diff --git a/ACL/include/ACL/Transport/MessageRequestHandler.h b/ACL/include/ACL/Transport/MessageRequestHandler.h
index c2a90e2fb6..f011ad9847 100644
--- a/ACL/include/ACL/Transport/MessageRequestHandler.h
+++ b/ACL/include/ACL/Transport/MessageRequestHandler.h
@@ -115,7 +115,7 @@ class MessageRequestHandler
      * Record a stream metric once when a specific threshold of bytes have been read from the stream.
      * The stream metric name and threshold will be specified in the MessageRequest.
      */
-    void recordStreamMetric(int bytes);
+    void recordStreamMetric(std::size_t bytes);
 
     /**
      * Record the metric that specifics the start of sending the Message Event to the cloud.
@@ -159,7 +159,7 @@ class MessageRequestHandler
     avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status m_resultStatus;
 
     /// The number of bytes that have been read from the stream.
-    unsigned int m_streamBytesRead;
+    std::size_t m_streamBytesRead;
 
     /// If the stream metric has already been recorded.
     bool m_recordedStreamMetric;
diff --git a/ACL/include/ACL/Transport/MessageRouterFactory.h b/ACL/include/ACL/Transport/MessageRouterFactory.h
index 093c46b9ba..dcdfc61404 100644
--- a/ACL/include/ACL/Transport/MessageRouterFactory.h
+++ b/ACL/include/ACL/Transport/MessageRouterFactory.h
@@ -22,7 +22,6 @@
 namespace alexaClientSDK {
 namespace acl {
 
-using namespace alexaClientSDK::acl;
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::avs::attachment;
 
diff --git a/ACL/include/ACL/Transport/MessageRouterFactoryInterface.h b/ACL/include/ACL/Transport/MessageRouterFactoryInterface.h
index 7a46a0ede6..a2b3242b6d 100644
--- a/ACL/include/ACL/Transport/MessageRouterFactoryInterface.h
+++ b/ACL/include/ACL/Transport/MessageRouterFactoryInterface.h
@@ -22,7 +22,6 @@
 namespace alexaClientSDK {
 namespace acl {
 
-using namespace alexaClientSDK::acl;
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::avs::attachment;
 
diff --git a/ACL/src/AVSConnectionManager.cpp b/ACL/src/AVSConnectionManager.cpp
index c5983a6c8e..75d41af7ec 100644
--- a/ACL/src/AVSConnectionManager.cpp
+++ b/ACL/src/AVSConnectionManager.cpp
@@ -26,7 +26,7 @@ namespace acl {
 using namespace alexaClientSDK::avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AVSConnectionManager");
+#define TAG "AVSConnectionManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ACL/src/Transport/DownchannelHandler.cpp b/ACL/src/Transport/DownchannelHandler.cpp
index f68908c0ba..8699df90d0 100644
--- a/ACL/src/Transport/DownchannelHandler.cpp
+++ b/ACL/src/Transport/DownchannelHandler.cpp
@@ -43,7 +43,7 @@ static const std::string DOWNCHANNEL_ID_PREFIX = "AVSDownChannel-";
 static const std::chrono::seconds ESTABLISH_CONNECTION_TIMEOUT = std::chrono::seconds(60);
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DownchannelHandler");
+#define TAG "DownchannelHandler"
 
 /// String to identify the metric source prefix for @c DownChannelHandler.
 static const std::string METRIC_SOURCE_PREFIX = "DOWNCHANNEL_HANDLER-";
diff --git a/ACL/src/Transport/ExchangeHandler.cpp b/ACL/src/Transport/ExchangeHandler.cpp
index e47ab179d6..222d71e31a 100644
--- a/ACL/src/Transport/ExchangeHandler.cpp
+++ b/ACL/src/Transport/ExchangeHandler.cpp
@@ -27,7 +27,7 @@ namespace acl {
 static const std::string AUTHORIZATION_HEADER = "Authorization: Bearer ";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ExchangeHandler");
+#define TAG "ExchangeHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ACL/src/Transport/HTTP2Transport.cpp b/ACL/src/Transport/HTTP2Transport.cpp
index 5d50ad78e3..bcb0be467f 100644
--- a/ACL/src/Transport/HTTP2Transport.cpp
+++ b/ACL/src/Transport/HTTP2Transport.cpp
@@ -43,7 +43,7 @@ using namespace avsCommon::utils::metrics;
 using namespace avsCommon::utils::power;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("HTTP2Transport");
+#define TAG "HTTP2Transport"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -288,10 +288,10 @@ HTTP2Transport::HTTP2Transport(
         m_disconnectReason{ConnectionStatusObserverInterface::ChangedReason::NONE} {
     m_observers.insert(transportObserver);
 
-    m_mainLoopPowerResource = PowerMonitor::getInstance()->createLocalPowerResource(TAG + "_mainLoop");
+    m_mainLoopPowerResource = PowerMonitor::getInstance()->createLocalPowerResource(TAG "_mainLoop");
 
     m_requestActivityPowerResource =
-        PowerMonitor::getInstance()->createLocalPowerResource(TAG + "_requestActivityResource");
+        PowerMonitor::getInstance()->createLocalPowerResource(TAG "_requestActivityResource");
 
     if (m_mainLoopPowerResource) {
         m_mainLoopPowerResource->acquire();
@@ -772,6 +772,8 @@ HTTP2Transport::State HTTP2Transport::handlePostConnecting() {
         }
     }
 
+    ACSDK_INFO(LX_P("handlePostConnecting").m("completing"));
+
     return sendMessagesAndPings(State::POST_CONNECTING, m_requestQueue);
 }
 
diff --git a/ACL/src/Transport/HTTP2TransportFactory.cpp b/ACL/src/Transport/HTTP2TransportFactory.cpp
index 805536fbdb..e9354cfc39 100644
--- a/ACL/src/Transport/HTTP2TransportFactory.cpp
+++ b/ACL/src/Transport/HTTP2TransportFactory.cpp
@@ -27,7 +27,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::avs::attachment;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("HTTP2TransportFactory");
+#define TAG "HTTP2TransportFactory"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ACL/src/Transport/MessageRequestHandler.cpp b/ACL/src/Transport/MessageRequestHandler.cpp
index 4a036005e4..7f0ec41b39 100644
--- a/ACL/src/Transport/MessageRequestHandler.cpp
+++ b/ACL/src/Transport/MessageRequestHandler.cpp
@@ -32,6 +32,7 @@
 namespace alexaClientSDK {
 namespace acl {
 
+using namespace avsCommon::avs;
 using namespace avsCommon::avs::attachment;
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::utils::http;
@@ -66,7 +67,7 @@ static const std::string ATTACHMENT_CONTENT_TYPE = "Content-Type: application/oc
 static const std::string MESSAGEREQUEST_ID_PREFIX = "AVSEvent-";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("MessageRequestHandler");
+#define TAG "MessageRequestHandler"
 
 /// Prefix used to identify metrics published by this module.
 static const std::string ACL_METRIC_SOURCE_PREFIX = "ACL-";
@@ -92,9 +93,18 @@ static const std::string SEND_COMPLETED = "SEND_COMPLETED";
 /// Metric identifier for message send error.
 static const std::string MESSAGE_SEND_ERROR = "ERROR.MESSAGE_SEND_FAILED";
 
-// Key value separator for HTTP headers
+/// Key value separator for HTTP headers
 static const std::string HTTP_KEY_VALUE_SEPARATOR = ": ";
 
+/// Event header key for the namespace field.
+static const std::string EVENT_HEADER_NAMESPACE = "namespace";
+
+/// Event header key for the name field.
+static const std::string EVENT_HEADER_NAME = "name";
+
+/// Event header missing.
+static const std::string EVENT_HEADER_MISSING = "EVENT_HEADER_MISSING";
+
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
  *
@@ -131,10 +141,12 @@ static void collectSendDataResultMetric(
  *
  * @param metricRecorder The metric recorder object.
  * @param status The @c MessageRequestObserverInterface::Status of the message.
+ * @param messageRequest The @c MessageRequest object.
  */
 static void submitMessageSendErrorMetric(
     const std::shared_ptr<MetricRecorderInterface>& metricRecorder,
-    MessageRequestObserverInterface::Status status) {
+    MessageRequestObserverInterface::Status status,
+    const std::shared_ptr<MessageRequest>& messageRequest) {
     if (!metricRecorder) {
         return;
     }
@@ -155,11 +167,27 @@ static void submitMessageSendErrorMetric(
             return;
     }
 
-    auto metricEvent = MetricEventBuilder{}
-                           .setActivityName(ACL_METRIC_SOURCE_PREFIX + MESSAGE_SEND_ERROR)
-                           .addDataPoint(DataPointCounterBuilder{}.setName(ss.str()).increment(1).build())
-                           .build();
-
+    auto metricEventBuilder = MetricEventBuilder{}
+                                  .setActivityName(ACL_METRIC_SOURCE_PREFIX + MESSAGE_SEND_ERROR)
+                                  .addDataPoint(DataPointCounterBuilder{}.setName(ss.str()).increment(1).build());
+    if (messageRequest) {
+        auto eventHeaders = messageRequest->retrieveEventHeaders();
+        if (!eventHeaders.eventNamespace.empty()) {
+            metricEventBuilder.addDataPoint(
+                DataPointStringBuilder{}.setName(EVENT_HEADER_NAMESPACE).setValue(eventHeaders.eventNamespace).build());
+        } else {
+            metricEventBuilder.addDataPoint(
+                DataPointStringBuilder{}.setName(EVENT_HEADER_NAMESPACE).setValue(EVENT_HEADER_MISSING).build());
+        }
+        if (!eventHeaders.eventName.empty()) {
+            metricEventBuilder.addDataPoint(
+                DataPointStringBuilder{}.setName(EVENT_HEADER_NAME).setValue(eventHeaders.eventName).build());
+        } else {
+            metricEventBuilder.addDataPoint(
+                DataPointStringBuilder{}.setName(EVENT_HEADER_NAME).setValue(EVENT_HEADER_MISSING).build());
+        }
+    }
+    auto metricEvent = metricEventBuilder.build();
     if (!metricEvent) {
         ACSDK_ERROR(LX("submitErrorMetricFailed").d("reason", "invalid metric event"));
         return;
@@ -168,7 +196,7 @@ static void submitMessageSendErrorMetric(
     recordMetric(metricRecorder, metricEvent);
 }
 
-void MessageRequestHandler::recordStreamMetric(int bytes) {
+void MessageRequestHandler::recordStreamMetric(std::size_t bytes) {
     if (m_messageRequest == nullptr) {
         return;
     }
@@ -506,7 +534,7 @@ void MessageRequestHandler::onResponseFinished(HTTP2ResponseFinishedStatus statu
 
     m_messageRequest->sendCompleted(m_resultStatus);
 
-    submitMessageSendErrorMetric(m_metricRecorder, m_resultStatus);
+    submitMessageSendErrorMetric(m_metricRecorder, m_resultStatus, m_messageRequest);
 }
 
 }  // namespace acl
diff --git a/ACL/src/Transport/MessageRequestQueue.cpp b/ACL/src/Transport/MessageRequestQueue.cpp
index 64bc623a9a..ac5adb2b30 100644
--- a/ACL/src/Transport/MessageRequestQueue.cpp
+++ b/ACL/src/Transport/MessageRequestQueue.cpp
@@ -24,7 +24,7 @@ namespace acl {
 using namespace avsCommon::avs;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("MessageRequestQueue");
+#define TAG "MessageRequestQueue"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ACL/src/Transport/MessageRouter.cpp b/ACL/src/Transport/MessageRouter.cpp
index 752ad20af9..bb8e16ce96 100644
--- a/ACL/src/Transport/MessageRouter.cpp
+++ b/ACL/src/Transport/MessageRouter.cpp
@@ -31,7 +31,7 @@ using namespace avsCommon::avs::attachment;
 using namespace avsCommon::avs;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("MessageRouter");
+#define TAG "MessageRouter"
 
 /// String for logging purpose as the key for the size of m_transports.
 static constexpr const char* KEY_SIZEOF_TRANSPORTS = "sizeOf m_transports";
@@ -316,7 +316,7 @@ void MessageRouter::notifyObserverOnConnectionStatusChanged(
             m_serverSideDisconnectNotificationPending = true;
             m_serverSideDisconnectTimer.start(m_serverSideReconnectGracePeriod, [this]() {
                 ACSDK_DEBUG0(LX("serverSideDisconectTimerPredicate"));
-                m_executor.submit([this]() {
+                m_executor.execute([this]() {
                     ACSDK_DEBUG0(
                         LX("serverSideDisconectTimerHandler")
                             .d("m_serverSideDisconnectNotificationPending", m_serverSideDisconnectNotificationPending));
@@ -335,7 +335,7 @@ void MessageRouter::notifyObserverOnConnectionStatusChanged(
             handleNotifyObserverOnConnectionStatusChanged(status, reason);
         }
     };
-    m_executor.submit(task);
+    m_executor.execute(task);
 }
 
 void MessageRouter::handleNotifyObserverOnConnectionStatusChanged(
@@ -360,7 +360,7 @@ void MessageRouter::notifyObserverOnReceive(const std::string& contextId, const
             temp->receive(contextId, message);
         }
     };
-    m_executor.submit(task);
+    m_executor.execute(task);
 }
 
 void MessageRouter::createActiveTransportLocked() {
@@ -428,7 +428,7 @@ void MessageRouter::safelyResetActiveTransportLocked() {
 void MessageRouter::safelyReleaseTransport(std::shared_ptr<TransportInterface> transport) {
     if (transport) {
         auto task = [transport]() { transport->shutdown(); };
-        m_executor.submit(task);
+        m_executor.execute(task);
     }
 }
 
diff --git a/ACL/src/Transport/MessageRouterFactory.cpp b/ACL/src/Transport/MessageRouterFactory.cpp
index b70d903e41..85506d09d9 100644
--- a/ACL/src/Transport/MessageRouterFactory.cpp
+++ b/ACL/src/Transport/MessageRouterFactory.cpp
@@ -20,7 +20,6 @@
 namespace alexaClientSDK {
 namespace acl {
 
-using namespace alexaClientSDK::acl;
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::avs::attachment;
 
diff --git a/ACL/src/Transport/MimeResponseSink.cpp b/ACL/src/Transport/MimeResponseSink.cpp
index a9fac90ff7..2bffc4e964 100644
--- a/ACL/src/Transport/MimeResponseSink.cpp
+++ b/ACL/src/Transport/MimeResponseSink.cpp
@@ -47,7 +47,7 @@ static const std::string MIME_OCTET_STREAM_CONTENT_TYPE = "application/octet-str
 static const size_t NON_MIME_BODY_MAX_SIZE = 4096;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("MimeResponseSink");
+#define TAG "MimeResponseSink"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ACL/src/Transport/PingHandler.cpp b/ACL/src/Transport/PingHandler.cpp
index f6bf8260a4..7589e50647 100644
--- a/ACL/src/Transport/PingHandler.cpp
+++ b/ACL/src/Transport/PingHandler.cpp
@@ -40,7 +40,7 @@ static const uint8_t PING_PRIORITY = 200;
 static const std::string PING_ID_PREFIX = "AVSPing-";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PingHandler");
+#define TAG "PingHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ACL/src/Transport/PostConnectSequencer.cpp b/ACL/src/Transport/PostConnectSequencer.cpp
index aed17e2262..39c0dd813c 100644
--- a/ACL/src/Transport/PostConnectSequencer.cpp
+++ b/ACL/src/Transport/PostConnectSequencer.cpp
@@ -27,7 +27,7 @@ using namespace avsCommon::utils::error;
 using namespace avsCommon::utils::power;
 
 /// String to identify log entries originating form this file.
-static const std::string TAG("PostConnectSequencer");
+#define TAG "PostConnectSequencer"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -50,9 +50,9 @@ std::shared_ptr<PostConnectSequencer> PostConnectSequencer::create(
 PostConnectSequencer::PostConnectSequencer(const PostConnectOperationsSet& postConnectOperations) :
         m_isStopping{false},
         m_postConnectOperations{postConnectOperations} {
-    ACSDK_DEBUG5(LX("init"));
+    ACSDK_INFO(LX("init"));
 
-    m_mainLoopPowerResource = PowerMonitor::getInstance()->createLocalPowerResource(TAG + "_mainLoop");
+    m_mainLoopPowerResource = PowerMonitor::getInstance()->createLocalPowerResource(TAG "_mainLoop");
 
     if (m_mainLoopPowerResource) {
         m_mainLoopPowerResource->acquire();
@@ -60,14 +60,14 @@ PostConnectSequencer::PostConnectSequencer(const PostConnectOperationsSet& postC
 }
 
 PostConnectSequencer::~PostConnectSequencer() {
-    ACSDK_DEBUG5(LX("destroy"));
+    ACSDK_INFO(LX("destroy"));
     stop();
 }
 
 bool PostConnectSequencer::doPostConnect(
     std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> postConnectSender,
     std::shared_ptr<PostConnectObserverInterface> postConnectObserver) {
-    ACSDK_DEBUG5(LX("doPostConnect"));
+    ACSDK_INFO(LX("doPostConnect"));
 
     if (!postConnectSender) {
         ACSDK_ERROR(LX("doPostConnectFailed").d("reason", "nullPostConnectSender"));
@@ -94,7 +94,7 @@ bool PostConnectSequencer::doPostConnect(
 void PostConnectSequencer::mainLoop(
     std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> postConnectSender,
     std::shared_ptr<PostConnectObserverInterface> postConnectObserver) {
-    ACSDK_DEBUG5(LX("mainLoop"));
+    ACSDK_INFO(LX("mainLoop"));
 
     PowerMonitor::getInstance()->assignThreadPowerResource(m_mainLoopPowerResource);
 
@@ -144,11 +144,11 @@ void PostConnectSequencer::mainLoop(
         postConnectObserver->onPostConnected();
     }
 
-    ACSDK_DEBUG5(LX("mainLoopReturning"));
+    ACSDK_INFO(LX("mainLoopReturning"));
 }
 
 void PostConnectSequencer::onDisconnect() {
-    ACSDK_DEBUG5(LX("onDisconnect"));
+    ACSDK_INFO(LX("onDisconnect"));
     stop();
 }
 
@@ -163,7 +163,7 @@ bool PostConnectSequencer::isStopping() {
 }
 
 void PostConnectSequencer::stop() {
-    ACSDK_DEBUG5(LX("stop"));
+    ACSDK_INFO(LX("stop"));
     {
         std::lock_guard<std::mutex> lock{m_mutex};
         if (m_isStopping) {
diff --git a/ACL/src/Transport/PostConnectSequencerFactory.cpp b/ACL/src/Transport/PostConnectSequencerFactory.cpp
index b28d63a251..503619f8a6 100644
--- a/ACL/src/Transport/PostConnectSequencerFactory.cpp
+++ b/ACL/src/Transport/PostConnectSequencerFactory.cpp
@@ -27,7 +27,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace acsdkPostConnectOperationProviderRegistrarInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PostConnectSequencerFactory");
+#define TAG "PostConnectSequencerFactory"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ACL/src/Transport/SynchronizedMessageRequestQueue.cpp b/ACL/src/Transport/SynchronizedMessageRequestQueue.cpp
index 701147990a..54860f84c7 100644
--- a/ACL/src/Transport/SynchronizedMessageRequestQueue.cpp
+++ b/ACL/src/Transport/SynchronizedMessageRequestQueue.cpp
@@ -24,7 +24,7 @@ namespace acl {
 using namespace avsCommon::avs;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SynchronizedMessageRequestQueue");
+#define TAG "SynchronizedMessageRequestQueue"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ACL/test/Transport/Common/MockHTTP2Connection.cpp b/ACL/test/Transport/Common/MockHTTP2Connection.cpp
index 775cb656c8..b163e42fa8 100644
--- a/ACL/test/Transport/Common/MockHTTP2Connection.cpp
+++ b/ACL/test/Transport/Common/MockHTTP2Connection.cpp
@@ -55,7 +55,7 @@ std::shared_ptr<HTTP2RequestInterface> MockHTTP2Connection::createAndSendRequest
 
     if (request->getRequestType() == HTTP2RequestType::POST) {
         // Parse POST HTTP2 Requests.
-        std::lock_guard<std::mutex> lock(m_postRequestMutex);
+        std::lock_guard<std::mutex> innerLock(m_postRequestMutex);
         m_postRequestQueue.push_back(request);
         if (m_postResponseCode != HTTPResponseCode::HTTP_RESPONSE_CODE_UNDEFINED) {
             request->getSink()->onReceiveResponseCode(responseCodeToInt(m_postResponseCode));
@@ -66,12 +66,12 @@ std::shared_ptr<HTTP2RequestInterface> MockHTTP2Connection::createAndSendRequest
         m_requestPostCv.notify_one();
     } else if (m_downchannelURL == request->getUrl()) {
         // Push downchannel requests to its queue.
-        std::lock_guard<std::mutex> lock(m_downchannelRequestMutex);
+        std::lock_guard<std::mutex> innerLock(m_downchannelRequestMutex);
         m_downchannelRequestQueue.push_back(request);
         m_downchannelRequestCv.notify_all();
     } else if (m_pingURL == request->getUrl()) {
         // Push ping requests to its queue.
-        std::lock_guard<std::mutex> lock(m_pingRequestMutex);
+        std::lock_guard<std::mutex> innerLock(m_pingRequestMutex);
         m_pingRequestQueue.push_back(request);
         m_pingRequestCv.notify_one();
     }
diff --git a/ACL/test/Transport/Common/MockMimeResponseSink.cpp b/ACL/test/Transport/Common/MockMimeResponseSink.cpp
index fa9dec7451..b2b6aa6f19 100644
--- a/ACL/test/Transport/Common/MockMimeResponseSink.cpp
+++ b/ACL/test/Transport/Common/MockMimeResponseSink.cpp
@@ -64,7 +64,7 @@ std::vector<char> MockMimeResponseSink::getMimePart(unsigned part) {
 }
 
 unsigned MockMimeResponseSink::getCountOfMimeParts() {
-    return m_mimeContents.size();
+    return static_cast<unsigned>(m_mimeContents.size());
 }
 
 }  // namespace test
diff --git a/ACL/test/Transport/HTTP2TransportTest.cpp b/ACL/test/Transport/HTTP2TransportTest.cpp
index f8be3dcc6c..f9b7032780 100644
--- a/ACL/test/Transport/HTTP2TransportTest.cpp
+++ b/ACL/test/Transport/HTTP2TransportTest.cpp
@@ -644,7 +644,7 @@ TEST_F(HTTP2TransportTest, test_pauseSendWhenSDSEmpty) {
         // Number of chunks the attachment will be divided into
         const unsigned chunks = 4;
         // the size of each chunk in bytes, this is the ceiling of (attachment.size / chunks)
-        unsigned int chunkSize = (attachment.size() + chunks - 1) / chunks;
+        unsigned int chunkSize = static_cast<unsigned int>((attachment.size() + chunks - 1) / chunks);
         auto writer = attMgr.createWriter(TEST_ATTACHMENT_ID_STRING_ONE, avsCommon::utils::sds::WriterPolicy::BLOCKING);
         AttachmentWriter::WriteStatus writeStatus = AttachmentWriter::WriteStatus::OK;
         unsigned int lastChunkSize = (attachment.size() % chunks == 0) ? chunkSize : attachment.size() % chunks;
@@ -959,7 +959,7 @@ TEST_F(HTTP2TransportTest, test_onSendCompletedNotification) {
 
     // Send a message for each test case defined in the messageResponseMap.
     std::vector<std::shared_ptr<TestMessageRequestObserver>> messageObservers;
-    unsigned messagesCount = messageResponseMap.size();  // number of test messages to send
+    unsigned messagesCount = static_cast<unsigned>(messageResponseMap.size());  // number of test messages to send
     for (unsigned messageNum = 0; messageNum < messagesCount; messageNum++) {
         std::shared_ptr<MessageRequest> messageReq = std::make_shared<MessageRequest>(TEST_MESSAGE, "");
         auto messageObserver = std::make_shared<TestMessageRequestObserver>();
diff --git a/ACL/test/Transport/MessageRouterTest.cpp b/ACL/test/Transport/MessageRouterTest.cpp
index 7cd35bb7d5..8daf3230ac 100644
--- a/ACL/test/Transport/MessageRouterTest.cpp
+++ b/ACL/test/Transport/MessageRouterTest.cpp
@@ -149,7 +149,7 @@ TEST_F(MessageRouterTest, test_sendMessageDoesNotSendAfterDisconnected) {
     m_router->sendMessage(messageRequest);
 }
 
-TEST_F(MessageRouterTest, test_shutdownCalledWithMultipleMessages) {
+TEST_F(MessageRouterTest, testTimer_shutdownCalledWithMultipleMessages) {
     setupStateToConnected();
 
     // wait for the result to propagate by scheduling a task on the client executor
diff --git a/ADSL/src/DirectiveProcessor.cpp b/ADSL/src/DirectiveProcessor.cpp
index 3ca3dd2c55..80d7e995cc 100644
--- a/ADSL/src/DirectiveProcessor.cpp
+++ b/ADSL/src/DirectiveProcessor.cpp
@@ -25,7 +25,7 @@
 #include "ADSL/DirectiveProcessor.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DirectiveProcessor");
+#define TAG "DirectiveProcessor"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -427,7 +427,6 @@ bool DirectiveProcessor::handleQueuedDirectivesLocked(std::unique_lock<std::mute
             scrubDialogRequestIdLocked(directive->getDialogRequestId());
         }
     }
-
     return handleDirectiveCalled;
 }
 
diff --git a/ADSL/src/DirectiveRouter.cpp b/ADSL/src/DirectiveRouter.cpp
index 9cd5f520ff..43cd5a3db0 100644
--- a/ADSL/src/DirectiveRouter.cpp
+++ b/ADSL/src/DirectiveRouter.cpp
@@ -27,7 +27,7 @@
 #include "ADSL/DirectiveRouter.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DirectiveRouter");
+#define TAG "DirectiveRouter"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ADSL/src/DirectiveSequencer.cpp b/ADSL/src/DirectiveSequencer.cpp
index 6ce7101540..328e61db0b 100644
--- a/ADSL/src/DirectiveSequencer.cpp
+++ b/ADSL/src/DirectiveSequencer.cpp
@@ -26,7 +26,7 @@
 #include "ADSL/DirectiveSequencer.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DirectiveSequencer");
+#define TAG "DirectiveSequencer"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ADSL/src/MessageInterpreter.cpp b/ADSL/src/MessageInterpreter.cpp
index 0cfcf613b9..33bbd3d4a5 100644
--- a/ADSL/src/MessageInterpreter.cpp
+++ b/ADSL/src/MessageInterpreter.cpp
@@ -39,7 +39,7 @@ static const std::string PARSE_COMPLETE("PARSE_COMPLETE");
 static const std::string PARSE_COMPLETE_ACTIVITY_NAME("MESSAGE_INTERPRETER-" + PARSE_COMPLETE);
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("MessageInterpreter");
+#define TAG "MessageInterpreter"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AFML/src/AudioActivityTracker.cpp b/AFML/src/AudioActivityTracker.cpp
index b0ef2fd6ba..bd29030b6a 100644
--- a/AFML/src/AudioActivityTracker.cpp
+++ b/AFML/src/AudioActivityTracker.cpp
@@ -43,7 +43,7 @@ static const std::string AUDIOACTIVITYTRACKER_CAPABILITY_INTERFACE_NAME = "Audio
 static const std::string AUDIOACTIVITYTRACKER_CAPABILITY_INTERFACE_VERSION = "1.0";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AudioActivityTracker");
+#define TAG "AudioActivityTracker"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -113,12 +113,12 @@ void AudioActivityTracker::provideState(
     const avsCommon::avs::NamespaceAndName& stateProviderName,
     unsigned int stateRequestToken) {
     ACSDK_DEBUG5(LX("provideState"));
-    m_executor.submit([this, stateRequestToken]() { executeProvideState(stateRequestToken); });
+    m_executor.execute([this, stateRequestToken]() { executeProvideState(stateRequestToken); });
 }
 
 void AudioActivityTracker::notifyOfActivityUpdates(const std::vector<Channel::State>& channelStates) {
     ACSDK_DEBUG5(LX("notifyOfActivityUpdates"));
-    m_executor.submit([this, channelStates]() { executeNotifyOfActivityUpdates(channelStates); });
+    m_executor.execute([this, channelStates]() { executeNotifyOfActivityUpdates(channelStates); });
 }
 
 AudioActivityTracker::AudioActivityTracker(
diff --git a/AFML/src/Channel.cpp b/AFML/src/Channel.cpp
index 3158ae00ce..8fc5a997ca 100644
--- a/AFML/src/Channel.cpp
+++ b/AFML/src/Channel.cpp
@@ -25,7 +25,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("Channel");
+#define TAG "Channel"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -49,7 +49,7 @@ Channel::Channel(const std::string& name, const unsigned int priority, bool isVi
         m_state{name} {
     /// Non-refcounted.
     m_powerResource = power::PowerResource::create(
-        TAG + ":" + name,
+        TAG ":" + name,
         power::PowerMonitor::getInstance()->getPowerResourceManager(),
         PowerResourceManagerInterface::PowerResourceLevel::STANDBY_MED,
         false);
diff --git a/AFML/src/FocusManagementComponent.cpp b/AFML/src/FocusManagementComponent.cpp
index f67235aab0..63fac243a4 100644
--- a/AFML/src/FocusManagementComponent.cpp
+++ b/AFML/src/FocusManagementComponent.cpp
@@ -27,7 +27,7 @@ using AudioFocusAnnotation = avsCommon::sdkInterfaces::AudioFocusAnnotation;
 using VisualFocusAnnotation = avsCommon::sdkInterfaces::VisualFocusAnnotation;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("FocusManagementComponent");
+#define TAG "FocusManagementComponent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AFML/src/FocusManager.cpp b/AFML/src/FocusManager.cpp
index c7c7b6ec5c..555df4d5b0 100644
--- a/AFML/src/FocusManager.cpp
+++ b/AFML/src/FocusManager.cpp
@@ -29,7 +29,7 @@ using namespace avsCommon::avs;
 using namespace interruptModel;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("FocusManager");
+#define TAG "FocusManager"
 
 /// Key for @c FocusManager configurations in configuration node.
 static const std::string VIRTUAL_CHANNELS_CONFIG_KEY = "virtualChannels";
@@ -77,7 +77,7 @@ bool FocusManager::acquireChannel(
         return false;
     }
 
-    m_executor.submit(
+    m_executor.execute(
         [this, channelToAcquire, channelActivity]() { acquireChannelHelper(channelToAcquire, channelActivity); });
     return true;
 }
@@ -97,7 +97,7 @@ bool FocusManager::acquireChannel(
         return false;
     }
 
-    m_executor.submit(
+    m_executor.execute(
         [this, channelToAcquire, channelActivity]() { acquireChannelHelper(channelToAcquire, channelActivity); });
     return true;
 }
@@ -117,7 +117,7 @@ std::future<bool> FocusManager::releaseChannel(
         return returnValue;
     }
 
-    m_executor.submit([this, channelToRelease, channelObserver, releaseChannelSuccess, channelName]() {
+    m_executor.execute([this, channelToRelease, channelObserver, releaseChannelSuccess, channelName]() {
         releaseChannelHelper(channelToRelease, channelObserver, releaseChannelSuccess, channelName);
     });
 
@@ -379,9 +379,9 @@ void FocusManager::stopAllActivitiesHelper(const ChannelsToInterfaceNamesMap& ch
         // Only release and set entire channel focus to NONE if there are no active Activity remaining.
         if (!channel->isActive()) {
             // Lock here to update internal state which stopForegroundActivity may concurrently access.
-            std::unique_lock<std::mutex> lock(m_mutex);
+            std::unique_lock<std::mutex> activeChannelsLock(m_mutex);
             m_activeChannels.erase(channel);
-            lock.unlock();
+            activeChannelsLock.unlock();
             setChannelFocus(channel, FocusState::NONE, MixingBehavior::MUST_STOP);
         }
     }
diff --git a/AFML/src/VisualActivityTracker.cpp b/AFML/src/VisualActivityTracker.cpp
index bf12c73f0c..ffefea6760 100644
--- a/AFML/src/VisualActivityTracker.cpp
+++ b/AFML/src/VisualActivityTracker.cpp
@@ -40,7 +40,7 @@ static const std::string VISUALACTIVITYTRACKER_CAPABILITY_INTERFACE_NAME = "Visu
 static const std::string VISUALACTIVITYTRACKER_CAPABILITY_INTERFACE_VERSION = "1.0";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("VisualActivityTracker");
+#define TAG "VisualActivityTracker"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -110,7 +110,7 @@ void VisualActivityTracker::provideState(
     const avsCommon::avs::NamespaceAndName& stateProviderName,
     unsigned int stateRequestToken) {
     ACSDK_DEBUG5(LX("provideState"));
-    m_executor.submit([this, stateRequestToken]() { executeProvideState(stateRequestToken); });
+    m_executor.execute([this, stateRequestToken]() { executeProvideState(stateRequestToken); });
 }
 
 void VisualActivityTracker::notifyOfActivityUpdates(const std::vector<Channel::State>& channels) {
@@ -132,7 +132,7 @@ void VisualActivityTracker::notifyOfActivityUpdates(const std::vector<Channel::S
         }
     }
 
-    m_executor.submit([this, channels]() {
+    m_executor.execute([this, channels]() {
         // The last element of the vector is the most recent channel state.
         m_channelState = channels.back();
     });
diff --git a/AVSCommon/AVS/include/AVSCommon/AVS/AVSDiscoveryEndpointAttributes.h b/AVSCommon/AVS/include/AVSCommon/AVS/AVSDiscoveryEndpointAttributes.h
index a15c9454bb..c55851db30 100644
--- a/AVSCommon/AVS/include/AVSCommon/AVS/AVSDiscoveryEndpointAttributes.h
+++ b/AVSCommon/AVS/include/AVSCommon/AVS/AVSDiscoveryEndpointAttributes.h
@@ -73,6 +73,26 @@ struct AVSDiscoveryEndpointAttributes {
          * Default constructor.
          */
         Registration() = default;
+
+        /**
+         * Operator == for @c Registration.
+         * @param rhs The object to compare to @c this.
+         * @return Whether the operation holds.
+         */
+        bool operator==(const Registration& rhs) {
+            return (
+                productId == rhs.productId && serialNumber == rhs.serialNumber &&
+                registrationKey == rhs.registrationKey && productIdKey == rhs.productIdKey);
+        }
+
+        /**
+         * Operator != for @c Registration.
+         * @param rhs The object to compare to @c this.
+         * @return Whether the operation holds.
+         */
+        bool operator!=(const Registration& rhs) {
+            return !(*this == rhs);
+        }
     };
 
     /**
diff --git a/AVSCommon/AVS/include/AVSCommon/AVS/CapabilityChangeNotifier.h b/AVSCommon/AVS/include/AVSCommon/AVS/CapabilityChangeNotifier.h
index 6e2a526177..02d9cfabf2 100644
--- a/AVSCommon/AVS/include/AVSCommon/AVS/CapabilityChangeNotifier.h
+++ b/AVSCommon/AVS/include/AVSCommon/AVS/CapabilityChangeNotifier.h
@@ -16,7 +16,7 @@
 #ifndef ALEXA_CLIENT_SDK_AVSCOMMON_AVS_INCLUDE_AVSCOMMON_AVS_CAPABILITYCHANGENOTIFIER_H_
 #define ALEXA_CLIENT_SDK_AVSCOMMON_AVS_INCLUDE_AVSCOMMON_AVS_CAPABILITYCHANGENOTIFIER_H_
 
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 #include <AVSCommon/SDKInterfaces/CapabilityConfigurationChangeObserverInterface.h>
 
 namespace alexaClientSDK {
@@ -27,7 +27,7 @@ namespace avs {
  * Implementation of CapabilityChangeNotifierInterface
  */
 using CapabilityChangeNotifier =
-    acsdkNotifier::Notifier<avsCommon::sdkInterfaces::CapabilityConfigurationChangeObserverInterface>;
+    notifier::Notifier<avsCommon::sdkInterfaces::CapabilityConfigurationChangeObserverInterface>;
 
 }  // namespace avs
 }  // namespace avsCommon
diff --git a/AVSCommon/AVS/include/AVSCommon/AVS/CapabilityChangeNotifierInterface.h b/AVSCommon/AVS/include/AVSCommon/AVS/CapabilityChangeNotifierInterface.h
index 3af5c99e69..ac197b669f 100644
--- a/AVSCommon/AVS/include/AVSCommon/AVS/CapabilityChangeNotifierInterface.h
+++ b/AVSCommon/AVS/include/AVSCommon/AVS/CapabilityChangeNotifierInterface.h
@@ -16,7 +16,7 @@
 #ifndef ALEXA_CLIENT_SDK_AVSCOMMON_AVS_INCLUDE_AVSCOMMON_AVS_CAPABILITYCHANGENOTIFIERINTERFACE_H_
 #define ALEXA_CLIENT_SDK_AVSCOMMON_AVS_INCLUDE_AVSCOMMON_AVS_CAPABILITYCHANGENOTIFIERINTERFACE_H_
 
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
 #include <AVSCommon/SDKInterfaces/CapabilityConfigurationChangeObserverInterface.h>
 
 namespace alexaClientSDK {
@@ -27,7 +27,7 @@ namespace avs {
  * Interface for registering to observe capability change.
  */
 using CapabilityChangeNotifierInterface =
-    acsdkNotifierInterfaces::NotifierInterface<sdkInterfaces::CapabilityConfigurationChangeObserverInterface>;
+    notifierInterfaces::NotifierInterface<sdkInterfaces::CapabilityConfigurationChangeObserverInterface>;
 
 }  // namespace avs
 }  // namespace avsCommon
diff --git a/AVSCommon/AVS/include/AVSCommon/AVS/CapabilityConfiguration.h b/AVSCommon/AVS/include/AVSCommon/AVS/CapabilityConfiguration.h
index 9012952693..03163e2fe3 100644
--- a/AVSCommon/AVS/include/AVSCommon/AVS/CapabilityConfiguration.h
+++ b/AVSCommon/AVS/include/AVSCommon/AVS/CapabilityConfiguration.h
@@ -28,13 +28,13 @@ namespace avsCommon {
 namespace avs {
 
 /// Key for interface type in the @c CapabilityConfiguration map
-static const std::string CAPABILITY_INTERFACE_TYPE_KEY = "type";
+static const auto CAPABILITY_INTERFACE_TYPE_KEY = "type";
 /// Key for interface name in the @c CapabilityConfiguration map
-static const std::string CAPABILITY_INTERFACE_NAME_KEY = "interface";
+static const auto CAPABILITY_INTERFACE_NAME_KEY = "interface";
 /// Key for interface version in the @c CapabilityConfiguration map
-static const std::string CAPABILITY_INTERFACE_VERSION_KEY = "version";
+static const auto CAPABILITY_INTERFACE_VERSION_KEY = "version";
 /// Key for interface configurations in the @c CapabilityConfiguration map
-static const std::string CAPABILITY_INTERFACE_CONFIGURATIONS_KEY = "configurations";
+static const auto CAPABILITY_INTERFACE_CONFIGURATIONS_KEY = "configurations";
 
 /**
  * Class to encapsulate the capability configuration implemented by a capability agent.
diff --git a/AVSCommon/AVS/include/AVSCommon/AVS/MessageRequest.h b/AVSCommon/AVS/include/AVSCommon/AVS/MessageRequest.h
index 871dab5d98..6886e5fb5b 100644
--- a/AVSCommon/AVS/include/AVSCommon/AVS/MessageRequest.h
+++ b/AVSCommon/AVS/include/AVSCommon/AVS/MessageRequest.h
@@ -59,6 +59,28 @@ class MessageRequest {
         std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> reader;
     };
 
+    /// A struct to hold event namespace and name.
+    struct EventHeaders {
+        /**
+         * Constructor.
+         *
+         * @param eventNamespace The namespace of the event.
+         * @param eventName The name of the event.
+         */
+        EventHeaders(const std::string& eventNamespace, const std::string& eventName) :
+                eventNamespace{eventNamespace},
+                eventName{eventName} {
+        }
+
+        EventHeaders() = default;
+
+        /// The event namespace.
+        std::string eventNamespace;
+
+        /// The event name.
+        std::string eventName;
+    };
+
     /**
      * Function to resolve an editable message request based on the provided resolveKey by updating the MessageRequest.
      * @param[in,out] req Target editable request message that will be modified in place.
@@ -216,6 +238,13 @@ class MessageRequest {
      */
     void removeObserver(std::shared_ptr<avsCommon::sdkInterfaces::MessageRequestObserverInterface> observer);
 
+    /**
+     * Retrieve MessageRequest event headers (namespace and name).
+     *
+     * @return EventHeaders containing the namespace and name.
+     */
+    EventHeaders retrieveEventHeaders() const;
+
     /**
      * Get additional HTTP headers for this request
      *
diff --git a/AVSCommon/AVS/src/AVSContext.cpp b/AVSCommon/AVS/src/AVSContext.cpp
index d3a0a275d8..c80de167e3 100644
--- a/AVSCommon/AVS/src/AVSContext.cpp
+++ b/AVSCommon/AVS/src/AVSContext.cpp
@@ -39,7 +39,7 @@ static const std::string TIME_OF_SAMPLE_KEY_STRING = "timeOfSample";
 static const std::string UNCERTAINTY_KEY_STRING = "uncertaintyInMilliseconds";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AVSContext");
+#define TAG "AVSContext"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/AVSDirective.cpp b/AVSCommon/AVS/src/AVSDirective.cpp
index d9e8c65274..e0559eee83 100644
--- a/AVSCommon/AVS/src/AVSDirective.cpp
+++ b/AVSCommon/AVS/src/AVSDirective.cpp
@@ -59,7 +59,7 @@ static const std::string JSON_ENDPOINT_ID_KEY = "endpointId";
 static const std::string JSON_ENDPOINT_COOKIE_KEY = "cookie";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AvsDirective");
+#define TAG "AvsDirective"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/AbstractAVSConnectionManager.cpp b/AVSCommon/AVS/src/AbstractAVSConnectionManager.cpp
index 4a4ba73e83..617c86455b 100644
--- a/AVSCommon/AVS/src/AbstractAVSConnectionManager.cpp
+++ b/AVSCommon/AVS/src/AbstractAVSConnectionManager.cpp
@@ -23,7 +23,7 @@ namespace avs {
 using namespace avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AbstractAVSConnectionManager");
+#define TAG "AbstractAVSConnectionManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/AlexaClientSDKInit.cpp b/AVSCommon/AVS/src/AlexaClientSDKInit.cpp
index 2af6d8c173..f54fb3abfb 100644
--- a/AVSCommon/AVS/src/AlexaClientSDKInit.cpp
+++ b/AVSCommon/AVS/src/AlexaClientSDKInit.cpp
@@ -30,7 +30,7 @@ namespace avs {
 namespace initialization {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AlexaClientSdkInit");
+#define TAG "AlexaClientSdkInit"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/Attachment/AttachmentManager.cpp b/AVSCommon/AVS/src/Attachment/AttachmentManager.cpp
index 025b13fb51..fca1a7c5dc 100644
--- a/AVSCommon/AVS/src/Attachment/AttachmentManager.cpp
+++ b/AVSCommon/AVS/src/Attachment/AttachmentManager.cpp
@@ -30,7 +30,7 @@ using namespace alexaClientSDK::avsCommon::utils;
 using namespace alexaClientSDK::avsCommon::utils::memory;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AttachmentManager");
+#define TAG "AttachmentManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/Attachment/AttachmentUtils.cpp b/AVSCommon/AVS/src/Attachment/AttachmentUtils.cpp
index 3d837b289f..56f5d5dcc8 100644
--- a/AVSCommon/AVS/src/Attachment/AttachmentUtils.cpp
+++ b/AVSCommon/AVS/src/Attachment/AttachmentUtils.cpp
@@ -28,7 +28,7 @@ namespace avs {
 namespace attachment {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AttachmentUtils");
+#define TAG "AttachmentUtils"
 
 /// Maximum size of the reader is 4KB.
 static const std::size_t MAX_READER_SIZE = 4 * 1024;
diff --git a/AVSCommon/AVS/src/Attachment/InProcessAttachmentWriter.cpp b/AVSCommon/AVS/src/Attachment/InProcessAttachmentWriter.cpp
index 58910e700b..c335433c41 100644
--- a/AVSCommon/AVS/src/Attachment/InProcessAttachmentWriter.cpp
+++ b/AVSCommon/AVS/src/Attachment/InProcessAttachmentWriter.cpp
@@ -24,7 +24,7 @@ namespace attachment {
 using namespace alexaClientSDK::avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("InProcessAttachmentWriter");
+#define TAG "InProcessAttachmentWriter"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/BlockingPolicy.cpp b/AVSCommon/AVS/src/BlockingPolicy.cpp
index 97ed6d9619..5082f4a334 100644
--- a/AVSCommon/AVS/src/BlockingPolicy.cpp
+++ b/AVSCommon/AVS/src/BlockingPolicy.cpp
@@ -26,17 +26,16 @@ namespace avsCommon {
 namespace avs {
 
 using namespace rapidjson;
-using namespace avsCommon::avs;
 using namespace avsCommon::utils::json;
 
 /// Flag indicating @c AUDIO medium is used.
-static const long MEDIUM_FLAG_AUDIO = 1;
+static const unsigned long MEDIUM_FLAG_AUDIO = 1;
 
 /// Flag indicating @c VISUAL medium is used.
-static const long MEDIUM_FLAG_VISUAL = 2;
+static const unsigned long MEDIUM_FLAG_VISUAL = 2;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("BlockingPolicy");
+#define TAG "BlockingPolicy"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/CapabilityAgent.cpp b/AVSCommon/AVS/src/CapabilityAgent.cpp
index bb5b329aaa..c44c2ec78d 100644
--- a/AVSCommon/AVS/src/CapabilityAgent.cpp
+++ b/AVSCommon/AVS/src/CapabilityAgent.cpp
@@ -31,7 +31,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CapabilityAgent");
+#define TAG "CapabilityAgent"
 
 /// Maximum number of directives that Can be Queued before we emit warning logs.
 static const int CAPABILITY_QUEUE_WARN_SIZE = 10;
@@ -67,6 +67,10 @@ CapabilityAgent::DirectiveInfo::DirectiveInfo(
 void CapabilityAgent::preHandleDirective(
     std::shared_ptr<AVSDirective> directive,
     std::unique_ptr<DirectiveHandlerResultInterface> result) {
+    if (!directive) {
+        ACSDK_ERROR(LX("preHandleDirectiveFailed").d("reason", "nullDirective"));
+        return;
+    }
     std::string messageId = directive->getMessageId();
     auto info = getDirectiveInfo(messageId);
     if (info) {
diff --git a/AVSCommon/AVS/src/CapabilityResources.cpp b/AVSCommon/AVS/src/CapabilityResources.cpp
index d5247142d2..71bb58fa12 100644
--- a/AVSCommon/AVS/src/CapabilityResources.cpp
+++ b/AVSCommon/AVS/src/CapabilityResources.cpp
@@ -24,7 +24,7 @@ namespace avsCommon {
 namespace avs {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CapabilityResources");
+#define TAG "CapabilityResources"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/CapabilitySemantics/ActionsToDirectiveMapping.cpp b/AVSCommon/AVS/src/CapabilitySemantics/ActionsToDirectiveMapping.cpp
index 80fcdb5de6..2298a77d4d 100644
--- a/AVSCommon/AVS/src/CapabilitySemantics/ActionsToDirectiveMapping.cpp
+++ b/AVSCommon/AVS/src/CapabilitySemantics/ActionsToDirectiveMapping.cpp
@@ -46,7 +46,7 @@ static const std::string PAYLOAD_KEY("payload");
 static const std::string EMPTY_JSON("{}");
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ActionsToDirectiveMapping");
+#define TAG "ActionsToDirectiveMapping"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/CapabilitySemantics/CapabilitySemantics.cpp b/AVSCommon/AVS/src/CapabilitySemantics/CapabilitySemantics.cpp
index 727b7bd5f7..ac3c1efda2 100644
--- a/AVSCommon/AVS/src/CapabilitySemantics/CapabilitySemantics.cpp
+++ b/AVSCommon/AVS/src/CapabilitySemantics/CapabilitySemantics.cpp
@@ -34,7 +34,7 @@ static const std::string STATE_MAPPINGS_KEY("stateMappings");
 static const std::string EMPTY_JSON("{}");
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CapabilitySemantics");
+#define TAG "CapabilitySemantics"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/CapabilitySemantics/StatesToRangeMapping.cpp b/AVSCommon/AVS/src/CapabilitySemantics/StatesToRangeMapping.cpp
index 8b43bfe5f2..63ad48014c 100644
--- a/AVSCommon/AVS/src/CapabilitySemantics/StatesToRangeMapping.cpp
+++ b/AVSCommon/AVS/src/CapabilitySemantics/StatesToRangeMapping.cpp
@@ -50,7 +50,7 @@ static constexpr double UNINITIALIZED_DOUBLE = std::numeric_limits<double>::min(
 static const std::string EMPTY_JSON("{}");
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("StatesToRangeMapping");
+#define TAG "StatesToRangeMapping"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/CapabilitySemantics/StatesToValueMapping.cpp b/AVSCommon/AVS/src/CapabilitySemantics/StatesToValueMapping.cpp
index e48cb54111..7a5a207309 100644
--- a/AVSCommon/AVS/src/CapabilitySemantics/StatesToValueMapping.cpp
+++ b/AVSCommon/AVS/src/CapabilitySemantics/StatesToValueMapping.cpp
@@ -47,7 +47,7 @@ static std::string UNINITIALIZED_STRING = "";
 static const std::string EMPTY_JSON("{}");
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("StatesToValueMapping");
+#define TAG "StatesToValueMapping"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/ComponentConfiguration.cpp b/AVSCommon/AVS/src/ComponentConfiguration.cpp
index 1429ffaf6d..65d22e939b 100644
--- a/AVSCommon/AVS/src/ComponentConfiguration.cpp
+++ b/AVSCommon/AVS/src/ComponentConfiguration.cpp
@@ -23,7 +23,7 @@ namespace avsCommon {
 namespace avs {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ComponentConfiguration");
+#define TAG "ComponentConfiguration"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/DialogUXStateAggregator.cpp b/AVSCommon/AVS/src/DialogUXStateAggregator.cpp
index f581277b9f..0a97253f80 100644
--- a/AVSCommon/AVS/src/DialogUXStateAggregator.cpp
+++ b/AVSCommon/AVS/src/DialogUXStateAggregator.cpp
@@ -26,7 +26,7 @@ using namespace avsCommon::utils::metrics;
 using namespace avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DialogUXStateAggregator");
+#define TAG "DialogUXStateAggregator"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -114,7 +114,7 @@ void DialogUXStateAggregator::addObserver(std::shared_ptr<DialogUXStateObserverI
         ACSDK_ERROR(LX("addObserverFailed").d("reason", "nullObserver"));
         return;
     }
-    m_executor.submit([this, observer]() {
+    m_executor.execute([this, observer]() {
         m_observers.insert(observer);
         observer->onDialogUXStateChanged(m_currentState);
     });
@@ -131,7 +131,7 @@ void DialogUXStateAggregator::removeObserver(std::shared_ptr<DialogUXStateObserv
 void DialogUXStateAggregator::onStateChanged(AudioInputProcessorObserverInterface::State state) {
     ACSDK_DEBUG0(LX("onStateChanged").d("AudioInputProcessorState", state));
     m_audioInputProcessorState = state;
-    m_executor.submit([this, state]() {
+    m_executor.execute([this, state]() {
         ACSDK_DEBUG0(LX("onStateChangedLambda").d("AudioInputProcessorState", state));
         switch (state) {
             case AudioInputProcessorObserverInterface::State::IDLE:
@@ -168,7 +168,7 @@ void DialogUXStateAggregator::onStateChanged(
     const std::vector<avsCommon::utils::audioAnalyzer::AudioAnalyzerState>& audioAnalyzerState) {
     ACSDK_DEBUG0(LX("onStateChanged").d("SpeechSynthesizerState", state));
     m_speechSynthesizerState = state;
-    m_executor.submit([this, state]() {
+    m_executor.execute([this, state]() {
         ACSDK_DEBUG0(LX("onStateChangedLambda").d("SpeechSynthesizerState", state));
         switch (state) {
             case SpeechSynthesizerObserverInterface::SpeechSynthesizerState::PLAYING:
@@ -222,7 +222,7 @@ void DialogUXStateAggregator::onConnectionStatusChanged(
     const DialogUXStateAggregator::Status status,
     const std::vector<DialogUXStateAggregator::EngineConnectionStatus>& engineStatuses) {
     ACSDK_DEBUG(LX("onConnectionStatusChanged").d("engineAggregatedStatus", status));
-    m_executor.submit([this, engineStatuses]() {
+    m_executor.execute([this, engineStatuses]() {
         bool isDisconnected = true;
         for (const auto& engineStatus : engineStatuses) {
             ACSDK_DEBUG(LX("onConnectionStatusChangedLambda")
@@ -244,7 +244,7 @@ void DialogUXStateAggregator::onConnectionStatusChanged(
 
 void DialogUXStateAggregator::onRequestProcessingStarted() {
     ACSDK_DEBUG0(LX("onRequestProcessingStarted"));
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         ACSDK_DEBUG0(LX("onRequestProcessingStartedLambda").d("currentState", m_currentState));
         // Stop the listening timer
         m_listeningTimeoutTimer.stop();
@@ -274,7 +274,7 @@ void DialogUXStateAggregator::onRequestProcessingStarted() {
 
 void DialogUXStateAggregator::onRequestProcessingCompleted() {
     ACSDK_DEBUG(LX("onRequestProcessingCompleted"));
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (DialogUXStateObserverInterface::DialogUXState::LISTENING == m_currentState) {
             /// It is possible that the cloud sends RPC without sending RPS. In those situations, if we are in
             /// LISTENING state, switch back to IDLE.
@@ -295,7 +295,7 @@ void DialogUXStateAggregator::notifyObserversOfState() {
 
 void DialogUXStateAggregator::transitionFromThinkingTimedOut() {
     ACSDK_DEBUG5(LX("transitionFromThinkingTimedOut"));
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         ACSDK_DEBUG5(LX("transitionFromThinkingTimedOutExecutor").d("m_currentState", m_currentState));
         if (DialogUXStateObserverInterface::DialogUXState::THINKING == m_currentState) {
             ACSDK_DEBUG(LX("transitionFromThinkingTimedOut"));
@@ -308,7 +308,7 @@ void DialogUXStateAggregator::transitionFromThinkingTimedOut() {
 
 void DialogUXStateAggregator::transitionFromListeningTimedOut() {
     ACSDK_DEBUG5(LX("transitionFromListeningTimedOut"));
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         ACSDK_DEBUG5(LX("transitionFromListeningTimedOutExecutor").d("m_currentState", m_currentState));
         if (DialogUXStateObserverInterface::DialogUXState::LISTENING == m_currentState) {
             ACSDK_DEBUG(LX("transitionFromListeningTimedOut"));
@@ -321,7 +321,7 @@ void DialogUXStateAggregator::transitionFromListeningTimedOut() {
 
 void DialogUXStateAggregator::tryEnterIdleStateOnTimer() {
     ACSDK_DEBUG5(LX("tryEnterIdleStateOnTimer"));
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         ACSDK_DEBUG5(LX("tryEnterIdleStateOnTimerExecutor")
                          .d("m_currentState", m_currentState)
                          .d("m_audioInputProcessorState", m_audioInputProcessorState)
diff --git a/AVSCommon/AVS/src/DirectiveRoutingRule.cpp b/AVSCommon/AVS/src/DirectiveRoutingRule.cpp
index 0b104c8ab1..1107417b5e 100644
--- a/AVSCommon/AVS/src/DirectiveRoutingRule.cpp
+++ b/AVSCommon/AVS/src/DirectiveRoutingRule.cpp
@@ -22,7 +22,7 @@ namespace avs {
 namespace directiveRoutingRule {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DirectiveRoutingRule");
+#define TAG "DirectiveRoutingRule"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/EditableMessageRequest.cpp b/AVSCommon/AVS/src/EditableMessageRequest.cpp
index de1fb00b3f..1065870772 100644
--- a/AVSCommon/AVS/src/EditableMessageRequest.cpp
+++ b/AVSCommon/AVS/src/EditableMessageRequest.cpp
@@ -23,7 +23,7 @@ namespace avs {
 using namespace avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("EditableMessageRequest");
+#define TAG "EditableMessageRequest"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/EventBuilder.cpp b/AVSCommon/AVS/src/EventBuilder.cpp
index dd5aaed250..4524d7c378 100644
--- a/AVSCommon/AVS/src/EventBuilder.cpp
+++ b/AVSCommon/AVS/src/EventBuilder.cpp
@@ -31,7 +31,7 @@ using namespace utils;
 using namespace avs::constants;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("EventBuilder");
+#define TAG "EventBuilder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/ExceptionEncounteredSender.cpp b/AVSCommon/AVS/src/ExceptionEncounteredSender.cpp
index 0806bdafa1..e5930aa582 100644
--- a/AVSCommon/AVS/src/ExceptionEncounteredSender.cpp
+++ b/AVSCommon/AVS/src/ExceptionEncounteredSender.cpp
@@ -32,7 +32,7 @@ using namespace rapidjson;
 using namespace alexaClientSDK::avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ExceptionEncountered");
+#define TAG "ExceptionEncountered"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/src/Initialization/SDKPrimitivesProvider.cpp b/AVSCommon/AVS/src/Initialization/SDKPrimitivesProvider.cpp
index bf0bc33db0..ef769e9966 100644
--- a/AVSCommon/AVS/src/Initialization/SDKPrimitivesProvider.cpp
+++ b/AVSCommon/AVS/src/Initialization/SDKPrimitivesProvider.cpp
@@ -23,7 +23,7 @@ namespace avs {
 namespace initialization {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SDKPrimitivesProvider");
+#define TAG "SDKPrimitivesProvider"
 
 std::shared_ptr<SDKPrimitivesProvider> SDKPrimitivesProvider::m_provider;
 std::mutex SDKPrimitivesProvider::m_mutex;
diff --git a/AVSCommon/AVS/src/MessageRequest.cpp b/AVSCommon/AVS/src/MessageRequest.cpp
index f1e89005eb..1afd2cc9f4 100644
--- a/AVSCommon/AVS/src/MessageRequest.cpp
+++ b/AVSCommon/AVS/src/MessageRequest.cpp
@@ -15,16 +15,30 @@
 
 #include "AVSCommon/AVS/MessageRequest.h"
 #include "AVSCommon/AVS/EditableMessageRequest.h"
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
 #include "AVSCommon/Utils/Logger/Logger.h"
 
 namespace alexaClientSDK {
 namespace avsCommon {
 namespace avs {
 
+using namespace avsCommon::utils::json::jsonUtils;
 using namespace sdkInterfaces;
 
+/// Event key.
+static const std::string EVENT{"event"};
+
+/// Header key.
+static const std::string EVENT_HEADER{"header"};
+
+/// Event header key for the namespace field.
+static const std::string EVENT_HEADER_NAMESPACE{"namespace"};
+
+/// Event header key for the name field.
+static const std::string EVENT_HEADER_NAME{"name"};
+
 /// String to identify log entries originating from this file.
-static const std::string TAG("MessageRequest");
+#define TAG "MessageRequest"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -110,7 +124,7 @@ std::string MessageRequest::getUriPathExtension() const {
 }
 
 int MessageRequest::attachmentReadersCount() const {
-    return m_readers.size();
+    return static_cast<int>(m_readers.size());
 }
 std::string MessageRequest::getStreamMetricName() const {
     return m_streamMetricName;
@@ -180,6 +194,48 @@ void MessageRequest::removeObserver(
     m_observers.erase(observer);
 }
 
+MessageRequest::EventHeaders MessageRequest::retrieveEventHeaders() const {
+    // This could be more efficient if parsed in the constructor. However, if this optimization is done in the future
+    // EditableMessageRequest will need to also refresh the cache, and thready safety for both classes would need to be
+    // re-evaluated.
+    rapidjson::Document document;
+    auto eventHeaders = MessageRequest::EventHeaders();
+
+    auto eventExists = parseJSON(this->getJsonContent(), &document);
+    if (!eventExists) {
+        ACSDK_ERROR(LX("retrieveEventHeadersFailed").d("reason", "Parsing error"));
+        return eventHeaders;
+    }
+
+    auto event = document.FindMember(EVENT);
+    if (event == document.MemberEnd()) {
+        ACSDK_ERROR(LX("retrieveEventHeadersFailed").d("reason", "No event found in json"));
+        return eventHeaders;
+    }
+
+    auto headers = event->value.FindMember(EVENT_HEADER);
+    if (headers == event->value.MemberEnd()) {
+        ACSDK_ERROR(LX("retrieveEventHeadersFailed").d("reason", "No event headers found"));
+        return eventHeaders;
+    }
+
+    auto field = headers->value.FindMember(EVENT_HEADER_NAMESPACE);
+    if (field != headers->value.MemberEnd() && field->value.IsString()) {
+        eventHeaders.eventNamespace = field->value.GetString();
+    } else {
+        ACSDK_ERROR(LX("retrieveEventHeadersFailed").d("reason", "No event namespace found"));
+    }
+
+    field = headers->value.FindMember(EVENT_HEADER_NAME);
+    if (field != headers->value.MemberEnd() && field->value.IsString()) {
+        eventHeaders.eventName = field->value.GetString();
+    } else {
+        ACSDK_ERROR(LX("retrieveEventHeadersFailed").d("reason", "No event name found"));
+    }
+
+    return eventHeaders;
+}
+
 const std::vector<std::pair<std::string, std::string>>& MessageRequest::getHeaders() const {
     return m_headers;
 }
diff --git a/AVSCommon/AVS/src/WaitableMessageRequest.cpp b/AVSCommon/AVS/src/WaitableMessageRequest.cpp
index 73ab9ab482..1d57488b6b 100644
--- a/AVSCommon/AVS/src/WaitableMessageRequest.cpp
+++ b/AVSCommon/AVS/src/WaitableMessageRequest.cpp
@@ -24,7 +24,7 @@ namespace avs {
 using namespace avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("WaitableMessageRequest");
+#define TAG "WaitableMessageRequest"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/AVS/test/Attachment/AttachmentReaderTest.cpp b/AVSCommon/AVS/test/Attachment/AttachmentReaderTest.cpp
index 59d447e6b4..ecb7d10a72 100644
--- a/AVSCommon/AVS/test/Attachment/AttachmentReaderTest.cpp
+++ b/AVSCommon/AVS/test/Attachment/AttachmentReaderTest.cpp
@@ -122,7 +122,7 @@ void AttachmentReaderTest::testMultipleReads(bool closeWriterBeforeReading) {
     std::vector<uint8_t> result(TEST_SDS_PARTIAL_READ_AMOUNT_IN_BYTES);
     auto readStatus = InProcessAttachmentReader::ReadStatus::OK;
 
-    int totalBytesRead = 0;
+    size_t totalBytesRead = 0;
     bool done = false;
     int iterations = 0;
     int iterationsMax = 10;
@@ -145,7 +145,7 @@ void AttachmentReaderTest::testMultipleReads(bool closeWriterBeforeReading) {
     // Not only was all the data read, but the reader remained open.
     ASSERT_NE(iterations, iterationsMax);
     ASSERT_EQ(readStatus, terminalStatus);
-    ASSERT_EQ(totalBytesRead, static_cast<ssize_t>(m_testPattern.size()));
+    ASSERT_EQ(totalBytesRead, m_testPattern.size());
 }
 
 void AttachmentReaderTest::readAndVerifyResult(
diff --git a/AVSCommon/AVS/test/Attachment/AttachmentWriterTest.cpp b/AVSCommon/AVS/test/Attachment/AttachmentWriterTest.cpp
index 64655407fa..6c432a6e28 100644
--- a/AVSCommon/AVS/test/Attachment/AttachmentWriterTest.cpp
+++ b/AVSCommon/AVS/test/Attachment/AttachmentWriterTest.cpp
@@ -89,7 +89,7 @@ void AttachmentWriterTest::testMultipleReads(bool closeWriterBeforeReading) {
     std::vector<uint8_t> result(TEST_SDS_PARTIAL_READ_AMOUNT_IN_BYTES);
     auto readStatus = InProcessAttachmentReader::ReadStatus::OK;
 
-    int totalBytesRead = 0;
+    size_t totalBytesRead = 0;
     bool done = false;
     int iterations = 0;
     int iterationsMax = 10;
@@ -111,7 +111,7 @@ void AttachmentWriterTest::testMultipleReads(bool closeWriterBeforeReading) {
 
     ASSERT_NE(iterations, iterationsMax);
     ASSERT_EQ(readStatus, terminalStatus);
-    ASSERT_EQ(totalBytesRead, static_cast<ssize_t>(m_testPattern.size()));
+    ASSERT_EQ(totalBytesRead, m_testPattern.size());
 }
 
 /**
diff --git a/AVSCommon/AVS/test/DialogUXStateAggregatorTest.cpp b/AVSCommon/AVS/test/DialogUXStateAggregatorTest.cpp
index 267c2ba555..08c0fb274c 100644
--- a/AVSCommon/AVS/test/DialogUXStateAggregatorTest.cpp
+++ b/AVSCommon/AVS/test/DialogUXStateAggregatorTest.cpp
@@ -25,6 +25,7 @@ namespace test {
 
 using namespace avsCommon::avs;
 using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::mediaPlayer;
 using namespace std;
 
 /// Long time out for observers to wait for the state change callback (we should not reach this).
@@ -40,7 +41,7 @@ static const auto SHORT_TIMEOUT = std::chrono::milliseconds(50);
 static const auto TRANSITION_TIMEOUT = std::chrono::milliseconds(300);
 
 /// Dummy value for a media player source id
-static const avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId TEST_SOURCE_ID = -1;
+static const MediaPlayerInterface::SourceId TEST_SOURCE_ID = static_cast<MediaPlayerInterface::SourceId>(-1);
 
 /// A test observer that mocks out the DialogUXStateObserverInterface##onDialogUXStateChanged() call.
 class TestObserver : public DialogUXStateObserverInterface {
diff --git a/AVSCommon/AVS/test/MessageRequestTest.cpp b/AVSCommon/AVS/test/MessageRequestTest.cpp
index 1f5ddd8ced..304fe9f796 100644
--- a/AVSCommon/AVS/test/MessageRequestTest.cpp
+++ b/AVSCommon/AVS/test/MessageRequestTest.cpp
@@ -22,11 +22,70 @@
 using namespace ::testing;
 
 namespace alexaClientSDK {
-
 namespace avsCommon {
 namespace avs {
 namespace test {
 
+/// Valid test event.
+// clang-format off
+static const std::string VALID_TEST_EVENT = R"({
+    "event": {
+        "header": {
+            "namespace": "test_namespace",
+            "name": "test_name",
+            "messageId": "test_messageId",
+            "dialogRequestId": "test_dialogRequestId"
+        },
+        "payload": {}
+    }
+})";
+// clang-format on
+
+/// Partially valid test event.
+// clang-format off
+static const std::string PARTIALLY_VALID_TEST_EVENT = R"({
+    "event": {
+        "header": {
+            "namespace": "test_namespace",
+            "messageId": "test_messageId",
+            "dialogRequestId": "test_dialogRequestId"
+        },
+        "payload": {}
+    }
+})";
+// clang-format on
+
+/// Incorrectly formatted test event.
+// clang-format off
+static const std::string INCORRECTLY_FORMATTED_TEST_EVENT = R"({
+    "event": {
+        "namespace": "test_namespace",
+        "messageId": "test_messageId",
+        "dialogRequestId": "test_dialogRequestId",
+        "payload": {}
+    }
+})";
+// clang-format on
+
+/// Invalid test event.
+// clang-format off
+static const std::string INVALID_TEST_EVENT = R"({
+    "event": {
+        "header": {
+            "messageId": "test_messageId",
+            "dialogRequestId": "test_dialogRequestId"
+        },
+        "payload": {}
+    }
+})";
+// clang-format on
+
+/// Test event namespace header value.
+static const std::string TEST_NAMESPACE = "test_namespace";
+
+/// Test event name header value.
+static const std::string TEST_NAME = "test_name";
+
 class MockAttachmentReader : public attachment::AttachmentReader {
 public:
     MOCK_METHOD4(
@@ -87,6 +146,42 @@ TEST_F(MessageRequestTest, test_extraHeaders) {
     EXPECT_EQ(expected, actual);
 }
 
+TEST_F(MessageRequestTest, test_eventHeaders) {
+    auto expectedEventHeaders = MessageRequest::EventHeaders(TEST_NAMESPACE, TEST_NAME);
+    MessageRequest messageRequest(VALID_TEST_EVENT, true, "", {});
+    auto actualEventHeaders = messageRequest.retrieveEventHeaders();
+
+    EXPECT_EQ(expectedEventHeaders.eventNamespace, actualEventHeaders.eventNamespace);
+    EXPECT_EQ(expectedEventHeaders.eventName, actualEventHeaders.eventName);
+}
+
+TEST_F(MessageRequestTest, test_partialEventHeaders) {
+    auto expectedEventHeaders = MessageRequest::EventHeaders(TEST_NAMESPACE, "");
+    MessageRequest messageRequest(PARTIALLY_VALID_TEST_EVENT, true, "", {});
+    auto actualEventHeaders = messageRequest.retrieveEventHeaders();
+
+    EXPECT_EQ(expectedEventHeaders.eventNamespace, actualEventHeaders.eventNamespace);
+    EXPECT_EQ(expectedEventHeaders.eventName, actualEventHeaders.eventName);
+}
+
+TEST_F(MessageRequestTest, test_incorrectlyFormattedEventHeaders) {
+    auto expectedEventHeaders = MessageRequest::EventHeaders();
+    MessageRequest messageRequest(INCORRECTLY_FORMATTED_TEST_EVENT, true, "", {});
+    auto actualEventHeaders = messageRequest.retrieveEventHeaders();
+
+    EXPECT_EQ(expectedEventHeaders.eventNamespace, actualEventHeaders.eventNamespace);
+    EXPECT_EQ(expectedEventHeaders.eventName, actualEventHeaders.eventName);
+}
+
+TEST_F(MessageRequestTest, test_emptyEventHeaders) {
+    auto expectedEventHeaders = MessageRequest::EventHeaders();
+    MessageRequest messageRequest(INVALID_TEST_EVENT, true, "", {});
+    auto actualEventHeaders = messageRequest.retrieveEventHeaders();
+
+    EXPECT_EQ(expectedEventHeaders.eventNamespace, actualEventHeaders.eventNamespace);
+    EXPECT_EQ(expectedEventHeaders.eventName, actualEventHeaders.eventName);
+}
+
 TEST_F(MessageRequestTest, test_isResolved) {
     MessageRequest resolvedReq("{}", true, "");
     EXPECT_TRUE(resolvedReq.isResolved());
diff --git a/AVSCommon/CMakeLists.txt b/AVSCommon/CMakeLists.txt
index 0ff9cb433b..9c5d181fbc 100644
--- a/AVSCommon/CMakeLists.txt
+++ b/AVSCommon/CMakeLists.txt
@@ -44,7 +44,6 @@ add_library(AVSCommon
     Utils/src/BluetoothEventBus.cpp
     Utils/src/Configuration/ConfigurationNode.cpp
     Utils/src/DeviceInfo.cpp
-    Utils/src/Executor.cpp
     Utils/src/FileUtils.cpp
     Utils/src/FormattedAudioStreamAdapter.cpp
     Utils/src/JSON/JSONGenerator.cpp
@@ -106,6 +105,9 @@ add_library(AVSCommon
     Utils/src/TaskThread.cpp
     Utils/src/ThreadPool.cpp
     Utils/src/Threading/ConditionVariableWrapper.cpp
+    Utils/src/Threading/ExecutorFactory.cpp
+    Utils/src/Threading/Executor.cpp
+    Utils/src/Threading/SharedExecutor.cpp
     Utils/src/TimePoint.cpp
     Utils/src/TimeUtils.cpp
     Utils/src/Timer.cpp
@@ -127,6 +129,8 @@ target_include_directories(AVSCommon PUBLIC
     "${MultipartParser_SOURCE_DIR}"
     ${CURL_INCLUDE_DIRS})
 
+target_include_directories(AVSCommon PRIVATE "${AVSCommon_SOURCE_DIR}/Utils/privateInclude")
+
 if (MSVC)
     target_include_directories(AVSCommon PUBLIC
             "${CMAKE_CURRENT_BINARY_DIR}/exports")
@@ -146,6 +150,7 @@ target_link_libraries(AVSCommon
     acsdkApplicationAudioPipelineFactoryInterfaces
     acsdkEqualizerInterfaces
     acsdkInteractionModelInterfaces
+    acsdkNotifierInterfaces
     )
 
 # install target
diff --git a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h
index 01191c80ce..519b8e8e8a 100644
--- a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h
+++ b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h
@@ -30,7 +30,8 @@ namespace sdkInterfaces {
  */
 class AlexaInterfaceMessageSenderInterface {
 public:
-    /// The type of error when calling sendErrorResponseEvent().
+    /// The type of error when calling sendErrorResponseEvent() with @c Alexa.ErrorResponse event.
+    /// https://developer.amazon.com/en-US/docs/alexa/device-apis/alexa-errorresponse.html
     enum class ErrorResponseType {
         /// The operation can't be performed because the endpoint is already in operation.
         ALREADY_IN_OPERATION,
@@ -96,6 +97,41 @@ class AlexaInterfaceMessageSenderInterface {
         VALUE_OUT_OF_RANGE
     };
 
+    /// The type of video error when calling sendErrorResponseEvent() with @c Alexa.Video.ErrorResponse event.
+    /// https://developer.amazon.com/en-US/docs/alexa/device-apis/alexa-video-errorresponse.html
+    enum class AlexaVideoErrorResponseType {
+        /// Indicates the content does not allow the action requested. For example, if the user tries to delete
+        /// a recording that is marked as not deletable.
+        ACTION_NOT_PERMITTED_FOR_CONTENT,
+
+        /// Indicates an additional confirmation must occur before the requested action can be completed.
+        CONFIRMATION_REQUIRED,
+
+        /// Indicates the record operation failed due to restrictions on the content.
+        CONTENT_NOT_RECORDABLE,
+
+        /// The user is not subscribed to the content for a channel or other subscription-based content.
+        NOT_SUBSCRIBED,
+
+        /// Indicates that a recording request failed because the recording already exists.
+        RECORDING_EXISTS,
+
+        /// Indicates that a recording request failed because the DVR storage is full.
+        STORAGE_FULL,
+
+        /// Indicates the title specified yielded multiple results, and disambiguation is required to determine
+        /// the program to record. This value should be used to indicate that the target device will provide a
+        /// mechanism for disambiguation. For example, this error could indicate that there are multiple airings
+        /// of a program or that the entity requested for recording has multiple programs associated with it.
+        TITLE_DISAMBIGUATION_REQUIRED,
+
+        /// Indicates that a recording request failed because of a scheduling conflict with another recording.
+        TUNER_OCCUPIED,
+
+        /// Indicates an invalid error type
+        NONE
+    };
+
     /**
      * Destructor.
      */
@@ -189,6 +225,15 @@ class AlexaInterfaceMessageSenderInterface {
         const std::string& correlationToken,
         const int estimatedDeferralInSeconds = 0) = 0;
 
+    /**
+     * Convert @c AlexaVideoErrorResponseType type to its corresponding string.  Note that any invalid
+     * @c AlexaVideoErrorResponseType will return an empty string.
+     *
+     * @param responseType the response type to convert.
+     * @return the corresponding string for video error response type
+     */
+    static std::string alexaVideoErrorResponseToString(AlexaVideoErrorResponseType responseType);
+
     /**
      * Convert an AlexaResponseType to its corresponding ErrorResponseType.  Note that any AlexaResponseType that does
      * not map to ErrorResponseType will return INTERNAL_ERROR.
@@ -199,6 +244,31 @@ class AlexaInterfaceMessageSenderInterface {
     static ErrorResponseType alexaResponseTypeToErrorType(const avsCommon::avs::AlexaResponseType responseType);
 };
 
+inline std::string AlexaInterfaceMessageSenderInterface::alexaVideoErrorResponseToString(
+    AlexaVideoErrorResponseType responseType) {
+    switch (responseType) {
+        case AlexaVideoErrorResponseType::ACTION_NOT_PERMITTED_FOR_CONTENT:
+            return "ACTION_NOT_PERMITTED_FOR_CONTENT";
+        case AlexaVideoErrorResponseType::CONFIRMATION_REQUIRED:
+            return "CONFIRMATION_REQUIRED";
+        case AlexaVideoErrorResponseType::CONTENT_NOT_RECORDABLE:
+            return "CONTENT_NOT_RECORDABLE";
+        case AlexaVideoErrorResponseType::NOT_SUBSCRIBED:
+            return "NOT_SUBSCRIBED";
+        case AlexaVideoErrorResponseType::RECORDING_EXISTS:
+            return "RECORDING_EXISTS";
+        case AlexaVideoErrorResponseType::STORAGE_FULL:
+            return "STORAGE_FULL";
+        case AlexaVideoErrorResponseType::TITLE_DISAMBIGUATION_REQUIRED:
+            return "TITLE_DISAMBIGUATION_REQUIRED";
+        case AlexaVideoErrorResponseType::TUNER_OCCUPIED:
+            return "TUNER_OCCUPIED";
+        case AlexaVideoErrorResponseType::NONE:
+            return "";
+    }
+    return "UNKNOWN";
+}
+
 inline AlexaInterfaceMessageSenderInterface::ErrorResponseType AlexaInterfaceMessageSenderInterface::
     alexaResponseTypeToErrorType(const avsCommon::avs::AlexaResponseType responseType) {
     switch (responseType) {
diff --git a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/AudioInputProcessorObserverInterface.h b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/AudioInputProcessorObserverInterface.h
index b99e176513..5b926f28ab 100644
--- a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/AudioInputProcessorObserverInterface.h
+++ b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/AudioInputProcessorObserverInterface.h
@@ -55,6 +55,14 @@ class AudioInputProcessorObserverInterface {
      */
     virtual void onStateChanged(State state) = 0;
 
+    /**
+     * This function is called when the active @c ASRProfile changes.
+     *
+     * @param profile The string representation of the active @c ASRProfile.
+     * Use the associated getASRProfile to retrieve the @c ASRProfile value.
+     */
+    virtual void onASRProfileChanged(const std::string& profile){};
+
     /**
      * This function converts the provided @c State to a string.
      *
diff --git a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceInterface.h b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceInterface.h
index 9d6297e9f4..96321071c6 100644
--- a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceInterface.h
+++ b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceInterface.h
@@ -209,6 +209,17 @@ class BluetoothDeviceInterface {
      */
     virtual std::future<bool> disconnect() = 0;
 
+    /**
+     * Sets the pairing pin for the current pairing attempt.  PIN length can range from 4 to 16
+     * alphanumeric characters, though most devices will only accept numeric characters in the PIN.
+     * Expected call flow is:
+     * pair() -> PIN request callback -> setPairingPin()
+     *
+     * @param pin BT pairing pin
+     * @return Indicates whether pairing pin was set.
+     */
+    virtual bool setPairingPin(const std::string& pin) = 0;
+
     /// @return The Bluetooth Services that this device supports.
     virtual std::vector<std::shared_ptr<services::SDPRecordInterface>> getSupportedServices() = 0;
 
diff --git a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/Bluetooth/Services/BluetoothServiceInterface.h b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/Bluetooth/Services/BluetoothServiceInterface.h
index d5cad86798..fe3db20de6 100644
--- a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/Bluetooth/Services/BluetoothServiceInterface.h
+++ b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/Bluetooth/Services/BluetoothServiceInterface.h
@@ -28,8 +28,8 @@ namespace services {
 
 /**
  * Interface representing a Bluetooth Service.
- * More Bluetooth Service information(e.g, UUID, NAME) could be found at
- * https://www.bluetooth.com/specifications/assigned-numbers/service-discovery/
+ * More Bluetooth Service information(e.g, UUID, NAME) could be found in the service discovery section at
+ * https://www.bluetooth.com/specifications/assigned-numbers/
  */
 class BluetoothServiceInterface {
 public:
diff --git a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/CallStateObserverInterface.h b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/CallStateObserverInterface.h
index bea7e4e067..f4a0c43d97 100644
--- a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/CallStateObserverInterface.h
+++ b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/CallStateObserverInterface.h
@@ -59,6 +59,10 @@ class CallStateObserverInterface {
         std::string inboundCalleeName;
         /// Textual description of exact call provider type.
         std::string callProviderType;
+        /// Call provider image url.
+        /// This image url may be null. For the case the provider image is not provided by url,
+        /// the application should have local image to display instead of downloading from this url.
+        std::string callProviderImageUrl;
         /// Inbound ringtone url.
         std::string inboundRingtoneUrl;
         /// Outbound ringtone url.
diff --git a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/GUIActivityEvent.h b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/GUIActivityEvent.h
new file mode 100644
index 0000000000..da674c736c
--- /dev/null
+++ b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/GUIActivityEvent.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVSCOMMON_SDKINTERFACES_INCLUDE_AVSCOMMON_SDKINTERFACES_GUIACTIVITYEVENT_H_
+#define ALEXA_CLIENT_SDK_AVSCOMMON_SDKINTERFACES_INCLUDE_AVSCOMMON_SDKINTERFACES_GUIACTIVITYEVENT_H_
+
+#include <memory>
+#include <string>
+
+namespace alexaClientSDK {
+namespace avsCommon {
+namespace sdkInterfaces {
+
+/// Enumeration of activity events used to indicate the state of a GUI
+enum class GUIActivityEvent {
+    /// GUI switched to active state (audio/video started).
+    ACTIVATED,
+
+    /// GUI become inactive.
+    DEACTIVATED,
+
+    /// Interrupt event (touch/scroll/etc).
+    INTERRUPT,
+
+    /// Guard option for unknown received state.
+    UNKNOWN
+};
+
+/**
+ * This function converts the provided string to an @c GUIActivityEvent.
+ *
+ * @param string The string to convert to @c GUIActivityEvent.
+ * @return The @c GUIActivityEvent.
+ */
+inline GUIActivityEvent guiActivityEventFromString(const std::string& string) {
+    if ("ACTIVATED" == string) {
+        return GUIActivityEvent::ACTIVATED;
+    } else if ("DEACTIVATED" == string) {
+        return GUIActivityEvent::DEACTIVATED;
+    } else if ("INTERRUPT" == string) {
+        return GUIActivityEvent::INTERRUPT;
+    } else {
+        return GUIActivityEvent::UNKNOWN;
+    }
+}
+
+/**
+ * This function converts a GUIActivityEvent to a string.
+ *
+ * @param event the GUIActivityEvent to be converted.
+ * @return the string representation of the GUIActivityEvent.
+ */
+inline std::string guiActivityEventToString(GUIActivityEvent event) {
+    switch (event) {
+        case GUIActivityEvent::ACTIVATED:
+            return "ACTIVATED";
+        case GUIActivityEvent::DEACTIVATED:
+            return "DEACTIVATED";
+        case GUIActivityEvent::INTERRUPT:
+            return "INTERRUPT";
+        case GUIActivityEvent::UNKNOWN:
+            return "UNKNOWN";
+    }
+    return "UNKNOWN";
+}
+
+/**
+ * Write an @c GUIActivityEvent value to an @c ostream as a string.
+ *
+ * @param stream The stream to write the value to.
+ * @param state The @c GUIActivityEvent value.
+ * @return The @c ostream that was passed in and written to.
+ */
+inline std::ostream& operator<<(std::ostream& stream, const GUIActivityEvent& activityEvent) {
+    return stream << guiActivityEventToString(activityEvent);
+}
+
+}  // namespace sdkInterfaces
+}  // namespace avsCommon
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVSCOMMON_SDKINTERFACES_INCLUDE_AVSCOMMON_SDKINTERFACES_GUIACTIVITYEVENT_H_
\ No newline at end of file
diff --git a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/GUIActivityEventObserverInterface.h b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/GUIActivityEventObserverInterface.h
new file mode 100644
index 0000000000..a18231952a
--- /dev/null
+++ b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/GUIActivityEventObserverInterface.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVSCOMMON_SDKINTERFACES_INCLUDE_AVSCOMMON_SDKINTERFACES_GUIACTIVITYEVENTOBSERVERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_AVSCOMMON_SDKINTERFACES_INCLUDE_AVSCOMMON_SDKINTERFACES_GUIACTIVITYEVENTOBSERVERINTERFACE_H_
+
+#include "GUIActivityEvent.h"
+
+namespace alexaClientSDK {
+namespace avsCommon {
+namespace sdkInterfaces {
+
+/**
+ * Observer interface for @c GUIActivityEvent
+ */
+class GUIActivityEventObserverInterface {
+public:
+    virtual ~GUIActivityEventObserverInterface() = default;
+
+    /**
+     * Observer method to be notified of activity event
+     * @param source The source of the activity event.
+     * @param event The activity event.
+     */
+    virtual void onGUIActivityEventReceived(const std::string& source, const GUIActivityEvent& activityEvent) = 0;
+};
+
+}  // namespace sdkInterfaces
+}  // namespace avsCommon
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVSCOMMON_SDKINTERFACES_INCLUDE_AVSCOMMON_SDKINTERFACES_GUIACTIVITYEVENTOBSERVERINTERFACE_H_
diff --git a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/PostConnectOperationInterface.h b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/PostConnectOperationInterface.h
index 9fd4e34536..4a3cc855c2 100644
--- a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/PostConnectOperationInterface.h
+++ b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/PostConnectOperationInterface.h
@@ -46,15 +46,16 @@ class PostConnectOperationInterface {
     /**
      * Returns the operation priority. The Priority is used to order the sequence of operations in ascending order.
      *
-     * @return unsigined int that representing the operation priority.
+     * @return unsigned int that representing the operation priority.
      */
     virtual unsigned int getOperationPriority() = 0;
 
     /**
-     * Performs the post connect operation. The implementation should ensure that the performOperation returns
-     * immediately after the abortOperation() method is called.
+     * Performs the post connect operation. The implementation should ensure that the #performOperation() returns
+     * immediately after the #abortOperation() method is called. If #abortOperation() is called before
+     * #performOperation(), the method must immediately return with false result.
      *
-     * @note: The performOperation() method is not expected to be called twice.
+     * @note This method is not expected to be called twice.
      *
      * @param messageSender - The @c MessageSenderInterface to send post connect message.
      * @return True if the post connect operation is successful, else false.
@@ -65,7 +66,8 @@ class PostConnectOperationInterface {
     /**
      * Aborts an operation that is currently being executed using the performOperation() method.
      *
-     * Note: This method will be called from a different thread from where the performOperation() is being called from.
+     * @note This method will be called from a different thread from where the performOperation() is being called from.
+     *       It is possible, that the method is called before #performOperation() call is made.
      */
     virtual void abortOperation() = 0;
 };
diff --git a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/SpeakerManagerInterface.h b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/SpeakerManagerInterface.h
index 60f097547c..72265233de 100644
--- a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/SpeakerManagerInterface.h
+++ b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/SpeakerManagerInterface.h
@@ -76,6 +76,25 @@ class SpeakerManagerInterface {
         int8_t volume,
         const NotificationProperties& properties) = 0;
 
+    /**
+     * Handle an external volume/mute state event in the system and update the settings.
+     *
+     * A volume could be changed either using SpeakerManager instance or using any other component
+     * which support volume change. In the case, volume on the device is being updated by some
+     * other component, this interface could be used to update the speaker settings of the
+     * associated @c ChannelVolumeInterface. This interface does not modify/change the volume
+     * or mute. It should be used to update speaker settings within SpeakerManager and notify
+     * AVS/observers if required of this change.
+     *
+     * @param type The type of @c ChannelVolumeInterface to retrieve settings for.
+     * @param speakerSettings New updated value. Values must be between [0,100]
+     * @param properties Notification properties that specify how the volume change will be notified.
+     */
+    virtual void onExternalSpeakerSettingsUpdate(
+        ChannelVolumeInterface::Type type,
+        const SpeakerInterface::SpeakerSettings& speakerSettings,
+        const NotificationProperties& properties){};
+
     /**
      * Adjusts the volume for ChannelVolumeInterfaces of a certain @c Type with a volume delta.
      *
diff --git a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/SpeechInteractionHandlerInterface.h b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/SpeechInteractionHandlerInterface.h
index 830eadc351..d4e85c69eb 100644
--- a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/SpeechInteractionHandlerInterface.h
+++ b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/SpeechInteractionHandlerInterface.h
@@ -21,6 +21,7 @@
 #include <memory>
 #include <string>
 
+#include <AIP/AudioInputProcessor.h>
 #include <AIP/AudioProvider.h>
 #include <AVSCommon/AVS/AudioInputStream.h>
 
diff --git a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/TemplateRuntimeObserverInterface.h b/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/TemplateRuntimeObserverInterface.h
deleted file mode 100644
index d3914a2536..0000000000
--- a/AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/TemplateRuntimeObserverInterface.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_AVSCOMMON_SDKINTERFACES_INCLUDE_AVSCOMMON_SDKINTERFACES_TEMPLATERUNTIMEOBSERVERINTERFACE_H_
-#define ALEXA_CLIENT_SDK_AVSCOMMON_SDKINTERFACES_INCLUDE_AVSCOMMON_SDKINTERFACES_TEMPLATERUNTIMEOBSERVERINTERFACE_H_
-
-#include <chrono>
-#include <string>
-
-#include "AVSCommon/AVS/FocusState.h"
-#include <AVSCommon/AVS/PlayerActivity.h>
-
-namespace alexaClientSDK {
-namespace avsCommon {
-namespace sdkInterfaces {
-
-/**
- * This @c TemplateRuntimeObserverInterface class is used to notify observers when a @c RenderTemplate or
- * @c RenderPlayerInfo directive is received.  These two directives contains metadata for rendering display
- * cards for devices with GUI support.
- */
-class TemplateRuntimeObserverInterface {
-public:
-    /**
-     * The @c AudioPlayerInfo contains information that is useful for rendering a PlayerInfo display card.
-     * @c AudioPlayerInfo is passed to the observers as a parameter in the @c renderPlayerInfoCard callback.
-     */
-    struct AudioPlayerInfo {
-        /**
-         * Default constructor.
-         */
-        AudioPlayerInfo() :
-                audioPlayerState{avsCommon::avs::PlayerActivity::IDLE},
-                offset{std::chrono::milliseconds::zero()} {};
-
-        /**
-         * The state of the @c AudioPlayer.  This information is useful for implementing the progress bar
-         * in the display card.  It is assumed that the client is responsible for progressing the progress bar
-         * when the @c AudioPlayer is in PLAYING state.
-         */
-        avsCommon::avs::PlayerActivity audioPlayerState;
-
-        /**
-         * The offset in millisecond of the media that @c AudioPlayer is handling.  This information is
-         * useful for implementation of the progress bar.
-         */
-        std::chrono::milliseconds offset;
-    };
-
-    /**
-     * Destructor
-     */
-    virtual ~TemplateRuntimeObserverInterface() = default;
-
-    /**
-     * Used to notify the observer when a RenderTemplate directive is received. Once called, the client should
-     * render the Template display card based on the metadata provided in the payload in structured JSON format.
-     *
-     * @note The payload may contain customer sensitive information and should be used with utmost care.
-     * Failure to do so may result in exposing or mishandling of customer data.
-     *
-     * @param jsonPayload The payload of the RenderTemplate directive in structured JSON format.
-     * @param focusState The @c FocusState of the channel used by TemplateRuntime interface.
-     */
-    virtual void renderTemplateCard(const std::string& jsonPayload, avsCommon::avs::FocusState focusState) = 0;
-
-    /**
-     * Used to notify the observer when the client should clear the Template display card.  Once the card is cleared,
-     * the client should call templateCardCleared().
-     */
-    virtual void clearTemplateCard() = 0;
-
-    /**
-     * Used to notify the observer when a RenderPlayerInfo directive is received. Once called, the client should
-     * render the PlayerInfo display card based on the metadata provided in the payload in structured JSON
-     * format.
-     *
-     * @param jsonPayload The payload of the RenderPlayerInfo directive in structured JSON format.
-     * @param audioPlayerInfo Information on the @c AudioPlayer.
-     * @param focusState The @c FocusState of the channel used by TemplateRuntime interface.
-     */
-    virtual void renderPlayerInfoCard(
-        const std::string& jsonPayload,
-        TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo,
-        avsCommon::avs::FocusState focusState) = 0;
-
-    /**
-     * Used to notify the observer when the client should clear the PlayerInfo display card.  Once the card is cleared,
-     * the client should call templateCardCleared().
-     */
-    virtual void clearPlayerInfoCard() = 0;
-};
-
-}  // namespace sdkInterfaces
-}  // namespace avsCommon
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_AVSCOMMON_SDKINTERFACES_INCLUDE_AVSCOMMON_SDKINTERFACES_TEMPLATERUNTIMEOBSERVERINTERFACE_H_
diff --git a/AVSCommon/SDKInterfaces/test/AVSCommon/SDKInterfaces/Bluetooth/MockBluetoothDevice.h b/AVSCommon/SDKInterfaces/test/AVSCommon/SDKInterfaces/Bluetooth/MockBluetoothDevice.h
index b9be92e81f..e7b1d0a337 100644
--- a/AVSCommon/SDKInterfaces/test/AVSCommon/SDKInterfaces/Bluetooth/MockBluetoothDevice.h
+++ b/AVSCommon/SDKInterfaces/test/AVSCommon/SDKInterfaces/Bluetooth/MockBluetoothDevice.h
@@ -30,6 +30,10 @@ namespace bluetooth {
 namespace test {
 
 using namespace ::testing;
+
+static constexpr std::size_t PAIRING_PIN_LENGTH_MIN = 4;
+static constexpr std::size_t PAIRING_PIN_LENGTH_MAX = 16;
+
 /**
  * Mock class that implements BluetoothDeviceInterface.
  * Please note that MockBluetoothDevice doesn't support sending any @c BluetoothEvent to @c BluetoothEventBus,
@@ -47,6 +51,7 @@ class MockBluetoothDevice : public BluetoothDeviceInterface {
     bool isConnected() override;
     std::future<bool> connect() override;
     std::future<bool> disconnect() override;
+    bool setPairingPin(const std::string& pin) override;
     std::vector<std::shared_ptr<services::SDPRecordInterface>> getSupportedServices() override;
     std::shared_ptr<services::BluetoothServiceInterface> getService(std::string uuid) override;
     utils::bluetooth::MediaStreamingState getStreamingState() override;
@@ -132,6 +137,13 @@ inline std::future<bool> MockBluetoothDevice::disconnect() {
     return connectionPromise.get_future();
 }
 
+inline bool MockBluetoothDevice::setPairingPin(const std::string& pin) {
+    if (pin.length() < PAIRING_PIN_LENGTH_MIN || pin.length() > PAIRING_PIN_LENGTH_MAX) {
+        return false;
+    }
+    return true;
+}
+
 inline std::vector<std::shared_ptr<services::SDPRecordInterface>> MockBluetoothDevice::getSupportedServices() {
     std::vector<std::shared_ptr<services::SDPRecordInterface>> services;
     for (auto service : m_supportedServices) {
diff --git a/AVSCommon/SDKInterfaces/test/AVSCommon/SDKInterfaces/Endpoints/MockEndpointBuilder.h b/AVSCommon/SDKInterfaces/test/AVSCommon/SDKInterfaces/Endpoints/MockEndpointBuilder.h
index e5db640773..cf5328c1d4 100644
--- a/AVSCommon/SDKInterfaces/test/AVSCommon/SDKInterfaces/Endpoints/MockEndpointBuilder.h
+++ b/AVSCommon/SDKInterfaces/test/AVSCommon/SDKInterfaces/Endpoints/MockEndpointBuilder.h
@@ -32,6 +32,7 @@ class MockEndpointBuilder : public EndpointBuilderInterface {
     /// @name @c EndpointBuilderInterface methods to be mocked.
     /// @{
     MOCK_METHOD1(withDerivedEndpointId, EndpointBuilderInterface&(const std::string& suffix));
+    MOCK_METHOD0(withDeviceRegistration, EndpointBuilderInterface&());
     MOCK_METHOD1(withEndpointId, EndpointBuilderInterface&(const EndpointIdentifier& endpointId));
     MOCK_METHOD1(withFriendlyName, EndpointBuilderInterface&(const std::string& friendlyName));
     MOCK_METHOD1(withDescription, EndpointBuilderInterface&(const std::string& description));
@@ -50,7 +51,61 @@ class MockEndpointBuilder : public EndpointBuilderInterface {
         withConnections,
         EndpointBuilderInterface&(const std::vector<std::map<std::string, std::string>>& connections));
     MOCK_METHOD1(withCookies, EndpointBuilderInterface&(const std::map<std::string, std::string>& cookies));
-    MOCK_METHOD0(build, utils::Optional<EndpointIdentifier>());
+    MOCK_METHOD3(
+        withPowerController,
+        EndpointBuilderInterface&(
+            std::shared_ptr<avsCommon::sdkInterfaces::powerController::PowerControllerInterface> powerController,
+            bool isProactivelyReported,
+            bool isRetrievable));
+    MOCK_METHOD6(
+        withToggleController,
+        EndpointBuilderInterface&(
+            std::shared_ptr<avsCommon::sdkInterfaces::toggleController::ToggleControllerInterface> toggleController,
+            const std::string& instance,
+            const avsCommon::sdkInterfaces::toggleController::ToggleControllerAttributes& toggleControllerAttributes,
+            bool isProactivelyReported,
+            bool isRetrievable,
+            bool isNonControllable));
+    MOCK_METHOD6(
+        withModeController,
+        EndpointBuilderInterface&(
+            std::shared_ptr<avsCommon::sdkInterfaces::modeController::ModeControllerInterface> modeController,
+            const std::string& instance,
+            const avsCommon::sdkInterfaces::modeController::ModeControllerAttributes& modeControllerAttributes,
+            bool isProactivelyReported,
+            bool isRetrievable,
+            bool isNonControllable));
+    MOCK_METHOD6(
+        withRangeController,
+        EndpointBuilderInterface&(
+            std::shared_ptr<avsCommon::sdkInterfaces::rangeController::RangeControllerInterface> rangeController,
+            const std::string& instance,
+            const avsCommon::sdkInterfaces::rangeController::RangeControllerAttributes& rangeControllerAttributes,
+            bool isProactivelyReported,
+            bool isRetrievable,
+            bool isNonControllable));
+    MOCK_METHOD1(
+        withEndpointCapabilitiesBuilder,
+        EndpointBuilderInterface&(
+            const std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesBuilderInterface>&));
+    MOCK_METHOD0(build, std::unique_ptr<EndpointInterface>());
+    /// @}
+    /// @name @c EndpointCapabilitiesRegistrarInterface methods to be mocked.
+    /// @{
+    MOCK_METHOD2(
+        withCapability,
+        EndpointCapabilitiesRegistrarInterface&(
+            const avs::CapabilityConfiguration& configuration,
+            std::shared_ptr<DirectiveHandlerInterface> directiveHandler));
+    MOCK_METHOD2(
+        withCapability,
+        EndpointCapabilitiesRegistrarInterface&(
+            const std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface>& configurationInterface,
+            std::shared_ptr<DirectiveHandlerInterface> directiveHandler));
+    MOCK_METHOD1(
+        withCapabilityConfiguration,
+        EndpointCapabilitiesRegistrarInterface&(
+            const std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface>& configurationInterface));
     /// @}
 };
 
diff --git a/AVSCommon/SDKInterfaces/test/AVSCommon/SDKInterfaces/MockSpeakerManager.h b/AVSCommon/SDKInterfaces/test/AVSCommon/SDKInterfaces/MockSpeakerManager.h
index bdc1df2421..95bc739d2d 100644
--- a/AVSCommon/SDKInterfaces/test/AVSCommon/SDKInterfaces/MockSpeakerManager.h
+++ b/AVSCommon/SDKInterfaces/test/AVSCommon/SDKInterfaces/MockSpeakerManager.h
@@ -34,6 +34,13 @@ class MockSpeakerManager : public SpeakerManagerInterface {
             int8_t volume,
             const avsCommon::sdkInterfaces::SpeakerManagerInterface::NotificationProperties& properties));
 
+    MOCK_METHOD3(
+        onExternalSpeakerSettingsUpdate,
+        void(
+            avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
+            const avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings& speakerSettings,
+            const avsCommon::sdkInterfaces::SpeakerManagerInterface::NotificationProperties& properties));
+
     MOCK_METHOD3(
         adjustVolume,
         std::future<bool>(
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Configuration/ConfigurationNode.h b/AVSCommon/Utils/include/AVSCommon/Utils/Configuration/ConfigurationNode.h
index cf57d30013..73b1d9a5bd 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Configuration/ConfigurationNode.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Configuration/ConfigurationNode.h
@@ -194,6 +194,15 @@ class ConfigurationNode {
      */
     ConfigurationNode operator[](const std::string& key) const;
 
+    /**
+     * Get @c ConfigurationNode value for @c key from this @c ConfigurationNode.
+     *
+     * @param key The key of the @c ConfigurationNode value to get.
+     * @return The @c ConfigurationNode value, or an empty node if this @c ConfigurationNode does not have
+     * a @c ConfigurationNode value for @c key.
+     */
+    ConfigurationNode getChildNode(const char* key) const;
+
     /**
      * operator bool(). Indicates of the @c ConfigurationNode references a valid object.
      *
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Error/FinallyGuard.h b/AVSCommon/Utils/include/AVSCommon/Utils/Error/FinallyGuard.h
index d65c4076e3..8d4357d9de 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Error/FinallyGuard.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Error/FinallyGuard.h
@@ -51,6 +51,13 @@ class FinallyGuard {
      */
     FinallyGuard(const std::function<void()>& finallyFunction);
 
+    /**
+     * Constructor.
+     *
+     * @param finallyFunction The function to be executed when the object goes out of scope.
+     */
+    FinallyGuard(const std::function<void()>&& finallyFunction);
+
     /**
      * Destructor. Runs @c m_function during destruction.
      */
@@ -64,6 +71,10 @@ class FinallyGuard {
 inline FinallyGuard::FinallyGuard(const std::function<void()>& finallyFunction) : m_function{finallyFunction} {
 }
 
+inline FinallyGuard::FinallyGuard(const std::function<void()>&& finallyFunction) :
+        m_function{std::move(finallyFunction)} {
+}
+
 inline FinallyGuard::~FinallyGuard() {
     if (m_function) {
         m_function();
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/JSON/JSONGenerator.h b/AVSCommon/Utils/include/AVSCommon/Utils/JSON/JSONGenerator.h
index 644a8499c4..8533842e76 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/JSON/JSONGenerator.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/JSON/JSONGenerator.h
@@ -210,7 +210,8 @@ class JsonGenerator {
 
 template <typename CollectionT, typename ValueT>
 bool JsonGenerator::addStringArray(const std::string& key, const CollectionT& collection) {
-    if (!checkWriter() || !m_writer.Key(key.c_str(), key.length())) {
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    if (!checkWriter() || !m_writer.Key(key.c_str(), keyLength)) {
         return false;
     }
     m_writer.StartArray();
@@ -224,7 +225,8 @@ bool JsonGenerator::addStringArray(const std::string& key, const CollectionT& co
 
 template <typename CollectionT, typename ValueT>
 bool JsonGenerator::addMembersArray(const std::string& key, const CollectionT& collection) {
-    if (!checkWriter() || !m_writer.Key(key.c_str(), key.length())) {
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    if (!checkWriter() || !m_writer.Key(key.c_str(), keyLength)) {
         return false;
     }
     m_writer.StartArray();
@@ -238,7 +240,8 @@ bool JsonGenerator::addMembersArray(const std::string& key, const CollectionT& c
 
 template <typename CollectionArrayT, typename CollectionValueT, typename ValueT>
 bool JsonGenerator::addCollectionOfStringArray(const std::string& key, const CollectionArrayT& collection) {
-    if (!checkWriter() || !m_writer.Key(key.c_str(), key.length())) {
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    if (!checkWriter() || !m_writer.Key(key.c_str(), keyLength)) {
         return false;
     }
     m_writer.StartArray();
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/LibcurlUtils/CurlMultiHandleWrapper.h b/AVSCommon/Utils/include/AVSCommon/Utils/LibcurlUtils/CurlMultiHandleWrapper.h
index ecaa3632d1..3d8a277213 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/LibcurlUtils/CurlMultiHandleWrapper.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/LibcurlUtils/CurlMultiHandleWrapper.h
@@ -80,13 +80,29 @@ class CurlMultiHandleWrapper {
     CURLMcode perform(int* runningHandles);
 
     /**
-     * Wait for actions to perform on the @c libcurl @c handles added to this @c libcurl @c multi @c handle.
+     * Poll for actions to perform on the @c libcurl @c handles added to this @c libcurl @c multi @c handle.  This can
+     * waken up by the @c wakeup() call.
+     *
+     * @note For Libcurl v7.68.0 or higher, this function will call curl_multi_poll(), this allows the polling thread to
+     * be woken up by the @c wakeup() call.  Otherwise for Libcurl v7.67.0 or lower, it will call curl_multi_wait() and
+     * the call to @c wakeup() will do nothing.
+     *
      *
      * @param timeout How long to wait for actions to perform.
      * @param[out] countHandlesUpdated The number of handles for which actions are ready to be performed.
      * @return @c libcurl code indicating the result of this operation.
      */
-    CURLMcode wait(std::chrono::milliseconds timeout, int* countHandlesUpdated);
+    CURLMcode poll(std::chrono::milliseconds timeout, int* countHandlesUpdated);
+
+    /**
+     * This function can be called from any thread to wake up a sleeping @c poll().
+     *
+     * @note For Libcurl v7.68.0 or higher, this function will call curl_multi_wakeup().  Otherwise, this is a no-op
+     * operation.
+     *
+     * @return @c true if the call succeeded, or @c false otherwise.
+     */
+    bool wakeup();
 
     /**
      * Receive the next messages about the @c libcurl @c handles added to this @c libcurl @c multi @c handle.
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/LibcurlUtils/LibcurlHTTP2Connection.h b/AVSCommon/Utils/include/AVSCommon/Utils/LibcurlUtils/LibcurlHTTP2Connection.h
index 570025f4b9..b84e090b95 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/LibcurlUtils/LibcurlHTTP2Connection.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/LibcurlUtils/LibcurlHTTP2Connection.h
@@ -69,7 +69,10 @@ class LibcurlHTTP2Connection : public avsCommon::utils::http2::HTTP2ConnectionIn
     LibcurlHTTP2Connection(
         const std::shared_ptr<LibcurlSetCurlOptionsCallbackInterface>& setCurlOptionsCallback = nullptr);
 
-private:
+    /**
+     * Alias for c++ ordered map where key is curl handle and value is pointer to LibcurlHTTP2Request.
+     */
+    using ActiveStreamMap = std::map<CURL*, std::shared_ptr<LibcurlHTTP2Request>>;
     /**
      * Adds a configured stream into this connection.
      * @param stream Request object with a configured curl handle.
@@ -86,10 +89,10 @@ class LibcurlHTTP2Connection : public avsCommon::utils::http2::HTTP2ConnectionIn
 
     /** Release a stream.
      *
-     * @param stream The stream to release.
+     * @param[in,out] iterator The iterator to ActiveStreamMap to erase.
      * @return Whether the operation was successful.
      */
-    bool releaseStream(LibcurlHTTP2Request& stream);
+    bool releaseStream(ActiveStreamMap::iterator& iterator);
 
     /**
      * Main network loop. Repeatedly call curl_multi_perform in order to transfer data on the incorporated streams.
@@ -134,10 +137,10 @@ class LibcurlHTTP2Connection : public avsCommon::utils::http2::HTTP2ConnectionIn
     /**
      * Cancel an active stream and report CANCELLED completion status.
      *
-     * @param stream The stream to cancel.
+     * @param[in,out] iterator The iterator to ActiveStreamMap to erase.
      * @return Whether the operation was successful.
      */
-    bool cancelActiveStream(LibcurlHTTP2Request& stream);
+    bool cancelActiveStream(ActiveStreamMap::iterator& iterator);
 
     /**
      * Release any active streams and report CANCELLED completion status.
@@ -174,8 +177,8 @@ class LibcurlHTTP2Connection : public avsCommon::utils::http2::HTTP2ConnectionIn
     /// Main thread for this class.
     std::thread m_networkThread;
 
-    /// Represents a CURL multi handle.  Intended to only be accessed by the network loop thread.
-    std::unique_ptr<avsCommon::utils::libcurlUtils::CurlMultiHandleWrapper> m_multi;
+    /// Represents a CURL multi handle.  Intended to only be accessed by the network loop thread and in @c addStream.
+    std::shared_ptr<avsCommon::utils::libcurlUtils::CurlMultiHandleWrapper> m_multi;
 
     /// Serializes concurrent access to the m_requestQueue and m_isStopping members.
     std::mutex m_mutex;
@@ -186,7 +189,7 @@ class LibcurlHTTP2Connection : public avsCommon::utils::http2::HTTP2ConnectionIn
 
     /// The list of streams that either do not have HTTP response headers, or have outstanding response data.
     /// Only accessed from the network loop thread.
-    std::map<CURL*, std::shared_ptr<LibcurlHTTP2Request>> m_activeStreams;
+    ActiveStreamMap m_activeStreams;
 
     /// Queue of requests send. Serialized by @c m_mutex.
     std::deque<std::shared_ptr<LibcurlHTTP2Request>> m_requestQueue;
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Logger/LogEntry.h b/AVSCommon/Utils/include/AVSCommon/Utils/Logger/LogEntry.h
index 93316ca196..7645b03e84 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Logger/LogEntry.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Logger/LogEntry.h
@@ -17,6 +17,7 @@
 #define ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_LOGGER_LOGENTRY_H_
 
 #include <algorithm>
+#include <cctype>
 #include <functional>
 #include <sstream>
 #include <string>
@@ -34,24 +35,36 @@ class LogEntry {
     /**
      * Constructor.
      *
-     * @param source The name of the source of this log entry.
-     * @param event The name of the event that this log entry describes.
+     * @param[in] source The name of the source of this log entry. If @a source is nullptr, it is treated as an empty
+     *                   string.
+     * @param[in] event  The name of the event that this log entry describes. If @a event is nullptr, it is treated as
+     *                   an empty string.
+     */
+    LogEntry(const char* source, const char* event);
+
+    /**
+     * Constructor.
+     *
+     * @param[in] source The name of the source of this log entry.
+     * @param[in] event  The name of the event that this log entry describes. If @a event is nullptr, it is treated as
+     *                   an empty string.
      */
     LogEntry(const std::string& source, const char* event);
 
     /**
      * Constructor.
      *
-     * @param source The name of the source of this log entry.
-     * @param event The name of the event that this log entry describes.
+     * @param[in] source The name of the source of this log entry.
+     * @param[in] event  The name of the event that this log entry describes.
      */
     LogEntry(const std::string& source, const std::string& event);
 
     /**
      * Add a @c key, @c value pair to the metadata of this log entry.
      *
-     * @param key The key identifying the value to add to this LogEntry.
-     * @param value The value to add to this LogEntry.
+     * @param[in] key   The key identifying the value to add to this LogEntry.
+     * @param[in] value The value to add to this LogEntry.
+     *
      * @return This instance to facilitate adding more information to this log entry.
      */
     template <typename ValueType>
@@ -59,17 +72,30 @@ class LogEntry {
 
     /**
      * Add a @c key, @c value pair to the metadata of this log entry.
-     * @param key The key identifying the value to add to this LogEntry.
-     * @param value The value to add to this LogEntry.
+     *
+     * @param[in] key   The key identifying the value to add to this LogEntry.
+     * @param[in] value The value to add to this LogEntry. If @a value is nullptr, it is treated as an empty string.
+     *
      * @return This instance to facilitate adding more information to this log entry.
      */
     LogEntry& d(const char* key, const char* value);
 
+    /**
+     * Add a @c key, @c value pair to the metadata of this log entry.
+     *
+     * @param[in] key   The key identifying the value to add to this LogEntry.
+     * @param[in] value The value to add to this LogEntry. If @a value is nullptr, it is treated as an empty string.
+     *
+     * @return This instance to facilitate adding more information to this log entry.
+     */
+    LogEntry& d(const char* key, char* value);
+
     /**
      * Add data (hence the name 'd') in the form of a @c key, @c value pair to the metadata of this log entry.
      *
-     * @param key The key identifying the value to add to this LogEntry.
-     * @param value The value to add to this LogEntry.
+     * @param[in] key   The key identifying the value to add to this LogEntry.
+     * @param[in] value The value to add to this LogEntry.
+     *
      * @return This instance to facilitate adding more information to this log entry.
      */
     LogEntry& d(const char* key, const std::string& value);
@@ -77,8 +103,9 @@ class LogEntry {
     /**
      * Add data (hence the name 'd') in the form of a @c key, @c value pair to the metadata of this log entry.
      *
-     * @param key The key identifying the value to add to this LogEntry.
-     * @param value The boolean value to add to this LogEntry.
+     * @param[in] key   The key identifying the value to add to this LogEntry.
+     * @param[in] value The boolean value to add to this LogEntry.
+     *
      * @return This instance to facilitate adding more information to this log entry.
      */
     LogEntry& d(const char* key, bool value);
@@ -86,23 +113,25 @@ class LogEntry {
     /**
      * Add data (hence the name 'd') in the form of a @c key, @c value pair to the metadata of this log entry.
      *
-     * @param key The key identifying the value to add to this LogEntry.
-     * @param value The value to add to this LogEntry.
+     * @param[in] key   The key identifying the value to add to this LogEntry.
+     * @param[in] value The value to add to this LogEntry.
+     *
      * @return This instance to facilitate adding more information to this log entry.
      */
     template <typename ValueType>
-    inline LogEntry& d(const char* key, const ValueType& value);
+    LogEntry& d(const char* key, const ValueType& value);
 
     /**
      * Add sensitive data in the form of a @c key, @c value pair to the metadata of this log entry.
      * Because the data is 'sensitive' it will only be emitted in DEBUG builds.
      *
-     * @param key The key identifying the value to add to this LogEntry.
-     * @param value The value to add to this LogEntry.
+     * @param[in] key   The key identifying the value to add to this LogEntry.
+     * @param[in] value The value to add to this LogEntry.
+     *
      * @return This instance to facilitate adding more information to this log entry.
      */
     template <typename ValueType>
-    inline LogEntry& sensitive(const char* key, const ValueType& value);
+    LogEntry& sensitive(const char* key, const ValueType& value);
 
     /**
      * Add data in the form of a @c key, @c value pair to the metadata of this log entry.
@@ -110,17 +139,20 @@ class LogEntry {
      * This is done in a distinct method (instead of m or d)  to avoid the cost of always checking
      * against the denylist.
      *
-     * @param key The key identifying the value to add to this LogEntry.
-     * @param value The value to add to this LogEntry, obfuscated if needed.
+     * @param[in] key   The key identifying the value to add to this LogEntry.
+     * @param[in] value The value to add to this LogEntry, obfuscated if needed.
+     *
      * @return This instance to facilitate adding more information to this log entry.
      */
-    inline LogEntry& obfuscatePrivateData(const char* key, const std::string& value);
+    LogEntry& obfuscatePrivateData(const char* key, const std::string& value);
 
     /**
      * Add an arbitrary message to the end of the text of this LogEntry.  Once this has been called no other
      * additions should be made to this LogEntry.
      *
-     * @param message The message to add to the end of the text of this LogEntry.
+     * @param[in] message The message to add to the end of the text of this LogEntry. If @a message is a nullptr, it is
+     *                    treated as an empty string.
+     *
      * @return This instance to facilitate passing this instance on.
      */
     LogEntry& m(const char* message);
@@ -129,7 +161,8 @@ class LogEntry {
      * Add an arbitrary message to the end of the text of this LogEntry.  Once this has been called no other
      * additions should be made to this LogEntry.
      *
-     * @param message The message to add to the end of the text of this LogEntry.
+     * @param[in] message The message to add to the end of the text of this LogEntry.
+     *
      * @return This instance to facilitate passing this instance on.
      */
     LogEntry& m(const std::string& message);
@@ -138,8 +171,10 @@ class LogEntry {
      * Add pointer (hence the name 'p') in the form of a @c key, address of the object pointed to by the shared_ptr @c
      * ptr to the metadata of this log entry.
      *
-     * @param key The key identifying the value to add to this LogEntry.
-     * @param ptr The shared_ptr of the object to add to this LogEntry.
+     * @param[in] key The key identifying the value to add to this LogEntry. If @a key is a nullptr, it is treated as an
+     *                empty string.
+     * @param[in] ptr The shared_ptr of the object to add to this LogEntry.
+     *
      * @return This instance to facilitate adding more information to this log entry.
      */
     template <typename PtrType>
@@ -149,8 +184,10 @@ class LogEntry {
      * Add pointer (hence the name 'p') in the form of a @c key, address of the raw @c ptr to the metadata of this
      * log entry.
      *
-     * @param key The key identifying the value to add to this LogEntry.
-     * @param ptr The raw pointer of the object to add to this LogEntry.
+     * @param[in] key The key identifying the value to add to this LogEntry. If @a key is a nullptr, it is treated as an
+     *                empty string.
+     * @param[in] ptr The raw pointer of the object to add to this LogEntry.
+     *
      * @return This instance to facilitate adding more information to this log entry.
      */
     LogEntry& p(const char* key, const void* ptr);
@@ -170,12 +207,6 @@ class LogEntry {
     /// Add the appropriate prefix for an arbitrary message that is about to be appended to the text of this LogEntry.
     void prefixMessage();
 
-    /// Return a list of labels we will obfuscate if sent to obfuscatePrivateData
-    static std::vector<std::string> getPrivateLabelDenyList() {
-        static std::vector<std::string> privateLabelDenyList = {"ssid"};
-        return privateLabelDenyList;
-    }
-
     /**
      * Append an escaped string to m_stream.
      * Our metadata and subsequent optional message is of the form:
@@ -202,14 +233,18 @@ inline LogEntry& LogEntry::d(const std::string& key, const ValueType& value) {
 }
 
 template <typename ValueType>
-LogEntry& LogEntry::d(const char* key, const ValueType& value) {
+inline LogEntry& LogEntry::d(const char* key, const ValueType& value) {
     prefixKeyValuePair();
     m_stream << key << KEY_VALUE_SEPARATOR << value;
     return *this;
 }
 
+inline LogEntry& LogEntry::d(const char* key, char* value) {
+    return d(key, const_cast<const char*>(value));
+}
+
 template <typename PtrType>
-LogEntry& LogEntry::p(const char* key, const std::shared_ptr<PtrType>& ptr) {
+inline LogEntry& LogEntry::p(const char* key, const std::shared_ptr<PtrType>& ptr) {
     return d(key, ptr.get());
 }
 
@@ -217,46 +252,16 @@ LogEntry& LogEntry::p(const char* key, const std::shared_ptr<PtrType>& ptr) {
 #ifdef ACSDK_EMIT_SENSITIVE_LOGS
 
 template <typename ValueType>
-LogEntry& LogEntry::sensitive(const char* key, const ValueType& value) {
+inline LogEntry& LogEntry::sensitive(const char* key, const ValueType& value) {
     return d(key, value);
 }
 #else
 template <typename ValueType>
-LogEntry& LogEntry::sensitive(const char*, const ValueType&) {
+inline LogEntry& LogEntry::sensitive(const char*, const ValueType&) {
     return *this;
 }
 #endif
 
-LogEntry& LogEntry::obfuscatePrivateData(const char* key, const std::string& value) {
-    // if value contains any  private label, obfuscate the section after the label
-    // since it can (but shouldn't) contain multiple,  obfuscate from the earliest one found onward
-    auto firstPosition = value.length();
-
-    for (auto privateLabel : getPrivateLabelDenyList()) {
-        auto it = std::search(
-            value.begin(),
-            value.end(),
-            privateLabel.begin(),
-            privateLabel.end(),
-            [](char valueChar, char denyListChar) { return std::tolower(valueChar) == std::tolower(denyListChar); });
-        if (it != value.end()) {
-            // capture the least value
-            auto thisPosition = std::distance(value.begin(), it) + privateLabel.length();
-            if (thisPosition < firstPosition) {
-                firstPosition = thisPosition;
-            }
-        }
-    }
-
-    if (firstPosition <= value.length()) {
-        // hash everything after the label itself
-        auto labelPart = value.substr(0, firstPosition);
-        auto obfuscatedPart = std::to_string(std::hash<std::string>{}(value.substr(firstPosition)));
-        return d(key, labelPart + obfuscatedPart);
-    }
-    return d(key, value);
-}
-
 }  // namespace logger
 }  // namespace utils
 }  // namespace avsCommon
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Logger/Logger.h b/AVSCommon/Utils/include/AVSCommon/Utils/Logger/Logger.h
index 2f0ab56556..9bedd30626 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Logger/Logger.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Logger/Logger.h
@@ -85,7 +85,7 @@ namespace logger {
  * are passed to the @c LogEntry constructor.  Here is an example of the definitions that typically appear at
  * the start of a .cpp file:
  *
- *     static const std::string TAG = "MyClass";
+ *     #define TAG "MyClass"
  *     #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
  *
  * When an event is to be logged, a wrapper macro named @c ACSDK_<LEVEL> is invoked with an expression that starts
@@ -138,14 +138,11 @@ namespace logger {
  *
  *     add_definitions("-DACSDK_LOG_MODULE=foo")
  *
- * All logs (module specific or not) are output to a @c Sink @c Logger.  By default, the @c Sink @c Logger
- * is @c ConsoleLogger.  This can be overridden by defining @c ACSDK_LOG_SINK.  The value of @c ACSDK_LOG_SINK
- * specifies a function name of the form:
- *
- *     Logger& get<ACSDK_LOG_SINK>Logger()
+ * For modules that does not have the @c ACSDK_LOG_MODULE definition, logs will be defaulted to use the
+ * ConsoleLogger module Logger.
  *
- * That function to used to get the @c Sink @c Logger.  When @c ACSDK_LOG_SINK is overridden, it is necessary
- * to provide an implementation of that function that returns the desired @c Logger.
+ * All logs (module specific or not) are output to a @c Sink @c Logger.  By default, the @c Sink @c Logger
+ * is @c ConsoleLogger.  The sink logger can be changed by calling initialize in @c LoggerSinkManager.
  */
 class Logger {
 public:
@@ -169,7 +166,7 @@ class Logger {
     /**
      * Return true of logs of a specified severity should be emitted by this Logger.
      *
-     * @param level The Level to check.
+     * @param[in] level The Level to check.
      * @return Returns true if logs of the specified Level should be emitted.
      */
     inline bool shouldLog(Level level) const;
@@ -177,8 +174,8 @@ class Logger {
     /**
      * Send a log entry to this Logger.
      *
-     * @param level The severity Level to associate with this log entry.
-     * @param entry Object used to build the text of this log entry.
+     * @param[in] level The severity Level to associate with this log entry.
+     * @param[in] entry Object used to build the text of this log entry.
      */
     void log(Level level, const LogEntry& entry);
 
@@ -190,8 +187,8 @@ class Logger {
      *
      * @note The user code should still ensure that the Logger object itself is valid.
      *
-     * @param level The severity Level to associate with this log entry.
-     * @param entry Object used to build the text of this log entry.
+     * @param[in] level The severity Level to associate with this log entry.
+     * @param[in] entry Object used to build the text of this log entry.
      */
     void logAtExit(Level level, const LogEntry& entry);
 
@@ -200,10 +197,10 @@ class Logger {
      * NOTE: This method must be thread-safe.
      * NOTE: Delays in returning from this method may hold up calls to Logger::log().
      *
-     * @param level The severity Level of this log line.
-     * @param time The time that the event to log occurred.
-     * @param threadMoniker Moniker of the thread that generated the event.
-     * @param text The text of the entry to log.
+     * @param[in] level The severity Level of this log line.
+     * @param[in] time The time that the event to log occurred.
+     * @param[in] threadMoniker Moniker of the thread that generated the event.
+     * @param[in] text The text of the entry to log.
      */
     virtual void emit(
         Level level,
@@ -214,16 +211,14 @@ class Logger {
     /**
      * Add an observer to this object.
      *
-     * @param An observer to this class, which will be notified when
-     * the logLevel changes.
+     * @param An observer to this class, which will be notified when the logLevel changes.
      */
     void addLogLevelObserver(LogLevelObserverInterface* observer);
 
     /**
      * Remove an observer to this object.
      *
-     * @param An observer to this class that will be removed from the
-     * notificaiton of logLevel changes.
+     * @param An observer to this class that will be removed from the notification of logLevel changes.
      */
     void removeLogLevelObserver(LogLevelObserverInterface* observer);
 
@@ -270,27 +265,21 @@ bool Logger::shouldLog(Level level) const {
  */
 #define ACSDK_GET_LOGGER_FUNCTION_NAME(type) ACSDK_CONCATENATE(ACSDK_CONCATENATE(get, type), Logger)
 
-// If @c ACSDK_LOG_SINK was not defined, default to logging to console.
-#ifndef ACSDK_LOG_SINK
-#define ACSDK_LOG_SINK Console
-#endif
-
-/// Build the get<type>Logger function name for whatever @c Logger logs will be sent to.
-#define ACSDK_GET_SINK_LOGGER ACSDK_GET_LOGGER_FUNCTION_NAME(ACSDK_LOG_SINK)
-
 /**
  * Get the @c Logger that logs should be sent to.
  *
  * @return The @c Logger that logs should be sent to.
  */
-std::shared_ptr<Logger> ACSDK_GET_SINK_LOGGER();
+std::shared_ptr<Logger> getConsoleLogger();
 
 }  // namespace logger
 }  // namespace utils
 }  // namespace avsCommon
 }  // namespace alexaClientSDK
 
-#ifdef ACSDK_LOG_MODULE
+#ifndef ACSDK_LOG_MODULE
+#define ACSDK_LOG_MODULE ConsoleLogger
+#endif  // ACSDK_LOG_MODULE
 
 #include "AVSCommon/Utils/Logger/ModuleLogger.h"
 
@@ -320,38 +309,16 @@ inline std::shared_ptr<Logger> ACSDK_GET_LOGGER_FUNCTION() {
 }  // namespace avsCommon
 }  // namespace alexaClientSDK
 
-#else  // ACSDK_LOG_MODULE
-
-namespace alexaClientSDK {
-namespace avsCommon {
-namespace utils {
-namespace logger {
-
-/**
- * Inline method to get the function that ACSDK_<LEVEL> macros will send logs to.
- * In this case @c ACSDK_LOG_MODULE was not defined, so logs are sent to the @c Logger returned by
- * @c get<ACSDK_LOG_SINK>Logger().
- */
-inline std::shared_ptr<Logger> ACSDK_GET_LOGGER_FUNCTION() {
-    static std::shared_ptr<Logger> logger = ACSDK_GET_SINK_LOGGER();
-    return logger;
-}
-
-}  // namespace logger
-}  // namespace utils
-}  // namespace avsCommon
-}  // namespace alexaClientSDK
-
-#endif
-
-/// Define log macro if logging is enabled. Else do nothing with params to avoid unused variable error.
-#ifdef ACSDK_LOG_ENABLED
 /**
- * Common implementation for sending entries to the log.
+ * @def ACSDK_LOG
+ * @brief Common implementation for sending entries to the log.
+ *
+ * @note If @c ACSDK_LOG_ENABLED is set to OFF, then logging is disabled.
  *
- * @param level The log level to associate with the log line.
- * @param entry The text (or builder of the text) for the log entry.
+ * @param[in] level The log level to associate with the log line.
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
+#ifdef ACSDK_LOG_ENABLED
 #define ACSDK_LOG(level, entry)                                                                      \
     do {                                                                                             \
         auto loggerInstance = alexaClientSDK::avsCommon::utils::logger::ACSDK_GET_LOGGER_FUNCTION(); \
@@ -359,231 +326,172 @@ inline std::shared_ptr<Logger> ACSDK_GET_LOGGER_FUNCTION() {
             loggerInstance->log(level, entry);                                                       \
         }                                                                                            \
     } while (false)
-#else
-   /**
-    * Null implementation for sending entries to the log.
-    *
-    * @param level Unused.
-    * @param entry Unused.
-    */
+#else  // ACSDK_LOG_ENABLED
 #define ACSDK_LOG(level, entry) \
     do {                        \
-        (void)level;            \
-        (void)entry;            \
+        (void)sizeof(level);    \
+        (void)sizeof(entry);    \
     } while (false)
-#endif
-
-#ifdef ACSDK_DEBUG_LOG_ENABLED
+#endif  // ACSDK_LOG_ENABLED
 
 /**
- * Send a DEBUG9 severity log line.
+ * @def ACSDK_DEBUG_LOG
+ * @brief Common implementation for sending debug entries to the log.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
- */
-#define ACSDK_DEBUG9(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG9, entry)
-
-/**
- * Send a DEBUG8 severity log line.
+ * @note If @c ACSDK_DEBUG_LOG_ENABLED is set to OFF, then logging is disabled.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @param[in] level The log level to associate with the log line.
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
-#define ACSDK_DEBUG8(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG8, entry)
 
-/**
- * Send a DEBUG7 severity log line.
- *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
- */
-#define ACSDK_DEBUG7(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG7, entry)
+#ifdef ACSDK_DEBUG_LOG_ENABLED
+#define ACSDK_DEBUG_LOG(level, entry) ACSDK_LOG((level), (entry))
+#else  // ACSDK_DEBUG_LOG_ENABLED
+#define ACSDK_DEBUG_LOG(level, entry) \
+    do {                              \
+        (void)sizeof(level);          \
+        (void)sizeof(entry);          \
+    } while (false)
+#endif  // ACSDK_DEBUG_LOG_ENABLED
 
 /**
- * Send a DEBUG6 severity log line.
+ * Send a DEBUG9 severity log line.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
- */
-#define ACSDK_DEBUG6(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG6, entry)
-
-/**
- * Send a DEBUG5 severity log line.
+ * @note If @c ACSDK_DEBUG_LOG_ENABLED is set to OFF, then logging is disabled.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
-#define ACSDK_DEBUG5(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG5, entry)
+#define ACSDK_DEBUG9(entry) ACSDK_DEBUG_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG9, entry)
 
 /**
- * Send a DEBUG4 severity log line.
+ * Send a DEBUG8 severity log line.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
- */
-#define ACSDK_DEBUG4(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG4, entry)
-
-/**
- * Send a DEBUG3 severity log line.
+ * @note If @c ACSDK_DEBUG_LOG_ENABLED is set to OFF, then logging is disabled.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
-#define ACSDK_DEBUG3(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG3, entry)
+#define ACSDK_DEBUG8(entry) ACSDK_DEBUG_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG8, entry)
 
 /**
- * Send a DEBUG2 severity log line.
+ * Send a DEBUG7 severity log line.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
- */
-#define ACSDK_DEBUG2(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG2, entry)
-
-/**
- * Send a DEBUG1 severity log line.
+ * @note If @c ACSDK_DEBUG_LOG_ENABLED is set to OFF, then logging is disabled.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
-#define ACSDK_DEBUG1(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG1, entry)
+#define ACSDK_DEBUG7(entry) ACSDK_DEBUG_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG7, entry)
 
 /**
- * Send a DEBUG0 severity log line.
+ * Send a DEBUG6 severity log line.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
- */
-#define ACSDK_DEBUG0(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG0, entry)
-
-/**
- * Send a log line at the default debug level (DEBUG0).
+ * @note If @c ACSDK_DEBUG_LOG_ENABLED is set to OFF, then logging is disabled.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
-#define ACSDK_DEBUG(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG0, entry)
-
-#else  // ACSDK_DEBUG_LOG_ENABLED
+#define ACSDK_DEBUG6(entry) ACSDK_DEBUG_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG6, entry)
 
 /**
- * Compile out a DEBUG9 severity log line.
+ * Send a DEBUG5 severity log line.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
- */
-#define ACSDK_DEBUG9(entry)
-
-/**
- * Compile out a DEBUG8 severity log line.
+ * @note If @c ACSDK_DEBUG_LOG_ENABLED is set to OFF, then logging is disabled.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
-#define ACSDK_DEBUG8(entry)
+#define ACSDK_DEBUG5(entry) ACSDK_DEBUG_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG5, entry)
 
 /**
- * Compile out a DEBUG7 severity log line.
+ * Send a DEBUG4 severity log line.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
- */
-#define ACSDK_DEBUG7(entry)
-
-/**
- * Compile out a DEBUG6 severity log line.
+ * @note If @c ACSDK_DEBUG_LOG_ENABLED is set to OFF, then logging is disabled.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
-#define ACSDK_DEBUG6(entry)
+#define ACSDK_DEBUG4(entry) ACSDK_DEBUG_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG4, entry)
 
 /**
- * Compile out a DEBUG5 severity log line.
+ * Send a DEBUG3 severity log line.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
- */
-#define ACSDK_DEBUG5(entry)
-
-/**
- * Compile out a DEBUG4 severity log line.
+ * @note If @c ACSDK_DEBUG_LOG_ENABLED is set to OFF, then logging is disabled.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
-#define ACSDK_DEBUG4(entry)
+#define ACSDK_DEBUG3(entry) ACSDK_DEBUG_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG3, entry)
 
 /**
- * Compile out a DEBUG3 severity log line.
+ * Send a DEBUG2 severity log line.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
- */
-#define ACSDK_DEBUG3(entry)
-
-/**
- * Compile out a DEBUG2 severity log line.
+ * @note If @c ACSDK_DEBUG_LOG_ENABLED is set to OFF, then logging is disabled.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
-#define ACSDK_DEBUG2(entry)
+#define ACSDK_DEBUG2(entry) ACSDK_DEBUG_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG2, entry)
 
 /**
- * Compile out a DEBUG1 severity log line.
+ * Send a DEBUG1 severity log line.
+ *
+ * @note If @c ACSDK_DEBUG_LOG_ENABLED is set to OFF, then logging is disabled.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
-#define ACSDK_DEBUG1(entry)
+#define ACSDK_DEBUG1(entry) ACSDK_DEBUG_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG1, entry)
 
 /**
- * Compile out a DEBUG0 severity log line.
+ * Send a DEBUG0 severity log line.
+ *
+ * @note If @c ACSDK_DEBUG_LOG_ENABLED is set to OFF, then logging is disabled.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
-#define ACSDK_DEBUG0(entry)
+#define ACSDK_DEBUG0(entry) ACSDK_DEBUG_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG0, entry)
 
 /**
- * Compile out a DEBUG severity log line.
+ * Send a log line at the default debug level (DEBUG0).
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @note If @c ACSDK_DEBUG_LOG_ENABLED is set to OFF, then logging is disabled.
+ *
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
-#define ACSDK_DEBUG(entry)
-
-#endif  // ACSDK_DEBUG_LOG_ENABLED
+#define ACSDK_DEBUG(entry) ACSDK_DEBUG_LOG(alexaClientSDK::avsCommon::utils::logger::Level::DEBUG0, entry)
 
 /**
  * Send a INFO severity log line.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @note If @c ACSDK_LOG_ENABLED is set to OFF, then logging is disabled.
+ *
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
 #define ACSDK_INFO(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::INFO, entry)
 
 /**
  * Send a WARN severity log line.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @note If @c ACSDK_LOG_ENABLED is set to OFF, then logging is disabled.
+ *
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
 #define ACSDK_WARN(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::WARN, entry)
 
 /**
  * Send a ERROR severity log line.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @note If @c ACSDK_LOG_ENABLED is set to OFF, then logging is disabled.
+ *
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
 #define ACSDK_ERROR(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::ERROR, entry)
 /**
  * Send a CRITICAL severity log line.
  *
- * @param loggerArg The Logger to send the line to.
- * @param entry The text (or builder of the text) for the log entry.
+ * @note If @c ACSDK_LOG_ENABLED is set to OFF, then logging is disabled.
+ *
+ * @param[in] entry A constructed @a LogEntry object with the log message text.
  */
 #define ACSDK_CRITICAL(entry) ACSDK_LOG(alexaClientSDK::avsCommon::utils::logger::Level::CRITICAL, entry)
 
+#ifndef ACSDK_LOGS_KEEP_FUNC_MACRO
+// In older Android releases __func__ is redefined as __PRETTY_FUNCTION__ making log messages difficult to read and
+// analyse. We undefine this macro if it is defined. See Logger.cmake for details on how to keep the macro intact.
+#undef __func__
+#endif  // ACSDK_LOGS_KEEP_FUNC_MACRO
+
 #endif  // ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_LOGGER_LOGGER_H_
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Logger/LoggerSinkManager.h b/AVSCommon/Utils/include/AVSCommon/Utils/Logger/LoggerSinkManager.h
index 252d03123f..f433e3441e 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Logger/LoggerSinkManager.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Logger/LoggerSinkManager.h
@@ -67,8 +67,7 @@ class LoggerSinkManager {
      *
      * @param sink The new @c Logger to forward logs to.
      *
-     * @note If this function is not called, the default sink logger
-     * will be the one returned by get<ACSDK_LOG_SINK>Logger().
+     * @note If this function is not called, the default sink logger is @c ConsoleLogger.
      */
     void initialize(const std::shared_ptr<Logger>& sink);
 
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Logger/ThreadMoniker.h b/AVSCommon/Utils/include/AVSCommon/Utils/Logger/ThreadMoniker.h
index ec70c280a6..09b638231a 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Logger/ThreadMoniker.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Logger/ThreadMoniker.h
@@ -27,82 +27,64 @@ namespace utils {
 namespace logger {
 
 /**
- * Class to provide @c std::this_thread access to unique name for itself.
+ * Class to provide unique name for execution context.
  *
- * The name ThreadMoniker is used instead of ThreadId to avoid confusion with platform specific thread identifiers
- * or the @c std::thread::id values rendered as a string.
+ * This class provides management for thread-local execution context identifiers. Execution context identifier is a
+ * hexadecimal string which is managed by facilities like @c Executor and @c Timer. Logging framework adds identifier
+ * value to all messages to identify which executor or timer is running the task.
+ *
+ * @note The same identifier can be reused by different threads, but will have the same context.
  */
 class ThreadMoniker {
 public:
+    /// Prefix value for executor monikers.
+    static constexpr char PREFIX_EXECUTOR = 'e';
+
+    /// Prefix value for timer monikers.
+    static constexpr char PREFIX_TIMER = 't';
+
     /**
-     * Get the moniker for @c std::this_thread.
+     * Get the moniker for the caller's thread.
      *
-     * @return The moniker for @c std::this_thread.
+     * Method returns identifier value assigned to the current thread by a call to #setThisThreadMoniker(). If the value
+     * has not been previously set, a new value is generated by #generateMoniker(), assigned to the current thread, and
+     * returned.
+     *
+     * @return The moniker for the caller's thread.
      */
-    static inline std::string getThisThreadMoniker();
+    static std::string getThisThreadMoniker() noexcept;
 
     /**
      * Generate a unique moniker.
      *
+     * This method generates a fixed-width moniker string. By default the value is a alpha-numeric string, prepended
+     * with spaces. If the \a prefix is specified, the value also includes prefix character with colon.
+     *
+     * @param prefix Optional prefix for moniker value. If @a prefix if not 0, it is used for generating moniker.
+     * Some of prefix values are reserved for use by ACSDK: 't' prefix is used by timers, and 'e' prefix is used by
+     * executors.
+     *
      * @return A new unique moniker.
      */
-    static std::string generateMoniker();
+    static std::string generateMoniker(char prefix = 0) noexcept;
 
     /**
-     * Set the moniker for @c std::this_thread. This method should be called before @c getThisThreadMoniker() in order
-     * to take effect.
+     * Set the moniker for the caller's thread.
+     *
+     * This method sets identifier value for the caller's thread. Any subsequent calls to #getThisThreadMoniker() will
+     * return @a moniker value.
      *
      * @param moniker The moniker for @c std::this_thread.
      */
-    static inline void setThisThreadMoniker(const std::string& moniker);
+    static void setThisThreadMoniker(const std::string& moniker) noexcept;
 
 private:
     /**
      * Constructor.
-     *
-     * @param moniker Optional moniker for this thread. If no moniker is provided, a new moniker will be provided.
      */
-    ThreadMoniker(const std::string& moniker = std::string());
-
-    /**
-     * Return the @c ThreadMoniker object for the current thread.
-     *
-     * @param moniker Use this moniker to initialize the @c ThreadMoniker if it doesn't exist already.
-     * @return The moniker for the @c std::this_thread.
-     */
-    static inline const ThreadMoniker& getMonikerObject(const std::string& moniker = std::string());
-
-    /**
-     * Return the @c ThreadMoniker object for the current thread for OS that don't support thread local variables.
-     *
-     * @param moniker Use this moniker to initialize the @c ThreadMoniker if it doesn't exist already.
-     * @return The moniker for the @c std::this_thread.
-     */
-    static const ThreadMoniker& getMonikerObjectFromMap(const std::string& moniker = std::string());
-
-    /// The current thread's moniker.
-    std::string m_moniker;
+    ThreadMoniker() = delete;
 };
 
-std::string ThreadMoniker::getThisThreadMoniker() {
-    return getMonikerObject().m_moniker;
-}
-
-void ThreadMoniker::setThisThreadMoniker(const std::string& moniker) {
-    getMonikerObject(moniker);
-}
-
-const ThreadMoniker& ThreadMoniker::getMonikerObject(const std::string& moniker) {
-#ifdef _WIN32
-    return getMonikerObjectFromMap(moniker);
-#else
-    /// Per-thread static instance so that @c m_threadMoniker.m_moniker is @c std::this_thread's moniker.
-    static thread_local ThreadMoniker m_threadMoniker{moniker};
-
-    return m_threadMoniker;
-#endif
-}
-
 }  // namespace logger
 }  // namespace utils
 }  // namespace avsCommon
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/MediaPlayer/ErrorTypes.h b/AVSCommon/Utils/include/AVSCommon/Utils/MediaPlayer/ErrorTypes.h
index 0878ed33ec..b17b083789 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/MediaPlayer/ErrorTypes.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/MediaPlayer/ErrorTypes.h
@@ -17,6 +17,7 @@
 #define ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_MEDIAPLAYER_ERRORTYPES_H_
 
 #include <ostream>
+#include <string>
 
 namespace alexaClientSDK {
 namespace avsCommon {
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/MediaPlayer/MediaDescription.h b/AVSCommon/Utils/include/AVSCommon/Utils/MediaPlayer/MediaDescription.h
index fb1c8db68e..ec7ef33344 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/MediaPlayer/MediaDescription.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/MediaPlayer/MediaDescription.h
@@ -69,7 +69,7 @@ inline MediaDescription emptyMediaDescription() {
                             "",
                             Optional<captions::CaptionData>(),
                             Optional<std::vector<audioAnalyzer::AudioAnalyzerState>>(),
-                            {},
+                            std::unordered_map<std::string, std::string>(),
                             false};
 }
 
@@ -81,6 +81,7 @@ inline MediaDescription emptyMediaDescription() {
  * @return The stream that was passed in and written to.
  */
 inline std::ostream& operator<<(std::ostream& stream, const MediaDescription& mediaDescription) {
+    stream << "MixingBehavior:";
     switch (mediaDescription.mixingBehavior) {
         case sdkInterfaces::audio::MixingBehavior::BEHAVIOR_PAUSE:
             stream << "BEHAVIOR_PAUSE";
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Metrics/MetricRecorderInterface.h b/AVSCommon/Utils/include/AVSCommon/Utils/Metrics/MetricRecorderInterface.h
index 6f6cccc33f..b6323fa900 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Metrics/MetricRecorderInterface.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Metrics/MetricRecorderInterface.h
@@ -43,10 +43,10 @@ class MetricRecorderInterface {
 };
 
 /**
- * Inline record metric function to handle if ACSDK_ENABLE_METRICS_RECORDING flag is defined or not
+ * Inline record metric function to handle if ACSDK_ENABLE_METRICS_RECORDING flag is defined or not.
  *
- * @param recorder is the pointer to the MetricRecorderInterface.
- * @param metricEvent is the pointer to the MetricEvent.
+ * @param recorder Optional pointer to MetricRecorderInterface. If this parameter is nullptr, metric is not sent.
+ * @param metricEvent Pointer to the MetricEvent.
  */
 inline void recordMetric(
     const std::shared_ptr<MetricRecorderInterface>& recorder,
@@ -55,6 +55,9 @@ inline void recordMetric(
     if (recorder) {
         recorder->recordMetric(std::move(metricEvent));
     }
+#else
+    (void)recorder;
+    (void)metricEvent;
 #endif
 }
 
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/PlatformDefinitions.h b/AVSCommon/Utils/include/AVSCommon/Utils/PlatformDefinitions.h
index e47afd3c1c..e879baa732 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/PlatformDefinitions.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/PlatformDefinitions.h
@@ -40,7 +40,79 @@ typedef SSIZE_T ssize_t;
 #endif
 
 #if defined(_MSC_VER)
+#ifndef ACSDK_USE_RTTI
 #define ACSDK_USE_RTTI ON
 #endif
+#endif
+
+/**
+ * @macro ACSDK_ALWAYS_INLINE
+ *
+ * Compiler-specific macro to disable cost-benefit analysis and always inline a method.
+ */
+
+/**
+ * @macro ACSDK_NO_INLINE
+ *
+ * Compiler-specific macro to disable cost-benefit analysis and never inline a method.
+ */
+
+/**
+ * @macro ACSDK_HIDDEN
+ *
+ * Compiler-specific macro to make symbol not visible outside of binary object.
+ */
+
+/**
+ * @macro ACSDK_INTERNAL_LINKAGE
+ *
+ * Compiler-specific macro to make symbol not visible outside of the scope it is instantiated.
+ */
+
+/**
+ * @macro ACSDK_HIDE_FROM_ABI
+ * @brief Compiler-specific macro to exclude symbol from binary exports.
+ *
+ * Macro excludes symbols from binary export table. This helps to reduce binary size when building shared libraries.
+ */
+
+#if defined(_MSC_VER)
+#define ACSDK_ALWAYS_INLINE __forceinline
+#define ACSDK_NO_INLINE __declspec(noinline)
+#define ACSDK_HIDDEN
+#define ACSDK_INTERNAL_LINKAGE ACSDK_ALWAYS_INLINE
+#elif defined(__GNUC__)
+
+#ifndef __has_attribute
+#define __has_attribute(x) 0
+#endif
+
+#define ACSDK_ALWAYS_INLINE inline __attribute__((__always_inline__))
+#define ACSDK_NO_INLINE __attribute__((__noinline__))
+#define ACSDK_HIDDEN __attribute__((__visibility__("hidden")))
+
+#if defined(__clang__)
+#if __has_attribute(internal_linkage)
+#define ACSDK_INTERNAL_LINKAGE __attribute__((internal_linkage))
+#else
+#define ACSDK_INTERNAL_LINKAGE __attribute__((__visibility__("hidden")))
+#endif
+#else
+#define ACSDK_INTERNAL_LINKAGE __attribute__((__visibility__("internal")))
+#endif
+#else
+#define ACSDK_ALWAYS_INLINE inline
+#define ACSDK_NO_INLINE
+#define ACSDK_HIDDEN
+#define ACSDK_INTERNAL_LINKAGE ACSDK_ALWAYS_INLINE
+#endif
+#define ACSDK_HIDE_FROM_ABI ACSDK_INTERNAL_LINKAGE
+
+/**
+ * @brief Compiler-specific macro for inline-only methods.
+ *
+ * Macro excludes symbols from binary export table. This helps to reduce binary size when building shared libraries.
+ */
+#define ACSDK_INLINE_VISIBILITY ACSDK_HIDE_FROM_ABI
 
 #endif  // ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_PLATFORMDEFINITIONS_H_
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Power/AggregatedPowerResourceManager.h b/AVSCommon/Utils/include/AVSCommon/Utils/Power/AggregatedPowerResourceManager.h
index 069b6b2a12..ffbeb03132 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Power/AggregatedPowerResourceManager.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Power/AggregatedPowerResourceManager.h
@@ -61,11 +61,13 @@ class AggregatedPowerResourceManager : public avsCommon::sdkInterfaces::PowerRes
 
     /// @name PowerResourceManagerInterface Legacy Methods
     /// @{
+    /**********************************Deprecated Legacy APIs**********************************************/
     void acquirePowerResource(
         const std::string& component,
         const PowerResourceLevel level = PowerResourceLevel::STANDBY_MED) override;
     void releasePowerResource(const std::string& component) override;
     bool isPowerResourceAcquired(const std::string& component) override;
+    /******************************************************************************************************/
     std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface::PowerResourceId> create(
         const std::string& resourceId,
         bool isRefCounted = true,
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/SDS/BufferLayout.h b/AVSCommon/Utils/include/AVSCommon/Utils/SDS/BufferLayout.h
index 67517a5e6c..507ccd0953 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/SDS/BufferLayout.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/SDS/BufferLayout.h
@@ -489,6 +489,13 @@ bool SharedDataStream<T>::BufferLayout::init(size_t wordSize, size_t maxReaders,
                                .d("maxReadersLimit", max_field_limit(&Header::maxReaders)));
         return false;
     }
+    if (maxEphemeralReaders > max_field_limit(&Header::maxEphemeralReaders)) {
+        logger::acsdkError(logger::LogEntry(TAG, "initFailed")
+                               .d("reason", "maxEphermalReadersTooLarge")
+                               .d("maxEphemeralReaders", maxEphemeralReaders)
+                               .d("maxEphemeralReaders", max_field_limit(&Header::maxEphemeralReaders)));
+        return false;
+    }
 
     // Pre-calculate some pointers and sizes that are frequently accessed.
     calculateAndCacheConstants(wordSize, maxReaders);
@@ -508,9 +515,9 @@ bool SharedDataStream<T>::BufferLayout::init(size_t wordSize, size_t maxReaders,
     header->magic = MAGIC_NUMBER;
     header->version = VERSION;
     header->traitsNameHash = stableHash(T::traitsName);
-    header->wordSize = wordSize;
-    header->maxReaders = maxReaders;
-    header->maxEphemeralReaders = maxEphemeralReaders;
+    header->wordSize = static_cast<uint16_t>(wordSize);
+    header->maxReaders = static_cast<uint8_t>(maxReaders);
+    header->maxEphemeralReaders = static_cast<uint8_t>(maxEphemeralReaders);
     header->isWriterEnabled = false;
     header->hasWriterBeenClosed = false;
     header->writeStartCursor = 0;
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/SDS/Reader.h b/AVSCommon/Utils/include/AVSCommon/Utils/SDS/Reader.h
index e7beb43f80..2cbba7304c 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/SDS/Reader.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/SDS/Reader.h
@@ -90,7 +90,7 @@ class SharedDataStream<T>::Reader {
      * @param bufferLayout The @c BufferLayout to use for reading stream data.
      * @param id The id of the reader, assigned by the @c SharedDataStream.
      */
-    Reader(Policy policy, std::shared_ptr<BufferLayout> bufferLayout, uint8_t id);
+    Reader(Policy policy, std::shared_ptr<BufferLayout> bufferLayout, size_t id);
 
     /// This destructor detaches the @c Reader from a @c BufferLayout.
     ~Reader();
@@ -245,7 +245,7 @@ class SharedDataStream<T>::Reader {
      * The index in @c BufferLayout::getReaderCursorArray() and @c BufferLayout::getReaderCloseIndexArray() assigned to
      * this @c Reader.
      */
-    uint8_t m_id;
+    size_t m_id;
 
     /// Pointer to this reader's cursor in BufferLayout::getReaderCursorArray().
     AtomicIndex* m_readerCursor;
@@ -258,7 +258,7 @@ template <typename T>
 const std::string SharedDataStream<T>::Reader::TAG = "SdsReader";
 
 template <typename T>
-SharedDataStream<T>::Reader::Reader(Policy policy, std::shared_ptr<BufferLayout> bufferLayout, uint8_t id) :
+SharedDataStream<T>::Reader::Reader(Policy policy, std::shared_ptr<BufferLayout> bufferLayout, size_t id) :
         m_policy{policy},
         m_bufferLayout{bufferLayout},
         m_id{id},
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Threading/Executor.h b/AVSCommon/Utils/include/AVSCommon/Utils/Threading/Executor.h
index af8e471393..a51e29bcde 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Threading/Executor.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Threading/Executor.h
@@ -26,8 +26,9 @@
 #include <mutex>
 #include <utility>
 
-#include "AVSCommon/Utils/Threading/TaskThread.h"
-#include "AVSCommon/Utils/Power/PowerResource.h"
+#include <AVSCommon/Utils/Threading/ExecutorInterface.h>
+#include <AVSCommon/Utils/Threading/TaskThread.h>
+#include <AVSCommon/Utils/Power/PowerResource.h>
 
 namespace alexaClientSDK {
 namespace avsCommon {
@@ -35,134 +36,174 @@ namespace utils {
 namespace threading {
 
 /**
+ * @brief Single-thread executor implementation.
+ *
  * An Executor is used to run callable types asynchronously.
+ *
+ * This type is a wrapper around ExecutorInterface implementation.
  */
 class Executor {
 public:
+    /**
+     * Constructs an Executor.
+     */
+    Executor() noexcept;
+
     /**
      * Constructs an Executor.
      *
-     * @param delayExit The period of time that this executor will keep its thread running while waiting
-     * for a new job. We use 1s by default.
+     * @param unused Unused parameter.
+     *
+     * @deprecated This method is kept for backwards compatibility.
      */
-    Executor(const std::chrono::milliseconds& delayExit = std::chrono::milliseconds(1000));
+    Executor(const std::chrono::milliseconds& unused) noexcept;
 
     /**
      * Destructs an Executor.
      */
-    ~Executor();
+    ~Executor() noexcept;
+
+    /**
+     * @brief Schedules a function for execution.
+     *
+     * Submits a function to be executed on an Executor thread.
+     *
+     * @param[in] function Function to execute. Function must not be empty.
+     * @return True if @a function is accepted for execution, false if @a function is empty or executor is shutdown.
+     */
+    bool execute(std::function<void()>&& function) noexcept;
+
+    /**
+     * @brief Schedules a function for execution.
+     *
+     * Submits a function to be executed on an Executor thread.
+     *
+     * @param[in] function Function to execute.
+     * @return True if @a function is accepted for execution, false if @a function is empty or executor is shutdown.
+     */
+    bool execute(const std::function<void()>& function) noexcept;
 
     /**
      * Submits a callable type (function, lambda expression, bind expression, or another function object) to be executed
      * on an Executor thread. The future must be checked for validity before waiting on it.
      *
+     * @tparam Task Callable type.
+     * @tparam Args Argument types.
+     *
      * @param task A callable type representing a task.
      * @param args The arguments to call the task with.
-     * @returns A @c std::future for the return value of the task.
+     * @return A @c std::future for the return value of the task.
+     *
+     * @note This method is less memory and speed efficient then #execute() and should not be used unless std::future
+     *       result is required.
      */
     template <typename Task, typename... Args>
-    auto submit(Task task, Args&&... args) -> std::future<decltype(task(args...))>;
+    auto submit(Task task, Args&&... args) noexcept -> std::future<decltype(task(args...))>;
 
     /**
      * Submits a callable type (function, lambda expression, bind expression, or another function object) to the front
      * of the internal queue to be executed on an Executor thread. The future must be checked for validity before
      * waiting on it.
      *
+     * @tparam Task Callable type.
+     * @tparam Args Argument types.
+     *
      * @param task A callable type representing a task.
      * @param args The arguments to call the task with.
-     * @returns A @c std::future for the return value of the task.
+     * @return A @c std::future for the return value of the task.
+     *
+     * @note This method is less memory and speed efficient then #execute() and should not be used unless std::future
+     *       result is required.
      */
     template <typename Task, typename... Args>
-    auto submitToFront(Task task, Args&&... args) -> std::future<decltype(task(args...))>;
+    auto submitToFront(Task task, Args&&... args) noexcept -> std::future<decltype(task(args...))>;
 
     /**
      * Waits for any previously submitted tasks to complete.
      */
-    void waitForSubmittedTasks();
+    void waitForSubmittedTasks() noexcept;
 
     /// Clears the executor of outstanding tasks and refuses any additional tasks to be submitted.
-    void shutdown();
+    void shutdown() noexcept;
 
     /// Returns whether or not the executor is shutdown.
-    bool isShutdown();
-
-private:
-    /// The queue type to use for holding tasks.
-    using Queue = std::deque<std::function<void()>>;
+    bool isShutdown() noexcept;
 
     /**
-     * Executes the next job in the queue.
+     * @brief Provides access to ExecutorInterface reference.
      *
-     * @return @c true if there's a next job; @c false if the job queue is empty.
+     * @return Reference to internal ExecutorInterface.
      */
-    bool runNext();
+    operator std::shared_ptr<ExecutorInterface>() const noexcept;
+
+private:
+    // Friend declaration.
+    friend class SharedExecutor;
 
     /**
-     * Checks if the job queue is empty and that no job is added in the grace period determined by @c m_timeout.
-     *
-     * @return @c true if there's at least one job left in the queue; @c false if the job queue is empty.
+     * @brief Ordering hint when submitting a new task to executor.
      */
-    bool hasNext();
+    enum class QueuePosition {
+        /// Add task to front of task queue.
+        Front = 1,
+        /// Add task to back of task queue.
+        Back
+    };
 
     /**
-     * Returns and removes the task at the front of the queue. If there are no tasks, this call will return an empty
-     * function.
+     * @brief Schedules a function for execution.
+     *
+     * Submits a function to be executed on an Executor thread.
      *
-     * @returns A function that represents a new task. The function will be empty if the queue has no job.
+     * @param[in] function Function to execute.
+     * @param[in] queuePosition Position in the queue for the new task.
+     * @return True on success, false on error: if @a function is empty, @a queuePosition is not valid, or executor is
+     *         in shutdown.
      */
-    std::function<void()> pop();
+    bool execute(std::function<void()>&& function, QueuePosition queuePosition) noexcept;
 
     /**
      * Pushes a task on the the queue. If the queue is shutdown, the task will be dropped, and an invalid
      * future will be returned.
      *
-     * @param front If @c true, push to the front of the queue, else push to the back.
+     * @param queuePosition Position in the queue for the new task.
      * @param task A task to push to the front or back of the queue.
      * @param args The arguments to call the task with.
      * @returns A @c std::future to access the return value of the task. If the queue is shutdown, the task will be
      *     dropped, and an invalid future will be returned.
      */
     template <typename Task, typename... Args>
-    auto pushTo(bool front, Task task, Args&&... args) -> std::future<decltype(task(args...))>;
-
-    /// The queue of tasks
-    Queue m_queue;
+    auto pushTo(QueuePosition queuePosition, Task&& task, Args&&... args) noexcept
+        -> std::future<decltype(task(args...))>;
 
-    /// Flag to indicate if the taskThread already have an executing job.
-    bool m_threadRunning;
-
-    /// Period that this queue will wait for a new job until it releases the task thread.
-    std::chrono::milliseconds m_timeout;
-
-    /// A mutex to protect access to the tasks in m_queue.
-    std::mutex m_queueMutex;
-
-    /// A flag for whether or not the queue is expecting more tasks.
-    std::atomic_bool m_shutdown;
-
-    /// A @c PowerResource.
-    std::shared_ptr<power::PowerResource> m_powerResource;
-
-    /// The condition variable used to detect new job or timeout.
-    std::condition_variable m_delayedCondition;
-
-    /// The id of this instance.
-    const uint64_t m_id;
+    /**
+     * Pushes a function on the the queue. If the queue is shutdown, the function will be dropped, and an invalid
+     * future will be returned.
+     *
+     * @tparam T Return type for @a function and resulting future value type.
+     * @param queuePosition Position in the queue for the new task.
+     * @param function A function to push.
+     * @returns A @c std::future to access the return value of the task. If the queue is shutdown, the task will be
+     *     dropped, and an invalid future will be returned.
+     */
+    template <typename T>
+    std::future<T> pushFunction(QueuePosition queuePosition, std::function<T()>&& function) noexcept;
 
-    /// The thread to execute tasks on. The thread must be declared last to be destructed first.
-    TaskThread m_taskThread;
+    /// Internal shared executor reference.
+    std::shared_ptr<class SharedExecutor> m_executor;
 };
 
+inline Executor::Executor(const std::chrono::milliseconds&) noexcept : Executor() {
+}
+
 template <typename Task, typename... Args>
-auto Executor::submit(Task task, Args&&... args) -> std::future<decltype(task(args...))> {
-    bool front = false;
-    return pushTo(front, std::forward<Task>(task), std::forward<Args>(args)...);
+auto Executor::submit(Task task, Args&&... args) noexcept -> std::future<decltype(task(args...))> {
+    return pushTo(QueuePosition::Back, std::forward<Task>(task), std::forward<Args>(args)...);
 }
 
 template <typename Task, typename... Args>
-auto Executor::submitToFront(Task task, Args&&... args) -> std::future<decltype(task(args...))> {
-    bool front = true;
-    return pushTo(front, std::forward<Task>(task), std::forward<Args>(args)...);
+auto Executor::submitToFront(Task task, Args&&... args) noexcept -> std::future<decltype(task(args...))> {
+    return pushTo(QueuePosition::Front, std::forward<Task>(task), std::forward<Args>(args)...);
 }
 
 /**
@@ -172,14 +213,14 @@ auto Executor::submitToFront(Task task, Args&&... args) -> std::future<decltype(
  * @param future The @c std::future on which to wait for a result to forward to @c promise.
  */
 template <typename T>
-inline static void forwardPromise(std::shared_ptr<std::promise<T>> promise, std::future<T>* future) {
+inline static void forwardPromise(std::promise<T>& promise, std::future<T>& future) noexcept {
 #if __cpp_exceptions || defined(__EXCEPTIONS)
     try {
 #endif
-        promise->set_value(future->get());
+        promise.set_value(future.get());
 #if __cpp_exceptions || defined(__EXCEPTIONS)
     } catch (...) {
-        promise->set_exception(std::current_exception());
+        promise.set_exception(std::current_exception());
     }
 #endif
 }
@@ -191,28 +232,32 @@ inline static void forwardPromise(std::shared_ptr<std::promise<T>> promise, std:
  * @param future The @c std::future on which to wait before fulfilling @c promise.
  */
 template <>
-inline void forwardPromise<void>(std::shared_ptr<std::promise<void>> promise, std::future<void>* future) {
+inline void forwardPromise<void>(std::promise<void>& promise, std::future<void>& future) noexcept {
 #if __cpp_exceptions || defined(__EXCEPTIONS)
     try {
 #endif
-        future->get();
-        promise->set_value();
+        future.get();
+        promise.set_value();
 #if __cpp_exceptions || defined(__EXCEPTIONS)
     } catch (...) {
-        promise->set_exception(std::current_exception());
+        promise.set_exception(std::current_exception());
     }
 #endif
 }
 
 template <typename Task, typename... Args>
-auto Executor::pushTo(bool front, Task task, Args&&... args) -> std::future<decltype(task(args...))> {
+inline auto Executor::pushTo(QueuePosition queuePosition, Task&& task, Args&&... args) noexcept
+    -> std::future<decltype(task(args...))> {
+    using ValueType = decltype(task(args...));
     // Remove arguments from the tasks type by binding the arguments to the task.
-    auto boundTask = std::bind(std::forward<Task>(task), std::forward<Args>(args)...);
+    std::function<ValueType()> fn{std::bind(std::forward<Task>(task), std::forward<Args>(args)...)};
+    return pushFunction(queuePosition, std::move(fn));
+}
 
+template <typename T>
+std::future<T> Executor::pushFunction(QueuePosition queuePosition, std::function<T()>&& function) noexcept {
     /*
-     * Create a std::packaged_task with the correct return type. The decltype only returns the return value of the
-     * boundTask. The following parentheses make it a function call with the boundTask return type. The package task
-     * will then return a future of the correct type.
+     * Create a std::packaged_task with the correct return type.
      *
      * Note: A std::packaged_task fulfills its future *during* the call to operator().  If the user of a
      * std::packaged_task hands it off to another thread to execute, and then waits on the future, they will be able to
@@ -223,53 +268,69 @@ auto Executor::pushTo(bool front, Task task, Args&&... args) -> std::future<decl
      * workaround for this limitation.  It executes the packaged task, then disposes of it before passing the task's
      * return value back to the future that the user is waiting on.
      */
-    using PackagedTaskType = std::packaged_task<decltype(boundTask())()>;
-    auto packaged_task = std::make_shared<PackagedTaskType>(boundTask);
 
-    // Create a promise/future that we will fulfill when we have cleaned up the task.
-    auto cleanupPromise = std::make_shared<std::promise<decltype(task(args...))>>();
-    auto cleanupFuture = cleanupPromise->get_future();
+    /**
+     * @brief Structure to carry parameters into lambda through shared pointer.
+     * @private
+     */
+    struct CallCtx {
+        /**
+         * @brief Construct object and assigned function to packaged task.
+         *
+         * @param function Function to wrap into packaged task.
+         */
+        inline CallCtx(std::function<T()>&& function) : packagedTask{std::move(function)} {
+        }
+
+        /// Packaged task.
+        std::packaged_task<T()> packagedTask;
+        /// Promise for result forwarding.
+        std::promise<T> cleanupPromise;
+    };
+
+    auto callCtx = std::make_shared<CallCtx>(std::move(function));
 
     // Remove the return type from the task by wrapping it in a lambda with no return value.
-    auto translated_task = [packaged_task, cleanupPromise]() mutable {
+    auto translated_task = [callCtx]() mutable {
         // Execute the task.
-        packaged_task->operator()();
+        callCtx->packagedTask();
         // Note the future for the task's result.
-        auto taskFuture = packaged_task->get_future();
+        auto taskFuture = callCtx->packagedTask.get_future();
         // Clean up the task.
-        packaged_task.reset();
+        callCtx->packagedTask.reset();
+        auto cleanupPromise = std::move(callCtx->cleanupPromise);
+        // Release parameters.
+        callCtx.reset();
         // Forward the task's result to our cleanup promise/future.
-        forwardPromise(cleanupPromise, &taskFuture);
+        forwardPromise(cleanupPromise, taskFuture);
     };
 
+    // Create a promise/future that we will fulfill when we have cleaned up the task.
+    auto cleanupFuture = callCtx->cleanupPromise.get_future();
+
     // Release our local reference to packaged task so that the only remaining reference is inside the lambda.
-    packaged_task.reset();
-
-    {
-        bool restart = false;
-        std::lock_guard<std::mutex> queueLock{m_queueMutex};
-        if (!m_shutdown) {
-            restart = !m_threadRunning;
-            if (m_powerResource) {
-                m_powerResource->acquire();
-            }
-            m_queue.emplace(front ? m_queue.begin() : m_queue.end(), std::move(translated_task));
-        } else {
-            using FutureType = decltype(task(args...));
-            return std::future<FutureType>();
-        }
+    callCtx.reset();
 
-        if (restart) {
-            // Restart task thread.
-            m_taskThread.start(std::bind(&Executor::runNext, this));
-            m_threadRunning = true;
-        }
+    if (!execute(std::move(translated_task), queuePosition)) {
+        return std::future<T>();
     }
 
-    m_delayedCondition.notify_one();
     return cleanupFuture;
 }
 
+/// @name Externalize Executor::pushFunction() for common types.
+/// @{
+extern template std::future<void> Executor::pushFunction(
+    QueuePosition queuePosition,
+    std::function<void()>&& function) noexcept;
+extern template std::future<bool> Executor::pushFunction(
+    QueuePosition queuePosition,
+    std::function<bool()>&& function) noexcept;
+extern template std::future<std::string> Executor::pushFunction(
+    QueuePosition queuePosition,
+    std::function<std::string()>&& function) noexcept;
+/// @}
+
 }  // namespace threading
 }  // namespace utils
 }  // namespace avsCommon
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Threading/ExecutorFactory.h b/AVSCommon/Utils/include/AVSCommon/Utils/Threading/ExecutorFactory.h
new file mode 100644
index 0000000000..be69d72d45
--- /dev/null
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Threading/ExecutorFactory.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_THREADING_EXECUTORFACTORY_H_
+#define ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_THREADING_EXECUTORFACTORY_H_
+
+#include <memory>
+
+#include <AVSCommon/Utils/Threading/ExecutorInterface.h>
+
+namespace alexaClientSDK {
+namespace avsCommon {
+namespace utils {
+namespace threading {
+
+/**
+ * @brief Create a single-thread executor.
+ *
+ * @return New executor reference or nullptr on error.
+ */
+std::shared_ptr<ExecutorInterface> createSingleThreadExecutor() noexcept;
+
+}  // namespace threading
+}  // namespace utils
+}  // namespace avsCommon
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_THREADING_EXECUTORFACTORY_H_
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Threading/ExecutorInterface.h b/AVSCommon/Utils/include/AVSCommon/Utils/Threading/ExecutorInterface.h
new file mode 100644
index 0000000000..5762b85b73
--- /dev/null
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Threading/ExecutorInterface.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_THREADING_EXECUTORINTERFACE_H_
+#define ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_THREADING_EXECUTORINTERFACE_H_
+
+#include <functional>
+#include <system_error>
+
+namespace alexaClientSDK {
+namespace avsCommon {
+namespace utils {
+namespace threading {
+
+/**
+ * @brief Interface for asynchronous execution of functions.
+ *
+ * This interface enables submission of functions for asynchronous execution. The implementations should use thread pool
+ * to acquire threads for running functions, and may be single- or multi-threaded.
+ *
+ * Executors can be in normal mode, when they accept tasks, and in shutdown mode. In shutdown mode executors do not
+ * accept new tasks for processing, and any tasks, that haven't started an execution will be dropped.
+ *
+ * @code
+ * auto error = executor->execute([]{ ... });
+ * if (error) {
+ *     ACSDK_ERROR(LX(__func__).("executorError", error.message()));
+ * }
+ * @endcode
+ *
+ * @see Executor
+ * @see ThreadPool
+ */
+class ExecutorInterface {
+public:
+    /**
+     * @brief Destructs an Executor.
+     *
+     * This method awaits till all running tasks are completed, and drops all enqueued tasks that haven't started
+     * execution.
+     */
+    virtual ~ExecutorInterface() noexcept = default;
+
+    /**
+     * @{
+     * @brief Schedules a function for execution.
+     *
+     * Submits a function to be executed on an executor thread.
+     *
+     * @param[in] function Function to execute. Function must not be empty.
+     *
+     * @return Platform-independent error code. If successful, the error value is zero.
+     * @retval std::errc::invalid_argument If @a function is empty.
+     * @retval std::errc::operation_not_permitted If executor is shutdown.
+     */
+    virtual std::error_condition execute(std::function<void()>&& function) noexcept = 0;
+    virtual std::error_condition execute(const std::function<void()>& function) noexcept = 0;
+    /// @}
+};
+
+}  // namespace threading
+}  // namespace utils
+}  // namespace avsCommon
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_THREADING_EXECUTORINTERFACE_H_
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Threading/TaskThread.h b/AVSCommon/Utils/include/AVSCommon/Utils/Threading/TaskThread.h
index 3a26dffee5..1a4096cbe7 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Threading/TaskThread.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Threading/TaskThread.h
@@ -53,9 +53,12 @@ class TaskThread {
      *
      * @param jobRunner Function that should execute jobs. The function should return @c true if there's more tasks
      * to be executed.
+     * @param moniker Thread moniker to use when executing @a jobRunner. All logging messages will use provided
+     * moniker for identifying the execution owner.
+     *
      * @return @c true if it succeeds to start the new jobRunner thread; @c false if it fails.
      */
-    bool start(std::function<bool()> jobRunner);
+    bool start(std::function<bool()> jobRunner, const std::string& moniker);
 
 private:
     /**
@@ -66,9 +69,6 @@ class TaskThread {
      */
     void run(std::function<bool()> jobRunner);
 
-    /// The monotonic start time of the thread.
-    std::chrono::steady_clock::time_point m_startTime;
-
     /// Mutex for protecting the worker thread.
     std::mutex m_mutex;
 
@@ -81,9 +81,6 @@ class TaskThread {
     /// Flag used to indicate that there is a new job starting.
     std::atomic_bool m_alreadyStarting;
 
-    /// The task thread moniker.
-    std::string m_moniker;
-
     /// ThreadPool to use for obtaining threads.
     std::shared_ptr<ThreadPool> m_threadPool;
 
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Threading/ThreadPool.h b/AVSCommon/Utils/include/AVSCommon/Utils/Threading/ThreadPool.h
index c6ab1f83f2..8b06b86149 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Threading/ThreadPool.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Threading/ThreadPool.h
@@ -18,9 +18,6 @@
 
 #include <condition_variable>
 #include <list>
-#ifdef THREAD_AFFINITY
-#include <map>
-#endif
 #include <string>
 
 #include "WorkerThread.h"
@@ -57,10 +54,12 @@ class ThreadPool {
     /**
      * Obtain a worker thread to operate on.
      *
-     * @param optionalMoniker the moniker of the worker desired.
-     * @return the worker thread obtained.
+     * This method returns a reference to worker object. If thread pool has worker objects in the pool, it returns one
+     * of them. If thread pool is empty, a newly constructed object is returned.
+     *
+     * @return Worker thread object.
      */
-    std::unique_ptr<WorkerThread> obtainWorker(std::string optionalMoniker = "");
+    std::unique_ptr<WorkerThread> obtainWorker();
 
     /**
      * Release a worker
@@ -81,7 +80,7 @@ class ThreadPool {
      * Obtain the current maximum threads for the thread pool.
      * @return the max threads the thread pool is currently set to hold.
      */
-    uint32_t getMaxThreads();
+    size_t getMaxThreads();
 
     /**
      * Obtain statics for the thread pool
@@ -103,10 +102,6 @@ class ThreadPool {
     static std::shared_ptr<ThreadPool> getDefaultThreadPool();
 
 private:
-#ifdef THREAD_AFFINITY
-    /// Map of Worker thread monikers to worker thread iterator in the worker queue.
-    std::map<std::string, std::list<std::unique_ptr<WorkerThread>>::iterator> m_workerMap;
-#endif
     /// Queue of worker threads to vend.
     std::list<std::unique_ptr<WorkerThread>> m_workerQueue;
 
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Threading/WorkerThread.h b/AVSCommon/Utils/include/AVSCommon/Utils/Threading/WorkerThread.h
index 8ee992a49d..3daaa3b1b8 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Threading/WorkerThread.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Threading/WorkerThread.h
@@ -57,10 +57,11 @@ class WorkerThread {
     void cancel();
 
     /**
-     * Return the moniker for the worker thread.
-     * @return the worker thread moniker.
+     * Return thread id.
+     *
+     * @return Thread id for the allocated thread.
      */
-    std::string getMoniker() const;
+    std::thread::id getThreadId() const;
 
 private:
     /**
@@ -68,9 +69,6 @@ class WorkerThread {
      */
     void runInternal();
 
-    /// The thread moniker for the worker thread.
-    const std::string m_moniker;
-
     /// Flag indicating the thread is stopping.
     std::atomic<bool> m_stop;
 
@@ -88,6 +86,9 @@ class WorkerThread {
 
     /// Condition variable for waking the thread.
     std::condition_variable m_workReady;
+
+    /// Platform-specific thread identifier.
+    std::thread::id m_threadId;
 };
 
 }  // namespace threading
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Timing/MultiTimer.h b/AVSCommon/Utils/include/AVSCommon/Utils/Timing/MultiTimer.h
index 169a80b57b..bc86dedfd9 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Timing/MultiTimer.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Timing/MultiTimer.h
@@ -45,17 +45,17 @@ class MultiTimer {
      * Factory method that creates a shared pointer to a MultiTimer.
      * @return A new instance of MultiTimer.
      */
-    static std::shared_ptr<MultiTimer> createMultiTimer();
+    static std::shared_ptr<MultiTimer> createMultiTimer() noexcept;
 
     /**
      * Constructor.
      */
-    MultiTimer();
+    MultiTimer() noexcept;
 
     /**
      * Destructor.
      */
-    ~MultiTimer();
+    ~MultiTimer() noexcept;
 
     /**
      * Submits a task to be executed after a given delay.
@@ -66,14 +66,14 @@ class MultiTimer {
      * @param task The task to be executed.
      * @return A unique token that can be used to cancel this task.
      */
-    Token submitTask(const std::chrono::milliseconds& delay, std::function<void()> task);
+    Token submitTask(const std::chrono::milliseconds& delay, std::function<void()> task) noexcept;
 
     /**
      * Removes a task from the queue.
      *
      * @param token The token used to identify the task to be canceled.
      */
-    void cancelTask(Token token);
+    void cancelTask(Token token) noexcept;
 
 private:
     /**
@@ -81,7 +81,7 @@ class MultiTimer {
      *
      * @return @c true if there are more timers scheduled; @c false otherwise.
      */
-    bool executeTimer();
+    bool executeTimer() noexcept;
 
     /**
      * Checks if there are any pending tasks within a grace period determined by an internal timeout.
@@ -89,11 +89,15 @@ class MultiTimer {
      * @param lock The lock being held during the check.
      * @return @c true if there's at least one task left; @c false if there is no pending task.
      */
-    bool hasNextLocked(std::unique_lock<std::mutex>& lock);
+    bool hasNextLocked(std::unique_lock<std::mutex>& lock) noexcept;
 
     /// Alias for the time point used in this class.
     using TimePoint = std::chrono::time_point<std::chrono::steady_clock>;
 
+    /// Moniker for timer tasks.
+    /// Whenever timer runs a task, it guarantees that task's thread has this value set with @c ThreadMoniker.
+    const std::string m_timerMoniker;
+
     /// The condition variable used to wait for the next task.
     std::condition_variable m_waitCondition;
 
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Timing/Timer.h b/AVSCommon/Utils/include/AVSCommon/Utils/Timing/Timer.h
index bad0d3e6d4..c0edac49d8 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Timing/Timer.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Timing/Timer.h
@@ -23,10 +23,8 @@
 #include <mutex>
 #include <thread>
 
-#include "AVSCommon/Utils/Error/FinallyGuard.h"
-#include "AVSCommon/AVS/Initialization/SDKPrimitivesProvider.h"
-#include "AVSCommon/Utils/Logger/LoggerUtils.h"
-#include "AVSCommon/Utils/Timing/TimerDelegate.h"
+#include <AVSCommon/AVS/Initialization/SDKPrimitivesProvider.h>
+#include <AVSCommon/Utils/Timing/TimerDelegate.h>
 
 namespace alexaClientSDK {
 namespace avsCommon {
@@ -34,6 +32,8 @@ namespace utils {
 namespace timing {
 
 /**
+ * @brief Timer to schedule task for delayed and periodic execution.
+ *
  * A @c Timer is used to schedule a callable type to run in the future.
  */
 class Timer {
@@ -42,7 +42,7 @@ class Timer {
      * Value for @c start()'s @c maxCount parameter which indicates that the @c Timer should continue firing
      * indefinitely.
      */
-    static const size_t FOREVER = 0;
+    static constexpr size_t FOREVER = 0;
 
     /// Specifies different ways to apply the period of a recurring task.
     enum class PeriodType {
@@ -51,8 +51,8 @@ class Timer {
          * period type ensures task calls occur on a predictable cadence.
          *
          * @note A timer makes one task call at a time, so if a task call takes more than one period to execute,
-         *     the subsequent calls which would have occured while the task was still executing will be skipped, and
-         *     the next call will not occur until the next period-multiple after the original task call completes.
+         *       the subsequent calls which would have occured while the task was still executing will be skipped, and
+         *       the next call will not occur until the next period-multiple after the original task call completes.
          */
         ABSOLUTE,
 
@@ -64,163 +64,188 @@ class Timer {
     };
 
     /**
-     * Contructs a @c Timer.
+     * @brief Constructs a @c Timer.
      *
-     * @param timerDelegateFactory A factory to create the @c TimerDelegate.
+     * @param[in] timerDelegateFactory A factory to create the @c TimerDelegate. By if the parameter is nullptr,
+     *                                 implementation will use TimerDelegateFactory.
      */
     Timer(
-        std::shared_ptr<sdkInterfaces::timing::TimerDelegateFactoryInterface> timerDelegateFactory =
-            avs::initialization::SDKPrimitivesProvider::getInstance()->getTimerDelegateFactory());
+        const std::shared_ptr<sdkInterfaces::timing::TimerDelegateFactoryInterface>& timerDelegateFactory =
+            avs::initialization::SDKPrimitivesProvider::getInstance()->getTimerDelegateFactory()) noexcept;
 
     /**
-     * Destructs a @c Timer.
+     * @brief Destructs a @c Timer.
      */
-    ~Timer();
+    ~Timer() noexcept;
 
     /// Static member function to get FOREVER.
-    static size_t getForever() {
+    static inline size_t getForever() noexcept {
         return FOREVER;
     }
 
-    /// Static member function to get TAG.
-    static std::string getTag() {
-        return "Timer";
-    }
-
     /**
+     * @brief Submit a callable type for periodic execution.
+     *
      * Submits a callable type (function, lambda expression, bind expression, or another function object) to be
      * executed after an initial delay, and then called repeatedly on a fixed time schedule.  A @c Timer instance
      * manages only one running @c Timer at a time; calling @c start() on an already-running @c Timer will fail.
      * Note that the template parameters are typically inferred from the function paramters when calling @c start().
      *
-     * @tparam Rep A type for measuring 'ticks' in a generic @c std::chrono::duration.
-     * @tparam Period A type for representing the number of ticks per second in a generic @c std::chrono::duration.
-     * @tparam Task The type of task to execute.
-     * @tparam Args The argument types for the task to execute.
+     * @tparam Delay    Initial delay type. This can be any specialization of std::chrono::duration convertible to
+     *                  std::chrono::nanoseconds.
+     * @tparam Period   Period type. This can be any specialization of std::chrono::duration convertible to
+     *                  std::chrono::nanoseconds.
+     * @tparam Task     The type of task to execute.
+     * @tparam Args     The argument types for the task to execute.
+     *
+     * @param[in] delay      The non-negative time to wait before making the first task call. Negative values will cause
+     *                       this function to return false.
+     * @param[in] period     The non-negative time to wait between subsequent task calls. Negative values will cause
+     *                       this function to return false.
+     * @param[in] periodType The type of period to use when making subsequent task calls.
+     * @param[in] maxCount   The desired number of times to call task.  Timer::getForever() means to call forever until
+     *                       Timer::stop() is called. Note that fewer than @a maxCount calls may occur if @a periodType
+     *                       is PeriodType::ABSOLUTE and the task runtime exceeds @a period.
+     * @param[in] task       A callable type representing a task.
+     * @param[in] args       The arguments to call the task with.
      *
-     * @param delay The non-negative time to wait before making the first task call.  Negative values will cause this
-     *    function to return false.
-     * @param period The non-negative time to wait between subsequent task calls.  Negative values will cause this
-     *    function to return false.
-     * @param periodType The type of period to use when making subsequent task calls.
-     * @param maxCount The desired number of times to call task.  @c Timer::getForever() means to call forever until
-     *     @c stop() is called.  Note that fewer than @c maxCount calls may occur if @c periodType is
-     *     @c PeriodType::ABSOLUTE and the task runtime exceeds @c period.
-     * @param task A callable type representing a task.
-     * @param args The arguments to call the task with.
      * @returns @c true if the timer started, else @c false.
      */
-    template <typename Rep, typename Period, typename Task, typename... Args>
+    template <typename Delay, typename Period, typename Task, typename... Args>
     bool start(
-        const std::chrono::duration<Rep, Period>& delay,
-        const std::chrono::duration<Rep, Period>& period,
+        Delay&& delay,
+        Period&& period,
         PeriodType periodType,
         size_t maxCount,
-        Task task,
-        Args&&... args);
+        Task&& task,
+        Args&&... args) noexcept;
 
     /**
+     * @brief Submit a callable type for periodic execution.
+     *
      * Submits a callable type (function, lambda expression, bind expression, or another function object) to be
      * executed repeatedly on a fixed time schedule.  A @c Timer instance manages only one running @c Timer at a time;
      * calling @c start() on an already-running @c Timer will fail.  Note that the template parameters are typically
      * inferred from the function paramters when calling @c start().
      *
-     * @tparam Rep A type for measuring 'ticks' in a generic @c std::chrono::duration.
-     * @tparam Period A type for representing the number of ticks per second in a generic @c std::chrono::duration.
-     * @tparam Task The type of task to execute.
-     * @tparam Args The argument types for the task to execute.
+     * @tparam Period   Period and initial delay type. This can be any specialization of std::chrono::duration
+     *                  convertible to std::chrono::nanoseconds.
+     * @tparam Task     The type of task to execute. This must be callable with @a args parameters.
+     * @tparam Args     The argument types for the task to execute.
+     *
+     * @param[in] period     The non-negative time to wait before each @a task call.  Negative values will cause this
+     *                       function to return false.
+     * @param[in] periodType The type of period to use when making subsequent task calls.
+     * @param[in] maxCount   The desired number of times to call task.  Timer::getForever() means to call forever until
+     *                       Timer::stop() is called.  Note that fewer than @a maxCount calls may occur if @a periodType
+     *                       is PeriodType::ABSOLUTE and the task runtime exceeds @a period.
+     * @param[in] task       A callable type representing a task.
+     * @param[in] args       The arguments to call @a task with.
      *
-     * @param period The non-negative time to wait before each @c task call.  Negative values will cause this
-     *    function to return false.
-     * @param periodType The type of period to use when making subsequent task calls.
-     * @param maxCount The desired number of times to call task.  @c Timer::getForever() means to call forever until
-     *     @c stop() is called.  Note that fewer than @c maxCount calls may occur if @c periodType is
-     *     @c PeriodType::ABSOLUTE and the task runtime exceeds @c period.
-     * @param task A callable type representing a task.
-     * @param args The arguments to call @c task with.
      * @returns @c true if the timer started, else @c false.
      */
-    template <typename Rep, typename Period, typename Task, typename... Args>
-    bool start(
-        const std::chrono::duration<Rep, Period>& period,
-        PeriodType periodType,
-        size_t maxCount,
-        Task task,
-        Args&&... args);
+    template <typename Period, typename Task, typename... Args>
+    bool start(Period&& period, PeriodType periodType, size_t maxCount, Task&& task, Args&&... args) noexcept;
 
     /**
+     * @brief Submit a callable type for single execution with future result.
+     *
      * Submits a callable type (function, lambda expression, bind expression, or another function object) to be
      * executed once, after the specified duration.  A @c Timer instance manages only one running @c Timer at a time;
      * calling @c start() on an already-running @c Timer will fail.  Note that the template parameters are typically
-     * inferred from the function paramters when calling @c start().
+     * inferred from the function parameters when calling @c start().
      *
-     * @tparam Rep A type for measuring 'ticks' in a generic @c std::chrono::duration.
-     * @tparam Period A type for representing the number of ticks per second in a generic @c std::chrono::duration.
-     * @tparam Task The type of task to execute.
-     * @tparam Args The argument types for the task to execute.
+     * @tparam Delay    Delay type. This can be any specialization of std::chrono::duration convertible to
+     *                  std::chrono::nanoseconds.
+     * @tparam Task     The type of task to execute.
+     * @tparam Args     The argument types for the task to execute.
      *
-     * @param delay The non-negative time to wait before calling @c task.  Negative values will cause this
-     *    function to return an invalid future.
-     * @param task A callable type representing a task.
-     * @param args The arguments to call @c task with.
-     * @returns A valid @c std::future for the return value of @c task if the timer started, else an invalid
-     *     @c std::future.  Note that the promise will be broken if @c stop() is called before @c task is called.
+     * @param[in] delay The non-negative time to wait before calling @a task. Negative values will cause this function
+     *                  to return an invalid future.
+     * @param[in] task  A callable type representing a task.
+     * @param[in] args  The arguments to call @c task with.
+     *
+     * @returns A valid @c std::future for the return value of @c task if the timer started, else an invalid @c
+     *          std::future.  Note that the promise will be broken if Timer::stop() is called before @a task is called.
      */
-    template <typename Rep, typename Period, typename Task, typename... Args>
-    auto start(const std::chrono::duration<Rep, Period>& delay, Task task, Args&&... args)
-        -> std::future<decltype(task(args...))>;
+    template <typename Delay, typename Task, typename... Args>
+    auto start(Delay&& delay, Task&& task, Args&&... args) noexcept -> std::future<decltype(task(args...))>;
 
     /**
+     * @brief Stop the timer.
+     *
      * Stops the @c Timer (if running).  This will not interrupt an active call to the task, but will prevent any
-     * subequent calls to the task.  If @c stop() is called while the task is executing, this function will block until
+     * subsequent calls to the task.  If @c stop() is called while the task is executing, this function will block until
      * the task completes.
      *
      * @note In the special case that @c stop() is called from inside the task function, @c stop() will still prevent
-     *     any subsequent calls to the task, but will *not* block as described above.
+     *       any subsequent calls to the task, but will *not* block as described above.
      */
-    void stop();
+    void stop() noexcept;
 
     /**
+     * @brief Check if timer is active.
+     *
      * Reports whether the @c Timer is active.  A timer is considered active if it is waiting to start a call to the
      * task, or if a call to the task is in progress.  A timer is only considered inactive if it has not been started,
      * if all requested/scheduled calls to the task have completed, or after a call to @c stop().
      *
      * @returns @c true if the @c Timer is active, else @c false.
      */
-    bool isActive() const;
+    bool isActive() const noexcept;
 
 private:
+    /**
+     * Value for Timer::start()'s @a maxCount parameter which indicates that the @c Timer should fire once.
+     */
+    static constexpr size_t ONCE = 1u;
+
     /**
      * Atomically activates this @c Timer (by setting @c m_running).
      *
      * @returns @c true if the @c Timer was previously inactive, else @c false.
      */
-    bool activate();
+    bool activate() noexcept;
 
     /**
      * Waits for the @c Timer @c period, then calls @c task.
      *
-     * @tparam Rep A type for measuring 'ticks' in a generic @c std::chrono::duration.
-     * @tparam Period A type for representing the number of ticks per second in a generic @c std::chrono::duration.
-     *
-     * @param delay The non-negative time to wait before making the first @c task call.
-     * @param period The non-negative time to wait between subsequent @c task calls.
-     * @param periodType The type of period to use when making subsequent task calls.
-     * @param maxCount The desired number of times to call task.  @c Timer::getForever() means to call forever until
-     *     @c stop() is called.  Note that fewer than @c maxCount calls may occur if @c periodType is
-     *     @c PeriodType::ABSOLUTE and the task runtime exceeds @c period.
-     * @param task A callable type representing a task.
+     * @param[in] delayNano  The non-negative time to wait before making the first @a task call.
+     * @param[in] periodNano The non-negative time to wait between subsequent @a task calls.
+     * @param[in] periodType The type of period to use when making subsequent task calls.
+     * @param[in] maxCount   The desired number of times to call task. Timer::getForever() means to call forever until
+     *                       Timer::stop() is called. Note that fewer than @a maxCount calls may occur if @a periodType
+     *                       is PeriodType::ABSOLUTE and the task runtime exceeds @a period.
+     * @param[in] task       Function object to call. It must be not empty.
      */
-    template <typename Rep, typename Period>
-    void callTask(
-        std::chrono::duration<Rep, Period> delay,
-        std::chrono::duration<Rep, Period> period,
+    bool callTask(
+        const std::chrono::nanoseconds& delayNano,
+        const std::chrono::nanoseconds& periodNano,
         PeriodType periodType,
         size_t maxCount,
-        std::function<void()> task);
+        std::function<void()>&& task) noexcept;
 
-    /// The mutex to protect the @c TimerDelegate.
-    mutable std::mutex m_mutex;
+    /**
+     * @brief Proxy method for convering delay and period to nanoseconds.
+     *
+     * @tparam Delay    Initial delay type. This can be any specialization of std::chrono::duration convertible to
+     *                  std::chrono::nanoseconds.
+     * @tparam Period   Period type. This can be any specialization of std::chrono::duration convertible to
+     *                  std::chrono::nanoseconds.
+     * @param delayNano
+     * @param periodNano
+     * @param periodType
+     * @param maxCount
+     * @param task
+     * @return
+     */
+    template <typename Delay, typename Period>
+    bool adaptTypesAndCallTask(
+        const Delay& delayNano,
+        const Period& periodNano,
+        PeriodType periodType,
+        size_t maxCount,
+        std::function<void()>&& task) noexcept;
 
     /// The @c TimerDelegateInterface which contains timer related logic.
     std::unique_ptr<sdkInterfaces::timing::TimerDelegateInterface> m_timer;
@@ -229,114 +254,88 @@ class Timer {
     std::thread m_thread;
 };
 
-template <typename Rep, typename Period, typename Task, typename... Args>
+template <typename Delay, typename Period, typename Task, typename... Args>
 bool Timer::start(
-    const std::chrono::duration<Rep, Period>& delay,
-    const std::chrono::duration<Rep, Period>& period,
+    Delay&& delay,
+    Period&& period,
     PeriodType periodType,
     size_t maxCount,
-    Task task,
-    Args&&... args) {
-    if (delay < std::chrono::duration<Rep, Period>::zero()) {
-        logger::acsdkError(logger::LogEntry(Timer::getTag(), "startFailed").d("reason", "negativeDelay"));
-        return false;
-    }
-    if (period < std::chrono::duration<Rep, Period>::zero()) {
-        logger::acsdkError(logger::LogEntry(Timer::getTag(), "startFailed").d("reason", "negativePeriod"));
-        return false;
-    }
-
-    // Don't start if already running.
-    if (!activate()) {
-        logger::acsdkError(logger::LogEntry(Timer::getTag(), "startFailed").d("reason", "timerAlreadyActive"));
-        return false;
-    }
-
-    // Remove arguments from the task's type by binding the arguments to the task.
-    using BoundTaskType = decltype(std::bind(std::forward<Task>(task), std::forward<Args>(args)...));
-    auto boundTask = std::make_shared<BoundTaskType>(std::bind(std::forward<Task>(task), std::forward<Args>(args)...));
-
-    // Remove the return type from the task by wrapping it in a lambda with no return value.
-    auto translatedTask = [boundTask]() { boundTask->operator()(); };
+    Task&& task,
+    Args&&... args) noexcept {
+    // convert arguments to lambda
+    auto boundTask = std::bind(std::forward<Task>(task), std::forward<Args>(args)...);
 
     // Kick off the new timer thread.
-    callTask<Rep, Period>(delay, period, periodType, maxCount, translatedTask);
-
-    return true;
+    return adaptTypesAndCallTask(
+        std::forward<Delay>(delay), std::forward<Period>(period), periodType, maxCount, std::move(boundTask));
 }
 
-template <typename Rep, typename Period, typename Task, typename... Args>
-bool Timer::start(
-    const std::chrono::duration<Rep, Period>& period,
-    PeriodType periodType,
-    size_t maxCount,
-    Task task,
-    Args&&... args) {
-    return start(period, period, periodType, maxCount, std::forward<Task>(task), std::forward<Args>(args)...);
+template <typename Period, typename Task, typename... Args>
+bool Timer::start(Period&& period, PeriodType periodType, size_t maxCount, Task&& task, Args&&... args) noexcept {
+    // convert arguments to lambda
+    auto boundTask = std::bind(std::forward<Task>(task), std::forward<Args>(args)...);
+
+    // Kick off the new timer thread.
+    return adaptTypesAndCallTask(
+        std::forward<Period>(period), std::forward<Period>(period), periodType, maxCount, std::move(boundTask));
 }
 
-template <typename Rep, typename Period, typename Task, typename... Args>
-auto Timer::start(const std::chrono::duration<Rep, Period>& delay, Task task, Args&&... args)
-    -> std::future<decltype(task(args...))> {
-    // Don't start if already running.
-    if (!activate()) {
-        logger::acsdkError(logger::LogEntry(Timer::getTag(), "startFailed").d("reason", "timerAlreadyActive"));
-        using FutureType = decltype(task(args...));
-        return std::future<FutureType>();
-    }
+template <typename Delay, typename Task, typename... Args>
+auto Timer::start(Delay&& delay, Task&& task, Args&&... args) noexcept -> std::future<decltype(task(args...))> {
+    // Task result value type.
+    using Value = decltype(task(args...));
 
     // Remove arguments from the task's type by binding the arguments to the task.
     auto boundTask = std::bind(std::forward<Task>(task), std::forward<Args>(args)...);
 
     /*
-     * Create a std::packaged_task with the correct return type. The decltype only returns the return value of the
-     * boundTask. The following parentheses make it a function call with the boundTask return type. The package task
-     * will then return a future of the correct type.
+     * Create a std::packaged_task with the correct return type. The reference will be passed into execution context
+     * and will not be shared between threads.
      */
-    using PackagedTaskType = std::packaged_task<decltype(boundTask())()>;
-    auto packagedTask = std::make_shared<PackagedTaskType>(boundTask);
+    auto packagedTask = std::make_shared<std::packaged_task<Value()>>(std::move(boundTask));
+    // Get future object reference for function result.
+    auto packagedTaskFuture = packagedTask->get_future();
 
     // Remove the return type from the task by wrapping it in a lambda with no return value.
-    auto translatedTask = [packagedTask]() { packagedTask->operator()(); };
+    auto translatedTask = std::bind(&std::packaged_task<Value()>::operator(), std::move(packagedTask));
 
     // Kick off the new timer thread.
-    static const size_t once = 1;
-    callTask<Rep, Period>(delay, delay, PeriodType::ABSOLUTE, once, translatedTask);
+    if (!adaptTypesAndCallTask(
+            std::forward<Delay>(delay),
+            std::forward<Delay>(delay),
+            PeriodType::ABSOLUTE,
+            ONCE,
+            std::move(translatedTask))) {
+        return std::future<Value>();
+    }
 
-    return packagedTask->get_future();
+    return packagedTaskFuture;
 }
 
-template <typename Rep, typename Period>
-void Timer::callTask(
-    std::chrono::duration<Rep, Period> delay,
-    std::chrono::duration<Rep, Period> period,
+template <typename Delay, typename Period>
+bool Timer::adaptTypesAndCallTask(
+    const Delay& delay,
+    const Period& period,
     PeriodType periodType,
     size_t maxCount,
-    std::function<void()> task) {
-    if (!m_timer) {
-        logger::acsdkError(logger::LogEntry(Timer::getTag(), "callTaskFailed").d("reason", "nullTimerDelegate"));
-        return;
-    }
-
-    auto delegatePeriodType = sdkInterfaces::timing::TimerDelegateInterface::PeriodType::ABSOLUTE;
-
-    switch (periodType) {
-        case PeriodType::ABSOLUTE:
-            delegatePeriodType = sdkInterfaces::timing::TimerDelegateInterface::PeriodType::ABSOLUTE;
-            break;
-        case PeriodType::RELATIVE:
-            delegatePeriodType = sdkInterfaces::timing::TimerDelegateInterface::PeriodType::RELATIVE;
-            break;
-    }
-
-    m_timer->start(
-        std::chrono::duration_cast<std::chrono::nanoseconds>(delay),
-        std::chrono::duration_cast<std::chrono::nanoseconds>(period),
-        delegatePeriodType,
-        maxCount,
-        task);
+    std::function<void()>&& task) noexcept {
+    return callTask(delay, period, periodType, maxCount, std::move(task));
 }
 
+// Externalize templates for common parameter types.
+extern template bool Timer::adaptTypesAndCallTask(
+    const std::chrono::milliseconds&,
+    const std::chrono::milliseconds&,
+    PeriodType,
+    size_t,
+    std::function<void()>&&) noexcept;
+extern template bool Timer::adaptTypesAndCallTask(
+    const std::chrono::nanoseconds&,
+    const std::chrono::nanoseconds&,
+    PeriodType,
+    size_t,
+    std::function<void()>&&) noexcept;
+
 }  // namespace timing
 }  // namespace utils
 }  // namespace avsCommon
diff --git a/AVSCommon/Utils/include/AVSCommon/Utils/Timing/TimerDelegate.h b/AVSCommon/Utils/include/AVSCommon/Utils/Timing/TimerDelegate.h
index 3a98f15b36..5795d42967 100644
--- a/AVSCommon/Utils/include/AVSCommon/Utils/Timing/TimerDelegate.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/Timing/TimerDelegate.h
@@ -57,13 +57,15 @@ class TimerDelegate : public sdkInterfaces::timing::TimerDelegateInterface {
      * @param periodType The type of period to use when making subsequent task calls.
      * @param maxCount The desired number of times to call task.
      * @param task A callable type representing a task.
+     * @param moniker Moniker value to use for a new thread.
      */
     void timerLoop(
         std::chrono::nanoseconds delay,
         std::chrono::nanoseconds period,
         PeriodType periodType,
         size_t maxCount,
-        std::function<void()> task);
+        std::function<void()> task,
+        std::string moniker);
 
     /// Cleanup logic which waits for the thread to join if possible. @c m_callMutex must be held before calling.
     void cleanupLocked();
diff --git a/shared/acsdkManufactory/include/acsdkManufactory/internal/TypeIndex.h b/AVSCommon/Utils/include/AVSCommon/Utils/TypeIndex.h
similarity index 82%
rename from shared/acsdkManufactory/include/acsdkManufactory/internal/TypeIndex.h
rename to AVSCommon/Utils/include/AVSCommon/Utils/TypeIndex.h
index 68efa7cafb..28cfcc110b 100644
--- a/shared/acsdkManufactory/include/acsdkManufactory/internal/TypeIndex.h
+++ b/AVSCommon/Utils/include/AVSCommon/Utils/TypeIndex.h
@@ -13,10 +13,9 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKMANUFACTORY_INTERNAL_TYPEINDEX_H_
-#define ACSDKMANUFACTORY_INTERNAL_TYPEINDEX_H_
+#ifndef ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_TYPEINDEX_H_
+#define ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_TYPEINDEX_H_
 
-#include <functional>
 #include <sstream>
 #include <string>
 #include <typeindex>
@@ -26,12 +25,9 @@
 #include <AVSCommon/Utils/Logger/LoggerUtils.h>
 #include <AVSCommon/Utils/PlatformDefinitions.h>
 
-#include "acsdkManufactory/internal/TypeTraitsHelper.h"
-
 namespace alexaClientSDK {
-namespace acsdkManufactory {
-namespace internal {
-
+namespace avsCommon {
+namespace utils {
 /**
  * TypeIndex provide a sortable and hashable identity for C++ types, much like std::type_index,
  * but with optional use of RTTI.
@@ -101,7 +97,7 @@ struct TypeIndex {
      *
      * @param value A value that uniquely identifies a type.
      */
-    TypeIndex(Value value);
+    explicit TypeIndex(Value value);
 
     /// The value used to uniquely identify a type.
     Value m_value;
@@ -135,7 +131,8 @@ char TypeIndex::TypeSpecific<Type>::m_instance;
  */
 template <typename Type>
 inline TypeIndex getTypeIndex() {
-    return TypeIndex{&TypeIndex::TypeSpecific<RemoveCvref_t<Type> >::m_instance};
+    return TypeIndex{&TypeIndex::TypeSpecific<
+        typename std::remove_cv<typename std::remove_reference<Type>::type>::type>::m_instance};
 }
 
 inline std::string TypeIndex::getName() const {
@@ -172,7 +169,7 @@ template <typename Type>
 inline void logTypeIndex(const std::string& name) {
     avsCommon::utils::logger::acsdkInfo(avsCommon::utils::logger::LogEntry("TypeIndex", __func__)
                                             .d("name", name)
-                                            .d("TypeIndex", internal::getTypeIndex<Type>().getName()));
+                                            .d("TypeIndex", getTypeIndex<Type>().getName()));
 }
 
 /**
@@ -180,22 +177,22 @@ inline void logTypeIndex(const std::string& name) {
  */
 #define ACSDK_LOG_TYPE_INDEX(type) logTypeIndex<type>(#type)
 
-}  // namespace internal
-}  // namespace acsdkManufactory
+}  // namespace utils
+}  // namespace avsCommon
 }  // namespace alexaClientSDK
 
 namespace std {
 
 template <>
-struct hash<alexaClientSDK::acsdkManufactory::internal::TypeIndex> {
-    std::size_t operator()(alexaClientSDK::acsdkManufactory::internal::TypeIndex typeIndex) const;
+struct hash<alexaClientSDK::avsCommon::utils::TypeIndex> {
+    std::size_t operator()(alexaClientSDK::avsCommon::utils::TypeIndex typeIndex) const;
 };
 
-inline std::size_t hash<alexaClientSDK::acsdkManufactory::internal::TypeIndex>::operator()(
-    alexaClientSDK::acsdkManufactory::internal::TypeIndex typeIndex) const {
-    return hash<alexaClientSDK::acsdkManufactory::internal::TypeIndex::Value>()(typeIndex.m_value);
+inline std::size_t hash<alexaClientSDK::avsCommon::utils::TypeIndex>::operator()(
+    alexaClientSDK::avsCommon::utils::TypeIndex typeIndex) const {
+    return hash<alexaClientSDK::avsCommon::utils::TypeIndex::Value>()(typeIndex.m_value);
 }
 
 }  // namespace std
 
-#endif  // ACSDKMANUFACTORY_INTERNAL_TYPEINDEX_H_
\ No newline at end of file
+#endif  // ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_INCLUDE_AVSCOMMON_UTILS_TYPEINDEX_H_
diff --git a/AVSCommon/Utils/privateInclude/AVSCommon/Utils/Threading/private/SharedExecutor.h b/AVSCommon/Utils/privateInclude/AVSCommon/Utils/Threading/private/SharedExecutor.h
new file mode 100644
index 0000000000..d9472c4329
--- /dev/null
+++ b/AVSCommon/Utils/privateInclude/AVSCommon/Utils/Threading/private/SharedExecutor.h
@@ -0,0 +1,155 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_PRIVATEINCLUDE_AVSCOMMON_UTILS_THREADING_PRIVATE_SHAREDEXECUTOR_H_
+#define ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_PRIVATEINCLUDE_AVSCOMMON_UTILS_THREADING_PRIVATE_SHAREDEXECUTOR_H_
+
+#include <atomic>
+#include <condition_variable>
+#include <chrono>
+#include <deque>
+#include <functional>
+#include <future>
+#include <memory>
+#include <mutex>
+#include <utility>
+
+#include <AVSCommon/Utils/Threading/ExecutorInterface.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include <AVSCommon/Utils/Threading/TaskThread.h>
+#include <AVSCommon/Utils/Power/PowerResource.h>
+
+namespace alexaClientSDK {
+namespace avsCommon {
+namespace utils {
+namespace threading {
+
+/**
+ * @brief Shared executor implementation.
+ *
+ * This implementation is managed by std::shared_ptr<ExecutorInterface>.
+ */
+class SharedExecutor : public virtual ExecutorInterface {
+public:
+    /**
+     * @brief Constructs an object.
+     */
+    SharedExecutor() noexcept;
+
+    /**
+     * @brief Destructs an Executor.
+     *
+     * This method awaits till all running tasks are completed, and drops all enqueued tasks that haven't started
+     * execution.
+     *
+     * @see #shutdown()
+     * @see #waitForSubmittedTasks()
+     */
+    ~SharedExecutor() noexcept;
+
+    /// @name Methods from ExecutorInterface.
+    /// @{
+    std::error_condition execute(std::function<void()>&& function) noexcept override;
+    std::error_condition execute(const std::function<void()>& function) noexcept override;
+    /// @}
+
+    /**
+     * Waits for any previously submitted tasks to complete.
+     */
+    void waitForSubmittedTasks() noexcept;
+
+    /// Clears the executor of outstanding tasks and refuses any additional tasks to be submitted.
+    void shutdown() noexcept;
+
+    /**
+     * @brief Returns whether or not the executor is shutdown.
+     *
+     * @return True if Executor::shutdown() has been called.
+     */
+    bool isShutdown() noexcept;
+
+private:
+    // Friend declaration.
+    friend class Executor;
+
+    /// Alias for queue position.
+    using QueuePosition = Executor::QueuePosition;
+
+    /// The queue type to use for holding tasks.
+    using Queue = std::deque<std::function<void()>>;
+
+    /**
+     * Executes the next job in the queue.
+     *
+     * @return @c true if there's a next job; @c false if the job queue is empty.
+     */
+    bool runNext() noexcept;
+
+    /**
+     * Checks if the job queue is empty and that no job is added in the grace period determined by @c m_timeout.
+     *
+     * @return @c true if there's at least one job left in the queue; @c false if the job queue is empty.
+     */
+    bool hasNext() noexcept;
+
+    /**
+     * Returns and removes the task at the front of the queue. If there are no tasks, this call will return an empty
+     * function.
+     *
+     * @returns A function that represents a new task. The function will be empty if the queue has no job.
+     */
+    std::function<void()> pop() noexcept;
+
+    /**
+     * @brief Schedules a function for execution.
+     *
+     * Submits a function to be executed on an Executor thread.
+     *
+     * @param[in] function Function to execute.
+     * @param[in] queuePosition Position in the queue for the new task.
+     *
+     * @return Portable error code. If successful, value is zero.
+     */
+    std::error_condition execute(std::function<void()>&& function, QueuePosition queuePosition) noexcept;
+
+    /// Moniker for executed tasks.
+    /// Whenever executor runs a task, it guarantees that task's thread has this value set with @c ThreadMoniker.
+    const std::string m_executorMoniker;
+
+    /// The queue of tasks
+    Queue m_queue;
+
+    /// Flag to indicate if the taskThread already have an executing job.
+    bool m_threadRunning;
+
+    /// A mutex to protect access to the tasks in m_queue.
+    std::mutex m_queueMutex;
+
+    /// A flag for whether or not the queue is expecting more tasks.
+    std::atomic_bool m_shutdown;
+
+    /// A @c PowerResource.
+    std::shared_ptr<power::PowerResource> m_powerResource;
+
+    /// The thread to execute tasks on. The thread must be declared last to be destructed first.
+    TaskThread m_taskThread;
+};
+
+}  // namespace threading
+}  // namespace utils
+}  // namespace avsCommon
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_PRIVATEINCLUDE_AVSCOMMON_UTILS_THREADING_PRIVATE_SHAREDEXECUTOR_H_
diff --git a/AVSCommon/Utils/src/BluetoothEventBus.cpp b/AVSCommon/Utils/src/BluetoothEventBus.cpp
index 3753a2e744..811b259cca 100644
--- a/AVSCommon/Utils/src/BluetoothEventBus.cpp
+++ b/AVSCommon/Utils/src/BluetoothEventBus.cpp
@@ -23,7 +23,7 @@ namespace utils {
 namespace bluetooth {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BluetoothEventBus"};
+#define TAG "BluetoothEventBus"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/Configuration/ConfigurationNode.cpp b/AVSCommon/Utils/src/Configuration/ConfigurationNode.cpp
index 59838ecd6c..f474ec255f 100644
--- a/AVSCommon/Utils/src/Configuration/ConfigurationNode.cpp
+++ b/AVSCommon/Utils/src/Configuration/ConfigurationNode.cpp
@@ -28,7 +28,7 @@ namespace utils {
 namespace configuration {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ConfigurationNode");
+#define TAG "ConfigurationNode"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -59,6 +59,9 @@ static std::string valueToString(const Value& value) {
     ACSDK_ERROR(LX("valueToStringFailed").d("reason", "AcceptReturnedFalse"));
     return "";
 }
+#else
+// This method is not called when debug logging is disabled, but we need it for sizeof() evaluation.
+std::string valueToString(const Value& value);
 #endif  // ACSDK_DEBUG_LOG_ENABLED
 
 /**
@@ -169,10 +172,14 @@ bool ConfigurationNode::getString(const std::string& key, const char** out, cons
 }
 
 ConfigurationNode ConfigurationNode::operator[](const std::string& key) const {
-    if (!*this) {
+    return getChildNode(key.c_str());
+}
+
+ConfigurationNode ConfigurationNode::getChildNode(const char* key) const {
+    if (!*this || !key) {
         return ConfigurationNode();
     }
-    auto it = m_object->FindMember(key.c_str());
+    auto it = m_object->FindMember(key);
     if (m_object->MemberEnd() == it || !it->value.IsObject()) {
         return ConfigurationNode();
     }
@@ -256,7 +263,7 @@ ConfigurationNode ConfigurationNode::operator[](const std::size_t index) const {
         return ConfigurationNode();
     }
     const rapidjson::Value& objectRef = *m_object;
-    return ConfigurationNode(&objectRef[index]);
+    return ConfigurationNode(&objectRef[static_cast<rapidjson::SizeType>(index)]);
 }
 
 }  // namespace configuration
diff --git a/AVSCommon/Utils/src/DeviceInfo.cpp b/AVSCommon/Utils/src/DeviceInfo.cpp
index 60f052ef03..7c77f5e456 100644
--- a/AVSCommon/Utils/src/DeviceInfo.cpp
+++ b/AVSCommon/Utils/src/DeviceInfo.cpp
@@ -23,7 +23,7 @@ namespace avsCommon {
 namespace utils {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DeviceInfo");
+#define TAG "DeviceInfo"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/Executor.cpp b/AVSCommon/Utils/src/Executor.cpp
deleted file mode 100644
index ac14bfc82e..0000000000
--- a/AVSCommon/Utils/src/Executor.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "AVSCommon/Utils/Memory/Memory.h"
-#include "AVSCommon/Utils/Power/PowerMonitor.h"
-#include "AVSCommon/Utils/Threading/Executor.h"
-
-namespace alexaClientSDK {
-namespace avsCommon {
-namespace utils {
-namespace threading {
-
-/// An id for identifying instances.
-static std::atomic<uint64_t> g_id{0};
-
-Executor::~Executor() {
-    shutdown();
-}
-
-Executor::Executor(const std::chrono::milliseconds& delayExit) :
-        m_threadRunning{false},
-        m_timeout{delayExit},
-        m_shutdown{false},
-        m_id{g_id++} {
-    m_powerResource = power::PowerMonitor::getInstance()->createLocalPowerResource("Executor:" + std::to_string(m_id));
-}
-
-void Executor::waitForSubmittedTasks() {
-    std::unique_lock<std::mutex> lock{m_queueMutex};
-    if (m_threadRunning) {
-        // wait for thread to exit.
-        std::promise<void> flushedPromise;
-        auto flushedFuture = flushedPromise.get_future();
-        m_queue.emplace_back([&flushedPromise]() { flushedPromise.set_value(); });
-
-        lock.unlock();
-        m_delayedCondition.notify_one();
-        flushedFuture.wait();
-    }
-}
-
-std::function<void()> Executor::pop() {
-    std::lock_guard<std::mutex> lock{m_queueMutex};
-    if (!m_queue.empty()) {
-        auto task = std::move(m_queue.front());
-        m_queue.pop_front();
-        return task;
-    }
-    return std::function<void()>();
-}
-
-bool Executor::hasNext() {
-    std::unique_lock<std::mutex> lock{m_queueMutex};
-
-    m_delayedCondition.wait_for(lock, m_timeout, [this] { return !m_queue.empty() || m_shutdown; });
-    m_threadRunning = !m_queue.empty();
-    return m_threadRunning;
-}
-
-bool Executor::runNext() {
-    auto task = pop();
-    if (task) {
-        task();
-    }
-
-    if (m_powerResource) {
-        m_powerResource->release();
-    }
-
-    // It is acceptable that we enter LPM before
-    // the wait. TaskThread will still wait the intended m_timeout relative to the system
-    // not in LPM.
-
-    return hasNext();
-}
-
-void Executor::shutdown() {
-    std::unique_lock<std::mutex> lock{m_queueMutex};
-    m_queue.clear();
-    m_shutdown = true;
-    lock.unlock();
-    waitForSubmittedTasks();
-}
-
-bool Executor::isShutdown() {
-    return m_shutdown;
-}
-
-}  // namespace threading
-}  // namespace utils
-}  // namespace avsCommon
-}  // namespace alexaClientSDK
diff --git a/AVSCommon/Utils/src/FileSystem/FileSystemUtilsLinux.cpp b/AVSCommon/Utils/src/FileSystem/FileSystemUtilsLinux.cpp
index 1e53d1dfe4..4f93ed5395 100644
--- a/AVSCommon/Utils/src/FileSystem/FileSystemUtilsLinux.cpp
+++ b/AVSCommon/Utils/src/FileSystem/FileSystemUtilsLinux.cpp
@@ -37,7 +37,7 @@ namespace utils {
 namespace filesystem {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("FileSystemUtils");
+#define TAG "FileSystemUtils"
 /// Create a LogEntry using this file's TAG and the specified event std::string.
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
@@ -67,6 +67,7 @@ class UmaskLocker {
 
 std::mutex UmaskLocker::s_umaskMutex;
 
+#ifdef ACSDK_LOG_ENABLED
 static std::string getStrError(int error) {
     static const size_t BUFFER_SIZE = 255;
     char buffer[BUFFER_SIZE + 1]{};
@@ -74,6 +75,10 @@ static std::string getStrError(int error) {
     (void)ignore;  // unused since the type can differ depending on the gnu or posix
     return buffer;
 }
+#else
+// Declaref function so it can be used in sizeof() expression when logging is disabled.
+std::string getStrError(int);
+#endif
 
 bool changePermissions(const std::string& path, Permissions perms) {
     if (chmod(path.c_str(), perms) != 0) {
diff --git a/AVSCommon/Utils/src/FileSystem/FileSystemUtilsWindows.cpp b/AVSCommon/Utils/src/FileSystem/FileSystemUtilsWindows.cpp
index 2047b834c8..49cc9f12e7 100644
--- a/AVSCommon/Utils/src/FileSystem/FileSystemUtilsWindows.cpp
+++ b/AVSCommon/Utils/src/FileSystem/FileSystemUtilsWindows.cpp
@@ -32,7 +32,7 @@ namespace utils {
 namespace filesystem {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("FileSystemUtils");
+#define TAG "FileSystemUtils"
 /// Create a LogEntry using this file's TAG and the specified event std::string.
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
@@ -47,6 +47,7 @@ const Permissions DEFAULT_FILE_PERMISSIONS = OWNER_READ | OWNER_WRITE | GROUP_RE
 #define S_ISREG(mode) (((mode)&S_IFMT) == S_IFREG)
 #endif
 
+#ifdef ACSDK_LOG_ENABLED
 static std::string getStrError(int error) {
     static const size_t BUFFER_SIZE = 255;
     char buffer[BUFFER_SIZE + 1]{};
@@ -54,6 +55,10 @@ static std::string getStrError(int error) {
     (void)ignore;  // unused since the type can differ depending on the gnu or posix
     return buffer;
 }
+#else
+// Declaref function so it can be used in sizeof() expression when logging is disabled.
+std::string getStrError(int);
+#endif
 
 static std::string getBackslashPath(std::string path) {
     replace(path.begin(), path.end(), '/', '\\');
@@ -252,7 +257,7 @@ static bool removeDirectory(const std::string& path) {
     } while (FindNextFileA(handle, &data));
 
     FindClose(handle);
-    result &= RemoveDirectoryA(path.c_str());
+    result &= static_cast<bool>(RemoveDirectoryA(path.c_str()));
     return result;
 }
 
diff --git a/AVSCommon/Utils/src/FileUtils.cpp b/AVSCommon/Utils/src/FileUtils.cpp
index a3aee25376..8fb62965d2 100644
--- a/AVSCommon/Utils/src/FileUtils.cpp
+++ b/AVSCommon/Utils/src/FileUtils.cpp
@@ -26,7 +26,7 @@ namespace utils {
 namespace file {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("FileUtils");
+#define TAG "FileUtils"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/FormattedAudioStreamAdapter.cpp b/AVSCommon/Utils/src/FormattedAudioStreamAdapter.cpp
index 79a60652cf..54c3428e6b 100644
--- a/AVSCommon/Utils/src/FormattedAudioStreamAdapter.cpp
+++ b/AVSCommon/Utils/src/FormattedAudioStreamAdapter.cpp
@@ -22,7 +22,7 @@ namespace utils {
 namespace bluetooth {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("FormattedAudioStreamAdapter");
+#define TAG "FormattedAudioStreamAdapter"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/HTTP2/HTTP2MimeRequestEncoder.cpp b/AVSCommon/Utils/src/HTTP2/HTTP2MimeRequestEncoder.cpp
index 632fd37de3..fa4b77b483 100644
--- a/AVSCommon/Utils/src/HTTP2/HTTP2MimeRequestEncoder.cpp
+++ b/AVSCommon/Utils/src/HTTP2/HTTP2MimeRequestEncoder.cpp
@@ -25,7 +25,7 @@
 #include "AVSCommon/Utils/HTTP2/HTTP2MimeRequestSourceInterface.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("HTTP2MimeRequestEncoder");
+#define TAG "HTTP2MimeRequestEncoder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/HTTP2/HTTP2MimeResponseDecoder.cpp b/AVSCommon/Utils/src/HTTP2/HTTP2MimeResponseDecoder.cpp
index a6598cb021..a5fe08722f 100644
--- a/AVSCommon/Utils/src/HTTP2/HTTP2MimeResponseDecoder.cpp
+++ b/AVSCommon/Utils/src/HTTP2/HTTP2MimeResponseDecoder.cpp
@@ -27,7 +27,7 @@ namespace http2 {
 using namespace avsCommon::utils::http;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("HTTP2MimeResponseDecoder");
+#define TAG "HTTP2MimeResponseDecoder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/ID3Tags/ID3v2Tags.cpp b/AVSCommon/Utils/src/ID3Tags/ID3v2Tags.cpp
index 46ee629fac..6a874b7a6c 100644
--- a/AVSCommon/Utils/src/ID3Tags/ID3v2Tags.cpp
+++ b/AVSCommon/Utils/src/ID3Tags/ID3v2Tags.cpp
@@ -19,7 +19,7 @@
 #include "AVSCommon/Utils/Logger/Logger.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ID3v2Tags");
+#define TAG "ID3v2Tags"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/JSON/JSONGenerator.cpp b/AVSCommon/Utils/src/JSON/JSONGenerator.cpp
index 8a9a2cc5c4..6d0ac1384a 100644
--- a/AVSCommon/Utils/src/JSON/JSONGenerator.cpp
+++ b/AVSCommon/Utils/src/JSON/JSONGenerator.cpp
@@ -21,7 +21,7 @@
 #include "AVSCommon/Utils/JSON/JSONUtils.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("JSONGenerator");
+#define TAG "JSONGenerator"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -40,7 +40,8 @@ JsonGenerator::JsonGenerator() : m_buffer{}, m_writer{m_buffer} {
 }
 
 bool JsonGenerator::startObject(const std::string& key) {
-    return checkWriter() && m_writer.Key(key.c_str(), key.length()) && m_writer.StartObject();
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    return checkWriter() && m_writer.Key(key.c_str(), keyLength) && m_writer.StartObject();
 }
 
 bool JsonGenerator::finishObject() {
@@ -48,35 +49,43 @@ bool JsonGenerator::finishObject() {
 }
 
 bool JsonGenerator::addMember(const std::string& key, const std::string& value) {
-    return checkWriter() && m_writer.Key(key.c_str(), key.length()) && m_writer.String(value);
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    return checkWriter() && m_writer.Key(key.c_str(), keyLength) && m_writer.String(value);
 }
 
 bool JsonGenerator::addMember(const std::string& key, uint64_t value) {
-    return checkWriter() && m_writer.Key(key.c_str(), key.length()) && m_writer.Uint64(value);
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    return checkWriter() && m_writer.Key(key.c_str(), keyLength) && m_writer.Uint64(value);
 }
 
 bool JsonGenerator::addMember(const std::string& key, unsigned int value) {
-    return checkWriter() && m_writer.Key(key.c_str(), key.length()) && m_writer.Uint(value);
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    return checkWriter() && m_writer.Key(key.c_str(), keyLength) && m_writer.Uint(value);
 }
 
 bool JsonGenerator::addMember(const std::string& key, int64_t value) {
-    return checkWriter() && m_writer.Key(key.c_str(), key.length()) && m_writer.Int64(value);
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    return checkWriter() && m_writer.Key(key.c_str(), keyLength) && m_writer.Int64(value);
 }
 
 bool JsonGenerator::addMember(const std::string& key, int value) {
-    return checkWriter() && m_writer.Key(key.c_str(), key.length()) && m_writer.Int(value);
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    return checkWriter() && m_writer.Key(key.c_str(), keyLength) && m_writer.Int(value);
 }
 
 bool JsonGenerator::addMember(const std::string& key, bool value) {
-    return checkWriter() && m_writer.Key(key.c_str(), key.length()) && m_writer.Bool(value);
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    return checkWriter() && m_writer.Key(key.c_str(), keyLength) && m_writer.Bool(value);
 }
 
 bool JsonGenerator::addMember(const std::string& key, const char* value) {
-    return value && checkWriter() && m_writer.Key(key.c_str(), key.length()) && m_writer.String(value);
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    return value && checkWriter() && m_writer.Key(key.c_str(), keyLength) && m_writer.String(value);
 }
 
 bool JsonGenerator::addMember(const std::string& key, double value) {
-    return checkWriter() && m_writer.Key(key.c_str(), key.length()) && m_writer.Double(value);
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    return checkWriter() && m_writer.Key(key.c_str(), keyLength) && m_writer.Double(value);
 }
 
 bool JsonGenerator::addRawJsonMember(const std::string& key, const std::string& json, bool validate) {
@@ -88,12 +97,14 @@ bool JsonGenerator::addRawJsonMember(const std::string& key, const std::string&
             return false;
         }
     }
-    return checkWriter() && m_writer.Key(key.c_str(), key.length()) &&
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    return checkWriter() && m_writer.Key(key.c_str(), keyLength) &&
            m_writer.RawValue(json.c_str(), json.length(), rapidjson::kStringType);
 }
 
 bool JsonGenerator::startArray(const std::string& key) {
-    return checkWriter() && m_writer.Key(key.c_str(), key.length()) && m_writer.StartArray();
+    auto keyLength = static_cast<rapidjson::SizeType>(key.length());
+    return checkWriter() && m_writer.Key(key.c_str(), keyLength) && m_writer.StartArray();
 }
 
 bool JsonGenerator::finishArray() {
diff --git a/AVSCommon/Utils/src/JSON/JSONUtils.cpp b/AVSCommon/Utils/src/JSON/JSONUtils.cpp
index 3cf8edb1d0..327d0bab09 100644
--- a/AVSCommon/Utils/src/JSON/JSONUtils.cpp
+++ b/AVSCommon/Utils/src/JSON/JSONUtils.cpp
@@ -28,7 +28,7 @@ namespace json {
 namespace jsonUtils {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("JsonUtils");
+#define TAG "JsonUtils"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/LibcurlUtils/CallbackData.cpp b/AVSCommon/Utils/src/LibcurlUtils/CallbackData.cpp
index a0eb9d9a7c..7d470b61b4 100644
--- a/AVSCommon/Utils/src/LibcurlUtils/CallbackData.cpp
+++ b/AVSCommon/Utils/src/LibcurlUtils/CallbackData.cpp
@@ -29,7 +29,7 @@ namespace libcurlUtils {
 using namespace alexaClientSDK::avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CallbackData");
+#define TAG "CallbackData"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/LibcurlUtils/CurlEasyHandleWrapper.cpp b/AVSCommon/Utils/src/LibcurlUtils/CurlEasyHandleWrapper.cpp
index e72244aedd..b508f8e77b 100644
--- a/AVSCommon/Utils/src/LibcurlUtils/CurlEasyHandleWrapper.cpp
+++ b/AVSCommon/Utils/src/LibcurlUtils/CurlEasyHandleWrapper.cpp
@@ -35,7 +35,7 @@ namespace libcurlUtils {
 using namespace avsCommon::utils::http;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CurlEasyHandleWrapper");
+#define TAG "CurlEasyHandleWrapper"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/LibcurlUtils/CurlMultiHandleWrapper.cpp b/AVSCommon/Utils/src/LibcurlUtils/CurlMultiHandleWrapper.cpp
index 0e73398813..32eb291c76 100644
--- a/AVSCommon/Utils/src/LibcurlUtils/CurlMultiHandleWrapper.cpp
+++ b/AVSCommon/Utils/src/LibcurlUtils/CurlMultiHandleWrapper.cpp
@@ -22,7 +22,7 @@ namespace utils {
 namespace libcurlUtils {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CurlMultiHandleWrapper");
+#define TAG "CurlMultiHandleWrapper"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -91,14 +91,32 @@ CURLMcode CurlMultiHandleWrapper::perform(int* runningHandles) {
     return result;
 }
 
-CURLMcode CurlMultiHandleWrapper::wait(std::chrono::milliseconds timeout, int* countHandlesUpdated) {
-    auto result = curl_multi_wait(m_handle, NULL, 0, timeout.count(), countHandlesUpdated);
+CURLMcode CurlMultiHandleWrapper::poll(std::chrono::milliseconds timeout, int* countHandlesUpdated) {
+#if CURL_AT_LEAST_VERSION(7, 68, 0)
+    auto result = curl_multi_poll(m_handle, nullptr, 0, timeout.count(), countHandlesUpdated);
+#else
+    auto result = curl_multi_wait(m_handle, nullptr, 0, static_cast<int>(timeout.count()), countHandlesUpdated);
+#endif
     if (result != CURLM_OK) {
         ACSDK_ERROR(LX("curlMultiWaitFailed").d("error", curl_multi_strerror(result)));
     }
     return result;
 }
 
+bool CurlMultiHandleWrapper::wakeup() {
+    bool returnVal = true;
+#if CURL_AT_LEAST_VERSION(7, 68, 0)
+    auto result = curl_multi_wakeup(m_handle);
+    if (result != CURLM_OK) {
+        ACSDK_ERROR(LX("curlMultiWakeupFailed").d("error", curl_multi_strerror(result)));
+        returnVal = false;
+    }
+#else
+    // no-op
+#endif
+    return returnVal;
+}
+
 CURLMsg* CurlMultiHandleWrapper::infoRead(int* messagesInQueue) {
     return curl_multi_info_read(m_handle, messagesInQueue);
 }
diff --git a/AVSCommon/Utils/src/LibcurlUtils/HTTPContentFetcherFactory.cpp b/AVSCommon/Utils/src/LibcurlUtils/HTTPContentFetcherFactory.cpp
index 0baa0dae9a..bf77fb389a 100644
--- a/AVSCommon/Utils/src/LibcurlUtils/HTTPContentFetcherFactory.cpp
+++ b/AVSCommon/Utils/src/LibcurlUtils/HTTPContentFetcherFactory.cpp
@@ -24,7 +24,7 @@ namespace utils {
 namespace libcurlUtils {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("HTTPContentFetcherFactory");
+#define TAG "HTTPContentFetcherFactory"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/LibcurlUtils/HttpPost.cpp b/AVSCommon/Utils/src/LibcurlUtils/HttpPost.cpp
index 42713cb77a..1b2610d982 100644
--- a/AVSCommon/Utils/src/LibcurlUtils/HttpPost.cpp
+++ b/AVSCommon/Utils/src/LibcurlUtils/HttpPost.cpp
@@ -28,7 +28,7 @@ namespace libcurlUtils {
 using namespace alexaClientSDK::avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("HttpPost");
+#define TAG "HttpPost"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/LibcurlUtils/HttpPut.cpp b/AVSCommon/Utils/src/LibcurlUtils/HttpPut.cpp
index 8690615f36..84d062658e 100644
--- a/AVSCommon/Utils/src/LibcurlUtils/HttpPut.cpp
+++ b/AVSCommon/Utils/src/LibcurlUtils/HttpPut.cpp
@@ -31,7 +31,7 @@ namespace libcurlUtils {
 using namespace alexaClientSDK::avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("HttpPut");
+#define TAG "HttpPut"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/LibcurlUtils/LibCurlHttpContentFetcher.cpp b/AVSCommon/Utils/src/LibcurlUtils/LibCurlHttpContentFetcher.cpp
index db3955e792..30a370131e 100644
--- a/AVSCommon/Utils/src/LibcurlUtils/LibCurlHttpContentFetcher.cpp
+++ b/AVSCommon/Utils/src/LibcurlUtils/LibCurlHttpContentFetcher.cpp
@@ -31,10 +31,9 @@ namespace libcurlUtils {
 
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::utils::http;
-using namespace avsCommon::utils::libcurlUtils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("LibCurlHttpContentFetcher");
+#define TAG "LibCurlHttpContentFetcher"
 
 /**
  * The timeout for a blocking write call to an @c AttachmentWriter. This value may be increased to decrease wakeups but
@@ -412,7 +411,7 @@ std::unique_ptr<avsCommon::utils::HTTPContent> LibCurlHttpContentFetcher::getCon
                     }
 
                     int numTransfersUpdated = 0;
-                    result = curlMultiHandle->wait(WAIT_FOR_ACTIVITY_TIMEOUT, &numTransfersUpdated);
+                    result = curlMultiHandle->poll(WAIT_FOR_ACTIVITY_TIMEOUT, &numTransfersUpdated);
                     if (result != CURLM_OK) {
                         ACSDK_ERROR(LX("getContentFailed")
                                         .d("reason", "multiWaitFailed")
@@ -470,7 +469,7 @@ std::unique_ptr<avsCommon::utils::HTTPContent> LibCurlHttpContentFetcher::getCon
                     }
 
                     int numTransfersUpdated = 0;
-                    result = curlMultiHandle->wait(WAIT_FOR_ACTIVITY_TIMEOUT, &numTransfersUpdated);
+                    result = curlMultiHandle->poll(WAIT_FOR_ACTIVITY_TIMEOUT, &numTransfersUpdated);
                     if (result != CURLM_OK) {
                         ACSDK_ERROR(LX("getContentFailed")
                                         .d("reason", "multiWaitFailed")
diff --git a/AVSCommon/Utils/src/LibcurlUtils/LibcurlHTTP2Connection.cpp b/AVSCommon/Utils/src/LibcurlUtils/LibcurlHTTP2Connection.cpp
index 2e473873bd..e4702ba5c5 100644
--- a/AVSCommon/Utils/src/LibcurlUtils/LibcurlHTTP2Connection.cpp
+++ b/AVSCommon/Utils/src/LibcurlUtils/LibcurlHTTP2Connection.cpp
@@ -26,10 +26,9 @@ namespace utils {
 namespace libcurlUtils {
 
 using namespace avsCommon::utils::http2;
-using namespace avsCommon::utils::libcurlUtils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("LibcurlHTTP2Connection");
+#define TAG "LibcurlHTTP2Connection"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -167,6 +166,10 @@ void LibcurlHTTP2Connection::setIsStopping() {
     std::lock_guard<std::mutex> lock(m_mutex);
     m_isStopping = true;
     m_cv.notify_one();
+    auto multiCurlHandle = m_multi;
+    if (multiCurlHandle) {
+        multiCurlHandle->wakeup();
+    }
 }
 
 std::shared_ptr<LibcurlHTTP2Request> LibcurlHTTP2Connection::dequeueRequest() {
@@ -246,7 +249,7 @@ void LibcurlHTTP2Connection::networkLoop() {
             }
 
             int numTransfersUpdated = 0;
-            result = m_multi->wait(multiWaitTimeout, &numTransfersUpdated);
+            result = m_multi->poll(multiWaitTimeout, &numTransfersUpdated);
             if (result != CURLM_OK) {
                 ACSDK_ERROR(
                     LX_P("networkLoopStopping").d("reason", "multiWaitFailed").d("error", curl_multi_strerror(result)));
@@ -329,6 +332,10 @@ bool LibcurlHTTP2Connection::addStream(std::shared_ptr<LibcurlHTTP2Request> stre
     }
     m_requestQueue.push_back(std::move(stream));
     m_cv.notify_one();
+    auto multiCurlHandle = m_multi;
+    if (multiCurlHandle) {
+        multiCurlHandle->wakeup();
+    }
     return true;
 }
 
@@ -351,7 +358,7 @@ void LibcurlHTTP2Connection::cleanupFinishedStreams() {
                                  .d("streamId", it->second->getId())
                                  .d("result", curl_easy_strerror(message->data.result))
                                  .d("CURLcode", message->data.result));
-                releaseStream(*(it->second));
+                releaseStream(it);
             } else {
                 ACSDK_ERROR(
                     LX_P("cleanupFinishedStreamError").d("reason", "streamNotFound").d("handle", message->easy_handle));
@@ -363,13 +370,15 @@ void LibcurlHTTP2Connection::cleanupFinishedStreams() {
 void LibcurlHTTP2Connection::cleanupCancelledAndStalledStreams() {
     auto it = m_activeStreams.begin();
     while (it != m_activeStreams.end()) {
-        auto stream = (it++)->second;
-        if (stream->isCancelled()) {
-            cancelActiveStream(*stream);
-        } else if (stream->hasProgressTimedOut()) {
+        auto stream = it->second;
+        if (stream->hasProgressTimedOut()) {
             ACSDK_WARN(LX_P("streamProgressTimedOut").d("streamId", stream->getId()));
             stream->reportCompletion(HTTP2ResponseFinishedStatus::TIMEOUT);
-            releaseStream(*stream);
+            releaseStream(it);
+        } else if (stream->isCancelled()) {
+            cancelActiveStream(it);
+        } else {
+            it++;
         }
     }
 }
@@ -395,16 +404,17 @@ void LibcurlHTTP2Connection::unPauseActiveStreams() {
     }
 }
 
-bool LibcurlHTTP2Connection::cancelActiveStream(LibcurlHTTP2Request& stream) {
-    ACSDK_INFO(LX_P("cancelActiveStream").d("streamId", stream.getId()));
-    stream.reportCompletion(HTTP2ResponseFinishedStatus::CANCELLED);
-    return releaseStream(stream);
+bool LibcurlHTTP2Connection::cancelActiveStream(ActiveStreamMap::iterator& iterator) {
+    auto stream = iterator->second;
+    ACSDK_INFO(LX_P("cancelActiveStream").d("streamId", stream->getId()));
+    stream->reportCompletion(HTTP2ResponseFinishedStatus::CANCELLED);
+    return releaseStream(iterator);
 }
 
 void LibcurlHTTP2Connection::cancelActiveStreams() {
     auto it = m_activeStreams.begin();
     while (it != m_activeStreams.end()) {
-        cancelActiveStream(*(it++)->second);
+        cancelActiveStream(it);
     }
 }
 
@@ -427,13 +437,14 @@ void LibcurlHTTP2Connection::cancelAllStreams() {
     cancelActiveStreams();
 }
 
-bool LibcurlHTTP2Connection::releaseStream(LibcurlHTTP2Request& stream) {
-    auto handle = stream.getCurlHandle();
-    ACSDK_DEBUG9(LX_P("releaseStream").d("streamId", stream.getId()));
+bool LibcurlHTTP2Connection::releaseStream(ActiveStreamMap::iterator& iterator) {
+    auto stream = iterator->second;
+    auto handle = stream->getCurlHandle();
+    ACSDK_DEBUG9(LX_P("releaseStream").d("streamId", stream->getId()));
     auto result = m_multi->removeHandle(handle);
-    m_activeStreams.erase(handle);
+    iterator = m_activeStreams.erase(iterator);
     if (result != CURLM_OK) {
-        ACSDK_ERROR(LX_P("releaseStreamFailed").d("reason", "removeHandleFailed").d("streamId", stream.getId()));
+        ACSDK_ERROR(LX_P("releaseStreamFailed").d("reason", "removeHandleFailed").d("streamId", stream->getId()));
         return false;
     }
     return true;
diff --git a/AVSCommon/Utils/src/LibcurlUtils/LibcurlHTTP2ConnectionFactory.cpp b/AVSCommon/Utils/src/LibcurlUtils/LibcurlHTTP2ConnectionFactory.cpp
index ca262ee74b..9bbd9c26ec 100644
--- a/AVSCommon/Utils/src/LibcurlUtils/LibcurlHTTP2ConnectionFactory.cpp
+++ b/AVSCommon/Utils/src/LibcurlUtils/LibcurlHTTP2ConnectionFactory.cpp
@@ -24,7 +24,7 @@ namespace utils {
 namespace libcurlUtils {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("LibcurlHTTP2ConnectionFactory");
+#define TAG "LibcurlHTTP2ConnectionFactory"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/LibcurlUtils/LibcurlHTTP2Request.cpp b/AVSCommon/Utils/src/LibcurlUtils/LibcurlHTTP2Request.cpp
index 5bdafb015e..ebba4d2012 100644
--- a/AVSCommon/Utils/src/LibcurlUtils/LibcurlHTTP2Request.cpp
+++ b/AVSCommon/Utils/src/LibcurlUtils/LibcurlHTTP2Request.cpp
@@ -28,7 +28,7 @@ using namespace std::chrono;
 static constexpr long INVALID_RESPONSE_CODE = -1L;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("LibcurlHTTP2Request");
+#define TAG "LibcurlHTTP2Request"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/LibcurlUtils/LibcurlUtils.cpp b/AVSCommon/Utils/src/LibcurlUtils/LibcurlUtils.cpp
index 3bedd403fd..497d7db9d3 100644
--- a/AVSCommon/Utils/src/LibcurlUtils/LibcurlUtils.cpp
+++ b/AVSCommon/Utils/src/LibcurlUtils/LibcurlUtils.cpp
@@ -28,7 +28,7 @@ namespace utils {
 namespace libcurlUtils {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("LibcurlUtils");
+#define TAG "LibcurlUtils"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/Logger/LogEntry.cpp b/AVSCommon/Utils/src/Logger/LogEntry.cpp
index 593d687171..5cde811583 100644
--- a/AVSCommon/Utils/src/Logger/LogEntry.cpp
+++ b/AVSCommon/Utils/src/Logger/LogEntry.cpp
@@ -24,44 +24,53 @@ namespace utils {
 namespace logger {
 
 /// List of characters we need to escape.
-static const char* RESERVED_METADATA_CHARS = R"(\,=:)";
+static constexpr auto RESERVED_METADATA_CHARS = R"(\,=:)";
 
 /// Escape sequence for '%'.
-static const std::string ESCAPED_METADATA_ESCAPE = R"(\\)";
+static constexpr auto ESCAPED_METADATA_ESCAPE = R"(\\)";
 
 /// Escape sequence for ','.
-static const std::string ESCAPED_PAIR_SEPARATOR = R"(\,)";
+static constexpr auto ESCAPED_PAIR_SEPARATOR = R"(\,)";
 
 /// Escape sequence for ':'.
-static const std::string ESCAPED_SECTION_SEPARATOR = R"(\:)";
+static constexpr auto ESCAPED_SECTION_SEPARATOR = R"(\:)";
 
 /// Escape sequence for '='.
-static const std::string ESCAPED_KEY_VALUE_SEPARATOR = R"(\=)";
+static constexpr auto ESCAPED_KEY_VALUE_SEPARATOR = R"(\=)";
 
 /// Reserved in metadata sequences for escaping other reserved values.
-static const char METADATA_ESCAPE = '\\';
+static constexpr char METADATA_ESCAPE = '\\';
 
 /// Reserved in metadata sequences to separate key,value pairs.
-static const char PAIR_SEPARATOR = ',';
+static constexpr char PAIR_SEPARATOR = ',';
 
 /// Reserved in metadata sequences to separate them from a preceding event and an optional terminal message.
-static const char SECTION_SEPARATOR = ':';
+static constexpr char SECTION_SEPARATOR = ':';
 
 /// String for boolean TRUE
-static const std::string BOOL_TRUE = "true";
+static constexpr auto BOOL_TRUE = "true";
 
 /// String for boolean FALSE
-static const std::string BOOL_FALSE = "false";
+static constexpr auto BOOL_FALSE = "false";
 
-LogEntry::LogEntry(const std::string& source, const char* event) : m_hasMetadata(false) {
-    m_stream << source << SECTION_SEPARATOR;
+/// Array of strings for obfuscation.
+/// @see LogEntry::obfuscatePrivateData()
+static constexpr const char* const DENYLIST[] = {"ssid"};
+
+LogEntry::LogEntry(const char* source, const char* event) : m_hasMetadata(false) {
+    if (source) {
+        m_stream << source;
+    }
+    m_stream << SECTION_SEPARATOR;
     if (event) {
         m_stream << event;
     }
 }
 
-LogEntry::LogEntry(const std::string& source, const std::string& event) : m_hasMetadata(false) {
-    m_stream << source << SECTION_SEPARATOR << event;
+LogEntry::LogEntry(const std::string& source, const char* event) : LogEntry(source.c_str(), event) {
+}
+
+LogEntry::LogEntry(const std::string& source, const std::string& event) : LogEntry(source.c_str(), event.c_str()) {
 }
 
 LogEntry& LogEntry::d(const char* key, const char* value) {
@@ -153,6 +162,39 @@ void LogEntry::appendEscapedString(const char* in) {
     }
 }
 
+LogEntry& LogEntry::obfuscatePrivateData(const char* key, const std::string& value) {
+    // if value contains any  private label, obfuscate the section after the label
+    // since it can (but shouldn't) contain multiple,  obfuscate from the earliest one found onward
+    auto firstPosition = value.length();
+
+    const size_t count = sizeof(DENYLIST) / sizeof(DENYLIST[0]);
+    for (size_t index = 0; index < count; ++index) {
+        const auto privateLabel = DENYLIST[index];
+        const auto privateLabelLen = std::strlen(privateLabel);
+        auto it = std::search(
+            value.begin(),
+            value.end(),
+            privateLabel,
+            privateLabel + privateLabelLen,
+            [](char valueChar, char denyListChar) { return std::tolower(valueChar) == std::tolower(denyListChar); });
+        if (it != value.end()) {
+            // capture the least value
+            auto thisPosition = std::distance(value.begin(), it) + privateLabelLen;
+            if (thisPosition < firstPosition) {
+                firstPosition = thisPosition;
+            }
+        }
+    }
+
+    if (firstPosition <= value.length()) {
+        // hash everything after the label itself
+        auto labelPart = value.substr(0, firstPosition);
+        auto obfuscatedPart = std::to_string(std::hash<std::string>{}(value.substr(firstPosition)));
+        return d(key, labelPart + obfuscatedPart);
+    }
+    return d(key, value);
+}
+
 }  // namespace logger
 }  // namespace utils
 }  // namespace avsCommon
diff --git a/AVSCommon/Utils/src/Logger/LogEntryBuffer.cpp b/AVSCommon/Utils/src/Logger/LogEntryBuffer.cpp
index 28c442d870..4932741cd2 100644
--- a/AVSCommon/Utils/src/Logger/LogEntryBuffer.cpp
+++ b/AVSCommon/Utils/src/Logger/LogEntryBuffer.cpp
@@ -50,7 +50,7 @@ LogEntryBuffer::int_type LogEntryBuffer::overflow(int_type ch) {
     setg(newBase, gptr() + delta, newEnd);
     m_base = newBase;
 
-    *pptr() = ch;
+    *pptr() = static_cast<char>(ch);
     pbump(1);
     return ch;
 }
diff --git a/AVSCommon/Utils/src/Logger/Logger.cpp b/AVSCommon/Utils/src/Logger/Logger.cpp
index 77097fd1b9..b5c5c4eb3f 100644
--- a/AVSCommon/Utils/src/Logger/Logger.cpp
+++ b/AVSCommon/Utils/src/Logger/Logger.cpp
@@ -24,11 +24,13 @@ namespace utils {
 namespace logger {
 
 /// Configuration key for root level "logger" object.
-static const std::string CONFIG_KEY_LOGGER = "logger";
+static constexpr auto CONFIG_KEY_LOGGER = "logger";
 
 /// Configuration key for "logLevel" values under "logger" and other per-module objects.
-static const std::string CONFIG_KEY_LOG_LEVEL = "logLevel";
+static constexpr auto CONFIG_KEY_LOG_LEVEL = "logLevel";
 
+/// Predefined thread id for messages that are logged when application exits.
+/// @see Logger::logAtExit()
 static constexpr auto AT_EXIT_THREAD_ID = "0";
 
 Logger::Logger(Level level) : m_level{level} {
@@ -42,7 +44,7 @@ void Logger::log(Level level, const LogEntry& entry) {
 
 void Logger::init(const configuration::ConfigurationNode configuration) {
     if (!initLogLevel(configuration)) {
-        initLogLevel(configuration::ConfigurationNode::getRoot()[CONFIG_KEY_LOGGER]);
+        initLogLevel(configuration::ConfigurationNode::getRoot()[std::string{CONFIG_KEY_LOGGER}]);
     }
 }
 
diff --git a/AVSCommon/Utils/src/Logger/LoggerSinkManager.cpp b/AVSCommon/Utils/src/Logger/LoggerSinkManager.cpp
index c4f6767384..7271f35fee 100644
--- a/AVSCommon/Utils/src/Logger/LoggerSinkManager.cpp
+++ b/AVSCommon/Utils/src/Logger/LoggerSinkManager.cpp
@@ -15,6 +15,7 @@
 
 #include <algorithm>
 
+#include "AVSCommon/Utils/Logger/ConsoleLogger.h"
 #include "AVSCommon/Utils/Logger/LoggerSinkManager.h"
 
 namespace alexaClientSDK {
@@ -85,7 +86,7 @@ void LoggerSinkManager::initialize(const std::shared_ptr<Logger>& sink) {
     }
 }
 
-LoggerSinkManager::LoggerSinkManager() : m_sink{ACSDK_GET_SINK_LOGGER()}, m_level(Level::UNKNOWN) {
+LoggerSinkManager::LoggerSinkManager() : m_sink{getConsoleLogger()}, m_level(Level::UNKNOWN) {
 }
 
 }  // namespace logger
diff --git a/AVSCommon/Utils/src/Logger/LoggerUtils.cpp b/AVSCommon/Utils/src/Logger/LoggerUtils.cpp
index b887a05468..4dce08379f 100644
--- a/AVSCommon/Utils/src/Logger/LoggerUtils.cpp
+++ b/AVSCommon/Utils/src/Logger/LoggerUtils.cpp
@@ -13,6 +13,7 @@
  * permissions and limitations under the License.
  */
 
+#include <cctype>
 #include <cstdio>
 #include <iomanip>
 #include <iostream>
diff --git a/AVSCommon/Utils/src/Logger/ModuleLogger.cpp b/AVSCommon/Utils/src/Logger/ModuleLogger.cpp
index 7b7222a592..92c90c12d0 100644
--- a/AVSCommon/Utils/src/Logger/ModuleLogger.cpp
+++ b/AVSCommon/Utils/src/Logger/ModuleLogger.cpp
@@ -51,12 +51,10 @@ void ModuleLogger::onSinkChanged(const std::shared_ptr<Logger>& logger) {
 }
 
 void ModuleLogger::updateLogLevel() {
-    if (Level::UNKNOWN == m_sinkLogLevel) {
+    if (Level::UNKNOWN != m_moduleLogLevel) {
         Logger::setLevel(m_moduleLogLevel);
-    } else if (Level::UNKNOWN == m_moduleLogLevel) {
-        Logger::setLevel(m_sinkLogLevel);
     } else {
-        Logger::setLevel((m_sinkLogLevel > m_moduleLogLevel) ? m_sinkLogLevel : m_moduleLogLevel);
+        Logger::setLevel(m_sinkLogLevel);
     }
 }
 
diff --git a/AVSCommon/Utils/src/Logger/ThreadMoniker.cpp b/AVSCommon/Utils/src/Logger/ThreadMoniker.cpp
index 363ae08bd9..572799d3be 100644
--- a/AVSCommon/Utils/src/Logger/ThreadMoniker.cpp
+++ b/AVSCommon/Utils/src/Logger/ThreadMoniker.cpp
@@ -13,55 +13,144 @@
  * permissions and limitations under the License.
  */
 
+#include <algorithm>
 #include <atomic>
+#include <cstring>
 #include <iomanip>
-#include <mutex>
 #include <sstream>
+
+#if defined(_WIN32) || defined(__QNX__)
+#include <mutex>
 #include <thread>
 #include <unordered_map>
+#endif
 
-#include "AVSCommon/Utils/Logger/ThreadMoniker.h"
+#include <AVSCommon/Utils/Logger/ThreadMoniker.h>
 
 namespace alexaClientSDK {
 namespace avsCommon {
 namespace utils {
 namespace logger {
 
-/// Counter to generate (small) unique thread monikers.
-static std::atomic<int> g_nextThreadMoniker(1);
+/// Space character for moniker formatting.
+static constexpr char CHAR_SPACE = ' ';
 
-ThreadMoniker::ThreadMoniker(const std::string& moniker) : m_moniker{moniker.empty() ? generateMoniker() : moniker} {
-}
+/// Colon character for moniker prefix separation.
+static constexpr char CHAR_COLON = ':';
 
-std::string ThreadMoniker::generateMoniker() {
-    std::ostringstream stream;
-    stream << std::setw(3) << std::hex << std::right << g_nextThreadMoniker++;
-    return stream.str();
-}
+/// Size of formatted moniker in characters.
+static constexpr size_t MONIKER_SIZE_CHARS = 5u;
 
-const ThreadMoniker& ThreadMoniker::getMonikerObjectFromMap(const std::string& moniker) {
-    /// Map each thread to a moniker.
-    static std::unordered_map<std::thread::id, ThreadMoniker> threadMonikers;
-    /// Map each moniker to a thread.
-    static std::unordered_map<std::string, std::thread::id> monikerThreads;
-    /// Lock used to synchronize access to the local maps.
-    static std::mutex monikerMutex;
+#if defined(_WIN32) || defined(__QNX__)
+/// Map each thread to a moniker.
+static std::unordered_map<std::thread::id, std::string> monikerMap;
+/// Lock used to synchronize access to the local maps.
+static std::mutex monikerMutex;
 
-    std::lock_guard<std::mutex> lock{monikerMutex};
+/**
+ * Return the moniker value reference for the current thread for OS that don't support thread local variables.
+ *
+ * @return The moniker for the @c std::this_thread.
+ */
+static inline std::string getMonikerValue() noexcept {
     auto id = std::this_thread::get_id();
-    auto entry = threadMonikers.find(id);
-    if (entry == threadMonikers.end()) {
-        auto oldEntry = monikerThreads.find(moniker);
-        if (oldEntry != monikerThreads.end()) {
-            threadMonikers.erase(oldEntry->second);
-        }
-        auto& object = threadMonikers.emplace(std::make_pair(id, ThreadMoniker(moniker))).first->second;
-        monikerThreads[object.m_moniker] = id;
-        return object;
+    std::lock_guard<std::mutex> lock{monikerMutex};
+    auto entry = monikerMap.find(id);
+    if (entry == monikerMap.end()) {
+        entry = monikerMap.emplace(std::make_pair(id, ThreadMoniker::generateMoniker())).first;
     }
     return entry->second;
 }
 
+/**
+ * @brief Set the moniker value reference for the current thread for OS that doesn't support thread local variables.
+ *
+ * @param moniker Moniker value to set.
+ */
+static inline void setMonikerValue(const std::string& moniker) noexcept {
+    auto id = std::this_thread::get_id();
+    std::lock_guard<std::mutex> lock{monikerMutex};
+    auto entry = monikerMap.find(id);
+    if (entry == monikerMap.end()) {
+        monikerMap.emplace(std::make_pair(id, moniker));
+    } else {
+        entry->second = moniker;
+    }
+}
+#else
+
+/**
+ * @brief Thread-local moniker value.
+ *
+ * Thread local destructors are called before static member destructors. If client code contains any static instance,
+ * that attempts to use Logging API from destructor, and exit() call is issued, the @a threadMoniker variable is
+ * released and running threads attempt to access string data through dangling pointers.
+ *
+ * To address the issue we use a type with a trivial destructor.
+ *
+ * @note This variable is defined only for platforms, that support @a thread_local.
+ *
+ * @see [basic.start.term]/p1 from C++ spec.
+ * @private
+ */
+static thread_local struct {
+    // Number of characters in @a value. It can be between 0 and sizeof(value) - 1.
+    std::size_t len;
+    // Moniker value. This value is not null-terminated.
+    char value[16];
+} threadMoniker = {0, {0}};
+
+/**
+ * @brief Changes moniker value for the caller's thread.
+ *
+ * @param moniker Value to set.
+ */
+static inline void setMonikerValue(const std::string& moniker) noexcept {
+    auto& tm = threadMoniker;
+    tm.len = std::min(sizeof(tm.value), moniker.length());
+    std::memcpy(tm.value, moniker.data(), tm.len);
+}
+
+/**
+ * @brief Returns reference to this thread's moniker value.
+ */
+static inline std::string getMonikerValue() noexcept {
+    auto& tm = threadMoniker;
+    if (!tm.len) {
+        setMonikerValue(ThreadMoniker::generateMoniker());
+    }
+    return std::string(tm.value, tm.value + tm.len);
+}
+
+#endif
+
+std::string ThreadMoniker::generateMoniker(char prefix) noexcept {
+    /// Counter to generate (small) unique thread monikers.
+    static std::atomic<int> g_nextThreadMoniker(1);
+
+    std::stringstream ss;
+    if (prefix) {
+        ss << prefix << CHAR_COLON;
+    }
+    ss << std::hex << g_nextThreadMoniker++;
+    auto nextMoniker = ss.str();
+
+    if (nextMoniker.size() < MONIKER_SIZE_CHARS) {
+        nextMoniker.reserve(MONIKER_SIZE_CHARS);
+        nextMoniker.insert(nextMoniker.begin(), MONIKER_SIZE_CHARS - nextMoniker.size(), CHAR_SPACE);
+    }
+
+    return nextMoniker;
+}
+
+std::string ThreadMoniker::getThisThreadMoniker() noexcept {
+    return getMonikerValue();
+}
+
+void ThreadMoniker::setThisThreadMoniker(const std::string& moniker) noexcept {
+    setMonikerValue(moniker);
+}
+
 }  // namespace logger
 }  // namespace utils
 }  // namespace avsCommon
diff --git a/AVSCommon/Utils/src/MacAddressString.cpp b/AVSCommon/Utils/src/MacAddressString.cpp
index 98489d5b66..ff592c67f4 100644
--- a/AVSCommon/Utils/src/MacAddressString.cpp
+++ b/AVSCommon/Utils/src/MacAddressString.cpp
@@ -15,6 +15,7 @@
 
 #include <AVSCommon/Utils/MacAddressString.h>
 
+#include <cctype>
 #include <memory>
 #include <string>
 
diff --git a/AVSCommon/Utils/src/MediaPlayer/PlaybackContext.cpp b/AVSCommon/Utils/src/MediaPlayer/PlaybackContext.cpp
index 1975d473e3..e6f4fce4c1 100644
--- a/AVSCommon/Utils/src/MediaPlayer/PlaybackContext.cpp
+++ b/AVSCommon/Utils/src/MediaPlayer/PlaybackContext.cpp
@@ -24,7 +24,7 @@ namespace utils {
 namespace mediaPlayer {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PlaybackContext");
+#define TAG "PlaybackContext"
 
 /**
  * Create a @c LogEntry using this file's @c TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/MediaPlayer/PooledMediaPlayerFactory.cpp b/AVSCommon/Utils/src/MediaPlayer/PooledMediaPlayerFactory.cpp
index 435866fb30..9dd503af55 100644
--- a/AVSCommon/Utils/src/MediaPlayer/PooledMediaPlayerFactory.cpp
+++ b/AVSCommon/Utils/src/MediaPlayer/PooledMediaPlayerFactory.cpp
@@ -23,7 +23,7 @@ namespace mediaPlayer {
 
 using namespace avsCommon::utils::mediaPlayer;
 
-static const std::string TAG("PooledMediaPlayerFactory");
+#define TAG "PooledMediaPlayerFactory"
 
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
diff --git a/AVSCommon/Utils/src/MediaPlayer/PooledMediaResourceProvider.cpp b/AVSCommon/Utils/src/MediaPlayer/PooledMediaResourceProvider.cpp
index 06858a3020..9bea774dde 100644
--- a/AVSCommon/Utils/src/MediaPlayer/PooledMediaResourceProvider.cpp
+++ b/AVSCommon/Utils/src/MediaPlayer/PooledMediaResourceProvider.cpp
@@ -25,7 +25,7 @@ namespace mediaPlayer {
 
 using namespace avsCommon::sdkInterfaces;
 
-static const std::string TAG("PooledMediaResourceProvider");
+#define TAG "PooledMediaResourceProvider"
 
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
diff --git a/AVSCommon/Utils/src/Metrics/DataPointCounterBuilder.cpp b/AVSCommon/Utils/src/Metrics/DataPointCounterBuilder.cpp
index fb9d8c1a04..c74a2efafb 100644
--- a/AVSCommon/Utils/src/Metrics/DataPointCounterBuilder.cpp
+++ b/AVSCommon/Utils/src/Metrics/DataPointCounterBuilder.cpp
@@ -25,7 +25,7 @@ namespace utils {
 namespace metrics {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DataPointCounterBuilder");
+#define TAG "DataPointCounterBuilder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/Metrics/DataPointDurationBuilder.cpp b/AVSCommon/Utils/src/Metrics/DataPointDurationBuilder.cpp
index 3099243963..ab728f8413 100644
--- a/AVSCommon/Utils/src/Metrics/DataPointDurationBuilder.cpp
+++ b/AVSCommon/Utils/src/Metrics/DataPointDurationBuilder.cpp
@@ -23,7 +23,7 @@ namespace utils {
 namespace metrics {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DataPointDurationBuilder");
+#define TAG "DataPointDurationBuilder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/Metrics/MetricEvent.cpp b/AVSCommon/Utils/src/Metrics/MetricEvent.cpp
index c93393dc63..f8993a1ba4 100644
--- a/AVSCommon/Utils/src/Metrics/MetricEvent.cpp
+++ b/AVSCommon/Utils/src/Metrics/MetricEvent.cpp
@@ -25,7 +25,7 @@ namespace utils {
 namespace metrics {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("MetricEvent");
+#define TAG "MetricEvent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/Metrics/MetricEventBuilder.cpp b/AVSCommon/Utils/src/Metrics/MetricEventBuilder.cpp
index 1b49ebf7f1..b50608877e 100644
--- a/AVSCommon/Utils/src/Metrics/MetricEventBuilder.cpp
+++ b/AVSCommon/Utils/src/Metrics/MetricEventBuilder.cpp
@@ -22,7 +22,7 @@ namespace utils {
 namespace metrics {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("MetricEventBuilder");
+#define TAG "MetricEventBuilder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/Metrics/UplData.cpp b/AVSCommon/Utils/src/Metrics/UplData.cpp
index 846547e8ca..d1028f0571 100644
--- a/AVSCommon/Utils/src/Metrics/UplData.cpp
+++ b/AVSCommon/Utils/src/Metrics/UplData.cpp
@@ -23,7 +23,7 @@ namespace utils {
 namespace metrics {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("UplData");
+#define TAG "UplData"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/MultiTimer.cpp b/AVSCommon/Utils/src/MultiTimer.cpp
index a5ba08c68b..bf3890ed65 100644
--- a/AVSCommon/Utils/src/MultiTimer.cpp
+++ b/AVSCommon/Utils/src/MultiTimer.cpp
@@ -15,9 +15,9 @@
 #include <algorithm>
 
 #include <AVSCommon/Utils/Timing/MultiTimer.h>
-
-#include "AVSCommon/Utils/Logger/Logger.h"
-#include "AVSCommon/Utils/Timing/Timer.h"
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Logger/ThreadMoniker.h>
+#include <AVSCommon/Utils/Timing/Timer.h>
 
 namespace alexaClientSDK {
 namespace avsCommon {
@@ -25,26 +25,31 @@ namespace utils {
 namespace timing {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("MultiTimer");
+#define TAG "MultiTimer"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
  *
- * @param The event string for this @c LogEntry.
+ * @param event The event string for this @c LogEntry.
  */
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
 /// Grace period used to avoid restarting the internal thread too often.
 static const std::chrono::milliseconds GRACE_PERIOD{500};
 
-std::shared_ptr<MultiTimer> MultiTimer::createMultiTimer() {
+std::shared_ptr<MultiTimer> MultiTimer::createMultiTimer() noexcept {
     return std::make_shared<MultiTimer>();
 }
 
-MultiTimer::MultiTimer() : m_isRunning{false}, m_isBeingDestroyed{false}, m_nextToken{0} {
+MultiTimer::MultiTimer() noexcept :
+        m_timerMoniker{utils::logger::ThreadMoniker::generateMoniker(utils::logger::ThreadMoniker::PREFIX_TIMER)},
+        m_isRunning{false},
+        m_isBeingDestroyed{false},
+        m_nextToken{0} {
+    ACSDK_DEBUG5(LX("init").d("moniker", m_timerMoniker));
 }
 
-MultiTimer::~MultiTimer() {
+MultiTimer::~MultiTimer() noexcept {
     std::unique_lock<std::mutex> lock{m_waitMutex};
     m_timers.clear();
     m_tasks.clear();
@@ -57,7 +62,7 @@ MultiTimer::~MultiTimer() {
     }
 }
 
-MultiTimer::Token MultiTimer::submitTask(const std::chrono::milliseconds& delay, std::function<void()> task) {
+MultiTimer::Token MultiTimer::submitTask(const std::chrono::milliseconds& delay, std::function<void()> task) noexcept {
     std::unique_lock<std::mutex> lock{m_waitMutex};
     auto token = m_nextToken++;
 
@@ -69,7 +74,7 @@ MultiTimer::Token MultiTimer::submitTask(const std::chrono::milliseconds& delay,
     // Kick-off task execution if needed.
     if (!m_isRunning) {
         m_isRunning = true;
-        m_timerThread.start(std::bind(&MultiTimer::executeTimer, this));
+        m_timerThread.start(std::bind(&MultiTimer::executeTimer, this), m_timerMoniker);
     } else {
         // Wake up timer thread if the new task is the next to expire.
         if (m_timers.begin()->second == token) {
@@ -80,7 +85,7 @@ MultiTimer::Token MultiTimer::submitTask(const std::chrono::milliseconds& delay,
     return token;
 }
 
-void MultiTimer::cancelTask(Token token) {
+void MultiTimer::cancelTask(Token token) noexcept {
     std::unique_lock<std::mutex> lock{m_waitMutex};
     auto taskIt = m_tasks.find(token);
     if (taskIt != m_tasks.end()) {
@@ -99,7 +104,7 @@ void MultiTimer::cancelTask(Token token) {
     }
 }
 
-bool MultiTimer::executeTimer() {
+bool MultiTimer::executeTimer() noexcept {
     std::unique_lock<std::mutex> lock{m_waitMutex};
     while (!m_timers.empty()) {
         auto now = std::chrono::steady_clock::now();
@@ -115,17 +120,23 @@ bool MultiTimer::executeTimer() {
             // Execute task.
             auto taskIt = m_tasks.find(nextIt->second);
             if (taskIt != m_tasks.end()) {
-                auto& task = taskIt->second.second;
-                task();
+                auto task = std::move(taskIt->second.second);
                 m_tasks.erase(taskIt);
+                m_timers.erase(nextIt);
+                lock.unlock();
+                if (task) {
+                    task();
+                }
+                lock.lock();
+            } else {
+                m_timers.erase(nextIt);
             }
-            m_timers.erase(nextIt);
         }
     }
     return hasNextLocked(lock);
 }
 
-bool MultiTimer::hasNextLocked(std::unique_lock<std::mutex>& lock) {
+bool MultiTimer::hasNextLocked(std::unique_lock<std::mutex>& lock) noexcept {
     m_waitCondition.wait_for(lock, GRACE_PERIOD, [this] { return (!m_tasks.empty()) || m_isBeingDestroyed; });
     m_isRunning = (!m_isBeingDestroyed) && !m_tasks.empty();
     return m_isRunning;
diff --git a/AVSCommon/Utils/src/Network/InternetConnectionMonitor.cpp b/AVSCommon/Utils/src/Network/InternetConnectionMonitor.cpp
index 327cf5528f..94a35adf46 100644
--- a/AVSCommon/Utils/src/Network/InternetConnectionMonitor.cpp
+++ b/AVSCommon/Utils/src/Network/InternetConnectionMonitor.cpp
@@ -26,7 +26,7 @@ using namespace avsCommon::utils::sds;
 using namespace utils::timing;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("InternetConnectionMonitor");
+#define TAG "InternetConnectionMonitor"
 
 /**
  * Create a @c LogEntry using this file's @c TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/Power/AggregatedPowerResourceManager.cpp b/AVSCommon/Utils/src/Power/AggregatedPowerResourceManager.cpp
index 0a20750f66..d03484ee47 100644
--- a/AVSCommon/Utils/src/Power/AggregatedPowerResourceManager.cpp
+++ b/AVSCommon/Utils/src/Power/AggregatedPowerResourceManager.cpp
@@ -26,7 +26,7 @@ namespace power {
 using namespace avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AggregatedPowerResourceManager");
+#define TAG "AggregatedPowerResourceManager"
 
 /// Prefix to uniquely identify the resource.
 static const std::string PREFIX = "ACSDK_";
@@ -89,24 +89,16 @@ AggregatedPowerResourceManager::AggregatedPowerResourceManager(
 void AggregatedPowerResourceManager::acquirePowerResource(
     const std::string& component,
     const PowerResourceLevel level) {
-    ACSDK_DEBUG9(LX(__func__));
-
-    std::lock_guard<std::mutex> lock(m_mutex);
-    m_appPowerResourceManager->acquirePowerResource(component, level);
+    ACSDK_ERROR(LX(__func__).m("API is deprecated.Please see PowerResourceManagerInterface for alternatives"));
 }
 
 void AggregatedPowerResourceManager::releasePowerResource(const std::string& component) {
-    ACSDK_DEBUG9(LX(__func__));
-
-    std::lock_guard<std::mutex> lock(m_mutex);
-    m_appPowerResourceManager->releasePowerResource(component);
+    ACSDK_ERROR(LX(__func__).m("API is deprecated.Please see PowerResourceManagerInterface for alternatives"));
 };
 
 bool AggregatedPowerResourceManager::isPowerResourceAcquired(const std::string& component) {
-    ACSDK_DEBUG9(LX(__func__));
-
-    std::lock_guard<std::mutex> lock(m_mutex);
-    return m_appPowerResourceManager->isPowerResourceAcquired(component);
+    ACSDK_ERROR(LX(__func__).m("API is deprecated.Please see PowerResourceManagerInterface for alternatives"));
+    return false;
 }
 
 std::shared_ptr<PowerResourceManagerInterface::PowerResourceId> AggregatedPowerResourceManager::
diff --git a/AVSCommon/Utils/src/Power/PowerMonitor.cpp b/AVSCommon/Utils/src/Power/PowerMonitor.cpp
index ab5b958765..9b91a9790a 100644
--- a/AVSCommon/Utils/src/Power/PowerMonitor.cpp
+++ b/AVSCommon/Utils/src/Power/PowerMonitor.cpp
@@ -23,7 +23,7 @@ namespace utils {
 namespace power {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PowerMonitor");
+#define TAG "PowerMonitor"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/Power/PowerResource.cpp b/AVSCommon/Utils/src/Power/PowerResource.cpp
index 2c509c6596..db7b004ac1 100644
--- a/AVSCommon/Utils/src/Power/PowerResource.cpp
+++ b/AVSCommon/Utils/src/Power/PowerResource.cpp
@@ -24,7 +24,7 @@ namespace power {
 using namespace avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PowerResource");
+#define TAG "PowerResource"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/RequiresShutdown.cpp b/AVSCommon/Utils/src/RequiresShutdown.cpp
index 0394d901cd..73ef87a6b9 100644
--- a/AVSCommon/Utils/src/RequiresShutdown.cpp
+++ b/AVSCommon/Utils/src/RequiresShutdown.cpp
@@ -24,7 +24,7 @@ namespace avsCommon {
 namespace utils {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("RequiresShutdown");
+#define TAG "RequiresShutdown"
 
 /**
  * Create a @c LogEntry using this file's @c TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/RetryTimer.cpp b/AVSCommon/Utils/src/RetryTimer.cpp
index 7470056c98..fbe08c8f8e 100644
--- a/AVSCommon/Utils/src/RetryTimer.cpp
+++ b/AVSCommon/Utils/src/RetryTimer.cpp
@@ -47,8 +47,8 @@ RetryTimer::RetryTimer(const std::vector<int>& retryTable, int decreasePercentag
 std::chrono::milliseconds RetryTimer::calculateTimeToRetry(int retryCount) const {
     if (retryCount < 0) {
         retryCount = 0;
-    } else if ((size_t)retryCount >= m_RetrySize) {
-        retryCount = m_RetrySize - 1;
+    } else if (static_cast<size_t>(retryCount) >= m_RetrySize) {
+        retryCount = static_cast<int>(m_RetrySize) - 1;
     }
 
     std::mt19937 generator(static_cast<unsigned>(std::time(nullptr)));
diff --git a/AVSCommon/Utils/src/Stopwatch.cpp b/AVSCommon/Utils/src/Stopwatch.cpp
index 017c04793a..836af0c4aa 100644
--- a/AVSCommon/Utils/src/Stopwatch.cpp
+++ b/AVSCommon/Utils/src/Stopwatch.cpp
@@ -22,7 +22,7 @@ namespace utils {
 namespace timing {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("Stopwatch");
+#define TAG "Stopwatch"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/Stream/Streambuf.cpp b/AVSCommon/Utils/src/Stream/Streambuf.cpp
index 6792a0bc78..1b1c52c6c4 100644
--- a/AVSCommon/Utils/src/Stream/Streambuf.cpp
+++ b/AVSCommon/Utils/src/Stream/Streambuf.cpp
@@ -12,7 +12,9 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
+#include <limits>
 
+#include <AVSCommon/Utils/Logger/Logger.h>
 #include "AVSCommon/Utils/Stream/Streambuf.h"
 
 namespace alexaClientSDK {
@@ -20,6 +22,22 @@ namespace avsCommon {
 namespace utils {
 namespace stream {
 
+/// String to identify log entries originating from this file.
+#define TAG "Streambuf"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Constant to indicate the MAX stream offset of an integer.
+static constexpr std::streamoff MAX_INT = std::numeric_limits<int>::max();
+
+/// Constant to indicate a invalid offset.
+static constexpr std::streamoff INVALID_OFFSET = std::streamoff(-1);
+
 // There are two casts, as a streambuf uses Type=char.  This requires removing the const and removing the unsigned.
 // setg only is for reading, so this operation is safe, although ugly.
 Streambuf::Streambuf(const unsigned char* data, size_t length) :
@@ -29,22 +47,27 @@ Streambuf::Streambuf(const unsigned char* data, size_t length) :
 }
 
 std::streampos Streambuf::seekoff(std::streamoff off, std::ios_base::seekdir way, std::ios_base::openmode which) {
+    auto errorPos = std::streampos(INVALID_OFFSET);
     switch (way) {
         case std::ios_base::beg:
             setg(m_begin, m_begin + off, m_end);
             break;
         case std::ios_base::cur:
-            gbump(off);
+            if (off > MAX_INT) {
+                ACSDK_ERROR(LX("seekoffFailed").d("reason", "offset out of limits").d("off", off).d("limit", MAX_INT));
+                return errorPos;
+            }
+            gbump(static_cast<int>(off));
             break;
         case std::ios_base::end:
             setg(m_begin, m_end + off, m_end);
             break;
         default:
-            return std::streampos(std::streamoff(-1));
+            return errorPos;
     }
 
     if (!gptr() || gptr() >= egptr() || gptr() < eback()) {
-        return std::streampos(std::streamoff(-1));
+        return errorPos;
     }
 
     return gptr() - eback();
diff --git a/AVSCommon/Utils/src/StringUtils.cpp b/AVSCommon/Utils/src/StringUtils.cpp
index f9d853e4f0..fba725e597 100644
--- a/AVSCommon/Utils/src/StringUtils.cpp
+++ b/AVSCommon/Utils/src/StringUtils.cpp
@@ -31,7 +31,7 @@ namespace string {
 using namespace avsCommon::utils::logger;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("StringUtils");
+#define TAG "StringUtils"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/TaskThread.cpp b/AVSCommon/Utils/src/TaskThread.cpp
index af362ac9c8..4c1a8488e1 100644
--- a/AVSCommon/Utils/src/TaskThread.cpp
+++ b/AVSCommon/Utils/src/TaskThread.cpp
@@ -15,17 +15,17 @@
 
 #include <chrono>
 
-#include "AVSCommon/Utils/Logger/Logger.h"
-#include "AVSCommon/Utils/Logger/ThreadMoniker.h"
-#include "AVSCommon/Utils/Threading/TaskThread.h"
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Logger/ThreadMoniker.h>
+#include <AVSCommon/Utils/Threading/TaskThread.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("TaskThread");
+#define TAG "TaskThread"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
  *
- * @param The event string for this @c LogEntry.
+ * @param event The event string for this @c LogEntry.
  */
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
@@ -62,7 +62,7 @@ TaskThread::~TaskThread() {
     }
 }
 
-bool TaskThread::start(std::function<bool()> jobRunner) {
+bool TaskThread::start(std::function<bool()> jobRunner, const std::string& moniker) {
     if (!jobRunner) {
         ACSDK_ERROR(LX("startFailed").d("reason", "invalidFunction"));
         return false;
@@ -74,19 +74,17 @@ bool TaskThread::start(std::function<bool()> jobRunner) {
         return false;
     }
 
-    m_startTime = steady_clock::now();
-
     m_stop = true;
     std::lock_guard<std::mutex> guard(m_mutex);
     if (m_shuttingDown) {
         ACSDK_ERROR(LX("startFailed").d("reason", "shuttingDown"));
         return false;
     }
-    m_workerThread = m_threadPool->obtainWorker(m_moniker);
+    m_workerThread = m_threadPool->obtainWorker();
 
-    m_moniker = m_workerThread->getMoniker();
-    m_workerThread->run([this, jobRunner] {
-        TaskThread::run(jobRunner);
+    m_workerThread->run([this, jobRunner, moniker] {
+        utils::logger::ThreadMoniker::setThisThreadMoniker(moniker);
+        TaskThread::run(std::move(jobRunner));
         return false;
     });
     return true;
@@ -94,15 +92,14 @@ bool TaskThread::start(std::function<bool()> jobRunner) {
 
 void TaskThread::run(std::function<bool()> jobRunner) {
     std::lock_guard<std::mutex> guard(m_mutex);
-    ACSDK_DEBUG9(LX("startThread")
-                     .d("moniker", m_moniker)
-                     .d("duration", duration_cast<microseconds>(steady_clock::now() - m_startTime).count()));
+
     // Reset stop flag and already starting flag.
     m_stop = false;
     m_alreadyStarting = false;
 
     while (!m_stop && jobRunner())
         ;
+
     m_threadPool->releaseWorker(std::move(m_workerThread));
 }
 
diff --git a/AVSCommon/Utils/src/ThreadPool.cpp b/AVSCommon/Utils/src/ThreadPool.cpp
index bb9abbf6e8..1e4b9c25ea 100644
--- a/AVSCommon/Utils/src/ThreadPool.cpp
+++ b/AVSCommon/Utils/src/ThreadPool.cpp
@@ -14,20 +14,18 @@
  */
 
 #include <memory>
-#include <functional>
 
 #include "AVSCommon/Utils/Logger/Logger.h"
-#include "AVSCommon/Utils/Logger/ThreadMoniker.h"
 #include "AVSCommon/Utils/Memory/Memory.h"
 #include "AVSCommon/Utils/Threading/ThreadPool.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ThreadPool");
+#define TAG "ThreadPool"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
  *
- * @param The event string for this @c LogEntry.
+ * @param event The event string for this @c LogEntry.
  */
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
@@ -39,8 +37,6 @@ namespace threading {
 using namespace std;
 using namespace logger;
 
-static ThreadPool SINGLETON_THREAD_POOL{};
-
 ThreadPool::ThreadPool(size_t maxThreads) :
         m_maxPoolThreads{maxThreads},
         m_created{0},
@@ -55,35 +51,18 @@ ThreadPool::~ThreadPool() {
     m_workerQueue.clear();
 }
 
-unique_ptr<WorkerThread> ThreadPool::obtainWorker(string optionalMoniker) {
+unique_ptr<WorkerThread> ThreadPool::obtainWorker() {
     std::lock_guard<mutex> lock(m_queueMutex);
-    ACSDK_DEBUG9(LX("obtainWorker")
-                     .d("created", m_created)
-                     .d("obtained", m_obtained)
-                     .d("releasedToPool", m_releasedToPool)
-                     .d("releasedFromPool", m_releasedFromPool)
-                     .d("outstanding", m_obtained - (m_releasedToPool + m_releasedFromPool)));
+
     m_obtained++;
     unique_ptr<WorkerThread> ret;
     if (m_workerQueue.empty()) {
         m_created++;
         ret = memory::make_unique<WorkerThread>();
     } else {
-#ifdef THREAD_AFFINITY
-        bool containsMoniker = false;
-        if (!optionalMoniker.empty()) {
-            containsMoniker = m_workerMap.count(optionalMoniker) > 0;
-        }
-        auto workerIterator = containsMoniker ? m_workerMap[optionalMoniker] : m_workerQueue.begin();
-#else
         auto workerIterator = m_workerQueue.begin();
-#endif
         ret = std::move(*workerIterator);
         m_workerQueue.erase(workerIterator);
-#ifdef THREAD_AFFINITY
-        std::string moniker = (*workerIterator)->getMoniker();
-        m_workerMap.erase(moniker);
-#endif
     }
 
     return ret;
@@ -91,7 +70,6 @@ unique_ptr<WorkerThread> ThreadPool::obtainWorker(string optionalMoniker) {
 
 void ThreadPool::releaseWorker(std::unique_ptr<WorkerThread> workerThread) {
     std::lock_guard<mutex> lock(m_queueMutex);
-
     if (m_workerQueue.size() >= m_maxPoolThreads) {
         // In order to allow this to be called from the thread being released,
         // we release the first thread in the queue when we want to stop growing.
@@ -101,10 +79,6 @@ void ThreadPool::releaseWorker(std::unique_ptr<WorkerThread> workerThread) {
         m_releasedToPool++;
     }
     m_workerQueue.push_back(std::move(workerThread));
-#ifdef THREAD_AFFINITY
-    std::string moniker = workerThread->getMoniker();
-    m_workerMap[moniker] = --m_workerQueue.end();
-#endif
 }
 
 void ThreadPool::setMaxThreads(size_t maxThreads) {
@@ -115,7 +89,7 @@ void ThreadPool::setMaxThreads(size_t maxThreads) {
     }
 }
 
-uint32_t ThreadPool::getMaxThreads() {
+size_t ThreadPool::getMaxThreads() {
     std::lock_guard<mutex> lock(m_queueMutex);
     return m_maxPoolThreads;
 }
diff --git a/AVSCommon/Utils/src/Threading/ConditionVariableWrapper.cpp b/AVSCommon/Utils/src/Threading/ConditionVariableWrapper.cpp
index 547e395c0f..43f6459709 100644
--- a/AVSCommon/Utils/src/Threading/ConditionVariableWrapper.cpp
+++ b/AVSCommon/Utils/src/Threading/ConditionVariableWrapper.cpp
@@ -26,7 +26,7 @@ namespace threading {
 using namespace avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG(ConditionVariableWrapper::getTag());
+#define TAG ConditionVariableWrapper::getTag()
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/Threading/Executor.cpp b/AVSCommon/Utils/src/Threading/Executor.cpp
new file mode 100644
index 0000000000..9f3aa04d61
--- /dev/null
+++ b/AVSCommon/Utils/src/Threading/Executor.cpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include <AVSCommon/Utils/Threading/private/SharedExecutor.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/// String to identify log entries originating from this file.
+#define TAG "ExecutorWrapper"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace avsCommon {
+namespace utils {
+namespace threading {
+
+Executor::Executor() noexcept : m_executor{std::make_shared<SharedExecutor>()} {
+    if (!m_executor) {
+        ACSDK_ERROR(LX("initError"));
+    }
+}
+
+Executor::~Executor() noexcept {
+    m_executor.reset();
+}
+
+bool Executor::execute(std::function<void()>&& function) noexcept {
+    return execute(std::move(function), QueuePosition::Back);
+}
+
+bool Executor::execute(std::function<void()>&& function, QueuePosition queuePosition) noexcept {
+    if (m_executor) {
+        auto error = m_executor->execute(std::move(function), queuePosition);
+        return !error;
+    }
+    return false;
+}
+
+bool Executor::execute(const std::function<void()>& function) noexcept {
+    return execute(std::function<void()>(function), QueuePosition::Back);
+}
+
+void Executor::waitForSubmittedTasks() noexcept {
+    if (m_executor) {
+        m_executor->waitForSubmittedTasks();
+    }
+}
+
+void Executor::shutdown() noexcept {
+    if (m_executor) {
+        m_executor->shutdown();
+    }
+}
+
+bool Executor::isShutdown() noexcept {
+    if (m_executor) {
+        return m_executor->isShutdown();
+    }
+    return true;
+}
+
+Executor::operator std::shared_ptr<ExecutorInterface>() const noexcept {
+    return m_executor;
+}
+
+}  // namespace threading
+}  // namespace utils
+}  // namespace avsCommon
+}  // namespace alexaClientSDK
diff --git a/AVSCommon/Utils/src/Threading/ExecutorFactory.cpp b/AVSCommon/Utils/src/Threading/ExecutorFactory.cpp
new file mode 100644
index 0000000000..45eeb75e4a
--- /dev/null
+++ b/AVSCommon/Utils/src/Threading/ExecutorFactory.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/Threading/private/SharedExecutor.h>
+#include <AVSCommon/Utils/Threading/ExecutorFactory.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/// String to identify log entries originating from this file.
+#define TAG "ExecutorFactory"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace avsCommon {
+namespace utils {
+namespace threading {
+
+std::shared_ptr<ExecutorInterface> createSingleThreadExecutor() noexcept {
+    auto res = std::make_shared<SharedExecutor>();
+    if (!res) {
+        ACSDK_ERROR(LX("createExecutorFailed"));
+    }
+    return res;
+}
+
+}  // namespace threading
+}  // namespace utils
+}  // namespace avsCommon
+}  // namespace alexaClientSDK
diff --git a/AVSCommon/Utils/src/Threading/SharedExecutor.cpp b/AVSCommon/Utils/src/Threading/SharedExecutor.cpp
new file mode 100644
index 0000000000..a80f6fc6fe
--- /dev/null
+++ b/AVSCommon/Utils/src/Threading/SharedExecutor.cpp
@@ -0,0 +1,203 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <algorithm>
+#include <exception>
+#include <cctype>
+
+#include <AVSCommon/Utils/Logger/ThreadMoniker.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/Power/PowerMonitor.h>
+#include <AVSCommon/Utils/Threading/private/SharedExecutor.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/// String to identify log entries originating from this file.
+#define TAG "Executor"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace avsCommon {
+namespace utils {
+namespace threading {
+
+template std::future<void> Executor::pushFunction(
+    QueuePosition queuePosition,
+    std::function<void()>&& function) noexcept;
+template std::future<bool> Executor::pushFunction(
+    QueuePosition queuePosition,
+    std::function<bool()>&& function) noexcept;
+template std::future<std::string> Executor::pushFunction(
+    QueuePosition queuePosition,
+    std::function<std::string()>&& function) noexcept;
+
+/// Prefix for power resource owned by @c Executor instance.
+/// @private
+static constexpr auto POWER_RESOURCE_PREFIX = "Executor:";
+
+/**
+ * Helper method to create power resource id from a moniker.
+ *
+ * This method concatenates @a POWER_RESOURCE_PREFIX with @a moniker without trailing spaces.
+ *
+ * @param moniker Moniker value to use.
+ * @return Power resource identifier.
+ * @private
+ */
+static std::string createPowerResourceName(const std::string& moniker) noexcept {
+    std::string::const_iterator it = moniker.begin();
+    while (it != moniker.end() && std::isspace(*it)) {
+        ++it;
+    }
+    std::string result;
+    constexpr auto powerResourcePrefixLen = sizeof(POWER_RESOURCE_PREFIX) - 1;
+    result.reserve(std::distance(it, moniker.end()) + powerResourcePrefixLen);
+    result.append(POWER_RESOURCE_PREFIX, powerResourcePrefixLen);
+    std::copy(it, moniker.end(), back_inserter(result));
+    return result;
+}
+
+SharedExecutor::SharedExecutor() noexcept :
+        m_executorMoniker{utils::logger::ThreadMoniker::generateMoniker(utils::logger::ThreadMoniker::PREFIX_EXECUTOR)},
+        m_threadRunning{false},
+        m_shutdown{false} {
+    ACSDK_DEBUG5(LX("created").d("moniker", m_executorMoniker));
+    m_powerResource =
+        power::PowerMonitor::getInstance()->createLocalPowerResource(createPowerResourceName(m_executorMoniker));
+}
+
+SharedExecutor::~SharedExecutor() noexcept {
+    shutdown();
+    ACSDK_DEBUG5(LX("destroyed").d("moniker", m_executorMoniker));
+}
+
+std::error_condition SharedExecutor::execute(std::function<void()>&& function) noexcept {
+    return execute(std::move(function), QueuePosition::Back);
+}
+
+std::error_condition SharedExecutor::execute(const std::function<void()>& function) noexcept {
+    // Forward copy of function reference.
+    return execute(std::function<void()>(function), QueuePosition::Back);
+}
+
+void SharedExecutor::waitForSubmittedTasks() noexcept {
+    std::unique_lock<std::mutex> lock{m_queueMutex};
+    if (m_threadRunning) {
+        // wait for thread to exit.
+        std::promise<void> flushedPromise;
+        auto flushedFuture = flushedPromise.get_future();
+        m_queue.emplace_back([&flushedPromise]() { flushedPromise.set_value(); });
+
+        lock.unlock();
+        flushedFuture.wait();
+    }
+}
+
+std::error_condition SharedExecutor::execute(std::function<void()>&& function, QueuePosition queuePosition) noexcept {
+    if (!function) {
+        ACSDK_ERROR(LX(__func__).d("reason", "emptyFunction"));
+        return std::errc::invalid_argument;
+    }
+    if (QueuePosition::Back != queuePosition && QueuePosition::Front != queuePosition) {
+        ACSDK_ERROR(LX(__func__).d("reason", "badQueuePosition"));
+        return std::errc::invalid_argument;
+    }
+
+    std::lock_guard<std::mutex> queueLock{m_queueMutex};
+    if (m_shutdown) {
+        ACSDK_WARN(LX(__func__).d("reason", "shutdownState"));
+        return std::errc::operation_not_permitted;
+    }
+
+    if (m_powerResource) {
+        m_powerResource->acquire();
+    }
+    m_queue.emplace(QueuePosition::Front == queuePosition ? m_queue.begin() : m_queue.end(), std::move(function));
+
+    if (!m_threadRunning) {
+        m_threadRunning = true;
+        // Restart task thread.
+        m_taskThread.start(std::bind(&SharedExecutor::runNext, this), m_executorMoniker);
+    }
+
+    return std::error_condition();
+}
+
+std::function<void()> SharedExecutor::pop() noexcept {
+    std::lock_guard<std::mutex> lock{m_queueMutex};
+    if (!m_queue.empty()) {
+        auto task = std::move(m_queue.front());
+        m_queue.pop_front();
+        return task;
+    }
+    return std::function<void()>();
+}
+
+bool SharedExecutor::hasNext() noexcept {
+    std::unique_lock<std::mutex> lock{m_queueMutex};
+    m_threadRunning = !m_queue.empty();
+    return m_threadRunning;
+}
+
+bool SharedExecutor::runNext() noexcept {
+    auto task = pop();
+    if (task) {
+#if __cpp_exceptions || defined(__EXCEPTIONS)
+        try {
+#endif
+            task();
+            // Ensure the task is released after executed.
+            task = nullptr;
+
+#if __cpp_exceptions || defined(__EXCEPTIONS)
+        } catch (const std::exception& ex) {
+            ACSDK_ERROR(LX(__func__).d("taskException", ex.what()));
+        } catch (...) {
+            ACSDK_ERROR(LX(__func__).d("taskException", "other"));
+        }
+#endif
+
+        if (m_powerResource) {
+            m_powerResource->release();
+        }
+    }
+
+    return hasNext();
+}
+
+void SharedExecutor::shutdown() noexcept {
+    Queue releaseQueue;
+    {
+        std::lock_guard<std::mutex> lock{m_queueMutex};
+        m_shutdown = true;
+        std::swap(releaseQueue, m_queue);
+    }
+    releaseQueue.clear();
+    waitForSubmittedTasks();
+}
+
+bool SharedExecutor::isShutdown() noexcept {
+    return m_shutdown;
+}
+
+}  // namespace threading
+}  // namespace utils
+}  // namespace avsCommon
+}  // namespace alexaClientSDK
diff --git a/AVSCommon/Utils/src/TimePoint.cpp b/AVSCommon/Utils/src/TimePoint.cpp
index 5083650c3c..e042977d79 100644
--- a/AVSCommon/Utils/src/TimePoint.cpp
+++ b/AVSCommon/Utils/src/TimePoint.cpp
@@ -26,7 +26,7 @@ namespace timing {
 using namespace avsCommon::utils::logger;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("TimePoint");
+#define TAG "TimePoint"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/src/TimeUtils.cpp b/AVSCommon/Utils/src/TimeUtils.cpp
index 03f470c6ee..4c50d6dc1c 100644
--- a/AVSCommon/Utils/src/TimeUtils.cpp
+++ b/AVSCommon/Utils/src/TimeUtils.cpp
@@ -33,33 +33,35 @@ using namespace avsCommon::utils::logger;
 using namespace avsCommon::utils::string;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("TimeUtils");
+#define TAG "TimeUtils"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
  *
- * @param The event string for this @c LogEntry.
+ * @param event The event string for this @c LogEntry.
  */
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
 /// The length of the year element in an ISO-8601 formatted string.
-static const int ENCODED_TIME_STRING_YEAR_STRING_LENGTH = 4;
+static const std::size_t ENCODED_TIME_STRING_YEAR_STRING_LENGTH = 4;
 /// The length of the month element in an ISO-8601 formatted string.
-static const int ENCODED_TIME_STRING_MONTH_STRING_LENGTH = 2;
+static const std::size_t ENCODED_TIME_STRING_MONTH_STRING_LENGTH = 2;
 /// The length of the day element in an ISO-8601 formatted string.
-static const int ENCODED_TIME_STRING_DAY_STRING_LENGTH = 2;
+static const std::size_t ENCODED_TIME_STRING_DAY_STRING_LENGTH = 2;
 /// The length of the hour element in an ISO-8601 formatted string.
-static const int ENCODED_TIME_STRING_HOUR_STRING_LENGTH = 2;
+static const std::size_t ENCODED_TIME_STRING_HOUR_STRING_LENGTH = 2;
 /// The length of the minute element in an ISO-8601 formatted string.
-static const int ENCODED_TIME_STRING_MINUTE_STRING_LENGTH = 2;
+static const std::size_t ENCODED_TIME_STRING_MINUTE_STRING_LENGTH = 2;
 /// The length of the second element in an ISO-8601 formatted string.
-static const int ENCODED_TIME_STRING_SECOND_STRING_LENGTH = 2;
+static const std::size_t ENCODED_TIME_STRING_SECOND_STRING_LENGTH = 2;
 /// The length of the post-fix element in an ISO-8601 formatted string.
-static const int ENCODED_TIME_STRING_POSTFIX_STRING_LENGTH = 4;
+static const std::size_t ENCODED_TIME_STRING_POSTFIX_STRING_LENGTH = 4;
 /// The dash separator used in an ISO-8601 formatted string.
 static const std::string ENCODED_TIME_STRING_DASH_SEPARATOR_STRING = "-";
 /// The 'T' separator used in an ISO-8601 formatted string.
 static const std::string ENCODED_TIME_STRING_T_SEPARATOR_STRING = "T";
+/// The 'Z' zone designator used in an ISO-8601 formatted string for zero UTC offset.
+static const std::string ENCODED_TIME_STRING_Z_DESIGNATOR = "Z";
 /// The colon separator used in an ISO-8601 formatted string.
 static const std::string ENCODED_TIME_STRING_COLON_SEPARATOR_STRING = ":";
 /// The plus separator used in an ISO-8601 formatted string.
@@ -68,31 +70,36 @@ static const std::string ENCODED_TIME_STRING_PLUS_SEPARATOR_STRING = "+";
 /// The offset into an ISO-8601 formatted string where the year begins.
 static const unsigned long ENCODED_TIME_STRING_YEAR_OFFSET = 0;
 /// The offset into an ISO-8601 formatted string where the month begins.
-static const unsigned long ENCODED_TIME_STRING_MONTH_OFFSET = ENCODED_TIME_STRING_YEAR_OFFSET +
-                                                              ENCODED_TIME_STRING_YEAR_STRING_LENGTH +
-                                                              ENCODED_TIME_STRING_DASH_SEPARATOR_STRING.length();
-/// The offset into an ISO-8601 formatted string where the day begins.
-static const unsigned long ENCODED_TIME_STRING_DAY_OFFSET = ENCODED_TIME_STRING_MONTH_OFFSET +
-                                                            ENCODED_TIME_STRING_MONTH_STRING_LENGTH +
+static const std::size_t ENCODED_TIME_STRING_MONTH_OFFSET = ENCODED_TIME_STRING_YEAR_OFFSET +
+                                                            ENCODED_TIME_STRING_YEAR_STRING_LENGTH +
                                                             ENCODED_TIME_STRING_DASH_SEPARATOR_STRING.length();
+/// The offset into an ISO-8601 formatted string where the day begins.
+static const std::size_t ENCODED_TIME_STRING_DAY_OFFSET = ENCODED_TIME_STRING_MONTH_OFFSET +
+                                                          ENCODED_TIME_STRING_MONTH_STRING_LENGTH +
+                                                          ENCODED_TIME_STRING_DASH_SEPARATOR_STRING.length();
 /// The offset into an ISO-8601 formatted string where the hour begins.
-static const unsigned long ENCODED_TIME_STRING_HOUR_OFFSET = ENCODED_TIME_STRING_DAY_OFFSET +
-                                                             ENCODED_TIME_STRING_DAY_STRING_LENGTH +
-                                                             ENCODED_TIME_STRING_T_SEPARATOR_STRING.length();
+static const std::size_t ENCODED_TIME_STRING_HOUR_OFFSET = ENCODED_TIME_STRING_DAY_OFFSET +
+                                                           ENCODED_TIME_STRING_DAY_STRING_LENGTH +
+                                                           ENCODED_TIME_STRING_T_SEPARATOR_STRING.length();
 /// The offset into an ISO-8601 formatted string where the minute begins.
-static const unsigned long ENCODED_TIME_STRING_MINUTE_OFFSET = ENCODED_TIME_STRING_HOUR_OFFSET +
-                                                               ENCODED_TIME_STRING_HOUR_STRING_LENGTH +
-                                                               ENCODED_TIME_STRING_COLON_SEPARATOR_STRING.length();
+static const std::size_t ENCODED_TIME_STRING_MINUTE_OFFSET = ENCODED_TIME_STRING_HOUR_OFFSET +
+                                                             ENCODED_TIME_STRING_HOUR_STRING_LENGTH +
+                                                             ENCODED_TIME_STRING_COLON_SEPARATOR_STRING.length();
 /// The offset into an ISO-8601 formatted string where the second begins.
-static const unsigned long ENCODED_TIME_STRING_SECOND_OFFSET = ENCODED_TIME_STRING_MINUTE_OFFSET +
-                                                               ENCODED_TIME_STRING_MINUTE_STRING_LENGTH +
-                                                               ENCODED_TIME_STRING_COLON_SEPARATOR_STRING.length();
+static const std::size_t ENCODED_TIME_STRING_SECOND_OFFSET = ENCODED_TIME_STRING_MINUTE_OFFSET +
+                                                             ENCODED_TIME_STRING_MINUTE_STRING_LENGTH +
+                                                             ENCODED_TIME_STRING_COLON_SEPARATOR_STRING.length();
 
 /// The total expected length of an ISO-8601 formatted string.
-static const unsigned long ENCODED_TIME_STRING_EXPECTED_LENGTH =
+static const std::size_t ENCODED_TIME_STRING_EXPECTED_LENGTH =
     ENCODED_TIME_STRING_SECOND_OFFSET + ENCODED_TIME_STRING_SECOND_STRING_LENGTH +
     ENCODED_TIME_STRING_PLUS_SEPARATOR_STRING.length() + ENCODED_TIME_STRING_POSTFIX_STRING_LENGTH;
 
+/// The total expected length of an ISO-8601 formatted string with UTC time.
+static const std::size_t ENCODED_TIME_STRING_EXPECTED_LENGTH_UTC = ENCODED_TIME_STRING_SECOND_OFFSET +
+                                                                   ENCODED_TIME_STRING_SECOND_STRING_LENGTH +
+                                                                   ENCODED_TIME_STRING_Z_DESIGNATOR.length();
+
 /**
  * Utility function that wraps localtime conversion to std::time_t.
  *
@@ -178,7 +185,8 @@ bool TimeUtils::convert8601TimeStringToTimeT(const std::string& iso8601TimeStrin
 
     std::tm timeInfo;
 
-    if (iso8601TimeString.length() != ENCODED_TIME_STRING_EXPECTED_LENGTH) {
+    if (iso8601TimeString.length() != ENCODED_TIME_STRING_EXPECTED_LENGTH &&
+        iso8601TimeString.length() != ENCODED_TIME_STRING_EXPECTED_LENGTH_UTC) {
         ACSDK_ERROR(
             LX("convert8601TimeStringToTimeTFailed").d("unexpected time string length:", iso8601TimeString.length()));
         return false;
diff --git a/AVSCommon/Utils/src/Timer.cpp b/AVSCommon/Utils/src/Timer.cpp
index 392bee1f99..13e441064e 100644
--- a/AVSCommon/Utils/src/Timer.cpp
+++ b/AVSCommon/Utils/src/Timer.cpp
@@ -14,60 +14,121 @@
  */
 
 #include <AVSCommon/Utils/Logger/Logger.h>
-
-#include "AVSCommon/Utils/Timing/Timer.h"
-#include "AVSCommon/Utils/Timing/TimerDelegateFactory.h"
+#include <AVSCommon/Utils/Timing/Timer.h>
+#include <AVSCommon/Utils/Timing/TimerDelegateFactory.h>
 
 namespace alexaClientSDK {
 namespace avsCommon {
 namespace utils {
 namespace timing {
 
+using namespace sdkInterfaces::timing;
+
 /// String to identify log entries originating from this file.
-static const std::string TAG(Timer::getTag());
+#define TAG "Timer"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
  *
- * @param The event string for this @c LogEntry.
+ * @param event The event string for this @c LogEntry.
  */
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
-Timer::Timer(std::shared_ptr<sdkInterfaces::timing::TimerDelegateFactoryInterface> timerDelegateFactory) {
-    if (!timerDelegateFactory) {
+// Instantiate templates
+template bool Timer::adaptTypesAndCallTask(
+    const std::chrono::milliseconds&,
+    const std::chrono::milliseconds&,
+    PeriodType,
+    size_t,
+    std::function<void()>&&) noexcept;
+template bool Timer::adaptTypesAndCallTask(
+    const std::chrono::nanoseconds&,
+    const std::chrono::nanoseconds&,
+    PeriodType,
+    size_t,
+    std::function<void()>&&) noexcept;
+
+Timer::Timer(const std::shared_ptr<TimerDelegateFactoryInterface>& timerDelegateFactory) noexcept {
+    if (timerDelegateFactory) {
+        m_timer = timerDelegateFactory->getTimerDelegate();
+    } else {
         ACSDK_WARN(
             LX(__func__).d("reason", "nullTimerDelegateFactory").m("Falling back to default TimerDelegateFactory"));
-        timerDelegateFactory = std::make_shared<TimerDelegateFactory>();
-        if (!timerDelegateFactory) {
-            ACSDK_ERROR(LX(__func__).d("reason", "nullDefaultTimerDelegateFactory"));
-            return;
-        }
+        m_timer = TimerDelegateFactory{}.getTimerDelegate();
     }
 
-    m_timer = timerDelegateFactory->getTimerDelegate();
     if (!m_timer) {
         ACSDK_ERROR(LX(__func__).d("reason", "nullTimerDelegate"));
     }
 }
 
-Timer::~Timer() {
+Timer::~Timer() noexcept {
     stop();
 }
 
-void Timer::stop() {
+void Timer::stop() noexcept {
     if (m_timer) {
         m_timer->stop();
     }
 }
 
-bool Timer::isActive() const {
+bool Timer::isActive() const noexcept {
     return m_timer && m_timer->isActive();
 }
 
-bool Timer::activate() {
+bool Timer::activate() noexcept {
     return m_timer && m_timer->activate();
 }
 
+bool Timer::callTask(
+    const std::chrono::nanoseconds& delayNano,
+    const std::chrono::nanoseconds& periodNano,
+    PeriodType periodType,
+    size_t maxCount,
+    std::function<void()>&& task) noexcept {
+    if (delayNano < std::chrono::nanoseconds::zero()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "negativeDelay"));
+        return false;
+    }
+    if (periodNano < std::chrono::nanoseconds::zero()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "negativePeriod"));
+        return false;
+    }
+    if (!task) {
+        ACSDK_ERROR(LX(__func__).d("reason", "nullTask"));
+        return false;
+    }
+
+    // Don't start if already running.
+    if (!activate()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "timerAlreadyActive"));
+        return false;
+    }
+
+    if (!m_timer) {
+        ACSDK_ERROR(LX(__func__).d("reason", "nullTimerDelegate"));
+        return false;
+    }
+
+    TimerDelegateInterface::PeriodType delegatePeriodType;
+
+    switch (periodType) {
+        case PeriodType::ABSOLUTE:
+            delegatePeriodType = TimerDelegateInterface::PeriodType::ABSOLUTE;
+            break;
+        case PeriodType::RELATIVE:
+            delegatePeriodType = TimerDelegateInterface::PeriodType::RELATIVE;
+            break;
+        default:
+            ACSDK_ERROR(LX(__func__).d("reason", "badPeriodType"));
+            return false;
+    }
+
+    m_timer->start(delayNano, periodNano, delegatePeriodType, maxCount, std::move(task));
+
+    return true;
+}
+
 }  // namespace timing
 }  // namespace utils
 }  // namespace avsCommon
diff --git a/AVSCommon/Utils/src/Timing/TimerDelegate.cpp b/AVSCommon/Utils/src/Timing/TimerDelegate.cpp
index 2c818ad6a6..ce5b171066 100644
--- a/AVSCommon/Utils/src/Timing/TimerDelegate.cpp
+++ b/AVSCommon/Utils/src/Timing/TimerDelegate.cpp
@@ -14,11 +14,12 @@
  */
 
 #include <AVSCommon/Utils/Error/FinallyGuard.h>
-#include "AVSCommon/Utils/Timing/TimerDelegate.h"
 #include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Logger/ThreadMoniker.h>
+#include <AVSCommon/Utils/Timing/TimerDelegate.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("TimerDelegate");
+#define TAG "TimerDelegate"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -32,6 +33,27 @@ namespace avsCommon {
 namespace utils {
 namespace timing {
 
+using utils::logger::ThreadMoniker;
+
+/**
+ * @brief Helper method to invoke task and catch exception.
+ *
+ * @param[in, out] task Task reference. The reference is cleared before the method returns.
+ */
+static void safeInvokeTask(std::function<void()>& task) {
+#if __cpp_exceptions || defined(__EXCEPTIONS)
+    try {
+#endif
+        task();
+#if __cpp_exceptions || defined(__EXCEPTIONS)
+    } catch (const std::exception& ex) {
+        ACSDK_ERROR(LX(__func__).d("taskException", ex.what()));
+    } catch (...) {
+        ACSDK_ERROR(LX(__func__).d("taskException", "other"));
+    }
+#endif
+}
+
 TimerDelegate::TimerDelegate() : m_running{false}, m_stopping{false} {
 }
 
@@ -45,10 +67,18 @@ void TimerDelegate::start(
     PeriodType periodType,
     size_t maxCount,
     std::function<void()> task) {
+    auto moniker = ThreadMoniker::generateMoniker(ThreadMoniker::PREFIX_TIMER);
+    ACSDK_DEBUG5(LX("init").d("moniker", moniker));
+
+    if (!task) {
+        ACSDK_ERROR(LX(__func__).d("reason", "nullTask"));
+    }
+
     std::lock_guard<std::mutex> lock(m_callMutex);
     cleanupLocked();
     activateLocked();
-    m_thread = std::thread(&TimerDelegate::timerLoop, this, delay, period, periodType, maxCount, task);
+    m_thread = std::thread(
+        &TimerDelegate::timerLoop, this, delay, period, periodType, maxCount, std::move(task), std::move(moniker));
 }
 
 void TimerDelegate::timerLoop(
@@ -56,9 +86,13 @@ void TimerDelegate::timerLoop(
     std::chrono::nanoseconds period,
     PeriodType periodType,
     size_t maxCount,
-    std::function<void()> task) {
+    std::function<void()> task,
+    std::string moniker) {
+    ThreadMoniker::setThisThreadMoniker(std::move(moniker));
+
     // Timepoint to measure delay/period against.
     auto now = std::chrono::steady_clock::now();
+    using utils::logger::ThreadMoniker;
 
     // Flag indicating whether we've drifted off schedule.
     bool offSchedule = false;
@@ -83,7 +117,7 @@ void TimerDelegate::timerLoop(
 
                 // Run the task if we're still on schedule.
                 if (!offSchedule) {
-                    task();
+                    safeInvokeTask(task);
                 }
 
                 // If the task runtime put us off schedule, skip the next task run.
@@ -95,11 +129,15 @@ void TimerDelegate::timerLoop(
                 break;
 
             case PeriodType::RELATIVE:
-                task();
+                safeInvokeTask(task);
                 now = std::chrono::steady_clock::now();
                 break;
         }
     }
+
+    // release task reference
+    task = nullptr;
+
     std::lock_guard<std::mutex> lockGuard(m_waitMutex);
     m_stopping = false;
     m_running = false;
@@ -108,7 +146,7 @@ void TimerDelegate::timerLoop(
 void TimerDelegate::stop() {
     std::lock_guard<std::mutex> lock(m_callMutex);
     {
-        std::lock_guard<std::mutex> lock(m_waitMutex);
+        std::lock_guard<std::mutex> stateLock(m_waitMutex);
         if (m_running) {
             m_stopping = true;
         }
diff --git a/AVSCommon/Utils/src/UUIDGeneration.cpp b/AVSCommon/Utils/src/UUIDGeneration.cpp
index 0579398d0f..39d4d57ffa 100644
--- a/AVSCommon/Utils/src/UUIDGeneration.cpp
+++ b/AVSCommon/Utils/src/UUIDGeneration.cpp
@@ -34,7 +34,7 @@ namespace utils {
 namespace uuidGeneration {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("UUIDGeneration");
+#define TAG "UUIDGeneration"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -177,13 +177,13 @@ static void addDefaultSeedLocked() {
     std::random_device rd;
     uint64_t timeSeed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
     if (lastInvokeTime > 0) {
-        seedsPool.push_front((uint32_t)(timeSeed - lastInvokeTime));  // interval between two invocations
+        seedsPool.push_front(static_cast<uint32_t>(timeSeed - lastInvokeTime));  // interval between two invocations
     }
     lastInvokeTime = timeSeed;
-    seedsPool.push_front((uint32_t)timeSeed);  // lower 32bits of current time
-    seedsPool.push_front(rd());                // random device
-    seedsPool.push_front(
-        reinterpret_cast<std::intptr_t>(&timeSeed));  // lower 32bits of memory address of temporary variable
+    seedsPool.push_front(static_cast<uint32_t>(timeSeed));  // lower 32bits of current time
+    seedsPool.push_front(rd());                             // random device
+    seedsPool.push_front(static_cast<uint32_t>(
+        reinterpret_cast<std::intptr_t>(&timeSeed)));  // lower 32bits of memory address of temporary variable
 
     if (seedsPool.size() > MAX_SEEDS_POOL_SIZE) {
         seedsPool.resize(MAX_SEEDS_POOL_SIZE);
diff --git a/AVSCommon/Utils/src/WavUtils.cpp b/AVSCommon/Utils/src/WavUtils.cpp
index bbe5086075..ca714dc1dc 100644
--- a/AVSCommon/Utils/src/WavUtils.cpp
+++ b/AVSCommon/Utils/src/WavUtils.cpp
@@ -24,7 +24,7 @@ namespace alexaClientSDK {
 namespace avsCommon {
 namespace utils {
 
-static const std::string TAG("WavUtils");
+#define TAG "WavUtils"
 
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
@@ -233,9 +233,9 @@ bool readWAVFile(
 
     // Check if the file size is at least the size of a .wav file header.
     inputFile.seekg(0, std::ios::end);
-    int fileLengthInBytes = inputFile.tellg();
+    size_t fileLengthInBytes = static_cast<size_t>(inputFile.tellg());
 
-    const int headerSize = isPCM ? PCM_HEADER_SIZE : NON_PCM_HEADER_SIZE;
+    const size_t headerSize = isPCM ? PCM_HEADER_SIZE : NON_PCM_HEADER_SIZE;
     if (fileLengthInBytes <= headerSize) {
         ACSDK_ERROR(LX("readAudioFileFailed").d("reason", "file size less than RIFF header"));
         return false;
@@ -249,7 +249,7 @@ bool readWAVFile(
 
     char* pBuffer = buffer.data();
 
-    if (static_cast<size_t>(inputFile.gcount()) != static_cast<size_t>(headerSize)) {
+    if (static_cast<size_t>(inputFile.gcount()) != headerSize) {
         ACSDK_ERROR(LX("readAudioFileFailed").d("reason", "failed reading header"));
         return false;
     }
@@ -275,7 +275,7 @@ bool readWAVFile(
     wavHeader.dataSz = readLongFromHeader(pBuffer, DATA_SZ_OFFSET + (isPCM ? 0 : NON_PCM_OFFSET));
 
     // Read the remainder of the wav file (excluding header) into the audioBuffer.
-    int numSamples = (fileLengthInBytes - headerSize) / sizeof(uint16_t);
+    size_t numSamples = (fileLengthInBytes - headerSize) / sizeof(uint16_t);
 
     audioBuffer->resize(numSamples, 0);
     inputFile.read(reinterpret_cast<char*>(&(audioBuffer->at(0))), numSamples * sizeof(uint16_t));
diff --git a/AVSCommon/Utils/src/WorkerThread.cpp b/AVSCommon/Utils/src/WorkerThread.cpp
index e82640b7b7..349f8c5dfe 100644
--- a/AVSCommon/Utils/src/WorkerThread.cpp
+++ b/AVSCommon/Utils/src/WorkerThread.cpp
@@ -23,10 +23,7 @@ namespace avsCommon {
 namespace utils {
 namespace threading {
 
-WorkerThread::WorkerThread() :
-        m_moniker{alexaClientSDK::avsCommon::utils::logger::ThreadMoniker::generateMoniker()},
-        m_stop{false},
-        m_cancel{false} {
+WorkerThread::WorkerThread() : m_stop{false}, m_cancel{false} {
     m_thread = std::thread{std::bind(&WorkerThread::runInternal, this)};
 }
 
@@ -45,14 +42,14 @@ WorkerThread::~WorkerThread() {
     }
 }
 
-std::string WorkerThread::getMoniker() const {
-    return m_moniker;
-}
-
 void WorkerThread::cancel() {
     m_cancel = true;
 }
 
+std::thread::id WorkerThread::getThreadId() const {
+    return m_thread.get_id();
+}
+
 void WorkerThread::run(std::function<bool()> workFunc) {
     std::lock_guard<std::mutex> lock(m_mutex);
     m_cancel = false;
@@ -61,7 +58,6 @@ void WorkerThread::run(std::function<bool()> workFunc) {
 }
 
 void WorkerThread::runInternal() {
-    alexaClientSDK::avsCommon::utils::logger::ThreadMoniker::setThisThreadMoniker(m_moniker);
     std::unique_lock<std::mutex> lock(m_mutex);
     do {
         // If run is called before the thread starts, it will notify before we wait, so we guard against that by
diff --git a/AVSCommon/Utils/test/AVSCommon/Utils/Power/AggregatedPowerResourceManagerTest.cpp b/AVSCommon/Utils/test/AVSCommon/Utils/Power/AggregatedPowerResourceManagerTest.cpp
index 1845154d4e..c84e2b284f 100644
--- a/AVSCommon/Utils/test/AVSCommon/Utils/Power/AggregatedPowerResourceManagerTest.cpp
+++ b/AVSCommon/Utils/test/AVSCommon/Utils/Power/AggregatedPowerResourceManagerTest.cpp
@@ -301,7 +301,7 @@ TEST_F(AggregatedPowerResourceManagerTest, test_closeCleanup) {
  * Test ensuring that acquirePowerResource calls the underlying application PowerResourceManagerInterface methods.
  */
 TEST_F(AggregatedPowerResourceManagerTest, test_acquirePowerResourceLegacy) {
-    EXPECT_CALL(*m_mockAppPowerManager, acquirePowerResource(TEST_ID, TEST_LEVEL));
+    EXPECT_CALL(*m_mockAppPowerManager, acquirePowerResource(TEST_ID, TEST_LEVEL)).Times(0);
     m_powerManager->acquirePowerResource(TEST_ID, TEST_LEVEL);
 }
 
@@ -309,7 +309,7 @@ TEST_F(AggregatedPowerResourceManagerTest, test_acquirePowerResourceLegacy) {
  * Test ensuring that releasePowerResource calls the underlying application PowerResourceManagerInterface methods.
  */
 TEST_F(AggregatedPowerResourceManagerTest, test_releasePowerResourceLegacy) {
-    EXPECT_CALL(*m_mockAppPowerManager, releasePowerResource(TEST_ID));
+    EXPECT_CALL(*m_mockAppPowerManager, releasePowerResource(TEST_ID)).Times(0);
     m_powerManager->releasePowerResource(TEST_ID);
 }
 
@@ -317,7 +317,7 @@ TEST_F(AggregatedPowerResourceManagerTest, test_releasePowerResourceLegacy) {
  * Test ensuring that isPowerResourceAcquired calls the underlying application PowerResourceManagerInterface methods.
  */
 TEST_F(AggregatedPowerResourceManagerTest, test_isPowerResourceAcquiredLegacy) {
-    EXPECT_CALL(*m_mockAppPowerManager, isPowerResourceAcquired(TEST_ID));
+    EXPECT_CALL(*m_mockAppPowerManager, isPowerResourceAcquired(TEST_ID)).Times(0);
     m_powerManager->isPowerResourceAcquired(TEST_ID);
 }
 
diff --git a/AVSCommon/Utils/test/CMakeLists.txt b/AVSCommon/Utils/test/CMakeLists.txt
index 9ed5e4de50..3f86a666a9 100644
--- a/AVSCommon/Utils/test/CMakeLists.txt
+++ b/AVSCommon/Utils/test/CMakeLists.txt
@@ -1,6 +1,3 @@
 add_subdirectory("Common")
 
-set(INCLUDE_PATH
-	"${AVSCommon_INCLUDE_DIRS}")
-
-discover_unit_tests("${INCLUDE_PATH}" "AVSCommon;UtilsCommonTestLib;SDKInterfacesTests")
+discover_unit_tests("" "AVSCommon;UtilsCommonTestLib;SDKInterfacesTests")
diff --git a/AVSCommon/Utils/test/Common/Common.cpp b/AVSCommon/Utils/test/Common/Common.cpp
index 91c6360a78..e1471bd049 100644
--- a/AVSCommon/Utils/test/Common/Common.cpp
+++ b/AVSCommon/Utils/test/Common/Common.cpp
@@ -37,9 +37,9 @@ std::string createRandomAlphabetString(int stringSize) {
     std::vector<uint16_t> vec(stringSize);
     std::independent_bits_engine<std::default_random_engine, CHAR_BIT, uint16_t> engine;
     std::random_device rd;
-    engine.seed(
+    engine.seed(static_cast<uint16_t>(
         rd() + std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now().time_since_epoch())
-                   .count());
+                   .count()));
     std::generate(begin(vec), end(vec), std::ref(engine));
 
     std::vector<uint8_t> vec8(stringSize);
diff --git a/AVSCommon/Utils/test/Common/TestableMessageObserver.cpp b/AVSCommon/Utils/test/Common/TestableMessageObserver.cpp
index 6764d208e2..fe774cc44e 100644
--- a/AVSCommon/Utils/test/Common/TestableMessageObserver.cpp
+++ b/AVSCommon/Utils/test/Common/TestableMessageObserver.cpp
@@ -24,7 +24,7 @@ namespace utils {
 using namespace avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("TestableMessageObserver");
+#define TAG "TestableMessageObserver"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/test/Common/Timing/StopTaskTimer.cpp b/AVSCommon/Utils/test/Common/Timing/StopTaskTimer.cpp
index b96a3289cf..32bd2d8fcb 100644
--- a/AVSCommon/Utils/test/Common/Timing/StopTaskTimer.cpp
+++ b/AVSCommon/Utils/test/Common/Timing/StopTaskTimer.cpp
@@ -28,7 +28,7 @@ using namespace avsCommon::sdkInterfaces::timing;
 using namespace avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("StopTaskTimer");
+#define TAG "StopTaskTimer"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -80,7 +80,7 @@ void StopTaskTimer::stop() {
     if (isActive()) {
         // Wait until any current executing tasked has finished.
         // The objective is to force the task to run from the beginning.
-        std::lock_guard<std::mutex> lock(m_taskMutex);
+        std::lock_guard<std::mutex> taskLock(m_taskMutex);
         m_task();
         m_delegate->stop();
     }
diff --git a/AVSCommon/Utils/test/ExecutorTest.cpp b/AVSCommon/Utils/test/ExecutorTest.cpp
index abd87894bf..68a0dc97e1 100644
--- a/AVSCommon/Utils/test/ExecutorTest.cpp
+++ b/AVSCommon/Utils/test/ExecutorTest.cpp
@@ -13,8 +13,13 @@
  * permissions and limitations under the License.
  */
 
-#include <list>
+#include <chrono>
+#include <condition_variable>
 #include <gtest/gtest.h>
+#include <list>
+#include <mutex>
+#include <system_error>
+#include <thread>
 
 #include "ExecutorTestUtils.h"
 #include "AVSCommon/Utils/Threading/Executor.h"
@@ -26,6 +31,9 @@ namespace utils {
 namespace threading {
 namespace test {
 
+/// Maximum timeout for blocking wait when expecting a signal.
+static const std::chrono::seconds EXECUTOR_SIGNAL_WAIT_TIMEOUT{30};
+
 class ExecutorTest : public ::testing::Test {
 public:
     Executor executor;
@@ -34,24 +42,28 @@ class ExecutorTest : public ::testing::Test {
 TEST_F(ExecutorTest, testTimer_submitStdFunctionAndVerifyExecution) {
     std::function<void()> function = []() {};
     auto future = executor.submit(function);
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
 }
 
 TEST_F(ExecutorTest, testTimer_submitStdBindAndVerifyExecution) {
     auto future = executor.submit(std::bind(exampleFunctionParams, 0));
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
 }
 
 TEST_F(ExecutorTest, testTimer_submitLambdaAndVerifyExecution) {
     auto future = executor.submit([]() {});
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
 }
 
 TEST_F(ExecutorTest, testTimer_submitFunctionPointerAndVerifyExecution) {
     auto future = executor.submit(&exampleFunction);
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
 }
@@ -59,6 +71,7 @@ TEST_F(ExecutorTest, testTimer_submitFunctionPointerAndVerifyExecution) {
 TEST_F(ExecutorTest, testTimer_submitFunctorAndVerifyExecution) {
     ExampleFunctor exampleFunctor;
     auto future = executor.submit(exampleFunctor);
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
 }
@@ -66,6 +79,7 @@ TEST_F(ExecutorTest, testTimer_submitFunctorAndVerifyExecution) {
 TEST_F(ExecutorTest, testTimer_submitFunctionWithPrimitiveReturnTypeNoArgsAndVerifyExecution) {
     int value = VALUE;
     auto future = executor.submit([=]() { return value; });
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
     ASSERT_EQ(future.get(), value);
@@ -74,6 +88,7 @@ TEST_F(ExecutorTest, testTimer_submitFunctionWithPrimitiveReturnTypeNoArgsAndVer
 TEST_F(ExecutorTest, testTimer_submitFunctionWithObjectReturnTypeNoArgsAndVerifyExecution) {
     SimpleObject value(VALUE);
     auto future = executor.submit([=]() { return value; });
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
     ASSERT_EQ(future.get().getValue(), value.getValue());
@@ -82,6 +97,7 @@ TEST_F(ExecutorTest, testTimer_submitFunctionWithObjectReturnTypeNoArgsAndVerify
 TEST_F(ExecutorTest, testTimer_submitFunctionWithNoReturnTypePrimitiveArgsAndVerifyExecution) {
     int value = VALUE;
     auto future = executor.submit([](int number) {}, value);
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
 }
@@ -89,6 +105,7 @@ TEST_F(ExecutorTest, testTimer_submitFunctionWithNoReturnTypePrimitiveArgsAndVer
 TEST_F(ExecutorTest, testTimer_submitFunctionWithNoReturnTypeObjectArgsAndVerifyExecution) {
     SimpleObject arg(0);
     auto future = executor.submit([](SimpleObject object) {}, arg);
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
 }
@@ -97,6 +114,7 @@ TEST_F(ExecutorTest, testTimer_submitFunctionWithPrimitiveReturnTypeObjectArgsAn
     int value = VALUE;
     SimpleObject arg(0);
     auto future = executor.submit([=](SimpleObject object) { return value; }, arg);
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
     ASSERT_EQ(future.get(), value);
@@ -106,6 +124,7 @@ TEST_F(ExecutorTest, testTimer_submitFunctionWithObjectReturnTypePrimitiveArgsAn
     int arg = 0;
     SimpleObject value(VALUE);
     auto future = executor.submit([=](int primitive) { return value; }, arg);
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
     ASSERT_EQ(future.get().getValue(), value.getValue());
@@ -115,6 +134,7 @@ TEST_F(ExecutorTest, testTimer_submitFunctionWithPrimitiveReturnTypePrimitiveArg
     int arg = 0;
     int value = VALUE;
     auto future = executor.submit([=](int number) { return value; }, arg);
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
     ASSERT_EQ(future.get(), value);
@@ -124,6 +144,7 @@ TEST_F(ExecutorTest, testTimer_submitFunctionWithObjectReturnTypeObjectArgsAndVe
     SimpleObject value(VALUE);
     SimpleObject arg(0);
     auto future = executor.submit([=](SimpleObject object) { return value; }, arg);
+    ASSERT_TRUE(future.valid());
     auto future_status = future.wait_for(SHORT_TIMEOUT_MS);
     ASSERT_EQ(future_status, std::future_status::ready);
     ASSERT_EQ(future.get().getValue(), value.getValue());
@@ -223,15 +244,14 @@ TEST_F(ExecutorTest, testTimer_futureWaitsForTaskCleanup) {
     SlowDestructor slowDestructor;
 
     // Submit a lambda to execute which captures a parameter by value that is slow to destruct.
-    executor
-        .submit([slowDestructor, &cleanedUp] {
-            // Update the captured copy of slowDestructor so that it will delay destruction and update the cleanedUp
-            // flag.
-            slowDestructor.cleanedUp = &cleanedUp;
-        }
-                // wait for the promise to be fulfilled.
-                )
-        .wait();
+    auto future = executor.submit([slowDestructor, &cleanedUp] {
+        // Update the captured copy of slowDestructor so that it will delay destruction and update the cleanedUp
+        // flag.
+        slowDestructor.cleanedUp = &cleanedUp;
+    });
+    ASSERT_TRUE(future.valid());
+    // wait for the promise to be fulfilled.
+    ASSERT_EQ(std::future_status::ready, future.wait_for(SHORT_TIMEOUT_MS * 2));
 
     ASSERT_TRUE(cleanedUp);
 }
@@ -264,7 +284,7 @@ TEST_F(ExecutorTest, testTimer_shutdown) {
     EXPECT_TRUE(executor.isShutdown());
 
     // verify that the task has now completed
-    EXPECT_TRUE(done.valid());
+    ASSERT_TRUE(done.valid());
     done.get();
 
     // try to submit a new task and verify that it is rejected
@@ -294,7 +314,10 @@ TEST_F(ExecutorTest, testTimer_shutdownCancelJob) {
     auto jobToWaitDrop = [&jobToDropResult, &waitSetUp, &waitJobStart] {
         waitJobStart.wakeUp();
         waitSetUp.wait(SHORT_TIMEOUT_MS);
-        jobToDropResult.wait_for(SHORT_TIMEOUT_MS);
+        // prevent unit test crash if jobToDropResult is not valid. It is checked below.
+        if (jobToDropResult.valid()) {
+            jobToDropResult.wait_for(SHORT_TIMEOUT_MS);
+        }
     };
 
     // 1st job waits for setup to be done then wait for the second job to be cancelled.
@@ -302,6 +325,7 @@ TEST_F(ExecutorTest, testTimer_shutdownCancelJob) {
 
     // 2nd job that should never run. When cancelled, its return will become available.
     jobToDropResult = executor.submit(jobToDrop);
+    ASSERT_TRUE(jobToDropResult.valid());
 
     // Wake up first job and wait for it to start running.
     const std::chrono::seconds DEFAULT_TIMEOUT{5};
@@ -322,9 +346,9 @@ TEST_F(ExecutorTest, test_forwardPromise) {
         src.set_value(42);
 
         auto future = src.get_future();
-        auto dst = std::make_shared<std::promise<int>>();
-        forwardPromise(dst, &future);
-        EXPECT_EQ(dst->get_future().get(), 42);
+        std::promise<int> dst;
+        forwardPromise(dst, future);
+        EXPECT_EQ(dst.get_future().get(), 42);
     }
     // Should forward the void value
     {
@@ -332,9 +356,9 @@ TEST_F(ExecutorTest, test_forwardPromise) {
         src.set_value();
 
         auto future = src.get_future();
-        auto dst = std::make_shared<std::promise<void>>();
-        forwardPromise(dst, &future);
-        EXPECT_NO_THROW(dst->get_future().get());
+        std::promise<void> dst;
+        forwardPromise(dst, future);
+        EXPECT_NO_THROW(dst.get_future().get());
     }
     // Should forward the exception
     {
@@ -342,9 +366,9 @@ TEST_F(ExecutorTest, test_forwardPromise) {
         src.set_exception(std::make_exception_ptr(std::exception()));
 
         auto future = src.get_future();
-        auto dst = std::make_shared<std::promise<int>>();
-        forwardPromise(dst, &future);
-        EXPECT_THROW(dst->get_future().get(), std::exception);
+        std::promise<int> dst;
+        forwardPromise(dst, future);
+        EXPECT_THROW(dst.get_future().get(), std::exception);
     }
     // Should forward the exception
     {
@@ -352,15 +376,16 @@ TEST_F(ExecutorTest, test_forwardPromise) {
         src.set_exception(std::make_exception_ptr(std::exception()));
 
         auto future = src.get_future();
-        auto dst = std::make_shared<std::promise<void>>();
-        forwardPromise(dst, &future);
-        EXPECT_THROW(dst->get_future().get(), std::exception);
+        std::promise<void> dst;
+        forwardPromise(dst, future);
+        EXPECT_THROW(dst.get_future().get(), std::exception);
     }
 }
 
 TEST_F(ExecutorTest, test_taskException) {
     {
         auto future = executor.submit([] { throw std::exception(); });
+        ASSERT_TRUE(future.valid());
         EXPECT_THROW(future.get(), std::exception);
     }
     {
@@ -370,10 +395,133 @@ TEST_F(ExecutorTest, test_taskException) {
                 return param;
             },
             42);
+        ASSERT_TRUE(future.valid());
         EXPECT_THROW(future.get(), std::runtime_error);
     }
 }
 
+/// Verify that empty function is not accepted by executor using movable function.
+TEST_F(ExecutorTest, test_executeEmptyMove) {
+    std::function<void()> fn;
+    ASSERT_FALSE(executor.execute(std::move(fn)));
+}
+
+/// Verify that empty function is not accepted by executor using const reference function.
+TEST_F(ExecutorTest, test_executeEmptyRef) {
+    const std::function<void()> fn;
+    ASSERT_FALSE(executor.execute(fn));
+}
+
+/// Verify that after task execution, the lambda is released if movable function is used.
+TEST_F(ExecutorTest, test_executeLambdaMove) {
+    std::mutex mutex;
+    std::condition_variable cond;
+    volatile bool executed = false;
+    volatile bool canExecute = false;
+    volatile bool started = false;
+    std::error_condition error;
+
+    auto shared = std::make_shared<std::string>();
+    auto weak = std::weak_ptr<std::string>(shared);
+    auto lambda = [&, shared] {
+        std::unique_lock<std::mutex> lock{mutex};
+        started = true;
+        cond.notify_all();
+        if (cond.wait_for(lock, EXECUTOR_SIGNAL_WAIT_TIMEOUT, [&] { return canExecute; })) {
+            executed = true;
+        } else {
+            error = std::errc::timed_out;
+        }
+        (void)&shared;
+    };
+
+    // Release strong reference and verify weak one is still valid (hold by lambda).
+    shared.reset();
+    ASSERT_FALSE(shared);
+    ASSERT_TRUE(weak.lock());
+
+    // Initiate execution but block executor thread in lambda.
+    ASSERT_TRUE(executor.execute(std::move(lambda)));
+    // Ensure lambda execution has started and blocked. If there is a bug in lambda, the executed flag may be set only
+    // if we give enough time for new thread start.
+    {
+        std::unique_lock<std::mutex> lock{mutex};
+        ASSERT_TRUE(cond.wait_for(lock, EXECUTOR_SIGNAL_WAIT_TIMEOUT, [&] { return started; }));
+    }
+    ASSERT_FALSE(executed);
+
+    // Check the reference is still valid.
+    ASSERT_TRUE(weak.lock());
+
+    // Allow lambda to complete
+    {
+        std::unique_lock<std::mutex> lock{mutex};
+        canExecute = true;
+    }
+    cond.notify_all();
+    executor.waitForSubmittedTasks();
+
+    // Verify the task is completed and shared object is released.
+    ASSERT_TRUE(executed);
+    ASSERT_FALSE(weak.lock());
+    ASSERT_FALSE(error);
+}
+
+/// Verify that after task execution, the lambda is not released if movable function is not used.
+TEST_F(ExecutorTest, test_executeLambdaRef) {
+    std::mutex mutex;
+    std::condition_variable cond;
+    volatile bool executed = false;
+    volatile bool canExecute = false;
+    volatile bool started = false;
+    std::error_condition error;
+
+    auto shared = std::make_shared<std::string>();
+    auto weak = std::weak_ptr<std::string>(shared);
+    const auto lambda = [&, shared] {
+        std::unique_lock<std::mutex> lock{mutex};
+        started = true;
+        cond.notify_all();
+        if (cond.wait_for(lock, EXECUTOR_SIGNAL_WAIT_TIMEOUT, [&] { return canExecute; })) {
+            executed = true;
+        } else {
+            error = std::errc::timed_out;
+        }
+        (void)&shared;
+    };
+
+    // Release strong reference and verify weak one is still valid (hold by lambda).
+    shared.reset();
+    ASSERT_FALSE(shared);
+    ASSERT_TRUE(weak.lock());
+
+    // Initiate execution but block executor thread in lambda.
+    ASSERT_TRUE(executor.execute(lambda));
+    // Ensure lambda execution has started and blocked. If there is a bug in lambda, the executed flag may be set only
+    // if we give enough time for new thread start.
+    {
+        std::unique_lock<std::mutex> lock{mutex};
+        ASSERT_TRUE(cond.wait_for(lock, EXECUTOR_SIGNAL_WAIT_TIMEOUT, [&] { return started; }));
+    }
+    ASSERT_FALSE(executed);
+
+    // Check the reference is still valid.
+    ASSERT_TRUE(weak.lock());
+
+    // Allow lambda to complete
+    {
+        std::unique_lock<std::mutex> lock{mutex};
+        canExecute = true;
+    }
+    cond.notify_all();
+    executor.waitForSubmittedTasks();
+
+    // Verify task is completed and we still have shared object through lambda
+    ASSERT_TRUE(executed);
+    ASSERT_TRUE(weak.lock());
+    ASSERT_FALSE(error);
+}
+
 }  // namespace test
 }  // namespace threading
 }  // namespace utils
diff --git a/AVSCommon/Utils/test/FileSystemUtilsTest.cpp b/AVSCommon/Utils/test/FileSystemUtilsTest.cpp
index 1a91f61335..b9c18dcf4a 100644
--- a/AVSCommon/Utils/test/FileSystemUtilsTest.cpp
+++ b/AVSCommon/Utils/test/FileSystemUtilsTest.cpp
@@ -41,7 +41,7 @@ class FileSystemUtilsTest : public ::testing::Test {
         createDirectory(WORKING_DIR);
         ASSERT_TRUE(exists(WORKING_DIR));
 
-#if defined(__linux__) or defined(__APPLE__)
+#if defined(__linux__) || defined(__APPLE__)
         // on some OS, the temp path is symbolically linked, which can cause issues for prefix tests
         // to accommodate this, get the realpath of the temp directory
         char resolved_path[PATH_MAX + 1];
diff --git a/AVSCommon/Utils/test/GmockExtensionTest.cpp b/AVSCommon/Utils/test/GmockExtensionTest.cpp
new file mode 100644
index 0000000000..2064840f20
--- /dev/null
+++ b/AVSCommon/Utils/test/GmockExtensionTest.cpp
@@ -0,0 +1,221 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/Test/GmockExtensions.h>
+
+namespace alexaClientSDK {
+namespace test {
+
+using namespace ::testing;
+
+/**
+ * @brief Interface with noexcept and const noexcept methods.
+ */
+class SomeInterface {
+public:
+    virtual ~SomeInterface() noexcept = default;
+    virtual int noexceptMethod0() noexcept = 0;
+    virtual int noexceptMethod1(int) noexcept = 0;
+    virtual int noexceptMethod2(int, int) noexcept = 0;
+    virtual int noexceptMethod3(int, int, int) noexcept = 0;
+    virtual int noexceptMethod4(int, int, int, int) noexcept = 0;
+    virtual int noexceptMethod5(int, int, int, int, int) noexcept = 0;
+    virtual int noexceptMethod6(int, int, int, int, int, int) noexcept = 0;
+    virtual int noexceptMethod7(int, int, int, int, int, int, int) noexcept = 0;
+    virtual int noexceptMethod8(int, int, int, int, int, int, int, int) noexcept = 0;
+    virtual int noexceptMethod9(int, int, int, int, int, int, int, int, int) noexcept = 0;
+    virtual int noexceptMethod10(int, int, int, int, int, int, int, int, int, int) noexcept = 0;
+    virtual int constNoexceptMethod0() const noexcept = 0;
+    virtual int constNoexceptMethod1(int) const noexcept = 0;
+    virtual int constNoexceptMethod2(int, int) const noexcept = 0;
+    virtual int constNoexceptMethod3(int, int, int) const noexcept = 0;
+    virtual int constNoexceptMethod4(int, int, int, int) const noexcept = 0;
+    virtual int constNoexceptMethod5(int, int, int, int, int) const noexcept = 0;
+    virtual int constNoexceptMethod6(int, int, int, int, int, int) const noexcept = 0;
+    virtual int constNoexceptMethod7(int, int, int, int, int, int, int) const noexcept = 0;
+    virtual int constNoexceptMethod8(int, int, int, int, int, int, int, int) const noexcept = 0;
+    virtual int constNoexceptMethod9(int, int, int, int, int, int, int, int, int) const noexcept = 0;
+    virtual int constNoexceptMethod10(int, int, int, int, int, int, int, int, int, int) const noexcept = 0;
+};
+
+/**
+ * @brief Mock for @c SomeInterface.
+ */
+class SomeMock : public SomeInterface {
+public:
+    MOCK_NOEXCEPT_METHOD0(noexceptMethod0, int());
+    MOCK_NOEXCEPT_METHOD1(noexceptMethod1, int(int));
+    MOCK_NOEXCEPT_METHOD2(noexceptMethod2, int(int, int));
+    MOCK_NOEXCEPT_METHOD3(noexceptMethod3, int(int, int, int));
+    MOCK_NOEXCEPT_METHOD4(noexceptMethod4, int(int, int, int, int));
+    MOCK_NOEXCEPT_METHOD5(noexceptMethod5, int(int, int, int, int, int));
+    MOCK_NOEXCEPT_METHOD6(noexceptMethod6, int(int, int, int, int, int, int));
+    MOCK_NOEXCEPT_METHOD7(noexceptMethod7, int(int, int, int, int, int, int, int));
+    MOCK_NOEXCEPT_METHOD8(noexceptMethod8, int(int, int, int, int, int, int, int, int));
+    MOCK_NOEXCEPT_METHOD9(noexceptMethod9, int(int, int, int, int, int, int, int, int, int));
+    MOCK_NOEXCEPT_METHOD10(noexceptMethod10, int(int, int, int, int, int, int, int, int, int, int));
+
+    MOCK_CONST_NOEXCEPT_METHOD0(constNoexceptMethod0, int());
+    MOCK_CONST_NOEXCEPT_METHOD1(constNoexceptMethod1, int(int));
+    MOCK_CONST_NOEXCEPT_METHOD2(constNoexceptMethod2, int(int, int));
+    MOCK_CONST_NOEXCEPT_METHOD3(constNoexceptMethod3, int(int, int, int));
+    MOCK_CONST_NOEXCEPT_METHOD4(constNoexceptMethod4, int(int, int, int, int));
+    MOCK_CONST_NOEXCEPT_METHOD5(constNoexceptMethod5, int(int, int, int, int, int));
+    MOCK_CONST_NOEXCEPT_METHOD6(constNoexceptMethod6, int(int, int, int, int, int, int));
+    MOCK_CONST_NOEXCEPT_METHOD7(constNoexceptMethod7, int(int, int, int, int, int, int, int));
+    MOCK_CONST_NOEXCEPT_METHOD8(constNoexceptMethod8, int(int, int, int, int, int, int, int, int));
+    MOCK_CONST_NOEXCEPT_METHOD9(constNoexceptMethod9, int(int, int, int, int, int, int, int, int, int));
+    MOCK_CONST_NOEXCEPT_METHOD10(constNoexceptMethod10, int(int, int, int, int, int, int, int, int, int, int));
+};
+
+/**
+ * @brief Test fixture for testing GMock extensions.
+ */
+class GmockExtensionsTest : public ::testing::Test {};
+
+TEST_F(GmockExtensionsTest, test_noexceptMethod0) {
+    SomeMock mock;
+    EXPECT_CALL(mock, noexceptMethod0()).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.noexceptMethod0());
+};
+
+TEST_F(GmockExtensionsTest, test_noexceptMethod1) {
+    SomeMock mock;
+    EXPECT_CALL(mock, noexceptMethod1(1)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.noexceptMethod1(1));
+};
+
+TEST_F(GmockExtensionsTest, test_noexceptMethod2) {
+    SomeMock mock;
+    EXPECT_CALL(mock, noexceptMethod2(1, 2)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.noexceptMethod2(1, 2));
+};
+
+TEST_F(GmockExtensionsTest, test_noexceptMethod3) {
+    SomeMock mock;
+    EXPECT_CALL(mock, noexceptMethod3(1, 2, 3)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.noexceptMethod3(1, 2, 3));
+};
+
+TEST_F(GmockExtensionsTest, test_noexceptMethod4) {
+    SomeMock mock;
+    EXPECT_CALL(mock, noexceptMethod4(1, 2, 3, 4)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.noexceptMethod4(1, 2, 3, 4));
+};
+
+TEST_F(GmockExtensionsTest, test_noexceptMethod5) {
+    SomeMock mock;
+    EXPECT_CALL(mock, noexceptMethod5(1, 2, 3, 4, 5)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.noexceptMethod5(1, 2, 3, 4, 5));
+};
+
+TEST_F(GmockExtensionsTest, test_noexceptMethod6) {
+    SomeMock mock;
+    EXPECT_CALL(mock, noexceptMethod6(1, 2, 3, 4, 5, 6)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.noexceptMethod6(1, 2, 3, 4, 5, 6));
+};
+
+TEST_F(GmockExtensionsTest, test_noexceptMethod7) {
+    SomeMock mock;
+    EXPECT_CALL(mock, noexceptMethod7(1, 2, 3, 4, 5, 6, 7)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.noexceptMethod7(1, 2, 3, 4, 5, 6, 7));
+};
+
+TEST_F(GmockExtensionsTest, test_noexceptMethod8) {
+    SomeMock mock;
+    EXPECT_CALL(mock, noexceptMethod8(1, 2, 3, 4, 5, 6, 7, 8)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.noexceptMethod8(1, 2, 3, 4, 5, 6, 7, 8));
+};
+
+TEST_F(GmockExtensionsTest, test_noexceptMethod9) {
+    SomeMock mock;
+    EXPECT_CALL(mock, noexceptMethod9(1, 2, 3, 4, 5, 6, 7, 8, 9)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.noexceptMethod9(1, 2, 3, 4, 5, 6, 7, 8, 9));
+};
+
+TEST_F(GmockExtensionsTest, test_noexceptMethod10) {
+    SomeMock mock;
+    EXPECT_CALL(mock, noexceptMethod10(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.noexceptMethod10(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
+};
+
+TEST_F(GmockExtensionsTest, test_constNoexceptMethod0) {
+    SomeMock mock;
+    EXPECT_CALL(mock, constNoexceptMethod0()).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.constNoexceptMethod0());
+};
+
+TEST_F(GmockExtensionsTest, test_constNoexceptMethod1) {
+    SomeMock mock;
+    EXPECT_CALL(mock, constNoexceptMethod1(1)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.constNoexceptMethod1(1));
+};
+
+TEST_F(GmockExtensionsTest, test_constNoexceptMethod2) {
+    SomeMock mock;
+    EXPECT_CALL(mock, constNoexceptMethod2(1, 2)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.constNoexceptMethod2(1, 2));
+};
+
+TEST_F(GmockExtensionsTest, test_constNoexceptMethod3) {
+    SomeMock mock;
+    EXPECT_CALL(mock, noexceptMethod3(1, 2, 3)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.noexceptMethod3(1, 2, 3));
+};
+
+TEST_F(GmockExtensionsTest, test_constNoexceptMethod4) {
+    SomeMock mock;
+    EXPECT_CALL(mock, constNoexceptMethod4(1, 2, 3, 4)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.constNoexceptMethod4(1, 2, 3, 4));
+};
+
+TEST_F(GmockExtensionsTest, test_constNoexceptMethod5) {
+    SomeMock mock;
+    EXPECT_CALL(mock, constNoexceptMethod5(1, 2, 3, 4, 5)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.constNoexceptMethod5(1, 2, 3, 4, 5));
+};
+
+TEST_F(GmockExtensionsTest, test_constNoexceptMethod6) {
+    SomeMock mock;
+    EXPECT_CALL(mock, constNoexceptMethod6(1, 2, 3, 4, 5, 6)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.constNoexceptMethod6(1, 2, 3, 4, 5, 6));
+};
+
+TEST_F(GmockExtensionsTest, test_constNoexceptMethod7) {
+    SomeMock mock;
+    EXPECT_CALL(mock, constNoexceptMethod7(1, 2, 3, 4, 5, 6, 7)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.constNoexceptMethod7(1, 2, 3, 4, 5, 6, 7));
+};
+
+TEST_F(GmockExtensionsTest, test_constNoexceptMethod8) {
+    SomeMock mock;
+    EXPECT_CALL(mock, constNoexceptMethod8(1, 2, 3, 4, 5, 6, 7, 8)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.constNoexceptMethod8(1, 2, 3, 4, 5, 6, 7, 8));
+};
+
+TEST_F(GmockExtensionsTest, test_constNoexceptMethod9) {
+    SomeMock mock;
+    EXPECT_CALL(mock, constNoexceptMethod9(1, 2, 3, 4, 5, 6, 7, 8, 9)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.constNoexceptMethod9(1, 2, 3, 4, 5, 6, 7, 8, 9));
+};
+
+TEST_F(GmockExtensionsTest, test_constNoexceptMethod10) {
+    SomeMock mock;
+    EXPECT_CALL(mock, constNoexceptMethod10(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)).Times(1).WillOnce(Return(-5));
+    ASSERT_EQ(-5, mock.constNoexceptMethod10(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
+};
+
+}  // namespace test
+}  // namespace alexaClientSDK
diff --git a/AVSCommon/Utils/test/JSONUtilTest.cpp b/AVSCommon/Utils/test/JSONUtilTest.cpp
index 562a527218..3e6268bbd7 100644
--- a/AVSCommon/Utils/test/JSONUtilTest.cpp
+++ b/AVSCommon/Utils/test/JSONUtilTest.cpp
@@ -293,7 +293,7 @@ TEST_F(JSONUtilTest, test_parseJSONInvalidJSON) {
  */
 TEST_F(JSONUtilTest, test_convertToStringValueWithString) {
     rapidjson::Value expected;
-    expected.SetString(STRING_VALUE.c_str(), STRING_VALUE.length());
+    expected.SetString(STRING_VALUE.c_str(), static_cast<rapidjson::SizeType>(STRING_VALUE.length()));
     std::string actual;
     ASSERT_TRUE(convertToValue(expected, &actual));
     ASSERT_EQ(expected.GetString(), actual);
@@ -326,7 +326,7 @@ TEST_F(JSONUtilTest, test_convertToStringValueWithInvalidValue) {
  */
 TEST_F(JSONUtilTest, test_convertToStringValueWithNullOutputParam) {
     rapidjson::Value node;
-    node.SetString(STRING_VALUE.c_str(), STRING_VALUE.length());
+    node.SetString(STRING_VALUE.c_str(), static_cast<rapidjson::SizeType>(STRING_VALUE.length()));
     std::string* value = nullptr;
     ASSERT_FALSE(convertToValue(node, value));
 }
diff --git a/AVSCommon/Utils/test/LibCurlHTTP2ConnectionTest.cpp b/AVSCommon/Utils/test/LibCurlHTTP2ConnectionTest.cpp
new file mode 100644
index 0000000000..bbf237d84f
--- /dev/null
+++ b/AVSCommon/Utils/test/LibCurlHTTP2ConnectionTest.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+#include "AVSCommon/Utils/LibcurlUtils/LibcurlHTTP2Connection.h"
+#include "AVSCommon/Utils/LibcurlUtils/LibcurlHTTP2Request.h"
+
+namespace alexaClientSDK {
+namespace avsCommon {
+namespace utils {
+namespace libcurlUtils {
+using namespace ::testing;
+
+/**
+ * Derived test class for LibCurlHTTP2Connection that is a friend class to the google test class
+ */
+class LibCurlHTTP2Connection_Test : public LibcurlHTTP2Connection {
+public:
+    LibCurlHTTP2Connection_Test() = default;
+    friend class GTEST_TEST_CLASS_NAME_(LibCurlHTTP2ConnectionTest, releaseStream_delete_ok);
+};
+/**
+ * Test fixture class for LibCurlHTTP2Connection
+ */
+
+class LibCurlHTTP2ConnectionTest : public ::testing::Test {
+protected:
+    void SetUp() override;
+    /// The LibCurlHTTP2Connection to test.
+    std::shared_ptr<LibCurlHTTP2Connection_Test> m_libCurlHTTP2Connection;
+};
+
+void LibCurlHTTP2ConnectionTest::SetUp() {
+    m_libCurlHTTP2Connection = std::make_shared<LibCurlHTTP2Connection_Test>();
+}
+
+TEST_F(LibCurlHTTP2ConnectionTest, releaseStream_delete_ok) {
+    // Setting IsStopping bool to true because we do not want network loop to process this request
+    m_libCurlHTTP2Connection->setIsStopping();
+    m_libCurlHTTP2Connection->createMultiHandle();
+    http2::HTTP2RequestConfig config{http2::HTTP2RequestType::GET, "www.foo.com", "xyz"};
+    config.setConnectionTimeout(std::chrono::seconds(60));
+    config.setIntermittentTransferExpected();
+    auto req = std::make_shared<LibcurlHTTP2Request>(config, nullptr, config.getId());
+    auto handle = req->getCurlHandle();
+    m_libCurlHTTP2Connection->m_activeStreams[handle] = req;
+    ASSERT_TRUE(m_libCurlHTTP2Connection->m_activeStreams.size());
+    LibCurlHTTP2Connection_Test::ActiveStreamMap::iterator iter = m_libCurlHTTP2Connection->m_activeStreams.begin();
+    m_libCurlHTTP2Connection->releaseStream(iter);
+    ASSERT_FALSE(m_libCurlHTTP2Connection->m_activeStreams.size());
+}
+
+}  // namespace libcurlUtils
+}  // namespace utils
+}  // namespace avsCommon
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/AVSCommon/Utils/test/LoggerTest.cpp b/AVSCommon/Utils/test/LoggerTest.cpp
index f2442027b0..6460ad9b52 100644
--- a/AVSCommon/Utils/test/LoggerTest.cpp
+++ b/AVSCommon/Utils/test/LoggerTest.cpp
@@ -191,7 +191,7 @@ void MockLogger::mockEmit(
     m_lastText = text;
 }
 
-MockModuleLogger::MockModuleLogger() : ModuleLogger(ACSDK_STRINGIFY(ACSDK_LOG_SINK)) {
+MockModuleLogger::MockModuleLogger() : ModuleLogger("ConsoleLogger") {
 }
 
 MockModuleLogger::~MockModuleLogger() {
@@ -231,7 +231,7 @@ void LoggerTest::TearDown() {
 }
 
 void LoggerTest::setLevelExpectations(Level level) {
-    ACSDK_GET_LOGGER_FUNCTION()->setLevel(level);
+    getLoggerTestLogger()->setLevel(level);
 
     switch (level) {
         case Level::UNKNOWN:
@@ -469,16 +469,19 @@ TEST_F(LoggerTest, test_logNoneLevel) {
 
 /**
  * Test observer mechanism in the MockModuleLogger.  Expects that when the logLevel changes for the sink, the
- * callback of the MockModuleLogger is triggered.  Also make sure any changes to sink's logLevel is ignored
- * after the MockModuleLogger's logLevel has been set.
+ * callback of the MockModuleLogger is triggered.  Also make sure any changes to MockModuleLogger's logLevel will
+ * override set log level of the MockModuleLogger and the MockModuleLogger will ignore further changes to the logLevel
+ * to the sink.
  */
 TEST_F(LoggerTest, test_moduleLoggerObserver) {
     MockModuleLogger mockModuleLogger;
-    getLoggerTestLogger()->setLevel(Level::WARN);
+    getLoggerTestLogger()->setLevel(Level::ERROR);
+    ASSERT_EQ(mockModuleLogger.getLogLevel(), Level::ERROR);
+    mockModuleLogger.setLevel(Level::WARN);
     ASSERT_EQ(mockModuleLogger.getLogLevel(), Level::WARN);
-    mockModuleLogger.setLevel(Level::CRITICAL);
-    ASSERT_EQ(mockModuleLogger.getLogLevel(), Level::CRITICAL);
     getLoggerTestLogger()->setLevel(Level::NONE);
+    ASSERT_EQ(mockModuleLogger.getLogLevel(), Level::WARN);
+    mockModuleLogger.setLevel(Level::NONE);
     ASSERT_EQ(mockModuleLogger.getLogLevel(), Level::NONE);
 }
 
@@ -490,20 +493,20 @@ TEST_F(LoggerTest, test_multipleModuleLoggerObservers) {
     MockModuleLogger mockModuleLogger2;
     MockModuleLogger mockModuleLogger3;
 
-    getLoggerTestLogger()->setLevel(Level::WARN);
-    ASSERT_EQ(mockModuleLogger1.getLogLevel(), Level::WARN);
-    ASSERT_EQ(mockModuleLogger2.getLogLevel(), Level::WARN);
-    ASSERT_EQ(mockModuleLogger3.getLogLevel(), Level::WARN);
+    getLoggerTestLogger()->setLevel(Level::NONE);
+    ASSERT_EQ(mockModuleLogger1.getLogLevel(), Level::NONE);
+    ASSERT_EQ(mockModuleLogger2.getLogLevel(), Level::NONE);
+    ASSERT_EQ(mockModuleLogger3.getLogLevel(), Level::NONE);
 
     mockModuleLogger1.setLevel(Level::CRITICAL);
     ASSERT_EQ(mockModuleLogger1.getLogLevel(), Level::CRITICAL);
-    ASSERT_EQ(mockModuleLogger2.getLogLevel(), Level::WARN);
-    ASSERT_EQ(mockModuleLogger3.getLogLevel(), Level::WARN);
-
-    getLoggerTestLogger()->setLevel(Level::NONE);
-    ASSERT_EQ(mockModuleLogger1.getLogLevel(), Level::NONE);
     ASSERT_EQ(mockModuleLogger2.getLogLevel(), Level::NONE);
     ASSERT_EQ(mockModuleLogger3.getLogLevel(), Level::NONE);
+
+    getLoggerTestLogger()->setLevel(Level::WARN);
+    ASSERT_EQ(mockModuleLogger1.getLogLevel(), Level::CRITICAL);
+    ASSERT_EQ(mockModuleLogger2.getLogLevel(), Level::WARN);
+    ASSERT_EQ(mockModuleLogger3.getLogLevel(), Level::WARN);
 }
 
 #ifdef ACSDK_LOG_ENABLED
diff --git a/AVSCommon/Utils/test/MIMEParserTest.cpp b/AVSCommon/Utils/test/MIMEParserTest.cpp
index 6a61f14af6..a60cddca4f 100644
--- a/AVSCommon/Utils/test/MIMEParserTest.cpp
+++ b/AVSCommon/Utils/test/MIMEParserTest.cpp
@@ -315,7 +315,7 @@ void runTestForCombination(std::vector<int>& partition, const std::string& paylo
 void generateCombinationsAndRunTest(
     std::vector<int>& partitions,
     size_t pos,
-    size_t remaining,
+    int remaining,
     const std::string& words,
     const std::string& boundary) {
     if (remaining == 0) {
@@ -351,7 +351,7 @@ TEST_F(MIMEParserTest, test_multipleCombinations) {
     for (size_t numberOfPartitions = 1; numberOfPartitions <= maxNumberOfPartitions;
          numberOfPartitions += numberOfPartitionsIncrement) {
         std::vector<int> partitions(numberOfPartitions);
-        generateCombinationsAndRunTest(partitions, 0, payload.size(), payload, "WWWoooAAA");
+        generateCombinationsAndRunTest(partitions, 0, static_cast<int>(payload.size()), payload, "WWWoooAAA");
     }
 }
 
@@ -379,12 +379,12 @@ TEST_F(MIMEParserTest, test_fixedSizeGroups) {
         decoder.onReceiveResponseCode(HTTPResponseCode::SUCCESS_OK);
 
         std::vector<std::string> groups;
-        int nGroups = (parts.size() + groupSize - 1) / groupSize;
-        for (int i = 0; i < nGroups; i++) {
+        size_t nGroups = (parts.size() + groupSize - 1) / groupSize;
+        for (size_t i = 0; i < nGroups; i++) {
             groups.push_back("");
         }
 
-        int currentGroup = 0;
+        size_t currentGroup = 0;
         for (size_t i = 0; i < parts.size(); ++i) {
             if (i != 0 && i % groupSize == 0) {
                 currentGroup++;
@@ -480,7 +480,7 @@ TEST_F(MIMEParserTest, test_decodingRandomBoundaries) {
     const std::string CHARACTERS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'()+_,-.:=?";
     std::random_device random_device;
     std::mt19937 generator(random_device());
-    std::uniform_int_distribution<> distribution(0, CHARACTERS.size() - 1);
+    std::uniform_int_distribution<> distribution(0, static_cast<int>(CHARACTERS.size() - 1));
 
     for (size_t length = 5; length < 50; length++) {
         std::string quotedRandomBoundary = QUOTE_CHAR;
@@ -523,9 +523,9 @@ TEST_F(MIMEParserTest, test_decodingInvalidBoundaries) {
         "thisstringhasmorethanseventycharacterssoitsinvalid123123123123123123123",
         "^invalidchar",
         "\"^invalidchar\""};
-    for (auto boundary : invalid_boundaries) {
+    for (auto testBoundary : invalid_boundaries) {
         for (auto header : headerAfterBoundary) {
-            const std::string boundaryHeader{BOUNDARY_HEADER_PREFIX + boundary + header};
+            const std::string boundaryHeader{BOUNDARY_HEADER_PREFIX + testBoundary + header};
             auto sink = std::make_shared<MockHTTP2MimeResponseDecodeSink>();
             HTTP2MimeResponseDecoder decoder{sink};
             ASSERT_FALSE(decoder.onReceiveHeaderLine(boundaryHeader));
@@ -538,9 +538,10 @@ TEST_F(MIMEParserTest, test_decodingInvalidBoundaries) {
  * Expected Result: pass
  */
 TEST_F(MIMEParserTest, test_decodingBoundaryAfteraNonBoundaryHeader) {
-    std::string boundary = "myboundary";
-    const std::vector<std::string> headers = {"content-type:nana;myprop:abc\r\n", BOUNDARY_HEADER_PREFIX + boundary};
-    generatePayloadAndTest(headers, boundary);
+    std::string testBoundary = "myboundary";
+    const std::vector<std::string> headers = {"content-type:nana;myprop:abc\r\n",
+                                              BOUNDARY_HEADER_PREFIX + testBoundary};
+    generatePayloadAndTest(headers, testBoundary);
 }
 
 /*
@@ -549,10 +550,10 @@ TEST_F(MIMEParserTest, test_decodingBoundaryAfteraNonBoundaryHeader) {
  */
 TEST_F(MIMEParserTest, test_decodingValidBoundariesWithMoreHeaders) {
     std::vector<std::string> headerAfterBoundary = {"", ";otherprop=yes", " somethingelse"};
-    std::string boundary = "myboundary";
+    std::string testBoundary = "myboundary";
     for (auto header : headerAfterBoundary) {
-        const std::string boundaryHeader{boundary + header};
-        generatePayloadAndTest(boundaryHeader, boundary);
+        const std::string boundaryHeader{testBoundary + header};
+        generatePayloadAndTest(boundaryHeader, testBoundary);
     }
 }
 
@@ -970,8 +971,8 @@ TEST_F(MIMEParserTest, test_aBORT) {
     sink->m_abort = true;
 
     // setup encoder
-    std::string boundary = createRandomAlphabetString(10);
-    HTTP2MimeRequestEncoder encoder{boundary, source};
+    std::string testBoundary = createRandomAlphabetString(10);
+    HTTP2MimeRequestEncoder encoder{testBoundary, source};
     char buf[LARGE];
     // Ensure repeated calls return ABORT
     ASSERT_TRUE(encoder.onSendData(buf, SMALL).status == HTTP2SendStatus::ABORT);
@@ -1041,8 +1042,8 @@ TEST_F(MIMEParserTest, test_variableChunkSizes) {
     char buf[XLARGE];
 
     // setup encoder
-    std::string boundary = createRandomAlphabetString(10);
-    HTTP2MimeRequestEncoder encoder{boundary, source};
+    std::string testBoundary = createRandomAlphabetString(10);
+    HTTP2MimeRequestEncoder encoder{testBoundary, source};
 
     // setup decoder
     HTTP2MimeResponseDecoder decoder{sink};
@@ -1075,7 +1076,7 @@ TEST_F(MIMEParserTest, test_variableChunkSizes) {
     index = 0;
     pauseCount = 0;
     HTTP2ReceiveDataStatus status{HTTP2ReceiveDataStatus::SUCCESS};
-    const std::string boundaryHeader{BOUNDARY_HEADER_PREFIX + boundary};
+    const std::string boundaryHeader{BOUNDARY_HEADER_PREFIX + testBoundary};
     bool resp = decoder.onReceiveHeaderLine(boundaryHeader);
     decoder.onReceiveResponseCode(
         static_cast<std::underlying_type<HTTPResponseCode>::type>(HTTPResponseCode::SUCCESS_OK));
diff --git a/AVSCommon/Utils/test/PooledMediaPlayerFactoryTest.cpp b/AVSCommon/Utils/test/PooledMediaPlayerFactoryTest.cpp
index e699e0aca8..2405c9b004 100644
--- a/AVSCommon/Utils/test/PooledMediaPlayerFactoryTest.cpp
+++ b/AVSCommon/Utils/test/PooledMediaPlayerFactoryTest.cpp
@@ -29,7 +29,7 @@ using namespace avsCommon::utils::mediaPlayer;
 using namespace avsCommon::utils::mediaPlayer::test;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PooledMediaPlayerFactoryTest");
+#define TAG "PooledMediaPlayerFactoryTest"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/AVSCommon/Utils/test/SafeTimeAccessTest.cpp b/AVSCommon/Utils/test/SafeTimeAccessTest.cpp
index c6519f0122..f3dc70055b 100644
--- a/AVSCommon/Utils/test/SafeTimeAccessTest.cpp
+++ b/AVSCommon/Utils/test/SafeTimeAccessTest.cpp
@@ -142,7 +142,7 @@ static void callSafeCTimeFunction(
     auto safeCTimeAccess = SafeCTimeAccess::instance();
     std::vector<std::pair<time_t, std::tm>> internalResults;
     for (int i = 0; i < 4; ++i) {
-        for (time_t t = startingSeed; t < LARGE_TIME_VALUE; t = 1.5 * (t + 1)) {
+        for (time_t t = startingSeed; t < LARGE_TIME_VALUE; t = static_cast<time_t>(1.5 * (t + 1))) {
             std::tm result;
             switch (type) {
                 case TestType::GMTIME:
diff --git a/AVSCommon/Utils/test/SharedDataStreamTest.cpp b/AVSCommon/Utils/test/SharedDataStreamTest.cpp
index 791098fcff..cf89d8f6b5 100644
--- a/AVSCommon/Utils/test/SharedDataStreamTest.cpp
+++ b/AVSCommon/Utils/test/SharedDataStreamTest.cpp
@@ -220,7 +220,7 @@ std::future<size_t> Source::run(
             for (size_t word = 0; word < blockSizeWords; ++word) {
                 for (size_t byte = 0; byte < wordSize; ++byte) {
                     size_t byteIndex = word * wordSize + byte;
-                    uint8_t byteValue = m_counter >> (byte % wordSize);
+                    uint8_t byteValue = static_cast<uint8_t>(m_counter >> (byte % wordSize));
                     block[byteIndex] = byteValue;
                 }
                 ++m_counter;
@@ -314,7 +314,7 @@ std::future<size_t> Sink::run(
             for (ssize_t word = 0; word < nWords; ++word) {
                 for (size_t byte = 0; byte < wordSize; ++byte) {
                     size_t byteIndex = word * wordSize + byte;
-                    uint8_t byteValue = m_counter >> (byte % wordSize);
+                    uint8_t byteValue = static_cast<uint8_t>(m_counter >> (byte % wordSize));
                     ASSERT_EQ(block[byteIndex], byteValue);
                 }
                 ++m_counter;
@@ -714,7 +714,7 @@ TEST_F(SharedDataStreamTest, test_readerSeek) {
     Sds::Index writerPos = 0;
     uint8_t writeBuf[WORDSIZE * WORDCOUNT];
     for (size_t i = 0; i < sizeof(writeBuf); ++i) {
-        writeBuf[i] = i;
+        writeBuf[i] = static_cast<uint8_t>(i);
     }
     size_t writeWords = WORDCOUNT / 2;
     ASSERT_EQ(writer->write(writeBuf, writeWords), static_cast<ssize_t>(writeWords));
diff --git a/AVSCommon/Utils/test/TaskThreadTest.cpp b/AVSCommon/Utils/test/TaskThreadTest.cpp
index d87c3973b3..6a277e1074 100644
--- a/AVSCommon/Utils/test/TaskThreadTest.cpp
+++ b/AVSCommon/Utils/test/TaskThreadTest.cpp
@@ -27,6 +27,10 @@ namespace test {
 
 /// Timeout used while waiting for synchronization events.
 const std::chrono::milliseconds MY_WAIT_TIMEOUT{100};
+/// Default thread moniker to use in tests.
+const auto THREAD_MONIKER = "1a1";
+/// Another thread moniker to use in tests.
+const auto THREAD_MONIKER2 = "1a2";
 
 using namespace logger;
 
@@ -39,7 +43,7 @@ TEST(TaskThreadTest, test_waitForNothing) {
 TEST(TaskThreadTest, test_startFailsDueToEmptyFunction) {
     TaskThread taskThread;
     std::function<bool()> emptyFunction;
-    EXPECT_FALSE(taskThread.start(emptyFunction));
+    EXPECT_FALSE(taskThread.start(emptyFunction, THREAD_MONIKER));
 }
 
 /// Test that start will trigger the provided job and thread will exit once the job is done and return @c false.
@@ -54,7 +58,7 @@ TEST(TaskThreadTest, test_simpleJob) {
 
     {
         TaskThread taskThread;
-        EXPECT_TRUE(taskThread.start(simpleJob));
+        EXPECT_TRUE(taskThread.start(simpleJob, THREAD_MONIKER));
         EXPECT_TRUE(waitEvent.wait(MY_WAIT_TIMEOUT));
     }
 
@@ -78,7 +82,7 @@ TEST(TaskThreadTest, test_sequenceJobs) {
 
     {
         TaskThread taskThread;
-        EXPECT_TRUE(taskThread.start(jobSequence));
+        EXPECT_TRUE(taskThread.start(jobSequence, THREAD_MONIKER));
         EXPECT_TRUE(waitEvent.wait(MY_WAIT_TIMEOUT));
     }
 
@@ -108,10 +112,10 @@ TEST(TaskThreadTest, test_startNewJob) {
     };
 
     TaskThread taskThread;
-    EXPECT_TRUE(taskThread.start(increment));
+    EXPECT_TRUE(taskThread.start(increment, THREAD_MONIKER));
 
     EXPECT_TRUE(waitEvent.wait(MY_WAIT_TIMEOUT));
-    EXPECT_TRUE(taskThread.start(decrement));
+    EXPECT_TRUE(taskThread.start(decrement, THREAD_MONIKER));
     EXPECT_TRUE(waitEvent2.wait(MY_WAIT_TIMEOUT));
     EXPECT_TRUE(taskCounter == 0);
 }
@@ -126,11 +130,11 @@ TEST(TaskThreadTest, testTimer_startFailDueTooManyThreads) {
     };
 
     TaskThread taskThread;
-    EXPECT_TRUE(taskThread.start(simpleJob));
+    EXPECT_TRUE(taskThread.start(simpleJob, THREAD_MONIKER));
 
     // Wait until first job has started.
-    waitStart.wait(MY_WAIT_TIMEOUT);
-    EXPECT_TRUE(taskThread.start([] { return false; }));
+    EXPECT_TRUE(waitStart.wait(MY_WAIT_TIMEOUT));
+    EXPECT_TRUE(taskThread.start([] { return false; }, THREAD_MONIKER));
 
     // Starting a thread again immediately should fail, unless the system is so fast in starting
     // the thread on the other core that it starts and runs a few instructions before this can
@@ -138,7 +142,7 @@ TEST(TaskThreadTest, testTimer_startFailDueTooManyThreads) {
     int threadStartCount;
     for (threadStartCount = 0; threadStartCount < 100; threadStartCount++) {
         // This should fail since the task thread is starting.
-        if (!taskThread.start([] { return false; })) {
+        if (!taskThread.start([] { return false; }, THREAD_MONIKER)) {
             break;
         }
     }
@@ -147,7 +151,7 @@ TEST(TaskThreadTest, testTimer_startFailDueTooManyThreads) {
     waitEnqueue.wakeUp();
 }
 
-/// Test that threads related to this task thread will always have the same moniker.
+/// Test that threads related to this task thread will always have specified moniker.
 TEST(TaskThreadTest, DISABLED_test_moniker) {
     WaitEvent waitGetMoniker, waitValidateMoniker;
     std::string moniker;
@@ -157,18 +161,22 @@ TEST(TaskThreadTest, DISABLED_test_moniker) {
         return false;
     };
 
-    auto validateMoniker = [&moniker, &waitValidateMoniker] {
-        EXPECT_EQ(moniker, ThreadMoniker::getThisThreadMoniker());
+    std::string moniker2;
+    auto validateMoniker = [&moniker2, &waitValidateMoniker] {
+        moniker2 = ThreadMoniker::getThisThreadMoniker();
         waitValidateMoniker.wakeUp();
         return false;
     };
 
     TaskThread taskThread;
-    EXPECT_TRUE(taskThread.start(getMoniker));
-    waitGetMoniker.wait(MY_WAIT_TIMEOUT);
+    EXPECT_TRUE(taskThread.start(getMoniker, THREAD_MONIKER));
+    EXPECT_TRUE(waitGetMoniker.wait(MY_WAIT_TIMEOUT));
 
-    EXPECT_TRUE(taskThread.start(validateMoniker));
-    waitValidateMoniker.wait(MY_WAIT_TIMEOUT);
+    EXPECT_TRUE(taskThread.start(validateMoniker, THREAD_MONIKER2));
+    EXPECT_TRUE(waitValidateMoniker.wait(MY_WAIT_TIMEOUT));
+
+    EXPECT_EQ(THREAD_MONIKER, moniker);
+    EXPECT_EQ(THREAD_MONIKER2, moniker2);
 }
 
 /// Test that threads from different @c TaskThreads will have different monikers.
@@ -183,19 +191,23 @@ TEST(TaskThreadTest, test_monikerDifferentObjects) {
         return false;
     };
 
-    auto validateMoniker = [&moniker, &waitValidateMoniker] {
-        EXPECT_NE(moniker, ThreadMoniker::getThisThreadMoniker());
+    std::string moniker2;
+    auto validateMoniker = [&moniker2, &waitValidateMoniker] {
+        moniker2 = ThreadMoniker::getThisThreadMoniker();
         waitValidateMoniker.wakeUp();
         return false;
     };
 
     TaskThread taskThread1;
     TaskThread taskThread2;
-    EXPECT_TRUE(taskThread1.start(getMoniker));
-    EXPECT_TRUE(taskThread2.start(validateMoniker));
+    EXPECT_TRUE(taskThread1.start(getMoniker, THREAD_MONIKER));
+    EXPECT_TRUE(taskThread2.start(validateMoniker, THREAD_MONIKER2));
     waitThread2Start.wakeUp();
-    waitGetMoniker.wait(MY_WAIT_TIMEOUT);
-    waitValidateMoniker.wait(MY_WAIT_TIMEOUT);
+    EXPECT_TRUE(waitGetMoniker.wait(MY_WAIT_TIMEOUT));
+    EXPECT_TRUE(waitValidateMoniker.wait(MY_WAIT_TIMEOUT));
+
+    EXPECT_EQ(THREAD_MONIKER, moniker);
+    EXPECT_EQ(THREAD_MONIKER2, moniker2);
 }
 
 }  // namespace test
diff --git a/AVSCommon/Utils/test/TimeUtilsTest.cpp b/AVSCommon/Utils/test/TimeUtilsTest.cpp
index b05456dcc5..066b2d5831 100644
--- a/AVSCommon/Utils/test/TimeUtilsTest.cpp
+++ b/AVSCommon/Utils/test/TimeUtilsTest.cpp
@@ -60,6 +60,32 @@ TEST(TimeTest, test_iso8601StringConversion) {
     ASSERT_EQ(static_cast<int64_t>(sec.count()), unixTime);
 }
 
+TEST(TimeTest, test_iso8601StringConversionUTC) {
+    TimeUtils timeUtils;
+    std::string iso8601Str{"1986-08-10T21:30:00Z"};
+    int64_t unixTime;
+    auto successUnix = timeUtils.convert8601TimeStringToUnix(iso8601Str, &unixTime);
+    ASSERT_TRUE(successUnix);
+
+    std::chrono::system_clock::time_point utcTimePoint;
+    auto successUtcTimePoint = timeUtils.convert8601TimeStringToUtcTimePoint(iso8601Str, &utcTimePoint);
+    ASSERT_TRUE(successUtcTimePoint);
+
+    time_t dateTimeT = std::chrono::system_clock::to_time_t(utcTimePoint);
+    auto sec = std::chrono::duration_cast<std::chrono::seconds>(utcTimePoint.time_since_epoch());
+    ASSERT_EQ(static_cast<int64_t>(sec.count()), unixTime);
+
+    std::tm dateTm;
+    auto safeCTimeAccess = SafeCTimeAccess::instance();
+    ASSERT_TRUE(safeCTimeAccess->getGmtime(dateTimeT, &dateTm));
+    ASSERT_EQ(dateTm.tm_year, 86);
+    ASSERT_EQ(dateTm.tm_mon, 7);
+    ASSERT_EQ(dateTm.tm_mday, 10);
+    ASSERT_EQ(dateTm.tm_hour, 21);
+    ASSERT_EQ(dateTm.tm_min, 30);
+    ASSERT_EQ(dateTm.tm_sec, 0);
+}
+
 TEST(TimeTest, test_stringConversionError) {
     TimeUtils timeUtils;
     std::string dateStr{"1986-8-10T21:30:00+0000"};
diff --git a/AVSCommon/Utils/test/TimerTest.cpp b/AVSCommon/Utils/test/TimerTest.cpp
index 09e30d926f..0bf9966db7 100644
--- a/AVSCommon/Utils/test/TimerTest.cpp
+++ b/AVSCommon/Utils/test/TimerTest.cpp
@@ -18,7 +18,7 @@
 #include <deque>
 #include <gtest/gtest.h>
 
-#include "AVSCommon/Utils/Timing/Timer.h"
+#include <AVSCommon/Utils/Timing/Timer.h>
 
 namespace alexaClientSDK {
 namespace avsCommon {
@@ -111,7 +111,7 @@ class TimerTest : public ::testing::Test {
 };
 
 void TimerTest::SetUp() {
-    m_timer = std::shared_ptr<Timer>(new Timer);
+    m_timer = std::make_shared<Timer>();
 }
 
 void TimerTest::simpleTask(std::chrono::milliseconds duration) {
diff --git a/AVSCommon/Utils/test/UUIDGenerationTest.cpp b/AVSCommon/Utils/test/UUIDGenerationTest.cpp
index 9d7371d7be..e22e26cb45 100644
--- a/AVSCommon/Utils/test/UUIDGenerationTest.cpp
+++ b/AVSCommon/Utils/test/UUIDGenerationTest.cpp
@@ -157,7 +157,7 @@ TEST_F(UUIDGenerationTest, test_multipleConcurrentSaltSettings) {
     }
 
     for (auto& future : uuidRequesters) {
-        unsigned int prevSizeOfSet = uuidsGenerated.size();
+        auto prevSizeOfSet = uuidsGenerated.size();
         auto uuid = future.get();
         uuidsGenerated.insert(uuid);
         ASSERT_EQ(UUID_LENGTH, uuid.length());
@@ -186,7 +186,7 @@ TEST_F(UUIDGenerationTest, test_multipleRequests) {
     std::unordered_set<std::string> uuidsGenerated;
 
     for (unsigned int i = 0; i < MAX_UUIDS_TO_GENERATE; ++i) {
-        unsigned int prevSizeOfSet = uuidsGenerated.size();
+        auto prevSizeOfSet = uuidsGenerated.size();
         auto uuid = generateUUID();
         uuidsGenerated.insert(uuid);
         ASSERT_EQ(UUID_LENGTH, uuid.length());
@@ -211,7 +211,7 @@ TEST_F(UUIDGenerationTest, test_multipleConcurrentRequests) {
     }
 
     for (auto& future : uuidRequesters) {
-        unsigned int prevSizeOfSet = uuidsGenerated.size();
+        auto prevSizeOfSet = uuidsGenerated.size();
         auto uuid = future.get();
         uuidsGenerated.insert(uuid);
         ASSERT_EQ(UUID_LENGTH, uuid.length());
diff --git a/AVSCommon/Utils/test/WorkerThreadTest.cpp b/AVSCommon/Utils/test/WorkerThreadTest.cpp
index b7d595b0c5..0d6dd6a1a3 100644
--- a/AVSCommon/Utils/test/WorkerThreadTest.cpp
+++ b/AVSCommon/Utils/test/WorkerThreadTest.cpp
@@ -35,7 +35,6 @@ TEST(TaskThreadTest, test_runWorkSeveralTimes) {
     std::atomic_int count{0};
     WaitEvent waitEvent;
     WorkerThread workerThread;
-    EXPECT_TRUE(!workerThread.getMoniker().empty());
 
     for (int i = 1; i <= 10; i++) {
         waitEvent.reset();
diff --git a/AVSCommon/Utils/test/acsdk/Test/GmockExtensions.h b/AVSCommon/Utils/test/acsdk/Test/GmockExtensions.h
new file mode 100644
index 0000000000..652eb80cd0
--- /dev/null
+++ b/AVSCommon/Utils/test/acsdk/Test/GmockExtensions.h
@@ -0,0 +1,361 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_TEST_ACSDK_TEST_GMOCKEXTENSIONS_H_
+#define ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_TEST_ACSDK_TEST_GMOCKEXTENSIONS_H_
+
+#include <gmock/gmock.h>
+
+/**
+ * @brief Internal macro for constructing method name.
+ *
+ * Macro constructs method name in a manner similar to GMOCK_MOCKER_.
+ *
+ * @param arity     Parameter count.
+ * @param constness Optional @a const specifier.
+ * @param Method    Method name.
+ *
+ * @return Method name.
+ */
+#define GMOCK_NOEXCEPT_MOCKER_(arity, constness, Method) \
+    GTEST_CONCAT_TOKEN_(gmock##constness##noexcept##arity##_##Method##_, __LINE__)
+
+/**
+ * @{
+ * @brief Internal macro for declaring and defining mock method.
+ *
+ * Macro declares and defines mock method with @a noexcept specifier. Otherwise it works similarly to macros
+ * GMOCK_METHOD0_ ... GMOCK_METHOD10_.
+ *
+ * @param tn        Number of arguments.
+ * @param constness Optional @a const specifier.
+ * @param Method    Method name.
+ */
+#define GMOCK_NOEXCEPT_METHOD0_(tn, constness, ct, Method, ...)                                                \
+    GMOCK_RESULT_(tn, __VA_ARGS__) ct Method() constness noexcept {                                            \
+        GTEST_COMPILE_ASSERT_(                                                                                 \
+            (::testing::tuple_size<tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == 0), \
+            this_method_does_not_take_0_arguments);                                                            \
+        GMOCK_NOEXCEPT_MOCKER_(0, constness, Method).SetOwnerAndName(this, #Method);                           \
+        return GMOCK_NOEXCEPT_MOCKER_(0, constness, Method).Invoke();                                          \
+    }                                                                                                          \
+    ::testing::MockSpec<__VA_ARGS__>& gmock_##Method() constness noexcept {                                    \
+        GMOCK_NOEXCEPT_MOCKER_(0, constness, Method).RegisterOwner(this);                                      \
+        return GMOCK_NOEXCEPT_MOCKER_(0, constness, Method).With();                                            \
+    }                                                                                                          \
+    mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_NOEXCEPT_MOCKER_(0, constness, Method)
+
+#define GMOCK_NOEXCEPT_METHOD1_(tn, constness, ct, Method, ...)                                                        \
+    GMOCK_RESULT_(tn, __VA_ARGS__) ct Method(GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1) constness noexcept {             \
+        GTEST_COMPILE_ASSERT_(                                                                                         \
+            (::testing::tuple_size<tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == 1),         \
+            this_method_does_not_take_1_argument);                                                                     \
+        GMOCK_NOEXCEPT_MOCKER_(1, constness, Method).SetOwnerAndName(this, #Method);                                   \
+        return GMOCK_NOEXCEPT_MOCKER_(1, constness, Method).Invoke(gmock_a1);                                          \
+    }                                                                                                                  \
+    ::testing::MockSpec<__VA_ARGS__>& gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1) constness noexcept { \
+        GMOCK_NOEXCEPT_MOCKER_(1, constness, Method).RegisterOwner(this);                                              \
+        return GMOCK_NOEXCEPT_MOCKER_(1, constness, Method).With(gmock_a1);                                            \
+    }                                                                                                                  \
+    mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_NOEXCEPT_MOCKER_(1, constness, Method)
+
+#define GMOCK_NOEXCEPT_METHOD2_(tn, constness, ct, Method, ...)                                                        \
+    GMOCK_RESULT_(tn, __VA_ARGS__)                                                                                     \
+    ct Method(GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2) constness noexcept {   \
+        GTEST_COMPILE_ASSERT_(                                                                                         \
+            (::testing::tuple_size<tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == 2),         \
+            this_method_does_not_take_2_arguments);                                                                    \
+        GMOCK_NOEXCEPT_MOCKER_(2, constness, Method).SetOwnerAndName(this, #Method);                                   \
+        return GMOCK_NOEXCEPT_MOCKER_(2, constness, Method).Invoke(gmock_a1, gmock_a2);                                \
+    }                                                                                                                  \
+    ::testing::MockSpec<__VA_ARGS__>& gmock_##Method(                                                                  \
+        GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2) constness noexcept { \
+        GMOCK_NOEXCEPT_MOCKER_(2, constness, Method).RegisterOwner(this);                                              \
+        return GMOCK_NOEXCEPT_MOCKER_(2, constness, Method).With(gmock_a1, gmock_a2);                                  \
+    }                                                                                                                  \
+    mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_NOEXCEPT_MOCKER_(2, constness, Method)
+
+#define GMOCK_NOEXCEPT_METHOD3_(tn, constness, ct, Method, ...)                                                \
+    GMOCK_RESULT_(tn, __VA_ARGS__)                                                                             \
+    ct Method(                                                                                                 \
+        GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1,                                                               \
+        GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2,                                                               \
+        GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3) constness noexcept {                                          \
+        GTEST_COMPILE_ASSERT_(                                                                                 \
+            (::testing::tuple_size<tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == 3), \
+            this_method_does_not_take_3_arguments);                                                            \
+        GMOCK_NOEXCEPT_MOCKER_(3, constness, Method).SetOwnerAndName(this, #Method);                           \
+        return GMOCK_NOEXCEPT_MOCKER_(3, constness, Method).Invoke(gmock_a1, gmock_a2, gmock_a3);              \
+    }                                                                                                          \
+    ::testing::MockSpec<__VA_ARGS__>& gmock_##Method(                                                          \
+        GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1,                                                           \
+        GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2,                                                           \
+        GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3) constness noexcept {                                      \
+        GMOCK_NOEXCEPT_MOCKER_(3, constness, Method).RegisterOwner(this);                                      \
+        return GMOCK_NOEXCEPT_MOCKER_(3, constness, Method).With(gmock_a1, gmock_a2, gmock_a3);                \
+    }                                                                                                          \
+    mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_NOEXCEPT_MOCKER_(3, constness, Method)
+
+#define GMOCK_NOEXCEPT_METHOD4_(tn, constness, ct, Method, ...)                                                \
+    GMOCK_RESULT_(tn, __VA_ARGS__)                                                                             \
+    ct Method(                                                                                                 \
+        GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1,                                                               \
+        GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2,                                                               \
+        GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3,                                                               \
+        GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4) constness noexcept {                                          \
+        GTEST_COMPILE_ASSERT_(                                                                                 \
+            (::testing::tuple_size<tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == 4), \
+            this_method_does_not_take_4_arguments);                                                            \
+        GMOCK_NOEXCEPT_MOCKER_(4, constness, Method).SetOwnerAndName(this, #Method);                           \
+        return GMOCK_NOEXCEPT_MOCKER_(4, constness, Method).Invoke(gmock_a1, gmock_a2, gmock_a3, gmock_a4);    \
+    }                                                                                                          \
+    ::testing::MockSpec<__VA_ARGS__>& gmock_##Method(                                                          \
+        GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1,                                                           \
+        GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2,                                                           \
+        GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3,                                                           \
+        GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4) constness noexcept {                                      \
+        GMOCK_NOEXCEPT_MOCKER_(4, constness, Method).RegisterOwner(this);                                      \
+        return GMOCK_NOEXCEPT_MOCKER_(4, constness, Method).With(gmock_a1, gmock_a2, gmock_a3, gmock_a4);      \
+    }                                                                                                          \
+    mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_NOEXCEPT_MOCKER_(4, constness, Method)
+
+#define GMOCK_NOEXCEPT_METHOD5_(tn, constness, ct, Method, ...)                                                       \
+    GMOCK_RESULT_(tn, __VA_ARGS__)                                                                                    \
+    ct Method(                                                                                                        \
+        GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1,                                                                      \
+        GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2,                                                                      \
+        GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3,                                                                      \
+        GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4,                                                                      \
+        GMOCK_ARG_(tn, 5, __VA_ARGS__) gmock_a5) constness noexcept {                                                 \
+        GTEST_COMPILE_ASSERT_(                                                                                        \
+            (::testing::tuple_size<tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == 5),        \
+            this_method_does_not_take_5_arguments);                                                                   \
+        GMOCK_NOEXCEPT_MOCKER_(5, constness, Method).SetOwnerAndName(this, #Method);                                  \
+        return GMOCK_NOEXCEPT_MOCKER_(5, constness, Method).Invoke(gmock_a1, gmock_a2, gmock_a3, gmock_a4, gmock_a5); \
+    }                                                                                                                 \
+    ::testing::MockSpec<__VA_ARGS__>& gmock_##Method(                                                                 \
+        GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1,                                                                  \
+        GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2,                                                                  \
+        GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3,                                                                  \
+        GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4,                                                                  \
+        GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5) constness noexcept {                                             \
+        GMOCK_NOEXCEPT_MOCKER_(5, constness, Method).RegisterOwner(this);                                             \
+        return GMOCK_NOEXCEPT_MOCKER_(5, constness, Method).With(gmock_a1, gmock_a2, gmock_a3, gmock_a4, gmock_a5);   \
+    }                                                                                                                 \
+    mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_NOEXCEPT_MOCKER_(5, constness, Method)
+
+#define GMOCK_NOEXCEPT_METHOD6_(tn, constness, ct, Method, ...)                                                \
+    GMOCK_RESULT_(tn, __VA_ARGS__)                                                                             \
+    ct Method(                                                                                                 \
+        GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1,                                                               \
+        GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2,                                                               \
+        GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3,                                                               \
+        GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4,                                                               \
+        GMOCK_ARG_(tn, 5, __VA_ARGS__) gmock_a5,                                                               \
+        GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6) constness noexcept {                                          \
+        GTEST_COMPILE_ASSERT_(                                                                                 \
+            (::testing::tuple_size<tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == 6), \
+            this_method_does_not_take_6_arguments);                                                            \
+        GMOCK_NOEXCEPT_MOCKER_(6, constness, Method).SetOwnerAndName(this, #Method);                           \
+        return GMOCK_NOEXCEPT_MOCKER_(6, constness, Method)                                                    \
+            .Invoke(gmock_a1, gmock_a2, gmock_a3, gmock_a4, gmock_a5, gmock_a6);                               \
+    }                                                                                                          \
+    ::testing::MockSpec<__VA_ARGS__>& gmock_##Method(                                                          \
+        GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1,                                                           \
+        GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2,                                                           \
+        GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3,                                                           \
+        GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4,                                                           \
+        GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5,                                                           \
+        GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6) constness noexcept {                                      \
+        GMOCK_NOEXCEPT_MOCKER_(6, constness, Method).RegisterOwner(this);                                      \
+        return GMOCK_NOEXCEPT_MOCKER_(6, constness, Method)                                                    \
+            .With(gmock_a1, gmock_a2, gmock_a3, gmock_a4, gmock_a5, gmock_a6);                                 \
+    }                                                                                                          \
+    mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_NOEXCEPT_MOCKER_(6, constness, Method)
+
+#define GMOCK_NOEXCEPT_METHOD7_(tn, constness, ct, Method, ...)                                                \
+    GMOCK_RESULT_(tn, __VA_ARGS__)                                                                             \
+    ct Method(                                                                                                 \
+        GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1,                                                               \
+        GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2,                                                               \
+        GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3,                                                               \
+        GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4,                                                               \
+        GMOCK_ARG_(tn, 5, __VA_ARGS__) gmock_a5,                                                               \
+        GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6,                                                               \
+        GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7) constness noexcept {                                          \
+        GTEST_COMPILE_ASSERT_(                                                                                 \
+            (::testing::tuple_size<tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == 7), \
+            this_method_does_not_take_7_arguments);                                                            \
+        GMOCK_NOEXCEPT_MOCKER_(7, constness, Method).SetOwnerAndName(this, #Method);                           \
+        return GMOCK_NOEXCEPT_MOCKER_(7, constness, Method)                                                    \
+            .Invoke(gmock_a1, gmock_a2, gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7);                     \
+    }                                                                                                          \
+    ::testing::MockSpec<__VA_ARGS__>& gmock_##Method(                                                          \
+        GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1,                                                           \
+        GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2,                                                           \
+        GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3,                                                           \
+        GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4,                                                           \
+        GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5,                                                           \
+        GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6,                                                           \
+        GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7) constness noexcept {                                      \
+        GMOCK_NOEXCEPT_MOCKER_(7, constness, Method).RegisterOwner(this);                                      \
+        return GMOCK_NOEXCEPT_MOCKER_(7, constness, Method)                                                    \
+            .With(gmock_a1, gmock_a2, gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7);                       \
+    }                                                                                                          \
+    mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_NOEXCEPT_MOCKER_(7, constness, Method)
+
+#define GMOCK_NOEXCEPT_METHOD8_(tn, constness, ct, Method, ...)                                                \
+    GMOCK_RESULT_(tn, __VA_ARGS__)                                                                             \
+    ct Method(                                                                                                 \
+        GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1,                                                               \
+        GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2,                                                               \
+        GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3,                                                               \
+        GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4,                                                               \
+        GMOCK_ARG_(tn, 5, __VA_ARGS__) gmock_a5,                                                               \
+        GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6,                                                               \
+        GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7,                                                               \
+        GMOCK_ARG_(tn, 8, __VA_ARGS__) gmock_a8) constness noexcept {                                          \
+        GTEST_COMPILE_ASSERT_(                                                                                 \
+            (::testing::tuple_size<tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == 8), \
+            this_method_does_not_take_8_arguments);                                                            \
+        GMOCK_NOEXCEPT_MOCKER_(8, constness, Method).SetOwnerAndName(this, #Method);                           \
+        return GMOCK_NOEXCEPT_MOCKER_(8, constness, Method)                                                    \
+            .Invoke(gmock_a1, gmock_a2, gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8);           \
+    }                                                                                                          \
+    ::testing::MockSpec<__VA_ARGS__>& gmock_##Method(                                                          \
+        GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1,                                                           \
+        GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2,                                                           \
+        GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3,                                                           \
+        GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4,                                                           \
+        GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5,                                                           \
+        GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6,                                                           \
+        GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7,                                                           \
+        GMOCK_MATCHER_(tn, 8, __VA_ARGS__) gmock_a8) constness noexcept {                                      \
+        GMOCK_NOEXCEPT_MOCKER_(8, constness, Method).RegisterOwner(this);                                      \
+        return GMOCK_NOEXCEPT_MOCKER_(8, constness, Method)                                                    \
+            .With(gmock_a1, gmock_a2, gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8);             \
+    }                                                                                                          \
+    mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_NOEXCEPT_MOCKER_(8, constness, Method)
+
+#define GMOCK_NOEXCEPT_METHOD9_(tn, constness, ct, Method, ...)                                                \
+    GMOCK_RESULT_(tn, __VA_ARGS__)                                                                             \
+    ct Method(                                                                                                 \
+        GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1,                                                               \
+        GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2,                                                               \
+        GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3,                                                               \
+        GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4,                                                               \
+        GMOCK_ARG_(tn, 5, __VA_ARGS__) gmock_a5,                                                               \
+        GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6,                                                               \
+        GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7,                                                               \
+        GMOCK_ARG_(tn, 8, __VA_ARGS__) gmock_a8,                                                               \
+        GMOCK_ARG_(tn, 9, __VA_ARGS__) gmock_a9) constness noexcept {                                          \
+        GTEST_COMPILE_ASSERT_(                                                                                 \
+            (::testing::tuple_size<tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == 9), \
+            this_method_does_not_take_9_arguments);                                                            \
+        GMOCK_NOEXCEPT_MOCKER_(9, constness, Method).SetOwnerAndName(this, #Method);                           \
+        return GMOCK_NOEXCEPT_MOCKER_(9, constness, Method)                                                    \
+            .Invoke(gmock_a1, gmock_a2, gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8, gmock_a9); \
+    }                                                                                                          \
+    ::testing::MockSpec<__VA_ARGS__>& gmock_##Method(                                                          \
+        GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1,                                                           \
+        GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2,                                                           \
+        GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3,                                                           \
+        GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4,                                                           \
+        GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5,                                                           \
+        GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6,                                                           \
+        GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7,                                                           \
+        GMOCK_MATCHER_(tn, 8, __VA_ARGS__) gmock_a8,                                                           \
+        GMOCK_MATCHER_(tn, 9, __VA_ARGS__) gmock_a9) constness noexcept {                                      \
+        GMOCK_NOEXCEPT_MOCKER_(9, constness, Method).RegisterOwner(this);                                      \
+        return GMOCK_NOEXCEPT_MOCKER_(9, constness, Method)                                                    \
+            .With(gmock_a1, gmock_a2, gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8, gmock_a9);   \
+    }                                                                                                          \
+    mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_NOEXCEPT_MOCKER_(9, constness, Method)
+
+#define GMOCK_NOEXCEPT_METHOD10_(tn, constness, ct, Method, ...)                                                      \
+    GMOCK_RESULT_(tn, __VA_ARGS__)                                                                                    \
+    ct Method(                                                                                                        \
+        GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1,                                                                      \
+        GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2,                                                                      \
+        GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3,                                                                      \
+        GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4,                                                                      \
+        GMOCK_ARG_(tn, 5, __VA_ARGS__) gmock_a5,                                                                      \
+        GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6,                                                                      \
+        GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7,                                                                      \
+        GMOCK_ARG_(tn, 8, __VA_ARGS__) gmock_a8,                                                                      \
+        GMOCK_ARG_(tn, 9, __VA_ARGS__) gmock_a9,                                                                      \
+        GMOCK_ARG_(tn, 10, __VA_ARGS__) gmock_a10) constness noexcept {                                               \
+        GTEST_COMPILE_ASSERT_(                                                                                        \
+            (::testing::tuple_size<tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == 10),       \
+            this_method_does_not_take_10_arguments);                                                                  \
+        GMOCK_NOEXCEPT_MOCKER_(10, constness, Method).SetOwnerAndName(this, #Method);                                 \
+        return GMOCK_NOEXCEPT_MOCKER_(10, constness, Method)                                                          \
+            .Invoke(                                                                                                  \
+                gmock_a1, gmock_a2, gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8, gmock_a9, gmock_a10); \
+    }                                                                                                                 \
+    ::testing::MockSpec<__VA_ARGS__>& gmock_##Method(                                                                 \
+        GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1,                                                                  \
+        GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2,                                                                  \
+        GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3,                                                                  \
+        GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4,                                                                  \
+        GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5,                                                                  \
+        GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6,                                                                  \
+        GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7,                                                                  \
+        GMOCK_MATCHER_(tn, 8, __VA_ARGS__) gmock_a8,                                                                  \
+        GMOCK_MATCHER_(tn, 9, __VA_ARGS__) gmock_a9,                                                                  \
+        GMOCK_MATCHER_(tn, 10, __VA_ARGS__) gmock_a10) constness noexcept {                                           \
+        GMOCK_NOEXCEPT_MOCKER_(10, constness, Method).RegisterOwner(this);                                            \
+        return GMOCK_NOEXCEPT_MOCKER_(10, constness, Method)                                                          \
+            .With(                                                                                                    \
+                gmock_a1, gmock_a2, gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8, gmock_a9, gmock_a10); \
+    }                                                                                                                 \
+    mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_NOEXCEPT_MOCKER_(10, constness, Method)
+/// @}
+
+/**
+ * @{
+ * @brief Macro to mock method with @a noexcept specifier.
+ */
+#define MOCK_NOEXCEPT_METHOD0(m, ...) GMOCK_NOEXCEPT_METHOD0_(, , , m, __VA_ARGS__)
+#define MOCK_NOEXCEPT_METHOD1(m, ...) GMOCK_NOEXCEPT_METHOD1_(, , , m, __VA_ARGS__)
+#define MOCK_NOEXCEPT_METHOD2(m, ...) GMOCK_NOEXCEPT_METHOD2_(, , , m, __VA_ARGS__)
+#define MOCK_NOEXCEPT_METHOD3(m, ...) GMOCK_NOEXCEPT_METHOD3_(, , , m, __VA_ARGS__)
+#define MOCK_NOEXCEPT_METHOD4(m, ...) GMOCK_NOEXCEPT_METHOD4_(, , , m, __VA_ARGS__)
+#define MOCK_NOEXCEPT_METHOD5(m, ...) GMOCK_NOEXCEPT_METHOD5_(, , , m, __VA_ARGS__)
+#define MOCK_NOEXCEPT_METHOD6(m, ...) GMOCK_NOEXCEPT_METHOD6_(, , , m, __VA_ARGS__)
+#define MOCK_NOEXCEPT_METHOD7(m, ...) GMOCK_NOEXCEPT_METHOD7_(, , , m, __VA_ARGS__)
+#define MOCK_NOEXCEPT_METHOD8(m, ...) GMOCK_NOEXCEPT_METHOD8_(, , , m, __VA_ARGS__)
+#define MOCK_NOEXCEPT_METHOD9(m, ...) GMOCK_NOEXCEPT_METHOD9_(, , , m, __VA_ARGS__)
+#define MOCK_NOEXCEPT_METHOD10(m, ...) GMOCK_NOEXCEPT_METHOD10_(, , , m, __VA_ARGS__)
+/// @}
+
+/**
+ * @{
+ * @brief Macro to mock method with @a const @a noexcept specifier.
+ */
+#define MOCK_CONST_NOEXCEPT_METHOD0(m, ...) GMOCK_NOEXCEPT_METHOD0_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_NOEXCEPT_METHOD1(m, ...) GMOCK_NOEXCEPT_METHOD1_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_NOEXCEPT_METHOD2(m, ...) GMOCK_NOEXCEPT_METHOD2_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_NOEXCEPT_METHOD3(m, ...) GMOCK_NOEXCEPT_METHOD3_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_NOEXCEPT_METHOD4(m, ...) GMOCK_NOEXCEPT_METHOD4_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_NOEXCEPT_METHOD5(m, ...) GMOCK_NOEXCEPT_METHOD5_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_NOEXCEPT_METHOD6(m, ...) GMOCK_NOEXCEPT_METHOD6_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_NOEXCEPT_METHOD7(m, ...) GMOCK_NOEXCEPT_METHOD7_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_NOEXCEPT_METHOD8(m, ...) GMOCK_NOEXCEPT_METHOD8_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_NOEXCEPT_METHOD9(m, ...) GMOCK_NOEXCEPT_METHOD9_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_NOEXCEPT_METHOD10(m, ...) GMOCK_NOEXCEPT_METHOD10_(, const, , m, __VA_ARGS__)
+/// @}
+
+#endif  // ALEXA_CLIENT_SDK_AVSCOMMON_UTILS_TEST_ACSDK_TEST_GMOCKEXTENSIONS_H_
diff --git a/AVSGatewayManager/include/AVSGatewayManager/AVSGatewayManager.h b/AVSGatewayManager/include/AVSGatewayManager/AVSGatewayManager.h
index 2c1a60e84d..f895d59676 100644
--- a/AVSGatewayManager/include/AVSGatewayManager/AVSGatewayManager.h
+++ b/AVSGatewayManager/include/AVSGatewayManager/AVSGatewayManager.h
@@ -57,6 +57,7 @@ class AVSGatewayManager
      * @param customerDataManager The @c CustomerDataManager object that will track the CustomerDataHandler.
      * @param configurationRoot The @c ConfigurationNode to get AVS gateway information from the config file.
      * @param providerRegistrar Object with which to register the new instance as a post connect operation provider.
+     * @param metricRecorder Optional @c MetricRecorderInterface object for sending metrics.
      * @return A new instance of the @c AVSGatewayManager.
      */
     static std::shared_ptr<avsCommon::sdkInterfaces::AVSGatewayManagerInterface> createAVSGatewayManagerInterface(
@@ -66,7 +67,8 @@ class AVSGatewayManager
         const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationRoot,
         const std::shared_ptr<
             acsdkPostConnectOperationProviderRegistrarInterfaces::PostConnectOperationProviderRegistrarInterface>&
-            providerRegistrar);
+            providerRegistrar,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder);
 
     /**
      * Creates an instance of the @c AVSGatewayManager.
@@ -76,13 +78,15 @@ class AVSGatewayManager
      * @param customerDataManager The @c CustomerDataManager object that will track the CustomerDataHandler.
      * @param configurationRoot The @c ConfigurationNode to get AVS gateway information from the config file.
      * @param authDelegate The @c AuthDelegateInterface to add AuthObservers to take action once Auth state changes
+     * @param metricRecorder Optional @c MetricRecorderInterface object for sending metrics.
      * @return A new instance of the @c AVSGatewayManager.
      */
     static std::shared_ptr<AVSGatewayManager> create(
         std::shared_ptr<storage::AVSGatewayManagerStorageInterface> avsGatewayManagerStorage,
         std::shared_ptr<registrationManager::CustomerDataManagerInterface> customerDataManager,
         const avsCommon::utils::configuration::ConfigurationNode& configurationRoot,
-        std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> authDelegate = nullptr);
+        std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> authDelegate = nullptr,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder = nullptr);
 
     /// @name AVSGatewayManagerInterface Functions
     /// @{
@@ -124,12 +128,14 @@ class AVSGatewayManager
      *
      * @param avsGatewayManagerStorage The @c AVSGatewayManagerInterface to store avs gateway information.
      * @param customerDataManager The @c CustomerDataManager object that will track the CustomerDataHandler.
+     * @param metricRecorder Optional @c MetricRecorderInterface object for sending metrics.
      * @param defaultGateway The default AVS Gateway URL to use.
      */
     AVSGatewayManager(
         std::shared_ptr<storage::AVSGatewayManagerStorageInterface> avsGatewayManagerStorage,
-        const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager,
-        const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate,
+        std::shared_ptr<registrationManager::CustomerDataManagerInterface> customerDataManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> authDelegate,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
         const std::string& defaultGateway);
 
     /**
@@ -153,6 +159,9 @@ class AVSGatewayManager
     /// The AVS Gateway Assigner.
     std::shared_ptr<avsCommon::sdkInterfaces::AVSGatewayAssignerInterface> m_avsGatewayAssigner;
 
+    /// Optional (may be nullptr) interface for recording metrics.
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
+
     /// The mutex to synchronize access to members.
     mutable std::mutex m_mutex;
 
diff --git a/AVSGatewayManager/include/AVSGatewayManager/PostConnectVerifyGatewaySender.h b/AVSGatewayManager/include/AVSGatewayManager/PostConnectVerifyGatewaySender.h
index ac59d93915..90fa98285a 100644
--- a/AVSGatewayManager/include/AVSGatewayManager/PostConnectVerifyGatewaySender.h
+++ b/AVSGatewayManager/include/AVSGatewayManager/PostConnectVerifyGatewaySender.h
@@ -22,6 +22,7 @@
 
 #include <AVSCommon/SDKInterfaces/PostConnectOperationInterface.h>
 #include <AVSCommon/AVS/WaitableMessageRequest.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
 #include <AVSCommon/Utils/WaitEvent.h>
 #include <AVSGatewayManager/GatewayVerifyState.h>
 
@@ -39,10 +40,17 @@ class PostConnectVerifyGatewaySender
      * Creates a new instance of @c PostConnectVerifyGatewaySender.
      *
      * @param gatewayVerifiedCallback The callback method that should be called on successful gateway verification.
+     * @param metricRecorder Optional (may be nullptr) reference to metric recorder.
      * @return a new instance of the @c PostConnectVerifyGatewaySender.
      */
     static std::shared_ptr<PostConnectVerifyGatewaySender> create(
-        std::function<void(const std::shared_ptr<PostConnectVerifyGatewaySender>&)> gatewayVerifiedCallback);
+        std::function<void(const std::shared_ptr<PostConnectVerifyGatewaySender>&)> gatewayVerifiedCallback,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder = nullptr);
+
+    /**
+     * Destructor for tracking lifecycle.
+     */
+    ~PostConnectVerifyGatewaySender();
 
     /// @name PostConnectOperationInterface Methods
     /// @{
@@ -76,9 +84,11 @@ class PostConnectVerifyGatewaySender
      * Constructor.
      *
      * @param gatewayVerifiedCallback The callback method that should be called on successful gateway verification.
+     * @param metricRecorder Optional (may be nullptr) reference to metric recorder.
      */
     explicit PostConnectVerifyGatewaySender(
-        std::function<void(const std::shared_ptr<PostConnectVerifyGatewaySender>&)> gatewayVerifiedCallback);
+        std::function<void(const std::shared_ptr<PostConnectVerifyGatewaySender>&)> gatewayVerifiedCallback,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder);
 
     /**
      * The VerifyGateway operation which sends the @c ApiGateway.VerifyGateway event.
@@ -103,6 +113,9 @@ class PostConnectVerifyGatewaySender
     /// The Callback function that will be called after successful response to @c VerifyGateway event.
     std::function<void(const std::shared_ptr<PostConnectVerifyGatewaySender>&)> m_gatewayVerifiedCallback;
 
+    /// Optional (may be nullptr) interface for metrics.
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
+
     /// Mutex to synchronize access to @c WaitableMessageRequest.
     std::mutex m_mutex;
 
diff --git a/AVSGatewayManager/src/AVSGatewayManager.cpp b/AVSGatewayManager/src/AVSGatewayManager.cpp
index 47ae25c535..441e58b4c2 100644
--- a/AVSGatewayManager/src/AVSGatewayManager.cpp
+++ b/AVSGatewayManager/src/AVSGatewayManager.cpp
@@ -28,7 +28,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::utils::configuration;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AVSGatewayManager");
+#define TAG "AVSGatewayManager"
 
 /**
  * Create a LogEntry using the file's TAG and the specified event string.
@@ -54,7 +54,8 @@ std::shared_ptr<avsCommon::sdkInterfaces::AVSGatewayManagerInterface> AVSGateway
         const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationRoot,
         const std::shared_ptr<
             acsdkPostConnectOperationProviderRegistrarInterfaces::PostConnectOperationProviderRegistrarInterface>&
-            providerRegistrar) {
+            providerRegistrar,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) {
     if (!configurationRoot) {
         ACSDK_ERROR(LX("createAVSGatewayManagerInterfaceFailed").d("reason", "nullConfigurationRoot"));
         return nullptr;
@@ -67,8 +68,12 @@ std::shared_ptr<avsCommon::sdkInterfaces::AVSGatewayManagerInterface> AVSGateway
         ACSDK_ERROR(LX("createAVSGatewayManagerInterfaceFailed").d("reason", "nullAuthDelegater"));
         return nullptr;
     }
-    auto gatewayManager =
-        create(std::move(avsGatewayManagerStorage), customerDataManager, *configurationRoot, authDelegate);
+    auto gatewayManager = create(
+        std::move(avsGatewayManagerStorage),
+        customerDataManager,
+        *configurationRoot,
+        authDelegate,
+        std::move(metricRecorder));
     if (!gatewayManager) {
         ACSDK_ERROR(LX("createAVSGatewayManagerInterfaceFailed").d("reason", "createFailed"));
         return nullptr;
@@ -84,7 +89,8 @@ std::shared_ptr<AVSGatewayManager> AVSGatewayManager::create(
     std::shared_ptr<storage::AVSGatewayManagerStorageInterface> avsGatewayManagerStorage,
     std::shared_ptr<registrationManager::CustomerDataManagerInterface> customerDataManager,
     const ConfigurationNode& configurationRoot,
-    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> authDelegate) {
+    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> authDelegate,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) {
     ACSDK_DEBUG5(LX(__func__));
     if (!avsGatewayManagerStorage) {
         ACSDK_ERROR(LX("createFailed").d("reason", "nullAvsGatewayManagerStorage"));
@@ -102,8 +108,12 @@ std::shared_ptr<AVSGatewayManager> AVSGatewayManager::create(
             avsGateway = DEFAULT_AVS_GATEWAY;
         }
 
-        auto avsGatewayManager = std::shared_ptr<AVSGatewayManager>(
-            new AVSGatewayManager(avsGatewayManagerStorage, customerDataManager, authDelegate, avsGateway));
+        auto avsGatewayManager = std::shared_ptr<AVSGatewayManager>(new AVSGatewayManager(
+            std::move(avsGatewayManagerStorage),
+            std::move(customerDataManager),
+            std::move(authDelegate),
+            std::move(metricRecorder),
+            avsGateway));
         if (avsGatewayManager->init()) {
             return avsGatewayManager;
         } else {
@@ -115,11 +125,13 @@ std::shared_ptr<AVSGatewayManager> AVSGatewayManager::create(
 
 AVSGatewayManager::AVSGatewayManager(
     std::shared_ptr<storage::AVSGatewayManagerStorageInterface> avsGatewayManagerStorage,
-    const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager,
-    const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate,
+    std::shared_ptr<registrationManager::CustomerDataManagerInterface> customerDataManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> authDelegate,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
     const std::string& defaultAVSGateway) :
         CustomerDataHandler{std::move(customerDataManager)},
         m_avsGatewayStorage{std::move(avsGatewayManagerStorage)},
+        m_metricRecorder{std::move(metricRecorder)},
         m_authDelegate{std::move(authDelegate)},
         m_currentState{defaultAVSGateway, false} {
 }
@@ -137,7 +149,7 @@ std::shared_ptr<PostConnectOperationInterface> AVSGatewayManager::createPostConn
     if (!m_currentState.isVerified) {
         auto callback = std::bind(&AVSGatewayManager::onGatewayVerified, this, std::placeholders::_1);
         std::shared_ptr<PostConnectVerifyGatewaySender> verifyGatewaySender =
-            PostConnectVerifyGatewaySender::create(callback);
+            PostConnectVerifyGatewaySender::create(callback, m_metricRecorder);
         m_currentVerifyGatewaySender = verifyGatewaySender;
 
         if (m_authDelegate) {
diff --git a/AVSGatewayManager/src/PostConnectVerifyGatewaySender.cpp b/AVSGatewayManager/src/PostConnectVerifyGatewaySender.cpp
index b481b9888a..44dae2190e 100644
--- a/AVSGatewayManager/src/PostConnectVerifyGatewaySender.cpp
+++ b/AVSGatewayManager/src/PostConnectVerifyGatewaySender.cpp
@@ -19,6 +19,8 @@
 
 #include <AVSCommon/AVS/EventBuilder.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Metrics/DataPointCounterBuilder.h>
+#include <AVSCommon/Utils/Metrics/MetricEventBuilder.h>
 #include <AVSCommon/Utils/RetryTimer.h>
 
 namespace alexaClientSDK {
@@ -26,9 +28,17 @@ namespace avsGatewayManager {
 
 using namespace avsCommon::avs;
 using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::metrics;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PostConnectVerifyGatewaySender");
+#define TAG "PostConnectVerifyGatewaySender"
+
+/// Activity name for post-connect metric.
+/// This name is dependent on TAG value.
+#define POST_CONNECT_ACTIVITY_NAME TAG "-sendVerifyGateway"
+
+/// Prefix for post-connect data point with status value.
+#define POST_CONNECT_STATUS_PREFIX "STATUS-"
 
 /**
  * Create a LogEntry using the file's TAG and the specified event string.
@@ -60,12 +70,13 @@ static avsCommon::utils::RetryTimer RETRY_TIMER{RETRY_TABLE};
 
 std::shared_ptr<PostConnectVerifyGatewaySender> PostConnectVerifyGatewaySender::create(
     std::function<void(const std::shared_ptr<PostConnectVerifyGatewaySender>& verifyGatewaySender)>
-        gatewayVerifiedCallback) {
+        gatewayVerifiedCallback,
+    std::shared_ptr<MetricRecorderInterface> metricRecorder) {
     if (!gatewayVerifiedCallback) {
         ACSDK_ERROR(LX("createFailed").d("reason", "invalid gatewayVerifiedCallback"));
     } else {
         return std::shared_ptr<PostConnectVerifyGatewaySender>(
-            new PostConnectVerifyGatewaySender(gatewayVerifiedCallback));
+            new PostConnectVerifyGatewaySender(gatewayVerifiedCallback, metricRecorder));
     }
 
     return nullptr;
@@ -73,9 +84,16 @@ std::shared_ptr<PostConnectVerifyGatewaySender> PostConnectVerifyGatewaySender::
 
 PostConnectVerifyGatewaySender::PostConnectVerifyGatewaySender(
     std::function<void(const std::shared_ptr<PostConnectVerifyGatewaySender>& verifyGatewaySender)>
-        gatewayVerifiedCallback) :
-        m_gatewayVerifiedCallback{gatewayVerifiedCallback},
+        gatewayVerifiedCallback,
+    std::shared_ptr<MetricRecorderInterface> metricRecorder) :
+        m_gatewayVerifiedCallback{std::move(gatewayVerifiedCallback)},
+        m_metricRecorder{std::move(metricRecorder)},
         m_isStopping{false} {
+    ACSDK_INFO(LX("init").p("this", this));
+}
+
+PostConnectVerifyGatewaySender::~PostConnectVerifyGatewaySender() {
+    ACSDK_INFO(LX("destroyed").p("this", this));
 }
 
 unsigned int PostConnectVerifyGatewaySender::getOperationPriority() {
@@ -83,7 +101,7 @@ unsigned int PostConnectVerifyGatewaySender::getOperationPriority() {
 }
 
 bool PostConnectVerifyGatewaySender::performOperation(const std::shared_ptr<MessageSenderInterface>& messageSender) {
-    ACSDK_DEBUG5(LX(__func__));
+    ACSDK_INFO(LX(__func__));
     if (!messageSender) {
         ACSDK_ERROR(LX("performOperationFailed").d("reason", "nullPostConnectSender"));
         return false;
@@ -126,7 +144,7 @@ void PostConnectVerifyGatewaySender::wakeOperation() {
 }
 
 void PostConnectVerifyGatewaySender::abortOperation() {
-    ACSDK_DEBUG5(LX(__func__));
+    ACSDK_INFO(LX(__func__));
     std::shared_ptr<WaitableMessageRequest> requestCopy;
     {
         std::lock_guard<std::mutex> lock{m_mutex};
@@ -157,6 +175,21 @@ PostConnectVerifyGatewaySender::VerifyGatewayReturnCode PostConnectVerifyGateway
     /// Wait for the response.
     auto status = m_postConnectRequest->waitForCompletion();
 
+#ifdef ACSDK_ENABLE_METRICS_RECORDING
+    if (m_metricRecorder) {
+        std::stringstream eventNameBuilder;
+        eventNameBuilder << POST_CONNECT_STATUS_PREFIX << status;
+        auto metricEvent =
+            MetricEventBuilder{}
+                .setActivityName(POST_CONNECT_ACTIVITY_NAME)
+                .addDataPoint(DataPointCounterBuilder{}.setName(eventNameBuilder.str()).increment(1).build())
+                .build();
+        if (metricEvent) {
+            m_metricRecorder->recordMetric(std::move(metricEvent));
+        }
+    }
+#endif
+
     switch (status) {
         /// 200 Response with a set gateway directive.
         case MessageRequestObserverInterface::Status::SUCCESS:
diff --git a/AVSGatewayManager/src/Storage/AVSGatewayManagerStorage.cpp b/AVSGatewayManager/src/Storage/AVSGatewayManagerStorage.cpp
index e1331e3527..81b7e758b4 100644
--- a/AVSGatewayManager/src/Storage/AVSGatewayManagerStorage.cpp
+++ b/AVSGatewayManager/src/Storage/AVSGatewayManagerStorage.cpp
@@ -27,7 +27,7 @@ using namespace avsCommon::sdkInterfaces::storage;
 using namespace avsCommon::utils::json;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AVSGatewayManagerStorage");
+#define TAG "AVSGatewayManagerStorage"
 
 /**
  * Create a LogEntry using the file's TAG and the specified event string.
diff --git a/ApplicationUtilities/AndroidUtilities/include/AndroidUtilities/PlatformSpecificValues.h b/ApplicationUtilities/AndroidUtilities/include/AndroidUtilities/PlatformSpecificValues.h
deleted file mode 100644
index 1538ed67bf..0000000000
--- a/ApplicationUtilities/AndroidUtilities/include/AndroidUtilities/PlatformSpecificValues.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_APPLICATIONUTILITIES_ANDROIDUTILITIES_INCLUDE_ANDROIDUTILITIES_PLATFORMSPECIFICVALUES_H_
-#define ALEXA_CLIENT_SDK_APPLICATIONUTILITIES_ANDROIDUTILITIES_INCLUDE_ANDROIDUTILITIES_PLATFORMSPECIFICVALUES_H_
-
-#include <string>
-
-#include "AndroidUtilities/AndroidSLESEngine.h"
-
-namespace alexaClientSDK {
-namespace applicationUtilities {
-namespace androidUtilities {
-
-struct PlatformSpecificValues {
-    std::shared_ptr<applicationUtilities::androidUtilities::AndroidSLESEngine> openSlEngine;
-};
-
-}  // namespace androidUtilities
-}  // namespace applicationUtilities
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_APPLICATIONUTILITIES_ANDROIDUTILITIES_INCLUDE_ANDROIDUTILITIES_PLATFORMSPECIFICVALUES_H_
diff --git a/ApplicationUtilities/AndroidUtilities/src/AndroidSLESBufferQueue.cpp b/ApplicationUtilities/AndroidUtilities/src/AndroidSLESBufferQueue.cpp
index 4c8b4f4448..eef4e02a77 100644
--- a/ApplicationUtilities/AndroidUtilities/src/AndroidSLESBufferQueue.cpp
+++ b/ApplicationUtilities/AndroidUtilities/src/AndroidSLESBufferQueue.cpp
@@ -17,7 +17,7 @@
 #include <AndroidUtilities/AndroidSLESObject.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"AndroidSLESBufferQueue"};
+#define TAG "AndroidSLESBufferQueue"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ApplicationUtilities/AndroidUtilities/src/AndroidSLESEngine.cpp b/ApplicationUtilities/AndroidUtilities/src/AndroidSLESEngine.cpp
index 401e2103fa..778f26472c 100644
--- a/ApplicationUtilities/AndroidUtilities/src/AndroidSLESEngine.cpp
+++ b/ApplicationUtilities/AndroidUtilities/src/AndroidSLESEngine.cpp
@@ -22,7 +22,7 @@
 #include <AndroidUtilities/AndroidSLESMicrophone.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"AndroidSLESEngine"};
+#define TAG "AndroidSLESEngine"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ApplicationUtilities/AndroidUtilities/src/AndroidSLESMicrophone.cpp b/ApplicationUtilities/AndroidUtilities/src/AndroidSLESMicrophone.cpp
index f4a263cd5c..b90d4a7163 100644
--- a/ApplicationUtilities/AndroidUtilities/src/AndroidSLESMicrophone.cpp
+++ b/ApplicationUtilities/AndroidUtilities/src/AndroidSLESMicrophone.cpp
@@ -19,7 +19,7 @@
 #include <AndroidUtilities/AndroidSLESEngine.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"AndroidMicrophone"};
+#define TAG "AndroidMicrophone"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ApplicationUtilities/AndroidUtilities/src/AndroidSLESObject.cpp b/ApplicationUtilities/AndroidUtilities/src/AndroidSLESObject.cpp
index eaa73e4b18..962949c586 100644
--- a/ApplicationUtilities/AndroidUtilities/src/AndroidSLESObject.cpp
+++ b/ApplicationUtilities/AndroidUtilities/src/AndroidSLESObject.cpp
@@ -20,7 +20,7 @@ namespace applicationUtilities {
 namespace androidUtilities {
 
 /// The tag associated with log entries from this class.
-static const std::string TAG{"AndroidSLESObject"};
+#define TAG "AndroidSLESObject"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ApplicationUtilities/DefaultClient/include/DefaultClient/DefaultClient.h b/ApplicationUtilities/DefaultClient/include/DefaultClient/DefaultClient.h
index 2569e2d653..6d4f8cb365 100644
--- a/ApplicationUtilities/DefaultClient/include/DefaultClient/DefaultClient.h
+++ b/ApplicationUtilities/DefaultClient/include/DefaultClient/DefaultClient.h
@@ -45,6 +45,7 @@
 #include <AVSCommon/SDKInterfaces/CallManagerInterface.h>
 #include <AVSCommon/SDKInterfaces/CapabilitiesDelegateInterface.h>
 #include <AVSCommon/SDKInterfaces/CapabilitiesDelegateObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/ChannelVolumeFactoryInterface.h>
 #include <AVSCommon/SDKInterfaces/ConnectionStatusObserverInterface.h>
 #include <AVSCommon/SDKInterfaces/Diagnostics/DiagnosticsInterface.h>
 #include <AVSCommon/SDKInterfaces/DialogUXStateObserverInterface.h>
@@ -60,8 +61,7 @@
 #include <AVSCommon/SDKInterfaces/SpeechInteractionHandlerInterface.h>
 #include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
 #include <AVSCommon/SDKInterfaces/SystemTimeZoneInterface.h>
-#include <AVSCommon/SDKInterfaces/TemplateRuntimeObserverInterface.h>
-#include <AVSCommon/SDKInterfaces/VisualFocusAnnotation.h>
+#include <acsdk/TemplateRuntimeInterfaces/TemplateRuntimeObserverInterface.h>
 #include <AVSCommon/Utils/DeviceInfo.h>
 #include <AVSCommon/Utils/LibcurlUtils/HTTPContentFetcherFactory.h>
 #include <AVSCommon/Utils/MediaPlayer/MediaPlayerFactoryInterface.h>
@@ -94,16 +94,17 @@
 #include <InterruptModel/InterruptModel.h>
 
 #ifdef ENABLE_PCC
-#include <AVSCommon/SDKInterfaces/Phone/PhoneCallerInterface.h>
-#include <PhoneCallController/PhoneCallController.h>
+#include <acsdk/PhoneCallControllerInterfaces/Phone/PhoneCallerInterface.h>
+#include <acsdk/PhoneCallController/PhoneCallController.h>
 #endif
 
 #ifdef ENABLE_MCC
-#include <AVSCommon/SDKInterfaces/Calendar/CalendarClientInterface.h>
-#include <AVSCommon/SDKInterfaces/Meeting/MeetingClientInterface.h>
-#include <MeetingClientController/MeetingClientController.h>
+#include <acsdk/MeetingClientControllerInterfaces/Calendar/CalendarClientInterface.h>
+#include <acsdk/MeetingClientControllerInterfaces/Meeting/MeetingClientInterface.h>
+#include <acsdk/MeetingClientController/MeetingClientController.h>
 #endif
 
+#include <acsdk/AudioEncoderInterfaces/AudioEncoderInterface.h>
 #include <AVSCommon/SDKInterfaces/SystemSoundPlayerInterface.h>
 #include <AVSCommon/SDKInterfaces/Endpoints/EndpointInterface.h>
 #include <Endpoints/Endpoint.h>
@@ -115,13 +116,11 @@
 #include <Settings/DeviceSettingsManager.h>
 #include <Settings/Storage/DeviceSettingStorageInterface.h>
 #include <SoftwareComponentReporter/SoftwareComponentReporterCapabilityAgent.h>
-#include <SpeakerManager/DefaultChannelVolumeFactory.h>
-#include <SpeakerManager/SpeakerManager.h>
-#include <SpeechEncoder/SpeechEncoder.h>
+#include <acsdk/SDKClient/FeatureClientInterface.h>
+#include <acsdk/SpeakerManager/Factories.h>
 #include <SpeechSynthesizer/SpeechSynthesizer.h>
 #include <System/SoftwareInfoSender.h>
 #include <System/UserInactivityMonitor.h>
-#include <TemplateRuntime/TemplateRuntime.h>
 
 #ifdef ENABLE_REVOKE_AUTH
 #include <System/RevokeAuthorizationHandler.h>
@@ -138,7 +137,9 @@ namespace defaultClient {
  * This class serves to instantiate each default component with of the SDK with no specializations to provide an
  * "out-of-box" component that users may utilize for AVS interaction.
  */
-class DefaultClient : public avsCommon::sdkInterfaces::SpeechInteractionHandlerInterface {
+class DefaultClient
+        : public avsCommon::sdkInterfaces::SpeechInteractionHandlerInterface
+        , public sdkClient::FeatureClientInterface {
 public:
     using DefaultClientSubsetManufactory = acsdkManufactory::Manufactory<
         std::shared_ptr<acsdkAlertsInterfaces::AlertsCapabilityAgentInterface>,
@@ -168,8 +169,6 @@ class DefaultClient : public avsCommon::sdkInterfaces::SpeechInteractionHandlerI
         std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>,
         acsdkManufactory::
             Annotated<avsCommon::sdkInterfaces::AudioFocusAnnotation, avsCommon::sdkInterfaces::FocusManagerInterface>,
-        acsdkManufactory::
-            Annotated<avsCommon::sdkInterfaces::VisualFocusAnnotation, avsCommon::sdkInterfaces::FocusManagerInterface>,
         std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>,
         std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>,
         std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>,
@@ -197,7 +196,7 @@ class DefaultClient : public avsCommon::sdkInterfaces::SpeechInteractionHandlerI
         std::shared_ptr<registrationManager::RegistrationNotifierInterface>,
         std::shared_ptr<settings::DeviceSettingsManager>,
         std::shared_ptr<settings::storage::DeviceSettingStorageInterface>,
-        std::shared_ptr<speechencoder::SpeechEncoder>,
+        std::shared_ptr<audioEncoderInterfaces::AudioEncoderInterface>,
         std::shared_ptr<acsdkDeviceSetupInterfaces::DeviceSetupInterface>>;
 
     using DefaultClientManufactory = acsdkManufactory::Manufactory<
@@ -228,8 +227,6 @@ class DefaultClient : public avsCommon::sdkInterfaces::SpeechInteractionHandlerI
         std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>,
         acsdkManufactory::
             Annotated<avsCommon::sdkInterfaces::AudioFocusAnnotation, avsCommon::sdkInterfaces::FocusManagerInterface>,
-        acsdkManufactory::
-            Annotated<avsCommon::sdkInterfaces::VisualFocusAnnotation, avsCommon::sdkInterfaces::FocusManagerInterface>,
         std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>,
         std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>,
         std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>,
@@ -257,7 +254,7 @@ class DefaultClient : public avsCommon::sdkInterfaces::SpeechInteractionHandlerI
         std::shared_ptr<registrationManager::RegistrationNotifierInterface>,
         std::shared_ptr<settings::DeviceSettingsManager>,
         std::shared_ptr<settings::storage::DeviceSettingStorageInterface>,
-        std::shared_ptr<speechencoder::SpeechEncoder>,
+        std::shared_ptr<audioEncoderInterfaces::AudioEncoderInterface>,
         std::shared_ptr<acsdkDeviceSetupInterfaces::DeviceSetupInterface>>;
 
     /**
@@ -293,6 +290,7 @@ class DefaultClient : public avsCommon::sdkInterfaces::SpeechInteractionHandlerI
      * @param externalCapabilitiesBuilder Optional object used to build capabilities that are not included in the SDK.
      * @param firstInteractionAudioProvider Optional object used in the first interaction started from
      * the alexa voice service
+     * @param sdkClientRegistry Optional object used when the @c SDKClientBuilder is used to construct DefaultClient
      * @return A @c std::unique_ptr to a DefaultClient if all went well or @c nullptr otherwise.
      */
     static std::unique_ptr<DefaultClient> create(
@@ -304,12 +302,12 @@ class DefaultClient : public avsCommon::sdkInterfaces::SpeechInteractionHandlerI
             std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>> additionalSpeakers,
 #ifdef ENABLE_PCC
         std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> phoneSpeaker,
-        std::shared_ptr<avsCommon::sdkInterfaces::phone::PhoneCallerInterface> phoneCaller,
+        std::shared_ptr<phoneCallControllerInterfaces::phone::PhoneCallerInterface> phoneCaller,
 #endif
 #ifdef ENABLE_MCC
         std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> meetingSpeaker,
-        std::shared_ptr<avsCommon::sdkInterfaces::meeting::MeetingClientInterface> meetingClient,
-        std::shared_ptr<avsCommon::sdkInterfaces::calendar::CalendarClientInterface> calendarClient,
+        std::shared_ptr<meetingClientControllerInterfaces::meeting::MeetingClientInterface> meetingClient,
+        std::shared_ptr<meetingClientControllerInterfaces::calendar::CalendarClientInterface> calendarClient,
 #endif
 #ifdef ENABLE_COMMS_AUDIO_PROXY
         std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
@@ -329,7 +327,8 @@ class DefaultClient : public avsCommon::sdkInterfaces::SpeechInteractionHandlerI
         std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics = nullptr,
         const std::shared_ptr<ExternalCapabilitiesBuilderInterface>& externalCapabilitiesBuilder = nullptr,
         capabilityAgents::aip::AudioProvider firstInteractionAudioProvider =
-            capabilityAgents::aip::AudioProvider::null());
+            capabilityAgents::aip::AudioProvider::null(),
+        const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry = nullptr);
 
     /**
      * Creates and initializes a default AVS SDK client. To connect the client to AVS, users should make a call to
@@ -405,6 +404,8 @@ of the @c ExpectSpeech directive's timeout. If provided, this function must rema
 AudioInputProcessor.
      * @param firstInteractionAudioProvider Optional object used in the first interaction started from
      * the alexa voice service
+     * @param cryptoFactory Optional Encryption facilities factory.
+     * @param sdkClientRegistry Optional object used when the @c SDKClientBuilder is used to construct DefaultClient
      * @return A @c std::unique_ptr to a DefaultClient if all went well or @c nullptr otherwise.
      */
     static std::unique_ptr<DefaultClient> create(
@@ -434,12 +435,12 @@ AudioInputProcessor.
             std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>> additionalSpeakers,
 #ifdef ENABLE_PCC
         std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> phoneSpeaker,
-        std::shared_ptr<avsCommon::sdkInterfaces::phone::PhoneCallerInterface> phoneCaller,
+        std::shared_ptr<phoneCallControllerInterfaces::phone::PhoneCallerInterface> phoneCaller,
 #endif
 #ifdef ENABLE_MCC
         std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> meetingSpeaker,
-        std::shared_ptr<avsCommon::sdkInterfaces::meeting::MeetingClientInterface> meetingClient,
-        std::shared_ptr<avsCommon::sdkInterfaces::calendar::CalendarClientInterface> calendarClient,
+        std::shared_ptr<meetingClientControllerInterfaces::meeting::MeetingClientInterface> meetingClient,
+        std::shared_ptr<meetingClientControllerInterfaces::calendar::CalendarClientInterface> calendarClient,
 #endif
 #ifdef ENABLE_COMMS_AUDIO_PROXY
         std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
@@ -482,14 +483,22 @@ AudioInputProcessor.
         std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics = nullptr,
         const std::shared_ptr<ExternalCapabilitiesBuilderInterface>& externalCapabilitiesBuilder = nullptr,
         std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface> channelVolumeFactory =
-            std::make_shared<alexaClientSDK::capabilityAgents::speakerManager::DefaultChannelVolumeFactory>(),
+            speakerManager::createChannelVolumeFactory(),
         bool startAlertSchedulingOnInitialization = true,
         std::shared_ptr<alexaClientSDK::acl::MessageRouterFactoryInterface> messageRouterFactory =
             std::make_shared<alexaClientSDK::acl::MessageRouterFactory>(),
         const std::shared_ptr<avsCommon::sdkInterfaces::ExpectSpeechTimeoutHandlerInterface>&
             expectSpeechTimeoutHandler = nullptr,
         capabilityAgents::aip::AudioProvider firstInteractionAudioProvider =
-            capabilityAgents::aip::AudioProvider::null());
+            capabilityAgents::aip::AudioProvider::null(),
+        const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory = nullptr,
+        const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry = nullptr);
+
+    /// @c FeatureClientInterface functions
+    /// @{
+    bool configure(const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) override;
+    void doShutdown() override;
+    /// @}
 
     /**
      * Connects the client to AVS. After this call, users can observe the state of the connection asynchronously by
@@ -633,7 +642,7 @@ AudioInputProcessor.
      * @param observer The observer to add.
      */
     void addTemplateRuntimeObserver(
-        std::shared_ptr<avsCommon::sdkInterfaces::TemplateRuntimeObserverInterface> observer);
+        std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeObserverInterface> observer);
 
     /**
      * Removes an observer to be notified when a TemplateRuntime directive is received.
@@ -641,12 +650,7 @@ AudioInputProcessor.
      * @param observer The observer to remove.
      */
     void removeTemplateRuntimeObserver(
-        std::shared_ptr<avsCommon::sdkInterfaces::TemplateRuntimeObserverInterface> observer);
-
-    /**
-     * Notify the TemplateRuntime Capability Agent that the display card is cleared from the screen.
-     */
-    void TemplateRuntimeDisplayCardCleared();
+        std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeObserverInterface> observer);
 
     /**
      * Adds an observer to be notified of IndicatorState changes.
@@ -1094,7 +1098,29 @@ AudioInputProcessor.
      */
     std::shared_ptr<acsdkBluetoothInterfaces::BluetoothLocalInterface> getBluetoothLocal();
 
+    /**
+     * Stops any ongoing interaction with the SDK by resetting the state of the @c AudioInputProcessor.
+     *
+     * This method is intended for use when a device needs to stop the current user interaction with alexa, for example
+     * when the audio input state needs to be returned to idle as a result of an event such as a back or exit button
+     * press. Calling this method has no effect on ongoing Alexa speech, audio playback or visual state.
+     */
+    void stopInteraction();
+
+    /**
+     * Get a reference to the audio focus manager
+     *
+     * @return shared_ptr to the audio @c FocusManagerInterface, callers should perform a nullptr check as the returned
+     * pointer may be null
+     */
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::FocusManagerInterface> getAudioFocusManager();
+
 private:
+    /**
+     * Constructor
+     */
+    DefaultClient();
+
     /**
      * Initializes the SDK and "glues" all the components together.
      *
@@ -1114,6 +1140,7 @@ AudioInputProcessor.
      * @param externalCapabilitiesBuilder Object used to build capabilities that are not included in the SDK.
      * @param firstInteractionAudioProvider Optional object used in the first interaction started from
      * the alexa voice service
+     * @param sdkClientRegistry Optional object used when the @c SDKClientBuilder is used to construct DefaultClient
      * @return Whether the SDK was initialized properly.
      */
     bool initialize(
@@ -1125,12 +1152,12 @@ AudioInputProcessor.
             std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>> additionalSpeakers,
 #ifdef ENABLE_PCC
         std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> phoneSpeaker,
-        std::shared_ptr<avsCommon::sdkInterfaces::phone::PhoneCallerInterface> phoneCaller,
+        std::shared_ptr<phoneCallControllerInterfaces::phone::PhoneCallerInterface> phoneCaller,
 #endif
 #ifdef ENABLE_MCC
         std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> meetingSpeaker,
-        std::shared_ptr<avsCommon::sdkInterfaces::meeting::MeetingClientInterface> meetingClient,
-        std::shared_ptr<avsCommon::sdkInterfaces::calendar::CalendarClientInterface> calendarClient,
+        std::shared_ptr<meetingClientControllerInterfaces::meeting::MeetingClientInterface> meetingClient,
+        std::shared_ptr<meetingClientControllerInterfaces::calendar::CalendarClientInterface> calendarClient,
 #endif
 #ifdef ENABLE_COMMS_AUDIO_PROXY
         std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
@@ -1147,7 +1174,8 @@ AudioInputProcessor.
         std::shared_ptr<avsCommon::sdkInterfaces::SoftwareInfoSenderObserverInterface> softwareInfoSenderObserver,
         std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics,
         const std::shared_ptr<ExternalCapabilitiesBuilderInterface>& externalCapabilitiesBuilder,
-        capabilityAgents::aip::AudioProvider firstInteractionAudioProvider);
+        capabilityAgents::aip::AudioProvider firstInteractionAudioProvider,
+        const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry = nullptr);
 
     /// The directive sequencer.
     std::shared_ptr<avsCommon::sdkInterfaces::DirectiveSequencerInterface> m_directiveSequencer;
@@ -1155,12 +1183,10 @@ AudioInputProcessor.
     /// The focus manager for audio channels.
     std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> m_audioFocusManager;
 
-    /// The focus manager for visual channels.
-    std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> m_visualFocusManager;
-
     /// The connection manager.
     std::shared_ptr<acl::AVSConnectionManagerInterface> m_connectionManager;
 
+    /// The internet connection monitor.
     std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface> m_internetConnectionMonitor;
 
     /// The captions manager.
@@ -1207,13 +1233,12 @@ AudioInputProcessor.
 
 #ifdef ENABLE_PCC
     /// The phoneCallController capability agent.
-    std::shared_ptr<capabilityAgents::phoneCallController::PhoneCallController> m_phoneCallControllerCapabilityAgent;
+    std::shared_ptr<phoneCallController::PhoneCallController> m_phoneCallControllerCapabilityAgent;
 #endif
 
 #ifdef ENABLE_MCC
     /// The MeetingClientController capability agent.
-    std::shared_ptr<capabilityAgents::meetingClientController::MeetingClientController>
-        m_meetingClientControllerCapabilityAgent;
+    std::shared_ptr<meetingClientController::MeetingClientController> m_meetingClientControllerCapabilityAgent;
 #endif
 
     /// The call manager capability agent.
@@ -1229,7 +1254,7 @@ AudioInputProcessor.
     std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface> m_speakerManager;
 
     /// The TemplateRuntime capability agent.
-    std::shared_ptr<capabilityAgents::templateRuntime::TemplateRuntime> m_templateRuntime;
+    std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeInterface> m_templateRuntime;
 
     /// The Equalizer capability agent.
     std::shared_ptr<acsdkEqualizer::EqualizerCapabilityAgent> m_equalizerCapabilityAgent;
diff --git a/ApplicationUtilities/DefaultClient/include/DefaultClient/DefaultClientBuilder.h b/ApplicationUtilities/DefaultClient/include/DefaultClient/DefaultClientBuilder.h
new file mode 100644
index 0000000000..36a7cde41a
--- /dev/null
+++ b/ApplicationUtilities/DefaultClient/include/DefaultClient/DefaultClientBuilder.h
@@ -0,0 +1,473 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_APPLICATIONUTILITIES_DEFAULTCLIENT_INCLUDE_DEFAULTCLIENT_DEFAULTCLIENTBUILDER_H_
+#define ALEXA_CLIENT_SDK_APPLICATIONUTILITIES_DEFAULTCLIENT_INCLUDE_DEFAULTCLIENT_DEFAULTCLIENTBUILDER_H_
+
+#include <ACL/Transport/MessageRouter.h>
+#include <ACL/Transport/MessageRouterFactory.h>
+#include <AIP/AudioInputProcessor.h>
+#include <AIP/AudioProvider.h>
+#include <AVSCommon/SDKInterfaces/AVSGatewayManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Audio/AudioFactoryInterface.h>
+#include <AVSCommon/SDKInterfaces/AuthDelegateInterface.h>
+#include <AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceConnectionRuleInterface.h>
+#include <AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilitiesDelegateInterface.h>
+#include <AVSCommon/SDKInterfaces/ChannelVolumeFactoryInterface.h>
+#include <AVSCommon/SDKInterfaces/ConnectionStatusObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/Diagnostics/DiagnosticsInterface.h>
+#include <AVSCommon/SDKInterfaces/DialogUXStateObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/ExpectSpeechTimeoutHandlerInterface.h>
+#include <AVSCommon/SDKInterfaces/InternetConnectionMonitorInterface.h>
+#include <AVSCommon/SDKInterfaces/LocaleAssetsManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/PowerResourceManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
+#include <AVSCommon/SDKInterfaces/SystemTimeZoneInterface.h>
+#include <AVSCommon/Utils/DeviceInfo.h>
+#include <AVSCommon/Utils/MediaPlayer/MediaPlayerFactoryInterface.h>
+#include <AVSCommon/Utils/MediaPlayer/MediaPlayerInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <CertifiedSender/CertifiedSender.h>
+#include <Endpoints/Endpoint.h>
+#include <Settings/Storage/DeviceSettingStorageInterface.h>
+#include <System/SoftwareInfoSender.h>
+#include <acsdk/SDKClient/FeatureClientBuilderInterface.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+#include <acsdkAlerts/Storage/AlertStorageInterface.h>
+#include <acsdkAudioPlayer/AudioPlayer.h>
+#include <acsdkBluetoothInterfaces/BluetoothStorageInterface.h>
+#include <acsdkExternalMediaPlayer/ExternalMediaPlayer.h>
+#include <acsdkNotificationsInterfaces/NotificationsStorageInterface.h>
+
+#ifdef ENABLE_PCC
+#include <acsdk/PhoneCallControllerInterfaces/Phone/PhoneCallerInterface.h>
+#include <acsdk/PhoneCallController/PhoneCallController.h>
+#endif
+
+#ifdef ENABLE_MCC
+#include <acsdk/MeetingClientControllerInterfaces/Calendar/CalendarClientInterface.h>
+#include <acsdk/MeetingClientControllerInterfaces/Meeting/MeetingClientInterface.h>
+#include <acsdk/MeetingClientController/MeetingClientController.h>
+#endif
+
+#include "DefaultClient/EqualizerRuntimeSetup.h"
+#include "DefaultClient/ExternalCapabilitiesBuilderInterface.h"
+
+#include "DefaultClient.h"
+
+namespace alexaClientSDK {
+namespace defaultClient {
+/**
+ * The DefaultClientBuilder is used to construct DefaultClient when used with the ClientBuilder
+ */
+class DefaultClientBuilder : public sdkClient::FeatureClientBuilderInterface {
+public:
+    /**
+     * Creates and initializes a default AVS SDK client. To connect the client to AVS, users should make a call to
+     * connect() after creation.
+     *
+     * @param deviceInfo DeviceInfo which reflects the device setup credentials.
+     * @param customerDataManager CustomerDataManager instance to be used by RegistrationManager and instances of
+     * all classes extending CustomDataHandler.
+     * @param externalMusicProviderMediaPlayers The map of <players, mediaPlayer> to use to play content from each
+     * external music provider.
+     * @param externalMusicProviderSpeakers The map of <players, speaker> to use to track volume of each
+     * external music provider media player.
+     * @param adapterCreationMap The map of <players, adapterCreationMethod> to use when creating the adapters for the
+     * different music providers supported by ExternalMediaPlayer.
+     * @param speakMediaPlayer The media player to use to play Alexa speech from.
+     * @param audioMediaPlayerFactory The media player factory to use to generate players for Alexa audio content.
+     * @param alertsMediaPlayer The media player to use to play alerts from.
+     * @param notificationsMediaPlayer The media player to play notification indicators.
+     * @param bluetoothMediaPlayer The media player to play bluetooth content.
+     * @param ringtoneMediaPlayer The media player to play Comms ringtones.
+     * @param systemSoundMediaPlayer The media player to play system sounds.
+     * @param speakSpeaker The speaker to control volume of Alexa speech.
+     * @param audioSpeakers A list of speakers to control volume of Alexa audio content.
+     * @param alertsSpeaker The speaker to control volume of alerts.
+     * @param notificationsSpeaker The speaker to control volume of notifications.
+     * @param bluetoothSpeaker The speaker to control volume of bluetooth.
+     * @param ringtoneSpeaker The speaker to control volume of Comms ringtones.
+     * @param systemSoundSpeaker The speaker to control volume of system sounds.
+     * @param additionalSpeakers A map of additional speakers to receive volume changes.
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+     * @param commsMediaPlayer The media player to play Comms calling audio.
+     * @param commsSpeaker The speaker to control volume of Comms calling audio.
+     * @param sharedDataStream The stream to use which has the audio from microphone.
+#endif
+     * @param equalizerRuntimeSetup Equalizer component runtime setup
+     * @param audioFactory The audioFactory is a component that provides unique audio streams.
+     * @param authDelegate The component that provides the client with valid LWA authorization.
+     * @param alertStorage The storage interface that will be used to store alerts.
+     * @param messageStorage The storage interface that will be used to store certified sender messages.
+     * @param notificationsStorage The storage interface that will be used to store notification indicators.
+     * @param deviceSettingStorage The storage interface that will be used to store device settings.
+     * @param bluetoothStorage The storage interface that will be used to store bluetooth data.
+     * @param miscStorage The storage interface that will be used to store key / value pairs.
+     * @param alexaDialogStateObservers Observers that can be used to be notified of Alexa dialog related UX state
+     * changes.
+     * @param connectionObservers Observers that can be used to be notified of connection status changes.
+     * @param isGuiSupported Whether the device supports GUI.
+     * @param capabilitiesDelegate The component that provides the client with the ability to send messages to the
+     * Capabilities API.
+     * @param contextManager The @c ContextManager which will provide the context for various components.
+     * @param transportFactory The object passed in here will be used whenever a new transport object
+     * for AVS communication is needed.
+     * @param avsGatewayManager The @c AVSGatewayManager instance used to create the ApiGateway CA.
+     * @param localeAssetsManager The device locale assets manager.
+     * @param enabledConnectionRules The set of @c BluetoothDeviceConnectionRuleInterface instances used to
+     * create the Bluetooth CA.
+     * @param systemTimezone Optional object used to set the system timezone.
+     * @param firmwareVersion The firmware version to report to @c AVS or @c INVALID_FIRMWARE_VERSION.
+     * @param sendSoftwareInfoOnConnected Whether to send SoftwareInfo upon connecting to @c AVS.
+     * @param softwareInfoSenderObserver Object to receive notifications about sending SoftwareInfo.
+     * @param bluetoothDeviceManager The @c BluetoothDeviceManager instance used to create the Bluetooth CA.
+     * @param metricRecorder The metric recorder object used to capture metrics.
+     * @param powerResourceManager Object to manage power resource.
+     * @param diagnostics Diagnostics interface which provides suite of APIs for diagnostic insight into SDK.
+     * @param externalCapabilitiesBuilder Optional object used to build capabilities that are not included in the SDK.
+     * @param channelVolumeFactory Optional object used to build @c ChannelVolumeInterface in the SDK.
+     * @param startAlertSchedulingOnInitialization Whether to start scheduling alerts after client initialization. If
+     * this is set to false, no alert scheduling will occur until onSystemClockSynchronized is called.
+     * @param messageRouterFactory Object used to instantiate @c MessageRouter in the SDK.
+     * @param expectSpeechTimeoutHandler An optional object that applications may provide to specify external handling
+of the @c ExpectSpeech directive's timeout. If provided, this function must remain valid for the lifetime of the @c
+AudioInputProcessor.
+     * @param firstInteractionAudioProvider Optional object used in the first interaction started from
+     * the alexa voice service
+     * @param cryptoFactory Optional Encryption facilities factory.
+     * @return A @c std::unique_ptr to a DefaultClient if all went well or @c nullptr otherwise.
+     */
+    static std::unique_ptr<DefaultClientBuilder> create(
+        std::shared_ptr<avsCommon::utils::DeviceInfo> deviceInfo,
+        std::shared_ptr<registrationManager::CustomerDataManagerInterface> customerDataManager,
+        std::unordered_map<std::string, std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface>>
+            externalMusicProviderMediaPlayers,
+        std::unordered_map<std::string, std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>>
+            externalMusicProviderSpeakers,
+        acsdkExternalMediaPlayer::ExternalMediaPlayer::AdapterCreationMap adapterCreationMap,
+        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> speakMediaPlayer,
+        std::unique_ptr<avsCommon::utils::mediaPlayer::MediaPlayerFactoryInterface> audioMediaPlayerFactory,
+        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> alertsMediaPlayer,
+        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> notificationsMediaPlayer,
+        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> bluetoothMediaPlayer,
+        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> ringtoneMediaPlayer,
+        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> systemSoundMediaPlayer,
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> speakSpeaker,
+        std::vector<std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>> audioSpeakers,
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> alertsSpeaker,
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> notificationsSpeaker,
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> bluetoothSpeaker,
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> ringtoneSpeaker,
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> systemSoundSpeaker,
+        std::multimap<
+            avsCommon::sdkInterfaces::ChannelVolumeInterface::Type,
+            std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>> additionalSpeakers,
+#ifdef ENABLE_PCC
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> phoneSpeaker,
+        std::shared_ptr<phoneCallControllerInterfaces::phone::PhoneCallerInterface> phoneCaller,
+#endif
+#ifdef ENABLE_MCC
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> meetingSpeaker,
+        std::shared_ptr<meetingClientControllerInterfaces::meeting::MeetingClientInterface> meetingClient,
+        std::shared_ptr<meetingClientControllerInterfaces::calendar::CalendarClientInterface> calendarClient,
+#endif
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> commsSpeaker,
+        std::shared_ptr<avsCommon::avs::AudioInputStream> sharedDataStream,
+#endif
+        std::shared_ptr<EqualizerRuntimeSetup> equalizerRuntimeSetup,
+        std::shared_ptr<avsCommon::sdkInterfaces::audio::AudioFactoryInterface> audioFactory,
+        std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> authDelegate,
+        std::shared_ptr<acsdkAlerts::storage::AlertStorageInterface> alertStorage,
+        std::shared_ptr<certifiedSender::MessageStorageInterface> messageStorage,
+        std::shared_ptr<acsdkNotificationsInterfaces::NotificationsStorageInterface> notificationsStorage,
+        std::shared_ptr<settings::storage::DeviceSettingStorageInterface> deviceSettingStorage,
+        std::shared_ptr<acsdkBluetoothInterfaces::BluetoothStorageInterface> bluetoothStorage,
+        std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage,
+        std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::DialogUXStateObserverInterface>>
+            alexaDialogStateObservers,
+        std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::ConnectionStatusObserverInterface>>
+            connectionObservers,
+        std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface> internetConnectionMonitor,
+        bool isGuiSupported,
+        std::shared_ptr<avsCommon::sdkInterfaces::CapabilitiesDelegateInterface> capabilitiesDelegate,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<alexaClientSDK::acl::TransportFactoryInterface> transportFactory,
+        std::shared_ptr<avsCommon::sdkInterfaces::AVSGatewayManagerInterface> avsGatewayManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface> localeAssetsManager,
+        std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceConnectionRuleInterface>>
+            enabledConnectionRules = std::unordered_set<
+                std::shared_ptr<avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceConnectionRuleInterface>>(),
+        std::shared_ptr<avsCommon::sdkInterfaces::SystemTimeZoneInterface> systemTimezone = nullptr,
+        avsCommon::sdkInterfaces::softwareInfo::FirmwareVersion firmwareVersion =
+            avsCommon::sdkInterfaces::softwareInfo::INVALID_FIRMWARE_VERSION,
+        bool sendSoftwareInfoOnConnected = false,
+        std::shared_ptr<avsCommon::sdkInterfaces::SoftwareInfoSenderObserverInterface> softwareInfoSenderObserver =
+            nullptr,
+        std::unique_ptr<avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceManagerInterface> bluetoothDeviceManager =
+            nullptr,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder = nullptr,
+        std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface> powerResourceManager = nullptr,
+        std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics = nullptr,
+        std::shared_ptr<ExternalCapabilitiesBuilderInterface> externalCapabilitiesBuilder = nullptr,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface> channelVolumeFactory =
+            speakerManager::createChannelVolumeFactory(),
+        bool startAlertSchedulingOnInitialization = true,
+        std::shared_ptr<alexaClientSDK::acl::MessageRouterFactoryInterface> messageRouterFactory =
+            std::make_shared<alexaClientSDK::acl::MessageRouterFactory>(),
+        std::shared_ptr<avsCommon::sdkInterfaces::ExpectSpeechTimeoutHandlerInterface> expectSpeechTimeoutHandler =
+            nullptr,
+        capabilityAgents::aip::AudioProvider firstInteractionAudioProvider =
+            capabilityAgents::aip::AudioProvider::null(),
+        std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface> cryptoFactory = nullptr);
+
+    /**
+     * Function used by SDKClientBuilder to construct an instance of DefaultClient
+     * @param sdkClientRegistry The @c SDKClientRegistry object
+     * @return An instance of the @c DefaultClient, or nullptr if creation failed
+     */
+    std::shared_ptr<DefaultClient> construct(const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry);
+
+    /// @c FeatureClientBuilderInterface functions
+    /// @{
+    std::string name() override;
+    /// @}
+
+private:
+    /// Constructor
+    DefaultClientBuilder();
+
+    /// Flag indicating whether the @c construct method has previously been called on this instance
+    bool m_constructed;
+
+    /// DeviceInfo which reflects the device setup credentials.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::DeviceInfo> m_deviceInfo;
+
+    /// CustomerDataManager instance to be used by RegistrationManager and instances of all classes extending
+    /// CustomDataHandler.
+    std::shared_ptr<alexaClientSDK::registrationManager::CustomerDataManagerInterface> m_customerDataManager;
+
+    /// The map of <players, mediaPlayer> to use to play content from each external music provider.
+    std::
+        unordered_map<std::string, std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface>>
+            m_externalMusicProviderMediaPlayers;
+
+    /// The map of <players, speaker> to use to track volume of each external music provider media player.
+    std::unordered_map<std::string, std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface>>
+        m_externalMusicProviderSpeakers;
+
+    /// The map of <players, adapterCreationMethod> to use when creating the adapters for the different music providers
+    /// supported by ExternalMediaPlayer.
+    alexaClientSDK::acsdkExternalMediaPlayer::ExternalMediaPlayer::AdapterCreationMap m_adapterCreationMap;
+
+    /// The media player to use to play Alexa speech from.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_speakMediaPlayer;
+
+    /// The media player factory to use to generate players for Alexa audio content.
+    std::unique_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerFactoryInterface>
+        m_audioMediaPlayerFactory;
+
+    /// The media player to use to play alerts from.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_alertsMediaPlayer;
+
+    /// The media player to play notification indicators.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_notificationsMediaPlayer;
+
+    /// The media player to play bluetooth content.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_bluetoothMediaPlayer;
+
+    /// The media player to play Comms ringtones.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_ringtoneMediaPlayer;
+
+    /// The media player to play system sounds.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_systemSoundMediaPlayer;
+
+    /// The speaker to control volume of Alexa speech.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> m_speakSpeaker;
+
+    /// A list of speakers to control volume of Alexa audio content.
+    std::vector<std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface>> m_audioSpeakers;
+
+    /// The speaker to control volume of alerts.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> m_alertsSpeaker;
+
+    /// The speaker to control volume of notifications.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> m_notificationsSpeaker;
+
+    /// The speaker to control volume of bluetooth.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> m_bluetoothSpeaker;
+
+    /// The speaker to control volume of Comms ringtones.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> m_ringtoneSpeaker;
+
+    /// The speaker to control volume of system sounds.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> m_systemSoundSpeaker;
+
+    /// A map of additional speakers to receive volume changes.
+    std::multimap<
+        alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface::Type,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface>>
+        m_additionalSpeakers;
+
+    /// Equalizer component runtime setup
+    std::shared_ptr<EqualizerRuntimeSetup> m_equalizerRuntimeSetup;
+
+    /// The audioFactory is a component that provides unique audio streams.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::audio::AudioFactoryInterface> m_audioFactory;
+
+    /// The component that provides the client with valid LWA authorization.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AuthDelegateInterface> m_authDelegate;
+
+    /// The storage interface that will be used to store alerts.
+    std::shared_ptr<alexaClientSDK::acsdkAlerts::storage::AlertStorageInterface> m_alertStorage;
+
+    /// The storage interface that will be used to store certified sender messages.
+    std::shared_ptr<alexaClientSDK::certifiedSender::MessageStorageInterface> m_messageStorage;
+
+    /// The storage interface that will be used to store notification indicators.
+    std::shared_ptr<alexaClientSDK::acsdkNotificationsInterfaces::NotificationsStorageInterface> m_notificationsStorage;
+
+    /// The storage interface that will be used to store device settings.
+    std::shared_ptr<alexaClientSDK::settings::storage::DeviceSettingStorageInterface> m_deviceSettingStorage;
+
+    /// The storage interface that will be used to store bluetooth data.
+    std::shared_ptr<alexaClientSDK::acsdkBluetoothInterfaces::BluetoothStorageInterface> m_bluetoothStorage;
+
+    /// The storage interface that will be used to store key / value pairs.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::storage::MiscStorageInterface> m_miscStorage;
+
+    /// Observers that can be used to be notified of Alexa dialog related UX state changes.
+    std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::DialogUXStateObserverInterface>>
+        m_alexaDialogStateObservers;
+
+    /// Observers that can be used to be notified of connection status changes.
+    std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ConnectionStatusObserverInterface>>
+        m_connectionObservers;
+
+    /// The interface for monitoring and reporting internet connection status
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>
+        m_internetConnectionMonitor;
+
+    /// Whether the device supports GUI.
+    bool m_isGuiSupported;
+
+    /// The component that provides the client with the ability to send messages to the Capabilities API.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::CapabilitiesDelegateInterface> m_capabilitiesDelegate;
+
+    /// The @c ContextManager which will provide the context for various components.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The object passed in here will be used whenever a new transport object for AVS communication is needed.
+    std::shared_ptr<alexaClientSDK::acl::TransportFactoryInterface> m_transportFactory;
+
+    /// The @c AVSGatewayManager instance used to create the ApiGateway CA.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSGatewayManagerInterface> m_avsGatewayManager;
+
+    /// The device locale assets manager.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsManagerInterface> m_localeAssetsManager;
+
+    /// The set of @c BluetoothDeviceConnectionRuleInterface instances used to create the Bluetooth CA.
+    std::unordered_set<
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceConnectionRuleInterface>>
+        m_enabledConnectionRules;
+
+    /// Optional object used to set the system timezone.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SystemTimeZoneInterface> m_systemTimezone;
+
+    /// The firmware version to report to @c AVS or @c INVALID_FIRMWARE_VERSION.
+    alexaClientSDK::avsCommon::sdkInterfaces::softwareInfo::FirmwareVersion m_firmwareVersion;
+
+    /// Whether to send SoftwareInfo upon connecting to @c AVS.
+    bool m_sendSoftwareInfoOnConnected;
+
+    /// Object to receive notifications about sending SoftwareInfo.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SoftwareInfoSenderObserverInterface>
+        m_softwareInfoSenderObserver;
+
+    /// The @c BluetoothDeviceManager instance used to create the Bluetooth CA.
+    std::unique_ptr<alexaClientSDK::avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceManagerInterface>
+        m_bluetoothDeviceManager;
+
+    /// The metric recorder object used to capture metrics.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
+
+    /// Object to manage power resource.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::PowerResourceManagerInterface> m_powerResourceManager;
+
+    /// Diagnostics interface which provides suite of APIs for diagnostic insight into SDK.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> m_diagnostics;
+
+    /// Optional object used to build capabilities that are not included in the SDK.
+    std::shared_ptr<ExternalCapabilitiesBuilderInterface> m_externalCapabilitiesBuilder;
+
+    /// Optional object used to build @c ChannelVolumeInterface in the SDK.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface> m_channelVolumeFactory;
+
+    /// Whether to start scheduling alerts after client initialization. If this is set to false, no alert scheduling
+    /// will occur until onSystemClockSynchronized is called.
+    bool m_startAlertSchedulingOnInitialization;
+
+    /// Object used to instantiate @c MessageRouter in the SDK.
+    std::shared_ptr<alexaClientSDK::acl::MessageRouterFactoryInterface> m_messageRouterFactory;
+
+    /// An optional object that applications may provide to specify external handling of the @c ExpectSpeech directive's
+    /// timeout. If provided, this function must remain valid for the lifetime of the @c AudioInputProcessor.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExpectSpeechTimeoutHandlerInterface>
+        m_expectSpeechTimeoutHandler;
+
+    /// Optional object used in the first interaction started from the alexa voice service
+    alexaClientSDK::capabilityAgents::aip::AudioProvider m_firstInteractionAudioProvider =
+        alexaClientSDK::capabilityAgents::aip::AudioProvider::null();
+
+    /// Optional Encryption facilities factory.
+    std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface> m_cryptoFactory;
+
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+    /// The media player to play Comms calling audio.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_commsMediaPlayer;
+
+    /// The speaker to control volume of Comms calling audio.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> m_commsSpeaker;
+
+    /// The stream to use which has the audio from microphone.
+    std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream> m_sharedDataStream;
+#endif
+
+#ifdef ENABLE_PCC
+    /// The speaker to control volume of phone audio.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> m_phoneSpeaker;
+
+    /// The calling functions available on a calling device
+    std::shared_ptr<phoneCallControllerInterfaces::phone::PhoneCallerInterface> m_phoneCaller;
+#endif
+
+#ifdef ENABLE_MCC
+    /// The speaker to control volume of meeting audio.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> m_meetingSpeaker;
+
+    /// The meeting functions available on a meeting device
+    std::shared_ptr<meetingClientControllerInterfaces::meeting::MeetingClientInterface> m_meetingClient;
+
+    /// The calendar functions available on a calendar device
+    std::shared_ptr<meetingClientControllerInterfaces::calendar::CalendarClientInterface> m_calendarClient;
+#endif
+};
+}  // namespace defaultClient
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_APPLICATIONUTILITIES_DEFAULTCLIENT_INCLUDE_DEFAULTCLIENT_DEFAULTCLIENTBUILDER_H_
diff --git a/ApplicationUtilities/DefaultClient/include/DefaultClient/DefaultClientComponent.h b/ApplicationUtilities/DefaultClient/include/DefaultClient/DefaultClientComponent.h
index 0673c3c6c6..cbf15164d2 100644
--- a/ApplicationUtilities/DefaultClient/include/DefaultClient/DefaultClientComponent.h
+++ b/ApplicationUtilities/DefaultClient/include/DefaultClient/DefaultClientComponent.h
@@ -18,6 +18,7 @@
 
 #include <memory>
 
+#include <acsdk/AudioEncoderInterfaces/AudioEncoderInterface.h>
 #include <ACL/Transport/MessageRouterFactoryInterface.h>
 #include <acsdkAlerts/Storage/AlertStorageInterface.h>
 #include <acsdkAlertsInterfaces/AlertsCapabilityAgentInterface.h>
@@ -34,6 +35,7 @@
 #include <acsdkNotificationsInterfaces/NotificationsStorageInterface.h>
 #include <acsdkStartupManagerInterfaces/StartupManagerInterface.h>
 #include <acsdkSystemClockMonitorInterfaces/SystemClockMonitorInterface.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
 #include <Alexa/AlexaInterfaceMessageSender.h>
 #include <AVSCommon/AVS/DialogUXStateAggregator.h>
 #include <AVSCommon/SDKInterfaces/AudioFocusAnnotation.h>
@@ -57,7 +59,6 @@
 #include <AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceManagerInterface.h>
 #include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
 #include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
-#include <AVSCommon/SDKInterfaces/VisualFocusAnnotation.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
 #include <AVSCommon/Utils/DeviceInfo.h>
 #include <Captions/CaptionManagerInterface.h>
@@ -68,7 +69,6 @@
 #include <RegistrationManager/CustomerDataManagerInterface.h>
 #include <RegistrationManager/RegistrationManagerInterface.h>
 #include <RegistrationManager/RegistrationNotifierInterface.h>
-#include <SpeechEncoder/SpeechEncoder.h>
 
 #include "DefaultClient/EqualizerRuntimeSetup.h"
 #include "DefaultClient/StubApplicationAudioPipelineFactory.h"
@@ -108,8 +108,6 @@ using DefaultClientComponent = acsdkManufactory::Component<
     std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>,
     acsdkManufactory::
         Annotated<avsCommon::sdkInterfaces::AudioFocusAnnotation, avsCommon::sdkInterfaces::FocusManagerInterface>,
-    acsdkManufactory::
-        Annotated<avsCommon::sdkInterfaces::VisualFocusAnnotation, avsCommon::sdkInterfaces::FocusManagerInterface>,
     std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>,
     std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>,
     std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>,
@@ -139,8 +137,9 @@ using DefaultClientComponent = acsdkManufactory::Component<
     std::shared_ptr<registrationManager::RegistrationNotifierInterface>,
     std::shared_ptr<settings::DeviceSettingsManager>,
     std::shared_ptr<settings::storage::DeviceSettingStorageInterface>,
-    std::shared_ptr<speechencoder::SpeechEncoder>,
-    std::shared_ptr<acsdkDeviceSetupInterfaces::DeviceSetupInterface>>;
+    std::shared_ptr<audioEncoderInterfaces::AudioEncoderInterface>,
+    std::shared_ptr<acsdkDeviceSetupInterfaces::DeviceSetupInterface>,
+    std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>>;
 
 /**
  * Get the manufactory @c Component for (legacy) @c DefaultClient initialization.
@@ -179,7 +178,8 @@ DefaultClientComponent getComponent(
     const std::shared_ptr<acsdkBluetoothInterfaces::BluetoothStorageInterface>& bluetoothStorage,
     const std::shared_ptr<acsdkBluetoothInterfaces::BluetoothDeviceConnectionRulesProviderInterface>&
         bluetoothConnectionRulesProvider,
-    const std::shared_ptr<acsdkNotificationsInterfaces::NotificationsStorageInterface>& notificationsStorage);
+    const std::shared_ptr<acsdkNotificationsInterfaces::NotificationsStorageInterface>& notificationsStorage,
+    const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory);
 
 }  // namespace defaultClient
 }  // namespace alexaClientSDK
diff --git a/ApplicationUtilities/DefaultClient/include/DefaultClient/ExternalCapabilitiesBuilderInterface.h b/ApplicationUtilities/DefaultClient/include/DefaultClient/ExternalCapabilitiesBuilderInterface.h
index 615a48c9dd..1eb9a849a6 100644
--- a/ApplicationUtilities/DefaultClient/include/DefaultClient/ExternalCapabilitiesBuilderInterface.h
+++ b/ApplicationUtilities/DefaultClient/include/DefaultClient/ExternalCapabilitiesBuilderInterface.h
@@ -38,15 +38,15 @@
 #include <AVSCommon/SDKInterfaces/SpeakerManagerInterface.h>
 #include <AVSCommon/SDKInterfaces/UserInactivityMonitorInterface.h>
 #include <AVSCommon/Utils/MediaPlayer/MediaPlayerInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
 #include <AVSCommon/Utils/Optional.h>
 #include <AVSCommon/Utils/RequiresShutdown.h>
 #include <CertifiedSender/CertifiedSender.h>
 #include <RegistrationManager/CustomerDataManagerInterface.h>
 #include <Settings/Storage/DeviceSettingStorageInterface.h>
 #include <SoftwareComponentReporter/SoftwareComponentReporterCapabilityAgent.h>
-#include <SpeakerManager/DefaultChannelVolumeFactory.h>
 #include <System/ReportStateHandler.h>
-#include <TemplateRuntime/TemplateRuntime.h>
+#include <acsdk/TemplateRuntimeInterfaces/TemplateRuntimeInterface.h>
 
 namespace alexaClientSDK {
 namespace defaultClient {
@@ -78,17 +78,6 @@ class ExternalCapabilitiesBuilderInterface {
      */
     virtual ~ExternalCapabilitiesBuilderInterface() = default;
 
-    /**
-     * This method sets the focus manager responsible for visual interactions.
-     *
-     * This method will only get called if GUI support has been enabled.
-     *
-     * @param visualFocusManager The focus manager object.
-     * @return A reference to this builder to allow nested function calls.
-     */
-    virtual ExternalCapabilitiesBuilderInterface& withVisualFocusManager(
-        std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> visualFocusManager) = 0;
-
     /**
      * This method sets the storage using for setting.
      *
@@ -107,7 +96,7 @@ class ExternalCapabilitiesBuilderInterface {
      * @param templateRuntime The TemplateRuntime object.
      */
     virtual ExternalCapabilitiesBuilderInterface& withTemplateRunTime(
-        std::shared_ptr<capabilityAgents::templateRuntime::TemplateRuntime> templateRuntime) = 0;
+        std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeInterface> templateRuntime) = 0;
 
     /**
      * Get the CallManager reference.
@@ -124,6 +113,15 @@ class ExternalCapabilitiesBuilderInterface {
     virtual ExternalCapabilitiesBuilderInterface& withInternetConnectionMonitor(
         std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface> internetConnectionMonitor) = 0;
 
+    /**
+     * This method sets the Alexa Interface Message Sender to send Alexa Interface response events.
+     *
+     * @param alexaMessageSender The AlexaInterfaceMessageSenderInterface object.
+     */
+    virtual ExternalCapabilitiesBuilderInterface& withAlexaInterfaceMessageSender(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>
+            alexaMessageSender) = 0;
+
     /**
      * This method sets the DialogUXStateAggregator for CallManager.
      *
@@ -161,6 +159,7 @@ class ExternalCapabilitiesBuilderInterface {
      * @param softwareComponentReporter Object to report adapters' versions.
      * @param playbackRouter Object to route local playback control command.
      * @param endpointRegistrationManager Object to manage endpoints.
+     * @param metricRecorder Object to manage AVS SDK metric reporting.
      * @return A list with all capabilities as well as objects that require explicit shutdown. Shutdown will be
      * performed in the reverse order of occurrence.
      */
@@ -192,7 +191,8 @@ class ExternalCapabilitiesBuilderInterface {
         std::shared_ptr<avsCommon::sdkInterfaces::ComponentReporterInterface> softwareComponentReporter,
         std::shared_ptr<avsCommon::sdkInterfaces::PlaybackRouterInterface> playbackRouter,
         std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>
-            endpointRegistrationManager) = 0;
+            endpointRegistrationManager,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) = 0;
 };
 
 }  // namespace defaultClient
diff --git a/ApplicationUtilities/DefaultClient/src/CMakeLists.txt b/ApplicationUtilities/DefaultClient/src/CMakeLists.txt
index 3ff7530960..27f8d654dd 100644
--- a/ApplicationUtilities/DefaultClient/src/CMakeLists.txt
+++ b/ApplicationUtilities/DefaultClient/src/CMakeLists.txt
@@ -4,6 +4,7 @@ add_definitions("-DACSDK_LOG_MODULE=defaultClient")
 add_library(DefaultClient
     ConnectionRetryTrigger.cpp
     DefaultClient.cpp
+    DefaultClientBuilder.cpp
     DefaultClientComponent.cpp
     EqualizerRuntimeSetup.cpp
     StubApplicationAudioPipelineFactory.cpp
@@ -15,8 +16,7 @@ target_include_directories(DefaultClient PUBLIC
     "${Endpoints_SOURCE_DIR}/include")
 
 if(BLUETOOTH_BLUEZ)
-    target_link_libraries(DefaultClient
-        BluetoothImplementationsBlueZ)
+    target_link_libraries(DefaultClient BluetoothImplementationsBlueZ)
 endif()
 
 target_link_libraries(DefaultClient
@@ -47,31 +47,34 @@ target_link_libraries(DefaultClient
     RegistrationManager
     SDKComponent
     SoftwareComponentReporter
-    SpeakerManager
     SpeechSynthesizer
     SystemSoundPlayer
-    TemplateRuntime
     acsdkAlerts
     acsdkAlertsInterfaces
+    acsdkAudioEncoderInterfaces
     acsdkAudioPlayer
     acsdkBluetooth
     acsdkBluetoothInterfaces
     acsdkEqualizer
     acsdkExternalMediaPlayer
     acsdkInteractionModel
+    acsdkSDKClient
     acsdkStartupManagerInterfaces
     acsdkSystemClockMonitorInterfaces
     acsdkDeviceSetup
     acsdkDeviceSetupInterfaces
     acsdkAuthorization
-    acsdkAuthorizationInterfaces)
+    acsdkAuthorizationInterfaces
+    acsdkSpeakerManagerComponent
+    acsdkTemplateRuntime
+    acsdkTemplateRuntimeInterfaces)
 
 if (CAPTIONS)
     target_link_libraries(DefaultClient CaptionsLib)
 endif()
 
 if (PCC)
-    target_link_libraries(DefaultClient PhoneCallController)
+    target_link_libraries(DefaultClient acsdkPhoneCallController)
 endif()
 
 if (MC)
@@ -82,7 +85,7 @@ if (MC)
 endif()
 
 if (MCC)
-    target_link_libraries(DefaultClient MeetingClientController)
+    target_link_libraries(DefaultClient acsdkMeetingClientController)
 endif()
 
 if (METRICS)
@@ -90,9 +93,5 @@ if (METRICS)
     target_link_libraries(DefaultClient MetricRecorder)
 endif()
 
-if (OPUS)
-    target_link_libraries(DefaultClient OpusEncoderContext)
-endif()
-
 # install target
 asdk_install()
diff --git a/ApplicationUtilities/DefaultClient/src/ConnectionRetryTrigger.cpp b/ApplicationUtilities/DefaultClient/src/ConnectionRetryTrigger.cpp
index 6c2e7fa383..ef9f3852fc 100644
--- a/ApplicationUtilities/DefaultClient/src/ConnectionRetryTrigger.cpp
+++ b/ApplicationUtilities/DefaultClient/src/ConnectionRetryTrigger.cpp
@@ -23,7 +23,7 @@ namespace defaultClient {
 using namespace alexaClientSDK::avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ConnectionRetryTrigger");
+#define TAG "ConnectionRetryTrigger"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ApplicationUtilities/DefaultClient/src/DefaultClient.cpp b/ApplicationUtilities/DefaultClient/src/DefaultClient.cpp
index e377a10f05..36f3562997 100644
--- a/ApplicationUtilities/DefaultClient/src/DefaultClient.cpp
+++ b/ApplicationUtilities/DefaultClient/src/DefaultClient.cpp
@@ -16,6 +16,8 @@
 #include <acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterConstants.h>
 #include <acsdkNotifications/NotificationRenderer.h>
 #include <acsdkSystemClockMonitorInterfaces/SystemClockMonitorObserverInterface.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+#include <acsdk/TemplateRuntime/TemplateRuntimeFactory.h>
 #include <ADSL/MessageInterpreter.h>
 #include <AVSCommon/AVS/Attachment/AttachmentManager.h>
 #include <AVSCommon/AVS/CapabilityChangeNotifier.h>
@@ -38,17 +40,6 @@
 #include <acsdkBluetooth/Bluetooth.h>
 #include <acsdkBluetooth/DeviceConnectionRulesAdapter.h>
 
-#ifdef ENABLE_PCC
-#include <AVSCommon/SDKInterfaces/Phone/PhoneCallerInterface.h>
-#include <PhoneCallController/PhoneCallController.h>
-#endif
-
-#ifdef ENABLE_MCC
-#include <AVSCommon/SDKInterfaces/Calendar/CalendarClientInterface.h>
-#include <AVSCommon/SDKInterfaces/Meeting/MeetingClientInterface.h>
-#include <MeetingClientController/MeetingClientController.h>
-#endif
-
 #include "DefaultClient/DefaultClient.h"
 #include "DefaultClient/DefaultClientComponent.h"
 #include "DefaultClient/StubApplicationAudioPipelineFactory.h"
@@ -67,7 +58,7 @@ using namespace alexaClientSDK::avsCommon::sdkInterfaces;
 using namespace alexaClientSDK::avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DefaultClient");
+#define TAG "DefaultClient"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -85,12 +76,12 @@ std::unique_ptr<DefaultClient> DefaultClient::create(
         std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>> additionalSpeakers,
 #ifdef ENABLE_PCC
     std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> phoneSpeaker,
-    std::shared_ptr<avsCommon::sdkInterfaces::phone::PhoneCallerInterface> phoneCaller,
+    std::shared_ptr<phoneCallControllerInterfaces::phone::PhoneCallerInterface> phoneCaller,
 #endif
 #ifdef ENABLE_MCC
     std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> meetingSpeaker,
-    std::shared_ptr<avsCommon::sdkInterfaces::meeting::MeetingClientInterface> meetingClient,
-    std::shared_ptr<avsCommon::sdkInterfaces::calendar::CalendarClientInterface> calendarClient,
+    std::shared_ptr<meetingClientControllerInterfaces::meeting::MeetingClientInterface> meetingClient,
+    std::shared_ptr<meetingClientControllerInterfaces::calendar::CalendarClientInterface> calendarClient,
 #endif
 #ifdef ENABLE_COMMS_AUDIO_PROXY
     std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
@@ -107,7 +98,8 @@ std::unique_ptr<DefaultClient> DefaultClient::create(
     std::shared_ptr<avsCommon::sdkInterfaces::SoftwareInfoSenderObserverInterface> softwareInfoSenderObserver,
     std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics,
     const std::shared_ptr<ExternalCapabilitiesBuilderInterface>& externalCapabilitiesBuilder,
-    capabilityAgents::aip::AudioProvider firstInteractionAudioProvider) {
+    capabilityAgents::aip::AudioProvider firstInteractionAudioProvider,
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
     std::unique_ptr<DefaultClient> defaultClient(new DefaultClient());
     if (!defaultClient->initialize(
             manufactory,
@@ -136,7 +128,12 @@ std::unique_ptr<DefaultClient> DefaultClient::create(
             softwareInfoSenderObserver,
             diagnostics,
             externalCapabilitiesBuilder,
-            firstInteractionAudioProvider)) {
+            firstInteractionAudioProvider,
+            sdkClientRegistry)) {
+        auto shutdownManager = defaultClient->getShutdownManager();
+        if (shutdownManager) {
+            shutdownManager->shutdown();
+        }
         return nullptr;
     }
     return defaultClient;
@@ -169,12 +166,12 @@ std::unique_ptr<DefaultClient> DefaultClient::create(
         std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>> additionalSpeakers,
 #ifdef ENABLE_PCC
     std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> phoneSpeaker,
-    std::shared_ptr<avsCommon::sdkInterfaces::phone::PhoneCallerInterface> phoneCaller,
+    std::shared_ptr<phoneCallControllerInterfaces::phone::PhoneCallerInterface> phoneCaller,
 #endif
 #ifdef ENABLE_MCC
     std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> meetingSpeaker,
-    std::shared_ptr<avsCommon::sdkInterfaces::meeting::MeetingClientInterface> meetingClient,
-    std::shared_ptr<avsCommon::sdkInterfaces::calendar::CalendarClientInterface> calendarClient,
+    std::shared_ptr<meetingClientControllerInterfaces::meeting::MeetingClientInterface> meetingClient,
+    std::shared_ptr<meetingClientControllerInterfaces::calendar::CalendarClientInterface> calendarClient,
 #endif
 #ifdef ENABLE_COMMS_AUDIO_PROXY
     std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
@@ -216,7 +213,9 @@ std::unique_ptr<DefaultClient> DefaultClient::create(
     bool startAlertSchedulingOnInitialization,
     std::shared_ptr<alexaClientSDK::acl::MessageRouterFactoryInterface> messageRouterFactory,
     const std::shared_ptr<avsCommon::sdkInterfaces::ExpectSpeechTimeoutHandlerInterface>& expectSpeechTimeoutHandler,
-    capabilityAgents::aip::AudioProvider firstInteractionAudioProvider) {
+    capabilityAgents::aip::AudioProvider firstInteractionAudioProvider,
+    const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
 
     if (!equalizerRuntimeSetup) {
         equalizerRuntimeSetup = std::make_shared<defaultClient::EqualizerRuntimeSetup>(false);
@@ -304,7 +303,8 @@ std::unique_ptr<DefaultClient> DefaultClient::create(
         std::move(bluetoothDeviceManager),
         std::move(bluetoothStorage),
         bluetoothConnectionRulesProvider,
-        std::move(notificationsStorage));
+        std::move(notificationsStorage),
+        cryptoFactory);
     auto manufactory = DefaultClientManufactory::create(component);
 
     auto speakerManager = manufactory->get<std::shared_ptr<SpeakerManagerInterface>>();
@@ -350,7 +350,8 @@ std::unique_ptr<DefaultClient> DefaultClient::create(
         softwareInfoSenderObserver,
         diagnostics,
         externalCapabilitiesBuilder,
-        firstInteractionAudioProvider);
+        firstInteractionAudioProvider,
+        sdkClientRegistry);
 }
 
 bool DefaultClient::initialize(
@@ -362,12 +363,12 @@ bool DefaultClient::initialize(
         std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>> additionalSpeakers,
 #ifdef ENABLE_PCC
     std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> phoneSpeaker,
-    std::shared_ptr<avsCommon::sdkInterfaces::phone::PhoneCallerInterface> phoneCaller,
+    std::shared_ptr<phoneCallControllerInterfaces::phone::PhoneCallerInterface> phoneCaller,
 #endif
 #ifdef ENABLE_MCC
     std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> meetingSpeaker,
-    std::shared_ptr<avsCommon::sdkInterfaces::meeting::MeetingClientInterface> meetingClient,
-    std::shared_ptr<avsCommon::sdkInterfaces::calendar::CalendarClientInterface> calendarClient,
+    std::shared_ptr<meetingClientControllerInterfaces::meeting::MeetingClientInterface> meetingClient,
+    std::shared_ptr<meetingClientControllerInterfaces::calendar::CalendarClientInterface> calendarClient,
 #endif
 #ifdef ENABLE_COMMS_AUDIO_PROXY
     std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
@@ -384,7 +385,15 @@ bool DefaultClient::initialize(
     std::shared_ptr<avsCommon::sdkInterfaces::SoftwareInfoSenderObserverInterface> softwareInfoSenderObserver,
     std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics,
     const std::shared_ptr<ExternalCapabilitiesBuilderInterface>& externalCapabilitiesBuilder,
-    capabilityAgents::aip::AudioProvider firstInteractionAudioProvider) {
+    capabilityAgents::aip::AudioProvider firstInteractionAudioProvider,
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+
+    m_shutdownManager = manufactory->get<std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface>>();
+    if (!m_shutdownManager) {
+        ACSDK_ERROR(LX("initializeFailed").m("Failed to get ShutdownManager!"));
+        return false;
+    }
+
     if (!ringtoneMediaPlayer) {
         ACSDK_ERROR(LX("initializeFailed").d("reason", "nullRingtoneMediaPlayer"));
         return false;
@@ -475,13 +484,13 @@ bool DefaultClient::initialize(
     m_internetConnectionMonitor =
         manufactory->get<std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>>();
     if (!m_internetConnectionMonitor) {
-        ACSDK_ERROR(LX("initializeFailed").d("reason", "nullConnectionManager"));
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "nullInternetConnectionMonitor"));
         return false;
     }
 
     m_connectionManager = manufactory->get<std::shared_ptr<avsCommon::sdkInterfaces::AVSConnectionManagerInterface>>();
     if (!m_connectionManager) {
-        ACSDK_ERROR(LX("initializeFailed").d("reason", "nullDefaultEndpointBuilder"));
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "nullConnectionManager"));
         return false;
     }
 
@@ -522,6 +531,10 @@ bool DefaultClient::initialize(
         ACSDK_ERROR(LX("initializeFailed").d("reason", "nullAlexaMessageSender"));
         return false;
     }
+    if (externalCapabilitiesBuilder) {
+        ACSDK_INFO(LX(__FUNCTION__).m("Supply m_alexaMessageSender to externalCapabilitiesBuilder"));
+        externalCapabilitiesBuilder->withAlexaInterfaceMessageSender(m_alexaMessageSender);
+    }
 
     m_speakerManager = manufactory->get<std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface>>();
     if (!m_speakerManager) {
@@ -569,12 +582,6 @@ bool DefaultClient::initialize(
         return false;
     }
 
-    m_shutdownManager = manufactory->get<std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface>>();
-    if (!m_shutdownManager) {
-        ACSDK_ERROR(LX("initializeFailed").m("Failed to get ShutdownManager!"));
-        return false;
-    }
-
     m_certifiedSender = manufactory->get<std::shared_ptr<certifiedSender::CertifiedSender>>();
     if (!m_certifiedSender) {
         ACSDK_ERROR(LX("initializeFailed").d("reason", "nullCertifiedSender"));
@@ -740,7 +747,7 @@ bool DefaultClient::initialize(
         speechConfirmationSetting,
         capabilityChangeNotifier,
         wakeWordsSetting,
-        manufactory->get<std::shared_ptr<speechencoder::SpeechEncoder>>(),
+        manufactory->get<std::shared_ptr<audioEncoderInterfaces::AudioEncoderInterface>>(),
         firstInteractionAudioProvider,
         powerResourceManager,
         metricRecorder,
@@ -832,7 +839,7 @@ bool DefaultClient::initialize(
      * that implements the
      * PhoneCallController interface of AVS
      */
-    m_phoneCallControllerCapabilityAgent = capabilityAgents::phoneCallController::PhoneCallController::create(
+    m_phoneCallControllerCapabilityAgent = phoneCallController::PhoneCallController::create(
         m_contextManager, m_connectionManager, phoneCaller, phoneSpeaker, m_audioFocusManager, m_exceptionSender);
     if (!m_phoneCallControllerCapabilityAgent) {
         ACSDK_ERROR(LX("initializeFailed").d("reason", "unableToCreatePhoneCallControllerCapabilityAgent"));
@@ -844,23 +851,20 @@ bool DefaultClient::initialize(
      * Creating the MeetingClientController - This component is the Capability Agent that implements the
      * MeetingClientController interface of AVS
      */
-    m_meetingClientControllerCapabilityAgent =
-        capabilityAgents::meetingClientController::MeetingClientController::create(
-            m_contextManager,
-            m_connectionManager,
-            meetingClient,
-            calendarClient,
-            m_speakerManager,
-            m_audioFocusManager,
-            m_exceptionSender);
+    m_meetingClientControllerCapabilityAgent = meetingClientController::MeetingClientController::create(
+        m_contextManager,
+        m_connectionManager,
+        meetingClient,
+        calendarClient,
+        m_speakerManager,
+        m_audioFocusManager,
+        m_exceptionSender);
     if (!m_meetingClientControllerCapabilityAgent) {
         ACSDK_ERROR(LX("initializeFailed").d("reason", "unableToCreateMeetingClientControllerCapabilityAgent"));
     }
 #endif
 
     if (isGuiSupported) {
-        m_visualFocusManager = manufactory->get<
-            acsdkManufactory::Annotated<avsCommon::sdkInterfaces::VisualFocusAnnotation, FocusManagerInterface>>();
         auto renderPlayerInfoCardsProviderRegistrar =
             manufactory
                 ->get<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface>>();
@@ -874,13 +878,14 @@ bool DefaultClient::initialize(
          * Capability Agent that implements the
          * TemplateRuntime interface of AVS.
          */
-        m_templateRuntime = capabilityAgents::templateRuntime::TemplateRuntime::createTemplateRuntime(
-            renderPlayerInfoCardsProviderRegistrar, m_visualFocusManager, m_exceptionSender);
-        if (!m_templateRuntime) {
+        auto templateRuntimeData = templateRuntime::TemplateRuntimeFactory::create(
+            renderPlayerInfoCardsProviderRegistrar, m_exceptionSender, m_defaultEndpointBuilder);
+        if (!templateRuntimeData.hasValue()) {
             ACSDK_ERROR(LX("initializeFailed").d("reason", "unableToCreateTemplateRuntimeCapabilityAgent"));
             return false;
         }
-        m_dialogUXStateAggregator->addObserver(m_templateRuntime);
+        m_templateRuntime = templateRuntimeData.value().templateRuntime;
+        m_shutdownObjects.push_back(templateRuntimeData.value().requiresShutdown);
         if (externalCapabilitiesBuilder) {
             externalCapabilitiesBuilder->withTemplateRunTime(m_templateRuntime);
         }
@@ -1059,10 +1064,6 @@ bool DefaultClient::initialize(
     }
 #endif
 
-    if (isGuiSupported) {
-        m_defaultEndpointBuilder->withCapability(m_templateRuntime, m_templateRuntime);
-    }
-
     if (m_equalizerCapabilityAgent) {
         m_defaultEndpointBuilder->withCapability(m_equalizerCapabilityAgent, m_equalizerCapabilityAgent);
     }
@@ -1111,7 +1112,8 @@ bool DefaultClient::initialize(
             powerResourceManager,
             m_softwareReporterCapabilityAgent,
             m_playbackRouter,
-            m_endpointRegistrationManager);
+            m_endpointRegistrationManager,
+            metricRecorder);
         for (auto& capability : externalCapabilities.first) {
             if (capability.configuration.hasValue()) {
                 m_defaultEndpointBuilder->withCapability(capability.configuration.value(), capability.directiveHandler);
@@ -1150,6 +1152,29 @@ bool DefaultClient::initialize(
     }
 
     m_defaultEndpointBuilder->withCapabilityConfiguration(m_softwareReporterCapabilityAgent);
+
+    if (sdkClientRegistry) {
+        sdkClientRegistry->registerComponent(m_defaultEndpointBuilder);
+        sdkClientRegistry->registerComponent(m_connectionManager);
+        sdkClientRegistry->registerComponent(m_exceptionSender);
+        sdkClientRegistry->registerComponent(m_certifiedSender);
+        sdkClientRegistry->registerComponent(m_audioFocusManager);
+        sdkClientRegistry->registerComponent(customerDataManager);
+        sdkClientRegistry->registerComponent(reportStateHandler);
+        sdkClientRegistry->registerComponent(m_audioInputProcessor);
+        sdkClientRegistry->registerComponent(m_speakerManager);
+        sdkClientRegistry->registerComponent(m_directiveSequencer);
+        sdkClientRegistry->registerComponent(userInactivityMonitor);
+        sdkClientRegistry->registerComponent(m_contextManager);
+        sdkClientRegistry->registerComponent(m_avsGatewayManager);
+        sdkClientRegistry->registerComponent(audioFactory);
+        sdkClientRegistry->registerComponent(powerResourceManager);
+        sdkClientRegistry->registerComponent(m_softwareReporterCapabilityAgent);
+        sdkClientRegistry->registerComponent(m_playbackRouter);
+        sdkClientRegistry->registerComponent(m_endpointRegistrationManager);
+        sdkClientRegistry->registerComponent(metricRecorder);
+        sdkClientRegistry->registerComponent(m_alexaMessageSender);
+    }
     return true;
 }
 
@@ -1265,7 +1290,7 @@ void DefaultClient::removeAudioPlayerObserver(
 }
 
 void DefaultClient::addTemplateRuntimeObserver(
-    std::shared_ptr<avsCommon::sdkInterfaces::TemplateRuntimeObserverInterface> observer) {
+    std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeObserverInterface> observer) {
     if (!m_templateRuntime) {
         ACSDK_ERROR(LX("addTemplateRuntimeObserverFailed").d("reason", "guiNotSupported"));
         return;
@@ -1274,7 +1299,7 @@ void DefaultClient::addTemplateRuntimeObserver(
 }
 
 void DefaultClient::removeTemplateRuntimeObserver(
-    std::shared_ptr<avsCommon::sdkInterfaces::TemplateRuntimeObserverInterface> observer) {
+    std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeObserverInterface> observer) {
     if (!m_templateRuntime) {
         ACSDK_ERROR(LX("removeTemplateRuntimeObserverFailed").d("reason", "guiNotSupported"));
         return;
@@ -1282,14 +1307,6 @@ void DefaultClient::removeTemplateRuntimeObserver(
     m_templateRuntime->removeObserver(observer);
 }
 
-void DefaultClient::TemplateRuntimeDisplayCardCleared() {
-    if (!m_templateRuntime) {
-        ACSDK_ERROR(LX("TemplateRuntimeDisplayCardClearedFailed").d("reason", "guiNotSupported"));
-        return;
-    }
-    m_templateRuntime->displayCardCleared();
-}
-
 void DefaultClient::addNotificationsObserver(
     std::shared_ptr<acsdkNotificationsInterfaces::NotificationsObserverInterface> observer) {
     m_notificationsNotifier->addObserver(observer);
@@ -1690,6 +1707,31 @@ std::shared_ptr<acsdkBluetoothInterfaces::BluetoothLocalInterface> DefaultClient
 }
 
 DefaultClient::~DefaultClient() {
+    shutdown();
+}
+
+bool DefaultClient::setEncodingAudioFormat(AudioFormat::Encoding encoding) {
+    return m_audioInputProcessor->setEncodingAudioFormat(encoding);
+}
+
+capabilityAgents::aip::AudioInputProcessor::EncodingFormatResponse DefaultClient::requestEncodingAudioFormats(
+    const capabilityAgents::aip::AudioInputProcessor::EncodingFormatRequest& encodings) {
+    return m_audioInputProcessor->requestEncodingAudioFormats(encodings);
+}
+
+bool DefaultClient::configure(const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    return true;
+}
+
+DefaultClient::DefaultClient() : FeatureClientInterface(TAG) {
+}
+
+void DefaultClient::doShutdown() {
+    if (m_shutdownManager) {
+        m_shutdownManager->shutdown();
+        m_shutdownManager.reset();
+    }
+
     while (!m_shutdownObjects.empty()) {
         if (m_shutdownObjects.back()) {
             m_shutdownObjects.back()->shutdown();
@@ -1701,10 +1743,6 @@ DefaultClient::~DefaultClient() {
         ACSDK_DEBUG5(LX("EndpointRegistrationManagerShutdown"));
         m_endpointRegistrationManager->shutdown();
     }
-    if (m_templateRuntime) {
-        ACSDK_DEBUG5(LX("TemplateRuntimeShutdown"));
-        m_templateRuntime->shutdown();
-    }
     if (m_audioInputProcessor) {
         ACSDK_DEBUG5(LX("AIPShutdown"));
         removeInternetConnectionObserver(m_audioInputProcessor);
@@ -1774,13 +1812,15 @@ DefaultClient::~DefaultClient() {
     }
 }
 
-bool DefaultClient::setEncodingAudioFormat(AudioFormat::Encoding encoding) {
-    return m_audioInputProcessor->setEncodingAudioFormat(encoding);
+void DefaultClient::stopInteraction() {
+    if (m_audioInputProcessor) {
+        m_audioInputProcessor->resetState();
+    }
 }
 
-capabilityAgents::aip::AudioInputProcessor::EncodingFormatResponse DefaultClient::requestEncodingAudioFormats(
-    const capabilityAgents::aip::AudioInputProcessor::EncodingFormatRequest& encodings) {
-    return m_audioInputProcessor->requestEncodingAudioFormats(encodings);
+std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> DefaultClient::getAudioFocusManager() {
+    return m_audioFocusManager;
 }
+
 }  // namespace defaultClient
 }  // namespace alexaClientSDK
diff --git a/ApplicationUtilities/DefaultClient/src/DefaultClientBuilder.cpp b/ApplicationUtilities/DefaultClient/src/DefaultClientBuilder.cpp
new file mode 100644
index 0000000000..ba1e5d7326
--- /dev/null
+++ b/ApplicationUtilities/DefaultClient/src/DefaultClientBuilder.cpp
@@ -0,0 +1,271 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "DefaultClient/DefaultClientBuilder.h"
+
+namespace alexaClientSDK {
+namespace defaultClient {
+/// String to identify log entries originating from this file.
+#define TAG "DefaultClientBuilder"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+// Friendly name for this builder component
+static const char DEFAULT_CLIENT_BUILDER_NAME[] = "DefaultClientBuilder";
+
+std::unique_ptr<DefaultClientBuilder> DefaultClientBuilder::create(
+    std::shared_ptr<avsCommon::utils::DeviceInfo> deviceInfo,
+    std::shared_ptr<registrationManager::CustomerDataManagerInterface> customerDataManager,
+    std::unordered_map<std::string, std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface>>
+        externalMusicProviderMediaPlayers,
+    std::unordered_map<std::string, std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>>
+        externalMusicProviderSpeakers,
+    acsdkExternalMediaPlayer::ExternalMediaPlayer::AdapterCreationMap adapterCreationMap,
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> speakMediaPlayer,
+    std::unique_ptr<avsCommon::utils::mediaPlayer::MediaPlayerFactoryInterface> audioMediaPlayerFactory,
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> alertsMediaPlayer,
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> notificationsMediaPlayer,
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> bluetoothMediaPlayer,
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> ringtoneMediaPlayer,
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> systemSoundMediaPlayer,
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> speakSpeaker,
+    std::vector<std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>> audioSpeakers,
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> alertsSpeaker,
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> notificationsSpeaker,
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> bluetoothSpeaker,
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> ringtoneSpeaker,
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> systemSoundSpeaker,
+    std::multimap<
+        avsCommon::sdkInterfaces::ChannelVolumeInterface::Type,
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>> additionalSpeakers,
+#ifdef ENABLE_PCC
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> phoneSpeaker,
+    std::shared_ptr<phoneCallControllerInterfaces::phone::PhoneCallerInterface> phoneCaller,
+#endif
+#ifdef ENABLE_MCC
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> meetingSpeaker,
+    std::shared_ptr<meetingClientControllerInterfaces::meeting::MeetingClientInterface> meetingClient,
+    std::shared_ptr<meetingClientControllerInterfaces::calendar::CalendarClientInterface> calendarClient,
+#endif
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> commsSpeaker,
+    std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream> sharedDataStream,
+#endif
+    std::shared_ptr<EqualizerRuntimeSetup> equalizerRuntimeSetup,
+    std::shared_ptr<avsCommon::sdkInterfaces::audio::AudioFactoryInterface> audioFactory,
+    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> authDelegate,
+    std::shared_ptr<acsdkAlerts::storage::AlertStorageInterface> alertStorage,
+    std::shared_ptr<certifiedSender::MessageStorageInterface> messageStorage,
+    std::shared_ptr<acsdkNotificationsInterfaces::NotificationsStorageInterface> notificationsStorage,
+    std::shared_ptr<settings::storage::DeviceSettingStorageInterface> deviceSettingStorage,
+    std::shared_ptr<acsdkBluetoothInterfaces::BluetoothStorageInterface> bluetoothStorage,
+    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage,
+    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::DialogUXStateObserverInterface>>
+        alexaDialogStateObservers,
+    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::ConnectionStatusObserverInterface>>
+        connectionObservers,
+    std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface> internetConnectionMonitor,
+    bool isGuiSupported,
+    std::shared_ptr<avsCommon::sdkInterfaces::CapabilitiesDelegateInterface> capabilitiesDelegate,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    std::shared_ptr<alexaClientSDK::acl::TransportFactoryInterface> transportFactory,
+    std::shared_ptr<avsCommon::sdkInterfaces::AVSGatewayManagerInterface> avsGatewayManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface> localeAssetsManager,
+    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceConnectionRuleInterface>>
+        enabledConnectionRules,
+    std::shared_ptr<avsCommon::sdkInterfaces::SystemTimeZoneInterface> systemTimezone,
+    avsCommon::sdkInterfaces::softwareInfo::FirmwareVersion firmwareVersion,
+    bool sendSoftwareInfoOnConnected,
+    std::shared_ptr<avsCommon::sdkInterfaces::SoftwareInfoSenderObserverInterface> softwareInfoSenderObserver,
+    std::unique_ptr<avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceManagerInterface> bluetoothDeviceManager,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+    std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface> powerResourceManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics,
+    std::shared_ptr<ExternalCapabilitiesBuilderInterface> externalCapabilitiesBuilder,
+    std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface> channelVolumeFactory,
+    bool startAlertSchedulingOnInitialization,
+    std::shared_ptr<alexaClientSDK::acl::MessageRouterFactoryInterface> messageRouterFactory,
+    std::shared_ptr<avsCommon::sdkInterfaces::ExpectSpeechTimeoutHandlerInterface> expectSpeechTimeoutHandler,
+    capabilityAgents::aip::AudioProvider firstInteractionAudioProvider,
+    std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface> cryptoFactory) {
+    auto builder = new DefaultClientBuilder();
+
+    builder->m_deviceInfo = std::move(deviceInfo);
+    builder->m_customerDataManager = std::move(customerDataManager);
+    builder->m_externalMusicProviderMediaPlayers = std::move(externalMusicProviderMediaPlayers);
+    builder->m_externalMusicProviderSpeakers = std::move(externalMusicProviderSpeakers);
+    builder->m_adapterCreationMap = std::move(adapterCreationMap);
+    builder->m_speakMediaPlayer = std::move(speakMediaPlayer);
+    builder->m_audioMediaPlayerFactory = std::move(audioMediaPlayerFactory);
+    builder->m_alertsMediaPlayer = std::move(alertsMediaPlayer);
+    builder->m_notificationsMediaPlayer = std::move(notificationsMediaPlayer);
+    builder->m_bluetoothMediaPlayer = std::move(bluetoothMediaPlayer);
+    builder->m_ringtoneMediaPlayer = std::move(ringtoneMediaPlayer);
+    builder->m_systemSoundMediaPlayer = std::move(systemSoundMediaPlayer);
+    builder->m_speakSpeaker = std::move(speakSpeaker);
+    builder->m_audioSpeakers = std::move(audioSpeakers);
+    builder->m_alertsSpeaker = std::move(alertsSpeaker);
+    builder->m_notificationsSpeaker = std::move(notificationsSpeaker);
+    builder->m_bluetoothSpeaker = std::move(bluetoothSpeaker);
+    builder->m_ringtoneSpeaker = std::move(ringtoneSpeaker);
+    builder->m_systemSoundSpeaker = std::move(systemSoundSpeaker);
+    builder->m_additionalSpeakers = std::move(additionalSpeakers);
+#ifdef ENABLE_PCC
+    builder->m_phoneSpeaker = std::move(phoneSpeaker);
+    builder->m_phoneCaller = std::move(phoneCaller);
+#endif
+#ifdef ENABLE_MCC
+    builder->m_meetingSpeaker = std::move(meetingSpeaker);
+    builder->m_meetingClient = std::move(meetingClient);
+    builder->m_calendarClient = std::move(calendarClient);
+#endif
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+    builder->m_commsMediaPlayer = std::move(commsMediaPlayer);
+    builder->m_commsSpeaker = std::move(commsSpeaker);
+    builder->m_sharedDataStream = std::move(sharedDataStream);
+#endif
+    builder->m_equalizerRuntimeSetup = std::move(equalizerRuntimeSetup);
+    builder->m_audioFactory = std::move(audioFactory);
+    builder->m_authDelegate = std::move(authDelegate);
+    builder->m_alertStorage = std::move(alertStorage);
+    builder->m_messageStorage = std::move(messageStorage);
+    builder->m_notificationsStorage = std::move(notificationsStorage);
+    builder->m_deviceSettingStorage = std::move(deviceSettingStorage);
+    builder->m_bluetoothStorage = std::move(bluetoothStorage);
+    builder->m_miscStorage = std::move(miscStorage);
+    builder->m_alexaDialogStateObservers = std::move(alexaDialogStateObservers);
+    builder->m_connectionObservers = std::move(connectionObservers);
+    builder->m_internetConnectionMonitor = std::move(internetConnectionMonitor);
+    builder->m_isGuiSupported = isGuiSupported;
+    builder->m_capabilitiesDelegate = std::move(capabilitiesDelegate);
+    builder->m_contextManager = std::move(contextManager);
+    builder->m_transportFactory = std::move(transportFactory);
+    builder->m_avsGatewayManager = std::move(avsGatewayManager);
+    builder->m_localeAssetsManager = std::move(localeAssetsManager);
+    builder->m_enabledConnectionRules = std::move(enabledConnectionRules);
+    builder->m_systemTimezone = std::move(systemTimezone);
+    builder->m_firmwareVersion = std::move(firmwareVersion);
+    builder->m_sendSoftwareInfoOnConnected = sendSoftwareInfoOnConnected;
+    builder->m_softwareInfoSenderObserver = std::move(softwareInfoSenderObserver);
+    builder->m_bluetoothDeviceManager = std::move(bluetoothDeviceManager);
+    builder->m_metricRecorder = std::move(metricRecorder);
+    builder->m_powerResourceManager = std::move(powerResourceManager);
+    builder->m_diagnostics = std::move(diagnostics);
+    builder->m_externalCapabilitiesBuilder = std::move(externalCapabilitiesBuilder);
+    builder->m_channelVolumeFactory = std::move(channelVolumeFactory);
+    builder->m_startAlertSchedulingOnInitialization = startAlertSchedulingOnInitialization;
+    builder->m_messageRouterFactory = std::move(messageRouterFactory);
+    builder->m_expectSpeechTimeoutHandler = std::move(expectSpeechTimeoutHandler);
+    builder->m_firstInteractionAudioProvider = std::move(firstInteractionAudioProvider);
+    builder->m_cryptoFactory = std::move(cryptoFactory);
+
+    return std::unique_ptr<DefaultClientBuilder>(builder);
+}
+
+DefaultClientBuilder::DefaultClientBuilder() : m_constructed(false) {
+}
+
+std::shared_ptr<DefaultClient> DefaultClientBuilder::construct(
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    if (m_constructed) {
+        ACSDK_ERROR(LX("constructFailed").d("reason", "Repeated call to construct()"));
+        return nullptr;
+    }
+
+    m_constructed = true;
+
+    return DefaultClient::create(
+        std::move(m_deviceInfo),
+        std::move(m_customerDataManager),
+        std::move(m_externalMusicProviderMediaPlayers),
+        std::move(m_externalMusicProviderSpeakers),
+        std::move(m_adapterCreationMap),
+        std::move(m_speakMediaPlayer),
+        std::move(m_audioMediaPlayerFactory),
+        std::move(m_alertsMediaPlayer),
+        std::move(m_notificationsMediaPlayer),
+        std::move(m_bluetoothMediaPlayer),
+        std::move(m_ringtoneMediaPlayer),
+        std::move(m_systemSoundMediaPlayer),
+        std::move(m_speakSpeaker),
+        std::move(m_audioSpeakers),
+        std::move(m_alertsSpeaker),
+        std::move(m_notificationsSpeaker),
+        std::move(m_bluetoothSpeaker),
+        std::move(m_ringtoneSpeaker),
+        std::move(m_systemSoundSpeaker),
+        std::move(m_additionalSpeakers),
+#ifdef ENABLE_PCC
+        std::move(m_phoneSpeaker),
+        std::move(m_phoneCaller),
+#endif
+#ifdef ENABLE_MCC
+        std::move(m_meetingSpeaker),
+        std::move(m_meetingClient),
+        std::move(m_calendarClient),
+#endif
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+        std::move(m_commsMediaPlayer),
+        std::move(m_commsSpeaker),
+        std::move(m_sharedDataStream),
+#endif
+        std::move(m_equalizerRuntimeSetup),
+        std::move(m_audioFactory),
+        std::move(m_authDelegate),
+        std::move(m_alertStorage),
+        std::move(m_messageStorage),
+        std::move(m_notificationsStorage),
+        std::move(m_deviceSettingStorage),
+        std::move(m_bluetoothStorage),
+        std::move(m_miscStorage),
+        std::move(m_alexaDialogStateObservers),
+        std::move(m_connectionObservers),
+        std::move(m_internetConnectionMonitor),
+        m_isGuiSupported,
+        std::move(m_capabilitiesDelegate),
+        std::move(m_contextManager),
+        std::move(m_transportFactory),
+        std::move(m_avsGatewayManager),
+        std::move(m_localeAssetsManager),
+        std::move(m_enabledConnectionRules),
+        std::move(m_systemTimezone),
+        std::move(m_firmwareVersion),
+        m_sendSoftwareInfoOnConnected,
+        std::move(m_softwareInfoSenderObserver),
+        std::move(m_bluetoothDeviceManager),
+        std::move(m_metricRecorder),
+        std::move(m_powerResourceManager),
+        std::move(m_diagnostics),
+        std::move(m_externalCapabilitiesBuilder),
+        std::move(m_channelVolumeFactory),
+        m_startAlertSchedulingOnInitialization,
+        std::move(m_messageRouterFactory),
+        std::move(m_expectSpeechTimeoutHandler),
+        std::move(m_firstInteractionAudioProvider),
+        std::move(m_cryptoFactory),
+        sdkClientRegistry);
+}
+
+std::string DefaultClientBuilder::name() {
+    return DEFAULT_CLIENT_BUILDER_NAME;
+}
+}  // namespace defaultClient
+}  // namespace alexaClientSDK
diff --git a/ApplicationUtilities/DefaultClient/src/DefaultClientComponent.cpp b/ApplicationUtilities/DefaultClient/src/DefaultClientComponent.cpp
index 98bab7f423..3191573541 100644
--- a/ApplicationUtilities/DefaultClient/src/DefaultClientComponent.cpp
+++ b/ApplicationUtilities/DefaultClient/src/DefaultClientComponent.cpp
@@ -29,7 +29,7 @@
 #include <acsdkNotifications/NotificationsComponent.h>
 #include <acsdkShared/SharedComponent.h>
 #include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
-#include <acsdkSpeechEncoder/SpeechEncoderComponent.h>
+#include <acsdk/AudioEncoderComponent/ComponentFactory.h>
 #include <acsdkSystemClockMonitor/SystemClockMonitor.h>
 #include <acsdkSystemClockMonitor/SystemClockNotifier.h>
 #include <ADSL/ADSLComponent.h>
@@ -51,12 +51,11 @@
 #include <Endpoints/DefaultEndpointBuilder.h>
 #include <PlaybackController/PlaybackControllerComponent.h>
 #include <RegistrationManager/RegistrationManagerComponent.h>
-#include <SpeakerManager/DefaultChannelVolumeFactory.h>
-#include <SpeakerManager/SpeakerManagerComponent.h>
+#include <acsdk/SpeakerManager/SpeakerManagerComponent.h>
 #include <SynchronizeStateSender/SynchronizeStateSenderFactory.h>
 #include <System/SystemComponent.h>
 #include <SystemSoundPlayer/SystemSoundPlayer.h>
-#include <TemplateRuntime/RenderPlayerInfoCardsProviderRegistrar.h>
+#include <acsdk/TemplateRuntime/RenderPlayerInfoCardsProviderRegistrarFactory.h>
 #include <acsdkDeviceSetup/DeviceSetupComponent.h>
 
 #include "DefaultClient/DefaultClientComponent.h"
@@ -83,7 +82,7 @@ using namespace capabilityAgents::alexa;
 using namespace capabilityAgents::system;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DefaultClientComponent");
+#define TAG "DefaultClientComponent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -222,7 +221,8 @@ DefaultClientComponent getComponent(
     const std::shared_ptr<acsdkBluetoothInterfaces::BluetoothStorageInterface>& bluetoothStorage,
     const std::shared_ptr<acsdkBluetoothInterfaces::BluetoothDeviceConnectionRulesProviderInterface>&
         bluetoothConnectionRulesProvider,
-    const std::shared_ptr<acsdkNotificationsInterfaces::NotificationsStorageInterface>& notificationsStorage) {
+    const std::shared_ptr<acsdkNotificationsInterfaces::NotificationsStorageInterface>& notificationsStorage,
+    const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory) {
     std::shared_ptr<avsCommon::utils::bluetooth::BluetoothEventBus> bluetoothEventBus;
     if (bluetoothDeviceManager) {
         bluetoothEventBus = bluetoothDeviceManager->getEventBus();
@@ -259,6 +259,7 @@ DefaultClientComponent getComponent(
         .addInstance(bluetoothEventBus)
         .addInstance(bluetoothStorage)
         .addInstance(notificationsStorage)
+        .addInstance(cryptoFactory)
         .addRetainedFactory(getCreateApplicationAudioPipelineFactory(stubAudioPipelineFactory))
         .addRetainedFactory(getCreateDeviceSettingStorageInterface(deviceSettingStorage))
 
@@ -292,7 +293,7 @@ DefaultClientComponent getComponent(
                               createCapabilitiesDelegateStorageInterface)
 
         /// Optional, horizontal components.
-        .addComponent(acsdkSpeechEncoder::getComponent())
+        .addComponent(audioEncoderComponent::getComponent())
         .addComponent(captions::getComponent())
 
         /// Capability Agents. Some CAs are still instantiated in DefaultClient.cpp.
@@ -308,10 +309,9 @@ DefaultClientComponent getComponent(
 #endif
         .addComponent(acsdkNotifications::getComponent())
         .addComponent(capabilityAgents::playbackController::getComponent())
-        .addComponent(capabilityAgents::speakerManager::getComponent())
+        .addComponent(speakerManagerComponent::getSpeakerManagerComponent())
         .addComponent(capabilityAgents::system::getComponent())
-        .addRetainedFactory(capabilityAgents::templateRuntime::RenderPlayerInfoCardsProviderRegistrar::
-                                createRenderPlayerInfoCardsProviderRegistrarInterface)
+        .addRetainedFactory(templateRuntime::createRenderPlayerInfoCardsProviderRegistrarInterface)
         .addComponent(acsdkDeviceSetup::getComponent());
 }
 
diff --git a/ApplicationUtilities/DefaultClient/src/EqualizerRuntimeSetup.cpp b/ApplicationUtilities/DefaultClient/src/EqualizerRuntimeSetup.cpp
index 310df8c159..50e20c247e 100644
--- a/ApplicationUtilities/DefaultClient/src/EqualizerRuntimeSetup.cpp
+++ b/ApplicationUtilities/DefaultClient/src/EqualizerRuntimeSetup.cpp
@@ -24,7 +24,7 @@ namespace defaultClient {
 using namespace alexaClientSDK::acsdkEqualizerInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("EqualizerRuntimeSetup");
+#define TAG "EqualizerRuntimeSetup"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ApplicationUtilities/DefaultClient/src/StubApplicationAudioPipelineFactory.cpp b/ApplicationUtilities/DefaultClient/src/StubApplicationAudioPipelineFactory.cpp
index f06f9a927e..4b6fb5ea41 100644
--- a/ApplicationUtilities/DefaultClient/src/StubApplicationAudioPipelineFactory.cpp
+++ b/ApplicationUtilities/DefaultClient/src/StubApplicationAudioPipelineFactory.cpp
@@ -23,7 +23,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::utils::mediaPlayer;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("StubApplicationAudioPipelineFactory");
+#define TAG "StubApplicationAudioPipelineFactory"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ApplicationUtilities/Resources/Audio/include/Audio/Data/create_header.bash b/ApplicationUtilities/Resources/Audio/include/Audio/Data/create_header.bash
index ad1c51c01c..8eb362c20c 100644
--- a/ApplicationUtilities/Resources/Audio/include/Audio/Data/create_header.bash
+++ b/ApplicationUtilities/Resources/Audio/include/Audio/Data/create_header.bash
@@ -1,5 +1,18 @@
 #!/bin/bash
 
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#  http://aws.amazon.com/apache2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
 # This is used to create a header file that contains binary data from a file that can be used in this library.  The
 # files are downloaded from https://developer.amazon.com/docs/alexa/alexa-voice-service/ux-design-overview.html#sounds.
 
diff --git a/ApplicationUtilities/Resources/Audio/src/CMakeLists.txt b/ApplicationUtilities/Resources/Audio/src/CMakeLists.txt
index 2b66b0c3c4..01a09a658b 100644
--- a/ApplicationUtilities/Resources/Audio/src/CMakeLists.txt
+++ b/ApplicationUtilities/Resources/Audio/src/CMakeLists.txt
@@ -8,8 +8,7 @@ add_library(AudioResources
         SystemSoundAudioFactory.cpp)
 
 target_include_directories(AudioResources PUBLIC
-        "${AudioResources_SOURCE_DIR}/include"
-	"${AVSCommon_SOURCE_DIR}/Utils/include")
+        "${AudioResources_SOURCE_DIR}/include")
 
 target_link_libraries(AudioResources AVSCommon)
 
diff --git a/ApplicationUtilities/SDKComponent/src/SDKComponent.cpp b/ApplicationUtilities/SDKComponent/src/SDKComponent.cpp
index 3cb1e4355d..becaa40f59 100644
--- a/ApplicationUtilities/SDKComponent/src/SDKComponent.cpp
+++ b/ApplicationUtilities/SDKComponent/src/SDKComponent.cpp
@@ -29,7 +29,7 @@ using namespace avsCommon::utils::logger;
 static const std::string SDK_COMPONENT_NAME = "com.amazon.alexa.deviceSDK";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SDKComponent");
+#define TAG "SDKComponent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/ApplicationUtilities/SystemSoundPlayer/src/SystemSoundPlayer.cpp b/ApplicationUtilities/SystemSoundPlayer/src/SystemSoundPlayer.cpp
index 21478a5b0e..bbf19dd492 100644
--- a/ApplicationUtilities/SystemSoundPlayer/src/SystemSoundPlayer.cpp
+++ b/ApplicationUtilities/SystemSoundPlayer/src/SystemSoundPlayer.cpp
@@ -24,7 +24,7 @@ using namespace avsCommon::utils::logger;
 using MediaPlayerState = avsCommon::utils::mediaPlayer::MediaPlayerState;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SystemSoundPlayer");
+#define TAG "SystemSoundPlayer"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/include/BlueZ/BlueZBluetoothDevice.h b/BluetoothImplementations/BlueZ/include/BlueZ/BlueZBluetoothDevice.h
index 29f43a53e4..92dac78e21 100644
--- a/BluetoothImplementations/BlueZ/include/BlueZ/BlueZBluetoothDevice.h
+++ b/BluetoothImplementations/BlueZ/include/BlueZ/BlueZBluetoothDevice.h
@@ -80,6 +80,8 @@ class BlueZBluetoothDevice
     std::future<bool> connect() override;
     std::future<bool> disconnect() override;
 
+    bool setPairingPin(const std::string& pin) override;
+
     std::vector<std::shared_ptr<avsCommon::sdkInterfaces::bluetooth::services::SDPRecordInterface>>
     getSupportedServices() override;
     std::shared_ptr<avsCommon::sdkInterfaces::bluetooth::services::BluetoothServiceInterface> getService(
diff --git a/BluetoothImplementations/BlueZ/src/BlueZA2DPSink.cpp b/BluetoothImplementations/BlueZ/src/BlueZA2DPSink.cpp
index fc35a085f1..cc10f0a83a 100644
--- a/BluetoothImplementations/BlueZ/src/BlueZA2DPSink.cpp
+++ b/BluetoothImplementations/BlueZ/src/BlueZA2DPSink.cpp
@@ -26,7 +26,7 @@ using namespace avsCommon::utils;
 using namespace avsCommon::sdkInterfaces::bluetooth::services;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BlueZA2DPSink"};
+#define TAG "BlueZA2DPSink"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/BlueZA2DPSource.cpp b/BluetoothImplementations/BlueZ/src/BlueZA2DPSource.cpp
index 28f8393922..528d5f942c 100644
--- a/BluetoothImplementations/BlueZ/src/BlueZA2DPSource.cpp
+++ b/BluetoothImplementations/BlueZ/src/BlueZA2DPSource.cpp
@@ -27,7 +27,7 @@ using namespace avsCommon::utils;
 using namespace avsCommon::sdkInterfaces::bluetooth::services;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BlueZA2DPSource"};
+#define TAG "BlueZA2DPSource"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/BlueZAVRCPController.cpp b/BluetoothImplementations/BlueZ/src/BlueZAVRCPController.cpp
index e4afdc8e75..3d72cf5c67 100644
--- a/BluetoothImplementations/BlueZ/src/BlueZAVRCPController.cpp
+++ b/BluetoothImplementations/BlueZ/src/BlueZAVRCPController.cpp
@@ -24,7 +24,7 @@ using namespace avsCommon::utils;
 using namespace avsCommon::sdkInterfaces::bluetooth::services;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BlueZAVRCPController"};
+#define TAG "BlueZAVRCPController"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/BlueZAVRCPTarget.cpp b/BluetoothImplementations/BlueZ/src/BlueZAVRCPTarget.cpp
index 50351806d5..1b9e0894e1 100644
--- a/BluetoothImplementations/BlueZ/src/BlueZAVRCPTarget.cpp
+++ b/BluetoothImplementations/BlueZ/src/BlueZAVRCPTarget.cpp
@@ -24,7 +24,7 @@ using namespace avsCommon::utils;
 using namespace avsCommon::sdkInterfaces::bluetooth::services;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BlueZAVRCPTarget"};
+#define TAG "BlueZAVRCPTarget"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/BlueZBluetoothDevice.cpp b/BluetoothImplementations/BlueZ/src/BlueZBluetoothDevice.cpp
index 662cb4e189..a1c9f41749 100644
--- a/BluetoothImplementations/BlueZ/src/BlueZBluetoothDevice.cpp
+++ b/BluetoothImplementations/BlueZ/src/BlueZBluetoothDevice.cpp
@@ -37,7 +37,7 @@ using namespace avsCommon::sdkInterfaces::bluetooth;
 using namespace avsCommon::sdkInterfaces::bluetooth::services;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BlueZBluetoothDevice"};
+#define TAG "BlueZBluetoothDevice"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -503,6 +503,11 @@ bool BlueZBluetoothDevice::executeDisconnect() {
     return true;
 }
 
+bool BlueZBluetoothDevice::setPairingPin(const std::string& pin) {
+    // This feature is not supported currently.
+    return false;
+}
+
 std::vector<std::shared_ptr<SDPRecordInterface>> BlueZBluetoothDevice::getSupportedServices() {
     ACSDK_DEBUG5(LX(__func__));
 
@@ -750,7 +755,7 @@ void BlueZBluetoothDevice::onPropertyChanged(const GVariantMapReader& changesMap
         initializeServices(uuids);
     }
 
-    m_executor.submit([this, pairedChanged, paired, connectedChanged, connected, aliasChanged, aliasStr] {
+    m_executor.execute([this, pairedChanged, paired, connectedChanged, connected, aliasChanged, aliasStr] {
         if (aliasChanged) {
             ACSDK_DEBUG5(LX("nameChanged").d("oldName", m_friendlyName).d("newName", aliasStr));
             m_friendlyName = aliasStr;
diff --git a/BluetoothImplementations/BlueZ/src/BlueZBluetoothDeviceManager.cpp b/BluetoothImplementations/BlueZ/src/BlueZBluetoothDeviceManager.cpp
index e10d5a7eef..49cc5863d7 100644
--- a/BluetoothImplementations/BlueZ/src/BlueZBluetoothDeviceManager.cpp
+++ b/BluetoothImplementations/BlueZ/src/BlueZBluetoothDeviceManager.cpp
@@ -25,7 +25,7 @@ using namespace avsCommon::sdkInterfaces::bluetooth;
 using namespace avsCommon::utils::bluetooth;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BlueZBluetoothDeviceManager"};
+#define TAG "BlueZBluetoothDeviceManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/BlueZDeviceManager.cpp b/BluetoothImplementations/BlueZ/src/BlueZDeviceManager.cpp
index ff225cd6b6..670f9b2339 100644
--- a/BluetoothImplementations/BlueZ/src/BlueZDeviceManager.cpp
+++ b/BluetoothImplementations/BlueZ/src/BlueZDeviceManager.cpp
@@ -79,7 +79,7 @@ static const std::string STATE_IDLE = "idle";
 static const std::string STATE_ACTIVE = "active";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BlueZDeviceManager"};
+#define TAG "BlueZDeviceManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/BlueZHFP.cpp b/BluetoothImplementations/BlueZ/src/BlueZHFP.cpp
index f3d1fabdb1..45e7d9bfef 100644
--- a/BluetoothImplementations/BlueZ/src/BlueZHFP.cpp
+++ b/BluetoothImplementations/BlueZ/src/BlueZHFP.cpp
@@ -26,7 +26,7 @@ using namespace avsCommon::utils;
 using namespace avsCommon::sdkInterfaces::bluetooth::services;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BlueZHFP"};
+#define TAG "BlueZHFP"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/BlueZHID.cpp b/BluetoothImplementations/BlueZ/src/BlueZHID.cpp
index 27d8d0e385..ab3d08ab13 100644
--- a/BluetoothImplementations/BlueZ/src/BlueZHID.cpp
+++ b/BluetoothImplementations/BlueZ/src/BlueZHID.cpp
@@ -26,7 +26,7 @@ using namespace avsCommon::utils;
 using namespace avsCommon::sdkInterfaces::bluetooth::services;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BlueZHID"};
+#define TAG "BlueZHID"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/BlueZHostController.cpp b/BluetoothImplementations/BlueZ/src/BlueZHostController.cpp
index 2ea1d28502..314cd1b34d 100644
--- a/BluetoothImplementations/BlueZ/src/BlueZHostController.cpp
+++ b/BluetoothImplementations/BlueZ/src/BlueZHostController.cpp
@@ -25,7 +25,7 @@ namespace bluetoothImplementations {
 namespace blueZ {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BlueZHostController"};
+#define TAG "BlueZHostController"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/BlueZSPP.cpp b/BluetoothImplementations/BlueZ/src/BlueZSPP.cpp
index b1173cf6f9..16686a42bc 100644
--- a/BluetoothImplementations/BlueZ/src/BlueZSPP.cpp
+++ b/BluetoothImplementations/BlueZ/src/BlueZSPP.cpp
@@ -26,7 +26,7 @@ using namespace avsCommon::utils;
 using namespace avsCommon::sdkInterfaces::bluetooth::services;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BlueZSPP"};
+#define TAG "BlueZSPP"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/DBusConnection.cpp b/BluetoothImplementations/BlueZ/src/DBusConnection.cpp
index 24f57a6d15..063bb8347a 100644
--- a/BluetoothImplementations/BlueZ/src/DBusConnection.cpp
+++ b/BluetoothImplementations/BlueZ/src/DBusConnection.cpp
@@ -23,7 +23,7 @@ namespace bluetoothImplementations {
 namespace blueZ {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"DBusConnection"};
+#define TAG "DBusConnection"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/DBusObjectBase.cpp b/BluetoothImplementations/BlueZ/src/DBusObjectBase.cpp
index 496ce7909f..f8ee17343a 100644
--- a/BluetoothImplementations/BlueZ/src/DBusObjectBase.cpp
+++ b/BluetoothImplementations/BlueZ/src/DBusObjectBase.cpp
@@ -23,7 +23,7 @@ namespace bluetoothImplementations {
 namespace blueZ {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"DBusObjectBase"};
+#define TAG "DBusObjectBase"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/DBusPropertiesProxy.cpp b/BluetoothImplementations/BlueZ/src/DBusPropertiesProxy.cpp
index ed3de477e8..12bb2b3f86 100644
--- a/BluetoothImplementations/BlueZ/src/DBusPropertiesProxy.cpp
+++ b/BluetoothImplementations/BlueZ/src/DBusPropertiesProxy.cpp
@@ -24,7 +24,7 @@ namespace bluetoothImplementations {
 namespace blueZ {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"DBusPropertiesProxy"};
+#define TAG "DBusPropertiesProxy"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/DBusProxy.cpp b/BluetoothImplementations/BlueZ/src/DBusProxy.cpp
index c813add37c..59d8c2a052 100644
--- a/BluetoothImplementations/BlueZ/src/DBusProxy.cpp
+++ b/BluetoothImplementations/BlueZ/src/DBusProxy.cpp
@@ -25,7 +25,7 @@ namespace bluetoothImplementations {
 namespace blueZ {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"BlueZUtils"};
+#define TAG "BlueZUtils"
 
 static const int PROXY_DEFAULT_TIMEOUT = -1;
 
diff --git a/BluetoothImplementations/BlueZ/src/GVariantMapReader.cpp b/BluetoothImplementations/BlueZ/src/GVariantMapReader.cpp
index 2f141b5000..830e790282 100644
--- a/BluetoothImplementations/BlueZ/src/GVariantMapReader.cpp
+++ b/BluetoothImplementations/BlueZ/src/GVariantMapReader.cpp
@@ -22,7 +22,7 @@ namespace bluetoothImplementations {
 namespace blueZ {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"GVariantMapReader"};
+#define TAG "GVariantMapReader"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/GVariantTupleReader.cpp b/BluetoothImplementations/BlueZ/src/GVariantTupleReader.cpp
index da5a9a3b3e..66cd7a1bb1 100644
--- a/BluetoothImplementations/BlueZ/src/GVariantTupleReader.cpp
+++ b/BluetoothImplementations/BlueZ/src/GVariantTupleReader.cpp
@@ -22,7 +22,7 @@ namespace bluetoothImplementations {
 namespace blueZ {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"GVariantTupleReader"};
+#define TAG "GVariantTupleReader"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/MPRISPlayer.cpp b/BluetoothImplementations/BlueZ/src/MPRISPlayer.cpp
index 944fe5290c..0caa549e8d 100644
--- a/BluetoothImplementations/BlueZ/src/MPRISPlayer.cpp
+++ b/BluetoothImplementations/BlueZ/src/MPRISPlayer.cpp
@@ -30,7 +30,7 @@ using namespace avsCommon::sdkInterfaces::bluetooth::services;
 using namespace avsCommon::utils::bluetooth;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"MPRISPlayer"};
+#define TAG "MPRISPlayer"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/MediaEndpoint.cpp b/BluetoothImplementations/BlueZ/src/MediaEndpoint.cpp
index dff806e84e..bdbf127699 100644
--- a/BluetoothImplementations/BlueZ/src/MediaEndpoint.cpp
+++ b/BluetoothImplementations/BlueZ/src/MediaEndpoint.cpp
@@ -96,7 +96,7 @@ constexpr size_t MAX_SANE_CODE_SIZE = MAX_SANE_FRAME_LENGTH * 32;
 constexpr size_t MIN_SANE_CODE_SIZE = 1;
 
 // Standard SDK per module logging constants
-static const std::string TAG{"MediaEndpoint"};
+#define TAG "MediaEndpoint"
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
 /**
diff --git a/BluetoothImplementations/BlueZ/src/PairingAgent.cpp b/BluetoothImplementations/BlueZ/src/PairingAgent.cpp
index 662811b8de..56f1fb6f2d 100644
--- a/BluetoothImplementations/BlueZ/src/PairingAgent.cpp
+++ b/BluetoothImplementations/BlueZ/src/PairingAgent.cpp
@@ -27,7 +27,7 @@ namespace bluetoothImplementations {
 namespace blueZ {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"PairingAgent"};
+#define TAG "PairingAgent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/BluetoothImplementations/BlueZ/src/PulseAudioBluetoothInitializer.cpp b/BluetoothImplementations/BlueZ/src/PulseAudioBluetoothInitializer.cpp
index 1812af5e8b..5474ecde60 100644
--- a/BluetoothImplementations/BlueZ/src/PulseAudioBluetoothInitializer.cpp
+++ b/BluetoothImplementations/BlueZ/src/PulseAudioBluetoothInitializer.cpp
@@ -21,7 +21,7 @@
 #include <AVSCommon/Utils/Logger/Logger.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"PulseAudioBluetoothInitializer"};
+#define TAG "PulseAudioBluetoothInitializer"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -414,7 +414,7 @@ void PulseAudioBluetoothInitializer::onEventFired(const BluetoothEvent& event) {
         return;
     }
 
-    m_executor.submit([this] {
+    m_executor.execute([this] {
         if (!m_paLoopStarted) {
             m_paLoopStarted = true;
             run();
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1418530279..a37bf9c745 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## ChangeLog
 
+### Version 3.0.0 - September 30 2022
+Feature enhancements, updates, and resolved issues from all releases are available on the [Amazon developer portal](https://developer.amazon.com/docs/alexa/avs-device-sdk/release-notes.html)
+
+### Version 1.26.0 - November 15 2021
+Feature enhancements, updates, and resolved issues from all releases are available on the [Amazon developer portal](https://developer.amazon.com/en-US/docs/alexa/avs-device-sdk-1-2x/release-notes.html)
+
 ### Version 1.25.0 - August 23 2021
 Feature enhancements, updates, and resolved issues from all releases are available on the [Amazon developer portal](https://developer.amazon.com/docs/alexa/avs-device-sdk/release-notes.html)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a49a5c5b6a..327a7fa005 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 # Set project information
-project(AlexaClientSDK VERSION 1.26.0 LANGUAGES CXX)
+project(AlexaClientSDK VERSION 3.0.0 LANGUAGES CXX)
 set(PROJECT_BRIEF "A cross-platform, modular SDK for interacting with the Alexa Voice Service")
 
 # This variable should be used by extension packages to include cmake files from this project.
@@ -27,6 +27,9 @@ configure_file (
 	"${PROJECT_BINARY_DIR}/AVSCommon/Utils/include/AVSCommon/Utils/SDKConfig.h"
 )
 
+# Create Integration directory in output
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Integration)
+
 # Add utils under ThirdParty first so extensions can also utilize them
 add_subdirectory("ThirdParty")
 
@@ -56,16 +59,12 @@ endif()
 add_subdirectory("InterruptModel")
 add_subdirectory("PlaylistParser")
 add_subdirectory("CapabilityAgents")
-if (NOT MSVC)
-    add_subdirectory("Integration")
-endif()
-add_subdirectory("SampleApp")
 add_subdirectory("ApplicationUtilities")
 add_subdirectory("MediaPlayer")
 add_subdirectory("shared")
-add_subdirectory("SpeechEncoder")
 add_subdirectory("Storage")
 add_subdirectory("SynchronizeStateSender")
+add_subdirectory("SampleApplications")
 add_subdirectory("doc")
 
 # Create .pc pkg-config file
diff --git a/CapabilitiesDelegate/include/CapabilitiesDelegate/CapabilitiesDelegate.h b/CapabilitiesDelegate/include/CapabilitiesDelegate/CapabilitiesDelegate.h
index 8a7106f886..dfe0182ec6 100644
--- a/CapabilitiesDelegate/include/CapabilitiesDelegate/CapabilitiesDelegate.h
+++ b/CapabilitiesDelegate/include/CapabilitiesDelegate/CapabilitiesDelegate.h
@@ -60,6 +60,15 @@ struct InProcessEndpointsToConfigMapStruct {
 /**
  * CapabilitiesDelegate provides an implementation of the CapabilitiesDelegateInterface. It allows clients to register
  * capabilities implemented by agents and publish them so that Alexa is aware of the device's capabilities.
+ *
+ * While updating capabilities for an endpoint, the device will also send the cached capabilities of all endpoints that
+ * share the same registration information. Such endpoints are referred to as deduplicated endpoints.
+ *
+ * @note: The following restrictions apply to deduplicated endpoints:
+ * 1. We can only have one set of deduplicated endpoints, and this set will include the default endpoint.
+ * 2. All capabilities of the deduplicated endpoints will need to fit into one discovery event.
+ * 3. Deleting a deduplicated endpoint is not permitted.
+ *
  */
 class CapabilitiesDelegate
         : public avsCommon::sdkInterfaces::CapabilitiesDelegateInterface
@@ -78,6 +87,7 @@ class CapabilitiesDelegate
      * @param providerRegistrar Object with which to register the new instance as a post connect operation provider.
      * @param shutdownNotifier The object to register with to be notified when it is time to shut down.
      * @param alexaEventProcessedNotifier The object to register with to be notified of AlexaEventProcessed directives.
+     * @param metricRecorder Optional reference to metric recorder.
      * @return If successful, returns a new CapabilitiesDelegate, otherwise @c nullptr.
      */
     static std::shared_ptr<CapabilitiesDelegateInterface> createCapabilitiesDelegateInterface(
@@ -89,7 +99,8 @@ class CapabilitiesDelegate
             providerRegistrar,
         const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
         const std::shared_ptr<acsdkAlexaEventProcessedNotifierInterfaces::AlexaEventProcessedNotifierInterface>&
-            alexaEventProcessedNotifier);
+            alexaEventProcessedNotifier,
+        const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder = nullptr);
 
     /**
      * Create an CapabilitiesDelegate.
@@ -103,7 +114,8 @@ class CapabilitiesDelegate
     static std::shared_ptr<CapabilitiesDelegate> create(
         const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate,
         const std::shared_ptr<storage::CapabilitiesDelegateStorageInterface>& storage,
-        const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager);
+        const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager,
+        const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder = nullptr);
 
     /// @name CapabilitiesDelegateInterface method overrides.
     /// @{
@@ -181,7 +193,8 @@ class CapabilitiesDelegate
     CapabilitiesDelegate(
         const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate,
         const std::shared_ptr<storage::CapabilitiesDelegateStorageInterface>& storage,
-        const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager);
+        const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager,
+        const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricsRecorder);
 
     /**
      * Perform initialization after construction but before returning the
@@ -285,6 +298,26 @@ class CapabilitiesDelegate
      */
     void moveInFlightEndpointsToRegisteredEndpoints();
 
+    /**
+     * Invoke the DiscoveryEventSender to send endpoints.
+     * @param addOrUpdateEndpointsToSend map of endpoints to be added or updated.
+     * @param deleteEndpointsToSend map of endpoints to be deleted.
+     * @return false if the DiscoveryEventSender was not successfully created, true otherwise.
+     */
+    bool executeSendDiscoveryEvents(
+        const std::unordered_map<std::string, std::string>& addOrUpdateEndpointsToSend,
+        const std::unordered_map<std::string, std::string>& deleteEndpointsToSend);
+
+    /**
+     * Determine whether an endpoint is deduplicated.
+     * @param endpointId Identifier of the endpoint.
+     * @return true if the endpoint is deduplicated, false otherwise.
+     */
+    bool isEndpointDeduplicated(const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId);
+
+    /// Optional (may be nullptr) interface for metrics.
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
+
     /// Mutex used to serialize access to Capabilities state and Capabilities state observers.
     std::mutex m_observerMutex;
 
@@ -323,6 +356,13 @@ class CapabilitiesDelegate
     /// A map of endpointId to configuration for currently registered endpoints.
     std::unordered_map<std::string, std::string> m_endpoints;
 
+    /// A map of endpointId to Registration for currently pending/in-flight/registered endpoints.
+    /// @note these endpoint(s) are the device maintaining the HTTP/2 connection.
+    std::unordered_map<
+        avsCommon::sdkInterfaces::endpoints::EndpointIdentifier,
+        avsCommon::utils::Optional<avsCommon::avs::AVSDiscoveryEndpointAttributes::Registration>>
+        m_endpointRegistrations;
+
     /// The mutex to serialize operations related to @c m_currentDiscoveryEventSender.
     std::mutex m_currentDiscoveryEventSenderMutex;
 
diff --git a/CapabilitiesDelegate/include/CapabilitiesDelegate/DiscoveryEventSender.h b/CapabilitiesDelegate/include/CapabilitiesDelegate/DiscoveryEventSender.h
index d936567f31..4c4a44ac48 100644
--- a/CapabilitiesDelegate/include/CapabilitiesDelegate/DiscoveryEventSender.h
+++ b/CapabilitiesDelegate/include/CapabilitiesDelegate/DiscoveryEventSender.h
@@ -26,6 +26,7 @@
 #include <AVSCommon/SDKInterfaces/AuthDelegateInterface.h>
 #include <AVSCommon/SDKInterfaces/AuthObserverInterface.h>
 #include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
 #include <AVSCommon/Utils/Threading/ConditionVariableWrapper.h>
 #include <AVSCommon/Utils/WaitEvent.h>
 
@@ -50,14 +51,18 @@ class DiscoveryEventSender
      * @param deleteReportEndpoints The map of endpoints for which the @c Discovery.DeleteReport event will be sent.
      * @param authDelegate The auth delegate instance to request the auth token from to be sent in the @c Discovery
      * events.
-     * @param waitForEventProcessed Indicate if sender should wait for the EventProcessed directive.
+     * @param waitForEventProcessed Indicate if sender should wait for the EventProcessed directive. Default is true.
+     * @param metricRecorder Optional (may be nullptr) reference to metric recorder.
+     * @param postConnect Indicate if sender is operating in post-connect operation context. Default is false.
      * @return a new instance of the @c DiscoveryEventSender.
      */
     static std::shared_ptr<DiscoveryEventSender> create(
         const std::unordered_map<std::string, std::string>& addOrUpdateReportEndpoints,
         const std::unordered_map<std::string, std::string>& deleteReportEndpoints,
         const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate,
-        const bool waitForEventProcessed = true);
+        bool waitForEventProcessed = true,
+        const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder = nullptr,
+        bool postConnect = false);
 
     /**
      * Destructor.
@@ -92,12 +97,16 @@ class DiscoveryEventSender
      * @param authDelegate The auth delegate instance to request the auth token from to be sent in the @c Discovery
      * events.
      * @param waitForEventProcessed Indicate if sender should wait for the EventProcessed directive.
+     * @param metricRecorder Optional (may be nullptr) reference to metric recorder.
+     * @param postConnect Indicate if sender is operating in post-connect operation context.
      */
     DiscoveryEventSender(
         const std::unordered_map<std::string, std::string>& addOrUpdateReportEndpoints,
         const std::unordered_map<std::string, std::string>& deleteReportEndpoints,
         const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate,
-        const bool waitForEventProcessed);
+        bool waitForEventProcessed,
+        const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder,
+        bool postConnect);
 
     /**
      * Sends the discovery event while taking into account retries.
@@ -193,6 +202,9 @@ class DiscoveryEventSender
     /// Auth delegate used to get the access token
     std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> m_authDelegate;
 
+    /// Optional (may be nullptr) interface for metrics.
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
+
     /// The authDelegate's auth status.
     AuthObserverInterface::State m_currentAuthState;
 
@@ -235,6 +247,9 @@ class DiscoveryEventSender
 
     /// Flag indicating if the event should wait for the EventProcessed directive.
     const bool m_waitForEventProcessed;
+
+    /// Flag indicating if the object is used for post-connect operations.
+    const bool m_postConnect;
 };
 
 }  // namespace capabilitiesDelegate
diff --git a/CapabilitiesDelegate/include/CapabilitiesDelegate/Utils/DiscoveryUtils.h b/CapabilitiesDelegate/include/CapabilitiesDelegate/Utils/DiscoveryUtils.h
index 86d27fecaf..9409115be3 100644
--- a/CapabilitiesDelegate/include/CapabilitiesDelegate/Utils/DiscoveryUtils.h
+++ b/CapabilitiesDelegate/include/CapabilitiesDelegate/Utils/DiscoveryUtils.h
@@ -110,6 +110,18 @@ std::string getDeleteReportEventJson(
     const std::vector<std::string>& endpointConfigurations,
     const std::string& authToken);
 
+/**
+ * Get the maximum number of supported endpoints.
+ * @return The maximum number of endpoints.
+ */
+size_t getMaxEndpoints();
+
+/**
+ * Get the maximum number of capabilities per endpoint.
+ * @return The maximum number of capabilities an endpoint can have.
+ */
+size_t getMaxCapabilitiesPerEndpoint();
+
 }  // namespace utils
 }  // namespace capabilitiesDelegate
 }  // namespace alexaClientSDK
diff --git a/CapabilitiesDelegate/src/CapabilitiesDelegate.cpp b/CapabilitiesDelegate/src/CapabilitiesDelegate.cpp
index 57ba3563b2..942102894b 100644
--- a/CapabilitiesDelegate/src/CapabilitiesDelegate.cpp
+++ b/CapabilitiesDelegate/src/CapabilitiesDelegate.cpp
@@ -14,6 +14,7 @@
  */
 
 #include <functional>
+#include <vector>
 
 #include <acsdkAlexaEventProcessedNotifierInterfaces/AlexaEventProcessedNotifierInterface.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
@@ -31,15 +32,16 @@ using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::sdkInterfaces::endpoints;
 using namespace avsCommon::utils;
 using namespace avsCommon::utils::configuration;
+using namespace avsCommon::utils::metrics;
 using namespace capabilitiesDelegate::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CapabilitiesDelegate");
+#define TAG "CapabilitiesDelegate"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
  *
- * @param The event string for this @c LogEntry.
+ * @param event The event string for this @c LogEntry.
  */
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
@@ -71,7 +73,8 @@ std::shared_ptr<CapabilitiesDelegateInterface> CapabilitiesDelegate::createCapab
         providerRegistrar,
     const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
     const std::shared_ptr<acsdkAlexaEventProcessedNotifierInterfaces::AlexaEventProcessedNotifierInterface>&
-        alexaEventProcessedNotifier) {
+        alexaEventProcessedNotifier,
+    const std::shared_ptr<MetricRecorderInterface>& metricRecorder) {
     if (!providerRegistrar) {
         ACSDK_ERROR(LX("createCapabilitiesDelegateInterfaceFailed").d("reason", "nullProviderRegistrar"));
         return nullptr;
@@ -82,7 +85,7 @@ std::shared_ptr<CapabilitiesDelegateInterface> CapabilitiesDelegate::createCapab
         return nullptr;
     }
 
-    auto capabilitiesDelegate = create(authDelegate, std::move(storage), customerDataManager);
+    auto capabilitiesDelegate = create(authDelegate, std::move(storage), customerDataManager, metricRecorder);
     if (!capabilitiesDelegate) {
         ACSDK_ERROR(LX("createCapabilitiesDelegateInterfaceFailed").d("reason", "createFailed"));
         return nullptr;
@@ -100,7 +103,8 @@ std::shared_ptr<CapabilitiesDelegateInterface> CapabilitiesDelegate::createCapab
 std::shared_ptr<CapabilitiesDelegate> CapabilitiesDelegate::create(
     const std::shared_ptr<AuthDelegateInterface>& authDelegate,
     const std::shared_ptr<storage::CapabilitiesDelegateStorageInterface>& capabilitiesDelegateStorage,
-    const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager) {
+    const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager,
+    const std::shared_ptr<MetricRecorderInterface>& metricRecorder) {
     if (!authDelegate) {
         ACSDK_ERROR(LX("createFailed").d("reason", "nullAuthDelegate"));
     } else if (!capabilitiesDelegateStorage) {
@@ -109,7 +113,7 @@ std::shared_ptr<CapabilitiesDelegate> CapabilitiesDelegate::create(
         ACSDK_ERROR(LX("createFailed").d("reason", "nullCustomerDataManager"));
     } else {
         std::shared_ptr<CapabilitiesDelegate> instance(
-            new CapabilitiesDelegate(authDelegate, capabilitiesDelegateStorage, customerDataManager));
+            new CapabilitiesDelegate(authDelegate, capabilitiesDelegateStorage, customerDataManager, nullptr));
         if (!(instance->init())) {
             ACSDK_ERROR(LX("createFailed").d("reason", "CapabilitiesDelegateInitFailed"));
             return nullptr;
@@ -124,9 +128,11 @@ std::shared_ptr<CapabilitiesDelegate> CapabilitiesDelegate::create(
 CapabilitiesDelegate::CapabilitiesDelegate(
     const std::shared_ptr<AuthDelegateInterface>& authDelegate,
     const std::shared_ptr<storage::CapabilitiesDelegateStorageInterface>& capabilitiesDelegateStorage,
-    const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager) :
+    const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager,
+    const std::shared_ptr<MetricRecorderInterface>& metricRecorder) :
         RequiresShutdown{"CapabilitiesDelegate"},
         CustomerDataHandler{customerDataManager},
+        m_metricRecorder{metricRecorder},
         m_capabilitiesState{CapabilitiesDelegateObserverInterface::State::UNINITIALIZED},
         m_capabilitiesError{CapabilitiesDelegateObserverInterface::Error::UNINITIALIZED},
         m_authDelegate{authDelegate},
@@ -248,6 +254,12 @@ void CapabilitiesDelegate::invalidateCapabilities() {
     }
 }
 
+/// Check if the endpoint is present in the map of endpoint registrations.
+bool CapabilitiesDelegate::isEndpointDeduplicated(const EndpointIdentifier& endpointId) {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_endpointRegistrations.find(endpointId) != m_endpointRegistrations.end();
+}
+
 bool CapabilitiesDelegate::addOrUpdateEndpoint(
     const AVSDiscoveryEndpointAttributes& endpointAttributes,
     const std::vector<CapabilityConfiguration>& capabilities) {
@@ -272,7 +284,7 @@ bool CapabilitiesDelegate::addOrUpdateEndpoint(
         }
     }
 
-    std::string endpointId = endpointAttributes.endpointId;
+    const EndpointIdentifier& endpointId = endpointAttributes.endpointId;
     {
         std::lock_guard<std::mutex> lock{m_endpointsMutex};
 
@@ -285,6 +297,17 @@ bool CapabilitiesDelegate::addOrUpdateEndpoint(
             return false;
         }
 
+        // Check that this endpoint's registration is not changing.
+        // If the endpoint is already present in m_endpointRegistrations, confirm that the current registration is not
+        // empty, and is the same as the previous one.
+        if (m_endpointRegistrations.find(endpointId) != m_endpointRegistrations.end() &&
+            m_endpointRegistrations[endpointId] != endpointAttributes.registration) {
+            ACSDK_ERROR(LX("addOrUpdateEndpointFailed")
+                            .d("reason", "Endpoint registration changed")
+                            .sensitive("endpointId", endpointId));
+            return false;
+        }
+
         // Add endpoint to pending list.
         it = m_addOrUpdateEndpoints.pending.find(endpointId);
         if (m_addOrUpdateEndpoints.pending.end() != it) {
@@ -294,19 +317,121 @@ bool CapabilitiesDelegate::addOrUpdateEndpoint(
             return false;
         }
 
+        if (capabilities.size() > getMaxCapabilitiesPerEndpoint()) {
+            ACSDK_ERROR(LX("addOrUpdateEndpointFailed")
+                            .d("reason", "Maximum number of capabilities reached")
+                            .d("size", capabilities.size()));
+            return false;
+        }
+
         std::string endpointConfigJson = getEndpointConfigJson(endpointAttributes, capabilities);
 
         // Check for endpoint configuration.
         if (endpointConfigJson.size() > MAX_ENDPOINTS_SIZE_IN_PAYLOAD) {
-            ACSDK_ERROR(LX("addOrUpdateEndpointFailed").d("reason", "endpointConfiguration too big"));
+            ACSDK_ERROR(LX("addOrUpdateEndpointFailed")
+                            .d("reason", "endpointConfiguration too big")
+                            .d("size", endpointConfigJson.size()));
             return false;
         }
 
+        if (endpointAttributes.registration.hasValue()) {
+            if (!m_endpointRegistrations.empty()) {
+                // check that the registration of endpointId matches the others by comparing it to the first one.
+                // Note that if endpointId is already present in m_endpointRegistrations, it has already been confirmed
+                // earlier that its registration is unchanged.
+                auto registration = m_endpointRegistrations.begin()->second;
+                if (endpointAttributes.registration != registration) {
+                    ACSDK_ERROR(LX("addOrUpdateEndpointFailed")
+                                    .d("reason", "Endpoint registration does not match existing deduplicated endpoints")
+                                    .sensitive("endpointId", endpointId));
+                    return false;
+                }
+            }
+            // If this endpoint needs to be added to m_endpointRegistrations check whether doing so will
+            // exceed the maximum number of endpoints.
+            if (m_endpointRegistrations.find(endpointId) == m_endpointRegistrations.end() &&
+                m_endpointRegistrations.size() + 1 > getMaxEndpoints()) {
+                ACSDK_ERROR(LX("addOrUpdateEndpointFailed")
+                                .d("reason", "Max number of deduplicated endpoints reached")
+                                .sensitive("endpointId", endpointId));
+                return false;
+            }
+
+            m_endpointRegistrations[endpointId] = endpointAttributes.registration;
+
+            // Check if any of the deduplicated endpoints are pending deletion or in-flight for deletion. If they are,
+            // fail this addOrUpdate. This should never happen.
+            for (auto& iter : m_endpointRegistrations) {
+                if ((m_deleteEndpoints.pending.find(iter.first) != m_deleteEndpoints.pending.end()) ||
+                    (m_deleteEndpoints.inFlight.find(iter.first) != m_deleteEndpoints.inFlight.end())) {
+                    ACSDK_ERROR(LX("addOrUpdateEndpointFailed")
+                                    .d("reason", "Deduplicated endpoint already pending delete")
+                                    .sensitive("endpointId", endpointId));
+                    return false;
+                }
+            }
+
+            // Check that all de-duplicated endpoints can fit into one discovery message by adding the sizes of their
+            // configurations.
+            // First add the size of the current endpoint configuration.
+            size_t totalConfigurationSize = endpointConfigJson.size();
+            for (auto& iter : m_endpointRegistrations) {
+                if (iter.first == endpointId) {
+                    // skip the current endpoint, since we have already added its configuration size.
+                    continue;
+                }
+                // Check pending before in-flight to ensure that the most recent configuration is used, wherever
+                // possible.
+                if (m_addOrUpdateEndpoints.pending.find(iter.first) != m_addOrUpdateEndpoints.pending.end()) {
+                    totalConfigurationSize += m_addOrUpdateEndpoints.pending[iter.first].size();
+                } else if (m_addOrUpdateEndpoints.inFlight.find(iter.first) != m_addOrUpdateEndpoints.inFlight.end()) {
+                    totalConfigurationSize += m_addOrUpdateEndpoints.inFlight[iter.first].size();
+                } else {
+                    totalConfigurationSize += m_endpoints[iter.first].size();
+                }
+            }
+
+            if (totalConfigurationSize > MAX_ENDPOINTS_SIZE_IN_PAYLOAD) {
+                ACSDK_ERROR(
+                    LX("addOrUpdateEndpointFailed")
+                        .d("reason", "Deduplicated endpoint configurations too big to fit into one discovery event"));
+                return false;
+            }
+
+            // All deduplicated endpoints can fit into one discovery message.
+            // Add the de-duplicated endpoints to the list of pending addOrUpdate endpoints, if they are not already
+            // present. If any of them are in flight, use that configuration as it is the most recent.
+            for (auto& iter : m_endpointRegistrations) {
+                auto dedupedEndpointId = iter.first;
+                if (dedupedEndpointId == endpointId) {
+                    // skip adding the endpoint here, as it will be added after.
+                    continue;
+                }
+                if (m_addOrUpdateEndpoints.pending.find(dedupedEndpointId) != m_addOrUpdateEndpoints.pending.end()) {
+                    // already pending update. Nothing to do.
+                } else if (
+                    m_addOrUpdateEndpoints.inFlight.find(dedupedEndpointId) != m_addOrUpdateEndpoints.inFlight.end()) {
+                    // update is in flight.
+                    m_addOrUpdateEndpoints.pending.insert(
+                        std::make_pair(dedupedEndpointId, m_addOrUpdateEndpoints.inFlight[dedupedEndpointId]));
+                    ACSDK_DEBUG0(LX("addOrUpdateEndpoint")
+                                     .m("Adding inflight deduplicated Endpoint")
+                                     .sensitive("endpointId", dedupedEndpointId));
+                } else {
+                    // add de-duped endpoint.
+                    ACSDK_DEBUG0(LX("addOrUpdateEndpoint")
+                                     .m("Adding registered deduplicated Endpoint")
+                                     .sensitive("endpointId", dedupedEndpointId));
+                    m_addOrUpdateEndpoints.pending.insert(
+                        std::make_pair(dedupedEndpointId, m_endpoints[dedupedEndpointId]));
+                }
+            }
+        }
         m_addOrUpdateEndpoints.pending.insert(std::make_pair(endpointId, endpointConfigJson));
     }
 
     if (!m_currentDiscoveryEventSender) {
-        m_executor.submit([this] { executeSendPendingEndpoints(); });
+        m_executor.execute([this] { executeSendPendingEndpoints(); });
     }
 
     return true;
@@ -336,7 +461,7 @@ bool CapabilitiesDelegate::deleteEndpoint(
         }
     }
 
-    std::string endpointId = endpointAttributes.endpointId;
+    const EndpointIdentifier& endpointId = endpointAttributes.endpointId;
 
     {
         std::lock_guard<std::mutex> lock{m_endpointsMutex};
@@ -358,6 +483,23 @@ bool CapabilitiesDelegate::deleteEndpoint(
             return false;
         }
 
+        // Check that this endpoint's registration is not changing
+        if (m_endpointRegistrations.find(endpointId) != m_endpointRegistrations.end() &&
+            m_endpointRegistrations[endpointId] != endpointAttributes.registration) {
+            ACSDK_ERROR(LX("deleteEndpointFailed")
+                            .d("reason", "Endpoint registration changed")
+                            .sensitive("endpointId", endpointId));
+            return false;
+        }
+
+        // Disable deleting de-duped endpoints.
+        if (isEndpointDeduplicated(endpointId)) {
+            ACSDK_ERROR(LX("deleteEndpointFailed")
+                            .d("reason", "Cannot delete a de-duplicated endpoint")
+                            .sensitive("endpointId", endpointId));
+            return false;
+        }
+
         // Add endpoint to pending list.
         it = m_deleteEndpoints.pending.find(endpointId);
         if (m_deleteEndpoints.pending.end() != it) {
@@ -371,7 +513,7 @@ bool CapabilitiesDelegate::deleteEndpoint(
     }
 
     if (!m_currentDiscoveryEventSender) {
-        m_executor.submit([this] { executeSendPendingEndpoints(); });
+        m_executor.execute([this] { executeSendPendingEndpoints(); });
     }
 
     return true;
@@ -395,46 +537,100 @@ void CapabilitiesDelegate::executeSendPendingEndpoints() {
         return;
     }
 
-    if (m_addOrUpdateEndpoints.pending.empty() && m_deleteEndpoints.pending.empty()) {
-        ACSDK_DEBUG5(LX(__func__).d("Skipped", "No endpoints to register or delete"));
-        return;
-    }
-
-    std::unordered_map<std::string, std::string> addOrUpdateEndpointsToSend;
+    std::vector<std::unordered_map<std::string, std::string>> addOrUpdateEndpointsToSendVector;
     std::unordered_map<std::string, std::string> deleteEndpointsToSend;
     {
         std::lock_guard<std::mutex> lock{m_endpointsMutex};
 
-        // Move pending endpoints to in-flight, since we are going to send them.
-        m_addOrUpdateEndpoints.inFlight = m_addOrUpdateEndpoints.pending;
-        addOrUpdateEndpointsToSend = m_addOrUpdateEndpoints.inFlight;
-        m_addOrUpdateEndpoints.pending.clear();
+        if (m_addOrUpdateEndpoints.pending.empty() && m_deleteEndpoints.pending.empty()) {
+            ACSDK_DEBUG5(LX(__func__).d("Skipped", "No endpoints to register or delete"));
+            return;
+        }
 
-        m_deleteEndpoints.inFlight = m_deleteEndpoints.pending;
-        deleteEndpointsToSend = m_deleteEndpoints.inFlight;
-        m_deleteEndpoints.pending.clear();
+        // check if the addOrUpdate Discovery event will need to be split.
+        size_t totalAddOrUpdateConfigSize = 0;
+        for (auto& iter : m_addOrUpdateEndpoints.pending) {
+            totalAddOrUpdateConfigSize += iter.second.size();
+        }
+
+        if (totalAddOrUpdateConfigSize <= MAX_ENDPOINTS_SIZE_IN_PAYLOAD) {
+            ACSDK_DEBUG5(LX("ExecuteSendPendingEndpoints").d("reason", "No need to split discovery message"));
+            // No split necessary.
+            m_addOrUpdateEndpoints.inFlight = m_addOrUpdateEndpoints.pending;
+            addOrUpdateEndpointsToSendVector.push_back(m_addOrUpdateEndpoints.inFlight);
+            m_addOrUpdateEndpoints.pending.clear();
+
+            m_deleteEndpoints.inFlight = m_deleteEndpoints.pending;
+            deleteEndpointsToSend = m_deleteEndpoints.inFlight;
+            m_deleteEndpoints.pending.clear();
+        } else {
+            // Discovery event will need to be split.
+            ACSDK_DEBUG5(LX("ExecuteSendPendingEndpoints").d("reason", "Need to split discovery message"));
+            // first send all endpoints that do not have registration information, i.e. are not de-duplicated. Send the
+            // endpoints to be deleted as well
+            std::unordered_map<std::string, std::string> addOrUpdateEndpointsToSend;
+            for (auto iter = m_addOrUpdateEndpoints.pending.begin(); iter != m_addOrUpdateEndpoints.pending.end();) {
+                if (!isEndpointDeduplicated(iter->first)) {
+                    addOrUpdateEndpointsToSend.insert(*iter);
+                    m_addOrUpdateEndpoints.inFlight.insert(*iter);
+                    iter = m_addOrUpdateEndpoints.pending.erase(iter);
+                } else {
+                    ++iter;
+                }
+            }
+            // No non-deduplicated endpoints are pending add or update.
+            if (!addOrUpdateEndpointsToSend.empty()) {
+                addOrUpdateEndpointsToSendVector.push_back(addOrUpdateEndpointsToSend);
+            }
+
+            m_deleteEndpoints.inFlight = m_deleteEndpoints.pending;
+            deleteEndpointsToSend = m_deleteEndpoints.inFlight;
+            m_deleteEndpoints.pending.clear();
+
+            addOrUpdateEndpointsToSend.clear();
+            deleteEndpointsToSend.clear();
+
+            // Send remaining deduplicated endpoints in a separate discovery event, if any.
+            if (!m_addOrUpdateEndpoints.pending.empty()) {
+                m_addOrUpdateEndpoints.inFlight = m_addOrUpdateEndpoints.pending;
+                addOrUpdateEndpointsToSend = m_addOrUpdateEndpoints.inFlight;
+                m_addOrUpdateEndpoints.pending.clear();
+            }
+            addOrUpdateEndpointsToSendVector.push_back(addOrUpdateEndpointsToSend);
+        }
+    }
+
+    for (auto& addOrUpdateEndpointsToSend : addOrUpdateEndpointsToSendVector) {
+        if (!executeSendDiscoveryEvents(addOrUpdateEndpointsToSend, deleteEndpointsToSend)) {
+            return;
+        }
+        deleteEndpointsToSend.clear();
     }
+}
 
+bool CapabilitiesDelegate::executeSendDiscoveryEvents(
+    const std::unordered_map<std::string, std::string>& addOrUpdateEndpointsToSend,
+    const std::unordered_map<std::string, std::string>& deleteEndpointsToSend) {
     ACSDK_DEBUG5(LX(__func__)
                      .d("num endpoints to add", addOrUpdateEndpointsToSend.size())
                      .d("num endpoints to delete", deleteEndpointsToSend.size()));
 
-    auto discoveryEventSender =
-        DiscoveryEventSender::create(addOrUpdateEndpointsToSend, deleteEndpointsToSend, m_authDelegate);
+    auto discoveryEventSender = DiscoveryEventSender::create(
+        addOrUpdateEndpointsToSend, deleteEndpointsToSend, m_authDelegate, true, m_metricRecorder);
 
     if (!discoveryEventSender) {
-        ACSDK_ERROR(LX("failedExecuteSendPendingEndpoints").d("reason", "failed to create DiscoveryEventSender"));
+        ACSDK_ERROR(LX("failedExecuteSendDiscoveryEvents").d("reason", "failed to create DiscoveryEventSender"));
         moveInFlightEndpointsToPending();
         setCapabilitiesState(
             CapabilitiesDelegateObserverInterface::State::FATAL_ERROR,
             CapabilitiesDelegateObserverInterface::Error::UNKNOWN_ERROR,
             getEndpointIdentifiers(addOrUpdateEndpointsToSend),
             getEndpointIdentifiers(deleteEndpointsToSend));
-        return;
+        return false;
     }
-
     setDiscoveryEventSender(discoveryEventSender);
     discoveryEventSender->sendDiscoveryEvents(m_messageSender);
+    return true;
 }
 
 void CapabilitiesDelegate::onAlexaEventProcessedReceived(const std::string& eventCorrelationToken) {
@@ -520,11 +716,18 @@ std::shared_ptr<PostConnectOperationInterface> CapabilitiesDelegate::createPostC
     /// even though no Discovery event was sent. This logic is not required for pending delete endpoints, since
     /// calls to CapabilitiesDelegate.deleteEndpoint fail when the endpoint is not already cached with
     /// CapabilitiesDelegate.
-    if (addOrUpdateEndpointsToSend.empty() && !originalPendingAddOrUpdateEndpoints.empty()) {
+    auto unchangedPendingAddOrUpdateEndpoints = originalPendingAddOrUpdateEndpoints;
+    for (const auto& endpoint : addOrUpdateEndpointsToSend) {
+        auto endpointIt = unchangedPendingAddOrUpdateEndpoints.find(endpoint.first);
+        if (endpointIt != unchangedPendingAddOrUpdateEndpoints.end()) {
+            unchangedPendingAddOrUpdateEndpoints.erase(endpointIt);
+        }
+    }
+    if (!unchangedPendingAddOrUpdateEndpoints.empty()) {
         setCapabilitiesState(
             CapabilitiesDelegateObserverInterface::State::SUCCESS,
             CapabilitiesDelegateObserverInterface::Error::SUCCESS,
-            getEndpointIdentifiers(originalPendingAddOrUpdateEndpoints),
+            getEndpointIdentifiers(unchangedPendingAddOrUpdateEndpoints),
             std::vector<std::string>{});
     }
 
@@ -538,8 +741,8 @@ std::shared_ptr<PostConnectOperationInterface> CapabilitiesDelegate::createPostC
                      .d("num endpoints to add", addOrUpdateEndpointsToSend.size())
                      .d("num endpoints to delete", deleteEndpointsToSend.size()));
 
-    std::shared_ptr<DiscoveryEventSenderInterface> newEventSender =
-        DiscoveryEventSender::create(addOrUpdateEndpointsToSend, deleteEndpointsToSend, m_authDelegate);
+    std::shared_ptr<DiscoveryEventSenderInterface> newEventSender = DiscoveryEventSender::create(
+        addOrUpdateEndpointsToSend, deleteEndpointsToSend, m_authDelegate, true, m_metricRecorder, true);
     if (!newEventSender) {
         ACSDK_ERROR(LX("createPostConnectOperationFailed").m("Could not create DiscoveryEventSender."));
         return nullptr;
@@ -562,9 +765,13 @@ void CapabilitiesDelegate::onDiscoveryCompleted(
     const std::unordered_map<std::string, std::string>& deleteReportEndpoints) {
     ACSDK_DEBUG5(LX(__func__));
 
-    if (m_addOrUpdateEndpoints.inFlight != addOrUpdateReportEndpoints ||
-        m_deleteEndpoints.inFlight != deleteReportEndpoints) {
-        ACSDK_WARN(LX(__func__).m("Cached in-flight endpoints do not match endpoints registered to AVS"));
+    {
+        std::lock_guard<std::mutex> lock{m_endpointsMutex};
+
+        if (m_addOrUpdateEndpoints.inFlight != addOrUpdateReportEndpoints ||
+            m_deleteEndpoints.inFlight != deleteReportEndpoints) {
+            ACSDK_WARN(LX(__func__).m("Cached in-flight endpoints do not match endpoints registered to AVS"));
+        }
     }
 
     auto addOrUpdateReportEndpointIdentifiers = getEndpointIdentifiers(addOrUpdateReportEndpoints);
@@ -589,7 +796,7 @@ void CapabilitiesDelegate::onDiscoveryCompleted(
         addOrUpdateReportEndpointIdentifiers,
         deleteReportEndpointIdentifiers);
 
-    m_executor.submit([this] { executeSendPendingEndpoints(); });
+    m_executor.execute([this] { executeSendPendingEndpoints(); });
 }
 
 void CapabilitiesDelegate::onDiscoveryFailure(MessageRequestObserverInterface::Status status) {
@@ -601,13 +808,20 @@ void CapabilitiesDelegate::onDiscoveryFailure(MessageRequestObserverInterface::S
     }
     ACSDK_ERROR(LX(__func__).d("reason", status));
 
-    auto addOrUpdateReportEndpointIdentifiers = getEndpointIdentifiers(m_addOrUpdateEndpoints.inFlight);
-    auto deleteReportEndpointIdentifiers = getEndpointIdentifiers(m_deleteEndpoints.inFlight);
-
-    switch (status) {
-        case MessageRequestObserverInterface::Status::INVALID_AUTH:
+    std::vector<EndpointIdentifier> addOrUpdateReportEndpointIdentifiers;
+    std::vector<EndpointIdentifier> deleteReportEndpointIdentifiers;
+    {
+        std::lock_guard<std::mutex> lock{m_endpointsMutex};
+        addOrUpdateReportEndpointIdentifiers = getEndpointIdentifiers(m_addOrUpdateEndpoints.inFlight);
+        deleteReportEndpointIdentifiers = getEndpointIdentifiers(m_deleteEndpoints.inFlight);
+        if (status == MessageRequestObserverInterface::Status::INVALID_AUTH ||
+            status == MessageRequestObserverInterface::Status::BAD_REQUEST) {
             m_addOrUpdateEndpoints.inFlight.clear();
             m_deleteEndpoints.inFlight.clear();
+        }
+    }
+    switch (status) {
+        case MessageRequestObserverInterface::Status::INVALID_AUTH:
             resetCurrentDiscoveryEventSender();
 
             setCapabilitiesState(
@@ -617,8 +831,6 @@ void CapabilitiesDelegate::onDiscoveryFailure(MessageRequestObserverInterface::S
                 deleteReportEndpointIdentifiers);
             break;
         case MessageRequestObserverInterface::Status::BAD_REQUEST:
-            m_addOrUpdateEndpoints.inFlight.clear();
-            m_deleteEndpoints.inFlight.clear();
             resetCurrentDiscoveryEventSender();
 
             setCapabilitiesState(
@@ -735,7 +947,7 @@ void CapabilitiesDelegate::onConnectionStatusChanged(
     if (ConnectionStatusObserverInterface::Status::CONNECTED == status) {
         /// If newly connected, send Discovery events for any endpoints that may have been added or deleted
         /// during the post-connect stage.
-        m_executor.submit([this] { executeSendPendingEndpoints(); });
+        m_executor.execute([this] { executeSendPendingEndpoints(); });
     }
 }
 
@@ -759,10 +971,16 @@ void CapabilitiesDelegate::addStaleEndpointsToPendingDeleteLocked(
         ACSDK_ERROR(LX("findEndpointsToDeleteLockedFailed").d("reason", "invalidStoredEndpointConfig"));
         return;
     }
-
+    // Do not allow a deduplicated endpoint to be deleted.
     for (auto& it : *storedEndpointConfig) {
         if (m_endpoints.end() == m_endpoints.find(it.first) &&
             m_addOrUpdateEndpoints.pending.end() == m_addOrUpdateEndpoints.pending.find(it.first)) {
+            if (isEndpointDeduplicated(it.first)) {
+                ACSDK_ERROR(LX(__func__)
+                                .d("reason", "deduplicated endpoint included in deleteReport")
+                                .sensitive("endpointId", it.first));
+                return;
+            }
             ACSDK_DEBUG9(LX(__func__).d("step", "endpoint included in deleteReport").sensitive("endpointId", it.first));
             m_deleteEndpoints.pending.insert({it.first, getDeleteReportEndpointConfigJson(it.first)});
         }
diff --git a/CapabilitiesDelegate/src/DiscoveryEventSender.cpp b/CapabilitiesDelegate/src/DiscoveryEventSender.cpp
index 11106eaef1..3d46f161ed 100644
--- a/CapabilitiesDelegate/src/DiscoveryEventSender.cpp
+++ b/CapabilitiesDelegate/src/DiscoveryEventSender.cpp
@@ -17,6 +17,8 @@
 #include "CapabilitiesDelegate/Utils/DiscoveryUtils.h"
 
 #include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Metrics/DataPointCounterBuilder.h>
+#include <AVSCommon/Utils/Metrics/MetricEventBuilder.h>
 #include <AVSCommon/Utils/RetryTimer.h>
 
 namespace alexaClientSDK {
@@ -24,10 +26,20 @@ namespace capabilitiesDelegate {
 
 using namespace avsCommon::avs;
 using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::metrics;
 using namespace capabilitiesDelegate::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DiscoveryEventSender");
+#define TAG "DiscoveryEventSender"
+
+/// Activity name for post-connect metrics after sending a report.
+#define POST_CONNECT_ADD_OR_UPDATE_REPORT_ACTIVITY "PostConnect" TAG "-sendAddOrUpdateReport"
+
+/// Activity name for post-connect metrics after sending a report.
+#define POST_CONNECT_DELETE_REPORT_ACTIVITY "PostConnect" TAG "-sendDeleteReport"
+
+/// Prefix for post-connect data point with status value.
+#define POST_CONNECT_STATUS_PREFIX "STATUS-"
 
 /**
  * Create a LogEntry using the file's TAG and the specified event string.
@@ -61,14 +73,21 @@ std::shared_ptr<DiscoveryEventSender> DiscoveryEventSender::create(
     const std::unordered_map<std::string, std::string>& addOrUpdateReportEndpoints,
     const std::unordered_map<std::string, std::string>& deleteReportEndpoints,
     const std::shared_ptr<AuthDelegateInterface>& authDelegate,
-    const bool waitForEventProcessed) {
+    bool waitForEventProcessed,
+    const std::shared_ptr<MetricRecorderInterface>& metricRecorder,
+    bool postConnect) {
     if (addOrUpdateReportEndpoints.empty() && deleteReportEndpoints.empty()) {
         ACSDK_ERROR(LX("createFailed").d("reason", "endpoint map empty"));
     } else if (!authDelegate) {
         ACSDK_ERROR(LX("createFailed").d("reason", "invalid auth delegate"));
     } else {
         auto instance = std::shared_ptr<DiscoveryEventSender>(new DiscoveryEventSender(
-            addOrUpdateReportEndpoints, deleteReportEndpoints, authDelegate, waitForEventProcessed));
+            addOrUpdateReportEndpoints,
+            deleteReportEndpoints,
+            authDelegate,
+            waitForEventProcessed,
+            metricRecorder,
+            postConnect));
 
         return instance;
     }
@@ -79,14 +98,18 @@ DiscoveryEventSender::DiscoveryEventSender(
     const std::unordered_map<std::string, std::string>& addOrUpdateReportEndpoints,
     const std::unordered_map<std::string, std::string>& deleteReportEndpoints,
     const std::shared_ptr<AuthDelegateInterface>& authDelegate,
-    const bool waitForEventProcessed) :
+    bool waitForEventProcessed,
+    const std::shared_ptr<MetricRecorderInterface>& metricRecorder,
+    bool postConnect) :
         m_addOrUpdateReportEndpoints{addOrUpdateReportEndpoints},
         m_deleteReportEndpoints{deleteReportEndpoints},
         m_authDelegate{authDelegate},
+        m_metricRecorder{metricRecorder},
         m_currentAuthState{AuthObserverInterface::State::UNINITIALIZED},
         m_isStopping{false},
         m_isSendDiscoveryEventsInvoked{false},
-        m_waitForEventProcessed{waitForEventProcessed} {
+        m_waitForEventProcessed{waitForEventProcessed},
+        m_postConnect{postConnect} {
 }
 
 DiscoveryEventSender::~DiscoveryEventSender() {
@@ -188,6 +211,7 @@ MessageRequestObserverInterface::Status DiscoveryEventSender::sendDiscoveryEvent
     const std::shared_ptr<MessageSenderInterface>& messageSender,
     const std::string& eventString,
     bool waitForEventProcessed) {
+    ACSDK_INFO(LX(__func__));
     ACSDK_DEBUG5(LX(__func__).sensitive("discoveryEvent", eventString));
     std::unique_lock<std::mutex> lock{m_mutex};
     m_eventProcessedWaitEvent.reset();
@@ -237,6 +261,27 @@ bool DiscoveryEventSender::sendDiscoveryEventWithRetries(
         }
 
         auto status = sendDiscoveryEvent(messageSender, eventString, isAddOrUpdateReportEvent);
+
+#ifdef ACSDK_ENABLE_METRICS_RECORDING
+        if (m_postConnect && m_metricRecorder) {
+            const auto activityName = isAddOrUpdateReportEvent ? POST_CONNECT_ADD_OR_UPDATE_REPORT_ACTIVITY
+                                                               : POST_CONNECT_DELETE_REPORT_ACTIVITY;
+            std::stringstream eventNameBuilder;
+            eventNameBuilder << POST_CONNECT_STATUS_PREFIX << status;
+            auto metricEvent =
+                MetricEventBuilder{}
+                    .setActivityName(activityName)
+                    .addDataPoint(DataPointCounterBuilder{}.setName(eventNameBuilder.str()).increment(1).build())
+                    .build();
+            if (metricEvent) {
+                m_metricRecorder->recordMetric(std::move(metricEvent));
+            }
+        }
+#else
+        (void)m_postConnect;
+        (void)m_metricRecorder;
+#endif
+
         switch (status) {
             case MessageRequestObserverInterface::Status::SUCCESS_ACCEPTED:
                 /// Successful response, proceed to send next event if available.
@@ -265,12 +310,12 @@ bool DiscoveryEventSender::sendDiscoveryEvents(
     const std::vector<std::string>& endpointConfigurations,
     const std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface>& messageSender,
     bool isAddOrUpdateReportEvent) {
-    int currentEventSize = 0;
+    size_t currentEventSize = 0;
     std::vector<std::string> currentEndpointConfigurationsBuffer;
     auto currentEndpointConfigIt = endpointConfigurations.begin();
 
     while (currentEndpointConfigIt != endpointConfigurations.end()) {
-        int currentEndpointConfigSize = currentEndpointConfigIt->size();
+        size_t currentEndpointConfigSize = currentEndpointConfigIt->size();
 
         bool sendEvent = false;
 
@@ -309,7 +354,7 @@ bool DiscoveryEventSender::sendDiscoveryEvents(
 
 bool DiscoveryEventSender::sendAddOrUpdateReportEvents(
     const std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface>& messageSender) {
-    ACSDK_DEBUG5(LX(__func__).d("num endpoints", m_addOrUpdateReportEndpoints.size()));
+    ACSDK_INFO(LX(__func__).d("num endpoints", m_addOrUpdateReportEndpoints.size()));
 
     if (m_addOrUpdateReportEndpoints.empty()) {
         ACSDK_DEBUG5(LX(__func__).m("endpoints list empty"));
@@ -380,7 +425,7 @@ void DiscoveryEventSender::removeDiscoveryStatusObserver(
 }
 
 void DiscoveryEventSender::reportDiscoveryStatus(MessageRequestObserverInterface::Status status) {
-    ACSDK_DEBUG5(LX(__func__));
+    ACSDK_INFO(LX(__func__).d("status", status));
 
     std::shared_ptr<DiscoveryStatusObserverInterface> observer;
     {
diff --git a/CapabilitiesDelegate/src/PostConnectCapabilitiesPublisher.cpp b/CapabilitiesDelegate/src/PostConnectCapabilitiesPublisher.cpp
index 85eeb62e58..e86ebb76d4 100644
--- a/CapabilitiesDelegate/src/PostConnectCapabilitiesPublisher.cpp
+++ b/CapabilitiesDelegate/src/PostConnectCapabilitiesPublisher.cpp
@@ -30,7 +30,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace capabilitiesDelegate::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PostConnectCapabilitiesPublisher");
+#define TAG "PostConnectCapabilitiesPublisher"
 
 /**
  * Create a LogEntry using the file's TAG and the specified event string.
@@ -56,11 +56,13 @@ PostConnectCapabilitiesPublisher::PostConnectCapabilitiesPublisher(
     std::shared_ptr<DiscoveryEventSenderInterface> discoveryEventSender) :
         m_isPerformOperationInvoked{false},
         m_discoveryEventSender{std::move(discoveryEventSender)} {
+    ACSDK_INFO(LX("init").p("this", this));
 }
 
 PostConnectCapabilitiesPublisher::~PostConnectCapabilitiesPublisher() {
     ACSDK_DEBUG5(LX(__func__));
     m_discoveryEventSender->stop();
+    ACSDK_INFO(LX("destroyed").p("this", this));
 }
 
 unsigned int PostConnectCapabilitiesPublisher::getOperationPriority() {
@@ -68,7 +70,7 @@ unsigned int PostConnectCapabilitiesPublisher::getOperationPriority() {
 }
 
 bool PostConnectCapabilitiesPublisher::performOperation(const std::shared_ptr<MessageSenderInterface>& messageSender) {
-    ACSDK_DEBUG5(LX(__func__));
+    ACSDK_INFO(LX(__func__));
     if (!messageSender) {
         ACSDK_ERROR(LX("performOperationFailed").d("reason", "nullPostConnectSender"));
         return false;
@@ -92,7 +94,7 @@ bool PostConnectCapabilitiesPublisher::performOperation(const std::shared_ptr<Me
 }
 
 void PostConnectCapabilitiesPublisher::abortOperation() {
-    ACSDK_DEBUG5(LX(__func__));
+    ACSDK_INFO(LX(__func__));
     m_discoveryEventSender->stop();
 }
 
diff --git a/CapabilitiesDelegate/src/Storage/SQLiteCapabilitiesDelegateStorage.cpp b/CapabilitiesDelegate/src/Storage/SQLiteCapabilitiesDelegateStorage.cpp
index 0fb734095d..9b18a94afc 100644
--- a/CapabilitiesDelegate/src/Storage/SQLiteCapabilitiesDelegateStorage.cpp
+++ b/CapabilitiesDelegate/src/Storage/SQLiteCapabilitiesDelegateStorage.cpp
@@ -24,7 +24,7 @@ namespace storage {
 using namespace avsCommon::utils::configuration;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SQLiteCapabilitiesDelegateStorage");
+#define TAG "SQLiteCapabilitiesDelegateStorage"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CapabilitiesDelegate/src/Utils/DiscoveryUtils.cpp b/CapabilitiesDelegate/src/Utils/DiscoveryUtils.cpp
index 62c7dcdb3b..6fa4a4a786 100644
--- a/CapabilitiesDelegate/src/Utils/DiscoveryUtils.cpp
+++ b/CapabilitiesDelegate/src/Utils/DiscoveryUtils.cpp
@@ -25,7 +25,7 @@
 #include <Endpoints/EndpointAttributeValidation.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DiscoveryUtils");
+#define TAG "DiscoveryUtils"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -113,6 +113,14 @@ static const std::string SCOPE_TYPE_BEARER_TOKEN = "BearerToken";
 /// Scope Token key
 static const std::string SCOPE_TOKEN_KEY = "token";
 
+/// Maximum number of endpoints for a user.
+/// See here for more information: https://developer.amazon.com/en-US/docs/alexa/device-apis/alexa-discovery.html#limits
+static constexpr size_t MAX_ENDPOINTS = 300;
+
+/// Maximum capabilities per endpoint.
+/// See here for more information: https://developer.amazon.com/en-US/docs/alexa/device-apis/alexa-discovery.html#limits
+static constexpr size_t MAX_CAPABILITIES_PER_ENDPOINT = 100;
+
 /**
  * Helper struct to build json objects
  */
@@ -414,6 +422,14 @@ std::string getDeleteReportEventJson(
     return buildJsonEventString(header, Optional<AVSMessageEndpoint>(), payloadGenerator.toString());
 }
 
+size_t getMaxEndpoints() {
+    return MAX_ENDPOINTS;
+}
+
+size_t getMaxCapabilitiesPerEndpoint() {
+    return MAX_CAPABILITIES_PER_ENDPOINT;
+}
+
 }  // namespace utils
 }  // namespace capabilitiesDelegate
 }  // namespace alexaClientSDK
diff --git a/CapabilitiesDelegate/test/CapabilitiesDelegateTest.cpp b/CapabilitiesDelegate/test/CapabilitiesDelegateTest.cpp
index f170dba2fd..d8abc4caf9 100644
--- a/CapabilitiesDelegate/test/CapabilitiesDelegateTest.cpp
+++ b/CapabilitiesDelegate/test/CapabilitiesDelegateTest.cpp
@@ -57,6 +57,22 @@ static const std::string EVENT_CORRELATION_TOKEN_KEY = "eventCorrelationToken";
 /// Constant representing the timeout for test events.
 /// @note Use a large enough value that should not fail even in slower systems.
 static const std::chrono::seconds MY_WAIT_TIMEOUT{5};
+/// A Test client Id.
+static const std::string TEST_CLIENT_ID = "TEST_CLIENT_ID";
+/// A Test product Id.
+static const std::string TEST_PRODUCT_ID = "TEST_PRODUCT_ID";
+/// A Test serial number.
+static const std::string TEST_SERIAL_NUMBER = "TEST_SERIAL_NUMBER";
+/// A Test product Id.
+static const std::string TEST_REGISTRATION_KEY = "TEST_REGISTRATION_KEY";
+/// A Test product Id Key.
+static const std::string TEST_PRODUCT_ID_KEY = "TEST_PRODUCT_ID_KEY";
+/// A Test manufacturer name.
+static const std::string TEST_MANUFACTURER_NAME = "TEST_MANUFACTURER_NAME";
+/// A Test description.
+static const std::string TEST_DESCRIPTION = "TEST_DESCRIPTION";
+/// A Test display category.
+static const std::string TEST_DISPLAY_CATEGORY = "TEST_DISPLAY_CATEGORY";
 
 /**
  * Structure to store event data from a Discovery event JSON.
@@ -79,13 +95,29 @@ AVSDiscoveryEndpointAttributes createEndpointAttributes(const std::string endpoi
     AVSDiscoveryEndpointAttributes attributes;
 
     attributes.endpointId = endpointId;
-    attributes.description = "TEST_DESCRIPTION";
-    attributes.manufacturerName = "TEST_MANUFACTURER_NAME";
-    attributes.displayCategories = {"TEST_DISPLAY_CATEGORY"};
+    attributes.description = TEST_DESCRIPTION;
+    attributes.manufacturerName = TEST_MANUFACTURER_NAME;
+    attributes.displayCategories = {TEST_DISPLAY_CATEGORY};
 
     return attributes;
 }
 
+/**
+ * Create a test @c AVSDiscoveryEndpointAttributes::Registration object.
+ * @param productId Optional product Id to use in these attributes.
+ * @param serialNumber Optional device serial number to use in these attributes.
+ * @param registrationKey Optional registration key to use in these attributes.
+ * @param productIdKey Optional product Id Key to use in these attributes.
+ * @return a @c AVSDiscoveryEndpointAttributes::Registration structure.
+ */
+AVSDiscoveryEndpointAttributes::Registration createEndpointRegistration(
+    const std::string productID = TEST_PRODUCT_ID,
+    const std::string serialNumber = TEST_SERIAL_NUMBER,
+    const std::string registrationKey = TEST_REGISTRATION_KEY,
+    const std::string productIdKey = TEST_PRODUCT_ID_KEY) {
+    return AVSDiscoveryEndpointAttributes::Registration(productID, serialNumber, registrationKey, productIdKey);
+}
+
 /**
  * Creates a test @c CapabilityConfiguration.
  * @return a @c CapabilityConfiguration structure.
@@ -124,6 +156,12 @@ class CapabilitiesDelegateTest : public Test {
     /// Helper that validates dynamically adding an endpoint. Used for testing dynamic delete.
     void addEndpoint(AVSDiscoveryEndpointAttributes attributes, CapabilityConfiguration configuration);
 
+    /// Helper that validates dynamically adding an endpoint. Used for testing dynamic delete.
+    void addEndpointToCapabilitiesDelegate(
+        std::shared_ptr<CapabilitiesDelegate>,
+        AVSDiscoveryEndpointAttributes attributes,
+        CapabilityConfiguration configuration);
+
     /*
      * Gets the event correlation token string.
      * @param request The message request to parse.
@@ -162,6 +200,7 @@ void CapabilitiesDelegateTest::SetUp() {
     /// Expect calls to storage.
     EXPECT_CALL(*m_mockCapabilitiesStorage, open()).WillOnce(Return(true));
     m_capabilitiesDelegate = CapabilitiesDelegate::create(m_mockAuthDelegate, m_mockCapabilitiesStorage, m_dataManager);
+
     ASSERT_NE(m_capabilitiesDelegate, nullptr);
 
     /// Add a new observer and it receives notifications of the current capabilities state.
@@ -281,6 +320,7 @@ TEST_F(CapabilitiesDelegateTest, test_init) {
     EXPECT_CALL(*m_mockCapabilitiesStorage, createDatabase()).WillOnce(Return(true));
 
     instance = CapabilitiesDelegate::create(m_mockAuthDelegate, m_mockCapabilitiesStorage, m_dataManager);
+
     ASSERT_NE(instance, nullptr);
     instance->shutdown();
 }
@@ -656,8 +696,8 @@ TEST_F(CapabilitiesDelegateTest, test_createPostConnectOperationWithDifferentEnd
             }));
 
     auto instance = CapabilitiesDelegate::create(m_mockAuthDelegate, m_mockCapabilitiesStorage, m_dataManager);
-    instance->addOrUpdateEndpoint(endpointAttributes, {capabilityConfig});
 
+    instance->addOrUpdateEndpoint(endpointAttributes, {capabilityConfig});
     /// Endpoint config is different from the endpoint config created with the test endpoint attributes so a
     /// post connect operation is created.
     auto publisher = instance->createPostConnectOperation();
@@ -1032,6 +1072,69 @@ TEST_F(
     instance->shutdown();
 }
 
+/**
+ * Tests if the createPostConnectOperation() creates a new @c PostConnectCapabilitiesPublisher when registered
+ * endpoint configurations are same as the ones in storage, but there is one additional stored endpoint that is
+ * not registered (and needs to be deleted).
+ * Tests CapabilitiesObservers are notified of added endpoints even though they were not published in an event.
+ * Tests if CapabilitiesDelegate returns a non-null post connect operation, since there is a stale endpoint to delete.
+ */
+TEST_F(
+    CapabilitiesDelegateTest,
+    test_createPostConnectOperationWithNewEndpointAndPendingEndpointsWithSameEndpointConfigs) {
+    auto unchangedEndpointAttributes = createEndpointAttributes("endpointId");
+    auto unchangedEndpointConfiguration = createCapabilityConfiguration();
+    std::vector<CapabilityConfiguration> unchangedCapabilityConfigs = {unchangedEndpointConfiguration};
+
+    auto newEndpointAttributes = createEndpointAttributes("newEndpointId");
+    auto newEndpointConfiguration = createCapabilityConfiguration();
+    std::vector<CapabilityConfiguration> newCapabilityConfigs = {newEndpointConfiguration};
+
+    std::string unchangedEndpointConfig =
+        utils::getEndpointConfigJson(unchangedEndpointAttributes, unchangedCapabilityConfigs);
+    std::string newEndpointConfig = utils::getEndpointConfigJson(newEndpointAttributes, newCapabilityConfigs);
+    EXPECT_CALL(*m_mockCapabilitiesStorage, open()).Times(1).WillOnce(Return(true));
+    EXPECT_CALL(*m_mockCapabilitiesStorage, load(_))
+        .Times(1)
+        .WillOnce(
+            Invoke([unchangedEndpointAttributes, unchangedEndpointConfig, newEndpointAttributes, newEndpointConfig](
+                       std::unordered_map<std::string, std::string>* storedEndpoints) {
+                storedEndpoints->insert({unchangedEndpointAttributes.endpointId, unchangedEndpointConfig});
+                return true;
+            }));
+    EXPECT_CALL(*m_mockCapabilitiesDelegateObserver, onCapabilitiesStateChange(_, _, _, _))
+        .WillOnce(Invoke([](CapabilitiesDelegateObserverInterface::State newState,
+                            CapabilitiesDelegateObserverInterface::Error newError,
+                            std::vector<std::string> addOrUpdateReportEndpointIdentifiers,
+                            std::vector<std::string> deleteReportEndpointIdentifiers) {
+            EXPECT_EQ(newState, CapabilitiesDelegateObserverInterface::State::UNINITIALIZED);
+            EXPECT_EQ(newError, CapabilitiesDelegateObserverInterface::Error::UNINITIALIZED);
+            EXPECT_EQ(addOrUpdateReportEndpointIdentifiers, std::vector<std::string>{});
+            EXPECT_EQ(deleteReportEndpointIdentifiers, std::vector<std::string>{});
+        }));
+
+    auto instance = CapabilitiesDelegate::create(m_mockAuthDelegate, m_mockCapabilitiesStorage, m_dataManager);
+    instance->addCapabilitiesObserver(m_mockCapabilitiesDelegateObserver);
+    instance->addOrUpdateEndpoint(unchangedEndpointAttributes, unchangedCapabilityConfigs);
+    instance->addOrUpdateEndpoint(newEndpointAttributes, newCapabilityConfigs);
+
+    /// Observer callback should only contain the pending endpoint to add (since that is already registered),
+    /// but not the stale endpoint to delete (since that still needs to be sent to AVS).
+    EXPECT_CALL(
+        *m_mockCapabilitiesDelegateObserver,
+        onCapabilitiesStateChange(
+            CapabilitiesDelegateObserverInterface::State::SUCCESS,
+            CapabilitiesDelegateObserverInterface::Error::SUCCESS,
+            std::vector<std::string>{unchangedEndpointAttributes.endpointId},
+            std::vector<std::string>{}));
+
+    auto publisher = instance->createPostConnectOperation();
+    ASSERT_NE(publisher, nullptr);
+
+    // Clean-up.
+    instance->shutdown();
+}
+
 /**
  * Tests if before the stale endpoint is deleted and the stale endpoint is added, that the first
  * createPostConnectOperation will create a deleteReport for the stale endpoint, but the second
@@ -1534,6 +1637,537 @@ TEST_F(CapabilitiesDelegateTest, test_duplicateEndpointInPendingAddOrUpdateAndDe
     ASSERT_FALSE(m_capabilitiesDelegate->addOrUpdateEndpoint(deleteEndpointAttributes, {capabilityConfig}));
 }
 
+/**
+ * Test endpoint registrations.
+ * Confirm that changing the registration of an endpoint results in a failure.
+ * Also confirm that adding an endpoint with a different registration results in a failure.
+ */
+TEST_F(CapabilitiesDelegateTest, test_registration) {
+    const std::string endpointID1{"TEST_ENDPOINT_ID_1"};
+    const std::string endpointID2{"TEST_ENDPOINT_ID_2"};
+    const std::string endpointID3{"TEST_ENDPOINT_ID_3"};
+
+    /// Configure endpointId1 attributes with a non-empty registration.
+    auto endpointAttributes1 = createEndpointAttributes(endpointID1);
+    endpointAttributes1.registration = createEndpointRegistration();
+
+    auto capabilityConfig = createCapabilityConfiguration();
+
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes1, {capabilityConfig}));
+
+    /// Try endpointId1 with empty registration.
+    auto updatedEndpointAttributes1 = createEndpointAttributes(endpointID1);
+    ASSERT_FALSE(m_capabilitiesDelegate->addOrUpdateEndpoint(updatedEndpointAttributes1, {capabilityConfig}));
+
+    /// Configure endpointId2 attributes with a non-empty registration.
+    auto endpointAttributes2 = createEndpointAttributes(endpointID2);
+    endpointAttributes2.registration = createEndpointRegistration();
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes2, {capabilityConfig}));
+
+    /// Try endpointId2 with non-empty registration.
+    auto updatedEndpointAttributes2 = createEndpointAttributes(endpointID2);
+    updatedEndpointAttributes2.registration = createEndpointRegistration("UPDATED_PRODUCT_ID");
+    ASSERT_FALSE(m_capabilitiesDelegate->addOrUpdateEndpoint(updatedEndpointAttributes2, {capabilityConfig}));
+
+    /// Try endpointId3 with different and non-empty registration.
+    auto updatedEndpointAttributes3 = createEndpointAttributes(endpointID3);
+    updatedEndpointAttributes3.registration = createEndpointRegistration("UPDATED_PRODUCT_ID");
+    ASSERT_FALSE(m_capabilitiesDelegate->addOrUpdateEndpoint(updatedEndpointAttributes3, {capabilityConfig}));
+}
+
+/**
+ * Test adding 3 endpoints that share registration information (i.e. they are de-duplicated in the cloud).
+ * Verify that other endpoints are sent in the discovery message whenever an endpoint is added.
+ * Finally, update the first endpoint that was sent and confirm that all endpoints are sent in the discovery message.
+ */
+TEST_F(CapabilitiesDelegateTest, test_addAndUpdateOfDeduplicatedEndpoints) {
+    m_capabilitiesDelegate->onConnectionStatusChanged(
+        ConnectionStatusObserverInterface::Status::CONNECTED,
+        ConnectionStatusObserverInterface::ChangedReason::SUCCESS);
+
+    WaitEvent e;
+    validateAuthDelegate();
+
+    const std::string endpointID1{"TEST_ENDPOINT_ID_1"};
+    const std::string endpointID2{"TEST_ENDPOINT_ID_2"};
+    const std::string endpointID3{"TEST_ENDPOINT_ID_3"};
+
+    /// Set-up.
+    auto endpointAttributes1 = createEndpointAttributes(endpointID1);
+    endpointAttributes1.registration = createEndpointRegistration();
+
+    auto endpointAttributes2 = createEndpointAttributes(endpointID2);
+    endpointAttributes2.registration = createEndpointRegistration();
+
+    auto endpointAttributes3 = createEndpointAttributes(endpointID3);
+    endpointAttributes3.registration = createEndpointRegistration();
+
+    auto capabilityConfig = createCapabilityConfiguration();
+
+    /// endpointId1 is being registered first. The Discovery message should only contain it.
+    /// Expect calls to MessageSender.
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([this](std::shared_ptr<MessageRequest> request) {
+            std::string eventCorrelationTokenString;
+            getEventCorrelationTokenString(request, eventCorrelationTokenString);
+
+            request->sendCompleted(MessageRequestObserverInterface::Status::SUCCESS_ACCEPTED);
+            m_capabilitiesDelegate->onAlexaEventProcessedReceived(eventCorrelationTokenString);
+        }));
+    /// Expect call to storage.
+    EXPECT_CALL(*m_mockCapabilitiesStorage, store(_)).WillOnce(Return(true));
+    EXPECT_CALL(*m_mockCapabilitiesStorage, erase((std::unordered_map<std::string, std::string>{})))
+        .WillOnce(Return(true));
+
+    /// Expect callback to CapabilitiesObserver.
+    EXPECT_CALL(*m_mockCapabilitiesDelegateObserver, onCapabilitiesStateChange(_, _, _, _))
+        .WillOnce(Invoke([&](CapabilitiesDelegateObserverInterface::State state,
+                             CapabilitiesDelegateObserverInterface::Error error,
+                             std::vector<std::string> addedEndpoints,
+                             std::vector<std::string> deletedEndpoints) {
+            EXPECT_EQ(state, CapabilitiesDelegateObserverInterface::State::SUCCESS);
+            EXPECT_EQ(error, CapabilitiesDelegateObserverInterface::Error::SUCCESS);
+            EXPECT_EQ(addedEndpoints, std::vector<std::string>{endpointID1});
+            EXPECT_EQ(deletedEndpoints, (std::vector<std::string>{}));
+
+            e.wakeUp();
+        }));
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes1, {capabilityConfig}));
+    ASSERT_TRUE(e.wait(MY_WAIT_TIMEOUT));
+    e.reset();
+
+    /// endpointId1 has already been registered. Confirm that it is added when endpointId2 is added.
+    /// Expect calls to MessageSender.
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([this](std::shared_ptr<MessageRequest> request) {
+            std::string eventCorrelationTokenString;
+            getEventCorrelationTokenString(request, eventCorrelationTokenString);
+
+            request->sendCompleted(MessageRequestObserverInterface::Status::SUCCESS_ACCEPTED);
+            m_capabilitiesDelegate->onAlexaEventProcessedReceived(eventCorrelationTokenString);
+        }));
+    /// Expect call to storage.
+    EXPECT_CALL(*m_mockCapabilitiesStorage, store(_)).WillOnce(Return(true));
+    EXPECT_CALL(*m_mockCapabilitiesStorage, erase((std::unordered_map<std::string, std::string>{})))
+        .WillOnce(Return(true));
+
+    /// Expect callback to CapabilitiesObserver.
+    EXPECT_CALL(*m_mockCapabilitiesDelegateObserver, onCapabilitiesStateChange(_, _, _, _))
+        .WillOnce(Invoke([&](CapabilitiesDelegateObserverInterface::State state,
+                             CapabilitiesDelegateObserverInterface::Error error,
+                             std::vector<std::string> addedEndpoints,
+                             std::vector<std::string> deletedEndpoints) {
+            std::vector<std::string> expectedAddedEndpoints{endpointID1, endpointID2};
+            std::sort(expectedAddedEndpoints.begin(), expectedAddedEndpoints.end());
+            std::sort(addedEndpoints.begin(), addedEndpoints.end());
+            EXPECT_EQ(state, CapabilitiesDelegateObserverInterface::State::SUCCESS);
+            EXPECT_EQ(error, CapabilitiesDelegateObserverInterface::Error::SUCCESS);
+            EXPECT_EQ(addedEndpoints, expectedAddedEndpoints);
+            EXPECT_EQ(deletedEndpoints, (std::vector<std::string>{}));
+
+            e.wakeUp();
+        }));
+
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes2, {capabilityConfig}));
+    ASSERT_TRUE(e.wait(MY_WAIT_TIMEOUT));
+    e.reset();
+
+    /// endpointId1 and endpointId2 have already been registered. Confirm that they are added when endpointId3 is added.
+    /// Expect calls to MessageSender.
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([this](std::shared_ptr<MessageRequest> request) {
+            std::string eventCorrelationTokenString;
+            getEventCorrelationTokenString(request, eventCorrelationTokenString);
+
+            request->sendCompleted(MessageRequestObserverInterface::Status::SUCCESS_ACCEPTED);
+            m_capabilitiesDelegate->onAlexaEventProcessedReceived(eventCorrelationTokenString);
+        }));
+    /// Expect call to storage.
+    EXPECT_CALL(*m_mockCapabilitiesStorage, store(_)).WillOnce(Return(true));
+    EXPECT_CALL(*m_mockCapabilitiesStorage, erase((std::unordered_map<std::string, std::string>{})))
+        .WillOnce(Return(true));
+
+    /// Expect callback to CapabilitiesObserver.
+    EXPECT_CALL(*m_mockCapabilitiesDelegateObserver, onCapabilitiesStateChange(_, _, _, _))
+        .WillOnce(Invoke([&](CapabilitiesDelegateObserverInterface::State state,
+                             CapabilitiesDelegateObserverInterface::Error error,
+                             std::vector<std::string> addedEndpoints,
+                             std::vector<std::string> deletedEndpoints) {
+            std::vector<std::string> expectedAddedEndpoints{endpointID1, endpointID2, endpointID3};
+            std::sort(expectedAddedEndpoints.begin(), expectedAddedEndpoints.end());
+            std::sort(addedEndpoints.begin(), addedEndpoints.end());
+            EXPECT_EQ(state, CapabilitiesDelegateObserverInterface::State::SUCCESS);
+            EXPECT_EQ(error, CapabilitiesDelegateObserverInterface::Error::SUCCESS);
+            EXPECT_EQ(addedEndpoints, expectedAddedEndpoints);
+            EXPECT_EQ(deletedEndpoints, (std::vector<std::string>{}));
+
+            e.wakeUp();
+        }));
+
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes3, {capabilityConfig}));
+    ASSERT_TRUE(e.wait(MY_WAIT_TIMEOUT));
+    e.reset();
+
+    /// Update the configuration
+    std::string additionalAttribute(256 * 10, 'X');
+    std::map<std::string, std::string> additionalAttributes;
+    additionalAttributes["test"] = "{\"test\":\"" + additionalAttribute + "\"}";
+    auto updatedCapabilityConfig = createCapabilityConfiguration(additionalAttributes);
+
+    auto updatedEndpointAttributes1 = createEndpointAttributes(endpointID1);
+    updatedEndpointAttributes1.registration = createEndpointRegistration();
+
+    /// endpointId1, endpointId2 and endpointId3 have already been registered. Confirm that they are added when
+    /// endpointId1 is updated.
+    /// Expect calls to MessageSender.
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([this](std::shared_ptr<MessageRequest> request) {
+            std::string eventCorrelationTokenString;
+            getEventCorrelationTokenString(request, eventCorrelationTokenString);
+
+            request->sendCompleted(MessageRequestObserverInterface::Status::SUCCESS_ACCEPTED);
+            m_capabilitiesDelegate->onAlexaEventProcessedReceived(eventCorrelationTokenString);
+        }));
+    /// Expect call to storage.
+    EXPECT_CALL(*m_mockCapabilitiesStorage, store(_)).WillOnce(Return(true));
+    EXPECT_CALL(*m_mockCapabilitiesStorage, erase((std::unordered_map<std::string, std::string>{})))
+        .WillOnce(Return(true));
+
+    /// Expect callback to CapabilitiesObserver.
+    EXPECT_CALL(*m_mockCapabilitiesDelegateObserver, onCapabilitiesStateChange(_, _, _, _))
+        .WillOnce(Invoke([&](CapabilitiesDelegateObserverInterface::State state,
+                             CapabilitiesDelegateObserverInterface::Error error,
+                             std::vector<std::string> addedEndpoints,
+                             std::vector<std::string> deletedEndpoints) {
+            std::vector<std::string> expectedAddedEndpoints{endpointID1, endpointID2, endpointID3};
+            std::sort(expectedAddedEndpoints.begin(), expectedAddedEndpoints.end());
+            std::sort(addedEndpoints.begin(), addedEndpoints.end());
+            EXPECT_EQ(state, CapabilitiesDelegateObserverInterface::State::SUCCESS);
+            EXPECT_EQ(error, CapabilitiesDelegateObserverInterface::Error::SUCCESS);
+            EXPECT_EQ(addedEndpoints, expectedAddedEndpoints);
+            EXPECT_EQ(deletedEndpoints, (std::vector<std::string>{}));
+
+            e.wakeUp();
+        }));
+
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(updatedEndpointAttributes1, {updatedCapabilityConfig}));
+    ASSERT_TRUE(e.wait(MY_WAIT_TIMEOUT));
+}
+
+/**
+ * Test that deleting a de-duplicated endpoint fails.
+ */
+TEST_F(CapabilitiesDelegateTest, test_deduplictedDeletionFailure) {
+    m_capabilitiesDelegate->onConnectionStatusChanged(
+        ConnectionStatusObserverInterface::Status::CONNECTED,
+        ConnectionStatusObserverInterface::ChangedReason::SUCCESS);
+
+    WaitEvent e;
+    validateAuthDelegate();
+
+    const std::string endpointID1{"TEST_ENDPOINT_ID_1"};
+    const std::string endpointID2{"TEST_ENDPOINT_ID_2"};
+
+    auto endpointAttributes1 = createEndpointAttributes(endpointID1);
+    endpointAttributes1.registration = createEndpointRegistration();
+
+    auto capabilityConfig = createCapabilityConfiguration();
+    auto capabilityConfigJson = utils::getEndpointConfigJson(endpointAttributes1, {capabilityConfig});
+
+    /// endpointId1 is being registered first. The Discovery message should only contain it.
+    /// Expect calls to MessageSender.
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([this](std::shared_ptr<MessageRequest> request) {
+            std::string eventCorrelationTokenString;
+            getEventCorrelationTokenString(request, eventCorrelationTokenString);
+
+            request->sendCompleted(MessageRequestObserverInterface::Status::SUCCESS_ACCEPTED);
+            m_capabilitiesDelegate->onAlexaEventProcessedReceived(eventCorrelationTokenString);
+        }));
+    /// Expect call to storage.
+    EXPECT_CALL(*m_mockCapabilitiesStorage, store(_)).WillOnce(Return(true));
+    EXPECT_CALL(*m_mockCapabilitiesStorage, erase((std::unordered_map<std::string, std::string>{})))
+        .WillOnce(Return(true));
+
+    /// Expect callback to CapabilitiesObserver.
+    EXPECT_CALL(*m_mockCapabilitiesDelegateObserver, onCapabilitiesStateChange(_, _, _, _))
+        .WillOnce(Invoke([&](CapabilitiesDelegateObserverInterface::State state,
+                             CapabilitiesDelegateObserverInterface::Error error,
+                             std::vector<std::string> addedEndpoints,
+                             std::vector<std::string> deletedEndpoints) {
+            EXPECT_EQ(state, CapabilitiesDelegateObserverInterface::State::SUCCESS);
+            EXPECT_EQ(error, CapabilitiesDelegateObserverInterface::Error::SUCCESS);
+            EXPECT_EQ(addedEndpoints, std::vector<std::string>{endpointID1});
+            EXPECT_EQ(deletedEndpoints, (std::vector<std::string>{}));
+
+            e.wakeUp();
+        }));
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes1, {capabilityConfig}));
+    ASSERT_TRUE(e.wait(MY_WAIT_TIMEOUT));
+    e.reset();
+
+    /// Deleting endpoint 1 should fail.
+    ASSERT_FALSE(m_capabilitiesDelegate->deleteEndpoint(endpointAttributes1, {capabilityConfig}));
+}
+
+/**
+ * Test adding two pairs of 3 endpoints that share registration information (i.e. they are de-duplicated in the cloud).
+ * For this test, endpointid3 and endpointId6 have large configurations, preventing them from being sent in the same
+ * message.
+ * Verify that the endpoints are split into two messages, each containing 3 endpoints.
+ */
+TEST_F(CapabilitiesDelegateTest, test_SplitMessagePendingDeduplicatedEndpoints) {
+    m_capabilitiesDelegate->onConnectionStatusChanged(
+        ConnectionStatusObserverInterface::Status::DISCONNECTED,
+        ConnectionStatusObserverInterface::ChangedReason::SERVER_SIDE_DISCONNECT);
+
+    WaitEvent e;
+    validateAuthDelegate();
+
+    const std::string endpointID1{"TEST_ENDPOINT_ID_1"};
+    const std::string endpointID2{"TEST_ENDPOINT_ID_2"};
+    const std::string endpointID3{"TEST_ENDPOINT_ID_3"};
+
+    /// Set-up the first set of deduplicated endpoints.
+    auto endpointAttributes1 = createEndpointAttributes(endpointID1);
+    endpointAttributes1.registration = createEndpointRegistration();
+
+    auto endpointAttributes2 = createEndpointAttributes(endpointID2);
+    endpointAttributes2.registration = createEndpointRegistration();
+
+    auto endpointAttributes3 = createEndpointAttributes(endpointID3);
+    endpointAttributes3.registration = createEndpointRegistration();
+
+    const std::string endpointID4{"TEST_ENDPOINT_ID_4"};
+    const std::string endpointID5{"TEST_ENDPOINT_ID_5"};
+    const std::string endpointID6{"TEST_ENDPOINT_ID_6"};
+
+    /// Set-up the second set of endpoints.
+    auto endpointAttributes4 = createEndpointAttributes(endpointID4);
+
+    auto endpointAttributes5 = createEndpointAttributes(endpointID5);
+
+    auto endpointAttributes6 = createEndpointAttributes(endpointID6);
+
+    /// Create a large capability configuration for endpoint3 and endpoint6.
+    std::string additionalAttribute(240 * 1024, 'X');
+    std::map<std::string, std::string> additionalAttributes;
+    additionalAttributes["test"] = "{\"test\":\"" + additionalAttribute + "\"}";
+    auto largeCapabilityConfig = createCapabilityConfiguration(additionalAttributes);
+
+    /// Create a default capability configuration for the other endpoints.
+    auto capabilityConfig = createCapabilityConfiguration();
+
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes1, {capabilityConfig}));
+
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes2, {capabilityConfig}));
+
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes3, {largeCapabilityConfig}));
+
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes4, {capabilityConfig}));
+
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes5, {capabilityConfig}));
+
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes6, {largeCapabilityConfig}));
+
+    /// Upon connect, expect two messages to be sent. One with endpoints 1,2 and 3, and the other with endpoints 4, 5
+    /// and 6. Expect calls to MessageSender.
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_))
+        .Times(Exactly(2))
+        .WillRepeatedly(Invoke([this](std::shared_ptr<MessageRequest> request) {
+            std::string eventCorrelationTokenString;
+            getEventCorrelationTokenString(request, eventCorrelationTokenString);
+
+            request->sendCompleted(MessageRequestObserverInterface::Status::SUCCESS_ACCEPTED);
+            m_capabilitiesDelegate->onAlexaEventProcessedReceived(eventCorrelationTokenString);
+        }));
+    /// Expect call to storage.
+    EXPECT_CALL(*m_mockCapabilitiesStorage, store(_)).WillRepeatedly(Return(true));
+    EXPECT_CALL(*m_mockCapabilitiesStorage, erase((std::unordered_map<std::string, std::string>{})))
+        .WillRepeatedly(Return(true));
+
+    /// Expect callback to CapabilitiesObserver.
+    std::vector<std::vector<std::string>> expectedAddedEndpoints{{endpointID1, endpointID2, endpointID3},
+                                                                 {endpointID4, endpointID5, endpointID6}};
+    int other{0};
+    EXPECT_CALL(*m_mockCapabilitiesDelegateObserver, onCapabilitiesStateChange(_, _, _, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&](CapabilitiesDelegateObserverInterface::State state,
+                             CapabilitiesDelegateObserverInterface::Error error,
+                             std::vector<std::string> addedEndpoints,
+                             std::vector<std::string> deletedEndpoints) {
+            std::sort(addedEndpoints.begin(), addedEndpoints.end());
+            EXPECT_EQ(state, CapabilitiesDelegateObserverInterface::State::SUCCESS);
+            EXPECT_EQ(error, CapabilitiesDelegateObserverInterface::Error::SUCCESS);
+            if (addedEndpoints[0] == endpointID1) {
+                other = 1;
+                EXPECT_EQ(addedEndpoints, expectedAddedEndpoints[0]);
+            } else {
+                EXPECT_EQ(addedEndpoints, expectedAddedEndpoints[1]);
+            }
+            EXPECT_EQ(deletedEndpoints, (std::vector<std::string>{}));
+        }))
+        .WillOnce(Invoke([&](CapabilitiesDelegateObserverInterface::State state,
+                             CapabilitiesDelegateObserverInterface::Error error,
+                             std::vector<std::string> addedEndpoints,
+                             std::vector<std::string> deletedEndpoints) {
+            std::sort(addedEndpoints.begin(), addedEndpoints.end());
+            EXPECT_EQ(state, CapabilitiesDelegateObserverInterface::State::SUCCESS);
+            EXPECT_EQ(error, CapabilitiesDelegateObserverInterface::Error::SUCCESS);
+            EXPECT_EQ(addedEndpoints, expectedAddedEndpoints[other]);
+            EXPECT_EQ(deletedEndpoints, (std::vector<std::string>{}));
+            e.wakeUp();
+        }));
+
+    m_capabilitiesDelegate->onConnectionStatusChanged(
+        ConnectionStatusObserverInterface::Status::CONNECTED,
+        ConnectionStatusObserverInterface::ChangedReason::SUCCESS);
+
+    ASSERT_TRUE(e.wait(MY_WAIT_TIMEOUT));
+}
+
+/**
+ * Test limits of the Alexa.Discovery interface.
+ * Specifically test :
+ * 1. Adding more than 300 deduplicated endpoints triggers a failure.
+ * 2. Having more than 100 capabilities per deduplicated endpoint triggers a failure.
+ * This is because a single discovery message cannot contain more than 300 endpoints, per the limits imposed here:
+ * https://developer.amazon.com/en-US/docs/alexa/device-apis/alexa-discovery.html#limits
+ */
+TEST_F(CapabilitiesDelegateTest, test_endpointLimits) {
+    // Create deduplicated endpoints
+    for (size_t i = 0; i < getMaxEndpoints(); ++i) {
+        const std::string testEndpointID = "TEST_ENDPOINT_ID_" + std::to_string(i);
+
+        auto endpointAttributes = createEndpointAttributes(testEndpointID);
+        endpointAttributes.registration = createEndpointRegistration();
+        auto capabilityConfig = createCapabilityConfiguration();
+
+        ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes, {capabilityConfig}));
+    }
+    const std::string lastEndpointID = "TEST_ENDPOINT_ID_LAST";
+    auto lastEndpointAttributes = createEndpointAttributes(lastEndpointID);
+    lastEndpointAttributes.registration = createEndpointRegistration();
+    auto lastCapabilityConfig = createCapabilityConfiguration();
+
+    ASSERT_FALSE(m_capabilitiesDelegate->addOrUpdateEndpoint(lastEndpointAttributes, {lastCapabilityConfig}));
+
+    const std::string endpointID = "TEST_ENDPOINT_ID";
+
+    /// Add a deduplicated endpoint with more than MAX_CAPABILITIES_PER_ENDPOINT capabilities.
+    auto endpointAttributes = createEndpointAttributes(endpointID);
+    endpointAttributes.registration = createEndpointRegistration();
+    std::vector<CapabilityConfiguration> largeConfig;
+    for (size_t i = 0; i <= getMaxCapabilitiesPerEndpoint(); ++i) {
+        largeConfig.push_back(createCapabilityConfiguration());
+    }
+
+    ASSERT_FALSE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes, largeConfig));
+}
+
+/**
+ * Test updating a deduplicated endpoint when it is in flight.
+ */
+TEST_F(CapabilitiesDelegateTest, test_updateDeduplicatedEndpointWhenInflight) {
+    m_capabilitiesDelegate->onConnectionStatusChanged(
+        ConnectionStatusObserverInterface::Status::CONNECTED,
+        ConnectionStatusObserverInterface::ChangedReason::SUCCESS);
+    WaitEvent e;
+    validateAuthDelegate();
+
+    const std::string endpointID{"TEST_ENDPOINT_ID"};
+
+    /// Set-up.
+    auto endpointAttributes = createEndpointAttributes(endpointID);
+    endpointAttributes.registration = createEndpointRegistration();
+
+    auto capabilityConfig = createCapabilityConfiguration();
+
+    addEndpoint(endpointAttributes, {capabilityConfig});
+
+    /// Add a DiscoveryEventSender to simulate Discovery event in-flight.
+    auto discoveryEventSender = std::make_shared<StrictMock<MockDiscoveryEventSender>>();
+    EXPECT_CALL(*discoveryEventSender, addDiscoveryStatusObserver(_))
+        .WillOnce(Invoke([this](const std::shared_ptr<DiscoveryStatusObserverInterface>& observer) {
+            EXPECT_EQ(observer, m_capabilitiesDelegate);
+        }));
+    EXPECT_CALL(*discoveryEventSender, removeDiscoveryStatusObserver(_))
+        .WillOnce(Invoke([this](const std::shared_ptr<DiscoveryStatusObserverInterface>& observer) {
+            EXPECT_EQ(observer, m_capabilitiesDelegate);
+        }));
+    EXPECT_CALL(*discoveryEventSender, stop());
+    m_capabilitiesDelegate->setDiscoveryEventSender(discoveryEventSender);
+
+    /// Create an updated capability configuration for the update to endpoint1.
+    std::string additionalAttribute(2 * 1024, 'X');
+    std::map<std::string, std::string> additionalAttributes;
+    additionalAttributes["test"] = "{\"test\":\"" + additionalAttribute + "\"}";
+    auto updatedCapabilityConfig = createCapabilityConfiguration(additionalAttributes);
+
+    /// Expect no callback to CapabilitiesObserver, since the update remains in pending.
+    EXPECT_CALL(
+        *m_mockCapabilitiesDelegateObserver,
+        onCapabilitiesStateChange(_, _, std::vector<std::string>{endpointID}, std::vector<std::string>{}))
+        .Times(0);
+
+    /// endpointId1 is inflight. Should be able to add it again to the pending update set.
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes, {updatedCapabilityConfig}));
+}
+
+/**
+ * Test adding a deduplicated endpoint when another one is in flight.
+ * Verify that the first endpoint is also sent in the discovery message when the second endpoint is added.
+ */
+TEST_F(CapabilitiesDelegateTest, test_addDeduplicatedEndpointWhenOtherInflight) {
+    m_capabilitiesDelegate->onConnectionStatusChanged(
+        ConnectionStatusObserverInterface::Status::CONNECTED,
+        ConnectionStatusObserverInterface::ChangedReason::SUCCESS);
+
+    WaitEvent e;
+    validateAuthDelegate();
+
+    const std::string endpointID1{"TEST_ENDPOINT_ID_1"};
+    const std::string endpointID2{"TEST_ENDPOINT_ID_2"};
+
+    /// Set-up.
+    auto endpointAttributes1 = createEndpointAttributes(endpointID1);
+    endpointAttributes1.registration = createEndpointRegistration();
+
+    auto endpointAttributes2 = createEndpointAttributes(endpointID2);
+    endpointAttributes2.registration = createEndpointRegistration();
+
+    auto capabilityConfig = createCapabilityConfiguration();
+
+    addEndpoint(endpointAttributes1, {capabilityConfig});
+
+    /// Add a DiscoveryEventSender to simulate Discovery event in-flight.
+    auto discoveryEventSender = std::make_shared<StrictMock<MockDiscoveryEventSender>>();
+    EXPECT_CALL(*discoveryEventSender, addDiscoveryStatusObserver(_))
+        .WillOnce(Invoke([this](const std::shared_ptr<DiscoveryStatusObserverInterface>& observer) {
+            EXPECT_EQ(observer, m_capabilitiesDelegate);
+        }));
+    EXPECT_CALL(*discoveryEventSender, removeDiscoveryStatusObserver(_))
+        .WillOnce(Invoke([this](const std::shared_ptr<DiscoveryStatusObserverInterface>& observer) {
+            EXPECT_EQ(observer, m_capabilitiesDelegate);
+        }));
+    EXPECT_CALL(*discoveryEventSender, stop());
+    m_capabilitiesDelegate->setDiscoveryEventSender(discoveryEventSender);
+
+    /// Expect no callback to CapabilitiesObserver, since the add of endpoint2 remains in pending.
+    EXPECT_CALL(
+        *m_mockCapabilitiesDelegateObserver,
+        onCapabilitiesStateChange(_, _, std::vector<std::string>{endpointID1, endpointID2}, std::vector<std::string>{}))
+        .Times(0);
+
+    /// Endpoint1 is in flight. Confirm that Endpoint2 is added to the pending endpoints.
+    ASSERT_TRUE(m_capabilitiesDelegate->addOrUpdateEndpoint(endpointAttributes2, {capabilityConfig}));
+}
+
 }  // namespace test
 }  // namespace capabilitiesDelegate
 }  // namespace alexaClientSDK
diff --git a/CapabilityAgents/AIP/include/AIP/ASRProfile.h b/CapabilityAgents/AIP/include/AIP/ASRProfile.h
index 1e4bf8774c..e69fcace61 100644
--- a/CapabilityAgents/AIP/include/AIP/ASRProfile.h
+++ b/CapabilityAgents/AIP/include/AIP/ASRProfile.h
@@ -34,7 +34,9 @@ enum class ASRProfile {
     /// Cloud determines end of user speech (0 to 5 ft).
     NEAR_FIELD,
     /// Cloud determines end of user speech (0 to 20+ ft).
-    FAR_FIELD
+    FAR_FIELD,
+    /// Indicates that ASR profile is undefined.
+    UNDEFINED
 };
 
 /**
@@ -55,6 +57,9 @@ inline std::ostream& operator<<(std::ostream& stream, ASRProfile profile) {
         case ASRProfile::FAR_FIELD:
             stream << "FAR_FIELD";
             break;
+        case ASRProfile::UNDEFINED:
+            stream << "";
+            break;
     }
     return stream;
 }
@@ -73,10 +78,31 @@ inline std::string asrProfileToString(ASRProfile profile) {
             return "NEAR_FIELD";
         case ASRProfile::FAR_FIELD:
             return "FAR_FIELD";
+        case ASRProfile::UNDEFINED:
+            return "";
     }
     return "";
 }
 
+/**
+ * This function reverse maps the provided string to corresponding ASRProfile Implementation as specified by
+ * asrProfileToString
+ * @param input string to convert to corresponding ASRProfile
+ * @return @c ASRProfile that corresponds to the input string. In case of error
+ * the API returns ASRProfile::UNDEFINED
+ */
+inline ASRProfile getASRProfile(const std::string& input) {
+    ASRProfile profile = ASRProfile::UNDEFINED;
+    if (asrProfileToString(ASRProfile::CLOSE_TALK) == input) {
+        profile = ASRProfile::CLOSE_TALK;
+    } else if (asrProfileToString(ASRProfile::NEAR_FIELD) == input) {
+        profile = ASRProfile::NEAR_FIELD;
+    } else if (asrProfileToString(ASRProfile::FAR_FIELD) == input) {
+        profile = ASRProfile::FAR_FIELD;
+    }
+    return profile;
+}
+
 }  // namespace aip
 }  // namespace capabilityAgents
 }  // namespace alexaClientSDK
diff --git a/CapabilityAgents/AIP/include/AIP/AudioInputProcessor.h b/CapabilityAgents/AIP/include/AIP/AudioInputProcessor.h
index e01cda8854..e4bf67566b 100644
--- a/CapabilityAgents/AIP/include/AIP/AudioInputProcessor.h
+++ b/CapabilityAgents/AIP/include/AIP/AudioInputProcessor.h
@@ -23,6 +23,7 @@
 #include <unordered_set>
 #include <vector>
 
+#include <acsdk/AudioEncoderInterfaces/AudioEncoderInterface.h>
 #include <AVSCommon/AVS/Attachment/InProcessAttachmentReader.h>
 #include <AVSCommon/AVS/CapabilityAgent.h>
 #include <AVSCommon/AVS/CapabilityConfiguration.h>
@@ -50,13 +51,13 @@
 #include <AVSCommon/SDKInterfaces/SystemSoundPlayerInterface.h>
 #include <AVSCommon/SDKInterfaces/UserInactivityMonitorInterface.h>
 #include <AVSCommon/Utils/AudioFormat.h>
+#include <AVSCommon/Utils/Metrics/DataPointDurationBuilder.h>
 #include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
 #include <AVSCommon/Utils/RequiresShutdown.h>
 #include <AVSCommon/Utils/Threading/Executor.h>
 #include <AVSCommon/Utils/Timing/Timer.h>
 #include <Settings/DeviceSettingsManager.h>
 #include <Settings/SettingEventMetadata.h>
-#include <SpeechEncoder/SpeechEncoder.h>
 
 #include "AudioProvider.h"
 #include "Initiator.h"
@@ -149,7 +150,7 @@ class AudioInputProcessor
      *     configurations change.
      * @param wakeWordsSetting The setting that represents the enabled wake words. This parameter is required if this
      * device supports wake words.
-     * @param speechEncoder The Speech Encoder used to encode audio inputs. This parameter is optional and
+     * @param audioEncoder The Audio Encoder used to encode audio inputs. This parameter is optional and
      *     defaults to nullptr, which disable the encoding feature.
      * @param defaultAudioProvider A default @c avsCommon::AudioProvider to use for ExpectSpeech if the previous
      *     provider is not readable (@c avsCommon::AudioProvider::alwaysReadable).  This parameter is optional and
@@ -175,7 +176,7 @@ class AudioInputProcessor
         std::shared_ptr<settings::SpeechConfirmationSetting> speechConfirmation,
         const std::shared_ptr<avsCommon::avs::CapabilityChangeNotifierInterface>& capabilityChangeNotifier,
         std::shared_ptr<settings::WakeWordsSetting> wakeWordsSetting = nullptr,
-        std::shared_ptr<speechencoder::SpeechEncoder> speechEncoder = nullptr,
+        std::shared_ptr<audioEncoderInterfaces::AudioEncoderInterface> audioEncoder = nullptr,
         AudioProvider defaultAudioProvider = AudioProvider::null(),
         std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface> powerResourceManager = nullptr,
         std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder = nullptr,
@@ -396,7 +397,7 @@ class AudioInputProcessor
      * @param exceptionEncounteredSender The object to use for sending ExceptionEncountered messages.
      * @param userInactivityMonitor The object to use for resetting user inactivity.
      * @param systemSoundPlayer The instance of the system sound player.
-     * @param speechEncoder The Speech Encoder used to encode audio inputs. This parameter is optional and
+     * @param audioEncoder The Audio Encoder used to encode audio inputs. This parameter is optional and
      *     will disable the encoding feature if set to nullptr.
      * @param defaultAudioProvider A default @c avsCommon::AudioProvider to use for ExpectSpeech if the previous
      *     provider is not readable (@c AudioProvider::alwaysReadable).  This parameter is optional, and ignored if set
@@ -427,7 +428,7 @@ class AudioInputProcessor
         std::shared_ptr<avsCommon::sdkInterfaces::UserInactivityMonitorInterface> userInactivityMonitor,
         std::shared_ptr<avsCommon::sdkInterfaces::SystemSoundPlayerInterface> systemSoundPlayer,
         const std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>& assetsManager,
-        std::shared_ptr<speechencoder::SpeechEncoder> speechEncoder,
+        std::shared_ptr<audioEncoderInterfaces::AudioEncoderInterface> audioEncoder,
         AudioProvider defaultAudioProvider,
         std::shared_ptr<settings::WakeWordConfirmationSetting> wakeWordConfirmation,
         std::shared_ptr<settings::SpeechConfirmationSetting> speechConfirmation,
@@ -766,7 +767,7 @@ class AudioInputProcessor
     avsCommon::utils::timing::Timer m_expectingSpeechTimer;
 
     /// The Speech Encoder to encode input stream.
-    const std::shared_ptr<speechencoder::SpeechEncoder> m_encoder;
+    const std::shared_ptr<audioEncoderInterfaces::AudioEncoderInterface> m_encoder;
 
     /**
      * @name Executor Thread Variables
@@ -957,6 +958,11 @@ class AudioInputProcessor
      */
     std::string m_uploadMetricName;
 
+    /**
+     * The Duration Builder used to calculate the duration of the fetch context call.
+     */
+    avsCommon::utils::metrics::DataPointDurationBuilder m_fetchContextTimeMetricData;
+
     /// A @c PowerResourceId used for wakelock logic.
     std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface::PowerResourceId> m_powerResourceId;
 
diff --git a/CapabilityAgents/AIP/src/AudioInputProcessor.cpp b/CapabilityAgents/AIP/src/AudioInputProcessor.cpp
index d0944a00c8..c3003b58ca 100644
--- a/CapabilityAgents/AIP/src/AudioInputProcessor.cpp
+++ b/CapabilityAgents/AIP/src/AudioInputProcessor.cpp
@@ -36,7 +36,6 @@
 #include <AVSCommon/AVS/Attachment/AttachmentUtils.h>
 #include <Settings/SettingEventMetadata.h>
 #include <Settings/SharedAVSSettingProtocol.h>
-#include <SpeechEncoder/SpeechEncoder.h>
 #include <AVSCommon/AVS/Attachment/DefaultAttachmentReader.h>
 
 #include "AIP/AudioInputProcessor.h"
@@ -84,7 +83,7 @@ static const std::string CAPABILITY_INTERFACE_VALUES_KEY = "values";
 static const std::string CAPABILITY_INTERFACE_DEFAULT_LOCALE = "DEFAULT";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AudioInputProcessor");
+#define TAG "AudioInputProcessor"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -199,6 +198,8 @@ static const std::string WAKEWORD_DETECTION_SEGMENT_UPLOADED_PCM = "AIP_WAKEWORD
 
 /// Recognize EVENT is built for AIP metric source
 static const std::string RECOGNIZE_START_SEND_MESSAGE = "RECOGNIZE_EVENT_IS_BUILT";
+static const std::string RECOGNIZE_START_SEND_MESSAGE_ACTIVITY_NAME =
+    METRIC_ACTIVITY_NAME_PREFIX_AIP + RECOGNIZE_START_SEND_MESSAGE;
 
 /// Wakeword Activity Name for AIP metric source
 static const std::string START_OF_STREAM_TIMESTAMP = "START_OF_STREAM_TIMESTAMP";
@@ -217,6 +218,11 @@ static const std::string ACQUIRE_POWER_RESOURCE_ACTIVITY = METRIC_ACTIVITY_NAME_
 static const std::string RELEASE_POWER_RESOURCE = "RELEASE_POWER_RESOURCE";
 static const std::string RELEASE_POWER_RESOURCE_ACTIVITY = METRIC_ACTIVITY_NAME_PREFIX_AIP + RELEASE_POWER_RESOURCE;
 
+/// The timestamp for the start of execute on context available
+static const std::string FETCH_CONTEXT_DURATION = "FETCH_CONTEXT_DURATION";
+static const std::string FETCH_CONTEXT_DURATION_ACTIVITY_NAME =
+    METRIC_ACTIVITY_NAME_PREFIX_AIP + FETCH_CONTEXT_DURATION;
+
 /// End of Speech Offset Received Activity Name for AIP metric source
 static const std::string END_OF_SPEECH_OFFSET_RECEIVED = "END_OF_SPEECH_OFFSET";
 static const std::string END_OF_SPEECH_OFFSET_RECEIVED_ACTIVITY_NAME =
@@ -260,6 +266,9 @@ static const int WAKEWORD_DETECTION_SEGMENT_SIZE_BYTES_OPUS = 5209;
 /// Threshold number of bytes for PCM Encoded Wakeword detection
 static const int WAKEWORD_DETECTION_SEGMENT_SIZE_BYTES_PCM = 40480;
 
+/// Cloud resolve key constant. Used to determine the encoding sent to the cloud.
+static const std::string CLOUD_RESOLVE_KEY = "CLOUD";
+
 /**
  * Helper function to get string values of encoding audio format, which are used in Recognize event.
  * @param encoding Target encoding format
@@ -410,7 +419,7 @@ std::shared_ptr<AudioInputProcessor> AudioInputProcessor::create(
     std::shared_ptr<settings::SpeechConfirmationSetting> speechConfirmation,
     const std::shared_ptr<avsCommon::avs::CapabilityChangeNotifierInterface>& capabilityChangeNotifier,
     std::shared_ptr<settings::WakeWordsSetting> wakeWordsSetting,
-    std::shared_ptr<speechencoder::SpeechEncoder> speechEncoder,
+    std::shared_ptr<audioEncoderInterfaces::AudioEncoderInterface> audioEncoder,
     AudioProvider defaultAudioProvider,
     std::shared_ptr<PowerResourceManagerInterface> powerResourceManager,
     std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
@@ -470,7 +479,7 @@ std::shared_ptr<AudioInputProcessor> AudioInputProcessor::create(
         userInactivityMonitor,
         systemSoundPlayer,
         assetsManager,
-        speechEncoder,
+        audioEncoder,
         defaultAudioProvider,
         wakeWordConfirmation,
         speechConfirmation,
@@ -508,7 +517,7 @@ void AudioInputProcessor::addObserver(std::shared_ptr<ObserverInterface> observe
         ACSDK_ERROR(LX("addObserverFailed").d("reason", "nullObserver"));
         return;
     }
-    m_executor.submit([this, observer]() { m_observers.insert(observer); });
+    m_executor.execute([this, observer]() { m_observers.insert(observer); });
 }
 
 void AudioInputProcessor::removeObserver(std::shared_ptr<ObserverInterface> observer) {
@@ -579,11 +588,13 @@ std::future<void> AudioInputProcessor::resetState() {
 }
 
 void AudioInputProcessor::onContextAvailable(const std::string& jsonContext) {
-    m_executor.submit([this, jsonContext]() { executeOnContextAvailable(jsonContext); });
+    ACSDK_DEBUG0(LX(__func__));
+    m_executor.execute([this, jsonContext]() { executeOnContextAvailable(jsonContext); });
 }
 
 void AudioInputProcessor::onContextFailure(const ContextRequestError error) {
-    m_executor.submit([this, error]() { executeOnContextFailure(error); });
+    ACSDK_DEBUG0(LX(__func__));
+    m_executor.execute([this, error]() { executeOnContextFailure(error); });
 }
 
 void AudioInputProcessor::handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) {
@@ -650,11 +661,11 @@ void AudioInputProcessor::onDeregistered() {
 
 void AudioInputProcessor::onFocusChanged(avsCommon::avs::FocusState newFocus, avsCommon::avs::MixingBehavior behavior) {
     ACSDK_DEBUG9(LX("onFocusChanged").d("newFocus", newFocus).d("MixingBehavior", behavior));
-    m_executor.submit([this, newFocus]() { executeOnFocusChanged(newFocus); });
+    m_executor.execute([this, newFocus]() { executeOnFocusChanged(newFocus); });
 }
 
 void AudioInputProcessor::onDialogUXStateChanged(DialogUXStateObserverInterface::DialogUXState newState) {
-    m_executor.submit([this, newState]() { executeOnDialogUXStateChanged(newState); });
+    m_executor.execute([this, newState]() { executeOnDialogUXStateChanged(newState); });
 }
 
 AudioInputProcessor::AudioInputProcessor(
@@ -666,7 +677,7 @@ AudioInputProcessor::AudioInputProcessor(
     std::shared_ptr<UserInactivityMonitorInterface> userInactivityMonitor,
     std::shared_ptr<SystemSoundPlayerInterface> systemSoundPlayer,
     const std::shared_ptr<LocaleAssetsManagerInterface>& assetsManager,
-    std::shared_ptr<speechencoder::SpeechEncoder> speechEncoder,
+    std::shared_ptr<audioEncoderInterfaces::AudioEncoderInterface> audioEncoder,
     AudioProvider defaultAudioProvider,
     std::shared_ptr<settings::WakeWordConfirmationSetting> wakeWordConfirmation,
     std::shared_ptr<settings::SpeechConfirmationSetting> speechConfirmation,
@@ -684,7 +695,7 @@ AudioInputProcessor::AudioInputProcessor(
         m_contextManager{contextManager},
         m_focusManager{focusManager},
         m_userInactivityMonitor{userInactivityMonitor},
-        m_encoder{speechEncoder},
+        m_encoder{audioEncoder},
         m_defaultAudioProvider{defaultAudioProvider},
         m_lastAudioProvider{AudioProvider::null()},
         m_state{ObserverInterface::State::IDLE},
@@ -709,6 +720,7 @@ AudioInputProcessor::AudioInputProcessor(
         m_messageRequestResolver{nullptr},
         m_encodingAudioFormats{{DEFAULT_RESOLVE_KEY, AudioFormat::Encoding::LPCM}} {
     m_capabilityConfigurations.insert(capabilitiesConfiguration);
+    m_fetchContextTimeMetricData.setName(FETCH_CONTEXT_DURATION);
 
     if (m_powerResourceManager) {
         m_powerResourceId = m_powerResourceManager->create(
@@ -819,7 +831,7 @@ bool resolveMessageRequest(
     rapidjson::Value formatValue;
     auto encodingFormat = encodingFormats.at(resolveKey);
     auto formatString = encodingFormatToString(encodingFormat);
-    formatValue.SetString(formatString.c_str(), formatString.length());
+    formatValue.SetString(formatString.c_str(), static_cast<rapidjson::SizeType>(formatString.length()));
 
     if (payload->value.FindMember(FORMAT_KEY) != payload->value.MemberEnd()) {
         ACSDK_WARN(LX("Format already exists in Json payload. Replace it with").d("format", formatString));
@@ -868,7 +880,7 @@ std::future<bool> AudioInputProcessor::expectSpeechTimedOut() {
 
 void AudioInputProcessor::handleStopCaptureDirective(std::shared_ptr<DirectiveInfo> info) {
     m_stopCaptureReceivedTime = steady_clock::now();
-    m_executor.submit([this, info]() {
+    m_executor.execute([this, info]() {
         bool stopImmediately = true;
         executeStopCapture(stopImmediately, info);
     });
@@ -895,7 +907,7 @@ void AudioInputProcessor::handleExpectSpeechDirective(std::shared_ptr<DirectiveI
         return;
     }
 
-    m_executor.submit([this, timeout, info]() { executeExpectSpeech(milliseconds{timeout}, info); });
+    m_executor.execute([this, timeout, info]() { executeExpectSpeech(milliseconds{timeout}, info); });
 }
 
 void AudioInputProcessor::handleSetEndOfSpeechOffsetDirective(std::shared_ptr<DirectiveInfo> info) {
@@ -1105,7 +1117,7 @@ bool AudioInputProcessor::executeRecognize(
     }
 
     if (settings::WakeWordConfirmationSettingType::TONE == m_wakeWordConfirmation->get()) {
-        m_executor.submit(
+        m_executor.execute(
             [this]() { m_systemSoundPlayer->playTone(SystemSoundPlayerInterface::Tone::WAKEWORD_NOTIFICATION); });
     }
 
@@ -1141,10 +1153,12 @@ bool AudioInputProcessor::executeRecognize(
     avsCommon::avs::AudioInputStream::Index encodingOffset = 0;
     AudioInputStream::Reader::Reference encodingReference = AudioInputStream::Reader::Reference::ABSOLUTE;
 
-    // Set up the speech encoder
+    // Set up the audio encoder
+    std::shared_ptr<AudioInputStream> encodedStream;
     if (m_usingEncoder) {
         ACSDK_DEBUG(LX("encodingAudio").d("format", avsEncodingFormat));
-        if (!m_encoder->startEncoding(provider.stream, provider.format, offset, reference)) {
+        encodedStream = m_encoder->startEncoding(provider.stream, provider.format, offset, reference);
+        if (!encodedStream) {
             ACSDK_ERROR(LX("executeRecognizeFailed").d("reason", "Failed to start encoder"));
             return false;
         }
@@ -1179,7 +1193,7 @@ bool AudioInputProcessor::executeRecognize(
         std::shared_ptr<attachment::AttachmentReader> audioReader =
             attachment::DefaultAttachmentReader<AudioInputStream>::create(
                 sds::ReaderPolicy::NONBLOCKING,
-                isLPCMEncodingAudioFormat ? provider.stream : m_encoder->getEncodedStream(),
+                isLPCMEncodingAudioFormat ? provider.stream : encodedStream,
                 isLPCMEncodingAudioFormat ? offset : encodingOffset,
                 isLPCMEncodingAudioFormat ? reference : encodingReference);
         if (!audioReader) {
@@ -1193,14 +1207,24 @@ bool AudioInputProcessor::executeRecognize(
         ACSDK_INFO(LX("Create audio attachment reader success")
                        .d("resolveKey", resolveKey)
                        .d("format", encodingFormatToString(it.second)));
+
+        if (resolveKey == CLOUD_RESOLVE_KEY) {
+            if (isLPCMEncodingAudioFormat) {
+                m_audioBytesForMetricThreshold = WAKEWORD_DETECTION_SEGMENT_SIZE_BYTES_PCM;
+                m_uploadMetricName = WAKEWORD_DETECTION_SEGMENT_UPLOADED_PCM;
+            } else {
+                m_audioBytesForMetricThreshold = WAKEWORD_DETECTION_SEGMENT_SIZE_BYTES_OPUS;
+                m_uploadMetricName = WAKEWORD_DETECTION_SEGMENT_UPLOADED_OPUS;
+            }
+        }
     }
 
     if (!multiStreamsRequestedLocked()) {
         m_messageRequestResolver = nullptr;
 
         // Set up format for single audio stream request
-        if (m_usingEncoder && m_encoder->getContext()) {
-            avsEncodingFormat = m_encoder->getContext()->getAVSFormatName();
+        if (m_usingEncoder) {
+            avsEncodingFormat = m_encoder->getAVSFormatName();
         }
         payloadGenerator.addMember(FORMAT_KEY, avsEncodingFormat);
 
@@ -1243,6 +1267,11 @@ bool AudioInputProcessor::executeRecognize(
 
     setState(ObserverInterface::State::RECOGNIZING);
 
+    // Notify observers of current ASRProfile
+    for (auto observer : m_observers) {
+        observer->onASRProfileChanged(asrProfileToString(provider.profile));
+    }
+
     // Note that we're preparing to send a Recognize event.
     m_preparingToSend = true;
 
@@ -1251,6 +1280,7 @@ bool AudioInputProcessor::executeRecognize(
     m_streamIsClosedInRecognizingState = false;
 
     //  Start assembling the context; we'll service the callback after assembling our Recognize event.
+    m_fetchContextTimeMetricData.startDurationTimer();
     m_contextManager->getContextWithoutReportableStateProperties(shared_from_this());
 
     // Stop the ExpectSpeech timer so we don't get a timeout.
@@ -1266,6 +1296,9 @@ bool AudioInputProcessor::executeRecognize(
     m_recognizeRequest.reset();
 
     // Handle metrics for this event.
+    if (m_usingEncoder) {
+        avsEncodingFormat = m_encoder->getAVSFormatName();
+    }
     submitMetric(
         m_metricRecorder,
         MetricEventBuilder{}
@@ -1282,6 +1315,7 @@ bool AudioInputProcessor::executeRecognize(
                               .setName("RESOURCE_TYPE_ID")
                               .setValue(std::to_string(m_resourceFlags.to_ulong()))
                               .build())
+            .addDataPoint(DataPointStringBuilder{}.setName("ENCODING_FORMAT").setValue(avsEncodingFormat).build())
             .addDataPoint(DataPointCounterBuilder{}.setName(START_OF_UTTERANCE).increment(1).build()),
         m_preCachedDialogRequestId);
 
@@ -1312,9 +1346,16 @@ bool AudioInputProcessor::executeRecognize(
                 .addDataPoint(
                     DataPointDurationBuilder{duration_cast<milliseconds>(startOfStreamTimestamp.time_since_epoch())}
                         .setName(START_OF_STREAM_TIMESTAMP)
-                        .build())
+                        .build()),
+            m_preCachedDialogRequestId);
+
+        submitMetric(
+            m_metricRecorder,
+            MetricEventBuilder{}
+                .setActivityName(RECOGNIZE_START_SEND_MESSAGE_ACTIVITY_NAME)
                 .addDataPoint(DataPointCounterBuilder{}.setName(RECOGNIZE_START_SEND_MESSAGE).increment(1).build()),
             m_preCachedDialogRequestId);
+
         ACSDK_DEBUG(LX(__func__).d("WW_DURATION(ms)", duration.count()));
     }
 
@@ -1330,6 +1371,13 @@ bool AudioInputProcessor::executeRecognize(
 void AudioInputProcessor::executeOnContextAvailable(const std::string& jsonContext) {
     ACSDK_DEBUG(LX("executeOnContextAvailable").sensitive("jsonContext", jsonContext));
 
+    /// Submit execute context start metric
+    submitMetric(
+        m_metricRecorder,
+        MetricEventBuilder{}
+            .setActivityName(FETCH_CONTEXT_DURATION_ACTIVITY_NAME)
+            .addDataPoint(m_fetchContextTimeMetricData.stopDurationTimer().build()),
+        m_preCachedDialogRequestId);
     // Should already be RECOGNIZING if we get here.
     if (m_state != ObserverInterface::State::RECOGNIZING) {
         ACSDK_ERROR(
@@ -1470,7 +1518,7 @@ bool AudioInputProcessor::executeStopCapture(bool stopImmediately, std::shared_p
     std::function<void()> stopCapture = [=] {
         ACSDK_DEBUG(LX("stopCapture").d("stopImmediately", stopImmediately));
         if (m_usingEncoder) {
-            // If SpeechEncoder is enabled, let it finish it so the stream will be closed automatically.
+            // If Audio Encoder is enabled, let it finish it so the stream will be closed automatically.
             m_encoder->stopEncoding(stopImmediately);
             m_usingEncoder = false;
         }
@@ -1631,7 +1679,7 @@ void AudioInputProcessor::setState(ObserverInterface::State state) {
 
     // Reset the user inactivity if transitioning to or from `RECOGNIZING` state.
     if (ObserverInterface::State::RECOGNIZING == m_state || ObserverInterface::State::RECOGNIZING == state) {
-        m_executor.submit([this]() { m_userInactivityMonitor->onUserActive(); });
+        m_executor.execute([this]() { m_userInactivityMonitor->onUserActive(); });
     }
 
     auto currentDialogRequestId =
@@ -1699,7 +1747,7 @@ void AudioInputProcessor::onExceptionReceived(const std::string& exceptionMessag
 
 void AudioInputProcessor::onSendCompleted(MessageRequestObserverInterface::Status status) {
     ACSDK_DEBUG(LX("onSendCompleted").d("status", status));
-    m_executor.submit([this, status]() {
+    m_executor.execute([this, status]() {
         if (MessageRequestObserverInterface::Status::SUCCESS == status &&
             ObserverInterface::State::RECOGNIZING == m_state) {
             // This is to take care of the edge case where the event stream is closed before a stop capture is received.
@@ -1715,7 +1763,7 @@ std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> Aud
 }
 
 void AudioInputProcessor::onLocaleAssetsChanged() {
-    m_executor.submit([this]() { executeOnLocaleAssetsChanged(); });
+    m_executor.execute([this]() { executeOnLocaleAssetsChanged(); });
 }
 
 void AudioInputProcessor::executeOnLocaleAssetsChanged() {
@@ -1787,7 +1835,7 @@ bool AudioInputProcessor::handleSetWakeWordConfirmation(std::shared_ptr<Directiv
 
     auto executeChange = [this, value]() { m_wakeWordConfirmation->setAvsChange(value); };
 
-    m_executor.submit(executeChange);
+    m_executor.execute(executeChange);
 
     if (info->result) {
         info->result->setCompleted();
@@ -1810,7 +1858,7 @@ bool AudioInputProcessor::handleSetSpeechConfirmation(std::shared_ptr<DirectiveI
         return false;
     }
 
-    settings::SpeechConfirmationSettingType value;
+    settings::SpeechConfirmationSettingType value = settings::getSpeechConfirmationDefault();
     std::stringstream ss{jsonValue};
     ss >> value;
 
@@ -1823,7 +1871,7 @@ bool AudioInputProcessor::handleSetSpeechConfirmation(std::shared_ptr<DirectiveI
 
     auto executeChange = [this, value]() { m_speechConfirmation->setAvsChange(value); };
 
-    m_executor.submit(executeChange);
+    m_executor.execute(executeChange);
 
     if (info->result) {
         info->result->setCompleted();
@@ -1852,7 +1900,7 @@ bool AudioInputProcessor::handleSetWakeWords(std::shared_ptr<DirectiveInfo> info
         return false;
     }
 
-    m_executor.submit([this, wakeWords, info]() { m_wakeWordsSetting->setAvsChange(wakeWords); });
+    m_executor.execute([this, wakeWords, info]() { m_wakeWordsSetting->setAvsChange(wakeWords); });
 
     if (info->result) {
         info->result->setCompleted();
@@ -1902,7 +1950,7 @@ void AudioInputProcessor::managePowerResource(ObserverInterface::State newState)
 
 void AudioInputProcessor::onConnectionStatusChanged(bool connected) {
     if (!connected) {
-        m_executor.submit([this]() { return executeDisconnected(); });
+        m_executor.execute([this]() { return executeDisconnected(); });
     }
 }
 
@@ -1914,8 +1962,7 @@ void AudioInputProcessor::executeDisconnected() {
 }
 
 bool AudioInputProcessor::setEncodingAudioFormat(AudioFormat::Encoding encoding) {
-    if (encoding == AudioFormat::Encoding::LPCM ||
-        (m_encoder && m_encoder->getContext() && encoding == m_encoder->getContext()->getAudioFormat().encoding)) {
+    if (encoding == AudioFormat::Encoding::LPCM || (m_encoder && encoding == m_encoder->getEncoding())) {
         std::lock_guard<std::mutex> lock(m_encodingFormatMutex);
         m_encodingAudioFormats.clear();
         // Only one format is configured, and AIP will send resolved RequestMessage, and this resolveKey is simply a
@@ -1927,10 +1974,10 @@ bool AudioInputProcessor::setEncodingAudioFormat(AudioFormat::Encoding encoding)
 }
 
 bool AudioInputProcessor::initialize() {
-    if (m_encoder && m_encoder->getContext()) {
+    if (m_encoder) {
         std::lock_guard<std::mutex> lock(m_encodingFormatMutex);
         m_encodingAudioFormats.clear();
-        m_encodingAudioFormats.emplace(DEFAULT_RESOLVE_KEY, m_encoder->getContext()->getAudioFormat().encoding);
+        m_encodingAudioFormats.emplace(DEFAULT_RESOLVE_KEY, m_encoder->getEncoding());
     }
     m_assetsManager->addLocaleAssetsObserver(shared_from_this());
     return true;
@@ -1986,21 +2033,17 @@ void AudioInputProcessor::closeAttachmentReaders(attachment::AttachmentReader::C
 }
 
 bool AudioInputProcessor::isEncodingFormatSupported(avsCommon::utils::AudioFormat::Encoding encodingFormat) const {
-    if (encodingFormat == AudioFormat::Encoding::LPCM ||
-        (m_encoder && m_encoder->getContext() &&
-         encodingFormat == m_encoder->getContext()->getAudioFormat().encoding)) {
+    if (encodingFormat == AudioFormat::Encoding::LPCM || (m_encoder && encodingFormat == m_encoder->getEncoding())) {
         return true;
     }
     return false;
 }
 
 bool AudioInputProcessor::isUsingEncoderLocked() const {
-    for (auto it = m_encodingAudioFormats.begin(); it != m_encodingAudioFormats.end(); it++) {
-        if (it->second != AudioFormat::Encoding::LPCM) {
-            return true;
-        }
-    }
-    return false;
+    return std::any_of(
+        m_encodingAudioFormats.begin(),
+        m_encodingAudioFormats.end(),
+        [](EncodingFormatResponse::const_reference entry) { return entry.second != AudioFormat::Encoding::LPCM; });
 }
 
 bool AudioInputProcessor::multiStreamsRequestedLocked() const {
diff --git a/CapabilityAgents/AIP/src/CMakeLists.txt b/CapabilityAgents/AIP/src/CMakeLists.txt
index 2c2eed5328..244db6c5fb 100644
--- a/CapabilityAgents/AIP/src/CMakeLists.txt
+++ b/CapabilityAgents/AIP/src/CMakeLists.txt
@@ -8,7 +8,6 @@ target_include_directories(AIP PUBLIC
     "${AFML_SOURCE_DIR}/include"
     "${AVSCommon_INCLUDE_DIRS}"
     "${DeviceSettings_INCLUDE_DIRS}"
-    "${SpeechEncoder_SOURCE_DIR}/include"
     "${SystemSoundPlayer_INCLUDE_DIRS}")
 
 target_link_libraries(AIP
@@ -16,7 +15,7 @@ target_link_libraries(AIP
     ADSL
     AFML
     DeviceSettings
-    SpeechEncoder
+    acsdkAudioEncoderInterfaces
     SystemSoundPlayer
     acsdkNotifier)
 
diff --git a/CapabilityAgents/AIP/test/AudioInputProcessorTest.cpp b/CapabilityAgents/AIP/test/AudioInputProcessorTest.cpp
index c1b553b7b5..a588977906 100644
--- a/CapabilityAgents/AIP/test/AudioInputProcessorTest.cpp
+++ b/CapabilityAgents/AIP/test/AudioInputProcessorTest.cpp
@@ -27,6 +27,8 @@
 #include <rapidjson/stringbuffer.h>
 #include <rapidjson/writer.h>
 
+#include <acsdk/AudioEncoderInterfaces/BlockAudioEncoderInterface.h>
+#include <acsdk/AudioEncoder/AudioEncoderFactory.h>
 #include <AVSCommon/AVS/CapabilityChangeNotifier.h>
 #include <AVSCommon/AVS/CapabilityChangeNotifierInterface.h>
 #include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
@@ -111,6 +113,9 @@ static const avsCommon::avs::NamespaceAndName DIRECTIVES[] = {STOP_CAPTURE,
 /// The SpeechRecognizer context state signature.
 static const avsCommon::avs::NamespaceAndName RECOGNIZER_STATE{NAMESPACE, "RecognizerState"};
 
+/// Byte array for audio sample data passing.
+using Bytes = audioEncoderInterfaces::BlockAudioEncoderInterface::Bytes;
+
 /// Sample rate for audio input stream.
 static const unsigned int SAMPLE_RATE_HZ = 16000;
 
@@ -632,7 +637,7 @@ void RecognizeEvent::verifyMessage(
         auto bytesRead = namedReader->reader->read(
             samples.data() + samplesRead, (samples.size() - samplesRead) * SDS_WORDSIZE, &status);
         if (avsCommon::avs::attachment::AttachmentReader::ReadStatus::OK_WOULDBLOCK == status) {
-            std::this_thread::yield();
+            std::this_thread::sleep_for(std::chrono::milliseconds(1));
             continue;
         }
         EXPECT_EQ(status, avsCommon::avs::attachment::AttachmentReader::ReadStatus::OK);
@@ -683,8 +688,8 @@ class MockExpectSpeechTimeoutHandler : public avsCommon::sdkInterfaces::ExpectSp
         bool(std::chrono::milliseconds timeout, const std::function<std::future<bool>()>& expectSpeechTimedOut));
 };
 
-/// Mock class that implements the SpeechEncoderContext.
-class MockEncoderContext : public speechencoder::EncoderContext {
+/// Mock class that implements the @c BlockAudioEncoderInterface.
+class MockBlockAudioEncoder : public audioEncoderInterfaces::BlockAudioEncoderInterface {
 public:
     MOCK_METHOD1(init, bool(alexaClientSDK::avsCommon::utils::AudioFormat inputFormat));
     MOCK_METHOD0(getInputFrameSize, size_t());
@@ -692,8 +697,9 @@ class MockEncoderContext : public speechencoder::EncoderContext {
     MOCK_METHOD0(requiresFullyRead, bool());
     MOCK_METHOD0(getAudioFormat, alexaClientSDK::avsCommon::utils::AudioFormat());
     MOCK_METHOD0(getAVSFormatName, std::string());
-    MOCK_METHOD0(start, bool());
-    MOCK_METHOD3(processSamples, ssize_t(void* samples, size_t numberOfWords, uint8_t* buffer));
+    MOCK_METHOD1(start, bool(Bytes&));
+    MOCK_METHOD3(processSamples, bool(Bytes::const_iterator, Bytes::const_iterator, Bytes&));
+    MOCK_METHOD1(flush, bool(Bytes&));
     MOCK_METHOD0(close, void());
 };
 
@@ -1018,10 +1024,10 @@ class AudioInputProcessorTest : public ::testing::Test {
     std::string m_dialogRequestId;
 
     /// The audio encoder object
-    std::shared_ptr<speechencoder::SpeechEncoder> m_speechEncoder;
+    std::shared_ptr<audioEncoderInterfaces::AudioEncoderInterface> m_audioEncoder;
 
-    /// The mock @c EncoderContext
-    std::shared_ptr<MockEncoderContext> m_mockEncoderContext;
+    /// The mock @c BlockAudioEncoderInterface
+    std::shared_ptr<MockBlockAudioEncoder> m_mockBlockAudioEncoder;
 
     /// Message ID in directive
     std::string m_messageId;
@@ -1123,30 +1129,30 @@ void AudioInputProcessorTest::SetUp() {
     m_pattern.resize(PATTERN_WORDS);
     std::iota(m_pattern.begin(), m_pattern.end(), 0);
 
-    m_mockEncoderContext = std::make_shared<MockEncoderContext>();
-    m_speechEncoder = std::make_shared<speechencoder::SpeechEncoder>(m_mockEncoderContext);
-    EXPECT_CALL(*m_mockEncoderContext, init(_)).Times(AtLeast(0)).WillRepeatedly(Return(true));
-    EXPECT_CALL(*m_mockEncoderContext, requiresFullyRead()).Times(AtLeast(0)).WillRepeatedly(Return(true));
-    EXPECT_CALL(*m_mockEncoderContext, getAVSFormatName()).WillRepeatedly(Return(std::string(AUDIO_FORMAT_OPUS)));
-    EXPECT_CALL(*m_mockEncoderContext, getInputFrameSize()).WillRepeatedly(Return(1));
-    EXPECT_CALL(*m_mockEncoderContext, getOutputFrameSize()).WillRepeatedly(Return(2));
-    EXPECT_CALL(*m_mockEncoderContext, processSamples(_, _, _))
-        .WillRepeatedly(Invoke([](void* samples, size_t numberOfWords, uint8_t* buffer) {
-            uint8_t* src = static_cast<uint8_t*>(samples);
-            buffer[0] = src[0];
-            buffer[1] = src[1];
-            return 2;
+    m_mockBlockAudioEncoder = std::make_shared<MockBlockAudioEncoder>();
+    m_audioEncoder = audioEncoder::createAudioEncoder(m_mockBlockAudioEncoder);
+    EXPECT_CALL(*m_mockBlockAudioEncoder, init(_)).Times(AtLeast(0)).WillRepeatedly(Return(true));
+    EXPECT_CALL(*m_mockBlockAudioEncoder, requiresFullyRead()).Times(AtLeast(0)).WillRepeatedly(Return(true));
+    EXPECT_CALL(*m_mockBlockAudioEncoder, getAVSFormatName()).WillRepeatedly(Return(std::string(AUDIO_FORMAT_OPUS)));
+    EXPECT_CALL(*m_mockBlockAudioEncoder, getInputFrameSize()).WillRepeatedly(Return(1));
+    EXPECT_CALL(*m_mockBlockAudioEncoder, getOutputFrameSize()).WillRepeatedly(Return(2));
+    EXPECT_CALL(*m_mockBlockAudioEncoder, processSamples(_, _, _))
+        .WillRepeatedly(Invoke([](Bytes::const_iterator begin, Bytes::const_iterator end, Bytes& buffer) {
+            const size_t bufferOffset = buffer.size();
+            buffer.resize(bufferOffset + 2);
+            std::memcpy(buffer.data() + bufferOffset, &*begin, 2);
+            return true;
         }));
-    EXPECT_CALL(*m_mockEncoderContext, getAudioFormat())
-        .WillRepeatedly(
-            Return(avsCommon::utils::AudioFormat{.encoding = avsCommon::utils::AudioFormat::Encoding::OPUS,
-                                                 .endianness = avsCommon::utils::AudioFormat::Endianness::LITTLE,
-                                                 .sampleRateHz = 16000,
-                                                 .sampleSizeInBits = 16,
-                                                 .numChannels = 1,
-                                                 .dataSigned = false,
-                                                 .layout = avsCommon::utils::AudioFormat::Layout::NON_INTERLEAVED}));
-    EXPECT_CALL(*m_mockEncoderContext, start()).WillRepeatedly(Return(true));
+    EXPECT_CALL(*m_mockBlockAudioEncoder, getAudioFormat())
+        .WillRepeatedly(Return(avsCommon::utils::AudioFormat{avsCommon::utils::AudioFormat::Encoding::OPUS,
+                                                             avsCommon::utils::AudioFormat::Endianness::LITTLE,
+                                                             16000,
+                                                             16,
+                                                             1,
+                                                             false,
+                                                             avsCommon::utils::AudioFormat::Layout::NON_INTERLEAVED}));
+    EXPECT_CALL(*m_mockBlockAudioEncoder, start(_)).WillRepeatedly(Return(true));
+    EXPECT_CALL(*m_mockBlockAudioEncoder, flush(_)).WillRepeatedly(Return(true));
 }
 
 void AudioInputProcessorTest::setupEncoderTest() {
@@ -1165,7 +1171,7 @@ void AudioInputProcessorTest::setupEncoderTest() {
         m_mockSpeechConfirmation,
         m_capabilityChangeNotifier,
         m_mockWakeWordSetting,
-        m_speechEncoder,
+        m_audioEncoder,
         *m_audioProvider,
         m_mockPowerResourceManager,
         m_metricRecorder);
@@ -1261,7 +1267,6 @@ bool AudioInputProcessorTest::testRecognizeSucceeds(
     }
 
     if (!bargeIn) {
-        EXPECT_CALL(*m_mockUserInactivityMonitor, onUserActive()).Times(2);
         EXPECT_CALL(*m_mockObserver, onStateChanged(AudioInputProcessorObserverInterface::State::RECOGNIZING));
         EXPECT_CALL(*m_mockFocusManager, acquireChannel(CHANNEL_NAME, _)).WillOnce(InvokeWithoutArgs([this, stopPoint] {
             m_audioInputProcessor->onFocusChanged(avsCommon::avs::FocusState::FOREGROUND, MixingBehavior::PRIMARY);
@@ -1324,6 +1329,7 @@ bool AudioInputProcessorTest::testRecognizeSucceeds(
         EXPECT_CALL(*m_mockPowerResourceManager, release(IsSamePowerResource(COMPONENT_NAME))).Times(AtLeast(1));
     }
 
+    EXPECT_CALL(*m_mockObserver, onASRProfileChanged(asrProfileToString(audioProvider.profile))).Times(AtLeast(1));
     auto sentFuture = m_recognizeEvent->send(m_audioInputProcessor);
 
     // If a valid begin index was not provided, load the SDS buffer with the test pattern after recognize() is sent.
@@ -1384,7 +1390,6 @@ bool AudioInputProcessorTest::testContextFailure(avsCommon::sdkInterfaces::Conte
             return CONTEXT_REQUEST_TOKEN;
         }));
     EXPECT_CALL(*m_mockObserver, onStateChanged(AudioInputProcessorObserverInterface::State::RECOGNIZING));
-    EXPECT_CALL(*m_mockUserInactivityMonitor, onUserActive()).Times(2);
     EXPECT_CALL(*m_mockObserver, onStateChanged(AudioInputProcessorObserverInterface::State::IDLE))
         .WillOnce(InvokeWithoutArgs([&] {
             std::lock_guard<std::mutex> lock(mutex);
@@ -1394,6 +1399,8 @@ bool AudioInputProcessorTest::testContextFailure(avsCommon::sdkInterfaces::Conte
     EXPECT_CALL(*m_mockPowerResourceManager, acquire(IsSamePowerResource(COMPONENT_NAME), _)).Times(AtLeast(1));
     EXPECT_CALL(*m_mockPowerResourceManager, release(IsSamePowerResource(COMPONENT_NAME))).Times(AtLeast(1));
 
+    EXPECT_CALL(*m_mockObserver, onASRProfileChanged(asrProfileToString(m_audioProvider->profile))).Times((AtLeast(1)));
+
     if (recognize.send(m_audioInputProcessor).get()) {
         std::unique_lock<std::mutex> lock(mutex);
         return conditionVariable.wait_for(lock, TEST_TIMEOUT, [&done] { return done; });
@@ -1470,7 +1477,6 @@ bool AudioInputProcessorTest::testExpectSpeechSucceeds(bool withDialogRequestId)
 
     EXPECT_CALL(*m_mockObserver, onStateChanged(AudioInputProcessorObserverInterface::State::EXPECTING_SPEECH));
     EXPECT_CALL(*m_mockObserver, onStateChanged(AudioInputProcessorObserverInterface::State::RECOGNIZING));
-    EXPECT_CALL(*m_mockUserInactivityMonitor, onUserActive()).Times(2);
     EXPECT_CALL(*m_mockPowerResourceManager, acquire(IsSamePowerResource(COMPONENT_NAME), _)).Times(AtLeast(1));
     if (withDialogRequestId) {
         EXPECT_CALL(*result, setCompleted());
@@ -1482,7 +1488,7 @@ bool AudioInputProcessorTest::testExpectSpeechSucceeds(bool withDialogRequestId)
             conditionVariable.notify_one();
             return CONTEXT_REQUEST_TOKEN;
         }));
-
+    EXPECT_CALL(*m_mockObserver, onASRProfileChanged(asrProfileToString(m_audioProvider->profile))).Times(AtLeast(1));
     if (!withDialogRequestId) {
         directiveHandler->handleDirectiveImmediately(avsDirective);
     } else {
@@ -1655,11 +1661,10 @@ bool AudioInputProcessorTest::testRecognizeWithExpectSpeechInitiator(bool withIn
     EXPECT_CALL(*result, setCompleted());
     EXPECT_CALL(*m_mockObserver, onStateChanged(AudioInputProcessorObserverInterface::State::EXPECTING_SPEECH));
     EXPECT_CALL(*m_mockObserver, onStateChanged(AudioInputProcessorObserverInterface::State::RECOGNIZING));
-    EXPECT_CALL(*m_mockUserInactivityMonitor, onUserActive()).Times(2);
     EXPECT_CALL(*m_mockContextManager, getContextWithoutReportableStateProperties(_, _, _))
         .WillOnce(Return(CONTEXT_REQUEST_TOKEN));
     EXPECT_CALL(*m_mockPowerResourceManager, acquire(IsSamePowerResource(COMPONENT_NAME), _)).Times(AtLeast(1));
-
+    EXPECT_CALL(*m_mockObserver, onASRProfileChanged(asrProfileToString(m_audioProvider->profile))).Times(AtLeast(1));
     // Set AIP to a sane state.
     directiveHandler->preHandleDirective(avsDirective, std::move(result));
     EXPECT_TRUE(directiveHandler->handleDirective(avsDirective->getMessageId()));
@@ -3636,16 +3641,15 @@ TEST_F(AudioInputProcessorTest, test_requestEncodingAudioFormatsSuccess) {
  */
 TEST_F(AudioInputProcessorTest, test_requestEncodingAudioFormatsWithFallbackAndUnsupportedFormats) {
     setupEncoderTest();
-    EXPECT_CALL(*m_mockEncoderContext, getAVSFormatName()).WillRepeatedly(Return(std::string(AUDIO_FORMAT_LPCM)));
-    EXPECT_CALL(*m_mockEncoderContext, getAudioFormat())
-        .WillRepeatedly(
-            Return(avsCommon::utils::AudioFormat{.encoding = avsCommon::utils::AudioFormat::Encoding::LPCM,
-                                                 .endianness = avsCommon::utils::AudioFormat::Endianness::LITTLE,
-                                                 .sampleRateHz = 16000,
-                                                 .sampleSizeInBits = 16,
-                                                 .numChannels = 1,
-                                                 .dataSigned = false,
-                                                 .layout = avsCommon::utils::AudioFormat::Layout::NON_INTERLEAVED}));
+    EXPECT_CALL(*m_mockBlockAudioEncoder, getAVSFormatName()).WillRepeatedly(Return(std::string(AUDIO_FORMAT_LPCM)));
+    EXPECT_CALL(*m_mockBlockAudioEncoder, getAudioFormat())
+        .WillRepeatedly(Return(avsCommon::utils::AudioFormat{avsCommon::utils::AudioFormat::Encoding::LPCM,
+                                                             avsCommon::utils::AudioFormat::Endianness::LITTLE,
+                                                             16000,
+                                                             16,
+                                                             1,
+                                                             false,
+                                                             avsCommon::utils::AudioFormat::Layout::NON_INTERLEAVED}));
 
     AudioInputProcessor::EncodingFormatRequest encodingReq = {
         {"CLOUD", {avsCommon::utils::AudioFormat::Encoding::OPUS, avsCommon::utils::AudioFormat::Encoding::OPUS}},
@@ -3822,7 +3826,7 @@ TEST_F(AudioInputProcessorTest, test_recognizeWakewordWithGoodBeginAndEndForMult
 }
 
 /// This function verifies that recognize() works for multiple audio streams in State::RECOGNIZING when the previous *
-/// recognize used the CLOSE_TALK profile. Disabled for potential race condition in SpeechEncoder.
+/// recognize used the CLOSE_TALK profile. Disabled for potential race condition in audio encoder.
 TEST_F(AudioInputProcessorTest, test_recognizeBargeInWhileRecognizingCloseTalkForMultiStreams) {
     auto audioProvider = *m_audioProvider;
     audioProvider.profile = ASRProfile::CLOSE_TALK;
diff --git a/CapabilityAgents/AIP/test/CMakeLists.txt b/CapabilityAgents/AIP/test/CMakeLists.txt
index 640e5e0e8b..1b8c692d8e 100644
--- a/CapabilityAgents/AIP/test/CMakeLists.txt
+++ b/CapabilityAgents/AIP/test/CMakeLists.txt
@@ -5,4 +5,4 @@ set(INCLUDE_PATH
     "${AVSCommon_SOURCE_DIR}/AVS/test"
     "${DeviceSettings_SOURCE_DIR}/test")
 
-discover_unit_tests("${INCLUDE_PATH}" "AIP;UtilsCommonTestLib;CertifiedSenderCommonTestLib;AVSSystem;SDKInterfacesTests")
+discover_unit_tests("${INCLUDE_PATH}" "AIP;UtilsCommonTestLib;CertifiedSenderCommonTestLib;AVSSystem;SDKInterfacesTests;acsdkAudioEncoder")
diff --git a/CapabilityAgents/AIP/test/MockObserver.h b/CapabilityAgents/AIP/test/MockObserver.h
index b59764086a..4f191a0767 100644
--- a/CapabilityAgents/AIP/test/MockObserver.h
+++ b/CapabilityAgents/AIP/test/MockObserver.h
@@ -29,6 +29,7 @@ namespace test {
 class MockObserver : public avsCommon::sdkInterfaces::AudioInputProcessorObserverInterface {
 public:
     MOCK_METHOD1(onStateChanged, void(avsCommon::sdkInterfaces::AudioInputProcessorObserverInterface::State state));
+    MOCK_METHOD1(onASRProfileChanged, void(const std::string& profile));
 };
 
 }  // namespace test
diff --git a/CapabilityAgents/Alexa/include/Alexa/AlexaEventProcessedNotifier.h b/CapabilityAgents/Alexa/include/Alexa/AlexaEventProcessedNotifier.h
index 5a07998cd8..5dfe0874cc 100644
--- a/CapabilityAgents/Alexa/include/Alexa/AlexaEventProcessedNotifier.h
+++ b/CapabilityAgents/Alexa/include/Alexa/AlexaEventProcessedNotifier.h
@@ -19,7 +19,7 @@
 #include <memory>
 
 #include <acsdkAlexaEventProcessedNotifierInterfaces/AlexaEventProcessedNotifierInterface.h>
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 #include <AVSCommon/SDKInterfaces/AlexaEventProcessedObserverInterface.h>
 
 namespace alexaClientSDK {
@@ -30,7 +30,7 @@ namespace alexa {
  * Relays notifications when Alexa.EventProcessed directive is received.
  */
 class AlexaEventProcessedNotifier
-        : public acsdkNotifier::Notifier<avsCommon::sdkInterfaces::AlexaEventProcessedObserverInterface> {
+        : public notifier::Notifier<avsCommon::sdkInterfaces::AlexaEventProcessedObserverInterface> {
 public:
     /**
      * Factory method.
diff --git a/CapabilityAgents/Alexa/src/AlexaInterfaceCapabilityAgent.cpp b/CapabilityAgents/Alexa/src/AlexaInterfaceCapabilityAgent.cpp
index 86aca70035..6aaad98372 100644
--- a/CapabilityAgents/Alexa/src/AlexaInterfaceCapabilityAgent.cpp
+++ b/CapabilityAgents/Alexa/src/AlexaInterfaceCapabilityAgent.cpp
@@ -31,7 +31,7 @@ using namespace avsCommon::utils;
 using DefaultEndpointAnnotation = avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"AlexaInterfaceCapabilityAgent"};
+#define TAG "AlexaInterfaceCapabilityAgent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -168,7 +168,7 @@ void AlexaInterfaceCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<A
 
 void AlexaInterfaceCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInfo> info) {
     ACSDK_DEBUG5(LX(__func__));
-    m_executor.submit([this, info] {
+    m_executor.execute([this, info] {
         if (!info || !info->directive) {
             ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirective"));
             return;
diff --git a/CapabilityAgents/Alexa/src/AlexaInterfaceMessageSender.cpp b/CapabilityAgents/Alexa/src/AlexaInterfaceMessageSender.cpp
index 4fa4a9f47c..3acf921f82 100644
--- a/CapabilityAgents/Alexa/src/AlexaInterfaceMessageSender.cpp
+++ b/CapabilityAgents/Alexa/src/AlexaInterfaceMessageSender.cpp
@@ -32,7 +32,7 @@ using namespace avsCommon::utils;
 using namespace avsCommon::utils::logger;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"AlexaInterfaceMessageSender"};
+#define TAG "AlexaInterfaceMessageSender"
 
 /// Name of response events.
 static const std::string EVENT_NAME_STATE_REPORT_STRING = "StateReport";
@@ -327,7 +327,7 @@ bool AlexaInterfaceMessageSender::sendCommonResponseEvent(
         endpoint,
         jsonPayload,
         responseNamespace == "" ? ALEXA_INTERFACE_NAME : responseNamespace);
-    m_executor.submit([this, event]() {
+    m_executor.execute([this, event]() {
         // Start collecting context for this endpoint.
         auto token = m_contextManager->getContext(shared_from_this(), event->endpoint.endpointId);
         m_pendingResponses[token] = event;
@@ -408,7 +408,7 @@ void AlexaInterfaceMessageSender::onStateChanged(
     const CapabilityState& state,
     const AlexaStateChangeCauseType cause) {
     auto event = std::make_shared<ChangeReportData>(identifier, state, cause);
-    m_executor.submit([this, event]() {
+    m_executor.execute([this, event]() {
         // Start collecting context for this endpoint.
         auto token = m_contextManager->getContext(shared_from_this(), event->tag.endpointId);
         m_pendingChangeReports[token] = event;
@@ -419,7 +419,7 @@ void AlexaInterfaceMessageSender::onContextAvailable(
     const std::string& endpointId,
     const AVSContext& endpointContext,
     ContextRequestToken token) {
-    m_executor.submit([this, endpointId, endpointContext, token]() {
+    m_executor.execute([this, endpointId, endpointContext, token]() {
         ACSDK_DEBUG(LX("onContextAvailable").sensitive("endpointId", endpointId));
 
         // Is this for a pending response event?
@@ -436,7 +436,8 @@ void AlexaInterfaceMessageSender::onContextAvailable(
 }
 
 void AlexaInterfaceMessageSender::onContextFailure(const ContextRequestError error, ContextRequestToken token) {
-    m_executor.submit([this, error, token]() {
+    m_executor.execute([this, error, token]() {
+        (void)error;  // mark capture as used for the case when logging is disabled.
         ACSDK_ERROR(LX("executeOnContextFailure").d("error", error));
 
         // Is this for a pending response event?
diff --git a/CapabilityAgents/ApiGateway/src/ApiGatewayCapabilityAgent.cpp b/CapabilityAgents/ApiGateway/src/ApiGatewayCapabilityAgent.cpp
index 9030205d1a..09371f14e9 100644
--- a/CapabilityAgents/ApiGateway/src/ApiGatewayCapabilityAgent.cpp
+++ b/CapabilityAgents/ApiGateway/src/ApiGatewayCapabilityAgent.cpp
@@ -29,7 +29,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::utils::json::jsonUtils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"ApiGateway"};
+#define TAG "ApiGateway"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -117,7 +117,7 @@ void ApiGatewayCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDi
 
 void ApiGatewayCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInfo> info) {
     ACSDK_DEBUG5(LX(__func__));
-    m_executor.submit([this, info] { executeHandleDirective(info); });
+    m_executor.execute([this, info] { executeHandleDirective(info); });
 }
 
 void ApiGatewayCapabilityAgent::executeHandleDirective(std::shared_ptr<DirectiveInfo> info) {
diff --git a/CapabilityAgents/CMakeLists.txt b/CapabilityAgents/CMakeLists.txt
index 013ad92743..9987b8170b 100644
--- a/CapabilityAgents/CMakeLists.txt
+++ b/CapabilityAgents/CMakeLists.txt
@@ -14,8 +14,7 @@ set(CAPABILITY_AGENTS
         "SoftwareComponentReporter"
         "SpeakerManager"
         "SpeechSynthesizer"
-        "System"
-        "TemplateRuntime")
+        "System")
 
 if (COMMS)
     list(APPEND CAPABILITY_AGENTS "CallManager")
diff --git a/CapabilityAgents/InteractionModel/acsdkInteractionModel/privateInclude/acsdkInteractionModel/InteractionModelNotifier.h b/CapabilityAgents/InteractionModel/acsdkInteractionModel/privateInclude/acsdkInteractionModel/InteractionModelNotifier.h
index a60a79dbdf..8de5238f07 100644
--- a/CapabilityAgents/InteractionModel/acsdkInteractionModel/privateInclude/acsdkInteractionModel/InteractionModelNotifier.h
+++ b/CapabilityAgents/InteractionModel/acsdkInteractionModel/privateInclude/acsdkInteractionModel/InteractionModelNotifier.h
@@ -20,7 +20,7 @@
 
 #include <acsdkInteractionModelInterfaces/InteractionModelNotifierInterface.h>
 #include <acsdkInteractionModelInterfaces/InteractionModelRequestProcessingObserverInterface.h>
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 
 namespace alexaClientSDK {
 namespace acsdkInteractionModel {
@@ -29,7 +29,7 @@ namespace acsdkInteractionModel {
  * Relays notifications related to acsdkInteractionModel.
  */
 class InteractionModelNotifier
-        : public acsdkNotifier::Notifier<
+        : public notifier::Notifier<
               acsdkInteractionModelInterfaces::InteractionModelRequestProcessingObserverInterface> {
 public:
     /*
diff --git a/CapabilityAgents/InteractionModel/acsdkInteractionModel/src/InteractionModelCapabilityAgent.cpp b/CapabilityAgents/InteractionModel/acsdkInteractionModel/src/InteractionModelCapabilityAgent.cpp
index 236d9e2da9..f61304a6b9 100644
--- a/CapabilityAgents/InteractionModel/acsdkInteractionModel/src/InteractionModelCapabilityAgent.cpp
+++ b/CapabilityAgents/InteractionModel/acsdkInteractionModel/src/InteractionModelCapabilityAgent.cpp
@@ -34,7 +34,7 @@ using namespace avsCommon::utils;
 using namespace json::jsonUtils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"InteractionModel"};
+#define TAG "InteractionModel"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -139,10 +139,44 @@ DirectiveHandlerConfiguration InteractionModelCapabilityAgent::getConfiguration(
 }
 void InteractionModelCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
     ACSDK_DEBUG5(LX(__func__));
-    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+
+    // The logic for handleDirectiveImmediately and preHandleDirective should be same,
+    // which we only process directive without dialogRequestId
+    preHandleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
 }
 void InteractionModelCapabilityAgent::preHandleDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
-    // No-op
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info) {
+        ACSDK_ERROR(LX("preHandleDirectiveFailed").d("reason", "nullInfo"));
+        return;
+    }
+
+    if (!info->directive) {
+        ACSDK_ERROR(LX("preHandleDirectiveFailed").d("reason", "nullDirective"));
+        return;
+    }
+
+    // Both preHandleDirective and handleDirectiveImmediately interfaces only handle message
+    // with empty dialogRequestId. Other messages (having dialogRequestId in header) will be
+    // queued to handle sequentially.
+    if (info->directive->getDialogRequestId().empty()) {
+        std::string errMessage;
+        ExceptionErrorType errType;
+
+        if (handleDirectiveHelper(info, &errMessage, &errType)) {
+            if (info->result) {
+                info->result->setCompleted();
+            }
+        } else {
+            ACSDK_ERROR(LX("preHandleDirectiveFailed").d("reason", errMessage));
+            m_exceptionEncounteredSender->sendExceptionEncountered(
+                info->directive->getUnparsedDirective(), errType, errMessage);
+            if (info->result) {
+                info->result->setFailed(errMessage);
+            }
+        }
+        removeDirective(info->directive->getMessageId());
+    }
 }
 
 bool InteractionModelCapabilityAgent::handleDirectiveHelper(
@@ -198,6 +232,7 @@ bool InteractionModelCapabilityAgent::handleDirectiveHelper(
                 return false;
             }
             m_directiveSequencer->setDialogRequestId(uuid);
+            ACSDK_DEBUG(LX(__func__).d("processDirective", directiveName).d("dialogRequestId", uuid));
         } else {
             *errMessage = "Dialog Request ID not specified";
             *type = ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED;
@@ -233,10 +268,12 @@ void InteractionModelCapabilityAgent::handleDirective(std::shared_ptr<Capability
         return;
     }
 
-    std::string errMessage;
-    ExceptionErrorType errType;
+    std::string errMessage = "emptyDialogRequestId";
+    ExceptionErrorType errType = ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED;
 
-    if (handleDirectiveHelper(info, &errMessage, &errType)) {
+    // Directives without dialogRequestId must be handled in preHandle or handleImmediately
+    // which happen on receiving thread.
+    if (!info->directive->getDialogRequestId().empty() && handleDirectiveHelper(info, &errMessage, &errType)) {
         if (info->result) {
             info->result->setCompleted();
         }
diff --git a/CapabilityAgents/InteractionModel/acsdkInteractionModel/test/InteractionModelCapabilityAgentTest.cpp b/CapabilityAgents/InteractionModel/acsdkInteractionModel/test/InteractionModelCapabilityAgentTest.cpp
index 14e1e660aa..bb372dda65 100644
--- a/CapabilityAgents/InteractionModel/acsdkInteractionModel/test/InteractionModelCapabilityAgentTest.cpp
+++ b/CapabilityAgents/InteractionModel/acsdkInteractionModel/test/InteractionModelCapabilityAgentTest.cpp
@@ -57,6 +57,21 @@ static const std::string CORRECT_NEW_DIALOG_REQUEST_DIRECTIVE_JSON_STRING = R"de
         }
     })delim";
 
+/// A sample Directive JSON string for the purposes of creating an AVSDirective object.
+static const std::string CORRECT_REQUEST_PROCESSING_STARTED_DIRECTIVE_JSON_STRING = R"delim(
+    {
+        "directive": {
+            "header": {
+                "namespace": "InteractionModel",
+                "name": "RequestProcessingStarted",
+                "messageId": "12345",
+                "dialogRequestId": "3456"
+            },
+            "payload": {
+            }
+        }
+    })delim";
+
 /// An invalid NewDialogRequest directive with an incorrect name
 static const std::string INCORRECT_NEW_DIALOG_REQUEST_DIRECTIVE_JSON_STRING_1 = R"delim(
     {
@@ -147,6 +162,21 @@ static const std::string RPC_DIRECTIVE_JSON_STRING = R"delim(
 // Timeout to wait before indicating a test failed.
 std::chrono::milliseconds TIMEOUT{500};
 
+/// A wrapper for InteractionModelCapabilityAgent for easy testing
+class InteractionModelCapabilityAgentWrapper : public InteractionModelCapabilityAgent {
+public:
+    static void handleDirectiveWrapper(
+        std::shared_ptr<avsCommon::avs::AVSDirective> directive,
+        std::shared_ptr<InteractionModelCapabilityAgent> capabilityAgent) {
+        capabilityAgent->handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+    }
+    static void preHandleDirectiveWrapper(
+        std::shared_ptr<avsCommon::avs::AVSDirective> directive,
+        std::shared_ptr<InteractionModelCapabilityAgent> capabilityAgent) {
+        capabilityAgent->preHandleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+    }
+};
+
 /// Test harness for @c InteractionModelCapabilityAgent class.
 class InteractionModelCapabilityAgentTest : public Test {
 public:
@@ -320,6 +350,55 @@ TEST_F(InteractionModelCapabilityAgentTest, test_processNewDialogRequestID) {
     ASSERT_EQ(TEST_DIALOG_REQUEST_AVS, m_mockDirectiveSequencer->getDialogRequestId());
 }
 
+/**
+ * Test to verify if a valid NewDialogRequest directive will set the dialogRequestID in the directive sequencer
+ * in preHandle hook.
+ */
+TEST_F(InteractionModelCapabilityAgentTest, test_preHandledNewDialogRequestID) {
+    // Create a dummy AVSDirective.
+    auto directivePair = AVSDirective::create(CORRECT_NEW_DIALOG_REQUEST_DIRECTIVE_JSON_STRING, nullptr, "");
+    std::shared_ptr<AVSDirective> directive = std::move(directivePair.first);
+    std::shared_ptr<CapabilityAgent> agent = std::dynamic_pointer_cast<CapabilityAgent>(m_interactionModelCA);
+
+    agent->preHandleDirective(directive, nullptr);
+    ASSERT_EQ(TEST_DIALOG_REQUEST_AVS, m_mockDirectiveSequencer->getDialogRequestId());
+}
+
+/**
+ * Test to verify if preHandle interface will NOT process directive having dialogRequestID.
+ */
+TEST_F(InteractionModelCapabilityAgentTest, test_preHandledRequestProcessingStarted) {
+    // Create a dummy AVSDirective.
+    auto directivePair = AVSDirective::create(CORRECT_REQUEST_PROCESSING_STARTED_DIRECTIVE_JSON_STRING, nullptr, "");
+    std::shared_ptr<AVSDirective> directive = std::move(directivePair.first);
+
+    InteractionModelCapabilityAgentWrapper::preHandleDirectiveWrapper(directive, m_interactionModelCA);
+    ASSERT_EQ("", m_mockDirectiveSequencer->getDialogRequestId());
+}
+
+/**
+ * Test to verify if preHandle interface will ignore directives with dialogRequestId.
+ */
+TEST_F(InteractionModelCapabilityAgentTest, test_preHandledNullNewDialogRequestID) {
+    std::shared_ptr<CapabilityAgent> agent = std::dynamic_pointer_cast<CapabilityAgent>(m_interactionModelCA);
+
+    agent->preHandleDirective(nullptr, nullptr);
+    ASSERT_EQ("", m_mockDirectiveSequencer->getDialogRequestId());
+}
+
+/**
+ * Test to verify if a valid NewDialogRequest directive with empty dialogRequestId
+ * will not be handled in handleDirective hook.
+ */
+TEST_F(InteractionModelCapabilityAgentTest, test_handledNewDialogRequestID) {
+    // Create a dummy AVSDirective.
+    auto directivePair = AVSDirective::create(CORRECT_NEW_DIALOG_REQUEST_DIRECTIVE_JSON_STRING, nullptr, "");
+    std::shared_ptr<AVSDirective> directive = std::move(directivePair.first);
+
+    InteractionModelCapabilityAgentWrapper::handleDirectiveWrapper(directive, m_interactionModelCA);
+    ASSERT_EQ("", m_mockDirectiveSequencer->getDialogRequestId());
+}
+
 /**
  * Test to verify if interface will ignore null directives
  */
diff --git a/CapabilityAgents/InteractionModel/acsdkInteractionModelInterfaces/include/acsdkInteractionModelInterfaces/InteractionModelNotifierInterface.h b/CapabilityAgents/InteractionModel/acsdkInteractionModelInterfaces/include/acsdkInteractionModelInterfaces/InteractionModelNotifierInterface.h
index 17170763c3..0f1a8e2cdc 100644
--- a/CapabilityAgents/InteractionModel/acsdkInteractionModelInterfaces/include/acsdkInteractionModelInterfaces/InteractionModelNotifierInterface.h
+++ b/CapabilityAgents/InteractionModel/acsdkInteractionModelInterfaces/include/acsdkInteractionModelInterfaces/InteractionModelNotifierInterface.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
 
 #include "acsdkInteractionModelInterfaces/InteractionModelRequestProcessingObserverInterface.h"
 
@@ -29,7 +29,7 @@ namespace acsdkInteractionModelInterfaces {
  * Interface for registering to observe acsdkInteractionModel RequestProcessing notifications.
  */
 using InteractionModelNotifierInterface =
-    acsdkNotifierInterfaces::NotifierInterface<InteractionModelRequestProcessingObserverInterface>;
+    notifierInterfaces::NotifierInterface<InteractionModelRequestProcessingObserverInterface>;
 
 }  // namespace acsdkInteractionModelInterfaces
 }  // namespace alexaClientSDK
diff --git a/CapabilityAgents/ModeController/src/ModeControllerAttributeBuilder.cpp b/CapabilityAgents/ModeController/src/ModeControllerAttributeBuilder.cpp
index 9186da72b3..3bbef75b6d 100644
--- a/CapabilityAgents/ModeController/src/ModeControllerAttributeBuilder.cpp
+++ b/CapabilityAgents/ModeController/src/ModeControllerAttributeBuilder.cpp
@@ -27,7 +27,7 @@ using namespace avsCommon::sdkInterfaces::modeController;
 using namespace avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"ModeControllerAttributeBuilder"};
+#define TAG "ModeControllerAttributeBuilder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CapabilityAgents/ModeController/src/ModeControllerCapabilityAgent.cpp b/CapabilityAgents/ModeController/src/ModeControllerCapabilityAgent.cpp
index 84567f251b..e20280b49b 100644
--- a/CapabilityAgents/ModeController/src/ModeControllerCapabilityAgent.cpp
+++ b/CapabilityAgents/ModeController/src/ModeControllerCapabilityAgent.cpp
@@ -40,7 +40,7 @@ using namespace avsCommon::utils::json;
 using namespace rapidjson;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"ModeControllerCapabilityAgent"};
+#define TAG "ModeControllerCapabilityAgent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -269,7 +269,7 @@ void ModeControllerCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInf
         return;
     }
 
-    m_executor.submit([this, info] {
+    m_executor.execute([this, info] {
         ACSDK_DEBUG5(LX("handleDirectiveInExecutor"));
         const std::string directiveName = info->directive->getName();
         if (!info->directive->getEndpoint().hasValue() ||
@@ -311,7 +311,7 @@ void ModeControllerCapabilityAgent::provideState(
     ACSDK_DEBUG5(
         LX(__func__).d("contextRequestToken", contextRequestToken).sensitive("stateProviderName", stateProviderName));
 
-    m_executor.submit([this, stateProviderName, contextRequestToken] {
+    m_executor.execute([this, stateProviderName, contextRequestToken] {
         ACSDK_DEBUG5(LX("provideStateInExecutor"));
         executeProvideState(stateProviderName, contextRequestToken);
     });
@@ -402,7 +402,7 @@ void ModeControllerCapabilityAgent::onModeChanged(const ModeState& mode, const A
         return;
     }
 
-    m_executor.submit([this, mode, cause] {
+    m_executor.execute([this, mode, cause] {
         m_contextManager->reportStateChange(
             CapabilityTag(NAMESPACE, MODEVALUE_PROPERTY_NAME, m_endpointId, m_instance),
             buildCapabilityState(mode),
diff --git a/CapabilityAgents/PlaybackController/src/PlaybackCommand.cpp b/CapabilityAgents/PlaybackController/src/PlaybackCommand.cpp
index bfb06db7d0..4fed6ecc2d 100644
--- a/CapabilityAgents/PlaybackController/src/PlaybackCommand.cpp
+++ b/CapabilityAgents/PlaybackController/src/PlaybackCommand.cpp
@@ -28,7 +28,7 @@ using namespace avsCommon::avs;
 using namespace rapidjson;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PlaybackCommand");
+#define TAG "PlaybackCommand"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CapabilityAgents/PlaybackController/src/PlaybackController.cpp b/CapabilityAgents/PlaybackController/src/PlaybackController.cpp
index 07401dfa16..caacbd1e15 100644
--- a/CapabilityAgents/PlaybackController/src/PlaybackController.cpp
+++ b/CapabilityAgents/PlaybackController/src/PlaybackController.cpp
@@ -40,7 +40,7 @@ static const std::string PLAYBACKCONTROLLER_CAPABILITY_INTERFACE_NAME = "Playbac
 static const std::string PLAYBACKCONTROLLER_CAPABILITY_INTERFACE_VERSION = "1.1";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PlaybackController");
+#define TAG "PlaybackController"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -120,7 +120,7 @@ void PlaybackController::handleCommand(const PlaybackCommand& command) {
     };
 
     ACSDK_DEBUG9(LX("buttonPressed").d("Button", command));
-    m_executor.submit(task);
+    m_executor.execute(task);
 }
 
 void PlaybackController::onButtonPressed(PlaybackButton button) {
@@ -167,11 +167,12 @@ void PlaybackController::onContextAvailable(const std::string& jsonContext) {
     };
 
     ACSDK_DEBUG9(LX("onContextAvailable"));
-    m_executor.submit(task);
+    m_executor.execute(task);
 }
 
 void PlaybackController::onContextFailure(const ContextRequestError error) {
     auto task = [this, error]() {
+        (void)error;  // mark capture as used when logging is disabled.
         if (m_commands.empty()) {
             // The queue shouldn't be empty, log a warning message and return here.
             ACSDK_WARN(LX("onContextFailureExecutor").m("Queue is empty, return."));
@@ -189,7 +190,7 @@ void PlaybackController::onContextFailure(const ContextRequestError error) {
     };
 
     ACSDK_DEBUG9(LX("onContextFailure"));
-    m_executor.submit(task);
+    m_executor.execute(task);
 }
 
 PlaybackController::PlaybackController(
diff --git a/CapabilityAgents/PlaybackController/src/PlaybackRouter.cpp b/CapabilityAgents/PlaybackController/src/PlaybackRouter.cpp
index c47f2dcfb4..8f58d5339c 100644
--- a/CapabilityAgents/PlaybackController/src/PlaybackRouter.cpp
+++ b/CapabilityAgents/PlaybackController/src/PlaybackRouter.cpp
@@ -26,7 +26,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::avs;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PlaybackRouter");
+#define TAG "PlaybackRouter"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CapabilityAgents/PowerController/src/PowerControllerCapabilityAgent.cpp b/CapabilityAgents/PowerController/src/PowerControllerCapabilityAgent.cpp
index 21d799a2b8..3e3b85fead 100644
--- a/CapabilityAgents/PowerController/src/PowerControllerCapabilityAgent.cpp
+++ b/CapabilityAgents/PowerController/src/PowerControllerCapabilityAgent.cpp
@@ -28,7 +28,7 @@ using namespace avsCommon::utils;
 using namespace avsCommon::utils::configuration;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"PowerControllerCapabilityAgent"};
+#define TAG "PowerControllerCapabilityAgent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -164,7 +164,7 @@ void PowerControllerCapabilityAgent::handleDirective(std::shared_ptr<DirectiveIn
         return;
     }
 
-    m_executor.submit([this, info] {
+    m_executor.execute([this, info] {
         ACSDK_DEBUG5(LX("handleDirectiveInExecutor"));
         const std::string directiveName = info->directive->getName();
         if (!info->directive->getEndpoint().hasValue() ||
@@ -195,7 +195,7 @@ void PowerControllerCapabilityAgent::provideState(
     ACSDK_DEBUG5(
         LX(__func__).d("contextRequestToken", contextRequestToken).sensitive("stateProviderName", stateProviderName));
 
-    m_executor.submit([this, stateProviderName, contextRequestToken] {
+    m_executor.execute([this, stateProviderName, contextRequestToken] {
         ACSDK_DEBUG5(LX("provideStateInExecutor"));
         executeProvideState(stateProviderName, contextRequestToken);
     });
@@ -254,7 +254,7 @@ void PowerControllerCapabilityAgent::onPowerStateChanged(
         return;
     }
 
-    m_executor.submit([this, powerState, cause] {
+    m_executor.execute([this, powerState, cause] {
         ACSDK_DEBUG5(LX("onPowerStateChangedInExecutor"));
         m_contextManager->reportStateChange(
             CapabilityTag(NAMESPACE, POWERSTATE_PROPERTY_NAME, m_endpointId), buildCapabilityState(powerState), cause);
diff --git a/CapabilityAgents/RangeController/src/RangeControllerAttributeBuilder.cpp b/CapabilityAgents/RangeController/src/RangeControllerAttributeBuilder.cpp
index e68d2ab07b..208bdbb0cc 100644
--- a/CapabilityAgents/RangeController/src/RangeControllerAttributeBuilder.cpp
+++ b/CapabilityAgents/RangeController/src/RangeControllerAttributeBuilder.cpp
@@ -29,7 +29,7 @@ using namespace avsCommon::sdkInterfaces::rangeController;
 using namespace avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"RangeControllerAttributeBuilder"};
+#define TAG "RangeControllerAttributeBuilder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CapabilityAgents/RangeController/src/RangeControllerCapabilityAgent.cpp b/CapabilityAgents/RangeController/src/RangeControllerCapabilityAgent.cpp
index d885c0fc63..d21494e33e 100644
--- a/CapabilityAgents/RangeController/src/RangeControllerCapabilityAgent.cpp
+++ b/CapabilityAgents/RangeController/src/RangeControllerCapabilityAgent.cpp
@@ -41,7 +41,7 @@ using namespace avsCommon::utils::json;
 using namespace rapidjson;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"RangeControllerCapabilityAgent"};
+#define TAG "RangeControllerCapabilityAgent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -271,7 +271,7 @@ void RangeControllerCapabilityAgent::handleDirective(std::shared_ptr<DirectiveIn
         return;
     }
 
-    m_executor.submit([this, info] {
+    m_executor.execute([this, info] {
         ACSDK_DEBUG5(LX("handleDirectiveInExecutor"));
         const std::string directiveName = info->directive->getName();
         if (!info->directive->getEndpoint().hasValue() ||
@@ -313,7 +313,7 @@ void RangeControllerCapabilityAgent::provideState(
     ACSDK_DEBUG5(
         LX(__func__).d("contextRequestToken", contextRequestToken).sensitive("stateProviderName", stateProviderName));
 
-    m_executor.submit([this, stateProviderName, contextRequestToken] {
+    m_executor.execute([this, stateProviderName, contextRequestToken] {
         ACSDK_DEBUG5(LX("provideStateInExecutor"));
         executeProvideState(stateProviderName, contextRequestToken);
     });
@@ -417,7 +417,7 @@ void RangeControllerCapabilityAgent::onRangeChanged(
         return;
     }
 
-    m_executor.submit([this, rangeState, cause] {
+    m_executor.execute([this, rangeState, cause] {
         m_contextManager->reportStateChange(
             CapabilityTag(NAMESPACE, RANGEVALUE_PROPERTY_NAME, m_endpointId, m_instance),
             buildCapabilityState(rangeState),
diff --git a/CapabilityAgents/SoftwareComponentReporter/src/SoftwareComponentReporterCapabilityAgent.cpp b/CapabilityAgents/SoftwareComponentReporter/src/SoftwareComponentReporterCapabilityAgent.cpp
index bfa4c8e65c..1784ee49d1 100644
--- a/CapabilityAgents/SoftwareComponentReporter/src/SoftwareComponentReporterCapabilityAgent.cpp
+++ b/CapabilityAgents/SoftwareComponentReporter/src/SoftwareComponentReporterCapabilityAgent.cpp
@@ -31,7 +31,7 @@ using namespace avsCommon::utils::configuration;
 using namespace avsCommon::utils::json;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"SoftwareComponentReporterCapabilityAgent"};
+#define TAG "SoftwareComponentReporterCapabilityAgent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CapabilityAgents/SpeakerManager/CMakeLists.txt b/CapabilityAgents/SpeakerManager/CMakeLists.txt
index d5a55a27b2..7cfaf2ea82 100644
--- a/CapabilityAgents/SpeakerManager/CMakeLists.txt
+++ b/CapabilityAgents/SpeakerManager/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-project(SpeakerManager LANGUAGES CXX)
+project(acsdkSpeakerManager LANGUAGES CXX)
 
-include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
-
-add_subdirectory("src")
-add_subdirectory("test")
+add_subdirectory("SpeakerManager")
+add_subdirectory("SpeakerManagerComponent")
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/CMakeLists.txt b/CapabilityAgents/SpeakerManager/SpeakerManager/CMakeLists.txt
new file mode 100644
index 0000000000..9b1c463097
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.0)
+project(acsdkSpeakerManager LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/doc/Namespaces.dox b/CapabilityAgents/SpeakerManager/SpeakerManager/doc/Namespaces.dox
new file mode 100644
index 0000000000..f3667514fc
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/doc/Namespaces.dox
@@ -0,0 +1,23 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @namespace alexaClientSDK::speakerManager
+ * @brief Speaker API Capability Agent Interface and Implementation.
+ *
+ * This namespace contains public API and implementation for Speaker API capability agent.
+ * @see Lib_acsdkSpeakerManager
+ * @ingroup Lib_acsdkSpeakerManager
+ */
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/doc/SpeakerManager.dox b/CapabilityAgents/SpeakerManager/SpeakerManager/doc/SpeakerManager.dox
new file mode 100644
index 0000000000..b9c08883b8
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/doc/SpeakerManager.dox
@@ -0,0 +1,27 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @defgroup Lib_acsdkSpeakerManager Capability Agent for AVS Speaker 1.0 Interface
+ * @brief Capability Agent API and implementation for
+ * <a href="https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/speaker.html">AVS Speaker 1.0</a>
+ * interface.
+ *
+ * @see https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/speaker.html Speaker 1.0 Interface
+ *
+ * @see alexaClientSDK::speakerManager
+ * @see alexaClientSDK::speakerManager::test
+ * @see Lib_acsdkSpeakerManagerComponent
+ */
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/include/acsdk/SpeakerManager/Factories.h b/CapabilityAgents/SpeakerManager/SpeakerManager/include/acsdk/SpeakerManager/Factories.h
new file mode 100644
index 0000000000..468f0814ac
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/include/acsdk/SpeakerManager/Factories.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_INCLUDE_ACSDK_SPEAKERMANAGER_FACTORIES_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_INCLUDE_ACSDK_SPEAKERMANAGER_FACTORIES_H_
+
+#include <memory>
+
+#include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
+#include <acsdk/SpeakerManager/SpeakerManagerConfigInterface.h>
+#include <acsdk/SpeakerManager/SpeakerManagerStorageInterface.h>
+#include <acsdk/SpeakerManager/SpeakerManagerStorageState.h>
+#include <AVSCommon/AVS/AVSDirective.h>
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ChannelVolumeFactoryInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/SpeakerManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/SpeakerManagerObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/DefaultEndpointAnnotation.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointCapabilitiesRegistrarInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+/**
+ * @brief Creates speaker manager CA.
+ *
+ * Method creates new speaker manager capability agent, adds supplied volume interfaces, and registers instance in
+ * capabilities registry and in shutdown manager.
+ *
+ * Additional channel volume interfaces can be added after construction using public SpeakerManagerInterface methods.
+ *
+ * Speaker manager groups all channels by type, and applies volume settings and configurations uniformly to all channels
+ * of the same type.
+ *
+ * Speaker manager uses SpeakerManagerConfigInterface to load initial (bootstrap) platform configuration, and
+ * SpeakerManagerStorageInterface to store and load persistent settings. Those interfaces
+ *
+ * @param[in] config                         Interface to load platform configuration.
+ * @param[in] storage                        Interface to load and store persistent configuration.
+ * @param[in] contextManager                 A @c ContextManagerInterface to manage the context.
+ * @param[in] messageSender                  A @c MessageSenderInterface to send messages to AVS.
+ * @param[in] exceptionEncounteredSender     An @c ExceptionEncounteredSenderInterface to send directive processing
+ *                                           exceptions to AVS.
+ * @param[in] metricRecorder                 The metric recorder.
+ * @param[in] shutdownNotifier               Factory uses this interface to register for shutdown notifications.
+ * @param[in] endpointCapabilitiesRegistrar  Factory uses this interface to register capability.
+ * @param[in] volumeInterfaces               Optional vector of @c ChannelVolumeInterfaces to register. Additional
+ *                                           interfaces can be added with @c
+ *                                           SpeakerManagerInterface::addChannelVolumeInterface() calls.
+ *
+ * @see createSpeakerManagerStorage()
+ * @see createSpeakerManagerConfig()
+ * @see createChannelVolumeFactory()
+ *
+ * @ingroup Lib_acsdkSpeakerManager
+ */
+std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface> createSpeakerManagerCapabilityAgent(
+    std::shared_ptr<SpeakerManagerConfigInterface> config,
+    std::shared_ptr<SpeakerManagerStorageInterface> storage,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionEncounteredSender,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+    const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
+    const std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>&
+        endpointCapabilitiesRegistrar,
+    const std::vector<std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface>>& volumeInterfaces =
+        {}) noexcept;
+
+/**
+ * @brief Create default implementation of @c ChannelVolumeFactoryInterface.
+ *
+ * @return Channel volume factory interface or nullptr on error.
+ */
+std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface> createChannelVolumeFactory() noexcept;
+
+/**
+ * @brief Adapt generic @c MiscStorageInterface into @c SpeakerManagerStorageInterface.
+ *
+ * Method returns an adapter of @c SpeakerManagerStorageInterface to @c SpeakerManagerStorageInterface.
+ *
+ * @param[in] storage Reference of @c MiscStorageInterface. This parameter must not be nullptr.
+ *
+ * @return Storage interface or nullptr on error.
+ *
+ * @ingroup Lib_acsdkSpeakerManager
+ */
+std::shared_ptr<SpeakerManagerStorageInterface> createSpeakerManagerStorage(
+    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> storage) noexcept;
+
+/**
+ * @brief Creates configuration interface for speaker manager.
+ *
+ * The method returns an interface that accesses configuration using @c ConfigurationNode facility. The returned object
+ * uses "speakerManagerCapabilityAgent" child and looks up the following keys:
+ * - "persistentStorage" -- Boolean flag that indicates if persistent storage is enabled.
+ * - "minUnmuteVolume" -- Minimum volume level for unmuting the channel. This setting applies to all channel types.
+ * - "defaultSpeakerVolume" -- Default speaker volume.
+ * - "defaultAlertsVolume" -- Default alerts volume.
+ * - "restoreMuteState" -- Boolean flag that indicates if mute state shall be preserved between device reboots.
+ *
+ * If AlexaClientSDKConfig.json configuration file is used, the example configuration may look like:
+ * @code{.json}
+ * {
+ *    "speakerManagerCapabilityAgent": {
+ *        "persistentStorage": true,
+ *        "minUnmuteVolume": 10,
+ *        "defaultSpeakerVolume": 40,
+ *        "defaultAlertsVolume": 40,
+ *        "restoreMuteState": true
+ *    }
+ * }
+ * @endcode
+ *
+ * @return Interface to load initial configuration or nullptr on error.
+ *
+ * @ingroup Lib_acsdkSpeakerManager
+ */
+std::shared_ptr<SpeakerManagerConfigInterface> createSpeakerManagerConfig() noexcept;
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_INCLUDE_ACSDK_SPEAKERMANAGER_FACTORIES_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/include/acsdk/SpeakerManager/SpeakerManagerConfigInterface.h b/CapabilityAgents/SpeakerManager/SpeakerManager/include/acsdk/SpeakerManager/SpeakerManagerConfigInterface.h
new file mode 100644
index 0000000000..bc59f3688a
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/include/acsdk/SpeakerManager/SpeakerManagerConfigInterface.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_INCLUDE_ACSDK_SPEAKERMANAGER_SPEAKERMANAGERCONFIGINTERFACE_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_INCLUDE_ACSDK_SPEAKERMANAGER_SPEAKERMANAGERCONFIGINTERFACE_H_
+
+#include <cstdint>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+struct SpeakerManagerStorageState;
+
+/**
+ * @brief Speaker manager configuration interface.
+ *
+ * This interface provides initial configuration for speaker manager capability agent.
+ *
+ * @see createSpeakerManagerConfig()
+ *
+ * @ingroup Lib_acsdkSpeakerManager
+ */
+struct SpeakerManagerConfigInterface {
+    /**
+     * @brief Virtual destructor to assure proper cleanup of derived types.
+     */
+    virtual ~SpeakerManagerConfigInterface() noexcept = default;
+
+    /**
+     * @brief Load persistent storage setting from platform configuration.
+     *
+     * @param[out] persistentStorage Flag if persistent storage is enabled for speaker settings.
+     * @return True if value is loaded, false is value is not present, is out of range, or operation failed.
+     */
+    virtual bool getPersistentStorage(bool& persistentStorage) noexcept = 0;
+
+    /**
+     * @brief Load minimum unmute volume from platform configuration.
+     *
+     * @param[out] minUnmuteVolume Minimum volume for unmuting speakers. The value must be in range 0..100 inclusive.
+     * @return True if value is loaded, false if value is not present, is out of range, or operation failed.
+     */
+    virtual bool getMinUnmuteVolume(std::uint8_t& minUnmuteVolume) noexcept = 0;
+
+    /**
+     * @brief Load minimum unmute volume from platform configuration.
+     *
+     * @param[out] restoreMuteState Flag if the speaker mute state must be preserved between sessions.
+     * @return True if value is loaded, false if value is not present, is out of range, or operation failed.
+     */
+    virtual bool getRestoreMuteState(bool& restoreMuteState) noexcept = 0;
+
+    /**
+     * @brief Load minimum unmute volume from platform configuration.
+     *
+     * @param[out] defaultSpeakerVolume Default volume for speaker channel. The value must be in range 0..100 inclusive.
+     * @return True if value is loaded, false if value is not present, is out of range, or operation failed.
+     */
+    virtual bool getDefaultSpeakerVolume(std::uint8_t& defaultSpeakerVolume) noexcept = 0;
+
+    /**
+     * @brief Load minimum unmute volume from platform configuration.
+     *
+     * @param[out] defaultAlertsVolume Default volume for alerts channel. The value must be in range 0..100 inclusive.
+     * @return True if value is loaded, false if value is not present, is out of range, or operation failed.
+     */
+    virtual bool getDefaultAlertsVolume(std::uint8_t& defaultAlertsVolume) noexcept = 0;
+};
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_INCLUDE_ACSDK_SPEAKERMANAGER_SPEAKERMANAGERCONFIGINTERFACE_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/include/acsdk/SpeakerManager/SpeakerManagerStorageInterface.h b/CapabilityAgents/SpeakerManager/SpeakerManager/include/acsdk/SpeakerManager/SpeakerManagerStorageInterface.h
new file mode 100644
index 0000000000..af34a01834
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/include/acsdk/SpeakerManager/SpeakerManagerStorageInterface.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_INCLUDE_ACSDK_SPEAKERMANAGER_SPEAKERMANAGERSTORAGEINTERFACE_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_INCLUDE_ACSDK_SPEAKERMANAGER_SPEAKERMANAGERSTORAGEINTERFACE_H_
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+struct SpeakerManagerStorageState;
+
+/**
+ * @brief Speaker manager storage interface.
+ *
+ * @see SpeakerManagerStorageState
+ *
+ * @ingroup Lib_acsdkSpeakerManager
+ */
+struct SpeakerManagerStorageInterface {
+    /**
+     * Virtual destructor to assure proper cleanup of derived types.
+     */
+    virtual ~SpeakerManagerStorageInterface() noexcept = default;
+
+    /**
+     * Loads state from underlying storage.
+     * @param[out] state Pointer to state structure for loaded values.
+     * @return Boolean flag if the operation is successful.
+     */
+    virtual bool loadState(SpeakerManagerStorageState& state) noexcept = 0;
+
+    /**
+     * Stores state to underlying storage.
+     * @param[in] state Reference of state structure for values to store.
+     * @return Boolean flag if the operation is successful.
+     */
+    virtual bool saveState(const SpeakerManagerStorageState& state) noexcept = 0;
+};
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_INCLUDE_ACSDK_SPEAKERMANAGER_SPEAKERMANAGERSTORAGEINTERFACE_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/include/acsdk/SpeakerManager/SpeakerManagerStorageState.h b/CapabilityAgents/SpeakerManager/SpeakerManager/include/acsdk/SpeakerManager/SpeakerManagerStorageState.h
new file mode 100644
index 0000000000..dc010b9679
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/include/acsdk/SpeakerManager/SpeakerManagerStorageState.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_INCLUDE_ACSDK_SPEAKERMANAGER_SPEAKERMANAGERSTORAGESTATE_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_INCLUDE_ACSDK_SPEAKERMANAGER_SPEAKERMANAGERSTORAGESTATE_H_
+
+#include <cstdint>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+/**
+ * @brief Storage state for SpeakerManager.
+ *
+ * SpeakerManager configuration includes configuration for two channel types: speaker and alerts. There can be any
+ * number of channels for each of types, but all of them share the same configuration.
+ *
+ * @see SpeakerManagerStorageInterface
+ *
+ * @ingroup Lib_acsdkSpeakerManager
+ */
+struct SpeakerManagerStorageState {
+    /**
+     * SpeakerManager channel type configuration state.
+     */
+    struct ChannelState {
+        /// Channel volume.
+        uint8_t channelVolume;
+        /// Channel mute status.
+        bool channelMuteStatus;
+    };
+    /// Configuration for speaker channels.
+    ChannelState speakerChannelState;
+    /// Configuration for alerts channels.
+    ChannelState alertsChannelState;
+};
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_INCLUDE_ACSDK_SPEAKERMANAGER_SPEAKERMANAGERSTORAGESTATE_H_
diff --git a/CapabilityAgents/SpeakerManager/include/SpeakerManager/ChannelVolumeManager.h b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/ChannelVolumeManager.h
similarity index 87%
rename from CapabilityAgents/SpeakerManager/include/SpeakerManager/ChannelVolumeManager.h
rename to CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/ChannelVolumeManager.h
index 9f670118b1..369c99e54f 100644
--- a/CapabilityAgents/SpeakerManager/include/SpeakerManager/ChannelVolumeManager.h
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/ChannelVolumeManager.h
@@ -13,19 +13,23 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_CHANNELVOLUMEMANAGER_H_
-#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_CHANNELVOLUMEMANAGER_H_
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_CHANNELVOLUMEMANAGER_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_CHANNELVOLUMEMANAGER_H_
 
-#include <AVSCommon/SDKInterfaces/ChannelVolumeInterface.h>
 #include <mutex>
 
+#include <AVSCommon/SDKInterfaces/ChannelVolumeInterface.h>
+
 namespace alexaClientSDK {
-namespace capabilityAgents {
 namespace speakerManager {
 /**
- * ChannelVolumeManager provides a concrete implementation of the ChannelVolumeInterface
+ * @brief Default implementation for @c ChannelVolumeInterface.
+ *
+ * ChannelVolumeManager provides a concrete implementation of the @c ChannelVolumeInterface.
  * It controls an underlying @c SpeakerInterface object and provides functionality to be able
  * to set SpeakerSettings and control Channel Volume Attenuation for this underlying SpeakerInterface.
+ *
+ * @ingroup Lib_acsdkSpeakerManager
  */
 class ChannelVolumeManager : public avsCommon::sdkInterfaces::ChannelVolumeInterface {
 public:
@@ -41,7 +45,7 @@ class ChannelVolumeManager : public avsCommon::sdkInterfaces::ChannelVolumeInter
         std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> speaker,
         avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type =
             avsCommon::sdkInterfaces::ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
-        std::function<int8_t(int8_t)> volumeCurve = nullptr);
+        std::function<int8_t(int8_t)> volumeCurve = nullptr) noexcept;
 
     /// ChannelVolumeInterface Functions.
     /// @{
@@ -73,7 +77,7 @@ class ChannelVolumeManager : public avsCommon::sdkInterfaces::ChannelVolumeInter
     ChannelVolumeManager(
         std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> speaker,
         avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
-        VolumeCurveFunction volumeCurve);
+        VolumeCurveFunction volumeCurve) noexcept;
 
     /**
      * Default Volume Curve Implementation that determines the desired attenuated
@@ -94,7 +98,7 @@ class ChannelVolumeManager : public avsCommon::sdkInterfaces::ChannelVolumeInter
      * @param unduckedVolume current volume of the channel
      * @return int8_t volume to be attenuated to as per the volume curve
      */
-    static int8_t defaultVolumeAttenuateFunction(int8_t unduckedVolume);
+    static int8_t defaultVolumeAttenuateFunction(int8_t unduckedVolume) noexcept;
 
     /// Mutex to synchronize the operations.
     mutable std::mutex m_mutex;
@@ -115,7 +119,6 @@ class ChannelVolumeManager : public avsCommon::sdkInterfaces::ChannelVolumeInter
     const avsCommon::sdkInterfaces::ChannelVolumeInterface::Type m_type;
 };
 }  // namespace speakerManager
-}  // namespace capabilityAgents
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_CHANNELVOLUMEMANAGER_H_
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_CHANNELVOLUMEMANAGER_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/DefaultChannelVolumeFactory.h b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/DefaultChannelVolumeFactory.h
new file mode 100644
index 0000000000..28a993c115
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/DefaultChannelVolumeFactory.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_DEFAULTCHANNELVOLUMEFACTORY_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_DEFAULTCHANNELVOLUMEFACTORY_H_
+
+#include <AVSCommon/SDKInterfaces/ChannelVolumeFactoryInterface.h>
+#include <acsdk/SpeakerManager/private/ChannelVolumeManager.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+/**
+ * @brief Default channel volume factory implementation.
+ *
+ * The @c DefaultChannelVolumeFactory provides a default implementation of @c ChannelVolumeFactoryInterface
+ * using the @c ChannelVolumeManager.
+ *
+ * @ingroup Lib_acsdkSpeakerManager
+ */
+class DefaultChannelVolumeFactory : public alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface {
+public:
+    /// ChannelVolumeFactoryInterface Functions.
+    /// @{
+    virtual std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface>
+    createChannelVolumeInterface(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> speaker,
+        alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
+        std::function<int8_t(int8_t)> volumeCurve) override;
+    /// @}
+};
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_DEFAULTCHANNELVOLUMEFACTORY_H_
diff --git a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManager.h b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManager.h
similarity index 86%
rename from CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManager.h
rename to CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManager.h
index 229b724c5a..cfac317a7a 100644
--- a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManager.h
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManager.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGER_H_
-#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGER_H_
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGER_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGER_H_
 
 #include <future>
 #include <map>
@@ -22,8 +22,11 @@
 #include <unordered_set>
 #include <vector>
 
-#include <acsdkManufactory/Annotated.h>
 #include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
+#include <acsdk/SpeakerManager/SpeakerManagerConfigInterface.h>
+#include <acsdk/SpeakerManager/SpeakerManagerStorageInterface.h>
+#include <acsdk/SpeakerManager/SpeakerManagerStorageState.h>
+#include <acsdk/SpeakerManager/private/SpeakerManagerConfigHelper.h>
 #include <AVSCommon/AVS/AVSDirective.h>
 #include <AVSCommon/AVS/CapabilityAgent.h>
 #include <AVSCommon/AVS/CapabilityConfiguration.h>
@@ -41,15 +44,13 @@
 #include <AVSCommon/Utils/Threading/Executor.h>
 #include <AVSCommon/Utils/RetryTimer.h>
 #include <AVSCommon/Utils/WaitEvent.h>
-#include <SpeakerManager/SpeakerManagerStorageInterface.h>
-#include <SpeakerManager/SpeakerManagerStorageState.h>
-#include <SpeakerManager/SpeakerManagerConfigHelper.h>
 
 namespace alexaClientSDK {
-namespace capabilityAgents {
 namespace speakerManager {
 
 /**
+ * @brief Capability Agent for Speaker API.
+ *
  * This class implements a @c CapabilityAgent that handles the AVS @c Speaker API.
  *
  * The @c SpeakerManager can handle multiple @c ChannelVolumeInterface objects and dedupe them with
@@ -67,6 +68,8 @@ namespace speakerManager {
  * @endcode
  *
  * Clients may extend the @c ChannelVolumeInterface::Type enum if multiple independent volume controls are needed.
+ *
+ * @ingroup Lib_acsdkSpeakerManager
  */
 class SpeakerManager
         : public avsCommon::avs::CapabilityAgent
@@ -90,16 +93,15 @@ class SpeakerManager
      * @param metricRecorder The metric recorder.
      */
     static std::shared_ptr<SpeakerManagerInterface> createSpeakerManagerCapabilityAgent(
-        const std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface>& storage,
-        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
-        const std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface>& messageSender,
-        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
-            exceptionEncounteredSender,
+        std::shared_ptr<SpeakerManagerConfigInterface> config,
+        std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> storage,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionEncounteredSender,
         const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
-        const acsdkManufactory::Annotated<
-            avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation,
-            avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>& endpointCapabilitiesRegistrar,
-        const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder);
+        const std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>&
+            endpointCapabilitiesRegistrar,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) noexcept;
 
     /**
      * Create an instance of @c SpeakerManager, and register the @c ChannelVolumeInterfaces that will be controlled
@@ -114,12 +116,13 @@ class SpeakerManager
      * @param metricRecorder The metric recorder.
      */
     static std::shared_ptr<SpeakerManager> create(
-        const std::shared_ptr<SpeakerManagerStorageInterface>& storage,
+        std::shared_ptr<SpeakerManagerConfigInterface> config,
+        std::shared_ptr<SpeakerManagerStorageInterface> storage,
         const std::vector<std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface>>& volumeInterfaces,
         std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
         std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
         std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionEncounteredSender,
-        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder = nullptr);
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder = nullptr) noexcept;
 
     /// @name CapabilityAgent Functions
     /// @{
@@ -130,12 +133,12 @@ class SpeakerManager
     void cancelDirective(std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info) override;
     /// @}
 
-    // @name RequiresShutdown Functions
+    /// @name RequiresShutdown Functions
     /// @{
     void doShutdown() override;
     /// @}
 
-    // @name SpeakerManagerInterface Functions
+    /// @name SpeakerManagerInterface Functions
     /// @{
     std::future<bool> setVolume(
         avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
@@ -174,6 +177,10 @@ class SpeakerManager
     std::future<bool> getSpeakerSettings(
         avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
         avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings* settings) override;
+    void onExternalSpeakerSettingsUpdate(
+        avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
+        const avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings& speakerSettings,
+        const NotificationProperties& properties) override;
     void addSpeakerManagerObserver(
         std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerObserverInterface> observer) override;
     void removeSpeakerManagerObserver(
@@ -200,17 +207,18 @@ class SpeakerManager
      * @param metricRecorder The metric recorder.
      */
     SpeakerManager(
-        const std::shared_ptr<SpeakerManagerStorageInterface>& speakerManagerStorage,
+        std::shared_ptr<SpeakerManagerConfigInterface> speakerManagerConfig,
+        std::shared_ptr<SpeakerManagerStorageInterface> speakerManagerStorage,
         const std::vector<std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface>>& groupVolumeInterfaces,
         std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
         std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
         std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionEncounteredSender,
-        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder);
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) noexcept;
 
     /// Hash functor to use identifier of @c ChannelVolumeInterface as the key in SpeakerSet.
     struct ChannelVolumeInterfaceHash {
     public:
-        size_t operator()(const std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface>& key) const {
+        size_t operator()(const std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface>& key) const noexcept {
             if (nullptr == key) {
                 /// This should never happen because the only way to add a ChannelVolumeInterface into the SpeakerSet
                 /// has a guard of nullptr.
@@ -225,7 +233,7 @@ class SpeakerManager
     public:
         bool operator()(
             const std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> channelVolumeInterface1,
-            std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> channelVolumeInterface2) const {
+            std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> channelVolumeInterface2) const noexcept {
             if (!channelVolumeInterface1 || !channelVolumeInterface2) {
                 /// This should never happen because the only way to add a ChannelVolumeInterface into the SpeakerSet
                 /// has a guard of nullptr.
@@ -249,7 +257,7 @@ class SpeakerManager
      * @param channelVolumeInterface The @c ChannelVolumeInterface object.
      */
     void addChannelVolumeInterfaceIntoSpeakerMap(
-        std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> channelVolumeInterface);
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> channelVolumeInterface) noexcept;
 
     /**
      * Parses the payload from a string into a rapidjson document.
@@ -258,21 +266,21 @@ class SpeakerManager
      * @param document The document that will contain the payload.
      * @return A bool indicating the results of the operation.
      */
-    bool parseDirectivePayload(std::string payload, rapidjson::Document* document);
+    bool parseDirectivePayload(std::string payload, rapidjson::Document* document) noexcept;
 
     /**
      * Performs clean-up after a successful handling of a directive.
      *
      * @param info The current directive being processed.
      */
-    void executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info);
+    void executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info) noexcept;
 
     /**
      * Removes the directive after it's been processed.
      *
      * @param info The current directive being processed.
      */
-    void removeDirective(std::shared_ptr<DirectiveInfo> info);
+    void removeDirective(std::shared_ptr<DirectiveInfo> info) noexcept;
 
     /**
      * Sends an exception to AVS.
@@ -284,7 +292,7 @@ class SpeakerManager
     void sendExceptionEncountered(
         std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
         const std::string& message,
-        avsCommon::avs::ExceptionErrorType type);
+        avsCommon::avs::ExceptionErrorType type) noexcept;
 
     /**
      * Function to update the state of the ContextManager.
@@ -295,7 +303,7 @@ class SpeakerManager
      */
     bool updateContextManager(
         const avsCommon::sdkInterfaces::ChannelVolumeInterface::Type& type,
-        const avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings& settings);
+        const avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings& settings) noexcept;
 
     /**
      * Sends <Volume/Mute>Changed events to AVS. The events are identical except for the name.
@@ -305,7 +313,7 @@ class SpeakerManager
      */
     void executeSendSpeakerSettingsChangedEvent(
         const std::string& eventName,
-        avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings settings);
+        avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings settings) noexcept;
 
     /**
      * Function to set the volume for a specific @c Type. This runs on a worker thread.
@@ -319,7 +327,7 @@ class SpeakerManager
     bool executeSetVolume(
         avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
         int8_t volume,
-        const avsCommon::sdkInterfaces::SpeakerManagerInterface::NotificationProperties& properties);
+        const avsCommon::sdkInterfaces::SpeakerManagerInterface::NotificationProperties& properties) noexcept;
 
     /**
      * Function to restore the volume from a mute state. This runs on a worker thread and will not send an event or
@@ -331,7 +339,7 @@ class SpeakerManager
      */
     bool executeRestoreVolume(
         avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
-        avsCommon::sdkInterfaces::SpeakerManagerObserverInterface::Source source);
+        avsCommon::sdkInterfaces::SpeakerManagerObserverInterface::Source source) noexcept;
 
     /**
      * Function to adjust the volume for a specific @c Type. This runs on a worker thread.
@@ -345,7 +353,7 @@ class SpeakerManager
     bool executeAdjustVolume(
         avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
         int8_t delta,
-        const avsCommon::sdkInterfaces::SpeakerManagerInterface::NotificationProperties& properties);
+        const avsCommon::sdkInterfaces::SpeakerManagerInterface::NotificationProperties& properties) noexcept;
 
     /**
      * Function to set the mute for a specific @c Type. This runs on a worker thread.
@@ -359,7 +367,7 @@ class SpeakerManager
     bool executeSetMute(
         avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
         bool mute,
-        const avsCommon::sdkInterfaces::SpeakerManagerInterface::NotificationProperties& properties);
+        const avsCommon::sdkInterfaces::SpeakerManagerInterface::NotificationProperties& properties) noexcept;
 
 #ifdef ENABLE_MAXVOLUME_SETTING
     /**
@@ -368,7 +376,7 @@ class SpeakerManager
      * @param type The type of speaker to set a limit on the maximum volume.
      * @return A bool indicating success.
      */
-    bool executeSetMaximumVolumeLimit(const int8_t maximumVolumeLimit);
+    bool executeSetMaximumVolumeLimit(const int8_t maximumVolumeLimit) noexcept;
 #endif  // ENABLE_MAXVOLUME_SETTING
 
     /**
@@ -381,7 +389,7 @@ class SpeakerManager
      */
     bool executeGetSpeakerSettings(
         avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
-        avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings* settings);
+        avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings* settings) noexcept;
 
     /**
      * Function to set the speaker settings for a specific @c ChannelVolumeInterface Type.
@@ -393,7 +401,7 @@ class SpeakerManager
      */
     bool executeSetSpeakerSettings(
         const avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
-        const avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings& settings);
+        const avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings& settings) noexcept;
 
     /**
      * Function that initializes and populates @c m_speakerSettings for the given @c type's speaker settings.
@@ -401,7 +409,7 @@ class SpeakerManager
      * @param type The type of speaker to initialize
      * @return A bool indicating success.
      */
-    bool executeInitializeSpeakerSettings(avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type);
+    bool executeInitializeSpeakerSettings(avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type) noexcept;
 
     /**
      * Function to send events when settings have changed.
@@ -416,7 +424,7 @@ class SpeakerManager
         const avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings& settings,
         const std::string& eventName,
         const avsCommon::sdkInterfaces::SpeakerManagerObserverInterface::Source& source,
-        const avsCommon::sdkInterfaces::ChannelVolumeInterface::Type& type);
+        const avsCommon::sdkInterfaces::ChannelVolumeInterface::Type& type) noexcept;
 
     /**
      * Function to notify the observer when a @c SpeakerSettings change has occurred.
@@ -428,12 +436,12 @@ class SpeakerManager
     void executeNotifyObserver(
         const avsCommon::sdkInterfaces::SpeakerManagerObserverInterface::Source& source,
         const avsCommon::sdkInterfaces::ChannelVolumeInterface::Type& type,
-        const avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings& settings);
+        const avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings& settings) noexcept;
 
     /**
      * Persist channel configuration.
      */
-    void executePersistConfiguration();
+    void executePersistConfiguration() noexcept;
 
     /**
      * Helper method to convert internally stored channel state into config format.
@@ -443,14 +451,14 @@ class SpeakerManager
      */
     void convertSettingsToChannelState(
         avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
-        SpeakerManagerStorageState::ChannelState* storageState);
+        SpeakerManagerStorageState::ChannelState* storageState) noexcept;
 
     /**
      * Get the maximum volume limit.
      *
      * @return The maximum volume limit.
      */
-    int8_t getMaximumVolumeLimit();
+    int8_t getMaximumVolumeLimit() noexcept;
 
     /**
      * Applies Settings to All Speakers
@@ -461,8 +469,7 @@ class SpeakerManager
      * @param args The arguments to call the task with.
      * @return A bool indicating success.
      */
-    template <typename Task, typename... Args>
-    bool retryAndApplySettings(Task task, Args&&... args);
+    bool retryAndApplySettings(const std::function<bool()>& task) noexcept;
 
     /**
      * Configure channel volume and mute status defaults.
@@ -473,23 +480,23 @@ class SpeakerManager
      */
     void presetChannelDefaults(
         avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
-        const SpeakerManagerStorageState::ChannelState& state);
+        const SpeakerManagerStorageState::ChannelState& state) noexcept;
 
     /**
      * Configures channels with default values.
      */
-    void loadConfiguration();
+    void loadConfiguration() noexcept;
 
     /**
      * Updates volume and mute status on managed channels according to configured settings.
      */
-    void updateChannelSettings();
+    void updateChannelSettings() noexcept;
 
     /**
      * Updates managed channels according to configured settings.
      * @param type Channel type.
      */
-    void updateChannelSettings(avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type);
+    void updateChannelSettings(avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type) noexcept;
 
     /**
      * Helper function to adjust input volume into acceptable range.
@@ -497,7 +504,7 @@ class SpeakerManager
      * @param volume Input volume.
      * @return Volume within correct limits.
      */
-    int8_t adjustVolumeRange(int64_t volume);
+    int8_t adjustVolumeRange(int64_t volume) noexcept;
 
     /// Component's configuration access.
     SpeakerManagerConfigHelper m_config;
@@ -512,7 +519,7 @@ class SpeakerManager
     std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> m_messageSender;
 
     /// the @c volume to restore to when unmuting at 0 volume
-    int m_minUnmuteVolume;
+    uint8_t m_minUnmuteVolume;
 
     /// An unordered_map contains ChannelVolumeInterfaces keyed by @c Type. Only internal function
     /// addChannelVolumeInterfaceIntoSpeakerMap can insert an element into this map to ensure that no invalid element
@@ -541,6 +548,9 @@ class SpeakerManager
     /// maximumVolumeLimit The maximum volume level speakers in this system can reach.
     int8_t m_maximumVolumeLimit;
 
+    /// Persistent Storage flag set from configuration
+    bool m_persistentStorage;
+
     /// Restore mute state flag from configuration
     bool m_restoreMuteState;
 
@@ -555,7 +565,6 @@ class SpeakerManager
 };
 
 }  // namespace speakerManager
-}  // namespace capabilityAgents
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGER_H_
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGER_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManagerConfig.h b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManagerConfig.h
new file mode 100644
index 0000000000..d94eac7f6e
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManagerConfig.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGERCONFIG_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGERCONFIG_H_
+
+#include <acsdk/SpeakerManager/SpeakerManagerConfigInterface.h>
+#include <acsdk/SpeakerManager/SpeakerManagerStorageState.h>
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+/**
+ * @brief Configuration interface for SpeakerManager.
+ *
+ * This class accesses configuration using @c ConfigurationNode facility. Internally class uses
+ * "speakerManagerCapabilityAgent" child and looks up the following keys:
+ * - "persistentStorage" -- Boolean flag that indicates if persistent storage is enabled.
+ * - "minUnmuteVolume" -- Minimum volume level for unmuting the channel. This setting applies to all channel types.
+ * - "defaultSpeakerVolume" -- Default speaker volume.
+ * - "defaultAlertsVolume" -- Default alerts volume.
+ * - "restoreMuteState" -- Boolean flag that indicates if mute state shall be preserved between device reboots.
+ *
+ * If AlexaClientSDKConfig.json configuration file is used, the example configuration may look like:
+ * @code{.json}
+ * {
+ *    "speakerManagerCapabilityAgent": {
+ *        "persistentStorage": true,
+ *        "minUnmuteVolume": 10,
+ *        "defaultSpeakerVolume": 40,
+ *        "defaultAlertsVolume": 40,
+ *        "restoreMuteState": true
+ *    }
+ * }
+ * @endcode
+ *
+ * @ingroup Lib_acsdkSpeakerManager
+ */
+class SpeakerManagerConfig : public SpeakerManagerConfigInterface {
+public:
+    /**
+     * @brief Construct object and load configuration.
+     */
+    SpeakerManagerConfig() noexcept;
+
+    /// @name SpeakerManagerConfigInterface Functions
+    /// @{
+    bool getPersistentStorage(bool& persistentStorage) noexcept override;
+    bool getMinUnmuteVolume(std::uint8_t& minUnmuteVolume) noexcept override;
+    bool getRestoreMuteState(bool& restoreMuteState) noexcept override;
+    bool getDefaultSpeakerVolume(std::uint8_t& defaultSpeakerVolume) noexcept override;
+    bool getDefaultAlertsVolume(std::uint8_t& defaultAlertsVolume) noexcept override;
+    /// @}
+private:
+    /**
+     * @brief Load and validate values from platform configuration.
+     */
+    void loadPlatformConfig() noexcept;
+
+    /// Flag if persistent storage is enabled for speaker settings.
+    avsCommon::utils::Optional<bool> m_persistentStorage;
+
+    /// Minimum volume for unmuting speakers. The value must be in range 0..100 inclusive.
+    avsCommon::utils::Optional<std::uint8_t> m_minUnmuteVolume;
+
+    /// Flag if the speaker mute state must be preserved between sessions.
+    avsCommon::utils::Optional<bool> m_restoreMuteState;
+
+    /// Default volume for speaker channel. The value must be in range 0..100 inclusive.
+    avsCommon::utils::Optional<std::uint8_t> m_defaultSpeakerVolume;
+
+    /// Default volume for alerts channel. The value must be in range 0..100 inclusive.
+    avsCommon::utils::Optional<std::uint8_t> m_defaultAlertsVolume;
+};
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGERCONFIG_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManagerConfigHelper.h b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManagerConfigHelper.h
new file mode 100644
index 0000000000..f03167e7f1
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManagerConfigHelper.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGERCONFIGHELPER_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGERCONFIGHELPER_H_
+
+#include <acsdk/SpeakerManager/SpeakerManagerStorageInterface.h>
+#include <acsdk/SpeakerManager/SpeakerManagerConfigInterface.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+/**
+ * @brief Helper class to manage configuration operations for SpeakerManager CA.
+ *
+ * This class implements all configuration operations and merges logic of accessing different configuration sources.
+ * SpeakerManager get configuration values from three sources: hardcoded values, platform configuration, and persistent
+ * storage.
+ *
+ * @ingroup Lib_acsdkSpeakerManager
+ */
+class SpeakerManagerConfigHelper {
+public:
+    /**
+     * Creates object.
+     * @param[in] storage Storage interface.
+     */
+    SpeakerManagerConfigHelper(
+        std::shared_ptr<SpeakerManagerConfigInterface> config,
+        std::shared_ptr<SpeakerManagerStorageInterface> storage) noexcept;
+
+    /**
+     * Load configuration.
+     *
+     * This method always succeeds (assuming @a state is not @a nullptr), as it first tries to load configuration
+     * from config storage, then from platform configuration files, and falls back to hardcoded values.
+     *
+     * @param[out] state Pointer to configuration container to fill with config values.
+     */
+    void loadState(SpeakerManagerStorageState& state) noexcept;
+
+    /**
+     * Saves configuration to to config storage.
+     *
+     * @param[in] state Configuration data to persist.
+     *
+     * @return Boolean that indicates operation success.
+     */
+    bool saveState(const SpeakerManagerStorageState& state) noexcept;
+
+    /**
+     * Loads if persistent storage is enabled from configuration. By default persistent storage is not enabled, but it
+     * can be overridden by configuration.
+     *
+     * @return Returns configured value, where true indicates that the persistent storage flag has been retrieved, and
+     * false indicates that a default shall be kept.
+     */
+    bool getPersistentStorage() const noexcept;
+
+    /**
+     * Loads minimum unmute volume level from platform configuration. The method tries to load the unmute value from
+     * platform configuration files, and if it fails, it returns a hardcoded value.
+     *
+     * @return Minimum volume level to unmute speakers.
+     */
+    int getMinUnmuteVolume() const noexcept;
+
+    /**
+     * Loads mute state handling from configuration. By default the speaker manager sets the mute status to the value
+     * prior to reboot, but this behaviour can be overridden by configuration.
+     *
+     * @return Returns configured value, where true indicates that mute status is configured according to the last
+     * saved state, and "false" indicates a default shall be kept.
+     */
+    bool getRestoreMuteState() const noexcept;
+
+private:
+    /**
+     * Default values that are used when no other configuration sources are available.
+     */
+    static const SpeakerManagerStorageState c_defaults;
+
+    /// Reference to configuration config interface.
+    const std::shared_ptr<SpeakerManagerConfigInterface> m_config;
+
+    /// Reference to configuration storage interface.
+    const std::shared_ptr<SpeakerManagerStorageInterface> m_storage;
+};
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGERCONFIGHELPER_H_
diff --git a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerConstants.h b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManagerConstants.h
similarity index 76%
rename from CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerConstants.h
rename to CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManagerConstants.h
index cba1e3fb97..11461ac3fc 100644
--- a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerConstants.h
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManagerConstants.h
@@ -16,15 +16,17 @@
 /**
  * @file
  */
-#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERCONSTANTS_H_
-#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERCONSTANTS_H_
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGERCONSTANTS_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGERCONSTANTS_H_
 
-#include "AVSCommon/AVS/NamespaceAndName.h"
+#include <AVSCommon/AVS/NamespaceAndName.h>
 
 namespace alexaClientSDK {
-namespace capabilityAgents {
 namespace speakerManager {
 
+/// @addtogroup Lib_acsdkSpeakerManager
+/// @{
+
 /// The Speaker interface namespace.
 const std::string NAMESPACE = "Speaker";
 
@@ -55,8 +57,9 @@ const std::string VOLUME_CHANGED = "VolumeChanged";
 /// The @c VolumeMute event.
 const std::string MUTE_CHANGED = "MuteChanged";
 
+/// @}
+
 }  // namespace speakerManager
-}  // namespace capabilityAgents
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERCONSTANTS_H_
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGERCONSTANTS_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManagerMiscStorage.h b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManagerMiscStorage.h
new file mode 100644
index 0000000000..f777d7b48c
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/privateInclude/acsdk/SpeakerManager/private/SpeakerManagerMiscStorage.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGERMISCSTORAGE_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGERMISCSTORAGE_H_
+
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
+#include <acsdk/SpeakerManager/SpeakerManagerStorageInterface.h>
+#include <acsdk/SpeakerManager/SpeakerManagerStorageState.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+/**
+ * @brief Configuration interface implementation for speaker manager.
+ *
+ * This class adapts @c MiscStorageInterface to @c SpeakerManagerStorageInterface.
+ *
+ * @ingroup Lib_acsdkSpeakerManager
+ */
+class SpeakerManagerMiscStorage : public SpeakerManagerStorageInterface {
+public:
+    /**
+     * Creates an instance of the @c SpeakerManagerMiscStorage.
+     *
+     * @param miscStorage The underlying miscellaneous storage to store @c SpeakerManager data.
+     * @return A unique pointer to the instance of the newly created @c SpeakerManagerMiscStorage.
+     */
+    static std::shared_ptr<SpeakerManagerMiscStorage> create(
+        std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage) noexcept;
+
+    /// @name SpeakerManagerStorageInterface Functions
+    /// @{
+    bool loadState(SpeakerManagerStorageState& state) noexcept override;
+    bool saveState(const SpeakerManagerStorageState& state) noexcept override;
+    /// @}
+
+private:
+    /// Helper to convert structure to JSON string.
+    static std::string convertToStateString(const SpeakerManagerStorageState& state) noexcept;
+    static std::string convertToStateString(const SpeakerManagerStorageState::ChannelState& state) noexcept;
+
+    /**
+     * Constructor.
+     *
+     * @param miscStorage The underlying miscellaneous storage used to store component data.
+     */
+    SpeakerManagerMiscStorage(
+        std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage) noexcept;
+
+    /**
+     * Method to initialize the object.
+     *
+     * This method connects to underlying storage and performs necessary actions.
+     *
+     * @return Boolean status, indicating operation success.
+     */
+    bool init() noexcept;
+
+    /**
+     * Helper to convert JSON string to structure.
+     *
+     * @param stateString JSON string describing @a SpeakerManagerStorageState data.
+     * @param state Pointer to storage for parsed values.
+     *
+     * @return Boolean status, indicating operation success.
+     */
+    bool convertFromStateString(const std::string& stateString, SpeakerManagerStorageState& state) noexcept;
+
+    /**
+     * Helper to convert JSON string to structure.
+     *
+     * @param stateString JSON string describing @a SpeakerManagerStorageState::ChannelState data.
+     * @param state Pointer to storage for parsed values.
+     *
+     * @return Boolean status, indicating operation success.
+     */
+    bool convertFromStateString(
+        const std::string& stateString,
+        SpeakerManagerStorageState::ChannelState& state) noexcept;
+
+    /// The Misc storage.
+    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> m_miscStorage;
+};
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_PRIVATEINCLUDE_ACSDK_SPEAKERMANAGER_PRIVATE_SPEAKERMANAGERMISCSTORAGE_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/src/CMakeLists.txt b/CapabilityAgents/SpeakerManager/SpeakerManager/src/CMakeLists.txt
new file mode 100644
index 0000000000..d90f4e8d34
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/src/CMakeLists.txt
@@ -0,0 +1,22 @@
+add_definitions("-DACSDK_LOG_MODULE=speakerManager")
+
+add_library(acsdkSpeakerManager
+        SpeakerManager.cpp
+        ChannelVolumeFactory.cpp
+        ChannelVolumeManager.cpp
+        DefaultChannelVolumeFactory.cpp
+        Factories.cpp
+        SpeakerManagerMiscStorage.cpp
+        SpeakerManagerConfig.cpp
+        SpeakerManagerConfigHelper.cpp)
+
+target_include_directories(acsdkSpeakerManager
+        PUBLIC
+        "${acsdkSpeakerManager_SOURCE_DIR}/include"
+        PRIVATE
+        "${acsdkSpeakerManager_SOURCE_DIR}/privateInclude")
+
+target_link_libraries(acsdkSpeakerManager AVSCommon acsdkShutdownManagerInterfaces Endpoints)
+
+# install target
+asdk_install()
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/src/ChannelVolumeFactory.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/src/ChannelVolumeFactory.cpp
new file mode 100644
index 0000000000..6390b03c6a
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/src/ChannelVolumeFactory.cpp
@@ -0,0 +1,28 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#include <memory>
+
+#include <acsdk/SpeakerManager/private/DefaultChannelVolumeFactory.h>
+#include <acsdk/SpeakerManager/Factories.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface> createChannelVolumeFactory() noexcept {
+    return std::make_shared<DefaultChannelVolumeFactory>();
+}
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/src/ChannelVolumeManager.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/src/ChannelVolumeManager.cpp
similarity index 89%
rename from CapabilityAgents/SpeakerManager/src/ChannelVolumeManager.cpp
rename to CapabilityAgents/SpeakerManager/SpeakerManager/src/ChannelVolumeManager.cpp
index e70f842d09..eb24ce6acd 100644
--- a/CapabilityAgents/SpeakerManager/src/ChannelVolumeManager.cpp
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/src/ChannelVolumeManager.cpp
@@ -13,35 +13,49 @@
  * permissions and limitations under the License.
  */
 #include <memory>
+
+#include <acsdk/SpeakerManager/private/ChannelVolumeManager.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
-#include "SpeakerManager/ChannelVolumeManager.h"
 
 namespace alexaClientSDK {
-namespace capabilityAgents {
 namespace speakerManager {
 
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::avs::speakerConstants;
 
-static const std::string TAG("ChannelVolumeManager");
+/// @addtogroup Lib_acsdkSpeakerManager
+/// @{
+
+/// @brief Logging tag
+/// @private
+#define TAG "ChannelVolumeManager"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ * @private
+ */
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
 /// The fraction of maximum volume used for the upper threshold in the default volume curve.
-static const float UPPER_VOLUME_CURVE_FRACTION = 0.40;
+/// @private
+static constexpr float UPPER_VOLUME_CURVE_FRACTION = 0.40f;
 
 /// The fraction of maximum volume used for the lower threshold in the default volume curve.
-static const float LOWER_VOLUME_CURVE_FRACTION = 0.20;
+/// @private
+static constexpr float LOWER_VOLUME_CURVE_FRACTION = 0.20f;
 
 /**
  * Checks whether a value is within the bounds.
  *
- * @tparam T The class type of the input parameters.
  * @param value The value to check.
  * @param min The minimum value.
  * @param max The maximum value.
+ *
+ * @private
  */
-template <class T>
-static bool withinBounds(T value, T min, T max) {
+static bool withinBounds(std::int64_t value, std::int64_t min, std::int64_t max) noexcept {
     if (value < min || value > max) {
         ACSDK_ERROR(LX("checkBoundsFailed").d("value", value).d("min", min).d("max", max));
         return false;
@@ -49,10 +63,12 @@ static bool withinBounds(T value, T min, T max) {
     return true;
 }
 
+/// @}
+
 std::shared_ptr<ChannelVolumeManager> ChannelVolumeManager::create(
     std::shared_ptr<SpeakerInterface> speaker,
     ChannelVolumeInterface::Type type,
-    VolumeCurveFunction volumeCurve) {
+    VolumeCurveFunction volumeCurve) noexcept {
     if (!speaker) {
         ACSDK_ERROR(LX(__func__).d("reason", "Null SpeakerInterface").m("createFailed"));
         return nullptr;
@@ -75,7 +91,7 @@ std::shared_ptr<ChannelVolumeManager> ChannelVolumeManager::create(
 ChannelVolumeManager::ChannelVolumeManager(
     std::shared_ptr<SpeakerInterface> speaker,
     ChannelVolumeInterface::Type type,
-    VolumeCurveFunction volumeCurve) :
+    VolumeCurveFunction volumeCurve) noexcept :
         ChannelVolumeInterface{},
         m_speaker{speaker},
         m_isDucked{false},
@@ -184,7 +200,7 @@ bool ChannelVolumeManager::getSpeakerSettings(
     return true;
 }
 
-int8_t ChannelVolumeManager::defaultVolumeAttenuateFunction(int8_t currentVolume) {
+int8_t ChannelVolumeManager::defaultVolumeAttenuateFunction(int8_t currentVolume) noexcept {
     const int8_t lowerBreakPoint = static_cast<int8_t>(AVS_SET_VOLUME_MAX * LOWER_VOLUME_CURVE_FRACTION);
     const int8_t upperBreakPoint = static_cast<int8_t>(AVS_SET_VOLUME_MAX * UPPER_VOLUME_CURVE_FRACTION);
 
@@ -197,5 +213,4 @@ int8_t ChannelVolumeManager::defaultVolumeAttenuateFunction(int8_t currentVolume
     }
 }
 }  // namespace speakerManager
-}  // namespace capabilityAgents
 }  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/src/DefaultChannelVolumeFactory.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/src/DefaultChannelVolumeFactory.cpp
new file mode 100644
index 0000000000..c8c681a031
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/src/DefaultChannelVolumeFactory.cpp
@@ -0,0 +1,30 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/SpeakerManager/private/DefaultChannelVolumeFactory.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface> DefaultChannelVolumeFactory::
+    createChannelVolumeInterface(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> speaker,
+        alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
+        std::function<int8_t(int8_t)> volumeCurve) {
+    return ChannelVolumeManager::create(std::move(speaker), std::move(type), std::move(volumeCurve));
+}
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/src/Factories.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/src/Factories.cpp
new file mode 100644
index 0000000000..9d6164c379
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/src/Factories.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#include <memory>
+
+#include <acsdk/SpeakerManager/Factories.h>
+#include <acsdk/SpeakerManager/private/DefaultChannelVolumeFactory.h>
+#include <acsdk/SpeakerManager/private/SpeakerManager.h>
+#include <acsdk/SpeakerManager/private/SpeakerManagerConfig.h>
+#include <acsdk/SpeakerManager/private/SpeakerManagerMiscStorage.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+/// @addtogroup Lib_acsdkSpeakerManager
+/// @{
+
+/// @brief String to identify log entries originating from this file.
+/// @private
+#define TAG "SpeakerManagerFactories"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ * @private
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// @}
+
+std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface> createSpeakerManagerCapabilityAgent(
+    std::shared_ptr<SpeakerManagerConfigInterface> config,
+    std::shared_ptr<SpeakerManagerStorageInterface> storage,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionEncounteredSender,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+    const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
+    const std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>&
+        endpointCapabilitiesRegistrar,
+    const std::vector<std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface>>& volumeInterfaces) noexcept {
+    if (!shutdownNotifier) {
+        ACSDK_ERROR(LX(__func__).d("reason", "nullShutdownNotifier"));
+        return nullptr;
+    }
+    if (!endpointCapabilitiesRegistrar) {
+        ACSDK_ERROR(LX(__func__).d("reason", "nullEndpointCapabilitiesRegistrar"));
+        return nullptr;
+    }
+
+    auto speakerManager = SpeakerManager::create(
+        std::move(config),
+        std::move(storage),
+        volumeInterfaces,
+        std::move(contextManager),
+        std::move(messageSender),
+        std::move(exceptionEncounteredSender),
+        std::move(metricRecorder));
+
+    if (!speakerManager) {
+        ACSDK_ERROR(LX(__func__).d("reason", "errorSpeakerManagerCreate"));
+        return nullptr;
+    }
+
+    shutdownNotifier->addObserver(speakerManager);
+    endpointCapabilitiesRegistrar->withCapability(speakerManager, speakerManager);
+
+    return speakerManager;
+}
+
+std::shared_ptr<SpeakerManagerStorageInterface> createSpeakerManagerStorage(
+    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> storage) noexcept {
+    return SpeakerManagerMiscStorage::create(std::move(storage));
+}
+
+std::shared_ptr<SpeakerManagerConfigInterface> createSpeakerManagerConfig() noexcept {
+    return std::make_shared<SpeakerManagerConfig>();
+}
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/src/SpeakerManager.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/src/SpeakerManager.cpp
similarity index 80%
rename from CapabilityAgents/SpeakerManager/src/SpeakerManager.cpp
rename to CapabilityAgents/SpeakerManager/SpeakerManager/src/SpeakerManager.cpp
index 77cd9a8a75..ab529d73cd 100644
--- a/CapabilityAgents/SpeakerManager/src/SpeakerManager.cpp
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/src/SpeakerManager.cpp
@@ -31,12 +31,11 @@
 #include <AVSCommon/Utils/Metrics/DataPointCounterBuilder.h>
 #include <AVSCommon/Utils/Metrics/MetricEventBuilder.h>
 
-#include "SpeakerManager/SpeakerManagerConstants.h"
-#include "SpeakerManager/SpeakerManager.h"
-#include "SpeakerManager/SpeakerManagerMiscStorage.h"
+#include <acsdk/SpeakerManager/private/SpeakerManagerConstants.h>
+#include <acsdk/SpeakerManager/private/SpeakerManager.h>
+#include <acsdk/SpeakerManager/private/SpeakerManagerMiscStorage.h>
 
 namespace alexaClientSDK {
-namespace capabilityAgents {
 namespace speakerManager {
 
 using namespace acsdkManufactory;
@@ -52,27 +51,29 @@ using namespace rapidjson;
 
 using DefaultEndpointAnnotation = avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation;
 
+/// @addtogroup Lib_acsdkSpeakerManager
+/// @{
+
 /// Speaker capability constants
 /// Speaker interface type
-static const std::string SPEAKER_CAPABILITY_INTERFACE_TYPE = "AlexaInterface";
+static const auto SPEAKER_CAPABILITY_INTERFACE_TYPE = "AlexaInterface";
 /// Speaker interface name
-static const std::string SPEAKER_CAPABILITY_INTERFACE_NAME = "Speaker";
+static const auto SPEAKER_CAPABILITY_INTERFACE_NAME = "Speaker";
 /// Speaker interface version
-static const std::string SPEAKER_CAPABILITY_INTERFACE_VERSION = "1.0";
+static const auto SPEAKER_CAPABILITY_INTERFACE_VERSION = "1.0";
 /// Retry timeout table
-static const std::vector<int> DEFAULT_RETRY_TABLE = {std::chrono::milliseconds(10).count(),
-                                                     std::chrono::milliseconds(20).count(),
-                                                     std::chrono::milliseconds(40).count()};
-
-/// String to identify log entries originating from this file.
-static const std::string TAG{"SpeakerManager"};
+static const std::vector<int> DEFAULT_RETRY_TABLE = {static_cast<int>(std::chrono::milliseconds(10).count()),
+                                                     static_cast<int>(std::chrono::milliseconds(20).count()),
+                                                     static_cast<int>(std::chrono::milliseconds(40).count())};
 /// prefix for metrics emitted from the SpeakerManager CA
-static const std::string SPEAKER_MANAGER_METRIC_PREFIX = "SPEAKER_MANAGER-";
+static const auto SPEAKER_MANAGER_METRIC_PREFIX = "SPEAKER_MANAGER-";
 
+/// String to identify log entries originating from this file.
+#define TAG "SpeakerManager"
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
  *
- * @param The event string for this @c LogEntry.
+ * @param event The event string for this @c LogEntry.
  */
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
@@ -82,9 +83,9 @@ static const std::string SPEAKER_MANAGER_METRIC_PREFIX = "SPEAKER_MANAGER-";
  * @param value The value to check.
  * @param min The minimum value.
  * @param max The maximum value.
+ * @private
  */
-template <class T>
-static bool withinBounds(T value, T min, T max) {
+static bool withinBounds(std::int64_t value, std::int64_t min, std::int64_t max) noexcept {
     if (value < min || value > max) {
         ACSDK_ERROR(LX("checkBoundsFailed").d("value", value).d("min", min).d("max", max));
         return false;
@@ -97,8 +98,9 @@ static bool withinBounds(T value, T min, T max) {
  *
  * @param source The input @c SpeakerManagerObserverInterface::Source.
  * @return The @c String representing the source.
+ * @private
  */
-static inline std::string getSourceString(SpeakerManagerObserverInterface::Source source) {
+static std::string getSourceString(SpeakerManagerObserverInterface::Source source) noexcept {
     std::stringstream ss;
     ss << source;
     return ss.str();
@@ -111,13 +113,17 @@ static inline std::string getSourceString(SpeakerManagerObserverInterface::Sourc
  * @param metricRecorder The @c MetricRecorderInterface which records Metric events.
  * @param eventName The name of the Metric event.
  * @param count Count of the metric that is emitted.
+ * @private
  */
 static void submitMetric(
     const std::shared_ptr<MetricRecorderInterface>& metricRecorder,
     const std::string& eventName,
-    int count) {
+    int count) noexcept {
+    std::string activityName;
+    activityName.reserve(sizeof(SPEAKER_MANAGER_METRIC_PREFIX) - 1 + eventName.size());
+    activityName.append(SPEAKER_MANAGER_METRIC_PREFIX, sizeof(SPEAKER_MANAGER_METRIC_PREFIX) - 1).append(eventName);
     auto metricEventBuilder = MetricEventBuilder{}
-                                  .setActivityName(SPEAKER_MANAGER_METRIC_PREFIX + eventName)
+                                  .setActivityName(activityName)
                                   .addDataPoint(DataPointCounterBuilder{}.setName(eventName).increment(count).build());
 
     auto metricEvent = metricEventBuilder.build();
@@ -133,49 +139,20 @@ static void submitMetric(
  * Creates the Speaker capability configuration.
  *
  * @return The Speaker capability configuration.
+ * @private
  */
-static std::shared_ptr<avsCommon::avs::CapabilityConfiguration> getSpeakerCapabilityConfiguration();
-
-std::shared_ptr<SpeakerManagerInterface> SpeakerManager::createSpeakerManagerCapabilityAgent(
-    const std::shared_ptr<MiscStorageInterface>& storage,
-    const std::shared_ptr<ContextManagerInterface>& contextManager,
-    const std::shared_ptr<MessageSenderInterface>& messageSender,
-    const std::shared_ptr<ExceptionEncounteredSenderInterface>& exceptionEncounteredSender,
-    const std::shared_ptr<ShutdownNotifierInterface>& shutdownNotifier,
-    const Annotated<DefaultEndpointAnnotation, endpoints::EndpointCapabilitiesRegistrarInterface>&
-        endpointCapabilitiesRegistrar,
-    const std::shared_ptr<MetricRecorderInterface>& metricRecorder) {
-    if (!shutdownNotifier || !endpointCapabilitiesRegistrar) {
-        ACSDK_ERROR(LX("createSpeakerManagerCapabilityAgentFailed")
-                        .d("reason", "nullParameter")
-                        .d("isContextManagerNull", !contextManager)
-                        .d("isDefaultEndpointCapabilitiesRegistrarNull", !endpointCapabilitiesRegistrar));
-        return nullptr;
-    }
-
-    auto speakerStorage = SpeakerManagerMiscStorage::create(storage);
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> speakers;
-    auto speakerManager = SpeakerManager::create(
-        speakerStorage, speakers, contextManager, messageSender, exceptionEncounteredSender, metricRecorder);
-
-    if (!speakerManager) {
-        ACSDK_ERROR(LX("createSpeakerManagerCapabilityAgentFailed"));
-        return nullptr;
-    }
-
-    shutdownNotifier->addObserver(speakerManager);
-    endpointCapabilitiesRegistrar->withCapability(speakerManager, speakerManager);
+static std::shared_ptr<avsCommon::avs::CapabilityConfiguration> getSpeakerCapabilityConfiguration() noexcept;
 
-    return speakerManager;
-}
+/// @}
 
 std::shared_ptr<SpeakerManager> SpeakerManager::create(
-    const std::shared_ptr<SpeakerManagerStorageInterface>& storage,
+    std::shared_ptr<SpeakerManagerConfigInterface> config,
+    std::shared_ptr<SpeakerManagerStorageInterface> storage,
     const std::vector<std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface>>& groupVolumeInterfaces,
     std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
     std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
     std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionEncounteredSender,
-    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) {
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) noexcept {
     if (!contextManager) {
         ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManager"));
         return nullptr;
@@ -190,25 +167,30 @@ std::shared_ptr<SpeakerManager> SpeakerManager::create(
         return nullptr;
     }
 
-    auto speakerManager = std::shared_ptr<SpeakerManager>(new SpeakerManager(
-        storage, groupVolumeInterfaces, contextManager, messageSender, exceptionEncounteredSender, metricRecorder));
-
-    return speakerManager;
+    return std::shared_ptr<SpeakerManager>(new SpeakerManager(
+        std::move(config),
+        std::move(storage),
+        groupVolumeInterfaces,
+        std::move(contextManager),
+        std::move(messageSender),
+        std::move(exceptionEncounteredSender),
+        std::move(metricRecorder)));
 }
 
 SpeakerManager::SpeakerManager(
-    const std::shared_ptr<SpeakerManagerStorageInterface>& speakerManagerStorage,
-    const std::vector<std::shared_ptr<ChannelVolumeInterface>>& groupVolumeInterfaces,
-    std::shared_ptr<ContextManagerInterface> contextManager,
-    std::shared_ptr<MessageSenderInterface> messageSender,
-    std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionEncounteredSender,
-    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) :
+    std::shared_ptr<SpeakerManagerConfigInterface> speakerManagerConfig,
+    std::shared_ptr<SpeakerManagerStorageInterface> speakerManagerStorage,
+    const std::vector<std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface>>& groupVolumeInterfaces,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionEncounteredSender,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) noexcept :
         CapabilityAgent{NAMESPACE, exceptionEncounteredSender},
         RequiresShutdown{"SpeakerManager"},
-        m_config{speakerManagerStorage},
-        m_metricRecorder{metricRecorder},
-        m_contextManager{contextManager},
-        m_messageSender{messageSender},
+        m_config{std::move(speakerManagerConfig), std::move(speakerManagerStorage)},
+        m_metricRecorder{std::move(metricRecorder)},
+        m_contextManager{std::move(contextManager)},
+        m_messageSender{std::move(messageSender)},
         m_minUnmuteVolume{MIN_UNMUTE_VOLUME},
         m_retryTimer{DEFAULT_RETRY_TABLE},
         m_maxRetries{DEFAULT_RETRY_TABLE.size()},
@@ -217,15 +199,17 @@ SpeakerManager::SpeakerManager(
     for (auto& groupVolume : groupVolumeInterfaces) {
         addChannelVolumeInterfaceIntoSpeakerMap(groupVolume);
     }
-
-    loadConfiguration();      // Load configuration (either from previous run, or from configuration).
-    updateChannelSettings();  // Apply loaded configuration
-
+    m_persistentStorage = m_config.getPersistentStorage();
+    if (m_persistentStorage) {
+        ACSDK_DEBUG5(LX("SpeakerManager").m("Persistent Storage is enabled."));
+        loadConfiguration();      // Load configuration (either from storage, or from configuration).
+        updateChannelSettings();  // Apply loaded configuration
+    }
     m_capabilityConfigurations.insert(getSpeakerCapabilityConfiguration());
 }
 
 void SpeakerManager::addChannelVolumeInterfaceIntoSpeakerMap(
-    std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> channelVolumeInterface) {
+    std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> channelVolumeInterface) noexcept {
     if (!channelVolumeInterface) {
         ACSDK_ERROR(LX("addChannelVolumeInterfaceFailed").d("reason", "nullChannelVolumeInterface"));
         return;
@@ -258,11 +242,13 @@ void SpeakerManager::addChannelVolumeInterfaceIntoSpeakerMap(
     ACSDK_DEBUG(LX(__func__).d("type", type).d("sizeOfSpeakerSet", m_speakerMap[type].size()));
 }
 
-std::shared_ptr<CapabilityConfiguration> getSpeakerCapabilityConfiguration() {
+std::shared_ptr<CapabilityConfiguration> getSpeakerCapabilityConfiguration() noexcept {
     std::unordered_map<std::string, std::string> configMap;
-    configMap.insert({CAPABILITY_INTERFACE_TYPE_KEY, SPEAKER_CAPABILITY_INTERFACE_TYPE});
-    configMap.insert({CAPABILITY_INTERFACE_NAME_KEY, SPEAKER_CAPABILITY_INTERFACE_NAME});
-    configMap.insert({CAPABILITY_INTERFACE_VERSION_KEY, SPEAKER_CAPABILITY_INTERFACE_VERSION});
+    // Create a type for gcc < 6.x
+    using s = std::string;
+    configMap.insert({s(CAPABILITY_INTERFACE_TYPE_KEY), s(SPEAKER_CAPABILITY_INTERFACE_TYPE)});
+    configMap.insert({s(CAPABILITY_INTERFACE_NAME_KEY), s(SPEAKER_CAPABILITY_INTERFACE_NAME)});
+    configMap.insert({s(CAPABILITY_INTERFACE_VERSION_KEY), s(SPEAKER_CAPABILITY_INTERFACE_VERSION)});
 
     return std::make_shared<CapabilityConfiguration>(configMap);
 }
@@ -293,7 +279,7 @@ void SpeakerManager::handleDirectiveImmediately(std::shared_ptr<AVSDirective> di
     handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
 };
 
-bool SpeakerManager::parseDirectivePayload(std::string payload, Document* document) {
+bool SpeakerManager::parseDirectivePayload(std::string payload, Document* document) noexcept {
     if (!document) {
         ACSDK_ERROR(LX("parseDirectivePayloadFailed").d("reason", "nullDocument"));
         return false;
@@ -314,8 +300,8 @@ bool SpeakerManager::parseDirectivePayload(std::string payload, Document* docume
 void SpeakerManager::sendExceptionEncountered(
     std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
     const std::string& message,
-    avsCommon::avs::ExceptionErrorType type) {
-    m_executor.submit([this, info, message, type] {
+    avsCommon::avs::ExceptionErrorType type) noexcept {
+    m_executor.execute([this, info, message, type] {
         m_exceptionEncounteredSender->sendExceptionEncountered(info->directive->getUnparsedDirective(), type, message);
         if (info && info->result) {
             info->result->setFailed(message);
@@ -324,14 +310,14 @@ void SpeakerManager::sendExceptionEncountered(
     });
 }
 
-void SpeakerManager::executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info) {
+void SpeakerManager::executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info) noexcept {
     if (info && info->result) {
         info->result->setCompleted();
     }
     removeDirective(info);
 }
 
-void SpeakerManager::removeDirective(std::shared_ptr<DirectiveInfo> info) {
+void SpeakerManager::removeDirective(std::shared_ptr<DirectiveInfo> info) noexcept {
     // Check result too, to catch cases where DirectiveInfo was created locally, without a nullptr result.
     // In those cases there is no messageId to remove because no result was expected.
     if (info->directive && info->result) {
@@ -342,7 +328,7 @@ void SpeakerManager::removeDirective(std::shared_ptr<DirectiveInfo> info) {
 
 void SpeakerManager::executeSendSpeakerSettingsChangedEvent(
     const std::string& eventName,
-    SpeakerInterface::SpeakerSettings settings) {
+    SpeakerInterface::SpeakerSettings settings) noexcept {
     ACSDK_DEBUG9(LX("executeSendSpeakerSettingsChangedEvent"));
     rapidjson::Document payload(rapidjson::kObjectType);
     payload.AddMember(VOLUME_KEY, settings.volume, payload.GetAllocator());
@@ -385,7 +371,7 @@ void SpeakerManager::handleDirective(std::shared_ptr<CapabilityAgent::DirectiveI
         int64_t volume;
         if (jsonUtils::retrieveValue(payload, VOLUME_KEY, &volume) &&
             withinBounds(volume, static_cast<int64_t>(AVS_SET_VOLUME_MIN), static_cast<int64_t>(AVS_SET_VOLUME_MAX))) {
-            m_executor.submit([this, volume, directiveType, info] {
+            m_executor.execute([this, volume, directiveType, info] {
                 /*
                  * Since AVS doesn't have a concept of Speaker IDs or types, no-op if a directive
                  * comes in and there are no AVS_SPEAKER_VOLUME speakers.
@@ -423,7 +409,7 @@ void SpeakerManager::handleDirective(std::shared_ptr<CapabilityAgent::DirectiveI
         if (jsonUtils::retrieveValue(payload, VOLUME_KEY, &delta) &&
             withinBounds(
                 delta, static_cast<int64_t>(AVS_ADJUST_VOLUME_MIN), static_cast<int64_t>(AVS_ADJUST_VOLUME_MAX))) {
-            m_executor.submit([this, delta, directiveType, info] {
+            m_executor.execute([this, delta, directiveType, info] {
                 /*
                  * Since AVS doesn't have a concept of Speaker IDs or types, no-op if a directive
                  * comes in and there are no AVS_SPEAKER_VOLUME speakers.
@@ -459,7 +445,7 @@ void SpeakerManager::handleDirective(std::shared_ptr<CapabilityAgent::DirectiveI
     } else if (directiveName == SET_MUTE.name) {
         bool mute = false;
         if (jsonUtils::retrieveValue(payload, MUTE_KEY, &mute)) {
-            m_executor.submit([this, mute, directiveType, info] {
+            m_executor.execute([this, mute, directiveType, info] {
                 /*
                  * Since AVS doesn't have a concept of Speaker IDs or types, no-op if a directive
                  * comes in and there are no AVS_SPEAKER_VOLUME speakers.
@@ -508,7 +494,7 @@ void SpeakerManager::addSpeakerManagerObserver(
         return;
     }
     ACSDK_DEBUG9(LX("addSpeakerManagerObserver").d("observer", observer.get()));
-    m_executor.submit([this, observer] {
+    m_executor.execute([this, observer] {
         if (!m_observers.insert(observer).second) {
             ACSDK_ERROR(LX("addSpeakerManagerObserverFailed").d("reason", "duplicateObserver"));
         }
@@ -523,7 +509,7 @@ void SpeakerManager::removeSpeakerManagerObserver(
         return;
     }
     ACSDK_DEBUG9(LX("removeSpeakerManagerObserver").d("observer", observer.get()));
-    m_executor.submit([this, observer] {
+    m_executor.execute([this, observer] {
         if (m_observers.erase(observer) == 0) {
             ACSDK_WARN(LX("removeSpeakerManagerObserverFailed").d("reason", "nonExistentObserver"));
         }
@@ -532,7 +518,7 @@ void SpeakerManager::removeSpeakerManagerObserver(
 
 bool SpeakerManager::updateContextManager(
     const ChannelVolumeInterface::Type& type,
-    const SpeakerInterface::SpeakerSettings& settings) {
+    const SpeakerInterface::SpeakerSettings& settings) noexcept {
     ACSDK_DEBUG9(LX("updateContextManagerCalled").d("speakerType", type));
 
     if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME != type) {
@@ -593,7 +579,7 @@ std::future<bool> SpeakerManager::setVolume(
 bool SpeakerManager::executeSetVolume(
     ChannelVolumeInterface::Type type,
     int8_t volume,
-    const SpeakerManagerInterface::NotificationProperties& properties) {
+    const SpeakerManagerInterface::NotificationProperties& properties) noexcept {
     ACSDK_DEBUG9(LX("executeSetVolumeCalled").d("volume", static_cast<int>(volume)));
     auto it = m_speakerMap.find(type);
     if (m_speakerMap.end() == it) {
@@ -616,8 +602,8 @@ bool SpeakerManager::executeSetVolume(
     if (volume > maximumVolumeLimit) {
         ACSDK_DEBUG0(LX("adjustingSetVolumeValue")
                          .d("reason", "valueHigherThanLimit")
-                         .d("value", (int)volume)
-                         .d("maximumVolumeLimitSetting", (int)maximumVolumeLimit));
+                         .d("value", static_cast<int>(volume))
+                         .d("maximumVolumeLimitSetting", static_cast<int>(maximumVolumeLimit)));
         adjustedVolume = maximumVolumeLimit;
     }
 
@@ -658,8 +644,10 @@ bool SpeakerManager::executeSetVolume(
 
     ACSDK_DEBUG(LX("executeSetVolumeSuccess").d("newVolume", static_cast<int>(settings.volume)));
 
-    if (previousVolume != settings.volume) {
-        executePersistConfiguration();
+    if (m_persistentStorage) {
+        if (previousVolume != settings.volume) {
+            executePersistConfiguration();
+        }
     }
 
     updateContextManager(type, settings);
@@ -678,13 +666,13 @@ bool SpeakerManager::executeSetVolume(
 
 void SpeakerManager::convertSettingsToChannelState(
     avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
-    SpeakerManagerStorageState::ChannelState* storageState) {
+    SpeakerManagerStorageState::ChannelState* storageState) noexcept {
     const auto& settings = m_speakerSettings[type];
     storageState->channelVolume = settings.volume;
     storageState->channelMuteStatus = settings.mute;
 }
 
-void SpeakerManager::executePersistConfiguration() {
+void SpeakerManager::executePersistConfiguration() noexcept {
     SpeakerManagerStorageState state;
     convertSettingsToChannelState(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, &state.speakerChannelState);
     convertSettingsToChannelState(ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME, &state.alertsChannelState);
@@ -698,7 +686,7 @@ void SpeakerManager::executePersistConfiguration() {
 
 bool SpeakerManager::executeRestoreVolume(
     ChannelVolumeInterface::Type type,
-    SpeakerManagerObserverInterface::Source source) {
+    SpeakerManagerObserverInterface::Source source) noexcept {
     SpeakerInterface::SpeakerSettings settings;
 
     if (!executeGetSpeakerSettings(type, &settings)) {
@@ -710,7 +698,8 @@ bool SpeakerManager::executeRestoreVolume(
         return true;
     }
 
-    return executeSetVolume(type, m_minUnmuteVolume, SpeakerManagerInterface::NotificationProperties(source));
+    return executeSetVolume(
+        type, static_cast<int8_t>(m_minUnmuteVolume), SpeakerManagerInterface::NotificationProperties(source));
 }
 
 std::future<bool> SpeakerManager::adjustVolume(
@@ -745,7 +734,7 @@ std::future<bool> SpeakerManager::adjustVolume(
 bool SpeakerManager::executeAdjustVolume(
     ChannelVolumeInterface::Type type,
     int8_t delta,
-    const SpeakerManagerInterface::NotificationProperties& properties) {
+    const SpeakerManagerInterface::NotificationProperties& properties) noexcept {
     ACSDK_DEBUG9(LX("executeAdjustVolumeCalled").d("delta", static_cast<int>(delta)));
     auto it = m_speakerMap.find(type);
     if (m_speakerMap.end() == it) {
@@ -826,8 +815,10 @@ bool SpeakerManager::executeAdjustVolume(
 
     ACSDK_DEBUG(LX("executeAdjustVolumeSuccess").d("newVolume", static_cast<int>(settings.volume)));
 
-    if (previousVolume != settings.volume) {
-        executePersistConfiguration();
+    if (m_persistentStorage) {
+        if (previousVolume != settings.volume) {
+            executePersistConfiguration();
+        }
     }
 
     updateContextManager(type, settings);
@@ -873,7 +864,7 @@ std::future<bool> SpeakerManager::setMute(
 bool SpeakerManager::executeSetMute(
     ChannelVolumeInterface::Type type,
     bool mute,
-    const SpeakerManagerInterface::NotificationProperties& properties) {
+    const SpeakerManagerInterface::NotificationProperties& properties) noexcept {
     ACSDK_DEBUG9(LX("executeSetMuteCalled").d("mute", mute));
     SpeakerInterface::SpeakerSettings settings;
     if (!executeGetSpeakerSettings(type, &settings)) {
@@ -925,7 +916,9 @@ bool SpeakerManager::executeSetMute(
 
     ACSDK_DEBUG(LX("executeSetMuteSuccess").d("mute", mute));
 
-    executePersistConfiguration();
+    if (m_persistentStorage) {
+        executePersistConfiguration();
+    }
 
     updateContextManager(type, settings);
 
@@ -941,14 +934,14 @@ bool SpeakerManager::executeSetMute(
 }
 
 #ifdef ENABLE_MAXVOLUME_SETTING
-std::future<bool> SpeakerManager::setMaximumVolumeLimit(const int8_t maximumVolumeLimit) {
+std::future<bool> SpeakerManager::setMaximumVolumeLimit(const int8_t maximumVolumeLimit) noexcept {
     return m_executor.submit([this, maximumVolumeLimit] {
         return withinBounds(maximumVolumeLimit, AVS_ADJUST_VOLUME_MIN, AVS_ADJUST_VOLUME_MAX) &&
                executeSetMaximumVolumeLimit(maximumVolumeLimit);
     });
 }
 
-bool SpeakerManager::executeSetMaximumVolumeLimit(const int8_t maximumVolumeLimit) {
+bool SpeakerManager::executeSetMaximumVolumeLimit(const int8_t maximumVolumeLimit) noexcept {
     ACSDK_DEBUG3(LX(__func__).d("maximumVolumeLimit", static_cast<int>(maximumVolumeLimit)));
 
     // First adjust current volumes.
@@ -987,7 +980,7 @@ void SpeakerManager::executeNotifySettingsChanged(
     const SpeakerInterface::SpeakerSettings& settings,
     const std::string& eventName,
     const SpeakerManagerObserverInterface::Source& source,
-    const ChannelVolumeInterface::Type& type) {
+    const ChannelVolumeInterface::Type& type) noexcept {
     // Only send an event if the AVS_SPEAKER_VOLUME settings changed.
     if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
         executeSendSpeakerSettingsChangedEvent(eventName, settings);
@@ -999,7 +992,7 @@ void SpeakerManager::executeNotifySettingsChanged(
 void SpeakerManager::executeNotifyObserver(
     const SpeakerManagerObserverInterface::Source& source,
     const ChannelVolumeInterface::Type& type,
-    const SpeakerInterface::SpeakerSettings& settings) {
+    const SpeakerInterface::SpeakerSettings& settings) noexcept {
     ACSDK_DEBUG9(LX("executeNotifyObserverCalled"));
     for (auto observer : m_observers) {
         observer->onSpeakerSettingsChanged(source, type, settings);
@@ -1015,7 +1008,7 @@ std::future<bool> SpeakerManager::getSpeakerSettings(
 
 bool SpeakerManager::executeGetSpeakerSettings(
     ChannelVolumeInterface::Type type,
-    SpeakerInterface::SpeakerSettings* settings) {
+    SpeakerInterface::SpeakerSettings* settings) noexcept {
     ACSDK_DEBUG9(LX("executeGetSpeakerSettingsCalled"));
     if (!settings) {
         ACSDK_ERROR(LX("executeGetSpeakerSettingsFailed").d("reason", "nullSettings"));
@@ -1037,7 +1030,8 @@ bool SpeakerManager::executeGetSpeakerSettings(
     return true;
 }
 
-bool SpeakerManager::executeInitializeSpeakerSettings(avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type) {
+bool SpeakerManager::executeInitializeSpeakerSettings(
+    avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type) noexcept {
     ACSDK_DEBUG5(LX("executeInitializeSpeakerSettings").d("type", type));
     auto it = m_speakerMap.find(type);
     if (m_speakerMap.end() == it) {
@@ -1052,13 +1046,93 @@ bool SpeakerManager::executeInitializeSpeakerSettings(avsCommon::sdkInterfaces::
         return false;
     }
 
-    m_speakerSettings[type] = settings;
+    if (m_persistentStorage) {
+        auto defaultSettingsIt = m_speakerSettings.find(type);
+        if (m_speakerSettings.end() == defaultSettingsIt) {
+            ACSDK_DEBUG5(LX("executeInitializeSpeakerSettings").d("Initializing new speaker setting", type));
+            m_speakerSettings[type] = settings;
+        }
+    } else {
+        m_speakerSettings[type] = settings;
+    }
+
     return true;
 }
 
+void SpeakerManager::onExternalSpeakerSettingsUpdate(
+    ChannelVolumeInterface::Type type,
+    const SpeakerInterface::SpeakerSettings& speakerSettings,
+    const NotificationProperties& properties) {
+    ACSDK_DEBUG9(LX("onExternalSpeakerSettingsUpdate"));
+    m_executor.execute([this, type, speakerSettings, properties] {
+        auto it = m_speakerMap.find(type);
+        if (m_speakerMap.end() == it) {
+            ACSDK_ERROR(LX("onExternalSpeakerSettingsUpdateFailed").d("reason", "noSpeakersWithType").d("type", type));
+            submitMetric(m_metricRecorder, "onExternalSpeakerSettingsUpdateFailedZeroSpeakers", 1);
+            return;
+        }
+
+        submitMetric(m_metricRecorder, "onExternalSpeakerSettingsUpdateFailedZeroSpeakers", 0);
+        submitMetric(m_metricRecorder, "onExternalSpeakerSettingsUpdate", 1);
+        submitMetric(
+            m_metricRecorder, "onExternalSpeakerSettingsUpdateSource_" + getSourceString(properties.source), 1);
+
+        auto adjustedVolume =
+            (speakerSettings.volume > AVS_SET_VOLUME_MIN) ? speakerSettings.volume : AVS_SET_VOLUME_MIN;
+
+        auto maximumVolumeLimit = getMaximumVolumeLimit();
+
+        if (speakerSettings.volume > maximumVolumeLimit) {
+            ACSDK_DEBUG0(LX("adjustingUpdatedVolumeValue")
+                             .d("reason", "valueHigherThanLimit")
+                             .d("value", static_cast<int>(speakerSettings.volume))
+                             .d("maximumVolumeLimitSetting", static_cast<int>(maximumVolumeLimit)));
+            adjustedVolume = maximumVolumeLimit;
+        }
+        SpeakerInterface::SpeakerSettings settings;
+        if (!executeGetSpeakerSettings(type, &settings)) {
+            ACSDK_ERROR(LX("onExternalSpeakerSettingsUpdateFailed").d("reason", "executeGetSpeakerSettingsFailed"));
+            return;
+        }
+        auto previousVolume = settings.volume;
+        auto previousMute = settings.mute;
+
+        // update the new settings.
+        settings.volume = adjustedVolume;
+        settings.mute = speakerSettings.mute;
+        if (!executeSetSpeakerSettings(type, settings)) {
+            ACSDK_ERROR(LX("executeOnVolumeUpdatedFailed").d("reason", "executeSetSpeakerSettingsFailed"));
+            return;
+        }
+
+        if (m_persistentStorage) {
+            if ((previousVolume != settings.volume) || (previousMute != settings.mute)) {
+                executePersistConfiguration();
+            }
+        }
+
+        updateContextManager(type, settings);
+
+        if (properties.notifyObservers) {
+            executeNotifyObserver(properties.source, type, settings);
+        }
+
+        if (properties.notifyAVS) {
+            if (!(previousVolume == settings.volume &&
+                  SpeakerManagerObserverInterface::Source::LOCAL_API == properties.source)) {
+                executeNotifySettingsChanged(settings, VOLUME_CHANGED, properties.source, type);
+            }
+            if (previousMute != settings.mute) {
+                executeNotifySettingsChanged(settings, MUTE_CHANGED, properties.source, type);
+            }
+        }
+        return;
+    });
+}
+
 bool SpeakerManager::executeSetSpeakerSettings(
     const ChannelVolumeInterface::Type type,
-    const SpeakerInterface::SpeakerSettings& settings) {
+    const SpeakerInterface::SpeakerSettings& settings) noexcept {
     ACSDK_DEBUG9(LX("executeSetSpeakerSettingsCalled"));
     if (m_speakerMap.end() == m_speakerMap.find(type)) {
         ACSDK_ERROR(LX("executeSetSpeakerSettings").d("reason", "noSpeakersWithTypeFound").d("type", type));
@@ -1071,6 +1145,26 @@ bool SpeakerManager::executeSetSpeakerSettings(
 
 void SpeakerManager::addChannelVolumeInterface(std::shared_ptr<ChannelVolumeInterface> channelVolumeInterface) {
     addChannelVolumeInterfaceIntoSpeakerMap(channelVolumeInterface);
+    if (m_persistentStorage) {
+        SpeakerInterface::SpeakerSettings& settings = m_speakerSettings[channelVolumeInterface->getSpeakerType()];
+        retryAndApplySettings([this, &settings, &channelVolumeInterface]() -> bool {
+            ACSDK_DEBUG9(LX(__func__)
+                             .d("speaker id", channelVolumeInterface->getId())
+                             .d("speaker type", channelVolumeInterface->getSpeakerType())
+                             .d("default volume set to ", settings.volume));
+            if (!channelVolumeInterface->setUnduckedVolume(settings.volume)) {
+                submitMetric(m_metricRecorder, "setVolumeFailed", 1);
+                return false;
+            }
+            if (!channelVolumeInterface->setMute(settings.mute)) {
+                submitMetric(m_metricRecorder, "setMuteFailed", 1);
+                return false;
+            }
+            submitMetric(m_metricRecorder, "setVolumeFailed", 0);
+            submitMetric(m_metricRecorder, "setMuteFailed", 0);
+            return true;
+        });
+    }
 }
 
 std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> SpeakerManager::
@@ -1078,17 +1172,15 @@ std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> Spe
     return m_capabilityConfigurations;
 }
 
-int8_t SpeakerManager::getMaximumVolumeLimit() {
+int8_t SpeakerManager::getMaximumVolumeLimit() noexcept {
     return m_maximumVolumeLimit;
 }
 
-template <typename Task, typename... Args>
-bool SpeakerManager::retryAndApplySettings(Task task, Args&&... args) {
-    auto boundTask = std::bind(std::forward<Task>(task), std::forward<Args>(args)...);
+bool SpeakerManager::retryAndApplySettings(const std::function<bool()>& task) noexcept {
     size_t attempt = 0;
     m_waitCancelEvent.reset();
     while (attempt < m_maxRetries) {
-        if (boundTask()) {
+        if (task()) {
             break;
         }
 
@@ -1102,7 +1194,7 @@ bool SpeakerManager::retryAndApplySettings(Task task, Args&&... args) {
     return attempt < m_maxRetries;
 }
 
-int8_t SpeakerManager::adjustVolumeRange(int64_t volume) {
+int8_t SpeakerManager::adjustVolumeRange(int64_t volume) noexcept {
     auto adjustedVolume = std::min(
         static_cast<int64_t>(AVS_ADJUST_VOLUME_MAX), std::max(static_cast<int64_t>(AVS_ADJUST_VOLUME_MIN), volume));
     return static_cast<int8_t>(adjustedVolume);
@@ -1110,7 +1202,7 @@ int8_t SpeakerManager::adjustVolumeRange(int64_t volume) {
 
 void SpeakerManager::presetChannelDefaults(
     ChannelVolumeInterface::Type type,
-    const SpeakerManagerStorageState::ChannelState& state) {
+    const SpeakerManagerStorageState::ChannelState& state) noexcept {
     auto adjustedVolume = adjustVolumeRange(state.channelVolume);
 
     if (adjustedVolume != state.channelVolume) {
@@ -1127,7 +1219,7 @@ void SpeakerManager::presetChannelDefaults(
     }
 }
 
-void SpeakerManager::loadConfiguration() {
+void SpeakerManager::loadConfiguration() noexcept {
     ACSDK_DEBUG5(LX("configureDefaults").m("Loading configuration"));
 
     m_minUnmuteVolume = m_config.getMinUnmuteVolume();
@@ -1140,12 +1232,12 @@ void SpeakerManager::loadConfiguration() {
     presetChannelDefaults(ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME, state.alertsChannelState);
 }
 
-void SpeakerManager::updateChannelSettings() {
+void SpeakerManager::updateChannelSettings() noexcept {
     updateChannelSettings(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
     updateChannelSettings(ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME);
 }
 
-void SpeakerManager::updateChannelSettings(ChannelVolumeInterface::Type type) {
+void SpeakerManager::updateChannelSettings(ChannelVolumeInterface::Type type) noexcept {
     auto it = m_speakerMap.find(type);
     if (it != m_speakerMap.end()) {
         SpeakerInterface::SpeakerSettings& settings = m_speakerSettings[type];
@@ -1181,5 +1273,4 @@ void SpeakerManager::updateChannelSettings(ChannelVolumeInterface::Type type) {
 }
 
 }  // namespace speakerManager
-}  // namespace capabilityAgents
 }  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/src/SpeakerManagerConfig.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/src/SpeakerManagerConfig.cpp
new file mode 100644
index 0000000000..26632b3f72
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/src/SpeakerManagerConfig.cpp
@@ -0,0 +1,144 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/SpeakerManager/private/SpeakerManagerConfig.h>
+#include <AVSCommon/AVS/SpeakerConstants/SpeakerConstants.h>
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+using namespace alexaClientSDK::avsCommon::avs::speakerConstants;
+using namespace alexaClientSDK::avsCommon::utils::configuration;
+using namespace alexaClientSDK::avsCommon::utils;
+
+/// @addtogroup Lib_acsdkSpeakerManager
+/// @{
+
+/// String to identify log entries originating from this file.
+/// @private
+#define TAG "SpeakerManagerConfig"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ * @private
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// The key in our config file to find the root of speaker manager configuration.
+/// @private
+static const auto SPEAKERMANAGER_CONFIGURATION_ROOT_KEY = "speakerManagerCapabilityAgent";
+/// The key in our config file to find the persistentStorage value.
+/// @private
+static const auto SPEAKERMANAGER_PERSISTENT_STORAGE_SETTING_KEY = "persistentStorage";
+/// The key in our config file to find the minUnmuteVolume value.
+/// @private
+static const auto SPEAKERMANAGER_MIN_UNMUTE_VOLUME_KEY = "minUnmuteVolume";
+/// The key in our config file to find the defaultSpeakerVolume value.
+/// @private
+static const auto SPEAKERMANAGER_DEFAULT_SPEAKER_VOLUME_KEY = "defaultSpeakerVolume";
+/// The key in our config file to find the defaultAlertsVolume value.
+/// @private
+static const auto SPEAKERMANAGER_DEFAULT_ALERTS_VOLUME_KEY = "defaultAlertsVolume";
+/// The key in our config file to find mute status keep flag
+/// @private
+static const auto SPEAKERMANAGER_RESTORE_MUTE_STATE_KEY = "restoreMuteState";
+
+/**
+ * @brief Helper to load a single volume level entry from configuration.
+ *
+ * @param[in]  node  Configuration node.
+ * @param[in]  key   Entry name.
+ * @param[out] value Volume entry result.
+ *
+ * @return True if entry with name @a key have been found, and it's value is within valid range. False otherwise.
+ * @private
+ */
+static bool loadVolumeConfig(ConfigurationNode& node, const char* key, Optional<std::uint8_t>& value) noexcept {
+    int tmp;
+    if (node.getInt(key, &tmp) && tmp >= AVS_SET_VOLUME_MIN && tmp <= AVS_SET_VOLUME_MAX) {
+        value = static_cast<std::uint8_t>(tmp);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+/// @}
+
+SpeakerManagerConfig::SpeakerManagerConfig() noexcept {
+    loadPlatformConfig();
+}
+
+bool SpeakerManagerConfig::getPersistentStorage(bool& persistentStorage) noexcept {
+    if (m_persistentStorage.hasValue()) {
+        persistentStorage = m_persistentStorage.value();
+        return true;
+    }
+    return false;
+}
+
+bool SpeakerManagerConfig::getMinUnmuteVolume(std::uint8_t& minUnmuteVolume) noexcept {
+    if (m_minUnmuteVolume.hasValue()) {
+        minUnmuteVolume = m_minUnmuteVolume.value();
+        return true;
+    }
+    return false;
+}
+
+bool SpeakerManagerConfig::getRestoreMuteState(bool& restoreMuteState) noexcept {
+    if (m_restoreMuteState.hasValue()) {
+        restoreMuteState = m_restoreMuteState.value();
+        return true;
+    }
+    return false;
+}
+
+bool SpeakerManagerConfig::getDefaultSpeakerVolume(std::uint8_t& defaultSpeakerVolume) noexcept {
+    if (m_defaultSpeakerVolume.hasValue()) {
+        defaultSpeakerVolume = m_defaultSpeakerVolume.value();
+        return true;
+    }
+    return false;
+}
+
+bool SpeakerManagerConfig::getDefaultAlertsVolume(std::uint8_t& defaultAlertsVolume) noexcept {
+    if (m_defaultAlertsVolume.hasValue()) {
+        defaultAlertsVolume = m_defaultAlertsVolume.value();
+        return true;
+    }
+    return false;
+}
+
+void SpeakerManagerConfig::loadPlatformConfig() noexcept {
+    auto configRoot = ConfigurationNode::getRoot().getChildNode(SPEAKERMANAGER_CONFIGURATION_ROOT_KEY);
+
+    loadVolumeConfig(configRoot, SPEAKERMANAGER_DEFAULT_SPEAKER_VOLUME_KEY, m_defaultSpeakerVolume);
+    loadVolumeConfig(configRoot, SPEAKERMANAGER_DEFAULT_ALERTS_VOLUME_KEY, m_defaultAlertsVolume);
+    loadVolumeConfig(configRoot, SPEAKERMANAGER_MIN_UNMUTE_VOLUME_KEY, m_minUnmuteVolume);
+
+    bool tmp;
+    if (configRoot.getBool(SPEAKERMANAGER_RESTORE_MUTE_STATE_KEY, &tmp)) {
+        m_restoreMuteState = tmp;
+    }
+    if (configRoot.getBool(SPEAKERMANAGER_PERSISTENT_STORAGE_SETTING_KEY, &tmp)) {
+        m_persistentStorage = tmp;
+    }
+}
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/src/SpeakerManagerConfigHelper.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/src/SpeakerManagerConfigHelper.cpp
new file mode 100644
index 0000000000..f406114f56
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/src/SpeakerManagerConfigHelper.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/SpeakerManager/private/SpeakerManager.h>
+#include <AVSCommon/AVS/SpeakerConstants/SpeakerConstants.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::sdkInterfaces::storage;
+using namespace avsCommon::avs::speakerConstants;
+using namespace avsCommon::utils::configuration;
+
+/// String to identify log entries originating from this file.
+/// @private
+#define TAG "SpeakerManagerConfigHelper"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ * @private
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+const SpeakerManagerStorageState SpeakerManagerConfigHelper::c_defaults = {{DEFAULT_SPEAKER_VOLUME, false},
+                                                                           {DEFAULT_ALERTS_VOLUME, false}};
+
+SpeakerManagerConfigHelper::SpeakerManagerConfigHelper(
+    std::shared_ptr<SpeakerManagerConfigInterface> config,
+    std::shared_ptr<SpeakerManagerStorageInterface> storage) noexcept :
+        m_config{std::move(config)},
+        m_storage{std::move(storage)} {
+}
+
+int SpeakerManagerConfigHelper::getMinUnmuteVolume() const noexcept {
+    std::uint8_t minUnmuteVolume;
+    if (!m_config->getMinUnmuteVolume(minUnmuteVolume)) {
+        minUnmuteVolume = MIN_UNMUTE_VOLUME;
+    }
+    return minUnmuteVolume;
+}
+
+bool SpeakerManagerConfigHelper::getPersistentStorage() const noexcept {
+    bool speakerPersistentStorageSetting;
+    if (!m_config->getPersistentStorage(speakerPersistentStorageSetting)) {
+        speakerPersistentStorageSetting = false;
+    }
+    return speakerPersistentStorageSetting;
+}
+
+void SpeakerManagerConfigHelper::loadState(SpeakerManagerStorageState& state) noexcept {
+    if (m_storage->loadState(state)) {
+        return;
+    }
+
+    state = c_defaults;
+
+    std::uint8_t tmp;
+    if (m_config->getDefaultSpeakerVolume(tmp)) {
+        state.speakerChannelState.channelVolume = tmp;
+    }
+    if (m_config->getDefaultAlertsVolume(tmp)) {
+        state.alertsChannelState.channelVolume = tmp;
+    }
+}
+
+bool SpeakerManagerConfigHelper::saveState(const SpeakerManagerStorageState& state) noexcept {
+    return m_storage->saveState(state);
+}
+
+bool SpeakerManagerConfigHelper::getRestoreMuteState() const noexcept {
+    bool restoreMuteState;
+    if (!m_config->getRestoreMuteState(restoreMuteState)) {
+        restoreMuteState = true;
+    }
+    return restoreMuteState;
+}
+
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/src/SpeakerManagerMiscStorage.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/src/SpeakerManagerMiscStorage.cpp
similarity index 77%
rename from CapabilityAgents/SpeakerManager/src/SpeakerManagerMiscStorage.cpp
rename to CapabilityAgents/SpeakerManager/SpeakerManager/src/SpeakerManagerMiscStorage.cpp
index 1209c2d99c..2d3690343b 100644
--- a/CapabilityAgents/SpeakerManager/src/SpeakerManagerMiscStorage.cpp
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/src/SpeakerManagerMiscStorage.cpp
@@ -13,54 +13,62 @@
  * permissions and limitations under the License.
  */
 
-#include <AVSCommon/SDKInterfaces/ChannelVolumeFactoryInterface.h>
+#include <acsdk/SpeakerManager/private/SpeakerManager.h>
+#include <acsdk/SpeakerManager/private/SpeakerManagerMiscStorage.h>
+#include <acsdk/SpeakerManager/SpeakerManagerStorageState.h>
 #include <AVSCommon/Utils/JSON/JSONGenerator.h>
 #include <AVSCommon/Utils/JSON/JSONUtils.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 
-#include "SpeakerManager/SpeakerManager.h"
-#include "SpeakerManager/SpeakerManagerMiscStorage.h"
-#include "SpeakerManager/SpeakerManagerStorageState.h"
-
 namespace alexaClientSDK {
-namespace capabilityAgents {
 namespace speakerManager {
 
 using namespace avsCommon::sdkInterfaces::storage;
 using namespace avsCommon::utils::json;
 
+/// @addtogroup Lib_acsdkSpeakerManager
+/// @{
+
 /// String to identify log entries originating from this file.
-static const std::string TAG("SpeakerManagerMiscStorage");
+/// @private
+#define TAG "SpeakerManagerMiscStorage"
 
 /**
  * Create a LogEntry using the file's TAG and the specified event string.
  *
- * @param The event string for this @c LogEntry.
+ * @param event The event string for this @c LogEntry.
+ * @private
  */
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
 /// Component name for Misc DB.
-static const std::string COMPONENT_NAME = "SpeakerManager";
+/// @private
+static const auto COMPONENT_NAME = "SpeakerManager";
 /// Misc DB table for component state.
-static const std::string COMPONENT_STATE_TABLE = "SpeakerManagerConfig";
+/// @private
+static const auto COMPONENT_STATE_TABLE = "SpeakerManagerConfig";
 /// Misc DB table entry for component state.
-static const std::string COMPONENT_STATE_KEY = "SpeakerManagerConfig";
-
+/// @private
+static const auto COMPONENT_STATE_KEY = "SpeakerManagerConfig";
 /// The key in our config for speaker volume.
-static const std::string SPEAKER_CHANNEL_STATE = "speakerChannelState";
+/// @private
+static const auto SPEAKER_CHANNEL_STATE = "speakerChannelState";
 /// The key in our config for speaker volume.
-static const std::string ALERTS_CHANNEL_STATE = "alertsChannelState";
-/// The key in our config for alerts volume.
-static const std::string ALERTS_VOLUME_KEY = "alertsVolume";
+/// @private
+static const auto ALERTS_CHANNEL_STATE = "alertsChannelState";
 /// The key in our config for speaker volume.
-static const std::string CHANNEL_VOLUME_KEY = "channelVolume";
+/// @private
+static const auto CHANNEL_VOLUME_KEY = "channelVolume";
 /// The key in our config for speaker volume.
-static const std::string CHANNEL_MUTE_STATUS_KEY = "channelMuteStatus";
+/// @private
+static const auto CHANNEL_MUTE_STATUS_KEY = "channelMuteStatus";
+
+/// @}
 
 std::shared_ptr<SpeakerManagerMiscStorage> SpeakerManagerMiscStorage::create(
-    const std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface>& miscStorage) {
+    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage) noexcept {
     if (miscStorage) {
-        auto res = std::shared_ptr<SpeakerManagerMiscStorage>(new SpeakerManagerMiscStorage(miscStorage));
+        auto res = std::shared_ptr<SpeakerManagerMiscStorage>(new SpeakerManagerMiscStorage(std::move(miscStorage)));
         if (res->init()) {
             return res;
         } else {
@@ -73,11 +81,11 @@ std::shared_ptr<SpeakerManagerMiscStorage> SpeakerManagerMiscStorage::create(
 }
 
 SpeakerManagerMiscStorage::SpeakerManagerMiscStorage(
-    const std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface>& miscStorage) :
-        m_miscStorage{miscStorage} {
+    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage) noexcept :
+        m_miscStorage{std::move(miscStorage)} {
 }
 
-bool SpeakerManagerMiscStorage::init() {
+bool SpeakerManagerMiscStorage::init() noexcept {
     if (!m_miscStorage->isOpened() && !m_miscStorage->open()) {
         ACSDK_DEBUG3(LX(__func__).m("Couldn't open misc database. Creating."));
         if (!m_miscStorage->createDatabase()) {
@@ -112,7 +120,7 @@ bool SpeakerManagerMiscStorage::init() {
 
 bool SpeakerManagerMiscStorage::convertFromStateString(
     const std::string& stateString,
-    SpeakerManagerStorageState::ChannelState& state) {
+    SpeakerManagerStorageState::ChannelState& state) noexcept {
     rapidjson::Document document;
     if (!jsonUtils::parseJSON(stateString, &document)) {
         ACSDK_ERROR(LX("convertFromStateString").d("reason", "parsingError"));
@@ -122,7 +130,7 @@ bool SpeakerManagerMiscStorage::convertFromStateString(
     int64_t tmpVolume;
 
     if (jsonUtils::retrieveValue(document, CHANNEL_VOLUME_KEY, &tmpVolume)) {
-        state.channelVolume = tmpVolume;
+        state.channelVolume = static_cast<uint8_t>(tmpVolume);
     } else {
         return false;
     }
@@ -135,7 +143,7 @@ bool SpeakerManagerMiscStorage::convertFromStateString(
 
 bool SpeakerManagerMiscStorage::convertFromStateString(
     const std::string& stateString,
-    SpeakerManagerStorageState& state) {
+    SpeakerManagerStorageState& state) noexcept {
     std::string tmp;
 
     return jsonUtils::retrieveValue(stateString, SPEAKER_CHANNEL_STATE, &tmp) &&
@@ -144,21 +152,22 @@ bool SpeakerManagerMiscStorage::convertFromStateString(
            convertFromStateString(tmp, state.alertsChannelState);
 }
 
-bool SpeakerManagerMiscStorage::loadState(SpeakerManagerStorageState& state) {
+bool SpeakerManagerMiscStorage::loadState(SpeakerManagerStorageState& state) noexcept {
     std::string stateString;
 
     return m_miscStorage->get(COMPONENT_NAME, COMPONENT_STATE_TABLE, COMPONENT_STATE_KEY, &stateString) &&
            !stateString.empty() && convertFromStateString(stateString, state);
 }
 
-std::string SpeakerManagerMiscStorage::convertToStateString(const SpeakerManagerStorageState::ChannelState& state) {
+std::string SpeakerManagerMiscStorage::convertToStateString(
+    const SpeakerManagerStorageState::ChannelState& state) noexcept {
     JsonGenerator generator;
     generator.addMember(CHANNEL_VOLUME_KEY, state.channelVolume);
     generator.addMember(CHANNEL_MUTE_STATUS_KEY, state.channelMuteStatus);
     return generator.toString();
 }
 
-std::string SpeakerManagerMiscStorage::convertToStateString(const SpeakerManagerStorageState& state) {
+std::string SpeakerManagerMiscStorage::convertToStateString(const SpeakerManagerStorageState& state) noexcept {
     ACSDK_DEBUG5(LX(__func__));
     JsonGenerator generator;
     generator.addRawJsonMember(SPEAKER_CHANNEL_STATE, convertToStateString(state.speakerChannelState));
@@ -166,7 +175,7 @@ std::string SpeakerManagerMiscStorage::convertToStateString(const SpeakerManager
     return generator.toString();
 }
 
-bool SpeakerManagerMiscStorage::saveState(const SpeakerManagerStorageState& state) {
+bool SpeakerManagerMiscStorage::saveState(const SpeakerManagerStorageState& state) noexcept {
     std::string stateString = convertToStateString(state);
     if (!m_miscStorage->put(COMPONENT_NAME, COMPONENT_STATE_TABLE, COMPONENT_STATE_KEY, stateString)) {
         ACSDK_ERROR(LX("saveStateFailed")
@@ -180,5 +189,4 @@ bool SpeakerManagerMiscStorage::saveState(const SpeakerManagerStorageState& stat
 }
 
 }  // namespace speakerManager
-}  // namespace capabilityAgents
 }  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/test/CMakeLists.txt b/CapabilityAgents/SpeakerManager/SpeakerManager/test/CMakeLists.txt
new file mode 100644
index 0000000000..2d2df6e18e
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/test/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+if(BUILD_TESTING)
+    add_library(acsdkSpeakerManagerTestLib INTERFACE)
+    target_include_directories(acsdkSpeakerManagerTestLib INTERFACE "${acsdkSpeakerManager_SOURCE_DIR}/test/include")
+
+    set(INCLUDE_PATH "${acsdkSpeakerManager_SOURCE_DIR}/privateInclude")
+    discover_unit_tests("${INCLUDE_PATH}" "acsdkSpeakerManager;UtilsCommonTestLib;SDKInterfacesTests;AVSCommonTestLib;acsdkSpeakerManagerTestLib")
+endif()
diff --git a/CapabilityAgents/SpeakerManager/test/ChannelVolumeManagerTest.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/test/ChannelVolumeManagerTest.cpp
similarity index 95%
rename from CapabilityAgents/SpeakerManager/test/ChannelVolumeManagerTest.cpp
rename to CapabilityAgents/SpeakerManager/SpeakerManager/test/ChannelVolumeManagerTest.cpp
index 9f3219623d..23aa44cb4d 100644
--- a/CapabilityAgents/SpeakerManager/test/ChannelVolumeManagerTest.cpp
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/test/ChannelVolumeManagerTest.cpp
@@ -17,22 +17,23 @@
 #include <gtest/gtest.h>
 #include <AVSCommon/SDKInterfaces/MockSpeakerInterface.h>
 
-#include "SpeakerManager/ChannelVolumeManager.h"
+#include <acsdk/SpeakerManager/private/ChannelVolumeManager.h>
 
 namespace alexaClientSDK {
-namespace capabilityAgents {
 namespace speakerManager {
 namespace test {
+
 using namespace avsCommon::avs;
 using namespace avsCommon::avs::speakerConstants;
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::sdkInterfaces::test;
 using namespace ::testing;
-using namespace alexaClientSDK::capabilityAgents::speakerManager;
 
 /// Initial Settings for underlying @c SpeakerInterface.
 static const SpeakerInterface::SpeakerSettings INITIAL_SETTINGS{AVS_SET_VOLUME_MAX / 2, false};
 
+/// @brief Test fixture for ChannelVolumeManager.
+/// @ingroup Test_acsdkSpeakerManager
 class ChannelVolumeManagerTest : public Test {
 public:
     /// SetUp before each test.
@@ -69,7 +70,7 @@ void ChannelVolumeManagerTest::TearDown() {
 }
 
 static int8_t defaultVolumeCurve(int8_t currentVolume) {
-    const float lowerBreakPointFraction = 0.20, upperBreakPointFraction = 0.40;
+    const float lowerBreakPointFraction = 0.20f, upperBreakPointFraction = 0.40f;
     const int8_t lowerBreakPoint = static_cast<int8_t>(AVS_SET_VOLUME_MAX * lowerBreakPointFraction);
     const int8_t upperBreakPoint = static_cast<int8_t>(AVS_SET_VOLUME_MAX * upperBreakPointFraction);
 
@@ -135,7 +136,7 @@ TEST_F(ChannelVolumeManagerTest, test_volumeIsRestoredToLatestUnduckedVolume) {
     ASSERT_TRUE(unit->startDucking());
 
     // set unducked volume
-    auto newUnduckedVolume = INITIAL_SETTINGS.volume * 2;
+    auto newUnduckedVolume = static_cast<int8_t>(INITIAL_SETTINGS.volume * 2);
     ASSERT_EQ(true, unit->setUnduckedVolume(newUnduckedVolume));
 
     // when stopDucking is called : volume should be restored to unducked volume
@@ -173,5 +174,4 @@ TEST_F(ChannelVolumeManagerTest, test_stopDuckingWhenAlreadyUnducked) {
 }
 }  // namespace test
 }  // namespace speakerManager
-}  // namespace capabilityAgents
 }  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/test/Namespaces.dox b/CapabilityAgents/SpeakerManager/SpeakerManager/test/Namespaces.dox
new file mode 100644
index 0000000000..e8f96a463e
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/test/Namespaces.dox
@@ -0,0 +1,24 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @namespace alexaClientSDK::speakerManager::test
+ * @brief Unit Tests and Mocks for Speaker API Capability Agent
+ *
+ * This namespace contains unit test for Speaker API capability agent implementation.
+ *
+ * @see Lib_acsdkSpeakerManager
+ * @ingroup Test_acsdkSpeakerManager
+ */
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerConfigHelperTest.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerConfigHelperTest.cpp
new file mode 100644
index 0000000000..97ffd40592
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerConfigHelperTest.cpp
@@ -0,0 +1,271 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+#include <memory>
+
+#include <acsdk/SpeakerManager/private/SpeakerManagerConfigHelper.h>
+#include <acsdk/SpeakerManager/SpeakerManagerStorageState.h>
+#include <acsdk/SpeakerManager/test/MockSpeakerManagerConfig.h>
+#include <acsdk/SpeakerManager/test/MockSpeakerManagerStorage.h>
+#include <AVSCommon/SDKInterfaces/SpeakerManagerObserverInterface.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+namespace test {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::avs::speakerConstants;
+using namespace avsCommon::sdkInterfaces;
+using namespace ::testing;
+
+/// @addtogroup Test_acsdkSpeakerManager
+/// @{
+
+/// @brief Test fixture for SpeakerManagerConfigHelper.
+class SpeakerManagerConfigHelperTest : public Test {
+public:
+    SpeakerManagerConfigHelperTest();
+
+protected:
+    /// SetUp before each test.
+    void SetUp() override;
+
+    /// TearDown after each test.
+    void TearDown() override;
+
+    /// Upstream interface mock
+    std::shared_ptr<NiceMock<MockSpeakerManagerStorage>> m_stubStorage;
+    /// Upstream interface mock
+    std::shared_ptr<MockSpeakerManagerConfig> m_stubConfig;
+};
+
+/// @}
+
+SpeakerManagerConfigHelperTest::SpeakerManagerConfigHelperTest() : m_stubStorage() {
+}
+
+void SpeakerManagerConfigHelperTest::SetUp() {
+    m_stubStorage = std::make_shared<NiceMock<MockSpeakerManagerStorage>>();
+    m_stubConfig = std::make_shared<NiceMock<MockSpeakerManagerConfig>>();
+}
+
+void SpeakerManagerConfigHelperTest::TearDown() {
+    m_stubStorage.reset();
+    m_stubConfig.reset();
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_initDoesntCallLoadSave) {
+    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(0);
+    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_getPersistentStorageFromConfiguration) {
+    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(0);
+    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
+
+    // Provide a valid configuration.
+    EXPECT_CALL(*m_stubConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+    ASSERT_TRUE(helper.getPersistentStorage());
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_getMinUnmuteVolumeFromConfiguration) {
+    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(0);
+    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
+
+    // Provide a valid configuration.
+    EXPECT_CALL(*m_stubConfig, getMinUnmuteVolume(_)).Times(1).WillOnce(Invoke([](std::uint8_t& res) {
+        res = 3;
+        return true;
+    }));
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+    ASSERT_EQ(3, helper.getMinUnmuteVolume());
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_getPersistentStorageReturnsDefaults) {
+    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(0);
+    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
+
+    // Provide an empty configuration.
+    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(0);
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+    ASSERT_FALSE(helper.getPersistentStorage());
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_getMinUnmuteVolumeReturnsDefaults) {
+    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(0);
+    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
+
+    // Provide an empty configuration.
+    EXPECT_CALL(*m_stubConfig, getMinUnmuteVolume(_)).Times(1).WillOnce(Return(false));
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+    ASSERT_EQ(MIN_UNMUTE_VOLUME, helper.getMinUnmuteVolume());
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_getRestoreMuteStateReturnsDefaults) {
+    // Provide an empty configuration.
+    EXPECT_CALL(*m_stubConfig, getRestoreMuteState(_)).Times(1).WillOnce(Return(false));
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+    ASSERT_TRUE(helper.getRestoreMuteState());
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_getPersistentStorageReturnsTrue) {
+    EXPECT_CALL(*m_stubConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+    ASSERT_TRUE(helper.getPersistentStorage());
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_getPersistentStorageReturnsFalse) {
+    EXPECT_CALL(*m_stubConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = false;
+        return true;
+    }));
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+    ASSERT_FALSE(helper.getPersistentStorage());
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_getRestoreMuteStateReturnsTrue) {
+    EXPECT_CALL(*m_stubConfig, getRestoreMuteState(_)).Times(1).WillOnce(Invoke([](bool& restoreMuteState) {
+        restoreMuteState = true;
+        return true;
+    }));
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+    ASSERT_TRUE(helper.getRestoreMuteState());
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_getRestoreMuteStateReturnsFalse) {
+    EXPECT_CALL(*m_stubConfig, getRestoreMuteState(_)).Times(1).WillOnce(Invoke([](bool& restoreMuteState) {
+        restoreMuteState = false;
+        return true;
+    }));
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+    ASSERT_FALSE(helper.getRestoreMuteState());
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_loadStateDelegate) {
+    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(1);
+    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+
+    ON_CALL(*m_stubStorage, loadState(_)).WillByDefault(Invoke([](SpeakerManagerStorageState& state) {
+        state.speakerChannelState.channelVolume = 10;
+        state.speakerChannelState.channelMuteStatus = true;
+        state.alertsChannelState.channelMuteStatus = false;
+        state.alertsChannelState.channelVolume = 20;
+        return true;
+    }));
+
+    SpeakerManagerStorageState state = {{255, false}, {255, false}};
+    helper.loadState(state);
+
+    EXPECT_EQ(10, state.speakerChannelState.channelVolume);
+    EXPECT_TRUE(state.speakerChannelState.channelMuteStatus);
+    EXPECT_EQ(20, state.alertsChannelState.channelVolume);
+    EXPECT_FALSE(state.alertsChannelState.channelMuteStatus);
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_loadStateFromConfig) {
+    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(1);
+    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
+
+    EXPECT_CALL(*m_stubConfig, getDefaultSpeakerVolume(_))
+        .Times(1)
+        .WillOnce(Invoke([](std::uint8_t& defaultSpeakerVolume) {
+            defaultSpeakerVolume = 5;
+            return true;
+        }));
+    EXPECT_CALL(*m_stubConfig, getDefaultAlertsVolume(_))
+        .Times(1)
+        .WillOnce(Invoke([](std::uint8_t& defaultSpeakerVolume) {
+            defaultSpeakerVolume = 6;
+            return true;
+        }));
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+
+    ON_CALL(*m_stubStorage, loadState(_)).WillByDefault(Return(false));
+
+    SpeakerManagerStorageState state = {{255, true}, {255, true}};
+    helper.loadState(state);
+
+    EXPECT_EQ(5, state.speakerChannelState.channelVolume);
+    EXPECT_FALSE(state.speakerChannelState.channelMuteStatus);
+    EXPECT_EQ(6, state.alertsChannelState.channelVolume);
+    EXPECT_FALSE(state.alertsChannelState.channelMuteStatus);
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_loadStateDefaults) {
+    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(1);
+    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
+
+    EXPECT_CALL(*m_stubConfig, getDefaultSpeakerVolume(_)).Times(1).WillOnce(Return(false));
+    EXPECT_CALL(*m_stubConfig, getDefaultAlertsVolume(_)).Times(1).WillOnce(Return(false));
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+
+    ON_CALL(*m_stubStorage, loadState(_)).WillByDefault(Return(false));
+
+    SpeakerManagerStorageState state = {{255, false}, {255, false}};
+    helper.loadState(state);
+
+    EXPECT_EQ(DEFAULT_SPEAKER_VOLUME, state.speakerChannelState.channelVolume);
+    EXPECT_FALSE(state.speakerChannelState.channelMuteStatus);
+    EXPECT_EQ(DEFAULT_ALERTS_VOLUME, state.alertsChannelState.channelVolume);
+    EXPECT_FALSE(state.alertsChannelState.channelMuteStatus);
+}
+
+TEST_F(SpeakerManagerConfigHelperTest, test_saveState) {
+    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(0);
+    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(1);
+
+    SpeakerManagerConfigHelper helper(m_stubConfig, m_stubStorage);
+    SpeakerManagerStorageState saved = {{0, true}, {0, true}};
+
+    ON_CALL(*m_stubStorage, saveState(_)).WillByDefault(Invoke([&saved](const SpeakerManagerStorageState& state) {
+        saved = state;
+        return true;
+    }));
+
+    SpeakerManagerStorageState state = {{255, false}, {255, false}};
+    ASSERT_TRUE(helper.saveState(state));
+
+    ASSERT_EQ(255, saved.speakerChannelState.channelVolume);
+    ASSERT_FALSE(saved.speakerChannelState.channelMuteStatus);
+    ASSERT_EQ(255, saved.alertsChannelState.channelVolume);
+    ASSERT_FALSE(saved.alertsChannelState.channelMuteStatus);
+}
+
+}  // namespace test
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerConfigTest.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerConfigTest.cpp
new file mode 100644
index 0000000000..9cb9e8e86d
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerConfigTest.cpp
@@ -0,0 +1,276 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+#include <memory>
+
+#include <acsdk/SpeakerManager/private/SpeakerManagerConfig.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+namespace test {
+
+using namespace avsCommon::utils::configuration;
+using namespace ::testing;
+
+/// @addtogroup Test_acsdkSpeakerManager
+/// @{
+/// Configuration without speaker manager root.
+static const auto JSON_TEST_CONFIG_MISSING = R"(
+{
+})";
+/// Configuration with speaker manager root but without entries.
+static const auto JSON_TEST_CONFIG_EMPTY = R"(
+{
+    "speakerManagerCapabilityAgent": {}
+})";
+/// Configuration with speaker manager root with persistentStorage.
+static const auto JSON_TEST_CONFIG_PERSISTENT_STORAGE = R"(
+{
+    "speakerManagerCapabilityAgent": {
+        "persistentStorage": true
+    }
+})";
+/// Configuration with speaker manager root with minUnmuteVolume.
+static const auto JSON_TEST_CONFIG_MIN_UNMUTE_VOLUME = R"(
+{
+    "speakerManagerCapabilityAgent": {
+        "minUnmuteVolume": 3
+    }
+})";
+/// Configuration with speaker manager root with defaultSpeakerVolume.
+static const auto JSON_TEST_CONFIG_DEFAULT_SPEAKER_VOLUME = R"(
+{
+    "speakerManagerCapabilityAgent": {
+        "defaultSpeakerVolume": 5
+    }
+})";
+/// Configuration with speaker manager root with defaultAlertsVolume.
+static const auto JSON_TEST_CONFIG_DEFAULT_ALERTS_VOLUME = R"(
+{
+    "speakerManagerCapabilityAgent": {
+        "defaultAlertsVolume": 6
+    }
+})";
+/// Configuration with speaker manager root with defaultAlertsVolume.
+static const auto JSON_TEST_CONFIG_RESTORE_MUTE_STATE = R"(
+{
+    "speakerManagerCapabilityAgent": {
+        "restoreMuteState": false
+    }
+})";
+/// Full configuration.
+static const auto JSON_TEST_CONFIG = R"(
+{
+    "speakerManagerCapabilityAgent": {
+        "persistentStorage": true,
+        "minUnmuteVolume": 3,
+        "defaultSpeakerVolume": 5,
+        "defaultAlertsVolume": 6,
+        "restoreMuteState": true
+    }
+}
+)";
+
+/// @brief Test fixture for SpeakerManagerConfig.
+class SpeakerManagerConfigTest : public Test {
+protected:
+    /**
+     * Configure ConfigurationNode with a given string.
+     *
+     * @param jsonConfig Configuration string.
+     * @return True on success.
+     */
+    bool configureJsonConfig(const char* jsonConfig);
+
+    /// SetUp before each test.
+    void SetUp() override;
+
+    /// TearDown after each test.
+    void TearDown() override;
+};
+
+/// @}
+
+void SpeakerManagerConfigTest::SetUp() {
+    ConfigurationNode::uninitialize();
+}
+
+void SpeakerManagerConfigTest::TearDown() {
+    ConfigurationNode::uninitialize();
+}
+
+bool SpeakerManagerConfigTest::configureJsonConfig(const char* jsonConfig) {
+    ConfigurationNode::uninitialize();
+    std::shared_ptr<std::istream> istr(new std::istringstream(jsonConfig));
+    return ConfigurationNode::initialize({istr});
+}
+
+/// Validate nothing breaks when config is missing.
+TEST_F(SpeakerManagerConfigTest, test_ValidateMissingConfig) {
+    ASSERT_TRUE(configureJsonConfig(JSON_TEST_CONFIG_MISSING));
+
+    SpeakerManagerConfig config;
+    bool persistentStorage;
+    bool restoreMuteState;
+    uint8_t minUnmuteVolume;
+    uint8_t defaultSpeakerVolume;
+    uint8_t defaultAlertsVolume;
+
+    ASSERT_FALSE(config.getPersistentStorage(persistentStorage));
+    ASSERT_FALSE(config.getRestoreMuteState(restoreMuteState));
+    ASSERT_FALSE(config.getMinUnmuteVolume(minUnmuteVolume));
+    ASSERT_FALSE(config.getDefaultSpeakerVolume(defaultSpeakerVolume));
+    ASSERT_FALSE(config.getDefaultAlertsVolume(defaultAlertsVolume));
+}
+
+/// Validate nothing breaks when config is empty.
+TEST_F(SpeakerManagerConfigTest, test_ValidateEmptyConfig) {
+    ASSERT_TRUE(configureJsonConfig(JSON_TEST_CONFIG_EMPTY));
+
+    SpeakerManagerConfig config;
+    bool persistentStorage;
+    bool restoreMuteState;
+    uint8_t minUnmuteVolume;
+    uint8_t defaultSpeakerVolume;
+    uint8_t defaultAlertsVolume;
+
+    ASSERT_FALSE(config.getPersistentStorage(persistentStorage));
+    ASSERT_FALSE(config.getRestoreMuteState(restoreMuteState));
+    ASSERT_FALSE(config.getMinUnmuteVolume(minUnmuteVolume));
+    ASSERT_FALSE(config.getDefaultSpeakerVolume(defaultSpeakerVolume));
+    ASSERT_FALSE(config.getDefaultAlertsVolume(defaultAlertsVolume));
+}
+
+/// Validate persistentVolume entry is read correctly.
+TEST_F(SpeakerManagerConfigTest, test_ValidatePersistentStorageConfig) {
+    ASSERT_TRUE(configureJsonConfig(JSON_TEST_CONFIG_PERSISTENT_STORAGE));
+
+    SpeakerManagerConfig config;
+    bool persistentStorage = false;
+    bool restoreMuteState;
+    uint8_t minUnmuteVolume;
+    uint8_t defaultSpeakerVolume;
+    uint8_t defaultAlertsVolume;
+
+    ASSERT_TRUE(config.getPersistentStorage(persistentStorage));
+    ASSERT_TRUE(persistentStorage);
+    ASSERT_FALSE(config.getRestoreMuteState(restoreMuteState));
+    ASSERT_FALSE(config.getMinUnmuteVolume(minUnmuteVolume));
+    ASSERT_FALSE(config.getDefaultSpeakerVolume(defaultSpeakerVolume));
+    ASSERT_FALSE(config.getDefaultAlertsVolume(defaultAlertsVolume));
+}
+
+/// Validate restoreMuteState entry is read correctly.
+TEST_F(SpeakerManagerConfigTest, test_ValidateRestoreMuteStateConfig) {
+    ASSERT_TRUE(configureJsonConfig(JSON_TEST_CONFIG_RESTORE_MUTE_STATE));
+
+    SpeakerManagerConfig config;
+    bool persistentStorage;
+    bool restoreMuteState = true;
+    uint8_t minUnmuteVolume;
+    uint8_t defaultSpeakerVolume;
+    uint8_t defaultAlertsVolume;
+
+    ASSERT_FALSE(config.getPersistentStorage(persistentStorage));
+    ASSERT_TRUE(config.getRestoreMuteState(restoreMuteState));
+    ASSERT_FALSE(restoreMuteState);
+    ASSERT_FALSE(config.getMinUnmuteVolume(minUnmuteVolume));
+    ASSERT_FALSE(config.getDefaultSpeakerVolume(defaultSpeakerVolume));
+    ASSERT_FALSE(config.getDefaultAlertsVolume(defaultAlertsVolume));
+}
+
+/// Validate minUnmuteVolume entry is read correctly.
+TEST_F(SpeakerManagerConfigTest, test_ValidateMinUnmuteVolumeConfig) {
+    ASSERT_TRUE(configureJsonConfig(JSON_TEST_CONFIG_MIN_UNMUTE_VOLUME));
+
+    SpeakerManagerConfig config;
+    bool persistentStorage;
+    bool restoreMuteState;
+    uint8_t minUnmuteVolume = 0;
+    uint8_t defaultSpeakerVolume;
+    uint8_t defaultAlertsVolume;
+
+    ASSERT_FALSE(config.getPersistentStorage(persistentStorage));
+    ASSERT_FALSE(config.getRestoreMuteState(restoreMuteState));
+    ASSERT_TRUE(config.getMinUnmuteVolume(minUnmuteVolume));
+    ASSERT_EQ(3u, minUnmuteVolume);
+    ASSERT_FALSE(config.getDefaultSpeakerVolume(defaultSpeakerVolume));
+    ASSERT_FALSE(config.getDefaultAlertsVolume(defaultAlertsVolume));
+}
+
+/// Validate defaultSpeakerVolume entry is read correctly.
+TEST_F(SpeakerManagerConfigTest, test_ValidateDefaultSpeakerVolumeConfig) {
+    ASSERT_TRUE(configureJsonConfig(JSON_TEST_CONFIG_DEFAULT_SPEAKER_VOLUME));
+
+    SpeakerManagerConfig config;
+    bool persistentStorage;
+    bool restoreMuteState;
+    uint8_t minUnmuteVolume;
+    uint8_t defaultSpeakerVolume = 0;
+    uint8_t defaultAlertsVolume;
+
+    ASSERT_FALSE(config.getPersistentStorage(persistentStorage));
+    ASSERT_FALSE(config.getRestoreMuteState(restoreMuteState));
+    ASSERT_FALSE(config.getMinUnmuteVolume(minUnmuteVolume));
+    ASSERT_TRUE(config.getDefaultSpeakerVolume(defaultSpeakerVolume));
+    ASSERT_EQ(5u, defaultSpeakerVolume);
+    ASSERT_FALSE(config.getDefaultAlertsVolume(defaultAlertsVolume));
+}
+
+/// Validate defaultAlertsVolume entry is read correctly.
+TEST_F(SpeakerManagerConfigTest, test_ValidateDefaultAlertsVolumeConfig) {
+    ASSERT_TRUE(configureJsonConfig(JSON_TEST_CONFIG_DEFAULT_ALERTS_VOLUME));
+
+    SpeakerManagerConfig config;
+    bool persistentStorage;
+    bool restoreMuteState;
+    uint8_t minUnmuteVolume;
+    uint8_t defaultSpeakerVolume;
+    uint8_t defaultAlertsVolume = 0;
+
+    ASSERT_FALSE(config.getPersistentStorage(persistentStorage));
+    ASSERT_FALSE(config.getRestoreMuteState(restoreMuteState));
+    ASSERT_FALSE(config.getMinUnmuteVolume(minUnmuteVolume));
+    ASSERT_FALSE(config.getDefaultSpeakerVolume(defaultSpeakerVolume));
+    ASSERT_TRUE(config.getDefaultAlertsVolume(defaultAlertsVolume));
+    ASSERT_EQ(6u, defaultAlertsVolume);
+}
+
+TEST_F(SpeakerManagerConfigTest, test_ValidateAllValues) {
+    ASSERT_TRUE(configureJsonConfig(JSON_TEST_CONFIG));
+
+    SpeakerManagerConfig config;
+    bool persistentStorage;
+    bool restoreMuteState;
+    uint8_t minUnmuteVolume;
+    uint8_t defaultSpeakerVolume;
+    uint8_t defaultAlertsVolume;
+
+    ASSERT_TRUE(config.getPersistentStorage(persistentStorage));
+    ASSERT_TRUE(persistentStorage);
+    ASSERT_TRUE(config.getRestoreMuteState(restoreMuteState));
+    ASSERT_TRUE(restoreMuteState);
+    ASSERT_TRUE(config.getMinUnmuteVolume(minUnmuteVolume));
+    ASSERT_EQ(3u, minUnmuteVolume);
+    ASSERT_TRUE(config.getDefaultSpeakerVolume(defaultSpeakerVolume));
+    ASSERT_EQ(5u, defaultSpeakerVolume);
+    ASSERT_TRUE(config.getDefaultAlertsVolume(defaultAlertsVolume));
+    ASSERT_EQ(6u, defaultAlertsVolume);
+}
+
+}  // namespace test
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/test/SpeakerManagerMiscStorageTest.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerMiscStorageTest.cpp
similarity index 95%
rename from CapabilityAgents/SpeakerManager/test/SpeakerManagerMiscStorageTest.cpp
rename to CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerMiscStorageTest.cpp
index b672df5a81..d0e2a6b9e5 100644
--- a/CapabilityAgents/SpeakerManager/test/SpeakerManagerMiscStorageTest.cpp
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerMiscStorageTest.cpp
@@ -13,30 +13,27 @@
  * permissions and limitations under the License.
  */
 
+#include <gmock/gmock.h>
 #include <memory>
 #include <vector>
 
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
 #include <AVSCommon/SDKInterfaces/SpeakerManagerObserverInterface.h>
-#include <SpeakerManager/SpeakerManagerConstants.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "SpeakerManager/SpeakerManagerMiscStorage.h"
+#include <acsdk/SpeakerManager/private/SpeakerManagerMiscStorage.h>
 
 namespace alexaClientSDK {
-namespace capabilityAgents {
 namespace speakerManager {
 namespace test {
 
 using namespace avsCommon::avs;
 using namespace avsCommon::avs::speakerConstants;
 using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::sdkInterfaces::storage;
-using namespace rapidjson;
 using namespace ::testing;
-using namespace alexaClientSDK::capabilityAgents::speakerManager;
 
-class MockMiscStorageInterface : public MiscStorageInterface {
+/// @addtogroup Test_acsdkSpeakerManager
+/// @{
+
+class MockMiscStorage : public storage::MiscStorageInterface {
 public:
     MOCK_METHOD0(createDatabase, bool());
     MOCK_METHOD0(open, bool());
@@ -71,6 +68,7 @@ static const std::string JSON_PAYLOAD =
     "  }"
     "}";
 
+/// @brief Test fixture for SpeakerManagerMiscStorage.
 class SpeakerManagerMiscStorageTest : public ::testing::TestWithParam<std::vector<ChannelVolumeInterface::Type>> {
 public:
     /// SetUp before each test.
@@ -81,11 +79,13 @@ class SpeakerManagerMiscStorageTest : public ::testing::TestWithParam<std::vecto
 
 protected:
     // Upstream interface mock
-    std::shared_ptr<NiceMock<MockMiscStorageInterface>> m_stubMiscStorage;
+    std::shared_ptr<NiceMock<MockMiscStorage>> m_stubMiscStorage;
 };
 
+/// @}
+
 void SpeakerManagerMiscStorageTest::SetUp() {
-    m_stubMiscStorage = std::make_shared<NiceMock<MockMiscStorageInterface>>();
+    m_stubMiscStorage = std::make_shared<NiceMock<MockMiscStorage>>();
 }
 
 void SpeakerManagerMiscStorageTest::TearDown() {
@@ -287,5 +287,4 @@ TEST_F(SpeakerManagerMiscStorageTest, test_parseJson) {
 
 }  // namespace test
 }  // namespace speakerManager
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
\ No newline at end of file
+}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerTest.cpp b/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerTest.cpp
new file mode 100644
index 0000000000..3a5590d445
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerTest.cpp
@@ -0,0 +1,2794 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <future>
+#include <gtest/gtest.h>
+#include <memory>
+#include <rapidjson/document.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
+#include <set>
+#include <vector>
+
+#include <acsdk/SpeakerManager/private/SpeakerManagerConstants.h>
+#include <acsdk/SpeakerManager/SpeakerManagerStorageInterface.h>
+#include <acsdk/SpeakerManager/private/SpeakerManager.h>
+#include <acsdk/SpeakerManager/test/MockSpeakerManagerConfig.h>
+#include <acsdk/SpeakerManager/test/MockSpeakerManagerObserver.h>
+#include <acsdk/SpeakerManager/test/MockSpeakerManagerStorage.h>
+#include <acsdk/Test/GmockExtensions.h>
+#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
+#include <AVSCommon/SDKInterfaces/MockChannelVolumeInterface.h>
+#include <AVSCommon/SDKInterfaces/MockContextManager.h>
+#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/SDKInterfaces/MockMessageSender.h>
+#include <AVSCommon/SDKInterfaces/MockSpeakerInterface.h>
+#include <AVSCommon/SDKInterfaces/SpeakerManagerObserverInterface.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/Metrics/MockMetricRecorder.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+namespace test {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::avs::attachment::test;
+using namespace avsCommon::avs::speakerConstants;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::sdkInterfaces::test;
+using namespace avsCommon::utils::memory;
+using namespace rapidjson;
+using namespace ::testing;
+
+/// @addtogroup Test_acsdkSpeakerManager
+/// @{
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// The @c MessageId identifer.
+static const auto MESSAGE_ID = "messageId";
+
+/// A @c SetVolume/AdjustVolume payload.
+static const auto VOLUME_PAYLOAD = R"(
+{
+  "volume":100
+}
+)";
+
+/// A @c SetMute payload.
+static const auto MUTE_PAYLOAD = R"(
+{
+  "mute": true
+}
+)";
+
+/// A @c SetMute payload to unmute.
+static const auto UNMUTE_PAYLOAD = R"(
+{
+  "mute": false
+}
+)";
+
+#ifdef ENABLE_MAXVOLUME_SETTING
+/// A valid value to be used as maximum volume limit.
+static const int8_t VALID_MAXIMUM_VOLUME_LIMIT = AVS_SET_VOLUME_MAX - 10;
+
+/// An invalid maximum volume limit value
+static const int8_t INVALID_MAXIMUM_VOLUME_LIMIT = AVS_SET_VOLUME_MAX + 10;
+#endif
+
+/// A valid delta to adjust the volume.
+static const int8_t VALID_VOLUME_ADJUSTMENT = 10;
+
+/**
+ * @brief Extend MockSpeakerManagerStorage with helpers.
+ */
+class MockSpeakerManagerStorageWithHelpers : public MockSpeakerManagerStorage {
+public:
+    /**
+     * Constructs object with default values and configures methods to return success.
+     */
+    MockSpeakerManagerStorageWithHelpers() {
+        setDefaults();
+        setSuccessMode();
+    }
+
+    /**
+     * @brief Sets default values for cached channels' values.
+     */
+    void setDefaults() {
+        m_state = {{AVS_SET_VOLUME_MIN, UNMUTE}, {AVS_SET_VOLUME_MIN, UNMUTE}};
+    }
+
+    /**
+     * @brief Configures mocked methods to load/store cached values.
+     */
+    void setSuccessMode() {
+        ON_CALL(*this, loadState(_)).WillByDefault(Invoke([this](SpeakerManagerStorageState& state) {
+            state = this->m_state;
+            return true;
+        }));
+        ON_CALL(*this, saveState(_)).WillByDefault(Invoke([this](const SpeakerManagerStorageState& state) {
+            this->m_state = state;
+            return true;
+        }));
+    }
+
+    /**
+     * @brief Configures mocked methods to fail.
+     */
+    void setFailureMode() {
+        ON_CALL(*this, loadState(_)).WillByDefault(Return(false));
+        ON_CALL(*this, saveState(_)).WillByDefault(Return(false));
+    }
+
+    /// @brief Cached values for channels.
+    SpeakerManagerStorageState m_state;
+};
+
+/**
+ * @brief Test fixture for SpeakerManager unit tests.
+ */
+class SpeakerManagerTest : public ::testing::TestWithParam<std::vector<ChannelVolumeInterface::Type>> {
+public:
+    /// SetUp before each test.
+    void SetUp();
+
+    /// TearDown after each test.
+    void TearDown();
+
+    /// CleanUp and reset the SpeakerManager.
+    void cleanUp();
+
+    /// Function to wait for @c m_wakeSetCompleteFuture to be set.
+    void wakeOnSetCompleted();
+
+    /// Helper function to get unique @c Type.
+    std::set<ChannelVolumeInterface::Type> getUniqueTypes(std::vector<std::shared_ptr<ChannelVolumeInterface>>& groups);
+
+#ifdef ENABLE_MAXVOLUME_SETTING
+    /**
+     * Helper function for create and sent a directive
+     *
+     * @param directiveName The directive name. One of SetVolume or AdjustVolume.
+     * @param volume The value of the volume files within the directive.
+     */
+    void createAndSendVolumeDirective(const std::string directiveName, const int8_t volume);
+#endif
+
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> createChannelVolumeInterfaces() {
+        auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+        channelVolumeInterface->DelegateToReal();
+        return {channelVolumeInterface};
+    }
+
+    /// A constructor which initializes the promises and futures needed for the test class.
+    SpeakerManagerTest() :
+            m_wakeSetCompletedPromise{},
+            m_wakeSetCompletedFuture{m_wakeSetCompletedPromise.get_future()} {
+    }
+
+protected:
+    /// Promise to synchronize directive handling through setCompleted.
+    std::promise<void> m_wakeSetCompletedPromise;
+
+    /// Future to synchronize directive handling through setCompleted.
+    std::future<void> m_wakeSetCompletedFuture;
+
+    /// The metric recorder.
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
+
+    /**
+     * Set this to a nice mock. The only instance of the mock being called is the setStateProvider member, which we
+     * explicitly test.
+     */
+    std::shared_ptr<NiceMock<MockContextManager>> m_mockContextManager;
+
+    /// Configuration interface mock.
+    std::shared_ptr<MockSpeakerManagerConfig> m_mockConfig;
+
+    /// Storage interface mock.
+    std::shared_ptr<MockSpeakerManagerStorageWithHelpers> m_mockStorage;
+
+    /// A strict mock that allows the test to strictly monitor the messages sent.
+    std::shared_ptr<StrictMock<MockMessageSender>> m_mockMessageSender;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<MockDirectiveHandlerResult>> m_mockDirectiveHandlerResult;
+
+    /// A mock to allow testing of the observer callback behavior.
+    std::shared_ptr<NiceMock<MockSpeakerManagerObserver>> m_observer;
+
+    /// A pointer to an instance of the SpeakerManager that will be instantiated per test.
+    std::shared_ptr<SpeakerManager> m_speakerManager;
+};
+
+/// @brief Test fixture for SpeakerManager.
+void SpeakerManagerTest::SetUp() {
+    m_mockConfig = std::make_shared<NiceMock<MockSpeakerManagerConfig>>();
+    m_mockStorage = std::make_shared<NiceMock<MockSpeakerManagerStorageWithHelpers>>();
+
+    m_metricRecorder = std::make_shared<NiceMock<avsCommon::utils::metrics::test::MockMetricRecorder>>();
+    m_mockContextManager = std::make_shared<NiceMock<MockContextManager>>();
+    m_mockMessageSender = std::make_shared<StrictMock<MockMessageSender>>();
+    m_mockExceptionSender = std::make_shared<StrictMock<MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult = make_unique<StrictMock<MockDirectiveHandlerResult>>();
+    m_observer = std::make_shared<NiceMock<MockSpeakerManagerObserver>>();
+}
+
+/// @}
+
+void SpeakerManagerTest::TearDown() {
+    if (m_speakerManager) {
+        m_speakerManager->shutdown();
+        m_speakerManager.reset();
+    }
+}
+
+void SpeakerManagerTest::wakeOnSetCompleted() {
+    m_wakeSetCompletedPromise.set_value();
+}
+
+/**
+ * Helper function to get unique @c Type from a vector of speakers.
+ */
+std::set<ChannelVolumeInterface::Type> SpeakerManagerTest::getUniqueTypes(
+    std::vector<std::shared_ptr<ChannelVolumeInterface>>& groups) {
+    std::set<ChannelVolumeInterface::Type> types;
+    for (auto item : groups) {
+        types.insert(item->getSpeakerType());
+    }
+    return types;
+}
+
+#ifdef ENABLE_MAXVOLUME_SETTING
+void SpeakerManagerTest::createAndSendVolumeDirective(const std::string directiveName, const int8_t volume) {
+    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
+        .Times(1)
+        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
+
+    static int id = 1;
+    const std::string messageId = MESSAGE_ID + std::to_string(id++);
+    std::string payload =
+        "{"
+        "\"volume\":" +
+        std::to_string(volume) + "}";
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_VOLUME.nameSpace, directiveName, messageId);
+
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, payload, attachmentManager, "");
+
+    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_speakerManager->CapabilityAgent::handleDirective(messageId);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+static int8_t getSpeakerVolume(std::shared_ptr<ChannelVolumeInterface> channelVolumeInterface) {
+    SpeakerInterface::SpeakerSettings speakerSettings;
+    channelVolumeInterface->getSpeakerSettings(&speakerSettings);
+    return speakerSettings.volume;
+}
+#endif
+
+/// Helper function to generate the VolumeState in JSON for the ContextManager.
+std::string generateVolumeStateJson(SpeakerInterface::SpeakerSettings settings) {
+    rapidjson::Document state(rapidjson::kObjectType);
+    state.AddMember(VOLUME_KEY, settings.volume, state.GetAllocator());
+    state.AddMember(MUTED_KEY, settings.mute, state.GetAllocator());
+
+    rapidjson::StringBuffer buffer;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+    if (!state.Accept(writer)) {
+        return "";
+    }
+
+    return buffer.GetString();
+}
+
+/**
+ * Tests creating the SpeakerManager with a null contextManager.
+ */
+TEST_F(SpeakerManagerTest, test_nullContextManager) {
+    auto channelVolumeInterfaces = createChannelVolumeInterfaces();
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        channelVolumeInterfaces,
+        nullptr,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    ASSERT_EQ(m_speakerManager, nullptr);
+}
+
+/**
+ * Tests creating the SpeakerManager with a null messageSender.
+ */
+TEST_F(SpeakerManagerTest, test_nullMessageSender) {
+    auto channelVolumeInterfaces = createChannelVolumeInterfaces();
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        channelVolumeInterfaces,
+        m_mockContextManager,
+        nullptr,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    ASSERT_EQ(m_speakerManager, nullptr);
+}
+
+/**
+ * Tests creating the SpeakerManager with a null exceptionSender.
+ */
+TEST_F(SpeakerManagerTest, test_nullExceptionSender) {
+    auto channelVolumeInterfaces = createChannelVolumeInterfaces();
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        channelVolumeInterfaces,
+        m_mockContextManager,
+        m_mockMessageSender,
+        nullptr,
+        m_metricRecorder);
+
+    ASSERT_EQ(m_speakerManager, nullptr);
+}
+
+/**
+ * Tests creating the SpeakerManager with no channelVolumeInterfaces.
+ */
+TEST_F(SpeakerManagerTest, test_noChannelVolumeInterfaces) {
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    ASSERT_NE(m_speakerManager, nullptr);
+}
+
+/**
+ * Tests that adding a channel volume interface does not overwrite existing default volume settings when persistent
+ * storage is enabled.
+ */
+TEST_F(SpeakerManagerTest, test_addChannelVolumeInterfaceDoesNotOverwriteDefaults) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    channelVolumeInterface->setUnduckedVolume(AVS_SET_VOLUME_MAX);
+    channelVolumeInterface->setMute(MUTE);
+
+    SpeakerInterface::SpeakerSettings settings;
+    ASSERT_TRUE(channelVolumeInterface->getSpeakerSettings(&settings));
+    ASSERT_EQ(settings.volume, AVS_SET_VOLUME_MAX);
+    ASSERT_EQ(settings.mute, MUTE);
+
+    m_speakerManager->addChannelVolumeInterface(channelVolumeInterface);
+    auto future = m_speakerManager->getSpeakerSettings(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, &settings);
+    ASSERT_TRUE(future.get());
+    ASSERT_EQ(settings.volume, AVS_SET_VOLUME_MIN);
+    ASSERT_EQ(settings.mute, UNMUTE);
+}
+
+/**
+ * Tests that the SpeakerManager initially provides the state at constructor time.
+ */
+TEST_F(SpeakerManagerTest, test_contextManagerSetStateConstructor) {
+    EXPECT_CALL(
+        *m_mockContextManager,
+        setState(VOLUME_STATE, generateVolumeStateJson(DEFAULT_SETTINGS), StateRefreshPolicy::NEVER, _))
+        .Times(Exactly(1));
+    auto groups = createChannelVolumeInterfaces();
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groups,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+}
+
+/**
+ * Test setVolume with a value that's under the bounds. The operation should fail.
+ */
+TEST_F(SpeakerManagerTest, test_setVolumeUnderBounds) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    // Expect call on initialization
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // Expect no more calls
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+    std::future<bool> future = m_speakerManager->setVolume(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MIN - 1, properties);
+    ASSERT_FALSE(future.get());
+}
+
+/**
+ * Test setVolume with a value that's under the bounds with persistent storage enabled. The operation should fail.
+ */
+TEST_F(SpeakerManagerTest, test_setVolumeUnderBoundsWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    // Expect call on initialization
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(1));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // Expect no more calls
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+    std::future<bool> future = m_speakerManager->setVolume(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MIN - 1, properties);
+    ASSERT_FALSE(future.get());
+}
+
+/**
+ * Test setVolume with a value that's over the bounds. The operation should fail.
+ */
+TEST_F(SpeakerManagerTest, test_setVolumeOverBounds) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    // Expect call on initialization.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // Expect no more calls.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+    std::future<bool> future = m_speakerManager->setVolume(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX + 1, properties);
+    ASSERT_FALSE(future.get());
+}
+
+/**
+ * Test setVolume with a value that's over the bounds with persistent storage enabled. The operation should fail.
+ */
+TEST_F(SpeakerManagerTest, test_setVolumeOverBoundsWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    // Expect call on initialization.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(1));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // Expect no more calls.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+    std::future<bool> future = m_speakerManager->setVolume(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX + 1, properties);
+    ASSERT_FALSE(future.get());
+}
+
+/**
+ * Test adjustVolume with a value that's under the bounds. The operation should fail.
+ */
+TEST_F(SpeakerManagerTest, test_adjustVolumeUnderBounds) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    // Expect call on initialization.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // Expect no more calls.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+
+    SpeakerManagerInterface::NotificationProperties properties;
+    std::future<bool> future = m_speakerManager->adjustVolume(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MIN - 1, properties);
+    ASSERT_FALSE(future.get());
+}
+
+/**
+ * Test adjustVolume with a value that's under the bounds with persistent storage enabled. The operation should fail.
+ */
+TEST_F(SpeakerManagerTest, test_adjustVolumeUnderBoundsWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    // Expect call on initialization.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(1));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // Expect no more calls.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+
+    SpeakerManagerInterface::NotificationProperties properties;
+    std::future<bool> future = m_speakerManager->adjustVolume(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MIN - 1, properties);
+    ASSERT_FALSE(future.get());
+}
+
+/**
+ * Test adjustVolume with a value that's over the bounds. The operation should fail.
+ */
+TEST_F(SpeakerManagerTest, test_adjustVolumeOverBounds) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+    // Expect call on initialization.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // Expect no more calls.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+    std::future<bool> future = m_speakerManager->adjustVolume(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX + 1, properties);
+    ASSERT_FALSE(future.get());
+}
+
+/**
+ * Test adjustVolume with a value that's over the bounds with persistent storage enabled. The operation should fail.
+ */
+TEST_F(SpeakerManagerTest, test_adjustVolumeOverBoundsWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+    // Expect call on initialization.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(1));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // Expect no more calls.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+    std::future<bool> future = m_speakerManager->adjustVolume(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX + 1, properties);
+    ASSERT_FALSE(future.get());
+}
+
+/**
+ * Test if one speaker is out of sync, getSpeakingSettings should return the cached value correctly.
+ */
+TEST_F(SpeakerManagerTest, test_getCachedSettings) {
+    // Prepare two speakers with the same type AVS_SPEAKER_VOLUME
+    auto channelVolumeInterface1 = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    auto channelVolumeInterface2 = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface1->DelegateToReal();
+    channelVolumeInterface2->DelegateToReal();
+    // Get speaker settings from the first speaker of each type during initialization.
+    EXPECT_CALL(*channelVolumeInterface1, getSpeakerSettings(_)).Times(Exactly(1));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface1, channelVolumeInterface2},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // If a speaker changes its volume and is out of sync with the rest speakers of the same type, querying speaker
+    // settings from SpeakerManager should return the cached volume correctly.
+    channelVolumeInterface2->setUnduckedVolume(AVS_SET_VOLUME_MAX);
+    channelVolumeInterface2->setMute(MUTE);
+    SpeakerInterface::SpeakerSettings settings;
+    std::future<bool> future =
+        m_speakerManager->getSpeakerSettings(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, &settings);
+    ASSERT_TRUE(future.get());
+    ASSERT_EQ(settings.volume, DEFAULT_SETTINGS.volume);
+    ASSERT_EQ(settings.mute, DEFAULT_SETTINGS.mute);
+
+    ASSERT_TRUE(channelVolumeInterface2->getSpeakerSettings(&settings));
+    ASSERT_EQ(settings.volume, AVS_SET_VOLUME_MAX);
+    ASSERT_EQ(settings.mute, MUTE);
+}
+
+/**
+ * Test adjustVolume when the adjusted volume is unchanged. Should not send an event.
+ */
+TEST_F(SpeakerManagerTest, test_eventNotSentWhenAdjustVolumeUnchanged) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    auto groupVec = std::vector<std::shared_ptr<ChannelVolumeInterface>>{channelVolumeInterface};
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // The test adjusts the volume by AVS_ADJUST_VOLUME_MIN, which results in the lowest volume possible.
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MIN, UNMUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings))
+            .Times(Exactly(1));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(0));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        std::future<bool> future = m_speakerManager->adjustVolume(type, AVS_ADJUST_VOLUME_MIN, properties);
+        ASSERT_TRUE(future.get());
+    }
+}
+
+/**
+ * Test adjustVolume when the adjusted volume is unchanged with persistent storage enabled. Should not send an event.
+ */
+TEST_F(SpeakerManagerTest, test_eventNotSentWhenAdjustVolumeUnchangedWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    auto groupVec = std::vector<std::shared_ptr<ChannelVolumeInterface>>{channelVolumeInterface};
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // The test adjusts the volume by AVS_ADJUST_VOLUME_MIN, which results in the lowest volume possible.
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MIN, UNMUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings))
+            .Times(Exactly(1));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(0));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        std::future<bool> future = m_speakerManager->adjustVolume(type, AVS_ADJUST_VOLUME_MIN, properties);
+        ASSERT_TRUE(future.get());
+    }
+}
+
+/**
+ * Test setVolume when the new volume is unchanged. Should not send an event.
+ */
+TEST_F(SpeakerManagerTest, test_eventNotSentWhenSetVolumeUnchanged) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(AVS_SET_VOLUME_MIN)).Times(Exactly(1));
+
+    auto groupVec = std::vector<std::shared_ptr<ChannelVolumeInterface>>{channelVolumeInterface};
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MIN, UNMUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings))
+            .Times(Exactly(1));
+        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(0));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        std::future<bool> future = m_speakerManager->setVolume(type, AVS_SET_VOLUME_MIN, properties);
+        ASSERT_TRUE(future.get());
+    }
+}
+
+/**
+ * Test setVolume when the new volume is unchanged with persistent storage enabled. Should not send an event.
+ */
+TEST_F(SpeakerManagerTest, test_eventNotSentWhenSetVolumeUnchangedWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(AVS_SET_VOLUME_MIN)).Times(Exactly(2));
+
+    auto groupVec = std::vector<std::shared_ptr<ChannelVolumeInterface>>{channelVolumeInterface};
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MIN, UNMUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings))
+            .Times(Exactly(1));
+        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(0));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        std::future<bool> future = m_speakerManager->setVolume(type, AVS_SET_VOLUME_MIN, properties);
+        ASSERT_TRUE(future.get());
+    }
+}
+
+/**
+ * Test getConfiguration and ensure that all directives are handled.
+ */
+TEST_F(SpeakerManagerTest, test_getConfiguration) {
+    auto channelVolumeInterfaceVec = createChannelVolumeInterfaces();
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        channelVolumeInterfaceVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    auto configuration = m_speakerManager->getConfiguration();
+    auto neitherNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUMS_NONE, false);
+    ASSERT_EQ(configuration[SET_VOLUME], neitherNonBlockingPolicy);
+    ASSERT_EQ(configuration[ADJUST_VOLUME], neitherNonBlockingPolicy);
+    ASSERT_EQ(configuration[SET_MUTE], neitherNonBlockingPolicy);
+}
+
+/**
+ * Test that adding duplicated ChannelVolumeInterface instances in the SpeakerManager works correctly.
+ */
+TEST_F(SpeakerManagerTest, test_addDuplicatedChannelVolumeInterfaces) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> channelVolumeInterfaceVec = {channelVolumeInterface,
+                                                                                      channelVolumeInterface};
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        channelVolumeInterfaceVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+    SpeakerManagerInterface::NotificationProperties properties;
+    std::future<bool> future = m_speakerManager->adjustVolume(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX, properties);
+    ASSERT_TRUE(future.get());
+}
+
+/**
+ * Test that adding a null observer does not cause any errors in the SpeakerManager.
+ */
+TEST_F(SpeakerManagerTest, test_addNullObserver) {
+    auto channelVolumeInterfaceVec = createChannelVolumeInterfaces();
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        channelVolumeInterfaceVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+    m_speakerManager->addSpeakerManagerObserver(nullptr);
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(2));
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    m_speakerManager->setVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX, properties)
+        .wait();
+    m_speakerManager->adjustVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX, properties)
+        .wait();
+    m_speakerManager->setMute(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, MUTE, properties).wait();
+    m_speakerManager->onExternalSpeakerSettingsUpdate(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, {AVS_SET_VOLUME_MAX, MUTE}, properties);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Test that removing an observer works correctly.
+ */
+TEST_F(SpeakerManagerTest, test_removeSpeakerManagerObserver) {
+    auto channelVolumeInterfaceVec = createChannelVolumeInterfaces();
+
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(2));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        channelVolumeInterfaceVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    m_speakerManager->removeSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    m_speakerManager->setVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX, properties)
+        .wait();
+    m_speakerManager->adjustVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX, properties)
+        .wait();
+    m_speakerManager->setMute(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, MUTE, properties).wait();
+    m_speakerManager->onExternalSpeakerSettingsUpdate(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, {AVS_SET_VOLUME_MAX, MUTE}, properties);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Test that removing a null observer does not cause any errors in the SpeakerManager.
+ */
+TEST_F(SpeakerManagerTest, test_removeNullObserver) {
+    auto channelVolumeInterfaceVec = createChannelVolumeInterfaces();
+
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(2));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        channelVolumeInterfaceVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+    m_speakerManager->removeSpeakerManagerObserver(nullptr);
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    m_speakerManager->setVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX, properties)
+        .wait();
+    m_speakerManager->adjustVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX, properties)
+        .wait();
+    m_speakerManager->setMute(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, MUTE, properties).wait();
+    m_speakerManager->onExternalSpeakerSettingsUpdate(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, {AVS_SET_VOLUME_MAX, MUTE}, properties);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Test retry logic for SetVolume on speaker type AVS_SPEAKER_VOLUME. Returning false once for speaker->setVolume()
+ * triggers retry and when successful returns the future of value true.
+ */
+TEST_F(SpeakerManagerTest, test_retryAndApplySettingsForSetVolume) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    auto retryTimes = 0;
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).WillRepeatedly(InvokeWithoutArgs([&retryTimes] {
+        return retryTimes++ > 0;
+    }));
+
+    SpeakerManagerInterface::NotificationProperties properties;
+    std::future<bool> future =
+        m_speakerManager->setVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MIN, properties);
+    ASSERT_TRUE(future.get());
+}
+
+/**
+ * Test retry logic for AdjustVolume on speakers of type AVS_SPEAKER_VOLUME. Return false once for the second speaker
+ * during adjustVolume() to trigger a retry. The delta should not be applied again to the first speaker during retry.
+ */
+TEST_F(SpeakerManagerTest, test_retryAndApplySettingsForAdjustVolume) {
+    auto channelVolumeInterface1 = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    auto channelVolumeInterface2 = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface1->DelegateToReal();
+    channelVolumeInterface2->DelegateToReal();
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface1, channelVolumeInterface2},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    auto retryTimes = 0;
+    EXPECT_CALL(*channelVolumeInterface2, setUnduckedVolume(_)).WillRepeatedly(InvokeWithoutArgs([&retryTimes] {
+        return retryTimes++ > 0;
+    }));
+
+    // Expect volumeChanged event.
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+    std::future<bool> future = m_speakerManager->adjustVolume(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+        VALID_VOLUME_ADJUSTMENT,
+        SpeakerManagerInterface::NotificationProperties());
+    ASSERT_TRUE(future.get());
+
+    SpeakerInterface::SpeakerSettings settings1;
+    ASSERT_TRUE(channelVolumeInterface1->getSpeakerSettings(&settings1));
+    ASSERT_EQ(settings1.volume, DEFAULT_SETTINGS.volume + VALID_VOLUME_ADJUSTMENT);
+
+    SpeakerInterface::SpeakerSettings speakerSettings;
+    std::future<bool> settingsFuture =
+        m_speakerManager->getSpeakerSettings(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, &speakerSettings);
+    ASSERT_TRUE(settingsFuture.get());
+    ASSERT_EQ(speakerSettings.volume, DEFAULT_SETTINGS.volume + VALID_VOLUME_ADJUSTMENT);
+}
+
+/**
+ * Test retry logic for SetMute on speaker type AVS_SPEAKER_VOLUME. Returning false once for speaker->setMute()
+ * triggers retry and when successful returns the future of value true.
+ */
+TEST_F(SpeakerManagerTest, test_retryAndApplySettingsForSetMute) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    auto retryTimes = 0;
+    EXPECT_CALL(*channelVolumeInterface, setMute(_)).WillRepeatedly(InvokeWithoutArgs([&retryTimes] {
+        return retryTimes++ > 0;
+    }));
+
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    std::future<bool> future =
+        m_speakerManager->setMute(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, MUTE, properties);
+    ASSERT_TRUE(future.get());
+}
+
+/**
+ * Test retryAndApplySettings() failure for setVolume, adjustVolume and setMute on speaker type AVS_SPEAKER_VOLUME.
+ * Repeatedly returning false for adjustVolume() and setMute() to trigger retries. After retrying maximum times,
+ * returning the future of false.
+ */
+TEST_F(SpeakerManagerTest, test_retryAndApplySettingsFails) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).WillRepeatedly(Return(false));
+    EXPECT_CALL(*channelVolumeInterface, setMute(_)).WillRepeatedly(Return(false));
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(0);
+
+    std::future<bool> setVolumeResult = m_speakerManager->setVolume(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+        AVS_SET_VOLUME_MIN,
+        SpeakerManagerInterface::NotificationProperties());
+    ASSERT_FALSE(setVolumeResult.get());
+
+    std::future<bool> adjustVolumeResult = m_speakerManager->adjustVolume(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+        VALID_VOLUME_ADJUSTMENT,
+        SpeakerManagerInterface::NotificationProperties());
+    ASSERT_FALSE(adjustVolumeResult.get());
+
+    std::future<bool> setMuteResult = m_speakerManager->setMute(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, MUTE, SpeakerManagerInterface::NotificationProperties());
+    ASSERT_FALSE(setMuteResult.get());
+
+    SpeakerInterface::SpeakerSettings speakerSettings;
+    std::future<bool> settingsFuture =
+        m_speakerManager->getSpeakerSettings(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, &speakerSettings);
+    ASSERT_TRUE(settingsFuture.get());
+    ASSERT_EQ(speakerSettings.volume, DEFAULT_SETTINGS.volume);
+    ASSERT_EQ(speakerSettings.mute, DEFAULT_SETTINGS.mute);
+}
+
+#ifdef ENABLE_MAXVOLUME_SETTING
+/**
+ * Test that setting a maximum volume limit succeeds and a local call to setVolume or adjustVolume will
+ * completely fail.
+ */
+TEST_F(SpeakerManagerTest, test_setMaximumVolumeLimit) {
+    auto avsChannelVolumeInterface =
+        std::make_shared<NiceMock<MockChannelVolumeInterface>>(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
+    avsChannelVolumeInterface->DelegateToReal();
+    auto alertsChannelVolumeInterface =
+        std::make_shared<NiceMock<MockChannelVolumeInterface>>(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
+    alertsChannelVolumeInterface->DelegateToReal();
+
+    avsChannelVolumeInterface->setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT - 1);
+    alertsChannelVolumeInterface->setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT - 1);
+
+    // Expect volumeChanged event.
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+    EXPECT_CALL(*avsChannelVolumeInterface, setUnduckedVolume(_)).Times(AtLeast(1));
+    EXPECT_CALL(*alertsChannelVolumeInterface, setUnduckedVolume(_)).Times(AtLeast(1));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(0);
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {avsChannelVolumeInterface, alertsChannelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    EXPECT_TRUE(m_speakerManager->setMaximumVolumeLimit(VALID_MAXIMUM_VOLUME_LIMIT).get());
+
+    // Local change either with setVolume will set to limit but with adjustVolume will fail
+    EXPECT_TRUE(
+        m_speakerManager
+            ->setVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, VALID_MAXIMUM_VOLUME_LIMIT + 1, properties)
+            .get());
+    EXPECT_FALSE(
+        m_speakerManager
+            ->adjustVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, VALID_MAXIMUM_VOLUME_LIMIT + 1, properties)
+            .get());
+
+    // The volume went to upper limit.
+    EXPECT_EQ(getSpeakerVolume(avsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
+    EXPECT_EQ(getSpeakerVolume(alertsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
+
+    // Increase the volume by 2, so end result will exceed the limit.
+    EXPECT_TRUE(m_speakerManager->adjustVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, 2, properties).get());
+
+    // Following the 2nd adjustVolume, the volume will change to the limit.
+    EXPECT_EQ(getSpeakerVolume(alertsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
+}
+
+/**
+ * Test that if a new limit was set while the volume was higher than the new limit, operation will succeed and the
+ * volume will be decreased.
+ */
+
+TEST_F(SpeakerManagerTest, testSetMaximumVolumeLimitWhileVolumeIsHigher) {
+    auto avsChannelVolumeInterface =
+        std::make_shared<NiceMock<MockChannelVolumeInterface>>(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
+    auto alertsChannelVolumeInterface =
+        std::make_shared<NiceMock<MockChannelVolumeInterface>>(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
+
+    avsChannelVolumeInterface->DelegateToReal();
+    alertsChannelVolumeInterface->DelegateToReal();
+
+    EXPECT_TRUE(avsChannelVolumeInterface->setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT + 1));
+    EXPECT_TRUE(alertsChannelVolumeInterface->setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT + 1));
+
+    EXPECT_CALL(*avsChannelVolumeInterface, setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT)).Times(1);
+    EXPECT_CALL(*alertsChannelVolumeInterface, setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT)).Times(1);
+
+    // Expect volumeChanged event.
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {avsChannelVolumeInterface, alertsChannelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    EXPECT_TRUE(m_speakerManager->setMaximumVolumeLimit(VALID_MAXIMUM_VOLUME_LIMIT).get());
+
+    EXPECT_EQ(getSpeakerVolume(avsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
+    EXPECT_EQ(getSpeakerVolume(alertsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
+}
+
+/**
+ * Test that SetVolume directive with volume > limit should set the volume to the limit
+ */
+
+TEST_F(SpeakerManagerTest, testAVSSetVolumeHigherThanLimit) {
+    avsCommon::utils::logger::getConsoleLogger()->setLevel(avsCommon::utils::logger::Level::DEBUG9);
+    auto avsChannelVolumeInterface =
+        std::make_shared<NiceMock<MockChannelVolumeInterface>>(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
+    auto alertsChannelVolumeInterface =
+        std::make_shared<NiceMock<MockChannelVolumeInterface>>(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
+
+    avsChannelVolumeInterface->DelegateToReal();
+    alertsChannelVolumeInterface->DelegateToReal();
+
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+
+    EXPECT_TRUE(avsChannelVolumeInterface->setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT - 1));
+    EXPECT_TRUE(alertsChannelVolumeInterface->setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT - 1));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {avsChannelVolumeInterface, alertsChannelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    EXPECT_TRUE(m_speakerManager->setMaximumVolumeLimit(VALID_MAXIMUM_VOLUME_LIMIT).get());
+
+    createAndSendVolumeDirective(SET_VOLUME.name, VALID_MAXIMUM_VOLUME_LIMIT + 1);
+
+    ASSERT_EQ(getSpeakerVolume(avsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
+    ASSERT_EQ(getSpeakerVolume(alertsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
+}
+
+/**
+ * Test that a call to @c setMaximumVolumeLimit with invalid value fails.
+ */
+TEST_F(SpeakerManagerTest, testSetMaximumVolumeLimitWithInvalidValue) {
+    auto avsChannelVolumeInterface = createChannelVolumeInterfaces();
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        avsChannelVolumeInterface,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    EXPECT_FALSE(m_speakerManager->setMaximumVolumeLimit(INVALID_MAXIMUM_VOLUME_LIMIT).get());
+}
+#endif
+
+/**
+ * Create different combinations of @c Type for  parameterized tests (TEST_P).
+ */
+INSTANTIATE_TEST_CASE_P(
+    Parameterized,
+    SpeakerManagerTest,
+    // clang-format off
+    ::testing::Values(
+        std::vector<ChannelVolumeInterface::Type>{
+            ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME
+        },
+        std::vector<ChannelVolumeInterface::Type>{
+            ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME
+        },
+        std::vector<ChannelVolumeInterface::Type>{
+            ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+            ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME
+        },
+        std::vector<ChannelVolumeInterface::Type>{
+            ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME,
+            ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME,
+        },
+        std::vector<ChannelVolumeInterface::Type>{
+            ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+            ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME,
+            ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+            ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME
+        }));
+// clang-format on
+
+/**
+ * Parameterized test for setVolume. One event should be sent if an AVS_SPEAKER_VOLUME typed speaker is modified.
+ */
+TEST_P(SpeakerManagerTest, test_setVolume) {
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        EXPECT_CALL(*group, setUnduckedVolume(_)).Times(Exactly(0));
+        EXPECT_CALL(*group, setUnduckedVolume(AVS_SET_VOLUME_MAX)).Times(Exactly(1));
+        groupVec.push_back(group);
+    }
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties(SpeakerManagerObserverInterface::Source::DIRECTIVE);
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, type, expectedSettings))
+            .Times(Exactly(1));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        std::future<bool> future = m_speakerManager->setVolume(type, AVS_SET_VOLUME_MAX, properties);
+        ASSERT_TRUE(future.get());
+    }
+}
+
+/**
+ * Parameterized test for setVolume with persistent storage enabled. One event should be sent if an AVS_SPEAKER_VOLUME
+ * typed speaker is modified.
+ */
+TEST_P(SpeakerManagerTest, test_setVolumeWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        EXPECT_CALL(*group, setUnduckedVolume(_)).Times(Exactly(1));
+        EXPECT_CALL(*group, setUnduckedVolume(AVS_SET_VOLUME_MAX)).Times(Exactly(1));
+        groupVec.push_back(group);
+    }
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties(SpeakerManagerObserverInterface::Source::DIRECTIVE);
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, type, expectedSettings))
+            .Times(Exactly(1));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        std::future<bool> future = m_speakerManager->setVolume(type, AVS_SET_VOLUME_MAX, properties);
+        ASSERT_TRUE(future.get());
+    }
+}
+
+/**
+ * Parameterized test for onExternalSpeakerSettingsUpdate. One event should be sent if an AVS_SPEAKER_VOLUME typed
+ * speaker is modified.
+ */
+TEST_P(SpeakerManagerTest, test_onExternalSpeakerSettingsUpdate) {
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        groupVec.push_back(group);
+    }
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings))
+            .Times(Exactly(1));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        m_speakerManager->onExternalSpeakerSettingsUpdate(type, expectedSettings, properties);
+        m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+    }
+}
+
+/**
+ * Parameterized test for onExternalSpeakerSettingsUpdate with persistent storage enabled. One event should be sent if
+ * an AVS_SPEAKER_VOLUME typed speaker is modified.
+ */
+TEST_P(SpeakerManagerTest, test_onExternalSpeakerSettingsUpdateWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        groupVec.push_back(group);
+    }
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings))
+            .Times(Exactly(1));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        m_speakerManager->onExternalSpeakerSettingsUpdate(type, expectedSettings, properties);
+        m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+    }
+}
+
+/**
+ * Test onExternalSpeakerSettingsUpdate when the new volume is unchanged. Should not send an event.
+ */
+TEST_F(SpeakerManagerTest, test_eventNotSentWhenOnExternalSpeakerSettingsUpdateUnchanged) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+    // expect call during initialization
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(AVS_SET_VOLUME_MIN)).Times(Exactly(0));
+
+    auto groupVec = std::vector<std::shared_ptr<ChannelVolumeInterface>>{channelVolumeInterface};
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MIN, UNMUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings))
+            .Times(Exactly(1));
+        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(0));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        m_speakerManager->onExternalSpeakerSettingsUpdate(type, expectedSettings, properties);
+        m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+    }
+}
+
+/**
+ * Test onExternalSpeakerSettingsUpdate when the new volume is unchanged with persistent storage enabled. Should not
+ * send an event.
+ */
+TEST_F(SpeakerManagerTest, test_eventNotSentWhenOnExternalSpeakerSettingsUpdateUnchangedWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+    // expect call during initialization
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(AVS_SET_VOLUME_MIN)).Times(Exactly(1));
+
+    auto groupVec = std::vector<std::shared_ptr<ChannelVolumeInterface>>{channelVolumeInterface};
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MIN, UNMUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings))
+            .Times(Exactly(1));
+        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(0));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        m_speakerManager->onExternalSpeakerSettingsUpdate(type, expectedSettings, properties);
+        m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+    }
+}
+
+/**
+ * Test onExternalSpeakerSettingsUpdate with a value that's under the bounds. The operation should fail.
+ */
+TEST_F(SpeakerManagerTest, test_onExternalSpeakerSettingsUpdateUnderBounds) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    // Expect call on initialization
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // Expect calls with volume set to minimum
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+    m_speakerManager->onExternalSpeakerSettingsUpdate(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, {AVS_SET_VOLUME_MIN - 1, MUTE}, properties);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+
+    SpeakerInterface::SpeakerSettings settings;
+    // Query SpeakerMananger for speaker settings
+    auto future = m_speakerManager->getSpeakerSettings(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, &settings);
+    ASSERT_TRUE(future.get());
+    ASSERT_EQ(settings.volume, AVS_SET_VOLUME_MIN);
+    ASSERT_EQ(settings.mute, MUTE);
+}
+
+/**
+ * Test onExternalSpeakerSettingsUpdate with a value that's under the bounds with persistent storage enabled.
+ * The operation should fail.
+ */
+TEST_F(SpeakerManagerTest, test_onExternalSpeakerSettingsUpdateUnderBoundsWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    // Expect call on initialization
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(1));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // Expect calls with volume set to minimum
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+    m_speakerManager->onExternalSpeakerSettingsUpdate(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, {AVS_SET_VOLUME_MIN - 1, MUTE}, properties);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+
+    SpeakerInterface::SpeakerSettings settings;
+    // Query SpeakerMananger for speaker settings
+    auto future = m_speakerManager->getSpeakerSettings(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, &settings);
+    ASSERT_TRUE(future.get());
+    ASSERT_EQ(settings.volume, AVS_SET_VOLUME_MIN);
+    ASSERT_EQ(settings.mute, MUTE);
+}
+
+/**
+ * Test onExternalSpeakerSettingsUpdate with a value that's over the bounds. The operation should fail.
+ */
+TEST_F(SpeakerManagerTest, test_onExternalSpeakerSettingsUpdateOverBounds) {
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    // Expect call on initialization.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // Expect no more calls.
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+    m_speakerManager->onExternalSpeakerSettingsUpdate(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, {AVS_SET_VOLUME_MAX + 1, UNMUTE}, properties);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+
+    SpeakerInterface::SpeakerSettings settings;
+    // Query SpeakerMananger for speaker settings
+    auto future = m_speakerManager->getSpeakerSettings(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, &settings);
+    ASSERT_TRUE(future.get());
+    ASSERT_EQ(settings.volume, AVS_SET_VOLUME_MAX);
+    ASSERT_EQ(settings.mute, UNMUTE);
+}
+
+/**
+ * Test onExternalSpeakerSettingsUpdate with a value that's over the bounds with persistent storage enabled. The
+ * operation should fail.
+ */
+TEST_F(SpeakerManagerTest, test_onExternalSpeakerSettingsUpdateOverBoundsWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
+    channelVolumeInterface->DelegateToReal();
+
+    // Expect call on initialization.
+    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(1));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        {channelVolumeInterface},
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // Expect no more calls.
+    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties;
+    m_speakerManager->onExternalSpeakerSettingsUpdate(
+        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, {AVS_SET_VOLUME_MAX + 1, UNMUTE}, properties);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+
+    SpeakerInterface::SpeakerSettings settings;
+    // Query SpeakerMananger for speaker settings
+    auto future = m_speakerManager->getSpeakerSettings(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, &settings);
+    ASSERT_TRUE(future.get());
+    ASSERT_EQ(settings.volume, AVS_SET_VOLUME_MAX);
+    ASSERT_EQ(settings.mute, UNMUTE);
+}
+
+/**
+ * Parameterized test for adjustVolume. One event should be sent if an AVS_SPEAKER_VOLUME typed speaker is modified.
+ */
+TEST_P(SpeakerManagerTest, test_adjustVolume) {
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        groupVec.push_back(group);
+    }
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // The test adjusts the volume by AVS_ADJUST_VOLUME_MAX, which results in the lowest volume possible.
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties(SpeakerManagerObserverInterface::Source::DIRECTIVE);
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, type, expectedSettings))
+            .Times(Exactly(1));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        std::future<bool> future = m_speakerManager->adjustVolume(type, AVS_ADJUST_VOLUME_MAX, properties);
+        ASSERT_TRUE(future.get());
+    }
+}
+
+/**
+ * Parameterized test for adjustVolume with persistent storage enabled. One event should be sent if an
+ * AVS_SPEAKER_VOLUME typed speaker is modified.
+ */
+TEST_P(SpeakerManagerTest, test_adjustVolumeWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        groupVec.push_back(group);
+    }
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    // The test adjusts the volume by AVS_ADJUST_VOLUME_MAX, which results in the lowest volume possible.
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties(SpeakerManagerObserverInterface::Source::DIRECTIVE);
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, type, expectedSettings))
+            .Times(Exactly(1));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        std::future<bool> future = m_speakerManager->adjustVolume(type, AVS_ADJUST_VOLUME_MAX, properties);
+        ASSERT_TRUE(future.get());
+    }
+}
+
+/**
+ * Parameterized test for setMute. One event should be sent if an AVS_SPEAKER_VOLUME typed speaker is modified.
+ */
+TEST_P(SpeakerManagerTest, test_setMute) {
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        EXPECT_CALL(*group, setMute(_)).Times(Exactly(0));
+        EXPECT_CALL(*group, setMute(MUTE)).Times(Exactly(1));
+        groupVec.push_back(group);
+    }
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    SpeakerInterface::SpeakerSettings expectedSettings{DEFAULT_SETTINGS.volume, MUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties(SpeakerManagerObserverInterface::Source::DIRECTIVE);
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, type, expectedSettings))
+            .Times(Exactly(1));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        std::future<bool> future = m_speakerManager->setMute(type, MUTE, properties);
+        ASSERT_TRUE(future.get());
+    }
+}
+
+/**
+ * Parameterized test for setMute with persistent storage enabled. One event should be sent if an AVS_SPEAKER_VOLUME
+ * typed speaker is modified.
+ */
+TEST_P(SpeakerManagerTest, test_setMuteWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        EXPECT_CALL(*group, setMute(_)).Times(Exactly(1));
+        EXPECT_CALL(*group, setMute(MUTE)).Times(Exactly(1));
+        groupVec.push_back(group);
+    }
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    SpeakerInterface::SpeakerSettings expectedSettings{DEFAULT_SETTINGS.volume, MUTE};
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties(SpeakerManagerObserverInterface::Source::DIRECTIVE);
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, type, expectedSettings))
+            .Times(Exactly(1));
+        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
+            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
+            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
+                .Times(AnyNumber());
+            EXPECT_CALL(
+                *m_mockContextManager,
+                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+                .Times(Exactly(1));
+        }
+
+        std::future<bool> future = m_speakerManager->setMute(type, MUTE, properties);
+        ASSERT_TRUE(future.get());
+    }
+}
+
+/**
+ * Parameterized test for getSpeakerSettings. Operation should succeed with default speaker settings.
+ */
+TEST_P(SpeakerManagerTest, test_getSpeakerSettings) {
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+    std::set<ChannelVolumeInterface::Type> uniqueTypes;
+
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+
+        // There should be one call to getSpeakerSettings for the first speaker of each type.
+        if (uniqueTypes.find(typeOfSpeaker) == uniqueTypes.end()) {
+            EXPECT_CALL(*group, getSpeakerSettings(_)).Times(AtLeast(1));
+            uniqueTypes.insert(typeOfSpeaker);
+        }
+
+        groupVec.push_back(group);
+    }
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+
+    for (auto speaker : groupVec) {
+        // SpeakerManager attempts to cache speaker settings initially. No getSpeakerSettings() call should be made to
+        // each speaker.
+        auto mockSpeaker = std::dynamic_pointer_cast<NiceMock<MockChannelVolumeInterface>>(speaker);
+        ASSERT_TRUE(mockSpeaker);
+        EXPECT_CALL(*mockSpeaker, getSpeakerSettings(_)).Times(0);
+    }
+
+    for (auto type : uniqueTypes) {
+        SpeakerInterface::SpeakerSettings settings;
+        // Query SpeakerMananger for speaker settings, value should be cached and not queried from each speaker.
+        std::future<bool> future = m_speakerManager->getSpeakerSettings(type, &settings);
+        ASSERT_TRUE(future.get());
+        ASSERT_EQ(settings.volume, DEFAULT_SETTINGS.volume);
+        ASSERT_EQ(settings.mute, DEFAULT_SETTINGS.mute);
+    }
+}
+
+/**
+ * Tests SetVolume Directive. Expect that the volume is unmuted and set, as well at most one
+ * event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
+ * In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
+ */
+TEST_P(SpeakerManagerTest, test_setVolumeDirective) {
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+    int eventsSent = 0;
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
+
+    // Create Speaker objects.
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        int timesCalled = 0;
+        if (typeOfSpeaker == ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME) {
+            timesCalled = 1;
+        }
+
+        SpeakerInterface::SpeakerSettings temp;
+        group->getSpeakerSettings(&temp);
+        if (temp.mute) {
+            EXPECT_CALL(*group, setMute(_)).Times(Exactly(1));
+            EXPECT_CALL(*group, setMute(UNMUTE)).Times(Exactly(timesCalled));
+        }
+        EXPECT_CALL(*group, setUnduckedVolume(_)).Times(Exactly(0));
+        EXPECT_CALL(*group, setUnduckedVolume(AVS_SET_VOLUME_MAX)).Times(Exactly(timesCalled));
+
+        groupVec.push_back(group);
+    }
+
+    auto uniqueTypes = getUniqueTypes(groupVec);
+
+    // Creation expectations based on type.
+    if (uniqueTypes.count(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME)) {
+        eventsSent = 1;
+
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(
+                SpeakerManagerObserverInterface::Source::DIRECTIVE,
+                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+                expectedSettings))
+            .Times(Exactly(1));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
+        EXPECT_CALL(
+            *m_mockContextManager,
+            setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+            .Times(Exactly(1));
+    } else {
+        EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(Exactly(0));
+    }
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(eventsSent));
+    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
+        .Times(1)
+        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_VOLUME.nameSpace, SET_VOLUME.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, VOLUME_PAYLOAD, attachmentManager, "");
+
+    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests SetVolume Directive with persistent storage enabled. Expect that the volume is unmuted and set, as well at most
+ * one event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
+ * In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
+ */
+TEST_P(SpeakerManagerTest, test_setVolumeDirectiveWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+    int eventsSent = 0;
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
+
+    // Create Speaker objects.
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        int timesCalled = 0;
+        if (typeOfSpeaker == ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME) {
+            timesCalled = 1;
+        }
+
+        SpeakerInterface::SpeakerSettings temp;
+        group->getSpeakerSettings(&temp);
+        if (temp.mute) {
+            EXPECT_CALL(*group, setMute(_)).Times(Exactly(1));
+            EXPECT_CALL(*group, setMute(UNMUTE)).Times(Exactly(timesCalled));
+        }
+        EXPECT_CALL(*group, setUnduckedVolume(_)).Times(Exactly(1));
+        EXPECT_CALL(*group, setUnduckedVolume(AVS_SET_VOLUME_MAX)).Times(Exactly(timesCalled));
+
+        groupVec.push_back(group);
+    }
+
+    auto uniqueTypes = getUniqueTypes(groupVec);
+
+    // Creation expectations based on type.
+    if (uniqueTypes.count(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME)) {
+        eventsSent = 1;
+
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(
+                SpeakerManagerObserverInterface::Source::DIRECTIVE,
+                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+                expectedSettings))
+            .Times(Exactly(1));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
+        EXPECT_CALL(
+            *m_mockContextManager,
+            setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+            .Times(Exactly(1));
+    } else {
+        EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(Exactly(0));
+    }
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(eventsSent));
+    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
+        .Times(1)
+        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_VOLUME.nameSpace, SET_VOLUME.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, VOLUME_PAYLOAD, attachmentManager, "");
+
+    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests AdjustVolume Directive. Expect that the volume is unmuted and adjusted, as well at most one
+ * event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
+ * In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
+ */
+TEST_P(SpeakerManagerTest, test_adjustVolumeDirective) {
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+    int eventsSent = 0;
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
+
+    // Create Speaker objects.
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        int timesCalled = 0;
+        if (typeOfSpeaker == ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME) {
+            timesCalled = 1;
+        }
+
+        SpeakerInterface::SpeakerSettings temp;
+        group->getSpeakerSettings(&temp);
+        if (temp.mute) {
+            EXPECT_CALL(*group, setMute(_)).Times(Exactly(1));
+            EXPECT_CALL(*group, setMute(UNMUTE)).Times(Exactly(timesCalled));
+        }
+        EXPECT_CALL(*group, setUnduckedVolume(_)).Times(Exactly(0));
+        EXPECT_CALL(*group, setUnduckedVolume(AVS_SET_VOLUME_MAX)).Times(Exactly(timesCalled));
+
+        groupVec.push_back(group);
+    }
+
+    auto uniqueTypes = getUniqueTypes(groupVec);
+
+    // Creation expectations based on type.
+    if (uniqueTypes.count(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME)) {
+        eventsSent = 1;
+
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(
+                SpeakerManagerObserverInterface::Source::DIRECTIVE,
+                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+                expectedSettings))
+            .Times(Exactly(1));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
+        EXPECT_CALL(
+            *m_mockContextManager,
+            setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+            .Times(Exactly(1));
+    } else {
+        EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(Exactly(0));
+    }
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(eventsSent));
+    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
+        .Times(1)
+        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(ADJUST_VOLUME.nameSpace, ADJUST_VOLUME.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, VOLUME_PAYLOAD, attachmentManager, "");
+
+    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests AdjustVolume Directive with persistent storage enabled. Expect that the volume is unmuted and adjusted, as well
+ * at most one event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
+ * In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
+ */
+TEST_P(SpeakerManagerTest, test_adjustVolumeDirectiveWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+    int eventsSent = 0;
+    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
+
+    // Create Speaker objects.
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        int timesCalled = 0;
+        if (typeOfSpeaker == ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME) {
+            timesCalled = 1;
+        }
+
+        SpeakerInterface::SpeakerSettings temp;
+        group->getSpeakerSettings(&temp);
+        if (temp.mute) {
+            EXPECT_CALL(*group, setMute(_)).Times(Exactly(1));
+            EXPECT_CALL(*group, setMute(UNMUTE)).Times(Exactly(timesCalled));
+        }
+        EXPECT_CALL(*group, setUnduckedVolume(_)).Times(Exactly(1));
+        EXPECT_CALL(*group, setUnduckedVolume(AVS_SET_VOLUME_MAX)).Times(Exactly(timesCalled));
+
+        groupVec.push_back(group);
+    }
+
+    auto uniqueTypes = getUniqueTypes(groupVec);
+
+    // Creation expectations based on type.
+    if (uniqueTypes.count(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME)) {
+        eventsSent = 1;
+
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(
+                SpeakerManagerObserverInterface::Source::DIRECTIVE,
+                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+                expectedSettings))
+            .Times(Exactly(1));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
+        EXPECT_CALL(
+            *m_mockContextManager,
+            setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+            .Times(Exactly(1));
+    } else {
+        EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(Exactly(0));
+    }
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(eventsSent));
+    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
+        .Times(1)
+        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(ADJUST_VOLUME.nameSpace, ADJUST_VOLUME.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, VOLUME_PAYLOAD, attachmentManager, "");
+
+    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests SetMute Directive. Expect that the volume is muted, as well at most one
+ * event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
+ * In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
+ */
+TEST_P(SpeakerManagerTest, test_setMuteDirective) {
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+    int eventsSent = 0;
+    SpeakerInterface::SpeakerSettings expectedSettings{DEFAULT_SETTINGS.volume, MUTE};
+
+    // Create Speaker objects.
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        int timesCalled = 0;
+        if (typeOfSpeaker == ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME) {
+            timesCalled = 1;
+        }
+
+        EXPECT_CALL(*group, setMute(_)).Times(Exactly(0));
+        EXPECT_CALL(*group, setMute(MUTE)).Times(Exactly(timesCalled));
+
+        groupVec.push_back(group);
+    }
+
+    auto uniqueTypes = getUniqueTypes(groupVec);
+
+    // Creation expectations based on type.
+    if (uniqueTypes.count(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME)) {
+        eventsSent = 1;
+
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(
+                SpeakerManagerObserverInterface::Source::DIRECTIVE,
+                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+                expectedSettings))
+            .Times(Exactly(1));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
+        EXPECT_CALL(
+            *m_mockContextManager,
+            setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+            .Times(Exactly(1));
+    } else {
+        EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(Exactly(0));
+    }
+
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(eventsSent));
+    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
+        .Times(1)
+        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_MUTE.nameSpace, SET_MUTE.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, MUTE_PAYLOAD, attachmentManager, "");
+
+    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests SetMute Directive with persistent storage enabled. Expect that the volume is muted, as well at most one
+ * event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
+ * In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
+ */
+TEST_P(SpeakerManagerTest, test_setMuteDirectiveWithPersistentStorage) {
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+    int eventsSent = 0;
+    SpeakerInterface::SpeakerSettings expectedSettings{DEFAULT_SETTINGS.volume, MUTE};
+
+    // Create Speaker objects.
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        int timesCalled = 0;
+        if (typeOfSpeaker == ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME) {
+            timesCalled = 1;
+        }
+
+        EXPECT_CALL(*group, setMute(_)).Times(Exactly(1));
+        EXPECT_CALL(*group, setMute(MUTE)).Times(Exactly(timesCalled));
+
+        groupVec.push_back(group);
+    }
+
+    auto uniqueTypes = getUniqueTypes(groupVec);
+
+    // Creation expectations based on type.
+    if (uniqueTypes.count(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME)) {
+        eventsSent = 1;
+
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(
+                SpeakerManagerObserverInterface::Source::DIRECTIVE,
+                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+                expectedSettings))
+            .Times(Exactly(1));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
+        EXPECT_CALL(
+            *m_mockContextManager,
+            setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
+            .Times(Exactly(1));
+    } else {
+        EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(Exactly(0));
+    }
+
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(eventsSent));
+    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
+        .Times(1)
+        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_MUTE.nameSpace, SET_MUTE.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, MUTE_PAYLOAD, attachmentManager, "");
+
+    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Test setVolume when unmute Directive sent. Setup test by setting volume to 0 and mute to true.
+ * Expect that the volume is unmuted and set to MIN_UNMUTE_VOLUME, as well at most one
+ * event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
+ * In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
+ */
+TEST_P(SpeakerManagerTest, test_setVolumeDirectiveWhenMuted) {
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+        groupVec.push_back(group);
+    }
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    for (auto& group : groupVec) {
+        auto mockGroup = std::dynamic_pointer_cast<NiceMock<MockChannelVolumeInterface>>(group);
+        EXPECT_CALL(*mockGroup, setUnduckedVolume(AVS_SET_VOLUME_MIN)).Times(1);
+        EXPECT_CALL(*mockGroup, setMute(MUTE)).Times(1);
+        auto typeOfSpeaker = mockGroup->getSpeakerType();
+        if (typeOfSpeaker == ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME) {
+            EXPECT_CALL(*mockGroup, setMute(UNMUTE)).Times(1);
+            EXPECT_CALL(*mockGroup, setUnduckedVolume(MIN_UNMUTE_VOLUME)).Times(1);
+        }
+    }
+
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+    SpeakerManagerInterface::NotificationProperties properties(
+        SpeakerManagerObserverInterface::Source::LOCAL_API, false, false);
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        m_speakerManager->setVolume(type, AVS_SET_VOLUME_MIN, properties);
+    }
+
+    for (auto type : getUniqueTypes(groupVec)) {
+        std::future<bool> future = m_speakerManager->setMute(type, MUTE, properties);
+    }
+
+    // Check to see if AVS_SPEAKER_VOLUME speakers exist and set EXPECT_CALL accordingly
+    auto uniqueTypes = getUniqueTypes(groupVec);
+    int eventsSent = 0;
+    SpeakerInterface::SpeakerSettings unMuteSettings{MIN_UNMUTE_VOLUME, UNMUTE};
+
+    if (uniqueTypes.count(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME)) {
+        // 2 events : {MIN_UNMUTE_VOLUME, MUTE} followed by {MIN_UNMUTE_VOLUME, UNMUTE}
+        eventsSent = 2;
+
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(
+                SpeakerManagerObserverInterface::Source::DIRECTIVE,
+                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+                SpeakerInterface::SpeakerSettings{MIN_UNMUTE_VOLUME, MUTE}))
+            .Times(Exactly(1));
+        EXPECT_CALL(
+            *m_observer,
+            onSpeakerSettingsChanged(
+                SpeakerManagerObserverInterface::Source::DIRECTIVE,
+                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
+                unMuteSettings))
+            .Times(Exactly(1));
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
+        EXPECT_CALL(
+            *m_mockContextManager,
+            setState(VOLUME_STATE, generateVolumeStateJson(unMuteSettings), StateRefreshPolicy::NEVER, _))
+            .Times(Exactly(1));
+    } else {
+        EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(0);
+        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(0);
+    }
+
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(eventsSent);
+    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
+        .Times(1)
+        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
+
+    // Create Directive to unmute the device.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_MUTE.nameSpace, SET_MUTE.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, UNMUTE_PAYLOAD, attachmentManager, "");
+
+    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Parameterized test for getSpeakerSettings. Operation should succeed with default speaker settings.
+ */
+TEST_P(SpeakerManagerTest, test_getSpeakerConfigDefaults) {
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+    std::set<ChannelVolumeInterface::Type> uniqueTypes;
+
+    // Enable Persistent Storage Setting.
+    EXPECT_CALL(*m_mockConfig, getPersistentStorage(_)).Times(1).WillOnce(Invoke([](bool& persistentStorage) {
+        persistentStorage = true;
+        return true;
+    }));
+
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+
+        // There should be one call to getSpeakerSettings for the first speaker of each type.
+        if (uniqueTypes.find(typeOfSpeaker) == uniqueTypes.end()) {
+            EXPECT_CALL(*group, getSpeakerSettings(_)).Times(AtLeast(1));
+            uniqueTypes.insert(typeOfSpeaker);
+        }
+
+        groupVec.push_back(group);
+    }
+
+    m_mockStorage->setFailureMode();
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+
+    for (auto speaker : groupVec) {
+        // SpeakerManager attempts to cache speaker settings initially. No getSpeakerSettings() call should be made to
+        // each speaker.
+        auto mockSpeaker = std::dynamic_pointer_cast<NiceMock<MockChannelVolumeInterface>>(speaker);
+        ASSERT_TRUE(mockSpeaker);
+        EXPECT_CALL(*mockSpeaker, getSpeakerSettings(_)).Times(0);
+    }
+
+    for (auto type : uniqueTypes) {
+        SpeakerInterface::SpeakerSettings settings;
+        // Query SpeakerMananger for speaker settings, value should be cached and not queried from each speaker.
+        std::future<bool> future = m_speakerManager->getSpeakerSettings(type, &settings);
+        ASSERT_TRUE(future.get());
+
+        switch (type) {
+            case avsCommon::sdkInterfaces::ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME:
+                EXPECT_EQ(settings.volume, alexaClientSDK::avsCommon::avs::speakerConstants::DEFAULT_SPEAKER_VOLUME);
+                break;
+            case avsCommon::sdkInterfaces::ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME:
+                EXPECT_EQ(settings.volume, alexaClientSDK::avsCommon::avs::speakerConstants::DEFAULT_ALERTS_VOLUME);
+                break;
+        }
+        ASSERT_EQ(settings.mute, false);
+    }
+}
+
+/**
+ * Parameterized test for getSpeakerSettings. Operation should succeed with speaker settings from storage.
+ */
+TEST_P(SpeakerManagerTest, test_getSpeakerConfigFromStorage) {
+    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
+    std::set<ChannelVolumeInterface::Type> uniqueTypes;
+
+    for (auto& typeOfSpeaker : GetParam()) {
+        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
+        group->DelegateToReal();
+
+        // There should be one call to getSpeakerSettings for the first speaker of each type.
+        if (uniqueTypes.find(typeOfSpeaker) == uniqueTypes.end()) {
+            EXPECT_CALL(*group, getSpeakerSettings(_)).Times(AtLeast(1));
+            uniqueTypes.insert(typeOfSpeaker);
+        }
+
+        groupVec.push_back(group);
+    }
+
+    m_mockStorage->setDefaults();
+
+    m_speakerManager = SpeakerManager::create(
+        m_mockConfig,
+        m_mockStorage,
+        groupVec,
+        m_mockContextManager,
+        m_mockMessageSender,
+        m_mockExceptionSender,
+        m_metricRecorder);
+
+    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
+    m_speakerManager->addSpeakerManagerObserver(m_observer);
+
+    for (auto speaker : groupVec) {
+        // SpeakerManager attempts to cache speaker settings initially. No getSpeakerSettings() call should be made to
+        // each speaker.
+        auto mockSpeaker = std::dynamic_pointer_cast<NiceMock<MockChannelVolumeInterface>>(speaker);
+        ASSERT_TRUE(mockSpeaker);
+        EXPECT_CALL(*mockSpeaker, getSpeakerSettings(_)).Times(0);
+    }
+
+    for (auto type : uniqueTypes) {
+        SpeakerInterface::SpeakerSettings settings;
+        // Query SpeakerMananger for speaker settings, value should be cached and not queried from each speaker.
+        std::future<bool> future = m_speakerManager->getSpeakerSettings(type, &settings);
+        ASSERT_TRUE(future.get());
+
+        EXPECT_EQ(settings.volume, AVS_SET_VOLUME_MIN);
+        EXPECT_EQ(settings.mute, false);
+    }
+}
+
+}  // namespace test
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerTest.dox b/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerTest.dox
new file mode 100644
index 0000000000..961c63dd42
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/test/SpeakerManagerTest.dox
@@ -0,0 +1,34 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @defgroup Test_acsdkSpeakerManager Unit tests for Speaker API Capability Agent.
+ * @brief Capability Agent unit tests.
+ *
+ * @see alexaClientSDK::speakerManager
+ * @see alexaClientSDK::speakerManager::test
+ *
+ * @ingroup Lib_acsdkSpeakerManager
+ */
+
+/**
+ * @defgroup Lib_acsdkSpeakerManagerTestLib Test mocks for speaker manager interfaces.
+ * @brief Capability Agent unit tests.
+ *
+ * @see alexaClientSDK::speakerManager
+ * @see alexaClientSDK::speakerManager::test
+ *
+ * @ingroup Lib_acsdkSpeakerManager
+ */
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/test/include/acsdk/SpeakerManager/test/MockSpeakerManagerConfig.h b/CapabilityAgents/SpeakerManager/SpeakerManager/test/include/acsdk/SpeakerManager/test/MockSpeakerManagerConfig.h
new file mode 100644
index 0000000000..9901fab15d
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/test/include/acsdk/SpeakerManager/test/MockSpeakerManagerConfig.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_TEST_INCLUDE_ACSDK_SPEAKERMANAGER_TEST_MOCKSPEAKERMANAGERCONFIG_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_TEST_INCLUDE_ACSDK_SPEAKERMANAGER_TEST_MOCKSPEAKERMANAGERCONFIG_H_
+
+#include <acsdk/Test/GmockExtensions.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+namespace test {
+
+/**
+ * @brief Mock object for @a SpeakerManagerConfigInterface.
+ *
+ * @see SpeakerManagerConfigInterface
+ * @ingroup Lib_acsdkSpeakerManagerTestLib
+ */
+class MockSpeakerManagerConfig : public SpeakerManagerConfigInterface {
+public:
+    MOCK_NOEXCEPT_METHOD1(getPersistentStorage, bool(bool&));
+    MOCK_NOEXCEPT_METHOD1(getMinUnmuteVolume, bool(std::uint8_t&));
+    MOCK_NOEXCEPT_METHOD1(getRestoreMuteState, bool(bool&));
+    MOCK_NOEXCEPT_METHOD1(getDefaultSpeakerVolume, bool(std::uint8_t&));
+    MOCK_NOEXCEPT_METHOD1(getDefaultAlertsVolume, bool(std::uint8_t&));
+};
+
+}  // namespace test
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_TEST_INCLUDE_ACSDK_SPEAKERMANAGER_TEST_MOCKSPEAKERMANAGERCONFIG_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/test/include/acsdk/SpeakerManager/test/MockSpeakerManagerObserver.h b/CapabilityAgents/SpeakerManager/SpeakerManager/test/include/acsdk/SpeakerManager/test/MockSpeakerManagerObserver.h
new file mode 100644
index 0000000000..c30213f867
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/test/include/acsdk/SpeakerManager/test/MockSpeakerManagerObserver.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_TEST_INCLUDE_ACSDK_SPEAKERMANAGER_TEST_MOCKSPEAKERMANAGEROBSERVER_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_TEST_INCLUDE_ACSDK_SPEAKERMANAGER_TEST_MOCKSPEAKERMANAGEROBSERVER_H_
+
+#include <acsdk/Test/GmockExtensions.h>
+#include <AVSCommon/SDKInterfaces/SpeakerManagerObserverInterface.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+namespace test {
+
+/**
+ * @brief Mock object for @a SpeakerManagerObserverInterface.
+ *
+ * @see avsCommon::sdkInterfaces::SpeakerManagerObserverInterface
+ * @ingroup Lib_acsdkSpeakerManagerTestLib
+ */
+class MockSpeakerManagerObserver : public avsCommon::sdkInterfaces::SpeakerManagerObserverInterface {
+public:
+    MOCK_METHOD3(
+        onSpeakerSettingsChanged,
+        void(
+            const Source&,
+            const avsCommon::sdkInterfaces::ChannelVolumeInterface::Type&,
+            const avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings&));
+};
+
+}  // namespace test
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_TEST_INCLUDE_ACSDK_SPEAKERMANAGER_TEST_MOCKSPEAKERMANAGEROBSERVER_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManager/test/include/acsdk/SpeakerManager/test/MockSpeakerManagerStorage.h b/CapabilityAgents/SpeakerManager/SpeakerManager/test/include/acsdk/SpeakerManager/test/MockSpeakerManagerStorage.h
new file mode 100644
index 0000000000..b770141df1
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManager/test/include/acsdk/SpeakerManager/test/MockSpeakerManagerStorage.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_TEST_INCLUDE_ACSDK_SPEAKERMANAGER_TEST_MOCKSPEAKERMANAGERSTORAGE_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_TEST_INCLUDE_ACSDK_SPEAKERMANAGER_TEST_MOCKSPEAKERMANAGERSTORAGE_H_
+
+#include <acsdk/Test/GmockExtensions.h>
+
+namespace alexaClientSDK {
+namespace speakerManager {
+namespace test {
+
+/**
+ * @brief Mock object for @a SpeakerManagerStorageInterface.
+ *
+ * @see SpeakerManagerStorageInterface
+ * @ingroup Lib_acsdkSpeakerManagerTestLib
+ */
+class MockSpeakerManagerStorage : public SpeakerManagerStorageInterface {
+public:
+    MOCK_NOEXCEPT_METHOD1(loadState, bool(SpeakerManagerStorageState&));
+    MOCK_NOEXCEPT_METHOD1(saveState, bool(const SpeakerManagerStorageState&));
+};
+
+}  // namespace test
+}  // namespace speakerManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGER_TEST_INCLUDE_ACSDK_SPEAKERMANAGER_TEST_MOCKSPEAKERMANAGERSTORAGE_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/CMakeLists.txt b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/CMakeLists.txt
new file mode 100644
index 0000000000..89b9b5e934
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.0)
+project(acsdkSpeakerManagerComponent LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/doc/Namespaces.dox b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/doc/Namespaces.dox
new file mode 100644
index 0000000000..5b243b21c3
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/doc/Namespaces.dox
@@ -0,0 +1,25 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @module Lib_acsdkSpeakerManager Speaker Manager Capability Agent Components
+ *
+ * @namespace alexaClientSDK::speakerManagerComponent
+ * @brief Speaker Manager Capability Agent Components
+ *
+ * This namespace contains factory methods for Speaker Manager components.
+ *
+ * @ingroup Lib_acsdkSpeakerManagerComponent
+ */
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/doc/SpeakerManagerComponent.dox b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/doc/SpeakerManagerComponent.dox
new file mode 100644
index 0000000000..b750a0bfd4
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/doc/SpeakerManagerComponent.dox
@@ -0,0 +1,27 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @defgroup Lib_acsdkSpeakerManagerComponent Speaker Capability Agent Components
+ * @brief Manufactory support for Speaker capability agent components.
+ *
+ * Speaker manager contains the following components:
+ * - Speaker manager capability agent
+ * - Speaker manager configuration integration
+ * - Speaker manager storage integration
+ * - Channel volume factory
+ *
+ * @ingroup alexaClientSDK::speakerManager
+ */
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/include/acsdk/SpeakerManager/ChannelVolumeFactoryComponent.h b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/include/acsdk/SpeakerManager/ChannelVolumeFactoryComponent.h
new file mode 100644
index 0000000000..50d92f87af
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/include/acsdk/SpeakerManager/ChannelVolumeFactoryComponent.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGERCOMPONENT_INCLUDE_ACSDK_SPEAKERMANAGER_CHANNELVOLUMEFACTORYCOMPONENT_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGERCOMPONENT_INCLUDE_ACSDK_SPEAKERMANAGER_CHANNELVOLUMEFACTORYCOMPONENT_H_
+
+#include <memory>
+#include <vector>
+
+#include <acsdkManufactory/Component.h>
+#include <AVSCommon/SDKInterfaces/ChannelVolumeFactoryInterface.h>
+
+namespace alexaClientSDK {
+namespace speakerManagerComponent {
+
+/// @addtogroup Lib_acsdkSpeakerManagerComponent
+/// @{
+
+/**
+ * @brief Component for ChannelVolumeFactoryInterface.
+ *
+ * Definition of a Manufactory component for the ChannelVolumeFactoryInterface.
+ */
+using ChannelVolumeFactoryComponent =
+    acsdkManufactory::Component<std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface>>;
+
+/**
+ * @brief Create component for ChannelVolumeFactoryInterface.
+ *
+ * Creates an manufactory component that exports a shared pointer to an implementation of @c
+ * ChannelVolumeFactoryInterface.
+ *
+ * @return A component.
+ */
+ChannelVolumeFactoryComponent getChannelVolumeFactoryComponent();
+
+/// @}
+
+}  // namespace speakerManagerComponent
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGERCOMPONENT_INCLUDE_ACSDK_SPEAKERMANAGER_CHANNELVOLUMEFACTORYCOMPONENT_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/include/acsdk/SpeakerManager/SpeakerManagerComponent.h b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/include/acsdk/SpeakerManager/SpeakerManagerComponent.h
new file mode 100644
index 0000000000..a082cf2952
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/include/acsdk/SpeakerManager/SpeakerManagerComponent.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGERCOMPONENT_INCLUDE_ACSDK_SPEAKERMANAGER_SPEAKERMANAGERCOMPONENT_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGERCOMPONENT_INCLUDE_ACSDK_SPEAKERMANAGER_SPEAKERMANAGERCOMPONENT_H_
+
+#include <memory>
+#include <vector>
+
+#include <acsdkManufactory/Component.h>
+#include <acsdkManufactory/Import.h>
+#include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/SpeakerManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/DefaultEndpointAnnotation.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointCapabilitiesRegistrarInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+
+namespace alexaClientSDK {
+namespace speakerManagerComponent {
+
+/// @addtogroup Lib_acsdkSpeakerManagerComponent
+/// @{
+
+/**
+ * @brief Component for @c SpeakerManagerInterface.
+ *
+ * Definition of a Manufactory component for the avsCommon::sdkInterfaces::SpeakerManagerInterface.
+ */
+using SpeakerManagerComponent = acsdkManufactory::Component<
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface>,
+    acsdkManufactory::Import<std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface>>,
+    acsdkManufactory::Import<std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>>,
+    acsdkManufactory::Import<std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>>,
+    acsdkManufactory::Import<std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>>,
+    acsdkManufactory::Import<std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface>>,
+    acsdkManufactory::Import<acsdkManufactory::Annotated<
+        avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation,
+        avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>>,
+    acsdkManufactory::Import<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>>;
+
+/**
+ * @brief Create component for @c SpeakerManagerInterface.
+ *
+ * Creates an manufactory component that exports a shared pointer to an implementation of @c SpeakerManagerInterface.
+ *
+ * @return A component.
+ */
+SpeakerManagerComponent getSpeakerManagerComponent() noexcept;
+
+/// @}
+
+}  // namespace speakerManagerComponent
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_SPEAKERMANAGERCOMPONENT_INCLUDE_ACSDK_SPEAKERMANAGER_SPEAKERMANAGERCOMPONENT_H_
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/src/CMakeLists.txt b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/src/CMakeLists.txt
new file mode 100644
index 0000000000..6d26f9a7d3
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/src/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkSpeakerManagerComponent")
+
+add_library(acsdkSpeakerManagerComponent ChannelVolumeFactoryComponent.cpp SpeakerManagerComponent.cpp)
+
+target_include_directories(acsdkSpeakerManagerComponent PUBLIC "${acsdkSpeakerManagerComponent_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkSpeakerManagerComponent acsdkSpeakerManager acsdkManufactory)
+
+# install target
+asdk_install()
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/src/ChannelVolumeFactoryComponent.cpp b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/src/ChannelVolumeFactoryComponent.cpp
new file mode 100644
index 0000000000..1220c0fec1
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/src/ChannelVolumeFactoryComponent.cpp
@@ -0,0 +1,32 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdkManufactory/ComponentAccumulator.h>
+
+#include <acsdk/SpeakerManager/ChannelVolumeFactoryComponent.h>
+#include <acsdk/SpeakerManager/Factories.h>
+
+namespace alexaClientSDK {
+namespace speakerManagerComponent {
+
+using namespace acsdkManufactory;
+using namespace speakerManager;
+
+ChannelVolumeFactoryComponent getChannelVolumeFactoryComponent() {
+    return ComponentAccumulator<>().addRetainedFactory(createChannelVolumeFactory);
+}
+
+}  // namespace speakerManagerComponent
+}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/src/SpeakerManagerComponent.cpp b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/src/SpeakerManagerComponent.cpp
new file mode 100644
index 0000000000..daf760c0e6
--- /dev/null
+++ b/CapabilityAgents/SpeakerManager/SpeakerManagerComponent/src/SpeakerManagerComponent.cpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdkManufactory/ComponentAccumulator.h>
+
+#include <acsdk/SpeakerManager/SpeakerManagerComponent.h>
+#include <acsdk/SpeakerManager/Factories.h>
+
+namespace alexaClientSDK {
+namespace speakerManagerComponent {
+
+using namespace acsdkManufactory;
+using namespace speakerManager;
+
+/**
+ * @brief Helper for manufactory.
+ *
+ * This method uses annotated types for correct interface lookup in manufactory.
+ *
+ * @param[in] storage                        A @c MiscStorageInterface to access persistent configuration.
+ * @param[in] contextManager                 A @c ContextManagerInterface to manage the context.
+ * @param[in] messageSender                  A @c MessageSenderInterface to send messages to AVS.
+ * @param[in] exceptionEncounteredSender     An @c ExceptionEncounteredSenderInterface to send directive processing
+ * exceptions to AVS.
+ * @param[in] shutdownNotifier               A @c ShutdownNotifierInterface to notify the SpeakerManager when it's time
+ * to shut down.
+ * @param[in] endpointCapabilitiesRegistrar  The @c EndpointCapabilitiesRegistrarInterface for the default endpoint
+ * (annotated with DefaultEndpointAnnotation), so that the SpeakerManager can register itself as a capability
+ * with the default endpoint.
+ * @param[in] metricRecorder                 The metric recorder.
+ *
+ * @return Reference to SpeakerManager CA or nullptr on error.
+ *
+ * @see createSpeakerManagerCapabilityAgent()
+ * @private
+ * @ingroup Lib_acsdkSpeakerManagerComponent
+ */
+static std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface> createSpeakerManagerCA(
+    std::shared_ptr<SpeakerManagerConfigInterface> config,
+    std::shared_ptr<SpeakerManagerStorageInterface> storage,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionEncounteredSender,
+    const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
+    const Annotated<
+        avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation,
+        avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>& endpointCapabilitiesRegistrar,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) noexcept {
+    return createSpeakerManagerCapabilityAgent(
+        std::move(config),
+        std::move(storage),
+        std::move(contextManager),
+        std::move(messageSender),
+        std::move(exceptionEncounteredSender),
+        std::move(metricRecorder),
+        shutdownNotifier,
+        endpointCapabilitiesRegistrar);
+}
+
+SpeakerManagerComponent getSpeakerManagerComponent() noexcept {
+    return ComponentAccumulator<>()
+        .addRequiredFactory(createSpeakerManagerCA)
+        .addRequiredFactory(createSpeakerManagerStorage)
+        .addRequiredFactory(createSpeakerManagerConfig);
+}
+
+}  // namespace speakerManagerComponent
+}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/include/SpeakerManager/DefaultChannelVolumeFactory.h b/CapabilityAgents/SpeakerManager/include/SpeakerManager/DefaultChannelVolumeFactory.h
deleted file mode 100644
index aae9897390..0000000000
--- a/CapabilityAgents/SpeakerManager/include/SpeakerManager/DefaultChannelVolumeFactory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_DEFAULTCHANNELVOLUMEFACTORY_H_
-#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_DEFAULTCHANNELVOLUMEFACTORY_H_
-
-#include <AVSCommon/SDKInterfaces/ChannelVolumeFactoryInterface.h>
-#include "SpeakerManager/ChannelVolumeManager.h"
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace speakerManager {
-
-/**
- * The @c DefaultChannelVolumeFactory provides a default implementation of @c ChannelVolumeFactoryInterface
- * using the @c ChannelVolumeManager.
- */
-class DefaultChannelVolumeFactory : public alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface {
-public:
-    /**
-     * Creates a new @c ChannelVolumeFactoryInterface implementation.
-     *
-     * @return A shared ptr to a new @c ChannelVolumeFactoryInterface.
-     */
-    static std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface>
-    createChannelVolumeFactoryInterface();
-
-    /// ChannelVolumeFactoryInterface Functions.
-    /// @{
-    virtual std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface>
-    createChannelVolumeInterface(
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> speaker,
-        alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
-        std::function<int8_t(int8_t)> volumeCurve) override;
-    /// @}
-};
-}  // namespace speakerManager
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
-#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_DEFAULTCHANNELVOLUMEFACTORY_H_
diff --git a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerComponent.h b/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerComponent.h
deleted file mode 100644
index 6321b07c58..0000000000
--- a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerComponent.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERCOMPONENT_H_
-#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERCOMPONENT_H_
-
-#include <memory>
-#include <vector>
-
-#include <acsdkManufactory/Component.h>
-#include <acsdkManufactory/Import.h>
-#include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
-#include <AVSCommon/SDKInterfaces/ChannelVolumeFactoryInterface.h>
-#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
-#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
-#include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
-#include <AVSCommon/SDKInterfaces/SpeakerInterface.h>
-#include <AVSCommon/SDKInterfaces/SpeakerManagerInterface.h>
-#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
-#include <AVSCommon/SDKInterfaces/Endpoints/DefaultEndpointAnnotation.h>
-#include <AVSCommon/SDKInterfaces/Endpoints/EndpointCapabilitiesRegistrarInterface.h>
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace speakerManager {
-
-/**
- * Definition of a Manufactory component for the SpeakerManager.
- */
-using SpeakerManagerComponent = acsdkManufactory::Component<
-    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface>,
-    acsdkManufactory::Import<std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface>>,
-    acsdkManufactory::Import<acsdkManufactory::Annotated<
-        avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation,
-        avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>>;
-
-/**
- * Creates an manufactory component that exports a shared pointer to an implementation of @c SpeakerManagerInterface.
- *
- * @return A component.
- */
-SpeakerManagerComponent getComponent();
-
-}  // namespace speakerManager
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERCOMPONENT_H_
diff --git a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerConfigHelper.h b/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerConfigHelper.h
deleted file mode 100644
index 2561933635..0000000000
--- a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerConfigHelper.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERCONFIGHELPER_H_
-#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERCONFIGHELPER_H_
-
-#include <SpeakerManager/SpeakerManagerStorageInterface.h>
-#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace speakerManager {
-
-/**
- * Helper class to manage configuration operations for SpeakerManager CA.
- *
- * This class implements all configuration operations and merges logic of accessing different configuration sources.
- * SpeakerManager get configuration values from three sources: hardcoded values, platform configuration, and persistent
- * storage.
- */
-class SpeakerManagerConfigHelper {
-public:
-    /**
-     * Creates object.
-     * @param[in] storage Storage interface.
-     */
-    SpeakerManagerConfigHelper(const std::shared_ptr<SpeakerManagerStorageInterface>& storage);
-
-    /**
-     * Load configuration.
-     *
-     * This method always succeeds (assuming @a state is not @a nullptr), as it first tries to load configuration
-     * from config storage, then from platform configuration files, and falls back to hardcoded values.
-     *
-     * @param[out] state Pointer to configuration container to fill with config values.
-     */
-    void loadState(SpeakerManagerStorageState& state);
-
-    /**
-     * Saves configuration to to config storage.
-     *
-     * @param[in] state Configuration data to persist.
-     *
-     * @return Boolean that indicates operation success.
-     */
-    bool saveState(const SpeakerManagerStorageState& state);
-
-    /**
-     * Loads minimum unmute volume level from platform configuration. The method tries to load the unmute value from
-     * platform configuration files, and if it fails, it returns a hardcoded value.
-     *
-     * @return Minimum volume level to unmute speakers.
-     */
-    int getMinUnmuteVolume() const;
-
-    /**
-     * Loads mute state handling from configuration. By default the speaker manager sets the mute status to the value
-     * prior to reboot, but this behaviour can be overridden by configuration.
-     *
-     * @return Returns configured value, where true indicates that mute status is configured according to the last
-     * saved state, and "false" indicates a default shall be kept.
-     */
-    bool getRestoreMuteState() const;
-
-private:
-    /**
-     * Load channels settings from hardcoded defaults.
-     *
-     * @param[out] state Destination container for configuration data.
-     */
-    void loadHardcodedState(SpeakerManagerStorageState& state);
-
-    /**
-     * Load channels settings from platform configuration.
-     *
-     * @param[out] state Destination container for configuration data.
-     *
-     * @return A bool indicating success.
-     */
-    bool loadStateFromConfig(SpeakerManagerStorageState& state);
-
-    /**
-     * Default values that are used when no other configuration sources are available.
-     */
-    static const SpeakerManagerStorageState c_defaults;
-
-    /// Reference to configuration storage interface.
-    std::shared_ptr<SpeakerManagerStorageInterface> m_storage;
-};
-
-}  // namespace speakerManager
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERCONFIGHELPER_H_
diff --git a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerMiscStorage.h b/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerMiscStorage.h
deleted file mode 100644
index 33562cba1a..0000000000
--- a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerMiscStorage.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERMISCSTORAGE_H_
-#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERMISCSTORAGE_H_
-
-#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
-#include <SpeakerManager/SpeakerManagerStorageInterface.h>
-#include <SpeakerManager/SpeakerManagerStorageState.h>
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace speakerManager {
-
-/**
- * Configuration interface for SpeakerManager.
- */
-class SpeakerManagerMiscStorage : public SpeakerManagerStorageInterface {
-public:
-    /**
-     * Creates an instance of the @c SpeakerManagerMiscStorage.
-     *
-     * @param miscStorage The underlying miscellaneous storage to store @c SpeakerManager data.
-     * @return A unique pointer to the instance of the newly created @c SpeakerManagerMiscStorage.
-     */
-    static std::shared_ptr<SpeakerManagerMiscStorage> create(
-        const std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface>& miscStorage);
-
-    /// @name SpeakerManagerStorageInterface Functions
-    /// @{
-    bool loadState(SpeakerManagerStorageState& state) override;
-    bool saveState(const SpeakerManagerStorageState& state) override;
-    /// @}
-
-private:
-    /// Helper to convert structure to JSON string.
-    static std::string convertToStateString(const SpeakerManagerStorageState& state);
-    static std::string convertToStateString(const SpeakerManagerStorageState::ChannelState& state);
-
-    /**
-     * Constructor.
-     *
-     * @param miscStorage The underlying miscellaneous storage used to store component data.
-     */
-    SpeakerManagerMiscStorage(
-        const std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface>& miscStorage);
-
-    /**
-     * Method to initialize the object.
-     *
-     * This method connects to underlying storage and performs necessary actions.
-     *
-     * @return Boolean status, indicating operation success.
-     */
-    bool init();
-
-    /**
-     * Helper to convert JSON string to structure.
-     *
-     * @param stateString JSON string describing @a SpeakerManagerStorageState data.
-     * @param state Pointer to storage for parsed values.
-     *
-     * @return Boolean status, indicating operation success.
-     */
-    bool convertFromStateString(const std::string& stateString, SpeakerManagerStorageState& state);
-
-    /**
-     * Helper to convert JSON string to structure.
-     *
-     * @param stateString JSON string describing @a SpeakerManagerStorageState::ChannelState data.
-     * @param state Pointer to storage for parsed values.
-     *
-     * @return Boolean status, indicating operation success.
-     */
-    bool convertFromStateString(const std::string& stateString, SpeakerManagerStorageState::ChannelState& state);
-
-    /// The Misc storage.
-    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> m_miscStorage;
-};
-
-}  // namespace speakerManager
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERMISCSTORAGE_H_
diff --git a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerStorageInterface.h b/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerStorageInterface.h
deleted file mode 100644
index cd100bb911..0000000000
--- a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerStorageInterface.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERSTORAGEINTERFACE_H_
-#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERSTORAGEINTERFACE_H_
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace speakerManager {
-
-struct SpeakerManagerStorageState;
-
-/**
- * Storage interface for SpeakerManager.
- */
-struct SpeakerManagerStorageInterface {
-    /**
-     * Virtual destructor to assure proper cleanup of derived types.
-     */
-    virtual ~SpeakerManagerStorageInterface() = default;
-
-    /**
-     * Loads state from underlying storage.
-     * @param[out] state Pointer to state structure for loaded values.
-     * @return Boolean flag if the operation is successful.
-     */
-    virtual bool loadState(SpeakerManagerStorageState& state) = 0;
-
-    /**
-     * Stores state to underlying storage.
-     * @param[in] state Reference of state structure for values to store.
-     * @return Boolean flag if the operation is successful.
-     */
-    virtual bool saveState(const SpeakerManagerStorageState& state) = 0;
-};
-
-}  // namespace speakerManager
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERSTORAGEINTERFACE_H_
diff --git a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerStorageState.h b/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerStorageState.h
deleted file mode 100644
index 0037b1cbeb..0000000000
--- a/CapabilityAgents/SpeakerManager/include/SpeakerManager/SpeakerManagerStorageState.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERSTORAGESTATE_H_
-#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERSTORAGESTATE_H_
-
-#include <cstdint>
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace speakerManager {
-
-/**
- * Storage state for SpeakerManager. SpeakerManager configuration includes configuration for two channel types: speaker
- * and alerts. There can be any number of channels for each of types, but all of them share the same configuraiton.
- */
-struct SpeakerManagerStorageState {
-    /**
-     * SpeakerManager channel type configuration state.
-     */
-    struct ChannelState {
-        /// Channel volume.
-        uint8_t channelVolume;
-        /// Channel mute status.
-        bool channelMuteStatus;
-    };
-    /// Configuration for speaker channels.
-    ChannelState speakerChannelState;
-    /// Configuration for alerts channels.
-    ChannelState alertsChannelState;
-};
-
-}  // namespace speakerManager
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_SPEAKERMANAGER_INCLUDE_SPEAKERMANAGER_SPEAKERMANAGERSTORAGESTATE_H_
diff --git a/CapabilityAgents/SpeakerManager/src/CMakeLists.txt b/CapabilityAgents/SpeakerManager/src/CMakeLists.txt
deleted file mode 100644
index 565e2341b0..0000000000
--- a/CapabilityAgents/SpeakerManager/src/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-add_definitions("-DACSDK_LOG_MODULE=speakerManager")
-
-add_library(SpeakerManager SpeakerManager.cpp
-                                  ChannelVolumeManager.cpp
-                                  DefaultChannelVolumeFactory.cpp
-                                  SpeakerManagerComponent.cpp
-                                  SpeakerManagerMiscStorage.cpp
-                                  SpeakerManagerConfigHelper.cpp)
-
-target_include_directories(SpeakerManager PUBLIC
-        "${ContextManager_INCLUDE_DIRS}"
-        "${SpeakerManager_SOURCE_DIR}/include")
-
-target_link_libraries(SpeakerManager AVSCommon acsdkManufactory acsdkShutdownManagerInterfaces Endpoints)
-
-# install target
-asdk_install()
diff --git a/CapabilityAgents/SpeakerManager/src/DefaultChannelVolumeFactory.cpp b/CapabilityAgents/SpeakerManager/src/DefaultChannelVolumeFactory.cpp
deleted file mode 100644
index 5299b5aa90..0000000000
--- a/CapabilityAgents/SpeakerManager/src/DefaultChannelVolumeFactory.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-#include "SpeakerManager/DefaultChannelVolumeFactory.h"
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace speakerManager {
-
-std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface> DefaultChannelVolumeFactory::
-    createChannelVolumeFactoryInterface() {
-    return std::make_shared<DefaultChannelVolumeFactory>();
-}
-
-std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface> DefaultChannelVolumeFactory::
-    createChannelVolumeInterface(
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> speaker,
-        alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type,
-        std::function<int8_t(int8_t)> volumeCurve) {
-    return alexaClientSDK::capabilityAgents::speakerManager::ChannelVolumeManager::create(speaker, type, volumeCurve);
-}
-
-}  // namespace speakerManager
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/src/SpeakerManagerComponent.cpp b/CapabilityAgents/SpeakerManager/src/SpeakerManagerComponent.cpp
deleted file mode 100644
index 12b851c9f8..0000000000
--- a/CapabilityAgents/SpeakerManager/src/SpeakerManagerComponent.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <acsdkManufactory/ComponentAccumulator.h>
-
-#include "SpeakerManager/SpeakerManager.h"
-#include "SpeakerManager/SpeakerManagerComponent.h"
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace speakerManager {
-
-using namespace acsdkManufactory;
-using namespace capabilityAgents::speakerManager;
-
-SpeakerManagerComponent getComponent() {
-    return ComponentAccumulator<>().addRequiredFactory(SpeakerManager::createSpeakerManagerCapabilityAgent);
-}
-
-}  // namespace speakerManager
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/src/SpeakerManagerConfigHelper.cpp b/CapabilityAgents/SpeakerManager/src/SpeakerManagerConfigHelper.cpp
deleted file mode 100644
index 56e400e48a..0000000000
--- a/CapabilityAgents/SpeakerManager/src/SpeakerManagerConfigHelper.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <SpeakerManager/SpeakerManager.h>
-#include <AVSCommon/AVS/SpeakerConstants/SpeakerConstants.h>
-
-using namespace alexaClientSDK::avsCommon::sdkInterfaces;
-using namespace alexaClientSDK::avsCommon::sdkInterfaces::storage;
-using namespace alexaClientSDK::avsCommon::avs::speakerConstants;
-using namespace alexaClientSDK::capabilityAgents::speakerManager;
-using namespace alexaClientSDK::avsCommon::utils::configuration;
-
-/// String to identify log entries originating from this file.
-static const std::string TAG{"SpeakerManagerConfigHelper"};
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param TAG Component tag.
- * @param evemt The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// The key in our config file to find the root of speaker manager configuration.
-static const std::string SPEAKERMANAGER_CONFIGURATION_ROOT_KEY = "speakerManagerCapabilityAgent";
-/// The key in our config file to find the minUnmuteVolume value.
-static const std::string SPEAKERMANAGER_MIN_UNMUTE_VOLUME_KEY = "minUnmuteVolume";
-/// The key in our config file to find the defaultSpeakerVolume value.
-static const std::string SPEAKERMANAGER_DEFAULT_SPEAKER_VOLUME_KEY = "defaultSpeakerVolume";
-/// The key in our config file to find the defaultAlertsVolume value.
-static const std::string SPEAKERMANAGER_DEFAULT_ALERTS_VOLUME_KEY = "defaultAlertsVolume";
-/// The key in our config file to find mute status keep flag
-static const std::string SPEAKERMANAGER_RESTORE_MUTE_STATE_KEY = "restoreMuteState";
-
-const SpeakerManagerStorageState SpeakerManagerConfigHelper::c_defaults = {{DEFAULT_SPEAKER_VOLUME, false},
-                                                                           {DEFAULT_ALERTS_VOLUME, false}};
-
-SpeakerManagerConfigHelper::SpeakerManagerConfigHelper(const std::shared_ptr<SpeakerManagerStorageInterface>& storage) :
-        m_storage(storage) {
-}
-
-int SpeakerManagerConfigHelper::getMinUnmuteVolume() const {
-    int minUnmuteVolume = MIN_UNMUTE_VOLUME;
-
-    auto node = ConfigurationNode::getRoot()[SPEAKERMANAGER_CONFIGURATION_ROOT_KEY];
-    // If key is present, then read and initialize the value from config or set to default.
-    node.getInt(SPEAKERMANAGER_MIN_UNMUTE_VOLUME_KEY, &minUnmuteVolume, MIN_UNMUTE_VOLUME);
-
-    return minUnmuteVolume;
-}
-
-void SpeakerManagerConfigHelper::loadState(SpeakerManagerStorageState& state) {
-    if (!m_storage->loadState(state) && !loadStateFromConfig(state)) {
-        loadHardcodedState(state);
-    }
-}
-
-bool SpeakerManagerConfigHelper::saveState(const SpeakerManagerStorageState& state) {
-    return m_storage->saveState(state);
-}
-
-bool SpeakerManagerConfigHelper::loadStateFromConfig(SpeakerManagerStorageState& state) {
-    int speakerVolume = 0;
-    int alertsVolume = 0;
-
-    auto node = ConfigurationNode::getRoot()[SPEAKERMANAGER_CONFIGURATION_ROOT_KEY];
-
-    if (node.getInt(SPEAKERMANAGER_DEFAULT_SPEAKER_VOLUME_KEY, &speakerVolume) &&
-        node.getInt(SPEAKERMANAGER_DEFAULT_ALERTS_VOLUME_KEY, &alertsVolume)) {
-        state.speakerChannelState.channelMuteStatus = false;
-        state.speakerChannelState.channelVolume = speakerVolume;
-        state.alertsChannelState.channelMuteStatus = false;
-        state.alertsChannelState.channelVolume = alertsVolume;
-
-        return true;
-    }
-    return false;
-}
-
-void SpeakerManagerConfigHelper::loadHardcodedState(SpeakerManagerStorageState& state) {
-    state = c_defaults;
-}
-
-bool SpeakerManagerConfigHelper::getRestoreMuteState() const {
-    auto node = ConfigurationNode::getRoot()[SPEAKERMANAGER_CONFIGURATION_ROOT_KEY];
-    bool result = false;
-    if (node.getBool(SPEAKERMANAGER_RESTORE_MUTE_STATE_KEY, &result)) {
-        return result;
-    } else {
-        return true;
-    }
-}
diff --git a/CapabilityAgents/SpeakerManager/test/CMakeLists.txt b/CapabilityAgents/SpeakerManager/test/CMakeLists.txt
deleted file mode 100644
index 6ab01b8b35..0000000000
--- a/CapabilityAgents/SpeakerManager/test/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-
-set(INCLUDE_PATH
-    "${SpeakerManager_INCLUDE_DIRS}"
-    "${AVSCommon_SOURCE_DIR}/AVS/test")
-
-discover_unit_tests("${INCLUDE_PATH}" "SpeakerManager;UtilsCommonTestLib;SDKInterfacesTests")
diff --git a/CapabilityAgents/SpeakerManager/test/SpeakerManagerConfigHelperTest.cpp b/CapabilityAgents/SpeakerManager/test/SpeakerManagerConfigHelperTest.cpp
deleted file mode 100644
index b35b9b7f28..0000000000
--- a/CapabilityAgents/SpeakerManager/test/SpeakerManagerConfigHelperTest.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <algorithm>
-#include <memory>
-#include <sstream>
-#include <set>
-#include <vector>
-#include <future>
-
-#include <AVSCommon/SDKInterfaces/SpeakerManagerObserverInterface.h>
-#include <AVSCommon/Utils/Memory/Memory.h>
-#include <SpeakerManager/SpeakerManagerConstants.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <rapidjson/document.h>
-#include <rapidjson/error/en.h>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/writer.h>
-
-#include "SpeakerManager/SpeakerManagerConfigHelper.h"
-#include "SpeakerManager/SpeakerManagerStorageState.h"
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace speakerManager {
-namespace test {
-
-using namespace avsCommon::avs;
-using namespace avsCommon::avs::speakerConstants;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils::configuration;
-using namespace avsCommon::utils::memory;
-using namespace rapidjson;
-using namespace ::testing;
-using namespace alexaClientSDK::capabilityAgents::speakerManager;
-
-static const std::string JSON_TEST_CONFIG =
-    "{\"speakerManagerCapabilityAgent\":{\"minUnmuteVolume\":3,\"defaultSpeakerVolume\":5,\"defaultAlertsVolume\":6,"
-    "\"restoreMuteState\":true}}";
-static const std::string JSON_TEST_CONFIG_NO_MUTE =
-    "{\"speakerManagerCapabilityAgent\":{\"minUnmuteVolume\":3,\"defaultSpeakerVolume\":5,\"defaultAlertsVolume\":6,"
-    "\"restoreMuteState\":false}}";
-
-class MockSpeakerManagerStorageInterface : public SpeakerManagerStorageInterface {
-public:
-    MOCK_METHOD1(loadState, bool(SpeakerManagerStorageState&));
-    MOCK_METHOD1(saveState, bool(const SpeakerManagerStorageState&));
-};
-
-class SpeakerManagerConfigHelperTest : public Test {
-public:
-    SpeakerManagerConfigHelperTest();
-
-protected:
-    /// SetUp before each test.
-    void SetUp() override;
-
-    /// TearDown after each test.
-    void TearDown() override;
-
-    // Upstream interface mock
-    std::shared_ptr<NiceMock<MockSpeakerManagerStorageInterface>> m_stubStorage;
-};
-
-SpeakerManagerConfigHelperTest::SpeakerManagerConfigHelperTest() : m_stubStorage() {
-}
-
-void SpeakerManagerConfigHelperTest::SetUp() {
-    m_stubStorage = std::make_shared<NiceMock<MockSpeakerManagerStorageInterface>>();
-}
-
-void SpeakerManagerConfigHelperTest::TearDown() {
-    m_stubStorage.reset();
-}
-
-TEST_F(SpeakerManagerConfigHelperTest, test_initDoesntCallLoadSave) {
-    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(0);
-    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
-
-    SpeakerManagerConfigHelper helper(m_stubStorage);
-}
-
-TEST_F(SpeakerManagerConfigHelperTest, test_getMinUnmuteVolumeFromConfiguration) {
-    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(0);
-    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
-
-    // Provide a valid configuration.
-    std::shared_ptr<std::istream> istr(new std::istringstream(JSON_TEST_CONFIG));
-    ConfigurationNode::uninitialize();
-    ASSERT_TRUE(ConfigurationNode::initialize({istr}));
-
-    SpeakerManagerConfigHelper helper(m_stubStorage);
-    ASSERT_EQ(3, helper.getMinUnmuteVolume());
-}
-
-TEST_F(SpeakerManagerConfigHelperTest, test_getMinUnmuteVolumeReturnsDefaults) {
-    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(0);
-    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
-
-    // Provide an empty configuration.
-    ConfigurationNode::uninitialize();
-    ASSERT_TRUE(ConfigurationNode::initialize({}));
-
-    SpeakerManagerConfigHelper helper(m_stubStorage);
-    ASSERT_EQ(MIN_UNMUTE_VOLUME, helper.getMinUnmuteVolume());
-}
-
-TEST_F(SpeakerManagerConfigHelperTest, test_getRestoreMuteStateReturnsDefaults) {
-    // Provide an empty configuration.
-    ConfigurationNode::uninitialize();
-    ASSERT_TRUE(ConfigurationNode::initialize({}));
-
-    SpeakerManagerConfigHelper helper(m_stubStorage);
-    ASSERT_TRUE(helper.getRestoreMuteState());
-}
-
-TEST_F(SpeakerManagerConfigHelperTest, test_getRestoreMuteStateReturnsTrue) {
-    ConfigurationNode::uninitialize();
-    std::shared_ptr<std::istream> istr(new std::istringstream(JSON_TEST_CONFIG));
-    ASSERT_TRUE(ConfigurationNode::initialize({istr}));
-
-    SpeakerManagerConfigHelper helper(m_stubStorage);
-    ASSERT_TRUE(helper.getRestoreMuteState());
-}
-
-TEST_F(SpeakerManagerConfigHelperTest, test_getRestoreMuteStateReturnsFalse) {
-    ConfigurationNode::uninitialize();
-    std::shared_ptr<std::istream> istr(new std::istringstream(JSON_TEST_CONFIG_NO_MUTE));
-    ASSERT_TRUE(ConfigurationNode::initialize({istr}));
-
-    SpeakerManagerConfigHelper helper(m_stubStorage);
-    ASSERT_FALSE(helper.getRestoreMuteState());
-}
-
-TEST_F(SpeakerManagerConfigHelperTest, test_loadStateDelegate) {
-    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(1);
-    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
-
-    SpeakerManagerConfigHelper helper(m_stubStorage);
-
-    ON_CALL(*m_stubStorage, loadState(_)).WillByDefault(Invoke([](SpeakerManagerStorageState& state) {
-        state.speakerChannelState.channelVolume = 10;
-        state.speakerChannelState.channelMuteStatus = true;
-        state.alertsChannelState.channelMuteStatus = false;
-        state.alertsChannelState.channelVolume = 20;
-        return true;
-    }));
-
-    SpeakerManagerStorageState state = {{255, false}, {255, false}};
-    helper.loadState(state);
-
-    EXPECT_EQ(10, state.speakerChannelState.channelVolume);
-    EXPECT_TRUE(state.speakerChannelState.channelMuteStatus);
-    EXPECT_EQ(20, state.alertsChannelState.channelVolume);
-    EXPECT_FALSE(state.alertsChannelState.channelMuteStatus);
-}
-
-TEST_F(SpeakerManagerConfigHelperTest, test_loadStateFromConfig) {
-    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(1);
-    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
-
-    std::shared_ptr<std::istream> istr(new std::istringstream(JSON_TEST_CONFIG));
-    ConfigurationNode::uninitialize();
-    ASSERT_TRUE(ConfigurationNode::initialize({istr}));
-
-    SpeakerManagerConfigHelper helper(m_stubStorage);
-
-    ON_CALL(*m_stubStorage, loadState(_)).WillByDefault(Return(false));
-
-    SpeakerManagerStorageState state = {{255, true}, {255, true}};
-    helper.loadState(state);
-
-    EXPECT_EQ(5, state.speakerChannelState.channelVolume);
-    EXPECT_FALSE(state.speakerChannelState.channelMuteStatus);
-    EXPECT_EQ(6, state.alertsChannelState.channelVolume);
-    EXPECT_FALSE(state.alertsChannelState.channelMuteStatus);
-}
-
-TEST_F(SpeakerManagerConfigHelperTest, test_loadStateDefaults) {
-    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(1);
-    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(0);
-
-    ConfigurationNode::uninitialize();
-    ASSERT_TRUE(ConfigurationNode::initialize({}));
-
-    SpeakerManagerConfigHelper helper(m_stubStorage);
-
-    ON_CALL(*m_stubStorage, loadState(_)).WillByDefault(Return(false));
-
-    SpeakerManagerStorageState state = {{255, false}, {255, false}};
-    helper.loadState(state);
-
-    EXPECT_EQ(DEFAULT_SPEAKER_VOLUME, state.speakerChannelState.channelVolume);
-    EXPECT_FALSE(state.speakerChannelState.channelMuteStatus);
-    EXPECT_EQ(DEFAULT_ALERTS_VOLUME, state.alertsChannelState.channelVolume);
-    EXPECT_FALSE(state.alertsChannelState.channelMuteStatus);
-}
-
-TEST_F(SpeakerManagerConfigHelperTest, test_saveState) {
-    EXPECT_CALL(*m_stubStorage, loadState(_)).Times(0);
-    EXPECT_CALL(*m_stubStorage, saveState(_)).Times(1);
-
-    SpeakerManagerConfigHelper helper(m_stubStorage);
-    SpeakerManagerStorageState saved = {{0, true}, {0, true}};
-
-    ON_CALL(*m_stubStorage, saveState(_)).WillByDefault(Invoke([&saved](const SpeakerManagerStorageState& state) {
-        saved = state;
-        return true;
-    }));
-
-    SpeakerManagerStorageState state = {{255, false}, {255, false}};
-    ASSERT_TRUE(helper.saveState(state));
-
-    ASSERT_EQ(255, saved.speakerChannelState.channelVolume);
-    ASSERT_FALSE(saved.speakerChannelState.channelMuteStatus);
-    ASSERT_EQ(255, saved.alertsChannelState.channelVolume);
-    ASSERT_FALSE(saved.alertsChannelState.channelMuteStatus);
-}
-
-}  // namespace test
-}  // namespace speakerManager
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/SpeakerManager/test/SpeakerManagerTest.cpp b/CapabilityAgents/SpeakerManager/test/SpeakerManagerTest.cpp
deleted file mode 100644
index 1fb1a8799a..0000000000
--- a/CapabilityAgents/SpeakerManager/test/SpeakerManagerTest.cpp
+++ /dev/null
@@ -1,1592 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <future>
-#include <memory>
-#include <set>
-#include <vector>
-
-#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
-#include <AVSCommon/SDKInterfaces/MockChannelVolumeInterface.h>
-#include <AVSCommon/SDKInterfaces/MockContextManager.h>
-#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
-#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
-#include <AVSCommon/SDKInterfaces/MockMessageSender.h>
-#include <AVSCommon/SDKInterfaces/MockSpeakerInterface.h>
-#include <AVSCommon/SDKInterfaces/SpeakerManagerObserverInterface.h>
-#include <AVSCommon/Utils/Memory/Memory.h>
-#include <AVSCommon/Utils/Metrics/MockMetricRecorder.h>
-#include <SpeakerManager/SpeakerManagerConstants.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <rapidjson/document.h>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/writer.h>
-
-#include "SpeakerManager/SpeakerManagerStorageInterface.h"
-#include "SpeakerManager/SpeakerManager.h"
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace speakerManager {
-namespace test {
-
-using namespace avsCommon::avs;
-using namespace avsCommon::avs::attachment::test;
-using namespace avsCommon::avs::speakerConstants;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::sdkInterfaces::test;
-using namespace avsCommon::utils::memory;
-using namespace rapidjson;
-using namespace ::testing;
-
-/// Timeout when waiting for futures to be set.
-static std::chrono::milliseconds TIMEOUT(1000);
-
-/// The @c MessageId identifer.
-static const std::string MESSAGE_ID("messageId");
-
-/// A @c SetVolume/AdjustVolume payload.
-static const std::string VOLUME_PAYLOAD =
-    "{"
-    "\"volume\":" +
-    std::to_string(AVS_SET_VOLUME_MAX) +
-    ""
-    "}";
-
-/// A @c SetMute payload.
-static const std::string MUTE_PAYLOAD =
-    "{"
-    "\"mute\":" +
-    MUTE_STRING +
-    ""
-    "}";
-
-/// A @c SetMute payload to unmute.
-static const std::string UNMUTE_PAYLOAD =
-    "{"
-    "\"mute\":" +
-    UNMUTE_STRING +
-    ""
-    "}";
-
-#ifdef ENABLE_MAXVOLUME_SETTING
-/// A valid value to be used as maximum volume limit.
-static const int8_t VALID_MAXIMUM_VOLUME_LIMIT = AVS_SET_VOLUME_MAX - 10;
-
-/// An invalid maximum volume limit value
-static const int8_t INVALID_MAXIMUM_VOLUME_LIMIT = AVS_SET_VOLUME_MAX + 10;
-#endif
-
-/// A valid delta to adjust the volume.
-static const int8_t VALID_VOLUME_ADJUSTMENT = 10;
-
-/**
- * A mock object to test that the observer is being correctly notified.
- */
-class MockObserver : public SpeakerManagerObserverInterface {
-public:
-    MOCK_METHOD3(
-        onSpeakerSettingsChanged,
-        void(const Source&, const ChannelVolumeInterface::Type&, const SpeakerInterface::SpeakerSettings&));
-};
-
-class MockSpeakerManagerStorage : public SpeakerManagerStorageInterface {
-public:
-    MOCK_METHOD1(loadState, bool(SpeakerManagerStorageState&));
-    MOCK_METHOD1(saveState, bool(const SpeakerManagerStorageState&));
-
-    MockSpeakerManagerStorage() :
-            m_state{.speakerChannelState = {.channelVolume = AVS_SET_VOLUME_MIN, .channelMuteStatus = UNMUTE},
-                    .alertsChannelState = {.channelVolume = AVS_SET_VOLUME_MIN, .channelMuteStatus = UNMUTE}} {
-        ON_CALL(*this, loadState(_)).WillByDefault(Invoke([this](SpeakerManagerStorageState& state) {
-            state = this->m_state;
-            return true;
-        }));
-        ON_CALL(*this, saveState(_)).WillByDefault(Invoke([this](const SpeakerManagerStorageState& state) {
-            this->m_state = state;
-            return true;
-        }));
-    }
-
-    void setDefaults() {
-        m_state = {.speakerChannelState = {.channelVolume = AVS_SET_VOLUME_MIN, .channelMuteStatus = UNMUTE},
-                   .alertsChannelState = {.channelVolume = AVS_SET_VOLUME_MIN, .channelMuteStatus = UNMUTE}};
-    }
-
-    void setFailureMode() {
-        ON_CALL(*this, loadState(_)).WillByDefault(Return(false));
-        ON_CALL(*this, saveState(_)).WillByDefault(Return(false));
-    }
-
-    SpeakerManagerStorageState m_state;
-};
-
-class SpeakerManagerTest : public ::testing::TestWithParam<std::vector<ChannelVolumeInterface::Type>> {
-public:
-    /// SetUp before each test.
-    void SetUp();
-
-    /// TearDown after each test.
-    void TearDown();
-
-    /// CleanUp and reset the SpeakerManager.
-    void cleanUp();
-
-    /// Function to wait for @c m_wakeSetCompleteFuture to be set.
-    void wakeOnSetCompleted();
-
-    /// Helper function to get unique @c Type.
-    std::set<ChannelVolumeInterface::Type> getUniqueTypes(std::vector<std::shared_ptr<ChannelVolumeInterface>>& groups);
-
-#ifdef ENABLE_MAXVOLUME_SETTING
-    /**
-     * Helper function for create and sent a directive
-     *
-     * @param directiveName The directive name. One of SetVolume or AdjustVolume.
-     * @param volume The value of the volume files within the directive.
-     */
-    void createAndSendVolumeDirective(const std::string directiveName, const int8_t volume);
-#endif
-
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> createChannelVolumeInterfaces() {
-        auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-        channelVolumeInterface->DelegateToReal();
-        return {channelVolumeInterface};
-    }
-
-    /// A constructor which initializes the promises and futures needed for the test class.
-    SpeakerManagerTest() :
-            m_wakeSetCompletedPromise{},
-            m_wakeSetCompletedFuture{m_wakeSetCompletedPromise.get_future()} {
-    }
-
-protected:
-    /// Promise to synchronize directive handling through setCompleted.
-    std::promise<void> m_wakeSetCompletedPromise;
-
-    /// Future to synchronize directive handling through setCompleted.
-    std::future<void> m_wakeSetCompletedFuture;
-
-    /// The metric recorder.
-    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
-
-    /*
-     * Set this to a nice mock. The only instance of the mock being called is the setStateProvider member, which we
-     * explicitly test.
-     */
-    std::shared_ptr<NiceMock<MockContextManager>> m_mockContextManager;
-
-    std::shared_ptr<MockSpeakerManagerStorage> m_mockStorage;
-
-    /// A strict mock that allows the test to strictly monitor the messages sent.
-    std::shared_ptr<StrictMock<MockMessageSender>> m_mockMessageSender;
-
-    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
-    std::shared_ptr<StrictMock<MockExceptionEncounteredSender>> m_mockExceptionSender;
-
-    /// A strict mock that allows the test to strictly monitor the handling of directives.
-    std::unique_ptr<StrictMock<MockDirectiveHandlerResult>> m_mockDirectiveHandlerResult;
-
-    /// A mock to allow testing of the observer callback behavior.
-    std::shared_ptr<NiceMock<MockObserver>> m_observer;
-
-    /// A pointer to an instance of the SpeakerManager that will be instantiated per test.
-    std::shared_ptr<SpeakerManager> m_speakerManager;
-};
-
-void SpeakerManagerTest::SetUp() {
-    m_mockStorage = std::make_shared<NiceMock<MockSpeakerManagerStorage>>();
-
-    m_metricRecorder = std::make_shared<NiceMock<avsCommon::utils::metrics::test::MockMetricRecorder>>();
-    m_mockContextManager = std::make_shared<NiceMock<MockContextManager>>();
-    m_mockMessageSender = std::make_shared<StrictMock<MockMessageSender>>();
-    m_mockExceptionSender = std::make_shared<StrictMock<MockExceptionEncounteredSender>>();
-    m_mockDirectiveHandlerResult = make_unique<StrictMock<MockDirectiveHandlerResult>>();
-    m_observer = std::make_shared<NiceMock<MockObserver>>();
-}
-
-void SpeakerManagerTest::TearDown() {
-    if (m_speakerManager) {
-        m_speakerManager->shutdown();
-        m_speakerManager.reset();
-    }
-}
-
-void SpeakerManagerTest::wakeOnSetCompleted() {
-    m_wakeSetCompletedPromise.set_value();
-}
-
-/**
- * Helper function to get unique @c Type from a vector of speakers.
- */
-std::set<ChannelVolumeInterface::Type> SpeakerManagerTest::getUniqueTypes(
-    std::vector<std::shared_ptr<ChannelVolumeInterface>>& groups) {
-    std::set<ChannelVolumeInterface::Type> types;
-    for (auto item : groups) {
-        types.insert(item->getSpeakerType());
-    }
-    return types;
-}
-
-#ifdef ENABLE_MAXVOLUME_SETTING
-void SpeakerManagerTest::createAndSendVolumeDirective(const std::string directiveName, const int8_t volume) {
-    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
-        .Times(1)
-        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
-
-    static int id = 1;
-    const std::string messageId = MESSAGE_ID + std::to_string(id++);
-    std::string payload =
-        "{"
-        "\"volume\":" +
-        std::to_string(volume) + "}";
-
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_VOLUME.nameSpace, directiveName, messageId);
-
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, payload, attachmentManager, "");
-
-    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_speakerManager->CapabilityAgent::handleDirective(messageId);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-}
-
-static int8_t getSpeakerVolume(std::shared_ptr<ChannelVolumeInterface> channelVolumeInterface) {
-    SpeakerInterface::SpeakerSettings speakerSettings;
-    channelVolumeInterface->getSpeakerSettings(&speakerSettings);
-    return speakerSettings.volume;
-}
-#endif
-
-/// Helper function to generate the VolumeState in JSON for the ContextManager.
-std::string generateVolumeStateJson(SpeakerInterface::SpeakerSettings settings) {
-    rapidjson::Document state(rapidjson::kObjectType);
-    state.AddMember(VOLUME_KEY, settings.volume, state.GetAllocator());
-    state.AddMember(MUTED_KEY, settings.mute, state.GetAllocator());
-
-    rapidjson::StringBuffer buffer;
-    rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-    if (!state.Accept(writer)) {
-        return "";
-    }
-
-    return buffer.GetString();
-}
-
-/**
- * Tests creating the SpeakerManager with a null contextManager.
- */
-TEST_F(SpeakerManagerTest, test_nullContextManager) {
-    auto channelVolumeInterfaces = createChannelVolumeInterfaces();
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, channelVolumeInterfaces, nullptr, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-
-    ASSERT_EQ(m_speakerManager, nullptr);
-}
-
-/**
- * Tests creating the SpeakerManager with a null messageSender.
- */
-TEST_F(SpeakerManagerTest, test_nullMessageSender) {
-    auto channelVolumeInterfaces = createChannelVolumeInterfaces();
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, channelVolumeInterfaces, m_mockContextManager, nullptr, m_mockExceptionSender, m_metricRecorder);
-
-    ASSERT_EQ(m_speakerManager, nullptr);
-}
-
-/**
- * Tests creating the SpeakerManager with a null exceptionSender.
- */
-TEST_F(SpeakerManagerTest, test_nullExceptionSender) {
-    auto channelVolumeInterfaces = createChannelVolumeInterfaces();
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, channelVolumeInterfaces, m_mockContextManager, m_mockMessageSender, nullptr, m_metricRecorder);
-
-    ASSERT_EQ(m_speakerManager, nullptr);
-}
-
-/**
- * Tests creating the SpeakerManager with no channelVolumeInterfaces.
- */
-TEST_F(SpeakerManagerTest, test_noChannelVolumeInterfaces) {
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, {}, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-
-    ASSERT_NE(m_speakerManager, nullptr);
-}
-
-/**
- * Tests that the SpeakerManager initially provides the state at constructor time.
- */
-TEST_F(SpeakerManagerTest, test_contextManagerSetStateConstructor) {
-    EXPECT_CALL(
-        *m_mockContextManager,
-        setState(VOLUME_STATE, generateVolumeStateJson(DEFAULT_SETTINGS), StateRefreshPolicy::NEVER, _))
-        .Times(Exactly(1));
-    auto groups = createChannelVolumeInterfaces();
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groups, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-}
-
-/*
- * Test setVolume with a value that's under the bounds. The operation should fail.
- */
-TEST_F(SpeakerManagerTest, test_setVolumeUnderBounds) {
-    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    channelVolumeInterface->DelegateToReal();
-
-    // Expect call on initialization
-    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(1));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        {channelVolumeInterface},
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    // Expect no more calls
-    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
-    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
-    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
-
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-    SpeakerManagerInterface::NotificationProperties properties;
-    std::future<bool> future = m_speakerManager->setVolume(
-        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MIN - 1, properties);
-    ASSERT_FALSE(future.get());
-}
-
-/*
- * Test setVolume with a value that's over the bounds. The operation should fail.
- */
-TEST_F(SpeakerManagerTest, test_setVolumeOverBounds) {
-    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    channelVolumeInterface->DelegateToReal();
-
-    // Expect call on initialization.
-    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(1));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        {channelVolumeInterface},
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    // Expect no more calls.
-    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
-    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
-    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-    SpeakerManagerInterface::NotificationProperties properties;
-    std::future<bool> future = m_speakerManager->setVolume(
-        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX + 1, properties);
-    ASSERT_FALSE(future.get());
-}
-
-/*
- * Test adjustVolume with a value that's under the bounds. The operation should fail.
- */
-TEST_F(SpeakerManagerTest, test_adjustVolumeUnderBounds) {
-    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    channelVolumeInterface->DelegateToReal();
-
-    // Expect call on initialization.
-    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(1));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        {channelVolumeInterface},
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    // Expect no more calls.
-    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
-    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
-    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-
-    SpeakerManagerInterface::NotificationProperties properties;
-    std::future<bool> future = m_speakerManager->adjustVolume(
-        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MIN - 1, properties);
-    ASSERT_FALSE(future.get());
-}
-
-/*
- * Test adjustVolume with a value that's over the bounds. The operation should fail.
- */
-TEST_F(SpeakerManagerTest, test_adjustVolumeOverBounds) {
-    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    channelVolumeInterface->DelegateToReal();
-    // Expect call on initialization.
-    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(1));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        {channelVolumeInterface},
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    // Expect no more calls.
-    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(0));
-    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
-    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-    SpeakerManagerInterface::NotificationProperties properties;
-    std::future<bool> future = m_speakerManager->adjustVolume(
-        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX + 1, properties);
-    ASSERT_FALSE(future.get());
-}
-
-/*
- * Test if one speaker is out of sync, getSpeakingSettings should return the cached value correctly.
- */
-TEST_F(SpeakerManagerTest, test_getCachedSettings) {
-    // Prepare two speakers with the same type AVS_SPEAKER_VOLUME
-    auto channelVolumeInterface1 = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    auto channelVolumeInterface2 = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    channelVolumeInterface1->DelegateToReal();
-    channelVolumeInterface2->DelegateToReal();
-    // Get speaker settings from the first speaker of each type during initialization.
-    EXPECT_CALL(*channelVolumeInterface1, getSpeakerSettings(_)).Times(Exactly(1));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        {channelVolumeInterface1, channelVolumeInterface2},
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    // If a speaker changes its volume and is out of sync with the rest speakers of the same type, querying speaker
-    // settings from SpeakerManager should return the cached volume correctly.
-    channelVolumeInterface2->setUnduckedVolume(AVS_SET_VOLUME_MAX);
-    channelVolumeInterface2->setMute(MUTE);
-    SpeakerInterface::SpeakerSettings settings;
-    std::future<bool> future =
-        m_speakerManager->getSpeakerSettings(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, &settings);
-    ASSERT_TRUE(future.get());
-    ASSERT_EQ(settings.volume, DEFAULT_SETTINGS.volume);
-    ASSERT_EQ(settings.mute, DEFAULT_SETTINGS.mute);
-
-    ASSERT_TRUE(channelVolumeInterface2->getSpeakerSettings(&settings));
-    ASSERT_EQ(settings.volume, AVS_SET_VOLUME_MAX);
-    ASSERT_EQ(settings.mute, MUTE);
-}
-
-/*
- * Test adjustVolume when the adjusted volume is unchanged. Should not send an event.
- */
-TEST_F(SpeakerManagerTest, test_eventNotSentWhenAdjustVolumeUnchanged) {
-    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    channelVolumeInterface->DelegateToReal();
-
-    auto groupVec = std::vector<std::shared_ptr<ChannelVolumeInterface>>{channelVolumeInterface};
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groupVec, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-
-    // The test adjusts the volume by AVS_ADJUST_VOLUME_MIN, which results in the lowest volume possible.
-    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MIN, UNMUTE};
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-    SpeakerManagerInterface::NotificationProperties properties;
-
-    for (auto type : getUniqueTypes(groupVec)) {
-        EXPECT_CALL(
-            *m_observer,
-            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings))
-            .Times(Exactly(1));
-        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
-            EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
-            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(0));
-            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
-                .Times(AnyNumber());
-            EXPECT_CALL(
-                *m_mockContextManager,
-                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
-                .Times(Exactly(1));
-        }
-
-        std::future<bool> future = m_speakerManager->adjustVolume(type, AVS_ADJUST_VOLUME_MIN, properties);
-        ASSERT_TRUE(future.get());
-    }
-}
-
-/*
- * Test setVolume when the new volume is unchanged. Should not send an event.
- */
-TEST_F(SpeakerManagerTest, test_eventNotSentWhenSetVolumeUnchanged) {
-    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    channelVolumeInterface->DelegateToReal();
-    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(AVS_SET_VOLUME_MIN)).Times(Exactly(2));
-
-    auto groupVec = std::vector<std::shared_ptr<ChannelVolumeInterface>>{channelVolumeInterface};
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groupVec, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-
-    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MIN, UNMUTE};
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-    SpeakerManagerInterface::NotificationProperties properties;
-
-    for (auto type : getUniqueTypes(groupVec)) {
-        EXPECT_CALL(
-            *m_observer,
-            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings))
-            .Times(Exactly(1));
-        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(0));
-        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
-            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(0));
-            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
-                .Times(AnyNumber());
-            EXPECT_CALL(
-                *m_mockContextManager,
-                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
-                .Times(Exactly(1));
-        }
-
-        std::future<bool> future = m_speakerManager->setVolume(type, AVS_SET_VOLUME_MIN, properties);
-        ASSERT_TRUE(future.get());
-    }
-}
-
-/**
- * Test getConfiguration and ensure that all directives are handled.
- */
-TEST_F(SpeakerManagerTest, test_getConfiguration) {
-    auto channelVolumeInterfaceVec = createChannelVolumeInterfaces();
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        channelVolumeInterfaceVec,
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    auto configuration = m_speakerManager->getConfiguration();
-    auto neitherNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUMS_NONE, false);
-    ASSERT_EQ(configuration[SET_VOLUME], neitherNonBlockingPolicy);
-    ASSERT_EQ(configuration[ADJUST_VOLUME], neitherNonBlockingPolicy);
-    ASSERT_EQ(configuration[SET_MUTE], neitherNonBlockingPolicy);
-}
-
-/**
- * Test that adding duplicated ChannelVolumeInterface instances in the SpeakerManager works correctly.
- */
-TEST_F(SpeakerManagerTest, test_addDuplicatedChannelVolumeInterfaces) {
-    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    channelVolumeInterface->DelegateToReal();
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> channelVolumeInterfaceVec = {channelVolumeInterface,
-                                                                                      channelVolumeInterface};
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        channelVolumeInterfaceVec,
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).Times(Exactly(1));
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
-    SpeakerManagerInterface::NotificationProperties properties;
-    std::future<bool> future = m_speakerManager->adjustVolume(
-        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX, properties);
-    ASSERT_TRUE(future.get());
-}
-
-/**
- * Test that adding a null observer does not cause any errors in the SpeakerManager.
- */
-TEST_F(SpeakerManagerTest, test_addNullObserver) {
-    auto channelVolumeInterfaceVec = createChannelVolumeInterfaces();
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        channelVolumeInterfaceVec,
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-    m_speakerManager->addSpeakerManagerObserver(nullptr);
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(2));
-    SpeakerManagerInterface::NotificationProperties properties;
-
-    m_speakerManager->setVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX, properties)
-        .wait();
-    m_speakerManager->adjustVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX, properties)
-        .wait();
-    m_speakerManager->setMute(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, MUTE, properties).wait();
-}
-
-/**
- * Test that removing an observer works correctly.
- */
-TEST_F(SpeakerManagerTest, test_removeSpeakerManagerObserver) {
-    auto channelVolumeInterfaceVec = createChannelVolumeInterfaces();
-
-    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(2));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        channelVolumeInterfaceVec,
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-    m_speakerManager->removeSpeakerManagerObserver(m_observer);
-    SpeakerManagerInterface::NotificationProperties properties;
-
-    m_speakerManager->setVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX, properties)
-        .wait();
-    m_speakerManager->adjustVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX, properties)
-        .wait();
-    m_speakerManager->setMute(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, MUTE, properties).wait();
-}
-
-/**
- * Test that removing a null observer does not cause any errors in the SpeakerManager.
- */
-TEST_F(SpeakerManagerTest, test_removeNullObserver) {
-    auto channelVolumeInterfaceVec = createChannelVolumeInterfaces();
-
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(2));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        channelVolumeInterfaceVec,
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-    m_speakerManager->removeSpeakerManagerObserver(nullptr);
-    SpeakerManagerInterface::NotificationProperties properties;
-
-    m_speakerManager->setVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX, properties)
-        .wait();
-    m_speakerManager->adjustVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX, properties)
-        .wait();
-    m_speakerManager->setMute(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, MUTE, properties).wait();
-}
-
-/*
- * Test retry logic for SetVolume on speaker type AVS_SPEAKER_VOLUME. Returning false once for speaker->setVolume()
- * triggers retry and when successful returns the future of value true.
- */
-TEST_F(SpeakerManagerTest, test_retryAndApplySettingsForSetVolume) {
-    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    channelVolumeInterface->DelegateToReal();
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        {channelVolumeInterface},
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    auto retryTimes = 0;
-    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).WillRepeatedly(InvokeWithoutArgs([&retryTimes] {
-        return retryTimes++ > 0;
-    }));
-
-    SpeakerManagerInterface::NotificationProperties properties;
-    std::future<bool> future =
-        m_speakerManager->setVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MIN, properties);
-    ASSERT_TRUE(future.get());
-}
-
-/*
- * Test retry logic for AdjustVolume on speakers of type AVS_SPEAKER_VOLUME. Return false once for the second speaker
- * during adjustVolume() to trigger a retry. The delta should not be applied again to the first speaker during retry.
- */
-TEST_F(SpeakerManagerTest, test_retryAndApplySettingsForAdjustVolume) {
-    auto channelVolumeInterface1 = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    auto channelVolumeInterface2 = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    channelVolumeInterface1->DelegateToReal();
-    channelVolumeInterface2->DelegateToReal();
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        {channelVolumeInterface1, channelVolumeInterface2},
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    auto retryTimes = 0;
-    EXPECT_CALL(*channelVolumeInterface2, setUnduckedVolume(_)).WillRepeatedly(InvokeWithoutArgs([&retryTimes] {
-        return retryTimes++ > 0;
-    }));
-
-    // Expect volumeChanged event.
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
-    std::future<bool> future = m_speakerManager->adjustVolume(
-        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
-        VALID_VOLUME_ADJUSTMENT,
-        SpeakerManagerInterface::NotificationProperties());
-    ASSERT_TRUE(future.get());
-
-    SpeakerInterface::SpeakerSettings settings1;
-    ASSERT_TRUE(channelVolumeInterface1->getSpeakerSettings(&settings1));
-    ASSERT_EQ(settings1.volume, DEFAULT_SETTINGS.volume + VALID_VOLUME_ADJUSTMENT);
-
-    SpeakerInterface::SpeakerSettings speakerSettings;
-    std::future<bool> settingsFuture =
-        m_speakerManager->getSpeakerSettings(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, &speakerSettings);
-    ASSERT_TRUE(settingsFuture.get());
-    ASSERT_EQ(speakerSettings.volume, DEFAULT_SETTINGS.volume + VALID_VOLUME_ADJUSTMENT);
-}
-
-/*
- * Test retry logic for SetMute on speaker type AVS_SPEAKER_VOLUME. Returning false once for speaker->setMute()
- * triggers retry and when successful returns the future of value true.
- */
-TEST_F(SpeakerManagerTest, test_retryAndApplySettingsForSetMute) {
-    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    channelVolumeInterface->DelegateToReal();
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        {channelVolumeInterface},
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    auto retryTimes = 0;
-    EXPECT_CALL(*channelVolumeInterface, setMute(_)).WillRepeatedly(InvokeWithoutArgs([&retryTimes] {
-        return retryTimes++ > 0;
-    }));
-
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
-    SpeakerManagerInterface::NotificationProperties properties;
-
-    std::future<bool> future =
-        m_speakerManager->setMute(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, MUTE, properties);
-    ASSERT_TRUE(future.get());
-}
-
-/*
- * Test retryAndApplySettings() failure for setVolume, adjustVolume and setMute on speaker type AVS_SPEAKER_VOLUME.
- * Repeatedly returning false for adjustVolume() and setMute() to trigger retries. After retrying maximum times,
- * returning the future of false.
- */
-TEST_F(SpeakerManagerTest, test_retryAndApplySettingsFails) {
-    auto channelVolumeInterface = std::make_shared<NiceMock<MockChannelVolumeInterface>>();
-    channelVolumeInterface->DelegateToReal();
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        {channelVolumeInterface},
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    EXPECT_CALL(*channelVolumeInterface, setUnduckedVolume(_)).WillRepeatedly(Return(false));
-    EXPECT_CALL(*channelVolumeInterface, setMute(_)).WillRepeatedly(Return(false));
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(0);
-
-    std::future<bool> setVolumeResult = m_speakerManager->setVolume(
-        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
-        AVS_SET_VOLUME_MIN,
-        SpeakerManagerInterface::NotificationProperties());
-    ASSERT_FALSE(setVolumeResult.get());
-
-    std::future<bool> adjustVolumeResult = m_speakerManager->adjustVolume(
-        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
-        VALID_VOLUME_ADJUSTMENT,
-        SpeakerManagerInterface::NotificationProperties());
-    ASSERT_FALSE(adjustVolumeResult.get());
-
-    std::future<bool> setMuteResult = m_speakerManager->setMute(
-        ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, MUTE, SpeakerManagerInterface::NotificationProperties());
-    ASSERT_FALSE(setMuteResult.get());
-
-    SpeakerInterface::SpeakerSettings speakerSettings;
-    std::future<bool> settingsFuture =
-        m_speakerManager->getSpeakerSettings(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, &speakerSettings);
-    ASSERT_TRUE(settingsFuture.get());
-    ASSERT_EQ(speakerSettings.volume, DEFAULT_SETTINGS.volume);
-    ASSERT_EQ(speakerSettings.mute, DEFAULT_SETTINGS.mute);
-}
-
-#ifdef ENABLE_MAXVOLUME_SETTING
-/**
- * Test that setting a maximum volume limit succeeds and a local call to setVolume or adjustVolume will
- * completely fail.
- */
-
-TEST_F(SpeakerManagerTest, test_setMaximumVolumeLimit) {
-    auto avsChannelVolumeInterface =
-        std::make_shared<NiceMock<MockChannelVolumeInterface>>(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
-    avsChannelVolumeInterface->DelegateToReal();
-    auto alertsChannelVolumeInterface =
-        std::make_shared<NiceMock<MockChannelVolumeInterface>>(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
-    alertsChannelVolumeInterface->DelegateToReal();
-
-    avsChannelVolumeInterface->setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT - 1);
-    alertsChannelVolumeInterface->setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT - 1);
-
-    // Expect volumeChanged event.
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
-    EXPECT_CALL(*avsChannelVolumeInterface, setUnduckedVolume(_)).Times(AtLeast(1));
-    EXPECT_CALL(*alertsChannelVolumeInterface, setUnduckedVolume(_)).Times(AtLeast(1));
-    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(0);
-    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        {avsChannelVolumeInterface, alertsChannelVolumeInterface},
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-    SpeakerManagerInterface::NotificationProperties properties;
-
-    EXPECT_TRUE(m_speakerManager->setMaximumVolumeLimit(VALID_MAXIMUM_VOLUME_LIMIT).get());
-
-    // Local change either with setVolume will set to limit but with adjustVolume will fail
-    EXPECT_TRUE(
-        m_speakerManager
-            ->setVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, VALID_MAXIMUM_VOLUME_LIMIT + 1, properties)
-            .get());
-    EXPECT_FALSE(
-        m_speakerManager
-            ->adjustVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, VALID_MAXIMUM_VOLUME_LIMIT + 1, properties)
-            .get());
-
-    // The volume went to upper limit.
-    EXPECT_EQ(getSpeakerVolume(avsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
-    EXPECT_EQ(getSpeakerVolume(alertsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
-
-    // Increase the volume by 2, so end result will exceed the limit.
-    EXPECT_TRUE(m_speakerManager->adjustVolume(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME, 2, properties).get());
-
-    // Following the 2nd adjustVolume, the volume will change to the limit.
-    EXPECT_EQ(getSpeakerVolume(alertsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
-}
-
-/**
- * Test that if a new limit was set while the volume was higher than the new limit, operation will succeed and the
- * volume will be decreased.
- */
-
-TEST_F(SpeakerManagerTest, testSetMaximumVolumeLimitWhileVolumeIsHigher) {
-    auto avsChannelVolumeInterface =
-        std::make_shared<NiceMock<MockChannelVolumeInterface>>(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
-    auto alertsChannelVolumeInterface =
-        std::make_shared<NiceMock<MockChannelVolumeInterface>>(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
-
-    avsChannelVolumeInterface->DelegateToReal();
-    alertsChannelVolumeInterface->DelegateToReal();
-
-    EXPECT_TRUE(avsChannelVolumeInterface->setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT + 1));
-    EXPECT_TRUE(alertsChannelVolumeInterface->setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT + 1));
-
-    EXPECT_CALL(*avsChannelVolumeInterface, setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT)).Times(1);
-    EXPECT_CALL(*alertsChannelVolumeInterface, setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT)).Times(1);
-
-    // Expect volumeChanged event.
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
-
-    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        {avsChannelVolumeInterface, alertsChannelVolumeInterface},
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    EXPECT_TRUE(m_speakerManager->setMaximumVolumeLimit(VALID_MAXIMUM_VOLUME_LIMIT).get());
-
-    EXPECT_EQ(getSpeakerVolume(avsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
-    EXPECT_EQ(getSpeakerVolume(alertsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
-}
-
-/**
- * Test that SetVolume directive with volume > limit should set the volume to the limit
- */
-
-TEST_F(SpeakerManagerTest, testAVSSetVolumeHigherThanLimit) {
-    avsCommon::utils::logger::getConsoleLogger()->setLevel(avsCommon::utils::logger::Level::DEBUG9);
-    auto avsChannelVolumeInterface =
-        std::make_shared<NiceMock<MockChannelVolumeInterface>>(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
-    auto alertsChannelVolumeInterface =
-        std::make_shared<NiceMock<MockChannelVolumeInterface>>(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME);
-
-    avsChannelVolumeInterface->DelegateToReal();
-    alertsChannelVolumeInterface->DelegateToReal();
-
-    EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
-
-    EXPECT_TRUE(avsChannelVolumeInterface->setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT - 1));
-    EXPECT_TRUE(alertsChannelVolumeInterface->setUnduckedVolume(VALID_MAXIMUM_VOLUME_LIMIT - 1));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        {avsChannelVolumeInterface, alertsChannelVolumeInterface},
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    EXPECT_TRUE(m_speakerManager->setMaximumVolumeLimit(VALID_MAXIMUM_VOLUME_LIMIT).get());
-
-    createAndSendVolumeDirective(SET_VOLUME.name, VALID_MAXIMUM_VOLUME_LIMIT + 1);
-
-    ASSERT_EQ(getSpeakerVolume(avsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
-    ASSERT_EQ(getSpeakerVolume(alertsChannelVolumeInterface), VALID_MAXIMUM_VOLUME_LIMIT);
-}
-
-/**
- * Test that a call to @c setMaximumVolumeLimit with invalid value fails.
- */
-TEST_F(SpeakerManagerTest, testSetMaximumVolumeLimitWithInvalidValue) {
-    auto avsChannelVolumeInterface = createChannelVolumeInterfaces();
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage,
-        avsChannelVolumeInterface,
-        m_mockContextManager,
-        m_mockMessageSender,
-        m_mockExceptionSender,
-        m_metricRecorder);
-
-    EXPECT_FALSE(m_speakerManager->setMaximumVolumeLimit(INVALID_MAXIMUM_VOLUME_LIMIT).get());
-}
-#endif
-
-/**
- * Create different combinations of @c Type for  parameterized tests (TEST_P).
- */
-INSTANTIATE_TEST_CASE_P(
-    Parameterized,
-    SpeakerManagerTest,
-    // clang-format off
-    ::testing::Values(
-        std::vector<ChannelVolumeInterface::Type>{
-            ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME
-        },
-        std::vector<ChannelVolumeInterface::Type>{
-            ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME
-        },
-        std::vector<ChannelVolumeInterface::Type>{
-            ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
-            ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME
-        },
-        std::vector<ChannelVolumeInterface::Type>{
-            ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME,
-            ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME,
-        },
-        std::vector<ChannelVolumeInterface::Type>{
-            ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
-            ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME,
-            ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
-            ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME
-        }));
-// clang-format on
-
-/**
- * Parameterized test for setVolume. One event should be sent if an AVS_SPEAKER_VOLUME typed speaker is modified.
- */
-TEST_P(SpeakerManagerTest, test_setVolume) {
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
-
-    for (auto& typeOfSpeaker : GetParam()) {
-        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
-        group->DelegateToReal();
-        EXPECT_CALL(*group, setUnduckedVolume(_)).Times(Exactly(1));
-        EXPECT_CALL(*group, setUnduckedVolume(AVS_SET_VOLUME_MAX)).Times(Exactly(1));
-        groupVec.push_back(group);
-    }
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groupVec, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-
-    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-    SpeakerManagerInterface::NotificationProperties properties(SpeakerManagerObserverInterface::Source::DIRECTIVE);
-
-    for (auto type : getUniqueTypes(groupVec)) {
-        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
-        EXPECT_CALL(
-            *m_observer,
-            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, type, expectedSettings))
-            .Times(Exactly(1));
-        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
-            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
-            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
-                .Times(AnyNumber());
-            EXPECT_CALL(
-                *m_mockContextManager,
-                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
-                .Times(Exactly(1));
-        }
-
-        std::future<bool> future = m_speakerManager->setVolume(type, AVS_SET_VOLUME_MAX, properties);
-        ASSERT_TRUE(future.get());
-    }
-}
-
-/**
- * Parameterized test for adjustVolume. One event should be sent if an AVS_SPEAKER_VOLUME typed speaker is modified.
- */
-TEST_P(SpeakerManagerTest, test_adjustVolume) {
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
-
-    for (auto& typeOfSpeaker : GetParam()) {
-        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
-        group->DelegateToReal();
-        groupVec.push_back(group);
-    }
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groupVec, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-
-    // The test adjusts the volume by AVS_ADJUST_VOLUME_MAX, which results in the lowest volume possible.
-    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-    SpeakerManagerInterface::NotificationProperties properties(SpeakerManagerObserverInterface::Source::DIRECTIVE);
-
-    for (auto type : getUniqueTypes(groupVec)) {
-        EXPECT_CALL(*m_mockStorage, saveState(_)).Times(Exactly(1));
-        EXPECT_CALL(
-            *m_observer,
-            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, type, expectedSettings))
-            .Times(Exactly(1));
-        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
-            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
-            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
-                .Times(AnyNumber());
-            EXPECT_CALL(
-                *m_mockContextManager,
-                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
-                .Times(Exactly(1));
-        }
-
-        std::future<bool> future = m_speakerManager->adjustVolume(type, AVS_ADJUST_VOLUME_MAX, properties);
-        ASSERT_TRUE(future.get());
-    }
-}
-
-/**
- * Parameterized test for setMute. One event should be sent if an AVS_SPEAKER_VOLUME typed speaker is modified.
- */
-TEST_P(SpeakerManagerTest, test_setMute) {
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
-
-    for (auto& typeOfSpeaker : GetParam()) {
-        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
-        group->DelegateToReal();
-        EXPECT_CALL(*group, setMute(_)).Times(Exactly(1));
-        EXPECT_CALL(*group, setMute(MUTE)).Times(Exactly(1));
-        groupVec.push_back(group);
-    }
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groupVec, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-
-    SpeakerInterface::SpeakerSettings expectedSettings{DEFAULT_SETTINGS.volume, MUTE};
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-    SpeakerManagerInterface::NotificationProperties properties(SpeakerManagerObserverInterface::Source::DIRECTIVE);
-
-    for (auto type : getUniqueTypes(groupVec)) {
-        EXPECT_CALL(
-            *m_observer,
-            onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, type, expectedSettings))
-            .Times(Exactly(1));
-        if (ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME == type) {
-            EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
-            EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _))
-                .Times(AnyNumber());
-            EXPECT_CALL(
-                *m_mockContextManager,
-                setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
-                .Times(Exactly(1));
-        }
-
-        std::future<bool> future = m_speakerManager->setMute(type, MUTE, properties);
-        ASSERT_TRUE(future.get());
-    }
-}
-
-/**
- * Parameterized test for getSpeakerSettings. Operation should succeed with default speaker settings.
- */
-TEST_P(SpeakerManagerTest, test_getSpeakerSettings) {
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
-    std::set<ChannelVolumeInterface::Type> uniqueTypes;
-
-    for (auto& typeOfSpeaker : GetParam()) {
-        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
-        group->DelegateToReal();
-
-        // There should be one call to getSpeakerSettings for the first speaker of each type.
-        if (uniqueTypes.find(typeOfSpeaker) == uniqueTypes.end()) {
-            EXPECT_CALL(*group, getSpeakerSettings(_)).Times(AtLeast(1));
-            uniqueTypes.insert(typeOfSpeaker);
-        }
-
-        groupVec.push_back(group);
-    }
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groupVec, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-
-    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-
-    for (auto speaker : groupVec) {
-        // SpeakerManager attempts to cache speaker settings initially. No getSpeakerSettings() call should be made to
-        // each speaker.
-        auto mockSpeaker = std::dynamic_pointer_cast<NiceMock<MockChannelVolumeInterface>>(speaker);
-        ASSERT_TRUE(mockSpeaker);
-        EXPECT_CALL(*mockSpeaker, getSpeakerSettings(_)).Times(0);
-    }
-
-    for (auto type : uniqueTypes) {
-        SpeakerInterface::SpeakerSettings settings;
-        // Query SpeakerMananger for speaker settings, value should be cached and not queried from each speaker.
-        std::future<bool> future = m_speakerManager->getSpeakerSettings(type, &settings);
-        ASSERT_TRUE(future.get());
-        ASSERT_EQ(settings.volume, DEFAULT_SETTINGS.volume);
-        ASSERT_EQ(settings.mute, DEFAULT_SETTINGS.mute);
-    }
-}
-
-/**
- * Tests SetVolume Directive. Expect that the volume is unmuted and set, as well at most one
- * event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
- * In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
- */
-TEST_P(SpeakerManagerTest, test_setVolumeDirective) {
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
-    int eventsSent = 0;
-    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
-
-    // Create Speaker objects.
-    for (auto& typeOfSpeaker : GetParam()) {
-        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
-        group->DelegateToReal();
-        int timesCalled = 0;
-        if (typeOfSpeaker == ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME) {
-            timesCalled = 1;
-        }
-
-        SpeakerInterface::SpeakerSettings temp;
-        group->getSpeakerSettings(&temp);
-        if (temp.mute) {
-            EXPECT_CALL(*group, setMute(_)).Times(Exactly(1));
-            EXPECT_CALL(*group, setMute(UNMUTE)).Times(Exactly(timesCalled));
-        }
-        EXPECT_CALL(*group, setUnduckedVolume(_)).Times(Exactly(1));
-        EXPECT_CALL(*group, setUnduckedVolume(AVS_SET_VOLUME_MAX)).Times(Exactly(timesCalled));
-
-        groupVec.push_back(group);
-    }
-
-    auto uniqueTypes = getUniqueTypes(groupVec);
-
-    // Creation expectations based on type.
-    if (uniqueTypes.count(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME)) {
-        eventsSent = 1;
-
-        EXPECT_CALL(
-            *m_observer,
-            onSpeakerSettingsChanged(
-                SpeakerManagerObserverInterface::Source::DIRECTIVE,
-                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
-                expectedSettings))
-            .Times(Exactly(1));
-        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
-        EXPECT_CALL(
-            *m_mockContextManager,
-            setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
-            .Times(Exactly(1));
-    } else {
-        EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
-        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(Exactly(0));
-    }
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(eventsSent));
-    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
-        .Times(1)
-        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groupVec, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_VOLUME.nameSpace, SET_VOLUME.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, VOLUME_PAYLOAD, attachmentManager, "");
-
-    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Tests AdjustVolume Directive. Expect that the volume is unmuted and adjusted, as well at most one
- * event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
- * In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
- */
-TEST_P(SpeakerManagerTest, test_adjustVolumeDirective) {
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
-    int eventsSent = 0;
-    SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
-
-    // Create Speaker objects.
-    for (auto& typeOfSpeaker : GetParam()) {
-        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
-        group->DelegateToReal();
-        int timesCalled = 0;
-        if (typeOfSpeaker == ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME) {
-            timesCalled = 1;
-        }
-
-        SpeakerInterface::SpeakerSettings temp;
-        group->getSpeakerSettings(&temp);
-        if (temp.mute) {
-            EXPECT_CALL(*group, setMute(_)).Times(Exactly(1));
-            EXPECT_CALL(*group, setMute(UNMUTE)).Times(Exactly(timesCalled));
-        }
-        EXPECT_CALL(*group, setUnduckedVolume(_)).Times(Exactly(1));
-        EXPECT_CALL(*group, setUnduckedVolume(AVS_SET_VOLUME_MAX)).Times(Exactly(timesCalled));
-
-        groupVec.push_back(group);
-    }
-
-    auto uniqueTypes = getUniqueTypes(groupVec);
-
-    // Creation expectations based on type.
-    if (uniqueTypes.count(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME)) {
-        eventsSent = 1;
-
-        EXPECT_CALL(
-            *m_observer,
-            onSpeakerSettingsChanged(
-                SpeakerManagerObserverInterface::Source::DIRECTIVE,
-                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
-                expectedSettings))
-            .Times(Exactly(1));
-        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
-        EXPECT_CALL(
-            *m_mockContextManager,
-            setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
-            .Times(Exactly(1));
-    } else {
-        EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
-        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(Exactly(0));
-    }
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(eventsSent));
-    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
-        .Times(1)
-        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groupVec, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(ADJUST_VOLUME.nameSpace, ADJUST_VOLUME.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, VOLUME_PAYLOAD, attachmentManager, "");
-
-    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Tests SetMute Directive. Expect that the volume is muted, as well at most one
- * event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
- * In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
- */
-TEST_P(SpeakerManagerTest, test_setMuteDirective) {
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
-    int eventsSent = 0;
-    SpeakerInterface::SpeakerSettings expectedSettings{DEFAULT_SETTINGS.volume, MUTE};
-
-    // Create Speaker objects.
-    for (auto& typeOfSpeaker : GetParam()) {
-        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
-        group->DelegateToReal();
-        int timesCalled = 0;
-        if (typeOfSpeaker == ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME) {
-            timesCalled = 1;
-        }
-
-        EXPECT_CALL(*group, setMute(_)).Times(Exactly(1));
-        EXPECT_CALL(*group, setMute(MUTE)).Times(Exactly(timesCalled));
-
-        groupVec.push_back(group);
-    }
-
-    auto uniqueTypes = getUniqueTypes(groupVec);
-
-    // Creation expectations based on type.
-    if (uniqueTypes.count(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME)) {
-        eventsSent = 1;
-
-        EXPECT_CALL(
-            *m_observer,
-            onSpeakerSettingsChanged(
-                SpeakerManagerObserverInterface::Source::DIRECTIVE,
-                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
-                expectedSettings))
-            .Times(Exactly(1));
-        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
-        EXPECT_CALL(
-            *m_mockContextManager,
-            setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _))
-            .Times(Exactly(1));
-    } else {
-        EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
-        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(Exactly(0));
-    }
-
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(eventsSent));
-    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
-        .Times(1)
-        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groupVec, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_MUTE.nameSpace, SET_MUTE.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, MUTE_PAYLOAD, attachmentManager, "");
-
-    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Test setVolume when unmute Directive sent. Setup test by setting volume to 0 and mute to true.
- * Expect that the volume is unmuted and set to MIN_UNMUTE_VOLUME, as well at most one
- * event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
- * In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
- */
-TEST_P(SpeakerManagerTest, test_setVolumeDirectiveWhenMuted) {
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
-
-    for (auto& typeOfSpeaker : GetParam()) {
-        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
-        group->DelegateToReal();
-        groupVec.push_back(group);
-    }
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groupVec, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-
-    for (auto& group : groupVec) {
-        auto mockGroup = std::dynamic_pointer_cast<NiceMock<MockChannelVolumeInterface>>(group);
-        EXPECT_CALL(*mockGroup, setUnduckedVolume(AVS_SET_VOLUME_MIN)).Times(1);
-        EXPECT_CALL(*mockGroup, setMute(MUTE)).Times(1);
-        auto typeOfSpeaker = mockGroup->getSpeakerType();
-        if (typeOfSpeaker == ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME) {
-            EXPECT_CALL(*mockGroup, setMute(UNMUTE)).Times(1);
-            EXPECT_CALL(*mockGroup, setUnduckedVolume(MIN_UNMUTE_VOLUME)).Times(1);
-        }
-    }
-
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-    SpeakerManagerInterface::NotificationProperties properties(
-        SpeakerManagerObserverInterface::Source::LOCAL_API, false, false);
-
-    for (auto type : getUniqueTypes(groupVec)) {
-        m_speakerManager->setVolume(type, AVS_SET_VOLUME_MIN, properties);
-    }
-
-    for (auto type : getUniqueTypes(groupVec)) {
-        std::future<bool> future = m_speakerManager->setMute(type, MUTE, properties);
-    }
-
-    // Check to see if AVS_SPEAKER_VOLUME speakers exist and set EXPECT_CALL accordingly
-    auto uniqueTypes = getUniqueTypes(groupVec);
-    int eventsSent = 0;
-    SpeakerInterface::SpeakerSettings unMuteSettings{MIN_UNMUTE_VOLUME, UNMUTE};
-
-    if (uniqueTypes.count(ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME)) {
-        // 2 events : {MIN_UNMUTE_VOLUME, MUTE} followed by {MIN_UNMUTE_VOLUME, UNMUTE}
-        eventsSent = 2;
-
-        EXPECT_CALL(
-            *m_observer,
-            onSpeakerSettingsChanged(
-                SpeakerManagerObserverInterface::Source::DIRECTIVE,
-                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
-                SpeakerInterface::SpeakerSettings{MIN_UNMUTE_VOLUME, MUTE}))
-            .Times(Exactly(1));
-        EXPECT_CALL(
-            *m_observer,
-            onSpeakerSettingsChanged(
-                SpeakerManagerObserverInterface::Source::DIRECTIVE,
-                ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME,
-                unMuteSettings))
-            .Times(Exactly(1));
-        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
-        EXPECT_CALL(
-            *m_mockContextManager,
-            setState(VOLUME_STATE, generateVolumeStateJson(unMuteSettings), StateRefreshPolicy::NEVER, _))
-            .Times(Exactly(1));
-    } else {
-        EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(0);
-        EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(0);
-    }
-
-    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(eventsSent);
-    EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
-        .Times(1)
-        .WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
-
-    // Create Directive to unmute the device.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_MUTE.nameSpace, SET_MUTE.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, UNMUTE_PAYLOAD, attachmentManager, "");
-
-    m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Parameterized test for getSpeakerSettings. Operation should succeed with default speaker settings.
- */
-TEST_P(SpeakerManagerTest, test_getSpeakerConfigDefaults) {
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
-    std::set<ChannelVolumeInterface::Type> uniqueTypes;
-
-    for (auto& typeOfSpeaker : GetParam()) {
-        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
-        group->DelegateToReal();
-
-        // There should be one call to getSpeakerSettings for the first speaker of each type.
-        if (uniqueTypes.find(typeOfSpeaker) == uniqueTypes.end()) {
-            EXPECT_CALL(*group, getSpeakerSettings(_)).Times(AtLeast(1));
-            uniqueTypes.insert(typeOfSpeaker);
-        }
-
-        groupVec.push_back(group);
-    }
-
-    m_mockStorage->setFailureMode();
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groupVec, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-
-    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-
-    for (auto speaker : groupVec) {
-        // SpeakerManager attempts to cache speaker settings initially. No getSpeakerSettings() call should be made to
-        // each speaker.
-        auto mockSpeaker = std::dynamic_pointer_cast<NiceMock<MockChannelVolumeInterface>>(speaker);
-        ASSERT_TRUE(mockSpeaker);
-        EXPECT_CALL(*mockSpeaker, getSpeakerSettings(_)).Times(0);
-    }
-
-    for (auto type : uniqueTypes) {
-        SpeakerInterface::SpeakerSettings settings;
-        // Query SpeakerMananger for speaker settings, value should be cached and not queried from each speaker.
-        std::future<bool> future = m_speakerManager->getSpeakerSettings(type, &settings);
-        ASSERT_TRUE(future.get());
-
-        switch (type) {
-            case avsCommon::sdkInterfaces::ChannelVolumeInterface::Type::AVS_SPEAKER_VOLUME:
-                EXPECT_EQ(settings.volume, alexaClientSDK::avsCommon::avs::speakerConstants::DEFAULT_SPEAKER_VOLUME);
-                break;
-            case avsCommon::sdkInterfaces::ChannelVolumeInterface::Type::AVS_ALERTS_VOLUME:
-                EXPECT_EQ(settings.volume, alexaClientSDK::avsCommon::avs::speakerConstants::DEFAULT_ALERTS_VOLUME);
-                break;
-        }
-        ASSERT_EQ(settings.mute, false);
-    }
-}
-
-/**
- * Parameterized test for getSpeakerSettings. Operation should succeed with speaker settings from storage.
- */
-TEST_P(SpeakerManagerTest, test_getSpeakerConfigFromStorage) {
-    std::vector<std::shared_ptr<ChannelVolumeInterface>> groupVec;
-    std::set<ChannelVolumeInterface::Type> uniqueTypes;
-
-    for (auto& typeOfSpeaker : GetParam()) {
-        auto group = std::make_shared<NiceMock<MockChannelVolumeInterface>>(typeOfSpeaker);
-        group->DelegateToReal();
-
-        // There should be one call to getSpeakerSettings for the first speaker of each type.
-        if (uniqueTypes.find(typeOfSpeaker) == uniqueTypes.end()) {
-            EXPECT_CALL(*group, getSpeakerSettings(_)).Times(AtLeast(1));
-            uniqueTypes.insert(typeOfSpeaker);
-        }
-
-        groupVec.push_back(group);
-    }
-
-    m_mockStorage->setDefaults();
-
-    m_speakerManager = SpeakerManager::create(
-        m_mockStorage, groupVec, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender, m_metricRecorder);
-
-    EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
-    m_speakerManager->addSpeakerManagerObserver(m_observer);
-
-    for (auto speaker : groupVec) {
-        // SpeakerManager attempts to cache speaker settings initially. No getSpeakerSettings() call should be made to
-        // each speaker.
-        auto mockSpeaker = std::dynamic_pointer_cast<NiceMock<MockChannelVolumeInterface>>(speaker);
-        ASSERT_TRUE(mockSpeaker);
-        EXPECT_CALL(*mockSpeaker, getSpeakerSettings(_)).Times(0);
-    }
-
-    for (auto type : uniqueTypes) {
-        SpeakerInterface::SpeakerSettings settings;
-        // Query SpeakerMananger for speaker settings, value should be cached and not queried from each speaker.
-        std::future<bool> future = m_speakerManager->getSpeakerSettings(type, &settings);
-        ASSERT_TRUE(future.get());
-
-        EXPECT_EQ(settings.volume, AVS_SET_VOLUME_MIN);
-        EXPECT_EQ(settings.mute, false);
-    }
-}
-
-}  // namespace test
-}  // namespace speakerManager
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/CapabilityAgents/SpeechSynthesizer/src/SpeechSynthesizer.cpp b/CapabilityAgents/SpeechSynthesizer/src/SpeechSynthesizer.cpp
index dfb53ab5cf..bb0ee35b78 100644
--- a/CapabilityAgents/SpeechSynthesizer/src/SpeechSynthesizer.cpp
+++ b/CapabilityAgents/SpeechSynthesizer/src/SpeechSynthesizer.cpp
@@ -52,7 +52,7 @@ static const std::string SPEECHSYNTHESIZER_CAPABILITY_INTERFACE_NAME = "SpeechSy
 static const std::string SPEECHSYNTHESIZER_CAPABILITY_INTERFACE_VERSION = "1.3";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"SpeechSynthesizer"};
+#define TAG "SpeechSynthesizer"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -261,7 +261,7 @@ avsCommon::avs::DirectiveHandlerConfiguration SpeechSynthesizer::getConfiguratio
 
 void SpeechSynthesizer::addObserver(std::shared_ptr<SpeechSynthesizerObserverInterface> observer) {
     ACSDK_DEBUG9(LX("addObserver").d("observer", observer.get()));
-    m_executor.submit([this, observer]() { m_observers.insert(observer); });
+    m_executor.execute([this, observer]() { m_observers.insert(observer); });
 }
 
 void SpeechSynthesizer::removeObserver(std::shared_ptr<SpeechSynthesizerObserverInterface> observer) {
@@ -277,7 +277,7 @@ void SpeechSynthesizer::onDeregistered() {
 void SpeechSynthesizer::handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) {
     ACSDK_DEBUG9(LX("handleDirectiveImmediately").d("messageId", directive->getMessageId()));
     auto info = createDirectiveInfo(directive, nullptr);
-    m_executor.submit([this, info]() { executeHandleImmediately(info); });
+    m_executor.execute([this, info]() { executeHandleImmediately(info); });
 }
 
 void SpeechSynthesizer::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
@@ -287,7 +287,7 @@ void SpeechSynthesizer::preHandleDirective(std::shared_ptr<DirectiveInfo> info)
     }
 
     ACSDK_DEBUG9(LX("preHandleDirective").d("messageId", info->directive->getMessageId()));
-    m_executor.submit([this, info]() { executePreHandle(info); });
+    m_executor.execute([this, info]() { executePreHandle(info); });
 }
 
 void SpeechSynthesizer::handleDirective(std::shared_ptr<DirectiveInfo> info) {
@@ -300,13 +300,13 @@ void SpeechSynthesizer::handleDirective(std::shared_ptr<DirectiveInfo> info) {
     if (info->directive->getName() == "Speak") {
         ACSDK_METRIC_MSG(TAG, info->directive, Metrics::Location::SPEECH_SYNTHESIZER_RECEIVE);
     }
-    m_executor.submit([this, info]() { executeHandle(info); });
+    m_executor.execute([this, info]() { executeHandle(info); });
 }
 
 void SpeechSynthesizer::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
     if (info && info->directive) {
         ACSDK_DEBUG9(LX("cancelDirective").d("messageId", info->directive->getMessageId()));
-        m_executor.submit([this, info]() { executeCancel(info); });
+        m_executor.execute([this, info]() { executeCancel(info); });
     } else {
         ACSDK_WARN(LX("cancelDirective").d("reason", "infoNotAvailable"));
     }
@@ -340,7 +340,7 @@ void SpeechSynthesizer::onFocusChanged(FocusState newFocus, MixingBehavior behav
     }
 
     auto currentInfo = std::make_shared<std::shared_ptr<SpeakDirectiveInfo>>(nullptr);
-    m_executor.submit([this, desiredState, currentInfo]() {
+    m_executor.execute([this, desiredState, currentInfo]() {
         *currentInfo = m_currentInfo;
         executeStateChange(desiredState);
     });
@@ -354,7 +354,7 @@ void SpeechSynthesizer::onFocusChanged(FocusState newFocus, MixingBehavior behav
                         .d("initialDesiredState", desiredState)
                         .d("desiredState", m_desiredState)
                         .d("currentState", m_currentState));
-        m_executor.submit([this, currentInfo]() {
+        m_executor.execute([this, currentInfo]() {
             ACSDK_DEBUG9(
                 LX("onFocusChangedLambda")
                     .d("currentInfo",
@@ -377,7 +377,7 @@ void SpeechSynthesizer::provideState(
     const avsCommon::avs::NamespaceAndName& stateProviderName,
     const unsigned int stateRequestToken) {
     ACSDK_DEBUG9(LX("provideState").d("token", stateRequestToken));
-    m_executor.submit([this, stateRequestToken]() {
+    m_executor.execute([this, stateRequestToken]() {
         std::lock_guard<std::mutex> lock(m_mutex);
         executeProvideStateLocked(stateRequestToken);
     });
@@ -404,7 +404,7 @@ void SpeechSynthesizer::onPlaybackStarted(SourceId id, const MediaPlayerState&)
     ACSDK_DEBUG9(LX("onPlaybackStarted").d("callbackSourceId", id));
     ACSDK_METRIC_IDS(TAG, "SpeechStarted", "", "", Metrics::Location::SPEECH_SYNTHESIZER_RECEIVE);
 
-    m_executor.submit([this, id] {
+    m_executor.execute([this, id] {
         if (id != m_mediaSourceId) {
             ACSDK_ERROR(LX("queueingExecutePlaybackStartedFailed")
                             .d("reason", "mismatchSourceId")
@@ -429,7 +429,7 @@ void SpeechSynthesizer::onPlaybackFinished(SourceId id, const MediaPlayerState&)
     ACSDK_DEBUG9(LX("onPlaybackFinished").d("callbackSourceId", id));
     ACSDK_METRIC_IDS(TAG, "SpeechFinished", "", "", Metrics::Location::SPEECH_SYNTHESIZER_RECEIVE);
 
-    m_executor.submit([this, id] {
+    m_executor.execute([this, id] {
         if (id != m_mediaSourceId) {
             ACSDK_ERROR(LX("queueingExecutePlaybackFinishedFailed")
                             .d("reason", "mismatchSourceId")
@@ -456,13 +456,13 @@ void SpeechSynthesizer::onPlaybackError(
     std::string error,
     const MediaPlayerState&) {
     ACSDK_DEBUG9(LX("onPlaybackError").d("callbackSourceId", id));
-    m_executor.submit([this, type, error]() { executePlaybackError(type, error); });
+    m_executor.execute([this, type, error]() { executePlaybackError(type, error); });
 }
 
 void SpeechSynthesizer::onPlaybackStopped(SourceId id, const MediaPlayerState&) {
     ACSDK_DEBUG9(LX("onPlaybackStopped").d("callbackSourceId", id));
 
-    m_executor.submit([this, id]() { executePlaybackStopped(id); });
+    m_executor.execute([this, id]() { executePlaybackStopped(id); });
 }
 
 void SpeechSynthesizer::onBufferUnderrun(SourceId id, const MediaPlayerState&) {
@@ -658,6 +658,7 @@ void SpeechSynthesizer::executePreHandleAfterValidation(std::shared_ptr<SpeakDir
                         .d("format", format));
         sendExceptionEncounteredAndReportFailed(
             speakInfo, avsCommon::avs::ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED, message);
+        return;
     }
 
     it = payload.FindMember(KEY_URL);
@@ -684,6 +685,7 @@ void SpeechSynthesizer::executePreHandleAfterValidation(std::shared_ptr<SpeakDir
         const std::string message("getAttachmentReaderFailed");
         ACSDK_ERROR(LX("executePreHandleFailed").d("reason", message));
         sendExceptionEncounteredAndReportFailed(speakInfo, avsCommon::avs::ExceptionErrorType::INTERNAL_ERROR, message);
+        return;
     }
 
     it = payload.FindMember(KEY_PLAY_BEHAVIOR);
@@ -1399,7 +1401,7 @@ void SpeechSynthesizer::resetMediaSourceId() {
 }
 
 void SpeechSynthesizer::onDialogUXStateChanged(DialogUXStateObserverInterface::DialogUXState newState) {
-    m_executor.submit([this, newState]() { executeOnDialogUXStateChanged(newState); });
+    m_executor.execute([this, newState]() { executeOnDialogUXStateChanged(newState); });
 }
 
 void SpeechSynthesizer::executeOnDialogUXStateChanged(DialogUXStateObserverInterface::DialogUXState newState) {
diff --git a/CapabilityAgents/SpeechSynthesizer/test/SpeechSynthesizerTest.cpp b/CapabilityAgents/SpeechSynthesizer/test/SpeechSynthesizerTest.cpp
index 0234a6f2ec..0632dfeb7c 100644
--- a/CapabilityAgents/SpeechSynthesizer/test/SpeechSynthesizerTest.cpp
+++ b/CapabilityAgents/SpeechSynthesizer/test/SpeechSynthesizerTest.cpp
@@ -167,6 +167,22 @@ static const std::string PAYLOAD_TEST_MULTIPLE_ANALYZER =
             "]"
         "}";
 // clang-format on
+/// A complete unparsed JSON directive for creating a directive without an attachment manager.
+// clang-format off
+static const std::string UNPARSED_DIRECTIVE_TEST =
+        "{"
+            "\"directive\": {"
+                "\"header\": {"
+                    "\"namespace\":\"" + NAMESPACE_SPEECH_SYNTHESIZER + "\","
+                    "\"name\":\"" + NAME_SPEAK + "\","
+                    "\"messageId\":\"" + MESSAGE_ID_TEST + "\","
+                    "\"dialogRequestId\":\"" + DIALOG_REQUEST_ID_TEST + "\""
+                "},"
+                "\"payload\":" +
+                    PAYLOAD_TEST +
+            "}"
+        "}";
+// clang-format on
 
 /// The @c FINISHED state of the @c SpeechSynthesizer.
 static const std::string FINISHED_STATE("FINISHED");
@@ -1950,7 +1966,87 @@ TEST_F(SpeechSynthesizerTest, test_parsingMultipleAnalyzerConfig) {
     ASSERT_TRUE(std::future_status::ready == m_wakeSendMessageFuture.wait_for(MY_WAIT_TIMEOUT));
 }
 
+/*
+
+ * Test playing a directive after capability agent is given a empty attachment reader.
+
+ *
+
+ * Expect the speech synthesizer to cancel the first directive, and play the second directive.
+
+ */
+
+TEST_F(SpeechSynthesizerTest, test_handleDirectiveWithEmptyAttachment) {
+    std::pair<std::unique_ptr<AVSDirective>, AVSDirective::ParseStatus> directivePair =
+        AVSDirective::create(UNPARSED_DIRECTIVE_TEST, nullptr, CONTEXT_ID_TEST);
+
+    std::shared_ptr<AVSDirective> directiveOne = std::move(directivePair.first);
+    {
+        SCOPED_TRACE("Empty attachment manager directive.");
+        EXPECT_CALL(*(m_mockFocusManager.get()), acquireChannel(CHANNEL_NAME, _))
+            .Times(0)
+            .WillOnce(InvokeWithoutArgs(this, &SpeechSynthesizerTest::wakeOnAcquireChannel));
+        EXPECT_CALL(
+            *(m_mockSpeechPlayer.get()),
+            attachmentSetSource(A<std::shared_ptr<avsCommon::avs::attachment::AttachmentReader>>(), nullptr))
+            .Times(0);
+        EXPECT_CALL(*(m_mockSpeechPlayer.get()), play(_)).Times(0);
+
+        m_speechSynthesizer->handleDirectiveImmediately(directiveOne);
+    }
+
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(
+        NAMESPACE_SPEECH_SYNTHESIZER, NAME_SPEAK, MESSAGE_ID_TEST_2, DIALOG_REQUEST_ID_TEST);
+    std::shared_ptr<AVSDirective> directiveTwo =
+        AVSDirective::create("", avsMessageHeader, PAYLOAD_TEST, m_attachmentManager, CONTEXT_ID_TEST);
+    {
+        SCOPED_TRACE("Check success after failed.");
+        EXPECT_CALL(*(m_mockFocusManager.get()), acquireChannel(CHANNEL_NAME, _))
+            .Times(1)
+            .WillOnce(InvokeWithoutArgs(this, &SpeechSynthesizerTest::wakeOnAcquireChannel));
+        EXPECT_CALL(
+            *(m_mockSpeechPlayer.get()),
+            attachmentSetSource(A<std::shared_ptr<avsCommon::avs::attachment::AttachmentReader>>(), nullptr))
+            .Times(AtLeast(1));
+        EXPECT_CALL(*(m_mockSpeechPlayer.get()), play(_)).Times(AtLeast(1));
+        EXPECT_CALL(*(m_mockSpeechPlayer.get()), getOffset(_))
+            .Times(1)
+            .WillOnce(Return(OFFSET_IN_CHRONO_MILLISECONDS_TEST));
+        EXPECT_CALL(*(m_mockSpeechPlayer.get()), getMediaPlayerState(_)).Times(AtLeast(2));
+        EXPECT_CALL(
+            *(m_mockContextManager.get()),
+            setState(NAMESPACE_AND_NAME_SPEECH_STATE, PLAYING_STATE_TEST, StateRefreshPolicy::ALWAYS, 0))
+            .Times(AtLeast(1))
+            .WillOnce(InvokeWithoutArgs(this, &SpeechSynthesizerTest::wakeOnSetState));
+        EXPECT_CALL(*(m_mockMessageSender.get()), sendMessage(_))
+            .Times(AtLeast(1))
+            .WillRepeatedly(InvokeWithoutArgs(this, &SpeechSynthesizerTest::wakeOnSendMessage));
+        EXPECT_CALL(*m_mockCaptionManager, isEnabled()).WillRepeatedly(Return(true));
+        EXPECT_CALL(*m_mockCaptionManager, onCaption(_, _)).Times(1);
+        EXPECT_CALL(*m_mockPowerResourceManager, acquire(_, _)).Times(AtLeast(1));
+
+        std::vector<audioAnalyzer::AudioAnalyzerState> data;
+        EXPECT_CALL(
+            *m_mockSpeechSynthesizerObserver,
+            onStateChanged(SpeechSynthesizerObserverInterface::SpeechSynthesizerState::GAINING_FOCUS, _, _, _))
+            .Times(1);
+        EXPECT_CALL(
+            *m_mockSpeechSynthesizerObserver,
+            onStateChanged(SpeechSynthesizerObserverInterface::SpeechSynthesizerState::PLAYING, _, _, Eq(data)))
+            .Times(1);
+
+        m_speechSynthesizer->addObserver(m_mockSpeechSynthesizerObserver);
+        m_speechSynthesizer->handleDirectiveImmediately(directiveTwo);
+        ASSERT_TRUE(std::future_status::ready == m_wakeAcquireChannelFuture.wait_for(MY_WAIT_TIMEOUT));
+        m_speechSynthesizer->onFocusChanged(FocusState::FOREGROUND, MixingBehavior::PRIMARY);
+        ASSERT_TRUE(std::future_status::ready == m_wakeSetStateFuture.wait_for(MY_WAIT_TIMEOUT));
+        m_wakeSetStatePromise = std::promise<void>();
+        m_wakeSetStateFuture = m_wakeSetStatePromise.get_future();
+        ASSERT_TRUE(m_mockSpeechPlayer->waitUntilPlaybackStarted());
+    }
+}
+
 }  // namespace test
 }  // namespace speechSynthesizer
 }  // namespace capabilityAgents
-}  // namespace alexaClientSDK
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/CapabilityAgents/System/src/LocaleHandler.cpp b/CapabilityAgents/System/src/LocaleHandler.cpp
index a850e8dcf4..42b378e85e 100644
--- a/CapabilityAgents/System/src/LocaleHandler.cpp
+++ b/CapabilityAgents/System/src/LocaleHandler.cpp
@@ -36,7 +36,7 @@ using namespace avsCommon::utils::logger;
 using namespace settings;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("LocaleHandler");
+#define TAG "LocaleHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -115,7 +115,7 @@ void LocaleHandler::handleDirective(std::shared_ptr<CapabilityAgent::DirectiveIn
         ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirective"));
         return;
     }
-    m_executor.submit([this, info]() { executeHandleDirective(info); });
+    m_executor.execute([this, info]() { executeHandleDirective(info); });
 }
 
 void LocaleHandler::cancelDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
diff --git a/CapabilityAgents/System/src/ReportStateHandler.cpp b/CapabilityAgents/System/src/ReportStateHandler.cpp
index e361dad64c..974d6590f0 100644
--- a/CapabilityAgents/System/src/ReportStateHandler.cpp
+++ b/CapabilityAgents/System/src/ReportStateHandler.cpp
@@ -31,7 +31,7 @@ using namespace avsCommon::utils::error;
 using namespace settings;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ReportStateHandler");
+#define TAG "ReportStateHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -171,7 +171,7 @@ void ReportStateHandler::handleDirectiveImmediately(std::shared_ptr<AVSDirective
         return;
     }
 
-    m_executor.submit([this, directive] { handleReportState(*directive); });
+    m_executor.execute([this, directive] { handleReportState(*directive); });
 }
 
 void ReportStateHandler::handleDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
@@ -185,7 +185,7 @@ void ReportStateHandler::handleDirective(std::shared_ptr<CapabilityAgent::Direct
         return;
     }
 
-    m_executor.submit([this, info] {
+    m_executor.execute([this, info] {
         auto ok = handleReportState(*(info->directive));
         if (info->result) {
             if (ok) {
@@ -241,7 +241,7 @@ void ReportStateHandler::initialize() {
     m_connectionObserver = SettingConnectionObserver::create([this](bool isConnected) {
         if (isConnected) {
             std::lock_guard<std::mutex> lock(m_stateMutex);
-            m_executor.submit([this] { sendReportState(); });
+            m_executor.execute([this] { sendReportState(); });
         }
     });
     m_connectionManager->addConnectionStatusObserver(m_connectionObserver);
diff --git a/CapabilityAgents/System/src/RevokeAuthorizationHandler.cpp b/CapabilityAgents/System/src/RevokeAuthorizationHandler.cpp
index c45de104e3..0686d5fada 100644
--- a/CapabilityAgents/System/src/RevokeAuthorizationHandler.cpp
+++ b/CapabilityAgents/System/src/RevokeAuthorizationHandler.cpp
@@ -31,7 +31,7 @@ using namespace avsCommon::utils::json;
 using namespace rapidjson;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"RevokeAuthorizationHandler"};
+#define TAG "RevokeAuthorizationHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CapabilityAgents/System/src/SoftwareInfoSendRequest.cpp b/CapabilityAgents/System/src/SoftwareInfoSendRequest.cpp
index f06c1b43d9..21ca43378e 100644
--- a/CapabilityAgents/System/src/SoftwareInfoSendRequest.cpp
+++ b/CapabilityAgents/System/src/SoftwareInfoSendRequest.cpp
@@ -40,7 +40,7 @@ using namespace avsCommon::utils::json;
 using namespace rapidjson;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"SoftwareInfoSendRequest"};
+#define TAG "SoftwareInfoSendRequest"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CapabilityAgents/System/src/SoftwareInfoSender.cpp b/CapabilityAgents/System/src/SoftwareInfoSender.cpp
index 82ea66aa28..4589cdd6f6 100644
--- a/CapabilityAgents/System/src/SoftwareInfoSender.cpp
+++ b/CapabilityAgents/System/src/SoftwareInfoSender.cpp
@@ -34,7 +34,7 @@ using namespace avsCommon::utils::json;
 using namespace rapidjson;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"SoftwareInfoSender"};
+#define TAG "SoftwareInfoSender"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CapabilityAgents/System/src/StateReportGenerator.cpp b/CapabilityAgents/System/src/StateReportGenerator.cpp
index 9d96882579..66f408b0c0 100644
--- a/CapabilityAgents/System/src/StateReportGenerator.cpp
+++ b/CapabilityAgents/System/src/StateReportGenerator.cpp
@@ -27,7 +27,7 @@ using namespace avsCommon::utils;
 using namespace avsCommon::utils::json;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("StateReportGenerator");
+#define TAG "StateReportGenerator"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CapabilityAgents/System/src/SystemCapabilityProvider.cpp b/CapabilityAgents/System/src/SystemCapabilityProvider.cpp
index 9748c8a857..f5a3611721 100644
--- a/CapabilityAgents/System/src/SystemCapabilityProvider.cpp
+++ b/CapabilityAgents/System/src/SystemCapabilityProvider.cpp
@@ -29,7 +29,7 @@ namespace system {
 using namespace avsCommon::avs;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"SystemCapabilityProvider"};
+#define TAG "SystemCapabilityProvider"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CapabilityAgents/System/src/TimeZoneHandler.cpp b/CapabilityAgents/System/src/TimeZoneHandler.cpp
index 73c398d911..a21302208a 100644
--- a/CapabilityAgents/System/src/TimeZoneHandler.cpp
+++ b/CapabilityAgents/System/src/TimeZoneHandler.cpp
@@ -34,7 +34,7 @@ using namespace avsCommon::utils::logger;
 using namespace settings;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("TimeZoneHandler");
+#define TAG "TimeZoneHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -85,7 +85,7 @@ void TimeZoneHandler::handleDirectiveImmediately(std::shared_ptr<AVSDirective> d
         return;
     }
     auto info = createDirectiveInfo(directive, nullptr);
-    m_executor.submit([this, info]() { executeHandleDirectiveImmediately(info); });
+    m_executor.execute([this, info]() { executeHandleDirectiveImmediately(info); });
 }
 void TimeZoneHandler::preHandleDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
     // intentional no-op
@@ -95,7 +95,7 @@ void TimeZoneHandler::handleDirective(std::shared_ptr<CapabilityAgent::Directive
         ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "info is nullptr."));
         return;
     }
-    m_executor.submit([this, info]() { executeHandleDirectiveImmediately(info); });
+    m_executor.execute([this, info]() { executeHandleDirectiveImmediately(info); });
 }
 void TimeZoneHandler::cancelDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
     // intentional no-op
diff --git a/CapabilityAgents/System/src/UserInactivityMonitor.cpp b/CapabilityAgents/System/src/UserInactivityMonitor.cpp
index 3d8ca625bf..3e052f33ad 100644
--- a/CapabilityAgents/System/src/UserInactivityMonitor.cpp
+++ b/CapabilityAgents/System/src/UserInactivityMonitor.cpp
@@ -34,7 +34,7 @@ using namespace avsCommon::utils::json;
 using namespace rapidjson;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("UserInactivityMonitor");
+#define TAG "UserInactivityMonitor"
 
 /// Number of seconds in one hour.
 static const int SECONDS_IN_HOUR = 3600;
@@ -147,7 +147,7 @@ void UserInactivityMonitor::sendInactivityReport() {
         return;
     }
     Document inactivityPayload(kObjectType);
-    SizeType payloadKeySize = INACTIVITY_EVENT_PAYLOAD_KEY.length();
+    SizeType payloadKeySize = static_cast<SizeType>(INACTIVITY_EVENT_PAYLOAD_KEY.length());
     const Pointer::Token payloadKey[] = {{INACTIVITY_EVENT_PAYLOAD_KEY.c_str(), payloadKeySize, kPointerInvalidIndex}};
 
     // AVS requires inactivity time to be a multiple of 3600.
diff --git a/CapabilityAgents/TemplateRuntime/CMakeLists.txt b/CapabilityAgents/TemplateRuntime/CMakeLists.txt
deleted file mode 100644
index f637b4bf9e..0000000000
--- a/CapabilityAgents/TemplateRuntime/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-project(TemplateRuntime LANGUAGES CXX)
-
-add_subdirectory("src")
-add_subdirectory("test")
diff --git a/CapabilityAgents/TemplateRuntime/include/TemplateRuntime/RenderPlayerInfoCardsProviderRegistrar.h b/CapabilityAgents/TemplateRuntime/include/TemplateRuntime/RenderPlayerInfoCardsProviderRegistrar.h
deleted file mode 100644
index 5d2d1edbf2..0000000000
--- a/CapabilityAgents/TemplateRuntime/include/TemplateRuntime/RenderPlayerInfoCardsProviderRegistrar.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_INCLUDE_TEMPLATERUNTIME_RENDERPLAYERINFOCARDSPROVIDERREGISTRAR_H_
-#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_INCLUDE_TEMPLATERUNTIME_RENDERPLAYERINFOCARDSPROVIDERREGISTRAR_H_
-
-#include <mutex>
-
-#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderInterface.h>
-#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderRegistrarInterface.h>
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace templateRuntime {
-
-/**
- * Class to accumulate the set of @c RenderPlayerInfoCardsProvider instances for creating the TemplateRuntime CA.
- */
-class RenderPlayerInfoCardsProviderRegistrar
-        : public avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface {
-public:
-    /**
-     * Create a new instance of @c RenderPlayerInfoCardsProviderRegistrar.
-     *
-     * @return A new instance of @c PostConnectOperationProviderRegistrar.
-     */
-    static std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface>
-    createRenderPlayerInfoCardsProviderRegistrarInterface();
-
-    /// @name RenderPlayerInfoCardsProviderRegistrarInterface methods.
-    /// @{
-    bool registerProvider(
-        const std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>& provider) override;
-
-    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>> getProviders()
-        override;
-    /// @}
-
-private:
-    /**
-     * Constructor.
-     */
-    RenderPlayerInfoCardsProviderRegistrar();
-
-    /// Serializes access to @c m_providers.
-    std::mutex m_mutex;
-
-    /// The @c RenderPlayerInfoCardsProviderInterface instances to use for the TemplateRuntime CA.
-    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>> m_providers;
-};
-
-}  // namespace templateRuntime
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_INCLUDE_TEMPLATERUNTIME_RENDERPLAYERINFOCARDSPROVIDERREGISTRAR_H_
diff --git a/CapabilityAgents/TemplateRuntime/include/TemplateRuntime/TemplateRuntime.h b/CapabilityAgents/TemplateRuntime/include/TemplateRuntime/TemplateRuntime.h
deleted file mode 100644
index 81d4eafd29..0000000000
--- a/CapabilityAgents/TemplateRuntime/include/TemplateRuntime/TemplateRuntime.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_INCLUDE_TEMPLATERUNTIME_TEMPLATERUNTIME_H_
-#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_INCLUDE_TEMPLATERUNTIME_TEMPLATERUNTIME_H_
-
-#include <chrono>
-#include <deque>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-
-#include <AVSCommon/AVS/CapabilityAgent.h>
-#include <AVSCommon/AVS/CapabilityConfiguration.h>
-#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
-#include <AVSCommon/SDKInterfaces/DialogUXStateObserverInterface.h>
-#include <AVSCommon/SDKInterfaces/FocusManagerInterface.h>
-#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsObserverInterface.h>
-#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderInterface.h>
-#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderRegistrarInterface.h>
-#include <AVSCommon/SDKInterfaces/TemplateRuntimeObserverInterface.h>
-#include <AVSCommon/Utils/RequiresShutdown.h>
-#include <AVSCommon/Utils/Threading/Executor.h>
-#include <AVSCommon/Utils/Timing/Timer.h>
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace templateRuntime {
-
-/**
- * This class implements a @c CapabilityAgent that handles the AVS @c TemplateRuntime API.  The
- * @c TemplateRuntime CA is responsible for handling the directives with the TemplateRuntime namespace.  Due
- * to the fact that the @c RenderPlayerInfo directives are closely related to the @c AudioPlayer, the @c TemplateRuntime
- * CA is an observer to the AudioPlayer and will be synchronizing the @c RenderPlayerInfo directives with the
- * corresponding @c AudioItem being handled in the @c AudioPlayer.
- *
- * The @c TemplateRuntime CA is also an observer to the @c DialogUXState to determine the end of a interaction so
- * that it would know when to clear a @c RenderTemplate displayCard.
- *
- * The clients who are interested in any TemplateRuntime directives can subscribe themselves as an observer, and the
- * clients will be notified via the TemplateRuntimeObserverInterface.
- */
-class TemplateRuntime
-        : public avsCommon::avs::CapabilityAgent
-        , public avsCommon::utils::RequiresShutdown
-        , public avsCommon::sdkInterfaces::RenderPlayerInfoCardsObserverInterface
-        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
-        , public avsCommon::sdkInterfaces::DialogUXStateObserverInterface
-        , public std::enable_shared_from_this<TemplateRuntime> {
-public:
-    /**
-     * Create an instance of @c TemplateRuntime.
-     *
-     * @param renderPlayerInfoCardsProviderRegistrar The registrar containing the set of @c
-     * RenderPlayerInfoCardsProviders.
-     * @param exceptionSender The object to use for sending AVS Exception messages.
-     * @return @c nullptr if the inputs are not defined, else a new instance of @c TemplateRuntime.
-     */
-    static std::shared_ptr<TemplateRuntime> createTemplateRuntime(
-        const std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface>&
-            renderPlayerInfoCardsInterfaces,
-        std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
-        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender);
-
-    /**
-     * Create an instance of @c TemplateRuntime.
-     *
-     * @param renderPlayerInfoCardsInterfaces A set of objects to use for subscribing @c TemplateRuntime as an
-     * observer of changes for RenderPlayerInfoCards.
-     * @param exceptionSender The object to use for sending AVS Exception messages.
-     * @return @c nullptr if the inputs are not defined, else a new instance of @c TemplateRuntime.
-     */
-    static std::shared_ptr<TemplateRuntime> create(
-        const std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>>&
-            renderPlayerInfoCardsInterfaces,
-        std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
-        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender);
-
-    /**
-     * Destructor.
-     */
-    virtual ~TemplateRuntime() = default;
-
-    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
-    /// @{
-    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
-    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
-    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
-    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
-    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
-    /// @}
-
-    /// @name ChannelObserverInterface Functions
-    /// @{
-    void onFocusChanged(avsCommon::avs::FocusState newFocus, avsCommon::avs::MixingBehavior behavior) override;
-    /// @}
-
-    /// @name RenderPlayerInfoCardsObserverInterface Functions
-    /// @{
-    void onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity state, const Context& context) override;
-    /// @}
-
-    /// @name DialogUXStateObserverInterface Functions
-    /// @{
-    void onDialogUXStateChanged(
-        avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState newState) override;
-    /// @}
-
-    /**
-     * This function adds an observer to @c TemplateRuntime so that it will get notified for renderTemplateCard or
-     * renderPlayerInfoCard.
-     *
-     * @param observer The @c TemplateRuntimeObserverInterface
-     */
-    void addObserver(std::shared_ptr<avsCommon::sdkInterfaces::TemplateRuntimeObserverInterface> observer);
-
-    /**
-     * This function removes an observer from @c TemplateRuntime so that it will no longer be notified of
-     * renderTemplateCard or renderPlayerInfoCard callbacks.
-     *
-     * @param observer The @c TemplateRuntimeObserverInterface
-     */
-    void removeObserver(std::shared_ptr<avsCommon::sdkInterfaces::TemplateRuntimeObserverInterface> observer);
-
-    /**
-     * This function notifies the @c TemplateRuntime that a displayCard has been cleared from the screen.  Upon getting
-     * this notification, the @c TemplateRuntime will release the visual channel.
-     */
-    void displayCardCleared();
-
-    /// @name CapabilityConfigurationInterface Functions
-    /// @{
-    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
-    /// @}
-
-    /**
-     * This function adds a @RenderPlayerInfoCardsProviderInterface for a client to subscribe @c TemplateRuntime as an
-     * observer of changes for RenderPlayerInfoCards.
-     *
-     * @param cardsProvider The @c RenderPlayerInfoCardsProviderInterface
-     */
-    void addRenderPlayerInfoCardsProvider(
-        std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface> cardsProvider);
-
-private:
-    /**
-     * This enum provides the state of the @c TemplateRuntime.
-     */
-    enum class State {
-        /// The @c TemplateRuntime is idle.
-        IDLE,
-
-        /*
-         * The @c TemplateRuntime has received a displayCard event is acquiring the visual channel from @c
-         * FocusManager.
-         */
-        ACQUIRING,
-
-        /*
-         * The @c TemplateRuntime has focus, either background or foreground, of the channel and has
-         * notified its observers of a displayCard.  @TemplateRuntime will remain in this state until there is a
-         * timeout, clearCard, or focusChanged(NONE) event.
-         */
-        DISPLAYING,
-
-        /*
-         * The @c TemplateRuntime has received a timeout or a clearCard event and is releasing the
-         * channel and has notified its observers to clear the display.
-         */
-        RELEASING,
-
-        /*
-         * The @c TemplateRuntime has received a displayCard event during releasing of the channel and is trying to
-         * acquire the visual channel again.
-         */
-        REACQUIRING
-    };
-
-    /**
-     * Utility structure to correspond a directive with its audioItemId.
-     */
-    struct AudioItemPair {
-        /**
-         * Default Constructor.
-         */
-        AudioItemPair() = default;
-
-        /**
-         * Constructor.
-         *
-         * @param itemId The ID for the @c AudioItem.
-         * @param renderPlayerInfoDirective The @c RenderPlayerInfo directive that corresponds to the audioItemId.
-         */
-        AudioItemPair(
-            std::string itemId,
-            std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> renderPlayerInfoDirective) :
-                audioItemId{itemId},
-                directive{renderPlayerInfoDirective} {};
-
-        /// The ID of the @c AudioItem.
-        std::string audioItemId;
-
-        /// The directive corresponding to the audioItemId.
-        std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> directive;
-    };
-
-    /**
-     * Constructor.
-     *
-     * @param renderPlayerInfoCardsInterfaces A set of objects to use for subscribing @c TemplateRuntime as an
-     * observer of changes for RenderPlayerInfoCards.
-     * @param exceptionSender The object to use for sending AVS Exception messages.
-     */
-    TemplateRuntime(
-        const std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>>&
-            renderPlayerInfoCardsInterfaces,
-        std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
-        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender);
-
-    // @name RequiresShutdown Functions
-    /// @{
-    void doShutdown() override;
-    /// @}
-
-    /**
-     * Initializes the object by reading the values from configuration.
-     */
-    bool initialize();
-
-    /**
-     * Remove a directive from the map of message IDs to DirectiveInfo instances.
-     *
-     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
-     */
-    void removeDirective(std::shared_ptr<DirectiveInfo> info);
-
-    /**
-     * Send the handling completed notification and clean up the resources.
-     *
-     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
-     */
-    void setHandlingCompleted(std::shared_ptr<DirectiveInfo> info);
-
-    /**
-     * This function handles a @c RenderTemplate directive.
-     *
-     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
-     */
-    void handleRenderTemplateDirective(std::shared_ptr<DirectiveInfo> info);
-
-    /**
-     * This function handles a @c RenderPlayerInfo directive.
-     *
-     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
-     */
-    void handleRenderPlayerInfoDirective(std::shared_ptr<DirectiveInfo> info);
-
-    /**
-     * This function handles any unknown directives received by @c TemplateRuntime CA.
-     *
-     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
-     */
-    void handleUnknownDirective(std::shared_ptr<DirectiveInfo> info);
-
-    /**
-     * This is an internal function that handles updating the @c m_audioItemInExecution when the @c AudioPlayer
-     * notifies the @c TemplateRuntime CA of any changes in the @c AudioPlayer audio state.  This function is
-     * intended to be used in the context of @c m_executor worker thread.
-     *
-     * @param state The @c PlayerActivity of the @c AudioPlayer.
-     * @param context The @c Context of the @c AudioPlayer at the time of the notification.
-     */
-    void executeAudioPlayerInfoUpdates(avsCommon::avs::PlayerActivity state, const Context& context);
-
-    /**
-     * This is an internal function that start or stop the @c m_clearDisplayTimer based on the @c PlayerActivity
-     * reported by the @c AudioPlayer.
-     *
-     * @param state The @c PlayerActivity of the @c AudioPlayer.
-     */
-    void executeAudioPlayerStartTimer(avsCommon::avs::PlayerActivity state);
-
-    /**
-     * This function handles the notification of the renderPlayerInfoCard callbacks to all the observers.  This function
-     * is intended to be used in the context of @c m_executor worker thread.
-     */
-    void executeRenderPlayerInfoCallbacks(bool isClearCard);
-
-    /**
-     * This function handles the notification of the renderTemplateCard callbacks to all the observers.  This function
-     * is intended to be used in the context of @c m_executor worker thread.
-     */
-    void executeRenderTemplateCallbacks(bool isClearCard);
-
-    /**
-     * This is an internal function that is called when the state machine is ready to notify the @TemplateRuntime
-     * observers to display a card.
-     */
-    void executeDisplayCard();
-
-    /**
-     * This is an internal function that is called when the state machine is ready to notify the @TemplateRuntime
-     * observers to clear a card.
-     */
-    void executeClearCard();
-
-    /**
-     * This is an internal function to start the @c m_clearDisplayTimer.
-     *
-     * @param timeout The period of the timer.
-     */
-    void executeStartTimer(std::chrono::milliseconds timeout);
-
-    /**
-     * This is an internal function to stop the @c m_clearDisplayTimer.
-     */
-    void executeStopTimer();
-
-    /**
-     * This is an internal function to convert the @c State to a string.
-     */
-    std::string stateToString(const TemplateRuntime::State state);
-
-    /**
-     * This is a state machine function to handle the timer event.
-     */
-    void executeTimerEvent();
-
-    /**
-     * This is a state machine function to handle the focus change event.
-     */
-    void executeOnFocusChangedEvent(avsCommon::avs::FocusState newFocus);
-
-    /**
-     * This is a state machine function to handle the displayCard event.
-     */
-    void executeDisplayCardEvent(
-        const std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> info);
-
-    /**
-     * This is a state machine function to handle the clearCard event.
-     */
-    void executeCardClearedEvent();
-
-    /// Timer that is responsible for clearing the display.
-    avsCommon::utils::timing::Timer m_clearDisplayTimer;
-
-    /**
-     * @name Executor Thread Variables
-     *
-     * These member variables are only accessed by functions in the @c m_executor worker thread, and do not require any
-     * synchronization.
-     */
-    /// @{
-    /// A set of observers to be notified when a @c RenderTemplate or @c RenderPlayerInfo directive is received
-    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::TemplateRuntimeObserverInterface>> m_observers;
-
-    /*
-     * This is a map that is used to store the current executing @c AudioItem based on the callbacks from the
-     * @c RenderPlayerInfoCardsProviderInterface.
-     */
-    std::unordered_map<std::shared_ptr<avsCommon::sdkInterfaces::MediaPropertiesInterface>, AudioItemPair>
-        m_audioItemsInExecution;
-
-    /// The current active RenderPlayerInfoCards provider that has the matching audioItemId.
-    std::shared_ptr<avsCommon::sdkInterfaces::MediaPropertiesInterface> m_activeRenderPlayerInfoCardsProvider;
-
-    /*
-     * This queue is for storing the @c RenderPlayerInfo directives when its audioItemId does not match the audioItemId
-     * in execution in the @c AudioPlayer.
-     */
-    std::deque<AudioItemPair> m_audioItems;
-
-    /// This map is to store the @c AudioPlayerInfo to be passed to the observers in the renderPlayerInfoCard callback.
-    std::unordered_map<
-        std::shared_ptr<avsCommon::sdkInterfaces::MediaPropertiesInterface>,
-        avsCommon::sdkInterfaces::TemplateRuntimeObserverInterface::AudioPlayerInfo>
-        m_audioPlayerInfo;
-
-    /// The directive corresponding to the RenderTemplate directive.
-    std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> m_lastDisplayedDirective;
-
-    /// A flag to check if @c RenderTemplate is the last directive received.
-    bool m_isRenderTemplateLastReceived;
-
-    /// The current focus state of the @c TemplateRuntime on the visual channel.
-    avsCommon::avs::FocusState m_focus;
-
-    /// The state of the @c TemplateRuntime state machine.
-    State m_state;
-    /// @}
-
-    /*
-     * This is a set of interfaces to the @c RenderPlayerInfoCardsProviderInterface.  The @c TemplateRuntime CA
-     * used this interface to add and remove itself as an observer.
-     */
-    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>>
-        m_renderPlayerInfoCardsInterfaces;
-
-    /// The @c FocusManager used to manage usage of the visual channel.
-    std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> m_focusManager;
-
-    /// Set of capability configurations that will get published using the Capabilities API
-    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> m_capabilityConfigurations;
-
-    /// This is the worker thread for the @c TemplateRuntime CA.
-    avsCommon::utils::threading::Executor m_executor;
-
-    /// The timeout value in ms for clearing the diplay card when TTS is FINSIHED
-    std::chrono::milliseconds m_ttsFinishedTimeout;
-
-    /// The timeout value in ms for clearing the diplay card when AudioPlay is FINSIHED
-    std::chrono::milliseconds m_audioPlaybackFinishedTimeout;
-
-    /// The timeout value in ms for clearing the diplay card when AudioPlay is STOPPED or PAUSED
-    std::chrono::milliseconds m_audioPlaybackStoppedPausedTimeout;
-};
-
-}  // namespace templateRuntime
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_INCLUDE_TEMPLATERUNTIME_TEMPLATERUNTIME_H_
diff --git a/CapabilityAgents/TemplateRuntime/src/CMakeLists.txt b/CapabilityAgents/TemplateRuntime/src/CMakeLists.txt
deleted file mode 100644
index 8755e32d20..0000000000
--- a/CapabilityAgents/TemplateRuntime/src/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-add_definitions("-DACSDK_LOG_MODULE=templateRuntime")
-
-add_library(TemplateRuntime
-    "${CMAKE_CURRENT_LIST_DIR}/TemplateRuntime.cpp"
-    "${CMAKE_CURRENT_LIST_DIR}/RenderPlayerInfoCardsProviderRegistrar.cpp")
-
-target_include_directories(TemplateRuntime
-    PUBLIC "${TemplateRuntime_SOURCE_DIR}/include")
-
-target_link_libraries(TemplateRuntime AVSCommon)
-
-# install target
-asdk_install()
\ No newline at end of file
diff --git a/CapabilityAgents/TemplateRuntime/src/TemplateRuntime.cpp b/CapabilityAgents/TemplateRuntime/src/TemplateRuntime.cpp
deleted file mode 100644
index 5a19ef6994..0000000000
--- a/CapabilityAgents/TemplateRuntime/src/TemplateRuntime.cpp
+++ /dev/null
@@ -1,820 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <ostream>
-
-#include <rapidjson/error/en.h>
-
-#include <AVSCommon/AVS/CapabilityConfiguration.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
-#include <AVSCommon/Utils/Logger/Logger.h>
-
-#include "TemplateRuntime/TemplateRuntime.h"
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace templateRuntime {
-
-using namespace avsCommon::avs;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils;
-using namespace avsCommon::utils::configuration;
-using namespace avsCommon::utils::json;
-
-/// TemplateRuntime capability constants
-/// TemplateRuntime interface type
-static const std::string TEMPLATERUNTIME_CAPABILITY_INTERFACE_TYPE = "AlexaInterface";
-/// TemplateRuntime interface name
-static const std::string TEMPLATERUNTIME_CAPABILITY_INTERFACE_NAME = "TemplateRuntime";
-/// TemplateRuntime interface version
-static const std::string TEMPLATERUNTIME_CAPABILITY_INTERFACE_VERSION = "1.1";
-
-/// String to identify log entries originating from this file.
-static const std::string TAG{"TemplateRuntime"};
-
-/// The key in our config file to find the root of template runtime configuration.
-static const std::string TEMPLATERUNTIME_CONFIGURATION_ROOT_KEY = "templateRuntimeCapabilityAgent";
-/// The key in our config file to set the display card timeout value when TTS is in FINISHED state
-static const std::string TEMPLATERUNTIME_TTS_FINISHED_KEY = "displayCardTTSFinishedTimeout";
-/// The key in our config file to set the display card timeout value when AudioPlayer is in FINISHED state
-static const std::string TEMPLATERUNTIME_AUDIOPLAYBACK_FINISHED_KEY = "displayCardAudioPlaybackFinishedTimeout";
-/// The key in our config file to set the display card timeout value when AudioPlayer is in STOPPED or PAUSE state
-static const std::string TEMPLATERUNTIME_AUDIOPLAYBACK_STOPPED_PAUSED_KEY =
-    "displayCardAudioPlaybackStoppedPausedTimeout";
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// The name of the @c FocusManager channel used by @c TemplateRuntime.
-static const std::string CHANNEL_NAME = avsCommon::sdkInterfaces::FocusManagerInterface::VISUAL_CHANNEL_NAME;
-
-/// The namespace for this capability agent.
-static const std::string NAMESPACE{"TemplateRuntime"};
-
-/// The name for RenderTemplate directive.
-static const std::string RENDER_TEMPLATE{"RenderTemplate"};
-
-/// The name for RenderPlayerInfo directive.
-static const std::string RENDER_PLAYER_INFO{"RenderPlayerInfo"};
-
-/// The RenderTemplate directive signature.
-static const NamespaceAndName TEMPLATE{NAMESPACE, RENDER_TEMPLATE};
-
-/// The RenderPlayerInfo directive signature.
-static const NamespaceAndName PLAYER_INFO{NAMESPACE, RENDER_PLAYER_INFO};
-
-/// Tag for find the AudioItemId in the payload of the RenderPlayerInfo directive
-static const std::string AUDIO_ITEM_ID_TAG{"audioItemId"};
-
-/// Maximum queue size allowed for m_audioItems.
-static const size_t MAXIMUM_QUEUE_SIZE{100};
-
-/// Default timeout for clearing the RenderTemplate display card when SpeechSynthesizer is in FINISHED state.
-static const std::chrono::milliseconds DEFAULT_TTS_FINISHED_TIMEOUT_MS{2000};
-
-/// Default timeout for clearing the RenderPlayerInfo display card when AudioPlayer is in FINISHED state.
-static const std::chrono::milliseconds DEFAULT_AUDIO_FINISHED_TIMEOUT_MS{2000};
-
-/// Default timeout for clearing the RenderPlayerInfo display card when AudioPlayer is in STOPPED/PAUSED state.
-static const std::chrono::milliseconds DEFAULT_AUDIO_STOPPED_PAUSED_TIMEOUT_MS{60000};
-
-/**
- * Creates the TemplateRuntime capability configuration.
- *
- * @return The TemplateRuntime capability configuration.
- */
-static std::shared_ptr<avsCommon::avs::CapabilityConfiguration> getTemplateRuntimeCapabilityConfiguration();
-
-std::shared_ptr<TemplateRuntime> TemplateRuntime::createTemplateRuntime(
-    const std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface>&
-        renderPlayerInfoCardsProviderRegistrar,
-    std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
-    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender) {
-    if (!renderPlayerInfoCardsProviderRegistrar || !focusManager || !exceptionSender) {
-        ACSDK_ERROR(LX("createFailed")
-                        .d("isRenderPlayerInfoCardsProviderRegistrarNull", !renderPlayerInfoCardsProviderRegistrar)
-                        .d("isFocusManagerNull", !focusManager)
-                        .d("isExceptionSenderNull", !exceptionSender));
-        return nullptr;
-    }
-
-    auto providers = renderPlayerInfoCardsProviderRegistrar->getProviders();
-    return TemplateRuntime::create(providers, focusManager, exceptionSender);
-}
-
-std::shared_ptr<TemplateRuntime> TemplateRuntime::create(
-    const std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>>&
-        renderPlayerInfoCardInterface,
-    std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
-    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender) {
-    if (!focusManager) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "nullFocusManager"));
-        return nullptr;
-    }
-
-    if (!exceptionSender) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
-        return nullptr;
-    }
-    std::shared_ptr<TemplateRuntime> templateRuntime(
-        new TemplateRuntime(renderPlayerInfoCardInterface, focusManager, exceptionSender));
-
-    if (!templateRuntime->initialize()) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "Initialization error."));
-        return nullptr;
-    }
-
-    for (const auto& renderPlayerInfoCardProvider : renderPlayerInfoCardInterface) {
-        if (!renderPlayerInfoCardProvider) {
-            ACSDK_ERROR(LX("createFailed").d("reason", "nullRenderPlayerInfoCardInterface"));
-            return nullptr;
-        }
-        renderPlayerInfoCardProvider->setObserver(templateRuntime);
-    }
-
-    return templateRuntime;
-}
-
-/**
- * Initializes the object by reading the values from configuration.
- */
-bool TemplateRuntime::initialize() {
-    auto configurationRoot = ConfigurationNode::getRoot()[TEMPLATERUNTIME_CONFIGURATION_ROOT_KEY];
-
-    // If key is present, then read and initilize the value from config or set to default.
-    configurationRoot.getDuration<std::chrono::milliseconds>(
-        TEMPLATERUNTIME_TTS_FINISHED_KEY, &m_ttsFinishedTimeout, DEFAULT_TTS_FINISHED_TIMEOUT_MS);
-
-    // If key is present, then read and initilize the value from config or set to default.
-    configurationRoot.getDuration<std::chrono::milliseconds>(
-        TEMPLATERUNTIME_AUDIOPLAYBACK_FINISHED_KEY, &m_audioPlaybackFinishedTimeout, DEFAULT_AUDIO_FINISHED_TIMEOUT_MS);
-
-    // If key is present, then read and initilize the value from config or set to default.
-    configurationRoot.getDuration<std::chrono::milliseconds>(
-        TEMPLATERUNTIME_AUDIOPLAYBACK_STOPPED_PAUSED_KEY,
-        &m_audioPlaybackStoppedPausedTimeout,
-        DEFAULT_AUDIO_STOPPED_PAUSED_TIMEOUT_MS);
-
-    return true;
-}
-
-void TemplateRuntime::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
-    ACSDK_DEBUG5(LX("handleDirectiveImmediately"));
-    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
-}
-
-void TemplateRuntime::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
-    ACSDK_DEBUG5(LX("preHandleDirective"));
-    // do nothing.
-}
-
-void TemplateRuntime::handleDirective(std::shared_ptr<DirectiveInfo> info) {
-    ACSDK_DEBUG5(LX("handleDirective"));
-    if (!info || !info->directive) {
-        ACSDK_ERROR(LX("preHandleDirectiveFailed").d("reason", "nullDirectiveInfo"));
-        return;
-    }
-    if (info->directive->getName() == TEMPLATE.name) {
-        handleRenderTemplateDirective(info);
-    } else if (info->directive->getName() == PLAYER_INFO.name) {
-        handleRenderPlayerInfoDirective(info);
-    } else {
-        handleUnknownDirective(info);
-    }
-}
-
-void TemplateRuntime::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
-    removeDirective(info);
-}
-
-DirectiveHandlerConfiguration TemplateRuntime::getConfiguration() const {
-    ACSDK_DEBUG5(LX("getConfiguration"));
-    DirectiveHandlerConfiguration configuration;
-    auto visualNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUM_VISUAL, false);
-
-    configuration[TEMPLATE] = visualNonBlockingPolicy;
-    configuration[PLAYER_INFO] = visualNonBlockingPolicy;
-    return configuration;
-}
-
-void TemplateRuntime::onFocusChanged(avsCommon::avs::FocusState newFocus, MixingBehavior) {
-    m_executor.submit([this, newFocus]() { executeOnFocusChangedEvent(newFocus); });
-}
-
-void TemplateRuntime::onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity state, const Context& context) {
-    ACSDK_DEBUG5(LX("onRenderPlayerCardsInfoChanged"));
-    m_executor.submit([this, state, context]() {
-        ACSDK_DEBUG5(LX("onPlayerActivityChangedInExecutor"));
-        executeAudioPlayerInfoUpdates(state, context);
-    });
-}
-
-void TemplateRuntime::onDialogUXStateChanged(
-    avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState newState) {
-    ACSDK_DEBUG5(LX("onDialogUXStateChanged").d("state", newState));
-    m_executor.submit([this, newState]() {
-        if (TemplateRuntime::State::DISPLAYING == m_state && m_lastDisplayedDirective &&
-            m_lastDisplayedDirective->directive->getName() == RENDER_TEMPLATE) {
-            if (avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState::IDLE == newState) {
-                executeStartTimer(m_ttsFinishedTimeout);
-            } else if (
-                avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState::EXPECTING == newState ||
-                avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState::SPEAKING == newState) {
-                executeStopTimer();
-            }
-        }
-    });
-}
-
-void TemplateRuntime::addObserver(
-    std::shared_ptr<avsCommon::sdkInterfaces::TemplateRuntimeObserverInterface> observer) {
-    ACSDK_DEBUG5(LX("addObserver"));
-    if (!observer) {
-        ACSDK_ERROR(LX("addObserver").m("Observer is null."));
-        return;
-    }
-    m_executor.submit([this, observer]() {
-        ACSDK_DEBUG5(LX("addObserverInExecutor"));
-        if (!m_observers.insert(observer).second) {
-            ACSDK_ERROR(LX("addObserverInExecutor").m("Duplicate observer."));
-        }
-    });
-}
-
-void TemplateRuntime::removeObserver(
-    std::shared_ptr<avsCommon::sdkInterfaces::TemplateRuntimeObserverInterface> observer) {
-    ACSDK_DEBUG5(LX("removeObserver"));
-    if (!observer) {
-        ACSDK_ERROR(LX("removeObserver").m("Observer is null."));
-        return;
-    }
-    m_executor.submit([this, observer]() {
-        ACSDK_DEBUG5(LX("removeObserverInExecutor"));
-        if (m_observers.erase(observer) == 0) {
-            ACSDK_WARN(LX("removeObserverInExecutor").m("Nonexistent observer."));
-        }
-    });
-}
-
-TemplateRuntime::TemplateRuntime(
-    const std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>>&
-        renderPlayerInfoCardsInterfaces,
-    std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
-    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender) :
-        CapabilityAgent{NAMESPACE, exceptionSender},
-        RequiresShutdown{"TemplateRuntime"},
-        m_isRenderTemplateLastReceived{false},
-        m_focus{FocusState::NONE},
-        m_state{TemplateRuntime::State::IDLE},
-        m_renderPlayerInfoCardsInterfaces{renderPlayerInfoCardsInterfaces},
-        m_focusManager{focusManager} {
-    m_capabilityConfigurations.insert(getTemplateRuntimeCapabilityConfiguration());
-}
-
-std::shared_ptr<CapabilityConfiguration> getTemplateRuntimeCapabilityConfiguration() {
-    std::unordered_map<std::string, std::string> configMap;
-    configMap.insert({CAPABILITY_INTERFACE_TYPE_KEY, TEMPLATERUNTIME_CAPABILITY_INTERFACE_TYPE});
-    configMap.insert({CAPABILITY_INTERFACE_NAME_KEY, TEMPLATERUNTIME_CAPABILITY_INTERFACE_NAME});
-    configMap.insert({CAPABILITY_INTERFACE_VERSION_KEY, TEMPLATERUNTIME_CAPABILITY_INTERFACE_VERSION});
-
-    return std::make_shared<CapabilityConfiguration>(configMap);
-}
-
-void TemplateRuntime::doShutdown() {
-    m_executor.shutdown();
-    m_focusManager.reset();
-    m_observers.clear();
-    m_activeRenderPlayerInfoCardsProvider.reset();
-    m_audioItemsInExecution.clear();
-    m_audioPlayerInfo.clear();
-    for (const auto& renderPlayerInfoCardsInterface : m_renderPlayerInfoCardsInterfaces) {
-        renderPlayerInfoCardsInterface->setObserver(nullptr);
-    }
-    m_renderPlayerInfoCardsInterfaces.clear();
-}
-
-void TemplateRuntime::removeDirective(std::shared_ptr<DirectiveInfo> info) {
-    /*
-     * Check result too, to catch cases where DirectiveInfo was created locally, without a nullptr result.
-     * In those cases there is no messageId to remove because no result was expected.
-     */
-    if (info->directive && info->result) {
-        CapabilityAgent::removeDirective(info->directive->getMessageId());
-    }
-}
-
-void TemplateRuntime::displayCardCleared() {
-    m_executor.submit([this]() { executeCardClearedEvent(); });
-}
-
-void TemplateRuntime::setHandlingCompleted(std::shared_ptr<DirectiveInfo> info) {
-    if (info && info->result) {
-        info->result->setCompleted();
-    }
-    removeDirective(info);
-}
-
-void TemplateRuntime::handleRenderTemplateDirective(std::shared_ptr<DirectiveInfo> info) {
-    ACSDK_DEBUG5(LX("handleRenderTemplateDirective"));
-
-    m_executor.submit([this, info]() {
-        ACSDK_DEBUG5(LX("handleRenderTemplateDirectiveInExecutor"));
-        m_isRenderTemplateLastReceived = true;
-        executeDisplayCardEvent(info);
-        setHandlingCompleted(info);
-    });
-}
-
-void TemplateRuntime::handleRenderPlayerInfoDirective(std::shared_ptr<DirectiveInfo> info) {
-    ACSDK_DEBUG5(LX("handleRenderPlayerInfoDirective"));
-
-    m_executor.submit([this, info]() {
-        ACSDK_DEBUG5(LX("handleRenderPlayerInfoDirectiveInExecutor"));
-        m_isRenderTemplateLastReceived = false;
-
-        rapidjson::Document payload;
-        rapidjson::ParseResult result = payload.Parse(info->directive->getPayload());
-        if (!result) {
-            ACSDK_ERROR(LX("handleRenderPlayerInfoDirectiveInExecutorParseFailed")
-                            .d("reason", rapidjson::GetParseError_En(result.Code()))
-                            .d("offset", result.Offset())
-                            .d("messageId", info->directive->getMessageId()));
-            sendExceptionEncounteredAndReportFailed(
-                info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
-            return;
-        }
-
-        std::string audioItemId;
-        if (!jsonUtils::retrieveValue(payload, AUDIO_ITEM_ID_TAG, &audioItemId)) {
-            ACSDK_ERROR(LX("handleRenderPlayerInfoDirective")
-                            .d("reason", "missingAudioItemId")
-                            .d("messageId", info->directive->getMessageId()));
-            sendExceptionEncounteredAndReportFailed(info, "missing audioItemId");
-            return;
-        }
-
-        size_t found = std::string::npos;
-        for (auto& executionMap : m_audioItemsInExecution) {
-            if (!executionMap.second.audioItemId.empty()) {
-                found = audioItemId.find(executionMap.second.audioItemId);
-            }
-            if (found != std::string::npos) {
-                ACSDK_DEBUG3(LX("handleRenderPlayerInfoDirectiveInExecutor")
-                                 .d("audioItemId", audioItemId)
-                                 .m("Matching audioItemId in execution."));
-                executionMap.second.directive = info;
-                m_activeRenderPlayerInfoCardsProvider = executionMap.first;
-                m_audioPlayerInfo[m_activeRenderPlayerInfoCardsProvider].offset =
-                    executionMap.first->getAudioItemOffset();
-                executeStopTimer();
-                executeDisplayCardEvent(info);
-                // Since there'a match, we can safely empty m_audioItems.
-                m_audioItems.clear();
-                break;
-            }
-        }
-
-        if (std::string::npos == found) {
-            ACSDK_DEBUG3(LX("handleRenderPlayerInfoDirectiveInExecutor")
-                             .d("audioItemId", audioItemId)
-                             .m("Not matching audioItemId in execution."));
-
-            AudioItemPair itemPair{audioItemId, info};
-            if (m_audioItems.size() == MAXIMUM_QUEUE_SIZE) {
-                // Something is wrong, so we pop the back of the queue and log an error.
-                auto discardedAudioItem = m_audioItems.back();
-                m_audioItems.pop_back();
-                ACSDK_ERROR(LX("handleRenderPlayerInfoDirective")
-                                .d("reason", "queueIsFull")
-                                .d("discardedAudioItemId", discardedAudioItem.audioItemId));
-            }
-            m_audioItems.push_front(itemPair);
-        }
-
-        setHandlingCompleted(info);
-    });
-}
-
-void TemplateRuntime::handleUnknownDirective(std::shared_ptr<DirectiveInfo> info) {
-    ACSDK_ERROR(LX("handleDirectiveFailed")
-                    .d("reason", "unknownDirective")
-                    .d("namespace", info->directive->getNamespace())
-                    .d("name", info->directive->getName()));
-
-    m_executor.submit([this, info] {
-        const std::string exceptionMessage =
-            "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
-
-        sendExceptionEncounteredAndReportFailed(
-            info, exceptionMessage, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
-    });
-}
-
-void TemplateRuntime::executeAudioPlayerInfoUpdates(avsCommon::avs::PlayerActivity state, const Context& context) {
-    ACSDK_DEBUG5(LX("executeAudioPlayerInfoUpdates")
-                     .d("audioItemId", context.audioItemId)
-                     .d("offset", context.offset.count())
-                     .d("audioPlayerState", state)
-                     .d("isRenderTemplatelastReceived", m_isRenderTemplateLastReceived));
-
-    if (avsCommon::avs::PlayerActivity::IDLE == state || avsCommon::avs::PlayerActivity::BUFFER_UNDERRUN == state) {
-        /*
-         * The TemplateRuntime Capability Agent is not interested in the IDLE nor BUFFER_UNDERRUN state, so we just
-         * ignore the callback.
-         */
-        return;
-    }
-
-    if (!context.mediaProperties) {
-        ACSDK_ERROR(LX("executeAudioPlayerInfoUpdatesFailed").d("reason", "nullRenderPlayerInfoCardsInterface"));
-        return;
-    }
-
-    const auto& currentRenderPlayerInfoCardsProvider = context.mediaProperties;
-    if (m_audioPlayerInfo[currentRenderPlayerInfoCardsProvider].audioPlayerState == state &&
-        m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].audioItemId == context.audioItemId) {
-        /*
-         * The AudioPlayer notification is chatty during audio playback as it will frequently toggle between
-         * BUFFER_UNDERRUN and PLAYER state.  So we filter out the callbacks if the notification are with the
-         * same state and audioItemId.
-         */
-        return;
-    }
-
-    auto isStateUpdated = (m_audioPlayerInfo[currentRenderPlayerInfoCardsProvider].audioPlayerState != state);
-    m_audioPlayerInfo[currentRenderPlayerInfoCardsProvider].audioPlayerState = state;
-    m_audioPlayerInfo[currentRenderPlayerInfoCardsProvider].offset = context.offset;
-    if (m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].audioItemId != context.audioItemId) {
-        m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].audioItemId = context.audioItemId;
-        m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].directive.reset();
-        // iterate from front to back (front is most recent)
-        for (auto it = m_audioItems.begin(); it != m_audioItems.end(); ++it) {
-            auto found = it->audioItemId.find(context.audioItemId);
-            if (std::string::npos != found) {
-                ACSDK_DEBUG3(LX("executeAudioPlayerInfoUpdates")
-                                 .d("audioItemId", context.audioItemId)
-                                 .m("Found matching audioItemId in queue."));
-                m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].directive = it->directive;
-                m_activeRenderPlayerInfoCardsProvider = currentRenderPlayerInfoCardsProvider;
-                // We are erasing items older than the current found, as well as the current item.
-                m_audioItems.erase(it, m_audioItems.end());
-                break;
-            }
-        }
-    }
-    if (m_isRenderTemplateLastReceived && state != avsCommon::avs::PlayerActivity::PLAYING) {
-        /*
-         * If RenderTemplate is the last directive received and the AudioPlayer is not notifying a PLAY,
-         * we shouldn't be notifying the observer to render a PlayerInfo display card.
-         */
-        return;
-    }
-    m_isRenderTemplateLastReceived = false;
-
-    /*
-     * If the AudioPlayer notifies a PLAYING state before the RenderPlayerInfo with the corresponding
-     * audioItemId is received, this function will also be called but the m_audioItemsInExecution.directive
-     * will be set to nullptr.  So we need to do a nullptr check here to make sure there is a RenderPlayerInfo
-     * displayCard to display..
-     */
-    if (m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].directive) {
-        if (isStateUpdated) {
-            executeAudioPlayerStartTimer(state);
-        }
-        executeDisplayCardEvent(m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].directive);
-    } else {
-        // The RenderTemplateCard is cleared before it's displayed, so we should release the focus.
-        if (TemplateRuntime::State::ACQUIRING == m_state) {
-            m_state = TemplateRuntime::State::RELEASING;
-        }
-    }
-}
-
-void TemplateRuntime::executeAudioPlayerStartTimer(avsCommon::avs::PlayerActivity state) {
-    if (avsCommon::avs::PlayerActivity::PLAYING == state) {
-        executeStopTimer();
-    } else if (avsCommon::avs::PlayerActivity::PAUSED == state || avsCommon::avs::PlayerActivity::STOPPED == state) {
-        executeStartTimer(m_audioPlaybackStoppedPausedTimeout);
-    } else if (avsCommon::avs::PlayerActivity::FINISHED == state) {
-        executeStartTimer(m_audioPlaybackFinishedTimeout);
-    }
-}
-
-void TemplateRuntime::executeRenderPlayerInfoCallbacks(bool isClearCard) {
-    ACSDK_DEBUG3(LX("executeRenderPlayerInfoCallbacks").d("isClearCard", isClearCard ? "True" : "False"));
-    if (isClearCard) {
-        for (auto& observer : m_observers) {
-            observer->clearPlayerInfoCard();
-        }
-    } else {
-        if (!m_activeRenderPlayerInfoCardsProvider) {
-            ACSDK_ERROR(
-                LX("executeRenderPlayerInfoCallbacksFailed").d("reason", "nullActiveRenderPlayerInfoCardsProvider"));
-            return;
-        }
-        if (!m_audioItemsInExecution[m_activeRenderPlayerInfoCardsProvider].directive) {
-            ACSDK_ERROR(LX("executeRenderPlayerInfoCallbacksFailed").d("reason", "nullAudioItemInExecution"));
-            return;
-        }
-        auto payload =
-            m_audioItemsInExecution[m_activeRenderPlayerInfoCardsProvider].directive->directive->getPayload();
-        for (auto& observer : m_observers) {
-            observer->renderPlayerInfoCard(payload, m_audioPlayerInfo[m_activeRenderPlayerInfoCardsProvider], m_focus);
-        }
-    }
-}
-
-void TemplateRuntime::executeRenderTemplateCallbacks(bool isClearCard) {
-    ACSDK_DEBUG3(LX("executeRenderTemplateCallbacks").d("isClear", isClearCard ? "True" : "False"));
-    for (auto& observer : m_observers) {
-        if (isClearCard) {
-            observer->clearTemplateCard();
-        } else {
-            observer->renderTemplateCard(m_lastDisplayedDirective->directive->getPayload(), m_focus);
-        }
-    }
-}
-
-void TemplateRuntime::executeDisplayCard() {
-    if (m_lastDisplayedDirective) {
-        if (m_lastDisplayedDirective->directive->getName() == RENDER_TEMPLATE) {
-            executeStopTimer();
-            executeRenderTemplateCallbacks(false);
-        } else {
-            executeRenderPlayerInfoCallbacks(false);
-        }
-    }
-}
-
-void TemplateRuntime::executeClearCard() {
-    if (m_lastDisplayedDirective) {
-        if (m_lastDisplayedDirective->directive->getName() == RENDER_TEMPLATE) {
-            executeRenderTemplateCallbacks(true);
-        } else {
-            executeRenderPlayerInfoCallbacks(true);
-        }
-    }
-}
-
-void TemplateRuntime::executeStartTimer(std::chrono::milliseconds timeout) {
-    if (TemplateRuntime::State::DISPLAYING == m_state) {
-        ACSDK_DEBUG3(LX("executeStartTimer").d("timeoutInMilliseconds", timeout.count()));
-        m_clearDisplayTimer.start(timeout, [this] { m_executor.submit([this] { executeTimerEvent(); }); });
-    }
-}
-
-void TemplateRuntime::executeStopTimer() {
-    ACSDK_DEBUG3(LX("executeStopTimer"));
-    m_clearDisplayTimer.stop();
-}
-
-/*
- * A state machine is used to acquire and release the visual channel from the visual @c FocusManager.  The state machine
- * has five @c State, and four events as listed below:
- *
- * displayCard - This event happens when the TempateRuntime is ready to notify its observers to display a
- * displayCard.
- *
- * focusChanged - This event happens when the @c FocusManager notifies a change in @c FocusState in the visual
- * channel.
- *
- * timer - This event happens when m_clearDisplayTimer expires and needs to notify its observers to clear the
- * displayCard.
- *
- * cardCleared - This event happens when @c displayCardCleared() is called to notify @c TemplateRuntime the device has
- * cleared the screen.
- *
- * Each state transition may result in one or more of the following actions:
- * (A) Acquire channel
- * (B) Release channel
- * (C) Notify observers to display displayCard
- * (D) Notify observers to clear displayCard
- * (E) Log error about unexpected focusChanged event.
- *
- * Below is the state table illustrating the state transition and its action.  NC means no change in state.
- *
- *                                              E  V  E  N  T  S
- *                -----------------------------------------------------------------------------------------
- *  Current State | displayCard  | timer          | focusChanged::NONE | focusChanged::FG/BG | cardCleared
- * --------------------------------------------------------------------------------------------------------
- * | IDLE         | ACQUIRING(A) | NC             | NC                 | RELEASING(B&E)      | NC
- * | ACQUIRING    | NC           | NC             | IDLE(E)            | DISPLAYING(C)       | NC
- * | DISPLAYING   | NC(C)        | RELEASING(B&D) | IDLE(D)            | DISPLAYING(C)       | RELEASING(B)
- * | RELEASING    | REACQUIRING  | NC             | IDLE               | NC(B&E)             | NC
- * | REACQUIRING  | NC           | NC             | ACQUIRING(A)       | RELEASING(B&E)      | NC
- * --------------------------------------------------------------------------------------------------------
- *
- */
-
-std::string TemplateRuntime::stateToString(const TemplateRuntime::State state) {
-    switch (state) {
-        case TemplateRuntime::State::IDLE:
-            return "IDLE";
-        case TemplateRuntime::State::ACQUIRING:
-            return "ACQUIRING";
-        case TemplateRuntime::State::DISPLAYING:
-            return "DISPLAYING";
-        case TemplateRuntime::State::RELEASING:
-            return "RELEASING";
-        case TemplateRuntime::State::REACQUIRING:
-            return "REACQUIRING";
-    }
-    return "UNKNOWN";
-}
-
-void TemplateRuntime::executeTimerEvent() {
-    State nextState = m_state;
-
-    switch (m_state) {
-        case TemplateRuntime::State::DISPLAYING:
-            executeClearCard();
-            m_focusManager->releaseChannel(CHANNEL_NAME, shared_from_this());
-            nextState = TemplateRuntime::State::RELEASING;
-            break;
-
-        case TemplateRuntime::State::IDLE:
-        case TemplateRuntime::State::ACQUIRING:
-        case TemplateRuntime::State::RELEASING:
-        case TemplateRuntime::State::REACQUIRING:
-            // Do Nothing.
-            break;
-    }
-    ACSDK_DEBUG3(
-        LX("executeTimerEvent").d("prevState", stateToString(m_state)).d("nextState", stateToString(nextState)));
-    m_state = nextState;
-}
-
-void TemplateRuntime::executeOnFocusChangedEvent(avsCommon::avs::FocusState newFocus) {
-    ACSDK_DEBUG5(LX("executeOnFocusChangedEvent").d("prevFocus", m_focus).d("newFocus", newFocus));
-
-    bool weirdFocusState = false;
-    State nextState = m_state;
-    m_focus = newFocus;
-
-    switch (m_state) {
-        case TemplateRuntime::State::IDLE:
-            // This is weird.  We shouldn't be getting any focus updates in Idle.
-            switch (newFocus) {
-                case FocusState::FOREGROUND:
-                case FocusState::BACKGROUND:
-                    weirdFocusState = true;
-                    break;
-                case FocusState::NONE:
-                    // Do nothing.
-                    break;
-            }
-            break;
-        case TemplateRuntime::State::ACQUIRING:
-            switch (newFocus) {
-                case FocusState::FOREGROUND:
-                case FocusState::BACKGROUND:
-                    executeDisplayCard();
-                    nextState = TemplateRuntime::State::DISPLAYING;
-                    break;
-                case FocusState::NONE:
-                    ACSDK_ERROR(LX("executeOnFocusChangedEvent")
-                                    .d("prevState", stateToString(m_state))
-                                    .d("nextFocus", newFocus)
-                                    .m("Unexpected focus state event."));
-                    nextState = TemplateRuntime::State::IDLE;
-                    break;
-            }
-            break;
-        case TemplateRuntime::State::DISPLAYING:
-            switch (newFocus) {
-                case FocusState::FOREGROUND:
-                case FocusState::BACKGROUND:
-                    executeDisplayCard();
-                    break;
-                case FocusState::NONE:
-                    executeClearCard();
-                    nextState = TemplateRuntime::State::IDLE;
-                    break;
-            }
-            break;
-        case TemplateRuntime::State::RELEASING:
-            switch (newFocus) {
-                case FocusState::FOREGROUND:
-                case FocusState::BACKGROUND:
-                    m_focusManager->releaseChannel(CHANNEL_NAME, shared_from_this());
-                    nextState = TemplateRuntime::State::RELEASING;
-                    break;
-                case FocusState::NONE:
-                    nextState = TemplateRuntime::State::IDLE;
-                    break;
-            }
-            break;
-        case TemplateRuntime::State::REACQUIRING:
-            switch (newFocus) {
-                case FocusState::FOREGROUND:
-                case FocusState::BACKGROUND:
-                    weirdFocusState = true;
-                    break;
-                case FocusState::NONE:
-                    m_focusManager->acquireChannel(CHANNEL_NAME, shared_from_this(), NAMESPACE);
-                    nextState = TemplateRuntime::State::ACQUIRING;
-                    break;
-            }
-            break;
-    }
-    if (weirdFocusState) {
-        ACSDK_ERROR(LX("executeOnFocusChangedEvent")
-                        .d("prevState", stateToString(m_state))
-                        .d("nextFocus", newFocus)
-                        .m("Unexpected focus state event."));
-        m_focusManager->releaseChannel(CHANNEL_NAME, shared_from_this());
-        nextState = TemplateRuntime::State::RELEASING;
-    }
-    ACSDK_DEBUG3(LX("executeOnFocusChangedEvent")
-                     .d("prevState", stateToString(m_state))
-                     .d("nextState", stateToString(nextState)));
-    m_state = nextState;
-}
-
-void TemplateRuntime::executeDisplayCardEvent(
-    const std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> info) {
-    State nextState = m_state;
-    m_lastDisplayedDirective = info;
-
-    switch (m_state) {
-        case TemplateRuntime::State::IDLE:
-            m_focusManager->acquireChannel(CHANNEL_NAME, shared_from_this(), NAMESPACE);
-            nextState = TemplateRuntime::State::ACQUIRING;
-            break;
-        case TemplateRuntime::State::ACQUIRING:
-            // Do Nothing.
-            break;
-        case TemplateRuntime::State::DISPLAYING:
-            executeDisplayCard();
-            nextState = TemplateRuntime::State::DISPLAYING;
-            break;
-        case TemplateRuntime::State::RELEASING:
-            nextState = TemplateRuntime::State::REACQUIRING;
-            break;
-        case TemplateRuntime::State::REACQUIRING:
-            // Do Nothing.
-            break;
-    }
-    ACSDK_DEBUG3(
-        LX("executeDisplayCardEvent").d("prevState", stateToString(m_state)).d("nextState", stateToString(nextState)));
-    m_state = nextState;
-}
-
-void TemplateRuntime::executeCardClearedEvent() {
-    State nextState = m_state;
-    switch (m_state) {
-        case TemplateRuntime::State::IDLE:
-        case TemplateRuntime::State::ACQUIRING:
-            // Do Nothing.
-            break;
-        case TemplateRuntime::State::DISPLAYING:
-            m_focusManager->releaseChannel(CHANNEL_NAME, shared_from_this());
-            nextState = TemplateRuntime::State::RELEASING;
-            break;
-        case TemplateRuntime::State::RELEASING:
-        case TemplateRuntime::State::REACQUIRING:
-            // Do Nothing.
-            break;
-    }
-    ACSDK_DEBUG3(
-        LX("executeCardClearedEvent").d("prevState", stateToString(m_state)).d("nextState", stateToString(nextState)));
-    m_state = nextState;
-}
-
-std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> TemplateRuntime::
-    getCapabilityConfigurations() {
-    return m_capabilityConfigurations;
-}
-
-void TemplateRuntime::addRenderPlayerInfoCardsProvider(
-    std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface> cardsProvider) {
-    ACSDK_DEBUG5(LX("addRenderPlayerInfoCardsProvider"));
-
-    if (!cardsProvider) {
-        ACSDK_ERROR(
-            LX("addRenderPlayerInfoCardsProviderFailed").d("reason", "nullRenderPlayerInfoCardsProviderInterface"));
-        return;
-    }
-    cardsProvider->setObserver(shared_from_this());
-    m_renderPlayerInfoCardsInterfaces.insert(cardsProvider);
-}
-
-}  // namespace templateRuntime
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/TemplateRuntime/test/CMakeLists.txt b/CapabilityAgents/TemplateRuntime/test/CMakeLists.txt
deleted file mode 100644
index 8529d325e6..0000000000
--- a/CapabilityAgents/TemplateRuntime/test/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-
-set(INCLUDE_PATH
-    "${TemplateRuntime_INCLUDE_DIR}"
-    "${RAPIDJSON_INCLUDE_DIR}"
-    "${AVSCommon_SOURCE_DIR}/AVS/test")
-
-discover_unit_tests("${INCLUDE_PATH}" "TemplateRuntime;SDKInterfacesTests")
diff --git a/CapabilityAgents/TemplateRuntime/test/RenderPlayerInfoCardsProviderRegistrarTest.cpp b/CapabilityAgents/TemplateRuntime/test/RenderPlayerInfoCardsProviderRegistrarTest.cpp
deleted file mode 100644
index f89e2d9edf..0000000000
--- a/CapabilityAgents/TemplateRuntime/test/RenderPlayerInfoCardsProviderRegistrarTest.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/// @file RenderPlayerInfoCardsProviderRegistrarTest.cpp
-
-#include <memory>
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderInterface.h>
-
-#include "TemplateRuntime/RenderPlayerInfoCardsProviderRegistrar.h"
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace templateRuntime {
-namespace test {
-
-using namespace ::testing;
-using namespace avsCommon::sdkInterfaces;
-
-class MockRenderPlayerInfoCardProvider : public RenderPlayerInfoCardsProviderInterface {
-public:
-    MOCK_METHOD1(setObserver, void(std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsObserverInterface>));
-};
-
-/**
- * Verify getProviders() returns the set of registered providers.
- */
-TEST(RenderPlayerInfoCardsProviderTest, test_getProviders) {
-    auto provider1 = std::make_shared<StrictMock<MockRenderPlayerInfoCardProvider>>();
-    auto provider2 = std::make_shared<StrictMock<MockRenderPlayerInfoCardProvider>>();
-    auto registrar = RenderPlayerInfoCardsProviderRegistrar::createRenderPlayerInfoCardsProviderRegistrarInterface();
-
-    ASSERT_TRUE(registrar);
-
-    ASSERT_TRUE(registrar->registerProvider(provider1));
-    ASSERT_TRUE(registrar->registerProvider(provider2));
-
-    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>> providers =
-        registrar->getProviders();
-    ASSERT_THAT(providers, Contains(provider1));
-    ASSERT_THAT(providers, Contains(provider2));
-}
-
-/**
- * Verify registering a provider fails if it is a duplicate.
- */
-TEST(PostConnectOperationProviderRegistrarTest, test_registerDuplicateProviderFails) {
-    auto provider1 = std::make_shared<StrictMock<MockRenderPlayerInfoCardProvider>>();
-    auto registrar = RenderPlayerInfoCardsProviderRegistrar::createRenderPlayerInfoCardsProviderRegistrarInterface();
-
-    ASSERT_TRUE(registrar);
-
-    ASSERT_TRUE(registrar->registerProvider(provider1));
-    ASSERT_FALSE(registrar->registerProvider(provider1));
-
-    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>> providers =
-        registrar->getProviders();
-    ASSERT_TRUE(providers.size() == 1);
-    ASSERT_THAT(providers, Contains(provider1));
-}
-
-/**
- * Verify registering a null provider fails.
- */
-TEST(PostConnectOperationProviderRegistrarTest, test_registerNullProviderFails) {
-    auto registrar = RenderPlayerInfoCardsProviderRegistrar::createRenderPlayerInfoCardsProviderRegistrarInterface();
-
-    ASSERT_TRUE(registrar);
-
-    ASSERT_FALSE(registrar->registerProvider(nullptr));
-
-    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>> providers =
-        registrar->getProviders();
-    ASSERT_TRUE(providers.size() == 0);
-}
-
-}  // namespace test
-}  // namespace templateRuntime
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/TemplateRuntime/test/TemplateRuntimeTest.cpp b/CapabilityAgents/TemplateRuntime/test/TemplateRuntimeTest.cpp
deleted file mode 100644
index 9edbc350af..0000000000
--- a/CapabilityAgents/TemplateRuntime/test/TemplateRuntimeTest.cpp
+++ /dev/null
@@ -1,971 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/// @file TemplateRuntimeTest
-#include <future>
-#include <memory>
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <rapidjson/document.h>
-
-#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
-#include <AVSCommon/SDKInterfaces/MediaPropertiesInterface.h>
-#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
-#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
-#include <AVSCommon/SDKInterfaces/MockFocusManager.h>
-#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsObserverInterface.h>
-#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderInterface.h>
-#include <AVSCommon/SDKInterfaces/TemplateRuntimeObserverInterface.h>
-#include <AVSCommon/Utils/Memory/Memory.h>
-
-#include "TemplateRuntime/TemplateRuntime.h"
-
-namespace alexaClientSDK {
-namespace capabilityAgents {
-namespace templateRuntime {
-namespace test {
-
-using namespace avsCommon::avs;
-using namespace avsCommon::avs::attachment::test;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::sdkInterfaces::test;
-using namespace avsCommon::utils::memory;
-using namespace rapidjson;
-using namespace ::testing;
-
-/// Timeout when waiting for futures to be set.
-static std::chrono::milliseconds TIMEOUT(1000);
-
-/// Timeout when waiting for clearTemplateCard.
-static std::chrono::milliseconds TEMPLATE_TIMEOUT(5000);
-
-/// Timeout when waiting for clearTemplateCard not called.
-static std::chrono::milliseconds TEMPLATE_NOT_CLEAR_TIMEOUT(2500);
-
-/// Timeout when waiting for clearTemplateCard.
-static std::chrono::milliseconds PLAYER_FINISHED_TIMEOUT(5000);
-
-/// The namespace for this capability agent.
-static const std::string NAMESPACE{"TemplateRuntime"};
-
-/// An unknown directive signature.
-static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
-
-/// The RenderTemplate directive signature.
-static const NamespaceAndName TEMPLATE{NAMESPACE, "RenderTemplate"};
-
-/// The RenderPlayerInfo directive signature.
-static const NamespaceAndName PLAYER_INFO{NAMESPACE, "RenderPlayerInfo"};
-
-/// The @c MessageId identifer.
-static const std::string MESSAGE_ID("messageId");
-
-/// An audioItemId for the RenderPlayerInfo directive.
-static const std::string AUDIO_ITEM_ID("AudioItemId abcdefgh");
-
-/// An audioItemId without a corresponding RenderPlayerInfo directive.
-static const std::string AUDIO_ITEM_ID_1("AudioItemId 12345678");
-
-/// A RenderTemplate directive payload.
-// clang-format off
-static const std::string TEMPLATE_PAYLOAD = "{"
-    "\"token\":\"TOKEN1\","
-    "\"type\":\"BodyTemplate1\","
-    "\"title\":{"
-        "\"mainTitle\":\"MAIN_TITLE\","
-        "\"subTitle\":\"SUB_TITLE\""
-    "}"
-"}";
-// clang-format on
-
-/// A RenderPlayerInfo directive payload.
-// clang-format off
-static const std::string PLAYERINFO_PAYLOAD = "{"
-    "\"audioItemId\":\"" + AUDIO_ITEM_ID + "\","
-    "\"content\":{"
-        "\"title\":\"TITLE\","
-        "\"header\":\"HEADER\""
-    "}"
-"}";
-// clang-format on
-
-/// A malformed RenderPlayerInfo directive payload.
-// clang-format off
-static const std::string MALFORM_PLAYERINFO_PAYLOAD = "{"
-    "\"audioItemId\"::::\"" + AUDIO_ITEM_ID + "\","
-        "\"content\":{{{{"
-        "\"title\":\"TITLE\","
-        "\"header\":\"HEADER\""
-    "}"
-"}";
-// clang-format on
-
-class MockMediaPropertiesFetcher : public MediaPropertiesInterface {
-public:
-    MOCK_METHOD0(getAudioItemOffset, std::chrono::milliseconds());
-    MOCK_METHOD0(getAudioItemDuration, std::chrono::milliseconds());
-};
-
-class MockRenderInfoCardsPlayer : public RenderPlayerInfoCardsProviderInterface {
-public:
-    MOCK_METHOD1(
-        setObserver,
-        void(std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsObserverInterface> observer));
-};
-
-class MockRenderInfoCardsPlayerRegistrar : public RenderPlayerInfoCardsProviderRegistrarInterface {
-public:
-    MOCK_METHOD1(
-        registerProvider,
-        bool(const std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>& provider));
-    MOCK_METHOD0(
-        getProviders,
-        std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>>());
-};
-
-class MockGui : public TemplateRuntimeObserverInterface {
-public:
-    MOCK_METHOD2(renderTemplateCard, void(const std::string& jsonPayload, avsCommon::avs::FocusState focusState));
-    MOCK_METHOD0(clearTemplateCard, void());
-    MOCK_METHOD3(
-        renderPlayerInfoCard,
-        void(
-            const std::string& jsonPayload,
-            TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo,
-            avsCommon::avs::FocusState focusState));
-    MOCK_METHOD0(clearPlayerInfoCard, void());
-};
-
-/// Test harness for @c TemplateRuntime class.
-class TemplateRuntimeTest : public ::testing::Test {
-public:
-    /// Set up the test harness for running a test.
-    void SetUp() override;
-
-    /// Clean up the test harness after running a test.
-    void TearDown() override;
-
-    /// Function to set the promise and wake @c m_wakeSetCompleteFuture.
-    void wakeOnSetCompleted();
-
-    /// Function to set the promise and wake @c m_wakeRenderTemplateCardFuture.
-    void wakeOnRenderTemplateCard();
-
-    /// Function to set the promise and wake @c m_wakeRenderPlayerInfoCardFuture.
-    void wakeOnRenderPlayerInfoCard();
-
-    /// Function to set the promise and wake @c m_wakeClearTemplateCardFuture.
-    void wakeOnClearTemplateCard();
-
-    /// Function to set the promise and wake @c m_wakeClearPlayerInfoCardFuture.
-    void wakeOnClearPlayerInfoCard();
-
-    /// Function to set the promise and wake @c m_wakeReleaseChannelFuture.
-    void wakeOnReleaseChannel();
-
-    /// A constructor which initializes the promises and futures needed for the test class.
-    TemplateRuntimeTest() :
-            m_wakeSetCompletedPromise{},
-            m_wakeSetCompletedFuture{m_wakeSetCompletedPromise.get_future()},
-            m_wakeRenderTemplateCardPromise{},
-            m_wakeRenderTemplateCardFuture{m_wakeRenderTemplateCardPromise.get_future()},
-            m_wakeRenderPlayerInfoCardPromise{},
-            m_wakeRenderPlayerInfoCardFuture{m_wakeRenderPlayerInfoCardPromise.get_future()},
-            m_wakeClearTemplateCardPromise{},
-            m_wakeClearTemplateCardFuture{m_wakeClearTemplateCardPromise.get_future()},
-            m_wakeClearPlayerInfoCardPromise{},
-            m_wakeClearPlayerInfoCardFuture{m_wakeClearPlayerInfoCardPromise.get_future()},
-            m_wakeReleaseChannelPromise{},
-            m_wakeReleaseChannelFuture{m_wakeReleaseChannelPromise.get_future()} {
-    }
-
-protected:
-    /// Promise to synchronize directive handling through setCompleted.
-    std::promise<void> m_wakeSetCompletedPromise;
-
-    /// Future to synchronize directive handling through setCompleted.
-    std::future<void> m_wakeSetCompletedFuture;
-
-    /// Promise to synchronize directive handling with RenderTemplateCard callback.
-    std::promise<void> m_wakeRenderTemplateCardPromise;
-
-    /// Future to synchronize directive handling with RenderTemplateCard callback.
-    std::future<void> m_wakeRenderTemplateCardFuture;
-
-    /// Promise to synchronize directive handling with RenderPlayerInfoCard callback.
-    std::promise<void> m_wakeRenderPlayerInfoCardPromise;
-
-    /// Future to synchronize directive handling with RenderPlayerInfoCard callback.
-    std::future<void> m_wakeRenderPlayerInfoCardFuture;
-
-    /// Promise to synchronize ClearTemplateCard callback.
-    std::promise<void> m_wakeClearTemplateCardPromise;
-
-    /// Future to synchronize ClearTemplateCard callback.
-    std::future<void> m_wakeClearTemplateCardFuture;
-
-    /// Promise to synchronize ClearPlayerInfoCard callback.
-    std::promise<void> m_wakeClearPlayerInfoCardPromise;
-
-    /// Future to synchronize ClearPlayerInfoCard callback.
-    std::future<void> m_wakeClearPlayerInfoCardFuture;
-
-    /// Promise to synchronize releaseChannel calls.
-    std::promise<void> m_wakeReleaseChannelPromise;
-
-    /// Future to synchronize releaseChannel calls.
-    std::future<void> m_wakeReleaseChannelFuture;
-
-    /// A nice mock for the RenderInfoCardsInterface calls.
-    std::shared_ptr<NiceMock<MockRenderInfoCardsPlayer>> m_mockRenderPlayerInfoCardsProvider;
-
-    /// A nice mock for the MediaPropertiesInterface calls.
-    std::shared_ptr<MockMediaPropertiesFetcher> m_mediaPropertiesFetcher;
-
-    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
-    std::shared_ptr<StrictMock<MockExceptionEncounteredSender>> m_mockExceptionSender;
-
-    /// A strict mock that allows the test to strictly monitor the handling of directives.
-    std::unique_ptr<StrictMock<MockDirectiveHandlerResult>> m_mockDirectiveHandlerResult;
-
-    /// @c FocusManager to request focus to the Visual channel.
-    std::shared_ptr<MockFocusManager> m_mockFocusManager;
-
-    /// A strict mock to allow testing of the observer callback.
-    std::shared_ptr<StrictMock<MockGui>> m_mockGui;
-
-    /// A pointer to an instance of the TemplateRuntime that will be instantiated per test.
-    std::shared_ptr<TemplateRuntime> m_templateRuntime;
-};
-
-void TemplateRuntimeTest::SetUp() {
-    m_mockExceptionSender = std::make_shared<StrictMock<MockExceptionEncounteredSender>>();
-    m_mockDirectiveHandlerResult = make_unique<StrictMock<MockDirectiveHandlerResult>>();
-    m_mockFocusManager = std::make_shared<NiceMock<MockFocusManager>>();
-    m_mediaPropertiesFetcher = std::make_shared<NiceMock<MockMediaPropertiesFetcher>>();
-    m_mockRenderPlayerInfoCardsProvider = std::make_shared<NiceMock<MockRenderInfoCardsPlayer>>();
-    m_mockGui = std::make_shared<StrictMock<MockGui>>();
-    m_templateRuntime =
-        TemplateRuntime::create({m_mockRenderPlayerInfoCardsProvider}, m_mockFocusManager, m_mockExceptionSender);
-    m_templateRuntime->addObserver(m_mockGui);
-
-    ON_CALL(*m_mockFocusManager, acquireChannel(_, _, _)).WillByDefault(InvokeWithoutArgs([this] {
-        m_templateRuntime->onFocusChanged(avsCommon::avs::FocusState::FOREGROUND, MixingBehavior::PRIMARY);
-        return true;
-    }));
-
-    ON_CALL(*m_mockFocusManager, releaseChannel(_, _)).WillByDefault(InvokeWithoutArgs([this] {
-        auto releaseChannelSuccess = std::make_shared<std::promise<bool>>();
-        std::future<bool> returnValue = releaseChannelSuccess->get_future();
-        m_templateRuntime->onFocusChanged(avsCommon::avs::FocusState::NONE, MixingBehavior::MUST_STOP);
-        releaseChannelSuccess->set_value(true);
-        return returnValue;
-    }));
-}
-
-void TemplateRuntimeTest::TearDown() {
-    if (m_templateRuntime) {
-        m_templateRuntime->shutdown();
-        m_templateRuntime.reset();
-    }
-}
-
-void TemplateRuntimeTest::wakeOnSetCompleted() {
-    m_wakeSetCompletedPromise.set_value();
-}
-
-void TemplateRuntimeTest::wakeOnRenderTemplateCard() {
-    m_wakeRenderTemplateCardPromise.set_value();
-}
-
-void TemplateRuntimeTest::wakeOnRenderPlayerInfoCard() {
-    m_wakeRenderPlayerInfoCardPromise.set_value();
-}
-
-void TemplateRuntimeTest::wakeOnClearTemplateCard() {
-    m_wakeClearTemplateCardPromise.set_value();
-}
-
-void TemplateRuntimeTest::wakeOnClearPlayerInfoCard() {
-    m_wakeClearPlayerInfoCardPromise.set_value();
-}
-
-void TemplateRuntimeTest::wakeOnReleaseChannel() {
-    m_wakeReleaseChannelPromise.set_value();
-}
-
-/**
- * Tests creating the TemplateRuntime with a null audioPlayerInterface.
- */
-TEST_F(TemplateRuntimeTest, test_nullAudioPlayerInterface) {
-    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>> providers = {
-        nullptr};
-    auto templateRuntime = TemplateRuntime::create(providers, m_mockFocusManager, m_mockExceptionSender);
-    ASSERT_EQ(templateRuntime, nullptr);
-}
-
-/**
- * Tests creating the TemplateRuntime with a null provider registrar.
- */
-TEST_F(TemplateRuntimeTest, test_nullProviderRegistrar) {
-    std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface> providerRegistrar =
-        nullptr;
-    auto templateRuntime =
-        TemplateRuntime::createTemplateRuntime(providerRegistrar, m_mockFocusManager, m_mockExceptionSender);
-    ASSERT_EQ(templateRuntime, nullptr);
-}
-
-/**
- * Tests creating the TemplateRuntime with a null focusManagerInterface.
- */
-TEST_F(TemplateRuntimeTest, test_nullFocusManagerInterface) {
-    auto templateRuntime =
-        TemplateRuntime::create({m_mockRenderPlayerInfoCardsProvider}, nullptr, m_mockExceptionSender);
-    ASSERT_EQ(templateRuntime, nullptr);
-}
-
-/**
- * Tests creating the TemplateRuntime with a null exceptionSender.
- */
-TEST_F(TemplateRuntimeTest, test_nullExceptionSender) {
-    auto templateRuntime = TemplateRuntime::create({m_mockRenderPlayerInfoCardsProvider}, m_mockFocusManager, nullptr);
-    ASSERT_EQ(templateRuntime, nullptr);
-}
-
-/**
- * Tests that the TemplateRuntime will add itself to the providers registered with the RenderInfoCardsPlayerRegistrar at
- * constructor time, and remove itself from them during shutdown.
- */
-TEST_F(TemplateRuntimeTest, test_renderInfoCardsPlayersFromRegistrarAddRemoveObserver) {
-    auto mockRenderInfoCardsProvider1 = std::make_shared<NiceMock<MockRenderInfoCardsPlayer>>();
-    auto mockRenderInfoCardsProvider2 = std::make_shared<NiceMock<MockRenderInfoCardsPlayer>>();
-
-    auto mockRenderInfoCardsPlayerRegistrar = std::make_shared<StrictMock<MockRenderInfoCardsPlayerRegistrar>>();
-    EXPECT_CALL(*mockRenderInfoCardsPlayerRegistrar, getProviders())
-        .WillOnce(Invoke([mockRenderInfoCardsProvider1, mockRenderInfoCardsProvider2]() {
-            std::unordered_set<std::shared_ptr<RenderPlayerInfoCardsProviderInterface>> providers = {
-                mockRenderInfoCardsProvider1, mockRenderInfoCardsProvider2};
-            return providers;
-        }));
-
-    auto mockExceptionSender = std::make_shared<StrictMock<MockExceptionEncounteredSender>>();
-    auto mockFocusManager = std::make_shared<NiceMock<MockFocusManager>>();
-
-    Expectation setObserver1 = EXPECT_CALL(*mockRenderInfoCardsProvider1, setObserver(NotNull())).Times(Exactly(1));
-    EXPECT_CALL(*mockRenderInfoCardsProvider1, setObserver(IsNull())).Times(Exactly(1)).After(setObserver1);
-    Expectation setObserver2 = EXPECT_CALL(*mockRenderInfoCardsProvider2, setObserver(NotNull())).Times(Exactly(1));
-    EXPECT_CALL(*mockRenderInfoCardsProvider2, setObserver(IsNull())).Times(Exactly(1)).After(setObserver2);
-
-    auto templateRuntime = TemplateRuntime::createTemplateRuntime(
-        mockRenderInfoCardsPlayerRegistrar, mockFocusManager, mockExceptionSender);
-    templateRuntime->shutdown();
-}
-
-/**
- * Tests that the TemplateRuntime successfully add itself with the RenderInfoCardsPlayers at constructor time, and
- * successfully remove itself with the RenderPlayerInfoCardsPlayers during shutdown.
- */
-TEST_F(TemplateRuntimeTest, test_renderInfoCardsPlayersAddRemoveObserver) {
-    auto mockRenderInfoCardsProvider1 = std::make_shared<NiceMock<MockRenderInfoCardsPlayer>>();
-    auto mockRenderInfoCardsProvider2 = std::make_shared<NiceMock<MockRenderInfoCardsPlayer>>();
-    auto mockExceptionSender = std::make_shared<StrictMock<MockExceptionEncounteredSender>>();
-    auto mockFocusManager = std::make_shared<NiceMock<MockFocusManager>>();
-
-    Expectation setObserver1 = EXPECT_CALL(*mockRenderInfoCardsProvider1, setObserver(NotNull())).Times(Exactly(1));
-    EXPECT_CALL(*mockRenderInfoCardsProvider1, setObserver(IsNull())).Times(Exactly(1)).After(setObserver1);
-    Expectation setObserver2 = EXPECT_CALL(*mockRenderInfoCardsProvider2, setObserver(NotNull())).Times(Exactly(1));
-    EXPECT_CALL(*mockRenderInfoCardsProvider2, setObserver(IsNull())).Times(Exactly(1)).After(setObserver2);
-
-    auto templateRuntime = TemplateRuntime::create(
-        {mockRenderInfoCardsProvider1, mockRenderInfoCardsProvider2}, mockFocusManager, mockExceptionSender);
-    templateRuntime->shutdown();
-}
-
-/**
- * Tests unknown Directive. Expect that the sendExceptionEncountered and setFailed will be called.
- */
-TEST_F(TemplateRuntimeTest, test_unknownDirective) {
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(NAMESPACE, UNKNOWN_DIRECTIVE, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive = AVSDirective::create("", avsMessageHeader, "", attachmentManager, "");
-
-    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Tests RenderTemplate Directive. Expect that the renderTemplateCard callback will be called and clearTemplateCard will
- * be called after 2s after DialogUXState is changed to IDLE state.
- */
-TEST_F(TemplateRuntimeTest, testSlow_renderTemplateDirective) {
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(TEMPLATE.nameSpace, TEMPLATE.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, TEMPLATE_PAYLOAD, attachmentManager, "");
-
-    EXPECT_CALL(*m_mockGui, renderTemplateCard(TEMPLATE_PAYLOAD, _))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderTemplateCard));
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-    EXPECT_CALL(*m_mockGui, clearTemplateCard())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnClearTemplateCard));
-
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-    m_wakeRenderTemplateCardFuture.wait_for(TIMEOUT);
-    m_templateRuntime->onDialogUXStateChanged(
-        avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState::IDLE);
-    m_wakeClearTemplateCardFuture.wait_for(TEMPLATE_TIMEOUT);
-}
-
-/**
- * Tests RenderTemplate Directive. Expect that the renderTemplateCard callback will be called and clearTemplateCard will
- * not be called if DialogUXState goes to IDLE state and then goes EXPECTING and SPEAKING state.
- */
-TEST_F(
-    TemplateRuntimeTest,
-    testRenderTemplateDirectiveWillNotClearCardAfterGoingToExpectingStateAfterGoingToIDLESlowTest) {
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(TEMPLATE.nameSpace, TEMPLATE.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, TEMPLATE_PAYLOAD, attachmentManager, "");
-
-    EXPECT_CALL(*m_mockGui, renderTemplateCard(TEMPLATE_PAYLOAD, _))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderTemplateCard));
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-    EXPECT_CALL(*m_mockGui, clearTemplateCard()).Times(Exactly(0));
-
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-    m_wakeRenderTemplateCardFuture.wait_for(TIMEOUT);
-
-    // first test IDLE->EXPECTING transition
-    m_templateRuntime->onDialogUXStateChanged(
-        avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState::IDLE);
-    m_templateRuntime->onDialogUXStateChanged(
-        avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState::EXPECTING);
-    EXPECT_EQ(m_wakeClearTemplateCardFuture.wait_for(TEMPLATE_NOT_CLEAR_TIMEOUT), std::future_status::timeout);
-
-    // now test IDLE->SPEAKING transition
-    m_templateRuntime->onDialogUXStateChanged(
-        avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState::IDLE);
-    m_templateRuntime->onDialogUXStateChanged(
-        avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState::SPEAKING);
-    EXPECT_EQ(m_wakeClearTemplateCardFuture.wait_for(TEMPLATE_NOT_CLEAR_TIMEOUT), std::future_status::timeout);
-}
-
-/**
- * Tests RenderTemplate Directive using the handleDirectiveImmediately. Expect that the renderTemplateCard
- * callback will be called.
- */
-TEST_F(TemplateRuntimeTest, test_handleDirectiveImmediately) {
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(TEMPLATE.nameSpace, TEMPLATE.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, TEMPLATE_PAYLOAD, attachmentManager, "");
-
-    EXPECT_CALL(*m_mockGui, renderTemplateCard(TEMPLATE_PAYLOAD, _))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderTemplateCard));
-
-    m_templateRuntime->handleDirectiveImmediately(directive);
-    m_wakeRenderTemplateCardFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Tests RenderTemplate Directive received before the corresponding AudioPlayer call. Expect
- * that the renderTemplateCard callback will be called and clearPlayerInfoCard will be called after 2s after Audio State
- * is changed to FINISHED state.
- */
-TEST_F(TemplateRuntimeTest, testSlow_renderPlayerInfoDirectiveBefore) {
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, PLAYERINFO_PAYLOAD, attachmentManager, "");
-
-    ::testing::InSequence s;
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-    EXPECT_CALL(*m_mockGui, renderTemplateCard(_, _)).Times(Exactly(0));
-
-    // do not expect renderPlayerInfo card call until AudioPlayer notify with the correct audioItemId
-    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(_, _, _)).Times(Exactly(0));
-
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-
-    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _, _))
-        .Times(Exactly(2))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderPlayerInfoCard))
-        .WillOnce(InvokeWithoutArgs([] {}));
-
-    RenderPlayerInfoCardsObserverInterface::Context context;
-    context.mediaProperties = m_mediaPropertiesFetcher;
-    context.audioItemId = AUDIO_ITEM_ID;
-    context.offset = TIMEOUT;
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
-
-    m_wakeRenderPlayerInfoCardFuture.wait_for(TIMEOUT);
-
-    EXPECT_CALL(*m_mockGui, clearPlayerInfoCard())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnClearPlayerInfoCard));
-
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::FINISHED, context);
-    m_wakeClearPlayerInfoCardFuture.wait_for(PLAYER_FINISHED_TIMEOUT);
-}
-
-/**
- * Tests RenderTemplate Directive received after the corresponding AudioPlayer call. Expect
- * that the renderTemplateCard callback will be called.
- */
-TEST_F(TemplateRuntimeTest, test_renderPlayerInfoDirectiveAfter) {
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, PLAYERINFO_PAYLOAD, attachmentManager, "");
-
-    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _, _))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderPlayerInfoCard));
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-
-    RenderPlayerInfoCardsObserverInterface::Context context;
-    context.mediaProperties = m_mediaPropertiesFetcher;
-    context.audioItemId = AUDIO_ITEM_ID;
-    context.offset = TIMEOUT;
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
-
-    m_wakeRenderPlayerInfoCardFuture.wait_for(TIMEOUT);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Tests RenderTemplate Directive received without an audioItemId. Expect that the
- * sendExceptionEncountered and setFailed will be called.
- */
-TEST_F(TemplateRuntimeTest, test_renderPlayerInfoDirectiveWithoutAudioItemId) {
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, TEMPLATE_PAYLOAD, attachmentManager, "");
-
-    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Tests when a malformed RenderTemplate Directive is received.  Expect that the
- * sendExceptionEncountered and setFailed will be called.
- */
-TEST_F(TemplateRuntimeTest, test_malformedRenderPlayerInfoDirective) {
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, MALFORM_PLAYERINFO_PAYLOAD, attachmentManager, "");
-
-    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Tests AudioPlayer notified the handling of AUDIO_ITEM_ID_1, and then RenderTemplate Directive with
- * AUDIO_ITEM_ID is received.  Expect that the renderTemplateCard callback will not be called until
- * the AudioPlayer notified the handling of AUDIO_ITEM_ID later.
- */
-TEST_F(TemplateRuntimeTest, test_renderPlayerInfoDirectiveDifferentAudioItemId) {
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, PLAYERINFO_PAYLOAD, attachmentManager, "");
-
-    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _, _)).Times(Exactly(0));
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-
-    RenderPlayerInfoCardsObserverInterface::Context context;
-    context.mediaProperties = m_mediaPropertiesFetcher;
-    context.audioItemId = AUDIO_ITEM_ID_1;
-    context.offset = TIMEOUT;
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-
-    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _, _))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderPlayerInfoCard));
-
-    context.audioItemId = AUDIO_ITEM_ID;
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
-
-    m_wakeRenderPlayerInfoCardFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Tests Provider notified the handling of AUDIO_ITEM_ID_1, and another provider notified the handling of
- * AUDIO_ITEM_ID, and then RenderTemplate Directive with AUDIO_ITEM_ID is received.  Expect that the
- * renderTemplateCard callback will be called and the correct getAudioItemOffset is called.
- */
-TEST_F(TemplateRuntimeTest, test_renderPlayerInfoDirectiveWithTwoProviders) {
-    auto anotherMediaPropertiesFetcher = std::make_shared<NiceMock<MockMediaPropertiesFetcher>>();
-
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, PLAYERINFO_PAYLOAD, attachmentManager, "");
-
-    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _, _))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderPlayerInfoCard));
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-
-    EXPECT_CALL(*anotherMediaPropertiesFetcher, getAudioItemOffset())
-        .Times(Exactly(1))
-        .WillOnce(Return(std::chrono::milliseconds::zero()));
-    EXPECT_CALL(*m_mediaPropertiesFetcher, getAudioItemOffset()).Times(Exactly(0));
-
-    RenderPlayerInfoCardsObserverInterface::Context context;
-    context.mediaProperties = m_mediaPropertiesFetcher;
-    context.audioItemId = AUDIO_ITEM_ID_1;
-    context.offset = TIMEOUT;
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
-
-    RenderPlayerInfoCardsObserverInterface::Context context1;
-    context1.mediaProperties = anotherMediaPropertiesFetcher;
-    context1.audioItemId = AUDIO_ITEM_ID;
-    context1.offset = TIMEOUT;
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context1);
-
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
-
-    m_wakeRenderPlayerInfoCardFuture.wait_for(TIMEOUT);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Tests AudioPlayer callbacks will trigger the correct renderPlayerInfoCard callbacks. Expect
- * the payload, audioPlayerState and offset to match to the ones passed in by the
- * RenderPlayerInfoCardsObserverInterface.
- */
-TEST_F(TemplateRuntimeTest, test_renderPlayerInfoDirectiveAudioStateUpdate) {
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, PLAYERINFO_PAYLOAD, attachmentManager, "");
-
-    ::testing::InSequence s;
-    // Send a directive first to TemplateRuntime
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-
-    RenderPlayerInfoCardsObserverInterface::Context context;
-    context.mediaProperties = m_mediaPropertiesFetcher;
-    context.audioItemId = AUDIO_ITEM_ID;
-
-    // Test onAudioPlayed() callback with 100ms offset
-    std::promise<void> wakePlayPromise;
-    std::future<void> wakePlayFuture = wakePlayPromise.get_future();
-    context.offset = std::chrono::milliseconds(100);
-    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _, _))
-        .Times(Exactly(1))
-        .WillOnce(Invoke([&wakePlayPromise, context](
-                             const std::string& jsonPayload,
-                             TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo,
-                             avsCommon::avs::FocusState focusState) {
-            EXPECT_EQ(audioPlayerInfo.audioPlayerState, avsCommon::avs::PlayerActivity::PLAYING);
-            EXPECT_EQ(audioPlayerInfo.offset, context.offset);
-            wakePlayPromise.set_value();
-        }));
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
-    wakePlayFuture.wait_for(TIMEOUT);
-
-    // Test onAudioPaused() callback with 200ms offset
-    std::promise<void> wakePausePromise;
-    std::future<void> wakePauseFuture = wakePausePromise.get_future();
-    context.offset = std::chrono::milliseconds(200);
-    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _, _))
-        .Times(Exactly(1))
-        .WillOnce(Invoke([&wakePausePromise, context](
-                             const std::string& jsonPayload,
-                             TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo,
-                             avsCommon::avs::FocusState focusState) {
-            EXPECT_EQ(audioPlayerInfo.audioPlayerState, avsCommon::avs::PlayerActivity::PAUSED);
-            EXPECT_EQ(audioPlayerInfo.offset, context.offset);
-            wakePausePromise.set_value();
-        }));
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PAUSED, context);
-    wakePauseFuture.wait_for(TIMEOUT);
-
-    // Test onAudioStopped() callback with 300ms offset
-    std::promise<void> wakeStopPromise;
-    std::future<void> wakeStopFuture = wakeStopPromise.get_future();
-    context.offset = std::chrono::milliseconds(300);
-    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _, _))
-        .Times(Exactly(1))
-        .WillOnce(Invoke([&wakeStopPromise, context](
-                             const std::string& jsonPayload,
-                             TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo,
-                             avsCommon::avs::FocusState focusState) {
-            EXPECT_EQ(audioPlayerInfo.audioPlayerState, avsCommon::avs::PlayerActivity::STOPPED);
-            EXPECT_EQ(audioPlayerInfo.offset, context.offset);
-            wakeStopPromise.set_value();
-        }));
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::STOPPED, context);
-    wakeStopFuture.wait_for(TIMEOUT);
-
-    // Test onAudioFinished() callback with 400ms offset
-    std::promise<void> wakeFinishPromise;
-    std::future<void> wakeFinishFuture = wakeFinishPromise.get_future();
-    context.offset = std::chrono::milliseconds(400);
-    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _, _))
-        .Times(Exactly(1))
-        .WillOnce(Invoke([&wakeFinishPromise, context](
-                             const std::string& jsonPayload,
-                             TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo,
-                             avsCommon::avs::FocusState focusState) {
-            EXPECT_EQ(audioPlayerInfo.audioPlayerState, avsCommon::avs::PlayerActivity::FINISHED);
-            EXPECT_EQ(audioPlayerInfo.offset, context.offset);
-            wakeFinishPromise.set_value();
-        }));
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::FINISHED, context);
-    wakeFinishFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Tests that if focus is changed to none, the clearTemplateCard() will be called.
- */
-TEST_F(TemplateRuntimeTest, test_focusNone) {
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(TEMPLATE.nameSpace, TEMPLATE.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, TEMPLATE_PAYLOAD, attachmentManager, "");
-
-    EXPECT_CALL(*m_mockGui, renderTemplateCard(TEMPLATE_PAYLOAD, _))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderTemplateCard));
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-    EXPECT_CALL(*m_mockGui, clearTemplateCard())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnClearTemplateCard));
-
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-    m_wakeRenderTemplateCardFuture.wait_for(TIMEOUT);
-    m_templateRuntime->onFocusChanged(FocusState::NONE, MixingBehavior::MUST_STOP);
-    m_wakeClearTemplateCardFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Tests that if displayCardCleared() is called, the clearTemplateCard() will not be called.
- */
-TEST_F(TemplateRuntimeTest, test_displayCardCleared) {
-    // Create Directive.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(TEMPLATE.nameSpace, TEMPLATE.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, TEMPLATE_PAYLOAD, attachmentManager, "");
-
-    EXPECT_CALL(*m_mockGui, renderTemplateCard(TEMPLATE_PAYLOAD, _))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderTemplateCard));
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-    EXPECT_CALL(*m_mockGui, clearTemplateCard()).Times(Exactly(0));
-    EXPECT_CALL(*m_mockFocusManager, releaseChannel(_, _)).Times(Exactly(1)).WillOnce(InvokeWithoutArgs([this] {
-        auto releaseChannelSuccess = std::make_shared<std::promise<bool>>();
-        std::future<bool> returnValue = releaseChannelSuccess->get_future();
-        m_templateRuntime->onFocusChanged(avsCommon::avs::FocusState::NONE, MixingBehavior::MUST_STOP);
-        releaseChannelSuccess->set_value(true);
-        wakeOnReleaseChannel();
-        return returnValue;
-    }));
-
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-    m_wakeRenderTemplateCardFuture.wait_for(TIMEOUT);
-    m_templateRuntime->displayCardCleared();
-    m_wakeReleaseChannelFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Tests that if another displayCard event is sent before channel's focus is set to none, the state machine would
- * transition to REACQUIRING state and acquireChannel again to display the card.
- */
-TEST_F(TemplateRuntimeTest, test_reacquireChannel) {
-    // Create RenderPlayerInfo Directive and wait until PlayerInfo card is displayed.
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive =
-        AVSDirective::create("", avsMessageHeader, PLAYERINFO_PAYLOAD, attachmentManager, "");
-
-    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _, _))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderPlayerInfoCard));
-
-    RenderPlayerInfoCardsObserverInterface::Context context;
-    context.mediaProperties = m_mediaPropertiesFetcher;
-    context.audioItemId = AUDIO_ITEM_ID;
-    context.offset = TIMEOUT;
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
-    m_templateRuntime->handleDirectiveImmediately(directive);
-    m_wakeRenderPlayerInfoCardFuture.wait_for(TIMEOUT);
-
-    // Send displayCardCleared() to clear card, before setting focus to NONE, send another TemplateCard.
-    EXPECT_CALL(*m_mockFocusManager, releaseChannel(_, _)).Times(Exactly(1)).WillOnce(InvokeWithoutArgs([this] {
-        auto releaseChannelSuccess = std::make_shared<std::promise<bool>>();
-        std::future<bool> returnValue = releaseChannelSuccess->get_future();
-        releaseChannelSuccess->set_value(true);
-        wakeOnReleaseChannel();
-        return returnValue;
-    }));
-    m_templateRuntime->displayCardCleared();
-    m_wakeReleaseChannelFuture.wait_for(TIMEOUT);
-
-    // Create RenderTemplate Directive and see if channel is reacquire correctly.
-    auto avsMessageHeader1 = std::make_shared<AVSMessageHeader>(TEMPLATE.nameSpace, TEMPLATE.name, MESSAGE_ID);
-    std::shared_ptr<AVSDirective> directive1 =
-        AVSDirective::create("", avsMessageHeader1, TEMPLATE_PAYLOAD, attachmentManager, "");
-
-    EXPECT_CALL(*m_mockGui, renderTemplateCard(TEMPLATE_PAYLOAD, _))
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderTemplateCard));
-
-    m_templateRuntime->handleDirectiveImmediately(directive1);
-    m_templateRuntime->onFocusChanged(avsCommon::avs::FocusState::NONE, MixingBehavior::MUST_STOP);
-    m_wakeRenderTemplateCardFuture.wait_for(TIMEOUT);
-}
-
-/**
- * Test that we should skip rendering a player info card if the audio has already changed.
- */
-TEST_F(TemplateRuntimeTest, testTimer_RenderPlayerInfoAfterPlayerActivityChanged) {
-    // Create Directive1.
-    const std::string messageId1{"messageId1"};
-    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
-    auto avsMessageHeader1 = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, messageId1);
-    std::shared_ptr<AVSDirective> directive1 =
-        AVSDirective::create("", avsMessageHeader1, PLAYERINFO_PAYLOAD, attachmentManager, "");
-
-    RenderPlayerInfoCardsObserverInterface::Context context;
-    context.mediaProperties = m_mediaPropertiesFetcher;
-    context.audioItemId = AUDIO_ITEM_ID;
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
-
-    ::testing::InSequence s;
-    EXPECT_CALL(*m_mockFocusManager, acquireChannel(_, _, _)).WillOnce(Return(true));
-    // Send a directive first to TemplateRuntime
-    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
-        .Times(Exactly(1))
-        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive1, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(messageId1);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-
-    // Test onAudioPlayed() callback with 100ms offset
-    std::promise<void> wakePlayPromise;
-    std::future<void> wakePlayFuture = wakePlayPromise.get_future();
-    context.offset = std::chrono::milliseconds(100);
-    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _, _)).Times(0);
-    EXPECT_CALL(*m_mockFocusManager, releaseChannel(_, _)).Times(Exactly(1)).WillOnce(InvokeWithoutArgs([this] {
-        auto releaseChannelSuccess = std::make_shared<std::promise<bool>>();
-        std::future<bool> returnValue = releaseChannelSuccess->get_future();
-        m_templateRuntime->onFocusChanged(avsCommon::avs::FocusState::NONE, MixingBehavior::MUST_STOP);
-        releaseChannelSuccess->set_value(true);
-        wakeOnReleaseChannel();
-        return returnValue;
-    }));
-
-    // Create Directive2.
-    const std::string messageId2{"messageId2"};
-    auto avsMessageHeader2 = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, messageId2);
-    auto mockDirectiveHandlerResult1 = make_unique<StrictMock<MockDirectiveHandlerResult>>();
-    std::shared_ptr<AVSDirective> directive2 =
-        AVSDirective::create("", avsMessageHeader1, PLAYERINFO_PAYLOAD, attachmentManager, "");
-    m_templateRuntime->CapabilityAgent::preHandleDirective(directive2, std::move(m_mockDirectiveHandlerResult));
-    m_templateRuntime->CapabilityAgent::handleDirective(messageId2);
-    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
-    m_wakeRenderTemplateCardFuture.wait_for(TIMEOUT);
-    m_templateRuntime->displayCardCleared();
-    m_wakeReleaseChannelFuture.wait_for(TIMEOUT);
-    context.audioItemId = AUDIO_ITEM_ID_1;
-    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
-    m_templateRuntime->onFocusChanged(avsCommon::avs::FocusState::FOREGROUND, MixingBehavior::PRIMARY);
-    m_templateRuntime->displayCardCleared();
-    m_wakeReleaseChannelFuture.wait_for(TIMEOUT);
-}
-
-}  // namespace test
-}  // namespace templateRuntime
-}  // namespace capabilityAgents
-}  // namespace alexaClientSDK
diff --git a/CapabilityAgents/ToggleController/src/ToggleControllerAttributeBuilder.cpp b/CapabilityAgents/ToggleController/src/ToggleControllerAttributeBuilder.cpp
index 53d367266e..1fd0540cc4 100644
--- a/CapabilityAgents/ToggleController/src/ToggleControllerAttributeBuilder.cpp
+++ b/CapabilityAgents/ToggleController/src/ToggleControllerAttributeBuilder.cpp
@@ -27,7 +27,7 @@ using namespace avsCommon::sdkInterfaces::toggleController;
 using namespace avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"ToggleControllerAttributeBuilder"};
+#define TAG "ToggleControllerAttributeBuilder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CapabilityAgents/ToggleController/src/ToggleControllerCapabilityAgent.cpp b/CapabilityAgents/ToggleController/src/ToggleControllerCapabilityAgent.cpp
index 5d9de1abce..3b3cd91491 100644
--- a/CapabilityAgents/ToggleController/src/ToggleControllerCapabilityAgent.cpp
+++ b/CapabilityAgents/ToggleController/src/ToggleControllerCapabilityAgent.cpp
@@ -29,7 +29,7 @@ using namespace avsCommon::utils;
 using namespace avsCommon::utils::configuration;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"ToggleControllerCapabilityAgent"};
+#define TAG "ToggleControllerCapabilityAgent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -202,7 +202,7 @@ void ToggleControllerCapabilityAgent::handleDirective(std::shared_ptr<DirectiveI
         return;
     }
 
-    m_executor.submit([this, info] {
+    m_executor.execute([this, info] {
         ACSDK_DEBUG5(LX("handleDirectiveInExecutor"));
         const std::string directiveName = info->directive->getName();
         if (!info->directive->getEndpoint().hasValue() ||
@@ -242,7 +242,7 @@ void ToggleControllerCapabilityAgent::provideState(
     ACSDK_DEBUG5(
         LX(__func__).d("contextRequestToken", contextRequestToken).sensitive("stateProviderName", stateProviderName));
 
-    m_executor.submit([this, stateProviderName, contextRequestToken] {
+    m_executor.execute([this, stateProviderName, contextRequestToken] {
         ACSDK_DEBUG5(LX("provideStateInExecutor"));
         executeProvideState(stateProviderName, contextRequestToken);
     });
@@ -316,7 +316,7 @@ void ToggleControllerCapabilityAgent::onToggleStateChanged(
         return;
     }
 
-    m_executor.submit([this, toggleState, cause] {
+    m_executor.execute([this, toggleState, cause] {
         m_contextManager->reportStateChange(
             CapabilityTag(NAMESPACE, TOGGLESTATE_PROPERTY_NAME, m_endpointId, m_instance),
             buildCapabilityState(toggleState),
diff --git a/Captions/Component/src/CaptionsComponent.cpp b/Captions/Component/src/CaptionsComponent.cpp
index d942de1485..e413ce1488 100644
--- a/Captions/Component/src/CaptionsComponent.cpp
+++ b/Captions/Component/src/CaptionsComponent.cpp
@@ -30,7 +30,7 @@ using namespace acsdkManufactory;
 using namespace acsdkShutdownManagerInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CaptionsComponent");
+#define TAG "CaptionsComponent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Captions/Implementation/src/CaptionManager.cpp b/Captions/Implementation/src/CaptionManager.cpp
index ab59778983..9982d8e77c 100644
--- a/Captions/Implementation/src/CaptionManager.cpp
+++ b/Captions/Implementation/src/CaptionManager.cpp
@@ -243,7 +243,7 @@ void CaptionManager::onParsed(const CaptionFrame& captionFrame) {
             // Attempt to split at the first available break between words before the requested wrap point.
             for (size_t i = wrapIndex; i > 0; i--) {
                 if (' ' == lineText[i]) {
-                    wrapIndex = i;
+                    wrapIndex = static_cast<int>(i);
                     break;
                 }
             }
diff --git a/Captions/Implementation/src/LibwebvttParserAdapter.cpp b/Captions/Implementation/src/LibwebvttParserAdapter.cpp
index 3ebf5fedde..a16b24a1aa 100644
--- a/Captions/Implementation/src/LibwebvttParserAdapter.cpp
+++ b/Captions/Implementation/src/LibwebvttParserAdapter.cpp
@@ -31,7 +31,7 @@ namespace captions {
 using namespace alexaClientSDK::avsCommon::utils::logger;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("LibwebvttParserAdapter");
+#define TAG "LibwebvttParserAdapter"
 
 /// Return value indicating an error occurred during parsing.
 static const int WEBVTT_CALLBACK_ERROR = -1;
diff --git a/Captions/Interface/src/CaptionLine.cpp b/Captions/Interface/src/CaptionLine.cpp
index eae9ec339d..72d89623eb 100644
--- a/Captions/Interface/src/CaptionLine.cpp
+++ b/Captions/Interface/src/CaptionLine.cpp
@@ -29,7 +29,7 @@ using namespace alexaClientSDK::avsCommon;
 using namespace alexaClientSDK::avsCommon::utils::logger;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CaptionLine");
+#define TAG "CaptionLine"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CertifiedSender/src/CertifiedSender.cpp b/CertifiedSender/src/CertifiedSender.cpp
index 840d314729..e1972327b2 100644
--- a/CertifiedSender/src/CertifiedSender.cpp
+++ b/CertifiedSender/src/CertifiedSender.cpp
@@ -33,7 +33,7 @@ using namespace avsCommon::utils::configuration;
 using namespace avsCommon::utils::power;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CertifiedSender");
+#define TAG "CertifiedSender"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CertifiedSender/src/SQLiteMessageStorage.cpp b/CertifiedSender/src/SQLiteMessageStorage.cpp
index 697c571107..3bd3f3a377 100644
--- a/CertifiedSender/src/SQLiteMessageStorage.cpp
+++ b/CertifiedSender/src/SQLiteMessageStorage.cpp
@@ -31,7 +31,7 @@ using namespace avsCommon::utils::logger;
 using namespace alexaClientSDK::storage::sqliteStorage;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SQLiteMessageStorage");
+#define TAG "SQLiteMessageStorage"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/CertifiedSender/test/CertifiedSenderTest.cpp b/CertifiedSender/test/CertifiedSenderTest.cpp
index 4dd454e707..99464d7df5 100644
--- a/CertifiedSender/test/CertifiedSenderTest.cpp
+++ b/CertifiedSender/test/CertifiedSenderTest.cpp
@@ -325,7 +325,7 @@ TEST_F(CertifiedSenderTest, testTimer_SendMessageWithURI) {
 /**
  * Tests if messages are re-submitted when the response is a re-tryable response.
  */
-TEST_F(CertifiedSenderTest, testSlow_retryableResponsesAreRetried) {
+TEST_F(CertifiedSenderTest, testTimer_retryableResponsesAreRetried) {
     std::static_pointer_cast<avsCommon::sdkInterfaces::ConnectionStatusObserverInterface>(m_certifiedSender)
         ->onConnectionStatusChanged(
             avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::Status::CONNECTED,
@@ -376,7 +376,7 @@ TEST_F(CertifiedSenderTest, testSlow_retryableResponsesAreRetried) {
 /**
  * Tests if messages are discarded when the response is a non-retryable response.
  */
-TEST_F(CertifiedSenderTest, testSlow_nonRetryableResponsesAreNotRetried) {
+TEST_F(CertifiedSenderTest, testTimer_nonRetryableResponsesAreNotRetried) {
     std::static_pointer_cast<avsCommon::sdkInterfaces::ConnectionStatusObserverInterface>(m_certifiedSender)
         ->onConnectionStatusChanged(
             avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::Status::CONNECTED,
diff --git a/CertifiedSender/test/Common/MockCertifiedSender.cpp b/CertifiedSender/test/Common/MockCertifiedSender.cpp
index 0e49410fe2..373a248250 100644
--- a/CertifiedSender/test/Common/MockCertifiedSender.cpp
+++ b/CertifiedSender/test/Common/MockCertifiedSender.cpp
@@ -25,7 +25,6 @@ using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::sdkInterfaces::test;
 using namespace avsCommon::utils;
 using namespace certifiedSender;
-using namespace certifiedSender::test;
 using namespace registrationManager;
 
 using namespace ::testing;
diff --git a/ContextManager/include/ContextManager/ContextManager.h b/ContextManager/include/ContextManager/ContextManager.h
index a00d0592f0..2fdb8d97f9 100644
--- a/ContextManager/include/ContextManager/ContextManager.h
+++ b/ContextManager/include/ContextManager/ContextManager.h
@@ -186,16 +186,11 @@ class ContextManager : public avsCommon::sdkInterfaces::ContextManagerInterface
      */
     struct RequestTracker {
         /// The token returned by the @c MultiTimer.
-        avsCommon::utils::timing::MultiTimer::Token timerToken;
+        const avsCommon::utils::timing::MultiTimer::Token timerToken;
         /// The context requester.
-        std::shared_ptr<avsCommon::sdkInterfaces::ContextRequesterInterface> contextRequester;
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextRequesterInterface> contextRequester;
         /// If Reportable Properties should be skipped for this request.
-        bool skipReportableStateProperties;
-
-        /**
-         * Default Constructor.
-         */
-        RequestTracker();
+        const bool skipReportableStateProperties;
 
         /**
          * Constructor.
diff --git a/ContextManager/src/ContextManager.cpp b/ContextManager/src/ContextManager.cpp
index 6631034a55..3abb219644 100644
--- a/ContextManager/src/ContextManager.cpp
+++ b/ContextManager/src/ContextManager.cpp
@@ -33,7 +33,7 @@ using namespace avsCommon::utils;
 using namespace avsCommon::utils::metrics;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ContextManager");
+#define TAG "ContextManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -87,12 +87,6 @@ static void NoopCallback() {
     // No-op
 }
 
-ContextManager::RequestTracker::RequestTracker() :
-        timerToken{0},
-        contextRequester{nullptr},
-        skipReportableStateProperties{false} {
-}
-
 ContextManager::RequestTracker::RequestTracker(
     avsCommon::utils::timing::MultiTimer::Token timerToken,
     std::shared_ptr<ContextRequesterInterface> contextRequester,
@@ -140,10 +134,10 @@ SetStateResult ContextManager::setState(
     const std::string& jsonState,
     const StateRefreshPolicy& refreshPolicy,
     const ContextRequestToken stateRequestToken) {
-    ACSDK_DEBUG5(LX(__func__).sensitive("capability", capabilityIdentifier));
+    ACSDK_DEBUG5(LX(__func__).d("token", stateRequestToken).sensitive("capability", capabilityIdentifier));
 
     if (EMPTY_TOKEN == stateRequestToken) {
-        m_executor.submit([this, capabilityIdentifier, jsonState, refreshPolicy] {
+        m_executor.execute([this, capabilityIdentifier, jsonState, refreshPolicy] {
             updateCapabilityState(capabilityIdentifier, jsonState, refreshPolicy);
         });
         return SetStateResult::SUCCESS;
@@ -169,7 +163,7 @@ SetStateResult ContextManager::setState(
         return SetStateResult::STATE_PROVIDER_NOT_REGISTERED;
     }
 
-    m_executor.submit([this, capabilityIdentifier, jsonState, refreshPolicy, stateRequestToken] {
+    m_executor.execute([this, capabilityIdentifier, jsonState, refreshPolicy, stateRequestToken] {
         updateCapabilityState(capabilityIdentifier, jsonState, refreshPolicy);
         if (jsonState.empty() && (StateRefreshPolicy::ALWAYS == refreshPolicy)) {
             ACSDK_ERROR(LX("setStateFailed")
@@ -218,7 +212,7 @@ void ContextManager::reportStateChange(
     AlexaStateChangeCauseType cause) {
     ACSDK_DEBUG5(LX(__func__).sensitive("capability", capabilityIdentifier));
 
-    m_executor.submit([this, capabilityIdentifier, capabilityState, cause] {
+    m_executor.execute([this, capabilityIdentifier, capabilityState, cause] {
         updateCapabilityState(capabilityIdentifier, capabilityState);
         std::lock_guard<std::mutex> observerMutex{m_observerMutex};
         for (auto& observer : m_observers) {
@@ -233,7 +227,7 @@ void ContextManager::provideStateResponse(
     ContextRequestToken stateRequestToken) {
     ACSDK_DEBUG5(LX(__func__).sensitive("capability", capabilityIdentifier));
 
-    m_executor.submit([this, capabilityIdentifier, capabilityState, stateRequestToken] {
+    m_executor.execute([this, capabilityIdentifier, capabilityState, stateRequestToken] {
         std::function<void()> contextAvailableCallback = NoopCallback;
         {
             std::lock_guard<std::mutex> requestsLock{m_requestsMutex};
@@ -274,7 +268,7 @@ void ContextManager::provideStateUnavailableResponse(
     bool isEndpointUnreachable) {
     ACSDK_DEBUG5(LX(__func__).sensitive("capability", capabilityIdentifier));
 
-    m_executor.submit([this, capabilityIdentifier, stateRequestToken, isEndpointUnreachable] {
+    m_executor.execute([this, capabilityIdentifier, stateRequestToken, isEndpointUnreachable] {
         std::function<void()> contextAvailableCallback = NoopCallback;
         std::function<void()> contextFailureCallback = NoopCallback;
         {
@@ -359,59 +353,75 @@ ContextRequestToken ContextManager::getContextInternal(
     const std::string& endpointId,
     const std::chrono::milliseconds& timeout,
     bool bSkipReportableStateProperties) {
-    ACSDK_DEBUG5(LX(__func__).sensitive("endpointId", endpointId));
     auto token = generateToken();
-    m_executor.submit([this, contextRequester, endpointId, token, timeout, bSkipReportableStateProperties] {
-        auto timerToken = m_multiTimer->submitTask(timeout, [this, token] {
-            // Cancel request after timeout.
-            m_executor.submit([this, token] {
-                std::function<void()> contextFailureCallback = NoopCallback;
-                {
-                    std::lock_guard<std::mutex> lock{m_requestsMutex};
-                    contextFailureCallback =
-                        getContextFailureCallbackLocked(token, ContextRequestError::STATE_PROVIDER_TIMEDOUT);
-                }
-                contextFailureCallback();
-            });
+    ACSDK_DEBUG5(LX(__func__)
+                     .d("token", token)
+                     .d("timeout(ms)", timeout.count())
+                     .d("skipReportableStateProperties", bSkipReportableStateProperties)
+                     .sensitive("endpointId", endpointId));
+
+    auto timerToken = m_multiTimer->submitTask(timeout, [this, token] {
+        // Cancel request after timeout.
+        m_executor.execute([this, token] {
+            std::function<void()> contextFailureCallback = NoopCallback;
+            {
+                std::lock_guard<std::mutex> lock{m_requestsMutex};
+                contextFailureCallback =
+                    getContextFailureCallbackLocked(token, ContextRequestError::STATE_PROVIDER_TIMEDOUT);
+            }
+            contextFailureCallback();
         });
+    });
 
-        std::lock_guard<std::mutex> requestsLock{m_requestsMutex};
-        auto& requestEndpointId = endpointId.empty() ? m_defaultEndpointId : endpointId;
-        m_pendingRequests.emplace(token, RequestTracker(timerToken, contextRequester, bSkipReportableStateProperties));
-
+    m_executor.execute([this, contextRequester, endpointId, token, timerToken, bSkipReportableStateProperties] {
         std::function<void()> contextAvailableCallback = NoopCallback;
         {
-            std::lock_guard<std::mutex> statesLock{m_endpointsStateMutex};
-
-            for (auto& capability : m_endpointsState[requestEndpointId]) {
-                auto stateInfo = capability.second;
-                auto stateProvider = capability.second.stateProvider;
-
-                if (stateProvider) {
-                    bool requestState = false;
-                    if (stateInfo.legacyCapability && stateInfo.refreshPolicy != StateRefreshPolicy::NEVER) {
-                        requestState = true;
-                    } else if (
-                        !stateInfo.legacyCapability && stateProvider->canStateBeRetrieved() &&
-                        stateProvider->shouldQueryState()) {
-                        if (stateProvider->hasReportableStateProperties()) {
-                            /// Check if the reportable state properties should be skipped.
-                            if (!bSkipReportableStateProperties) {
+            std::lock_guard<std::mutex> requestsLock{m_requestsMutex};
+            auto& requestEndpointId = endpointId.empty() ? m_defaultEndpointId : endpointId;
+            m_pendingRequests.emplace(
+                token, RequestTracker(timerToken, contextRequester, bSkipReportableStateProperties));
+
+            {
+                std::lock_guard<std::mutex> statesLock{m_endpointsStateMutex};
+
+                auto endpointsStateIt = m_endpointsState.find(requestEndpointId);
+                if (m_endpointsState.end() == endpointsStateIt) {
+                    ACSDK_WARN(LX(__func__)
+                                   .d("reason", "requestEndpointIdNotFound")
+                                   .d("token", token)
+                                   .sensitive("endpointId", requestEndpointId));
+                } else {
+                    for (auto& capability : endpointsStateIt->second) {
+                        auto stateInfo = capability.second;
+                        auto stateProvider = capability.second.stateProvider;
+
+                        if (stateProvider) {
+                            bool requestState = false;
+                            if (stateInfo.legacyCapability && stateInfo.refreshPolicy != StateRefreshPolicy::NEVER) {
                                 requestState = true;
+                            } else if (
+                                !stateInfo.legacyCapability && stateProvider->canStateBeRetrieved() &&
+                                stateProvider->shouldQueryState()) {
+                                if (stateProvider->hasReportableStateProperties()) {
+                                    /// Check if the reportable state properties should be skipped.
+                                    if (!bSkipReportableStateProperties) {
+                                        requestState = true;
+                                    }
+                                } else {
+                                    requestState = true;
+                                }
                             }
-                        } else {
-                            requestState = true;
-                        }
-                    }
 
-                    if (requestState) {
-                        stateProvider->provideState(capability.first, token);
-                        m_pendingStateRequest[token].emplace(capability.first);
+                            if (requestState) {
+                                m_pendingStateRequest[token].emplace(capability.first);
+                                stateProvider->provideState(capability.first, token);
+                            }
+                        }
                     }
                 }
-            }
 
-            contextAvailableCallback = getContextAvailableCallbackIfReadyLocked(token, requestEndpointId);
+                contextAvailableCallback = getContextAvailableCallbackIfReadyLocked(token, requestEndpointId);
+            }
         }
         /// Callback method should be called outside the lock.
         contextAvailableCallback();
@@ -434,27 +444,36 @@ std::function<void()> ContextManager::getContextFailureCallbackLocked(
         m_pendingStateRequest.erase(requestToken);
     }};
 
-    auto& request = m_pendingRequests[requestToken];
-    if (!request.contextRequester) {
+    auto requestIt = m_pendingRequests.find(requestToken);
+    if (m_pendingRequests.end() == requestIt) {
+        ACSDK_ERROR(LX(__func__).d("result", "tokenNotFound").d("token", requestToken));
+        return NoopCallback;
+    }
+    auto& request = requestIt->second;
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextRequesterInterface> contextRequester = request.contextRequester;
+    if (!contextRequester) {
         ACSDK_DEBUG0(LX(__func__).d("result", "nullRequester").d("token", requestToken));
         return NoopCallback;
     }
-    for (auto& pendingState : m_pendingStateRequest[requestToken]) {
-        ACSDK_ERROR(LX(__func__)
-                        .d("pendingStateProviderName", pendingState.name)
-                        .d("pendingStateProviderNamespace", pendingState.nameSpace));
-        auto metricName = STATE_PROVIDER_TIMEOUT_METRIC_PREFIX + pendingState.nameSpace;
-        recordMetric(
-            m_metricRecorder,
-            MetricEventBuilder{}
-                .setActivityName("CONTEXT_MANAGER-" + metricName)
-                .addDataPoint(DataPointCounterBuilder{}.setName(metricName).increment(1).build())
-                .build());
+    auto stateRequestIt = m_pendingStateRequest.find(requestToken);
+    if (m_pendingStateRequest.end() != stateRequestIt) {
+        for (auto& pendingState : stateRequestIt->second) {
+            ACSDK_ERROR(LX(__func__)
+                            .d("pendingStateProviderName", pendingState.name)
+                            .d("pendingStateProviderNamespace", pendingState.nameSpace));
+            auto metricName = STATE_PROVIDER_TIMEOUT_METRIC_PREFIX + pendingState.nameSpace;
+            recordMetric(
+                m_metricRecorder,
+                MetricEventBuilder{}
+                    .setActivityName("CONTEXT_MANAGER-" + metricName)
+                    .addDataPoint(DataPointCounterBuilder{}.setName(metricName).increment(1).build())
+                    .build());
+        }
     }
-    auto contextRequester = request.contextRequester;
 
     return [contextRequester, error, requestToken]() {
         if (contextRequester) {
+            ACSDK_ERROR(LX(__func__).d("reason", "invokeOnContextFailure").d("token", requestToken));
             contextRequester->onContextFailure(error, requestToken);
         }
     };
@@ -463,10 +482,16 @@ std::function<void()> ContextManager::getContextFailureCallbackLocked(
 std::function<void()> ContextManager::getContextAvailableCallbackIfReadyLocked(
     unsigned int requestToken,
     const EndpointIdentifier& endpointId) {
-    auto& pendingStates = m_pendingStateRequest[requestToken];
-    if (!pendingStates.empty()) {
-        ACSDK_DEBUG5(LX(__func__).d("result", "stateNotAvailableYet").d("pendingStates", pendingStates.size()));
-        return NoopCallback;
+    auto stateRequestIt = m_pendingStateRequest.find(requestToken);
+    if (m_pendingStateRequest.end() != stateRequestIt) {
+        auto& pendingStates = stateRequestIt->second;
+        if (!pendingStates.empty()) {
+            ACSDK_DEBUG5(LX(__func__)
+                             .d("result", "stateNotAvailableYet")
+                             .d("token", requestToken)
+                             .d("pendingStates", pendingStates.size()));
+            return NoopCallback;
+        }
     }
 
     ACSDK_DEBUG5(LX(__func__).sensitive("endpointId", endpointId).d("token", requestToken));
@@ -480,8 +505,14 @@ std::function<void()> ContextManager::getContextAvailableCallbackIfReadyLocked(
         m_pendingStateRequest.erase(requestToken);
     }};
 
-    auto& request = m_pendingRequests[requestToken];
-    if (!request.contextRequester) {
+    auto requestIt = m_pendingRequests.find(requestToken);
+    if (m_pendingRequests.end() == requestIt) {
+        ACSDK_ERROR(LX(__func__).d("result", "tokenNotFound").d("token", requestToken));
+        return NoopCallback;
+    }
+    auto& request = requestIt->second;
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextRequesterInterface> contextRequester = request.contextRequester;
+    if (!contextRequester) {
         ACSDK_ERROR(
             LX("getContextAvailableCallbackIfReadyLockedFailed").d("reason", "nullRequester").d("token", requestToken));
         return NoopCallback;
@@ -489,40 +520,44 @@ std::function<void()> ContextManager::getContextAvailableCallbackIfReadyLocked(
 
     AVSContext context;
     auto& requestEndpointId = endpointId.empty() ? m_defaultEndpointId : endpointId;
-    for (auto& capability : m_endpointsState[requestEndpointId]) {
-        auto stateProvider = capability.second.stateProvider;
-        auto stateInfo = capability.second;
-        bool addState = false;
-
-        if (stateInfo.legacyCapability) {
-            // Ignore if the state is not available for legacy SOMETIMES refresh policy.
-            if ((stateInfo.refreshPolicy == StateRefreshPolicy::SOMETIMES) && !stateInfo.capabilityState.hasValue()) {
-                ACSDK_DEBUG5(LX(__func__).d("skipping state for legacy capabilityIdentifier", capability.first));
+    auto endpointStateIt = m_endpointsState.find(requestEndpointId);
+    if (endpointStateIt != m_endpointsState.end()) {
+        for (auto& capability : endpointStateIt->second) {
+            auto stateProvider = capability.second.stateProvider;
+            auto stateInfo = capability.second;
+            bool addState = false;
+
+            if (stateInfo.legacyCapability) {
+                // Ignore if the state is not available for legacy SOMETIMES refresh policy.
+                if ((stateInfo.refreshPolicy == StateRefreshPolicy::SOMETIMES) &&
+                    !stateInfo.capabilityState.hasValue()) {
+                    ACSDK_DEBUG5(LX(__func__).d("skipping state for legacy capabilityIdentifier", capability.first));
+                } else {
+                    addState = true;
+                }
             } else {
-                addState = true;
-            }
-        } else {
-            if (stateProvider && stateProvider->canStateBeRetrieved()) {
-                /// Check if the reportable state properties should be skipped.
-                if (stateProvider->hasReportableStateProperties()) {
-                    if (!request.skipReportableStateProperties) {
+                if (stateProvider && stateProvider->canStateBeRetrieved()) {
+                    /// Check if the reportable state properties should be skipped.
+                    if (stateProvider->hasReportableStateProperties()) {
+                        if (!request.skipReportableStateProperties) {
+                            addState = true;
+                        }
+                    } else {
                         addState = true;
                     }
-                } else {
-                    addState = true;
                 }
             }
-        }
 
-        if (addState) {
-            ACSDK_DEBUG5(LX(__func__).sensitive("addState", capability.first));
-            context.addState(capability.first, stateInfo.capabilityState.value());
+            if (addState) {
+                ACSDK_DEBUG5(LX(__func__).sensitive("addState", capability.first));
+                context.addState(capability.first, stateInfo.capabilityState.value());
+            }
         }
     }
-    auto contextRequester = request.contextRequester;
 
     return [contextRequester, context, endpointId, requestToken]() {
         if (contextRequester) {
+            ACSDK_DEBUG5(LX(__func__).d("reason", "invokeOnContextAvailable").d("token", requestToken));
             contextRequester->onContextAvailable(endpointId, context, requestToken);
         }
     };
diff --git a/ContextManager/test/ContextManagerTest.cpp b/ContextManager/test/ContextManagerTest.cpp
index 54a6b4b1da..de987cd5b8 100644
--- a/ContextManager/test/ContextManagerTest.cpp
+++ b/ContextManager/test/ContextManagerTest.cpp
@@ -32,7 +32,7 @@ using namespace avsCommon::avs;
 using namespace avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ContextManagerTest");
+#define TAG "ContextManagerTest"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Diagnostics/src/AudioInjectorMicrophone.cpp b/Diagnostics/src/AudioInjectorMicrophone.cpp
index 2da9ed25bb..d330c2e32c 100644
--- a/Diagnostics/src/AudioInjectorMicrophone.cpp
+++ b/Diagnostics/src/AudioInjectorMicrophone.cpp
@@ -24,7 +24,7 @@ using avsCommon::avs::AudioInputStream;
 using namespace avsCommon::utils::timing;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AudioInjectorMicrophone");
+#define TAG "AudioInjectorMicrophone"
 
 /// The timeout to use for writing to the SharedDataStream.
 static const std::chrono::milliseconds TIMEOUT_FOR_WRITING{500};
diff --git a/Diagnostics/src/DevicePropertyAggregator.cpp b/Diagnostics/src/DevicePropertyAggregator.cpp
index f6a2001092..099a69622f 100644
--- a/Diagnostics/src/DevicePropertyAggregator.cpp
+++ b/Diagnostics/src/DevicePropertyAggregator.cpp
@@ -25,7 +25,7 @@ using namespace alexaClientSDK::avsCommon::sdkInterfaces;
 using namespace alexaClientSDK::avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"DevicePropertyAggregator"};
+#define TAG "DevicePropertyAggregator"
 
 /// String to identify invalid property value.
 static const std::string INVALID_VALUE{"INVALID"};
@@ -127,7 +127,7 @@ void DevicePropertyAggregator::onAuthStateChange(
             break;
     }
 
-    m_executor.submit([this, registered]() {
+    m_executor.execute([this, registered]() {
         m_asyncPropertyMap[DevicePropertyAggregatorInterface::REGISTRATION_STATUS] = toString(registered);
     });
 }
@@ -260,7 +260,7 @@ Optional<std::string> DevicePropertyAggregator::getDeviceContextJson() {
 
 void DevicePropertyAggregator::onAlertStateChange(const AlertObserverInterface::AlertInfo& alertInfo) {
     ACSDK_DEBUG5(LX(__func__));
-    m_executor.submit([this, alertInfo]() {
+    m_executor.execute([this, alertInfo]() {
         std::stringstream ss;
         ss << alertInfo.type << ":" << alertInfo.state;
         m_asyncPropertyMap[DevicePropertyAggregatorInterface::ALERT_TYPE_AND_STATE] = ss.str();
@@ -271,7 +271,7 @@ void DevicePropertyAggregator::onPlayerActivityChanged(
     PlayerActivity state,
     const AudioPlayerObserverInterface::Context& context) {
     ACSDK_DEBUG5(LX(__func__));
-    m_executor.submit([this, state, context]() {
+    m_executor.execute([this, state, context]() {
         std::string playerActivityState = avsCommon::avs::playerActivityToString(state);
         m_asyncPropertyMap[DevicePropertyAggregatorInterface::AUDIO_PLAYER_STATE] = playerActivityState;
         m_asyncPropertyMap[DevicePropertyAggregatorInterface::CONTENT_ID] = context.audioItemId;
@@ -280,7 +280,7 @@ void DevicePropertyAggregator::onPlayerActivityChanged(
 
 void DevicePropertyAggregator::onConnectionStatusChanged(const Status status, const ChangedReason reason) {
     ACSDK_DEBUG5(LX(__func__));
-    m_executor.submit([this, status]() {
+    m_executor.execute([this, status]() {
         std::stringstream ss;
         ss << status;
         m_asyncPropertyMap[DevicePropertyAggregatorInterface::CONNECTION_STATE] = ss.str();
@@ -289,7 +289,7 @@ void DevicePropertyAggregator::onConnectionStatusChanged(const Status status, co
 
 void DevicePropertyAggregator::onSetIndicator(IndicatorState state) {
     ACSDK_DEBUG5(LX(__func__));
-    m_executor.submit([this, state]() {
+    m_executor.execute([this, state]() {
         std::stringstream ss;
         ss << state;
         m_asyncPropertyMap[DevicePropertyAggregatorInterface::NOTIFICATION_INDICATOR] = ss.str();
@@ -302,7 +302,7 @@ void DevicePropertyAggregator::onNotificationReceived() {
 
 void DevicePropertyAggregator::onDialogUXStateChanged(DialogUXStateObserverInterface::DialogUXState newState) {
     ACSDK_DEBUG5(LX(__func__));
-    m_executor.submit([this, newState]() {
+    m_executor.execute([this, newState]() {
         m_asyncPropertyMap[DevicePropertyAggregatorInterface::TTS_PLAYER_STATE] =
             DialogUXStateObserverInterface::stateToString(newState);
     });
@@ -313,7 +313,7 @@ void DevicePropertyAggregator::onSpeakerSettingsChanged(
     const ChannelVolumeInterface::Type& type,
     const SpeakerInterface::SpeakerSettings& settings) {
     ACSDK_DEBUG5(LX(__func__));
-    m_executor.submit([this, type, settings]() { updateSpeakerSettingsInPropertyMap(type, settings); });
+    m_executor.execute([this, type, settings]() { updateSpeakerSettingsInPropertyMap(type, settings); });
 }
 
 void DevicePropertyAggregator::updateSpeakerSettingsInPropertyMap(
@@ -338,7 +338,7 @@ void DevicePropertyAggregator::updateSpeakerSettingsInPropertyMap(
 
 void DevicePropertyAggregator::onRangeChanged(const RangeState& rangeState, const AlexaStateChangeCauseType cause) {
     ACSDK_DEBUG5(LX(__func__).d("range value", rangeState.value));
-    m_executor.submit([this, rangeState]() {
+    m_executor.execute([this, rangeState]() {
         std::stringstream ss;
         ss << rangeState.value;
         m_asyncPropertyMap[DevicePropertyAggregatorInterface::RANGE_CONTROLLER_STATUS] = ss.str();
@@ -349,7 +349,7 @@ void DevicePropertyAggregator::onPowerStateChanged(
     const PowerState& powerState,
     const AlexaStateChangeCauseType cause) {
     ACSDK_DEBUG5(LX(__func__).d("power state", powerState.powerState));
-    m_executor.submit([this, powerState]() {
+    m_executor.execute([this, powerState]() {
         std::stringstream ss;
         ss << powerState.powerState;
         m_asyncPropertyMap[DevicePropertyAggregatorInterface::POWER_CONTROLLER_STATUS] = ss.str();
diff --git a/Diagnostics/src/DeviceProtocolTracer.cpp b/Diagnostics/src/DeviceProtocolTracer.cpp
index 4d84df6886..ab2500c335 100644
--- a/Diagnostics/src/DeviceProtocolTracer.cpp
+++ b/Diagnostics/src/DeviceProtocolTracer.cpp
@@ -30,7 +30,7 @@ using namespace avsCommon::utils::json;
 using namespace rapidjson;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DeviceProtocolTracer");
+#define TAG "DeviceProtocolTracer"
 
 /// Maximum number of trace messages stored in the device protocol tracer.
 static const unsigned int DEFAULT_MAX_MESSAGES = 1;
diff --git a/Diagnostics/src/DiagnosticsUtils.cpp b/Diagnostics/src/DiagnosticsUtils.cpp
index 8d6375f63f..0057e5dab1 100644
--- a/Diagnostics/src/DiagnosticsUtils.cpp
+++ b/Diagnostics/src/DiagnosticsUtils.cpp
@@ -23,7 +23,7 @@ namespace diagnostics {
 namespace utils {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DiagnosticsUtils");
+#define TAG "DiagnosticsUtils"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Diagnostics/src/FileBasedAudioInjector.cpp b/Diagnostics/src/FileBasedAudioInjector.cpp
index 8202c49d78..134c63f7d0 100644
--- a/Diagnostics/src/FileBasedAudioInjector.cpp
+++ b/Diagnostics/src/FileBasedAudioInjector.cpp
@@ -25,7 +25,7 @@ namespace alexaClientSDK {
 namespace diagnostics {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("FileBasedAudioInjector");
+#define TAG "FileBasedAudioInjector"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Endpoints/src/DefaultEndpointBuilder.cpp b/Endpoints/src/DefaultEndpointBuilder.cpp
index 7f56656529..27ea6d8188 100644
--- a/Endpoints/src/DefaultEndpointBuilder.cpp
+++ b/Endpoints/src/DefaultEndpointBuilder.cpp
@@ -31,7 +31,7 @@ using namespace avsCommon::sdkInterfaces::endpoints;
 using namespace avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DefaultEndpointBuilder");
+#define TAG "DefaultEndpointBuilder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Endpoints/src/Endpoint.cpp b/Endpoints/src/Endpoint.cpp
index 79a896e6ba..302be3294c 100644
--- a/Endpoints/src/Endpoint.cpp
+++ b/Endpoints/src/Endpoint.cpp
@@ -26,7 +26,7 @@ using namespace avsCommon::sdkInterfaces::endpoints;
 using namespace avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("Endpoint");
+#define TAG "Endpoint"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Endpoints/src/EndpointBuilder.cpp b/Endpoints/src/EndpointBuilder.cpp
index ca2e6e29b2..f2e4eb182f 100644
--- a/Endpoints/src/EndpointBuilder.cpp
+++ b/Endpoints/src/EndpointBuilder.cpp
@@ -44,7 +44,7 @@ using namespace avsCommon::sdkInterfaces::endpoints;
 using namespace avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("EndpointBuilder");
+#define TAG "EndpointBuilder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Endpoints/src/EndpointRegistrationManager.cpp b/Endpoints/src/EndpointRegistrationManager.cpp
index ba02676377..28ee17b4bc 100644
--- a/Endpoints/src/EndpointRegistrationManager.cpp
+++ b/Endpoints/src/EndpointRegistrationManager.cpp
@@ -25,7 +25,7 @@ namespace alexaClientSDK {
 namespace endpoints {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("EndpointRegistrationManager");
+#define TAG "EndpointRegistrationManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -117,7 +117,7 @@ std::future<EndpointRegistrationManager::RegistrationResult> EndpointRegistratio
         return promise.get_future();
     }
 
-    m_executor.submit([this, endpoint]() { executeRegisterEndpoint(endpoint); });
+    m_executor.execute([this, endpoint]() { executeRegisterEndpoint(endpoint); });
 
     auto& pending = m_pendingRegistrations[endpointId];
     pending.first = std::move(endpoint);
@@ -160,7 +160,7 @@ std::future<EndpointRegistrationManager::UpdateResult> EndpointRegistrationManag
     }
 
     auto endpoint = m_endpoints[endpointId];
-    m_executor.submit(
+    m_executor.execute(
         [this, endpoint, endpointModificationData]() { executeUpdateEndpoint(endpoint, endpointModificationData); });
     auto& pending = m_pendingUpdates[endpointId];
     pending.first = std::move(endpoint);
@@ -219,7 +219,7 @@ std::future<EndpointRegistrationManager::DeregistrationResult> EndpointRegistrat
 
     auto endpoint = m_endpoints[endpointId];
 
-    m_executor.submit([this, endpoint]() { executeDeregisterEndpoint(endpoint); });
+    m_executor.execute([this, endpoint]() { executeDeregisterEndpoint(endpoint); });
 
     auto& pending = m_pendingDeregistrations[endpointId];
     pending.first = std::move(endpoint);
@@ -472,7 +472,7 @@ void EndpointRegistrationManager::onCapabilityRegistrationStatusChanged(
     const std::pair<CapabilityRegistrationProxy::State, std::vector<EndpointIdentifier>>& addedOrUpdatedEndpoints,
     const std::pair<CapabilityRegistrationProxy::State, std::vector<EndpointIdentifier>>& deletedEndpoints) {
     ACSDK_DEBUG5(LX(__func__));
-    m_executor.submit([this, addedOrUpdatedEndpoints, deletedEndpoints] {
+    m_executor.execute([this, addedOrUpdatedEndpoints, deletedEndpoints] {
         updateAddedOrUpdatedEndpoints(addedOrUpdatedEndpoints);
         removeDeletedEndpoints(deletedEndpoints);
     });
diff --git a/Endpoints/test/EndpointRegistrationManagerTest.cpp b/Endpoints/test/EndpointRegistrationManagerTest.cpp
index c2b0a35e7e..df8a8a85e3 100644
--- a/Endpoints/test/EndpointRegistrationManagerTest.cpp
+++ b/Endpoints/test/EndpointRegistrationManagerTest.cpp
@@ -113,6 +113,8 @@ void EndpointRegistrationManagerTest::SetUp() {
 void EndpointRegistrationManagerTest::TearDown() {
     m_manager.reset();
     m_capabilitiesDelegate.reset();
+    m_capabilitiesObserver.reset();
+    m_registrationObserver.reset();
 
     m_sequencer->shutdown();
     m_sequencer.reset();
@@ -214,14 +216,14 @@ TEST_F(EndpointRegistrationManagerTest, test_registerEndpointSucceeds) {
     EXPECT_CALL(*m_sequencer, addDirectiveHandler(handler)).WillOnce(Return(true));
     EXPECT_CALL(*m_capabilitiesDelegate, addOrUpdateEndpoint(_, configurations)).WillOnce(Return(true));
 
-    // Check that register endpoint was enqueued.
-    auto result = m_manager->registerEndpoint(endpoint);
-    ASSERT_EQ(result.wait_for(std::chrono::milliseconds::zero()), std::future_status::timeout);
-
     // Expect that the observer will be notified that the endpoint was registered.
     EXPECT_CALL(*m_registrationObserver, onEndpointRegistration(endpointId, _, RegistrationResult::SUCCEEDED));
     EXPECT_CALL(*m_registrationObserver, onPendingEndpointRegistrationOrUpdate(endpointId, _, _));
 
+    // Check that register endpoint was enqueued.
+    auto result = m_manager->registerEndpoint(endpoint);
+    ASSERT_EQ(result.wait_for(std::chrono::milliseconds::zero()), std::future_status::timeout);
+
     m_capabilitiesObserver->onCapabilitiesStateChange(
         CapabilitiesDelegateObserverInterface::State::SUCCESS,
         CapabilitiesDelegateObserverInterface::Error::SUCCESS,
@@ -251,11 +253,13 @@ TEST_F(EndpointRegistrationManagerTest, test_deregisterEndpointSucceeds) {
     EXPECT_CALL(*m_capabilitiesDelegate, addOrUpdateEndpoint(_, configurations)).WillOnce(Return(true));
     EXPECT_CALL(*m_capabilitiesDelegate, deleteEndpoint(_, configurations)).WillOnce(Return(true));
 
+    // set expectation
+    EXPECT_CALL(*m_registrationObserver, onEndpointRegistration(endpointId, _, RegistrationResult::SUCCEEDED));
+    EXPECT_CALL(*m_registrationObserver, onPendingEndpointRegistrationOrUpdate(endpointId, _, _));
+
     // Add an endpoint so we can test delete.
     auto addResult = m_manager->registerEndpoint(endpoint);
 
-    EXPECT_CALL(*m_registrationObserver, onEndpointRegistration(endpointId, _, RegistrationResult::SUCCEEDED));
-    EXPECT_CALL(*m_registrationObserver, onPendingEndpointRegistrationOrUpdate(endpointId, _, _));
     m_capabilitiesObserver->onCapabilitiesStateChange(
         CapabilitiesDelegateObserverInterface::State::SUCCESS,
         CapabilitiesDelegateObserverInterface::Error::SUCCESS,
@@ -312,11 +316,13 @@ TEST_F(EndpointRegistrationManagerTest, test_updateEndpointSucceeds) {
     EXPECT_CALL(*m_sequencer, addDirectiveHandler(handler1)).WillOnce(Return(true));
     EXPECT_CALL(*m_sequencer, addDirectiveHandler(handler2)).WillOnce(Return(true));
     EXPECT_CALL(*m_capabilitiesDelegate, addOrUpdateEndpoint(_, _)).WillRepeatedly(Return(true));
-    // Add an endpoint so we can test update
-    auto addResult = m_manager->registerEndpoint(endpoint);
 
     EXPECT_CALL(*m_registrationObserver, onEndpointRegistration(endpointId, _, RegistrationResult::SUCCEEDED));
     EXPECT_CALL(*m_registrationObserver, onPendingEndpointRegistrationOrUpdate(endpointId, _, _));
+
+    // Add an endpoint so we can test update
+    auto addResult = m_manager->registerEndpoint(endpoint);
+
     m_capabilitiesObserver->onCapabilitiesStateChange(
         CapabilitiesDelegateObserverInterface::State::SUCCESS,
         CapabilitiesDelegateObserverInterface::Error::SUCCESS,
@@ -330,9 +336,9 @@ TEST_F(EndpointRegistrationManagerTest, test_updateEndpointSucceeds) {
     EXPECT_CALL(*m_sequencer, addDirectiveHandler(addedHandler)).WillOnce(Return(true));
     EXPECT_CALL(*m_sequencer, removeDirectiveHandler(handler2)).WillOnce(Return(true));
     EXPECT_CALL(*endpoint, update(_)).WillOnce(Return(true));
-    auto updateResult = m_manager->updateEndpoint(endpointId, std::make_shared<EndpointModificationData>(updatedData));
     EXPECT_CALL(*m_registrationObserver, onEndpointUpdate(endpointId, _, UpdateResult::SUCCEEDED));
     EXPECT_CALL(*m_registrationObserver, onPendingEndpointRegistrationOrUpdate(endpointId, _, _));
+    auto updateResult = m_manager->updateEndpoint(endpointId, std::make_shared<EndpointModificationData>(updatedData));
     m_capabilitiesObserver->onCapabilitiesStateChange(
         CapabilitiesDelegateObserverInterface::State::SUCCESS,
         CapabilitiesDelegateObserverInterface::Error::SUCCESS,
@@ -417,15 +423,15 @@ TEST_F(EndpointRegistrationManagerTest, test_registerEndpointWhenCapabilityRegis
     EXPECT_CALL(*m_sequencer, removeDirectiveHandler(handler)).WillOnce(Return(true));
     EXPECT_CALL(*m_capabilitiesDelegate, addOrUpdateEndpoint(_, configurations)).WillOnce(Return(true));
 
-    // Check that register endpoint was enqueued.
-    auto result = m_manager->registerEndpoint(endpoint);
-    ASSERT_EQ(result.wait_for(std::chrono::milliseconds::zero()), std::future_status::timeout);
-
     // Expect that the observer will be notified that the endpoint was registered.
     EXPECT_CALL(
         *m_registrationObserver, onEndpointRegistration(endpointId, _, RegistrationResult::CONFIGURATION_ERROR));
     EXPECT_CALL(*m_registrationObserver, onPendingEndpointRegistrationOrUpdate(endpointId, _, _));
 
+    // Check that register endpoint was enqueued.
+    auto result = m_manager->registerEndpoint(endpoint);
+    ASSERT_EQ(result.wait_for(std::chrono::milliseconds::zero()), std::future_status::timeout);
+
     m_capabilitiesObserver->onCapabilitiesStateChange(
         CapabilitiesDelegateObserverInterface::State::FATAL_ERROR,
         CapabilitiesDelegateObserverInterface::Error::UNKNOWN_ERROR,
@@ -716,9 +722,9 @@ TEST_F(EndpointRegistrationManagerTest, test_deregisterEndpointWhileUpdateInProg
     ASSERT_EQ(result.get(), RegistrationResult::SUCCEEDED);
 
     // Check that update endpoint enqueued.
-    auto updateResult = m_manager->updateEndpoint(endpointId, updatedData);
     EXPECT_CALL(*m_registrationObserver, onEndpointUpdate(endpointId, _, _)).Times(1);
     EXPECT_CALL(*m_registrationObserver, onPendingEndpointRegistrationOrUpdate(endpointId, _, _)).Times(1);
+    auto updateResult = m_manager->updateEndpoint(endpointId, updatedData);
     ASSERT_EQ(updateResult.wait_for(std::chrono::milliseconds::zero()), std::future_status::timeout);
 
     // Check that the deregistration fails.
@@ -852,9 +858,9 @@ TEST_F(EndpointRegistrationManagerTest, test_updateEndpointWhileUpdateInProgress
     ASSERT_EQ(result.get(), RegistrationResult::SUCCEEDED);
 
     // Check that update endpoint enqueued.
-    auto deleteResult = m_manager->updateEndpoint(endpointId, updatedData);
     EXPECT_CALL(*m_registrationObserver, onEndpointUpdate(endpointId, _, _)).Times(1);
     EXPECT_CALL(*m_registrationObserver, onPendingEndpointRegistrationOrUpdate(endpointId, _, _)).Times(1);
+    auto deleteResult = m_manager->updateEndpoint(endpointId, updatedData);
     ASSERT_EQ(deleteResult.wait_for(std::chrono::milliseconds::zero()), std::future_status::timeout);
 
     // Check that the redundant update fails.
diff --git a/Integration/AlexaClientSDKConfig.json b/Integration/AlexaClientSDKConfig.json
index da213f9dde..d64f42a441 100644
--- a/Integration/AlexaClientSDKConfig.json
+++ b/Integration/AlexaClientSDKConfig.json
@@ -4,9 +4,6 @@
 /// See https://developer.amazon.com/en-US/docs/alexa/avs-device-sdk/alexa-client-sdk-config-json.html
 /// to learn more about configuration options and default behaviours.
 {
-    "cblAuthDelegate":{
-        "databaseFilePath":"${SDK_CBL_AUTH_DELEGATE_DATABASE_FILE_PATH}"
-    },
     "deviceInfo":{
         "deviceSerialNumber":"${SDK_CONFIG_DEVICE_SERIAL_NUMBER}",
         "clientId":"${SDK_CONFIG_CLIENT_ID}",
@@ -27,6 +24,7 @@
         "databaseFilePath":"${SDK_LWA_AUTHORIZATION_ADAPTER_DATABASE_FILE_PATH}"
     },
     "speakerManagerCapabilityAgent":{
+        "persistentStorage":true,
         "defaultSpeakerVolume":40,
         "defaultAlertsVolume":40,
         "restoreMuteState":true
@@ -42,6 +40,12 @@
         "locales":["en-US","en-GB","de-DE","en-IN","en-CA","ja-JP","en-AU","fr-FR","it-IT","es-ES","es-MX","fr-CA",
             "es-US", "hi-IN", "pt-BR", "ar-SA"],
         "defaultLocale":"en-US",
+        "davs": {
+            "artifactDirectory": "${SDK_DAVS_ARTIFACT_DIR}",
+            "segmentId": "${SDK_DAVS_SEGMENT_ID}",
+            "artifactBudgetSizeInMB": 100,
+            "pollingIntervalInSeconds": 0
+        },
         "localeCombinations":[
             ["en-US", "es-US"],
             ["es-US", "en-US"],
@@ -58,7 +62,21 @@
             ["en-IN", "hi-IN"],
             ["hi-IN", "en-IN"],
             ["fr-CA", "en-CA"],
-            ["en-CA", "fr-CA"]
+            ["en-CA", "fr-CA"],
+            ["en-GB", "fr-FR"],
+            ["fr-FR", "en-GB"],
+            ["en-GB", "es-ES"],
+            ["es-ES", "en-GB"],
+            ["en-GB", "de-DE"],
+            ["de-DE", "en-GB"],
+            ["en-GB", "it-IT"],
+            ["it-IT", "en-GB"],
+            ["hi-IN", "en-US"],
+            ["en-US", "hi-IN"],
+            ["pt-BR", "en-US"],
+            ["en-US", "pt-BR"],
+            ["es-MX", "en-US"],
+            ["en-US", "es-MX"]
         ],
         "defaultTimezone":"America/Vancouver"
     },
@@ -75,9 +93,6 @@
         "agentString": "CQCAFYNYDC"
     },
     "sampleApp": {
-        "displayCardsSupported":true,
-        "sensory": {
-            "modelFilePath": "${SDK_SENSORY_MODEL_FILE_PATH}"
-        }
+        "displayCardsSupported":true
     }
 }
diff --git a/Integration/CMakeLists.txt b/Integration/CMakeLists.txt
deleted file mode 100644
index 78d41e5378..0000000000
--- a/Integration/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-project(Integration LANGUAGES CXX)
-
-include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
-
-add_subdirectory("src")
-add_subdirectory("test")
diff --git a/Integration/include/Integration/ACLTestContext.h b/Integration/include/Integration/ACLTestContext.h
deleted file mode 100644
index c01ec0165b..0000000000
--- a/Integration/include/Integration/ACLTestContext.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_ACLTESTCONTEXT_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_ACLTESTCONTEXT_H_
-
-#include <memory>
-#include <string>
-
-#include <ACL/Transport/MessageRouter.h>
-#include <AVSCommon/AVS/Attachment/AttachmentManager.h>
-#include <AVSCommon/SDKInterfaces/AuthDelegateInterface.h>
-#include <CBLAuthDelegate/CBLAuthRequesterInterface.h>
-#include <ContextManager/ContextManager.h>
-#include <RegistrationManager/CustomerDataManagerInterface.h>
-
-#include "Integration/AuthDelegateTestContext.h"
-#include "Integration/ConnectionStatusObserver.h"
-#include "Integration/SDKTestContext.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-/**
- * Class providing lifecycle management of resources needed for testing ACL or functionality that
- * requires ACL for testing.
- */
-class ACLTestContext {
-public:
-    /**
-     * Create an ACLTestContext.
-     *
-     * @note Only one instance of this class should exist at a time - but it is okay (and expected)
-     * that multiple instances of this class will be created (and destroyed) during one execution
-     * of the application using this class.
-     *
-     * Creating an instance of this class provides:
-     * <li>Initialization of the @c Alexa @c Client @c SDK (includes @ libcurl and @c ConfigurationNode.</li>
-     * <li>A @c CustomerDataManager instance.</li>
-     * <li>An @c AuthDelegateInterface instance.</li>
-     * <li>An @c AttachmentManager instance.</li>
-     * <li>A @c ConnectionStatusObserver instance.</li>
-     * <li>A @c ContextManager instance.</li>
-     * <li>Initialization of @c PostConnect.</li>
-     *
-     * @param filePath The path to a config file.
-     * @param overlay A @c JSON string containing values to overlay on the contents of the configuration file.
-     * @return An ACLTestContext instance or nullptr if the operation failed.
-     */
-    static std::unique_ptr<ACLTestContext> create(const std::string& filePath, const std::string& overlay = "");
-
-    /**
-     * Destructor.  de-initializes all resources acquired during construction.
-     */
-    ~ACLTestContext();
-
-    /**
-     * Get the instance of @c AuthDelegateInterface to use for the test.
-     *
-     * @return The instance of @c AuthDelegateInterface to use for the test.
-     */
-    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> getAuthDelegate() const;
-
-    /**
-     * Get the instance of @c CustomerDataManager to use for the test.
-     *
-     * @return The instance of @c CustomerDataManager to use for the test.
-     */
-    std::shared_ptr<registrationManager::CustomerDataManagerInterface> getCustomerDataManager() const;
-
-    /**
-     * Get the instance of @c AttachmentManager to use for the test.
-     *
-     * @return The instance of @c AttachmentManager to use for the test.
-     */
-    std::shared_ptr<avsCommon::avs::attachment::AttachmentManager> getAttachmentManager() const;
-
-    /**
-     * Get the @c MessageRouter instance to use for the test.
-     *
-     * @return The @c MessageRouter instance to use for the test.
-     */
-    std::shared_ptr<acl::MessageRouter> getMessageRouter() const;
-
-    /**
-     * Get the @c ConnectionStatusObserver instance to use for the test.
-     *
-     * @return The @c ConnectionStatusObserver instance to use for the test.
-     */
-    std::shared_ptr<ConnectionStatusObserver> getConnectionStatusObserver() const;
-
-    /**
-     * Get the @c ContextManager instance to use for the test.
-     *
-     * @return The @c ContextManager instance to use for the test.
-     */
-    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> getContextManager() const;
-
-    /**
-     * Wait for the @c ConnectionStatusObserver to be notified that the client has successfully connected to @c AVS.
-     */
-    void waitForConnected();
-
-    /**
-     * Wait for the @c ConnectionStatusObserver to be notified that the client has successfully disconnected
-     * from @c AVS.
-     */
-    void waitForDisconnected();
-
-private:
-    /**
-     * Constructor.
-     *
-     * @param filePath The path to a config file.
-     * @param overlay A @c JSON string containing values to overlay on the contents of the configuration file.
-     */
-    ACLTestContext(const std::string& filePath, const std::string& overlay = "");
-
-    /// Provide and AuthDelegate implementation suitable for testing.
-    std::unique_ptr<AuthDelegateTestContext> m_authDelegateTestContext;
-
-    /// The Object to use to manage attachments.
-    std::shared_ptr<avsCommon::avs::attachment::AttachmentManager> m_attachmentManager;
-
-    /// Object that routs messages from @c AVS.
-    std::shared_ptr<acl::MessageRouter> m_messageRouter;
-
-    /// Object to monitor the status of the connection with @c AVS.
-    std::shared_ptr<ConnectionStatusObserver> m_connectionStatusObserver;
-
-    /// Object to acquire SDK context.
-    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
-};
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_ACLTESTCONTEXT_H_
diff --git a/Integration/include/Integration/AipStateObserver.h b/Integration/include/Integration/AipStateObserver.h
deleted file mode 100644
index 38378b7ccd..0000000000
--- a/Integration/include/Integration/AipStateObserver.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_AIPSTATEOBSERVER_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_AIPSTATEOBSERVER_H_
-
-#include <chrono>
-#include <deque>
-#include <condition_variable>
-#include <mutex>
-
-#include <AVSCommon/SDKInterfaces/AudioInputProcessorObserverInterface.h>
-
-namespace alexaClientSDK {
-namespace integration {
-
-class AipStateObserver : public avsCommon::sdkInterfaces::AudioInputProcessorObserverInterface {
-public:
-    AipStateObserver();
-    void onStateChanged(avsCommon::sdkInterfaces::AudioInputProcessorObserverInterface::State newState) override;
-    bool checkState(
-        const avsCommon::sdkInterfaces::AudioInputProcessorObserverInterface::State expectedState,
-        const std::chrono::seconds duration = std::chrono::seconds(10));
-    avsCommon::sdkInterfaces::AudioInputProcessorObserverInterface::State waitForNext(
-        const std::chrono::seconds duration);
-
-private:
-    avsCommon::sdkInterfaces::AudioInputProcessorObserverInterface::State m_state;
-    std::mutex m_mutex;
-    std::condition_variable m_wakeTrigger;
-    std::deque<avsCommon::sdkInterfaces::AudioInputProcessorObserverInterface::State> m_queue;
-};
-
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_AIPSTATEOBSERVER_H_
diff --git a/Integration/include/Integration/AuthDelegateTestContext.h b/Integration/include/Integration/AuthDelegateTestContext.h
deleted file mode 100644
index 139c053580..0000000000
--- a/Integration/include/Integration/AuthDelegateTestContext.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_AUTHDELEGATETESTCONTEXT_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_AUTHDELEGATETESTCONTEXT_H_
-
-#include <memory>
-#include <string>
-
-#include <gtest/gtest.h>
-
-#include <ACL/Transport/MessageRouter.h>
-#include <AVSCommon/AVS/Attachment/AttachmentManager.h>
-#include <AVSCommon/SDKInterfaces/AuthDelegateInterface.h>
-#ifdef ACSDK_ACS_UTILS
-#include <acsdkFFSAuthDelegate/FFSAuthRequesterInterface.h>
-#else
-#include <CBLAuthDelegate/CBLAuthRequesterInterface.h>
-#endif
-#include <ContextManager/ContextManager.h>
-#include <RegistrationManager/CustomerDataManagerInterface.h>
-
-#include "Integration/ConnectionStatusObserver.h"
-#include "Integration/SDKTestContext.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-/**
- * Class providing lifecycle management of resources needed for testing instances of AuthDelegateInterface or
- * functionality that requires such instances for testing.
- */
-class AuthDelegateTestContext {
-public:
-    /**
-     * Create an AuthDelegateTestContext
-     *
-     * @note Only one instance of this class should exist at a time - but it is okay (and expected)
-     * that multiple instances of this class will be created (and destroyed) during one execution
-     * of the application using this class.
-     *
-     * Creating an instance of this class provides:
-     * <li>A @c CustomerDataManager instance.</li>
-     * <li>An @c AuthDelegateInterface instance.</li>
-     *
-     * @param filePath The path to a config file.
-     * @param overlay A @c JSON string containing values to overlay on the contents of the configuration file.
-     */
-    static std::unique_ptr<AuthDelegateTestContext> create(
-        const std::string& filePath,
-        const std::string& overlay = "");
-
-    /**
-     * Destructor.  de-initializes all resources acquired during construction.
-     */
-    ~AuthDelegateTestContext();
-
-    /**
-     * Determine whether or not this instance was properly initialized.
-     *
-     * @return Whether or not this instance was properly initialized.
-     */
-    bool isValid() const;
-
-    /**
-     * Get the instance of @c AuthDelegateInterface to use for the test.
-     *
-     * @return The instance of @c AuthDelegateInterface to use for the test.
-     */
-    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> getAuthDelegate() const;
-
-    /**
-     * Get the instance of @c CustomerDataManager to use for the test.
-     *
-     * @return The instance of @c CustomerDataManager to use for the test.
-     */
-    std::shared_ptr<registrationManager::CustomerDataManagerInterface> getCustomerDataManager() const;
-
-private:
-#ifdef ACSDK_ACS_UTILS
-    class AuthRequester : public acsdkffsAuthDelegate::FFSAuthRequesterInterface {
-    public:
-        void onRequestFFS() override;
-    };
-#else
-    /**
-     * Implementation of @c CBLAuthRequesterInterface used to detect the case where the user
-     * still needs to authorize access to @c AVS.
-     */
-    class AuthRequester : public authorization::cblAuthDelegate::CBLAuthRequesterInterface {
-    public:
-        /// @name CBLAuthRequesterInterface methods
-        /// @{
-        void onRequestAuthorization(const std::string& url, const std::string& code) override;
-        void onCheckingForAuthorization() override;
-        /// @}
-    };
-#endif
-    /**
-     * Constructor.
-     *
-     * @param filePath The path to a config file.
-     * @param overlay A @c JSON string containing values to overlay on the contents of the configuration file.
-     */
-    AuthDelegateTestContext(const std::string& filePath, const std::string& overlay = "");
-
-    /// Provide and SDK initialization suitable for testing.
-    std::unique_ptr<SDKTestContext> m_sdkTestContext;
-
-    /// The AuthDelegate to use for authorizing with LWA and AVS.
-    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> m_authDelegate;
-
-    /// Object to manage customer specific data.
-    std::shared_ptr<registrationManager::CustomerDataManagerInterface> m_customerDataManager;
-};
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_AUTHDELEGATETESTCONTEXT_H_
diff --git a/Integration/include/Integration/AuthObserver.h b/Integration/include/Integration/AuthObserver.h
deleted file mode 100644
index a0c4ed4e4e..0000000000
--- a/Integration/include/Integration/AuthObserver.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_AUTHOBSERVER_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_AUTHOBSERVER_H_
-
-#include <chrono>
-#include <condition_variable>
-#include <mutex>
-
-#include <AVSCommon/SDKInterfaces/AuthObserverInterface.h>
-
-namespace alexaClientSDK {
-namespace integration {
-
-class AuthObserver : public avsCommon::sdkInterfaces::AuthObserverInterface {
-public:
-    AuthObserver();
-    void onAuthStateChange(
-        const avsCommon::sdkInterfaces::AuthObserverInterface::State,
-        const avsCommon::sdkInterfaces::AuthObserverInterface::Error =
-            avsCommon::sdkInterfaces::AuthObserverInterface::Error::SUCCESS) override;
-    AuthObserverInterface::State getAuthState() const;
-    bool waitFor(
-        const avsCommon::sdkInterfaces::AuthObserverInterface::State,
-        const std::chrono::seconds = std::chrono::seconds(20));
-
-private:
-    avsCommon::sdkInterfaces::AuthObserverInterface::State m_authState;
-    avsCommon::sdkInterfaces::AuthObserverInterface::Error m_authError;
-    std::mutex m_mutex;
-    std::condition_variable m_wakeTrigger;
-};
-
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_AUTHOBSERVER_H_
diff --git a/Integration/include/Integration/ClientMessageHandler.h b/Integration/include/Integration/ClientMessageHandler.h
deleted file mode 100644
index 233b7ea186..0000000000
--- a/Integration/include/Integration/ClientMessageHandler.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_CLIENTMESSAGEHANDLER_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_CLIENTMESSAGEHANDLER_H_
-
-#include <chrono>
-#include <condition_variable>
-#include <memory>
-#include <mutex>
-
-#include <AVSCommon/AVS/Attachment/AttachmentManager.h>
-
-#include <AVSCommon/SDKInterfaces/MessageObserverInterface.h>
-
-namespace alexaClientSDK {
-namespace integration {
-
-using namespace alexaClientSDK::avsCommon::sdkInterfaces;
-
-/// Minimal implementation of a message observer for integration tests.
-class ClientMessageHandler : public MessageObserverInterface {
-public:
-    /// Constructor.
-    ClientMessageHandler(std::shared_ptr<avsCommon::avs::attachment::AttachmentManager> attachmentManager);
-
-    /**
-     * Implementation of the interface's receive function.
-     *
-     * For the purposes of these integration tests, this function simply logs and counts messages.
-     */
-    void receive(const std::string& contextId, const std::string& message) override;
-
-    /**
-     * Wait for a message to be received.
-     *
-     * This function waits for a specified number of seconds for a message to arrive.
-     * @param duration Number of seconds to wait before giving up.
-     * @return true if a message was received within the specified duration, else false.
-     */
-    bool waitForNext(const std::chrono::seconds duration = std::chrono::seconds(2));
-
-private:
-    /// Mutex to protect m_count.
-    std::mutex m_mutex;
-    /// Trigger to wake up waitForNext calls.
-    std::condition_variable m_wakeTrigger;
-    /// Count of received messages that have not been waited on.
-    unsigned int m_count;
-
-    std::shared_ptr<avsCommon::avs::attachment::AttachmentManager> m_attachmentManager;
-};
-
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_CLIENTMESSAGEHANDLER_H_
diff --git a/Integration/include/Integration/ConnectionStatusObserver.h b/Integration/include/Integration/ConnectionStatusObserver.h
deleted file mode 100644
index db81005f0f..0000000000
--- a/Integration/include/Integration/ConnectionStatusObserver.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_CONNECTIONSTATUSOBSERVER_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_CONNECTIONSTATUSOBSERVER_H_
-
-#include <chrono>
-#include <condition_variable>
-#include <deque>
-#include <mutex>
-#include <AVSCommon/SDKInterfaces/ConnectionStatusObserverInterface.h>
-
-namespace alexaClientSDK {
-namespace integration {
-
-/**
- * The class implements ConnectionStatusObserverInterface for testing.
- */
-class ConnectionStatusObserver : public avsCommon::sdkInterfaces::ConnectionStatusObserverInterface {
-public:
-    /**
-     * ConnectionStatusObserver constructor.
-     */
-    ConnectionStatusObserver();
-
-    void onConnectionStatusChanged(
-        const avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::Status connectionStatus,
-        const avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::ChangedReason reason) override;
-    /**
-     * The utility function to get the connection status.
-     * @return Status The @c connectionStatus for the connection.
-     */
-    avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::Status getConnectionStatus() const;
-
-    /**
-     * Function to allow waiting for an expected status when a connection or disconnection is done.
-     * @param connectionStatus The expected connection status for which the waiting is done.
-     * @param duration The maximum time waiting for the expected connectionStatus.
-     * @return true if expected connectionStatus is received within @c duration else false.
-     */
-    bool waitFor(
-        const avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::Status connectionStatus,
-        const std::chrono::seconds duration = std::chrono::seconds(15));
-
-    /**
-     * Function to check if the connection is broken due to Server side Disconnect.
-     * @return true if the disconnect happens due to SERVER_SIDE_DISCONNECT else false.
-     */
-    bool checkForServerSideDisconnect();
-
-private:
-    /// Mutex used internally to enforce thread safety and serialize read/write access to @c m_statusChanges.
-    mutable std::mutex m_mutex;
-    /// The cv used when waiting for a particular status of a connection
-    std::condition_variable m_wakeTrigger;
-    /// The queue of values of the pair (Connection status, ChangedReason) throughout the connection.
-    std::deque<std::pair<ConnectionStatusObserverInterface::Status, ConnectionStatusObserverInterface::ChangedReason>>
-        m_statusChanges;
-};
-
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_CONNECTIONSTATUSOBSERVER_H_
diff --git a/Integration/include/Integration/JsonHeader.h b/Integration/include/Integration/JsonHeader.h
deleted file mode 100644
index ae736d0cb5..0000000000
--- a/Integration/include/Integration/JsonHeader.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_JSONHEADER_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_JSONHEADER_H_
-
-#include <string>
-
-// Todo ACSDK-443: Move the JSON to text file
-/// This is a basic synchronize JSON message which may be used to initiate a connection with AVS.
-// clang-format off
-static const std::string SYNCHRONIZE_STATE_JSON =
-    "{"
-        "\"context\":[{"
-            "\"header\":{"
-                "\"name\":\"SpeechState\","
-                "\"namespace\":\"SpeechSynthesizer\""
-            "},"
-            "\"payload\":{"
-                "\"playerActivity\":\"FINISHED\","
-                "\"offsetInMilliseconds\":0,"
-                "\"token\":\"\""
-            "}"
-        "}],"
-        "\"event\":{"
-            "\"header\":{"
-                "\"messageId\":\"00000000-0000-0000-0000-000000000000\","
-                "\"name\":\"SynchronizeState\","
-                "\"namespace\":\"System\""
-            "},"
-            "\"payload\":{"
-            "}"
-        "}"
-    "}";
-// clang-format on
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_JSONHEADER_H_
diff --git a/Integration/include/Integration/ObservableMessageRequest.h b/Integration/include/Integration/ObservableMessageRequest.h
deleted file mode 100644
index 8f72cda42b..0000000000
--- a/Integration/include/Integration/ObservableMessageRequest.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_OBSERVABLEMESSAGEREQUEST_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_OBSERVABLEMESSAGEREQUEST_H_
-
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <mutex>
-
-#include <AVSCommon/AVS/MessageRequest.h>
-
-namespace alexaClientSDK {
-namespace integration {
-
-class ObservableMessageRequest : public avsCommon::avs::MessageRequest {
-public:
-    /**
-     * Constructor.
-     */
-    ObservableMessageRequest(
-        const std::string& jsonContent,
-        std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> attachmentReader = nullptr);
-
-    void sendCompleted(avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status status) override;
-
-    void exceptionReceived(const std::string& exceptionMessage) override;
-
-    /**
-     * Utility function to get the status once the message has been sent.
-     */
-    avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status getSendMessageStatus() const;
-
-    /**
-     * Function to allow waiting for a particular status back from the component sending the message to AVS.
-     */
-    bool waitFor(
-        const avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status,
-        const std::chrono::seconds = std::chrono::seconds(10));
-    /// Function indicating if sendCompleted has been called
-    bool hasSendCompleted();
-    /// Function indicating if exceptionReceived has been called
-    bool wasExceptionReceived();
-
-private:
-    /// The status of whether the message was sent to AVS ok.
-    avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status m_sendMessageStatus;
-    /// Mutex used internally to enforce thread safety.
-    mutable std::mutex m_mutex;
-    /// The cv used when waiting for a particular status of a message being sent.
-    std::condition_variable m_wakeTrigger;
-    /// The variable that gets set when send is completed.
-    std::atomic<bool> m_sendCompleted;
-    /// The variable that gets set when exception is received.
-    std::atomic<bool> m_exceptionReceived;
-};
-
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_OBSERVABLEMESSAGEREQUEST_H_
diff --git a/Integration/include/Integration/SDKTestContext.h b/Integration/include/Integration/SDKTestContext.h
deleted file mode 100644
index 013e92bf82..0000000000
--- a/Integration/include/Integration/SDKTestContext.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_SDKTESTCONTEXT_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_SDKTESTCONTEXT_H_
-
-#include <memory>
-#include <string>
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-/**
- * Class providing lifecycle management of resources needed for testing the @c Alexa @c Client @c SDK.
- */
-class SDKTestContext {
-public:
-    /**
-     * Create an SDKTestContext
-     *
-     * @note Only one instance of this class should exist at a time - but it is okay (and expected)
-     * that multiple instances of this class will be created (and destroyed) during one execution
-     * of the application using this class.
-     *
-     * Creating an instance of this class provides initialization of the @c Alexa @c Client @c SDK
-     * (which includes initialization of @ libcurl and @c ConfigurationNode.
-     *
-     * @param filePath The path to a config file.
-     * @param overlay A @c JSON string containing values to overlay on the contents of the configuration file.
-     * @return An SDKTestContext instance or nullptr if the operation failed.
-     */
-    static std::unique_ptr<SDKTestContext> create(const std::string& filePath, const std::string& overlay = "");
-
-    /**
-     * Destructor de-initializes the @c Alexa @c Client @c SDK.
-     */
-    ~SDKTestContext();
-
-private:
-    /**
-     * Constructor.
-     *
-     * @param filePath The path to a config file.
-     * @param overlay A @c JSON string containing values to overlay on the contents of the configuration file.
-     */
-    SDKTestContext(const std::string& filePath, const std::string& overlay);
-};
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_SDKTESTCONTEXT_H_
diff --git a/Integration/include/Integration/TestAlertObserver.h b/Integration/include/Integration/TestAlertObserver.h
deleted file mode 100644
index b0f9c39d7a..0000000000
--- a/Integration/include/Integration/TestAlertObserver.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTALERTOBSERVER_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTALERTOBSERVER_H_
-
-#include <chrono>
-#include <condition_variable>
-#include <mutex>
-#include <string>
-#include <deque>
-
-#include <acsdkAlertsInterfaces/AlertObserverInterface.h>
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-class TestAlertObserver : public acsdkAlertsInterfaces::AlertObserverInterface {
-public:
-    void onAlertStateChange(const AlertObserverInterface::AlertInfo& alertInfo) override;
-
-    class changedAlert {
-    public:
-        State state;
-    };
-
-    changedAlert waitForNext(const std::chrono::seconds duration);
-
-private:
-    std::mutex m_mutex;
-    std::condition_variable m_wakeTrigger;
-    std::deque<changedAlert> m_queue;
-    State currentState;
-};
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTALERTOBSERVER_H_
diff --git a/Integration/include/Integration/TestDirectiveHandler.h b/Integration/include/Integration/TestDirectiveHandler.h
deleted file mode 100644
index 604bca98bc..0000000000
--- a/Integration/include/Integration/TestDirectiveHandler.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTDIRECTIVEHANDLER_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTDIRECTIVEHANDLER_H_
-
-#include <condition_variable>
-#include <string>
-#include <future>
-#include <fstream>
-#include <chrono>
-#include <deque>
-#include <mutex>
-#include <unordered_map>
-
-#include "AVSCommon/SDKInterfaces/DirectiveHandlerInterface.h"
-#include "AVSCommon/AVS/Attachment/AttachmentManager.h"
-#include "AVSCommon/Utils/JSON/JSONUtils.h"
-
-using namespace alexaClientSDK::avsCommon;
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-/**
- * TestDirectiveHandler is a mock of the @c DirectiveHandlerInterface and allows tests
- * to wait for invocations upon those interfaces and inspect the parameters of those invocations.
- */
-class TestDirectiveHandler : public avsCommon::sdkInterfaces::DirectiveHandlerInterface {
-public:
-    /**
-     * Constructor.
-     *
-     * @param config The @c avsCommon::avs::DirectiveHandlerConfiguration for the directive handler for registering
-     * with a directive sequencer.
-     */
-    TestDirectiveHandler(avsCommon::avs::DirectiveHandlerConfiguration config);
-
-    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
-
-    void preHandleDirective(
-        std::shared_ptr<avsCommon::avs::AVSDirective> directive,
-        std::unique_ptr<avsCommon::sdkInterfaces::DirectiveHandlerResultInterface> result) override;
-
-    bool handleDirective(const std::string& messageId) override;
-
-    void cancelDirective(const std::string& messageId) override;
-
-    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
-
-    void onDeregistered() override;
-
-    /**
-     * Class defining the parameters to calls to the mocked interfaces.
-     */
-    class DirectiveParams {
-    public:
-        /**
-         * Constructor.
-         */
-        DirectiveParams();
-
-        /**
-         * Return whether this DirectiveParams is of type 'UNSET'.
-         *
-         * @return Whether this DirectiveParams is of type 'UNSET'.
-         */
-        bool isUnset() const {
-            return Type::UNSET == type;
-        }
-
-        /**
-         * Return whether this DirectiveParams is of type 'HANDLE_IMMEDIATELY'.
-         *
-         * @return Whether this DirectiveParams is of type 'HANDLE_IMMEDIATELY'.
-         */
-        bool isHandleImmediately() const {
-            return Type::HANDLE_IMMEDIATELY == type;
-        }
-
-        /**
-         * Return whether this DirectiveParams is of type 'PREHANDLE'.
-         *
-         * @return Whether this DirectiveParams is of type 'PREHANDLE'.
-         */
-        bool isPreHandle() const {
-            return Type::PREHANDLE == type;
-        }
-
-        /**
-         * Return whether this DirectiveParams is of type 'HANDLE'.
-         *
-         * @return Whether this DirectiveParams is of type 'HANDLE'.
-         */
-        bool isHandle() const {
-            return Type::HANDLE == type;
-        }
-
-        /**
-         * Return whether this DirectiveParams is of type 'CANCEL'.
-         *
-         * @return Whether this DirectiveParams is of type 'CANCEL'.
-         */
-        bool isCancel() const {
-            return Type::CANCEL == type;
-        }
-
-        /**
-         * Return whether this DirectiveParams is of type 'TIMEOUT'.
-         *
-         * @return Whether this DirectiveParams is of type 'TIMEOUT'.
-         */
-        bool isTimeout() const {
-            return Type::TIMEOUT == type;
-        }
-
-        // Enum for the way the directive was passed to DirectiveHandler.
-        enum class Type {
-            // Not yet set.
-            UNSET,
-            // Set when handleDirectiveImmediately is called.
-            HANDLE_IMMEDIATELY,
-            // Set when preHandleDirective is called.
-            PREHANDLE,
-            // Set when handleDirective is called.
-            HANDLE,
-            // Set when cancelDirective is called.
-            CANCEL,
-            // Set when waitForNext times out waiting for a directive.
-            TIMEOUT
-        };
-
-        // Type of how the directive was passed to DirectiveHandler.
-        Type type;
-        // AVSDirective passed from the Directive Sequencer to the DirectiveHandler.
-        std::shared_ptr<avsCommon::avs::AVSDirective> directive;
-        // DirectiveHandlerResult to inform the Directive Sequencer a directive has either successfully or
-        // unsuccessfully handled.
-        std::shared_ptr<avsCommon::sdkInterfaces::DirectiveHandlerResultInterface> result;
-    };
-
-    /**
-     * Function to retrieve the next DirectiveParams in the test queue or time out if the queue is empty. Takes a
-     * duration in seconds to wait before timing out.
-     */
-    DirectiveParams waitForNext(const std::chrono::seconds duration);
-
-private:
-    /// Mutex to protect m_queue.
-    std::mutex m_mutex;
-    /// Trigger to wake up waitForNext calls.
-    std::condition_variable m_wakeTrigger;
-    /// Queue of received directives that have not been waited on.
-    std::deque<DirectiveParams> m_queue;
-    /// map of message IDs to result handlers.
-    std::unordered_map<std::string, std::shared_ptr<avsCommon::sdkInterfaces::DirectiveHandlerResultInterface>>
-        m_results;
-    /// map of message IDs to result handlers.
-    std::unordered_map<std::string, std::shared_ptr<avsCommon::avs::AVSDirective>> m_directives;
-    /// The @c avsCommon::avs::DirectiveHandlerConfiguration of the handler.
-    avsCommon::avs::DirectiveHandlerConfiguration m_configuration;
-};
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTDIRECTIVEHANDLER_H_
diff --git a/Integration/include/Integration/TestExceptionEncounteredSender.h b/Integration/include/Integration/TestExceptionEncounteredSender.h
deleted file mode 100644
index 0df39f10a3..0000000000
--- a/Integration/include/Integration/TestExceptionEncounteredSender.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTEXCEPTIONENCOUNTEREDSENDER_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTEXCEPTIONENCOUNTEREDSENDER_H_
-
-#include <condition_variable>
-#include <string>
-#include <future>
-#include <fstream>
-#include <chrono>
-#include <deque>
-#include <mutex>
-#include <unordered_map>
-
-#include "AVSCommon/SDKInterfaces/DirectiveHandlerInterface.h"
-#include "AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h"
-#include "AVSCommon/AVS/Attachment/AttachmentManager.h"
-#include "AVSCommon/Utils/JSON/JSONUtils.h"
-
-using namespace alexaClientSDK::avsCommon;
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-/**
- * TestExceptionEncounteredSender is a mock of the @c ExceptionEncounteredSenderInterface and allows tests
- * to wait for invocations upon those interfaces and inspect the parameters of those invocations.
- */
-class TestExceptionEncounteredSender : public avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface {
-public:
-    void sendExceptionEncountered(
-        const std::string& unparsedDirective,
-        avsCommon::avs::ExceptionErrorType error,
-        const std::string& message) override;
-    /**
-     * Parse an @c AVSDirective from a JSON string.
-     *
-     * @param rawJSON The JSON to parse.
-     * @param attachmentManager The @c AttachmentManager to initialize the new @c AVSDirective with.
-     * @return A new @c AVSDirective, or nullptr if parsing the JSON fails.
-     */
-    std::shared_ptr<avs::AVSDirective> parseDirective(
-        const std::string& rawJSON,
-        std::shared_ptr<avsCommon::avs::attachment::AttachmentManager> attachmentManager);
-
-    /**
-     * Class defining the parameters to calls to the mocked interfaces.
-     */
-    class ExceptionParams {
-    public:
-        /**
-         * Constructor.
-         */
-        ExceptionParams();
-
-        // Enum for the way the directive was passed.
-        enum class Type {
-            // Not yet set.
-            UNSET,
-            // Set when sendExceptionEncountered is called.
-            EXCEPTION,
-            // Set when waitForNext times out waiting for a directive.
-            TIMEOUT
-        };
-
-        // Type of how the directive was passed.
-        Type type;
-        // AVSDirective passed from the Directive Sequencer.
-        std::shared_ptr<avsCommon::avs::AVSDirective> directive;
-        // Unparsed directive string passed to sendExceptionEncountered.
-        std::string exceptionUnparsedDirective;
-        // Error type passed to sendExceptionEncountered.
-        avsCommon::avs::ExceptionErrorType exceptionError;
-        // Additional information passed to sendExceptionEncountered.
-        std::string exceptionMessage;
-    };
-
-    /**
-     * Function to retrieve the next DirectiveParams in the test queue or time out if the queue is empty. Takes a
-     * duration in seconds to wait before timing out.
-     */
-    ExceptionParams waitForNext(const std::chrono::seconds duration);
-
-private:
-    /// Mutex to protect m_queue.
-    std::mutex m_mutex;
-    /// Trigger to wake up waitForNext calls.
-    std::condition_variable m_wakeTrigger;
-    /// Queue of received directives that have not been waited on.
-    std::deque<ExceptionParams> m_queue;
-};
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTEXCEPTIONENCOUNTEREDSENDER_H_
diff --git a/Integration/include/Integration/TestMediaPlayer.h b/Integration/include/Integration/TestMediaPlayer.h
deleted file mode 100644
index e445af4ff4..0000000000
--- a/Integration/include/Integration/TestMediaPlayer.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTMEDIAPLAYER_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTMEDIAPLAYER_H_
-
-#include <chrono>
-#include <condition_variable>
-#include <deque>
-#include <mutex>
-#include <thread>
-#include <iostream>
-#include <string>
-#include <future>
-#include <unordered_set>
-
-#include <AVSCommon/Utils/MediaPlayer/MediaPlayerInterface.h>
-#include <AVSCommon/Utils/MediaPlayer/MediaPlayerObserverInterface.h>
-#include "AVSCommon/Utils/MediaType.h"
-#include "AVSCommon/Utils/Timing/Timer.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-/**
- * A Mock MediaPlayer that attempts to alert the observer of playing and stopping without
- * actually playing audio. This removes the dependancy on an audio player to run tests with
- * SpeechSynthesizer
- */
-class TestMediaPlayer : public avsCommon::utils::mediaPlayer::MediaPlayerInterface {
-public:
-    // Destructor.
-    ~TestMediaPlayer();
-
-    avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId setSource(
-        std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> attachmentReader,
-        const avsCommon::utils::AudioFormat* audioFormat = nullptr,
-        const avsCommon::utils::mediaPlayer::SourceConfig& config =
-            avsCommon::utils::mediaPlayer::emptySourceConfig()) override;
-
-    avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId setSource(
-        std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> attachmentReader,
-        std::chrono::milliseconds offsetAdjustment,
-        const avsCommon::utils::AudioFormat* audioFormat = nullptr,
-        const avsCommon::utils::mediaPlayer::SourceConfig& config =
-            avsCommon::utils::mediaPlayer::emptySourceConfig()) override;
-
-    avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId setSource(
-        std::shared_ptr<std::istream> stream,
-        bool repeat,
-        const avsCommon::utils::mediaPlayer::SourceConfig& config = avsCommon::utils::mediaPlayer::emptySourceConfig(),
-        avsCommon::utils::MediaType format = avsCommon::utils::MediaType::UNKNOWN) override;
-
-    avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId setSource(
-        const std::string& url,
-        std::chrono::milliseconds offset = std::chrono::milliseconds::zero(),
-        const avsCommon::utils::mediaPlayer::SourceConfig& config = avsCommon::utils::mediaPlayer::emptySourceConfig(),
-        bool repeat = false,
-        const avsCommon::utils::mediaPlayer::PlaybackContext& playbackContext =
-            avsCommon::utils::mediaPlayer::PlaybackContext()) override;
-
-    bool play(avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId id) override;
-
-    bool stop(avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId id) override;
-
-    bool pause(avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId id) override;
-
-    bool resume(avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId id) override;
-
-    std::chrono::milliseconds getOffset(avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId id) override;
-
-    void addObserver(
-        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerObserverInterface> playerObserver) override;
-
-    void removeObserver(
-        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerObserverInterface> playerObserver) override;
-
-    avsCommon::utils::Optional<avsCommon::utils::mediaPlayer::MediaPlayerState> getMediaPlayerState(
-        avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId id) override;
-
-    uint64_t getNumBytesBuffered() override;
-
-private:
-    /// Observers to notify of state changes.
-    std::unordered_set<std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerObserverInterface>> m_observers;
-    /// Flag to indicate when a playback finished notification has been sent to the observer.
-    bool m_playbackFinished = false;
-    /// The AttachmentReader to read audioData from.
-    std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> m_attachmentReader;
-    /// Timer to wait to send onPlaybackFinished to the observer.
-    std::shared_ptr<avsCommon::utils::timing::Timer> m_timer;
-    // istream for Alerts.
-    std::shared_ptr<std::istream> m_istream;
-};
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTMEDIAPLAYER_H_
diff --git a/Integration/include/Integration/TestMessageSender.h b/Integration/include/Integration/TestMessageSender.h
deleted file mode 100644
index 66bcc24460..0000000000
--- a/Integration/include/Integration/TestMessageSender.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTMESSAGESENDER_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTMESSAGESENDER_H_
-
-#include <string>
-#include <chrono>
-#include <deque>
-#include <mutex>
-
-#include <ACL/AVSConnectionManager.h>
-#include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
-#include <AVSCommon/SDKInterfaces/MessageObserverInterface.h>
-#include <AVSCommon/Utils/RequiresShutdown.h>
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-class TestMessageSender
-        : public avsCommon::sdkInterfaces::MessageSenderInterface
-        , public avsCommon::utils::RequiresShutdown {
-public:
-    /// Destructor.
-    ~TestMessageSender() = default;
-
-    void sendMessage(std::shared_ptr<avsCommon::avs::MessageRequest> request) override;
-
-    TestMessageSender(
-        std::shared_ptr<acl::MessageRouterInterface> messageRouter,
-        bool isEnabled,
-        std::shared_ptr<avsCommon::sdkInterfaces::ConnectionStatusObserverInterface> connectionStatusObserver,
-        std::shared_ptr<avsCommon::sdkInterfaces::MessageObserverInterface> messageObserver);
-
-    class SendParams {
-    public:
-        enum class Type { SEND, TIMEOUT };
-        Type type;
-        std::shared_ptr<avsCommon::avs::MessageRequest> request;
-    };
-
-    SendParams waitForNext(const std::chrono::seconds duration);
-
-    /**
-     * Enable the AVSConnectionManager object to make connections to AVS.  Once enabled, the object will attempt to
-     * create a connection to AVS.  If the object is already connected, this function will do nothing.
-     */
-    void enable();
-
-    /**
-     * Disable the AVSConnectionManager object.  If the object is currently connected to AVS, then calling this
-     * function will cause the connection to be closed.  If the object is not connected, then calling this function
-     * will do nothing.
-     */
-    void disable();
-
-    /**
-     * Returns if the object is enabled for making connections to AVS.
-     *
-     * @return Whether this Connection object is enabled to make connections.
-     */
-    bool isEnabled();
-
-    /**
-     * This function causes the object, if enabled, to create new connection to AVS.  If the object is already
-     * connected, then that connection will be closed and a new one created.  If the object is not connected, but
-     * perhaps in the process of waiting for its next connection attempt, then its waiting policy will be reset and
-     * it will attempt to create a new connection immediately.
-     * If the object is disabled, then this function will do nothing.
-     */
-    void reconnect();
-
-    /**
-     * Set the gateway URL for the AVS connection.  Calling this function with a new value will cause the
-     * current active connection to be closed, and a new one opened to the new gateway.
-     * @param avsGateway The URL for the new AVS gateway.
-     */
-    void setAVSGateway(const std::string& avsGateway);
-
-    void addConnectionStatusObserver(
-        std::shared_ptr<avsCommon::sdkInterfaces::ConnectionStatusObserverInterface> observer);
-
-    /**
-     * Removes an observer from being notified of connection status changes.
-     *
-     * @param observer The observer object to remove.
-     */
-    void removeConnectionStatusObserver(
-        std::shared_ptr<avsCommon::sdkInterfaces::ConnectionStatusObserverInterface> observer);
-
-    /**
-     * Adds an observer to be notified of message receptions.
-     *
-     * @param observer The observer object to add.
-     */
-    void addMessageObserver(std::shared_ptr<avsCommon::sdkInterfaces::MessageObserverInterface> observer);
-
-    /**
-     * Removes an observer from being notified of message receptions.
-     *
-     * @param observer The observer object to remove.
-     */
-    void removeMessageObserver(std::shared_ptr<avsCommon::sdkInterfaces::MessageObserverInterface> observer);
-
-    void doShutdown() override;
-
-    std::shared_ptr<acl::AVSConnectionManager> getConnectionManager() const;
-
-private:
-    /// Mutex to protect m_queue.
-    std::mutex m_mutex;
-    /// Trigger to wake up waitForNext calls.
-    std::condition_variable m_wakeTrigger;
-    /// Queue of received directives that have not been waited on.
-    std::deque<SendParams> m_queue;
-
-    std::shared_ptr<acl::AVSConnectionManager> m_connectionManager;
-};
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTMESSAGESENDER_H_
diff --git a/Integration/include/Integration/TestSpeechSynthesizerObserver.h b/Integration/include/Integration/TestSpeechSynthesizerObserver.h
deleted file mode 100644
index 56cb3a5dbc..0000000000
--- a/Integration/include/Integration/TestSpeechSynthesizerObserver.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTSPEECHSYNTHESIZEROBSERVER_H_
-#define ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTSPEECHSYNTHESIZEROBSERVER_H_
-
-#include <chrono>
-#include <condition_variable>
-#include <deque>
-#include <mutex>
-
-#include <AVSCommon/SDKInterfaces/SpeechSynthesizerObserverInterface.h>
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-/**
- * Interface for observing a SpeechSynthesizer.
- */
-class TestSpeechSynthesizerObserver : public avsCommon::sdkInterfaces::SpeechSynthesizerObserverInterface {
-public:
-    TestSpeechSynthesizerObserver();
-
-    ~TestSpeechSynthesizerObserver() = default;
-
-    void onStateChanged(
-        avsCommon::sdkInterfaces::SpeechSynthesizerObserverInterface::SpeechSynthesizerState state,
-        const avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId mediaSourceId,
-        const avsCommon::utils::Optional<avsCommon::utils::mediaPlayer::MediaPlayerState>& mediaPlayerState,
-        const std::vector<avsCommon::utils::audioAnalyzer::AudioAnalyzerState>& audioAnalyzerState) override;
-
-    bool checkState(
-        const avsCommon::sdkInterfaces::SpeechSynthesizerObserverInterface::SpeechSynthesizerState expectedState,
-        const std::chrono::seconds duration);
-
-    avsCommon::sdkInterfaces::SpeechSynthesizerObserverInterface::SpeechSynthesizerState waitForNext(
-        const std::chrono::seconds duration);
-
-    avsCommon::sdkInterfaces::SpeechSynthesizerObserverInterface::SpeechSynthesizerState getCurrentState();
-
-private:
-    avsCommon::sdkInterfaces::SpeechSynthesizerObserverInterface::SpeechSynthesizerState m_state;
-    std::mutex m_mutex;
-    std::condition_variable m_wakeTrigger;
-    std::deque<avsCommon::sdkInterfaces::SpeechSynthesizerObserverInterface::SpeechSynthesizerState> m_queue;
-};
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_INTEGRATION_INCLUDE_INTEGRATION_TESTSPEECHSYNTHESIZEROBSERVER_H_
diff --git a/Integration/inputs/alexa_recognize_joke_test.wav b/Integration/inputs/alexa_recognize_joke_test.wav
deleted file mode 100755
index 5d67f82b8c..0000000000
Binary files a/Integration/inputs/alexa_recognize_joke_test.wav and /dev/null differ
diff --git a/Integration/inputs/alexa_recognize_silence_test.wav b/Integration/inputs/alexa_recognize_silence_test.wav
deleted file mode 100755
index 06f49fe699..0000000000
Binary files a/Integration/inputs/alexa_recognize_silence_test.wav and /dev/null differ
diff --git a/Integration/inputs/alexa_recognize_wiki_test.wav b/Integration/inputs/alexa_recognize_wiki_test.wav
deleted file mode 100755
index 6b976e4afc..0000000000
Binary files a/Integration/inputs/alexa_recognize_wiki_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_cancel_timer_test.wav b/Integration/inputs/recognize_cancel_timer_test.wav
deleted file mode 100755
index 372fe6c52d..0000000000
Binary files a/Integration/inputs/recognize_cancel_timer_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_flashbriefing_test.wav b/Integration/inputs/recognize_flashbriefing_test.wav
deleted file mode 100755
index 2719b0e9b2..0000000000
Binary files a/Integration/inputs/recognize_flashbriefing_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_joke_test.wav b/Integration/inputs/recognize_joke_test.wav
deleted file mode 100755
index 0a046867be..0000000000
Binary files a/Integration/inputs/recognize_joke_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_lions_test.wav b/Integration/inputs/recognize_lions_test.wav
deleted file mode 100755
index 1c42a3b45d..0000000000
Binary files a/Integration/inputs/recognize_lions_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_long_timer_test.wav b/Integration/inputs/recognize_long_timer_test.wav
deleted file mode 100755
index 00e03f297c..0000000000
Binary files a/Integration/inputs/recognize_long_timer_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_silence_test.wav b/Integration/inputs/recognize_silence_test.wav
deleted file mode 100755
index 94498fb4ca..0000000000
Binary files a/Integration/inputs/recognize_silence_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_sing_song_test.wav b/Integration/inputs/recognize_sing_song_test.wav
deleted file mode 100755
index 39505d8a0d..0000000000
Binary files a/Integration/inputs/recognize_sing_song_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_stop_test.wav b/Integration/inputs/recognize_stop_test.wav
deleted file mode 100755
index b9802c952c..0000000000
Binary files a/Integration/inputs/recognize_stop_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_stop_timer_test.wav b/Integration/inputs/recognize_stop_timer_test.wav
deleted file mode 100755
index f278b2f219..0000000000
Binary files a/Integration/inputs/recognize_stop_timer_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_test.wav b/Integration/inputs/recognize_test.wav
deleted file mode 100755
index 9f0462f5ed..0000000000
Binary files a/Integration/inputs/recognize_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_timer_test.wav b/Integration/inputs/recognize_timer_test.wav
deleted file mode 100755
index b7116821cd..0000000000
Binary files a/Integration/inputs/recognize_timer_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_very_long_timer_test.wav b/Integration/inputs/recognize_very_long_timer_test.wav
deleted file mode 100755
index 0deaf82aa4..0000000000
Binary files a/Integration/inputs/recognize_very_long_timer_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_volume_up_test.wav b/Integration/inputs/recognize_volume_up_test.wav
deleted file mode 100755
index 2075dcbab3..0000000000
Binary files a/Integration/inputs/recognize_volume_up_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_weather_test.wav b/Integration/inputs/recognize_weather_test.wav
deleted file mode 100755
index 80adfced19..0000000000
Binary files a/Integration/inputs/recognize_weather_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_whats_up_test.wav b/Integration/inputs/recognize_whats_up_test.wav
deleted file mode 100755
index 42aa2d4cb5..0000000000
Binary files a/Integration/inputs/recognize_whats_up_test.wav and /dev/null differ
diff --git a/Integration/inputs/recognize_wiki_test.wav b/Integration/inputs/recognize_wiki_test.wav
deleted file mode 100755
index f1edb68c9c..0000000000
Binary files a/Integration/inputs/recognize_wiki_test.wav and /dev/null differ
diff --git a/Integration/inputs/silence_test.wav b/Integration/inputs/silence_test.wav
deleted file mode 100755
index 464dfe623e..0000000000
Binary files a/Integration/inputs/silence_test.wav and /dev/null differ
diff --git a/Integration/inputs/utterance_time_success.opus b/Integration/inputs/utterance_time_success.opus
deleted file mode 100755
index 9c1198ba20..0000000000
Binary files a/Integration/inputs/utterance_time_success.opus and /dev/null differ
diff --git a/Integration/src/ACLTestContext.cpp b/Integration/src/ACLTestContext.cpp
deleted file mode 100644
index 0824d6b7ac..0000000000
--- a/Integration/src/ACLTestContext.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <vector>
-
-#include <gtest/gtest.h>
-
-#include <ACL/Transport/HTTP2TransportFactory.h>
-#include <ACL/Transport/PostConnectSequencerFactory.h>
-#include <AVSCommon/Utils/DeviceInfo.h>
-#include <AVSCommon/Utils/LibcurlUtils/LibcurlHTTP2ConnectionFactory.h>
-
-#include <CBLAuthDelegate/CBLAuthDelegate.h>
-#include <SynchronizeStateSender/SynchronizeStateSenderFactory.h>
-
-#include "Integration/ACLTestContext.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace acl;
-using namespace avsCommon::avs::attachment;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils::configuration;
-using namespace avsCommon::utils::libcurlUtils;
-using namespace authorization::cblAuthDelegate;
-using namespace contextManager;
-using namespace registrationManager;
-
-std::unique_ptr<ACLTestContext> ACLTestContext::create(const std::string& filePath, const std::string& overlay) {
-    std::unique_ptr<ACLTestContext> context(new ACLTestContext(filePath, overlay));
-    if (context->m_authDelegateTestContext && context->m_attachmentManager && context->m_messageRouter &&
-        context->m_connectionStatusObserver && context->m_contextManager) {
-        return context;
-    }
-    return nullptr;
-}
-
-ACLTestContext::~ACLTestContext() {
-    m_attachmentManager.reset();
-
-    if (m_messageRouter) {
-        m_messageRouter->shutdown();
-    }
-
-    m_connectionStatusObserver.reset();
-    m_contextManager.reset();
-    m_authDelegateTestContext.reset();
-}
-
-std::shared_ptr<AuthDelegateInterface> ACLTestContext::getAuthDelegate() const {
-    return m_authDelegateTestContext->getAuthDelegate();
-}
-
-std::shared_ptr<CustomerDataManagerInterface> ACLTestContext::getCustomerDataManager() const {
-    return m_authDelegateTestContext->getCustomerDataManager();
-}
-
-std::shared_ptr<AttachmentManager> ACLTestContext::getAttachmentManager() const {
-    return m_attachmentManager;
-}
-
-std::shared_ptr<MessageRouter> ACLTestContext::getMessageRouter() const {
-    return m_messageRouter;
-}
-
-std::shared_ptr<ConnectionStatusObserver> ACLTestContext::getConnectionStatusObserver() const {
-    return m_connectionStatusObserver;
-}
-
-std::shared_ptr<ContextManagerInterface> ACLTestContext::getContextManager() const {
-    return m_contextManager;
-}
-
-void ACLTestContext::waitForConnected() {
-    ASSERT_TRUE(m_connectionStatusObserver->waitFor(ConnectionStatusObserverInterface::Status::CONNECTED))
-        << "Connecting timed out";
-}
-
-void ACLTestContext::waitForDisconnected() {
-    ASSERT_TRUE(m_connectionStatusObserver->waitFor(ConnectionStatusObserverInterface::Status::DISCONNECTED))
-        << "Disconnecting timed out";
-}
-
-/// Default @c AVS gateway to connect to.
-static const std::string DEFAULT_AVS_GATEWAY = "https://alexa.na.gateway.devices.a2z.com";
-
-ACLTestContext::ACLTestContext(const std::string& filePath, const std::string& overlay) {
-    m_authDelegateTestContext = AuthDelegateTestContext::create(filePath, overlay);
-    EXPECT_TRUE(m_authDelegateTestContext);
-    if (!m_authDelegateTestContext) {
-        return;
-    }
-
-    auto config = ConfigurationNode::getRoot();
-    EXPECT_TRUE(config);
-    if (!config) {
-        return;
-    }
-
-    auto deviceInfo =
-        avsCommon::utils::DeviceInfo::createFromConfiguration(std::make_shared<ConfigurationNode>(config));
-    EXPECT_TRUE(deviceInfo);
-    if (!deviceInfo) {
-        return;
-    }
-
-    m_contextManager = ContextManager::createContextManagerInterface(std::move(deviceInfo));
-    EXPECT_TRUE(m_contextManager);
-    if (!m_contextManager) {
-        return;
-    }
-
-    auto synchronizeStateSenderFactory =
-        synchronizeStateSender::SynchronizeStateSenderFactory::create(m_contextManager);
-    std::vector<std::shared_ptr<PostConnectOperationProviderInterface>> providers;
-    providers.push_back(synchronizeStateSenderFactory);
-    auto postConnectFactory = acl::PostConnectSequencerFactory::create(providers);
-    auto http2ConnectionFactory = std::make_shared<LibcurlHTTP2ConnectionFactory>();
-    auto transportFactory = std::make_shared<acl::HTTP2TransportFactory>(http2ConnectionFactory, postConnectFactory);
-    m_attachmentManager = std::make_shared<AttachmentManager>(AttachmentManager::AttachmentType::IN_PROCESS);
-    m_messageRouter =
-        std::make_shared<MessageRouter>(getAuthDelegate(), m_attachmentManager, transportFactory, DEFAULT_AVS_GATEWAY);
-    m_connectionStatusObserver = std::make_shared<ConnectionStatusObserver>();
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/AipStateObserver.cpp b/Integration/src/AipStateObserver.cpp
deleted file mode 100644
index 012a0aa427..0000000000
--- a/Integration/src/AipStateObserver.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "Integration/AipStateObserver.h"
-
-namespace alexaClientSDK {
-namespace integration {
-
-using avsCommon::sdkInterfaces::AudioInputProcessorObserverInterface;
-
-AipStateObserver::AipStateObserver() : m_state(AudioInputProcessorObserverInterface::State::IDLE) {
-}
-
-void AipStateObserver::onStateChanged(AudioInputProcessorObserverInterface::State newState) {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    m_queue.push_back(newState);
-    m_state = newState;
-    m_wakeTrigger.notify_all();
-}
-
-bool AipStateObserver::checkState(
-    const AudioInputProcessorObserverInterface::State expectedState,
-    const std::chrono::seconds duration) {
-    AudioInputProcessorObserverInterface::State hold = waitForNext(duration);
-    return hold == expectedState;
-}
-
-AudioInputProcessorObserverInterface::State AipStateObserver::waitForNext(const std::chrono::seconds duration) {
-    AudioInputProcessorObserverInterface::State ret;
-    std::unique_lock<std::mutex> lock(m_mutex);
-    if (!m_wakeTrigger.wait_for(lock, duration, [this]() { return !m_queue.empty(); })) {
-        ret = AudioInputProcessorObserverInterface::State::IDLE;
-        return ret;
-    }
-    ret = m_queue.front();
-    m_queue.pop_front();
-    return ret;
-}
-
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/AuthDelegateTestContext.cpp b/Integration/src/AuthDelegateTestContext.cpp
deleted file mode 100644
index 662e36bea4..0000000000
--- a/Integration/src/AuthDelegateTestContext.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include <AVSCommon/Utils/DeviceInfo.h>
-#include <AVSCommon/Utils/LibcurlUtils/HttpPost.h>
-#ifdef ACSDK_ACS_UTILS
-#include <acsdkFFSAuthDelegate/ACSFFSAuthDelegateStorage.h>
-#include <acsdkFFSAuthDelegate/FFSAuthDelegate.h>
-#else
-#include <CBLAuthDelegate/CBLAuthDelegate.h>
-#include <CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h>
-#endif
-#include <RegistrationManager/CustomerDataManagerFactory.h>
-
-#include "Integration/AuthDelegateTestContext.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils::configuration;
-#ifdef ACSDK_ACS_UTILS
-using namespace acsdkffsAuthDelegate;
-#else
-using namespace authorization::cblAuthDelegate;
-#endif
-using namespace contextManager;
-using namespace registrationManager;
-using namespace ::testing;
-
-std::unique_ptr<AuthDelegateTestContext> AuthDelegateTestContext::create(
-    const std::string& filePath,
-    const std::string& overlay) {
-    std::unique_ptr<AuthDelegateTestContext> context(new AuthDelegateTestContext(filePath, overlay));
-    if (context->m_sdkTestContext && context->m_customerDataManager && context->m_authDelegate) {
-        return context;
-    }
-    return nullptr;
-}
-
-AuthDelegateTestContext::~AuthDelegateTestContext() {
-    m_authDelegate.reset();
-    m_customerDataManager.reset();
-    m_sdkTestContext.reset();
-}
-
-#ifdef ACSDK_ACS_UTILS
-void AuthDelegateTestContext::AuthRequester::onRequestFFS() {
-}
-#else
-void AuthDelegateTestContext::AuthRequester::onRequestAuthorization(const std::string& url, const std::string& code) {
-    ASSERT_FALSE(true) << "FATAL ERROR: Authorization required before running integration test";
-}
-
-void AuthDelegateTestContext::AuthRequester::onCheckingForAuthorization() {
-}
-#endif
-
-bool AuthDelegateTestContext::isValid() const {
-    return m_customerDataManager && m_authDelegate;
-}
-
-std::shared_ptr<AuthDelegateInterface> AuthDelegateTestContext::getAuthDelegate() const {
-    return m_authDelegate;
-}
-
-std::shared_ptr<registrationManager::CustomerDataManagerInterface> AuthDelegateTestContext::getCustomerDataManager()
-    const {
-    return m_customerDataManager;
-}
-
-AuthDelegateTestContext::AuthDelegateTestContext(const std::string& filePath, const std::string& overlay) {
-    m_sdkTestContext = SDKTestContext::create(filePath, overlay);
-    EXPECT_TRUE(m_sdkTestContext);
-    if (!m_sdkTestContext) {
-        return;
-    }
-
-    auto config = std::make_shared<ConfigurationNode>(ConfigurationNode::getRoot());
-    EXPECT_TRUE(*config);
-    if (!*config) {
-        return;
-    }
-
-    // TODO: use configuration or parameter here to determine which kind of AuthDelegate to create.
-
-    m_customerDataManager = registrationManager::CustomerDataManagerFactory::createCustomerDataManagerInterface();
-    EXPECT_TRUE(m_customerDataManager);
-    if (!m_customerDataManager) {
-        return;
-    }
-
-#ifdef ACSDK_ACS_UTILS
-    auto storage = ACSFFSAuthDelegateStorage::createFFSAuthDelegateStorageInterface();
-    EXPECT_TRUE(storage);
-    if (!storage) {
-        return;
-    }
-
-    m_authDelegate = FFSAuthDelegate::createFFSAuthDelegateInterface(
-        config,
-        m_customerDataManager,
-        std::move(storage),
-        std::make_shared<AuthRequester>(),
-        avsCommon::utils::libcurlUtils::HttpPost::create(),
-        avsCommon::utils::DeviceInfo::createFromConfiguration(config));
-
-    EXPECT_TRUE(m_authDelegate);
-#else
-    auto storage = SQLiteCBLAuthDelegateStorage::createCBLAuthDelegateStorageInterface(config, nullptr, nullptr);
-    EXPECT_TRUE(storage);
-    if (!storage) {
-        return;
-    }
-
-    m_authDelegate = CBLAuthDelegate::createAuthDelegateInterface(
-        config,
-        m_customerDataManager,
-        std::move(storage),
-        std::make_shared<AuthRequester>(),
-        avsCommon::utils::libcurlUtils::HttpPost::create(),
-        avsCommon::utils::DeviceInfo::createFromConfiguration(config));
-
-    EXPECT_TRUE(m_authDelegate);
-#endif
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/AuthObserver.cpp b/Integration/src/AuthObserver.cpp
deleted file mode 100644
index 248a4f481f..0000000000
--- a/Integration/src/AuthObserver.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "Integration/AuthObserver.h"
-#include <iostream>
-
-namespace alexaClientSDK {
-namespace integration {
-
-using avsCommon::sdkInterfaces::AuthObserverInterface;
-
-AuthObserver::AuthObserver() :
-        m_authState(AuthObserverInterface::State::UNINITIALIZED),
-        m_authError(AuthObserverInterface::Error::SUCCESS) {
-}
-
-void AuthObserver::onAuthStateChange(
-    const AuthObserverInterface::State authState,
-    const AuthObserverInterface::Error authError) {
-    m_authState = authState;
-    m_authError = authError;
-    m_wakeTrigger.notify_all();
-}
-
-AuthObserverInterface::State AuthObserver::getAuthState() const {
-    return m_authState;
-}
-
-bool AuthObserver::waitFor(const AuthObserverInterface::State authState, const std::chrono::seconds duration) {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    return m_wakeTrigger.wait_for(lock, duration, [this, authState]() { return m_authState == authState; });
-}
-
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/CMakeLists.txt b/Integration/src/CMakeLists.txt
deleted file mode 100644
index 7aca9a6fb6..0000000000
--- a/Integration/src/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-if(BUILD_TESTING)
-    add_definitions("-DACSDK_LOG_MODULE=integration")
-    file(GLOB_RECURSE INTEGRATION_SRC "*.cpp")
-    add_library(Integration STATIC "${INTEGRATION_SRC}")
-    target_include_directories(Integration PUBLIC "${ACL_SOURCE_DIR}/include")
-    target_include_directories(Integration PUBLIC "${CBLAuthDelegate_SOURCE_DIR}/include")
-    target_include_directories(Integration PUBLIC "${ContextManager_SOURCE_DIR}/include")
-    target_include_directories(Integration PUBLIC "${Integration_SOURCE_DIR}/include")
-    target_include_directories(Integration PUBLIC "${CapabilityAgents_SOURCE_DIR}/include")
-    target_include_directories(Integration PUBLIC "${AIP_SOURCE_DIR}/include")
-    target_include_directories(Integration PUBLIC "${SpeechSynthesizer_SOURCE_DIR}/include")
-    target_include_directories(Integration PUBLIC "${AudioPlayer_SOURCE_DIR}/include")
-    target_include_directories(Integration PUBLIC "${AVSSystem_SOURCE_DIR}/include")
-    target_include_directories(Integration PUBLIC "${RegistrationManager_SOURCE_DIR}/include")
-    target_include_directories(Integration PUBLIC "${SQLiteStorage_SOURCE_DIR}/include")
-    target_include_directories(Integration PUBLIC "${SynchronizeStateSender_SOURCE_DIR}/include")
-
-    target_link_libraries(Integration
-            ACL
-            AudioResources
-            CBLAuthDelegate
-            ContextManager
-            gtest
-            gmock
-            RegistrationManager
-            SynchronizeStateSender
-            acsdkAlerts)
-    if(ACS_UTILS)
-        target_link_libraries(Integration acsdkFFSAuthDelegate)
-    endif()
-endif()
\ No newline at end of file
diff --git a/Integration/src/ClientMessageHandler.cpp b/Integration/src/ClientMessageHandler.cpp
deleted file mode 100644
index c6fd245fab..0000000000
--- a/Integration/src/ClientMessageHandler.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "Integration/ClientMessageHandler.h"
-#include <iostream>
-
-namespace alexaClientSDK {
-namespace integration {
-
-using namespace avsCommon::avs::attachment;
-
-ClientMessageHandler::ClientMessageHandler(std::shared_ptr<AttachmentManager> attachmentManager) :
-        m_count{0},
-        m_attachmentManager{attachmentManager} {
-}
-
-void ClientMessageHandler::receive(const std::string& contextId, const std::string& message) {
-    std::cout << "ClientMessageHandler::receive: message:" << message << std::endl;
-    std::unique_lock<std::mutex> lock(m_mutex);
-    ++m_count;
-    m_wakeTrigger.notify_all();
-}
-
-bool ClientMessageHandler::waitForNext(const std::chrono::seconds duration) {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    if (!m_wakeTrigger.wait_for(lock, duration, [this]() { return m_count > 0; })) {
-        return false;
-    }
-    --m_count;
-    return true;
-}
-
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/ConnectionStatusObserver.cpp b/Integration/src/ConnectionStatusObserver.cpp
deleted file mode 100644
index 9625883025..0000000000
--- a/Integration/src/ConnectionStatusObserver.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "Integration/ConnectionStatusObserver.h"
-
-#include <iostream>
-
-namespace alexaClientSDK {
-namespace integration {
-
-using alexaClientSDK::avsCommon::sdkInterfaces::ConnectionStatusObserverInterface;
-
-ConnectionStatusObserver::ConnectionStatusObserver() :
-        m_statusChanges({std::make_pair(Status::DISCONNECTED, ChangedReason::ACL_CLIENT_REQUEST)}) {
-}
-
-void ConnectionStatusObserver::onConnectionStatusChanged(const Status connectionStatus, const ChangedReason reason) {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    m_statusChanges.push_back(std::make_pair(connectionStatus, reason));
-    m_wakeTrigger.notify_all();
-}
-
-bool ConnectionStatusObserver::checkForServerSideDisconnect() {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    for (auto pairValue : m_statusChanges) {
-        if (pairValue.first == Status::PENDING && pairValue.second == ChangedReason::SERVER_SIDE_DISCONNECT) {
-            return true;
-        }
-    }
-    return false;
-}
-
-ConnectionStatusObserverInterface::Status ConnectionStatusObserver::getConnectionStatus() const {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    return m_statusChanges.back().first;
-}
-
-bool ConnectionStatusObserver::waitFor(const Status connectionStatus, const std::chrono::seconds duration) {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    return m_wakeTrigger.wait_for(
-        lock, duration, [this, connectionStatus]() { return m_statusChanges.back().first == connectionStatus; });
-}
-
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/ObservableMessageRequest.cpp b/Integration/src/ObservableMessageRequest.cpp
deleted file mode 100644
index fd26425ebd..0000000000
--- a/Integration/src/ObservableMessageRequest.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <AVSCommon/Utils/Logger/Logger.h>
-
-#include "Integration/ObservableMessageRequest.h"
-
-#include <iostream>
-
-namespace alexaClientSDK {
-namespace integration {
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("ObservableMessageRequest");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-using namespace avsCommon::avs;
-using namespace avsCommon::avs::attachment;
-
-/// The field name for the user voice attachment.
-static const std::string AUDIO_ATTACHMENT_FIELD_NAME = "audio";
-
-ObservableMessageRequest::ObservableMessageRequest(
-    const std::string& jsonContent,
-    std::shared_ptr<AttachmentReader> attachmentReader) :
-        MessageRequest{jsonContent},
-        m_sendMessageStatus(avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::PENDING),
-        m_sendCompleted{false},
-        m_exceptionReceived{false} {
-    if (attachmentReader) {
-        addAttachmentReader(AUDIO_ATTACHMENT_FIELD_NAME, attachmentReader);
-    }
-}
-
-void ObservableMessageRequest::sendCompleted(
-    avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status sendMessageStatus) {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    ACSDK_DEBUG(LX("onSendCompleted").d("status", sendMessageStatus));
-    m_sendMessageStatus = sendMessageStatus;
-    m_sendCompleted = true;
-    m_wakeTrigger.notify_all();
-}
-
-avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status ObservableMessageRequest::getSendMessageStatus()
-    const {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    return m_sendMessageStatus;
-}
-
-bool ObservableMessageRequest::waitFor(
-    const avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status sendMessageStatus,
-    const std::chrono::seconds duration) {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    return m_wakeTrigger.wait_for(
-        lock, duration, [this, sendMessageStatus]() { return sendMessageStatus == m_sendMessageStatus; });
-}
-
-void ObservableMessageRequest::exceptionReceived(const std::string& exceptionMessage) {
-    ACSDK_DEBUG(LX("onExceptionReceived").d("status", exceptionMessage));
-    m_exceptionReceived = true;
-}
-
-bool ObservableMessageRequest::hasSendCompleted() {
-    return m_sendCompleted;
-}
-
-bool ObservableMessageRequest::wasExceptionReceived() {
-    return m_exceptionReceived;
-}
-
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/SDKTestContext.cpp b/Integration/src/SDKTestContext.cpp
deleted file mode 100644
index b877f17f32..0000000000
--- a/Integration/src/SDKTestContext.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <fstream>
-#include <sstream>
-
-#include <gtest/gtest.h>
-
-#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
-
-#include "Integration/SDKTestContext.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace avsCommon::avs::initialization;
-
-std::unique_ptr<SDKTestContext> SDKTestContext::create(const std::string& filePath, const std::string& overlay) {
-    std::unique_ptr<SDKTestContext> context(new SDKTestContext(filePath, overlay));
-    if (AlexaClientSDKInit::isInitialized()) {
-        return context;
-    }
-    return nullptr;
-}
-
-SDKTestContext::~SDKTestContext() {
-    AlexaClientSDKInit::uninitialize();
-}
-
-SDKTestContext::SDKTestContext(const std::string& filePath, const std::string& overlay) {
-    std::vector<std::shared_ptr<std::istream>> streams;
-
-    auto infile = std::shared_ptr<std::ifstream>(new std::ifstream(filePath));
-    EXPECT_TRUE(infile->good());
-    if (!infile->good()) {
-        return;
-    }
-    streams.push_back(infile);
-
-    auto overlayStream = std::shared_ptr<std::stringstream>(new std::stringstream());
-    if (!overlay.empty()) {
-        (*overlayStream) << overlay;
-        streams.push_back(overlayStream);
-    }
-
-    EXPECT_TRUE(AlexaClientSDKInit::initialize(streams));
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/TestAlertObserver.cpp b/Integration/src/TestAlertObserver.cpp
deleted file mode 100644
index 82233cb52b..0000000000
--- a/Integration/src/TestAlertObserver.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <iostream>
-
-#include "Integration/TestAlertObserver.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-void TestAlertObserver::onAlertStateChange(const AlertObserverInterface::AlertInfo& alertInfo) {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    TestAlertObserver::changedAlert ca;
-    ca.state = alertInfo.state;
-    m_queue.push_back(ca);
-    m_wakeTrigger.notify_all();
-}
-
-TestAlertObserver::changedAlert TestAlertObserver::waitForNext(const std::chrono::seconds duration) {
-    TestAlertObserver::changedAlert ret;
-    std::unique_lock<std::mutex> lock(m_mutex);
-    if (!m_wakeTrigger.wait_for(lock, duration, [this]() { return !m_queue.empty(); })) {
-        ret.state = currentState;
-        return ret;
-    }
-    ret = m_queue.front();
-    m_queue.pop_front();
-    return ret;
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/TestDirectiveHandler.cpp b/Integration/src/TestDirectiveHandler.cpp
deleted file mode 100644
index 7137a88da0..0000000000
--- a/Integration/src/TestDirectiveHandler.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "Integration/TestDirectiveHandler.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-TestDirectiveHandler::TestDirectiveHandler(avsCommon::avs::DirectiveHandlerConfiguration config) :
-        m_configuration{config} {
-}
-
-void TestDirectiveHandler::handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    TestDirectiveHandler::DirectiveParams dp;
-    dp.type = DirectiveParams::Type::HANDLE_IMMEDIATELY;
-    dp.directive = directive;
-    m_queue.push_back(dp);
-    m_wakeTrigger.notify_all();
-}
-
-void TestDirectiveHandler::preHandleDirective(
-    std::shared_ptr<avsCommon::avs::AVSDirective> directive,
-    std::unique_ptr<avsCommon::sdkInterfaces::DirectiveHandlerResultInterface> result) {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    TestDirectiveHandler::DirectiveParams dp;
-    dp.type = TestDirectiveHandler::DirectiveParams::Type::PREHANDLE;
-    dp.directive = directive;
-    dp.result = std::move(result);
-    m_results[directive->getMessageId()] = dp.result;
-    m_directives[directive->getMessageId()] = directive;
-    m_queue.push_back(dp);
-    m_wakeTrigger.notify_all();
-}
-
-bool TestDirectiveHandler::handleDirective(const std::string& messageId) {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    TestDirectiveHandler::DirectiveParams dp;
-    dp.type = DirectiveParams::Type::HANDLE;
-    auto result = m_results.find(messageId);
-    if (m_results.end() == result) {
-        return false;
-    }
-    dp.result = result->second;
-    auto directive = m_directives.find(messageId);
-    if (m_directives.end() == directive) {
-        return false;
-    }
-    dp.directive = directive->second;
-    m_queue.push_back(dp);
-    m_wakeTrigger.notify_all();
-    return true;
-}
-
-void TestDirectiveHandler::cancelDirective(const std::string& messageId) {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    TestDirectiveHandler::DirectiveParams dp;
-    dp.type = DirectiveParams::Type::CANCEL;
-    auto result = m_results.find(messageId);
-    dp.result = result->second;
-    m_results.erase(result);
-    auto directive = m_directives.find(messageId);
-    dp.directive = directive->second;
-    m_directives.erase(directive);
-    m_queue.push_back(dp);
-    m_wakeTrigger.notify_all();
-}
-
-avsCommon::avs::DirectiveHandlerConfiguration TestDirectiveHandler::getConfiguration() const {
-    return m_configuration;
-}
-
-void TestDirectiveHandler::onDeregistered() {
-}
-
-TestDirectiveHandler::DirectiveParams TestDirectiveHandler::waitForNext(const std::chrono::seconds duration) {
-    DirectiveParams ret;
-    std::unique_lock<std::mutex> lock(m_mutex);
-    if (!m_wakeTrigger.wait_for(lock, duration, [this]() { return !m_queue.empty(); })) {
-        ret.type = DirectiveParams::Type::TIMEOUT;
-        return ret;
-    }
-    ret = m_queue.front();
-    m_queue.pop_front();
-    return ret;
-}
-
-TestDirectiveHandler::DirectiveParams::DirectiveParams() : type{Type::UNSET} {
-}
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/TestExceptionEncounteredSender.cpp b/Integration/src/TestExceptionEncounteredSender.cpp
deleted file mode 100644
index e0b558d809..0000000000
--- a/Integration/src/TestExceptionEncounteredSender.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "Integration/TestExceptionEncounteredSender.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace avsCommon::utils::json;
-
-/// JSON key to get the event object of a message.
-static const std::string JSON_MESSAGE_EVENT_KEY = "event";
-/// JSON key to get the directive object of a message.
-static const std::string JSON_MESSAGE_DIRECTIVE_KEY = "directive";
-/// JSON key to get the header object of a message.
-static const std::string JSON_MESSAGE_HEADER_KEY = "header";
-/// JSON key to get the namespace value of a header.
-static const std::string JSON_MESSAGE_NAMESPACE_KEY = "namespace";
-/// JSON key to get the name value of a header.
-static const std::string JSON_MESSAGE_NAME_KEY = "name";
-/// JSON key to get the messageId value of a header.
-static const std::string JSON_MESSAGE_MESSAGE_ID_KEY = "messageId";
-/// JSON key to get the dialogRequestId value of a header.
-static const std::string JSON_MESSAGE_DIALOG_REQUEST_ID_KEY = "dialogRequestId";
-/// JSON key to get the payload object of a message.
-static const std::string JSON_MESSAGE_PAYLOAD_KEY = "payload";
-
-void TestExceptionEncounteredSender::sendExceptionEncountered(
-    const std::string& unparsedDirective,
-    avs::ExceptionErrorType error,
-    const std::string& message) {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    ExceptionParams dp;
-    dp.type = ExceptionParams::Type::EXCEPTION;
-    dp.directive = parseDirective(
-        unparsedDirective,
-        std::make_shared<avsCommon::avs::attachment::AttachmentManager>(
-            avsCommon::avs::attachment::AttachmentManager::AttachmentType::IN_PROCESS));
-    dp.exceptionUnparsedDirective = unparsedDirective;
-    dp.exceptionError = error;
-    dp.exceptionMessage = message;
-    m_queue.push_back(dp);
-    m_wakeTrigger.notify_all();
-}
-
-std::shared_ptr<avsCommon::avs::AVSDirective> TestExceptionEncounteredSender::parseDirective(
-    const std::string& rawJSON,
-    std::shared_ptr<avsCommon::avs::attachment::AttachmentManager> attachmentManager) {
-    std::string directiveJSON;
-    std::string headerJSON;
-    std::string payloadJSON;
-    std::string nameSpace;
-    std::string name;
-    std::string messageId;
-    std::string dialogRequestId;
-
-    if (!jsonUtils::retrieveValue(rawJSON, JSON_MESSAGE_DIRECTIVE_KEY, &directiveJSON) ||
-        !jsonUtils::retrieveValue(directiveJSON, JSON_MESSAGE_HEADER_KEY, &headerJSON) ||
-        !jsonUtils::retrieveValue(directiveJSON, JSON_MESSAGE_PAYLOAD_KEY, &payloadJSON) ||
-        !jsonUtils::retrieveValue(headerJSON, JSON_MESSAGE_NAMESPACE_KEY, &nameSpace) ||
-        !jsonUtils::retrieveValue(headerJSON, JSON_MESSAGE_NAME_KEY, &name) ||
-        !jsonUtils::retrieveValue(headerJSON, JSON_MESSAGE_MESSAGE_ID_KEY, &messageId)) {
-        return nullptr;
-    }
-
-    jsonUtils::retrieveValue(headerJSON, JSON_MESSAGE_NAMESPACE_KEY, &dialogRequestId);
-
-    auto header = std::make_shared<avsCommon::avs::AVSMessageHeader>(nameSpace, name, messageId, dialogRequestId);
-    return avsCommon::avs::AVSDirective::create(rawJSON, header, payloadJSON, attachmentManager, "");
-}
-
-TestExceptionEncounteredSender::ExceptionParams TestExceptionEncounteredSender::waitForNext(
-    const std::chrono::seconds duration) {
-    ExceptionParams ret;
-    std::unique_lock<std::mutex> lock(m_mutex);
-    if (!m_wakeTrigger.wait_for(lock, duration, [this]() { return !m_queue.empty(); })) {
-        ret.type = ExceptionParams::Type::TIMEOUT;
-        return ret;
-    }
-    ret = m_queue.front();
-    m_queue.pop_front();
-    return ret;
-}
-
-TestExceptionEncounteredSender::ExceptionParams::ExceptionParams() :
-        type{Type::UNSET},
-        exceptionError{avsCommon::avs::ExceptionErrorType::INTERNAL_ERROR} {
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/TestMediaPlayer.cpp b/Integration/src/TestMediaPlayer.cpp
deleted file mode 100644
index 67521e02d5..0000000000
--- a/Integration/src/TestMediaPlayer.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <atomic>
-
-#include "Integration/TestMediaPlayer.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("TestMediaPlayer");
-
-/// Default media player state for reporting all playback eventing
-static const avsCommon::utils::mediaPlayer::MediaPlayerState DEFAULT_MEDIA_PLAYER_STATE = {
-    std::chrono::milliseconds(0)};
-
-/// A counter used to increment the source id when a new source is set.
-static std::atomic<avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId> g_sourceId{0};
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-TestMediaPlayer::~TestMediaPlayer() {
-}
-
-avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId TestMediaPlayer::setSource(
-    std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> attachmentReader,
-    const avsCommon::utils::AudioFormat* audioFormat,
-    const avsCommon::utils::mediaPlayer::SourceConfig& config) {
-    m_attachmentReader = std::move(attachmentReader);
-    return ++g_sourceId;
-}
-
-avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId TestMediaPlayer::setSource(
-    std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> attachmentReader,
-    std::chrono::milliseconds offsetAdjustment,
-    const avsCommon::utils::AudioFormat* audioFormat,
-    const avsCommon::utils::mediaPlayer::SourceConfig& config) {
-    m_attachmentReader = std::move(attachmentReader);
-    return ++g_sourceId;
-}
-
-avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId TestMediaPlayer::setSource(
-    std::shared_ptr<std::istream> stream,
-    bool repeat,
-    const avsCommon::utils::mediaPlayer::SourceConfig& config,
-    avsCommon::utils::MediaType format) {
-    m_istream = stream;
-    return ++g_sourceId;
-}
-
-avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId TestMediaPlayer::setSource(
-    const std::string& url,
-    std::chrono::milliseconds offset,
-    const avsCommon::utils::mediaPlayer::SourceConfig& config,
-    bool repeat,
-    const avsCommon::utils::mediaPlayer::PlaybackContext& playbackContext) {
-    return ++g_sourceId;
-}
-
-bool TestMediaPlayer::play(avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId id) {
-    if (m_observers.empty()) {
-        return false;
-    }
-    for (const auto& observer : m_observers) {
-        observer->onPlaybackStarted(id, DEFAULT_MEDIA_PLAYER_STATE);
-    }
-    m_playbackFinished = true;
-    m_timer = std::unique_ptr<avsCommon::utils::timing::Timer>(new avsCommon::utils::timing::Timer);
-    // Wait 600 milliseconds before sending onPlaybackFinished.
-    m_timer->start(std::chrono::milliseconds(600), [this, id] {
-        for (const auto& observer : m_observers) {
-            if (m_playbackFinished) {
-                observer->onPlaybackFinished(id, DEFAULT_MEDIA_PLAYER_STATE);
-            }
-        }
-        m_playbackFinished = false;
-    });
-    return true;
-}
-
-bool TestMediaPlayer::stop(avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId id) {
-    if (!m_playbackFinished || m_observers.empty()) {
-        return false;
-    }
-    for (const auto& observer : m_observers) {
-        if (m_playbackFinished) {
-            observer->onPlaybackStopped(id, DEFAULT_MEDIA_PLAYER_STATE);
-        }
-    }
-    m_playbackFinished = false;
-    return true;
-}
-
-// TODO Add implementation
-bool TestMediaPlayer::pause(avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId id) {
-    return true;
-}
-
-// TODO Add implementation
-bool TestMediaPlayer::resume(avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId id) {
-    return true;
-}
-
-std::chrono::milliseconds TestMediaPlayer::getOffset(avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId id) {
-    return std::chrono::milliseconds::zero();
-}
-
-void TestMediaPlayer::addObserver(
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerObserverInterface> playerObserver) {
-    m_observers.insert(playerObserver);
-}
-
-void TestMediaPlayer::removeObserver(
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerObserverInterface> playerObserver) {
-    m_observers.erase(playerObserver);
-}
-
-uint64_t TestMediaPlayer::getNumBytesBuffered() {
-    return 0;
-}
-
-avsCommon::utils::Optional<avsCommon::utils::mediaPlayer::MediaPlayerState> TestMediaPlayer::getMediaPlayerState(
-    avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId id) {
-    auto offset = getOffset(id);
-    auto state = avsCommon::utils::mediaPlayer::MediaPlayerState();
-    state.offset = offset;
-    return avsCommon::utils::Optional<avsCommon::utils::mediaPlayer::MediaPlayerState>(state);
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/TestMessageSender.cpp b/Integration/src/TestMessageSender.cpp
deleted file mode 100644
index 37f88e6e23..0000000000
--- a/Integration/src/TestMessageSender.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "ACL/AVSConnectionManager.h"
-#include "Integration/TestMessageSender.h"
-
-using namespace alexaClientSDK;
-using namespace acl;
-using namespace avsCommon::avs;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils;
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-TestMessageSender::TestMessageSender(
-    std::shared_ptr<acl::MessageRouterInterface> messageRouter,
-    bool isEnabled,
-    std::shared_ptr<ConnectionStatusObserverInterface> connectionStatusObserver,
-    std::shared_ptr<MessageObserverInterface> messageObserver) :
-        RequiresShutdown{"TestMessageSender"} {
-    m_connectionManager =
-        acl::AVSConnectionManager::create(messageRouter, isEnabled, {connectionStatusObserver}, {messageObserver});
-}
-
-void TestMessageSender::sendMessage(std::shared_ptr<MessageRequest> request) {
-    m_connectionManager->sendMessage(request);
-    SendParams sendState;
-    std::unique_lock<std::mutex> lock(m_mutex);
-    sendState.type = SendParams::Type::SEND;
-    sendState.request = request;
-    m_queue.push_back(sendState);
-    m_wakeTrigger.notify_all();
-}
-
-TestMessageSender::SendParams TestMessageSender::waitForNext(const std::chrono::seconds duration) {
-    SendParams ret;
-    std::unique_lock<std::mutex> lock(m_mutex);
-    if (!m_wakeTrigger.wait_for(lock, duration, [this]() { return !m_queue.empty(); })) {
-        ret.type = SendParams::Type::TIMEOUT;
-        return ret;
-    }
-    ret = m_queue.front();
-    m_queue.pop_front();
-    return ret;
-}
-
-void TestMessageSender::enable() {
-    m_connectionManager->enable();
-}
-
-void TestMessageSender::disable() {
-    m_connectionManager->disable();
-}
-
-bool TestMessageSender::isEnabled() {
-    return m_connectionManager->isEnabled();
-}
-
-void TestMessageSender::reconnect() {
-    m_connectionManager->reconnect();
-}
-
-void TestMessageSender::setAVSGateway(const std::string& avsGateway) {
-    m_connectionManager->setAVSGateway(avsGateway);
-}
-
-void TestMessageSender::addConnectionStatusObserver(
-    std::shared_ptr<avsCommon::sdkInterfaces::ConnectionStatusObserverInterface> observer) {
-    m_connectionManager->addConnectionStatusObserver(observer);
-}
-
-void TestMessageSender::removeConnectionStatusObserver(
-    std::shared_ptr<avsCommon::sdkInterfaces::ConnectionStatusObserverInterface> observer) {
-    m_connectionManager->removeConnectionStatusObserver(observer);
-}
-
-void TestMessageSender::addMessageObserver(
-    std::shared_ptr<avsCommon::sdkInterfaces::MessageObserverInterface> observer) {
-    m_connectionManager->addMessageObserver(observer);
-}
-
-void TestMessageSender::doShutdown() {
-    m_connectionManager->shutdown();
-}
-
-void TestMessageSender::removeMessageObserver(
-    std::shared_ptr<avsCommon::sdkInterfaces::MessageObserverInterface> observer) {
-    m_connectionManager->removeMessageObserver(observer);
-}
-
-std::shared_ptr<acl::AVSConnectionManager> TestMessageSender::getConnectionManager() const {
-    return m_connectionManager;
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/src/TestSpeechSynthesizerObserver.cpp b/Integration/src/TestSpeechSynthesizerObserver.cpp
deleted file mode 100644
index a2efec6dbb..0000000000
--- a/Integration/src/TestSpeechSynthesizerObserver.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "Integration/TestSpeechSynthesizerObserver.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using avsCommon::sdkInterfaces::SpeechSynthesizerObserverInterface;
-
-TestSpeechSynthesizerObserver::TestSpeechSynthesizerObserver() :
-        m_state(SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED) {
-}
-
-void TestSpeechSynthesizerObserver::onStateChanged(
-    SpeechSynthesizerObserverInterface::SpeechSynthesizerState state,
-    const avsCommon::utils::mediaPlayer::MediaPlayerInterface::SourceId mediaSourceId,
-    const avsCommon::utils::Optional<avsCommon::utils::mediaPlayer::MediaPlayerState>& mediaPlayerState,
-    const std::vector<avsCommon::utils::audioAnalyzer::AudioAnalyzerState>& audioAnalyzerState) {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    m_state = state;
-    m_queue.push_back(state);
-    m_wakeTrigger.notify_all();
-}
-
-bool TestSpeechSynthesizerObserver::checkState(
-    const SpeechSynthesizerObserverInterface::SpeechSynthesizerState expectedState,
-    const std::chrono::seconds duration) {
-    // Pull the front of the state queue
-    SpeechSynthesizerObserverInterface::SpeechSynthesizerState hold = waitForNext(duration);
-    return (hold == expectedState);
-}
-
-SpeechSynthesizerObserverInterface::SpeechSynthesizerState TestSpeechSynthesizerObserver::waitForNext(
-    const std::chrono::seconds duration) {
-    SpeechSynthesizerObserverInterface::SpeechSynthesizerState ret;
-    std::unique_lock<std::mutex> lock(m_mutex);
-    if (!m_wakeTrigger.wait_for(lock, duration, [this]() { return !m_queue.empty(); })) {
-        return m_state;
-    }
-
-    ret = m_queue.front();
-    m_queue.pop_front();
-    return ret;
-}
-
-SpeechSynthesizerObserverInterface::SpeechSynthesizerState TestSpeechSynthesizerObserver::getCurrentState() {
-    return m_state;
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
diff --git a/Integration/test/AlertsIntegrationTest.cpp b/Integration/test/AlertsIntegrationTest.cpp
deleted file mode 100644
index b9e276df52..0000000000
--- a/Integration/test/AlertsIntegrationTest.cpp
+++ /dev/null
@@ -1,1449 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/// @file AlertsIntegrationTest.cpp
-
-#include <chrono>
-#include <deque>
-#include <fstream>
-#include <future>
-#include <iostream>
-#include <mutex>
-#include <string>
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include <ADSL/DirectiveSequencer.h>
-#include <ADSL/MessageInterpreter.h>
-#include <AFML/FocusManager.h>
-#include <AIP/AudioInputProcessor.h>
-#include <AIP/AudioProvider.h>
-#include <AIP/Initiator.h>
-#include <acsdkAlerts/AlertsCapabilityAgent.h>
-#include <acsdkAlerts/Storage/SQLiteAlertStorage.h>
-#include <Audio/AlertsAudioFactory.h>
-#include <Audio/SystemSoundAudioFactory.h>
-#include <AVSCommon/AVS/Attachment/InProcessAttachmentReader.h>
-#include <AVSCommon/AVS/CapabilityChangeNotifier.h>
-#include <AVSCommon/SDKInterfaces/MockLocaleAssetsManager.h>
-#include <AVSCommon/SDKInterfaces/MockSpeakerManager.h>
-#include <AVSCommon/SDKInterfaces/Endpoints/MockEndpointCapabilitiesRegistrar.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
-#include <AVSCommon/Utils/LibcurlUtils/HTTPContentFetcherFactory.h>
-#include <AVSCommon/Utils/Logger/LogEntry.h>
-#include <AVSCommon/Utils/Metrics/MockMetricRecorder.h>
-#include <CertifiedSender/CertifiedSender.h>
-#include <CertifiedSender/SQLiteMessageStorage.h>
-#include <RegistrationManager/CustomerDataManagerFactory.h>
-#include <Settings/MockSetting.h>
-#include <Settings/SpeechConfirmationSettingType.h>
-#include <Settings/Types/AlarmVolumeRampTypes.h>
-#include <Settings/WakeWordConfirmationSettingType.h>
-#include <acsdkInteractionModel/InteractionModelCapabilityAgent.h>
-#include <acsdkInteractionModel/InteractionModelNotifier.h>
-#include <SpeechSynthesizer/SpeechSynthesizer.h>
-#include <System/UserInactivityMonitor.h>
-#include <SystemSoundPlayer/SystemSoundPlayer.h>
-#include <acsdkAlertsInterfaces/AlertObserverInterface.h>
-#include <acsdkManufactory/Annotated.h>
-#include <acsdkShutdownManager/ShutdownNotifier.h>
-
-#include "Integration/ACLTestContext.h"
-#include "Integration/TestAlertObserver.h"
-#include "Integration/TestDirectiveHandler.h"
-#include "Integration/TestExceptionEncounteredSender.h"
-#include "Integration/TestMessageSender.h"
-#include "Integration/TestSpeechSynthesizerObserver.h"
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-#include <MediaPlayer/MediaPlayer.h>
-#else
-#include "Integration/TestMediaPlayer.h"
-#endif
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace acl;
-using namespace acsdkAlerts;
-using namespace acsdkAlertsInterfaces;
-using namespace acsdkManufactory;
-using namespace adsl;
-using namespace avsCommon;
-using namespace avsCommon::avs;
-using namespace avsCommon::avs::attachment;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils::mediaPlayer;
-using namespace certifiedSender;
-using namespace sdkInterfaces;
-using namespace sdkInterfaces::endpoints;
-using namespace sdkInterfaces::endpoints::test;
-using namespace avsCommon::utils::sds;
-using namespace avsCommon::utils::json;
-using namespace capabilityAgents::aip;
-using namespace afml;
-using namespace acsdkInteractionModel;
-using namespace capabilityAgents::speechSynthesizer;
-using namespace capabilityAgents::system;
-using namespace settings;
-using namespace settings::test;
-using namespace testing;
-#ifdef GSTREAMER_MEDIA_PLAYER
-using namespace mediaPlayer;
-#endif
-
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Joke" to be recognized.
-static const std::string RECOGNIZE_JOKE_AUDIO_FILE_NAME = "/recognize_joke_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "What's up" to be recognized.
-static const std::string RECOGNIZE_WHATS_UP_AUDIO_FILE_NAME = "/recognize_whats_up_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "What's up" to be recognized.
-static const std::string RECOGNIZE_WEATHER_AUDIO_FILE_NAME = "/recognize_weather_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Set a timer for 5 seconds" to be recognized.
-static const std::string RECOGNIZE_TIMER_AUDIO_FILE_NAME = "/recognize_timer_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Set a timer for 10 seconds" to be recognized.
-static const std::string RECOGNIZE_LONG_TIMER_AUDIO_FILE_NAME = "/recognize_long_timer_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Set a timer for 15 seconds" to be recognized.
-static const std::string RECOGNIZE_VERY_LONG_TIMER_AUDIO_FILE_NAME = "/recognize_very_long_timer_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Stop" to be recognized.
-static const std::string RECOGNIZE_STOP_AUDIO_FILE_NAME = "/recognize_stop_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Cancel the timer" to be recognized.
-static const std::string RECOGNIZE_CANCEL_TIMER_AUDIO_FILE_NAME = "/recognize_cancel_timer_test.wav";
-// This string to be used for Speak Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_RECOGNIZE = "Recognize";
-// This string to be used for SetAlertFailed Directives which use the NAMESPACE_ALERTS namespace.
-static const std::string NAME_SET_ALERT_FAILED = "SetAlertFailed";
-// This string to be used for AlertStopped Directives which use the NAMESPACE_ALERTS namespace.
-static const std::string NAME_ALERT_STOPPED = "AlertStopped";
-// This string to be used for AlertEnteredBackground Directives which use the NAMESPACE_ALERTS namespace.
-static const std::string NAME_ALERT_ENTERED_BACKGROUND = "AlertEnteredBackground";
-// This string to be used for AlertEnteredForeground Directives which use the NAMESPACE_ALERTS namespace.
-static const std::string NAME_ALERT_ENTERED_FOREGROUND = "AlertEnteredForeground";
-// This string to be used for DeleteAlertSucceeded Directives which use the NAMESPACE_ALERTS namespace.
-static const std::string NAME_DELETE_ALERT_SUCCEEDED = "DeleteAlertSucceeded";
-// This string to be used for DeleteAlertFailed Directives which use the NAMESPACE_ALERTS namespace.
-static const std::string NAME_DELETE_ALERT_FAILED = "DeleteAlertFailed";
-// This string to be used for AlertStarted Directives which use the NAMESPACE_ALERTS namespace.
-static const std::string NAME_ALERT_STARTED = "AlertStarted";
-// This string to be used for SpeechStarted Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_SPEECH_STARTED = "SpeechStarted";
-// This string to be used for SpeechFinished Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_SPEECH_FINISHED = "SpeechFinished";
-// This string to be used for AlertStarted Directives which use the NAMESPACE_ALERTS namespace.
-static const std::string NAME_SET_ALERT_SUCCEEDED = "SetAlertSucceeded";
-// Sample dialog activity id.
-static const std::string DIALOG_ACTIVITY_ID = "Dialog";
-// Sample content activity id.
-static const std::string CONTENT_ACTIVITY_ID = "Content";
-/// Sample alerts activity id.
-static const std::string ALERTS_ACTIVITY_ID = "Alerts";
-// This Integer to be used to specify a timeout in seconds.
-static const std::chrono::seconds WAIT_FOR_TIMEOUT_DURATION(25);
-// This Integer to be used to specify a short timeout in seconds.
-static const std::chrono::seconds SHORT_TIMEOUT_DURATION(5);
-/// The compatible encoding for AIP.
-static const avsCommon::utils::AudioFormat::Encoding COMPATIBLE_ENCODING =
-    avsCommon::utils::AudioFormat::Encoding::LPCM;
-/// The compatible endianness for AIP.
-static const avsCommon::utils::AudioFormat::Endianness COMPATIBLE_ENDIANNESS =
-    avsCommon::utils::AudioFormat::Endianness::LITTLE;
-/// The compatible sample rate for AIP.
-static const unsigned int COMPATIBLE_SAMPLE_RATE = 16000;
-/// The compatible bits per sample.
-static const unsigned int COMPATIBLE_SAMPLE_SIZE_IN_BITS = 16;
-/// The compatible number of channels
-static const unsigned int COMPATIBLE_NUM_CHANNELS = 1;
-
-/// JSON key to get the event object of a message.
-static const std::string JSON_MESSAGE_EVENT_KEY = "event";
-/// JSON key to get the directive object of a message.
-static const std::string JSON_MESSAGE_DIRECTIVE_KEY = "directive";
-/// JSON key to get the header object of a message.
-static const std::string JSON_MESSAGE_HEADER_KEY = "header";
-/// JSON key to get the namespace value of a header.
-static const std::string JSON_MESSAGE_NAMESPACE_KEY = "namespace";
-/// JSON key to get the name value of a header.
-static const std::string JSON_MESSAGE_NAME_KEY = "name";
-/// JSON key to get the messageId value of a header.
-static const std::string JSON_MESSAGE_MESSAGE_ID_KEY = "messageId";
-/// JSON key to get the dialogRequestId value of a header.
-static const std::string JSON_MESSAGE_DIALOG_REQUEST_ID_KEY = "dialogRequestId";
-/// JSON key to get the payload object of a message.
-static const std::string JSON_MESSAGE_PAYLOAD_KEY = "payload";
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("AlertsIntegrationTest");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// Path to the AlexaClientSDKConfig.json file (from command line arguments).
-static std::string g_configPath;
-/// Path to resources (e.g. audio files) for tests (from command line arguments).
-static std::string g_inputPath;
-
-/// A test observer that mocks out the ChannelObserverInterface##onFocusChanged() call.
-class TestClient : public ChannelObserverInterface {
-public:
-    /**
-     * Constructor.
-     */
-    TestClient() : m_focusState(FocusState::NONE), m_focusChangeOccurred(false) {
-    }
-
-    /**
-     * Implementation of the ChannelObserverInterface##onFocusChanged() callback.
-     *
-     * @param focusState The new focus state of the Channel observer.
-     * @param behavior The new MixingBehavior of the Channel observer.
-     */
-    void onFocusChanged(FocusState focusState, MixingBehavior behavior) override {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        m_focusState = focusState;
-        m_focusChangeOccurred = true;
-        m_focusChangedCV.notify_one();
-    }
-
-    /**
-     * Waits for the ChannelObserverInterface##onFocusChanged() callback.
-     *
-     * @param timeout The amount of time to wait for the callback.
-     * @param focusChanged An output parameter that notifies the caller whether a callback occurred.
-     * @return Returns @c true if the callback occured within the timeout period and @c false otherwise.
-     */
-    FocusState waitForFocusChange(std::chrono::milliseconds timeout, bool* focusChanged) {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        bool success = m_focusChangedCV.wait_for(lock, timeout, [this]() { return m_focusChangeOccurred; });
-
-        if (!success) {
-            *focusChanged = false;
-        } else {
-            m_focusChangeOccurred = false;
-            *focusChanged = true;
-        }
-        return m_focusState;
-    }
-
-private:
-    /// The focus state of the observer.
-    FocusState m_focusState;
-
-    /// A lock to guard against focus state changes.
-    std::mutex m_mutex;
-
-    /// A condition variable to wait for focus changes.
-    std::condition_variable m_focusChangedCV;
-
-    /// A boolean flag so that we can re-use the observer even after a callback has occurred.
-    bool m_focusChangeOccurred;
-};
-
-class holdToTalkButton {
-public:
-    bool startRecognizing(std::shared_ptr<AudioInputProcessor> aip, std::shared_ptr<AudioProvider> audioProvider) {
-        return aip->recognize(*audioProvider, Initiator::PRESS_AND_HOLD).get();
-    }
-
-    bool stopRecognizing(std::shared_ptr<AudioInputProcessor> aip) {
-        return aip->stopCapture().get();
-    }
-};
-
-class AlertsTest : public ::testing::Test {
-protected:
-    virtual void SetUp() override {
-        m_context = ACLTestContext::create(g_configPath);
-        ASSERT_TRUE(m_context);
-
-        m_exceptionEncounteredSender = std::make_shared<TestExceptionEncounteredSender>();
-        m_metricRecorder = std::make_shared<NiceMock<avsCommon::utils::metrics::test::MockMetricRecorder>>();
-        m_dialogUXStateAggregator = std::make_shared<avsCommon::avs::DialogUXStateAggregator>();
-        m_shutdownNotifier = std::make_shared<acsdkShutdownManager::ShutdownNotifier>();
-
-        auto registrar = std::make_shared<NiceMock<MockEndpointCapabilitiesRegistrar>>();
-        m_endpointCapabilitiesRegistrar =
-            Annotated<DefaultEndpointAnnotation, EndpointCapabilitiesRegistrarInterface>(registrar);
-        EXPECT_CALL(
-            *(registrar.get()),
-            withCapability(A<const std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface>&>(), _))
-            .WillRepeatedly(ReturnRef(
-                *std::make_shared<avsCommon::sdkInterfaces::endpoints::test::MockEndpointCapabilitiesRegistrar>()));
-
-        m_directiveSequencer = DirectiveSequencer::create(m_exceptionEncounteredSender, m_metricRecorder);
-        m_messageInterpreter = std::make_shared<MessageInterpreter>(
-            m_exceptionEncounteredSender, m_directiveSequencer, m_context->getAttachmentManager(), m_metricRecorder);
-
-        // Set up connection and connect
-        m_avsConnectionManager = std::make_shared<TestMessageSender>(
-            m_context->getMessageRouter(), false, m_context->getConnectionStatusObserver(), m_messageInterpreter);
-        ASSERT_TRUE(m_avsConnectionManager);
-
-        m_focusManager = std::make_shared<FocusManager>(FocusManager::getDefaultAudioChannels());
-        std::shared_ptr<avsCommon::sdkInterfaces::test::MockSpeakerManager> mockSpeakerManager =
-            std::make_shared<avsCommon::sdkInterfaces::test::MockSpeakerManager>();
-        ON_CALL(*(mockSpeakerManager.get()), getSpeakerSettings(testing::_, testing::_))
-            .WillByDefault(testing::Invoke([](avsCommon::sdkInterfaces::ChannelVolumeInterface::Type,
-                                              avsCommon::sdkInterfaces::SpeakerInterface::SpeakerSettings*) {
-                std::promise<bool> promise;
-                promise.set_value(true);
-                return promise.get_future();
-            }));
-        m_speakerManager = mockSpeakerManager;
-
-        m_testContentClient = std::make_shared<TestClient>();
-        ASSERT_TRUE(m_focusManager->acquireChannel(
-            FocusManager::CONTENT_CHANNEL_NAME, m_testContentClient, CONTENT_ACTIVITY_ID));
-        bool focusChanged = false;
-        ASSERT_EQ(
-            m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-        ASSERT_TRUE(focusChanged);
-
-        m_testDialogClient = std::make_shared<TestClient>();
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-        m_speakMediaPlayer =
-            MediaPlayer::create(std::make_shared<avsCommon::utils::libcurlUtils::HTTPContentFetcherFactory>());
-#else
-        m_speakMediaPlayer = std::make_shared<TestMediaPlayer>();
-#endif
-
-        m_compatibleAudioFormat.sampleRateHz = COMPATIBLE_SAMPLE_RATE;
-        m_compatibleAudioFormat.sampleSizeInBits = COMPATIBLE_SAMPLE_SIZE_IN_BITS;
-        m_compatibleAudioFormat.numChannels = COMPATIBLE_NUM_CHANNELS;
-        m_compatibleAudioFormat.endianness = COMPATIBLE_ENDIANNESS;
-        m_compatibleAudioFormat.encoding = COMPATIBLE_ENCODING;
-
-        m_mockAlarmVolumeRampSetting =
-            std::make_shared<MockSetting<types::AlarmVolumeRampTypes>>(types::getAlarmVolumeRampDefault());
-        m_mockWakeWordConfirmationSetting =
-            std::make_shared<MockSetting<WakeWordConfirmationSettingType>>(getWakeWordConfirmationDefault());
-        m_mockSpeechConfirmationSetting =
-            std::make_shared<MockSetting<SpeechConfirmationSettingType>>(getSpeechConfirmationDefault());
-
-        size_t nWords = 1024 * 1024;
-        size_t wordSize = 2;
-        size_t maxReaders = 3;
-        size_t bufferSize = AudioInputStream::calculateBufferSize(nWords, wordSize, maxReaders);
-
-        auto m_Buffer = std::make_shared<avsCommon::avs::AudioInputStream::Buffer>(bufferSize);
-        auto m_Sds = avsCommon::avs::AudioInputStream::create(m_Buffer, wordSize, maxReaders);
-        ASSERT_NE(nullptr, m_Sds);
-        m_AudioBuffer = std::move(m_Sds);
-        m_AudioBufferWriter =
-            m_AudioBuffer->createWriter(avsCommon::avs::AudioInputStream::Writer::Policy::NONBLOCKABLE);
-        ASSERT_NE(nullptr, m_AudioBufferWriter);
-
-        // Set up hold to talk button.
-        bool alwaysReadable = true;
-        bool canOverride = true;
-        bool canBeOverridden = true;
-        m_HoldToTalkAudioProvider = std::make_shared<AudioProvider>(
-            m_AudioBuffer,
-            m_compatibleAudioFormat,
-            ASRProfile::CLOSE_TALK,
-            !alwaysReadable,
-            canOverride,
-            !canBeOverridden);
-
-        m_holdToTalkButton = std::make_shared<holdToTalkButton>();
-
-        m_userInactivityMonitor = UserInactivityMonitor::create(m_avsConnectionManager, m_exceptionEncounteredSender);
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-        auto systemSoundMediaPlayer =
-            MediaPlayer::create(std::make_shared<avsCommon::utils::libcurlUtils::HTTPContentFetcherFactory>());
-#else
-        auto systemSoundMediaPlayer = std::make_shared<TestMediaPlayer>();
-#endif
-
-        m_systemSoundPlayer = applicationUtilities::systemSoundPlayer::SystemSoundPlayer::create(
-            systemSoundMediaPlayer,
-            std::make_shared<applicationUtilities::resources::audio::SystemSoundAudioFactory>());
-
-        m_customerDataManager = registrationManager::CustomerDataManagerFactory::createCustomerDataManagerInterface();
-
-        DeviceSettingManagerSettingConfigurations configurations;
-        m_deviceSettingsManager =
-            std::make_shared<settings::DeviceSettingsManager>(m_customerDataManager, configurations);
-
-        m_AudioInputProcessor = AudioInputProcessor::create(
-            m_directiveSequencer,
-            m_avsConnectionManager,
-            m_context->getContextManager(),
-            m_focusManager,
-            m_dialogUXStateAggregator,
-            m_exceptionEncounteredSender,
-            m_userInactivityMonitor,
-            m_systemSoundPlayer,
-            std::make_shared<::testing::NiceMock<sdkInterfaces::test::MockLocaleAssetsManager>>(),
-            m_mockWakeWordConfirmationSetting,
-            m_mockSpeechConfirmationSetting,
-            std::make_shared<avsCommon::avs::CapabilityChangeNotifier>(),
-            nullptr,
-            nullptr,
-            AudioProvider::null(),
-            nullptr,
-            m_metricRecorder);
-        ASSERT_NE(nullptr, m_AudioInputProcessor);
-        m_AudioInputProcessor->addObserver(m_dialogUXStateAggregator);
-
-        // Create and register the SpeechSynthesizer.
-        m_speechSynthesizer = SpeechSynthesizer::create(
-            m_speakMediaPlayer,
-            m_avsConnectionManager,
-            m_focusManager,
-            m_context->getContextManager(),
-            m_exceptionEncounteredSender,
-            m_metricRecorder,
-            m_dialogUXStateAggregator);
-        ASSERT_NE(nullptr, m_speechSynthesizer);
-        m_directiveSequencer->addDirectiveHandler(m_speechSynthesizer);
-        m_speechSynthesizerObserver = std::make_shared<TestSpeechSynthesizerObserver>();
-        m_speechSynthesizer->addObserver(m_speechSynthesizerObserver);
-        m_speechSynthesizer->addObserver(m_dialogUXStateAggregator);
-
-        m_interactionModelNotifier = InteractionModelNotifier::createInteractionModelNotifierInterface();
-        m_interactionModelCA = InteractionModelCapabilityAgent::create(
-            m_directiveSequencer,
-            m_exceptionEncounteredSender,
-            m_interactionModelNotifier,
-            m_endpointCapabilitiesRegistrar);
-        ASSERT_NE(nullptr, m_interactionModelCA);
-        ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(m_interactionModelCA));
-        m_interactionModelNotifier->addObserver(m_dialogUXStateAggregator);
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-        m_rendererMediaPlayer = MediaPlayer::create(nullptr);
-#else
-        m_rendererMediaPlayer = std::make_shared<TestMediaPlayer>();
-#endif
-        m_alertRenderer = renderer::Renderer::create(m_rendererMediaPlayer, nullptr);
-
-        auto alertsAudioFactory = std::make_shared<applicationUtilities::resources::audio::AlertsAudioFactory>();
-
-        m_alertStorage = acsdkAlerts::storage::SQLiteAlertStorage::create(
-            avsCommon::utils::configuration::ConfigurationNode::getRoot(), alertsAudioFactory, m_metricRecorder);
-
-        m_alertObserver = std::make_shared<TestAlertObserver>();
-
-        auto messageStorage =
-            SQLiteMessageStorage::create(avsCommon::utils::configuration::ConfigurationNode::getRoot());
-
-        m_certifiedSender = CertifiedSender::create(
-            m_avsConnectionManager,
-            m_avsConnectionManager->getConnectionManager(),
-            std::move(messageStorage),
-            m_customerDataManager);
-
-        m_alertsAgent = AlertsCapabilityAgent::create(
-            m_avsConnectionManager,
-            m_avsConnectionManager->getConnectionManager(),
-            m_certifiedSender,
-            m_focusManager,
-            m_speakerManager,
-            m_context->getContextManager(),
-            m_exceptionEncounteredSender,
-            m_alertStorage,
-            alertsAudioFactory,
-            m_alertRenderer,
-            m_customerDataManager,
-            m_mockAlarmVolumeRampSetting,
-            m_deviceSettingsManager,
-            m_metricRecorder);
-        ASSERT_NE(m_alertsAgent, nullptr);
-        m_alertsAgent->addObserver(m_alertObserver);
-        m_alertsAgent->onLocalStop();
-        m_alertsAgent->removeAllAlerts();
-        m_directiveSequencer->addDirectiveHandler(m_alertsAgent);
-
-        m_avsConnectionManager->addConnectionStatusObserver(m_alertsAgent);
-
-        connect();
-    }
-
-    void TearDown() override {
-        disconnect();
-        // Note that these nullptr checks are needed to avoid segaults if @c SetUp() failed.
-        if (m_AudioInputProcessor) {
-            m_AudioInputProcessor->shutdown();
-        }
-        if (m_directiveSequencer) {
-            m_directiveSequencer->shutdown();
-        }
-        if (m_speechSynthesizer) {
-            m_speechSynthesizer->shutdown();
-        }
-        if (m_alertsAgent) {
-            m_alertsAgent->onLocalStop();
-            m_alertsAgent->removeAllAlerts();
-            m_alertsAgent->shutdown();
-        }
-        if (m_certifiedSender) {
-            m_certifiedSender->shutdown();
-        }
-        if (m_avsConnectionManager) {
-            m_avsConnectionManager->shutdown();
-        }
-        m_context.reset();
-#ifdef GSTREAMER_MEDIA_PLAYER
-        if (m_speakMediaPlayer) {
-            m_speakMediaPlayer->shutdown();
-        }
-        if (m_rendererMediaPlayer) {
-            m_rendererMediaPlayer->shutdown();
-        }
-#endif
-        if (m_userInactivityMonitor) {
-            m_userInactivityMonitor->shutdown();
-        }
-    }
-
-    /**
-     * Connect to AVS.
-     */
-    void connect() {
-        m_avsConnectionManager->enable();
-        m_context->waitForConnected();
-    }
-
-    /**
-     * Disconnect from AVS.
-     */
-    void disconnect() {
-        if (m_avsConnectionManager) {
-            m_avsConnectionManager->disable();
-            m_context->waitForDisconnected();
-        }
-    }
-
-    std::string getSentEventName(TestMessageSender::SendParams sendParams) {
-        std::string eventString;
-        std::string eventHeader;
-        std::string eventName;
-        jsonUtils::retrieveValue(sendParams.request->getJsonContent(), JSON_MESSAGE_EVENT_KEY, &eventString);
-        jsonUtils::retrieveValue(eventString, JSON_MESSAGE_HEADER_KEY, &eventHeader);
-        jsonUtils::retrieveValue(eventHeader, JSON_MESSAGE_NAME_KEY, &eventName);
-        return eventName;
-    }
-
-    bool checkSentEventName(TestMessageSender::SendParams sendParams, std::string expectedName) {
-        if (TestMessageSender::SendParams::Type::SEND == sendParams.type) {
-            std::string eventName;
-            eventName = getSentEventName(sendParams);
-            return eventName == expectedName;
-        }
-        return false;
-    }
-
-    std::vector<int16_t> readAudioFromFile(const std::string& fileName, bool* errorOccurred) {
-        const int RIFF_HEADER_SIZE = 44;
-
-        std::ifstream inputFile(fileName.c_str(), std::ifstream::binary);
-        if (!inputFile.good()) {
-            std::cout << "Couldn't open audio file!" << std::endl;
-            if (errorOccurred) {
-                *errorOccurred = true;
-            }
-            return {};
-        }
-        inputFile.seekg(0, std::ios::end);
-        int fileLengthInBytes = inputFile.tellg();
-        if (fileLengthInBytes <= RIFF_HEADER_SIZE) {
-            std::cout << "File should be larger than 44 bytes, which is the size of the RIFF header" << std::endl;
-            if (errorOccurred) {
-                *errorOccurred = true;
-            }
-            return {};
-        }
-
-        inputFile.seekg(RIFF_HEADER_SIZE, std::ios::beg);
-
-        int numSamples = (fileLengthInBytes - RIFF_HEADER_SIZE) / 2;
-
-        std::vector<int16_t> retVal(numSamples, 0);
-
-        inputFile.read((char*)&retVal[0], numSamples * 2);
-
-        if (inputFile.gcount() != numSamples * 2) {
-            std::cout << "Error reading audio file" << std::endl;
-            if (errorOccurred) {
-                *errorOccurred = true;
-            }
-            return {};
-        }
-
-        inputFile.close();
-        if (errorOccurred) {
-            *errorOccurred = false;
-        }
-        return retVal;
-    }
-
-    void sendAudioFileAsRecognize(std::string audioFile) {
-        // Signal to the AIP to start recognizing.
-        ASSERT_NE(nullptr, m_HoldToTalkAudioProvider);
-        ASSERT_TRUE(m_holdToTalkButton->startRecognizing(m_AudioInputProcessor, m_HoldToTalkAudioProvider));
-
-        // Put audio onto the SDS saying "Tell me a joke".
-        bool error = false;
-        std::string file = g_inputPath + audioFile;
-        std::vector<int16_t> audioData = readAudioFromFile(file, &error);
-        ASSERT_FALSE(error);
-        ASSERT_FALSE(audioData.empty());
-        m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-        // Stop holding the button.
-        ASSERT_TRUE(m_holdToTalkButton->stopRecognizing(m_AudioInputProcessor));
-    }
-
-    /// Context for running ACL based tests.
-    std::unique_ptr<ACLTestContext> m_context;
-
-    std::shared_ptr<TestMessageSender> m_avsConnectionManager;
-    std::shared_ptr<CertifiedSender> m_certifiedSender;
-    std::shared_ptr<TestExceptionEncounteredSender> m_exceptionEncounteredSender;
-    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
-    std::shared_ptr<TestDirectiveHandler> m_directiveHandler;
-    std::shared_ptr<DirectiveSequencerInterface> m_directiveSequencer;
-    std::shared_ptr<MessageInterpreter> m_messageInterpreter;
-    std::shared_ptr<FocusManager> m_focusManager;
-    std::shared_ptr<SpeakerManagerInterface> m_speakerManager;
-    std::shared_ptr<TestClient> m_testContentClient;
-    std::shared_ptr<TestClient> m_testDialogClient;
-    std::shared_ptr<TestAlertObserver> m_AlertsAgentObserver;
-    std::shared_ptr<SpeechSynthesizer> m_speechSynthesizer;
-    std::shared_ptr<acsdkInteractionModelInterfaces::InteractionModelNotifierInterface> m_interactionModelNotifier;
-    std::shared_ptr<InteractionModelCapabilityAgent> m_interactionModelCA;
-    std::shared_ptr<AlertsCapabilityAgent> m_alertsAgent;
-    std::shared_ptr<TestSpeechSynthesizerObserver> m_speechSynthesizerObserver;
-    std::shared_ptr<acsdkAlerts::storage::SQLiteAlertStorage> m_alertStorage;
-    std::shared_ptr<MockSetting<types::AlarmVolumeRampTypes>> m_mockAlarmVolumeRampSetting;
-    std::shared_ptr<MockSetting<WakeWordConfirmationSettingType>> m_mockWakeWordConfirmationSetting;
-    std::shared_ptr<MockSetting<SpeechConfirmationSettingType>> m_mockSpeechConfirmationSetting;
-    std::shared_ptr<renderer::RendererInterface> m_alertRenderer;
-    std::shared_ptr<TestAlertObserver> m_alertObserver;
-    std::shared_ptr<holdToTalkButton> m_holdToTalkButton;
-    std::shared_ptr<AudioProvider> m_HoldToTalkAudioProvider;
-    avsCommon::utils::AudioFormat m_compatibleAudioFormat;
-    std::unique_ptr<AudioInputStream::Writer> m_AudioBufferWriter;
-    std::shared_ptr<AudioInputStream> m_AudioBuffer;
-    std::shared_ptr<AudioInputProcessor> m_AudioInputProcessor;
-    std::shared_ptr<UserInactivityMonitor> m_userInactivityMonitor;
-    std::shared_ptr<applicationUtilities::systemSoundPlayer::SystemSoundPlayer> m_systemSoundPlayer;
-    std::shared_ptr<settings::DeviceSettingsManager> m_deviceSettingsManager;
-    std::shared_ptr<registrationManager::CustomerDataManagerInterface> m_customerDataManager;
-    std::shared_ptr<acsdkShutdownManager::ShutdownNotifier> m_shutdownNotifier;
-    Annotated<DefaultEndpointAnnotation, EndpointCapabilitiesRegistrarInterface> m_endpointCapabilitiesRegistrar;
-
-    FocusState m_focusState;
-    std::mutex m_mutex;
-    std::condition_variable m_focusChangedCV;
-    bool m_focusChangeOccurred;
-    std::shared_ptr<avsCommon::avs::DialogUXStateAggregator> m_dialogUXStateAggregator;
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-    std::shared_ptr<MediaPlayer> m_speakMediaPlayer;
-    std::shared_ptr<MediaPlayer> m_rendererMediaPlayer;
-#else
-    std::shared_ptr<TestMediaPlayer> m_speakMediaPlayer;
-    std::shared_ptr<TestMediaPlayer> m_rendererMediaPlayer;
-#endif
-};
-
-/**
- * Test when one timer is stopped locally
- *
- * Set a 5 second timer, ensure it goes off, then use local stop and make sure the timer is stopped.
- */
-TEST_F(AlertsTest, DISABLED_test_handleOneTimerWithLocalStop) {
-    // Write audio to SDS saying "Set a timer for 5 seconds"
-    sendAudioFileAsRecognize(RECOGNIZE_TIMER_AUDIO_FILE_NAME);
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // Speech is handled.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // SetAlertSucceeded Event is sent
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_SUCCEEDED));
-
-    ASSERT_EQ(m_alertObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION).state, AlertObserverInterface::State::READY);
-
-    // AlertStarted Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STARTED));
-
-    ASSERT_EQ(m_alertObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION).state, AlertObserverInterface::State::STARTED);
-
-    // The test channel client has been notified the content channel has been backgrounded.
-    bool focusChanged = false;
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    // Locally stop the alarm.
-    m_alertsAgent->onLocalStop();
-
-    ASSERT_EQ(m_alertObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION).state, AlertObserverInterface::State::STOPPED);
-
-    // AlertStopped Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STOPPED));
-
-    // Low priority Test client gets back permission to the test channel
-    EXPECT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    EXPECT_TRUE(focusChanged);
-}
-
-/**
- * Test when one timer is stopped verbally
- *
- * Set two second timer, ensure they go off, then stop both timers.
- */
-TEST_F(AlertsTest, DISABLED_test_handleMultipleTimersWithLocalStop) {
-    // Write audio to SDS saying "Set a timer for 15 seconds".
-    sendAudioFileAsRecognize(RECOGNIZE_VERY_LONG_TIMER_AUDIO_FILE_NAME);
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // The test channel client has been notified the content channel has been backgrounded.
-    bool focusChanged = false;
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    // Speech is handled.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    // Write audio to SDS saying "Set a timer for 5 seconds".
-    sendAudioFileAsRecognize(RECOGNIZE_TIMER_AUDIO_FILE_NAME);
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    // SetAlertSucceeded Event is sent
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_SUCCEEDED));
-
-    // Speech is handled.
-    sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // SetAlertSucceeded Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_SUCCEEDED));
-
-    // AlertStarted Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STARTED));
-
-    // The test channel client has been notified the content channel has been backgrounded.
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    std::this_thread::sleep_for(std::chrono::milliseconds(2000));
-
-    // Locally stop the alarm.
-    m_focusManager->stopForegroundActivity();
-
-    // AlertStopped Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STOPPED));
-
-    // AlertStarted Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STARTED));
-
-    // The test channel client has been notified the content channel has been backgrounded.
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    std::this_thread::sleep_for(std::chrono::milliseconds(600));
-
-    // Locally stop the second alarm.
-    m_focusManager->stopForegroundActivity();
-
-    // AlertStopped Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STOPPED));
-
-    // Low priority Test client gets back permission to the test channel.
-    EXPECT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    EXPECT_TRUE(focusChanged);
-}
-
-/**
- * Test when the Alerts channel is acqired by a different client when an alert is active
- *
- * Set a 5 second timer, ensure it goes off, then have a test client acquire the Alerts channel. Ensure that the alert
- * is stopped.
- */
-TEST_F(AlertsTest, DISABLED_test_stealChannelFromActiveAlert) {
-    // Write audio to SDS saying "Set a timer for 5 seconds"
-    sendAudioFileAsRecognize(RECOGNIZE_TIMER_AUDIO_FILE_NAME);
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // Speech is handled.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // SetAlertSucceeded Event is sent
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_SUCCEEDED));
-
-    // AlertStarted Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STARTED));
-    ASSERT_EQ(m_alertObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION).state, AlertObserverInterface::State::READY);
-    ASSERT_EQ(m_alertObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION).state, AlertObserverInterface::State::STARTED);
-
-    // The test channel client has been notified the content channel has been backgrounded.
-    bool focusChanged = false;
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    // Steal the alerts channel.
-    ASSERT_TRUE(
-        m_focusManager->acquireChannel(FocusManager::ALERT_CHANNEL_NAME, m_testDialogClient, ALERTS_ACTIVITY_ID));
-
-    // AlertStopped Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STOPPED));
-
-    ASSERT_EQ(m_alertObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION).state, AlertObserverInterface::State::STOPPED);
-
-    // Release the alerts channel.
-    m_focusManager->releaseChannel(FocusManager::ALERT_CHANNEL_NAME, m_testDialogClient);
-
-    // Low priority Test client gets back permission to the test channel.
-    EXPECT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    EXPECT_TRUE(focusChanged);
-}
-
-/**
- * Test when a disconnect and reconnect happens while an alert is active
- *
- * Set a 5 second timer, then call disconnect, wait for the alert to become active and reconnect.
- * Locally stop the alert and ensure AlertStopped is sent.
- */
-TEST_F(AlertsTest, test_disconnectAndReconnectBeforeLocalStop) {
-    // Write audio to SDS saying "Set a timer for 5 seconds"
-    sendAudioFileAsRecognize(RECOGNIZE_TIMER_AUDIO_FILE_NAME);
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // Speech is handled.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // SetAlertSucceeded Event is sent
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_SUCCEEDED));
-
-    // allow time for the certified sender to send the message ok.
-    std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-
-    disconnect();
-
-    // Wait for the alarm to go off.
-    std::this_thread::sleep_for(std::chrono::milliseconds(6000));
-
-    // The test channel client has been notified the content channel has been backgrounded.
-    bool focusChanged = false;
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    connect();
-
-    // allow time for the other components to become aware of the connection status change.
-    std::this_thread::sleep_for(std::chrono::milliseconds(2000));
-
-    // Locally stop the alarm.
-    m_alertsAgent->onLocalStop();
-
-    // AlertStarted Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STARTED));
-    // AlertStopped Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STOPPED));
-
-    // Low priority Test client gets back permission to the test channel
-    EXPECT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    EXPECT_TRUE(focusChanged);
-
-    m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged);
-    ASSERT_FALSE(focusChanged);
-}
-
-/**
- * Test when a disconnect and reconnect happens before  an alert is active
- *
- * Set a 5 second timer, then call disconnect then reconnect. Once the alert is active, locally stop the alert
- * and ensure AlertStopped is sent.
- */
-TEST_F(AlertsTest, test_disconnectAndReconnect) {
-    // Write audio to SDS saying "Set a timer for 5 seconds"
-    sendAudioFileAsRecognize(RECOGNIZE_TIMER_AUDIO_FILE_NAME);
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // Speech is handled.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // SetAlertSucceeded Event is sent
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_SUCCEEDED));
-    disconnect();
-
-    // Wait for the alarm to go off.
-    std::this_thread::sleep_for(std::chrono::milliseconds(6000));
-
-    // The test channel client has been notified the content channel has been backgrounded.
-    bool focusChanged = false;
-
-    EXPECT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    EXPECT_TRUE(focusChanged);
-
-    // Locally stop the alarm.
-    m_alertsAgent->onLocalStop();
-
-    connect();
-
-    // AlertStarted Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STARTED));
-
-    // AlertStopped Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STOPPED));
-
-    // Low priority Test client gets back permission to the test channel
-    EXPECT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    EXPECT_TRUE(focusChanged);
-}
-
-/**
- * Test when all alerts are cleared from storage before an alert is active
- *
- * Set a 5 second timer, then call removeAllAlerts. Wait and ensure that the alert does not become active and no
- * events are sent for it.
- */
-TEST_F(AlertsTest, test_removeAllAlertsBeforeAlertIsActive) {
-    // Write audio to SDS saying "Set a timer for 5 seconds"
-    sendAudioFileAsRecognize(RECOGNIZE_TIMER_AUDIO_FILE_NAME);
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // Speech is handled.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    bool focusChanged = false;
-    FocusState state;
-    state = m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged);
-    ASSERT_TRUE(focusChanged);
-    ASSERT_EQ(state, FocusState::BACKGROUND);
-
-    state = m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged);
-    ASSERT_TRUE(focusChanged);
-    ASSERT_EQ(state, FocusState::FOREGROUND);
-
-    // SetAlertSucceeded Event is sent
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_SUCCEEDED));
-
-    // Remove all alerts.
-    m_alertsAgent->removeAllAlerts();
-
-    // AlertStarted Event is not sent.
-    sendParams = m_avsConnectionManager->waitForNext(SHORT_TIMEOUT_DURATION);
-    ASSERT_FALSE(checkSentEventName(sendParams, NAME_ALERT_STARTED));
-
-    // AlertStopped Event is not sent.
-    sendParams = m_avsConnectionManager->waitForNext(SHORT_TIMEOUT_DURATION);
-    ASSERT_FALSE(checkSentEventName(sendParams, NAME_ALERT_STOPPED));
-
-    // Focus has not changed.
-    focusChanged = false;
-    state = m_testContentClient->waitForFocusChange(SHORT_TIMEOUT_DURATION, &focusChanged);
-    ASSERT_FALSE(focusChanged);
-    ASSERT_EQ(state, FocusState::FOREGROUND);
-}
-
-/**
- * Test when an alert is canceled before it is due
- *
- * Set a 10 second timer, then send audio of "Cancel the timer" as a recognize event. Ensure the timer does not go off
- * and the DeleteAlertSucceeded event is sent.
- */
-TEST_F(AlertsTest, DISABLED_test_cancelAlertBeforeItIsActive) {
-    // Write audio to SDS saying "Set a timer for 10 seconds"
-    sendAudioFileAsRecognize(RECOGNIZE_LONG_TIMER_AUDIO_FILE_NAME);
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // Speech is handled.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // SetAlertSucceeded Event is sent
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_SUCCEEDED));
-
-    // Write audio to SDS sying "Cancel the timer"
-    sendAudioFileAsRecognize(RECOGNIZE_CANCEL_TIMER_AUDIO_FILE_NAME);
-
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // DeleteAlertSucceeded Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_DELETE_ALERT_SUCCEEDED));
-
-    // Speech is handled.
-    sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // Low priority Test client gets back permission to the test channel.
-    bool focusChanged = false;
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-
-    focusChanged = false;
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-
-    // AlertStarted Event is not sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_FALSE(checkSentEventName(sendParams, NAME_ALERT_STARTED));
-}
-
-/**
- * Test when the storage is removed before an alert is set
- *
- * Close the storage before asking for a 5 second timer. SetAlertFailed and then DeleteAlertSucceeded events are then
- * sent. Deletion succeeds because missing alert is not treated as an error.
- */
-TEST_F(AlertsTest, test_removeStorageBeforeAlarmIsSet) {
-    m_alertStorage->close();
-
-    // Write audio to SDS saying "Set a timer for 5 seconds"
-    sendAudioFileAsRecognize(RECOGNIZE_LONG_TIMER_AUDIO_FILE_NAME);
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // Speech is handled.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    bool focusChanged = false;
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    // SetAlertFailed Event is sent
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_FAILED));
-
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    if (checkSentEventName(sendParams, NAME_SPEECH_STARTED)) {
-        sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        if (checkSentEventName(sendParams, NAME_SPEECH_FINISHED)) {
-            sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        }
-    }
-    // Missing alert is not treated as an error, DeleteAlertSucceeded is sent.
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_DELETE_ALERT_SUCCEEDED));
-
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    // Low priority Test client gets back permission to the test channel.
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    ASSERT_TRUE(focusChanged);
-}
-
-/**
- * Test when an alert is active and the user barges in and gets one speak in response
- *
- * Set a 5 second timer and wait until it is active. Send a recognize event asking for joke and see that the alert goes
- * into the background. When the speak is complete, the alert is foregrounded and can be locally stopped.
- *
- * Note: Disabling test as sometimes "tell me a joke" causes multiple speech started and speech finished events to
- *       be sent based on user config making this integration test unstable.
- */
-TEST_F(AlertsTest, DISABLED_testTimer_userShortUnrelatedBargeInOnActive) {
-    // Write audio to SDS saying "Set a timer for 5 seconds"
-    sendAudioFileAsRecognize(RECOGNIZE_TIMER_AUDIO_FILE_NAME);
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // Speech is handled.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // SetAlertSucceeded Event is sent
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_SUCCEEDED));
-
-    // AlertStarted Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STARTED));
-
-    // The test channel client has been notified the content channel has been backgrounded.
-    bool focusChanged = false;
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    // Write audio to SDS sying "Tell me a joke"
-    sendAudioFileAsRecognize(RECOGNIZE_JOKE_AUDIO_FILE_NAME);
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-
-    if (getSentEventName(sendParams) == NAME_ALERT_ENTERED_BACKGROUND) {
-        sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    } else {
-        ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-        sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_ENTERED_BACKGROUND));
-    }
-
-    // Speech is handled.
-    sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_ENTERED_FOREGROUND));
-
-    std::this_thread::sleep_for(std::chrono::milliseconds(600));
-
-    // Locally stop the alarm.
-    m_alertsAgent->onLocalStop();
-
-    // AlertStopped Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    EXPECT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STOPPED));
-
-    // Low priority Test client gets back permission to the test channel
-    EXPECT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    EXPECT_TRUE(focusChanged);
-}
-
-/**
- * Test when an alert is active and the user barges in and gets multiple speaks in response
- *
- * Set a 5 second timer and wait until it is active. Send a recognize event asking "what's up" and see that the alert
- * goes into the background. When all the speaks are complete, the alert is forgrounded and can be locally stopped.
- */
-TEST_F(AlertsTest, DISABLED_testTimer_UserLongUnrelatedBargeInOnActive) {
-    // Write audio to SDS saying "Set a timer for 5 seconds"
-    sendAudioFileAsRecognize(RECOGNIZE_TIMER_AUDIO_FILE_NAME);
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // Speech is handled.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // SetAlertSucceeded Event is sent
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_SUCCEEDED));
-
-    // Wait for the alarm to go off.
-    std::this_thread::sleep_for(std::chrono::milliseconds(6000));
-
-    // AlertStarted Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STARTED));
-
-    // The test channel client has been notified the content channel has been backgrounded.
-    bool focusChanged = false;
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    // Write audio to SDS sying "What's up"
-    sendAudioFileAsRecognize(RECOGNIZE_WHATS_UP_AUDIO_FILE_NAME);
-
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    if (getSentEventName(sendParams) == NAME_ALERT_ENTERED_BACKGROUND) {
-        sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        EXPECT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-    } else {
-        EXPECT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-        sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_ENTERED_BACKGROUND));
-    }
-
-    // Speech is handled.
-    sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-
-    sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_FINISHED));
-    sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_ALERT_ENTERED_FOREGROUND));
-    sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_ALERT_ENTERED_BACKGROUND));
-
-    while (checkSentEventName(sendStartedParams, NAME_ALERT_ENTERED_BACKGROUND)) {
-        sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-        sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_FINISHED));
-        sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_ALERT_ENTERED_FOREGROUND));
-        sendStartedParams = m_avsConnectionManager->waitForNext(SHORT_TIMEOUT_DURATION);
-    }
-
-    std::this_thread::sleep_for(std::chrono::milliseconds(600));
-
-    // Locally stop the alarm.
-    m_alertsAgent->onLocalStop();
-
-    sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_ALERT_STOPPED));
-
-    // Low priority Test client gets back permission to the test channel
-    EXPECT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    EXPECT_TRUE(focusChanged);
-}
-
-/**
- * Test when the user is speaking to Alexa and an alert becomes active
- *
- * Set a 5 second timer then start a recognize event using a hold to talk initiator but do not call stopCapture until
- * the alert has become active in the background. Once the alert is active, call stopCapture and see that is is in the
- * foreground before locally stopping it.
- */
-TEST_F(AlertsTest, DISABLED_test_userSpeakingWhenAlertShouldBeActive) {
-    // Write audio to SDS saying "Set a timer for 10 seconds"
-    sendAudioFileAsRecognize(RECOGNIZE_LONG_TIMER_AUDIO_FILE_NAME);
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // Speech is handled.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // SetAlertSucceeded Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_SUCCEEDED));
-
-    // Signal to the AIP to start recognizing.
-    ASSERT_NE(nullptr, m_HoldToTalkAudioProvider);
-    ASSERT_TRUE(m_holdToTalkButton->startRecognizing(m_AudioInputProcessor, m_HoldToTalkAudioProvider));
-
-    // Put audio onto the SDS saying "Tell me a joke".
-    bool error = false;
-    std::string file = g_inputPath + RECOGNIZE_WEATHER_AUDIO_FILE_NAME;
-    std::vector<int16_t> audioData = readAudioFromFile(file, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // The test channel client has been notified the content channel has been backgrounded.
-    bool focusChanged = false;
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    // AlertStarted Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STARTED));
-
-    // Stop holding the button.
-    ASSERT_TRUE(m_holdToTalkButton->stopRecognizing(m_AudioInputProcessor));
-
-    // Speech is handled.
-    sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    if (getSentEventName(sendParams) == NAME_SPEECH_FINISHED) {
-        ASSERT_TRUE(checkSentEventName(sendParams, NAME_SPEECH_FINISHED));
-        sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_ENTERED_FOREGROUND));
-    } else {
-        ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_ENTERED_FOREGROUND));
-        sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_TRUE(checkSentEventName(sendParams, NAME_SPEECH_FINISHED));
-    }
-
-    std::this_thread::sleep_for(std::chrono::milliseconds(800));
-
-    // Locally stop the alarm.
-    m_alertsAgent->onLocalStop();
-
-    // Low priority Test client gets back permission to the test channel
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    ASSERT_TRUE(focusChanged);
-}
-
-TEST_F(AlertsTest, DISABLED_test_handleOneTimerWithVocalStop) {
-    // Write audio to SDS saying "Set a timer for 5 seconds"
-    sendAudioFileAsRecognize(RECOGNIZE_TIMER_AUDIO_FILE_NAME);
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-
-    // SpeechFinished is sent here.
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // SetAlertSucceeded Event is sent
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_SET_ALERT_SUCCEEDED));
-
-    // AlertStarted Event is sent.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STARTED));
-
-    ASSERT_EQ(
-        m_alertObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION).state,
-        AlertObserverInterface::State::SCHEDULED_FOR_LATER);
-    ASSERT_EQ(m_alertObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION).state, AlertObserverInterface::State::READY);
-    ASSERT_EQ(m_alertObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION).state, AlertObserverInterface::State::STARTED);
-
-    std::this_thread::sleep_for(std::chrono::milliseconds(2000));
-
-    // The test channel client has been notified the content channel has been backgrounded.
-    bool focusChanged = false;
-    ASSERT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::BACKGROUND);
-    ASSERT_TRUE(focusChanged);
-
-    // Write audio to SDS sying "Stop"
-    sendAudioFileAsRecognize(RECOGNIZE_STOP_AUDIO_FILE_NAME);
-
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    if (getSentEventName(sendParams) == NAME_ALERT_ENTERED_BACKGROUND) {
-        sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        EXPECT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-    } else {
-        EXPECT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-        sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_ENTERED_BACKGROUND));
-    }
-
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_DELETE_ALERT_SUCCEEDED));
-
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_ALERT_STOPPED));
-
-    ASSERT_EQ(
-        m_alertObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION).state,
-        AlertObserverInterface::State::FOCUS_ENTERED_BACKGROUND);
-    ASSERT_EQ(m_alertObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION).state, AlertObserverInterface::State::STOPPED);
-
-    // Low priority Test client gets back permission to the test channel
-    EXPECT_EQ(
-        m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged), FocusState::FOREGROUND);
-    EXPECT_TRUE(focusChanged);
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-int main(int argc, char** argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-    if (argc < 3) {
-        std::cerr << "USAGE: " << std::string(argv[0]) << " <path_to_AlexaClientSDKConfig.json> <path_to_inputs_folder>"
-                  << std::endl;
-        return 1;
-
-    } else {
-        alexaClientSDK::integration::test::g_configPath = std::string(argv[1]);
-        alexaClientSDK::integration::test::g_inputPath = std::string(argv[2]);
-        return RUN_ALL_TESTS();
-    }
-}
diff --git a/Integration/test/AlexaAuthorizationDelegateTest.cpp b/Integration/test/AlexaAuthorizationDelegateTest.cpp
deleted file mode 100644
index 3026e04751..0000000000
--- a/Integration/test/AlexaAuthorizationDelegateTest.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <chrono>
-#include <fstream>
-#include <sstream>
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include <CBLAuthDelegate/CBLAuthDelegate.h>
-#include <CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h>
-#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
-
-#include "Integration/AuthDelegateTestContext.h"
-#include "Integration/AuthObserver.h"
-#include "Integration/SDKTestContext.h"
-
-/// Path to the AlexaClientSDKConfig.json file (from command line arguments).
-static std::string g_configPath;
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace avsCommon::avs::initialization;
-using namespace avsCommon::utils::configuration;
-using namespace authorization::cblAuthDelegate;
-using namespace registrationManager;
-using namespace ::testing;
-
-/// Timeout in seconds for AuthDelegate to wait for LWA response.
-static const std::chrono::seconds TIME_OUT(60);
-
-/**
- * Define test fixture for AuthDelegate integration test.
- */
-class AlexaAuthorizationDelegateTest : public ::testing::Test {
-public:
-    /**
-     * Destructor
-     */
-    ~AlexaAuthorizationDelegateTest();
-};
-
-AlexaAuthorizationDelegateTest::~AlexaAuthorizationDelegateTest() {
-    AlexaClientSDKInit::uninitialize();
-}
-
-/**
- * Test AuthDelegate could get token refreshed with valid configurations
- *
- * If valid clientID, refreshToken, clientSecret are provided in the AuthDelegate.config file, then AuthDelegate should
- * be able to retrieve the valid refresh token (get authorized).
- */
-TEST_F(AlexaAuthorizationDelegateTest, test_refreshAuthToken) {
-    auto authDelegateContext = AuthDelegateTestContext::create(g_configPath);
-    ASSERT_TRUE(authDelegateContext);
-
-    auto authDelegate = authDelegateContext->getAuthDelegate();
-    ASSERT_TRUE(authDelegate);
-    auto authObserver = std::make_shared<AuthObserver>();
-    authDelegate->addAuthObserver(authObserver);
-
-    ASSERT_TRUE(authObserver->waitFor(AuthObserver::State::REFRESHED, TIME_OUT))
-        << "Refreshing the auth token timed out.";
-}
-
-/**
- * Test when sending invalid refresh token, CBLAuthDelegate notifies the observer of the error.
- *
- * If an invalid client_id is sent to @c LWA, a "InvalidValue" response will be sent back and we should
- * notify the observer of the unrecoverable error.
- */
-TEST_F(AlexaAuthorizationDelegateTest, test_invalidClientIdWithUnrecoverableError) {
-    auto authDelegateContext =
-        AuthDelegateTestContext::create(g_configPath, R"({ "deviceInfo" : { "clientId" : "InvalidClientId" } })");
-    ASSERT_TRUE(authDelegateContext);
-
-    auto authDelegate = authDelegateContext->getAuthDelegate();
-    ASSERT_TRUE(authDelegate);
-    auto authObserver = std::make_shared<AuthObserver>();
-    authDelegate->addAuthObserver(authObserver);
-
-    ASSERT_TRUE(authObserver->waitFor(AuthObserver::State::UNRECOVERABLE_ERROR, TIME_OUT))
-        << "Waiting for UNRECOVERABLE_ERROR timed out";
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-int main(int argc, char** argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-    if (argc < 2) {
-        std::cerr << "USAGE: " << std::string(argv[0]) << " <path to AlexaClientSDKConfig.json>" << std::endl;
-        return 1;
-    } else {
-        g_configPath = std::string(argv[1]);
-    }
-    return RUN_ALL_TESTS();
-}
diff --git a/Integration/test/AlexaCommunicationsLibraryTest.cpp b/Integration/test/AlexaCommunicationsLibraryTest.cpp
deleted file mode 100644
index 2665449df0..0000000000
--- a/Integration/test/AlexaCommunicationsLibraryTest.cpp
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/// @file AlexaCommunicationsLibraryTest.cpp
-
-#include <future>
-#include <fstream>
-#include <chrono>
-
-#include <gtest/gtest.h>
-
-#include <ACL/AVSConnectionManager.h>
-#include <AVSCommon/AVS/Attachment/AttachmentManager.h>
-#include <AVSCommon/AVS/Attachment/InProcessAttachment.h>
-#include <CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h>
-#include <ContextManager/ContextManager.h>
-
-#include "Integration/ACLTestContext.h"
-#include "Integration/ClientMessageHandler.h"
-#include "Integration/ConnectionStatusObserver.h"
-#include "Integration/ObservableMessageRequest.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace acl;
-using namespace avsCommon::avs;
-using namespace avsCommon::avs::attachment;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils::sds;
-using namespace registrationManager;
-
-/// This is a basic synchronize JSON message which may be used to initiate a connection with AVS.
-// clang-format off
-static const std::string SYNCHRONIZE_STATE_JSON =
-    "{"
-        "\"context\":[{"
-            "\"header\":{"
-                "\"name\":\"SpeechState\","
-                "\"namespace\":\"SpeechSynthesizer\""
-            "},"
-            "\"payload\":{"
-                "\"playerActivity\":\"FINISHED\","
-                "\"offsetInMilliseconds\":0,"
-                "\"token\":\"\""
-            "}"
-        "}],"
-        "\"event\":{"
-            "\"header\":{"
-                "\"messageId\":\"00000000-0000-0000-0000-000000000000\","
-                "\"name\":\"SynchronizeState\","
-                "\"namespace\":\"System\""
-            "},"
-            "\"payload\":{"
-            "}"
-        "}"
-    "}";
-// clang-format on
-
-/// This is a partial JSON string that should not be parseable.
-static const std::string BAD_SYNCHRONIZE_STATE_JSON = "{";
-
-/**
- * This string specifies a Recognize event using the specified profile.
- *
- * CLOSE_TALK performs end-of-speech detection on the client, so a stop-capture directive will not be received from AVS.
- * NEAR_FIELD performs end-of-speech detection in AVS, so a stop-capture directive will be received from AVS.
- */
-// clang-format off
-#define RECOGNIZE_EVENT_JSON(PROFILE)                             \
-    "{"                                                           \
-        "\"event\":{"                                             \
-            "\"payload\":{"                                       \
-                "\"format\":\"AUDIO_L16_RATE_16000_CHANNELS_1\"," \
-                "\"profile\":\"" #PROFILE "\""                    \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"dialogRequestId\":\"dialogRequestId123\","     \
-                "\"messageId\":\"messageId123\","                 \
-                "\"name\":\"Recognize\","                         \
-                "\"namespace\":\"SpeechRecognizer\""              \
-            "}"                                                   \
-        "},"                                                      \
-        "\"context\":[{"                                          \
-            "\"payload\":{"                                       \
-                "\"activeAlerts\":[],"                            \
-                "\"allAlerts\":[]"                                \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"name\":\"AlertsState\","                       \
-                "\"namespace\":\"Alerts\""                        \
-            "}"                                                   \
-        "},"                                                      \
-        "{"                                                       \
-            "\"payload\":{"                                       \
-                "\"playerActivity\":\"IDLE\","                    \
-                "\"offsetInMilliseconds\":0,"                     \
-                "\"token\":\"\""                                  \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"name\":\"PlaybackState\","                     \
-                "\"namespace\":\"AudioPlayer\""                   \
-            "}"                                                   \
-        "},"                                                      \
-        "{"                                                       \
-            "\"payload\":{"                                       \
-                "\"muted\":false,"                                \
-                "\"volume\":0"                                    \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"name\":\"VolumeState\","                       \
-                "\"namespace\":\"Speaker\""                       \
-            "}"                                                   \
-        "},"                                                      \
-        "{"                                                       \
-            "\"payload\":{"                                       \
-                "\"playerActivity\":\"FINISHED\","                \
-                "\"offsetInMilliseconds\":0,"                     \
-                "\"token\":\"\""                                  \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"name\":\"SpeechState\","                       \
-                "\"namespace\":\"SpeechSynthesizer\""             \
-            "}"                                                   \
-        "}]"                                                      \
-    "}"
-// clang-format on
-
-/// This string specifies a Recognize event using the CLOSE_TALK profile.
-static const std::string CT_RECOGNIZE_EVENT_JSON = RECOGNIZE_EVENT_JSON(CLOSE_TALK);
-/// This string specifies a Recognize event using the NEAR_FIELD profile.
-static const std::string NF_RECOGNIZE_EVENT_JSON = RECOGNIZE_EVENT_JSON(NEAR_FIELD);
-
-/// This string specifies an ExpectSpeechTimedOut event.
-// clang-format off
-static const std::string EXPECT_SPEECH_TIMED_OUT_EVENT_JSON =
-    "{"
-        "\"event\": {"
-            "\"header\": {"
-                "\"namespace\": \"SpeechRecognizer\","
-                "\"name\": \"ExpectSpeechTimedOut\","
-                "\"messageId\": \"messageId123\","
-            "},"
-            "\"payload\": {"
-            "}"
-        "}"
-    "}";
-// clang-format on
-
-/// This is a 16 bit 16 kHz little endian linear PCM audio file containing a recognized message for AVS
-static const std::string RECOGNIZE_AUDIO_FILE_NAME = "recognize_test.wav";
-/// This is a 16 bit 16 kHz little endian linear PCM audio file containing several seconds of silence
-static const std::string SILENCE_AUDIO_FILE_NAME = "silence_test.wav";
-
-/**
- * The value of MAX_THREADS is determined by the maximum number of streams we can have active at once which is defined
- * in HTTP2Connection.cpp as a constant MAX_STREAMS=10. Streams include events, the downchannel and ping.
- * Since we establish a downchannel when we connect, we can only have (MAX_STREAMS - 1) events sent at once.
- * Therefore, the value of MAX_THREADS = MAX_STREAMS -1.
- */
-static const int MAX_CONCURRENT_STREAMS = 9;
-
-/// Path to the AlexaClientSDKConfig.json file (from command line arguments).
-static std::string g_configPath;
-/// Path to resources (e.g. audio files) for tests (from command line arguments).
-static std::string g_inputPath;
-
-class AlexaCommunicationsLibraryTest : public ::testing::Test {
-public:
-    void SetUp() override {
-        m_context = ACLTestContext::create(g_configPath);
-        ASSERT_TRUE(m_context);
-
-        m_clientMessageHandler = std::make_shared<ClientMessageHandler>(m_context->getAttachmentManager());
-        m_avsConnectionManager = AVSConnectionManager::create(
-            m_context->getMessageRouter(), false, {m_context->getConnectionStatusObserver()}, {m_clientMessageHandler});
-        ASSERT_TRUE(m_avsConnectionManager);
-
-        connect();
-    }
-
-    void TearDown() override {
-        // Note nullptr checks needed to avoid segaults if @c SetUp() failed.
-        if (m_avsConnectionManager) {
-            disconnect();
-            m_avsConnectionManager->shutdown();
-        }
-        m_context.reset();
-    }
-
-    void connect() {
-        m_avsConnectionManager->enable();
-        m_context->waitForConnected();
-    }
-
-    void disconnect() {
-        if (m_avsConnectionManager) {
-            m_avsConnectionManager->disable();
-            m_context->waitForDisconnected();
-        }
-    }
-
-    /*
-     * Function to send an Event to AVS.
-     */
-    void sendEvent(
-        const std::string& jsonContent,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status expectedStatus,
-        std::chrono::seconds timeout,
-        std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> attachmentReader = nullptr) {
-        auto messageRequest = std::make_shared<ObservableMessageRequest>(jsonContent, attachmentReader);
-
-        m_avsConnectionManager->sendMessage(messageRequest);
-        ASSERT_TRUE(messageRequest->waitFor(expectedStatus, timeout));
-        ASSERT_TRUE(messageRequest->hasSendCompleted() || messageRequest->wasExceptionReceived());
-    }
-
-    /**
-     * Function to create an attachmentReader given a filename.
-     */
-    std::shared_ptr<InProcessAttachmentReader> createAttachmentReader(const std::string& fileName) {
-        // 1MB is large enough for our test audio samples.
-        const int mbBytes = 1024 * 1024;
-
-        // create an SDS with 1MB size, so we can write the entire audio file into it.
-        auto sdsBufferSize = InProcessSDS::calculateBufferSize(mbBytes);
-        auto sdsBuffer = std::make_shared<InProcessSDSTraits::Buffer>(sdsBufferSize);
-        std::shared_ptr<InProcessSDS> sds = InProcessSDS::create(sdsBuffer);
-
-        // open the file.
-        auto is = std::make_shared<std::ifstream>(fileName, std::ios::binary);
-        EXPECT_TRUE(is->is_open());
-
-        // read the data from the file into the SDS, via the local buffer.
-        std::vector<char> localBuffer(mbBytes);
-        auto attachmentWriter = InProcessAttachmentWriter::create(sds);
-        while (*is) {
-            // data -> local buffer
-            is->read(localBuffer.data(), mbBytes);
-            size_t numBytesRead = static_cast<size_t>(is->gcount());
-
-            // local buffer -> sds
-            AttachmentWriter::WriteStatus writeStatus = AttachmentWriter::WriteStatus::OK;
-            attachmentWriter->write(localBuffer.data(), numBytesRead, &writeStatus);
-
-            // confirm the SDS write operation went ok
-            bool writeStatusOk =
-                (AttachmentWriter::WriteStatus::OK == writeStatus ||
-                 AttachmentWriter::WriteStatus::CLOSED == writeStatus);
-            EXPECT_TRUE(writeStatusOk);
-        }
-
-        // closing the writer indicates to readers of the SDS that there is no more data that will be written.
-        attachmentWriter->close();
-
-        // create and return the reader.
-        std::shared_ptr<InProcessAttachmentReader> attachmentReader =
-            InProcessAttachmentReader::create(ReaderPolicy::NONBLOCKING, sds);
-        EXPECT_NE(attachmentReader, nullptr);
-
-        return attachmentReader;
-    }
-
-    /**
-     * Sends a SynchronizeState Event to AVS.
-     */
-    void sendSynchronizeStateEvent() {
-        sendEvent(
-            SYNCHRONIZE_STATE_JSON,
-            avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS_NO_CONTENT,
-            std::chrono::seconds(40));
-    }
-
-    /// Context for running ACL based tests.
-    std::unique_ptr<ACLTestContext> m_context;
-
-    std::shared_ptr<ClientMessageHandler> m_clientMessageHandler;
-    std::shared_ptr<AVSConnectionManager> m_avsConnectionManager;
-};
-
-/**
- * Test sending an Event to AVS.
- *
- * This test sends a SynchronizeState Event, which does not require an attachment, or receive a Directive in response.
- *
- * @see https://developer.amazon.com/public/solutions/alexa/alexa-voice-service/reference/system#synchronizestate
- */
-TEST_F(AlexaCommunicationsLibraryTest, test_sendEvent) {
-    sendEvent(
-        SYNCHRONIZE_STATE_JSON,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS_NO_CONTENT,
-        std::chrono::seconds(10));
-}
-
-/**
- * Function that tests the behavior of the ACL when an improperly formatted message is sent, expecting the server
- * to return a bad request status.
- */
-TEST_F(AlexaCommunicationsLibraryTest, test_sendInvalidEvent) {
-    sendEvent(
-        BAD_SYNCHRONIZE_STATE_JSON,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::BAD_REQUEST,
-        std::chrono::seconds(10));
-}
-
-/**
- * Test ability to send an event with attachments to Alexa Voice Service.
- *
- * This test sends a RecognizeAudio event, which requires an attachment of the audio stream.  In this case,
- * we send a pre-recorded audio file which asks Alexa to "tell me a joke".
- *
- * @see https://developer.amazon.com/public/solutions/alexa/alexa-voice-service/reference/speechrecognizer#recognize
- */
-TEST_F(AlexaCommunicationsLibraryTest, test_sendEventWithAttachment) {
-    auto attachmentReader = createAttachmentReader(g_inputPath + "/" + RECOGNIZE_AUDIO_FILE_NAME);
-    sendEvent(
-        CT_RECOGNIZE_EVENT_JSON,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        std::chrono::seconds(10),
-        attachmentReader);
-}
-
-/**
- * Test sending an Event and receiving a Directive in response.
- *
- * This test sends a Recognize event, which includes an audio attachment.  In this case, the audio file sent to AVS
- * asks Alexa to "tell me a joke".  The Speak Directive we expect in response will be the joke.
- *
- * @see https://developer.amazon.com/public/solutions/alexa/alexa-voice-service/reference/audioplayer#states
- */
-TEST_F(AlexaCommunicationsLibraryTest, test_sendEventAndReceiveDirective) {
-    auto attachmentReader = createAttachmentReader(g_inputPath + "/" + RECOGNIZE_AUDIO_FILE_NAME);
-    sendEvent(
-        CT_RECOGNIZE_EVENT_JSON,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        std::chrono::seconds(10),
-        attachmentReader);
-
-    // We expect to receive Directives in response to the recognize Event.  Wait for the first one.
-    ASSERT_TRUE(m_clientMessageHandler->waitForNext(std::chrono::seconds(20)));
-}
-
-/**
- * Test sending multiple Events in succession and verify that AVS responds to each of them.
- */
-TEST_F(AlexaCommunicationsLibraryTest, test_sendEventsSerially) {
-    const int NUMBER_OF_SUCCESSIVE_SENDS = 10;
-    for (int i = 0; i < NUMBER_OF_SUCCESSIVE_SENDS; ++i) {
-        sendSynchronizeStateEvent();
-    }
-}
-
-/**
- * Test sending multiple Events concurrently and verify that AVS responds to each of them.
- */
-TEST_F(AlexaCommunicationsLibraryTest, test_sendEventsConcurrently) {
-    std::vector<std::future<void>> futures;
-
-    for (int i = 0; i < MAX_CONCURRENT_STREAMS; ++i) {
-        auto future = std::async(std::launch::async, [this]() { sendSynchronizeStateEvent(); });
-        futures.push_back(std::move(future));
-    }
-
-    for (auto& future : futures) {
-        auto status = future.wait_for(std::chrono::seconds(20));
-        ASSERT_EQ(status, std::future_status::ready);
-    }
-}
-
-/**
- * Test receiving an AVS Directive on the DownChannel.
- *
- * DownChannel Directives are unsolicited - they may be pushed to the client by AVS at any time.
- * This test exercises this functionality by sending a RecognizeAudio Event with silence for the attached audio.
- * By using the NEAR_FIELD audio profile, we expect AVS to detect the end of speech and send a StopCapture Directive.
- *
- * @see https://developer.amazon.com/public/solutions/alexa/alexa-voice-service/reference/speechrecognizer#profiles
- */
-TEST_F(AlexaCommunicationsLibraryTest, test_receiveDirectiveOnDownchannel) {
-    auto attachmentReader = createAttachmentReader(g_inputPath + "/" + SILENCE_AUDIO_FILE_NAME);
-    sendEvent(
-        NF_RECOGNIZE_EVENT_JSON,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS_NO_CONTENT,
-        std::chrono::seconds(10),
-        attachmentReader);
-
-    // Wait for the StopCapture Directive to be received.
-    ASSERT_TRUE(m_clientMessageHandler->waitForNext(std::chrono::seconds(20)));
-}
-
-/**
- * Test that a connection to AVS persists between sending Events.
- */
-TEST_F(AlexaCommunicationsLibraryTest, test_persistentConnection) {
-    auto attachmentReader = createAttachmentReader(g_inputPath + "/" + RECOGNIZE_AUDIO_FILE_NAME);
-    sendEvent(
-        CT_RECOGNIZE_EVENT_JSON,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        std::chrono::seconds(10),
-        attachmentReader);
-    ASSERT_FALSE(m_context->getConnectionStatusObserver()->waitFor(
-        ConnectionStatusObserverInterface::Status::DISCONNECTED, std::chrono::seconds(20)))
-        << "Connection changed after a response was received";
-    sendEvent(
-        CT_RECOGNIZE_EVENT_JSON,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS_NO_CONTENT,
-        std::chrono::seconds(10),
-        attachmentReader);
-}
-
-/**
- * Test add- and removeConnectionStatuObserver, expecting the observer to be updated only when it is added.
- */
-TEST_F(AlexaCommunicationsLibraryTest, test_multipleConnectionStatusObservers) {
-    auto observer = std::make_shared<ConnectionStatusObserver>();
-    m_avsConnectionManager->addConnectionStatusObserver(observer);
-
-    ASSERT_TRUE(observer->waitFor(ConnectionStatusObserverInterface::Status::CONNECTED));
-
-    // Remove the observer and disconnect, expecting the status to not change.
-    m_avsConnectionManager->removeConnectionStatusObserver(observer);
-    disconnect();
-    ASSERT_EQ(observer->getConnectionStatus(), ConnectionStatusObserverInterface::Status::CONNECTED);
-    ASSERT_TRUE(
-        m_context->getConnectionStatusObserver()->waitFor(ConnectionStatusObserverInterface::Status::DISCONNECTED));
-}
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-int main(int argc, char** argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-    if (argc < 3) {
-        std::cerr << "USAGE: " << std::string(argv[0]) << " <path_to_auth_delgate_config> <path_to_inputs_folder>"
-                  << std::endl;
-        return 1;
-    } else {
-        alexaClientSDK::integration::test::g_configPath = std::string(argv[1]);
-        alexaClientSDK::integration::test::g_inputPath = std::string(argv[2]);
-        return RUN_ALL_TESTS();
-    }
-}
diff --git a/Integration/test/AlexaDirectiveSequencerLibraryTest.cpp b/Integration/test/AlexaDirectiveSequencerLibraryTest.cpp
deleted file mode 100644
index 7685afb587..0000000000
--- a/Integration/test/AlexaDirectiveSequencerLibraryTest.cpp
+++ /dev/null
@@ -1,1134 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/// @file AlexaDirectiveSequencerLibraryTest.cpp
-
-#include <chrono>
-#include <deque>
-#include <future>
-#include <fstream>
-#include <mutex>
-#include <string>
-#include <unordered_map>
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include <rapidjson/error/en.h>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/writer.h>
-
-#include <ACL/AVSConnectionManager.h>
-#include <ADSL/DirectiveSequencer.h>
-#include <ADSL/MessageInterpreter.h>
-#include <AVSCommon/AVS/Attachment/InProcessAttachmentReader.h>
-#include <AVSCommon/AVS/Attachment/InProcessAttachmentWriter.h>
-#include <AVSCommon/AVS/BlockingPolicy.h>
-#include <AVSCommon/AVS/EventBuilder.h>
-#include <AVSCommon/SDKInterfaces/DirectiveHandlerInterface.h>
-#include <AVSCommon/SDKInterfaces/DirectiveHandlerResultInterface.h>
-#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
-#include <AVSCommon/Utils/Logger/Logger.h>
-
-#include "Integration/ACLTestContext.h"
-#include "Integration/ObservableMessageRequest.h"
-#include "Integration/TestDirectiveHandler.h"
-#include "Integration/TestExceptionEncounteredSender.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace acl;
-using namespace adsl;
-using namespace avsCommon;
-using namespace avsCommon::avs;
-using namespace avsCommon::avs::attachment;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils::sds;
-using namespace avsCommon::utils::json;
-using namespace rapidjson;
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("AlexaDirectiveSequencerLibraryTest");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/**
- * This string specifies a Recognize event using the specified profile.
- *
- * CLOSE_TALK performs end-of-speech detection on the client, so no directive is sent from AVS to stop recording.
- * NEAR_FIELD performs end-of-speech detection in AVS, so a directive is sent from AVS to stop recording.
- */
-// clang-format off
-#define RECOGNIZE_EVENT_JSON(PROFILE, DIALOG_REQUEST_ID )         \
-    "{"                                                           \
-        "\"event\":{"                                             \
-            "\"payload\":{"                                       \
-                "\"format\":\"AUDIO_L16_RATE_16000_CHANNELS_1\"," \
-                "\"profile\":\"" #PROFILE "\""                    \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"dialogRequestId\":\"" DIALOG_REQUEST_ID "\","  \
-                "\"messageId\":\"messageId123\","                 \
-                "\"name\":\"Recognize\","                         \
-                "\"namespace\":\"SpeechRecognizer\""              \
-            "}"                                                   \
-        "},"                                                      \
-        "\"context\":[{"                                          \
-            "\"payload\":{"                                       \
-                "\"activeAlerts\":[],"                            \
-                "\"allAlerts\":[]"                                \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"name\":\"AlertsState\","                       \
-                "\"namespace\":\"Alerts\""                        \
-            "}"                                                   \
-        "},"                                                      \
-        "{"                                                       \
-            "\"payload\":{"                                       \
-                "\"playerActivity\":\"IDLE\","                    \
-                "\"offsetInMilliseconds\":0,"                     \
-                "\"token\":\"\""                                  \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"name\":\"PlaybackState\","                     \
-                "\"namespace\":\"AudioPlayer\""                   \
-            "}"                                                   \
-        "},"                                                      \
-        "{"                                                       \
-            "\"payload\":{"                                       \
-                "\"muted\":false,"                                \
-                "\"volume\":0"                                    \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"name\":\"VolumeState\","                       \
-                "\"namespace\":\"Speaker\""                       \
-            "}"                                                   \
-        "},"                                                      \
-        "{"                                                       \
-            "\"payload\":{"                                       \
-                "\"playerActivity\":\"FINISHED\","                \
-                "\"offsetInMilliseconds\":0,"                     \
-                "\"token\":\"\""                                  \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"name\":\"SpeechState\","                       \
-                "\"namespace\":\"SpeechSynthesizer\""             \
-            "}"                                                   \
-        "}]"                                                      \
-    "}"
-// clang-format on
-
-/// This is a 16 bit 16 kHz little endian linear PCM audio file of "Joke" to be recognized.
-static const std::string RECOGNIZE_JOKE_AUDIO_FILE_NAME = "/recognize_joke_test.wav";
-/// This is a 16 bit 16 kHz little endian linear PCM audio file of "Wikipedia" to be recognized.
-static const std::string RECOGNIZE_WIKI_AUDIO_FILE_NAME = "/recognize_wiki_test.wav";
-/// This is a 16 bit 16 kHz little endian linear PCM audio file of "Lions" to be recognized.
-static const std::string RECOGNIZE_LIONS_AUDIO_FILE_NAME = "/recognize_lions_test.wav";
-/// This is a 16 bit 16 kHz little endian linear PCM audio file of "What's up" to be recognized.
-static const std::string RECOGNIZE_WHATS_UP_AUDIO_FILE_NAME = "/recognize_whats_up_test.wav";
-/// This is a 16 bit 16 kHz little endian linear PCM audio file of "Set a timer for 5 seconds" to be recognized.
-static const std::string RECOGNIZE_TIMER_AUDIO_FILE_NAME = "/recognize_timer_test.wav";
-/// This is a 16 bit 16 kHz little endian linear PCM audio file of "flashbriefing" to be recognized.
-static const std::string RECOGNIZE_FLASHBRIEFING_AUDIO_FILE_NAME = "/recognize_flashbriefing_test.wav";
-
-// String to be used as a basic DialogRequestID.
-#define FIRST_DIALOG_REQUEST_ID "DialogRequestID123"
-// String to be used as a DialogRequestID when the first has already been used.
-#define SECOND_DIALOG_REQUEST_ID "DialogRequestID456"
-
-/// This string specifies a Recognize event using the CLOSE_TALK profile and uses the first DialogRequestID.
-static const std::string CT_FIRST_RECOGNIZE_EVENT_JSON = RECOGNIZE_EVENT_JSON(CLOSE_TALK, FIRST_DIALOG_REQUEST_ID);
-/// This string specifies a Recognize event using the CLOSE_TALK profile and uses the second DialogRequestID.
-static const std::string CT_SECOND_RECOGNIZE_EVENT_JSON = RECOGNIZE_EVENT_JSON(CLOSE_TALK, SECOND_DIALOG_REQUEST_ID);
-// This string to be used for ClearQueue Directives which use the NAMESPACE_AUDIO_PLAYER namespace.
-static const std::string NAME_CLEAR_QUEUE = "ClearQueue";
-// This string to be used for ExpectSpeech Directives which use the NAMESPACE_SPEECH_RECOGNIZER namespace.
-static const std::string NAME_EXPECT_SPEECH = "ExpectSpeech";
-// This string to be used for Play Directives which use the NAMESPACE_AUDIO_PLAYER namespace.
-static const std::string NAME_PLAY = "Play";
-// This string to be used for SetMute Directives which use the NAMESPACE_SPEAKER namespace.
-static const std::string NAME_SET_MUTE = "SetMute";
-// This string to be used for Speak Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_SPEAK = "Speak";
-// This string to be used for Stop Directives which use the NAMESPACE_AUDIO_PLAYER namespace.
-static const std::string NAME_STOP = "Stop";
-// This string to be used for SpeechStarted Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_SPEECH_STARTED = "SpeechStarted";
-// This string to be used for SpeechFinished Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_SPEECH_FINISHED = "SpeechFinished";
-// This string to be used for SetAlertFailed Directives which use the NAMESPACE_ALERTS namespace.
-static const std::string NAME_SET_ALERT_FAILED = "SetAlertFailed";
-// This string to be used for SetAlert Directives which use the NAMESPACE_ALERTS namespace.
-static const std::string NAME_SET_ALERT = "SetAlert";
-
-// This String to be used to register the AudioPlayer namespace to a DirectiveHandler.
-static const std::string NAMESPACE_AUDIO_PLAYER = "AudioPlayer";
-// This String to be used to register the Alerts namespace to a DirectiveHandler.
-static const std::string NAMESPACE_ALERTS = "Alerts";
-// This String to be used to register the Speaker namespace to a DirectiveHandler.
-static const std::string NAMESPACE_SPEAKER = "Speaker";
-// This String to be used to register the SpeechRecognizer namespace to a DirectiveHandler.
-static const std::string NAMESPACE_SPEECH_RECOGNIZER = "SpeechRecognizer";
-// This String to be used to register the SpeechSynthesizer namespace to a DirectiveHandler.
-static const std::string NAMESPACE_SPEECH_SYNTHESIZER = "SpeechSynthesizer";
-
-// This pair connects a ExpectSpeech name and SpeechRecognizer namespace for use in DirectiveHandler registration.
-static const NamespaceAndName EXPECT_SPEECH_PAIR(NAMESPACE_SPEECH_RECOGNIZER, NAME_EXPECT_SPEECH);
-// This pair connects a SetMute name and Speaker namespace for use in DirectiveHandler registration.
-static const NamespaceAndName SET_MUTE_PAIR(NAMESPACE_SPEAKER, NAME_SET_MUTE);
-// This pair connects a Speak name and SpeechSynthesizer namespace for use in DirectiveHandler registration.
-static const NamespaceAndName SPEAK_PAIR(NAMESPACE_SPEECH_SYNTHESIZER, NAME_SPEAK);
-// This pair connects a SetAlert name and Alerts namespace for use in DirectiveHandler registration.
-static const NamespaceAndName SET_ALERT_PAIR(NAMESPACE_ALERTS, NAME_SET_ALERT);
-
-// This Integer to be used to specify a timeout in seconds for a directive to reach the DirectiveHandler.
-static const std::chrono::seconds WAIT_FOR_TIMEOUT_DURATION(5);
-// This Integer to be used to specify a timeout in seconds for AuthDelegate to wait for LWA response.
-static const std::chrono::seconds SEND_EVENT_TIMEOUT_DURATION(20);
-// Time to wait before sending Recognize response to Alexa
-static const std::chrono::seconds RESPONSE_DELAY(2);
-
-/// JSON key to get the directive object of a message.
-static const std::string JSON_MESSAGE_DIRECTIVE_KEY = "directive";
-/// JSON key to get the header object of a message.
-static const std::string JSON_MESSAGE_HEADER_KEY = "header";
-/// JSON key to get the namespace value of a header.
-static const std::string JSON_MESSAGE_NAMESPACE_KEY = "namespace";
-/// JSON key to get the name value of a header.
-static const std::string JSON_MESSAGE_NAME_KEY = "name";
-/// JSON key to get the messageId value of a header.
-static const std::string JSON_MESSAGE_MESSAGE_ID_KEY = "messageId";
-/// JSON key to get the dialogRequestId value of a header.
-static const std::string JSON_MESSAGE_DIALOG_REQUEST_ID_KEY = "dialogRequestId";
-/// JSON key to get the payload object of a message.
-static const std::string JSON_MESSAGE_PAYLOAD_KEY = "payload";
-/// JSON key to get the payload object of a message.
-static const std::string JSON_MESSAGE_TOKEN_KEY = "token";
-/// JSON key to add to the payload object of a message.
-static const char TOKEN_KEY[] = "token";
-
-/// Path to the AlexaClientSDKConfig.json file (from command line arguments).
-static std::string g_configPath;
-/// Path to resources (e.g. audio files) for tests (from command line arguments).
-static std::string g_inputPath;
-
-class AlexaDirectiveSequencerLibraryTest : public ::testing::Test {
-protected:
-    void SetUp() override {
-        m_context = ACLTestContext::create(g_configPath);
-        ASSERT_TRUE(m_context);
-
-        m_exceptionEncounteredSender = std::make_shared<TestExceptionEncounteredSender>();
-        m_directiveSequencer = DirectiveSequencer::create(m_exceptionEncounteredSender);
-        m_messageInterpreter = std::make_shared<MessageInterpreter>(
-            m_exceptionEncounteredSender, m_directiveSequencer, m_context->getAttachmentManager());
-
-        // note: No DirectiveHandlers have been registered with the DirectiveSequencer yet. Registration of
-        // handlers is deferred to individual test implementations.
-
-        m_avsConnectionManager = AVSConnectionManager::create(
-            m_context->getMessageRouter(), false, {m_context->getConnectionStatusObserver()}, {m_messageInterpreter});
-        ASSERT_TRUE(m_avsConnectionManager);
-
-        connect();
-    }
-
-    void TearDown() override {
-        disconnect();
-        // Note that these nullptr checks are needed to avoid segaults if @c SetUp() failed.
-        if (m_directiveSequencer) {
-            m_directiveSequencer->shutdown();
-        }
-        if (m_avsConnectionManager) {
-            m_avsConnectionManager->shutdown();
-        }
-        m_context.reset();
-    }
-
-    /**
-     * Connect to AVS.
-     */
-    void connect() {
-        m_avsConnectionManager->enable();
-        m_context->waitForConnected();
-    }
-
-    /**
-     * Disconnect from AVS.
-     */
-    void disconnect() {
-        if (m_avsConnectionManager) {
-            m_avsConnectionManager->disable();
-            m_context->waitForDisconnected();
-        }
-    }
-
-    /**
-     * Send and event to AVS. Blocks until a status is received.
-     *
-     * @param message The message to send.
-     * @param expectStatus The status to expect from the call to send the message.
-     * @param timeout How long to wait for a result from delivering the message.
-     */
-    void sendEvent(
-        const std::string& jsonContent,
-        std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> attachmentReader,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status expectedStatus,
-        std::chrono::seconds timeout) {
-        auto messageRequest = std::make_shared<ObservableMessageRequest>(jsonContent, attachmentReader);
-        m_avsConnectionManager->sendMessage(messageRequest);
-        ASSERT_TRUE(messageRequest->waitFor(expectedStatus, timeout));
-    }
-
-    /**
-     * Function to setup a message and send it to AVS.
-     *
-     * @param json A JSON string containing the message to send.
-     * @param expectStatus The status to expect from the call to send the message.
-     * @param timeout How long to wait for a result from delivering the message.
-     */
-    void setupMessageAndSend(
-        const std::string& json,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status expectedStatus,
-        std::chrono::seconds timeout) {
-        sendEvent(json, nullptr, expectedStatus, timeout);
-    }
-
-    /**
-     * Function to setup a message with an attachment and send it to AVS.
-     *
-     * @param json A JSON string containing the message to send.
-     * @param file Name of the file to read the attachment from.
-     * @param expectStatus The status to expect from the call to send the message.
-     * @param timeout How long to wait for a result from delivering the message.
-     */
-    void setupMessageWithAttachmentAndSend(
-        const std::string& json,
-        std::string& file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status expectedStatus,
-        std::chrono::seconds timeout) {
-        auto is = std::make_shared<std::ifstream>(file, std::ios::binary);
-        ASSERT_TRUE(is->is_open());
-
-        const int mbBytes = 1024 * 1024;
-
-        std::vector<char> localBuffer(mbBytes);
-
-        auto bufferSize = InProcessSDS::calculateBufferSize(localBuffer.size());
-        auto buffer = std::make_shared<InProcessSDSTraits::Buffer>(bufferSize);
-        std::shared_ptr<InProcessSDS> sds = InProcessSDS::create(buffer);
-
-        auto attachmentWriter = InProcessAttachmentWriter::create(sds);
-
-        while (*is) {
-            is->read(localBuffer.data(), mbBytes);
-            size_t numBytesRead = is->gcount();
-            AttachmentWriter::WriteStatus writeStatus = AttachmentWriter::WriteStatus::OK;
-            attachmentWriter->write(localBuffer.data(), numBytesRead, &writeStatus);
-
-            // write status should be either OK or CLOSED
-            bool writeStatusOk =
-                (AttachmentWriter::WriteStatus::OK == writeStatus ||
-                 AttachmentWriter::WriteStatus::CLOSED == writeStatus);
-            ASSERT_TRUE(writeStatusOk);
-        }
-
-        attachmentWriter->close();
-
-        std::shared_ptr<InProcessAttachmentReader> attachmentReader =
-            InProcessAttachmentReader::create(ReaderPolicy::NONBLOCKING, sds);
-        ASSERT_NE(attachmentReader, nullptr);
-
-        sendEvent(json, attachmentReader, expectedStatus, std::chrono::seconds(timeout));
-    }
-
-    /**
-     * Helper function to check that a directive with the given name is an exception.
-     *
-     * @param Pointer to a exception encountered sender to receive exceptions through.
-     * @param String of the name of the directive that should be an exception.
-     */
-    void assertExceptionWithName(const std::string name) {
-        TestExceptionEncounteredSender::ExceptionParams params;
-        bool nameFound = false;
-        do {
-            params = m_exceptionEncounteredSender->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-            if (params.directive && params.directive->getName() == name) {
-                nameFound = true;
-            }
-        } while (params.type != TestExceptionEncounteredSender::ExceptionParams::Type::TIMEOUT && !nameFound);
-        ASSERT_TRUE(nameFound);
-        ASSERT_NE(params.type, TestExceptionEncounteredSender::ExceptionParams::Type::TIMEOUT);
-    }
-
-    /**
-     * Function to setup a message with a token and send it to AVS.
-     *
-     * @param eventName Name of the event to send.
-     * @param eventNameSpace Namespace if the Name of the event to send.
-     * @param dialogRequestID DialogRequestID to use to send the event.
-     * @param token Token to be added to the event payload.
-     * @param expectedStatus MessageRequest status to expect after sending the event
-     */
-    void sendEventWithToken(
-        const std::string& eventName,
-        const std::string& eventNameSpace,
-        const std::string& dialogRequestID,
-        std::string token,
-        MessageRequestObserverInterface::Status expectedStatus) {
-        rapidjson::Document payload(rapidjson::kObjectType);
-        payload.AddMember(TOKEN_KEY, token, payload.GetAllocator());
-
-        rapidjson::StringBuffer buffer;
-        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-        ASSERT_TRUE(payload.Accept(writer));
-
-        auto event = buildJsonEventString(eventNameSpace, eventName, dialogRequestID, buffer.GetString());
-        sendEvent(event.second, nullptr, expectedStatus, std::chrono::seconds(SEND_EVENT_TIMEOUT_DURATION));
-    }
-
-    /// Context for running ACL based tests.
-    std::unique_ptr<ACLTestContext> m_context;
-
-    /// Object that manages the connection to @c AVS.
-    std::shared_ptr<AVSConnectionManager> m_avsConnectionManager;
-
-    /// The @c DirectiveSequencer instance to test.
-    std::shared_ptr<DirectiveSequencerInterface> m_directiveSequencer;
-
-    /// Object to convert messages from @c AVS in to directives passed to the @c DirectiveSequencer.
-    std::shared_ptr<MessageInterpreter> m_messageInterpreter;
-
-    std::shared_ptr<TestExceptionEncounteredSender> m_exceptionEncounteredSender;
-};
-
-/**
- * Helper function to extract the token from a directive.
- *
- * @param params that has the JSON to be searched through.
- * @param returnToken to hold the reulting token.
- * @return Indicates whether extracting the token was successful.
- */
-bool getToken(TestDirectiveHandler::DirectiveParams params, std::string& returnToken) {
-    std::string directiveString;
-    std::string directivePayload;
-    std::string directiveToken;
-    jsonUtils::retrieveValue(params.directive->getUnparsedDirective(), JSON_MESSAGE_DIRECTIVE_KEY, &directiveString);
-    jsonUtils::retrieveValue(directiveString, JSON_MESSAGE_PAYLOAD_KEY, &directivePayload);
-    return jsonUtils::retrieveValue(directivePayload, JSON_MESSAGE_TOKEN_KEY, &returnToken);
-}
-
-/**
- * Test DirectiveSequencer's ability to pass an @c AVSDirective to a @c DirectiveHandler.
- *
- * This test is intended to test @c DirectiveSequencer's ability to pass an @c AVSDirective to a @c DirectiveHandler
- * that has been registered to handle an @c AVSDirective.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, test_sendEventWithDirective) {
-    DirectiveHandlerConfiguration config;
-    config[SET_MUTE_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-    config[SPEAK_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, true);
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio of "Joke" that will prompt SetMute and Speak.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_JOKE_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    // Wait for the first directive to route through to our handler.
-    auto params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_FALSE(params.isTimeout());
-}
-
-/**
- * Test @c DirectiveSequencer's ability to pass a group of no-blocking @c AVSDirectives to a @c DirectiveHandler.
- *
- * This test registers @c NON_BLOCKING handling for a suite of directives expected in response to recognize
- * request. It then verifies that handleDirective() is called for the subsequent directives without waiting for
- * completion of handling of any of the directives.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, test_sendDirectiveGroupWithoutBlocking) {
-    DirectiveHandlerConfiguration config;
-    auto audioNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-    config[SET_MUTE_PAIR] = audioNonBlockingPolicy;
-    config[SPEAK_PAIR] = audioNonBlockingPolicy;
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio of "Joke" that will prompt SetMute and Speak.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_JOKE_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    // Look for SetMute and Speak without completing the handling of any directives.
-    TestDirectiveHandler::DirectiveParams params;
-    TestDirectiveHandler::DirectiveParams setMuteParams;
-    TestDirectiveHandler::DirectiveParams speakParams;
-    while (true) {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        if (params.isTimeout()) {
-            break;
-        }
-        if (params.directive->getName() == NAME_SET_MUTE) {
-            setMuteParams = params;
-        } else if (params.directive->getName() == NAME_SPEAK) {
-            speakParams = params;
-        }
-    }
-    ASSERT_TRUE(setMuteParams.isHandle());
-    ASSERT_TRUE(speakParams.isHandle());
-}
-
-/**
- * Test @c DirectiveSequencer's ability to drop directives that do not match the current @c dialogRequestId.
- *
- * The test first sets the @c dialogRequestId, sends an event with that @c dialopRequestId, flushes the resulting
- * directives, then (without updating the current @c dialogRequestId) sends an event with a new @c dialogRequestId.
- * It then verifies that the directive handler was not called for the @c AVSDirectives expected to result from the
- * second event.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, test_sendDirectiveWithDifferentDialogRequestID) {
-    DirectiveHandlerConfiguration config;
-    auto audioNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-    config[SET_MUTE_PAIR] = audioNonBlockingPolicy;
-    config[SPEAK_PAIR] = audioNonBlockingPolicy;
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio for a flashbriefing which will send back at least SetMute, Speak, SetMute, Play and Play.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_WHATS_UP_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    // Drain the directive results until we get a timeout. There should be no cancels or exceptions.
-    TestDirectiveHandler::DirectiveParams params;
-    do {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_FALSE(params.isCancel());
-    } while (!params.isTimeout());
-
-    // Send an event that has a different dialogRequestID, without calling setDialogRequestId().
-    file = g_inputPath + RECOGNIZE_JOKE_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_SECOND_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    // Directives from the second event do not reach the directive handler because they do no have
-    // the current dialogRequestId.
-    params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(params.isTimeout());
-}
-
-/**
- * Test @c DirectiveSequencer's ability to drop queued @c AVSDirectives after Barge-In.
- *
- * This test registers handlers, including a blocking handler for @c AVSDirectives known to come from a canned
- * @c Recognize event. It then consumes the handling events up to the point of handling the blocking @c AVSDirective.
- * Then the @c dialogRequestId is changed (canceling the blocking @c AVSDirective and any subsequent @c AVSDirectives
- * in that group. Finally, a new @c Recognize event with the new @c dialogRequestId is sent. The events
- * are then consumed verifying cancellation of @c AVSDirectives from the first group and handling of @c AVSDirectives
- * in the second group.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, DISABLED_test_dropQueueAfterBargeIn) {
-    DirectiveHandlerConfiguration config;
-    config[SET_MUTE_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-    config[SPEAK_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, true);
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio for a flashbriefing which will send back (at least) SetMute, Speak, SetMute, Play and Play.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_WHATS_UP_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    TestDirectiveHandler::DirectiveParams params;
-
-    // Consume up to the blocking directive.
-    do {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_FALSE(params.isTimeout());
-    } while (!params.isHandle() || params.directive->getName() != NAME_SPEAK);
-    ASSERT_EQ(params.directive->getDialogRequestId(), FIRST_DIALOG_REQUEST_ID);
-
-    // Call setDialogRequestId(), canceling the previous group. Then send a new event with the new dialogRequestId.
-    m_directiveSequencer->setDialogRequestId(SECOND_DIALOG_REQUEST_ID);
-    std::string differentFile = g_inputPath + RECOGNIZE_JOKE_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_SECOND_RECOGNIZE_EVENT_JSON,
-        differentFile,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    // Consume cancellations and the new directives.
-    bool cancelCalled = false;
-    bool handleCalled = false;
-    do {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        if (params.isCancel()) {
-            ASSERT_EQ(params.directive->getDialogRequestId(), FIRST_DIALOG_REQUEST_ID);
-            cancelCalled = true;
-        } else if (params.isHandle()) {
-            ASSERT_EQ(params.directive->getDialogRequestId(), SECOND_DIALOG_REQUEST_ID);
-            ASSERT_TRUE(params.result);
-            params.result->setCompleted();
-            handleCalled = true;
-        }
-    } while (!params.isTimeout());
-    ASSERT_TRUE(cancelCalled);
-    ASSERT_TRUE(handleCalled);
-}
-
-/**
- * Test @c DirectiveSequencer's ability to handle a Directive without a DialogRequestID.
- *
- * This test sends a @c Recognize event to AVS to trigger delivery of a @c Speak and a @c SetAlert directive.
- * @c SetAlert directives do not have a @c dialogRequestId value. This test uses that fact to verify that
- * @c AVSDirectives with no @c dialogRequestId are processed properly.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, DISABLED_test_sendDirectiveWithoutADialogRequestID) {
-    DirectiveHandlerConfiguration config;
-    auto audioNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-    config[SPEAK_PAIR] = audioNonBlockingPolicy;
-    config[SET_ALERT_PAIR] = audioNonBlockingPolicy;
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio of "Set a timer for 5 seconds" that will prompt a Speak.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_TIMER_AUDIO_FILE_NAME;
-
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    std::string token;
-    bool handleAlertFound = false;
-    bool prehandleAlertFound = false;
-    bool prehandleSpeakFound = false;
-
-    TestDirectiveHandler::DirectiveParams params;
-    params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    while (!params.isTimeout()) {
-        if (params.directive->getName() == NAME_SPEAK) {
-            ASSERT_FALSE(params.directive->getDialogRequestId().empty());
-            if (params.isPreHandle()) {
-                prehandleSpeakFound = true;
-            } else if (params.isHandle()) {
-                ASSERT_TRUE(prehandleSpeakFound);
-                ASSERT_TRUE(getToken(params, token));
-                // Send speechFinished to prompt the cloud to send setAlert which does not have a DialogRequestID.
-
-                sendEventWithToken(
-                    NAME_SPEECH_FINISHED,
-                    NAMESPACE_SPEECH_SYNTHESIZER,
-                    FIRST_DIALOG_REQUEST_ID,
-                    token,
-                    MessageRequestObserverInterface::Status::SUCCESS_NO_CONTENT);
-            }
-        } else {
-            ASSERT_EQ(params.directive->getName(), NAME_SET_ALERT);
-            ASSERT_TRUE(params.directive->getDialogRequestId().empty());
-            if (params.isPreHandle()) {
-                prehandleAlertFound = true;
-            } else if (params.isHandle()) {
-                ASSERT_TRUE(prehandleAlertFound);
-                handleAlertFound = true;
-                ASSERT_TRUE(getToken(params, token));
-            }
-        }
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    }
-    ASSERT_TRUE(handleAlertFound);
-    // Send setAlertFailed to clean up the alert on the cloud side.
-    sendEventWithToken(
-        NAME_SET_ALERT_FAILED,
-        NAMESPACE_ALERTS,
-        FIRST_DIALOG_REQUEST_ID,
-        token,
-        MessageRequestObserverInterface::Status::SUCCESS);
-
-    params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    while (!params.isTimeout()) {
-        // Make sure no other calls for SetAlert are made except for the initial handleImmediately.
-        ASSERT_NE(params.directive->getName(), NAME_SET_ALERT);
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    }
-}
-
-/**
- * Test @c DirectiveSequencer's ability to make both preHandleDirective() and handleDirective() call for
- * @c AVSDirectives with a non-empty @c dialogRequestId.
- *
- * This test registers handlers for the directives expected in response to a @c Recognize event. It then counts the
- * number of @c preHandleDirective() and @c handleDirective() callbacks verifying that the counts come out to the
- * same value in the end.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, test_sendDirectivesForPreHandling) {
-    DirectiveHandlerConfiguration config;
-    config[SET_MUTE_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-    config[SPEAK_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, true);
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio for a flashbriefing which will send back SetMute, Speak, SetMute, Play and Play.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_WHATS_UP_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    // Count each preHandle and handle that arrives.
-    TestDirectiveHandler::DirectiveParams params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    int preHandleCounter = 0;
-    int onHandleCounter = 0;
-    while (!params.isTimeout()) {
-        if (params.isPreHandle()) {
-            ++preHandleCounter;
-        } else if (params.isHandle()) {
-            ++onHandleCounter;
-            ASSERT_TRUE(params.result);
-            params.result->setCompleted();
-        }
-        ASSERT_TRUE(preHandleCounter >= onHandleCounter);
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    }
-    // Verify there were the same number of calls for each.
-    ASSERT_EQ(preHandleCounter, onHandleCounter);
-}
-
-/**
- * Test @c DirectiveSequencer's ability to drop the head of a @c dialogRequestId group.
- *
- * This test registers handlers (including a blocking handler) for the @c AVSDirectives expected in response to a
- * canned @c Recognize request. When @c handleDirective() is called for the blocking @c AVSDirective, setFailed()
- * is called to trigger the cancellation of subsequent @c AVSDirectives in the same group.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, test_cancelDirectivesWhileInQueue) {
-    DirectiveHandlerConfiguration config;
-    config[SET_MUTE_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-    config[SPEAK_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, true);
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio for a flashbriefing which will send back (at least) SetMute, Speak, SetMute, Play, and Play.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_WHATS_UP_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    TestDirectiveHandler::DirectiveParams params;
-
-    do {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_FALSE(params.isTimeout());
-    } while (!params.isHandle() || params.directive->getName() != NAME_SPEAK);
-
-    // Send back error for the speak handler.
-    ASSERT_TRUE(params.result);
-    params.result->setFailed("Test Error");
-
-    // Check that no other directives arrive for handling.
-    do {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    } while (params.isCancel() || params.isPreHandle());
-    ASSERT_TRUE(params.isTimeout());
-}
-
-/**
- * Test @c DirectiveSequencer's ability to sequence a group that has a Blocking Directive before other directives.
- *
- * This test is intended to verify the Directive Sequencer's ability to handle a dialogRequestID group that has a
- * blocking directive, followed by non-blocking directives. Expect that the directive handler will receive a SetMute
- * directive and then nothing until setComplete() is called for that directive. Then expect the directive handler
- * to receive at least one subsequent directive.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, test_oneBlockingDirectiveAtTheFront) {
-    DirectiveHandlerConfiguration config;
-    config[SET_MUTE_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, true);
-    config[SPEAK_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio of "Joke" that will prompt a stream of directives including SetMute.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_JOKE_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    // Expect set-mute which is blocking and no other handles after that (timeout reached because SetMute blocks).
-    TestDirectiveHandler::DirectiveParams params;
-    TestDirectiveHandler::DirectiveParams blockingParams;
-    while (true) {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        if (params.isTimeout()) {
-            break;
-        }
-        if (params.isHandle()) {
-            if (params.directive->getName() == NAME_SET_MUTE) {
-                // Note the blocking params from handle so we can unblock below.
-                blockingParams = params;
-            } else {
-                ASSERT_FALSE(blockingParams.isHandle());
-            }
-        }
-    }
-    ASSERT_TRUE(blockingParams.isHandle());
-
-    // Unblock the queue.
-    blockingParams.result->setCompleted();
-
-    // Expect subsequent directives, including Speak.
-    TestDirectiveHandler::DirectiveParams speakParams;
-    do {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            // Remember that we saw a speak param.
-            speakParams = params;
-        }
-    } while (!params.isTimeout());
-    ASSERT_TRUE(speakParams.isHandle());
-}
-
-/**
- * Test @c DirectiveSequencer's ability to sequence a group that has one @c BLOCKING @c AVSDirective in the middle.
- *
- * This test is intended to test the @c DirectiveSequencer's ability to handle a @c dialogRequestID group that has at
- * least one non-blocking directive, followed by a blocking directive, followed by non-blocking directives.
- * @c preHandleDirective() and @c handleDirective() should be called for directives before the Speak directive,
- * whose handling blocks further handling of directives. Once @c setComplete() is called for the @c BLOCKING
- * @c AVSDirective, @c handleDirective() should be called for the subsequent (and @c NON_BLOCKING) @c AVSDirectives
- * without waiting for the completion of any subsequent @c AVSDirectives.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, test_oneBlockingDirectiveInTheMiddle) {
-    DirectiveHandlerConfiguration config;
-    config[SET_MUTE_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-    config[SPEAK_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, true);
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio for a flashbriefing which will send back SetMute, Speak, SetMute, Play and Play.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_FLASHBRIEFING_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    TestDirectiveHandler::DirectiveParams params;
-
-    // Expect SetMute which is non-blocking.
-    do {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_FALSE(params.isTimeout());
-    } while (!params.isHandle() || params.directive->getName() != NAME_SET_MUTE);
-
-    TestDirectiveHandler::DirectiveParams blockingParams;
-
-    // Expect Speak which is blocking.
-    do {
-        blockingParams = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_FALSE(blockingParams.isTimeout());
-    } while (!blockingParams.isHandle() || blockingParams.directive->getName() != NAME_SPEAK);
-
-    // Expect a timeout because we're blocked.
-    do {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_FALSE(params.isHandle());
-    } while (!params.isTimeout());
-
-    // Unblock the queue.
-    ASSERT_TRUE(blockingParams.result);
-    blockingParams.result->setCompleted();
-
-    // See things that were previously blocked in the queue come through afterward.
-    params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_FALSE(params.isTimeout());
-}
-
-/**
- * Test @c DirectiveSequencer's ability to drop a directive when no handler is registered for it.
- *
- * To do this, no handler is set for a directive (@c SetMute) that is known to come down consistently in response to
- * a Recognize event, instead an exception encountered is expected.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, test_noDirectiveHandlerRegisteredForADirectiveAtTheFront) {
-    // Don't Register a DirectiveHandler for SetMute.
-    DirectiveHandlerConfiguration config;
-    config[SPEAK_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio of "Joke" that will trigger SetMute and possibly others.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_JOKE_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    // Make sure no SetMute directives are given to the handler, and that they result in exception encountered.
-    assertExceptionWithName(NAME_SET_MUTE);
-}
-
-/**
- * Test @c DirectiveSequencer's ability to drop a directive in the middle when no handler is registered for it.
- *
- * To do this, no handler is set for a directive (@c SetMute) that is known to come down consistently in response to
- * a Recognize event, instead an exception encountered is expected.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, DISABLED_test_noDirectiveHandlerRegisteredForADirectiveInTheMiddle) {
-    // Don't Register a DirectiveHandler for Speak.
-    DirectiveHandlerConfiguration config;
-    config[SET_MUTE_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio of "Joke" that will trigger SetMute and speak.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_JOKE_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    // Make sure no Speak directives are given to the handler, and that they result in exception encountered.
-    assertExceptionWithName(NAME_SPEAK);
-}
-
-/**
- * Test @c DirectiveSequencer's ability to refuse to overwrite registration of a directive handler.
- *
- * To do this, an attempt is made to set two different handlers for the same directive. The @c DirectiveSequencer
- * is expected to refuse the second handler. This directive is known to come down consistently in response to a
- * Recognize event. The Handler that was first set is the only one that should receive the directive.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, test_twoDirectiveHandlersRegisteredForADirective) {
-    DirectiveHandlerConfiguration handlerAConfig;
-    auto audioBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, true);
-    handlerAConfig[SET_MUTE_PAIR] = audioBlockingPolicy;
-
-    auto directiveHandlerA = std::make_shared<TestDirectiveHandler>(handlerAConfig);
-
-    DirectiveHandlerConfiguration handlerbConfig;
-    handlerbConfig[SET_MUTE_PAIR] = audioBlockingPolicy;
-    auto directiveHandlerB = std::make_shared<TestDirectiveHandler>(handlerbConfig);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandlerA));
-
-    // Attempt to overwrite one of the handlers
-    ASSERT_FALSE(m_directiveSequencer->addDirectiveHandler(directiveHandlerB));
-
-    // Send audio of "Joke" that will prompt SetMute.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_JOKE_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    // A received the SetMute directive.
-    TestDirectiveHandler::DirectiveParams paramsA;
-    do {
-        paramsA = directiveHandlerA->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_FALSE(paramsA.isTimeout());
-    } while (!paramsA.isHandle() && paramsA.directive->getName() != NAME_SET_MUTE);
-
-    // B receives nothing.
-    TestDirectiveHandler::DirectiveParams paramsB = directiveHandlerB->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(paramsB.isTimeout());
-}
-
-/**
- * Test @c DirectiveSequencer's ability to handle a multi-turn scenario
- *
- * This test is intended to test the Directive Sequencer's ability to go through a full loop of sending a recognize
- * event that will prompt a multi-turn directive, receiving a directive group that contains ExpectSpeech, sending a
- * recognize event to respond to Alexa's question, and receiving the final directive group.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, test_multiturnScenario) {
-    DirectiveHandlerConfiguration config;
-    auto audioNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-    config[SET_MUTE_PAIR] = audioNonBlockingPolicy;
-    config[SPEAK_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, true);
-    config[EXPECT_SPEECH_PAIR] = audioNonBlockingPolicy;
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio of "wikipedia" which will prompt a SetMute, a Speak, and an ExpectSpeech.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_WIKI_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    TestDirectiveHandler::DirectiveParams params;
-
-    // Check we're being told to ExpectSpeech.
-    do {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_FALSE(params.isTimeout());
-        ASSERT_EQ(params.directive->getDialogRequestId(), FIRST_DIALOG_REQUEST_ID);
-        if (params.isHandle()) {
-            params.result->setCompleted();
-        }
-    } while (!params.isHandle() || params.directive->getName() != NAME_EXPECT_SPEECH);
-
-    // Sleep to delay sending next Recognize request too soon and surprising Alexa.
-    std::this_thread::sleep_for(RESPONSE_DELAY);
-
-    // Send back a recognize event.
-    m_directiveSequencer->setDialogRequestId(SECOND_DIALOG_REQUEST_ID);
-    std::string differentFile = g_inputPath + RECOGNIZE_LIONS_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_SECOND_RECOGNIZE_EVENT_JSON,
-        differentFile,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    // Just the wikipedia directive group in response.
-    do {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        if (params.isHandle()) {
-            ASSERT_EQ(params.directive->getDialogRequestId(), SECOND_DIALOG_REQUEST_ID);
-            params.result->setCompleted();
-        }
-    } while (!params.isTimeout());
-}
-
-/**
- * Test ability to get an attachment from @c AttachmentManager.
- */
-TEST_F(AlexaDirectiveSequencerLibraryTest, test_getAttachmentWithContentId) {
-    DirectiveHandlerConfiguration config;
-    config[SPEAK_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, true);
-
-    auto directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-    ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(directiveHandler));
-
-    // Send audio of "Joke" that will prompt SetMute and Speak.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_JOKE_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    // Wait for the directive to route through to our handler.
-    TestDirectiveHandler::DirectiveParams params;
-    do {
-        params = directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_FALSE(params.isTimeout());
-    } while (!params.isPreHandle() || params.directive->getName() != NAME_SPEAK);
-
-    auto directive = params.directive;
-    std::string payloadUrl;
-    jsonUtils::retrieveValue(directive->getPayload(), "url", &payloadUrl);
-    ASSERT_TRUE(!payloadUrl.empty());
-
-    auto stringIndex = payloadUrl.find(":");
-    ASSERT_TRUE(stringIndex != std::string::npos);
-    ASSERT_TRUE(stringIndex != payloadUrl.size() - 1);
-
-    auto contentId = payloadUrl.substr(payloadUrl.find(':') + 1);
-    auto attachmentReader = directive->getAttachmentReader(contentId, ReaderPolicy::BLOCKING);
-
-    ASSERT_NE(attachmentReader, nullptr);
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-int main(int argc, char** argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-    if (argc < 3) {
-        std::cerr << "USAGE: " << std::string(argv[0]) << " <path_to_AlexaClientSDKConfig.json> <path_to_inputs_folder>"
-                  << std::endl;
-        return 1;
-    } else {
-        alexaClientSDK::integration::test::g_configPath = std::string(argv[1]);
-        alexaClientSDK::integration::test::g_inputPath = std::string(argv[2]);
-        return RUN_ALL_TESTS();
-    }
-}
diff --git a/Integration/test/AudioInputProcessorIntegrationTest.cpp b/Integration/test/AudioInputProcessorIntegrationTest.cpp
deleted file mode 100644
index d1743ae9f5..0000000000
--- a/Integration/test/AudioInputProcessorIntegrationTest.cpp
+++ /dev/null
@@ -1,1906 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/// @file AudioInputProcessorIntegrationTest.cpp
-
-#include <chrono>
-#include <deque>
-#include <fstream>
-#include <future>
-#include <mutex>
-#include <string>
-#include <unordered_map>
-
-#include <gtest/gtest.h>
-
-#include <ACL/AVSConnectionManager.h>
-#include <acsdkManufactory/Annotated.h>
-#include <ADSL/DirectiveSequencer.h>
-#include <ADSL/MessageInterpreter.h>
-#include <AFML/Channel.h>
-#include <AFML/FocusManager.h>
-#include <AIP/AudioInputProcessor.h>
-#include <AIP/AudioProvider.h>
-#include <AIP/Initiator.h>
-#include <Audio/SystemSoundAudioFactory.h>
-#include <AVSCommon/AVS/Attachment/InProcessAttachmentWriter.h>
-#include <AVSCommon/AVS/BlockingPolicy.h>
-#include <AVSCommon/AVS/CapabilityChangeNotifier.h>
-#include <AVSCommon/SDKInterfaces/ChannelObserverInterface.h>
-#include <AVSCommon/SDKInterfaces/DirectiveHandlerInterface.h>
-#include <AVSCommon/SDKInterfaces/KeyWordObserverInterface.h>
-#include <AVSCommon/SDKInterfaces/MockLocaleAssetsManager.h>
-#include <AVSCommon/SDKInterfaces/Endpoints/MockEndpointCapabilitiesRegistrar.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
-#include <AVSCommon/Utils/LibcurlUtils/HTTPContentFetcherFactory.h>
-#include <AVSCommon/Utils/Logger/LogEntry.h>
-#include <AVSCommon/Utils/Metrics/MockMetricRecorder.h>
-#include <AVSCommon/Utils/Threading/Executor.h>
-#ifdef GSTREAMER_MEDIA_PLAYER
-#include <MediaPlayer/MediaPlayer.h>
-#else
-#include "Integration/TestMediaPlayer.h"
-#endif
-#include <acsdkInteractionModel/InteractionModelCapabilityAgent.h>
-#include <acsdkInteractionModel/InteractionModelNotifier.h>
-#include <Settings/MockSetting.h>
-#include <Settings/SpeechConfirmationSettingType.h>
-#include <Settings/WakeWordConfirmationSettingType.h>
-#include <SystemSoundPlayer/SystemSoundPlayer.h>
-
-#include "Integration/ACLTestContext.h"
-#include "Integration/ObservableMessageRequest.h"
-#include "Integration/AipStateObserver.h"
-#include "Integration/TestMessageSender.h"
-#include "Integration/TestDirectiveHandler.h"
-#include "Integration/TestExceptionEncounteredSender.h"
-#include "System/UserInactivityMonitor.h"
-
-#ifdef KWD_SENSORY
-#include "Sensory/SensoryKeywordDetector.h"
-#endif
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace alexaClientSDK::acl;
-using namespace alexaClientSDK::adsl;
-using namespace alexaClientSDK::avsCommon;
-using namespace alexaClientSDK::avsCommon::avs;
-using namespace alexaClientSDK::avsCommon::utils;
-using namespace alexaClientSDK::avsCommon::avs::attachment;
-using namespace alexaClientSDK::avsCommon::sdkInterfaces;
-using namespace capabilityAgents::aip;
-using namespace acsdkInteractionModel;
-using namespace capabilityAgents::system;
-using namespace sdkInterfaces;
-using namespace sdkInterfaces::endpoints;
-using namespace sdkInterfaces::endpoints::test;
-using namespace sdkInterfaces::test;
-using namespace avsCommon::utils::sds;
-using namespace avsCommon::utils::json;
-using namespace avsCommon::utils::metrics::test;
-using namespace afml;
-using namespace contextManager;
-using namespace settings;
-using namespace settings::test;
-using namespace testing;
-
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Tell me a Joke" to be recognized.
-static const std::string JOKE_AUDIO_FILE = "/recognize_joke_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Wikipedia" to be recognized.
-static const std::string WIKI_AUDIO_FILE = "/recognize_wiki_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Lions" to be recognized.
-static const std::string LIONS_AUDIO_FILE = "/recognize_lions_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of silence to be recognized.
-static const std::string SILENCE_AUDIO_FILE = "/recognize_silence_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Alexa, Tell me a Joke" to be recognized.
-static const std::string ALEXA_JOKE_AUDIO_FILE = "/alexa_recognize_joke_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Alexa, Wikipedia" to be recognized.
-static const std::string ALEXA_WIKI_AUDIO_FILE = "/alexa_recognize_wiki_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Alexa" then silence to be recognized.
-static const std::string ALEXA_SILENCE_AUDIO_FILE = "/alexa_recognize_silence_test.wav";
-// This is a 32KHz little endian OPUS audio file with Constant Bit rate of "What time is it?" to be recognized.
-static const std::string TIME_AUDIO_FILE_OPUS = "/utterance_time_success.opus";
-// This string to be used for Speak Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_VOLUME_STATE = "VolumeState";
-// This string to be used for Speak Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_SPEAK = "Speak";
-// This string to be used for ExpectSpeech Directives which use the NAMESPACE_SPEECH_RECOGNIZER namespace.
-static const std::string NAME_EXPECT_SPEECH = "ExpectSpeech";
-// This string to be used for ExpectSpeechTimedOut Events which use the NAMESPACE_SPEECH_RECOGNIZER namespace.
-static const std::string NAME_EXPECT_SPEECH_TIMED_OUT = "ExpectSpeechTimedOut";
-// This string to be used for SetMute Directives which use the NAMESPACE_SPEAKER namespace.
-static const std::string NAME_SET_MUTE = "SetMute";
-// This string to be used for Play Directives which use the NAMESPACE_AUDIO_PLAYER namespace.
-static const std::string NAME_PLAY = "Play";
-// This string to be used for StopCapture Directives which use the NAMESPACE_SPEECH_RECOGNIZER namespace.
-static const std::string NAME_STOP_CAPTURE = "StopCapture";
-// This string to be used for Recognize Directives which use the NAMESPACE_SPEECH_RECOGNIZER namespace.
-static const std::string NAME_RECOGNIZE = "Recognize";
-// This String to be used to register the SpeechRecognizer namespace to a DirectiveHandler.
-static const std::string NAMESPACE_SPEECH_RECOGNIZER = "SpeechRecognizer";
-// This String to be used to register the SpeechSynthesizer namespace to a DirectiveHandler.
-static const std::string NAMESPACE_SPEECH_SYNTHESIZER = "SpeechSynthesizer";
-// This String to be used to register the AudioPlayer namespace to a DirectiveHandler.
-static const std::string NAMESPACE_AUDIO_PLAYER = "AudioPlayer";
-// This String to be used to register the Speaker namespace to a DirectiveHandler.
-static const std::string NAMESPACE_SPEAKER = "Speaker";
-// This pair connects a Speak name and SpeechSynthesizer namespace for use in DirectiveHandler registration.
-static const NamespaceAndName SPEAK_PAIR = {NAMESPACE_SPEECH_SYNTHESIZER, NAME_SPEAK};
-// This pair connects a ExpectSpeech name and SpeechRecognizer namespace for use in DirectiveHandler registration.
-static const NamespaceAndName EXPECT_SPEECH_PAIR = {NAMESPACE_SPEECH_RECOGNIZER, NAME_EXPECT_SPEECH};
-// This pair connects a SetMute name and Speaker namespace for use in DirectiveHandler registration.
-static const NamespaceAndName SET_MUTE_PAIR = {NAMESPACE_SPEAKER, NAME_SET_MUTE};
-// This pair connects a SetMute name and Speaker namespace for use in DirectiveHandler registration.
-static const NamespaceAndName VOLUME_STATE_PAIR = {NAMESPACE_SPEAKER, NAME_VOLUME_STATE};
-// This pair connects a Play name and AudioPlayer namespace for use in DirectiveHandler registration.
-static const NamespaceAndName PLAY_PAIR = {NAMESPACE_AUDIO_PLAYER, NAME_PLAY};
-// This pair connects a StopCapture name and SpeechRecognizer namespace for use in DirectiveHandler registration.
-static const NamespaceAndName STOP_CAPTURE_PAIR = {NAMESPACE_SPEECH_RECOGNIZER, NAME_STOP_CAPTURE};
-/// Sample dialog activity id.
-static const std::string DIALOG_ACTIVITY_ID = "Dialog";
-/// Sample alerts activity id.
-static const std::string ALARM_ACTIVITY_ID = "Alarms";
-/// Sample content activity id.
-static const std::string CONTENT_ACTIVITY_ID = "Content";
-
-// This Integer to be used to specify a timeout in seconds for long operations.
-static const std::chrono::seconds LONG_TIMEOUT_DURATION(10);
-// This Integer to be used when it is expected the duration will timeout but some wait time is still desired.
-static const std::chrono::seconds SHORT_TIMEOUT_DURATION(2);
-// This Integer to be used when no timeout is desired.
-static const std::chrono::seconds NO_TIMEOUT_DURATION(0);
-// The length of RIFF container format which is the header of a wav file.
-static const int RIFF_HEADER_SIZE = 44;
-/// The compatible sample rate for OPUS 32KHz.
-static const unsigned int COMPATIBLE_SAMPLE_RATE_OPUS_32 = 32000;
-#ifdef KWD_SENSORY
-/// The name of the resource file required for Sensory
-static const std::string RESOURCE_FILE = "/SensoryModels/spot-alexa-rpi-31000.snsr";
-#endif
-
-/// JSON key to get the directive object of a message.
-static const std::string JSON_MESSAGE_DIRECTIVE_KEY = "directive";
-/// JSON key to get the header object of a message.
-static const std::string JSON_MESSAGE_HEADER_KEY = "header";
-/// JSON key to get the namespace value of a header.
-static const std::string JSON_MESSAGE_NAMESPACE_KEY = "namespace";
-/// JSON key to get the name value of a header.
-static const std::string JSON_MESSAGE_NAME_KEY = "name";
-/// JSON key to get the messageId value of a header.
-static const std::string JSON_MESSAGE_MESSAGE_ID_KEY = "messageId";
-/// JSON key to get the dialogRequestId value of a header.
-static const std::string JSON_MESSAGE_DIALOG_REQUEST_ID_KEY = "dialogRequestId";
-/// JSON key to get the payload object of a message.
-static const std::string JSON_MESSAGE_PAYLOAD_KEY = "payload";
-
-/**
- * The sensitivity to the keyword in the model.
- */
-/// The compatible encoding.
-static const avsCommon::utils::AudioFormat::Encoding COMPATIBLE_ENCODING =
-    avsCommon::utils::AudioFormat::Encoding::LPCM;
-/// The compatible endianness.
-static const avsCommon::utils::AudioFormat::Endianness COMPATIBLE_ENDIANNESS =
-    avsCommon::utils::AudioFormat::Endianness::LITTLE;
-/// The compatible sample rate.
-static const unsigned int COMPATIBLE_SAMPLE_RATE = 16000;
-/// The compatible bits per sample.
-static const unsigned int COMPATIBLE_SAMPLE_SIZE_IN_BITS = 16;
-/// The compatible number of channels
-static const unsigned int COMPATIBLE_NUM_CHANNELS = 1;
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("AlexaDirectiveSequencerLibraryTest");
-
-/// Path to the AlexaClientSDKConfig.json file (from command line arguments).
-static std::string g_configPath;
-/// Path to resources (e.g. audio files) for tests (from command line arguments).
-static std::string g_inputPath;
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) ::alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-class tapToTalkButton {
-public:
-    bool startRecognizing(std::shared_ptr<AudioInputProcessor> aip, std::shared_ptr<AudioProvider> audioProvider) {
-        return aip->recognize(*audioProvider, Initiator::TAP).get();
-    }
-};
-
-class holdToTalkButton {
-public:
-    bool startRecognizing(std::shared_ptr<AudioInputProcessor> aip, std::shared_ptr<AudioProvider> audioProvider) {
-        return aip->recognize(*audioProvider, Initiator::PRESS_AND_HOLD).get();
-    }
-
-    bool stopRecognizing(std::shared_ptr<AudioInputProcessor> aip) {
-        return aip->stopCapture().get();
-    }
-};
-
-#if defined(KWD_SENSORY)
-class wakeWordTrigger : public KeyWordObserverInterface {
-public:
-    wakeWordTrigger(AudioFormat compatibleAudioFormat, std::shared_ptr<AudioInputProcessor> aip) :
-            m_compatibleAudioFormat(compatibleAudioFormat),
-            m_aip(aip) {
-    }
-    void onKeyWordDetected(
-        std::shared_ptr<AudioInputStream> stream,
-        std::string keyword,
-        AudioInputStream::Index beginIndex,
-        AudioInputStream::Index endIndex,
-        std::shared_ptr<const std::vector<char>> KWDMetadata = nullptr) {
-        keyWordDetected = true;
-        ASSERT_NE(nullptr, stream);
-        auto audioProvider = AudioProvider::WakeAudioProvider(stream, m_compatibleAudioFormat);
-
-        if (m_aip) {
-            AudioInputStream::Index aipBegin = AudioInputProcessor::INVALID_INDEX;
-            AudioInputStream::Index aipEnd = AudioInputProcessor::INVALID_INDEX;
-
-            if (endIndex != KeyWordObserverInterface::UNSPECIFIED_INDEX) {
-                if (beginIndex != KeyWordObserverInterface::UNSPECIFIED_INDEX) {
-                    // If we know where the keyword starts and ends, pass both of those along to AIP.
-                    aipBegin = beginIndex;
-                    aipEnd = endIndex;
-                } else {
-                    // If we only know where the keyword ends, AIP should begin recording there.
-                    aipBegin = endIndex;
-                }
-            }
-            auto now = std::chrono::steady_clock::now();
-// Else we don't have any indices to pass along; AIP will begin recording ASAP.
-#ifdef KWD_SENSORY
-            m_aip->recognize(audioProvider, Initiator::WAKEWORD, now, aipBegin, aipEnd, keyword);
-#endif
-        }
-    }
-
-    bool keyWordDetected = false;
-    AudioFormat m_compatibleAudioFormat;
-    std::shared_ptr<AudioInputProcessor> m_aip;
-};
-#endif
-
-class testStateProvider
-        : public StateProviderInterface
-        , public RequiresShutdown {
-public:
-    testStateProvider(std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager) :
-            RequiresShutdown("testStateProvider") {
-        m_contextManager = contextManager;
-    }
-    ~testStateProvider() {
-    }
-
-    void provideState(const NamespaceAndName& nsname, const unsigned int stateRequestToken) override {
-        m_executor.submit([this, stateRequestToken] {
-            std::ostringstream context;
-            context << R"({)"
-                       R"("volume":)"
-                    << 50 << R"(,)"
-                    << R"("muted":)" << false << R"(})";
-
-            m_contextManager->setState(
-                VOLUME_STATE_PAIR, context.str(), avsCommon::avs::StateRefreshPolicy::ALWAYS, stateRequestToken);
-            m_stateRequested = true;
-        });
-    }
-
-    bool checkStateRequested() {
-        bool savedResult = false;
-        if (m_stateRequested) {
-            savedResult = true;
-            m_stateRequested = false;
-        }
-        return savedResult;
-    }
-
-protected:
-    void doShutdown() override {
-        m_contextManager.reset();
-        m_executor.shutdown();
-    }
-
-private:
-    bool m_stateRequested = false;
-    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
-    avsCommon::utils::threading::Executor m_executor;
-};
-
-/// A test observer that mocks out the ChannelObserverInterface##onFocusChanged() call.
-class TestClient : public ChannelObserverInterface {
-public:
-    /**
-     * Constructor.
-     */
-    TestClient() : m_focusState(FocusState::NONE) {
-    }
-
-    /**
-     * Implementation of the ChannelObserverInterface##onFocusChanged() callback.
-     *
-     * @param focusState The new focus state of the Channel observer.
-     * @param behavior The new MixingBehavior of the Channel observer.
-     */
-    void onFocusChanged(FocusState focusState, MixingBehavior behavior) override {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        m_queue.push_back(focusState);
-        m_focusState = focusState;
-        m_wakeTrigger.notify_all();
-    }
-
-    /**
-     * Waits for the ChannelObserverInterface##onFocusChanged() callback.
-     *
-     * @param timeout The amount of time to wait for the callback.
-     * @param focusChanged An output parameter that notifies the caller whether a callback occurred.
-     * @return Returns @c true if the callback occured within the timeout period and @c false otherwise.
-     */
-    FocusState waitForFocusChange(std::chrono::milliseconds timeout) {
-        FocusState ret;
-        std::unique_lock<std::mutex> lock(m_mutex);
-        if (!m_wakeTrigger.wait_for(lock, timeout, [this]() { return !m_queue.empty(); })) {
-            ret = FocusState::NONE;
-            return ret;
-        }
-        ret = m_queue.front();
-        m_queue.pop_front();
-        return ret;
-    }
-
-private:
-    /// The focus state of the observer.
-    FocusState m_focusState;
-
-    /// A lock to guard against focus state changes.
-    std::mutex m_mutex;
-
-    /// Trigger to wake up waitForNext calls.
-    std::condition_variable m_wakeTrigger;
-    /// Queue of received directives that have not been waited on.
-    std::deque<FocusState> m_queue;
-};
-
-class AudioInputProcessorTest : public ::testing::Test {
-protected:
-    void SetUp() override {
-        m_context = ACLTestContext::create(g_configPath);
-        ASSERT_TRUE(m_context);
-
-        m_exceptionEncounteredSender = std::make_shared<TestExceptionEncounteredSender>();
-        m_metricRecorder = std::make_shared<NiceMock<MockMetricRecorder>>();
-
-        auto registrar = std::make_shared<NiceMock<MockEndpointCapabilitiesRegistrar>>();
-        m_endpointCapabilitiesRegistrar =
-            acsdkManufactory::Annotated<DefaultEndpointAnnotation, EndpointCapabilitiesRegistrarInterface>(registrar);
-        EXPECT_CALL(
-            *(registrar.get()),
-            withCapability(A<const std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface>&>(), _))
-            .WillRepeatedly(ReturnRef(
-                *std::make_shared<avsCommon::sdkInterfaces::endpoints::test::MockEndpointCapabilitiesRegistrar>()));
-
-        DirectiveHandlerConfiguration handlerConfig;
-        handlerConfig[SET_MUTE_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
-        handlerConfig[SPEAK_PAIR] = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, true);
-        m_directiveHandler = std::make_shared<TestDirectiveHandler>(handlerConfig);
-
-        m_directiveSequencer = DirectiveSequencer::create(m_exceptionEncounteredSender, m_metricRecorder);
-        ASSERT_NE(nullptr, m_directiveSequencer);
-        m_messageInterpreter = std::make_shared<MessageInterpreter>(
-            m_exceptionEncounteredSender, m_directiveSequencer, m_context->getAttachmentManager(), m_metricRecorder);
-
-        m_compatibleAudioFormat.sampleRateHz = COMPATIBLE_SAMPLE_RATE;
-        m_compatibleAudioFormat.sampleSizeInBits = COMPATIBLE_SAMPLE_SIZE_IN_BITS;
-        m_compatibleAudioFormat.numChannels = COMPATIBLE_NUM_CHANNELS;
-        m_compatibleAudioFormat.endianness = COMPATIBLE_ENDIANNESS;
-        m_compatibleAudioFormat.encoding = COMPATIBLE_ENCODING;
-
-        size_t nWords = 1024 * 1024;
-        size_t wordSize = 2;
-        size_t maxReaders = 3;
-        size_t bufferSize = AudioInputStream::calculateBufferSize(nWords, wordSize, maxReaders);
-
-        m_wakeWordConfirmation =
-            std::make_shared<MockSetting<WakeWordConfirmationSettingType>>(getWakeWordConfirmationDefault());
-        m_speechConfirmation =
-            std::make_shared<MockSetting<SpeechConfirmationSettingType>>(getSpeechConfirmationDefault());
-
-        auto m_Buffer = std::make_shared<avsCommon::avs::AudioInputStream::Buffer>(bufferSize);
-        auto m_Sds = avsCommon::avs::AudioInputStream::create(m_Buffer, wordSize, maxReaders);
-        ASSERT_NE(nullptr, m_Sds);
-        m_AudioBuffer = std::move(m_Sds);
-        m_AudioBufferWriter =
-            m_AudioBuffer->createWriter(avsCommon::avs::AudioInputStream::Writer::Policy::NONBLOCKABLE);
-        ASSERT_NE(nullptr, m_AudioBufferWriter);
-
-        // Set up tap and hold to talk buttons.
-        m_HoldToTalkAudioProvider =
-            std::make_shared<AudioProvider>(AudioProvider::HoldAudioProvider(m_AudioBuffer, m_compatibleAudioFormat));
-        m_TapToTalkAudioProvider =
-            std::make_shared<AudioProvider>(AudioProvider::TapAudioProvider(m_AudioBuffer, m_compatibleAudioFormat));
-
-        m_tapToTalkButton = std::make_shared<tapToTalkButton>();
-        m_holdToTalkButton = std::make_shared<holdToTalkButton>();
-        m_focusManager = std::make_shared<FocusManager>(FocusManager::getDefaultAudioChannels());
-        m_dialogUXStateAggregator = std::make_shared<avsCommon::avs::DialogUXStateAggregator>();
-
-        m_stateProvider = std::make_shared<testStateProvider>(m_context->getContextManager());
-        ASSERT_TRUE(m_context->getContextManager());
-
-        m_context->getContextManager()->setStateProvider(VOLUME_STATE_PAIR, m_stateProvider);
-
-        // Set up connection and connect
-        m_avsConnectionManager = std::make_shared<TestMessageSender>(
-            m_context->getMessageRouter(), false, m_context->getConnectionStatusObserver(), m_messageInterpreter);
-        ASSERT_TRUE(m_avsConnectionManager);
-
-        connect();
-
-        m_userInactivityMonitor = UserInactivityMonitor::create(m_avsConnectionManager, m_exceptionEncounteredSender);
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-        auto systemSoundMediaPlayer = alexaClientSDK::mediaPlayer::MediaPlayer::create(
-            std::make_shared<avsCommon::utils::libcurlUtils::HTTPContentFetcherFactory>());
-#else
-        auto systemSoundMediaPlayer = std::make_shared<TestMediaPlayer>();
-#endif
-
-        m_systemSoundPlayer = applicationUtilities::systemSoundPlayer::SystemSoundPlayer::create(
-            systemSoundMediaPlayer,
-            std::make_shared<applicationUtilities::resources::audio::SystemSoundAudioFactory>());
-
-        m_interactionModelNotifier = InteractionModelNotifier::createInteractionModelNotifierInterface();
-        m_interactionModelCA = InteractionModelCapabilityAgent::create(
-            m_directiveSequencer,
-            m_exceptionEncounteredSender,
-            m_interactionModelNotifier,
-            m_endpointCapabilitiesRegistrar);
-        ASSERT_NE(nullptr, m_interactionModelCA);
-        ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(m_interactionModelCA));
-        m_interactionModelNotifier->addObserver(m_dialogUXStateAggregator);
-
-        m_AudioInputProcessor = AudioInputProcessor::create(
-            m_directiveSequencer,
-            m_avsConnectionManager,
-            m_context->getContextManager(),
-            m_focusManager,
-            m_dialogUXStateAggregator,
-            m_exceptionEncounteredSender,
-            m_userInactivityMonitor,
-            m_systemSoundPlayer,
-            std::make_shared<::testing::NiceMock<sdkInterfaces::test::MockLocaleAssetsManager>>(),
-            m_wakeWordConfirmation,
-            m_speechConfirmation,
-            std::make_shared<avsCommon::avs::CapabilityChangeNotifier>(),
-            nullptr,
-            nullptr,
-            AudioProvider::null(),
-            nullptr,
-            m_metricRecorder);
-        ASSERT_NE(nullptr, m_AudioInputProcessor);
-        m_AudioInputProcessor->addObserver(m_dialogUXStateAggregator);
-
-        m_testClient = std::make_shared<TestClient>();
-        ASSERT_TRUE(m_focusManager->acquireChannel(FocusManager::ALERT_CHANNEL_NAME, m_testClient, ALARM_ACTIVITY_ID));
-        ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-        m_StateObserver = std::make_shared<AipStateObserver>();
-        ASSERT_NE(nullptr, m_StateObserver);
-        m_AudioInputProcessor->addObserver(m_StateObserver);
-
-        ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(m_AudioInputProcessor));
-
-#if defined(KWD_SENSORY)
-        m_wakeWordTrigger = std::make_shared<wakeWordTrigger>(m_compatibleAudioFormat, m_AudioInputProcessor);
-
-#ifdef KWD_SENSORY
-        m_detector = kwd::SensoryKeywordDetector::create(
-            m_AudioBuffer,
-            m_compatibleAudioFormat,
-            {m_wakeWordTrigger},
-            // Not using an empty initializer list here to account for a GCC 4.9.2 regression
-            std::unordered_set<std::shared_ptr<KeyWordDetectorStateObserverInterface>>(),
-            g_inputPath + RESOURCE_FILE);
-        ASSERT_TRUE(m_detector);
-#endif
-#endif
-        ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(m_directiveHandler));
-
-        ASSERT_TRUE(
-            m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, NO_TIMEOUT_DURATION));
-    }
-
-    void TearDown() override {
-        disconnect();
-        // Note that these nullptr checks are needed to avoid segaults if @c SetUp() failed.
-        if (m_AudioInputProcessor) {
-            m_AudioInputProcessor->shutdown();
-        }
-        if (m_directiveSequencer) {
-            m_directiveSequencer->shutdown();
-        }
-        if (m_avsConnectionManager) {
-            m_avsConnectionManager->shutdown();
-        }
-        if (m_stateProvider) {
-            m_stateProvider->shutdown();
-        }
-        if (m_userInactivityMonitor) {
-            m_userInactivityMonitor->shutdown();
-        }
-        m_context.reset();
-    }
-
-    /**
-     * Connect to AVS.
-     */
-    void connect() {
-        m_avsConnectionManager->enable();
-        m_context->waitForConnected();
-    }
-
-    /**
-     * Disconnect from AVS.
-     */
-    void disconnect() {
-        if (m_avsConnectionManager) {
-            m_avsConnectionManager->disable();
-            m_context->waitForDisconnected();
-        }
-    }
-
-    bool checkSentEventName(std::shared_ptr<TestMessageSender> connectionManager, std::string expectedName) {
-        TestMessageSender::SendParams sendParams = connectionManager->waitForNext(SHORT_TIMEOUT_DURATION);
-        if (TestMessageSender::SendParams::Type::SEND == sendParams.type) {
-            std::string eventString;
-            std::string eventHeader;
-            std::string eventName;
-            jsonUtils::retrieveValue(sendParams.request->getJsonContent(), "event", &eventString);
-            jsonUtils::retrieveValue(eventString, "header", &eventHeader);
-            jsonUtils::retrieveValue(eventHeader, "name", &eventName);
-            if (eventName == expectedName) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    /// Context for running ACL based tests.
-    std::unique_ptr<ACLTestContext> m_context;
-
-    std::shared_ptr<TestMessageSender> m_avsConnectionManager;
-    std::shared_ptr<TestDirectiveHandler> m_directiveHandler;
-    std::shared_ptr<TestExceptionEncounteredSender> m_exceptionEncounteredSender;
-    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
-    std::shared_ptr<DirectiveSequencerInterface> m_directiveSequencer;
-    std::shared_ptr<MessageInterpreter> m_messageInterpreter;
-    std::shared_ptr<afml::FocusManager> m_focusManager;
-    std::shared_ptr<avsCommon::avs::DialogUXStateAggregator> m_dialogUXStateAggregator;
-    std::shared_ptr<TestClient> m_testClient;
-    std::shared_ptr<UserInactivityMonitor> m_userInactivityMonitor;
-    std::shared_ptr<AudioInputProcessor> m_AudioInputProcessor;
-    std::shared_ptr<acsdkInteractionModelInterfaces::InteractionModelNotifierInterface> m_interactionModelNotifier;
-    std::shared_ptr<InteractionModelCapabilityAgent> m_interactionModelCA;
-    acsdkManufactory::Annotated<DefaultEndpointAnnotation, EndpointCapabilitiesRegistrarInterface>
-        m_endpointCapabilitiesRegistrar;
-    std::shared_ptr<AipStateObserver> m_StateObserver;
-    std::shared_ptr<tapToTalkButton> m_tapToTalkButton;
-    std::shared_ptr<holdToTalkButton> m_holdToTalkButton;
-    std::shared_ptr<testStateProvider> m_stateProvider;
-    std::unique_ptr<AudioInputStream::Writer> m_AudioBufferWriter;
-    std::shared_ptr<AudioInputStream> m_AudioBuffer;
-    std::shared_ptr<AudioProvider> m_TapToTalkAudioProvider;
-    std::shared_ptr<AudioProvider> m_HoldToTalkAudioProvider;
-    avsCommon::utils::AudioFormat m_compatibleAudioFormat;
-    std::shared_ptr<applicationUtilities::systemSoundPlayer::SystemSoundPlayer> m_systemSoundPlayer;
-    std::shared_ptr<settings::test::MockSetting<settings::WakeWordConfirmationSettingType>> m_wakeWordConfirmation;
-    std::shared_ptr<settings::test::MockSetting<settings::SpeechConfirmationSettingType>> m_speechConfirmation;
-#if defined(KWD_SENSORY)
-    std::shared_ptr<wakeWordTrigger> m_wakeWordTrigger;
-    std::unique_ptr<kwd::SensoryKeywordDetector> m_detector;
-#endif
-};
-
-template <typename T>
-std::vector<T> readAudioFromFile(const std::string& fileName, const int& headerPosition, bool* errorOccurred) {
-    std::ifstream inputFile(fileName.c_str(), std::ifstream::binary);
-    if (!inputFile.good()) {
-        std::cout << "Couldn't open audio file!" << std::endl;
-        if (errorOccurred) {
-            *errorOccurred = true;
-        }
-        return {};
-    }
-    inputFile.seekg(0, std::ios::end);
-    int fileLengthInBytes = inputFile.tellg();
-
-    if (fileLengthInBytes <= headerPosition) {
-        std::cout << "File should be larger than header position" << std::endl;
-        if (errorOccurred) {
-            *errorOccurred = true;
-        }
-        return {};
-    }
-
-    inputFile.seekg(headerPosition, std::ios::beg);
-
-    int numSamples = (fileLengthInBytes - headerPosition) / sizeof(T);
-
-    std::vector<T> retVal(numSamples, 0);
-
-    inputFile.read((char*)&retVal[0], numSamples * sizeof(T));
-
-    if (static_cast<size_t>(inputFile.gcount()) != numSamples * sizeof(T)) {
-        std::cout << "Error reading audio file" << std::endl;
-        if (errorOccurred) {
-            *errorOccurred = true;
-        }
-        return {};
-    }
-
-    inputFile.close();
-    if (errorOccurred) {
-        *errorOccurred = false;
-    }
-    return retVal;
-}
-
-/**
- * Test AudioInputProcessor's ability to handle a simple interation triggered by a wakeword.
- *
- * To do this, audio of "Alexa, tell me a joke" is fed into a stream that is being read by a wake word engine. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with a SetMute and Speak
- * directive.
- */
-#if defined(KWD_SENSORY)
-TEST_F(AudioInputProcessorTest, test_wakeWordJoke) {
-    // Put audio onto the SDS saying "Alexa, Tell me a joke".
-    bool error;
-    std::string file = g_inputPath + ALEXA_JOKE_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that prehandle and handle for setMute and Speak has reached the test SS.
-    TestDirectiveHandler::DirectiveParams params =
-        m_directiveHandler->waitForNext(std::chrono::seconds(LONG_TIMEOUT_DURATION));
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    }
-}
-#endif
-
-/**
- * Test AudioInputProcessor's ability to handle a recognize triggered by a wakeword followed by silence .
- *
- * To do this, audio of "Alexa, ........." is fed into a stream that is being read by a wake word engine. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with no directives.
- */
-#if defined(KWD_SENSORY)
-TEST_F(AudioInputProcessorTest, test_wakeWordSilence) {
-    // Put audio onto the SDS saying "Alexa ......".
-    bool error;
-    std::string file = g_inputPath + ALEXA_SILENCE_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // Check that a recognize event was sent
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that no prehandle or handle for setMute and Speak has reached the test SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    ASSERT_EQ(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-}
-#endif
-
-/**
- * Test AudioInputProcessor's ability to handle a multiturn interation triggered by a wakeword.
- *
- * To do this, audio of "Alexa, wikipedia" is fed into a stream that is being read by a wake word engine. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with a SetMute, Speak,
- * and ExpectSpeech directive. Audio of "Lions" is then fed into the stream and another recognize event is sent.
- */
-#if defined(KWD_SENSORY)
-TEST_F(AudioInputProcessorTest, test_wakeWordMultiturn) {
-    // Put audio onto the SDS saying "Alexa, wikipedia".
-    bool error;
-    std::string file = g_inputPath + ALEXA_WIKI_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that prehandle and handle for setMute and Speak has reached the test SS.
-    TestDirectiveHandler::DirectiveParams params =
-        m_directiveHandler->waitForNext(std::chrono::seconds(LONG_TIMEOUT_DURATION));
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    }
-
-    // Check that AIP is now in EXPECTING_SPEECH state.
-    ASSERT_TRUE(m_StateObserver->checkState(
-        AudioInputProcessorObserverInterface::State::EXPECTING_SPEECH, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying "Lions".
-    bool secondError;
-    std::string secondFile = g_inputPath + LIONS_AUDIO_FILE;
-    std::vector<int16_t> secondAudioData = readAudioFromFile<int16_t>(secondFile, RIFF_HEADER_SIZE, &secondError);
-    ASSERT_FALSE(secondError);
-    m_AudioBufferWriter->write(secondAudioData.data(), secondAudioData.size());
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that prehandle and handle for setMute and Speak has reached the test SS.
-    params = m_directiveHandler->waitForNext(LONG_TIMEOUT_DURATION);
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    }
-}
-#endif
-
-/**
- * Test AudioInputProcessor's ability to handle a simple interation triggered by a wakeword but no user response.
- *
- * To do this, audio of "Alexa, wikipedia" is fed into a stream that is being read by a wake word engine. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with a SetMute, Speak,
- * and ExpectSpeech directive. Audio of "...." is then fed into the stream and another recognize event is sent
- * but no directives are given in response.
- */
-#if defined(KWD_SENSORY)
-TEST_F(AudioInputProcessorTest, test_wakeWordMultiturnWithoutUserResponse) {
-    // Put audio onto the SDS saying "Alexa, wikipedia".
-    bool error;
-    std::string file = g_inputPath + ALEXA_WIKI_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // Check that a recognize event was sent
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that prehandle and handle for setMute and Speak has reached the test SS
-    TestDirectiveHandler::DirectiveParams params =
-        m_directiveHandler->waitForNext(std::chrono::seconds(LONG_TIMEOUT_DURATION));
-
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            std::this_thread::sleep_for(std::chrono::seconds(2));
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    }
-
-    // Check that AIP is now in EXPECTING_SPEECH state.
-    ASSERT_TRUE(m_StateObserver->checkState(
-        AudioInputProcessorObserverInterface::State::EXPECTING_SPEECH, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying ".......".
-    bool secondError;
-    std::string secondFile = g_inputPath + SILENCE_AUDIO_FILE;
-    std::vector<int16_t> secondAudioData = readAudioFromFile<int16_t>(secondFile, RIFF_HEADER_SIZE, &secondError);
-    ASSERT_FALSE(secondError);
-    m_AudioBufferWriter->write(secondAudioData.data(), secondAudioData.size());
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was not sent.
-    ASSERT_FALSE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_FALSE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has not changed.
-    ASSERT_EQ(m_testClient->waitForFocusChange(SHORT_TIMEOUT_DURATION), FocusState::NONE);
-}
-#endif
-
-/**
- * Test AudioInputProcessor's ability to handle a simple interation triggered by a tap to talk button.
- *
- * To do this, audio of "Tell me a joke" is fed into a stream after button sends recognize to AudioInputProcessor. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with a SetMute and Speak
- * directive.
- */
-TEST_F(AudioInputProcessorTest, DISABLED_test_tapToTalkJoke) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_tapToTalkButton->startRecognizing(m_AudioInputProcessor, m_TapToTalkAudioProvider));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying "Tell me a joke".
-    bool error;
-    std::string file = g_inputPath + JOKE_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that prehandle and handle for setMute and Speak has reached the test SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(LONG_TIMEOUT_DURATION);
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    }
-}
-
-// ACSDK-2410 Disable this test temporarily due to running into issues with Raspberry Pi
-TEST_F(AudioInputProcessorTest, DISABLED_test_tapToTalkTimeOpus) {
-    m_compatibleAudioFormat.sampleRateHz = COMPATIBLE_SAMPLE_RATE_OPUS_32;
-    m_compatibleAudioFormat.numChannels = COMPATIBLE_NUM_CHANNELS;
-    m_compatibleAudioFormat.endianness = COMPATIBLE_ENDIANNESS;
-    m_compatibleAudioFormat.encoding = avsCommon::utils::AudioFormat::Encoding::OPUS;
-
-    std::shared_ptr<AudioProvider> tapToTalkAudioProvider =
-        std::make_shared<AudioProvider>(AudioProvider::TapAudioProvider(m_AudioBuffer, m_compatibleAudioFormat));
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_tapToTalkButton->startRecognizing(m_AudioInputProcessor, tapToTalkAudioProvider));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying "What time is it?".
-    bool error;
-    std::string file = g_inputPath + TIME_AUDIO_FILE_OPUS;
-    int headerSize = 0;
-    std::vector<uint8_t> audioData = readAudioFromFile<uint8_t>(file, headerSize, &error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-}
-
-/**
- * Test AudioInputProcessor's ability to handle a silent interation triggered by a tap to talk button.
- *
- * To do this, audio of "....." is fed into a stream after button sends recognize to AudioInputProcessor. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds no directives.
- */
-TEST_F(AudioInputProcessorTest, DISABLED_test_tapToTalkSilence) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_tapToTalkButton->startRecognizing(m_AudioInputProcessor, m_TapToTalkAudioProvider));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying ".......".
-    bool error;
-    std::string file = g_inputPath + SILENCE_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that no directives arrived to the fake SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    ASSERT_EQ(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-}
-
-/**
- * Test AudioInputProcessor's ability to handle no audio being written triggered by a tap to talk button.
- *
- * To do this, no audio is fed into a stream after button sends recognize to AudioInputProcessor. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with no directive.
- */
-TEST_F(AudioInputProcessorTest, test_tapToTalkNoAudio) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_tapToTalkButton->startRecognizing(m_AudioInputProcessor, m_TapToTalkAudioProvider));
-
-    // Put no audio onto the SDS.
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that a recognize event was sent
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has not changed.
-    ASSERT_EQ(m_testClient->waitForFocusChange(SHORT_TIMEOUT_DURATION), FocusState::NONE);
-
-    // Check that no directives arrived to the fake SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    ASSERT_EQ(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-}
-
-/**
- * Test AudioInputProcessor's ability to handle an interation triggered by a tap to talk button with wake word.
- *
- * To do this, audio of "Alexa, Tell me a joke" is fed into a stream after button sends recognize to
- * AudioInputProcessor. The AudioInputProcessor is then observed to send only one Recognize event to AVS which responds
- * with a SetMute and Speak directive.
- */
-#if defined(KWD_SENSORY)
-TEST_F(AudioInputProcessorTest, test_tapToTalkWithWakeWordConflict) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_tapToTalkButton->startRecognizing(m_AudioInputProcessor, m_TapToTalkAudioProvider));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying "Alexa, Tell me a joke".
-    bool error;
-    std::string file = g_inputPath + ALEXA_JOKE_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that prehandle and handle for setMute and Speak has reached the test SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(LONG_TIMEOUT_DURATION);
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    }
-}
-#endif
-
-/**
- * Test AudioInputProcessor's ability to handle a multiturn interation triggered by a tap to talk button.
- *
- * To do this, audio of "Wikipedia" is fed into a stream after button sends recognize to AudioInputProcessor. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with a SetMute, Speak,
- * and ExpectSpeech directive. Audio of "Lions" is then fed into the stream and another recognize event is sent.
- */
-TEST_F(AudioInputProcessorTest, test_tapToTalkMultiturn) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_tapToTalkButton->startRecognizing(m_AudioInputProcessor, m_TapToTalkAudioProvider));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying "Wikipedia".
-    bool error;
-    std::string file = g_inputPath + WIKI_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that prehandle and handle for setMute and Speak has reached the test SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(LONG_TIMEOUT_DURATION);
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            std::this_thread::sleep_for(std::chrono::seconds(2));
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(SHORT_TIMEOUT_DURATION);
-    }
-
-    // Check that AIP is now in EXPECTING_SPEECH state.
-    ASSERT_TRUE(m_StateObserver->checkState(
-        AudioInputProcessorObserverInterface::State::EXPECTING_SPEECH, SHORT_TIMEOUT_DURATION));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, SHORT_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying "Lions".
-    bool secondError;
-    std::string secondFile = g_inputPath + LIONS_AUDIO_FILE;
-    std::vector<int16_t> secondAudioData = readAudioFromFile<int16_t>(secondFile, RIFF_HEADER_SIZE, &secondError);
-    ASSERT_FALSE(secondError);
-    m_AudioBufferWriter->write(secondAudioData.data(), secondAudioData.size());
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that prehandle and handle for setMute and Speak has reached the test SS.
-    params = m_directiveHandler->waitForNext(LONG_TIMEOUT_DURATION);
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    }
-}
-
-/**
- * Test AudioInputProcessor's ability to handle a multiturn interation triggered by a tap to talk button but no user
- * response.
- *
- * To do this, audio of "Wikipedia" is fed into a stream after button sends recognize to AudioInputProcessor. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with a SetMute, Speak,
- * and ExpectSpeech directive. Audio of "...." is then fed into the stream and another recognize event is sent
- * but no directives are given in response.
- */
-TEST_F(AudioInputProcessorTest, DISABLED_test_tapToTalkMultiturnWithoutUserResponse) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_tapToTalkButton->startRecognizing(m_AudioInputProcessor, m_TapToTalkAudioProvider));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying "Wikipedia".
-    bool error;
-    std::string file = g_inputPath + WIKI_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    bool expectSpeechFound = true;
-    TestDirectiveHandler::DirectiveParams params;
-    while (expectSpeechFound) {
-        // Check that AIP is in an IDLE state before starting.
-        ASSERT_TRUE(
-            m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-        // Check that prehandle and handle for setMute and Speak has reached the test SS.
-        params = m_directiveHandler->waitForNext(SHORT_TIMEOUT_DURATION);
-        ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-        while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-            if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-                std::this_thread::sleep_for(std::chrono::seconds(2));
-                params.result->setCompleted();
-            }
-            params = m_directiveHandler->waitForNext(SHORT_TIMEOUT_DURATION);
-        }
-
-        // Check that AIP is now in EXPECTING_SPEECH state.
-        ASSERT_TRUE(m_StateObserver->checkState(
-            AudioInputProcessorObserverInterface::State::EXPECTING_SPEECH, SHORT_TIMEOUT_DURATION));
-
-        // Put audio onto the SDS saying ".......".
-        bool secondError;
-        std::string secondFile = g_inputPath + SILENCE_AUDIO_FILE;
-        std::vector<int16_t> secondAudioData = readAudioFromFile<int16_t>(secondFile, RIFF_HEADER_SIZE, &secondError);
-        ASSERT_FALSE(secondError);
-        m_AudioBufferWriter->write(secondAudioData.data(), secondAudioData.size());
-
-        // Check that AIP is now in RECOGNIZING state.
-        ASSERT_TRUE(m_StateObserver->checkState(
-            AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-        // Check that a recognize event was sent.
-        ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-        // The test channel client has been notified the alarm channel has been backgrounded.
-        ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-        // Check that AIP is in BUSY state.
-        ASSERT_TRUE(
-            m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-        // Check that AIP is in an IDLE state.
-        ASSERT_TRUE(
-            m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-        // Check that the test context provider was asked to provide context for the event.
-        ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-        // The test channel client has been notified the alarm channel has been foregrounded.
-        ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-        // Check that the test context provider was asked to provide context for the event.
-        ASSERT_FALSE(m_stateProvider->checkStateRequested());
-        params = m_directiveHandler->waitForNext(SHORT_TIMEOUT_DURATION);
-        if (params.type == TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-            expectSpeechFound = false;
-        }
-    }
-    // The test channel client has not changed.
-    ASSERT_EQ(m_testClient->waitForFocusChange(SHORT_TIMEOUT_DURATION), FocusState::NONE);
-
-    // Check that a recognize event was not sent.
-    ASSERT_FALSE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that no directives arrived to the fake SS.
-    ASSERT_EQ(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-}
-
-/**
- * Test AudioInputProcessor's ability to handle a cancel partway through an interaction.
- *
- * To do this, audio of "Tell me a joke" is fed into a stream after button sends recognize to AudioInputProcessor. The
- * button then sends a reset command and no recognize event is sent.
- */
-TEST_F(AudioInputProcessorTest, test_tapToTalkCancel) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_tapToTalkButton->startRecognizing(m_AudioInputProcessor, m_TapToTalkAudioProvider));
-
-    // Cancel the interaction.
-    m_AudioInputProcessor->resetState();
-
-    // Check that AIP was briefly in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying "Tell me a joke".
-    bool error;
-    std::string file = g_inputPath + JOKE_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that no directives arrived to the fake SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    ASSERT_EQ(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-}
-
-/**
- * Test AudioInputProcessor's ability to handle a simple interation triggered by a hold to talk button.
- *
- * To do this, audio of "Tell me a joke" is fed into a stream after button sends recognize to AudioInputProcessor. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with a SetMute and Speak
- * directive.
- */
-TEST_F(AudioInputProcessorTest, test_holdToTalkJoke) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_NE(nullptr, m_HoldToTalkAudioProvider);
-    ASSERT_TRUE(m_holdToTalkButton->startRecognizing(m_AudioInputProcessor, m_HoldToTalkAudioProvider));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying "Tell me a joke".
-    bool error;
-    std::string file = g_inputPath + JOKE_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Stop holding the button.
-    ASSERT_TRUE(m_holdToTalkButton->stopRecognizing(m_AudioInputProcessor));
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that prehandle and handle for setMute and Speak has reached the test SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(LONG_TIMEOUT_DURATION);
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    }
-}
-
-/**
- * Test AudioInputProcessor's ability to handle a multiturn interation triggered by a hold to talk button.
- *
- * To do this, audio of "Wikipedia" is fed into a stream after button sends recognize to AudioInputProcessor. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with a SetMute, Speak,
- * and ExpectSpeech directive. Audio of "Lions" is then fed into the stream and another recognize event is sent.
- */
-TEST_F(AudioInputProcessorTest, DISABLED_test_holdToTalkMultiturn) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_holdToTalkButton->startRecognizing(m_AudioInputProcessor, m_HoldToTalkAudioProvider));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying "Wikipedia".
-    bool error;
-    std::string file = g_inputPath + WIKI_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Stop holding the button.
-    ASSERT_TRUE(m_holdToTalkButton->stopRecognizing(m_AudioInputProcessor));
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that prehandle and handle for setMute and Speak has reached the test SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(LONG_TIMEOUT_DURATION);
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            std::this_thread::sleep_for(std::chrono::seconds(2));
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(SHORT_TIMEOUT_DURATION);
-    }
-
-    // Check that AIP is now in EXPECTING_SPEECH state.
-    ASSERT_TRUE(m_StateObserver->checkState(
-        AudioInputProcessorObserverInterface::State::EXPECTING_SPEECH, LONG_TIMEOUT_DURATION));
-
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_holdToTalkButton->startRecognizing(m_AudioInputProcessor, m_HoldToTalkAudioProvider));
-
-    // Put audio onto the SDS of "Lions".
-    bool secondError;
-    file = g_inputPath + LIONS_AUDIO_FILE;
-    std::vector<int16_t> secondAudioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &secondError);
-    ASSERT_FALSE(secondError);
-    m_AudioBufferWriter->write(secondAudioData.data(), secondAudioData.size());
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Stop holding the button.
-    ASSERT_TRUE(m_holdToTalkButton->stopRecognizing(m_AudioInputProcessor));
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that prehandle and handle for setMute and Speak has reached the test SS.
-    params = m_directiveHandler->waitForNext(LONG_TIMEOUT_DURATION);
-    params = m_directiveHandler->waitForNext(SHORT_TIMEOUT_DURATION);
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    }
-}
-
-/**
- * Test AudioInputProcessor's ability to handle a multiturn interation triggered by a hold to talk button but no user
- * response.
- *
- * To do this, audio of "Wikipedia" is fed into a stream after button sends recognize to AudioInputProcessor. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with a SetMute, Speak,
- * and ExpectSpeech directive. Audio of "...." is then fed into the stream and another recognize event is sent
- * but no directives are given in response.
- */
-TEST_F(AudioInputProcessorTest, DISABLED_test_holdToTalkMultiTurnWithSilence) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_holdToTalkButton->startRecognizing(m_AudioInputProcessor, m_HoldToTalkAudioProvider));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying "Wikipedia".
-    bool error;
-    std::string file = g_inputPath + WIKI_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Stop holding the button.
-    ASSERT_TRUE(m_holdToTalkButton->stopRecognizing(m_AudioInputProcessor));
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    bool expectSpeechFound = true;
-    TestDirectiveHandler::DirectiveParams params;
-    while (expectSpeechFound) {
-        // Check that AIP is in an IDLE state before starting.
-        ASSERT_TRUE(
-            m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-        // Check that prehandle and handle for setMute and Speak has reached the test SS.
-        params = m_directiveHandler->waitForNext(LONG_TIMEOUT_DURATION);
-
-        ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-
-        while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-            if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-                std::this_thread::sleep_for(std::chrono::seconds(2));
-                params.result->setCompleted();
-            }
-            params = m_directiveHandler->waitForNext(SHORT_TIMEOUT_DURATION);
-        }
-
-        // Check that AIP is now in EXPECTING_SPEECH state.
-        ASSERT_TRUE(m_StateObserver->checkState(
-            AudioInputProcessorObserverInterface::State::EXPECTING_SPEECH, SHORT_TIMEOUT_DURATION));
-
-        // Signal to the AIP to start recognizing.
-        ASSERT_TRUE(m_holdToTalkButton->startRecognizing(m_AudioInputProcessor, m_HoldToTalkAudioProvider));
-
-        // Put audio onto the SDS saying ".......".
-        bool secondError;
-        std::string secondFile = g_inputPath + SILENCE_AUDIO_FILE;
-        std::vector<int16_t> secondAudioData = readAudioFromFile<int16_t>(secondFile, RIFF_HEADER_SIZE, &secondError);
-        ASSERT_FALSE(secondError);
-        m_AudioBufferWriter->write(secondAudioData.data(), secondAudioData.size());
-
-        // Check that AIP is now in RECOGNIZING state.
-        ASSERT_TRUE(m_StateObserver->checkState(
-            AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-        // Stop holding the button.
-        ASSERT_TRUE(m_holdToTalkButton->stopRecognizing(m_AudioInputProcessor));
-
-        // Check that a recognize event was sent.
-        ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-        // The test channel client has been notified the alarm channel has been backgrounded.
-        ASSERT_EQ(m_testClient->waitForFocusChange(NO_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-        // Check that AIP is in BUSY state.
-        ASSERT_TRUE(
-            m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-        // Check that AIP is in an IDLE state.
-        ASSERT_TRUE(
-            m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-        // Check that the test context provider was asked to provide context for the event.
-        ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-        // The test channel client has been notified the alarm channel has been foregrounded.
-        ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-        // Check that the test context provider was asked to provide context for the event.
-        ASSERT_FALSE(m_stateProvider->checkStateRequested());
-        params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-        if (params.type == TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-            expectSpeechFound = false;
-        }
-    }
-    // The test channel client has not changed.
-    ASSERT_EQ(m_testClient->waitForFocusChange(SHORT_TIMEOUT_DURATION), FocusState::NONE);
-
-    // Check that a recognize event was not sent.
-    ASSERT_FALSE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that no directives arrived to the fake SS.
-    ASSERT_EQ(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-}
-
-/**
- * Test AudioInputProcessor's ability to handle a multiturn interation triggered by a hold to talk button that times
- * out.
- *
- * To do this, audio of "Wikipedia" is fed into a stream after button sends recognize to AudioInputProcessor. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with a SetMute, Speak,
- * and ExpectSpeech directive. The button does not trigger another recognize so no recognize event is sent
- * and no directives are given in response. ExpectSpeechTimedOut event is observed to be sent.
- */
-TEST_F(AudioInputProcessorTest, DISABLED_test_holdToTalkMultiturnWithTimeOut) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_holdToTalkButton->startRecognizing(m_AudioInputProcessor, m_HoldToTalkAudioProvider));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Put audio onto the SDS saying "Wikipedia".
-    bool error;
-    std::string file = g_inputPath + WIKI_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Stop holding the button.
-    ASSERT_TRUE(m_holdToTalkButton->stopRecognizing(m_AudioInputProcessor));
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that prehandle and handle for setMute and Speak has reached the test SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(LONG_TIMEOUT_DURATION);
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.isHandle() && params.directive->getName() == NAME_SPEAK) {
-            std::this_thread::sleep_for(std::chrono::seconds(2));
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(SHORT_TIMEOUT_DURATION);
-    }
-
-    // Do not signal to the AIP to start recognizing.
-
-    // Check that AIP is now in EXPECTING_SPEECH state.
-    ASSERT_TRUE(m_StateObserver->checkState(
-        AudioInputProcessorObserverInterface::State::EXPECTING_SPEECH, LONG_TIMEOUT_DURATION));
-
-    // The test channel client has stayed foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(SHORT_TIMEOUT_DURATION), FocusState::NONE);
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that ExpectSpeechTimeOut event has been sent.
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_EXPECT_SPEECH_TIMED_OUT));
-}
-
-/**
- * Test AudioInputProcessor's ability to handle no audio being written triggered by a hold to talk button.
- *
- * To do this, no audio is fed into a stream after button sends recognize to AudioInputProcessor. The
- * AudioInputProcessor is then observed to send a Recognize event to AVS which responds with no directive.
- */
-TEST_F(AudioInputProcessorTest, test_holdToTalkNoAudio) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_TRUE(m_holdToTalkButton->startRecognizing(m_AudioInputProcessor, m_HoldToTalkAudioProvider));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Write nothing to the SDS.
-
-    // The test channel client has been notified the alarm channel has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // Stop holding the button.
-    ASSERT_TRUE(m_holdToTalkButton->stopRecognizing(m_AudioInputProcessor));
-
-    // Check that AIP is in BUSY state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::BUSY, LONG_TIMEOUT_DURATION));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(LONG_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // Check that a recognize event was sent
-    ASSERT_TRUE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that no prehandle or handle for setMute and Speak has reached the test SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    ASSERT_EQ(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-}
-
-/**
- * Test AudioInputProcessor's ability to handle a cancel partway through a hold to talk interaction.
- *
- * To do this, audio of "Tell me a joke" is fed into a stream after button sends recognize to AudioInputProcessor. The
- * button then sends a cancel command and no recognize event is sent.
- */
-TEST_F(AudioInputProcessorTest, test_holdToTalkCancel) {
-    // Signal to the AIP to start recognizing.
-    ASSERT_NE(nullptr, m_HoldToTalkAudioProvider);
-    ASSERT_TRUE(m_holdToTalkButton->startRecognizing(m_AudioInputProcessor, m_HoldToTalkAudioProvider));
-
-    // Check that AIP is now in RECOGNIZING state.
-    ASSERT_TRUE(
-        m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::RECOGNIZING, LONG_TIMEOUT_DURATION));
-
-    // Cancel the recognize.
-    m_AudioInputProcessor->resetState();
-
-    // Put audio onto the SDS saying "Tell me a joke".
-    bool error;
-    std::string file = g_inputPath + JOKE_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    ASSERT_FALSE(audioData.empty());
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // Stop holding the button.
-    ASSERT_FALSE(m_holdToTalkButton->stopRecognizing(m_AudioInputProcessor));
-
-    // Check that AIP is in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, LONG_TIMEOUT_DURATION));
-
-    // Check that the test context provider was not asked to provide context for the event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // Check that no recognize event was sent.
-    ASSERT_FALSE(checkSentEventName(m_avsConnectionManager, NAME_RECOGNIZE));
-
-    // Check that no prehandle or handle for setMute and Speak has reached the test SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    ASSERT_EQ(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-}
-
-/**
- * Test AudioInputProcessor's ability to not handle audio when no recognize occurs.
- *
- * To do this, audio of "Tell me a joke" is fed into a stream that is being read by a wake word engine. The
- * lack of the wakeword or button-initiated recognize results in no recognize event being sent.
- */
-TEST_F(AudioInputProcessorTest, test_audioWithoutAnyTrigger) {
-    // Put audio onto the SDS saying "Tell me a joke" without a trigger.
-    bool error;
-    std::string file = g_inputPath + JOKE_AUDIO_FILE;
-    std::vector<int16_t> audioData = readAudioFromFile<int16_t>(file, RIFF_HEADER_SIZE, &error);
-    ASSERT_FALSE(error);
-    m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-    // Check that AIP is still in an IDLE state.
-    ASSERT_TRUE(m_StateObserver->checkState(AudioInputProcessorObserverInterface::State::IDLE, SHORT_TIMEOUT_DURATION));
-
-    // Check that the test context provider was asked to provide context as the post-connect objects would have fetched
-    // context to send StateSynchronizer event.
-    ASSERT_TRUE(m_stateProvider->checkStateRequested());
-
-    // The test channel client has been not notified the alarm channel has been foregrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(SHORT_TIMEOUT_DURATION), FocusState::NONE);
-
-    // Check that no prehandle or handle has reached the test SS.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(NO_TIMEOUT_DURATION);
-    ASSERT_EQ(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-int main(int argc, char** argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-    if (argc < 3) {
-        std::cerr << "USAGE: " << std::string(argv[0]) << " <path_to_AlexaClientSDKConfig.json> <path_to_inputs_folder>"
-                  << std::endl;
-        return 1;
-
-    } else {
-        alexaClientSDK::integration::test::g_configPath = std::string(argv[1]);
-        alexaClientSDK::integration::test::g_inputPath = std::string(argv[2]);
-        return RUN_ALL_TESTS();
-    }
-}
diff --git a/Integration/test/AudioPlayerIntegrationTest.cpp b/Integration/test/AudioPlayerIntegrationTest.cpp
deleted file mode 100644
index bd3d00f86c..0000000000
--- a/Integration/test/AudioPlayerIntegrationTest.cpp
+++ /dev/null
@@ -1,725 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/// @file AudioPlayerIntegrationTest.cpp
-
-#include <chrono>
-#include <deque>
-#include <fstream>
-#include <iostream>
-#include <mutex>
-#include <string>
-
-#include <gtest/gtest.h>
-
-#include <ADSL/DirectiveSequencer.h>
-#include <ADSL/MessageInterpreter.h>
-#include <AFML/FocusManager.h>
-#include <AIP/AudioInputProcessor.h>
-#include <AIP/AudioProvider.h>
-#include <AIP/Initiator.h>
-#include <acsdkAudioPlayer/AudioPlayer.h>
-#include <Audio/SystemSoundAudioFactory.h>
-#include <AVSCommon/AVS/Attachment/InProcessAttachmentWriter.h>
-#include <AVSCommon/AVS/CapabilityChangeNotifier.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
-#include <AVSCommon/Utils/LibcurlUtils/HTTPContentFetcherFactory.h>
-#include <AVSCommon/SDKInterfaces/MockChannelVolumeInterface.h>
-#include <AVSCommon/SDKInterfaces/MockLocaleAssetsManager.h>
-#include <AVSCommon/Utils/Logger/LogEntry.h>
-#include <AVSCommon/Utils/Metrics/MockMetricRecorder.h>
-#include <Captions/CaptionManagerInterface.h>
-#ifdef GSTREAMER_MEDIA_PLAYER
-#include <MediaPlayer/MediaPlayer.h>
-#else
-#include "Integration/TestMediaPlayer.h"
-#endif
-
-#include <PlaybackController/PlaybackController.h>
-#include <PlaybackController/PlaybackRouter.h>
-#include <SpeechSynthesizer/SpeechSynthesizer.h>
-#include <System/UserInactivityMonitor.h>
-#include <Settings/MockSetting.h>
-#include <Settings/SpeechConfirmationSettingType.h>
-#include <Settings/WakeWordConfirmationSettingType.h>
-#include <SystemSoundPlayer/SystemSoundPlayer.h>
-#include <AVSCommon/Utils/MediaPlayer/PooledMediaResourceProvider.h>
-
-#include "Integration/ACLTestContext.h"
-#include "Integration/ObservableMessageRequest.h"
-#include "Integration/TestDirectiveHandler.h"
-#include "Integration/TestExceptionEncounteredSender.h"
-#include "Integration/TestMessageSender.h"
-#include "Integration/TestSpeechSynthesizerObserver.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace acl;
-using namespace adsl;
-using namespace avsCommon;
-using namespace avsCommon::avs;
-using namespace avsCommon::avs::attachment;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::sdkInterfaces::test;
-using namespace avsCommon::utils::mediaPlayer;
-using namespace contextManager;
-using namespace sdkInterfaces;
-using namespace avsCommon::utils::sds;
-using namespace avsCommon::utils::json;
-using namespace capabilityAgents::aip;
-using namespace capabilityAgents::playbackController;
-using namespace afml;
-using namespace capabilityAgents::speechSynthesizer;
-using namespace capabilityAgents::system;
-using namespace settings;
-using namespace settings::test;
-using namespace testing;
-#ifdef GSTREAMER_MEDIA_PLAYER
-using namespace mediaPlayer;
-#endif
-
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Sing me a song" to be recognized.
-static const std::string RECOGNIZE_SING_FILE_NAME = "/recognize_sing_song_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Flashbriefing" to be recognized.
-static const std::string RECOGNIZE_FLASHBRIEFING_FILE_NAME = "/recognize_flashbriefing_test.wav";
-
-// This string to be used for PlaybackStarted Directives which use the AudioPlayer namespace.
-static const std::string NAME_PLAYBACK_STARTED = "PlaybackStarted";
-// This string to be used for PlaybackNearlyFinished Directives which use the AudioPlayer namespace.
-static const std::string NAME_PLAYBACK_NEARLY_FINISHED = "PlaybackNearlyFinished";
-// This string to be used for PlaybackFinished Directives which use the AudioPlayer namespace.
-static const std::string NAME_PLAYBACK_FINISHED = "PlaybackFinished";
-// This string to be used for PlaybackStopped Directives which use the AudioPlayer namespace.
-static const std::string NAME_PLAYBACK_STOPPED = "PlaybackStopped";
-// This string to be used for SynchronizeState Directives.
-static const std::string NAME_SYNC_STATE = "SynchronizeState";
-// This string to be used for Speak Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_RECOGNIZE = "Recognize";
-// This string to be used for SpeechStarted Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_SPEECH_STARTED = "SpeechStarted";
-// This string to be used for SpeechFinished Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_SPEECH_FINISHED = "SpeechFinished";
-
-/// The dialog Channel name used in intializing the FocusManager.
-static const std::string DIALOG_CHANNEL_NAME = "Dialog";
-
-/// The content Channel name used in intializing the FocusManager.
-static const std::string CONTENT_CHANNEL_NAME = "Content";
-
-/// An incorrect Channel name that is never initialized as a Channel.
-static const std::string TEST_CHANNEL_NAME = "Test";
-
-/// The priority of the dialog Channel used in intializing the FocusManager.
-static const unsigned int DIALOG_CHANNEL_PRIORITY = 100;
-
-/// The priority of the content Channel used in intializing the FocusManager.
-static const unsigned int CONTENT_CHANNEL_PRIORITY = 300;
-
-/// The priority of the content Channel used in intializing the FocusManager.
-static const unsigned int TEST_CHANNEL_PRIORITY = 400;
-
-/// Sample dialog activity id.
-static const std::string DIALOG_ACTIVITY_ID = "dialog";
-
-/// Sample content activity id.
-static const std::string CONTENT_ACTIVITY_ID = "content";
-
-/// Sample content activity id.
-static const std::string TEST_ACTIVITY_ID = "test";
-
-// This Integer to be used to specify a timeout in seconds.
-static const std::chrono::seconds WAIT_FOR_TIMEOUT_DURATION(15);
-static const std::chrono::seconds NO_TIMEOUT_DURATION(0);
-static const std::chrono::seconds SONG_TIMEOUT_DURATION(120);
-/// The compatible encoding for AIP.
-static const avsCommon::utils::AudioFormat::Encoding COMPATIBLE_ENCODING =
-    avsCommon::utils::AudioFormat::Encoding::LPCM;
-/// The compatible endianness for AIP.
-static const avsCommon::utils::AudioFormat::Endianness COMPATIBLE_ENDIANNESS =
-    avsCommon::utils::AudioFormat::Endianness::LITTLE;
-/// The compatible sample rate for AIP.
-static const unsigned int COMPATIBLE_SAMPLE_RATE = 16000;
-/// The compatible bits per sample.
-static const unsigned int COMPATIBLE_SAMPLE_SIZE_IN_BITS = 16;
-/// The compatible number of channels
-static const unsigned int COMPATIBLE_NUM_CHANNELS = 1;
-
-/// JSON key to get the event object of a message.
-static const std::string JSON_MESSAGE_EVENT_KEY = "event";
-/// JSON key to get the directive object of a message.
-static const std::string JSON_MESSAGE_DIRECTIVE_KEY = "directive";
-/// JSON key to get the header object of a message.
-static const std::string JSON_MESSAGE_HEADER_KEY = "header";
-/// JSON key to get the namespace value of a header.
-static const std::string JSON_MESSAGE_NAMESPACE_KEY = "namespace";
-/// JSON key to get the name value of a header.
-static const std::string JSON_MESSAGE_NAME_KEY = "name";
-/// JSON key to get the messageId value of a header.
-static const std::string JSON_MESSAGE_MESSAGE_ID_KEY = "messageId";
-/// JSON key to get the dialogRequestId value of a header.
-static const std::string JSON_MESSAGE_DIALOG_REQUEST_ID_KEY = "dialogRequestId";
-/// JSON key to get the payload object of a message.
-static const std::string JSON_MESSAGE_PAYLOAD_KEY = "payload";
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("AudioPlayerIntegrationTest");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// Path to the AlexaClientSDKConfig.json file (from command line arguments).
-static std::string g_configPath;
-/// Path to resources (e.g. audio files) for tests (from command line arguments).
-static std::string g_inputPath;
-
-/// A test observer that mocks out the ChannelObserverInterface##onFocusChanged() call.
-class TestClient : public ChannelObserverInterface {
-public:
-    /**
-     * Constructor.
-     */
-    TestClient() : m_focusState(FocusState::NONE), m_focusChangeOccurred(false) {
-    }
-
-    /**
-     * Implementation of the ChannelObserverInterface##onFocusChanged() callback.
-     *
-     * @param focusState The new focus state of the Channel observer.
-     * @param behavior The new MixingBehavior of the Channel observer.
-     */
-    void onFocusChanged(FocusState focusState, MixingBehavior behavior) override {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        m_focusState = focusState;
-        m_focusChangeOccurred = true;
-        m_focusChangedCV.notify_one();
-    }
-
-    /**
-     * Waits for the ChannelObserverInterface##onFocusChanged() callback.
-     *
-     * @param timeout The amount of time to wait for the callback.
-     * @param focusChanged An output parameter that notifies the caller whether a callback occurred.
-     * @return Returns @c true if the callback occurred within the timeout period and @c false otherwise.
-     */
-    FocusState waitForFocusChange(std::chrono::milliseconds timeout, bool* focusChanged) {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        bool success = m_focusChangedCV.wait_for(lock, timeout, [this]() { return m_focusChangeOccurred; });
-
-        if (!success) {
-            *focusChanged = false;
-        } else {
-            m_focusChangeOccurred = false;
-            *focusChanged = true;
-        }
-        return m_focusState;
-    }
-
-private:
-    /// The focus state of the observer.
-    FocusState m_focusState;
-
-    /// A lock to guard against focus state changes.
-    std::mutex m_mutex;
-
-    /// A condition variable to wait for focus changes.
-    std::condition_variable m_focusChangedCV;
-
-    /// A boolean flag so that we can re-use the observer even after a callback has occurred.
-    bool m_focusChangeOccurred;
-};
-
-class holdToTalkButton {
-public:
-    bool startRecognizing(std::shared_ptr<AudioInputProcessor> aip, std::shared_ptr<AudioProvider> audioProvider) {
-        return aip->recognize(*audioProvider, Initiator::PRESS_AND_HOLD).get();
-    }
-
-    bool stopRecognizing(std::shared_ptr<AudioInputProcessor> aip) {
-        return aip->stopCapture().get();
-    }
-};
-
-class AudioPlayerTest : public Test {
-protected:
-    virtual void SetUp() override {
-        m_context = ACLTestContext::create(g_configPath);
-        ASSERT_TRUE(m_context);
-
-        m_exceptionEncounteredSender = std::make_shared<TestExceptionEncounteredSender>();
-        m_metricRecorder = std::make_shared<NiceMock<avsCommon::utils::metrics::test::MockMetricRecorder>>();
-        m_dialogUXStateAggregator = std::make_shared<avsCommon::avs::DialogUXStateAggregator>();
-
-        m_directiveSequencer = DirectiveSequencer::create(m_exceptionEncounteredSender, m_metricRecorder);
-        m_messageInterpreter = std::make_shared<MessageInterpreter>(
-            m_exceptionEncounteredSender, m_directiveSequencer, m_context->getAttachmentManager(), m_metricRecorder);
-
-        // Set up connection and connect
-        m_avsConnectionManager = std::make_shared<TestMessageSender>(
-            m_context->getMessageRouter(), false, m_context->getConnectionStatusObserver(), m_messageInterpreter);
-        ASSERT_TRUE(m_avsConnectionManager);
-
-        FocusManager::ChannelConfiguration dialogChannelConfig{DIALOG_CHANNEL_NAME, DIALOG_CHANNEL_PRIORITY};
-        FocusManager::ChannelConfiguration contentChannelConfig{CONTENT_CHANNEL_NAME, CONTENT_CHANNEL_PRIORITY};
-        FocusManager::ChannelConfiguration testChannelConfig{TEST_CHANNEL_NAME, TEST_CHANNEL_PRIORITY};
-
-        std::vector<FocusManager::ChannelConfiguration> channelConfigurations{
-            dialogChannelConfig, contentChannelConfig, testChannelConfig};
-
-        m_focusManager = std::make_shared<FocusManager>(channelConfigurations);
-        m_testContentClient = std::make_shared<TestClient>();
-        ASSERT_TRUE(m_focusManager->acquireChannel(TEST_CHANNEL_NAME, m_testContentClient, TEST_ACTIVITY_ID));
-        bool focusChanged;
-        FocusState state;
-        state = m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged);
-        ASSERT_TRUE(focusChanged);
-        ASSERT_EQ(state, FocusState::FOREGROUND);
-
-        m_playbackController = PlaybackController::create(m_context->getContextManager(), m_avsConnectionManager);
-        m_playbackRouter = PlaybackRouter::create(m_playbackController);
-        m_speakerInterface = std::make_shared<testing::NiceMock<MockChannelVolumeInterface>>();
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-        m_speakMediaPlayer =
-            MediaPlayer::create(std::make_shared<avsCommon::utils::libcurlUtils::HTTPContentFetcherFactory>());
-#else
-        m_speakMediaPlayer = std::make_shared<TestMediaPlayer>();
-#endif
-
-        m_compatibleAudioFormat.sampleRateHz = COMPATIBLE_SAMPLE_RATE;
-        m_compatibleAudioFormat.sampleSizeInBits = COMPATIBLE_SAMPLE_SIZE_IN_BITS;
-        m_compatibleAudioFormat.numChannels = COMPATIBLE_NUM_CHANNELS;
-        m_compatibleAudioFormat.endianness = COMPATIBLE_ENDIANNESS;
-        m_compatibleAudioFormat.encoding = COMPATIBLE_ENCODING;
-
-        size_t nWords = 1024 * 1024;
-        size_t wordSize = 2;
-        size_t maxReaders = 3;
-        size_t bufferSize = AudioInputStream::calculateBufferSize(nWords, wordSize, maxReaders);
-
-        auto m_Buffer = std::make_shared<avsCommon::avs::AudioInputStream::Buffer>(bufferSize);
-        auto m_Sds = avsCommon::avs::AudioInputStream::create(m_Buffer, wordSize, maxReaders);
-        ASSERT_NE(nullptr, m_Sds);
-        m_AudioBuffer = std::move(m_Sds);
-        m_AudioBufferWriter =
-            m_AudioBuffer->createWriter(avsCommon::avs::AudioInputStream::Writer::Policy::NONBLOCKABLE);
-        ASSERT_NE(nullptr, m_AudioBufferWriter);
-
-        // Set up hold to talk button.
-        m_HoldToTalkAudioProvider =
-            std::make_shared<AudioProvider>(AudioProvider::HoldAudioProvider(m_AudioBuffer, m_compatibleAudioFormat));
-
-        m_holdToTalkButton = std::make_shared<holdToTalkButton>();
-
-        m_userInactivityMonitor = UserInactivityMonitor::create(m_avsConnectionManager, m_exceptionEncounteredSender);
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-        auto systemSoundMediaPlayer =
-            MediaPlayer::create(std::make_shared<avsCommon::utils::libcurlUtils::HTTPContentFetcherFactory>());
-#else
-        auto systemSoundMediaPlayer = std::make_shared<TestMediaPlayer>();
-#endif
-
-        m_systemSoundPlayer = applicationUtilities::systemSoundPlayer::SystemSoundPlayer::create(
-            systemSoundMediaPlayer,
-            std::make_shared<alexaClientSDK::applicationUtilities::resources::audio::SystemSoundAudioFactory>());
-
-        m_mockWakeWordConfirmationSetting =
-            std::make_shared<MockSetting<WakeWordConfirmationSettingType>>(getWakeWordConfirmationDefault());
-        m_mockSpeechConfirmationSetting =
-            std::make_shared<MockSetting<SpeechConfirmationSettingType>>(getSpeechConfirmationDefault());
-
-        m_AudioInputProcessor = AudioInputProcessor::create(
-            m_directiveSequencer,
-            m_avsConnectionManager,
-            m_context->getContextManager(),
-            m_focusManager,
-            m_dialogUXStateAggregator,
-            m_exceptionEncounteredSender,
-            m_userInactivityMonitor,
-            m_systemSoundPlayer,
-            std::make_shared<NiceMock<sdkInterfaces::test::MockLocaleAssetsManager>>(),
-            m_mockWakeWordConfirmationSetting,
-            m_mockSpeechConfirmationSetting,
-            std::make_shared<avsCommon::avs::CapabilityChangeNotifier>(),
-            nullptr,
-            nullptr,
-            AudioProvider::null(),
-            nullptr,
-            m_metricRecorder);
-        ASSERT_NE(nullptr, m_AudioInputProcessor);
-        m_AudioInputProcessor->addObserver(m_dialogUXStateAggregator);
-
-        // Create and register the SpeechSynthesizer.
-        m_speechSynthesizer = SpeechSynthesizer::create(
-            m_speakMediaPlayer,
-            m_avsConnectionManager,
-            m_focusManager,
-            m_context->getContextManager(),
-            m_exceptionEncounteredSender,
-            m_metricRecorder,
-            m_dialogUXStateAggregator,
-            m_captionManager);
-        ASSERT_NE(nullptr, m_speechSynthesizer);
-        m_directiveSequencer->addDirectiveHandler(m_speechSynthesizer);
-        m_speechSynthesizerObserver = std::make_shared<TestSpeechSynthesizerObserver>();
-        m_speechSynthesizer->addObserver(m_speechSynthesizerObserver);
-        m_speechSynthesizer->addObserver(m_dialogUXStateAggregator);
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-        m_contentMediaPlayer =
-            MediaPlayer::create(std::make_shared<avsCommon::utils::libcurlUtils::HTTPContentFetcherFactory>());
-#else
-        m_contentMediaPlayer = std::make_shared<TestMediaPlayer>();
-#endif
-
-        std::vector<std::shared_ptr<MediaPlayerInterface>> players = {m_contentMediaPlayer};
-        auto mockMediaResourceProvider =
-            avsCommon::utils::mediaPlayer::PooledMediaResourceProvider::createPooledMediaResourceProviderInterface(
-                players, {m_speakerInterface});
-
-        // Create and register the AudioPlayer.
-        m_audioPlayer = acsdkAudioPlayer::AudioPlayer::create(
-            mockMediaResourceProvider,
-            m_avsConnectionManager,
-            m_focusManager,
-            m_context->getContextManager(),
-            m_exceptionEncounteredSender,
-            m_playbackRouter,
-            m_captionManager,
-            m_metricRecorder);
-        ASSERT_NE(nullptr, m_audioPlayer);
-        m_directiveSequencer->addDirectiveHandler(m_audioPlayer);
-
-        connect();
-    }
-
-    void TearDown() override {
-        disconnect();
-        // Note that these nullptr checks are needed to avoid segaults if @c SetUp() failed.
-        if (m_AudioInputProcessor) {
-            m_AudioInputProcessor->shutdown();
-        }
-        if (m_directiveSequencer) {
-            m_directiveSequencer->shutdown();
-        }
-        if (m_speechSynthesizer) {
-            m_speechSynthesizer->shutdown();
-        }
-        if (m_audioPlayer) {
-            m_audioPlayer->shutdown();
-        }
-        if (m_avsConnectionManager) {
-            m_avsConnectionManager->shutdown();
-        }
-#ifdef GSTREAMER_MEDIA_PLAYER
-        if (m_speakMediaPlayer) {
-            m_speakMediaPlayer->shutdown();
-        }
-        if (m_contentMediaPlayer) {
-            m_contentMediaPlayer->shutdown();
-        }
-#endif
-        if (m_userInactivityMonitor) {
-            m_userInactivityMonitor->shutdown();
-        }
-        if (m_playbackController) {
-            m_playbackController->shutdown();
-        }
-        if (m_playbackRouter) {
-            m_playbackRouter->shutdown();
-        }
-        m_context.reset();
-    }
-
-    /**
-     * Connect to AVS.
-     */
-    void connect() {
-        m_avsConnectionManager->enable();
-        m_context->waitForConnected();
-    }
-
-    /**
-     * Disconnect from AVS.
-     */
-    void disconnect() {
-        if (m_avsConnectionManager) {
-            m_avsConnectionManager->disable();
-            m_context->waitForDisconnected();
-        }
-    }
-
-    std::string getSentEventName(TestMessageSender::SendParams sendParams) {
-        std::string eventString;
-        std::string eventHeader;
-        std::string eventName;
-        jsonUtils::retrieveValue(sendParams.request->getJsonContent(), JSON_MESSAGE_EVENT_KEY, &eventString);
-        jsonUtils::retrieveValue(eventString, JSON_MESSAGE_HEADER_KEY, &eventHeader);
-        jsonUtils::retrieveValue(eventHeader, JSON_MESSAGE_NAME_KEY, &eventName);
-        return eventName;
-    }
-
-    bool checkSentEventName(TestMessageSender::SendParams sendParams, std::string expectedName) {
-        if (TestMessageSender::SendParams::Type::SEND == sendParams.type) {
-            std::string eventName;
-            eventName = getSentEventName(sendParams);
-            return eventName == expectedName;
-        }
-        return false;
-    }
-
-    std::vector<int16_t> readAudioFromFile(const std::string& fileName, bool* errorOccurred) {
-        const int RIFF_HEADER_SIZE = 44;
-
-        std::ifstream inputFile(fileName.c_str(), std::ifstream::binary);
-        if (!inputFile.good()) {
-            std::cout << "Couldn't open audio file!" << std::endl;
-            if (errorOccurred) {
-                *errorOccurred = true;
-            }
-            return {};
-        }
-        inputFile.seekg(0, std::ios::end);
-        int fileLengthInBytes = inputFile.tellg();
-        if (fileLengthInBytes <= RIFF_HEADER_SIZE) {
-            std::cout << "File should be larger than 44 bytes, which is the size of the RIFF header" << std::endl;
-            if (errorOccurred) {
-                *errorOccurred = true;
-            }
-            return {};
-        }
-
-        inputFile.seekg(RIFF_HEADER_SIZE, std::ios::beg);
-
-        int numSamples = (fileLengthInBytes - RIFF_HEADER_SIZE) / 2;
-
-        std::vector<int16_t> retVal(numSamples, 0);
-
-        inputFile.read((char*)&retVal[0], numSamples * 2);
-
-        if (inputFile.gcount() != numSamples * 2) {
-            std::cout << "Error reading audio file" << std::endl;
-            if (errorOccurred) {
-                *errorOccurred = true;
-            }
-            return {};
-        }
-
-        inputFile.close();
-        if (errorOccurred) {
-            *errorOccurred = false;
-        }
-        return retVal;
-    }
-
-    void sendAudioFileAsRecognize(std::string audioFile) {
-        // Signal to the AIP to start recognizing.
-        ASSERT_NE(nullptr, m_HoldToTalkAudioProvider);
-        ASSERT_TRUE(m_holdToTalkButton->startRecognizing(m_AudioInputProcessor, m_HoldToTalkAudioProvider));
-
-        bool error;
-        std::string file = g_inputPath + audioFile;
-        std::vector<int16_t> audioData = readAudioFromFile(file, &error);
-        ASSERT_FALSE(error);
-        ASSERT_FALSE(audioData.empty());
-        m_AudioBufferWriter->write(audioData.data(), audioData.size());
-
-        // Stop holding the button.
-        ASSERT_TRUE(m_holdToTalkButton->stopRecognizing(m_AudioInputProcessor));
-    }
-
-    /// Context for running ACL based tests.
-    std::unique_ptr<ACLTestContext> m_context;
-
-    std::shared_ptr<TestMessageSender> m_avsConnectionManager;
-    std::shared_ptr<TestExceptionEncounteredSender> m_exceptionEncounteredSender;
-    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
-    std::shared_ptr<PlaybackController> m_playbackController;
-    std::shared_ptr<PlaybackRouter> m_playbackRouter;
-    std::shared_ptr<MockChannelVolumeInterface> m_speakerInterface;
-    std::shared_ptr<TestDirectiveHandler> m_directiveHandler;
-    std::shared_ptr<DirectiveSequencerInterface> m_directiveSequencer;
-    std::shared_ptr<MessageInterpreter> m_messageInterpreter;
-    std::shared_ptr<FocusManager> m_focusManager;
-    std::shared_ptr<TestClient> m_testContentClient;
-    std::shared_ptr<SpeechSynthesizer> m_speechSynthesizer;
-    std::shared_ptr<TestSpeechSynthesizerObserver> m_speechSynthesizerObserver;
-    std::shared_ptr<holdToTalkButton> m_holdToTalkButton;
-    std::shared_ptr<AudioProvider> m_HoldToTalkAudioProvider;
-    avsCommon::utils::AudioFormat m_compatibleAudioFormat;
-    std::unique_ptr<AudioInputStream::Writer> m_AudioBufferWriter;
-    std::shared_ptr<AudioInputStream> m_AudioBuffer;
-    std::shared_ptr<AudioInputProcessor> m_AudioInputProcessor;
-    std::shared_ptr<UserInactivityMonitor> m_userInactivityMonitor;
-    std::shared_ptr<acsdkAudioPlayer::AudioPlayer> m_audioPlayer;
-    std::shared_ptr<applicationUtilities::systemSoundPlayer::SystemSoundPlayer> m_systemSoundPlayer;
-    std::shared_ptr<MockSetting<WakeWordConfirmationSettingType>> m_mockWakeWordConfirmationSetting;
-    std::shared_ptr<MockSetting<SpeechConfirmationSettingType>> m_mockSpeechConfirmationSetting;
-    std::shared_ptr<captions::CaptionManagerInterface> m_captionManager;
-
-    FocusState m_focusState;
-    std::mutex m_mutex;
-    std::condition_variable m_focusChangedCV;
-    bool m_focusChangeOccurred;
-    std::shared_ptr<avsCommon::avs::DialogUXStateAggregator> m_dialogUXStateAggregator;
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-    std::shared_ptr<MediaPlayer> m_speakMediaPlayer;
-    std::shared_ptr<MediaPlayer> m_contentMediaPlayer;
-#else
-    std::shared_ptr<TestMediaPlayer> m_speakMediaPlayer;
-    std::shared_ptr<TestMediaPlayer> m_contentMediaPlayer;
-#endif
-};
-
-/**
- * Test ability for the AudioPlayer to handle one play directive.
- *
- * This test is intended to test the AudioPlayer's ability to handle a short play directive all the way through. To do
- * this, an audio file of "Sing me a song" is sent as a Recognize event. In response, a Play directive is received. The
- * tests then observe that the correct events are sent in order.
- *
- */
-TEST_F(AudioPlayerTest, test_singASong) {
-    // Sing me a song.
-    sendAudioFileAsRecognize(RECOGNIZE_SING_FILE_NAME);
-    bool focusChanged;
-    FocusState state;
-    state = m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged);
-    ASSERT_TRUE(focusChanged);
-    ASSERT_EQ(state, FocusState::BACKGROUND);
-
-    // Recognize.
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    bool playbackFinishedFound = false;
-    bool playbackNearlyFinishedFound = false;
-    bool playbackStartedFound = false;
-
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    while (TestMessageSender::SendParams::Type::TIMEOUT != sendParams.type && !playbackFinishedFound) {
-        if (checkSentEventName(sendParams, NAME_PLAYBACK_STARTED)) {
-            playbackStartedFound = true;
-            sendParams = m_avsConnectionManager->waitForNext(SONG_TIMEOUT_DURATION);
-        } else if (checkSentEventName(sendParams, NAME_PLAYBACK_NEARLY_FINISHED)) {
-            playbackNearlyFinishedFound = true;
-            sendParams = m_avsConnectionManager->waitForNext(SONG_TIMEOUT_DURATION);
-        } else if (checkSentEventName(sendParams, NAME_PLAYBACK_FINISHED)) {
-            playbackFinishedFound = true;
-        } else {
-            sendParams = m_avsConnectionManager->waitForNext(SONG_TIMEOUT_DURATION);
-        }
-    }
-    ASSERT_TRUE(playbackStartedFound);
-    ASSERT_TRUE(playbackNearlyFinishedFound);
-    ASSERT_TRUE(playbackFinishedFound);
-
-    state = m_testContentClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION, &focusChanged);
-    ASSERT_TRUE(focusChanged);
-    ASSERT_EQ(state, FocusState::FOREGROUND);
-
-    m_testContentClient->waitForFocusChange(NO_TIMEOUT_DURATION, &focusChanged);
-    ASSERT_FALSE(focusChanged);
-}
-
-/**
- * Test ability for the AudioPlayer to handle multiple play directives.
- *
- * This test is intended to test the AudioPlayer's ability to handle a group play directive all the way through. To do
- * this, an audio file of "Flashbriefing" is sent as a Recognize event. In response, a Speak, then an undefined number
- * of Play directives, and a final Speak directive is received. The tests then observe that the correct events are sent
- * in order.
- *
- * @note ACSDK-2373 - Test is disabled due to an assumption that each flash briefing must be less than 2min in length,
- * and this is making this integration test unstable.
- *
- */
-TEST_F(AudioPlayerTest, DISABLED_test_flashBriefing) {
-    // Ask for a flashbriefing.
-    sendAudioFileAsRecognize(RECOGNIZE_FLASHBRIEFING_FILE_NAME);
-
-    // Recognize event is sent.
-    TestMessageSender::SendParams sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendParams, NAME_RECOGNIZE));
-
-    // Speech is handled.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // If no items are in flashbriefing, this section will be skipped. Ensure that at least two items are selected in
-    // the Alexa app under Settings -> Flashbriefing.
-    sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    bool hasFlashbriefingItems = false;
-    while (TestMessageSender::SendParams::Type::TIMEOUT != sendParams.type &&
-           !checkSentEventName(sendParams, NAME_SPEECH_STARTED) &&
-           !checkSentEventName(sendParams, NAME_PLAYBACK_STOPPED)) {
-        hasFlashbriefingItems = true;
-        bool playbackFinishedFound = false;
-        bool playbackNearlyFinishedFound = false;
-        bool playbackStartedFound = false;
-
-        while (TestMessageSender::SendParams::Type::TIMEOUT != sendParams.type && !playbackFinishedFound) {
-            if (checkSentEventName(sendParams, NAME_PLAYBACK_STARTED)) {
-                playbackStartedFound = true;
-                sendParams = m_avsConnectionManager->waitForNext(SONG_TIMEOUT_DURATION);
-            } else if (checkSentEventName(sendParams, NAME_PLAYBACK_NEARLY_FINISHED)) {
-                playbackNearlyFinishedFound = true;
-                sendParams = m_avsConnectionManager->waitForNext(SONG_TIMEOUT_DURATION);
-            } else if (checkSentEventName(sendParams, NAME_PLAYBACK_FINISHED)) {
-                playbackFinishedFound = true;
-                sendParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-            } else {
-                sendParams = m_avsConnectionManager->waitForNext(SONG_TIMEOUT_DURATION);
-            }
-        }
-        ASSERT_TRUE(playbackStartedFound);
-        ASSERT_TRUE(playbackNearlyFinishedFound);
-        ASSERT_TRUE(playbackFinishedFound);
-    }
-
-    if (hasFlashbriefingItems) {
-        // The last speak is then allowed.
-        EXPECT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-        sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        EXPECT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-    }
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-int main(int argc, char** argv) {
-    testing::InitGoogleTest(&argc, argv);
-    if (argc < 3) {
-        std::cerr << "USAGE: " << std::string(argv[0]) << " <path_to_AlexaClientSDKConfig.json> <path_to_inputs_folder>"
-                  << std::endl;
-        return 1;
-
-    } else {
-        alexaClientSDK::integration::test::g_configPath = std::string(argv[1]);
-        alexaClientSDK::integration::test::g_inputPath = std::string(argv[2]);
-        return RUN_ALL_TESTS();
-    }
-}
diff --git a/Integration/test/CMakeLists.txt b/Integration/test/CMakeLists.txt
deleted file mode 100644
index 81f7194963..0000000000
--- a/Integration/test/CMakeLists.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-find_package(GTest ${GTEST_PACKAGE_CONFIG})
-
-set(INCLUDE_PATH "${ACL_SOURCE_DIR}/include"
-     "${GTEST_INCLUDE_DIRS}"
-     "${KWD_SOURCE_DIR}/include"
-     "${SENSORY_SOURCE_DIR}/include"
-     "${SENSORY_KEY_WORD_DETECTOR_INCLUDE_DIR}"
-     "${AIP_SOURCE_DIR}/include"
-     "${SpeechSynthesizer_SOURCE_DIR}/include"
-     "${acsdkInteractionModel_SOURCE_DIR}/include"
-     "${acsdkInteractionModel_SOURCE_DIR}/privateInclude"
-     "${AVSSystem_SOURCE_DIR}/include"
-     "${GST_INCLUDE_DIRS}"
-     "${AVSCommon_INCLUDE_DIRS}"
-     "${AVSCommon_SOURCE_DIR}/Utils/test"
-     "${AudioResources_INCLUDE_DIRS}"
-     "${MediaPlayer_SOURCE_DIR}/include"
-     "${PlaybackController_SOURCE_DIR}/include"
-     "${ContextManager_SOURCE_DIR}/include"
-     "${DeviceSettings_SOURCE_DIR}/test"
-     "${MetricRecorder_INCLUDE_DIRS}")
-
-set(LINK_PATH ACL
-        ADSL
-        AFML
-        AIP
-        AVSSystem
-        CBLAuthDelegate
-        ContextManager
-        Integration
-        gtest
-        gmock
-        PlaybackController
-        SpeechSynthesizer
-        UtilsCommonTestLib
-        SDKInterfacesTests
-        acsdkAlerts
-        acsdkAudioPlayer
-        acsdkInteractionModel
-        acsdkKWDImplementations
-        acsdkManufactory
-        acsdkShutdownManager)
-
-if(SENSORY_KEY_WORD_DETECTOR)
-    SET(LINK_PATH ${LINK_PATH} SENSORY)
-endif()
-if(GSTREAMER_MEDIA_PLAYER)
-    SET(LINK_PATH ${LINK_PATH} MediaPlayer)
-    add_definitions(-DGSTREAMER_MEDIA_PLAYER)
-endif()
-if(METRICS)
-    SET(LINK_PATH ${LINK_PATH} MetricRecorder)
-endif()
-
-# Define a variable for the audio inputs.
-set(INTEGRATION_INPUTS "${Integration_SOURCE_DIR}/inputs")
-
-# Copy SDK Json file to the build directory.
-set(SDK_CONFIG_FILENAME "AlexaClientSDKConfig.json")
-set(SDK_CONFIG_FILE_SOURCE "${Integration_SOURCE_DIR}/${SDK_CONFIG_FILENAME}")
-set(SDK_CONFIG_FILE_TARGET "${Integration_BINARY_DIR}/${SDK_CONFIG_FILENAME}")
-# Use configure_file to support variable substitution later.
-configure_file("${SDK_CONFIG_FILE_SOURCE}" "${SDK_CONFIG_FILE_TARGET}")
-
-# Copy Adapter SDK Json file to the build directory.
-set(SDK_ADAPTERS_CONFIG_FILENAME "ExternalMediaPlayerAdapters.json")
-set(SDK_ADAPTERS_CONFIG_FILE_SOURCE "${Integration_SOURCE_DIR}/${SDK_ADAPTERS_CONFIG_FILENAME}")
-set(SDK_ADAPTERS_CONFIG_FILE_TARGET "${Integration_BINARY_DIR}/${SDK_ADAPTERS_CONFIG_FILENAME}")
-
-if(EXISTS "${SDK_ADAPTERS_CONFIG_FILE_SOURCE}")
-    # Use configure_file to support variable substitution later.
-    configure_file("${SDK_ADAPTERS_CONFIG_FILE_SOURCE}" "${SDK_ADAPTERS_CONFIG_FILE_TARGET}")
-endif()
-
-if(BUILD_TESTING)
-    add_custom_target(integration
-        COMMAND ${CMAKE_CTEST_COMMAND} -L Integration -C Integration --output-on-failure)
-    include(${Integration_BINARY_DIR}/CTestCustom.cmake OPTIONAL)
-    set(testSourceFiles
-        "${CMAKE_CURRENT_SOURCE_DIR}/AlexaAuthorizationDelegateTest.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/AlexaCommunicationsLibraryTest.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/AlexaDirectiveSequencerLibraryTest.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/AudioInputProcessorIntegrationTest.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ServerDisconnectIntegrationTest.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/SpeechSynthesizerIntegrationTest.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/AlertsIntegrationTest.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/AudioPlayerIntegrationTest.cpp")
-    # file(GLOB_RECURSE testSourceFiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*Test.cpp")
-    foreach (testSourceFile IN LISTS testSourceFiles)
-        get_filename_component(testName ${testSourceFile} NAME_WE)
-        add_executable(${testName} ${testSourceFile})
-        target_include_directories(${testName} PUBLIC "${INCLUDE_PATH}")
-        target_link_libraries(${testName} "${LINK_PATH}")
-        if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-            target_link_libraries(${testName} atomic)
-        endif()
-        add_rpath_to_target("${testName}")
-        add_test(NAME ${testName}
-            COMMAND ${testName} ${SDK_CONFIG_FILE_TARGET} ${INTEGRATION_INPUTS}
-            CONFIGURATIONS Integration)
-        set_tests_properties(${testName} PROPERTIES LABELS "Integration")
-        add_dependencies(integration ${testName})
-    endforeach()
-
-    message(STATUS "Please fill ${SDK_CONFIG_FILE_TARGET} before you execute integration tests.")
-    if(EXISTS "${SDK_ADAPTERS_CONFIG_FILE_SOURCE}")
-        # Use configure_file to support variable substitution later.
-        message(STATUS "Please fill ${SDK_ADAPTERS_CONFIG_FILE_TARGET} before you execute integration tests.")
-    endif()
-
-    if(NETWORK_INTEGRATION_TESTS AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
-        set(networkTestSourceFile
-            "${CMAKE_CURRENT_SOURCE_DIR}/NetworkIntegrationTest.cpp")
-        get_filename_component(networkTestName ${networkTestSourceFile} NAME_WE)
-        add_executable(${networkTestName} ${networkTestSourceFile})
-        target_include_directories(${networkTestName} PUBLIC "${INCLUDE_PATH}")
-        target_link_libraries(${networkTestName} "${LINK_PATH}")
-        add_custom_target(networkIntegration
-                COMMAND NetworkIntegrationTests "${SDK_CONFIG_FILE_TARGET}" "${NETWORK_INTERFACE}")
-    else()
-        message("Skipping build of NetworkIntegrationTests.cpp.")
-    endif()
-endif()
diff --git a/Integration/test/NetworkIntegrationTest.cpp b/Integration/test/NetworkIntegrationTest.cpp
deleted file mode 100644
index a87b6e79ad..0000000000
--- a/Integration/test/NetworkIntegrationTest.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/// @file NetworkIntegrationTests.cpp
-
-#include <chrono>
-#include <fstream>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <gtest/gtest.h>
-
-#include <ACL/AVSConnectionManager.h>
-#include <AVSCommon/AVS/MessageRequest.h>
-#include <AVSCommon/Utils/Logger/Logger.h>
-#include <ContextManager/ContextManager.h>
-
-#include "Integration/ACLTestContext.h"
-#include "Integration/ConnectionStatusObserver.h"
-#include "Integration/JsonHeader.h"
-#include "Integration/ObservableMessageRequest.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace ::testing;
-using namespace acl;
-using namespace avsCommon::avs;
-using namespace avsCommon::avs::attachment;
-using namespace avsCommon::utils::sds;
-using namespace avsCommon::sdkInterfaces;
-
-static const std::string TAG("NetworkIntegrationTests");
-
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// Amount of Delay in milliseconds to be added.
-static const std::string DELAY_TIME = "1000ms";
-/// Amount of Delay for causing a TIMEDOUT status in MessageRequest.
-static const std::string LONG_DELAY_TIME = "40000ms";
-/// The time to wait for expected message status on sending the message.
-static const int TIMEOUT_FOR_SEND_IN_SECONDS = 10;
-/// The time to wait for expected message status when delay is longer.
-static const int LONG_TIMEOUT_FOR_SEND_IN_SECONDS = 40;
-
-/// Path to the AlexaClientSDKConfig.json file.
-std::string g_configPath;
-/// The network interface specified for the delay to be added.
-std::string network_interface;
-
-/**
- * Test class to stress test the ACL Library for slow network connection.
- */
-class NetworkIntegrationTests : public ::testing::Test {
-public:
-    void SetUp() override;
-    void TearDown() override;
-
-    /**
-     * This function enables the @c m_avsConnectionManager to establish a connection to AVS.
-     */
-    void connect();
-
-    /**
-     * This function disables the @c m_avsConnectionManager to tear down the connection.
-     */
-    void disconnect();
-
-    /**
-     * The function to send one message to AVS.
-     * @param jsonContent The content in json format to send in the message.
-     * @param expectedStatus The expected status of the message being sent to AVS.
-     * @param timeout The maximum time to wait for the @c expectedStatus.
-     * @param attachmentReader The attachment reader for the MessageRequest.
-     */
-    void sendEvent(
-        const std::string& jsonContent,
-        MessageRequestObserverInterface::Status expectedStatus,
-        std::chrono::seconds timeout,
-        std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> attachmentReader = nullptr);
-
-    /**
-     * The function adds delay to the network.
-     * @param DelayTime The delay in milliseconds to be introduced in the network.
-     */
-    void addDelay(const std::string& delayTime);
-
-    /**
-     * Remove the delay in the network.
-     */
-    void deleteDelay();
-
-protected:
-    /// Context for running ACL based tests.
-    std::unique_ptr<ACLTestContext> m_context;
-
-    /// ConnectionStatus Observer for checking the status changes in connection.
-    std::shared_ptr<ConnectionStatusObserver> m_connectionStatusObserver;
-
-    /// Connection Manager for handling the communication between client and AVS.
-    std::shared_ptr<AVSConnectionManager> m_avsConnectionManager;
-
-    /// ContextManager object.
-    std::shared_ptr<contextManager::ContextManager> m_contextManager;
-};
-
-void NetworkIntegrationTests::SetUp() {
-    m_context = ACLTestContext::create(g_configPath);
-    ASSERT_TRUE(m_context);
-
-    m_avsConnectionManager = AVSConnectionManager::create(
-        m_context->getMessageRouter(),
-        false,
-        {m_context->getConnectionStatusObserver()},
-        std::unordered_set<std::shared_ptr<MessageObserverInterface>>());
-    ASSERT_TRUE(m_avsConnectionManager);
-}
-
-void NetworkIntegrationTests::TearDown() {
-    deleteDelay();
-}
-
-void NetworkIntegrationTests::connect() {
-    m_avsConnectionManager->enable();
-    m_context->waitForConnected();
-}
-
-void NetworkIntegrationTests::disconnect() {
-    if (m_avsConnectionManager) {
-        m_avsConnectionManager->disable();
-        m_context->waitForDisconnected();
-    }
-}
-
-void NetworkIntegrationTests::sendEvent(
-    const std::string& jsonContent,
-    MessageRequestObserverInterface::Status expectedStatus,
-    std::chrono::seconds timeout,
-    std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> attachmentReader) {
-    auto messageRequest = std::make_shared<ObservableMessageRequest>(jsonContent, attachmentReader);
-    m_avsConnectionManager->sendMessage(messageRequest);
-    ASSERT_TRUE(messageRequest->waitFor(expectedStatus, timeout));
-    ASSERT_TRUE(messageRequest->hasSendCompleted() || messageRequest->wasExceptionReceived());
-}
-
-void NetworkIntegrationTests::addDelay(const std::string& delayTime) {
-    std::string str = "tc qdisc add dev " + network_interface + " root netem delay " + delayTime;
-    int ret = system(str.c_str());
-    ASSERT_TRUE(WIFEXITED(ret)) << "System call didn't terminate normally";
-    ASSERT_EQ(0, WEXITSTATUS(ret)) << "Child process in system call exited abnormally";
-}
-
-void NetworkIntegrationTests::deleteDelay() {
-    std::string str = "tc qdisc delete dev " + network_interface + " root";
-    int ret = system(str.c_str());
-    ASSERT_TRUE(WIFEXITED(ret)) << "System call didn't terminate normally";
-    ASSERT_EQ(0, WEXITSTATUS(ret)) << "Child process in system call exited abnormally";
-}
-
-/**
- * Test if connection and disconnection can be established after delay is introduced.
- */
-TEST_F(NetworkIntegrationTests, test_connectAfterSlowConnection) {
-    addDelay(DELAY_TIME);
-    connect();
-    disconnect();
-}
-
-/**
- * Establish Connection, and introduce delay and check if @c connectionStatus remains CONNECTED.
- */
-TEST_F(NetworkIntegrationTests, test_connectBeforeSlowConnection) {
-    connect();
-    addDelay(DELAY_TIME);
-    disconnect();
-}
-
-/**
- * Establish connection, introduce delay and test if connect can be done again.
- */
-TEST_F(NetworkIntegrationTests, test_reConnectAfterDelay) {
-    connect();
-    addDelay(DELAY_TIME);
-    disconnect();
-    connect();
-    disconnect();
-}
-
-/**
- * Establish connection, introduce a delay, send a message, check if the Status of MessageRequest
- * is SUCCESS.
- */
-TEST_F(NetworkIntegrationTests, test_sendEventAfterDelayPass) {
-    connect();
-    addDelay(DELAY_TIME);
-    sendEvent(
-        SYNCHRONIZE_STATE_JSON,
-        MessageRequestObserverInterface::Status::SUCCESS,
-        std::chrono::seconds(TIMEOUT_FOR_SEND_IN_SECONDS));
-    disconnect();
-}
-
-/**
- * Establish connection, introduce a longer delay time of greater than 30 seconds, send a message,
- * the Status of MessageRequest will be TIMEDOUT.
- */
-TEST_F(NetworkIntegrationTests, test_sendEventAfterDelayFails) {
-    connect();
-    addDelay(LONG_DELAY_TIME);
-    sendEvent(
-        SYNCHRONIZE_STATE_JSON,
-        MessageRequestObserverInterface::Status::TIMEDOUT,
-        std::chrono::seconds(LONG_TIMEOUT_FOR_SEND_IN_SECONDS));
-    disconnect();
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-int main(int argc, char** argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-
-    if (getuid()) {
-        std::cerr << "You need to be root to run this test" << std::endl;
-        return 1;
-    }
-    if (argc < 3) {
-        std::cerr << "USAGE: " << std::string(argv[0]) << "<path_to_AlexaClientSDKConfig.json> <Network_Interface_Name>"
-                  << std::endl;
-        return 1;
-    } else {
-        alexaClientSDK::integration::test::g_configPath = std::string(argv[1]);
-        alexaClientSDK::integration::test::network_interface = std::string(argv[2]);
-        return RUN_ALL_TESTS();
-    }
-}
diff --git a/Integration/test/ServerDisconnectIntegrationTest.cpp b/Integration/test/ServerDisconnectIntegrationTest.cpp
deleted file mode 100644
index f2d8315350..0000000000
--- a/Integration/test/ServerDisconnectIntegrationTest.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/// @file ServerDisconnectIntegrationTest.cpp
-
-#include <chrono>
-#include <fstream>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include <ACL/AVSConnectionManager.h>
-#include <ACL/Transport/HTTP2TransportFactory.h>
-#include <ACL/Transport/PostConnectSequencerFactory.h>
-#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
-#include <AVSCommon/AVS/MessageRequest.h>
-#include <AVSCommon/Utils/LibcurlUtils/LibcurlHTTP2ConnectionFactory.h>
-#include <AVSCommon/Utils/Logger/Logger.h>
-#include <AVSCommon/Utils/RequiresShutdown.h>
-#include <ContextManager/ContextManager.h>
-#include <SynchronizeStateSender/SynchronizeStateSenderFactory.h>
-
-#include "Integration/AuthDelegateTestContext.h"
-#include "Integration/AuthObserver.h"
-#include "Integration/ConnectionStatusObserver.h"
-#include "Integration/JsonHeader.h"
-#include "Integration/ObservableMessageRequest.h"
-#include "Integration/SDKTestContext.h"
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace ::testing;
-using namespace acl;
-using namespace avsCommon::avs;
-using namespace avsCommon::avs::attachment;
-using namespace avsCommon::avs::initialization;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils;
-using namespace avsCommon::utils::configuration;
-using namespace avsCommon::utils::libcurlUtils;
-using namespace contextManager;
-
-using alexaClientSDK::avsCommon::sdkInterfaces::ConnectionStatusObserverInterface;
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("ServerDisconnectIntegrationTest");
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// The time to wait for expected message status on sending the message.
-static const int TIMEOUT_FOR_SEND_IN_SECONDS = 10;
-
-/// Path to the AlexaClientSDKConfig.json file (from command line arguments).
-static std::string g_configPath;
-
-/**
- * This class tests the functionality for communication between client and AVS using ACL library.
- */
-class AVSCommunication : public avsCommon::utils::RequiresShutdown {
-public:
-    /**
-     * Create an AVSCommunication object which initializes @c m_connectionStatusObserver, @c m_avsConnectionManager,
-     * @c m_authDelegate and @c m_messageRouter.
-     *
-     * @param authDelegate AuthDelegate to use to authorize access to @c AVS.
-     * @return The created AVSCommunication object or @c nullptr if create fails.
-     */
-    static std::unique_ptr<AVSCommunication> create(std::shared_ptr<AuthDelegateInterface> authDelegate);
-
-    /**
-     * The function to establish connection by enabling the @c m_avsConnectionManager.
-     */
-    void connect();
-
-    /**
-     * The function to tear down the connection by disabling the @c m_avsConnectionManager.
-     */
-    void disconnect();
-
-    /**
-     * Function to retun the connection status observer.
-     */
-    std::shared_ptr<ConnectionStatusObserver> getConnectionStatusObserver();
-
-    /**
-     * The function to send one message to AVS.
-     * @param jsonContent The content in json format to send in the message.
-     * @param expectedStatus The expected status of the message being sent to AVS.
-     * @param timeout The maximum time to wait for the @c expectedStatus.
-     * @param attachmentReader The attachment reader for the MessageRequest.
-     * @return true if expected avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status is received within the
-     * @c timeout else false.
-     */
-    bool sendEvent(
-        const std::string& jsonContent,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status expectedStatus,
-        std::chrono::seconds timeout,
-        std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> attachmentReader = nullptr);
-
-    /**
-     * The function to check for Server Side Disconnect for the current connection.
-     * @return true if disconnect is due to SERVER_SIDE_DISCONNECT else false.
-     */
-    bool checkForServerSideDisconnect();
-
-protected:
-    void doShutdown() override;
-
-private:
-    /**
-     * AVSCommunication Constructor
-     */
-    AVSCommunication();
-    /// ConnectionStatus Observer for checking the status changes sent to AVS.
-    std::shared_ptr<ConnectionStatusObserver> m_connectionStatusObserver;
-    /// Connection Manager for handling the communication between client.
-    std::shared_ptr<AVSConnectionManager> m_avsConnectionManager;
-    /// ContextManager object.
-    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
-    /// Pointer to message router so we can properly shutdown
-    std::shared_ptr<MessageRouter> m_messageRouter;
-};
-
-AVSCommunication::AVSCommunication() : RequiresShutdown("AVSCommunication") {
-}
-
-std::unique_ptr<AVSCommunication> AVSCommunication::create(std::shared_ptr<AuthDelegateInterface> authDelegate) {
-    std::unique_ptr<AVSCommunication> avsCommunication(new AVSCommunication());
-    if (!authDelegate) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "nullAuthDelegate"));
-        return nullptr;
-    }
-
-    auto config = ConfigurationNode::getRoot();
-    EXPECT_TRUE(config);
-    if (!config) {
-        return nullptr;
-    }
-
-    auto deviceInfo = DeviceInfo::createFromConfiguration(std::make_shared<ConfigurationNode>(config));
-    EXPECT_TRUE(deviceInfo);
-    if (!deviceInfo) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "createDeviceInfoFailed"));
-        return nullptr;
-    }
-    avsCommunication->m_contextManager = ContextManager::createContextManagerInterface(std::move(deviceInfo));
-    avsCommunication->m_connectionStatusObserver = std::make_shared<ConnectionStatusObserver>();
-
-    auto synchronizeStateSenderFactory =
-        synchronizeStateSender::SynchronizeStateSenderFactory::create(avsCommunication->m_contextManager);
-    std::vector<std::shared_ptr<PostConnectOperationProviderInterface>> providers;
-    providers.push_back(synchronizeStateSenderFactory);
-    auto postConnectFactory = acl::PostConnectSequencerFactory::create(providers);
-    auto http2ConnectionFactory = std::make_shared<LibcurlHTTP2ConnectionFactory>();
-    auto transportFactory = std::make_shared<acl::HTTP2TransportFactory>(http2ConnectionFactory, postConnectFactory);
-    avsCommunication->m_messageRouter = std::make_shared<MessageRouter>(
-        authDelegate,
-        std::make_shared<AttachmentManager>(AttachmentManager::AttachmentType::IN_PROCESS),
-        transportFactory);
-
-    avsCommunication->m_avsConnectionManager = AVSConnectionManager::create(
-        avsCommunication->m_messageRouter,
-        false,
-        {avsCommunication->m_connectionStatusObserver},
-        std::unordered_set<std::shared_ptr<MessageObserverInterface>>());
-    if (!avsCommunication->m_avsConnectionManager) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "nullAVSConnectionManager"));
-        return nullptr;
-    }
-    return avsCommunication;
-}
-
-void AVSCommunication::connect() {
-    m_avsConnectionManager->enable();
-
-    /*
-    Cannot wait anymore for status to move to connected state
-    AVS could kick one the comm's out even before reaching CONNECTED
-    state when post-connect sends the context with its profile.
-    ASSERT_TRUE(m_connectionStatusObserver->waitFor(
-                ConnectionStatusObserverInterface::Status::CONNECTED));
-    */
-}
-
-void AVSCommunication::disconnect() {
-    m_avsConnectionManager->disable();
-    ASSERT_TRUE(m_connectionStatusObserver->waitFor(ConnectionStatusObserverInterface::Status::DISCONNECTED));
-}
-
-std::shared_ptr<ConnectionStatusObserver> AVSCommunication::getConnectionStatusObserver() {
-    return m_connectionStatusObserver;
-}
-
-void AVSCommunication::doShutdown() {
-    m_avsConnectionManager->shutdown();
-    m_messageRouter->shutdown();
-}
-
-bool AVSCommunication::sendEvent(
-    const std::string& jsonContent,
-    avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status expectedStatus,
-    std::chrono::seconds timeout,
-    std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> attachmentReader) {
-    auto messageRequest = std::make_shared<ObservableMessageRequest>(jsonContent, attachmentReader);
-    m_avsConnectionManager->sendMessage(messageRequest);
-    return messageRequest->waitFor(expectedStatus, timeout);
-}
-
-bool AVSCommunication::checkForServerSideDisconnect() {
-    return m_connectionStatusObserver->checkForServerSideDisconnect();
-}
-
-/**
- * Class to implement the integration test of Server Side Disconnect between two connections with same configuration.
- */
-class ServerDisconnectIntegrationTest : public ::testing::Test {
-public:
-    void SetUp() override;
-    void TearDown() override;
-
-protected:
-    /// Context for running AuthDelegate based tests.
-    std::unique_ptr<AuthDelegateTestContext> m_authDelegateTestContext;
-    /// Object for the 1st connection to AVS.
-    std::unique_ptr<AVSCommunication> m_firstAvsCommunication;
-    /// Object for the 2nd connection to AVS.
-    std::unique_ptr<AVSCommunication> m_secondAvsCommunication;
-};
-
-void ServerDisconnectIntegrationTest::SetUp() {
-    m_authDelegateTestContext = AuthDelegateTestContext::create(g_configPath);
-    ASSERT_TRUE(m_authDelegateTestContext);
-
-    auto authDelegate = m_authDelegateTestContext->getAuthDelegate();
-    ASSERT_TRUE(m_firstAvsCommunication = AVSCommunication::create(authDelegate));
-    ASSERT_TRUE(m_secondAvsCommunication = AVSCommunication::create(authDelegate));
-}
-
-void ServerDisconnectIntegrationTest::TearDown() {
-    // Note that these nullptr checks are needed to avoid segaults if @c SetUp() failed.
-    if (m_firstAvsCommunication) {
-        m_firstAvsCommunication->shutdown();
-    }
-    if (m_secondAvsCommunication) {
-        m_secondAvsCommunication->shutdown();
-    }
-    m_authDelegateTestContext.reset();
-}
-
-/**
- * Test sending a message while having a server side disconnect. The send fails to return the expected
- * status of SUCCESS.
- *
- * @note Disabling this test until it can be updated to reflect server side changes.
- */
-TEST_F(ServerDisconnectIntegrationTest, DISABLED_test_sendEvent) {
-    m_firstAvsCommunication->connect();
-    ASSERT_TRUE(m_firstAvsCommunication->getConnectionStatusObserver()->waitFor(
-        ConnectionStatusObserverInterface::Status::CONNECTED));
-
-    m_secondAvsCommunication->connect();
-    ASSERT_TRUE(m_firstAvsCommunication->getConnectionStatusObserver()->waitFor(
-        ConnectionStatusObserverInterface::Status::PENDING));
-    EXPECT_TRUE(m_firstAvsCommunication->checkForServerSideDisconnect());
-
-    m_firstAvsCommunication->disconnect();
-    m_secondAvsCommunication->disconnect();
-
-    m_firstAvsCommunication->connect();
-    ASSERT_TRUE(m_firstAvsCommunication->getConnectionStatusObserver()->waitFor(
-        ConnectionStatusObserverInterface::Status::CONNECTED));
-
-    ASSERT_TRUE(m_firstAvsCommunication->sendEvent(
-        SYNCHRONIZE_STATE_JSON,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS_NO_CONTENT,
-        std::chrono::seconds(TIMEOUT_FOR_SEND_IN_SECONDS)));
-    m_firstAvsCommunication->disconnect();
-
-    m_secondAvsCommunication->connect();
-    ASSERT_TRUE(m_secondAvsCommunication->getConnectionStatusObserver()->waitFor(
-        ConnectionStatusObserverInterface::Status::CONNECTED));
-
-    ASSERT_TRUE(m_secondAvsCommunication->sendEvent(
-        SYNCHRONIZE_STATE_JSON,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS_NO_CONTENT,
-        std::chrono::seconds(TIMEOUT_FOR_SEND_IN_SECONDS)));
-    m_secondAvsCommunication->disconnect();
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-int main(int argc, char** argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-
-    if (argc < 2) {
-        std::cerr << "USAGE: " << std::string(argv[0]) << " <path_to_AlexaClientSDKConfig.json>" << std::endl;
-        return 1;
-    } else {
-        alexaClientSDK::integration::test::g_configPath = std::string(argv[1]);
-        return RUN_ALL_TESTS();
-    }
-}
diff --git a/Integration/test/SpeechSynthesizerIntegrationTest.cpp b/Integration/test/SpeechSynthesizerIntegrationTest.cpp
deleted file mode 100644
index 2fda71d7fc..0000000000
--- a/Integration/test/SpeechSynthesizerIntegrationTest.cpp
+++ /dev/null
@@ -1,1060 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/// @file SpeechSynthesizerIntegrationTest.cpp
-
-#include <chrono>
-#include <deque>
-#include <iostream>
-#include <mutex>
-#include <string>
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include <acsdkManufactory/Annotated.h>
-#include <ADSL/DirectiveSequencer.h>
-#include <ADSL/MessageInterpreter.h>
-#include <AFML/FocusManager.h>
-#include <AVSCommon/AVS/Attachment/InProcessAttachmentReader.h>
-#include <AVSCommon/AVS/Attachment/InProcessAttachmentWriter.h>
-#include <AVSCommon/AVS/BlockingPolicy.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
-#include <AVSCommon/Utils/LibcurlUtils/HTTPContentFetcherFactory.h>
-#include <AVSCommon/SDKInterfaces/DirectiveHandlerInterface.h>
-#include <AVSCommon/SDKInterfaces/Endpoints/MockEndpointCapabilitiesRegistrar.h>
-#include <AVSCommon/Utils/Logger/LogEntry.h>
-#include <AVSCommon/Utils/Metrics/MockMetricRecorder.h>
-#include <acsdkInteractionModel/InteractionModelCapabilityAgent.h>
-#include <acsdkInteractionModel/InteractionModelNotifier.h>
-#include <SpeechSynthesizer/SpeechSynthesizer.h>
-
-#include "Integration/ACLTestContext.h"
-#include "Integration/ObservableMessageRequest.h"
-#include "Integration/TestDirectiveHandler.h"
-#include "Integration/TestExceptionEncounteredSender.h"
-#include "Integration/TestMessageSender.h"
-#include "Integration/TestSpeechSynthesizerObserver.h"
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-#include "MediaPlayer/MediaPlayer.h"
-#else
-#include "Integration/TestMediaPlayer.h"
-#endif
-
-namespace alexaClientSDK {
-namespace integration {
-namespace test {
-
-using namespace acl;
-using namespace adsl;
-using namespace afml;
-using namespace avsCommon;
-using namespace avsCommon::avs;
-using namespace avsCommon::avs::attachment;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::sdkInterfaces::endpoints;
-using namespace avsCommon::sdkInterfaces::endpoints::test;
-using namespace avsCommon::utils::json;
-using namespace avsCommon::utils::mediaPlayer;
-using namespace avsCommon::utils::sds;
-using namespace acsdkInteractionModel;
-using namespace capabilityAgents::speechSynthesizer;
-using namespace contextManager;
-using namespace sdkInterfaces;
-using namespace testing;
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-using namespace mediaPlayer;
-#endif
-
-/**
- * This string specifies a Recognize event using the specified profile.
- *
- * CLOSE_TALK performs end-of-speech detection on the client, so no directive is sent from AVS to stop recording.
- * NEAR_FIELD performs end-of-speech detection in AVS, so a directive is sent from AVS to stop recording.
- */
-// clang-format off
-#define RECOGNIZE_EVENT_JSON(PROFILE, DIALOG_REQUEST_ID )         \
-    "{"                                                           \
-        "\"event\":{"                                             \
-            "\"payload\":{"                                       \
-                "\"format\":\"AUDIO_L16_RATE_16000_CHANNELS_1\"," \
-                "\"profile\":\"" #PROFILE "\""                    \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"dialogRequestId\":\"" DIALOG_REQUEST_ID "\","  \
-                "\"messageId\":\"messageId123\","                 \
-                "\"name\":\"Recognize\","                         \
-                "\"namespace\":\"SpeechRecognizer\""              \
-            "}"                                                   \
-        "},"                                                      \
-        "\"context\":[{"                                          \
-            "\"payload\":{"                                       \
-                "\"activeAlerts\":[],"                            \
-                "\"allAlerts\":[]"                                \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"name\":\"AlertsState\","                       \
-                "\"namespace\":\"Alerts\""                        \
-            "}"                                                   \
-        "},"                                                      \
-        "{"                                                       \
-            "\"payload\":{"                                       \
-                "\"playerActivity\":\"IDLE\","                    \
-                "\"offsetInMilliseconds\":0,"                     \
-                "\"token\":\"\""                                  \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"name\":\"PlaybackState\","                     \
-                "\"namespace\":\"AudioPlayer\""                   \
-            "}"                                                   \
-        "},"                                                      \
-        "{"                                                       \
-            "\"payload\":{"                                       \
-                "\"muted\":false,"                                \
-                "\"volume\":0"                                    \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"name\":\"VolumeState\","                       \
-                "\"namespace\":\"Speaker\""                       \
-            "}"                                                   \
-        "},"                                                      \
-        "{"                                                       \
-            "\"payload\":{"                                       \
-                "\"playerActivity\":\"FINISHED\","                \
-                "\"offsetInMilliseconds\":0,"                     \
-                "\"token\":\"\""                                  \
-            "},"                                                  \
-            "\"header\":{"                                        \
-                "\"name\":\"SpeechState\","                       \
-                "\"namespace\":\"SpeechSynthesizer\""             \
-            "}"                                                   \
-        "}]"                                                      \
-    "}"
-// clang-format on
-
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Joke" to be recognized.
-static const std::string RECOGNIZE_JOKE_AUDIO_FILE_NAME = "/recognize_joke_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Wikipedia" to be recognized.
-static const std::string RECOGNIZE_WIKI_AUDIO_FILE_NAME = "/recognize_wiki_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Lions" to be recognized.
-static const std::string RECOGNIZE_LIONS_AUDIO_FILE_NAME = "/recognize_lions_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Flashbriefing" to be recognized.
-static const std::string RECOGNIZE_FLASHBRIEFING_AUDIO_FILE_NAME = "/recognize_flashbriefing_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "What's up" to be recognized.
-static const std::string RECOGNIZE_WHATS_UP_AUDIO_FILE_NAME = "/recognize_whats_up_test.wav";
-// This is a 16 bit 16 kHz little endian linear PCM audio file of "Volume up" to be recognized.
-static const std::string RECOGNIZE_VOLUME_UP_AUDIO_FILE_NAME = "/recognize_volume_up_test.wav";
-// String to be used as a basic DialogRequestID.
-#define FIRST_DIALOG_REQUEST_ID "DialogRequestID123"
-// String to be used as a DialogRequestID when the first has already been used.
-#define SECOND_DIALOG_REQUEST_ID "DialogRequestID456"
-// This string specifies a Recognize event using the CLOSE_TALK profile and uses the first DialogRequestID.
-static const std::string CT_FIRST_RECOGNIZE_EVENT_JSON = RECOGNIZE_EVENT_JSON(CLOSE_TALK, FIRST_DIALOG_REQUEST_ID);
-// This string specifies a Recognize event using the CLOSE_TALK profile and uses the first DialogRequestID.
-static const std::string CT_FIRST_RECOGNIZE_EVENT_JSON_NEAR = RECOGNIZE_EVENT_JSON(NEAR_FIELD, FIRST_DIALOG_REQUEST_ID);
-// This string specifies a Recognize event using the CLOSE_TALK profile and uses the second DialogRequestID.
-static const std::string CT_SECOND_RECOGNIZE_EVENT_JSON = RECOGNIZE_EVENT_JSON(CLOSE_TALK, SECOND_DIALOG_REQUEST_ID);
-// This string to be used for Speak Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_SPEAK = "Speak";
-// This string to be used for Speak Directives which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_RECOGNIZE = "Recognize";
-// This string to be used for AdjustVolume Directives which use the NAMESPACE_SPEAKER namespace.
-static const std::string NAME_ADJUST_VOLUME = "AdjustVolume";
-// This string to be used for ExpectSpeech Directives which use the NAMESPACE_SPEECH_RECOGNIZER namespace.
-static const std::string NAME_EXPECT_SPEECH = "ExpectSpeech";
-// This string to be used for SetMute Directives which use the NAMESPACE_SPEAKER namespace.
-static const std::string NAME_SET_MUTE = "SetMute";
-// This string to be used for SpeechStarted events which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_SPEECH_STARTED = "SpeechStarted";
-// This string to be used for SpeechFinished events which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_SPEECH_FINISHED = "SpeechFinished";
-// This string to be used for SpeechInterrupted events which use the NAMESPACE_SPEECH_SYNTHESIZER namespace.
-static const std::string NAME_SPEECH_INTERRUPTED = "SpeechInterrupted";
-// This String to be used to register the SpeechRecognizer namespace to a DirectiveHandler.
-static const std::string NAMESPACE_SPEECH_RECOGNIZER = "SpeechRecognizer";
-// This String to be used to register the SpeechSynthesizer namespace to a DirectiveHandler.
-static const std::string NAMESPACE_SPEECH_SYNTHESIZER = "SpeechSynthesizer";
-// This String to be used to register the Speaker namespace to a DirectiveHandler.
-static const std::string NAMESPACE_SPEAKER = "Speaker";
-// This pair connects a Speak name and SpeechSynthesizer namespace for use in DirectiveHandler registration.
-static const NamespaceAndName SPEAK_PAIR = {NAMESPACE_SPEECH_SYNTHESIZER, NAME_SPEAK};
-// This pair connects a ExpectSpeech name and SpeechRecognizer namespace for use in DirectiveHandler registration.
-static const NamespaceAndName EXPECT_SPEECH_PAIR = {NAMESPACE_SPEECH_RECOGNIZER, NAME_EXPECT_SPEECH};
-// This pair connects a SetMute name and Speaker namespace for use in DirectiveHandler registration.
-static const NamespaceAndName SET_MUTE_PAIR = {NAMESPACE_SPEAKER, NAME_SET_MUTE};
-// This pair connects a SetMute name and Speaker namespace for use in DirectiveHandler registration.
-static const NamespaceAndName ADJUST_VOLUME_PAIR = {NAMESPACE_SPEAKER, NAME_ADJUST_VOLUME};
-// Sample dialog activity id.
-static const std::string DIALOG_ACTIVITY_ID = "Dialog";
-/// Sample alerts activity id.
-static const std::string ALERTS_ACTIVITY_ID = "Alerts";
-// A timeout in seconds for a directive to reach the DirectiveHandler.
-static const std::chrono::seconds WAIT_FOR_TIMEOUT_DURATION(15);
-// A timeout in seconds for an event to be sent to @c AVS.
-static const std::chrono::seconds SEND_EVENT_TIMEOUT_DURATION(20);
-// A timeout in seconds for a directive to reach the DirectiveHandler.
-static const std::chrono::seconds DIRECTIVE_TIMEOUT_DURATION(7);
-// Timeout to use when expecting o reach the timeout.
-static const std::chrono::seconds WANTING_TIMEOUT_DURATION(1);
-// A timeout in seconds for the Media Player to finish playing.
-static const std::chrono::seconds WAIT_FOR_MEDIA_PLAYER_TIMEOUT_DURATION(60);
-// This Integer to be used to specify number of Speak Directives to validate in test handleMultipleConsecutiveSpeaks.
-// Although we anticipate four Speak Directives, we validate only three Speak Directives.
-// Validating three Speak Directives helps keep the test short.
-static const unsigned int NUMBER_OF_SPEAK_DIRECTIVES_TO_VALIDATE = 3;
-
-/// JSON key to get the event object of a message.
-static const std::string JSON_MESSAGE_EVENT_KEY = "event";
-/// JSON key to get the directive object of a message.
-static const std::string JSON_MESSAGE_DIRECTIVE_KEY = "directive";
-/// JSON key to get the header object of a message.
-static const std::string JSON_MESSAGE_HEADER_KEY = "header";
-/// JSON key to get the namespace value of a header.
-static const std::string JSON_MESSAGE_NAMESPACE_KEY = "namespace";
-/// JSON key to get the name value of a header.
-static const std::string JSON_MESSAGE_NAME_KEY = "name";
-/// JSON key to get the messageId value of a header.
-static const std::string JSON_MESSAGE_MESSAGE_ID_KEY = "messageId";
-/// JSON key to get the dialogRequestId value of a header.
-static const std::string JSON_MESSAGE_DIALOG_REQUEST_ID_KEY = "dialogRequestId";
-/// JSON key to get the payload object of a message.
-static const std::string JSON_MESSAGE_PAYLOAD_KEY = "payload";
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("SpeechSynthesizerIntegrationTest");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// Path to the AlexaClientSDKConfig.json file (from command line arguments).
-static std::string g_configPath;
-/// Path to resources (e.g. audio files) for tests (from command line arguments).
-static std::string g_inputPath;
-
-/// A test observer that mocks out the ChannelObserverInterface##onFocusChanged() call.
-class TestClient : public ChannelObserverInterface {
-public:
-    /**
-     * Constructor.
-     */
-    TestClient() : m_focusState(FocusState::NONE) {
-    }
-
-    /**
-     * Implementation of the ChannelObserverInterface##onFocusChanged() callback.
-     *
-     * @param focusState The new focus state of the Channel observer.
-     * @param behavior The new MixingBehavior of the Channel observer.
-     */
-    void onFocusChanged(FocusState focusState, MixingBehavior behavior) override {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        m_queue.push_back(focusState);
-        m_focusState = focusState;
-        m_wakeTrigger.notify_all();
-    }
-
-    /**
-     * Waits for the ChannelObserverInterface##onFocusChanged() callback.
-     *
-     * @param timeout The amount of time to wait for the callback.
-     * @param focusChanged An output parameter that notifies the caller whether a callback occurred.
-     * @return Returns @c true if the callback occured within the timeout period and @c false otherwise.
-     */
-    FocusState waitForFocusChange(std::chrono::milliseconds timeout) {
-        FocusState ret;
-        std::unique_lock<std::mutex> lock(m_mutex);
-        if (!m_wakeTrigger.wait_for(lock, timeout, [this]() { return !m_queue.empty(); })) {
-            ret = m_focusState;
-            return ret;
-        }
-        ret = m_queue.front();
-        m_queue.pop_front();
-        return ret;
-    }
-
-    FocusState getCurrentFocusState() {
-        return m_focusState;
-    }
-
-private:
-    /// The focus state of the observer.
-    FocusState m_focusState;
-
-    /// A lock to guard against focus state changes.
-    std::mutex m_mutex;
-
-    /// Trigger to wake up waitForNext calls.
-    std::condition_variable m_wakeTrigger;
-    /// Queue of received focus states that have not been waited on.
-    std::deque<FocusState> m_queue;
-};
-
-class SpeechSynthesizerTest : public ::testing::Test {
-protected:
-    virtual void SetUp() override {
-        m_context = ACLTestContext::create(g_configPath);
-        ASSERT_TRUE(m_context);
-
-        m_exceptionEncounteredSender = std::make_shared<TestExceptionEncounteredSender>();
-        m_metricRecorder = std::make_shared<NiceMock<avsCommon::utils::metrics::test::MockMetricRecorder>>();
-        m_dialogUXStateAggregator = std::make_shared<avsCommon::avs::DialogUXStateAggregator>();
-
-        auto registrar = std::make_shared<NiceMock<MockEndpointCapabilitiesRegistrar>>();
-        m_endpointCapabilitiesRegistrar =
-            acsdkManufactory::Annotated<DefaultEndpointAnnotation, EndpointCapabilitiesRegistrarInterface>(registrar);
-        EXPECT_CALL(
-            *(registrar.get()),
-            withCapability(A<const std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface>&>(), _))
-            .WillRepeatedly(ReturnRef(
-                *std::make_shared<avsCommon::sdkInterfaces::endpoints::test::MockEndpointCapabilitiesRegistrar>()));
-
-        DirectiveHandlerConfiguration config;
-        auto audioBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, true);
-        config[SET_MUTE_PAIR] = audioBlockingPolicy;
-        config[ADJUST_VOLUME_PAIR] = audioBlockingPolicy;
-        config[EXPECT_SPEECH_PAIR] = audioBlockingPolicy;
-        m_directiveHandler = std::make_shared<TestDirectiveHandler>(config);
-
-        m_directiveSequencer = DirectiveSequencer::create(m_exceptionEncounteredSender, m_metricRecorder);
-        m_messageInterpreter = std::make_shared<MessageInterpreter>(
-            m_exceptionEncounteredSender, m_directiveSequencer, m_context->getAttachmentManager(), m_metricRecorder);
-
-        // Set up connection and connect
-        m_avsConnectionManager = std::make_shared<TestMessageSender>(
-            m_context->getMessageRouter(), false, m_context->getConnectionStatusObserver(), m_messageInterpreter);
-        ASSERT_TRUE(m_avsConnectionManager);
-
-        connect();
-
-        m_focusManager = std::make_shared<FocusManager>(FocusManager::getDefaultAudioChannels());
-        m_testClient = std::make_shared<TestClient>();
-        ASSERT_TRUE(m_focusManager->acquireChannel(FocusManager::ALERT_CHANNEL_NAME, m_testClient, ALERTS_ACTIVITY_ID));
-        ASSERT_EQ(m_testClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-        m_mediaPlayer =
-            MediaPlayer::create(std::make_shared<avsCommon::utils::libcurlUtils::HTTPContentFetcherFactory>());
-#else
-        m_mediaPlayer = std::make_shared<TestMediaPlayer>();
-#endif
-
-        // Create and register the SpeechSynthesizer.
-        m_speechSynthesizer = SpeechSynthesizer::create(
-            m_mediaPlayer,
-            m_avsConnectionManager,
-            m_focusManager,
-            m_context->getContextManager(),
-            m_exceptionEncounteredSender,
-            m_metricRecorder,
-            m_dialogUXStateAggregator,
-            nullptr);
-        m_directiveSequencer->addDirectiveHandler(m_speechSynthesizer);
-        m_speechSynthesizerObserver = std::make_shared<TestSpeechSynthesizerObserver>();
-        m_speechSynthesizer->addObserver(m_speechSynthesizerObserver);
-        m_speechSynthesizer->addObserver(m_dialogUXStateAggregator);
-
-        ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(m_directiveHandler));
-
-        m_interactionModelNotifier = InteractionModelNotifier::createInteractionModelNotifierInterface();
-        m_interactionModelCA = InteractionModelCapabilityAgent::create(
-            m_directiveSequencer,
-            m_exceptionEncounteredSender,
-            m_interactionModelNotifier,
-            m_endpointCapabilitiesRegistrar);
-        ASSERT_NE(nullptr, m_interactionModelCA);
-        ASSERT_TRUE(m_directiveSequencer->addDirectiveHandler(m_interactionModelCA));
-        m_interactionModelNotifier->addObserver(m_dialogUXStateAggregator);
-    }
-
-    /**
-     * Send and event to AVS. Blocks until a status is received.
-     *
-     * @param message The message to send.
-     * @param expectStatus The status to expect from the call to send the message.
-     * @param timeout How long to wait for a result from delivering the message.
-     */
-    void sendEvent(
-        const std::string& jsonContent,
-        std::shared_ptr<avsCommon::avs::attachment::AttachmentReader> attachmentReader,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status expectedStatus,
-        std::chrono::seconds timeout) {
-        auto messageRequest = std::make_shared<ObservableMessageRequest>(jsonContent, attachmentReader);
-        m_avsConnectionManager->sendMessage(messageRequest);
-        ASSERT_TRUE(messageRequest->waitFor(expectedStatus, timeout));
-    }
-
-    /**
-     * Function to setup a message and send it to AVS.
-     *
-     * @param json A JSON string containing the message to send.
-     * @param expectStatus The status to expect from the call to send the message.
-     * @param timeout How long to wait for a result from delivering the message.
-     */
-    void setupMessageAndSend(
-        const std::string& json,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status expectedStatus,
-        std::chrono::seconds timeout) {
-        sendEvent(json, nullptr, expectedStatus, timeout);
-    }
-
-    /**
-     * Function to setup a message with an attachment and send it to AVS.
-     *
-     * @param json A JSON string containing the message to send.
-     * @param file Name of the file to read the attachment from.
-     * @param expectStatus The status to expect from the call to send the message.
-     * @param timeout How long to wait for a result from delivering the message.
-     */
-    void setupMessageWithAttachmentAndSend(
-        const std::string& json,
-        std::string& file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status expectedStatus,
-        std::chrono::seconds timeout) {
-        auto is = std::make_shared<std::ifstream>(file, std::ios::binary);
-        ASSERT_TRUE(is->is_open());
-
-        const int mbBytes = 1024 * 1024;
-
-        std::vector<char> localBuffer(mbBytes);
-
-        auto bufferSize = InProcessSDS::calculateBufferSize(localBuffer.size());
-        auto buffer = std::make_shared<InProcessSDSTraits::Buffer>(bufferSize);
-        std::shared_ptr<InProcessSDS> sds = InProcessSDS::create(buffer);
-
-        auto attachmentWriter = InProcessAttachmentWriter::create(sds);
-
-        while (*is) {
-            is->read(localBuffer.data(), mbBytes);
-            size_t numBytesRead = is->gcount();
-            AttachmentWriter::WriteStatus writeStatus = AttachmentWriter::WriteStatus::OK;
-            attachmentWriter->write(localBuffer.data(), numBytesRead, &writeStatus);
-
-            // write status should be either OK or CLOSED
-            bool writeStatusOk =
-                (AttachmentWriter::WriteStatus::OK == writeStatus ||
-                 AttachmentWriter::WriteStatus::CLOSED == writeStatus);
-            ASSERT_TRUE(writeStatusOk);
-        }
-
-        attachmentWriter->close();
-
-        std::shared_ptr<InProcessAttachmentReader> attachmentReader =
-            InProcessAttachmentReader::create(ReaderPolicy::NONBLOCKING, sds);
-        ASSERT_NE(attachmentReader, nullptr);
-
-        sendEvent(json, attachmentReader, expectedStatus, std::chrono::seconds(timeout));
-    }
-
-    /**
-     * Waits for the ChannelObserverInterface##onFocusChanged() callback.
-     *
-     * @param timeout The amount of time to wait for the callback.
-     * @param focusChanged An output parameter that notifies the caller whether a callback occurred.
-     * @return Returns @c true if the callback occured within the timeout period and @c false otherwise.
-     */
-    FocusState waitForFocusChange(std::chrono::milliseconds timeout) {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        m_focusChanged.wait_for(lock, timeout, [this]() { return m_focusChangeOccurred; });
-
-        return m_focusState;
-    }
-
-    void TearDown() override {
-        disconnect();
-        // Note that these nullptr checks are needed to avoid segaults if @c SetUp() failed.
-        if (m_speechSynthesizer) {
-            // m_speechSynthesizer->removeObserver(m_dialogUXStateAggregator);
-            m_speechSynthesizer->shutdown();
-        }
-        if (m_directiveSequencer) {
-            m_directiveSequencer->shutdown();
-        }
-        if (m_avsConnectionManager) {
-            m_avsConnectionManager->shutdown();
-        }
-#ifdef GSTREAMER_MEDIA_PLAYER
-        if (m_mediaPlayer) {
-            m_mediaPlayer->shutdown();
-        }
-#endif
-        m_context.reset();
-    }
-
-    /**
-     * Connect to AVS.
-     */
-    void connect() {
-        m_avsConnectionManager->enable();
-        m_context->waitForConnected();
-    }
-
-    /**
-     * Disconnect from AVS.
-     */
-    void disconnect() {
-        if (m_avsConnectionManager) {
-            m_avsConnectionManager->disable();
-            m_context->waitForDisconnected();
-        }
-    }
-
-    bool checkSentEventName(TestMessageSender::SendParams sendParams, std::string expectedName) {
-        if (TestMessageSender::SendParams::Type::SEND == sendParams.type) {
-            std::string eventString;
-            std::string eventHeader;
-            std::string eventName;
-            jsonUtils::retrieveValue(sendParams.request->getJsonContent(), JSON_MESSAGE_EVENT_KEY, &eventString);
-            jsonUtils::retrieveValue(eventString, JSON_MESSAGE_HEADER_KEY, &eventHeader);
-            jsonUtils::retrieveValue(eventHeader, JSON_MESSAGE_NAME_KEY, &eventName);
-            return eventName == expectedName;
-        }
-        return false;
-    }
-
-    /// Context for running ACL based tests.
-    std::unique_ptr<ACLTestContext> m_context;
-
-    std::shared_ptr<TestMessageSender> m_avsConnectionManager;
-    std::shared_ptr<TestExceptionEncounteredSender> m_exceptionEncounteredSender;
-    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
-    std::shared_ptr<TestDirectiveHandler> m_directiveHandler;
-    std::shared_ptr<DirectiveSequencerInterface> m_directiveSequencer;
-    std::shared_ptr<MessageInterpreter> m_messageInterpreter;
-    std::shared_ptr<TestSpeechSynthesizerObserver> m_speechSynthesizerObserver;
-    std::shared_ptr<SpeechSynthesizer> m_speechSynthesizer;
-    std::shared_ptr<acsdkInteractionModelInterfaces::InteractionModelNotifierInterface> m_interactionModelNotifier;
-    std::shared_ptr<InteractionModelCapabilityAgent> m_interactionModelCA;
-    acsdkManufactory::Annotated<DefaultEndpointAnnotation, EndpointCapabilitiesRegistrarInterface>
-        m_endpointCapabilitiesRegistrar;
-    std::shared_ptr<avsCommon::avs::DialogUXStateAggregator> m_dialogUXStateAggregator;
-    std::shared_ptr<FocusManager> m_focusManager;
-    std::shared_ptr<TestClient> m_testClient;
-    FocusState m_focusState;
-    std::mutex m_mutex;
-    std::condition_variable m_focusChanged;
-    bool m_focusChangeOccurred;
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-    std::shared_ptr<MediaPlayer> m_mediaPlayer;
-#else
-    std::shared_ptr<TestMediaPlayer> m_mediaPlayer;
-#endif
-};
-
-/**
- * Test ability for the SpeechSynthesizer to handle multiple consecutive Speak directives.
- *
- * This test is intended to test the SpeechSynthesizer's ability to receive multiple directives, play each using a
- * MediaPlayer then return to a finished state and notify the DirectiveSequencer that the directive was handled. This is
- * done by sending a Recognize event to AVS with audio of "What's up?" which returns four sets of SetMute and Speak.
- *
- */
-TEST_F(SpeechSynthesizerTest, DISABLED_test_handleMultipleConsecutiveSpeaks) {
-    // SpeechSynthesizerObserverInterface defaults to a FINISHED state.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // Send audio of "What's up" that will prompt four sets of SetMute and Speak.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_WHATS_UP_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    TestMessageSender::SendParams sendRecognizeParams = m_avsConnectionManager->waitForNext(DIRECTIVE_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendRecognizeParams, NAME_RECOGNIZE));
-
-    for (unsigned int x = 0; x < NUMBER_OF_SPEAK_DIRECTIVES_TO_VALIDATE; ++x) {
-        // Each iteration, remove the blocking setMute directive.
-        TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        while (params.type != TestDirectiveHandler::DirectiveParams::Type::HANDLE) {
-            ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-            params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        }
-        params.result->setCompleted();
-
-        // SpeechSynthesizer is now speaking.
-        ASSERT_EQ(
-            m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-            SpeechSynthesizerObserverInterface::SpeechSynthesizerState::GAINING_FOCUS);
-
-        ASSERT_EQ(
-            m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-            SpeechSynthesizerObserverInterface::SpeechSynthesizerState::PLAYING);
-
-        // Check that SS grabs the channel focus by seeing that the test client has been backgrounded.
-        ASSERT_EQ(m_testClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-        // SpeechStarted has sent.
-        TestMessageSender::SendParams sendStartedParams =
-            m_avsConnectionManager->waitForNext(DIRECTIVE_TIMEOUT_DURATION);
-        ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-
-        // Media Player has finished.
-        ASSERT_EQ(
-            m_speechSynthesizerObserver->waitForNext(WAIT_FOR_MEDIA_PLAYER_TIMEOUT_DURATION),
-            SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-        // SpeechFinished was sent.
-        TestMessageSender::SendParams sendFinishedParams =
-            m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-        // Alerts channel regains the foreground.
-        ASSERT_EQ(m_testClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION), FocusState::FOREGROUND);
-    }
-}
-
-/**
- * Test ability for the SpeechSynthesizer to handle one Speak directive.
- *
- * This test is intended to test the SpeechSynthesizer's ability to receive one directive, play it using a MediaPlayer
- * then return to a finished state. Once the Speak reaches the SpeechSynthesizer, the dialogRequestID is changed and
- * all directives are cancelled.
- *
- */
-TEST_F(SpeechSynthesizerTest, test_bargeInOnOneSpeech) {
-    // SpeechSynthesizerObserverInterface defaults to a FINISHED state.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // Send audio of "Joke" that will prompt SetMute and Speak.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_JOKE_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    TestMessageSender::SendParams sendRecognizeParams = m_avsConnectionManager->waitForNext(DIRECTIVE_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendRecognizeParams, NAME_RECOGNIZE));
-
-    // Wait for the directive to route through to our handler.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_EQ(params.type, TestDirectiveHandler::DirectiveParams::Type::PREHANDLE);
-    params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_EQ(params.type, TestDirectiveHandler::DirectiveParams::Type::HANDLE);
-
-    // Unblock the queue so SpeechSynthesizer can do its work.
-    params.result->setCompleted();
-
-    // SpeechSynthesizer is now speaking.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::GAINING_FOCUS);
-
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::PLAYING);
-
-    // Change the dialogRequestID to cancel the queued directives.
-    m_directiveSequencer->setDialogRequestId(SECOND_DIALOG_REQUEST_ID);
-
-    // Check that SS grabs the channel focus by seeing that the test client has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // SpeechStarted was sent.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(DIRECTIVE_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-
-    // SpeechSynthesizer has finished.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::INTERRUPTED);
-
-    // SpeechInterrupted was sent.
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_INTERRUPTED));
-
-    // Alerts channel regains the foreground.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION), FocusState::FOREGROUND);
-}
-
-/**
- * Test ability for the SpeechSynthesizer to handle a barge in at the begining of consecutive speaks.
- *
- * This test is intended to test the SpeechSynthesizer's ability to receive multiple directives, play each using a
- * MediaPlayer then return to a finished state and notify the DirectiveSequencer that the directive was handled. This is
- * done by sending a Recognize event to AVS with audio of "What's up?" which returns four sets of SetMute and Speak.
- * Once the first Speak reaches the SpeechSynthesizer, the dialogRequestID is changed and all directives are cancelled.
- *
- */
-TEST_F(SpeechSynthesizerTest, test_bargeInOnMultipleSpeaksAtTheBeginning) {
-    // SpeechSynthesizerObserverInterface defaults to a FINISHED state.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // Send audio of "What's Up" that will prompt four sets of SetMute and Speak.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_WHATS_UP_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    TestMessageSender::SendParams sendRecognizeParams = m_avsConnectionManager->waitForNext(DIRECTIVE_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendRecognizeParams, NAME_RECOGNIZE));
-
-    // Wait for the directive to route through to our handler.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-
-    // While blocked, change the dialogRequestID.
-    m_directiveSequencer->setDialogRequestId(SECOND_DIALOG_REQUEST_ID);
-
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.type == TestDirectiveHandler::DirectiveParams::Type::HANDLE) {
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    }
-
-    // SpeechSynthesizer is still finished.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WANTING_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // Check that the test client is still in the foreground.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WANTING_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // SpeechStarted is not sent.
-    TestMessageSender::SendParams canceledSendStartedParams =
-        m_avsConnectionManager->waitForNext(WANTING_TIMEOUT_DURATION);
-    ASSERT_FALSE(checkSentEventName(canceledSendStartedParams, NAME_SPEECH_STARTED));
-
-    // Media Player has not changed.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WANTING_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // SpeechFinished is not sent.
-    TestMessageSender::SendParams canceledSendFinishedParams =
-        m_avsConnectionManager->waitForNext(WANTING_TIMEOUT_DURATION);
-    ASSERT_FALSE(checkSentEventName(canceledSendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // Alerts channel regains the foreground.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WANTING_TIMEOUT_DURATION), FocusState::FOREGROUND);
-}
-
-/**
- * Test ability for the SpeechSynthesizer to handle a barge in in the middle of consecutive speaks.
- *
- * This test is intended to test the SpeechSynthesizer's ability to receive multiple directives, play each using a
- * MediaPlayer then return to a finished state and notify the DirectiveSequencer that the directive was handled. This is
- * done by sending a Recognize event to AVS with audio of "What's up?" which returns four sets of SetMute and Speak.
- * While the Speak directives are being handled, the dialogRequestID is changed and all directives are cancelled.
- *
- */
-TEST_F(SpeechSynthesizerTest, DISABLED_test_bargeInOnMultipleSpeaksInTheMiddle) {
-    // SpeechSynthesizerObserverInterface defaults to a FINISHED state.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // Send audio of "What's up" that will prompt four sets of SetMute and Speak.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_WHATS_UP_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    TestMessageSender::SendParams sendRecognizeParams = m_avsConnectionManager->waitForNext(DIRECTIVE_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendRecognizeParams, NAME_RECOGNIZE));
-
-    // Wait for the directive to route through to our handler.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    bool handleFound = false;
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT && !handleFound) {
-        if (params.type == TestDirectiveHandler::DirectiveParams::Type::HANDLE) {
-            handleFound = true;
-        } else {
-            params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-        }
-    }
-    ASSERT_TRUE(handleFound);
-
-    // Unblock the queue so SS can do its work.
-    params.result->setCompleted();
-
-    // SpeechSynthesizer is now speaking.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::GAINING_FOCUS);
-
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::PLAYING);
-
-    // Check that SS grabs the channel focus by seeing that the test client has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // SpeechStarted is sent.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(DIRECTIVE_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-
-    // Media Player has finished.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // SpeechFinished is sent here.
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // Alerts channel regains the foreground.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // While blocked, change the dialogRequestID to cancel the queued directives.
-    m_directiveSequencer->setDialogRequestId(SECOND_DIALOG_REQUEST_ID);
-
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.type == TestDirectiveHandler::DirectiveParams::Type::HANDLE) {
-            // Unblock the queue so SS can do its work.
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    }
-
-    // SpeechSynthesizer is still finished.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WANTING_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // Check that the test client is still in the foreground.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WANTING_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // SpeechStarted is not sent.
-    TestMessageSender::SendParams canceledSendStartedParams =
-        m_avsConnectionManager->waitForNext(WANTING_TIMEOUT_DURATION);
-    ASSERT_FALSE(checkSentEventName(canceledSendStartedParams, NAME_SPEECH_STARTED));
-
-    // Media Player has not changed.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WANTING_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // SpeechFinished is not sent.
-    TestMessageSender::SendParams canceledSendFinishedParams =
-        m_avsConnectionManager->waitForNext(WANTING_TIMEOUT_DURATION);
-    ASSERT_FALSE(checkSentEventName(canceledSendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // Alerts channel regains the foreground.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WANTING_TIMEOUT_DURATION), FocusState::FOREGROUND);
-}
-
-/**
- * Test ability for the SpeechSynthesizer to handle a Multiturn scenario.
- *
- * This test is intended to test the SpeechSynthesizer's ability to receive one directive, play it using a MediaPlayer
- * then return to a finished state. Another recognize event is then sent to AVS is response to the ExpectSpeech
- * directive which prompts another Speak directive to be handled.
- */
-TEST_F(SpeechSynthesizerTest, test_multiturnScenario) {
-    // SpeechSynthesizerObserverInterface defaults to a FINISHED state.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // Send audio of "Wikipedia" that will prompt SetMute, Speak, and ExpectSpeech.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string file = g_inputPath + RECOGNIZE_WIKI_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        file,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    TestMessageSender::SendParams sendRecognizeParams = m_avsConnectionManager->waitForNext(DIRECTIVE_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendRecognizeParams, NAME_RECOGNIZE));
-
-    // Wait for the directive to route through to our handler.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_NE(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-    while (params.type == TestDirectiveHandler::DirectiveParams::Type::HANDLE) {
-        params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    }
-    params.result->setCompleted();
-
-    // SpeechSynthesizer is now speaking.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::GAINING_FOCUS);
-
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::PLAYING);
-
-    // Check that SS grabs the channel focus by seeing that the test client has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // SpeechStarted is sent.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(DIRECTIVE_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-
-    // Media Player has finished.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // SpeechFinished is sent here.
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // Alerts channel regains the foreground.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    bool expectSpeechFound = false;
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.type == TestDirectiveHandler::DirectiveParams::Type::HANDLE) {
-            if (params.directive->getName() == NAME_EXPECT_SPEECH) {
-                expectSpeechFound = true;
-            }
-            // Unblock the queue so SS can do its work.
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    }
-    ASSERT_TRUE(expectSpeechFound);
-
-    // Clear out remaining directives.
-    m_directiveSequencer->setDialogRequestId(FIRST_DIALOG_REQUEST_ID);
-    std::string secondFile = g_inputPath + RECOGNIZE_LIONS_AUDIO_FILE_NAME;
-    setupMessageWithAttachmentAndSend(
-        CT_FIRST_RECOGNIZE_EVENT_JSON,
-        secondFile,
-        avsCommon::sdkInterfaces::MessageRequestObserverInterface::Status::SUCCESS,
-        SEND_EVENT_TIMEOUT_DURATION);
-
-    TestMessageSender::SendParams secondSendRecognizeParams =
-        m_avsConnectionManager->waitForNext(DIRECTIVE_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(secondSendRecognizeParams, NAME_RECOGNIZE));
-
-    params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    while (params.type != TestDirectiveHandler::DirectiveParams::Type::TIMEOUT) {
-        if (params.type == TestDirectiveHandler::DirectiveParams::Type::HANDLE) {
-            // Unblock the queue so SS can do its work.
-            params.result->setCompleted();
-        }
-        params = m_directiveHandler->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    }
-
-    // SpeechSynthesizer is now speaking.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::GAINING_FOCUS);
-
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::PLAYING);
-
-    // Check that SS grabs the channel focus by seeing that the test client has been backgrounded.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION), FocusState::BACKGROUND);
-
-    // SpeechStarted is sent.
-    TestMessageSender::SendParams secondSendStartedParams =
-        m_avsConnectionManager->waitForNext(DIRECTIVE_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(secondSendStartedParams, NAME_SPEECH_STARTED));
-
-    // Media Player has finished.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // SpeechFinished is sent here.
-    TestMessageSender::SendParams secondSendFinishedParams =
-        m_avsConnectionManager->waitForNext(WAIT_FOR_TIMEOUT_DURATION);
-    ASSERT_TRUE(checkSentEventName(secondSendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // Alerts channel regains the foreground.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WAIT_FOR_TIMEOUT_DURATION), FocusState::FOREGROUND);
-}
-
-/**
- * Test ability for the test setup to handle no directives.
- *
- * This test is intended to test the SpeechSynthesizer's ability to do nothing when there are no Speak directives. No
- * Recognize events are sent to trigger any directives.
- */
-TEST_F(SpeechSynthesizerTest, test_handleNoDirectives) {
-    // SpeechSynthesizerObserverInterface defaults to a FINISHED state.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WAIT_FOR_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    TestMessageSender::SendParams sendRecognizeParams = m_avsConnectionManager->waitForNext(WANTING_TIMEOUT_DURATION);
-    ASSERT_FALSE(checkSentEventName(sendRecognizeParams, NAME_RECOGNIZE));
-
-    // Wait for the directive to route through to our handler.
-    TestDirectiveHandler::DirectiveParams params = m_directiveHandler->waitForNext(WANTING_TIMEOUT_DURATION);
-    ASSERT_EQ(params.type, TestDirectiveHandler::DirectiveParams::Type::TIMEOUT);
-
-    // SpeechSynthesizer defaults to Finished state.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WANTING_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // Check that the test client is still in the foreground.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WANTING_TIMEOUT_DURATION), FocusState::FOREGROUND);
-
-    // SpeechStarted is not sent.
-    TestMessageSender::SendParams sendStartedParams = m_avsConnectionManager->waitForNext(WANTING_TIMEOUT_DURATION);
-    ASSERT_FALSE(checkSentEventName(sendStartedParams, NAME_SPEECH_STARTED));
-
-    // Media Player has not changed.
-    ASSERT_EQ(
-        m_speechSynthesizerObserver->waitForNext(WANTING_TIMEOUT_DURATION),
-        SpeechSynthesizerObserverInterface::SpeechSynthesizerState::FINISHED);
-
-    // SpeechFinished is not sent.
-    TestMessageSender::SendParams sendFinishedParams = m_avsConnectionManager->waitForNext(WANTING_TIMEOUT_DURATION);
-    ASSERT_FALSE(checkSentEventName(sendFinishedParams, NAME_SPEECH_FINISHED));
-
-    // Alerts channel regains the foreground.
-    ASSERT_EQ(m_testClient->waitForFocusChange(WANTING_TIMEOUT_DURATION), FocusState::FOREGROUND);
-}
-
-}  // namespace test
-}  // namespace integration
-}  // namespace alexaClientSDK
-
-int main(int argc, char** argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-    if (argc < 3) {
-        std::cerr << "USAGE: " << std::string(argv[0]) << " <path_to_AlexaClientSDKConfig.json> <path_to_inputs_folder>"
-                  << std::endl;
-        return 1;
-
-    } else {
-        alexaClientSDK::integration::test::g_configPath = std::string(argv[1]);
-        alexaClientSDK::integration::test::g_inputPath = std::string(argv[2]);
-        return RUN_ALL_TESTS();
-    }
-}
diff --git a/InterruptModel/config/include/InterruptModel/config/InterruptModelConfiguration.h b/InterruptModel/config/include/InterruptModel/config/InterruptModelConfiguration.h
index 1ed6542c8d..4029f9308a 100644
--- a/InterruptModel/config/include/InterruptModel/config/InterruptModelConfiguration.h
+++ b/InterruptModel/config/include/InterruptModel/config/InterruptModelConfiguration.h
@@ -21,7 +21,9 @@
 #include <memory>
 #include <sstream>
 
-#if defined(_MSC_VER)
+#include <AVSCommon/Utils/SDKConfig.h>
+
+#if defined(_MSC_VER) && defined(ACSDK_CONFIG_SHARED_LIBS)
 #if defined(IN_INTERRUPTMODEL)
 #define interruptmodel_EXPORT __declspec(dllexport)
 #else
diff --git a/InterruptModel/src/InterruptModel.cpp b/InterruptModel/src/InterruptModel.cpp
index a04aec36fa..970a992152 100644
--- a/InterruptModel/src/InterruptModel.cpp
+++ b/InterruptModel/src/InterruptModel.cpp
@@ -24,7 +24,7 @@ namespace interruptModel {
 using namespace avsCommon::avs;
 using namespace avsCommon::utils::configuration;
 
-static const std::string TAG{"InterruptModel"};
+#define TAG "InterruptModel"
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
 /// Key for the interrupt model configuration
diff --git a/MediaPlayer/AndroidSLESMediaPlayer/src/AndroidSLESMediaPlayer.cpp b/MediaPlayer/AndroidSLESMediaPlayer/src/AndroidSLESMediaPlayer.cpp
index 257f27f104..7e6a173a5b 100644
--- a/MediaPlayer/AndroidSLESMediaPlayer/src/AndroidSLESMediaPlayer.cpp
+++ b/MediaPlayer/AndroidSLESMediaPlayer/src/AndroidSLESMediaPlayer.cpp
@@ -38,7 +38,7 @@
 #include "AndroidSLESMediaPlayer/FFmpegUrlInputController.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AndroidSLESMediaPlayer");
+#define TAG "AndroidSLESMediaPlayer"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/AndroidSLESMediaPlayer/src/AndroidSLESMediaQueue.cpp b/MediaPlayer/AndroidSLESMediaPlayer/src/AndroidSLESMediaQueue.cpp
index ac1e424257..f58483c5aa 100644
--- a/MediaPlayer/AndroidSLESMediaPlayer/src/AndroidSLESMediaQueue.cpp
+++ b/MediaPlayer/AndroidSLESMediaPlayer/src/AndroidSLESMediaQueue.cpp
@@ -20,7 +20,7 @@
 #include "AndroidSLESMediaPlayer/AndroidSLESMediaQueue.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"AndroidSLESMediaQueue"};
+#define TAG "AndroidSLESMediaQueue"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -89,7 +89,7 @@ std::unique_ptr<AndroidSLESMediaQueue> AndroidSLESMediaQueue::create(
 }
 
 void AndroidSLESMediaQueue::onBufferFree() {
-    m_executor.submit([this]() { fillBuffer(); });
+    m_executor.execute([this]() { fillBuffer(); });
 }
 
 AndroidSLESMediaQueue::~AndroidSLESMediaQueue() {
@@ -212,7 +212,7 @@ void AndroidSLESMediaQueue::enqueueSilence(const PlaybackConfiguration& configur
 void AndroidSLESMediaQueue::fillAllBuffers(const PlaybackConfiguration& configuration) {
     enqueueSilence(configuration);
     for (; m_index < m_buffers.size(); ++m_index) {
-        m_executor.submit([this]() { fillBuffer(); });
+        m_executor.execute([this]() { fillBuffer(); });
     }
     m_index = 0;
 }
diff --git a/MediaPlayer/AndroidSLESMediaPlayer/src/AndroidSLESSpeaker.cpp b/MediaPlayer/AndroidSLESMediaPlayer/src/AndroidSLESSpeaker.cpp
index 229be6c7bf..16cf5f9164 100644
--- a/MediaPlayer/AndroidSLESMediaPlayer/src/AndroidSLESSpeaker.cpp
+++ b/MediaPlayer/AndroidSLESMediaPlayer/src/AndroidSLESSpeaker.cpp
@@ -21,7 +21,7 @@
 #include "AndroidSLESMediaPlayer/AndroidSLESSpeaker.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AndroidSLESSpeaker");
+#define TAG "AndroidSLESSpeaker"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegAttachmentInputController.cpp b/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegAttachmentInputController.cpp
index 64d185c97d..318906e289 100644
--- a/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegAttachmentInputController.cpp
+++ b/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegAttachmentInputController.cpp
@@ -29,7 +29,7 @@ extern "C" {
 #include "AndroidSLESMediaPlayer/FFmpegDeleter.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("FFmpegAttachmentInputController");
+#define TAG "FFmpegAttachmentInputController"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegDecoder.cpp b/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegDecoder.cpp
index a5aa58613f..c2026a90ca 100644
--- a/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegDecoder.cpp
+++ b/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegDecoder.cpp
@@ -39,7 +39,7 @@ extern "C" {
 #include "AndroidSLESMediaPlayer/PlaybackConfiguration.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("FFmpegDecoder");
+#define TAG "FFmpegDecoder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegStreamInputController.cpp b/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegStreamInputController.cpp
index 8f38f4fef6..72a801d6f4 100644
--- a/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegStreamInputController.cpp
+++ b/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegStreamInputController.cpp
@@ -28,7 +28,7 @@ extern "C" {
 #include "AndroidSLESMediaPlayer/FFmpegStreamInputController.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("FFmpegStreamInputController");
+#define TAG "FFmpegStreamInputController"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegUrlInputController.cpp b/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegUrlInputController.cpp
index c27f2f2a54..5c49f5bbdc 100644
--- a/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegUrlInputController.cpp
+++ b/MediaPlayer/AndroidSLESMediaPlayer/src/FFmpegUrlInputController.cpp
@@ -26,7 +26,7 @@ extern "C" {
 #include "AndroidSLESMediaPlayer/FFmpegUrlInputController.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("FFmpegUrlInputController");
+#define TAG "FFmpegUrlInputController"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/AndroidSLESMediaPlayer/src/PlaybackConfiguration.cpp b/MediaPlayer/AndroidSLESMediaPlayer/src/PlaybackConfiguration.cpp
index c042c4028b..48675fc43e 100644
--- a/MediaPlayer/AndroidSLESMediaPlayer/src/PlaybackConfiguration.cpp
+++ b/MediaPlayer/AndroidSLESMediaPlayer/src/PlaybackConfiguration.cpp
@@ -23,7 +23,7 @@
 #include "AndroidSLESMediaPlayer/PlaybackConfiguration.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PlaybackConfiguration");
+#define TAG "PlaybackConfiguration"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/AndroidSLESMediaPlayer/test/AndroidSLESMediaPlayerTest.cpp b/MediaPlayer/AndroidSLESMediaPlayer/test/AndroidSLESMediaPlayerTest.cpp
index 9d317f3f99..91b1c93109 100644
--- a/MediaPlayer/AndroidSLESMediaPlayer/test/AndroidSLESMediaPlayerTest.cpp
+++ b/MediaPlayer/AndroidSLESMediaPlayer/test/AndroidSLESMediaPlayerTest.cpp
@@ -34,7 +34,7 @@
 #include <Audio/Data/med_system_alerts_melodic_01_short.wav.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AndroidSLESMediaPlayerTest");
+#define TAG "AndroidSLESMediaPlayerTest"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/AndroidSLESMediaPlayer/test/AndroidSLESMediaQueueTest.cpp b/MediaPlayer/AndroidSLESMediaPlayer/test/AndroidSLESMediaQueueTest.cpp
index c1f9365232..b8a1feb402 100644
--- a/MediaPlayer/AndroidSLESMediaPlayer/test/AndroidSLESMediaQueueTest.cpp
+++ b/MediaPlayer/AndroidSLESMediaPlayer/test/AndroidSLESMediaQueueTest.cpp
@@ -30,7 +30,7 @@
 #include "AndroidSLESMediaPlayer/AndroidSLESMediaQueue.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"AndroidSLESMediaQueueTest"};
+#define TAG "AndroidSLESMediaQueueTest"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/AndroidSLESMediaPlayer/test/AndroidSLESSpeakerTest.cpp b/MediaPlayer/AndroidSLESMediaPlayer/test/AndroidSLESSpeakerTest.cpp
index c0540a99d6..3e91991068 100644
--- a/MediaPlayer/AndroidSLESMediaPlayer/test/AndroidSLESSpeakerTest.cpp
+++ b/MediaPlayer/AndroidSLESMediaPlayer/test/AndroidSLESSpeakerTest.cpp
@@ -24,7 +24,7 @@
 #include "AndroidSLESMediaPlayer/AndroidSLESSpeaker.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"AndroidSLESSpeakerTest"};
+#define TAG "AndroidSLESSpeakerTest"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/AndroidSLESMediaPlayer/test/FFmpegDecoderTest.cpp b/MediaPlayer/AndroidSLESMediaPlayer/test/FFmpegDecoderTest.cpp
index 59f6b3aa4b..6108bc867c 100644
--- a/MediaPlayer/AndroidSLESMediaPlayer/test/FFmpegDecoderTest.cpp
+++ b/MediaPlayer/AndroidSLESMediaPlayer/test/FFmpegDecoderTest.cpp
@@ -28,7 +28,7 @@
 #include "AndroidSLESMediaPlayer/FFmpegDecoder.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("FFmpegDecoderTest");
+#define TAG "FFmpegDecoderTest"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/GStreamerMediaPlayer/src/AttachmentReaderSource.cpp b/MediaPlayer/GStreamerMediaPlayer/src/AttachmentReaderSource.cpp
index b928bb4b9e..65f2a63f06 100644
--- a/MediaPlayer/GStreamerMediaPlayer/src/AttachmentReaderSource.cpp
+++ b/MediaPlayer/GStreamerMediaPlayer/src/AttachmentReaderSource.cpp
@@ -28,7 +28,7 @@ using namespace avsCommon::utils::mediaPlayer;
 using namespace avsCommon::avs::attachment;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AttachmentReaderSource");
+#define TAG "AttachmentReaderSource"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/GStreamerMediaPlayer/src/BaseStreamSource.cpp b/MediaPlayer/GStreamerMediaPlayer/src/BaseStreamSource.cpp
index 61e98ce5f0..51b6bc7efd 100644
--- a/MediaPlayer/GStreamerMediaPlayer/src/BaseStreamSource.cpp
+++ b/MediaPlayer/GStreamerMediaPlayer/src/BaseStreamSource.cpp
@@ -28,7 +28,7 @@ using namespace avsCommon::utils::mediaPlayer;
 using namespace avsCommon::avs::attachment;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("BaseStreamSource");
+#define TAG "BaseStreamSource"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/GStreamerMediaPlayer/src/IStreamSource.cpp b/MediaPlayer/GStreamerMediaPlayer/src/IStreamSource.cpp
index 4d8ab24792..fc33895fed 100644
--- a/MediaPlayer/GStreamerMediaPlayer/src/IStreamSource.cpp
+++ b/MediaPlayer/GStreamerMediaPlayer/src/IStreamSource.cpp
@@ -28,7 +28,7 @@ using namespace avsCommon::utils::mediaPlayer;
 using namespace avsCommon::avs::attachment;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("IStreamSource");
+#define TAG "IStreamSource"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/GStreamerMediaPlayer/src/MediaPlayer.cpp b/MediaPlayer/GStreamerMediaPlayer/src/MediaPlayer.cpp
index 4a9dcaf50e..58c360428d 100644
--- a/MediaPlayer/GStreamerMediaPlayer/src/MediaPlayer.cpp
+++ b/MediaPlayer/GStreamerMediaPlayer/src/MediaPlayer.cpp
@@ -49,7 +49,7 @@ using namespace avsCommon::utils::configuration;
 using MediaPlayerState = avsCommon::utils::mediaPlayer::MediaPlayerState;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("MediaPlayer");
+#define TAG "MediaPlayer"
 
 static const std::string MEDIAPLAYER_CONFIGURATION_ROOT_KEY = "gstreamerMediaPlayer";
 /// The key in our config file to set the audioSink.
diff --git a/MediaPlayer/GStreamerMediaPlayer/src/Normalizer.cpp b/MediaPlayer/GStreamerMediaPlayer/src/Normalizer.cpp
index 63c1090ab1..3bc3bac08e 100644
--- a/MediaPlayer/GStreamerMediaPlayer/src/Normalizer.cpp
+++ b/MediaPlayer/GStreamerMediaPlayer/src/Normalizer.cpp
@@ -22,7 +22,7 @@ namespace alexaClientSDK {
 namespace mediaPlayer {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("Normalizer");
+#define TAG "Normalizer"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/GStreamerMediaPlayer/src/OffsetManager.cpp b/MediaPlayer/GStreamerMediaPlayer/src/OffsetManager.cpp
index f88743cb65..9337b21a37 100644
--- a/MediaPlayer/GStreamerMediaPlayer/src/OffsetManager.cpp
+++ b/MediaPlayer/GStreamerMediaPlayer/src/OffsetManager.cpp
@@ -23,7 +23,7 @@ namespace mediaPlayer {
 using namespace avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("OffsetManager");
+#define TAG "OffsetManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/MediaPlayer/GStreamerMediaPlayer/test/MediaPlayerTest.cpp b/MediaPlayer/GStreamerMediaPlayer/test/MediaPlayerTest.cpp
index a71d1913f9..84b07b06c1 100644
--- a/MediaPlayer/GStreamerMediaPlayer/test/MediaPlayerTest.cpp
+++ b/MediaPlayer/GStreamerMediaPlayer/test/MediaPlayerTest.cpp
@@ -49,7 +49,7 @@ using namespace avsCommon::utils::memory;
 using namespace ::testing;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("MediaPlayerTest");
+#define TAG "MediaPlayerTest"
 
 static const MediaPlayer::SourceId ERROR_SOURCE_ID = MediaPlayer::ERROR;
 
diff --git a/Metrics/MetricRecorder/src/MetricRecorder.cpp b/Metrics/MetricRecorder/src/MetricRecorder.cpp
index 4226cc988d..00190343cb 100644
--- a/Metrics/MetricRecorder/src/MetricRecorder.cpp
+++ b/Metrics/MetricRecorder/src/MetricRecorder.cpp
@@ -22,7 +22,7 @@ namespace metrics {
 namespace implementations {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("MetricRecorder");
+#define TAG "MetricRecorder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -62,7 +62,7 @@ void MetricRecorder::recordMetric(std::shared_ptr<alexaClientSDK::avsCommon::uti
         return;
     }
 
-    m_executor.submit([this, metricEvent]() {
+    m_executor.execute([this, metricEvent]() {
         for (const auto& sink : m_sinks) {
             sink->consumeMetric(metricEvent);
         }
diff --git a/Metrics/SampleMetricSink/src/SampleMetricSink.cpp b/Metrics/SampleMetricSink/src/SampleMetricSink.cpp
index 4ad6bfce46..68bd88b4d5 100644
--- a/Metrics/SampleMetricSink/src/SampleMetricSink.cpp
+++ b/Metrics/SampleMetricSink/src/SampleMetricSink.cpp
@@ -36,7 +36,7 @@ using namespace alexaClientSDK::avsCommon::utils::configuration;
 using namespace alexaClientSDK::avsCommon::utils::metrics;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SampleMetricSink");
+#define TAG "SampleMetricSink"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Metrics/UplCalculator/include/Metrics/BaseUplCalculator.h b/Metrics/UplCalculator/include/Metrics/BaseUplCalculator.h
index d220dd7685..521bea09d0 100644
--- a/Metrics/UplCalculator/include/Metrics/BaseUplCalculator.h
+++ b/Metrics/UplCalculator/include/Metrics/BaseUplCalculator.h
@@ -36,6 +36,8 @@ static constexpr const char* DIRECTIVE_DISPATCHED_IMMEDIATE = "DIRECTIVE_DISPATC
 
 /// Names of the new recordered timepoints for UPL
 static constexpr const char* END_OF_UTTERANCE = "END_OF_UTTERANCE";
+static constexpr const char* END_OF_WW = "END_OF_WW";
+static constexpr const char* RECOGNIZE_EVENT_IS_BUILT = "RECOGNIZE_EVENT_IS_BUILT";
 
 /// Datapoint name for the start of utterance with wakeword detection
 static constexpr const char* START_OF_STREAM_TIMESTAMP = "START_OF_STREAM_TIMESTAMP";
diff --git a/Metrics/UplCalculator/src/BaseUplCalculator.cpp b/Metrics/UplCalculator/src/BaseUplCalculator.cpp
index 86f62e5d5a..eea50be9c7 100644
--- a/Metrics/UplCalculator/src/BaseUplCalculator.cpp
+++ b/Metrics/UplCalculator/src/BaseUplCalculator.cpp
@@ -23,7 +23,7 @@ namespace metrics {
 namespace implementations {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("BaseUplCalculator");
+#define TAG "BaseUplCalculator"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -78,13 +78,19 @@ void BaseUplCalculator::inspectMetric(
         }
     } else if (WW_DURATION == metricName) {
         std::chrono::milliseconds startOfStreamTimestamp;
+        std::chrono::milliseconds wakeWordDuration;
         if (getDuration(START_OF_STREAM_TIMESTAMP, metricEvent, startOfStreamTimestamp)) {
             // Sends a warning since it overwrites previous START_OF_UTTERANCE
             m_uplData->addTimepoint(START_OF_UTTERANCE, UplTimePoint(startOfStreamTimestamp));
+            if (getDuration(WW_DURATION, metricEvent, wakeWordDuration)) {
+                m_uplData->addTimepoint(END_OF_WW, UplTimePoint(startOfStreamTimestamp + wakeWordDuration));
+            }
         } else {
             ACSDK_ERROR(
                 LX("inspectMetricFailed").d("reason", "missing START_OF_STREAM_TIMESTAMP").d("metricName", metricName));
         }
+    } else if (RECOGNIZE_EVENT_IS_BUILT == metricName) {
+        m_uplData->addTimepoint(RECOGNIZE_EVENT_IS_BUILT, metricEvent->getSteadyTimestamp());
     } else if (STOP_CAPTURE == metricName) {
         m_uplData->addTimepoint(metricName, metricEvent->getSteadyTimestamp());
     } else if (END_OF_SPEECH_OFFSET == metricName) {
diff --git a/Metrics/UplCalculator/src/MediaUplCalculator.cpp b/Metrics/UplCalculator/src/MediaUplCalculator.cpp
index 1817b390c4..3a439fb4b8 100644
--- a/Metrics/UplCalculator/src/MediaUplCalculator.cpp
+++ b/Metrics/UplCalculator/src/MediaUplCalculator.cpp
@@ -29,7 +29,7 @@ namespace metrics {
 namespace implementations {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("MediaUplCalculator");
+#define TAG "MediaUplCalculator"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Metrics/UplCalculator/src/TtsUplCalculator.cpp b/Metrics/UplCalculator/src/TtsUplCalculator.cpp
index 97174c3cc8..00814c1f8d 100644
--- a/Metrics/UplCalculator/src/TtsUplCalculator.cpp
+++ b/Metrics/UplCalculator/src/TtsUplCalculator.cpp
@@ -28,7 +28,7 @@ namespace metrics {
 namespace implementations {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("TtsUplCalculator");
+#define TAG "TtsUplCalculator"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Metrics/UplCalculator/src/UplMetricSink.cpp b/Metrics/UplCalculator/src/UplMetricSink.cpp
index 2193a6099e..c22efc3110 100644
--- a/Metrics/UplCalculator/src/UplMetricSink.cpp
+++ b/Metrics/UplCalculator/src/UplMetricSink.cpp
@@ -25,7 +25,7 @@ namespace metrics {
 namespace implementations {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("UplMetricSink");
+#define TAG "UplMetricSink"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/NOTICE.txt b/NOTICE.txt
index 5af4c0c79a..5b3fe61fed 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,162 +1,160 @@
-AVS Device SDK
-Copyright 2016-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-***************************
-AVS DEVICE SDK COMPONENTS
-***************************
-
-The following AVS Device SDK components are licensed under the Apache
-License, Version 2.0 (the "License"):
-
-- Activity Focus Manager Library (AFML)
-- Alerts Capability Agent
-- Alexa Communications Library (ACL)
-- Alexa Directive Sequencer Library (ADSL)
-- Audio Input Processor (AIP) / Speech Recognizer Capability Agent
-- Certified Sender
-- Context Manager
-- Default Client
-- ExternalMediaPlayer Capability Agent
-- Key Word Detector (KWD)
-- Media Player
-- Notifications Capability Agent
-- Playback Controller Capability Agent
-- Playlist Parser
-- RegistrationManager
-- Sample App
-- Settings Capability Agent
-- SpeakerManager Capability Agent
-- SpeechSynthesizer Capability Agent
-- Storage
-- System Capability Agent
-- Template Runtime Capability Agent
-
-You may not use this file except in compliance with the License. A copy of
-the License is located at
-
-    http://aws.amazon.com/apache2.0/
-
-or in the "license" file accompanying this file. This file is distributed on
-an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-or implied. See the License for the specific language governing permissions and
-limitations under the License.
-
-***************************
-AVS DEVICE SDK COMPONENTS
-***************************
-
-The following AVS Device SDK component is licensed under the Amazon Software License:
-
-- AudioPlayer Capability Agent
-- InterruptModel
-
-You may not use this file except in compliance with the Amazon Software License. A copy
-of the Amazon Software License is located at:
-
-  http://aws.amazon.com/asl/
-
-******************
-ALEXA AUDIO ASSETS
-******************
-
-Copyright 2019-2022 Amazon.com, Inc. or its affiliates ("Amazon").
-All Rights Reserved.
-
-These materials are licensed to you as “AVS Materials" under the Amazon
-Developer Services Agreement, which is currently available at
-https://developer.amazon.com/support/legal/da
-
-**********************
-THIRD PARTY COMPONENTS
-**********************
-
-This software includes third party software subject to the following
-copyrights:
-
-- JSON parsing for C++ from RapidJSON - Copyright (C) 2015 THL A29 Limited,
-a Tencent company, and Milo Yip.
-
-- Multipart parsing for MIME messages from multipart-parser -
-Copyright (c) 2010 Hongli Lai
-
-- C++ test framework from Google Test - Copyright 2008, Google Inc.
-
-- Extension for writing and using C++ mock classes from Google Mock -
-Copyright 2008, Google Inc.
-
-- a2dp-rtp.h from BlueALSA - Copyright (c) 2016-2017 Arkadiusz Bokowy.
-
-- Part of the code in BluetoothImplementations/BlueZ/src/MediaEndpoint.cpp is based on
-BlueALSA project - Copyright (c) 2016-2017 Arkadiusz Bokowy.
-
-- Part of the code in shared/acsdkManufactory is based on fruit -
-Copyright 2014 Google Inc. All rights reserved, available at
-https://github.com/google/fruit.
- 
-NOTE: Other license terms may apply to certain, identified software files
-contained within or distributed with the accompanying software if such terms
-are included in the directory containing the accompanying software. Such
-other license terms will then apply in lieu of the terms of the software
-license above.
-
-***********
-PKCS#11 API
-***********
-Copyright © OASIS Open 2015. All Rights Reserved.
-
-All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual Property Rights
-Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS website:
-[http://www.oasis-open.org/policies-guidelines/ipr]
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or
-otherwise explain it or assist in its implementation may be prepared, copied, published, and distributed, in whole or in
-part, without restriction of any kind, provided that the above copyright notice and this section are included on all such
-copies and derivative works. However, this document itself may not be modified in any way, including by removing the
-copyright notice or references to OASIS, except as needed for the purpose of developing any document or deliverable
-produced by an OASIS Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS
-IPR Policy, must be followed) or as required to translate it into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE
-ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS
-MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS
-DOCUMENT OR ANY PART THEREOF.
-
-[OASIS requests that any OASIS Party or any other party that believes it has patent claims that would necessarily be
-infringed by implementations of this OASIS Standards Final Deliverable, to notify OASIS TC Administrator and provide
-an indication of its willingness to grant patent licenses to such patent claims in a manner consistent with the IPR Mode
-of the OASIS Technical Committee that produced this deliverable.]
-
-[OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of ownership of any patent
-claims that would necessarily be infringed by implementations of this OASIS Standards Final Deliverable by a patent
-holder that is not willing to provide a license to such patent claims in a manner consistent with the IPR Mode of the
-OASIS Technical Committee that produced this OASIS Standards Final Deliverable. OASIS may include such claims on its
-website, but disclaims any obligation to do so.]
-
-[OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be
-claimed to pertain to the implementation or use of the technology described in this OASIS Standards Final Deliverable or
-the extent to which any license under such rights might or might not be available; neither does it represent that it has
-made any effort to identify any such rights. Information on OASIS’ procedures with respect to rights in any document or
-deliverable produced by an OASIS Technical Committee can be found on the OASIS website. Copies of claims of rights made
-available for publication and any assurances of licenses to be made available, or the result of an attempt made to
-obtain a general license or permission for the use of such proprietary rights by implementers or users of this OASIS
-Standards Final Deliverable, can be obtained from the OASIS TC Administrator. OASIS makes no representation that any
-information or list of intellectual property rights will at any time be complete, or that any claims in such list are,
-in fact, Essential Claims.]
-
-*********************************
-Important note on SoftHSM library
-*********************************
-
-This module is intended for experimentation purposes only. We strongly discourage the use of SoftHSM in a production
-environment because it might provide a false sense of additional security. The resulting configuration doesn't provide
-any actual security benefits. The keys stored in SoftHSM are not stored more securely.than any other means of secrets
-storage in the Greengrass environment.
-
-The purpose of this module it to allow you to learn about the PKCS#11 specification and do initial testing of your
-software if you plan to use a real hardware-based HSM in the future.
-
-You must test your future hardware implementation separately and completely before any production usage because there
-might be differences between PKCS#11 implementation provided in SoftHSM and a hardware-based implementation.
\ No newline at end of file
+AVS Device SDK
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+***************************
+AVS DEVICE SDK COMPONENTS
+***************************
+The following AVS Device SDK components are licensed under the Apache
+License, Version 2.0 (the "License"):
+- Activity Focus Manager Library (AFML)
+- Alerts Capability Agent
+- Alexa Communications Library (ACL)
+- Alexa Directive Sequencer Library (ADSL)
+- Audio Input Processor (AIP) / Speech Recognizer Capability Agent
+- Certified Sender
+- Context Manager
+- Default Client
+- Feature Clients
+- ExternalMediaPlayer Capability Agent
+- Key Word Detector (KWD)
+- Media Player
+- Notifications Capability Agent
+- Playback Controller Capability Agent
+- Playlist Parser
+- RegistrationManager
+- Sample Applications
+- Settings Capability Agent
+- SpeakerManager Capability Agent
+- SpeechSynthesizer Capability Agent
+- Storage
+- System Capability Agent
+- Template Runtime Capability Agent
+- APLCapabilityCommon Capability Agent
+- AlexaPresentationAPL Capability Agent
+- AlexaPlaybackController Capability Agent
+- AlexaChannelController Capability Agent
+- AlexaKeypadController Capability Agent
+- AlexaLauncher Capability Agent
+- AlexaRecordController Capability Agent
+- AlexaRemoteVideoPlayer Capability Agent
+- AlexaSeekController Capability Agent
+- AlexaVideoCommon Capability Agent
+- AlexaVideoRecorder Capability Agent
+- LiveViewController Capability Agent
+- InputController Capability Agent
+- VisualCharacteristics Capability Agent
+- PresentationOrchestrator Capability Agent
+
+You may not use this file except in compliance with the License. A copy of
+the License is located at
+    http://aws.amazon.com/apache2.0/
+or in the "license" file accompanying this file. This file is distributed on
+an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+or implied. See the License for the specific language governing permissions and
+limitations under the License.
+***************************
+AVS DEVICE SDK COMPONENTS
+***************************
+The following AVS Device SDK component is licensed under the Amazon Software License:
+- AudioPlayer Capability Agent
+- InterruptModel
+- AlexaPresentation Capability Agent
+You may not use this file except in compliance with the Amazon Software License. A copy
+of the Amazon Software License is located at:
+  http://aws.amazon.com/asl/
+
+The Alexa logo may only be used to represent the Alexa brand as described in the  AVS UX Logo and Brand guidance.
+You may not use the Alexa logo except in compliance with the AVS UX Logo and Brand guidance.
+A copy of this guidance is located at:
+  https://developer.amazon.com/docs/alexa-voice-service/logo-and-brand.html
+
+Components NOT listed above are licensed under the Apache License, Version 2.0 (the "License"):
+You may not use this file except in compliance with the License. A copy of
+the License is located at:
+  http://aws.amazon.com/apache2.0/
+or in the "license" file accompanying this file. This file is distributed on
+an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+or implied. See the License for the specific language governing permissions and
+limitations under the License.
+
+******************
+ALEXA AUDIO ASSETS
+******************
+Copyright Amazon.com, Inc. or its affiliates (“Amazon”).
+All Rights Reserved.
+These materials are licensed to you as "Program Materials" under the Program
+Materials License Agreement, which is currently available at
+https://developer.amazon.com/support/legal/pml.
+**********************
+THIRD PARTY COMPONENTS
+**********************
+This software includes third party software subject to the following
+copyrights:
+- JSON parsing for C++ from RapidJSON - Copyright (C) 2015 THL A29 Limited,
+a Tencent company, and Milo Yip.
+- Multipart parsing for MIME messages from multipart-parser -
+Copyright (c) 2010 Hongli Lai
+- C++ test framework from Google Test - Copyright 2008, Google Inc.
+- Extension for writing and using C++ mock classes from Google Mock -
+Copyright 2008, Google Inc.
+- a2dp-rtp.h from BlueALSA - Copyright (c) 2016-2017 Arkadiusz Bokowy.
+- Part of the code in BluetoothImplementations/BlueZ/src/MediaEndpoint.cpp is based on
+BlueALSA project - Copyright (c) 2016-2017 Arkadiusz Bokowy.
+- Part of the code in shared/acsdkManufactory is based on fruit -
+Copyright 2014 Google Inc. All rights reserved, available at
+https://github.com/google/fruit.
+ 
+NOTE: Other license terms may apply to certain, identified software files
+contained within or distributed with the accompanying software if such terms
+are included in the directory containing the accompanying software. Such
+other license terms will then apply in lieu of the terms of the software
+license above.
+***********
+PKCS#11 API
+***********
+Copyright © OASIS Open 2015. All Rights Reserved.
+All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual Property Rights
+Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS website:
+[http://www.oasis-open.org/policies-guidelines/ipr]
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or
+otherwise explain it or assist in its implementation may be prepared, copied, published, and distributed, in whole or in
+part, without restriction of any kind, provided that the above copyright notice and this section are included on all such
+copies and derivative works. However, this document itself may not be modified in any way, including by removing the
+copyright notice or references to OASIS, except as needed for the purpose of developing any document or deliverable
+produced by an OASIS Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS
+IPR Policy, must be followed) or as required to translate it into languages other than English.
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
+This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE
+ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS
+MEMBERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THIS
+DOCUMENT OR ANY PART THEREOF.
+[OASIS requests that any OASIS Party or any other party that believes it has patent claims that would necessarily be
+infringed by implementations of this OASIS Standards Final Deliverable, to notify OASIS TC Administrator and provide
+an indication of its willingness to grant patent licenses to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this deliverable.]
+[OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of ownership of any patent
+claims that would necessarily be infringed by implementations of this OASIS Standards Final Deliverable by a patent
+holder that is not willing to provide a license to such patent claims in a manner consistent with the IPR Mode of the
+OASIS Technical Committee that produced this OASIS Standards Final Deliverable. OASIS may include such claims on its
+website, but disclaims any obligation to do so.]
+[OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be
+claimed to pertain to the implementation or use of the technology described in this OASIS Standards Final Deliverable or
+the extent to which any license under such rights might or might not be available; neither does it represent that it has
+made any effort to identify any such rights. Information on OASIS’ procedures with respect to rights in any document or
+deliverable produced by an OASIS Technical Committee can be found on the OASIS website. Copies of claims of rights made
+available for publication and any assurances of licenses to be made available, or the result of an attempt made to
+obtain a general license or permission for the use of such proprietary rights by implementers or users of this OASIS
+Standards Final Deliverable, can be obtained from the OASIS TC Administrator. OASIS makes no representation that any
+information or list of intellectual property rights will at any time be complete, or that any claims in such list are,
+in fact, Essential Claims.]
+*********************************
+Important note on SoftHSM library
+*********************************
+This module is intended for experimentation purposes only. We strongly discourage the use of SoftHSM in a production
+environment because it might provide a false sense of additional security. The resulting configuration doesn't provide
+any actual security benefits. The keys stored in SoftHSM are not stored more securely.than any other means of secrets
+storage in the Greengrass environment.
+The purpose of this module it to allow you to learn about the PKCS#11 specification and do initial testing of your
+software if you plan to use a real hardware-based HSM in the future.
+You must test your future hardware implementation separately and completely before any production usage because there
+might be differences between PKCS#11 implementation provided in SoftHSM and a hardware-based implementation.
diff --git a/PlaylistParser/src/ContentDecrypter.cpp b/PlaylistParser/src/ContentDecrypter.cpp
index 3a9d93d27a..2a5d3acb69 100644
--- a/PlaylistParser/src/ContentDecrypter.cpp
+++ b/PlaylistParser/src/ContentDecrypter.cpp
@@ -47,7 +47,7 @@ struct EVP_CIPHER_CTX_Deleter {
 using EVP_CIPHER_CTX_free_ptr = std::unique_ptr<EVP_CIPHER_CTX, EVP_CIPHER_CTX_Deleter>;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ContentDecrypter");
+#define TAG "ContentDecrypter"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -359,7 +359,7 @@ int ContentDecrypter::decryptAES(
 
     EVP_CIPHER_CTX_set_padding(ctx.get(), usePadding);
 
-    if (!EVP_DecryptUpdate(ctx.get(), output.data(), &len, encryptedContent.data(), inputSize)) {
+    if (!EVP_DecryptUpdate(ctx.get(), output.data(), &len, encryptedContent.data(), static_cast<int>(inputSize))) {
         logFailure("UnableToDecryptUpdate");
         return 0;
     }
@@ -475,7 +475,7 @@ bool ContentDecrypter::decryptSampleAES(
 #endif
 
     // find decoder for the stream
-    AVCodec* dec = avcodec_find_decoder(cid);
+    auto dec = avcodec_find_decoder(cid);
 
     // Allocate a codec context for the decoder
     AVCodecContextPtr decCtx(avcodec_alloc_context3(dec));
diff --git a/PlaylistParser/src/FFMpegInputBuffer.cpp b/PlaylistParser/src/FFMpegInputBuffer.cpp
index 3f46d05527..206a8058b4 100644
--- a/PlaylistParser/src/FFMpegInputBuffer.cpp
+++ b/PlaylistParser/src/FFMpegInputBuffer.cpp
@@ -33,7 +33,7 @@ int FFMpegInputBuffer::read(int size, uint8_t* data) {
         std::memcpy(data, m_inputBytes.data() + m_offset, readSize);
         m_offset += readSize;
     }
-    return readSize;
+    return static_cast<int>(readSize);
 }
 
 bool FFMpegInputBuffer::setOffset(int64_t offset) {
diff --git a/PlaylistParser/src/Id3TagsRemover.cpp b/PlaylistParser/src/Id3TagsRemover.cpp
index b8c6c410f2..090f4fb825 100644
--- a/PlaylistParser/src/Id3TagsRemover.cpp
+++ b/PlaylistParser/src/Id3TagsRemover.cpp
@@ -27,7 +27,7 @@ using namespace avsCommon::avs::attachment;
 using namespace avsCommon::utils::id3Tags;
 using namespace avsCommon::utils::sds;
 
-static const std::string TAG("Id3TagsRemover");
+#define TAG "Id3TagsRemover"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/PlaylistParser/src/IterativePlaylistParser.cpp b/PlaylistParser/src/IterativePlaylistParser.cpp
index 865557d101..b575cac3c1 100644
--- a/PlaylistParser/src/IterativePlaylistParser.cpp
+++ b/PlaylistParser/src/IterativePlaylistParser.cpp
@@ -31,7 +31,7 @@ using namespace avsCommon::utils::playlistParser;
 using namespace avsCommon::utils::string;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("IterativePlaylistParser");
+#define TAG "IterativePlaylistParser"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -87,14 +87,14 @@ PlaylistEntry IterativePlaylistParser::next() {
             return playItem.playlistEntry;
         }
         auto playlistURL = playItem.playlistURL;
-        auto contentFetcher = m_contentFetcherFactory->create(playItem.playlistURL);
-        if (!contentFetcher) {
+        auto playlistContentFetcher = m_contentFetcherFactory->create(playItem.playlistURL);
+        if (!playlistContentFetcher) {
             ACSDK_ERROR(LX("nextFailed").d("reason", "createContentFetcherFailed").sensitive("url", playlistURL));
             return PlaylistEntry::createErrorEntry(playlistURL);
         }
 
-        contentFetcher->getContent(HTTPContentFetcherInterface::FetchOptions::ENTIRE_BODY);
-        auto header = contentFetcher->getHeader(&m_abort);
+        playlistContentFetcher->getContent(HTTPContentFetcherInterface::FetchOptions::ENTIRE_BODY);
+        auto header = playlistContentFetcher->getHeader(&m_abort);
         if (m_abort) {
             ACSDK_DEBUG9(LX("nextFailed").d("info", "aborting"));
             break;
@@ -155,13 +155,13 @@ PlaylistEntry IterativePlaylistParser::next() {
                         // recovery mechanism. This way, if we parse this so far into the future that all the URLs
                         // we had previously seen are gone, we'll still stream the latest URLs.
                         int startPointForNewURLsAdded = 0;
-                        for (int i = entries.size() - 1; i >= 0; --i) {
+                        for (int i = static_cast<int>(entries.size() - 1); i >= 0; --i) {
                             if (entries.at(i).url == m_lastUrl) {
                                 // We need to add the URLs past this point
                                 startPointForNewURLsAdded = i + 1;
                             }
                         }
-                        for (int i = entries.size() - 1; i >= startPointForNewURLsAdded; --i) {
+                        for (int i = static_cast<int>(entries.size() - 1); i >= startPointForNewURLsAdded; --i) {
                             ACSDK_DEBUG9(LX("foundNewURLInLivePlaylist"));
                             auto entry = entries.at(i);
                             m_playQueue.push_front(entry);
diff --git a/PlaylistParser/src/M3UParser.cpp b/PlaylistParser/src/M3UParser.cpp
index 5844058a78..d1aebdf54d 100644
--- a/PlaylistParser/src/M3UParser.cpp
+++ b/PlaylistParser/src/M3UParser.cpp
@@ -13,6 +13,7 @@
  * permissions and limitations under the License.
  */
 
+#include <cctype>
 #include <iomanip>
 #include <sstream>
 
@@ -28,7 +29,7 @@ namespace playlistParser {
 using namespace avsCommon::utils::playlistParser;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("M3UParser");
+#define TAG "M3UParser"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/PlaylistParser/src/PlaylistParser.cpp b/PlaylistParser/src/PlaylistParser.cpp
index cbaff44287..756c94aef2 100644
--- a/PlaylistParser/src/PlaylistParser.cpp
+++ b/PlaylistParser/src/PlaylistParser.cpp
@@ -35,7 +35,7 @@ using namespace avsCommon::utils::playlistParser;
 using namespace avsCommon::utils::string;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PlaylistParser");
+#define TAG "PlaylistParser"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -79,7 +79,7 @@ int PlaylistParser::parsePlaylist(
 
     auto id = ++g_id;
 
-    m_executor.submit([this, id, observer, url, playlistTypesToNotBeParsed]() {
+    m_executor.execute([this, id, observer, url, playlistTypesToNotBeParsed]() {
         doDepthFirstSearch(id, observer, url, playlistTypesToNotBeParsed);
     });
     return id;
@@ -247,7 +247,7 @@ void PlaylistParser::doDepthFirstSearch(
                          * previously seen are gone, we'll still stream the latest URLs.
                          */
                         int startPointForNewURLsAdded = 0;
-                        for (int i = entries.size() - 1; i >= 0; --i) {
+                        for (int i = static_cast<int>(entries.size() - 1); i >= 0; --i) {
                             if (entries.at(i).url == lastUrlParsed) {
                                 // We need to add the URLs past this point
                                 startPointForNewURLsAdded = i + 1;
@@ -300,7 +300,7 @@ void PlaylistParser::doDepthFirstSearch(
                                                  .d("playlistMediaSequence", m3uContent.mediaSequence));
                             }
                             lastMediaSequence = m3uContent.mediaSequence;
-                            lastNumberOfFragments = entries.size();
+                            lastNumberOfFragments = static_cast<int>(entries.size());
                         }
 
                         /*
diff --git a/PlaylistParser/src/PlaylistUtils.cpp b/PlaylistParser/src/PlaylistUtils.cpp
index 866993cd93..743d4e6899 100644
--- a/PlaylistParser/src/PlaylistUtils.cpp
+++ b/PlaylistParser/src/PlaylistUtils.cpp
@@ -32,7 +32,7 @@ using namespace avsCommon::utils::http;
 using namespace avsCommon::utils::sds;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PlaylistUtils");
+#define TAG "PlaylistUtils"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/PlaylistParser/src/UrlContentToAttachmentConverter.cpp b/PlaylistParser/src/UrlContentToAttachmentConverter.cpp
index d0aceddeb9..54d01e56c5 100644
--- a/PlaylistParser/src/UrlContentToAttachmentConverter.cpp
+++ b/PlaylistParser/src/UrlContentToAttachmentConverter.cpp
@@ -26,7 +26,7 @@ using namespace avsCommon::utils::playlistParser;
 using namespace avsCommon::utils::sds;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("UrlContentToAttachmentConverter");
+#define TAG "UrlContentToAttachmentConverter"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -118,7 +118,7 @@ void UrlContentToAttachmentConverter::onPlaylistEntryParsed(int requestId, Playl
     if (playlistEntry.type == PlaylistEntry::Type::MEDIA_INIT_INFO &&
         encryptionInfo.method == EncryptionInfo::Method::SAMPLE_AES) {
         auto totalDuration = encryptionInfo.totalDuration;
-        m_executor.submit([this, url, headers, totalDuration, playlistEntry]() {
+        m_executor.execute([this, url, headers, totalDuration, playlistEntry]() {
             ByteVector mediaInitSection;
             if (!download(url, headers, &mediaInitSection, playlistEntry.contentFetcher)) {
                 closeStreamWriter();
@@ -158,14 +158,14 @@ void UrlContentToAttachmentConverter::onPlaylistEntryParsed(int requestId, Playl
     auto contentFetcher = playlistEntry.contentFetcher;
     switch (parseResult) {
         case avsCommon::utils::playlistParser::PlaylistParseResult::ERROR:
-            m_executor.submit([this]() {
+            m_executor.execute([this]() {
                 ACSDK_DEBUG9(LX("closingWriter"));
                 closeStreamWriter();
                 notifyError();
             });
             break;
         case avsCommon::utils::playlistParser::PlaylistParseResult::FINISHED:
-            m_executor.submit([this, url, headers, encryptionInfo, contentFetcher]() {
+            m_executor.execute([this, url, headers, encryptionInfo, contentFetcher]() {
                 ACSDK_DEBUG9(LX("calling writeDecryptedUrlContentIntoStream"));
                 if (!m_streamWriterClosed &&
                     !writeDecryptedUrlContentIntoStream(url, headers, encryptionInfo, contentFetcher)) {
@@ -178,7 +178,7 @@ void UrlContentToAttachmentConverter::onPlaylistEntryParsed(int requestId, Playl
             });
             break;
         case avsCommon::utils::playlistParser::PlaylistParseResult::STILL_ONGOING:
-            m_executor.submit([this, url, headers, encryptionInfo, contentFetcher]() {
+            m_executor.execute([this, url, headers, encryptionInfo, contentFetcher]() {
                 if (!m_streamWriterClosed &&
                     !writeDecryptedUrlContentIntoStream(url, headers, encryptionInfo, contentFetcher)) {
                     ACSDK_ERROR(LX("writeUrlContentToStreamFailed").d("info", "closingWriter"));
@@ -188,7 +188,7 @@ void UrlContentToAttachmentConverter::onPlaylistEntryParsed(int requestId, Playl
             });
             break;
         case avsCommon::utils::playlistParser::PlaylistParseResult::SHUTDOWN:
-            m_executor.submit([this]() {
+            m_executor.execute([this]() {
                 ACSDK_DEBUG9(LX("closingWriter"));
                 closeStreamWriter();
             });
diff --git a/README.md b/README.md
index 4c267600f3..13a52a78c1 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ The Alexa Voice Service (AVS) enables developers to integrate Alexa directly int
 
 ### What is the AVS Device SDK
 
-The Alexa Voice Service (AVS) Device SDK provides you with a set of C ++ libraries to build an Alexa Built-in product, meaning your device has direct access to cloud-based Alexa capabilities to receive voice responses instantly. Your device can be almost anything – a smartwatch, a speaker, headphones – the choice is yours.
+The Alexa Voice Service (AVS) Device SDK provides you with a set of C ++ libraries to build an Alexa Built-in product, meaning your device has direct access to cloud-based Alexa capabilities to receive voice responses instantly. You can create a wide range of devices — a smartwatch, speaker, headphones, smart TV, set-top boxes, soundbar, AV receiver, home theater hub, or a gaming console — the choice is yours.
 
 [Learn more »](https://developer.amazon.com/docs/alexa/avs-device-sdk/overview.html)
 
@@ -16,13 +16,10 @@ Feature enhancements, updates, and resolved issues from all releases are availab
 
 ### Get Started
 
-You can set up the SDK on the following platforms:
-* [Ubuntu Linux](https://developer.amazon.com/docs/alexa/avs-device-sdk/ubuntu.html)
-* [Raspberry Pi](https://developer.amazon.com/docs/alexa/avs-device-sdk/raspberry-pi.html)
-* [macOS](https://developer.amazon.com/docs/alexa/avs-device-sdk/mac-os.html)
-* [Windows 64-bit](https://developer.amazon.com/docs/alexa/avs-device-sdk/windows-64.html)
-* [Generic Linux](https://developer.amazon.com/docs/alexa/avs-device-sdk/linux.html)
-* [Android](https://developer.amazon.com/docs/alexa/avs-device-sdk/android.html)
+You can [set up the SDK](https://developer.amazon.com/en-US/docs/alexa/avs-device-sdk/quick-start-guides.html) on the following platforms:
+* Ubuntu Linux
+* Raspberry Pi
+* macOS
 
 ### SDK Architecture
 
@@ -34,9 +31,6 @@ The SDK is modular and abstract. It provides [separate components](https://devel
 
 View the [C++ API References](https://alexa.github.io/avs-device-sdk/) for detailed information about implementation.
 
-### Security Best Practices and Important Considerations
-
-All Alexa products should adopt the [Security Best Practices for Alexa](https://developer.amazon.com/docs/alexa/alexa-voice-service/security-best-practices.html).
-
-When building Alexa with the SDK, you should also adhere to the [following security principles](https://developer.amazon.com/docs/alexa/avs-device-sdk/overview.html#security-best-practices).
+### Security Requirements
 
+All Alexa products must meet the [AVS Security Requirements](https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/avs-security-reqs.html). In addition, when building the AVS Device SDK, you are required to adhere to the [following security principles](https://developer.amazon.com/en-US/docs/alexa/avs-device-sdk/overview.html#security-requirements).
diff --git a/SECURITY.md b/SECURITY.md
index b204f9fcda..3bf42e4b56 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,5 +1,5 @@
 ### Security Policy for Device SDKs
-Amazon has updated the AVS API to add a new consent screen during device registration for new users if the device has not been not certified by Amazon. Once the device has completed the testing process including obtaining a security assessment from Authorized Security Lab and receiving an Alexa Built-in badge, this consent screen will be removed and developers will be able to offer the full Alexa experience on their Alexa Built-in devices. To learn more about device testing and certification, please visit [here](https://developer.amazon.com/en-US/alexa/devices/alexa-built-in/development-resources#additional-resources).
+Amazon has updated the AVS API to add a new consent screen during device registration for new users if the device has not been certified by Amazon. Once the device has completed the testing process including obtaining a security assessment from Authorized Security Lab and receiving an Alexa Built-in badge, this consent screen will be removed and developers will be able to offer the full Alexa experience on their Alexa Built-in devices. To learn more about device testing and certification, please visit [here](https://developer.amazon.com/en-US/alexa/devices/alexa-built-in/development-resources#additional-resources).
 
 ### Reporting a Vulnerability
 If you discover a potential security issue in this project we ask that you notify Alexa Voice Services Security team by sending an email to <avs-security@amazon.com>. Please do **not** create a public GitHub issue.
\ No newline at end of file
diff --git a/SampleApp/Authorization/CBLAuthDelegate/CMakeLists.txt b/SampleApp/Authorization/CBLAuthDelegate/CMakeLists.txt
deleted file mode 100644
index 11a16f7abb..0000000000
--- a/SampleApp/Authorization/CBLAuthDelegate/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-project(CBLAuthDelegate LANGUAGES CXX)
-
-include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
-
-add_subdirectory("src")
diff --git a/SampleApp/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/CBLAuthDelegateStorageInterface.h b/SampleApp/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/CBLAuthDelegateStorageInterface.h
deleted file mode 100644
index a49e1335fe..0000000000
--- a/SampleApp/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/CBLAuthDelegateStorageInterface.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_AUTHORIZATION_CBLAUTHDELEGATE_INCLUDE_CBLAUTHDELEGATE_CBLAUTHDELEGATESTORAGEINTERFACE_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_AUTHORIZATION_CBLAUTHDELEGATE_INCLUDE_CBLAUTHDELEGATE_CBLAUTHDELEGATESTORAGEINTERFACE_H_
-
-#include <string>
-
-namespace alexaClientSDK {
-namespace authorization {
-namespace cblAuthDelegate {
-
-/**
- * The interface to persistent storage needed by a CBLAuthDelegate (Code Based Linking AuthDelegate).
- *
- * IMPORTANT: Your token storage MUST be encrypted.
- * Note that in the default SDK implementation, we do not provide encryption.
- */
-class CBLAuthDelegateStorageInterface {
-public:
-    /**
-     * Destructor.
-     */
-    virtual ~CBLAuthDelegateStorageInterface() = default;
-
-    /**
-     * Creates a new database with the given filepath.
-     * If the file specified already exists, or if a database is already being handled by this object, then
-     * this function returns false.
-     *
-     * @return @c true If the database is created ok, or @c false if either the file exists or a database is already
-     * being handled by this object.
-     */
-    virtual bool createDatabase() = 0;
-
-    /**
-     * Open a database with the given filepath.  If this object is already managing an open database, or the file
-     * does not exist, or there is a problem opening the database, this function returns false.
-     *
-     * @return @c true If the database is opened ok, @c false if either the file does not exist, if this object is
-     * already managing an open database, or if there is another internal reason the database could not be opened.
-     */
-    virtual bool open() = 0;
-
-    /**
-     * Set the stored refresh token value.
-     *
-     * @param refreshToken The refresh token to insert into the database.
-     * @return Whether the refresh token was successfully stored.
-     */
-    virtual bool setRefreshToken(const std::string& refreshToken) = 0;
-
-    /**
-     * Clear the stored refresh token value.
-     *
-     * @return Whether the refresh token was successfully cleared.
-     */
-    virtual bool clearRefreshToken() = 0;
-
-    /**
-     * Get the stored refresh token value.
-     *
-     * @param[out] refreshToken
-     * @return Whether or not the operation was successful.
-     */
-    virtual bool getRefreshToken(std::string* refreshToken) = 0;
-
-    /**
-     * A utility function to clear all records from storage.  Note that the storage will still exist, it
-     * will just have not content.
-     *
-     * @return Whether the database was successfully cleared.
-     */
-    virtual bool clear() = 0;
-};
-
-}  // namespace cblAuthDelegate
-}  // namespace authorization
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_AUTHORIZATION_CBLAUTHDELEGATE_INCLUDE_CBLAUTHDELEGATE_CBLAUTHDELEGATESTORAGEINTERFACE_H_
diff --git a/SampleApp/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/CBLAuthRequesterInterface.h b/SampleApp/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/CBLAuthRequesterInterface.h
deleted file mode 100644
index beef91d8da..0000000000
--- a/SampleApp/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/CBLAuthRequesterInterface.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_AUTHORIZATION_CBLAUTHDELEGATE_INCLUDE_CBLAUTHDELEGATE_CBLAUTHREQUESTERINTERFACE_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_AUTHORIZATION_CBLAUTHDELEGATE_INCLUDE_CBLAUTHDELEGATE_CBLAUTHREQUESTERINTERFACE_H_
-
-#include <string>
-
-namespace alexaClientSDK {
-namespace authorization {
-namespace cblAuthDelegate {
-
-/**
- * Interface for receiving requests for authorization from a CBLAuthDelegate.
- */
-class CBLAuthRequesterInterface {
-public:
-    /**
-     * Notification of a request for authorization.
-     *
-     * @param url The URL that the user needs to navigate to.
-     * @param code The code that the user needs to enter once authorized.
-     */
-    virtual void onRequestAuthorization(const std::string& url, const std::string& code) = 0;
-
-    /**
-     * Notification that we are polling @c LWA to see if the client has been authorized.
-     */
-    virtual void onCheckingForAuthorization() = 0;
-
-    /**
-     * Destructor.
-     */
-    virtual ~CBLAuthRequesterInterface() = default;
-};
-
-}  // namespace cblAuthDelegate
-}  // namespace authorization
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_AUTHORIZATION_CBLAUTHDELEGATE_INCLUDE_CBLAUTHDELEGATE_CBLAUTHREQUESTERINTERFACE_H_
diff --git a/SampleApp/Authorization/CBLAuthDelegate/src/CMakeLists.txt b/SampleApp/Authorization/CBLAuthDelegate/src/CMakeLists.txt
deleted file mode 100644
index cb20a1c962..0000000000
--- a/SampleApp/Authorization/CBLAuthDelegate/src/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-find_package(Threads ${THREADS_PACKAGE_CONFIG})
-
-add_definitions("-DACSDK_LOG_MODULE=cblAuthDelegate")
-
-if (CRYPTO_FOUND AND PKCS11)
-    message(STATUS
-            "\nIMPORTANT! Default SQLiteCBLAuthDelegateStorage uses encryption with hardware security module. "
-            "Check \"pkcs11Module\" section in configuration file.\n"
-            "Your application's auth token storage MUST be encrypted and protected by hardware security module for "
-            "certification.\n")
-else()
-    message(WARNING
-            "\nWARNING! Default SQLiteCBLAuthDelegateStorage is NOT encrypted. Your application's auth token storage "
-            "MUST be encrypted and protected by hardware security module for certification.\n")
-endif()
-
-add_library(CBLAuthDelegate
-    CBLAuthDelegate.cpp
-    SQLiteCBLAuthDelegateStorage.cpp)
-target_include_directories(CBLAuthDelegate PUBLIC
-    "${CBLAuthDelegate_SOURCE_DIR}/include")
-target_include_directories(CBLAuthDelegate PRIVATE
-    "${RAPIDJSON_INCLUDE_DIR}")
-target_link_libraries(
-    CBLAuthDelegate
-    AVSCommon
-    RegistrationManager
-    SQLiteStorage
-    acsdkAuthorization
-    acsdkAuthorizationInterfaces
-    ${CURL_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT})
-
-# install target
-asdk_install()
diff --git a/SampleApp/Authorization/CMakeLists.txt b/SampleApp/Authorization/CMakeLists.txt
deleted file mode 100644
index 86e228182f..0000000000
--- a/SampleApp/Authorization/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-project(Authorization LANGUAGES CXX)
-
-include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
-
-add_subdirectory("CBLAuthDelegate")
diff --git a/SampleApp/CMakeLists.txt b/SampleApp/CMakeLists.txt
deleted file mode 100644
index 92b1ddd30c..0000000000
--- a/SampleApp/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-add_subdirectory("Authorization")
-
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-
-set(VALID FALSE)
-
-if (PORTAUDIO AND (GSTREAMER_MEDIA_PLAYER OR CUSTOM_MEDIA_PLAYER))
-    set(VALID TRUE)
-elseif (ANDROID_MEDIA_PLAYER AND ANDROID_MICROPHONE)
-    set(VALID TRUE)
-elseif (AUDIO_INJECTION AND (GSTREAMER_MEDIA_PLAYER OR ANDROID_MEDIA_PLAYER OR CUSTOM_MEDIA_PLAYER))
-    set(VALID TRUE)
-endif()
-
-if (VALID)
-    project(SampleApp LANGUAGES CXX)
-    include("${AVS_CMAKE_BUILD}/BuildDefaults.cmake")
-
-    add_subdirectory("src")
-else()
-    message("To build the Sample App, please enable microphone and media player modules.")
-endif()
\ No newline at end of file
diff --git a/SampleApp/include/SampleApp/ConsolePrinter.h b/SampleApp/include/SampleApp/ConsolePrinter.h
deleted file mode 100644
index 1db8643ee8..0000000000
--- a/SampleApp/include/SampleApp/ConsolePrinter.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_CONSOLEPRINTER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_CONSOLEPRINTER_H_
-
-#include <mutex>
-#include <string>
-
-#include <AVSCommon/Utils/Logger/Logger.h>
-#include <AVSCommon/Utils/Logger/LogStringFormatter.h>
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/**
- * A simple class that prints to the screen.
- */
-class ConsolePrinter : public avsCommon::utils::logger::Logger {
-public:
-    /**
-     * Constructor.
-     *
-     * @deprecated (instances of ConsolePrinter needlessly duplicate ConsoleLogger functionality.)
-     */
-    ConsolePrinter();
-
-    /**
-     * Prints a simple message along with an \n.
-     *
-     * @param stringToPrint The string to print.
-     */
-    static void simplePrint(const std::string& stringToPrint);
-
-    /**
-     * Prints a message with a pretty format with a \n after.
-     *
-     * @param stringToPrint The string to print.
-     */
-    static void prettyPrint(const std::string& stringToPrint);
-
-    /**
-     * Prints a multi-line message with a pretty format with a \n after.
-     *
-     * @param lines The strings to print.
-     */
-    static void prettyPrint(std::initializer_list<std::string> lines);
-
-    /**
-     * Prints a decorated multi-line message with a pretty format with a newline after,
-     * along with an "Alexa Says" header, used for outputting captions.
-     *
-     * @param lines The strings representing captions from Alexa's voice.
-     */
-    static void captionsPrint(const std::vector<std::string>& lines);
-
-    /// @name Logger methods
-    /// @{
-    void emit(
-        avsCommon::utils::logger::Level level,
-        std::chrono::system_clock::time_point time,
-        const char* threadMoniker,
-        const char* text) override;
-    /// @}
-
-private:
-    /**
-     * Holding a shared pointer to the mutex
-     * to make sure the mutex is not already destroyed
-     * when called from global's destructor
-     */
-    std::shared_ptr<std::mutex> m_mutex;
-
-    /**
-     * Object used to format strings for log messages.
-     */
-    avsCommon::utils::logger::LogStringFormatter m_logFormatter;
-};
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_CONSOLEPRINTER_H_
diff --git a/SampleApp/include/SampleApp/ExternalCapabilitiesBuilder.h b/SampleApp/include/SampleApp/ExternalCapabilitiesBuilder.h
deleted file mode 100644
index 616631b918..0000000000
--- a/SampleApp/include/SampleApp/ExternalCapabilitiesBuilder.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_EXTERNALCAPABILITIESBUILDER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_EXTERNALCAPABILITIESBUILDER_H_
-
-#include <AVSCommon/Utils/DeviceInfo.h>
-#include <DefaultClient/ExternalCapabilitiesBuilderInterface.h>
-
-namespace alexaClientSDK {
-namespace sampleApp {
-/**
- * This class provides a facility to add external capabilities to default client.
- *
- * Default client will provide its core components in the build call.
- *
- * @note Any object created during the buildCapabilities that keep a pointer to a core component should be added or
- * managed by an object in the list of @c RequiresShutdown objects returned by buildCapabilities(). This will ensure
- * that these objects are shutdown during @c DefaultClient shutdown and before any core component is shutdown.
- */
-class ExternalCapabilitiesBuilder : public alexaClientSDK::defaultClient::ExternalCapabilitiesBuilderInterface {
-public:
-    /**
-     * Constructor.
-     *
-     * @param deviceInfo DeviceInfo which reflects the device setup credentials.
-     */
-    ExternalCapabilitiesBuilder(std::shared_ptr<avsCommon::utils::DeviceInfo> deviceInfo);
-
-    /// @name ExternalCapabilitiesBuilderInterface methods.
-    /// @{
-    ExternalCapabilitiesBuilder& withVisualFocusManager(
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::FocusManagerInterface> focusManager) override;
-
-    ExternalCapabilitiesBuilder& withSettingsStorage(
-        std::shared_ptr<alexaClientSDK::settings::storage ::DeviceSettingStorageInterface> settingStorage) override;
-
-    ExternalCapabilitiesBuilder& withTemplateRunTime(
-        std::shared_ptr<alexaClientSDK::capabilityAgents::templateRuntime::TemplateRuntime> templateRuntime) override;
-
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::CallManagerInterface> getCallManager() override;
-
-    ExternalCapabilitiesBuilder& withInternetConnectionMonitor(
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>
-            internetConnectionMonitor) override;
-
-    ExternalCapabilitiesBuilder& withDialogUXStateAggregator(
-        std::shared_ptr<alexaClientSDK::avsCommon::avs::DialogUXStateAggregator> dialogUXStateAggregator) override;
-
-    std::pair<std::list<Capability>, std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>>
-    buildCapabilities(
-        std::shared_ptr<alexaClientSDK::acsdkExternalMediaPlayer::ExternalMediaPlayer> externalMediaPlayer,
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSConnectionManagerInterface> connectionManager,
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
-        std::shared_ptr<alexaClientSDK::certifiedSender::CertifiedSender> certifiedSender,
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::FocusManagerInterface> audioFocusManager,
-        std::shared_ptr<alexaClientSDK::registrationManager::CustomerDataManagerInterface> dataManager,
-        std::shared_ptr<alexaClientSDK::capabilityAgents::system::ReportStateHandler> stateReportHandler,
-        std::shared_ptr<alexaClientSDK::capabilityAgents::aip::AudioInputProcessor> audioInputProcessor,
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerManagerInterface> speakerManager,
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::DirectiveSequencerInterface> directiveSequencer,
-        std::shared_ptr<avsCommon::sdkInterfaces::UserInactivityMonitorInterface> userInactivityMonitor,
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSGatewayManagerInterface> avsGatewayManager,
-        std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> ringtoneMediaPlayer,
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::audio::AudioFactoryInterface> audioFactory,
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface>
-            ringtoneChannelVolumeInterface,
-#ifdef ENABLE_COMMS_AUDIO_PROXY
-        std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> commsSpeaker,
-        std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream> sharedDataStream,
-#endif
-        std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface> powerResourceManager,
-        std::shared_ptr<avsCommon::sdkInterfaces::ComponentReporterInterface> softwareComponentReporter,
-        std::shared_ptr<avsCommon::sdkInterfaces::PlaybackRouterInterface> playbackRouter,
-        std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>
-            endpointRegistrationManager) override;
-    /// @}
-
-private:
-    /// DeviceInfo which reflects the device setup credentials.
-    std::shared_ptr<alexaClientSDK::avsCommon::utils::DeviceInfo> m_deviceInfo;
-
-    /// When GUI is enabled, this will hold the TemplateRuntime Capability Agent.
-    std::shared_ptr<alexaClientSDK::capabilityAgents::templateRuntime::TemplateRuntime> m_templateRuntime;
-
-    /// When COMMS is enabled, this will hold the CallManager.
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::CallManagerInterface> m_callManager;
-
-    /// When COMMS is enabled, this will hold the DialogUXStateAggregator
-    std::shared_ptr<alexaClientSDK::avsCommon::avs::DialogUXStateAggregator> m_dialogUXStateAggregator;
-
-    /// When COMMS is enabled, this will hold the InternetConnectionMonitor.
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>
-        m_internetConnectionMonitor;
-
-    /// When GUI is enabled, this will hold the visual focus manager.
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::FocusManagerInterface> m_visualFocusManager;
-};
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_EXTERNALCAPABILITIESBUILDER_H_
diff --git a/SampleApp/include/SampleApp/GuiRenderer.h b/SampleApp/include/SampleApp/GuiRenderer.h
deleted file mode 100644
index b858f01868..0000000000
--- a/SampleApp/include/SampleApp/GuiRenderer.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_GUIRENDERER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_GUIRENDERER_H_
-
-#include <AVSCommon/SDKInterfaces/TemplateRuntimeObserverInterface.h>
-#include <map>
-#include <string>
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/**
- * A class that implements the TemplateRuntimeObserverInterface.  Instead of rendering the
- * display cards, this class will print out some useful information (e.g. JSON payload)
- * when the renderTemplateCard or renderPlayerInfoCard callbacks are called.
- *
- * It is also used to track the PlayerInfo controls, and provide the PlayerInfo toggle states.
- *
- * @note Due to the payload in RenderTemplate may contain sensitive information, the
- * payload will only be printed if @c ACSDK_EMIT_SENSITIVE_LOGS is ON.
- */
-class GuiRenderer : public avsCommon::sdkInterfaces::TemplateRuntimeObserverInterface {
-public:
-    /**
-     * Constructor.
-     */
-    GuiRenderer();
-
-    /// @name TemplateRuntimeObserverInterface Functions
-    /// @{
-    void renderTemplateCard(const std::string& jsonPayload, avsCommon::avs::FocusState focusState) override;
-    void clearTemplateCard() override;
-    void renderPlayerInfoCard(
-        const std::string& jsonPayload,
-        TemplateRuntimeObserverInterface::AudioPlayerInfo info,
-        avsCommon::avs::FocusState focusState) override;
-    void clearPlayerInfoCard() override;
-    /// @}
-
-    /// returns the PlayerInfo toggle state
-    bool getGuiToggleState(const std::string& toggleName);
-
-    /// String to identify the AVS action SELECTED string.
-    static const std::string TOGGLE_ACTION_SELECTED;
-    /// String to identify the AVS action DESELECTED string.
-    static const std::string TOGGLE_ACTION_DESELECTED;
-    /// String to identify the AVS name SHUFFLE string.
-    static const std::string TOGGLE_NAME_SHUFFLE;
-    /// String to identify the AVS name LOOP string.
-    static const std::string TOGGLE_NAME_LOOP;
-    /// String to identify the AVS name REPEAT string.
-    static const std::string TOGGLE_NAME_REPEAT;
-    /// String to identify the AVS name THUMBS_UP string.
-    static const std::string TOGGLE_NAME_THUMBSUP;
-    /// String to identify the AVS name THUMBS_DOWN string.
-    static const std::string TOGGLE_NAME_THUMBSDOWN;
-
-private:
-    // Last known toggle states
-    std::map<std::string, bool> m_guiToggleStateMap;
-};
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_GUIRENDERER_H_
diff --git a/SampleApp/include/SampleApp/InputControllerHandler.h b/SampleApp/include/SampleApp/InputControllerHandler.h
deleted file mode 100644
index d4a8fecb8a..0000000000
--- a/SampleApp/include/SampleApp/InputControllerHandler.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_INPUTCONTROLLERHANDLER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_INPUTCONTROLLERHANDLER_H_
-
-#include <memory>
-
-#include <acsdkInputControllerInterfaces/InputControllerHandlerInterface.h>
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/**
- * Sample implementation of an @c InputControllerHandlerInterface.
- */
-class InputControllerHandler : public acsdkInputControllerInterfaces::InputControllerHandlerInterface {
-public:
-    /**
-     * Create a InputControllerHandler object.
-     *
-     * @return A pointer to a new InputControllerHandler object if it succeeds; otherwise, @c nullptr.
-     */
-    static std::shared_ptr<InputControllerHandler> create();
-
-    /// @name InputControllerHandlerInterface methods
-    /// @{
-    virtual InputConfigurations getConfiguration() override;
-    virtual bool onInputChange(const std::string& input) override;
-    /// @}
-
-private:
-    /**
-     * Constructor.
-     */
-    InputControllerHandler() = default;
-};
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_INPUTCONTROLLERHANDLER_H_
diff --git a/SampleApp/include/SampleApp/KeywordObserver.h b/SampleApp/include/SampleApp/KeywordObserver.h
deleted file mode 100644
index d40eab82e3..0000000000
--- a/SampleApp/include/SampleApp/KeywordObserver.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_KEYWORDOBSERVER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_KEYWORDOBSERVER_H_
-
-#include <memory>
-#include <string>
-
-#include <acsdkKWDImplementations/AbstractKeywordDetector.h>
-#include <AVSCommon/AVS/AudioInputStream.h>
-#include <AVSCommon/SDKInterfaces/KeyWordObserverInterface.h>
-#include <DefaultClient/DefaultClient.h>
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/**
- * Observes callbacks from keyword detections and notifies the DefaultClient that a wake word has occurred.
- */
-class KeywordObserver : public avsCommon::sdkInterfaces::KeyWordObserverInterface {
-public:
-    /**
-     * Creates a KeywordObserver and registers as an observer to a KeywordDetector.
-     *
-     * @param client The default SDK client.
-     * @param audioProvider The audio provider from which to stream audio data from.
-     * @param keywordDetector The @c AbstractKeywordDetector to self register to as an observer.
-     *
-     * @return a @c KeywordObserver.
-     */
-    static std::shared_ptr<KeywordObserver> create(
-        std::shared_ptr<defaultClient::DefaultClient> client,
-        capabilityAgents::aip::AudioProvider audioProvider,
-        std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> keywordDetector);
-
-    /**
-     * Constructor.
-     *
-     * @param client The default SDK client.
-     * @param audioProvider The audio provider from which to stream audio data from.
-     */
-    KeywordObserver(
-        std::shared_ptr<defaultClient::DefaultClient> client,
-        capabilityAgents::aip::AudioProvider audioProvider);
-
-    /// @name KeyWordObserverInterface Functions
-    /// @{
-    void onKeyWordDetected(
-        std::shared_ptr<avsCommon::avs::AudioInputStream> stream,
-        std::string keyword,
-        avsCommon::avs::AudioInputStream::Index beginIndex = UNSPECIFIED_INDEX,
-        avsCommon::avs::AudioInputStream::Index endIndex = UNSPECIFIED_INDEX,
-        std::shared_ptr<const std::vector<char>> KWDMetadata = nullptr) override;
-    /// @}
-
-private:
-    /// The default SDK client.
-    std::shared_ptr<defaultClient::DefaultClient> m_client;
-
-    /// The audio provider.
-    capabilityAgents::aip::AudioProvider m_audioProvider;
-};
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_KEYWORDOBSERVER_H_
diff --git a/SampleApp/include/SampleApp/LocaleAssetsManager.h b/SampleApp/include/SampleApp/LocaleAssetsManager.h
deleted file mode 100644
index 1cc57e0cc7..0000000000
--- a/SampleApp/include/SampleApp/LocaleAssetsManager.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_LOCALEASSETSMANAGER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_LOCALEASSETSMANAGER_H_
-
-#include <map>
-#include <memory>
-#include <mutex>
-#include <set>
-#include <unordered_set>
-
-#include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
-#include <AVSCommon/SDKInterfaces/LocaleAssetsManagerInterface.h>
-#include <AVSCommon/Utils/RequiresShutdown.h>
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/**
- * Sample implementation of an asset manager.
- *
- * This manager will use the @c AlexaClientSDKConfig.json to retrieve the supported locales. For devices with wake word
- * enabled this class will support "ALEXA" only.
- */
-class LocaleAssetsManager
-        : public avsCommon::sdkInterfaces::LocaleAssetsManagerInterface
-        , public avsCommon::utils::RequiresShutdown {
-public:
-    /**
-     * Create an instance of @c LocaleAssetsManagerInterface.
-     *
-     * @param configurationNode A pointer to the @c ConfigurationNode instance.
-     * @param shutdownNotifier A pointer to the @c ShutdownNotifier instance.
-     * @return A pointer to the @c LocaleAssetsManagerInterface.
-     */
-    static std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface> createLocaleAssetsManagerInterface(
-        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
-        const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier);
-
-    /**
-     * Create an instance of @c LocaleAssetsManager.
-     *
-     * @param configurationNode A pointer to the @c ConfigurationNode instance.
-     * @return A pointer to a new LocaleAssetsManager object if it succeeds; otherwise, @c nullptr.
-     */
-    static std::shared_ptr<LocaleAssetsManager> createLocaleAssetsManager(
-        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode);
-
-    /**
-     * Create a LocaleAssetsManager object.
-     *
-     * @deprecated
-     * @return A pointer to a new LocaleAssetsManager object if it succeeds; otherwise, @c nullptr.
-     */
-    static std::shared_ptr<LocaleAssetsManager> create(bool enableWakeWord);
-
-    /// @name LocaleAssetsManagerInterface methods
-    /// @{
-    bool changeAssets(const Locales& locales, const WakeWords& wakeWords) override;
-    void cancelOngoingChange() override;
-    WakeWordsSets getDefaultSupportedWakeWords() const override;
-    std::map<LanguageTag, WakeWordsSets> getLanguageSpecificWakeWords() const override;
-    std::map<Locale, WakeWordsSets> getLocaleSpecificWakeWords() const override;
-    WakeWordsSets getSupportedWakeWords(const Locale& locale) const override;
-    std::set<Locale> getSupportedLocales() const override;
-    LocaleCombinations getSupportedLocaleCombinations() const override;
-    Locale getDefaultLocale() const override;
-    Locales getDefaultLocales() const override;
-    void addLocaleAssetsObserver(
-        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>& observer)
-        override;
-    void removeLocaleAssetsObserver(
-        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>& observer)
-        override;
-    void onConfigurationChanged(const alexaClientSDK::avsCommon::avs::CapabilityConfiguration& configuration) override;
-    void setEndpointRegistrationManager(
-        const std::shared_ptr<
-            alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>& manager)
-        override;
-    /// @}
-
-    /// @name RequiresShutdown methods
-    /// @{
-    void doShutdown() override;
-    /// @}
-private:
-    /**
-     * Constructor.
-     */
-    LocaleAssetsManager();
-
-    /**
-     * Initialize the assets manager object.
-     *
-     * @param configurationNode The @c ConfigurationNode pointer.
-     * @return @c true if it succeeds; otherwise, return @c false.
-     */
-    bool initialize(const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode);
-
-    /**
-     * Initialize the assets manager object.
-     *
-     * @param enableWakeWord Indicates whether wake words are enabled in this device or not.
-     * @param configurationNode The @c ConfigurationNode instance.
-     * @return @c true if it succeeds; otherwise, return @c false.
-     */
-    bool initialize(bool enableWakeWord, const avsCommon::utils::configuration::ConfigurationNode& configurationNode);
-
-    /// Set with the supported wake words. This object doesn't support different wake words per locale.
-    WakeWordsSets m_supportedWakeWords;
-
-    /// Set with the supported locales.
-    std::set<Locale> m_supportedLocales;
-
-    /// Vector of supported locales combinations.
-    LocaleCombinations m_supportedLocalesCombinations;
-
-    /// The default locale.
-    Locale m_defaultLocale;
-
-    /// The default multilingual locale.
-    Locales m_defaultLocales;
-
-    /// Mutex to synchronize access to observers.
-    mutable std::mutex m_observersMutex;
-
-    /// Mutex to synchronize access to @c EndpointRegistrationManager.
-    std::mutex m_ermMutex;
-
-    //// Members below are modified after initialization and hence should be synchronized.
-
-    /// Set with observers.
-    std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>>
-        m_observers;
-
-    /// Dynamically update wakewords/locales capabilitie changes.
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>
-        m_endpointRegistrationManager;
-};
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_LOCALEASSETSMANAGER_H_
diff --git a/SampleApp/include/SampleApp/PlatformSpecificValues.h b/SampleApp/include/SampleApp/PlatformSpecificValues.h
deleted file mode 100644
index 6ef692c051..0000000000
--- a/SampleApp/include/SampleApp/PlatformSpecificValues.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PLATFORMSPECIFICVALUES_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PLATFORMSPECIFICVALUES_H_
-
-#if defined(ANDROID_MEDIA_PLAYER) || defined(ANDROID_MICROPHONE)
-#include <AndroidUtilities/AndroidSLESEngine.h>
-#include <AndroidUtilities/PlatformSpecificValues.h>
-#endif
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/*
- * This struct contains platform-specific values required by other components in the SampleApp. The struct is
- * passed to @c SampleApplicationComponent in order to instantiate components there.
- *
- * For example, when building for Android, media players and the microphone require the AndroidSLESEngine, so
- * we include the openSlEngine when the SDK is built for Android. Otherwise, the AndroidSLESEngine
- * and related Android utilities are not compiled with the SDK nor included in any of the components.
- *
- * Other platform-specific values can be added as required.
- */
-#if defined(ANDROID_MEDIA_PLAYER) || defined(ANDROID_MICROPHONE)
-using PlatformSpecificValues = applicationUtilities::androidUtilities::PlatformSpecificValues;
-#else
-struct PlatformSpecificValues {};
-#endif
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PLATFORMSPECIFICVALUES_H_
diff --git a/SampleApp/include/SampleApp/PortAudioMicrophoneWrapper.h b/SampleApp/include/SampleApp/PortAudioMicrophoneWrapper.h
deleted file mode 100644
index 0dec84fa5b..0000000000
--- a/SampleApp/include/SampleApp/PortAudioMicrophoneWrapper.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PORTAUDIOMICROPHONEWRAPPER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PORTAUDIOMICROPHONEWRAPPER_H_
-
-#include <mutex>
-#include <thread>
-
-#include <AVSCommon/AVS/AudioInputStream.h>
-
-#include <portaudio.h>
-#include <Audio/MicrophoneInterface.h>
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/// This acts as a wrapper around PortAudio, a cross-platform open-source audio I/O library.
-class PortAudioMicrophoneWrapper : public applicationUtilities::resources::audio::MicrophoneInterface {
-public:
-    /**
-     * Creates a @c PortAudioMicrophoneWrapper.
-     *
-     * @param stream The shared data stream to write to.
-     * @return A unique_ptr to a @c PortAudioMicrophoneWrapper if creation was successful and @c nullptr otherwise.
-     */
-    static std::unique_ptr<PortAudioMicrophoneWrapper> create(std::shared_ptr<avsCommon::avs::AudioInputStream> stream);
-
-    /**
-     * Stops streaming from the microphone.
-     *
-     * @return Whether the stop was successful.
-     */
-    bool stopStreamingMicrophoneData() override;
-
-    /**
-     * Starts streaming from the microphone.
-     *
-     * @return Whether the start was successful.
-     */
-    bool startStreamingMicrophoneData() override;
-
-    /**
-     * Whether the microphone is currently streaming.
-     *
-     * @return Whether the microphone is streaming.
-     */
-    bool isStreaming() override;
-
-    /**
-     * Destructor.
-     */
-    ~PortAudioMicrophoneWrapper();
-
-private:
-    /**
-     * Constructor.
-     *
-     * @param stream The shared data stream to write to.
-     */
-    PortAudioMicrophoneWrapper(std::shared_ptr<avsCommon::avs::AudioInputStream> stream);
-
-    /**
-     * The callback that PortAudio will issue when audio is avaiable to read.
-     *
-     * @param inputBuffer The temporary buffer that microphone audio data will be available in.
-     * @param outputBuffer Not used here.
-     * @param numSamples The number of samples available to consume.
-     * @param timeInfo Time stamps indicated when the first sample in the buffer was captured. Not used here.
-     * @param statusFlags Flags that tell us when underflow or overflow conditions occur. Not used here.
-     * @param userData A user supplied pointer.
-     * @return A PortAudio code that will indicate how PortAudio should continue.
-     */
-    static int PortAudioCallback(
-        const void* inputBuffer,
-        void* outputBuffer,
-        unsigned long numSamples,
-        const PaStreamCallbackTimeInfo* timeInfo,
-        PaStreamCallbackFlags statusFlags,
-        void* userData);
-
-    /// Initializes PortAudio
-    bool initialize();
-
-    /**
-     * Get the optional config parameter from @c AlexaClientSDKConfig.json
-     * for setting the PortAudio stream's suggested latency.
-     *
-     * @param[out] suggestedLatency The latency as it is configured in the file.
-     * @return  @c true if the suggestedLatency is defined in the config file, @c false otherwise.
-     */
-    bool getConfigSuggestedLatency(PaTime& suggestedLatency);
-
-    /// The stream of audio data.
-    const std::shared_ptr<avsCommon::avs::AudioInputStream> m_audioInputStream;
-
-    /// The writer that will be used to writer audio data into the sds.
-    std::shared_ptr<avsCommon::avs::AudioInputStream::Writer> m_writer;
-
-    /// The PortAudio stream
-    PaStream* m_paStream;
-
-    /**
-     * A lock to seralize access to startStreamingMicrophoneData() and stopStreamingMicrophoneData() between different
-     * threads.
-     */
-    std::mutex m_mutex;
-
-    /**
-     * Whether the microphone is currently streaming.
-     */
-    bool m_isStreaming;
-};
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PORTAUDIOMICROPHONEWRAPPER_H_
diff --git a/SampleApp/include/SampleApp/RevokeAuthorizationObserver.h b/SampleApp/include/SampleApp/RevokeAuthorizationObserver.h
deleted file mode 100644
index 531b180202..0000000000
--- a/SampleApp/include/SampleApp/RevokeAuthorizationObserver.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_REVOKEAUTHORIZATIONOBSERVER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_REVOKEAUTHORIZATIONOBSERVER_H_
-
-#include <memory>
-
-#include <AVSCommon/SDKInterfaces/RevokeAuthorizationObserverInterface.h>
-#include <RegistrationManager/RegistrationManagerInterface.h>
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/**
- * Observes callbacks from revoke authorization requests and notifies the default client.
- */
-class RevokeAuthorizationObserver : public avsCommon::sdkInterfaces::RevokeAuthorizationObserverInterface {
-public:
-    /**
-     * Constructor.
-     *
-     * @param manager The registration manager providing logout functionality.
-     */
-    RevokeAuthorizationObserver(std::shared_ptr<registrationManager::RegistrationManagerInterface> manager);
-
-    /// @name RevokeAuthorizationObserverInterface Functions
-    /// @{
-    void onRevokeAuthorization() override;
-    /// @}
-
-private:
-    /// The registration manager used to logout.
-    std::shared_ptr<registrationManager::RegistrationManagerInterface> m_manager;
-};
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_REVOKEAUTHORIZATIONOBSERVER_H_
diff --git a/SampleApp/include/SampleApp/SampleApplication.h b/SampleApp/include/SampleApp/SampleApplication.h
deleted file mode 100644
index 902907c6e2..0000000000
--- a/SampleApp/include/SampleApp/SampleApplication.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SAMPLEAPPLICATION_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SAMPLEAPPLICATION_H_
-
-#include <fstream>
-#include <map>
-#include <memory>
-#include <tuple>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
-#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
-#include <AVSCommon/SDKInterfaces/ApplicationMediaInterfaces.h>
-#include <AVSCommon/SDKInterfaces/ChannelVolumeInterface.h>
-#include <AVSCommon/SDKInterfaces/Diagnostics/DiagnosticsInterface.h>
-#include <AVSCommon/Utils/MediaPlayer/PooledMediaPlayerFactory.h>
-#include <CapabilitiesDelegate/CapabilitiesDelegate.h>
-#include <DefaultClient/EqualizerRuntimeSetup.h>
-#include <acsdkExternalMediaPlayer/ExternalMediaPlayer.h>
-
-#ifdef AUTH_MANAGER
-#include <acsdkAuthorization/AuthorizationManager.h>
-#include <acsdkAuthorization/LWA/LWAAuthorizationAdapter.h>
-#endif
-
-#include "ConsolePrinter.h"
-#include "ConsoleReader.h"
-
-#include "SampleApp/GuiRenderer.h"
-#include "SampleApplicationReturnCodes.h"
-#include "UserInputManager.h"
-
-#ifdef KWD
-#include <acsdkKWDImplementations/AbstractKeywordDetector.h>
-#endif
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-#include <MediaPlayer/MediaPlayer.h>
-#elif defined(ANDROID_MEDIA_PLAYER)
-#include <AndroidSLESMediaPlayer/AndroidSLESMediaPlayer.h>
-#endif
-
-#ifdef BLUETOOTH_BLUEZ_PULSEAUDIO_OVERRIDE_ENDPOINTS
-#include <BlueZ/PulseAudioBluetoothInitializer.h>
-#endif
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/// Class to manage the top-level components of the AVS Client Application
-class SampleApplication {
-public:
-    /**
-     * Create a SampleApplication.
-     *
-     * @param consoleReader The @c ConsoleReader to read inputs from console.
-     * @param configFiles The vector of configuration files.
-     * @param logLevel The level of logging to enable.  If this parameter is an empty string, the SDK's default
-     *     logging level will be used.
-     * @param diagnostics An optional @c DiagnosticsInterface object to provide diagnostics on the SDK.
-     * @return A new @c SampleApplication, or @c nullptr if the operation failed.
-     */
-    static std::unique_ptr<SampleApplication> create(
-        std::shared_ptr<alexaClientSDK::sampleApp::ConsoleReader> consoleReader,
-        const std::vector<std::string>& configFiles,
-        const std::string& logLevel = "",
-        std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics = nullptr);
-
-    /**
-     * Runs the application, blocking until the user asks the application to quit or a device reset is triggered.
-     *
-     * @return Returns a @c SampleAppReturnCode.
-     */
-    SampleAppReturnCode run();
-
-#ifdef DIAGNOSTICS
-    /**
-     * Initiates application stop for restart sequence. This method notifies event loop that the application
-     * should be terminated with subsequent restart, in other words, if the application is running, it should
-     * return SampleAppReturnCode::RESTART code.
-     *
-     * @return True if restart has been successfully initiated, false on error or if operation is not supported.
-     */
-    bool initiateRestart();
-#endif
-
-    /// Destructor which manages the @c SampleApplication shutdown sequence.
-    ~SampleApplication();
-
-    /**
-     * Exposes the default client.
-     *
-     * @return Returns a reference to the @c DefaultClient.
-     */
-    std::shared_ptr<alexaClientSDK::defaultClient::DefaultClient> getDefaultClient();
-
-    /**
-     * Method to create mediaPlayers for the optional music provider adapters plugged into the SDK.
-     *
-     * @param httpContentFetcherFactory The HTTPContentFetcherFactory to be used while creating the mediaPlayers.
-     * @param equalizerRuntimeSetup Equalizer runtime setup to register equalizers
-     * @return @c true if the mediaPlayer of all the registered adapters could be created @c false otherwise.
-     */
-    bool createMediaPlayersForAdapters(
-        const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
-            httpContentFetcherFactory,
-        std::shared_ptr<defaultClient::EqualizerRuntimeSetup> equalizerRuntimeSetup);
-
-    /**
-     * Instances of this class register ExternalMediaAdapters. Each adapter registers itself by instantiating
-     * a static instance of the below class supplying their business name and creator method.
-     */
-    class AdapterRegistration {
-    public:
-        /**
-         * Register an @c ExternalMediaAdapter for use by @c ExternalMediaPlayer.
-         *
-         * @param playerId The @c playerId identifying the @c ExternalMediaAdapter to register.
-         * @param createFunction The function to use to create instances of the specified @c ExternalMediaAdapter.
-         */
-        AdapterRegistration(
-            const std::string& playerId,
-            acsdkExternalMediaPlayer::ExternalMediaPlayer::AdapterCreateFunction createFunction);
-    };
-
-    /**
-     * Instances of this class register MediaPlayers to be created. Each third-party adapter registers a mediaPlayer
-     * for itself by instantiating a static instance of the below class supplying their business name, speaker interface
-     * type and creator method.
-     */
-    class MediaPlayerRegistration {
-    public:
-        /**
-         * Register a @c MediaPlayer for use by a music provider adapter.
-         *
-         * @param playerId The @c playerId identifying the @c ExternalMediaAdapter to register.
-         * @param speakerType The SpeakerType of the mediaPlayer to be created.
-         */
-        MediaPlayerRegistration(
-            const std::string& playerId,
-            avsCommon::sdkInterfaces::ChannelVolumeInterface::Type speakerType);
-    };
-
-private:
-    /**
-     * Initialize a SampleApplication.
-     *
-     * @param consoleReader The @c ConsoleReader to read inputs from console.
-     * @param configFiles The vector of configuration files.
-     * @param logLevel The level of logging to enable.  If this parameter is an empty string, the SDK's default
-     *     logging level will be used.
-     * @param diagnostics An optional @c DiagnosticsInterface object to provide diagnostics on the SDK.
-     * @return @c true if initialization succeeded, else @c false.
-     */
-    bool initialize(
-        std::shared_ptr<alexaClientSDK::sampleApp::ConsoleReader> consoleReader,
-        const std::vector<std::string>& configFiles,
-        const std::string& logLevel,
-        std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics);
-
-    /**
-     * Create an application media player.
-     *
-     * @param contentFetcherFactory Used to create objects that can fetch remote HTTP content.
-     * @param enableEqualizer Flag indicating if equalizer should be enabled for this media player.
-     * @param name The media player instance name used for logging purpose.
-     * @param enableLiveMode Flag, indicating if the player is in live mode.
-     * @return Application Media interface if it succeeds; otherwise, return @c nullptr.
-     */
-    std::shared_ptr<avsCommon::sdkInterfaces::ApplicationMediaInterfaces> createApplicationMediaPlayer(
-        const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
-            httpContentFetcherFactory,
-        bool enableEqualizer,
-        const std::string& name,
-        bool enableLiveMode = false);
-
-#ifdef ENABLE_ENDPOINT_CONTROLLERS
-    /**
-     * Function to add Toggle, Range and Mode handlers to the Default endpoint.
-     *
-     * @param defaultEndpointBuilder The reference to default endpoint's @c EndpointBuilderInterface used for adding
-     * controllers.
-     * @return Returns @c true if successful in adding all the three controllers otherwise @c false.
-     */
-
-    bool addControllersToDefaultEndpoint(
-        std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> defaultEndpointBuilder);
-
-    /**
-     * Function to add Power, Toggle, Range and Mode handlers to the Peripheral endpoint.
-     *
-     * @param peripheralEndpointBuilder The reference to peripheral endpoint's @c EndpointBuilder used for adding
-     * controllers.
-     * @param diagnostics Diagnostics interface which provides suite of APIs for diagnostic insight into SDK.
-     * @return Returns @c true if successful in adding all the four controllers otherwise @c false.
-     */
-    bool addControllersToPeripheralEndpoint(
-        std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> peripheralEndpointBuilder,
-        std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics);
-#endif
-    /// Object with which to trigger shutdown operations.
-    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> m_shutdownManager;
-
-    /// Object to manage lifecycle of Alexa Client SDK initialization.
-    std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit> m_sdkInit;
-
-    /// The @c DefaultClient which "glues" together all other modules.
-    std::shared_ptr<alexaClientSDK::defaultClient::DefaultClient> m_client;
-
-    /// The @c InteractionManager which perform user requests.
-    std::shared_ptr<InteractionManager> m_interactionManager;
-
-    /// The @c UserInputManager which controls the client.
-    std::shared_ptr<UserInputManager> m_userInputManager;
-
-    /// The @c GuiRender which provides an abstraction to visual rendering
-    std::shared_ptr<GuiRenderer> m_guiRenderer;
-
-    /// The map of the adapters and their mediaPlayers.
-    std::unordered_map<std::string, std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface>>
-        m_externalMusicProviderMediaPlayersMap;
-
-    /// The map of the adapters and their mediaPlayers.
-    std::unordered_map<std::string, std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>>
-        m_externalMusicProviderSpeakersMap;
-
-    /// The vector of components requiring shutdown
-    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>> m_shutdownRequiredList;
-
-    /// The @c MediaPlayer used by @c SpeechSynthesizer.
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_speakMediaPlayer;
-
-    /// The Pool of @c MediaPlayers used by @c AudioPlayer (via @c PooledMediaPlayerFactory)
-    std::vector<std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface>> m_audioMediaPlayerPool;
-
-    /// The @c MediaPlayer used by @c Alerts.
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_alertsMediaPlayer;
-
-    /// The @c MediaPlayer used by @c NotificationsCapabilityAgent.
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_notificationsMediaPlayer;
-
-    /// The @c MediaPlayer used by @c Bluetooth.
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_bluetoothMediaPlayer;
-
-    /// The @c MediaPlayer used by @c SystemSoundPlayer.
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_systemSoundMediaPlayer;
-
-#ifdef ENABLE_COMMS_AUDIO_PROXY
-    /// The @c MediaPlayer used by @c Comms.
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_commsMediaPlayer;
-#endif
-
-#ifdef ENABLE_PCC
-    /// The @c MediaPlayer used by PhoneCallController.
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_phoneMediaPlayer;
-#endif
-
-    /// The @c CapabilitiesDelegate used by the client.
-    std::shared_ptr<alexaClientSDK::capabilitiesDelegate::CapabilitiesDelegate> m_capabilitiesDelegate;
-
-    /// The @c MediaPlayer used by @c NotificationsCapabilityAgent.
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_ringtoneMediaPlayer;
-
-    /// The singleton map from @c playerId to @c ChannelVolumeInterface::Type.
-    static std::unordered_map<std::string, avsCommon::sdkInterfaces::ChannelVolumeInterface::Type>
-        m_playerToSpeakerTypeMap;
-
-    /// The singleton map from @c playerId to @c ExternalMediaAdapter creation functions.
-    static acsdkExternalMediaPlayer::ExternalMediaPlayer::AdapterCreationMap m_adapterToCreateFuncMap;
-
-#ifdef KWD
-    /// The Wakeword Detector which can wake up the client using audio input.
-    std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> m_keywordDetector;
-#endif
-
-#if defined(ANDROID_MEDIA_PLAYER) || defined(ANDROID_MICROPHONE)
-    /// The android OpenSL ES engine used to create media players and microphone.
-    std::shared_ptr<applicationUtilities::androidUtilities::AndroidSLESEngine> m_openSlEngine;
-#endif
-
-#ifdef BLUETOOTH_BLUEZ_PULSEAUDIO_OVERRIDE_ENDPOINTS
-    /// Initializer object to reload PulseAudio Bluetooth modules.
-    std::shared_ptr<bluetoothImplementations::blueZ::PulseAudioBluetoothInitializer> m_pulseAudioInitializer;
-#endif
-
-#ifdef POWER_CONTROLLER
-    /// The @c PeripheralEndpointPowerControllerHandler used by @c InteractionManager
-    std::shared_ptr<PeripheralEndpointPowerControllerHandler> m_peripheralEndpointPowerHandler;
-#endif
-
-#ifdef TOGGLE_CONTROLLER
-    /// The @c PeripheralEndpointToggleControllerHandler used by @c InteractionManager
-    std::shared_ptr<PeripheralEndpointToggleControllerHandler> m_peripheralEndpointToggleHandler;
-#endif
-
-#ifdef RANGE_CONTROLLER
-    /// The @c PeripheralEndpointRangeControllerHandler used by @c InteractionManager
-    std::shared_ptr<PeripheralEndpointRangeControllerHandler> m_peripheralEndpointRangeHandler;
-#endif
-
-#ifdef MODE_CONTROLLER
-    /// The @c PeripheralEndpointModeControllerHandler used by @c InteractionManager
-    std::shared_ptr<PeripheralEndpointModeControllerHandler> m_peripheralEndpointModeHandler;
-#endif
-
-#ifdef AUTH_MANAGER
-    /// The @c AuthorizationManager instance that can be used to dynamically authorize with different methods.
-    std::shared_ptr<acsdkAuthorization::AuthorizationManager> m_authManager;
-
-    /// The adapter that supports authorizing with LWA based methods.
-    std::shared_ptr<acsdkAuthorization::lwa::LWAAuthorizationAdapter> m_lwaAdapter;
-#endif
-};
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SAMPLEAPPLICATION_H_
diff --git a/SampleApp/include/SampleApp/SampleApplicationComponent.h b/SampleApp/include/SampleApp/SampleApplicationComponent.h
deleted file mode 100644
index 8f1feac653..0000000000
--- a/SampleApp/include/SampleApp/SampleApplicationComponent.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SAMPLEAPPLICATIONCOMPONENT_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SAMPLEAPPLICATIONCOMPONENT_H_
-
-#include <istream>
-#include <memory>
-#include <vector>
-
-#include <acsdkManufactory/Component.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
-#include <AVSCommon/SDKInterfaces/AuthDelegateInterface.h>
-#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
-#include <AVSCommon/SDKInterfaces/LocaleAssetsManagerInterface.h>
-#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
-#include <AVSCommon/AVS/Attachment/AttachmentManagerInterface.h>
-#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <AVSCommon/Utils/DeviceInfo.h>
-
-#ifndef ACSDK_ACS_UTILS
-#include <CBLAuthDelegate/CBLAuthDelegateStorageInterface.h>
-#include <CBLAuthDelegate/CBLAuthRequesterInterface.h>
-#endif
-
-#include <RegistrationManager/CustomerDataManagerInterface.h>
-
-#include "SampleApp/UIManager.h"
-
-namespace alexaClientSDK {
-namespace acsdkSampleApplication {
-
-/**
- * Definition of the Manufactory component for the Sample App.
- *
- */
-using SampleApplicationComponent = acsdkManufactory::Component<
-#ifndef ACSDK_ACS_UTILS
-    std::shared_ptr<authorization::cblAuthDelegate::CBLAuthRequesterInterface>,
-#endif
-    std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit>,
-    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>,
-    std::shared_ptr<avsCommon::utils::DeviceInfo>,
-    std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>,
-    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>,
-    std::shared_ptr<registrationManager::CustomerDataManagerInterface>,
-    std::shared_ptr<sampleApp::UIManager>,
-    std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>,
-    std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>>;
-
-/**
- * Get the manufactory @c Component for acsdkSampleApp.
- *
- * For applications that have not transitioned to using the manufactory to instantiate SDK components, they can
- * provide pre-built custom implementations of the @c AuthDelegateInterface and @c MetricRecorderInterface.
- *
- * @param initParams The @c InitializationParameters to use when initializing the SDK Sample App.
- * @param requiresShutdownList The @c RequiresShutdown vector to which newly instantiated objects can be added.
- * @param authDelegate Optional pre-built implementation of @c AuthDelegateInterface to add to the manufactory. Default
- * is nullptr.
- * @param MetricRecorderInterface Optional pre-built implementation of @c MetricRecorderInterface to add to the
- * manufactory. Default is nullptr.
- * @param logger Optional pre-built implementation of @c Logger to add to the manufactory. Default is nullptr.
- * @return The manufactory @c Component for acsdkSampleApp.
- */
-SampleApplicationComponent getComponent(
-    std::unique_ptr<avsCommon::avs::initialization::InitializationParameters> initParams,
-    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>>& requiresShutdownList,
-    const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate = nullptr,
-    const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder = nullptr,
-    const std::shared_ptr<avsCommon::utils::logger::Logger>& logger = nullptr);
-
-}  // namespace acsdkSampleApplication
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SAMPLEAPPLICATIONCOMPONENT_H_
diff --git a/SampleApp/include/SampleApp/SampleApplicationReturnCodes.h b/SampleApp/include/SampleApp/SampleApplicationReturnCodes.h
deleted file mode 100644
index 0f4dda3f53..0000000000
--- a/SampleApp/include/SampleApp/SampleApplicationReturnCodes.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SAMPLEAPPLICATIONRETURNCODES_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SAMPLEAPPLICATIONRETURNCODES_H_
-
-#include <cstdlib>
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-enum SampleAppReturnCode {
-    /// The SampleApp exits in success.
-    OK = EXIT_SUCCESS,
-    /// The SampleApp exits in failure.
-    ERROR = EXIT_FAILURE,
-    /// The SampleApp exits and needs a restart.
-    RESTART
-};
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SAMPLEAPPLICATIONRETURNCODES_H_
diff --git a/SampleApp/include/SampleApp/SampleEqualizerModeController.h b/SampleApp/include/SampleApp/SampleEqualizerModeController.h
deleted file mode 100644
index a17400e8e2..0000000000
--- a/SampleApp/include/SampleApp/SampleEqualizerModeController.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SAMPLEEQUALIZERMODECONTROLLER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SAMPLEEQUALIZERMODECONTROLLER_H_
-
-#include <list>
-#include <memory>
-#include <mutex>
-
-#include <acsdkEqualizerInterfaces/EqualizerModeControllerInterface.h>
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/**
- * Sample implementation of @c EqualizerModeControllerInterface that prints the mode requested to console.
- */
-class SampleEqualizerModeController : public acsdkEqualizerInterfaces::EqualizerModeControllerInterface {
-public:
-    /**
-     * Factory method to create an instance of @c EqualizerModeControllerInterface.
-     *
-     * @return An instance of @c EqualizerModeControllerInterface.
-     */
-    static std::shared_ptr<acsdkEqualizerInterfaces::EqualizerModeControllerInterface>
-    createEqualizerModeControllerInterface();
-
-    /**
-     * Factory method.
-     *
-     * @deprecated
-     * @return An instance of @c SampleEqualizerModeController.
-     */
-    static std::shared_ptr<SampleEqualizerModeController> create();
-
-    /// @name EqualizerModeControllerInterface methods
-    /// @{
-
-    bool setEqualizerMode(acsdkEqualizerInterfaces::EqualizerMode mode) override;
-
-    ///@}
-
-private:
-    /**
-     * Constructor.
-     */
-    SampleEqualizerModeController() = default;
-};
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SAMPLEEQUALIZERMODECONTROLLER_H_
diff --git a/SampleApp/src/CMakeLists.txt b/SampleApp/src/CMakeLists.txt
deleted file mode 100644
index 9c8705ae07..0000000000
--- a/SampleApp/src/CMakeLists.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-set(LibSampleApp_SOURCES)
-list(APPEND LibSampleApp_SOURCES
-        CaptionPresenter.cpp
-        ConsolePrinter.cpp
-        ConsoleReader.cpp
-        ExternalCapabilitiesBuilder.cpp
-        GuiRenderer.cpp
-        InteractionManager.cpp
-        KeywordObserver.cpp
-        LocaleAssetsManager.cpp
-        UserInputManager.cpp
-        UIManager.cpp
-        SampleApplicationComponent.cpp
-        SampleApplication.cpp
-        SampleEqualizerModeController.cpp)
-
-if (DIAGNOSTICS)
-    list(APPEND LibSampleApp_SOURCES SDKDiagnostics.cpp)
-endif()
-
-if (PORTAUDIO)
-    list(APPEND LibSampleApp_SOURCES PortAudioMicrophoneWrapper.cpp)
-endif()
-
-IF (A4B)
-    list(APPEND LibSampleApp_SOURCES RevokeAuthorizationObserver.cpp)
-ENDIF()
-
-if (PCC)
-    list(APPEND LibSampleApp_SOURCES PhoneCaller.cpp)
-endif()
-
-if (MCC)
-    list(APPEND LibSampleApp_SOURCES MeetingClient.cpp)
-    list(APPEND LibSampleApp_SOURCES CalendarClient.cpp)
-endif()
-
-if (ENDPOINT_CONTROLLERS_POWER_CONTROLLER)
-    list(APPEND LibSampleApp_SOURCES PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.cpp)
-endif()
-
-if (ENDPOINT_CONTROLLERS_TOGGLE_CONTROLLER)
-    list(APPEND LibSampleApp_SOURCES PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.cpp)
-    list(APPEND LibSampleApp_SOURCES DefaultEndpoint/DefaultEndpointToggleControllerHandler.cpp)
-
-endif()
-
-if (ENDPOINT_CONTROLLERS_RANGE_CONTROLLER)
-    list(APPEND LibSampleApp_SOURCES PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.cpp)
-    list(APPEND LibSampleApp_SOURCES DefaultEndpoint/DefaultEndpointRangeControllerHandler.cpp)
-endif()
-
-if (ENDPOINT_CONTROLLERS_MODE_CONTROLLER)
-    list(APPEND LibSampleApp_SOURCES PeripheralEndpoint/PeripheralEndpointModeControllerHandler.cpp)
-    list(APPEND LibSampleApp_SOURCES DefaultEndpoint/DefaultEndpointModeControllerHandler.cpp)
-endif()
-
-if (INPUT_CONTROLLER)
-    list(APPEND LibSampleApp_SOURCES InputControllerHandler.cpp)
-endif()
-
-if(EXTERNAL_MEDIA_ADAPTERS)
-    list(APPEND LibSampleApp_SOURCES ${ALL_EMP_ADAPTER_REGISTRATION_FILES})
-endif ()
-
-add_library(LibSampleApp ${LibSampleApp_SOURCES})
-
-target_include_directories(LibSampleApp PUBLIC
-        # This is relative to project(SampleApp).
-        "${SampleApp_SOURCE_DIR}/include"
-        "${PORTAUDIO_INCLUDE_DIR}")
-
-target_link_libraries(LibSampleApp
-        acsdkAudioInputStream
-        acsdkCore
-        acsdkCrypto
-        acsdkEqualizerImplementations
-        acsdkKWDImplementations
-        acsdkManufactory
-        acsdkPkcs11
-        AVSCommon
-        AVSGatewayManager
-        CapabilitiesDelegate
-        CaptionsComponent
-        CBLAuthDelegate
-        DefaultClient
-        InterruptModel
-        SQLiteStorage
-        SynchronizeStateSender
-        "${PORTAUDIO_LIB_PATH}")
-
-if (ACS_UTILS)
-    target_link_libraries(LibSampleApp acsdkACSSampleApplicationOptions)
-else()
-    target_link_libraries(LibSampleApp acsdkDefaultSampleApplicationOptions)
-endif()
-
-if (ANDROID)
-    target_include_directories(LibSampleApp PUBLIC "${AndroidUtilities}/include")
-    target_link_libraries(LibSampleApp AndroidUtilities)
-    if (ANDROID_MEDIA_PLAYER)
-        target_include_directories(LibSampleApp PUBLIC "${AndroidSLESMediaPlayer}/include")
-        target_link_libraries(LibSampleApp AndroidSLESMediaPlayer)
-    endif()
-endif()
-
-if (GSTREAMER_MEDIA_PLAYER)
-    target_include_directories(LibSampleApp PUBLIC "${MediaPlayer_SOURCE_DIR}/include")
-    target_link_libraries(LibSampleApp MediaPlayer)
-elseif (CUSTOM_MEDIA_PLAYER)
-    target_link_libraries(LibSampleApp ${CUSTOM_MEDIA_PLAYER_TARGETS})
-endif()
-
-if(KWD)
-    target_link_libraries(LibSampleApp KeywordDetectorProvider)
-endif()
-
-if (COMMS)
-    target_link_libraries(LibSampleApp CallManager)
-endif()
-
-if (RTCSC)
-    target_link_libraries(LibSampleApp RtcscCapabilityAgent)
-endif()
-
-if (MRM AND MRM_STANDALONE_APP)
-    target_link_libraries(LibSampleApp acsdkMultiRoomMusic MRMHandlerProxy)
-elseif (MRM)
-    target_link_libraries(LibSampleApp acsdkMultiRoomMusic MRMHandler)
-endif()
-
-if (DIAGNOSTICS)
-    target_link_libraries(LibSampleApp Diagnostics)
-endif()
-
-if(EXTERNAL_MEDIA_ADAPTERS)
-    target_link_libraries(LibSampleApp acsdkExternalMediaPlayerAdapters)
-endif ()
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    target_link_libraries(LibSampleApp
-            "-framework CoreAudio"
-            "-framework AudioToolbox"
-            "-framework AudioUnit"
-            "-framework CoreServices"
-            "-framework Carbon")
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    target_link_libraries(LibSampleApp
-            rt m pthread asound atomic)
-endif()
-
-if (AUTH_MANAGER)
-    target_link_libraries(LibSampleApp acsdkAuthorization)
-endif()
-
-if (INPUT_CONTROLLER)
-    target_link_libraries(LibSampleApp acsdkInputController)
-endif()
-
-if (CRYPTO_FOUND AND PKCS11)
-    target_compile_definitions(LibSampleApp PRIVATE ENABLE_PKCS11)
-endif()
-
-add_rpath_to_target("LibSampleApp")
-
-add_executable(SampleApp
-        main.cpp)
-
-target_link_libraries(SampleApp LibSampleApp)
-
-# install target
-asdk_install_targets(LibSampleApp TRUE)
diff --git a/SampleApp/src/ConsolePrinter.cpp b/SampleApp/src/ConsolePrinter.cpp
deleted file mode 100644
index 025d617649..0000000000
--- a/SampleApp/src/ConsolePrinter.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <iostream>
-#include <algorithm>
-#include <cmath>
-
-#include <AVSCommon/Utils/CoutMutex.h>
-
-#include "SampleApp/ConsolePrinter.h"
-
-/**
- *  When using pretty print, we pad our strings in the beginning and in the end with the margin representation '#'
- *  and 7 spaces. E.g., if I pass "Hello world!" string, pretty print will look like:
- *  ############################
- *  #       Hello world!       #
- *  ############################
- */
-static const size_t PADDING_LENGTH = 8;
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-using namespace avsCommon::utils;
-
-ConsolePrinter::ConsolePrinter() :
-        avsCommon::utils::logger::Logger{avsCommon::utils::logger::Level::UNKNOWN},
-        m_mutex{getCoutMutex()} {
-}
-
-void ConsolePrinter::simplePrint(const std::string& stringToPrint) {
-    auto mutex = getCoutMutex();
-    if (!mutex) {
-        return;
-    }
-
-    std::lock_guard<std::mutex> lock{*mutex};
-    std::cout << stringToPrint << std::endl;
-}
-
-void ConsolePrinter::prettyPrint(std::initializer_list<std::string> lines) {
-    size_t maxLength = 0;
-    for (auto& line : lines) {
-        maxLength = std::max(line.size(), maxLength);
-    }
-
-    const std::string headingBorder(maxLength + (2 * PADDING_LENGTH), '#');
-    std::ostringstream oss;
-    oss << headingBorder << std::endl;
-
-    // Write each line starting and ending with '#'
-    auto padBegin = std::string("#");
-    padBegin.append(PADDING_LENGTH - 1, ' ');
-    for (auto& line : lines) {
-        auto padEnd = std::string("#");
-        padEnd.insert(padEnd.begin(), maxLength - line.size() + (PADDING_LENGTH - 1), ' ');
-        oss << padBegin << line << padEnd << std::endl;
-    }
-
-    oss << headingBorder << std::endl;
-    simplePrint(oss.str());
-}
-
-void ConsolePrinter::captionsPrint(const std::vector<std::string>& lines) {
-    size_t maxLength = 0;
-    for (auto& line : lines) {
-        maxLength = std::max(line.size(), maxLength);
-    }
-
-    // The line length should be even here to allow for alignment of the header string and '#' boundaries
-    if (maxLength % 2 != 0) {
-        maxLength += 1;
-    }
-
-    const std::string heading(" Alexa Says ");  // keep the number of characters in this string even
-    size_t maxBorderLength = (2 * PADDING_LENGTH) + maxLength;
-    size_t headerLength = std::ceil((maxBorderLength - heading.length()) / 2);
-
-    const std::string headingBorder(headerLength, '#');
-    std::ostringstream oss;
-    oss << headingBorder << heading << headingBorder << std::endl;
-
-    // Write each line starting and ending with '#'
-    auto padBegin = std::string("#");
-    padBegin.append(PADDING_LENGTH - 1, ' ');
-    for (auto& line : lines) {
-        auto padEnd = std::string("#");
-        padEnd.insert(padEnd.begin(), maxLength - line.size() + (PADDING_LENGTH - 1), ' ');
-        oss << padBegin << line << padEnd << std::endl;
-    }
-
-    const std::string footingBorder(maxBorderLength, '#');
-    oss << footingBorder << std::endl;
-    simplePrint(oss.str());
-}
-
-void ConsolePrinter::prettyPrint(const std::string& stringToPrint) {
-    prettyPrint({stringToPrint});
-}
-
-void ConsolePrinter::emit(
-    avsCommon::utils::logger::Level level,
-    std::chrono::system_clock::time_point time,
-    const char* threadMoniker,
-    const char* text) {
-    std::lock_guard<std::mutex> lock{*m_mutex};
-    std::cout << m_logFormatter.format(level, time, threadMoniker, text) << std::endl;
-}
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
diff --git a/SampleApp/src/ExternalCapabilitiesBuilder.cpp b/SampleApp/src/ExternalCapabilitiesBuilder.cpp
deleted file mode 100644
index e6f716392f..0000000000
--- a/SampleApp/src/ExternalCapabilitiesBuilder.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "SampleApp/ExternalCapabilitiesBuilder.h"
-
-#include <AVSCommon/Utils/Logger/Logger.h>
-
-#ifdef ENABLE_COMMS
-#include <AVSCommon/SDKInterfaces/CallManagerInterface.h>
-#include <CallManager/CallManager.h>
-#include <CallManager/SipUserAgent.h>
-#endif
-
-#ifdef ENABLE_COMMS_AUDIO_PROXY
-#include <CallManager/CallAudioDeviceProxy.h>
-#endif
-
-#ifdef ENABLE_MRM
-#include <acsdkMultiRoomMusic/MRMCapabilityAgent.h>
-#ifdef ENABLE_MRM_STANDALONE_APP
-#include <MRMHandler/MRMHandlerProxy.h>
-#else
-#include <MRMHandler/MRMHandler.h>
-#endif  // ENABLE_MRM_STANDALONE_APP
-#endif  // ENABLE_MRM
-
-#ifdef ENABLE_COMMS
-#define COMMS_NAMESPACE "com.amazon.avs-comms-adapter"
-#endif
-
-#if ENABLE_INPUT_CONTROLLER
-#include <acsdkInputController/InputControllerFactory.h>
-#include "SampleApp/InputControllerHandler.h"
-#endif
-
-#ifdef ENABLE_RTCSC
-#include <RTCSessionController/RtcscCapabilityAgent.h>
-#endif
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("ExternalCapabilitiesBuilder");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-ExternalCapabilitiesBuilder::ExternalCapabilitiesBuilder(std::shared_ptr<avsCommon::utils::DeviceInfo> deviceInfo) :
-        m_deviceInfo{deviceInfo} {
-    ACSDK_DEBUG5(LX(__func__));
-}
-
-ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withVisualFocusManager(
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::FocusManagerInterface> focusManager) {
-    ACSDK_DEBUG5(LX(__func__));
-    m_visualFocusManager = std::move(focusManager);
-    return *this;
-}
-
-ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withSettingsStorage(
-    std::shared_ptr<alexaClientSDK::settings::storage ::DeviceSettingStorageInterface> settingStorage) {
-    // ExternalCapabilitiesBuilder doesn't need the settingStorage to build any object.
-    return *this;
-}
-
-ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withTemplateRunTime(
-    std::shared_ptr<alexaClientSDK::capabilityAgents::templateRuntime::TemplateRuntime> templateRuntime) {
-    ACSDK_DEBUG5(LX(__func__));
-    m_templateRuntime = std::move(templateRuntime);
-    return *this;
-}
-
-std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::CallManagerInterface> ExternalCapabilitiesBuilder::
-    getCallManager() {
-    return m_callManager;
-}
-
-ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withInternetConnectionMonitor(
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>
-        internetConnectionMonitor) {
-    m_internetConnectionMonitor = std::move(internetConnectionMonitor);
-    return *this;
-}
-
-ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withDialogUXStateAggregator(
-    std::shared_ptr<alexaClientSDK::avsCommon::avs::DialogUXStateAggregator> dialogUXStateAggregator) {
-    m_dialogUXStateAggregator = std::move(dialogUXStateAggregator);
-    return *this;
-}
-
-std::pair<
-    std::list<ExternalCapabilitiesBuilder::Capability>,
-    std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>>
-ExternalCapabilitiesBuilder::buildCapabilities(
-    std::shared_ptr<alexaClientSDK::acsdkExternalMediaPlayer::ExternalMediaPlayer> externalMediaPlayer,
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSConnectionManagerInterface> connectionManager,
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
-    std::shared_ptr<alexaClientSDK::certifiedSender::CertifiedSender> certifiedSender,
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::FocusManagerInterface> audioFocusManager,
-    std::shared_ptr<alexaClientSDK::registrationManager::CustomerDataManagerInterface> dataManager,
-    std::shared_ptr<alexaClientSDK::capabilityAgents::system::ReportStateHandler> stateReportHandler,
-    std::shared_ptr<alexaClientSDK::capabilityAgents::aip::AudioInputProcessor> audioInputProcessor,
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerManagerInterface> speakerManager,
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::DirectiveSequencerInterface> directiveSequencer,
-    std::shared_ptr<avsCommon::sdkInterfaces::UserInactivityMonitorInterface> userInactivityMonitor,
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSGatewayManagerInterface> avsGatewayManager,
-    std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> ringtoneMediaPlayer,
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::audio::AudioFactoryInterface> audioFactory,
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface> ringtoneChannelVolumeInterface,
-#ifdef ENABLE_COMMS_AUDIO_PROXY
-    std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> commsSpeaker,
-    std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream> sharedDataStream,
-#endif
-    std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface> powerResourceManager,
-    std::shared_ptr<avsCommon::sdkInterfaces::ComponentReporterInterface> softwareComponentReporter,
-    std::shared_ptr<avsCommon::sdkInterfaces::PlaybackRouterInterface> playbackRouter,
-    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>
-        endpointRegistrationManager) {
-    ACSDK_DEBUG5(LX(__func__));
-    std::pair<
-        std::list<ExternalCapabilitiesBuilder::Capability>,
-        std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>>
-        retValue;
-    std::list<Capability> capabilities;
-    std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>> requireShutdownObjects;
-
-#ifdef ENABLE_COMMS
-    if (!ringtoneMediaPlayer) {
-        ACSDK_ERROR(LX("initializeFailed").d("reason", "nullRingtoneMediaPlayer"));
-        return retValue;
-    }
-
-    auto sipUserAgent = std::make_shared<capabilityAgents::callManager::SipUserAgent>();
-    std::string avsGatewayURL = avsGatewayManager->getGatewayURL();
-
-    if (!capabilityAgents::callManager::CallManager::create(
-            sipUserAgent,
-            ringtoneMediaPlayer,
-            messageSender,
-            contextManager,
-            audioFocusManager,
-            m_visualFocusManager,
-            exceptionSender,
-            audioFactory->communications(),
-            avsGatewayURL,
-            speakerManager,
-            ringtoneChannelVolumeInterface,
-            powerResourceManager)) {
-        ACSDK_ERROR(LX("initializeFailed").d("reason", "unableToCreateCallManager"));
-        return retValue;
-    }
-
-    auto callManager = capabilityAgents::callManager::CallManager::getInstance();
-
-    m_callManager = callManager;
-
-    const std::string commsVersion = capabilityAgents::callManager::CallManager::getCommsAdapterVersion();
-    std::shared_ptr<avsCommon::avs::ComponentConfiguration> commsConfig =
-        avsCommon::avs::ComponentConfiguration::createComponentConfiguration(COMMS_NAMESPACE, commsVersion);
-    softwareComponentReporter->addConfiguration(commsConfig);
-    m_dialogUXStateAggregator->addObserver(callManager);
-    m_internetConnectionMonitor->addInternetConnectionObserver(callManager);
-    connectionManager->addConnectionStatusObserver(callManager);
-    avsGatewayManager->addObserver(m_callManager);
-
-    Capability callManagerCapability;
-    auto callManagerConfigurations = callManager->getCapabilityConfigurations();
-    callManagerCapability.directiveHandler = std::move(callManager);
-    for (auto& configurationPtr : callManagerConfigurations) {
-        callManagerCapability.configuration = *configurationPtr;
-        capabilities.push_back(callManagerCapability);
-    }
-    requireShutdownObjects.push_back(m_callManager);
-
-#ifdef ENABLE_COMMS_AUDIO_PROXY
-    auto acquireAudioInputStream = [sharedDataStream]() -> std::shared_ptr<avsCommon::avs::AudioInputStream> {
-        return sharedDataStream;
-    };
-    auto relinquishAudioInputStream = [](std::shared_ptr<avsCommon::avs::AudioInputStream> stream) {
-        // Nothing to release
-    };
-    auto callAudioDeviceProxy = capabilityAgents::callManager::CallAudioDeviceProxy::create(
-        commsMediaPlayer, commsSpeaker, acquireAudioInputStream, relinquishAudioInputStream);
-    m_callManager->addObserver(callAudioDeviceProxy);
-#endif
-#endif
-
-#ifdef ENABLE_MRM
-#ifdef ENABLE_MRM_STANDALONE_APP
-    auto mrmHandler = capabilityAgents::mrm::mrmHandler::MRMHandlerProxy::create(
-        connectionManager,
-        messageSender,
-        directiveSequencer,
-        userInactivityMonitor,
-        contextManager,
-        audioFocusManager,
-        speakerManager);
-#else
-    auto mrmHandler = capabilityAgents::mrm::mrmHandler::MRMHandler::create(
-        connectionManager,
-        messageSender,
-        directiveSequencer,
-        userInactivityMonitor,
-        contextManager,
-        audioFocusManager,
-        speakerManager,
-        m_deviceInfo->getDeviceSerialNumber());
-
-#endif  // ENABLE_MRM_STANDALONE_APP
-
-    if (!mrmHandler) {
-        ACSDK_ERROR(LX(__func__).m("Unable to create mrmHandler"));
-        return retValue;
-    }
-
-    auto mrmCapabilityAgent = capabilityAgents::mrm::MRMCapabilityAgent::create(
-        std::move(mrmHandler), speakerManager, userInactivityMonitor, exceptionSender);
-
-    if (!mrmCapabilityAgent) {
-        ACSDK_ERROR(LX(__func__).m("Unable to create MRMCapabilityAgent"));
-        return retValue;
-    }
-
-    if (m_templateRuntime) {
-        m_templateRuntime->addRenderPlayerInfoCardsProvider(mrmCapabilityAgent);
-    }
-
-    if (m_callManager) {
-        m_callManager->addObserver(mrmCapabilityAgent);
-    }
-
-    Capability mrmCapability;
-    auto mrmConfigurations = mrmCapabilityAgent->getCapabilityConfigurations();
-    mrmCapability.directiveHandler = mrmCapabilityAgent;
-    for (auto& configurationPtr : mrmConfigurations) {
-        mrmCapability.configuration = *configurationPtr;
-        capabilities.push_back(mrmCapability);
-    }
-
-    requireShutdownObjects.push_back(mrmCapabilityAgent);
-
-#endif  // // ENABLE_MRM
-
-#if ENABLE_INPUT_CONTROLLER
-    auto inputControllerHandler = InputControllerHandler::create();
-    if (!inputControllerHandler) {
-        ACSDK_CRITICAL(LX("Failed to create input controller handler!"));
-        return retValue;
-    }
-    auto inputController = acsdkInputController::create(inputControllerHandler, exceptionSender);
-    if (!inputController.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create input controller capability agent!"));
-        return retValue;
-    }
-
-    Capability inputControllerCapability;
-    auto inputControllerConfigurations =
-        inputController.value().capabilityConfigurationInterface->getCapabilityConfigurations();
-    inputControllerCapability.directiveHandler = std::move(inputController.value().directiveHandler);
-    for (auto& configurationPtr : inputControllerConfigurations) {
-        inputControllerCapability.configuration = *configurationPtr;
-        capabilities.push_back(inputControllerCapability);
-    }
-#endif
-
-#ifdef ENABLE_RTCSC
-    auto rtcscCapabilityAgent = capabilityAgents::rtcscCapabilityAgent::RtcscCapabilityAgent::create(
-        messageSender, contextManager, exceptionSender);
-    if (!rtcscCapabilityAgent) {
-        ACSDK_ERROR(LX(__func__).m("Unable to create RTCSCCapabilityAgent"));
-        return retValue;
-    }
-
-    Capability rtcscCapability;
-    auto rtcscConfigurations = rtcscCapabilityAgent->getCapabilityConfigurations();
-    rtcscCapability.directiveHandler = std::move(rtcscCapabilityAgent);
-    for (auto& configurationPtr : rtcscConfigurations) {
-        rtcscCapability.configuration = *configurationPtr;
-        capabilities.push_back(rtcscCapability);
-    }
-    requireShutdownObjects.push_back(rtcscCapabilityAgent);
-#endif  // ENABLE_RTCSC
-
-    retValue.first.swap(capabilities);
-    retValue.second.swap(requireShutdownObjects);
-
-    return retValue;
-}
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
diff --git a/SampleApp/src/InputControllerHandler.cpp b/SampleApp/src/InputControllerHandler.cpp
deleted file mode 100644
index 1125752f0b..0000000000
--- a/SampleApp/src/InputControllerHandler.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "SampleApp/ConsolePrinter.h"
-#include "SampleApp/InputControllerHandler.h"
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("InputControllerHandler");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-const static acsdkInputControllerInterfaces::InputControllerHandlerInterface::InputFriendlyNameType inputs{
-    {"HDMI1", {"TV", "Television"}},
-    {"PHONO", {"Turntable"}},
-    {"AUX1", {"Cassette"}}};
-
-std::shared_ptr<InputControllerHandler> InputControllerHandler::create() {
-    auto inputControllerHandler = std::shared_ptr<InputControllerHandler>(new InputControllerHandler());
-    return inputControllerHandler;
-}
-
-acsdkInputControllerInterfaces::InputControllerHandlerInterface::InputConfigurations InputControllerHandler::
-    getConfiguration() {
-    return {inputs};
-}
-
-bool InputControllerHandler::onInputChange(const std::string& input) {
-    ConsolePrinter::prettyPrint({"InputController Input: " + input});
-    return true;
-}
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
diff --git a/SampleApp/src/KeywordObserver.cpp b/SampleApp/src/KeywordObserver.cpp
deleted file mode 100644
index b5ee46978a..0000000000
--- a/SampleApp/src/KeywordObserver.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "SampleApp/KeywordObserver.h"
-
-#include "AVSCommon/Utils/Logger/LogEntry.h"
-#include "AVSCommon/Utils/Logger/Logger.h"
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("KeywordObserver");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-std::shared_ptr<KeywordObserver> KeywordObserver::create(
-    std::shared_ptr<defaultClient::DefaultClient> client,
-    capabilityAgents::aip::AudioProvider audioProvider,
-    std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> keywordDetector) {
-    auto keywordObserver = std::make_shared<KeywordObserver>(client, audioProvider);
-    if (keywordDetector) {
-        keywordDetector->addKeyWordObserver(keywordObserver);
-    }
-
-    return keywordObserver;
-}
-
-KeywordObserver::KeywordObserver(
-    std::shared_ptr<defaultClient::DefaultClient> client,
-    capabilityAgents::aip::AudioProvider audioProvider) :
-        m_client{client},
-        m_audioProvider{audioProvider} {
-}
-
-/**
- * Compute the start of speech timestamp used in UPL calculations. This is calculated by taking the time detected on
- * wakeword to the time and subtracting the duration of the wakeword uttered to determine time at the start of the
- * wakeword. @c startOfSpeechTimestamp must be set to the time on wakeword detected for this calculation to work. If
- * wakeword duration can not be calculated start of speech timestamp is left as the time on wakeword detected.
- *
- * @param wakewordBeingIndex The begin index of the first part of the keyword found within the @c stream.
- * @param wakewordEndIndex The end index of the last part of the keyword within the @c stream.
- * @param sampleRateHz The SampleRate in Hz of the @c stream.
- * @param stream The stream in which the keyword was detected.
- * @param startOfSpeechTimestamp Moment in time to calculate when user started talking to Alexa.
- */
-static void computeStartOfSpeechTimestamp(
-    const avsCommon::avs::AudioInputStream::Index wakewordBeginIndex,
-    const avsCommon::avs::AudioInputStream::Index wakewordEndIndex,
-    const int sampleRateHz,
-    const std::shared_ptr<avsCommon::avs::AudioInputStream>& stream,
-    std::chrono::steady_clock::time_point& startOfSpeechTimestamp) {
-    // Create a reader to get the current index position
-    static const auto startWithNewData = true;
-    if (!stream) {
-        ACSDK_WARN(LX("onKeywordDetected").m("Audio stream was null, using default offset."));
-        return;
-    }
-
-    auto reader = stream->createReader(avsCommon::avs::AudioInputStream::Reader::Policy::NONBLOCKING, startWithNewData);
-    if (!reader) {
-        ACSDK_WARN(LX("onKeywordDetected").m("Reader was null, using default offset."));
-        return;
-    }
-
-    // Get the current index position
-    const auto currentIndex = reader->tell();
-
-    if (currentIndex <= wakewordBeginIndex) {
-        ACSDK_WARN(LX("onKeywordDetected").m("Index wrapping occurred, using default offset."));
-        // Note: this should never happen, since it should not be possible for millions of years w/ 64-bit indexes.
-        return;
-    }
-
-    // Translate the currentIndex position to a time duration elapsed since the end of wakeword
-    const auto sampleRatePerMillisec = sampleRateHz / 1000;
-
-    const auto timeSinceStartOfWW =
-        std::chrono::milliseconds((currentIndex - wakewordBeginIndex) / sampleRatePerMillisec);
-    ACSDK_DEBUG9(LX(__func__).d("timeSinceStartOfWW", timeSinceStartOfWW.count()));
-
-    // Adjust the start of speech timestamp to be the start of the WW.
-    startOfSpeechTimestamp -= timeSinceStartOfWW;
-}
-
-void KeywordObserver::onKeyWordDetected(
-    std::shared_ptr<avsCommon::avs::AudioInputStream> stream,
-    std::string keyword,
-    avsCommon::avs::AudioInputStream::Index beginIndex,
-    avsCommon::avs::AudioInputStream::Index endIndex,
-    std::shared_ptr<const std::vector<char>> KWDMetadata) {
-    if (endIndex != avsCommon::sdkInterfaces::KeyWordObserverInterface::UNSPECIFIED_INDEX &&
-        beginIndex == avsCommon::sdkInterfaces::KeyWordObserverInterface::UNSPECIFIED_INDEX) {
-        if (m_client) {
-            m_client->notifyOfTapToTalk(m_audioProvider, endIndex);
-        }
-    } else if (
-        endIndex != avsCommon::sdkInterfaces::KeyWordObserverInterface::UNSPECIFIED_INDEX &&
-        beginIndex != avsCommon::sdkInterfaces::KeyWordObserverInterface::UNSPECIFIED_INDEX) {
-        if (m_client) {
-            auto startOfSpeechTimestamp = std::chrono::steady_clock::now();
-            computeStartOfSpeechTimestamp(
-                beginIndex, endIndex, m_audioProvider.format.sampleRateHz, stream, startOfSpeechTimestamp);
-            m_client->notifyOfWakeWord(
-                m_audioProvider, beginIndex, endIndex, keyword, startOfSpeechTimestamp, KWDMetadata);
-        }
-    }
-}
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
diff --git a/SampleApp/src/LocaleAssetsManager.cpp b/SampleApp/src/LocaleAssetsManager.cpp
deleted file mode 100644
index 4b220c3540..0000000000
--- a/SampleApp/src/LocaleAssetsManager.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
-#include <AVSCommon/Utils/Logger/Logger.h>
-#include <Settings/SettingStringConversion.h>
-
-#include "SampleApp/LocaleAssetsManager.h"
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("LocaleAssetsManager");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-using namespace acsdkShutdownManagerInterfaces;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils::configuration;
-using namespace avsCommon::utils::json::jsonUtils;
-
-/// The key in our config file to find the root of settings for this database.
-static const std::string SETTING_CONFIGURATION_ROOT_KEY = "deviceSettings";
-
-/// The key to find the locales configuration.
-static const std::string LOCALES_CONFIGURATION_KEY = "locales";
-
-/// The key to find the locales configuration.
-static const std::string DEFAULT_LOCALE_CONFIGURATION_KEY = "defaultLocale";
-
-/// The key to find the locales combinations configuration.
-static const std::string LOCALE_COMBINATION_CONFIGURATION_KEY = "localeCombinations";
-
-/// The default locale value used if the locale configuration is not present.
-static const std::string DEFAULT_LOCALE_VALUE = "en-US";
-
-/// The index for primary locale in the default locales vector.
-static const int PRIMARY_LOCALE_INDEX = 0;
-
-/// The default supported wake word.
-static const std::string DEFAULT_SUPPORTED_WAKEWORD = "ALEXA";
-
-std::shared_ptr<LocaleAssetsManagerInterface> LocaleAssetsManager::createLocaleAssetsManagerInterface(
-    const std::shared_ptr<ConfigurationNode>& configurationNode,
-    const std::shared_ptr<ShutdownNotifierInterface>& shutdownNotifier) {
-    if (!shutdownNotifier) {
-        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceFailed").d("reason", "null shutdown notifier"));
-        return nullptr;
-    }
-
-    auto manager = std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager());
-    if (!manager->initialize(configurationNode)) {
-        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceFailed").d("reason", "initialize failed"));
-        return nullptr;
-    }
-    shutdownNotifier->addObserver(manager);
-
-    return manager;
-}
-
-std::shared_ptr<LocaleAssetsManager> LocaleAssetsManager::createLocaleAssetsManager(
-    const std::shared_ptr<ConfigurationNode>& configurationNode) {
-    auto manager = std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager());
-    if (!manager->initialize(configurationNode)) {
-        ACSDK_ERROR(LX("createLocaleAssetsManager").d("reason", "initialize failed"));
-        return nullptr;
-    }
-
-    return manager;
-}
-
-std::shared_ptr<LocaleAssetsManager> LocaleAssetsManager::create(bool enableWakeWord) {
-    auto manager = std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager());
-    if (!manager->initialize(enableWakeWord, ConfigurationNode::getRoot())) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "initialize failed"));
-        return nullptr;
-    }
-    return manager;
-}
-
-bool LocaleAssetsManager::changeAssets(const Locales& locales, const WakeWords& wakeWords) {
-    // The device should set the locale and wakeWord here.
-    ACSDK_INFO(LX(__func__)
-                   .d("Locale", settings::toSettingString<Locales>(locales).second)
-                   .d("WakeWords", settings::toSettingString<WakeWords>(wakeWords).second));
-    return true;
-}
-
-void LocaleAssetsManager::cancelOngoingChange() {
-    // No work is done by changeAssets.
-}
-
-bool LocaleAssetsManager::initialize(const std::shared_ptr<ConfigurationNode>& configurationNode) {
-    if (!configurationNode) {
-        ACSDK_ERROR(LX("initializeFailed").d("reason", "null configuration node"));
-        return false;
-    }
-
-#ifdef KWD
-    static constexpr bool enableWakeWord = true;
-#else
-    static constexpr bool enableWakeWord = false;
-#endif
-
-    return initialize(enableWakeWord, *configurationNode);
-}
-
-bool LocaleAssetsManager::initialize(bool enableWakeWord, const ConfigurationNode& configurationNode) {
-    auto settingsConfig = configurationNode[SETTING_CONFIGURATION_ROOT_KEY];
-    if (!settingsConfig) {
-        ACSDK_ERROR(LX("initializeFailed")
-                        .d("reason", "configurationKeyNotFound")
-                        .d("configurationKey", SETTING_CONFIGURATION_ROOT_KEY));
-        return false;
-    }
-
-    if (!settingsConfig.getStringValues(LOCALES_CONFIGURATION_KEY, &m_supportedLocales)) {
-        ACSDK_ERROR(LX("initializeFailed")
-                        .d("reason", "configurationKeyNotFound")
-                        .d("configurationKey", LOCALES_CONFIGURATION_KEY));
-        return false;
-    }
-
-    auto combinationArray = settingsConfig.getArray(LOCALE_COMBINATION_CONFIGURATION_KEY);
-    if (combinationArray) {
-        for (std::size_t arrayIndex = 0; arrayIndex < combinationArray.getArraySize(); ++arrayIndex) {
-            auto stringVector = retrieveStringArray<std::vector<std::string>>(combinationArray[arrayIndex].serialize());
-
-            // Make sure the combination is more than one locale.
-            if (stringVector.size() <= 1) {
-                ACSDK_ERROR(
-                    LX("initializeFailed").d("reason", "LocaleCombinationSizeError").d("size", stringVector.size()));
-                return false;
-            }
-
-            // Make sure all the locales in the combination are supported.
-            for (const auto& locale : stringVector) {
-                if (m_supportedLocales.count(locale) == 0) {
-                    ACSDK_ERROR(
-                        LX("initializeFailed").d("reason", "notSupportedLocalesInCombination").d("locale", locale));
-                    return false;
-                }
-            }
-            m_supportedLocalesCombinations.insert(stringVector);
-        }
-    }
-
-    auto localesArray = settingsConfig.getArray(DEFAULT_LOCALE_CONFIGURATION_KEY);
-    if (!localesArray) {
-        if (!settingsConfig.getString(DEFAULT_LOCALE_CONFIGURATION_KEY, &m_defaultLocale)) {
-            ACSDK_ERROR(
-                LX("initializeFailed")
-                    .d("reason", "configurationKeyNotFound")
-                    .d("configurationKey", SETTING_CONFIGURATION_ROOT_KEY + "." + DEFAULT_LOCALE_CONFIGURATION_KEY));
-            return false;
-        }
-        m_defaultLocales.push_back(m_defaultLocale);
-    } else {
-        m_defaultLocales = retrieveStringArray<std::vector<std::string>>(localesArray.serialize());
-    }
-
-    if (m_supportedLocales.empty()) {
-        ACSDK_ERROR(LX("initializeFailed").d("reason", "noSupportedLocalesInConfiguration"));
-        return false;
-    }
-
-    if (m_defaultLocales.empty()) {
-        ACSDK_ERROR(LX("initializeFailed").d("reason", "noDefaultLocaleInConfiguration"));
-        return false;
-    }
-
-    // Check if the default is in the supported locales.
-    if (m_supportedLocales.find(m_defaultLocales[PRIMARY_LOCALE_INDEX]) == m_supportedLocales.end()) {
-        ACSDK_ERROR(LX("initializeFailed").d("reason", "defaultLocaleNotInSupportedLocaleList"));
-        return false;
-    }
-
-    // Check if the default multilingual locale is in the supported locale combinations.
-    if (m_defaultLocales.size() > 1 &&
-        m_supportedLocalesCombinations.find(m_defaultLocales) == m_supportedLocalesCombinations.end()) {
-        ACSDK_ERROR(LX("initializeFailed").d("reason", "defaultLocalesNotInSupportedLocalesCombinationsList"));
-        return false;
-    }
-
-    WakeWords wakeWords;
-    if (enableWakeWord) {
-        m_supportedWakeWords.insert({DEFAULT_SUPPORTED_WAKEWORD});
-    } else {
-        ACSDK_INFO(LX(__func__).d("supportedWakeWords", "NONE"));
-    }
-
-    return true;
-}
-
-LocaleAssetsManager::WakeWordsSets LocaleAssetsManager::getSupportedWakeWords(const Locale& locale) const {
-    return m_supportedWakeWords;
-}
-
-LocaleAssetsManager::WakeWordsSets LocaleAssetsManager::getDefaultSupportedWakeWords() const {
-    return m_supportedWakeWords;
-}
-
-std::map<LocaleAssetsManager::Locale, LocaleAssetsManager::WakeWordsSets> LocaleAssetsManager::
-    getLocaleSpecificWakeWords() const {
-    return std::map<LocaleAssetsManager::Locale, LocaleAssetsManager::WakeWordsSets>();
-}
-
-std::map<LocaleAssetsManager::LanguageTag, LocaleAssetsManager::WakeWordsSets> LocaleAssetsManager::
-    getLanguageSpecificWakeWords() const {
-    return std::map<LocaleAssetsManager::LanguageTag, LocaleAssetsManager::WakeWordsSets>();
-}
-
-std::set<LocaleAssetsManager::Locale> LocaleAssetsManager::getSupportedLocales() const {
-    return m_supportedLocales;
-}
-
-LocaleAssetsManager::LocaleCombinations LocaleAssetsManager::getSupportedLocaleCombinations() const {
-    return m_supportedLocalesCombinations;
-}
-
-LocaleAssetsManager::Locale LocaleAssetsManager::getDefaultLocale() const {
-    ACSDK_ERROR(LX("getDefaultLocale").d("reason", "methodDeprecated"));
-    return m_defaultLocale;
-}
-
-LocaleAssetsManager::Locales LocaleAssetsManager::getDefaultLocales() const {
-    return m_defaultLocales;
-}
-
-void LocaleAssetsManager::addLocaleAssetsObserver(
-    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>& observer) {
-    std::lock_guard<std::mutex> lock{m_observersMutex};
-    if (observer == nullptr) {
-        ACSDK_ERROR(LX("addLocaleAssetsObserverFailed").d("reason", "nullObserver"));
-        return;
-    }
-    m_observers.insert(observer);
-}
-
-void LocaleAssetsManager::removeLocaleAssetsObserver(
-    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>& observer) {
-    std::lock_guard<std::mutex> lock{m_observersMutex};
-    if (observer == nullptr) {
-        ACSDK_ERROR(LX("removeLocaleAssetsObserverFailed").d("reason", "nullObserver"));
-        return;
-    }
-    m_observers.erase(observer);
-}
-
-void LocaleAssetsManager::setEndpointRegistrationManager(
-    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>&
-        manager) {
-    std::lock_guard<std::mutex> lock{m_ermMutex};
-    if (manager == nullptr) {
-        ACSDK_ERROR(LX("setEndpointRegistrationManagerFailed").m("null EndpointRegistrationManager"));
-        return;
-    }
-    m_endpointRegistrationManager = manager;
-}
-
-void LocaleAssetsManager::onConfigurationChanged(
-    const alexaClientSDK::avsCommon::avs::CapabilityConfiguration& configuration) {
-    // No-op
-}
-
-LocaleAssetsManager::LocaleAssetsManager() :
-        RequiresShutdown{"LocaleAssetsManager"},
-        m_defaultLocale{DEFAULT_LOCALE_VALUE} {
-}
-
-void LocaleAssetsManager::doShutdown() {
-    {
-        std::lock_guard<std::mutex> lock{m_ermMutex};
-        m_endpointRegistrationManager.reset();
-    }
-    {
-        std::lock_guard<std::mutex> lock{m_observersMutex};
-        m_observers.clear();
-    }
-}
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
diff --git a/SampleApp/src/PortAudioMicrophoneWrapper.cpp b/SampleApp/src/PortAudioMicrophoneWrapper.cpp
deleted file mode 100644
index 8f6ed686fa..0000000000
--- a/SampleApp/src/PortAudioMicrophoneWrapper.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <cstring>
-#include <string>
-
-#include <rapidjson/document.h>
-
-#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <AVSCommon/Utils/Logger/Logger.h>
-#include "SampleApp/PortAudioMicrophoneWrapper.h"
-#include "SampleApp/ConsolePrinter.h"
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-using avsCommon::avs::AudioInputStream;
-
-static const int NUM_INPUT_CHANNELS = 1;
-static const int NUM_OUTPUT_CHANNELS = 0;
-static const double SAMPLE_RATE = 16000;
-static const unsigned long PREFERRED_SAMPLES_PER_CALLBACK = paFramesPerBufferUnspecified;
-
-static const std::string SAMPLE_APP_CONFIG_ROOT_KEY("sampleApp");
-static const std::string PORTAUDIO_CONFIG_ROOT_KEY("portAudio");
-static const std::string PORTAUDIO_CONFIG_SUGGESTED_LATENCY_KEY("suggestedLatency");
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("PortAudioMicrophoneWrapper");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-std::unique_ptr<PortAudioMicrophoneWrapper> PortAudioMicrophoneWrapper::create(
-    std::shared_ptr<AudioInputStream> stream) {
-    if (!stream) {
-        ACSDK_CRITICAL(LX("Invalid stream passed to PortAudioMicrophoneWrapper"));
-        return nullptr;
-    }
-    std::unique_ptr<PortAudioMicrophoneWrapper> portAudioMicrophoneWrapper(new PortAudioMicrophoneWrapper(stream));
-    if (!portAudioMicrophoneWrapper->initialize()) {
-        ACSDK_CRITICAL(LX("Failed to initialize PortAudioMicrophoneWrapper"));
-        return nullptr;
-    }
-    return portAudioMicrophoneWrapper;
-}
-
-PortAudioMicrophoneWrapper::PortAudioMicrophoneWrapper(std::shared_ptr<AudioInputStream> stream) :
-        m_audioInputStream{stream},
-        m_paStream{nullptr},
-        m_isStreaming{false} {
-}
-
-PortAudioMicrophoneWrapper::~PortAudioMicrophoneWrapper() {
-    Pa_StopStream(m_paStream);
-    Pa_CloseStream(m_paStream);
-    Pa_Terminate();
-}
-
-bool PortAudioMicrophoneWrapper::initialize() {
-    m_writer = m_audioInputStream->createWriter(AudioInputStream::Writer::Policy::NONBLOCKABLE);
-    if (!m_writer) {
-        ACSDK_CRITICAL(LX("Failed to create stream writer"));
-        return false;
-    }
-    PaError err;
-    err = Pa_Initialize();
-    if (err != paNoError) {
-        ACSDK_CRITICAL(LX("Failed to initialize PortAudio").d("errorCode", err));
-        return false;
-    }
-
-    PaTime suggestedLatency = -1;
-    bool latencyInConfig = getConfigSuggestedLatency(suggestedLatency);
-
-    if (!latencyInConfig) {
-        err = Pa_OpenDefaultStream(
-            &m_paStream,
-            NUM_INPUT_CHANNELS,
-            NUM_OUTPUT_CHANNELS,
-            paInt16,
-            SAMPLE_RATE,
-            PREFERRED_SAMPLES_PER_CALLBACK,
-            PortAudioCallback,
-            this);
-    } else {
-        ACSDK_INFO(
-            LX("PortAudio suggestedLatency has been configured to ").d("Seconds", std::to_string(suggestedLatency)));
-        if (suggestedLatency < 0) {
-            ACSDK_CRITICAL(LX("Failed to configure PortAudio invalid suggestedLatency"));
-            return false;
-        }
-
-        PaStreamParameters inputParameters;
-        std::memset(&inputParameters, 0, sizeof(inputParameters));
-        inputParameters.device = Pa_GetDefaultInputDevice();
-        inputParameters.channelCount = NUM_INPUT_CHANNELS;
-        inputParameters.sampleFormat = paInt16;
-        inputParameters.suggestedLatency = suggestedLatency;
-        inputParameters.hostApiSpecificStreamInfo = nullptr;
-
-        err = Pa_OpenStream(
-            &m_paStream,
-            &inputParameters,
-            nullptr,
-            SAMPLE_RATE,
-            PREFERRED_SAMPLES_PER_CALLBACK,
-            paNoFlag,
-            PortAudioCallback,
-            this);
-    }
-
-    if (err != paNoError) {
-        ACSDK_CRITICAL(LX("Failed to open PortAudio default stream").d("errorCode", err));
-        return false;
-    }
-    return true;
-}
-
-bool PortAudioMicrophoneWrapper::startStreamingMicrophoneData() {
-    ACSDK_INFO(LX(__func__));
-    std::lock_guard<std::mutex> lock{m_mutex};
-    PaError err = Pa_StartStream(m_paStream);
-    if (err != paNoError) {
-        ACSDK_CRITICAL(LX("Failed to start PortAudio stream"));
-        return false;
-    }
-    m_isStreaming = true;
-    return true;
-}
-
-bool PortAudioMicrophoneWrapper::stopStreamingMicrophoneData() {
-    ACSDK_INFO(LX(__func__));
-    std::lock_guard<std::mutex> lock{m_mutex};
-    PaError err = Pa_StopStream(m_paStream);
-    if (err != paNoError) {
-        ACSDK_CRITICAL(LX("Failed to stop PortAudio stream"));
-        return false;
-    }
-    m_isStreaming = false;
-    return true;
-}
-
-bool PortAudioMicrophoneWrapper::isStreaming() {
-    return m_isStreaming;
-}
-
-int PortAudioMicrophoneWrapper::PortAudioCallback(
-    const void* inputBuffer,
-    void* outputBuffer,
-    unsigned long numSamples,
-    const PaStreamCallbackTimeInfo* timeInfo,
-    PaStreamCallbackFlags statusFlags,
-    void* userData) {
-    PortAudioMicrophoneWrapper* wrapper = static_cast<PortAudioMicrophoneWrapper*>(userData);
-    ssize_t returnCode = wrapper->m_writer->write(inputBuffer, numSamples);
-    if (returnCode <= 0) {
-        ACSDK_CRITICAL(LX("Failed to write to stream."));
-        return paAbort;
-    }
-    return paContinue;
-}
-
-bool PortAudioMicrophoneWrapper::getConfigSuggestedLatency(PaTime& suggestedLatency) {
-    bool latencyInConfig = false;
-    auto config = avsCommon::utils::configuration::ConfigurationNode::getRoot()[SAMPLE_APP_CONFIG_ROOT_KEY]
-                                                                               [PORTAUDIO_CONFIG_ROOT_KEY];
-    if (config) {
-        latencyInConfig = config.getValue(
-            PORTAUDIO_CONFIG_SUGGESTED_LATENCY_KEY,
-            &suggestedLatency,
-            suggestedLatency,
-            &rapidjson::Value::IsDouble,
-            &rapidjson::Value::GetDouble);
-    }
-
-    return latencyInConfig;
-}
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
diff --git a/SampleApp/src/SampleApplication.cpp b/SampleApp/src/SampleApplication.cpp
deleted file mode 100644
index f9bbc2f210..0000000000
--- a/SampleApp/src/SampleApplication.cpp
+++ /dev/null
@@ -1,1951 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <acsdkAudioInputStream/AudioInputStreamFactory.h>
-#include <acsdkAudioInputStream/CompatibleAudioFormat.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCrypto/CryptoFactory.h>
-#include <acsdkManufactory/Manufactory.h>
-#include <acsdkPkcs11/KeyStoreFactory.h>
-#include <ACL/Transport/HTTP2TransportFactory.h>
-#include <ACL/Transport/PostConnectSequencerFactory.h>
-#include <AVSCommon/AVS/CapabilitySemantics/CapabilitySemantics.h>
-#include <AVSCommon/AVS/Initialization/InitializationParametersBuilder.h>
-#include <AVSCommon/SDKInterfaces/PowerResourceManagerInterface.h>
-#include <AVSCommon/Utils/LibcurlUtils/HttpPost.h>
-#include <AVSCommon/Utils/LibcurlUtils/LibcurlHTTP2ConnectionFactory.h>
-#include <AVSCommon/Utils/UUIDGeneration/UUIDGeneration.h>
-#include <AVSGatewayManager/AVSGatewayManager.h>
-#include <AVSGatewayManager/Storage/AVSGatewayManagerStorage.h>
-#include <SynchronizeStateSender/SynchronizeStateSenderFactory.h>
-
-#include "SampleApp/ExternalCapabilitiesBuilder.h"
-#include "SampleApp/KeywordObserver.h"
-#include "SampleApp/LocaleAssetsManager.h"
-#include "SampleApp/SampleApplication.h"
-#include "SampleApp/SampleApplicationComponent.h"
-
-#ifdef AUTH_MANAGER
-#include <acsdkAuthorization/AuthorizationManager.h>
-#include <acsdkAuthorization/LWA/LWAAuthorizationAdapter.h>
-#include <acsdkAuthorization/LWA/LWAAuthorizationStorage.h>
-#include <acsdkAuthorizationInterfaces/AuthorizationManagerInterface.h>
-#include <acsdkSampleApplicationCBLAuthRequester/SampleApplicationCBLAuthRequester.h>
-#endif
-
-#ifdef ENABLE_REVOKE_AUTH
-#include "SampleApp/RevokeAuthorizationObserver.h"
-#endif
-
-#ifdef ENABLE_PCC
-#include "SampleApp/PhoneCaller.h"
-#endif
-
-#ifdef ENABLE_MCC
-#include "SampleApp/CalendarClient.h"
-#include "SampleApp/MeetingClient.h"
-#endif
-
-#ifdef KWD
-#include <KWDProvider/KeywordDetectorProvider.h>
-#endif
-
-#ifdef PORTAUDIO
-#include <SampleApp/PortAudioMicrophoneWrapper.h>
-#endif
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-#include <MediaPlayer/MediaPlayer.h>
-#endif
-
-#ifdef ANDROID
-#if defined(ANDROID_MEDIA_PLAYER) || defined(ANDROID_MICROPHONE)
-#include <AndroidUtilities/AndroidSLESEngine.h>
-#endif
-
-#ifdef ANDROID_MEDIA_PLAYER
-#include <AndroidSLESMediaPlayer/AndroidSLESMediaPlayer.h>
-#include <AndroidSLESMediaPlayer/AndroidSLESSpeaker.h>
-#endif
-
-#ifdef ANDROID_MICROPHONE
-#include <AndroidUtilities/AndroidSLESMicrophone.h>
-#endif
-
-#ifdef ANDROID_LOGGER
-#include <AndroidUtilities/AndroidLogger.h>
-#endif
-
-#endif
-
-#ifdef BLUETOOTH_BLUEZ
-#include <BlueZ/BlueZBluetoothDeviceManager.h>
-#endif
-
-#ifdef POWER_CONTROLLER
-#include "SampleApp/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h"
-#endif
-
-#ifdef TOGGLE_CONTROLLER
-#include <ToggleController/ToggleControllerAttributeBuilder.h>
-#include "SampleApp/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h"
-#include "SampleApp/DefaultEndpoint/DefaultEndpointToggleControllerHandler.h"
-#endif
-
-#ifdef RANGE_CONTROLLER
-#include <RangeController/RangeControllerAttributeBuilder.h>
-#include "SampleApp/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h"
-#include "SampleApp/DefaultEndpoint/DefaultEndpointRangeControllerHandler.h"
-#endif
-
-#ifdef MODE_CONTROLLER
-#include <ModeController/ModeControllerAttributeBuilder.h>
-#include "SampleApp/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h"
-#include "SampleApp/DefaultEndpoint/DefaultEndpointModeControllerHandler.h"
-#endif
-
-#ifdef ENABLE_LPM
-#include <AVSCommon/Utils/Power/NoOpPowerResourceManager.h>
-#endif
-
-#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
-#include <AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceConnectionRuleInterface.h>
-#include <AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceManagerInterface.h>
-#include <AVSCommon/SDKInterfaces/Diagnostics/ProtocolTracerInterface.h>
-#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
-#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <AVSCommon/Utils/DeviceInfo.h>
-#include <AVSCommon/Utils/LibcurlUtils/HTTPContentFetcherFactory.h>
-#include <AVSCommon/Utils/Logger/Logger.h>
-#include <AVSCommon/Utils/Logger/LoggerSinkManager.h>
-#include <AVSCommon/Utils/Network/InternetConnectionMonitor.h>
-#include <acsdkAlerts/Storage/SQLiteAlertStorage.h>
-#include <Audio/AudioFactory.h>
-#include <Audio/MicrophoneInterface.h>
-#include <acsdkBluetooth/BasicDeviceConnectionRule.h>
-#include <acsdkBluetooth/SQLiteBluetoothStorage.h>
-#include <acsdkNotifications/SQLiteNotificationsStorage.h>
-#include <CBLAuthDelegate/CBLAuthDelegate.h>
-#include <CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h>
-#include <CapabilitiesDelegate/CapabilitiesDelegate.h>
-#include <CapabilitiesDelegate/Storage/SQLiteCapabilitiesDelegateStorage.h>
-#include <SQLiteStorage/SQLiteMiscStorage.h>
-#include <SampleApp/CaptionPresenter.h>
-#include <SampleApp/SampleEqualizerModeController.h>
-#include <Settings/Storage/SQLiteDeviceSettingStorage.h>
-
-#include <acsdkEqualizerImplementations/InMemoryEqualizerConfiguration.h>
-#include <acsdkEqualizerImplementations/MiscDBEqualizerStorage.h>
-#include <acsdkEqualizerImplementations/SDKConfigEqualizerConfiguration.h>
-#include <acsdkEqualizerInterfaces/EqualizerInterface.h>
-#include <InterruptModel/config/InterruptModelConfiguration.h>
-
-#include <algorithm>
-#include <cctype>
-#include <csignal>
-
-#ifdef CUSTOM_MEDIA_PLAYER
-namespace alexaClientSDK {
-
-std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ApplicationMediaInterfaces> createCustomMediaPlayer(
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>
-        contentFetcherFactory,
-    bool enableEqualizer,
-    const std::string& name,
-    bool enableLiveMode);
-
-}  // namespace alexaClientSDK
-#endif
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-/// The size of each word within the stream.
-static const size_t WORD_SIZE = 2;
-
-/// The maximum number of readers of the stream.
-static const size_t MAX_READERS = 10;
-
-/// The default number of MediaPlayers used by AudioPlayer CA/
-/// Can be overridden in the Configuration using @c AUDIO_MEDIAPLAYER_POOL_SIZE_KEY
-static const unsigned int AUDIO_MEDIAPLAYER_POOL_SIZE_DEFAULT = 2;
-
-/// The amount of audio data to keep in the ring buffer.
-static const std::chrono::seconds AMOUNT_OF_AUDIO_DATA_IN_BUFFER = std::chrono::seconds(15);
-
-/// Key for the root node value containing configuration values for SampleApp.
-static const std::string SAMPLE_APP_CONFIG_KEY("sampleApp");
-
-/// Key for the root node value containing configuration values for Equalizer.
-static const std::string EQUALIZER_CONFIG_KEY("equalizer");
-
-/// Key for the @c firmwareVersion value under the @c SAMPLE_APP_CONFIG_KEY configuration node.
-static const std::string FIRMWARE_VERSION_KEY("firmwareVersion");
-
-/// Key for the @c endpoint value under the @c SAMPLE_APP_CONFIG_KEY configuration node.
-static const std::string ENDPOINT_KEY("endpoint");
-
-/// Key for setting if display cards are supported or not under the @c SAMPLE_APP_CONFIG_KEY configuration node.
-static const std::string DISPLAY_CARD_KEY("displayCardsSupported");
-
-/// Key for the Audio MediaPlayer pool size.
-static const std::string AUDIO_MEDIAPLAYER_POOL_SIZE_KEY("audioMediaPlayerPoolSize");
-
-using namespace acsdkManufactory;
-using namespace acsdkSampleApplication;
-using namespace avsCommon;
-using namespace avsCommon::avs;
-using namespace avsCommon::sdkInterfaces;
-using namespace acsdkExternalMediaPlayer;
-using MediaPlayerInterface = alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface;
-using ApplicationMediaInterfaces = alexaClientSDK::avsCommon::sdkInterfaces::ApplicationMediaInterfaces;
-
-/// The @c m_playerToMediaPlayerMap Map of the adapter to their speaker-type and MediaPlayer creation methods.
-std::unordered_map<std::string, avsCommon::sdkInterfaces::ChannelVolumeInterface::Type>
-    SampleApplication::m_playerToSpeakerTypeMap;
-
-/// The singleton map from @c playerId to @c ExternalMediaAdapter creation functions.
-std::unordered_map<std::string, ExternalMediaPlayer::AdapterCreateFunction> SampleApplication::m_adapterToCreateFuncMap;
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("SampleApplication");
-
-#ifdef ENABLE_ENDPOINT_CONTROLLERS
-/// The instance name for the toggle controller in default endpoint
-static const std::string DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME("DefaultEndpoint.Light");
-
-/// The friendly name of the toggle controller in default endpoint.
-static const std::string DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_FRIENDLY_NAME("Light");
-
-/// The instance name for the range controller in the default endpoint.
-static const std::string DEFAULT_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME("DefaultEndpoint.FanSpeed");
-
-/// The instance name for the mode controller in the default endpoint.
-static const std::string DEFAULT_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME("DefaultEndpoint.Mode");
-
-#ifdef RANGE_CONTROLLER
-/// The range value for the prest 'high' for range controller in the default endpoint.
-static const double DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH = 5;
-
-/// The range value for the prest 'medium' for range controller in the default endpoint.
-static const double DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_MEDIUM = 3;
-
-/// The range value for the prest 'low' for range controller in the default endpoint.
-static const double DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW = 1;
-#endif  // RANGE_CONTROLLER
-
-// Note: Discoball is an imaginary peripheral endpoint that is connected to the device with the following
-// capabilities : power, light (toggle), height (range), and the color of light (mode).
-// Discoball uses semantic annotations to enable additional natural utterances.
-
-/// The derived endpoint Id used in endpoint creation.
-static const std::string PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID("Discoball");
-
-/// The description of the endpoint.
-static const std::string PERIPHERAL_ENDPOINT_DESCRIPTION("Sample Discoball Description");
-
-/// The friendly name of the peripheral endpoint. This is used in utterance.
-static const std::string PERIPHERAL_ENDPOINT_FRIENDLYNAME("Discoball");
-
-/// The manufacturer of peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_MANUFACTURER_NAME("Sample Manufacturer");
-
-/// The display category of the peripheral endpoint.
-static const std::vector<std::string> PERIPHERAL_ENDPOINT_DISPLAYCATEGORY({"OTHER"});
-
-/// The instance name for the toggle controller in peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME("Discoball.Light");
-
-/// The friendly name of the toggle controller on peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_FRIENDLY_NAME("Light");
-
-/// The instance name for the range controller peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME("Discoball.Height");
-
-/// The friendly name of the range controller on peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_FRIENDLY_NAME("Height");
-
-/// The instance name for the mode controller peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME("Discoball.Mode");
-
-/// The friendly name of the mode controller on peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_MODE_CONTROLLER_FRIENDLY_NAME("Light");
-
-/// The model of the peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_MODEL("Model1");
-
-/// Serial number of the peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_SERIAL_NUMBER("123456789");
-
-/// Firmware version number peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_FIRMWARE_VERSION("1.0");
-
-/// Software Version number peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_SOFTWARE_VERSION("1.0");
-
-/// The custom identifier peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_CUSTOM_IDENTIFIER("SampleApp");
-
-#ifdef RANGE_CONTROLLER
-/// The range controller preset 'high' in peripheral endpoint.
-static const double PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH = 10;
-
-/// The range controller preset 'medium' in peripheral endpoint.
-static const double PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_MEDIUM = 5;
-
-/// The range controller preset 'low' in peripheral endpoint.
-static const double PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW = 1;
-
-/// The action ID for "raise" semantic annotations.
-static const std::string SEMANTICS_ACTION_ID_RAISE("Alexa.Actions.Raise");
-
-/// The action ID for "lower" semantic annotations.
-static const std::string SEMANTICS_ACTION_ID_LOWER("Alexa.Actions.Lower");
-
-/// The range controller SetRangeValue directive name.
-static const std::string SETRANGE_DIRECTIVE_NAME("SetRangeValue");
-
-/// The range controller SetRangeValue payload mapped to the raise action.
-static const std::string PERIPHERAL_ENDPOINT_RAISE_PAYLOAD =
-    R"({"rangeValue":)" + std::to_string(PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH) + R"(})";
-
-/// The range controller SetRangeValue payload mapped to the lower action.
-static const std::string PERIPHERAL_ENDPOINT_LOWER_PAYLOAD =
-    R"({"rangeValue":)" + std::to_string(PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW) + R"(})";
-
-#endif  // RANGE_CONTROLLER
-
-/// US English locale string.
-static const std::string EN_US("en-US");
-#endif  // ENABLE_ENDPOINT_CONTROLLERS
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// A set of all log levels.
-static const std::set<alexaClientSDK::avsCommon::utils::logger::Level> allLevels = {
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG9,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG8,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG7,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG6,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG5,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG4,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG3,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG2,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG1,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG0,
-    alexaClientSDK::avsCommon::utils::logger::Level::INFO,
-    alexaClientSDK::avsCommon::utils::logger::Level::WARN,
-    alexaClientSDK::avsCommon::utils::logger::Level::ERROR,
-    alexaClientSDK::avsCommon::utils::logger::Level::CRITICAL,
-    alexaClientSDK::avsCommon::utils::logger::Level::NONE};
-
-#ifdef ENABLE_ENDPOINT_CONTROLLERS
-
-/// Struct representing the friendly name.
-struct FriendlyName {
-    /// Type of the friendly name.
-    enum class Type {
-        /// Friendly name as asset type.
-        ASSET,
-        /// Friendly name as text type.
-        TEXT
-    };
-
-    /// Holds the type of the friendly name.
-    Type type;
-
-    /// Value contains the assetId when Type::ASSET or it contains the text when Type::TEXT.
-    std::string value;
-};
-
-/// The capability resources of primitive controllers.
-struct CapabilityResources {
-    /// Represents the friendly name of capability.
-    std::vector<FriendlyName> friendlyNames;
-};
-
-#ifdef RANGE_CONTROLLER
-/// This struct represents the Range Controller preset and its friendly names.
-struct RangeControllerPresetResources {
-    /// The value of a preset.
-    double presetValue;
-
-    /// The friendly names of the presets.
-    std::vector<FriendlyName> friendlyNames;
-};
-#endif
-
-#ifdef MODE_CONTROLLER
-/// This struct represents the Mode Controller modes and its friendly names.
-struct ModeControllerModeResources {
-    /// The mode in the Mode Controller.
-    std::string mode;
-
-    /// The friendly names of the @c mode.
-    std::vector<FriendlyName> friendlyNames;
-};
-#endif
-#endif
-
-/**
- * Gets a log level consumable by the SDK based on the user input string for log level.
- *
- * @param userInputLogLevel The string to be parsed into a log level.
- * @return The log level. This will default to NONE if the input string is not properly parsable.
- */
-static alexaClientSDK::avsCommon::utils::logger::Level getLogLevelFromUserInput(std::string userInputLogLevel) {
-    std::transform(userInputLogLevel.begin(), userInputLogLevel.end(), userInputLogLevel.begin(), ::toupper);
-    return alexaClientSDK::avsCommon::utils::logger::convertNameToLevel(userInputLogLevel);
-}
-
-/**
- * Allows the process to ignore the SIGPIPE signal.
- * The SIGPIPE signal may be received when the application performs a write to a closed socket.
- * This is a case that arises in the use of certain networking libraries.
- *
- * @return true if the action for handling SIGPIPEs was correctly set to ignore, else false.
- */
-static bool ignoreSigpipeSignals() {
-#ifndef NO_SIGPIPE
-    if (std::signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
-        return false;
-    }
-#endif
-    return true;
-}
-
-#ifdef ENABLE_ENDPOINT_CONTROLLERS
-#ifdef TOGGLE_CONTROLLER
-/**
- * Helper function to build the @c ToggleControllerAttributes
- *
- * @param capabilityResources The @c CapabilityResources containing friendly names of controller.
- * @return A non optional @c ToggleControllerAttributes if the build succeeds; otherwise, an empty
- * @c ToggleControllerAttributes object.
- */
-static avsCommon::utils::Optional<avsCommon::sdkInterfaces::toggleController::ToggleControllerAttributes>
-buildToggleControllerAttributes(const CapabilityResources& capabilityResources) {
-    auto controllerAttribute =
-        avsCommon::utils::Optional<avsCommon::sdkInterfaces::toggleController::ToggleControllerAttributes>();
-    auto toggleControllerAttributeBuilder =
-        capabilityAgents::toggleController::ToggleControllerAttributeBuilder::create();
-    if (!toggleControllerAttributeBuilder) {
-        ACSDK_ERROR(LX("Failed to create default endpoint toggle controller attribute builder!"));
-        return controllerAttribute;
-    }
-
-    if (capabilityResources.friendlyNames.size() == 0) {
-        ACSDK_ERROR(LX("buildToggleControllerAttributesFailed").m("noFriendlyNames"));
-        return controllerAttribute;
-    }
-
-    auto toggleControllerCapabilityResources = avsCommon::avs::CapabilityResources();
-    for (auto& friendlyName : capabilityResources.friendlyNames) {
-        if (FriendlyName::Type::ASSET == friendlyName.type) {
-            if (!toggleControllerCapabilityResources.addFriendlyNameWithAssetId(friendlyName.value)) {
-                ACSDK_ERROR(LX("buildToggleControllerAttributes")
-                                .m("addFriendlyNameWithAssetIdFailed")
-                                .d("value", friendlyName.value));
-                return controllerAttribute;
-            }
-        }
-        if (FriendlyName::Type::TEXT == friendlyName.type) {
-            if (!toggleControllerCapabilityResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
-                ACSDK_ERROR(LX("buildToggleControllerAttributes")
-                                .m("addFriendlyNameWithAssetIdFailed")
-                                .d("value", friendlyName.value));
-                return controllerAttribute;
-            }
-        }
-    }
-
-    toggleControllerAttributeBuilder->withCapabilityResources(toggleControllerCapabilityResources);
-
-    return toggleControllerAttributeBuilder->build();
-}
-#endif  // TOGGLE_CONTROLLER
-
-#ifdef RANGE_CONTROLLER
-/**
- * Helper function to build the @c RangeControllerAttributes
- *
- * @param capabilityResources The @c CapabilityResources containing friendly names of controller.
- * @param rangeControllerPresetResources A vector representing the preset resources used for building the configuration.
- * @param semantics An optional @c CapabilitySemantics for the range controller.
- * @return A non optional @c RangeControllerAttributes if the build succeeds; otherwise, an empty
- * @c RangeControllerAttributes object.
- */
-static avsCommon::utils::Optional<avsCommon::sdkInterfaces::rangeController::RangeControllerAttributes>
-buildRangeControllerAttributes(
-    const CapabilityResources& capabilityResources,
-    const std::vector<RangeControllerPresetResources>& rangeControllerPresetResources,
-    const avsCommon::utils::Optional<avsCommon::avs::capabilitySemantics::CapabilitySemantics> semantics =
-        avsCommon::utils::Optional<avsCommon::avs::capabilitySemantics::CapabilitySemantics>()) {
-    auto controllerAttribute =
-        avsCommon::utils::Optional<avsCommon::sdkInterfaces::rangeController::RangeControllerAttributes>();
-
-    auto rangeControllerAttributeBuilder = capabilityAgents::rangeController::RangeControllerAttributeBuilder::create();
-    if (!rangeControllerAttributeBuilder) {
-        ACSDK_ERROR(LX("Failed to create range controller attribute builder!"));
-        return controllerAttribute;
-    }
-
-    if (capabilityResources.friendlyNames.size() == 0) {
-        ACSDK_ERROR(LX("buildRangeControllerAttributesFailed").m("emptyCapabilityFriendlyNames"));
-        return controllerAttribute;
-    }
-
-    auto rangeControllerCapabilityResources = avsCommon::avs::CapabilityResources();
-    for (auto& friendlyName : capabilityResources.friendlyNames) {
-        if (FriendlyName::Type::ASSET == friendlyName.type) {
-            if (!rangeControllerCapabilityResources.addFriendlyNameWithAssetId(friendlyName.value)) {
-                ACSDK_ERROR(LX("buildRangeControllerAttributes")
-                                .m("addFriendlyNameWithAssetIdFailed")
-                                .d("value", friendlyName.value));
-                return controllerAttribute;
-            }
-        }
-        if (FriendlyName::Type::TEXT == friendlyName.type) {
-            if (!rangeControllerCapabilityResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
-                ACSDK_ERROR(LX("buildRangeControllerAttributes")
-                                .m("addFriendlyNameWithAssetIdFailed")
-                                .d("value", friendlyName.value));
-                return controllerAttribute;
-            }
-        }
-    }
-
-    rangeControllerAttributeBuilder->withCapabilityResources(rangeControllerCapabilityResources);
-
-    if (rangeControllerPresetResources.size() > 0) {
-        for (auto& presetResource : rangeControllerPresetResources) {
-            if (presetResource.friendlyNames.size() == 0) {
-                ACSDK_ERROR(LX("buildRangeControllerAttributes")
-                                .m("buildRangeControllerAttributesFailed")
-                                .m("noPresetFriendlyNames")
-                                .d("presetValue", presetResource.presetValue));
-                return controllerAttribute;
-            }
-            auto presetResources = avsCommon::avs::CapabilityResources();
-            for (auto& friendlyName : presetResource.friendlyNames) {
-                if (FriendlyName::Type::ASSET == friendlyName.type) {
-                    if (!presetResources.addFriendlyNameWithAssetId(friendlyName.value)) {
-                        ACSDK_ERROR(LX("buildRangeControllerAttributes")
-                                        .m("addFriendlyNameWithAssetIdFailed")
-                                        .d("value", friendlyName.value)
-                                        .d("presetValue", presetResource.presetValue));
-                        return controllerAttribute;
-                    }
-                }
-                if (FriendlyName::Type::TEXT == friendlyName.type) {
-                    if (!presetResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
-                        ACSDK_ERROR(LX("buildRangeControllerAttributes")
-                                        .m("addFriendlyNameWithAssetIdFailed")
-                                        .d("value", friendlyName.value)
-                                        .d("presetValue", presetResource.presetValue));
-                        return controllerAttribute;
-                    }
-                }
-            }
-            rangeControllerAttributeBuilder->addPreset(std::make_pair(presetResource.presetValue, presetResources));
-        }
-    }
-
-    if (semantics.hasValue()) {
-        if (!semantics.value().isValid()) {
-            ACSDK_ERROR(LX("buildRangeControllerAttributes").m("invalidSemantics"));
-            return controllerAttribute;
-        }
-        rangeControllerAttributeBuilder->withSemantics(semantics.value());
-    }
-
-    return rangeControllerAttributeBuilder->build();
-}
-#endif  // RANGE_CONTROLLER
-
-#ifdef MODE_CONTROLLER
-/**
- * Helper function to build the @c ModeControllerAttributes
- *
- * @param capabilityResources The @c CapabilityResources containing friendly names of controller.
- * @param presetResources A vector representing the mode resources used for building the configuration.
- * @return A non optional @c ModeControllerAttributes if the build succeeds; otherwise, an empty
- * @c ModeControllerAttributes object.
- */
-static avsCommon::utils::Optional<avsCommon::sdkInterfaces::modeController::ModeControllerAttributes>
-buildModeControllerAttributes(
-    const CapabilityResources& capabilityResources,
-    const std::vector<ModeControllerModeResources>& modeControllerModeResources) {
-    auto controllerAttribute =
-        avsCommon::utils::Optional<avsCommon::sdkInterfaces::modeController::ModeControllerAttributes>();
-
-    auto modeControllerAttributeBuilder = capabilityAgents::modeController::ModeControllerAttributeBuilder::create();
-    if (!modeControllerAttributeBuilder) {
-        ACSDK_ERROR(LX("Failed to create mode controller attribute builder!"));
-        return controllerAttribute;
-    }
-
-    if (capabilityResources.friendlyNames.size() == 0) {
-        ACSDK_ERROR(LX("buildModeControllerAttributesFailed").m("emptyCapabilityFriendlyNames"));
-        return controllerAttribute;
-    }
-
-    auto modeControllerCapabilityResources = avsCommon::avs::CapabilityResources();
-    for (auto& friendlyName : capabilityResources.friendlyNames) {
-        if (FriendlyName::Type::ASSET == friendlyName.type) {
-            if (!modeControllerCapabilityResources.addFriendlyNameWithAssetId(friendlyName.value)) {
-                ACSDK_ERROR(LX("buildModeControllerAttributes")
-                                .m("addFriendlyNameWithAssetIdFailed")
-                                .d("value", friendlyName.value));
-                return controllerAttribute;
-            }
-        }
-        if (FriendlyName::Type::TEXT == friendlyName.type) {
-            if (!modeControllerCapabilityResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
-                ACSDK_ERROR(LX("buildModeControllerAttributes")
-                                .m("addFriendlyNameWithAssetIdFailed")
-                                .d("value", friendlyName.value));
-                return controllerAttribute;
-            }
-        }
-    }
-
-    modeControllerAttributeBuilder->withCapabilityResources(modeControllerCapabilityResources);
-
-    if (modeControllerModeResources.size() > 0) {
-        for (auto& modeResource : modeControllerModeResources) {
-            if (modeResource.friendlyNames.size() == 0) {
-                ACSDK_ERROR(LX("buildModeControllerAttributes")
-                                .m("buildModeControllerAttributesFailed")
-                                .m("noPresetFriendlyNames")
-                                .d("mode", modeResource.mode));
-                return controllerAttribute;
-            }
-            auto modeResources = avsCommon::avs::CapabilityResources();
-            for (auto& friendlyName : modeResource.friendlyNames) {
-                if (FriendlyName::Type::ASSET == friendlyName.type) {
-                    if (!modeResources.addFriendlyNameWithAssetId(friendlyName.value)) {
-                        ACSDK_ERROR(LX("buildModeControllerAttributes")
-                                        .m("addFriendlyNameWithAssetIdFailed")
-                                        .d("value", friendlyName.value)
-                                        .d("mode", modeResource.mode));
-                        return controllerAttribute;
-                    }
-                }
-                if (FriendlyName::Type::TEXT == friendlyName.type) {
-                    if (!modeResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
-                        ACSDK_ERROR(LX("buildModeControllerAttributes")
-                                        .m("addFriendlyNameWithAssetIdFailed")
-                                        .d("value", friendlyName.value)
-                                        .d("mode", modeResource.mode));
-                        return controllerAttribute;
-                    }
-                }
-            }
-            modeControllerAttributeBuilder->addMode(modeResource.mode, modeResources);
-        }
-        modeControllerAttributeBuilder->setOrdered(true);
-    }
-
-    return modeControllerAttributeBuilder->build();
-}
-#endif  // MODE_CONTROLLER
-#endif  // ENABLE_ENDPOINT_CONTROLLERS
-
-std::unique_ptr<SampleApplication> SampleApplication::create(
-    std::shared_ptr<alexaClientSDK::sampleApp::ConsoleReader> consoleReader,
-    const std::vector<std::string>& configFiles,
-    const std::string& logLevel,
-    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics) {
-    auto clientApplication = std::unique_ptr<SampleApplication>(new SampleApplication);
-    if (!clientApplication->initialize(consoleReader, configFiles, logLevel, diagnostics)) {
-        ACSDK_CRITICAL(LX("Failed to initialize SampleApplication"));
-        return nullptr;
-    }
-    if (!ignoreSigpipeSignals()) {
-        ACSDK_CRITICAL(LX("Failed to set a signal handler for SIGPIPE"));
-        return nullptr;
-    }
-
-    return clientApplication;
-}
-
-SampleApplication::AdapterRegistration::AdapterRegistration(
-    const std::string& playerId,
-    ExternalMediaPlayer::AdapterCreateFunction createFunction) {
-    ACSDK_DEBUG0(LX(__func__).d("id", playerId));
-    if (m_adapterToCreateFuncMap.find(playerId) != m_adapterToCreateFuncMap.end()) {
-        ACSDK_WARN(LX("Adapter already exists").d("playerID", playerId));
-    }
-
-    m_adapterToCreateFuncMap[playerId] = createFunction;
-}
-
-SampleApplication::MediaPlayerRegistration::MediaPlayerRegistration(
-    const std::string& playerId,
-    avsCommon::sdkInterfaces::ChannelVolumeInterface::Type speakerType) {
-    ACSDK_DEBUG0(LX(__func__).d("id", playerId));
-    if (m_playerToSpeakerTypeMap.find(playerId) != m_playerToSpeakerTypeMap.end()) {
-        ACSDK_WARN(LX("MediaPlayer already exists").d("playerId", playerId));
-    }
-
-    m_playerToSpeakerTypeMap[playerId] = speakerType;
-}
-
-SampleAppReturnCode SampleApplication::run() {
-    return m_userInputManager->run();
-}
-
-#ifdef DIAGNOSTICS
-bool SampleApplication::initiateRestart() {
-    m_userInputManager->onLogout();
-    return true;
-}
-#endif
-
-SampleApplication::~SampleApplication() {
-    if (m_shutdownManager) {
-        m_shutdownManager->shutdown();
-    }
-
-    // First clean up anything that depends on the the MediaPlayers.
-    m_userInputManager.reset();
-    m_externalMusicProviderMediaPlayersMap.clear();
-
-    for (auto& shutdownable : m_shutdownRequiredList) {
-        if (!shutdownable) {
-            ACSDK_ERROR(LX("shutdownFailed").m("Component requiring shutdown was null"));
-        } else {
-            shutdownable->shutdown();
-        }
-    }
-
-    m_sdkInit.reset();
-}
-
-std::shared_ptr<alexaClientSDK::defaultClient::DefaultClient> SampleApplication::getDefaultClient() {
-    return m_client;
-}
-
-bool SampleApplication::createMediaPlayersForAdapters(
-    const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
-        httpContentFetcherFactory,
-    std::shared_ptr<defaultClient::EqualizerRuntimeSetup> equalizerRuntimeSetup) {
-    bool equalizerEnabled = equalizerRuntimeSetup->isEnabled();
-
-    for (auto& entry : m_playerToSpeakerTypeMap) {
-        auto applicationMediaInterfaces = createApplicationMediaPlayer(
-            httpContentFetcherFactory, equalizerEnabled, entry.first + "MediaPlayer", false);
-        if (applicationMediaInterfaces) {
-            m_externalMusicProviderMediaPlayersMap[entry.first] = applicationMediaInterfaces->mediaPlayer;
-            m_externalMusicProviderSpeakersMap[entry.first] = applicationMediaInterfaces->speaker;
-            if (equalizerEnabled) {
-                equalizerRuntimeSetup->addEqualizer(applicationMediaInterfaces->equalizer);
-            }
-        } else {
-            ACSDK_CRITICAL(LX("Failed to create application media interface").d("playerId", entry.first));
-            return false;
-        }
-    }
-
-    return true;
-}
-
-bool SampleApplication::initialize(
-    std::shared_ptr<alexaClientSDK::sampleApp::ConsoleReader> consoleReader,
-    const std::vector<std::string>& configFiles,
-    const std::string& logLevel,
-    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics) {
-    avsCommon::utils::logger::Level logLevelValue = avsCommon::utils::logger::Level::UNKNOWN;
-
-    if (!logLevel.empty()) {
-        logLevelValue = getLogLevelFromUserInput(logLevel);
-        if (alexaClientSDK::avsCommon::utils::logger::Level::UNKNOWN == logLevelValue) {
-            alexaClientSDK::sampleApp::ConsolePrinter::simplePrint("Unknown log level input!");
-            alexaClientSDK::sampleApp::ConsolePrinter::simplePrint("Possible log level options are: ");
-            for (auto it = allLevels.begin(); it != allLevels.end(); ++it) {
-                alexaClientSDK::sampleApp::ConsolePrinter::simplePrint(
-                    alexaClientSDK::avsCommon::utils::logger::convertLevelToName(*it));
-            }
-            return false;
-        }
-
-        alexaClientSDK::sampleApp::ConsolePrinter::simplePrint(
-            "Running app with log level: " +
-            alexaClientSDK::avsCommon::utils::logger::convertLevelToName(logLevelValue));
-    }
-
-    alexaClientSDK::avsCommon::utils::logger::LoggerSinkManager::instance().setLevel(logLevelValue);
-
-    auto configJsonStreams = std::make_shared<std::vector<std::shared_ptr<std::istream>>>();
-
-    for (auto configFile : configFiles) {
-        if (configFile.empty()) {
-            alexaClientSDK::sampleApp::ConsolePrinter::simplePrint("Config filename is empty!");
-            return false;
-        }
-
-        auto configInFile = std::shared_ptr<std::ifstream>(new std::ifstream(configFile));
-        if (!configInFile->good()) {
-            ACSDK_CRITICAL(LX("Failed to read config file").d("filename", configFile));
-            alexaClientSDK::sampleApp::ConsolePrinter::simplePrint("Failed to read config file " + configFile);
-            return false;
-        }
-
-        configJsonStreams->push_back(configInFile);
-    }
-
-#ifdef DISABLE_DUCKING
-    bool enableDucking = false;
-#else
-    bool enableDucking = true;
-#endif
-
-    // Add the InterruptModel Configuration.
-    configJsonStreams->push_back(
-        alexaClientSDK::afml::interruptModel::InterruptModelConfiguration::getConfig(enableDucking));
-
-    auto builder = initialization::InitializationParametersBuilder::create();
-    if (!builder) {
-        ACSDK_ERROR(LX("createInitializeParamsFailed").d("reason", "nullBuilder"));
-        return false;
-    }
-
-    builder->withJsonStreams(configJsonStreams);
-
-#ifdef ENABLE_LPM
-    auto powerResourceManager = std::make_shared<avsCommon::utils::power::NoOpPowerResourceManager>();
-    builder->withPowerResourceManager(powerResourceManager);
-#endif
-
-    auto initParams = builder->build();
-
-    /**
-     * If you wish to specify custom implementations for @c AuthDelegateInterface or @c MetricRecorderInterface,
-     * you can pass those objects to the sampleAppComponent via acsdkSampleApplication::getComponent.
-     *
-     * For example:
-     * auto sampleAppComponent = acsdkSampleApplication::getComponent(
-     *     std::move(initParams),
-     *     m_shutdownRequiredList,
-     *     m_cryptoFactory,
-     *     m_keyStore,
-     *     myCustomAuthDelegate,
-     *     myCustomMetricRecorder,
-     *     myCustomLogger);
-     *
-     */
-    SampleApplicationComponent sampleAppComponent =
-        acsdkSampleApplication::getComponent(std::move(initParams), m_shutdownRequiredList);
-    auto manufactory = Manufactory<
-        std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit>,
-        std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>,
-        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>,
-        std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>,
-        std::shared_ptr<avsCommon::utils::DeviceInfo>,
-        std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>,
-        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>,
-        std::shared_ptr<registrationManager::CustomerDataManagerInterface>,
-        std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>,
-        std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>,
-        std::shared_ptr<UIManager>>::create(sampleAppComponent);
-
-    auto metricRecorder = manufactory->get<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>();
-
-    m_sdkInit = manufactory->get<std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit>>();
-    if (!m_sdkInit) {
-        ACSDK_CRITICAL(LX("Failed to get SDKInit!"));
-        return false;
-    }
-
-    auto configPtr = manufactory->get<std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>>();
-    if (!configPtr) {
-        ACSDK_CRITICAL(LX("Failed to acquire the configuration"));
-        return false;
-    }
-    auto& config = *configPtr;
-    auto sampleAppConfig = config[SAMPLE_APP_CONFIG_KEY];
-
-    auto httpContentFetcherFactory = std::make_shared<avsCommon::utils::libcurlUtils::HTTPContentFetcherFactory>();
-
-    // Creating the misc DB object to be used by various components.
-    std::shared_ptr<alexaClientSDK::storage::sqliteStorage::SQLiteMiscStorage> miscStorage =
-        alexaClientSDK::storage::sqliteStorage::SQLiteMiscStorage::create(config);
-
-    /*
-     * Creating customerDataManager which will be used by the registrationManager and all classes that extend
-     * CustomerDataHandler
-     */
-    auto customerDataManager = manufactory->get<std::shared_ptr<registrationManager::CustomerDataManagerInterface>>();
-    if (!customerDataManager) {
-        ACSDK_CRITICAL(LX("Failed to get CustomerDataManager!"));
-        return false;
-    }
-
-    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> authDelegate;
-
-#ifdef AUTH_MANAGER
-    m_authManager = acsdkAuthorization::AuthorizationManager::create(miscStorage, customerDataManager);
-    if (!m_authManager) {
-        ACSDK_CRITICAL(LX("Failed to create AuthorizationManager!"));
-        return false;
-    }
-
-    m_shutdownRequiredList.push_back(m_authManager);
-    authDelegate = m_authManager;
-#else
-    /*
-     * Creating the AuthDelegate - this component takes care of LWA and authorization of the client.
-     */
-    authDelegate = manufactory->get<std::shared_ptr<AuthDelegateInterface>>();
-#endif
-
-    if (!authDelegate) {
-        ACSDK_CRITICAL(LX("Creation of AuthDelegate failed!"));
-        return false;
-    }
-
-    /*
-     * Creating Equalizer specific implementations
-     */
-    auto equalizerConfigBranch = config[EQUALIZER_CONFIG_KEY];
-    auto equalizerConfiguration = acsdkEqualizer::SDKConfigEqualizerConfiguration::create(equalizerConfigBranch);
-    std::shared_ptr<defaultClient::EqualizerRuntimeSetup> equalizerRuntimeSetup =
-        std::make_shared<defaultClient::EqualizerRuntimeSetup>(false);
-
-    bool equalizerEnabled = false;
-    if (equalizerConfiguration && equalizerConfiguration->isEnabled()) {
-        equalizerEnabled = true;
-        equalizerRuntimeSetup = std::make_shared<defaultClient::EqualizerRuntimeSetup>();
-        auto equalizerStorage = acsdkEqualizer::MiscDBEqualizerStorage::create(miscStorage);
-        auto equalizerModeController = sampleApp::SampleEqualizerModeController::create();
-
-        equalizerRuntimeSetup->setStorage(equalizerStorage);
-        equalizerRuntimeSetup->setConfiguration(equalizerConfiguration);
-        equalizerRuntimeSetup->setModeController(equalizerModeController);
-    }
-
-#if defined(ANDROID_MEDIA_PLAYER) || defined(ANDROID_MICROPHONE)
-    m_openSlEngine = applicationUtilities::androidUtilities::AndroidSLESEngine::create();
-    if (!m_openSlEngine) {
-        ACSDK_ERROR(LX("createAndroidMicFailed").d("reason", "failed to create engine"));
-        return false;
-    }
-#endif
-
-    auto speakerMediaInterfaces = createApplicationMediaPlayer(httpContentFetcherFactory, false, "SpeakMediaPlayer");
-    if (!speakerMediaInterfaces) {
-        ACSDK_CRITICAL(LX("Failed to create application media interfaces for speech!"));
-        return false;
-    }
-    m_speakMediaPlayer = speakerMediaInterfaces->mediaPlayer;
-
-    int poolSize = AUDIO_MEDIAPLAYER_POOL_SIZE_DEFAULT;
-    sampleAppConfig.getInt(AUDIO_MEDIAPLAYER_POOL_SIZE_KEY, &poolSize, AUDIO_MEDIAPLAYER_POOL_SIZE_DEFAULT);
-    std::vector<std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface>> audioSpeakers;
-
-    for (int index = 0; index < poolSize; index++) {
-        std::shared_ptr<MediaPlayerInterface> mediaPlayer;
-        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> speaker;
-        std::shared_ptr<acsdkEqualizerInterfaces::EqualizerInterface> equalizer;
-
-        auto audioMediaInterfaces =
-            createApplicationMediaPlayer(httpContentFetcherFactory, equalizerEnabled, "AudioMediaPlayer");
-        if (!audioMediaInterfaces) {
-            ACSDK_CRITICAL(LX("Failed to create application media interfaces for audio!"));
-            return false;
-        }
-        m_audioMediaPlayerPool.push_back(audioMediaInterfaces->mediaPlayer);
-        audioSpeakers.push_back(audioMediaInterfaces->speaker);
-        // Creating equalizers
-        if (equalizerRuntimeSetup->isEnabled()) {
-            equalizerRuntimeSetup->addEqualizer(audioMediaInterfaces->equalizer);
-        }
-    }
-
-    avsCommon::utils::Optional<avsCommon::utils::mediaPlayer::Fingerprint> fingerprint =
-        (*(m_audioMediaPlayerPool.begin()))->getFingerprint();
-    auto audioMediaPlayerFactory = std::unique_ptr<mediaPlayer::PooledMediaPlayerFactory>();
-    if (fingerprint.hasValue()) {
-        audioMediaPlayerFactory =
-            mediaPlayer::PooledMediaPlayerFactory::create(m_audioMediaPlayerPool, fingerprint.value());
-    } else {
-        audioMediaPlayerFactory = mediaPlayer::PooledMediaPlayerFactory::create(m_audioMediaPlayerPool);
-    }
-    if (!audioMediaPlayerFactory) {
-        ACSDK_CRITICAL(LX("Failed to create media player factory for content!"));
-        return false;
-    }
-
-    auto notificationMediaInterfaces =
-        createApplicationMediaPlayer(httpContentFetcherFactory, false, "NotificationsMediaPlayer");
-    if (!notificationMediaInterfaces) {
-        ACSDK_CRITICAL(LX("Failed to create application media interfaces for notifications!"));
-        return false;
-    }
-    m_notificationsMediaPlayer = notificationMediaInterfaces->mediaPlayer;
-
-    auto bluetoothMediaInterfaces =
-        createApplicationMediaPlayer(httpContentFetcherFactory, false, "BluetoothMediaPlayer");
-    if (!bluetoothMediaInterfaces) {
-        ACSDK_CRITICAL(LX("Failed to create application media interfaces for bluetooth!"));
-        return false;
-    }
-    m_bluetoothMediaPlayer = bluetoothMediaInterfaces->mediaPlayer;
-
-    auto ringtoneMediaInterfaces =
-        createApplicationMediaPlayer(httpContentFetcherFactory, false, "RingtoneMediaPlayer");
-    if (!ringtoneMediaInterfaces) {
-        alexaClientSDK::sampleApp::ConsolePrinter::simplePrint(
-            "Failed to create application media interfaces for ringtones!");
-        return false;
-    }
-    m_ringtoneMediaPlayer = ringtoneMediaInterfaces->mediaPlayer;
-
-#ifdef ENABLE_COMMS_AUDIO_PROXY
-    auto commsMediaInterfaces =
-        createApplicationMediaPlayer(httpContentFetcherFactory, false, "CommsMediaPlayer", true);
-    if (!commsMediaInterfaces) {
-        ACSDK_CRITICAL(LX("Failed to create application media interfaces for comms!"));
-        return false;
-    }
-    m_commsMediaPlayer = commsMediaInterfaces->mediaPlayer;
-    auto commsSpeaker = commsMediaInterfaces->speaker;
-#endif
-
-    auto alertsMediaInterfaces = createApplicationMediaPlayer(httpContentFetcherFactory, false, "AlertsMediaPlayer");
-    if (!alertsMediaInterfaces) {
-        ACSDK_CRITICAL(LX("Failed to create application media interfaces for alerts!"));
-        return false;
-    }
-    m_alertsMediaPlayer = alertsMediaInterfaces->mediaPlayer;
-
-    auto systemSoundMediaInterfaces =
-        createApplicationMediaPlayer(httpContentFetcherFactory, false, "SystemSoundMediaPlayer");
-    if (!systemSoundMediaInterfaces) {
-        ACSDK_CRITICAL(LX("Failed to create application media interfaces for system sound player!"));
-        return false;
-    }
-    m_systemSoundMediaPlayer = systemSoundMediaInterfaces->mediaPlayer;
-
-#ifdef ENABLE_PCC
-    auto phoneMediaInterfaces = createApplicationMediaPlayer(httpContentFetcherFactory, false, "PhoneMediaPlayer");
-    if (!phoneMediaInterfaces) {
-        ACSDK_CRITICAL(LX("Failed to create application media interfaces for phone!"));
-        return false;
-    }
-    auto phoneSpeaker = phoneMediaInterfaces->speaker;
-#endif
-
-#ifdef ENABLE_MCC
-    auto meetingMediaInterfaces = createApplicationMediaPlayer(httpContentFetcherFactory, false, "MeetingMediaPlayer");
-    if (!meetingMediaInterfaces) {
-        ACSDK_CRITICAL(LX("Failed to create application media interfaces for meeting client!"));
-        return false;
-    }
-    auto meetingSpeaker = meetingMediaInterfaces->speaker;
-#endif
-
-    if (!createMediaPlayersForAdapters(httpContentFetcherFactory, equalizerRuntimeSetup)) {
-        ACSDK_CRITICAL(LX("Could not create mediaPlayers for adapters"));
-        return false;
-    }
-
-    auto audioFactory = std::make_shared<alexaClientSDK::applicationUtilities::resources::audio::AudioFactory>();
-
-    // Creating the alert storage object to be used for rendering and storing alerts.
-    auto alertStorage = alexaClientSDK::acsdkAlerts::storage::SQLiteAlertStorage::create(
-        config, audioFactory->alerts(), metricRecorder);
-
-    // Creating the message storage object to be used for storing message to be sent later.
-    auto messageStorage = alexaClientSDK::certifiedSender::SQLiteMessageStorage::create(config);
-
-    /*
-     * Creating notifications storage object to be used for storing notification indicators.
-     */
-    auto notificationsStorage = alexaClientSDK::acsdkNotifications::SQLiteNotificationsStorage::create(config);
-
-    /*
-     * Creating new device settings storage object to be used for storing AVS Settings.
-     */
-    auto deviceSettingsStorage = alexaClientSDK::settings::storage::SQLiteDeviceSettingStorage::create(config);
-
-    /*
-     * Creating bluetooth storage object to be used for storing uuid to mac mappings for devices.
-     */
-    auto bluetoothStorage = alexaClientSDK::acsdkBluetooth::SQLiteBluetoothStorage::create(config);
-
-    /*
-     * Create sample locale asset manager.
-     */
-    auto localeAssetsManager = manufactory->get<std::shared_ptr<LocaleAssetsManagerInterface>>();
-    if (!localeAssetsManager) {
-        ACSDK_CRITICAL(LX("Failed to create Locale Assets Manager!"));
-        return false;
-    }
-
-    /*
-     * Creating the UI component that observes various components and prints to the console accordingly.
-     */
-    auto userInterfaceManager = manufactory->get<std::shared_ptr<alexaClientSDK::sampleApp::UIManager>>();
-    if (!userInterfaceManager) {
-        ACSDK_CRITICAL(LX("Failed to get UIManager!"));
-        return false;
-    }
-
-    /*
-     * Create the presentation layer for the captions.
-     */
-    auto captionPresenter = std::make_shared<alexaClientSDK::sampleApp::CaptionPresenter>();
-
-#ifdef ENABLE_PCC
-    auto phoneCaller = std::make_shared<alexaClientSDK::sampleApp::PhoneCaller>();
-#endif
-
-#ifdef ENABLE_MCC
-    auto meetingClient = std::make_shared<alexaClientSDK::sampleApp::MeetingClient>();
-    auto calendarClient = std::make_shared<alexaClientSDK::sampleApp::CalendarClient>();
-#endif
-
-    /*
-     * Creating the deviceInfo object
-     */
-    auto deviceInfo = manufactory->get<std::shared_ptr<avsCommon::utils::DeviceInfo>>();
-    if (!deviceInfo) {
-        ACSDK_CRITICAL(LX("Creation of DeviceInfo failed!"));
-        return false;
-    }
-
-    /*
-     * Supply a SALT for UUID generation, this should be as unique to each individual device as possible
-     */
-    alexaClientSDK::avsCommon::utils::uuidGeneration::setSalt(
-        deviceInfo->getClientId() + deviceInfo->getDeviceSerialNumber());
-
-    /*
-     * Creating the CapabilitiesDelegate - This component provides the client with the ability to send messages to the
-     * Capabilities API.
-     */
-    auto capabilitiesDelegateStorage =
-        alexaClientSDK::capabilitiesDelegate::storage::SQLiteCapabilitiesDelegateStorage::create(config);
-
-    m_capabilitiesDelegate = alexaClientSDK::capabilitiesDelegate::CapabilitiesDelegate::create(
-        authDelegate, std::move(capabilitiesDelegateStorage), customerDataManager);
-
-    if (!m_capabilitiesDelegate) {
-        alexaClientSDK::sampleApp::ConsolePrinter::simplePrint("Creation of CapabilitiesDelegate failed!");
-        return false;
-    }
-
-    m_shutdownRequiredList.push_back(m_capabilitiesDelegate);
-    authDelegate->addAuthObserver(userInterfaceManager);
-    m_capabilitiesDelegate->addCapabilitiesObserver(userInterfaceManager);
-
-    // INVALID_FIRMWARE_VERSION is passed to @c getInt() as a default in case FIRMWARE_VERSION_KEY is not found.
-    int firmwareVersion = static_cast<int>(avsCommon::sdkInterfaces::softwareInfo::INVALID_FIRMWARE_VERSION);
-    sampleAppConfig.getInt(FIRMWARE_VERSION_KEY, &firmwareVersion, firmwareVersion);
-
-    /*
-     * Check to see if displayCards is supported on the device. The default is supported unless specified otherwise in
-     * the configuration.
-     */
-    bool displayCardsSupported;
-    config[SAMPLE_APP_CONFIG_KEY].getBool(DISPLAY_CARD_KEY, &displayCardsSupported, true);
-
-    /*
-     * Creating the InternetConnectionMonitor that will notify observers of internet connection status changes.
-     */
-    auto internetConnectionMonitor =
-        avsCommon::utils::network::InternetConnectionMonitor::create(httpContentFetcherFactory);
-    if (!internetConnectionMonitor) {
-        ACSDK_CRITICAL(LX("Failed to create InternetConnectionMonitor"));
-        return false;
-    }
-
-    /*
-     * Creating the Context Manager - This component manages the context of each of the components to update to AVS.
-     * It is required for each of the capability agents so that they may provide their state just before any event is
-     * fired off.
-     */
-    auto contextManager = manufactory->get<std::shared_ptr<ContextManagerInterface>>();
-    if (!contextManager) {
-        ACSDK_CRITICAL(LX("Creation of ContextManager failed."));
-        return false;
-    }
-
-    auto avsGatewayManagerStorage = avsGatewayManager::storage::AVSGatewayManagerStorage::create(miscStorage);
-    if (!avsGatewayManagerStorage) {
-        ACSDK_CRITICAL(LX("Creation of AVSGatewayManagerStorage failed"));
-        return false;
-    }
-    auto avsGatewayManager = avsGatewayManager::AVSGatewayManager::create(
-        std::move(avsGatewayManagerStorage), customerDataManager, config, authDelegate);
-    if (!avsGatewayManager) {
-        ACSDK_CRITICAL(LX("Creation of AVSGatewayManager failed"));
-        return false;
-    }
-
-    auto synchronizeStateSenderFactory = synchronizeStateSender::SynchronizeStateSenderFactory::create(contextManager);
-    if (!synchronizeStateSenderFactory) {
-        ACSDK_CRITICAL(LX("Creation of SynchronizeStateSenderFactory failed"));
-        return false;
-    }
-
-    std::vector<std::shared_ptr<avsCommon::sdkInterfaces::PostConnectOperationProviderInterface>> providers;
-    providers.push_back(synchronizeStateSenderFactory);
-    providers.push_back(avsGatewayManager);
-    providers.push_back(m_capabilitiesDelegate);
-
-    /*
-     * Create a factory for creating objects that handle tasks that need to be performed right after establishing
-     * a connection to AVS.
-     */
-    auto postConnectSequencerFactory = acl::PostConnectSequencerFactory::create(providers);
-
-    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::ProtocolTracerInterface> deviceProtocolTracer;
-    if (diagnostics) {
-        /*
-         * Create the deviceProtocolTracer to trace events and directives.
-         */
-        deviceProtocolTracer = diagnostics->getProtocolTracer();
-
-        if (deviceProtocolTracer) {
-            const std::string DIAGNOSTICS_KEY = "diagnostics";
-            const std::string MAX_TRACED_MESSAGES_KEY = "maxTracedMessages";
-            const std::string TRACE_FROM_STARTUP = "protocolTraceFromStartup";
-
-            int configMaxValue = -1;
-            bool configProtocolTraceEnabled = false;
-
-            if (alexaClientSDK::avsCommon::utils::configuration::ConfigurationNode::getRoot()[DIAGNOSTICS_KEY].getInt(
-                    MAX_TRACED_MESSAGES_KEY, &configMaxValue)) {
-                if (configMaxValue < 0) {
-                    ACSDK_WARN(LX("ignoringMaxTracedMessages")
-                                   .d("reason", "negativeValue")
-                                   .d("maxTracedMessages", configMaxValue));
-                } else {
-                    deviceProtocolTracer->setMaxMessages(static_cast<unsigned int>(configMaxValue));
-                }
-            }
-
-            if (alexaClientSDK::avsCommon::utils::configuration::ConfigurationNode::getRoot()[DIAGNOSTICS_KEY].getBool(
-                    TRACE_FROM_STARTUP, &configProtocolTraceEnabled)) {
-                if (configProtocolTraceEnabled) {
-                    deviceProtocolTracer->setProtocolTraceFlag(configProtocolTraceEnabled);
-                    ACSDK_DEBUG9(LX("Protocol Trace has been enabled at startup"));
-                }
-            }
-        }
-    }
-
-    /*
-     * Create a factory to create objects that establish a connection with AVS.
-     */
-    auto transportFactory = std::make_shared<acl::HTTP2TransportFactory>(
-        std::make_shared<avsCommon::utils::libcurlUtils::LibcurlHTTP2ConnectionFactory>(),
-        postConnectSequencerFactory,
-        nullptr,
-        deviceProtocolTracer);
-
-    /*
-     * Create the BluetoothDeviceManager to communicate with the Bluetooth stack.
-     */
-    std::unique_ptr<avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceManagerInterface> bluetoothDeviceManager;
-
-    /*
-     * Create the connectionRules to communicate with the Bluetooth stack.
-     */
-    std::unordered_set<
-        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceConnectionRuleInterface>>
-        enabledConnectionRules;
-    enabledConnectionRules.insert(alexaClientSDK::acsdkBluetooth::BasicDeviceConnectionRule::create());
-
-#ifdef BLUETOOTH_BLUEZ
-    auto eventBus = std::make_shared<avsCommon::utils::bluetooth::BluetoothEventBus>();
-
-#ifdef BLUETOOTH_BLUEZ_PULSEAUDIO_OVERRIDE_ENDPOINTS
-    /*
-     * Create PulseAudio initializer object. Subscribe to BLUETOOTH_DEVICE_MANAGER_INITIALIZED event before we create
-     * the BT Device Manager, otherwise may miss it.
-     */
-    m_pulseAudioInitializer = bluetoothImplementations::blueZ::PulseAudioBluetoothInitializer::create(eventBus);
-#endif
-
-    bluetoothDeviceManager = bluetoothImplementations::blueZ::BlueZBluetoothDeviceManager::create(eventBus);
-#endif
-
-    /*
-     * Creating the buffer (Shared Data Stream) that will hold user audio data. This is the main input into the SDK.
-     */
-    std::shared_ptr<alexaClientSDK::avsCommon::utils::AudioFormat> compatibleAudioFormat =
-        alexaClientSDK::acsdkAudioInputStream::CompatibleAudioFormat::getCompatibleAudioFormat();
-
-    std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream> sharedDataStream =
-        alexaClientSDK::acsdkAudioInputStream::AudioInputStreamFactory::createAudioInputStream(
-            compatibleAudioFormat, WORD_SIZE, MAX_READERS, AMOUNT_OF_AUDIO_DATA_IN_BUFFER);
-
-    if (!sharedDataStream) {
-        ACSDK_CRITICAL(LX("Failed to create shared data stream!"));
-        return false;
-    }
-
-    /*
-     * Creating each of the audio providers. An audio provider is a simple package of data consisting of the stream
-     * of audio data, as well as metadata about the stream. For each of the three audio providers created here, the same
-     * stream is used since this sample application will only have one microphone.
-     */
-
-    // Creating tap to talk audio provider
-    alexaClientSDK::capabilityAgents::aip::AudioProvider tapToTalkAudioProvider =
-        alexaClientSDK::capabilityAgents::aip::AudioProvider::AudioProvider::TapAudioProvider(
-            sharedDataStream, *compatibleAudioFormat);
-
-    // Creating hold to talk audio provider
-    alexaClientSDK::capabilityAgents::aip::AudioProvider holdToTalkAudioProvider =
-        alexaClientSDK::capabilityAgents::aip::AudioProvider::AudioProvider::HoldAudioProvider(
-            sharedDataStream, *compatibleAudioFormat);
-
-    /*
-     * Creating the DefaultClient - this component serves as an out-of-box default object that instantiates and "glues"
-     * together all the modules.
-     */
-    m_client = alexaClientSDK::defaultClient::DefaultClient::create(
-        deviceInfo,
-        customerDataManager,
-        m_externalMusicProviderMediaPlayersMap,
-        m_externalMusicProviderSpeakersMap,
-        m_adapterToCreateFuncMap,
-        m_speakMediaPlayer,
-        std::move(audioMediaPlayerFactory),
-        m_alertsMediaPlayer,
-        m_notificationsMediaPlayer,
-        m_bluetoothMediaPlayer,
-        m_ringtoneMediaPlayer,
-        m_systemSoundMediaPlayer,
-        speakerMediaInterfaces->speaker,
-        audioSpeakers,
-        alertsMediaInterfaces->speaker,
-        notificationMediaInterfaces->speaker,
-        bluetoothMediaInterfaces->speaker,
-        ringtoneMediaInterfaces->speaker,
-        systemSoundMediaInterfaces->speaker,
-        {},
-#ifdef ENABLE_PCC
-        phoneSpeaker,
-        phoneCaller,
-#endif
-#ifdef ENABLE_MCC
-        meetingSpeaker,
-        meetingClient,
-        calendarClient,
-#endif
-#ifdef ENABLE_COMMS_AUDIO_PROXY
-        m_commsMediaPlayer,
-        commsSpeaker,
-        sharedDataStream,
-#endif
-        equalizerRuntimeSetup,
-        audioFactory,
-        authDelegate,
-        std::move(alertStorage),
-        std::move(messageStorage),
-        std::move(notificationsStorage),
-        std::move(deviceSettingsStorage),
-        std::move(bluetoothStorage),
-        miscStorage,
-        {userInterfaceManager},
-        {userInterfaceManager},
-        std::move(internetConnectionMonitor),
-        displayCardsSupported,
-        m_capabilitiesDelegate,
-        contextManager,
-        transportFactory,
-        avsGatewayManager,
-        localeAssetsManager,
-        enabledConnectionRules,
-        /* systemTimezone*/ nullptr,
-        firmwareVersion,
-        true,
-        nullptr,
-        std::move(bluetoothDeviceManager),
-        metricRecorder,
-#ifdef ENABLE_LPM
-        powerResourceManager,
-#else
-        nullptr,
-#endif
-        diagnostics,
-        std::make_shared<alexaClientSDK::sampleApp::ExternalCapabilitiesBuilder>(deviceInfo),
-        std::make_shared<alexaClientSDK::capabilityAgents::speakerManager::DefaultChannelVolumeFactory>(),
-        true,
-        std::make_shared<alexaClientSDK::acl::MessageRouterFactory>(),
-        nullptr,
-        tapToTalkAudioProvider);
-    if (!m_client) {
-        ACSDK_CRITICAL(LX("Failed to create default SDK client!"));
-        return false;
-    }
-
-    m_client->addSpeakerManagerObserver(userInterfaceManager);
-
-    m_client->addNotificationsObserver(userInterfaceManager);
-
-    m_client->addBluetoothDeviceObserver(userInterfaceManager);
-
-    m_shutdownManager = m_client->getShutdownManager();
-    if (!m_shutdownManager) {
-        ACSDK_CRITICAL(LX("Failed to get ShutdownManager!"));
-        return false;
-    }
-
-#ifdef ENABLE_CAPTIONS
-    std::vector<std::shared_ptr<MediaPlayerInterface>> captionableMediaSources = m_audioMediaPlayerPool;
-    captionableMediaSources.emplace_back(m_speakMediaPlayer);
-    m_client->addCaptionPresenter(captionPresenter);
-    m_client->setCaptionMediaPlayers(captionableMediaSources);
-#endif
-
-    userInterfaceManager->configureSettingsNotifications(m_client->getSettingsManager());
-
-    /*
-     * Add GUI Renderer as an observer if display cards are supported.
-     */
-    if (displayCardsSupported) {
-        m_guiRenderer = std::make_shared<GuiRenderer>();
-        m_client->addTemplateRuntimeObserver(m_guiRenderer);
-    }
-
-#ifdef PORTAUDIO
-    std::shared_ptr<PortAudioMicrophoneWrapper> micWrapper = PortAudioMicrophoneWrapper::create(sharedDataStream);
-#elif defined(ANDROID_MICROPHONE)
-    std::shared_ptr<applicationUtilities::androidUtilities::AndroidSLESMicrophone> micWrapper =
-        m_openSlEngine->createAndroidMicrophone(sharedDataStream);
-#elif AUDIO_INJECTION
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::diagnostics::AudioInjectorInterface> audioInjector;
-    if (diagnostics) {
-        audioInjector = diagnostics->getAudioInjector();
-    }
-
-    if (!audioInjector) {
-        ACSDK_CRITICAL(LX("No audio injector provided!"));
-        return false;
-    }
-    std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> micWrapper =
-        audioInjector->getMicrophone(sharedDataStream, *compatibleAudioFormat);
-#else
-    ACSDK_CRITICAL(LX("No microphone module provided!"));
-    return false;
-#endif
-    if (!micWrapper) {
-        ACSDK_CRITICAL(LX("Failed to create microphone wrapper!"));
-        return false;
-    }
-
-#ifdef ENABLE_ENDPOINT_CONTROLLERS
-    // Default Endpoint
-    if (!addControllersToDefaultEndpoint(m_client->getDefaultEndpointBuilder())) {
-        ACSDK_CRITICAL(LX("Failed to add controllers to default endpoint!"));
-        return false;
-    }
-
-    // Peripheral Endpoint
-    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> peripheralEndpointBuilder =
-        m_client->createEndpointBuilder();
-    if (!peripheralEndpointBuilder) {
-        ACSDK_CRITICAL(LX("Failed to create peripheral endpoint Builder!"));
-        return false;
-    }
-
-    peripheralEndpointBuilder->withDerivedEndpointId(PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID)
-        .withDescription(PERIPHERAL_ENDPOINT_DESCRIPTION)
-        .withFriendlyName(PERIPHERAL_ENDPOINT_FRIENDLYNAME)
-        .withManufacturerName(PERIPHERAL_ENDPOINT_MANUFACTURER_NAME)
-        .withAdditionalAttributes(
-            PERIPHERAL_ENDPOINT_MANUFACTURER_NAME,
-            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_MODEL,
-            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_SERIAL_NUMBER,
-            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_FIRMWARE_VERSION,
-            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_SOFTWARE_VERSION,
-            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_CUSTOM_IDENTIFIER)
-        .withDisplayCategory(PERIPHERAL_ENDPOINT_DISPLAYCATEGORY);
-
-    if (!addControllersToPeripheralEndpoint(peripheralEndpointBuilder, diagnostics)) {
-        ACSDK_CRITICAL(LX("Failed to add controllers to peripheral endpoint!"));
-        return false;
-    }
-
-    auto peripheralEndpoint = peripheralEndpointBuilder->build();
-    if (!peripheralEndpoint) {
-        ACSDK_CRITICAL(LX("Failed to create Peripheral Endpoint!"));
-        return false;
-    }
-
-    m_client->registerEndpoint(std::move(peripheralEndpoint));
-#endif
-
-// Creating wake word audio provider, if necessary
-#ifdef KWD
-    alexaClientSDK::capabilityAgents::aip::AudioProvider wakeWordAudioProvider =
-        alexaClientSDK::capabilityAgents::aip::AudioProvider::WakeAudioProvider(
-            sharedDataStream, *compatibleAudioFormat);
-
-    m_keywordDetector = alexaClientSDK::kwd::KeywordDetectorProvider::create(
-        sharedDataStream,
-        *compatibleAudioFormat,
-        std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::KeyWordObserverInterface>>(),
-        std::unordered_set<
-            std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::KeyWordDetectorStateObserverInterface>>());
-    if (!m_keywordDetector) {
-        ACSDK_CRITICAL(LX("Failed to create keyword detector!"));
-        return false;
-    }
-
-    // // This observer is notified any time a keyword is detected and notifies the DefaultClient to start recognizing.
-    auto keywordObserver = KeywordObserver::create(m_client, wakeWordAudioProvider, m_keywordDetector);
-
-    // If wake word is enabled, then creating the interaction manager with a wake word audio provider.
-    m_interactionManager = std::make_shared<alexaClientSDK::sampleApp::InteractionManager>(
-        m_client,
-        micWrapper,
-        userInterfaceManager,
-#ifdef ENABLE_PCC
-        phoneCaller,
-#endif
-#ifdef ENABLE_MCC
-        meetingClient,
-        calendarClient,
-#endif
-        holdToTalkAudioProvider,
-        tapToTalkAudioProvider,
-        m_guiRenderer,
-        wakeWordAudioProvider
-#ifdef POWER_CONTROLLER
-        ,
-        m_peripheralEndpointPowerHandler
-#endif
-#ifdef TOGGLE_CONTROLLER
-        ,
-        m_peripheralEndpointToggleHandler
-#endif
-#ifdef RANGE_CONTROLLER
-        ,
-        m_peripheralEndpointRangeHandler
-#endif
-#ifdef MODE_CONTROLLER
-        ,
-        m_peripheralEndpointModeHandler
-#endif
-        ,
-        nullptr,
-        diagnostics);
-#else
-    // clang-format off
-    // If wake word is not enabled, then creating the interaction manager without a wake word audio provider.
-    m_interactionManager = std::make_shared<alexaClientSDK::sampleApp::InteractionManager>(
-        m_client,
-        micWrapper,
-        userInterfaceManager,
-#ifdef ENABLE_PCC
-        phoneCaller,
-#endif
-#ifdef ENABLE_MCC
-        meetingClient,
-        calendarClient,
-#endif
-        holdToTalkAudioProvider,
-        tapToTalkAudioProvider,
-        m_guiRenderer,
-        capabilityAgents::aip::AudioProvider::null()
-#ifdef POWER_CONTROLLER
-        ,
-        m_peripheralEndpointPowerHandler
-#endif
-#ifdef TOGGLE_CONTROLLER
-        ,
-        m_peripheralEndpointToggleHandler
-#endif
-#ifdef RANGE_CONTROLLER
-        ,
-        m_peripheralEndpointRangeHandler
-#endif
-#ifdef MODE_CONTROLLER
-        ,
-        m_peripheralEndpointModeHandler
-#endif
-        ,
-        nullptr,
-        diagnostics);
-// clang-format on
-#endif
-
-    m_shutdownRequiredList.push_back(m_interactionManager);
-    m_client->addAlexaDialogStateObserver(m_interactionManager);
-    m_client->addCallStateObserver(m_interactionManager);
-
-#ifdef ENABLE_REVOKE_AUTH
-    // Creating the revoke authorization observer.
-    auto revokeObserver =
-        std::make_shared<alexaClientSDK::sampleApp::RevokeAuthorizationObserver>(m_client->getRegistrationManager());
-    m_client->addRevokeAuthorizationObserver(revokeObserver);
-#endif
-
-    // Creating the input observer.
-    m_userInputManager = alexaClientSDK::sampleApp::UserInputManager::create(
-        m_interactionManager, consoleReader, localeAssetsManager, deviceInfo->getDefaultEndpointId());
-    if (!m_userInputManager) {
-        ACSDK_CRITICAL(LX("Failed to create UserInputManager!"));
-        return false;
-    }
-
-    authDelegate->addAuthObserver(m_userInputManager);
-    m_client->addRegistrationObserver(m_userInputManager);
-    m_capabilitiesDelegate->addCapabilitiesObserver(m_userInputManager);
-
-#ifdef AUTH_MANAGER
-    m_authManager->setRegistrationManager(m_client->getRegistrationManager());
-
-    auto httpPost = avsCommon::utils::libcurlUtils::HttpPost::createHttpPostInterface();
-    auto cryptoFactory = manufactory->get<std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>>();
-    auto keyStore = manufactory->get<std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>>();
-
-    m_lwaAdapter = acsdkAuthorization::lwa::LWAAuthorizationAdapter::create(
-        configPtr,
-        std::move(httpPost),
-        deviceInfo,
-        acsdkAuthorization::lwa::LWAAuthorizationStorage::createLWAAuthorizationStorageInterface(
-            configPtr, "", cryptoFactory, keyStore));
-
-    if (!m_lwaAdapter) {
-        ACSDK_CRITICAL(LX("Failed to create LWA Adapter!"));
-        return false;
-    }
-
-    m_authManager->add(m_lwaAdapter);
-
-    auto cblRequest = acsdkSampleApplicationCBLAuthRequester::SampleApplicationCBLAuthRequester::
-        createCBLAuthorizationObserverInterface(userInterfaceManager);
-
-    m_lwaAdapter->authorizeUsingCBL(cblRequest);
-#endif
-
-    m_client->connect();
-
-    return true;
-}
-
-std::shared_ptr<ApplicationMediaInterfaces> SampleApplication::createApplicationMediaPlayer(
-    const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
-        httpContentFetcherFactory,
-    bool enableEqualizer,
-    const std::string& name,
-    bool enableLiveMode) {
-#ifdef GSTREAMER_MEDIA_PLAYER
-    /*
-     * For the SDK, the MediaPlayer happens to also provide volume control functionality.
-     * Note the externalMusicProviderMediaPlayer is not added to the set of SpeakerInterfaces as there would be
-     * more actions needed for these beyond setting the volume control on the MediaPlayer.
-     */
-    auto mediaPlayer = alexaClientSDK::mediaPlayer::MediaPlayer::create(
-        httpContentFetcherFactory, enableEqualizer, name, enableLiveMode);
-    if (!mediaPlayer) {
-        return nullptr;
-    }
-    auto speaker = std::static_pointer_cast<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface>(mediaPlayer);
-    auto equalizer = std::static_pointer_cast<acsdkEqualizerInterfaces::EqualizerInterface>(mediaPlayer);
-    auto requiresShutdown = std::static_pointer_cast<alexaClientSDK::avsCommon::utils::RequiresShutdown>(mediaPlayer);
-    auto applicationMediaInterfaces =
-        std::make_shared<ApplicationMediaInterfaces>(mediaPlayer, speaker, equalizer, requiresShutdown);
-#elif defined(ANDROID_MEDIA_PLAYER)
-    // TODO - Add support of live mode to AndroidSLESMediaPlayer (ACSDK-2530).
-    std::shared_ptr<mediaPlayer::android::AndroidSLESMediaPlayer> mediaPlayer =
-        mediaPlayer::android::AndroidSLESMediaPlayer::create(
-            httpContentFetcherFactory,
-            m_openSlEngine,
-            enableEqualizer,
-            mediaPlayer::android::PlaybackConfiguration(),
-            name);
-    if (!mediaPlayer) {
-        return nullptr;
-    }
-    auto speaker = mediaPlayer->getSpeaker();
-    auto equalizer = std::static_pointer_cast<acsdkEqualizerInterfaces::EqualizerInterface>(mediaPlayer);
-    auto requiresShutdown = std::static_pointer_cast<alexaClientSDK::avsCommon::utils::RequiresShutdown>(mediaPlayer);
-    auto applicationMediaInterfaces =
-        std::make_shared<ApplicationMediaInterfaces>(mediaPlayer, speaker, equalizer, requiresShutdown);
-#elif defined(CUSTOM_MEDIA_PLAYER)
-    // Custom media players must implement the createCustomMediaPlayer function
-    auto applicationMediaInterfaces =
-        createCustomMediaPlayer(httpContentFetcherFactory, enableEqualizer, name, enableLiveMode);
-    if (!applicationMediaInterfaces) {
-        return nullptr;
-    }
-#endif
-
-    if (applicationMediaInterfaces->requiresShutdown) {
-        m_shutdownRequiredList.push_back(applicationMediaInterfaces->requiresShutdown);
-    }
-    return applicationMediaInterfaces;
-}
-
-#ifdef ENABLE_ENDPOINT_CONTROLLERS
-bool SampleApplication::addControllersToDefaultEndpoint(
-    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> defaultEndpointBuilder) {
-    if (!defaultEndpointBuilder) {
-        ACSDK_CRITICAL(LX("addControllersToDefaultEndpointFailed").m("invalidDefaultEndpointBuilder"));
-        return false;
-    }
-
-#ifdef TOGGLE_CONTROLLER
-    auto toggleHandler =
-        DefaultEndpointToggleControllerHandler::create(DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME);
-    if (!toggleHandler) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint toggle controller handler!"));
-        return false;
-    }
-
-    auto toggleControllerAttributes = buildToggleControllerAttributes(
-        {{{FriendlyName::Type::TEXT, DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_FRIENDLY_NAME}}});
-    if (!toggleControllerAttributes.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint toggle controller attributes!"));
-        return false;
-    }
-
-    defaultEndpointBuilder->withToggleController(
-        toggleHandler,
-        DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME,
-        toggleControllerAttributes.value(),
-        true,
-        true,
-        false);
-#endif
-
-#ifdef RANGE_CONTROLLER
-    auto rangeHandler = DefaultEndpointRangeControllerHandler::create(DEFAULT_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME);
-    if (!rangeHandler) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint range controller handler!"));
-        return false;
-    }
-
-    auto rangeControllerAttributes = buildRangeControllerAttributes(
-        {{{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_SETTING_FANSPEED}}},
-        {{DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH,
-          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MAXIMUM},
-           {FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_HIGH}}},
-         {DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_MEDIUM,
-          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MEDIUM}}},
-         {DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW,
-          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MINIMUM},
-           {FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_LOW}}}});
-
-    if (!rangeControllerAttributes.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint range controller attributes!"));
-        return false;
-    }
-
-    defaultEndpointBuilder->withRangeController(
-        rangeHandler,
-        DEFAULT_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME,
-        rangeControllerAttributes.value(),
-        true,
-        true,
-        false);
-#endif
-
-#ifdef MODE_CONTROLLER
-    auto modeHandler = DefaultEndpointModeControllerHandler::create(DEFAULT_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME);
-    if (!modeHandler) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint mode controller handler!"));
-        return false;
-    }
-
-    auto modeControllerAttributes = buildModeControllerAttributes(
-        {{{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_SETTING_MODE}}},
-        {{DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_FAN_ONLY,
-          {{FriendlyName::Type::TEXT,
-            DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_FAN_ONLY_FRIENDLY_NAME}}},
-         {DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_HEAT,
-          {{FriendlyName::Type::TEXT, DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_HEAT_FRIENDLY_NAME}}},
-         {DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_COOL,
-          {{FriendlyName::Type::TEXT,
-            DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_COOL_FRIENDLY_NAME}}}});
-
-    if (!modeControllerAttributes.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint mode controller attributes!"));
-        return false;
-    }
-
-    defaultEndpointBuilder->withModeController(
-        modeHandler,
-        DEFAULT_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME,
-        modeControllerAttributes.value(),
-        true,
-        true,
-        false);
-#endif
-
-    return true;
-}
-
-bool SampleApplication::addControllersToPeripheralEndpoint(
-    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> peripheralEndpointBuilder,
-    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics) {
-    if (!peripheralEndpointBuilder) {
-        ACSDK_CRITICAL(LX("addControllersToPeripheralEndpointFailed").m("invalidPeripheralEndpointBuilder"));
-        return false;
-    }
-
-#ifdef POWER_CONTROLLER
-    m_peripheralEndpointPowerHandler =
-        PeripheralEndpointPowerControllerHandler::create(PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID);
-    if (!m_peripheralEndpointPowerHandler) {
-        ACSDK_CRITICAL(LX("Failed to create power controller handler!"));
-        return false;
-    }
-    peripheralEndpointBuilder->withPowerController(m_peripheralEndpointPowerHandler, true, true);
-
-    if (diagnostics) {
-        auto deviceProperties = diagnostics->getDevicePropertyAggregator();
-        if (deviceProperties) {
-            m_peripheralEndpointPowerHandler->addObserver(deviceProperties);
-        }
-    }
-#endif
-
-#ifdef TOGGLE_CONTROLLER
-    m_peripheralEndpointToggleHandler = PeripheralEndpointToggleControllerHandler::create(
-        PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID, PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME);
-    if (!m_peripheralEndpointToggleHandler) {
-        ACSDK_CRITICAL(LX("Failed to create toggle controller handler!"));
-        return false;
-    }
-
-    auto peripheralEndpointToggleControllerAttributes = buildToggleControllerAttributes(
-        {{{FriendlyName::Type::TEXT, PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_FRIENDLY_NAME}}});
-    if (!peripheralEndpointToggleControllerAttributes.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create peripheral endpoint toggle controller attributes!"));
-        return false;
-    }
-
-    peripheralEndpointBuilder->withToggleController(
-        m_peripheralEndpointToggleHandler,
-        PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME,
-        peripheralEndpointToggleControllerAttributes.value(),
-        true,
-        true,
-        false);
-#endif
-
-#ifdef RANGE_CONTROLLER
-    m_peripheralEndpointRangeHandler = PeripheralEndpointRangeControllerHandler::create(
-        PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID, PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME);
-    if (!m_peripheralEndpointRangeHandler) {
-        ACSDK_CRITICAL(LX("Failed to create range controller handler!"));
-        return false;
-    }
-
-    // Enables "raise" and "lower" utterances for the peripheral endpoint by mapping actions to directives.
-    auto raiseActionMapping = capabilitySemantics::ActionsToDirectiveMapping();
-    raiseActionMapping.addAction(SEMANTICS_ACTION_ID_RAISE);
-    raiseActionMapping.setDirective(SETRANGE_DIRECTIVE_NAME, PERIPHERAL_ENDPOINT_RAISE_PAYLOAD);
-
-    auto lowerActionMapping = capabilitySemantics::ActionsToDirectiveMapping();
-    lowerActionMapping.addAction(SEMANTICS_ACTION_ID_LOWER);
-    lowerActionMapping.setDirective(SETRANGE_DIRECTIVE_NAME, PERIPHERAL_ENDPOINT_LOWER_PAYLOAD);
-
-    auto peripheralEndpointRangeSemantics = capabilitySemantics::CapabilitySemantics();
-    peripheralEndpointRangeSemantics.addActionsToDirectiveMapping(raiseActionMapping);
-    peripheralEndpointRangeSemantics.addActionsToDirectiveMapping(lowerActionMapping);
-    if (!peripheralEndpointRangeSemantics.isValid()) {
-        ACSDK_CRITICAL(LX("Failed to create peripheral endpoint semantic annotations!"));
-        return false;
-    }
-
-    auto peripheralEndpointRangeControllerAttributes = buildRangeControllerAttributes(
-        {{{FriendlyName::Type::TEXT, PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_FRIENDLY_NAME}}},
-        {{PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH,
-          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MAXIMUM},
-           {FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_HIGH}}},
-         {PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_MEDIUM,
-          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MEDIUM}}},
-         {PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW,
-          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MINIMUM},
-           {FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_LOW}}}},
-        utils::Optional<capabilitySemantics::CapabilitySemantics>(peripheralEndpointRangeSemantics));
-
-    if (!peripheralEndpointRangeControllerAttributes.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create peripheral endpoint range controller attributes!"));
-        return false;
-    }
-
-    peripheralEndpointBuilder->withRangeController(
-        m_peripheralEndpointRangeHandler,
-        PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME,
-        peripheralEndpointRangeControllerAttributes.value(),
-        true,
-        true,
-        false);
-
-    if (diagnostics) {
-        auto deviceProperties = diagnostics->getDevicePropertyAggregator();
-        if (deviceProperties) {
-            m_peripheralEndpointRangeHandler->addObserver(deviceProperties);
-        }
-    }
-#endif
-
-#ifdef MODE_CONTROLLER
-    m_peripheralEndpointModeHandler = PeripheralEndpointModeControllerHandler::create(
-        PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID, PERIPHERAL_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME);
-    if (!m_peripheralEndpointModeHandler) {
-        ACSDK_CRITICAL(LX("Failed to create mode controller handler!"));
-        return false;
-    }
-
-    auto peripheralEndpointModeControllerAttributes = buildModeControllerAttributes(
-        {{{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_SETTING_MODE},
-          {FriendlyName::Type::TEXT, PERIPHERAL_ENDPOINT_MODE_CONTROLLER_FRIENDLY_NAME}}},
-        {{PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_RED,
-          {{FriendlyName::Type::TEXT, PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_RED}}},
-         {PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_GREEN,
-          {{FriendlyName::Type::TEXT, PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_GREEN}}},
-         {PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_BLUE,
-          {{FriendlyName::Type::TEXT, PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_BLUE}}}});
-
-    if (!peripheralEndpointModeControllerAttributes.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint mode controller attributes!"));
-        return false;
-    }
-
-    peripheralEndpointBuilder->withModeController(
-        m_peripheralEndpointModeHandler,
-        PERIPHERAL_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME,
-        peripheralEndpointModeControllerAttributes.value(),
-        true,
-        true,
-        false);
-#endif
-
-    return true;
-}
-#endif
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
diff --git a/SampleApp/src/SampleApplicationComponent.cpp b/SampleApp/src/SampleApplicationComponent.cpp
deleted file mode 100644
index c8449455be..0000000000
--- a/SampleApp/src/SampleApplicationComponent.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <acsdkCrypto/CryptoFactory.h>
-#include <acsdkManufactory/ComponentAccumulator.h>
-#include <acsdkPkcs11/KeyStoreFactory.h>
-#include <ContextManager/ContextManager.h>
-
-#ifdef ACSDK_ACS_UTILS
-#include <acsdkACSSampleApplicationOptions/ACSSampleApplicationOptionsComponent.h>
-#else
-#include <acsdkSampleApplicationCBLAuthRequester/SampleApplicationCBLAuthRequester.h>
-#include <acsdkDefaultSampleApplicationOptions/DefaultSampleApplicationOptionsComponent.h>
-#endif
-
-#include <AVSCommon/Utils/LibcurlUtils/HttpPost.h>
-#include <RegistrationManager/CustomerDataManagerFactory.h>
-
-#include "SampleApp/LocaleAssetsManager.h"
-#include "SampleApp/SampleApplicationComponent.h"
-#include "SampleApp/UIManager.h"
-
-namespace alexaClientSDK {
-namespace acsdkSampleApplication {
-
-using namespace acsdkManufactory;
-using namespace avsCommon::avs::initialization;
-
-/**
- * @c UIManagerInterface factory that just forwards the instance of UIManager.
- *
- * @param uiManager The @c UIManager instance that will provide the implementation.
- * @return The implementation of @c CBLAuthRequesterInterface to use.
- */
-static std::shared_ptr<acsdkSampleApplicationInterfaces::UIManagerInterface> createUIManagerInterface(
-    const std::shared_ptr<sampleApp::UIManager>& uiManager) {
-    return uiManager;
-}
-
-/**
- * Function that returns a factory to instantiate @c LocaleAssetsManagerInterface.
- *
- * @param requiresShutdownList - The vector of @c RequiresShutdown pointers to which the @c LocaleAssetsManager will be
- * added.
- * @return An std::function to instantiate @c LocaleAssetsManagerInterface.
- */
-static std::function<std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>(
-    const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>&)>
-getCreateLocaleAssetsManagerInterface(
-    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>>& requiresShutdownList) {
-    return
-        [&requiresShutdownList](const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configNode) {
-            auto manager = sampleApp::LocaleAssetsManager::createLocaleAssetsManager(configNode);
-            if (manager) {
-                requiresShutdownList.push_back(manager);
-            }
-            return manager;
-        };
-}
-
-SampleApplicationComponent getComponent(
-    std::unique_ptr<avsCommon::avs::initialization::InitializationParameters> initParams,
-    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>>& requiresShutdownList,
-    const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate,
-    const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder,
-    const std::shared_ptr<avsCommon::utils::logger::Logger>& logger) {
-    return ComponentAccumulator<>()
-        /// This initializes the SDK with the @c InitializationParameters. The factory method is primary,
-        /// meaning it will be called before other factory methods in the manufactory.
-        .addPrimaryFactory(AlexaClientSDKInit::getCreateAlexaClientSDKInit(std::move(initParams)))
-
-    /// The below components specify commonly-changed application options, such as AuthDelegateInterface.
-    /// Applications may want to replace these components with their own to specify custom implementations.
-    /// Applications may also directly pass pre-built custom implementations of AuthDelegateInterface, Logger, or
-    /// MetricRecorderInterface to the SampleApplicationOptionsComponent.
-#ifdef ACSDK_ACS_UTILS
-        .addComponent(acsdkSampleApplication::getSampleApplicationOptionsComponent())
-#else
-        .addComponent(
-            acsdkSampleApplication::getSampleApplicationOptionsComponent(authDelegate, metricRecorder, logger))
-        /// These interfaces are implemented for the Sample App, but applications may want to customize these (e.g. the
-        /// CBLAuthRequesterInterface).
-        .addRetainedFactory(
-            acsdkSampleApplicationCBLAuthRequester::SampleApplicationCBLAuthRequester::createCBLAuthRequesterInterface)
-#endif
-        .addRetainedFactory(getCreateLocaleAssetsManagerInterface(requiresShutdownList))
-        .addRetainedFactory(sampleApp::UIManager::create)
-        .addRetainedFactory(createUIManagerInterface)
-
-        /// These objects are shared by many components in the SDK. Applications are not expected to change these.
-        .addRetainedFactory(avsCommon::utils::DeviceInfo::createFromConfiguration)
-        .addRetainedFactory(avsCommon::utils::configuration::ConfigurationNode::createRoot)
-        .addUniqueFactory(avsCommon::utils::libcurlUtils::HttpPost::createHttpPostInterface)
-        .addRetainedFactory(avsCommon::utils::timing::MultiTimer::createMultiTimer)
-        .addRetainedFactory(contextManager::ContextManager::createContextManagerInterface)
-        .addRetainedFactory(registrationManager::CustomerDataManagerFactory::createCustomerDataManagerInterface)
-#ifdef ENABLE_PKCS11
-        .addRetainedFactory(acsdkPkcs11::createKeyStore)
-#else
-        .addInstance(std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>())
-#endif
-        .addRetainedFactory(acsdkCrypto::createCryptoFactory);
-}
-
-}  // namespace acsdkSampleApplication
-}  // namespace alexaClientSDK
diff --git a/SampleApp/src/SampleEqualizerModeController.cpp b/SampleApp/src/SampleEqualizerModeController.cpp
deleted file mode 100644
index 9ddb960bf6..0000000000
--- a/SampleApp/src/SampleEqualizerModeController.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <memory>
-#include <sstream>
-#include <SampleApp/SampleEqualizerModeController.h>
-
-#include "SampleApp/ConsolePrinter.h"
-
-#include "SampleApp/SampleEqualizerModeController.h"
-
-namespace alexaClientSDK {
-namespace sampleApp {
-
-using namespace alexaClientSDK::acsdkEqualizerInterfaces;
-
-std::shared_ptr<acsdkEqualizerInterfaces::EqualizerModeControllerInterface> SampleEqualizerModeController::
-    createEqualizerModeControllerInterface() {
-    return create();
-}
-
-std::shared_ptr<SampleEqualizerModeController> SampleEqualizerModeController::create() {
-    return std::shared_ptr<SampleEqualizerModeController>(new SampleEqualizerModeController());
-}
-
-bool SampleEqualizerModeController::setEqualizerMode(EqualizerMode mode) {
-    ConsolePrinter::prettyPrint("Equalizer Mode changed to '" + equalizerModeToString(mode) + "'");
-    return true;
-}
-
-}  // namespace sampleApp
-}  // namespace alexaClientSDK
diff --git a/SampleApp/src/main.cpp b/SampleApp/src/main.cpp
deleted file mode 100644
index 9b23bf85b2..0000000000
--- a/SampleApp/src/main.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "SampleApp/ConsoleReader.h"
-#include "SampleApp/SampleApplication.h"
-#include "SampleApp/SampleApplicationReturnCodes.h"
-
-#ifdef DIAGNOSTICS
-#include "SampleApp/SDKDiagnostics.h"
-#endif
-
-#include <cstdlib>
-#include <string>
-
-using namespace alexaClientSDK::sampleApp;
-
-/**
- * Function that evaluates if the SampleApp invocation uses old-style or new-style opt-arg style invocation.
- *
- * @param argc The number of elements in the @c argv array.
- * @param argv An array of @a argc elements, containing the program name and all command-line arguments.
- * @return @c true of the invocation uses optarg style argument @c false otherwise.
- */
-bool usesOptStyleArgs(int argc, char* argv[]) {
-    for (int i = 1; i < argc; i++) {
-        if (!strcmp(argv[i], "-C") || !strcmp(argv[i], "-K") || !strcmp(argv[i], "-L")) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-/**
- * This serves as the starting point for the application. This code instantiates the @c UserInputManager and processes
- * user input until the @c run() function returns.
- *
- * @param argc The number of elements in the @c argv array.
- * @param argv An array of @a argc elements, containing the program name and all command-line arguments.
- * @return @c EXIT_FAILURE if the program failed to initialize correctly, else @c EXIT_SUCCESS.
- */
-int main(int argc, char* argv[]) {
-    std::vector<std::string> configFiles;
-    std::string logLevel;
-
-    if (usesOptStyleArgs(argc, argv)) {
-        for (int i = 1; i < argc; i++) {
-            if (strcmp(argv[i], "-C") == 0) {
-                if (i + 1 == argc) {
-                    ConsolePrinter::simplePrint("No config specified for -C option");
-                    return SampleAppReturnCode::ERROR;
-                }
-                configFiles.push_back(std::string(argv[++i]));
-                ConsolePrinter::simplePrint("configFile " + std::string(argv[i]));
-            } else if (strcmp(argv[i], "-L") == 0) {
-                if (i + 1 == argc) {
-                    ConsolePrinter::simplePrint("No debugLevel specified for -L option");
-                    return SampleAppReturnCode::ERROR;
-                }
-                logLevel = std::string(argv[++i]);
-            } else {
-                ConsolePrinter::simplePrint(
-                    "USAGE: " + std::string(argv[0]) + " -C <config1.json> -C <config2.json> ... -C <configN.json> " +
-                    " -L <log_level>");
-                return SampleAppReturnCode::ERROR;
-            }
-        }
-    } else {
-        if (argc < 2) {
-            ConsolePrinter::simplePrint(
-                "USAGE: " + std::string(argv[0]) + " <path_to_AlexaClientSDKConfig.json> [log_level]");
-            return SampleAppReturnCode::ERROR;
-        }
-        if (3 == argc) {
-            logLevel = std::string(argv[2]);
-        }
-
-        configFiles.push_back(std::string(argv[1]));
-        ConsolePrinter::simplePrint("configFile " + std::string(argv[1]));
-    }
-
-    auto consoleReader = std::make_shared<ConsoleReader>();
-
-    std::unique_ptr<SampleApplication> sampleApplication;
-    SampleAppReturnCode returnCode = SampleAppReturnCode::OK;
-
-#ifdef DIAGNOSTICS
-    std::shared_ptr<SDKDiagnostics> diagnostics = SDKDiagnostics::create();
-    if (!diagnostics) {
-        return SampleAppReturnCode::ERROR;
-    }
-#endif
-
-    do {
-        sampleApplication = SampleApplication::create(
-            consoleReader,
-            configFiles,
-            logLevel
-#ifdef DIAGNOSTICS
-            ,
-            diagnostics
-#endif
-        );
-
-        if (!sampleApplication) {
-            ConsolePrinter::simplePrint("Failed to create SampleApplication!");
-            return SampleAppReturnCode::ERROR;
-        }
-        returnCode = sampleApplication->run();
-        sampleApplication.reset();
-    } while (SampleAppReturnCode::RESTART == returnCode);
-
-    return returnCode;
-}
diff --git a/SampleApplications/CMakeLists.txt b/SampleApplications/CMakeLists.txt
new file mode 100644
index 0000000000..3277bcd513
--- /dev/null
+++ b/SampleApplications/CMakeLists.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+if (INSTALL_COMMON_SAMPLE_LIBS)
+    add_subdirectory("Common")
+else()
+    add_subdirectory("Common" EXCLUDE_FROM_ALL)
+endif()
+
+set(HAS_CONSOLE_SAMPLE_APP_DEPENDENCIES FALSE)
+
+if (PORTAUDIO AND (GSTREAMER_MEDIA_PLAYER OR CUSTOM_MEDIA_PLAYER))
+    set(HAS_CONSOLE_SAMPLE_APP_DEPENDENCIES TRUE)
+elseif (ANDROID_MEDIA_PLAYER AND ANDROID_MICROPHONE)
+    set(HAS_CONSOLE_SAMPLE_APP_DEPENDENCIES TRUE)
+elseif (AUDIO_INJECTION AND (GSTREAMER_MEDIA_PLAYER OR ANDROID_MEDIA_PLAYER OR CUSTOM_MEDIA_PLAYER))
+    set(HAS_CONSOLE_SAMPLE_APP_DEPENDENCIES TRUE)
+endif()
+
+if (HAS_CONSOLE_SAMPLE_APP_DEPENDENCIES)
+    message("ConsoleSampleApplication build enabled.")
+    add_subdirectory("ConsoleSampleApplication" EXCLUDE_FROM_ALL)
+else()
+    message("ConsoleSampleApplication build disabled.")
+    message("\tTo enable ConsoleSampleApplication build please enable microphone and media player modules.")
+endif()
diff --git a/SampleApp/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/CBLAuthDelegate.h b/SampleApplications/Common/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/CBLAuthDelegate.h
similarity index 97%
rename from SampleApp/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/CBLAuthDelegate.h
rename to SampleApplications/Common/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/CBLAuthDelegate.h
index e017fa576b..f238dbb37c 100644
--- a/SampleApp/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/CBLAuthDelegate.h
+++ b/SampleApplications/Common/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/CBLAuthDelegate.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_AUTHORIZATION_CBLAUTHDELEGATE_INCLUDE_CBLAUTHDELEGATE_CBLAUTHDELEGATE_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_AUTHORIZATION_CBLAUTHDELEGATE_INCLUDE_CBLAUTHDELEGATE_CBLAUTHDELEGATE_H_
+#ifndef CBLAUTHDELEGATE_CBLAUTHDELEGATE_H_
+#define CBLAUTHDELEGATE_CBLAUTHDELEGATE_H_
 
 #include <chrono>
 #include <condition_variable>
@@ -43,7 +43,7 @@ namespace cblAuthDelegate {
 /**
  * CBLAuthDelegate provides an implementation of the @c AuthDelegateInterface using the Code-Based Linking
  * authorization process.
- * @see https://developer.amazon.com/docs/alexa/alexa-voice-service/code-based-linking-other-platforms.html
+ * @see https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/authorize-cbl.html
  */
 class CBLAuthDelegate
         : public avsCommon::sdkInterfaces::AuthDelegateInterface
@@ -388,4 +388,4 @@ class CBLAuthDelegate
 }  // namespace authorization
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_AUTHORIZATION_CBLAUTHDELEGATE_INCLUDE_CBLAUTHDELEGATE_CBLAUTHDELEGATE_H_
+#endif  // CBLAUTHDELEGATE_CBLAUTHDELEGATE_H_
diff --git a/SampleApp/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h b/SampleApplications/Common/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h
similarity index 80%
rename from SampleApp/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h
rename to SampleApplications/Common/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h
index b851346be4..e2254a0e94 100644
--- a/SampleApp/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h
+++ b/SampleApplications/Common/Authorization/CBLAuthDelegate/include/CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_AUTHORIZATION_CBLAUTHDELEGATE_INCLUDE_CBLAUTHDELEGATE_SQLITECBLAUTHDELEGATESTORAGE_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_AUTHORIZATION_CBLAUTHDELEGATE_INCLUDE_CBLAUTHDELEGATE_SQLITECBLAUTHDELEGATESTORAGE_H_
+#ifndef CBLAUTHDELEGATE_SQLITECBLAUTHDELEGATESTORAGE_H_
+#define CBLAUTHDELEGATE_SQLITECBLAUTHDELEGATESTORAGE_H_
 
 #include <memory>
 #include <string>
 
 #include <acsdkAuthorizationInterfaces/LWA/LWAAuthorizationStorageInterface.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
 
 #include "CBLAuthDelegate/CBLAuthDelegateStorageInterface.h"
@@ -49,8 +49,8 @@ class SQLiteCBLAuthDelegateStorage : public CBLAuthDelegateStorageInterface {
      */
     static std::shared_ptr<CBLAuthDelegateStorageInterface> createCBLAuthDelegateStorageInterface(
         const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationRoot,
-        const std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
-        const std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>& keyStore);
+        const std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+        const std::shared_ptr<cryptoInterfaces::KeyStoreInterface>& keyStore);
 
     /**
      * Destructor
@@ -82,4 +82,4 @@ class SQLiteCBLAuthDelegateStorage : public CBLAuthDelegateStorageInterface {
 }  // namespace authorization
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_AUTHORIZATION_CBLAUTHDELEGATE_INCLUDE_CBLAUTHDELEGATE_SQLITECBLAUTHDELEGATESTORAGE_H_
+#endif  // CBLAUTHDELEGATE_SQLITECBLAUTHDELEGATESTORAGE_H_
diff --git a/SampleApp/Authorization/CBLAuthDelegate/src/CBLAuthDelegate.cpp b/SampleApplications/Common/Authorization/CBLAuthDelegate/src/CBLAuthDelegate.cpp
similarity index 99%
rename from SampleApp/Authorization/CBLAuthDelegate/src/CBLAuthDelegate.cpp
rename to SampleApplications/Common/Authorization/CBLAuthDelegate/src/CBLAuthDelegate.cpp
index d3add1bd84..bd58d80664 100644
--- a/SampleApp/Authorization/CBLAuthDelegate/src/CBLAuthDelegate.cpp
+++ b/SampleApplications/Common/Authorization/CBLAuthDelegate/src/CBLAuthDelegate.cpp
@@ -46,7 +46,7 @@ using namespace registrationManager;
 using namespace rapidjson;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CBLAuthDelegate");
+#define TAG "CBLAuthDelegate"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/SampleApp/Authorization/CBLAuthDelegate/src/SQLiteCBLAuthDelegateStorage.cpp b/SampleApplications/Common/Authorization/CBLAuthDelegate/src/SQLiteCBLAuthDelegateStorage.cpp
similarity index 93%
rename from SampleApp/Authorization/CBLAuthDelegate/src/SQLiteCBLAuthDelegateStorage.cpp
rename to SampleApplications/Common/Authorization/CBLAuthDelegate/src/SQLiteCBLAuthDelegateStorage.cpp
index f5d128f512..d51a775eee 100644
--- a/SampleApp/Authorization/CBLAuthDelegate/src/SQLiteCBLAuthDelegateStorage.cpp
+++ b/SampleApplications/Common/Authorization/CBLAuthDelegate/src/SQLiteCBLAuthDelegateStorage.cpp
@@ -27,7 +27,7 @@ using namespace acsdkAuthorizationInterfaces;
 using namespace avsCommon::utils::logger;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SQLiteCBLAuthDelegateStorage");
+#define TAG "SQLiteCBLAuthDelegateStorage"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -41,8 +41,8 @@ static const std::string CONFIG_KEY_CBL_AUTH_DELEGATE = "cblAuthDelegate";
 
 std::shared_ptr<CBLAuthDelegateStorageInterface> SQLiteCBLAuthDelegateStorage::createCBLAuthDelegateStorageInterface(
     const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationRoot,
-    const std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
-    const std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>& keyStore) {
+    const std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+    const std::shared_ptr<cryptoInterfaces::KeyStoreInterface>& keyStore) {
     if (!configurationRoot) {
         ACSDK_ERROR(LX("createCBLAuthDelegateStorageInterfaceFailed").d("reason", "nullConfigurationRoot"));
         return nullptr;
diff --git a/SampleApplications/Common/CMakeLists.txt b/SampleApplications/Common/CMakeLists.txt
new file mode 100644
index 0000000000..93ee12817d
--- /dev/null
+++ b/SampleApplications/Common/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+add_subdirectory("Console")
+add_subdirectory("Endpoint")
+add_subdirectory("InteractionManager")
+add_subdirectory("LibSampleApp")
+add_subdirectory("PeripheralEndpoint")
+if (PORTAUDIO)
+    add_subdirectory("PortAudioMicrophoneAdapter")
+endif()
+add_subdirectory("TemplateRuntimePresentationAdaptor")
diff --git a/SampleApplications/Common/Console/CMakeLists.txt b/SampleApplications/Common/Console/CMakeLists.txt
new file mode 100644
index 0000000000..551b856ec8
--- /dev/null
+++ b/SampleApplications/Common/Console/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkSampleConsole LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/SampleApplications/Common/Console/include/acsdk/Sample/Console/ConsolePrinter.h b/SampleApplications/Common/Console/include/acsdk/Sample/Console/ConsolePrinter.h
new file mode 100644
index 0000000000..15d0fde5aa
--- /dev/null
+++ b/SampleApplications/Common/Console/include/acsdk/Sample/Console/ConsolePrinter.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_CONSOLE_CONSOLEPRINTER_H_
+#define ACSDK_SAMPLE_CONSOLE_CONSOLEPRINTER_H_
+
+#include <mutex>
+#include <string>
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Logger/LogStringFormatter.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * A simple class that prints to the screen.
+ */
+class ConsolePrinter : public avsCommon::utils::logger::Logger {
+public:
+    /**
+     * Constructor.
+     *
+     * @deprecated (instances of ConsolePrinter needlessly duplicate ConsoleLogger functionality.)
+     */
+    ConsolePrinter();
+
+    /**
+     * Prints a simple message along with an \n.
+     *
+     * @param stringToPrint The string to print.
+     */
+    static void simplePrint(const std::string& stringToPrint);
+
+    /**
+     * Prints a message with a pretty format with a \n after.
+     *
+     * @param stringToPrint The string to print.
+     */
+    static void prettyPrint(const std::string& stringToPrint);
+
+    /**
+     * Prints a multi-line message with a pretty format with a \n after.
+     *
+     * @param lines The strings to print.
+     */
+    static void prettyPrint(std::initializer_list<std::string> lines);
+
+    /**
+     * Prints a decorated multi-line message with a pretty format with a newline after,
+     * along with an "Alexa Says" header, used for outputting captions.
+     *
+     * @param lines The strings representing captions from Alexa's voice.
+     */
+    static void captionsPrint(const std::vector<std::string>& lines);
+
+    /// @name Logger methods
+    /// @{
+    void emit(
+        avsCommon::utils::logger::Level level,
+        std::chrono::system_clock::time_point time,
+        const char* threadMoniker,
+        const char* text) override;
+    /// @}
+
+private:
+    /**
+     * Holding a shared pointer to the mutex
+     * to make sure the mutex is not already destroyed
+     * when called from global's destructor
+     */
+    std::shared_ptr<std::mutex> m_mutex;
+
+    /**
+     * Object used to format strings for log messages.
+     */
+    avsCommon::utils::logger::LogStringFormatter m_logFormatter;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_CONSOLE_CONSOLEPRINTER_H_
diff --git a/SampleApplications/Common/Console/src/CMakeLists.txt b/SampleApplications/Common/Console/src/CMakeLists.txt
new file mode 100644
index 0000000000..f65f066d85
--- /dev/null
+++ b/SampleApplications/Common/Console/src/CMakeLists.txt
@@ -0,0 +1,14 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkSampleConsole")
+
+add_library(acsdkSampleConsole
+    ConsolePrinter.cpp)
+
+target_include_directories(acsdkSampleConsole PUBLIC
+    "${acsdkSampleConsole_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkSampleConsole
+    AVSCommon
+)
+
+# install target only if sample libraries are installed
+asdk_sample_install()
diff --git a/SampleApplications/Common/Console/src/ConsolePrinter.cpp b/SampleApplications/Common/Console/src/ConsolePrinter.cpp
new file mode 100644
index 0000000000..dd9d67e98e
--- /dev/null
+++ b/SampleApplications/Common/Console/src/ConsolePrinter.cpp
@@ -0,0 +1,127 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/Sample/Console/ConsolePrinter.h"
+
+#include <iostream>
+#include <algorithm>
+#include <cmath>
+
+#include <AVSCommon/Utils/CoutMutex.h>
+
+/**
+ *  When using pretty print, we pad our strings in the beginning and in the end with the margin representation '#'
+ *  and 7 spaces. E.g., if I pass "Hello world!" string, pretty print will look like:
+ *  ############################
+ *  #       Hello world!       #
+ *  ############################
+ */
+static const size_t PADDING_LENGTH = 8;
+
+static const std::string ALEXA_SAYS_HEADING = " Alexa Says ";
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+using namespace avsCommon::utils;
+
+ConsolePrinter::ConsolePrinter() :
+        avsCommon::utils::logger::Logger{avsCommon::utils::logger::Level::UNKNOWN},
+        m_mutex{getCoutMutex()} {
+}
+
+void ConsolePrinter::simplePrint(const std::string& stringToPrint) {
+    auto mutex = getCoutMutex();
+    if (!mutex) {
+        return;
+    }
+
+    std::lock_guard<std::mutex> lock{*mutex};
+    std::cout << stringToPrint << std::endl;
+}
+
+void ConsolePrinter::prettyPrint(std::initializer_list<std::string> lines) {
+    size_t maxLength = 0;
+    for (auto& line : lines) {
+        maxLength = std::max(line.size(), maxLength);
+    }
+
+    const std::string headingBorder(maxLength + (2 * PADDING_LENGTH), '#');
+    std::ostringstream oss;
+    oss << headingBorder << std::endl;
+
+    // Write each line starting and ending with '#'
+    auto padBegin = std::string("#");
+    padBegin.append(PADDING_LENGTH - 1, ' ');
+    for (auto& line : lines) {
+        auto padEnd = std::string("#");
+        padEnd.insert(padEnd.begin(), maxLength - line.size() + (PADDING_LENGTH - 1), ' ');
+        oss << padBegin << line << padEnd << std::endl;
+    }
+
+    oss << headingBorder << std::endl;
+    simplePrint(oss.str());
+}
+
+void ConsolePrinter::captionsPrint(const std::vector<std::string>& lines) {
+    size_t maxLength = 0;
+    for (auto& line : lines) {
+        maxLength = std::max(line.size(), maxLength);
+    }
+
+    // The line length should be even here to allow for alignment of the header string and '#' boundaries
+    if (maxLength % 2 != 0) {
+        maxLength += 1;
+    }
+
+    size_t maxBorderLength = (2 * PADDING_LENGTH) + maxLength;
+    size_t availableLength = (maxBorderLength - ALEXA_SAYS_HEADING.length());
+    size_t headerLength = availableLength / 2 + availableLength % 2;
+
+    const std::string headingBorder(headerLength, '#');
+    std::ostringstream oss;
+    oss << headingBorder << ALEXA_SAYS_HEADING << headingBorder << std::endl;
+
+    // Write each line starting and ending with '#'
+    auto padBegin = std::string("#");
+    padBegin.append(PADDING_LENGTH - 1, ' ');
+    for (auto& line : lines) {
+        auto padEnd = std::string("#");
+        padEnd.insert(padEnd.begin(), maxLength - line.size() + (PADDING_LENGTH - 1), ' ');
+        oss << padBegin << line << padEnd << std::endl;
+    }
+
+    const std::string footingBorder(maxBorderLength, '#');
+    oss << footingBorder << std::endl;
+    simplePrint(oss.str());
+}
+
+void ConsolePrinter::prettyPrint(const std::string& stringToPrint) {
+    prettyPrint({stringToPrint});
+}
+
+void ConsolePrinter::emit(
+    avsCommon::utils::logger::Level level,
+    std::chrono::system_clock::time_point time,
+    const char* threadMoniker,
+    const char* text) {
+    std::lock_guard<std::mutex> lock{*m_mutex};
+    std::cout << m_logFormatter.format(level, time, threadMoniker, text) << std::endl;
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/Endpoint/CMakeLists.txt b/SampleApplications/Common/Endpoint/CMakeLists.txt
new file mode 100644
index 0000000000..27b29a97b7
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkSampleEndpoint LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/SampleApp/include/SampleApp/DefaultEndpoint/DefaultEndpointModeControllerHandler.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointModeControllerHandler.h
similarity index 90%
rename from SampleApp/include/SampleApp/DefaultEndpoint/DefaultEndpointModeControllerHandler.h
rename to SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointModeControllerHandler.h
index 550a7176c0..d48c942714 100644
--- a/SampleApp/include/SampleApp/DefaultEndpoint/DefaultEndpointModeControllerHandler.h
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointModeControllerHandler.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_DEFAULTENDPOINT_DEFAULTENDPOINTMODECONTROLLERHANDLER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_DEFAULTENDPOINT_DEFAULTENDPOINTMODECONTROLLERHANDLER_H_
+#ifndef ACSDK_SAMPLE_ENDPOINT_DEFAULTENDPOINT_DEFAULTENDPOINTMODECONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_ENDPOINT_DEFAULTENDPOINT_DEFAULTENDPOINTMODECONTROLLERHANDLER_H_
 
 #include <list>
 
@@ -22,7 +22,8 @@
 #include <AVSCommon/Utils/Threading/Executor.h>
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 /**
  * An implementation of a @c ModeControllerInterface.
@@ -100,7 +101,8 @@ class DefaultEndpointModeControllerHandler : public avsCommon::sdkInterfaces::mo
     std::list<std::shared_ptr<avsCommon::sdkInterfaces::modeController::ModeControllerObserverInterface>> m_observers;
 };
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_DEFAULTENDPOINT_DEFAULTENDPOINTMODECONTROLLERHANDLER_H_
+#endif  // ACSDK_SAMPLE_ENDPOINT_DEFAULTENDPOINT_DEFAULTENDPOINTMODECONTROLLERHANDLER_H_
diff --git a/SampleApp/include/SampleApp/DefaultEndpoint/DefaultEndpointRangeControllerHandler.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointRangeControllerHandler.h
similarity index 89%
rename from SampleApp/include/SampleApp/DefaultEndpoint/DefaultEndpointRangeControllerHandler.h
rename to SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointRangeControllerHandler.h
index 8cf3d7a99a..61e3f3ecc9 100644
--- a/SampleApp/include/SampleApp/DefaultEndpoint/DefaultEndpointRangeControllerHandler.h
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointRangeControllerHandler.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_DEFAULTENDPOINT_DEFAULTENDPOINTRANGECONTROLLERHANDLER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_DEFAULTENDPOINT_DEFAULTENDPOINTRANGECONTROLLERHANDLER_H_
+#ifndef ACSDK_SAMPLE_ENDPOINT_DEFAULTENDPOINT_DEFAULTENDPOINTRANGECONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_ENDPOINT_DEFAULTENDPOINT_DEFAULTENDPOINTRANGECONTROLLERHANDLER_H_
 
 #include <list>
 
@@ -22,7 +22,8 @@
 #include <AVSCommon/Utils/Threading/Executor.h>
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 /**
  * An implementation of an @c RangeControllerInterface.
@@ -89,7 +90,8 @@ class DefaultEndpointRangeControllerHandler
     std::list<std::shared_ptr<avsCommon::sdkInterfaces::rangeController::RangeControllerObserverInterface>> m_observers;
 };
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_DEFAULTENDPOINT_DEFAULTENDPOINTRANGECONTROLLERHANDLER_H_
+#endif  // ACSDK_SAMPLE_ENDPOINT_DEFAULTENDPOINT_DEFAULTENDPOINTRANGECONTROLLERHANDLER_H_
diff --git a/SampleApp/include/SampleApp/DefaultEndpoint/DefaultEndpointToggleControllerHandler.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointToggleControllerHandler.h
similarity index 87%
rename from SampleApp/include/SampleApp/DefaultEndpoint/DefaultEndpointToggleControllerHandler.h
rename to SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointToggleControllerHandler.h
index 3a00cdc2c3..cd977f6408 100644
--- a/SampleApp/include/SampleApp/DefaultEndpoint/DefaultEndpointToggleControllerHandler.h
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointToggleControllerHandler.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_DEFAULTENDPOINT_DEFAULTENDPOINTTOGGLECONTROLLERHANDLER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_DEFAULTENDPOINT_DEFAULTENDPOINTTOGGLECONTROLLERHANDLER_H_
+#ifndef ACSDK_SAMPLE_ENDPOINT_DEFAULTENDPOINT_DEFAULTENDPOINTTOGGLECONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_ENDPOINT_DEFAULTENDPOINT_DEFAULTENDPOINTTOGGLECONTROLLERHANDLER_H_
 
 #include <list>
 
@@ -22,7 +22,8 @@
 #include <AVSCommon/Utils/Threading/Executor.h>
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 /**
  * Sample implementation of an @c ToggleControllerInterface.
@@ -77,7 +78,8 @@ class DefaultEndpointToggleControllerHandler
         m_observers;
 };
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_DEFAULTENDPOINT_DEFAULTENDPOINTTOGGLECONTROLLERHANDLER_H_
+#endif  // ACSDK_SAMPLE_ENDPOINT_DEFAULTENDPOINT_DEFAULTENDPOINTTOGGLECONTROLLERHANDLER_H_
diff --git a/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaChannelControllerHandler.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaChannelControllerHandler.h
new file mode 100644
index 0000000000..a142c3f9c5
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaChannelControllerHandler.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXACHANNELCONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXACHANNELCONTROLLERHANDLER_H_
+
+#include <memory>
+#include <mutex>
+#include <string>
+#include <vector>
+
+#include <acsdk/AlexaChannelControllerInterfaces/ChannelControllerInterface.h>
+#include <acsdk/Notifier/Notifier.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * Sample implementation of an @c AlexaChannelControllerInterface.
+ */
+
+class EndpointAlexaChannelControllerHandler : public alexaChannelControllerInterfaces::ChannelControllerInterface {
+public:
+    /**
+     * Create a EndpointAlexaChannelControllerHandler object.
+     *
+     * @param endpointName The name of the endpoint.
+     * @return A pointer to a new EndpointAlexaChannelControllerHandler object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<EndpointAlexaChannelControllerHandler> create(std::string endpointName);
+
+    /// @name AlexaChannelControllerInterface methods
+    /// @{
+    alexaChannelControllerInterfaces::ChannelControllerInterface::Response change(
+        std::unique_ptr<alexaChannelControllerTypes::Channel> channel) override;
+    alexaChannelControllerInterfaces::ChannelControllerInterface::Response incrementChannel() override;
+    alexaChannelControllerInterfaces::ChannelControllerInterface::Response decrementChannel() override;
+    std::unique_ptr<alexaChannelControllerTypes::Channel> getCurrentChannel() override;
+    bool addObserver(
+        std::weak_ptr<alexaChannelControllerInterfaces::ChannelControllerObserverInterface> observer) override;
+    void removeObserver(
+        std::weak_ptr<alexaChannelControllerInterfaces::ChannelControllerObserverInterface> observer) override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     * @param endpointName The name of the endpoint the capability is associated.
+     */
+    EndpointAlexaChannelControllerHandler(std::string endpointName);
+
+    /**
+     * Helper function to notify channel change to the observers of @c ChannelControllerInterface.
+     *
+     * @param channel The changed channel to be notified to the observer.
+     */
+    void notifyObservers(std::unique_ptr<alexaChannelControllerTypes::Channel> channel);
+
+    /// The name of the endpoint that this controller is associated.
+    std::string m_endpointName;
+
+    /// Mutex to serialize access to variables.
+    std::mutex m_mutex;
+
+    /// Current channel at the endpoint.
+    std::unique_ptr<alexaChannelControllerTypes::Channel> m_currentChannel;
+
+    /// The notifier of @c ChannelControllerInterface observers.
+    notifier::Notifier<alexaChannelControllerInterfaces::ChannelControllerObserverInterface> m_notifier;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXACHANNELCONTROLLERHANDLER_H_
diff --git a/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaKeypadControllerHandler.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaKeypadControllerHandler.h
new file mode 100644
index 0000000000..6d4580ab3a
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaKeypadControllerHandler.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXAKEYPADCONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXAKEYPADCONTROLLERHANDLER_H_
+
+#include <memory>
+#include <mutex>
+#include <string>
+
+#include <acsdkAlexaKeypadControllerInterfaces/AlexaKeypadControllerInterface.h>
+#include <acsdkAlexaKeypadControllerInterfaces/Keystroke.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * Sample implementation of an @c AlexaKeypadControllerInterface.
+ */
+
+class EndpointAlexaKeypadControllerHandler
+        : public acsdkAlexaKeypadControllerInterfaces::AlexaKeypadControllerInterface {
+public:
+    /**
+     * Create a AlexaKeypadControllerHandler object.
+     *
+     * @param endpointName The name of the endpoint.
+     * @return A pointer to a new @c AlexaKeypadControllerHandler object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<EndpointAlexaKeypadControllerHandler> create(const std::string& endpointName);
+
+    /// @name AlexaKeypadControllerInterface methods
+    /// @{
+    acsdkAlexaKeypadControllerInterfaces::AlexaKeypadControllerInterface::Response handleKeystroke(
+        acsdkAlexaKeypadControllerInterfaces::Keystroke keystroke) override;
+
+    std::set<acsdkAlexaKeypadControllerInterfaces::Keystroke> getSupportedKeys() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     * @param endpointName The name of the endpoint the capability is associated.
+     */
+    EndpointAlexaKeypadControllerHandler(const std::string& endpointName);
+
+    /// Mutex to serialize access to variables.
+    std::mutex m_mutex;
+
+    /// The name of the endpoint that this controller is associated.
+    std::string m_endpointName;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXAKEYPADCONTROLLERHANDLER_H_
diff --git a/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaLauncherHandler.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaLauncherHandler.h
new file mode 100644
index 0000000000..fb63360238
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaLauncherHandler.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXALAUNCHERHANDLER_H_
+#define ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXALAUNCHERHANDLER_H_
+
+#include <list>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+
+#include <acsdkAlexaLauncherInterfaces/AlexaLauncherInterface.h>
+#include <acsdkAlexaLauncherInterfaces/AlexaLauncherObserverInterface.h>
+#include <acsdkAlexaLauncherInterfaces/AlexaLauncherTargetState.h>
+#include <acsdk/Notifier/Notifier.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * Sample implementation of an @c AlexaLauncherInterface.
+ */
+
+class EndpointAlexaLauncherHandler : public acsdkAlexaLauncherInterfaces::AlexaLauncherInterface {
+public:
+    /// Alias for a callback function for launching target.
+    using LaunchHandlerCallback = std::function<void(void)>;
+
+    /**
+     * Create a EndpointAlexaLauncherHandler object.
+     *
+     * @param endpointName The name of the endpoint.
+     * @return A pointer to a new EndpointAlexaLauncherHandler object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<EndpointAlexaLauncherHandler> create(const std::string& endpointName);
+
+    /// @name AlexaLauncherInterface methods
+    /// @{
+    acsdkAlexaLauncherInterfaces::AlexaLauncherInterface::Response launchTarget(
+        const acsdkAlexaLauncherInterfaces::TargetState& targetState) override;
+    acsdkAlexaLauncherInterfaces::TargetState getLauncherTargetState() override;
+    bool addObserver(
+        const std::weak_ptr<acsdkAlexaLauncherInterfaces::AlexaLauncherObserverInterface>& observer) override;
+    void removeObserver(
+        const std::weak_ptr<acsdkAlexaLauncherInterfaces::AlexaLauncherObserverInterface>& observer) override;
+    /// @}
+
+    /**
+     * Registers a callback for a given launch target.
+     * @param targetName Name of the target for this callback.
+     * @param callback Method to call when this target is launched by user.
+     * @return True if successfully registered.
+     */
+    bool registerLaunchTargetCallback(const std::string& targetName, LaunchHandlerCallback callback);
+
+    /**
+     * De-registers a callback for a given launch target.
+     * @param targetName Name of the target for this callback.
+     * @return True if successfully de-registered.
+     */
+    bool deregisterLaunchTargetCallback(const std::string& targetName);
+
+private:
+    /// Alias for Notifier based on @c AlexaLauncherObserverInterface.
+    using AlexaLauncherNotifier = notifier::Notifier<acsdkAlexaLauncherInterfaces::AlexaLauncherObserverInterface>;
+
+    /**
+     * Constructor.
+     * @param endpointName The name of the endpoint the capability is associated.
+     */
+    EndpointAlexaLauncherHandler(const std::string& endpointName);
+
+    /**
+     * Helper function to notify target state change to the observers of @c AlexaLauncherObserverInterface.
+     *
+     * @param targetState The changed target state to be notified to the observer.
+     */
+    void notifyObservers(const acsdkAlexaLauncherInterfaces::TargetState& targetState);
+
+    /**
+     * Notify registered callback that user has requested to launch the specific target.
+     * @param targetName name of the target to be launched.
+     * @return True if this method was successfully able to invoke a registered callback.
+     */
+    bool notifyTargetCallback(const std::string& targetName);
+
+    /// Mutex to serialize access to variables.
+    std::mutex m_mutex;
+
+    /// The name of the endpoint that this controller is associated.
+    std::string m_endpointName;
+
+    /// Current target state of the endpoint.
+    acsdkAlexaLauncherInterfaces::TargetState m_currentTargetState;
+
+    /// A dictionary of all launch target callbacks indexed by the target names.
+    std::unordered_map<std::string, LaunchHandlerCallback> m_launcherCallbacks;
+
+    /// Pointer to the AlexaLauncher notifier.
+    std::shared_ptr<AlexaLauncherNotifier> m_notifier;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXALAUNCHERHANDLER_H_
diff --git a/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaPlaybackControllerHandler.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaPlaybackControllerHandler.h
new file mode 100644
index 0000000000..c59e735097
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaPlaybackControllerHandler.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXAPLAYBACKCONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXAPLAYBACKCONTROLLERHANDLER_H_
+
+#include <memory>
+#include <mutex>
+#include <set>
+#include <string>
+
+#include <acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerInterface.h>
+#include <acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerObserverInterface.h>
+#include <acsdkAlexaPlaybackControllerInterfaces/PlaybackOperation.h>
+#include <acsdk/Notifier/Notifier.h>
+#include <acsdk/Sample/Endpoint/EndpointFocusAdapter.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * Sample implementation of an @c AlexaPlaybackControllerInterface.
+ */
+
+class EndpointAlexaPlaybackControllerHandler
+        : public acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface {
+public:
+    /**
+     * Create a AlexaPlaybackControllerHandler object.
+     *
+     * @param endpointName The name of the endpoint.
+     * @param focusAdapter The @c EndpointFocusAdapter to manage focus.
+     * @return A pointer to a new @c AlexaPlaybackControllerHandler object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<EndpointAlexaPlaybackControllerHandler> create(
+        const std::string& endpointName,
+        std::shared_ptr<EndpointFocusAdapter> focusAdapter);
+
+    /// @name AlexaPlaybackControllerInterface methods
+    /// @{
+    acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response play() override;
+    acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response pause() override;
+    acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response stop() override;
+    acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response startOver() override;
+    acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response previous() override;
+    acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response next() override;
+    acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response rewind() override;
+    acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response fastForward() override;
+    acsdkAlexaPlaybackControllerInterfaces::PlaybackState getPlaybackState() override;
+    bool addObserver(
+        const std::weak_ptr<acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerObserverInterface>& observer)
+        override;
+    void removeObserver(
+        const std::weak_ptr<acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerObserverInterface>& observer)
+        override;
+    std::set<acsdkAlexaPlaybackControllerInterfaces::PlaybackOperation> getSupportedOperations() override;
+    /// @}
+
+private:
+    /// Alias for Notifier based on @c AlexaPlaybackControllerObserverInterface.
+    using AlexaPlaybackControllerNotifier =
+        notifier::Notifier<acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerObserverInterface>;
+
+    /**
+     * Constructor.
+     * @param endpointName The name of the endpoint the capability is associated.
+     * @param focusAdapter The @c EndpointFocusAdapter to manage focus.
+     */
+    EndpointAlexaPlaybackControllerHandler(
+        const std::string& endpointName,
+        std::shared_ptr<EndpointFocusAdapter> focusAdapter);
+
+    /**
+     * Helper function to notify playback state change to the observers of @c PlaybackControllerObserverInterface.
+     *
+     * @param playbackState The changed playback state to be notified to the observer.
+     */
+    void notifyObservers(acsdkAlexaPlaybackControllerInterfaces::PlaybackState playbackState);
+
+    /**
+     * Helper function to log the playback information, for the purpose of verifying playback operations are
+     * received by the handler.
+     *
+     * @param endpointName The name of the endpoint the capability is assoicated.
+     * @param playbackOperation The playback operation @c PlaybackOperation to log.
+     */
+    static void logOperation(const std::string& endpointName, const std::string& playbackOperation);
+
+    /// Mutex to serialize access to variables.
+    std::mutex m_mutex;
+
+    /// The name of the endpoint that this controller is associated.
+    std::string m_endpointName;
+
+    /// Pointer to the AlexaPlaybackController notifier.
+    std::shared_ptr<AlexaPlaybackControllerNotifier> m_notifier;
+
+    /// Current playback state of the endpoint.
+    acsdkAlexaPlaybackControllerInterfaces::PlaybackState m_currentPlaybackState;
+
+    /// The focus adapter
+    std::shared_ptr<EndpointFocusAdapter> m_focusAdapter;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXAPLAYBACKCONTROLLERHANDLER_H_
diff --git a/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaRecordControllerHandler.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaRecordControllerHandler.h
new file mode 100644
index 0000000000..ae3e84e6e8
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaRecordControllerHandler.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXARECORDCONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXARECORDCONTROLLERHANDLER_H_
+
+#include <memory>
+#include <mutex>
+#include <string>
+
+#include <acsdk/AlexaRecordControllerInterfaces/RecordControllerInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * Sample implementation of a @c RecordControllerInterface.
+ */
+
+class EndpointAlexaRecordControllerHandler : public alexaRecordControllerInterfaces::RecordControllerInterface {
+public:
+    /**
+     * Create a @c EndpointAlexaRecordController object.
+     *
+     * @param endpointName The name of the endpoint.
+     * @return A pointer to a new @c EndpointAlexaRecordController object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<EndpointAlexaRecordControllerHandler> create(std::string endpointName);
+
+    /// @name RecordControllerInterface methods
+    /// @{
+    virtual alexaRecordControllerInterfaces::RecordControllerInterface::Response startRecording() override;
+    virtual alexaRecordControllerInterfaces::RecordControllerInterface::Response stopRecording() override;
+    virtual bool isRecording() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     * @param endpointName The name of the endpoint the capability is associated.
+     */
+    EndpointAlexaRecordControllerHandler(std::string endpointName);
+
+    /// Mutex to serialize access to variables.
+    std::mutex m_mutex;
+
+    /// The name of the endpoint that this controller is associated.
+    std::string m_endpointName;
+
+    /// The current recording state
+    bool m_isRecording;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXARECORDCONTROLLERHANDLER_H_
diff --git a/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaRemoteVideoPlayerHandler.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaRemoteVideoPlayerHandler.h
new file mode 100644
index 0000000000..57a1d69819
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaRemoteVideoPlayerHandler.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXAREMOTEVIDEOPLAYERHANDLER_H_
+#define ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXAREMOTEVIDEOPLAYERHANDLER_H_
+
+#include <memory>
+#include <mutex>
+#include <string>
+
+#include <acsdk/AlexaRemoteVideoPlayerInterfaces/RemoteVideoPlayerInterface.h>
+#include <acsdk/Sample/Endpoint/EndpointFocusAdapter.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * Sample implementation of a Remote Video Player.
+ */
+class EndpointAlexaRemoteVideoPlayerHandler : public alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerInterface {
+public:
+    /**
+     * Create an @c EndpointAlexaRemoteVideoPlayerHandler object.
+     *
+     * @param endpointName The name of the endpoint.
+     * @param focusAdapter The @c EndpointFocusAdapter to manage focus.
+     * @return A pointer to a new @c EndpointAlexaRemoteVideoPlayerHandler object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<EndpointAlexaRemoteVideoPlayerHandler> create(
+        std::string endpointName,
+        std::shared_ptr<EndpointFocusAdapter> focusAdapter);
+
+    /// @name RemoteVideoPlayerInterface methods
+    /// @{
+    alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerInterface::Response playVideo(
+        std::unique_ptr<alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerRequest> request) override;
+    alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerInterface::Response displaySearchResults(
+        std::unique_ptr<alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerRequest> request) override;
+    alexaRemoteVideoPlayerInterfaces::Configuration getConfiguration() override;
+    /// @}
+
+    /**
+     * Actions performed when focus has been acquired. No OP in this stub implementation.
+     * Should invoke the video application to either start video playback or display search results.
+     */
+    void onFocusAcquired();
+
+private:
+    /**
+     * Constructor.
+     * @param endpointName The name of the endpoint the capability is associated.
+     * @param focusAdapter The @c EndpointFocusAdapter to manage focus.
+     */
+    EndpointAlexaRemoteVideoPlayerHandler(std::string endpointName, std::shared_ptr<EndpointFocusAdapter> focusAdapter);
+
+    /// Mutex to serialize access to variables.
+    std::mutex m_mutex;
+
+    /// The name of the endpoint that this controller is associated.
+    std::string m_endpointName;
+
+    /// The focus adapter
+    std::shared_ptr<EndpointFocusAdapter> m_focusAdapter;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXAREMOTEVIDEOPLAYERHANDLER_H_
diff --git a/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaSeekControllerHandler.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaSeekControllerHandler.h
new file mode 100644
index 0000000000..ad7551def0
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaSeekControllerHandler.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXASEEKCONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXASEEKCONTROLLERHANDLER_H_
+
+#include <chrono>
+#include <memory>
+#include <mutex>
+#include <string>
+
+#include <acsdkAlexaSeekControllerInterfaces/AlexaSeekControllerInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * Sample implementation of an @c AlexaSeekControllerInterface.
+ */
+
+class EndpointAlexaSeekControllerHandler : public acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface {
+public:
+    /**
+     * Create a EndpointAlexaSeekControllerHandler object.
+     *
+     * @param endpointName The name of the endpoint.
+     * @return A pointer to a new EndpointAlexaSeekControllerHandler object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<EndpointAlexaSeekControllerHandler> create(const std::string& endpointName);
+
+    /// @name AlexaSeekControllerInterface methods
+    /// @{
+    acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface::Response adjustSeekPosition(
+        const std::chrono::milliseconds& deltaPosition) override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     * @param endpointName The name of the endpoint the capability is associated.
+     */
+    EndpointAlexaSeekControllerHandler(const std::string& endpointName);
+
+    /// Mutex to serialize access to variables.
+    std::mutex m_mutex;
+
+    /// The name of the endpoint that this controller is associated.
+    std::string m_endpointName;
+
+    /// The current timestamp position of video or audio content on the device in milliseconds.
+    std::chrono::milliseconds m_currentMediaPosition;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXASEEKCONTROLLERHANDLER_H_
diff --git a/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaVideoRecorderHandler.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaVideoRecorderHandler.h
new file mode 100644
index 0000000000..53adcc8d84
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointAlexaVideoRecorderHandler.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXAVIDEORECORDERHANDLER_H_
+#define ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXAVIDEORECORDERHANDLER_H_
+
+#include "acsdkAlexaVideoRecorderInterfaces/VideoRecorderInterface.h"
+
+#include <memory>
+#include <mutex>
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * Sample implementation of an @c AlexaVideoRecorderInterface.
+ */
+
+class EndpointAlexaVideoRecorderHandler : public acsdkAlexaVideoRecorderInterfaces::VideoRecorderInterface {
+public:
+    /**
+     * Create a EndpointRemoteVideoPlayerHandler object.
+     *
+     * @param endpointName The name of the endpoint.
+     * @return A pointer to a new EndpointRemoteVideoPlayerHandler object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::unique_ptr<EndpointAlexaVideoRecorderHandler> create(const std::string endpointName);
+
+    /// @name VideoRecorderHandlerInterface methods
+    /// @{
+    acsdkAlexaVideoRecorderInterfaces::VideoRecorderInterface::Response searchAndRecord(
+        std::unique_ptr<acsdkAlexaVideoRecorderInterfaces::VideoRecorderRequest> context) override;
+
+    acsdkAlexaVideoRecorderInterfaces::VideoRecorderInterface::Response cancelRecording(
+        std::unique_ptr<acsdkAlexaVideoRecorderInterfaces::VideoRecorderRequest> context) override;
+
+    acsdkAlexaVideoRecorderInterfaces::VideoRecorderInterface::Response deleteRecording(
+        std::unique_ptr<acsdkAlexaVideoRecorderInterfaces::VideoRecorderRequest> context) override;
+
+    bool isExtendedRecordingGUIShown() override;
+
+    int getStorageUsedPercentage() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     * @param endpointName The name of the endpoint the capability is associated.
+     */
+    EndpointAlexaVideoRecorderHandler(const std::string& endpointName);
+
+    /// Mutex to serialize access to variables.
+    std::mutex m_mutex;
+
+    /// The name of the endpoint that this controller is associated.
+    std::string m_endpointName;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_ENDPOINT_ENDPOINTALEXAVIDEORECORDERHANDLER_H_
diff --git a/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointCapabilitiesBuilder.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointCapabilitiesBuilder.h
new file mode 100644
index 0000000000..f66326664b
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointCapabilitiesBuilder.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_ENDPOINT_ENDPOINTCAPABILITIESBUILDER_H_
+#define ACSDK_SAMPLE_ENDPOINT_ENDPOINTCAPABILITIESBUILDER_H_
+
+#include <list>
+#include <memory>
+#include <unordered_set>
+
+#include <acsdk/Sample/Endpoint/EndpointFocusAdapter.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointCapabilitiesBuilderInterface.h>
+
+#include <acsdk/Sample/Endpoint/EndpointAlexaLauncherHandler.h>
+
+#ifdef ALEXA_KEYPAD_CONTROLLER
+#include <acsdk/Sample/Endpoint/EndpointAlexaKeypadControllerHandler.h>
+#endif
+
+#ifdef ALEXA_PLAYBACK_CONTROLLER
+#include <acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerObserverInterface.h>
+#include <acsdk/Sample/Endpoint/EndpointAlexaPlaybackControllerHandler.h>
+#endif
+
+#ifdef ALEXA_SEEK_CONTROLLER
+#include <acsdk/Sample/Endpoint/EndpointAlexaSeekControllerHandler.h>
+#endif
+
+#ifdef ALEXA_VIDEO_RECORDER
+#include <acsdk/Sample/Endpoint/EndpointAlexaVideoRecorderHandler.h>
+#endif
+
+#ifdef ALEXA_CHANNEL_CONTROLLER
+#include <acsdk/Sample/Endpoint/EndpointAlexaChannelControllerHandler.h>
+#endif
+
+#ifdef ALEXA_RECORD_CONTROLLER
+#include <acsdk/Sample/Endpoint/EndpointAlexaRecordControllerHandler.h>
+#endif
+
+#ifdef ALEXA_REMOTE_VIDEO_PLAYER
+#include <acsdk/Sample/Endpoint/EndpointAlexaRemoteVideoPlayerHandler.h>
+#endif
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+/**
+ * An implementation of a @c EndpointCapabilitiesBuilderInterface.
+ */
+class EndpointCapabilitiesBuilder
+        : public alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesBuilderInterface {
+public:
+    /**
+     * Constructor.
+     * @param focusAdapter The @c EndpointFocusAdapter to handle visual and audio focus. Set to nullptr by default.
+     */
+    EndpointCapabilitiesBuilder(std::shared_ptr<EndpointFocusAdapter> focusAdapter = nullptr);
+
+    /// @name @c EndpointCapabilitiesBuilderInterface methods.
+    /// @{
+    std::pair<std::list<Capability>, std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>>
+    buildCapabilities(
+        const alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>&
+            responseSender,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+            exceptionSender) override;
+    /// @}
+
+    /**
+     * Gets the Alexa launcher handler.
+     * @return A shared pointer to the Alexa launcher hanlder.
+     */
+    std::shared_ptr<EndpointAlexaLauncherHandler> getAlexaLauncherHandler() const;
+
+private:
+    /// Mutex to protect concurrent calls to EndpointCapabilitiesBuilder class
+    std::mutex m_buildCapabilitiesMutex;
+
+    /// Flag to check if capabilities have already been built
+    bool m_capabilitiesBuilt;
+
+    /// The @c EndpointFocusAdapter used to manage audio focus.
+    std::shared_ptr<EndpointFocusAdapter> m_focusAdapter;
+
+    /// Handler for Launcher directives
+    std::shared_ptr<EndpointAlexaLauncherHandler> m_launcherHandler;
+
+#ifdef ALEXA_KEYPAD_CONTROLLER
+    /// Handler for Keypad Controller directives
+    std::shared_ptr<EndpointAlexaKeypadControllerHandler> m_keypadControllerHandler;
+#endif
+
+#ifdef ALEXA_PLAYBACK_CONTROLLER
+    /// Handler for Playback Controller directives
+    std::shared_ptr<EndpointAlexaPlaybackControllerHandler> m_playbackControllerHandler;
+#endif
+
+#ifdef ALEXA_SEEK_CONTROLLER
+    /// Handler for Seek Controller directives
+    std::shared_ptr<EndpointAlexaSeekControllerHandler> m_seekControllerHandler;
+#endif
+
+#ifdef ALEXA_VIDEO_RECORDER
+    /// Handler for Video Recorder directives
+    std::shared_ptr<EndpointAlexaVideoRecorderHandler> m_videoRecorderHandler;
+#endif
+
+#ifdef ALEXA_CHANNEL_CONTROLLER
+    /// Handler for Channel Controller directives
+    std::shared_ptr<EndpointAlexaChannelControllerHandler> m_channelControllerHandler;
+#endif
+
+#ifdef ALEXA_RECORD_CONTROLLER
+    /// Handler for Record Controller directives
+    std::shared_ptr<EndpointAlexaRecordControllerHandler> m_recordControllerHandler;
+#endif
+
+#ifdef ALEXA_REMOTE_VIDEO_PLAYER
+    /// Handler for Remote Video Player directives.
+    std::shared_ptr<EndpointAlexaRemoteVideoPlayerHandler> m_remoteVideoPlayerHandler;
+#endif
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_ENDPOINT_ENDPOINTCAPABILITIESBUILDER_H_
diff --git a/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointFocusAdapter.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointFocusAdapter.h
new file mode 100644
index 0000000000..0269254758
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointFocusAdapter.h
@@ -0,0 +1,155 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_ENDPOINT_ENDPOINTFOCUSADAPTER_H_
+#define ACSDK_SAMPLE_ENDPOINT_ENDPOINTFOCUSADAPTER_H_
+
+#include <functional>
+#include <memory>
+#include <string>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <AVSCommon/SDKInterfaces/ChannelObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/FocusManagerInterface.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * Class to handle focus management.
+ */
+class EndpointFocusAdapter
+        : public avsCommon::sdkInterfaces::ChannelObserverInterface
+        , public std::enable_shared_from_this<EndpointFocusAdapter> {
+public:
+    using FocusAcquiredCallback = std::function<void(void)>;
+    /**
+     * Create an @c EndpointFocusAdapter object.
+     *
+     * @param focusManager The @c FocusManager, to handle audio focus.
+     * @param presentationOrchestrator The @c PresentationOrchestrator, to dismiss any existing presentations.
+     * @param presentationOrchestratorStateTracker The @c PresentationOrchestratorStateTracker, to set and release the
+     * interface for visual focus.
+     * @return A pointer to a new @c EndpointFocusAdapter object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<EndpointFocusAdapter> create(
+        std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorInterface> presentationOrchestrator,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>
+            presentationOrchestratorStateTracker);
+
+    /**
+     * Destructor
+     */
+    virtual ~EndpointFocusAdapter() = default;
+
+    /// @name ChannelObserverInterface Functions
+    /// @{
+    void onFocusChanged(avsCommon::avs::FocusState focusState, avsCommon::avs::MixingBehavior behavior) override;
+    /// @}
+
+    /**
+     * Acquire visual and audio focus.
+     *
+     * @param interfaceName The interface requesting focus.
+     * @param callback The function to be invoked when focus is acquired.
+     */
+    void acquireFocus(const std::string& interfaceName, FocusAcquiredCallback callback);
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param focusManager The @c FocusManager, to handle audio focus.
+     * @param presentationOrchestrator The @c PresentationOrchestrator, to dismiss any existing presentations.
+     * @param presentationOrchestratorStateTracker The @c PresentationOrchestratorStateTracker, to set and release the
+     * interface for visual focus.
+     */
+    EndpointFocusAdapter(
+        std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorInterface> presentationOrchestrator,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>
+            presentationOrchestratorStateTracker);
+
+    /**
+     * Utility function to acquire the Content channel for focus management.
+     */
+    void executeAcquireContentChannel();
+
+    /**
+     * Utility function to release the Content channel for focus management.
+     */
+    void executeReleaseContentChannel();
+
+    /**
+     * Utility function to acquire the window.
+     */
+    void executeAcquireWindow();
+
+    /**
+     * Utility function to release the window.
+     */
+    void executeReleaseWindow();
+
+    /**
+     * Struct containing the name of the interface and corresponding callback for acquireFocus requests.
+     */
+    struct FocusAcquireInterfaceAndCallback {
+        /**
+         * Constructor.
+         *
+         * @param interfaceName The name of the interface requesting focus.
+         * @param callback The callback to be invoked when focus is acquired.
+         */
+        FocusAcquireInterfaceAndCallback(std::string interfaceName, FocusAcquiredCallback callback) :
+                interfaceName{std::move(interfaceName)},
+                callback(callback) {
+        }
+
+        /// The interface name for focus requests.
+        std::string interfaceName;
+
+        /// The callback to to be invoked when focus is acquired.
+        FocusAcquiredCallback callback;
+    };
+
+    /// Convenience typedef
+    using FocusAcquireInterfaceAndCallbackPtr = std::shared_ptr<FocusAcquireInterfaceAndCallback>;
+
+    /// The @c FocusManager used to manage audio focus.
+    std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> m_focusManager;
+
+    /// Pointer to the presentation orchestrator.
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorInterface> m_presentationOrchestrator;
+
+    /// Presentation Orchestrator State Tracker.
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>
+        m_presentationOrchestratorStateTracker;
+
+    /// Pointer to the struct storing the information (interface name and callback) about the focus acquire request.
+    FocusAcquireInterfaceAndCallbackPtr m_focusAcquirePtr;
+
+    /// Shared pointer to the executor.
+    std::shared_ptr<avsCommon::utils::threading::Executor> m_executor;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_ENDPOINT_ENDPOINTFOCUSADAPTER_H_
\ No newline at end of file
diff --git a/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointInputControllerHandler.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointInputControllerHandler.h
new file mode 100644
index 0000000000..1e72d1211f
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/EndpointInputControllerHandler.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_SAMPLE_ENDPOINT_ENDPOINTINPUTCONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_ENDPOINT_ENDPOINTINPUTCONTROLLERHANDLER_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <acsdk/AlexaInputControllerInterfaces/InputControllerInterface.h>
+
+#include <acsdk/Notifier/Notifier.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * Sample implementation of an @c InputControllerInterface.
+ */
+class EndpointInputControllerHandler : public alexaInputControllerInterfaces::InputControllerInterface {
+public:
+    /**
+     * Create a InputControllerInterface object.
+     *
+     * @param endpointName The name of the endpoint
+     *
+     * @return A pointer to a new InputControllerHandler object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<EndpointInputControllerHandler> create(const std::string& endpointName);
+
+    /// @name InputControllerInterface methods
+    /// @{
+    SupportedInputs getSupportedInputs() override;
+    InputControllerInterface::Response setInput(alexaInputControllerInterfaces::Input input) override;
+    alexaInputControllerInterfaces::Input getInput() override;
+    bool addObserver(
+        const std::weak_ptr<alexaInputControllerInterfaces::InputControllerObserverInterface> observer) override;
+    void removeObserver(
+        const std::weak_ptr<alexaInputControllerInterfaces::InputControllerObserverInterface> observer) override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     * @param endpointName The name of the endpoint the capability is associated.
+     */
+    EndpointInputControllerHandler(const std::string& endpointName);
+
+    /// Mutex to serialize access to variables.
+    std::mutex m_mutex;
+
+    /// The name of the endpoint that this controller is associated.
+    std::string m_endpointName;
+
+    /// Current input of the endpoint.
+    alexaInputControllerInterfaces::Input m_currentInput;
+
+    /// Inputs supported by the endpoint.
+    alexaInputControllerInterfaces::InputControllerInterface::SupportedInputs m_supportedInputs;
+
+    /// The notifier of @c InputControllerObserverInterface observers.
+    notifier::Notifier<alexaInputControllerInterfaces::InputControllerObserverInterface> m_notifier;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_ENDPOINT_ENDPOINTINPUTCONTROLLERHANDLER_H_
diff --git a/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/InputControllerEndpointCapabilitiesBuilder.h b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/InputControllerEndpointCapabilitiesBuilder.h
new file mode 100644
index 0000000000..5ac128c051
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/include/acsdk/Sample/Endpoint/InputControllerEndpointCapabilitiesBuilder.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_SAMPLE_ENDPOINT_INPUTCONTROLLERENDPOINTCAPABILITIESBUILDER_H_
+#define ACSDK_SAMPLE_ENDPOINT_INPUTCONTROLLERENDPOINTCAPABILITIESBUILDER_H_
+
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointCapabilitiesBuilderInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * An implementation of a @c EndpointCapabilitiesBuilderInterface.
+ */
+class InputControllerEndpointCapabilitiesBuilder
+        : public alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesBuilderInterface {
+public:
+    /**
+     * Constructor.
+     */
+    InputControllerEndpointCapabilitiesBuilder();
+    /// @name @c EndpointCapabilitiesBuilderInterface methods.
+    /// @{
+    std::pair<std::list<Capability>, std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>>
+    buildCapabilities(
+        const alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>&
+            responseSender,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+            exceptionSender) override;
+    /// @}
+private:
+    /// Lock to protect concurrent calls to PeripheralEndpointCapabilitiesBuilder class
+    std::mutex m_buildCapabilitiesMutex;
+    /// Flag to check if capabilities have already been built
+    bool m_capabilitiesBuilt;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_ENDPOINT_INPUTCONTROLLERENDPOINTCAPABILITIESBUILDER_H_
diff --git a/SampleApplications/Common/Endpoint/src/CMakeLists.txt b/SampleApplications/Common/Endpoint/src/CMakeLists.txt
new file mode 100644
index 0000000000..8b2ef6e62f
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/CMakeLists.txt
@@ -0,0 +1,121 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkSampleEndpoint")
+
+set(SampleEndpoint_SOURCES)
+list(APPEND SampleEndpoint_SOURCES
+    EndpointAlexaLauncherHandler.cpp
+    EndpointCapabilitiesBuilder.cpp
+    EndpointFocusAdapter.cpp)
+
+if (VIDEO_CONTROLLERS_ALEXA_KEYPAD_CONTROLLER)
+    list(APPEND SampleEndpoint_SOURCES EndpointAlexaKeypadControllerHandler.cpp)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_PLAYBACK_CONTROLLER)
+    list(APPEND SampleEndpoint_SOURCES EndpointAlexaPlaybackControllerHandler.cpp)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_SEEK_CONTROLLER)
+    list(APPEND SampleEndpoint_SOURCES EndpointAlexaSeekControllerHandler.cpp)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_VIDEO_RECORDER)
+    list(APPEND SampleEndpoint_SOURCES EndpointAlexaVideoRecorderHandler.cpp)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_CHANNEL_CONTROLLER)
+    list(APPEND SampleEndpoint_SOURCES EndpointAlexaChannelControllerHandler.cpp)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_RECORD_CONTROLLER)
+    list(APPEND SampleEndpoint_SOURCES EndpointAlexaRecordControllerHandler.cpp)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_REMOTE_VIDEO_PLAYER)
+    list(APPEND SampleEndpoint_SOURCES EndpointAlexaRemoteVideoPlayerHandler.cpp)
+endif()
+
+if (ENDPOINT_CONTROLLERS_INPUT_CONTROLLER)
+    list(APPEND SampleEndpoint_SOURCES EndpointInputControllerHandler.cpp)
+    list(APPEND SampleEndpoint_SOURCES InputControllerEndpointCapabilitiesBuilder.cpp)
+endif()
+
+if (ENDPOINT_CONTROLLERS_TOGGLE_CONTROLLER)
+    list(APPEND SampleEndpoint_SOURCES DefaultEndpoint/DefaultEndpointToggleControllerHandler.cpp)
+endif()
+
+if (ENDPOINT_CONTROLLERS_RANGE_CONTROLLER)
+    list(APPEND SampleEndpoint_SOURCES DefaultEndpoint/DefaultEndpointRangeControllerHandler.cpp)
+endif()
+
+if (ENDPOINT_CONTROLLERS_MODE_CONTROLLER)
+    list(APPEND SampleEndpoint_SOURCES DefaultEndpoint/DefaultEndpointModeControllerHandler.cpp)
+endif()
+
+add_library(acsdkSampleEndpoint ${SampleEndpoint_SOURCES})
+
+target_include_directories(acsdkSampleEndpoint PUBLIC
+        "${acsdkSampleEndpoint_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkSampleEndpoint
+        AVSCommon
+        acsdkAlexaLauncherInterfaces
+        acsdkNotifier
+        acsdkPresentationOrchestratorInterfaces
+        acsdkPresentationOrchestratorStateTracker
+        acsdkSampleConsole
+)
+
+if (VIDEO_CONTROLLERS_ALEXA_LAUNCHER)
+    target_link_libraries(acsdkSampleEndpoint
+            acsdkAlexaLauncher)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_KEYPAD_CONTROLLER)
+    target_link_libraries(acsdkSampleEndpoint
+            acsdkAlexaKeypadController
+            acsdkAlexaKeypadControllerInterfaces)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_PLAYBACK_CONTROLLER)
+    target_link_libraries(acsdkSampleEndpoint
+            acsdkAlexaPlaybackController
+            acsdkAlexaPlaybackControllerInterfaces)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_SEEK_CONTROLLER)
+    target_link_libraries(acsdkSampleEndpoint
+            acsdkAlexaSeekController
+            acsdkAlexaSeekControllerInterfaces)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_VIDEO_RECORDER)
+    target_link_libraries(acsdkSampleEndpoint
+            acsdkAlexaVideoRecorder
+            acsdkAlexaVideoRecorderInterfaces)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_CHANNEL_CONTROLLER)
+    target_link_libraries(acsdkSampleEndpoint
+            acsdkAlexaChannelController
+            acsdkAlexaChannelControllerInterfaces)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_RECORD_CONTROLLER)
+    target_link_libraries(acsdkSampleEndpoint
+            acsdkAlexaRecordController
+            acsdkAlexaRecordControllerInterfaces)
+endif()
+
+if (VIDEO_CONTROLLERS_ALEXA_REMOTE_VIDEO_PLAYER)
+    target_link_libraries(acsdkSampleEndpoint
+            acsdkAlexaRemoteVideoPlayer
+            acsdkAlexaRemoteVideoPlayerInterfaces
+            )
+endif()
+
+if (ENDPOINT_CONTROLLERS_INPUT_CONTROLLER)
+    target_link_libraries(acsdkSampleEndpoint acsdkAlexaInputController)
+endif()
+
+# install target only if sample libraries are installed
+asdk_sample_install()
diff --git a/SampleApp/src/DefaultEndpoint/DefaultEndpointModeControllerHandler.cpp b/SampleApplications/Common/Endpoint/src/DefaultEndpoint/DefaultEndpointModeControllerHandler.cpp
similarity index 95%
rename from SampleApp/src/DefaultEndpoint/DefaultEndpointModeControllerHandler.cpp
rename to SampleApplications/Common/Endpoint/src/DefaultEndpoint/DefaultEndpointModeControllerHandler.cpp
index b9014bfafd..87c2505cf9 100644
--- a/SampleApp/src/DefaultEndpoint/DefaultEndpointModeControllerHandler.cpp
+++ b/SampleApplications/Common/Endpoint/src/DefaultEndpoint/DefaultEndpointModeControllerHandler.cpp
@@ -15,15 +15,15 @@
 
 #include <algorithm>
 
-#include "SampleApp/ConsolePrinter.h"
-#include "SampleApp/DefaultEndpoint/DefaultEndpointModeControllerHandler.h"
+#include "acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointModeControllerHandler.h"
 
+#include <acsdk/Sample/Console/ConsolePrinter.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
 #include <AVSCommon/Utils/JSON/JSONUtils.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DefaultEndpointModeControllerHandler");
+#define TAG "DefaultEndpointModeControllerHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -33,11 +33,13 @@ static const std::string TAG("DefaultEndpointModeControllerHandler");
 #define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 using namespace avsCommon::avs;
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::sdkInterfaces::modeController;
+using namespace sampleApplications::common;
 
 const std::string DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_FAN_ONLY = "Fan Only";
 
@@ -171,5 +173,6 @@ void DefaultEndpointModeControllerHandler::removeObserver(
     m_observers.remove(observer);
 }
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
diff --git a/SampleApp/src/DefaultEndpoint/DefaultEndpointRangeControllerHandler.cpp b/SampleApplications/Common/Endpoint/src/DefaultEndpoint/DefaultEndpointRangeControllerHandler.cpp
similarity index 95%
rename from SampleApp/src/DefaultEndpoint/DefaultEndpointRangeControllerHandler.cpp
rename to SampleApplications/Common/Endpoint/src/DefaultEndpoint/DefaultEndpointRangeControllerHandler.cpp
index da8439b2e7..269cefeddd 100644
--- a/SampleApp/src/DefaultEndpoint/DefaultEndpointRangeControllerHandler.cpp
+++ b/SampleApplications/Common/Endpoint/src/DefaultEndpoint/DefaultEndpointRangeControllerHandler.cpp
@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-#include "SampleApp/ConsolePrinter.h"
-#include "SampleApp/DefaultEndpoint/DefaultEndpointRangeControllerHandler.h"
+#include "acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointRangeControllerHandler.h"
 
+#include <acsdk/Sample/Console/ConsolePrinter.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
 #include <AVSCommon/Utils/JSON/JSONUtils.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
@@ -30,7 +30,7 @@ static const double MINIMUM_RANGE = 1;
 static const double RANGE_PRECISION = 1;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DefaultEndpointRangeControllerHandler");
+#define TAG "DefaultEndpointRangeControllerHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -40,11 +40,13 @@ static const std::string TAG("DefaultEndpointRangeControllerHandler");
 #define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 using namespace avsCommon::avs;
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::sdkInterfaces::rangeController;
+using namespace sampleApplications::common;
 
 /**
  * Helper function to notify range value change to the observers of @c RangeControllerObserverInterface.
@@ -168,5 +170,6 @@ void DefaultEndpointRangeControllerHandler::removeObserver(
     m_observers.remove(observer);
 }
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
diff --git a/SampleApp/src/DefaultEndpoint/DefaultEndpointToggleControllerHandler.cpp b/SampleApplications/Common/Endpoint/src/DefaultEndpoint/DefaultEndpointToggleControllerHandler.cpp
similarity index 92%
rename from SampleApp/src/DefaultEndpoint/DefaultEndpointToggleControllerHandler.cpp
rename to SampleApplications/Common/Endpoint/src/DefaultEndpoint/DefaultEndpointToggleControllerHandler.cpp
index ba20779255..f797221b62 100644
--- a/SampleApp/src/DefaultEndpoint/DefaultEndpointToggleControllerHandler.cpp
+++ b/SampleApplications/Common/Endpoint/src/DefaultEndpoint/DefaultEndpointToggleControllerHandler.cpp
@@ -13,16 +13,16 @@
  * permissions and limitations under the License.
  */
 
-#include "SampleApp/ConsolePrinter.h"
-#include "SampleApp/DefaultEndpoint/DefaultEndpointToggleControllerHandler.h"
+#include "acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointToggleControllerHandler.h"
 
+#include <acsdk/Sample/Console/ConsolePrinter.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
 #include <AVSCommon/Utils/JSON/JSONUtils.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 //#include <Settings/SettingStringConversion.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DefaultEndpointToggleControllerHandler");
+#define TAG "DefaultEndpointToggleControllerHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -32,11 +32,13 @@ static const std::string TAG("DefaultEndpointToggleControllerHandler");
 #define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 using namespace avsCommon::avs;
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::sdkInterfaces::toggleController;
+using namespace sampleApplications::common;
 
 /**
  * Helper function to notify toggle state change to the observers of @c ToggleControllerObserverInterface.
@@ -119,5 +121,6 @@ void DefaultEndpointToggleControllerHandler::removeObserver(
     m_observers.remove(observer);
 }
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/Endpoint/src/EndpointAlexaChannelControllerHandler.cpp b/SampleApplications/Common/Endpoint/src/EndpointAlexaChannelControllerHandler.cpp
new file mode 100644
index 0000000000..043f09a296
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/EndpointAlexaChannelControllerHandler.cpp
@@ -0,0 +1,180 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/Sample/Endpoint/EndpointAlexaChannelControllerHandler.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+
+/// String to identify log entries originating from this file.
+#define TAG "EndpointAlexaChannelControllerHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+using namespace alexaChannelControllerInterfaces;
+using namespace alexaChannelControllerTypes;
+
+/// The namespace for this capability agent.
+static const char NAMESPACE[] = "Alexa.ChannelController";
+
+/// The supported version
+static const char INTERFACE_VERSION[] = "3";
+
+/// The starting channel number
+static const char INITIAL_CHANNEL_NUMBER[] = "1";
+
+std::shared_ptr<EndpointAlexaChannelControllerHandler> EndpointAlexaChannelControllerHandler::create(
+    std::string endpointName) {
+    auto channelControllerHandler = std::shared_ptr<EndpointAlexaChannelControllerHandler>(
+        new EndpointAlexaChannelControllerHandler(std::move(endpointName)));
+    return channelControllerHandler;
+}
+
+/**
+ * A helper function to generate string out of Channel object.
+ * @param channel Channel related values such as name, callsign, affiliate callsign and uri, name and image.
+ * @return A string object that contains Channel content
+ */
+static std::string generateChannelPrint(const Channel& channel) {
+    std::string channelPayload = " Channel {  Number: " + channel.getNumber() + ", CallSign: " + channel.getCallSign() +
+                                 ", Affiliate CallSign:" + channel.getAffiliateCallSign() +
+                                 ", URI: " + channel.getURI() + +" Channel Metadata { Name: " + channel.getName() +
+                                 ", Image: " + channel.getImageURL() + " } " + " } ";
+    return "{" + channelPayload + " } ";
+}
+
+EndpointAlexaChannelControllerHandler::EndpointAlexaChannelControllerHandler(std::string endpointName) :
+        m_endpointName{std::move(endpointName)},
+        m_currentChannel{Channel::Create(INITIAL_CHANNEL_NUMBER, "", "", "", "", "")} {
+}
+
+ChannelControllerInterface::Response EndpointAlexaChannelControllerHandler::change(std::unique_ptr<Channel> channel) {
+    if (channel == nullptr) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalidChannel"));
+        return ChannelControllerInterface::Response{ChannelControllerInterface::Response::Type::FAILED_INTERNAL_ERROR,
+                                                    "Channel is nullptr"};
+    }
+    std::string channelPayload = generateChannelPrint(*channel);
+    ConsolePrinter::prettyPrint({"API Name: " + std::string(NAMESPACE),
+                                 +"API Version: " + std::string(INTERFACE_VERSION),
+                                 +"ENDPOINT: " + m_endpointName,
+                                 +"Change Channel",
+                                 +"Channel Payload: " + channelPayload});
+    std::unique_lock<std::mutex> lock{m_mutex};
+    m_currentChannel = std::move(channel);
+    std::unique_ptr<Channel> copyOfChannel = Channel::Create(
+        m_currentChannel->getNumber(),
+        m_currentChannel->getCallSign(),
+        m_currentChannel->getAffiliateCallSign(),
+        m_currentChannel->getURI(),
+        m_currentChannel->getName(),
+        m_currentChannel->getImageURL());
+    lock.unlock();
+    notifyObservers(std::move(copyOfChannel));
+
+    return ChannelControllerInterface::Response{};
+}
+
+ChannelControllerInterface::Response EndpointAlexaChannelControllerHandler::incrementChannel() {
+    ConsolePrinter::prettyPrint({"API Name: " + std::string(NAMESPACE),
+                                 +"API Version: " + std::string(INTERFACE_VERSION),
+                                 +"ENDPOINT: " + m_endpointName,
+                                 +"Increment Channel"});
+    std::unique_lock<std::mutex> lock{m_mutex};
+    std::unique_ptr<Channel> copyOfChannel = Channel::Create(
+        m_currentChannel->getNumber(),
+        m_currentChannel->getCallSign(),
+        m_currentChannel->getAffiliateCallSign(),
+        m_currentChannel->getURI(),
+        m_currentChannel->getName(),
+        m_currentChannel->getImageURL());
+    lock.unlock();
+
+    notifyObservers(std::move(copyOfChannel));
+
+    return ChannelControllerInterface::Response{};
+}
+
+ChannelControllerInterface::Response EndpointAlexaChannelControllerHandler::decrementChannel() {
+    ConsolePrinter::prettyPrint({"API Name: " + std::string(NAMESPACE),
+                                 +"API Version: " + std::string(INTERFACE_VERSION),
+                                 +"ENDPOINT: " + m_endpointName,
+                                 +"Decrement Channel"});
+    std::unique_lock<std::mutex> lock{m_mutex};
+    std::unique_ptr<Channel> copyOfChannel = Channel::Create(
+        m_currentChannel->getNumber(),
+        m_currentChannel->getCallSign(),
+        m_currentChannel->getAffiliateCallSign(),
+        m_currentChannel->getURI(),
+        m_currentChannel->getName(),
+        m_currentChannel->getImageURL());
+    lock.unlock();
+
+    notifyObservers(std::move(copyOfChannel));
+
+    return ChannelControllerInterface::Response{};
+}
+
+std::unique_ptr<Channel> EndpointAlexaChannelControllerHandler::getCurrentChannel() {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    return Channel::Create(
+        m_currentChannel->getNumber(),
+        m_currentChannel->getCallSign(),
+        m_currentChannel->getAffiliateCallSign(),
+        m_currentChannel->getURI(),
+        m_currentChannel->getName(),
+        m_currentChannel->getImageURL());
+}
+
+bool EndpointAlexaChannelControllerHandler::addObserver(std::weak_ptr<ChannelControllerObserverInterface> observer) {
+    m_notifier.addWeakPtrObserver(observer);
+    return true;
+}
+
+void EndpointAlexaChannelControllerHandler::removeObserver(std::weak_ptr<ChannelControllerObserverInterface> observer) {
+    m_notifier.removeWeakPtrObserver(observer);
+}
+
+void EndpointAlexaChannelControllerHandler::notifyObservers(std::unique_ptr<Channel> channelState) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (channelState == nullptr) {
+        ACSDK_ERROR(LX(__func__).d("reason:", "channelState is nullptr"));
+        return;
+    }
+    std::shared_ptr<Channel> channel = std::move(channelState);
+    m_notifier.notifyObservers([channel](const std::shared_ptr<ChannelControllerObserverInterface>& observer) {
+        std::unique_ptr<Channel> state = Channel::Create(
+            channel->getNumber(),
+            channel->getCallSign(),
+            channel->getAffiliateCallSign(),
+            channel->getURI(),
+            channel->getName(),
+            channel->getImageURL());
+        observer->onChannelChanged(std::move(state));
+    });
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/Endpoint/src/EndpointAlexaKeypadControllerHandler.cpp b/SampleApplications/Common/Endpoint/src/EndpointAlexaKeypadControllerHandler.cpp
new file mode 100644
index 0000000000..fba1573619
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/EndpointAlexaKeypadControllerHandler.cpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#include "acsdk/Sample/Endpoint/EndpointAlexaKeypadControllerHandler.h"
+
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+
+/// String to identify log entries originating from this file.
+#define TAG "AlexaKeypadControllerHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+using namespace acsdkAlexaKeypadControllerInterfaces;
+
+/// The namespace for this capability agent.
+static const char* const NAMESPACE = "Alexa.KeypadController";
+
+/// The supported version
+static const char* const INTERFACE_VERSION = "3";
+
+std::shared_ptr<EndpointAlexaKeypadControllerHandler> EndpointAlexaKeypadControllerHandler::create(
+    const std::string& endpointName) {
+    auto keypadControllerHandler =
+        std::shared_ptr<EndpointAlexaKeypadControllerHandler>(new EndpointAlexaKeypadControllerHandler(endpointName));
+    return keypadControllerHandler;
+}
+
+EndpointAlexaKeypadControllerHandler::EndpointAlexaKeypadControllerHandler(const std::string& endpointName) :
+        m_endpointName{endpointName} {
+}
+
+AlexaKeypadControllerInterface::Response EndpointAlexaKeypadControllerHandler::handleKeystroke(Keystroke keystroke) {
+    std::unique_lock<std::mutex> lock(m_mutex);
+
+    ConsolePrinter::prettyPrint({"API Name: " + std::string(NAMESPACE),
+                                 +"API Version: " + std::string(INTERFACE_VERSION),
+                                 +"ENDPOINT: " + m_endpointName,
+                                 +"Keystroke: " + keystrokeToString(keystroke)});
+
+    lock.unlock();
+    return AlexaKeypadControllerInterface::Response();
+}
+
+std::set<Keystroke> EndpointAlexaKeypadControllerHandler::getSupportedKeys() {
+    const static std::set<Keystroke> keysSet = {Keystroke::INFO,
+                                                Keystroke::MORE,
+                                                Keystroke::SELECT,
+                                                Keystroke::UP,
+                                                Keystroke::DOWN,
+                                                Keystroke::LEFT,
+                                                Keystroke::RIGHT,
+                                                Keystroke::BACK,
+                                                Keystroke::PAGE_UP,
+                                                Keystroke::PAGE_DOWN,
+                                                Keystroke::PAGE_LEFT,
+                                                Keystroke::PAGE_RIGHT};
+    return keysSet;
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/Endpoint/src/EndpointAlexaLauncherHandler.cpp b/SampleApplications/Common/Endpoint/src/EndpointAlexaLauncherHandler.cpp
new file mode 100644
index 0000000000..0e32be61f1
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/EndpointAlexaLauncherHandler.cpp
@@ -0,0 +1,160 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/Sample/Endpoint/EndpointAlexaLauncherHandler.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+
+/// String to identify log entries originating from this file.
+#define TAG "EndpointAlexaLauncherHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+using namespace acsdkAlexaLauncherInterfaces;
+
+/// The namespace for this capability agent.
+static const char* const NAMESPACE = "Alexa.Launcher";
+
+/// The supported version
+static const char* const INTERFACE_VERSION = "3";
+
+std::shared_ptr<EndpointAlexaLauncherHandler> EndpointAlexaLauncherHandler::create(const std::string& endpointName) {
+    auto launcherHandler =
+        std::shared_ptr<EndpointAlexaLauncherHandler>(new EndpointAlexaLauncherHandler(endpointName));
+    return launcherHandler;
+}
+
+EndpointAlexaLauncherHandler::EndpointAlexaLauncherHandler(const std::string& endpointName) :
+        m_endpointName{endpointName} {
+    m_notifier = std::make_shared<AlexaLauncherNotifier>();
+}
+
+/**
+ * A helper function to generate string out of Target object.
+ * @param target This struct holds target related values such as identifier, name.
+ * @return A string object that contains Target content
+ */
+static std::string generateTargetPrint(const acsdkAlexaLauncherInterfaces::TargetState& targetState) {
+    std::string targetPayload =
+        " LaunchTarget {  identifier: " + targetState.identifier + "," + " name: " + targetState.name + " } ";
+    return "{" + targetPayload + " } ";
+}
+
+AlexaLauncherInterface::Response EndpointAlexaLauncherHandler::launchTarget(
+    const acsdkAlexaLauncherInterfaces::TargetState& targetState) {
+    std::string payload = generateTargetPrint(targetState);
+    ConsolePrinter::prettyPrint({"API Name: " + std::string(NAMESPACE),
+                                 +"API Version: " + std::string(INTERFACE_VERSION),
+                                 +"ENDPOINT: " + m_endpointName,
+                                 +"Launch Target PAYLOAD: " + payload});
+    AlexaLauncherInterface::Response response;
+    bool retVal = notifyTargetCallback(targetState.name);
+
+    if (retVal) {
+        std::unique_lock<std::mutex> lock(m_mutex);
+        m_currentTargetState = targetState;
+        lock.unlock();
+
+        notifyObservers(targetState);
+        response = {AlexaLauncherInterface::Response::Type::SUCCESS, ""};
+    } else {
+        response = {AlexaLauncherInterface::Response::Type::NOT_SUPPORTED_IN_CURRENT_MODE,
+                    "Unable to launch the target specified."};
+    }
+
+    return response;
+}
+
+acsdkAlexaLauncherInterfaces::TargetState EndpointAlexaLauncherHandler::getLauncherTargetState() {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    ACSDK_DEBUG5(LX(__func__));
+
+    return m_currentTargetState;
+}
+
+bool EndpointAlexaLauncherHandler::addObserver(
+    const std::weak_ptr<acsdkAlexaLauncherInterfaces::AlexaLauncherObserverInterface>& observer) {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    m_notifier->addWeakPtrObserver(observer);
+    ACSDK_DEBUG5(LX(__func__));
+    return true;
+}
+
+void EndpointAlexaLauncherHandler::removeObserver(
+    const std::weak_ptr<acsdkAlexaLauncherInterfaces::AlexaLauncherObserverInterface>& observer) {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    m_notifier->removeWeakPtrObserver(observer);
+}
+
+bool EndpointAlexaLauncherHandler::registerLaunchTargetCallback(
+    const std::string& targetName,
+    LaunchHandlerCallback callback) {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    auto it = m_launcherCallbacks.find(targetName);
+    if (it != m_launcherCallbacks.end()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "target already registered."));
+        return false;
+    }
+
+    m_launcherCallbacks.emplace(targetName, callback);
+    return true;
+}
+
+bool EndpointAlexaLauncherHandler::deregisterLaunchTargetCallback(const std::string& targetName) {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    auto it = m_launcherCallbacks.find(targetName);
+    if (it == m_launcherCallbacks.end()) {
+        ACSDK_DEBUG5(LX(__func__).d("reason", "No callback registered for this target."));
+        return false;
+    }
+
+    m_launcherCallbacks.erase(it);
+    return true;
+}
+
+bool EndpointAlexaLauncherHandler::notifyTargetCallback(const std::string& targetName) {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    auto it = m_launcherCallbacks.find(targetName);
+    if (it == m_launcherCallbacks.end()) {
+        ACSDK_DEBUG5(LX(__func__).d("reason", "No callback registered for this target."));
+        return false;
+    }
+
+    it->second();
+    return true;
+}
+
+void EndpointAlexaLauncherHandler::notifyObservers(const acsdkAlexaLauncherInterfaces::TargetState& targetState) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_notifier->notifyObservers([targetState](const std::shared_ptr<AlexaLauncherObserverInterface>& observer) {
+        if (observer) {
+            observer->onLauncherTargetChanged(targetState);
+        }
+    });
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/Endpoint/src/EndpointAlexaPlaybackControllerHandler.cpp b/SampleApplications/Common/Endpoint/src/EndpointAlexaPlaybackControllerHandler.cpp
new file mode 100644
index 0000000000..617c2dee5d
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/EndpointAlexaPlaybackControllerHandler.cpp
@@ -0,0 +1,194 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#include "acsdk/Sample/Endpoint/EndpointAlexaPlaybackControllerHandler.h"
+
+#include <set>
+
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/// String to identify log entries originating from this file.
+#define TAG "EndpointAlexaPlaybackControllerHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+using namespace acsdkAlexaPlaybackControllerInterfaces;
+
+/// The namespace for this capability agent.
+static const char* const NAMESPACE = "Alexa.PlaybackController";
+
+/// The supported version
+static const char* const INTERFACE_VERSION = "3";
+
+void EndpointAlexaPlaybackControllerHandler::logOperation(
+    const std::string& endpointName,
+    const std::string& playbackOperation) {
+    static const std::string apiNameString("API Name: " + std::string(NAMESPACE));
+    static const std::string apiVersionString("API Version: " + std::string(INTERFACE_VERSION));
+    std::string endpointNameString("Endpoint: " + endpointName);
+    std::string playbackOperationString("Playback Operation: " + playbackOperation);
+
+    ConsolePrinter::prettyPrint({apiNameString, apiVersionString, endpointNameString, playbackOperationString});
+}
+
+std::shared_ptr<EndpointAlexaPlaybackControllerHandler> EndpointAlexaPlaybackControllerHandler::create(
+    const std::string& endpointName,
+    std::shared_ptr<EndpointFocusAdapter> focusAdapter) {
+    if (!focusAdapter) {
+        ACSDK_WARN(LX(__func__).m("NULL Focus Adapter"));
+    }
+    auto playbackControllerHandler = std::shared_ptr<EndpointAlexaPlaybackControllerHandler>(
+        new EndpointAlexaPlaybackControllerHandler(endpointName, std::move(focusAdapter)));
+    return playbackControllerHandler;
+}
+
+EndpointAlexaPlaybackControllerHandler::EndpointAlexaPlaybackControllerHandler(
+    const std::string& endpointName,
+    std::shared_ptr<EndpointFocusAdapter> focusAdapter) :
+        m_endpointName{endpointName},
+        m_currentPlaybackState{PlaybackState::STOPPED},
+        m_focusAdapter{std::move(focusAdapter)} {
+    m_notifier = std::make_shared<AlexaPlaybackControllerNotifier>();
+}
+
+AlexaPlaybackControllerInterface::Response EndpointAlexaPlaybackControllerHandler::play() {
+    {
+        std::unique_lock<std::mutex> lock(m_mutex);
+        m_currentPlaybackState = PlaybackState::PLAYING;
+    }
+
+    // Play the current media
+    logOperation(m_endpointName, "PLAY");
+
+    notifyObservers(m_currentPlaybackState);
+
+    return AlexaPlaybackControllerInterface::Response{AlexaPlaybackControllerInterface::Response::Type::SUCCESS, ""};
+}
+
+AlexaPlaybackControllerInterface::Response EndpointAlexaPlaybackControllerHandler::pause() {
+    {
+        std::unique_lock<std::mutex> lock(m_mutex);
+        m_currentPlaybackState = PlaybackState::PAUSED;
+    }
+
+    // Pause the current media
+    logOperation(m_endpointName, "PAUSE");
+
+    notifyObservers(m_currentPlaybackState);
+
+    return AlexaPlaybackControllerInterface::Response{AlexaPlaybackControllerInterface::Response::Type::SUCCESS, ""};
+}
+
+AlexaPlaybackControllerInterface::Response EndpointAlexaPlaybackControllerHandler::stop() {
+    {
+        std::unique_lock<std::mutex> lock(m_mutex);
+        m_currentPlaybackState = PlaybackState::STOPPED;
+    }
+
+    // Stop the current media
+    logOperation(m_endpointName, "STOP");
+
+    notifyObservers(m_currentPlaybackState);
+
+    return AlexaPlaybackControllerInterface::Response{AlexaPlaybackControllerInterface::Response::Type::SUCCESS, ""};
+}
+
+AlexaPlaybackControllerInterface::Response EndpointAlexaPlaybackControllerHandler::startOver() {
+    // Restart the current media
+    logOperation(m_endpointName, "START_OVER");
+
+    return AlexaPlaybackControllerInterface::Response{AlexaPlaybackControllerInterface::Response::Type::SUCCESS, ""};
+}
+
+AlexaPlaybackControllerInterface::Response EndpointAlexaPlaybackControllerHandler::previous() {
+    // Go to the previous media
+    logOperation(m_endpointName, "PREVIOUS");
+
+    return AlexaPlaybackControllerInterface::Response{AlexaPlaybackControllerInterface::Response::Type::SUCCESS, ""};
+}
+
+AlexaPlaybackControllerInterface::Response EndpointAlexaPlaybackControllerHandler::next() {
+    // Go to the next media
+    logOperation(m_endpointName, "NEXT");
+
+    return AlexaPlaybackControllerInterface::Response{AlexaPlaybackControllerInterface::Response::Type::SUCCESS, ""};
+}
+
+AlexaPlaybackControllerInterface::Response EndpointAlexaPlaybackControllerHandler::rewind() {
+    // Rewind the current media
+    logOperation(m_endpointName, "REWIND");
+
+    return AlexaPlaybackControllerInterface::Response{AlexaPlaybackControllerInterface::Response::Type::SUCCESS, ""};
+}
+
+AlexaPlaybackControllerInterface::Response EndpointAlexaPlaybackControllerHandler::fastForward() {
+    // Fast forward the current media
+    logOperation(m_endpointName, "FAST_FORWARD");
+
+    return AlexaPlaybackControllerInterface::Response{AlexaPlaybackControllerInterface::Response::Type::SUCCESS, ""};
+}
+
+PlaybackState EndpointAlexaPlaybackControllerHandler::getPlaybackState() {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    return m_currentPlaybackState;
+}
+
+bool EndpointAlexaPlaybackControllerHandler::addObserver(
+    const std::weak_ptr<AlexaPlaybackControllerObserverInterface>& observer) {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    m_notifier->addWeakPtrObserver(observer);
+    return true;
+}
+
+void EndpointAlexaPlaybackControllerHandler::removeObserver(
+    const std::weak_ptr<AlexaPlaybackControllerObserverInterface>& observer) {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    m_notifier->removeWeakPtrObserver(observer);
+}
+
+void EndpointAlexaPlaybackControllerHandler::notifyObservers(PlaybackState playbackState) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_notifier->notifyObservers(
+        [playbackState](const std::shared_ptr<AlexaPlaybackControllerObserverInterface>& observer) {
+            if (observer) {
+                observer->onPlaybackStateChanged(playbackState);
+            }
+        });
+}
+
+std::set<PlaybackOperation> EndpointAlexaPlaybackControllerHandler::getSupportedOperations() {
+    static const std::set<PlaybackOperation> playbackOperations = {PlaybackOperation::PLAY,
+                                                                   PlaybackOperation::PAUSE,
+                                                                   PlaybackOperation::STOP,
+                                                                   PlaybackOperation::START_OVER,
+                                                                   PlaybackOperation::PREVIOUS,
+                                                                   PlaybackOperation::NEXT,
+                                                                   PlaybackOperation::REWIND,
+                                                                   PlaybackOperation::FAST_FORWARD};
+    return playbackOperations;
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/Endpoint/src/EndpointAlexaRecordControllerHandler.cpp b/SampleApplications/Common/Endpoint/src/EndpointAlexaRecordControllerHandler.cpp
new file mode 100644
index 0000000000..7f91e80df6
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/EndpointAlexaRecordControllerHandler.cpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/Sample/Endpoint/EndpointAlexaRecordControllerHandler.h"
+
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+
+/// String to identify log entries originating from this file.
+#define TAG "EndpointAlexaRecordControllerHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+using namespace alexaRecordControllerInterfaces;
+
+/// The namespace for this capability agent.
+static const char NAMESPACE[] = "Alexa.RecordController";
+
+/// The supported version
+static const char INTERFACE_VERSION[] = "3";
+
+std::shared_ptr<EndpointAlexaRecordControllerHandler> EndpointAlexaRecordControllerHandler::create(
+    std::string endpointName) {
+    return std::shared_ptr<EndpointAlexaRecordControllerHandler>(
+        new EndpointAlexaRecordControllerHandler(std::move(endpointName)));
+}
+
+EndpointAlexaRecordControllerHandler::EndpointAlexaRecordControllerHandler(std::string endpointName) :
+        m_endpointName{std::move(endpointName)},
+        m_isRecording{false} {
+}
+
+RecordControllerInterface::Response EndpointAlexaRecordControllerHandler::startRecording() {
+    ConsolePrinter::prettyPrint({"API Name: " + std::string(NAMESPACE),
+                                 +"API Version: " + std::string(INTERFACE_VERSION),
+                                 +"ENDPOINT: " + m_endpointName,
+                                 +"Start Recording"});
+    {
+        std::lock_guard<std::mutex> lock{m_mutex};
+        m_isRecording = true;
+    }
+    return RecordControllerInterface::Response{};
+}
+
+RecordControllerInterface::Response EndpointAlexaRecordControllerHandler::stopRecording() {
+    ConsolePrinter::prettyPrint({"API Name: " + std::string(NAMESPACE),
+                                 +"API Version: " + std::string(INTERFACE_VERSION),
+                                 +"ENDPOINT: " + m_endpointName,
+                                 +"Stop Recording"});
+    {
+        std::lock_guard<std::mutex> lock{m_mutex};
+        m_isRecording = false;
+    }
+    return RecordControllerInterface::Response{};
+}
+
+bool EndpointAlexaRecordControllerHandler::isRecording() {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    return m_isRecording;
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/Endpoint/src/EndpointAlexaRemoteVideoPlayerHandler.cpp b/SampleApplications/Common/Endpoint/src/EndpointAlexaRemoteVideoPlayerHandler.cpp
new file mode 100644
index 0000000000..63ff5dac3f
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/EndpointAlexaRemoteVideoPlayerHandler.cpp
@@ -0,0 +1,122 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/Sample/Endpoint/EndpointAlexaRemoteVideoPlayerHandler.h"
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/// String to identify log entries originating from this file.
+#define TAG "EndpointRemoteVideoPlayerHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+using namespace alexaRemoteVideoPlayerInterfaces;
+using namespace acsdkAlexaVideoCommon;
+using namespace presentationOrchestratorInterfaces;
+using namespace avsCommon::sdkInterfaces;
+
+/// The supported version
+static const char* const INTERFACE_VERSION = "3";
+
+/// Interface name for Alexa.RemoteVideoPlayer requests.
+static const char ALEXA_REMOTE_VIDEO_PLAYER_INTERFACE_NAME[] = "Alexa.RemoteVideoPlayer";
+
+std::shared_ptr<EndpointAlexaRemoteVideoPlayerHandler> EndpointAlexaRemoteVideoPlayerHandler::create(
+    std::string endpointName,
+    std::shared_ptr<EndpointFocusAdapter> focusAdapter) {
+    if (!focusAdapter) {
+        ACSDK_WARN(LX(__func__).m("NULL Focus Adapter"));
+    }
+    auto remoteVideoPlayerHandler = std::shared_ptr<EndpointAlexaRemoteVideoPlayerHandler>(
+        new EndpointAlexaRemoteVideoPlayerHandler(std::move(endpointName), std::move(focusAdapter)));
+    return remoteVideoPlayerHandler;
+}
+
+EndpointAlexaRemoteVideoPlayerHandler::EndpointAlexaRemoteVideoPlayerHandler(
+    std::string endpointName,
+    std::shared_ptr<EndpointFocusAdapter> focusAdapter) :
+        m_endpointName{std::move(endpointName)},
+        m_focusAdapter{std::move(focusAdapter)} {
+}
+
+RemoteVideoPlayerInterface::Response EndpointAlexaRemoteVideoPlayerHandler::playVideo(
+    std::unique_ptr<RemoteVideoPlayerRequest> request) {
+    std::string queryPayload = request->searchTextTranscribed.valueOr("[Unable to transcribe Search Query]");
+    ConsolePrinter::prettyPrint({"API Name: " + std::string(ALEXA_REMOTE_VIDEO_PLAYER_INTERFACE_NAME),
+                                 +"API Version: " + std::string(INTERFACE_VERSION),
+                                 +"ENDPOINT: " + m_endpointName,
+                                 +"Play Video Query:" + queryPayload});
+    std::unique_lock<std::mutex> lock(m_mutex);
+    if (m_focusAdapter) {
+        m_focusAdapter->acquireFocus(ALEXA_REMOTE_VIDEO_PLAYER_INTERFACE_NAME, [this]() { onFocusAcquired(); });
+    }
+    lock.unlock();
+    return RemoteVideoPlayerInterface::Response();
+}
+
+RemoteVideoPlayerInterface::Response EndpointAlexaRemoteVideoPlayerHandler::displaySearchResults(
+    std::unique_ptr<RemoteVideoPlayerRequest> request) {
+    std::string queryPayload = request->searchTextTranscribed.valueOr("[Unable to transcribe Search Query]");
+    ConsolePrinter::prettyPrint({"API Name: " + std::string(ALEXA_REMOTE_VIDEO_PLAYER_INTERFACE_NAME),
+                                 +"API Version: " + std::string(INTERFACE_VERSION),
+                                 +"ENDPOINT: " + m_endpointName,
+                                 +"Display Search Results Query:" + queryPayload});
+    std::unique_lock<std::mutex> lock(m_mutex);
+    if (m_focusAdapter) {
+        m_focusAdapter->acquireFocus(ALEXA_REMOTE_VIDEO_PLAYER_INTERFACE_NAME, [this]() { onFocusAcquired(); });
+    }
+    lock.unlock();
+    return RemoteVideoPlayerInterface::Response();
+}
+
+Configuration EndpointAlexaRemoteVideoPlayerHandler::getConfiguration() {
+    const static std::set<Configuration::SupportedOperations> directives{
+        Configuration::SupportedOperations::PLAY_VIDEO, Configuration::SupportedOperations::DISPLAY_SEARCH_RESULTS};
+
+    const static std::set<acsdkAlexaVideoCommon::VideoEntity::EntityType> entityTypes{
+        VideoEntity::EntityType::MEDIA_TYPE,
+        VideoEntity::EntityType::ACTOR,
+        VideoEntity::EntityType::CHARACTER,
+        VideoEntity::EntityType::EVENT,
+        VideoEntity::EntityType::FRANCHISE,
+        VideoEntity::EntityType::GENRE,
+        VideoEntity::EntityType::LEAGUE,
+        VideoEntity::EntityType::SEASON,
+        VideoEntity::EntityType::EPISODE,
+        VideoEntity::EntityType::SPORT,
+        VideoEntity::EntityType::SPORTS_TEAM,
+        VideoEntity::EntityType::VIDEO};
+
+    const static std::list<Configuration::Catalog> catalog{Configuration::Catalog()};
+
+    return Configuration(directives, entityTypes, catalog);
+}
+
+void EndpointAlexaRemoteVideoPlayerHandler::onFocusAcquired() {
+    ACSDK_DEBUG9(LX(__func__));
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/Endpoint/src/EndpointAlexaSeekControllerHandler.cpp b/SampleApplications/Common/Endpoint/src/EndpointAlexaSeekControllerHandler.cpp
new file mode 100644
index 0000000000..f1a80e9258
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/EndpointAlexaSeekControllerHandler.cpp
@@ -0,0 +1,98 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+#include "acsdk/Sample/Endpoint/EndpointAlexaSeekControllerHandler.h"
+
+/// String to identify log entries originating from this file.
+#define TAG "EndpointAlexaSeekControllerHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+using namespace acsdkAlexaSeekControllerInterfaces;
+
+/// The namespace for this capability agent.
+static const char* const NAMESPACE = "Alexa.SeekController";
+
+/// The supported version
+static const char* const INTERFACE_VERSION = "3";
+
+/// The maximum timestamp of the current video or audio content in seconds
+static const std::chrono::seconds MAX_MEDIA_POSITION_SECONDS{600};
+
+std::shared_ptr<EndpointAlexaSeekControllerHandler> EndpointAlexaSeekControllerHandler::create(
+    const std::string& endpointName) {
+    auto seekControllerHandler =
+        std::shared_ptr<EndpointAlexaSeekControllerHandler>(new EndpointAlexaSeekControllerHandler(endpointName));
+    return seekControllerHandler;
+}
+
+EndpointAlexaSeekControllerHandler::EndpointAlexaSeekControllerHandler(const std::string& endpointName) :
+        m_endpointName{endpointName},
+        m_currentMediaPosition{0} {
+}
+
+/**
+ * Helper function to log the seek information, for the purpose of verifying seek operations are
+ * received by the handler.
+ *
+ * @param endpointName The name of the endpoint the capability is assoicated.
+ * @param deltaPosition The delta value to seek the current audio or video content in milliseconds.
+ */
+static void logOperation(const std::string& endpointName, const std::chrono::milliseconds& deltaPosition) {
+    static const std::string apiNameString("API Name: " + std::string(NAMESPACE));
+    static const std::string apiVersionString("API Version: " + std::string(INTERFACE_VERSION));
+    std::string endpointNameString("Endpoint: " + endpointName);
+    std::string deltaPositionString("DeltaPositionInMilliseconds: " + std::to_string(deltaPosition.count()));
+
+    ConsolePrinter::prettyPrint({apiNameString, apiVersionString, endpointNameString, deltaPositionString});
+}
+
+acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface::Response EndpointAlexaSeekControllerHandler::
+    adjustSeekPosition(const std::chrono::milliseconds& deltaPosition) {
+    logOperation(m_endpointName, deltaPosition);
+
+    std::chrono::milliseconds newMediaPosition;
+    {
+        std::lock_guard<std::mutex> lock{m_mutex};
+
+        newMediaPosition = m_currentMediaPosition;
+        std::chrono::milliseconds maxMediaPosition = MAX_MEDIA_POSITION_SECONDS;
+        newMediaPosition += deltaPosition;
+
+        if (newMediaPosition < std::chrono::milliseconds::zero()) {
+            newMediaPosition = std::chrono::milliseconds::zero();
+        } else if (newMediaPosition > maxMediaPosition) {
+            newMediaPosition = maxMediaPosition;
+        }
+
+        m_currentMediaPosition = newMediaPosition;
+    }
+
+    return AlexaSeekControllerInterface::Response{newMediaPosition};
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/Endpoint/src/EndpointAlexaVideoRecorderHandler.cpp b/SampleApplications/Common/Endpoint/src/EndpointAlexaVideoRecorderHandler.cpp
new file mode 100644
index 0000000000..7b5401cb5d
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/EndpointAlexaVideoRecorderHandler.cpp
@@ -0,0 +1,98 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#include "acsdk/Sample/Endpoint/EndpointAlexaVideoRecorderHandler.h"
+
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/// String to identify log entries originating from this file.
+#define TAG "EndpointAlexaVideoRecorderHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+using namespace avsCommon::utils;
+using namespace acsdkAlexaVideoRecorderInterfaces;
+
+std::unique_ptr<EndpointAlexaVideoRecorderHandler> EndpointAlexaVideoRecorderHandler::create(
+    const std::string endpointName) {
+    auto videoRecorderHandler = std::unique_ptr<EndpointAlexaVideoRecorderHandler>(
+        new EndpointAlexaVideoRecorderHandler(std::move(endpointName)));
+    return videoRecorderHandler;
+}
+
+EndpointAlexaVideoRecorderHandler::EndpointAlexaVideoRecorderHandler(const std::string& endpointName) :
+        m_endpointName{endpointName} {
+}
+
+VideoRecorderInterface::Response EndpointAlexaVideoRecorderHandler::searchAndRecord(
+    std::unique_ptr<acsdkAlexaVideoRecorderInterfaces::VideoRecorderRequest>) {
+    std::unique_lock<std::mutex> lock(m_mutex);
+
+    ConsolePrinter::prettyPrint({"ENDPOINT: " + m_endpointName, "Search and Record"});
+    lock.unlock();
+
+    VideoRecorderInterface::Response videoRecorderResponse;
+    videoRecorderResponse.type = VideoRecorderInterface::Response::Type::SUCCESS;
+    videoRecorderResponse.message = "SCHEDULED";
+
+    return videoRecorderResponse;
+}
+
+VideoRecorderInterface::Response EndpointAlexaVideoRecorderHandler::cancelRecording(
+    std::unique_ptr<acsdkAlexaVideoRecorderInterfaces::VideoRecorderRequest>) {
+    std::unique_lock<std::mutex> lock(m_mutex);
+
+    ConsolePrinter::prettyPrint({"ENDPOINT: " + m_endpointName, "Cancel Recording Results"});
+    lock.unlock();
+
+    VideoRecorderInterface::Response videoRecorderResponse;
+    return videoRecorderResponse;
+}
+
+VideoRecorderInterface::Response EndpointAlexaVideoRecorderHandler::deleteRecording(
+    std::unique_ptr<acsdkAlexaVideoRecorderInterfaces::VideoRecorderRequest>) {
+    std::unique_lock<std::mutex> lock(m_mutex);
+
+    ConsolePrinter::prettyPrint({"ENDPOINT: " + m_endpointName, "Delete Recording Results"});
+    lock.unlock();
+
+    VideoRecorderInterface::Response videoRecorderResponse;
+    return videoRecorderResponse;
+}
+
+bool EndpointAlexaVideoRecorderHandler::isExtendedRecordingGUIShown() {
+    // must come from the physical or virtual endpoint device
+    bool retVal = true;
+    return retVal;
+}
+
+int EndpointAlexaVideoRecorderHandler::getStorageUsedPercentage() {
+    // must come from the physical or virtual endpoint device
+    int retVal = 100;
+    return retVal;
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/Endpoint/src/EndpointCapabilitiesBuilder.cpp b/SampleApplications/Common/Endpoint/src/EndpointCapabilitiesBuilder.cpp
new file mode 100644
index 0000000000..3dbe09f8d2
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/EndpointCapabilitiesBuilder.cpp
@@ -0,0 +1,331 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/Sample/Endpoint/EndpointCapabilitiesBuilder.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#ifdef ALEXA_LAUNCHER
+#include <acsdkAlexaLauncher/AlexaLauncherFactory.h>
+#endif
+
+#ifdef ALEXA_KEYPAD_CONTROLLER
+#include <acsdkAlexaKeypadController/AlexaKeypadControllerFactory.h>
+#endif
+
+#ifdef ALEXA_PLAYBACK_CONTROLLER
+#include <acsdkAlexaPlaybackController/AlexaPlaybackControllerFactory.h>
+#endif
+
+#ifdef ALEXA_SEEK_CONTROLLER
+#include <acsdkAlexaSeekController/AlexaSeekControllerFactory.h>
+#endif
+
+#ifdef ALEXA_VIDEO_RECORDER
+#include <acsdkAlexaVideoRecorder/AlexaVideoRecorderFactory.h>
+#endif
+
+#ifdef ALEXA_CHANNEL_CONTROLLER
+#include <acsdk/AlexaChannelController/AlexaChannelControllerFactory.h>
+#endif
+
+#ifdef ALEXA_RECORD_CONTROLLER
+#include <acsdk/AlexaRecordController/AlexaRecordControllerFactory.h>
+#endif
+
+#ifdef ALEXA_REMOTE_VIDEO_PLAYER
+#include <acsdk/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerFactory.h>
+#endif
+
+/// String to identify log entries originating from this file.
+#define TAG "EndpointCapabilitiesBuilder"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+EndpointCapabilitiesBuilder::EndpointCapabilitiesBuilder(std::shared_ptr<EndpointFocusAdapter> focusAdapter) :
+        m_capabilitiesBuilt(false),
+        m_focusAdapter{std::move(focusAdapter)} {
+    ACSDK_DEBUG5(LX(__func__));
+}
+
+#ifdef ENABLE_VIDEO_CONTROLLERS
+/*
+ * Helper method to populate the capabilities and requires shutdown lists for the different CapabilityAgents
+ *
+ * @param [in] capabilityConfigurationInterface The capabilityConfigurationInterface of the capability agent being
+ * implemented.
+ * @param [in] directiveHandler The interface used to handle the directives.
+ * @param [in] requiresShutdown Instance of @c RequiresShutdown used for cleaning up the capability agent during
+ * shutdown.
+ * @param [out] capabilities The list of Capability Objects to be updated.
+ * @param [out] requireShutdownObjects The list of requiresShutdown objects that this capability agent needs to be
+ * added to.
+ */
+static void populateLists(
+    const std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface>& capabilityConfigurationInterface,
+    const std::shared_ptr<avsCommon::sdkInterfaces::DirectiveHandlerInterface>& directiveHandler,
+    const std::shared_ptr<avsCommon::utils::RequiresShutdown>& requiresShutdown,
+    std::list<EndpointCapabilitiesBuilder::Capability>& capabilities,
+    std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>& requireShutdownObjects) {
+    if (!capabilityConfigurationInterface || !directiveHandler || !requiresShutdown) {
+        ACSDK_ERROR(LX("populateListsFailed").d("reason", "nullCapabilityAgentData"));
+        return;
+    }
+    auto configurations = capabilityConfigurationInterface->getCapabilityConfigurations();
+    if (configurations.empty() || configurations.find(nullptr) != configurations.end()) {
+        ACSDK_ERROR(LX("populateListsFailed").d("reason", "invalidConfiguration"));
+        return;
+    }
+    for (const auto& configurationPtr : configurations) {
+        auto& configuration = *configurationPtr;
+        capabilities.push_back({configuration, directiveHandler});
+    }
+    requireShutdownObjects.push_back(requiresShutdown);
+}
+#endif  // ENABLE_VIDEO_CONTROLLERS
+
+std::pair<
+    std::list<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesBuilderInterface::Capability>,
+    std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>>
+EndpointCapabilitiesBuilder::buildCapabilities(
+    const alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>&
+        responseSender,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+        exceptionSender) {
+    ACSDK_DEBUG5(LX(__func__));
+    std::pair<
+        std::list<
+            alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesBuilderInterface::Capability>,
+        std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>>
+        retValue;
+    std::list<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesBuilderInterface::Capability>
+        capabilities;
+    std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>> requireShutdownObjects;
+
+    std::lock_guard<std::mutex> lock(m_buildCapabilitiesMutex);
+
+    if (m_capabilitiesBuilt) {
+        ACSDK_ERROR(LX(__func__).d("buildCapabilitiesFailed reason", "Capabilities already built!"));
+        return retValue;
+    }
+
+#ifdef ALEXA_LAUNCHER
+    m_launcherHandler = EndpointAlexaLauncherHandler::create(endpointId);
+    if (m_launcherHandler) {
+        acsdkAlexaLauncher::AlexaLauncherFactory launcherFactory;
+        auto launcherCA = launcherFactory.create(
+            endpointId, m_launcherHandler, contextManager, responseSender, exceptionSender, false, true);
+
+        if (launcherCA.hasValue()) {
+            populateLists(
+                launcherCA.value().capabilityConfigurationInterface,
+                launcherCA.value().directiveHandler,
+                launcherCA.value().requiresShutdown,
+                capabilities,
+                requireShutdownObjects);
+        } else {
+            ACSDK_ERROR(LX("Failed to create Alexa launcher CA!"));
+        }
+    } else {
+        ACSDK_ERROR(LX("Failed to create Alexa launcher handler!"));
+    }
+#endif  // ALEXA_LAUNCHER
+
+#ifdef ALEXA_KEYPAD_CONTROLLER
+    auto keypadControllerHandler = EndpointAlexaKeypadControllerHandler::create(endpointId);
+    if (keypadControllerHandler) {
+        acsdkAlexaKeypadController::AlexaKeypadControllerFactory keypadControllerFactory;
+        auto keypadControllerCA = keypadControllerFactory.create(
+            endpointId, keypadControllerHandler, contextManager, responseSender, exceptionSender);
+
+        if (keypadControllerCA.hasValue()) {
+            populateLists(
+                keypadControllerCA.value().capabilityConfigurationInterface,
+                keypadControllerCA.value().directiveHandler,
+                keypadControllerCA.value().requiresShutdown,
+                capabilities,
+                requireShutdownObjects);
+        } else {
+            ACSDK_ERROR(LX("Failed to create Alexa keypad controller CA!"));
+        }
+    } else {
+        ACSDK_ERROR(LX("Failed to create Alexa keypad controller handler!"));
+    }
+#endif  // ALEXA_KEYPAD_CONTROLLER
+
+#ifdef ALEXA_PLAYBACK_CONTROLLER
+    auto playbackControllerHandler = EndpointAlexaPlaybackControllerHandler::create(endpointId, m_focusAdapter);
+    if (playbackControllerHandler) {
+        acsdkAlexaPlaybackController::AlexaPlaybackControllerFactory playbackControllerFactory;
+
+#ifdef ALEXA_PLAYBACK_STATE_REPORTER
+        // passing isProactivelyReported and isRetrievable as true for sending PlaybackStateReporter events
+        auto playbackControllerCA = playbackControllerFactory.create(
+            endpointId, playbackControllerHandler, contextManager, responseSender, exceptionSender, true, true);
+#else
+        auto playbackControllerCA = playbackControllerFactory.create(
+            endpointId, playbackControllerHandler, contextManager, responseSender, exceptionSender, false, false);
+#endif
+
+        if (playbackControllerCA.hasValue()) {
+            populateLists(
+                playbackControllerCA.value().capabilityConfigurationInterface,
+                playbackControllerCA.value().directiveHandler,
+                playbackControllerCA.value().requiresShutdown,
+                capabilities,
+                requireShutdownObjects);
+        } else {
+            ACSDK_ERROR(LX("Failed to create Alexa playback controller CA!"));
+        }
+    } else {
+        ACSDK_ERROR(LX("Failed to create Alexa playback controller handler!"));
+    }
+#endif  // ALEXA_PLAYBACK_CONTROLLER
+
+#ifdef ALEXA_SEEK_CONTROLLER
+    auto seekControllerHandler = EndpointAlexaSeekControllerHandler::create(endpointId);
+    if (seekControllerHandler) {
+        acsdkAlexaSeekController::AlexaSeekControllerFactory seekControllerFactory;
+        auto seekControllerCA = seekControllerFactory.create(
+            endpointId, seekControllerHandler, contextManager, responseSender, exceptionSender, true);
+
+        if (seekControllerCA.hasValue()) {
+            populateLists(
+                seekControllerCA.value().capabilityConfigurationInterface,
+                seekControllerCA.value().directiveHandler,
+                seekControllerCA.value().requiresShutdown,
+                capabilities,
+                requireShutdownObjects);
+        } else {
+            ACSDK_ERROR(LX("Failed to create Alexa seek controller CA!"));
+        }
+    } else {
+        ACSDK_ERROR(LX("Failed to create Alexa seek controller handler!"));
+    }
+#endif  // ALEXA_SEEK_CONTROLLER
+
+#ifdef ALEXA_VIDEO_RECORDER
+    m_videoRecorderHandler = EndpointAlexaVideoRecorderHandler::create(endpointId);
+    if (m_videoRecorderHandler) {
+        acsdkAlexaVideoRecorder::AlexaVideoRecorderFactory videoRecorderFactory;
+        auto videoRecorderCA = videoRecorderFactory.create(
+            endpointId, m_videoRecorderHandler, contextManager, responseSender, exceptionSender);
+
+        if (videoRecorderCA.hasValue()) {
+            populateLists(
+                videoRecorderCA.value().capabilityConfigurationInterface,
+                videoRecorderCA.value().directiveHandler,
+                videoRecorderCA.value().requiresShutdown,
+                capabilities,
+                requireShutdownObjects);
+        } else {
+            ACSDK_ERROR(LX("Failed to create video recorder CA!"));
+        }
+    } else {
+        ACSDK_ERROR(LX("Failed to create video recorder handler!"));
+    }
+#endif  // ALEXA_VIDEO_RECORDER
+
+#ifdef ALEXA_CHANNEL_CONTROLLER
+    m_channelControllerHandler = EndpointAlexaChannelControllerHandler::create(endpointId);
+    if (m_channelControllerHandler) {
+        alexaChannelController::AlexaChannelControllerFactory channelControllerFactory;
+        // passing isProactivelyReported and isRetrievable as true for sending ChannelController events
+        auto channelControllerCA = channelControllerFactory.create(
+            endpointId, m_channelControllerHandler, contextManager, responseSender, exceptionSender, true, true);
+
+        if (channelControllerCA.hasValue()) {
+            populateLists(
+                channelControllerCA.value().capabilityConfigurationInterface,
+                channelControllerCA.value().directiveHandler,
+                channelControllerCA.value().requiresShutdown,
+                capabilities,
+                requireShutdownObjects);
+        } else {
+            ACSDK_ERROR(LX("Failed to create Alexa Channel Controller CA!"));
+        }
+    } else {
+        ACSDK_ERROR(LX("Failed to create Alexa Channel Controller handler!"));
+    }
+#endif  // ALEXA_CHANNEL_CONTROLLER
+
+#ifdef ALEXA_RECORD_CONTROLLER
+    m_recordControllerHandler = EndpointAlexaRecordControllerHandler::create(endpointId);
+    if (m_recordControllerHandler) {
+        alexaRecordController::AlexaRecordControllerFactory recordControllerFactory;
+        auto recordControllerCA = recordControllerFactory.create(
+            endpointId, m_recordControllerHandler, contextManager, responseSender, exceptionSender, true);
+
+        if (recordControllerCA.hasValue()) {
+            populateLists(
+                recordControllerCA.value().capabilityConfigurationInterface,
+                recordControllerCA.value().directiveHandler,
+                recordControllerCA.value().requiresShutdown,
+                capabilities,
+                requireShutdownObjects);
+        } else {
+            ACSDK_ERROR(LX("Failed to create Alexa Record Controller CA!"));
+        }
+    } else {
+        ACSDK_ERROR(LX("Failed to create Alexa Record Controller handler!"));
+    }
+#endif  // ALEXA_RECORD_CONTROLLER
+
+#ifdef ALEXA_REMOTE_VIDEO_PLAYER
+    m_remoteVideoPlayerHandler = EndpointAlexaRemoteVideoPlayerHandler::create(endpointId, m_focusAdapter);
+    if (m_remoteVideoPlayerHandler) {
+        alexaRemoteVideoPlayer::AlexaRemoteVideoPlayerFactory remoteVideoPlayerFactory;
+        auto remoteVideoPlayerCA = remoteVideoPlayerFactory.create(
+            endpointId, m_remoteVideoPlayerHandler, contextManager, responseSender, exceptionSender);
+
+        if (remoteVideoPlayerCA.hasValue()) {
+            populateLists(
+                remoteVideoPlayerCA.value().capabilityConfigurationInterface,
+                remoteVideoPlayerCA.value().directiveHandler,
+                remoteVideoPlayerCA.value().requiresShutdown,
+                capabilities,
+                requireShutdownObjects);
+        } else {
+            ACSDK_ERROR(LX("Failed to create Remote Video Player CA!"));
+        }
+    } else {
+        ACSDK_ERROR(LX("Failed to create Remote Video Player handler!"));
+    }
+#endif  // ALEXA_REMOTE_VIDEO_PLAYER
+
+    retValue.first.swap(capabilities);
+    retValue.second.swap(requireShutdownObjects);
+    m_capabilitiesBuilt = true;
+    return retValue;
+}
+
+std::shared_ptr<EndpointAlexaLauncherHandler> EndpointCapabilitiesBuilder::getAlexaLauncherHandler() const {
+    return m_launcherHandler;
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/Endpoint/src/EndpointFocusAdapter.cpp b/SampleApplications/Common/Endpoint/src/EndpointFocusAdapter.cpp
new file mode 100644
index 0000000000..c9e6bb140c
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/EndpointFocusAdapter.cpp
@@ -0,0 +1,138 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/Sample/Endpoint/EndpointFocusAdapter.h>
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/// String to identify log entries originating from this file.
+#define TAG "EndpointFocusAdapter"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+using namespace presentationOrchestratorInterfaces;
+
+/// The @c Channel name for use by the FocusManager.
+static const char* const CHANNEL_NAME = avsCommon::sdkInterfaces::FocusManagerInterface::CONTENT_CHANNEL_NAME;
+
+std::shared_ptr<EndpointFocusAdapter> EndpointFocusAdapter::create(
+    std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
+    std::shared_ptr<PresentationOrchestratorInterface> presentationOrchestrator,
+    std::shared_ptr<PresentationOrchestratorStateTrackerInterface> presentationOrchestratorStateTracker) {
+    if (!focusManager || !presentationOrchestrator || !presentationOrchestratorStateTracker) {
+        ACSDK_WARN(LX(__func__).d("Endpoint Focus Adapter Creation Failed", "Null input"));
+        return nullptr;
+    }
+
+    auto focusAdapter = std::shared_ptr<EndpointFocusAdapter>(new EndpointFocusAdapter(
+        std::move(focusManager), std::move(presentationOrchestrator), std::move(presentationOrchestratorStateTracker)));
+    return focusAdapter;
+}
+
+EndpointFocusAdapter::EndpointFocusAdapter(
+    std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
+    std::shared_ptr<PresentationOrchestratorInterface> presentationOrchestrator,
+    std::shared_ptr<PresentationOrchestratorStateTrackerInterface> presentationOrchestratorStateTracker) :
+        m_focusManager{std::move(focusManager)},
+        m_presentationOrchestrator{std::move(presentationOrchestrator)},
+        m_presentationOrchestratorStateTracker{std::move(presentationOrchestratorStateTracker)},
+        m_executor(std::make_shared<alexaClientSDK::avsCommon::utils::threading::Executor>()) {
+}
+
+void EndpointFocusAdapter::executeAcquireWindow() {
+    ACSDK_DEBUG9(LX("executeAcquireWindow"));
+    if (m_focusAcquirePtr) {
+        /// Clear all existing presentations.
+        m_presentationOrchestrator->clearPresentations();
+        /// Set the device interface.
+        m_presentationOrchestratorStateTracker->setDeviceInterface(m_focusAcquirePtr->interfaceName);
+    }
+    executeAcquireContentChannel();
+}
+
+void EndpointFocusAdapter::executeReleaseWindow() {
+    ACSDK_DEBUG9(LX("executeReleaseWindow"));
+    m_presentationOrchestratorStateTracker->releaseDeviceInterface();
+}
+
+void EndpointFocusAdapter::executeAcquireContentChannel() {
+    ACSDK_DEBUG9(LX("executeAcquireContentChannel"));
+    if (m_focusAcquirePtr) {
+        auto activity = avsCommon::sdkInterfaces::FocusManagerInterface::Activity::create(
+            m_focusAcquirePtr->interfaceName, shared_from_this());
+        m_focusManager->acquireChannel(CHANNEL_NAME, activity);
+    }
+}
+
+void EndpointFocusAdapter::executeReleaseContentChannel() {
+    ACSDK_DEBUG9(LX("executeReleaseContentChannel"));
+    if (m_focusManager) {
+        m_focusManager->releaseChannel(CHANNEL_NAME, shared_from_this());
+    }
+}
+
+void EndpointFocusAdapter::onFocusChanged(
+    avsCommon::avs::FocusState newFocus,
+    avsCommon::avs::MixingBehavior behavior) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor->execute([this, newFocus] {
+        switch (newFocus) {
+            case avsCommon::avs::FocusState::FOREGROUND:
+                /// Audio Focus has been acquired. Can Play content. After playback is complete, releaseContentChannel()
+                /// must be called.
+                /// Note the callback is invoked only once per acquireFocus request.
+                if (m_focusAcquirePtr) {
+                    m_focusAcquirePtr->callback();
+                    m_focusAcquirePtr.reset();
+                }
+                break;
+            case avsCommon::avs::FocusState::BACKGROUND:
+                /// Audio Focus has been granted. Can Play content, subject to the Mixing Behavior. After playback is
+                /// complete, releaseContentChannel() must be called.
+                break;
+            case avsCommon::avs::FocusState::NONE:
+                /// All playback must immediately stop. Further playback would require focus to be acquired again.
+                executeReleaseWindow();
+                break;
+        }
+    });
+}
+
+void EndpointFocusAdapter::acquireFocus(const std::string& interfaceName, FocusAcquiredCallback callback) {
+    m_executor->execute([this, interfaceName, callback] {
+        /// Clear any existing acquireFocus request information.
+        m_focusAcquirePtr.reset();
+        if (callback) {
+            m_focusAcquirePtr = std::make_shared<FocusAcquireInterfaceAndCallback>(std::move(interfaceName), callback);
+        } else {
+            ACSDK_WARN(LX("No callback registered for Focus acquisition"));
+        }
+        executeAcquireWindow();
+    });
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/SampleApplications/Common/Endpoint/src/EndpointInputControllerHandler.cpp b/SampleApplications/Common/Endpoint/src/EndpointInputControllerHandler.cpp
new file mode 100644
index 0000000000..22409ab322
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/EndpointInputControllerHandler.cpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/Sample/Endpoint/EndpointInputControllerHandler.h"
+
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+
+/// Literal to identify log entries originating from this file.
+#define TAG "EndpointInputControllerHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+using namespace alexaInputControllerInterfaces;
+
+static const Input DEFAULT_INPUT = Input::HDMI_1;
+
+/// Inputs available on Device
+static const InputControllerInterface::SupportedInputs INPUT_AVAILABLE{{Input::HDMI_1, {"TV", "Television"}},
+                                                                       {Input::DVD, {"DVD"}},
+                                                                       {Input::CD, {"MUSIC"}}};
+
+std::shared_ptr<EndpointInputControllerHandler> EndpointInputControllerHandler::create(
+    const std::string& endpointName) {
+    return std::shared_ptr<EndpointInputControllerHandler>(new EndpointInputControllerHandler(endpointName));
+}
+
+EndpointInputControllerHandler::EndpointInputControllerHandler(const std::string& endpointName) :
+        m_endpointName{endpointName},
+        m_currentInput{DEFAULT_INPUT},
+        m_supportedInputs{INPUT_AVAILABLE} {
+}
+
+InputControllerInterface::Response EndpointInputControllerHandler::setInput(Input input) {
+    std::string prefix = m_endpointName.empty() ? "DEFAULT" : m_endpointName;
+    ConsolePrinter::prettyPrint({" ENDPOINT: " + prefix + " Input: " + inputToString(input)});
+    {
+        std::lock_guard<std::mutex> lock(m_mutex);
+        m_currentInput = input;
+    }
+    m_notifier.notifyObservers(
+        [&](const std::shared_ptr<InputControllerObserverInterface>& observer) { observer->onInputChanged(input); });
+    return InputControllerInterface::Response();
+}
+
+InputControllerInterface::SupportedInputs EndpointInputControllerHandler::getSupportedInputs() {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    return m_supportedInputs;
+}
+
+Input EndpointInputControllerHandler::getInput() {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    return m_currentInput;
+}
+
+bool EndpointInputControllerHandler::addObserver(const std::weak_ptr<InputControllerObserverInterface> observer) {
+    m_notifier.addWeakPtrObserver(observer);
+    return true;
+}
+
+void EndpointInputControllerHandler::removeObserver(const std::weak_ptr<InputControllerObserverInterface> observer) {
+    m_notifier.removeWeakPtrObserver(observer);
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/Endpoint/src/InputControllerEndpointCapabilitiesBuilder.cpp b/SampleApplications/Common/Endpoint/src/InputControllerEndpointCapabilitiesBuilder.cpp
new file mode 100644
index 0000000000..e3c35abba2
--- /dev/null
+++ b/SampleApplications/Common/Endpoint/src/InputControllerEndpointCapabilitiesBuilder.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/Sample/Endpoint/InputControllerEndpointCapabilitiesBuilder.h"
+
+#include <acsdk/AlexaInputController/InputControllerFactory.h>
+#include "acsdk/Sample/Endpoint/EndpointInputControllerHandler.h"
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/// String to identify log entries originating from this file.
+#define TAG "InputControllerEndpointCapabilitiesBuilder"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+InputControllerEndpointCapabilitiesBuilder::InputControllerEndpointCapabilitiesBuilder() : m_capabilitiesBuilt{false} {
+    ACSDK_DEBUG5(LX(__func__));
+}
+
+std::pair<
+    std::list<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesBuilderInterface::Capability>,
+    std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>>
+InputControllerEndpointCapabilitiesBuilder::buildCapabilities(
+    const alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>&
+        responseSender,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+        exceptionSender) {
+    ACSDK_DEBUG5(LX(__func__));
+    std::pair<
+        std::list<
+            alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesBuilderInterface::Capability>,
+        std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>>
+        retValue;
+    std::list<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesBuilderInterface::Capability>
+        capabilities;
+    std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>> requireShutdownObjects;
+    std::lock_guard<std::mutex> lock(m_buildCapabilitiesMutex);
+    if (m_capabilitiesBuilt) {
+        ACSDK_ERROR(LX(__FUNCTION__).d("buildCapabilitiesFailed reason", "Capabilities already built!"));
+        return retValue;
+    }
+
+    auto inputControllerHandler = EndpointInputControllerHandler::create(endpointId);
+    if (inputControllerHandler) {
+        auto inputControllerCapabilityAgent = alexaInputController::AlexaInputControllerFactory::create(
+            endpointId, inputControllerHandler, contextManager, responseSender, exceptionSender, true, true);
+        if (inputControllerCapabilityAgent.hasValue()) {
+            auto configurations =
+                inputControllerCapabilityAgent.value().capabilityConfigurationInterface->getCapabilityConfigurations();
+            if (configurations.empty() || configurations.find(nullptr) != configurations.end()) {
+                ACSDK_ERROR(LX("buildCapabilitiesFailed").d("reason", "invalidRemoteVideoPlayerConfiguration"));
+            }
+            for (auto& configurationPtr : configurations) {
+                auto& configuration = *configurationPtr;
+                capabilities.push_back({configuration, inputControllerCapabilityAgent.value().directiveHandler});
+            }
+            requireShutdownObjects.push_back(inputControllerCapabilityAgent.value().requiresShutdown);
+        } else {
+            ACSDK_ERROR(LX("Failed to create InputController CA!"));
+        }
+    } else {
+        ACSDK_ERROR(LX("Failed to create InputController handler!"));
+    }
+
+    retValue.first.swap(capabilities);
+    retValue.second.swap(requireShutdownObjects);
+    m_capabilitiesBuilt = true;
+    return retValue;
+}
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/InteractionManager/CMakeLists.txt b/SampleApplications/Common/InteractionManager/CMakeLists.txt
new file mode 100644
index 0000000000..e5d595e223
--- /dev/null
+++ b/SampleApplications/Common/InteractionManager/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkSampleInteractionManager LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/SampleApp/include/SampleApp/InteractionManager.h b/SampleApplications/Common/InteractionManager/include/acsdk/Sample/InteractionManager/InteractionManager.h
similarity index 85%
rename from SampleApp/include/SampleApp/InteractionManager.h
rename to SampleApplications/Common/InteractionManager/include/acsdk/Sample/InteractionManager/InteractionManager.h
index d223723594..8dbe584842 100644
--- a/SampleApp/include/SampleApp/InteractionManager.h
+++ b/SampleApplications/Common/InteractionManager/include/acsdk/Sample/InteractionManager/InteractionManager.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_INTERACTIONMANAGER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_INTERACTIONMANAGER_H_
+#ifndef ACSDK_SAMPLE_INTERACTIONMANAGER_INTERACTIONMANAGER_H_
+#define ACSDK_SAMPLE_INTERACTIONMANAGER_INTERACTIONMANAGER_H_
 
 #include <memory>
 
@@ -25,6 +25,7 @@
 #include <AVSCommon/SDKInterfaces/Diagnostics/DiagnosticsInterface.h>
 #include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
 #include <AVSCommon/SDKInterfaces/SpeakerInterface.h>
+#include <AVSCommon/SDKInterfaces/SpeechInteractionHandlerInterface.h>
 #include <AVSCommon/Utils/Optional.h>
 #include <AVSCommon/Utils/RequiresShutdown.h>
 #include <DefaultClient/DefaultClient.h>
@@ -33,36 +34,36 @@
 #include <Settings/WakeWordConfirmationSettingType.h>
 
 #include "KeywordObserver.h"
-#include "GuiRenderer.h"
 #include "UIManager.h"
 
 #ifdef ENABLE_PCC
-#include "PhoneCaller.h"
+#include <acsdk/PhoneCallControllerAdapter/PhoneCaller.h>
 #endif
 
 #ifdef ENABLE_MCC
-#include "CalendarClient.h"
-#include "MeetingClient.h"
+#include <acsdk/MeetingClientControllerAdapter/CalendarClient.h>
+#include <acsdk/MeetingClientControllerAdapter/MeetingClient.h>
 #endif
 
 #ifdef POWER_CONTROLLER
-#include "PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h"
+#include <acsdk/Sample/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h>
 #endif
 
 #ifdef TOGGLE_CONTROLLER
-#include "PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h"
+#include <acsdk/Sample/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h>
 #endif
 
 #ifdef RANGE_CONTROLLER
-#include "PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h"
+#include <acsdk/Sample/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h>
 #endif
 
 #ifdef MODE_CONTROLLER
-#include "PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h"
+#include <acsdk/Sample/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h>
 #endif
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 /**
  * This class manages most of the user interaction by taking in commands and notifying the DefaultClient and the
@@ -79,17 +80,16 @@ class InteractionManager
     InteractionManager(
         std::shared_ptr<defaultClient::DefaultClient> client,
         std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> micWrapper,
-        std::shared_ptr<sampleApp::UIManager> userInterface,
+        std::shared_ptr<UIManager> userInterface,
 #ifdef ENABLE_PCC
-        std::shared_ptr<sampleApp::PhoneCaller> phoneCaller,
+        std::shared_ptr<phoneCallControllerAdapter::PhoneCaller> phoneCaller,
 #endif
 #ifdef ENABLE_MCC
-        std::shared_ptr<sampleApp::MeetingClient> meetingClient,
-        std::shared_ptr<sampleApp::CalendarClient> calendarClient,
+        std::shared_ptr<meetingClientControllerAdapter::MeetingClient> meetingClient,
+        std::shared_ptr<meetingClientControllerAdapter::CalendarClient> calendarClient,
 #endif
         capabilityAgents::aip::AudioProvider holdToTalkAudioProvider,
         capabilityAgents::aip::AudioProvider tapToTalkAudioProvider,
-        std::shared_ptr<sampleApp::GuiRenderer> guiRenderer = nullptr,
         capabilityAgents::aip::AudioProvider wakeWordAudioProvider = capabilityAgents::aip::AudioProvider::null(),
 #ifdef POWER_CONTROLLER
         std::shared_ptr<PeripheralEndpointPowerControllerHandler> powerControllerHandler = nullptr,
@@ -177,28 +177,38 @@ class InteractionManager
 
     /**
      * Should be called whenever a user presses 'SHUFFLE' for playback.
+     * @param action The boolean action for the toggle state that needs to be applied. If true, shuffle button is set to
+     * be active.
      */
-    void playbackShuffle();
+    void playbackShuffle(bool action);
 
     /**
      * Should be called whenever a user presses 'LOOP' for playback.
+     * @param action The boolean action for the toggle state that needs to be applied. If true, loop button is set to be
+     * active.
      */
-    void playbackLoop();
+    void playbackLoop(bool action);
 
     /**
      * Should be called whenever a user presses 'REPEAT' for playback.
+     * @param action The boolean action for the toggle state that needs to be applied. If true, repeat button is set to
+     * be active.
      */
-    void playbackRepeat();
+    void playbackRepeat(bool action);
 
     /**
      * Should be called whenever a user presses 'THUMBS_UP' for playback.
+     * @param action The boolean action for the toggle state that needs to be applied. If true, thumbs-up button is set
+     * to be active.
      */
-    void playbackThumbsUp();
+    void playbackThumbsUp(bool action);
 
     /**
      * Should be called whenever a user presses 'THUMBS_DOWN' for playback.
+     * @param action The boolean action for the toggle state that needs to be applied. If true, thumbs-down button is
+     * set to be active.
      */
-    void playbackThumbsDown();
+    void playbackThumbsDown(bool action);
 
     /**
      * Should be called whenever a user presses 'SETTINGS' for settings options.
@@ -370,6 +380,16 @@ class InteractionManager
      */
     void setMute(avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type, bool mute);
 
+    /**
+     * Overrides the default @c SpeechInteractionHandlerInterface for Hold To Talk interactions.
+     * Defaults to @c DefaultClient.
+     *
+     * @param holdToTalkHandler the @c SpeechInteractionHandlerInterface to use as override for Hold To Talk
+     * interactions.
+     */
+    void overrideHoldToTalkSpeechHandler(
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeechInteractionHandlerInterface> holdToTalkHandler);
+
     /**
      * Reset the device and remove any customer data.
      */
@@ -442,6 +462,7 @@ class InteractionManager
      * Should be called when the user wants to disable the video of local device.
      */
     void disableVideo();
+
 #endif
 
     /**
@@ -672,26 +693,27 @@ class InteractionManager
     std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> m_micWrapper;
 
     /// The user interface manager.
-    std::shared_ptr<sampleApp::UIManager> m_userInterface;
-
-    /// The gui renderer.
-    std::shared_ptr<sampleApp::GuiRenderer> m_guiRenderer;
+    std::shared_ptr<UIManager> m_userInterface;
 
     /// The call manager.
     std::shared_ptr<avsCommon::sdkInterfaces::CallManagerInterface> m_callManager;
 
 #ifdef ENABLE_PCC
     /// The Phone Caller
-    std::shared_ptr<sampleApp::PhoneCaller> m_phoneCaller;
+    std::shared_ptr<phoneCallControllerAdapter::PhoneCaller> m_phoneCaller;
 #endif
 
 #ifdef ENABLE_MCC
     /// The Meeting Client.
-    std::shared_ptr<sampleApp::MeetingClient> m_meetingClient;
+    std::shared_ptr<meetingClientControllerAdapter::MeetingClient> m_meetingClient;
     /// The Calendar Client.
-    std::shared_ptr<sampleApp::CalendarClient> m_calendarClient;
+    std::shared_ptr<meetingClientControllerAdapter::CalendarClient> m_calendarClient;
 #endif
 
+    /// The active @c SpeechInteractionHandlerInterface to use for Hold To Talk interactions
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeechInteractionHandlerInterface>
+        m_holdToTalkSpeechInteractionHandler;
+
     /// The hold to talk audio provider.
     capabilityAgents::aip::AudioProvider m_holdToTalkAudioProvider;
 
@@ -753,11 +775,16 @@ class InteractionManager
     void doShutdown() override;
     /// @}
 
-    /// sends Gui Toggle event
-    void sendGuiToggleEvent(const std::string& toggleName, avsCommon::avs::PlaybackToggle toggleType);
+    /**
+     * Sends user action to toggle a playback button to the media player.
+     * @param toggleType Type of the toggle button.
+     * @param action The boolean action for the toggle state. If true, button is set to be active.
+     */
+    void sendGuiToggleEvent(avsCommon::avs::PlaybackToggle toggleType, bool action);
 };
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_INTERACTIONMANAGER_H_
+#endif  // ALEXA_CLIENT_SDK_INTERACTIONMANAGER_INCLUDE_ACSDK_SAMPLE_INTERACTIONMANAGER_INTERACTIONMANAGER_H_
diff --git a/SampleApplications/Common/InteractionManager/include/acsdk/Sample/InteractionManager/KeywordObserver.h b/SampleApplications/Common/InteractionManager/include/acsdk/Sample/InteractionManager/KeywordObserver.h
new file mode 100644
index 0000000000..e97500d8da
--- /dev/null
+++ b/SampleApplications/Common/InteractionManager/include/acsdk/Sample/InteractionManager/KeywordObserver.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_INTERACTIONMANAGER_KEYWORDOBSERVER_H_
+#define ACSDK_SAMPLE_INTERACTIONMANAGER_KEYWORDOBSERVER_H_
+
+#include <memory>
+#include <string>
+
+#include <acsdkKWDImplementations/AbstractKeywordDetector.h>
+#include <AVSCommon/AVS/AudioInputStream.h>
+#include <AVSCommon/SDKInterfaces/KeyWordObserverInterface.h>
+#include <DefaultClient/DefaultClient.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * Observes callbacks from keyword detections and notifies the DefaultClient that a wake word has occurred.
+ */
+class KeywordObserver : public avsCommon::sdkInterfaces::KeyWordObserverInterface {
+public:
+    /**
+     * Creates a KeywordObserver and registers as an observer to a KeywordDetector.
+     *
+     * @param client The default SDK client.
+     * @param audioProvider The audio provider from which to stream audio data from.
+     * @param keywordDetector The @c AbstractKeywordDetector to self register to as an observer.
+     *
+     * @return a @c KeywordObserver.
+     */
+    static std::shared_ptr<KeywordObserver> create(
+        std::shared_ptr<defaultClient::DefaultClient> client,
+        capabilityAgents::aip::AudioProvider audioProvider,
+        std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> keywordDetector);
+
+    /**
+     * Constructor.
+     *
+     * @param client The default SDK client.
+     * @param audioProvider The audio provider from which to stream audio data from.
+     */
+    KeywordObserver(
+        std::shared_ptr<defaultClient::DefaultClient> client,
+        capabilityAgents::aip::AudioProvider audioProvider);
+
+    /// @name KeyWordObserverInterface Functions
+    /// @{
+    void onKeyWordDetected(
+        std::shared_ptr<avsCommon::avs::AudioInputStream> stream,
+        std::string keyword,
+        avsCommon::avs::AudioInputStream::Index beginIndex = UNSPECIFIED_INDEX,
+        avsCommon::avs::AudioInputStream::Index endIndex = UNSPECIFIED_INDEX,
+        std::shared_ptr<const std::vector<char>> KWDMetadata = nullptr) override;
+    /// @}
+
+private:
+    /// The default SDK client.
+    std::shared_ptr<defaultClient::DefaultClient> m_client;
+
+    /// The audio provider.
+    capabilityAgents::aip::AudioProvider m_audioProvider;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_INTERACTIONMANAGER_KEYWORDOBSERVER_H_
diff --git a/SampleApp/include/SampleApp/UIManager.h b/SampleApplications/Common/InteractionManager/include/acsdk/Sample/InteractionManager/UIManager.h
similarity index 91%
rename from SampleApp/include/SampleApp/UIManager.h
rename to SampleApplications/Common/InteractionManager/include/acsdk/Sample/InteractionManager/UIManager.h
index 7fccf5e19e..c76105cb50 100644
--- a/SampleApp/include/SampleApp/UIManager.h
+++ b/SampleApplications/Common/InteractionManager/include/acsdk/Sample/InteractionManager/UIManager.h
@@ -13,14 +13,16 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_UIMANAGER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_UIMANAGER_H_
+#ifndef ACSDK_SAMPLE_INTERACTIONMANAGER_UIMANAGER_H_
+#define ACSDK_SAMPLE_INTERACTIONMANAGER_UIMANAGER_H_
 
 #include <string>
 #include <memory>
 #include <unordered_map>
 #include <vector>
 
+#include <acsdkSampleApplicationInterfaces/UIStateAggregatorInterface.h>
+#include <acsdkSampleApplicationInterfaces/UIAuthNotifierInterface.h>
 #include <acsdkSampleApplicationInterfaces/UIManagerInterface.h>
 #include <AVSCommon/SDKInterfaces/AuthObserverInterface.h>
 #include <AVSCommon/SDKInterfaces/CapabilitiesDelegateObserverInterface.h>
@@ -32,7 +34,6 @@
 #include <AVSCommon/SDKInterfaces/SpeakerManagerObserverInterface.h>
 #include <AVSCommon/Utils/DeviceInfo.h>
 #include <AVSCommon/Utils/Threading/Executor.h>
-#include <CBLAuthDelegate/CBLAuthRequesterInterface.h>
 #include <Settings/DeviceSettingsManager.h>
 #include <Settings/SettingCallbacks.h>
 #include <Settings/SpeechConfirmationSettingType.h>
@@ -42,7 +43,8 @@
 #include <acsdkNotificationsInterfaces/NotificationsObserverInterface.h>
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 /**
  * This class manages the states that the user will see when interacting with the Sample Application. For now, it simply
@@ -402,6 +404,19 @@ class UIManager
      */
     void printAudioInjectionFailureMessage();
 
+    /**
+     * Set a notifier that bridges Authorization state from UI manager to the user interface.
+     * @param uiAuthNotifier An instance of @c UIAuthNotifierInterface.
+     */
+    void setUIAuthNotifier(std::shared_ptr<acsdkSampleApplicationInterfaces::UIAuthNotifierInterface> uiAuthNotifier);
+
+    /**
+     * Set a notifier that bridges Alexa and connection state from UI manager to the user interface.
+     * @param uiStateAggregator An instance of @c UIStateAggregatorInterface.
+     */
+    void setUIStateAggregator(
+        std::shared_ptr<acsdkSampleApplicationInterfaces::UIStateAggregatorInterface> uiStateAggregator);
+
 private:
     /**
      * Constructor
@@ -483,9 +498,16 @@ class UIManager
 
     // The @c EndpointIdentifier of the default endpoint.
     avsCommon::sdkInterfaces::endpoints::EndpointIdentifier m_defaultEndpointId;
+
+    /// An instance of @c UIStateAggregatorInterface to be used to notify user interface about Alexa State.
+    std::shared_ptr<acsdkSampleApplicationInterfaces::UIStateAggregatorInterface> m_uiStateAggregator;
+
+    /// An instance of @c UIAuthNotifierInterface to be used to notify authorization State.
+    std::shared_ptr<acsdkSampleApplicationInterfaces::UIAuthNotifierInterface> m_uiAuthNotifier;
 };
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_UIMANAGER_H_
+#endif  // ACSDK_SAMPLE_INTERACTIONMANAGER_UIMANAGER_H_
diff --git a/SampleApplications/Common/InteractionManager/src/CMakeLists.txt b/SampleApplications/Common/InteractionManager/src/CMakeLists.txt
new file mode 100644
index 0000000000..b115bfa30c
--- /dev/null
+++ b/SampleApplications/Common/InteractionManager/src/CMakeLists.txt
@@ -0,0 +1,32 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkSampleInteractionManager")
+
+add_library(acsdkSampleInteractionManager
+    InteractionManager.cpp
+    KeywordObserver.cpp
+    UIManager.cpp)
+
+target_include_directories(acsdkSampleInteractionManager PUBLIC
+    "${acsdkSampleInteractionManager_SOURCE_DIR}/include"
+    "${acsdkSamplePeripheralEndpoint_SOURCE_DIR}/include"
+    "${acsdkSampleConsole_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkSampleInteractionManager
+    acsdkKWDImplementations
+    acsdkSampleApplicationInterfaces
+    acsdkSampleConsole
+    acsdkSamplePeripheralEndpoint
+    AVSCommon
+    DefaultClient
+    RegistrationManager
+)
+
+if (PCC)
+    target_link_libraries(acsdkSampleInteractionManager acsdkPhoneCallControllerAdapter)
+endif()
+
+if (MCC)
+    target_link_libraries(acsdkSampleInteractionManager acsdkMeetingClientControllerAdapter)
+endif()
+
+# install target only if sample libraries are installed
+asdk_sample_install()
diff --git a/SampleApp/src/InteractionManager.cpp b/SampleApplications/Common/InteractionManager/src/InteractionManager.cpp
similarity index 76%
rename from SampleApp/src/InteractionManager.cpp
rename to SampleApplications/Common/InteractionManager/src/InteractionManager.cpp
index 4186d367f2..29ce9f0924 100644
--- a/SampleApp/src/InteractionManager.cpp
+++ b/SampleApplications/Common/InteractionManager/src/InteractionManager.cpp
@@ -17,25 +17,17 @@
 #include <AVSCommon/SDKInterfaces/Endpoints/EndpointModificationData.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 
-#include "SampleApp/InteractionManager.h"
+#include "acsdk/Sample/InteractionManager/InteractionManager.h"
 #include "Endpoints/Endpoint.h"
 
-#ifdef ENABLE_PCC
-#include <SampleApp/PhoneCaller.h>
-#endif
-
-#ifdef ENABLE_MCC
-#include <SampleApp/CalendarClient.h>
-#include <SampleApp/MeetingClient.h>
-#endif
-
 #include <vector>
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("InteractionManager");
+#define TAG "InteractionManager"
 
 /// Dynamic endpoint description.
 static const std::string ENDPOINT_DESCRIPTION = "dynamic light endpoint";
@@ -57,17 +49,16 @@ using namespace avsCommon::sdkInterfaces;
 InteractionManager::InteractionManager(
     std::shared_ptr<defaultClient::DefaultClient> client,
     std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> micWrapper,
-    std::shared_ptr<sampleApp::UIManager> userInterface,
+    std::shared_ptr<UIManager> userInterface,
 #ifdef ENABLE_PCC
-    std::shared_ptr<sampleApp::PhoneCaller> phoneCaller,
+    std::shared_ptr<phoneCallControllerAdapter::PhoneCaller> phoneCaller,
 #endif
 #ifdef ENABLE_MCC
-    std::shared_ptr<sampleApp::MeetingClient> meetingClient,
-    std::shared_ptr<sampleApp::CalendarClient> calendarClient,
+    std::shared_ptr<meetingClientControllerAdapter::MeetingClient> meetingClient,
+    std::shared_ptr<meetingClientControllerAdapter::CalendarClient> calendarClient,
 #endif
     capabilityAgents::aip::AudioProvider holdToTalkAudioProvider,
     capabilityAgents::aip::AudioProvider tapToTalkAudioProvider,
-    std::shared_ptr<sampleApp::GuiRenderer> guiRenderer,
     capabilityAgents::aip::AudioProvider wakeWordAudioProvider,
 
 #ifdef POWER_CONTROLLER
@@ -88,7 +79,6 @@ InteractionManager::InteractionManager(
         m_client{client},
         m_micWrapper{micWrapper},
         m_userInterface{userInterface},
-        m_guiRenderer{guiRenderer},
         m_callManager{callManager},
 #ifdef ENABLE_PCC
         m_phoneCaller{phoneCaller},
@@ -97,6 +87,7 @@ InteractionManager::InteractionManager(
         m_meetingClient{meetingClient},
         m_calendarClient{calendarClient},
 #endif
+        m_holdToTalkSpeechInteractionHandler{client},
         m_holdToTalkAudioProvider{holdToTalkAudioProvider},
         m_tapToTalkAudioProvider{tapToTalkAudioProvider},
         m_wakeWordAudioProvider{wakeWordAudioProvider},
@@ -126,7 +117,7 @@ InteractionManager::InteractionManager(
 };
 
 void InteractionManager::begin() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         m_userInterface->printWelcomeScreen();
         if (m_diagnostics && m_diagnostics->getAudioInjector()) {
             m_userInterface->printAudioInjectionHeader();
@@ -136,20 +127,20 @@ void InteractionManager::begin() {
 }
 
 void InteractionManager::help() {
-    m_executor.submit([this]() { m_userInterface->printHelpScreen(); });
+    m_executor.execute([this]() { m_userInterface->printHelpScreen(); });
 }
 
 void InteractionManager::limitedHelp() {
-    m_executor.submit([this]() { m_userInterface->printLimitedHelp(); });
+    m_executor.execute([this]() { m_userInterface->printLimitedHelp(); });
 }
 
 void InteractionManager::settings() {
-    m_executor.submit([this]() { m_userInterface->printSettingsScreen(); });
+    m_executor.execute([this]() { m_userInterface->printSettingsScreen(); });
 }
 
 void InteractionManager::clearCachedEndpointIdentifiers(
     const std::vector<avsCommon::sdkInterfaces::endpoints::EndpointIdentifier>& deletedEndpoints) {
-    m_executor.submit([this, deletedEndpoints]() {
+    m_executor.execute([this, deletedEndpoints]() {
         if (m_dynamicEndpointId.hasValue() &&
             (deletedEndpoints.end() !=
              std::find(deletedEndpoints.begin(), deletedEndpoints.end(), m_dynamicEndpointId.value()))) {
@@ -160,7 +151,7 @@ void InteractionManager::clearCachedEndpointIdentifiers(
 
 #if ENABLE_ENDPOINT_CONTROLLERS
 void InteractionManager::endpointModification() {
-    m_executor.submit([this]() { m_userInterface->printEndpointModificationScreen(); });
+    m_executor.execute([this]() { m_userInterface->printEndpointModificationScreen(); });
 }
 
 bool InteractionManager::addEndpoint(const std::string& friendlyName) {
@@ -230,7 +221,7 @@ bool InteractionManager::updateEndpoint(
 }
 
 void InteractionManager::addDynamicEndpoint() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_dynamicEndpointId.hasValue()) {
             m_userInterface->printEndpointModificationError("Dynamic endpoint already added.");
         } else if (!addEndpoint("light")) {
@@ -240,7 +231,7 @@ void InteractionManager::addDynamicEndpoint() {
 }
 
 void InteractionManager::modifyDynamicEndpoint() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (!m_dynamicEndpointId.hasValue()) {
             m_userInterface->printEndpointModificationError("Dynamic endpoint not added yet.");
         } else {
@@ -265,7 +256,7 @@ void InteractionManager::modifyDynamicEndpoint() {
 }
 
 void InteractionManager::deleteDynamicEndpoint() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (!m_dynamicEndpointId.hasValue()) {
             m_userInterface->printEndpointModificationError("Dynamic endpoint not added yet.");
         } else {
@@ -281,100 +272,100 @@ void InteractionManager::deleteDynamicEndpoint() {
 }
 
 void InteractionManager::endpointController() {
-    m_executor.submit([this]() { m_userInterface->printEndpointControllerScreen(); });
+    m_executor.execute([this]() { m_userInterface->printEndpointControllerScreen(); });
 }
 #endif
 
 #ifdef POWER_CONTROLLER
 void InteractionManager::powerController() {
-    m_executor.submit([this]() { m_userInterface->printPowerControllerScreen(); });
+    m_executor.execute([this]() { m_userInterface->printPowerControllerScreen(); });
 }
 #endif
 
 #ifdef TOGGLE_CONTROLLER
 void InteractionManager::toggleController() {
-    m_executor.submit([this]() { m_userInterface->printToggleControllerScreen(); });
+    m_executor.execute([this]() { m_userInterface->printToggleControllerScreen(); });
 }
 #endif
 
 #ifdef MODE_CONTROLLER
 void InteractionManager::modeController() {
-    m_executor.submit([this]() { m_userInterface->printModeControllerScreen(); });
+    m_executor.execute([this]() { m_userInterface->printModeControllerScreen(); });
 }
 #endif
 
 #ifdef RANGE_CONTROLLER
 void InteractionManager::rangeController() {
-    m_executor.submit([this]() { m_userInterface->printRangeControllerScreen(); });
+    m_executor.execute([this]() { m_userInterface->printRangeControllerScreen(); });
 }
 #endif
 
 void InteractionManager::locale() {
-    m_executor.submit([this]() { m_userInterface->printLocaleScreen(); });
+    m_executor.execute([this]() { m_userInterface->printLocaleScreen(); });
 }
 
 void InteractionManager::alarmVolumeRamp() {
-    m_executor.submit([this]() { m_userInterface->printAlarmVolumeRampScreen(); });
+    m_executor.execute([this]() { m_userInterface->printAlarmVolumeRampScreen(); });
 }
 
 void InteractionManager::wakewordConfirmation() {
-    m_executor.submit([this]() { m_userInterface->printWakeWordConfirmationScreen(); });
+    m_executor.execute([this]() { m_userInterface->printWakeWordConfirmationScreen(); });
 }
 
 void InteractionManager::speechConfirmation() {
-    m_executor.submit([this]() { m_userInterface->printSpeechConfirmationScreen(); });
+    m_executor.execute([this]() { m_userInterface->printSpeechConfirmationScreen(); });
 }
 
 void InteractionManager::timeZone() {
-    m_executor.submit([this]() { m_userInterface->printTimeZoneScreen(); });
+    m_executor.execute([this]() { m_userInterface->printTimeZoneScreen(); });
 }
 
 void InteractionManager::networkInfo() {
-    m_executor.submit([this]() { m_userInterface->printNetworkInfoScreen(); });
+    m_executor.execute([this]() { m_userInterface->printNetworkInfoScreen(); });
 }
 
 void InteractionManager::networkInfoConnectionTypePrompt() {
-    m_executor.submit([this]() { m_userInterface->printNetworkInfoConnectionTypePrompt(); });
+    m_executor.execute([this]() { m_userInterface->printNetworkInfoConnectionTypePrompt(); });
 }
 
 void InteractionManager::networkInfoESSIDPrompt() {
-    m_executor.submit([this]() { m_userInterface->printNetworkInfoESSIDPrompt(); });
+    m_executor.execute([this]() { m_userInterface->printNetworkInfoESSIDPrompt(); });
 }
 
 void InteractionManager::networkInfoBSSIDPrompt() {
-    m_executor.submit([this]() { m_userInterface->printNetworkInfoBSSIDPrompt(); });
+    m_executor.execute([this]() { m_userInterface->printNetworkInfoBSSIDPrompt(); });
 }
 
 void InteractionManager::networkInfoIpPrompt() {
-    m_executor.submit([this]() { m_userInterface->printNetworkInfoIpPrompt(); });
+    m_executor.execute([this]() { m_userInterface->printNetworkInfoIpPrompt(); });
 }
 
 void InteractionManager::networkInfoSubnetPrompt() {
-    m_executor.submit([this]() { m_userInterface->printNetworkInfoSubnetPrompt(); });
+    m_executor.execute([this]() { m_userInterface->printNetworkInfoSubnetPrompt(); });
 }
 
 void InteractionManager::networkInfoMacPrompt() {
-    m_executor.submit([this]() { m_userInterface->printNetworkInfoMacPrompt(); });
+    m_executor.execute([this]() { m_userInterface->printNetworkInfoMacPrompt(); });
 }
 
 void InteractionManager::networkInfoDHCPPrompt() {
-    m_executor.submit([this]() { m_userInterface->printNetworkInfoDHCPPrompt(); });
+    m_executor.execute([this]() { m_userInterface->printNetworkInfoDHCPPrompt(); });
 }
 
 void InteractionManager::networkInfoStaticIpPrompt() {
-    m_executor.submit([this]() { m_userInterface->printNetworkInfoStaticIpPrompt(); });
+    m_executor.execute([this]() { m_userInterface->printNetworkInfoStaticIpPrompt(); });
 }
 
 void InteractionManager::doNotDisturb() {
-    m_executor.submit([this]() { m_userInterface->printDoNotDisturbScreen(); });
+    m_executor.execute([this]() { m_userInterface->printDoNotDisturbScreen(); });
 }
 
 void InteractionManager::errorValue() {
-    m_executor.submit([this]() { m_userInterface->printErrorScreen(); });
+    m_executor.execute([this]() { m_userInterface->printErrorScreen(); });
 }
 
 void InteractionManager::microphoneToggle() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (!m_wakeWordAudioProvider) {
             return;
         }
@@ -394,25 +385,40 @@ void InteractionManager::microphoneToggle() {
     });
 }
 
+void InteractionManager::overrideHoldToTalkSpeechHandler(
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeechInteractionHandlerInterface> holdToTalkHandler) {
+    m_executor.execute([this, holdToTalkHandler]() {
+        if (m_isHoldOccurring) {
+            ACSDK_ERROR(LX("overrideHoldToTalkSpeechHandlerFailed").d("reason", "activeHoldOccurring"));
+            return;
+        } else if (holdToTalkHandler) {
+            m_holdToTalkSpeechInteractionHandler = holdToTalkHandler;
+        } else {
+            ACSDK_INFO(LX("overrideHoldToTalkSpeechHandlerReset").d("reason", "null holdToTalkHandler"));
+            m_holdToTalkSpeechInteractionHandler = m_client;
+        }
+    });
+}
+
 void InteractionManager::holdToggled() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (!m_isMicOn) {
             return;
         }
 
         if (!m_isHoldOccurring) {
-            if (m_client->notifyOfHoldToTalkStart(m_holdToTalkAudioProvider).get()) {
+            if (m_holdToTalkSpeechInteractionHandler->notifyOfHoldToTalkStart(m_holdToTalkAudioProvider).get()) {
                 m_isHoldOccurring = true;
             }
         } else {
             m_isHoldOccurring = false;
-            m_client->notifyOfHoldToTalkEnd();
+            m_holdToTalkSpeechInteractionHandler->notifyOfHoldToTalkEnd();
         }
     });
 }
 
 void InteractionManager::tap() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (!m_isMicOn) {
             return;
         }
@@ -429,80 +435,76 @@ void InteractionManager::tap() {
 }
 
 void InteractionManager::stopForegroundActivity() {
-    m_executor.submit([this]() { m_client->stopForegroundActivity(); });
+    m_executor.execute([this]() { m_client->stopForegroundActivity(); });
 }
 
 void InteractionManager::playbackPlay() {
-    m_executor.submit([this]() { m_client->getPlaybackRouter()->buttonPressed(PlaybackButton::PLAY); });
+    m_executor.execute([this]() { m_client->getPlaybackRouter()->buttonPressed(PlaybackButton::PLAY); });
 }
 
 void InteractionManager::playbackPause() {
-    m_executor.submit([this]() { m_client->getPlaybackRouter()->buttonPressed(PlaybackButton::PAUSE); });
+    m_executor.execute([this]() { m_client->getPlaybackRouter()->buttonPressed(PlaybackButton::PAUSE); });
 }
 
 void InteractionManager::playbackNext() {
-    m_executor.submit([this]() { m_client->getPlaybackRouter()->buttonPressed(PlaybackButton::NEXT); });
+    m_executor.execute([this]() { m_client->getPlaybackRouter()->buttonPressed(PlaybackButton::NEXT); });
 }
 
 void InteractionManager::playbackPrevious() {
-    m_executor.submit([this]() { m_client->getPlaybackRouter()->buttonPressed(PlaybackButton::PREVIOUS); });
+    m_executor.execute([this]() { m_client->getPlaybackRouter()->buttonPressed(PlaybackButton::PREVIOUS); });
 }
 
 void InteractionManager::playbackSkipForward() {
-    m_executor.submit([this]() { m_client->getPlaybackRouter()->buttonPressed(PlaybackButton::SKIP_FORWARD); });
+    m_executor.execute([this]() { m_client->getPlaybackRouter()->buttonPressed(PlaybackButton::SKIP_FORWARD); });
 }
 
 void InteractionManager::playbackSkipBackward() {
-    m_executor.submit([this]() { m_client->getPlaybackRouter()->buttonPressed(PlaybackButton::SKIP_BACKWARD); });
+    m_executor.execute([this]() { m_client->getPlaybackRouter()->buttonPressed(PlaybackButton::SKIP_BACKWARD); });
 }
 
-void InteractionManager::playbackShuffle() {
-    sendGuiToggleEvent(GuiRenderer::TOGGLE_NAME_SHUFFLE, PlaybackToggle::SHUFFLE);
+void InteractionManager::playbackShuffle(bool action) {
+    sendGuiToggleEvent(PlaybackToggle::SHUFFLE, action);
 }
 
-void InteractionManager::playbackLoop() {
-    sendGuiToggleEvent(GuiRenderer::TOGGLE_NAME_LOOP, PlaybackToggle::LOOP);
+void InteractionManager::playbackLoop(bool action) {
+    sendGuiToggleEvent(PlaybackToggle::LOOP, action);
 }
 
-void InteractionManager::playbackRepeat() {
-    sendGuiToggleEvent(GuiRenderer::TOGGLE_NAME_REPEAT, PlaybackToggle::REPEAT);
+void InteractionManager::playbackRepeat(bool action) {
+    sendGuiToggleEvent(PlaybackToggle::REPEAT, action);
 }
 
-void InteractionManager::playbackThumbsUp() {
-    sendGuiToggleEvent(GuiRenderer::TOGGLE_NAME_THUMBSUP, PlaybackToggle::THUMBS_UP);
+void InteractionManager::playbackThumbsUp(bool action) {
+    sendGuiToggleEvent(PlaybackToggle::THUMBS_UP, action);
 }
 
-void InteractionManager::playbackThumbsDown() {
-    sendGuiToggleEvent(GuiRenderer::TOGGLE_NAME_THUMBSDOWN, PlaybackToggle::THUMBS_DOWN);
+void InteractionManager::playbackThumbsDown(bool action) {
+    sendGuiToggleEvent(PlaybackToggle::THUMBS_DOWN, action);
 }
 
-void InteractionManager::sendGuiToggleEvent(const std::string& toggleName, PlaybackToggle toggleType) {
-    bool action = false;
-    if (m_guiRenderer) {
-        action = !m_guiRenderer->getGuiToggleState(toggleName);
-    }
-    m_executor.submit(
+void InteractionManager::sendGuiToggleEvent(PlaybackToggle toggleType, bool action) {
+    m_executor.execute(
         [this, toggleType, action]() { m_client->getPlaybackRouter()->togglePressed(toggleType, action); });
 }
 
 void InteractionManager::speakerControl() {
-    m_executor.submit([this]() { m_userInterface->printSpeakerControlScreen(); });
+    m_executor.execute([this]() { m_userInterface->printSpeakerControlScreen(); });
 }
 
 void InteractionManager::firmwareVersionControl() {
-    m_executor.submit([this]() { m_userInterface->printFirmwareVersionControlScreen(); });
+    m_executor.execute([this]() { m_userInterface->printFirmwareVersionControlScreen(); });
 }
 
 void InteractionManager::setFirmwareVersion(avsCommon::sdkInterfaces::softwareInfo::FirmwareVersion firmwareVersion) {
-    m_executor.submit([this, firmwareVersion]() { m_client->setFirmwareVersion(firmwareVersion); });
+    m_executor.execute([this, firmwareVersion]() { m_client->setFirmwareVersion(firmwareVersion); });
 }
 
 void InteractionManager::volumeControl() {
-    m_executor.submit([this]() { m_userInterface->printVolumeControlScreen(); });
+    m_executor.execute([this]() { m_userInterface->printVolumeControlScreen(); });
 }
 
 void InteractionManager::adjustVolume(avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type, int8_t delta) {
-    m_executor.submit([this, type, delta]() {
+    m_executor.execute([this, type, delta]() {
         /*
          * Group the unmute action as part of the same affordance that caused the volume change, so we don't
          * send another event. This isn't a requirement by AVS.
@@ -527,7 +529,7 @@ void InteractionManager::adjustVolume(avsCommon::sdkInterfaces::ChannelVolumeInt
 }
 
 void InteractionManager::setMute(avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type, bool mute) {
-    m_executor.submit([this, type, mute]() {
+    m_executor.execute([this, type, mute]() {
         std::future<bool> future =
             m_client->getSpeakerManager()->setMute(type, mute, SpeakerManagerInterface::NotificationProperties());
         future.get();
@@ -535,7 +537,7 @@ void InteractionManager::setMute(avsCommon::sdkInterfaces::ChannelVolumeInterfac
 }
 
 void InteractionManager::confirmResetDevice() {
-    m_executor.submit([this]() { m_userInterface->printResetConfirmation(); });
+    m_executor.execute([this]() { m_userInterface->printResetConfirmation(); });
 }
 
 void InteractionManager::resetDevice() {
@@ -548,12 +550,12 @@ void InteractionManager::resetDevice() {
 }
 
 void InteractionManager::confirmReauthorizeDevice() {
-    m_executor.submit([this]() { m_userInterface->printReauthorizeConfirmation(); });
+    m_executor.execute([this]() { m_userInterface->printReauthorizeConfirmation(); });
 }
 
 #ifdef ENABLE_COMMS
 void InteractionManager::commsControl() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_client->isCommsEnabled()) {
             m_userInterface->printCommsControlScreen();
         } else {
@@ -563,7 +565,7 @@ void InteractionManager::commsControl() {
 }
 
 void InteractionManager::acceptCall() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_client->isCommsEnabled()) {
             m_client->acceptCommsCall();
         } else {
@@ -573,7 +575,7 @@ void InteractionManager::acceptCall() {
 }
 
 void InteractionManager::stopCall() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_client->isCommsEnabled()) {
             m_client->stopCommsCall();
         } else {
@@ -583,7 +585,7 @@ void InteractionManager::stopCall() {
 }
 
 void InteractionManager::muteCallToggle() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_client->isCommsCallMuted()) {
             m_client->unmuteCommsCall();
             m_userInterface->printUnmuteCallScreen();
@@ -595,7 +597,7 @@ void InteractionManager::muteCallToggle() {
 }
 
 void InteractionManager::sendDtmf(avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone dtmfTone) {
-    m_executor.submit([this, dtmfTone]() {
+    m_executor.execute([this, dtmfTone]() {
         if (m_client->isCommsEnabled()) {
             m_client->sendDtmf(dtmfTone);
         } else {
@@ -605,15 +607,15 @@ void InteractionManager::sendDtmf(avsCommon::sdkInterfaces::CallManagerInterface
 }
 
 void InteractionManager::dtmfControl() {
-    m_executor.submit([this]() { m_userInterface->printDtmfScreen(); });
+    m_executor.execute([this]() { m_userInterface->printDtmfScreen(); });
 }
 
 void InteractionManager::errorDtmf() {
-    m_executor.submit([this]() { m_userInterface->printDtmfErrorScreen(); });
+    m_executor.execute([this]() { m_userInterface->printDtmfErrorScreen(); });
 }
 
 void InteractionManager::muteSelf() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_client->isCommsEnabled()) {
             m_client->muteCommsCall();
         } else {
@@ -623,7 +625,7 @@ void InteractionManager::muteSelf() {
 }
 
 void InteractionManager::unmuteSelf() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_client->isCommsEnabled()) {
             m_client->unmuteCommsCall();
         } else {
@@ -633,7 +635,7 @@ void InteractionManager::unmuteSelf() {
 }
 
 void InteractionManager::enableVideo() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_client->isCommsEnabled()) {
             m_client->enableVideo();
         } else {
@@ -643,7 +645,7 @@ void InteractionManager::enableVideo() {
 }
 
 void InteractionManager::disableVideo() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_client->isCommsEnabled()) {
             m_client->disableVideo();
         } else {
@@ -654,7 +656,7 @@ void InteractionManager::disableVideo() {
 #endif
 
 void InteractionManager::onDialogUXStateChanged(DialogUXState state) {
-    m_executor.submit([this, state]() {
+    m_executor.execute([this, state]() {
         if (DialogUXState::LISTENING == state) {
             if (m_isMicOn && !m_micWrapper->isStreaming()) {
                 m_micWrapper->startStreamingMicrophoneData();
@@ -672,9 +674,9 @@ void InteractionManager::onDialogUXStateChanged(DialogUXState state) {
 }
 
 void InteractionManager::onCallStateChange(CallState state) {
-    m_executor.submit([this, state]() {
+    m_executor.execute([this, state]() {
         if (CallState::CALL_CONNECTED == state) {
-            if (!m_micWrapper->isStreaming()) {
+            if (m_isMicOn && !m_micWrapper->isStreaming()) {
                 m_micWrapper->startStreamingMicrophoneData();
             }
             m_isCallConnected = true;
@@ -707,7 +709,7 @@ void InteractionManager::setLocale(const settings::DeviceLocales& value) {
 }
 
 settings::types::NetworkInfo InteractionManager::getNetworkInfo() {
-    auto netSettings = m_client->getSettingsManager()->getValue<settings::NETWORK_INFO>();
+    auto netSettings = m_client->getSettingsManager()->getValue<settings::NETWORK_INFO>(settings::types::NetworkInfo());
     return netSettings.second;
 }
 
@@ -745,26 +747,26 @@ void InteractionManager::setMode(const std::string mode) {
 
 #ifdef ENABLE_PCC
 void InteractionManager::phoneControl() {
-    m_executor.submit([this]() { m_userInterface->printPhoneControlScreen(); });
+    m_executor.execute([this]() { m_userInterface->printPhoneControlScreen(); });
 }
 
 void InteractionManager::callId() {
-    m_executor.submit([this]() { m_userInterface->printCallIdScreen(); });
+    m_executor.execute([this]() { m_userInterface->printCallIdScreen(); });
 }
 
 void InteractionManager::callerId() {
-    m_executor.submit([this]() { m_userInterface->printCallerIdScreen(); });
+    m_executor.execute([this]() { m_userInterface->printCallerIdScreen(); });
 }
 
 void InteractionManager::sendCallActivated(const std::string& callId) {
-    m_executor.submit([this, callId]() {
+    m_executor.execute([this, callId]() {
         if (m_phoneCaller) {
             m_phoneCaller->sendCallActivated(callId);
         }
     });
 }
 void InteractionManager::sendCallTerminated(const std::string& callId) {
-    m_executor.submit([this, callId]() {
+    m_executor.execute([this, callId]() {
         if (m_phoneCaller) {
             m_phoneCaller->sendCallTerminated(callId);
         }
@@ -772,7 +774,7 @@ void InteractionManager::sendCallTerminated(const std::string& callId) {
 }
 
 void InteractionManager::sendCallFailed(const std::string& callId) {
-    m_executor.submit([this, callId]() {
+    m_executor.execute([this, callId]() {
         if (m_phoneCaller) {
             m_phoneCaller->sendCallFailed(callId);
         }
@@ -780,7 +782,7 @@ void InteractionManager::sendCallFailed(const std::string& callId) {
 }
 
 void InteractionManager::sendCallReceived(const std::string& callId, const std::string& callerId) {
-    m_executor.submit([this, callId, callerId]() {
+    m_executor.execute([this, callId, callerId]() {
         if (m_phoneCaller) {
             m_phoneCaller->sendCallReceived(callId, callerId);
         }
@@ -788,7 +790,7 @@ void InteractionManager::sendCallReceived(const std::string& callId, const std::
 }
 
 void InteractionManager::sendCallerIdReceived(const std::string& callId, const std::string& callerId) {
-    m_executor.submit([this, callId, callerId]() {
+    m_executor.execute([this, callId, callerId]() {
         if (m_phoneCaller) {
             m_phoneCaller->sendCallerIdReceived(callId, callerId);
         }
@@ -796,7 +798,7 @@ void InteractionManager::sendCallerIdReceived(const std::string& callId, const s
 }
 
 void InteractionManager::sendInboundRingingStarted(const std::string& callId) {
-    m_executor.submit([this, callId]() {
+    m_executor.execute([this, callId]() {
         if (m_phoneCaller) {
             m_phoneCaller->sendInboundRingingStarted(callId);
         }
@@ -804,7 +806,7 @@ void InteractionManager::sendInboundRingingStarted(const std::string& callId) {
 }
 
 void InteractionManager::sendOutboundCallRequested(const std::string& callId) {
-    m_executor.submit([this, callId]() {
+    m_executor.execute([this, callId]() {
         if (m_phoneCaller) {
             m_phoneCaller->sendDialStarted(callId);
         }
@@ -812,7 +814,7 @@ void InteractionManager::sendOutboundCallRequested(const std::string& callId) {
 }
 
 void InteractionManager::sendOutboundRingingStarted(const std::string& callId) {
-    m_executor.submit([this, callId]() {
+    m_executor.execute([this, callId]() {
         if (m_phoneCaller) {
             m_phoneCaller->sendOutboundRingingStarted(callId);
         }
@@ -820,7 +822,7 @@ void InteractionManager::sendOutboundRingingStarted(const std::string& callId) {
 }
 
 void InteractionManager::sendSendDtmfSucceeded(const std::string& callId) {
-    m_executor.submit([this, callId]() {
+    m_executor.execute([this, callId]() {
         if (m_phoneCaller) {
             m_phoneCaller->sendSendDtmfSucceeded(callId);
         }
@@ -828,7 +830,7 @@ void InteractionManager::sendSendDtmfSucceeded(const std::string& callId) {
 }
 
 void InteractionManager::sendSendDtmfFailed(const std::string& callId) {
-    m_executor.submit([this, callId]() {
+    m_executor.execute([this, callId]() {
         if (m_phoneCaller) {
             m_phoneCaller->sendSendDtmfFailed(callId);
         }
@@ -838,26 +840,26 @@ void InteractionManager::sendSendDtmfFailed(const std::string& callId) {
 
 #ifdef ENABLE_MCC
 void InteractionManager::meetingControl() {
-    m_executor.submit([this]() { m_userInterface->printMeetingControlScreen(); });
+    m_executor.execute([this]() { m_userInterface->printMeetingControlScreen(); });
 }
 
 void InteractionManager::sessionId() {
-    m_executor.submit([this]() { m_userInterface->printSessionIdScreen(); });
+    m_executor.execute([this]() { m_userInterface->printSessionIdScreen(); });
 }
 
 void InteractionManager::calendarItemsFile() {
-    m_executor.submit([this]() { m_userInterface->printCalendarItemsScreen(); });
+    m_executor.execute([this]() { m_userInterface->printCalendarItemsScreen(); });
 }
 
 void InteractionManager::sendMeetingJoined(const std::string& sessionId) {
-    m_executor.submit([this, sessionId]() {
+    m_executor.execute([this, sessionId]() {
         if (m_meetingClient) {
             m_meetingClient->sendMeetingJoined(sessionId);
         }
     });
 }
 void InteractionManager::sendMeetingEnded(const std::string& sessionId) {
-    m_executor.submit([this, sessionId]() {
+    m_executor.execute([this, sessionId]() {
         if (m_meetingClient) {
             m_meetingClient->sendMeetingEnded(sessionId);
         }
@@ -865,7 +867,7 @@ void InteractionManager::sendMeetingEnded(const std::string& sessionId) {
 }
 
 void InteractionManager::sendSetCurrentMeetingSession(const std::string& sessionId) {
-    m_executor.submit([this, sessionId]() {
+    m_executor.execute([this, sessionId]() {
         if (m_meetingClient) {
             m_meetingClient->sendSetCurrentMeetingSession(sessionId);
         }
@@ -873,7 +875,7 @@ void InteractionManager::sendSetCurrentMeetingSession(const std::string& session
 }
 
 void InteractionManager::sendClearCurrentMeetingSession() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_meetingClient) {
             m_meetingClient->sendClearCurrentMeetingSession();
         }
@@ -881,7 +883,7 @@ void InteractionManager::sendClearCurrentMeetingSession() {
 }
 
 void InteractionManager::sendConferenceConfigurationChanged() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_meetingClient) {
             m_meetingClient->sendConferenceConfigurationChanged();
         }
@@ -889,7 +891,7 @@ void InteractionManager::sendConferenceConfigurationChanged() {
 }
 
 void InteractionManager::sendMeetingClientErrorOccured(const std::string& sessionId) {
-    m_executor.submit([this, sessionId]() {
+    m_executor.execute([this, sessionId]() {
         if (m_meetingClient) {
             m_meetingClient->sendMeetingClientErrorOccured(sessionId);
         }
@@ -897,7 +899,7 @@ void InteractionManager::sendMeetingClientErrorOccured(const std::string& sessio
 }
 
 void InteractionManager::sendCalendarItemsRetrieved(const std::string& calendarItemsFile) {
-    m_executor.submit([this, calendarItemsFile]() {
+    m_executor.execute([this, calendarItemsFile]() {
         if (m_calendarClient) {
             m_calendarClient->sendCalendarItemsRetrieved(calendarItemsFile);
         }
@@ -905,7 +907,7 @@ void InteractionManager::sendCalendarItemsRetrieved(const std::string& calendarI
 }
 
 void InteractionManager::sendCalendarClientErrorOccured() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_calendarClient) {
             m_calendarClient->sendCalendarClientErrorOccured();
         }
@@ -918,15 +920,15 @@ void InteractionManager::setDoNotDisturbMode(bool enable) {
 }
 
 void InteractionManager::diagnosticsControl() {
-    m_executor.submit([this]() { m_userInterface->printDiagnosticsScreen(); });
+    m_executor.execute([this]() { m_userInterface->printDiagnosticsScreen(); });
 }
 
 void InteractionManager::devicePropertiesControl() {
-    m_executor.submit([this]() { m_userInterface->printDevicePropertiesScreen(); });
+    m_executor.execute([this]() { m_userInterface->printDevicePropertiesScreen(); });
 }
 
 void InteractionManager::showDeviceProperties() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_diagnostics) {
             auto deviceProperties = m_diagnostics->getDevicePropertyAggregator();
             if (deviceProperties) {
@@ -937,11 +939,11 @@ void InteractionManager::showDeviceProperties() {
 }
 
 void InteractionManager::audioInjectionControl() {
-    m_executor.submit([this]() { m_userInterface->printAudioInjectionScreen(); });
+    m_executor.execute([this]() { m_userInterface->printAudioInjectionScreen(); });
 }
 
 void InteractionManager::injectWavFile(const std::string& absoluteFilePath) {
-    m_executor.submit([this, absoluteFilePath]() {
+    m_executor.execute([this, absoluteFilePath]() {
         if (!m_diagnostics) {
             ACSDK_ERROR(LX("audioInjectionFailed").d("reason", "nullDiagnosticObject"));
             m_userInterface->printAudioInjectionFailureMessage();
@@ -962,11 +964,11 @@ void InteractionManager::injectWavFile(const std::string& absoluteFilePath) {
 }
 
 void InteractionManager::deviceProtocolTraceControl() {
-    m_executor.submit([this]() { m_userInterface->printDeviceProtocolTracerScreen(); });
+    m_executor.execute([this]() { m_userInterface->printDeviceProtocolTracerScreen(); });
 }
 
 void InteractionManager::printProtocolTrace() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_diagnostics) {
             auto protocolTrace = m_diagnostics->getProtocolTracer();
             if (protocolTrace) {
@@ -977,7 +979,7 @@ void InteractionManager::printProtocolTrace() {
 }
 
 void InteractionManager::setProtocolTraceFlag(bool enabled) {
-    m_executor.submit([this, enabled]() {
+    m_executor.execute([this, enabled]() {
         if (m_diagnostics) {
             auto protocolTrace = m_diagnostics->getProtocolTracer();
             if (protocolTrace) {
@@ -989,7 +991,7 @@ void InteractionManager::setProtocolTraceFlag(bool enabled) {
 }
 
 void InteractionManager::clearProtocolTrace() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (m_diagnostics) {
             auto protocolTrace = m_diagnostics->getProtocolTracer();
             if (protocolTrace) {
@@ -1012,7 +1014,7 @@ void InteractionManager::doShutdown() {
 }
 
 void InteractionManager::sendDeviceSetupComplete() {
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         auto deviceSetup = m_client->getDeviceSetup();
         if (!deviceSetup) {
             ACSDK_ERROR(LX(__func__).m("DeviceSetup is null"));
@@ -1028,5 +1030,6 @@ void InteractionManager::sendDeviceSetupComplete() {
     });
 }
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/InteractionManager/src/KeywordObserver.cpp b/SampleApplications/Common/InteractionManager/src/KeywordObserver.cpp
new file mode 100644
index 0000000000..a40c7aa121
--- /dev/null
+++ b/SampleApplications/Common/InteractionManager/src/KeywordObserver.cpp
@@ -0,0 +1,131 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/Sample/InteractionManager/KeywordObserver.h"
+
+#include "AVSCommon/Utils/Logger/LogEntry.h"
+#include "AVSCommon/Utils/Logger/Logger.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/// String to identify log entries originating from this file.
+#define TAG "KeywordObserver"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+std::shared_ptr<KeywordObserver> KeywordObserver::create(
+    std::shared_ptr<defaultClient::DefaultClient> client,
+    capabilityAgents::aip::AudioProvider audioProvider,
+    std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> keywordDetector) {
+    auto keywordObserver = std::make_shared<KeywordObserver>(client, audioProvider);
+    if (keywordDetector) {
+        keywordDetector->addKeyWordObserver(keywordObserver);
+    }
+
+    return keywordObserver;
+}
+
+KeywordObserver::KeywordObserver(
+    std::shared_ptr<defaultClient::DefaultClient> client,
+    capabilityAgents::aip::AudioProvider audioProvider) :
+        m_client{client},
+        m_audioProvider{audioProvider} {
+}
+
+/**
+ * Compute the start of speech timestamp used in UPL calculations. This is calculated by taking the time detected on
+ * wakeword to the time and subtracting the duration of the wakeword uttered to determine time at the start of the
+ * wakeword. @c startOfSpeechTimestamp must be set to the time on wakeword detected for this calculation to work. If
+ * wakeword duration can not be calculated start of speech timestamp is left as the time on wakeword detected.
+ *
+ * @param wakewordBeingIndex The begin index of the first part of the keyword found within the @c stream.
+ * @param wakewordEndIndex The end index of the last part of the keyword within the @c stream.
+ * @param sampleRateHz The SampleRate in Hz of the @c stream.
+ * @param stream The stream in which the keyword was detected.
+ * @param startOfSpeechTimestamp Moment in time to calculate when user started talking to Alexa.
+ */
+static void computeStartOfSpeechTimestamp(
+    const avsCommon::avs::AudioInputStream::Index wakewordBeginIndex,
+    const avsCommon::avs::AudioInputStream::Index wakewordEndIndex,
+    const int sampleRateHz,
+    const std::shared_ptr<avsCommon::avs::AudioInputStream>& stream,
+    std::chrono::steady_clock::time_point& startOfSpeechTimestamp) {
+    // Create a reader to get the current index position
+    static const auto startWithNewData = true;
+    if (!stream) {
+        ACSDK_WARN(LX("onKeywordDetected").m("Audio stream was null, using default offset."));
+        return;
+    }
+
+    auto reader = stream->createReader(avsCommon::avs::AudioInputStream::Reader::Policy::NONBLOCKING, startWithNewData);
+    if (!reader) {
+        ACSDK_WARN(LX("onKeywordDetected").m("Reader was null, using default offset."));
+        return;
+    }
+
+    // Get the current index position
+    const auto currentIndex = reader->tell();
+
+    if (currentIndex <= wakewordBeginIndex) {
+        ACSDK_WARN(LX("onKeywordDetected").m("Index wrapping occurred, using default offset."));
+        // Note: this should never happen, since it should not be possible for millions of years w/ 64-bit indexes.
+        return;
+    }
+
+    // Translate the currentIndex position to a time duration elapsed since the end of wakeword
+    const auto sampleRatePerMillisec = sampleRateHz / 1000;
+
+    const auto timeSinceStartOfWW =
+        std::chrono::milliseconds((currentIndex - wakewordBeginIndex) / sampleRatePerMillisec);
+    ACSDK_DEBUG9(LX(__func__).d("timeSinceStartOfWW", timeSinceStartOfWW.count()));
+
+    // Adjust the start of speech timestamp to be the start of the WW.
+    startOfSpeechTimestamp -= timeSinceStartOfWW;
+}
+
+void KeywordObserver::onKeyWordDetected(
+    std::shared_ptr<avsCommon::avs::AudioInputStream> stream,
+    std::string keyword,
+    avsCommon::avs::AudioInputStream::Index beginIndex,
+    avsCommon::avs::AudioInputStream::Index endIndex,
+    std::shared_ptr<const std::vector<char>> KWDMetadata) {
+    if (endIndex != avsCommon::sdkInterfaces::KeyWordObserverInterface::UNSPECIFIED_INDEX &&
+        beginIndex == avsCommon::sdkInterfaces::KeyWordObserverInterface::UNSPECIFIED_INDEX) {
+        if (m_client) {
+            m_client->notifyOfTapToTalk(m_audioProvider, endIndex);
+        }
+    } else if (
+        endIndex != avsCommon::sdkInterfaces::KeyWordObserverInterface::UNSPECIFIED_INDEX &&
+        beginIndex != avsCommon::sdkInterfaces::KeyWordObserverInterface::UNSPECIFIED_INDEX) {
+        if (m_client) {
+            auto startOfSpeechTimestamp = std::chrono::steady_clock::now();
+            computeStartOfSpeechTimestamp(
+                beginIndex, endIndex, m_audioProvider.format.sampleRateHz, stream, startOfSpeechTimestamp);
+            m_client->notifyOfWakeWord(
+                m_audioProvider, beginIndex, endIndex, keyword, startOfSpeechTimestamp, KWDMetadata);
+        }
+    }
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApp/src/UIManager.cpp b/SampleApplications/Common/InteractionManager/src/UIManager.cpp
similarity index 89%
rename from SampleApp/src/UIManager.cpp
rename to SampleApplications/Common/InteractionManager/src/UIManager.cpp
index 36bb4378d8..80f806ffae 100644
--- a/SampleApp/src/UIManager.cpp
+++ b/SampleApplications/Common/InteractionManager/src/UIManager.cpp
@@ -19,17 +19,16 @@
 #include <AVSCommon/SDKInterfaces/DialogUXStateObserverInterface.h>
 #include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
 #include <AVSCommon/Utils/SDKVersion.h>
 #include <Settings/SettingStringConversion.h>
 #include <Settings/SpeechConfirmationSettingType.h>
 #include <Settings/WakeWordConfirmationSettingType.h>
 
-#include "SampleApp/ConsolePrinter.h"
-#include "SampleApp/UIManager.h"
+#include "acsdk/Sample/Console/ConsolePrinter.h"
+#include "acsdk/Sample/InteractionManager/UIManager.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("UIManager");
+#define TAG "UIManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -39,7 +38,8 @@ static const std::string TAG("UIManager");
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::utils;
@@ -599,6 +599,7 @@ std::shared_ptr<UIManager> UIManager::create(
         ACSDK_ERROR(LX("createFailed").d("reason", "nullDeviceInfo"));
         return nullptr;
     }
+
     return std::shared_ptr<UIManager>(new UIManager(localeAssetsManager, deviceInfo));
 }
 
@@ -632,7 +633,7 @@ static const std::string DTMF_MESSAGE =
     "+----------------------------------------------------------------------------+\n";
 
 void UIManager::onDialogUXStateChanged(DialogUXState state) {
-    m_executor.submit([this, state]() {
+    m_executor.execute([this, state]() {
         if (state == m_dialogState) {
             return;
         }
@@ -642,7 +643,7 @@ void UIManager::onDialogUXStateChanged(DialogUXState state) {
 }
 
 void UIManager::onConnectionStatusChanged(const Status status, const ChangedReason reason) {
-    m_executor.submit([this, status]() {
+    m_executor.execute([this, status]() {
         if (m_connectionStatus == status) {
             return;
         }
@@ -652,7 +653,7 @@ void UIManager::onConnectionStatusChanged(const Status status, const ChangedReas
 }
 
 void UIManager::onSettingChanged(const std::string& key, const std::string& value) {
-    m_executor.submit([key, value]() {
+    m_executor.execute([key, value]() {
         std::string msg = key + " set to " + value;
         ConsolePrinter::prettyPrint(msg);
     });
@@ -662,7 +663,7 @@ void UIManager::onSpeakerSettingsChanged(
     const SpeakerManagerObserverInterface::Source& source,
     const ChannelVolumeInterface::Type& type,
     const SpeakerInterface::SpeakerSettings& settings) {
-    m_executor.submit([source, type, settings]() {
+    m_executor.execute([source, type, settings]() {
         std::ostringstream oss;
         oss << "SOURCE:" << source << " TYPE:" << type << " VOLUME:" << static_cast<int>(settings.volume)
             << " MUTE:" << settings.mute;
@@ -671,7 +672,7 @@ void UIManager::onSpeakerSettingsChanged(
 }
 
 void UIManager::onSetIndicator(avsCommon::avs::IndicatorState state) {
-    m_executor.submit([state]() {
+    m_executor.execute([state]() {
         std::ostringstream oss;
         oss << "NOTIFICATION INDICATOR STATE: " << state;
         ConsolePrinter::prettyPrint(oss.str());
@@ -679,11 +680,11 @@ void UIManager::onSetIndicator(avsCommon::avs::IndicatorState state) {
 }
 
 void UIManager::printMessage(const std::string& message) {
-    m_executor.submit([message]() { ConsolePrinter::prettyPrint(message); });
+    m_executor.execute([message]() { ConsolePrinter::prettyPrint(message); });
 }
 
 void UIManager::onAuthStateChange(AuthObserverInterface::State newState, AuthObserverInterface::Error newError) {
-    m_executor.submit([this, newState, newError]() {
+    m_executor.execute([this, newState, newError]() {
         if (m_authState != newState) {
             m_authState = newState;
             switch (m_authState) {
@@ -730,6 +731,10 @@ void UIManager::onAuthStateChange(AuthObserverInterface::State newState, AuthObs
                     }
                     break;
             }
+
+            if (m_uiAuthNotifier) {
+                m_uiAuthNotifier->notifyAuthorizationStateChange(m_authState);
+            }
         }
     });
 }
@@ -739,7 +744,7 @@ void UIManager::onCapabilitiesStateChange(
     CapabilitiesDelegateObserverInterface::Error newError,
     const std::vector<avsCommon::sdkInterfaces::endpoints::EndpointIdentifier>& addedOrUpdatedEndpoints,
     const std::vector<avsCommon::sdkInterfaces::endpoints::EndpointIdentifier>& deletedEndpoints) {
-    m_executor.submit([this, newState, newError, addedOrUpdatedEndpoints, deletedEndpoints]() {
+    m_executor.execute([this, newState, newError, addedOrUpdatedEndpoints, deletedEndpoints]() {
         // If one of the added or updated endpointIds is the default endpoint, and the
         // add/update failed, go into limited mode.
         // Limited mode is unnecessary if the failure is for non-default endpoints.
@@ -777,61 +782,61 @@ void UIManager::onCapabilitiesStateChange(
 }
 
 void UIManager::printWelcomeScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(ALEXA_WELCOME_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(ALEXA_WELCOME_MESSAGE); });
 }
 
 void UIManager::printHelpScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(HELP_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(HELP_MESSAGE); });
 }
 
 void UIManager::printLimitedHelp() {
-    m_executor.submit(
+    m_executor.execute(
         [this]() { ConsolePrinter::simplePrint(LIMITED_HELP_HEADER + m_failureStatus + LIMITED_HELP_MESSAGE); });
 }
 
 void UIManager::printAudioInjectionHeader() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(AUDIO_INJECTION_HEADER); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(AUDIO_INJECTION_HEADER); });
 }
 
 void UIManager::printSettingsScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(SETTINGS_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(SETTINGS_MESSAGE); });
 }
 
 #ifdef ENABLE_ENDPOINT_CONTROLLERS
 void UIManager::printEndpointModificationScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(ENDPOINT_MODIFICATION_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(ENDPOINT_MODIFICATION_MESSAGE); });
 }
 
 void UIManager::printEndpointModificationError(const std::string& message) {
-    m_executor.submit([message]() { ConsolePrinter::prettyPrint(message); });
+    m_executor.execute([message]() { ConsolePrinter::prettyPrint(message); });
 }
 
 void UIManager::printEndpointControllerScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(ENDPOINT_CONTROLLER_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(ENDPOINT_CONTROLLER_MESSAGE); });
 }
 #endif
 
 #ifdef POWER_CONTROLLER
 void UIManager::printPowerControllerScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(POWER_CONTROLLER_OPTIONS); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(POWER_CONTROLLER_OPTIONS); });
 }
 #endif
 
 #ifdef TOGGLE_CONTROLLER
 void UIManager::printToggleControllerScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(TOGGLE_CONTROLLER_OPTIONS); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(TOGGLE_CONTROLLER_OPTIONS); });
 }
 #endif
 
 #ifdef MODE_CONTROLLER
 void UIManager::printModeControllerScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(MODE_CONTROLLER_OPTIONS); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(MODE_CONTROLLER_OPTIONS); });
 }
 #endif
 
 #ifdef RANGE_CONTROLLER
 void UIManager::printRangeControllerScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(RANGE_CONTROLLER_OPTIONS); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(RANGE_CONTROLLER_OPTIONS); });
 }
 #endif
 
@@ -858,165 +863,165 @@ void UIManager::printLocaleScreen() {
         ConsolePrinter::simplePrint(LOCALE_MESSAGE_HEADER + optionString + LOCALE_MESSAGE_FOOTER);
     };
 
-    m_executor.submit(printLocaleMessage);
+    m_executor.execute(printLocaleMessage);
 }
 
 void UIManager::printSpeakerControlScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(SPEAKER_CONTROL_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(SPEAKER_CONTROL_MESSAGE); });
 }
 
 void UIManager::printFirmwareVersionControlScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(FIRMWARE_CONTROL_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(FIRMWARE_CONTROL_MESSAGE); });
 }
 
 void UIManager::printVolumeControlScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(VOLUME_CONTROL_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(VOLUME_CONTROL_MESSAGE); });
 }
 
 #ifdef ENABLE_PCC
 void UIManager::printPhoneControlScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(PHONE_CONTROL_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(PHONE_CONTROL_MESSAGE); });
 }
 
 void UIManager::printCallIdScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(ENTER_CALL_ID_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(ENTER_CALL_ID_MESSAGE); });
 }
 
 void UIManager::printCallerIdScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(ENTER_CALLER_ID_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(ENTER_CALLER_ID_MESSAGE); });
 }
 #endif
 
 #ifdef ENABLE_MCC
 void UIManager::printMeetingControlScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(MEETING_CONTROL_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(MEETING_CONTROL_MESSAGE); });
 }
 
 void UIManager::printSessionIdScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(ENTER_SESSION_ID_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(ENTER_SESSION_ID_MESSAGE); });
 }
 
 void UIManager::printCalendarItemsScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(ENTER_CALENDAR_ITEMS_FILE_PATH_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(ENTER_CALENDAR_ITEMS_FILE_PATH_MESSAGE); });
 }
 #endif
 
 #ifdef ENABLE_COMMS
 void UIManager::printCommsControlScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(COMMS_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(COMMS_MESSAGE); });
 }
 
 void UIManager::printDtmfScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(DTMF_MESSAGE); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(DTMF_MESSAGE); });
 }
 
 void UIManager::printDtmfErrorScreen() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint("Invalid Dtmf Tones"); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint("Invalid Dtmf Tones"); });
 }
 
 void UIManager::printMuteCallScreen() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint("Mute the call"); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint("Mute the call"); });
 }
 
 void UIManager::printUnmuteCallScreen() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint("Unmute the call"); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint("Unmute the call"); });
 }
 #endif
 
 void UIManager::printErrorScreen() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint("Invalid Option"); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint("Invalid Option"); });
 }
 
 void UIManager::microphoneOff() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint("Microphone Off!"); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint("Microphone Off!"); });
 }
 
 void UIManager::printResetConfirmation() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(RESET_CONFIRMATION); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(RESET_CONFIRMATION); });
 }
 
 void UIManager::printReauthorizeConfirmation() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(REAUTHORIZE_CONFIRMATION); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(REAUTHORIZE_CONFIRMATION); });
 }
 
 void UIManager::printResetWarning() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint(RESET_WARNING); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint(RESET_WARNING); });
 }
 
 void UIManager::printAlarmVolumeRampScreen() {
-    m_executor.submit([]() {
+    m_executor.execute([]() {
         ConsolePrinter::simplePrint(ALARM_VOLUME_RAMP_HEADER);
         ConsolePrinter::simplePrint(ENABLE_SETTING_MENU);
     });
 }
 
 void UIManager::printDoNotDisturbScreen() {
-    m_executor.submit([]() {
+    m_executor.execute([]() {
         ConsolePrinter::simplePrint(DONOTDISTURB_CONFIRMATION_HEADER);
         ConsolePrinter::simplePrint(ENABLE_SETTING_MENU);
     });
 }
 
 void UIManager::printWakeWordConfirmationScreen() {
-    m_executor.submit([]() {
+    m_executor.execute([]() {
         ConsolePrinter::simplePrint(WAKEWORD_CONFIRMATION_HEADER);
         ConsolePrinter::simplePrint(ENABLE_SETTING_MENU);
     });
 }
 
 void UIManager::printSpeechConfirmationScreen() {
-    m_executor.submit([]() {
+    m_executor.execute([]() {
         ConsolePrinter::simplePrint(SPEECH_CONFIRMATION_HEADER);
         ConsolePrinter::simplePrint(ENABLE_SETTING_MENU);
     });
 }
 
 void UIManager::printTimeZoneScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(TIMEZONE_SETTING_MENU); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(TIMEZONE_SETTING_MENU); });
 }
 
 void UIManager::printNetworkInfoScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(NETWORK_INFO_SETTING_MENU); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(NETWORK_INFO_SETTING_MENU); });
 }
 
 void UIManager::printNetworkInfoConnectionTypePrompt() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_CONNECTION_TYPE_PROMPT); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_CONNECTION_TYPE_PROMPT); });
 }
 
 void UIManager::printNetworkInfoESSIDPrompt() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_ESSID_PROMPT); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_ESSID_PROMPT); });
 }
 
 void UIManager::printNetworkInfoBSSIDPrompt() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_BSSID_PROMPT); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_BSSID_PROMPT); });
 }
 
 void UIManager::printNetworkInfoIpPrompt() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_IP_PROMPT); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_IP_PROMPT); });
 }
 
 void UIManager::printNetworkInfoSubnetPrompt() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_SUBNET_MASK_PROMPT); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_SUBNET_MASK_PROMPT); });
 }
 
 void UIManager::printNetworkInfoMacPrompt() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_MAC_ADDRESS_PROMPT); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_MAC_ADDRESS_PROMPT); });
 }
 
 void UIManager::printNetworkInfoDHCPPrompt() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_DHCP_ADDRESS_PROMPT); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_DHCP_ADDRESS_PROMPT); });
 }
 
 void UIManager::printNetworkInfoStaticIpPrompt() {
-    m_executor.submit([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_STATIC_IP_PROMPT); });
+    m_executor.execute([]() { ConsolePrinter::prettyPrint(NETWORK_INFO_STATIC_IP_PROMPT); });
 }
 
 void UIManager::printDiagnosticsScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(DIAGNOSTICS_SCREEN); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(DIAGNOSTICS_SCREEN); });
 }
 
 void UIManager::printDevicePropertiesScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(DEVICE_PROPERTIES_SCREEN); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(DEVICE_PROPERTIES_SCREEN); });
 }
 
 void UIManager::printAllDeviceProperties(const std::unordered_map<std::string, std::string>& deviceProperties) {
@@ -1025,33 +1030,43 @@ void UIManager::printAllDeviceProperties(const std::unordered_map<std::string, s
         ss << keyVal.first << ":" << keyVal.second << std::endl;
     }
     auto propertiesString = ss.str();
-    m_executor.submit([propertiesString]() { ConsolePrinter::simplePrint(propertiesString); });
+    m_executor.execute([propertiesString]() { ConsolePrinter::simplePrint(propertiesString); });
 }
 
 void UIManager::printDeviceProtocolTracerScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(DEVICE_PROTOCOL_TRACE_SCREEN); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(DEVICE_PROTOCOL_TRACE_SCREEN); });
 }
 
 void UIManager::printProtocolTrace(const std::string& protocolTrace) {
-    m_executor.submit([protocolTrace]() { ConsolePrinter::simplePrint(protocolTrace); });
+    m_executor.execute([protocolTrace]() { ConsolePrinter::simplePrint(protocolTrace); });
 }
 
 void UIManager::printProtocolTraceFlag(bool enabled) {
-    m_executor.submit([enabled]() {
+    m_executor.execute([enabled]() {
         ConsolePrinter::simplePrint("Protocol trace : " + std::string(enabled ? "Enabled" : "Disabled"));
     });
 }
 
 void UIManager::printAudioInjectionScreen() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint(AUDIO_INJECTION_SCREEN); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint(AUDIO_INJECTION_SCREEN); });
 }
 
 void UIManager::printAudioInjectionFailureMessage() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint("Failure injecting audio file."); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint("Failure injecting audio file."); });
+}
+
+void UIManager::setUIStateAggregator(
+    std::shared_ptr<acsdkSampleApplicationInterfaces::UIStateAggregatorInterface> uiStateAggregator) {
+    m_executor.execute([this, uiStateAggregator]() { m_uiStateAggregator = std::move(uiStateAggregator); });
+}
+
+void UIManager::setUIAuthNotifier(
+    std::shared_ptr<acsdkSampleApplicationInterfaces::UIAuthNotifierInterface> uiAuthNotifier) {
+    m_executor.execute([this, uiAuthNotifier]() { m_uiAuthNotifier = std::move(uiAuthNotifier); });
 }
 
 void UIManager::microphoneOn() {
-    m_executor.submit([this]() { printState(); });
+    m_executor.execute([this]() { printState(); });
 }
 
 void UIManager::onBooleanSettingNotification(
@@ -1064,7 +1079,7 @@ void UIManager::onBooleanSettingNotification(
         msg = "ERROR: Failed to set " + name + ". ";
     }
     msg += name + " is " + std::string(state ? "ON" : "OFF");
-    m_executor.submit([msg]() { ConsolePrinter::prettyPrint(msg); });
+    m_executor.execute([msg]() { ConsolePrinter::prettyPrint(msg); });
 }
 
 template <typename SettingType>
@@ -1079,44 +1094,55 @@ void UIManager::onSettingNotification(
     }
     stream << name << " is " << settings::toSettingString<SettingType>(value).second;
     std::string msg = stream.str();
-    m_executor.submit([msg]() { ConsolePrinter::prettyPrint(msg); });
+    m_executor.execute([msg]() { ConsolePrinter::prettyPrint(msg); });
 }
 
 void UIManager::printState() {
+    std::string alexaState;
     if (m_connectionStatus == avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::Status::DISCONNECTED) {
         ConsolePrinter::prettyPrint("Client not connected!");
+        alexaState = "DISCONNECTED";
     } else if (m_connectionStatus == avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::Status::PENDING) {
         ConsolePrinter::prettyPrint("Connecting...");
+        alexaState = "CONNECTING";
     } else if (m_connectionStatus == avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::Status::CONNECTED) {
         switch (m_dialogState) {
             case DialogUXState::IDLE:
                 ConsolePrinter::prettyPrint("Alexa is currently idle!");
-                return;
+                alexaState = "IDLE";
+                break;
             case DialogUXState::LISTENING:
                 ConsolePrinter::prettyPrint("Listening...");
-                return;
+                alexaState = "LISTENING";
+                break;
             case DialogUXState::EXPECTING:
                 ConsolePrinter::prettyPrint("Expecting...");
-                return;
+                alexaState = "EXPECTING";
+                break;
             case DialogUXState::THINKING:
                 ConsolePrinter::prettyPrint("Thinking...");
-                return;
+                alexaState = "THINKING";
+                break;
             case DialogUXState::SPEAKING:
                 ConsolePrinter::prettyPrint("Speaking...");
-                return;
-            /*
-             * This is an intermediate state after a SPEAK directive is completed. In the case of a speech burst the
-             * next SPEAK could kick in or if its the last SPEAK directive ALEXA moves to the IDLE state. So we do
-             * nothing for this state.
-             */
+                alexaState = "SPEAKING";
+                break;
+                /*
+                 * This is an intermediate state after a SPEAK directive is completed. In the case of a speech burst the
+                 * next SPEAK could kick in or if its the last SPEAK directive ALEXA moves to the IDLE state. So we do
+                 * nothing for this state.
+                 */
             case DialogUXState::FINISHED:
                 return;
         }
     }
+    if (m_uiStateAggregator && !alexaState.empty()) {
+        m_uiStateAggregator->notifyAlexaState(alexaState);
+    }
 }
 
 void UIManager::printCommsNotSupported() {
-    m_executor.submit([]() { ConsolePrinter::simplePrint("Comms is not supported in this device."); });
+    m_executor.execute([]() { ConsolePrinter::simplePrint("Comms is not supported in this device."); });
 }
 
 void UIManager::setFailureStatus(const std::string& status) {
@@ -1167,7 +1193,7 @@ bool UIManager::configureSettingsNotifications(std::shared_ptr<settings::DeviceS
 }
 
 void UIManager::onActiveDeviceConnected(const DeviceAttributes& deviceAttributes) {
-    m_executor.submit([deviceAttributes]() {
+    m_executor.execute([deviceAttributes]() {
         std::ostringstream oss;
         oss << "SUPPORTED SERVICES: ";
         std::string separator = "";
@@ -1180,7 +1206,7 @@ void UIManager::onActiveDeviceConnected(const DeviceAttributes& deviceAttributes
 }
 
 void UIManager::onActiveDeviceDisconnected(const DeviceAttributes& deviceAttributes) {
-    m_executor.submit([deviceAttributes]() {
+    m_executor.execute([deviceAttributes]() {
         std::ostringstream oss;
         oss << "SUPPORTED SERVICES: ";
         std::string separator = "";
@@ -1192,5 +1218,6 @@ void UIManager::onActiveDeviceDisconnected(const DeviceAttributes& deviceAttribu
     });
 }
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/LibSampleApp/CMakeLists.txt b/SampleApplications/Common/LibSampleApp/CMakeLists.txt
new file mode 100644
index 0000000000..545def276c
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+project(acsdkSampleApp LANGUAGES CXX)
+add_subdirectory("src")
diff --git a/SampleApp/include/SampleApp/CaptionPresenter.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/CaptionPresenter.h
similarity index 89%
rename from SampleApp/include/SampleApp/CaptionPresenter.h
rename to SampleApplications/Common/LibSampleApp/include/SampleApp/CaptionPresenter.h
index 3fc883b42c..9f9fd2aaf7 100644
--- a/SampleApp/include/SampleApp/CaptionPresenter.h
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/CaptionPresenter.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_CAPTIONPRESENTER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_CAPTIONPRESENTER_H_
+#ifndef SAMPLEAPP_CAPTIONPRESENTER_H_
+#define SAMPLEAPP_CAPTIONPRESENTER_H_
 
 #include <Captions/CaptionManagerInterface.h>
 #include <Captions/CaptionPresenterInterface.h>
@@ -48,4 +48,4 @@ class CaptionPresenter : public captions::CaptionPresenterInterface {
 }  // namespace sampleApp
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_CAPTIONPRESENTER_H_
+#endif  // SAMPLEAPP_CAPTIONPRESENTER_H_
diff --git a/SampleApp/include/SampleApp/ConsoleReader.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/ConsoleReader.h
similarity index 92%
rename from SampleApp/include/SampleApp/ConsoleReader.h
rename to SampleApplications/Common/LibSampleApp/include/SampleApp/ConsoleReader.h
index b70edc836e..1f637d9578 100644
--- a/SampleApp/include/SampleApp/ConsoleReader.h
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/ConsoleReader.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_CONSOLEREADER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_CONSOLEREADER_H_
+#ifndef SAMPLEAPP_CONSOLEREADER_H_
+#define SAMPLEAPP_CONSOLEREADER_H_
 
 #include <atomic>
 #include <chrono>
@@ -93,4 +93,4 @@ class ConsoleReader {
 }  // namespace sampleApp
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_CONSOLEREADER_H_
+#endif  // SAMPLEAPP_CONSOLEREADER_H_
diff --git a/SampleApplications/Common/LibSampleApp/include/SampleApp/ExternalCapabilitiesBuilder.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/ExternalCapabilitiesBuilder.h
new file mode 100644
index 0000000000..0d88172200
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/ExternalCapabilitiesBuilder.h
@@ -0,0 +1,121 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef SAMPLEAPP_EXTERNALCAPABILITIESBUILDER_H_
+#define SAMPLEAPP_EXTERNALCAPABILITIESBUILDER_H_
+
+#include <AVSCommon/Utils/DeviceInfo.h>
+#include <DefaultClient/ExternalCapabilitiesBuilderInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApp {
+/**
+ * This class provides a facility to add external capabilities to default client.
+ *
+ * Default client will provide its core components in the build call.
+ *
+ * @note Any object created during the buildCapabilities that keep a pointer to a core component should be added or
+ * managed by an object in the list of @c RequiresShutdown objects returned by buildCapabilities(). This will ensure
+ * that these objects are shutdown during @c DefaultClient shutdown and before any core component is shutdown.
+ */
+class ExternalCapabilitiesBuilder : public alexaClientSDK::defaultClient::ExternalCapabilitiesBuilderInterface {
+public:
+    /**
+     * Constructor.
+     *
+     * @param deviceInfo DeviceInfo which reflects the device setup credentials.
+     */
+    ExternalCapabilitiesBuilder(std::shared_ptr<avsCommon::utils::DeviceInfo> deviceInfo);
+
+    /// @name ExternalCapabilitiesBuilderInterface methods.
+    /// @{
+    ExternalCapabilitiesBuilder& withSettingsStorage(
+        std::shared_ptr<alexaClientSDK::settings::storage ::DeviceSettingStorageInterface> settingStorage) override;
+
+    ExternalCapabilitiesBuilder& withTemplateRunTime(
+        std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeInterface> templateRuntime) override;
+
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::CallManagerInterface> getCallManager() override;
+
+    ExternalCapabilitiesBuilder& withInternetConnectionMonitor(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>
+            internetConnectionMonitor) override;
+
+    ExternalCapabilitiesBuilder& withDialogUXStateAggregator(
+        std::shared_ptr<alexaClientSDK::avsCommon::avs::DialogUXStateAggregator> dialogUXStateAggregator) override;
+
+    ExternalCapabilitiesBuilder& withAlexaInterfaceMessageSender(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>
+            alexaMessageSender) override;
+
+    std::pair<std::list<Capability>, std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>>
+    buildCapabilities(
+        std::shared_ptr<alexaClientSDK::acsdkExternalMediaPlayer::ExternalMediaPlayer> externalMediaPlayer,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSConnectionManagerInterface> connectionManager,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        std::shared_ptr<alexaClientSDK::certifiedSender::CertifiedSender> certifiedSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::FocusManagerInterface> audioFocusManager,
+        std::shared_ptr<alexaClientSDK::registrationManager::CustomerDataManagerInterface> dataManager,
+        std::shared_ptr<alexaClientSDK::capabilityAgents::system::ReportStateHandler> stateReportHandler,
+        std::shared_ptr<alexaClientSDK::capabilityAgents::aip::AudioInputProcessor> audioInputProcessor,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerManagerInterface> speakerManager,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::DirectiveSequencerInterface> directiveSequencer,
+        std::shared_ptr<avsCommon::sdkInterfaces::UserInactivityMonitorInterface> userInactivityMonitor,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSGatewayManagerInterface> avsGatewayManager,
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> ringtoneMediaPlayer,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::audio::AudioFactoryInterface> audioFactory,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface>
+            ringtoneChannelVolumeInterface,
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> commsSpeaker,
+        std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream> sharedDataStream,
+#endif
+        std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface> powerResourceManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::ComponentReporterInterface> softwareComponentReporter,
+        std::shared_ptr<avsCommon::sdkInterfaces::PlaybackRouterInterface> playbackRouter,
+        std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>
+            endpointRegistrationManager,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) override;
+    /// @}
+
+private:
+    /// DeviceInfo which reflects the device setup credentials.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::DeviceInfo> m_deviceInfo;
+
+    /// When GUI is enabled, this will hold the TemplateRuntime Capability Agent.
+    std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeInterface> m_templateRuntime;
+
+    /// When COMMS is enabled, this will hold the CallManager.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::CallManagerInterface> m_callManager;
+
+    /// When COMMS is enabled, this will hold the DialogUXStateAggregator
+    std::shared_ptr<alexaClientSDK::avsCommon::avs::DialogUXStateAggregator> m_dialogUXStateAggregator;
+
+    /// When COMMS is enabled, this will hold the InternetConnectionMonitor.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>
+        m_internetConnectionMonitor;
+
+    /// Message Sender for Response events on Alexa Interface
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>
+        m_alexaMessageSender;
+};
+
+}  // namespace sampleApp
+}  // namespace alexaClientSDK
+
+#endif  // SAMPLEAPP_EXTERNALCAPABILITIESBUILDER_H_
diff --git a/SampleApplications/Common/LibSampleApp/include/SampleApp/GuiRenderer.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/GuiRenderer.h
new file mode 100644
index 0000000000..64845e3f18
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/GuiRenderer.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef SAMPLEAPP_GUIRENDERER_H_
+#define SAMPLEAPP_GUIRENDERER_H_
+
+#include <map>
+#include <string>
+
+#include <AVSCommon/Utils/Optional.h>
+#include <acsdk/TemplateRuntimeInterfaces/TemplateRuntimeObserverInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApp {
+
+/**
+ * A class that implements the TemplateRuntimeObserverInterface.  Instead of rendering the
+ * display cards, this class will print out some useful information (e.g. JSON payload)
+ * when the renderTemplateCard or renderPlayerInfoCard callbacks are called.
+ *
+ * It is also used to track the PlayerInfo controls, and provide the PlayerInfo toggle states.
+ *
+ * @note Due to the payload in RenderTemplate may contain sensitive information, the
+ * payload will only be printed if @c ACSDK_EMIT_SENSITIVE_LOGS is ON.
+ */
+class GuiRenderer : public templateRuntimeInterfaces::TemplateRuntimeObserverInterface {
+public:
+    /**
+     * Constructor.
+     */
+    GuiRenderer();
+
+    /// @name TemplateRuntimeObserverInterface Functions
+    /// @{
+    void renderTemplateCard(const std::string& jsonPayload) override;
+    void renderPlayerInfoCard(const std::string& jsonPayload, TemplateRuntimeObserverInterface::AudioPlayerInfo info)
+        override;
+    /// @}
+
+    /**
+     * Returns the UI state of a toggle button
+     * @param toggleName Name of the toggle button
+     * @return Optional boolean if the toggle button name is valid. True if button is set, false otherwise.
+     */
+    avsCommon::utils::Optional<bool> getGuiToggleState(const std::string& toggleName);
+
+    /// String to identify the AVS action SELECTED string.
+    static const std::string TOGGLE_ACTION_SELECTED;
+    /// String to identify the AVS action DESELECTED string.
+    static const std::string TOGGLE_ACTION_DESELECTED;
+    /// String to identify the AVS name SHUFFLE string.
+    static const std::string TOGGLE_NAME_SHUFFLE;
+    /// String to identify the AVS name LOOP string.
+    static const std::string TOGGLE_NAME_LOOP;
+    /// String to identify the AVS name REPEAT string.
+    static const std::string TOGGLE_NAME_REPEAT;
+    /// String to identify the AVS name THUMBS_UP string.
+    static const std::string TOGGLE_NAME_THUMBSUP;
+    /// String to identify the AVS name THUMBS_DOWN string.
+    static const std::string TOGGLE_NAME_THUMBSDOWN;
+
+private:
+    /// Last known toggle states.
+    std::map<std::string, bool> m_guiToggleStateMap;
+
+    /// Clear the template card.
+    void clearTemplateCard();
+
+    /// Clear the music player template card.
+    void clearPlayerInfoCard();
+};
+
+}  // namespace sampleApp
+}  // namespace alexaClientSDK
+
+#endif  // SAMPLEAPP_GUIRENDERER_H_
diff --git a/SampleApplications/Common/LibSampleApp/include/SampleApp/KeywordObserver.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/KeywordObserver.h
new file mode 100644
index 0000000000..cbc7aada09
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/KeywordObserver.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef SAMPLEAPP_KEYWORDOBSERVER_H_
+#define SAMPLEAPP_KEYWORDOBSERVER_H_
+
+#include <memory>
+#include <string>
+
+#include <acsdkKWDImplementations/AbstractKeywordDetector.h>
+#include <AVSCommon/AVS/AudioInputStream.h>
+#include <AVSCommon/SDKInterfaces/KeyWordObserverInterface.h>
+#include <DefaultClient/DefaultClient.h>
+
+namespace alexaClientSDK {
+namespace sampleApp {
+
+/**
+ * Observes callbacks from keyword detections and notifies the DefaultClient that a wake word has occurred.
+ */
+class KeywordObserver : public avsCommon::sdkInterfaces::KeyWordObserverInterface {
+public:
+    /**
+     * Creates a KeywordObserver and registers as an observer to a KeywordDetector.
+     *
+     * @param client The default SDK client.
+     * @param audioProvider The audio provider from which to stream audio data from.
+     * @param keywordDetector The @c AbstractKeywordDetector to self register to as an observer.
+     *
+     * @return a @c KeywordObserver.
+     */
+    static std::shared_ptr<KeywordObserver> create(
+        std::shared_ptr<defaultClient::DefaultClient> client,
+        capabilityAgents::aip::AudioProvider audioProvider,
+        std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> keywordDetector);
+
+    /**
+     * Constructor.
+     *
+     * @param client The default SDK client.
+     * @param audioProvider The audio provider from which to stream audio data from.
+     */
+    KeywordObserver(
+        std::shared_ptr<defaultClient::DefaultClient> client,
+        capabilityAgents::aip::AudioProvider audioProvider);
+
+    /// @name KeyWordObserverInterface Functions
+    /// @{
+    void onKeyWordDetected(
+        std::shared_ptr<avsCommon::avs::AudioInputStream> stream,
+        std::string keyword,
+        avsCommon::avs::AudioInputStream::Index beginIndex = UNSPECIFIED_INDEX,
+        avsCommon::avs::AudioInputStream::Index endIndex = UNSPECIFIED_INDEX,
+        std::shared_ptr<const std::vector<char>> KWDMetadata = nullptr) override;
+    /// @}
+
+private:
+    /// The default SDK client.
+    std::shared_ptr<defaultClient::DefaultClient> m_client;
+
+    /// The audio provider.
+    capabilityAgents::aip::AudioProvider m_audioProvider;
+};
+
+}  // namespace sampleApp
+}  // namespace alexaClientSDK
+
+#endif  // SAMPLEAPP_KEYWORDOBSERVER_H_
diff --git a/SampleApplications/Common/LibSampleApp/include/SampleApp/LocaleAssetsManager.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/LocaleAssetsManager.h
new file mode 100644
index 0000000000..99b777101b
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/LocaleAssetsManager.h
@@ -0,0 +1,299 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef SAMPLEAPP_LOCALEASSETSMANAGER_H_
+#define SAMPLEAPP_LOCALEASSETSMANAGER_H_
+
+#include <map>
+#include <memory>
+#include <mutex>
+#include <set>
+#include <unordered_set>
+
+#include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
+#include <AVSCommon/SDKInterfaces/LocaleAssetsManagerInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#ifdef KWD
+#ifdef ASSET_MANAGER
+#include <acsdkAssetManager/AssetManager.h>
+#endif
+#include <acsdkKWDImplementations/AbstractKeywordDetector.h>
+#include <AVSCommon/AVS/AudioInputStream.h>
+#include <AVSCommon/Utils/AudioFormat.h>
+#include <DefaultClient/DefaultClient.h>
+#endif
+
+namespace alexaClientSDK {
+namespace sampleApp {
+
+#if defined(KWD) && defined(ASSET_MANAGER)
+using namespace acsdkAssets::manager;
+#endif
+/**
+ * Sample implementation of an asset manager.
+ *
+ * This manager will use the @c AlexaClientSDKConfig.json to retrieve the supported locales. For devices with wake word
+ * enabled this class will support "ALEXA" only.
+ */
+class LocaleAssetsManager
+        : public avsCommon::sdkInterfaces::LocaleAssetsManagerInterface
+        , public avsCommon::utils::RequiresShutdown {
+public:
+    /**
+     * Create an instance of @c LocaleAssetsManagerInterface.
+     *
+     * @param configurationNode A pointer to the @c ConfigurationNode instance.
+     * @param shutdownNotifier A pointer to the @c ShutdownNotifier instance.
+     * @return A pointer to the @c LocaleAssetsManagerInterface.
+     */
+    static std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface> createLocaleAssetsManagerInterface(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+        const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier);
+
+    /**
+     * Create an instance of @c LocaleAssetsManager.
+     *
+     * @param configurationNode A pointer to the @c ConfigurationNode instance.
+     * @return A pointer to a new LocaleAssetsManager object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<LocaleAssetsManager> createLocaleAssetsManager(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode);
+
+    /**
+     * Create a LocaleAssetsManager object.
+     *
+     * @deprecated
+     * @return A pointer to a new LocaleAssetsManager object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<LocaleAssetsManager> create(bool enableWakeWord);
+
+    /// @name LocaleAssetsManagerInterface methods
+    /// @{
+    bool changeAssets(const Locales& locales, const WakeWords& wakeWords) override;
+    void cancelOngoingChange() override;
+    WakeWordsSets getDefaultSupportedWakeWords() const override;
+    std::map<LanguageTag, WakeWordsSets> getLanguageSpecificWakeWords() const override;
+    std::map<Locale, WakeWordsSets> getLocaleSpecificWakeWords() const override;
+    WakeWordsSets getSupportedWakeWords(const Locale& locale) const override;
+    std::set<Locale> getSupportedLocales() const override;
+    LocaleCombinations getSupportedLocaleCombinations() const override;
+    Locale getDefaultLocale() const override;
+    Locales getDefaultLocales() const override;
+    void addLocaleAssetsObserver(
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>& observer)
+        override;
+    void removeLocaleAssetsObserver(
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>& observer)
+        override;
+    void onConfigurationChanged(const alexaClientSDK::avsCommon::avs::CapabilityConfiguration& configuration) override;
+    void setEndpointRegistrationManager(
+        const std::shared_ptr<
+            alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>& manager)
+        override;
+    /// @}
+
+    /// @name RequiresShutdown methods
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+#ifdef KWD
+#ifdef ASSET_MANAGER
+    /**
+     * Create an instance of @c LocaleAssetsManagerInterface with KWD and DAVS Asset Manager support.
+     *
+     * @param configurationNode A pointer to the @c ConfigurationNode instance.
+     * @param shutdownNotifier A pointer to the @c ShutdownNotifier instance.
+     * @param audioInputStream A pointer to the @c AudioInputStream instance.
+     * @param audioFormat A pointer to the @c AudioFormat instance.
+     * @param keywordDetector A pointer to the @c AbstractKeywordDetector instance.
+     * @param assetManager A pointer to the @c DavsAssetManager instance.
+     * @return A pointer to the @c LocaleAssetsManagerInterface.
+     */
+    static std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>
+    createLocaleAssetsManagerInterfaceWithKwdAndDavs(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+        const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector,
+        const std::shared_ptr<AssetManager>& assetManager);
+
+    /**
+     * Create an instance of @c LocaleAssetsManager with KWD and DAVS Asset Manager support.
+     *
+     * @param configurationNode A pointer to the @c ConfigurationNode instance.
+     * @param audioInputStream A pointer to the @c AudioInputStream instance.
+     * @param audioFormat A pointer to the @c AudioFormat instance.
+     * @param keywordDetector A pointer to the @c AbstractKeywordDetector instance.
+     * @param assetManager A pointer to the @c DavsAssetManager instance.
+     * @return A pointer to a new LocaleAssetsManager object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<LocaleAssetsManager> createLocaleAssetsManagerWithKwdAndDavs(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector,
+        const std::shared_ptr<AssetManager>& assetManager);
+#else
+    /**
+     * Create an instance of @c LocaleAssetsManagerInterface with KWD support.
+     *
+     * @param configurationNode A pointer to the @c ConfigurationNode instance.
+     * @param shutdownNotifier A pointer to the @c ShutdownNotifier instance.
+     * @param audioInputStream A pointer to the @c AudioInputStream instance.
+     * @param audioFormat A pointer to the @c AudioFormat instance.
+     * @param keywordDetector A pointer to the @c AbstractKeywordDetector instance.
+     * @return A pointer to the @c LocaleAssetsManagerInterface.
+     */
+    static std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>
+    createLocaleAssetsManagerInterfaceWithKwd(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+        const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector);
+
+    /**
+     * Create an instance of @c LocaleAssetsManager with KWD support.
+     *
+     * @param configurationNode A pointer to the @c ConfigurationNode instance.
+     * @param audioInputStream A pointer to the @c AudioInputStream instance.
+     * @param audioFormat A pointer to the @c AudioFormat instance.
+     * @param keywordDetector A pointer to the @c AbstractKeywordDetector instance.
+     * @return A pointer to a new LocaleAssetsManager object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<LocaleAssetsManager> createLocaleAssetsManagerWithKwd(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector);
+#endif
+    void setDefaultClient(const std::shared_ptr<defaultClient::DefaultClient>& defaultClient);
+#endif
+private:
+    /**
+     * Constructor.
+     */
+    LocaleAssetsManager();
+
+#ifdef KWD
+#ifdef ASSET_MANAGER
+    /**
+     * Constructor with KWD and DAVS Asset Manager support.
+     *
+     * @param audioInputStream AudioInputStream.
+     * @param audioFormat AudioFormat.
+     * @param keywordDetector AbstractKeywordDetector.
+     * @param assetManager Davs AssetManager.
+     */
+    LocaleAssetsManager(
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector,
+        const std::shared_ptr<AssetManager>& assetManager);
+#else
+    /**
+     * Constructor with KWD support.
+     *
+     * @param audioFormat AudioInputStream.
+     * @param audioFormat AudioFormat.
+     * @param keywordDetector AbstractKeywordDetector.
+     */
+    LocaleAssetsManager(
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector);
+#endif
+#endif
+    /**
+     * Initialize the assets manager object.
+     *
+     * @param configurationNode The @c ConfigurationNode pointer.
+     * @return @c true if it succeeds; otherwise, return @c false.
+     */
+    bool initialize(const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode);
+
+    /**
+     * Initialize the assets manager object.
+     *
+     * @param enableWakeWord Indicates whether wake words are enabled in this device or not.
+     * @param configurationNode The @c ConfigurationNode instance.
+     * @return @c true if it succeeds; otherwise, return @c false.
+     */
+    bool initialize(bool enableWakeWord, const avsCommon::utils::configuration::ConfigurationNode& configurationNode);
+
+    /// Set with the supported wake words. This object doesn't support different wake words per locale.
+    WakeWordsSets m_supportedWakeWords;
+
+    /// Set with the supported locales.
+    std::set<Locale> m_supportedLocales;
+
+    /// Vector of supported locales combinations.
+    LocaleCombinations m_supportedLocalesCombinations;
+
+    /// The default locale.
+    Locale m_defaultLocale;
+
+    /// The default multilingual locale.
+    Locales m_defaultLocales;
+
+#ifdef KWD
+    /// The stream of audio data.
+    const std::shared_ptr<avsCommon::avs::AudioInputStream> m_audioInputStream;
+    /// The audio format.
+    const std::shared_ptr<avsCommon::utils::AudioFormat> m_audioFormat;
+
+    /// Mutex to synchronize access to m_DefaultClient.
+    std::mutex m_defaultClientMutex;
+
+    /// Mutex to synchronize access to m_keywordDetector.
+    std::mutex m_keywordDetectorMutex;
+
+    //// Members below are modified after initialization and hence should be synchronized.
+
+    /// The default SDK client.
+    std::shared_ptr<defaultClient::DefaultClient> m_DefaultClient;
+
+    /// The Wakeword Detector which can wake up the client using audio input.
+    std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> m_keywordDetector;
+#ifdef ASSET_MANAGER
+    /// Davs AssetManager.
+    std::shared_ptr<AssetManager> m_assetManager;
+#endif
+#endif
+
+    /// Mutex to synchronize access to observers.
+    mutable std::mutex m_observersMutex;
+
+    /// Mutex to synchronize access to @c EndpointRegistrationManager.
+    std::mutex m_ermMutex;
+
+    //// Members below are modified after initialization and hence should be synchronized.
+
+    /// Set with observers.
+    std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>>
+        m_observers;
+
+    /// Dynamically update wakewords/locales capabilitie changes.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>
+        m_endpointRegistrationManager;
+};
+
+}  // namespace sampleApp
+}  // namespace alexaClientSDK
+
+#endif  // SAMPLEAPP_LOCALEASSETSMANAGER_H_
diff --git a/SampleApplications/Common/LibSampleApp/include/SampleApp/RevokeAuthorizationObserver.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/RevokeAuthorizationObserver.h
new file mode 100644
index 0000000000..8a11d96897
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/RevokeAuthorizationObserver.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef SAMPLEAPP_REVOKEAUTHORIZATIONOBSERVER_H_
+#define SAMPLEAPP_REVOKEAUTHORIZATIONOBSERVER_H_
+
+#include <memory>
+
+#include <AVSCommon/SDKInterfaces/RevokeAuthorizationObserverInterface.h>
+#include <RegistrationManager/RegistrationManagerInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApp {
+
+/**
+ * Observes callbacks from revoke authorization requests and notifies the default client.
+ */
+class RevokeAuthorizationObserver : public avsCommon::sdkInterfaces::RevokeAuthorizationObserverInterface {
+public:
+    /**
+     * Constructor.
+     *
+     * @param manager The registration manager providing logout functionality.
+     */
+    RevokeAuthorizationObserver(std::shared_ptr<registrationManager::RegistrationManagerInterface> manager);
+
+    /// @name RevokeAuthorizationObserverInterface Functions
+    /// @{
+    void onRevokeAuthorization() override;
+    /// @}
+
+private:
+    /// The registration manager used to logout.
+    std::shared_ptr<registrationManager::RegistrationManagerInterface> m_manager;
+};
+
+}  // namespace sampleApp
+}  // namespace alexaClientSDK
+#endif  // SAMPLEAPP_REVOKEAUTHORIZATIONOBSERVER_H_
diff --git a/SampleApp/include/SampleApp/SDKDiagnostics.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/SDKDiagnostics.h
similarity index 93%
rename from SampleApp/include/SampleApp/SDKDiagnostics.h
rename to SampleApplications/Common/LibSampleApp/include/SampleApp/SDKDiagnostics.h
index 0ab8d8baf6..87577c8c11 100644
--- a/SampleApp/include/SampleApp/SDKDiagnostics.h
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/SDKDiagnostics.h
@@ -12,8 +12,8 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SDKDIAGNOSTICS_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SDKDIAGNOSTICS_H_
+#ifndef SAMPLEAPP_SDKDIAGNOSTICS_H_
+#define SAMPLEAPP_SDKDIAGNOSTICS_H_
 
 #include <memory>
 
@@ -78,4 +78,4 @@ class SDKDiagnostics : public avsCommon::sdkInterfaces::diagnostics::Diagnostics
 }  // namespace sampleApp
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_SDKDIAGNOSTICS_H_
+#endif  // SAMPLEAPP_SDKDIAGNOSTICS_H_
diff --git a/SampleApplications/Common/LibSampleApp/include/SampleApp/SampleApplication.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/SampleApplication.h
new file mode 100644
index 0000000000..5ae4ca795c
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/SampleApplication.h
@@ -0,0 +1,325 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef SAMPLEAPP_SAMPLEAPPLICATION_H_
+#define SAMPLEAPP_SAMPLEAPPLICATION_H_
+
+#include <fstream>
+#include <map>
+#include <memory>
+#include <tuple>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include <acsdkAuthorization/AuthorizationManager.h>
+#include <acsdkAuthorization/LWA/LWAAuthorizationAdapter.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
+#include <AVSCommon/SDKInterfaces/ApplicationMediaInterfaces.h>
+#include <AVSCommon/SDKInterfaces/ChannelVolumeInterface.h>
+#include <AVSCommon/SDKInterfaces/Diagnostics/DiagnosticsInterface.h>
+#include <AVSCommon/Utils/MediaPlayer/PooledMediaPlayerFactory.h>
+#include <CapabilitiesDelegate/CapabilitiesDelegate.h>
+#include <DefaultClient/EqualizerRuntimeSetup.h>
+#include <acsdkExternalMediaPlayer/ExternalMediaPlayer.h>
+
+#include "ConsoleReader.h"
+
+#include "SampleApp/GuiRenderer.h"
+#include "SampleApplicationReturnCodes.h"
+#include "UserInputManager.h"
+
+#ifdef GSTREAMER_MEDIA_PLAYER
+#include <MediaPlayer/MediaPlayer.h>
+#elif defined(ANDROID_MEDIA_PLAYER)
+#include <AndroidSLESMediaPlayer/AndroidSLESMediaPlayer.h>
+#endif
+
+#ifdef BLUETOOTH_BLUEZ_PULSEAUDIO_OVERRIDE_ENDPOINTS
+#include <BlueZ/PulseAudioBluetoothInitializer.h>
+#endif
+
+namespace alexaClientSDK {
+namespace sampleApp {
+
+/// Class to manage the top-level components of the AVS Client Application
+class SampleApplication {
+public:
+    /**
+     * Create a SampleApplication.
+     *
+     * @param consoleReader The @c ConsoleReader to read inputs from console.
+     * @param configFiles The vector of configuration files.
+     * @param logLevel The level of logging to enable.  If this parameter is an empty string, the SDK's default
+     *     logging level will be used.
+     * @param diagnostics An optional @c DiagnosticsInterface object to provide diagnostics on the SDK.
+     * @return A new @c SampleApplication, or @c nullptr if the operation failed.
+     */
+    static std::unique_ptr<SampleApplication> create(
+        std::shared_ptr<alexaClientSDK::sampleApp::ConsoleReader> consoleReader,
+        const std::vector<std::string>& configFiles,
+        const std::string& logLevel = "",
+        std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics = nullptr);
+
+    /**
+     * Runs the application, blocking until the user asks the application to quit or a device reset is triggered.
+     *
+     * @return Returns a @c SampleAppReturnCode.
+     */
+    SampleAppReturnCode run();
+
+#ifdef DIAGNOSTICS
+    /**
+     * Initiates application stop for restart sequence. This method notifies event loop that the application
+     * should be terminated with subsequent restart, in other words, if the application is running, it should
+     * return SampleAppReturnCode::RESTART code.
+     *
+     * @return True if restart has been successfully initiated, false on error or if operation is not supported.
+     */
+    bool initiateRestart();
+#endif
+
+    /// Destructor which manages the @c SampleApplication shutdown sequence.
+    ~SampleApplication();
+
+    /**
+     * Exposes the default client.
+     *
+     * @return Returns a reference to the @c DefaultClient.
+     */
+    std::shared_ptr<alexaClientSDK::defaultClient::DefaultClient> getDefaultClient();
+
+    /**
+     * Method to create mediaPlayers for the optional music provider adapters plugged into the SDK.
+     *
+     * @param httpContentFetcherFactory The HTTPContentFetcherFactory to be used while creating the mediaPlayers.
+     * @param equalizerRuntimeSetup Equalizer runtime setup to register equalizers
+     * @return @c true if the mediaPlayer of all the registered adapters could be created @c false otherwise.
+     */
+    bool createMediaPlayersForAdapters(
+        const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
+            httpContentFetcherFactory,
+        std::shared_ptr<defaultClient::EqualizerRuntimeSetup> equalizerRuntimeSetup);
+
+    /**
+     * Instances of this class register ExternalMediaAdapters. Each adapter registers itself by instantiating
+     * a static instance of the below class supplying their business name and creator method.
+     */
+    class AdapterRegistration {
+    public:
+        /**
+         * Register an @c ExternalMediaAdapter for use by @c ExternalMediaPlayer.
+         *
+         * @param playerId The @c playerId identifying the @c ExternalMediaAdapter to register.
+         * @param createFunction The function to use to create instances of the specified @c ExternalMediaAdapter.
+         */
+        AdapterRegistration(
+            const std::string& playerId,
+            acsdkExternalMediaPlayer::ExternalMediaPlayer::AdapterCreateFunction createFunction);
+    };
+
+    /**
+     * Instances of this class register MediaPlayers to be created. Each third-party adapter registers a mediaPlayer
+     * for itself by instantiating a static instance of the below class supplying their business name, speaker interface
+     * type and creator method.
+     */
+    class MediaPlayerRegistration {
+    public:
+        /**
+         * Register a @c MediaPlayer for use by a music provider adapter.
+         *
+         * @param playerId The @c playerId identifying the @c ExternalMediaAdapter to register.
+         * @param speakerType The SpeakerType of the mediaPlayer to be created.
+         */
+        MediaPlayerRegistration(
+            const std::string& playerId,
+            avsCommon::sdkInterfaces::ChannelVolumeInterface::Type speakerType);
+    };
+
+private:
+    /**
+     * Initialize a SampleApplication.
+     *
+     * @param consoleReader The @c ConsoleReader to read inputs from console.
+     * @param configFiles The vector of configuration files.
+     * @param logLevel The level of logging to enable.  If this parameter is an empty string, the SDK's default
+     *     logging level will be used.
+     * @param diagnostics An optional @c DiagnosticsInterface object to provide diagnostics on the SDK.
+     * @return @c true if initialization succeeded, else @c false.
+     */
+    bool initialize(
+        std::shared_ptr<alexaClientSDK::sampleApp::ConsoleReader> consoleReader,
+        const std::vector<std::string>& configFiles,
+        const std::string& logLevel,
+        std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics);
+
+    /**
+     * Create an application media player.
+     *
+     * @param contentFetcherFactory Used to create objects that can fetch remote HTTP content.
+     * @param enableEqualizer Flag indicating if equalizer should be enabled for this media player.
+     * @param name The media player instance name used for logging purpose.
+     * @param enableLiveMode Flag, indicating if the player is in live mode.
+     * @return Application Media interface if it succeeds; otherwise, return @c nullptr.
+     */
+    std::shared_ptr<avsCommon::sdkInterfaces::ApplicationMediaInterfaces> createApplicationMediaPlayer(
+        const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
+            httpContentFetcherFactory,
+        bool enableEqualizer,
+        const std::string& name,
+        bool enableLiveMode = false);
+
+#ifdef ENABLE_ENDPOINT_CONTROLLERS
+    /**
+     * Function to add Toggle, Range and Mode handlers to the Default endpoint.
+     *
+     * @param defaultEndpointBuilder The reference to default endpoint's @c EndpointBuilderInterface used for adding
+     * controllers.
+     * @return Returns @c true if successful in adding all the three controllers otherwise @c false.
+     */
+
+    bool addControllersToDefaultEndpoint(
+        std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> defaultEndpointBuilder);
+
+    /**
+     * Function to add Power, Toggle, Range and Mode handlers to the Peripheral endpoint.
+     *
+     * @param peripheralEndpointBuilder The reference to peripheral endpoint's @c EndpointBuilder used for adding
+     * controllers.
+     * @param diagnostics Diagnostics interface which provides suite of APIs for diagnostic insight into SDK.
+     * @return Returns @c true if successful in adding all the four controllers otherwise @c false.
+     */
+    bool addControllersToPeripheralEndpoint(
+        std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> peripheralEndpointBuilder,
+        std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics);
+#endif
+    /// Object with which to trigger shutdown operations.
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> m_shutdownManager;
+
+    /// Object to manage lifecycle of Alexa Client SDK initialization.
+    std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit> m_sdkInit;
+
+    /// The @c DefaultClient which "glues" together all other modules.
+    std::shared_ptr<alexaClientSDK::defaultClient::DefaultClient> m_client;
+
+    /// The @c InteractionManager which perform user requests.
+    std::shared_ptr<sampleApplications::common::InteractionManager> m_interactionManager;
+
+    /// The @c UserInputManager which controls the client.
+    std::shared_ptr<UserInputManager> m_userInputManager;
+
+    /// The @c GuiRender which provides an abstraction to visual rendering
+    std::shared_ptr<GuiRenderer> m_guiRenderer;
+
+    /// The map of the adapters and their mediaPlayers.
+    std::unordered_map<std::string, std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface>>
+        m_externalMusicProviderMediaPlayersMap;
+
+    /// The map of the adapters and their mediaPlayers.
+    std::unordered_map<std::string, std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>>
+        m_externalMusicProviderSpeakersMap;
+
+    /// The vector of components requiring shutdown
+    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>> m_shutdownRequiredList;
+
+    /// The @c MediaPlayer used by @c SpeechSynthesizer.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_speakMediaPlayer;
+
+    /// The Pool of @c MediaPlayers used by @c AudioPlayer (via @c PooledMediaPlayerFactory)
+    std::vector<std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface>> m_audioMediaPlayerPool;
+
+    /// The @c MediaPlayer used by @c Alerts.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_alertsMediaPlayer;
+
+    /// The @c MediaPlayer used by @c NotificationsCapabilityAgent.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_notificationsMediaPlayer;
+
+    /// The @c MediaPlayer used by @c Bluetooth.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_bluetoothMediaPlayer;
+
+    /// The @c MediaPlayer used by @c SystemSoundPlayer.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_systemSoundMediaPlayer;
+
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+    /// The @c MediaPlayer used by @c Comms.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_commsMediaPlayer;
+#endif
+
+#ifdef ENABLE_PCC
+    /// The @c MediaPlayer used by PhoneCallController.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_phoneMediaPlayer;
+#endif
+
+    /// The @c CapabilitiesDelegate used by the client.
+    std::shared_ptr<alexaClientSDK::capabilitiesDelegate::CapabilitiesDelegate> m_capabilitiesDelegate;
+
+    /// The @c MediaPlayer used by @c NotificationsCapabilityAgent.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_ringtoneMediaPlayer;
+
+    /// The singleton map from @c playerId to @c ChannelVolumeInterface::Type.
+    static std::unordered_map<std::string, avsCommon::sdkInterfaces::ChannelVolumeInterface::Type>
+        m_playerToSpeakerTypeMap;
+
+    /// The singleton map from @c playerId to @c ExternalMediaAdapter creation functions.
+    static acsdkExternalMediaPlayer::ExternalMediaPlayer::AdapterCreationMap m_adapterToCreateFuncMap;
+
+#if defined(ANDROID_MEDIA_PLAYER) || defined(ANDROID_MICROPHONE)
+    /// The android OpenSL ES engine used to create media players and microphone.
+    std::shared_ptr<applicationUtilities::androidUtilities::AndroidSLESEngine> m_openSlEngine;
+#endif
+
+#ifdef BLUETOOTH_BLUEZ_PULSEAUDIO_OVERRIDE_ENDPOINTS
+    /// Initializer object to reload PulseAudio Bluetooth modules.
+    std::shared_ptr<bluetoothImplementations::blueZ::PulseAudioBluetoothInitializer> m_pulseAudioInitializer;
+#endif
+
+#ifdef POWER_CONTROLLER
+    /// The @c PeripheralEndpointPowerControllerHandler used by @c InteractionManager
+    std::shared_ptr<sampleApplications::common::PeripheralEndpointPowerControllerHandler>
+        m_peripheralEndpointPowerHandler;
+#endif
+
+#ifdef TOGGLE_CONTROLLER
+    /// The @c PeripheralEndpointToggleControllerHandler used by @c InteractionManager
+    std::shared_ptr<sampleApplications::common::PeripheralEndpointToggleControllerHandler>
+        m_peripheralEndpointToggleHandler;
+#endif
+
+#ifdef RANGE_CONTROLLER
+    /// The @c PeripheralEndpointRangeControllerHandler used by @c InteractionManager
+    std::shared_ptr<sampleApplications::common::PeripheralEndpointRangeControllerHandler>
+        m_peripheralEndpointRangeHandler;
+#endif
+
+#ifdef MODE_CONTROLLER
+    /// The @c PeripheralEndpointModeControllerHandler used by @c InteractionManager
+    std::shared_ptr<sampleApplications::common::PeripheralEndpointModeControllerHandler>
+        m_peripheralEndpointModeHandler;
+#endif
+
+    /// The @c AuthorizationManager instance that can be used to dynamically authorize with different methods.
+    std::shared_ptr<acsdkAuthorization::AuthorizationManager> m_authManager;
+
+    /// The adapter that supports authorizing with LWA based methods.
+    std::shared_ptr<acsdkAuthorization::lwa::LWAAuthorizationAdapter> m_lwaAdapter;
+};
+
+}  // namespace sampleApp
+}  // namespace alexaClientSDK
+
+#endif  // SAMPLEAPP_SAMPLEAPPLICATION_H_
diff --git a/SampleApplications/Common/LibSampleApp/include/SampleApp/SampleApplicationComponent.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/SampleApplicationComponent.h
new file mode 100644
index 0000000000..709df5d2f1
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/SampleApplicationComponent.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef SAMPLEAPP_SAMPLEAPPLICATIONCOMPONENT_H_
+#define SAMPLEAPP_SAMPLEAPPLICATIONCOMPONENT_H_
+
+#include <istream>
+#include <memory>
+#include <vector>
+
+#include <acsdkAuthorizationInterfaces/LWA/CBLAuthorizationObserverInterface.h>
+#include <acsdkManufactory/Component.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/Sample/InteractionManager/UIManager.h>
+#include <AVSCommon/SDKInterfaces/AuthDelegateInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/LocaleAssetsManagerInterface.h>
+#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
+#include <AVSCommon/AVS/Attachment/AttachmentManagerInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include <AVSCommon/Utils/DeviceInfo.h>
+
+#include <RegistrationManager/CustomerDataManagerInterface.h>
+
+namespace alexaClientSDK {
+namespace acsdkSampleApplication {
+
+/**
+ * Definition of the Manufactory component for the Sample App.
+ *
+ */
+using SampleApplicationComponent = acsdkManufactory::Component<
+#ifndef ACSDK_ACS_UTILS
+    std::shared_ptr<acsdkAuthorizationInterfaces::lwa::CBLAuthorizationObserverInterface>,
+#endif
+    std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit>,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>,
+    std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>,
+    std::shared_ptr<avsCommon::utils::DeviceInfo>,
+    std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>,
+    std::shared_ptr<registrationManager::CustomerDataManagerInterface>,
+    std::shared_ptr<sampleApplications::common::UIManager>,
+    std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>,
+    std::shared_ptr<cryptoInterfaces::KeyStoreInterface>>;
+
+/**
+ * Get the manufactory @c Component for acsdkSampleApp.
+ *
+ * For applications that have not transitioned to using the manufactory to instantiate SDK components, they can
+ * provide pre-built custom implementations of the @c AuthDelegateInterface and @c MetricRecorderInterface.
+ *
+ * @param initParams The @c InitializationParameters to use when initializing the SDK Sample App.
+ * @param requiresShutdownList The @c RequiresShutdown vector to which newly instantiated objects can be added.
+ * @param MetricRecorderInterface Optional pre-built implementation of @c MetricRecorderInterface to add to the
+ * manufactory. Default is nullptr.
+ * @param logger Optional pre-built implementation of @c Logger to add to the manufactory. Default is nullptr.
+ * @return The manufactory @c Component for acsdkSampleApp.
+ */
+SampleApplicationComponent getComponent(
+    std::unique_ptr<avsCommon::avs::initialization::InitializationParameters> initParams,
+    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>>& requiresShutdownList,
+    const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder = nullptr,
+    const std::shared_ptr<avsCommon::utils::logger::Logger>& logger = nullptr);
+
+}  // namespace acsdkSampleApplication
+}  // namespace alexaClientSDK
+
+#endif  // SAMPLEAPP_SAMPLEAPPLICATIONCOMPONENT_H_
diff --git a/SampleApplications/Common/LibSampleApp/include/SampleApp/SampleApplicationReturnCodes.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/SampleApplicationReturnCodes.h
new file mode 100644
index 0000000000..feea4ed4fd
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/SampleApplicationReturnCodes.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef SAMPLEAPP_SAMPLEAPPLICATIONRETURNCODES_H_
+#define SAMPLEAPP_SAMPLEAPPLICATIONRETURNCODES_H_
+
+#include <cstdlib>
+
+namespace alexaClientSDK {
+namespace sampleApp {
+
+enum SampleAppReturnCode {
+    /// The SampleApp exits in success.
+    OK = EXIT_SUCCESS,
+    /// The SampleApp exits in failure.
+    ERROR = EXIT_FAILURE,
+    /// The SampleApp exits and needs a restart.
+    RESTART
+};
+
+}  // namespace sampleApp
+}  // namespace alexaClientSDK
+
+#endif  // SAMPLEAPP_SAMPLEAPPLICATIONRETURNCODES_H_
diff --git a/SampleApplications/Common/LibSampleApp/include/SampleApp/SampleEqualizerModeController.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/SampleEqualizerModeController.h
new file mode 100644
index 0000000000..50b189d283
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/SampleEqualizerModeController.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef SAMPLEAPP_SAMPLEEQUALIZERMODECONTROLLER_H_
+#define SAMPLEAPP_SAMPLEEQUALIZERMODECONTROLLER_H_
+
+#include <list>
+#include <memory>
+#include <mutex>
+
+#include <acsdkEqualizerInterfaces/EqualizerModeControllerInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApp {
+
+/**
+ * Sample implementation of @c EqualizerModeControllerInterface that prints the mode requested to console.
+ */
+class SampleEqualizerModeController : public acsdkEqualizerInterfaces::EqualizerModeControllerInterface {
+public:
+    /**
+     * Factory method to create an instance of @c EqualizerModeControllerInterface.
+     *
+     * @return An instance of @c EqualizerModeControllerInterface.
+     */
+    static std::shared_ptr<acsdkEqualizerInterfaces::EqualizerModeControllerInterface>
+    createEqualizerModeControllerInterface();
+
+    /**
+     * Factory method.
+     *
+     * @deprecated
+     * @return An instance of @c SampleEqualizerModeController.
+     */
+    static std::shared_ptr<SampleEqualizerModeController> create();
+
+    /// @name EqualizerModeControllerInterface methods
+    /// @{
+
+    bool setEqualizerMode(acsdkEqualizerInterfaces::EqualizerMode mode) override;
+
+    ///@}
+
+private:
+    /**
+     * Constructor.
+     */
+    SampleEqualizerModeController() = default;
+};
+
+}  // namespace sampleApp
+}  // namespace alexaClientSDK
+
+#endif  // SAMPLEAPP_SAMPLEEQUALIZERMODECONTROLLER_H_
diff --git a/SampleApp/include/SampleApp/UserInputManager.h b/SampleApplications/Common/LibSampleApp/include/SampleApp/UserInputManager.h
similarity index 88%
rename from SampleApp/include/SampleApp/UserInputManager.h
rename to SampleApplications/Common/LibSampleApp/include/SampleApp/UserInputManager.h
index a201ef61ae..d9dc1ba188 100644
--- a/SampleApp/include/SampleApp/UserInputManager.h
+++ b/SampleApplications/Common/LibSampleApp/include/SampleApp/UserInputManager.h
@@ -13,17 +13,18 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_USERINPUTMANAGER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_USERINPUTMANAGER_H_
+#ifndef SAMPLEAPP_USERINPUTMANAGER_H_
+#define SAMPLEAPP_USERINPUTMANAGER_H_
 
 #include <atomic>
 #include <memory>
 
 #include <AVSCommon/SDKInterfaces/LocaleAssetsManagerInterface.h>
 #include <RegistrationManager/RegistrationObserverInterface.h>
+#include <acsdk/Sample/InteractionManager/InteractionManager.h>
 
 #include "ConsoleReader.h"
-#include "InteractionManager.h"
+#include "GuiRenderer.h"
 #include "SampleApplicationReturnCodes.h"
 
 namespace alexaClientSDK {
@@ -39,13 +40,15 @@ class UserInputManager
      * Create a UserInputManager.
      *
      * @param interactionManager An instance of the @c InteractionManager used to manage user input.
+     * @param guiRenderer An instance of @c GuiRenderer to be used to fetch playback states.
      * @param consoleReader The @c ConsoleReader to read inputs from console.
      * @param localeAssetsManager The @c LocaleAssetsManagerInterface that provides the supported locales.
      * @param defaultEndpointId The @c EndpointIdentifier of the default endpoint.
      * @return Returns a new @c UserInputManager, or @c nullptr if the operation failed.
      */
     static std::unique_ptr<UserInputManager> create(
-        std::shared_ptr<InteractionManager> interactionManager,
+        std::shared_ptr<sampleApplications::common::InteractionManager> interactionManager,
+        std::shared_ptr<GuiRenderer> guiRenderer,
         std::shared_ptr<ConsoleReader> consoleReader,
         std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface> localeAssetsManager,
         const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& defaultEndpointId);
@@ -67,12 +70,14 @@ class UserInputManager
      * Constructor.
      *
      * @param interactionManager An instance of the @c InteractionManager used to manage user input.
+     * @param guiRenderer An instance of @c GuiRenderer to be used to fetch playback states.
      * @param consoleReader The @c ConsoleReader to read inputs from console.
      * @param localeAssetsManager The @c LocaleAssetsManagerInterface that provides the supported locales.
      * @param defaultEndpointId The @c EndpointIdentifier of the default endpoint.
      */
     UserInputManager(
-        std::shared_ptr<InteractionManager> interactionManager,
+        std::shared_ptr<sampleApplications::common::InteractionManager> interactionManager,
+        std::shared_ptr<GuiRenderer> guiRenderer,
         std::shared_ptr<ConsoleReader> consoleReader,
         std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface> localeAssetsManager,
         const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& defaultEndpointId);
@@ -182,7 +187,10 @@ class UserInputManager
     bool deviceSetupCompleted();
 
     /// The main interaction manager that interfaces with the SDK.
-    std::shared_ptr<InteractionManager> m_interactionManager;
+    std::shared_ptr<sampleApplications::common::InteractionManager> m_interactionManager;
+
+    /// The gui renderer.
+    std::shared_ptr<GuiRenderer> m_guiRenderer;
 
     /// The @c ConsoleReader to read input from console.
     std::shared_ptr<ConsoleReader> m_consoleReader;
@@ -204,4 +212,4 @@ class UserInputManager
 }  // namespace sampleApp
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_USERINPUTMANAGER_H_
+#endif  // SAMPLEAPP_USERINPUTMANAGER_H_
diff --git a/SampleApplications/Common/LibSampleApp/src/CMakeLists.txt b/SampleApplications/Common/LibSampleApp/src/CMakeLists.txt
new file mode 100644
index 0000000000..47c794b180
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/src/CMakeLists.txt
@@ -0,0 +1,139 @@
+set(acsdkSampleApp_SOURCES)
+list(APPEND acsdkSampleApp_SOURCES
+        CaptionPresenter.cpp
+        ConsoleReader.cpp
+        ExternalCapabilitiesBuilder.cpp
+        GuiRenderer.cpp
+        LocaleAssetsManager.cpp
+        UserInputManager.cpp
+        SampleApplicationComponent.cpp
+        SampleApplication.cpp
+        SampleEqualizerModeController.cpp)
+
+if (DIAGNOSTICS)
+    list(APPEND acsdkSampleApp_SOURCES SDKDiagnostics.cpp)
+endif()
+
+IF (A4B)
+    list(APPEND acsdkSampleApp_SOURCES RevokeAuthorizationObserver.cpp)
+ENDIF()
+
+if(EXTERNAL_MEDIA_ADAPTERS)
+    list(APPEND acsdkSampleApp_SOURCES ${ALL_EMP_ADAPTER_REGISTRATION_FILES})
+endif ()
+
+add_library(acsdkSampleApp ${acsdkSampleApp_SOURCES})
+
+target_include_directories(acsdkSampleApp PUBLIC
+        # This is relative to project(SampleApp).
+        "${acsdkSampleApp_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkSampleApp
+        acsdkAudioInputStream
+        acsdkCore
+        acsdkCrypto
+        acsdkEqualizerImplementations
+        acsdkKWDImplementations
+        acsdkManufactory
+        acsdkSampleApplicationCBLAuthRequester
+        acsdkSampleConsole
+        acsdkSampleEndpoint
+        acsdkSampleInteractionManager
+        acsdkSamplePeripheralEndpoint
+        AVSCommon
+        AVSGatewayManager
+        CapabilitiesDelegate
+        CaptionsComponent
+        DefaultClient
+        InterruptModel
+        SQLiteStorage
+        SynchronizeStateSender)
+
+if (ACS_UTILS)
+    target_link_libraries(acsdkSampleApp acsdkACSSampleApplicationOptions)
+else()
+    target_link_libraries(acsdkSampleApp acsdkDefaultSampleApplicationOptions)
+endif()
+
+if(ASSET_MANAGER)
+    target_link_libraries(acsdkSampleApp acsdkAssetManager acsdkAssetManagerClient)
+endif()
+
+if (ANDROID)
+    target_include_directories(acsdkSampleApp PUBLIC "${AndroidUtilities}/include")
+    target_link_libraries(acsdkSampleApp AndroidUtilities)
+    if (ANDROID_MEDIA_PLAYER)
+        target_include_directories(acsdkSampleApp PUBLIC "${AndroidSLESMediaPlayer}/include")
+        target_link_libraries(acsdkSampleApp AndroidSLESMediaPlayer)
+    endif()
+endif()
+
+if (GSTREAMER_MEDIA_PLAYER)
+    target_include_directories(acsdkSampleApp PUBLIC "${MediaPlayer_SOURCE_DIR}/include")
+    target_link_libraries(acsdkSampleApp MediaPlayer)
+elseif (CUSTOM_MEDIA_PLAYER)
+    target_link_libraries(acsdkSampleApp ${CUSTOM_MEDIA_PLAYER_TARGETS})
+endif()
+
+if(KWD)
+    target_link_libraries(acsdkSampleApp KeywordDetectorProvider)
+endif()
+
+if (COMMS)
+    target_link_libraries(acsdkSampleApp CallManager)
+endif()
+
+if (RTCSC)
+    target_link_libraries(acsdkSampleApp RtcscCapabilityAgent)
+endif()
+
+if (MRM AND MRM_STANDALONE_APP)
+    target_link_libraries(acsdkSampleApp acsdkMultiRoomMusic MRMHandlerProxy)
+elseif (MRM)
+    target_link_libraries(acsdkSampleApp acsdkMultiRoomMusic MRMHandler)
+endif()
+
+if (DIAGNOSTICS)
+    target_link_libraries(acsdkSampleApp Diagnostics)
+endif()
+
+if(EXTERNAL_MEDIA_ADAPTERS)
+    target_link_libraries(acsdkSampleApp acsdkExternalMediaPlayerAdapters)
+endif ()
+
+if (PORTAUDIO)
+    target_link_libraries(acsdkSampleApp acsdkPortAudioMicrophoneAdapter)
+endif()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    target_link_libraries(acsdkSampleApp
+            "-framework CoreAudio"
+            "-framework AudioToolbox"
+            "-framework AudioUnit"
+            "-framework CoreServices"
+            "-framework Carbon")
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    target_link_libraries(acsdkSampleApp
+            rt m pthread asound atomic)
+endif()
+
+target_link_libraries(acsdkSampleApp acsdkAuthorization)
+
+if (PKCS11)
+    target_link_libraries(acsdkSampleApp acsdkPkcs11)
+    target_compile_definitions(acsdkSampleApp PRIVATE ENABLE_PKCS11)
+endif()
+
+
+if (PCC)
+    target_link_libraries(acsdkSampleApp acsdkPhoneCallControllerAdapter)
+endif()
+
+if (MCC)
+    target_link_libraries(acsdkSampleApp acsdkMeetingClientControllerAdapter)
+endif()
+
+add_rpath_to_target("acsdkSampleApp")
+
+# install target only if sample libraries are installed
+asdk_sample_install()
diff --git a/SampleApp/src/CaptionPresenter.cpp b/SampleApplications/Common/LibSampleApp/src/CaptionPresenter.cpp
similarity index 94%
rename from SampleApp/src/CaptionPresenter.cpp
rename to SampleApplications/Common/LibSampleApp/src/CaptionPresenter.cpp
index f28741f9b7..e0ebb895f1 100644
--- a/SampleApp/src/CaptionPresenter.cpp
+++ b/SampleApplications/Common/LibSampleApp/src/CaptionPresenter.cpp
@@ -14,13 +14,14 @@
  */
 
 #include "SampleApp/CaptionPresenter.h"
-#include "SampleApp/ConsolePrinter.h"
+#include <acsdk/Sample/Console/ConsolePrinter.h>
 
 namespace alexaClientSDK {
 namespace sampleApp {
 
 using namespace avsCommon::utils;
 using namespace alexaClientSDK::avsCommon::avs;
+using namespace sampleApplications::common;
 
 std::shared_ptr<captions::CaptionPresenterInterface> CaptionPresenter::createCaptionPresenterInterface(
     const std::shared_ptr<captions::CaptionManagerInterface>& captionManager) {
@@ -55,7 +56,7 @@ std::pair<bool, int> CaptionPresenter::getWrapIndex(const captions::CaptionLine&
     // This lineWidth value is artificially small to demonstrate the line wrapping functionality.
     const size_t lineWidth = 30;
     if (captionLine.text.length() > lineWidth) {
-        return std::make_pair(true, lineWidth);
+        return std::make_pair(true, static_cast<int>(lineWidth));
     }
     return std::make_pair(false, 0);
 }
diff --git a/SampleApp/src/ConsoleReader.cpp b/SampleApplications/Common/LibSampleApp/src/ConsoleReader.cpp
similarity index 96%
rename from SampleApp/src/ConsoleReader.cpp
rename to SampleApplications/Common/LibSampleApp/src/ConsoleReader.cpp
index 74aa2e7618..95d6cf9e2d 100644
--- a/SampleApp/src/ConsoleReader.cpp
+++ b/SampleApplications/Common/LibSampleApp/src/ConsoleReader.cpp
@@ -12,11 +12,11 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
+#include "SampleApp/ConsoleReader.h"
 
 #include <iostream>
 
-#include "SampleApp/ConsolePrinter.h"
-#include "SampleApp/ConsoleReader.h"
+#include <acsdk/Sample/Console/ConsolePrinter.h>
 
 namespace alexaClientSDK {
 namespace sampleApp {
@@ -24,6 +24,8 @@ namespace sampleApp {
 /// Time to wait for if there's a pending read request from the user.
 static const std::chrono::milliseconds READ_REQUEST_PENDING_TIMEOUT{100};
 
+using namespace sampleApplications::common;
+
 ConsoleReader::ConsoleReader() : m_state{IDLE}, m_shutDown{false}, m_lastCharRead{0} {
     m_thread = std::thread(&ConsoleReader::workerLoop, this);
 }
diff --git a/SampleApplications/Common/LibSampleApp/src/ExternalCapabilitiesBuilder.cpp b/SampleApplications/Common/LibSampleApp/src/ExternalCapabilitiesBuilder.cpp
new file mode 100644
index 0000000000..ee93b82808
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/src/ExternalCapabilitiesBuilder.cpp
@@ -0,0 +1,285 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "SampleApp/ExternalCapabilitiesBuilder.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#ifdef ENABLE_COMMS
+#include <AVSCommon/SDKInterfaces/CallManagerInterface.h>
+#include <CallManager/CallManager.h>
+#include <CallManager/SipUserAgent.h>
+#endif
+
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+#include <CallManager/CallAudioDeviceProxy.h>
+#endif
+
+#ifdef ENABLE_MRM
+#include <acsdkMultiRoomMusic/MRMCapabilityAgent.h>
+#ifdef ENABLE_MRM_STANDALONE_APP
+#include <MRMHandler/MRMHandlerProxy.h>
+#else
+#include <MRMHandler/MRMHandler.h>
+#endif  // ENABLE_MRM_STANDALONE_APP
+#endif  // ENABLE_MRM
+
+#ifdef ENABLE_COMMS
+#define COMMS_NAMESPACE "com.amazon.avs-comms-adapter"
+#endif
+
+#ifdef ENABLE_RTCSC
+#include <RTCSessionController/RtcscCapabilityAgent.h>
+#endif
+
+namespace alexaClientSDK {
+namespace sampleApp {
+
+/// String to identify log entries originating from this file.
+#define TAG "ExternalCapabilitiesBuilder"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+ExternalCapabilitiesBuilder::ExternalCapabilitiesBuilder(std::shared_ptr<avsCommon::utils::DeviceInfo> deviceInfo) :
+        m_deviceInfo{deviceInfo} {
+    ACSDK_DEBUG5(LX(__func__));
+}
+
+ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withSettingsStorage(
+    std::shared_ptr<alexaClientSDK::settings::storage ::DeviceSettingStorageInterface> settingStorage) {
+    // ExternalCapabilitiesBuilder doesn't need the settingStorage to build any object.
+    return *this;
+}
+
+ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withTemplateRunTime(
+    std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeInterface> templateRuntime) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_templateRuntime = std::move(templateRuntime);
+    return *this;
+}
+
+std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::CallManagerInterface> ExternalCapabilitiesBuilder::
+    getCallManager() {
+    return m_callManager;
+}
+
+ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withInternetConnectionMonitor(
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>
+        internetConnectionMonitor) {
+    m_internetConnectionMonitor = std::move(internetConnectionMonitor);
+    return *this;
+}
+
+ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withDialogUXStateAggregator(
+    std::shared_ptr<alexaClientSDK::avsCommon::avs::DialogUXStateAggregator> dialogUXStateAggregator) {
+    m_dialogUXStateAggregator = std::move(dialogUXStateAggregator);
+    return *this;
+}
+
+ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withAlexaInterfaceMessageSender(
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>
+        alexaMessageSender) {
+    m_alexaMessageSender = std::move(alexaMessageSender);
+    return *this;
+}
+
+std::pair<
+    std::list<ExternalCapabilitiesBuilder::Capability>,
+    std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>>
+ExternalCapabilitiesBuilder::buildCapabilities(
+    std::shared_ptr<alexaClientSDK::acsdkExternalMediaPlayer::ExternalMediaPlayer> externalMediaPlayer,
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSConnectionManagerInterface> connectionManager,
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+    std::shared_ptr<alexaClientSDK::certifiedSender::CertifiedSender> certifiedSender,
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::FocusManagerInterface> audioFocusManager,
+    std::shared_ptr<alexaClientSDK::registrationManager::CustomerDataManagerInterface> dataManager,
+    std::shared_ptr<alexaClientSDK::capabilityAgents::system::ReportStateHandler> stateReportHandler,
+    std::shared_ptr<alexaClientSDK::capabilityAgents::aip::AudioInputProcessor> audioInputProcessor,
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerManagerInterface> speakerManager,
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::DirectiveSequencerInterface> directiveSequencer,
+    std::shared_ptr<avsCommon::sdkInterfaces::UserInactivityMonitorInterface> userInactivityMonitor,
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSGatewayManagerInterface> avsGatewayManager,
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> ringtoneMediaPlayer,
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::audio::AudioFactoryInterface> audioFactory,
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface> ringtoneChannelVolumeInterface,
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface> commsSpeaker,
+    std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream> sharedDataStream,
+#endif
+    std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface> powerResourceManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::ComponentReporterInterface> softwareComponentReporter,
+    std::shared_ptr<avsCommon::sdkInterfaces::PlaybackRouterInterface> playbackRouter,
+    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>
+        endpointRegistrationManager,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) {
+    ACSDK_DEBUG5(LX(__func__));
+    std::pair<
+        std::list<ExternalCapabilitiesBuilder::Capability>,
+        std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>>>
+        retValue;
+    std::list<Capability> capabilities;
+    std::list<std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown>> requireShutdownObjects;
+
+#ifdef ENABLE_COMMS
+    if (!ringtoneMediaPlayer) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "nullRingtoneMediaPlayer"));
+        return retValue;
+    }
+
+    auto sipUserAgent = std::make_shared<capabilityAgents::callManager::SipUserAgent>();
+    std::string avsGatewayURL = avsGatewayManager->getGatewayURL();
+
+    if (!capabilityAgents::callManager::CallManager::create(
+            sipUserAgent,
+            ringtoneMediaPlayer,
+            messageSender,
+            contextManager,
+            audioFocusManager,
+            exceptionSender,
+            audioFactory->communications(),
+            avsGatewayURL,
+            m_dialogUXStateAggregator,
+            speakerManager,
+            ringtoneChannelVolumeInterface,
+            powerResourceManager,
+            metricRecorder)) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "unableToCreateCallManager"));
+        return retValue;
+    }
+
+    auto callManager = capabilityAgents::callManager::CallManager::getInstance();
+
+    m_callManager = callManager;
+
+    const std::string commsVersion = capabilityAgents::callManager::CallManager::getCommsAdapterVersion();
+    std::shared_ptr<avsCommon::avs::ComponentConfiguration> commsConfig =
+        avsCommon::avs::ComponentConfiguration::createComponentConfiguration(COMMS_NAMESPACE, commsVersion);
+    softwareComponentReporter->addConfiguration(commsConfig);
+    m_internetConnectionMonitor->addInternetConnectionObserver(callManager);
+    connectionManager->addConnectionStatusObserver(callManager);
+    avsGatewayManager->addObserver(m_callManager);
+
+    Capability callManagerCapability;
+    auto callManagerConfigurations = callManager->getCapabilityConfigurations();
+    callManagerCapability.directiveHandler = std::move(callManager);
+    for (auto& configurationPtr : callManagerConfigurations) {
+        callManagerCapability.configuration = *configurationPtr;
+        capabilities.push_back(callManagerCapability);
+    }
+    requireShutdownObjects.push_back(m_callManager);
+
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+    auto acquireAudioInputStream = [sharedDataStream]() -> std::shared_ptr<avsCommon::avs::AudioInputStream> {
+        return sharedDataStream;
+    };
+    auto relinquishAudioInputStream = [](std::shared_ptr<avsCommon::avs::AudioInputStream> stream) {
+        // Nothing to release
+    };
+    auto callAudioDeviceProxy = capabilityAgents::callManager::CallAudioDeviceProxy::create(
+        commsMediaPlayer, commsSpeaker, acquireAudioInputStream, relinquishAudioInputStream);
+    m_callManager->addObserver(callAudioDeviceProxy);
+#endif
+#endif
+
+#ifdef ENABLE_MRM
+#ifdef ENABLE_MRM_STANDALONE_APP
+    auto mrmHandler = capabilityAgents::mrm::mrmHandler::MRMHandlerProxy::create(
+        connectionManager,
+        messageSender,
+        directiveSequencer,
+        userInactivityMonitor,
+        contextManager,
+        audioFocusManager,
+        speakerManager);
+#else
+    auto mrmHandler = capabilityAgents::mrm::mrmHandler::MRMHandler::create(
+        connectionManager,
+        messageSender,
+        directiveSequencer,
+        userInactivityMonitor,
+        contextManager,
+        audioFocusManager,
+        speakerManager,
+        m_deviceInfo->getDeviceSerialNumber());
+
+#endif  // ENABLE_MRM_STANDALONE_APP
+
+    if (!mrmHandler) {
+        ACSDK_ERROR(LX(__func__).m("Unable to create mrmHandler"));
+        return retValue;
+    }
+
+    auto mrmCapabilityAgent = capabilityAgents::mrm::MRMCapabilityAgent::create(
+        std::move(mrmHandler), speakerManager, userInactivityMonitor, exceptionSender);
+
+    if (!mrmCapabilityAgent) {
+        ACSDK_ERROR(LX(__func__).m("Unable to create MRMCapabilityAgent"));
+        return retValue;
+    }
+
+    if (m_templateRuntime) {
+        m_templateRuntime->addRenderPlayerInfoCardsProvider(mrmCapabilityAgent);
+    }
+
+    if (m_callManager) {
+        m_callManager->addObserver(mrmCapabilityAgent);
+    }
+
+    Capability mrmCapability;
+    auto mrmConfigurations = mrmCapabilityAgent->getCapabilityConfigurations();
+    mrmCapability.directiveHandler = mrmCapabilityAgent;
+    for (auto& configurationPtr : mrmConfigurations) {
+        mrmCapability.configuration = *configurationPtr;
+        capabilities.push_back(mrmCapability);
+    }
+
+    requireShutdownObjects.push_back(mrmCapabilityAgent);
+
+#endif  // // ENABLE_MRM
+
+#ifdef ENABLE_RTCSC
+    auto rtcscCapabilityAgent = capabilityAgents::rtcscCapabilityAgent::RtcscCapabilityAgent::create(
+        messageSender, contextManager, exceptionSender);
+    if (!rtcscCapabilityAgent) {
+        ACSDK_ERROR(LX(__func__).m("Unable to create RTCSCCapabilityAgent"));
+        return retValue;
+    }
+
+    Capability rtcscCapability;
+    auto rtcscConfigurations = rtcscCapabilityAgent->getCapabilityConfigurations();
+    rtcscCapability.directiveHandler = std::move(rtcscCapabilityAgent);
+    for (auto& configurationPtr : rtcscConfigurations) {
+        rtcscCapability.configuration = *configurationPtr;
+        capabilities.push_back(rtcscCapability);
+    }
+    requireShutdownObjects.push_back(rtcscCapabilityAgent);
+#endif  // ENABLE_RTCSC
+
+    retValue.first.swap(capabilities);
+    retValue.second.swap(requireShutdownObjects);
+
+    return retValue;
+}
+
+}  // namespace sampleApp
+}  // namespace alexaClientSDK
diff --git a/SampleApp/src/GuiRenderer.cpp b/SampleApplications/Common/LibSampleApp/src/GuiRenderer.cpp
similarity index 94%
rename from SampleApp/src/GuiRenderer.cpp
rename to SampleApplications/Common/LibSampleApp/src/GuiRenderer.cpp
index 75c8b46de0..c507a462d0 100644
--- a/SampleApp/src/GuiRenderer.cpp
+++ b/SampleApplications/Common/LibSampleApp/src/GuiRenderer.cpp
@@ -16,14 +16,16 @@
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
 
+#include <acsdk/Sample/Console/ConsolePrinter.h>
 #include <AVSCommon/Utils/JSON/JSONUtils.h>
-#include "SampleApp/ConsolePrinter.h"
+
 #include "SampleApp/GuiRenderer.h"
 
 namespace alexaClientSDK {
 namespace sampleApp {
 
 using namespace avsCommon::utils::json;
+using namespace sampleApplications::common;
 
 /// Tag for find the AudioItemId in the payload of the RenderPlayerInfo directive
 static const std::string AUDIO_ITEM_ID_TAG("audioItemId");
@@ -46,10 +48,10 @@ static const std::string CONTROLS_SELECTED_KEY("selected");
 /// Tag for find the maintitle in the title node of the RenderTemplate directive
 static const std::string MAIN_TITLE_TAG("mainTitle");
 
-// String to identify the AVS name SKIP_FORWARD string.
+/// String to identify the AVS name SKIP_FORWARD string.
 static const std::string BUTTON_NAME_SKIPFORWARD("SKIP_FORWARD");
 
-// String to identify the AVS name SKIP_BACKWARD string.
+/// String to identify the AVS name SKIP_BACKWARD string.
 static const std::string BUTTON_NAME_SKIPBACKWARD("SKIP_BACKWARD");
 
 /// Begin a RenderTemplate UI block
@@ -114,7 +116,7 @@ const std::string GuiRenderer::TOGGLE_NAME_THUMBSUP = "THUMBS_UP";
 
 const std::string GuiRenderer::TOGGLE_NAME_THUMBSDOWN = "THUMBS_DOWN";
 
-void GuiRenderer::renderTemplateCard(const std::string& jsonPayload, avsCommon::avs::FocusState focusState) {
+void GuiRenderer::renderTemplateCard(const std::string& jsonPayload) {
     rapidjson::Document payload;
     rapidjson::ParseResult result = payload.Parse(jsonPayload);
     if (!result) {
@@ -143,7 +145,6 @@ void GuiRenderer::renderTemplateCard(const std::string& jsonPayload, avsCommon::
     // Storing the output in a single buffer so that the display is continuous.
     std::string buffer;
     buffer += RENDER_TEMPLATE_HEADER;
-    buffer += "# Focus State         : " + focusStateToString(focusState) + "\n";
     buffer += "# Template Type       : " + templateType + "\n";
     buffer += "# Main Title          : " + mainTitle + "\n";
     buffer += RENDER_FOOTER;
@@ -163,8 +164,7 @@ void GuiRenderer::clearTemplateCard() {
 
 void GuiRenderer::renderPlayerInfoCard(
     const std::string& jsonPayload,
-    TemplateRuntimeObserverInterface::AudioPlayerInfo info,
-    avsCommon::avs::FocusState focusState) {
+    TemplateRuntimeObserverInterface::AudioPlayerInfo info) {
     rapidjson::Document payload;
     rapidjson::ParseResult result = payload.Parse(jsonPayload);
     if (!result) {
@@ -181,10 +181,9 @@ void GuiRenderer::renderPlayerInfoCard(
     // Storing the output in a single buffer so that the display is continuous.
     std::string buffer;
     buffer += RENDER_PLAYER_INFO_HEADER;
-    buffer += "# Focus State         : " + focusStateToString(focusState) + "\n";
     buffer += "# AudioItemId         : " + audioItemId + "\n";
     buffer += "# Audio state         : " + playerActivityToString(info.audioPlayerState) + "\n";
-    buffer += "# Offset milliseconds : " + std::to_string(info.offset.count()) + "\n";
+    buffer += "# Offset milliseconds : " + std::to_string(info.mediaProperties->getAudioItemOffset().count()) + "\n";
     buffer += RENDER_FOOTER;
     buffer += jsonPayload + "\n";
     buffer += RENDER_PLAYER_CONTROLS_HEADER;
@@ -244,8 +243,9 @@ void GuiRenderer::clearPlayerInfoCard() {
     ConsolePrinter::simplePrint(RENDER_PLAYER_INFO_CLEARED);
 }
 
-bool GuiRenderer::getGuiToggleState(const std::string& toggleName) {
-    return m_guiToggleStateMap.find(toggleName)->second;
+avsCommon::utils::Optional<bool> GuiRenderer::getGuiToggleState(const std::string& toggleName) {
+    const auto& it = m_guiToggleStateMap.find(toggleName);
+    return it != m_guiToggleStateMap.end() ? it->second : avsCommon::utils::Optional<bool>();
 }
 
 }  // namespace sampleApp
diff --git a/SampleApplications/Common/LibSampleApp/src/LocaleAssetsManager.cpp b/SampleApplications/Common/LibSampleApp/src/LocaleAssetsManager.cpp
new file mode 100644
index 0000000000..cc50af008b
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/src/LocaleAssetsManager.cpp
@@ -0,0 +1,475 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <Settings/SettingStringConversion.h>
+
+#include "SampleApp/LocaleAssetsManager.h"
+
+/// String to identify log entries originating from this file.
+#define TAG "LocaleAssetsManager"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApp {
+
+using namespace acsdkShutdownManagerInterfaces;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::configuration;
+using namespace avsCommon::utils::json::jsonUtils;
+
+/// The key in our config file to find the root of settings for this database.
+static const std::string SETTING_CONFIGURATION_ROOT_KEY = "deviceSettings";
+
+/// The key to find the locales configuration.
+static const std::string LOCALES_CONFIGURATION_KEY = "locales";
+
+/// The key to find the locales configuration.
+static const std::string DEFAULT_LOCALE_CONFIGURATION_KEY = "defaultLocale";
+
+/// The key to find the locales combinations configuration.
+static const std::string LOCALE_COMBINATION_CONFIGURATION_KEY = "localeCombinations";
+
+/// The default locale value used if the locale configuration is not present.
+static const std::string DEFAULT_LOCALE_VALUE = "en-US";
+
+/// The index for primary locale in the default locales vector.
+static const int PRIMARY_LOCALE_INDEX = 0;
+
+/// The default supported wake word.
+static const std::string DEFAULT_SUPPORTED_WAKEWORD = "ALEXA";
+
+std::shared_ptr<LocaleAssetsManagerInterface> LocaleAssetsManager::createLocaleAssetsManagerInterface(
+    const std::shared_ptr<ConfigurationNode>& configurationNode,
+    const std::shared_ptr<ShutdownNotifierInterface>& shutdownNotifier) {
+    if (!shutdownNotifier) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceFailed").d("reason", "null shutdown notifier"));
+        return nullptr;
+    }
+
+    auto manager = std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager());
+    if (!manager->initialize(configurationNode)) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceFailed").d("reason", "initialize failed"));
+        return nullptr;
+    }
+    shutdownNotifier->addObserver(manager);
+
+    return manager;
+}
+
+std::shared_ptr<LocaleAssetsManager> LocaleAssetsManager::createLocaleAssetsManager(
+    const std::shared_ptr<ConfigurationNode>& configurationNode) {
+    auto manager = std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager());
+    if (!manager->initialize(configurationNode)) {
+        ACSDK_ERROR(LX("createLocaleAssetsManager").d("reason", "initialize failed"));
+        return nullptr;
+    }
+    return manager;
+}
+
+std::shared_ptr<LocaleAssetsManager> LocaleAssetsManager::create(bool enableWakeWord) {
+    auto manager = std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager());
+    if (!manager->initialize(enableWakeWord, ConfigurationNode::getRoot())) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "initialize failed"));
+        return nullptr;
+    }
+    return manager;
+}
+
+#ifdef KWD
+#ifdef ASSET_MANAGER
+std::shared_ptr<LocaleAssetsManagerInterface> LocaleAssetsManager::createLocaleAssetsManagerInterfaceWithKwdAndDavs(
+    const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+    const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
+    const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+    const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+    const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector,
+    const std::shared_ptr<AssetManager>& assetManager) {
+    if (!shutdownNotifier) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdAndDavsFailed").d("reason", "null shutdown notifier"));
+        return nullptr;
+    }
+    if (!audioInputStream) {
+        ACSDK_ERROR(
+            LX("createLocaleAssetsManagerInterfaceWithKwdAndDavsFailed").d("reason", "null audio input stream"));
+        return nullptr;
+    }
+    if (!audioFormat) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdAndDavsFailed").d("reason", "null audio format"));
+        return nullptr;
+    }
+    if (!keywordDetector) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdAndDavsFailed").d("reason", "null keywordDetector"));
+        return nullptr;
+    }
+    if (!assetManager) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdAndDavsFailed").d("reason", "null davsAssetManager"));
+        return nullptr;
+    }
+
+    auto manager = std::shared_ptr<LocaleAssetsManager>(
+        new LocaleAssetsManager(audioInputStream, audioFormat, keywordDetector, assetManager));
+    if (!manager->initialize(configurationNode)) {
+        ACSDK_ERROR(
+            LX("createLocaleAssetsManagerInterfaceWithKwdAndDavsFailedFailed").d("reason", "initialize failed"));
+        return nullptr;
+    }
+    shutdownNotifier->addObserver(manager);
+
+    return manager;
+}
+
+std::shared_ptr<LocaleAssetsManager> LocaleAssetsManager::createLocaleAssetsManagerWithKwdAndDavs(
+    const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+    const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+    const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+    const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector,
+    const std::shared_ptr<AssetManager>& assetManager) {
+    if (!audioInputStream) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdAndDavsFailed").d("reason", "null audio input stream"));
+        return nullptr;
+    }
+    if (!audioFormat) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdAndDavsFailed").d("reason", "null audio format"));
+        return nullptr;
+    }
+    if (!keywordDetector) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdAndDavsFailed").d("reason", "null keywordDetector"));
+        return nullptr;
+    }
+    if (!assetManager) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdAndDavsFailed").d("reason", "null davsAssetManager"));
+        return nullptr;
+    }
+
+    auto manager = std::shared_ptr<LocaleAssetsManager>(
+        new LocaleAssetsManager(audioInputStream, audioFormat, keywordDetector, assetManager));
+    if (!manager->initialize(configurationNode)) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdAndDavsFailed").d("reason", "initialize failed"));
+        return nullptr;
+    }
+
+    return manager;
+}
+#else
+std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface> LocaleAssetsManager::
+    createLocaleAssetsManagerInterfaceWithKwd(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+        const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector) {
+    if (!shutdownNotifier) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdFailed").d("reason", "null shutdown notifier"));
+        return nullptr;
+    }
+    if (!audioInputStream) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdFailed").d("reason", "null audio input stream"));
+        return nullptr;
+    }
+    if (!audioFormat) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdFailed").d("reason", "null audio format"));
+        return nullptr;
+    }
+    if (!keywordDetector) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdFailed").d("reason", "null keywordDetector"));
+        return nullptr;
+    }
+
+    auto manager =
+        std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager(audioInputStream, audioFormat, keywordDetector));
+    if (!manager->initialize(configurationNode)) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdFailed").d("reason", "initialize failed"));
+        return nullptr;
+    }
+    shutdownNotifier->addObserver(manager);
+
+    return manager;
+}
+
+std::shared_ptr<LocaleAssetsManager> LocaleAssetsManager::createLocaleAssetsManagerWithKwd(
+    const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+    const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+    const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+    const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector) {
+    if (!audioInputStream) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdFailed").d("reason", "null audio input stream"));
+        return nullptr;
+    }
+    if (!audioFormat) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdFailed").d("reason", "null audio format"));
+        return nullptr;
+    }
+    if (!keywordDetector) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdFailed").d("reason", "null keywordDetector"));
+        return nullptr;
+    }
+    auto manager =
+        std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager(audioInputStream, audioFormat, keywordDetector));
+    if (!manager->initialize(configurationNode)) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdFailed").d("reason", "initialize failed"));
+        return nullptr;
+    }
+
+    return manager;
+}
+#endif
+void LocaleAssetsManager::setDefaultClient(const std::shared_ptr<defaultClient::DefaultClient>& defaultClient) {
+    std::lock_guard<std::mutex> lock{m_defaultClientMutex};
+    if (defaultClient == nullptr) {
+        ACSDK_ERROR(LX("setDefaultClientFailed").d("reason", "nullDefaultClient"));
+        return;
+    }
+    m_DefaultClient = defaultClient;
+}
+#endif
+
+bool LocaleAssetsManager::changeAssets(const Locales& locales, const WakeWords& wakeWords) {
+    // The device should set the locale and wakeWord here.
+    ACSDK_INFO(LX(__func__)
+                   .d("Locale", settings::toSettingString<Locales>(locales).second)
+                   .d("WakeWords", settings::toSettingString<WakeWords>(wakeWords).second));
+    return true;
+}
+
+void LocaleAssetsManager::cancelOngoingChange() {
+    // No work is done by changeAssets.
+}
+
+bool LocaleAssetsManager::initialize(const std::shared_ptr<ConfigurationNode>& configurationNode) {
+    if (!configurationNode) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "null configuration node"));
+        return false;
+    }
+
+#ifdef KWD
+    static constexpr bool enableWakeWord = true;
+#else
+    static constexpr bool enableWakeWord = false;
+#endif
+
+    return initialize(enableWakeWord, *configurationNode);
+}
+
+bool LocaleAssetsManager::initialize(bool enableWakeWord, const ConfigurationNode& configurationNode) {
+    auto settingsConfig = configurationNode[SETTING_CONFIGURATION_ROOT_KEY];
+    if (!settingsConfig) {
+        ACSDK_ERROR(LX("initializeFailed")
+                        .d("reason", "configurationKeyNotFound")
+                        .d("configurationKey", SETTING_CONFIGURATION_ROOT_KEY));
+        return false;
+    }
+
+    if (!settingsConfig.getStringValues(LOCALES_CONFIGURATION_KEY, &m_supportedLocales)) {
+        ACSDK_ERROR(LX("initializeFailed")
+                        .d("reason", "configurationKeyNotFound")
+                        .d("configurationKey", LOCALES_CONFIGURATION_KEY));
+        return false;
+    }
+
+    auto combinationArray = settingsConfig.getArray(LOCALE_COMBINATION_CONFIGURATION_KEY);
+    if (combinationArray) {
+        for (std::size_t arrayIndex = 0; arrayIndex < combinationArray.getArraySize(); ++arrayIndex) {
+            auto stringVector = retrieveStringArray<std::vector<std::string>>(combinationArray[arrayIndex].serialize());
+
+            // Make sure the combination is more than one locale.
+            if (stringVector.size() <= 1) {
+                ACSDK_ERROR(
+                    LX("initializeFailed").d("reason", "LocaleCombinationSizeError").d("size", stringVector.size()));
+                return false;
+            }
+
+            // Make sure all the locales in the combination are supported.
+            for (const auto& locale : stringVector) {
+                if (m_supportedLocales.count(locale) == 0) {
+                    ACSDK_ERROR(
+                        LX("initializeFailed").d("reason", "notSupportedLocalesInCombination").d("locale", locale));
+                    return false;
+                }
+            }
+            m_supportedLocalesCombinations.insert(stringVector);
+        }
+    }
+
+    auto localesArray = settingsConfig.getArray(DEFAULT_LOCALE_CONFIGURATION_KEY);
+    if (!localesArray) {
+        if (!settingsConfig.getString(DEFAULT_LOCALE_CONFIGURATION_KEY, &m_defaultLocale)) {
+            ACSDK_ERROR(
+                LX("initializeFailed")
+                    .d("reason", "configurationKeyNotFound")
+                    .d("configurationKey", SETTING_CONFIGURATION_ROOT_KEY + "." + DEFAULT_LOCALE_CONFIGURATION_KEY));
+            return false;
+        }
+        m_defaultLocales.push_back(m_defaultLocale);
+    } else {
+        m_defaultLocales = retrieveStringArray<std::vector<std::string>>(localesArray.serialize());
+    }
+
+    if (m_supportedLocales.empty()) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "noSupportedLocalesInConfiguration"));
+        return false;
+    }
+
+    if (m_defaultLocales.empty()) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "noDefaultLocaleInConfiguration"));
+        return false;
+    }
+
+    // Check if the default is in the supported locales.
+    if (m_supportedLocales.find(m_defaultLocales[PRIMARY_LOCALE_INDEX]) == m_supportedLocales.end()) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "defaultLocaleNotInSupportedLocaleList"));
+        return false;
+    }
+
+    // Check if the default multilingual locale is in the supported locale combinations.
+    if (m_defaultLocales.size() > 1 &&
+        m_supportedLocalesCombinations.find(m_defaultLocales) == m_supportedLocalesCombinations.end()) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "defaultLocalesNotInSupportedLocalesCombinationsList"));
+        return false;
+    }
+
+    WakeWords wakeWords;
+    if (enableWakeWord) {
+        m_supportedWakeWords.insert({DEFAULT_SUPPORTED_WAKEWORD});
+    } else {
+        ACSDK_INFO(LX(__func__).d("supportedWakeWords", "NONE"));
+    }
+
+    return true;
+}
+
+LocaleAssetsManager::WakeWordsSets LocaleAssetsManager::getSupportedWakeWords(const Locale& locale) const {
+    return m_supportedWakeWords;
+}
+
+LocaleAssetsManager::WakeWordsSets LocaleAssetsManager::getDefaultSupportedWakeWords() const {
+    return m_supportedWakeWords;
+}
+
+std::map<LocaleAssetsManager::Locale, LocaleAssetsManager::WakeWordsSets> LocaleAssetsManager::
+    getLocaleSpecificWakeWords() const {
+    return std::map<LocaleAssetsManager::Locale, LocaleAssetsManager::WakeWordsSets>();
+}
+
+std::map<LocaleAssetsManager::LanguageTag, LocaleAssetsManager::WakeWordsSets> LocaleAssetsManager::
+    getLanguageSpecificWakeWords() const {
+    return std::map<LocaleAssetsManager::LanguageTag, LocaleAssetsManager::WakeWordsSets>();
+}
+
+std::set<LocaleAssetsManager::Locale> LocaleAssetsManager::getSupportedLocales() const {
+    return m_supportedLocales;
+}
+
+LocaleAssetsManager::LocaleCombinations LocaleAssetsManager::getSupportedLocaleCombinations() const {
+    return m_supportedLocalesCombinations;
+}
+
+LocaleAssetsManager::Locale LocaleAssetsManager::getDefaultLocale() const {
+    ACSDK_ERROR(LX("getDefaultLocale").d("reason", "methodDeprecated"));
+    return m_defaultLocale;
+}
+
+LocaleAssetsManager::Locales LocaleAssetsManager::getDefaultLocales() const {
+    return m_defaultLocales;
+}
+
+void LocaleAssetsManager::addLocaleAssetsObserver(
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>& observer) {
+    std::lock_guard<std::mutex> lock{m_observersMutex};
+    if (observer == nullptr) {
+        ACSDK_ERROR(LX("addLocaleAssetsObserverFailed").d("reason", "nullObserver"));
+        return;
+    }
+    m_observers.insert(observer);
+}
+
+void LocaleAssetsManager::removeLocaleAssetsObserver(
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>& observer) {
+    std::lock_guard<std::mutex> lock{m_observersMutex};
+    if (observer == nullptr) {
+        ACSDK_ERROR(LX("removeLocaleAssetsObserverFailed").d("reason", "nullObserver"));
+        return;
+    }
+    m_observers.erase(observer);
+}
+
+void LocaleAssetsManager::setEndpointRegistrationManager(
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>&
+        manager) {
+    std::lock_guard<std::mutex> lock{m_ermMutex};
+    if (manager == nullptr) {
+        ACSDK_ERROR(LX("setEndpointRegistrationManagerFailed").m("null EndpointRegistrationManager"));
+        return;
+    }
+    m_endpointRegistrationManager = manager;
+}
+
+void LocaleAssetsManager::onConfigurationChanged(
+    const alexaClientSDK::avsCommon::avs::CapabilityConfiguration& configuration) {
+    // No-op
+}
+
+LocaleAssetsManager::LocaleAssetsManager() :
+        RequiresShutdown{"LocaleAssetsManager"},
+        m_defaultLocale{DEFAULT_LOCALE_VALUE} {
+}
+
+#ifdef KWD
+#ifdef ASSET_MANAGER
+LocaleAssetsManager::LocaleAssetsManager(
+    const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+    const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+    const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector,
+    const std::shared_ptr<AssetManager>& assetManager) :
+        RequiresShutdown{"LocaleAssetsManager"},
+        m_audioInputStream(audioInputStream),
+        m_audioFormat(audioFormat),
+        m_keywordDetector(keywordDetector),
+        m_assetManager(assetManager) {
+}
+#else
+LocaleAssetsManager::LocaleAssetsManager(
+    const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+    const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+    const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector) :
+        RequiresShutdown{"LocaleAssetsManager"},
+        m_audioInputStream(audioInputStream),
+        m_audioFormat(audioFormat),
+        m_keywordDetector(keywordDetector) {
+}
+#endif
+#endif
+
+void LocaleAssetsManager::doShutdown() {
+    {
+        std::lock_guard<std::mutex> lock{m_ermMutex};
+        m_endpointRegistrationManager.reset();
+    }
+    {
+        std::lock_guard<std::mutex> lock{m_observersMutex};
+        m_observers.clear();
+    }
+}
+
+}  // namespace sampleApp
+}  // namespace alexaClientSDK
diff --git a/SampleApp/src/RevokeAuthorizationObserver.cpp b/SampleApplications/Common/LibSampleApp/src/RevokeAuthorizationObserver.cpp
similarity index 100%
rename from SampleApp/src/RevokeAuthorizationObserver.cpp
rename to SampleApplications/Common/LibSampleApp/src/RevokeAuthorizationObserver.cpp
diff --git a/SampleApp/src/SDKDiagnostics.cpp b/SampleApplications/Common/LibSampleApp/src/SDKDiagnostics.cpp
similarity index 98%
rename from SampleApp/src/SDKDiagnostics.cpp
rename to SampleApplications/Common/LibSampleApp/src/SDKDiagnostics.cpp
index 984b832aa6..0d80200e9f 100644
--- a/SampleApp/src/SDKDiagnostics.cpp
+++ b/SampleApplications/Common/LibSampleApp/src/SDKDiagnostics.cpp
@@ -25,7 +25,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::sdkInterfaces::diagnostics;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SDKDiagnostics");
+#define TAG "SDKDiagnostics"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/SampleApplications/Common/LibSampleApp/src/SampleApplication.cpp b/SampleApplications/Common/LibSampleApp/src/SampleApplication.cpp
new file mode 100644
index 0000000000..fa628a2649
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/src/SampleApplication.cpp
@@ -0,0 +1,2091 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdkAudioInputStream/AudioInputStreamFactory.h>
+#include <acsdkAudioInputStream/CompatibleAudioFormat.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/Crypto/CryptoFactory.h>
+#include <acsdkManufactory/Manufactory.h>
+#include <acsdk/Sample/InteractionManager/KeywordObserver.h>
+#include <ACL/Transport/HTTP2TransportFactory.h>
+#include <ACL/Transport/PostConnectSequencerFactory.h>
+#include <AVSCommon/AVS/CapabilitySemantics/CapabilitySemantics.h>
+#include <AVSCommon/AVS/Initialization/InitializationParametersBuilder.h>
+#include <AVSCommon/SDKInterfaces/PowerResourceManagerInterface.h>
+#include <AVSCommon/Utils/LibcurlUtils/HttpPost.h>
+#include <AVSCommon/Utils/LibcurlUtils/LibcurlHTTP2ConnectionFactory.h>
+#include <AVSCommon/Utils/UUIDGeneration/UUIDGeneration.h>
+#include <AVSGatewayManager/AVSGatewayManager.h>
+#include <AVSGatewayManager/Storage/AVSGatewayManagerStorage.h>
+#include <SynchronizeStateSender/SynchronizeStateSenderFactory.h>
+
+#ifdef INPUT_CONTROLLER
+#include <acsdk/Sample/Endpoint/InputControllerEndpointCapabilitiesBuilder.h>
+#endif
+
+#include "SampleApp/ExternalCapabilitiesBuilder.h"
+#include "SampleApp/LocaleAssetsManager.h"
+#include "SampleApp/SampleApplication.h"
+#include "SampleApp/SampleApplicationComponent.h"
+
+#include <acsdkAuthorization/AuthorizationManager.h>
+#include <acsdkAuthorization/LWA/LWAAuthorizationAdapter.h>
+#include <acsdkAuthorization/LWA/LWAAuthorizationStorage.h>
+#include <acsdkAuthorizationInterfaces/AuthorizationManagerInterface.h>
+#include <acsdkSampleApplicationCBLAuthRequester/SampleApplicationCBLAuthRequester.h>
+
+#ifdef ENABLE_REVOKE_AUTH
+#include "SampleApp/RevokeAuthorizationObserver.h"
+#endif
+
+#ifdef ENABLE_PCC
+#include "acsdk/PhoneCallControllerAdapter/PhoneCaller.h"
+#endif
+
+#ifdef ENABLE_MCC
+#include <acsdk/MeetingClientControllerAdapter/CalendarClient.h>
+#include <acsdk/MeetingClientControllerAdapter/MeetingClient.h>
+#endif
+
+#ifdef KWD
+#ifdef ASSET_MANAGER
+#include <acsdkDavsClient/DavsClient.h>
+#include <acsdkDavsClient/DavsEndpointHandlerV3.h>
+#include <acsdkAssetManager/AssetManager.h>
+#include <acsdkAssetsInterfaces/Communication/InMemoryAmdCommunicationHandler.h>
+#endif
+#include <KWDProvider/KeywordDetectorProvider.h>
+#endif
+
+#ifdef PORTAUDIO
+#include <acsdk/Sample/Microphone/PortAudioMicrophoneAdapter.h>
+#endif
+
+#ifdef GSTREAMER_MEDIA_PLAYER
+#include <MediaPlayer/MediaPlayer.h>
+#endif
+
+#ifdef ANDROID
+#if defined(ANDROID_MEDIA_PLAYER) || defined(ANDROID_MICROPHONE)
+#include <AndroidUtilities/AndroidSLESEngine.h>
+#endif
+
+#ifdef ANDROID_MEDIA_PLAYER
+#include <AndroidSLESMediaPlayer/AndroidSLESMediaPlayer.h>
+#include <AndroidSLESMediaPlayer/AndroidSLESSpeaker.h>
+#endif
+
+#ifdef ANDROID_MICROPHONE
+#include <AndroidUtilities/AndroidSLESMicrophone.h>
+#endif
+
+#ifdef ANDROID_LOGGER
+#include <AndroidUtilities/AndroidLogger.h>
+#endif
+
+#endif
+
+#ifdef BLUETOOTH_BLUEZ
+#include <BlueZ/BlueZBluetoothDeviceManager.h>
+#endif
+
+#ifdef POWER_CONTROLLER
+#include <acsdk/Sample/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h>
+#endif
+
+#ifdef TOGGLE_CONTROLLER
+#include <ToggleController/ToggleControllerAttributeBuilder.h>
+#include <acsdk/Sample/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h>
+#include <acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointToggleControllerHandler.h>
+#endif
+
+#ifdef RANGE_CONTROLLER
+#include <RangeController/RangeControllerAttributeBuilder.h>
+#include <acsdk/Sample/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h>
+#include <acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointRangeControllerHandler.h>
+#endif
+
+#ifdef MODE_CONTROLLER
+#include <ModeController/ModeControllerAttributeBuilder.h>
+#include <acsdk/Sample/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h>
+#include <acsdk/Sample/Endpoint/DefaultEndpoint/DefaultEndpointModeControllerHandler.h>
+#endif
+
+#ifdef ENABLE_LPM
+#include <AVSCommon/Utils/Power/NoOpPowerResourceManager.h>
+#endif
+
+#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
+#include <AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceConnectionRuleInterface.h>
+#include <AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Diagnostics/ProtocolTracerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include <AVSCommon/Utils/DeviceInfo.h>
+#include <AVSCommon/Utils/LibcurlUtils/HTTPContentFetcherFactory.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Logger/LoggerSinkManager.h>
+#include <AVSCommon/Utils/Network/InternetConnectionMonitor.h>
+#include <acsdkAlerts/Storage/SQLiteAlertStorage.h>
+#include <Audio/AudioFactory.h>
+#include <Audio/MicrophoneInterface.h>
+#include <acsdkBluetooth/BasicDeviceConnectionRule.h>
+#include <acsdkBluetooth/SQLiteBluetoothStorage.h>
+#include <acsdkNotifications/SQLiteNotificationsStorage.h>
+#include <CapabilitiesDelegate/CapabilitiesDelegate.h>
+#include <CapabilitiesDelegate/Storage/SQLiteCapabilitiesDelegateStorage.h>
+#include <SQLiteStorage/SQLiteMiscStorage.h>
+#include <SampleApp/CaptionPresenter.h>
+#include <SampleApp/SampleEqualizerModeController.h>
+#include <Settings/Storage/SQLiteDeviceSettingStorage.h>
+
+#include <acsdkEqualizerImplementations/InMemoryEqualizerConfiguration.h>
+#include <acsdkEqualizerImplementations/MiscDBEqualizerStorage.h>
+#include <acsdkEqualizerImplementations/SDKConfigEqualizerConfiguration.h>
+#include <acsdkEqualizerInterfaces/EqualizerInterface.h>
+#include <InterruptModel/config/InterruptModelConfiguration.h>
+
+#include <algorithm>
+#include <cctype>
+#include <csignal>
+
+#ifdef CUSTOM_MEDIA_PLAYER
+namespace alexaClientSDK {
+
+std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ApplicationMediaInterfaces> createCustomMediaPlayer(
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>
+        contentFetcherFactory,
+    bool enableEqualizer,
+    const std::string& name,
+    bool enableLiveMode);
+
+}  // namespace alexaClientSDK
+#endif
+
+namespace alexaClientSDK {
+namespace sampleApp {
+
+/// The size of each word within the stream.
+static const size_t WORD_SIZE = 2;
+
+/// The maximum number of readers of the stream.
+static const size_t MAX_READERS = 10;
+
+/// The default number of MediaPlayers used by AudioPlayer CA/
+/// Can be overridden in the Configuration using @c AUDIO_MEDIAPLAYER_POOL_SIZE_KEY
+static const unsigned int AUDIO_MEDIAPLAYER_POOL_SIZE_DEFAULT = 2;
+
+/// The amount of audio data to keep in the ring buffer.
+static const std::chrono::seconds AMOUNT_OF_AUDIO_DATA_IN_BUFFER = std::chrono::seconds(15);
+
+/// Key for the root node value containing configuration values for SampleApp.
+static const std::string SAMPLE_APP_CONFIG_KEY("sampleApp");
+
+/// Key for the root node value containing configuration values for Equalizer.
+static const std::string EQUALIZER_CONFIG_KEY("equalizer");
+
+/// Key for the @c firmwareVersion value under the @c SAMPLE_APP_CONFIG_KEY configuration node.
+static const std::string FIRMWARE_VERSION_KEY("firmwareVersion");
+
+/// Key for the @c endpoint value under the @c SAMPLE_APP_CONFIG_KEY configuration node.
+static const std::string ENDPOINT_KEY("endpoint");
+
+/// Key for setting if display cards are supported or not under the @c SAMPLE_APP_CONFIG_KEY configuration node.
+static const std::string DISPLAY_CARD_KEY("displayCardsSupported");
+
+/// Key for the Audio MediaPlayer pool size.
+static const std::string AUDIO_MEDIAPLAYER_POOL_SIZE_KEY("audioMediaPlayerPoolSize");
+
+#if defined(KWD) && defined(ASSET_MANAGER)
+/// Name of @c ConfigurationNode for DeviceSettings
+const std::string CONFIG_KEY_DEVICE_SETTINGS = "deviceSettings";
+
+/// Name of @c Parent group for davs setting
+const std::string CONFIG_KEY_DAVS_KEY = "davs";
+
+/// Name of @c locale value in davs's @c ConfigurationNode.
+const std::string CONFIG_KEY_ARTIFACT_DIRECTORY = "artifactDirectory";
+
+/// Name of @c locale value in davs's @c ConfigurationNode.
+const std::string CONFIG_KEY_ARTIFACT_BUDGET_SIZE_IN_MB = "artifactBudgetSizeInMB";
+
+/// Name of @c locale value in davs's @c ConfigurationNode.
+const std::string CONFIG_KEY_SEGMENT_ID = "segmentId";
+
+/// Name of @c locale value in davs's @c ConfigurationNode.
+const std::string CONFIG_KEY_POLLING_INTERVAL_IN_SECONDS = "pollingIntervalInSeconds";
+
+/// Default polling interval for the Davs Client. Default is zero second because it implies that the polling interval
+/// for each DAVS request will be set by the DAVS cloud API call response’s ttl field instead.
+constexpr uint32_t POLLING_INTERVAL_IN_SECONDS_DEFAULT = 0;
+
+/// Default budget in MB for DAVs Asset Manager
+constexpr uint32_t ARTIFACT_BUDGET_SIZE_IN_MB_DEFAULT = 100;
+#endif
+
+using namespace acsdkManufactory;
+using namespace acsdkSampleApplication;
+using namespace avsCommon;
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace acsdkExternalMediaPlayer;
+using namespace alexaClientSDK::crypto;
+using namespace alexaClientSDK::cryptoInterfaces;
+using namespace avsCommon::avs;
+using namespace sampleApplications::common;
+
+using MediaPlayerInterface = alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface;
+using ApplicationMediaInterfaces = alexaClientSDK::avsCommon::sdkInterfaces::ApplicationMediaInterfaces;
+
+/// The @c m_playerToMediaPlayerMap Map of the adapter to their speaker-type and MediaPlayer creation methods.
+std::unordered_map<std::string, avsCommon::sdkInterfaces::ChannelVolumeInterface::Type>
+    SampleApplication::m_playerToSpeakerTypeMap;
+
+/// The singleton map from @c playerId to @c ExternalMediaAdapter creation functions.
+std::unordered_map<std::string, ExternalMediaPlayer::AdapterCreateFunction> SampleApplication::m_adapterToCreateFuncMap;
+
+/// String to identify log entries originating from this file.
+#define TAG "SampleApplication"
+
+#ifdef ENABLE_ENDPOINT_CONTROLLERS
+/// The instance name for the toggle controller in default endpoint
+static const std::string DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME("DefaultEndpoint.Light");
+
+/// The friendly name of the toggle controller in default endpoint.
+static const std::string DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_FRIENDLY_NAME("Light");
+
+/// The instance name for the range controller in the default endpoint.
+static const std::string DEFAULT_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME("DefaultEndpoint.FanSpeed");
+
+/// The instance name for the mode controller in the default endpoint.
+static const std::string DEFAULT_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME("DefaultEndpoint.Mode");
+
+#ifdef RANGE_CONTROLLER
+/// The range value for the prest 'high' for range controller in the default endpoint.
+static const double DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH = 5;
+
+/// The range value for the prest 'medium' for range controller in the default endpoint.
+static const double DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_MEDIUM = 3;
+
+/// The range value for the prest 'low' for range controller in the default endpoint.
+static const double DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW = 1;
+#endif  // RANGE_CONTROLLER
+
+// Note: Discoball is an imaginary peripheral endpoint that is connected to the device with the following
+// capabilities : power, light (toggle), height (range), and the color of light (mode).
+// Discoball uses semantic annotations to enable additional natural utterances.
+
+/// The derived endpoint Id used in endpoint creation.
+static const std::string PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID("Discoball");
+
+/// The description of the endpoint.
+static const std::string PERIPHERAL_ENDPOINT_DESCRIPTION("Sample Discoball Description");
+
+/// The friendly name of the peripheral endpoint. This is used in utterance.
+static const std::string PERIPHERAL_ENDPOINT_FRIENDLYNAME("Discoball");
+
+/// The manufacturer of peripheral endpoint.
+static const std::string PERIPHERAL_ENDPOINT_MANUFACTURER_NAME("Sample Manufacturer");
+
+/// The display category of the peripheral endpoint.
+static const std::vector<std::string> PERIPHERAL_ENDPOINT_DISPLAYCATEGORY({"OTHER"});
+
+/// The instance name for the toggle controller in peripheral endpoint.
+static const std::string PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME("Discoball.Light");
+
+/// The friendly name of the toggle controller on peripheral endpoint.
+static const std::string PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_FRIENDLY_NAME("Light");
+
+/// The instance name for the range controller peripheral endpoint.
+static const std::string PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME("Discoball.Height");
+
+/// The friendly name of the range controller on peripheral endpoint.
+static const std::string PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_FRIENDLY_NAME("Height");
+
+/// The instance name for the mode controller peripheral endpoint.
+static const std::string PERIPHERAL_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME("Discoball.Mode");
+
+/// The friendly name of the mode controller on peripheral endpoint.
+static const std::string PERIPHERAL_ENDPOINT_MODE_CONTROLLER_FRIENDLY_NAME("Light");
+
+/// The model of the peripheral endpoint.
+static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_MODEL("Model1");
+
+/// Serial number of the peripheral endpoint.
+static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_SERIAL_NUMBER("123456789");
+
+/// Firmware version number peripheral endpoint.
+static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_FIRMWARE_VERSION("1.0");
+
+/// Software Version number peripheral endpoint.
+static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_SOFTWARE_VERSION("1.0");
+
+/// The custom identifier peripheral endpoint.
+static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_CUSTOM_IDENTIFIER("SampleApp");
+
+#ifdef RANGE_CONTROLLER
+/// The range controller preset 'high' in peripheral endpoint.
+static const double PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH = 10;
+
+/// The range controller preset 'medium' in peripheral endpoint.
+static const double PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_MEDIUM = 5;
+
+/// The range controller preset 'low' in peripheral endpoint.
+static const double PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW = 1;
+
+/// The action ID for "raise" semantic annotations.
+static const std::string SEMANTICS_ACTION_ID_RAISE("Alexa.Actions.Raise");
+
+/// The action ID for "lower" semantic annotations.
+static const std::string SEMANTICS_ACTION_ID_LOWER("Alexa.Actions.Lower");
+
+/// The range controller SetRangeValue directive name.
+static const std::string SETRANGE_DIRECTIVE_NAME("SetRangeValue");
+
+/// The range controller SetRangeValue payload mapped to the raise action.
+static const std::string PERIPHERAL_ENDPOINT_RAISE_PAYLOAD =
+    R"({"rangeValue":)" + std::to_string(PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH) + R"(})";
+
+/// The range controller SetRangeValue payload mapped to the lower action.
+static const std::string PERIPHERAL_ENDPOINT_LOWER_PAYLOAD =
+    R"({"rangeValue":)" + std::to_string(PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW) + R"(})";
+
+#endif  // RANGE_CONTROLLER
+
+/// US English locale string.
+static const std::string EN_US("en-US");
+#endif  // ENABLE_ENDPOINT_CONTROLLERS
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// A set of all log levels.
+static const std::set<alexaClientSDK::avsCommon::utils::logger::Level> allLevels = {
+    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG9,
+    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG8,
+    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG7,
+    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG6,
+    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG5,
+    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG4,
+    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG3,
+    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG2,
+    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG1,
+    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG0,
+    alexaClientSDK::avsCommon::utils::logger::Level::INFO,
+    alexaClientSDK::avsCommon::utils::logger::Level::WARN,
+    alexaClientSDK::avsCommon::utils::logger::Level::ERROR,
+    alexaClientSDK::avsCommon::utils::logger::Level::CRITICAL,
+    alexaClientSDK::avsCommon::utils::logger::Level::NONE};
+
+#ifdef ENABLE_ENDPOINT_CONTROLLERS
+
+/// Struct representing the friendly name.
+struct FriendlyName {
+    /// Type of the friendly name.
+    enum class Type {
+        /// Friendly name as asset type.
+        ASSET,
+        /// Friendly name as text type.
+        TEXT
+    };
+
+    /// Holds the type of the friendly name.
+    Type type;
+
+    /// Value contains the assetId when Type::ASSET or it contains the text when Type::TEXT.
+    std::string value;
+};
+
+/// The capability resources of primitive controllers.
+struct CapabilityResources {
+    /// Represents the friendly name of capability.
+    std::vector<FriendlyName> friendlyNames;
+};
+
+#ifdef RANGE_CONTROLLER
+/// This struct represents the Range Controller preset and its friendly names.
+struct RangeControllerPresetResources {
+    /// The value of a preset.
+    double presetValue;
+
+    /// The friendly names of the presets.
+    std::vector<FriendlyName> friendlyNames;
+};
+#endif
+
+#ifdef MODE_CONTROLLER
+/// This struct represents the Mode Controller modes and its friendly names.
+struct ModeControllerModeResources {
+    /// The mode in the Mode Controller.
+    std::string mode;
+
+    /// The friendly names of the @c mode.
+    std::vector<FriendlyName> friendlyNames;
+};
+#endif
+#endif
+
+/**
+ * Gets a log level consumable by the SDK based on the user input string for log level.
+ *
+ * @param userInputLogLevel The string to be parsed into a log level.
+ * @return The log level. This will default to NONE if the input string is not properly parsable.
+ */
+static alexaClientSDK::avsCommon::utils::logger::Level getLogLevelFromUserInput(std::string userInputLogLevel) {
+    std::transform(userInputLogLevel.begin(), userInputLogLevel.end(), userInputLogLevel.begin(), ::toupper);
+    return alexaClientSDK::avsCommon::utils::logger::convertNameToLevel(userInputLogLevel);
+}
+
+/**
+ * Allows the process to ignore the SIGPIPE signal.
+ * The SIGPIPE signal may be received when the application performs a write to a closed socket.
+ * This is a case that arises in the use of certain networking libraries.
+ *
+ * @return true if the action for handling SIGPIPEs was correctly set to ignore, else false.
+ */
+static bool ignoreSigpipeSignals() {
+#ifndef NO_SIGPIPE
+    if (std::signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
+        return false;
+    }
+#endif
+    return true;
+}
+
+#ifdef ENABLE_ENDPOINT_CONTROLLERS
+#ifdef TOGGLE_CONTROLLER
+/**
+ * Helper function to build the @c ToggleControllerAttributes
+ *
+ * @param capabilityResources The @c CapabilityResources containing friendly names of controller.
+ * @return A non optional @c ToggleControllerAttributes if the build succeeds; otherwise, an empty
+ * @c ToggleControllerAttributes object.
+ */
+static avsCommon::utils::Optional<avsCommon::sdkInterfaces::toggleController::ToggleControllerAttributes>
+buildToggleControllerAttributes(const CapabilityResources& capabilityResources) {
+    auto controllerAttribute =
+        avsCommon::utils::Optional<avsCommon::sdkInterfaces::toggleController::ToggleControllerAttributes>();
+    auto toggleControllerAttributeBuilder =
+        capabilityAgents::toggleController::ToggleControllerAttributeBuilder::create();
+    if (!toggleControllerAttributeBuilder) {
+        ACSDK_ERROR(LX("Failed to create default endpoint toggle controller attribute builder!"));
+        return controllerAttribute;
+    }
+
+    if (capabilityResources.friendlyNames.size() == 0) {
+        ACSDK_ERROR(LX("buildToggleControllerAttributesFailed").m("noFriendlyNames"));
+        return controllerAttribute;
+    }
+
+    auto toggleControllerCapabilityResources = avsCommon::avs::CapabilityResources();
+    for (auto& friendlyName : capabilityResources.friendlyNames) {
+        if (FriendlyName::Type::ASSET == friendlyName.type) {
+            if (!toggleControllerCapabilityResources.addFriendlyNameWithAssetId(friendlyName.value)) {
+                ACSDK_ERROR(LX("buildToggleControllerAttributes")
+                                .m("addFriendlyNameWithAssetIdFailed")
+                                .d("value", friendlyName.value));
+                return controllerAttribute;
+            }
+        }
+        if (FriendlyName::Type::TEXT == friendlyName.type) {
+            if (!toggleControllerCapabilityResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
+                ACSDK_ERROR(LX("buildToggleControllerAttributes")
+                                .m("addFriendlyNameWithAssetIdFailed")
+                                .d("value", friendlyName.value));
+                return controllerAttribute;
+            }
+        }
+    }
+
+    toggleControllerAttributeBuilder->withCapabilityResources(toggleControllerCapabilityResources);
+
+    return toggleControllerAttributeBuilder->build();
+}
+#endif  // TOGGLE_CONTROLLER
+
+#ifdef RANGE_CONTROLLER
+/**
+ * Helper function to build the @c RangeControllerAttributes
+ *
+ * @param capabilityResources The @c CapabilityResources containing friendly names of controller.
+ * @param rangeControllerPresetResources A vector representing the preset resources used for building the configuration.
+ * @param semantics An optional @c CapabilitySemantics for the range controller.
+ * @return A non optional @c RangeControllerAttributes if the build succeeds; otherwise, an empty
+ * @c RangeControllerAttributes object.
+ */
+static avsCommon::utils::Optional<avsCommon::sdkInterfaces::rangeController::RangeControllerAttributes>
+buildRangeControllerAttributes(
+    const CapabilityResources& capabilityResources,
+    const std::vector<RangeControllerPresetResources>& rangeControllerPresetResources,
+    const avsCommon::utils::Optional<avsCommon::avs::capabilitySemantics::CapabilitySemantics> semantics =
+        avsCommon::utils::Optional<avsCommon::avs::capabilitySemantics::CapabilitySemantics>()) {
+    auto controllerAttribute =
+        avsCommon::utils::Optional<avsCommon::sdkInterfaces::rangeController::RangeControllerAttributes>();
+
+    auto rangeControllerAttributeBuilder = capabilityAgents::rangeController::RangeControllerAttributeBuilder::create();
+    if (!rangeControllerAttributeBuilder) {
+        ACSDK_ERROR(LX("Failed to create range controller attribute builder!"));
+        return controllerAttribute;
+    }
+
+    if (capabilityResources.friendlyNames.size() == 0) {
+        ACSDK_ERROR(LX("buildRangeControllerAttributesFailed").m("emptyCapabilityFriendlyNames"));
+        return controllerAttribute;
+    }
+
+    auto rangeControllerCapabilityResources = avsCommon::avs::CapabilityResources();
+    for (auto& friendlyName : capabilityResources.friendlyNames) {
+        if (FriendlyName::Type::ASSET == friendlyName.type) {
+            if (!rangeControllerCapabilityResources.addFriendlyNameWithAssetId(friendlyName.value)) {
+                ACSDK_ERROR(LX("buildRangeControllerAttributes")
+                                .m("addFriendlyNameWithAssetIdFailed")
+                                .d("value", friendlyName.value));
+                return controllerAttribute;
+            }
+        }
+        if (FriendlyName::Type::TEXT == friendlyName.type) {
+            if (!rangeControllerCapabilityResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
+                ACSDK_ERROR(LX("buildRangeControllerAttributes")
+                                .m("addFriendlyNameWithAssetIdFailed")
+                                .d("value", friendlyName.value));
+                return controllerAttribute;
+            }
+        }
+    }
+
+    rangeControllerAttributeBuilder->withCapabilityResources(rangeControllerCapabilityResources);
+
+    if (rangeControllerPresetResources.size() > 0) {
+        for (auto& presetResource : rangeControllerPresetResources) {
+            if (presetResource.friendlyNames.size() == 0) {
+                ACSDK_ERROR(LX("buildRangeControllerAttributes")
+                                .m("buildRangeControllerAttributesFailed")
+                                .m("noPresetFriendlyNames")
+                                .d("presetValue", presetResource.presetValue));
+                return controllerAttribute;
+            }
+            auto presetResources = avsCommon::avs::CapabilityResources();
+            for (auto& friendlyName : presetResource.friendlyNames) {
+                if (FriendlyName::Type::ASSET == friendlyName.type) {
+                    if (!presetResources.addFriendlyNameWithAssetId(friendlyName.value)) {
+                        ACSDK_ERROR(LX("buildRangeControllerAttributes")
+                                        .m("addFriendlyNameWithAssetIdFailed")
+                                        .d("value", friendlyName.value)
+                                        .d("presetValue", presetResource.presetValue));
+                        return controllerAttribute;
+                    }
+                }
+                if (FriendlyName::Type::TEXT == friendlyName.type) {
+                    if (!presetResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
+                        ACSDK_ERROR(LX("buildRangeControllerAttributes")
+                                        .m("addFriendlyNameWithAssetIdFailed")
+                                        .d("value", friendlyName.value)
+                                        .d("presetValue", presetResource.presetValue));
+                        return controllerAttribute;
+                    }
+                }
+            }
+            rangeControllerAttributeBuilder->addPreset(std::make_pair(presetResource.presetValue, presetResources));
+        }
+    }
+
+    if (semantics.hasValue()) {
+        if (!semantics.value().isValid()) {
+            ACSDK_ERROR(LX("buildRangeControllerAttributes").m("invalidSemantics"));
+            return controllerAttribute;
+        }
+        rangeControllerAttributeBuilder->withSemantics(semantics.value());
+    }
+
+    return rangeControllerAttributeBuilder->build();
+}
+#endif  // RANGE_CONTROLLER
+
+#ifdef MODE_CONTROLLER
+/**
+ * Helper function to build the @c ModeControllerAttributes
+ *
+ * @param capabilityResources The @c CapabilityResources containing friendly names of controller.
+ * @param presetResources A vector representing the mode resources used for building the configuration.
+ * @return A non optional @c ModeControllerAttributes if the build succeeds; otherwise, an empty
+ * @c ModeControllerAttributes object.
+ */
+static avsCommon::utils::Optional<avsCommon::sdkInterfaces::modeController::ModeControllerAttributes>
+buildModeControllerAttributes(
+    const CapabilityResources& capabilityResources,
+    const std::vector<ModeControllerModeResources>& modeControllerModeResources) {
+    auto controllerAttribute =
+        avsCommon::utils::Optional<avsCommon::sdkInterfaces::modeController::ModeControllerAttributes>();
+
+    auto modeControllerAttributeBuilder = capabilityAgents::modeController::ModeControllerAttributeBuilder::create();
+    if (!modeControllerAttributeBuilder) {
+        ACSDK_ERROR(LX("Failed to create mode controller attribute builder!"));
+        return controllerAttribute;
+    }
+
+    if (capabilityResources.friendlyNames.size() == 0) {
+        ACSDK_ERROR(LX("buildModeControllerAttributesFailed").m("emptyCapabilityFriendlyNames"));
+        return controllerAttribute;
+    }
+
+    auto modeControllerCapabilityResources = avsCommon::avs::CapabilityResources();
+    for (auto& friendlyName : capabilityResources.friendlyNames) {
+        if (FriendlyName::Type::ASSET == friendlyName.type) {
+            if (!modeControllerCapabilityResources.addFriendlyNameWithAssetId(friendlyName.value)) {
+                ACSDK_ERROR(LX("buildModeControllerAttributes")
+                                .m("addFriendlyNameWithAssetIdFailed")
+                                .d("value", friendlyName.value));
+                return controllerAttribute;
+            }
+        }
+        if (FriendlyName::Type::TEXT == friendlyName.type) {
+            if (!modeControllerCapabilityResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
+                ACSDK_ERROR(LX("buildModeControllerAttributes")
+                                .m("addFriendlyNameWithAssetIdFailed")
+                                .d("value", friendlyName.value));
+                return controllerAttribute;
+            }
+        }
+    }
+
+    modeControllerAttributeBuilder->withCapabilityResources(modeControllerCapabilityResources);
+
+    if (modeControllerModeResources.size() > 0) {
+        for (auto& modeResource : modeControllerModeResources) {
+            if (modeResource.friendlyNames.size() == 0) {
+                ACSDK_ERROR(LX("buildModeControllerAttributes")
+                                .m("buildModeControllerAttributesFailed")
+                                .m("noPresetFriendlyNames")
+                                .d("mode", modeResource.mode));
+                return controllerAttribute;
+            }
+            auto modeResources = avsCommon::avs::CapabilityResources();
+            for (auto& friendlyName : modeResource.friendlyNames) {
+                if (FriendlyName::Type::ASSET == friendlyName.type) {
+                    if (!modeResources.addFriendlyNameWithAssetId(friendlyName.value)) {
+                        ACSDK_ERROR(LX("buildModeControllerAttributes")
+                                        .m("addFriendlyNameWithAssetIdFailed")
+                                        .d("value", friendlyName.value)
+                                        .d("mode", modeResource.mode));
+                        return controllerAttribute;
+                    }
+                }
+                if (FriendlyName::Type::TEXT == friendlyName.type) {
+                    if (!modeResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
+                        ACSDK_ERROR(LX("buildModeControllerAttributes")
+                                        .m("addFriendlyNameWithAssetIdFailed")
+                                        .d("value", friendlyName.value)
+                                        .d("mode", modeResource.mode));
+                        return controllerAttribute;
+                    }
+                }
+            }
+            modeControllerAttributeBuilder->addMode(modeResource.mode, modeResources);
+        }
+        modeControllerAttributeBuilder->setOrdered(true);
+    }
+
+    return modeControllerAttributeBuilder->build();
+}
+#endif  // MODE_CONTROLLER
+#endif  // ENABLE_ENDPOINT_CONTROLLERS
+
+std::unique_ptr<SampleApplication> SampleApplication::create(
+    std::shared_ptr<alexaClientSDK::sampleApp::ConsoleReader> consoleReader,
+    const std::vector<std::string>& configFiles,
+    const std::string& logLevel,
+    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics) {
+    auto clientApplication = std::unique_ptr<SampleApplication>(new SampleApplication);
+    if (!clientApplication->initialize(consoleReader, configFiles, logLevel, diagnostics)) {
+        ACSDK_CRITICAL(LX("Failed to initialize SampleApplication"));
+        return nullptr;
+    }
+    if (!ignoreSigpipeSignals()) {
+        ACSDK_CRITICAL(LX("Failed to set a signal handler for SIGPIPE"));
+        return nullptr;
+    }
+
+    return clientApplication;
+}
+
+SampleApplication::AdapterRegistration::AdapterRegistration(
+    const std::string& playerId,
+    ExternalMediaPlayer::AdapterCreateFunction createFunction) {
+    ACSDK_DEBUG0(LX(__func__).d("id", playerId));
+    if (m_adapterToCreateFuncMap.find(playerId) != m_adapterToCreateFuncMap.end()) {
+        ACSDK_WARN(LX("Adapter already exists").d("playerID", playerId));
+    }
+
+    m_adapterToCreateFuncMap[playerId] = createFunction;
+}
+
+SampleApplication::MediaPlayerRegistration::MediaPlayerRegistration(
+    const std::string& playerId,
+    avsCommon::sdkInterfaces::ChannelVolumeInterface::Type speakerType) {
+    ACSDK_DEBUG0(LX(__func__).d("id", playerId));
+    if (m_playerToSpeakerTypeMap.find(playerId) != m_playerToSpeakerTypeMap.end()) {
+        ACSDK_WARN(LX("MediaPlayer already exists").d("playerId", playerId));
+    }
+
+    m_playerToSpeakerTypeMap[playerId] = speakerType;
+}
+
+SampleAppReturnCode SampleApplication::run() {
+    return m_userInputManager->run();
+}
+
+#ifdef DIAGNOSTICS
+bool SampleApplication::initiateRestart() {
+    m_userInputManager->onLogout();
+    return true;
+}
+#endif
+
+SampleApplication::~SampleApplication() {
+    if (m_shutdownManager) {
+        m_shutdownManager->shutdown();
+    }
+
+    // First clean up anything that depends on the the MediaPlayers.
+    m_userInputManager.reset();
+    m_externalMusicProviderMediaPlayersMap.clear();
+
+    for (auto& shutdownable : m_shutdownRequiredList) {
+        if (!shutdownable) {
+            ACSDK_ERROR(LX("shutdownFailed").m("Component requiring shutdown was null"));
+        } else {
+            shutdownable->shutdown();
+        }
+    }
+    m_sdkInit.reset();
+}
+
+std::shared_ptr<alexaClientSDK::defaultClient::DefaultClient> SampleApplication::getDefaultClient() {
+    return m_client;
+}
+
+bool SampleApplication::createMediaPlayersForAdapters(
+    const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
+        httpContentFetcherFactory,
+    std::shared_ptr<defaultClient::EqualizerRuntimeSetup> equalizerRuntimeSetup) {
+    bool equalizerEnabled = equalizerRuntimeSetup->isEnabled();
+
+    for (auto& entry : m_playerToSpeakerTypeMap) {
+        auto applicationMediaInterfaces = createApplicationMediaPlayer(
+            httpContentFetcherFactory, equalizerEnabled, entry.first + "MediaPlayer", false);
+        if (applicationMediaInterfaces) {
+            m_externalMusicProviderMediaPlayersMap[entry.first] = applicationMediaInterfaces->mediaPlayer;
+            m_externalMusicProviderSpeakersMap[entry.first] = applicationMediaInterfaces->speaker;
+            if (equalizerEnabled) {
+                equalizerRuntimeSetup->addEqualizer(applicationMediaInterfaces->equalizer);
+            }
+        } else {
+            ACSDK_CRITICAL(LX("Failed to create application media interface").d("playerId", entry.first));
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool SampleApplication::initialize(
+    std::shared_ptr<alexaClientSDK::sampleApp::ConsoleReader> consoleReader,
+    const std::vector<std::string>& configFiles,
+    const std::string& logLevel,
+    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics) {
+    avsCommon::utils::logger::Level logLevelValue = avsCommon::utils::logger::Level::UNKNOWN;
+
+    if (!logLevel.empty()) {
+        logLevelValue = getLogLevelFromUserInput(logLevel);
+        if (alexaClientSDK::avsCommon::utils::logger::Level::UNKNOWN == logLevelValue) {
+            ConsolePrinter::simplePrint("Unknown log level input!");
+            ConsolePrinter::simplePrint("Possible log level options are: ");
+            for (auto it = allLevels.begin(); it != allLevels.end(); ++it) {
+                ConsolePrinter::simplePrint(alexaClientSDK::avsCommon::utils::logger::convertLevelToName(*it));
+            }
+            return false;
+        }
+
+        ConsolePrinter::simplePrint(
+            "Running app with log level: " +
+            alexaClientSDK::avsCommon::utils::logger::convertLevelToName(logLevelValue));
+    }
+
+    alexaClientSDK::avsCommon::utils::logger::LoggerSinkManager::instance().setLevel(logLevelValue);
+
+    auto configJsonStreams = std::make_shared<std::vector<std::shared_ptr<std::istream>>>();
+
+    for (auto configFile : configFiles) {
+        if (configFile.empty()) {
+            ConsolePrinter::simplePrint("Config filename is empty!");
+            return false;
+        }
+
+        auto configInFile = std::shared_ptr<std::ifstream>(new std::ifstream(configFile));
+        if (!configInFile->good()) {
+            ACSDK_CRITICAL(LX("Failed to read config file").d("filename", configFile));
+            ConsolePrinter::simplePrint("Failed to read config file " + configFile);
+            return false;
+        }
+
+        configJsonStreams->push_back(configInFile);
+    }
+
+#ifdef DISABLE_DUCKING
+    bool enableDucking = false;
+#else
+    bool enableDucking = true;
+#endif
+
+    // Add the InterruptModel Configuration.
+    configJsonStreams->push_back(
+        alexaClientSDK::afml::interruptModel::InterruptModelConfiguration::getConfig(enableDucking));
+
+    auto builder = initialization::InitializationParametersBuilder::create();
+    if (!builder) {
+        ACSDK_ERROR(LX("createInitializeParamsFailed").d("reason", "nullBuilder"));
+        return false;
+    }
+
+    builder->withJsonStreams(configJsonStreams);
+
+#ifdef ENABLE_LPM
+    auto powerResourceManager = std::make_shared<avsCommon::utils::power::NoOpPowerResourceManager>();
+    builder->withPowerResourceManager(powerResourceManager);
+#endif
+
+    auto initParams = builder->build();
+
+    /**
+     * If you wish to specify custom implementations for @c AuthDelegateInterface or @c MetricRecorderInterface,
+     * you can pass those objects to the sampleAppComponent via acsdkSampleApplication::getComponent.
+     *
+     * For example:
+     * auto sampleAppComponent = acsdkSampleApplication::getComponent(
+     *     std::move(initParams),
+     *     m_shutdownRequiredList,
+     *     m_cryptoFactory,
+     *     m_keyStore,
+     *     myCustomAuthDelegate,
+     *     myCustomMetricRecorder,
+     *     myCustomLogger);
+     *
+     */
+    SampleApplicationComponent sampleAppComponent =
+        acsdkSampleApplication::getComponent(std::move(initParams), m_shutdownRequiredList);
+    auto manufactory = Manufactory<
+        std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit>,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>,
+        std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>,
+        std::shared_ptr<avsCommon::utils::DeviceInfo>,
+        std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>,
+        std::shared_ptr<registrationManager::CustomerDataManagerInterface>,
+        std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>,
+        std::shared_ptr<cryptoInterfaces::KeyStoreInterface>,
+        std::shared_ptr<UIManager>>::create(sampleAppComponent);
+
+    auto metricRecorder = manufactory->get<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>();
+
+    m_sdkInit = manufactory->get<std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit>>();
+    if (!m_sdkInit) {
+        ACSDK_CRITICAL(LX("Failed to get SDKInit!"));
+        return false;
+    }
+
+    auto configPtr = manufactory->get<std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>>();
+    if (!configPtr) {
+        ACSDK_CRITICAL(LX("Failed to acquire the configuration"));
+        return false;
+    }
+    auto& config = *configPtr;
+    auto sampleAppConfig = config[SAMPLE_APP_CONFIG_KEY];
+
+    auto httpContentFetcherFactory = std::make_shared<avsCommon::utils::libcurlUtils::HTTPContentFetcherFactory>();
+
+    // Creating the misc DB object to be used by various components.
+    std::shared_ptr<alexaClientSDK::storage::sqliteStorage::SQLiteMiscStorage> miscStorage =
+        alexaClientSDK::storage::sqliteStorage::SQLiteMiscStorage::create(config);
+
+    /*
+     * Creating customerDataManager which will be used by the registrationManager and all classes that extend
+     * CustomerDataHandler
+     */
+    auto customerDataManager = manufactory->get<std::shared_ptr<registrationManager::CustomerDataManagerInterface>>();
+    if (!customerDataManager) {
+        ACSDK_CRITICAL(LX("Failed to get CustomerDataManager!"));
+        return false;
+    }
+
+    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> authDelegate;
+
+    m_authManager = acsdkAuthorization::AuthorizationManager::create(miscStorage, customerDataManager);
+    if (!m_authManager) {
+        ACSDK_CRITICAL(LX("Failed to create AuthorizationManager!"));
+        return false;
+    }
+
+    m_shutdownRequiredList.push_back(m_authManager);
+    authDelegate = m_authManager;
+
+    if (!authDelegate) {
+        ACSDK_CRITICAL(LX("Creation of AuthDelegate failed!"));
+        return false;
+    }
+
+    /*
+     * Creating Equalizer specific implementations
+     */
+    auto equalizerConfigBranch = config[EQUALIZER_CONFIG_KEY];
+    auto equalizerConfiguration = acsdkEqualizer::SDKConfigEqualizerConfiguration::create(equalizerConfigBranch);
+    std::shared_ptr<defaultClient::EqualizerRuntimeSetup> equalizerRuntimeSetup =
+        std::make_shared<defaultClient::EqualizerRuntimeSetup>(false);
+
+    bool equalizerEnabled = false;
+    if (equalizerConfiguration && equalizerConfiguration->isEnabled()) {
+        equalizerEnabled = true;
+        equalizerRuntimeSetup = std::make_shared<defaultClient::EqualizerRuntimeSetup>();
+        auto equalizerStorage = acsdkEqualizer::MiscDBEqualizerStorage::create(miscStorage);
+        auto equalizerModeController = sampleApp::SampleEqualizerModeController::create();
+
+        equalizerRuntimeSetup->setStorage(equalizerStorage);
+        equalizerRuntimeSetup->setConfiguration(equalizerConfiguration);
+        equalizerRuntimeSetup->setModeController(equalizerModeController);
+    }
+
+#if defined(ANDROID_MEDIA_PLAYER) || defined(ANDROID_MICROPHONE)
+    m_openSlEngine = applicationUtilities::androidUtilities::AndroidSLESEngine::create();
+    if (!m_openSlEngine) {
+        ACSDK_ERROR(LX("createAndroidMicFailed").d("reason", "failed to create engine"));
+        return false;
+    }
+#endif
+
+    auto speakerMediaInterfaces = createApplicationMediaPlayer(httpContentFetcherFactory, false, "SpeakMediaPlayer");
+    if (!speakerMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for speech!"));
+        return false;
+    }
+    m_speakMediaPlayer = speakerMediaInterfaces->mediaPlayer;
+
+    int poolSize = AUDIO_MEDIAPLAYER_POOL_SIZE_DEFAULT;
+    sampleAppConfig.getInt(AUDIO_MEDIAPLAYER_POOL_SIZE_KEY, &poolSize, AUDIO_MEDIAPLAYER_POOL_SIZE_DEFAULT);
+    std::vector<std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface>> audioSpeakers;
+
+    for (int index = 0; index < poolSize; index++) {
+        std::shared_ptr<MediaPlayerInterface> mediaPlayer;
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> speaker;
+        std::shared_ptr<acsdkEqualizerInterfaces::EqualizerInterface> equalizer;
+
+        auto audioMediaInterfaces =
+            createApplicationMediaPlayer(httpContentFetcherFactory, equalizerEnabled, "AudioMediaPlayer");
+        if (!audioMediaInterfaces) {
+            ACSDK_CRITICAL(LX("Failed to create application media interfaces for audio!"));
+            return false;
+        }
+        m_audioMediaPlayerPool.push_back(audioMediaInterfaces->mediaPlayer);
+        audioSpeakers.push_back(audioMediaInterfaces->speaker);
+        // Creating equalizers
+        if (equalizerRuntimeSetup->isEnabled()) {
+            equalizerRuntimeSetup->addEqualizer(audioMediaInterfaces->equalizer);
+        }
+    }
+
+    avsCommon::utils::Optional<avsCommon::utils::mediaPlayer::Fingerprint> fingerprint =
+        (*(m_audioMediaPlayerPool.begin()))->getFingerprint();
+    auto audioMediaPlayerFactory = std::unique_ptr<mediaPlayer::PooledMediaPlayerFactory>();
+    if (fingerprint.hasValue()) {
+        audioMediaPlayerFactory =
+            mediaPlayer::PooledMediaPlayerFactory::create(m_audioMediaPlayerPool, fingerprint.value());
+    } else {
+        audioMediaPlayerFactory = mediaPlayer::PooledMediaPlayerFactory::create(m_audioMediaPlayerPool);
+    }
+    if (!audioMediaPlayerFactory) {
+        ACSDK_CRITICAL(LX("Failed to create media player factory for content!"));
+        return false;
+    }
+
+    auto notificationMediaInterfaces =
+        createApplicationMediaPlayer(httpContentFetcherFactory, false, "NotificationsMediaPlayer");
+    if (!notificationMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for notifications!"));
+        return false;
+    }
+    m_notificationsMediaPlayer = notificationMediaInterfaces->mediaPlayer;
+
+    auto bluetoothMediaInterfaces =
+        createApplicationMediaPlayer(httpContentFetcherFactory, false, "BluetoothMediaPlayer");
+    if (!bluetoothMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for bluetooth!"));
+        return false;
+    }
+    m_bluetoothMediaPlayer = bluetoothMediaInterfaces->mediaPlayer;
+
+    auto ringtoneMediaInterfaces =
+        createApplicationMediaPlayer(httpContentFetcherFactory, false, "RingtoneMediaPlayer");
+    if (!ringtoneMediaInterfaces) {
+        ConsolePrinter::simplePrint("Failed to create application media interfaces for ringtones!");
+        return false;
+    }
+    m_ringtoneMediaPlayer = ringtoneMediaInterfaces->mediaPlayer;
+
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+    auto commsMediaInterfaces =
+        createApplicationMediaPlayer(httpContentFetcherFactory, false, "CommsMediaPlayer", true);
+    if (!commsMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for comms!"));
+        return false;
+    }
+    m_commsMediaPlayer = commsMediaInterfaces->mediaPlayer;
+    auto commsSpeaker = commsMediaInterfaces->speaker;
+#endif
+
+    auto alertsMediaInterfaces = createApplicationMediaPlayer(httpContentFetcherFactory, false, "AlertsMediaPlayer");
+    if (!alertsMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for alerts!"));
+        return false;
+    }
+    m_alertsMediaPlayer = alertsMediaInterfaces->mediaPlayer;
+
+    auto systemSoundMediaInterfaces =
+        createApplicationMediaPlayer(httpContentFetcherFactory, false, "SystemSoundMediaPlayer");
+    if (!systemSoundMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for system sound player!"));
+        return false;
+    }
+    m_systemSoundMediaPlayer = systemSoundMediaInterfaces->mediaPlayer;
+
+#ifdef ENABLE_PCC
+    auto phoneMediaInterfaces = createApplicationMediaPlayer(httpContentFetcherFactory, false, "PhoneMediaPlayer");
+    if (!phoneMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for phone!"));
+        return false;
+    }
+    auto phoneSpeaker = phoneMediaInterfaces->speaker;
+#endif
+
+#ifdef ENABLE_MCC
+    auto meetingMediaInterfaces = createApplicationMediaPlayer(httpContentFetcherFactory, false, "MeetingMediaPlayer");
+    if (!meetingMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for meeting client!"));
+        return false;
+    }
+    auto meetingSpeaker = meetingMediaInterfaces->speaker;
+#endif
+
+    if (!createMediaPlayersForAdapters(httpContentFetcherFactory, equalizerRuntimeSetup)) {
+        ACSDK_CRITICAL(LX("Could not create mediaPlayers for adapters"));
+        return false;
+    }
+
+    auto audioFactory = std::make_shared<alexaClientSDK::applicationUtilities::resources::audio::AudioFactory>();
+
+    // Creating the alert storage object to be used for rendering and storing alerts.
+    auto alertStorage = alexaClientSDK::acsdkAlerts::storage::SQLiteAlertStorage::create(
+        config, audioFactory->alerts(), metricRecorder);
+
+    // Creating the message storage object to be used for storing message to be sent later.
+    auto messageStorage = alexaClientSDK::certifiedSender::SQLiteMessageStorage::create(config);
+
+    /*
+     * Creating notifications storage object to be used for storing notification indicators.
+     */
+    auto notificationsStorage = alexaClientSDK::acsdkNotifications::SQLiteNotificationsStorage::create(config);
+
+    /*
+     * Creating new device settings storage object to be used for storing AVS Settings.
+     */
+    auto deviceSettingsStorage = alexaClientSDK::settings::storage::SQLiteDeviceSettingStorage::create(config);
+
+    /*
+     * Creating bluetooth storage object to be used for storing uuid to mac mappings for devices.
+     */
+    auto bluetoothStorage = alexaClientSDK::acsdkBluetooth::SQLiteBluetoothStorage::create(config);
+
+    /*
+     * Creating the InternetConnectionMonitor that will notify observers of internet connection status changes.
+     */
+    std::shared_ptr<avsCommon::utils::network::InternetConnectionMonitor> internetConnectionMonitor =
+        avsCommon::utils::network::InternetConnectionMonitor::create(httpContentFetcherFactory);
+    if (!internetConnectionMonitor) {
+        ACSDK_CRITICAL(LX("Failed to create InternetConnectionMonitor"));
+        return false;
+    }
+
+    /*
+     * Creating the UI component that observes various components and prints to the console accordingly.
+     */
+    auto userInterfaceManager = manufactory->get<std::shared_ptr<UIManager>>();
+    if (!userInterfaceManager) {
+        ACSDK_CRITICAL(LX("Failed to get UIManager!"));
+        return false;
+    }
+
+    /*
+     * Create the presentation layer for the captions.
+     */
+    auto captionPresenter = std::make_shared<alexaClientSDK::sampleApp::CaptionPresenter>();
+
+#ifdef ENABLE_PCC
+    auto phoneCaller = std::make_shared<phoneCallControllerAdapter::PhoneCaller>();
+#endif
+
+#ifdef ENABLE_MCC
+    auto meetingClient = std::make_shared<meetingClientControllerAdapter::MeetingClient>();
+    auto calendarClient = std::make_shared<meetingClientControllerAdapter::CalendarClient>();
+#endif
+
+    /*
+     * Creating the deviceInfo object
+     */
+    auto deviceInfo = manufactory->get<std::shared_ptr<avsCommon::utils::DeviceInfo>>();
+    if (!deviceInfo) {
+        ACSDK_CRITICAL(LX("Creation of DeviceInfo failed!"));
+        return false;
+    }
+
+    /*
+     * Supply a SALT for UUID generation, this should be as unique to each individual device as possible
+     */
+    alexaClientSDK::avsCommon::utils::uuidGeneration::setSalt(
+        deviceInfo->getClientId() + deviceInfo->getDeviceSerialNumber());
+
+    /*
+     * Creating the CapabilitiesDelegate - This component provides the client with the ability to send messages to the
+     * Capabilities API.
+     */
+    auto capabilitiesDelegateStorage =
+        alexaClientSDK::capabilitiesDelegate::storage::SQLiteCapabilitiesDelegateStorage::create(config);
+
+    m_capabilitiesDelegate = alexaClientSDK::capabilitiesDelegate::CapabilitiesDelegate::create(
+        authDelegate, std::move(capabilitiesDelegateStorage), customerDataManager, metricRecorder);
+
+    if (!m_capabilitiesDelegate) {
+        ConsolePrinter::simplePrint("Creation of CapabilitiesDelegate failed!");
+        return false;
+    }
+
+    m_shutdownRequiredList.push_back(m_capabilitiesDelegate);
+    authDelegate->addAuthObserver(userInterfaceManager);
+    m_capabilitiesDelegate->addCapabilitiesObserver(userInterfaceManager);
+
+    // INVALID_FIRMWARE_VERSION is passed to @c getInt() as a default in case FIRMWARE_VERSION_KEY is not found.
+    int firmwareVersion = static_cast<int>(avsCommon::sdkInterfaces::softwareInfo::INVALID_FIRMWARE_VERSION);
+    sampleAppConfig.getInt(FIRMWARE_VERSION_KEY, &firmwareVersion, firmwareVersion);
+
+    /*
+     * Check to see if displayCards is supported on the device. The default is supported unless specified otherwise in
+     * the configuration.
+     */
+    bool displayCardsSupported;
+    config[SAMPLE_APP_CONFIG_KEY].getBool(DISPLAY_CARD_KEY, &displayCardsSupported, true);
+
+    /*
+     * Creating the Context Manager - This component manages the context of each of the components to update to AVS.
+     * It is required for each of the capability agents so that they may provide their state just before any event is
+     * fired off.
+     */
+    auto contextManager = manufactory->get<std::shared_ptr<ContextManagerInterface>>();
+    if (!contextManager) {
+        ACSDK_CRITICAL(LX("Creation of ContextManager failed."));
+        return false;
+    }
+
+    auto avsGatewayManagerStorage = avsGatewayManager::storage::AVSGatewayManagerStorage::create(miscStorage);
+    if (!avsGatewayManagerStorage) {
+        ACSDK_CRITICAL(LX("Creation of AVSGatewayManagerStorage failed"));
+        return false;
+    }
+    auto avsGatewayManager = avsGatewayManager::AVSGatewayManager::create(
+        std::move(avsGatewayManagerStorage), customerDataManager, config, authDelegate, metricRecorder);
+    if (!avsGatewayManager) {
+        ACSDK_CRITICAL(LX("Creation of AVSGatewayManager failed"));
+        return false;
+    }
+
+    auto synchronizeStateSenderFactory = synchronizeStateSender::SynchronizeStateSenderFactory::create(contextManager);
+    if (!synchronizeStateSenderFactory) {
+        ACSDK_CRITICAL(LX("Creation of SynchronizeStateSenderFactory failed"));
+        return false;
+    }
+
+    std::vector<std::shared_ptr<avsCommon::sdkInterfaces::PostConnectOperationProviderInterface>> providers;
+    providers.push_back(synchronizeStateSenderFactory);
+    providers.push_back(avsGatewayManager);
+    providers.push_back(m_capabilitiesDelegate);
+
+    /*
+     * Create a factory for creating objects that handle tasks that need to be performed right after establishing
+     * a connection to AVS.
+     */
+    auto postConnectSequencerFactory = acl::PostConnectSequencerFactory::create(providers);
+
+    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::ProtocolTracerInterface> deviceProtocolTracer;
+    if (diagnostics) {
+        /*
+         * Create the deviceProtocolTracer to trace events and directives.
+         */
+        deviceProtocolTracer = diagnostics->getProtocolTracer();
+
+        if (deviceProtocolTracer) {
+            const std::string DIAGNOSTICS_KEY = "diagnostics";
+            const std::string MAX_TRACED_MESSAGES_KEY = "maxTracedMessages";
+            const std::string TRACE_FROM_STARTUP = "protocolTraceFromStartup";
+
+            int configMaxValue = -1;
+            bool configProtocolTraceEnabled = false;
+
+            if (alexaClientSDK::avsCommon::utils::configuration::ConfigurationNode::getRoot()[DIAGNOSTICS_KEY].getInt(
+                    MAX_TRACED_MESSAGES_KEY, &configMaxValue)) {
+                if (configMaxValue < 0) {
+                    ACSDK_WARN(LX("ignoringMaxTracedMessages")
+                                   .d("reason", "negativeValue")
+                                   .d("maxTracedMessages", configMaxValue));
+                } else {
+                    deviceProtocolTracer->setMaxMessages(static_cast<unsigned int>(configMaxValue));
+                }
+            }
+
+            if (alexaClientSDK::avsCommon::utils::configuration::ConfigurationNode::getRoot()[DIAGNOSTICS_KEY].getBool(
+                    TRACE_FROM_STARTUP, &configProtocolTraceEnabled)) {
+                if (configProtocolTraceEnabled) {
+                    deviceProtocolTracer->setProtocolTraceFlag(configProtocolTraceEnabled);
+                    ACSDK_DEBUG9(LX("Protocol Trace has been enabled at startup"));
+                }
+            }
+        }
+    }
+
+    /*
+     * Create a factory to create objects that establish a connection with AVS.
+     */
+    auto transportFactory = std::make_shared<acl::HTTP2TransportFactory>(
+        std::make_shared<avsCommon::utils::libcurlUtils::LibcurlHTTP2ConnectionFactory>(),
+        postConnectSequencerFactory,
+        metricRecorder,
+        deviceProtocolTracer);
+
+    /*
+     * Create the BluetoothDeviceManager to communicate with the Bluetooth stack.
+     */
+    std::unique_ptr<avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceManagerInterface> bluetoothDeviceManager;
+
+    /*
+     * Create the connectionRules to communicate with the Bluetooth stack.
+     */
+    std::unordered_set<
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceConnectionRuleInterface>>
+        enabledConnectionRules;
+    enabledConnectionRules.insert(alexaClientSDK::acsdkBluetooth::BasicDeviceConnectionRule::create());
+
+#ifdef BLUETOOTH_BLUEZ
+    auto eventBus = std::make_shared<avsCommon::utils::bluetooth::BluetoothEventBus>();
+
+#ifdef BLUETOOTH_BLUEZ_PULSEAUDIO_OVERRIDE_ENDPOINTS
+    /*
+     * Create PulseAudio initializer object. Subscribe to BLUETOOTH_DEVICE_MANAGER_INITIALIZED event before we create
+     * the BT Device Manager, otherwise may miss it.
+     */
+    m_pulseAudioInitializer = bluetoothImplementations::blueZ::PulseAudioBluetoothInitializer::create(eventBus);
+#endif
+
+    bluetoothDeviceManager = bluetoothImplementations::blueZ::BlueZBluetoothDeviceManager::create(eventBus);
+#endif
+
+    /*
+     * Creating the buffer (Shared Data Stream) that will hold user audio data. This is the main input into the SDK.
+     */
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::AudioFormat> compatibleAudioFormat =
+        alexaClientSDK::acsdkAudioInputStream::CompatibleAudioFormat::getCompatibleAudioFormat();
+
+    std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream> sharedDataStream =
+        alexaClientSDK::acsdkAudioInputStream::AudioInputStreamFactory::createAudioInputStream(
+            compatibleAudioFormat, WORD_SIZE, MAX_READERS, AMOUNT_OF_AUDIO_DATA_IN_BUFFER);
+
+    if (!sharedDataStream) {
+        ACSDK_CRITICAL(LX("Failed to create shared data stream!"));
+        return false;
+    }
+
+    std::shared_ptr<LocaleAssetsManager> localeAssetsManager;
+#ifdef KWD
+    std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> keywordDetector =
+        alexaClientSDK::kwd::KeywordDetectorProvider::create(
+            sharedDataStream,
+            *compatibleAudioFormat,
+            std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::KeyWordObserverInterface>>(),
+            std::unordered_set<
+                std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::KeyWordDetectorStateObserverInterface>>());
+    if (!keywordDetector) {
+        ACSDK_CRITICAL(LX("Failed to create keyword detector!"));
+        return false;
+    }
+#ifdef ASSET_MANAGER
+    using namespace acsdkAssets::commonInterfaces;
+    using namespace acsdkAssets::davs;
+    using namespace acsdkAssets::manager;
+
+    auto davsSettingsConfig = config[CONFIG_KEY_DEVICE_SETTINGS][CONFIG_KEY_DAVS_KEY];
+
+    std::string artifactDirectory;
+    std::string segmentID;
+    uint32_t maxArtifactDirSizeInMB = 0;
+    uint32_t pollingIntervalInSeconds = 0;
+    if (davsSettingsConfig) {
+        davsSettingsConfig.getString(CONFIG_KEY_ARTIFACT_DIRECTORY, &artifactDirectory);
+        davsSettingsConfig.getString(CONFIG_KEY_SEGMENT_ID, &segmentID);
+        davsSettingsConfig.getUint32(
+            CONFIG_KEY_ARTIFACT_BUDGET_SIZE_IN_MB, &maxArtifactDirSizeInMB, ARTIFACT_BUDGET_SIZE_IN_MB_DEFAULT);
+        davsSettingsConfig.getUint32(
+            CONFIG_KEY_POLLING_INTERVAL_IN_SECONDS, &pollingIntervalInSeconds, POLLING_INTERVAL_IN_SECONDS_DEFAULT);
+    }
+
+    // Creating Davs Endpoint V3 Handler
+    std::shared_ptr<DavsEndpointHandlerV3> davsEndpointHandlerV3 = DavsEndpointHandlerV3::create(segmentID);
+    if (!davsEndpointHandlerV3) {
+        ACSDK_CRITICAL(LX("Failed to create DavsEndpointHandlerV3!"));
+        return false;
+    }
+
+    std::string artifactTempDirectory(artifactDirectory.append("_tmp"));
+
+    // Creating the Davs Client
+    std::shared_ptr<DavsClient> davsClient = DavsClient::create(
+        artifactTempDirectory.c_str(),
+        authDelegate,
+        internetConnectionMonitor,
+        davsEndpointHandlerV3,
+        metricRecorder,
+        std::chrono::seconds(pollingIntervalInSeconds));
+
+    if (!davsClient) {
+        ACSDK_CRITICAL(LX("Failed to create DavsClient!"));
+        return false;
+    }
+
+    // Creating Amd Communication Handler
+    std::shared_ptr<AmdCommunicationInterface> amdCommunicationHandler = InMemoryAmdCommunicationHandler::create();
+
+    if (!amdCommunicationHandler) {
+        ACSDK_CRITICAL(LX("Failed to create InMemoryAmdCommunicationHandler!"));
+        return false;
+    }
+
+    // Creating urlAllowListWrapper Handler used to define which urls are allowed
+    bool allowAllUrls = true;
+    std::shared_ptr<UrlAllowListWrapper> urlAllowListWrapper = UrlAllowListWrapper::create({}, allowAllUrls);
+
+    if (!urlAllowListWrapper) {
+        ACSDK_CRITICAL(LX("Failed to create UrlAllowListWrapper!"));
+        return false;
+    }
+
+    std::shared_ptr<AssetManager> assetManager = AssetManager::create(
+        amdCommunicationHandler, davsClient, artifactDirectory.c_str(), authDelegate, urlAllowListWrapper);
+
+    if (!assetManager) {
+        ACSDK_CRITICAL(LX("Failed to create AssetManager!"));
+        return false;
+    }
+    assetManager.get()->setBudget(maxArtifactDirSizeInMB);
+    /*
+     * Create sample locale asset manager with KWD and DAVS Asset Manager support.
+     */
+    localeAssetsManager = LocaleAssetsManager::createLocaleAssetsManagerWithKwdAndDavs(
+        configPtr, sharedDataStream, compatibleAudioFormat, keywordDetector, assetManager);
+#else
+    /**
+     * Create sample locale asset manager with KWD support.
+     */
+    localeAssetsManager = LocaleAssetsManager::createLocaleAssetsManagerWithKwd(
+        configPtr, sharedDataStream, compatibleAudioFormat, keywordDetector);
+#endif
+#else
+    /*
+     * Create sample locale asset manager.
+     */
+    localeAssetsManager = LocaleAssetsManager::createLocaleAssetsManager(configPtr);
+#endif
+
+    if (!localeAssetsManager) {
+        ACSDK_CRITICAL(LX("Failed to create Locale Assets Manager!"));
+        return false;
+    }
+
+    /*
+     * Creating each of the audio providers. An audio provider is a simple package of data consisting of the stream
+     * of audio data, as well as metadata about the stream. For each of the three audio providers created here, the same
+     * stream is used since this sample application will only have one microphone.
+     */
+
+    // Creating tap to talk audio provider
+    alexaClientSDK::capabilityAgents::aip::AudioProvider tapToTalkAudioProvider =
+        alexaClientSDK::capabilityAgents::aip::AudioProvider::AudioProvider::TapAudioProvider(
+            sharedDataStream, *compatibleAudioFormat);
+
+    // Creating hold to talk audio provider
+    alexaClientSDK::capabilityAgents::aip::AudioProvider holdToTalkAudioProvider =
+        alexaClientSDK::capabilityAgents::aip::AudioProvider::AudioProvider::HoldAudioProvider(
+            sharedDataStream, *compatibleAudioFormat);
+
+    /*
+     * Creating the cryptoFactory - This component provides the encryption facilities
+     */
+    auto cryptoFactory = manufactory->get<std::shared_ptr<CryptoFactoryInterface>>();
+
+    /*
+     * Creating the DefaultClient - this component serves as an out-of-box default object that instantiates and "glues"
+     * together all the modules.
+     */
+    m_client = alexaClientSDK::defaultClient::DefaultClient::create(
+        deviceInfo,
+        customerDataManager,
+        m_externalMusicProviderMediaPlayersMap,
+        m_externalMusicProviderSpeakersMap,
+        m_adapterToCreateFuncMap,
+        m_speakMediaPlayer,
+        std::move(audioMediaPlayerFactory),
+        m_alertsMediaPlayer,
+        m_notificationsMediaPlayer,
+        m_bluetoothMediaPlayer,
+        m_ringtoneMediaPlayer,
+        m_systemSoundMediaPlayer,
+        speakerMediaInterfaces->speaker,
+        audioSpeakers,
+        alertsMediaInterfaces->speaker,
+        notificationMediaInterfaces->speaker,
+        bluetoothMediaInterfaces->speaker,
+        ringtoneMediaInterfaces->speaker,
+        systemSoundMediaInterfaces->speaker,
+        {},
+#ifdef ENABLE_PCC
+        phoneSpeaker,
+        phoneCaller,
+#endif
+#ifdef ENABLE_MCC
+        meetingSpeaker,
+        meetingClient,
+        calendarClient,
+#endif
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+        m_commsMediaPlayer,
+        commsSpeaker,
+        sharedDataStream,
+#endif
+        equalizerRuntimeSetup,
+        audioFactory,
+        authDelegate,
+        std::move(alertStorage),
+        std::move(messageStorage),
+        std::move(notificationsStorage),
+        std::move(deviceSettingsStorage),
+        std::move(bluetoothStorage),
+        miscStorage,
+        {userInterfaceManager},
+        {userInterfaceManager},
+        std::move(internetConnectionMonitor),
+        displayCardsSupported,
+        m_capabilitiesDelegate,
+        contextManager,
+        transportFactory,
+        avsGatewayManager,
+        localeAssetsManager,
+        enabledConnectionRules,
+        /* systemTimezone*/ nullptr,
+        firmwareVersion,
+        true,
+        nullptr,
+        std::move(bluetoothDeviceManager),
+        metricRecorder,
+#ifdef ENABLE_LPM
+        powerResourceManager,
+#else
+        nullptr,
+#endif
+        diagnostics,
+        std::make_shared<alexaClientSDK::sampleApp::ExternalCapabilitiesBuilder>(deviceInfo),
+        alexaClientSDK::speakerManager::createChannelVolumeFactory(),
+        true,
+        std::make_shared<alexaClientSDK::acl::MessageRouterFactory>(),
+        nullptr,
+        tapToTalkAudioProvider,
+        cryptoFactory);
+    if (!m_client) {
+        ACSDK_CRITICAL(LX("Failed to create default SDK client!"));
+        return false;
+    }
+
+    m_client->addSpeakerManagerObserver(userInterfaceManager);
+
+    m_client->addNotificationsObserver(userInterfaceManager);
+
+    m_client->addBluetoothDeviceObserver(userInterfaceManager);
+
+    m_shutdownManager = m_client->getShutdownManager();
+    if (!m_shutdownManager) {
+        ACSDK_CRITICAL(LX("Failed to get ShutdownManager!"));
+        return false;
+    }
+
+#ifdef ENABLE_CAPTIONS
+    std::vector<std::shared_ptr<MediaPlayerInterface>> captionableMediaSources = m_audioMediaPlayerPool;
+    captionableMediaSources.emplace_back(m_speakMediaPlayer);
+    m_client->addCaptionPresenter(captionPresenter);
+    m_client->setCaptionMediaPlayers(captionableMediaSources);
+#endif
+
+    userInterfaceManager->configureSettingsNotifications(m_client->getSettingsManager());
+
+    /*
+     * Add GUI Renderer as an observer if display cards are supported.
+     */
+    if (displayCardsSupported) {
+        m_guiRenderer = std::make_shared<GuiRenderer>();
+        m_client->addTemplateRuntimeObserver(m_guiRenderer);
+    }
+
+#ifdef PORTAUDIO
+    std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> micWrapper =
+        sample::microphone::createPortAudioMicrophoneInterface(sharedDataStream);
+#elif defined(ANDROID_MICROPHONE)
+    std::shared_ptr<applicationUtilities::androidUtilities::AndroidSLESMicrophone> micWrapper =
+        m_openSlEngine->createAndroidMicrophone(sharedDataStream);
+#elif AUDIO_INJECTION
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::diagnostics::AudioInjectorInterface> audioInjector;
+    if (diagnostics) {
+        audioInjector = diagnostics->getAudioInjector();
+    }
+
+    if (!audioInjector) {
+        ACSDK_CRITICAL(LX("No audio injector provided!"));
+        return false;
+    }
+    std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> micWrapper =
+        audioInjector->getMicrophone(sharedDataStream, *compatibleAudioFormat);
+#else
+    std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> micWrapper;
+    ACSDK_CRITICAL(LX("No microphone module provided!"));
+    return false;
+#endif
+    if (!micWrapper) {
+        ACSDK_CRITICAL(LX("Failed to create microphone wrapper!"));
+        return false;
+    }
+
+#ifdef ENABLE_ENDPOINT_CONTROLLERS
+    // Default Endpoint
+    if (!addControllersToDefaultEndpoint(m_client->getDefaultEndpointBuilder())) {
+        ACSDK_CRITICAL(LX("Failed to add controllers to default endpoint!"));
+        return false;
+    }
+
+    // Peripheral Endpoint
+    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> peripheralEndpointBuilder =
+        m_client->createEndpointBuilder();
+    if (!peripheralEndpointBuilder) {
+        ACSDK_CRITICAL(LX("Failed to create peripheral endpoint Builder!"));
+        return false;
+    }
+
+    peripheralEndpointBuilder->withDerivedEndpointId(PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID)
+        .withDescription(PERIPHERAL_ENDPOINT_DESCRIPTION)
+        .withFriendlyName(PERIPHERAL_ENDPOINT_FRIENDLYNAME)
+        .withManufacturerName(PERIPHERAL_ENDPOINT_MANUFACTURER_NAME)
+        .withAdditionalAttributes(
+            PERIPHERAL_ENDPOINT_MANUFACTURER_NAME,
+            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_MODEL,
+            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_SERIAL_NUMBER,
+            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_FIRMWARE_VERSION,
+            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_SOFTWARE_VERSION,
+            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_CUSTOM_IDENTIFIER)
+        .withDisplayCategory(PERIPHERAL_ENDPOINT_DISPLAYCATEGORY);
+
+    if (!addControllersToPeripheralEndpoint(peripheralEndpointBuilder, diagnostics)) {
+        ACSDK_CRITICAL(LX("Failed to add controllers to peripheral endpoint!"));
+        return false;
+    }
+
+    auto peripheralEndpoint = peripheralEndpointBuilder->build();
+    if (!peripheralEndpoint) {
+        ACSDK_CRITICAL(LX("Failed to create Peripheral Endpoint!"));
+        return false;
+    }
+
+    m_client->registerEndpoint(std::move(peripheralEndpoint));
+#endif
+
+// Creating wake word audio provider, if necessary
+#ifdef KWD
+    alexaClientSDK::capabilityAgents::aip::AudioProvider wakeWordAudioProvider =
+        alexaClientSDK::capabilityAgents::aip::AudioProvider::WakeAudioProvider(
+            sharedDataStream, *compatibleAudioFormat);
+    // // This observer is notified any time a keyword is detected and notifies the DefaultClient to start recognizing.
+    auto keywordObserver = KeywordObserver::create(m_client, wakeWordAudioProvider, keywordDetector);
+    // Set the default client for localeAssetsManager, which will be used to create new keywordObserver when a new
+    // keyword detector is created.
+    localeAssetsManager->setDefaultClient(m_client);
+
+    // If wake word is enabled, then creating the interaction manager with a wake word audio provider.
+    m_interactionManager = std::make_shared<alexaClientSDK::sampleApp::InteractionManager>(
+        m_client,
+        micWrapper,
+        userInterfaceManager,
+#ifdef ENABLE_PCC
+        phoneCaller,
+#endif
+#ifdef ENABLE_MCC
+        meetingClient,
+        calendarClient,
+#endif
+        holdToTalkAudioProvider,
+        tapToTalkAudioProvider,
+        wakeWordAudioProvider
+#ifdef POWER_CONTROLLER
+        ,
+        m_peripheralEndpointPowerHandler
+#endif
+#ifdef TOGGLE_CONTROLLER
+        ,
+        m_peripheralEndpointToggleHandler
+#endif
+#ifdef RANGE_CONTROLLER
+        ,
+        m_peripheralEndpointRangeHandler
+#endif
+#ifdef MODE_CONTROLLER
+        ,
+        m_peripheralEndpointModeHandler
+#endif
+        ,
+        nullptr,
+        diagnostics);
+#else
+    // clang-format off
+    // If wake word is not enabled, then creating the interaction manager without a wake word audio provider.
+    m_interactionManager = std::make_shared<InteractionManager>(
+        m_client,
+        micWrapper,
+        userInterfaceManager,
+#ifdef ENABLE_PCC
+        phoneCaller,
+#endif
+#ifdef ENABLE_MCC
+        meetingClient,
+        calendarClient,
+#endif
+        holdToTalkAudioProvider,
+        tapToTalkAudioProvider,
+        capabilityAgents::aip::AudioProvider::null()
+#ifdef POWER_CONTROLLER
+        ,
+        m_peripheralEndpointPowerHandler
+#endif
+#ifdef TOGGLE_CONTROLLER
+        ,
+        m_peripheralEndpointToggleHandler
+#endif
+#ifdef RANGE_CONTROLLER
+        ,
+        m_peripheralEndpointRangeHandler
+#endif
+#ifdef MODE_CONTROLLER
+        ,
+        m_peripheralEndpointModeHandler
+#endif
+        ,
+        nullptr,
+        diagnostics);
+// clang-format on
+#endif
+
+    m_shutdownRequiredList.push_back(m_interactionManager);
+    m_client->addAlexaDialogStateObserver(m_interactionManager);
+#ifdef ENABLE_COMMS
+    m_client->addCallStateObserver(m_interactionManager);
+#endif
+
+#ifdef ENABLE_REVOKE_AUTH
+    // Creating the revoke authorization observer.
+    auto revokeObserver =
+        std::make_shared<alexaClientSDK::sampleApp::RevokeAuthorizationObserver>(m_client->getRegistrationManager());
+    m_client->addRevokeAuthorizationObserver(revokeObserver);
+#endif
+
+    // Creating the input observer.
+    m_userInputManager = alexaClientSDK::sampleApp::UserInputManager::create(
+        m_interactionManager, m_guiRenderer, consoleReader, localeAssetsManager, deviceInfo->getDefaultEndpointId());
+    if (!m_userInputManager) {
+        ACSDK_CRITICAL(LX("Failed to create UserInputManager!"));
+        return false;
+    }
+
+    authDelegate->addAuthObserver(m_userInputManager);
+    m_client->addRegistrationObserver(m_userInputManager);
+    m_capabilitiesDelegate->addCapabilitiesObserver(m_userInputManager);
+
+    m_authManager->setRegistrationManager(m_client->getRegistrationManager());
+
+    auto httpPost = avsCommon::utils::libcurlUtils::HttpPost::createHttpPostInterface();
+    auto keyStore = manufactory->get<std::shared_ptr<KeyStoreInterface>>();
+
+    m_lwaAdapter = acsdkAuthorization::lwa::LWAAuthorizationAdapter::create(
+        configPtr,
+        std::move(httpPost),
+        deviceInfo,
+        acsdkAuthorization::lwa::LWAAuthorizationStorage::createLWAAuthorizationStorageInterface(
+            configPtr, "", cryptoFactory, keyStore));
+
+    if (!m_lwaAdapter) {
+        ACSDK_CRITICAL(LX("Failed to create LWA Adapter!"));
+        return false;
+    }
+
+    m_authManager->add(m_lwaAdapter);
+
+    auto cblRequest = acsdkSampleApplicationCBLAuthRequester::SampleApplicationCBLAuthRequester::
+        createCBLAuthorizationObserverInterface(userInterfaceManager);
+
+    m_lwaAdapter->authorizeUsingCBL(cblRequest);
+
+    m_client->connect();
+
+    return true;
+}
+
+std::shared_ptr<ApplicationMediaInterfaces> SampleApplication::createApplicationMediaPlayer(
+    const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
+        httpContentFetcherFactory,
+    bool enableEqualizer,
+    const std::string& name,
+    bool enableLiveMode) {
+#ifdef GSTREAMER_MEDIA_PLAYER
+    /*
+     * For the SDK, the MediaPlayer happens to also provide volume control functionality.
+     * Note the externalMusicProviderMediaPlayer is not added to the set of SpeakerInterfaces as there would be
+     * more actions needed for these beyond setting the volume control on the MediaPlayer.
+     */
+    auto mediaPlayer = alexaClientSDK::mediaPlayer::MediaPlayer::create(
+        httpContentFetcherFactory, enableEqualizer, name, enableLiveMode);
+    if (!mediaPlayer) {
+        return nullptr;
+    }
+    auto speaker = std::static_pointer_cast<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface>(mediaPlayer);
+    auto equalizer = std::static_pointer_cast<acsdkEqualizerInterfaces::EqualizerInterface>(mediaPlayer);
+    auto requiresShutdown = std::static_pointer_cast<alexaClientSDK::avsCommon::utils::RequiresShutdown>(mediaPlayer);
+    auto applicationMediaInterfaces =
+        std::make_shared<ApplicationMediaInterfaces>(mediaPlayer, speaker, equalizer, requiresShutdown);
+#elif defined(ANDROID_MEDIA_PLAYER)
+    // TODO - Add support of live mode to AndroidSLESMediaPlayer (ACSDK-2530).
+    std::shared_ptr<mediaPlayer::android::AndroidSLESMediaPlayer> mediaPlayer =
+        mediaPlayer::android::AndroidSLESMediaPlayer::create(
+            httpContentFetcherFactory,
+            m_openSlEngine,
+            enableEqualizer,
+            mediaPlayer::android::PlaybackConfiguration(),
+            name);
+    if (!mediaPlayer) {
+        return nullptr;
+    }
+    auto speaker = mediaPlayer->getSpeaker();
+    auto equalizer = std::static_pointer_cast<acsdkEqualizerInterfaces::EqualizerInterface>(mediaPlayer);
+    auto requiresShutdown = std::static_pointer_cast<alexaClientSDK::avsCommon::utils::RequiresShutdown>(mediaPlayer);
+    auto applicationMediaInterfaces =
+        std::make_shared<ApplicationMediaInterfaces>(mediaPlayer, speaker, equalizer, requiresShutdown);
+#elif defined(CUSTOM_MEDIA_PLAYER)
+    // Custom media players must implement the createCustomMediaPlayer function
+    auto applicationMediaInterfaces =
+        createCustomMediaPlayer(httpContentFetcherFactory, enableEqualizer, name, enableLiveMode);
+    if (!applicationMediaInterfaces) {
+        return nullptr;
+    }
+#else
+    std::shared_ptr<ApplicationMediaInterfaces> applicationMediaInterfaces;
+#endif
+
+    if (applicationMediaInterfaces && applicationMediaInterfaces->requiresShutdown) {
+        m_shutdownRequiredList.push_back(applicationMediaInterfaces->requiresShutdown);
+    }
+    return applicationMediaInterfaces;
+}
+
+#ifdef ENABLE_ENDPOINT_CONTROLLERS
+bool SampleApplication::addControllersToDefaultEndpoint(
+    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> defaultEndpointBuilder) {
+    if (!defaultEndpointBuilder) {
+        ACSDK_CRITICAL(LX("addControllersToDefaultEndpointFailed").m("invalidDefaultEndpointBuilder"));
+        return false;
+    }
+
+#ifdef TOGGLE_CONTROLLER
+    auto toggleHandler =
+        DefaultEndpointToggleControllerHandler::create(DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME);
+    if (!toggleHandler) {
+        ACSDK_CRITICAL(LX("Failed to create default endpoint toggle controller handler!"));
+        return false;
+    }
+
+    auto toggleControllerAttributes = buildToggleControllerAttributes(
+        {{{FriendlyName::Type::TEXT, DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_FRIENDLY_NAME}}});
+    if (!toggleControllerAttributes.hasValue()) {
+        ACSDK_CRITICAL(LX("Failed to create default endpoint toggle controller attributes!"));
+        return false;
+    }
+
+    defaultEndpointBuilder->withToggleController(
+        toggleHandler,
+        DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME,
+        toggleControllerAttributes.value(),
+        true,
+        true,
+        false);
+#endif
+
+#ifdef RANGE_CONTROLLER
+    auto rangeHandler = DefaultEndpointRangeControllerHandler::create(DEFAULT_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME);
+    if (!rangeHandler) {
+        ACSDK_CRITICAL(LX("Failed to create default endpoint range controller handler!"));
+        return false;
+    }
+
+    auto rangeControllerAttributes = buildRangeControllerAttributes(
+        {{{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_SETTING_FANSPEED}}},
+        {{DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH,
+          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MAXIMUM},
+           {FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_HIGH}}},
+         {DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_MEDIUM,
+          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MEDIUM}}},
+         {DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW,
+          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MINIMUM},
+           {FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_LOW}}}});
+
+    if (!rangeControllerAttributes.hasValue()) {
+        ACSDK_CRITICAL(LX("Failed to create default endpoint range controller attributes!"));
+        return false;
+    }
+
+    defaultEndpointBuilder->withRangeController(
+        rangeHandler,
+        DEFAULT_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME,
+        rangeControllerAttributes.value(),
+        true,
+        true,
+        false);
+#endif
+
+#ifdef MODE_CONTROLLER
+    auto modeHandler = DefaultEndpointModeControllerHandler::create(DEFAULT_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME);
+    if (!modeHandler) {
+        ACSDK_CRITICAL(LX("Failed to create default endpoint mode controller handler!"));
+        return false;
+    }
+
+    auto modeControllerAttributes = buildModeControllerAttributes(
+        {{{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_SETTING_MODE}}},
+        {{DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_FAN_ONLY,
+          {{FriendlyName::Type::TEXT,
+            DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_FAN_ONLY_FRIENDLY_NAME}}},
+         {DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_HEAT,
+          {{FriendlyName::Type::TEXT, DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_HEAT_FRIENDLY_NAME}}},
+         {DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_COOL,
+          {{FriendlyName::Type::TEXT,
+            DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_COOL_FRIENDLY_NAME}}}});
+
+    if (!modeControllerAttributes.hasValue()) {
+        ACSDK_CRITICAL(LX("Failed to create default endpoint mode controller attributes!"));
+        return false;
+    }
+
+    defaultEndpointBuilder->withModeController(
+        modeHandler,
+        DEFAULT_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME,
+        modeControllerAttributes.value(),
+        true,
+        true,
+        false);
+#endif
+
+#ifdef INPUT_CONTROLLER
+    auto inputControllerEndpointCapabilitiesBuilder = std::make_shared<InputControllerEndpointCapabilitiesBuilder>();
+    if (!inputControllerEndpointCapabilitiesBuilder) {
+        ACSDK_CRITICAL(
+            LX("addCapabilitiesBuilderToDefaultEndpointFailed").m("invalidInputControllerEndpointCapabilitiesBuilder"));
+        return false;
+    }
+    defaultEndpointBuilder->withEndpointCapabilitiesBuilder(inputControllerEndpointCapabilitiesBuilder);
+#endif
+
+    return true;
+}
+
+bool SampleApplication::addControllersToPeripheralEndpoint(
+    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> peripheralEndpointBuilder,
+    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics) {
+    if (!peripheralEndpointBuilder) {
+        ACSDK_CRITICAL(LX("addControllersToPeripheralEndpointFailed").m("invalidPeripheralEndpointBuilder"));
+        return false;
+    }
+
+#ifdef POWER_CONTROLLER
+    m_peripheralEndpointPowerHandler =
+        PeripheralEndpointPowerControllerHandler::create(PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID);
+    if (!m_peripheralEndpointPowerHandler) {
+        ACSDK_CRITICAL(LX("Failed to create power controller handler!"));
+        return false;
+    }
+    peripheralEndpointBuilder->withPowerController(m_peripheralEndpointPowerHandler, true, true);
+
+    if (diagnostics) {
+        auto deviceProperties = diagnostics->getDevicePropertyAggregator();
+        if (deviceProperties) {
+            m_peripheralEndpointPowerHandler->addObserver(deviceProperties);
+        }
+    }
+#endif
+
+#ifdef TOGGLE_CONTROLLER
+    m_peripheralEndpointToggleHandler = PeripheralEndpointToggleControllerHandler::create(
+        PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID, PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME);
+    if (!m_peripheralEndpointToggleHandler) {
+        ACSDK_CRITICAL(LX("Failed to create toggle controller handler!"));
+        return false;
+    }
+
+    auto peripheralEndpointToggleControllerAttributes = buildToggleControllerAttributes(
+        {{{FriendlyName::Type::TEXT, PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_FRIENDLY_NAME}}});
+    if (!peripheralEndpointToggleControllerAttributes.hasValue()) {
+        ACSDK_CRITICAL(LX("Failed to create peripheral endpoint toggle controller attributes!"));
+        return false;
+    }
+
+    peripheralEndpointBuilder->withToggleController(
+        m_peripheralEndpointToggleHandler,
+        PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME,
+        peripheralEndpointToggleControllerAttributes.value(),
+        true,
+        true,
+        false);
+#endif
+
+#ifdef RANGE_CONTROLLER
+    m_peripheralEndpointRangeHandler = PeripheralEndpointRangeControllerHandler::create(
+        PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID, PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME);
+    if (!m_peripheralEndpointRangeHandler) {
+        ACSDK_CRITICAL(LX("Failed to create range controller handler!"));
+        return false;
+    }
+
+    // Enables "raise" and "lower" utterances for the peripheral endpoint by mapping actions to directives.
+    auto raiseActionMapping = capabilitySemantics::ActionsToDirectiveMapping();
+    raiseActionMapping.addAction(SEMANTICS_ACTION_ID_RAISE);
+    raiseActionMapping.setDirective(SETRANGE_DIRECTIVE_NAME, PERIPHERAL_ENDPOINT_RAISE_PAYLOAD);
+
+    auto lowerActionMapping = capabilitySemantics::ActionsToDirectiveMapping();
+    lowerActionMapping.addAction(SEMANTICS_ACTION_ID_LOWER);
+    lowerActionMapping.setDirective(SETRANGE_DIRECTIVE_NAME, PERIPHERAL_ENDPOINT_LOWER_PAYLOAD);
+
+    auto peripheralEndpointRangeSemantics = capabilitySemantics::CapabilitySemantics();
+    peripheralEndpointRangeSemantics.addActionsToDirectiveMapping(raiseActionMapping);
+    peripheralEndpointRangeSemantics.addActionsToDirectiveMapping(lowerActionMapping);
+    if (!peripheralEndpointRangeSemantics.isValid()) {
+        ACSDK_CRITICAL(LX("Failed to create peripheral endpoint semantic annotations!"));
+        return false;
+    }
+
+    auto peripheralEndpointRangeControllerAttributes = buildRangeControllerAttributes(
+        {{{FriendlyName::Type::TEXT, PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_FRIENDLY_NAME}}},
+        {{PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH,
+          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MAXIMUM},
+           {FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_HIGH}}},
+         {PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_MEDIUM,
+          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MEDIUM}}},
+         {PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW,
+          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MINIMUM},
+           {FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_LOW}}}},
+        utils::Optional<capabilitySemantics::CapabilitySemantics>(peripheralEndpointRangeSemantics));
+
+    if (!peripheralEndpointRangeControllerAttributes.hasValue()) {
+        ACSDK_CRITICAL(LX("Failed to create peripheral endpoint range controller attributes!"));
+        return false;
+    }
+
+    peripheralEndpointBuilder->withRangeController(
+        m_peripheralEndpointRangeHandler,
+        PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME,
+        peripheralEndpointRangeControllerAttributes.value(),
+        true,
+        true,
+        false);
+
+    if (diagnostics) {
+        auto deviceProperties = diagnostics->getDevicePropertyAggregator();
+        if (deviceProperties) {
+            m_peripheralEndpointRangeHandler->addObserver(deviceProperties);
+        }
+    }
+#endif
+
+#ifdef MODE_CONTROLLER
+    m_peripheralEndpointModeHandler = PeripheralEndpointModeControllerHandler::create(
+        PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID, PERIPHERAL_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME);
+    if (!m_peripheralEndpointModeHandler) {
+        ACSDK_CRITICAL(LX("Failed to create mode controller handler!"));
+        return false;
+    }
+
+    auto peripheralEndpointModeControllerAttributes = buildModeControllerAttributes(
+        {{{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_SETTING_MODE},
+          {FriendlyName::Type::TEXT, PERIPHERAL_ENDPOINT_MODE_CONTROLLER_FRIENDLY_NAME}}},
+        {{PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_RED,
+          {{FriendlyName::Type::TEXT, PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_RED}}},
+         {PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_GREEN,
+          {{FriendlyName::Type::TEXT, PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_GREEN}}},
+         {PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_BLUE,
+          {{FriendlyName::Type::TEXT, PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_BLUE}}}});
+
+    if (!peripheralEndpointModeControllerAttributes.hasValue()) {
+        ACSDK_CRITICAL(LX("Failed to create default endpoint mode controller attributes!"));
+        return false;
+    }
+
+    peripheralEndpointBuilder->withModeController(
+        m_peripheralEndpointModeHandler,
+        PERIPHERAL_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME,
+        peripheralEndpointModeControllerAttributes.value(),
+        true,
+        true,
+        false);
+#endif
+
+#ifdef INPUT_CONTROLLER
+    auto inputControllerEndpointCapabilitiesBuilder = std::make_shared<InputControllerEndpointCapabilitiesBuilder>();
+    if (!inputControllerEndpointCapabilitiesBuilder) {
+        ACSDK_CRITICAL(LX("addCapabilitiesBuilderToVideoPeripheralEndpointFailed")
+                           .m("invalidInputControllerEndpointCapabilitiesBuilder"));
+        return false;
+    }
+    peripheralEndpointBuilder->withEndpointCapabilitiesBuilder(inputControllerEndpointCapabilitiesBuilder);
+#endif
+
+    return true;
+}
+#endif
+
+}  // namespace sampleApp
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/LibSampleApp/src/SampleApplicationComponent.cpp b/SampleApplications/Common/LibSampleApp/src/SampleApplicationComponent.cpp
new file mode 100644
index 0000000000..cb496ea290
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/src/SampleApplicationComponent.cpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "SampleApp/SampleApplicationComponent.h"
+
+#include <acsdk/Crypto/CryptoFactory.h>
+#include <acsdkManufactory/ComponentAccumulator.h>
+#include <acsdk/Sample/InteractionManager/UIManager.h>
+
+#ifdef ENABLE_PKCS11
+#include <acsdk/Pkcs11/KeyStoreFactory.h>
+#endif
+#include <ContextManager/ContextManager.h>
+
+#ifdef ACSDK_ACS_UTILS
+#include <acsdkACSSampleApplicationOptions/ACSSampleApplicationOptionsComponent.h>
+#else
+#include <acsdkSampleApplicationCBLAuthRequester/SampleApplicationCBLAuthRequester.h>
+#include <acsdkDefaultSampleApplicationOptions/DefaultSampleApplicationOptionsComponent.h>
+#endif
+
+#include <AVSCommon/Utils/LibcurlUtils/HttpPost.h>
+#include <RegistrationManager/CustomerDataManagerFactory.h>
+
+#include "SampleApp/LocaleAssetsManager.h"
+
+namespace alexaClientSDK {
+namespace acsdkSampleApplication {
+
+using namespace acsdkManufactory;
+using namespace avsCommon::avs::initialization;
+using namespace sampleApplications::common;
+
+/**
+ * @c UIManagerInterface factory that just forwards the instance of UIManager.
+ *
+ * @param uiManager The @c UIManager instance that will provide the implementation.
+ * @return The implementation of @c CBLAuthRequesterInterface to use.
+ */
+static std::shared_ptr<acsdkSampleApplicationInterfaces::UIManagerInterface> createUIManagerInterface(
+    const std::shared_ptr<UIManager>& uiManager) {
+    return uiManager;
+}
+
+/**
+ * Function that returns a factory to instantiate @c LocaleAssetsManagerInterface.
+ *
+ * @param requiresShutdownList - The vector of @c RequiresShutdown pointers to which the @c LocaleAssetsManager will be
+ * added.
+ * @return An std::function to instantiate @c LocaleAssetsManagerInterface.
+ */
+static std::function<std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>(
+    const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>&)>
+getCreateLocaleAssetsManagerInterface(
+    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>>& requiresShutdownList) {
+    return
+        [&requiresShutdownList](const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configNode) {
+            auto manager = sampleApp::LocaleAssetsManager::createLocaleAssetsManager(configNode);
+            if (manager) {
+                requiresShutdownList.push_back(manager);
+            }
+            return manager;
+        };
+}
+
+SampleApplicationComponent getComponent(
+    std::unique_ptr<avsCommon::avs::initialization::InitializationParameters> initParams,
+    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>>& requiresShutdownList,
+    const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder,
+    const std::shared_ptr<avsCommon::utils::logger::Logger>& logger) {
+    return ComponentAccumulator<>()
+        /// This initializes the SDK with the @c InitializationParameters. The factory method is primary,
+        /// meaning it will be called before other factory methods in the manufactory.
+        .addPrimaryFactory(AlexaClientSDKInit::getCreateAlexaClientSDKInit(std::move(initParams)))
+
+    /// The below components specify commonly-changed application options, such as AuthDelegateInterface.
+    /// Applications may want to replace these components with their own to specify custom implementations.
+    /// Applications may also directly pass pre-built custom implementations of AuthDelegateInterface, Logger, or
+    /// MetricRecorderInterface to the SampleApplicationOptionsComponent.
+#ifdef ACSDK_ACS_UTILS
+        .addComponent(acsdkSampleApplication::getSampleApplicationOptionsComponent())
+#else
+        .addComponent(acsdkSampleApplication::getSampleApplicationOptionsComponent(metricRecorder, logger))
+        /// These interfaces are implemented for the Sample App, but applications may want to customize these (e.g. the
+        /// CBLAuthRequesterInterface).
+        .addRetainedFactory(acsdkSampleApplicationCBLAuthRequester::SampleApplicationCBLAuthRequester::
+                                createCBLAuthorizationObserverInterface)
+#endif
+        .addRetainedFactory(getCreateLocaleAssetsManagerInterface(requiresShutdownList))
+        .addRetainedFactory(UIManager::create)
+        .addRetainedFactory(createUIManagerInterface)
+
+        /// These objects are shared by many components in the SDK. Applications are not expected to change these.
+        .addRetainedFactory(avsCommon::utils::DeviceInfo::createFromConfiguration)
+        .addRetainedFactory(avsCommon::utils::configuration::ConfigurationNode::createRoot)
+        .addUniqueFactory(avsCommon::utils::libcurlUtils::HttpPost::createHttpPostInterface)
+        .addRetainedFactory(avsCommon::utils::timing::MultiTimer::createMultiTimer)
+        .addRetainedFactory(contextManager::ContextManager::createContextManagerInterface)
+        .addRetainedFactory(registrationManager::CustomerDataManagerFactory::createCustomerDataManagerInterface)
+#ifdef ENABLE_PKCS11
+        .addRetainedFactory(pkcs11::createKeyStore)
+#else
+        .addInstance(std::shared_ptr<cryptoInterfaces::KeyStoreInterface>())
+#endif
+        .addRetainedFactory(crypto::createCryptoFactory);
+}
+
+}  // namespace acsdkSampleApplication
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/LibSampleApp/src/SampleEqualizerModeController.cpp b/SampleApplications/Common/LibSampleApp/src/SampleEqualizerModeController.cpp
new file mode 100644
index 0000000000..afe94f5f93
--- /dev/null
+++ b/SampleApplications/Common/LibSampleApp/src/SampleEqualizerModeController.cpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <memory>
+
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+
+#include "SampleApp/SampleEqualizerModeController.h"
+
+namespace alexaClientSDK {
+namespace sampleApp {
+
+using namespace alexaClientSDK::acsdkEqualizerInterfaces;
+using namespace sampleApplications::common;
+
+std::shared_ptr<acsdkEqualizerInterfaces::EqualizerModeControllerInterface> SampleEqualizerModeController::
+    createEqualizerModeControllerInterface() {
+    return create();
+}
+
+std::shared_ptr<SampleEqualizerModeController> SampleEqualizerModeController::create() {
+    return std::shared_ptr<SampleEqualizerModeController>(new SampleEqualizerModeController());
+}
+
+bool SampleEqualizerModeController::setEqualizerMode(EqualizerMode mode) {
+    ConsolePrinter::prettyPrint("Equalizer Mode changed to '" + equalizerModeToString(mode) + "'");
+    return true;
+}
+
+}  // namespace sampleApp
+}  // namespace alexaClientSDK
diff --git a/SampleApp/src/UserInputManager.cpp b/SampleApplications/Common/LibSampleApp/src/UserInputManager.cpp
similarity index 94%
rename from SampleApp/src/UserInputManager.cpp
rename to SampleApplications/Common/LibSampleApp/src/UserInputManager.cpp
index 6bc0b326e2..4851cf6cf0 100644
--- a/SampleApp/src/UserInputManager.cpp
+++ b/SampleApplications/Common/LibSampleApp/src/UserInputManager.cpp
@@ -12,18 +12,17 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-
 #include <cctype>
 #include <limits>
 
 #include <AVSCommon/SDKInterfaces/SpeakerInterface.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 #include <AVSCommon/Utils/String/StringUtils.h>
+
 #include "SampleApp/UserInputManager.h"
-#include "SampleApp/ConsolePrinter.h"
 
 #ifdef MODE_CONTROLLER
-#include "SampleApp/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h"
+#include "acsdk/Sample/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h"
 #endif
 
 namespace alexaClientSDK {
@@ -31,6 +30,7 @@ namespace sampleApp {
 
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::sdkInterfaces::softwareInfo;
+using namespace sampleApplications::common;
 
 static const char HOLD = 'h';
 static const char TAP = 't';
@@ -178,7 +178,7 @@ static const int8_t DECREASE_VOLUME = -10;
 static const auto READ_CONSOLE_TIMEOUT = std::chrono::milliseconds(100);
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("UserInputManager");
+#define TAG "UserInputManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -189,6 +189,7 @@ static const std::string TAG("UserInputManager");
 
 std::unique_ptr<UserInputManager> UserInputManager::create(
     std::shared_ptr<InteractionManager> interactionManager,
+    std::shared_ptr<GuiRenderer> guiRenderer,
     std::shared_ptr<ConsoleReader> consoleReader,
     std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface> localeAssetsManager,
     const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& defaultEndpointId) {
@@ -197,6 +198,11 @@ std::unique_ptr<UserInputManager> UserInputManager::create(
         return nullptr;
     }
 
+    if (!guiRenderer) {
+        ACSDK_CRITICAL(LX("Invalid GUIRenderer passed to UserInputManager"));
+        return nullptr;
+    }
+
     if (!consoleReader) {
         ACSDK_CRITICAL(LX("Invalid ConsoleReader passed to UserInputManager"));
         return nullptr;
@@ -208,15 +214,17 @@ std::unique_ptr<UserInputManager> UserInputManager::create(
     }
 
     return std::unique_ptr<UserInputManager>(
-        new UserInputManager(interactionManager, consoleReader, localeAssetsManager, defaultEndpointId));
+        new UserInputManager(interactionManager, guiRenderer, consoleReader, localeAssetsManager, defaultEndpointId));
 }
 
 UserInputManager::UserInputManager(
     std::shared_ptr<InteractionManager> interactionManager,
+    std::shared_ptr<GuiRenderer> guiRenderer,
     std::shared_ptr<ConsoleReader> consoleReader,
     std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface> localeAssetsManager,
     const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& defaultEndpointId) :
         m_interactionManager{interactionManager},
+        m_guiRenderer{guiRenderer},
         m_consoleReader{consoleReader},
         m_localeAssetsManager{localeAssetsManager},
         m_defaultEndpointId{defaultEndpointId},
@@ -267,7 +275,7 @@ SampleAppReturnCode UserInputManager::run() {
         if (!readConsoleInput(&x)) {
             break;
         }
-        x = ::tolower(x);
+        x = static_cast<char>(::tolower(x));
         if (x == QUIT) {
             break;
         } else if (x == RESET) {
@@ -324,15 +332,30 @@ SampleAppReturnCode UserInputManager::run() {
         } else if (x == SKIP_BACKWARD) {
             m_interactionManager->playbackSkipBackward();
         } else if (x == SHUFFLE) {
-            m_interactionManager->playbackShuffle();
+            avsCommon::utils::Optional<bool> optionalState =
+                m_guiRenderer->getGuiToggleState(GuiRenderer::TOGGLE_NAME_SHUFFLE);
+            // Toggle the state if available, else set it to false to disable
+            m_interactionManager->playbackShuffle(optionalState.hasValue() ? !optionalState.value() : false);
         } else if (x == LOOP) {
-            m_interactionManager->playbackLoop();
+            avsCommon::utils::Optional<bool> optionalState =
+                m_guiRenderer->getGuiToggleState(GuiRenderer::TOGGLE_NAME_LOOP);
+            // Toggle the state if available, else set it to false to disable
+            m_interactionManager->playbackLoop(optionalState.hasValue() ? !optionalState.value() : false);
         } else if (x == REPEAT) {
-            m_interactionManager->playbackRepeat();
+            avsCommon::utils::Optional<bool> optionalState =
+                m_guiRenderer->getGuiToggleState(GuiRenderer::TOGGLE_NAME_REPEAT);
+            // Toggle the state if available, else set it to false to disable
+            m_interactionManager->playbackRepeat(optionalState.hasValue() ? !optionalState.value() : false);
         } else if (x == THUMBS_UP) {
-            m_interactionManager->playbackThumbsUp();
+            avsCommon::utils::Optional<bool> optionalState =
+                m_guiRenderer->getGuiToggleState(GuiRenderer::TOGGLE_NAME_THUMBSUP);
+            // Toggle the state if available, else set it to false to disable
+            m_interactionManager->playbackThumbsUp(optionalState.hasValue() ? !optionalState.value() : false);
         } else if (x == THUMBS_DOWN) {
-            m_interactionManager->playbackThumbsDown();
+            avsCommon::utils::Optional<bool> optionalState =
+                m_guiRenderer->getGuiToggleState(GuiRenderer::TOGGLE_NAME_THUMBSDOWN);
+            // Toggle the state if available, else set it to false to disable
+            m_interactionManager->playbackThumbsDown(optionalState.hasValue() ? !optionalState.value() : false);
         } else if (x == FIRMWARE_VERSION) {
             std::string text;
             std::getline(std::cin, text);
diff --git a/SampleApplications/Common/PeripheralEndpoint/CMakeLists.txt b/SampleApplications/Common/PeripheralEndpoint/CMakeLists.txt
new file mode 100644
index 0000000000..5e24bd28e0
--- /dev/null
+++ b/SampleApplications/Common/PeripheralEndpoint/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkSamplePeripheralEndpoint LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/SampleApp/include/SampleApp/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h b/SampleApplications/Common/PeripheralEndpoint/include/acsdk/Sample/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h
similarity index 90%
rename from SampleApp/include/SampleApp/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h
rename to SampleApplications/Common/PeripheralEndpoint/include/acsdk/Sample/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h
index 54db031aac..f7ab49382f 100644
--- a/SampleApp/include/SampleApp/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h
+++ b/SampleApplications/Common/PeripheralEndpoint/include/acsdk/Sample/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PERIPHERALENDPOINT_PERIPHERALENDPOINTMODECONTROLLERHANDLER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PERIPHERALENDPOINT_PERIPHERALENDPOINTMODECONTROLLERHANDLER_H_
+#ifndef ACSDK_SAMPLE_PERIPHERALENDPOINT_PERIPHERALENDPOINTMODECONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_PERIPHERALENDPOINT_PERIPHERALENDPOINTMODECONTROLLERHANDLER_H_
 
 #include <list>
 
@@ -22,7 +22,8 @@
 #include <AVSCommon/Utils/Threading/Executor.h>
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 /**
  * An implementation of an @c ModeControllerInterface.
@@ -107,7 +108,8 @@ class PeripheralEndpointModeControllerHandler
     std::list<std::shared_ptr<avsCommon::sdkInterfaces::modeController::ModeControllerObserverInterface>> m_observers;
 };
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PERIPHERALENDPOINT_PERIPHERALENDPOINTMODECONTROLLERHANDLER_H_
+#endif  // ACSDK_SAMPLE_PERIPHERALENDPOINT_PERIPHERALENDPOINTMODECONTROLLERHANDLER_H_
diff --git a/SampleApp/include/SampleApp/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h b/SampleApplications/Common/PeripheralEndpoint/include/acsdk/Sample/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h
similarity index 88%
rename from SampleApp/include/SampleApp/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h
rename to SampleApplications/Common/PeripheralEndpoint/include/acsdk/Sample/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h
index 7cad41706a..8cc0e78546 100644
--- a/SampleApp/include/SampleApp/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h
+++ b/SampleApplications/Common/PeripheralEndpoint/include/acsdk/Sample/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PERIPHERALENDPOINT_PERIPHERALENDPOINTPOWERCONTROLLERHANDLER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PERIPHERALENDPOINT_PERIPHERALENDPOINTPOWERCONTROLLERHANDLER_H_
+#ifndef ACSDK_SAMPLE_PERIPHERALENDPOINT_PERIPHERALENDPOINTPOWERCONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_PERIPHERALENDPOINT_PERIPHERALENDPOINTPOWERCONTROLLERHANDLER_H_
 
 #include <list>
 
@@ -22,7 +22,8 @@
 #include <AVSCommon/Utils/Threading/Executor.h>
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 /**
  * An implementation of an @c PowerControllerInterface.
@@ -81,7 +82,8 @@ class PeripheralEndpointPowerControllerHandler
     std::list<std::shared_ptr<avsCommon::sdkInterfaces::powerController::PowerControllerObserverInterface>> m_observers;
 };
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PERIPHERALENDPOINT_PERIPHERALENDPOINTPOWERCONTROLLERHANDLER_H_
+#endif  // ACSDK_SAMPLE_PERIPHERALENDPOINT_PERIPHERALENDPOINTPOWERCONTROLLERHANDLER_H_
diff --git a/SampleApp/include/SampleApp/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h b/SampleApplications/Common/PeripheralEndpoint/include/acsdk/Sample/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h
similarity index 90%
rename from SampleApp/include/SampleApp/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h
rename to SampleApplications/Common/PeripheralEndpoint/include/acsdk/Sample/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h
index 27ac8de3db..4db4188cc0 100644
--- a/SampleApp/include/SampleApp/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h
+++ b/SampleApplications/Common/PeripheralEndpoint/include/acsdk/Sample/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PERIPHERALENDPOINT_PERIPHERALENDPOINTRANGECONTROLLERHANDLER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PERIPHERALENDPOINT_PERIPHERALENDPOINTRANGECONTROLLERHANDLER_H_
+#ifndef ACSDK_SAMPLE_PERIPHERALENDPOINT_PERIPHERALENDPOINTRANGECONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_PERIPHERALENDPOINT_PERIPHERALENDPOINTRANGECONTROLLERHANDLER_H_
 
 #include <list>
 
@@ -22,7 +22,8 @@
 #include <AVSCommon/Utils/Threading/Executor.h>
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 /**
  * An implementation of an @c RangeControllerInterface.
@@ -103,7 +104,8 @@ class PeripheralEndpointRangeControllerHandler
     std::list<std::shared_ptr<avsCommon::sdkInterfaces::rangeController::RangeControllerObserverInterface>> m_observers;
 };
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PERIPHERALENDPOINT_PERIPHERALENDPOINTRANGECONTROLLERHANDLER_H_
+#endif  // ACSDK_SAMPLE_PERIPHERALENDPOINT_PERIPHERALENDPOINTRANGECONTROLLERHANDLER_H_
diff --git a/SampleApp/include/SampleApp/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h b/SampleApplications/Common/PeripheralEndpoint/include/acsdk/Sample/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h
similarity index 89%
rename from SampleApp/include/SampleApp/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h
rename to SampleApplications/Common/PeripheralEndpoint/include/acsdk/Sample/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h
index 5e5f5c178e..5811d256ef 100644
--- a/SampleApp/include/SampleApp/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h
+++ b/SampleApplications/Common/PeripheralEndpoint/include/acsdk/Sample/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PERIPHERALENDPOINT_PERIPHERALENDPOINTTOGGLECONTROLLERHANDLER_H_
-#define ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PERIPHERALENDPOINT_PERIPHERALENDPOINTTOGGLECONTROLLERHANDLER_H_
+#ifndef ACSDK_SAMPLE_PERIPHERALENDPOINT_PERIPHERALENDPOINTTOGGLECONTROLLERHANDLER_H_
+#define ACSDK_SAMPLE_PERIPHERALENDPOINT_PERIPHERALENDPOINTTOGGLECONTROLLERHANDLER_H_
 
 #include <list>
 
@@ -22,7 +22,8 @@
 #include <AVSCommon/Utils/Threading/Executor.h>
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 /**
  * Sample implementation of an @c ToggleControllerInterface.
@@ -92,7 +93,8 @@ class PeripheralEndpointToggleControllerHandler
         m_observers;
 };
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
 
-#endif  // ALEXA_CLIENT_SDK_SAMPLEAPP_INCLUDE_SAMPLEAPP_PERIPHERALENDPOINT_PERIPHERALENDPOINTTOGGLECONTROLLERHANDLER_H_
+#endif  // ACSDK_SAMPLE_PERIPHERALENDPOINT_PERIPHERALENDPOINTTOGGLECONTROLLERHANDLER_H_
diff --git a/SampleApplications/Common/PeripheralEndpoint/src/CMakeLists.txt b/SampleApplications/Common/PeripheralEndpoint/src/CMakeLists.txt
new file mode 100644
index 0000000000..7895fee167
--- /dev/null
+++ b/SampleApplications/Common/PeripheralEndpoint/src/CMakeLists.txt
@@ -0,0 +1,34 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkSamplePeripheralEndpoint")
+
+set(SamplePeripheralEndpoint_SOURCES)
+list(APPEND SamplePeripheralEndpoint_SOURCES
+    NullPeripheralEndpoint.cpp)
+
+if (ENDPOINT_CONTROLLERS_POWER_CONTROLLER)
+    list(APPEND SamplePeripheralEndpoint_SOURCES PeripheralEndpointPowerControllerHandler.cpp)
+endif()
+
+if (ENDPOINT_CONTROLLERS_TOGGLE_CONTROLLER)
+   list(APPEND SamplePeripheralEndpoint_SOURCES PeripheralEndpointToggleControllerHandler.cpp)
+endif()
+
+if (ENDPOINT_CONTROLLERS_RANGE_CONTROLLER)
+   list(APPEND SamplePeripheralEndpoint_SOURCES PeripheralEndpointRangeControllerHandler.cpp)
+endif()
+
+if (ENDPOINT_CONTROLLERS_MODE_CONTROLLER)
+   list(APPEND SamplePeripheralEndpoint_SOURCES PeripheralEndpointModeControllerHandler.cpp)
+endif()
+
+add_library(acsdkSamplePeripheralEndpoint ${SamplePeripheralEndpoint_SOURCES})
+
+target_include_directories(acsdkSamplePeripheralEndpoint PUBLIC
+        "${acsdkSamplePeripheralEndpoint_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkSamplePeripheralEndpoint
+    acsdkSampleConsole
+    AVSCommon
+)
+
+# install target only if sample libraries are installed
+asdk_sample_install()
diff --git a/SampleApplications/Common/PeripheralEndpoint/src/NullPeripheralEndpoint.cpp b/SampleApplications/Common/PeripheralEndpoint/src/NullPeripheralEndpoint.cpp
new file mode 100644
index 0000000000..52e6a77aac
--- /dev/null
+++ b/SampleApplications/Common/PeripheralEndpoint/src/NullPeripheralEndpoint.cpp
@@ -0,0 +1,14 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
diff --git a/SampleApp/src/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.cpp b/SampleApplications/Common/PeripheralEndpoint/src/PeripheralEndpointModeControllerHandler.cpp
similarity index 95%
rename from SampleApp/src/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.cpp
rename to SampleApplications/Common/PeripheralEndpoint/src/PeripheralEndpointModeControllerHandler.cpp
index f35333fda2..1d63841b27 100644
--- a/SampleApp/src/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.cpp
+++ b/SampleApplications/Common/PeripheralEndpoint/src/PeripheralEndpointModeControllerHandler.cpp
@@ -15,15 +15,13 @@
 
 #include <algorithm>
 
-#include "SampleApp/ConsolePrinter.h"
-#include "SampleApp/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h"
-
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+#include <acsdk/Sample/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PeripheralEndpointModeControllerHandler");
+#define TAG "PeripheralEndpointModeControllerHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -33,7 +31,8 @@ static const std::string TAG("PeripheralEndpointModeControllerHandler");
 #define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 using namespace avsCommon::avs;
 using namespace avsCommon::sdkInterfaces;
@@ -178,5 +177,6 @@ void PeripheralEndpointModeControllerHandler::setMode(const std::string& mode) {
     }
 }
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
diff --git a/SampleApp/src/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.cpp b/SampleApplications/Common/PeripheralEndpoint/src/PeripheralEndpointPowerControllerHandler.cpp
similarity index 94%
rename from SampleApp/src/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.cpp
rename to SampleApplications/Common/PeripheralEndpoint/src/PeripheralEndpointPowerControllerHandler.cpp
index f04dca7602..c7dbcd37d5 100644
--- a/SampleApp/src/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.cpp
+++ b/SampleApplications/Common/PeripheralEndpoint/src/PeripheralEndpointPowerControllerHandler.cpp
@@ -13,15 +13,13 @@
  * permissions and limitations under the License.
  */
 
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+#include <acsdk/Sample/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 
-#include "SampleApp/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h"
-#include "SampleApp/ConsolePrinter.h"
-
 /// String to identify log entries originating from this file.
-static const std::string TAG("PeripheralEndpointPowerControllerHandler");
+#define TAG "PeripheralEndpointPowerControllerHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -31,7 +29,8 @@ static const std::string TAG("PeripheralEndpointPowerControllerHandler");
 #define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 using namespace avsCommon::avs;
 using namespace avsCommon::sdkInterfaces;
@@ -122,5 +121,6 @@ void PeripheralEndpointPowerControllerHandler::setPowerState(bool powerState) {
     }
 }
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
diff --git a/SampleApp/src/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.cpp b/SampleApplications/Common/PeripheralEndpoint/src/PeripheralEndpointRangeControllerHandler.cpp
similarity index 95%
rename from SampleApp/src/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.cpp
rename to SampleApplications/Common/PeripheralEndpoint/src/PeripheralEndpointRangeControllerHandler.cpp
index 91d7e29641..2f749f43f8 100644
--- a/SampleApp/src/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.cpp
+++ b/SampleApplications/Common/PeripheralEndpoint/src/PeripheralEndpointRangeControllerHandler.cpp
@@ -13,11 +13,9 @@
  * permissions and limitations under the License.
  */
 
-#include "SampleApp/ConsolePrinter.h"
-#include "SampleApp/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h"
-
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+#include <acsdk/Sample/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 
 /// The range controller maximum range.
@@ -30,7 +28,7 @@ static const double MINIMUM_RANGE = 1;
 static const double RANGE_PRECISION = 1;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PeripheralEndpointRangeControllerHandler");
+#define TAG "PeripheralEndpointRangeControllerHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -40,7 +38,8 @@ static const std::string TAG("PeripheralEndpointRangeControllerHandler");
 #define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 using namespace avsCommon::avs;
 using namespace avsCommon::sdkInterfaces;
@@ -180,5 +179,6 @@ void PeripheralEndpointRangeControllerHandler::setRangeValue(double value) {
     }
 }
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
diff --git a/SampleApp/src/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.cpp b/SampleApplications/Common/PeripheralEndpoint/src/PeripheralEndpointToggleControllerHandler.cpp
similarity index 93%
rename from SampleApp/src/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.cpp
rename to SampleApplications/Common/PeripheralEndpoint/src/PeripheralEndpointToggleControllerHandler.cpp
index e2d2ea8921..f1b3b1b0d2 100644
--- a/SampleApp/src/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.cpp
+++ b/SampleApplications/Common/PeripheralEndpoint/src/PeripheralEndpointToggleControllerHandler.cpp
@@ -13,16 +13,13 @@
  * permissions and limitations under the License.
  */
 
-#include "SampleApp/ConsolePrinter.h"
-#include "SampleApp/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h"
-
+#include <acsdk/Sample/Console/ConsolePrinter.h>
+#include <acsdk/Sample/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
-//#include <Settings/SettingStringConversion.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PeripheralEndpointToggleControllerHandler");
+#define TAG "PeripheralEndpointToggleControllerHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -32,7 +29,8 @@ static const std::string TAG("PeripheralEndpointToggleControllerHandler");
 #define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
 
 namespace alexaClientSDK {
-namespace sampleApp {
+namespace sampleApplications {
+namespace common {
 
 using namespace avsCommon::avs;
 using namespace avsCommon::sdkInterfaces;
@@ -134,5 +132,6 @@ void PeripheralEndpointToggleControllerHandler::setToggleState(bool toggleState)
     }
 }
 
-}  // namespace sampleApp
+}  // namespace common
+}  // namespace sampleApplications
 }  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/PortAudioMicrophoneAdapter/CMakeLists.txt b/SampleApplications/Common/PortAudioMicrophoneAdapter/CMakeLists.txt
new file mode 100644
index 0000000000..cf2a99d91e
--- /dev/null
+++ b/SampleApplications/Common/PortAudioMicrophoneAdapter/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkPortAudioMicrophoneAdapter LANGUAGES CXX)
+
+add_library(${PROJECT_NAME}
+        src/PortAudioMicrophoneAdapter.cpp
+        src/PortAudioMicrophoneWrapper.cpp)
+
+target_include_directories(${PROJECT_NAME} PUBLIC include PRIVATE privateInclude "${PORTAUDIO_INCLUDE_DIR}")
+target_link_libraries(${PROJECT_NAME} PUBLIC AVSCommon AudioResources PRIVATE  "${PORTAUDIO_LIB_PATH}")
+target_compile_definitions(${PROJECT_NAME} PRIVATE ACSDK_LOG_MODULE=${PROJECT_NAME})
+
+# install target only if sample libraries are installed
+asdk_sample_install()
diff --git a/SampleApplications/Common/PortAudioMicrophoneAdapter/include/acsdk/Sample/Microphone/PortAudioMicrophoneAdapter.h b/SampleApplications/Common/PortAudioMicrophoneAdapter/include/acsdk/Sample/Microphone/PortAudioMicrophoneAdapter.h
new file mode 100644
index 0000000000..540ca1685c
--- /dev/null
+++ b/SampleApplications/Common/PortAudioMicrophoneAdapter/include/acsdk/Sample/Microphone/PortAudioMicrophoneAdapter.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_MICROPHONE_PORTAUDIOMICROPHONEADAPTER_H_
+#define ACSDK_SAMPLE_MICROPHONE_PORTAUDIOMICROPHONEADAPTER_H_
+
+#include <memory>
+#include <AVSCommon/AVS/AudioInputStream.h>
+
+#include <Audio/MicrophoneInterface.h>
+
+namespace alexaClientSDK {
+namespace sample {
+namespace microphone {
+
+std::unique_ptr<applicationUtilities::resources::audio::MicrophoneInterface> createPortAudioMicrophoneInterface(
+    std::shared_ptr<avsCommon::avs::AudioInputStream> stream);
+
+}  // namespace microphone
+}  // namespace sample
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_MICROPHONE_PORTAUDIOMICROPHONEADAPTER_H_
diff --git a/SampleApplications/Common/PortAudioMicrophoneAdapter/privateInclude/acsdk/Sample/Microphone/PortAudioMicrophoneWrapper.h b/SampleApplications/Common/PortAudioMicrophoneAdapter/privateInclude/acsdk/Sample/Microphone/PortAudioMicrophoneWrapper.h
new file mode 100644
index 0000000000..472538ec84
--- /dev/null
+++ b/SampleApplications/Common/PortAudioMicrophoneAdapter/privateInclude/acsdk/Sample/Microphone/PortAudioMicrophoneWrapper.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_MICROPHONE_PORTAUDIOMICROPHONEWRAPPER_H_
+#define ACSDK_SAMPLE_MICROPHONE_PORTAUDIOMICROPHONEWRAPPER_H_
+
+#include <mutex>
+#include <thread>
+
+#include <AVSCommon/AVS/AudioInputStream.h>
+
+#include <portaudio.h>
+#include <Audio/MicrophoneInterface.h>
+
+namespace alexaClientSDK {
+namespace sample {
+namespace microphone {
+
+/// This acts as a wrapper around PortAudio, a cross-platform open-source audio I/O library.
+class PortAudioMicrophoneWrapper : public applicationUtilities::resources::audio::MicrophoneInterface {
+public:
+    /**
+     * Creates a @c PortAudioMicrophoneWrapper.
+     *
+     * @param stream The shared data stream to write to.
+     * @return A unique_ptr to a @c PortAudioMicrophoneWrapper if creation was successful and @c nullptr otherwise.
+     */
+    static std::unique_ptr<PortAudioMicrophoneWrapper> create(std::shared_ptr<avsCommon::avs::AudioInputStream> stream);
+
+    /**
+     * Stops streaming from the microphone.
+     *
+     * @return Whether the stop was successful.
+     */
+    bool stopStreamingMicrophoneData() override;
+
+    /**
+     * Starts streaming from the microphone.
+     *
+     * @return Whether the start was successful.
+     */
+    bool startStreamingMicrophoneData() override;
+
+    /**
+     * Whether the microphone is currently streaming.
+     *
+     * @return Whether the microphone is streaming.
+     */
+    bool isStreaming() override;
+
+    /**
+     * Destructor.
+     */
+    ~PortAudioMicrophoneWrapper();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param stream The shared data stream to write to.
+     */
+    PortAudioMicrophoneWrapper(std::shared_ptr<avsCommon::avs::AudioInputStream> stream);
+
+    /**
+     * The callback that PortAudio will issue when audio is avaiable to read.
+     *
+     * @param inputBuffer The temporary buffer that microphone audio data will be available in.
+     * @param outputBuffer Not used here.
+     * @param numSamples The number of samples available to consume.
+     * @param timeInfo Time stamps indicated when the first sample in the buffer was captured. Not used here.
+     * @param statusFlags Flags that tell us when underflow or overflow conditions occur. Not used here.
+     * @param userData A user supplied pointer.
+     * @return A PortAudio code that will indicate how PortAudio should continue.
+     */
+    static int PortAudioCallback(
+        const void* inputBuffer,
+        void* outputBuffer,
+        unsigned long numSamples,
+        const PaStreamCallbackTimeInfo* timeInfo,
+        PaStreamCallbackFlags statusFlags,
+        void* userData);
+
+    /// Initializes PortAudio
+    bool initialize();
+
+    /**
+     * Get the optional config parameter from @c AlexaClientSDKConfig.json
+     * for setting the PortAudio stream's suggested latency.
+     *
+     * @param[out] suggestedLatency The latency as it is configured in the file.
+     * @return  @c true if the suggestedLatency is defined in the config file, @c false otherwise.
+     */
+    bool getConfigSuggestedLatency(PaTime& suggestedLatency);
+
+    /// The stream of audio data.
+    const std::shared_ptr<avsCommon::avs::AudioInputStream> m_audioInputStream;
+
+    /// The writer that will be used to writer audio data into the sds.
+    std::shared_ptr<avsCommon::avs::AudioInputStream::Writer> m_writer;
+
+    /// The PortAudio stream
+    PaStream* m_paStream;
+
+    /**
+     * A lock to seralize access to startStreamingMicrophoneData() and stopStreamingMicrophoneData() between different
+     * threads.
+     */
+    std::mutex m_mutex;
+
+    /**
+     * Whether the microphone is currently streaming.
+     */
+    bool m_isStreaming;
+};
+
+}  // namespace microphone
+}  // namespace sample
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_MICROPHONE_PORTAUDIOMICROPHONEWRAPPER_H_
diff --git a/SampleApplications/Common/PortAudioMicrophoneAdapter/src/PortAudioMicrophoneAdapter.cpp b/SampleApplications/Common/PortAudioMicrophoneAdapter/src/PortAudioMicrophoneAdapter.cpp
new file mode 100644
index 0000000000..ffe7512631
--- /dev/null
+++ b/SampleApplications/Common/PortAudioMicrophoneAdapter/src/PortAudioMicrophoneAdapter.cpp
@@ -0,0 +1,32 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/Sample/Microphone/PortAudioMicrophoneAdapter.h>
+#include <acsdk/Sample/Microphone/PortAudioMicrophoneWrapper.h>
+
+namespace alexaClientSDK {
+namespace sample {
+namespace microphone {
+
+using applicationUtilities::resources::audio::MicrophoneInterface;
+using avsCommon::avs::AudioInputStream;
+
+std::unique_ptr<MicrophoneInterface> createPortAudioMicrophoneInterface(std::shared_ptr<AudioInputStream> stream) {
+    return PortAudioMicrophoneWrapper::create(std::move(stream));
+}
+
+}  // namespace microphone
+}  // namespace sample
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/PortAudioMicrophoneAdapter/src/PortAudioMicrophoneWrapper.cpp b/SampleApplications/Common/PortAudioMicrophoneAdapter/src/PortAudioMicrophoneWrapper.cpp
new file mode 100644
index 0000000000..a7e4fa8561
--- /dev/null
+++ b/SampleApplications/Common/PortAudioMicrophoneAdapter/src/PortAudioMicrophoneWrapper.cpp
@@ -0,0 +1,200 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/Sample/Microphone/PortAudioMicrophoneWrapper.h>
+
+#include <cstring>
+#include <string>
+
+#include <rapidjson/document.h>
+
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace sample {
+namespace microphone {
+
+using avsCommon::avs::AudioInputStream;
+
+static const int NUM_INPUT_CHANNELS = 1;
+static const int NUM_OUTPUT_CHANNELS = 0;
+static const double SAMPLE_RATE = 16000;
+static const unsigned long PREFERRED_SAMPLES_PER_CALLBACK = paFramesPerBufferUnspecified;
+
+static const auto SAMPLE_APP_CONFIG_ROOT_KEY = "sampleApp";
+static const auto PORTAUDIO_CONFIG_ROOT_KEY = "portAudio";
+static const auto PORTAUDIO_CONFIG_SUGGESTED_LATENCY_KEY = "suggestedLatency";
+
+/// String to identify log entries originating from this file.
+#define TAG "PortAudioMicrophoneWrapper"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+std::unique_ptr<PortAudioMicrophoneWrapper> PortAudioMicrophoneWrapper::create(
+    std::shared_ptr<AudioInputStream> stream) {
+    if (!stream) {
+        ACSDK_CRITICAL(LX("Invalid stream passed to PortAudioMicrophoneWrapper"));
+        return nullptr;
+    }
+    std::unique_ptr<PortAudioMicrophoneWrapper> portAudioMicrophoneWrapper(new PortAudioMicrophoneWrapper(stream));
+    if (!portAudioMicrophoneWrapper->initialize()) {
+        ACSDK_CRITICAL(LX("Failed to initialize PortAudioMicrophoneWrapper"));
+        return nullptr;
+    }
+    return portAudioMicrophoneWrapper;
+}
+
+PortAudioMicrophoneWrapper::PortAudioMicrophoneWrapper(std::shared_ptr<AudioInputStream> stream) :
+        m_audioInputStream{stream},
+        m_paStream{nullptr},
+        m_isStreaming{false} {
+}
+
+PortAudioMicrophoneWrapper::~PortAudioMicrophoneWrapper() {
+    Pa_StopStream(m_paStream);
+    Pa_CloseStream(m_paStream);
+    Pa_Terminate();
+}
+
+bool PortAudioMicrophoneWrapper::initialize() {
+    m_writer = m_audioInputStream->createWriter(AudioInputStream::Writer::Policy::NONBLOCKABLE);
+    if (!m_writer) {
+        ACSDK_CRITICAL(LX("Failed to create stream writer"));
+        return false;
+    }
+    PaError err;
+    err = Pa_Initialize();
+    if (err != paNoError) {
+        ACSDK_CRITICAL(LX("Failed to initialize PortAudio").d("errorCode", err));
+        return false;
+    }
+
+    PaTime suggestedLatency = -1;
+    bool latencyInConfig = getConfigSuggestedLatency(suggestedLatency);
+
+    if (!latencyInConfig) {
+        err = Pa_OpenDefaultStream(
+            &m_paStream,
+            NUM_INPUT_CHANNELS,
+            NUM_OUTPUT_CHANNELS,
+            paInt16,
+            SAMPLE_RATE,
+            PREFERRED_SAMPLES_PER_CALLBACK,
+            PortAudioCallback,
+            this);
+    } else {
+        ACSDK_INFO(
+            LX("PortAudio suggestedLatency has been configured to ").d("Seconds", std::to_string(suggestedLatency)));
+        if (suggestedLatency < 0) {
+            ACSDK_CRITICAL(LX("Failed to configure PortAudio invalid suggestedLatency"));
+            return false;
+        }
+
+        PaStreamParameters inputParameters;
+        std::memset(&inputParameters, 0, sizeof(inputParameters));
+        inputParameters.device = Pa_GetDefaultInputDevice();
+        inputParameters.channelCount = NUM_INPUT_CHANNELS;
+        inputParameters.sampleFormat = paInt16;
+        inputParameters.suggestedLatency = suggestedLatency;
+        inputParameters.hostApiSpecificStreamInfo = nullptr;
+
+        err = Pa_OpenStream(
+            &m_paStream,
+            &inputParameters,
+            nullptr,
+            SAMPLE_RATE,
+            PREFERRED_SAMPLES_PER_CALLBACK,
+            paNoFlag,
+            PortAudioCallback,
+            this);
+    }
+
+    if (err != paNoError) {
+        ACSDK_CRITICAL(LX("Failed to open PortAudio default stream").d("errorCode", err));
+        return false;
+    }
+    return true;
+}
+
+bool PortAudioMicrophoneWrapper::startStreamingMicrophoneData() {
+    ACSDK_INFO(LX(__func__));
+    std::lock_guard<std::mutex> lock{m_mutex};
+    PaError err = Pa_StartStream(m_paStream);
+    if (err != paNoError) {
+        ACSDK_CRITICAL(LX("Failed to start PortAudio stream"));
+        return false;
+    }
+    m_isStreaming = true;
+    return true;
+}
+
+bool PortAudioMicrophoneWrapper::stopStreamingMicrophoneData() {
+    ACSDK_INFO(LX(__func__));
+    std::lock_guard<std::mutex> lock{m_mutex};
+    PaError err = Pa_StopStream(m_paStream);
+    if (err != paNoError) {
+        ACSDK_CRITICAL(LX("Failed to stop PortAudio stream"));
+        return false;
+    }
+    m_isStreaming = false;
+    return true;
+}
+
+bool PortAudioMicrophoneWrapper::isStreaming() {
+    return m_isStreaming;
+}
+
+int PortAudioMicrophoneWrapper::PortAudioCallback(
+    const void* inputBuffer,
+    void* outputBuffer,
+    unsigned long numSamples,
+    const PaStreamCallbackTimeInfo* timeInfo,
+    PaStreamCallbackFlags statusFlags,
+    void* userData) {
+    PortAudioMicrophoneWrapper* wrapper = static_cast<PortAudioMicrophoneWrapper*>(userData);
+    ssize_t returnCode = wrapper->m_writer->write(inputBuffer, numSamples);
+    if (returnCode <= 0) {
+        ACSDK_CRITICAL(LX("Failed to write to stream."));
+        return paAbort;
+    }
+    return paContinue;
+}
+
+bool PortAudioMicrophoneWrapper::getConfigSuggestedLatency(PaTime& suggestedLatency) {
+    bool latencyInConfig = false;
+    auto config = avsCommon::utils::configuration::ConfigurationNode::getRoot()
+                      .getChildNode(SAMPLE_APP_CONFIG_ROOT_KEY)
+                      .getChildNode(PORTAUDIO_CONFIG_ROOT_KEY);
+    if (config) {
+        latencyInConfig = config.getValue(
+            PORTAUDIO_CONFIG_SUGGESTED_LATENCY_KEY,
+            &suggestedLatency,
+            suggestedLatency,
+            &rapidjson::Value::IsDouble,
+            &rapidjson::Value::GetDouble);
+    }
+
+    return latencyInConfig;
+}
+
+}  // namespace microphone
+}  // namespace sample
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/Common/TemplateRuntimePresentationAdaptor/CMakeLists.txt b/SampleApplications/Common/TemplateRuntimePresentationAdaptor/CMakeLists.txt
new file mode 100644
index 0000000000..0f35fd8af6
--- /dev/null
+++ b/SampleApplications/Common/TemplateRuntimePresentationAdaptor/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkSampleTemplateRuntimePresentationAdaptor LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/SampleApplications/Common/TemplateRuntimePresentationAdaptor/include/acsdk/Sample/TemplateRuntime/TemplateRuntimePresentationAdapter.h b/SampleApplications/Common/TemplateRuntimePresentationAdaptor/include/acsdk/Sample/TemplateRuntime/TemplateRuntimePresentationAdapter.h
new file mode 100644
index 0000000000..a80091637a
--- /dev/null
+++ b/SampleApplications/Common/TemplateRuntimePresentationAdaptor/include/acsdk/Sample/TemplateRuntime/TemplateRuntimePresentationAdapter.h
@@ -0,0 +1,248 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_TEMPLATERUNTIME_TEMPLATERUNTIMEPRESENTATIONADAPTER_H_
+#define ACSDK_SAMPLE_TEMPLATERUNTIME_TEMPLATERUNTIMEPRESENTATIONADAPTER_H_
+
+#include <string>
+#include <utility>
+
+#include <rapidjson/document.h>
+#include <rapidjson/writer.h>
+
+#include <acsdkAudioPlayerInterfaces/AudioPlayerObserverInterface.h>
+#include <acsdk/Notifier/Notifier.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorClientInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationTypes.h>
+#include <acsdk/TemplateRuntimeInterfaces/TemplateRuntimeObserverInterface.h>
+#include <AVSCommon/AVS/PlayerActivity.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+#include "TemplateRuntimePresentationAdapterObserverInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * This class interprets the Template Runtime contract for user interface.
+ */
+class TemplateRuntimePresentationAdapter
+        : public presentationOrchestratorInterfaces::PresentationObserverInterface
+        , public templateRuntimeInterfaces::TemplateRuntimeObserverInterface
+        , public acsdkAudioPlayerInterfaces::AudioPlayerObserverInterface
+        , public std::enable_shared_from_this<TemplateRuntimePresentationAdapter> {
+public:
+    /**
+     * Create an instance of @c TemplateRuntimePresentationAdapter
+     * @return Shared pointer to the @c TemplateRuntimePresentationAdapter
+     */
+    static std::shared_ptr<TemplateRuntimePresentationAdapter> create();
+
+    /**
+     * Destructor
+     */
+    virtual ~TemplateRuntimePresentationAdapter() = default;
+
+    /// @name PresentationObserverInterface functions
+    /// @{
+    void onPresentationAvailable(
+        presentationOrchestratorInterfaces::PresentationRequestToken id,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationInterface> presentation) override;
+    void onPresentationStateChanged(
+        presentationOrchestratorInterfaces::PresentationRequestToken id,
+        presentationOrchestratorInterfaces::PresentationState newState) override;
+    bool onNavigateBack(presentationOrchestratorInterfaces::PresentationRequestToken id) override;
+    /// @}
+
+    /// @name TemplateRuntimeObserverInterface functions
+    /// @{
+    void renderTemplateCard(const std::string& jsonPayload) override;
+
+    void renderPlayerInfoCard(
+        const std::string& jsonPayload,
+        templateRuntimeInterfaces::TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) override;
+
+    /// @}
+
+    /// @name AudioPlayerObserverInterface Functions
+    /// @{
+    void onPlayerActivityChanged(
+        avsCommon::avs::PlayerActivity state,
+        const acsdkAudioPlayerInterfaces::AudioPlayerObserverInterface::Context& context) override;
+    /// @}
+
+    /**
+     * Set the executor used as the worker thread
+     * @param executor The @c Executor to set
+     * @note This function should only be used for testing purposes. No call to any other method should
+     * be done prior to this call.
+     */
+    void setExecutor(std::shared_ptr<avsCommon::utils::threading::Executor> executor);
+
+    /**
+     * Registers an observer to the adapter for presentation changes.
+     * @param observer Instance of an observer to be notified of any change.
+     */
+    void addTemplateRuntimePresentationAdapterObserver(
+        const std::weak_ptr<TemplateRuntimePresentationAdapterObserverInterface>& observer);
+
+    /**
+     * De-registers an observer from the adapter for presentation changes.
+     * @param observer Instance of an observer to be removed.
+     */
+    void removeTemplateRuntimePresentationAdapterObserver(
+        const std::weak_ptr<TemplateRuntimePresentationAdapterObserverInterface>& observer);
+
+    /**
+     * Set the window id to use for render template card presentations managed by the adapter
+     * @param renderTemplateWindowId id of the render template window
+     */
+    void setRenderTemplateWindowId(const std::string& renderTemplateWindowId);
+
+    /**
+     * Set the window id to use for render player info card presentations managed by the adapter
+     * @param renderPlayerInfoWindowId id of the render player info window
+     */
+    void setRenderPlayerInfoWindowId(const std::string& renderPlayerInfoWindowId);
+
+    /**
+     * Set the presentation orchestrator
+     * @param poClient pointer to the presentation orchestrator
+     */
+    void setPresentationOrchestrator(
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface> poClient);
+
+private:
+    /**
+     * Constructor
+     */
+    explicit TemplateRuntimePresentationAdapter();
+
+    /**
+     * Initializes the @c TemplateRuntimePresentationAdapter object.
+     */
+    bool initialize();
+
+    /// Alias for Notifier based on @c TemplateRuntimePresentationAdapterObserverInterface.
+    using TemplateRuntimePresentationAdapterNotifier =
+        notifier::Notifier<TemplateRuntimePresentationAdapterObserverInterface>;
+
+    /**
+     * Session for DisplayCard Presentation
+     */
+    struct DisplayCardSession {
+        /**
+         * Default Constructor.
+         */
+        DisplayCardSession() = default;
+
+        /**
+         * Constructor
+         * @param jsonPayload DisplayCard json payload;
+         */
+        explicit DisplayCardSession(std::string jsonPayload) :
+                jsonPayload{std::move(jsonPayload)},
+                presentation{nullptr},
+                presentationState{presentationOrchestratorInterfaces::PresentationState::NONE} {};
+
+        /// The json payload for the DisplayCard session
+        std::string jsonPayload;
+
+        /// Pointer to the @c PresentationInterface presentation association for this session
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationInterface> presentation;
+
+        /// The @c PresentationState of this session
+        presentationOrchestratorInterfaces::PresentationState presentationState;
+    };
+
+    /// Convenience typedef
+    using DisplayCardSessionPtr = std::shared_ptr<DisplayCardSession>;
+
+    /**
+     * Session for PlayerInfo Presentation
+     */
+    struct PlayerInfoCardSession : DisplayCardSession {
+        /**
+         * Default Constructor.
+         */
+        PlayerInfoCardSession() = default;
+
+        /**
+         * Constructor
+         * @param jsonPayload playerInfo json payload
+         * @param audioPlayerInfo associated audioPlayerInfo
+         */
+        PlayerInfoCardSession(
+            std::string jsonPayload,
+            templateRuntimeInterfaces::TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) :
+                jsonPayload{std::move(jsonPayload)},
+                audioPlayerInfo{std::move(audioPlayerInfo)} {};
+
+        /// The json payload for the playerInfo session
+        std::string jsonPayload;
+
+        /// The @c AudioPlayerInfo for this session
+        templateRuntimeInterfaces::TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo;
+    };
+
+    /// Convenience typedef
+    using PlayerInfoCardSessionPtr = std::shared_ptr<PlayerInfoCardSession>;
+
+    /**
+     * In executor method to process player activity updates.
+     * @param state Player state.
+     */
+    void executeOnPlayerActivityChanged(alexaClientSDK::avsCommon::avs::PlayerActivity state);
+
+    /// Shared pointer to the template runtime presentation adapter notifier.
+    std::shared_ptr<TemplateRuntimePresentationAdapterNotifier> m_templateRuntimePresentationAdapterNotifier;
+
+    /// Pointer to the presentation orchestrator client
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface>
+        m_presentationOrchestratorClient;
+
+    /// Active presentation request token for RenderTemplate presentation
+    presentationOrchestratorInterfaces::PresentationRequestToken m_renderTemplateRequestToken;
+
+    /// Active presentation request token for PlayerInfo presentation
+    presentationOrchestratorInterfaces::PresentationRequestToken m_playerInfoRequestToken;
+
+    /// Pointer to DisplayCard Session
+    DisplayCardSessionPtr m_displayCardSession;
+
+    /// Pointer to PlayerInfoCard Session
+    PlayerInfoCardSessionPtr m_playerInfoCardSession;
+
+    /// The timeout value in ms for clearing the display card when AudioPlay is FINISHED
+    std::chrono::milliseconds m_audioPlaybackFinishedTimeout;
+
+    /// The timeout value in ms for clearing the display card when AudioPlay is STOPPED or PAUSED
+    std::chrono::milliseconds m_audioPlaybackStoppedPausedTimeout;
+
+    /// Id of the window used to handle render template payloads.
+    std::string m_renderTemplateWindowId;
+
+    /// Id of the window used to handle render player info payloads.
+    std::string m_renderPlayerInfoWindowId;
+
+    /// Shared pointer to the executor.
+    std::shared_ptr<avsCommon::utils::threading::Executor> m_executor;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ACSDK_SAMPLE_TEMPLATERUNTIME_TEMPLATERUNTIMEPRESENTATIONADAPTER_H_
diff --git a/SampleApplications/Common/TemplateRuntimePresentationAdaptor/include/acsdk/Sample/TemplateRuntime/TemplateRuntimePresentationAdapterObserverInterface.h b/SampleApplications/Common/TemplateRuntimePresentationAdaptor/include/acsdk/Sample/TemplateRuntime/TemplateRuntimePresentationAdapterObserverInterface.h
new file mode 100644
index 0000000000..1024615957
--- /dev/null
+++ b/SampleApplications/Common/TemplateRuntimePresentationAdaptor/include/acsdk/Sample/TemplateRuntime/TemplateRuntimePresentationAdapterObserverInterface.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SAMPLE_TEMPLATERUNTIME_TEMPLATERUNTIMEPRESENTATIONADAPTEROBSERVERINTERFACE_H_
+#define ACSDK_SAMPLE_TEMPLATERUNTIME_TEMPLATERUNTIMEPRESENTATIONADAPTEROBSERVERINTERFACE_H_
+
+#include <string>
+
+#include <acsdk/TemplateRuntimeInterfaces/TemplateRuntimeObserverInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+/**
+ * An contract fulfilled by user interface to present the template runtime cards.
+ */
+class TemplateRuntimePresentationAdapterObserverInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~TemplateRuntimePresentationAdapterObserverInterface() = default;
+
+    /**
+     * Used to notify when a RenderTemplate presentation is ready to display. Once called, the client should
+     * render the Template display card based on the metadata provided in the payload in structured JSON format.
+     *
+     * @note The payload may contain customer sensitive information and should be used with utmost care.
+     * Failure to do so may result in exposing or mishandling of customer data.
+     *
+     * @param jsonPayload The payload of the RenderTemplate directive in structured JSON format.
+     */
+    virtual void renderTemplateCard(const std::string& jsonPayload) = 0;
+
+    /**
+     * Used to notify when a RenderPlayerInfo presentation is ready to display. Once called, the client should
+     * render the PlayerInfo display card based on the metadata provided in the payload in structured JSON
+     * format.
+     *
+     * @param jsonPayload The payload of the RenderPlayerInfo directive in structured JSON format.
+     * @param audioPlayerInfo Information on the @c AudioPlayer.
+     */
+    virtual void renderPlayerInfoCard(
+        const std::string& jsonPayload,
+        templateRuntimeInterfaces::TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) = 0;
+
+    /**
+     * Used to notify when the render template card should be cleared.
+     */
+    virtual void clearRenderTemplateCard() = 0;
+
+    /**
+     * Used to notify when the player info card should be cleared.
+     */
+    virtual void clearPlayerInfoCard() = 0;
+};
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SAMPLE_TEMPLATERUNTIME_TEMPLATERUNTIMEPRESENTATIONADAPTEROBSERVERINTERFACE_H_
diff --git a/SampleApplications/Common/TemplateRuntimePresentationAdaptor/src/CMakeLists.txt b/SampleApplications/Common/TemplateRuntimePresentationAdaptor/src/CMakeLists.txt
new file mode 100644
index 0000000000..81685de73f
--- /dev/null
+++ b/SampleApplications/Common/TemplateRuntimePresentationAdaptor/src/CMakeLists.txt
@@ -0,0 +1,18 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkSampleTemplateRuntimePresentationAdaptor")
+
+add_library(acsdkSampleTemplateRuntimePresentationAdaptor
+    TemplateRuntimePresentationAdapter.cpp)
+
+target_include_directories(acsdkSampleTemplateRuntimePresentationAdaptor PUBLIC
+    "${acsdkSampleTemplateRuntimePresentationAdaptor_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkSampleTemplateRuntimePresentationAdaptor
+        acsdkAudioPlayer
+        acsdkPresentationOrchestratorClient
+        acsdkPresentationOrchestratorInterfaces
+        acsdkSampleApplicationInterfaces
+        acsdkTemplateRuntime
+        acsdkTemplateRuntimeInterfaces)
+
+# install target only if sample libraries are installed
+asdk_sample_install()
diff --git a/SampleApplications/Common/TemplateRuntimePresentationAdaptor/src/TemplateRuntimePresentationAdapter.cpp b/SampleApplications/Common/TemplateRuntimePresentationAdaptor/src/TemplateRuntimePresentationAdapter.cpp
new file mode 100644
index 0000000000..984ff8f6f2
--- /dev/null
+++ b/SampleApplications/Common/TemplateRuntimePresentationAdaptor/src/TemplateRuntimePresentationAdapter.cpp
@@ -0,0 +1,281 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/Sample/TemplateRuntime/TemplateRuntimePresentationAdapter.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace common {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::utils::configuration;
+using namespace acsdkAudioPlayerInterfaces;
+using namespace presentationOrchestratorInterfaces;
+
+/// String to identify log entries originating from this file.
+#define TAG "TemplateRuntimePresentationAdapter"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Interface name for Alexa.TemplateRuntime requests.
+static const char TEMPLATE_RUNTIME_INTERFACE_NAME[] = "TemplateRuntime";
+
+/// Request token for RenderTemplate directive.
+static const char RENDER_TEMPLATE_TOKEN[] = "RenderTemplate";
+
+/// Request token for PlayerInfo directive.
+static const char PLAYER_INFO_TOKEN[] = "RenderPlayerInfo";
+
+/// The key in our config file to find the root of template runtime configuration.
+static const char TEMPLATERUNTIME_CONFIGURATION_ROOT_KEY[] = "templateRuntimeCapabilityAgent";
+
+/// The key in our config file to set the display card timeout value when AudioPlayer is in FINISHED state
+static const char TEMPLATERUNTIME_AUDIOPLAYBACK_FINISHED_KEY[] = "displayCardAudioPlaybackFinishedTimeout";
+
+/// The key in our config file to set the display card timeout value when AudioPlayer is in STOPPED or PAUSED state
+static const char TEMPLATERUNTIME_AUDIOPLAYBACK_STOPPED_PAUSED_KEY[] = "displayCardAudioPlaybackStoppedPausedTimeout";
+
+/// Default timeout for clearing the RenderPlayerInfo display card when AudioPlayer is in FINISHED state.
+static const std::chrono::milliseconds DEFAULT_AUDIO_FINISHED_TIMEOUT_MS{10000};
+
+/// Default timeout for clearing the RenderPlayerInfo display card when AudioPlayer is in STOPPED/PAUSED state.
+static const std::chrono::milliseconds DEFAULT_AUDIO_STOPPED_PAUSED_TIMEOUT_MS{60000};
+
+std::shared_ptr<TemplateRuntimePresentationAdapter> TemplateRuntimePresentationAdapter::create() {
+    auto templateRuntimePresentationAdapter =
+        std::shared_ptr<TemplateRuntimePresentationAdapter>(new TemplateRuntimePresentationAdapter());
+
+    templateRuntimePresentationAdapter->initialize();
+
+    return templateRuntimePresentationAdapter;
+}
+
+TemplateRuntimePresentationAdapter::TemplateRuntimePresentationAdapter() :
+        m_executor(std::make_shared<alexaClientSDK::avsCommon::utils::threading::Executor>()) {
+    m_templateRuntimePresentationAdapterNotifier = std::make_shared<TemplateRuntimePresentationAdapterNotifier>();
+}
+
+bool TemplateRuntimePresentationAdapter::initialize() {
+    auto configurationRoot = ConfigurationNode::getRoot()[std::string(TEMPLATERUNTIME_CONFIGURATION_ROOT_KEY)];
+
+    configurationRoot.getDuration<std::chrono::milliseconds>(
+        TEMPLATERUNTIME_AUDIOPLAYBACK_FINISHED_KEY, &m_audioPlaybackFinishedTimeout, DEFAULT_AUDIO_FINISHED_TIMEOUT_MS);
+
+    configurationRoot.getDuration<std::chrono::milliseconds>(
+        TEMPLATERUNTIME_AUDIOPLAYBACK_STOPPED_PAUSED_KEY,
+        &m_audioPlaybackStoppedPausedTimeout,
+        DEFAULT_AUDIO_STOPPED_PAUSED_TIMEOUT_MS);
+
+    return true;
+}
+
+void TemplateRuntimePresentationAdapter::addTemplateRuntimePresentationAdapterObserver(
+    const std::weak_ptr<TemplateRuntimePresentationAdapterObserverInterface>& observer) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit(
+        [this, observer]() { m_templateRuntimePresentationAdapterNotifier->addWeakPtrObserver(observer); });
+}
+
+void TemplateRuntimePresentationAdapter::removeTemplateRuntimePresentationAdapterObserver(
+    const std::weak_ptr<TemplateRuntimePresentationAdapterObserverInterface>& observer) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit(
+        [this, observer]() { m_templateRuntimePresentationAdapterNotifier->removeWeakPtrObserver(observer); });
+}
+
+void TemplateRuntimePresentationAdapter::onPresentationAvailable(
+    PresentationRequestToken id,
+    std::shared_ptr<PresentationInterface> presentation) {
+    ACSDK_DEBUG5(LX(__func__).d("id", id));
+
+    m_executor->submit([this, id, presentation]() {
+        if (id == m_playerInfoRequestToken && m_playerInfoCardSession) {
+            m_playerInfoCardSession->presentation = presentation;
+            m_playerInfoCardSession->presentationState = presentation->getState();
+            executeOnPlayerActivityChanged(m_playerInfoCardSession->audioPlayerInfo.audioPlayerState);
+            m_templateRuntimePresentationAdapterNotifier->notifyObservers(
+                [this](const std::shared_ptr<TemplateRuntimePresentationAdapterObserverInterface>& observer) {
+                    observer->renderPlayerInfoCard(
+                        m_playerInfoCardSession->jsonPayload, m_playerInfoCardSession->audioPlayerInfo);
+                });
+        } else if (id == m_renderTemplateRequestToken && m_displayCardSession) {
+            m_displayCardSession->presentation = presentation;
+            m_displayCardSession->presentationState = presentation->getState();
+            m_templateRuntimePresentationAdapterNotifier->notifyObservers(
+                [this](const std::shared_ptr<TemplateRuntimePresentationAdapterObserverInterface>& observer) {
+                    observer->renderTemplateCard(m_displayCardSession->jsonPayload);
+                });
+        }
+    });
+}
+
+void TemplateRuntimePresentationAdapter::onPresentationStateChanged(
+    PresentationRequestToken id,
+    PresentationState newState) {
+    ACSDK_DEBUG5(LX(__func__).d("id", id).d("newState", newState));
+
+    m_executor->submit([this, id, newState] {
+        DisplayCardSessionPtr session = nullptr;
+        if (id == m_playerInfoRequestToken && m_playerInfoCardSession) {
+            session = m_playerInfoCardSession;
+        } else if (id == m_renderTemplateRequestToken && m_displayCardSession) {
+            session = m_displayCardSession;
+        }
+        if (!session || newState == session->presentationState) {
+            return;
+        }
+        session->presentationState = newState;
+        auto& presentation = session->presentation;
+
+        if (PresentationState::NONE == newState) {
+            if (id == m_playerInfoRequestToken) {
+                m_templateRuntimePresentationAdapterNotifier->notifyObservers(
+                    [](const std::shared_ptr<TemplateRuntimePresentationAdapterObserverInterface>& observer) {
+                        observer->clearPlayerInfoCard();
+                    });
+            } else if (id == m_renderTemplateRequestToken) {
+                m_templateRuntimePresentationAdapterNotifier->notifyObservers(
+                    [](const std::shared_ptr<TemplateRuntimePresentationAdapterObserverInterface>& observer) {
+                        observer->clearRenderTemplateCard();
+                    });
+            }
+            if (presentation) {
+                presentation.reset();
+            }
+        }
+    });
+}
+
+bool TemplateRuntimePresentationAdapter::onNavigateBack(PresentationRequestToken id) {
+    /* NO OP: Let PO manage the back navigation */
+    return false;
+}
+
+void TemplateRuntimePresentationAdapter::renderTemplateCard(const std::string& jsonPayload) {
+    ACSDK_DEBUG9(LX(__func__));
+
+    m_executor->submit([this, jsonPayload]() {
+        PresentationOptions poOptions;
+        poOptions.presentationLifespan = PresentationLifespan::TRANSIENT;
+        poOptions.metadata = RENDER_TEMPLATE_TOKEN;
+        poOptions.interfaceName = TEMPLATE_RUNTIME_INTERFACE_NAME;
+        poOptions.timeout = PresentationInterface::getTimeoutDefault();
+
+        m_displayCardSession = std::make_shared<DisplayCardSession>(jsonPayload);
+
+        m_renderTemplateRequestToken =
+            m_presentationOrchestratorClient->requestWindow(m_renderTemplateWindowId, poOptions, shared_from_this());
+    });
+}
+
+void TemplateRuntimePresentationAdapter::renderPlayerInfoCard(
+    const std::string& jsonPayload,
+    alexaClientSDK::templateRuntimeInterfaces::TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) {
+    ACSDK_DEBUG9(LX(__func__));
+
+    m_executor->submit([this, jsonPayload, audioPlayerInfo]() {
+        if (m_playerInfoCardSession && m_playerInfoCardSession->presentation &&
+            PresentationState::NONE != m_playerInfoCardSession->presentationState) {
+            m_playerInfoCardSession->jsonPayload = jsonPayload;
+            m_playerInfoCardSession->audioPlayerInfo = audioPlayerInfo;
+            if (PresentationState::FOREGROUND == m_playerInfoCardSession->presentationState) {
+                m_templateRuntimePresentationAdapterNotifier->notifyObservers(
+                    [this](const std::shared_ptr<TemplateRuntimePresentationAdapterObserverInterface>& observer) {
+                        observer->renderPlayerInfoCard(
+                            m_playerInfoCardSession->jsonPayload, m_playerInfoCardSession->audioPlayerInfo);
+                    });
+            }
+            return;
+        }
+        PresentationOptions poOptions;
+        poOptions.presentationLifespan = PresentationLifespan::LONG;
+        poOptions.metadata = PLAYER_INFO_TOKEN;
+        poOptions.interfaceName = TEMPLATE_RUNTIME_INTERFACE_NAME;
+        poOptions.timeout = PresentationInterface::getTimeoutDefault();
+
+        m_playerInfoCardSession = std::make_shared<PlayerInfoCardSession>(jsonPayload, audioPlayerInfo);
+
+        m_playerInfoRequestToken =
+            m_presentationOrchestratorClient->requestWindow(m_renderPlayerInfoWindowId, poOptions, shared_from_this());
+    });
+}
+
+void TemplateRuntimePresentationAdapter::setRenderTemplateWindowId(const std::string& renderTemplateWindowId) {
+    m_executor->submit([this, renderTemplateWindowId]() { m_renderTemplateWindowId = renderTemplateWindowId; });
+}
+
+void TemplateRuntimePresentationAdapter::setRenderPlayerInfoWindowId(const std::string& renderPlayerInfoWindowId) {
+    m_executor->submit([this, renderPlayerInfoWindowId]() { m_renderPlayerInfoWindowId = renderPlayerInfoWindowId; });
+}
+
+void TemplateRuntimePresentationAdapter::setExecutor(
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> executor) {
+    m_executor = std::move(executor);
+}
+
+void TemplateRuntimePresentationAdapter::onPlayerActivityChanged(
+    PlayerActivity state,
+    const AudioPlayerObserverInterface::Context& context) {
+    ACSDK_DEBUG9(LX(__func__).d("newState", playerActivityToString(state).c_str()));
+    m_executor->submit([this, state]() { executeOnPlayerActivityChanged(state); });
+}
+
+void TemplateRuntimePresentationAdapter::executeOnPlayerActivityChanged(PlayerActivity state) {
+    if (!m_playerInfoCardSession || !m_playerInfoCardSession->presentation) {
+        return;
+    }
+    std::chrono::milliseconds presentationTimeout;
+    PresentationLifespan presentationLifespan;
+    switch (state) {
+        case PlayerActivity::PLAYING:
+        case PlayerActivity::BUFFER_UNDERRUN:
+            presentationTimeout = m_playerInfoCardSession->presentation->getTimeoutDisabled();
+            presentationLifespan = PresentationLifespan::LONG;
+            break;
+        case PlayerActivity::IDLE:
+        case PlayerActivity::STOPPED:
+        case PlayerActivity::PAUSED:
+            presentationTimeout = m_audioPlaybackStoppedPausedTimeout;
+            presentationLifespan = PresentationLifespan::TRANSIENT;
+            break;
+        case PlayerActivity::FINISHED:
+            presentationTimeout = m_audioPlaybackFinishedTimeout;
+            presentationLifespan = PresentationLifespan::SHORT;
+            break;
+        default:
+            /* Do Nothing */
+            return;
+    }
+
+    m_playerInfoCardSession->presentation->setLifespan(presentationLifespan);
+    m_playerInfoCardSession->presentation->setTimeout(presentationTimeout);
+    m_playerInfoCardSession->presentation->startTimeout();
+}
+
+void TemplateRuntimePresentationAdapter::setPresentationOrchestrator(
+    std::shared_ptr<PresentationOrchestratorClientInterface> poClient) {
+    m_presentationOrchestratorClient = std::move(poClient);
+}
+
+}  // namespace common
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/ConsoleSampleApplication/CMakeLists.txt b/SampleApplications/ConsoleSampleApplication/CMakeLists.txt
new file mode 100644
index 0000000000..f4038812a1
--- /dev/null
+++ b/SampleApplications/ConsoleSampleApplication/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+project(SampleApp LANGUAGES CXX)
+add_subdirectory("src")
diff --git a/SampleApplications/ConsoleSampleApplication/src/CMakeLists.txt b/SampleApplications/ConsoleSampleApplication/src/CMakeLists.txt
new file mode 100644
index 0000000000..414d2c01a7
--- /dev/null
+++ b/SampleApplications/ConsoleSampleApplication/src/CMakeLists.txt
@@ -0,0 +1,4 @@
+
+add_executable(SampleApp main.cpp)
+
+target_link_libraries(SampleApp acsdkSampleApp)
diff --git a/SampleApplications/ConsoleSampleApplication/src/main.cpp b/SampleApplications/ConsoleSampleApplication/src/main.cpp
new file mode 100644
index 0000000000..fb3993be60
--- /dev/null
+++ b/SampleApplications/ConsoleSampleApplication/src/main.cpp
@@ -0,0 +1,127 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "SampleApp/ConsoleReader.h"
+#include "SampleApp/SampleApplication.h"
+#include "SampleApp/SampleApplicationReturnCodes.h"
+
+#ifdef DIAGNOSTICS
+#include "SampleApp/SDKDiagnostics.h"
+#endif
+
+#include <cstdlib>
+#include <string>
+
+using namespace alexaClientSDK::sampleApp;
+using namespace alexaClientSDK::sampleApplications::common;
+
+/**
+ * Function that evaluates if the SampleApp invocation uses old-style or new-style opt-arg style invocation.
+ *
+ * @param argc The number of elements in the @c argv array.
+ * @param argv An array of @a argc elements, containing the program name and all command-line arguments.
+ * @return @c true of the invocation uses optarg style argument @c false otherwise.
+ */
+bool usesOptStyleArgs(int argc, char* argv[]) {
+    for (int i = 1; i < argc; i++) {
+        if (!strcmp(argv[i], "-C") || !strcmp(argv[i], "-K") || !strcmp(argv[i], "-L")) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * This serves as the starting point for the application. This code instantiates the @c UserInputManager and processes
+ * user input until the @c run() function returns.
+ *
+ * @param argc The number of elements in the @c argv array.
+ * @param argv An array of @a argc elements, containing the program name and all command-line arguments.
+ * @return @c EXIT_FAILURE if the program failed to initialize correctly, else @c EXIT_SUCCESS.
+ */
+int main(int argc, char* argv[]) {
+    std::vector<std::string> configFiles;
+    std::string logLevel;
+
+    if (usesOptStyleArgs(argc, argv)) {
+        for (int i = 1; i < argc; i++) {
+            if (strcmp(argv[i], "-C") == 0) {
+                if (i + 1 == argc) {
+                    ConsolePrinter::simplePrint("No config specified for -C option");
+                    return SampleAppReturnCode::ERROR;
+                }
+                configFiles.push_back(std::string(argv[++i]));
+                ConsolePrinter::simplePrint("configFile " + std::string(argv[i]));
+            } else if (strcmp(argv[i], "-L") == 0) {
+                if (i + 1 == argc) {
+                    ConsolePrinter::simplePrint("No debugLevel specified for -L option");
+                    return SampleAppReturnCode::ERROR;
+                }
+                logLevel = std::string(argv[++i]);
+            } else {
+                ConsolePrinter::simplePrint(
+                    "USAGE: " + std::string(argv[0]) + " -C <config1.json> -C <config2.json> ... -C <configN.json> " +
+                    " -L <log_level>");
+                return SampleAppReturnCode::ERROR;
+            }
+        }
+    } else {
+        if (argc < 2) {
+            ConsolePrinter::simplePrint(
+                "USAGE: " + std::string(argv[0]) + " <path_to_AlexaClientSDKConfig.json> [log_level]");
+            return SampleAppReturnCode::ERROR;
+        }
+        if (3 == argc) {
+            logLevel = std::string(argv[2]);
+        }
+
+        configFiles.push_back(std::string(argv[1]));
+        ConsolePrinter::simplePrint("configFile " + std::string(argv[1]));
+    }
+
+    auto consoleReader = std::make_shared<ConsoleReader>();
+
+    std::unique_ptr<SampleApplication> sampleApplication;
+    SampleAppReturnCode returnCode = SampleAppReturnCode::OK;
+
+#ifdef DIAGNOSTICS
+    std::shared_ptr<SDKDiagnostics> diagnostics = SDKDiagnostics::create();
+    if (!diagnostics) {
+        return SampleAppReturnCode::ERROR;
+    }
+#endif
+
+    do {
+        sampleApplication = SampleApplication::create(
+            consoleReader,
+            configFiles,
+            logLevel
+#ifdef DIAGNOSTICS
+            ,
+            diagnostics
+#endif
+        );
+
+        if (!sampleApplication) {
+            ConsolePrinter::simplePrint("Failed to create SampleApplication!");
+            return SampleAppReturnCode::ERROR;
+        }
+        returnCode = sampleApplication->run();
+        sampleApplication.reset();
+    } while (SampleAppReturnCode::RESTART == returnCode);
+
+    return returnCode;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/.clang-format b/SampleApplications/IPCServerSampleApplication/.clang-format
new file mode 100644
index 0000000000..3d1ec24482
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/.clang-format
@@ -0,0 +1,102 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
+
diff --git a/SampleApplications/IPCServerSampleApplication/.gitignore b/SampleApplications/IPCServerSampleApplication/.gitignore
new file mode 100644
index 0000000000..29cb2ae252
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/.gitignore
@@ -0,0 +1,7 @@
+# OS generated files #
+######################
+*.DS_Store
+ 
+# Jetbrains IDE #
+#################
+*.idea
diff --git a/SampleApplications/IPCServerSampleApplication/CMakeLists.txt b/SampleApplications/IPCServerSampleApplication/CMakeLists.txt
new file mode 100644
index 0000000000..eb7f1dee92
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/CMakeLists.txt
@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+project(IPCServerSampleApplication LANGUAGES CXX)
+
+# enable testing - needs to be included from this top-level directory
+include(tools/Testing.cmake)
+
+set(ASDK_LIBRARY_DIRS "${CMAKE_PREFIX_PATH}/lib")
+set(ASDK_INCLUDE_DIRS "${ASDK_INCLUDE_DIRS}" "${CMAKE_PREFIX_PATH}/include")
+set(ASDK_LDFLAGS "${ASDK_LDFLAGS}" "-L${CMAKE_PREFIX_PATH}/lib")
+
+get_filename_component(AVS_CMAKE_BUILD ../../cmakeBuild ABSOLUTE)
+
+add_subdirectory(Communication)
+add_subdirectory(LibIPCServerSampleApp)
+
+if (METRICS_EXTENSION)
+    add_subdirectory("Metrics")
+endif ()
+
+
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+include(${AVS_CMAKE_BUILD}/cmake/PrepareInstall.cmake)
+
+add_subdirectory(src)
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/Communication/CMakeLists.txt b/SampleApplications/IPCServerSampleApplication/Communication/CMakeLists.txt
new file mode 100644
index 0000000000..95eceee617
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/Communication/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(Communication LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+include(${AVS_CMAKE_BUILD}/cmake/PrepareInstall.cmake)
+
+add_subdirectory("src")
diff --git a/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/MessageListenerInterface.h b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/MessageListenerInterface.h
new file mode 100644
index 0000000000..f61c489299
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/MessageListenerInterface.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_MESSAGELISTENERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_MESSAGELISTENERINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace communication {
+
+/**
+ * An interface that listens to incoming messages from arbitrary sources
+ */
+class MessageListenerInterface {
+public:
+    /**
+     * Called when a new message is available on the arbitrary source channel
+     *
+     * @note Blocking in this handler will block delivery of further messages.
+     * @param jsonMessage an arbitrary string
+     */
+    virtual void onMessage(const std::string& jsonMessage) = 0;
+};
+
+}  // namespace communication
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_MESSAGELISTENERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/MessagingInterface.h b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/MessagingInterface.h
new file mode 100644
index 0000000000..e61c9546b5
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/MessagingInterface.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_MESSAGINGINTERFACE_H_
+#define ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_MESSAGINGINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include "MessageListenerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace communication {
+
+/**
+ * Messaging interface for sending and receiving messages with arbitrary sinks
+ */
+class MessagingInterface {
+public:
+    /**
+     * Write a message into a sink
+     *
+     * @param payload an arbitrary string
+     */
+    virtual void writeMessage(const std::string& payload) = 0;
+
+    /**
+     * Set a listener interface that is called when new messages are received
+     * @note Subsequent call to this method override the previous listener.
+     * @param messageListener
+     */
+    virtual void setMessageListener(std::shared_ptr<MessageListenerInterface> messageListener) = 0;
+};
+
+}  // namespace communication
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_MESSAGINGINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/MessagingServerInterface.h b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/MessagingServerInterface.h
new file mode 100644
index 0000000000..f29ca62af1
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/MessagingServerInterface.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_MESSAGINGSERVERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_MESSAGINGSERVERINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include "MessagingInterface.h"
+#include "MessageListenerInterface.h"
+#include "MessagingServerObserverInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace communication {
+
+/**
+ * Server with a @c MessagingInterface capabilities.
+ */
+class MessagingServerInterface : public MessagingInterface {
+public:
+    /**
+     * Start the implementation of the @c MessagingInterface
+     * @note The implementation may choose to make this method blocking or non blocking.
+     * @return @c true for success. @c False otherwise.
+     */
+    virtual bool start() = 0;
+
+    /**
+     * Stop the messaging implmentation
+     */
+    virtual void stop() = 0;
+
+    /**
+     * Is the medium ready for passing messages
+     */
+    virtual bool isReady() = 0;
+
+    /**
+     * Set server observer.
+     * @param observer The observer which should gets notified whenever a new connection is open or a connection is
+     * closed.
+     */
+    virtual void setObserver(const std::shared_ptr<MessagingServerObserverInterface>& observer) = 0;
+};
+
+}  // namespace communication
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_MESSAGINGSERVERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/MessagingServerObserverInterface.h b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/MessagingServerObserverInterface.h
new file mode 100644
index 0000000000..dd304fbe17
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/MessagingServerObserverInterface.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_MESSAGINGSERVEROBSERVERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_MESSAGINGSERVEROBSERVERINTERFACE_H_
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace communication {
+
+/**
+ * Observe @c MessagingServer events.
+ */
+class MessagingServerObserverInterface {
+public:
+    /**
+     * A new connection to the server has been opened.
+     */
+    virtual void onConnectionOpened() = 0;
+
+    /**
+     * A connection to the server has been closed.
+     */
+    virtual void onConnectionClosed() = 0;
+};
+
+}  // namespace communication
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_MESSAGINGSERVEROBSERVERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/WebSocketConfig.h b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/WebSocketConfig.h
new file mode 100644
index 0000000000..1c1a41036c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/WebSocketConfig.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/*
+ * Based on code supplied by the websocketpp library, original licence below
+ *
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_WEBSOCKETCONFIG_H_
+#define ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_WEBSOCKETCONFIG_H_
+
+#include <websocketpp/transport/asio/endpoint.hpp>
+// Always include the no_tls config, even if ssl is enabled
+#include <websocketpp/config/asio_no_tls.hpp>
+#ifdef ENABLE_WEBSOCKET_SSL
+#include <websocketpp/transport/asio/security/tls.hpp>
+#endif
+
+#include "WebSocketSDKLogger.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace communication {
+/**
+ * Contains the configuration for WebSocketsPP.
+ *
+ * WebSocketsPP takes this configuration as a template parameter,
+ * and uses these typedef's to configure the various parts of the library
+ */
+struct WebSocketConfig : public websocketpp::config::asio {
+    /// The type of this struct
+    typedef WebSocketConfig type;
+
+    /// The base class which this config is extending
+    typedef asio base;
+
+    /// Concurrency policy used by websocketspp
+    typedef base::concurrency_type concurrency_type;
+
+    /// The type of request policy (a http request parser)
+    typedef base::request_type request_type;
+
+    /// The type of response policy (http)
+    typedef base::response_type response_type;
+
+    /// Type used to store messages
+    typedef base::message_type message_type;
+
+    /// Connection message manager policy
+    typedef base::con_msg_manager_type con_msg_manager_type;
+
+    /// Endpoint message manager policy
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    /// Logger to use for access logs
+    typedef WebSocketSDKLogger alog_type;
+
+    /// Logger to use for error logs
+    typedef WebSocketSDKLogger elog_type;
+
+    /// Random number generator type
+    typedef base::rng_type rng_type;
+
+    /**
+     * Specifies the transport configuration which will be used by websocketspp
+     *
+     * In this case contains a redefinition of the above types plus the type of transport in use
+     */
+    struct transport_config : public base::transport_config {
+        /// Concurrency policy used by websocketspp
+        typedef type::concurrency_type concurrency_type;
+
+        /// Logger to use for access logs
+        typedef type::alog_type alog_type;
+
+        /// Logger to use for error logs
+        typedef type::elog_type elog_type;
+
+        /// The type of request policy (a http request parser)
+        typedef type::request_type request_type;
+
+        /// The type of response policy (http)
+        typedef type::response_type response_type;
+
+#ifdef ENABLE_WEBSOCKET_SSL
+        typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
+#else
+        /// The socket type to use (basic, tls, etc)
+        typedef websocketpp::transport::asio::basic_socket::endpoint socket_type;
+#endif
+    };
+
+    /// Typedef for the endpoint encapsulating the transport configuration defined above
+    typedef websocketpp::transport::asio::endpoint<transport_config> transport_type;
+};
+}  // namespace communication
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_WEBSOCKETCONFIG_H_
diff --git a/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/WebSocketSDKLogger.h b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/WebSocketSDKLogger.h
new file mode 100644
index 0000000000..93c297006f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/WebSocketSDKLogger.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_WEBSOCKETSDKLOGGER_H_
+#define ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_WEBSOCKETSDKLOGGER_H_
+
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/logger/levels.hpp>
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace communication {
+/// Wrapper around the Alexa Client SDK logger for use by websocketspp
+class WebSocketSDKLogger {
+public:
+    using level = websocketpp::log::level;
+
+    /// Construct the logger
+    /**
+     * @param hint A channel type specific hint for how to construct the logger
+     */
+    WebSocketSDKLogger(websocketpp::log::channel_type_hint::value hint = websocketpp::log::channel_type_hint::access) :
+            m_channelTypeHint{hint} {
+    }
+
+    /// Construct the logger
+    /**
+     * @param channels
+     * @param hint The type of messages this logger will process, access or error
+     */
+    WebSocketSDKLogger(level channels, websocketpp::log::channel_type_hint::value hint) : m_channelTypeHint{hint} {
+    }
+
+    /// Dynamically enable the given list of channels
+    /**
+     *  This logger depends on the SDK logger for log level selection, channel selection is ignored
+     *
+     * @param channels
+     */
+    void set_channels(level channels) {
+    }
+
+    /// Dynamically disable the given list of channels
+    /**
+     *  This logger depends on the SDK logger for log level selection, channel selection is ignored
+     *
+     * @param channels
+     */
+    void clear_channels(level channels) {
+    }
+
+    /// Tests whether a log level is statically enabled.
+    /**
+     *  This logger depends on the SDK logger for log level selection
+     *  so always return true and ignore arguments
+     *
+     *  @param channel
+     */
+    bool static_test(level channel) const {
+        return true;
+    }
+
+    /// Tests whether a log level is dynamically enabled.
+    /**
+     *  This logger depends on the SDK logger for log level selection
+     *  so always return true and ignore arguments
+     *
+     *  @param channel
+     */
+    bool dynamic_test(level channel) const {
+        return true;
+    }
+
+    /// Write a string message to the given channel
+    /**
+     * @param channel The channel to write to
+     * @param msg The message to write
+     */
+    void write(level channel, std::string const& msg);
+
+    /// Write a cstring message to the given channel
+    /**
+     * @param channel The channel to write to
+     * @param msg The message to write
+     */
+    void write(level channel, char const* msg);
+
+private:
+    /// retrieve the syslog priority code given a WebSocket++ error channel
+    /**
+     * @param channel The level to look up
+     * @return The syslog level associated with `channel`
+     */
+    void logErrorMessage(level channel, char const* msg) const;
+
+    /// retrieve the syslog priority code given a WebSocket++ access channel
+    /**
+     * @param channel The level to look up
+     * @return The syslog level associated with `channel`
+     */
+    void logAccessMessage(level, char const* msg) const;
+
+    websocketpp::log::channel_type_hint::value m_channelTypeHint;
+};
+}  // namespace communication
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_WEBSOCKETSDKLOGGER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/WebSocketServer.h b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/WebSocketServer.h
new file mode 100644
index 0000000000..04eb10ff88
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/Communication/include/Communication/WebSocketServer.h
@@ -0,0 +1,176 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_WEBSOCKETSERVER_H_
+#define ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_WEBSOCKETSERVER_H_
+
+#include <string>
+#include <set>
+
+#include <websocketpp/server.hpp>
+#ifdef ENABLE_WEBSOCKET_SSL
+#include <asio/ssl.hpp>
+#endif
+
+#include "MessagingServerInterface.h"
+
+#include "WebSocketConfig.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace communication {
+
+/*
+ Implementation Notes
+ --------------------
+
+ This implementation is loosely taken from the example code within the WebSocketPP library.
+
+ The main idea behind ASIO is that all requests to write/read are asynchronous, generally any request to read/write
+ is provided a callback, which is called when the the request is complete. In cases where the input is required for e.g.
+ for read, ASIO returns control flow immediately, calling the supplied callback at some later time.
+
+ Top-level sequence expressed serially, session operations are handled by the WebSocketPP library:
+
+ Setup listener socket on supplied port
+ Wait for connection
+ Get notified of new connection - add it to the set of connections
+
+ When data is received from a client, onMessage will be called with the message payload
+
+ When sending a message to clients, the data is sent to each connection which is currently open.
+
+ When a client disconnects for any reason, onConnectionClose is called - the connection is removed from the
+  set of connections
+
+ Additional notes
+ ----------------
+ This implementation supports multiple clients; writes will be fanned out to all clients, reads are accepted
+ from any client. The connection_hdl descriptor identifies the client which is opening/closing a connection or
+ sending a message.
+*/
+
+/**
+ * A @c MessagingServerInterface implementation using WebSocket.
+ * The @c start method is blocking.
+ */
+class WebSocketServer
+        : public std::enable_shared_from_this<WebSocketServer>
+        , public MessagingServerInterface {
+public:
+    /**
+     * Constructor.
+     *
+     * @param interface Network interface to bind / listen.
+     * @param port Port to bind / listen.
+     */
+    WebSocketServer(const std::string& interface, unsigned short port);
+
+    /**
+     * Set the SSL certificate and private key files.
+     *
+     * @param certificateAuthority Root CA to be used for client certificate verification.
+     * @param certificate Server certificate chain.
+     * @param privateKey Private key corresponding to Server certificate.
+     */
+    void setCertificateFile(
+        const std::string& certificateAuthority,
+        const std::string& certificate,
+        const std::string& privateKey);
+
+    /// @name MessagingServerInterface Functions
+    /// @{
+    bool start() override;
+    void writeMessage(const std::string& payload) override;
+    void setMessageListener(std::shared_ptr<MessageListenerInterface> messageListener) override;
+    void stop() override;
+    bool isReady() override;
+    void setObserver(const std::shared_ptr<communication::MessagingServerObserverInterface>& observer) override;
+    /// @}
+    virtual ~WebSocketServer() = default;
+
+private:
+    typedef websocketpp::server<WebSocketConfig> server;
+    using connection_hdl = websocketpp::connection_hdl;
+
+    /**
+     * Callback from WebSocket server when a connection is opened.
+     *
+     * @param connectionHdl Connection handler.
+     */
+    void onConnectionOpen(connection_hdl connectionHdl);
+
+    /**
+     * Callback from WebSocket server when a connection is closed.
+     *
+     * @param connectionHdl Connection handler.
+     */
+    void onConnectionClose(connection_hdl connectionHdl);
+
+    /**
+     * Callback from WebSocket server when a message is received.
+     *
+     * @param connectionHdl Connection handler.
+     * @param messagePtr Pointer to the message.
+     */
+    void onMessage(connection_hdl connectionHdl, server::message_ptr messagePtr);
+
+#ifdef ENABLE_WEBSOCKET_SSL
+    /**
+     * Callback from WebSocket server when tls is initialized - used to set tls options
+     */
+    std::shared_ptr<asio::ssl::context> onTlsInit();
+#endif
+
+    /**
+     * Callback from WebSocket after handshake has been received and processed but before it has been accepted.
+     *
+     * @param connectionHdl Connection handler.
+     * @return true on accept, false on reject.
+     */
+    bool onValidate(connection_hdl connectionHdl);
+
+    /// Indicates whether the server was successfully initialised
+    std::atomic_bool m_initialised{false};
+
+    /// The websocket server instance
+    server m_webSocketServer;
+
+    /// Reference to a message listener to be called when a new message is received
+    std::shared_ptr<MessageListenerInterface> m_messageListener;
+
+    /// Reference to current session
+    connection_hdl m_connection;
+
+    /// The websocket ssl certificate authority file
+    std::string m_certificateAuthorityFile;
+
+    /// The websocket ssl certificate chain file
+    std::string m_certificateFile;
+
+    /// The websocket ssl private key file
+    std::string m_privateKeyFile;
+
+    /// The server observer.
+    std::shared_ptr<MessagingServerObserverInterface> m_observer;
+};
+
+}  // namespace communication
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_COMMUNICATION_INCLUDE_COMMUNICATION_WEBSOCKETSERVER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/Communication/src/CMakeLists.txt b/SampleApplications/IPCServerSampleApplication/Communication/src/CMakeLists.txt
new file mode 100644
index 0000000000..c220dd824f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/Communication/src/CMakeLists.txt
@@ -0,0 +1,43 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+add_definitions("-DACSDK_LOG_MODULE=communication")
+add_library(Communication SHARED WebSocketServer.cpp WebSocketSDKLogger.cpp)
+
+
+if(NOT WEBSOCKETPP_INCLUDE_DIR)
+    message(FATAL_ERROR "WebSocketPP Path is required to enable websocket server")
+endif()
+
+
+if(NOT ASIO_INCLUDE_DIR)
+    find_path(ASIO_INCLUDE_DIR NAMES "asio.hpp")
+
+    if(ASIO_INCLUDE_DIR STREQUAL "ASIO_INCLUDE_DIR-NOTFOUND")
+        message(FATAL_ERROR "WebSocket support requires asio.")
+    endif()
+endif()
+
+target_include_directories(Communication PUBLIC
+    "${WEBSOCKETPP_INCLUDE_DIR}"
+    "${Communication_SOURCE_DIR}/include"
+    "${ASDK_INCLUDE_DIRS}"
+     "${ASIO_INCLUDE_DIR}")
+
+target_link_libraries(Communication "${ASDK_LDFLAGS}" AVSCommon)
+target_compile_definitions(Communication PUBLIC ASIO_STANDALONE)
+
+# Currently only allow non SSL websocket with debug builds
+if(DISABLE_WEBSOCKET_SSL)
+    string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE)
+    if(NOT LOWERCASE_CMAKE_BUILD_TYPE STREQUAL "debug")
+        message(FATAL_ERROR "DISABLE_WEBSOCKET_SSL used in non-debug build.")
+    endif()
+else()
+    find_package(OpenSSL REQUIRED)
+    add_definitions(-DENABLE_WEBSOCKET_SSL)
+
+    target_include_directories(Communication PUBLIC "${OPENSSL_INCLUDE_DIR}")
+    target_link_libraries(Communication
+            "${OPENSSL_SSL_LIBRARY}"
+            "${OPENSSL_CRYPTO_LIBRARY}")
+endif()
diff --git a/SampleApplications/IPCServerSampleApplication/Communication/src/WebSocketSDKLogger.cpp b/SampleApplications/IPCServerSampleApplication/Communication/src/WebSocketSDKLogger.cpp
new file mode 100644
index 0000000000..37d8e296ca
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/Communication/src/WebSocketSDKLogger.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "Communication/WebSocketSDKLogger.h"
+
+#define TAG "WebSocket"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace communication {
+
+void WebSocketSDKLogger::write(websocketpp::log::level channel, std::string const& msg) {
+    write(channel, msg.c_str());
+}
+
+void WebSocketSDKLogger::write(websocketpp::log::level channel, char const* msg) {
+    if (m_channelTypeHint == websocketpp::log::channel_type_hint::access) {
+        logAccessMessage(channel, msg);
+    } else {
+        logErrorMessage(channel, msg);
+    }
+}
+
+void WebSocketSDKLogger::logErrorMessage(websocketpp::log::level channel, char const* msg) const {
+    switch (channel) {
+        case websocketpp::log::elevel::devel:
+        case websocketpp::log::elevel::library:
+            ACSDK_DEBUG5(LX("ErrorLog").sensitive("message", msg));
+            return;
+        case websocketpp::log::elevel::info:
+            ACSDK_INFO(LX("ErrorLog").sensitive("message", msg));
+            return;
+        case websocketpp::log::elevel::warn:
+            ACSDK_WARN(LX("ErrorLog").sensitive("message", msg));
+            return;
+        case websocketpp::log::elevel::rerror:
+            ACSDK_ERROR(LX("ErrorLog").sensitive("message", msg));
+            return;
+        case websocketpp::log::elevel::fatal:
+            ACSDK_CRITICAL(LX("ErrorLog").sensitive("message", msg));
+            return;
+        default:
+            ACSDK_INFO(LX("ErrorLog").sensitive("message", msg));
+            return;
+    }
+}
+
+void WebSocketSDKLogger::logAccessMessage(websocketpp::log::level, char const* msg) const {
+    ACSDK_DEBUG9(LX("AccessLog").sensitive("message", msg));
+}
+}  // namespace communication
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/Communication/src/WebSocketServer.cpp b/SampleApplications/IPCServerSampleApplication/Communication/src/WebSocketServer.cpp
new file mode 100644
index 0000000000..45a65ba5c0
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/Communication/src/WebSocketServer.cpp
@@ -0,0 +1,274 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <memory>
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "Communication/WebSocketServer.h"
+
+static const std::string TAG("WebSocketServer");
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace communication {
+
+using namespace websocketpp::lib::placeholders;
+using server = websocketpp::server<WebSocketConfig>;
+using connection_hdl = websocketpp::connection_hdl;
+
+WebSocketServer::WebSocketServer(const std::string& interface, const unsigned short port) {
+    websocketpp::lib::error_code errorCode;
+    m_webSocketServer.init_asio(errorCode);
+    if (errorCode) {
+        ACSDK_ERROR(
+            LX("server::init_asio").d("errorCode", errorCode.value()).d("errorCategory", errorCode.category().name()));
+        return;
+    }
+
+    m_webSocketServer.set_reuse_addr(true);
+    m_webSocketServer.set_open_handler(bind(&WebSocketServer::onConnectionOpen, this, _1));
+    m_webSocketServer.set_close_handler(bind(&WebSocketServer::onConnectionClose, this, _1));
+    m_webSocketServer.set_message_handler(bind(&WebSocketServer::onMessage, this, _1, _2));
+
+#ifdef ENABLE_WEBSOCKET_SSL
+    m_webSocketServer.set_tls_init_handler(bind(&WebSocketServer::onTlsInit, this));
+#endif
+
+    m_webSocketServer.set_validate_handler(bind(&WebSocketServer::onValidate, this, _1));
+
+    auto endpoint = asio::ip::tcp::endpoint(asio::ip::address::from_string(interface), port);
+    m_webSocketServer.listen(endpoint, errorCode);
+
+    if (errorCode) {
+        ACSDK_ERROR(
+            LX("server::listen").d("errorCode", errorCode.value()).d("errorCategory", errorCode.category().name()));
+        return;
+    }
+
+    m_initialised = true;
+}
+
+void WebSocketServer::setMessageListener(std::shared_ptr<MessageListenerInterface> messageListener) {
+    m_messageListener = messageListener;
+}
+
+void WebSocketServer::setCertificateFile(
+    const std::string& certificateAuthority,
+    const std::string& certificate,
+    const std::string& privateKey) {
+    m_certificateAuthorityFile = certificateAuthority;
+    m_certificateFile = certificate;
+    m_privateKeyFile = privateKey;
+}
+
+bool WebSocketServer::start() {
+    if (!m_initialised) {
+        ACSDK_ERROR(LX("startFailed").d("reason", "server not initialised"));
+        return false;
+    }
+
+#ifdef ENABLE_WEBSOCKET_SSL
+    if (m_certificateAuthorityFile.empty() || m_certificateFile.empty() || m_privateKeyFile.empty()) {
+        ACSDK_CRITICAL(LX("startFailed")
+                           .d("reason", "SSL certificate configuration missing")
+                           .d("m_certificateAuthorityFile", m_certificateAuthorityFile)
+                           .d("m_certificateFile", m_certificateFile)
+                           .d("m_privateKeyFile", m_privateKeyFile));
+        return false;
+    }
+#endif
+
+    websocketpp::lib::error_code errorCode;
+
+    m_webSocketServer.start_accept(errorCode);
+    if (errorCode) {
+        ACSDK_ERROR(LX("server::start_accept")
+                        .d("errorCode", errorCode.value())
+                        .d("errorCategory", errorCode.category().name()));
+        return false;
+    }
+
+    auto endpoint = m_webSocketServer.get_local_endpoint(errorCode);
+    if (errorCode) {
+        ACSDK_ERROR(LX("server::get_local_endpoint")
+                        .d("errorCode", errorCode.value())
+                        .d("errorCategory", errorCode.category().name()));
+        return false;
+    }
+
+    ACSDK_INFO(LX("Listening for websocket connections").d("interface", endpoint.address()).d("port", endpoint.port()));
+
+    m_webSocketServer.run();
+
+    return true;
+}
+
+void WebSocketServer::stop() {
+    websocketpp::lib::error_code errorCode;
+    m_webSocketServer.stop_listening(errorCode);
+    if (errorCode) {
+        ACSDK_ERROR(LX("server::stop_listening")
+                        .d("errorCode", errorCode.value())
+                        .d("errorCategory", errorCode.category().name()));
+    }
+
+    m_webSocketServer.close(m_connection, websocketpp::close::status::going_away, "shutting down", errorCode);
+    if (errorCode) {
+        ACSDK_ERROR(
+            LX("server::close").d("errorCode", errorCode.value()).d("errorCategory", errorCode.category().name()));
+    }
+
+    m_connection.reset();
+}
+
+void WebSocketServer::writeMessage(const std::string& payload) {
+    websocketpp::lib::error_code errorCode;
+    ACSDK_DEBUG9(LX("writeMessageBegin"));
+
+    m_webSocketServer.send(m_connection, payload, websocketpp::frame::opcode::text, errorCode);
+    if (errorCode) {
+        ACSDK_ERROR(
+            LX("server::send").d("errorCode", errorCode.value()).d("errorCategory", errorCode.category().name()));
+    }
+
+    ACSDK_DEBUG9(LX("writeMessageComplete"));
+}
+
+void WebSocketServer::onConnectionOpen(connection_hdl connectionHdl) {
+    m_connection = connectionHdl;
+
+    websocketpp::lib::error_code errorCode;
+    auto client = m_webSocketServer.get_con_from_hdl(connectionHdl, errorCode);
+    if (errorCode) {
+        ACSDK_ERROR(
+            LX("onConnectionOpen").d("errorCode", errorCode.value()).d("errorCategory", errorCode.category().name()));
+        return;
+    }
+    ACSDK_INFO(LX("onConnectionOpen").sensitive("remoteHost", client->get_remote_endpoint()));
+
+    m_observer->onConnectionOpened();
+}
+
+bool WebSocketServer::isReady() {
+    return !m_connection.expired();
+}
+
+void WebSocketServer::setObserver(const std::shared_ptr<MessagingServerObserverInterface>& observer) {
+    m_observer = observer;
+}
+
+void WebSocketServer::onConnectionClose(connection_hdl connectionHdl) {
+    m_connection.reset();
+
+    ACSDK_INFO(LX("onConnectionClose"));
+
+    m_observer->onConnectionClosed();
+}
+
+void WebSocketServer::onMessage(connection_hdl connectionHdl, server::message_ptr messagePtr) {
+    if (m_messageListener) {
+        m_messageListener->onMessage(messagePtr->get_payload());
+    } else {
+        ACSDK_WARN(LX("onMessageFailed")
+                       .d("reason", "messageListener is null")
+                       .sensitive("message:", messagePtr->get_payload()));
+    }
+}
+
+#ifdef ENABLE_WEBSOCKET_SSL
+std::shared_ptr<asio::ssl::context> WebSocketServer::onTlsInit() {
+    auto ctx = std::make_shared<asio::ssl::context>(asio::ssl::context::sslv23);
+    asio::error_code errorCode;
+
+    // Use do-while(false) to be able to break from it in case if error happened to not swallow it with the next one
+    // No explicit check required as connection will preserve error happened and also fail on incomplete configuration.
+    do {
+        ctx->set_options(
+            asio::ssl::context::default_workarounds | asio::ssl::context::no_sslv2 | asio::ssl::context::no_sslv3 |
+                asio::ssl::context::no_tlsv1 | asio::ssl::context::no_tlsv1_1 | asio::ssl::context::single_dh_use,
+            errorCode);
+        if (errorCode) {
+            ACSDK_ERROR(LX("onTlsInit::set_options")
+                            .d("errorCode", errorCode.value())
+                            .d("errorCategory", errorCode.category().name()));
+            break;
+        }
+
+        ctx->load_verify_file(m_certificateAuthorityFile, errorCode);
+        if (errorCode) {
+            ACSDK_ERROR(LX("onTlsInit::load_verify_file")
+                            .d("errorCode", errorCode.value())
+                            .d("errorCategory", errorCode.category().name()));
+            break;
+        }
+
+        ctx->use_certificate_chain_file(m_certificateFile, errorCode);
+        if (errorCode) {
+            ACSDK_ERROR(LX("onTlsInit::use_certificate_chain_file")
+                            .d("errorCode", errorCode.value())
+                            .d("errorCategory", errorCode.category().name()));
+            break;
+        }
+
+        ctx->use_private_key_file(m_privateKeyFile, asio::ssl::context::pem, errorCode);
+        if (errorCode) {
+            ACSDK_ERROR(LX("onTlsInit::use_private_key_file")
+                            .d("errorCode", errorCode.value())
+                            .d("errorCategory", errorCode.category().name()));
+            break;
+        }
+
+        ctx->set_verify_mode(
+            asio::ssl::context::verify_peer | asio::ssl::context::verify_fail_if_no_peer_cert, errorCode);
+        if (errorCode) {
+            ACSDK_ERROR(LX("onTlsInit::set_verify_mode")
+                            .d("errorCode", errorCode.value())
+                            .d("errorCategory", errorCode.category().name()));
+            break;
+        }
+    } while (false);
+
+    return ctx;
+}
+#endif  // ENABLE_WEBSOCKET_SSL
+
+bool WebSocketServer::onValidate(connection_hdl connectionHdl) {
+    // As we currently don't support more than one connection in general and in GUIClient in particular reject all
+    // connections if we already have one.
+    bool result = m_connection.expired();
+    if (!result) {
+        ACSDK_WARN(LX("onValidate").m("connection already open"));
+        asio::error_code errorCode;
+        auto conn = m_webSocketServer.get_con_from_hdl(connectionHdl, errorCode);
+        if (!errorCode) {
+            conn->set_status(websocketpp::http::status_code::conflict);
+        }
+    }
+    return result;
+}
+
+}  // namespace communication
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/CMakeLists.txt b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/CMakeLists.txt
new file mode 100644
index 0000000000..09c03dd2f4
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+project(LibIPCServerSampleApp LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+include(${AVS_CMAKE_BUILD}/cmake/PrepareInstall.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLDocumentSession.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLDocumentSession.h
new file mode 100644
index 0000000000..5cabee709c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLDocumentSession.h
@@ -0,0 +1,257 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLDOCUMENTSESSION_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLDOCUMENTSESSION_H_
+
+#include <chrono>
+#include <string>
+#include <unordered_set>
+
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLDocumentSessionInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLTimeoutType.h>
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationOptions.h>
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationSession.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationObserverInterface.h>
+#include "IPCServerSampleApp/AlexaPresentation/APLViewhostInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+class APLDocumentSession
+        : public aplCapabilityCommonInterfaces::APLDocumentSessionInterface
+        , public presentationOrchestratorInterfaces::PresentationObserverInterface
+        , public APLViewhostObserverInterface
+        , public std::enable_shared_from_this<APLDocumentSession> {
+public:
+    /**
+     * Constructor
+     * @param document APL document for this session.
+     * @param data APL data for this session.
+     * @param supportedViewPorts Supported viewports for this session.
+     * @param presentationSession Presentation session for this session.
+     * @param presentationOptions Presentation options for this session.
+     * @param observer Observer of this document session.
+     * @param viewhost Instance of the viewhost on which the document session will be rendered.
+     * @param hasPresentationAssociation Boolean defining whether session has associated presentation.
+     */
+    APLDocumentSession(
+        const std::string& document,
+        const std::string& data,
+        const std::string& supportedViewPorts,
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+        const aplCapabilityCommonInterfaces::PresentationOptions& presentationOptions,
+        std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::APLDocumentObserverInterface> observer,
+        APLViewhostInterfacePtr viewhost,
+        bool hasPresentationAssociation);
+
+    void renderDocument(
+        const std::string& document,
+        const std::string& data,
+        const alexaClientSDK::aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+        const alexaClientSDK::aplCapabilityCommonInterfaces::PresentationOptions& presentationOptions);
+
+    void updateTimeoutType(const aplCapabilityCommonInterfaces::APLTimeoutType& timeoutType);
+
+    /// @name APLDocumentSessionInterface Functions
+    /// {
+    void clearDocument() override;
+    void executeCommands(const std::string& commands) override;
+    void dataSourceUpdate(const std::string& sourceType, const std::string& payload) override;
+    void interruptCommandSequence() override;
+    void provideDocumentContext(const unsigned int stateRequestToken) override;
+    void requestForeground() override;
+    void stopTimeout() override;
+    void resetTimeout() override;
+    void updateLifespan(presentationOrchestratorInterfaces::PresentationLifespan lifespan) override;
+    void updateTimeout(std::chrono::milliseconds timeout) override;
+    std::string getToken() const override;
+    bool isForegroundFocused() override;
+    /// }
+
+    /// @name PresentationObserverInterface functions
+    /// @{
+    void onPresentationAvailable(
+        presentationOrchestratorInterfaces::PresentationRequestToken id,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationInterface> presentation) override;
+    void onPresentationStateChanged(
+        presentationOrchestratorInterfaces::PresentationRequestToken id,
+        presentationOrchestratorInterfaces::PresentationState newState) override;
+    bool onNavigateBack(presentationOrchestratorInterfaces::PresentationRequestToken id) override;
+    /// @}
+
+    /// @name APLViewhostObserverInterface functions
+    /// @{
+    void onCommandExecutionComplete(
+        const std::string& token,
+        APLClient::AplCommandExecutionEvent event,
+        const std::string& message) override;
+    void onRenderDocumentComplete(
+        const std::string& token,
+        bool result,
+        const std::string& error,
+        const std::chrono::steady_clock::time_point& timestamp) override;
+    void onSendEvent(
+        const std::string& token,
+        const std::string& arguments,
+        const std::string& components,
+        const std::string& source) override;
+    void onVisualContextAvailable(
+        const unsigned int requestToken,
+        const std::string& token,
+        const std::string& version,
+        const std::string& visualContext,
+        const std::string& datasourceContext) override;
+    void onDataSourceUpdateComplete(const std::string& token, bool result, const std::string& error) override;
+    void onDataSourceFetch(const std::string& token, const std::string& dataSourceType, const std::string& payload)
+        override;
+    void onRuntimeError(const std::string& token, const std::string& payload) override;
+    void onDocumentFinished(const std::string& token) override;
+    void onOpenURL(const std::string& token, const std::string& url) override;
+    void onDocumentCleared(const std::string& token) override;
+    void onSetDocumentIdleTimeout(const std::string& token, const std::chrono::milliseconds& timeout) override;
+    /// @}
+
+    /**
+     * Inits the first render of the session
+     */
+    void firstRender();
+
+    /**
+     * Helper function which can be used to convert a @c APLDocumentSessionInterface to an @c APLDocumentSession
+     * @param aplDocumentSessionInterface The interface to try to convert
+     * @return A pointer to the APLDocumentSession, or nullptr if @c aplDocumentSessionInterface does not represent an
+     * @c APLDocumentSession
+     */
+    static std::shared_ptr<APLDocumentSession> getDocumentSessionFromInterface(
+        const std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface>& aplDocumentSessionInterface);
+
+private:
+    /**
+     * This class wraps the APLDocumentSession to allow this implementation to comply with the
+     * APLDocumentObserverInterface
+     */
+    class APLDocumentSessionWrapper : public aplCapabilityCommonInterfaces::APLDocumentSessionInterface {
+    public:
+        /**
+         * Constructor
+         * @param documentSession Pointer to the document session
+         */
+        APLDocumentSessionWrapper(std::shared_ptr<APLDocumentSession> documentSession);
+
+        /// @name APLDocumentSessionInterface Functions
+        /// {
+        void clearDocument() override;
+        void executeCommands(const std::string& commands) override;
+        void dataSourceUpdate(const std::string& sourceType, const std::string& payload) override;
+        void interruptCommandSequence() override;
+        void provideDocumentContext(const unsigned int stateRequestToken) override;
+        void requestForeground() override;
+        void stopTimeout() override;
+        void resetTimeout() override;
+        void updateLifespan(presentationOrchestratorInterfaces::PresentationLifespan lifespan) override;
+        void updateTimeout(std::chrono::milliseconds timeout) override;
+        std::string getToken() const override;
+        bool isForegroundFocused() override;
+        /// }
+
+        /**
+         * Conversion operator to obtain the underlying document session
+         * @return The underlying document session
+         */
+        operator std::shared_ptr<APLDocumentSession> const();
+
+    private:
+        /// The document session
+        std::shared_ptr<APLDocumentSession> m_documentSession;
+    };
+
+    /**
+     * Renders a document, must only be executed from inside the executor thread
+     * @param firstRender Whether this is the first time this DocumentSession is rendering
+     * @return true if the render request was made to the viewhost
+     */
+    bool executeRenderDocument(bool firstRender = false);
+
+    /**
+     * Clears the currently rendering document, must only be executed from inside the executor thread
+     * @param forceClear Whether the presentation state check should be skipped
+     */
+    void executeClearDocument(bool forceClear = false);
+
+    /**
+     * Checks if this document session is still associated with a valid presentation
+     * @return true if document session is still active
+     */
+    bool executeIsPresentationActive() const;
+
+    /**
+     * Checks if this document session is still associated with a presentation that is valid and foregrounded.
+     * @return true if document session is in foreground.
+     */
+    bool executeIsPresentationForegrounded() const;
+
+    /**
+     * Checks if this APLDocumentSession is aware of this APL token
+     * @param token The APL token to check
+     * @return true if the token is handled by this document session, false otherwise
+     */
+    bool canHandleToken(const std::string& token);
+
+    /// A weak pointer to the APL Client/Viewhost.
+    std::weak_ptr<APLViewhostInterface> m_viewhost;
+
+    /// Indicates if this document session has an association with a presentation.
+    bool m_hasPresentationAssociation;
+
+    /// Pointer to associated presentation
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationInterface> m_presentation;
+
+    /// The current presentation state
+    presentationOrchestratorInterfaces::PresentationState m_state;
+
+    /// The last rendered APL document
+    std::string m_document;
+
+    /// The APL document data
+    std::string m_data;
+
+    /// The presentation session for this APLDocumentSession as provided during construction or renderDocument
+    aplCapabilityCommonInterfaces::PresentationSession m_presentationSession;
+
+    /// The presentation options for this APLDocumentSession as provided during construction or renderDocument
+    aplCapabilityCommonInterfaces::PresentationOptions m_presentationOptions;
+
+    /// The observer for this APLDocumentSession
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentObserverInterface> m_observer;
+
+    /// The set of tokens associated with this APLDocumentSession
+    std::unordered_set<std::string> m_tokens;
+
+    /// A string containing the json value of supported viewports.
+    std::string m_supportedViewports;
+
+    /// Whether this document session has completed rendering
+    bool m_renderComplete;
+
+    /// An internal executor that performs execution of callable objects passed to it sequentially but asynchronously.
+    avsCommon::utils::threading::Executor m_executor;
+};
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLDOCUMENTSESSION_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLDocumentSessionManager.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLDocumentSessionManager.h
new file mode 100644
index 0000000000..549621c9e2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLDocumentSessionManager.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLDOCUMENTSESSIONMANAGER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLDOCUMENTSESSIONMANAGER_H_
+
+#include <unordered_map>
+
+#include "IPCServerSampleApp/AlexaPresentation/APLDocumentSessionManagerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+class APLDocumentSessionManager : public APLDocumentSessionManagerInterface {
+public:
+    /**
+     * Create an instance of @c APLDocumentSessionManager
+     * @return pointer to @c APLDocumentSessionManager
+     */
+    static std::unique_ptr<APLDocumentSessionManager> create();
+
+    /// @c APLDocumentSessionManagerInterface Functions
+    /// {
+    void addDocumentSession(
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+        const std::string& token,
+        std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface> session) override;
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface> getDocumentSessionByPresentationSession(
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSessionId) override;
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface> getDocumentSessionByToken(
+        const std::string& token) override;
+    void clearDocumentSession(const aplCapabilityCommonInterfaces::PresentationSession& presentationSession) override;
+    void invokeFunctionPerDocumentSession(
+        std::function<void(const std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface>&)> func)
+        override;
+    void associateTokenWithPresentationSession(
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+        const std::string& token) override;
+    /// }
+
+private:
+    /**
+     * Constructor
+     */
+    APLDocumentSessionManager();
+
+    /**
+     * Check if session exists for a token or not
+     *
+     * @param token token of document
+     * @return shared_ptr to the session
+     */
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface> findSessionByTokenLocked(
+        const std::string& token);
+
+    /**
+     * Generates an ID from the presentation session
+     * @param presentationSession The presentation session
+     * @return A string identifying this presentationSession
+     */
+    std::string generatePresentationId(
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession) const;
+
+    /// mutex for session map
+    std::mutex m_mutex;
+
+    /// map from token to session id
+    std::unordered_map<std::string, std::string> m_tokenToPresentationSessionId;
+
+    /// map from session id to tokens
+    std::unordered_map<std::string, std::set<std::string>> m_presentationSessionIdToToken;
+
+    /// map of presentation session id to active sessions
+    std::unordered_map<std::string, std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface>>
+        m_activeSessions;
+};
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLDOCUMENTSESSIONMANAGER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLDocumentSessionManagerInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLDocumentSessionManagerInterface.h
new file mode 100644
index 0000000000..d47d0180a9
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLDocumentSessionManagerInterface.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLDOCUMENTSESSIONMANAGERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLDOCUMENTSESSIONMANAGERINTERFACE_H_
+
+#include <functional>
+#include <memory>
+#include <string>
+
+#include <acsdk/APLCapabilityCommonInterfaces/APLDocumentSessionInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * A @c APLDocumentSessionManagerInterface allows for tracking the active APL Document Sessions
+ */
+class APLDocumentSessionManagerInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~APLDocumentSessionManagerInterface() = default;
+
+    /**
+     * Add an active session
+     *
+     * @param presentationSession presentation session for this document session
+     * @param token token of document session
+     * @param session the document session object
+     */
+    virtual void addDocumentSession(
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSessionId,
+        const std::string& token,
+        std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface> session) = 0;
+
+    /**
+     * Get the Session using the Presentation Session
+     *
+     * @param presentationSession The presentation session
+     * @return shared_ptr to the @c APLDocumentSessionInterface associated with this presentationSession, or nullptr if
+     * none exists
+     */
+    virtual std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface>
+    getDocumentSessionByPresentationSession(
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession) = 0;
+
+    /**
+     * Get the Session using the APL token
+     *
+     * @param token token of document session
+     * @return shared_ptr to the @c APLDocumentSessionInterface associated with this token, or nullptr if none exists
+     */
+    virtual std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface> getDocumentSessionByToken(
+        const std::string& token) = 0;
+
+    /**
+     * Clear an active document session
+     *
+     * @param presentationSession presentation session of document session to clear
+     */
+    virtual void clearDocumentSession(
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession) = 0;
+
+    /**
+     * Invoke a function on each document session tracked by the session manager
+     *
+     * @param func function to be executed with the document session
+     */
+    virtual void invokeFunctionPerDocumentSession(
+        std::function<void(const std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface>&)>
+            func) = 0;
+
+    /**
+     * Associates a token with an existing presentation session
+     * @param presentationSession The presentation session, must have already been added with @c addDocumentSession
+     * @param token The document token
+     */
+    virtual void associateTokenWithPresentationSession(
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+        const std::string& token) = 0;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLDOCUMENTSESSIONMANAGERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLPayloadParser.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLPayloadParser.h
new file mode 100644
index 0000000000..807da29621
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLPayloadParser.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLPAYLOADPARSER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLPAYLOADPARSER_H_
+
+#include <string>
+
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/document.h>
+
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLTimeoutType.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+class APLPayloadParser {
+public:
+    /**
+     * Extract the document from APL payload.
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @return string containing the json value of document
+     */
+    static std::string extractDocument(const rapidjson::Document& jsonPayload);
+
+    /**
+     * Extract the datasourse from APL payload.
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @return string containing the json value of datasource
+     */
+    static std::string extractDatasources(const rapidjson::Document& jsonPayload);
+
+    /**
+     * Extract the supported viewports from APL payload.
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @return string containing the json value of supported viewports.
+     */
+    static std::string extractSupportedViewports(const rapidjson::Document& jsonPayload);
+
+    /**
+     * Extract the timeout type from APL payload.
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @return TimeoutType of the APL payload.
+     */
+    static aplCapabilityCommonInterfaces::APLTimeoutType extractTimeoutType(const rapidjson::Document& jsonPayload);
+
+    /**
+     * Extract the presentation session instance from APL payload.
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @return Instance of @c PresentationSession object.
+     */
+    static const aplCapabilityCommonInterfaces::PresentationSession extractPresentationSession(
+        const rapidjson::Document& jsonPayload);
+};
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLPAYLOADPARSER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLRuntimeInterfaceImpl.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLRuntimeInterfaceImpl.h
new file mode 100644
index 0000000000..004973173b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLRuntimeInterfaceImpl.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLRUNTIMEINTERFACEIMPL_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLRUNTIMEINTERFACEIMPL_H_
+
+#include <mutex>
+
+#include <acsdk/APLCapabilityCommonInterfaces/APLDocumentSessionInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLRuntimeInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorClientInterface.h>
+#include "IPCServerSampleApp/AlexaPresentation/APLViewhostInterface.h"
+#include "IPCServerSampleApp/GUI/GUIClientInterface.h"
+
+#include "IPCServerSampleApp/AlexaPresentation/APLDocumentSession.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+class APLRuntimeInterfaceImpl : public aplCapabilityCommonInterfaces::APLRuntimeInterface {
+public:
+    /**
+     * Destructor
+     */
+    ~APLRuntimeInterfaceImpl();
+
+    /**
+     * Create a new APLRuntimeInterfaceImpl object
+     *
+     * @param runtime @c IAPLRuntime instance
+     * @return shared_ptr to APLRuntimeInterfaceImpl
+     */
+    static std::shared_ptr<APLRuntimeInterfaceImpl> create(const APLViewhostInterfacePtr& runtime);
+
+    /// @name APLRuntimeInterface functions
+    /// @{
+    void renderDocument(
+        const std::string& document,
+        const std::string& data,
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+        const aplCapabilityCommonInterfaces::PresentationOptions& presentationOptions,
+        std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentObserverInterface> observer) override;
+
+    std::string getMaxAPLVersion() const override;
+    /// @}
+
+    void setDefaultWindowId(const std::string& windowId);
+
+    void setPresentationOrchestrator(
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface> poClient);
+
+    std::shared_ptr<APLDocumentSession> createDocumentSession(
+        const std::string& document,
+        const std::string& data,
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+        const aplCapabilityCommonInterfaces::PresentationOptions& presentationOptions,
+        std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentObserverInterface> observer,
+        bool hasPresentationAssociation);
+
+private:
+    /**
+     * Construct a new APLRuntimeInterfaceImpl object
+     *
+     * @param viewhost @c APLViewhostInterface instance
+     */
+    explicit APLRuntimeInterfaceImpl(APLViewhostInterfacePtr viewhost);
+
+    /// Pointer to the APL Client/Viewhost.
+    APLViewhostInterfacePtr m_viewhost;
+
+    /// Pointer to the presentation orchestrator client.
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface>
+        m_presentationOrchestratorClient;
+
+    /// Id of the window used by default to render experiences.
+    std::string m_defaultWindowId;
+
+    /// mutex for guarding members set by different thread.
+    std::mutex m_mutex;
+};
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLRUNTIMEINTERFACEIMPL_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLRuntimePresentationAdapter.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLRuntimePresentationAdapter.h
new file mode 100644
index 0000000000..36740fb35c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLRuntimePresentationAdapter.h
@@ -0,0 +1,351 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLRUNTIMEPRESENTATIONADAPTER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLRUNTIMEPRESENTATIONADAPTER_H_
+
+#include <string>
+
+#include <rapidjson/document.h>
+#include <rapidjson/writer.h>
+
+#include <acsdk/AlexaPresentationInterfaces/AlexaPresentationCapabilityAgentInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/VisualStateProviderInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentObserverInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLDocumentObserverInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLTimeoutType.h>
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationOptions.h>
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationToken.h>
+#include <AVSCommon/AVS/PlayerActivity.h>
+#include <AVSCommon/SDKInterfaces/DialogUXStateObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/GUIActivityEvent.h>
+#include <AVSCommon/SDKInterfaces/GUIActivityEventObserverInterface.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include "IPCServerSampleApp/GUI/GUIActivityEventNotifierInterface.h"
+
+#include "IPCServerSampleApp/AlexaPresentation/APLDocumentSessionManager.h"
+#include "IPCServerSampleApp/AlexaPresentation/APLRuntimeInterfaceImpl.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+class APLRuntimePresentationAdapter
+        : public aplCapabilityCommonInterfaces::APLCapabilityAgentObserverInterface
+        , public avsCommon::sdkInterfaces::DialogUXStateObserverInterface
+        , public avsCommon::sdkInterfaces::GUIActivityEventObserverInterface
+        , public aplCapabilityCommonInterfaces::VisualStateProviderInterface
+        , public aplCapabilityCommonInterfaces::APLDocumentObserverInterface
+        , public std::enable_shared_from_this<APLRuntimePresentationAdapter> {
+public:
+    /**
+     * Create an instance of APL runtime presentation adaptor.
+     * @param runtimeInterface An instance of a APL runtime implementation.
+     * @param activityEventNotifier Notifier to GUI activity events.
+     * @return Instance of APL runtime presentation adaptor if successful, else nullptr.
+     */
+    static std::shared_ptr<APLRuntimePresentationAdapter> create(
+        const std::shared_ptr<APLRuntimeInterfaceImpl>& runtimeInterface,
+        std::shared_ptr<gui::GUIActivityEventNotifierInterface> activityEventNotifier);
+
+    /**
+     * Sets the Alexa Presentation Capability Agent to the @c APLRuntimePresentationAdapter.
+     * @param alexaPresentationCA Instance of the Alexa Presentation Capability Agent.
+     */
+    void setAlexaPresentationCA(
+        std::shared_ptr<alexaPresentationInterfaces::AlexaPresentationCapabilityAgentInterface> alexaPresentationCA);
+
+    /**
+     * Sets the default window id to use for rendering documents that do not provide one.
+     * @param windowId The default window id.
+     */
+    void setDefaultWindowId(const std::string& windowId);
+
+    /**
+     * Returns the APL version implemented by the runtime.
+     * https://developer.amazon.com/en-US/docs/alexa/alexa-presentation-language/apl-latest-version.html
+     * @return apl version.
+     */
+    std::string getAPLRuntimeVersion();
+
+    /// @name AlexaPresentationObserverInterface functions
+    /// @{
+    void onRenderDocument(
+        const std::string& document,
+        const std::string& datasource,
+        const aplCapabilityCommonInterfaces::PresentationToken& token,
+        const std::string& windowId,
+        const aplCapabilityCommonInterfaces::APLTimeoutType timeoutType,
+        const std::string& interfaceName,
+        const std::string& supportedViewports,
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+        const std::chrono::steady_clock::time_point& receiveTime,
+        std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> agent) override;
+
+    void onExecuteCommands(const std::string& sourceType, const aplCapabilityCommonInterfaces::PresentationToken& token)
+        override;
+
+    void onDataSourceUpdate(
+        const std::string& sourceType,
+        const std::string& jsonPayload,
+        const aplCapabilityCommonInterfaces::PresentationToken& token) override;
+
+    void onShowDocument(const aplCapabilityCommonInterfaces::PresentationToken& token) override;
+    /// @}
+
+    /// @name APLDocumentObserverInterface functions
+    /// @{
+    void onAPLDocumentSessionAvailable(
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+        const aplCapabilityCommonInterfaces::PresentationToken& token,
+        std::unique_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface>&& session) override;
+
+    void onCommandExecutionComplete(
+        const aplCapabilityCommonInterfaces::PresentationToken& token,
+        alexaClientSDK::aplCapabilityCommonInterfaces::APLCommandExecutionEvent event,
+        const std::string& error) override;
+
+    void onRenderDocumentComplete(
+        const aplCapabilityCommonInterfaces::PresentationToken& token,
+        bool result,
+        const std::string& error,
+        const std::chrono::steady_clock::time_point& timestamp) override;
+
+    void onSendEvent(const aplCapabilityCommonInterfaces::aplEventPayload::UserEvent& payload) override;
+
+    void onVisualContextAvailable(
+        const avsCommon::sdkInterfaces::ContextRequestToken requestToken,
+        const aplCapabilityCommonInterfaces::aplEventPayload::VisualContext& context) override;
+
+    void onDataSourceUpdateComplete(const std::string& token, bool result, const std::string& error) override;
+
+    void onDataSourceFetch(const aplCapabilityCommonInterfaces::aplEventPayload::DataSourceFetch& payload) override;
+
+    void onRuntimeError(const aplCapabilityCommonInterfaces::aplEventPayload::RuntimeError& payload) override;
+
+    void onDocumentFinished(const std::string& token) override;
+
+    void onActiveDocumentChanged(
+        const aplCapabilityCommonInterfaces::PresentationToken& token,
+        const aplCapabilityCommonInterfaces::PresentationSession& session) override;
+
+    void onSessionEnded(const aplCapabilityCommonInterfaces::PresentationSession& presentationSession) override;
+
+    void onActivityEvent(
+        const aplCapabilityCommonInterfaces::PresentationToken& token,
+        const avsCommon::sdkInterfaces::GUIActivityEvent& event) override;
+    /// @}
+
+    /// @name VisualStateProviderInterface functions
+    /// @{
+    void provideState(
+        const aplCapabilityCommonInterfaces::PresentationToken& token,
+        const avsCommon::sdkInterfaces::ContextRequestToken stateRequestToken) override;
+    /// @}
+
+    /// @name ActivityEventObserverInterface functions
+    /// @{
+    void onGUIActivityEventReceived(
+        const std::string& source,
+        const avsCommon::sdkInterfaces::GUIActivityEvent& activityEvent) override;
+    /// @}
+
+    /// @name DialogUXStateObserverInterface Functions
+    /// @{
+    void onDialogUXStateChanged(
+        avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState newState) override;
+    /// @}
+
+    void onPlayerActivityChanged(avsCommon::avs::PlayerActivity state);
+
+    /**
+     * TEST ONLY
+     */
+    void setExecutor(std::shared_ptr<avsCommon::utils::threading::Executor>);
+
+    /**
+     * Used to request the rendering af an APL document that has no presentation lifecycle association.
+     * Once called, the client should render the document based on the
+     * APL specification in the payload in structured JSON format.
+     *
+     * @note The payload may contain customer sensitive information and should be used with utmost care.
+     * Failure to do so may result in exposing or mishandling of customer data.
+     *
+     * @param jsonPayload A JSON payload that maps to the schema of the Alexa.Presentation.APL.RenderDocument directive
+     * and follows the APL specification.
+     * @param token The APL presentation token associated with this payload.
+     * @param windowId The target windowId.
+     * @param receiveTime The time at which the document request was initiated, for more accurate telemetry.
+     * @param interface The interface (namespace) which is associated with this document.
+     * @param agent Pointer to the @c AlexaPresentationCAInterface requesting the render.
+     */
+    void renderDocumentWithoutPresentation(
+        const std::string& jsonPayload,
+        const std::string& token,
+        const std::string& windowId,
+        const std::chrono::steady_clock::time_point& receiveTime,
+        const std::string& interface,
+        std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> agent);
+
+    /**
+     * Clears the associated document from the tracked sessions.
+     * @param token The toke for the APL document.
+     */
+    void clearDocument(const std::string& token);
+
+private:
+    APLRuntimePresentationAdapter(
+        const std::shared_ptr<APLRuntimeInterfaceImpl>& runtimeInterface,
+        std::unique_ptr<APLDocumentSessionManager> sessionManager,
+        std::shared_ptr<gui::GUIActivityEventNotifierInterface> activityEventNotifier);
+
+    void executeRenderDocument(
+        const std::string& document,
+        const std::string& datasource,
+        const aplCapabilityCommonInterfaces::PresentationToken& token,
+        const std::string& windowId,
+        const aplCapabilityCommonInterfaces::APLTimeoutType timeoutType,
+        const std::string& interfaceName,
+        const std::string& supportedViewports,
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+        const std::chrono::steady_clock::time_point& receiveTime,
+        std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> agent,
+        bool trackAsPresentation);
+    void executeClearDocument(const std::string& token);
+    void executeExecuteCommands(
+        const std::string& jsonPayload,
+        const aplCapabilityCommonInterfaces::PresentationToken& token);
+    void executeDataSourceUpdate(
+        const std::string& sourceType,
+        const std::string& jsonPayload,
+        const std::string& token);
+    void executeRequestForeground(const std::string& token);
+    void executeOnCommandExecutionComplete(
+        const std::string& token,
+        aplCapabilityCommonInterfaces::APLCommandExecutionEvent event,
+        const std::string& message);
+    void executeOnRenderDocumentComplete(
+        const std::string& token,
+        bool result,
+        const std::string& error,
+        const std::chrono::steady_clock::time_point& timestamp);
+    void executeOnSendEvent(const aplCapabilityCommonInterfaces::aplEventPayload::UserEvent& payload);
+    void executeOnVisualContextAvailable(
+        const avsCommon::sdkInterfaces::ContextRequestToken requestToken,
+        const aplCapabilityCommonInterfaces::aplEventPayload::VisualContext& context);
+    void executeOnDataSourceUpdateComplete(const std::string& token, bool result, const std::string& error);
+    void executeOnDataSourceFetch(
+        const aplCapabilityCommonInterfaces::aplEventPayload::DataSourceFetch& dataSourceFetch);
+    void executeOnRuntimeError(const aplCapabilityCommonInterfaces::aplEventPayload::RuntimeError& runtimeError);
+    void executeOnDocumentFinished(const std::string& token);
+    void executeProvideState(const std::string& aplToken, const unsigned int stateRequestToken);
+    void executeOnPlayerActivityChanged(avsCommon::avs::PlayerActivity state);
+
+    /**
+     * Tracker for PresentationAgents to Document associations.
+     *
+     * Because tokens are not guaranteed to be unique for documents, this tracker helps count the number of
+     * documents with the given token that are associated with the agent.
+     */
+    struct PresentationAgentDocumentTracker {
+        /**
+         * Constructor
+         *
+         * @param token - The token for the document being mapped to the agent.
+         * @param presentationAgent - The @c AlexaPresentationCAInterface presentation agent being tracked.
+         */
+        explicit PresentationAgentDocumentTracker(
+            std::string token,
+            std::weak_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> presentationAgent,
+            bool trackAsPresentation) :
+                token{std::move(token)},
+                presentationAgent{std::move(presentationAgent)} {
+            handleOnPresentationDismissed = trackAsPresentation;
+            docCount = 1;
+        };
+
+        /// The token for the agent mapping.
+        std::string token;
+
+        /// The presentation agent being tracked.
+        std::weak_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> presentationAgent;
+
+        /// The number of documents with the same token associated with the agent.
+        int docCount;
+
+        /// True if the tracker manages presentations that should be reported to AVS when dismissed.
+        bool handleOnPresentationDismissed;
+    };
+
+    /**
+     * An internal function to retrieve an @c PresentationAgentDocumentTracker from the m_presentationAgentTrackers map
+     *
+     * @param token - The token identifying the agent tracker.
+     */
+    std::shared_ptr<PresentationAgentDocumentTracker> executeGetPresentationAgentTrackerFromToken(
+        const std::string& token);
+
+    /**
+     * An internal function to retrieve an @c AlexaPresentationCAInterface from the m_presentationAgentTrackers map
+     *
+     * @param token - The token identifying the agent.
+     */
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> executeGetPresentationAgentFromToken(
+        const std::string& token);
+
+    /**
+     * An internal function to remove the token association from the m_presentationAgentTrackers map.
+     * Will clean up the agent tracker if it's the last token<>document instance for the agent mapping.
+     *
+     * @param token - The token identifying the agent.
+     */
+    void executeRemoveTokenFromPresentationAgentTracker(const std::string& token);
+
+    /**
+     * Update TimeoutType for an APL Document session
+     * @param aplToken Token for APL Document
+     * @param timeoutType new @c TimeoutType
+     */
+    void executeUpdateTimeoutType(
+        const std::string& aplToken,
+        const aplCapabilityCommonInterfaces::APLTimeoutType& timeoutType);
+
+    const std::shared_ptr<APLRuntimeInterfaceImpl> m_runtimeInterface;
+
+    std::unique_ptr<APLDocumentSessionManager> m_sessionManager;
+
+    std::shared_ptr<gui::GUIActivityEventNotifierInterface> m_activityEventNotifier;
+
+    /// Whether Alexa is speaking or listening.
+    bool m_isSpeakingOrListening;
+
+    /// Reference to the Alexa Presentation Capability Agent.
+    std::shared_ptr<alexaPresentationInterfaces::AlexaPresentationCapabilityAgentInterface> m_alexaPresentationCA;
+
+    /// The map of active tokens to @c PresentationAgentDocumentTrackers.
+    std::unordered_map<std::string, std::shared_ptr<PresentationAgentDocumentTracker>> m_presentationAgentTrackers;
+
+    /// A count of the number of presentation trackers per APL Capability Agent
+    std::unordered_map<std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface>, unsigned int>
+        m_presentationTrackersPerCA;
+
+    /// Executor to perform tasks asynchronously.
+    std::shared_ptr<avsCommon::utils::threading::Executor> m_executor;
+};
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLRUNTIMEPRESENTATIONADAPTER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLViewhostInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLViewhostInterface.h
new file mode 100644
index 0000000000..a293247007
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLViewhostInterface.h
@@ -0,0 +1,157 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLVIEWHOSTINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLVIEWHOSTINTERFACE_H_
+
+#include <chrono>
+#include <memory>
+#include <rapidjson/document.h>
+#include <string>
+
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationSession.h>
+#include <acsdk/APLCapabilityCommonInterfaces/VisualStateProviderInterface.h>
+#include <AVSCommon/SDKInterfaces/MediaPropertiesInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+#include "APLViewhostObserverInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * This interface is intended to define a well defined surface for APLCore / APLViewhost integrations.
+ */
+class APLViewhostInterface : public aplCapabilityCommonInterfaces::VisualStateProviderInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~APLViewhostInterface() = default;
+
+    /**
+     * Adds a viewhost observer
+     * @param observer the observer to register
+     */
+    virtual void addObserver(const APLViewhostObserverInterfacePtr& observer) = 0;
+
+    /**
+     * Removes a viewhost observer.
+     * @param observer the observer to unregister
+     */
+    virtual void removeObserver(const APLViewhostObserverInterfacePtr& observer) = 0;
+
+    /**
+     * Render an APL document with extra associated data payload
+     * @param presentationSession The presentation session associated with this renderDocument request
+     * @param document JSON string containing APL document
+     * @param data JSON string containing data payload associated with APL document
+     * @param token Presentation token uniquely identifying the document
+     * @param supportedViewports Viewports supported by this document
+     * @param windowId Target windowId to display the document within
+     */
+    virtual void renderDocument(
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+        const std::string& token,
+        const std::string& document,
+        const std::string& datasources,
+        const std::string& supportedViewports,
+        const std::string& windowId) = 0;
+
+    /**
+     * Clear APL document
+     * @deprecated provide an explicit token instead
+     */
+    virtual void clearDocument() {
+        clearDocument("");
+    }
+
+    /**
+     * Clear APL document
+     * @param token token of document to clear
+     */
+    virtual void clearDocument(const std::string& token) {
+        // no-op by default for backwards compatibility
+    }
+
+    /**
+     * Execute commands referenced in APL document
+     * @param document JSON string containing APL command to execute
+     * @param token Presentation token to identify document to execute commands on
+     */
+    virtual void executeCommands(const std::string& commands, const std::string& token) = 0;
+
+    /**
+     * Update the data source payload for a given APL document
+     * @param sourceType APL spec source type for data update
+     * @param data JSON string containing new data payload associated with APL document
+     * @param token Presentation token to identify document to update
+     */
+    virtual void dataSourceUpdate(const std::string& sourceType, const std::string& data, const std::string& token) = 0;
+
+    /**
+     * Interrupt active command sequence
+     * @deprecated provide an explicit token instead
+     */
+    virtual void interruptCommandSequence() {
+        interruptCommandSequence("");
+    }
+
+    /**
+     * Interrupt active command sequence
+     * @param token token of document to interrupt
+     */
+    virtual void interruptCommandSequence(const std::string& token) {
+        // no-op by default for backwards compatibility
+    }
+
+    /**
+     * Used for metrics purposes, notifies the APLRuntime of the time when the directive was received
+     * @param token token of the document
+     * @param receiveTime The receive time
+     */
+    virtual void onRenderDirectiveReceived(
+        const std::string& token,
+        const std::chrono::steady_clock::time_point& receiveTime){
+        // no-op by default for compatibility
+    };
+
+    /**
+     * Retrieves the maximum APL version supported by this runtime
+     * @returns the max supported APL version
+     */
+    virtual std::string getMaxAPLVersion() const = 0;
+
+    /**
+     * Sets the metrics recorder to be used by the runtime to record and emit metric events.
+     * @param metricRecorder Shared pointer to the @c MetricRecorderInterface
+     */
+    virtual void setMetricRecorder(
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) = 0;
+
+    /**
+     * Handle back navigation
+     * @param windowId The window ID on which to perform the back action
+     * @return true if the viewhost can handle back, false otherwise
+     */
+    virtual bool handleBack(const std::string& windowId) = 0;
+};
+
+using APLViewhostInterfacePtr = std::shared_ptr<APLViewhostInterface>;
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLVIEWHOSTINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLViewhostObserverInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLViewhostObserverInterface.h
new file mode 100644
index 0000000000..b4d9a141c8
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/APLViewhostObserverInterface.h
@@ -0,0 +1,160 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLVIEWHOSTOBSERVERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLVIEWHOSTOBSERVERINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include <APLClient/AplCommandExecutionEvent.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+/**
+ * Observer interface used for callbacks from the APL Viewhost implementation.
+ */
+class APLViewhostObserverInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~APLViewhostObserverInterface() = default;
+
+    /**
+     * Callback when command execution is complete.
+     * @param token the presentation token corresponding to the document being executed
+     * @param event the command execution event.
+     * @param message the execute command completion message.
+     */
+    virtual void onCommandExecutionComplete(
+        const std::string& token,
+        APLClient::AplCommandExecutionEvent event,
+        const std::string& message) = 0;
+
+    /**
+     * Callback when render document is complete.
+     * @param token the presentation token corresponding to the document being rendered
+     * @param result true if successful, false otherwise
+     * @param timestamp The timestamp at which the document was rendered
+     */
+    virtual void onRenderDocumentComplete(
+        const std::string& token,
+        bool result,
+        const std::string& error,
+        const std::chrono::steady_clock::time_point& timestamp) = 0;
+
+    /**
+     * Callback for send event request
+     * @param token the presentation token corresponding to the document sending the event
+     * @param arguments Arguments array of SendEvent command
+     * @param components Object containing the component of the SendEvent command
+     * @param source Object detailing component which generated the command
+     */
+    virtual void onSendEvent(
+        const std::string& token,
+        const std::string& arguments,
+        const std::string& components,
+        const std::string& source) = 0;
+
+    /**
+     * callback when a new visual context is available
+     * @param requestToken token which was provided with the original visual context request
+     * @param token the presentation token corresponding to the document providing the context.
+     * @param version the version of the UI component on the device.
+     * @param visualContext serialized visual context
+     * @param datasourceContext serialized datasource context
+     */
+    virtual void onVisualContextAvailable(
+        const unsigned int requestToken,
+        const std::string& token,
+        const std::string& version,
+        const std::string& visualContext,
+        const std::string& datasourceContext) {
+        // no-op by default for backwards compatibility
+    }
+
+    /**
+     * Callback when data source update is complete.
+     * @param token the presentation token corresponding to the document being updated
+     * @param result true if successful, false otherwise
+     * @param error error string if available
+     */
+    virtual void onDataSourceUpdateComplete(const std::string& token, bool result, const std::string& error) {
+        // no-op by default for backwards compatibility
+    }
+
+    /**
+     * Callback when document requires a data source update
+     * @param token the presentation token corresponding to the document requiring the update
+     * @param dataSourceType the data source type requiring update
+     * @param payload The payload of the fetch request
+     */
+    virtual void onDataSourceFetch(
+        const std::string& token,
+        const std::string& dataSourceType,
+        const std::string& payload) {
+        // no-op by default for backwards compatibility
+    }
+
+    /**
+     * Callback when document receives a runtime error
+     * @param token the presentation token corresponding to the document encountering the error
+     * @param payload The payload of the error
+     */
+    virtual void onRuntimeError(const std::string& token, const std::string& payload) {
+        // no-op by default for backwards compatibility
+    }
+
+    /**
+     * Callback when document is no longer displayed
+     * @param token the presentation token corresponding to the document encountering the error
+     */
+    virtual void onDocumentFinished(const std::string& token) {
+        // no-op by default for backwards compatibility
+    }
+
+    /**
+     * Callback when an open URL command occurs
+     * @param token the presentation token
+     * @param url the url to open
+     */
+    virtual void onOpenURL(const std::string& token, const std::string& url) {
+        // no-op by default for compatibility
+    }
+
+    /**
+     * Callback when a document has been cleared
+     * @param token the presentation of the cleared document
+     */
+    virtual void onDocumentCleared(const std::string& token) {
+        // no-op by default for compatibility
+    }
+
+    /**
+     * Callback when a document timeout needs to be updated
+     * @param token the presentation token
+     * @param timeout updated timeout value
+     */
+    virtual void onSetDocumentIdleTimeout(const std::string& token, const std::chrono::milliseconds& timeout) = 0;
+};
+
+using APLViewhostObserverInterfacePtr = std::shared_ptr<APLViewhostObserverInterface>;
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLVIEWHOSTOBSERVERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/AplClientBridge.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/AplClientBridge.h
new file mode 100644
index 0000000000..1447eb2bd5
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/AplClientBridge.h
@@ -0,0 +1,459 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLCLIENTBRIDGE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLCLIENTBRIDGE_H_
+
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationSession.h>
+#include <acsdk/Sample/TemplateRuntime/TemplateRuntimePresentationAdapterObserverInterface.h>
+#include <acsdkAudioPlayerInterfaces/AudioPlayerObserverInterface.h>
+#include <acsdkExternalMediaPlayerInterfaces/ExternalMediaPlayerObserverInterface.h>
+
+// Disable warnings from APLClient
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#include <APLClient/AplClientBinding.h>
+#include <APLClient/AplRenderingEvent.h>
+#include <APLClient/AplRenderingEventObserver.h>
+#include <APLClient/Extensions/AplCoreExtensionInterface.h>
+#include <APLClient/Extensions/AudioPlayer/AplAudioPlayerExtension.h>
+#include <APLClient/Extensions/AudioPlayer/AplAudioPlayerExtensionObserverInterface.h>
+#include <APLClient/Extensions/Backstack/AplBackstackExtension.h>
+#include <APLClient/Extensions/Backstack/AplBackstackExtensionObserver.h>
+#pragma GCC diagnostic pop
+#include <AVSCommon/Utils/LibcurlUtils/HTTPContentFetcherFactory.h>
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include <Communication/MessagingServerObserverInterface.h>
+#include "IPCServerSampleApp/AlexaPresentation/APLViewhostInterface.h"
+#include "IPCServerSampleApp/AlexaPresentation/APLViewhostObserverInterface.h"
+#include "IPCServerSampleApp/CachingDownloadManager.h"
+#include "IPCServerSampleApp/GUI/GUIManager.h"
+#include "IPCServerSampleApp/IPC/Components/APLClientHandler.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/APLClientHandlerInterface.h"
+#include "IPCServerSampleApp/IPC/Namespaces/APLClientNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * A struct that helps storing additional parameters for APLClientBridge.
+ */
+struct AplClientBridgeParameter {
+    // Maximum number of concurrent downloads allowed.
+    int maxNumberOfConcurrentDownloads;
+};
+
+class AplClientBridge
+        : public APLClient::AplOptionsInterface
+        , public APLViewhostInterface
+        , public communication::MessagingServerObserverInterface
+        , public acsdkAudioPlayerInterfaces::AudioPlayerObserverInterface
+        , public common::TemplateRuntimePresentationAdapterObserverInterface
+        , public acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerObserverInterface
+        , public APLClient::Extensions::Backstack::AplBackstackExtensionObserverInterface
+        , public APLClient::Extensions::AudioPlayer::AplAudioPlayerExtensionObserverInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public ipc::APLClientHandlerInterface
+        , public std::enable_shared_from_this<AplClientBridge> {
+public:
+    static std::shared_ptr<AplClientBridge> create(
+        std::shared_ptr<CachingDownloadManager> contentDownloadManager,
+        std::shared_ptr<gui::GUIClientInterface> guiClient,
+        AplClientBridgeParameter parameters);
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// @name AplOptionsInterface Functions
+    /// {
+    void sendMessage(const std::string& token, const std::string& payload) override;
+
+    void resetViewhost(const std::string& token) override;
+
+    std::string downloadResource(const std::string& source) override;
+
+    std::chrono::milliseconds getTimezoneOffset() override;
+
+    void onActivityStarted(const std::string& token, const std::string& source) override;
+
+    void onActivityEnded(const std::string& token, const std::string& source) override;
+
+    void onSendEvent(const std::string& token, const std::string& event) override;
+
+    void onCommandExecutionComplete(
+        const std::string& token,
+        APLClient::AplCommandExecutionEvent event,
+        const std::string& message) override;
+
+    void onRenderDocumentComplete(const std::string& token, bool result, const std::string& error) override;
+
+    void onVisualContextAvailable(const std::string& token, unsigned int stateRequestToken, const std::string& context)
+        override;
+
+    void onSetDocumentIdleTimeout(const std::string& token, const std::chrono::milliseconds& timeout) override;
+
+    void onRenderingEvent(const std::string& token, APLClient::AplRenderingEvent event) override;
+
+    void onFinish(const std::string& token) override;
+
+    void onDataSourceFetchRequestEvent(const std::string& token, const std::string& type, const std::string& payload)
+        override;
+
+    void onRuntimeErrorEvent(const std::string& token, const std::string& payload) override;
+
+    void onExtensionEvent(
+        const std::string& aplToken,
+        const std::string& uri,
+        const std::string& name,
+        const std::string& source,
+        const std::string& params,
+        unsigned int event,
+        std::shared_ptr<APLClient::Extensions::AplCoreExtensionEventCallbackResultInterface> resultCallback) override;
+
+    void logMessage(APLClient::LogLevel level, const std::string& source, const std::string& message) override;
+
+    int getMaxNumberOfConcurrentDownloads() override;
+
+    /// }
+
+    /// @name MessagingServerObserverInterface Functions
+    /// @{
+    void onConnectionOpened() override;
+
+    void onConnectionClosed() override;
+    /// @}
+
+    /// @name AudioPlayerObserverInterface methods
+    /// @{
+    void onPlayerActivityChanged(avsCommon::avs::PlayerActivity state, const Context& context) override;
+    /// }
+
+    /// @name TemplateRuntimePresentationAdapterObserverInterface Functions
+    /// @{
+    void renderTemplateCard(const std::string& jsonPayload) override;
+    void renderPlayerInfoCard(
+        const std::string& jsonPayload,
+        templateRuntimeInterfaces::TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) override;
+    void clearRenderTemplateCard() override;
+    void clearPlayerInfoCard() override;
+    /// @}
+
+    /// @name ExternalMediaPlayerObserverInterface methods
+    /// @{
+    void onLoginStateProvided(
+        const std::string& playerId,
+        acsdkExternalMediaPlayerInterfaces::ObservableSessionProperties sessionStateProperties) override;
+
+    void onPlaybackStateProvided(
+        const std::string& playerId,
+        acsdkExternalMediaPlayerInterfaces::ObservablePlaybackStateProperties playbackStateProperties) override;
+    /// }
+
+    /// @name AplBackstackExtensionObserverInterface Functions
+    /// @{
+    void onRestoreDocumentState(std::shared_ptr<APLClient::AplDocumentState> documentState) override;
+    /// @}
+
+    /// @name AplAudioPlayerExtensionObserverInterface methods
+    /// @{
+    void onAudioPlayerPlay() override;
+
+    void onAudioPlayerPause() override;
+
+    void onAudioPlayerNext() override;
+
+    void onAudioPlayerPrevious() override;
+
+    void onAudioPlayerSeekToPosition(int offsetInMilliseconds) override;
+
+    void onAudioPlayerToggle(const std::string& name, bool checked) override;
+
+    void onAudioPlayerSkipForward() override;
+
+    void onAudioPlayerSkipBackward() override;
+
+    void onAudioPlayerLyricDataFlushed(
+        const std::string& token,
+        long durationInMilliseconds,
+        const std::string& lyricData) override;
+    /// }
+
+    void onUpdateTimer();
+
+    void setGUIManager(std::shared_ptr<gui::GUIServerInterface> guiManager);
+
+    /// @name APLViewhostInterface functions
+    /// @{
+    void renderDocument(
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+        const std::string& token,
+        const std::string& document,
+        const std::string& datasources,
+        const std::string& supportedViewports,
+        const std::string& windowId) override;
+
+    void clearDocument(const std::string& token) override;
+
+    void executeCommands(const std::string& jsonPayload, const std::string& token) override;
+
+    void interruptCommandSequence(const std::string& token) override;
+
+    void dataSourceUpdate(const std::string& sourceType, const std::string& jsonPayload, const std::string& token)
+        override;
+
+    void addObserver(const APLViewhostObserverInterfacePtr& observer) override;
+
+    void removeObserver(const APLViewhostObserverInterfacePtr& observer) override;
+
+    void onRenderDirectiveReceived(const std::string& token, const std::chrono::steady_clock::time_point& receiveTime)
+        override;
+
+    std::string getMaxAPLVersion() const override;
+
+    void setMetricRecorder(std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) override;
+
+    void provideState(const std::string& aplToken, const unsigned int stateRequestToken) override;
+
+    bool handleBack(const std::string& windowId) override;
+    /// @}
+
+    /// @name APLClientHandlerInterface methods
+    /// @{
+    void initializeRenderersRequest(const std::string& message) override;
+    void metricsReport(const std::string& message) override;
+    void viewhostEvent(const std::string& message) override;
+    void renderCompleted(const std::string& message) override;
+    void renderDocumentRequest(const std::string& message) override;
+    void executeCommandsRequest(const std::string& message) override;
+    void clearDocumentRequest(const std::string& message) override;
+    /// }
+
+    void onMessage(const std::string& windowId, const std::string& message);
+
+    void handleRenderingEvent(const std::string& token, APLClient::AplRenderingEvent event);
+
+    void handleDisplayMetrics(const std::string& windowId, const std::string& jsonPayload);
+
+    /**
+     *  Initialize empty client renderer and load corresponding supported extensions
+     *  @param windowId id of the window to be created
+     *  @param supportedExtensions URIs of all supported APL extensions for this window
+     */
+    void initializeRenderer(const std::string& windowId, const std::set<std::string>& supportedExtensions);
+
+    /**
+     * Adds the given extension to @c m_sharedRegisteredExtensions map.
+     *
+     * @param extension Pointer to @c AplCoreExtensionInterface which is being added to @c m_sharedRegisteredExtensions.
+     */
+    void registerSharedExtension(const std::shared_ptr<APLClient::Extensions::AplCoreExtensionInterface>& extension);
+
+    /**
+     * Returns a shared pointer to the @c AplClientRenderer holding root-context for a given aplToken
+     * Note:- This is not a thread safe method, avoid calling this method outside @c executor context
+     *
+     * @param the APL token in context
+     * @return the instance of @c APLClientRenderer if found, else nullptr
+     */
+    std::shared_ptr<APLClient::AplClientRenderer> getAplClientRendererFromAplToken(const std::string& aplToken);
+
+    /**
+     * Returns a shared pointer to the @c AplClientRenderer holding root-context for a target window ID
+     * Note:- This is not a thread safe method, avoid calling this method outside @c executor context
+     *
+     * @param the window id in context
+     * @return the instance of @c APLClientRenderer if found, else nullptr
+     */
+    std::shared_ptr<APLClient::AplClientRenderer> getAplClientRendererFromWindowId(const std::string& windowId);
+
+    /**
+     * Sets the media properties to be used to extract the media player state
+     * @param mediaProperties
+     */
+    void setMediaProperties(std::shared_ptr<avsCommon::sdkInterfaces::MediaPropertiesInterface> mediaProperties);
+
+    /**
+     * Initializes the IPC handlers implemented by the APLClientBridge.
+     */
+    void initialize();
+
+private:
+    AplClientBridge(
+        std::shared_ptr<CachingDownloadManager> contentDownloadManager,
+        std::shared_ptr<gui::GUIClientInterface> guiClient,
+        AplClientBridgeParameter parameters);
+
+    /**
+     * Set token to window id in the managed m_aplTokenToWindowIdMap
+     * @param token of the apl document.
+     * @param windowId the id of the window presenting the document with provided token.
+     */
+    void setTokenToWindow(const std::string& token, const std::string& windowId);
+
+    /**
+     * Gets the back extension associated with the provided renderer.
+     *
+     * @param aplClientRenderer shared pointer of @c APLClientRenderer to check for associated backstack extension.
+     * @return Shared pointer to the back extension instance if available, else nullptr
+     */
+    static std::shared_ptr<APLClient::Extensions::Backstack::AplBackstackExtension> getBackExtensionForRenderer(
+        const std::shared_ptr<APLClient::AplClientRenderer>& aplClientRenderer);
+
+    /// Alias for APLViewhostObserverInterface function
+    template <typename... Args>
+    using APLViewhostObserverFunc = void (APLViewhostObserverInterface::*)(Args...);
+
+    /**
+     * Call the given function with the given args on all registered observers
+     * @tparam Args1 Function argument types
+     * @tparam Args2 Argument types, must be convertible to corresponding Args1 type
+     * @param func The function to call
+     * @param args The args to pass to the function
+     */
+    template <typename... Args1, typename... Args2>
+    void executeNotifyObservers(APLViewhostObserverFunc<Args1...> func, Args2&&... args);
+
+    /**
+     * Executor method for handling the a presentation state change event, must be called in executor context
+     * @param windowId The new window ID
+     * @param presentationSession The new presentation session
+     */
+    void executeOnPresentationSessionChanged(
+        const std::string& windowId,
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession);
+
+    /// Helper class for mapping tokens to windows and vice-versa (1-N mapping from window to tokens)
+    class TokenWindowBiMap {
+    public:
+        /**
+         * Inserts the token window combination into the map
+         * @param token The token
+         * @param window The corresponding window
+         */
+        void insert(const std::string& token, const std::string& window) {
+            m_tokenToWindow[token] = window;
+            m_windowToToken[window].insert(token);
+        }
+
+        /**
+         * Erases the given token from the mapping
+         * @param token The token to erase
+         */
+        void eraseToken(const std::string& token) {
+            auto tokenToWindowIt = m_tokenToWindow.find(token);
+            if (tokenToWindowIt == m_tokenToWindow.end()) {
+                return;
+            }
+
+            auto windowId = tokenToWindowIt->second;
+            m_tokenToWindow.erase(tokenToWindowIt);
+            m_windowToToken[windowId].erase(token);
+        }
+
+        /**
+         * Erases the given window and all corresponding tokens from the mapping
+         * @param window The window to erase
+         */
+        void eraseWindow(const std::string& window) {
+            for (auto& token : m_windowToToken[window]) {
+                m_tokenToWindow.erase(token);
+            }
+            m_windowToToken.erase(window);
+        }
+
+        /**
+         * Gets the window associated with the given token
+         * @param token The token to search for
+         * @return The window ID, or an empty string if no mapping exists
+         */
+        std::string getWindowByToken(const std::string& token) {
+            auto tokenToWindowIt = m_tokenToWindow.find(token);
+            if (tokenToWindowIt == m_tokenToWindow.end()) {
+                return "";
+            }
+
+            return tokenToWindowIt->second;
+        }
+
+    private:
+        /// Token to window mapping
+        std::unordered_map<std::string, std::string> m_tokenToWindow;
+
+        /// Window to token mapping
+        std::unordered_map<std::string, std::unordered_set<std::string>> m_windowToToken;
+    };
+
+    /// Pointer to the download manager for retrieving resources
+    std::shared_ptr<CachingDownloadManager> m_contentDownloadManager;
+
+    /// An internal timer use to run the APL Core update loop
+    avsCommon::utils::timing::Timer m_updateTimer;
+
+    /// Pointer to the APL Client
+    std::unique_ptr<APLClient::AplClientBinding> m_aplClientBinding;
+
+    /// Pointer to the GUI Manager
+    std::shared_ptr<gui::GUIServerInterface> m_guiManager;
+
+    /// Pointer to the GUI Client
+    std::shared_ptr<gui::GUIClientInterface> m_guiClient;
+
+    /// APLClient handler.
+    std::shared_ptr<ipc::APLClientHandler> m_aplClientHandler;
+
+    /// Whether a render is currently queued
+    std::atomic_bool m_renderQueued;
+
+    /// An internal struct that stores additional parameters for AplClientBridge.
+    AplClientBridgeParameter m_parameters;
+
+    /// Collection of all @c AudioPlayerExtensions
+    std::vector<std::shared_ptr<APLClient::Extensions::AudioPlayer::AplAudioPlayerExtension>> m_audioPlayerExtensions;
+
+    /// The @c PlayerActivity state of the @c AudioPlayer
+    avsCommon::avs::PlayerActivity m_playerActivityState;
+
+    /// Collection of Pointer to the @c AplClientRenderer for every windowId
+    std::unordered_map<std::string, std::shared_ptr<APLClient::AplClientRenderer>> m_aplClientRendererMap;
+
+    /// Map containing the active presentation session for each windowId
+    std::unordered_map<std::string, aplCapabilityCommonInterfaces::PresentationSession> m_windowIdToPresentationSession;
+
+    /// Map containing the extensions for each URI shared by all renderers
+    std::unordered_map<std::string, std::shared_ptr<APLClient::Extensions::AplCoreExtensionInterface>>
+        m_sharedRegisteredExtensions;
+
+    /// Observer to APL document activity.
+    std::vector<std::weak_ptr<APLViewhostObserverInterface>> m_observers;
+
+    /// Mapping from windows to tokens - this includes all tokens which may be in the backstack
+    TokenWindowBiMap m_windowTokenMapping;
+
+    /// An internal executor that performs execution of callable objects passed to it sequentially but asynchronously.
+    avsCommon::utils::threading::Executor m_executor;
+
+    /// The @c MediaPropertiesInterface for the current @c AudioPlayer
+    std::shared_ptr<avsCommon::sdkInterfaces::MediaPropertiesInterface> m_mediaProperties;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_APLCLIENTBRIDGE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/IPCAPLAgent.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/IPCAPLAgent.h
new file mode 100644
index 0000000000..3342e2165e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/AlexaPresentation/IPCAPLAgent.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_IPCAPLAGENT_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_IPCAPLAGENT_H_
+
+#include <memory>
+#include <string>
+
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentObserverInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLCommandExecutionEvent.h>
+
+#include "IPCServerSampleApp/GUI/GUIClientInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * IPC APL Agent used for routing APL runtime events from documents initiated by an IPC client.
+ */
+class IPCAPLAgent : public aplCapabilityCommonInterfaces::APLCapabilityAgentInterface {
+public:
+    /**
+     * Create a IPCAPLAgent
+     *
+     * @param guiClient A pointer to a GUI Client.
+     * @return an instance of IPCAPLAgent.
+     */
+    static std::shared_ptr<IPCAPLAgent> create(std::shared_ptr<gui::GUIClientInterface> guiClient);
+
+    /**
+     * Destructor.
+     */
+    virtual ~IPCAPLAgent() = default;
+
+    /// @name APLCapabilityAgentInterface functions
+    /// @{
+    void setAPLMaxVersion(const std::string& APLMaxVersion);
+
+    void onDocumentDismissed(const std::string& token);
+
+    void onActiveDocumentChanged(
+        const std::string& token,
+        const aplCapabilityCommonInterfaces::PresentationSession& session) override;
+
+    void addObserver(std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentObserverInterface> observer);
+
+    void removeObserver(std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentObserverInterface> observer);
+
+    void clearExecuteCommands(const std::string& token = std::string(), bool markAsFailed = true) override;
+
+    void sendUserEvent(
+        const alexaClientSDK::aplCapabilityCommonInterfaces::aplEventPayload::UserEvent& payload) override;
+
+    void sendDataSourceFetchRequestEvent(
+        const alexaClientSDK::aplCapabilityCommonInterfaces::aplEventPayload::DataSourceFetch& fetchPayload) override;
+
+    void sendRuntimeErrorEvent(
+        const alexaClientSDK::aplCapabilityCommonInterfaces::aplEventPayload::RuntimeError& payload) override;
+
+    void onVisualContextAvailable(
+        alexaClientSDK::avsCommon::sdkInterfaces::ContextRequestToken requestToken,
+        const alexaClientSDK::aplCapabilityCommonInterfaces::aplEventPayload::VisualContext& visualContext) override;
+
+    void processRenderDocumentResult(const std::string& token, const bool result, const std::string& error) override;
+
+    void processExecuteCommandsResult(
+        const std::string& token,
+        alexaClientSDK::aplCapabilityCommonInterfaces::APLCommandExecutionEvent event,
+        const std::string& error) override;
+
+    void recordRenderComplete(const std::chrono::steady_clock::time_point& timestamp) override;
+
+    void proactiveStateReport() override;
+    /// @}
+
+private:
+    explicit IPCAPLAgent(std::shared_ptr<gui::GUIClientInterface> guiClient);
+
+    /// Pointer to the GUI Client, used for sending IPC messages
+    std::shared_ptr<gui::GUIClientInterface> m_guiClient;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_ALEXAPRESENTATION_IPCAPLAGENT_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/CachingDownloadManager.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/CachingDownloadManager.h
new file mode 100644
index 0000000000..7d3d19b787
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/CachingDownloadManager.h
@@ -0,0 +1,189 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_CACHINGDOWNLOADMANAGER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_CACHINGDOWNLOADMANAGER_H_
+
+#include <cstdint>
+#include <memory>
+
+#include <AVSCommon/Utils/LibcurlUtils/HTTPContentFetcherFactory.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
+
+#include <RegistrationManager/CustomerDataHandler.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+class CachingDownloadManager : public registrationManager::CustomerDataHandler {
+public:
+    class Observer {
+    public:
+        Observer() = default;
+        virtual ~Observer() = default;
+
+        /**
+         * Called at the start of a download, when a resource is not found in the cache.
+         */
+        virtual void onDownloadStarted(){};
+
+        /**
+         * Called when a resource was not found in the cache and has successfully been downloaded.
+         */
+        virtual void onDownloadComplete(){};
+
+        /**
+         * Called when a resource was not found in the cache and the attempt to download it has failed.
+         */
+        virtual void onDownloadFailed(){};
+
+        /**
+         * Called when a resource was found in the cache and downloading is not attempted.
+         */
+        virtual void onCacheHit(){};
+
+        /**
+         * Called during the download of a resource. Observers should expect multiple calls
+         * to this method for a single download.
+         *
+         * @param numberOfBytes The number of bytes that have been downloaded.
+         */
+        virtual void onBytesRead(uint64_t numberOfBytes){};
+    };
+
+    /**
+     * Constructor.
+     *
+     * @param httpContentFetcherFactory Pointer to a http content fetcher factory for making download requests
+     * @param cachePeriodInSeconds Number of seconds to reuse cache for downloaded packages
+     * @param maxCacheSize Maximum cache size for caching downloaded packages
+     * @param miscStorage Wrapper to read and write to misc stor=age database
+     */
+    CachingDownloadManager(
+        std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>
+            httpContentFetcherInterfaceFactoryInterface,
+        unsigned long cachePeriodInSeconds,
+        unsigned long maxCacheSize,
+        std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage,
+        const std::shared_ptr<registrationManager::CustomerDataManagerInterface> customerDataManager);
+
+    /**
+     * Method that should be called when requesting content
+     *
+     * @param source URL
+     * @param observer An observer to notify of the download, or @c nullptr to disable notifications.
+     * @return content - either from cache or from source
+     */
+    std::string retrieveContent(const std::string& source, std::shared_ptr<Observer> observer = nullptr);
+
+    /**
+     * Class to define a cached content item
+     */
+    class CachedContent {
+    public:
+        /**
+         * Time when the content was put into cache
+         */
+        std::chrono::system_clock::time_point importTime;
+        /**
+         * Content of the item
+         */
+        std::string content;
+
+        CachedContent() = default;
+
+        /**
+         * Constructor
+         *
+         * @param importTime Time when the item was inserted into cache
+         * @param content The content of the item
+         */
+        CachedContent(std::chrono::system_clock::time_point importTime, const std::string& content);
+    };
+
+private:
+    /**
+     * Downloads content requested by import from provided URL from source.
+     * @param source URL
+     * @param observer An observer to notify of the download, or @c nullptr to disable notifications.
+     * @return content from source
+     */
+    std::string downloadFromSource(const std::string& source, std::shared_ptr<Observer> observer);
+    /**
+     * Scans the cache to remove all expired entries, and evict the oldest entry if cache is full
+     */
+    void cleanUpCache();
+    /**
+     * Write the downloaded content to storage.
+     * @param source URL.
+     * @param content CachedContent object.
+     */
+    void writeToStorage(std::string source, CachedContent content);
+
+    /// @name CustomerDataHandler Function
+    /// @{
+    void clearData() override;
+    /// @}
+
+    /**
+     * Remove the downloaded content from storage.
+     * @param source  source URL.
+     */
+    void removeFromStorage(std::string source);
+    /**
+     * Used to create objects that can fetch remote HTTP content.
+     */
+    std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface> m_contentFetcherFactory;
+    /**
+     * Reuse time for caching of downloaded content
+     */
+    std::chrono::duration<double> m_cachePeriod;
+    /**
+     * Max numbers of entries in cache for downloaded content
+     */
+    unsigned long m_maxCacheSize;
+    /**
+     * The hashmap that maps the source url to a CachedContent
+     */
+    std::unordered_map<std::string, CachingDownloadManager::CachedContent> cachedContentMap;
+    /**
+     * The mutex for cachedContentMap
+     */
+    std::mutex cachedContentMapMutex;
+    /**
+     * The wrapper to read and write to local misc storage.
+     */
+    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> m_miscStorage;
+    /**
+     * An internal executor that performs execution of callable objects passed to it sequentially but asynchronously.
+     */
+    avsCommon::utils::threading::Executor m_executor;
+};
+
+/**
+ * This is a function to convert the @c CachedContent to a string.
+ */
+inline std::string cachedContentToString(CachingDownloadManager::CachedContent content, std::string delimiter) {
+    auto time = std::chrono::duration_cast<std::chrono::seconds>(content.importTime.time_since_epoch()).count();
+    return std::to_string(time) + delimiter + content.content;
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_CACHINGDOWNLOADMANAGER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/ConfigValidator.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/ConfigValidator.h
new file mode 100644
index 0000000000..84f5a01129
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/ConfigValidator.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_CONFIGVALIDATOR_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_CONFIGVALIDATOR_H_
+
+#include <unordered_map>
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include <rapidjson/document.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+class ConfigValidator {
+public:
+    /**
+     * Constructor.
+     */
+    ConfigValidator();
+
+    /**
+     * Default destructor.
+     */
+    ~ConfigValidator() = default;
+
+    /**
+     * Validates a configuration node using the json schema file.
+     *
+     * @param configuration The @c ConfigurationNode configuration object. The configuration object will be validated
+     * against the schema file for errors.
+     * @param jsonSchema The json schema that contains the representation of the configuration object.
+     * This schema is expected to comply with JSON Schema Draft v4 specification which is currently the latest version
+     * of JSON Schema supported by rapidjson v1.1. For documentation details, refer to:
+     * http://json-schema.org/specification.html
+     * @return boolean Indicates if validation of the configuration object was successful
+     */
+    bool validate(avsCommon::utils::configuration::ConfigurationNode& configuration, rapidjson::Document& jsonSchema);
+
+    /**
+     * Create a new ConfigValidator.
+     *
+     * @return The ConfigValidator object
+     */
+    static std::shared_ptr<ConfigValidator> create();
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_CONFIGVALIDATOR_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/ConnectionObserver.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/ConnectionObserver.h
new file mode 100644
index 0000000000..2e5c1c5fed
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/ConnectionObserver.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_CONNECTIONOBSERVER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_CONNECTIONOBSERVER_H_
+
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+
+#include <AVSCommon/SDKInterfaces/AuthObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/ConnectionStatusObserverInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * A class that observes the status of authorization and connection to AVS.
+ */
+class ConnectionObserver
+        : public avsCommon::sdkInterfaces::AuthObserverInterface
+        , public avsCommon::sdkInterfaces::ConnectionStatusObserverInterface {
+public:
+    /**
+     * Constructor.
+     */
+    ConnectionObserver();
+
+    void onAuthStateChange(
+        avsCommon::sdkInterfaces::AuthObserverInterface::State newState,
+        avsCommon::sdkInterfaces::AuthObserverInterface::Error error) override;
+
+    void onConnectionStatusChanged(
+        const avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::Status status,
+        const avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::ChangedReason reason) override;
+
+    /**
+     * Waits for the specified authorization state.
+     *
+     * @param authState The auth state to wait for.
+     * @param duration The optional duration to wait for. This defaults to 20 seconds.
+     * @return Whether the state was successfully reached.
+     */
+    bool waitFor(
+        const avsCommon::sdkInterfaces::AuthObserverInterface::State authState,
+        const std::chrono::seconds duration = std::chrono::seconds(20));
+
+    /**
+     * Waits for the specified connection state.
+     *
+     * @param authState The connection state to wait for.
+     * @param duration The optional duration to wait for. This defaults to 20 seconds.
+     * @return Whether the state was successfully reached.
+     */
+    bool waitFor(
+        const avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::Status connectionStatus,
+        const std::chrono::seconds duration = std::chrono::seconds(20));
+
+private:
+    /// Internal mutex to serialize access to m_connectionStatus and m_authState states.
+    std::mutex m_mutex;
+
+    /// A condition variable used to wait for state changes.
+    std::condition_variable m_trigger;
+
+    /// The current authorization state.
+    avsCommon::sdkInterfaces::AuthObserverInterface::State m_authState;
+
+    /// The current connection state.
+    avsCommon::sdkInterfaces::ConnectionStatusObserverInterface::Status m_connectionStatus;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_CONNECTIONOBSERVER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/ConsolePrinter.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/ConsolePrinter.h
new file mode 100644
index 0000000000..490f039f92
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/ConsolePrinter.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_CONSOLEPRINTER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_CONSOLEPRINTER_H_
+
+#include <mutex>
+#include <string>
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Logger/LogStringFormatter.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * A simple class that prints to the screen.
+ */
+class ConsolePrinter : public avsCommon::utils::logger::Logger {
+public:
+    /**
+     * Constructor.
+     *
+     * @deprecated (instances of ConsolePrinter needlessly duplicate ConsoleLogger functionality.)
+     */
+    ConsolePrinter();
+
+    /**
+     * Prints a simple message along with an \n.
+     *
+     * @param stringToPrint The string to print.
+     */
+    static void simplePrint(const std::string& stringToPrint);
+
+    /**
+     * Prints a message with a pretty format with a \n after.
+     *
+     * @param stringToPrint The string to print.
+     */
+    static void prettyPrint(const std::string& stringToPrint);
+
+    /**
+     * Prints a multi-line message with a pretty format with a \n after.
+     *
+     * @param lines The strings to print.
+     */
+    static void prettyPrint(std::initializer_list<std::string> lines);
+
+    /**
+     * Prints a decorated multi-line message with a pretty format with a newline after,
+     * along with an "Alexa Says" header, used for outputting captions.
+     *
+     * @param lines The strings representing captions from Alexa's voice.
+     */
+    static void captionsPrint(const std::vector<std::string>& lines);
+
+    /// @name Logger methods
+    /// @{
+    void emit(
+        avsCommon::utils::logger::Level level,
+        std::chrono::system_clock::time_point time,
+        const char* threadMoniker,
+        const char* text) override;
+    /// @}
+
+private:
+    /**
+     * Holding a shared pointer to the mutex
+     * to make sure the mutex is not already destroyed
+     * when called from global's destructor
+     */
+    std::shared_ptr<std::mutex> m_mutex;
+
+    /**
+     * Object used to format strings for log messages.
+     */
+    avsCommon::utils::logger::LogStringFormatter m_logFormatter;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_CONSOLEPRINTER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/DownloadMonitor.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/DownloadMonitor.h
new file mode 100644
index 0000000000..2a9502fae6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/DownloadMonitor.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_DOWNLOADMONITOR_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_DOWNLOADMONITOR_H_
+
+#include <APLClient/Telemetry/DownloadMetricsEmitter.h>
+
+#include "IPCServerSampleApp/CachingDownloadManager.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * Emits APL telemetry in response to download manager events.
+ */
+class DownloadMonitor : public CachingDownloadManager::Observer {
+public:
+    explicit DownloadMonitor(APLClient::Telemetry::DownloadMetricsEmitterPtr metricsEmitter);
+
+    ~DownloadMonitor() override = default;
+
+    void onDownloadStarted() override;
+
+    void onDownloadComplete() override;
+
+    void onDownloadFailed() override;
+
+    void onCacheHit() override;
+
+    void onBytesRead(uint64_t numberOfBytes) override;
+
+private:
+    APLClient::Telemetry::DownloadMetricsEmitterPtr m_metricsEmitter;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_DOWNLOADMONITOR_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/Extensions/LiveView/AplLiveViewExtension.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/Extensions/LiveView/AplLiveViewExtension.h
new file mode 100644
index 0000000000..be28b4edce
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/Extensions/LiveView/AplLiveViewExtension.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_EXTENSIONS_LIVEVIEW_APLLIVEVIEWEXTENSION_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_EXTENSIONS_LIVEVIEW_APLLIVEVIEWEXTENSION_H_
+
+#include "AplLiveViewExtensionObserverInterface.h"
+
+// Disable warnings from APLClient
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#include <APLClient/Extensions/AplCoreExtensionInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace extensions {
+namespace liveView {
+
+using namespace APLClient::Extensions;
+
+static const std::string URI = "aplext:liveview:10";
+
+/**
+ * An APL Extension designed for communication with a Camera @LiveView
+ */
+class AplLiveViewExtension : public AplCoreExtensionInterface {
+public:
+    /**
+     * Constructor
+     */
+    explicit AplLiveViewExtension(std::shared_ptr<AplLiveViewExtensionObserverInterface> observer);
+
+    ~AplLiveViewExtension() = default;
+
+    /// @name AplCoreExtensionInterface Functions
+    /// @{
+    std::string getUri() override;
+
+    apl::Object getEnvironment() override;
+
+    std::list<apl::ExtensionCommandDefinition> getCommandDefinitions() override;
+
+    std::list<apl::ExtensionEventHandler> getEventHandlers() override;
+
+    std::unordered_map<std::string, apl::LiveObjectPtr> getLiveDataObjects() override;
+
+    void applySettings(const apl::Object& settings) override;
+    /// @}
+
+    /// @name AplCoreExtensionEventCallbackInterface Functions
+    /// @{
+    void onExtensionEvent(
+        const std::string& uri,
+        const std::string& name,
+        const apl::Object& source,
+        const apl::Object& params,
+        unsigned int event,
+        std::shared_ptr<AplCoreExtensionEventCallbackResultInterface> resultCallback) override;
+    /// @}
+
+    /**
+     * Informs the APL document of changes in camera state
+     * @param cameraState enumerated @CameraState
+     */
+    void setCameraState(const std::string& cameraState);
+
+    /**
+     * Informs the APL document of changes in camera microphone state.
+     * @param enabled true if camera microphone is enabled and unmuted.
+     */
+    void setCameraMicrophoneState(bool enabled);
+
+    /**
+     * Informs the APL document of the current ASR Profile for the device relative to audio input.
+     * Used to determine UI state and display characteristics.
+     * See: https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/audio-hardware-configurations.html
+     * @param asrProfile the current asrProfile for the device.
+     */
+    void setAsrProfile(const std::string& asrProfile);
+
+    /**
+     * Informs the APL document that the first frame of the camera has rendered.
+     */
+    void onCameraFirstFrameRendered();
+
+    /**
+     * Informs the APL document that the camera has been cleared and is no longer displayed.
+     */
+    void onCameraCleared();
+
+private:
+    /// The @c AplLiveViewExtensionObserverInterface observer
+    std::shared_ptr<AplLiveViewExtensionObserverInterface> m_observer;
+
+    /// The document settings defined 'name' for the cameraState data object
+    std::string m_cameraStateName;
+
+    /// The @c apl::LiveMap for LiveView cameraState data.
+    apl::LiveMapPtr m_cameraState;
+};
+
+using AplLiveViewExtensionPtr = std::shared_ptr<AplLiveViewExtension>;
+
+}  // namespace liveView
+}  // namespace extensions
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_EXTENSIONS_LIVEVIEW_APLLIVEVIEWEXTENSION_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/Extensions/LiveView/AplLiveViewExtensionObserverInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/Extensions/LiveView/AplLiveViewExtensionObserverInterface.h
new file mode 100644
index 0000000000..de3a478bed
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/Extensions/LiveView/AplLiveViewExtensionObserverInterface.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_EXTENSIONS_LIVEVIEW_APLLIVEVIEWEXTENSIONOBSERVERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_EXTENSIONS_LIVEVIEW_APLLIVEVIEWEXTENSIONOBSERVERINTERFACE_H_
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace extensions {
+namespace liveView {
+
+/**
+ * This class allows a @c AplLiveViewExtensionObserverInterface observer to be notified of changes in the
+ * @c AplLiveViewExtension.
+ * The observer should control the state of the corresponding LiveView.
+ */
+class AplLiveViewExtensionObserverInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~AplLiveViewExtensionObserverInterface() = default;
+
+    /**
+     * Used to notify the observer when the extension has issued a request to exit the camera.
+     * The observer should stop the active camera.
+     */
+    virtual void handleCameraExitRequest() = 0;
+
+    /**
+     * Used to notify the observer when the extension has issued a request to open the camera microphone.
+     * The observer should open the microphone for communication over the camera.
+     * @param enabled true if requesting to enable the microphone.
+     */
+    virtual void handleChangeCameraMicStateRequest(bool enabled) = 0;
+};
+
+}  // namespace liveView
+}  // namespace extensions
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_EXTENSIONS_LIVEVIEW_APLLIVEVIEWEXTENSIONOBSERVERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/ExternalCapabilitiesBuilder.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/ExternalCapabilitiesBuilder.h
new file mode 100644
index 0000000000..dc4f6ac717
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/ExternalCapabilitiesBuilder.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_EXTERNALCAPABILITIESBUILDER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_EXTERNALCAPABILITIESBUILDER_H_
+
+#include <AVSCommon/Utils/DeviceInfo.h>
+#include <DefaultClient/ExternalCapabilitiesBuilderInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+/**
+ * This class provides a facility to add external capabilities to default client.
+ *
+ * Default client will provide its core components in the build call.
+ *
+ * @note Any object created during the buildCapabilities that keep a pointer to a core component should be added or
+ * managed by an object in the list of @c RequiresShutdown objects returned by buildCapabilities(). This will ensure
+ * that these objects are shutdown during @c DefaultClient shutdown and before any core component is shutdown.
+ */
+class ExternalCapabilitiesBuilder : public defaultClient::ExternalCapabilitiesBuilderInterface {
+public:
+    /**
+     * Constructor.
+     *
+     * @param deviceInfo DeviceInfo which reflects the device setup credentials.
+     */
+    ExternalCapabilitiesBuilder(std::shared_ptr<avsCommon::utils::DeviceInfo> deviceInfo);
+
+    /// @name ExternalCapabilitiesBuilderInterface methods.
+    /// @{
+    ExternalCapabilitiesBuilder& withSettingsStorage(
+        std::shared_ptr<settings::storage ::DeviceSettingStorageInterface> settingStorage) override;
+
+    ExternalCapabilitiesBuilder& withTemplateRunTime(
+        std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeInterface> templateRuntime) override;
+
+    std::shared_ptr<avsCommon::sdkInterfaces::CallManagerInterface> getCallManager() override;
+
+    ExternalCapabilitiesBuilder& withInternetConnectionMonitor(
+        std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface> internetConnectionMonitor)
+        override;
+
+    ExternalCapabilitiesBuilder& withDialogUXStateAggregator(
+        std::shared_ptr<avsCommon::avs::DialogUXStateAggregator> dialogUXStateAggregator) override;
+    ExternalCapabilitiesBuilderInterface& withAlexaInterfaceMessageSender(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>
+            alexaMessageSender) override;
+    std::pair<std::list<Capability>, std::list<std::shared_ptr<avsCommon::utils::RequiresShutdown>>> buildCapabilities(
+        std::shared_ptr<acsdkExternalMediaPlayer::ExternalMediaPlayer> externalMediaPlayer,
+        std::shared_ptr<avsCommon::sdkInterfaces::AVSConnectionManagerInterface> connectionManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        std::shared_ptr<certifiedSender::CertifiedSender> certifiedSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> audioFocusManager,
+        std::shared_ptr<registrationManager::CustomerDataManagerInterface> dataManager,
+        std::shared_ptr<capabilityAgents::system::ReportStateHandler> stateReportHandler,
+        std::shared_ptr<capabilityAgents::aip::AudioInputProcessor> audioInputProcessor,
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface> speakerManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::DirectiveSequencerInterface> directiveSequencer,
+        std::shared_ptr<avsCommon::sdkInterfaces::UserInactivityMonitorInterface> userInactivityMonitor,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::AVSGatewayManagerInterface> avsGatewayManager,
+        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> ringtoneMediaPlayer,
+        std::shared_ptr<avsCommon::sdkInterfaces::audio::AudioFactoryInterface> audioFactory,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> ringtoneChannelVolumeInterface,
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> commsSpeaker,
+        std::shared_ptr<avsCommon::avs::AudioInputStream> sharedDataStream,
+#endif
+        std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface> powerResourceManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::ComponentReporterInterface> softwareComponentReporter,
+        std::shared_ptr<avsCommon::sdkInterfaces::PlaybackRouterInterface> playbackRouter,
+        std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>
+            endpointRegistrationManager,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) override;
+    /// @}
+
+private:
+    /// DeviceInfo which reflects the device setup credentials.
+    std::shared_ptr<avsCommon::utils::DeviceInfo> m_deviceInfo;
+
+    /// When GUI is enabled, this will hold the TemplateRuntime Capability Agent.
+    std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeInterface> m_templateRuntime;
+
+#ifdef ENABLE_COMMS
+    /// When COMMS is enabled, this will hold the CallManager.
+    std::shared_ptr<avsCommon::sdkInterfaces::CallManagerInterface> m_callManager;
+#endif
+
+    /// When COMMS is enabled, this will hold the DialogUXStateAggregator
+    std::shared_ptr<avsCommon::avs::DialogUXStateAggregator> m_dialogUXStateAggregator;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_EXTERNALCAPABILITIESBUILDER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/CaptureState.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/CaptureState.h
new file mode 100644
index 0000000000..5254209e06
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/CaptureState.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_CAPTURESTATE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_CAPTURESTATE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+
+/// Enumeration defining the states of audio input initiator.
+enum class CaptureState {
+    /// Start Capture.
+    START,
+    /// Stop Capture. Only supported for PRESS_AND_HOLD. TAP will stop capturing only when StopCapture directive
+    /// is received by device.
+    /// @see https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/speechrecognizer.html#stopcapture
+    STOP,
+    /// Guard option for unknown received state.
+    UNKNOWN
+};
+
+/**
+ * This function converts the provided string to an @c CaptureState.
+ *
+ * @param string The string to convert to @c CaptureState.
+ * @return The @c CaptureState.
+ */
+inline CaptureState captureStateFromString(const std::string& string) {
+    if ("START" == string) {
+        return CaptureState::START;
+    } else if ("STOP" == string) {
+        return CaptureState::STOP;
+    } else {
+        return CaptureState::UNKNOWN;
+    }
+}
+
+/**
+ * This function converts a CaptureState to a string.
+ *
+ * @param state the input @c CaptureState.
+ * @return the string for the input CaptureState.
+ */
+inline std::string captureStateToString(CaptureState state) {
+    switch (state) {
+        case CaptureState::START:
+            return "START";
+        case CaptureState::STOP:
+            return "STOP";
+        default:
+            return "UNKNOWN";
+    }
+}
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_CAPTURESTATE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIActivityEventNotifier.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIActivityEventNotifier.h
new file mode 100644
index 0000000000..3383700fe2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIActivityEventNotifier.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUIACTIVITYEVENTNOTIFIER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUIACTIVITYEVENTNOTIFIER_H_
+
+#include <memory>
+
+#include <AVSCommon/SDKInterfaces/GUIActivityEvent.h>
+#include <AVSCommon/SDKInterfaces/GUIActivityEventObserverInterface.h>
+#include "IPCServerSampleApp/GUI/GUIActivityEventNotifierInterface.h"
+#include <acsdk/Notifier/Notifier.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+
+/**
+ * Manages all observers of @c GUIActivityEvent
+ */
+class GUIActivityEventNotifier
+        : public gui::GUIActivityEventNotifierInterface
+        , public notifier::Notifier<avsCommon::sdkInterfaces::GUIActivityEventObserverInterface> {
+public:
+    /**
+     * Create an instance of @c GUIActivityEventNotifier
+     * @return shared pointer to @c GUIActivityEventNotifier
+     */
+    static std::shared_ptr<GUIActivityEventNotifier> create();
+
+    /// @c GUIActivityEventNotifierInterface Functions
+    /// @{
+    void notifyObserversOfGUIActivityEvent(
+        const std::string& source,
+        const avsCommon::sdkInterfaces::GUIActivityEvent& activityEvent) override;
+    /// @}
+
+private:
+    /**
+     * Constructor
+     */
+    GUIActivityEventNotifier();
+};
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUIACTIVITYEVENTNOTIFIER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIActivityEventNotifierInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIActivityEventNotifierInterface.h
new file mode 100644
index 0000000000..ac8716a817
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIActivityEventNotifierInterface.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUIACTIVITYEVENTNOTIFIERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUIACTIVITYEVENTNOTIFIERINTERFACE_H_
+
+#include <AVSCommon/SDKInterfaces/GUIActivityEvent.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+
+/**
+ * Notifier interface for @c GUIActivityEvent
+ */
+class GUIActivityEventNotifierInterface {
+public:
+    /**
+     * Notify observers of activity event
+     * @param source The source of the activity event.
+     * @param activityEvent The activity event.
+     */
+    virtual void notifyObserversOfGUIActivityEvent(
+        const std::string& source,
+        const avsCommon::sdkInterfaces::GUIActivityEvent& activityEvent) = 0;
+};
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUIACTIVITYEVENTNOTIFIERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIClient.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIClient.h
new file mode 100644
index 0000000000..82889f9439
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIClient.h
@@ -0,0 +1,569 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUICLIENT_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUICLIENT_H_
+
+#include <thread>
+#include <atomic>
+#include <condition_variable>
+#include <memory>
+#include <mutex>
+#include <thread>
+#include <string>
+
+#include <rapidjson/document.h>
+
+#include <acsdk/APLCapabilityCommonInterfaces/APLDocumentObserverInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorTypes.h>
+#include <AVSCommon/AVS/FocusState.h>
+#include <AVSCommon/SDKInterfaces/AuthObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/ChannelObserverInterface.h>
+#ifdef ENABLE_COMMS
+#include <AVSCommon/SDKInterfaces/CallStateObserverInterface.h>
+#endif
+#include <AVSCommon/SDKInterfaces/GUIActivityEvent.h>
+#include <AVSCommon/SDKInterfaces/GUIActivityEventObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Timing/Timer.h>
+#include <acsdkSampleApplicationInterfaces/UIAuthNotifierInterface.h>
+#include <acsdkSampleApplicationInterfaces/UIStateAggregatorInterface.h>
+#include <RegistrationManager/CustomerDataHandler.h>
+#include <RegistrationManager/RegistrationObserverInterface.h>
+#include <RegistrationManager/CustomerDataHandler.h>
+#include <Communication/MessagingServerInterface.h>
+
+#include "IPCServerSampleApp/AlexaPresentation/AplClientBridge.h"
+#include "IPCServerSampleApp/AlexaPresentation/APLRuntimePresentationAdapter.h"
+#include "IPCServerSampleApp/AlexaPresentation/IPCAPLAgent.h"
+#include "IPCServerSampleApp/GUI/GUIClientInterface.h"
+#include "IPCServerSampleApp/GUI/GUIServerInterface.h"
+#include "IPCServerSampleApp/IPC/Components/AudioFocusManagerHandler.h"
+#include "IPCServerSampleApp/IPC/Components/SystemHandler.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/AudioFocusManagerHandlerInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/SystemHandlerInterface.h"
+#include "IPCServerSampleApp/IPC/IPCRouter.h"
+#include "IPCServerSampleApp/IPC/IPCDispatcherInterface.h"
+#include "IPCServerSampleApp/IPC/IPCVersionManager.h"
+#include "IPCServerSampleApp/IPC/Namespaces/AudioFocusManagerNamespace.h"
+#include "IPCServerSampleApp/IPC/Namespaces/SystemNamespace.h"
+#include "IPCServerSampleApp/Messages/MessageInterface.h"
+#include "IPCServerSampleApp/SampleApplicationReturnCodes.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+/**
+ * Manages all GUI related operations to be called from the GUI and the SDK
+ * Encapsulates APL core Client implementation and APL Core integration point.
+ */
+class GUIClient
+        : public communication::MessagingServerInterface
+        , public communication::MessageListenerInterface
+        , public registrationManager::RegistrationObserverInterface
+        , public communication::MessagingServerObserverInterface
+        , public avsCommon::sdkInterfaces::AuthObserverInterface
+        , public avsCommon::sdkInterfaces::CapabilitiesObserverInterface
+        , public gui::GUIClientInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public registrationManager::CustomerDataHandler
+        , public std::enable_shared_from_this<GUIClient>
+        , public acsdkSampleApplicationInterfaces::UIAuthNotifierInterface
+        , public acsdkSampleApplicationInterfaces::UIStateAggregatorInterface
+        , public ipc::IPCDispatcherInterface
+        , public ipc::AudioFocusManagerHandlerInterface
+        , public ipc::SystemHandlerInterface {
+public:
+    /**
+     * Create a @c GUIClient
+     *
+     * @param serverImplementation An implementation of @c MessagingInterface
+     * @param customerDataManager Object that will track the CustomerDataHandler.
+     * @note The @c serverImplementation should implement the @c start method in a blocking fashion.
+     * @param deviceInfo DeviceInfo which reflects the device setup credentials.
+     * @return an instance of GUIClient.
+     */
+    static std::shared_ptr<GUIClient> create(
+        std::shared_ptr<MessagingServerInterface> serverImplementation,
+        const std::shared_ptr<registrationManager::CustomerDataManagerInterface> customerDataManager,
+        const std::shared_ptr<ipc::IPCVersionManager> ipcVersionManager,
+        std::shared_ptr<avsCommon::utils::DeviceInfo> deviceInfo);
+
+    /// @name GUIClientInterface Functions
+    /// @{
+    void setGUIManager(std::shared_ptr<gui::GUIServerInterface> guiManager) override;
+    bool acquireFocus(
+        std::string avsInterface,
+        std::string channelName,
+        avsCommon::avs::ContentType contentType,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) override;
+    bool releaseFocus(
+        std::string avsInterface,
+        std::string channelName,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) override;
+#ifdef ENABLE_COMMS
+    void sendCallStateInfo(
+        const avsCommon::sdkInterfaces::CallStateObserverInterface::CallStateInfo& callStateInfo) override;
+#endif
+    void sendMessage(messages::MessageInterface& message) override;
+    bool finalizeClientInitialization(bool errorState) override;
+    void handleInitializeAPLRenderers(rapidjson::Document& payload) override;
+    void handleDisplayMetrics(rapidjson::Document& payload) override;
+    void handleAplEvent(rapidjson::Document& payload) override;
+    void handleRenderComplete(rapidjson::Document& payload) override;
+    void handleLocalRenderDocument(rapidjson::Document& payload) override;
+    void handleLocalExecuteCommands(rapidjson::Document& payload) override;
+    void handleLocalClearDocument(rapidjson::Document& payload) override;
+    void handleOnFocusChangedReceivedConfirmation(GUIToken token) override;
+    void focusAcquireRequest(
+        const GUIToken token,
+        const std::string& avsInterface,
+        const std::string& channelName,
+        avsCommon::avs::ContentType contentType) override;
+    void focusReleaseRequest(const GUIToken token, const std::string& avsInterface, const std::string& channelName)
+        override;
+    void setLocales(const std::string& localeStr) override;
+    std::shared_ptr<ipc::IPCRouter> getIPCRouter() override;
+    /// @}
+
+    /// @name MessagingServerInterface Functions
+    /// @{
+    bool start() override;
+    void writeMessage(const std::string& payload) override;
+    void setMessageListener(std::shared_ptr<MessageListenerInterface> messageListener) override;
+    void stop() override;
+    bool isReady() override;
+    void setObserver(const std::shared_ptr<communication::MessagingServerObserverInterface>& observer) override;
+    /// @}
+
+    /// @name MessagingServerObserverInterface Function
+    /// @{
+    void onConnectionOpened() override;
+    void onConnectionClosed() override;
+    /// @}
+
+    /// @name MessageListenerInterface Function
+    /// @{
+    void onMessage(const std::string& jsonMessage) override;
+    /// @}
+
+    /// @name AuthObserverInterface Function
+    /// @{
+    void onAuthStateChange(AuthObserverInterface::State newState, AuthObserverInterface::Error newError) override;
+    /// @}
+
+    /// @name CapabilitiesObserverInterface Methods
+    /// @{
+    void onCapabilitiesStateChange(
+        avsCommon::sdkInterfaces::CapabilitiesObserverInterface::State newState,
+        avsCommon::sdkInterfaces::CapabilitiesObserverInterface::Error newError,
+        const std::vector<avsCommon::sdkInterfaces::endpoints::EndpointIdentifier>& addedOrUpdatedEndpoints,
+        const std::vector<avsCommon::sdkInterfaces::endpoints::EndpointIdentifier>& deletedEndpoints) override;
+    /// }
+
+    /// @name CustomerDataHandlerInterface Function
+    /// @{
+    void clearData() override;
+    /// @}
+
+    /// @name UIAuthNotifierInterface Function
+    /// @{
+    void notifyAuthorizationRequest(const std::string& url, const std::string& code) override;
+    void notifyAuthorizationStateChange(avsCommon::sdkInterfaces::AuthObserverInterface::State state) override;
+    /// @}
+
+    /// @name UIStateAggregatorInterface Function
+    /// @{
+    void notifyAlexaState(const std::string& state) override;
+    /// @}
+
+    /**
+     * Processes user input until a quit command or a device reset is triggered.
+     *
+     * @return Returns a @c SampleAppReturnCode.
+     */
+    SampleAppReturnCode run();
+
+    /// @name RegistrationObserverInterface Functions
+    /// @{
+    void onLogout() override;
+    /// @}
+
+    /// @name IPCDispatcherInterface Functions
+    /// @{
+    bool dispatch(const std::string& message) override;
+    /// @}
+
+    /// @name AudioFocusManagerHandlerInterface methods
+    /// @{
+    void acquireChannelRequest(const std::string& message) override;
+    void releaseChannelRequest(const std::string& message) override;
+    void focusChangedReport(const std::string& message) override;
+    /// }
+
+    /// @name SystemHandlerInterface methods
+    /// @{
+    void authorizationStateRequest(const std::string& message) override;
+    void alexaStateRequest(const std::string& message) override;
+    void authorizationInfoRequest(const std::string& message) override;
+    void localesRequest(const std::string& message) override;
+    /// }
+
+    /**
+     * Sets the APL Client Bridge
+     * @param aplClientBridge The APL Client bridge
+     * @param aplVersionChanged True if the APL Client version has changed from last run.
+     */
+    void setAplClientBridge(std::shared_ptr<AplClientBridge> aplClientBridge, bool aplVersionChanged);
+
+    /**
+     * Sets the APL Runtime adapter
+     * @param aplRuntimePresentationAdapter Shared pointer to APL runtime adapter
+     */
+    void setAPLRuntimePresentationAdapter(
+        const std::shared_ptr<APLRuntimePresentationAdapter>& aplRuntimePresentationAdapter);
+
+    /// Adds a mediaplayer to the m_mediaPlayerMap with the key as the name and value as the mediaplayer
+    void addToMediaPlayerMap(
+        const std::string& name,
+        const std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface>& mediaPlayer);
+
+    /// Initializes the IPC router.
+    void initIPCRouter();
+
+    /**
+     * Provides the IPC Client with information to complete CBL based authorization.
+     *
+     * @param url The url to use to complete CBL-based LWA authrorization.
+     * @param code The CBL code to use to complete authorization.
+     * @param clientId AVS Device Id.
+     */
+    void sendCompleteAuthorizationMessage(const std::string& url, const std::string& code, const std::string& clientId);
+
+    /**
+     * Informs the IPC Client of changes in the state of the Alexa client connection.
+     *
+     * @param state Enumerated state of the Alexa client.
+     */
+    void sendSetAlexaStateMessage(const std::string& state);
+
+    /**
+     * Informs the IPC Client of changes in Alexa Authorization status.
+     *
+     * @param state Enumerated authorization state.
+     */
+    void sendSetAuthorizationStateMessage(const std::string& state);
+
+    /**
+     * Informs the  IPC Client of changes in supported locales for the SDK.
+     *
+     * @param localeStr The locale(s) for the device. In single-locale mode, contains one locale string.
+     * In multi-locale mode, the first string indicates the primary locale, and any other strings correspond to
+     * secondary locales.
+     */
+    void sendSetLocalesMessage(const std::string& localeStr);
+
+private:
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /**
+     * This class represents requestors as clients of FocusManager and handle notifications.
+     */
+    class ProxyFocusObserver : public avsCommon::sdkInterfaces::ChannelObserverInterface {
+    public:
+        /**
+         * Constructor.
+         *
+         * @param avsInterface Name of related AVS Interface.
+         * @param token Requester token.
+         * @param focusBridge FocusBridge to perform operations through.
+         * @param channelName Name of related channel.
+         */
+        ProxyFocusObserver(
+            std::string avsInterface,
+            GUIToken token,
+            std::shared_ptr<GUIClient> focusBridge,
+            std::string channelName);
+
+        /// @name ChannelObserverInterface Functions
+        /// @{
+        void onFocusChanged(avsCommon::avs::FocusState newFocus, avsCommon::avs::MixingBehavior behavior) override;
+        ///@}
+
+    private:
+        /// AVS Interface Name
+        const std::string m_avsInterface;
+
+        /// Related requester token.
+        GUIToken m_token;
+
+        /// Parent FocusBridge.
+        std::shared_ptr<GUIClient> m_focusBridge;
+
+        /// Focus channel name.
+        const std::string m_channelName;
+    };
+
+    /**
+     * Constructor
+     */
+    GUIClient(
+        std::shared_ptr<MessagingServerInterface> serverImplementation,
+        const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager,
+        std::shared_ptr<ipc::IPCVersionManager> ipcVersionManager,
+        std::shared_ptr<avsCommon::utils::DeviceInfo> deviceInfo);
+
+    /// Server worker thread.
+    void serverThread();
+
+    /// Send initRequest message to the client and wait for init response.
+    void sendInitRequestAndWait();
+
+    /**
+     * Handle SendCallStateInfo event.
+     */
+#ifdef ENABLE_COMMS
+    void executeSendCallStateInfo(
+        const avsCommon::sdkInterfaces::CallStateObserverInterface::CallStateInfo& callStateInfo);
+#endif
+
+    /**
+     * Send focus response.
+     *
+     * @param token Requester token.
+     * @param result Result of focus operation.
+     */
+    void executeSendFocusResponse(const GUIToken token, const bool result);
+
+    /**
+     * Starting timer to release channel in situations when focus operation result or
+     * onFocusChanged event was not received by GUI so it will not know if it needs to release it.
+     *
+     * @param avsInterface The AVS Interface to release.
+     * @param token Requester token.
+     * @param channelName The channel to release.
+     */
+    void startAutoreleaseTimer(const std::string& avsInterface, const GUIToken token, const std::string& channelName);
+
+    /**
+     * Handle autoRelease.
+     *
+     * @param avsInterface The AVS Interface to release.
+     * @param token Requester token.
+     * @param channelName Channel name.
+     */
+    void autoRelease(const std::string& avsInterface, const GUIToken token, const std::string& channelName);
+
+    /**
+     * Send focus change event notification.
+     *
+     * @param token Requester token.
+     * @param state Resulting channel state.
+     */
+    void sendOnFocusChanged(const GUIToken token, const avsCommon::avs::FocusState state);
+
+    /**
+     * Sends a GUI Message to the server.
+     * @param message The message to be written.
+     */
+    void executeSendMessage(messages::MessageInterface& message);
+
+    /**
+     * Write a message to the server.
+     *
+     * @param payload an arbitrary string
+     */
+    void executeWriteMessage(const std::string& payload);
+
+    /**
+     * An internal function handling audio focus requests in the executor thread.
+     * @param avsInterface The AVS Interface requesting focus.
+     * @param channelName The channel to be requested.
+     * @param contentType The type of content acquiring focus.
+     * @param channelObserver the channelObserver to be notified.
+     */
+    bool executeAcquireFocus(
+        std::string avsInterface,
+        std::string channelName,
+        avsCommon::avs::ContentType contentType,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver);
+
+    /**
+     * An internal function handling release audio focus requests in the executor thread.
+     * @param avsInterface The avsInterface to be released.
+     * @param channelName The channel to be released.
+     * @param channelObserver the channelObserver to be notified.
+     */
+    bool executeReleaseFocus(
+        std::string avsInterface,
+        std::string channelName,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver);
+
+    /**
+     * Registers namespaces and versions that will be handled by the IPC Server
+     */
+    void registerNamespaces();
+
+    /**
+     * Handle accept call message
+     * @param payload The payload retrieved from message holding this event.
+     */
+    void executeHandleAcceptCall(rapidjson::Document& payload);
+
+    /**
+     * Handle stop call message
+     * @param payload The payload retrieved from message holding this event.
+     */
+    void executeHandleStopCall(rapidjson::Document& payload);
+
+    /**
+     * Handle enable local video message.
+     * @param payload The payload retrieved from message holding this event.
+     */
+    void executeHandleEnableLocalVideo(rapidjson::Document& payload);
+
+    /**
+     * Handle disable local video message.
+     * @param payload The payload retrieved from message holding this event.
+     */
+    void executeHandleDisableLocalVideo(rapidjson::Document& payload);
+
+#ifdef ENABLE_COMMS
+    /**
+     * Handle send DTMF key message.
+     * @param payload The payload retrieved from message holding this event.
+     */
+    void executeHandleSendDtmf(rapidjson::Document& payload);
+#endif
+
+    /**
+     * Creates a runtime error payload for invalid windowId reported found in a directive
+     * @param errorMsg Error message to be sent with runtime error
+     * @param aplToken APL Token for directive with error
+     */
+    void reportInvalidWindowIdRuntimeError(const std::string& errorMsg, const std::string& aplToken);
+
+    // The GUI manager implementation.
+    std::shared_ptr<gui::GUIServerInterface> m_guiManager;
+
+    /// An internal executor that performs execution of callable objects passed to it sequentially but asynchronously.
+    avsCommon::utils::threading::Executor m_executor;
+
+    // The server implementation.
+    std::shared_ptr<MessagingServerInterface> m_serverImplementation;
+
+    /// The thread used by the underlying server
+    std::thread m_serverThread;
+
+    // The thread used for init messages.
+    std::thread m_initThread;
+
+    /// Synchronize access between threads.
+    std::mutex m_mutex;
+
+    /// condition variable notify server state changed
+    std::condition_variable m_cond;
+
+    /// Has the underlying server started.
+    std::atomic_bool m_hasServerStarted;
+
+    /// Has initialization message from been received.
+    std::atomic_bool m_initMessageReceived;
+
+    /// Is the server in unrecoverable error state.
+    std::atomic_bool m_errorState;
+
+    /// The Listener to receive the messages
+    std::shared_ptr<MessageListenerInterface> m_messageListener;
+
+    /// Has the user logged out.
+    std::atomic_bool m_shouldRestart;
+
+    /// Server observer
+    std::shared_ptr<communication::MessagingServerObserverInterface> m_observer;
+
+    /// The APL Client Bridge
+    std::shared_ptr<AplClientBridge> m_aplClientBridge;
+
+    /// The IPC Version Manager
+    std::shared_ptr<ipc::IPCVersionManager> m_ipcVersionManager;
+
+    /// Flag to indicate that a fatal failure occurred. In this case, customer can either reset the device or kill
+    /// the app.
+    std::atomic_bool m_limitedInteraction;
+
+    /// Map from message type to handling function.
+    std::map<std::string, std::function<void(rapidjson::Document&)>> m_messageHandlers;
+
+    /// Mutex for requester maps.
+    std::mutex m_mapMutex;
+
+    /// A map of GUI side focus observers (proxies).
+    std::map<GUIToken, std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface>> m_focusObservers;
+
+    /// Autorelease timers for case when client not received channel state change message.
+    std::map<GUIToken, std::shared_ptr<avsCommon::utils::timing::Timer>> m_autoReleaseTimers;
+
+    /// AudioFocusManager handler.
+    std::shared_ptr<ipc::AudioFocusManagerHandler> m_audioFocusManagerIPCHandler;
+
+    /// System handler.
+    std::shared_ptr<ipc::SystemHandler> m_systemIPCHandler;
+
+    /// Map to store IPC media players
+    std::map<std::string, std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface>> m_mediaPlayerMap;
+
+    /// Pointer to APL runtime presentation adapter for handling GUI client initiated APL rendering.
+    std::shared_ptr<APLRuntimePresentationAdapter> m_aplRuntimePresentationAdapter;
+
+    /// An instance of an IPC Router.
+    std::shared_ptr<ipc::IPCRouter> m_ipcRouter;
+
+    /// Pointer to the agent that handles GUI client initiated APL runtime callbacks;
+    std::shared_ptr<IPCAPLAgent> m_ipcAPLAgent;
+
+    /// DeviceInfo object for reporting config information.
+    std::shared_ptr<avsCommon::utils::DeviceInfo> m_deviceInfo;
+
+    /// Cached value of the Alexa client state.
+    std::string m_alexaState;
+
+    /// Cached value of the authorization state.
+    std::string m_authState;
+
+    /// Cached value of the url to use to complete the CBL-based LWA authorization.
+    std::string m_authUrl;
+
+    /// Cached value of the CBL code to use to complete the authorization.
+    std::string m_authCode;
+
+    /// Cached value of the locales for the device.
+    std::string m_localeStr;
+
+    /// Cached value of the AVS device id.
+    std::string m_clientId;
+};
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUICLIENT_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIClientInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIClientInterface.h
new file mode 100644
index 0000000000..d03562e39e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIClientInterface.h
@@ -0,0 +1,190 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUICLIENTINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUICLIENTINTERFACE_H_
+
+#include <rapidjson/document.h>
+
+#include <AVSCommon/AVS/FocusState.h>
+#ifdef ENABLE_COMMS
+#include <AVSCommon/SDKInterfaces/CallStateObserverInterface.h>
+#endif
+#include <AVSCommon/SDKInterfaces/ChannelObserverInterface.h>
+
+#include <acsdk/APLCapabilityCommonInterfaces/VisualStateProviderInterface.h>
+
+#include "IPCServerSampleApp/IPC/IPCRouter.h"
+#include "IPCServerSampleApp/Messages/Message.h"
+
+#include "GUIServerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+
+/**
+ * An interface representing the GUI component responsible for rendering display card and for APL.
+ */
+// TODO: Elaborate the requirements for an implementation of GUIClientInterface (ARC-905)
+class GUIClientInterface {
+public:
+    /// Alias for GUI provided token.
+    using GUIToken = uint64_t;
+
+    /**
+     * Destructor
+     */
+    virtual ~GUIClientInterface() = default;
+
+    /**
+     * Set a reference to a GUI Manager
+     * @param guiManager Client related operations.
+     */
+    virtual void setGUIManager(std::shared_ptr<gui::GUIServerInterface> guiManager) = 0;
+
+    /**
+     * Request audio focus.
+     * @param avsInterface The AVS Interface requesting focus.
+     * @param channelName The channel to be requested.
+     * @param contentType The type of content acquiring focus.
+     * @param channelObserver the channelObserver to be notified.
+     */
+    virtual bool acquireFocus(
+        std::string avsInterface,
+        std::string channelName,
+        avsCommon::avs::ContentType contentType,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) = 0;
+
+    /**
+     * Release audio focus.
+     * @param avsInterface The AVS Interface releasing focus.
+     * @param channelName The channel to be released.
+     * @param channelObserver the channelObserver to be notified.
+     */
+    virtual bool releaseFocus(
+        std::string avsInterface,
+        std::string channelName,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) = 0;
+
+    /**
+     * Send call state info.
+     * @param callStateInfo The call state info.
+     */
+#ifdef ENABLE_COMMS
+    virtual void sendCallStateInfo(
+        const avsCommon::sdkInterfaces::CallStateObserverInterface::CallStateInfo& callStateInfo) = 0;
+#endif
+
+    /**
+     * Sends a GUI Message to the server.
+     * @param message The message to be written.
+     */
+    virtual void sendMessage(messages::MessageInterface& message) = 0;
+
+    /**
+     * Finalize the client initialization with the error state so far passed from the caller.
+     *
+     * @param errorState Error state of the client initialization so far passed by the caller.
+     * @return true if finalization succeeds.
+     */
+    virtual bool finalizeClientInitialization(bool errorState) = 0;
+
+    /**
+     * Handle initialization of APL Renderers based on window and supported extensions reported by GUI app
+     * @param payload The payload retrieved from message holding this event.
+     */
+    virtual void handleInitializeAPLRenderers(rapidjson::Document& payload) = 0;
+
+    /**
+     * Handle displayMetrics message.
+     * @param payload The payload retrieved from message holding this event.
+     */
+    virtual void handleDisplayMetrics(rapidjson::Document& payload) = 0;
+
+    /**
+     * Handle aplEvent message.
+     *
+     * @param payload The payload retrieved from message holding this event.
+     */
+    virtual void handleAplEvent(rapidjson::Document& payload) = 0;
+
+    /**
+     * Handle renderComplete message.
+     * @param payload The payload retrieved from message holding this event.
+     */
+    virtual void handleRenderComplete(rapidjson::Document& payload) = 0;
+
+    /**
+     * Handle Local RenderDocument message.
+     *
+     * @param payload The payload holding the local render document directive.
+     */
+    virtual void handleLocalRenderDocument(rapidjson::Document& payload) = 0;
+
+    /**
+     * Handle Local ExecuteCommands message.
+     *
+     * @param payload The payload holding the local execute commands directive.
+     */
+    virtual void handleLocalExecuteCommands(rapidjson::Document& payload) = 0;
+
+    /**
+     * Handle Local ClearDocument message.
+     *
+     * @param payload The payload holding the local clear document directive.
+     */
+    virtual void handleLocalClearDocument(rapidjson::Document& payload) = 0;
+
+    /**
+     * Handle focus message received confirmation messages.
+     *
+     * @param token Token field in the focusChangedReport event.
+     */
+    virtual void handleOnFocusChangedReceivedConfirmation(GUIToken token) = 0;
+
+    /// Internal function to execute @see processFocusAcquireRequest
+    virtual void focusAcquireRequest(
+        const GUIToken token,
+        const std::string& avsInterface,
+        const std::string& channelName,
+        avsCommon::avs::ContentType contentType) = 0;
+
+    /// Internal function to execute @see processFocusReleaseRequest
+    virtual void focusReleaseRequest(
+        const GUIToken token,
+        const std::string& avsInterface,
+        const std::string& channelName) = 0;
+
+    /**
+     * Informs the  IPC Client of changes in supported locales for the SDK.
+     *
+     * @param localeStr The locale(s) for the device. In single-locale mode, contains one locale string.
+     * In multi-locale mode, the first string indicates the primary locale, and any other strings correspond to
+     * secondary locales.
+     */
+    virtual void setLocales(const std::string& localeStr) = 0;
+
+    /// Returns a reference to @c m_ipcRouter.
+    virtual std::shared_ptr<ipc::IPCRouter> getIPCRouter() = 0;
+};
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUICLIENTINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIManager.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIManager.h
new file mode 100644
index 0000000000..29d57be395
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIManager.h
@@ -0,0 +1,534 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUIMANAGER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUIMANAGER_H_
+
+#include <Audio/MicrophoneInterface.h>
+#include <AFML/FocusManager.h>
+#include <AVSCommon/AVS/FocusState.h>
+#include <acsdkAudioPlayerInterfaces/AudioPlayerObserverInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentInterface.h>
+#include <acsdk/Notifier/Notifier.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateObserverInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <acsdk/Sample/InteractionManager/InteractionManager.h>
+#include <acsdk/Sample/Endpoint/EndpointAlexaLauncherHandler.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h>
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsSerializerInterface.h>
+#ifdef ENABLE_COMMS
+#include <AVSCommon/SDKInterfaces/CallStateObserverInterface.h>
+#endif
+#include <AVSCommon/SDKInterfaces/CapabilitiesObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/ChannelObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/FocusManagerObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/GUIActivityEvent.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <Settings/DeviceSettingsManager.h>
+#include <Settings/SettingCallbacks.h>
+#include <DefaultClient/DefaultClient.h>
+
+#include "IPCServerSampleApp/AlexaPresentation/APLRuntimePresentationAdapter.h"
+#include "IPCServerSampleApp/GUILogBridge.h"
+#include "IPCServerSampleApp/GUI/CaptureState.h"
+#include "IPCServerSampleApp/GUI/GUIActivityEventNotifierInterface.h"
+#include "IPCServerSampleApp/GUI/GUIClientInterface.h"
+#include "IPCServerSampleApp/GUI/GUIServerInterface.h"
+#include "IPCServerSampleApp/GUI/TemplateRuntimePresentationAdapterBridge.h"
+#include "IPCServerSampleApp/GUI/NavigationEvent.h"
+#include "IPCServerSampleApp/IPC/Components/DoNotDisturbHandler.h"
+#include "IPCServerSampleApp/IPC/Components/InteractionManagerHandler.h"
+#include "IPCServerSampleApp/IPC/Components/LoggerHandler.h"
+#include "IPCServerSampleApp/IPC/Components/SessionSetupHandler.h"
+#include "IPCServerSampleApp/IPC/Components/WindowManagerHandler.h"
+#include "IPCServerSampleApp/IPC/Namespaces/DoNotDisturbNamespace.h"
+#include "IPCServerSampleApp/IPC/Namespaces/InteractionManagerNamespace.h"
+#include "IPCServerSampleApp/IPC/Namespaces/LoggerNamespace.h"
+#include "IPCServerSampleApp/IPC/Namespaces/SessionSetupNamespace.h"
+#include "IPCServerSampleApp/IPC/Namespaces/WindowManagerNamespace.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/DoNotDisturbHandlerInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/InteractionManagerHandlerInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/LoggerHandlerInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/SessionSetupHandlerInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/WindowManagerHandlerInterface.h"
+#include "IPCServerSampleApp/IPC/IPCVersionManager.h"
+#include "IPCServerSampleApp/TimezoneHelper.h"
+
+#ifdef UWP_BUILD
+#include <SSSDKCommon/NullMicrophone.h>
+#endif
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+
+/**
+ * Manages all GUI related operations to be called from the SDK and the GUIClient
+ */
+class GUIManager
+        : public avsCommon::sdkInterfaces::DialogUXStateObserverInterface
+        , public avsCommon::sdkInterfaces::AudioInputProcessorObserverInterface
+        , public gui::GUIServerInterface
+        , public acsdkAudioPlayerInterfaces::AudioPlayerObserverInterface
+        , public presentationOrchestratorInterfaces::PresentationOrchestratorStateObserverInterface
+        , public avsCommon::sdkInterfaces::FocusManagerObserverInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public avsCommon::sdkInterfaces::ChannelObserverInterface
+        , public ipc::DoNotDisturbHandlerInterface
+        , public ipc::SessionSetupHandlerInterface
+        , public ipc::WindowManagerHandlerInterface
+        , public ipc::InteractionManagerHandlerInterface
+        , public ipc::LoggerHandlerInterface
+#ifdef ENABLE_COMMS
+        , public avsCommon::sdkInterfaces::CallStateObserverInterface
+#endif
+        , public std::enable_shared_from_this<GUIManager> {
+public:
+    /**
+     * Create a GUIManager.
+     *
+     * @param guiClient A pointer to a GUI Client.
+     * @param activityEventNotifier A pointer to a activity event notifier.
+     * @param micWrapper A pointer to a microphone wrapper.
+     * @param interactionManager A pointer to interaction manager.
+     * @param launcherHandler A pointer to launcher handler.
+     *
+     * @return An instance of GUIManager.
+     */
+    static std::shared_ptr<GUIManager> create(
+        std::shared_ptr<gui::GUIClientInterface> guiClient,
+        std::shared_ptr<gui::GUIActivityEventNotifierInterface> activityEventNotifier,
+        std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> micWrapper,
+        std::shared_ptr<common::InteractionManager> interactionManager,
+        std::shared_ptr<common::EndpointAlexaLauncherHandler> launcherHandler);
+
+    /// @name GUIServerInterface methods
+    /// @{
+    void handleRecognizeSpeechRequest(capabilityAgents::aip::Initiator initiator, bool start) override;
+
+    void handleMicrophoneToggle() override;
+
+    void handlePlaybackPlay() override;
+
+    void handlePlaybackPause() override;
+
+    void handlePlaybackNext() override;
+
+    void handlePlaybackPrevious() override;
+
+    void handlePlaybackSeekTo(int offset) override;
+
+    void handlePlaybackSkipForward() override;
+
+    void handlePlaybackSkipBackward() override;
+
+    void handlePlaybackToggle(const std::string& name, bool checked) override;
+
+    void onUserEvent() override;
+
+    bool handleFocusAcquireRequest(
+        std::string avsInterface,
+        std::string channelName,
+        avsCommon::avs::ContentType contentType,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) override;
+
+    bool handleFocusReleaseRequest(
+        std::string avsInterface,
+        std::string channelName,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) override;
+
+    void handleGUIActivityEvent(avsCommon::sdkInterfaces::GUIActivityEvent event, const std::string& source = "")
+        override;
+
+    void handleNavigationEvent(NavigationEvent event) override;
+
+    std::vector<visualCharacteristicsInterfaces::WindowTemplate> getWindowTemplates() override;
+
+    std::vector<visualCharacteristicsInterfaces::InteractionMode> getInteractionModes() override;
+
+    visualCharacteristicsInterfaces::DisplayCharacteristics getDisplayCharacteristics() override;
+
+    void setWindowInstances(
+        const std::vector<presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance>& instances,
+        const std::string& defaultWindowInstanceId,
+        const std::string& audioPlaybackUIWindowId) override;
+
+    bool addWindowInstance(
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& instance) override;
+
+    bool removeWindowInstance(const std::string& windowInstanceId) override;
+
+    void updateWindowInstance(
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& instance) override;
+
+    bool setDefaultWindowInstance(const std::string& windowInstanceId) override;
+
+    bool serializeInteractionMode(
+        const std::vector<visualCharacteristicsInterfaces::InteractionMode>& interactionModes,
+        std::string& serializedJson) override;
+
+    bool serializeWindowTemplate(
+        const std::vector<visualCharacteristicsInterfaces::WindowTemplate>& windowTemplates,
+        std::string& serializedJson) override;
+
+    bool serializeDisplayCharacteristics(
+        const visualCharacteristicsInterfaces::DisplayCharacteristics& display,
+        std::string& serializedJson) override;
+
+    void forceExit() override;
+
+    std::chrono::milliseconds getDeviceTimezoneOffset() override;
+
+    void handleOnMessagingServerConnectionOpened() override;
+
+    void handleDocumentTerminated(const std::string& token, bool failed) override;
+
+    void acceptCall() override;
+
+    void stopCall() override;
+
+    void enableLocalVideo() override;
+
+    void disableLocalVideo() override;
+
+#ifdef ENABLE_COMMS
+    void sendDtmf(avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone dtmfTone) override;
+#endif
+
+    void handleLocaleChange() override;
+
+    void initClient() override;
+    /// }
+
+    /// @name DoNotDisturbHandlerInterface methods
+    /// @{
+    void doNotDisturbStateChanged(const std::string& message) override;
+    void doNotDisturbStateRequest(const std::string& message) override;
+    /// }
+
+    /// @name SessionSetupHandlerInterface methods
+    /// @{
+    void namespaceVersionsReport(const std::string& message) override;
+    void clientInitialized(const std::string& message) override;
+    void clientConfigRequest(const std::string& message) override;
+    /// }
+
+    /// @name WindowManagerHandlerInterface methods
+    /// @{
+    void visualCharacteristicsRequest(const std::string& message) override;
+    void defaultWindowInstanceChanged(const std::string& message) override;
+    void windowInstancesReport(const std::string& message) override;
+    void windowInstancesAdded(const std::string& message) override;
+    void windowInstancesRemoved(const std::string& message) override;
+    void windowInstancesUpdated(const std::string& message) override;
+    /// }
+
+    /// @name InteractionManagerHandlerInterface methods
+    /// @{
+    void recognizeSpeechRequest(const std::string& message) override;
+    void navigationEvent(const std::string& message) override;
+    void guiActivityEvent(const std::string& message) override;
+    /// }
+
+    /// @name LoggerHandlerInterface methods
+    /// @{
+    void logEvent(const std::string& message) override;
+    /// }
+
+    /// @name FocusManagerObserverInterface methods
+    /// @{
+    void onFocusChanged(const std::string& channelName, avsCommon::avs::FocusState newFocus) override;
+    /// }
+
+    /// @name AudioPlayerObserverInterface methods
+    /// @{
+    void onPlayerActivityChanged(avsCommon::avs::PlayerActivity state, const Context& context) override;
+    /// }
+
+    /// @name PresentationOrchestratorStateObserverInterface Functions
+    /// @{
+    void onStateChanged(
+        const std::string& windowId,
+        const presentationOrchestratorInterfaces::PresentationMetadata& metadata) override;
+    /// @}
+
+    /**
+     * UXDialogObserverInterface methods
+     */
+    void onDialogUXStateChanged(DialogUXState newState) override;
+
+    /// @name AudioInputProcessorObserverInterface methods.
+    /// @{
+    void onStateChanged(AudioInputProcessorObserverInterface::State state) override;
+    /// @}
+
+    /// @name CallStateObserverInterface methods.
+    /// @{
+#ifdef ENABLE_COMMS
+    void onCallStateInfoChange(
+        const avsCommon::sdkInterfaces::CallStateObserverInterface::CallStateInfo& newStateInfo) override;
+    void onCallStateChange(avsCommon::sdkInterfaces::CallStateObserverInterface::CallState newCallState) override;
+#endif
+    /// @}
+
+    /**
+     * Sets the SDK Client Registry
+     * @param clientRegistry Reference to the SDKClientRegistry
+     */
+    void setClient(std::shared_ptr<sdkClient::SDKClientRegistry> clientRegistry);
+
+    /**
+     * Configure settings notifications.
+     *
+     * @return @true if it succeeds to configure the settings notifications; @c false otherwise.
+     */
+    bool configureSettingsNotifications();
+
+    /**
+     * Set the IPCVersion manager.
+     *
+     * @param ipcVersionManager Pointer to the @c IPCVersionManager.
+     */
+    void setIpcVersionManager(std::shared_ptr<ipc::IPCVersionManager> ipcVersionManager);
+
+    /**
+     * Parse window instance from the specified json.
+     * @param payload The payload to be parsed
+     * @param windowInstance [ out ] Parsed object for @c WindowInstance.
+     * @return true if parsed successfully, false otherwise.
+     */
+    bool parseWindowInstance(
+        const rapidjson::Value& payload,
+        presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& windowInstance);
+
+#ifdef UWP_BUILD
+    void inputAudioFile(const std::string& audioFile);
+#endif
+
+    /**
+     * This will force clear the DIALOG channel and reset it, allowing for proper cloud-side context when locally
+     * stopping DIALOG channel.
+     */
+    void forceClearDialogChannelFocus();
+
+    /// @name ChannelObserverInterface Methods
+    /// @{
+    void onFocusChanged(avsCommon::avs::FocusState newFocus, avsCommon::avs::MixingBehavior behavior) override;
+    /// }
+
+    /**
+     * Sets the APL Runtime adapter
+     * @param aplRuntimePresentationAdapter Shared pointer to APL runtime adapter
+     */
+    void setAPLRuntimePresentationAdapter(std::shared_ptr<APLRuntimePresentationAdapter> aplRuntimePresentationAdapter);
+
+    /**
+     * Sets the TemplateRuntime Presentation Adapter Bridge
+     * @param templateRuntimePresentationAdapterBridge The @c TemplateRuntimePresentationAdapterBridge
+     */
+    void setTemplateRuntimePresentationAdapterBridge(
+        std::shared_ptr<TemplateRuntimePresentationAdapterBridge> templateRuntimePresentationAdapterBridge);
+
+    /**
+     * Initializes the IPC handlers implemented by the GUIManager.
+     */
+    void initialize();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param guiClient A pointer to a GUI Client.
+     * @param activityEventNotifier A pointer to a activity event notifier.
+     * @param micWrapper A pointer to a microphone wrapper.
+     * @param interactionManager A pointer to interaction manager.
+     * @param launcherHandler A pointer to launcher handler.
+     */
+    GUIManager(
+        std::shared_ptr<gui::GUIClientInterface> guiClient,
+        std::shared_ptr<gui::GUIActivityEventNotifierInterface> activityEventNotifier,
+        std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> micWrapper,
+        std::shared_ptr<common::InteractionManager> interactionManager,
+        std::shared_ptr<common::EndpointAlexaLauncherHandler> launcherHandler);
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /**
+     * Internal function for handling a @c NavigationEvent::BACK event
+     */
+    void executeBackNavigation();
+
+    /**
+     * Internal function for handling a @c NavigationEvent::EXIT event
+     */
+    void executeExitNavigation();
+
+    /**
+     * Update the firmware version.
+     *
+     * @param firmwareVersion The new firmware version.
+     */
+    void setFirmwareVersion(avsCommon::sdkInterfaces::softwareInfo::FirmwareVersion firmwareVersion);
+
+    /**
+     * Should be called after a user wishes to modify the volume.
+     */
+    void adjustVolume(avsCommon::sdkInterfaces::ChannelVolumeInterface::Type, int8_t delta);
+
+    /**
+     * Should be called after a user wishes to set mute.
+     */
+    void setMute(avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type, bool mute);
+
+    /**
+     * Internal function to update cached defaultWindowId and inform adapters.
+     *
+     * @param windowId the window id to use by default.
+     */
+    void setDefaultWindowId(const std::string& windowId);
+
+    /**
+     * Internal function to update cached audioPlaybackUIWindowId and inform adapters.
+     *
+     * @param windowId the window id to use for audio playback UI.
+     */
+    void setAudioPlaybackUIWindowId(const std::string& windowId);
+
+    /**
+     * Reset the device and remove any customer data.
+     */
+    void resetDevice();
+
+    /**
+     * A reference to the GUI Client.
+     */
+    std::shared_ptr<gui::GUIClientInterface> m_guiClient;
+
+    /**
+     * A reference to @c ActivityEvent notifier
+     */
+    std::shared_ptr<gui::GUIActivityEventNotifierInterface> m_activityEventNotifier;
+
+    /**
+     * A reference to the smart screen client.
+     */
+    std::shared_ptr<alexaClientSDK::defaultClient::DefaultClient> m_defaultClient;
+
+    /// Whether Alexa is speaking or listening.
+    bool m_isSpeakingOrListening;
+
+    /// The microphone managing object.
+#ifdef UWP_BUILD
+    std::shared_ptr<alexaSmartScreenSDK::sssdkCommon::NullMicrophone> m_micWrapper;
+#else
+    std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> m_micWrapper;
+#endif
+
+    /// The @c PlayerActivity of the @c AudioPlayer.
+    avsCommon::avs::PlayerActivity m_playerActivityState;
+
+    /// The last state reported by AudioInputProcessor.
+    avsCommon::sdkInterfaces::AudioInputProcessorObserverInterface::State m_audioInputProcessorState;
+
+    /// Map of channel focus states by channelName.
+    std::unordered_map<std::string, avsCommon::avs::FocusState> m_channelFocusStates;
+
+    /// Utility flag used for clearing Alert Channel when Foregrounded.
+    bool m_clearAlertChannelOnForegrounded;
+
+    /// Object that manages settings callbacks.
+    std::shared_ptr<settings::SettingCallbacks<settings::DeviceSettingsManager>> m_callbacks;
+
+    /// Object that manages settings.
+    std::shared_ptr<settings::DeviceSettingsManager> m_settingsManager;
+
+    /// The @c DoNotDisturbHandler.
+    std::shared_ptr<ipc::DoNotDisturbHandler> m_doNotDisturbIPCHandler;
+
+    /// The @c InteractionManagerHandler.
+    std::shared_ptr<ipc::InteractionManagerHandler> m_interactionManagerIPCHandler;
+
+    /// The @c LoggerHandler.
+    std::shared_ptr<ipc::LoggerHandler> m_loggerIPCHandler;
+
+    /// SessionSetup handler.
+    std::shared_ptr<ipc::SessionSetupHandler> m_sessionSetupIPCHandler;
+
+    /// The IPC Version Manager.
+    std::shared_ptr<ipc::IPCVersionManager> m_ipcVersionManager;
+
+    /// The launcher handler.
+    std::shared_ptr<common::EndpointAlexaLauncherHandler> m_launcherHandler;
+
+    /// WindowManager handler.
+    std::shared_ptr<ipc::WindowManagerHandler> m_windowManagerIPCHandler;
+
+    /// Default Window Id.
+    std::string m_defaultWindowId;
+
+    /// Audio Playback UI Window Id.
+    std::string m_audioPlaybackUIWindowId;
+
+    /// GUI log bridge to be used to handle log events.
+    GUILogBridge m_guiLogBridge;
+
+    /// The interface holding audio focus.
+    std::string m_interfaceHoldingAudioFocus;
+
+    /// Object that provides timezone offsets for the device.
+    std::shared_ptr<TimezoneHelper> m_timezoneHelper;
+
+    /// Interaction Manager.
+    std::shared_ptr<common::InteractionManager> m_interactionManager;
+
+    /// Presentation Orchestrator State Tracker.
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>
+        m_presentationOrchestratorStateTracker;
+
+    /// Visual Characteristics component.
+    std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsInterface> m_visualCharacteristics;
+
+    /// Visual Characteristics Serializer component.
+    std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsSerializerInterface>
+        m_visualCharacteristicsSerializer;
+
+    /// Presentation Orchestrator.
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorInterface> m_presentationOrchestrator;
+
+    /// Alexa Presentation APL CA.
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> m_alexaPresentationAPL;
+
+    /// Pointer to th APL Runtime Presentation Adapter.
+    std::shared_ptr<APLRuntimePresentationAdapter> m_aplRuntimePresentationAdapter;
+
+    /// Pointer to the Template Runtime Presentation Adapter Bridge.
+    std::shared_ptr<TemplateRuntimePresentationAdapterBridge> m_templateRuntimePresentationAdapterBridge;
+
+    /// An internal executor that performs execution of callable objects passed to it sequentially but asynchronously.
+    avsCommon::utils::threading::Executor m_executor;
+};
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUIMANAGER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIServerInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIServerInterface.h
new file mode 100644
index 0000000000..ac5f3f560e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/GUIServerInterface.h
@@ -0,0 +1,305 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUISERVERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUISERVERINTERFACE_H_
+
+#include <AIP/Initiator.h>
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/ContentType.h>
+#include <AVSCommon/SDKInterfaces/AuthObserverInterface.h>
+#ifdef ENABLE_COMMS
+#include <AVSCommon/SDKInterfaces/CallManagerInterface.h>
+#endif
+#include <AVSCommon/SDKInterfaces/ChannelObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/GUIActivityEvent.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorTypes.h>
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h>
+
+#include <APLClient/AplRenderingEvent.h>
+#include "NavigationEvent.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+
+/// An interface providing APIs to be used by GUIClient.
+class GUIServerInterface {
+public:
+    /**
+     * Handle Recognize Speech Request Event
+     * @param initiator the @c Initiator type for speech recognition
+     * @param start true if this is the start of speech recognition
+     */
+    virtual void handleRecognizeSpeechRequest(capabilityAgents::aip::Initiator initiator, bool start) = 0;
+
+    /**
+     * Toggles the microphone state if the Sample App was built with wake word. When the microphone is turned off, the
+     * app enters a privacy mode in which it stops recording audio data from the microphone, thus disabling Alexa waking
+     * up due to wake word. Note however that hold-to-talk and tap-to-talk modes will still work by recording
+     * microphone data temporarily until a user initiated interaction is complete. If this app was built without wake
+     * word then this will do nothing as the microphone is already off.
+     */
+    virtual void handleMicrophoneToggle() = 0;
+
+    /**
+     * Handle playback 'PLAY' event.
+     */
+    virtual void handlePlaybackPlay() = 0;
+
+    /**
+     * Handle playback 'PAUSE' event.
+     */
+    virtual void handlePlaybackPause() = 0;
+
+    /**
+     * Handle playback 'NEXT' event.
+     */
+    virtual void handlePlaybackNext() = 0;
+
+    /**
+     * Handle playback 'PREVIOUS' event.
+     */
+    virtual void handlePlaybackPrevious() = 0;
+
+    /**
+     * Handle playback 'SEEK_TO' event.
+     */
+    virtual void handlePlaybackSeekTo(int offset) = 0;
+
+    /**
+     * Handle playback 'SKIP_FORWARD' event.
+     */
+    virtual void handlePlaybackSkipForward() = 0;
+
+    /**
+     * Handle playback 'SKIP_BACKWARD' event.
+     */
+    virtual void handlePlaybackSkipBackward() = 0;
+
+    /**
+     * Handle playback 'TOGGLE' event.
+     * @param name name of the TOGGLE.
+     * @param checked checked state of the TOGGLE.
+     */
+    virtual void handlePlaybackToggle(const std::string& name, bool checked) = 0;
+
+    /**
+     * Handle focus acquire requests.
+     *
+     * @param avsInterface The AVS Interface requesting focus.
+     * @param channelName The channel to be requested.
+     * @param contentType The type of content acquiring focus.
+     * @param channelObserver the channelObserver to be notified.
+     */
+    virtual bool handleFocusAcquireRequest(
+        std::string avsInterface,
+        std::string channelName,
+        avsCommon::avs::ContentType contentType,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) = 0;
+
+    /**
+     * Handle focus release requests.
+     *
+     * @param avsInterface The avsInterface to be released.
+     * @param channelName channelName to be released.
+     * @param channelObserver the channelObserver to be notified.
+     */
+    virtual bool handleFocusReleaseRequest(
+        std::string avsInterface,
+        std::string channelName,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) = 0;
+
+    /**
+     * Handle activityEvent message.
+     *
+     * @param event the activity event.
+     * @param source The source of the activity event. Default empty string.
+     */
+    virtual void handleGUIActivityEvent(
+        avsCommon::sdkInterfaces::GUIActivityEvent event,
+        const std::string& source = "") = 0;
+
+    /**
+     * Handle event the navigation event.
+     *
+     * @param event the navigation event.
+     */
+    virtual void handleNavigationEvent(NavigationEvent event) = 0;
+
+    /**
+     * Gets the window template configuration
+     * @return vector containing the window templates
+     */
+    virtual std::vector<visualCharacteristicsInterfaces::WindowTemplate> getWindowTemplates() = 0;
+
+    /**
+     * Retrieve the interaction mode configuration
+     * @return vector containing the interaction modes
+     */
+    virtual std::vector<visualCharacteristicsInterfaces::InteractionMode> getInteractionModes() = 0;
+
+    /**
+     * Get the display characteristics
+     * @return the display characteristics object
+     */
+    virtual visualCharacteristicsInterfaces::DisplayCharacteristics getDisplayCharacteristics() = 0;
+
+    /**
+     * Sets the window instances to be reported in WindowState.
+     * Replaces any windows in the existing WindowState set.
+     * @param instances The vector of window instances to aad/report in WindowState
+     * @param defaultWindowInstanceId The default window id to report in WindowState
+     * @param audioPlaybackUIWindowId The id of the window handling audio playback to report in WindowState
+     */
+    virtual void setWindowInstances(
+        const std::vector<presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance>& instances,
+        const std::string& defaultWindowInstanceId,
+        const std::string& audioPlaybackUIWindowId) = 0;
+
+    /**
+     * Adds a window instance to be reported in WindowState
+     * @param instance The window instance to add
+     * @return true if the instance was successfully added, false otherwise
+     */
+    virtual bool addWindowInstance(
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& instance) = 0;
+
+    /**
+     * Remove an existing window instance, at least one window must exist at all times
+     * @param windowInstanceId The id of the window to remove
+     * @return true if the instance was removed, false otherwise
+     */
+    virtual bool removeWindowInstance(const std::string& windowInstanceId) = 0;
+
+    /**
+     * Updates an already existing window instance
+     * @param instance The updated window instance, the window ID must match an already existing window
+     */
+    virtual void updateWindowInstance(
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& instance) = 0;
+
+    /**
+     * Sets the default window instance
+     * @param windowInstanceId The id of window to set as the default, this window id must already exist
+     * @return true if the default has been set, false otherwise
+     */
+    virtual bool setDefaultWindowInstance(const std::string& windowInstanceId) = 0;
+
+    /**
+     * Serialize interaction modes into reportable json format.
+     * @param interactionModes  Collection of @c InteractionMode to be serialized
+     * @param serializedJson [ out ] Serialized json payload
+     *
+     * @return True if serialization successful, false otherwise.
+     */
+    virtual bool serializeInteractionMode(
+        const std::vector<visualCharacteristicsInterfaces::InteractionMode>& interactionModes,
+        std::string& serializedJson) = 0;
+
+    /**
+     * Serialize window template into reportable json format.
+     * @param windowTemplates  Collection of @c WindowTemplate to be serialized
+     * @param serializedJson [ out ] Serialized json payload
+     *
+     * @return True if serialization successful, false otherwise.
+     */
+    virtual bool serializeWindowTemplate(
+        const std::vector<visualCharacteristicsInterfaces::WindowTemplate>& windowTemplates,
+        std::string& serializedJson) = 0;
+
+    /**
+     * Serialize display characteristics into reportable json format.
+     * @param display Instance of @c DisplayCharacteristics to be serialized
+     * @param serializedJson [ out ] Serialized json payload
+     *
+     * @return True if serialization successful, false otherwise.
+     */
+    virtual bool serializeDisplayCharacteristics(
+        const visualCharacteristicsInterfaces::DisplayCharacteristics& display,
+        std::string& serializedJson) = 0;
+
+    /**
+     * Gets Device Time Zone Offset.
+     */
+    virtual std::chrono::milliseconds getDeviceTimezoneOffset() = 0;
+
+    virtual void onUserEvent() = 0;
+
+    /**
+     * Force exit to reset focus state and clear card.
+     */
+    virtual void forceExit() = 0;
+
+    /**
+     * Handle accept call event.
+     */
+    virtual void acceptCall() = 0;
+
+    /**
+     * Handle stop call event.
+     */
+    virtual void stopCall() = 0;
+
+    /**
+     * Handle enable local video event.
+     */
+    virtual void enableLocalVideo() = 0;
+
+    /**
+     * Handle disable local video event.
+     */
+    virtual void disableLocalVideo() = 0;
+
+#ifdef ENABLE_COMMS
+    /**
+     * Handle send DTMF tone event.
+     */
+    virtual void sendDtmf(avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone dtmfTone) = 0;
+#endif
+
+    /**
+     * Handle an onConnectionOpened event from the messaging server
+     */
+    virtual void handleOnMessagingServerConnectionOpened() = 0;
+
+    /**
+     * Handle document terminated result.
+     * Handler should clear the associated APL document, and any active/pending ExecuteCommands directives for the
+     * document.
+     *
+     * @param token the apl document result token.
+     * @param failed the indication if document terminated due to failure.
+     */
+    virtual void handleDocumentTerminated(const std::string& token, bool failed) = 0;
+
+    /**
+     * Handle Locale Change
+     */
+    virtual void handleLocaleChange() = 0;
+
+    /**
+     * Initialize the IPC connection and inform the IPC client of the IPC framework version.
+     */
+    virtual void initClient() = 0;
+};
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_GUISERVERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/NavigationEvent.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/NavigationEvent.h
new file mode 100644
index 0000000000..079a9fa52e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/NavigationEvent.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_NAVIGATIONEVENT_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_NAVIGATIONEVENT_H_
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+
+/// Enumeration of navigation events that could be sent from GUI App to SampleApp.
+enum class NavigationEvent {
+    /// Exit button has been pressed.
+    EXIT,
+
+    /// Back button has been pressed.
+    BACK,
+
+    /// Guard option for unknown received state.
+    UNKNOWN
+};
+
+/**
+ * This function converts the provided string to an @c NavigationEvent.
+ *
+ * @param string The string to convert to @c NavigationEvent.
+ * @return The @c NavigationEvent.
+ */
+inline NavigationEvent navigationEventFromString(const std::string& string) {
+    if ("EXIT" == string) {
+        return NavigationEvent::EXIT;
+    } else if ("BACK" == string) {
+        return NavigationEvent::BACK;
+    } else {
+        return NavigationEvent::UNKNOWN;
+    }
+}
+
+/**
+ * This function converts a NavigationEvent to string
+ *
+ * @param event the input NavigationEvent
+ * @return the string for the input NavigationEvent
+ */
+inline std::string navigationEventToString(NavigationEvent event) {
+    switch (event) {
+        case NavigationEvent::BACK:
+            return "BACK";
+        case NavigationEvent::EXIT:
+            return "EXIT";
+        default:
+            return "UNKNOWN";
+    }
+}
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_NAVIGATIONEVENT_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/TemplateRuntimePresentationAdapterBridge.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/TemplateRuntimePresentationAdapterBridge.h
new file mode 100644
index 0000000000..b71132fc8f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUI/TemplateRuntimePresentationAdapterBridge.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_TEMPLATERUNTIMEPRESENTATIONADAPTERBRIDGE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_TEMPLATERUNTIMEPRESENTATIONADAPTERBRIDGE_H_
+
+#include <string>
+
+#include <acsdk/Sample/TemplateRuntime/TemplateRuntimePresentationAdapter.h>
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/TemplateRuntimeHandlerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+
+/**
+ * Bridge for binding TemplateRuntime IPC messages to the @c TemplateRuntimePresentationAdapter
+ */
+class TemplateRuntimePresentationAdapterBridge
+        : public ipc::TemplateRuntimeHandlerInterface
+        , public std::enable_shared_from_this<TemplateRuntimePresentationAdapterBridge> {
+public:
+    /**
+     * Create an instance of @c TemplateRuntimePresentationAdapterBridge
+     *
+     * @param templateRuntimePresentationAdapter Pointer to the @c TemplateRuntimePresentationAdapter.
+     * @return Shared pointer to @c TemplateRuntimePresentationAdapterBridge
+     */
+    static std::shared_ptr<TemplateRuntimePresentationAdapterBridge> create(
+        const std::shared_ptr<sampleApplications::common::TemplateRuntimePresentationAdapter>&
+            templateRuntimePresentationAdapter);
+
+    /// @name TemplateRuntimeHandlerInterface methods
+    /// @{
+    void windowIdReport(const std::string& message) override;
+    /// }
+
+    /**
+     * Sets the render player info window id on the adapter if not explicitly reported by the client via the
+     * associated TemplateRuntime windowIdReport.
+     * @param renderPlayerInfoWindowId the window id to use for player info window if not set by client.
+     * @return returns true if the bridge accepts the explicitly set player info window id.
+     */
+    bool setRenderPlayerInfoWindowId(const std::string& renderPlayerInfoWindowId);
+
+    /**
+     * Returns the render player info window id used by the adapter bridge for presentations.
+     * @return the render player info window id.
+     */
+    std::string getRenderPlayerInfoWindowId();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param templateRuntimePresentationAdapter Pointer to the @c TemplateRuntimePresentationAdapter.
+     */
+    TemplateRuntimePresentationAdapterBridge(
+        std::shared_ptr<sampleApplications::common::TemplateRuntimePresentationAdapter>
+            templateRuntimePresentationAdapter);
+
+    /// The @c TemplateRuntimePresentationAdapter
+    std::shared_ptr<sampleApplications::common::TemplateRuntimePresentationAdapter>
+        m_templateRuntimePresentationAdapter;
+
+    /// Cached value of the reported render player info window id
+    std::string m_renderPlayerInfoWindowId;
+};
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUI_TEMPLATERUNTIMEPRESENTATIONADAPTERBRIDGE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUILogBridge.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUILogBridge.h
new file mode 100644
index 0000000000..9c9f1c58f8
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/GUILogBridge.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUILOGBRIDGE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUILOGBRIDGE_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * Enum used to specify the severity assigned to an IPC client log message.
+ */
+enum class IPCLogLevel {
+    /// Intermediate debug log level.
+    DEBUG5,
+    /// Logs of normal operations, to be used in release builds.
+    INFO,
+    /// Log of an event that may indicate a problem.
+    WARN,
+    /// Log of an event that indicates an error.
+    ERROR,
+    /// An unknown severity level.
+    UNKNOWN
+};
+
+/**
+ * Convert a string into a @c IPCLogLevel value.
+ *
+ * @param logLevel The @c std::string value to convert to a @c IPCLogLevel value.
+ * @return The @c IPCLogLevel conversion of the @c std::string value.
+ */
+inline IPCLogLevel ipcLogLevelFromString(const std::string& logLevel) {
+    if ("DEBUG" == logLevel) {
+        return IPCLogLevel::DEBUG5;
+    } else if ("INFO" == logLevel) {
+        return IPCLogLevel::INFO;
+    } else if ("WARN" == logLevel) {
+        return IPCLogLevel::WARN;
+    } else if ("ERROR" == logLevel) {
+        return IPCLogLevel::ERROR;
+    } else {
+        return IPCLogLevel::UNKNOWN;
+    }
+}
+
+/**
+ * Simple class to direct GUI log to SDK log.
+ */
+class GUILogBridge {
+public:
+    /**
+     * Transform IPC LogEvent level to SDK one according to guidelines and log it.
+     *
+     * @param logLevel IPCLoglevel.
+     * @param message Event/log message.
+     */
+    void log(IPCLogLevel logLevel, const std::string& message);
+
+private:
+    /**
+     * Internal function to execute logging.
+     */
+    static void executeLog(IPCLogLevel logLevel, const std::string& message);
+
+    /// This is the worker thread for the @c GUILogBridge.
+    avsCommon::utils::threading::Executor m_executor;
+};
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_GUILOGBRIDGE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/APLClientHandler.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/APLClientHandler.h
new file mode 100644
index 0000000000..9fd5d46190
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/APLClientHandler.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_APLCLIENTHANDLER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_APLCLIENTHANDLER_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include "IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/APLClientHandlerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract for the handler that will handle the APLClient namespace messages coming from the IPC client.
+ */
+class APLClientHandler
+        : public IPCHandlerBase
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<APLClientHandler> {
+public:
+    /**
+     * Create an instance of @c APLClientHandler
+     *
+     * @param ipcHandlerRegistrar Used to register @c APLClientHandler.
+     * @param aplClientComponent Handles the parsed APLClient payloads.
+     * @return Shared pointer to @c APLClientHandler
+     */
+    static std::shared_ptr<APLClientHandler> create(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<APLClientHandlerInterface> aplClientComponent);
+
+    /**
+     * Sends a createRenderer IPC message to the IPC client.
+     *
+     * @param windowId Identifies which window to render the specified APL document.
+     * @param token Unique identifier for the APL document.
+     */
+    void dispatchCreateRenderer(const std::string& windowId, const std::string& token);
+
+    /**
+     * Sends a sendMessageToViewhost IPC message to the IPC client.
+     *
+     * @param windowId Identifies the APL window/document instance for which the APL core message is intended.
+     * @param payload Opaque serialized APL Core message payload to be provided to the IPC APL Viewhost.
+     */
+    void dispatchSendMessageToViewhost(const std::string& windowId, const std::string& payload);
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// Register this handler for its namespace and its methods for the corresponding namespace functions.
+    void registerHandlers();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param ipcHandlerRegistrar Used to register @c APLClientHandler.
+     * @param aplClientComponent Handles the parsed APLClient payloads.
+     */
+    APLClientHandler(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<APLClientHandlerInterface> aplClientComponent);
+
+    /// A reference to the @c IPCHandlerRegistrationInterface used to register/deregister @c APLClientHandler.
+    std::shared_ptr<IPCHandlerRegistrationInterface> m_ipcHandlerRegistrar;
+
+    /// A reference to the IPC dispatcher to dispatch messages to the IPC Client.
+    std::shared_ptr<IPCDispatcherInterface> m_ipcDispatcher;
+
+    /// A reference to the @c APLClientHandlerInterface that will handle the parsed payloads.
+    std::shared_ptr<APLClientHandlerInterface> m_aplClientComponent;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_APLCLIENTHANDLER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/AlexaCaptionsHandler.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/AlexaCaptionsHandler.h
new file mode 100644
index 0000000000..3fb2fcba99
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/AlexaCaptionsHandler.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_ALEXACAPTIONSHANDLER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_ALEXACAPTIONSHANDLER_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include "IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h"
+#include "IPCServerSampleApp/RenderCaptionsInterface.h"
+#include "IPCServerSampleApp/SmartScreenCaptionStateManager.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract for the handler that will handle the AlexaCaptions namespace messages coming from the IPC client.
+ */
+class AlexaCaptionsHandler
+        : public IPCHandlerBase
+        , public RenderCaptionsInterface
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<AlexaCaptionsHandler> {
+public:
+    /**
+     * Create an instance of @c AlexaCaptionsHandler
+     *
+     * @param ipcHandlerRegistrar Used to register @c AlexaCaptionsHandler.
+     * @param miscStorage An implementation of MiscStorageInterface
+     * @return Shared pointer to @c AlexaCaptionsHandler.
+     */
+    static std::shared_ptr<AlexaCaptionsHandler> create(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage);
+
+    /// @name RenderCaptionsInterface Function
+    /// @{
+    void renderCaptions(const std::string& payload) override;
+    /// @}
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// Register this handler for its namespace and its methods for the corresponding namespace functions.
+    void registerHandlers();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param ipcHandlerRegistrar Used to register @c AlexaCaptionsHandler.
+     * @param miscStorage An implementation of MiscStorageInterface.
+     */
+    AlexaCaptionsHandler(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage);
+
+    /// A reference to the @c IPCHandlerRegistrationInterface used to register/deregister IPC Handler.
+    std::shared_ptr<IPCHandlerRegistrationInterface> m_ipcHandlerRegistrar;
+
+    /// A reference to the IPC dispatcher to dispatch messages to the IPC Client.
+    std::shared_ptr<IPCDispatcherInterface> m_ipcDispatcher;
+
+    /// CaptionManager to manage settings for captions
+    SmartScreenCaptionStateManager m_captionManager;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_ALEXACAPTIONSHANDLER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/AudioFocusManagerHandler.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/AudioFocusManagerHandler.h
new file mode 100644
index 0000000000..1c002711e3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/AudioFocusManagerHandler.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_AUDIOFOCUSMANAGERHANDLER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_AUDIOFOCUSMANAGERHANDLER_H_
+
+#include <string>
+
+#include <AVSCommon/AVS/FocusState.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include "IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/AudioFocusManagerHandlerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract for the handler that will handle the AudioFocusManager namespace messages coming from the IPC client.
+ */
+class AudioFocusManagerHandler
+        : public IPCHandlerBase
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<AudioFocusManagerHandler> {
+public:
+    /**
+     * Create an instance of @c AudioFocusManagerHandler
+     *
+     * @param ipcHandlerRegistrar Used to register @c AudioFocusManagerHandler.
+     * @param audioFocusManagerComponent Handles the parsed AudioFocusManager payloads.
+     * @return Shared pointer to @c AudioFocusManagerHandler
+     */
+    static std::shared_ptr<AudioFocusManagerHandler> create(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<AudioFocusManagerHandlerInterface> audioFocusManagerComponent);
+
+    /**
+     * Sends a processChannelResult IPC message to the IPC client.
+     *
+     * @param token Token identifying the requestor.
+     * @param result Result of channel focus acquisition or release request.
+     */
+    void processChannelResult(unsigned token, bool result);
+
+    /**
+     * Sends a processFocusChanged IPC message to the IPC client.
+     *
+     * @param token Token identifying the requestor.
+     * @param focusState Enumerated focus state for the associated audio channel.
+     */
+    void processFocusChanged(unsigned token, avsCommon::avs::FocusState focusState);
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// Register this handler for its namespace and its methods for the corresponding namespace functions.
+    void registerHandlers();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param ipcHandlerRegistrar Used to register @c AudioFocusManagerHandler.
+     * @param audioFocusManagerComponent Handles the parsed AudioFocusManager payloads.
+     */
+    AudioFocusManagerHandler(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<AudioFocusManagerHandlerInterface> audioFocusManagerComponent);
+
+    /// A reference to the @c IPCHandlerRegistrationInterface used to register/deregister @c AudioFocusManagerHandler.
+    std::shared_ptr<IPCHandlerRegistrationInterface> m_ipcHandlerRegistrar;
+
+    /// A reference to the IPC dispatcher to dispatch messages to the IPC Client.
+    std::shared_ptr<IPCDispatcherInterface> m_ipcDispatcher;
+
+    /// A reference to the @c AudioFocusManagerHandlerInterface that will handle the parsed payloads.
+    std::shared_ptr<AudioFocusManagerHandlerInterface> m_audioFocusManagerComponent;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_AUDIOFOCUSMANAGERHANDLER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/DoNotDisturbHandler.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/DoNotDisturbHandler.h
new file mode 100644
index 0000000000..bb84ad73b9
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/DoNotDisturbHandler.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_DONOTDISTURBHANDLER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_DONOTDISTURBHANDLER_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include "IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/DoNotDisturbHandlerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract for the handler that will handle the DoNotDisturb namespace messages coming from the IPC client.
+ */
+class DoNotDisturbHandler
+        : public IPCHandlerBase
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<DoNotDisturbHandler> {
+public:
+    /**
+     * Create an instance of @c DoNotDisturbHandler
+     *
+     * @param ipcHandlerRegistrar Used to register @c DoNotDisturbHandler.
+     * @param doNotDisturbComponent Handles the parsed DoNotDisturb payloads.
+     * @return Shared pointer to @c DoNotDisturbHandler
+     */
+    static std::shared_ptr<DoNotDisturbHandler> create(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<DoNotDisturbHandlerInterface> doNotDisturbComponent);
+
+    /**
+     * Sends a setDoNotDisturbState IPC message to the IPC client.
+     *
+     * @param enabled States whether do not disturb setting is enabled.
+     */
+    void dispatchSetDoNotDisturbState(bool enabled);
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// Register this handler for its namespace and its methods for the corresponding namespace functions.
+    void registerHandlers();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param ipcHandlerRegistrar Used to register @c DoNotDisturbHandler.
+     * @param doNotDisturbComponent Handles the parsed DoNotDisturb payloads.
+     */
+    DoNotDisturbHandler(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<DoNotDisturbHandlerInterface> doNotDisturbComponent);
+
+    /// A reference to the @c IPCHandlerRegistrationInterface used to register/deregister @c DoNotDisturbHandler.
+    std::shared_ptr<IPCHandlerRegistrationInterface> m_ipcHandlerRegistrar;
+
+    /// A reference to the IPC dispatcher to dispatch messages to the IPC Client.
+    std::shared_ptr<IPCDispatcherInterface> m_ipcDispatcher;
+
+    /// A reference to the @c DoNotDisturbHandlerInterface that will handle the parsed payloads.
+    std::shared_ptr<DoNotDisturbHandlerInterface> m_doNotDisturbComponent;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_DONOTDISTURBHANDLER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/InteractionManagerHandler.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/InteractionManagerHandler.h
new file mode 100644
index 0000000000..576123b073
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/InteractionManagerHandler.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_INTERACTIONMANAGERHANDLER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_INTERACTIONMANAGERHANDLER_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include "IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/InteractionManagerHandlerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract for the handler that will handle the InteractionManager namespace messages coming from the IPC client.
+ */
+class InteractionManagerHandler
+        : public IPCHandlerBase
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<InteractionManagerHandler> {
+public:
+    /**
+     * Create an instance of @c InteractionManagerHandler
+     *
+     * @param ipcHandlerRegistrar Used to register @c InteractionManagerHandler.
+     * @param interactionManagerComponent Handles the parsed InteractionManager payloads.
+     * @return Shared pointer to @c InteractionManagerHandler
+     */
+    static std::shared_ptr<InteractionManagerHandler> create(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<InteractionManagerHandlerInterface> interactionManagerComponent);
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// Register this handler for its namespace and its methods for the corresponding namespace functions.
+    void registerHandlers();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param ipcHandlerRegistrar Used to register @c InteractionManagerHandler.
+     * @param interactionManagerComponent Handles the parsed InteractionManager payloads.
+     */
+    InteractionManagerHandler(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<InteractionManagerHandlerInterface> interactionManagerComponent);
+
+    /// A reference to the @c IPCHandlerRegistrationInterface used to register/deregister @c InteractionManagerHandler.
+    std::shared_ptr<IPCHandlerRegistrationInterface> m_ipcHandlerRegistrar;
+
+    /// A reference to the IPC dispatcher to dispatch messages to the IPC Client.
+    std::shared_ptr<IPCDispatcherInterface> m_ipcDispatcher;
+
+    /// A reference to the @c InteractionManagerHandlerInterface that will handle the parsed payloads.
+    std::shared_ptr<InteractionManagerHandlerInterface> m_interactionManagerComponent;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_INTERACTIONMANAGERHANDLER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/LiveViewCameraHandler.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/LiveViewCameraHandler.h
new file mode 100644
index 0000000000..7947634cbe
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/LiveViewCameraHandler.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_LIVEVIEWCAMERAHANDLER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_LIVEVIEWCAMERAHANDLER_H_
+
+#include <memory>
+#include <string>
+
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include "IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/LiveViewCameraHandlerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract for the handler that will handle the LiveViewCamera namespace messages coming from the IPC client.
+ */
+class LiveViewCameraHandler
+        : public IPCHandlerBase
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<LiveViewCameraHandler> {
+public:
+    /**
+     * Create an instance of @c LiveViewCameraHandler
+     *
+     * @param ipcHandlerRegistrar Used to register @c LiveViewCameraHandler.
+     * @param liveViewCameraComponent Handles the parsed LiveViewCamera payloads.
+     * @return Shared pointer to @c LiveViewCameraHandler
+     */
+    static std::shared_ptr<LiveViewCameraHandler> create(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<LiveViewCameraHandlerInterface> liveViewCameraComponent);
+
+    /**
+     * Sends a renderCamera IPC message to the IPC client.
+     *
+     * @param startLiveViewPayload The payload of the corresponding StartLiveView directive.
+     */
+    void renderCamera(const std::string& startLiveViewPayload);
+
+    /**
+     * Sends a setCameraState IPC message to the IPC client.
+     *
+     * @param cameraState Enumerated live view camera state.
+     */
+    void setCameraState(const std::string& cameraState);
+
+    /**
+     * Sends a clearCamera IPC message to the IPC client.
+     */
+    void clearCamera();
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// Register this handler for its namespace and its methods for the corresponding namespace functions.
+    void registerHandlers();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param ipcHandlerRegistrar Used to register @c LiveViewCameraHandler.
+     * @param liveViewCameraComponent Handles the parsed LiveViewCamera payloads.
+     */
+    LiveViewCameraHandler(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<LiveViewCameraHandlerInterface> liveViewCameraComponent);
+
+    /// A reference to the @c IPCHandlerRegistrationInterface used to register/deregister @c LiveViewCameraHandler.
+    std::shared_ptr<IPCHandlerRegistrationInterface> m_ipcHandlerRegistrar;
+
+    /// A reference to the IPC dispatcher to dispatch messages to the IPC Client.
+    std::shared_ptr<IPCDispatcherInterface> m_ipcDispatcher;
+
+    /// A reference to the @c LiveViewCameraHandlerInterface that will handle the parsed payloads.
+    std::shared_ptr<LiveViewCameraHandlerInterface> m_liveViewCameraComponent;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_LIVEVIEWCAMERAHANDLER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/LoggerHandler.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/LoggerHandler.h
new file mode 100644
index 0000000000..d4a180a0ed
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/LoggerHandler.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_LOGGERHANDLER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_LOGGERHANDLER_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include "IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/LoggerHandlerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract for the handler that will handle the Logger namespace messages coming from the IPC client.
+ */
+class LoggerHandler
+        : public IPCHandlerBase
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<LoggerHandler> {
+public:
+    /**
+     * Create an instance of @c LoggerHandler
+     *
+     * @param ipcHandlerRegistrar Used to register @c LoggerHandler.
+     * @param loggerComponent Handles the parsed Logger payloads.
+     * @return Shared pointer to @c LoggerHandler
+     */
+    static std::shared_ptr<LoggerHandler> create(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<LoggerHandlerInterface> loggerComponent);
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// Register this handler for its namespace and its methods for the corresponding namespace functions.
+    void registerHandlers();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param ipcHandlerRegistrar Used to register @c LoggerHandler.
+     * @param loggerComponent Handles the parsed Logger payloads.
+     */
+    LoggerHandler(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<LoggerHandlerInterface> loggerComponent);
+
+    /// A reference to the @c IPCHandlerRegistrationInterface used to register/deregister @c LoggerHandler.
+    std::shared_ptr<IPCHandlerRegistrationInterface> m_ipcHandlerRegistrar;
+
+    /// A reference to the IPC dispatcher to dispatch messages to the IPC Client.
+    std::shared_ptr<IPCDispatcherInterface> m_ipcDispatcher;
+
+    /// A reference to the @c LoggerHandlerInterface that will handle the parsed payloads.
+    std::shared_ptr<LoggerHandlerInterface> m_loggerComponent;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_LOGGERHANDLER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/SessionSetupHandler.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/SessionSetupHandler.h
new file mode 100644
index 0000000000..4233a48f3a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/SessionSetupHandler.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_SESSIONSETUPHANDLER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_SESSIONSETUPHANDLER_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include "IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/SessionSetupHandlerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract for the handler that will handle the SessionSetup namespace messages coming from the IPC client.
+ */
+class SessionSetupHandler
+        : public IPCHandlerBase
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<SessionSetupHandler> {
+public:
+    /**
+     * Create an instance of @c SessionSetupHandler
+     *
+     * @param ipcHandlerRegistrar Used to register @c SessionSetupHandler.
+     * @param sessionSetupComponent Handles the parsed SessionSetup payloads.
+     * @return Shared pointer to @c SessionSetupHandler
+     */
+    static std::shared_ptr<SessionSetupHandler> create(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<SessionSetupHandlerInterface> sessionSetupComponent);
+
+    /**
+     * Sends a configureClient IPC message to the IPC client.
+     *
+     * @param payload Payload is an opaque object defined by the IPC Client.
+     */
+    void dispatchConfigureClient(const std::string& payload);
+
+    /**
+     * Sends a initializeClient IPC message to the IPC client.
+     *
+     * @param ipcVersion Version number of the ACSDK IPC framework requesting the connection to the IPC client.
+     */
+    void dispatchInitializeClient(const std::string& ipcVersion);
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// Register this handler for its namespace and its methods for the corresponding namespace functions.
+    void registerHandlers();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param ipcHandlerRegistrar Used to register @c SessionSetupHandler.
+     * @param sessionSetupComponent Handles the parsed SessionSetup payloads.
+     */
+    SessionSetupHandler(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<SessionSetupHandlerInterface> sessionSetupComponent);
+
+    /// A reference to the @c IPCHandlerRegistrationInterface used to register/deregister @c SessionSetupHandler.
+    std::shared_ptr<IPCHandlerRegistrationInterface> m_ipcHandlerRegistrar;
+
+    /// A reference to the IPC dispatcher to dispatch messages to the IPC Client.
+    std::shared_ptr<IPCDispatcherInterface> m_ipcDispatcher;
+
+    /// A reference to the @c SessionSetupHandlerInterface that will handle the parsed payloads.
+    std::shared_ptr<SessionSetupHandlerInterface> m_sessionSetupComponent;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_SESSIONSETUPHANDLER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/SystemHandler.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/SystemHandler.h
new file mode 100644
index 0000000000..8d1ea645d6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/SystemHandler.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_SYSTEMHANDLER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_SYSTEMHANDLER_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include "IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/SystemHandlerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract for the handler that will handle the System namespace messages coming from the IPC client.
+ */
+class SystemHandler
+        : public IPCHandlerBase
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<SystemHandler> {
+public:
+    /**
+     * Create an instance of @c SystemHandler
+     *
+     * @param ipcHandlerRegistrar Used to register @c SystemHandler.
+     * @param systemComponent Handles the parsed System payloads.
+     * @return Shared pointer to @c SystemHandler
+     */
+    static std::shared_ptr<SystemHandler> create(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<SystemHandlerInterface> systemComponent);
+
+    /**
+     * Provides the IPC Client with information to complete CBL based authorization.
+     *
+     * @param url The url to use to complete CBL-based LWA authrorization.
+     * @param code The CBL code to use to complete authorization.
+     * @param clientId AVS Device Id.
+     */
+    void completeAuthorization(const std::string& url, const std::string& code, const std::string& clientId);
+
+    /**
+     * Informs the IPC Client of changes in the state of the Alexa client connection.
+     *
+     * @param state Enumerated state of the Alexa client.
+     */
+    void setAlexaState(const std::string& state);
+
+    /**
+     * Informs the IPC Client of changes in Alexa Authorization status.
+     *
+     * @param state Enumerated authorization state.
+     */
+    void setAuthorizationState(const std::string& state);
+
+    /**
+     * Informs the  IPC Client of changes in supported locales for the SDK.
+     *
+     * @param localeStr The locale(s) for the device. In single-locale mode, contains one locale string.
+     * In multi-locale mode, the first string indicates the primary locale, and any other strings correspond to
+     * secondary locales.
+     */
+    void setLocales(const std::string& localeStr);
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// Register this handler for its namespace and its methods for the corresponding namespace functions.
+    void registerHandlers();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param ipcHandlerRegistrar Used to register @c SystemHandler.
+     * @param systemComponent Handles the parsed System payloads.
+     */
+    SystemHandler(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<SystemHandlerInterface> systemComponent);
+
+    /// A reference to the @c IPCHandlerRegistrationInterface used to register/deregister @c SystemHandler.
+    std::shared_ptr<IPCHandlerRegistrationInterface> m_ipcHandlerRegistrar;
+
+    /// A reference to the IPC dispatcher to dispatch messages to the IPC Client.
+    std::shared_ptr<IPCDispatcherInterface> m_ipcDispatcher;
+
+    /// A reference to the @c SystemHandlerInterface that will handle the parsed payloads.
+    std::shared_ptr<SystemHandlerInterface> m_systemComponent;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_SYSTEMHANDLER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/TemplateRuntimeHandler.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/TemplateRuntimeHandler.h
new file mode 100644
index 0000000000..cc45047e0c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/TemplateRuntimeHandler.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_TEMPLATERUNTIMEHANDLER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_TEMPLATERUNTIMEHANDLER_H_
+
+#include <string>
+
+#include <acsdk/Sample/TemplateRuntime/TemplateRuntimePresentationAdapterObserverInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include "IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/TemplateRuntimeHandlerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract for the handler that will handle the TemplateRuntime namespace messages coming from the IPC client.
+ */
+class TemplateRuntimeHandler
+        : public IPCHandlerBase
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public common::TemplateRuntimePresentationAdapterObserverInterface
+        , public std::enable_shared_from_this<TemplateRuntimeHandler> {
+public:
+    /**
+     * Create an instance of @c TemplateRuntimeHandler
+     *
+     * @param ipcHandlerRegistrar Used to register @c TemplateRuntimeHandler.
+     * @param templateRuntimeComponent Pointer to the @c TemplateRuntimeHandlerInterface.
+     * @return Shared pointer to @c TemplateRuntimeHandler
+     */
+    static std::shared_ptr<TemplateRuntimeHandler> create(
+        const std::shared_ptr<IPCHandlerRegistrationInterface>& ipcHandlerRegistrar,
+        const std::shared_ptr<TemplateRuntimeHandlerInterface>& templateRuntimeComponent);
+
+    /// @name TemplateRuntimePresentationAdapterObserverInterface Functions
+    /// @{
+    void renderTemplateCard(const std::string& jsonPayload) override;
+    void renderPlayerInfoCard(
+        const std::string& jsonPayload,
+        templateRuntimeInterfaces::TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) override;
+    void clearRenderTemplateCard() override;
+    void clearPlayerInfoCard() override;
+    /// @}
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// Register this handler for its namespace and its methods for the corresponding namespace functions.
+    void registerHandlers();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param ipcHandlerRegistrar Used to register @c TemplateRuntimeHandler.
+     * @param templateRuntimeComponent Pointer to the @c TemplateRuntimeHandlerInterface.
+     */
+    TemplateRuntimeHandler(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<TemplateRuntimeHandlerInterface> templateRuntimeComponent);
+
+    /// A reference to the @c IPCHandlerRegistrationInterface used to register/deregister @c TemplateRuntimeHandler.
+    std::shared_ptr<IPCHandlerRegistrationInterface> m_ipcHandlerRegistrar;
+
+    /// A reference to the IPC dispatcher to dispatch messages to the IPC Client.
+    std::shared_ptr<IPCDispatcherInterface> m_ipcDispatcher;
+
+    /// A reference to the @c TemplateRuntimeHandlerInterface that will handle the parsed payloads.
+    std::shared_ptr<TemplateRuntimeHandlerInterface> m_templateRuntimeComponent;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_TEMPLATERUNTIMEHANDLER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/WindowManagerHandler.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/WindowManagerHandler.h
new file mode 100644
index 0000000000..2dc81cd41c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Components/WindowManagerHandler.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_WINDOWMANAGERHANDLER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_WINDOWMANAGERHANDLER_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include "IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/WindowManagerHandlerInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract for the handler that will handle the WindowManager namespace messages coming from the IPC client.
+ */
+class WindowManagerHandler
+        : public IPCHandlerBase
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<WindowManagerHandler> {
+public:
+    /**
+     * Create an instance of @c WindowManagerHandler
+     *
+     * @param ipcHandlerRegistrar Used to register @c WindowManagerHandler.
+     * @param windowManagerComponent Handles the parsed WindowManager payloads.
+     * @return Shared pointer to @c WindowManagerHandler
+     */
+    static std::shared_ptr<WindowManagerHandler> create(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<WindowManagerHandlerInterface> windowManagerComponent);
+
+    /**
+     * Sends a setVisualCharacteristics IPC message to the IPC client.
+     *
+     * @param displayCharacteristicOpt Serialized configuration object for the Alexa.Display capability (optional).
+     * @param interactionModesOpt Serialized configuration object for the Alexa.InteractionMode capability (optional).
+     * @param windowTemplatesOpt Serialized configuration object for the Alexa.DisplayWindow capability (optional).
+     */
+    void dispatchSetVisualCharacteristics(
+        const avsCommon::utils::Optional<std::string>& displayCharacteristicOpt,
+        const avsCommon::utils::Optional<std::string>& interactionModesOpt,
+        const avsCommon::utils::Optional<std::string>& windowTemplatesOpt);
+
+    /**
+     * Informs the IPC client to clear the content of the given window.
+     *
+     * @param windowId Id of the window to clear in the IPC client.
+     */
+    void dispatchClearWindow(const std::string& windowId);
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// Register this handler for its namespace and its methods for the corresponding namespace functions.
+    void registerHandlers();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param ipcHandlerRegistrar Used to register @c WindowManagerHandler.
+     * @param windowManagerComponent Handles the parsed WindowManager payloads.
+     */
+    WindowManagerHandler(
+        std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+        std::shared_ptr<WindowManagerHandlerInterface> windowManagerComponent);
+
+    /// A reference to the @c IPCHandlerRegistrationInterface used to register/deregister @c WindowManagerHandler.
+    std::shared_ptr<IPCHandlerRegistrationInterface> m_ipcHandlerRegistrar;
+
+    /// A reference to the IPC dispatcher to dispatch messages to the IPC Client.
+    std::shared_ptr<IPCDispatcherInterface> m_ipcDispatcher;
+
+    /// A reference to the @c WindowManagerHandlerInterface that will handle the parsed payloads.
+    std::shared_ptr<WindowManagerHandlerInterface> m_windowManagerComponent;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_COMPONENTS_WINDOWMANAGERHANDLER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/APLClientHandlerInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/APLClientHandlerInterface.h
new file mode 100644
index 0000000000..8afccad539
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/APLClientHandlerInterface.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_APLCLIENTHANDLERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_APLCLIENTHANDLERINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract to handle APLClient.
+ */
+class APLClientHandlerInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~APLClientHandlerInterface() = default;
+
+    /**
+     * IPC Client sends this event to initialize any native APLClientRenderer instances required for the IPC client’s
+     * windows.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void initializeRenderersRequest(const std::string& message) = 0;
+
+    /**
+     * This event is sent from the APL IPC Viewhost to report APL Metrics defined in the Viewhost. Not intended to be
+     * manually invoked from the IPC client.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void metricsReport(const std::string& message) = 0;
+
+    /**
+     * This event is sent from the APL IPC Viewhost for communicating with APLCore. Not intended to be manually invoked
+     * from the IPC client.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void viewhostEvent(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event when the IPC APL Viewhost has completed inflation of an APL document after receipt of
+     * a createRenderer directive.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void renderCompleted(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to initiate the local rendering of an APL document.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void renderDocumentRequest(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to initiate APL commands on a document rendered via renderDocumentRequest.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void executeCommandsRequest(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to clear a local APL document rendered via renderDocumentRequest and release the
+     * native renderer.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void clearDocumentRequest(const std::string& message) = 0;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_APLCLIENTHANDLERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/AudioFocusManagerHandlerInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/AudioFocusManagerHandlerInterface.h
new file mode 100644
index 0000000000..62f6acd45c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/AudioFocusManagerHandlerInterface.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_AUDIOFOCUSMANAGERHANDLERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_AUDIOFOCUSMANAGERHANDLERINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/// AVS interface json key in the message.
+static const char AVS_INTERFACE_TAG[] = "avsInterface";
+
+/// The token json key in the message.
+static const char AUDIO_FOCUS_MANAGER_TOKEN_TAG[] = "token";
+
+/// The channel name key in the message.
+static const char CHANNEL_NAME_TAG[] = "channelName";
+
+/// The content type key in the message.
+static const char CONTENT_TYPE_TAG[] = "contentType";
+
+/**
+ * A contract to handle AudioFocusManager.
+ */
+class AudioFocusManagerHandlerInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~AudioFocusManagerHandlerInterface() = default;
+
+    /**
+     * IPC Client sends this event to request the SDK to acquire audio focus for the given channel.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void acquireChannelRequest(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to request the SDK to release audio focus for the given channel.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void releaseChannelRequest(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to inform the SDK that it has received the processFocusChanged directive.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void focusChangedReport(const std::string& message) = 0;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_AUDIOFOCUSMANAGERHANDLERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/DoNotDisturbHandlerInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/DoNotDisturbHandlerInterface.h
new file mode 100644
index 0000000000..b94925d306
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/DoNotDisturbHandlerInterface.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_DONOTDISTURBHANDLERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_DONOTDISTURBHANDLERINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/// The enabled json key in the message.
+static const char ENABLED_TAG[] = "enabled";
+
+/**
+ * A contract to handle DoNotDisturb mode.
+ */
+class DoNotDisturbHandlerInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~DoNotDisturbHandlerInterface() = default;
+
+    /**
+     * Set Do Not Disturb mode.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void doNotDisturbStateChanged(const std::string& message) = 0;
+
+    /**
+     * Request the SDK to inform current Do Not Disturb setting state.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void doNotDisturbStateRequest(const std::string& message) = 0;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_DONOTDISTURBHANDLERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/InteractionManagerHandlerInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/InteractionManagerHandlerInterface.h
new file mode 100644
index 0000000000..c60a1489fd
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/InteractionManagerHandlerInterface.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_INTERACTIONMANAGERHANDLERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_INTERACTIONMANAGERHANDLERINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/// The initiatorType json key in the message.
+static const char AUDIO_INPUT_INITIATOR_TYPE_TAG[] = "initiatorType";
+
+/// The captureState json key in the message.
+static const char CAPTURE_STATE_TAG[] = "captureState";
+
+/// The event json key in the message.
+static const char EVENT_TAG[] = "event";
+
+/**
+ * This contract handles the user interaction events coming from client.
+ */
+class InteractionManagerHandlerInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~InteractionManagerHandlerInterface() = default;
+
+    /**
+     * Open or close the microphone to start an Alexa interaction via the SpeechRecognizer.Recognize event.
+     * @see https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/speechrecognizer.html#recognize
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void recognizeSpeechRequest(const std::string& message) = 0;
+
+    /**
+     * Handle event the navigation event.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void navigationEvent(const std::string& message) = 0;
+
+    /**
+     * Handle GUI activity event message.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void guiActivityEvent(const std::string& message) = 0;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_INTERACTIONMANAGERHANDLERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/LiveViewCameraHandlerInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/LiveViewCameraHandlerInterface.h
new file mode 100644
index 0000000000..93cc1c66a2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/LiveViewCameraHandlerInterface.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_LIVEVIEWCAMERAHANDLERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_LIVEVIEWCAMERAHANDLERINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/// The enabled json key in the message.
+static const char CAMERA_ENABLED_TAG[] = "enabled";
+
+/// The window id json key in the message.
+static const char CAMERA_WINDOW_ID_TAG[] = "windowId";
+
+/**
+ * A contract to handle LiveViewCamera.
+ */
+class LiveViewCameraHandlerInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~LiveViewCameraHandlerInterface() = default;
+
+    /**
+     * IPC client has changed the state of the camera microphone used for 2-way communication.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void cameraMicrophoneStateChanged(const std::string& message) = 0;
+
+    /**
+     * IPC client rendered the first frame of the live view camera.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void cameraFirstFrameRendered(const std::string& message) = 0;
+
+    /**
+     * IPC client sends this event to report the windowId used for displaying live view camera.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void windowIdReport(const std::string& message) = 0;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_LIVEVIEWCAMERAHANDLERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/LoggerHandlerInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/LoggerHandlerInterface.h
new file mode 100644
index 0000000000..5f2aae6a45
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/LoggerHandlerInterface.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_LOGGERHANDLERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_LOGGERHANDLERINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/// The level json key in the message.
+static const char LEVEL_TAG[] = "level";
+
+/// The message json key in the message.
+static const char MESSAGE_TAG[] = "message";
+
+/**
+ * A contract to handle Logger.
+ */
+class LoggerHandlerInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~LoggerHandlerInterface() = default;
+
+    /**
+     * IPC Client sends this event to log a message to the SDK’s native logger implementation
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void logEvent(const std::string& message) = 0;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_LOGGERHANDLERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/SessionSetupHandlerInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/SessionSetupHandlerInterface.h
new file mode 100644
index 0000000000..d1cb142f27
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/SessionSetupHandlerInterface.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_SESSIONSETUPHANDLERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_SESSIONSETUPHANDLERINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/// Entries json key in the message.
+static const char ENTRIES_TAG[] = "entries";
+
+/// Namespace json key in the message.
+static const char NAMESPACE_TAG[] = "namespace";
+
+/// Version json key in the message.
+static const char VERSION_TAG[] = "version";
+
+/// IsIPCVersionSupport json key in the message.
+static const char IS_IPC_VERSION_SUPPORTED_TAG[] = "isIPCVersionSupported";
+
+/**
+ * A contract to handle SessionSetup.
+ */
+class SessionSetupHandlerInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~SessionSetupHandlerInterface() = default;
+
+    /**
+     * IPC Client sends this event to inform the SDK of the supported IPC namespace versions in the client.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void namespaceVersionsReport(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to inform the SDK as a response to the initializeClient directive.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void clientInitialized(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to request SDK to send a client-defined config payload for the IPC Client via the
+     * configureClient directive.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void clientConfigRequest(const std::string& message) = 0;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_SESSIONSETUPHANDLERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/SystemHandlerInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/SystemHandlerInterface.h
new file mode 100644
index 0000000000..cca1402f9b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/SystemHandlerInterface.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_SYSTEMHANDLERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_SYSTEMHANDLERINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract to handle System.
+ */
+class SystemHandlerInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~SystemHandlerInterface() = default;
+
+    /**
+     * IPC Client sends this event to request the native client to return the authorization state through the
+     * setAuthorizationState directive.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void authorizationStateRequest(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to request the native client to return the Alexa state through the setAlexaState
+     * directive.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void alexaStateRequest(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to request the native client to return the authorization information through the
+     * completeAuthorization directive.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void authorizationInfoRequest(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to request the native client to return the supported locales through the setLocales
+     * directive.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void localesRequest(const std::string& message) = 0;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_SYSTEMHANDLERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/TemplateRuntimeHandlerInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/TemplateRuntimeHandlerInterface.h
new file mode 100644
index 0000000000..fcf99d77f6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/TemplateRuntimeHandlerInterface.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_TEMPLATERUNTIMEHANDLERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_TEMPLATERUNTIMEHANDLERINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/// Render Template window id json key in the message.
+static const char RENDER_TEMPLATE_WINDOW_ID_TAG[] = "renderTemplateWindowId";
+
+/// Render Player Info window id json key in the message.
+static const char RENDER_PLAYER_INFO_WINDOW_ID_TAG[] = "renderPlayerInfoWindowId";
+
+/**
+ * A contract to handle TemplateRuntime.
+ */
+class TemplateRuntimeHandlerInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~TemplateRuntimeHandlerInterface() = default;
+
+    /**
+     * IPC Client sends this event to report the windowId’s used in the IPC Client to display RenderTemplate and
+     * RenderPlayerInfo payloads to the Alexa client for purposes of presentation orchestration.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void windowIdReport(const std::string& message) = 0;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_TEMPLATERUNTIMEHANDLERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/WindowManagerHandlerInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/WindowManagerHandlerInterface.h
new file mode 100644
index 0000000000..1beb271d6f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/HandlerInterfaces/WindowManagerHandlerInterface.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_WINDOWMANAGERHANDLERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_WINDOWMANAGERHANDLERINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/// Characteristics json key in the message.
+static const char CHARACTERISTICS_TAG[] = "characteristics";
+
+/// Device display json key in the message.
+static const char DEVICE_DISPLAY_TAG[] = "deviceDisplay";
+
+/// Window templates json key in the message.
+static const char WINDOW_TEMPLATES_TAG[] = "windowTemplates";
+
+/// Interaction modes json key in the message.
+static const char INTERACTION_MODES_TAG[] = "interactionModes";
+
+/// Default window id json key in the message.
+static const char DEFAULT_WINDOW_ID_TAG[] = "defaultWindowId";
+
+/// Audio playback UI window id json key in the message.
+static const char AUDIO_PLAYBACK_UI_WINDOW_ID_TAG[] = "audioPlaybackUIWindowId";
+
+/// The window instances json key in the message.
+static const char WINDOW_INSTANCES_TAG[] = "windowInstances";
+
+/// The window id json key in the message.
+static const char WINDOW_ID_TAG[] = "windowId";
+
+/// The template id json key in the message.
+static const char TEMPLATE_ID_TAG[] = "templateId";
+
+/// The interaction mode json key in the message.
+static const char INTERACTION_MODE_TAG[] = "interactionMode";
+
+/// The size configuration id json key in the message.
+static const char SIZE_CONFIGURATION_ID_TAG[] = "sizeConfigurationId";
+
+/// The supported interfaces json key in the message.
+static const char SUPPORTED_INTERFACES[] = "supportedInterfaces";
+
+/// The zOrderIndex json key in the message.
+static const char Z_ORDER_INDEX[] = "zOrderIndex";
+
+/// The window ids json key in the message.
+static const char WINDOW_IDS_TAG[] = "windowIds";
+
+/**
+ * A contract to handle WindowManager.
+ */
+class WindowManagerHandlerInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~WindowManagerHandlerInterface() = default;
+
+    /**
+     * IPC Client sends this event to request the visual characteristics asserted by SDK.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void visualCharacteristicsRequest(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to inform the SDK of a change to the default window instance id to report in
+     * WindowState.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void defaultWindowInstanceChanged(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to inform the SDK of the window instances created in the IPC Client to track for
+     * visual presentation.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void windowInstancesReport(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to inform the SDK of the window instances added in the IPC Client to track for visual
+     * presentation.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void windowInstancesAdded(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to inform the SDK of the window instances removed in the IPC Client to no longer
+     * track for visual presentation.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void windowInstancesRemoved(const std::string& message) = 0;
+
+    /**
+     * IPC Client sends this event to inform the SDK of the window instances updated in the IPC Client.
+     *
+     * @param message Incoming IPC message from the IPC client.
+     */
+    virtual void windowInstancesUpdated(const std::string& message) = 0;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_HANDLERINTERFACES_WINDOWMANAGERHANDLERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCDispatcherInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCDispatcherInterface.h
new file mode 100644
index 0000000000..420cf4bd04
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCDispatcherInterface.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCDISPATCHERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCDISPATCHERINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract that helps application to communicate with client by dispatching messages over IPC.
+ */
+class IPCDispatcherInterface {
+public:
+    /**
+     * Dispatches a message over IPC channel.
+     * @param message Message to be transmitted.
+     *
+     * return true if successful.
+     */
+    virtual bool dispatch(const std::string& message) = 0;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCDISPATCHERINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCHandlerBase.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCHandlerBase.h
new file mode 100644
index 0000000000..4f94569a54
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCHandlerBase.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCHANDLERBASE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCHANDLERBASE_H_
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A Base class to assist IPC components to handle messages coming from IPC client.
+ */
+class IPCHandlerBase {
+public:
+    /**
+     * Invokes a method to handle an IPC message.
+     * @param methodName Name of the method to be invoked.
+     * @param message Message to be handled by a concrete method.
+     */
+    void invokeMethod(const std::string& methodName, const std::string& message);
+
+    /// Alias for the message handler function.
+    using IPCMessageHandler = std::function<void(const std::string&)>;
+
+    /**
+     * Destructor.
+     */
+    ~IPCHandlerBase();
+
+protected:
+    /**
+     * Base IPC handler constructor. Note: We do not expect this class to be instantiated on its own.
+     *
+     * @param namespaceName Namespace of the realized IPC handler class.
+     * @param executor Executor context to support operations asynchronously.
+     */
+    IPCHandlerBase(
+        const std::string& namespaceName,
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> executor);
+
+    /**
+     * Registers the method that handles an IPC message.
+     *
+     * @param methodName Name of the IPC method for which handler has to be registered.
+     * @param handlerFunction Function reference to be invoked for the said method.
+     * @return true is successful.
+     */
+    bool registerIPCMessageHandlerMethod(const std::string& methodName, IPCMessageHandler handlerFunction);
+
+    /**
+     * De-registers the method that handles an IPC message.
+     *
+     * @param methodName Name of the IPC method for which handler has to be registered.
+     * @return true is successful.
+     */
+    bool deregisterIPCMessageHandlerMethod(const std::string& methodName);
+
+    /// Name of the namespace of the realized IPC handler class.
+    std::string m_namespaceName;
+
+    /// Dictionary to hold the IPC message handler methods.
+    std::unordered_map<std::string, IPCMessageHandler> m_messageHandlers;
+
+    /// Executor context to support operations asynchronously.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> m_executor;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCHANDLERBASE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h
new file mode 100644
index 0000000000..1f5a8648ab
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCHANDLERREGISTRATIONINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCHANDLERREGISTRATIONINTERFACE_H_
+#include <string>
+#include <memory>
+
+#include "IPCServerSampleApp/IPC/IPCDispatcherInterface.h"
+#include "IPCServerSampleApp/IPC/IPCHandlerBase.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * A contract to register IPC message handler for a given namespace.
+ */
+class IPCHandlerRegistrationInterface {
+public:
+    /**
+     * Default Destructor.
+     */
+    virtual ~IPCHandlerRegistrationInterface() = default;
+
+    /**
+     * Registers a IPC handler interface for a given namespace
+     *
+     * @param ipcNamespace Namespace for the IPC handler to be registered.
+     * @param handler A weak pointer to the handler instance.
+     * @return an instance of Dispatcher used to sending message over IPC channel.
+     */
+    virtual std::shared_ptr<IPCDispatcherInterface> registerHandler(
+        const std::string& ipcNamespace,
+        std::weak_ptr<IPCHandlerBase> handler) = 0;
+
+    /**
+     * De-registers a IPC handler interface for a given namespace
+     * @param ipcNamespace Namespace for the IPC handler to be de-registered.
+     *
+     * @return true if successful.
+     */
+    virtual bool deregisterHandler(const std::string& ipcNamespace) = 0;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCHANDLERREGISTRATIONINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCRouter.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCRouter.h
new file mode 100644
index 0000000000..31a2114d66
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCRouter.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCROUTER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCROUTER_H_
+
+#include <memory>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include <Communication/MessageListenerInterface.h>
+#include <Communication/MessagingServerInterface.h>
+
+#include "IPCServerSampleApp/IPC/IPCDispatcherInterface.h"
+#include "IPCServerSampleApp/IPC/IPCHandlerRegistrationInterface.h"
+#include "IPCServerSampleApp/IPC/IPCHandlerBase.h"
+#include "IPCServerSampleApp/IPC/IPCVersionManager.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/**
+ * The function of this class is responsible for managing the messages to and from IPC client.
+ * Following are the rules:
+ * 1. On initialization, router will register IPC messaging contracts used for sending and receiving messages over IPC.
+ * 2. Router will also register all the feature IPC handlers that implements IPC channel for their respective
+ *    namespaces. It can de-register the IPC components.
+ * 3. While registered, router will provide a concrete ipc dispatcher (implemented by self).
+ * 4. When router receives a message, it sniffs the namespace from header and passes on the payload/message to the
+ *    handler and request to `invokeMethod`. Note that access to handler component registry is time-bound and
+ *    thread-safe. To accommodate these attributes, this class deliberately avoids executor pattern and instead relies
+ *    on mutex lock to minimize the critical section.
+ * 5. When handler gets a message that needs to be communicated over IPC, router constructs appropriate message and
+ *    dispatches.
+ */
+class IPCRouter
+        : public IPCHandlerRegistrationInterface
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown {
+public:
+    /**
+     * Constructs an instance of an IPC Router.
+     *
+     * @param messagingServer An implementation of @c MessagingServerInterface.
+     * @param ipcDispatcher An instance of a message dispatcher to IPC Client.
+     * @param ipcVersionManager An instance of a @c IPCVersionManager.
+     * @return an instance of IPCRouter.
+     */
+    static std::shared_ptr<IPCRouter> create(
+        std::shared_ptr<communication::MessagingServerInterface> messagingServer,
+        std::shared_ptr<IPCDispatcherInterface> ipcDispatcher,
+        std::shared_ptr<IPCVersionManager> ipcVersionManager);
+
+    /**
+     * Called when a new message needs to be routed to registered ipc component.
+     *
+     * @note Blocking in this handler will block delivery of further messages.
+     * @param message a serialized message that needs to be routed to respective IPC component.
+     */
+    void onMessage(const std::string& message);
+
+    /// @name IPCHandlerRegistrationInterface Functions
+    /// @{
+    std::shared_ptr<IPCDispatcherInterface> registerHandler(
+        const std::string& ipcNamespace,
+        std::weak_ptr<IPCHandlerBase> handler) override;
+    bool deregisterHandler(const std::string& ipcNamespace) override;
+    /// @}
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+private:
+    /// Inner struct to wrap a weak handler instance.
+    struct HandlerInstance {
+        const std::string& ipcNamespace;
+        std::weak_ptr<IPCHandlerBase> handler;
+    };
+
+    /**
+     * Create an instance of an IPC Router.
+     *
+     * @param messagingServer An implementation of @c MessagingServerInterface
+     * @param ipcDispatcher An instance of a message dispatcher to IPC Client.
+     * @param ipcVersionManager An instance of a @c IPCVersionManager.
+     */
+    IPCRouter(
+        std::shared_ptr<communication::MessagingServerInterface> messagingServer,
+        std::shared_ptr<IPCDispatcherInterface> ipcDispatcher,
+        const std::shared_ptr<IPCVersionManager> ipcVersionManager);
+
+    /**
+     * If registered, gets the handler instance from the router registry.
+     * Note: Caller should ensure this call is thread-safe; must lock handler registry.
+     *
+     * @param ipcNamespace Namespace for the IPC handler.
+     * @return If available, returns the ipc handler instance else nullptr.
+     */
+    std::shared_ptr<IPCHandlerBase> getHandlerRegisteredLocked(const std::string& ipcNamespace);
+
+    /// A dictionary used for storing registered IPC handlers.
+    std::unordered_map<std::string, HandlerInstance> m_handlerMap;
+
+    /// The server implementation.
+    std::shared_ptr<communication::MessagingServerInterface> m_messagingServer;
+
+    /// The Listener to receive the messages.
+    std::shared_ptr<communication::MessageListenerInterface> m_messageListener;
+
+    /// The IPC Version Manager
+    std::shared_ptr<IPCVersionManager> m_ipcVersionManager;
+
+    /// The dispatcher for sending message to IPC client.
+    std::shared_ptr<IPCDispatcherInterface> m_ipcDispatcher;
+
+    /// Mutex to ensure handlerMap is thread-safe.
+    std::mutex m_mutex;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCROUTER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCVersionManager.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCVersionManager.h
new file mode 100644
index 0000000000..c7a5f79f86
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/IPCVersionManager.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCVERSIONMANAGER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCVERSIONMANAGER_H_
+
+#include <rapidjson/document.h>
+#include <list>
+#include <unordered_map>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+class IPCVersionManager {
+public:
+    IPCVersionManager();
+
+    virtual ~IPCVersionManager() = default;
+
+    /**
+     * Validates the Namespace Versions
+     *
+     * @param payload The rapidjson payload containing the namespace-version entries.
+     * @return true if versions are the same, false if there is a version mismatch.
+     */
+    bool handleAssertNamespaceVersions(const rapidjson::Document& payload);
+
+    /**
+     * Validates the Namespace Version using a serialized payload
+     *
+     * @param payload The serialized payload containing the namespace-version entries.
+     * @return true if versions are the same, false if there is a version mismatch.
+     */
+    bool handleAssertNamespaceVersionsFromString(const std::string& payload);
+
+    /**
+     * Validates an individual namespace-version entry
+     *
+     * @param ns The namespace to validate the version of
+     * @param clientNamespaceVersion The IPC client version to validate against
+     * @return true if versions are the same, false if there is a version mismatch
+     */
+    bool validateVersionForNamespace(const std::string& ns, int clientNamespaceVersion);
+
+    /**
+     * Adds a namespace-version entry to the VersionManager
+     *
+     * @param ns The namespace to add
+     * @param version The version to add
+     */
+    void registerNamespaceVersionEntry(const std::string& ns, int version);
+
+    /**
+     * Removes a namespace-version entry from the VersionManager
+     *
+     * @param ns Namespace of the namespace-version entry to remove
+     */
+    void deregisterNamespaceVersionEntry(const std::string& ns);
+
+private:
+    /**
+     * Extracts namespace-version entries from rapidjson::Document
+     *
+     * @param message The rapidjson document containing the namespace-version entries.
+     * @return namespace-version entries
+     */
+    static std::unordered_map<std::string, int> buildMapFromEntries(const rapidjson::Document& message);
+
+    /// The namespace-version map
+    std::unordered_map<std::string, int> m_namespaceVersionMap;
+};
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_IPCVERSIONMANAGER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/APLClientNamespace.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/APLClientNamespace.h
new file mode 100644
index 0000000000..9f440ad066
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/APLClientNamespace.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_APLCLIENTNAMESPACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_APLCLIENTNAMESPACE_H_
+
+#include <string>
+
+#include "IPCServerSampleApp/Messages/Message.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+namespace IPCNamespaces {
+
+/// The message namespace for APLClient.
+static const char IPC_MSG_NAMESPACE_APL[] = "APLClient";
+
+/// The namespace version for APL.
+static const int IPC_MSG_VERSION_APL(1);
+
+/// The message name for sendMessageToViewhost.
+static const char IPC_MESSAGE_NAME_VIEWHOST_MESSAGE[] = "sendMessageToViewhost";
+
+/// The message name for createRenderer.
+static const char IPC_MESSAGE_NAME_CREATE_RENDERER[] = "createRenderer";
+
+/**
+ * The @c AplViewhostMessage provides drawing updates to the GUI Client's APL renderer.
+ */
+class AplViewhostMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param windowId The target windowId for this message.
+     * @param payload The APL Core message object to serialize.
+     */
+    AplViewhostMessage(const std::string& windowId, const std::string& payload) :
+            Message(IPC_MSG_NAMESPACE_APL, IPC_MSG_VERSION_APL, IPC_MESSAGE_NAME_VIEWHOST_MESSAGE) {
+        setWindowIdInPayload(windowId);
+        setParsedPayloadInPayload(payload);
+        addPayload();
+    }
+};
+
+/**
+ * The @c AplCreateRendererMessage provides the GUI Client with information to trigger an APL document render in the
+ * targeted window.
+ */
+class AplCreateRendererMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param windowId The id of the window to target with the APL document render.
+     * @param token The presentation token of the APL document to render
+     */
+    AplCreateRendererMessage(const std::string& windowId, const std::string& token) :
+            Message(IPC_MSG_NAMESPACE_APL, IPC_MSG_VERSION_APL, IPC_MESSAGE_NAME_CREATE_RENDERER) {
+        setWindowIdInPayload(windowId);
+        setTokenInPayload(token);
+        addPayload();
+    }
+};
+
+}  // namespace IPCNamespaces
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_APLCLIENTNAMESPACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/AlexaCaptionsNamespace.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/AlexaCaptionsNamespace.h
new file mode 100644
index 0000000000..aa6a69128a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/AlexaCaptionsNamespace.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_ALEXACAPTIONSNAMESPACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_ALEXACAPTIONSNAMESPACE_H_
+
+#include <string>
+
+#include "IPCServerSampleApp/Messages/Message.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+namespace IPCNamespaces {
+
+/// The message namespace for Captions.
+static const char IPC_MSG_NAMESPACE_CAPTIONS[] = "AlexaCaptions";
+
+/// The namespace version for Captions.
+static const int IPC_MSG_VERSION_CAPTIONS(1);
+
+/// The message name for renderCaptions.
+static const char IPC_MSG_NAME_RENDER_CAPTIONS[] = "renderCaptions";
+
+/// The message name for setCaptionsState.
+static const char IPC_MSG_NAME_SET_CAPTIONS_STATE[] = "setCaptionsState";
+
+/// The enabled json key in the message.
+static const char IPC_MSG_NAME_ENABLED_TAG[] = "enabled";
+
+/**
+ *  The @c RenderCaptionsMessage instructs the IPC Client to render Alexa captions
+ */
+class RenderCaptionsMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param payload The RenderCaptionsMessage payload to serialize.
+     */
+    explicit RenderCaptionsMessage(const std::string& payload) :
+            Message(IPC_MSG_NAMESPACE_CAPTIONS, IPC_MSG_VERSION_CAPTIONS, IPC_MSG_NAME_RENDER_CAPTIONS) {
+        setParsedPayload(payload);
+    };
+};
+
+/**
+ *  The @c SetCaptionsStateMessage instructs the IPC Client to set the state of Alexa captions
+ */
+class SetCaptionsStateMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param enabled Boolean flag to set json enabled for the SetCaptionsStateMessage
+     */
+    explicit SetCaptionsStateMessage(const bool enabled) :
+            Message(IPC_MSG_NAMESPACE_CAPTIONS, IPC_MSG_VERSION_CAPTIONS, IPC_MSG_NAME_SET_CAPTIONS_STATE) {
+        setEnabledInPayload(enabled);
+        addPayload();
+    };
+};
+
+}  // namespace IPCNamespaces
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_ALEXACAPTIONSNAMESPACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/AudioFocusManagerNamespace.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/AudioFocusManagerNamespace.h
new file mode 100644
index 0000000000..2d593a0dcb
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/AudioFocusManagerNamespace.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_AUDIOFOCUSMANAGERNAMESPACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_AUDIOFOCUSMANAGERNAMESPACE_H_
+
+#include "IPCServerSampleApp/Messages/Message.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+namespace IPCNamespaces {
+
+/// The message namespace for AudioFocusManager.
+static const char IPC_MSG_NAMESPACE_AUDIO_FOCUS_MANAGER[] = "AudioFocusManager";
+
+/// The namespace version for AudioFocusManager.
+static const int IPC_MSG_VERSION_AUDIO_FOCUS_MANAGER(1);
+
+/// The message name for processChannelResult.
+static const char IPC_MSG_NAME_PROCESS_CHANNEL_RESULT[] = "processChannelResult";
+
+/// The result json key in the message.
+static const char IPC_MSG_RESULT_TAG[] = "result";
+
+/// The message name for processFocusChanged.
+static const char IPC_MSG_NAME_PROCESS_FOCUS_CHANGED[] = "processFocusChanged";
+
+/// The focusState json key in the message.
+static const char IPC_MSG_FOCUS_STATE_TAG[] = "focusState";
+
+/**
+ * The @c ProcessFocusChangedMessage provides the IPC Client with Focus state changes for the corresponding token.
+ */
+class ProcessFocusChangedMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param token The requester token.
+     * @param focusState The channel focus state.
+     */
+    ProcessFocusChangedMessage(unsigned token, avsCommon::avs::FocusState focusState) :
+            Message(
+                IPC_MSG_NAMESPACE_AUDIO_FOCUS_MANAGER,
+                IPC_MSG_VERSION_AUDIO_FOCUS_MANAGER,
+                IPC_MSG_NAME_PROCESS_FOCUS_CHANGED) {
+        setTokenInPayload(token);
+        addMemberInPayload(IPC_MSG_FOCUS_STATE_TAG, focusStateToString(focusState));
+        addPayload();
+    }
+};
+
+/**
+ * The @c ProcessChannelResultMessage provides the IPC Client with the result of `acquireChannelRequest` and
+ * `releaseChannelRequest` requests processing.
+ */
+class ProcessChannelResultMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param token The requester token.
+     * @param result The result of channel focus request processing.
+     */
+    ProcessChannelResultMessage(unsigned token, bool result) :
+            Message(
+                IPC_MSG_NAMESPACE_AUDIO_FOCUS_MANAGER,
+                IPC_MSG_VERSION_AUDIO_FOCUS_MANAGER,
+                IPC_MSG_NAME_PROCESS_CHANNEL_RESULT) {
+        setTokenInPayload(token);
+        addMemberInPayload(IPC_MSG_RESULT_TAG, result ? "true" : "false");
+        addPayload();
+    }
+};
+
+}  // namespace IPCNamespaces
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_AUDIOFOCUSMANAGERNAMESPACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/CommunicationsNamespace.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/CommunicationsNamespace.h
new file mode 100644
index 0000000000..e0516aa075
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/CommunicationsNamespace.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_COMMUNICATIONSNAMESPACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_COMMUNICATIONSNAMESPACE_H_
+
+#include "IPCServerSampleApp/Messages/Message.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+namespace IPCNamespaces {
+
+/// The message namespace for Comms.
+static const char IPC_MSG_NAMESPACE_COMMUNICATIONS[] = "Communications";
+
+/// The namespace version for Communications.
+static const int IPC_MSG_VERSION_COMMUNICATIONS(1);
+
+/// The callState json key in the message.
+static const char IPC_MSG_CALL_STATE_TAG[] = "callState";
+
+/// The message name for callStateChange.
+static const char IPC_MSG_NAME_CALL_STATE_CHANGE[] = "callStateChange";
+
+/// The callType json key in the message.
+static const char IPC_MSG_CALL_TYPE_TAG[] = "callType";
+
+/// The previousSipUserAgentState json key in the message.
+static const char IPC_MSG_PREVIOUS_SIP_USER_AGENT_STATE_TAG[] = "previousSipUserAgentState";
+
+/// The currentSipUserAgentState json key in the message.
+static const char IPC_MSG_CURRENT_SIP_USER_AGENT_STATE_TAG[] = "currentSipUserAgentState";
+
+/// The displayName json key in the message.
+static const char IPC_MSG_DISPLAY_NAME_TAG[] = "displayName";
+
+/// The endpointLabel json key in the message.
+static const char IPC_MSG_END_POINT_LABEL_TAG[] = "endpointLabel";
+
+/// The inboundCalleeName json key in the message.
+static const char IPC_MSG_INBOUND_CALLEE_NAME_TAG[] = "inboundCalleeName";
+
+/// The callProviderType json key in the message.
+static const char IPC_MSG_CALL_PROVIDER_TYPE_TAG[] = "callProviderType";
+
+/// The inboundRingtoneUrl json key in the message.
+static const char IPC_MSG_INBOUND_RINGTONE_URL_TAG[] = "inboundRingtoneUrl";
+
+/// The outboundRingbackUrl json key in the message.
+static const char IPC_MSG_OUTBOUND_RINGBACK_URL_TAG[] = "outboundRingbackUrl";
+
+/// The isDropIn json key in the message.
+static const char IPC_MSG_IS_DROP_IN_TAG[] = "isDropIn";
+
+/**
+ * The @c CallStateChangeMessage contains information for communicating call state info to the GUI Client.
+ */
+class CallStateChangeMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param callStateInfo The Comms client call state info.
+     */
+    CallStateChangeMessage(const avsCommon::sdkInterfaces::CallStateObserverInterface::CallStateInfo& callStateInfo) :
+            Message(IPC_MSG_NAMESPACE_COMMUNICATIONS, IPC_MSG_VERSION_COMMUNICATIONS, IPC_MSG_NAME_CALL_STATE_CHANGE) {
+        std::ostringstream oss;
+        oss << callStateInfo.callState;
+        addMemberInPayload(IPC_MSG_CALL_STATE_TAG, oss.str());
+        addMemberInPayload(IPC_MSG_CALL_TYPE_TAG, callStateInfo.callType);
+        addMemberInPayload(IPC_MSG_PREVIOUS_SIP_USER_AGENT_STATE_TAG, callStateInfo.previousSipUserAgentState);
+        addMemberInPayload(IPC_MSG_CURRENT_SIP_USER_AGENT_STATE_TAG, callStateInfo.currentSipUserAgentState);
+        addMemberInPayload(IPC_MSG_DISPLAY_NAME_TAG, callStateInfo.displayName);
+        addMemberInPayload(IPC_MSG_END_POINT_LABEL_TAG, callStateInfo.endpointLabel);
+        addMemberInPayload(IPC_MSG_INBOUND_CALLEE_NAME_TAG, callStateInfo.inboundCalleeName);
+        addMemberInPayload(IPC_MSG_CALL_PROVIDER_TYPE_TAG, callStateInfo.callProviderType);
+        addMemberInPayload(IPC_MSG_INBOUND_RINGTONE_URL_TAG, callStateInfo.inboundRingtoneUrl);
+        addMemberInPayload(IPC_MSG_OUTBOUND_RINGBACK_URL_TAG, callStateInfo.outboundRingbackUrl);
+        addMemberInPayload(IPC_MSG_IS_DROP_IN_TAG, callStateInfo.isDropIn);
+        addPayload();
+    }
+};
+
+}  // namespace IPCNamespaces
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_COMMUNICATIONSNAMESPACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/DoNotDisturbNamespace.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/DoNotDisturbNamespace.h
new file mode 100644
index 0000000000..6d93d9b8d7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/DoNotDisturbNamespace.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_DONOTDISTURBNAMESPACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_DONOTDISTURBNAMESPACE_H_
+
+#include "IPCServerSampleApp/Messages/Message.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+namespace IPCNamespaces {
+
+/// The message namespace for Do Not Disturb.
+static const char IPC_MSG_NAMESPACE_DO_NOT_DISTURB[] = "DoNotDisturb";
+
+/// The namespace version for Do Not Disturb.
+static const int IPC_MSG_VERSION_DO_NOT_DISTURB(1);
+
+/// The message name for setDoNotDisturbState.
+static const char IPC_MSG_NAME_SET_DND_SETTING_CHANGE[] = "setDoNotDisturbState";
+
+/**
+ *  The @c DoNotDisturbSettingChange informs the IPC Client of changes to DoNotDisturb state
+ */
+class SetDoNotDisturbStateMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param enabled boolean indicating the current state of DoNotDisturb
+     */
+    explicit SetDoNotDisturbStateMessage(const bool enabled) :
+            Message(
+                IPC_MSG_NAMESPACE_DO_NOT_DISTURB,
+                IPC_MSG_VERSION_DO_NOT_DISTURB,
+                IPC_MSG_NAME_SET_DND_SETTING_CHANGE) {
+        setEnabledInPayload(enabled);
+        addPayload();
+    };
+};
+
+}  // namespace IPCNamespaces
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_DONOTDISTURBNAMESPACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/InteractionManagerNamespace.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/InteractionManagerNamespace.h
new file mode 100644
index 0000000000..be08e06a48
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/InteractionManagerNamespace.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_INTERACTIONMANAGERNAMESPACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_INTERACTIONMANAGERNAMESPACE_H_
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+namespace IPCNamespaces {
+
+/**
+ * Interaction Manager does not have messages from IPC Server, but should be registered as a namespace
+ * to handle events from the IPC Client
+ */
+
+/// The message namespace for Interaction Manager.
+static const char IPC_MSG_NAMESPACE_INTERACTION_MANAGER[] = "InteractionManager";
+
+/// The namespace version for Interaction Manager.
+static const int IPC_MSG_VERSION_INTERACTION_MANAGER(1);
+
+}  // namespace IPCNamespaces
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_INTERACTIONMANAGERNAMESPACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/LiveViewCameraNamespace.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/LiveViewCameraNamespace.h
new file mode 100644
index 0000000000..8f607c9901
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/LiveViewCameraNamespace.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_LIVEVIEWCAMERANAMESPACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_LIVEVIEWCAMERANAMESPACE_H_
+
+#include <memory>
+#include <string>
+
+#include "IPCServerSampleApp/Messages/Message.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+namespace IPCNamespaces {
+
+/// The message namespace for LiveViewCamera.
+static const char IPC_MSG_NAMESPACE_LIVE_VIEW_CAMERA[] = "LiveViewCamera";
+
+/// The namespace version for LiveViewCamera.
+static const int IPC_MSG_VERSION_LIVE_VIEW_CAMERA(1);
+
+/// The message name for renderCamera.
+static const char IPC_MSG_NAME_RENDER_CAMERA[] = "renderCamera";
+
+/// The message name for setCameraState.
+static const char IPC_MSG_NAME_SET_CAMERA_STATE[] = "setCameraState";
+
+/// The message name for clearCamera.
+static const char IPC_MSG_NAME_CLEAR_CAMERA[] = "clearCamera";
+
+/// The startLiveViewPayload key in RenderCamera message.
+static const char IPC_MSG_START_LIVE_VIEW_PAYLOAD_TAG[] = "startLiveViewPayload";
+
+/**
+ *  The @c RenderCameraMessage informs the IPC Client to present the live view camera stream and UI.
+ */
+class RenderCameraMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param startLiveViewPayload StartLiveView directive payload.
+     */
+    explicit RenderCameraMessage(const std::string& startLiveViewPayload) :
+            Message(IPC_MSG_NAMESPACE_LIVE_VIEW_CAMERA, IPC_MSG_VERSION_LIVE_VIEW_CAMERA, IPC_MSG_NAME_RENDER_CAMERA) {
+        rapidjson::Value payload(rapidjson::kObjectType);
+        rapidjson::Document messageDocument(&alloc());
+        payload.AddMember(
+            rapidjson::Value(IPC_MSG_START_LIVE_VIEW_PAYLOAD_TAG, alloc()).Move(),
+            messageDocument.Parse(startLiveViewPayload),
+            alloc());
+        setPayload(std::move(payload));
+    };
+};
+
+/**
+ *  The @c SetCameraStateMessage informs the IPC Client of changes in the state of the active live view camera.
+ */
+class SetCameraStateMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param cameraState Live view camera state.
+     */
+    explicit SetCameraStateMessage(const std::string& cameraState) :
+            Message(
+                IPC_MSG_NAMESPACE_LIVE_VIEW_CAMERA,
+                IPC_MSG_VERSION_LIVE_VIEW_CAMERA,
+                IPC_MSG_NAME_SET_CAMERA_STATE) {
+        setStateInPayload(cameraState);
+        addPayload();
+    };
+};
+
+/**
+ *  The @c ClearCameraMessage informs the IPC Client to present the live view camera stream and UI.
+ */
+class ClearCameraMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     */
+    explicit ClearCameraMessage() :
+            Message(IPC_MSG_NAMESPACE_LIVE_VIEW_CAMERA, IPC_MSG_VERSION_LIVE_VIEW_CAMERA, IPC_MSG_NAME_CLEAR_CAMERA) {
+        addPayload();
+    };
+};
+
+}  // namespace IPCNamespaces
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_LIVEVIEWCAMERANAMESPACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/LoggerNamespace.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/LoggerNamespace.h
new file mode 100644
index 0000000000..4ae5b1fefe
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/LoggerNamespace.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_LOGGERNAMESPACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_LOGGERNAMESPACE_H_
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+namespace IPCNamespaces {
+
+/**
+ * Logger does not have messages from IPC Server, but should be registered as a namespace
+ * to handle events from the IPC Client
+ */
+
+/// The message namespace for Logger.
+static const char IPC_MSG_NAMESPACE_LOGGER[] = "Logger";
+
+/// The namespace version for Logger.
+static const int IPC_MSG_VERSION_LOGGER(1);
+
+}  // namespace IPCNamespaces
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_LOGGERNAMESPACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/SessionSetupNamespace.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/SessionSetupNamespace.h
new file mode 100644
index 0000000000..d74ce3ff20
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/SessionSetupNamespace.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_SESSIONSETUPNAMESPACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_SESSIONSETUPNAMESPACE_H_
+
+#include <string>
+
+#include <rapidjson/document.h>
+
+#include "IPCServerSampleApp/Messages/Message.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+namespace IPCNamespaces {
+
+/// The version for the IPC Framework
+static const char IPC_FRAMEWORK_VERSION[] = "1.0.0";
+
+/// The message namespace for SessionSetup.
+static const char IPC_MSG_NAMESPACE_SESSION_SETUP[] = "SessionSetup";
+
+/// The namespace version for SessionSetup.
+static const int IPC_MSG_VERSION_SESSION_SETUP(1);
+
+/// The message name for initializeClient.
+static const char IPC_MSG_NAME_INIT_CLIENT[] = "initializeClient";
+
+/// The message name for configureClient.
+static const char IPC_MSG_NAME_CONFIGURE_CLIENT[] = "configureClient";
+
+/// The IPC Framework version key in the message.
+static const char IPC_MSG_IPC_VERSION_TAG[] = "ipcVersion";
+
+/**
+ * The @c InitClientMessage contains information for initializing the IPC Client.
+ */
+class InitClientMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param ipcVersion The version number for the IPC framework.
+     */
+    explicit InitClientMessage(const std::string& ipcVersion) :
+            Message(IPC_MSG_NAMESPACE_SESSION_SETUP, IPC_MSG_VERSION_SESSION_SETUP, IPC_MSG_NAME_INIT_CLIENT) {
+        addMemberInPayload(IPC_MSG_IPC_VERSION_TAG, ipcVersion);
+        addPayload();
+    }
+};
+
+/**
+ * The @c ConfigureClientMessage contains any configuration required by the IPC client.
+ */
+class ConfigureClientMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param payload payload for IPC Client config
+     */
+    explicit ConfigureClientMessage(const std::string& payload) :
+            Message(IPC_MSG_NAMESPACE_SESSION_SETUP, IPC_MSG_VERSION_SESSION_SETUP, IPC_MSG_NAME_CONFIGURE_CLIENT) {
+        rapidjson::Document messageDocument(&alloc());
+        setPayload(std::move(messageDocument.Parse(payload)));
+    }
+};
+
+}  // namespace IPCNamespaces
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_SESSIONSETUPNAMESPACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/SystemNamespace.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/SystemNamespace.h
new file mode 100644
index 0000000000..ffc558fec9
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/SystemNamespace.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_SYSTEMNAMESPACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_SYSTEMNAMESPACE_H_
+
+#include <string>
+
+#include <rapidjson/document.h>
+
+#include "IPCServerSampleApp/Messages/Message.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+namespace IPCNamespaces {
+
+/// The namespace namespace for System.
+static const char IPC_MSG_NAMESPACE_SYSTEM[] = "System";
+
+/// The namespace version for System.
+static const int IPC_MSG_VERSION_SYSTEM(1);
+
+/// The message name for completeAuthorization.
+static const char IPC_MSG_NAME_COMPLETE_AUTH[] = "completeAuthorization";
+
+/// The message name for setAlexaState.
+static const char IPC_MSG_NAME_SET_ALEXA_STATE[] = "setAlexaState";
+
+/// The message name for setAuthorizationState.
+static const char IPC_MSG_NAME_SET_AUTH_STATE[] = "setAuthorizationState";
+
+/// The message name for setLocales.
+static const char IPC_MSG_NAME_SET_LOCALES[] = "setLocales";
+
+/// The locales json key in the message.
+static const char IPC_MSG_LOCALES_TAG[] = "locales";
+
+/// The auth url json key in the message.
+static const char IPC_MSG_AUTH_URL_TAG[] = "url";
+
+/// The auth code json key in the message.
+static const char IPC_MSG_AUTH_CODE_TAG[] = "code";
+
+/// The clientId json key in the message.
+static const char IPC_MSG_CLIENT_ID_TAG[] = "clientId";
+
+/**
+ * The @c CompleteAuthorizationMessage provides the GUI Client with information to present to the user to complete CBL
+ * device authorization.
+ */
+class CompleteAuthorizationMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param url The URL that the user needs to navigate to.
+     * @param code The code that the user needs to enter once authorized.
+     * @param authClientId The device's Client Id.
+     */
+    CompleteAuthorizationMessage(const std::string& url, const std::string& code, const std::string& authClientId) :
+            Message(IPC_MSG_NAMESPACE_SYSTEM, IPC_MSG_VERSION_SYSTEM, IPC_MSG_NAME_COMPLETE_AUTH) {
+        addMemberInPayload(IPC_MSG_AUTH_URL_TAG, url);
+        addMemberInPayload(IPC_MSG_AUTH_CODE_TAG, code);
+        addMemberInPayload(IPC_MSG_CLIENT_ID_TAG, authClientId);
+        addPayload();
+    }
+};
+
+/**
+ * The @c SetAuthorizationStateMessage provides the GUI Client with information about changes to the state of
+ * authorization.
+ */
+class SetAuthorizationStateMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param authorizationState The state of authorization.
+     */
+    SetAuthorizationStateMessage(const std::string& authorizationState) :
+            Message(IPC_MSG_NAMESPACE_SYSTEM, IPC_MSG_VERSION_SYSTEM, IPC_MSG_NAME_SET_AUTH_STATE) {
+        setStateInPayload(authorizationState);
+        addPayload();
+    }
+};
+
+/**
+ * The @c SetAlexaStateMessage contains information for communicating Alexa state to the GUI Client.
+ */
+class SetAlexaStateMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param alexaState The state of the Alexa client.
+     */
+    explicit SetAlexaStateMessage(const std::string& alexaState) :
+            Message(IPC_MSG_NAMESPACE_SYSTEM, IPC_MSG_VERSION_SYSTEM, IPC_MSG_NAME_SET_ALEXA_STATE) {
+        setStateInPayload(alexaState);
+        addPayload();
+    }
+};
+
+/**
+ *  The @c SetLocalesMessage informs the GUI Client of Alexa locale setting changes.
+ */
+class SetLocalesMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     *  @param localeStr the string containing the locale
+     */
+    explicit SetLocalesMessage(const std::string& localeStr) :
+            Message(IPC_MSG_NAMESPACE_SYSTEM, IPC_MSG_VERSION_SYSTEM, IPC_MSG_NAME_SET_LOCALES) {
+        rapidjson::Value payload(rapidjson::kObjectType);
+        rapidjson::Document messageDocument(&alloc());
+        payload.AddMember(
+            rapidjson::Value(IPC_MSG_LOCALES_TAG, alloc()).Move(), messageDocument.Parse(localeStr), alloc());
+        setPayload(std::move(payload));
+    };
+};
+
+}  // namespace IPCNamespaces
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_SYSTEMNAMESPACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/TemplateRuntimeNamespace.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/TemplateRuntimeNamespace.h
new file mode 100644
index 0000000000..d75c3f8285
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/TemplateRuntimeNamespace.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_TEMPLATERUNTIMENAMESPACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_TEMPLATERUNTIMENAMESPACE_H_
+
+#include <string>
+
+#include "IPCServerSampleApp/Messages/Message.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+namespace IPCNamespaces {
+
+/// The message namespace for TemplateRuntime.
+static const char IPC_MSG_NAMESPACE_TEMPLATE_RUNTIME[] = "TemplateRuntime";
+
+/// The namespace version for TemplateRuntime.
+static const int IPC_MSG_VERSION_TEMPLATE_RUNTIME(1);
+
+/// The message name for clearPlayerInfoCard.
+static const char IPC_MSG_NAME_CLEAR_PLAYER_INFO_CARD[] = "clearPlayerInfoCard";
+
+/// The message name for clearTemplateCard.
+static const char IPC_MSG_NAME_CLEAR_TEMPLATE_CARD[] = "clearTemplateCard";
+
+/// The message name for renderPlayerInfo.
+static const char IPC_MSG_NAME_RENDER_PLAYER_INFO[] = "renderPlayerInfo";
+
+/// The audioPlayerState json key in the message.
+static const char IPC_MSG_AUDIO_PLAYER_STATE_TAG[] = "audioPlayerState";
+
+/// The audioOffset json key in the message.
+static const char IPC_MSG_AUDIO_OFFSET_TAG[] = "audioOffset";
+
+/// The message handler name for renderTemplate.
+static const char IPC_MSG_NAME_RENDER_TEMPLATE[] = "renderTemplate";
+
+/**
+ *  The @c RenderPlayerInfoMessage instructs the GUI Client to display visual metadata associated with a media item,
+ * such as a song or playlist. It contains the datasource and AudioPlayer state information required to synchronize the
+ * UI with the active AudioPlayer.
+ */
+class RenderPlayerInfoMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param jsonPayload The RenderPlayerInfo payload.
+     * @param audioPlayerInfo @c The TemplateRuntimeObserverInterface::AudioPlayerInfo object containing player state
+     * and offset values.
+     */
+    RenderPlayerInfoMessage(
+        const std::string& jsonPayload,
+        templateRuntimeInterfaces::TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) :
+            Message(
+                IPC_MSG_NAMESPACE_TEMPLATE_RUNTIME,
+                IPC_MSG_VERSION_TEMPLATE_RUNTIME,
+                IPC_MSG_NAME_RENDER_PLAYER_INFO) {
+        addMemberInPayload(IPC_MSG_AUDIO_PLAYER_STATE_TAG, playerActivityToString(audioPlayerInfo.audioPlayerState));
+        addMemberInPayload(IPC_MSG_AUDIO_OFFSET_TAG, audioPlayerInfo.mediaProperties->getAudioItemOffset().count());
+        setParsedPayloadInPayload(jsonPayload);
+        addPayload();
+    }
+};
+
+/**
+ * The @c RenderTemplateMessage instructs the GUI Client to draw visual metadata to the screen.
+ */
+class RenderTemplateMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param jsonPayload The RenderTemplate payload.
+     */
+    RenderTemplateMessage(const std::string& jsonPayload) :
+            Message(
+                IPC_MSG_NAMESPACE_TEMPLATE_RUNTIME,
+                IPC_MSG_VERSION_TEMPLATE_RUNTIME,
+                IPC_MSG_NAME_RENDER_TEMPLATE) {
+        setParsedPayload(jsonPayload);
+    }
+};
+
+/**
+ *  The @c ClearPlayerInfoCardMessage instructs the GUI Client to clear the audio media player UI from the screen.
+ */
+class ClearPlayerInfoCardMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     */
+    ClearPlayerInfoCardMessage() :
+            Message(
+                IPC_MSG_NAMESPACE_TEMPLATE_RUNTIME,
+                IPC_MSG_VERSION_TEMPLATE_RUNTIME,
+                IPC_MSG_NAME_CLEAR_PLAYER_INFO_CARD) {
+        addPayload();
+    }
+};
+
+/**
+ *  The @c ClearRenderTemplateCardMessage instructs the GUI Client to clear visual content from the screen.
+ */
+class ClearRenderTemplateCardMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     */
+    ClearRenderTemplateCardMessage() :
+            Message(
+                IPC_MSG_NAMESPACE_TEMPLATE_RUNTIME,
+                IPC_MSG_VERSION_TEMPLATE_RUNTIME,
+                IPC_MSG_NAME_CLEAR_TEMPLATE_CARD) {
+        addPayload();
+    }
+};
+
+}  // namespace IPCNamespaces
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_TEMPLATERUNTIMENAMESPACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/WindowManagerNamespace.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/WindowManagerNamespace.h
new file mode 100644
index 0000000000..1aa593e0d1
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/IPC/Namespaces/WindowManagerNamespace.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_WINDOWMANAGERNAMESPACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_WINDOWMANAGERNAMESPACE_H_
+
+#include <string>
+
+#include <rapidjson/document.h>
+
+#include "IPCServerSampleApp/Messages/Message.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+namespace IPCNamespaces {
+
+/// The message namespace for Window Manager.
+static const char IPC_MSG_NAMESPACE_WINDOW_MANAGER[] = "WindowManager";
+
+/// The message name for set visual characteristics.
+static const char IPC_MSG_NAME_SET_VISUAL_CHARACTERISTICS[] = "setVisualCharacteristics";
+
+/// The message name for clearWindow.
+static const char IPC_MSG_NAME_CLEAR_WINDOW[] = "clearWindow";
+
+/// The device display json key in visual characteristics message.
+static const char IPC_MSG_DEVICE_DISPLAY_TAG[] = "deviceDisplay";
+
+/// The interaction modes json key in visual characteristics message.
+static const char IPC_MSG_INTERACTION_MODES_TAG[] = "interactionModes";
+
+/// The window templates json key in visual characteristics message.
+static const char IPC_MSG_WINDOW_TEMPLATES_TAG[] = "windowTemplates";
+
+/// The namespace version for Window Manager.
+static const int IPC_MSG_VERSION_WINDOW_MANAGER(1);
+
+/// The key in visual characteristics capability config for Device display characteristics
+static const char VISUAL_CHARACTERISTICS_CAPABILITY_CONFIG_DISPLAY_TAG[] = "display";
+
+/// The key in visual characteristics capability config for interaction modes configuration
+static const char VISUAL_CHARACTERISTICS_CAPABILITY_CONFIG_INTERACTION_MODES_TAG[] = "interactionModes";
+
+/// The key in visual characteristics capability config for window templates configuration
+static const char VISUAL_CHARACTERISTICS_CAPABILITY_CONFIG_WINDOW_TEMPLATES_TAG[] = "templates";
+
+/**
+ * The @c SetVisualCharacteristicsMessage contains visual characteristics asserted by the
+ * Client.
+ */
+class SetVisualCharacteristicsMessage : public messages::Message {
+public:
+    /**
+     * Constructor.
+     *
+     * @param displayCharacteristics serialized display characteristics reported by Visual Characteristics Capability
+     * @param interactionModes serialized interaction modes configuration reported by Visual Characteristics Capability
+     * @param windowTemplates serialized window templates configuration reported by Visual Characteristics Capability
+     */
+    SetVisualCharacteristicsMessage(
+        const avsCommon::utils::Optional<std::string>& displayCharacteristics,
+        const avsCommon::utils::Optional<std::string>& interactionModes,
+        const avsCommon::utils::Optional<std::string>& windowTemplates) :
+            Message(
+                IPC_MSG_NAMESPACE_WINDOW_MANAGER,
+                IPC_MSG_VERSION_WINDOW_MANAGER,
+                IPC_MSG_NAME_SET_VISUAL_CHARACTERISTICS) {
+        rapidjson::Value payload(rapidjson::kObjectType);
+        rapidjson::Document messageDocument(&alloc());
+
+        if (displayCharacteristics.hasValue()) {
+            payload.AddMember(
+                IPC_MSG_DEVICE_DISPLAY_TAG,
+                messageDocument.Parse(
+                    displayCharacteristics.value())[VISUAL_CHARACTERISTICS_CAPABILITY_CONFIG_DISPLAY_TAG],
+                alloc());
+        }
+
+        if (interactionModes.hasValue()) {
+            payload.AddMember(
+                IPC_MSG_INTERACTION_MODES_TAG,
+                messageDocument.Parse(
+                    interactionModes.value())[VISUAL_CHARACTERISTICS_CAPABILITY_CONFIG_INTERACTION_MODES_TAG],
+                alloc());
+        }
+
+        if (windowTemplates.hasValue()) {
+            payload.AddMember(
+                IPC_MSG_WINDOW_TEMPLATES_TAG,
+                messageDocument.Parse(
+                    windowTemplates.value())[VISUAL_CHARACTERISTICS_CAPABILITY_CONFIG_WINDOW_TEMPLATES_TAG],
+                alloc());
+        }
+
+        setPayload(std::move(payload));
+    }
+};
+
+/**
+ *  The @c ClearWindowMessage instructs the IPC Client to clear visual content for the given window.
+ */
+class ClearWindowMessage : public messages::Message {
+public:
+    /**
+     * Constructor
+     *
+     * @param windowId The id of the window to clear.
+     */
+    explicit ClearWindowMessage(const std::string& windowId) :
+            Message(IPC_MSG_NAMESPACE_WINDOW_MANAGER, IPC_MSG_VERSION_WINDOW_MANAGER, IPC_MSG_NAME_CLEAR_WINDOW) {
+        setWindowIdInPayload(windowId);
+        addPayload();
+    }
+};
+
+}  // namespace IPCNamespaces
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_IPC_NAMESPACES_WINDOWMANAGERNAMESPACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/KeywordObserver.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/KeywordObserver.h
new file mode 100644
index 0000000000..9a6408ab84
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/KeywordObserver.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_KEYWORDOBSERVER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_KEYWORDOBSERVER_H_
+
+#include <memory>
+#include <string>
+
+#include <acsdkKWDImplementations/AbstractKeywordDetector.h>
+#include <AVSCommon/AVS/AudioInputStream.h>
+#include <AVSCommon/SDKInterfaces/KeyWordObserverInterface.h>
+#include <DefaultClient/DefaultClient.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * Observes callbacks from keyword detections and notifies the DefaultClient that a wake word has occurred.
+ */
+class KeywordObserver : public avsCommon::sdkInterfaces::KeyWordObserverInterface {
+public:
+    /**
+     * Creates a KeywordObserver and registers as an observer to a KeywordDetector.
+     *
+     * @param client The default SDK client.
+     * @param audioProvider The audio provider from which to stream audio data from.
+     * @param keywordDetector The @c AbstractKeywordDetector to self register to as an observer.
+     *
+     * @return a @c KeywordObserver.
+     */
+    static std::shared_ptr<KeywordObserver> create(
+        std::shared_ptr<defaultClient::DefaultClient> client,
+        capabilityAgents::aip::AudioProvider audioProvider,
+        std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> keywordDetector);
+
+    /**
+     * Constructor.
+     *
+     * @param client The default SDK client.
+     * @param audioProvider The audio provider from which to stream audio data from.
+     */
+    KeywordObserver(
+        std::shared_ptr<defaultClient::DefaultClient> client,
+        capabilityAgents::aip::AudioProvider audioProvider);
+
+    /// @name KeyWordObserverInterface Functions
+    /// @{
+    void onKeyWordDetected(
+        std::shared_ptr<avsCommon::avs::AudioInputStream> stream,
+        std::string keyword,
+        avsCommon::avs::AudioInputStream::Index beginIndex = UNSPECIFIED_INDEX,
+        avsCommon::avs::AudioInputStream::Index endIndex = UNSPECIFIED_INDEX,
+        std::shared_ptr<const std::vector<char>> KWDMetadata = nullptr) override;
+    /// @}
+
+private:
+    /// The default SDK client.
+    std::shared_ptr<defaultClient::DefaultClient> m_client;
+
+    /// The audio provider.
+    capabilityAgents::aip::AudioProvider m_audioProvider;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_KEYWORDOBSERVER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/LiveViewController/LiveViewControllerPresentationAdapter.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/LiveViewController/LiveViewControllerPresentationAdapter.h
new file mode 100644
index 0000000000..5d8d458ca7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/LiveViewController/LiveViewControllerPresentationAdapter.h
@@ -0,0 +1,253 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_LIVEVIEWCONTROLLER_LIVEVIEWCONTROLLERPRESENTATIONADAPTER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_LIVEVIEWCONTROLLER_LIVEVIEWCONTROLLERPRESENTATIONADAPTER_H_
+
+#include <memory>
+#include <string>
+#include <unordered_set>
+#include <utility>
+
+#include <rapidjson/document.h>
+#include <rapidjson/writer.h>
+
+#include <acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerConfiguration.h>
+#include <acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerInterface.h>
+#include <acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerTypes.h>
+#include <acsdk/Notifier/Notifier.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorClientInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationTypes.h>
+#include <acsdk/Sample/InteractionManager/InteractionManager.h>
+#include <AIP/ASRProfile.h>
+#include <AVSCommon/SDKInterfaces/AudioInputProcessorObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/SpeechInteractionHandlerInterface.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include <IPCServerSampleApp/AlexaPresentation/AplClientBridge.h>
+#include <IPCServerSampleApp/Extensions/LiveView/AplLiveViewExtension.h>
+#include <IPCServerSampleApp/Extensions/LiveView/AplLiveViewExtensionObserverInterface.h>
+#include <IPCServerSampleApp/IPC/Components/LiveViewCameraHandler.h>
+#include <IPCServerSampleApp/IPC/HandlerInterfaces/LiveViewCameraHandlerInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace liveViewController {
+
+/**
+ * This class interprets the LiveViewController contract for user interface.
+ */
+class LiveViewControllerPresentationAdapter
+        : public presentationOrchestratorInterfaces::PresentationObserverInterface
+        , public ipc::LiveViewCameraHandlerInterface
+        , public alexaClientSDK::alexaLiveViewControllerInterfaces::LiveViewControllerInterface
+        , public avsCommon::sdkInterfaces::AudioInputProcessorObserverInterface
+        , public avsCommon::sdkInterfaces::SpeechInteractionHandlerInterface
+        , public extensions::liveView::AplLiveViewExtensionObserverInterface
+        , public std::enable_shared_from_this<LiveViewControllerPresentationAdapter> {
+public:
+    /**
+     * Create an instance of @c LiveViewControllerPresentationAdapter.
+     *
+     * @param ipcHandlerRegistrar Pointer to the @c ipc::IPCHandlerRegistrationInterface.
+     * @param aplClientBridge Pointer to the @c AplClientBridge to support live view APL extension.
+     *
+     * @return Shared pointer to the @c LiveViewControllerPresentationAdapter.
+     */
+    static std::shared_ptr<LiveViewControllerPresentationAdapter> create(
+        const std::shared_ptr<ipc::IPCHandlerRegistrationInterface>& ipcHandlerRegistrar,
+        const std::shared_ptr<AplClientBridge>& aplClientBridge);
+
+    /// @name PresentationObserverInterface functions
+    /// @{
+    void onPresentationAvailable(
+        presentationOrchestratorInterfaces::PresentationRequestToken id,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationInterface> presentation) override;
+    void onPresentationStateChanged(
+        presentationOrchestratorInterfaces::PresentationRequestToken id,
+        presentationOrchestratorInterfaces::PresentationState newState) override;
+    bool onNavigateBack(presentationOrchestratorInterfaces::PresentationRequestToken id) override;
+    /// @}
+
+    /// name LiveViewCameraHandlerInterface methods
+    /// @{
+    void cameraMicrophoneStateChanged(const std::string& message) override;
+    void cameraFirstFrameRendered(const std::string& message) override;
+    void windowIdReport(const std::string& message) override;
+    /// }
+
+    /// name LiveViewControllerInterface methods
+    /// @{
+    LiveViewControllerInterface::Response start(
+        std::unique_ptr<LiveViewControllerInterface::StartLiveViewRequest> request) override;
+    LiveViewControllerInterface::Response stop() override;
+    LiveViewControllerInterface::Response setCameraState(
+        alexaLiveViewControllerInterfaces::CameraState cameraState) override;
+    alexaLiveViewControllerInterfaces::Configuration getConfiguration() override;
+    bool addObserver(
+        std::weak_ptr<alexaLiveViewControllerInterfaces::LiveViewControllerObserverInterface> observer) override;
+    void removeObserver(
+        std::weak_ptr<alexaLiveViewControllerInterfaces::LiveViewControllerObserverInterface> observer) override;
+    /// }
+
+    /// @name AplLiveViewExtensionObserverInterface methods
+    /// @{
+    void handleCameraExitRequest() override;
+    void handleChangeCameraMicStateRequest(bool micOn) override;
+    /// }
+
+    /// @name AudioInputProcessorObserverInterface methods
+    /// @{
+    void onStateChanged(State state) override;
+    void onASRProfileChanged(const std::string& profile) override;
+    /// }
+
+    /// @name SpeechInteractionHandlerInterface Methods
+    /// @{
+    std::future<bool> notifyOfWakeWord(
+        capabilityAgents::aip::AudioProvider wakeWordAudioProvider,
+        avsCommon::avs::AudioInputStream::Index beginIndex,
+        avsCommon::avs::AudioInputStream::Index endIndex,
+        std::string keyword,
+        std::chrono::steady_clock::time_point startOfSpeechTimestamp,
+        std::shared_ptr<const std::vector<char>> KWDMetadata = nullptr) override;
+
+    std::future<bool> notifyOfTapToTalk(
+        capabilityAgents::aip::AudioProvider tapToTalkAudioProvider,
+        avsCommon::avs::AudioInputStream::Index beginIndex = capabilityAgents::aip::AudioInputProcessor::INVALID_INDEX,
+        std::chrono::steady_clock::time_point startOfSpeechTimestamp = std::chrono::steady_clock::now()) override;
+
+    std::future<bool> notifyOfHoldToTalkStart(
+        capabilityAgents::aip::AudioProvider holdToTalkAudioProvider,
+        std::chrono::steady_clock::time_point startOfSpeechTimestamp = std::chrono::steady_clock::now(),
+        avsCommon::avs::AudioInputStream::Index beginIndex =
+            capabilityAgents::aip::AudioInputProcessor::INVALID_INDEX) override;
+
+    std::future<bool> notifyOfHoldToTalkEnd() override;
+
+    std::future<bool> notifyOfTapToTalkEnd() override;
+    /// }
+
+    /**
+     * Set the presentation orchestrator
+     * @param poClient pointer to the presentation orchestrator
+     */
+    void setPresentationOrchestrator(
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface> poClient);
+
+    /**
+     * Set the interaction manager
+     * @param interactionManager pointer to the interaction manager.
+     */
+    void setInteractionManager(std::shared_ptr<common::InteractionManager> interactionManager);
+
+    /**
+     * Handle setting microphone state for live view camera use cases.
+     * @param enabled whether microphone should be turned on for live view camera experiences or not.
+     */
+    void handleSetCameraMicrophoneState(bool enabled);
+
+private:
+    /**
+     * Constructor.
+     */
+    explicit LiveViewControllerPresentationAdapter();
+
+    /**
+     * Initializes the @c LiveViewControllerPresentationAdapter.
+     *
+     * @param ipcHandlerRegistrar Pointer to the @c ipc::IPCHandlerRegistrationInterface.
+     * @param aplClientBridge Pointer to the @c AplClientBridge to support live view APL extension.
+     */
+    void initialize(
+        const std::shared_ptr<ipc::IPCHandlerRegistrationInterface>& ipcHandlerRegistrar,
+        const std::shared_ptr<AplClientBridge>& aplClientBridge);
+
+    /**
+     * Handle a change in active @c ASRProfile.
+     *
+     * @param profile the activce @c ASRProfile
+     */
+    void handleASRProfileChanged(alexaClientSDK::capabilityAgents::aip::ASRProfile profile);
+
+    /**
+     * Dismisses the active presentation.
+     */
+    void dismissPresentation();
+
+    /**
+     * Internal executor for dismissing the active presentation.
+     */
+    void executeDismissPresentation();
+
+    /**
+     * Helper function to notify the observers of the @c LiveViewControllerInterface that live view has been cleared.
+     */
+    void executeOnPresentationDismissed();
+
+    /**
+     * Internal executor for setting the camera UI's mic state
+     * @param enabled true if microphone is on, @c false otherwise.
+     */
+    void executeSetCameraUIMicState(bool enabled);
+
+    /**
+     * Helper function to notify the observers of the @c LiveViewControllerInterface that microphone state has been
+     * changed.
+     *
+     * @param enabled @c true if microphone is on, @c false otherwise.
+     */
+    void executeNotifyMicrophoneStateChanged(bool enabled);
+
+    /// Pointer to the @c PresentationInterface presentation association.
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationInterface> m_presentation;
+
+    /// Pointer to the presentation orchestrator client
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface>
+        m_presentationOrchestratorClient;
+
+    /// @c AplLiveViewExtensionPtr for handling liveView APL UI interactions.
+    extensions::liveView::AplLiveViewExtensionPtr m_aplLiveViewExtension;
+
+    /// The @c LiveViewCameraHandler
+    std::shared_ptr<ipc::LiveViewCameraHandler> m_liveViewCameraIPCHandler;
+
+    /// Interaction Manager.
+    std::shared_ptr<common::InteractionManager> m_interactionManager;
+
+    /// Active presentation request token for StartLiveView presentation.
+    presentationOrchestratorInterfaces::PresentationRequestToken m_startLiveViewRequestToken;
+
+    /// Cached value of the reported live view camera window id.
+    std::string m_liveViewCameraWindowId;
+
+    /// Pointer to the @c StartLiveViewRequest.
+    std::unique_ptr<LiveViewControllerInterface::StartLiveViewRequest> m_startLiveViewRequest;
+
+    /// Shared pointer to the active @c ASRProfile
+    alexaClientSDK::capabilityAgents::aip::ASRProfile m_asrProfile;
+
+    /// Shared pointer to the executor.
+    avsCommon::utils::threading::Executor m_executor;
+
+    /// The notifier of @c LiveViewControllerInterface observers.
+    notifier::Notifier<alexaLiveViewControllerInterfaces::LiveViewControllerObserverInterface> m_notifier;
+};
+
+}  // namespace liveViewController
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_LIVEVIEWCONTROLLER_LIVEVIEWCONTROLLERPRESENTATIONADAPTER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/LocaleAssetsManager.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/LocaleAssetsManager.h
new file mode 100644
index 0000000000..d9460a2dbd
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/LocaleAssetsManager.h
@@ -0,0 +1,297 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_LOCALEASSETSMANAGER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_LOCALEASSETSMANAGER_H_
+
+#include <map>
+#include <memory>
+#include <mutex>
+#include <set>
+#include <unordered_set>
+
+#include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
+#include <AVSCommon/SDKInterfaces/LocaleAssetsManagerInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#ifdef KWD
+#ifdef ASSET_MANAGER
+#include <acsdkAssetManager/AssetManager.h>
+#endif
+#include <acsdkKWDImplementations/AbstractKeywordDetector.h>
+#include <AVSCommon/AVS/AudioInputStream.h>
+#include <AVSCommon/Utils/AudioFormat.h>
+#include <DefaultClient/DefaultClient.h>
+#endif
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+#if defined(KWD) && defined(ASSET_MANAGER)
+using namespace acsdkAssets::manager;
+#endif
+/**
+ * Sample implementation of an asset manager.
+ *
+ * This manager will use the @c AlexaClientSDKConfig.json to retrieve the supported locales. For devices with wake word
+ * enabled this class will support "ALEXA" only.
+ */
+class LocaleAssetsManager
+        : public avsCommon::sdkInterfaces::LocaleAssetsManagerInterface
+        , public avsCommon::utils::RequiresShutdown {
+public:
+    /**
+     * Create an instance of @c LocaleAssetsManagerInterface.
+     *
+     * @param configurationNode A pointer to the @c ConfigurationNode instance.
+     * @param shutdownNotifier A pointer to the @c ShutdownNotifier instance.
+     * @return A pointer to the @c LocaleAssetsManagerInterface.
+     */
+    static std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface> createLocaleAssetsManagerInterface(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+        const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier);
+
+    /**
+     * Create an instance of @c LocaleAssetsManager.
+     *
+     * @param configurationNode A pointer to the @c ConfigurationNode instance.
+     * @return A pointer to a new LocaleAssetsManager object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<LocaleAssetsManager> createLocaleAssetsManager(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode);
+
+    /**
+     * Create a LocaleAssetsManager object.
+     *
+     * @deprecated
+     * @return A pointer to a new LocaleAssetsManager object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<LocaleAssetsManager> create(bool enableWakeWord);
+
+    /// @name LocaleAssetsManagerInterface methods
+    /// @{
+    bool changeAssets(const Locales& locales, const WakeWords& wakeWords) override;
+    void cancelOngoingChange() override;
+    WakeWordsSets getDefaultSupportedWakeWords() const override;
+    std::map<LanguageTag, WakeWordsSets> getLanguageSpecificWakeWords() const override;
+    std::map<Locale, WakeWordsSets> getLocaleSpecificWakeWords() const override;
+    WakeWordsSets getSupportedWakeWords(const Locale& locale) const override;
+    std::set<Locale> getSupportedLocales() const override;
+    LocaleCombinations getSupportedLocaleCombinations() const override;
+    Locale getDefaultLocale() const override;
+    Locales getDefaultLocales() const override;
+    void addLocaleAssetsObserver(
+        const std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>& observer) override;
+    void removeLocaleAssetsObserver(
+        const std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>& observer) override;
+    void onConfigurationChanged(const avsCommon::avs::CapabilityConfiguration& configuration) override;
+    void setEndpointRegistrationManager(
+        const std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>& manager)
+        override;
+    /// @}
+
+    /// @name RequiresShutdown methods
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+#ifdef KWD
+#ifdef ASSET_MANAGER
+    /**
+     * Create an instance of @c LocaleAssetsManagerInterface with KWD and DAVS Asset Manager support.
+     *
+     * @param configurationNode A pointer to the @c ConfigurationNode instance.
+     * @param shutdownNotifier A pointer to the @c ShutdownNotifier instance.
+     * @param audioInputStream A pointer to the @c AudioInputStream instance.
+     * @param audioFormat A pointer to the @c AudioFormat instance.
+     * @param keywordDetector A pointer to the @c AbstractKeywordDetector instance.
+     * @param assetManager A pointer to the @c DavsAssetManager instance.
+     * @return A pointer to the @c LocaleAssetsManagerInterface.
+     */
+    static std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>
+    createLocaleAssetsManagerInterfaceWithKwdAndDavs(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+        const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector,
+        const std::shared_ptr<AssetManager>& assetManager);
+
+    /**
+     * Create an instance of @c LocaleAssetsManager with KWD and DAVS Asset Manager support.
+     *
+     * @param configurationNode A pointer to the @c ConfigurationNode instance.
+     * @param audioInputStream A pointer to the @c AudioInputStream instance.
+     * @param audioFormat A pointer to the @c AudioFormat instance.
+     * @param keywordDetector A pointer to the @c AbstractKeywordDetector instance.
+     * @param assetManager A pointer to the @c DavsAssetManager instance.
+     * @return A pointer to a new LocaleAssetsManager object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<LocaleAssetsManager> createLocaleAssetsManagerWithKwdAndDavs(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector,
+        const std::shared_ptr<AssetManager>& assetManager);
+#else
+    /**
+     * Create an instance of @c LocaleAssetsManagerInterface with KWD support.
+     *
+     * @param configurationNode A pointer to the @c ConfigurationNode instance.
+     * @param shutdownNotifier A pointer to the @c ShutdownNotifier instance.
+     * @param audioInputStream A pointer to the @c AudioInputStream instance.
+     * @param audioFormat A pointer to the @c AudioFormat instance.
+     * @param keywordDetector A pointer to the @c AbstractKeywordDetector instance.
+     * @return A pointer to the @c LocaleAssetsManagerInterface.
+     */
+    static std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>
+    createLocaleAssetsManagerInterfaceWithKwd(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+        const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector);
+
+    /**
+     * Create an instance of @c LocaleAssetsManager with KWD support.
+     *
+     * @param configurationNode A pointer to the @c ConfigurationNode instance.
+     * @param audioInputStream A pointer to the @c AudioInputStream instance.
+     * @param audioFormat A pointer to the @c AudioFormat instance.
+     * @param keywordDetector A pointer to the @c AbstractKeywordDetector instance.
+     * @return A pointer to a new LocaleAssetsManager object if it succeeds; otherwise, @c nullptr.
+     */
+    static std::shared_ptr<LocaleAssetsManager> createLocaleAssetsManagerWithKwd(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector);
+#endif
+    void setDefaultClient(const std::shared_ptr<defaultClient::DefaultClient>& defaultClient);
+#endif
+private:
+    /**
+     * Constructor.
+     */
+    LocaleAssetsManager();
+
+#ifdef KWD
+#ifdef ASSET_MANAGER
+    /**
+     * Constructor with KWD and DAVS Asset Manager support.
+     *
+     * @param audioInputStream AudioInputStream.
+     * @param audioFormat AudioFormat.
+     * @param keywordDetector AbstractKeywordDetector.
+     * @param assetManager Davs AssetManager.
+     */
+    LocaleAssetsManager(
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector,
+        const std::shared_ptr<AssetManager>& assetManager);
+#else
+    /**
+     * Constructor with KWD support.
+     *
+     * @param audioFormat AudioInputStream.
+     * @param audioFormat AudioFormat.
+     * @param keywordDetector AbstractKeywordDetector.
+     */
+    LocaleAssetsManager(
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector);
+#endif
+#endif
+    /**
+     * Initialize the assets manager object.
+     *
+     * @param configurationNode The @c ConfigurationNode pointer.
+     * @return @c true if it succeeds; otherwise, return @c false.
+     */
+    bool initialize(const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode);
+
+    /**
+     * Initialize the assets manager object.
+     *
+     * @param enableWakeWord Indicates whether wake words are enabled in this device or not.
+     * @param configurationNode The @c ConfigurationNode instance.
+     * @return @c true if it succeeds; otherwise, return @c false.
+     */
+    bool initialize(bool enableWakeWord, const avsCommon::utils::configuration::ConfigurationNode& configurationNode);
+
+    /// Set with the supported wake words. This object doesn't support different wake words per locale.
+    WakeWordsSets m_supportedWakeWords;
+
+    /// Set with the supported locales.
+    std::set<Locale> m_supportedLocales;
+
+    /// Vector of supported locales combinations.
+    LocaleCombinations m_supportedLocalesCombinations;
+
+    /// The default locale.
+    Locale m_defaultLocale;
+
+    /// The default multilingual locale.
+    Locales m_defaultLocales;
+
+#ifdef KWD
+    /// The stream of audio data.
+    const std::shared_ptr<avsCommon::avs::AudioInputStream> m_audioInputStream;
+    /// The audio format.
+    const std::shared_ptr<avsCommon::utils::AudioFormat> m_audioFormat;
+
+    /// Mutex to synchronize access to m_DefaultClient.
+    std::mutex m_defaultClientMutex;
+
+    /// Mutex to synchronize access to m_keywordDetector.
+    std::mutex m_keywordDetectorMutex;
+
+    //// Members below are modified after initialization and hence should be synchronized.
+
+    /// The default SDK client.
+    std::shared_ptr<defaultClient::DefaultClient> m_DefaultClient;
+
+    /// The Wakeword Detector which can wake up the client using audio input.
+    std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> m_keywordDetector;
+#ifdef ASSET_MANAGER
+    /// Davs AssetManager.
+    std::shared_ptr<AssetManager> m_assetManager;
+#endif
+#endif
+
+    /// Mutex to synchronize access to observers.
+    mutable std::mutex m_observersMutex;
+
+    /// Mutex to synchronize access to @c EndpointRegistrationManager.
+    std::mutex m_ermMutex;
+
+    //// Members below are modified after initialization and hence should be synchronized.
+
+    /// Set with observers.
+    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>> m_observers;
+
+    /// Dynamically update wakewords/locales capabilities changes.
+    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>
+        m_endpointRegistrationManager;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_LOCALEASSETSMANAGER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/Messages/Message.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/Messages/Message.h
new file mode 100644
index 0000000000..95690aed3a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/Messages/Message.h
@@ -0,0 +1,264 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_MESSAGES_MESSAGE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_MESSAGES_MESSAGE_H_
+
+#include <string>
+
+#include <rapidjson/document.h>
+#include <rapidjson/writer.h>
+#include <rapidjson/stringbuffer.h>
+
+#include "MessageInterface.h"
+
+/// The payload json key in the message.
+const char MSG_PAYLOAD_TAG[] = "payload";
+
+/// The windowId json key in the message.
+const char MSG_WINDOWID_TAG[] = "windowId";
+
+/// The enabled json key in the message.
+const char MSG_ENABLED_TAG[] = "enabled";
+
+/// The token json key in the message.
+const char MSG_TOKEN_TAG[] = "token";
+
+/// The state json key in the message.
+const char MSG_STATE_TAG[] = "state";
+
+/// String representation of empty json
+const std::string EMPTY_JSON("{}");
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace messages {
+
+/**
+ * Helper class to construct a @c MessageInterface message.
+ */
+class Message : public MessageInterface {
+private:
+    rapidjson::Document mParsedDocument;
+
+public:
+    /**
+     * Constructor
+     * @param namespace The namespace from this message
+     * @param version The version from this message
+     * @param name The handler name from this message
+     */
+    Message(const std::string& nameSpace, const int version, const std::string& name) :
+            MessageInterface(version, nameSpace, name),
+            mParsedDocument(&alloc()) {
+    }
+
+    /**
+     * Add a new member to the json
+     * @param name The name of the new member
+     * @param value The value of the new member
+     * @return this
+     */
+    Message& addMember(const std::string& name, const std::string& value) {
+        mDocument.AddMember(
+            rapidjson::Value(name.c_str(), mDocument.GetAllocator()).Move(),
+            rapidjson::Value(value.c_str(), mDocument.GetAllocator()).Move(),
+            mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Add a new member to the json
+     * @param name The name of the new member
+     * @param value The value of the new member
+     * @return this
+     */
+    Message& addMember(const std::string& name, unsigned value) {
+        mDocument.AddMember(
+            rapidjson::Value(name.c_str(), mDocument.GetAllocator()).Move(), value, mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Add a new member to existing payload
+     * @param name The name of the new member
+     * @param value The value of the new member
+     * @return this
+     */
+    Message& addMemberInPayload(const std::string& name, const std::string& value) {
+        mPayload.AddMember(
+            rapidjson::Value(name.c_str(), mDocument.GetAllocator()).Move(),
+            rapidjson::Value(value.c_str(), mDocument.GetAllocator()).Move(),
+            mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Add an integer to existing payload
+     * @param name The name of the new member
+     * @param value The value of the new member
+     * @return this
+     */
+    Message& addIntegerInPayload(const std::string& name, const int value) {
+        mPayload.AddMember(
+            rapidjson::Value(name.c_str(), mDocument.GetAllocator()).Move(), value, mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Add a new member to the existing payload
+     * @param name The name of the new member
+     * @param value The value of the new member
+     * @return this
+     */
+    Message& addMemberInPayload(const std::string& name, unsigned value) {
+        mPayload.AddMember(
+            rapidjson::Value(name.c_str(), mDocument.GetAllocator()).Move(), value, mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Sets the json enabled for this message
+     * @param enabled The enabled bool to send
+     * @return this
+     */
+    Message& setEnabledInPayload(bool enabled) {
+        addMemberInPayload(MSG_ENABLED_TAG, enabled);
+        return *this;
+    }
+
+    /**
+     * Sets the json state for this message
+     * @param state The state to send
+     * @return this
+     */
+    Message& setStateInPayload(const std::string& state) {
+        mPayload.AddMember(
+            MSG_STATE_TAG, rapidjson::Value(state.c_str(), mDocument.GetAllocator()).Move(), mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Sets the token for this message
+     * @param token
+     * @return this
+     */
+    Message& setTokenInPayload(const std::string& token) {
+        mPayload.AddMember(MSG_TOKEN_TAG, token, mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Sets the token for this message
+     * @param token
+     * @return this
+     */
+    Message& setTokenInPayload(unsigned token) {
+        mPayload.AddMember(MSG_TOKEN_TAG, token, mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Sets the json payload for this message
+     * @param payload The payload to parse and send
+     * @return this
+     */
+    Message& setParsedPayload(const std::string& payload) {
+        mDocument.AddMember(MSG_PAYLOAD_TAG, mParsedDocument.Parse(payload), mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Sets the json payload for this message
+     * @param payload The payload to parse and send
+     * @return this
+     */
+    Message& setParsedPayloadInPayload(const std::string& payload) {
+        mPayload.AddMember(MSG_PAYLOAD_TAG, mParsedDocument.Parse(payload), mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Sets the windowId for this message
+     * @param windowId The target windowId of
+     * @return this
+     */
+    Message& setWindowIdInPayload(const std::string& windowId) {
+        mPayload.AddMember(MSG_WINDOWID_TAG, windowId, mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Add the payload to this message
+     * @return this
+     */
+    Message& addPayload() {
+        mDocument.AddMember(MSG_PAYLOAD_TAG, mPayload, mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Sets the json payload for this message
+     * @param payload The payload to send
+     * @return this
+     */
+    Message& setPayload(rapidjson::Value&& payload) {
+        mDocument.AddMember(MSG_PAYLOAD_TAG, std::move(payload), mDocument.GetAllocator());
+        return *this;
+    }
+
+    /**
+     * Retrieves the rapidjson allocator
+     * @return The allocator
+     */
+    auto alloc() -> decltype(mDocument.GetAllocator()) {
+        return mDocument.GetAllocator();
+    };
+
+    /**
+     * Retrieves the json string representing this message
+     * @return json string representation of message
+     */
+    std::string get() {
+        rapidjson::StringBuffer buffer;
+        buffer.Clear();
+        rapidjson::Writer<
+            rapidjson::StringBuffer,
+            rapidjson::UTF8<>,
+            rapidjson::UTF8<>,
+            rapidjson::CrtAllocator,
+            rapidjson::kWriteNanAndInfFlag>
+            writer(buffer);
+        if (!mDocument.Accept(writer)) {
+            return EMPTY_JSON;
+        }
+        return std::string(buffer.GetString(), buffer.GetSize());
+    }
+
+    /**
+     * Retrieves the @c rapidjson::Value object representation of this message
+     * @return @c rapidjson::Value object representation of message
+     */
+    rapidjson::Value&& getValue() {
+        return std::move(mDocument);
+    };
+};
+}  // namespace messages
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_MESSAGES_MESSAGE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/Messages/MessageInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/Messages/MessageInterface.h
new file mode 100644
index 0000000000..949573f0ec
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/Messages/MessageInterface.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_MESSAGES_MESSAGEINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_MESSAGES_MESSAGEINTERFACE_H_
+
+#include <string>
+
+#include <rapidjson/document.h>
+#include <rapidjson/writer.h>
+#include <rapidjson/stringbuffer.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace messages {
+
+/// The namespace json key in the message.
+const char MSG_HEADER_TAG[] = "header";
+
+/// The payload json key in the message.
+const char MSG_PAYLOAD_TAG[] = "payload";
+
+/// The version json key in the message.
+const char MSG_VERSION_TAG[] = "version";
+
+/// The namespace json key in the message.
+const char MSG_NAMESPACE_TAG[] = "namespace";
+
+/// The name json key in the message.
+const char MSG_NAME_TAG[] = "name";
+
+/**
+ * An interface for rapidjson::Document based messages.
+ *
+ * All messages have the format:
+ * {
+ * header : { version, namespace, name }
+ * payload : {}
+ * }
+ */
+class MessageInterface {
+protected:
+    rapidjson::Document mDocument;
+    rapidjson::Value mPayload;
+
+public:
+    /**
+     * Constructor
+     * @param version The version for this message
+     * @param nameSpace The namespace for this message
+     * @param name The type from this message
+     */
+    MessageInterface(const int version, const std::string& nameSpace, const std::string& name) :
+            mDocument(rapidjson::kObjectType),
+            mPayload(rapidjson::kObjectType) {
+        auto& alloc = mDocument.GetAllocator();
+
+        rapidjson::Value header(rapidjson::kObjectType);
+        header.AddMember(MSG_VERSION_TAG, version, alloc);
+        header.AddMember(MSG_NAMESPACE_TAG, nameSpace, alloc);
+        header.AddMember(MSG_NAME_TAG, name, alloc);
+        mDocument.AddMember(MSG_HEADER_TAG, header, alloc);
+    }
+
+    /**
+     * Retrieves the json string representing this message
+     * @return json string representation of message
+     */
+    virtual std::string get() = 0;
+
+    /**
+     * Retrieves the @c rapidjson::Value object representation of this message
+     * @return @c rapidjson::Value object representation of message
+     */
+    virtual rapidjson::Value&& getValue() = 0;
+};
+}  // namespace messages
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_MESSAGES_MESSAGEINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/PortAudioMicrophoneWrapper.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/PortAudioMicrophoneWrapper.h
new file mode 100644
index 0000000000..f409259dcc
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/PortAudioMicrophoneWrapper.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_PORTAUDIOMICROPHONEWRAPPER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_PORTAUDIOMICROPHONEWRAPPER_H_
+
+#include <mutex>
+#include <thread>
+
+#include <AVSCommon/AVS/AudioInputStream.h>
+
+#include <portaudio.h>
+#include <Audio/MicrophoneInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/// This acts as a wrapper around PortAudio, a cross-platform open-source audio I/O library.
+class PortAudioMicrophoneWrapper : public applicationUtilities::resources::audio::MicrophoneInterface {
+public:
+    /**
+     * Creates a @c PortAudioMicrophoneWrapper.
+     *
+     * @param stream The shared data stream to write to.
+     * @return A unique_ptr to a @c PortAudioMicrophoneWrapper if creation was successful and @c nullptr otherwise.
+     */
+    static std::unique_ptr<PortAudioMicrophoneWrapper> create(std::shared_ptr<avsCommon::avs::AudioInputStream> stream);
+
+    /**
+     * Stops streaming from the microphone.
+     *
+     * @return Whether the stop was successful.
+     */
+    bool stopStreamingMicrophoneData() override;
+
+    /**
+     * Starts streaming from the microphone.
+     *
+     * @return Whether the start was successful.
+     */
+    bool startStreamingMicrophoneData() override;
+
+    /**
+     * Whether the microphone is currently streaming.
+     *
+     * @return Whether the microphone is streaming.
+     */
+    bool isStreaming() override;
+
+    /**
+     * Destructor.
+     */
+    ~PortAudioMicrophoneWrapper();
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param stream The shared data stream to write to.
+     */
+    PortAudioMicrophoneWrapper(std::shared_ptr<avsCommon::avs::AudioInputStream> stream);
+
+    /**
+     * The callback that PortAudio will issue when audio is avaiable to read.
+     *
+     * @param inputBuffer The temporary buffer that microphone audio data will be available in.
+     * @param outputBuffer Not used here.
+     * @param numSamples The number of samples available to consume.
+     * @param timeInfo Time stamps indicated when the first sample in the buffer was captured. Not used here.
+     * @param statusFlags Flags that tell us when underflow or overflow conditions occur. Not used here.
+     * @param userData A user supplied pointer.
+     * @return A PortAudio code that will indicate how PortAudio should continue.
+     */
+    static int PortAudioCallback(
+        const void* inputBuffer,
+        void* outputBuffer,
+        unsigned long numSamples,
+        const PaStreamCallbackTimeInfo* timeInfo,
+        PaStreamCallbackFlags statusFlags,
+        void* userData);
+
+    /// Initializes PortAudio
+    bool initialize();
+
+    /**
+     * Get the optional config parameter from @c AlexaClientSDKConfig.json
+     * for setting the PortAudio stream's suggested latency.
+     *
+     * @param[out] suggestedLatency The latency as it is configured in the file.
+     * @return  @c true if the suggestedLatency is defined in the config file, @c false otherwise.
+     */
+    bool getConfigSuggestedLatency(PaTime& suggestedLatency);
+
+    /// The stream of audio data.
+    const std::shared_ptr<avsCommon::avs::AudioInputStream> m_audioInputStream;
+
+    /// The writer that will be used to writer audio data into the sds.
+    std::shared_ptr<avsCommon::avs::AudioInputStream::Writer> m_writer;
+
+    /// The PortAudio stream
+    PaStream* m_paStream;
+
+    /**
+     * A lock to seralize access to startStreamingMicrophoneData() and stopStreamingMicrophoneData() between different
+     * threads.
+     */
+    std::mutex m_mutex;
+
+    /**
+     * Whether the microphone is currently streaming.
+     */
+    bool m_isStreaming;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_PORTAUDIOMICROPHONEWRAPPER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/RenderCaptionsInterface.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/RenderCaptionsInterface.h
new file mode 100644
index 0000000000..6153a984c7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/RenderCaptionsInterface.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_RENDERCAPTIONSINTERFACE_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_RENDERCAPTIONSINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * This class is used to render captions visually
+ */
+class RenderCaptionsInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~RenderCaptionsInterface() = default;
+    /**
+     * Send captions to be rendered
+     *
+     * @param payload Captions to be rendered.
+     */
+    virtual void renderCaptions(const std::string& payload) = 0;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_RENDERCAPTIONSINTERFACE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/RevokeAuthorizationObserver.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/RevokeAuthorizationObserver.h
new file mode 100644
index 0000000000..22bddda431
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/RevokeAuthorizationObserver.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_REVOKEAUTHORIZATIONOBSERVER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_REVOKEAUTHORIZATIONOBSERVER_H_
+
+#include <memory>
+
+#include <AVSCommon/SDKInterfaces/RevokeAuthorizationObserverInterface.h>
+#include <RegistrationManager/RegistrationManagerInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * Observes callbacks from revoke authorization requests and notifies the default client.
+ */
+class RevokeAuthorizationObserver : public avsCommon::sdkInterfaces::RevokeAuthorizationObserverInterface {
+public:
+    /**
+     * Constructor.
+     *
+     * @param manager The registration manager providing logout functionality.
+     */
+    RevokeAuthorizationObserver(std::shared_ptr<registrationManager::RegistrationManagerInterface> manager);
+
+    /// @name RevokeAuthorizationObserverInterface Functions
+    /// @{
+    void onRevokeAuthorization() override;
+    /// @}
+
+private:
+    /// The registration manager used to logout.
+    std::shared_ptr<registrationManager::RegistrationManagerInterface> m_manager;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_REVOKEAUTHORIZATIONOBSERVER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SampleApplication.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SampleApplication.h
new file mode 100644
index 0000000000..3af784edbb
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SampleApplication.h
@@ -0,0 +1,277 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SAMPLEAPPLICATION_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SAMPLEAPPLICATION_H_
+
+#include <fstream>
+#include <map>
+#include <memory>
+#include <tuple>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include <acsdkAuthorization/AuthorizationManager.h>
+#include <acsdkAuthorization/LWA/LWAAuthorizationAdapter.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
+#include <AVSCommon/SDKInterfaces/ApplicationMediaInterfaces.h>
+#include <AVSCommon/SDKInterfaces/ChannelVolumeInterface.h>
+#include <AVSCommon/SDKInterfaces/Diagnostics/DiagnosticsInterface.h>
+#include <AVSCommon/Utils/MediaPlayer/PooledMediaPlayerFactory.h>
+#include <CapabilitiesDelegate/CapabilitiesDelegate.h>
+#include <acsdkExternalMediaPlayer/ExternalMediaPlayer.h>
+
+#include "ConsolePrinter.h"
+#include <DefaultClient/EqualizerRuntimeSetup.h>
+
+#include "SampleApplicationReturnCodes.h"
+
+#ifdef KWD
+#include <acsdkKWDImplementations/AbstractKeywordDetector.h>
+#endif
+
+#ifdef GSTREAMER_MEDIA_PLAYER
+#include <MediaPlayer/MediaPlayer.h>
+#elif defined(UWP_BUILD)
+#include <SSSDKCommon/TestMediaPlayer.h>
+#endif  // GSTREAMER_MEDIA_PLAYER
+
+#include <acsdk/Sample/InteractionManager/InteractionManager.h>
+
+#include "GUI/GUIActivityEventNotifier.h"
+#include "GUI/GUIClient.h"
+#include "GUI/GUIManager.h"
+#include "IPC/Components/AlexaCaptionsHandler.h"
+#include "IPC/Components/TemplateRuntimeHandler.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/// Class to manage the top-level components of the AVS Client Application
+class SampleApplication {
+public:
+    /**
+     * Create a SampleApplication.
+     *
+     * @param configFiles The vector of configuration files.
+     * @param logLevel The level of logging to enable.  If this parameter is an empty string, the SDK's default
+     *     logging level will be used.
+     * @param diagnostics An optional @c DiagnosticsInterface object to provide diagnostics on the SDK.
+     * @return A new @c SampleApplication, or @c nullptr if the operation failed.
+     */
+    static std::unique_ptr<SampleApplication> create(
+        const std::vector<std::string>& configFiles,
+        const std::string& logLevel = "",
+        std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics = nullptr);
+
+    /**
+     * Runs the application, blocking until the user asks the application to quit or a device reset is triggered.
+     *
+     * @return Returns a @c SampleAppReturnCode.
+     */
+    SampleAppReturnCode run();
+
+    /// Destructor which manages the @c SampleApplication shutdown sequence.
+    ~SampleApplication();
+#ifdef UWP_BUILD
+    std::shared_ptr<gui::GUIClient> getGUIClient() {
+        return m_guiClient;
+    }
+
+    std::shared_ptr<gui::GUIManager> getGUIManager() {
+        return m_guiManager;
+    }
+#endif
+
+    /**
+     * Method to create mediaPlayers for the optional music provider adapters plugged into the SDK.
+     *
+     * @param httpContentFetcherFactory The HTTPContentFetcherFactory to be used while creating the mediaPlayers.
+     * @param equalizerRuntimeSetup Equalizer runtime setup to register equalizers
+     * @return @c true if the mediaPlayer of all the registered adapters could be created @c false otherwise.
+     */
+    bool createMediaPlayersForAdapters(
+        const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
+            httpContentFetcherFactory,
+        const std::shared_ptr<defaultClient::EqualizerRuntimeSetup> equalizerRuntimeSetup);
+
+    /**
+     * Instances of this class register ExternalMediaAdapters. Each adapter registers itself by instantiating
+     * a static instance of the below class supplying their business name and creator method.
+     */
+    class AdapterRegistration {
+    public:
+        /**
+         * Register an @c ExternalMediaAdapter for use by @c ExternalMediaPlayer.
+         *
+         * @param playerId The @c playerId identifying the @c ExternalMediaAdapter to register.
+         * @param createFunction The function to use to create instances of the specified @c ExternalMediaAdapter.
+         */
+        AdapterRegistration(
+            const std::string& playerId,
+            acsdkExternalMediaPlayer::ExternalMediaPlayer::AdapterCreateFunction createFunction);
+    };
+
+    /**
+     * Instances of this class register MediaPlayers to be created. Each third-party adapter registers a mediaPlayer
+     * for itself by instantiating a static instance of the below class supplying their business name, speaker interface
+     * type and creator method.
+     */
+    class MediaPlayerRegistration {
+    public:
+        /**
+         * Register a @c MediaPlayer for use by a music provider adapter.
+         *
+         * @param playerId The @c playerId identifying the @c ExternalMediaAdapter to register.
+         * @param speakerType The SpeakerType of the mediaPlayer to be created.
+         */
+        MediaPlayerRegistration(
+            const std::string& playerId,
+            avsCommon::sdkInterfaces::ChannelVolumeInterface::Type speakerType);
+    };
+
+private:
+    /**
+     * Initialize a SampleApplication.
+     *
+     * @param configFiles The vector of configuration files.
+     * @param logLevel The level of logging to enable.  If this parameter is an empty string, the SDK's default
+     *     logging level will be used.
+     * @param diagnostics An optional @c DiagnosticsInterface object to provide diagnostics on the SDK.
+     * @return @c true if initialization succeeded, else @c false.
+     */
+    bool initialize(
+        const std::vector<std::string>& configFiles,
+        const std::string& logLevel,
+        std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics);
+
+    /**
+     * Create an application media player.
+     *
+     * @param contentFetcherFactory Used to create objects that can fetch remote HTTP content.
+     * @param enableEqualizer Flag indicating if equalizer should be enabled for this media player.
+     * @param name The media player instance name used for logging purpose.
+     * @param enableLiveMode Flag, indicating if the player is in live mode.
+     * @return Application Media interface if it succeeds; otherwise, return @c nullptr.
+     */
+    std::shared_ptr<avsCommon::sdkInterfaces::ApplicationMediaInterfaces> createApplicationMediaPlayer(
+        const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
+            httpContentFetcherFactory,
+        bool enableEqualizer,
+        const std::string& name,
+        bool enableLiveMode = false);
+
+    /// Object with which to trigger shutdown operations.
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> m_shutdownManager;
+
+    /// Object to manage lifecycle of Alexa Client SDK initialization.
+    std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit> m_sdkInit;
+
+    /// The @c SDKClientRegistry which contains all feature clients
+    std::shared_ptr<sdkClient::SDKClientRegistry> m_clientRegistry;
+
+    /// The @c DefaultClient which "glues" together all other modules.
+    std::shared_ptr<defaultClient::DefaultClient> m_defaultClient;
+
+    /// The @c InteractionManager which perform user interaction.
+    std::shared_ptr<common::InteractionManager> m_interactionManager;
+
+    /// The @c GUIClient
+    std::shared_ptr<gui::GUIClient> m_guiClient;
+
+    /// The @c GUIManager
+    std::shared_ptr<gui::GUIManager> m_guiManager;
+
+    /// The @c AplClientBridge
+    std::shared_ptr<AplClientBridge> m_aplClientBridge;
+
+    /// The @c GUIActivityEventNotifier
+    std::shared_ptr<gui::GUIActivityEventNotifier> m_activityEventNotifier;
+
+    /// The @c TemplateRuntimeHandler.
+    std::shared_ptr<ipc::TemplateRuntimeHandler> m_templateRuntimeIPCHandler;
+
+    /// The AlexaCaptions IPC Handler.
+    std::shared_ptr<ipc::AlexaCaptionsHandler> m_alexaCaptionIPCHandler;
+
+    /// The map of the adapters and their mediaPlayers.
+    std::unordered_map<std::string, std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface>>
+        m_externalMusicProviderMediaPlayersMap;
+
+    /// The map of the adapters and their mediaPlayers.
+    std::unordered_map<std::string, std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>>
+        m_externalMusicProviderSpeakersMap;
+
+    /// The vector of components requiring shutdown
+    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>> m_shutdownRequiredList;
+
+    /// The @c MediaPlayer used by @c SpeechSynthesizer.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_speakMediaPlayer;
+
+    /// The Pool of @c MediaPlayers used by @c AudioPlayer (via @c PooledMediaPlayerFactory)
+    std::vector<std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface>> m_audioMediaPlayerPool;
+
+    /// The @c MediaPlayer used by @c Alerts.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_alertsMediaPlayer;
+
+    /// The @c MediaPlayer used by @c NotificationsCapabilityAgent.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_notificationsMediaPlayer;
+
+    /// The @c MediaPlayer used by @c Bluetooth.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_bluetoothMediaPlayer;
+
+    /// The @c MediaPlayer used by @c SystemSoundPlayer.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_systemSoundMediaPlayer;
+
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+    /// The @c MediaPlayer used by @c Comms.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_commsMediaPlayer;
+#endif
+
+    /// The @c CapabilitiesDelegate used by the client.
+    std::shared_ptr<capabilitiesDelegate::CapabilitiesDelegate> m_capabilitiesDelegate;
+
+    /// The @c MediaPlayer used by @c NotificationsCapabilityAgent.
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_ringtoneMediaPlayer;
+
+    /// The singleton map from @c playerId to @c ChannelVolumeInterface::Type.
+    static std::unordered_map<std::string, avsCommon::sdkInterfaces::ChannelVolumeInterface::Type>
+        m_playerToSpeakerTypeMap;
+
+    /// The singleton map from @c playerId to @c ExternalMediaAdapter creation functions.
+    static acsdkExternalMediaPlayer::ExternalMediaPlayer::AdapterCreationMap m_adapterToCreateFuncMap;
+
+#ifdef KWD
+    /// The Wakeword Detector which can wake up the client using audio input.
+    std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> m_keywordDetector;
+#endif
+
+    /// The @c AuthorizationManager instance that can be used to dynamically authorize with different methods.
+    std::shared_ptr<acsdkAuthorization::AuthorizationManager> m_authManager;
+
+    /// The adapter that supports authorizing with LWA based methods.
+    std::shared_ptr<acsdkAuthorization::lwa::LWAAuthorizationAdapter> m_lwaAdapter;
+
+    std::string decodeHexToAscii(const std::string hexString);
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SAMPLEAPPLICATION_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SampleApplicationComponent.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SampleApplicationComponent.h
new file mode 100644
index 0000000000..bb7f2f0ae7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SampleApplicationComponent.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SAMPLEAPPLICATIONCOMPONENT_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SAMPLEAPPLICATIONCOMPONENT_H_
+
+#include <istream>
+#include <memory>
+#include <vector>
+
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
+#include <acsdkAuthorizationInterfaces/LWA/CBLAuthorizationObserverInterface.h>
+#include <acsdkManufactory/Component.h>
+#include <AVSCommon/SDKInterfaces/AuthDelegateInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/LocaleAssetsManagerInterface.h>
+#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
+#include <AVSCommon/AVS/Attachment/AttachmentManagerInterface.h>
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include <AVSCommon/Utils/DeviceInfo.h>
+#include <AVSCommon/Utils/LibcurlUtils/HttpPostInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * Definition of the Manufactory component for the Sample App.
+ *
+ */
+using SampleApplicationComponent = acsdkManufactory::Component<
+    std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit>,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>,
+    std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>,
+    std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>,
+    std::shared_ptr<avsCommon::utils::DeviceInfo>,
+    std::shared_ptr<registrationManager::CustomerDataManagerInterface>,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>,
+    std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>,
+    std::shared_ptr<cryptoInterfaces::KeyStoreInterface>>;
+
+using SampleApplicationOptionsComponent = acsdkManufactory::Component<
+    acsdkManufactory::Import<std::unique_ptr<avsCommon::utils::libcurlUtils::HttpPostInterface>>,
+    acsdkManufactory::Import<std::shared_ptr<avsCommon::utils::DeviceInfo>>,
+    acsdkManufactory::Import<std::shared_ptr<registrationManager::CustomerDataManagerInterface>>,
+    std::shared_ptr<avsCommon::utils::logger::Logger>,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>;
+
+/**
+ * Get the @c Manufactory @c Component for the default @c SampleApplication options
+ * @return The @c Manufactory @c Component for the default @c SampleApplication options
+ */
+
+SampleApplicationOptionsComponent getSampleApplicationOptionsComponent();
+
+/**
+ * Get the manufactory @c Component for SampleApp.
+ *
+ * @return The manufactory @c Component for SampleApp.
+ */
+SampleApplicationComponent getComponent(
+    std::unique_ptr<avsCommon::avs::initialization::InitializationParameters> initParams,
+    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>>& requiresShutdownList,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate = nullptr,
+    const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder = nullptr,
+    const std::shared_ptr<avsCommon::utils::logger::Logger>& logger = nullptr);
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SAMPLEAPPLICATIONCOMPONENT_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SampleApplicationReturnCodes.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SampleApplicationReturnCodes.h
new file mode 100644
index 0000000000..07da42fc44
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SampleApplicationReturnCodes.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SAMPLEAPPLICATIONRETURNCODES_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SAMPLEAPPLICATIONRETURNCODES_H_
+
+#include <cstdlib>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+enum SampleAppReturnCode {
+    /// The SampleApp exits in success.
+    OK = EXIT_SUCCESS,
+    /// The SampleApp exits in failure.
+    ERROR = EXIT_FAILURE,
+    /// The SampleApp exits and needs a restart.
+    RESTART
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SAMPLEAPPLICATIONRETURNCODES_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SampleEqualizerModeController.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SampleEqualizerModeController.h
new file mode 100644
index 0000000000..217ca87803
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SampleEqualizerModeController.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SAMPLEEQUALIZERMODECONTROLLER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SAMPLEEQUALIZERMODECONTROLLER_H_
+
+#include <list>
+#include <memory>
+#include <mutex>
+
+#include <acsdkEqualizerInterfaces/EqualizerModeControllerInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * Sample implementation of @c EqualizerModeControllerInterface that prints the mode requested to console.
+ */
+class SampleEqualizerModeController : public acsdkEqualizerInterfaces::EqualizerModeControllerInterface {
+public:
+    /**
+     * Factory method.
+     *
+     * @return An instance of @c SampleEqualizerModeController.
+     */
+    static std::shared_ptr<SampleEqualizerModeController> create();
+
+    /// @name EqualizerModeControllerInterface methods
+    /// @{
+
+    bool setEqualizerMode(acsdkEqualizerInterfaces::EqualizerMode mode) override;
+
+    ///@}
+
+private:
+    /**
+     * Constructor.
+     */
+    SampleEqualizerModeController() = default;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SAMPLEEQUALIZERMODECONTROLLER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SmartScreenCaptionPresenter.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SmartScreenCaptionPresenter.h
new file mode 100644
index 0000000000..922e69721e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SmartScreenCaptionPresenter.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SMARTSCREENCAPTIONPRESENTER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SMARTSCREENCAPTIONPRESENTER_H_
+
+#include "IPCServerSampleApp/RenderCaptionsInterface.h"
+#include <Captions/CaptionPresenterInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+class SmartScreenCaptionPresenter : public captions::CaptionPresenterInterface {
+public:
+    explicit SmartScreenCaptionPresenter(std::shared_ptr<RenderCaptionsInterface> renderCaptionsInterface);
+
+    /// @name CaptionPresenterInterface methods
+    /// @{
+    void onCaptionActivity(const captions::CaptionFrame& captionFrame, avsCommon::avs::FocusState focusState) override;
+    std::pair<bool, int> getWrapIndex(const captions::CaptionLine& captionLine) override;
+    ///@}
+
+private:
+    /// Pointer to the GUI Client interface
+    std::shared_ptr<RenderCaptionsInterface> m_renderCaptionsInterface;
+
+    rapidjson::Document convertCaptionFrameToJson(const captions::CaptionFrame& captionFrame);
+    rapidjson::Value convertCaptionLineToJson(
+        const captions::CaptionLine& captionLine,
+        rapidjson::Document::AllocatorType& allocator);
+    rapidjson::Value convertTextStyleToJson(
+        captions::TextStyle textStyle,
+        rapidjson::Document::AllocatorType& allocator);
+    rapidjson::Value convertStyleToJson(captions::Style style, rapidjson::Document::AllocatorType& allocator);
+
+    rapidjson::Value convertCaptionLinesToJson(
+        const std::vector<captions::CaptionLine>& captionLines,
+        rapidjson::Document::AllocatorType& allocator);
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SMARTSCREENCAPTIONPRESENTER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SmartScreenCaptionStateManager.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SmartScreenCaptionStateManager.h
new file mode 100644
index 0000000000..7d6920d3be
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/SmartScreenCaptionStateManager.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SMARTSCREENCAPTIONSTATEMANAGER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SMARTSCREENCAPTIONSTATEMANAGER_H_
+
+#include <memory>
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * This class manages if captions are turned on or off. It stores the status persistently
+ * in disk
+ */
+class SmartScreenCaptionStateManager {
+public:
+    /**
+     * Constructor
+     * @param miscStorage the storage where Captions settings are stored
+     */
+    explicit SmartScreenCaptionStateManager(
+        std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage);
+    /**
+     * Retrieves the current captions status
+     * @return whether or not Captions are enabled
+     */
+    bool areCaptionsEnabled();
+
+    /**
+     * Set the state of captions in the DB.
+     * @param enabled true if captions should be enabled
+     */
+    void setCaptionsState(bool enabled);
+
+private:
+    /// Pointer to the storage interface
+    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> m_miscStorage;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_SMARTSCREENCAPTIONSTATEMANAGER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/TelemetrySink.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/TelemetrySink.h
new file mode 100644
index 0000000000..b5e8457317
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/TelemetrySink.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_TELEMETRYSINK_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_TELEMETRYSINK_H_
+
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+#include <APLClient/Telemetry/AplMetricsSinkInterface.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/**
+ * Records telemetry reported by APL through a @c MetricRecorderInterface.
+ */
+class TelemetrySink : public APLClient::Telemetry::AplMetricsSinkInterface {
+public:
+    TelemetrySink(std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder);
+    ~TelemetrySink() override = default;
+
+    /**
+     * Outputs a timer value through this instance's metrics recorder.
+     * @param metadata The metadata associated with this timer.
+     * @param name The name of the timer to report
+     * @param value The elapsed time recorded by the timer
+     */
+    void reportTimer(
+        const std::map<std::string, std::string>& metadata,
+        const std::string& name,
+        const std::chrono::nanoseconds& value) override;
+
+    /**
+     * Outputs a counter value through this instance's metrics recorder.
+     * @param metadata The metadata associated with this counter.
+     * @param name The name of the counter to report
+     * @param value The recorded value of the counter
+     */
+    void reportCounter(const std::map<std::string, std::string>& metadata, const std::string& name, uint64_t value)
+        override;
+
+private:
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
+};
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_TELEMETRYSINK_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/TimezoneHelper.h b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/TimezoneHelper.h
new file mode 100644
index 0000000000..e7c05f2ee5
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/include/IPCServerSampleApp/TimezoneHelper.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_TIMEZONEHELPER_H_
+#define ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_TIMEZONEHELPER_H_
+
+#include <chrono>
+#include <string>
+
+#include <Settings/DeviceSettingsManager.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+/**
+ * Utility class to calculate the timezone offset for the device
+ */
+class TimezoneHelper
+        : public settings::SettingObserverInterface<settings::TimeZoneSetting>
+        , public std::enable_shared_from_this<TimezoneHelper> {
+public:
+    /**
+     * Create an instance of the @c TimezoneHelper
+     * @param deviceSettingsManager Reference to the DeviceSettingsManager
+     * @return instance of the TimezoneHelper
+     */
+    static std::shared_ptr<TimezoneHelper> create(
+        const std::shared_ptr<settings::DeviceSettingsManager>& deviceSettingsManager);
+
+    /**
+     * Gets Device Time Zone Offset.
+     */
+    std::chrono::milliseconds getDeviceTimezoneOffset();
+
+    /// @c SettingObserverInterface functions
+    /// @{
+    void onSettingNotification(const std::string& value, settings::SettingNotifications notification) override;
+    /// @}
+
+private:
+    /**
+     * Constructor
+     * @param deviceSettingsManager Reference to the DeviceSettingsManager
+     */
+    TimezoneHelper(const std::shared_ptr<settings::DeviceSettingsManager>& deviceSettingsManager);
+
+    /**
+     * Calculates the offset
+     * @param timeZone The timezone name
+     * @return The offset in milliseconds, or 0 if the timezone could not be identified
+     */
+    std::chrono::milliseconds calculateDeviceTimezoneOffset(const std::string& timeZone);
+
+    /**
+     * The timezone offset
+     */
+    std::chrono::milliseconds m_deviceTimeZoneOffset;
+};
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_LIBIPCSERVERSAMPLEAPP_INCLUDE_IPCSERVERSAMPLEAPP_TIMEZONEHELPER_H_
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLDocumentSession.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLDocumentSession.cpp
new file mode 100644
index 0000000000..be6b43ac38
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLDocumentSession.cpp
@@ -0,0 +1,710 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/AlexaPresentation/APLRuntimePresentationAdapter.h"
+#include "IPCServerSampleApp/AlexaPresentation/APLDocumentSession.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+using namespace presentationOrchestratorInterfaces;
+using namespace aplCapabilityCommonInterfaces;
+
+static const std::string TAG{"APLDocumentSession"};
+
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+APLDocumentSession::APLDocumentSession(
+    const std::string& document,
+    const std::string& data,
+    const std::string& supportedViewports,
+    const alexaClientSDK::aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+    const alexaClientSDK::aplCapabilityCommonInterfaces::PresentationOptions& presentationOptions,
+    std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::APLDocumentObserverInterface> observer,
+    APLViewhostInterfacePtr viewhost,
+    bool hasPresentationAssociation) :
+        m_viewhost{viewhost},
+        m_hasPresentationAssociation{hasPresentationAssociation},
+        m_presentation{nullptr},
+        m_state{PresentationState::NONE},
+        m_document{document},
+        m_data{data},
+        m_presentationSession{presentationSession},
+        m_presentationOptions{presentationOptions},
+        m_observer{observer},
+        m_supportedViewports{supportedViewports},
+        m_renderComplete{false} {
+}
+
+void APLDocumentSession::clearDocument() {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this] { executeClearDocument(); });
+}
+
+void APLDocumentSession::executeClearDocument(bool forceClear) {
+    if (!forceClear && !executeIsPresentationActive()) {
+        ACSDK_WARN(LX("clearDocumentFailed").d("reason", "Presentation is not active"));
+        return;
+    }
+
+    if (auto viewhost = m_viewhost.lock()) {
+        viewhost->clearDocument(m_presentationOptions.token);
+    }
+}
+
+void APLDocumentSession::executeCommands(const std::string& commands) {
+    ACSDK_DEBUG9(LX(__func__));
+
+    m_executor.submit([this, commands] {
+        if (executeIsPresentationForegrounded()) {
+            if (auto viewhost = m_viewhost.lock()) {
+                viewhost->executeCommands(commands, m_presentationOptions.token);
+            }
+        } else {
+            onCommandExecutionComplete(
+                m_presentationOptions.token,
+                APLClient::AplCommandExecutionEvent::FAILED,
+                "Presentation is not in focus");
+            ACSDK_WARN(LX("executeCommandsFailed").d("reason", "Presentation is not in focus"));
+        }
+    });
+}
+
+void APLDocumentSession::dataSourceUpdate(const std::string& sourceType, const std::string& payload) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, sourceType, payload] {
+        if (executeIsPresentationForegrounded()) {
+            if (auto viewhost = m_viewhost.lock()) {
+                viewhost->dataSourceUpdate(sourceType, payload, m_presentationOptions.token);
+            }
+        } else {
+            onDataSourceUpdateComplete(m_presentationOptions.token, false, "Presentation is not in focus");
+            ACSDK_WARN(LX("dataSourceUpdateFailed").d("reason", "Presentation is not in focus"));
+        }
+    });
+}
+
+void APLDocumentSession::interruptCommandSequence() {
+    ACSDK_DEBUG9(LX(__func__));
+
+    m_executor.submit([this] {
+        if (!executeIsPresentationActive()) {
+            ACSDK_WARN(LX("interruptCommandSequenceFailed").d("reason", "Presentation is not active"));
+            return;
+        }
+
+        if (auto viewhost = m_viewhost.lock()) {
+            viewhost->interruptCommandSequence(m_presentationOptions.token);
+        }
+    });
+}
+
+void APLDocumentSession::provideDocumentContext(const unsigned int stateRequestToken) {
+    ACSDK_DEBUG5(LX(__func__));
+
+    m_executor.submit([this, stateRequestToken] {
+        if (!executeIsPresentationActive()) {
+            aplEventPayload::VisualContext visualContext;
+            ACSDK_WARN(LX("provideDocumentContextFailed").d("reason", "Presentation is not active"));
+            m_observer->onVisualContextAvailable(stateRequestToken, visualContext);
+            return;
+        }
+
+        if (!m_renderComplete) {
+            aplEventPayload::VisualContext visualContext;
+            ACSDK_WARN(LX("provideDocumentContextFailed").d("reason", "Document has not rendered"));
+            m_observer->onVisualContextAvailable(stateRequestToken, visualContext);
+            return;
+        }
+
+        if (auto viewhost = m_viewhost.lock()) {
+            viewhost->provideState(getToken(), stateRequestToken);
+        }
+    });
+}
+
+void APLDocumentSession::requestForeground() {
+    m_executor.submit([this] {
+        if (!executeIsPresentationActive()) {
+            ACSDK_WARN(LX("requestForegroundFailed").d("reason", "No active presentation"));
+            return;
+        } else if (executeIsPresentationForegrounded()) {
+            ACSDK_DEBUG0(LX("requestForeground").m("Presentation already foreground"));
+            return;
+        }
+
+        if (m_presentation) {
+            m_presentation->foreground();
+        }
+    });
+}
+
+void APLDocumentSession::stopTimeout() {
+    m_executor.submit([this] {
+        if (!m_hasPresentationAssociation) {
+            ACSDK_WARN(LX("stopTimeout").m("No presentation associated with this document session."));
+            return;
+        }
+        m_presentation->stopTimeout();
+    });
+}
+
+void APLDocumentSession::resetTimeout() {
+    m_executor.submit([this] {
+        if (!m_hasPresentationAssociation) {
+            ACSDK_WARN(LX("resetTimeout").m("No presentation associated with this document session."));
+            return;
+        }
+
+        m_presentation->stopTimeout();
+        m_presentation->startTimeout();
+    });
+}
+
+void APLDocumentSession::updateLifespan(
+    alexaClientSDK::presentationOrchestratorInterfaces::PresentationLifespan lifespan) {
+    m_executor.submit([this, lifespan] {
+        if (!m_hasPresentationAssociation) {
+            ACSDK_WARN(LX("updateLifespan").m("No presentation associated with this document session."));
+            return;
+        }
+        m_presentation->setLifespan(lifespan);
+    });
+}
+
+void APLDocumentSession::updateTimeout(std::chrono::milliseconds timeout) {
+    m_executor.submit([this, timeout] {
+        if (!executeIsPresentationActive()) {
+            ACSDK_WARN(LX("updateTimeoutFailed").d("reason", "Presentation is not active"));
+            return;
+        }
+
+        if (m_presentation) {
+            m_presentation->setTimeout(timeout);
+            if (timeout != PresentationInterface::getTimeoutDisabled() &&
+                m_presentation->getState() == PresentationState::FOREGROUND) {
+                // APL interfaces expect any active timeouts to be reset
+                m_presentation->startTimeout();
+            }
+        }
+    });
+}
+
+void APLDocumentSession::updateTimeoutType(const APLTimeoutType& timeoutType) {
+    m_executor.submit([this, timeoutType] {
+        if (!executeIsPresentationActive()) {
+            ACSDK_WARN(LX("updateTimeoutTypeFailed").d("reason", "Presentation is not active"));
+            return;
+        }
+
+        PresentationLifespan presentationLifespan;
+        switch (timeoutType) {
+            case APLTimeoutType::SHORT:
+                presentationLifespan = PresentationLifespan::SHORT;
+                break;
+            case APLTimeoutType::TRANSIENT:
+                presentationLifespan = PresentationLifespan::TRANSIENT;
+                break;
+            case APLTimeoutType::LONG:
+                presentationLifespan = PresentationLifespan::LONG;
+                break;
+        }
+
+        if (m_presentation) {
+            m_presentation->setLifespan(presentationLifespan);
+            m_presentation->startTimeout();
+        }
+    });
+}
+
+std::string APLDocumentSession::getToken() const {
+    return m_presentationOptions.token;
+}
+
+void APLDocumentSession::onPresentationAvailable(
+    PresentationRequestToken id,
+    std::shared_ptr<PresentationInterface> presentation) {
+    ACSDK_DEBUG5(LX(__func__).d("id", id));
+    m_executor.submit([this, presentation] {
+        m_presentation = presentation;
+        m_state = presentation->getState();
+        firstRender();
+    });
+}
+
+void APLDocumentSession::onPresentationStateChanged(PresentationRequestToken id, PresentationState newState) {
+    ACSDK_DEBUG5(LX(__func__).d("id", id).d("oldState", m_state).d("newState", newState));
+
+    m_executor.submit([this, newState] {
+        if (newState == m_state) {
+            return;
+        }
+
+        m_state = newState;
+
+        switch (newState) {
+            case PresentationState::FOREGROUND:
+                m_observer->onActiveDocumentChanged(m_presentationOptions.token, m_presentationSession);
+                // fall-through
+            case PresentationState::FOREGROUND_UNFOCUSED:
+                // TODO: Restore state if previous state was background
+                break;
+            case PresentationState::BACKGROUND:
+                // TODO: We do not yet support the background state, once it is possible to suspend state then this
+                // should be replaced
+                if (executeIsPresentationActive()) {
+                    if (m_presentation) {
+                        m_presentation->dismiss();
+                    }
+                }
+                break;
+            case PresentationState::NONE:
+                executeClearDocument(true);
+                if (m_presentation) {
+                    m_presentation.reset();
+                }
+                break;
+        }
+    });
+}
+
+void APLDocumentSession::onCommandExecutionComplete(
+    const std::string& token,
+    APLClient::AplCommandExecutionEvent event,
+    const std::string& message) {
+    if (!canHandleToken(token)) {
+        return;
+    }
+
+    aplCapabilityCommonInterfaces::APLCommandExecutionEvent eventType =
+        aplCapabilityCommonInterfaces::APLCommandExecutionEvent::FAILED;
+    switch (event) {
+        case APLClient::AplCommandExecutionEvent::FAILED:
+            eventType = aplCapabilityCommonInterfaces::APLCommandExecutionEvent::FAILED;
+            break;
+        case APLClient::AplCommandExecutionEvent::RESOLVED:
+            eventType = aplCapabilityCommonInterfaces::APLCommandExecutionEvent::RESOLVED;
+            break;
+        case APLClient::AplCommandExecutionEvent::TERMINATED:
+            eventType = aplCapabilityCommonInterfaces::APLCommandExecutionEvent::TERMINATED;
+            break;
+    }
+
+    // Presentation state not checked to avoid possibility of blocking the directive
+    m_observer->onCommandExecutionComplete(token, eventType, message);
+}
+
+void APLDocumentSession::onRenderDocumentComplete(
+    const std::string& token,
+    bool result,
+    const std::string& error,
+    const std::chrono::steady_clock::time_point& timestamp) {
+    if (!canHandleToken(token)) {
+        return;
+    }
+
+    m_executor.submit([this, token, result, error, timestamp] {
+        // Only change the renderComplete state if this belongs to the last renderDocument we received.
+        if (getToken() == token) {
+            m_renderComplete = result;
+        }
+
+        // Presentation state not checked to avoid possibility of blocking the directive
+        m_observer->onRenderDocumentComplete(token, result, error, timestamp);
+    });
+}
+
+void APLDocumentSession::onSendEvent(
+    const std::string& token,
+    const std::string& arguments,
+    const std::string& components,
+    const std::string& source) {
+    if (!canHandleToken(token)) {
+        return;
+    }
+
+    m_executor.submit([this, token, arguments, components, source] {
+        if (!executeIsPresentationActive()) {
+            ACSDK_WARN(LX("onSendEventFailed").d("reason", "Presentation is not active"));
+            return;
+        }
+
+        aplEventPayload::UserEvent event;
+        event.token = std::move(token);
+        event.arguments = std::move(arguments);
+        event.source = std::move(source);
+        event.components = std::move(components);
+
+        m_observer->onSendEvent(event);
+    });
+}
+
+void APLDocumentSession::onVisualContextAvailable(
+    const unsigned int requestToken,
+    const std::string& token,
+    const std::string& version,
+    const std::string& visualContext,
+    const std::string& datasourceContext) {
+    if (!canHandleToken(token)) {
+        return;
+    }
+
+    aplEventPayload::VisualContext context;
+    context.token = std::move(token);
+    context.version = std::move(version);
+    context.visualContext = std::move(visualContext);
+    context.datasourceContext = std::move(datasourceContext);
+    m_observer->onVisualContextAvailable(requestToken, context);
+}
+
+void APLDocumentSession::onDataSourceUpdateComplete(const std::string& token, bool result, const std::string& error) {
+    if (!canHandleToken(token)) {
+        return;
+    }
+
+    m_observer->onDataSourceUpdateComplete(token, result, error);
+}
+
+void APLDocumentSession::onDataSourceFetch(
+    const std::string& token,
+    const std::string& dataSourceType,
+    const std::string& payload) {
+    if (!canHandleToken(token)) {
+        return;
+    }
+
+    m_executor.submit([this, token, dataSourceType, payload] {
+        if (!executeIsPresentationActive()) {
+            ACSDK_WARN(LX("onDataSourceFetchFailed").d("reason", "Presentation is not active"));
+            return;
+        }
+
+        aplEventPayload::DataSourceFetch dataSourceFetch{token, dataSourceType, payload};
+
+        m_observer->onDataSourceFetch(dataSourceFetch);
+    });
+}
+
+void APLDocumentSession::onRuntimeError(const std::string& token, const std::string& payload) {
+    if (!canHandleToken(token)) {
+        return;
+    }
+
+    m_executor.submit([this, token, payload] {
+        if (!executeIsPresentationActive()) {
+            ACSDK_WARN(LX("onRuntimeErrorFailed").d("reason", "Presentation is not active"));
+            return;
+        }
+
+        aplEventPayload::RuntimeError runtimeError{token, payload};
+
+        m_observer->onRuntimeError(runtimeError);
+    });
+}
+
+void APLDocumentSession::onDocumentFinished(const std::string& token) {
+    if (!canHandleToken(token)) {
+        return;
+    }
+
+    ACSDK_DEBUG5(LX(__func__).d("token", token));
+
+    m_executor.submit([this, token] {
+        if (executeIsPresentationActive()) {
+            // Dismissing the presentation will result in a onDocumentCleared event which will notify observers
+            if (m_presentation) {
+                m_presentation->dismiss();
+            }
+        } else {
+            ACSDK_ERROR(LX("onDocumentFinishedFailed").d("reason", "No active presentation"));
+        }
+    });
+}
+
+void APLDocumentSession::onOpenURL(const std::string& token, const std::string& url) {
+    if (!canHandleToken(token)) {
+        return;
+    }
+
+    ACSDK_INFO(LX(__func__).m("Open URL not supported"));
+}
+
+void APLDocumentSession::onDocumentCleared(const std::string& token) {
+    ACSDK_DEBUG5(LX(__func__).d("token", token));
+    // onDocumentCleared should only sent in response to a request from us to clear the document
+    if (!canHandleToken(token)) {
+        return;
+    }
+
+    m_executor.submit([this, token] {
+        m_renderComplete = false;
+        // If there is an active presentation for a cleared APL document session, it should be dismissed.
+        if (executeIsPresentationActive()) {
+            if (m_presentation) {
+                m_presentation->dismiss();
+            }
+        }
+
+        m_observer->onDocumentFinished(token);
+        m_observer->onSessionEnded(m_presentationSession);
+
+        if (auto viewhost = m_viewhost.lock()) {
+            viewhost->removeObserver(shared_from_this());
+        }
+    });
+}
+
+void APLDocumentSession::onSetDocumentIdleTimeout(const std::string& token, const std::chrono::milliseconds& timeout) {
+    if (!canHandleToken(token)) {
+        return;
+    }
+
+    ACSDK_DEBUG5(LX(__func__).d("token", token).d("timeoutMs", timeout.count()));
+
+    m_executor.submit([this, token, timeout] {
+        if (!executeIsPresentationActive()) {
+            ACSDK_WARN(LX("onSetDocumentIdleTimeoutFailed").d("reason", "Presentation is not active"));
+            return;
+        }
+
+        if (m_presentation) {
+            m_presentation->setTimeout(timeout);
+            m_presentation->startTimeout();
+        }
+    });
+}
+
+void APLDocumentSession::firstRender() {
+    ACSDK_DEBUG5(LX(__func__));
+    if (executeRenderDocument(true)) {
+        ACSDK_DEBUG5(LX(__func__).d("executedRenderDocument", true));
+        auto documentSessionWrapper =
+            std::unique_ptr<APLDocumentSessionWrapper>(new APLDocumentSessionWrapper(shared_from_this()));
+        m_observer->onAPLDocumentSessionAvailable(
+            m_presentationSession, m_presentationOptions.token, std::move(documentSessionWrapper));
+        m_observer->onActiveDocumentChanged(m_presentationOptions.token, m_presentationSession);
+    }
+}
+
+bool APLDocumentSession::executeRenderDocument(bool firstRender) {
+    ACSDK_DEBUG5(LX(__func__).d("firstRender", firstRender));
+    if (!executeIsPresentationActive()) {
+        ACSDK_WARN(LX("executeRenderDocumentFailed").d("reason", "Presentation is not active"));
+        m_observer->onRenderDocumentComplete(
+            m_presentationOptions.token, false, "No active presentation", std::chrono::steady_clock::now());
+        m_observer->onDocumentFinished(m_presentationOptions.token);
+        return false;
+    }
+
+    if (auto viewhost = m_viewhost.lock()) {
+        m_tokens.insert(m_presentationOptions.token);
+
+        if (firstRender) {
+            viewhost->addObserver(shared_from_this());
+        }
+
+        m_renderComplete = false;
+
+        viewhost->renderDocument(
+            m_presentationSession,
+            m_presentationOptions.token,
+            m_document,
+            m_data,
+            m_supportedViewports,
+            m_presentationOptions.windowId);
+        if (m_presentationOptions.documentReceivedTimestamp.time_since_epoch().count() != 0) {
+            viewhost->onRenderDirectiveReceived(
+                m_presentationOptions.token, m_presentationOptions.documentReceivedTimestamp);
+        }
+
+        return true;
+    } else {
+        ACSDK_ERROR(LX("executeRenderDocumentFailed").d("reason", "Viewhost pointer expired"));
+        if (m_presentation) {
+            m_presentation->dismiss();
+        }
+        m_observer->onRenderDocumentComplete(
+            m_presentationOptions.token, false, "Viewhost not available", std::chrono::steady_clock::now());
+
+        return false;
+    }
+}
+
+void APLDocumentSession::renderDocument(
+    const std::string& document,
+    const std::string& data,
+    const PresentationSession& presentationSession,
+    const alexaClientSDK::aplCapabilityCommonInterfaces::PresentationOptions& presentationOptions) {
+    m_executor.submit([this, document, data, presentationSession, presentationOptions] {
+        if (!executeIsPresentationActive()) {
+            ACSDK_WARN(LX("renderDocumentFailed").d("reason", "Presentation is not active"));
+            m_observer->onRenderDocumentComplete(
+                presentationOptions.token, false, "No active presentation", std::chrono::steady_clock::now());
+            return;
+        }
+
+        if (m_presentationSession.id != presentationSession.id) {
+            ACSDK_ERROR(LX("renderDocumentFailed")
+                            .d("reason", "Cannot change presentation session ID for an existing session"));
+            m_observer->onRenderDocumentComplete(
+                presentationOptions.token, false, "Invalid session ID change", std::chrono::steady_clock::now());
+            return;
+        }
+
+        // Any render of a new document to the session means the previous document is finished
+        if (!m_presentationOptions.token.empty()) {
+            m_observer->onDocumentFinished(m_presentationOptions.token);
+        }
+
+        if (presentationOptions.token != m_presentationOptions.token) {
+            if (m_presentation) {
+                m_presentation->setMetadata(presentationOptions.token);
+            }
+        }
+
+        /// If necessary overwrite the window ID, we do not allow a session to exist in two different windows
+        auto lastWindowId = m_presentationOptions.windowId;
+        m_document = document;
+        m_data = data;
+        m_presentationOptions = presentationOptions;
+        m_presentationSession = presentationSession;
+
+        if (lastWindowId != m_presentationOptions.windowId) {
+            if (!presentationOptions.windowId.empty()) {
+                ACSDK_WARN(LX("renderDocument")
+                               .d("oldWindowId", lastWindowId)
+                               .d("newWindowId", m_presentationOptions.windowId)
+                               .m("Mismatched window id, using old window ID"));
+            }
+
+            m_presentationOptions.windowId = lastWindowId;
+        }
+
+        executeRenderDocument();
+    });
+}
+
+bool APLDocumentSession::executeIsPresentationActive() const {
+    // If we have no presentation association, we treat it as 'active', since the absence of the presentation
+    // should not gate any behavior of the document session itself in these scenarios.
+    return !m_hasPresentationAssociation || (m_presentation && m_presentation->getState() != PresentationState::NONE);
+}
+
+bool APLDocumentSession::executeIsPresentationForegrounded() const {
+    // If we have no presentation association, we treat it as 'foregrounded', since the absence of the presentation
+    // should not gate any behavior of the document session itself in these scenarios.
+    return !m_hasPresentationAssociation ||
+           (m_presentation && m_presentation->getState() == PresentationState::FOREGROUND);
+}
+
+bool APLDocumentSession::onNavigateBack(PresentationRequestToken id) {
+    return m_executor
+        .submit([this] {
+            if (auto viewhost = m_viewhost.lock()) {
+                return viewhost->handleBack(m_presentationOptions.windowId);
+            }
+            return false;
+        })
+        .get();
+}
+
+bool APLDocumentSession::isForegroundFocused() {
+    return m_executor.submit([this] { return executeIsPresentationForegrounded(); }).get();
+}
+
+bool APLDocumentSession::canHandleToken(const std::string& token) {
+    return m_tokens.count(token);
+}
+
+std::shared_ptr<APLDocumentSession> APLDocumentSession::getDocumentSessionFromInterface(
+    const std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface>& aplDocumentSessionInterface) {
+    auto documentSessionWrapper = std::dynamic_pointer_cast<APLDocumentSessionWrapper>(aplDocumentSessionInterface);
+    if (!documentSessionWrapper) {
+        // Try also casting this object to an APLDocumentSession
+        if (auto documentSession = std::dynamic_pointer_cast<APLDocumentSession>(aplDocumentSessionInterface)) {
+            return documentSession;
+        }
+        ACSDK_ERROR(
+            LX("getDocumentSessionFromInterfaceFailed").d("reason", "Interface does not represent a document session"));
+        return nullptr;
+    }
+
+    return *documentSessionWrapper;
+}
+
+void APLDocumentSession::APLDocumentSessionWrapper::clearDocument() {
+    m_documentSession->clearDocument();
+}
+
+void APLDocumentSession::APLDocumentSessionWrapper::executeCommands(const std::string& commands) {
+    m_documentSession->executeCommands(commands);
+}
+
+void APLDocumentSession::APLDocumentSessionWrapper::dataSourceUpdate(
+    const std::string& sourceType,
+    const std::string& payload) {
+    m_documentSession->dataSourceUpdate(sourceType, payload);
+}
+
+void APLDocumentSession::APLDocumentSessionWrapper::interruptCommandSequence() {
+    m_documentSession->interruptCommandSequence();
+}
+
+void APLDocumentSession::APLDocumentSessionWrapper::provideDocumentContext(const unsigned int stateRequestToken) {
+    m_documentSession->provideDocumentContext(stateRequestToken);
+}
+
+void APLDocumentSession::APLDocumentSessionWrapper::requestForeground() {
+    m_documentSession->requestForeground();
+}
+
+void APLDocumentSession::APLDocumentSessionWrapper::stopTimeout() {
+    m_documentSession->stopTimeout();
+}
+
+void APLDocumentSession::APLDocumentSessionWrapper::resetTimeout() {
+    m_documentSession->resetTimeout();
+}
+
+void APLDocumentSession::APLDocumentSessionWrapper::updateLifespan(
+    presentationOrchestratorInterfaces::PresentationLifespan lifespan) {
+    m_documentSession->updateLifespan(lifespan);
+}
+
+void APLDocumentSession::APLDocumentSessionWrapper::updateTimeout(std::chrono::milliseconds timeout) {
+    m_documentSession->updateTimeout(timeout);
+}
+
+std::string APLDocumentSession::APLDocumentSessionWrapper::getToken() const {
+    return m_documentSession->getToken();
+}
+
+bool APLDocumentSession::APLDocumentSessionWrapper::isForegroundFocused() {
+    return m_documentSession->isForegroundFocused();
+}
+
+APLDocumentSession::APLDocumentSessionWrapper::APLDocumentSessionWrapper(
+    std::shared_ptr<APLDocumentSession> documentSession) :
+        m_documentSession(std::move(documentSession)) {
+}
+
+APLDocumentSession::APLDocumentSessionWrapper::operator std::shared_ptr<APLDocumentSession> const() {
+    return m_documentSession;
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLDocumentSessionManager.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLDocumentSessionManager.cpp
new file mode 100644
index 0000000000..ad1b9f4ec4
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLDocumentSessionManager.cpp
@@ -0,0 +1,150 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <mutex>
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "IPCServerSampleApp/AlexaPresentation/APLDocumentSessionManager.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+static const std::string TAG{"APLDocumentSessionManager"};
+
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+std::unique_ptr<APLDocumentSessionManager> APLDocumentSessionManager::create() {
+    return std::unique_ptr<APLDocumentSessionManager>(new APLDocumentSessionManager());
+}
+
+APLDocumentSessionManager::APLDocumentSessionManager() = default;
+
+void APLDocumentSessionManager::addDocumentSession(
+    const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+    const std::string& token,
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface> session) {
+    ACSDK_DEBUG9(LX(__func__).d("token", token.c_str()));
+    std::lock_guard<std::mutex> guard(m_mutex);
+    if (findSessionByTokenLocked(token)) {
+        ACSDK_WARN(LX(__func__).m("Active session already exists"));
+        return;
+    }
+    auto presentationSessionId = generatePresentationId(presentationSession);
+    m_presentationSessionIdToToken[presentationSessionId].insert(token);
+    m_tokenToPresentationSessionId[token] = presentationSessionId;
+    m_activeSessions.insert(std::make_pair(presentationSessionId, std::move(session)));
+}
+
+std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface> APLDocumentSessionManager::
+    findSessionByTokenLocked(const std::string& token) {
+    auto tokenToSessionIt = m_tokenToPresentationSessionId.find(token);
+    if (tokenToSessionIt == m_tokenToPresentationSessionId.end()) {
+        return nullptr;
+    }
+
+    auto sessionIt = m_activeSessions.find(tokenToSessionIt->second);
+    if (sessionIt == m_activeSessions.end()) {
+        return nullptr;
+    }
+
+    return sessionIt->second;
+}
+
+std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface> APLDocumentSessionManager::
+    getDocumentSessionByToken(const std::string& token) {
+    ACSDK_DEBUG9(LX(__func__).d("token", token));
+
+    std::lock_guard<std::mutex> guard(m_mutex);
+    return findSessionByTokenLocked(token);
+}
+
+void APLDocumentSessionManager::clearDocumentSession(
+    const aplCapabilityCommonInterfaces::PresentationSession& presentationSession) {
+    std::lock_guard<std::mutex> guard(m_mutex);
+    const auto presentationSessionId = generatePresentationId(presentationSession);
+    ACSDK_DEBUG9(LX(__func__).d("presentationSessionId", presentationSessionId));
+
+    for (auto& token : m_presentationSessionIdToToken[presentationSessionId]) {
+        m_tokenToPresentationSessionId.erase(token);
+    }
+    m_presentationSessionIdToToken.erase(presentationSessionId);
+    m_activeSessions.erase(presentationSessionId);
+}
+
+void APLDocumentSessionManager::invokeFunctionPerDocumentSession(
+    std::function<void(const std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface>&)> func) {
+    std::lock_guard<std::mutex> guard(m_mutex);
+    for (auto const& activeSessionEntry : m_activeSessions) {
+        func(activeSessionEntry.second);
+    }
+}
+
+void APLDocumentSessionManager::associateTokenWithPresentationSession(
+    const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+    const std::string& token) {
+    auto presentationSessionId = generatePresentationId(presentationSession);
+    ACSDK_DEBUG9(LX(__func__).d("sessionId", presentationSessionId).d("token", token));
+
+    if (m_activeSessions.count(presentationSessionId) == 0) {
+        ACSDK_WARN(LX("associateTokenWithSessionFailed")
+                       .d("reason", "session does not exist")
+                       .d("presentationSessionId", presentationSessionId));
+        return;
+    }
+
+    std::lock_guard<std::mutex> guard(m_mutex);
+    auto tokenSessionIt = m_tokenToPresentationSessionId.find(token);
+    if (tokenSessionIt != m_tokenToPresentationSessionId.end()) {
+        auto existingSessionId = tokenSessionIt->second;
+        if (existingSessionId == presentationSessionId) {
+            // Mapping already exists and is unchanged
+            return;
+        }
+
+        ACSDK_DEBUG5(LX(__func__)
+                         .d("presentationSessionId", presentationSessionId)
+                         .d("token", token)
+                         .m("Token is already associated with session, updating mapping"));
+        m_presentationSessionIdToToken[existingSessionId].erase(token);
+    }
+
+    m_tokenToPresentationSessionId[token] = presentationSessionId;
+    m_presentationSessionIdToToken[presentationSessionId].insert(token);
+}
+
+std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentSessionInterface> APLDocumentSessionManager::
+    getDocumentSessionByPresentationSession(
+        const aplCapabilityCommonInterfaces::PresentationSession& presentationSession) {
+    auto presentationSessionId = generatePresentationId(presentationSession);
+    ACSDK_DEBUG9(LX(__func__).d("sessionId", presentationSessionId));
+    auto it = m_activeSessions.find(presentationSessionId);
+    if (it == m_activeSessions.end()) {
+        return nullptr;
+    }
+
+    return it->second;
+}
+
+std::string APLDocumentSessionManager::generatePresentationId(
+    const aplCapabilityCommonInterfaces::PresentationSession& presentationSession) const {
+    // Only use the part of the id before the ':' separator
+    return presentationSession.id.substr(0, presentationSession.id.find(":")) + "/" + presentationSession.skillId;
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLPayloadParser.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLPayloadParser.cpp
new file mode 100644
index 0000000000..1b9cc2e38d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLPayloadParser.cpp
@@ -0,0 +1,187 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <rapidjson/writer.h>
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+
+#include "IPCServerSampleApp/AlexaPresentation/APLPayloadParser.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+using namespace avsCommon::utils::json;
+
+static const std::string TAG{"APLPayloadParser"};
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Identifier for the document sent in an APL directive
+static const std::string DOCUMENT_FIELD = "document";
+
+/// Identifier for the datasources sent in an APL directive
+static const std::string DATASOURCES_FIELD = "datasources";
+
+/// Identifier for the supportedViewports array sent in an APL directive
+static const std::string SUPPORTED_VIEWPORTS_FIELD = "supportedViewports";
+
+/// Empty JSON for unparsed values
+static const std::string EMPTY_JSON = "{}";
+
+/// Identifier for the presentationSession sent in a RenderDocument directive
+static const std::string PRESENTATION_SESSION_FIELD{"presentationSession"};
+
+/// Identifier for the skilld in presentationSession
+static const std::string SKILL_ID{"skillId"};
+
+/// Identifier for the id in presentationSession
+static const std::string PRESENTATION_SESSION_ID{"id"};
+
+/// Identifier for the grantedExtensions in presentationSession
+static const std::string PRESENTATION_SESSION_GRANTEDEXTENSIONS{"grantedExtensions"};
+
+/// Identifier for the autoInitializedExtensions in presentationSession
+static const std::string PRESENTATION_SESSION_AUTOINITIALIZEDEXTENSIONS{"autoInitializedExtensions"};
+
+//// Identifier for the uri in grantedExtensions or autoInitializedExtensions
+static const std::string PRESENTATION_SESSION_URI{"uri"};
+
+/// Identifier for the settings in autoInitializedExtensions
+static const std::string PRESENTATION_SESSION_SETTINGS{"settings"};
+
+/// Identifier for the timeoutType sent in a RenderDocument directive
+static const std::string TIMEOUTTYPE_FIELD = "timeoutType";
+
+std::string APLPayloadParser::extractDocument(const rapidjson::Document& document) {
+    std::string aplDocument;
+    if (!jsonUtils::retrieveValue(document, DOCUMENT_FIELD, &aplDocument)) {
+        aplDocument = EMPTY_JSON;
+    }
+
+    return aplDocument;
+}
+
+std::string APLPayloadParser::extractDatasources(const rapidjson::Document& document) {
+    std::string aplData;
+    if (!jsonUtils::retrieveValue(document, DATASOURCES_FIELD, &aplData)) {
+        aplData = EMPTY_JSON;
+    }
+
+    return aplData;
+}
+
+std::string APLPayloadParser::extractSupportedViewports(const rapidjson::Document& document) {
+    std::string supportedViewports;
+    rapidjson::Value::ConstMemberIterator jsonIt;
+    if (!jsonUtils::findNode(document, SUPPORTED_VIEWPORTS_FIELD, &jsonIt)) {
+        supportedViewports = EMPTY_JSON;
+    } else {
+        rapidjson::StringBuffer sb;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(sb);
+
+        if (!jsonIt->value.Accept(writer)) {
+            ACSDK_ERROR(LX("extractSupportedViewportsFailed").d("reason", "Error serializing json iterator payload"));
+            return EMPTY_JSON;
+        }
+
+        supportedViewports = sb.GetString();
+    }
+
+    return supportedViewports;
+}
+
+aplCapabilityCommonInterfaces::APLTimeoutType APLPayloadParser::extractTimeoutType(
+    const rapidjson::Document& document) {
+    std::string timeoutTypeStr;
+    if (!jsonUtils::retrieveValue(document, TIMEOUTTYPE_FIELD, &timeoutTypeStr)) {
+        ACSDK_WARN(LX("extractTimeoutTypeFailed").d("reason", "Missing timeoutType field, using SHORT"));
+        return aplCapabilityCommonInterfaces::APLTimeoutType::SHORT;
+    }
+
+    auto timeoutType = aplCapabilityCommonInterfaces::convertToTimeoutType(timeoutTypeStr);
+
+    if (!timeoutType.hasValue()) {
+        ACSDK_WARN(LX("extractTimeoutTypeFailed").d("reason", "Invalid timeoutType field, using SHORT"));
+    }
+
+    return timeoutType.valueOr(aplCapabilityCommonInterfaces::APLTimeoutType::SHORT);
+}
+
+const aplCapabilityCommonInterfaces::PresentationSession APLPayloadParser::extractPresentationSession(
+    const rapidjson::Document& document) {
+    rapidjson::Value::ConstMemberIterator iterator;
+    std::string presentationSessionPayload;
+    if (!jsonUtils::findNode(document, PRESENTATION_SESSION_FIELD, &iterator) ||
+        !jsonUtils::convertToValue(iterator->value, &presentationSessionPayload)) {
+        ACSDK_WARN(
+            LX("extractPresentationSessionFailed").d("reason", "Unable to retrieve presentationSession payload"));
+        return {};
+    }
+
+    std::string skillId;
+    if (!jsonUtils::retrieveValue(presentationSessionPayload, SKILL_ID, &skillId)) {
+        ACSDK_WARN(LX(__func__).m("Failed to find presentationSession skillId"));
+    }
+
+    std::string id;
+    if (!jsonUtils::retrieveValue(presentationSessionPayload, PRESENTATION_SESSION_ID, &id)) {
+        ACSDK_WARN(LX(__func__).m("Failed to find presentationSession id"));
+    }
+
+    rapidjson::Document doc;
+    doc.Parse(presentationSessionPayload);
+    std::vector<aplCapabilityCommonInterfaces::GrantedExtension> grantedExtensions;
+    if (doc.HasMember(PRESENTATION_SESSION_GRANTEDEXTENSIONS) &&
+        doc[PRESENTATION_SESSION_GRANTEDEXTENSIONS].IsArray()) {
+        auto grantExtensionArray = doc[PRESENTATION_SESSION_GRANTEDEXTENSIONS].GetArray();
+        for (auto& itr : grantExtensionArray) {
+            aplCapabilityCommonInterfaces::GrantedExtension grantedExtension;
+            if (itr.HasMember(PRESENTATION_SESSION_URI) && itr[PRESENTATION_SESSION_URI].IsString()) {
+                grantedExtension.uri = itr[PRESENTATION_SESSION_URI].GetString();
+                grantedExtensions.push_back(grantedExtension);
+            } else {
+                ACSDK_WARN(LX(__func__).m("Error parsing grantedExtensions"));
+            }
+        }
+    } else {
+        ACSDK_WARN(LX(__func__).m("Failed to find presentationSession grantedExtensions"));
+    }
+
+    std::vector<aplCapabilityCommonInterfaces::AutoInitializedExtension> autoInitializedExtensions;
+    if (doc.HasMember(PRESENTATION_SESSION_AUTOINITIALIZEDEXTENSIONS) &&
+        doc[PRESENTATION_SESSION_AUTOINITIALIZEDEXTENSIONS].IsArray()) {
+        auto autoInitializedExtensionArray = doc[PRESENTATION_SESSION_AUTOINITIALIZEDEXTENSIONS].GetArray();
+        for (auto& itr : autoInitializedExtensionArray) {
+            aplCapabilityCommonInterfaces::AutoInitializedExtension autoInitializedExtension;
+            if (itr.HasMember(PRESENTATION_SESSION_URI) && itr[PRESENTATION_SESSION_URI].IsString() &&
+                itr.HasMember(PRESENTATION_SESSION_SETTINGS) && itr[PRESENTATION_SESSION_SETTINGS].IsString()) {
+                autoInitializedExtension.uri = itr[PRESENTATION_SESSION_URI].GetString();
+                autoInitializedExtension.settings = itr[PRESENTATION_SESSION_SETTINGS].GetString();
+                autoInitializedExtensions.push_back(autoInitializedExtension);
+            } else {
+                ACSDK_WARN(LX(__func__).m("Error parsing autoInitializedExtensions"));
+            }
+        }
+    } else {
+        ACSDK_WARN(LX(__func__).m("Failed to find presentationSession autoInitializedExtensions"));
+    }
+
+    aplCapabilityCommonInterfaces::PresentationSession presentationSession = {
+        skillId, id, grantedExtensions, autoInitializedExtensions};
+
+    return presentationSession;
+}
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLRuntimeInterfaceImpl.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLRuntimeInterfaceImpl.cpp
new file mode 100644
index 0000000000..ec99b4f45a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLRuntimeInterfaceImpl.cpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/AlexaPresentation/APLRuntimeInterfaceImpl.h"
+
+#include <memory>
+
+#include "IPCServerSampleApp/AlexaPresentation/APLViewhostInterface.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+using presentationOrchestratorInterfaces::PresentationLifespan;
+
+static const std::string TAG{"APLRuntimeInterfaceImpl"};
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+APLRuntimeInterfaceImpl::APLRuntimeInterfaceImpl(APLViewhostInterfacePtr viewhost) : m_viewhost{viewhost} {
+}
+
+APLRuntimeInterfaceImpl::~APLRuntimeInterfaceImpl() {
+}
+
+std::shared_ptr<APLRuntimeInterfaceImpl> APLRuntimeInterfaceImpl::create(const APLViewhostInterfacePtr& viewhost) {
+    if (!viewhost) {
+        ACSDK_ERROR(LX(__func__).m("viewhost null"));
+        return nullptr;
+    }
+
+    return std::shared_ptr<APLRuntimeInterfaceImpl>(new APLRuntimeInterfaceImpl(viewhost));
+}
+void APLRuntimeInterfaceImpl::renderDocument(
+    const std::string& document,
+    const std::string& data,
+    const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+    const aplCapabilityCommonInterfaces::PresentationOptions& presentationOptions,
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentObserverInterface> observer) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!m_presentationOrchestratorClient) {
+        ACSDK_CRITICAL(
+            LX("renderDocumentFailed").d("reason", "Presentation Orchestrator Client has not been configured"));
+        return;
+    }
+
+    aplCapabilityCommonInterfaces::PresentationOptions options = presentationOptions;
+    if (options.windowId.empty()) {
+        std::lock_guard<std::mutex> guard(m_mutex);
+        options.windowId = m_defaultWindowId;
+    }
+
+    auto documentSession =
+        createDocumentSession(document, data, presentationSession, presentationOptions, observer, true);
+
+    presentationOrchestratorInterfaces::PresentationOptions poOptions;
+    poOptions.presentationLifespan = options.lifespan;
+    poOptions.metadata = options.token;
+    poOptions.interfaceName = options.interfaceName;
+    poOptions.timeout = options.timeout;
+
+    m_presentationOrchestratorClient->requestWindow(options.windowId, poOptions, documentSession);
+}
+
+std::shared_ptr<APLDocumentSession> APLRuntimeInterfaceImpl::createDocumentSession(
+    const std::string& document,
+    const std::string& data,
+    const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+    const aplCapabilityCommonInterfaces::PresentationOptions& presentationOptions,
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLDocumentObserverInterface> observer,
+    bool hasPresentationAssociation) {
+    ACSDK_DEBUG5(LX(__func__));
+
+    aplCapabilityCommonInterfaces::PresentationOptions options = presentationOptions;
+    if (options.windowId.empty()) {
+        std::lock_guard<std::mutex> guard(m_mutex);
+        options.windowId = m_defaultWindowId;
+    }
+
+    return std::shared_ptr<APLDocumentSession>(new APLDocumentSession(
+        document,
+        data,
+        presentationOptions.supportedViewports,
+        presentationSession,
+        options,
+        std::move(observer),
+        m_viewhost,
+        hasPresentationAssociation));
+}
+
+void APLRuntimeInterfaceImpl::setDefaultWindowId(const std::string& windowId) {
+    std::lock_guard<std::mutex> guard(m_mutex);
+    m_defaultWindowId = windowId;
+}
+
+std::string APLRuntimeInterfaceImpl::getMaxAPLVersion() const {
+    return m_viewhost->getMaxAPLVersion();
+}
+
+void APLRuntimeInterfaceImpl::setPresentationOrchestrator(
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface> poClient) {
+    m_presentationOrchestratorClient = std::move(poClient);
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLRuntimePresentationAdapter.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLRuntimePresentationAdapter.cpp
new file mode 100644
index 0000000000..98d5416207
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/APLRuntimePresentationAdapter.cpp
@@ -0,0 +1,597 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/AlexaPresentation/APLRuntimePresentationAdapter.h"
+
+#include <memory>
+
+#include <acsdk/APLCapabilityCommonInterfaces/APLTimeoutType.h>
+
+#include "IPCServerSampleApp/AlexaPresentation/APLDocumentSession.h"
+#include "IPCServerSampleApp/AlexaPresentation/APLPayloadParser.h"
+#include "IPCServerSampleApp/AlexaPresentation/APLDocumentSessionManager.h"
+#include "IPCServerSampleApp/AlexaPresentation/APLRuntimeInterfaceImpl.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+using namespace alexaPresentationInterfaces;
+using namespace aplCapabilityCommonInterfaces;
+using namespace aplCapabilityCommonInterfaces::aplEventPayload;
+using namespace avsCommon::sdkInterfaces;
+using namespace presentationOrchestratorInterfaces;
+
+#define TAG "APLRuntimePresentationAdapter"
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+std::shared_ptr<APLRuntimePresentationAdapter> APLRuntimePresentationAdapter::create(
+    const std::shared_ptr<APLRuntimeInterfaceImpl>& runtimeInterface,
+    std::shared_ptr<gui::GUIActivityEventNotifierInterface> activityEventNotifier) {
+    if (!runtimeInterface) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "null runtimeInterface"));
+        return nullptr;
+    }
+
+    if (!activityEventNotifier) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "null activityEventNotifier"));
+        return nullptr;
+    }
+
+    auto sessionManager = APLDocumentSessionManager::create();
+    if (!sessionManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "null sessionManager"));
+        return nullptr;
+    }
+
+    return std::shared_ptr<APLRuntimePresentationAdapter>(new APLRuntimePresentationAdapter(
+        runtimeInterface, std::move(sessionManager), std::move(activityEventNotifier)));
+}
+
+APLRuntimePresentationAdapter::APLRuntimePresentationAdapter(
+    const std::shared_ptr<APLRuntimeInterfaceImpl>& runtimeInterface,
+    std::unique_ptr<APLDocumentSessionManager> sessionManager,
+    std::shared_ptr<gui::GUIActivityEventNotifierInterface> activityEventNotifier) :
+        m_runtimeInterface(runtimeInterface),
+        m_sessionManager(std::move(sessionManager)),
+        m_activityEventNotifier(std::move(activityEventNotifier)),
+        m_isSpeakingOrListening(false),
+        m_executor(std::make_shared<avsCommon::utils::threading::Executor>()) {
+}
+
+void APLRuntimePresentationAdapter::setAlexaPresentationCA(
+    std::shared_ptr<AlexaPresentationCapabilityAgentInterface> alexaPresentationCA) {
+    m_executor->submit([this, alexaPresentationCA]() { m_alexaPresentationCA = alexaPresentationCA; });
+}
+
+void APLRuntimePresentationAdapter::setDefaultWindowId(const std::string& windowId) {
+    m_executor->submit([this, windowId]() { m_runtimeInterface->setDefaultWindowId(windowId); });
+}
+
+std::shared_ptr<APLRuntimePresentationAdapter::PresentationAgentDocumentTracker> APLRuntimePresentationAdapter::
+    executeGetPresentationAgentTrackerFromToken(const std::string& token) {
+    auto agentTracker = m_presentationAgentTrackers.find(token);
+    if (agentTracker != m_presentationAgentTrackers.end()) {
+        return agentTracker->second;
+    }
+    return nullptr;
+}
+
+std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> APLRuntimePresentationAdapter::
+    executeGetPresentationAgentFromToken(const std::string& token) {
+    if (auto agentTracker = executeGetPresentationAgentTrackerFromToken(token)) {
+        return agentTracker->presentationAgent.lock();
+    }
+    return nullptr;
+}
+
+void APLRuntimePresentationAdapter::executeRemoveTokenFromPresentationAgentTracker(const std::string& token) {
+    if (auto agentTracker = executeGetPresentationAgentTrackerFromToken(token)) {
+        agentTracker->docCount--;
+        if (agentTracker->docCount == 0) {
+            if (auto ca = agentTracker->presentationAgent.lock()) {
+                auto trackerIt = m_presentationTrackersPerCA.find(ca);
+                if (trackerIt != m_presentationTrackersPerCA.end() && --trackerIt->second == 0) {
+                    // Notify the CA that no document is being displayed
+                    ca->onActiveDocumentChanged("", {});
+                    m_presentationTrackersPerCA.erase(trackerIt);
+                }
+            }
+            m_presentationAgentTrackers.erase(token);
+        }
+    }
+}
+
+void APLRuntimePresentationAdapter::onRenderDocument(
+    const std::string& document,
+    const std::string& datasource,
+    const PresentationToken& token,
+    const std::string& windowId,
+    const APLTimeoutType timeoutType,
+    const std::string& interfaceName,
+    const std::string& supportedViewports,
+    const PresentationSession& presentationSession,
+    const std::chrono::steady_clock::time_point& receiveTime,
+    std::shared_ptr<APLCapabilityAgentInterface> agent) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor->submit([this,
+                        document,
+                        datasource,
+                        token,
+                        windowId,
+                        timeoutType,
+                        interfaceName,
+                        supportedViewports,
+                        presentationSession,
+                        receiveTime,
+                        agent]() {
+        executeRenderDocument(
+            document,
+            datasource,
+            token,
+            windowId,
+            timeoutType,
+            interfaceName,
+            supportedViewports,
+            presentationSession,
+            receiveTime,
+            agent,
+            true);
+    });
+}
+
+void APLRuntimePresentationAdapter::renderDocumentWithoutPresentation(
+    const std::string& jsonPayload,
+    const std::string& token,
+    const std::string& windowId,
+    const std::chrono::steady_clock::time_point& receiveTime,
+    const std::string& interface,
+    std::shared_ptr<APLCapabilityAgentInterface> agent) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor->submit([this, jsonPayload, token, windowId, receiveTime, interface, agent]() {
+        rapidjson::Document payload;
+        rapidjson::ParseResult result = payload.Parse(jsonPayload);
+        if (!result) {
+            ACSDK_ERROR(LX("renderDocumentWithoutPresentationFailed")
+                            .d("reason", "parsingPayloadFailed")
+                            .sensitive("payload", jsonPayload));
+            return;
+        }
+
+        std::string document = APLPayloadParser::extractDocument(payload);
+        std::string dataSources = APLPayloadParser::extractDatasources(payload);
+        std::string supportedViewports = APLPayloadParser::extractSupportedViewports(payload);
+
+        executeRenderDocument(
+            document,
+            dataSources,
+            token,
+            windowId,
+            APLTimeoutType::SHORT,
+            interface,
+            supportedViewports,
+            {interface, token + windowId},
+            receiveTime,
+            agent,
+            false);
+    });
+}
+
+void APLRuntimePresentationAdapter::executeRenderDocument(
+    const std::string& document,
+    const std::string& datasource,
+    const PresentationToken& token,
+    const std::string& windowId,
+    const APLTimeoutType timeoutType,
+    const std::string& interfaceName,
+    const std::string& supportedViewports,
+    const PresentationSession& presentationSession,
+    const std::chrono::steady_clock::time_point& receiveTime,
+    std::shared_ptr<APLCapabilityAgentInterface> agent,
+    bool trackAsPresentation) {
+    ACSDK_DEBUG5(LX(__func__));
+
+    // Create or update agent mapping for document token
+    if (auto agentTracker = executeGetPresentationAgentTrackerFromToken(token)) {
+        agentTracker->docCount++;
+    } else {
+        m_presentationAgentTrackers[token] =
+            std::make_shared<PresentationAgentDocumentTracker>(token, agent, trackAsPresentation);
+        ++m_presentationTrackersPerCA[agent];
+    }
+
+    // Translate APL timeout to presentation lifespan
+    PresentationLifespan lifespan = PresentationLifespan::SHORT;  // Short life spam
+    switch (timeoutType) {
+        case APLTimeoutType::SHORT:
+            lifespan = PresentationLifespan::SHORT;
+            break;
+        case APLTimeoutType::TRANSIENT:
+            lifespan = PresentationLifespan::TRANSIENT;
+            break;
+        case APLTimeoutType::LONG:
+            lifespan = PresentationLifespan::LONG;
+            break;
+    }
+
+    aplCapabilityCommonInterfaces::PresentationOptions presentationOptions = {
+        windowId,
+        PresentationInterface::getTimeoutDefault(),
+        token,
+        lifespan,
+        supportedViewports,
+        receiveTime,
+        interfaceName};
+
+    if (trackAsPresentation) {
+        // TODO: Workaround to avoid problems caused by duplicate tokens being received in consecutive renderDocument
+        // directives.
+        if (auto session = m_sessionManager->getDocumentSessionByPresentationSession(presentationSession)) {
+            ACSDK_DEBUG5(LX(__func__).d("token", token).m("Session already exists for token"));
+            m_sessionManager->associateTokenWithPresentationSession(presentationSession, token);
+            // This implementation of APLRuntime re-uses APLDocumentSessions so it is necessary to convert the interface
+            // back into an APLDocumentSession
+            auto documentSession = APLDocumentSession::getDocumentSessionFromInterface(session);
+            if (!documentSession) {
+                ACSDK_ERROR(LX("executeRenderDocumentFailed")
+                                .d("reason", "Unable to convert APLDocumentSessionInterface to APLDocumentSession"));
+                return;
+            }
+
+            documentSession->renderDocument(document, datasource, presentationSession, presentationOptions);
+        } else {
+            // Before we render an APL document, we clear existing APL document sessions.
+            // This logic needs to be added to ensure we don't allow concurrent APL document rendering
+            // until we have a full support.
+            for (const auto& agentTrackerPair : m_presentationAgentTrackers) {
+                // Only clear APL documents that originated from the APL CA
+                if (!agentTrackerPair.second->handleOnPresentationDismissed) {
+                    continue;
+                }
+                if (const auto& docSession = m_sessionManager->getDocumentSessionByToken(agentTrackerPair.first)) {
+                    docSession->clearDocument();
+                }
+            }
+
+            m_runtimeInterface->renderDocument(
+                document, datasource, presentationSession, presentationOptions, shared_from_this());
+        }
+    } else {
+        auto session = m_runtimeInterface->createDocumentSession(
+            document, datasource, presentationSession, presentationOptions, shared_from_this(), false);
+        session->firstRender();
+    }
+}
+
+void APLRuntimePresentationAdapter::clearDocument(const std::string& token) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, token] { executeClearDocument(token); });
+}
+
+void APLRuntimePresentationAdapter::executeClearDocument(const std::string& token) {
+    auto session = m_sessionManager->getDocumentSessionByToken(token);
+    if (!session) {
+        ACSDK_ERROR(LX("executeClearDocumentFailed")
+                        .d("reason", "No active session exists to call executeClearDocument")
+                        .d("token", token));
+        return;
+    }
+    session->clearDocument();
+}
+
+void APLRuntimePresentationAdapter::onExecuteCommands(const std::string& jsonPayload, const PresentationToken& token) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor->submit([this, jsonPayload, token]() { executeExecuteCommands(jsonPayload, token); });
+}
+
+void APLRuntimePresentationAdapter::executeExecuteCommands(
+    const std::string& jsonPayload,
+    const PresentationToken& token) {
+    auto session = m_sessionManager->getDocumentSessionByToken(token);
+    if (!session) {
+        ACSDK_ERROR(LX("executeExecuteCommandsFailed")
+                        .d("reason", "No active session exists to call executeCommands")
+                        .d("token", token));
+        if (auto ca = executeGetPresentationAgentFromToken(token)) {
+            ca->processExecuteCommandsResult(token, APLCommandExecutionEvent::FAILED, "No matching APL session");
+        }
+        return;
+    }
+    session->executeCommands(jsonPayload);
+    m_activityEventNotifier->notifyObserversOfGUIActivityEvent("APLCommandExecution", GUIActivityEvent::ACTIVATED);
+}
+
+void APLRuntimePresentationAdapter::onDataSourceUpdate(
+    const std::string& sourceType,
+    const std::string& jsonPayload,
+    const std::string& token) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor->submit(
+        [this, sourceType, jsonPayload, token]() { executeDataSourceUpdate(sourceType, jsonPayload, token); });
+}
+
+void APLRuntimePresentationAdapter::executeDataSourceUpdate(
+    const std::string& sourceType,
+    const std::string& jsonPayload,
+    const std::string& token) {
+    auto session = m_sessionManager->getDocumentSessionByToken(token);
+    if (!session) {
+        ACSDK_ERROR(LX(__func__).m("No active session exists to call dataSourceUpdate"));
+        return;
+    }
+    session->dataSourceUpdate(sourceType, jsonPayload);
+}
+
+void APLRuntimePresentationAdapter::onActivityEvent(const PresentationToken& token, const GUIActivityEvent& event) {
+}
+
+void APLRuntimePresentationAdapter::onCommandExecutionComplete(
+    const aplCapabilityCommonInterfaces::PresentationToken& token,
+    alexaClientSDK::aplCapabilityCommonInterfaces::APLCommandExecutionEvent event,
+    const std::string& error) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor->submit([this, token, event, error]() { executeOnCommandExecutionComplete(token, event, error); });
+}
+
+void APLRuntimePresentationAdapter::executeOnCommandExecutionComplete(
+    const std::string& token,
+    APLCommandExecutionEvent event,
+    const std::string& message) {
+    if (auto ca = executeGetPresentationAgentFromToken(token)) {
+        ca->processExecuteCommandsResult(token, event, message);
+        m_activityEventNotifier->notifyObserversOfGUIActivityEvent(
+            "APLCommandExecution", GUIActivityEvent::DEACTIVATED);
+    }
+}
+
+void APLRuntimePresentationAdapter::onRenderDocumentComplete(
+    const PresentationToken& token,
+    bool result,
+    const std::string& error,
+    const std::chrono::steady_clock::time_point& timestamp) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor->submit([this, token, result, error, timestamp]() {
+        executeOnRenderDocumentComplete(token, result, error, timestamp);
+    });
+}
+
+void APLRuntimePresentationAdapter::onShowDocument(const PresentationToken& token) {
+}
+
+void APLRuntimePresentationAdapter::executeOnRenderDocumentComplete(
+    const std::string& token,
+    bool result,
+    const std::string& error,
+    const std::chrono::steady_clock::time_point& timestamp) {
+    if (auto ca = executeGetPresentationAgentFromToken(token)) {
+        ca->processRenderDocumentResult(token, result, error);
+        ca->recordRenderComplete(timestamp);
+    }
+
+    /// TODO: The following code is pending the migration to NowPlaying
+    /**
+    if (m_isNowPlaying && result) {
+        executeOnPlayerActivityChanged(avsCommon::avs::PlayerActivity::PLAYING);
+    }
+    **/
+}
+
+void APLRuntimePresentationAdapter::onVisualContextAvailable(
+    const ContextRequestToken requestToken,
+    const aplEventPayload::VisualContext& context) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor->submit([this, requestToken, context]() { executeOnVisualContextAvailable(requestToken, context); });
+}
+
+void APLRuntimePresentationAdapter::executeOnVisualContextAvailable(
+    const ContextRequestToken requestToken,
+    const aplEventPayload::VisualContext& context) {
+    if (auto ca = executeGetPresentationAgentFromToken(context.token)) {
+        ca->onVisualContextAvailable(requestToken, context);
+    }
+}
+
+void APLRuntimePresentationAdapter::provideState(
+    const PresentationToken& token,
+    const ContextRequestToken stateRequestToken) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, token, stateRequestToken]() { executeProvideState(token, stateRequestToken); });
+}
+
+void APLRuntimePresentationAdapter::executeProvideState(
+    const PresentationToken& token,
+    const ContextRequestToken stateRequestToken) {
+    auto session = m_sessionManager->getDocumentSessionByToken(token);
+    if (!session) {
+        ACSDK_WARN(LX("executeProvideStateFailed").d("reason", "No session for token"));
+
+        VisualContext context{token, m_runtimeInterface->getMaxAPLVersion(), "", ""};
+        executeOnVisualContextAvailable(stateRequestToken, context);
+        return;
+    }
+    session->provideDocumentContext(stateRequestToken);
+}
+
+void APLRuntimePresentationAdapter::onSendEvent(const aplEventPayload::UserEvent& payload) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor->submit([this, payload]() { executeOnSendEvent(payload); });
+}
+
+void APLRuntimePresentationAdapter::executeOnSendEvent(const aplEventPayload::UserEvent& userEvent) {
+    if (auto ca = executeGetPresentationAgentFromToken(userEvent.token)) {
+        ca->sendUserEvent(userEvent);
+    }
+}
+
+void APLRuntimePresentationAdapter::onDataSourceUpdateComplete(
+    const std::string& token,
+    bool result,
+    const std::string& error) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor->submit([this, token, result, error]() { executeOnDataSourceUpdateComplete(token, result, error); });
+}
+
+void APLRuntimePresentationAdapter::executeOnDataSourceUpdateComplete(
+    const std::string& token,
+    bool result,
+    const std::string& error) {
+    // no op
+}
+
+void APLRuntimePresentationAdapter::onDataSourceFetch(const DataSourceFetch& dataSourceFetch) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor->submit([this, dataSourceFetch]() { executeOnDataSourceFetch(dataSourceFetch); });
+}
+
+void APLRuntimePresentationAdapter::executeOnDataSourceFetch(const DataSourceFetch& dataSourceFetch) {
+    if (auto ca = executeGetPresentationAgentFromToken(dataSourceFetch.token)) {
+        ca->sendDataSourceFetchRequestEvent(dataSourceFetch);
+    }
+}
+
+void APLRuntimePresentationAdapter::onRuntimeError(const RuntimeError& runtimeError) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor->submit([this, runtimeError]() { executeOnRuntimeError(runtimeError); });
+}
+
+void APLRuntimePresentationAdapter::executeOnRuntimeError(const RuntimeError& runtimeError) {
+    if (auto ca = executeGetPresentationAgentFromToken(runtimeError.token)) {
+        ca->sendRuntimeErrorEvent(runtimeError);
+    }
+}
+
+void APLRuntimePresentationAdapter::onDocumentFinished(const std::string& token) {
+    ACSDK_DEBUG9(LX(__func__).d("token", token));
+    m_executor->submit([this, token]() { executeOnDocumentFinished(token); });
+}
+
+void APLRuntimePresentationAdapter::executeOnDocumentFinished(const std::string& token) {
+    ACSDK_DEBUG9(LX(__func__).d("token", token));
+
+    // We only inform agent of a dismissed document if there are no other documents for the agent with the same token.
+    if (auto tracker = executeGetPresentationAgentTrackerFromToken(token)) {
+        if (tracker->handleOnPresentationDismissed && m_alexaPresentationCA && tracker->docCount <= 1) {
+            m_alexaPresentationCA->onPresentationDismissed(token);
+        }
+    }
+
+    executeRemoveTokenFromPresentationAgentTracker(token);
+}
+
+std::string APLRuntimePresentationAdapter::getAPLRuntimeVersion() {
+    ACSDK_DEBUG9(LX(__func__));
+    // Execute on executor thread but block this thread
+    // until completed to ensure APL version is reported before continuing.
+    return m_executor->submit([this]() { return m_runtimeInterface->getMaxAPLVersion(); }).get();
+}
+
+void APLRuntimePresentationAdapter::setExecutor(std::shared_ptr<avsCommon::utils::threading::Executor> executor) {
+    m_executor = executor;
+}
+
+void APLRuntimePresentationAdapter::onPlayerActivityChanged(avsCommon::avs::PlayerActivity state) {
+    ACSDK_DEBUG9(LX(__func__).d("newState", avsCommon::avs::playerActivityToString(state).c_str()));
+    m_executor->submit([this, state]() { executeOnPlayerActivityChanged(state); });
+}
+
+void APLRuntimePresentationAdapter::executeOnPlayerActivityChanged(avsCommon::avs::PlayerActivity state) {
+    // TODO: Once NowPlaying is available this code needs to be implemented
+}
+
+void APLRuntimePresentationAdapter::onAPLDocumentSessionAvailable(
+    const PresentationSession& presentationSession,
+    const PresentationToken& token,
+    std::unique_ptr<APLDocumentSessionInterface>&& session) {
+    ACSDK_DEBUG9(LX(__func__));
+    std::shared_ptr<APLDocumentSessionInterface> sessionShared = std::move(session);
+    m_executor->submit([this, presentationSession, token, sessionShared] {
+        m_sessionManager->addDocumentSession(presentationSession, token, sessionShared);
+    });
+}
+
+void APLRuntimePresentationAdapter::executeUpdateTimeoutType(
+    const std::string& aplToken,
+    const aplCapabilityCommonInterfaces::APLTimeoutType& timeoutType) {
+    auto session = m_sessionManager->getDocumentSessionByToken(aplToken);
+    if (!session) {
+        ACSDK_ERROR(LX(__func__).m("No active session exists to call dataSourceUpdate"));
+        return;
+    }
+
+    switch (timeoutType) {
+        case APLTimeoutType::SHORT:
+            session->updateLifespan(PresentationLifespan::SHORT);
+            break;
+        case APLTimeoutType::TRANSIENT:
+            session->updateLifespan(PresentationLifespan::TRANSIENT);
+            break;
+        case APLTimeoutType::LONG:
+            session->updateLifespan(PresentationLifespan::LONG);
+            break;
+    }
+}
+
+void APLRuntimePresentationAdapter::onDialogUXStateChanged(DialogUXStateObserverInterface::DialogUXState newState) {
+    m_executor->submit([this, newState] {
+        if (newState == DialogUXState::SPEAKING || newState == DialogUXState::LISTENING) {
+            m_isSpeakingOrListening = true;
+        } else {
+            m_isSpeakingOrListening = false;
+        }
+    });
+}
+
+void APLRuntimePresentationAdapter::onGUIActivityEventReceived(
+    const std::string& source,
+    const GUIActivityEvent& activityEvent) {
+    auto func = [this, source, activityEvent](const std::shared_ptr<APLDocumentSessionInterface>& session) {
+        if (session->isForegroundFocused()) {
+            ACSDK_DEBUG9(LX("onActivityEventReceivedBySession").d("reason", "APL session foreground focused"));
+            if (auto ca = executeGetPresentationAgentFromToken(session->getToken())) {
+                if (GUIActivityEvent::INTERRUPT == activityEvent) {
+                    session->interruptCommandSequence();
+
+                    if (m_isSpeakingOrListening) {
+                        ca->clearExecuteCommands();
+                    }
+                }
+            }
+        }
+    };
+
+    m_executor->submit([this, func] { m_sessionManager->invokeFunctionPerDocumentSession(func); });
+}
+
+void APLRuntimePresentationAdapter::onActiveDocumentChanged(
+    const std::string& token,
+    const PresentationSession& session) {
+    m_executor->submit([this, token, session] {
+        if (auto ca = executeGetPresentationAgentFromToken(token)) {
+            ca->onActiveDocumentChanged(token, session);
+        }
+    });
+}
+
+void APLRuntimePresentationAdapter::onSessionEnded(const PresentationSession& presentationSession) {
+    m_executor->submit([this, presentationSession] {
+        if (auto documentSession = m_sessionManager->getDocumentSessionByPresentationSession(presentationSession)) {
+            executeRemoveTokenFromPresentationAgentTracker(documentSession->getToken());
+        }
+        m_sessionManager->clearDocumentSession(presentationSession);
+    });
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/AplClientBridge.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/AplClientBridge.cpp
new file mode 100644
index 0000000000..7e76d4a224
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/AplClientBridge.cpp
@@ -0,0 +1,939 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <rapidjson/document.h>
+#include <rapidjson/error/en.h>
+
+#include <AVSCommon/SDKInterfaces/GUIActivityEvent.h>
+#include <AVSCommon/Utils/Timing/Timer.h>
+#include "IPCServerSampleApp/AlexaPresentation/AplClientBridge.h"
+#include "IPCServerSampleApp/AlexaPresentation/APLRuntimePresentationAdapter.h"
+#include "IPCServerSampleApp/CachingDownloadManager.h"
+#include "IPCServerSampleApp/DownloadMonitor.h"
+#include "IPCServerSampleApp/IPC/Namespaces/APLClientNamespace.h"
+
+#ifdef ENABLE_APL_TELEMETRY
+#include "IPCServerSampleApp/TelemetrySink.h"
+#endif
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+static const std::string TAG{"AplClientBridge"};
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+using namespace aplCapabilityCommonInterfaces;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::avs::attachment;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::json;
+using namespace avsCommon::utils::libcurlUtils;
+using namespace avsCommon::utils::sds;
+using namespace avsCommon::utils::timing;
+using namespace APLClient::Extensions;
+
+static const char ARGUMENTS_KEY[] = "arguments";
+static const char COMPONENTS_KEY[] = "components";
+static const char SOURCE_KEY[] = "source";
+static const char VERSION_KEY[] = "version";
+static const char VISUAL_CONTEXT_KEY[] = "componentsVisibleOnScreen";
+static const char DATASOURCE_CONTEXT_KEY[] = "dataSources";
+
+std::shared_ptr<AplClientBridge> AplClientBridge::create(
+    std::shared_ptr<CachingDownloadManager> contentDownloadManager,
+    std::shared_ptr<gui::GUIClientInterface> guiClient,
+    AplClientBridgeParameter parameters) {
+    std::shared_ptr<AplClientBridge> aplClientBridge(
+        new AplClientBridge(contentDownloadManager, guiClient, parameters));
+    aplClientBridge->m_aplClientBinding.reset(new APLClient::AplClientBinding(aplClientBridge));
+    aplClientBridge->initialize();
+
+    return aplClientBridge;
+}
+
+AplClientBridge::AplClientBridge(
+    std::shared_ptr<CachingDownloadManager> contentDownloadManager,
+    std::shared_ptr<gui::GUIClientInterface> guiClient,
+    AplClientBridgeParameter parameters) :
+        RequiresShutdown{"AplClientBridge"},
+        m_contentDownloadManager{contentDownloadManager},
+        m_guiClient{guiClient},
+        m_renderQueued{false},
+        m_parameters{parameters} {
+    m_playerActivityState = avsCommon::avs::PlayerActivity::FINISHED;
+}
+
+void AplClientBridge::initialize() {
+    m_aplClientHandler = ipc::APLClientHandler::create(m_guiClient->getIPCRouter(), shared_from_this());
+}
+
+void AplClientBridge::addObserver(const APLViewhostObserverInterfacePtr& newObserver) {
+    m_executor.submit([this, newObserver] {
+        for (auto& weakObserver : m_observers) {
+            if (auto observer = weakObserver.lock()) {
+                if (observer == newObserver) {
+                    ACSDK_ERROR(LX("addObserverFailed").d("reason", "Attempt to add duplicate observer"));
+                    return;
+                }
+            }
+        }
+
+        m_observers.push_back(newObserver);
+    });
+}
+void AplClientBridge::removeObserver(const APLViewhostObserverInterfacePtr& observer) {
+    m_executor.submit([this, observer] {
+        for (auto it = m_observers.begin(); it != m_observers.end(); ++it) {
+            if (auto spObserver = it->lock()) {
+                if (spObserver == observer) {
+                    m_observers.erase(it);
+                    return;
+                }
+            }
+        }
+
+        ACSDK_ERROR(LX("removeObserverFailed").d("reason", "Attempt to remove non-existent observer"));
+    });
+}
+
+void AplClientBridge::initializeRenderer(
+    const std::string& windowId,
+    const std::set<std::string>& supportedExtensions) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, windowId, supportedExtensions] {
+        if (!windowId.empty()) {
+            auto aplClientRenderer = getAplClientRendererFromWindowId(windowId);
+            if (!aplClientRenderer) {
+                aplClientRenderer = m_aplClientBinding->createRenderer(windowId);
+                m_aplClientRendererMap[windowId] = aplClientRenderer;
+            }
+
+            std::unordered_set<std::shared_ptr<APLClient::Extensions::AplCoreExtensionInterface>> extensions;
+            for (auto& uri : supportedExtensions) {
+                if (aplClientRenderer->getExtension(uri)) {
+                    continue;
+                }
+                if (APLClient::Extensions::Backstack::URI == uri) {
+                    extensions.emplace(std::make_shared<Backstack::AplBackstackExtension>(shared_from_this()));
+                } else if (APLClient::Extensions::AudioPlayer::URI == uri) {
+                    auto audioPlayerExtension =
+                        std::make_shared<AudioPlayer::AplAudioPlayerExtension>(shared_from_this());
+                    extensions.emplace(audioPlayerExtension);
+                    m_audioPlayerExtensions.push_back(audioPlayerExtension);
+                } else if (m_sharedRegisteredExtensions.count(uri) != 0) {
+                    extensions.emplace(m_sharedRegisteredExtensions[uri]);
+                }
+            }
+
+            if (!extensions.empty()) {
+                aplClientRenderer->addExtensions(std::move(extensions));
+            }
+        }
+    });
+}
+
+void AplClientBridge::registerSharedExtension(
+    const std::shared_ptr<APLClient::Extensions::AplCoreExtensionInterface>& extension) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, extension] { m_sharedRegisteredExtensions[extension->getUri()] = extension; });
+}
+
+void AplClientBridge::sendMessage(const std::string& token, const std::string& payload) {
+    ACSDK_DEBUG9(LX(__func__));
+    std::string newPayload = payload;
+    auto aplClientRenderer = getAplClientRendererFromAplToken(token);
+    if (aplClientRenderer && m_aplClientHandler) {
+        m_aplClientHandler->dispatchSendMessageToViewhost(aplClientRenderer->getWindowId(), newPayload);
+    } else {
+        if (!aplClientRenderer) {
+            ACSDK_WARN(LX("sendMessageFailed").d("reason", "nullAplClientRenderer"));
+        }
+        if (!m_aplClientHandler) {
+            ACSDK_WARN(LX("sendMessageFailed").d("reason", "nullAplClientHandler"));
+        }
+    }
+}
+
+void AplClientBridge::resetViewhost(const std::string& token) {
+    ACSDK_DEBUG9(LX(__func__));
+    auto aplClientRenderer = getAplClientRendererFromAplToken(token);
+    if (aplClientRenderer && m_aplClientHandler) {
+        m_aplClientHandler->dispatchCreateRenderer(aplClientRenderer->getWindowId(), token);
+    } else {
+        if (!aplClientRenderer) {
+            ACSDK_WARN(LX("resetViewHostFailed").d("reason", "nullAplClientRenderer"));
+        }
+        if (!m_aplClientHandler) {
+            ACSDK_WARN(LX("resetViewHostFailed").d("reason", "nullAplClientHandler"));
+        }
+    }
+}
+
+std::string AplClientBridge::downloadResource(const std::string& source) {
+    ACSDK_DEBUG9(LX(__func__));
+    auto downloadMetricsEmitter = m_aplClientBinding->createDownloadMetricsEmitter();
+    auto observer = std::make_shared<DownloadMonitor>(downloadMetricsEmitter);
+    return m_contentDownloadManager->retrieveContent(source, observer);
+}
+
+std::chrono::milliseconds AplClientBridge::getTimezoneOffset() {
+    // Relies on fact that this is always called in the executor thread via either RenderDocument or UpdateTimer
+    return m_guiManager->getDeviceTimezoneOffset();
+}
+
+void AplClientBridge::onActivityStarted(const std::string& token, const std::string& source) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, source] { m_guiManager->handleGUIActivityEvent(GUIActivityEvent::ACTIVATED, source); });
+}
+
+void AplClientBridge::onActivityEnded(const std::string& token, const std::string& source) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, source] { m_guiManager->handleGUIActivityEvent(GUIActivityEvent::DEACTIVATED, source); });
+}
+
+void AplClientBridge::onSendEvent(const std::string& token, const std::string& event) {
+    ACSDK_DEBUG9(LX(__func__));
+    rapidjson::Document payload;
+    if (payload.Parse(event).HasParseError()) {
+        ACSDK_ERROR(LX("onSendEventFailed").d("reason", "Invalid JSON"));
+        return;
+    }
+
+    std::string arguments;
+    std::string components;
+    std::string source;
+    if (payload.HasMember(ARGUMENTS_KEY)) {
+        const rapidjson::Value& argValue = payload[ARGUMENTS_KEY];
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        if (!argValue.Accept(writer)) {
+            ACSDK_ERROR(LX("onSendEventFailed").d("reason", "Error serializing arguments payload"));
+            return;
+        }
+        arguments = buffer.GetString();
+    }
+    if (payload.HasMember(COMPONENTS_KEY)) {
+        const rapidjson::Value& componentsValue = payload[COMPONENTS_KEY];
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        if (!componentsValue.Accept(writer)) {
+            ACSDK_ERROR(LX("onSendEventFailed").d("reason", "Error serializing components payload"));
+            return;
+        }
+        components = buffer.GetString();
+    }
+    if (payload.HasMember(SOURCE_KEY)) {
+        const rapidjson::Value& sourceValue = payload[SOURCE_KEY];
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        if (!sourceValue.Accept(writer)) {
+            ACSDK_ERROR(LX("onSendEventFailed").d("reason", "Error serializing source payload"));
+            return;
+        }
+        source = buffer.GetString();
+    }
+
+    m_executor.submit([this, token, arguments, components, source] {
+        executeNotifyObservers(&APLViewhostObserverInterface::onSendEvent, token, arguments, components, source);
+    });
+}
+
+void AplClientBridge::onCommandExecutionComplete(
+    const std::string& token,
+    APLClient::AplCommandExecutionEvent event,
+    const std::string& message) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, token, event, message] {
+        executeNotifyObservers(&APLViewhostObserverInterface::onCommandExecutionComplete, token, event, message);
+    });
+}
+
+void AplClientBridge::onRenderDocumentComplete(const std::string& token, bool result, const std::string& error) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, token, result, error] {
+        executeNotifyObservers(
+            &APLViewhostObserverInterface::onRenderDocumentComplete,
+            token,
+            result,
+            error,
+            std::chrono::steady_clock::now());
+
+        auto aplClientRenderer = getAplClientRendererFromAplToken(token);
+        if (!result && aplClientRenderer) {
+            aplClientRenderer->onRenderingEvent(APLClient::AplRenderingEvent::RENDER_ABORTED);
+        }
+    });
+}
+
+void AplClientBridge::onVisualContextAvailable(
+    const std::string& token,
+    unsigned int stateRequestToken,
+    const std::string& context) {
+    ACSDK_DEBUG9(LX(__func__));
+
+    rapidjson::Document payload;
+    if (payload.Parse(context).HasParseError()) {
+        ACSDK_ERROR(LX("onVisualContextAvailableFailed").d("reason", "Invalid JSON"));
+        return;
+    }
+
+    std::string version;
+    if (payload.HasMember(VERSION_KEY) && payload[VERSION_KEY].IsString()) {
+        version = payload[VERSION_KEY].GetString();
+    }
+
+    std::string visualContext;
+    if (payload.HasMember(VISUAL_CONTEXT_KEY)) {
+        const auto& visualContextArray = payload[VISUAL_CONTEXT_KEY];
+        if (!visualContextArray.IsArray()) {
+            ACSDK_ERROR(LX("onVisualContextAvailableFailed").d("reason", "Visual context is not an array"));
+            return;
+        }
+        if (visualContextArray.GetArray().Empty()) {
+            ACSDK_ERROR(LX("onVisualContextAvailableFailed").d("reason", "Visual context array is empty"));
+            return;
+        }
+        const auto& value = visualContextArray.GetArray()[0];
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        if (!value.Accept(writer)) {
+            ACSDK_ERROR(LX("onVisualContextAvailableFailed").d("reason", "Error serializing components payload"));
+            return;
+        }
+        visualContext = buffer.GetString();
+    }
+
+    std::string datasourceContext;
+    if (payload.HasMember(DATASOURCE_CONTEXT_KEY)) {
+        const auto& value = payload[DATASOURCE_CONTEXT_KEY];
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        if (!value.Accept(writer)) {
+            ACSDK_ERROR(LX("onVisualContextAvailableFailed").d("reason", "Error serializing components payload"));
+            return;
+        }
+        datasourceContext = buffer.GetString();
+    }
+
+    m_executor.submit([this, token, stateRequestToken, version, visualContext, datasourceContext] {
+        executeNotifyObservers(
+            &APLViewhostObserverInterface::onVisualContextAvailable,
+            stateRequestToken,
+            token,
+            version,
+            visualContext,
+            datasourceContext);
+    });
+}
+
+void AplClientBridge::onSetDocumentIdleTimeout(const std::string& token, const std::chrono::milliseconds& timeout) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, token, timeout] {
+        executeNotifyObservers(&APLViewhostObserverInterface::onSetDocumentIdleTimeout, token, timeout);
+    });
+}
+
+void AplClientBridge::onFinish(const std::string& token) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, token] {
+        executeNotifyObservers(&APLViewhostObserverInterface::onDocumentFinished, token);
+        // Ideally this action can be handled elsewhere, but for now the call is necessary to ensure that
+        // foreground activity is stopped
+        m_guiManager->handleDocumentTerminated(token, false);
+    });
+}
+
+void AplClientBridge::onRuntimeErrorEvent(const std::string& token, const std::string& payload) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, token, payload] {
+        executeNotifyObservers(&APLViewhostObserverInterface::onRuntimeError, token, payload);
+    });
+}
+
+void AplClientBridge::onDataSourceFetchRequestEvent(
+    const std::string& token,
+    const std::string& type,
+    const std::string& payload) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, token, type, payload] {
+        executeNotifyObservers(&APLViewhostObserverInterface::onDataSourceFetch, token, type, payload);
+    });
+}
+
+void AplClientBridge::onExtensionEvent(
+    const std::string& aplToken,
+    const std::string& uri,
+    const std::string& name,
+    const std::string& source,
+    const std::string& params,
+    unsigned int event,
+    std::shared_ptr<AplCoreExtensionEventCallbackResultInterface> resultCallback) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, aplToken, uri, name, source, params, event, resultCallback] {
+        auto aplClientRenderer = getAplClientRendererFromAplToken(aplToken);
+        if (aplClientRenderer) {
+            aplClientRenderer->onExtensionEvent(uri, name, source, params, event, resultCallback);
+        }
+    });
+}
+
+void AplClientBridge::logMessage(APLClient::LogLevel level, const std::string& source, const std::string& message) {
+    switch (level) {
+        case APLClient::LogLevel::CRITICAL:
+        case APLClient::LogLevel::ERROR:
+            ACSDK_ERROR(LX(source).m(message));
+            break;
+        case APLClient::LogLevel::WARN:
+            ACSDK_WARN(LX(source).m(message));
+            break;
+        case APLClient::LogLevel::INFO:
+            ACSDK_INFO(LX(source).m(message));
+            break;
+        case APLClient::LogLevel::DBG:
+            ACSDK_DEBUG0(LX(source).m(message));
+            break;
+        case APLClient::LogLevel::TRACE:
+            ACSDK_DEBUG9(LX(source).m(message));
+            break;
+    }
+}
+
+void AplClientBridge::onConnectionOpened() {
+    ACSDK_DEBUG9(LX("onConnectionOpened"));
+    // Start the scheduled event timer to refresh the display at 60fps
+    m_executor.submit([this] {
+        m_updateTimer.start(
+            std::chrono::milliseconds(16),
+            Timer::PeriodType::ABSOLUTE,
+            Timer::FOREVER,
+            std::bind(&AplClientBridge::onUpdateTimer, this));
+    });
+}
+
+void AplClientBridge::onConnectionClosed() {
+    ACSDK_DEBUG9(LX("onConnectionClosed"));
+    // Stop the outstanding timer as the client is no longer connected
+    m_executor.submit([this] { m_updateTimer.stop(); });
+}
+
+void AplClientBridge::provideState(const std::string& aplToken, const unsigned int stateRequestToken) {
+    ACSDK_DEBUG9(LX(__func__));
+
+    m_executor.submit([this, stateRequestToken, aplToken] {
+        auto aplClientRenderer = getAplClientRendererFromAplToken(aplToken);
+        if (aplClientRenderer) {
+            aplClientRenderer->requestVisualContext(stateRequestToken);
+        }
+    });
+}
+
+void AplClientBridge::onUpdateTimer() {
+    bool renderQueued = m_renderQueued.exchange(true);
+    if (renderQueued) {
+        // Render was already queued, we can safely skip this rendering
+        return;
+    }
+
+    m_executor.submit([this] {
+        m_renderQueued = false;
+        for (auto& aplClientRendererPair : m_aplClientRendererMap) {
+            aplClientRendererPair.second->onUpdateTick();
+        }
+
+        if (m_mediaProperties && avsCommon::avs::PlayerActivity::PLAYING == m_playerActivityState) {
+            int audioItemOffset = m_mediaProperties->getAudioItemOffset().count();
+            for (const auto& audioPlayerExtension : m_audioPlayerExtensions) {
+                audioPlayerExtension->updatePlaybackProgress(audioItemOffset);
+            }
+        }
+    });
+}
+
+void AplClientBridge::setGUIManager(std::shared_ptr<gui::GUIServerInterface> guiManager) {
+    m_executor.submit([this, guiManager] { m_guiManager = guiManager; });
+}
+
+void AplClientBridge::renderDocument(
+    const PresentationSession& presentationSession,
+    const std::string& token,
+    const std::string& document,
+    const std::string& dataSources,
+    const std::string& supportedViewports,
+    const std::string& windowId) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, presentationSession, token, document, dataSources, supportedViewports, windowId] {
+        if (windowId.empty()) {
+            ACSDK_ERROR(LX("renderDocumentFailed").d("reason", "window id cannot be empty, finishing document"));
+            onFinish(token);
+            return;
+        }
+        std::shared_ptr<APLClient::AplClientRenderer> aplClientRenderer;
+        if (m_aplClientRendererMap.find(windowId) != m_aplClientRendererMap.end()) {
+            aplClientRenderer = m_aplClientRendererMap[windowId];
+        } else {
+            /// Will be reached for targetWindowId not found in configurations
+            aplClientRenderer = m_aplClientBinding->createRenderer(windowId);
+            m_aplClientRendererMap[windowId] = aplClientRenderer;
+        }
+
+        // Don't need to check for existence first
+        const auto& lastSessionForWindow = m_windowIdToPresentationSession[windowId];
+
+        /** /// TODO Change this to operator once APL Runtime team has the changes.
+         * Presentation session is a match if the last session and current session for a window are same. Here are
+         * the rules governing this equivalency:
+         * 1. Skill Id should match.
+         * 2. Presentation Id should match.
+         * 3. Should have same supported extensions.
+         * 4. Same list of auto-initialized extensions in the APL client renderer.
+         */
+        bool isSamePresentationSession = lastSessionForWindow.skillId == presentationSession.skillId &&
+                                         lastSessionForWindow.id == presentationSession.id;
+
+        if (!isSamePresentationSession) {
+            // Session IDs do not match
+            executeOnPresentationSessionChanged(windowId, presentationSession);
+            m_windowTokenMapping.eraseWindow(windowId);
+        }
+
+        setTokenToWindow(token, windowId);
+
+        if (auto backExtension = getBackExtensionForRenderer(aplClientRenderer)) {
+            if (backExtension->shouldCacheActiveDocument()) {
+                if (auto documentState = aplClientRenderer->getActiveDocumentState()) {
+                    backExtension->addDocumentStateToBackstack(documentState);
+                }
+            }
+        }
+
+        aplClientRenderer->renderDocument(document, dataSources, supportedViewports, token);
+    });
+}
+
+void AplClientBridge::setMediaProperties(
+    std::shared_ptr<avsCommon::sdkInterfaces::MediaPropertiesInterface> mediaProperties) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, mediaProperties] { m_mediaProperties = mediaProperties; });
+}
+
+void AplClientBridge::clearDocument(const std::string& token) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, token] {
+        auto aplClientRenderer = getAplClientRendererFromAplToken(token);
+        if (aplClientRenderer) {
+            m_windowTokenMapping.eraseToken(token);
+            aplClientRenderer->clearDocument();
+
+            // Reset the renderer's backstack on document clear
+            if (auto backExtension = getBackExtensionForRenderer(aplClientRenderer)) {
+                backExtension->reset();
+            }
+        } else {
+            ACSDK_DEBUG0(LX("clearDocumentFailed").d("reason", "No renderer for token").d("token", token));
+        }
+        // We inform observer either way, as the document renderer either was successfully cleared or had already been
+        // cleared.
+        executeNotifyObservers(&APLViewhostObserverInterface::onDocumentCleared, token);
+    });
+}
+
+void AplClientBridge::executeCommands(const std::string& jsonPayload, const std::string& token) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, jsonPayload, token] {
+        auto aplClientRenderer = getAplClientRendererFromAplToken(token);
+        if (aplClientRenderer) {
+            aplClientRenderer->executeCommands(jsonPayload, token);
+        } else {
+            executeNotifyObservers(
+                &APLViewhostObserverInterface::onCommandExecutionComplete,
+                token,
+                APLClient::AplCommandExecutionEvent::FAILED,
+                "No document renderer instance for token.");
+        }
+    });
+}
+
+void AplClientBridge::interruptCommandSequence(const std::string& token) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, token] {
+        auto aplClientRenderer = getAplClientRendererFromAplToken(token);
+        if (aplClientRenderer) {
+            aplClientRenderer->interruptCommandSequence();
+        }
+    });
+}
+
+void AplClientBridge::dataSourceUpdate(
+    const std::string& sourceType,
+    const std::string& jsonPayload,
+    const std::string& token) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, sourceType, jsonPayload, token] {
+        auto aplClientRenderer = getAplClientRendererFromAplToken(token);
+        if (aplClientRenderer) {
+            aplClientRenderer->dataSourceUpdate(sourceType, jsonPayload, token);
+        }
+    });
+}
+
+void AplClientBridge::onMessage(const std::string& windowId, const std::string& message) {
+    ACSDK_DEBUG9(LX(__func__));
+
+    auto aplClientRenderer = getAplClientRendererFromWindowId(windowId);
+    if (aplClientRenderer && aplClientRenderer->shouldHandleMessage(message)) {
+        m_executor.submit([message, aplClientRenderer] { aplClientRenderer->handleMessage(message); });
+    }
+}
+
+bool AplClientBridge::handleBack(const std::string& windowId) {
+    return m_executor
+        .submit([this, windowId] {
+            if (auto aplClientRenderer = getAplClientRendererFromWindowId(windowId)) {
+                if (auto backExtension = getBackExtensionForRenderer(aplClientRenderer)) {
+                    return backExtension->handleBack();
+                }
+            }
+            return false;
+        })
+        .get();
+}
+
+void AplClientBridge::executeOnPresentationSessionChanged(
+    const std::string& windowId,
+    const PresentationSession& presentationSession) {
+    ACSDK_DEBUG9(LX(__func__).d("windowId", windowId));
+    // Reset the active window's backstack on session change
+    if (auto aplClientRenderer = getAplClientRendererFromWindowId(windowId)) {
+        if (auto backExtension = getBackExtensionForRenderer(aplClientRenderer)) {
+            backExtension->reset();
+        }
+    }
+
+    // Notify all audio player extensions of presentation session change.
+    for (const auto& audioPlayerExtension : m_audioPlayerExtensions) {
+        audioPlayerExtension->setActivePresentationSession(presentationSession.id, presentationSession.skillId);
+    }
+
+    m_windowIdToPresentationSession[windowId] = presentationSession;
+}
+
+void AplClientBridge::onRenderingEvent(const std::string& token, APLClient::AplRenderingEvent event) {
+    ACSDK_DEBUG9(LX(__func__));
+    /// no-op - metrics are handled by APL Client
+}
+
+int AplClientBridge::getMaxNumberOfConcurrentDownloads() {
+    return m_parameters.maxNumberOfConcurrentDownloads;
+}
+
+void AplClientBridge::onRestoreDocumentState(std::shared_ptr<APLClient::AplDocumentState> documentState) {
+    // We restore into the last rendered (active) window
+    auto aplClientRenderer = getAplClientRendererFromAplToken(documentState->token);
+    if (aplClientRenderer) {
+        // The restored document's token is now associated with the active renderer's window id
+        setTokenToWindow(documentState->token, aplClientRenderer->getWindowId());
+        return aplClientRenderer->restoreDocumentState(documentState);
+    }
+}
+
+void AplClientBridge::onPlayerActivityChanged(avsCommon::avs::PlayerActivity state, const Context& context) {
+    m_executor.submit([this, state, context]() {
+        m_playerActivityState = state;
+        for (const auto& audioPlayerExtension : m_audioPlayerExtensions) {
+            audioPlayerExtension->updatePlayerActivity(
+                playerActivityToString(m_playerActivityState), context.offset.count());
+        }
+    });
+}
+
+void AplClientBridge::renderPlayerInfoCard(
+    const std::string& payload,
+    templateRuntimeInterfaces::TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) {
+    setMediaProperties(audioPlayerInfo.mediaProperties);
+}
+
+void AplClientBridge::renderTemplateCard(const std::string& payload) {
+    // no-op
+}
+
+void AplClientBridge::clearPlayerInfoCard() {
+    // no-op
+}
+
+void AplClientBridge::clearRenderTemplateCard() {
+    // no-op
+}
+
+void AplClientBridge::onLoginStateProvided(
+    const std::string& playerId,
+    const acsdkExternalMediaPlayerInterfaces::ObservableSessionProperties sessionStateProperties) {
+    // Unused ExternalMediaPlayerObserverInterface function.
+}
+
+void AplClientBridge::onPlaybackStateProvided(
+    const std::string& playerId,
+    const acsdkExternalMediaPlayerInterfaces::ObservablePlaybackStateProperties playbackStateProperties) {
+    m_executor.submit([this, playbackStateProperties]() {
+        if (playbackStateProperties.state == "IDLE") {
+            m_playerActivityState = avsCommon::avs::PlayerActivity::IDLE;
+        } else if (playbackStateProperties.state == "STOPPED") {
+            m_playerActivityState = avsCommon::avs::PlayerActivity::STOPPED;
+        } else if (playbackStateProperties.state == "FINISHED") {
+            m_playerActivityState = avsCommon::avs::PlayerActivity::FINISHED;
+        } else if (playbackStateProperties.state == "PLAYING") {
+            m_playerActivityState = avsCommon::avs::PlayerActivity::PLAYING;
+        } else if (playbackStateProperties.state == "PAUSED") {
+            m_playerActivityState = avsCommon::avs::PlayerActivity::PAUSED;
+        }
+
+        int audioItemOffset = m_mediaProperties->getAudioItemOffset().count();
+        for (const auto& audioPlayerExtension : m_audioPlayerExtensions) {
+            audioPlayerExtension->updatePlayerActivity(playbackStateProperties.state, audioItemOffset);
+        }
+    });
+}
+
+std::shared_ptr<APLClient::Extensions::Backstack::AplBackstackExtension> AplClientBridge::getBackExtensionForRenderer(
+    const std::shared_ptr<APLClient::AplClientRenderer>& aplClientRenderer) {
+    return std::dynamic_pointer_cast<APLClient::Extensions::Backstack::AplBackstackExtension>(
+        aplClientRenderer->getExtension(APLClient::Extensions::Backstack::URI));
+}
+
+void AplClientBridge::onAudioPlayerPlay() {
+    ACSDK_DEBUG3(LX(__func__));
+    m_executor.submit([this]() { m_guiManager->handlePlaybackPlay(); });
+}
+
+void AplClientBridge::onAudioPlayerPause() {
+    ACSDK_DEBUG3(LX(__func__));
+    m_executor.submit([this]() { m_guiManager->handlePlaybackPause(); });
+}
+
+void AplClientBridge::onAudioPlayerNext() {
+    ACSDK_DEBUG3(LX(__func__));
+    m_executor.submit([this]() { m_guiManager->handlePlaybackNext(); });
+}
+
+void AplClientBridge::onAudioPlayerPrevious() {
+    ACSDK_DEBUG3(LX(__func__));
+    m_executor.submit([this]() { m_guiManager->handlePlaybackPrevious(); });
+}
+
+void AplClientBridge::onAudioPlayerSeekToPosition(int offsetInMilliseconds) {
+    ACSDK_DEBUG3(LX(__func__));
+    m_executor.submit([this, offsetInMilliseconds]() {
+        for (const auto& audioPlayerExtension : m_audioPlayerExtensions) {
+            audioPlayerExtension->updatePlaybackProgress(offsetInMilliseconds);
+        }
+        m_guiManager->handlePlaybackSeekTo(offsetInMilliseconds);
+    });
+}
+
+void AplClientBridge::onAudioPlayerSkipForward() {
+    ACSDK_DEBUG3(LX(__func__));
+    m_executor.submit([this]() { m_guiManager->handlePlaybackSkipForward(); });
+}
+
+void AplClientBridge::onAudioPlayerSkipBackward() {
+    ACSDK_DEBUG3(LX(__func__));
+    m_executor.submit([this]() { m_guiManager->handlePlaybackSkipBackward(); });
+}
+
+void AplClientBridge::onAudioPlayerToggle(const std::string& name, bool checked) {
+    ACSDK_DEBUG3(LX(__func__).d("toggle", name).d("checked", checked));
+    m_executor.submit([this, name, checked]() { m_guiManager->handlePlaybackToggle(name, checked); });
+}
+
+void AplClientBridge::setMetricRecorder(
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) {
+#ifdef ENABLE_APL_TELEMETRY
+    if (metricRecorder) {
+        auto sink = std::make_shared<TelemetrySink>(metricRecorder);
+        m_aplClientBinding->onTelemetrySinkUpdated(sink);
+    }
+#endif
+}
+
+void AplClientBridge::handleRenderingEvent(const std::string& token, APLClient::AplRenderingEvent event) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, token, event] {
+        auto aplClientRenderer = getAplClientRendererFromAplToken(token);
+        if (aplClientRenderer) {
+            aplClientRenderer->onRenderingEvent(event);
+        }
+    });
+}
+
+void AplClientBridge::handleDisplayMetrics(const std::string& windowId, const std::string& jsonPayload) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, windowId, jsonPayload] {
+        auto aplClientRenderer = getAplClientRendererFromWindowId(windowId);
+        if (aplClientRenderer) {
+            aplClientRenderer->onMetricsReported(jsonPayload);
+        }
+    });
+}
+
+void AplClientBridge::onRenderDirectiveReceived(
+    const std::string& token,
+    const std::chrono::steady_clock::time_point& receiveTime) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_executor.submit([this, token, receiveTime] {
+        auto aplClientRenderer = getAplClientRendererFromAplToken(token);
+        if (aplClientRenderer) {
+            aplClientRenderer->onRenderDirectiveReceived(receiveTime);
+        }
+    });
+}
+
+std::shared_ptr<APLClient::AplClientRenderer> AplClientBridge::getAplClientRendererFromWindowId(
+    const std::string& windowId) {
+    std::shared_ptr<APLClient::AplClientRenderer> renderer = nullptr;
+    auto m_aplClientRendererMapIter = m_aplClientRendererMap.find(windowId);
+    if (m_aplClientRendererMapIter != m_aplClientRendererMap.end()) {
+        renderer = m_aplClientRendererMapIter->second;
+    }
+
+    if (!renderer) {
+        ACSDK_WARN(LX("getAplClientRendererFromWindowIdFailed")
+                       .d("targetWindowId", windowId)
+                       .m("Unable to find renderer for this windowId"));
+    }
+
+    return renderer;
+}
+
+std::shared_ptr<APLClient::AplClientRenderer> AplClientBridge::getAplClientRendererFromAplToken(
+    const std::string& aplToken) {
+    std::shared_ptr<APLClient::AplClientRenderer> renderer = nullptr;
+    auto windowId = m_windowTokenMapping.getWindowByToken(aplToken);
+    if (!windowId.empty()) {
+        auto m_aplClientRendererMapIter = m_aplClientRendererMap.find(windowId);
+        if (m_aplClientRendererMapIter != m_aplClientRendererMap.end()) {
+            renderer = m_aplClientRendererMapIter->second;
+        }
+
+        if (!renderer) {
+            ACSDK_WARN(LX("getAplClientRendererFromAplTokenFailed")
+                           .d("APLToken", aplToken)
+                           .m("Unable to find renderer for this token"));
+        }
+    }
+
+    return renderer;
+}
+
+void AplClientBridge::setTokenToWindow(const std::string& token, const std::string& windowId) {
+    m_windowTokenMapping.insert(token, windowId);
+}
+
+/// TODO: Implement the onAudioPlayerLyricDataFlushed function from the @c AplAudioPlayerExtensionObserverInterface
+void AplClientBridge::onAudioPlayerLyricDataFlushed(
+    const std::string& token,
+    long durationInMilliseconds,
+    const std::string& lyricData) {
+    ACSDK_DEBUG3(LX(__func__));
+}
+
+void AplClientBridge::doShutdown() {
+    m_updateTimer.stop();
+    m_executor.shutdown();
+}
+
+std::string AplClientBridge::getMaxAPLVersion() const {
+    return m_aplClientBinding->getAPLVersionReported();
+}
+
+template <typename... Args1, typename... Args2>
+void AplClientBridge::executeNotifyObservers(APLViewhostObserverFunc<Args1...> func, Args2&&... args) {
+    auto it = m_observers.begin();
+    while (it != m_observers.end()) {
+        if (auto observer = it->lock()) {
+            (*observer.*func)(std::forward<Args2>(args)...);
+            ++it;
+        } else {
+            // Weak ptr expired, remove this from the list of observers
+            it = m_observers.erase(it);
+        }
+    }
+}
+
+void AplClientBridge::initializeRenderersRequest(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+    m_guiClient->handleInitializeAPLRenderers(payload);
+}
+
+void AplClientBridge::metricsReport(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+    m_guiClient->handleDisplayMetrics(payload);
+}
+
+void AplClientBridge::viewhostEvent(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+    m_guiClient->handleAplEvent(payload);
+}
+
+void AplClientBridge::renderCompleted(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+    m_guiClient->handleRenderComplete(payload);
+}
+
+void AplClientBridge::renderDocumentRequest(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+    m_guiClient->handleLocalRenderDocument(payload);
+}
+
+void AplClientBridge::executeCommandsRequest(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+    m_guiClient->handleLocalExecuteCommands(payload);
+}
+
+void AplClientBridge::clearDocumentRequest(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+    m_guiClient->handleLocalClearDocument(payload);
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/IPCAPLAgent.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/IPCAPLAgent.cpp
new file mode 100644
index 0000000000..b2bac93ec3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/AlexaPresentation/IPCAPLAgent.cpp
@@ -0,0 +1,102 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <utility>
+
+#include <AVSCommon/SDKInterfaces/GUIActivityEvent.h>
+
+#include "IPCServerSampleApp/AlexaPresentation/IPCAPLAgent.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+using namespace aplCapabilityCommonInterfaces;
+
+/// String to identify log entries originating from this file.
+static const std::string TAG("IPCAPLAgent");
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+std::shared_ptr<IPCAPLAgent> IPCAPLAgent::create(std::shared_ptr<gui::GUIClientInterface> guiClient) {
+    if (!guiClient) {
+        ACSDK_CRITICAL(LX(__func__).d("reason", "null guiClient"));
+        return nullptr;
+    }
+
+    return std::shared_ptr<IPCAPLAgent>(new IPCAPLAgent(guiClient));
+}
+
+IPCAPLAgent::IPCAPLAgent(std::shared_ptr<gui::GUIClientInterface> guiClient) {
+    m_guiClient = std::move(guiClient);
+}
+void IPCAPLAgent::setAPLMaxVersion(const std::string& APLMaxVersion) {
+    ACSDK_DEBUG5(LX(__func__).d("APLMaxVersion", APLMaxVersion));
+    // TODO : Implement IPC Message to GUIClient
+}
+void IPCAPLAgent::onActiveDocumentChanged(const std::string& token, const PresentationSession& session) {
+    ACSDK_DEBUG5(LX(__func__).d("token", token));
+    // TODO : Implement IPC Message to GUIClient
+}
+void IPCAPLAgent::onDocumentDismissed(const std::string& token) {
+    // TODO : Implement IPC Message to GUIClient
+}
+void IPCAPLAgent::addObserver(std::shared_ptr<APLCapabilityAgentObserverInterface> observer) {
+    // No-op
+}
+void IPCAPLAgent::removeObserver(std::shared_ptr<APLCapabilityAgentObserverInterface> observer) {
+    // No-op
+}
+void IPCAPLAgent::clearExecuteCommands(const std::string& token, const bool markAsFailed) {
+    // TODO : Implement IPC Message to GUIClient
+}
+void IPCAPLAgent::sendUserEvent(const aplEventPayload::UserEvent& payload) {
+    // TODO : Implement IPC Message to GUIClient
+}
+void IPCAPLAgent::sendDataSourceFetchRequestEvent(const aplEventPayload::DataSourceFetch& fetchPayload) {
+    // TODO : Implement IPC Message to GUIClient
+}
+void IPCAPLAgent::sendRuntimeErrorEvent(const aplCapabilityCommonInterfaces::aplEventPayload::RuntimeError& payload) {
+    // TODO : Implement IPC Message to GUIClient
+}
+void IPCAPLAgent::onVisualContextAvailable(
+    avsCommon::sdkInterfaces::ContextRequestToken requestToken,
+    const aplCapabilityCommonInterfaces::aplEventPayload::VisualContext& visualContext) {
+    // TODO : Implement IPC Message to GUIClient
+}
+void IPCAPLAgent::processRenderDocumentResult(const std::string& token, const bool result, const std::string& error) {
+    // TODO : Implement IPC Message to GUIClient
+}
+void IPCAPLAgent::processExecuteCommandsResult(
+    const std::string& token,
+    APLCommandExecutionEvent event,
+    const std::string& error) {
+    // TODO : Implement IPC Message to GUIClient
+}
+void IPCAPLAgent::recordRenderComplete(const std::chrono::steady_clock::time_point& timestamp) {
+    // TODO : Implement IPC Message to GUIClient
+}
+void IPCAPLAgent::proactiveStateReport() {
+    // TODO : Implement IPC Message to GUIClient
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/CMakeLists.txt b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/CMakeLists.txt
new file mode 100644
index 0000000000..565f2c16c4
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/CMakeLists.txt
@@ -0,0 +1,202 @@
+add_definitions("-DACSDK_LOG_MODULE=LibIPCServerSampleApp")
+list(APPEND LibIPCServerSampleApp_SOURCES
+        AlexaPresentation/AplClientBridge.cpp
+        AlexaPresentation/APLDocumentSession.cpp
+        AlexaPresentation/APLDocumentSessionManager.cpp
+        AlexaPresentation/APLPayloadParser.cpp
+        AlexaPresentation/APLRuntimeInterfaceImpl.cpp
+        AlexaPresentation/APLRuntimePresentationAdapter.cpp
+        AlexaPresentation/IPCAPLAgent.cpp
+        ConfigValidator.cpp
+        ConnectionObserver.cpp
+        CachingDownloadManager.cpp
+        ConsolePrinter.cpp
+        DownloadMonitor.cpp
+        ExternalCapabilitiesBuilder.cpp
+        GUILogBridge.cpp
+        GUI/GUIActivityEventNotifier.cpp
+        GUI/GUIClient.cpp
+        GUI/GUIManager.cpp
+        GUI/TemplateRuntimePresentationAdapterBridge.cpp
+        KeywordObserver.cpp
+        LocaleAssetsManager.cpp
+        SampleApplication.cpp
+        SampleApplicationComponent.cpp
+        SampleEqualizerModeController.cpp
+        SmartScreenCaptionPresenter.cpp
+        SmartScreenCaptionStateManager.cpp
+        TelemetrySink.cpp
+        TimezoneHelper.cpp
+        IPC/IPCVersionManager.cpp
+        IPC/IPCHandlerBase.cpp
+        IPC/IPCRouter.cpp
+        IPC/Components/APLClientHandler.cpp
+        IPC/Components/AlexaCaptionsHandler.cpp
+        IPC/Components/AudioFocusManagerHandler.cpp
+        IPC/Components/DoNotDisturbHandler.cpp
+        IPC/Components/InteractionManagerHandler.cpp
+        IPC/Components/LoggerHandler.cpp
+        IPC/Components/SessionSetupHandler.cpp
+        IPC/Components/SystemHandler.cpp
+        IPC/Components/TemplateRuntimeHandler.cpp
+        IPC/Components/WindowManagerHandler.cpp)
+
+set(APLCLIENT_LIBRARY_DIRS "${APL_CLIENT_INSTALL_PATH}/lib")
+set(APLCLIENT_INCLUDE_DIRS "${APLCLIENT_INCLUDE_DIRS}" "${APL_CLIENT_INSTALL_PATH}/include")
+set(APLCLIENT_LDFLAGS "${APLCLIENT_LDFLAGS}" "-L${APLCLIENT_LIBRARY_DIRS}")
+
+if (RTCSC)
+    list(APPEND LibIPCServerSampleApp_SOURCES IPC/Components/LiveViewCameraHandler.cpp)
+    list(APPEND LibIPCServerSampleApp_SOURCES Extensions/LiveView/AplLiveViewExtension.cpp)
+    list(APPEND LibIPCServerSampleApp_SOURCES LiveViewController/LiveViewControllerPresentationAdapter.cpp)
+endif ()
+
+if (PORTAUDIO)
+    list(APPEND LibIPCServerSampleApp_SOURCES PortAudioMicrophoneWrapper.cpp)
+endif ()
+
+IF (A4B)
+    list(APPEND LibIPCServerSampleApp_SOURCES RevokeAuthorizationObserver.cpp)
+ENDIF ()
+
+IF (HAS_EXTERNAL_MEDIA_PLAYER_ADAPTERS)
+    file(GLOB_RECURSE SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/ExternalMediaAdapterRegistration/*.cpp)
+    foreach (myfile ${SRC_FILE})
+        list(APPEND LibIPCServerSampleApp_SOURCES ${myfile})
+    endforeach (myfile)
+ENDIF ()
+
+add_library(LibIPCServerSampleApp ${LibIPCServerSampleApp_SOURCES})
+
+target_include_directories(LibIPCServerSampleApp PUBLIC
+        "${LibIPCServerSampleApp_SOURCE_DIR}/include"
+        "${ASDK_INCLUDE_DIRS}"
+        "${AudioResources_SOURCE_DIR}/include"
+        "${RegistrationManager_SOURCE_DIR}/include"
+        "${ESP_SOURCE_DIR}/include"
+        "${PORTAUDIO_INCLUDE_DIR}"
+        "${Utils_SOURCE_DIR}/include"
+        "${Communication_SOURCE_DIR}/include"
+        "${base64_SOURCE_DIR}/include"
+        "${APLCLIENT_INCLUDE_DIRS}")
+
+target_link_libraries(LibIPCServerSampleApp
+        "${ASDK_LDFLAGS}"
+        "${APLCLIENT_LDFLAGS}"
+        acsdkAlerts
+        acsdkAlexaPresentationFeatureClient
+        acsdkAudioInputStream
+        acsdkAuthorization
+        acsdkBluetooth
+        acsdkCore
+        acsdkCrypto
+        acsdkEqualizerImplementations
+        acsdkKWDImplementations
+        acsdkManufactory
+        acsdkNotifications
+        acsdkNotifier
+        acsdkPresentationOrchestratorFeatureClient
+        acsdkSampleApplicationCBLAuthRequester
+        acsdkSampleConsole
+        acsdkSampleEndpoint
+        acsdkSampleInteractionManager
+        acsdkSamplePeripheralEndpoint
+        acsdkSampleTemplateRuntimePresentationAdaptor
+        acsdkSDKClient
+        acsdkShared
+        acsdkSpeakerManager
+        acsdkVisualCharacteristicsFeatureClient
+        acsdkVisualStateTrackerFeatureClient
+        ACL
+        APLClient
+        AudioResources
+        AVSCommon
+        AVSGatewayManager
+        CapabilitiesDelegate
+        Captions
+        CaptionsComponent
+        CertifiedSender
+        Communication
+        ContextManager
+        DefaultClient
+        DeviceSettings
+        InterruptModel
+        RegistrationManager
+        SQLiteStorage
+        SynchronizeStateSender
+        "${PORTAUDIO_LIB_PATH}")
+
+if (RTCSC)
+    target_link_libraries(LibIPCServerSampleApp acsdkLiveViewControllerFeatureClient)
+endif()
+
+if (GSTREAMER_MEDIA_PLAYER)
+    target_include_directories(LibIPCServerSampleApp PUBLIC "${MediaPlayer_SOURCE_DIR}/include" "${GST_INCLUDE_DIRS}")
+    target_link_libraries(LibIPCServerSampleApp MediaPlayer)
+    target_include_directories(LibIPCServerSampleApp PUBLIC)
+endif ()
+
+if (KWD)
+    target_link_libraries(LibIPCServerSampleApp KeywordDetectorProvider)
+endif ()
+
+if (METRICS_EXTENSION)
+    add_definitions(-DMETRICS_EXTENSION)
+    target_include_directories(LibIPCServerSampleApp PRIVATE "${MetricsExtension_SOURCE_DIR}/include")
+    target_link_libraries(LibIPCServerSampleApp MetricsExtension)
+endif()
+
+if (NOT WEBSOCKETPP_INCLUDE_DIR)
+    message(FATAL_ERROR "WebSocketPP Path is required to enable websocket server")
+endif ()
+
+if (NOT ASIO_INCLUDE_DIR)
+    find_path(ASIO_INCLUDE_DIR NAMES "asio.hpp")
+
+    if (ASIO_INCLUDE_DIR STREQUAL "ASIO_INCLUDE_DIR-NOTFOUND")
+        message(FATAL_ERROR "WebSocket support requires asio.")
+    endif ()
+endif ()
+
+target_compile_definitions(LibIPCServerSampleApp PUBLIC ASIO_STANDALONE)
+target_include_directories(LibIPCServerSampleApp PUBLIC
+        "${ASIO_INCLUDE_DIR}"
+        "${WEBSOCKETPP_INCLUDE_DIR}")
+
+if (CRYPTO_FOUND AND PKCS11)
+    target_compile_definitions(LibIPCServerSampleApp PRIVATE ENABLE_PKCS11)
+endif ()
+
+# Currently only allow non SSL websocket with debug builds
+if (DISABLE_WEBSOCKET_SSL)
+    string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE)
+    if (NOT LOWERCASE_CMAKE_BUILD_TYPE STREQUAL "debug")
+        message(FATAL_ERROR "DISABLE_WEBSOCKET_SSL used in non-debug build.")
+    endif ()
+else ()
+    find_package(OpenSSL REQUIRED)
+    add_definitions(-DENABLE_WEBSOCKET_SSL)
+
+    target_include_directories(LibIPCServerSampleApp PUBLIC "${OPENSSL_INCLUDE_DIR}")
+    target_link_libraries(LibIPCServerSampleApp
+            "${OPENSSL_SSL_LIBRARY}"
+            "${OPENSSL_CRYPTO_LIBRARY}")
+endif ()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    target_link_libraries(LibIPCServerSampleApp
+            "-rpath ${ASDK_LIBRARY_DIRS}"
+            "-rpath ${APLCLIENT_LIBRARY_DIRS}"
+            "-framework CoreAudio"
+            "-framework AudioToolbox"
+            "-framework AudioUnit"
+            "-framework CoreServices"
+            "-framework Carbon")
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    target_link_libraries(LibIPCServerSampleApp
+            rt m pthread asound atomic
+            "-Wl,-rpath,${ASDK_LIBRARY_DIRS}"
+            "-Wl,-rpath,${APLCLIENT_LIBRARY_DIRS}")
+endif ()
+
+add_rpath_to_target("LibIPCServerSampleApp")
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/CachingDownloadManager.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/CachingDownloadManager.cpp
new file mode 100644
index 0000000000..1cdf77707a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/CachingDownloadManager.cpp
@@ -0,0 +1,323 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <fstream>
+#include <unordered_map>
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+
+#include "IPCServerSampleApp/CachingDownloadManager.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+static const std::string TAG{"CachingDownloadManager"};
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+using namespace avsCommon::avs::attachment;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::json;
+using namespace avsCommon::utils::libcurlUtils;
+using namespace avsCommon::utils::sds;
+
+/// Process attachment ID
+static const std::string PROCESS_ATTACHMENT_ID = "import_download:";
+/// A wait period for a polling loop that constantly check if a content fetcher finished fetching the payload or failed.
+static const std::chrono::milliseconds WAIT_FOR_ACTIVITY_TIMEOUT{100};
+/// Timeout to wait for am item to arrive from the content fetcher
+static const std::chrono::minutes FETCH_TIMEOUT{5};
+/// The number of bytes read from the attachment with each read in the read loop.
+static const size_t CHUNK_SIZE(1024);
+/// Component name for SmartScreenSampleApp
+static const std::string COMPONENT_NAME = "IPCServerSampleApp";
+/// Table name for APL packages
+static const std::string TABLE_NAME = "Packages";
+/// Delimiter to separate package content and import time, since we currently have only one column for value in misc
+/// storage
+static const std::string DELIMITER = "||||";
+/// The number of retries when downloading a package from source
+static const int DOWNLOAD_FROM_SOURCE_RETRY_ATTEMPTS = 3;
+
+CachingDownloadManager::CachingDownloadManager(
+    std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>
+        httpContentFetcherInterfaceFactoryInterface,
+    unsigned long cachePeriodInSeconds,
+    unsigned long maxCacheSize,
+    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage,
+    const std::shared_ptr<registrationManager::CustomerDataManagerInterface> customerDataManager) :
+        CustomerDataHandler{customerDataManager},
+        m_contentFetcherFactory{httpContentFetcherInterfaceFactoryInterface},
+        m_cachePeriod{std::chrono::seconds(cachePeriodInSeconds)},
+        m_maxCacheSize{maxCacheSize},
+        m_miscStorage(miscStorage) {
+    bool doesTableExist = false;
+    if (!m_miscStorage->tableExists(COMPONENT_NAME, TABLE_NAME, &doesTableExist)) {
+        ACSDK_ERROR(LX(__func__).m("Cannot check for table existence."));
+    }
+
+    if (!doesTableExist) {
+        if (!m_miscStorage->createTable(
+                COMPONENT_NAME,
+                TABLE_NAME,
+                avsCommon::sdkInterfaces::storage::MiscStorageInterface::KeyType::STRING_KEY,
+                avsCommon::sdkInterfaces::storage::MiscStorageInterface::ValueType::STRING_VALUE)) {
+            ACSDK_ERROR(LX(__func__).m("Cannot create table for storing APL packages."));
+        }
+    } else {
+        std::unordered_map<std::string, std::string> packageMap;
+        if (!m_miscStorage->load(COMPONENT_NAME, TABLE_NAME, &packageMap)) {
+            ACSDK_ERROR(LX(__func__).m("Cannot load downloaded packages."));
+        }
+        for (auto& kvp : packageMap) {
+            size_t delimiterPos = kvp.second.find(DELIMITER);
+            if (delimiterPos == std::string::npos) {
+                ACSDK_ERROR(LX(__func__).m("Package content for " + kvp.first + " is corrupted."));
+            } else {
+                auto timeStamp = kvp.second.substr(0, delimiterPos);
+                auto packageContent = kvp.second.substr(delimiterPos + DELIMITER.length());
+                auto importTime =
+                    std::chrono::time_point<std::chrono::system_clock>(std::chrono::seconds(std::stol(timeStamp)));
+                if (std::chrono::system_clock::now() - importTime < m_cachePeriod) {
+                    ACSDK_DEBUG9(LX(__func__).m("Loaded package " + kvp.first + " from misc storage"));
+                    cachedContentMap[kvp.first] = CachedContent(importTime, packageContent);
+                }
+            }
+        }
+    }
+}
+
+CachingDownloadManager::CachedContent::CachedContent(
+    std::chrono::system_clock::time_point importTime,
+    const std::string& content) {
+    this->importTime = importTime;
+    this->content = content;
+}
+
+std::string CachingDownloadManager::retrieveContent(const std::string& source, std::shared_ptr<Observer> observer) {
+    {
+        const std::lock_guard<std::mutex> lock(cachedContentMapMutex);
+        if (cachedContentMap.find(source) != cachedContentMap.end()) {
+            if ((std::chrono::system_clock::now() - cachedContentMap[source].importTime) < m_cachePeriod) {
+                ACSDK_DEBUG9(LX("retrieveContent").d("contentSource", "returnedFromCache"));
+                if (observer) {
+                    observer->onCacheHit();
+                }
+                return cachedContentMap[source].content;
+            }
+        }
+    }
+
+    std::string content;
+
+    for (int i = 0; i < DOWNLOAD_FROM_SOURCE_RETRY_ATTEMPTS; i++) {
+        content = downloadFromSource(source, observer);
+        ACSDK_DEBUG9(LX("retrieveContent").d("contentSource", "downloadedFromSource"));
+
+        if (!content.empty()) {
+            auto cachedContent = CachedContent(std::chrono::system_clock::now(), content);
+            {
+                const std::lock_guard<std::mutex> lock(cachedContentMapMutex);
+                cachedContentMap[source] = cachedContent;
+                cleanUpCache();
+            }
+
+            writeToStorage(source, cachedContent);
+            return content;
+        }
+    }
+    ACSDK_ERROR(LX("retrieveContent").d("contentSource", "downloadedFromSourceFailedAllRetries"));
+
+    return content;
+}
+
+void CachingDownloadManager::writeToStorage(std::string source, CachingDownloadManager::CachedContent content) {
+    m_executor.submit([this, source, content] {
+        if (!m_miscStorage->put(COMPONENT_NAME, TABLE_NAME, source, cachedContentToString(content, DELIMITER))) {
+            ACSDK_ERROR(LX(__func__).m("Failed to write package to disk storage."));
+        } else {
+            ACSDK_DEBUG9(LX(__func__).m("Successfully stored " + source + " to disk"));
+        }
+    });
+}
+
+void CachingDownloadManager::cleanUpCache() {
+    std::chrono::system_clock::time_point oldestTime = std::chrono::system_clock::time_point::max();
+    std::string oldestSource;
+
+    for (auto it = cachedContentMap.begin(); it != cachedContentMap.end();) {
+        if ((std::chrono::system_clock::now() - it->second.importTime) > m_cachePeriod) {
+            removeFromStorage(it->first);
+            it = cachedContentMap.erase(it);
+            ACSDK_DEBUG9(LX("cleanUpCache").d("deletedCacheEntry", "entryExpired"));
+        } else {
+            if (it->second.importTime < oldestTime) {
+                oldestTime = it->second.importTime;
+                oldestSource = it->first;
+            }
+            it++;
+        }
+    }
+
+    if (cachedContentMap.size() > m_maxCacheSize) {
+        cachedContentMap.erase(oldestSource);
+        ACSDK_DEBUG9(LX("cleanUpCache").d("deletedCacheEntry", "maxCacheSizeReached"));
+    }
+}
+
+void CachingDownloadManager::clearData() {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!m_miscStorage->clearTable(COMPONENT_NAME, TABLE_NAME)) {
+        ACSDK_ERROR(LX("clearTableFailed").d("reason", "unable to clear the table from the database"));
+    }
+}
+
+void CachingDownloadManager::removeFromStorage(std::string source) {
+    m_executor.submit([this, source] {
+        if (!m_miscStorage->remove(COMPONENT_NAME, TABLE_NAME, source)) {
+            ACSDK_ERROR(LX(__func__).m("Failed to remove package " + source + " from disk."));
+        } else {
+            ACSDK_DEBUG9(LX(__func__).m("Removed package " + source + " from disk."));
+        }
+    });
+}
+
+std::string CachingDownloadManager::downloadFromSource(const std::string& source, std::shared_ptr<Observer> observer) {
+    if (observer) {
+        observer->onDownloadStarted();
+    }
+    auto contentFetcher = m_contentFetcherFactory->create(source);
+    contentFetcher->getContent(HTTPContentFetcherInterface::FetchOptions::ENTIRE_BODY);
+
+    HTTPContentFetcherInterface::Header header = contentFetcher->getHeader(nullptr);
+    if (!header.successful) {
+        ACSDK_ERROR(LX(__func__).sensitive("source", source).m("getHeaderFailed"));
+        if (observer) {
+            observer->onDownloadFailed();
+        }
+        return "";
+    }
+
+    if (!isStatusCodeSuccess(header.responseCode)) {
+        ACSDK_ERROR(LX("downloadFromSourceFailed")
+                        .d("statusCode", header.responseCode)
+                        .sensitive("url", source)
+                        .d("reason", "nonSuccessStatusCodeFromGetHeader"));
+        if (observer) {
+            observer->onDownloadFailed();
+        }
+        return "";
+    }
+
+    ACSDK_DEBUG9(LX("downloadFromSource")
+                     .d("contentType", header.contentType)
+                     .d("statusCode", header.responseCode)
+                     .sensitive("url", source)
+                     .m("headersReceived"));
+
+    auto stream = std::make_shared<InProcessAttachment>(PROCESS_ATTACHMENT_ID);
+    std::shared_ptr<AttachmentWriter> streamWriter = stream->createWriter(WriterPolicy::BLOCKING);
+
+    if (!contentFetcher->getBody(streamWriter)) {
+        ACSDK_ERROR(LX("downloadFromSourceFailed").d("reason", "getBodyFailed"));
+        if (observer) {
+            observer->onDownloadFailed();
+        }
+        return "";
+    }
+
+    auto startTime = std::chrono::steady_clock::now();
+    auto elapsedTime = std::chrono::steady_clock::now() - startTime;
+    HTTPContentFetcherInterface::State contentFetcherState = contentFetcher->getState();
+    while ((FETCH_TIMEOUT > elapsedTime) && (HTTPContentFetcherInterface::State::BODY_DONE != contentFetcherState) &&
+           (HTTPContentFetcherInterface::State::ERROR != contentFetcherState)) {
+        std::this_thread::sleep_for(WAIT_FOR_ACTIVITY_TIMEOUT);
+        elapsedTime = std::chrono::steady_clock::now() - startTime;
+        contentFetcherState = contentFetcher->getState();
+    }
+
+    if (FETCH_TIMEOUT <= elapsedTime) {
+        ACSDK_ERROR(LX("downloadFromSourceFailed").d("reason", "waitTimeout"));
+        if (observer) {
+            observer->onDownloadFailed();
+        }
+        return "";
+    }
+
+    if (HTTPContentFetcherInterface::State::ERROR == contentFetcherState) {
+        ACSDK_ERROR(LX("downloadFromSourceFailed").d("reason", "receivingBodyFailed"));
+        if (observer) {
+            observer->onDownloadFailed();
+        }
+        return "";
+    }
+
+    std::unique_ptr<AttachmentReader> reader = stream->createReader(ReaderPolicy::NONBLOCKING);
+
+    std::string content;
+    auto readStatus = AttachmentReader::ReadStatus::OK;
+    std::vector<char> buffer(CHUNK_SIZE, 0);
+    bool streamClosed = false;
+    AttachmentReader::ReadStatus previousStatus = AttachmentReader::ReadStatus::OK_TIMEDOUT;
+    ssize_t bytesRead = -1;
+    while (!streamClosed && bytesRead != 0) {
+        bytesRead = reader->read(buffer.data(), buffer.size(), &readStatus);
+        if (previousStatus != readStatus) {
+            ACSDK_DEBUG9(LX(__func__).d("readStatus", readStatus));
+            previousStatus = readStatus;
+        }
+        switch (readStatus) {
+            case AttachmentReader::ReadStatus::CLOSED:
+                streamClosed = true;
+                if (bytesRead == 0) {
+                    break;
+                }
+                /* FALL THROUGH - to add any data received even if closed */
+            case AttachmentReader::ReadStatus::OK:
+            case AttachmentReader::ReadStatus::OK_WOULDBLOCK:
+            case AttachmentReader::ReadStatus::OK_TIMEDOUT:
+                content.append(buffer.data(), bytesRead);
+                break;
+            case AttachmentReader::ReadStatus::OK_OVERRUN_RESET:
+                // Current AttachmentReader policy renders this outcome impossible.
+                ACSDK_ERROR(LX("downloadFromSourceFailed").d("reason", "overrunReset"));
+                break;
+            case AttachmentReader::ReadStatus::ERROR_OVERRUN:
+            case AttachmentReader::ReadStatus::ERROR_BYTES_LESS_THAN_WORD_SIZE:
+            case AttachmentReader::ReadStatus::ERROR_INTERNAL:
+                ACSDK_ERROR(LX("downloadFromSourceFailed").d("reason", "readError"));
+                if (observer) {
+                    observer->onDownloadFailed();
+                }
+                return "";
+        }
+        if (0 == bytesRead) {
+            ACSDK_DEBUG9(LX("downloadFromSource").m("alreadyReadAllBytes"));
+        } else if (observer) {
+            observer->onBytesRead(bytesRead);
+        }
+    }
+
+    ACSDK_DEBUG9(LX("downloadFromSource").d("URL", contentFetcher->getUrl()));
+
+    if (observer) {
+        observer->onDownloadComplete();
+    }
+    return content;
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/ConfigValidator.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/ConfigValidator.cpp
new file mode 100644
index 0000000000..0c48de6957
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/ConfigValidator.cpp
@@ -0,0 +1,157 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include "IPCServerSampleApp/ConfigValidator.h"
+
+#include <rapidjson/document.h>
+#include <rapidjson/schema.h>
+#include <rapidjson/stringbuffer.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+using namespace rapidjson;
+using namespace std;
+
+/// String to identify log entries originating from this file.
+static const std::string TAG("ConfigValidator");
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+static const std::string VISUALCHARACTERISTICS_CONFIG_ROOT_KEY = "visualCharacteristics";
+
+static const std::string VISUALCHARACTERISTICS_INTERFACE_KEY{"interface"};
+
+static const std::string ALEXADISPLAYWINDOW_INTERFACE_NAME{"Alexa.Display.Window"};
+static const std::string ALEXADISPLAYWINDOW_CONFIGURATIONS_KEY{"configurations"};
+static const std::string ALEXADISPLAYWINDOW_TEMPLATES_KEY{"templates"};
+static const std::string ALEXADISPLAYWINDOW_TEMPLATE_ID_KEY{"id"};
+static const std::string ALEXADISPLAYWINDOW_TEMPLATE_CONFIGURATION_KEY{"configuration"};
+static const std::string ALEXADISPLAYWINDOW_TEMPLATE_INTERACTIONMODES_KEY{"interactionModes"};
+
+static const std::string ALEXAINTERACTIONMODE_INTERFACE_NAME{"Alexa.InteractionMode"};
+static const std::string ALEXAINTERACTIONMODE_INTERFACTIONMODES_KEY{"interactionModes"};
+static const std::string ALEXAINTERACTIONMODE_INTERFACTIONMODE_ID_KEY{"id"};
+
+ConfigValidator::ConfigValidator() {
+}
+
+std::shared_ptr<ConfigValidator> ConfigValidator::create() {
+    std::shared_ptr<ConfigValidator> configValidator(new ConfigValidator());
+    return configValidator;
+}
+
+bool ConfigValidator::validate(
+    avsCommon::utils::configuration::ConfigurationNode& configuration,
+    rapidjson::Document& jsonSchema) {
+    rapidjson::SchemaDocument schema(jsonSchema);
+    rapidjson::SchemaValidator validator(schema);
+    rapidjson::Document doc;
+
+    if (doc.Parse(configuration.serialize().c_str()).HasParseError()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalidConfigurationNode!"));
+        return false;
+    }
+
+    // Validate configuration against schema
+    if (!doc.Accept(validator)) {
+        rapidjson::StringBuffer docBuffer, schemaBuffer;
+        std::string validatorErrorMessage;
+        validator.GetInvalidSchemaPointer().StringifyUriFragment(schemaBuffer);
+        validator.GetInvalidDocumentPointer().StringifyUriFragment(docBuffer);
+        // Get the first error message
+        validatorErrorMessage = std::string("configuration validation failed at ") + docBuffer.GetString() +
+                                " against schema " + schemaBuffer.GetString() + " with keyword '" +
+                                validator.GetInvalidSchemaKeyword() + "'";
+        ACSDK_ERROR(LX(__func__).d("reason", "validationFailed").d("message", validatorErrorMessage));
+        return false;
+    }
+
+    // Validate configuration against business logic
+    auto visualCharacteristicsConfig = configuration.getArray(VISUALCHARACTERISTICS_CONFIG_ROOT_KEY);
+
+    // Extract Alexa display window templates, Alexa interaction modes
+    avsCommon::utils::configuration::ConfigurationNode alexaDisplayWindowInterface;
+    avsCommon::utils::configuration::ConfigurationNode alexaInteractionModeInterface;
+    for (size_t i = 0; i < visualCharacteristicsConfig.getArraySize(); i++) {
+        std::string interfaceName;
+        visualCharacteristicsConfig[i].getString(VISUALCHARACTERISTICS_INTERFACE_KEY, &interfaceName);
+        if (interfaceName == ALEXADISPLAYWINDOW_INTERFACE_NAME) {
+            alexaDisplayWindowInterface = visualCharacteristicsConfig[i];
+        } else if (interfaceName == ALEXAINTERACTIONMODE_INTERFACE_NAME) {
+            alexaInteractionModeInterface = visualCharacteristicsConfig[i];
+        }
+    }
+    if (!alexaDisplayWindowInterface) {
+        ACSDK_ERROR(LX(__func__).d("reason", "Alexa display window interface not found"));
+        return false;
+    }
+    if (!alexaInteractionModeInterface) {
+        ACSDK_ERROR(LX(__func__).d("reason", "Alexa interaction mode interface not found"));
+        return false;
+    }
+    auto alexaDisplayWindowTemplates =
+        alexaDisplayWindowInterface[ALEXADISPLAYWINDOW_CONFIGURATIONS_KEY].getArray(ALEXADISPLAYWINDOW_TEMPLATES_KEY);
+    auto alexaInteractionModes = alexaInteractionModeInterface[ALEXADISPLAYWINDOW_CONFIGURATIONS_KEY].getArray(
+        ALEXAINTERACTIONMODE_INTERFACTIONMODES_KEY);
+
+    // Extract Alexa interaction mode ids;
+    std::vector<std::string> alexaInteractionModeIds;
+    for (size_t i = 0; i < alexaInteractionModes.getArraySize(); i++) {
+        std::string alexaInteractionModeId;
+        alexaInteractionModes[i].getString(ALEXAINTERACTIONMODE_INTERFACTIONMODE_ID_KEY, &alexaInteractionModeId);
+        alexaInteractionModeIds.push_back(alexaInteractionModeId);
+    }
+
+    // Construct Alexa display window interface template map
+    std::unordered_map<std::string, avsCommon::utils::configuration::ConfigurationNode>
+        alexaDisplayWindowInterfaceTemplateMap;
+    for (size_t i = 0; i < alexaDisplayWindowTemplates.getArraySize(); i++) {
+        std::string alexaDisplayWindowTemplateId;
+        alexaDisplayWindowTemplates[i].getString(ALEXADISPLAYWINDOW_TEMPLATE_ID_KEY, &alexaDisplayWindowTemplateId);
+        alexaDisplayWindowInterfaceTemplateMap.insert({alexaDisplayWindowTemplateId, alexaDisplayWindowTemplates[i]});
+    }
+
+    // Validate Alexa display window interface templates interactionModes
+    for (size_t i = 0; i < alexaDisplayWindowTemplates.getArraySize(); i++) {
+        std::set<std::string> windowTemplateInteractionModes;
+        alexaDisplayWindowTemplates[i][ALEXADISPLAYWINDOW_TEMPLATE_CONFIGURATION_KEY].getStringValues(
+            ALEXADISPLAYWINDOW_TEMPLATE_INTERACTIONMODES_KEY, &windowTemplateInteractionModes);
+        for (const auto& windowTemplateInteractionMode : windowTemplateInteractionModes) {
+            if (std::find(
+                    alexaInteractionModeIds.begin(), alexaInteractionModeIds.end(), windowTemplateInteractionMode) ==
+                alexaInteractionModeIds.end()) {
+                ACSDK_ERROR(LX(__func__)
+                                .d("reason", "validationFailed")
+                                .d("message", "InteractionModes ID not found in Alexa.InteractionMode interface"));
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/ConnectionObserver.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/ConnectionObserver.cpp
new file mode 100644
index 0000000000..c56e87eb77
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/ConnectionObserver.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/ConnectionObserver.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+using namespace alexaClientSDK;
+using namespace avsCommon::sdkInterfaces;
+
+ConnectionObserver::ConnectionObserver() :
+        m_authState(AuthObserverInterface::State::UNINITIALIZED),
+        m_connectionStatus(ConnectionStatusObserverInterface::Status::DISCONNECTED) {
+}
+
+void ConnectionObserver::onAuthStateChange(AuthObserverInterface::State newState, AuthObserverInterface::Error error) {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    m_authState = newState;
+    m_trigger.notify_all();
+}
+
+void ConnectionObserver::onConnectionStatusChanged(
+    const ConnectionStatusObserverInterface::Status status,
+    const ConnectionStatusObserverInterface::ChangedReason reason) {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    m_connectionStatus = status;
+    m_trigger.notify_all();
+}
+
+bool ConnectionObserver::waitFor(const AuthObserverInterface::State authState, const std::chrono::seconds duration) {
+    std::unique_lock<std::mutex> lock(m_mutex);
+    return m_trigger.wait_for(lock, duration, [this, authState]() { return authState == m_authState; });
+}
+
+bool ConnectionObserver::waitFor(
+    const ConnectionStatusObserverInterface::Status connectionStatus,
+    const std::chrono::seconds duration) {
+    std::unique_lock<std::mutex> lock(m_mutex);
+    return m_trigger.wait_for(
+        lock, duration, [this, connectionStatus]() { return connectionStatus == m_connectionStatus; });
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/ConsolePrinter.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/ConsolePrinter.cpp
new file mode 100644
index 0000000000..bb5b3db4e2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/ConsolePrinter.cpp
@@ -0,0 +1,127 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <iostream>
+#include <algorithm>
+#include <cmath>
+
+#include <AVSCommon/Utils/CoutMutex.h>
+
+#include "IPCServerSampleApp/ConsolePrinter.h"
+
+/**
+ *  When using pretty print, we pad our strings in the beginning and in the end with the margin representation '#'
+ *  and 7 spaces. E.g., if I pass "Hello world!" string, pretty print will look like:
+ *  ############################
+ *  #       Hello world!       #
+ *  ############################
+ */
+static const size_t PADDING_LENGTH = 8;
+
+static const std::string ALEXA_SAYS_HEADING = " Alexa Says ";
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+using namespace avsCommon::utils;
+
+ConsolePrinter::ConsolePrinter() :
+        avsCommon::utils::logger::Logger{avsCommon::utils::logger::Level::UNKNOWN},
+        m_mutex{getCoutMutex()} {
+}
+
+void ConsolePrinter::simplePrint(const std::string& stringToPrint) {
+    auto mutex = getCoutMutex();
+    if (!mutex) {
+        return;
+    }
+
+    std::lock_guard<std::mutex> lock{*mutex};
+    std::cout << stringToPrint << std::endl;
+}
+
+void ConsolePrinter::prettyPrint(std::initializer_list<std::string> lines) {
+    size_t maxLength = 0;
+    for (auto& line : lines) {
+        maxLength = std::max(line.size(), maxLength);
+    }
+
+    const std::string headingBorder(maxLength + (2 * PADDING_LENGTH), '#');
+    std::ostringstream oss;
+    oss << headingBorder << std::endl;
+
+    // Write each line starting and ending with '#'
+    auto padBegin = std::string("#");
+    padBegin.append(PADDING_LENGTH - 1, ' ');
+    for (auto& line : lines) {
+        auto padEnd = std::string("#");
+        padEnd.insert(padEnd.begin(), maxLength - line.size() + (PADDING_LENGTH - 1), ' ');
+        oss << padBegin << line << padEnd << std::endl;
+    }
+
+    oss << headingBorder << std::endl;
+    simplePrint(oss.str());
+}
+
+void ConsolePrinter::captionsPrint(const std::vector<std::string>& lines) {
+    size_t maxLength = 0;
+    for (auto& line : lines) {
+        maxLength = std::max(line.size(), maxLength);
+    }
+
+    // The line length should be even here to allow for alignment of the header string and '#' boundaries
+    if (maxLength % 2 != 0) {
+        maxLength += 1;
+    }
+
+    size_t maxBorderLength = (2 * PADDING_LENGTH) + maxLength;
+    size_t availableLength = (maxBorderLength - ALEXA_SAYS_HEADING.length());
+    size_t headerLength = availableLength / 2 + availableLength % 2;
+
+    const std::string headingBorder(headerLength, '#');
+    std::ostringstream oss;
+    oss << headingBorder << ALEXA_SAYS_HEADING << headingBorder << std::endl;
+
+    // Write each line starting and ending with '#'
+    auto padBegin = std::string("#");
+    padBegin.append(PADDING_LENGTH - 1, ' ');
+    for (auto& line : lines) {
+        auto padEnd = std::string("#");
+        padEnd.insert(padEnd.begin(), maxLength - line.size() + (PADDING_LENGTH - 1), ' ');
+        oss << padBegin << line << padEnd << std::endl;
+    }
+
+    const std::string footingBorder(maxBorderLength, '#');
+    oss << footingBorder << std::endl;
+    simplePrint(oss.str());
+}
+
+void ConsolePrinter::prettyPrint(const std::string& stringToPrint) {
+    prettyPrint({stringToPrint});
+}
+
+void ConsolePrinter::emit(
+    avsCommon::utils::logger::Level level,
+    std::chrono::system_clock::time_point time,
+    const char* threadMoniker,
+    const char* text) {
+    std::lock_guard<std::mutex> lock{*m_mutex};
+    std::cout << m_logFormatter.format(level, time, threadMoniker, text) << std::endl;
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/DownloadMonitor.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/DownloadMonitor.cpp
new file mode 100644
index 0000000000..351fdcab11
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/DownloadMonitor.cpp
@@ -0,0 +1,48 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/DownloadMonitor.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+DownloadMonitor::DownloadMonitor(APLClient::Telemetry::DownloadMetricsEmitterPtr metricsEmitter) :
+        m_metricsEmitter{metricsEmitter} {
+}
+
+void DownloadMonitor::onDownloadStarted() {
+    m_metricsEmitter->onDownloadStarted();
+}
+
+void DownloadMonitor::onDownloadComplete() {
+    m_metricsEmitter->onDownloadComplete();
+}
+
+void DownloadMonitor::onDownloadFailed() {
+    m_metricsEmitter->onDownloadFailed();
+}
+
+void DownloadMonitor::onCacheHit() {
+    m_metricsEmitter->onCacheHit();
+}
+
+void DownloadMonitor::onBytesRead(uint64_t numberOfBytes) {
+    m_metricsEmitter->onBytesRead(numberOfBytes);
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/Extensions/LiveView/AplLiveViewExtension.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/Extensions/LiveView/AplLiveViewExtension.cpp
new file mode 100644
index 0000000000..3fe09a1639
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/Extensions/LiveView/AplLiveViewExtension.cpp
@@ -0,0 +1,246 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <string>
+#include <utility>
+
+#include "IPCServerSampleApp/Extensions/LiveView/AplLiveViewExtension.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace extensions {
+namespace liveView {
+
+static const char TAG[] = "AplLiveViewExtension";
+
+/// String to identify log entries originating from this file.
+static const std::string SETTING_CAMERA_STATE_NAME = "cameraStateName";
+static const std::string COMMAND_EXIT_CAMERA = "ExitCamera";
+static const std::string COMMAND_CHANGE_CAMERA_MIC_STATE = "ChangeCameraMicState";
+static const std::string EVENTHANDLER_ON_CAMERA_STATE_CHANGED_NAME = "OnCameraStateChanged";
+static const std::string EVENTHANDLER_ON_CAMERA_MIC_STATE_CHANGED_NAME = "OnCameraMicStateChanged";
+static const std::string EVENTHANDLER_ON_CAMERA_FIRST_FRAME_RENDERED_NAME = "OnCameraFirstFrameRendered";
+static const std::string EVENTHANDLER_ON_CAMERA_CLEARED_NAME = "OnCameraCleared";
+static const std::string EVENTHANDLER_ON_ASR_PROFILE_CHANGED_NAME = "OnASRProfileChanged";
+
+static const std::string PROPERTY_CAMERA_MIC_STATE = "micOn";
+static const std::string PROPERTY_CAMERA_STATE = "cameraState";
+static const std::string PROPERTY_CAMERA_FIRST_FRAME_RENDERED = "firstFrameRendered";
+static const std::string PROPERTY_ASR_PROFILE = "asrProfile";
+
+/// List of accepted live view camera states.
+static const std::vector<std::string> CAMERA_STATES = {"CONNECTING", "CONNECTED", "DISCONNECTED", "ERROR", "UNKNOWN"};
+
+/// List of accepted device asr profiles.
+/// https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/audio-hardware-configurations.html
+static const std::vector<std::string> ASR_PROFILES = {"CLOSE_TALK", "NEAR_FIELD", "FAR_FIELD"};
+
+AplLiveViewExtension::AplLiveViewExtension(std::shared_ptr<AplLiveViewExtensionObserverInterface> observer) :
+        m_observer{std::move(observer)} {
+    m_cameraState = apl::LiveMap::create();
+    m_cameraState->set(PROPERTY_CAMERA_STATE, "DISCONNECTED");
+    m_cameraState->set(PROPERTY_CAMERA_MIC_STATE, false);
+    m_cameraState->set(PROPERTY_ASR_PROFILE, "NEAR_FIELD");
+    m_cameraState->set(PROPERTY_CAMERA_FIRST_FRAME_RENDERED, false);
+}
+
+std::string AplLiveViewExtension::getUri() {
+    return URI;
+}
+
+apl::Object AplLiveViewExtension::getEnvironment() {
+    // No environment for LiveView Extension
+    return apl::Object("");
+}
+
+std::list<apl::ExtensionCommandDefinition> AplLiveViewExtension::getCommandDefinitions() {
+    std::list<apl::ExtensionCommandDefinition> extCmdDefs(
+        {apl::ExtensionCommandDefinition(URI, COMMAND_EXIT_CAMERA).allowFastMode(true),
+         apl::ExtensionCommandDefinition(URI, COMMAND_CHANGE_CAMERA_MIC_STATE)
+             .allowFastMode(true)
+             .property(PROPERTY_CAMERA_MIC_STATE, false, true)});
+    return extCmdDefs;
+}
+
+std::list<apl::ExtensionEventHandler> AplLiveViewExtension::getEventHandlers() {
+    std::list<apl::ExtensionEventHandler> extensionEventHandlers(
+        {apl::ExtensionEventHandler(URI, EVENTHANDLER_ON_CAMERA_STATE_CHANGED_NAME),
+         apl::ExtensionEventHandler(URI, EVENTHANDLER_ON_CAMERA_MIC_STATE_CHANGED_NAME),
+         apl::ExtensionEventHandler(URI, EVENTHANDLER_ON_ASR_PROFILE_CHANGED_NAME),
+         apl::ExtensionEventHandler(URI, EVENTHANDLER_ON_CAMERA_FIRST_FRAME_RENDERED_NAME),
+         apl::ExtensionEventHandler(URI, EVENTHANDLER_ON_CAMERA_CLEARED_NAME)});
+    return extensionEventHandlers;
+}
+
+std::unordered_map<std::string, apl::LiveObjectPtr> AplLiveViewExtension::getLiveDataObjects() {
+    auto liveObjects = std::unordered_map<std::string, apl::LiveObjectPtr>();
+    if (!m_cameraStateName.empty()) {
+        liveObjects.emplace(m_cameraStateName, m_cameraState);
+    }
+    return liveObjects;
+}
+
+void AplLiveViewExtension::applySettings(const apl::Object& settings) {
+    // Reset to defaults
+    m_cameraStateName.clear();
+    /// Apply @c apl::Content defined settings
+    logMessage(apl::LogLevel::kInfo, TAG, __func__, settings.toDebugString());
+    if (settings.isMap()) {
+        if (settings.has(SETTING_CAMERA_STATE_NAME)) {
+            m_cameraStateName = settings.get(SETTING_CAMERA_STATE_NAME).getString();
+        }
+    }
+}
+
+void AplLiveViewExtension::onExtensionEvent(
+    const std::string& uri,
+    const std::string& name,
+    const apl::Object& source,
+    const apl::Object& params,
+    unsigned int event,
+    std::shared_ptr<AplCoreExtensionEventCallbackResultInterface> resultCallback = nullptr) {
+    auto eventDebugString = getEventDebugString(uri, name, params);
+    logMessage(LOGLEVEL_DEBUG, TAG, __func__, eventDebugString);
+
+    bool succeeded = true;
+
+    if (m_observer) {
+        if (COMMAND_EXIT_CAMERA == name) {
+            m_observer->handleCameraExitRequest();
+        } else if (COMMAND_CHANGE_CAMERA_MIC_STATE == name) {
+            if (confirmEventParams(TAG, {PROPERTY_CAMERA_MIC_STATE}, params)) {
+                bool micOn = params.get(PROPERTY_CAMERA_MIC_STATE).getBoolean();
+                m_cameraState->set(PROPERTY_CAMERA_MIC_STATE, micOn);
+                m_observer->handleChangeCameraMicStateRequest(micOn);
+            } else {
+                succeeded = false;
+            }
+        } else {
+            logMessage(apl::LogLevel::kError, TAG, __func__, "Invalid Command: " + eventDebugString);
+            succeeded = false;
+        }
+    } else {
+        logMessage(apl::LogLevel::kError, TAG, __func__, "No Event Observer: " + eventDebugString);
+        succeeded = false;
+    }
+
+    if (resultCallback) {
+        resultCallback->onExtensionEventResult(event, succeeded);
+    }
+}
+
+void AplLiveViewExtension::setCameraState(const std::string& cameraState) {
+    if (m_cameraState->get(PROPERTY_CAMERA_STATE).getString() == cameraState) {
+        logMessage(apl::LogLevel::kWarn, TAG, __func__, "Camera State Unchanged");
+        return;
+    }
+
+    if (std::find(CAMERA_STATES.begin(), CAMERA_STATES.end(), cameraState) == CAMERA_STATES.end()) {
+        logMessage(apl::LogLevel::kError, TAG, __func__, "Invalid Camera State: " + cameraState);
+        return;
+    }
+
+    // If cameraState changes to anything but CONNECTED, always reset first frame rendered
+    if (cameraState != "CONNECTED") {
+        m_cameraState->set(PROPERTY_CAMERA_FIRST_FRAME_RENDERED, false);
+    }
+
+    m_cameraState->set(PROPERTY_CAMERA_STATE, cameraState);
+
+    if (!m_eventHandler) {
+        logMessage(apl::LogLevel::kWarn, TAG, __func__, "No Event Handler");
+        return;
+    }
+
+    auto cameraStateObj = apl::ObjectMap({{PROPERTY_CAMERA_STATE, cameraState}});
+
+    m_eventHandler->invokeExtensionEventHandler(URI, EVENTHANDLER_ON_CAMERA_STATE_CHANGED_NAME, cameraStateObj, false);
+}
+
+void AplLiveViewExtension::setCameraMicrophoneState(bool micOn) {
+    if (m_cameraState->get(PROPERTY_CAMERA_MIC_STATE).getBoolean() == micOn) {
+        logMessage(apl::LogLevel::kWarn, TAG, __func__, "Mic State Unchanged");
+        return;
+    }
+    m_cameraState->set(PROPERTY_CAMERA_MIC_STATE, micOn);
+
+    if (!m_eventHandler) {
+        logMessage(apl::LogLevel::kWarn, TAG, __func__, "No Event Handler");
+        return;
+    }
+
+    auto cameraMicState = apl::ObjectMap({{PROPERTY_CAMERA_MIC_STATE, micOn}});
+
+    m_eventHandler->invokeExtensionEventHandler(
+        URI, EVENTHANDLER_ON_CAMERA_MIC_STATE_CHANGED_NAME, cameraMicState, false);
+}
+
+void AplLiveViewExtension::setAsrProfile(const std::string& asrProfile) {
+    if (m_cameraState->get(PROPERTY_ASR_PROFILE).getString() == asrProfile) {
+        logMessage(apl::LogLevel::kWarn, TAG, __func__, "ASR Profile Unchanged");
+        return;
+    }
+
+    if (std::find(ASR_PROFILES.begin(), ASR_PROFILES.end(), asrProfile) == ASR_PROFILES.end()) {
+        logMessage(apl::LogLevel::kError, TAG, __func__, "Invalid ASR Profile: " + asrProfile);
+        return;
+    }
+
+    m_cameraState->set(PROPERTY_ASR_PROFILE, asrProfile);
+
+    if (!m_eventHandler) {
+        logMessage(apl::LogLevel::kWarn, TAG, __func__, "No Event Handler");
+        return;
+    }
+
+    auto asrProfileObj = apl::ObjectMap({{PROPERTY_ASR_PROFILE, asrProfile}});
+
+    m_eventHandler->invokeExtensionEventHandler(URI, EVENTHANDLER_ON_ASR_PROFILE_CHANGED_NAME, asrProfileObj, false);
+}
+
+void AplLiveViewExtension::onCameraFirstFrameRendered() {
+    if (m_cameraState->get(PROPERTY_CAMERA_FIRST_FRAME_RENDERED).getBoolean()) {
+        logMessage(apl::LogLevel::kWarn, TAG, __func__, "First Frame already rendered");
+        return;
+    }
+
+    m_cameraState->set(PROPERTY_CAMERA_FIRST_FRAME_RENDERED, true);
+
+    if (!m_eventHandler) {
+        logMessage(apl::LogLevel::kWarn, TAG, __func__, "No Event Handler");
+        return;
+    }
+
+    m_eventHandler->invokeExtensionEventHandler(
+        URI, EVENTHANDLER_ON_CAMERA_FIRST_FRAME_RENDERED_NAME, apl::ObjectMap({}), false);
+}
+
+void AplLiveViewExtension::onCameraCleared() {
+    m_cameraState->set(PROPERTY_CAMERA_FIRST_FRAME_RENDERED, false);
+
+    if (!m_eventHandler) {
+        logMessage(apl::LogLevel::kWarn, TAG, __func__, "No Event Handler");
+        return;
+    }
+
+    m_eventHandler->invokeExtensionEventHandler(URI, EVENTHANDLER_ON_CAMERA_CLEARED_NAME, apl::ObjectMap({}), false);
+}
+
+}  // namespace liveView
+}  // namespace extensions
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/ExternalCapabilitiesBuilder.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/ExternalCapabilitiesBuilder.cpp
new file mode 100644
index 0000000000..c7256172ac
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/ExternalCapabilitiesBuilder.cpp
@@ -0,0 +1,197 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/ExternalCapabilitiesBuilder.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#ifdef ENABLE_COMMS
+#include <AVSCommon/SDKInterfaces/CallManagerInterface.h>
+#include <CallManager/CallManager.h>
+#include <CallManager/SipUserAgent.h>
+#endif
+
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+#include <CallManager/CallAudioDeviceProxy.h>
+#endif
+
+#ifdef ENABLE_COMMS
+#define COMMS_NAMESPACE "com.amazon.avs-comms-adapter"
+#endif
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/// String to identify log entries originating from this file.
+static const std::string TAG("ExternalCapabilitiesBuilder");
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+ExternalCapabilitiesBuilder::ExternalCapabilitiesBuilder(std::shared_ptr<avsCommon::utils::DeviceInfo> deviceInfo) :
+        m_deviceInfo{deviceInfo} {
+    ACSDK_DEBUG5(LX(__func__));
+}
+
+ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withSettingsStorage(
+    std::shared_ptr<settings::storage ::DeviceSettingStorageInterface> settingStorage) {
+    // ExternalCapabilitiesBuilder doesn't need the settingStorage to build any object.
+    return *this;
+}
+
+ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withTemplateRunTime(
+    std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeInterface> templateRuntime) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_templateRuntime = std::move(templateRuntime);
+    return *this;
+}
+
+std::shared_ptr<avsCommon::sdkInterfaces::CallManagerInterface> ExternalCapabilitiesBuilder::getCallManager() {
+#ifdef ENABLE_COMMS
+    return m_callManager;
+#else
+    return nullptr;
+#endif
+}
+
+ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withInternetConnectionMonitor(
+    std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface> internetConnectionMonitor) {
+    // ExternalCapabilitiesBuilder doesn't need the internetConnectionMonitor to build any object.
+    return *this;
+}
+
+ExternalCapabilitiesBuilder& ExternalCapabilitiesBuilder::withDialogUXStateAggregator(
+    std::shared_ptr<avsCommon::avs::DialogUXStateAggregator> dialogUXStateAggregator) {
+    m_dialogUXStateAggregator = std::move(dialogUXStateAggregator);
+    return *this;
+}
+
+std::pair<
+    std::list<ExternalCapabilitiesBuilder::Capability>,
+    std::list<std::shared_ptr<avsCommon::utils::RequiresShutdown>>>
+ExternalCapabilitiesBuilder::buildCapabilities(
+    std::shared_ptr<acsdkExternalMediaPlayer::ExternalMediaPlayer> externalMediaPlayer,
+    std::shared_ptr<avsCommon::sdkInterfaces::AVSConnectionManagerInterface> connectionManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+    std::shared_ptr<certifiedSender::CertifiedSender> certifiedSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> audioFocusManager,
+    std::shared_ptr<registrationManager::CustomerDataManagerInterface> dataManager,
+    std::shared_ptr<capabilityAgents::system::ReportStateHandler> stateReportHandler,
+    std::shared_ptr<capabilityAgents::aip::AudioInputProcessor> audioInputProcessor,
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface> speakerManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::DirectiveSequencerInterface> directiveSequencer,
+    std::shared_ptr<avsCommon::sdkInterfaces::UserInactivityMonitorInterface> userInactivityMonitor,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::AVSGatewayManagerInterface> avsGatewayManager,
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> ringtoneMediaPlayer,
+    std::shared_ptr<avsCommon::sdkInterfaces::audio::AudioFactoryInterface> audioFactory,
+    std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> ringtoneChannelVolumeInterface,
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> commsMediaPlayer,
+    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> commsSpeaker,
+    std::shared_ptr<avsCommon::avs::AudioInputStream> sharedDataStream,
+#endif
+    std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface> powerResourceManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::ComponentReporterInterface> softwareComponentReporter,
+    std::shared_ptr<avsCommon::sdkInterfaces::PlaybackRouterInterface> playbackRouter,
+    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>
+        endpointRegistrationManager,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) {
+    ACSDK_DEBUG5(LX(__func__));
+    std::pair<
+        std::list<ExternalCapabilitiesBuilder::Capability>,
+        std::list<std::shared_ptr<avsCommon::utils::RequiresShutdown>>>
+        retValue;
+    std::list<Capability> capabilities;
+    std::list<std::shared_ptr<avsCommon::utils::RequiresShutdown>> requireShutdownObjects;
+
+#ifdef ENABLE_COMMS
+    if (!ringtoneMediaPlayer) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "nullRingtoneMediaPlayer"));
+        return retValue;
+    }
+
+    auto sipUserAgent = std::make_shared<capabilityAgents::callManager::SipUserAgent>();
+    std::string avsGatewayURL = avsGatewayManager->getGatewayURL();
+
+    if (!capabilityAgents::callManager::CallManager::create(
+            sipUserAgent,
+            ringtoneMediaPlayer,
+            messageSender,
+            contextManager,
+            audioFocusManager,
+            exceptionSender,
+            audioFactory->communications(),
+            avsGatewayURL,
+            speakerManager,
+            ringtoneChannelVolumeInterface)) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "unableToCreateCallManager"));
+        return retValue;
+    }
+
+    auto callManager = capabilityAgents::callManager::CallManager::getInstance();
+
+    m_callManager = callManager;
+
+    const std::string commsVersion = capabilityAgents::callManager::CallManager::getCommsAdapterVersion();
+    std::shared_ptr<avsCommon::avs::ComponentConfiguration> commsConfig =
+        avsCommon::avs::ComponentConfiguration::createComponentConfiguration(COMMS_NAMESPACE, commsVersion);
+    softwareComponentReporter->addConfiguration(commsConfig);
+    m_dialogUXStateAggregator->addObserver(callManager);
+    connectionManager->addConnectionStatusObserver(callManager);
+    avsGatewayManager->addObserver(m_callManager);
+
+    Capability callManagerCapability;
+    auto callManagerConfigurations = callManager->getCapabilityConfigurations();
+    callManagerCapability.directiveHandler = std::move(callManager);
+    for (auto& configurationPtr : callManagerConfigurations) {
+        callManagerCapability.configuration = *configurationPtr;
+        capabilities.push_back(callManagerCapability);
+    }
+    requireShutdownObjects.push_back(m_callManager);
+
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+    auto acquireAudioInputStream = [sharedDataStream]() -> std::shared_ptr<avsCommon::avs::AudioInputStream> {
+        return sharedDataStream;
+    };
+    auto relinquishAudioInputStream = [](std::shared_ptr<avsCommon::avs::AudioInputStream> stream) {
+        // Nothing to release
+    };
+    auto callAudioDeviceProxy = capabilityAgents::callManager::CallAudioDeviceProxy::create(
+        commsMediaPlayer, commsSpeaker, acquireAudioInputStream, relinquishAudioInputStream);
+    m_callManager->addObserver(callAudioDeviceProxy);
+#endif
+#endif
+
+    retValue.first.swap(capabilities);
+    retValue.second.swap(requireShutdownObjects);
+
+    return retValue;
+}
+defaultClient::ExternalCapabilitiesBuilderInterface& ExternalCapabilitiesBuilder::withAlexaInterfaceMessageSender(
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>
+        alexaMessageSender) {
+    return *this;
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUI/GUIActivityEventNotifier.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUI/GUIActivityEventNotifier.cpp
new file mode 100644
index 0000000000..e6d7482b97
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUI/GUIActivityEventNotifier.cpp
@@ -0,0 +1,48 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <memory>
+#include <string>
+
+#include <AVSCommon/SDKInterfaces/GUIActivityEventObserverInterface.h>
+
+#include "IPCServerSampleApp/GUI/GUIActivityEventNotifier.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+
+std::shared_ptr<gui::GUIActivityEventNotifier> GUIActivityEventNotifier::create() {
+    auto activityEventNotifier = std::shared_ptr<GUIActivityEventNotifier>(new GUIActivityEventNotifier());
+    return activityEventNotifier;
+}
+
+GUIActivityEventNotifier::GUIActivityEventNotifier() {
+}
+
+void GUIActivityEventNotifier::notifyObserversOfGUIActivityEvent(
+    const std::string& source,
+    const avsCommon::sdkInterfaces::GUIActivityEvent& activityEvent) {
+    notifyObservers(
+        [source, activityEvent](std::shared_ptr<avsCommon::sdkInterfaces::GUIActivityEventObserverInterface> observer) {
+            observer->onGUIActivityEventReceived(source, activityEvent);
+        });
+}
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUI/GUIClient.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUI/GUIClient.cpp
new file mode 100644
index 0000000000..cc3d5524c6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUI/GUIClient.cpp
@@ -0,0 +1,1055 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <utility>
+#include <vector>
+#include <algorithm>
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Timing/Timer.h>
+
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationSession.h>
+
+#include "IPCServerSampleApp/GUI/GUIClient.h"
+#include "IPCServerSampleApp/IPC/Namespaces/AlexaCaptionsNamespace.h"
+#ifdef ENABLE_COMMS
+#include "IPCServerSampleApp/IPC/Namespaces/CommunicationsNamespace.h"
+#endif
+#ifdef ENABLE_RTCSC
+#include "IPCServerSampleApp/IPC/Namespaces/LiveViewCameraNamespace.h"
+#endif
+#include "IPCServerSampleApp/IPC/Namespaces/TemplateRuntimeNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+
+static const std::string TAG{"GUIClient"};
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// The message name for answering a call.
+static const std::string NAME_ACCEPT_CALL("acceptCall");
+
+/// The message name for hanging up a call.
+static const std::string NAME_STOP_CALL("stopCall");
+
+/// The message name for enabling local video during a call.
+static const std::string NAME_ENABLE_LOCAL_VIDEO("enableLocalVideo");
+
+/// The message name for disabling local video during a call.
+static const std::string NAME_DISABLE_LOCAL_VIDEO("disableLocalVideo");
+
+/// The message name for sending DTMF keys during a PSTN call.
+static const std::string NAME_SEND_DTMF("sendDtmf");
+
+/// The token json key in the message.
+static const std::string TOKEN_TAG("token");
+
+/// The enabled json key in the message.
+static const std::string ENABLED_TAG("enabled");
+
+/// The DTMF tone json key in the message.
+static const std::string DTMF_TONE_TAG("dtmfTone");
+
+/// One second Autorelease timeout
+static const std::chrono::seconds AUTORELEASE_DURATION{1};
+
+/// Identifier for the presentation object sent in an APL directive
+static const std::string PRESENTATION_TOKEN = "presentationToken";
+
+/// Invalid window id runtime error errors key
+static const std::string ERRORS_KEY{"errors"};
+
+/// Invalid window id runtime error type key
+static const std::string TYPE_KEY{"type"};
+
+/// Invalid window id runtime error reason key
+static const std::string REASON_KEY{"reason"};
+
+/// Invalid window id runtime error list id key
+static const std::string LIST_ID_KEY{"listId"};
+
+/// Invalid window id runtime error message key
+static const std::string MESSAGE_KEY{"message"};
+
+/// The apl renderer instances json key in the message
+static const std::string APL_RENDERER_INSTANCES_TAG{"rendererInstances"};
+
+/// The window id json key in the message.
+static const std::string WINDOW_ID_TAG{"windowId"};
+
+/// The json key for the supported extension from window configuration.
+static const std::string SUPPORTED_EXTN_KEY{"supportedExtensions"};
+
+/// The payload json key in the message.
+static const std::string PAYLOAD_TAG{"payload"};
+
+/// Invalid window id runtime error reason
+static const std::string INVALID_OPERATION{"INVALID_OPERATION"};
+
+/// Invalid window id runtime error reason
+static const std::string INVALID_WINDOW_ID{"Invalid window id"};
+
+#ifdef ENABLE_COMMS
+/// Mapping of DTMF enum to characters for Comms dial tones
+static const std::map<std::string, avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone>
+    DTMF_TONE_STRING_TO_ENUM_MAP = {
+        {"0", avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone::DTMF_ZERO},
+        {"1", avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone::DTMF_ONE},
+        {"2", avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone::DTMF_TWO},
+        {"3", avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone::DTMF_THREE},
+        {"4", avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone::DTMF_FOUR},
+        {"5", avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone::DTMF_FIVE},
+        {"6", avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone::DTMF_SIX},
+        {"7", avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone::DTMF_SEVEN},
+        {"8", avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone::DTMF_EIGHT},
+        {"9", avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone::DTMF_NINE},
+        {"*", avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone::DTMF_STAR},
+        {"#", avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone::DTMF_POUND},
+};
+#endif
+
+using namespace avsCommon::utils::json;
+using namespace avsCommon::utils::timing;
+using namespace avsCommon::sdkInterfaces::storage;
+
+std::shared_ptr<GUIClient> GUIClient::create(
+    std::shared_ptr<MessagingServerInterface> serverImplementation,
+    const std::shared_ptr<registrationManager::CustomerDataManagerInterface> customerDataManager,
+    const std::shared_ptr<ipc::IPCVersionManager> ipcVersionManager,
+    std::shared_ptr<avsCommon::utils::DeviceInfo> deviceInfo) {
+    if (!serverImplementation) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullServerImplementation"));
+        return nullptr;
+    }
+
+    if (!customerDataManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullCustomerDataManager"));
+        return nullptr;
+    }
+
+    if (!ipcVersionManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIPCVersionManager"));
+        return nullptr;
+    }
+
+    return std::shared_ptr<GUIClient>(
+        new GUIClient(serverImplementation, customerDataManager, ipcVersionManager, deviceInfo));
+}
+
+GUIClient::GUIClient(
+    std::shared_ptr<MessagingServerInterface> serverImplementation,
+    const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager,
+    std::shared_ptr<ipc::IPCVersionManager> ipcVersionManager,
+    std::shared_ptr<avsCommon::utils::DeviceInfo> deviceInfo) :
+        RequiresShutdown{TAG},
+        CustomerDataHandler{customerDataManager},
+        m_serverImplementation{std::move(serverImplementation)},
+        m_hasServerStarted{false},
+        m_initMessageReceived{false},
+        m_errorState{false},
+        m_shouldRestart{false},
+        m_ipcVersionManager{std::move(ipcVersionManager)},
+        m_limitedInteraction{false},
+        m_ipcAPLAgent{nullptr},
+        m_deviceInfo{deviceInfo} {
+    m_messageHandlers.emplace(
+        NAME_ACCEPT_CALL, [this](rapidjson::Document& payload) { executeHandleAcceptCall(payload); });
+    m_messageHandlers.emplace(NAME_STOP_CALL, [this](rapidjson::Document& payload) { executeHandleStopCall(payload); });
+
+    m_messageHandlers.emplace(
+        NAME_ENABLE_LOCAL_VIDEO, [this](rapidjson::Document& payload) { executeHandleEnableLocalVideo(payload); });
+    m_messageHandlers.emplace(
+        NAME_DISABLE_LOCAL_VIDEO, [this](rapidjson::Document& payload) { executeHandleDisableLocalVideo(payload); });
+
+#ifdef ENABLE_COMMS
+    m_messageHandlers.emplace(NAME_SEND_DTMF, [this](rapidjson::Document& payload) { executeHandleSendDtmf(payload); });
+#endif
+
+    registerNamespaces();
+}
+
+void GUIClient::doShutdown() {
+    ACSDK_DEBUG3(LX(__func__));
+    stop();
+    m_executor.shutdown();
+    m_guiManager.reset();
+    m_aplClientBridge.reset();
+    m_messageListener.reset();
+    m_observer.reset();
+    m_serverImplementation.reset();
+
+    std::lock_guard<std::mutex> lock{m_mapMutex};
+    m_focusObservers.clear();
+}
+
+void GUIClient::setGUIManager(std::shared_ptr<gui::GUIServerInterface> guiManager) {
+    ACSDK_DEBUG3(LX(__func__));
+    m_executor.submit([this, guiManager]() {
+        if (!m_aplClientBridge) {
+            ACSDK_ERROR(LX("setGUIManagerFailed").d("reason", "nullAplRenderer"));
+            return;
+        }
+        m_guiManager = guiManager;
+        m_aplClientBridge->setGUIManager(guiManager);
+    });
+}
+
+void GUIClient::registerNamespaces() {
+    m_ipcVersionManager->registerNamespaceVersionEntry(
+        ipc::IPCNamespaces::IPC_MSG_NAMESPACE_INTERACTION_MANAGER,
+        ipc::IPCNamespaces::IPC_MSG_VERSION_INTERACTION_MANAGER);
+    m_ipcVersionManager->registerNamespaceVersionEntry(
+        ipc::IPCNamespaces::IPC_MSG_NAMESPACE_APL, ipc::IPCNamespaces::IPC_MSG_VERSION_APL);
+    m_ipcVersionManager->registerNamespaceVersionEntry(
+        ipc::IPCNamespaces::IPC_MSG_NAMESPACE_SYSTEM, ipc::IPCNamespaces::IPC_MSG_VERSION_SYSTEM);
+    m_ipcVersionManager->registerNamespaceVersionEntry(
+        ipc::IPCNamespaces::IPC_MSG_NAMESPACE_AUDIO_FOCUS_MANAGER,
+        ipc::IPCNamespaces::IPC_MSG_VERSION_AUDIO_FOCUS_MANAGER);
+    m_ipcVersionManager->registerNamespaceVersionEntry(
+        ipc::IPCNamespaces::IPC_MSG_NAMESPACE_LOGGER, ipc::IPCNamespaces::IPC_MSG_VERSION_LOGGER);
+    m_ipcVersionManager->registerNamespaceVersionEntry(
+        ipc::IPCNamespaces::IPC_MSG_NAMESPACE_SESSION_SETUP, ipc::IPCNamespaces::IPC_MSG_VERSION_SESSION_SETUP);
+    m_ipcVersionManager->registerNamespaceVersionEntry(
+        ipc::IPCNamespaces::IPC_MSG_NAMESPACE_DO_NOT_DISTURB, ipc::IPCNamespaces::IPC_MSG_VERSION_DO_NOT_DISTURB);
+    m_ipcVersionManager->registerNamespaceVersionEntry(
+        ipc::IPCNamespaces::IPC_MSG_NAMESPACE_TEMPLATE_RUNTIME, ipc::IPCNamespaces::IPC_MSG_VERSION_TEMPLATE_RUNTIME);
+    m_ipcVersionManager->registerNamespaceVersionEntry(
+        ipc::IPCNamespaces::IPC_MSG_NAMESPACE_WINDOW_MANAGER, ipc::IPCNamespaces::IPC_MSG_VERSION_WINDOW_MANAGER);
+    m_ipcVersionManager->registerNamespaceVersionEntry(
+        ipc::IPCNamespaces::IPC_MSG_NAMESPACE_CAPTIONS, ipc::IPCNamespaces::IPC_MSG_VERSION_CAPTIONS);
+#ifdef ENABLE_RTCSC
+    m_ipcVersionManager->registerNamespaceVersionEntry(
+        ipc::IPCNamespaces::IPC_MSG_NAMESPACE_LIVE_VIEW_CAMERA, ipc::IPCNamespaces::IPC_MSG_VERSION_LIVE_VIEW_CAMERA);
+#endif
+#ifdef ENABLE_COMMS
+    m_ipcVersionManager->registerNamespaceVersionEntry(
+        IPC_MSG_NAMESPACE_COMMUNICATIONS, IPC_MSG_VERSION_COMMUNICATIONS);
+#endif
+}
+
+void GUIClient::setAplClientBridge(std::shared_ptr<AplClientBridge> aplClientBridge, bool aplVersionChanged) {
+    ACSDK_DEBUG3(LX(__func__));
+    m_executor.submit([this, aplClientBridge, aplVersionChanged]() {
+        m_aplClientBridge = aplClientBridge;
+        if (aplVersionChanged) {
+            m_shouldRestart = true;
+        }
+    });
+}
+
+bool GUIClient::acquireFocus(
+    std::string avsInterface,
+    std::string channelName,
+    avsCommon::avs::ContentType contentType,
+    std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) {
+    ACSDK_DEBUG5(LX(__func__));
+
+    return m_executor
+        .submit([this, avsInterface, channelName, contentType, channelObserver]() {
+            return executeAcquireFocus(avsInterface, channelName, contentType, channelObserver);
+        })
+        .get();
+}
+
+bool GUIClient::releaseFocus(
+    std::string avsInterface,
+    std::string channelName,
+    std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_executor
+        .submit([this, avsInterface, channelName, channelObserver]() {
+            return executeReleaseFocus(avsInterface, channelName, channelObserver);
+        })
+        .get();
+}
+
+#ifdef ENABLE_COMMS
+void GUIClient::sendCallStateInfo(
+    const avsCommon::sdkInterfaces::CallStateObserverInterface::CallStateInfo& callStateInfo) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor.submit([this, callStateInfo]() { executeSendCallStateInfo(callStateInfo); });
+}
+#endif
+
+bool GUIClient::executeAcquireFocus(
+    std::string avsInterface,
+    std::string channelName,
+    avsCommon::avs::ContentType contentType,
+    std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) {
+    return m_guiManager->handleFocusAcquireRequest(avsInterface, channelName, contentType, channelObserver);
+}
+
+bool GUIClient::executeReleaseFocus(
+    std::string avsInterface,
+    std::string channelName,
+    std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) {
+    return m_guiManager->handleFocusReleaseRequest(avsInterface, channelName, channelObserver);
+}
+
+bool GUIClient::isReady() {
+    return m_hasServerStarted && m_initMessageReceived && !m_errorState;
+}
+
+void GUIClient::setMessageListener(std::shared_ptr<MessageListenerInterface> messageListener) {
+    m_executor.submit([this, messageListener]() {
+        std::lock_guard<std::mutex> lock(m_mutex);
+        m_messageListener = messageListener;
+    });
+}
+
+bool GUIClient::start() {
+    m_executor.submit([this]() {
+        // start the server asynchronously.
+        m_serverThread = std::thread(&GUIClient::serverThread, this);
+    });
+
+    return true;
+};
+
+void GUIClient::serverThread() {
+    ACSDK_DEBUG3(LX("serverThread"));
+    if (m_serverImplementation) {
+        m_serverImplementation->setMessageListener(shared_from_this());
+        m_serverImplementation->setObserver(shared_from_this());
+
+        m_hasServerStarted = true;
+
+        if (!m_serverImplementation->start()) {
+            m_hasServerStarted = false;
+            m_errorState = true;
+            ACSDK_ERROR(LX("serverThreadFailed").d("reason", "start failed"));
+            return;
+        }
+    } else {
+        ACSDK_ERROR(LX("serverThreadFailed").d("reason", "noServerImplementation"));
+    }
+}
+
+void GUIClient::stop() {
+    ACSDK_DEBUG3(LX(__func__));
+    m_executor.submit([this]() {
+        if (m_hasServerStarted) {
+            m_serverImplementation->stop();
+        }
+        m_hasServerStarted = m_initMessageReceived = m_errorState = false;
+    });
+    if (m_serverThread.joinable()) {
+        m_serverThread.join();
+    }
+}
+
+void GUIClient::onMessage(const std::string& jsonMessage) {
+    m_executor.submit([this, jsonMessage]() { m_ipcRouter->onMessage(std::move(jsonMessage)); });
+}
+
+void GUIClient::executeHandleAcceptCall(rapidjson::Document& payload) {
+    m_guiManager->acceptCall();
+}
+
+void GUIClient::executeHandleStopCall(rapidjson::Document& payload) {
+    m_guiManager->stopCall();
+}
+
+void GUIClient::executeHandleEnableLocalVideo(rapidjson::Document& payload) {
+    m_guiManager->enableLocalVideo();
+}
+
+void GUIClient::executeHandleDisableLocalVideo(rapidjson::Document& payload) {
+    m_guiManager->disableLocalVideo();
+}
+
+#ifdef ENABLE_COMMS
+void GUIClient::executeHandleSendDtmf(rapidjson::Document& payload) {
+    std::string dtmfString;
+    if (!jsonUtils::retrieveValue(payload, DTMF_TONE_TAG, &dtmfString)) {
+        ACSDK_ERROR(LX("handleSendDtmfRequestFailed").d("reason", "dtmfToneNotFound"));
+        return;
+    }
+    ACSDK_DEBUG3(LX("handleSendDtmfRequest").d(DTMF_TONE_TAG, dtmfString));
+
+    auto dtmfIterator = DTMF_TONE_STRING_TO_ENUM_MAP.find(dtmfString);
+    if (dtmfIterator == DTMF_TONE_STRING_TO_ENUM_MAP.end()) {
+        ACSDK_ERROR(LX("handleSendDtmfRequestFailed").d("unknown dtmfTone", dtmfString));
+        return;
+    }
+    avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone dtmfTone = dtmfIterator->second;
+    m_guiManager->sendDtmf(dtmfTone);
+}
+#endif
+
+void GUIClient::focusAcquireRequest(
+    const GUIToken token,
+    const std::string& avsInterface,
+    const std::string& channelName,
+    avsCommon::avs::ContentType contentType) {
+    bool result = true;
+    std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> focusObserver;
+    {
+        std::lock_guard<std::mutex> lock{m_mapMutex};
+        if (m_focusObservers.count(token) == 0) {
+            m_focusObservers[token] =
+                std::make_shared<ProxyFocusObserver>(avsInterface, token, shared_from_this(), channelName);
+            focusObserver = m_focusObservers[token];
+        } else {
+            result = false;
+        }
+    }
+
+    if (!result) {
+        ACSDK_ERROR(LX("focusAcquireRequestFail").d("token", token).d("reason", "observer already exists"));
+        executeSendFocusResponse(token, false);
+        return;
+    }
+
+    result = executeAcquireFocus(avsInterface, channelName, contentType, focusObserver);
+    if (!result) {
+        ACSDK_ERROR(LX("focusAcquireRequestFail").d("token", token).d("reason", "acquireChannel returned false"));
+        executeSendFocusResponse(token, false);
+        return;
+    }
+
+    executeSendFocusResponse(token, true);
+}
+
+void GUIClient::focusReleaseRequest(
+    const GUIToken token,
+    const std::string& avsInterface,
+    const std::string& channelName) {
+    bool result = true;
+
+    std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> focusObserver;
+    {
+        std::lock_guard<std::mutex> lock{m_mapMutex};
+        auto it = m_focusObservers.find(token);
+        if (it == m_focusObservers.end()) {
+            result = false;
+        } else {
+            focusObserver = it->second;
+        }
+    }
+
+    if (!result || !focusObserver) {
+        ACSDK_ERROR(LX("focusReleaseRequestFail").d("token", token).d("reason", "no observer found"));
+        executeSendFocusResponse(token, false);
+        return;
+    }
+
+    result = executeReleaseFocus(avsInterface, channelName, focusObserver);
+    if (!result) {
+        ACSDK_ERROR(LX("focusReleaseRequestFail").d("token", token).d("reason", "releaseChannel returned false"));
+        executeSendFocusResponse(token, false);
+        return;
+    }
+    executeSendFocusResponse(token, true);
+}
+
+void GUIClient::executeSendFocusResponse(const GUIToken token, const bool result) {
+    m_audioFocusManagerIPCHandler->processChannelResult(token, result);
+}
+
+void GUIClient::handleOnFocusChangedReceivedConfirmation(GUIToken token) {
+    std::lock_guard<std::mutex> lock{m_mapMutex};
+    auto currentAutoReleaseTimer = m_autoReleaseTimers.find(token);
+    if (currentAutoReleaseTimer != m_autoReleaseTimers.end()) {
+        if (!currentAutoReleaseTimer->second) {
+            ACSDK_ERROR(LX("processOnFocusChangedReceivedConfirmationFail")
+                            .d("token", token)
+                            .d("reason", "autoReleaseTimer is null"));
+            return;
+        }
+        currentAutoReleaseTimer->second->stop();
+    }
+}
+
+void GUIClient::handleLocalRenderDocument(rapidjson::Document& payload) {
+    std::string token;
+    if (!jsonUtils::retrieveValue(payload, TOKEN_TAG, &token)) {
+        ACSDK_ERROR(LX("handleLocalRenderDocumentFailed").d("reason", "tokenNotFound"));
+        return;
+    }
+
+    std::string documentPayload;
+    if (!jsonUtils::retrieveValue(payload, PAYLOAD_TAG, &documentPayload)) {
+        ACSDK_ERROR(LX("handleLocalRenderDocumentFailed").d("reason", "payloadNotFound"));
+        return;
+    }
+
+    std::string windowId;
+    if (!jsonUtils::retrieveValue(payload, WINDOW_ID_TAG, &windowId)) {
+        ACSDK_ERROR(LX("handleLocalRenderDocumentFailed").d("reason", "windowIdNotFound"));
+        return;
+    }
+
+    if (!m_ipcAPLAgent) {
+        m_ipcAPLAgent = IPCAPLAgent::create(shared_from_this());
+        m_ipcAPLAgent->setAPLMaxVersion(m_aplRuntimePresentationAdapter->getAPLRuntimeVersion());
+    }
+
+    if (m_aplRuntimePresentationAdapter) {
+        m_aplRuntimePresentationAdapter->renderDocumentWithoutPresentation(
+            documentPayload, token, windowId, std::chrono::steady_clock::now(), TAG, m_ipcAPLAgent);
+    } else {
+        ACSDK_ERROR(LX("handleLocalRenderDocumentFailed").d("reason", "aplRuntimeAdapterForLocalDocumentNotFound"));
+    }
+}
+
+void GUIClient::handleLocalClearDocument(rapidjson::Document& payload) {
+    std::string token;
+    if (!jsonUtils::retrieveValue(payload, TOKEN_TAG, &token)) {
+        ACSDK_ERROR(LX("handleLocalClearDocumentFailed").d("reason", "tokenNotFound"));
+        return;
+    }
+
+    if (m_aplRuntimePresentationAdapter) {
+        m_aplRuntimePresentationAdapter->clearDocument(token);
+    } else {
+        ACSDK_ERROR(LX("handleLocalClearDocumentFailed").d("reason", "aplRuntimeAdapterForLocalDocumentNotFound"));
+    }
+}
+
+void GUIClient::handleLocalExecuteCommands(rapidjson::Document& payload) {
+    std::string token;
+    if (!jsonUtils::retrieveValue(payload, TOKEN_TAG, &token)) {
+        ACSDK_ERROR(LX("handleLocalExecuteCommandsFailed").d("reason", "tokenNotFound"));
+        return;
+    }
+
+    std::string commandsPayload;
+    if (!jsonUtils::retrieveValue(payload, PAYLOAD_TAG, &commandsPayload)) {
+        ACSDK_ERROR(LX("handleLocalExecuteCommandsFailed").d("reason", "payloadNotFound"));
+        return;
+    }
+
+    if (m_aplRuntimePresentationAdapter) {
+        m_aplRuntimePresentationAdapter->onExecuteCommands(commandsPayload, token);
+    } else {
+        ACSDK_ERROR(LX("handleLocalExecuteCommandsFailed").d("reason", "aplRuntimeAdapterForLocalDocumentNotFound"));
+    }
+}
+void GUIClient::handleAplEvent(rapidjson::Document& payload) {
+    if (!m_aplClientBridge) {
+        ACSDK_ERROR(LX("handleAplEventFailed").d("reason", "APL Renderer has not been configured"));
+        return;
+    }
+
+    std::string eventPayload;
+    if (!jsonUtils::retrieveValue(payload, PAYLOAD_TAG, &eventPayload)) {
+        ACSDK_ERROR(LX("handleAplEventFailed").d("reason", "payloadNotFound"));
+        return;
+    }
+
+    std::string windowId;
+    if (!jsonUtils::retrieveValue(payload, WINDOW_ID_TAG, &windowId)) {
+        ACSDK_ERROR(LX("handleAplEventFailed").d("reason", "windowIdNotFound"));
+        return;
+    }
+
+    m_aplClientBridge->onMessage(windowId, eventPayload);
+}
+
+void GUIClient::handleRenderComplete(rapidjson::Document& payload) {
+    std::string windowId;
+    if (!jsonUtils::retrieveValue(payload, WINDOW_ID_TAG, &windowId)) {
+        ACSDK_ERROR(LX("handleRenderComplete").d("reason", "windowIdNotFound"));
+        return;
+    }
+
+    m_aplClientBridge->handleRenderingEvent(windowId, APLClient::AplRenderingEvent::DOCUMENT_RENDERED);
+}
+
+void GUIClient::handleDisplayMetrics(rapidjson::Document& payload) {
+    std::string windowId;
+    std::string jsonPayload;
+
+    if (!jsonUtils::retrieveValue(payload, WINDOW_ID_TAG, &windowId)) {
+        ACSDK_ERROR(LX("handleDisplayMetricsFailed").d("reason", "windowIdNotFound"));
+        return;
+    }
+
+    if (!jsonUtils::convertToValue(payload, &jsonPayload)) {
+        ACSDK_ERROR(LX("handleDisplayMetricsFailed").d("reason", "unableToConvertPayloadToValue"));
+        return;
+    }
+
+    m_aplClientBridge->handleDisplayMetrics(windowId, jsonPayload);
+}
+
+void GUIClient::setObserver(const std::shared_ptr<MessagingServerObserverInterface>& observer) {
+    m_executor.submit([this, observer]() { m_observer = observer; });
+}
+
+void GUIClient::onConnectionOpened() {
+    ACSDK_DEBUG3(LX("onConnectionOpened"));
+    m_executor.submit([this]() {
+        if (!m_initThread.joinable()) {
+            m_initThread = std::thread(&GUIClient::sendInitRequestAndWait, this);
+        } else {
+            ACSDK_INFO(LX("onConnectionOpened").m("init thread is not avilable"));
+        }
+
+        if (m_observer) {
+            m_observer->onConnectionOpened();
+        }
+        m_guiManager->handleOnMessagingServerConnectionOpened();
+    });
+}
+
+void GUIClient::onConnectionClosed() {
+    ACSDK_DEBUG3(LX("onConnectionClosed"));
+    m_executor.submit([this]() {
+        if (!m_serverImplementation->isReady()) {
+            m_initMessageReceived = false;
+        }
+
+        if (m_initThread.joinable()) {
+            m_initThread.join();
+        }
+
+        if (m_observer) {
+            m_observer->onConnectionClosed();
+        }
+        m_aplClientBridge->onConnectionClosed();
+    });
+}
+
+void GUIClient::clearData() {
+    ACSDK_DEBUG5(LX(__func__));
+}
+
+void GUIClient::onLogout() {
+    m_shouldRestart = true;
+    m_cond.notify_all();
+}
+
+SampleAppReturnCode GUIClient::run() {
+    ACSDK_DEBUG3(LX("run"));
+    std::unique_lock<std::mutex> lock(m_mutex);
+    m_cond.wait(lock, [this] { return m_shouldRestart || m_errorState; });
+    ACSDK_DEBUG3(LX("runExits").d("reason", m_shouldRestart ? "loggedout" : "not initialized"));
+    return m_shouldRestart ? SampleAppReturnCode::RESTART
+                           : (m_errorState ? SampleAppReturnCode::ERROR : SampleAppReturnCode::OK);
+}
+
+void GUIClient::sendInitRequestAndWait() {
+    // Wait for server to be ready
+    ACSDK_DEBUG9(LX("sendInitRequestAndWait").m("waiting for server to be ready"));
+    while (!m_serverImplementation->isReady()) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    }
+
+    // Send init request message.
+    m_guiManager->initClient();
+
+    // Wait for response
+    std::unique_lock<std::mutex> lock(m_mutex);
+    ACSDK_DEBUG3(LX("start").m("waiting for InitResponse"));
+    m_cond.wait(lock, [this] {
+        ACSDK_DEBUG9(LX("sendInitRequestAndWait")
+                         .d("errorState", m_errorState)
+                         .d("initMessage received", m_initMessageReceived));
+        return m_errorState || m_initMessageReceived;
+    });
+
+    ACSDK_DEBUG3(LX("start").m("InitResponse received"));
+    m_aplClientBridge->onConnectionOpened();
+}
+
+#ifdef ENABLE_COMMS
+void GUIClient::executeSendCallStateInfo(
+    const avsCommon::sdkInterfaces::CallStateObserverInterface::CallStateInfo& callStateInfo) {
+    auto message = messages::CallStateChangeMessage(callStateInfo);
+    sendMessage(message);
+}
+#endif
+
+bool GUIClient::finalizeClientInitialization(bool errorState) {
+    m_errorState = errorState;
+    m_initMessageReceived = true;
+
+    m_cond.notify_all();
+    if (m_initThread.joinable()) {
+        m_initThread.join();
+    }
+
+    return true;
+}
+
+void GUIClient::onAuthStateChange(AuthObserverInterface::State newState, AuthObserverInterface::Error newError) {
+    m_limitedInteraction = m_limitedInteraction || (newState == AuthObserverInterface::State::UNRECOVERABLE_ERROR);
+}
+
+void GUIClient::onCapabilitiesStateChange(
+    avsCommon::sdkInterfaces::CapabilitiesObserverInterface::State newState,
+    avsCommon::sdkInterfaces::CapabilitiesObserverInterface::Error newError,
+    const std::vector<avsCommon::sdkInterfaces::endpoints::EndpointIdentifier>& addedOrUpdatedEndpoints,
+    const std::vector<avsCommon::sdkInterfaces::endpoints::EndpointIdentifier>& deletedEndpoints) {
+    m_limitedInteraction = m_limitedInteraction ||
+                           (newState == avsCommon::sdkInterfaces::CapabilitiesObserverInterface::State::FATAL_ERROR);
+}
+
+GUIClient::ProxyFocusObserver::ProxyFocusObserver(
+    std::string avsInterface,
+    const GUIToken token,
+    std::shared_ptr<GUIClient> guiClient,
+    std::string channelName) :
+        m_avsInterface{std::move(avsInterface)},
+        m_token{token},
+        m_focusBridge{std::move(guiClient)},
+        m_channelName{std::move(channelName)} {
+}
+
+void GUIClient::ProxyFocusObserver::onFocusChanged(
+    avsCommon::avs::FocusState newFocus,
+    avsCommon::avs::MixingBehavior behavior) {
+    if (newFocus != avsCommon::avs::FocusState::NONE) {
+        m_focusBridge->startAutoreleaseTimer(m_avsInterface, m_token, m_channelName);
+    }
+    m_focusBridge->sendOnFocusChanged(m_token, newFocus);
+}
+
+void GUIClient::startAutoreleaseTimer(
+    const std::string& avsInterface,
+    const GUIToken token,
+    const std::string& channelName) {
+    std::shared_ptr<avsCommon::utils::timing::Timer> timer = std::make_shared<avsCommon::utils::timing::Timer>();
+    {
+        std::lock_guard<std::mutex> lock{m_mapMutex};
+        m_autoReleaseTimers[token] = timer;
+    }
+
+    timer->start(AUTORELEASE_DURATION, [this, avsInterface, token, channelName] {
+        autoRelease(avsInterface, token, channelName);
+    });
+}
+
+void GUIClient::autoRelease(const std::string& avsInterface, const GUIToken token, const std::string& channelName) {
+    ACSDK_DEBUG5(LX("autoRelease").d("token", token).d("channelName", channelName));
+    m_executor.submit([this, avsInterface, token, channelName]() {
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> focusObserver;
+        std::shared_ptr<avsCommon::utils::timing::Timer> autoReleaseTimer;
+        {
+            std::lock_guard<std::mutex> lock{m_mapMutex};
+            focusObserver = m_focusObservers[token];
+            if (!focusObserver) {
+                ACSDK_CRITICAL(LX("autoReleaseFailed").d("token", token).d("reason", "focusObserver is null"));
+                return;
+            }
+        }
+        m_guiManager->handleFocusReleaseRequest(avsInterface, channelName, focusObserver);
+    });
+}
+
+void GUIClient::sendOnFocusChanged(const GUIToken token, const avsCommon::avs::FocusState state) {
+    m_audioFocusManagerIPCHandler->processFocusChanged(token, state);
+
+    if (state == avsCommon::avs::FocusState::NONE) {
+        // Remove observer and timer when released.
+        std::lock_guard<std::mutex> lock{m_mapMutex};
+        if (m_focusObservers.erase(token) == 0) {
+            ACSDK_WARN(LX("sendOnFocusChanged").d("reason", "tokenNotFoundWhenRemovingObserver").d("token", token));
+        }
+        if (m_autoReleaseTimers.erase(token) == 0) {
+            ACSDK_WARN(
+                LX("sendOnFocusChanged").d("reason", "tokenNotFoundWhenRemovingAutoReleaseTimer").d("token", token));
+        }
+    }
+}
+
+void GUIClient::notifyAuthorizationRequest(const std::string& url, const std::string& code) {
+    m_authUrl = url;
+    m_authCode = code;
+    m_clientId = m_deviceInfo->getClientId();
+    sendCompleteAuthorizationMessage(url, code, m_deviceInfo->getClientId());
+}
+
+void GUIClient::notifyAuthorizationStateChange(avsCommon::sdkInterfaces::AuthObserverInterface::State state) {
+    std::string authState = "UNINITIALIZED";
+    switch (state) {
+        case avsCommon::sdkInterfaces::AuthObserverInterface::State::UNINITIALIZED:
+            authState = "UNINITIALIZED";
+            break;
+        case avsCommon::sdkInterfaces::AuthObserverInterface::State::REFRESHED:
+            authState = "REFRESHED";
+            break;
+        case avsCommon::sdkInterfaces::AuthObserverInterface::State::EXPIRED:
+            authState = "EXPIRED";
+            break;
+        case avsCommon::sdkInterfaces::AuthObserverInterface::State::UNRECOVERABLE_ERROR:
+            authState = "ERROR";
+            break;
+        case avsCommon::sdkInterfaces::AuthObserverInterface::State::AUTHORIZING:
+            authState = "AUTHORIZING";
+            break;
+    }
+
+    m_authState = authState;
+    sendSetAuthorizationStateMessage(authState);
+}
+
+void GUIClient::notifyAlexaState(const std::string& state) {
+    m_alexaState = state;
+    sendSetAlexaStateMessage(state);
+}
+
+void GUIClient::setLocales(const std::string& localeStr) {
+    m_localeStr = localeStr;
+    sendSetLocalesMessage(localeStr);
+}
+
+void GUIClient::sendMessage(messages::MessageInterface& message) {
+    writeMessage(message.get());
+}
+
+void GUIClient::executeSendMessage(messages::MessageInterface& message) {
+    executeWriteMessage(message.get());
+}
+
+void GUIClient::writeMessage(const std::string& payload) {
+    m_executor.submit([this, payload]() { executeWriteMessage(payload); });
+}
+
+void GUIClient::executeWriteMessage(const std::string& payload) {
+    m_serverImplementation->writeMessage(payload);
+}
+
+void GUIClient::handleInitializeAPLRenderers(rapidjson::Document& payload) {
+    if (!m_aplClientBridge) {
+        ACSDK_ERROR(LX("handleInitializeAPLRenderersFailed").d("reason", "null aplClientBridge"));
+        return;
+    }
+
+    if (!payload.IsObject()) {
+        ACSDK_ERROR(LX("handleInitializeAPLRenderersFailed").d("reason", "payload not an object"));
+        return;
+    }
+
+    const auto& rendererInstances = payload[APL_RENDERER_INSTANCES_TAG];
+    if (!rendererInstances.IsArray()) {
+        ACSDK_ERROR(LX("handleInitializeAPLRenderersFailed").d("reason", "window instances not an array"));
+        return;
+    }
+
+    for (auto const& rendererInstance : rendererInstances.GetArray()) {
+        std::string windowId;
+        if (!jsonUtils::retrieveValue(rendererInstance, WINDOW_ID_TAG, &windowId)) {
+            ACSDK_WARN(LX("handleInitializeAPLRenderersFailed").d("reason", "window ID not found"));
+            continue;
+        }
+
+        const auto& supportedExtensionsJson = rendererInstance[SUPPORTED_EXTN_KEY];
+        if (!supportedExtensionsJson.IsArray()) {
+            ACSDK_WARN(LX("handleInitializeAPLRenderersFailed").d("reason", "supportedExtensions is not an array"));
+            continue;
+        }
+        const auto supportedExtensions = jsonUtils::retrieveStringArray<std::set<std::string>>(supportedExtensionsJson);
+
+        ACSDK_DEBUG1(LX(__func__).d("initializingWindow", windowId));
+        m_aplClientBridge->initializeRenderer(windowId, supportedExtensions);
+    }
+}
+
+void GUIClient::reportInvalidWindowIdRuntimeError(const std::string& errorMessage, const std::string& aplToken) {
+    rapidjson::Document runtimeErrorPayloadJson(rapidjson::kObjectType);
+    auto& alloc = runtimeErrorPayloadJson.GetAllocator();
+    rapidjson::Value payload(rapidjson::kObjectType);
+    rapidjson::Value errors(rapidjson::kArrayType);
+    payload.AddMember(rapidjson::StringRef(PRESENTATION_TOKEN), aplToken, alloc);
+
+    rapidjson::Value error(rapidjson::kObjectType);
+    error.AddMember(rapidjson::StringRef(TYPE_KEY), INVALID_OPERATION, alloc);
+    error.AddMember(rapidjson::StringRef(REASON_KEY), INVALID_WINDOW_ID, alloc);
+    error.AddMember(rapidjson::StringRef(LIST_ID_KEY), "", alloc);
+    error.AddMember(rapidjson::StringRef(MESSAGE_KEY), errorMessage, alloc);
+
+    errors.PushBack(error, alloc);
+    payload.AddMember(rapidjson::StringRef(ERRORS_KEY), errors, alloc);
+
+    rapidjson::StringBuffer sb;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(sb);
+    if (!payload.Accept(writer)) {
+        ACSDK_ERROR(LX("reportInvalidWindowIdRuntimeErrorFailed").d("reason", "Error serializing payload"));
+        return;
+    }
+
+    // m_guiManager->handleRuntimeErrorEvent(aplToken, sb.GetString());
+    ACSDK_WARN(LX("reportInvalidWindowIdRuntimeError").d("reported runtime error", std::string(sb.GetString())));
+}
+
+void GUIClient::addToMediaPlayerMap(
+    const std::string& name,
+    const std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface>& mediaPlayer) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor.submit([this, name, mediaPlayer]() { m_mediaPlayerMap[name] = mediaPlayer; });
+}
+
+void GUIClient::setAPLRuntimePresentationAdapter(
+    const std::shared_ptr<APLRuntimePresentationAdapter>& aplRuntimePresentationAdapter) {
+    m_executor.submit(
+        [this, aplRuntimePresentationAdapter]() { m_aplRuntimePresentationAdapter = aplRuntimePresentationAdapter; });
+}
+
+bool GUIClient::dispatch(const std::string& message) {
+    writeMessage(message);
+
+    return true;
+}
+
+void GUIClient::initIPCRouter() {
+    ACSDK_DEBUG3(LX(__func__));
+    m_ipcRouter = ipc::IPCRouter::create(m_serverImplementation, shared_from_this(), m_ipcVersionManager);
+
+    m_audioFocusManagerIPCHandler = ipc::AudioFocusManagerHandler::create(m_ipcRouter, shared_from_this());
+    m_systemIPCHandler = ipc::SystemHandler::create(m_ipcRouter, shared_from_this());
+}
+
+std::shared_ptr<ipc::IPCRouter> GUIClient::getIPCRouter() {
+    return m_ipcRouter;
+}
+
+void GUIClient::sendCompleteAuthorizationMessage(
+    const std::string& url,
+    const std::string& code,
+    const std::string& clientId) {
+    if (m_systemIPCHandler) {
+        m_systemIPCHandler->completeAuthorization(url, code, clientId);
+    } else {
+        ACSDK_WARN(LX(__func__).d("reason", "systemHandlerNotFound"));
+    }
+}
+
+void GUIClient::sendSetAlexaStateMessage(const std::string& state) {
+    if (m_systemIPCHandler) {
+        m_systemIPCHandler->setAlexaState(state);
+    } else {
+        ACSDK_WARN(LX(__func__).d("reason", "systemHandlerNotFound"));
+    }
+}
+
+void GUIClient::sendSetAuthorizationStateMessage(const std::string& authState) {
+    if (m_systemIPCHandler) {
+        m_systemIPCHandler->setAuthorizationState(authState);
+    } else {
+        ACSDK_WARN(LX(__func__).d("reason", "systemHandlerNotFound"));
+    }
+}
+
+void GUIClient::sendSetLocalesMessage(const std::string& localeStr) {
+    if (m_systemIPCHandler) {
+        m_systemIPCHandler->setLocales(localeStr);
+    } else {
+        ACSDK_WARN(LX(__func__).d("reason", "systemHandlerNotFound"));
+    }
+}
+
+void GUIClient::acquireChannelRequest(const std::string& message) {
+    ACSDK_DEBUG0(LX("acquireChannelRequest"));
+    std::string avsInterface;
+    if (!jsonUtils::retrieveValue(message, ipc::AVS_INTERFACE_TAG, &avsInterface)) {
+        ACSDK_ERROR(LX("acquireChannelRequestFailed").d("reason", "avsInterfaceNotFound"));
+        return;
+    }
+
+    GUIToken token = 0;
+    if (!jsonUtils::retrieveValue(message, ipc::AUDIO_FOCUS_MANAGER_TOKEN_TAG, &token)) {
+        ACSDK_ERROR(LX("acquireChannelRequestFailed").d("reason", "tokenNotFound"));
+        return;
+    }
+
+    std::string channelName;
+    if (!jsonUtils::retrieveValue(message, ipc::CHANNEL_NAME_TAG, &channelName)) {
+        ACSDK_ERROR(LX("acquireChannelRequestFailed").d("reason", "channelNameNotFound"));
+        return;
+    }
+
+    avsCommon::avs::ContentType contentType = avsCommon::avs::ContentType::UNDEFINED;
+    std::string contentTypeStr;
+    if (!jsonUtils::retrieveValue(message, ipc::CONTENT_TYPE_TAG, &contentTypeStr)) {
+        ACSDK_WARN(LX("acquireChannelRequest").d("reason", "contentTypeUndefined"));
+    } else {
+        if (contentTypeStr == "MIXABLE") {
+            contentType = avsCommon::avs::ContentType::MIXABLE;
+        } else if (contentTypeStr == "NONMIXABLE") {
+            contentType = avsCommon::avs::ContentType::NONMIXABLE;
+        } else {
+            ACSDK_WARN(LX("acquireChannelRequest").d("reason", "contentTypeInvalid").d("contentType", contentTypeStr));
+        }
+    }
+
+    focusAcquireRequest(token, avsInterface, channelName, contentType);
+}
+
+void GUIClient::releaseChannelRequest(const std::string& message) {
+    std::string avsInterface;
+    if (!jsonUtils::retrieveValue(message, ipc::AVS_INTERFACE_TAG, &avsInterface)) {
+        ACSDK_ERROR(LX("releaseChannelRequestFaied").d("reason", "avsInterfaceNotFound"));
+        return;
+    }
+
+    GUIToken token = 0;
+    if (!jsonUtils::retrieveValue(message, ipc::AUDIO_FOCUS_MANAGER_TOKEN_TAG, &token)) {
+        ACSDK_ERROR(LX("releaseChannelRequestFaied").d("reason", "tokenNotFound"));
+        return;
+    }
+
+    std::string channelName;
+    if (!jsonUtils::retrieveValue(message, ipc::CHANNEL_NAME_TAG, &channelName)) {
+        ACSDK_ERROR(LX("releaseChannelRequestFaied").d("reason", "channelNameNotFound"));
+        return;
+    }
+
+    focusReleaseRequest(token, avsInterface, channelName);
+}
+
+void GUIClient::focusChangedReport(const std::string& message) {
+    GUIToken token = 0;
+    if (!jsonUtils::retrieveValue(message, ipc::AUDIO_FOCUS_MANAGER_TOKEN_TAG, &token)) {
+        ACSDK_ERROR(LX("focusChangedReportFailed").d("reason", "tokenNotFound"));
+        return;
+    }
+
+    handleOnFocusChangedReceivedConfirmation(token);
+}
+
+void GUIClient::authorizationStateRequest(const std::string& message) {
+    if (!m_authState.empty()) {
+        sendSetAuthorizationStateMessage(m_authState);
+    }
+}
+
+void GUIClient::alexaStateRequest(const std::string& message) {
+    if (!m_alexaState.empty()) {
+        sendSetAlexaStateMessage(m_alexaState);
+    }
+}
+
+void GUIClient::authorizationInfoRequest(const std::string& message) {
+    // Do not send the authorization info if it is already done.
+    if (m_authState != "REFRESHED" && !m_authUrl.empty() && !m_authCode.empty() && !m_clientId.empty()) {
+        sendCompleteAuthorizationMessage(m_authUrl, m_authCode, m_clientId);
+    }
+}
+
+void GUIClient::localesRequest(const std::string& message) {
+    if (!m_localeStr.empty()) {
+        sendSetLocalesMessage(m_localeStr);
+    }
+}
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUI/GUIManager.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUI/GUIManager.cpp
new file mode 100644
index 0000000000..f36b22d613
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUI/GUIManager.cpp
@@ -0,0 +1,1315 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <rapidjson/document.h>
+#include <rapidjson/error/en.h>
+
+#include <acsdk/AlexaPresentationFeatureClient/AlexaPresentationFeatureClient.h>
+#include <acsdk/PresentationOrchestratorFeatureClient/PresentationOrchestratorFeatureClient.h>
+#include <acsdk/VisualCharacteristicsFeatureClient/VisualCharacteristicsFeatureClient.h>
+#include <acsdk/VisualStateTrackerFeatureClient/VisualStateTrackerFeatureClient.h>
+#include <AVSCommon/AVS/PlaybackButtons.h>
+#include <AVSCommon/SDKInterfaces/FocusManagerInterface.h>
+#include <Settings/SettingObserverInterface.h>
+
+#include "IPCServerSampleApp/GUI/GUIManager.h"
+
+#ifdef UWP_BUILD
+#include <UWPSampleApp/Utils.h>
+#include <SSSDKCommon/AudioFileUtil.h>
+#endif
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+
+using namespace alexaClientSDK;
+using namespace avsCommon::utils::json;
+using namespace avsCommon::avs;
+
+/// String to identify log entries originating from this file.
+static const std::string TAG("GUIManager");
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.x1
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Interface name to use for focus requests.
+static const std::string APL_INTERFACE("Alexa.Presentation.APL");
+
+/// String to identify the Shuffle Toggle of PlaybackController.
+static const std::string SHUFFLE_TOGGLE_ID("shuffle");
+
+/// String to identify the Loop Toggle of PlaybackController.
+static const std::string LOOP_TOGGLE_ID("loop");
+
+/// String to identify the Repeat Toggle of PlaybackController.
+static const std::string REPEAT_TOGGLE_ID("repeat");
+
+/// String to identify the Repeat Toggle of PlaybackController.
+static const std::string THUMBSUP_TOGGLE_ID("thumbsUp");
+
+/// String to identify the Repeat Toggle of PlaybackController.
+static const std::string THUMBSDOWN_TOGGLE_ID("thumbsDown");
+
+/// String identifier for the home target.
+static const std::string TARGET_HOME("Home");
+
+/// Map to match a toggle command id to the corresponding enum value.
+static const std::map<std::string, avsCommon::avs::PlaybackToggle> TOGGLE_COMMAND_ID_TO_TOGGLE = {
+    {SHUFFLE_TOGGLE_ID, avsCommon::avs::PlaybackToggle::SHUFFLE},
+    {LOOP_TOGGLE_ID, avsCommon::avs::PlaybackToggle::LOOP},
+    {REPEAT_TOGGLE_ID, avsCommon::avs::PlaybackToggle::LOOP},
+    {THUMBSUP_TOGGLE_ID, avsCommon::avs::PlaybackToggle::THUMBS_UP},
+    {THUMBSDOWN_TOGGLE_ID, avsCommon::avs::PlaybackToggle::THUMBS_DOWN}};
+
+std::shared_ptr<GUIManager> GUIManager::create(
+    std::shared_ptr<gui::GUIClientInterface> guiClient,
+    std::shared_ptr<gui::GUIActivityEventNotifierInterface> activityEventNotifier,
+    std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> micWrapper,
+    std::shared_ptr<common::InteractionManager> interactionManager,
+    std::shared_ptr<common::EndpointAlexaLauncherHandler> launcherHandler) {
+    if (!guiClient) {
+        ACSDK_CRITICAL(LX(__func__).d("reason", "null guiClient"));
+        return nullptr;
+    }
+    if (!activityEventNotifier) {
+        ACSDK_CRITICAL(LX(__func__).d("reason", "null activityEventNotifier"));
+        return nullptr;
+    }
+    if (!micWrapper) {
+        ACSDK_CRITICAL(LX(__func__).d("reason", "null micWrapper"));
+        return nullptr;
+    }
+
+    if (!interactionManager) {
+        ACSDK_CRITICAL(LX(__func__).d("reason", "null interactionManager"));
+        return nullptr;
+    }
+
+    std::shared_ptr<GUIManager> guiManager(
+        new GUIManager(guiClient, activityEventNotifier, micWrapper, interactionManager, launcherHandler));
+    guiManager->initialize();
+
+    return guiManager;
+}
+
+GUIManager::GUIManager(
+    std::shared_ptr<gui::GUIClientInterface> guiClient,
+    std::shared_ptr<gui::GUIActivityEventNotifierInterface> activityEventNotifier,
+    std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> micWrapper,
+    std::shared_ptr<common::InteractionManager> interactionManager,
+    std::shared_ptr<common::EndpointAlexaLauncherHandler> launcherHandler) :
+        RequiresShutdown{"GUIManager"},
+        m_activityEventNotifier{activityEventNotifier},
+        m_playerActivityState{PlayerActivity::FINISHED},
+        m_launcherHandler{launcherHandler},
+        m_interactionManager{interactionManager} {
+    m_guiClient = guiClient;
+    m_isSpeakingOrListening = false;
+    m_clearAlertChannelOnForegrounded = false;
+    m_audioInputProcessorState = AudioInputProcessorObserverInterface::State::IDLE;
+    m_channelFocusStates[avsCommon::sdkInterfaces::FocusManagerInterface::DIALOG_CHANNEL_NAME] = FocusState::NONE;
+    m_channelFocusStates[avsCommon::sdkInterfaces::FocusManagerInterface::ALERT_CHANNEL_NAME] = FocusState::NONE;
+    m_channelFocusStates[avsCommon::sdkInterfaces::FocusManagerInterface::CONTENT_CHANNEL_NAME] = FocusState::NONE;
+    m_channelFocusStates[avsCommon::sdkInterfaces::FocusManagerInterface::COMMUNICATIONS_CHANNEL_NAME] =
+        FocusState::NONE;
+    m_channelFocusStates[avsCommon::sdkInterfaces::FocusManagerInterface::VISUAL_CHANNEL_NAME] = FocusState::NONE;
+    m_interfaceHoldingAudioFocus = {};
+
+#ifdef UWP_BUILD
+    m_micWrapper = std::dynamic_pointer_cast<alexaSmartScreenSDK::sssdkCommon::NullMicrophone>(micWrapper);
+#else
+    m_micWrapper = micWrapper;
+#endif
+
+    m_micWrapper->startStreamingMicrophoneData();
+}
+
+void GUIManager::initialize() {
+    m_doNotDisturbIPCHandler = ipc::DoNotDisturbHandler::create(m_guiClient->getIPCRouter(), shared_from_this());
+    m_interactionManagerIPCHandler =
+        ipc::InteractionManagerHandler::create(m_guiClient->getIPCRouter(), shared_from_this());
+    m_loggerIPCHandler = ipc::LoggerHandler::create(m_guiClient->getIPCRouter(), shared_from_this());
+    m_sessionSetupIPCHandler = ipc::SessionSetupHandler::create(m_guiClient->getIPCRouter(), shared_from_this());
+    m_windowManagerIPCHandler = ipc::WindowManagerHandler::create(m_guiClient->getIPCRouter(), shared_from_this());
+
+    if (m_launcherHandler) {
+        m_launcherHandler->registerLaunchTargetCallback(
+            TARGET_HOME, [this]() { m_executor.submit([this]() { executeExitNavigation(); }); });
+    }
+}
+
+void GUIManager::handleRecognizeSpeechRequest(capabilityAgents::aip::Initiator initiator, bool start) {
+    ACSDK_DEBUG9(LX(__func__).d("initiator", initiatorToString(initiator)).d("start", start));
+    m_executor.submit([this, initiator]() {
+        if (capabilityAgents::aip::Initiator::TAP == initiator) {
+            m_interactionManager->tap();
+        } else if (capabilityAgents::aip::Initiator::PRESS_AND_HOLD == initiator) {
+            m_interactionManager->holdToggled();
+        }
+    });
+}
+
+void GUIManager::handleMicrophoneToggle() {
+    ACSDK_DEBUG5(LX(__func__));
+    m_interactionManager->microphoneToggle();
+}
+
+void GUIManager::handlePlaybackPlay() {
+    m_interactionManager->playbackPlay();
+}
+
+void GUIManager::handlePlaybackPause() {
+    m_interactionManager->playbackPause();
+}
+
+void GUIManager::handlePlaybackNext() {
+    m_interactionManager->playbackNext();
+}
+
+void GUIManager::handlePlaybackPrevious() {
+    m_interactionManager->playbackPrevious();
+}
+
+void GUIManager::handlePlaybackSeekTo(int offset) {
+    ACSDK_DEBUG9(LX(__func__).d("offset", offset));
+    std::chrono::milliseconds seekToPosition(offset);
+    m_executor.submit(
+        [this, seekToPosition]() { m_defaultClient->getPlaybackRouter()->localSeekTo(seekToPosition, false); });
+}
+
+void GUIManager::handlePlaybackSkipForward() {
+    m_interactionManager->playbackSkipForward();
+}
+
+void GUIManager::handlePlaybackSkipBackward() {
+    m_interactionManager->playbackSkipBackward();
+}
+
+void GUIManager::handlePlaybackToggle(const std::string& name, bool checked) {
+    m_executor.submit([this, name, checked]() {
+        auto it = TOGGLE_COMMAND_ID_TO_TOGGLE.find(name);
+        if (it == TOGGLE_COMMAND_ID_TO_TOGGLE.end()) {
+            ACSDK_ERROR(LX(__func__).d("Invalid Toggle Name", name));
+            return;
+        }
+
+        switch (it->second) {
+            case avsCommon::avs::PlaybackToggle::SHUFFLE:
+                m_interactionManager->playbackShuffle(checked);
+                break;
+            case avsCommon::avs::PlaybackToggle::LOOP:
+                m_interactionManager->playbackLoop(checked);
+                break;
+            case avsCommon::avs::PlaybackToggle::THUMBS_UP:
+                m_interactionManager->playbackThumbsUp(checked);
+                break;
+            case avsCommon::avs::PlaybackToggle::THUMBS_DOWN:
+                m_interactionManager->playbackThumbsDown(checked);
+                break;
+            case avsCommon::avs::PlaybackToggle::REPEAT:
+                m_interactionManager->playbackRepeat(checked);
+                break;
+        }
+    });
+}
+
+void GUIManager::setFirmwareVersion(avsCommon::sdkInterfaces::softwareInfo::FirmwareVersion firmwareVersion) {
+    m_interactionManager->setFirmwareVersion(firmwareVersion);
+}
+
+void GUIManager::adjustVolume(avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type, int8_t delta) {
+    m_interactionManager->adjustVolume(type, delta);
+}
+
+void GUIManager::setMute(avsCommon::sdkInterfaces::ChannelVolumeInterface::Type type, bool mute) {
+    m_interactionManager->setMute(type, mute);
+}
+
+void GUIManager::resetDevice() {
+    m_interactionManager->resetDevice();
+}
+
+void GUIManager::acceptCall() {
+#ifdef ENABLE_COMMS
+    m_interactionManager->acceptCall();
+#endif
+}
+
+void GUIManager::stopCall() {
+#ifdef ENABLE_COMMS
+    m_interactionManager->stopCall();
+#endif
+}
+
+void GUIManager::enableLocalVideo() {
+#ifdef ENABLE_COMMS
+    m_executor.submit([this]() {
+        if (m_defaultClient->isCommsEnabled()) {
+            m_defaultClient->enableLocalVideo();
+        } else {
+            ACSDK_WARN(LX(__func__).m("Communication not supported."));
+        }
+    });
+#endif
+}
+
+void GUIManager::disableLocalVideo() {
+#ifdef ENABLE_COMMS
+    m_executor.submit([this]() {
+        if (m_defaultClient->isCommsEnabled()) {
+            m_defaultClient->disableLocalVideo();
+        } else {
+            ACSDK_WARN(LX(__func__).m("Communication not supported."));
+        }
+    });
+#endif
+}
+
+#ifdef ENABLE_COMMS
+void GUIManager::sendDtmf(avsCommon::sdkInterfaces::CallManagerInterface::DTMFTone dtmfTone) {
+    m_interactionManager->sendDtmf(dtmfTone);
+}
+#endif
+bool GUIManager::handleFocusAcquireRequest(
+    std::string avsInterface,
+    std::string channelName,
+    avsCommon::avs::ContentType contentType,
+    std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) {
+    return m_executor
+        .submit([this, channelName, channelObserver, contentType, avsInterface]() {
+            auto activity = acl::FocusManagerInterface::Activity::create(
+                avsInterface, channelObserver, std::chrono::milliseconds::zero(), contentType);
+
+            bool focusAcquired = m_defaultClient->getAudioFocusManager()->acquireChannel(channelName, activity);
+            if (focusAcquired) {
+                m_interfaceHoldingAudioFocus = avsInterface;
+            }
+            return focusAcquired;
+        })
+        .get();
+}
+
+bool GUIManager::handleFocusReleaseRequest(
+    std::string avsInterface,
+    std::string channelName,
+    std::shared_ptr<avsCommon::sdkInterfaces::ChannelObserverInterface> channelObserver) {
+    return m_executor
+        .submit([this, avsInterface, channelName, channelObserver]() {
+            if (avsInterface == m_interfaceHoldingAudioFocus) {
+                bool focusReleased =
+                    m_defaultClient->getAudioFocusManager()->releaseChannel(channelName, channelObserver).get();
+                if (focusReleased) {
+                    m_interfaceHoldingAudioFocus.clear();
+                }
+                return focusReleased;
+            }
+            return false;
+        })
+        .get();
+}
+
+void GUIManager::handleGUIActivityEvent(avsCommon::sdkInterfaces::GUIActivityEvent event, const std::string& source) {
+    m_executor.submit([this, source, event]() {
+        if (avsCommon::sdkInterfaces::GUIActivityEvent::INTERRUPT == event && m_isSpeakingOrListening) {
+            ACSDK_DEBUG3(LX(__func__).d("Interrupted activity while speaking or listening", event));
+            if (avsCommon::avs::FocusState::FOREGROUND ==
+                m_channelFocusStates[afml::FocusManager::DIALOG_CHANNEL_NAME]) {
+                m_defaultClient->stopForegroundActivity();
+            }
+        }
+
+        m_activityEventNotifier->notifyObserversOfGUIActivityEvent(source.empty() ? TAG : source, event);
+    });
+}
+
+void GUIManager::handleNavigationEvent(NavigationEvent event) {
+    m_executor.submit([this, event]() {
+        ACSDK_DEBUG3(LX(__func__).d("processNavigationEvent in executor", navigationEventToString(event)));
+
+        // TODO : Implement more robust visual presentation and granular channel orchestration for local navigation
+        switch (event) {
+            case NavigationEvent::BACK:
+                executeBackNavigation();
+                break;
+            case NavigationEvent::EXIT:
+                executeExitNavigation();
+                break;
+            default:
+                // Not possible as returned above.
+                break;
+        }
+    });
+}
+
+void GUIManager::executeBackNavigation() {
+    /**
+     * Back Navigation supports the following use cases:
+     * 1. GUIClient managed back, for traversal of a UI client implemented backstack.
+     * 2. Back from ALL other active audio channel(s) and /or visual card to audio content/PlayerInfo card.
+     * 3. Back from audio content content/PlayerInfo card to 'home' state.
+     */
+
+    std::string focusedWindowId = m_presentationOrchestratorStateTracker->getFocusedWindowId();
+
+    bool dialogChannelActive =
+        FocusState::NONE != m_channelFocusStates[avsCommon::sdkInterfaces::FocusManagerInterface::DIALOG_CHANNEL_NAME];
+    bool alertChannelActive =
+        FocusState::NONE != m_channelFocusStates[avsCommon::sdkInterfaces::FocusManagerInterface::ALERT_CHANNEL_NAME];
+    bool contentChannelActive =
+        FocusState::NONE != m_channelFocusStates[avsCommon::sdkInterfaces::FocusManagerInterface::CONTENT_CHANNEL_NAME];
+    bool nonPlayerInfoWindowDisplaying =
+        !focusedWindowId.empty() && focusedWindowId != m_audioPlaybackUIWindowId &&
+        focusedWindowId != m_templateRuntimePresentationAdapterBridge->getRenderPlayerInfoWindowId();
+
+    /**
+     * Always stop the foreground activity unless we're playing audio content, AND dialog and alerts aren't
+     active,
+     * AND we are still presenting GUI over PlayerInfo.  In that case we should only clear the card.
+     */
+    bool stopForegroundActivity =
+        !(PlayerActivity::PLAYING == m_playerActivityState && nonPlayerInfoWindowDisplaying && !dialogChannelActive &&
+          !alertChannelActive);
+
+    /**
+     * Always clear the displayed presentations unless:
+     * - dialog OR alerts channel is active
+     * - AND audio content channel is active, but there is no NonPlayerInfoDisplay UI displayed
+     * In that case we should stop the foreground activity (the dialog or alert), but not clear the presentation.
+     * TODO: Add case for live view controller here.
+     */
+    bool clearPresentations =
+        !((dialogChannelActive || alertChannelActive) && (contentChannelActive && !nonPlayerInfoWindowDisplaying));
+
+    /**
+     * Stopping foreground audio activity happens before we allow GUIClient to handle 'visual' back navigation.
+     */
+    if (stopForegroundActivity) {
+        /**
+         * If both dialog and alerts are active,
+         * stop dialog first (which has priority), and then stop alerts when it becomes foregrounded.
+         */
+        if (dialogChannelActive && alertChannelActive) {
+            m_clearAlertChannelOnForegrounded = true;
+        }
+        m_defaultClient->stopForegroundActivity();
+    }
+
+    /**
+     * BACK will attempt to let the Presentation Orchestrator handle visual navigation before clearing.
+     * This allows for things like backstack traversal.
+     */
+    if (clearPresentations && m_presentationOrchestrator->navigateBack()) {
+        /// Clear clout context unless waiting to clear Alert channel first
+        if (!m_clearAlertChannelOnForegrounded) {
+            forceClearDialogChannelFocus();
+        }
+    }
+}
+
+void GUIManager::executeExitNavigation() {
+    /// EXIT will immediately clear everything.
+    m_presentationOrchestrator->clearPresentations();
+    if (m_alexaPresentationAPL) {
+        m_alexaPresentationAPL->clearExecuteCommands();
+    }
+    m_defaultClient->stopAllActivities();
+    forceClearDialogChannelFocus();
+}
+
+void GUIManager::forceExit() {
+    m_executor.submit([this]() { executeExitNavigation(); });
+}
+
+std::vector<visualCharacteristicsInterfaces::WindowTemplate> GUIManager::getWindowTemplates() {
+    return m_executor.submit([this]() { return m_visualCharacteristics->getWindowTemplates(); }).get();
+}
+
+std::vector<visualCharacteristicsInterfaces::InteractionMode> GUIManager::getInteractionModes() {
+    return m_executor.submit([this]() { return m_visualCharacteristics->getInteractionModes(); }).get();
+}
+
+visualCharacteristicsInterfaces::DisplayCharacteristics GUIManager::getDisplayCharacteristics() {
+    return m_executor.submit([this]() { return m_visualCharacteristics->getDisplayCharacteristics(); }).get();
+}
+
+static bool shouldReportWindowInstance(
+    const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& instance) {
+    const auto& interfaces = instance.supportedInterfaces;
+    return std::find(interfaces.begin(), interfaces.end(), APL_INTERFACE) != interfaces.end();
+}
+
+void GUIManager::setWindowInstances(
+    const std::vector<presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance>& instances,
+    const std::string& defaultWindowInstanceId,
+    const std::string& audioPlaybackUIWindowId) {
+    ACSDK_DEBUG0(LX(__func__)
+                     .d("defaultWindowInstanceId", defaultWindowInstanceId)
+                     .d("audioPlaybackUIWindowId", audioPlaybackUIWindowId));
+    m_executor.submit([this, instances, defaultWindowInstanceId, audioPlaybackUIWindowId]() {
+        setDefaultWindowId(defaultWindowInstanceId);
+        setAudioPlaybackUIWindowId(audioPlaybackUIWindowId);
+        std::vector<visualCharacteristicsInterfaces::WindowInstance> reportableInstances;
+        for (const auto& instance : instances) {
+            if (shouldReportWindowInstance(instance)) {
+                reportableInstances.push_back(instance);
+            }
+        }
+
+        m_visualCharacteristics->setWindowInstances(reportableInstances, defaultWindowInstanceId);
+        m_presentationOrchestratorStateTracker->setWindows(instances);
+    });
+}
+
+bool GUIManager::addWindowInstance(
+    const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& instance) {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", instance.id));
+    return m_executor
+        .submit([this, instance]() {
+            if (shouldReportWindowInstance(instance) && !m_visualCharacteristics->addWindowInstance(instance)) {
+                ACSDK_ERROR(LX("addWindowInstanceFailed")
+                                .d("reason", "Failed to add window instance to visual characteristics"));
+                return false;
+            }
+
+            m_presentationOrchestratorStateTracker->addWindow(instance);
+            return true;
+        })
+        .get();
+}
+
+bool GUIManager::removeWindowInstance(const std::string& windowInstanceId) {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", windowInstanceId));
+    return m_executor
+        .submit([this, windowInstanceId]() { return m_visualCharacteristics->removeWindowInstance(windowInstanceId); })
+        .get();
+}
+
+void GUIManager::updateWindowInstance(
+    const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& instance) {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", instance.id));
+    m_executor.submit([this, instance]() { m_visualCharacteristics->updateWindowInstance(instance); });
+}
+
+bool GUIManager::setDefaultWindowInstance(const std::string& windowInstanceId) {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", windowInstanceId));
+    return m_executor
+        .submit(
+            [this, windowInstanceId]() { return m_visualCharacteristics->setDefaultWindowInstance(windowInstanceId); })
+        .get();
+}
+
+bool GUIManager::serializeInteractionMode(
+    const std::vector<visualCharacteristicsInterfaces::InteractionMode>& interactionModes,
+    std::string& serializedJson) {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_executor
+        .submit([this, interactionModes, &serializedJson]() {
+            return m_visualCharacteristicsSerializer->serializeInteractionModes(interactionModes, serializedJson);
+        })
+        .get();
+}
+
+bool GUIManager::serializeWindowTemplate(
+    const std::vector<visualCharacteristicsInterfaces::WindowTemplate>& windowTemplates,
+    std::string& serializedJson) {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_executor
+        .submit([this, windowTemplates, &serializedJson]() {
+            return m_visualCharacteristicsSerializer->serializeWindowTemplate(windowTemplates, serializedJson);
+        })
+        .get();
+}
+
+bool GUIManager::serializeDisplayCharacteristics(
+    const visualCharacteristicsInterfaces::DisplayCharacteristics& display,
+    std::string& serializedJson) {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_executor
+        .submit([this, display, &serializedJson]() {
+            return m_visualCharacteristicsSerializer->serializeDisplayCharacteristics(display, serializedJson);
+        })
+        .get();
+}
+
+void GUIManager::doNotDisturbStateChanged(const std::string& message) {
+    bool enabled = false;
+    if (!jsonUtils::retrieveValue(message, ipc::ENABLED_TAG, &enabled)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "enabledNotFound"));
+        return;
+    }
+    m_defaultClient->getSettingsManager()->setValue<settings::DO_NOT_DISTURB>(enabled);
+}
+
+void GUIManager::doNotDisturbStateRequest(const std::string& message) {
+    if (m_doNotDisturbIPCHandler && m_settingsManager) {
+        m_doNotDisturbIPCHandler->dispatchSetDoNotDisturbState(
+            m_settingsManager->getValue<settings::DO_NOT_DISTURB>(false).second);
+    } else {
+        if (!m_doNotDisturbIPCHandler) {
+            ACSDK_WARN(LX(__func__).d("reason", "doNotDisturbSettingHandlerNotFound"));
+        }
+        if (!m_settingsManager) {
+            ACSDK_WARN(LX(__func__).d("reason", "settingsManagerNotFound"));
+        }
+    }
+}
+
+void GUIManager::namespaceVersionsReport(const std::string& message) {
+    m_ipcVersionManager->handleAssertNamespaceVersionsFromString(message);
+}
+
+void GUIManager::clientInitialized(const std::string& message) {
+    bool isIPCVersionSupported = false;
+    bool errorState = false;
+    if (!jsonUtils::retrieveValue(message, ipc::IS_IPC_VERSION_SUPPORTED_TAG, &isIPCVersionSupported)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "isIPCVersionSupportedNotFound"));
+        errorState = true;
+    }
+
+    if (!isIPCVersionSupported && !errorState) {
+        ACSDK_WARN(LX(__func__)
+                       .d("reason", "IPC Version not supported by client")
+                       .d("IPCVersion", ipc::IS_IPC_VERSION_SUPPORTED_TAG));
+    }
+
+    if (m_guiClient->finalizeClientInitialization(errorState)) {
+        // Init locale for gui layer after GUI client is done initializing.
+        handleLocaleChange();
+    }
+}
+
+void GUIManager::clientConfigRequest(const std::string& message) {
+    if (m_sessionSetupIPCHandler) {
+        m_sessionSetupIPCHandler->dispatchConfigureClient(message);
+    } else {
+        ACSDK_WARN(LX(__func__).d("reason", "sessionSetupHandlerNotFound"));
+    }
+}
+
+void GUIManager::initClient() {
+    if (m_sessionSetupIPCHandler) {
+        m_sessionSetupIPCHandler->dispatchInitializeClient(ipc::IPCNamespaces::IPC_FRAMEWORK_VERSION);
+    } else {
+        ACSDK_WARN(LX(__func__).d("reason", "sessionSetupHandlerNotFound"));
+    }
+}
+
+void GUIManager::visualCharacteristicsRequest(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+
+    if (!payload.HasMember(ipc::CHARACTERISTICS_TAG)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "characteristics key not found"));
+        return;
+    }
+
+    avsCommon::utils::Optional<std::string> displayCharacteristicOpt;
+    avsCommon::utils::Optional<std::string> interactionModesOpt;
+    avsCommon::utils::Optional<std::string> windowTemplatesOpt;
+    auto characteristicsSet = jsonUtils::retrieveStringArray<std::set<std::string>>(payload[ipc::CHARACTERISTICS_TAG]);
+    for (auto const& characteristic : characteristicsSet) {
+        if (ipc::DEVICE_DISPLAY_TAG == characteristic) {
+            auto displayCharacteristics = getDisplayCharacteristics();
+            std::string serializedDisplayCharacteristics;
+            if (!serializeDisplayCharacteristics(displayCharacteristics, serializedDisplayCharacteristics)) {
+                ACSDK_WARN(LX(__func__).d("reason", "unable to serialize display characteristics"));
+                continue;
+            }
+
+            displayCharacteristicOpt.set(serializedDisplayCharacteristics);
+            continue;
+        }
+
+        if (ipc::INTERACTION_MODES_TAG == characteristic) {
+            auto interactionModes = getInteractionModes();
+            std::string serializedInteractionModes;
+            if (!serializeInteractionMode(interactionModes, serializedInteractionModes)) {
+                ACSDK_WARN(LX(__func__).d("reason", "unable to serialize interaction modes"));
+                continue;
+            }
+
+            interactionModesOpt.set(serializedInteractionModes);
+            continue;
+        }
+
+        if (ipc::WINDOW_TEMPLATES_TAG == characteristic) {
+            auto windowTemplates = getWindowTemplates();
+            std::string serializedWindowTemplates;
+            if (!serializeWindowTemplate(windowTemplates, serializedWindowTemplates)) {
+                ACSDK_WARN(LX(__func__).d("reason", "unable to serialize window templates"));
+                continue;
+            }
+
+            windowTemplatesOpt.set(serializedWindowTemplates);
+            continue;
+        }
+    }
+
+    if (m_windowManagerIPCHandler) {
+        m_windowManagerIPCHandler->dispatchSetVisualCharacteristics(
+            displayCharacteristicOpt, interactionModesOpt, windowTemplatesOpt);
+    } else {
+        ACSDK_WARN(LX(__func__).d("reason", "windowManagerHandlerNotFound"));
+    }
+}
+
+void GUIManager::setDefaultWindowId(const std::string& windowId) {
+    m_defaultWindowId = windowId;
+    m_aplRuntimePresentationAdapter->setDefaultWindowId(m_defaultWindowId);
+}
+
+void GUIManager::setAudioPlaybackUIWindowId(const std::string& windowId) {
+    m_audioPlaybackUIWindowId = windowId;
+    if (!m_templateRuntimePresentationAdapterBridge->setRenderPlayerInfoWindowId(m_audioPlaybackUIWindowId)) {
+        ACSDK_WARN(LX(__func__).d("reason", "player info window already set."));
+    }
+}
+
+void GUIManager::defaultWindowInstanceChanged(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+
+    if (!payload.IsObject()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "payload not an object"));
+        return;
+    }
+
+    std::string defaultWindowId;
+    if (!jsonUtils::retrieveValue(payload, ipc::DEFAULT_WINDOW_ID_TAG, &defaultWindowId)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "default window ID not found"));
+        return;
+    }
+
+    if (!setDefaultWindowInstance(defaultWindowId)) {
+        ACSDK_ERROR(LX(__func__)
+                        .d("reason", "unable to set the default window instance")
+                        .d("defaultWindowId", defaultWindowId));
+        return;
+    }
+
+    // Set Default Window Id
+    setDefaultWindowId(defaultWindowId);
+}
+
+void GUIManager::windowInstancesReport(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+
+    std::string defaultWindowId;
+    if (!jsonUtils::retrieveValue(message, ipc::DEFAULT_WINDOW_ID_TAG, &defaultWindowId)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "default window ID not found"));
+        return;
+    }
+
+    std::string audioPlaybackUIWindowId;
+    if (!jsonUtils::retrieveValue(message, ipc::AUDIO_PLAYBACK_UI_WINDOW_ID_TAG, &audioPlaybackUIWindowId)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "audio playback UI window ID not found"));
+        return;
+    }
+
+    if (!payload.HasMember(ipc::WINDOW_INSTANCES_TAG)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "window instances key not found"));
+        return;
+    }
+    const auto& windowInstances = payload[ipc::WINDOW_INSTANCES_TAG];
+    if (!windowInstances.IsArray()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "window instances not an array"));
+        return;
+    }
+
+    std::vector<presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance> instances;
+    for (auto const& windowInstance : windowInstances.GetArray()) {
+        presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance instance;
+        if (!parseWindowInstance(windowInstance, instance)) {
+            ACSDK_ERROR(LX(__func__).d("reason", "unable to parse all window instances"));
+            return;
+        }
+
+        instances.push_back(instance);
+    }
+
+    // Set Window Instances
+    setWindowInstances(instances, defaultWindowId, audioPlaybackUIWindowId);
+}
+
+bool GUIManager::parseWindowInstance(
+    const rapidjson::Value& payload,
+    presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& windowInstance) {
+    if (!jsonUtils::retrieveValue(payload, ipc::WINDOW_ID_TAG, &windowInstance.id)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "window ID not found"));
+        return false;
+    }
+
+    if (!jsonUtils::retrieveValue(payload, ipc::TEMPLATE_ID_TAG, &windowInstance.templateId)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "template ID not found"));
+        return false;
+    }
+
+    if (!jsonUtils::retrieveValue(payload, ipc::INTERACTION_MODE_TAG, &windowInstance.interactionMode)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "interaction mode not found"));
+        return false;
+    }
+
+    if (!jsonUtils::retrieveValue(payload, ipc::SIZE_CONFIGURATION_ID_TAG, &windowInstance.sizeConfigurationId)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "size configuration ID not found"));
+        return false;
+    }
+
+    if (!payload.HasMember(ipc::SUPPORTED_INTERFACES)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "supportedInterfaces not found"));
+        return false;
+    }
+
+    const auto& supportedInterfacesValue = payload[ipc::SUPPORTED_INTERFACES];
+    if (!supportedInterfacesValue.IsArray()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "supportedInterfaces is not an array"));
+        return false;
+    }
+    windowInstance.supportedInterfaces =
+        jsonUtils::retrieveStringArray<std::vector<std::string>>(supportedInterfacesValue);
+
+    int64_t zOrderIndex;
+    if (!jsonUtils::retrieveValue(payload, ipc::Z_ORDER_INDEX, &zOrderIndex)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "zOrderIndex not found"));
+        return false;
+    }
+
+    windowInstance.zOrderIndex = zOrderIndex;
+
+    return true;
+}
+
+void GUIManager::windowInstancesAdded(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+
+    if (!payload.IsObject()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "payload not an object"));
+        return;
+    }
+
+    if (!payload.HasMember(ipc::WINDOW_INSTANCES_TAG)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "window instances key not found"));
+        return;
+    }
+
+    const auto& windowInstances = payload[ipc::WINDOW_INSTANCES_TAG];
+    if (!windowInstances.IsArray()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "window instances not an array"));
+        return;
+    }
+    for (auto const& windowInstance : windowInstances.GetArray()) {
+        presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance instance;
+        if (!parseWindowInstance(windowInstance, instance)) {
+            ACSDK_ERROR(LX(__func__).d("reason", "unable to parse all window instances"));
+            return;
+        }
+        if (!addWindowInstance(instance)) {
+            ACSDK_ERROR(LX(__func__).d("reason", "unable to add window instance").d("windowId", instance.id));
+            return;
+        }
+    }
+}
+
+void GUIManager::windowInstancesRemoved(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+
+    if (!payload.IsObject()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "payload not an object"));
+        return;
+    }
+
+    if (!payload.HasMember(ipc::WINDOW_IDS_TAG)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "window ids key not found"));
+        return;
+    }
+
+    const auto& windowIds = payload[ipc::WINDOW_IDS_TAG];
+    if (!windowIds.IsArray()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "window ids not an array"));
+        return;
+    }
+
+    auto windowIdsSet = jsonUtils::retrieveStringArray<std::set<std::string>>(payload[ipc::WINDOW_IDS_TAG]);
+    for (auto const& windowId : windowIdsSet) {
+        if (!removeWindowInstance(windowId)) {
+            ACSDK_WARN(LX(__func__).d("reason", "unable to remove window instance").d("windowId", windowId));
+            continue;
+        }
+    }
+}
+
+void GUIManager::windowInstancesUpdated(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+
+    if (!payload.IsObject()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "payload not an object"));
+        return;
+    }
+
+    if (!payload.HasMember(ipc::WINDOW_INSTANCES_TAG)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "window instances key not found"));
+        return;
+    }
+    const auto& windowInstances = payload[ipc::WINDOW_INSTANCES_TAG];
+    if (!windowInstances.IsArray()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "window instances not an array"));
+        return;
+    }
+    for (const auto& windowInstance : windowInstances.GetArray()) {
+        presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance instance;
+        if (!parseWindowInstance(windowInstance, instance)) {
+            ACSDK_WARN(LX(__func__).d("reason", "unable to parse window instance"));
+            continue;
+        }
+        updateWindowInstance(instance);
+    }
+}
+
+void GUIManager::recognizeSpeechRequest(const std::string& message) {
+    ACSDK_DEBUG0(LX(__func__));
+
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+
+    std::string initiatorType;
+    if (!jsonUtils::retrieveValue(payload, ipc::AUDIO_INPUT_INITIATOR_TYPE_TAG, &initiatorType)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "initiatorTypeNotFound"));
+        return;
+    }
+
+    capabilityAgents::aip::Initiator initiator;
+    if (initiatorToString(capabilityAgents::aip::Initiator::PRESS_AND_HOLD) == initiatorType) {
+        initiator = capabilityAgents::aip::Initiator::PRESS_AND_HOLD;
+    } else if (initiatorToString(capabilityAgents::aip::Initiator::TAP) == initiatorType) {
+        initiator = capabilityAgents::aip::Initiator::TAP;
+    } else {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid initiatorType"));
+        return;
+    }
+
+    std::string captureStateStr;
+    if (!jsonUtils::retrieveValue(payload, ipc::CAPTURE_STATE_TAG, &captureStateStr)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "captureStateNotFound"));
+        return;
+    }
+
+    CaptureState captureState = captureStateFromString(captureStateStr);
+    if (CaptureState::UNKNOWN == captureState) {
+        ACSDK_ERROR(LX(__func__).d("reason", "received unknown type of captureState"));
+        return;
+    }
+    bool startCapture = CaptureState::START == captureState;
+
+    handleRecognizeSpeechRequest(initiator, startCapture);
+}
+
+void GUIManager::navigationEvent(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+
+    std::string event;
+    if (!jsonUtils::retrieveValue(payload, ipc::EVENT_TAG, &event)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "eventNotFound"));
+        return;
+    }
+
+    NavigationEvent navigationEvent = navigationEventFromString(event);
+    if (NavigationEvent::UNKNOWN == navigationEvent) {
+        ACSDK_ERROR(LX(__func__).d("reason", "received unknown type of event"));
+        return;
+    }
+
+    handleNavigationEvent(navigationEvent);
+}
+
+void GUIManager::guiActivityEvent(const std::string& message) {
+    ACSDK_DEBUG5(LX(__func__));
+
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+
+    std::string event;
+    if (!jsonUtils::retrieveValue(payload, ipc::EVENT_TAG, &event)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "eventNotFound"));
+        return;
+    }
+    avsCommon::sdkInterfaces::GUIActivityEvent activityEvent =
+        avsCommon::sdkInterfaces::guiActivityEventFromString(event);
+    if (avsCommon::sdkInterfaces::GUIActivityEvent::UNKNOWN == activityEvent) {
+        ACSDK_ERROR(LX(__func__).d("reason", "received unknown type of event"));
+        return;
+    }
+
+    handleGUIActivityEvent(activityEvent);
+}
+
+void GUIManager::logEvent(const std::string& message) {
+    std::string level;
+    if (!jsonUtils::retrieveValue(message, ipc::LEVEL_TAG, &level)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "levelNotFound"));
+        return;
+    }
+
+    IPCLogLevel logLevel = ipcLogLevelFromString(level);
+    if (IPCLogLevel::UNKNOWN == logLevel) {
+        ACSDK_ERROR(LX(__func__).d("reason", "received unknown type of logLevel"));
+        return;
+    }
+
+    std::string logMessage;
+    if (!jsonUtils::retrieveValue(message, ipc::MESSAGE_TAG, &logMessage)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "messageNotFound"));
+        return;
+    }
+
+    m_guiLogBridge.log(logLevel, logMessage);
+}
+
+#ifdef ENABLE_COMMS
+void GUIManager::onCallStateInfoChange(const CallStateInfo& stateInfo) {
+    m_guiClient->sendCallStateInfo(stateInfo);
+}
+
+void GUIManager::onCallStateChange(CallState callState) {
+    m_interactionManager->onCallStateChange(callState);
+}
+#endif
+
+void GUIManager::onDialogUXStateChanged(DialogUXState state) {
+    m_executor.submit([this, state]() {
+        switch (state) {
+            case DialogUXState::SPEAKING:
+                m_isSpeakingOrListening = true;
+                break;
+            case DialogUXState::EXPECTING:
+            case DialogUXState::FINISHED:
+            case DialogUXState::IDLE:
+            case DialogUXState::THINKING:
+                m_isSpeakingOrListening = false;
+                break;
+            case DialogUXState::LISTENING:
+                m_isSpeakingOrListening = true;
+            default:
+                break;
+        }
+    });
+}
+
+void GUIManager::onUserEvent() {
+    ACSDK_DEBUG0(LX(__func__).m(AudioInputProcessorObserverInterface::stateToString(m_audioInputProcessorState)));
+    if (AudioInputProcessorObserverInterface::State::EXPECTING_SPEECH == m_audioInputProcessorState) {
+        m_defaultClient->stopInteraction();
+    }
+}
+
+void GUIManager::onStateChanged(AudioInputProcessorObserverInterface::State state) {
+    m_audioInputProcessorState = state;
+
+    // Interrupt activity on speech recognizing
+    if (state == AudioInputProcessorObserverInterface::State::RECOGNIZING) {
+        handleGUIActivityEvent(
+            avsCommon::sdkInterfaces::GUIActivityEvent::INTERRUPT,
+            "AudioInputProcessor" + AudioInputProcessorObserverInterface::stateToString(state));
+    }
+}
+
+void GUIManager::onPlayerActivityChanged(avsCommon::avs::PlayerActivity state, const Context& context) {
+    m_executor.submit([this, state]() { m_playerActivityState = state; });
+}
+
+void GUIManager::onStateChanged(
+    const std::string& windowId,
+    const presentationOrchestratorInterfaces::PresentationMetadata& metadata) {
+    ACSDK_DEBUG(LX(__func__).d("windowId", windowId).d("interface", metadata.interfaceName));
+    if (!windowId.empty() && metadata.interfaceName.empty()) {
+        ACSDK_DEBUG(LX("clearWindow").d("windowId", windowId));
+        m_windowManagerIPCHandler->dispatchClearWindow(windowId);
+    }
+}
+
+void GUIManager::onFocusChanged(const std::string& channelName, FocusState newFocus) {
+    m_executor.submit([this, channelName, newFocus]() {
+        ACSDK_DEBUG(
+            LX("ChannelFocusChanged").d("channelName", channelName).d("newFocus", focusStateToString(newFocus)));
+
+        m_channelFocusStates[channelName] = newFocus;
+
+        /// Handle use case to clear Alerts channel when foregrounded.
+        if (channelName == avsCommon::sdkInterfaces::FocusManagerInterface::ALERT_CHANNEL_NAME &&
+            FocusState::FOREGROUND == newFocus && m_clearAlertChannelOnForegrounded) {
+            m_defaultClient->stopForegroundActivity();
+            forceClearDialogChannelFocus();
+            m_clearAlertChannelOnForegrounded = false;
+        }
+    });
+}
+
+void GUIManager::setClient(std::shared_ptr<sdkClient::SDKClientRegistry> clientRegistry) {
+    auto result = m_executor.submit([this, clientRegistry]() {
+        if (!clientRegistry) {
+            ACSDK_CRITICAL(LX("setClientFailed").d("reason", "null clientRegistry"));
+            return;
+        }
+        m_defaultClient = clientRegistry->get<defaultClient::DefaultClient>();
+        if (!m_defaultClient) {
+            ACSDK_CRITICAL(LX("setClientFailed").d("reason", "null default client"));
+            return;
+        }
+
+        auto visualStateTrackerFeatureClient = clientRegistry->get<featureClient::VisualStateTrackerFeatureClient>();
+        if (!visualStateTrackerFeatureClient) {
+            ACSDK_CRITICAL(LX("setClientFailed").d("reason", "null state tracker client"));
+            return;
+        }
+
+        m_presentationOrchestratorStateTracker =
+            visualStateTrackerFeatureClient->getPresentationOrchestratorStateTracker();
+        m_presentationOrchestratorStateTracker->addStateObserver(shared_from_this());
+
+        auto visualCharacteristicsFeatureClient =
+            clientRegistry->get<featureClient::VisualCharacteristicsFeatureClient>();
+        if (!visualCharacteristicsFeatureClient) {
+            ACSDK_CRITICAL(LX("setClientFailed").d("reason", "null visual characteristics client"));
+            return;
+        }
+
+        m_visualCharacteristics = visualCharacteristicsFeatureClient->getVisualCharacteristics();
+        m_visualCharacteristicsSerializer = visualCharacteristicsFeatureClient->getVisualCharacteristicsSerializer();
+
+        auto presentationOrchestratorFeatureClient =
+            clientRegistry->get<featureClient::PresentationOrchestratorFeatureClient>();
+        if (!presentationOrchestratorFeatureClient) {
+            ACSDK_CRITICAL(LX("setClientFailed").d("reason", "null presentation orchestrator feature client"));
+            return;
+        }
+
+        m_presentationOrchestrator = presentationOrchestratorFeatureClient->getPresentationOrchestrator();
+
+        auto alexaPresentationFeatureClient = clientRegistry->get<featureClient::AlexaPresentationFeatureClient>();
+        if (alexaPresentationFeatureClient) {
+            m_alexaPresentationAPL = alexaPresentationFeatureClient->getAPLCapabilityAgent();
+        } else {
+            ACSDK_WARN(LX("setClientIncomplete").d("reason", "null alexa presentation feature client"));
+        }
+
+        m_settingsManager = m_defaultClient->getSettingsManager();
+        if (!m_settingsManager) {
+            ACSDK_CRITICAL(LX("setClientFailed").d("reason", "Unable to retrieve settings manager"));
+            return;
+        }
+
+        m_timezoneHelper = TimezoneHelper::create(m_settingsManager);
+        if (!m_timezoneHelper) {
+            ACSDK_CRITICAL(LX("setClientFailed").d("reason", "Unable to create timezone helper"));
+        }
+    });
+    result.wait();
+}
+
+std::chrono::milliseconds GUIManager::getDeviceTimezoneOffset() {
+    if (!m_timezoneHelper) {
+        ACSDK_WARN(LX("getDeviceTimezoneOffsetFailed").d("reason", "null TimezoneHelper"));
+        return std::chrono::milliseconds::zero();
+    }
+    return m_timezoneHelper->getDeviceTimezoneOffset();
+}
+
+void GUIManager::doShutdown() {
+    ACSDK_DEBUG3(LX(__func__));
+    m_executor.shutdown();
+    m_guiClient.reset();
+    m_micWrapper.reset();
+    m_interactionManager.reset();
+}
+
+bool GUIManager::configureSettingsNotifications() {
+    bool future =
+        m_executor
+            .submit([this]() {
+                if (!m_settingsManager) {
+                    ACSDK_ERROR(LX("configureSettingsNotificationsFailed").d("reason", "nullSettingsManager"));
+                    return false;
+                }
+
+                m_callbacks = settings::SettingCallbacks<settings::DeviceSettingsManager>::create(m_settingsManager);
+
+                if (!m_callbacks) {
+                    ACSDK_ERROR(LX("configureSettingsNotificationsFailed").d("reason", "createCallbacksFailed"));
+                    return false;
+                }
+
+                bool callback = m_callbacks->add<settings::DeviceSettingsIndex::DO_NOT_DISTURB>(
+                    [this](bool enable, settings::SettingNotifications notifications) {
+                        if (m_doNotDisturbIPCHandler && m_settingsManager) {
+                            m_doNotDisturbIPCHandler->dispatchSetDoNotDisturbState(
+                                m_settingsManager->getValue<settings::DO_NOT_DISTURB>(false).second);
+                        } else {
+                            if (!m_doNotDisturbIPCHandler) {
+                                ACSDK_WARN(LX(__func__).d("reason", "doNotDisturbSettingHandlerNotFound"));
+                            }
+                            if (!m_settingsManager) {
+                                ACSDK_WARN(LX(__func__).d("reason", "settingsManagerNotFound"));
+                            }
+                        }
+                    });
+
+                callback &= m_callbacks->add<settings::DeviceSettingsIndex::LOCALE>(
+                    [this](const settings::DeviceLocales& value, settings::SettingNotifications notifications) {
+                        handleLocaleChange();
+                    });
+                return callback;
+            })
+            .get();
+
+    return future;
+}
+
+void GUIManager::handleLocaleChange() {
+    auto localeSetting = m_defaultClient->getSettingsManager()->getValue<settings::DeviceSettingsIndex::LOCALE>();
+    if (!localeSetting.first) {
+        ACSDK_WARN(LX(__func__).m("Invalid locales array from settings."));
+        return;
+    }
+    auto locales = localeSetting.second;
+    rapidjson::Document document;
+    document.SetArray();
+
+    auto& allocator = document.GetAllocator();
+    for (const auto& locale : locales) {
+        document.PushBack(rapidjson::Value().SetString(locale.c_str(), locale.length(), allocator), allocator);
+    }
+
+    rapidjson::StringBuffer strbuf;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(strbuf);
+    if (!document.Accept(writer)) {
+        ACSDK_WARN(LX(__func__).m("Error serializing document payload."));
+        return;
+    }
+
+    auto localeStr = strbuf.GetString();
+    ACSDK_DEBUG3(LX(__func__).d("LocaleChanged", localeStr));
+    m_guiClient->setLocales(localeStr);
+}
+
+void GUIManager::setIpcVersionManager(std::shared_ptr<ipc::IPCVersionManager> ipcVersionManager) {
+    m_ipcVersionManager = std::move(ipcVersionManager);
+}
+
+void GUIManager::setAPLRuntimePresentationAdapter(
+    std::shared_ptr<APLRuntimePresentationAdapter> aplRuntimePresentationAdapter) {
+    m_aplRuntimePresentationAdapter = std::move(aplRuntimePresentationAdapter);
+}
+
+void GUIManager::setTemplateRuntimePresentationAdapterBridge(
+    std::shared_ptr<TemplateRuntimePresentationAdapterBridge> templateRuntimePresentationAdapterBridge) {
+    m_templateRuntimePresentationAdapterBridge = std::move(templateRuntimePresentationAdapterBridge);
+}
+
+void GUIManager::handleOnMessagingServerConnectionOpened() {
+    if (m_doNotDisturbIPCHandler && m_settingsManager) {
+        m_doNotDisturbIPCHandler->dispatchSetDoNotDisturbState(
+            m_settingsManager->getValue<settings::DO_NOT_DISTURB>(false).second);
+    } else {
+        if (!m_doNotDisturbIPCHandler) {
+            ACSDK_WARN(LX(__func__).d("reason", "doNotDisturbSettingHandlerNotFound"));
+        }
+        if (!m_settingsManager) {
+            ACSDK_WARN(LX(__func__).d("reason", "settingsManagerNotFound"));
+        }
+    }
+}
+
+void GUIManager::handleDocumentTerminated(const std::string& token, bool failed) {
+    // Only stop audio if it is coming from APL Audio (SpeakItem, SpeakList, etc.)
+    if (APL_INTERFACE == m_interfaceHoldingAudioFocus) {
+        m_defaultClient->stopForegroundActivity();
+    }
+}
+
+/// === Workaround start ===
+/**
+ * In order to support multi-turn interactions SDK processes SpeechSynthesizer audio context in special way. This
+ * leads to skill context not been cleared on cloud side when we locally exit. In order to fix that we should grab
+ * DIALOG channel by interface processed in normal way and proceed as before.
+ * More global AVS C++ SDK solution to be implemented later.
+ */
+/// Interface name to use for focus requests.
+
+void GUIManager::forceClearDialogChannelFocus() {
+    ACSDK_DEBUG5(LX(__func__).m("Force Clear Dialog Channel"));
+    m_defaultClient->getAudioFocusManager()->acquireChannel(
+        avsCommon::sdkInterfaces::FocusManagerInterface::DIALOG_CHANNEL_NAME, shared_from_this(), APL_INTERFACE);
+}
+
+void GUIManager::onFocusChanged(avsCommon::avs::FocusState newFocus, avsCommon::avs::MixingBehavior behavior) {
+    if (newFocus == avsCommon::avs::FocusState::FOREGROUND) {
+        m_defaultClient->stopForegroundActivity();
+        m_defaultClient->stopInteraction();
+    }
+}
+/// === Workaround end ===
+
+#ifdef UWP_BUILD
+void GUIManager::inputAudioFile(const std::string& audioFile) {
+    bool errorOccured = false;
+    auto audioData = alexaSmartScreenSDK::sssdkCommon::AudioFileUtil::readAudioFromFile(audioFile, errorOccured);
+    if (errorOccured) {
+        return;
+    }
+    handleTapToTalk();
+    m_micWrapper->writeAudioData(audioData);
+}
+#endif
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUI/TemplateRuntimePresentationAdapterBridge.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUI/TemplateRuntimePresentationAdapterBridge.cpp
new file mode 100644
index 0000000000..dc462b2068
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUI/TemplateRuntimePresentationAdapterBridge.cpp
@@ -0,0 +1,101 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <memory>
+#include <string>
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "IPCServerSampleApp/GUI/TemplateRuntimePresentationAdapterBridge.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace gui {
+
+using namespace avsCommon::utils::json;
+
+#define TAG "TemplateRuntimePresentationAdapterBridge"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+std::shared_ptr<TemplateRuntimePresentationAdapterBridge> TemplateRuntimePresentationAdapterBridge::create(
+    const std::shared_ptr<sampleApplications::common::TemplateRuntimePresentationAdapter>&
+        templateRuntimePresentationAdapter) {
+    if (!templateRuntimePresentationAdapter) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullTemplateRuntimePresentationAdapter"));
+        return nullptr;
+    }
+
+    auto templateRuntimePresentationAdapterBridge = std::shared_ptr<TemplateRuntimePresentationAdapterBridge>(
+        new TemplateRuntimePresentationAdapterBridge(templateRuntimePresentationAdapter));
+
+    return templateRuntimePresentationAdapterBridge;
+}
+
+TemplateRuntimePresentationAdapterBridge::TemplateRuntimePresentationAdapterBridge(
+    std::shared_ptr<sampleApplications::common::TemplateRuntimePresentationAdapter>
+        templateRuntimePresentationAdapter) :
+        m_templateRuntimePresentationAdapter{std::move(templateRuntimePresentationAdapter)} {
+}
+
+bool TemplateRuntimePresentationAdapterBridge::setRenderPlayerInfoWindowId(
+    const std::string& renderPlayerInfoWindowId) {
+    if (m_renderPlayerInfoWindowId.empty()) {
+        m_templateRuntimePresentationAdapter->setRenderPlayerInfoWindowId(renderPlayerInfoWindowId);
+        return true;
+    } else {
+        ACSDK_WARN(LX(__func__).d("reason", "player info window id already set by TemplateRuntime windowIdReport."));
+        return false;
+    }
+}
+
+std::string TemplateRuntimePresentationAdapterBridge::getRenderPlayerInfoWindowId() {
+    return m_renderPlayerInfoWindowId;
+}
+
+void TemplateRuntimePresentationAdapterBridge::windowIdReport(const std::string& message) {
+    rapidjson::Document payload;
+    if (!jsonUtils::parseJSON(message, &payload)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+        return;
+    }
+
+    std::string renderTemplateWindowId;
+    if (!jsonUtils::retrieveValue(message, ipc::RENDER_TEMPLATE_WINDOW_ID_TAG, &renderTemplateWindowId)) {
+        ACSDK_WARN(LX(__func__).d("reason", "render template window ID not found"));
+    } else {
+        m_templateRuntimePresentationAdapter->setRenderTemplateWindowId(renderTemplateWindowId);
+    }
+
+    std::string renderPlayerInfoWindowId;
+    if (!jsonUtils::retrieveValue(message, ipc::RENDER_PLAYER_INFO_WINDOW_ID_TAG, &renderPlayerInfoWindowId)) {
+        ACSDK_WARN(LX(__func__).d("reason", "render player info window ID not found"));
+    } else {
+        m_renderPlayerInfoWindowId = renderPlayerInfoWindowId;
+        m_templateRuntimePresentationAdapter->setRenderPlayerInfoWindowId(m_renderPlayerInfoWindowId);
+    }
+}
+
+}  // namespace gui
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUILogBridge.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUILogBridge.cpp
new file mode 100644
index 0000000000..06ae31c3f7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/GUILogBridge.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include "IPCServerSampleApp/GUILogBridge.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/// String to identify log entries originating from this file.
+static const std::string TAG("GUILogBridge");
+
+/// String to identify event happened.
+static const std::string GUI_LOG_EVENT("GUILog");
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+/**
+ * Write an ACSDK log from the IPC Log Event
+ * @param logLevel IPCLogLevel
+ * @param message the message to log.
+ */
+void GUILogBridge::log(IPCLogLevel logLevel, const std::string& message) {
+    m_executor.submit([logLevel, message]() { executeLog(logLevel, message); });
+}
+
+void GUILogBridge::executeLog(IPCLogLevel logLevel, const std::string& message) {
+    switch (logLevel) {
+        case IPCLogLevel::DEBUG5:
+            ACSDK_DEBUG5(LX(GUI_LOG_EVENT).m(message));
+            break;
+        case IPCLogLevel::INFO:
+            ACSDK_INFO(LX(GUI_LOG_EVENT).m(message));
+            break;
+        case IPCLogLevel::ERROR:
+            ACSDK_ERROR(LX(GUI_LOG_EVENT).m(message));
+            break;
+        case IPCLogLevel::WARN:
+        default:
+            ACSDK_WARN(LX(GUI_LOG_EVENT).m(message));
+            break;
+    }
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/APLClientHandler.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/APLClientHandler.cpp
new file mode 100644
index 0000000000..ba115ff12b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/APLClientHandler.cpp
@@ -0,0 +1,172 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "IPCServerSampleApp/IPC/Components/APLClientHandler.h"
+#include "IPCServerSampleApp/IPC/Namespaces/APLClientNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::json;
+
+#define TAG "APLClientHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Constant for initializeRenderersRequest event.
+static const char INITIALIZE_RENDERERS_REQUEST_EVENT[] = "initializeRenderersRequest";
+
+/// Constant for metricsReport event.
+static const char METRICS_REPORT_EVENT[] = "metricsReport";
+
+/// Constant for viewhostEvent.
+static const char VIEWHOST_EVENT[] = "viewhostEvent";
+
+/// Constant for renderCompleted event.
+static const char RENDER_COMPLETED_EVENT[] = "renderCompleted";
+
+/// Constant for renderDocumentRequest event.
+static const char RENDER_DOCUMENT_REQUEST_EVENT[] = "renderDocumentRequest";
+
+/// Constant for executeCommandsRequest event.
+static const char EXECUTE_COMMANDS_REQUEST_EVENT[] = "executeCommandsRequest";
+
+/// Constant for clearDocumentRequest event.
+static const char CLEAR_DOCUMENT_REQUEST[] = "clearDocumentRequest";
+
+std::shared_ptr<APLClientHandler> APLClientHandler::create(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<APLClientHandlerInterface> aplClientComponent) {
+    if (!ipcHandlerRegistrar) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIpcHandlerRegistrar"));
+        return nullptr;
+    }
+
+    if (!aplClientComponent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullAPLClientComponent"));
+        return nullptr;
+    }
+
+    auto aplClientHandler = std::shared_ptr<APLClientHandler>(
+        new APLClientHandler(std::move(ipcHandlerRegistrar), std::move(aplClientComponent)));
+
+    if (aplClientHandler) {
+        aplClientHandler->registerHandlers();
+    }
+
+    return aplClientHandler;
+}
+
+APLClientHandler::APLClientHandler(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<APLClientHandlerInterface> aplClientComponent) :
+        IPCHandlerBase(IPCNamespaces::IPC_MSG_NAMESPACE_APL, std::make_shared<threading::Executor>()),
+        RequiresShutdown{TAG},
+        m_ipcHandlerRegistrar{std::move(ipcHandlerRegistrar)},
+        m_aplClientComponent{std::move(aplClientComponent)} {
+}
+
+void APLClientHandler::registerHandlers() {
+    /// Register @c APLClientHandler.
+    m_ipcDispatcher = m_ipcHandlerRegistrar->registerHandler(IPCNamespaces::IPC_MSG_NAMESPACE_APL, shared_from_this());
+    if (!m_ipcDispatcher) {
+        ACSDK_ERROR(LX("registerHandlerFailed").d("namespace", IPCNamespaces::IPC_MSG_NAMESPACE_APL));
+        return;
+    }
+    /// Register its methods to handle incoming events from the IPC client.
+    if (!registerIPCMessageHandlerMethod(INITIALIZE_RENDERERS_REQUEST_EVENT, [this](std::string message) {
+            m_aplClientComponent->initializeRenderersRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", INITIALIZE_RENDERERS_REQUEST_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(
+            METRICS_REPORT_EVENT, [this](std::string message) { m_aplClientComponent->metricsReport(message); })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", METRICS_REPORT_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(
+            VIEWHOST_EVENT, [this](std::string message) { m_aplClientComponent->viewhostEvent(message); })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", VIEWHOST_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(
+            RENDER_COMPLETED_EVENT, [this](std::string message) { m_aplClientComponent->renderCompleted(message); })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", RENDER_COMPLETED_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(RENDER_DOCUMENT_REQUEST_EVENT, [this](std::string message) {
+            m_aplClientComponent->renderDocumentRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", RENDER_DOCUMENT_REQUEST_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(EXECUTE_COMMANDS_REQUEST_EVENT, [this](std::string message) {
+            m_aplClientComponent->executeCommandsRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", EXECUTE_COMMANDS_REQUEST_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(CLEAR_DOCUMENT_REQUEST, [this](std::string message) {
+            m_aplClientComponent->clearDocumentRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", CLEAR_DOCUMENT_REQUEST));
+        return;
+    }
+}
+
+void APLClientHandler::dispatchCreateRenderer(const std::string& windowId, const std::string& token) {
+    m_executor->submit([this, windowId, token]() {
+        auto message = IPCNamespaces::AplCreateRendererMessage(windowId, token);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeDispatchCreateRenderer failed"));
+        }
+    });
+}
+
+void APLClientHandler::dispatchSendMessageToViewhost(const std::string& windowId, const std::string& payload) {
+    m_executor->submit([this, windowId, payload]() {
+        auto message = IPCNamespaces::AplViewhostMessage(windowId, payload);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeDispatchSendMessageToViewhost failed"));
+        }
+    });
+}
+
+void APLClientHandler::doShutdown() {
+    /// Deregister @c APLClientHandler.
+    if (!m_ipcHandlerRegistrar->deregisterHandler(IPCNamespaces::IPC_MSG_NAMESPACE_APL)) {
+        ACSDK_WARN(LX("deregisterHandlerFailed"));
+    }
+    m_ipcDispatcher.reset();
+    m_ipcHandlerRegistrar.reset();
+    m_aplClientComponent.reset();
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/AlexaCaptionsHandler.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/AlexaCaptionsHandler.cpp
new file mode 100644
index 0000000000..5541113fea
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/AlexaCaptionsHandler.cpp
@@ -0,0 +1,136 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/IPC/Components/AlexaCaptionsHandler.h"
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "IPCServerSampleApp/IPC/Namespaces/AlexaCaptionsNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::json;
+
+/// Logger tag.
+#define TAG "AlexaCaptionsHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// The message name for captions state changed.
+static const std::string NAME_CAPTIONS_STATE_CHANGED("captionsStateChanged");
+
+/// The message name for captions state request.
+static const std::string NAME_CAPTIONS_STATE_REQUEST("captionsStateRequest");
+
+/// The enabled json key in the message.
+static const char ENABLED_TAG[] = "enabled";
+
+std::shared_ptr<AlexaCaptionsHandler> AlexaCaptionsHandler::create(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage) {
+    if (!ipcHandlerRegistrar) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIpcHandlerRegistrar"));
+        return nullptr;
+    }
+
+    if (!miscStorage) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullCaptionManager"));
+        return nullptr;
+    }
+
+    auto alexaCaptionsHandler = std::shared_ptr<AlexaCaptionsHandler>(
+        new AlexaCaptionsHandler(std::move(ipcHandlerRegistrar), std::move(miscStorage)));
+
+    if (alexaCaptionsHandler) {
+        alexaCaptionsHandler->registerHandlers();
+    }
+
+    return alexaCaptionsHandler;
+}
+
+AlexaCaptionsHandler::AlexaCaptionsHandler(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage) :
+        IPCHandlerBase(IPCNamespaces::IPC_MSG_NAMESPACE_CAPTIONS, std::make_shared<threading::Executor>()),
+        RequiresShutdown{TAG},
+        m_ipcHandlerRegistrar{std::move(ipcHandlerRegistrar)},
+        m_captionManager{SmartScreenCaptionStateManager(miscStorage)} {
+}
+
+void AlexaCaptionsHandler::registerHandlers() {
+    /// Register @c AlexaCaptionsHandler.
+    m_ipcDispatcher =
+        m_ipcHandlerRegistrar->registerHandler(IPCNamespaces::IPC_MSG_NAMESPACE_CAPTIONS, shared_from_this());
+    if (!m_ipcDispatcher) {
+        ACSDK_ERROR(LX("registerHandlerFailed").d("namespace", IPCNamespaces::IPC_MSG_NAMESPACE_CAPTIONS));
+        return;
+    }
+
+    /// Register its methods to handle incoming events from the IPC client.
+    if (!registerIPCMessageHandlerMethod(NAME_CAPTIONS_STATE_CHANGED, [this](std::string message) {
+            bool enabled = false;
+
+            if (!jsonUtils::retrieveValue(message, ENABLED_TAG, &enabled)) {
+                ACSDK_ERROR(LX("executeHandleCaptionsStateChangedFailed").d("reason", "enabledNotFound"));
+                return;
+            }
+
+            m_captionManager.setCaptionsState(enabled);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", NAME_CAPTIONS_STATE_CHANGED));
+        return;
+    }
+
+    if (!registerIPCMessageHandlerMethod(NAME_CAPTIONS_STATE_REQUEST, [this](std::string message) {
+            auto response = ipc::IPCNamespaces::SetCaptionsStateMessage(m_captionManager.areCaptionsEnabled());
+            m_ipcDispatcher->dispatch(response.get());
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", NAME_CAPTIONS_STATE_REQUEST));
+        return;
+    }
+}
+
+void AlexaCaptionsHandler::renderCaptions(const std::string& payload) {
+    if (m_captionManager.areCaptionsEnabled()) {
+        ACSDK_DEBUG5(LX("renderCaptions"));
+
+        auto message = ipc::IPCNamespaces::RenderCaptionsMessage(payload);
+        m_ipcDispatcher->dispatch(message.get());
+    }
+}
+
+void AlexaCaptionsHandler::doShutdown() {
+    /// Deregister @c AlexaCaptionsHandler.
+    if (!m_ipcHandlerRegistrar->deregisterHandler(IPCNamespaces::IPC_MSG_NAMESPACE_CAPTIONS)) {
+        ACSDK_WARN(LX("deregisterHandlerFailed"));
+    }
+    m_ipcDispatcher.reset();
+    m_ipcHandlerRegistrar.reset();
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/AudioFocusManagerHandler.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/AudioFocusManagerHandler.cpp
new file mode 100644
index 0000000000..96fa844abc
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/AudioFocusManagerHandler.cpp
@@ -0,0 +1,141 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "IPCServerSampleApp/IPC/Components/AudioFocusManagerHandler.h"
+#include "IPCServerSampleApp/IPC/Namespaces/AudioFocusManagerNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::json;
+
+#define TAG "AudioFocusManagerHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Constant for acquireChannelRequest event.
+static const char ACQUIRE_CHANNEL_REQUEST_EVENT[] = "acquireChannelRequest";
+
+/// Constant for releaseChannelRequest event.
+static const char RELEASE_CHANNEL_REQUEST_EVENT[] = "releaseChannelRequest";
+
+/// Constant for focusChangedReport event.
+static const char FOCUS_CHANGED_REPORT_EVENT[] = "focusChangedReport";
+
+std::shared_ptr<AudioFocusManagerHandler> AudioFocusManagerHandler::create(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<AudioFocusManagerHandlerInterface> audioFocusManagerComponent) {
+    if (!ipcHandlerRegistrar) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIpcHandlerRegistrar"));
+        return nullptr;
+    }
+
+    if (!audioFocusManagerComponent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullAudioFocusManagerComponent"));
+        return nullptr;
+    }
+
+    auto audioFocusManagerHandler = std::shared_ptr<AudioFocusManagerHandler>(
+        new AudioFocusManagerHandler(std::move(ipcHandlerRegistrar), std::move(audioFocusManagerComponent)));
+
+    if (audioFocusManagerHandler) {
+        audioFocusManagerHandler->registerHandlers();
+    }
+
+    return audioFocusManagerHandler;
+}
+
+AudioFocusManagerHandler::AudioFocusManagerHandler(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<AudioFocusManagerHandlerInterface> audioFocusManagerComponent) :
+        IPCHandlerBase(IPCNamespaces::IPC_MSG_NAMESPACE_AUDIO_FOCUS_MANAGER, std::make_shared<threading::Executor>()),
+        RequiresShutdown{TAG},
+        m_ipcHandlerRegistrar{std::move(ipcHandlerRegistrar)},
+        m_audioFocusManagerComponent{std::move(audioFocusManagerComponent)} {
+}
+
+void AudioFocusManagerHandler::registerHandlers() {
+    /// Register @c AudioFocusManagerHandler.
+    m_ipcDispatcher = m_ipcHandlerRegistrar->registerHandler(
+        IPCNamespaces::IPC_MSG_NAMESPACE_AUDIO_FOCUS_MANAGER, shared_from_this());
+    if (!m_ipcDispatcher) {
+        ACSDK_ERROR(LX("registerHandlerFailed").d("namespace", IPCNamespaces::IPC_MSG_NAMESPACE_AUDIO_FOCUS_MANAGER));
+        return;
+    }
+    /// Register its methods to handle incoming events from the IPC client.
+    if (!registerIPCMessageHandlerMethod(ACQUIRE_CHANNEL_REQUEST_EVENT, [this](std::string message) {
+            m_audioFocusManagerComponent->acquireChannelRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", ACQUIRE_CHANNEL_REQUEST_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(RELEASE_CHANNEL_REQUEST_EVENT, [this](std::string message) {
+            m_audioFocusManagerComponent->releaseChannelRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", RELEASE_CHANNEL_REQUEST_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(FOCUS_CHANGED_REPORT_EVENT, [this](std::string message) {
+            m_audioFocusManagerComponent->focusChangedReport(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", FOCUS_CHANGED_REPORT_EVENT));
+        return;
+    }
+}
+
+void AudioFocusManagerHandler::processChannelResult(unsigned token, bool result) {
+    m_executor->submit([this, token, result]() {
+        auto message = IPCNamespaces::ProcessChannelResultMessage(token, result);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeProcessChannelResult failed"));
+        }
+    });
+}
+
+void AudioFocusManagerHandler::processFocusChanged(unsigned token, avsCommon::avs::FocusState focusState) {
+    m_executor->submit([this, token, focusState]() {
+        auto message = IPCNamespaces::ProcessFocusChangedMessage(token, focusState);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeProcessFocusChanged failed"));
+        }
+    });
+}
+
+void AudioFocusManagerHandler::doShutdown() {
+    /// Deregister @c AudioFocusManagerHandler.
+    if (!m_ipcHandlerRegistrar->deregisterHandler(IPCNamespaces::IPC_MSG_NAMESPACE_AUDIO_FOCUS_MANAGER)) {
+        ACSDK_WARN(LX("deregisterHandlerFailed"));
+    }
+
+    m_ipcDispatcher.reset();
+    m_ipcHandlerRegistrar.reset();
+    m_audioFocusManagerComponent.reset();
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/DoNotDisturbHandler.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/DoNotDisturbHandler.cpp
new file mode 100644
index 0000000000..8284d80784
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/DoNotDisturbHandler.cpp
@@ -0,0 +1,122 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "IPCServerSampleApp/IPC/Components/DoNotDisturbHandler.h"
+#include "IPCServerSampleApp/IPC/Namespaces/DoNotDisturbNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::json;
+
+#define TAG "DoNotDisturbHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Constant for doNotDisturbStateChanged event.
+static const char DO_NOT_DISTURB_STATE_CHANGED_EVENT[] = "doNotDisturbStateChanged";
+
+/// Constant for doNotDisturbStateRequest event.
+static const char DO_NOT_DISTURB_STATE_REQUEST_EVENT[] = "doNotDisturbStateRequest";
+
+std::shared_ptr<DoNotDisturbHandler> DoNotDisturbHandler::create(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<DoNotDisturbHandlerInterface> doNotDisturbComponent) {
+    if (!ipcHandlerRegistrar) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIpcHandlerRegistrar"));
+        return nullptr;
+    }
+
+    if (!doNotDisturbComponent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullDoNotDisturbComponent"));
+        return nullptr;
+    }
+
+    auto doNotDisturbHandler = std::shared_ptr<DoNotDisturbHandler>(
+        new DoNotDisturbHandler(std::move(ipcHandlerRegistrar), std::move(doNotDisturbComponent)));
+
+    if (doNotDisturbHandler) {
+        doNotDisturbHandler->registerHandlers();
+    }
+
+    return doNotDisturbHandler;
+}
+
+DoNotDisturbHandler::DoNotDisturbHandler(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<DoNotDisturbHandlerInterface> doNotDisturbComponent) :
+        IPCHandlerBase(IPCNamespaces::IPC_MSG_NAMESPACE_DO_NOT_DISTURB, std::make_shared<threading::Executor>()),
+        RequiresShutdown{TAG},
+        m_ipcHandlerRegistrar{std::move(ipcHandlerRegistrar)},
+        m_doNotDisturbComponent{std::move(doNotDisturbComponent)} {
+}
+
+void DoNotDisturbHandler::registerHandlers() {
+    /// Register @c DoNotDisturbHandler.
+    m_ipcDispatcher =
+        m_ipcHandlerRegistrar->registerHandler(IPCNamespaces::IPC_MSG_NAMESPACE_DO_NOT_DISTURB, shared_from_this());
+    if (!m_ipcDispatcher) {
+        ACSDK_ERROR(LX("registerHandlerFailed").d("namespace", IPCNamespaces::IPC_MSG_NAMESPACE_DO_NOT_DISTURB));
+        return;
+    }
+    /// Register its methods to handle incoming events from the IPC client.
+    if (!registerIPCMessageHandlerMethod(DO_NOT_DISTURB_STATE_CHANGED_EVENT, [this](std::string message) {
+            m_doNotDisturbComponent->doNotDisturbStateChanged(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", DO_NOT_DISTURB_STATE_CHANGED_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(DO_NOT_DISTURB_STATE_REQUEST_EVENT, [this](std::string message) {
+            m_doNotDisturbComponent->doNotDisturbStateRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", DO_NOT_DISTURB_STATE_REQUEST_EVENT));
+        return;
+    }
+}
+
+void DoNotDisturbHandler::dispatchSetDoNotDisturbState(bool enabled) {
+    m_executor->submit([this, enabled]() {
+        auto message = IPCNamespaces::SetDoNotDisturbStateMessage(enabled);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeDispatchSetDoNotDisturbState failed"));
+        }
+    });
+}
+
+void DoNotDisturbHandler::doShutdown() {
+    /// Deregister @c DoNotDisturbHandler.
+    if (!m_ipcHandlerRegistrar->deregisterHandler(IPCNamespaces::IPC_MSG_NAMESPACE_DO_NOT_DISTURB)) {
+        ACSDK_WARN(LX("deregisterHandlerFailed"));
+    }
+    m_ipcDispatcher.reset();
+    m_ipcHandlerRegistrar.reset();
+    m_doNotDisturbComponent.reset();
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/InteractionManagerHandler.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/InteractionManagerHandler.cpp
new file mode 100644
index 0000000000..0d2d40198a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/InteractionManagerHandler.cpp
@@ -0,0 +1,124 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "IPCServerSampleApp/IPC/Components/InteractionManagerHandler.h"
+#include "IPCServerSampleApp/IPC/Namespaces/InteractionManagerNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::json;
+
+#define TAG "InteractionManagerHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Constant for guiActivityEvent.
+static const char GUI_ACTIVITY_EVENT[] = "guiActivityEvent";
+
+/// Constant for navigationEvent.
+static const char NAVIGATION_EVENT[] = "navigationEvent";
+
+/// Constant for recognizeSpeechRequest event.
+static const char RECOGNIZE_SPEECH_REQUEST_EVENT[] = "recognizeSpeechRequest";
+
+std::shared_ptr<InteractionManagerHandler> InteractionManagerHandler::create(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<InteractionManagerHandlerInterface> interactionManagerComponent) {
+    if (!ipcHandlerRegistrar) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIpcHandlerRegistrar"));
+        return nullptr;
+    }
+
+    if (!interactionManagerComponent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullInteractionManagerComponent"));
+        return nullptr;
+    }
+
+    auto interactionManagerHandler = std::shared_ptr<InteractionManagerHandler>(
+        new InteractionManagerHandler(std::move(ipcHandlerRegistrar), std::move(interactionManagerComponent)));
+
+    if (interactionManagerHandler) {
+        interactionManagerHandler->registerHandlers();
+    }
+
+    return interactionManagerHandler;
+}
+
+InteractionManagerHandler::InteractionManagerHandler(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<InteractionManagerHandlerInterface> interactionManagerComponent) :
+        IPCHandlerBase(IPCNamespaces::IPC_MSG_NAMESPACE_INTERACTION_MANAGER, std::make_shared<threading::Executor>()),
+        RequiresShutdown{TAG},
+        m_ipcHandlerRegistrar{std::move(ipcHandlerRegistrar)},
+        m_interactionManagerComponent{std::move(interactionManagerComponent)} {
+}
+
+void InteractionManagerHandler::registerHandlers() {
+    /// Register @c InteractionManagerHandler.
+    m_ipcDispatcher = m_ipcHandlerRegistrar->registerHandler(
+        IPCNamespaces::IPC_MSG_NAMESPACE_INTERACTION_MANAGER, shared_from_this());
+    if (!m_ipcDispatcher) {
+        ACSDK_ERROR(LX("registerHandlerFailed").d("namespace", IPCNamespaces::IPC_MSG_NAMESPACE_INTERACTION_MANAGER));
+        return;
+    }
+
+    /// Register its methods to handle incoming events from the IPC client.
+    if (!registerIPCMessageHandlerMethod(GUI_ACTIVITY_EVENT, [this](std::string message) {
+            m_interactionManagerComponent->guiActivityEvent(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", GUI_ACTIVITY_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(NAVIGATION_EVENT, [this](std::string message) {
+            m_interactionManagerComponent->navigationEvent(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", NAVIGATION_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(RECOGNIZE_SPEECH_REQUEST_EVENT, [this](std::string message) {
+            m_interactionManagerComponent->recognizeSpeechRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", RECOGNIZE_SPEECH_REQUEST_EVENT));
+        return;
+    }
+}
+
+void InteractionManagerHandler::doShutdown() {
+    /// Deregister @c InteractionManagerHandler.
+    if (!m_ipcHandlerRegistrar->deregisterHandler(IPCNamespaces::IPC_MSG_NAMESPACE_INTERACTION_MANAGER)) {
+        ACSDK_WARN(LX("deregisterHandlerFailed"));
+    }
+
+    m_ipcDispatcher.reset();
+    m_ipcHandlerRegistrar.reset();
+    m_interactionManagerComponent.reset();
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/LiveViewCameraHandler.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/LiveViewCameraHandler.cpp
new file mode 100644
index 0000000000..dab395e2c0
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/LiveViewCameraHandler.cpp
@@ -0,0 +1,149 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "IPCServerSampleApp/IPC/Components/LiveViewCameraHandler.h"
+#include "IPCServerSampleApp/IPC/Namespaces/LiveViewCameraNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::json;
+
+#define TAG "LiveViewCameraHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Constant for cameraMicrophoneStateChanged event.
+static const char CAMERA_MICROPHONE_STATE_CHANGED_EVENT[] = "cameraMicrophoneStateChanged";
+
+/// Constant for cameraFirstFrameRendered event.
+static const char CAMERA_FIRST_FRAME_RENDERED_EVENT[] = "cameraFirstFrameRendered";
+
+/// Constant for windowIdReport event.
+static const char WINDOW_ID_REPORT_EVENT[] = "windowIdReport";
+
+std::shared_ptr<LiveViewCameraHandler> LiveViewCameraHandler::create(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<LiveViewCameraHandlerInterface> liveViewCameraComponent) {
+    if (!ipcHandlerRegistrar) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIpcHandlerRegistrar"));
+        return nullptr;
+    }
+
+    if (!liveViewCameraComponent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullLiveViewCameraComponent"));
+        return nullptr;
+    }
+
+    auto liveViewCameraHandler = std::shared_ptr<LiveViewCameraHandler>(
+        new LiveViewCameraHandler(std::move(ipcHandlerRegistrar), std::move(liveViewCameraComponent)));
+
+    if (liveViewCameraHandler) {
+        liveViewCameraHandler->registerHandlers();
+    }
+
+    return liveViewCameraHandler;
+}
+
+LiveViewCameraHandler::LiveViewCameraHandler(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<LiveViewCameraHandlerInterface> liveViewCameraComponent) :
+        IPCHandlerBase(IPCNamespaces::IPC_MSG_NAMESPACE_LIVE_VIEW_CAMERA, std::make_shared<threading::Executor>()),
+        RequiresShutdown{TAG},
+        m_ipcHandlerRegistrar{std::move(ipcHandlerRegistrar)},
+        m_liveViewCameraComponent{std::move(liveViewCameraComponent)} {
+}
+
+void LiveViewCameraHandler::registerHandlers() {
+    /// Register @c LiveViewCameraHandler.
+    m_ipcDispatcher =
+        m_ipcHandlerRegistrar->registerHandler(IPCNamespaces::IPC_MSG_NAMESPACE_LIVE_VIEW_CAMERA, shared_from_this());
+    if (!m_ipcDispatcher) {
+        ACSDK_ERROR(LX("registerHandlerFailed").d("namespace", IPCNamespaces::IPC_MSG_NAMESPACE_LIVE_VIEW_CAMERA));
+        return;
+    }
+    /// Register its methods to handle incoming events from the IPC client.
+    if (!registerIPCMessageHandlerMethod(CAMERA_MICROPHONE_STATE_CHANGED_EVENT, [this](std::string message) {
+            m_liveViewCameraComponent->cameraMicrophoneStateChanged(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", CAMERA_MICROPHONE_STATE_CHANGED_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(CAMERA_FIRST_FRAME_RENDERED_EVENT, [this](std::string message) {
+            m_liveViewCameraComponent->cameraFirstFrameRendered(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", CAMERA_FIRST_FRAME_RENDERED_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(WINDOW_ID_REPORT_EVENT, [this](std::string message) {
+            m_liveViewCameraComponent->windowIdReport(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", WINDOW_ID_REPORT_EVENT));
+        return;
+    }
+}
+
+void LiveViewCameraHandler::renderCamera(const std::string& startLiveViewPayload) {
+    m_executor->submit([this, startLiveViewPayload]() {
+        auto message = IPCNamespaces::RenderCameraMessage(startLiveViewPayload);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("renderCamera failed"));
+        }
+    });
+}
+
+void LiveViewCameraHandler::setCameraState(const std::string& cameraState) {
+    m_executor->submit([this, cameraState]() {
+        auto message = IPCNamespaces::SetCameraStateMessage(cameraState);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("setCameraState failed"));
+        }
+    });
+}
+
+void LiveViewCameraHandler::clearCamera() {
+    m_executor->submit([this]() {
+        auto message = IPCNamespaces::ClearCameraMessage();
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("clearCamera failed"));
+        }
+    });
+}
+
+void LiveViewCameraHandler::doShutdown() {
+    /// Deregister @c LiveViewCameraHandler.
+    if (!m_ipcHandlerRegistrar->deregisterHandler(IPCNamespaces::IPC_MSG_NAMESPACE_LIVE_VIEW_CAMERA)) {
+        ACSDK_WARN(LX("deregisterHandlerFailed"));
+    }
+    m_ipcDispatcher.reset();
+    m_ipcHandlerRegistrar.reset();
+    m_liveViewCameraComponent.reset();
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/LoggerHandler.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/LoggerHandler.cpp
new file mode 100644
index 0000000000..2c2d067235
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/LoggerHandler.cpp
@@ -0,0 +1,105 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "IPCServerSampleApp/IPC/Components/LoggerHandler.h"
+#include "IPCServerSampleApp/IPC/Namespaces/LoggerNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::json;
+
+#define TAG "LoggerHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Constant for guiActivityEvent.
+static const char LOG_EVENT[] = "logEvent";
+
+std::shared_ptr<LoggerHandler> LoggerHandler::create(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<LoggerHandlerInterface> loggerComponent) {
+    if (!ipcHandlerRegistrar) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIpcHandlerRegistrar"));
+        return nullptr;
+    }
+
+    if (!loggerComponent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullLoggerComponent"));
+        return nullptr;
+    }
+
+    auto loggerHandler =
+        std::shared_ptr<LoggerHandler>(new LoggerHandler(std::move(ipcHandlerRegistrar), std::move(loggerComponent)));
+
+    if (loggerHandler) {
+        loggerHandler->registerHandlers();
+    }
+
+    return loggerHandler;
+}
+
+LoggerHandler::LoggerHandler(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<LoggerHandlerInterface> loggerComponent) :
+        IPCHandlerBase(IPCNamespaces::IPC_MSG_NAMESPACE_LOGGER, std::make_shared<threading::Executor>()),
+        RequiresShutdown{TAG},
+        m_ipcHandlerRegistrar{std::move(ipcHandlerRegistrar)},
+        m_loggerComponent{std::move(loggerComponent)} {
+}
+
+void LoggerHandler::registerHandlers() {
+    /// Register @c LoggerHandler.
+    m_ipcDispatcher =
+        m_ipcHandlerRegistrar->registerHandler(IPCNamespaces::IPC_MSG_NAMESPACE_LOGGER, shared_from_this());
+    if (!m_ipcDispatcher) {
+        ACSDK_ERROR(LX("registerHandlerFailed").d("namespace", IPCNamespaces::IPC_MSG_NAMESPACE_LOGGER));
+        return;
+    }
+
+    /// Register its methods to handle incoming events from the IPC client.
+    if (!registerIPCMessageHandlerMethod(
+            LOG_EVENT, [this](std::string message) { m_loggerComponent->logEvent(message); })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", LOG_EVENT));
+        return;
+    }
+}
+
+void LoggerHandler::doShutdown() {
+    /// Deregister @c LoggerHandler.
+    if (!m_ipcHandlerRegistrar->deregisterHandler(IPCNamespaces::IPC_MSG_NAMESPACE_LOGGER)) {
+        ACSDK_WARN(LX("deregisterHandlerFailed"));
+    }
+
+    m_ipcDispatcher.reset();
+    m_ipcHandlerRegistrar.reset();
+    m_loggerComponent.reset();
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/SessionSetupHandler.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/SessionSetupHandler.cpp
new file mode 100644
index 0000000000..6088a537ce
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/SessionSetupHandler.cpp
@@ -0,0 +1,146 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "IPCServerSampleApp/IPC/Components/SessionSetupHandler.h"
+#include "IPCServerSampleApp/IPC/Namespaces/SessionSetupNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::json;
+
+#define TAG "SessionSetupHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Constant for namespaceVersionsReport event.
+static const char NAMESPACE_VERSIONS_REPORT_EVENT[] = "namespaceVersionsReport";
+
+/// Constant for clientInitialized event.
+static const char CLIENT_INITIALIZED_EVENT[] = "clientInitialized";
+
+/// Constant for clientConfigRequest event.
+static const char CLIENT_CONFIG_REQUEST_EVENT[] = "clientConfigRequest";
+
+/// The key in our config file to find the root of sample client configuration
+static const std::string SAMPLE_CLIENT_CONFIGURATION_ROOT_KEY = "sampleClientConfig";
+
+std::shared_ptr<SessionSetupHandler> SessionSetupHandler::create(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<SessionSetupHandlerInterface> sessionSetupComponent) {
+    if (!ipcHandlerRegistrar) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIpcHandlerRegistrar"));
+        return nullptr;
+    }
+
+    if (!sessionSetupComponent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullSessionSetupComponent"));
+        return nullptr;
+    }
+
+    auto sessionSetupHandler = std::shared_ptr<SessionSetupHandler>(
+        new SessionSetupHandler(std::move(ipcHandlerRegistrar), std::move(sessionSetupComponent)));
+
+    if (sessionSetupHandler) {
+        sessionSetupHandler->registerHandlers();
+    }
+
+    return sessionSetupHandler;
+}
+
+SessionSetupHandler::SessionSetupHandler(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<SessionSetupHandlerInterface> sessionSetupComponent) :
+        IPCHandlerBase(IPCNamespaces::IPC_MSG_NAMESPACE_SESSION_SETUP, std::make_shared<threading::Executor>()),
+        RequiresShutdown{TAG},
+        m_ipcHandlerRegistrar{std::move(ipcHandlerRegistrar)},
+        m_sessionSetupComponent{std::move(sessionSetupComponent)} {
+}
+
+void SessionSetupHandler::registerHandlers() {
+    /// Register @c SessionSetupHandler.
+    m_ipcDispatcher =
+        m_ipcHandlerRegistrar->registerHandler(IPCNamespaces::IPC_MSG_NAMESPACE_SESSION_SETUP, shared_from_this());
+    if (!m_ipcDispatcher) {
+        ACSDK_ERROR(LX("registerHandlerFailed").d("namespace", IPCNamespaces::IPC_MSG_NAMESPACE_SESSION_SETUP));
+        return;
+    }
+    /// Register its methods to handle incoming events from the IPC client.
+    if (!registerIPCMessageHandlerMethod(NAMESPACE_VERSIONS_REPORT_EVENT, [this](std::string message) {
+            m_sessionSetupComponent->namespaceVersionsReport(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", NAMESPACE_VERSIONS_REPORT_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(CLIENT_INITIALIZED_EVENT, [this](std::string message) {
+            m_sessionSetupComponent->clientInitialized(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", CLIENT_INITIALIZED_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(CLIENT_CONFIG_REQUEST_EVENT, [this](std::string message) {
+            m_sessionSetupComponent->clientConfigRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", CLIENT_CONFIG_REQUEST_EVENT));
+        return;
+    }
+}
+
+void SessionSetupHandler::dispatchConfigureClient(const std::string& payload) {
+    m_executor->submit([this, payload]() {
+        /// Get the root ConfigurationNode.
+        auto configurationRoot = avsCommon::utils::configuration::ConfigurationNode::getRoot();
+        auto message =
+            IPCNamespaces::ConfigureClientMessage(configurationRoot[SAMPLE_CLIENT_CONFIGURATION_ROOT_KEY].serialize());
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeDispatchConfigureClient failed"));
+        }
+    });
+}
+
+void SessionSetupHandler::dispatchInitializeClient(const std::string& ipcVersion) {
+    m_executor->submit([this, ipcVersion]() {
+        auto message = IPCNamespaces::InitClientMessage(ipcVersion);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeDispatchInitializeClient failed"));
+        }
+    });
+}
+
+void SessionSetupHandler::doShutdown() {
+    /// Deregister @c SessionSetupHandler.
+    if (!m_ipcHandlerRegistrar->deregisterHandler(IPCNamespaces::IPC_MSG_NAMESPACE_SESSION_SETUP)) {
+        ACSDK_WARN(LX("deregisterHandlerFailed"));
+    }
+    m_ipcDispatcher.reset();
+    m_ipcHandlerRegistrar.reset();
+    m_sessionSetupComponent.reset();
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/SystemHandler.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/SystemHandler.cpp
new file mode 100644
index 0000000000..570cf814af
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/SystemHandler.cpp
@@ -0,0 +1,169 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "IPCServerSampleApp/IPC/Components/SystemHandler.h"
+#include "IPCServerSampleApp/IPC/Namespaces/SystemNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::json;
+
+#define TAG "SystemHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Constant for alexaStateRequest event.
+static const char ALEXA_STATE_REQUEST_EVENT[] = "alexaStateRequest";
+
+/// Constant for authorizationInfoRequest event.
+static const char AUTHORIZATION_INFO_REQUEST_EVENT[] = "authorizationInfoRequest";
+
+/// Constant for authorizationStateRequest event.
+static const char AUTHORIZATION_STATE_REQUEST_EVENT[] = "authorizationStateRequest";
+
+/// Constant for localesRequest event.
+static const char LOCALES_REQUEST_EVENT[] = "localesRequest";
+
+std::shared_ptr<SystemHandler> SystemHandler::create(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<SystemHandlerInterface> systemComponent) {
+    if (!ipcHandlerRegistrar) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIpcHandlerRegistrar"));
+        return nullptr;
+    }
+
+    if (!systemComponent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullSystemComponent"));
+        return nullptr;
+    }
+
+    auto systemHandler =
+        std::shared_ptr<SystemHandler>(new SystemHandler(std::move(ipcHandlerRegistrar), std::move(systemComponent)));
+
+    if (systemHandler) {
+        systemHandler->registerHandlers();
+    }
+
+    return systemHandler;
+}
+
+SystemHandler::SystemHandler(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<SystemHandlerInterface> systemComponent) :
+        IPCHandlerBase(IPCNamespaces::IPC_MSG_NAMESPACE_SYSTEM, std::make_shared<threading::Executor>()),
+        RequiresShutdown{TAG},
+        m_ipcHandlerRegistrar{std::move(ipcHandlerRegistrar)},
+        m_systemComponent{std::move(systemComponent)} {
+}
+
+void SystemHandler::registerHandlers() {
+    /// Register @c SystemHandler.
+    m_ipcDispatcher =
+        m_ipcHandlerRegistrar->registerHandler(IPCNamespaces::IPC_MSG_NAMESPACE_SYSTEM, shared_from_this());
+    if (!m_ipcDispatcher) {
+        ACSDK_ERROR(LX("registerHandlerFailed").d("namespace", IPCNamespaces::IPC_MSG_NAMESPACE_SYSTEM));
+        return;
+    }
+    /// Register its methods to handle incoming events from the IPC client.
+    if (!registerIPCMessageHandlerMethod(ALEXA_STATE_REQUEST_EVENT, [this](std::string message) {
+            m_systemComponent->alexaStateRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", ALEXA_STATE_REQUEST_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(AUTHORIZATION_INFO_REQUEST_EVENT, [this](std::string message) {
+            m_systemComponent->authorizationInfoRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", AUTHORIZATION_INFO_REQUEST_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(AUTHORIZATION_STATE_REQUEST_EVENT, [this](std::string message) {
+            m_systemComponent->authorizationStateRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", AUTHORIZATION_STATE_REQUEST_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(
+            LOCALES_REQUEST_EVENT, [this](std::string message) { m_systemComponent->localesRequest(message); })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", LOCALES_REQUEST_EVENT));
+        return;
+    }
+}
+
+void SystemHandler::completeAuthorization(
+    const std::string& url,
+    const std::string& code,
+    const std::string& clientId) {
+    m_executor->submit([this, url, code, clientId]() {
+        auto message = ipc::IPCNamespaces::CompleteAuthorizationMessage(url, code, clientId);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeCompleteAuthorization failed"));
+        }
+    });
+}
+
+void SystemHandler::setAlexaState(const std::string& state) {
+    m_executor->submit([this, state]() {
+        auto message = ipc::IPCNamespaces::SetAlexaStateMessage(state);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeSetAlexaState failed"));
+        }
+    });
+}
+
+void SystemHandler::setAuthorizationState(const std::string& state) {
+    m_executor->submit([this, state]() {
+        auto message = ipc::IPCNamespaces::SetAuthorizationStateMessage(state);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeSetAuthorizationState failed"));
+        }
+    });
+}
+
+void SystemHandler::setLocales(const std::string& localeStr) {
+    m_executor->submit([this, localeStr]() {
+        auto message = ipc::IPCNamespaces::SetLocalesMessage(localeStr);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeSetLocales failed"));
+        }
+    });
+}
+
+void SystemHandler::doShutdown() {
+    /// Deregister @c SystemHandler.
+    if (!m_ipcHandlerRegistrar->deregisterHandler(IPCNamespaces::IPC_MSG_NAMESPACE_SYSTEM)) {
+        ACSDK_WARN(LX("deregisterHandlerFailed"));
+    }
+
+    m_ipcDispatcher.reset();
+    m_ipcHandlerRegistrar.reset();
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/TemplateRuntimeHandler.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/TemplateRuntimeHandler.cpp
new file mode 100644
index 0000000000..cf7955570f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/TemplateRuntimeHandler.cpp
@@ -0,0 +1,146 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <acsdk/TemplateRuntimeInterfaces/TemplateRuntimeObserverInterface.h>
+
+#include "IPCServerSampleApp/IPC/Components/TemplateRuntimeHandler.h"
+#include "IPCServerSampleApp/IPC/HandlerInterfaces/TemplateRuntimeHandlerInterface.h"
+#include "IPCServerSampleApp/IPC/Namespaces/TemplateRuntimeNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::json;
+
+#define TAG "TemplateRuntimeHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Constant for windowIdReport event.
+static const char TEMPLATE_RUNTIME_WINDOW_ID_REPORT_EVENT[] = "windowIdReport";
+
+std::shared_ptr<TemplateRuntimeHandler> TemplateRuntimeHandler::create(
+    const std::shared_ptr<IPCHandlerRegistrationInterface>& ipcHandlerRegistrar,
+    const std::shared_ptr<TemplateRuntimeHandlerInterface>& templateRuntimeComponent) {
+    if (!ipcHandlerRegistrar) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIpcHandlerRegistrar"));
+        return nullptr;
+    }
+
+    if (!templateRuntimeComponent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullTemplateRuntimeComponent"));
+        return nullptr;
+    }
+
+    auto templateRuntimeHandler = std::shared_ptr<TemplateRuntimeHandler>(
+        new TemplateRuntimeHandler(std::move(ipcHandlerRegistrar), std::move(templateRuntimeComponent)));
+
+    if (templateRuntimeHandler) {
+        templateRuntimeHandler->registerHandlers();
+    }
+
+    return templateRuntimeHandler;
+}
+
+TemplateRuntimeHandler::TemplateRuntimeHandler(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<TemplateRuntimeHandlerInterface> templateRuntimeComponent) :
+        IPCHandlerBase(IPCNamespaces::IPC_MSG_NAMESPACE_TEMPLATE_RUNTIME, std::make_shared<threading::Executor>()),
+        RequiresShutdown{TAG},
+        m_ipcHandlerRegistrar{std::move(ipcHandlerRegistrar)},
+        m_templateRuntimeComponent{std::move(templateRuntimeComponent)} {
+}
+
+void TemplateRuntimeHandler::registerHandlers() {
+    /// Register @c TemplateRuntimeHandler.
+    m_ipcDispatcher =
+        m_ipcHandlerRegistrar->registerHandler(IPCNamespaces::IPC_MSG_NAMESPACE_TEMPLATE_RUNTIME, shared_from_this());
+    if (!m_ipcDispatcher) {
+        ACSDK_ERROR(LX("registerHandlerFailed").d("namespace", IPCNamespaces::IPC_MSG_NAMESPACE_TEMPLATE_RUNTIME));
+        return;
+    }
+
+    /// Register its methods to handle incoming events from the IPC client.
+    if (!registerIPCMessageHandlerMethod(TEMPLATE_RUNTIME_WINDOW_ID_REPORT_EVENT, [this](const std::string& message) {
+            m_templateRuntimeComponent->windowIdReport(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", TEMPLATE_RUNTIME_WINDOW_ID_REPORT_EVENT));
+        return;
+    }
+}
+
+void TemplateRuntimeHandler::renderPlayerInfoCard(
+    const std::string& payload,
+    templateRuntimeInterfaces::TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) {
+    m_executor->submit([this, payload, audioPlayerInfo]() {
+        auto message = ipc::IPCNamespaces::RenderPlayerInfoMessage(payload, audioPlayerInfo);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("renderPlayerInfoCard failed"));
+        }
+    });
+}
+
+void TemplateRuntimeHandler::renderTemplateCard(const std::string& payload) {
+    m_executor->submit([this, payload]() {
+        auto message = ipc::IPCNamespaces::RenderTemplateMessage(payload);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("renderTemplateCard failed"));
+        }
+    });
+}
+
+void TemplateRuntimeHandler::clearPlayerInfoCard() {
+    m_executor->submit([this]() {
+        auto message = ipc::IPCNamespaces::ClearPlayerInfoCardMessage();
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("clearPlayerInfoCard failed"));
+        }
+    });
+}
+
+void TemplateRuntimeHandler::clearRenderTemplateCard() {
+    m_executor->submit([this]() {
+        auto message = ipc::IPCNamespaces::ClearRenderTemplateCardMessage();
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("clearRenderTemplateCard failed"));
+        }
+    });
+}
+
+void TemplateRuntimeHandler::doShutdown() {
+    /// Deregister @c TemplateRuntimeHandler.
+    if (!m_ipcHandlerRegistrar->deregisterHandler(IPCNamespaces::IPC_MSG_NAMESPACE_TEMPLATE_RUNTIME)) {
+        ACSDK_WARN(LX("deregisterHandlerFailed"));
+    }
+
+    m_ipcDispatcher.reset();
+    m_ipcHandlerRegistrar.reset();
+    m_templateRuntimeComponent.reset();
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/WindowManagerHandler.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/WindowManagerHandler.cpp
new file mode 100644
index 0000000000..e34c1eff53
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/Components/WindowManagerHandler.cpp
@@ -0,0 +1,173 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "IPCServerSampleApp/IPC/Components/WindowManagerHandler.h"
+#include "IPCServerSampleApp/IPC/Namespaces/WindowManagerNamespace.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::json;
+
+#define TAG "WindowManagerHandler"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Constant for visualCharacteristicsRequest event.
+static const char VISUAL_CHARACTERISTICS_REQUEST_EVENT[] = "visualCharacteristicsRequest";
+
+/// Constant for defaultWindowInstanceChanged event.
+static const char DEFAULT_WINDOW_INSTANCE_CHANGED_EVENT[] = "defaultWindowInstanceChanged";
+
+/// Constant for windowInstancesReport event.
+static const char WINDOW_INSTANCES_REPORT_EVENT[] = "windowInstancesReport";
+
+/// Constant for windowInstancesAdded event.
+static const char WINDOW_INSTANCES_ADDED_EVENT[] = "windowInstancesAdded";
+
+/// Constant for windowInstancesRemoved event.
+static const char WINDOW_INSTANCES_REMOVED_EVENT[] = "windowInstancesRemoved";
+
+/// Constant for windowInstancesUpdated event.
+static const char WINDOW_INSTANCES_UPDATED_EVENT[] = "windowInstancesUpdated";
+
+std::shared_ptr<WindowManagerHandler> WindowManagerHandler::create(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<WindowManagerHandlerInterface> windowManagerComponent) {
+    if (!ipcHandlerRegistrar) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIpcHandlerRegistrar"));
+        return nullptr;
+    }
+
+    if (!windowManagerComponent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullWindowManagerComponent"));
+        return nullptr;
+    }
+
+    auto windowManagerHandler = std::shared_ptr<WindowManagerHandler>(
+        new WindowManagerHandler(std::move(ipcHandlerRegistrar), std::move(windowManagerComponent)));
+
+    if (windowManagerHandler) {
+        windowManagerHandler->registerHandlers();
+    }
+
+    return windowManagerHandler;
+}
+
+WindowManagerHandler::WindowManagerHandler(
+    std::shared_ptr<IPCHandlerRegistrationInterface> ipcHandlerRegistrar,
+    std::shared_ptr<WindowManagerHandlerInterface> windowManagerComponent) :
+        IPCHandlerBase(IPCNamespaces::IPC_MSG_NAMESPACE_WINDOW_MANAGER, std::make_shared<threading::Executor>()),
+        RequiresShutdown{TAG},
+        m_ipcHandlerRegistrar{std::move(ipcHandlerRegistrar)},
+        m_windowManagerComponent{std::move(windowManagerComponent)} {
+}
+
+void WindowManagerHandler::registerHandlers() {
+    /// Register @c WindowManagerHandler.
+    m_ipcDispatcher =
+        m_ipcHandlerRegistrar->registerHandler(IPCNamespaces::IPC_MSG_NAMESPACE_WINDOW_MANAGER, shared_from_this());
+    if (!m_ipcDispatcher) {
+        ACSDK_ERROR(LX("registerHandlerFailed").d("namespace", IPCNamespaces::IPC_MSG_NAMESPACE_WINDOW_MANAGER));
+        return;
+    }
+
+    /// Register its methods to handle incoming events from the IPC client.
+    if (!registerIPCMessageHandlerMethod(VISUAL_CHARACTERISTICS_REQUEST_EVENT, [this](std::string message) {
+            m_windowManagerComponent->visualCharacteristicsRequest(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", VISUAL_CHARACTERISTICS_REQUEST_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(DEFAULT_WINDOW_INSTANCE_CHANGED_EVENT, [this](std::string message) {
+            m_windowManagerComponent->defaultWindowInstanceChanged(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", DEFAULT_WINDOW_INSTANCE_CHANGED_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(WINDOW_INSTANCES_REPORT_EVENT, [this](std::string message) {
+            m_windowManagerComponent->windowInstancesReport(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", WINDOW_INSTANCES_REPORT_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(WINDOW_INSTANCES_ADDED_EVENT, [this](std::string message) {
+            m_windowManagerComponent->windowInstancesAdded(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", WINDOW_INSTANCES_ADDED_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(WINDOW_INSTANCES_REMOVED_EVENT, [this](std::string message) {
+            m_windowManagerComponent->windowInstancesRemoved(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", WINDOW_INSTANCES_REMOVED_EVENT));
+        return;
+    }
+    if (!registerIPCMessageHandlerMethod(WINDOW_INSTANCES_UPDATED_EVENT, [this](std::string message) {
+            m_windowManagerComponent->windowInstancesUpdated(message);
+        })) {
+        ACSDK_ERROR(LX("registerIPCMessageHandlerMethod").d("methodName", WINDOW_INSTANCES_UPDATED_EVENT));
+        return;
+    }
+}
+
+void WindowManagerHandler::dispatchSetVisualCharacteristics(
+    const avsCommon::utils::Optional<std::string>& displayCharacteristicOpt,
+    const avsCommon::utils::Optional<std::string>& interactionModesOpt,
+    const avsCommon::utils::Optional<std::string>& windowTemplatesOpt) {
+    m_executor->submit([this, displayCharacteristicOpt, interactionModesOpt, windowTemplatesOpt]() {
+        auto message = IPCNamespaces::SetVisualCharacteristicsMessage(
+            displayCharacteristicOpt, interactionModesOpt, windowTemplatesOpt);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeDispatchSetVisualCharacteristics failed"));
+        }
+    });
+}
+
+void WindowManagerHandler::dispatchClearWindow(const std::string& windowId) {
+    m_executor->submit([this, windowId]() {
+        auto message = IPCNamespaces::ClearWindowMessage(windowId);
+        if (!m_ipcDispatcher || !m_ipcDispatcher->dispatch(message.get())) {
+            ACSDK_ERROR(LX("executeDispatchClearWindow failed"));
+        }
+    });
+}
+
+void WindowManagerHandler::doShutdown() {
+    /// Deregister @c WindowManagerHandler.
+    if (!m_ipcHandlerRegistrar->deregisterHandler(IPCNamespaces::IPC_MSG_NAMESPACE_WINDOW_MANAGER)) {
+        ACSDK_WARN(LX("deregisterHandlerFailed"));
+    }
+
+    m_ipcDispatcher.reset();
+    m_ipcHandlerRegistrar.reset();
+    m_windowManagerComponent.reset();
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/IPCHandlerBase.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/IPCHandlerBase.cpp
new file mode 100644
index 0000000000..bd37a7b1bd
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/IPCHandlerBase.cpp
@@ -0,0 +1,98 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/IPC/IPCHandlerBase.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+/// Literal to identify log entries originating from this file.
+#define TAG "IPCHandlerBase"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+using namespace alexaClientSDK::avsCommon::utils::threading;
+
+IPCHandlerBase::IPCHandlerBase(const std::string& namespaceName, std::shared_ptr<Executor> executor) :
+        m_namespaceName{namespaceName},
+        m_executor{executor} {
+    if (!executor) {
+        ACSDK_CRITICAL(
+            LX("IPCHandlerBase").d("reason", "nullExecutor").m("Expect child class to provide the executor"));
+    }
+}
+
+void IPCHandlerBase::invokeMethod(const std::string& methodName, const std::string& message) {
+    m_executor->submit([this, methodName, message] {
+        auto it = m_messageHandlers.find(methodName);
+        if (it != m_messageHandlers.end()) {
+            it->second(message);
+        } else {
+            ACSDK_WARN(LX("invokeMethod").d("reason", "unknownMethod").d("IPCMessageName", methodName));
+        }
+    });
+}
+
+bool IPCHandlerBase::registerIPCMessageHandlerMethod(const std::string& methodName, IPCMessageHandler messageHandler) {
+    return m_executor
+        ->submit([this, methodName, messageHandler] {
+            auto it = m_messageHandlers.find(methodName);
+            if (it != m_messageHandlers.end()) {
+                ACSDK_WARN(LX("registerIPCMessageHandlerMethod")
+                               .d("reason", "handlerAlreadyRegistered")
+                               .d("methodName", methodName));
+                return false;
+            }
+
+            m_messageHandlers[methodName] = messageHandler;
+            return true;
+        })
+        .get();
+}
+
+bool IPCHandlerBase::deregisterIPCMessageHandlerMethod(const std::string& methodName) {
+    return m_executor
+        ->submit([this, methodName] {
+            auto it = m_messageHandlers.find(methodName);
+            if (it == m_messageHandlers.end()) {
+                ACSDK_WARN(LX("registerIPCMessageHandlerMethod")
+                               .d("reason", "handlerNotRegistered")
+                               .d("methodName", methodName));
+                return false;
+            }
+
+            m_messageHandlers.erase(it);
+            return true;
+        })
+        .get();
+}
+
+IPCHandlerBase::~IPCHandlerBase() {
+    m_messageHandlers.clear();
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/IPCRouter.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/IPCRouter.cpp
new file mode 100644
index 0000000000..621cfc8b0b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/IPCRouter.cpp
@@ -0,0 +1,197 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/IPC/IPCRouter.h"
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::json;
+
+#define TAG "IPCRouter"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// The header json key in the message.
+static const char HEADER_TAG[] = "header";
+
+/// The namespace json key in the message.
+static const char NAMESPACE_TAG[] = "namespace";
+
+/// The name json key in the message.
+static const char NAME_TAG[] = "name";
+
+/// The version json key in the message.
+static const char VERSION_TAG[] = "version";
+
+/// The payload json key in the message.
+static const char PAYLOAD_TAG[] = "payload";
+
+std::shared_ptr<IPCRouter> IPCRouter::create(
+    std::shared_ptr<communication::MessagingServerInterface> messagingServer,
+    std::shared_ptr<IPCDispatcherInterface> ipcDispatcher,
+    std::shared_ptr<IPCVersionManager> ipcVersionManager) {
+    if (!messagingServer) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullMessagingServer"));
+        return nullptr;
+    }
+
+    if (!ipcDispatcher) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIPCDispatcher"));
+        return nullptr;
+    }
+
+    if (!ipcVersionManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIPCVersionManager"));
+        return nullptr;
+    }
+
+    return std::shared_ptr<IPCRouter>(
+        new IPCRouter(std::move(messagingServer), std::move(ipcDispatcher), std::move(ipcVersionManager)));
+}
+
+IPCRouter::IPCRouter(
+    std::shared_ptr<communication::MessagingServerInterface> messagingServer,
+    std::shared_ptr<IPCDispatcherInterface> ipcDispatcher,
+    const std::shared_ptr<IPCVersionManager> ipcVersionManager) :
+        RequiresShutdown{TAG},
+        m_messagingServer{messagingServer},
+        m_ipcVersionManager{ipcVersionManager},
+        m_ipcDispatcher{ipcDispatcher} {
+}
+
+std::shared_ptr<IPCDispatcherInterface> IPCRouter::registerHandler(
+    const std::string& ipcNamespace,
+    std::weak_ptr<IPCHandlerBase> handler) {
+    std::lock_guard<std::mutex> lock(m_mutex);
+
+    auto handlerInstance = getHandlerRegisteredLocked(ipcNamespace);
+    if (handlerInstance) {
+        ACSDK_ERROR(LX(__func__).d("reason", "ipcComponentAlreadyRegistered"));
+        return nullptr;
+    }
+
+    m_handlerMap.insert({ipcNamespace, {ipcNamespace, handler}});
+
+    return m_ipcDispatcher;
+}
+
+bool IPCRouter::deregisterHandler(const std::string& ipcNamespace) {
+    std::lock_guard<std::mutex> lock(m_mutex);
+
+    const auto it = m_handlerMap.find(ipcNamespace);
+    if (it != m_handlerMap.end()) {
+        m_handlerMap.erase(it);
+        return true;
+    }
+
+    return false;
+}
+
+void IPCRouter::onMessage(const std::string& message) {
+    ACSDK_DEBUG9(LX("onMessageInExecutor").sensitive("message", message));
+    rapidjson::Document jsonMessage;
+    rapidjson::ParseResult result = jsonMessage.Parse(message);
+    if (!result) {
+        ACSDK_ERROR(LX("onMessageFailed").d("reason", "parsingPayloadFailed"));
+        return;
+    }
+
+    std::string header;
+    if (!jsonUtils::retrieveValue(message, HEADER_TAG, &header)) {
+        ACSDK_ERROR(LX("onMessageFailed").d("reason", "headerNotFound"));
+        return;
+    }
+
+    std::string ipcNamespace;
+    if (!jsonUtils::retrieveValue(header, NAMESPACE_TAG, &ipcNamespace)) {
+        ACSDK_ERROR(LX("onMessageFailed").d("reason", "namespaceNotFound"));
+        return;
+    }
+
+    std::string methodName;
+    if (!jsonUtils::retrieveValue(header, NAME_TAG, &methodName)) {
+        ACSDK_ERROR(LX("onMessageFailed").d("reason", "methodNameNotFound"));
+        return;
+    }
+
+    if (!jsonMessage[HEADER_TAG].HasMember(VERSION_TAG)) {
+        ACSDK_ERROR(LX("onMessageFailed").d("reason", "versionNotFound"));
+        return;
+    }
+
+    int version = jsonMessage[HEADER_TAG][VERSION_TAG].GetInt();
+    if (!m_ipcVersionManager->validateVersionForNamespace(ipcNamespace, version)) {
+        ACSDK_ERROR(LX("onMessageFailed").d("reason", "versionValidationFailed"));
+        return;
+    }
+
+    std::string stringPayload;
+    if (!jsonUtils::retrieveValue(message, PAYLOAD_TAG, &stringPayload)) {
+        ACSDK_ERROR(LX("onMessageFailed").d("reason", "payloadNotFound"));
+        return;
+    }
+
+    std::unique_lock<std::mutex> lock(m_mutex);
+    auto handler = getHandlerRegisteredLocked(ipcNamespace);
+    lock.unlock();
+
+    if (!handler) {
+        ACSDK_ERROR(LX("onMessageFailed").d("reason", "unableToFindHandler").d("namespace", ipcNamespace));
+        return;
+    }
+
+    handler->invokeMethod(std::move(methodName), std::move(stringPayload));
+}
+
+void IPCRouter::doShutdown() {
+    m_messagingServer.reset();
+    m_ipcVersionManager.reset();
+
+    std::lock_guard<std::mutex> lock{m_mutex};
+    m_handlerMap.clear();
+}
+
+std::shared_ptr<IPCHandlerBase> IPCRouter::getHandlerRegisteredLocked(const std::string& ipcNamespace) {
+    std::shared_ptr<IPCHandlerBase> handler;
+    const auto it = m_handlerMap.find(ipcNamespace);
+    if (it == m_handlerMap.end()) {
+        return nullptr;
+    }
+
+    if (!(handler = it->second.handler.lock())) {
+        ACSDK_ERROR(LX("getHandlerRegisteredLocked").d("reason", "invalidHandler"));
+        m_handlerMap.erase(it);
+        return nullptr;
+    }
+
+    return handler;
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/IPCVersionManager.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/IPCVersionManager.cpp
new file mode 100644
index 0000000000..400580c051
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/IPC/IPCVersionManager.cpp
@@ -0,0 +1,123 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#include <string>
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include "IPCServerSampleApp/IPC/IPCVersionManager.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace ipc {
+
+using namespace avsCommon::utils::json;
+
+/// The version string
+static const std::string VERSION = "version";
+
+/// The entries string
+static const std::string ENTRIES = "entries";
+
+/// The namespace string
+static const std::string NAMESPACE = "namespace";
+
+/// String to identify log entries originating from this file.
+static const std::string TAG("IPCVersionManager");
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+IPCVersionManager::IPCVersionManager() : m_namespaceVersionMap{} {
+}
+
+bool IPCVersionManager::validateVersionForNamespace(const std::string& ns, int clientNamespaceVersion) {
+    if (m_namespaceVersionMap.count(ns) == 0) {
+        ACSDK_ERROR(LX(__func__).d("reason", "Namespace not registered by server").d("namespace", ns));
+        return false;
+    }
+    ACSDK_DEBUG9(LX(__func__)
+                     .d("Namespace", ns)
+                     .d("Server Version", m_namespaceVersionMap[ns])
+                     .d("Client version", clientNamespaceVersion));
+
+    if (m_namespaceVersionMap[ns] > clientNamespaceVersion) {
+        ACSDK_ERROR(LX(__func__).m("Namespace version mismatch. Update Client"));
+    } else if (m_namespaceVersionMap[ns] < clientNamespaceVersion) {
+        ACSDK_ERROR(LX(__func__).m("Namespace version mismatch. Update Server"));
+    }
+    return m_namespaceVersionMap[ns] == clientNamespaceVersion;
+}
+
+bool IPCVersionManager::handleAssertNamespaceVersions(const rapidjson::Document& payload) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!payload.HasMember(ENTRIES)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "entries not present in the message"));
+        return false;
+    }
+
+    std::unordered_map<std::string, int> ipcMessageMap = buildMapFromEntries(payload);
+
+    for (auto const& mapEntry : ipcMessageMap) {
+        std::string ns = mapEntry.first;
+        int version = mapEntry.second;
+        if (!validateVersionForNamespace(ns, version)) {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool IPCVersionManager::handleAssertNamespaceVersionsFromString(const std::string& payload) {
+    ACSDK_DEBUG9(LX(__func__));
+    rapidjson::Document document;
+    if (!jsonUtils::parseJSON(payload, &document)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "invalid payload string"));
+        return false;
+    }
+
+    return handleAssertNamespaceVersions(document);
+}
+
+void IPCVersionManager::registerNamespaceVersionEntry(const std::string& ns, int version) {
+    m_namespaceVersionMap.insert({ns, version});
+}
+
+void IPCVersionManager::deregisterNamespaceVersionEntry(const std::string& ns) {
+    m_namespaceVersionMap.erase(ns);
+}
+
+std::unordered_map<std::string, int> IPCVersionManager::buildMapFromEntries(const rapidjson::Document& message) {
+    std::unordered_map<std::string, int> ipcMessageMap = {};
+    auto& entries = message[ENTRIES];
+    for (rapidjson::Value::ConstValueIterator itr = entries.Begin(); itr != entries.End(); ++itr) {
+        const rapidjson::Value& attribute = *itr;
+        std::string ns;
+        if (!avsCommon::utils::json::jsonUtils::retrieveValue(attribute, NAMESPACE, &ns)) {
+            ACSDK_WARN(LX("buildMapFromEntriesError").d("reason", "namespace not found"));
+            return {};
+        }
+        ipcMessageMap[ns] = attribute[VERSION].GetInt();
+    }
+    return ipcMessageMap;
+}
+
+}  // namespace ipc
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/KeywordObserver.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/KeywordObserver.cpp
new file mode 100644
index 0000000000..8c541206e0
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/KeywordObserver.cpp
@@ -0,0 +1,131 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/KeywordObserver.h"
+
+#include "AVSCommon/Utils/Logger/LogEntry.h"
+#include "AVSCommon/Utils/Logger/Logger.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+/// String to identify log entries originating from this file.
+#define TAG "KeywordObserver"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+std::shared_ptr<KeywordObserver> KeywordObserver::create(
+    std::shared_ptr<defaultClient::DefaultClient> client,
+    capabilityAgents::aip::AudioProvider audioProvider,
+    std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> keywordDetector) {
+    auto keywordObserver = std::make_shared<KeywordObserver>(client, audioProvider);
+    if (keywordDetector) {
+        keywordDetector->addKeyWordObserver(keywordObserver);
+    }
+
+    return keywordObserver;
+}
+
+KeywordObserver::KeywordObserver(
+    std::shared_ptr<defaultClient::DefaultClient> client,
+    capabilityAgents::aip::AudioProvider audioProvider) :
+        m_client{client},
+        m_audioProvider{audioProvider} {
+}
+
+/**
+ * Compute the start of speech timestamp used in UPL calculations. This is calculated by taking the time detected on
+ * wakeword to the time and subtracting the duration of the wakeword uttered to determine time at the start of the
+ * wakeword. @c startOfSpeechTimestamp must be set to the time on wakeword detected for this calculation to work. If
+ * wakeword duration can not be calculated start of speech timestamp is left as the time on wakeword detected.
+ *
+ * @param wakewordBeingIndex The begin index of the first part of the keyword found within the @c stream.
+ * @param wakewordEndIndex The end index of the last part of the keyword within the @c stream.
+ * @param sampleRateHz The SampleRate in Hz of the @c stream.
+ * @param stream The stream in which the keyword was detected.
+ * @param startOfSpeechTimestamp Moment in time to calculate when user started talking to Alexa.
+ */
+static void computeStartOfSpeechTimestamp(
+    const avsCommon::avs::AudioInputStream::Index wakewordBeginIndex,
+    const avsCommon::avs::AudioInputStream::Index wakewordEndIndex,
+    const int sampleRateHz,
+    const std::shared_ptr<avsCommon::avs::AudioInputStream>& stream,
+    std::chrono::steady_clock::time_point& startOfSpeechTimestamp) {
+    // Create a reader to get the current index position
+    static const auto startWithNewData = true;
+    if (!stream) {
+        ACSDK_WARN(LX("onKeywordDetected").m("Audio stream was null, using default offset."));
+        return;
+    }
+
+    auto reader = stream->createReader(avsCommon::avs::AudioInputStream::Reader::Policy::NONBLOCKING, startWithNewData);
+    if (!reader) {
+        ACSDK_WARN(LX("onKeywordDetected").m("Reader was null, using default offset."));
+        return;
+    }
+
+    // Get the current index position
+    const auto currentIndex = reader->tell();
+
+    if (currentIndex <= wakewordBeginIndex) {
+        ACSDK_WARN(LX("onKeywordDetected").m("Index wrapping occurred, using default offset."));
+        // Note: this should never happen, since it should not be possible for millions of years w/ 64-bit indexes.
+        return;
+    }
+
+    // Translate the currentIndex position to a time duration elapsed since the end of wakeword
+    const auto sampleRatePerMillisec = sampleRateHz / 1000;
+
+    const auto timeSinceStartOfWW =
+        std::chrono::milliseconds((currentIndex - wakewordBeginIndex) / sampleRatePerMillisec);
+    ACSDK_DEBUG9(LX(__func__).d("timeSinceStartOfWW", timeSinceStartOfWW.count()));
+
+    // Adjust the start of speech timestamp to be the start of the WW.
+    startOfSpeechTimestamp -= timeSinceStartOfWW;
+}
+
+void KeywordObserver::onKeyWordDetected(
+    std::shared_ptr<avsCommon::avs::AudioInputStream> stream,
+    std::string keyword,
+    avsCommon::avs::AudioInputStream::Index beginIndex,
+    avsCommon::avs::AudioInputStream::Index endIndex,
+    std::shared_ptr<const std::vector<char>> KWDMetadata) {
+    if (endIndex != avsCommon::sdkInterfaces::KeyWordObserverInterface::UNSPECIFIED_INDEX &&
+        beginIndex == avsCommon::sdkInterfaces::KeyWordObserverInterface::UNSPECIFIED_INDEX) {
+        if (m_client) {
+            m_client->notifyOfTapToTalk(m_audioProvider, endIndex);
+        }
+    } else if (
+        endIndex != avsCommon::sdkInterfaces::KeyWordObserverInterface::UNSPECIFIED_INDEX &&
+        beginIndex != avsCommon::sdkInterfaces::KeyWordObserverInterface::UNSPECIFIED_INDEX) {
+        if (m_client) {
+            auto startOfSpeechTimestamp = std::chrono::steady_clock::now();
+            computeStartOfSpeechTimestamp(
+                beginIndex, endIndex, m_audioProvider.format.sampleRateHz, stream, startOfSpeechTimestamp);
+            m_client->notifyOfWakeWord(
+                m_audioProvider, beginIndex, endIndex, keyword, startOfSpeechTimestamp, KWDMetadata);
+        }
+    }
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/LiveViewController/LiveViewControllerPresentationAdapter.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/LiveViewController/LiveViewControllerPresentationAdapter.cpp
new file mode 100644
index 0000000000..cb61426529
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/LiveViewController/LiveViewControllerPresentationAdapter.cpp
@@ -0,0 +1,573 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <memory>
+#include <string>
+
+#include <AVSCommon/Utils/JSON/JSONGenerator.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include <IPCServerSampleApp/LiveViewController/LiveViewControllerPresentationAdapter.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace liveViewController {
+
+using namespace avsCommon::utils::json;
+using namespace alexaLiveViewControllerInterfaces;
+using namespace presentationOrchestratorInterfaces;
+
+/// String to identify log entries originating from this file.
+#define TAG "LiveViewControllerPresentationAdapter"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Interface name for Alexa.Camera.LiveViewController requests.
+static const char LIVE_VIEW_CAMERA_INTERFACE_NAME[] = "Alexa.Camera.LiveViewController";
+
+/// Identifier for the SessionId.
+static const char* const SESSION_ID_FIELD = "sessionId";
+
+/// Identifier for the Role.
+static const char* const ROLE_FIELD = "role";
+
+/// Identifier for the Target.
+static const char* const TARGET_FIELD = "target";
+
+/// Identifier for a target's endpointId.
+static const char* const ENDPOINT_ID_FIELD = "endpointId";
+
+/// Identifier for a target's type.
+static const char* const TYPE_FIELD = "type";
+
+/// Identifier for the participants.
+static const char* const PARTICIPANTS_FIELD = "participants";
+
+/// Identifier for the viewers in participants.
+static const char* const VIEWERS_FIELD = "viewers";
+
+/// Identifier for the name of a viewer.
+static const char* const VIEWER_NAME_FIELD = "name";
+
+/// Identifier for the hasCameraControl property of a viewer.
+static const char* const VIEWER_HAS_CAMERA_CONTROL_FIELD = "hasCameraControl";
+
+/// Identifier for the state of a viewer.
+static const char* const VIEWER_STATE_FIELD = "state";
+
+/// Identifier for the camera in participants.
+static const char* const CAMERA_FIELD = "camera";
+
+/// Identifier for the camera name in participants.
+static const char* const CAMERA_NAME_FIELD = "name";
+
+/// Identifier for the camera make in participants.
+static const char* const CAMERA_MAKE_FIELD = "make";
+
+/// Identifier for the camera model in participants.
+static const char* const CAMERA_MODEL_FIELD = "model";
+
+/// Identifier for the camera capabilities in participants.
+static const char* const CAMERA_CAPABILITIES_FIELD = "capabilities";
+
+/// Identifier for the viewerExperience.
+static const char* const VIEWER_EXPERIENCE_FIELD = "viewerExperience";
+
+/// Identifier for a viewerExperience's suggestedDisplay.
+static const char* const SUGGESTED_DISPLAY_FIELD = "suggestedDisplay";
+
+/// Identifier for a suggestedDisplay's displayMode.
+static const char* const DISPLAY_MODE_FIELD = "displayMode";
+
+/// Identifier for a suggestedDisplay's overlayType.
+static const char* const OVERLAY_TYPE_FIELD = "overlayType";
+
+/// Identifier for a suggestedDisplay's overlayPosition.
+static const char* const OVERLAY_POSITION_FIELD = "overlayPosition";
+
+/// Identifier for a viewerExperience's audioProperties.
+static const char* const AUDIO_PROPERTIES_FIELD = "audioProperties";
+
+/// Identifier for an audioProperties' talkMode.
+static const char* const TALK_MODE_FIELD = "talkMode";
+
+/// Identifier for an audioProperties' concurrentTwoWayTalk.
+static const char* const CONCURRENT_TWO_WAY_TALK_FIELD = "concurrentTwoWayTalk";
+
+/// Identifier for an audioProperties' microphoneState.
+static const char* const MICROPHONE_STATE_FIELD = "microphoneState";
+
+/// Identifier for an audioProperties' speakerState.
+static const char* const SPEAKER_STATE_FIELD = "speakerState";
+
+/// Identifier for a viewerExperience's liveViewTrigger.
+static const char* const LIVE_VIEW_TRIGGER_FIELD = "liveViewTrigger";
+
+/// Identifier for a viewerExperience's idleTimeoutInMilliseconds.
+static const char* const IDLE_TIMEOUT_FIELD = "idleTimeoutInMilliseconds";
+
+/**
+ * Adds a @c Target object to a json object.
+ *
+ * @param targetObject The target object to add the json object.
+ * @param jsonGenerator The json generator being used to generate the json object.
+ */
+static void addTargetObjectToJson(Target targetObject, JsonGenerator& jsonGenerator) {
+    jsonGenerator.startObject(TARGET_FIELD);
+    jsonGenerator.addMember(ENDPOINT_ID_FIELD, targetObject.endpointId);
+    jsonGenerator.addMember(TYPE_FIELD, targetTypeToString(targetObject.type.value()));
+    jsonGenerator.finishObject();
+}
+
+/**
+ * Adds a @c Camera object to a json object.
+ *
+ * @param cameraObject The camera object to add the json object.
+ * @param jsonGenerator The json generator being used to generate the json object.
+ */
+static void addParticipantsCameraObjectToJson(Camera cameraObject, JsonGenerator& jsonGenerator) {
+    jsonGenerator.startObject(CAMERA_FIELD);
+    jsonGenerator.addMember(CAMERA_NAME_FIELD, cameraObject.name);
+    jsonGenerator.addMember(CAMERA_MAKE_FIELD, cameraObject.make);
+    jsonGenerator.addMember(CAMERA_MODEL_FIELD, cameraObject.model.value());
+    std::set<std::string> motionCapabilitiesArray;
+    for (const auto& motionCapability : cameraObject.capabilities.value()) {
+        motionCapabilitiesArray.insert(motionCapabilityToString(motionCapability));
+    }
+    jsonGenerator.addStringArray(CAMERA_CAPABILITIES_FIELD, motionCapabilitiesArray);
+    jsonGenerator.finishObject();
+}
+
+/**
+ * Adds a @c Participants object to a json object.
+ *
+ * @param participantsObject The participants object to add to the json object.
+ * @param jsonGenerator The json generator being used to generate the json object.
+ */
+static void addParticipantsObjectToJson(Participants participantsObject, JsonGenerator& jsonGenerator) {
+    jsonGenerator.startObject(PARTICIPANTS_FIELD);
+    jsonGenerator.startArray(VIEWERS_FIELD);
+    for (const auto& viewer : participantsObject.viewers) {
+        jsonGenerator.startArrayElement();
+        jsonGenerator.addMember(VIEWER_NAME_FIELD, viewer.name);
+        jsonGenerator.addMember(VIEWER_HAS_CAMERA_CONTROL_FIELD, viewer.hasCameraControl);
+        jsonGenerator.addMember(VIEWER_STATE_FIELD, viewerStateToString(viewer.state));
+        jsonGenerator.finishArrayElement();
+    }
+    jsonGenerator.finishArray();
+    addParticipantsCameraObjectToJson(participantsObject.camera, jsonGenerator);
+    jsonGenerator.finishObject();
+}
+
+/**
+ * Adds a @c DisplayProperties object to a json object.
+ *
+ * @param displayPropertiesObject The display properties object to add to the json object.
+ * @param jsonGenerator The json generator being used to generate the json object.
+ */
+static void addDisplayPropertiesObjectToJson(
+    const DisplayProperties& displayPropertiesObject,
+    JsonGenerator& jsonGenerator) {
+    jsonGenerator.startObject(SUGGESTED_DISPLAY_FIELD);
+    jsonGenerator.addMember(DISPLAY_MODE_FIELD, displayModeToString(displayPropertiesObject.displayMode));
+    jsonGenerator.addMember(OVERLAY_TYPE_FIELD, overlayTypeToString(displayPropertiesObject.overlayType.value()));
+    jsonGenerator.addMember(
+        OVERLAY_POSITION_FIELD, overlayPositionToString(displayPropertiesObject.overlayPosition.value()));
+    jsonGenerator.finishObject();
+}
+
+/**
+ * Adds an @c AudioProperties object to a json object.
+ *
+ * @param audioPropertiesObject The audio properties object to add to the json object.
+ * @param jsonGenerator The json generator being used to generate the json object.
+ */
+static void addAudioPropertiesObjectToJson(const AudioProperties& audioPropertiesObject, JsonGenerator& jsonGenerator) {
+    jsonGenerator.startObject(AUDIO_PROPERTIES_FIELD);
+    jsonGenerator.addMember(TALK_MODE_FIELD, talkModeToString(audioPropertiesObject.talkMode));
+    jsonGenerator.addMember(
+        CONCURRENT_TWO_WAY_TALK_FIELD, concurrentTwoWayTalkStateToString(audioPropertiesObject.concurrentTwoWayTalk));
+    jsonGenerator.addMember(MICROPHONE_STATE_FIELD, audioStateToString(audioPropertiesObject.microphoneState));
+    jsonGenerator.addMember(SPEAKER_STATE_FIELD, audioStateToString(audioPropertiesObject.speakerState));
+    jsonGenerator.finishObject();
+}
+
+/**
+ * Adds an @c ViewerExperience object to a json object.
+ *
+ * @param viewerExperienceObject The viewer experience object to add to the json object.
+ * @param jsonGenerator The json generator being used to generate the json object.
+ */
+static void addViewerExperienceObjectToJson(
+    const ViewerExperience& viewerExperienceObject,
+    JsonGenerator& jsonGenerator) {
+    jsonGenerator.startObject(VIEWER_EXPERIENCE_FIELD);
+    addDisplayPropertiesObjectToJson(viewerExperienceObject.suggestedDisplay, jsonGenerator);
+    addAudioPropertiesObjectToJson(viewerExperienceObject.audioProperties, jsonGenerator);
+    jsonGenerator.addMember(LIVE_VIEW_TRIGGER_FIELD, liveViewTriggerToString(viewerExperienceObject.liveViewTrigger));
+    jsonGenerator.addMember(IDLE_TIMEOUT_FIELD, viewerExperienceObject.idleTimeoutInMilliseconds.count());
+    jsonGenerator.finishObject();
+}
+
+static std::string serializeStartLiveViewPayload(
+    std::unique_ptr<LiveViewControllerInterface::StartLiveViewRequest> startLiveViewRequest) {
+    JsonGenerator jsonGenerator;
+    jsonGenerator.addMember(SESSION_ID_FIELD, startLiveViewRequest->sessionId);
+    addTargetObjectToJson(startLiveViewRequest->target, jsonGenerator);
+    jsonGenerator.addMember(ROLE_FIELD, roleToString(startLiveViewRequest->role));
+    addParticipantsObjectToJson(startLiveViewRequest->participants, jsonGenerator);
+    addViewerExperienceObjectToJson(startLiveViewRequest->viewerExperience, jsonGenerator);
+    return jsonGenerator.toString();
+}
+
+static std::string cameraStateToString(CameraState cameraState) {
+    switch (cameraState) {
+        case CameraState::CONNECTED:
+            return "CONNECTED";
+        case CameraState::CONNECTING:
+            return "CONNECTING";
+        case CameraState::DISCONNECTED:
+            return "DISCONNECTED";
+        case CameraState::ERROR:
+            return "ERROR";
+        case CameraState::UNKNOWN:
+            return "";
+    }
+    return "";
+}
+
+std::shared_ptr<LiveViewControllerPresentationAdapter> LiveViewControllerPresentationAdapter::create(
+    const std::shared_ptr<ipc::IPCHandlerRegistrationInterface>& ipcHandlerRegistrar,
+    const std::shared_ptr<AplClientBridge>& aplClientBridge) {
+    if (!ipcHandlerRegistrar) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullIPCHandlerRegistrar"));
+        return nullptr;
+    }
+
+    if (!aplClientBridge) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullAplClientBridge"));
+        return nullptr;
+    }
+
+    auto liveViewControllerPresentationAdapter =
+        std::shared_ptr<LiveViewControllerPresentationAdapter>(new LiveViewControllerPresentationAdapter());
+
+    liveViewControllerPresentationAdapter->initialize(ipcHandlerRegistrar, aplClientBridge);
+
+    return liveViewControllerPresentationAdapter;
+}
+
+LiveViewControllerPresentationAdapter::LiveViewControllerPresentationAdapter() {
+}
+
+void LiveViewControllerPresentationAdapter::initialize(
+    const std::shared_ptr<ipc::IPCHandlerRegistrationInterface>& ipcHandlerRegistrar,
+    const std::shared_ptr<AplClientBridge>& aplClientBridge) {
+    m_liveViewCameraIPCHandler = ipc::LiveViewCameraHandler::create(ipcHandlerRegistrar, shared_from_this());
+    m_aplLiveViewExtension = std::make_shared<extensions::liveView::AplLiveViewExtension>(shared_from_this());
+    // Init ASR Profile as CLOSE_TALK
+    handleASRProfileChanged(alexaClientSDK::capabilityAgents::aip::ASRProfile::CLOSE_TALK);
+    // Register the extension with the APL client bridge.
+    aplClientBridge->registerSharedExtension(m_aplLiveViewExtension);
+}
+
+void LiveViewControllerPresentationAdapter::onPresentationAvailable(
+    PresentationRequestToken id,
+    std::shared_ptr<PresentationInterface> presentation) {
+    ACSDK_DEBUG5(LX(__func__).d("id", id));
+
+    m_executor.submit([this, id, presentation]() {
+        if (id == m_startLiveViewRequestToken) {
+            m_presentation = presentation;
+            bool cameraTalkSupported =
+                TalkMode::NO_SUPPORT != m_startLiveViewRequest->viewerExperience.audioProperties.talkMode;
+            // The camera mic should be enabled on int if the request is UNMUTED, supports TWO_WAY_TALK,
+            // AND the device is not using a CLOSE_TALK ASR Profile
+            bool micInitEnabled =
+                alexaClientSDK::capabilityAgents::aip::ASRProfile::CLOSE_TALK != m_asrProfile &&
+                AudioState::UNMUTED == m_startLiveViewRequest->viewerExperience.audioProperties.microphoneState &&
+                ConcurrentTwoWayTalkState::ENABLED ==
+                    m_startLiveViewRequest->viewerExperience.audioProperties.concurrentTwoWayTalk;
+            std::string startLiveViewPayload = serializeStartLiveViewPayload(std::move(m_startLiveViewRequest));
+            // Init camera render
+            m_liveViewCameraIPCHandler->renderCamera(startLiveViewPayload);
+            // Init camera UI mic state, will handle the call to toggle the mic once initialized
+            executeSetCameraUIMicState(micInitEnabled);
+            // Set self as HoldToTalk handler if ASR Profile is CLOSE_TALK and the camera actually supports talk
+            if (alexaClientSDK::capabilityAgents::aip::ASRProfile::CLOSE_TALK == m_asrProfile && cameraTalkSupported) {
+                m_interactionManager->overrideHoldToTalkSpeechHandler(shared_from_this());
+            }
+        }
+    });
+}
+
+void LiveViewControllerPresentationAdapter::onPresentationStateChanged(
+    PresentationRequestToken id,
+    PresentationState newState) {
+    ACSDK_DEBUG5(LX(__func__).d("id", id).d("newState", newState));
+
+    m_executor.submit([this, id, newState] {
+        if (id != m_startLiveViewRequestToken) {
+            ACSDK_WARN(LX(__func__)
+                           .d("reason", "state change does not correspond to the last presentation")
+                           .d("id", id)
+                           .d("m_startLiveViewRequestToken", m_startLiveViewRequestToken));
+            return;
+        }
+
+        switch (newState) {
+            case PresentationState::FOREGROUND:
+                // fall-through
+            case PresentationState::FOREGROUND_UNFOCUSED:
+                break;
+            case PresentationState::BACKGROUND:
+                executeDismissPresentation();
+                break;
+            case PresentationState::NONE:
+                if (m_presentation) {
+                    m_presentation.reset();
+                }
+                executeOnPresentationDismissed();
+                break;
+        }
+    });
+}
+
+bool LiveViewControllerPresentationAdapter::onNavigateBack(PresentationRequestToken id) {
+    /* NO OP: Let PO manage the back navigation */
+    return false;
+}
+
+void LiveViewControllerPresentationAdapter::cameraMicrophoneStateChanged(const std::string& message) {
+    bool enabled = false;
+    if (!jsonUtils::retrieveValue(message, ipc::CAMERA_ENABLED_TAG, &enabled)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "enabledNotFound"));
+        return;
+    }
+    handleSetCameraMicrophoneState(enabled);
+}
+
+void LiveViewControllerPresentationAdapter::cameraFirstFrameRendered(const std::string& message) {
+    m_executor.submit([this]() {
+        if (m_aplLiveViewExtension) {
+            m_aplLiveViewExtension->onCameraFirstFrameRendered();
+        }
+    });
+}
+
+void LiveViewControllerPresentationAdapter::windowIdReport(const std::string& message) {
+    m_executor.submit([this, message]() {
+        rapidjson::Document payload;
+        if (!jsonUtils::parseJSON(message, &payload)) {
+            ACSDK_ERROR(LX(__func__).d("reason", "invalid message string"));
+            return;
+        }
+
+        std::string liveViewCameraWindowId;
+        if (!jsonUtils::retrieveValue(message, ipc::CAMERA_WINDOW_ID_TAG, &liveViewCameraWindowId)) {
+            ACSDK_WARN(LX(__func__).d("reason", "live view camera window ID not found"));
+        } else {
+            m_liveViewCameraWindowId = liveViewCameraWindowId;
+        }
+    });
+}
+
+LiveViewControllerInterface::Response LiveViewControllerPresentationAdapter::start(
+    std::unique_ptr<LiveViewControllerInterface::StartLiveViewRequest> request) {
+    m_executor.submit([this]() {
+        if (m_presentationOrchestratorClient) {
+            PresentationOptions poOptions;
+            poOptions.presentationLifespan = PresentationLifespan::SHORT;
+            poOptions.interfaceName = LIVE_VIEW_CAMERA_INTERFACE_NAME;
+            poOptions.timeout = PresentationInterface::getTimeoutDisabled();
+
+            m_startLiveViewRequestToken = m_presentationOrchestratorClient->requestWindow(
+                m_liveViewCameraWindowId, poOptions, shared_from_this());
+        }
+    });
+
+    m_startLiveViewRequest = std::move(request);
+
+    return {};
+}
+
+LiveViewControllerInterface::Response LiveViewControllerPresentationAdapter::stop() {
+    dismissPresentation();
+    return {};
+}
+
+LiveViewControllerInterface::Response LiveViewControllerPresentationAdapter::setCameraState(CameraState cameraState) {
+    m_executor.submit([this, cameraState]() {
+        auto cameraStateStr = cameraStateToString(cameraState);
+        m_liveViewCameraIPCHandler->setCameraState(cameraStateStr);
+
+        if (m_aplLiveViewExtension) {
+            m_aplLiveViewExtension->setCameraState(cameraStateStr);
+        }
+    });
+
+    return {};
+}
+
+Configuration LiveViewControllerPresentationAdapter::getConfiguration() {
+    const static std::set<DisplayMode> supportedDisplayModes = {DisplayMode::FULL_SCREEN};
+    const static std::set<OverlayType> supportedOverlayTypes = {OverlayType::NONE};
+    const static std::set<OverlayPosition> supportedOverlayPositions = {OverlayPosition::TOP_RIGHT};
+
+    return Configuration(supportedDisplayModes, supportedOverlayTypes, supportedOverlayPositions);
+}
+
+void LiveViewControllerPresentationAdapter::handleCameraExitRequest() {
+    dismissPresentation();
+}
+
+void LiveViewControllerPresentationAdapter::handleChangeCameraMicStateRequest(bool micOn) {
+    handleSetCameraMicrophoneState(micOn);
+}
+
+void LiveViewControllerPresentationAdapter::handleSetCameraMicrophoneState(bool enabled) {
+    m_executor.submit([this, enabled]() { executeNotifyMicrophoneStateChanged(enabled); });
+}
+
+void LiveViewControllerPresentationAdapter::setPresentationOrchestrator(
+    std::shared_ptr<PresentationOrchestratorClientInterface> poClient) {
+    m_executor.submit([this, poClient]() { m_presentationOrchestratorClient = std::move(poClient); });
+}
+
+void LiveViewControllerPresentationAdapter::setInteractionManager(
+    std::shared_ptr<common::InteractionManager> interactionManager) {
+    m_executor.submit([this, interactionManager]() { m_interactionManager = std::move(interactionManager); });
+}
+
+bool LiveViewControllerPresentationAdapter::addObserver(std::weak_ptr<LiveViewControllerObserverInterface> observer) {
+    m_notifier.addWeakPtrObserver(observer);
+    return true;
+}
+
+void LiveViewControllerPresentationAdapter::removeObserver(
+    std::weak_ptr<LiveViewControllerObserverInterface> observer) {
+    m_notifier.removeWeakPtrObserver(observer);
+}
+
+void LiveViewControllerPresentationAdapter::onASRProfileChanged(const std::string& profile) {
+    handleASRProfileChanged(capabilityAgents::aip::getASRProfile(profile));
+}
+
+void LiveViewControllerPresentationAdapter::onStateChanged(State state) {
+    // No-op
+}
+
+void LiveViewControllerPresentationAdapter::handleASRProfileChanged(
+    alexaClientSDK::capabilityAgents::aip::ASRProfile profile) {
+    m_executor.submit([this, profile]() {
+        m_asrProfile = profile;
+        if (m_aplLiveViewExtension) {
+            m_aplLiveViewExtension->setAsrProfile(asrProfileToString(profile));
+        }
+    });
+}
+
+void LiveViewControllerPresentationAdapter::dismissPresentation() {
+    m_executor.submit([this]() { executeDismissPresentation(); });
+}
+
+void LiveViewControllerPresentationAdapter::executeDismissPresentation() {
+    if (m_presentation) {
+        m_presentation->dismiss();
+    }
+}
+
+void LiveViewControllerPresentationAdapter::executeOnPresentationDismissed() {
+    ACSDK_DEBUG9(LX(__func__));
+    m_interactionManager->overrideHoldToTalkSpeechHandler(nullptr);
+
+    m_liveViewCameraIPCHandler->clearCamera();
+
+    if (m_aplLiveViewExtension) {
+        m_aplLiveViewExtension->onCameraCleared();
+    }
+    m_notifier.notifyObservers(
+        [](const std::shared_ptr<LiveViewControllerObserverInterface>& observer) { observer->onLiveViewCleared(); });
+}
+
+void LiveViewControllerPresentationAdapter::executeNotifyMicrophoneStateChanged(bool enabled) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_notifier.notifyObservers([enabled](const std::shared_ptr<LiveViewControllerObserverInterface>& observer) {
+        observer->onMicrophoneStateChanged(microphoneStateToAudioState(enabled));
+    });
+}
+
+void LiveViewControllerPresentationAdapter::executeSetCameraUIMicState(bool enabled) {
+    if (m_aplLiveViewExtension) {
+        m_aplLiveViewExtension->setCameraMicrophoneState(enabled);
+    }
+}
+
+std::future<bool> LiveViewControllerPresentationAdapter::notifyOfWakeWord(
+    capabilityAgents::aip::AudioProvider wakeWordAudioProvider,
+    avsCommon::avs::AudioInputStream::Index beginIndex,
+    avsCommon::avs::AudioInputStream::Index endIndex,
+    std::string keyword,
+    std::chrono::steady_clock::time_point startOfSpeechTimestamp,
+    std::shared_ptr<const std::vector<char>> KWDMetadata) {
+    // No-op
+    return m_executor.submit([]() { return false; });
+}
+
+std::future<bool> LiveViewControllerPresentationAdapter::notifyOfTapToTalk(
+    capabilityAgents::aip::AudioProvider tapToTalkAudioProvider,
+    avsCommon::avs::AudioInputStream::Index beginIndex,
+    std::chrono::steady_clock::time_point startOfSpeechTimestamp) {
+    // No-op
+    return m_executor.submit([]() { return false; });
+}
+
+std::future<bool> LiveViewControllerPresentationAdapter::notifyOfHoldToTalkStart(
+    capabilityAgents::aip::AudioProvider holdToTalkAudioProvider,
+    std::chrono::steady_clock::time_point startOfSpeechTimestamp,
+    avsCommon::avs::AudioInputStream::Index beginIndex) {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_executor.submit([this]() {
+        executeSetCameraUIMicState(true);
+        executeNotifyMicrophoneStateChanged(true);
+        return true;
+    });
+}
+
+std::future<bool> LiveViewControllerPresentationAdapter::notifyOfHoldToTalkEnd() {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_executor.submit([this]() {
+        executeSetCameraUIMicState(false);
+        executeNotifyMicrophoneStateChanged(false);
+        return true;
+    });
+}
+
+std::future<bool> LiveViewControllerPresentationAdapter::notifyOfTapToTalkEnd() {
+    // No-op
+    return m_executor.submit([]() { return false; });
+}
+
+}  // namespace liveViewController
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/LocaleAssetsManager.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/LocaleAssetsManager.cpp
new file mode 100644
index 0000000000..eff2d0ab97
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/LocaleAssetsManager.cpp
@@ -0,0 +1,482 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <Settings/SettingStringConversion.h>
+
+#include "IPCServerSampleApp/LocaleAssetsManager.h"
+
+/// String to identify log entries originating from this file.
+#define TAG "LocaleAssetsManager"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+using namespace acsdkShutdownManagerInterfaces;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::configuration;
+using namespace avsCommon::utils::json::jsonUtils;
+
+/// The key in our config file to find the root of settings for this database.
+static const std::string SETTING_CONFIGURATION_ROOT_KEY = "deviceSettings";
+
+/// The key to find the locales configuration.
+static const std::string LOCALES_CONFIGURATION_KEY = "locales";
+
+/// The key to find the locales configuration.
+static const std::string DEFAULT_LOCALE_CONFIGURATION_KEY = "defaultLocale";
+
+/// The key to find the locales combinations configuration.
+static const std::string LOCALE_COMBINATION_CONFIGURATION_KEY = "localeCombinations";
+
+/// The default locale value used if the locale configuration is not present.
+static const std::string DEFAULT_LOCALE_VALUE = "en-US";
+
+/// The index for primary locale in the default locales vector.
+static const int PRIMARY_LOCALE_INDEX = 0;
+
+/// The default supported wake word.
+static const std::string DEFAULT_SUPPORTED_WAKEWORD = "ALEXA";
+
+std::shared_ptr<LocaleAssetsManagerInterface> LocaleAssetsManager::createLocaleAssetsManagerInterface(
+    const std::shared_ptr<ConfigurationNode>& configurationNode,
+    const std::shared_ptr<ShutdownNotifierInterface>& shutdownNotifier) {
+    if (!shutdownNotifier) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceFailed").d("reason", "null shutdown notifier"));
+        return nullptr;
+    }
+
+    auto manager = std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager());
+    if (!manager) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceFailed").d("reason", "null LocaleAssetsManager"));
+        return nullptr;
+    }
+
+    if (!manager->initialize(configurationNode)) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceFailed").d("reason", "initialize failed"));
+        return nullptr;
+    }
+    shutdownNotifier->addObserver(manager);
+
+    return manager;
+}
+
+std::shared_ptr<LocaleAssetsManager> LocaleAssetsManager::createLocaleAssetsManager(
+    const std::shared_ptr<ConfigurationNode>& configurationNode) {
+    auto manager = std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager());
+    if (!manager->initialize(configurationNode)) {
+        ACSDK_ERROR(LX("createLocaleAssetsManager").d("reason", "initialize failed"));
+        return nullptr;
+    }
+    return manager;
+}
+
+std::shared_ptr<LocaleAssetsManager> LocaleAssetsManager::create(bool enableWakeWord) {
+    auto manager = std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager());
+    if (!manager->initialize(enableWakeWord, ConfigurationNode::getRoot())) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "initialize failed"));
+        return nullptr;
+    }
+    return manager;
+}
+
+#ifdef KWD
+#ifdef ASSET_MANAGER
+std::shared_ptr<LocaleAssetsManagerInterface> LocaleAssetsManager::createLocaleAssetsManagerInterfaceWithKwdAndDavs(
+    const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+    const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
+    const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+    const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+    const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector,
+    const std::shared_ptr<AssetManager>& assetManager) {
+    if (!shutdownNotifier) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdAndDavsFailed").d("reason", "null shutdown notifier"));
+        return nullptr;
+    }
+    if (!audioInputStream) {
+        ACSDK_ERROR(
+            LX("createLocaleAssetsManagerInterfaceWithKwdAndDavsFailed").d("reason", "null audio input stream"));
+        return nullptr;
+    }
+    if (!audioFormat) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdAndDavsFailed").d("reason", "null audio format"));
+        return nullptr;
+    }
+    if (!keywordDetector) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdAndDavsFailed").d("reason", "null keywordDetector"));
+        return nullptr;
+    }
+    if (!assetManager) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdAndDavsFailed").d("reason", "null davsAssetManager"));
+        return nullptr;
+    }
+
+    auto manager = std::shared_ptr<LocaleAssetsManager>(
+        new LocaleAssetsManager(audioInputStream, audioFormat, keywordDetector, assetManager));
+    if (!manager->initialize(configurationNode)) {
+        ACSDK_ERROR(
+            LX("createLocaleAssetsManagerInterfaceWithKwdAndDavsFailedFailed").d("reason", "initialize failed"));
+        return nullptr;
+    }
+    shutdownNotifier->addObserver(manager);
+
+    return manager;
+}
+
+std::shared_ptr<LocaleAssetsManager> LocaleAssetsManager::createLocaleAssetsManagerWithKwdAndDavs(
+    const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+    const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+    const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+    const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector,
+    const std::shared_ptr<AssetManager>& assetManager) {
+    if (!audioInputStream) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdAndDavsFailed").d("reason", "null audio input stream"));
+        return nullptr;
+    }
+    if (!audioFormat) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdAndDavsFailed").d("reason", "null audio format"));
+        return nullptr;
+    }
+    if (!keywordDetector) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdAndDavsFailed").d("reason", "null keywordDetector"));
+        return nullptr;
+    }
+    if (!assetManager) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdAndDavsFailed").d("reason", "null davsAssetManager"));
+        return nullptr;
+    }
+
+    auto manager = std::shared_ptr<LocaleAssetsManager>(
+        new LocaleAssetsManager(audioInputStream, audioFormat, keywordDetector, assetManager));
+    if (!manager->initialize(configurationNode)) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdAndDavsFailed").d("reason", "initialize failed"));
+        return nullptr;
+    }
+
+    return manager;
+}
+#else
+std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface> LocaleAssetsManager::
+    createLocaleAssetsManagerInterfaceWithKwd(
+        const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+        const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+        const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector) {
+    if (!shutdownNotifier) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdFailed").d("reason", "null shutdown notifier"));
+        return nullptr;
+    }
+    if (!audioInputStream) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdFailed").d("reason", "null audio input stream"));
+        return nullptr;
+    }
+    if (!audioFormat) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdFailed").d("reason", "null audio format"));
+        return nullptr;
+    }
+    if (!keywordDetector) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdFailed").d("reason", "null keywordDetector"));
+        return nullptr;
+    }
+
+    auto manager =
+        std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager(audioInputStream, audioFormat, keywordDetector));
+    if (!manager->initialize(configurationNode)) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerInterfaceWithKwdFailed").d("reason", "initialize failed"));
+        return nullptr;
+    }
+    shutdownNotifier->addObserver(manager);
+
+    return manager;
+}
+
+std::shared_ptr<LocaleAssetsManager> LocaleAssetsManager::createLocaleAssetsManagerWithKwd(
+    const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationNode,
+    const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+    const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+    const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector) {
+    if (!audioInputStream) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdFailed").d("reason", "null audio input stream"));
+        return nullptr;
+    }
+    if (!audioFormat) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdFailed").d("reason", "null audio format"));
+        return nullptr;
+    }
+    if (!keywordDetector) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdFailed").d("reason", "null keywordDetector"));
+        return nullptr;
+    }
+    auto manager =
+        std::shared_ptr<LocaleAssetsManager>(new LocaleAssetsManager(audioInputStream, audioFormat, keywordDetector));
+    if (!manager->initialize(configurationNode)) {
+        ACSDK_ERROR(LX("createLocaleAssetsManagerWithKwdFailed").d("reason", "initialize failed"));
+        return nullptr;
+    }
+
+    return manager;
+}
+#endif
+void LocaleAssetsManager::setDefaultClient(const std::shared_ptr<defaultClient::DefaultClient>& defaultClient) {
+    std::lock_guard<std::mutex> lock{m_defaultClientMutex};
+    if (defaultClient == nullptr) {
+        ACSDK_ERROR(LX("setDefaultClientFailed").d("reason", "nullDefaultClient"));
+        return;
+    }
+    m_DefaultClient = defaultClient;
+}
+#endif
+
+bool LocaleAssetsManager::changeAssets(const Locales& locales, const WakeWords& wakeWords) {
+    // The device should set the locale and wakeWord here.
+    ACSDK_INFO(LX(__func__)
+                   .d("Locale", settings::toSettingString<Locales>(locales).second)
+                   .d("WakeWords", settings::toSettingString<WakeWords>(wakeWords).second));
+    return true;
+}
+
+void LocaleAssetsManager::cancelOngoingChange() {
+    // No work is done by changeAssets.
+}
+
+bool LocaleAssetsManager::initialize(const std::shared_ptr<ConfigurationNode>& configurationNode) {
+    if (!configurationNode) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "null configuration node"));
+        return false;
+    }
+
+#ifdef KWD
+    static constexpr bool enableWakeWord = true;
+#else
+    static constexpr bool enableWakeWord = false;
+#endif
+
+    return initialize(enableWakeWord, *configurationNode);
+}
+
+bool LocaleAssetsManager::initialize(bool enableWakeWord, const ConfigurationNode& configurationNode) {
+    auto settingsConfig = configurationNode[SETTING_CONFIGURATION_ROOT_KEY];
+    if (!settingsConfig) {
+        ACSDK_ERROR(LX("initializeFailed")
+                        .d("reason", "configurationKeyNotFound")
+                        .d("configurationKey", SETTING_CONFIGURATION_ROOT_KEY));
+        return false;
+    }
+
+    if (!settingsConfig.getStringValues(LOCALES_CONFIGURATION_KEY, &m_supportedLocales)) {
+        ACSDK_ERROR(LX("initializeFailed")
+                        .d("reason", "configurationKeyNotFound")
+                        .d("configurationKey", LOCALES_CONFIGURATION_KEY));
+        return false;
+    }
+
+    auto combinationArray = settingsConfig.getArray(LOCALE_COMBINATION_CONFIGURATION_KEY);
+    if (combinationArray) {
+        for (std::size_t arrayIndex = 0; arrayIndex < combinationArray.getArraySize(); ++arrayIndex) {
+            auto stringVector = retrieveStringArray<std::vector<std::string>>(combinationArray[arrayIndex].serialize());
+
+            // Make sure the combination is more than one locale.
+            if (stringVector.size() <= 1) {
+                ACSDK_ERROR(
+                    LX("initializeFailed").d("reason", "LocaleCombinationSizeError").d("size", stringVector.size()));
+                return false;
+            }
+
+            // Make sure all the locales in the combination are supported.
+            for (const auto& locale : stringVector) {
+                if (m_supportedLocales.count(locale) == 0) {
+                    ACSDK_ERROR(
+                        LX("initializeFailed").d("reason", "notSupportedLocalesInCombination").d("locale", locale));
+                    return false;
+                }
+            }
+            m_supportedLocalesCombinations.insert(stringVector);
+        }
+    }
+
+    auto localesArray = settingsConfig.getArray(DEFAULT_LOCALE_CONFIGURATION_KEY);
+    if (!localesArray) {
+        if (!settingsConfig.getString(DEFAULT_LOCALE_CONFIGURATION_KEY, &m_defaultLocale)) {
+            ACSDK_ERROR(
+                LX("initializeFailed")
+                    .d("reason", "configurationKeyNotFound")
+                    .d("configurationKey", SETTING_CONFIGURATION_ROOT_KEY + "." + DEFAULT_LOCALE_CONFIGURATION_KEY));
+            return false;
+        }
+        m_defaultLocales.push_back(m_defaultLocale);
+    } else {
+        m_defaultLocales = retrieveStringArray<std::vector<std::string>>(localesArray.serialize());
+    }
+
+    if (m_supportedLocales.empty()) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "noSupportedLocalesInConfiguration"));
+        return false;
+    }
+
+    if (m_defaultLocales.empty()) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "noDefaultLocaleInConfiguration"));
+        return false;
+    }
+
+    // Check if the default is in the supported locales.
+    if (m_supportedLocales.find(m_defaultLocales[PRIMARY_LOCALE_INDEX]) == m_supportedLocales.end()) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "defaultLocaleNotInSupportedLocaleList"));
+        return false;
+    }
+
+    // Check if the default multilingual locale is in the supported locale combinations.
+    if (m_defaultLocales.size() > 1 &&
+        m_supportedLocalesCombinations.find(m_defaultLocales) == m_supportedLocalesCombinations.end()) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "defaultLocalesNotInSupportedLocalesCombinationsList"));
+        return false;
+    }
+
+    WakeWords wakeWords;
+    if (enableWakeWord) {
+        m_supportedWakeWords.insert({DEFAULT_SUPPORTED_WAKEWORD});
+    } else {
+        ACSDK_INFO(LX(__func__).d("supportedWakeWords", "NONE"));
+    }
+
+    return true;
+}
+
+LocaleAssetsManager::WakeWordsSets LocaleAssetsManager::getSupportedWakeWords(const Locale& locale) const {
+    return m_supportedWakeWords;
+}
+
+LocaleAssetsManager::WakeWordsSets LocaleAssetsManager::getDefaultSupportedWakeWords() const {
+    return m_supportedWakeWords;
+}
+
+std::map<LocaleAssetsManager::Locale, LocaleAssetsManager::WakeWordsSets> LocaleAssetsManager::
+    getLocaleSpecificWakeWords() const {
+    return std::map<LocaleAssetsManager::Locale, LocaleAssetsManager::WakeWordsSets>();
+}
+
+std::map<LocaleAssetsManager::LanguageTag, LocaleAssetsManager::WakeWordsSets> LocaleAssetsManager::
+    getLanguageSpecificWakeWords() const {
+    return std::map<LocaleAssetsManager::LanguageTag, LocaleAssetsManager::WakeWordsSets>();
+}
+
+std::set<LocaleAssetsManager::Locale> LocaleAssetsManager::getSupportedLocales() const {
+    return m_supportedLocales;
+}
+
+LocaleAssetsManager::LocaleCombinations LocaleAssetsManager::getSupportedLocaleCombinations() const {
+    return m_supportedLocalesCombinations;
+}
+
+LocaleAssetsManager::Locale LocaleAssetsManager::getDefaultLocale() const {
+    ACSDK_ERROR(LX("getDefaultLocale").d("reason", "methodDeprecated"));
+    return m_defaultLocale;
+}
+
+LocaleAssetsManager::Locales LocaleAssetsManager::getDefaultLocales() const {
+    return m_defaultLocales;
+}
+
+void LocaleAssetsManager::addLocaleAssetsObserver(
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>& observer) {
+    std::lock_guard<std::mutex> lock{m_observersMutex};
+    if (observer == nullptr) {
+        ACSDK_ERROR(LX("addLocaleAssetsObserverFailed").d("reason", "nullObserver"));
+        return;
+    }
+    m_observers.insert(observer);
+}
+
+void LocaleAssetsManager::removeLocaleAssetsObserver(
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::LocaleAssetsObserverInterface>& observer) {
+    std::lock_guard<std::mutex> lock{m_observersMutex};
+    if (observer == nullptr) {
+        ACSDK_ERROR(LX("removeLocaleAssetsObserverFailed").d("reason", "nullObserver"));
+        return;
+    }
+    m_observers.erase(observer);
+}
+
+void LocaleAssetsManager::setEndpointRegistrationManager(
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointRegistrationManagerInterface>&
+        manager) {
+    std::lock_guard<std::mutex> lock{m_ermMutex};
+    if (manager == nullptr) {
+        ACSDK_ERROR(LX("setEndpointRegistrationManagerFailed").m("null EndpointRegistrationManager"));
+        return;
+    }
+    m_endpointRegistrationManager = manager;
+}
+
+void LocaleAssetsManager::onConfigurationChanged(
+    const alexaClientSDK::avsCommon::avs::CapabilityConfiguration& configuration) {
+    // No-op
+}
+
+LocaleAssetsManager::LocaleAssetsManager() :
+        RequiresShutdown{"LocaleAssetsManager"},
+        m_defaultLocale{DEFAULT_LOCALE_VALUE} {
+}
+
+#ifdef KWD
+#ifdef ASSET_MANAGER
+LocaleAssetsManager::LocaleAssetsManager(
+    const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+    const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+    const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector,
+    const std::shared_ptr<AssetManager>& assetManager) :
+        RequiresShutdown{"LocaleAssetsManager"},
+        m_audioInputStream(audioInputStream),
+        m_audioFormat(audioFormat),
+        m_keywordDetector(keywordDetector),
+        m_assetManager(assetManager) {
+}
+#else
+LocaleAssetsManager::LocaleAssetsManager(
+    const std::shared_ptr<avsCommon::avs::AudioInputStream>& audioInputStream,
+    const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
+    const std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>& keywordDetector) :
+        RequiresShutdown{"LocaleAssetsManager"},
+        m_audioInputStream(audioInputStream),
+        m_audioFormat(audioFormat),
+        m_keywordDetector(keywordDetector) {
+}
+#endif
+#endif
+
+void LocaleAssetsManager::doShutdown() {
+    {
+        std::lock_guard<std::mutex> lock{m_ermMutex};
+        m_endpointRegistrationManager.reset();
+    }
+    {
+        std::lock_guard<std::mutex> lock{m_observersMutex};
+        m_observers.clear();
+    }
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/PortAudioMicrophoneWrapper.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/PortAudioMicrophoneWrapper.cpp
new file mode 100644
index 0000000000..f7767ef0ab
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/PortAudioMicrophoneWrapper.cpp
@@ -0,0 +1,200 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <cstring>
+#include <string>
+
+#include <rapidjson/document.h>
+
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include "IPCServerSampleApp/PortAudioMicrophoneWrapper.h"
+#include "IPCServerSampleApp/ConsolePrinter.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+using namespace alexaClientSDK;
+using avsCommon::avs::AudioInputStream;
+
+static const int NUM_INPUT_CHANNELS = 1;
+static const int NUM_OUTPUT_CHANNELS = 0;
+static const double SAMPLE_RATE = 16000;
+static const unsigned long PREFERRED_SAMPLES_PER_CALLBACK = paFramesPerBufferUnspecified;
+
+static const std::string SAMPLE_APP_CONFIG_ROOT_KEY("sampleApp");
+static const std::string PORTAUDIO_CONFIG_ROOT_KEY("portAudio");
+static const std::string PORTAUDIO_CONFIG_SUGGESTED_LATENCY_KEY("suggestedLatency");
+
+/// String to identify log entries originating from this file.
+static const std::string TAG("PortAudioMicrophoneWrapper");
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+std::unique_ptr<PortAudioMicrophoneWrapper> PortAudioMicrophoneWrapper::create(
+    std::shared_ptr<AudioInputStream> stream) {
+    if (!stream) {
+        ACSDK_CRITICAL(LX("Invalid stream passed to PortAudioMicrophoneWrapper"));
+        return nullptr;
+    }
+    std::unique_ptr<PortAudioMicrophoneWrapper> portAudioMicrophoneWrapper(new PortAudioMicrophoneWrapper(stream));
+    if (!portAudioMicrophoneWrapper->initialize()) {
+        ACSDK_CRITICAL(LX("Failed to initialize PortAudioMicrophoneWrapper"));
+        return nullptr;
+    }
+    return portAudioMicrophoneWrapper;
+}
+
+PortAudioMicrophoneWrapper::PortAudioMicrophoneWrapper(std::shared_ptr<AudioInputStream> stream) :
+        m_audioInputStream{stream},
+        m_paStream{nullptr},
+        m_isStreaming{false} {
+}
+
+PortAudioMicrophoneWrapper::~PortAudioMicrophoneWrapper() {
+    Pa_StopStream(m_paStream);
+    Pa_CloseStream(m_paStream);
+    Pa_Terminate();
+}
+
+bool PortAudioMicrophoneWrapper::initialize() {
+    m_writer = m_audioInputStream->createWriter(AudioInputStream::Writer::Policy::NONBLOCKABLE);
+    if (!m_writer) {
+        ACSDK_CRITICAL(LX("Failed to create stream writer"));
+        return false;
+    }
+    PaError err;
+    err = Pa_Initialize();
+    if (err != paNoError) {
+        ACSDK_CRITICAL(LX("Failed to initialize PortAudio").d("errorCode", err));
+        return false;
+    }
+
+    PaTime suggestedLatency = -1;
+    bool latencyInConfig = getConfigSuggestedLatency(suggestedLatency);
+
+    if (!latencyInConfig) {
+        err = Pa_OpenDefaultStream(
+            &m_paStream,
+            NUM_INPUT_CHANNELS,
+            NUM_OUTPUT_CHANNELS,
+            paInt16,
+            SAMPLE_RATE,
+            PREFERRED_SAMPLES_PER_CALLBACK,
+            PortAudioCallback,
+            this);
+    } else {
+        ACSDK_INFO(
+            LX("PortAudio suggestedLatency has been configured to ").d("Seconds", std::to_string(suggestedLatency)));
+        if (suggestedLatency < 0) {
+            ACSDK_CRITICAL(LX("Failed to configure PortAudio invalid suggestedLatency"));
+            return false;
+        }
+
+        PaStreamParameters inputParameters;
+        std::memset(&inputParameters, 0, sizeof(inputParameters));
+        inputParameters.device = Pa_GetDefaultInputDevice();
+        inputParameters.channelCount = NUM_INPUT_CHANNELS;
+        inputParameters.sampleFormat = paInt16;
+        inputParameters.suggestedLatency = suggestedLatency;
+        inputParameters.hostApiSpecificStreamInfo = nullptr;
+
+        err = Pa_OpenStream(
+            &m_paStream,
+            &inputParameters,
+            nullptr,
+            SAMPLE_RATE,
+            PREFERRED_SAMPLES_PER_CALLBACK,
+            paNoFlag,
+            PortAudioCallback,
+            this);
+    }
+
+    if (err != paNoError) {
+        ACSDK_CRITICAL(LX("Failed to open PortAudio default stream").d("errorCode", err));
+        return false;
+    }
+    return true;
+}
+
+bool PortAudioMicrophoneWrapper::startStreamingMicrophoneData() {
+    ACSDK_DEBUG0(LX(__func__));
+    std::lock_guard<std::mutex> lock{m_mutex};
+    PaError err = Pa_StartStream(m_paStream);
+    if (err != paNoError) {
+        ACSDK_CRITICAL(LX("Failed to start PortAudio stream"));
+        return false;
+    }
+    m_isStreaming = true;
+    return true;
+}
+
+bool PortAudioMicrophoneWrapper::stopStreamingMicrophoneData() {
+    ACSDK_DEBUG0(LX(__func__));
+    std::lock_guard<std::mutex> lock{m_mutex};
+    PaError err = Pa_StopStream(m_paStream);
+    if (err != paNoError) {
+        ACSDK_CRITICAL(LX("Failed to stop PortAudio stream"));
+        return false;
+    }
+    m_isStreaming = false;
+    return true;
+}
+
+bool PortAudioMicrophoneWrapper::isStreaming() {
+    return m_isStreaming;
+}
+
+int PortAudioMicrophoneWrapper::PortAudioCallback(
+    const void* inputBuffer,
+    void* outputBuffer,
+    unsigned long numSamples,
+    const PaStreamCallbackTimeInfo* timeInfo,
+    PaStreamCallbackFlags statusFlags,
+    void* userData) {
+    PortAudioMicrophoneWrapper* wrapper = static_cast<PortAudioMicrophoneWrapper*>(userData);
+    ssize_t returnCode = wrapper->m_writer->write(inputBuffer, numSamples);
+    if (returnCode <= 0) {
+        ACSDK_CRITICAL(LX("Failed to write to stream."));
+        return paAbort;
+    }
+    return paContinue;
+}
+
+bool PortAudioMicrophoneWrapper::getConfigSuggestedLatency(PaTime& suggestedLatency) {
+    bool latencyInConfig = false;
+    auto config = avsCommon::utils::configuration::ConfigurationNode::getRoot()[SAMPLE_APP_CONFIG_ROOT_KEY]
+                                                                               [PORTAUDIO_CONFIG_ROOT_KEY];
+    if (config) {
+        latencyInConfig = config.getValue(
+            PORTAUDIO_CONFIG_SUGGESTED_LATENCY_KEY,
+            &suggestedLatency,
+            suggestedLatency,
+            &rapidjson::Value::IsDouble,
+            &rapidjson::Value::GetDouble);
+    }
+
+    return latencyInConfig;
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/RevokeAuthorizationObserver.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/RevokeAuthorizationObserver.cpp
new file mode 100644
index 0000000000..0938c72620
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/RevokeAuthorizationObserver.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/RevokeAuthorizationObserver.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+using namespace alexaClientSDK;
+
+RevokeAuthorizationObserver::RevokeAuthorizationObserver(
+    std::shared_ptr<registrationManager::RegistrationManagerInterface> manager) :
+        m_manager{manager} {
+}
+
+void RevokeAuthorizationObserver::onRevokeAuthorization() {
+    if (m_manager) {
+        m_manager->logout();
+    }
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SampleApplication.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SampleApplication.cpp
new file mode 100644
index 0000000000..d06f440b49
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SampleApplication.cpp
@@ -0,0 +1,1615 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdkAudioInputStream/AudioInputStreamFactory.h>
+#include <acsdkAudioInputStream/CompatibleAudioFormat.h>
+#include <acsdkManufactory/Manufactory.h>
+#include <ACL/Transport/HTTP2TransportFactory.h>
+#include <ACL/Transport/PostConnectSequencerFactory.h>
+#include <AVSCommon/AVS/CapabilitySemantics/CapabilitySemantics.h>
+#include <AVSCommon/AVS/Initialization/InitializationParametersBuilder.h>
+#include <AVSCommon/SDKInterfaces/PowerResourceManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
+#include <AVSCommon/Utils/LibcurlUtils/HttpPost.h>
+#include <AVSCommon/Utils/LibcurlUtils/LibcurlHTTP2ConnectionFactory.h>
+#include <AVSCommon/Utils/UUIDGeneration/UUIDGeneration.h>
+#include <AVSGatewayManager/AVSGatewayManager.h>
+#include <AVSGatewayManager/Storage/AVSGatewayManagerStorage.h>
+#include <SynchronizeStateSender/SynchronizeStateSenderFactory.h>
+
+#include <acsdk/AlexaPresentationFeatureClient/AlexaPresentationFeatureClientBuilder.h>
+#include <acsdk/PresentationOrchestratorFeatureClient/PresentationOrchestratorFeatureClientBuilder.h>
+#include <acsdk/Sample/Endpoint/EndpointFocusAdapter.h>
+#include <acsdk/Sample/InteractionManager/UIManager.h>
+#include <acsdk/Sample/TemplateRuntime/TemplateRuntimePresentationAdapter.h>
+#include <acsdk/SDKClient/SDKClientBuilder.h>
+#include <acsdk/VisualCharacteristicsFeatureClient/VisualCharacteristicsFeatureClientBuilder.h>
+#include <acsdk/VisualStateTrackerFeatureClient/VisualStateTrackerFeatureClientBuilder.h>
+#include <acsdkAuthorization/AuthorizationManager.h>
+#include <acsdkAuthorization/LWA/LWAAuthorizationAdapter.h>
+#include <acsdkAuthorization/LWA/LWAAuthorizationStorage.h>
+#include <acsdkAuthorizationInterfaces/AuthorizationManagerInterface.h>
+#include <acsdkSampleApplicationCBLAuthRequester/SampleApplicationCBLAuthRequester.h>
+
+#include <DefaultClient/DefaultClientBuilder.h>
+
+#ifdef ENABLE_VIDEO_CONTROLLERS
+#include <acsdk/Sample/Endpoint/EndpointCapabilitiesBuilder.h>
+#endif
+
+#ifdef INPUT_CONTROLLER
+#include <acsdk/Sample/Endpoint/InputControllerEndpointCapabilitiesBuilder.h>
+#endif
+
+#ifdef ENABLE_REVOKE_AUTH
+#include "IPCServerSampleApp/RevokeAuthorizationObserver.h"
+#endif
+
+#ifdef KWD
+#include <acsdkKWDProvider/KWDProvider/KeywordDetectorProvider.h>
+#endif
+
+#ifdef PORTAUDIO
+#include "IPCServerSampleApp/PortAudioMicrophoneWrapper.h"
+#elif defined(UWP_BUILD)
+#include "SSSDKCommon/NullMicrophone.h"
+#endif
+
+#ifdef GSTREAMER_MEDIA_PLAYER
+#include <MediaPlayer/MediaPlayer.h>
+#elif defined(UWP_BUILD)
+#include <SSSDKCommon/NullMediaSpeaker.h>
+#include <SSSDKCommon/NullEqualizer.h>
+#endif
+
+#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
+#include <AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceConnectionRuleInterface.h>
+#include <AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Diagnostics/ProtocolTracerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include <AVSCommon/Utils/DeviceInfo.h>
+#include <AVSCommon/Utils/LibcurlUtils/HTTPContentFetcherFactory.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Logger/LoggerSinkManager.h>
+#include <AVSCommon/Utils/Network/InternetConnectionMonitor.h>
+#include <acsdkAlerts/Storage/SQLiteAlertStorage.h>
+#include <Audio/AudioFactory.h>
+#include <Audio/MicrophoneInterface.h>
+#include <acsdkBluetooth/BasicDeviceConnectionRule.h>
+#include <acsdkBluetooth/SQLiteBluetoothStorage.h>
+#include <acsdkNotifications/SQLiteNotificationsStorage.h>
+#include <CapabilitiesDelegate/CapabilitiesDelegate.h>
+#include <CapabilitiesDelegate/Storage/SQLiteCapabilitiesDelegateStorage.h>
+#include <SQLiteStorage/SQLiteMiscStorage.h>
+#include <Settings/Storage/SQLiteDeviceSettingStorage.h>
+#include "IPCServerSampleApp/SampleEqualizerModeController.h"
+
+#include <acsdkEqualizerImplementations/InMemoryEqualizerConfiguration.h>
+#include <acsdkEqualizerImplementations/MiscDBEqualizerStorage.h>
+#include <acsdkEqualizerImplementations/SDKConfigEqualizerConfiguration.h>
+#include <acsdkEqualizerInterfaces/EqualizerInterface.h>
+#include <InterruptModel/config/InterruptModelConfiguration.h>
+
+#include <algorithm>
+#include <cctype>
+#include <csignal>
+
+#ifndef UWP_BUILD
+#include <Communication/WebSocketServer.h>
+#else
+#include "UWPSampleApp/UWPSampleApp/include/UWPSampleApp/NullSocketServer.h"
+#endif
+
+#ifdef CUSTOM_MEDIA_PLAYER
+namespace alexaClientSDK {
+
+std::shared_ptr<avsCommon::sdkInterfaces::ApplicationMediaInterfaces> createCustomMediaPlayer(
+    std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface> contentFetcherFactory,
+    bool enableEqualizer,
+    const std::string& name,
+    bool enableLiveMode);
+
+}  // namespace alexaClientSDK
+#endif
+
+#ifdef ENABLE_RTCSC
+#include <acsdk/LiveViewControllerFeatureClient/LiveViewControllerFeatureClientBuilder.h>
+#include "IPCServerSampleApp/LiveViewController/LiveViewControllerPresentationAdapter.h"
+#endif
+
+#include "IPCServerSampleApp/AlexaPresentation/APLRuntimeInterfaceImpl.h"
+#include "IPCServerSampleApp/AlexaPresentation/APLRuntimePresentationAdapter.h"
+#include "IPCServerSampleApp/GUI/TemplateRuntimePresentationAdapterBridge.h"
+#include "IPCServerSampleApp/ExternalCapabilitiesBuilder.h"
+#include "IPCServerSampleApp/KeywordObserver.h"
+#include "IPCServerSampleApp/LocaleAssetsManager.h"
+#include "IPCServerSampleApp/SampleApplication.h"
+#include "IPCServerSampleApp/SampleApplicationComponent.h"
+#include "IPCServerSampleApp/SmartScreenCaptionPresenter.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+using namespace avsCommon::sdkInterfaces::storage;
+
+/**
+ * WebSocket interface to listen on.
+ * WARNING: If this is changed to listen on a publicly accessible interface then additional
+ * security precautions will need to be taken to secure client connections and authenticate
+ * connecting clients.
+ */
+static const std::string DEFAULT_WEBSOCKET_INTERFACE = "127.0.0.1";
+
+/// WebSocket port to listen on.
+static const int DEFAULT_WEBSOCKET_PORT = 8933;
+
+/// The size of each word within the stream.
+static const size_t WORD_SIZE = 2;
+
+/// The maximum number of readers of the stream.
+static const size_t MAX_READERS = 10;
+
+/// The default number of MediaPlayers used by AudioPlayer CA
+static const unsigned int AUDIO_MEDIAPLAYER_POOL_SIZE_DEFAULT = 2;
+
+#ifdef ENABLE_VIDEO_CONTROLLERS
+// Note: The video endpoint is a virtual endpoint for enabling Video capabilities like AlexaLauncher,
+// AlexaKeypadController, AlexaPlaybackController, AlexaSeekController, AlexaVideoRecorder, AlexaChannelController,
+// AlexaRecordController and AlexaRemoteVideoPlayer.
+
+/// The derived endpoint Id used in endpoint creation.
+static const char VIDEO_ENDPOINT_DERIVED_ENDPOINT_ID[] = "Video";
+
+/// The description of the endpoint.
+static const char VIDEO_ENDPOINT_DESCRIPTION[] = "Sample Video Description";
+
+/// The friendly name of the video endpoint. This is used in utterance.
+static const char VIDEO_ENDPOINT_FRIENDLY_NAME[] = "Video";
+
+/// The manufacturer of video endpoint.
+static const char VIDEO_ENDPOINT_MANUFACTURER_NAME[] = "Sample Manufacturer";
+
+/// The display category of the video endpoint.
+static const std::vector<std::string> VIDEO_ENDPOINT_DISPLAYCATEGORY({"OTHER"});
+
+/// The model of the video endpoint.
+static const char VIDEO_ENDPOINT_ADDITIONAL_ATTRIBUTE_MODEL[] = "Model1";
+
+/// Serial number of the video endpoint.
+static const char VIDEO_ENDPOINT_ADDITIONAL_ATTRIBUTE_SERIAL_NUMBER[] = "123456789";
+
+/// Firmware version number of the video endpoint.
+static const char VIDEO_ENDPOINT_ADDITIONAL_ATTRIBUTE_FIRMWARE_VERSION[] = "1.0";
+
+/// Software Version number of the video endpoint.
+static const char VIDEO_ENDPOINT_ADDITIONAL_ATTRIBUTE_SOFTWARE_VERSION[] = "1.0";
+
+/// The custom identifier of the video endpoint.
+static const char VIDEO_ENDPOINT_ADDITIONAL_ATTRIBUTE_CUSTOM_IDENTIFIER[] = "IPCServerSampleApp";
+#endif  // ENABLE_VIDEO_CONTROLLERS
+
+/// The amount of audio data to keep in the ring buffer.
+static const std::chrono::seconds AMOUNT_OF_AUDIO_DATA_IN_BUFFER = std::chrono::seconds(15);
+
+/// Key for the root node value containing configuration values for SampleApp.
+static const std::string SAMPLE_APP_CONFIG_KEY("sampleApp");
+
+/// Key for the root node value containing configuration values for Equalizer.
+static const std::string EQUALIZER_CONFIG_KEY("equalizer");
+
+/// Key for the @c firmwareVersion value under the @c SAMPLE_APP_CONFIG_KEY configuration node.
+static const std::string FIRMWARE_VERSION_KEY("firmwareVersion");
+
+/// Key for the @c websocket config under the @c SAMPLE_APP_CONFIG_KEY configuration node.
+static const std::string WEBSOCKET_CONFIG_KEY("websocket");
+
+/// Key for setting the interface which websockets will bind to @c WEBSOCKET_CONFIG_KEY configuration node.
+static const std::string WEBSOCKET_INTERFACE_KEY("websocketInterface");
+
+/// Key for setting the port number which websockets will listen on @c WEBSOCKET_CONFIG_KEY configuration node.
+static const std::string WEBSOCKET_PORT_KEY("websocketPort");
+
+/// Key for setting the certificate file for use by websockets when SSL is enabled, @c SAMPLE_APP_CONFIG configuration
+/// node.
+static const std::string WEBSOCKET_CERTIFICATE("websocketCertificate");
+
+/// Key for setting the private key file for use by websockets when SSL is enabled, @c SAMPLE_APP_CONFIG configuration
+/// node.
+static const std::string WEBSOCKET_PRIVATE_KEY("websocketPrivateKey");
+
+/// Key for setting the certificate authority file for use by websockets when SSL is enabled, @c SAMPLE_APP_CONFIG
+/// configuration node.
+static const std::string WEBSOCKET_CERTIFICATE_AUTHORITY("websocketCertificateAuthority");
+
+/// Key for the Audio MediaPlayer pool size.
+static const std::string AUDIO_MEDIAPLAYER_POOL_SIZE_KEY("audioMediaPlayerPoolSize");
+
+/// Key for the root node value containing configuration values for APL Content Cache.
+static const std::string APL_CONTENT_CACHE_CONFIG_KEY("aplContentCache");
+
+/// Key for cache reuse period for imported packages in seconds.
+static const std::string CONTENT_CACHE_REUSE_PERIOD_IN_SECONDS_KEY("contentCacheReusePeriodInSeconds");
+
+/// Default value for cache reuse period.
+static const std::string DEFAULT_CONTENT_CACHE_REUSE_PERIOD_IN_SECONDS("600");
+
+/// Key for max number of cache entries for imported packages.
+static const std::string CONTENT_CACHE_MAX_SIZE_KEY("contentCacheMaxSize");
+
+/// Default value for max number of cache entries for imported packages.
+static const std::string DEFAULT_CONTENT_CACHE_MAX_SIZE("50");
+
+/// The key in our config file to find the maxNumberOfConcurrentDownloads configuration.
+static const std::string MAX_NUMBER_OF_CONCURRENT_DOWNLOAD_CONFIGURATION_KEY = "maxNumberOfConcurrentDownloads";
+
+/// The default value for the maximum number of concurrent downloads.
+static const int DEFAULT_MAX_NUMBER_OF_CONCURRENT_DOWNLOAD = 5;
+
+/// Misc Storage app component name.
+static const std::string MISC_STORAGE_APP_COMPONENT_NAME("IPCServerSampleApp");
+
+/// Misc Storage APL table name.
+static const std::string MISC_STORAGE_APL_TABLE_NAME("APL");
+
+/// Storage key name for APLMaxVersion entry.
+static const std::string APL_MAX_VERSION_DB_KEY("APLMaxVersion");
+
+using namespace alexaClientSDK;
+using namespace acsdkExternalMediaPlayer;
+using namespace acsdkManufactory;
+using namespace avsCommon;
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using MediaPlayerInterface = avsCommon::utils::mediaPlayer::MediaPlayerInterface;
+using ApplicationMediaInterfaces = avsCommon::sdkInterfaces::ApplicationMediaInterfaces;
+
+/// The @c m_playerToMediaPlayerMap Map of the adapter to their speaker-type and MediaPlayer creation methods.
+std::unordered_map<std::string, avsCommon::sdkInterfaces::ChannelVolumeInterface::Type>
+    SampleApplication::m_playerToSpeakerTypeMap;
+
+/// The singleton map from @c playerId to @c ExternalMediaAdapter creation functions.
+std::unordered_map<std::string, ExternalMediaPlayer::AdapterCreateFunction> SampleApplication::m_adapterToCreateFuncMap;
+
+/// String to identify log entries originating from this file.
+static const std::string TAG("SampleApplication");
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// A set of all log levels.
+static const std::set<avsCommon::utils::logger::Level> allLevels = {avsCommon::utils::logger::Level::DEBUG9,
+                                                                    avsCommon::utils::logger::Level::DEBUG8,
+                                                                    avsCommon::utils::logger::Level::DEBUG7,
+                                                                    avsCommon::utils::logger::Level::DEBUG6,
+                                                                    avsCommon::utils::logger::Level::DEBUG5,
+                                                                    avsCommon::utils::logger::Level::DEBUG4,
+                                                                    avsCommon::utils::logger::Level::DEBUG3,
+                                                                    avsCommon::utils::logger::Level::DEBUG2,
+                                                                    avsCommon::utils::logger::Level::DEBUG1,
+                                                                    avsCommon::utils::logger::Level::DEBUG0,
+                                                                    avsCommon::utils::logger::Level::INFO,
+                                                                    avsCommon::utils::logger::Level::WARN,
+                                                                    avsCommon::utils::logger::Level::ERROR,
+                                                                    avsCommon::utils::logger::Level::CRITICAL,
+                                                                    avsCommon::utils::logger::Level::NONE};
+
+/**
+ * Gets a log level consumable by the SDK based on the user input string for log level.
+ *
+ * @param userInputLogLevel The string to be parsed into a log level.
+ * @return The log level. This will default to NONE if the input string is not properly parsable.
+ */
+static avsCommon::utils::logger::Level getLogLevelFromUserInput(std::string userInputLogLevel) {
+    std::transform(userInputLogLevel.begin(), userInputLogLevel.end(), userInputLogLevel.begin(), ::toupper);
+    return avsCommon::utils::logger::convertNameToLevel(userInputLogLevel);
+}
+
+/**
+ * Allows the process to ignore the SIGPIPE signal.
+ * The SIGPIPE signal may be received when the application performs a write to a closed socket.
+ * This is a case that arises in the use of certain networking libraries.
+ *
+ * @return true if the action for handling SIGPIPEs was correctly set to ignore, else false.
+ */
+static bool ignoreSigpipeSignals() {
+#ifndef NO_SIGPIPE
+    if (std::signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
+        return false;
+    }
+#endif
+    return true;
+}
+
+std::unique_ptr<SampleApplication> SampleApplication::create(
+    const std::vector<std::string>& configFiles,
+    const std::string& logLevel,
+    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics) {
+    auto clientApplication = std::unique_ptr<SampleApplication>(new SampleApplication);
+    if (!clientApplication->initialize(configFiles, logLevel, diagnostics)) {
+        ACSDK_CRITICAL(LX("Failed to initialize SampleApplication"));
+        return nullptr;
+    }
+    if (!ignoreSigpipeSignals()) {
+        ACSDK_CRITICAL(LX("Failed to set a signal handler for SIGPIPE"));
+        return nullptr;
+    }
+
+    return clientApplication;
+}
+
+SampleApplication::AdapterRegistration::AdapterRegistration(
+    const std::string& playerId,
+    ExternalMediaPlayer::AdapterCreateFunction createFunction) {
+    ACSDK_DEBUG0(LX(__func__).d("id", playerId));
+    if (m_adapterToCreateFuncMap.find(playerId) != m_adapterToCreateFuncMap.end()) {
+        ACSDK_WARN(LX("Adapter already exists").d("playerID", playerId));
+    }
+
+    m_adapterToCreateFuncMap[playerId] = createFunction;
+}
+
+SampleApplication::MediaPlayerRegistration::MediaPlayerRegistration(
+    const std::string& playerId,
+    avsCommon::sdkInterfaces::ChannelVolumeInterface::Type speakerType) {
+    ACSDK_DEBUG0(LX(__func__).d("id", playerId));
+    if (m_playerToSpeakerTypeMap.find(playerId) != m_playerToSpeakerTypeMap.end()) {
+        ACSDK_WARN(LX("MediaPlayer already exists").d("playerId", playerId));
+    }
+
+    m_playerToSpeakerTypeMap[playerId] = speakerType;
+}
+
+SampleAppReturnCode SampleApplication::run() {
+    return m_guiClient->run();
+}
+
+SampleApplication::~SampleApplication() {
+    if (m_aplClientBridge) {
+        m_aplClientBridge->shutdown();
+    }
+
+    if (m_guiManager) {
+        m_guiManager->shutdown();
+    }
+
+    if (m_guiClient) {
+        m_guiClient->shutdown();
+    }
+    // Clean up anything that depends on the the MediaPlayers.
+    m_externalMusicProviderMediaPlayersMap.clear();
+
+    for (auto& shutdownable : m_shutdownRequiredList) {
+        if (!shutdownable) {
+            ACSDK_ERROR(LX("shutdownFailed").m("Component requiring shutdown was null"));
+        }
+        shutdownable->shutdown();
+    }
+
+    m_sdkInit.reset();
+}
+
+bool SampleApplication::createMediaPlayersForAdapters(
+    const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
+        httpContentFetcherFactory,
+    const std::shared_ptr<defaultClient::EqualizerRuntimeSetup> equalizerRuntimeSetup) {
+    bool equalizerEnabled = equalizerRuntimeSetup->isEnabled();
+
+    for (auto& entry : m_playerToSpeakerTypeMap) {
+        auto applicationMediaInterfaces = createApplicationMediaPlayer(
+            httpContentFetcherFactory, equalizerEnabled, entry.first + "MediaPlayer", false);
+        if (applicationMediaInterfaces) {
+            m_externalMusicProviderMediaPlayersMap[entry.first] = applicationMediaInterfaces->mediaPlayer;
+            m_externalMusicProviderSpeakersMap[entry.first] = applicationMediaInterfaces->speaker;
+            if (equalizerEnabled) {
+                equalizerRuntimeSetup->addEqualizer(applicationMediaInterfaces->equalizer);
+            }
+        } else {
+            ACSDK_CRITICAL(LX("Failed to create application media interface").d("playerId", entry.first));
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool SampleApplication::initialize(
+    const std::vector<std::string>& configFiles,
+    const std::string& logLevel,
+    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics) {
+    avsCommon::utils::logger::Level logLevelValue = avsCommon::utils::logger::Level::UNKNOWN;
+
+    if (!logLevel.empty()) {
+        logLevelValue = getLogLevelFromUserInput(logLevel);
+        if (avsCommon::utils::logger::Level::UNKNOWN == logLevelValue) {
+            ConsolePrinter::simplePrint("Unknown log level input!");
+            ConsolePrinter::simplePrint("Possible log level options are: ");
+            for (auto it = allLevels.begin(); it != allLevels.end(); ++it) {
+                ConsolePrinter::simplePrint(avsCommon::utils::logger::convertLevelToName(*it));
+            }
+            return false;
+        }
+
+        ConsolePrinter::simplePrint(
+            "Running app with log level: " + avsCommon::utils::logger::convertLevelToName(logLevelValue));
+    }
+
+    avsCommon::utils::logger::LoggerSinkManager::instance().setLevel(logLevelValue);
+
+    auto configJsonStreams = std::make_shared<std::vector<std::shared_ptr<std::istream>>>();
+
+    for (auto& configFile : configFiles) {
+        if (configFile.empty()) {
+            ConsolePrinter::simplePrint("Config filename is empty!");
+            return false;
+        }
+
+        auto configInFile = std::shared_ptr<std::ifstream>(new std::ifstream(configFile));
+        if (!configInFile->good()) {
+            ACSDK_CRITICAL(LX("Failed to read config file").d("filename", configFile));
+            ConsolePrinter::simplePrint("Failed to read config file " + configFile);
+            return false;
+        }
+
+        configJsonStreams->push_back(configInFile);
+    }
+
+    bool enableDucking = true;
+
+#ifdef DISABLE_DUCKING
+    enableDucking = false;
+#endif
+
+    // Add the InterruptModel Configuration.
+    configJsonStreams->push_back(afml::interruptModel::InterruptModelConfiguration::getConfig(enableDucking));
+
+    auto builder = initialization::InitializationParametersBuilder::create();
+    if (!builder) {
+        ACSDK_ERROR(LX("createInitializeParamsFailed").d("reason", "nullBuilder"));
+        return false;
+    }
+
+    builder->withJsonStreams(configJsonStreams);
+
+    auto initParams = builder->build();
+    auto sampleAppComponent = getComponent(std::move(initParams), m_shutdownRequiredList);
+
+    auto manufactory = Manufactory<
+        std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit>,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>,
+        std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>,
+        std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>,
+        std::shared_ptr<avsCommon::utils::DeviceInfo>,
+        std::shared_ptr<registrationManager::CustomerDataManagerInterface>,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>,
+        std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>,
+        std::shared_ptr<cryptoInterfaces::KeyStoreInterface>>::create(sampleAppComponent);
+
+    auto metricRecorder = manufactory->get<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>();
+
+    m_sdkInit = manufactory->get<std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit>>();
+    if (!m_sdkInit) {
+        ACSDK_CRITICAL(LX("Failed to get SDKInit!"));
+        return false;
+    }
+
+    auto configPtr = manufactory->get<std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>>();
+    if (!configPtr) {
+        ACSDK_CRITICAL(LX("Failed to acquire the configuration"));
+        return false;
+    }
+    auto& config = *configPtr;
+
+#ifdef ENABLE_CONFIG_VALIDATION
+
+    /*
+     * Creating config validator
+     */
+    auto configValidator = ConfigValidator::create();
+    if (!configValidator) {
+        ACSDK_CRITICAL(LX("Failed to create config validator!"));
+        return false;
+    }
+
+    auto schemaStringInAscii = decodeHexToAscii(SCHEMA_HEX);
+    std::stringstream schemaStream;
+    schemaStream << schemaStringInAscii;
+
+    if (schemaStream.good()) {
+        rapidjson::IStreamWrapper isw(schemaStream);
+        rapidjson::Document jsonSchema;
+        if (!jsonSchema.ParseStream(isw).HasParseError()) {
+            // Validating config parameters
+            if (!configValidator->validate(config, jsonSchema)) {
+                ACSDK_ERROR(LX("Configuration validation failed!"));
+                return false;
+            }
+        } else {
+            ACSDK_ERROR(LX("Configuration file could not be validated!").d("reason", "invalid json schema"));
+            return false;
+        }
+    } else {
+        ACSDK_ERROR(LX("Configuration file could not be validated!").d("reason", "failed to read schema string"));
+        return false;
+    }
+
+#endif
+
+    auto sampleAppConfig = config[SAMPLE_APP_CONFIG_KEY];
+
+    auto httpContentFetcherFactory = std::make_shared<avsCommon::utils::libcurlUtils::HTTPContentFetcherFactory>();
+
+    // Creating the misc DB object to be used by various components.
+    std::shared_ptr<alexaClientSDK::storage::sqliteStorage::SQLiteMiscStorage> miscStorage =
+        alexaClientSDK::storage::sqliteStorage::SQLiteMiscStorage::create(config);
+
+    if (!miscStorage->isOpened() && !miscStorage->open()) {
+        ACSDK_DEBUG3(LX("openStorage").m("Couldn't open misc database. Creating."));
+
+        if (!miscStorage->createDatabase()) {
+            ACSDK_ERROR(LX("openStorageFailed").m("Could not create misc database."));
+            return false;
+        }
+    }
+
+    std::string APLVersion;
+    std::string websocketInterface;
+    auto websocketConfig = sampleAppConfig[WEBSOCKET_CONFIG_KEY];
+    websocketConfig.getString(WEBSOCKET_INTERFACE_KEY, &websocketInterface, DEFAULT_WEBSOCKET_INTERFACE);
+
+    int websocketPortNumber = DEFAULT_WEBSOCKET_PORT;
+    websocketConfig.getInt(WEBSOCKET_PORT_KEY, &websocketPortNumber, DEFAULT_WEBSOCKET_PORT);
+
+    // Create the websocket server that handles communications with websocket clients
+
+#ifdef UWP_BUILD
+    auto webSocketServer = std::make_shared<NullSocketServer>();
+#else
+    auto webSocketServer = std::make_shared<communication::WebSocketServer>(websocketInterface, websocketPortNumber);
+
+#ifdef ENABLE_WEBSOCKET_SSL
+    std::string sslCaFile;
+    websocketConfig.getString(WEBSOCKET_CERTIFICATE_AUTHORITY, &sslCaFile);
+
+    std::string sslCertificateFile;
+    websocketConfig.getString(WEBSOCKET_CERTIFICATE, &sslCertificateFile);
+
+    std::string sslPrivateKeyFile;
+    websocketConfig.getString(WEBSOCKET_PRIVATE_KEY, &sslPrivateKeyFile);
+
+    webSocketServer->setCertificateFile(sslCaFile, sslCertificateFile, sslPrivateKeyFile);
+#endif  // ENABLE_WEBSOCKET_SSL
+
+#endif  // UWP_BUILD
+
+    /*
+     * Creating customerDataManager which will be used by the registrationManager and all classes that extend
+     * CustomerDataHandler
+     */
+    auto customerDataManager = manufactory->get<std::shared_ptr<registrationManager::CustomerDataManagerInterface>>();
+    if (!customerDataManager) {
+        ACSDK_CRITICAL(LX("Failed to get CustomerDataManager!"));
+        return false;
+    }
+
+    m_activityEventNotifier = gui::GUIActivityEventNotifier::create();
+    auto ipcVersionManager = std::make_shared<ipc::IPCVersionManager>();
+
+    /*
+     * Creating the deviceInfo object
+     */
+    auto deviceInfo = manufactory->get<std::shared_ptr<avsCommon::utils::DeviceInfo>>();
+    if (!deviceInfo) {
+        ACSDK_CRITICAL(LX("Creation of DeviceInfo failed!"));
+        return false;
+    }
+
+    m_guiClient = gui::GUIClient::create(webSocketServer, customerDataManager, ipcVersionManager, deviceInfo);
+
+    if (!m_guiClient) {
+        ACSDK_CRITICAL(LX("Creation of GUIClient failed!"));
+        return false;
+    }
+
+    // Initialize the IPC router
+    m_guiClient->initIPCRouter();
+
+    /*
+     * Creating Equalizer specific implementations
+     */
+    auto equalizerConfigBranch = config[EQUALIZER_CONFIG_KEY];
+    auto equalizerConfiguration = acsdkEqualizer::SDKConfigEqualizerConfiguration::create(equalizerConfigBranch);
+    std::shared_ptr<defaultClient::EqualizerRuntimeSetup> equalizerRuntimeSetup =
+        std::make_shared<defaultClient::EqualizerRuntimeSetup>(false);
+
+    bool equalizerEnabled = false;
+    if (equalizerConfiguration && equalizerConfiguration->isEnabled()) {
+        equalizerEnabled = true;
+        equalizerRuntimeSetup = std::make_shared<defaultClient::EqualizerRuntimeSetup>();
+        auto equalizerStorage = acsdkEqualizer::MiscDBEqualizerStorage::create(miscStorage);
+        auto equalizerModeController = SampleEqualizerModeController::create();
+
+        equalizerRuntimeSetup->setStorage(equalizerStorage);
+        equalizerRuntimeSetup->setConfiguration(equalizerConfiguration);
+        equalizerRuntimeSetup->setModeController(equalizerModeController);
+    }
+
+    auto speakerMediaInterfaces = createApplicationMediaPlayer(httpContentFetcherFactory, false, "SpeakMediaPlayer");
+    if (!speakerMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for speech!"));
+        return false;
+    }
+    m_speakMediaPlayer = speakerMediaInterfaces->mediaPlayer;
+
+    int poolSize = AUDIO_MEDIAPLAYER_POOL_SIZE_DEFAULT;
+    sampleAppConfig.getInt(AUDIO_MEDIAPLAYER_POOL_SIZE_KEY, &poolSize, AUDIO_MEDIAPLAYER_POOL_SIZE_DEFAULT);
+    std::vector<std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface>> audioSpeakers;
+
+    for (int index = 0; index < poolSize; index++) {
+        std::shared_ptr<MediaPlayerInterface> mediaPlayer;
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerInterface> speaker;
+        std::shared_ptr<acsdkEqualizerInterfaces::EqualizerInterface> equalizer;
+
+        auto audioMediaInterfaces =
+            createApplicationMediaPlayer(httpContentFetcherFactory, equalizerEnabled, "AudioMediaPlayer");
+        if (!audioMediaInterfaces) {
+            ACSDK_CRITICAL(LX("Failed to create application media interfaces for audio!"));
+            return false;
+        }
+        m_audioMediaPlayerPool.push_back(audioMediaInterfaces->mediaPlayer);
+        audioSpeakers.push_back(audioMediaInterfaces->speaker);
+        // Creating equalizers
+        if (equalizerRuntimeSetup->isEnabled()) {
+            equalizerRuntimeSetup->addEqualizer(audioMediaInterfaces->equalizer);
+        }
+    }
+
+    avsCommon::utils::Optional<avsCommon::utils::mediaPlayer::Fingerprint> fingerprint =
+        (*(m_audioMediaPlayerPool.begin()))->getFingerprint();
+    auto audioMediaPlayerFactory = std::unique_ptr<mediaPlayer::PooledMediaPlayerFactory>();
+    if (fingerprint.hasValue()) {
+        audioMediaPlayerFactory =
+            mediaPlayer::PooledMediaPlayerFactory::create(m_audioMediaPlayerPool, fingerprint.value());
+    } else {
+        audioMediaPlayerFactory = mediaPlayer::PooledMediaPlayerFactory::create(m_audioMediaPlayerPool);
+    }
+    if (!audioMediaPlayerFactory) {
+        ACSDK_CRITICAL(LX("Failed to create media player factory for content!"));
+        return false;
+    }
+
+    auto notificationMediaInterfaces =
+        createApplicationMediaPlayer(httpContentFetcherFactory, false, "NotificationsMediaPlayer");
+    if (!notificationMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for notifications!"));
+        return false;
+    }
+    m_notificationsMediaPlayer = notificationMediaInterfaces->mediaPlayer;
+
+    auto bluetoothMediaInterfaces =
+        createApplicationMediaPlayer(httpContentFetcherFactory, false, "BluetoothMediaPlayer");
+    if (!bluetoothMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for bluetooth!"));
+        return false;
+    }
+    m_bluetoothMediaPlayer = bluetoothMediaInterfaces->mediaPlayer;
+
+    auto ringtoneMediaInterfaces =
+        createApplicationMediaPlayer(httpContentFetcherFactory, false, "RingtoneMediaPlayer");
+    if (!ringtoneMediaInterfaces) {
+        ConsolePrinter::simplePrint("Failed to create application media interfaces for ringtones!");
+        return false;
+    }
+    m_ringtoneMediaPlayer = ringtoneMediaInterfaces->mediaPlayer;
+
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+    auto commsMediaInterfaces =
+        createApplicationMediaPlayer(httpContentFetcherFactory, false, "CommsMediaPlayer", true);
+    if (!commsMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for comms!"));
+        return false;
+    }
+    m_commsMediaPlayer = commsMediaInterfaces->mediaPlayer;
+    auto commsSpeaker = commsMediaInterfaces->speaker;
+#endif
+
+    auto alertsMediaInterfaces = createApplicationMediaPlayer(httpContentFetcherFactory, false, "AlertsMediaPlayer");
+    if (!alertsMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for alerts!"));
+        return false;
+    }
+
+    m_alertsMediaPlayer = alertsMediaInterfaces->mediaPlayer;
+    auto systemSoundMediaInterfaces =
+        createApplicationMediaPlayer(httpContentFetcherFactory, false, "SystemSoundMediaPlayer");
+    if (!systemSoundMediaInterfaces) {
+        ACSDK_CRITICAL(LX("Failed to create application media interfaces for system sound player!"));
+        return false;
+    }
+    m_systemSoundMediaPlayer = systemSoundMediaInterfaces->mediaPlayer;
+
+    if (!createMediaPlayersForAdapters(httpContentFetcherFactory, equalizerRuntimeSetup)) {
+        ACSDK_CRITICAL(LX("Could not create mediaPlayers for adapters"));
+        return false;
+    }
+
+    auto audioFactory = std::make_shared<applicationUtilities::resources::audio::AudioFactory>();
+
+    // Creating the alert storage object to be used for rendering and storing alerts.
+    auto alertStorage =
+        acsdkAlerts::storage::SQLiteAlertStorage::create(config, audioFactory->alerts(), metricRecorder);
+
+    // Creating the message storage object to be used for storing message to be sent later.
+    auto messageStorage = certifiedSender::SQLiteMessageStorage::create(config);
+
+    /*
+     * Creating notifications storage object to be used for storing notification indicators.
+     */
+    auto notificationsStorage = acsdkNotifications::SQLiteNotificationsStorage::create(config);
+
+    /*
+     * Creating new device settings storage object to be used for storing AVS Settings.
+     */
+    auto deviceSettingsStorage = settings::storage::SQLiteDeviceSettingStorage::create(config);
+
+    /*
+     * Creating bluetooth storage object to be used for storing uuid to mac mappings for devices.
+     */
+    auto bluetoothStorage = acsdkBluetooth::SQLiteBluetoothStorage::create(config);
+
+    /*
+     * Create sample locale asset manager.
+     */
+    auto localeAssetsManager = manufactory->get<std::shared_ptr<LocaleAssetsManagerInterface>>();
+    if (!localeAssetsManager) {
+        ACSDK_CRITICAL(LX("Failed to create Locale Assets Manager!"));
+        return false;
+    }
+
+    std::string cachePeriodInSeconds;
+    std::string maxCacheSize;
+
+    auto aplContentCacheConfig = sampleAppConfig[APL_CONTENT_CACHE_CONFIG_KEY];
+
+    aplContentCacheConfig.getString(
+        CONTENT_CACHE_REUSE_PERIOD_IN_SECONDS_KEY,
+        &cachePeriodInSeconds,
+        DEFAULT_CONTENT_CACHE_REUSE_PERIOD_IN_SECONDS);
+    aplContentCacheConfig.getString(CONTENT_CACHE_MAX_SIZE_KEY, &maxCacheSize, DEFAULT_CONTENT_CACHE_MAX_SIZE);
+
+    auto contentDownloadManager = std::make_shared<CachingDownloadManager>(
+        httpContentFetcherFactory,
+        std::stol(cachePeriodInSeconds),
+        std::stol(maxCacheSize),
+        miscStorage,
+        customerDataManager);
+
+    int maxNumberOfConcurrentDownloads = DEFAULT_MAX_NUMBER_OF_CONCURRENT_DOWNLOAD;
+    aplContentCacheConfig.getInt(
+        MAX_NUMBER_OF_CONCURRENT_DOWNLOAD_CONFIGURATION_KEY,
+        &maxNumberOfConcurrentDownloads,
+        DEFAULT_MAX_NUMBER_OF_CONCURRENT_DOWNLOAD);
+
+    if (1 > maxNumberOfConcurrentDownloads) {
+        maxNumberOfConcurrentDownloads = DEFAULT_MAX_NUMBER_OF_CONCURRENT_DOWNLOAD;
+        ACSDK_ERROR(LX("Invalid values for maxNumberOfConcurrentDownloads"));
+    }
+
+    auto parameters = AplClientBridgeParameter{maxNumberOfConcurrentDownloads};
+    m_aplClientBridge = AplClientBridge::create(contentDownloadManager, m_guiClient, parameters);
+    APLVersion = m_aplClientBridge->getMaxAPLVersion();
+
+    bool aplTableExists = false;
+    if (!miscStorage->tableExists(MISC_STORAGE_APP_COMPONENT_NAME, MISC_STORAGE_APL_TABLE_NAME, &aplTableExists)) {
+        ACSDK_ERROR(LX("openStorageFailed").m("Could not get apl table information from misc database."));
+        return false;
+    }
+
+    if (!aplTableExists) {
+        ACSDK_DEBUG3(LX("openStorage").d("apl table doesn't exist", MISC_STORAGE_APL_TABLE_NAME));
+        if (!miscStorage->createTable(
+                MISC_STORAGE_APP_COMPONENT_NAME,
+                MISC_STORAGE_APL_TABLE_NAME,
+                MiscStorageInterface::KeyType::STRING_KEY,
+                MiscStorageInterface::ValueType::STRING_VALUE)) {
+            ACSDK_ERROR(LX("openStorageFailed")
+                            .d("reason", "Could not create table")
+                            .d("table", MISC_STORAGE_APL_TABLE_NAME)
+                            .d("component", MISC_STORAGE_APP_COMPONENT_NAME));
+            return false;
+        }
+    }
+
+    std::string APLDBVersion;
+    if (!miscStorage->get(
+            MISC_STORAGE_APP_COMPONENT_NAME, MISC_STORAGE_APL_TABLE_NAME, APL_MAX_VERSION_DB_KEY, &APLDBVersion)) {
+        ACSDK_ERROR(LX("getAPLMaxVersionFromStorageFailed").d("reason", "storage failure"));
+    }
+    ACSDK_DEBUG3(LX(__func__).d("APLDBVersion", APLDBVersion));
+    if (APLDBVersion.empty()) {
+        ACSDK_INFO(LX("no APL version saved").d("reason", "couldn't find saved APLDBVersion"));
+    }
+
+    bool aplVersionChanged = false;
+    if (APLVersion != APLDBVersion) {
+        // Empty value does not constitute version change, and should not result in app reset.
+        if (!APLDBVersion.empty()) {
+            aplVersionChanged = true;
+        }
+        if (!miscStorage->put(
+                MISC_STORAGE_APP_COMPONENT_NAME, MISC_STORAGE_APL_TABLE_NAME, APL_MAX_VERSION_DB_KEY, APLVersion)) {
+            ACSDK_ERROR(LX("saveAPLMaxVersionInStorage").m("Could not set new value"));
+        } else {
+            ACSDK_DEBUG1(LX("saveAPLMaxVersionInStorage").m("succeeded"));
+        }
+    }
+
+    m_guiClient->setAplClientBridge(m_aplClientBridge, aplVersionChanged);
+
+    m_alexaCaptionIPCHandler = ipc::AlexaCaptionsHandler::create(m_guiClient->getIPCRouter(), miscStorage);
+    /*
+     * Create the presentation layer for the captions.
+     */
+    auto captionPresenter = std::make_shared<SmartScreenCaptionPresenter>(m_alexaCaptionIPCHandler);
+
+    // Creating the UI component that observes various components and prints to the console accordingly.
+    auto uiManager = common::UIManager::create(localeAssetsManager, deviceInfo);
+    if (!uiManager) {
+        ACSDK_CRITICAL(LX("Failed to get UIManager!"));
+        return false;
+    }
+
+    uiManager->setUIAuthNotifier(m_guiClient);
+    uiManager->setUIStateAggregator(m_guiClient);
+
+    auto cblAuthRequester = acsdkSampleApplicationCBLAuthRequester::SampleApplicationCBLAuthRequester::
+        createCBLAuthorizationObserverInterface(uiManager);
+    if (!cblAuthRequester) {
+        ACSDK_CRITICAL(LX("Failed to initialize CBLAuthRequester"));
+        return false;
+    }
+
+    std::static_pointer_cast<acsdkSampleApplicationCBLAuthRequester::SampleApplicationCBLAuthRequester>(
+        cblAuthRequester)
+        ->setUIAuthNotifier(m_guiClient);
+
+    /*
+     * Supply a SALT for UUID generation, this should be as unique to each individual device as possible
+     */
+    avsCommon::utils::uuidGeneration::setSalt(deviceInfo->getClientId() + deviceInfo->getDeviceSerialNumber());
+
+    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> authDelegate;
+
+    m_authManager = acsdkAuthorization::AuthorizationManager::create(miscStorage, customerDataManager);
+    if (!m_authManager) {
+        ACSDK_CRITICAL(LX("Failed to create AuthorizationManager!"));
+        return false;
+    }
+
+    m_shutdownRequiredList.push_back(m_authManager);
+    authDelegate = m_authManager;
+
+    if (!authDelegate) {
+        ACSDK_CRITICAL(LX("Creation of AuthDelegate failed!"));
+        return false;
+    }
+
+    /*
+     * Creating the CapabilitiesDelegate - This component provides the client with the ability to send messages to the
+     * Capabilities API.
+     */
+    auto capabilitiesDelegateStorage = capabilitiesDelegate::storage::SQLiteCapabilitiesDelegateStorage::create(config);
+
+    m_capabilitiesDelegate = capabilitiesDelegate::CapabilitiesDelegate::create(
+        authDelegate, std::move(capabilitiesDelegateStorage), customerDataManager);
+
+    if (!m_capabilitiesDelegate) {
+        ACSDK_CRITICAL(LX("Creation of CapabilitiesDelegate failed!"));
+        return false;
+    }
+
+    m_shutdownRequiredList.push_back(m_capabilitiesDelegate);
+    authDelegate->addAuthObserver(uiManager);
+    m_capabilitiesDelegate->addCapabilitiesObserver(uiManager);
+
+    // INVALID_FIRMWARE_VERSION is passed to @c getInt() as a default in case FIRMWARE_VERSION_KEY is not found.
+    int firmwareVersion = static_cast<int>(avsCommon::sdkInterfaces::softwareInfo::INVALID_FIRMWARE_VERSION);
+    sampleAppConfig.getInt(FIRMWARE_VERSION_KEY, &firmwareVersion, firmwareVersion);
+
+    /*
+     * Creating the InternetConnectionMonitor that will notify observers of internet connection status changes.
+     */
+    auto internetConnectionMonitor =
+        avsCommon::utils::network::InternetConnectionMonitor::create(httpContentFetcherFactory);
+    if (!internetConnectionMonitor) {
+        ACSDK_CRITICAL(LX("Failed to create InternetConnectionMonitor"));
+        return false;
+    }
+
+    /*
+     * Creating the Context Manager - This component manages the context of each of the components to update to AVS.
+     * It is required for each of the capability agents so that they may provide their state just before any event is
+     * fired off.
+     */
+    auto contextManager = manufactory->get<std::shared_ptr<ContextManagerInterface>>();
+    if (!contextManager) {
+        ACSDK_CRITICAL(LX("Creation of ContextManager failed."));
+        return false;
+    }
+
+    auto avsGatewayManagerStorage = avsGatewayManager::storage::AVSGatewayManagerStorage::create(miscStorage);
+    if (!avsGatewayManagerStorage) {
+        ACSDK_CRITICAL(LX("Creation of AVSGatewayManagerStorage failed"));
+        return false;
+    }
+    auto avsGatewayManager = avsGatewayManager::AVSGatewayManager::create(
+        std::move(avsGatewayManagerStorage), customerDataManager, config, authDelegate);
+    if (!avsGatewayManager) {
+        ACSDK_CRITICAL(LX("Creation of AVSGatewayManager failed"));
+        return false;
+    }
+
+    auto synchronizeStateSenderFactory = synchronizeStateSender::SynchronizeStateSenderFactory::create(contextManager);
+    if (!synchronizeStateSenderFactory) {
+        ACSDK_CRITICAL(LX("Creation of SynchronizeStateSenderFactory failed"));
+        return false;
+    }
+
+    std::vector<std::shared_ptr<avsCommon::sdkInterfaces::PostConnectOperationProviderInterface>> providers;
+    providers.push_back(synchronizeStateSenderFactory);
+    providers.push_back(avsGatewayManager);
+    providers.push_back(m_capabilitiesDelegate);
+
+    /*
+     * Create a factory for creating objects that handle tasks that need to be performed right after establishing
+     * a connection to AVS.
+     */
+    auto postConnectSequencerFactory = acl::PostConnectSequencerFactory::create(providers);
+
+    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::ProtocolTracerInterface> deviceProtocolTracer;
+    if (diagnostics) {
+        /*
+         * Create the deviceProtocolTracer to trace events and directives.
+         */
+        deviceProtocolTracer = diagnostics->getProtocolTracer();
+
+        if (deviceProtocolTracer) {
+            const std::string DIAGNOSTICS_KEY = "diagnostics";
+            const std::string MAX_TRACED_MESSAGES_KEY = "maxTracedMessages";
+            const std::string TRACE_FROM_STARTUP = "protocolTraceFromStartup";
+
+            int configMaxValue = -1;
+            bool configProtocolTraceEnabled = false;
+
+            if (avsCommon::utils::configuration::ConfigurationNode::getRoot()[DIAGNOSTICS_KEY].getInt(
+                    MAX_TRACED_MESSAGES_KEY, &configMaxValue)) {
+                if (configMaxValue < 0) {
+                    ACSDK_WARN(LX("ignoringMaxTracedMessages")
+                                   .d("reason", "negativeValue")
+                                   .d("maxTracedMessages", configMaxValue));
+                } else {
+                    deviceProtocolTracer->setMaxMessages(static_cast<unsigned int>(configMaxValue));
+                }
+            }
+
+            if (avsCommon::utils::configuration::ConfigurationNode::getRoot()[DIAGNOSTICS_KEY].getBool(
+                    TRACE_FROM_STARTUP, &configProtocolTraceEnabled)) {
+                if (configProtocolTraceEnabled) {
+                    deviceProtocolTracer->setProtocolTraceFlag(configProtocolTraceEnabled);
+                    ACSDK_DEBUG9(LX("Protocol Trace has been enabled at startup"));
+                }
+            }
+        }
+    }
+
+    /*
+     * Create a factory to create objects that establish a connection with AVS.
+     */
+    auto transportFactory = std::make_shared<acl::HTTP2TransportFactory>(
+        std::make_shared<avsCommon::utils::libcurlUtils::LibcurlHTTP2ConnectionFactory>(),
+        postConnectSequencerFactory,
+        nullptr,
+        deviceProtocolTracer);
+
+    /*
+     * Creating the buffer (Shared Data Stream) that will hold user audio data. This is the main input into the SDK.
+     */
+    std::shared_ptr<avsCommon::utils::AudioFormat> compatibleAudioFormat =
+        acsdkAudioInputStream::CompatibleAudioFormat::getCompatibleAudioFormat();
+
+    std::shared_ptr<avsCommon::avs::AudioInputStream> sharedDataStream =
+        acsdkAudioInputStream::AudioInputStreamFactory::createAudioInputStream(
+            compatibleAudioFormat, WORD_SIZE, MAX_READERS, AMOUNT_OF_AUDIO_DATA_IN_BUFFER);
+
+    if (!sharedDataStream) {
+        ACSDK_CRITICAL(LX("Failed to create shared data stream!"));
+        return false;
+    }
+
+    /*
+     * Create the BluetoothDeviceManager to communicate with the Bluetooth stack.
+     */
+    std::unique_ptr<avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceManagerInterface> bluetoothDeviceManager;
+
+    /*
+     * Create the connectionRules to communicate with the Bluetooth stack.
+     */
+    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::bluetooth::BluetoothDeviceConnectionRuleInterface>>
+        enabledConnectionRules;
+    enabledConnectionRules.insert(acsdkBluetooth::BasicDeviceConnectionRule::create());
+
+    /*
+     * Creating each of the audio providers. An audio provider is a simple package of data consisting of the stream
+     * of audio data, as well as metadata about the stream. For each of the three audio providers created here, the same
+     * stream is used since this sample application will only have one microphone.
+     */
+
+    // Creating tap to talk audio provider
+    capabilityAgents::aip::AudioProvider tapToTalkAudioProvider =
+        capabilityAgents::aip::AudioProvider::AudioProvider::TapAudioProvider(sharedDataStream, *compatibleAudioFormat);
+
+    // Creating hold to talk audio provider
+    capabilityAgents::aip::AudioProvider holdToTalkAudioProvider =
+        capabilityAgents::aip::AudioProvider::AudioProvider::HoldAudioProvider(
+            sharedDataStream, *compatibleAudioFormat);
+
+    // Creating wake word audio provider, if necessary
+#ifdef KWD
+    capabilityAgents::aip::AudioProvider wakeWordAudioProvider =
+        capabilityAgents::aip::AudioProvider::WakeAudioProvider(sharedDataStream, *compatibleAudioFormat);
+#endif  // KWD
+
+#ifdef PORTAUDIO
+    std::shared_ptr<PortAudioMicrophoneWrapper> micWrapper = PortAudioMicrophoneWrapper::create(sharedDataStream);
+#elif AUDIO_INJECTION
+    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::AudioInjectorInterface> audioInjector;
+    if (diagnostics) {
+        audioInjector = diagnostics->getAudioInjector();
+    }
+
+    if (!audioInjector) {
+        ACSDK_CRITICAL(LX("No audio injector provided!"));
+        return false;
+    }
+    std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> micWrapper =
+        audioInjector->getMicrophone(sharedDataStream, *compatibleAudioFormat);
+#elif defined(UWP_BUILD)
+    std::shared_ptr<alexaSmartScreenSDK::sssdkCommon::NullMicrophone> micWrapper =
+        std::make_shared<alexaSmartScreenSDK::sssdkCommon::NullMicrophone>(sharedDataStream);
+#else
+    ACSDK_CRITICAL(LX("No microphone module provided!"));
+    return false;
+#endif
+    if (!micWrapper) {
+        ACSDK_CRITICAL(LX("Failed to create microphone wrapper!"));
+        return false;
+    }
+
+    auto aplRuntimeInterface = APLRuntimeInterfaceImpl::create(m_aplClientBridge);
+    if (!aplRuntimeInterface) {
+        ACSDK_CRITICAL(LX("Failed to create APLRuntimeInterface!"));
+        return false;
+    }
+
+    auto aplRuntimePresentationAdapter =
+        APLRuntimePresentationAdapter::create(aplRuntimeInterface, m_activityEventNotifier);
+
+    if (!aplRuntimePresentationAdapter) {
+        ACSDK_CRITICAL(LX("Failed to create APLRuntimePresentationAdapter!"));
+        return false;
+    }
+
+    auto templateRuntimePresentationAdapter = sampleApplications::common::TemplateRuntimePresentationAdapter::create();
+
+    if (!templateRuntimePresentationAdapter) {
+        ACSDK_CRITICAL(LX("Failed to create TemplateRuntimePresentationAdapter!"));
+        return false;
+    }
+
+    auto templateRuntimePresentationAdapterBridge =
+        gui::TemplateRuntimePresentationAdapterBridge::create(templateRuntimePresentationAdapter);
+
+    if (!templateRuntimePresentationAdapterBridge) {
+        ACSDK_CRITICAL(LX("Failed to create TemplateRuntimePresentationAdapterBridge!"));
+        return false;
+    }
+
+    m_templateRuntimeIPCHandler =
+        ipc::TemplateRuntimeHandler::create(m_guiClient->getIPCRouter(), templateRuntimePresentationAdapterBridge);
+
+    templateRuntimePresentationAdapter->addTemplateRuntimePresentationAdapterObserver(m_templateRuntimeIPCHandler);
+    templateRuntimePresentationAdapter->addTemplateRuntimePresentationAdapterObserver(m_aplClientBridge);
+
+    /*
+     * Retrieve the cryptoFactory - This component provides the encryption facilities
+     */
+    auto cryptoFactory = manufactory->get<std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>>();
+
+    /*
+     * Creating the various feature clients which will add all the features that are used by the application.
+     * The FeatureClientBuilder will glue them all together and build a single client which can access them
+     */
+    sdkClient::SDKClientBuilder sdkClientBuilder;
+
+    /*
+     * Creating the DefaultClient builder - this client builds most of the core functionality required by the
+     * application
+     */
+    auto defaultClientBuilder = defaultClient::DefaultClientBuilder::create(
+        deviceInfo,
+        customerDataManager,
+        m_externalMusicProviderMediaPlayersMap,
+        m_externalMusicProviderSpeakersMap,
+        m_adapterToCreateFuncMap,
+        m_speakMediaPlayer,
+        std::move(audioMediaPlayerFactory),
+        m_alertsMediaPlayer,
+        m_notificationsMediaPlayer,
+        m_bluetoothMediaPlayer,
+        m_ringtoneMediaPlayer,
+        m_systemSoundMediaPlayer,
+        speakerMediaInterfaces->speaker,
+        audioSpeakers,
+        alertsMediaInterfaces->speaker,
+        notificationMediaInterfaces->speaker,
+        bluetoothMediaInterfaces->speaker,
+        ringtoneMediaInterfaces->speaker,
+        systemSoundMediaInterfaces->speaker,
+        {},
+#ifdef ENABLE_COMMS_AUDIO_PROXY
+        m_commsMediaPlayer,
+        commsSpeaker,
+        sharedDataStream,
+#endif
+        equalizerRuntimeSetup,
+        audioFactory,
+        authDelegate,
+        std::move(alertStorage),
+        std::move(messageStorage),
+        std::move(notificationsStorage),
+        std::move(deviceSettingsStorage),
+        std::move(bluetoothStorage),
+        miscStorage,
+        {uiManager},
+        {uiManager},
+        std::move(internetConnectionMonitor),
+        true,
+        m_capabilitiesDelegate,
+        contextManager,
+        transportFactory,
+        avsGatewayManager,
+        localeAssetsManager,
+        enabledConnectionRules,
+        /* systemTimezone*/ nullptr,
+        firmwareVersion,
+        true,
+        nullptr,
+        std::move(bluetoothDeviceManager),
+        metricRecorder,
+        nullptr,
+        diagnostics,
+        std::make_shared<ExternalCapabilitiesBuilder>(deviceInfo),
+        speakerManager::createChannelVolumeFactory(),
+        true,
+        std::make_shared<acl::MessageRouterFactory>(),
+        nullptr,
+        capabilityAgents::aip::AudioProvider::null(),
+        cryptoFactory);
+
+    if (!defaultClientBuilder) {
+        ACSDK_CRITICAL(LX("Failed to create default client builder!"));
+        return false;
+    }
+    sdkClientBuilder.withFeature(std::move(defaultClientBuilder));
+
+    /**
+     * Creating the VisualCharacteristicsFeatureClientBuilder, this will add visual characteristics features to the
+     * application
+     */
+    auto visualCharacteristicsFeatureBuilder = featureClient::VisualCharacteristicsFeatureClientBuilder::create();
+    if (!visualCharacteristicsFeatureBuilder) {
+        ACSDK_CRITICAL(LX("Failed to create visual characteristics client builder!"));
+        return false;
+    }
+    sdkClientBuilder.withFeature(std::move(visualCharacteristicsFeatureBuilder));
+
+    /**
+     * Creating the VisualStateTrackerFeatureClientBuilder, this will add visual state tracking features to the
+     * application
+     */
+    auto visualStateTrackerFeatureBuilder = featureClient::VisualStateTrackerFeatureClientBuilder::create();
+    if (!visualStateTrackerFeatureBuilder) {
+        ACSDK_CRITICAL(LX("Failed to create visual state tracker client builder!"));
+        return false;
+    }
+    sdkClientBuilder.withFeature(std::move(visualStateTrackerFeatureBuilder));
+
+    /**
+     * Creating the PresentationOrchestratorFeatureClientBuilder, this will add presentation orchestrator features to
+     * the application
+     */
+    auto presentationOrchestratorFeatureBuilder = featureClient::PresentationOrchestratorFeatureClientBuilder::create();
+    if (!presentationOrchestratorFeatureBuilder) {
+        ACSDK_CRITICAL(LX("Failed to create presentation orchestrator client builder!"));
+        return false;
+    }
+    sdkClientBuilder.withFeature(std::move(presentationOrchestratorFeatureBuilder));
+
+    /**
+     * Creating the AlexaPresentationFeatureClientBuilder, this will add APL features to the application
+     */
+    auto alexaPresentationFeatureBuilder =
+        featureClient::AlexaPresentationFeatureClientBuilder::create(APLVersion, aplRuntimePresentationAdapter);
+    if (!alexaPresentationFeatureBuilder) {
+        ACSDK_CRITICAL(LX("Failed to create alexa presentation client builder!"));
+        return false;
+    }
+    sdkClientBuilder.withFeature(std::move(alexaPresentationFeatureBuilder));
+
+#ifdef ENABLE_RTCSC
+    /**
+     * Creating the LiveViewControllerFeatureClientBuilder, this will add LiveViewController features to the
+     * application.
+     */
+    auto liveViewControllerPresentationAdapter = liveViewController::LiveViewControllerPresentationAdapter::create(
+        m_guiClient->getIPCRouter(), m_aplClientBridge);
+
+    if (!liveViewControllerPresentationAdapter) {
+        ACSDK_CRITICAL(LX("Failed to create LiveViewControllerPresentationAdapter!"));
+        return false;
+    }
+
+    auto liveViewControllerFeatureBuilder = featureClient::LiveViewControllerFeatureClientBuilder::create(
+        deviceInfo->getDeviceSerialNumber(), liveViewControllerPresentationAdapter);
+    if (!liveViewControllerFeatureBuilder) {
+        ACSDK_CRITICAL(LX("Failed to create live view controller client builder!"));
+        return false;
+    }
+    sdkClientBuilder.withFeature(std::move(liveViewControllerFeatureBuilder));
+#endif
+
+    m_clientRegistry = sdkClientBuilder.build();
+    if (!m_clientRegistry) {
+        ACSDK_CRITICAL(LX("Failed to build SDK Client!"));
+        return false;
+    }
+
+    m_defaultClient = m_clientRegistry->get<defaultClient::DefaultClient>();
+    if (!m_defaultClient) {
+        ACSDK_CRITICAL(LX("Failed to retrieve default SDK client!"));
+        return false;
+    }
+
+    auto poFeatureClient = m_clientRegistry->get<featureClient::PresentationOrchestratorFeatureClient>();
+    if (!poFeatureClient) {
+        ACSDK_CRITICAL(LX("Failed to retrieve PresentationOrchestratorFeatureClient!"));
+        return false;
+    }
+
+    auto aplFeatureClient = m_clientRegistry->get<featureClient::AlexaPresentationFeatureClient>();
+    if (!aplFeatureClient) {
+        ACSDK_CRITICAL(LX("Failed to retrieve AlexaPresentationFeatureClient!"));
+        return false;
+    }
+
+#ifdef ENABLE_RTCSC
+    auto liveViewControllerFeatureClient = m_clientRegistry->get<featureClient::LiveViewControllerFeatureClient>();
+    if (!liveViewControllerFeatureClient) {
+        ACSDK_CRITICAL(LX("Failed to retrieve LiveViewControllerFeatureClient!"));
+        return false;
+    }
+
+    liveViewControllerPresentationAdapter->setPresentationOrchestrator(
+        poFeatureClient->getPresentationOrchestratorClient());
+
+    m_defaultClient->addAudioInputProcessorObserver(liveViewControllerPresentationAdapter);
+#endif
+
+    aplRuntimeInterface->setPresentationOrchestrator(poFeatureClient->getPresentationOrchestratorClient());
+    templateRuntimePresentationAdapter->setPresentationOrchestrator(
+        poFeatureClient->getPresentationOrchestratorClient());
+    aplRuntimePresentationAdapter->setAlexaPresentationCA(aplFeatureClient->getAlexaPresentationCapabilityAgent());
+
+    m_defaultClient->addSpeakerManagerObserver(uiManager);
+    m_defaultClient->addNotificationsObserver(uiManager);
+    m_defaultClient->addTemplateRuntimeObserver(templateRuntimePresentationAdapter);
+    aplFeatureClient->addAPLCapabilityAgentObserver(aplRuntimePresentationAdapter);
+
+    m_defaultClient->addAudioPlayerObserver(m_aplClientBridge);
+    m_defaultClient->addAudioPlayerObserver(templateRuntimePresentationAdapter);
+    m_defaultClient->addExternalMediaPlayerObserver(m_aplClientBridge);
+
+    m_defaultClient->addAlexaDialogStateObserver(poFeatureClient->getVisualTimeoutManager());
+    m_defaultClient->addAlexaDialogStateObserver(aplRuntimePresentationAdapter);
+    m_activityEventNotifier->addObserver(poFeatureClient->getVisualTimeoutManager());
+    m_activityEventNotifier->addObserver(aplRuntimePresentationAdapter);
+    m_guiClient->setAPLRuntimePresentationAdapter(aplRuntimePresentationAdapter);
+#ifdef KWD
+    m_keywordDetector = kwd::KeywordDetectorProvider::create(
+        sharedDataStream,
+        *compatibleAudioFormat,
+        std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::KeyWordObserverInterface>>(),
+        std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::KeyWordDetectorStateObserverInterface>>());
+    if (!m_keywordDetector) {
+        ACSDK_CRITICAL(LX("Failed to create keyword detector!"));
+    }
+
+    // This observer is notified any time a keyword is detected and notifies the DefaultClient to start recognizing.
+    auto keywordObserver = KeywordObserver::create(m_defaultClient, wakeWordAudioProvider, m_keywordDetector);
+#endif
+
+#ifdef ENABLE_CAPTIONS
+    std::vector<std::shared_ptr<MediaPlayerInterface>> captionableMediaSources = m_audioMediaPlayerPool;
+    captionableMediaSources.emplace_back(m_speakMediaPlayer);
+    m_defaultClient->addCaptionPresenter(captionPresenter);
+#ifndef UWP_BUILD
+    m_defaultClient->setCaptionMediaPlayers(captionableMediaSources);
+#endif
+#endif
+
+    std::shared_ptr<common::EndpointAlexaLauncherHandler> launcherHandler;
+
+#ifdef ENABLE_VIDEO_CONTROLLERS
+    auto visualStateTrackerFeatureClient = m_clientRegistry->get<featureClient::VisualStateTrackerFeatureClient>();
+    if (!visualStateTrackerFeatureClient) {
+        ACSDK_CRITICAL(LX("setClientFailed").d("reason", "null state tracker client"));
+        return false;
+    }
+
+    // Create the endpoint focus adapter.
+    auto endpointFocusAdapter = sampleApplications::common::EndpointFocusAdapter::create(
+        m_defaultClient->getAudioFocusManager(),
+        poFeatureClient->getPresentationOrchestrator(),
+        visualStateTrackerFeatureClient->getPresentationOrchestratorStateTracker());
+
+    if (!endpointFocusAdapter) {
+        ACSDK_CRITICAL(LX("Failed to create EndpointFocusAdapter!"));
+        return false;
+    }
+
+    auto videoEndpointBuilder = m_defaultClient->createEndpointBuilder();
+    if (!videoEndpointBuilder) {
+        ACSDK_CRITICAL(LX("Failed to create Video endpoint Builder!"));
+        return false;
+    }
+
+    videoEndpointBuilder->withDerivedEndpointId(VIDEO_ENDPOINT_DERIVED_ENDPOINT_ID)
+        .withDeviceRegistration()
+        .withDescription(VIDEO_ENDPOINT_DESCRIPTION)
+        .withFriendlyName(VIDEO_ENDPOINT_FRIENDLY_NAME)
+        .withManufacturerName(VIDEO_ENDPOINT_MANUFACTURER_NAME)
+        .withAdditionalAttributes(
+            VIDEO_ENDPOINT_MANUFACTURER_NAME,
+            VIDEO_ENDPOINT_ADDITIONAL_ATTRIBUTE_MODEL,
+            VIDEO_ENDPOINT_ADDITIONAL_ATTRIBUTE_SERIAL_NUMBER,
+            VIDEO_ENDPOINT_ADDITIONAL_ATTRIBUTE_FIRMWARE_VERSION,
+            VIDEO_ENDPOINT_ADDITIONAL_ATTRIBUTE_SOFTWARE_VERSION,
+            VIDEO_ENDPOINT_ADDITIONAL_ATTRIBUTE_CUSTOM_IDENTIFIER)
+        .withDisplayCategory(VIDEO_ENDPOINT_DISPLAYCATEGORY);
+
+    auto videoEndpointCapabilitiesBuilder =
+        std::make_shared<alexaClientSDK::sampleApplications::common::EndpointCapabilitiesBuilder>(endpointFocusAdapter);
+    if (!videoEndpointCapabilitiesBuilder) {
+        ACSDK_CRITICAL(LX("addCapabilitiesBuilderToVideoEndpointFailed").m("invalidVideoEndpointCapabilitiesBuilder"));
+        return false;
+    }
+    videoEndpointBuilder->withEndpointCapabilitiesBuilder(videoEndpointCapabilitiesBuilder);
+
+#ifdef INPUT_CONTROLLER
+    // Enable the InputController on the Video Endpoint.
+    auto inputControllerEndpointCapabilitiesBuilder =
+        std::make_shared<sampleApplications::common::InputControllerEndpointCapabilitiesBuilder>();
+    if (!inputControllerEndpointCapabilitiesBuilder) {
+        ACSDK_CRITICAL(
+            LX("addCapabilitiesBuilderToVideoEndpointFailed").m("invalidInputControllerEndpointCapabilitiesBuilder"));
+        return false;
+    }
+    videoEndpointBuilder->withEndpointCapabilitiesBuilder(inputControllerEndpointCapabilitiesBuilder);
+#endif  // INPUT_CONTROLLER
+
+    auto videoEndpoint = videoEndpointBuilder->build();
+    if (!videoEndpoint) {
+        ACSDK_CRITICAL(LX("Failed to create Video Endpoint!"));
+        return false;
+    }
+
+    launcherHandler = videoEndpointCapabilitiesBuilder->getAlexaLauncherHandler();
+    m_defaultClient->registerEndpoint(std::move(videoEndpoint));
+#endif  // ENABLE_VIDEO_CONTROLLERS
+
+#if defined(INPUT_CONTROLLER) && !defined(ENABLE_VIDEO_CONTROLLERS)
+    // Enable the InputController on the default endpoint
+    auto defaultEndpointInputControllerBuilder =
+        std::make_shared<alexaClientSDK::sampleApplications::common::InputControllerEndpointCapabilitiesBuilder>();
+    if (!defaultEndpointInputControllerBuilder) {
+        ACSDK_CRITICAL(
+            LX("addCapabilitiesBuilderToDefaultEndpointFailed").m("invalidInputControllerEndpointCapabilitiesBuilder"));
+        return false;
+    }
+
+    m_defaultClient->getDefaultEndpointBuilder()->withEndpointCapabilitiesBuilder(
+        defaultEndpointInputControllerBuilder);
+#endif
+
+    // clang-format off
+    // If wake word is not enabled, then creating the interaction manager without a wake word audio provider.
+    m_interactionManager = std::make_shared<common::InteractionManager>(
+        m_defaultClient,
+        micWrapper,
+        uiManager,
+        holdToTalkAudioProvider,
+        tapToTalkAudioProvider,
+#ifdef KWD
+        wakeWordAudioProvider,
+#else
+        capabilityAgents::aip::AudioProvider::null(),
+#endif
+        nullptr,
+        diagnostics);
+
+    if (m_interactionManager) {
+        m_shutdownRequiredList.push_back(m_interactionManager);
+    }
+
+#ifdef ENABLE_RTCSC
+    liveViewControllerPresentationAdapter->setInteractionManager(m_interactionManager);
+#endif
+
+#ifdef KWD
+    // If wake word is enabled, then creating the GUI manager with a wake word audio provider.
+    m_guiManager = gui::GUIManager::create(
+        m_guiClient,
+        m_activityEventNotifier,
+        micWrapper,
+        m_interactionManager,
+        launcherHandler);
+#else
+    // If wake word is not enabled, then creating the gui manager without a wake word audio provider.
+    m_guiManager = gui::GUIManager::create(
+        m_guiClient,
+        m_activityEventNotifier,
+        micWrapper,
+        m_interactionManager,
+        launcherHandler);
+#endif  // KWD
+
+    m_guiManager->setClient(m_clientRegistry);
+    m_guiClient->setGUIManager(m_guiManager);
+
+    m_defaultClient->addAlexaDialogStateObserver(m_guiManager);
+    m_defaultClient->addAlexaDialogStateObserver(m_interactionManager);
+#ifdef ENABLE_COMMS
+    m_defaultClient->addCallStateObserver(m_interactionManager);
+#endif
+    m_defaultClient->addAudioPlayerObserver(m_guiManager);
+    m_defaultClient->getAudioFocusManager()->addObserver(m_guiManager);
+    m_defaultClient->addAudioInputProcessorObserver(m_guiManager);
+
+#ifdef ENABLE_REVOKE_AUTH
+    // Creating the revoke authorization observer.
+    auto revokeObserver = std::make_shared<RevokeAuthorizationObserver>(
+        m_defaultClient->getRegistrationManager());
+    m_defaultClient->addRevokeAuthorizationObserver(revokeObserver);
+#endif  // ENABLE_REVOKE_AUTH
+
+    authDelegate->addAuthObserver(m_guiClient);
+    m_defaultClient->addRegistrationObserver(m_guiClient);
+    m_capabilitiesDelegate->addCapabilitiesObserver(m_guiClient);
+
+    m_authManager->setRegistrationManager(m_defaultClient->getRegistrationManager());
+
+    auto httpPost = avsCommon::utils::libcurlUtils::HttpPost::createHttpPostInterface();
+    auto keyStore = manufactory->get<std::shared_ptr<cryptoInterfaces::KeyStoreInterface>>();
+
+    m_lwaAdapter = acsdkAuthorization::lwa::LWAAuthorizationAdapter::create(
+        configPtr,
+        std::move(httpPost),
+        deviceInfo,
+        acsdkAuthorization::lwa::LWAAuthorizationStorage::createLWAAuthorizationStorageInterface(
+            configPtr, "", cryptoFactory, keyStore));
+
+    if (!m_lwaAdapter) {
+        ACSDK_CRITICAL(LX("Failed to create LWA Adapter!"));
+        return false;
+    }
+
+    m_authManager->add(m_lwaAdapter);
+
+    m_lwaAdapter->authorizeUsingCBL(cblAuthRequester);
+
+    m_guiManager->setIpcVersionManager(ipcVersionManager);
+    m_guiManager->configureSettingsNotifications();
+
+    m_guiManager->setAPLRuntimePresentationAdapter(aplRuntimePresentationAdapter);
+    m_guiManager->setTemplateRuntimePresentationAdapterBridge(templateRuntimePresentationAdapterBridge);
+
+    if (!m_guiClient->start()) {
+        return false;
+    }
+
+    m_defaultClient->connect();
+
+    return true;
+}
+
+std::shared_ptr<ApplicationMediaInterfaces> SampleApplication::createApplicationMediaPlayer(
+    const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
+        httpContentFetcherFactory,
+    bool enableEqualizer,
+    const std::string& name,
+    bool enableLiveMode) {
+#ifdef GSTREAMER_MEDIA_PLAYER
+    /*
+     * For the SDK, the MediaPlayer happens to also provide volume control functionality.
+     * Note the externalMusicProviderMediaPlayer is not added to the set of SpeakerInterfaces as there would be
+     * more actions needed for these beyond setting the volume control on the MediaPlayer.
+     */
+    auto mediaPlayer = mediaPlayer::MediaPlayer::create(
+        httpContentFetcherFactory, enableEqualizer, name, enableLiveMode);
+    if (!mediaPlayer) {
+        return nullptr;
+    }
+    auto speaker = std::static_pointer_cast<avsCommon::sdkInterfaces::SpeakerInterface>(mediaPlayer);
+    auto equalizer =
+        std::static_pointer_cast<acsdkEqualizerInterfaces::EqualizerInterface>(mediaPlayer);
+    auto requiresShutdown = std::static_pointer_cast<avsCommon::utils::RequiresShutdown>(mediaPlayer);
+    auto applicationMediaInterfaces =
+        std::make_shared<ApplicationMediaInterfaces>(mediaPlayer, speaker, equalizer, requiresShutdown);
+#elif defined(CUSTOM_MEDIA_PLAYER)
+    // Custom media players must implement the createCustomMediaPlayer function
+    auto applicationMediaInterfaces =
+        createCustomMediaPlayer(httpContentFetcherFactory, enableEqualizer, name, enableLiveMode);
+    if (!applicationMediaInterfaces) {
+        return nullptr;
+    }
+
+#elif defined(UWP_BUILD)
+    auto mediaPlayer = std::make_shared<alexaSmartScreenSDK::sssdkCommon::TestMediaPlayer>();
+    auto nullEqualizer = std::make_shared<alexaSmartScreenSDK::sssdkCommon::NullEqualizer>();
+
+    auto speaker = std::make_shared<alexaSmartScreenSDK::sssdkCommon::NullMediaSpeaker>();
+    auto requiresShutdown = std::static_pointer_cast<avsCommon::utils::RequiresShutdown>(mediaPlayer);
+
+    return std::make_shared<ApplicationMediaInterfaces>(mediaPlayer, speaker, nullEqualizer, requiresShutdown);
+#endif
+
+#ifndef UWP_BUILD
+    if (applicationMediaInterfaces->requiresShutdown) {
+        m_shutdownRequiredList.push_back(applicationMediaInterfaces->requiresShutdown);
+    }
+    return applicationMediaInterfaces;
+#endif
+}
+
+std::string SampleApplication::decodeHexToAscii(const std::string hexString) {
+    std::string asciiString(hexString.size() / 2, '\0');
+    std::string byte(2, '\0');
+    for (size_t i = 0; i < hexString.size() - 1; i += 2) {
+        byte[0] = hexString[i];
+        byte[1] = hexString[i + 1];
+        asciiString[i / 2] = static_cast<char>(std::stoi(byte, nullptr, 16));
+    }
+
+    return asciiString;
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SampleApplicationComponent.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SampleApplicationComponent.cpp
new file mode 100644
index 0000000000..881b0dd5c1
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SampleApplicationComponent.cpp
@@ -0,0 +1,117 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdkCore/CoreComponent.h>
+#include <acsdk/Crypto/CryptoFactory.h>
+#ifdef ENABLE_PKCS11
+#include <acsdk/Pkcs11/KeyStoreFactory.h>
+#endif
+#include <acsdkManufactory/ComponentAccumulator.h>
+#include <acsdkShared/SharedComponent.h>
+#include <ContextManager/ContextManager.h>
+#include <acsdkDefaultSampleApplicationOptions/DefaultSampleApplicationOptionsComponent.h>
+
+#ifdef ACSDK_ACS_UTILS
+#include <acsdkACSSampleApplicationOptions/ACSSampleApplicationOptionsComponent.h>
+#else
+#include <acsdkDefaultSampleApplicationOptions/DefaultSampleApplicationOptionsComponent.h>
+#include <AVSCommon/Utils/LibcurlUtils/HttpPost.h>
+
+#endif
+
+#include <RegistrationManager/CustomerDataManagerFactory.h>
+
+#include "IPCServerSampleApp/LocaleAssetsManager.h"
+#include "IPCServerSampleApp/SampleApplicationComponent.h"
+
+#ifdef METRICS_EXTENSION
+#include <MetricsExtension/MetricsExtension.h>
+#else
+#include <acsdkDefaultSampleApplicationOptions/NullMetricRecorder.h>
+#endif
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+using namespace alexaClientSDK;
+using namespace acsdkManufactory;
+using namespace avsCommon::avs::initialization;
+
+SampleApplicationOptionsComponent getSampleApplicationOptionsComponent() {
+    return ComponentAccumulator<>()
+        .addComponent(acsdkShared::getComponent())
+        .addPrimaryFactory(avsCommon::utils::logger::getConsoleLogger)
+#ifdef METRICS_EXTENSION
+        .addRetainedFactory(metrics::MetricsExtension::createMetricRecorderInterface)
+#else
+        .addRetainedFactory(acsdkDefaultSampleApplicationOptions::NullMetricRecorder::createMetricRecorderInterface)
+#endif
+        ;
+}
+
+/**
+ * Function that returns a factory to instantiate @c LocaleAssetsManagerInterface.
+ *
+ * @param requiresShutdownList - The vector of @c RequiresShutdown pointers to which the @c LocaleAssetsManager will be
+ * added.
+ * @return An std::function to instantiate @c LocaleAssetsManagerInterface.
+ */
+static std::function<std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>(
+    const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>&)>
+getCreateLocaleAssetsManagerInterface(
+    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>>& requiresShutdownList) {
+    return
+        [&requiresShutdownList](const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configNode) {
+            auto manager = LocaleAssetsManager::createLocaleAssetsManager(configNode);
+            if (manager) {
+                requiresShutdownList.push_back(manager);
+            }
+            return manager;
+        };
+}
+
+SampleApplicationComponent getComponent(
+    std::unique_ptr<avsCommon::avs::initialization::InitializationParameters> initParams,
+    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>>& requiresShutdownList,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate,
+    const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder,
+    const std::shared_ptr<avsCommon::utils::logger::Logger>& logger) {
+    return ComponentAccumulator<>()
+#ifdef ACSDK_ACS_UTILS
+        .addComponent(acsdkSampleApplication::getSampleApplicationOptionsComponent())
+#else
+        .addComponent(getSampleApplicationOptionsComponent())
+#endif
+        .addPrimaryFactory(AlexaClientSDKInit::getCreateAlexaClientSDKInit(std::move(initParams)))
+        .addRetainedFactory(avsCommon::utils::configuration::ConfigurationNode::createRoot)
+        .addUniqueFactory(avsCommon::utils::libcurlUtils::HttpPost::createHttpPostInterface)
+        .addRetainedFactory(avsCommon::utils::timing::MultiTimer::createMultiTimer)
+        .addRetainedFactory(getCreateLocaleAssetsManagerInterface(requiresShutdownList))
+        .addRetainedFactory(contextManager::ContextManager::createContextManagerInterface)
+        .addRetainedFactory(avsCommon::utils::DeviceInfo::createFromConfiguration)
+        .addRetainedFactory(registrationManager::CustomerDataManagerFactory::createCustomerDataManagerInterface)
+#ifdef ENABLE_PKCS11
+        .addRetainedFactory(pkcs11::createKeyStore)
+#else
+        .addInstance(std::shared_ptr<cryptoInterfaces::KeyStoreInterface>())
+#endif
+        .addRetainedFactory(crypto::createCryptoFactory);
+    ;
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SampleEqualizerModeController.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SampleEqualizerModeController.cpp
new file mode 100644
index 0000000000..f64ed0fc45
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SampleEqualizerModeController.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <memory>
+#include <sstream>
+
+#include "IPCServerSampleApp/ConsolePrinter.h"
+
+#include "IPCServerSampleApp/SampleEqualizerModeController.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+using namespace acsdkEqualizerInterfaces;
+
+std::shared_ptr<SampleEqualizerModeController> SampleEqualizerModeController::create() {
+    return std::shared_ptr<SampleEqualizerModeController>(new SampleEqualizerModeController());
+}
+
+bool SampleEqualizerModeController::setEqualizerMode(EqualizerMode mode) {
+    ConsolePrinter::prettyPrint("Equalizer Mode changed to '" + equalizerModeToString(mode) + "'");
+    return true;
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SmartScreenCaptionPresenter.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SmartScreenCaptionPresenter.cpp
new file mode 100644
index 0000000000..4baade34d7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SmartScreenCaptionPresenter.cpp
@@ -0,0 +1,135 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
+#include "IPCServerSampleApp/SmartScreenCaptionPresenter.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+static const std::string TAG{"SmartScreenCaptionPresenter"};
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+SmartScreenCaptionPresenter::SmartScreenCaptionPresenter(
+    std::shared_ptr<RenderCaptionsInterface> renderCaptionsInterface) {
+    m_renderCaptionsInterface = renderCaptionsInterface;
+}
+
+void SmartScreenCaptionPresenter::onCaptionActivity(
+    const captions::CaptionFrame& captionFrame,
+    avsCommon::avs::FocusState focusState) {
+    if (avsCommon::avs::FocusState::FOREGROUND == focusState) {
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+
+        if (!convertCaptionFrameToJson(captionFrame).Accept(writer)) {
+            ACSDK_ERROR(LX("onCaptionActivityFailed").d("reason", "Error serializing captionFrame payload"));
+            return;
+        }
+        m_renderCaptionsInterface->renderCaptions(buffer.GetString());
+    }
+}
+
+std::pair<bool, int> SmartScreenCaptionPresenter::getWrapIndex(const captions::CaptionLine& captionLine) {
+    // Line wrap will be implemented on the GUI side
+    return std::make_pair(false, 0);
+}
+
+rapidjson::Document SmartScreenCaptionPresenter::convertCaptionFrameToJson(const captions::CaptionFrame& captionFrame) {
+    rapidjson::Document captionFrameJson(rapidjson::kObjectType);
+
+    captionFrameJson.AddMember(
+        "duration",
+        rapidjson::Value(std::chrono::duration_cast<std::chrono::milliseconds>(captionFrame.getDuration()).count())
+            .Move(),
+        captionFrameJson.GetAllocator());
+
+    captionFrameJson.AddMember(
+        "delay",
+        rapidjson::Value(std::chrono::duration_cast<std::chrono::milliseconds>(captionFrame.getDelay()).count()).Move(),
+        captionFrameJson.GetAllocator());
+
+    captionFrameJson.AddMember(
+        "captionLines",
+        rapidjson::Value(
+            convertCaptionLinesToJson(captionFrame.getCaptionLines(), captionFrameJson.GetAllocator()),
+            captionFrameJson.GetAllocator()),
+        captionFrameJson.GetAllocator());
+
+    return captionFrameJson;
+}
+
+rapidjson::Value SmartScreenCaptionPresenter::convertCaptionLinesToJson(
+    const std::vector<captions::CaptionLine>& captionLines,
+    rapidjson::Document::AllocatorType& allocator) {
+    rapidjson::Value captionLinesJson(rapidjson::kArrayType);
+    for (const auto& captionLine : captionLines) {
+        captionLinesJson.PushBack(convertCaptionLineToJson(captionLine, allocator), allocator);
+    }
+
+    return captionLinesJson;
+}
+
+rapidjson::Value SmartScreenCaptionPresenter::convertCaptionLineToJson(
+    const captions::CaptionLine& captionLine,
+    rapidjson::Document::AllocatorType& allocator) {
+    rapidjson::Value captionLineJson(rapidjson::kObjectType);
+    rapidjson::Value captionStyleArrayJson(rapidjson::kArrayType);
+
+    for (auto& textStyle : captionLine.styles) {
+        captionStyleArrayJson.PushBack(convertTextStyleToJson(textStyle, allocator), allocator);
+    }
+
+    captionLineJson.AddMember("text", rapidjson::Value(captionLine.text, allocator), allocator);
+
+    captionLineJson.AddMember("styles", rapidjson::Value(captionStyleArrayJson, allocator), allocator);
+
+    return captionLineJson;
+}
+
+rapidjson::Value SmartScreenCaptionPresenter::convertTextStyleToJson(
+    captions::TextStyle textStyle,
+    rapidjson::Document::AllocatorType& allocator) {
+    rapidjson::Value textStyleJson(rapidjson::kObjectType);
+
+    textStyleJson.AddMember(
+        "activeStyle",
+        rapidjson::Value(convertStyleToJson(textStyle.activeStyle, allocator), allocator).Move(),
+        allocator);
+
+    textStyleJson.AddMember(
+        "charIndex", rapidjson::Value(std::to_string(textStyle.charIndex), allocator).Move(), allocator);
+
+    return textStyleJson;
+}
+
+rapidjson::Value SmartScreenCaptionPresenter::convertStyleToJson(
+    captions::Style style,
+    rapidjson::Document::AllocatorType& allocator) {
+    rapidjson::Value styleJson(rapidjson::kObjectType);
+
+    styleJson.AddMember("bold", rapidjson::Value(std::to_string(style.m_bold), allocator).Move(), allocator);
+
+    styleJson.AddMember("italic", rapidjson::Value(std::to_string(style.m_italic), allocator).Move(), allocator);
+
+    styleJson.AddMember("underline", rapidjson::Value(std::to_string(style.m_underline), allocator).Move(), allocator);
+
+    return styleJson;
+}
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SmartScreenCaptionStateManager.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SmartScreenCaptionStateManager.cpp
new file mode 100644
index 0000000000..bc70b5ba0e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/SmartScreenCaptionStateManager.cpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/SmartScreenCaptionStateManager.h"
+#include "AVSCommon/Utils/Logger/Logger.h"
+#include "AVSCommon/Utils/Logger/LogEntry.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+static const std::string TAG{"SmartScreenCaptionStateManager"};
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Component name for IPCServerSampleApp
+static const std::string componentName = "IPCServerSampleApp";
+
+/// Table name for settings
+static const std::string tableName = "Settings";
+
+/// Key for Captions setting
+static const std::string captionsKey = "CaptionsEnabled";
+
+/// Value for Captions ON
+static const std::string captionsEnabledString = "CAPTIONS_ENABLED";
+
+/// Value for Captions OFF
+static const std::string captionsDisabledString = "CAPTIONS_DISABLED";
+
+SmartScreenCaptionStateManager::SmartScreenCaptionStateManager(
+    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface> miscStorage) :
+        m_miscStorage{std::move(miscStorage)} {
+    bool doesTableExist = false;
+    if (!m_miscStorage->tableExists(componentName, tableName, &doesTableExist)) {
+        ACSDK_ERROR(LX("checkIfSettingsTableExistsFailed").d("reason", "storageFailure"));
+    }
+
+    if (!doesTableExist) {
+        if (!m_miscStorage->createTable(
+                componentName,
+                tableName,
+                avsCommon::sdkInterfaces::storage::MiscStorageInterface::KeyType::STRING_KEY,
+                avsCommon::sdkInterfaces::storage::MiscStorageInterface::ValueType::STRING_VALUE)) {
+            ACSDK_ERROR(LX("createSettingsTableFailed").d("reason", "storageFailure"));
+        }
+    }
+}
+
+bool SmartScreenCaptionStateManager::areCaptionsEnabled() {
+    std::string captionStatusValue;
+    if (m_miscStorage->get(componentName, tableName, captionsKey, &captionStatusValue)) {
+        return captionStatusValue == captionsEnabledString;
+    } else {
+        ACSDK_ERROR(LX("readCaptionsSettingFailed").d("reason", "storageFailure"));
+        return false;
+    }
+}
+
+void SmartScreenCaptionStateManager::setCaptionsState(bool enabled) {
+    if (!m_miscStorage->put(
+            componentName, tableName, captionsKey, enabled ? captionsEnabledString : captionsDisabledString)) {
+        ACSDK_ERROR(LX("changeCaptionsStateFailed").d("reason", "storageFailure"));
+    }
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/TelemetrySink.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/TelemetrySink.cpp
new file mode 100644
index 0000000000..729a98e6d6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/TelemetrySink.cpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <chrono>
+
+#include <AVSCommon/Utils/Metrics/DataPointCounterBuilder.h>
+#include <AVSCommon/Utils/Metrics/DataPointDurationBuilder.h>
+#include <AVSCommon/Utils/Metrics/DataPointStringBuilder.h>
+#include <AVSCommon/Utils/Metrics/MetricEventBuilder.h>
+
+#include "IPCServerSampleApp/TelemetrySink.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+
+TelemetrySink::TelemetrySink(std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder) :
+        m_metricRecorder{std::move(metricRecorder)} {
+}
+
+void TelemetrySink::reportTimer(
+    const std::map<std::string, std::string>& metadata,
+    const std::string& name,
+    const std::chrono::nanoseconds& value) {
+    auto durationInMillis = std::chrono::duration_cast<std::chrono::milliseconds>(value);
+    avsCommon::utils::metrics::MetricEventBuilder builder;
+    builder.setActivityName(name);
+    builder.setPriority(avsCommon::utils::metrics::Priority::HIGH);
+    builder.addDataPoint(avsCommon::utils::metrics::DataPointDurationBuilder(durationInMillis).setName(name).build());
+    for (const auto& entry : metadata) {
+        builder.addDataPoint(
+            avsCommon::utils::metrics::DataPointStringBuilder{}.setName(entry.first).setValue(entry.second).build());
+    }
+
+    auto event = builder.build();
+    m_metricRecorder->recordMetric(event);
+}
+
+void TelemetrySink::reportCounter(
+    const std::map<std::string, std::string>& metadata,
+    const std::string& name,
+    uint64_t value) {
+    avsCommon::utils::metrics::MetricEventBuilder builder;
+    builder.setActivityName(name);
+    builder.setPriority(avsCommon::utils::metrics::Priority::HIGH);
+    builder.addDataPoint(avsCommon::utils::metrics::DataPointCounterBuilder().setName(name).increment(value).build());
+    for (const auto& entry : metadata) {
+        builder.addDataPoint(
+            avsCommon::utils::metrics::DataPointStringBuilder{}.setName(entry.first).setValue(entry.second).build());
+    }
+
+    auto event = builder.build();
+    m_metricRecorder->recordMetric(event);
+}
+
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/TimezoneHelper.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/TimezoneHelper.cpp
new file mode 100644
index 0000000000..0d9124b832
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/src/TimezoneHelper.cpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "IPCServerSampleApp/TimezoneHelper.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+/// String to identify log entries originating from this file.
+#define TAG "TimezoneHelper"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+std::shared_ptr<TimezoneHelper> TimezoneHelper::create(
+    const std::shared_ptr<settings::DeviceSettingsManager>& deviceSettingsManager) {
+    auto timezoneHelper = std::shared_ptr<TimezoneHelper>(new TimezoneHelper(deviceSettingsManager));
+    if (!timezoneHelper) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "Failed to create TimezoneHelper"));
+        return nullptr;
+    }
+
+    deviceSettingsManager->addObserver<settings::TIMEZONE>(timezoneHelper);
+
+    return timezoneHelper;
+}
+
+std::chrono::milliseconds TimezoneHelper::getDeviceTimezoneOffset() {
+    return m_deviceTimeZoneOffset;
+}
+
+TimezoneHelper::TimezoneHelper(const std::shared_ptr<settings::DeviceSettingsManager>& deviceSettingsManager) {
+    m_deviceTimeZoneOffset = calculateDeviceTimezoneOffset(
+        deviceSettingsManager->getSetting<settings::DeviceSettingsIndex::TIMEZONE>()->get());
+}
+
+std::chrono::milliseconds TimezoneHelper::calculateDeviceTimezoneOffset(const std::string& timeZone) {
+#ifdef _MSC_VER
+    /// Important Note: The MSC version of this function only retrieves the device timezone offset, it does not use
+    /// the provided timeZone parameter
+
+    TIME_ZONE_INFORMATION TimeZoneInfo;
+    GetTimeZoneInformation(&TimeZoneInfo);
+    auto offsetInMinutes = -TimeZoneInfo.Bias - TimeZoneInfo.DaylightBias;
+    ACSDK_DEBUG9(LX(__func__).m(std::to_string(offsetInMinutes)));
+    return std::chrono::minutes(offsetInMinutes);
+#else
+    char* prevTZ = getenv("TZ");
+    setenv("TZ", timeZone.c_str(), 1);
+    time_t t = time(NULL);
+    struct tm* structtm = localtime(&t);
+    if (prevTZ) {
+        setenv("TZ", prevTZ, 1);
+    } else {
+        unsetenv("TZ");
+    }
+    if (!structtm) {
+        ACSDK_ERROR(LX(__func__).m("localtime returns NULL"));
+        return std::chrono::milliseconds::zero();
+    }
+    return std::chrono::milliseconds(structtm->tm_gmtoff * 1000);
+#endif
+}
+
+void TimezoneHelper::onSettingNotification(const std::string& value, settings::SettingNotifications) {
+    m_deviceTimeZoneOffset = calculateDeviceTimezoneOffset(value);
+}
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/test/CMakeLists.txt b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/test/CMakeLists.txt
new file mode 100644
index 0000000000..37b8497a26
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/test/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+        "${LibIPCServerSampleApp_INCLUDE_DIR}")
+
+discover_unit_tests("${INCLUDE_PATH}" "LibIPCServerSampleApp")
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/test/IPCVersionManagerTest.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/test/IPCVersionManagerTest.cpp
new file mode 100644
index 0000000000..769221b037
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/test/IPCVersionManagerTest.cpp
@@ -0,0 +1,167 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+#include "rapidjson/document.h"
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include "IPCServerSampleApp/IPC/IPCVersionManager.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace test {
+
+using namespace ::testing;
+using namespace rapidjson;
+using namespace avsCommon::utils::json;
+using namespace ipc;
+
+/// The SessionSetup string
+static const std::string SESSION_SETUP("SessionSetup");
+
+/// The FocusManager string
+static const std::string FOCUS_MANAGER("FocusManager");
+
+/// The Controller string
+static const std::string CONTROLLER("Controller");
+
+class IPCVersionManagerTest : public ::testing::Test {
+public:
+    void SetUp() override;
+
+protected:
+    std::shared_ptr<IPCVersionManager> m_ipcVersionManager;
+};
+
+void IPCVersionManagerTest::SetUp() {
+    m_ipcVersionManager = std::make_shared<IPCVersionManager>();
+}
+
+/**
+ * Test version equality
+ */
+TEST_F(IPCVersionManagerTest, test_serverClientVersionEqual) {
+    m_ipcVersionManager->registerNamespaceVersionEntry(SESSION_SETUP, 1);
+    m_ipcVersionManager->registerNamespaceVersionEntry(FOCUS_MANAGER, 1);
+
+    ASSERT_TRUE(m_ipcVersionManager->validateVersionForNamespace(SESSION_SETUP, 1));
+    ASSERT_TRUE(m_ipcVersionManager->validateVersionForNamespace(FOCUS_MANAGER, 1));
+}
+
+/**
+ * Test server version higher than client version
+ */
+TEST_F(IPCVersionManagerTest, test_highServerVersion) {
+    m_ipcVersionManager->registerNamespaceVersionEntry(SESSION_SETUP, 2);
+    m_ipcVersionManager->registerNamespaceVersionEntry(FOCUS_MANAGER, 2);
+
+    ASSERT_FALSE(m_ipcVersionManager->validateVersionForNamespace(SESSION_SETUP, 1));
+    ASSERT_FALSE(m_ipcVersionManager->validateVersionForNamespace(FOCUS_MANAGER, 1));
+}
+
+/**
+ * Test client version higher than server version
+ */
+TEST_F(IPCVersionManagerTest, test_highClientVersion) {
+    m_ipcVersionManager->registerNamespaceVersionEntry(SESSION_SETUP, 1);
+    m_ipcVersionManager->registerNamespaceVersionEntry(FOCUS_MANAGER, 1);
+
+    ASSERT_FALSE(m_ipcVersionManager->validateVersionForNamespace(SESSION_SETUP, 2));
+    ASSERT_FALSE(m_ipcVersionManager->validateVersionForNamespace(FOCUS_MANAGER, 2));
+}
+
+/**
+ * Test mixed server client mismatch
+ */
+TEST_F(IPCVersionManagerTest, test_mixedMismatch) {
+    m_ipcVersionManager->registerNamespaceVersionEntry(SESSION_SETUP, 1);
+    m_ipcVersionManager->registerNamespaceVersionEntry(FOCUS_MANAGER, 2);
+
+    ASSERT_FALSE(m_ipcVersionManager->validateVersionForNamespace(SESSION_SETUP, 2));
+    ASSERT_FALSE(m_ipcVersionManager->validateVersionForNamespace(FOCUS_MANAGER, 1));
+}
+
+/**
+ * Test server client mismatch document
+ */
+TEST_F(IPCVersionManagerTest, test_mixedMismatchDocument) {
+    m_ipcVersionManager->registerNamespaceVersionEntry(SESSION_SETUP, 1);
+    m_ipcVersionManager->registerNamespaceVersionEntry(FOCUS_MANAGER, 2);
+    m_ipcVersionManager->registerNamespaceVersionEntry(CONTROLLER, 2);
+    std::string json = R"(
+        {"entries":[{"namespace":"SessionSetup","version":2},{"namespace":"FocusManager","version":0},
+        {"namespace":"Controller","version":1}]})";
+
+    Document document;
+    jsonUtils::parseJSON(json, &document);
+    ASSERT_FALSE(m_ipcVersionManager->handleAssertNamespaceVersions(document));
+    ASSERT_FALSE(m_ipcVersionManager->handleAssertNamespaceVersionsFromString(json));
+}
+
+/**
+ * Test server client mismatch document when a namespace version entry in the middle is mismatched
+ */
+TEST_F(IPCVersionManagerTest, test_mixedMiddleEntryMismatchDocument) {
+    m_ipcVersionManager->registerNamespaceVersionEntry(SESSION_SETUP, 1);
+    m_ipcVersionManager->registerNamespaceVersionEntry(FOCUS_MANAGER, 2);
+    m_ipcVersionManager->registerNamespaceVersionEntry(CONTROLLER, 2);
+    std::string json = R"(
+        {"entries":[{"namespace":"SessionSetup","version":1},{"namespace":"FocusManager","version":2},
+        {"namespace":"Controller","version":1}]})";
+
+    Document document;
+    jsonUtils::parseJSON(json, &document);
+    ASSERT_FALSE(m_ipcVersionManager->handleAssertNamespaceVersions(document));
+    ASSERT_FALSE(m_ipcVersionManager->handleAssertNamespaceVersionsFromString(json));
+}
+
+/**
+ * Test server has namespace registered but client does not
+ */
+TEST_F(IPCVersionManagerTest, test_registeredNamespaceOnServerNotClient) {
+    m_ipcVersionManager->registerNamespaceVersionEntry(SESSION_SETUP, 1);
+    m_ipcVersionManager->registerNamespaceVersionEntry(FOCUS_MANAGER, 1);
+    m_ipcVersionManager->registerNamespaceVersionEntry(CONTROLLER, 1);
+    std::string json = R"(
+        {"entries":[{"namespace":"SessionSetup","version":1},
+        {"namespace":"Controller","version":1}]})";
+
+    Document document;
+    jsonUtils::parseJSON(json, &document);
+    ASSERT_TRUE(m_ipcVersionManager->handleAssertNamespaceVersions(document));
+    ASSERT_TRUE(m_ipcVersionManager->handleAssertNamespaceVersionsFromString(json));
+}
+
+/**
+ * Test client has namespace registered but server does not
+ */
+TEST_F(IPCVersionManagerTest, test_registeredNamespaceOnClientNotServer) {
+    m_ipcVersionManager->registerNamespaceVersionEntry(SESSION_SETUP, 1);
+    m_ipcVersionManager->registerNamespaceVersionEntry(CONTROLLER, 1);
+    std::string json = R"(
+        {"entries":[{"namespace":"SessionSetup","version":1},{"namespace":"FocusManager","version":1},
+        {"namespace":"Controller","version":1}]})";
+
+    Document document;
+    jsonUtils::parseJSON(json, &document);
+    ASSERT_FALSE(m_ipcVersionManager->handleAssertNamespaceVersions(document));
+    ASSERT_FALSE(m_ipcVersionManager->handleAssertNamespaceVersionsFromString(json));
+}
+
+}  // namespace test
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/test/SmartScreenCaptionPresenterTest.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/test/SmartScreenCaptionPresenterTest.cpp
new file mode 100644
index 0000000000..79f71c2d21
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/test/SmartScreenCaptionPresenterTest.cpp
@@ -0,0 +1,90 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <gmock/gmock-generated-function-mockers.h>
+#include "IPCServerSampleApp/RenderCaptionsInterface.h"
+#include "IPCServerSampleApp/SmartScreenCaptionPresenter.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace test {
+
+using namespace ::testing;
+using namespace captions;
+
+class MockRenderCaptionsInterface : public RenderCaptionsInterface {
+public:
+    MOCK_METHOD1(renderCaptions, void(const std::string& payload));
+};
+
+class SmartScreenCaptionPresenterTest : public ::testing::Test {
+public:
+    void SetUp() override;
+
+protected:
+    std::shared_ptr<StrictMock<MockRenderCaptionsInterface>> m_mockRenderCaptionsInterface;
+    std::shared_ptr<SmartScreenCaptionPresenter> m_captionPresenter;
+};
+
+void SmartScreenCaptionPresenterTest::SetUp() {
+    m_mockRenderCaptionsInterface = std::make_shared<StrictMock<MockRenderCaptionsInterface>>();
+    m_captionPresenter = std::make_shared<SmartScreenCaptionPresenter>(m_mockRenderCaptionsInterface);
+}
+
+/**
+ * Test for empty captions
+ */
+TEST_F(SmartScreenCaptionPresenterTest, test_renderEmptyCaptions) {
+    std::string expectedInput = R"({"duration":0,"delay":0,"captionLines":[]})";
+    CaptionFrame captionFrame = CaptionFrame();
+
+    EXPECT_CALL(*m_mockRenderCaptionsInterface, renderCaptions(expectedInput)).Times(Exactly(1));
+    m_captionPresenter->onCaptionActivity(captionFrame, avsCommon::avs::FocusState::FOREGROUND);
+}
+
+/**
+ * Test for Non-Foreground focus state
+ */
+TEST_F(SmartScreenCaptionPresenterTest, test_renderCaptionsWithBackgroundOrNoneFocusState) {
+    CaptionFrame captionFrame = CaptionFrame();
+
+    EXPECT_CALL(*m_mockRenderCaptionsInterface, renderCaptions(_)).Times(Exactly(0));
+    m_captionPresenter->onCaptionActivity(captionFrame, avsCommon::avs::FocusState::BACKGROUND);
+    m_captionPresenter->onCaptionActivity(captionFrame, avsCommon::avs::FocusState::NONE);
+}
+
+/**
+ * Test for normal render captions
+ */
+TEST_F(SmartScreenCaptionPresenterTest, test_renderCaptionsHappyCase) {
+    Style style = Style(true, true, true);
+    TextStyle textStyle = TextStyle(0, style);
+    CaptionLine captionLine = CaptionLine("TestCaptionLine", {textStyle});
+    CaptionFrame captionFrame =
+        CaptionFrame(0, std::chrono::milliseconds(1000), std::chrono::milliseconds(0), {captionLine});
+
+    std::string expectedPayloadString =
+        R"({"duration":1000,"delay":0,"captionLines":[{"text":"TestCaptionLine","styles":[{"activeStyle":{"bold":"1","italic":"1","underline":"1"},"charIndex":"0"}]}]})";
+    EXPECT_CALL(*m_mockRenderCaptionsInterface, renderCaptions(expectedPayloadString)).Times(Exactly(1));
+
+    m_captionPresenter->onCaptionActivity(captionFrame, avsCommon::avs::FocusState::FOREGROUND);
+}
+}  // namespace test
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
diff --git a/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/test/SmartScreenCaptionStateManagerTest.cpp b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/test/SmartScreenCaptionStateManagerTest.cpp
new file mode 100644
index 0000000000..8628702082
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/LibIPCServerSampleApp/test/SmartScreenCaptionStateManagerTest.cpp
@@ -0,0 +1,203 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <gmock/gmock-generated-function-mockers.h>
+#include "IPCServerSampleApp/SmartScreenCaptionStateManager.h"
+
+namespace alexaClientSDK {
+namespace sampleApplications {
+namespace ipcServerSampleApp {
+namespace test {
+
+using namespace ::testing;
+
+static const std::string componentName = "IPCServerSampleApp";
+static const std::string tableName = "Settings";
+static const std::string captionsKey = "CaptionsEnabled";
+static const std::string captionsEnabledString = "CAPTIONS_ENABLED";
+static const std::string captionsDisabledString = "CAPTIONS_DISABLED";
+
+class MockMiscStorage : public avsCommon::sdkInterfaces::storage::MiscStorageInterface {
+public:
+    MOCK_METHOD0(createDatabase, bool());
+    MOCK_METHOD0(open, bool());
+    MOCK_METHOD0(isOpened, bool());
+    MOCK_METHOD0(close, void());
+    MOCK_METHOD4(
+        createTable,
+        bool(const std::string& componentName, const std::string& tableName, KeyType keyType, ValueType valueType));
+    MOCK_METHOD2(clearTable, bool(const std::string& componentName, const std::string& tableName));
+    MOCK_METHOD2(deleteTable, bool(const std::string& componentName, const std::string& tableName));
+    MOCK_METHOD4(
+        get,
+        bool(
+            const std::string& componentName,
+            const std::string& tableName,
+            const std::string& key,
+            std::string* value));
+    MOCK_METHOD4(
+        add,
+        bool(
+            const std::string& componentName,
+            const std::string& tableName,
+            const std::string& key,
+            const std::string& value));
+    MOCK_METHOD4(
+        update,
+        bool(
+            const std::string& componentName,
+            const std::string& tableName,
+            const std::string& key,
+            const std::string& value));
+    MOCK_METHOD4(
+        put,
+        bool(
+            const std::string& componentName,
+            const std::string& tableName,
+            const std::string& key,
+            const std::string& value));
+    MOCK_METHOD3(remove, bool(const std::string& componentName, const std::string& tableName, const std::string& key));
+    MOCK_METHOD4(
+        tableEntryExists,
+        bool(
+            const std::string& componentName,
+            const std::string& tableName,
+            const std::string& key,
+            bool* tableEntryExistsValue));
+    MOCK_METHOD3(
+        tableExists,
+        bool(const std::string& componentName, const std::string& tableName, bool* tableExistsValue));
+    MOCK_METHOD3(
+        load,
+        bool(
+            const std::string& componentName,
+            const std::string& tableName,
+            std::unordered_map<std::string, std::string>* valueContainer));
+};
+
+class SmartScreenCaptionStateManagerTest : public ::testing::Test {
+public:
+    void SetUp() override;
+
+protected:
+    std::shared_ptr<NiceMock<MockMiscStorage>> m_mockMiscStorage;
+    std::shared_ptr<SmartScreenCaptionStateManager> captionManager;
+
+    void expectTableToExist();
+};
+
+void SmartScreenCaptionStateManagerTest::SetUp() {
+    m_mockMiscStorage = std::make_shared<NiceMock<MockMiscStorage>>();
+}
+
+void SmartScreenCaptionStateManagerTest::expectTableToExist() {
+    ON_CALL(*m_mockMiscStorage, tableExists(componentName, tableName, NotNull()))
+        .WillByDefault(DoAll(SetArgPointee<2>(true), Return(true)));
+    captionManager = std::make_shared<SmartScreenCaptionStateManager>(m_mockMiscStorage);
+}
+
+/**
+ * Tests getCaptions on true value
+ */
+TEST_F(SmartScreenCaptionStateManagerTest, test_getCaptionSettingWhenDatabaseReturnsTrue) {
+    expectTableToExist();
+
+    EXPECT_CALL(*m_mockMiscStorage, get(componentName, tableName, captionsKey, NotNull()))
+        .Times(Exactly(1))
+        .WillOnce(DoAll(SetArgPointee<3>(captionsEnabledString), Return(true)));
+
+    ASSERT_EQ(captionManager->areCaptionsEnabled(), true);
+}
+
+/**
+ * Tests getCaptions on false value
+ */
+TEST_F(SmartScreenCaptionStateManagerTest, test_getCaptionSettingWhenDataBaseReturnsFalse) {
+    expectTableToExist();
+
+    EXPECT_CALL(*m_mockMiscStorage, get(componentName, tableName, captionsKey, NotNull()))
+        .Times(Exactly(1))
+        .WillOnce(DoAll(SetArgPointee<3>(captionsDisabledString), Return(true)));
+
+    ASSERT_EQ(captionManager->areCaptionsEnabled(), false);
+}
+
+/**
+ * Tests getCaptions on database error
+ */
+TEST_F(SmartScreenCaptionStateManagerTest, test_getCaptionSettingWhenDataBaseStorageFailure) {
+    expectTableToExist();
+
+    EXPECT_CALL(*m_mockMiscStorage, get(componentName, tableName, captionsKey, NotNull()))
+        .Times(Exactly(1))
+        .WillOnce(Return(false));
+
+    ASSERT_EQ(captionManager->areCaptionsEnabled(), false);
+}
+
+/**
+ * Tests set captions enabled
+ */
+TEST_F(SmartScreenCaptionStateManagerTest, test_setCaptionsEnabled) {
+    expectTableToExist();
+
+    EXPECT_CALL(*m_mockMiscStorage, put(componentName, tableName, captionsKey, captionsEnabledString))
+        .Times(Exactly(1))
+        .WillOnce(Return(true));
+
+    captionManager->setCaptionsState(true);
+}
+
+/**
+ * Tests set captions disabled
+ */
+TEST_F(SmartScreenCaptionStateManagerTest, test_setCaptionsDisabled) {
+    expectTableToExist();
+
+    EXPECT_CALL(*m_mockMiscStorage, put(componentName, tableName, captionsKey, captionsDisabledString))
+        .Times(Exactly(1))
+        .WillOnce(Return(true));
+
+    captionManager->setCaptionsState(false);
+}
+
+/**
+ * Create table if it does not exist
+ */
+TEST_F(SmartScreenCaptionStateManagerTest, test_createTableInDatabaseIfItDoesNotExist) {
+    EXPECT_CALL(*m_mockMiscStorage, tableExists(componentName, tableName, NotNull()))
+        .Times(Exactly(1))
+        .WillOnce(DoAll(SetArgPointee<2>(false), Return(true)));
+
+    EXPECT_CALL(
+        *m_mockMiscStorage,
+        createTable(
+            componentName,
+            tableName,
+            avsCommon::sdkInterfaces::storage::MiscStorageInterface::KeyType::STRING_KEY,
+            avsCommon::sdkInterfaces::storage::MiscStorageInterface::ValueType::STRING_VALUE))
+        .Times(Exactly(1))
+        .WillOnce(Return(true));
+
+    captionManager = std::make_shared<SmartScreenCaptionStateManager>(m_mockMiscStorage);
+}
+
+}  // namespace test
+}  // namespace ipcServerSampleApp
+}  // namespace sampleApplications
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/.clang-format b/SampleApplications/IPCServerSampleApplication/ThirdParty/.clang-format
new file mode 100644
index 0000000000..fc63453063
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/.clang-format
@@ -0,0 +1,5 @@
+---
+Language:        Cpp
+BasedOnStyle:  	 None
+...
+
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/.gitignore b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/.gitignore
new file mode 100644
index 0000000000..ce310bc357
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/.gitignore
@@ -0,0 +1,2 @@
+# Ignore CI build directory
+build/
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/.travis.yml b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/.travis.yml
new file mode 100644
index 0000000000..3204dfac17
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/.travis.yml
@@ -0,0 +1,46 @@
+# Build matrix / environment variable are explained on:
+# http://about.travis-ci.org/docs/user/build-configuration/
+# This file can be validated on:
+# http://lint.travis-ci.org/
+
+install:
+# /usr/bin/gcc is 4.6 always, but gcc-X.Y is available.
+- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
+# /usr/bin/clang is 3.4, lets override with modern one.
+- if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+- echo ${PATH}
+- echo ${CXX}
+- ${CXX} --version
+- ${CXX} -v
+addons:
+  apt:
+    # List of whitelisted in travis packages for ubuntu-precise can be found here:
+    #   https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
+    # List of whitelisted in travis apt-sources:
+    #   https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
+    sources:
+    - ubuntu-toolchain-r-test
+    - llvm-toolchain-precise-3.7
+    packages:
+    - gcc-4.9
+    - g++-4.9
+    - clang-3.7
+    - valgrind
+os:
+  - linux
+  - osx
+language: cpp
+compiler:
+  - gcc
+  - clang
+script: ./travis.sh
+env:
+  matrix:
+    - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE
+    - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE
+    - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug CXX_FLAGS=-std=c++11  VERBOSE_MAKE=true VERBOSE
+#    - GTEST_TARGET=googletest SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
+#    - GTEST_TARGET=googlemock SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
+notifications:
+  email: false
+sudo: false
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/CMakeLists.txt b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/CMakeLists.txt
new file mode 100644
index 0000000000..8d2b552ef7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 2.6.2)
+
+project( googletest-distribution )
+
+enable_testing()
+
+option(BUILD_GTEST "Builds the googletest subproject" OFF)
+
+#Note that googlemock target already builds googletest
+option(BUILD_GMOCK "Builds the googlemock subproject" ON)
+
+if(BUILD_GMOCK)
+  add_subdirectory( googlemock )
+elseif(BUILD_GTEST)
+  add_subdirectory( googletest )
+endif()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/README.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/README.md
new file mode 100644
index 0000000000..076484e4fa
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/README.md
@@ -0,0 +1,142 @@
+
+# Google Test #
+
+[![Build Status](https://travis-ci.org/google/googletest.svg?branch=master)](https://travis-ci.org/google/googletest)
+[![Build status](https://ci.appveyor.com/api/projects/status/4o38plt0xbo1ubc8/branch/master?svg=true)](https://ci.appveyor.com/project/BillyDonahue/googletest/branch/master)
+
+Welcome to **Google Test**, Google's C++ test framework!
+
+This repository is a merger of the formerly separate GoogleTest and
+GoogleMock projects. These were so closely related that it makes sense to
+maintain and release them together.
+
+Please see the project page above for more information as well as the
+mailing list for questions, discussions, and development.  There is
+also an IRC channel on OFTC (irc.oftc.net) #gtest available.  Please
+join us!
+
+Getting started information for **Google Test** is available in the 
+[Google Test Primer](googletest/docs/Primer.md) documentation.
+
+**Google Mock** is an extension to Google Test for writing and using C++ mock
+classes.  See the separate [Google Mock documentation](googlemock/README.md).
+
+More detailed documentation for googletest (including build instructions) are
+in its interior [googletest/README.md](googletest/README.md) file.
+
+## Features ##
+
+  * An [XUnit](https://en.wikipedia.org/wiki/XUnit) test framework.
+  * Test discovery.
+  * A rich set of assertions.
+  * User-defined assertions.
+  * Death tests.
+  * Fatal and non-fatal failures.
+  * Value-parameterized tests.
+  * Type-parameterized tests.
+  * Various options for running the tests.
+  * XML test report generation.
+
+## Platforms ##
+
+Google test has been used on a variety of platforms:
+
+  * Linux
+  * Mac OS X
+  * Windows
+  * Cygwin
+  * MinGW
+  * Windows Mobile
+  * Symbian
+
+## Who Is Using Google Test? ##
+
+In addition to many internal projects at Google, Google Test is also used by
+the following notable projects:
+
+  * The [Chromium projects](http://www.chromium.org/) (behind the Chrome
+    browser and Chrome OS).
+  * The [LLVM](http://llvm.org/) compiler.
+  * [Protocol Buffers](https://github.com/google/protobuf), Google's data
+    interchange format.
+  * The [OpenCV](http://opencv.org/) computer vision library.
+
+## Related Open Source Projects ##
+
+[Google Test UI](https://github.com/ospector/gtest-gbar) is test runner that runs
+your test binary, allows you to track its progress via a progress bar, and
+displays a list of test failures. Clicking on one shows failure text. Google
+Test UI is written in C#.
+
+[GTest TAP Listener](https://github.com/kinow/gtest-tap-listener) is an event
+listener for Google Test that implements the
+[TAP protocol](https://en.wikipedia.org/wiki/Test_Anything_Protocol) for test
+result output. If your test runner understands TAP, you may find it useful.
+
+## Requirements ##
+
+Google Test is designed to have fairly minimal requirements to build
+and use with your projects, but there are some.  Currently, we support
+Linux, Windows, Mac OS X, and Cygwin.  We will also make our best
+effort to support other platforms (e.g. Solaris, AIX, and z/OS).
+However, since core members of the Google Test project have no access
+to these platforms, Google Test may have outstanding issues there.  If
+you notice any problems on your platform, please notify
+<googletestframework@googlegroups.com>. Patches for fixing them are
+even more welcome!
+
+### Linux Requirements ###
+
+These are the base requirements to build and use Google Test from a source
+package (as described below):
+
+  * GNU-compatible Make or gmake
+  * POSIX-standard shell
+  * POSIX(-2) Regular Expressions (regex.h)
+  * A C++98-standard-compliant compiler
+
+### Windows Requirements ###
+
+  * Microsoft Visual C++ v7.1 or newer
+
+### Cygwin Requirements ###
+
+  * Cygwin v1.5.25-14 or newer
+
+### Mac OS X Requirements ###
+
+  * Mac OS X v10.4 Tiger or newer
+  * Xcode Developer Tools
+
+### Requirements for Contributors ###
+
+We welcome patches.  If you plan to contribute a patch, you need to
+build Google Test and its own tests from a git checkout (described
+below), which has further requirements:
+
+  * [Python](https://www.python.org/) v2.3 or newer (for running some of
+    the tests and re-generating certain source files from templates)
+  * [CMake](https://cmake.org/) v2.6.4 or newer
+
+## Regenerating Source Files ##
+
+Some of Google Test's source files are generated from templates (not
+in the C++ sense) using a script.
+For example, the
+file include/gtest/internal/gtest-type-util.h.pump is used to generate
+gtest-type-util.h in the same directory.
+
+You don't need to worry about regenerating the source files
+unless you need to modify them.  You would then modify the
+corresponding `.pump` files and run the '[pump.py](googletest/scripts/pump.py)'
+generator script.  See the [Pump Manual](googletest/docs/PumpManual.md).
+
+### Contributing Code ###
+
+We welcome patches.  Please read the
+[Developer's Guide](googletest/docs/DevGuide.md)
+for how you can contribute. In particular, make sure you have signed
+the Contributor License Agreement, or we won't be able to accept the
+patch.
+
+Happy testing!
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/appveyor.yml b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/appveyor.yml
new file mode 100644
index 0000000000..d613fd6027
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/appveyor.yml
@@ -0,0 +1,71 @@
+version: '{build}'
+
+os: Visual Studio 2015
+
+environment:
+  matrix:
+  - Toolset: v140
+  - Toolset: v120
+  - Toolset: v110
+  - Toolset: v100
+
+platform:
+  - Win32
+  - x64
+
+configuration:
+#  - Release
+  - Debug
+
+build:
+  verbosity: minimal
+
+artifacts:
+  - path: '_build/Testing/Temporary/*'
+    name: test_results
+
+before_build:
+- ps: |
+    Write-Output "Configuration: $env:CONFIGURATION"
+    Write-Output "Platform: $env:PLATFORM"
+    $generator = switch ($env:TOOLSET)
+    {
+        "v140" {"Visual Studio 14 2015"}
+        "v120" {"Visual Studio 12 2013"}
+        "v110" {"Visual Studio 11 2012"}
+        "v100" {"Visual Studio 10 2010"}
+    }
+    if ($env:PLATFORM -eq "x64")
+    {
+        $generator = "$generator Win64"
+    }
+
+build_script:
+- ps: |
+    if (($env:TOOLSET -eq "v100") -and ($env:PLATFORM -eq "x64"))
+    {
+        return
+    }
+    md _build -Force | Out-Null
+    cd _build
+
+    & cmake -G "$generator" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -Dgtest_build_tests=ON -Dgtest_build_samples=ON -Dgmock_build_tests=ON ..
+    if ($LastExitCode -ne 0) {
+        throw "Exec: $ErrorMessage"
+    }
+    & cmake --build . --config $env:CONFIGURATION
+    if ($LastExitCode -ne 0) {
+        throw "Exec: $ErrorMessage"
+    }
+
+test_script:
+- ps: |
+    if (($env:Toolset -eq "v100") -and ($env:PLATFORM -eq "x64"))
+    {
+        return
+    }
+
+    & ctest -C $env:CONFIGURATION --output-on-failure
+    if ($LastExitCode -ne 0) {
+        throw "Exec: $ErrorMessage"
+    }
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/CHANGES b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/CHANGES
new file mode 100644
index 0000000000..d6f2f760e3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/CHANGES
@@ -0,0 +1,126 @@
+Changes for 1.7.0:
+
+* All new improvements in Google Test 1.7.0.
+* New feature: matchers DoubleNear(), FloatNear(),
+  NanSensitiveDoubleNear(), NanSensitiveFloatNear(),
+  UnorderedElementsAre(), UnorderedElementsAreArray(), WhenSorted(),
+  WhenSortedBy(), IsEmpty(), and SizeIs().
+* Improvement: Google Mock can now be built as a DLL.
+* Improvement: when compiled by a C++11 compiler, matchers AllOf()
+  and AnyOf() can accept an arbitrary number of matchers.
+* Improvement: when compiled by a C++11 compiler, matchers
+  ElementsAreArray() can accept an initializer list.
+* Improvement: when exceptions are enabled, a mock method with no
+  default action now throws instead crashing the test.
+* Improvement: added class testing::StringMatchResultListener to aid
+  definition of composite matchers.
+* Improvement: function return types used in MOCK_METHOD*() macros can
+  now contain unprotected commas.
+* Improvement (potentially breaking): EXPECT_THAT() and ASSERT_THAT()
+  are now more strict in ensuring that the value type and the matcher
+  type are compatible, catching potential bugs in tests.
+* Improvement: Pointee() now works on an optional<T>.
+* Improvement: the ElementsAreArray() matcher can now take a vector or
+  iterator range as input, and makes a copy of its input elements
+  before the conversion to a Matcher.
+* Improvement: the Google Mock Generator can now generate mocks for
+  some class templates.
+* Bug fix: mock object destruction triggerred by another mock object's
+  destruction no longer hangs.
+* Improvement: Google Mock Doctor works better with newer Clang and
+  GCC now.
+* Compatibility fixes.
+* Bug/warning fixes.
+
+Changes for 1.6.0:
+
+* Compilation is much faster and uses much less memory, especially
+  when the constructor and destructor of a mock class are moved out of
+  the class body.
+* New matchers: Pointwise(), Each().
+* New actions: ReturnPointee() and ReturnRefOfCopy().
+* CMake support.
+* Project files for Visual Studio 2010.
+* AllOf() and AnyOf() can handle up-to 10 arguments now.
+* Google Mock doctor understands Clang error messages now.
+* SetArgPointee<> now accepts string literals.
+* gmock_gen.py handles storage specifier macros and template return
+  types now.
+* Compatibility fixes.
+* Bug fixes and implementation clean-ups.
+* Potentially incompatible changes: disables the harmful 'make install'
+  command in autotools.
+
+Potentially breaking changes:
+
+* The description string for MATCHER*() changes from Python-style
+  interpolation to an ordinary C++ string expression.
+* SetArgumentPointee is deprecated in favor of SetArgPointee.
+* Some non-essential project files for Visual Studio 2005 are removed.
+
+Changes for 1.5.0:
+
+ * New feature: Google Mock can be safely used in multi-threaded tests
+   on platforms having pthreads.
+ * New feature: function for printing a value of arbitrary type.
+ * New feature: function ExplainMatchResult() for easy definition of
+   composite matchers.
+ * The new matcher API lets user-defined matchers generate custom
+   explanations more directly and efficiently.
+ * Better failure messages all around.
+ * NotNull() and IsNull() now work with smart pointers.
+ * Field() and Property() now work when the matcher argument is a pointer
+   passed by reference.
+ * Regular expression matchers on all platforms.
+ * Added GCC 4.0 support for Google Mock Doctor.
+ * Added gmock_all_test.cc for compiling most Google Mock tests
+   in a single file.
+ * Significantly cleaned up compiler warnings.
+ * Bug fixes, better test coverage, and implementation clean-ups.
+
+ Potentially breaking changes:
+
+ * Custom matchers defined using MatcherInterface or MakePolymorphicMatcher()
+   need to be updated after upgrading to Google Mock 1.5.0; matchers defined
+   using MATCHER or MATCHER_P* aren't affected.
+ * Dropped support for 'make install'.
+
+Changes for 1.4.0 (we skipped 1.2.* and 1.3.* to match the version of
+Google Test):
+
+ * Works in more environments: Symbian and minGW, Visual C++ 7.1.
+ * Lighter weight: comes with our own implementation of TR1 tuple (no
+   more dependency on Boost!).
+ * New feature: --gmock_catch_leaked_mocks for detecting leaked mocks.
+ * New feature: ACTION_TEMPLATE for defining templatized actions.
+ * New feature: the .After() clause for specifying expectation order.
+ * New feature: the .With() clause for for specifying inter-argument
+   constraints.
+ * New feature: actions ReturnArg<k>(), ReturnNew<T>(...), and
+   DeleteArg<k>().
+ * New feature: matchers Key(), Pair(), Args<...>(), AllArgs(), IsNull(),
+   and Contains().
+ * New feature: utility class MockFunction<F>, useful for checkpoints, etc.
+ * New feature: functions Value(x, m) and SafeMatcherCast<T>(m).
+ * New feature: copying a mock object is rejected at compile time.
+ * New feature: a script for fusing all Google Mock and Google Test
+   source files for easy deployment.
+ * Improved the Google Mock doctor to diagnose more diseases.
+ * Improved the Google Mock generator script.
+ * Compatibility fixes for Mac OS X and gcc.
+ * Bug fixes and implementation clean-ups.
+
+Changes for 1.1.0:
+
+ * New feature: ability to use Google Mock with any testing framework.
+ * New feature: macros for easily defining new matchers
+ * New feature: macros for easily defining new actions.
+ * New feature: more container matchers.
+ * New feature: actions for accessing function arguments and throwing
+   exceptions.
+ * Improved the Google Mock doctor script for diagnosing compiler errors.
+ * Bug fixes and implementation clean-ups.
+
+Changes for 1.0.0:
+
+ * Initial Open Source release of Google Mock
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/CMakeLists.txt b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/CMakeLists.txt
new file mode 100644
index 0000000000..beb259a2e9
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/CMakeLists.txt
@@ -0,0 +1,202 @@
+########################################################################
+# CMake build script for Google Mock.
+#
+# To run the tests for Google Mock itself on Linux, use 'make test' or
+# ctest.  You can select which tests to run using 'ctest -R regex'.
+# For more options, run 'ctest --help'.
+
+# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
+# make it prominent in the GUI.
+option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
+
+option(gmock_build_tests "Build all of Google Mock's own tests." OFF)
+
+# A directory to find Google Test sources.
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt")
+  set(gtest_dir gtest)
+else()
+  set(gtest_dir ../googletest)
+endif()
+
+# Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
+include("${gtest_dir}/cmake/hermetic_build.cmake" OPTIONAL)
+
+if (COMMAND pre_project_set_up_hermetic_build)
+  # Google Test also calls hermetic setup functions from add_subdirectory,
+  # although its changes will not affect things at the current scope.
+  pre_project_set_up_hermetic_build()
+endif()
+
+########################################################################
+#
+# Project-wide settings
+
+# Name of the project.
+#
+# CMake files in this project can refer to the root source directory
+# as ${gmock_SOURCE_DIR} and to the root binary directory as
+# ${gmock_BINARY_DIR}.
+# Language "C" is required for find_package(Threads).
+project(gmock CXX C)
+cmake_minimum_required(VERSION 2.6.2)
+
+if (COMMAND set_up_hermetic_build)
+  set_up_hermetic_build()
+endif()
+
+# Instructs CMake to process Google Test's CMakeLists.txt and add its
+# targets to the current scope.  We are placing Google Test's binary
+# directory in a subdirectory of our own as VC compilation may break
+# if they are the same (the default).
+add_subdirectory("${gtest_dir}" "${gmock_BINARY_DIR}/gtest")
+
+# Although Google Test's CMakeLists.txt calls this function, the
+# changes there don't affect the current scope.  Therefore we have to
+# call it again here.
+config_compiler_and_linker()  # from ${gtest_dir}/cmake/internal_utils.cmake
+
+# Adds Google Mock's and Google Test's header directories to the search path.
+include_directories("${gmock_SOURCE_DIR}/include"
+                    "${gmock_SOURCE_DIR}"
+                    "${gtest_SOURCE_DIR}/include"
+                    # This directory is needed to build directly from Google
+                    # Test sources.
+                    "${gtest_SOURCE_DIR}")
+
+# Summary of tuple support for Microsoft Visual Studio:
+# Compiler    version(MS)  version(cmake)  Support
+# ----------  -----------  --------------  -----------------------------
+# <= VS 2010  <= 10        <= 1600         Use Google Tests's own tuple.
+# VS 2012     11           1700            std::tr1::tuple + _VARIADIC_MAX=10
+# VS 2013     12           1800            std::tr1::tuple
+if (MSVC AND MSVC_VERSION EQUAL 1700)
+  add_definitions(/D _VARIADIC_MAX=10)
+endif()
+
+########################################################################
+#
+# Defines the gmock & gmock_main libraries.  User tests should link
+# with one of them.
+
+# Google Mock libraries.  We build them using more strict warnings than what
+# are used for other targets, to ensure that Google Mock can be compiled by
+# a user aggressive about warnings.
+cxx_library(gmock
+            "${cxx_strict}"
+            "${gtest_dir}/src/gtest-all.cc"
+            src/gmock-all.cc)
+
+cxx_library(gmock_main
+            "${cxx_strict}"
+            "${gtest_dir}/src/gtest-all.cc"
+            src/gmock-all.cc
+            src/gmock_main.cc)
+
+# If the CMake version supports it, attach header directory information
+# to the targets for when we are part of a parent build (ie being pulled
+# in via add_subdirectory() rather than being a standalone build).
+if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
+  target_include_directories(gmock      INTERFACE "${gmock_SOURCE_DIR}/include")
+  target_include_directories(gmock_main INTERFACE "${gmock_SOURCE_DIR}/include")
+endif()
+
+########################################################################
+#
+# Install rules
+install(TARGETS gmock gmock_main
+  DESTINATION lib)
+install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock
+  DESTINATION include)
+
+########################################################################
+#
+# Google Mock's own tests.
+#
+# You can skip this section if you aren't interested in testing
+# Google Mock itself.
+#
+# The tests are not built by default.  To build them, set the
+# gmock_build_tests option to ON.  You can do it by running ccmake
+# or specifying the -Dgmock_build_tests=ON flag when running cmake.
+
+if (gmock_build_tests)
+  # This must be set in the root directory for the tests to be run by
+  # 'make test' or ctest.
+  enable_testing()
+
+  ############################################################
+  # C++ tests built with standard compiler flags.
+
+  cxx_test(gmock-actions_test gmock_main)
+  cxx_test(gmock-cardinalities_test gmock_main)
+  cxx_test(gmock_ex_test gmock_main)
+  cxx_test(gmock-generated-actions_test gmock_main)
+  cxx_test(gmock-generated-function-mockers_test gmock_main)
+  cxx_test(gmock-generated-internal-utils_test gmock_main)
+  cxx_test(gmock-generated-matchers_test gmock_main)
+  cxx_test(gmock-internal-utils_test gmock_main)
+  cxx_test(gmock-matchers_test gmock_main)
+  cxx_test(gmock-more-actions_test gmock_main)
+  cxx_test(gmock-nice-strict_test gmock_main)
+  cxx_test(gmock-port_test gmock_main)
+  cxx_test(gmock-spec-builders_test gmock_main)
+  cxx_test(gmock_link_test gmock_main test/gmock_link2_test.cc)
+  cxx_test(gmock_test gmock_main)
+
+  if (CMAKE_USE_PTHREADS_INIT)
+    cxx_test(gmock_stress_test gmock)
+  endif()
+
+  # gmock_all_test is commented to save time building and running tests.
+  # Uncomment if necessary.
+  # cxx_test(gmock_all_test gmock_main)
+
+  ############################################################
+  # C++ tests built with non-standard compiler flags.
+
+  cxx_library(gmock_main_no_exception "${cxx_no_exception}"
+    "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+
+  cxx_library(gmock_main_no_rtti "${cxx_no_rtti}"
+    "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+
+  if (NOT MSVC OR MSVC_VERSION LESS 1600)  # 1600 is Visual Studio 2010.
+    # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that
+    # conflict with our own definitions. Therefore using our own tuple does not
+    # work on those compilers.
+    cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}"
+      "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+
+    cxx_test_with_flags(gmock_use_own_tuple_test "${cxx_use_own_tuple}"
+      gmock_main_use_own_tuple test/gmock-spec-builders_test.cc)
+  endif()
+
+  cxx_test_with_flags(gmock-more-actions_no_exception_test "${cxx_no_exception}"
+    gmock_main_no_exception test/gmock-more-actions_test.cc)
+
+  cxx_test_with_flags(gmock_no_rtti_test "${cxx_no_rtti}"
+    gmock_main_no_rtti test/gmock-spec-builders_test.cc)
+
+  cxx_shared_library(shared_gmock_main "${cxx_default}"
+    "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
+
+  # Tests that a binary can be built with Google Mock as a shared library.  On
+  # some system configurations, it may not possible to run the binary without
+  # knowing more details about the system configurations. We do not try to run
+  # this binary. To get a more robust shared library coverage, configure with
+  # -DBUILD_SHARED_LIBS=ON.
+  cxx_executable_with_flags(shared_gmock_test_ "${cxx_default}"
+    shared_gmock_main test/gmock-spec-builders_test.cc)
+  set_target_properties(shared_gmock_test_
+    PROPERTIES
+    COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
+
+  ############################################################
+  # Python tests.
+
+  cxx_executable(gmock_leak_test_ test gmock_main)
+  py_test(gmock_leak_test)
+
+  cxx_executable(gmock_output_test_ test gmock)
+  py_test(gmock_output_test)
+endif()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/CONTRIBUTORS b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/CONTRIBUTORS
new file mode 100644
index 0000000000..6e9ae362b6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/CONTRIBUTORS
@@ -0,0 +1,40 @@
+# This file contains a list of people who've made non-trivial
+# contribution to the Google C++ Mocking Framework project.  People
+# who commit code to the project are encouraged to add their names
+# here.  Please keep the list sorted by first names.
+
+Benoit Sigoure <tsuna@google.com>
+Bogdan Piloca <boo@google.com>
+Chandler Carruth <chandlerc@google.com>
+Dave MacLachlan <dmaclach@gmail.com>
+David Anderson <danderson@google.com>
+Dean Sturtevant
+Gene Volovich <gv@cite.com>
+Hal Burch <gmock@hburch.com>
+Jeffrey Yasskin <jyasskin@google.com>
+Jim Keller <jimkeller@google.com>
+Joe Walnes <joe@truemesh.com>
+Jon Wray <jwray@google.com>
+Keir Mierle <mierle@gmail.com>
+Keith Ray <keith.ray@gmail.com>
+Kostya Serebryany <kcc@google.com>
+Lev Makhlis
+Manuel Klimek <klimek@google.com>
+Mario Tanev <radix@google.com>
+Mark Paskin
+Markus Heule <markus.heule@gmail.com>
+Matthew Simmons <simmonmt@acm.org>
+Mike Bland <mbland@google.com>
+Neal Norwitz <nnorwitz@gmail.com>
+Nermin Ozkiranartli <nermin@google.com>
+Owen Carlsen <ocarlsen@google.com>
+Paneendra Ba <paneendra@google.com>
+Paul Menage <menage@google.com>
+Piotr Kaminski <piotrk@google.com>
+Russ Rufer <russ@pentad.com>
+Sverre Sundsdal <sundsdal@gmail.com>
+Takeshi Yoshino <tyoshino@google.com>
+Vadim Berman <vadimb@google.com>
+Vlad Losev <vladl@google.com>
+Wolfgang Klier <wklier@google.com>
+Zhanyong Wan <wan@google.com>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/LICENSE b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/LICENSE
new file mode 100644
index 0000000000..1941a11f8c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/LICENSE
@@ -0,0 +1,28 @@
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/Makefile.am b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/Makefile.am
new file mode 100644
index 0000000000..9adbc5163d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/Makefile.am
@@ -0,0 +1,224 @@
+# Automake file
+
+# Nonstandard package files for distribution.
+EXTRA_DIST = LICENSE
+
+# We may need to build our internally packaged gtest. If so, it will be
+# included in the 'subdirs' variable.
+SUBDIRS = $(subdirs)
+
+# This is generated by the configure script, so clean it for distribution.
+DISTCLEANFILES = scripts/gmock-config
+
+# We define the global AM_CPPFLAGS as everything we compile includes from these
+# directories.
+AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I$(srcdir)/include
+
+# Modifies compiler and linker flags for pthreads compatibility.
+if HAVE_PTHREADS
+  AM_CXXFLAGS = @PTHREAD_CFLAGS@ -DGTEST_HAS_PTHREAD=1
+  AM_LIBS = @PTHREAD_LIBS@
+endif
+
+# Build rules for libraries.
+lib_LTLIBRARIES = lib/libgmock.la lib/libgmock_main.la
+
+lib_libgmock_la_SOURCES = src/gmock-all.cc
+
+pkginclude_HEADERS = \
+  include/gmock/gmock-actions.h \
+  include/gmock/gmock-cardinalities.h \
+  include/gmock/gmock-generated-actions.h \
+  include/gmock/gmock-generated-function-mockers.h \
+  include/gmock/gmock-generated-matchers.h \
+  include/gmock/gmock-generated-nice-strict.h \
+  include/gmock/gmock-matchers.h \
+  include/gmock/gmock-more-actions.h \
+  include/gmock/gmock-more-matchers.h \
+  include/gmock/gmock-spec-builders.h \
+  include/gmock/gmock.h
+
+pkginclude_internaldir = $(pkgincludedir)/internal
+pkginclude_internal_HEADERS = \
+  include/gmock/internal/gmock-generated-internal-utils.h \
+  include/gmock/internal/gmock-internal-utils.h \
+  include/gmock/internal/gmock-port.h \
+  include/gmock/internal/custom/gmock-generated-actions.h \
+  include/gmock/internal/custom/gmock-matchers.h \
+  include/gmock/internal/custom/gmock-port.h
+
+lib_libgmock_main_la_SOURCES = src/gmock_main.cc
+lib_libgmock_main_la_LIBADD = lib/libgmock.la
+
+# Build rules for tests. Automake's naming for some of these variables isn't
+# terribly obvious, so this is a brief reference:
+#
+# TESTS -- Programs run automatically by "make check"
+# check_PROGRAMS -- Programs built by "make check" but not necessarily run
+
+TESTS=
+check_PROGRAMS=
+AM_LDFLAGS = $(GTEST_LDFLAGS)
+
+# This exercises all major components of Google Mock.  It also
+# verifies that libgmock works.
+TESTS += test/gmock-spec-builders_test
+check_PROGRAMS += test/gmock-spec-builders_test
+test_gmock_spec_builders_test_SOURCES = test/gmock-spec-builders_test.cc
+test_gmock_spec_builders_test_LDADD = $(GTEST_LIBS) lib/libgmock.la
+
+# This tests using Google Mock in multiple translation units.  It also
+# verifies that libgmock_main and libgmock work.
+TESTS += test/gmock_link_test
+check_PROGRAMS += test/gmock_link_test
+test_gmock_link_test_SOURCES = \
+  test/gmock_link2_test.cc \
+  test/gmock_link_test.cc \
+  test/gmock_link_test.h
+test_gmock_link_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la  lib/libgmock.la
+
+if HAVE_PYTHON
+  # Tests that fused gmock files compile and work.
+  TESTS += test/gmock_fused_test
+  check_PROGRAMS += test/gmock_fused_test
+  test_gmock_fused_test_SOURCES = \
+    fused-src/gmock-gtest-all.cc \
+    fused-src/gmock/gmock.h \
+    fused-src/gmock_main.cc \
+    fused-src/gtest/gtest.h \
+    test/gmock_test.cc
+  test_gmock_fused_test_CPPFLAGS = -I"$(srcdir)/fused-src"
+endif
+
+# Google Mock source files that we don't compile directly.
+GMOCK_SOURCE_INGLUDES = \
+  src/gmock-cardinalities.cc \
+  src/gmock-internal-utils.cc \
+  src/gmock-matchers.cc \
+  src/gmock-spec-builders.cc \
+  src/gmock.cc
+
+EXTRA_DIST += $(GMOCK_SOURCE_INGLUDES)
+
+# C++ tests that we don't compile using autotools.
+EXTRA_DIST += \
+  test/gmock-actions_test.cc \
+  test/gmock_all_test.cc \
+  test/gmock-cardinalities_test.cc \
+  test/gmock_ex_test.cc \
+  test/gmock-generated-actions_test.cc \
+  test/gmock-generated-function-mockers_test.cc \
+  test/gmock-generated-internal-utils_test.cc \
+  test/gmock-generated-matchers_test.cc \
+  test/gmock-internal-utils_test.cc \
+  test/gmock-matchers_test.cc \
+  test/gmock-more-actions_test.cc \
+  test/gmock-nice-strict_test.cc \
+  test/gmock-port_test.cc \
+  test/gmock_stress_test.cc
+
+# Python tests, which we don't run using autotools.
+EXTRA_DIST += \
+  test/gmock_leak_test.py \
+  test/gmock_leak_test_.cc \
+  test/gmock_output_test.py \
+  test/gmock_output_test_.cc \
+  test/gmock_output_test_golden.txt \
+  test/gmock_test_utils.py
+
+# Nonstandard package files for distribution.
+EXTRA_DIST += \
+  CHANGES \
+  CONTRIBUTORS \
+  make/Makefile
+
+# Pump scripts for generating Google Mock headers.
+# TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump.
+EXTRA_DIST += \
+  include/gmock/gmock-generated-actions.h.pump \
+  include/gmock/gmock-generated-function-mockers.h.pump \
+  include/gmock/gmock-generated-matchers.h.pump \
+  include/gmock/gmock-generated-nice-strict.h.pump \
+  include/gmock/internal/gmock-generated-internal-utils.h.pump \
+  include/gmock/internal/custom/gmock-generated-actions.h.pump
+
+# Script for fusing Google Mock and Google Test source files.
+EXTRA_DIST += scripts/fuse_gmock_files.py
+
+# The Google Mock Generator tool from the cppclean project.
+EXTRA_DIST += \
+  scripts/generator/LICENSE \
+  scripts/generator/README \
+  scripts/generator/README.cppclean \
+  scripts/generator/cpp/__init__.py \
+  scripts/generator/cpp/ast.py \
+  scripts/generator/cpp/gmock_class.py \
+  scripts/generator/cpp/keywords.py \
+  scripts/generator/cpp/tokenize.py \
+  scripts/generator/cpp/utils.py \
+  scripts/generator/gmock_gen.py
+
+# Script for diagnosing compiler errors in programs that use Google
+# Mock.
+EXTRA_DIST += scripts/gmock_doctor.py
+
+# CMake scripts.
+EXTRA_DIST += \
+  CMakeLists.txt
+
+# Microsoft Visual Studio 2005 projects.
+EXTRA_DIST += \
+  msvc/2005/gmock.sln \
+  msvc/2005/gmock.vcproj \
+  msvc/2005/gmock_config.vsprops \
+  msvc/2005/gmock_main.vcproj \
+  msvc/2005/gmock_test.vcproj
+
+# Microsoft Visual Studio 2010 projects.
+EXTRA_DIST += \
+  msvc/2010/gmock.sln \
+  msvc/2010/gmock.vcxproj \
+  msvc/2010/gmock_config.props \
+  msvc/2010/gmock_main.vcxproj \
+  msvc/2010/gmock_test.vcxproj
+
+if HAVE_PYTHON
+# gmock_test.cc does not really depend on files generated by the
+# fused-gmock-internal rule.  However, gmock_test.o does, and it is
+# important to include test/gmock_test.cc as part of this rule in order to
+# prevent compiling gmock_test.o until all dependent files have been
+# generated.
+$(test_gmock_fused_test_SOURCES): fused-gmock-internal
+
+# TODO(vladl@google.com): Find a way to add Google Tests's sources here.
+fused-gmock-internal: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
+                      $(lib_libgmock_la_SOURCES) $(GMOCK_SOURCE_INGLUDES) \
+                      $(lib_libgmock_main_la_SOURCES) \
+                      scripts/fuse_gmock_files.py
+	mkdir -p "$(srcdir)/fused-src"
+	chmod -R u+w "$(srcdir)/fused-src"
+	rm -f "$(srcdir)/fused-src/gtest/gtest.h"
+	rm -f "$(srcdir)/fused-src/gmock/gmock.h"
+	rm -f "$(srcdir)/fused-src/gmock-gtest-all.cc"
+	"$(srcdir)/scripts/fuse_gmock_files.py" "$(srcdir)/fused-src"
+	cp -f "$(srcdir)/src/gmock_main.cc" "$(srcdir)/fused-src"
+
+maintainer-clean-local:
+	rm -rf "$(srcdir)/fused-src"
+endif
+
+# Death tests may produce core dumps in the build directory. In case
+# this happens, clean them to keep distcleancheck happy.
+CLEANFILES = core
+
+# Disables 'make install' as installing a compiled version of Google
+# Mock can lead to undefined behavior due to violation of the
+# One-Definition Rule.
+
+install-exec-local:
+	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system."
+	false
+
+install-data-local:
+	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Mock into your build system."
+	false
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/README.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/README.md
new file mode 100644
index 0000000000..332beab388
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/README.md
@@ -0,0 +1,333 @@
+## Google Mock ##
+
+The Google C++ mocking framework.
+
+### Overview ###
+
+Google's framework for writing and using C++ mock classes.
+It can help you derive better designs of your system and write better tests.
+
+It is inspired by:
+
+  * [jMock](http://www.jmock.org/),
+  * [EasyMock](http://www.easymock.org/), and
+  * [Hamcrest](http://code.google.com/p/hamcrest/),
+
+and designed with C++'s specifics in mind.
+
+Google mock:
+
+  * lets you create mock classes trivially using simple macros.
+  * supports a rich set of matchers and actions.
+  * handles unordered, partially ordered, or completely ordered expectations.
+  * is extensible by users.
+
+We hope you find it useful!
+
+### Features ###
+
+  * Provides a declarative syntax for defining mocks.
+  * Can easily define partial (hybrid) mocks, which are a cross of real
+    and mock objects.
+  * Handles functions of arbitrary types and overloaded functions.
+  * Comes with a rich set of matchers for validating function arguments.
+  * Uses an intuitive syntax for controlling the behavior of a mock.
+  * Does automatic verification of expectations (no record-and-replay needed).
+  * Allows arbitrary (partial) ordering constraints on
+    function calls to be expressed,.
+  * Lets a user extend it by defining new matchers and actions.
+  * Does not use exceptions.
+  * Is easy to learn and use.
+
+Please see the project page above for more information as well as the
+mailing list for questions, discussions, and development.  There is
+also an IRC channel on OFTC (irc.oftc.net) #gtest available.  Please
+join us!
+
+Please note that code under [scripts/generator](scripts/generator/) is
+from [cppclean](http://code.google.com/p/cppclean/) and released under
+the Apache License, which is different from Google Mock's license.
+
+## Getting Started ##
+
+If you are new to the project, we suggest that you read the user
+documentation in the following order:
+
+  * Learn the [basics](../googletest/docs/Primer.md) of
+    Google Test, if you choose to use Google Mock with it (recommended).
+  * Read [Google Mock for Dummies](docs/ForDummies.md).
+  * Read the instructions below on how to build Google Mock.
+
+You can also watch Zhanyong's [talk](http://www.youtube.com/watch?v=sYpCyLI47rM) on Google Mock's usage and implementation.
+
+Once you understand the basics, check out the rest of the docs:
+
+  * [CheatSheet](docs/CheatSheet.md) - all the commonly used stuff
+    at a glance.
+  * [CookBook](docs/CookBook.md) - recipes for getting things done,
+    including advanced techniques.
+
+If you need help, please check the
+[KnownIssues](docs/KnownIssues.md) and
+[FrequentlyAskedQuestions](docs/FrequentlyAskedQuestions.md) before
+posting a question on the
+[discussion group](http://groups.google.com/group/googlemock).
+
+
+### Using Google Mock Without Google Test ###
+
+Google Mock is not a testing framework itself.  Instead, it needs a
+testing framework for writing tests.  Google Mock works seamlessly
+with [Google Test](http://code.google.com/p/googletest/), but
+you can also use it with [any C++ testing framework](googlemock/ForDummies.md#Using_Google_Mock_with_Any_Testing_Framework).
+
+### Requirements for End Users ###
+
+Google Mock is implemented on top of [Google Test](
+http://github.com/google/googletest/), and depends on it.
+You must use the bundled version of Google Test when using Google Mock.
+
+You can also easily configure Google Mock to work with another testing
+framework, although it will still need Google Test.  Please read
+["Using_Google_Mock_with_Any_Testing_Framework"](
+    docs/ForDummies.md#Using_Google_Mock_with_Any_Testing_Framework)
+for instructions.
+
+Google Mock depends on advanced C++ features and thus requires a more
+modern compiler. The following are needed to use Google Mock:
+
+#### Linux Requirements ####
+
+  * GNU-compatible Make or "gmake"
+  * POSIX-standard shell
+  * POSIX(-2) Regular Expressions (regex.h)
+  * C++98-standard-compliant compiler (e.g. GCC 3.4 or newer)
+
+#### Windows Requirements ####
+
+  * Microsoft Visual C++ 8.0 SP1 or newer
+
+#### Mac OS X Requirements ####
+
+  * Mac OS X 10.4 Tiger or newer
+  * Developer Tools Installed
+
+### Requirements for Contributors ###
+
+We welcome patches. If you plan to contribute a patch, you need to
+build Google Mock and its tests, which has further requirements:
+
+  * Automake version 1.9 or newer
+  * Autoconf version 2.59 or newer
+  * Libtool / Libtoolize
+  * Python version 2.3 or newer (for running some of the tests and
+    re-generating certain source files from templates)
+
+### Building Google Mock ###
+
+#### Preparing to Build (Unix only) ####
+
+If you are using a Unix system and plan to use the GNU Autotools build
+system to build Google Mock (described below), you'll need to
+configure it now.
+
+To prepare the Autotools build system:
+
+    cd googlemock
+    autoreconf -fvi
+
+To build Google Mock and your tests that use it, you need to tell your
+build system where to find its headers and source files.  The exact
+way to do it depends on which build system you use, and is usually
+straightforward.
+
+This section shows how you can integrate Google Mock into your
+existing build system.
+
+Suppose you put Google Mock in directory `${GMOCK_DIR}` and Google Test
+in `${GTEST_DIR}` (the latter is `${GMOCK_DIR}/gtest` by default).  To
+build Google Mock, create a library build target (or a project as
+called by Visual Studio and Xcode) to compile
+
+    ${GTEST_DIR}/src/gtest-all.cc and ${GMOCK_DIR}/src/gmock-all.cc
+
+with
+
+    ${GTEST_DIR}/include and ${GMOCK_DIR}/include
+
+in the system header search path, and
+
+    ${GTEST_DIR} and ${GMOCK_DIR}
+
+in the normal header search path.  Assuming a Linux-like system and gcc,
+something like the following will do:
+
+    g++ -isystem ${GTEST_DIR}/include -I${GTEST_DIR} \
+        -isystem ${GMOCK_DIR}/include -I${GMOCK_DIR} \
+        -pthread -c ${GTEST_DIR}/src/gtest-all.cc
+    g++ -isystem ${GTEST_DIR}/include -I${GTEST_DIR} \
+        -isystem ${GMOCK_DIR}/include -I${GMOCK_DIR} \
+        -pthread -c ${GMOCK_DIR}/src/gmock-all.cc
+    ar -rv libgmock.a gtest-all.o gmock-all.o
+
+(We need -pthread as Google Test and Google Mock use threads.)
+
+Next, you should compile your test source file with
+${GTEST\_DIR}/include and ${GMOCK\_DIR}/include in the header search
+path, and link it with gmock and any other necessary libraries:
+
+    g++ -isystem ${GTEST_DIR}/include -isystem ${GMOCK_DIR}/include \
+        -pthread path/to/your_test.cc libgmock.a -o your_test
+
+As an example, the make/ directory contains a Makefile that you can
+use to build Google Mock on systems where GNU make is available
+(e.g. Linux, Mac OS X, and Cygwin).  It doesn't try to build Google
+Mock's own tests.  Instead, it just builds the Google Mock library and
+a sample test.  You can use it as a starting point for your own build
+script.
+
+If the default settings are correct for your environment, the
+following commands should succeed:
+
+    cd ${GMOCK_DIR}/make
+    make
+    ./gmock_test
+
+If you see errors, try to tweak the contents of
+[make/Makefile](make/Makefile) to make them go away.
+
+### Windows ###
+
+The msvc/2005 directory contains VC++ 2005 projects and the msvc/2010
+directory contains VC++ 2010 projects for building Google Mock and
+selected tests.
+
+Change to the appropriate directory and run "msbuild gmock.sln" to
+build the library and tests (or open the gmock.sln in the MSVC IDE).
+If you want to create your own project to use with Google Mock, you'll
+have to configure it to use the `gmock_config` propety sheet.  For that:
+
+ * Open the Property Manager window (View | Other Windows | Property Manager)
+ * Right-click on your project and select "Add Existing Property Sheet..."
+ * Navigate to `gmock_config.vsprops` or `gmock_config.props` and select it.
+ * In Project Properties | Configuration Properties | General | Additional
+   Include Directories, type <path to Google Mock>/include.
+
+### Tweaking Google Mock ###
+
+Google Mock can be used in diverse environments.  The default
+configuration may not work (or may not work well) out of the box in
+some environments.  However, you can easily tweak Google Mock by
+defining control macros on the compiler command line.  Generally,
+these macros are named like `GTEST_XYZ` and you define them to either 1
+or 0 to enable or disable a certain feature.
+
+We list the most frequently used macros below.  For a complete list,
+see file [${GTEST\_DIR}/include/gtest/internal/gtest-port.h](
+../googletest/include/gtest/internal/gtest-port.h).
+
+### Choosing a TR1 Tuple Library ###
+
+Google Mock uses the C++ Technical Report 1 (TR1) tuple library
+heavily.  Unfortunately TR1 tuple is not yet widely available with all
+compilers.  The good news is that Google Test 1.4.0+ implements a
+subset of TR1 tuple that's enough for Google Mock's need.  Google Mock
+will automatically use that implementation when the compiler doesn't
+provide TR1 tuple.
+
+Usually you don't need to care about which tuple library Google Test
+and Google Mock use.  However, if your project already uses TR1 tuple,
+you need to tell Google Test and Google Mock to use the same TR1 tuple
+library the rest of your project uses, or the two tuple
+implementations will clash.  To do that, add
+
+    -DGTEST_USE_OWN_TR1_TUPLE=0
+
+to the compiler flags while compiling Google Test, Google Mock, and
+your tests.  If you want to force Google Test and Google Mock to use
+their own tuple library, just add
+
+    -DGTEST_USE_OWN_TR1_TUPLE=1
+
+to the compiler flags instead.
+
+If you want to use Boost's TR1 tuple library with Google Mock, please
+refer to the Boost website (http://www.boost.org/) for how to obtain
+it and set it up.
+
+### As a Shared Library (DLL) ###
+
+Google Mock is compact, so most users can build and link it as a static
+library for the simplicity.  Google Mock can be used as a DLL, but the
+same DLL must contain Google Test as well.  See
+[Google Test's README][gtest_readme]
+for instructions on how to set up necessary compiler settings.
+
+### Tweaking Google Mock ###
+
+Most of Google Test's control macros apply to Google Mock as well.
+Please see [Google Test's README][gtest_readme] for how to tweak them.
+
+### Upgrading from an Earlier Version ###
+
+We strive to keep Google Mock releases backward compatible.
+Sometimes, though, we have to make some breaking changes for the
+users' long-term benefits.  This section describes what you'll need to
+do if you are upgrading from an earlier version of Google Mock.
+
+#### Upgrading from 1.1.0 or Earlier ####
+
+You may need to explicitly enable or disable Google Test's own TR1
+tuple library.  See the instructions in section "[Choosing a TR1 Tuple
+Library](../googletest/#choosing-a-tr1-tuple-library)".
+
+#### Upgrading from 1.4.0 or Earlier ####
+
+On platforms where the pthread library is available, Google Test and
+Google Mock use it in order to be thread-safe.  For this to work, you
+may need to tweak your compiler and/or linker flags.  Please see the
+"[Multi-threaded Tests](../googletest#multi-threaded-tests
+)" section in file Google Test's README for what you may need to do.
+
+If you have custom matchers defined using `MatcherInterface` or
+`MakePolymorphicMatcher()`, you'll need to update their definitions to
+use the new matcher API (
+[monomorphic](http://code.google.com/p/googlemock/wiki/CookBook#Writing_New_Monomorphic_Matchers),
+[polymorphic](http://code.google.com/p/googlemock/wiki/CookBook#Writing_New_Polymorphic_Matchers)).
+Matchers defined using `MATCHER()` or `MATCHER_P*()` aren't affected.
+
+### Developing Google Mock ###
+
+This section discusses how to make your own changes to Google Mock.
+
+#### Testing Google Mock Itself ####
+
+To make sure your changes work as intended and don't break existing
+functionality, you'll want to compile and run Google Test's own tests.
+For that you'll need Autotools.  First, make sure you have followed
+the instructions above to configure Google Mock.
+Then, create a build output directory and enter it.  Next,
+
+    ${GMOCK_DIR}/configure  # try --help for more info
+
+Once you have successfully configured Google Mock, the build steps are
+standard for GNU-style OSS packages.
+
+    make        # Standard makefile following GNU conventions
+    make check  # Builds and runs all tests - all should pass.
+
+Note that when building your project against Google Mock, you are building
+against Google Test as well.  There is no need to configure Google Test
+separately.
+
+#### Contributing a Patch ####
+
+We welcome patches.
+Please read the [Developer's Guide](docs/DevGuide.md)
+for how you can contribute. In particular, make sure you have signed
+the Contributor License Agreement, or we won't be able to accept the
+patch.
+
+Happy testing!
+
+[gtest_readme]: ../googletest/README.md "googletest"
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/build-aux/.keep b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/build-aux/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/configure.ac b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/configure.ac
new file mode 100644
index 0000000000..3b740f205e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/configure.ac
@@ -0,0 +1,146 @@
+m4_include(../googletest/m4/acx_pthread.m4)
+
+AC_INIT([Google C++ Mocking Framework],
+        [1.7.0],
+        [googlemock@googlegroups.com],
+        [gmock])
+
+# Provide various options to initialize the Autoconf and configure processes.
+AC_PREREQ([2.59])
+AC_CONFIG_SRCDIR([./LICENSE])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_HEADERS([build-aux/config.h])
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([scripts/gmock-config], [chmod +x scripts/gmock-config])
+
+# Initialize Automake with various options. We require at least v1.9, prevent
+# pedantic complaints about package files, and enable various distribution
+# targets.
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 dist-zip foreign subdir-objects])
+
+# Check for programs used in building Google Test.
+AC_PROG_CC
+AC_PROG_CXX
+AC_LANG([C++])
+AC_PROG_LIBTOOL
+
+# TODO(chandlerc@google.com): Currently we aren't running the Python tests
+# against the interpreter detected by AM_PATH_PYTHON, and so we condition
+# HAVE_PYTHON by requiring "python" to be in the PATH, and that interpreter's
+# version to be >= 2.3. This will allow the scripts to use a "/usr/bin/env"
+# hashbang.
+PYTHON=  # We *do not* allow the user to specify a python interpreter
+AC_PATH_PROG([PYTHON],[python],[:])
+AS_IF([test "$PYTHON" != ":"],
+      [AM_PYTHON_CHECK_VERSION([$PYTHON],[2.3],[:],[PYTHON=":"])])
+AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != ":"])
+
+# TODO(chandlerc@google.com) Check for the necessary system headers.
+
+# Configure pthreads.
+AC_ARG_WITH([pthreads],
+            [AS_HELP_STRING([--with-pthreads],
+               [use pthreads (default is yes)])],
+            [with_pthreads=$withval],
+            [with_pthreads=check])
+
+have_pthreads=no
+AS_IF([test "x$with_pthreads" != "xno"],
+      [ACX_PTHREAD(
+        [],
+        [AS_IF([test "x$with_pthreads" != "xcheck"],
+               [AC_MSG_FAILURE(
+                 [--with-pthreads was specified, but unable to be used])])])
+       have_pthreads="$acx_pthread_ok"])
+AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" == "xyes"])
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_LIBS)
+
+# GoogleMock currently has hard dependencies upon GoogleTest above and beyond
+# running its own test suite, so we both provide our own version in
+# a subdirectory and provide some logic to use a custom version or a system
+# installed version.
+AC_ARG_WITH([gtest],
+            [AS_HELP_STRING([--with-gtest],
+                            [Specifies how to find the gtest package. If no
+                            arguments are given, the default behavior, a
+                            system installed gtest will be used if present,
+                            and an internal version built otherwise. If a
+                            path is provided, the gtest built or installed at
+                            that prefix will be used.])],
+            [],
+            [with_gtest=yes])
+AC_ARG_ENABLE([external-gtest],
+              [AS_HELP_STRING([--disable-external-gtest],
+                              [Disables any detection or use of a system
+                              installed or user provided gtest. Any option to
+                              '--with-gtest' is ignored. (Default is enabled.)])
+              ], [], [enable_external_gtest=yes])
+AS_IF([test "x$with_gtest" == "xno"],
+      [AC_MSG_ERROR([dnl
+Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard
+dependency upon GoogleTest to build, please provide a version, or allow
+GoogleMock to use any installed version and fall back upon its internal
+version.])])
+
+# Setup various GTEST variables. TODO(chandlerc@google.com): When these are
+# used below, they should be used such that any pre-existing values always
+# trump values we set them to, so that they can be used to selectively override
+# details of the detection process.
+AC_ARG_VAR([GTEST_CONFIG],
+           [The exact path of Google Test's 'gtest-config' script.])
+AC_ARG_VAR([GTEST_CPPFLAGS],
+           [C-like preprocessor flags for Google Test.])
+AC_ARG_VAR([GTEST_CXXFLAGS],
+           [C++ compile flags for Google Test.])
+AC_ARG_VAR([GTEST_LDFLAGS],
+           [Linker path and option flags for Google Test.])
+AC_ARG_VAR([GTEST_LIBS],
+           [Library linking flags for Google Test.])
+AC_ARG_VAR([GTEST_VERSION],
+           [The version of Google Test available.])
+HAVE_BUILT_GTEST="no"
+
+GTEST_MIN_VERSION="1.7.0"
+
+AS_IF([test "x${enable_external_gtest}" = "xyes"],
+      [# Begin filling in variables as we are able.
+      AS_IF([test "x${with_gtest}" != "xyes"],
+            [AS_IF([test -x "${with_gtest}/scripts/gtest-config"],
+                   [GTEST_CONFIG="${with_gtest}/scripts/gtest-config"],
+                   [GTEST_CONFIG="${with_gtest}/bin/gtest-config"])
+            AS_IF([test -x "${GTEST_CONFIG}"], [],
+                  [AC_MSG_ERROR([dnl
+Unable to locate either a built or installed Google Test at '${with_gtest}'.])
+                  ])])
+
+      AS_IF([test -x "${GTEST_CONFIG}"], [],
+            [AC_PATH_PROG([GTEST_CONFIG], [gtest-config])])
+      AS_IF([test -x "${GTEST_CONFIG}"],
+            [AC_MSG_CHECKING([for Google Test version >= ${GTEST_MIN_VERSION}])
+            AS_IF([${GTEST_CONFIG} --min-version=${GTEST_MIN_VERSION}],
+                  [AC_MSG_RESULT([yes])
+                  HAVE_BUILT_GTEST="yes"],
+                  [AC_MSG_RESULT([no])])])])
+
+AS_IF([test "x${HAVE_BUILT_GTEST}" = "xyes"],
+      [GTEST_CPPFLAGS=`${GTEST_CONFIG} --cppflags`
+      GTEST_CXXFLAGS=`${GTEST_CONFIG} --cxxflags`
+      GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags`
+      GTEST_LIBS=`${GTEST_CONFIG} --libs`
+      GTEST_VERSION=`${GTEST_CONFIG} --version`],
+      [AC_CONFIG_SUBDIRS([../googletest])
+      # GTEST_CONFIG needs to be executable both in a Makefile environmont and
+      # in a shell script environment, so resolve an absolute path for it here.
+      GTEST_CONFIG="`pwd -P`/../googletest/scripts/gtest-config"
+      GTEST_CPPFLAGS='-I$(top_srcdir)/../googletest/include'
+      GTEST_CXXFLAGS='-g'
+      GTEST_LDFLAGS=''
+      GTEST_LIBS='$(top_builddir)/../googletest/lib/libgtest.la'
+      GTEST_VERSION="${GTEST_MIN_VERSION}"])
+
+# TODO(chandlerc@google.com) Check the types, structures, and other compiler
+# and architecture characteristics.
+
+# Output the generated files. No further autoconf macros may be used.
+AC_OUTPUT
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/CheatSheet.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/CheatSheet.md
new file mode 100644
index 0000000000..ef4451b878
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/CheatSheet.md
@@ -0,0 +1,562 @@
+
+
+# Defining a Mock Class #
+
+## Mocking a Normal Class ##
+
+Given
+```
+class Foo {
+  ...
+  virtual ~Foo();
+  virtual int GetSize() const = 0;
+  virtual string Describe(const char* name) = 0;
+  virtual string Describe(int type) = 0;
+  virtual bool Process(Bar elem, int count) = 0;
+};
+```
+(note that `~Foo()` **must** be virtual) we can define its mock as
+```
+#include "gmock/gmock.h"
+
+class MockFoo : public Foo {
+  MOCK_CONST_METHOD0(GetSize, int());
+  MOCK_METHOD1(Describe, string(const char* name));
+  MOCK_METHOD1(Describe, string(int type));
+  MOCK_METHOD2(Process, bool(Bar elem, int count));
+};
+```
+
+To create a "nice" mock object which ignores all uninteresting calls,
+or a "strict" mock object, which treats them as failures:
+```
+NiceMock<MockFoo> nice_foo;     // The type is a subclass of MockFoo.
+StrictMock<MockFoo> strict_foo; // The type is a subclass of MockFoo.
+```
+
+## Mocking a Class Template ##
+
+To mock
+```
+template <typename Elem>
+class StackInterface {
+ public:
+  ...
+  virtual ~StackInterface();
+  virtual int GetSize() const = 0;
+  virtual void Push(const Elem& x) = 0;
+};
+```
+(note that `~StackInterface()` **must** be virtual) just append `_T` to the `MOCK_*` macros:
+```
+template <typename Elem>
+class MockStack : public StackInterface<Elem> {
+ public:
+  ...
+  MOCK_CONST_METHOD0_T(GetSize, int());
+  MOCK_METHOD1_T(Push, void(const Elem& x));
+};
+```
+
+## Specifying Calling Conventions for Mock Functions ##
+
+If your mock function doesn't use the default calling convention, you
+can specify it by appending `_WITH_CALLTYPE` to any of the macros
+described in the previous two sections and supplying the calling
+convention as the first argument to the macro. For example,
+```
+  MOCK_METHOD_1_WITH_CALLTYPE(STDMETHODCALLTYPE, Foo, bool(int n));
+  MOCK_CONST_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, Bar, int(double x, double y));
+```
+where `STDMETHODCALLTYPE` is defined by `<objbase.h>` on Windows.
+
+# Using Mocks in Tests #
+
+The typical flow is:
+  1. Import the Google Mock names you need to use. All Google Mock names are in the `testing` namespace unless they are macros or otherwise noted.
+  1. Create the mock objects.
+  1. Optionally, set the default actions of the mock objects.
+  1. Set your expectations on the mock objects (How will they be called? What wil they do?).
+  1. Exercise code that uses the mock objects; if necessary, check the result using [Google Test](../../googletest/) assertions.
+  1. When a mock objects is destructed, Google Mock automatically verifies that all expectations on it have been satisfied.
+
+Here is an example:
+```
+using ::testing::Return;                            // #1
+
+TEST(BarTest, DoesThis) {
+  MockFoo foo;                                    // #2
+
+  ON_CALL(foo, GetSize())                         // #3
+      .WillByDefault(Return(1));
+  // ... other default actions ...
+
+  EXPECT_CALL(foo, Describe(5))                   // #4
+      .Times(3)
+      .WillRepeatedly(Return("Category 5"));
+  // ... other expectations ...
+
+  EXPECT_EQ("good", MyProductionFunction(&foo));  // #5
+}                                                 // #6
+```
+
+# Setting Default Actions #
+
+Google Mock has a **built-in default action** for any function that
+returns `void`, `bool`, a numeric value, or a pointer.
+
+To customize the default action for functions with return type `T` globally:
+```
+using ::testing::DefaultValue;
+
+// Sets the default value to be returned. T must be CopyConstructible.
+DefaultValue<T>::Set(value);
+// Sets a factory. Will be invoked on demand. T must be MoveConstructible.
+//   T MakeT();
+DefaultValue<T>::SetFactory(&MakeT);
+// ... use the mocks ...
+// Resets the default value.
+DefaultValue<T>::Clear();
+```
+
+To customize the default action for a particular method, use `ON_CALL()`:
+```
+ON_CALL(mock_object, method(matchers))
+    .With(multi_argument_matcher)  ?
+    .WillByDefault(action);
+```
+
+# Setting Expectations #
+
+`EXPECT_CALL()` sets **expectations** on a mock method (How will it be
+called? What will it do?):
+```
+EXPECT_CALL(mock_object, method(matchers))
+    .With(multi_argument_matcher)  ?
+    .Times(cardinality)            ?
+    .InSequence(sequences)         *
+    .After(expectations)           *
+    .WillOnce(action)              *
+    .WillRepeatedly(action)        ?
+    .RetiresOnSaturation();        ?
+```
+
+If `Times()` is omitted, the cardinality is assumed to be:
+
+  * `Times(1)` when there is neither `WillOnce()` nor `WillRepeatedly()`;
+  * `Times(n)` when there are `n WillOnce()`s but no `WillRepeatedly()`, where `n` >= 1; or
+  * `Times(AtLeast(n))` when there are `n WillOnce()`s and a `WillRepeatedly()`, where `n` >= 0.
+
+A method with no `EXPECT_CALL()` is free to be invoked _any number of times_, and the default action will be taken each time.
+
+# Matchers #
+
+A **matcher** matches a _single_ argument.  You can use it inside
+`ON_CALL()` or `EXPECT_CALL()`, or use it to validate a value
+directly:
+
+| `EXPECT_THAT(value, matcher)` | Asserts that `value` matches `matcher`. |
+|:------------------------------|:----------------------------------------|
+| `ASSERT_THAT(value, matcher)` | The same as `EXPECT_THAT(value, matcher)`, except that it generates a **fatal** failure. |
+
+Built-in matchers (where `argument` is the function argument) are
+divided into several categories:
+
+## Wildcard ##
+|`_`|`argument` can be any value of the correct type.|
+|:--|:-----------------------------------------------|
+|`A<type>()` or `An<type>()`|`argument` can be any value of type `type`.     |
+
+## Generic Comparison ##
+
+|`Eq(value)` or `value`|`argument == value`|
+|:---------------------|:------------------|
+|`Ge(value)`           |`argument >= value`|
+|`Gt(value)`           |`argument > value` |
+|`Le(value)`           |`argument <= value`|
+|`Lt(value)`           |`argument < value` |
+|`Ne(value)`           |`argument != value`|
+|`IsNull()`            |`argument` is a `NULL` pointer (raw or smart).|
+|`NotNull()`           |`argument` is a non-null pointer (raw or smart).|
+|`Ref(variable)`       |`argument` is a reference to `variable`.|
+|`TypedEq<type>(value)`|`argument` has type `type` and is equal to `value`. You may need to use this instead of `Eq(value)` when the mock function is overloaded.|
+
+Except `Ref()`, these matchers make a _copy_ of `value` in case it's
+modified or destructed later. If the compiler complains that `value`
+doesn't have a public copy constructor, try wrap it in `ByRef()`,
+e.g. `Eq(ByRef(non_copyable_value))`. If you do that, make sure
+`non_copyable_value` is not changed afterwards, or the meaning of your
+matcher will be changed.
+
+## Floating-Point Matchers ##
+
+|`DoubleEq(a_double)`|`argument` is a `double` value approximately equal to `a_double`, treating two NaNs as unequal.|
+|:-------------------|:----------------------------------------------------------------------------------------------|
+|`FloatEq(a_float)`  |`argument` is a `float` value approximately equal to `a_float`, treating two NaNs as unequal.  |
+|`NanSensitiveDoubleEq(a_double)`|`argument` is a `double` value approximately equal to `a_double`, treating two NaNs as equal.  |
+|`NanSensitiveFloatEq(a_float)`|`argument` is a `float` value approximately equal to `a_float`, treating two NaNs as equal.    |
+
+The above matchers use ULP-based comparison (the same as used in
+[Google Test](../../googletest/)). They
+automatically pick a reasonable error bound based on the absolute
+value of the expected value.  `DoubleEq()` and `FloatEq()` conform to
+the IEEE standard, which requires comparing two NaNs for equality to
+return false. The `NanSensitive*` version instead treats two NaNs as
+equal, which is often what a user wants.
+
+|`DoubleNear(a_double, max_abs_error)`|`argument` is a `double` value close to `a_double` (absolute error <= `max_abs_error`), treating two NaNs as unequal.|
+|:------------------------------------|:--------------------------------------------------------------------------------------------------------------------|
+|`FloatNear(a_float, max_abs_error)`  |`argument` is a `float` value close to `a_float` (absolute error <= `max_abs_error`), treating two NaNs as unequal.  |
+|`NanSensitiveDoubleNear(a_double, max_abs_error)`|`argument` is a `double` value close to `a_double` (absolute error <= `max_abs_error`), treating two NaNs as equal.  |
+|`NanSensitiveFloatNear(a_float, max_abs_error)`|`argument` is a `float` value close to `a_float` (absolute error <= `max_abs_error`), treating two NaNs as equal.    |
+
+## String Matchers ##
+
+The `argument` can be either a C string or a C++ string object:
+
+|`ContainsRegex(string)`|`argument` matches the given regular expression.|
+|:----------------------|:-----------------------------------------------|
+|`EndsWith(suffix)`     |`argument` ends with string `suffix`.           |
+|`HasSubstr(string)`    |`argument` contains `string` as a sub-string.   |
+|`MatchesRegex(string)` |`argument` matches the given regular expression with the match starting at the first character and ending at the last character.|
+|`StartsWith(prefix)`   |`argument` starts with string `prefix`.         |
+|`StrCaseEq(string)`    |`argument` is equal to `string`, ignoring case. |
+|`StrCaseNe(string)`    |`argument` is not equal to `string`, ignoring case.|
+|`StrEq(string)`        |`argument` is equal to `string`.                |
+|`StrNe(string)`        |`argument` is not equal to `string`.            |
+
+`ContainsRegex()` and `MatchesRegex()` use the regular expression
+syntax defined
+[here](../../googletest/docs/AdvancedGuide.md#regular-expression-syntax).
+`StrCaseEq()`, `StrCaseNe()`, `StrEq()`, and `StrNe()` work for wide
+strings as well.
+
+## Container Matchers ##
+
+Most STL-style containers support `==`, so you can use
+`Eq(expected_container)` or simply `expected_container` to match a
+container exactly.   If you want to write the elements in-line,
+match them more flexibly, or get more informative messages, you can use:
+
+| `ContainerEq(container)` | The same as `Eq(container)` except that the failure message also includes which elements are in one container but not the other. |
+|:-------------------------|:---------------------------------------------------------------------------------------------------------------------------------|
+| `Contains(e)`            | `argument` contains an element that matches `e`, which can be either a value or a matcher.                                       |
+| `Each(e)`                | `argument` is a container where _every_ element matches `e`, which can be either a value or a matcher.                           |
+| `ElementsAre(e0, e1, ..., en)` | `argument` has `n + 1` elements, where the i-th element matches `ei`, which can be a value or a matcher. 0 to 10 arguments are allowed. |
+| `ElementsAreArray({ e0, e1, ..., en })`, `ElementsAreArray(array)`, or `ElementsAreArray(array, count)` | The same as `ElementsAre()` except that the expected element values/matchers come from an initializer list, STL-style container, or C-style array. |
+| `IsEmpty()`              | `argument` is an empty container (`container.empty()`).                                                                          |
+| `Pointwise(m, container)` | `argument` contains the same number of elements as in `container`, and for all i, (the i-th element in `argument`, the i-th element in `container`) match `m`, which is a matcher on 2-tuples. E.g. `Pointwise(Le(), upper_bounds)` verifies that each element in `argument` doesn't exceed the corresponding element in `upper_bounds`. See more detail below. |
+| `SizeIs(m)`              | `argument` is a container whose size matches `m`. E.g. `SizeIs(2)` or `SizeIs(Lt(2))`.                                           |
+| `UnorderedElementsAre(e0, e1, ..., en)` | `argument` has `n + 1` elements, and under some permutation each element matches an `ei` (for a different `i`), which can be a value or a matcher. 0 to 10 arguments are allowed. |
+| `UnorderedElementsAreArray({ e0, e1, ..., en })`, `UnorderedElementsAreArray(array)`, or `UnorderedElementsAreArray(array, count)` | The same as `UnorderedElementsAre()` except that the expected element values/matchers come from an initializer list, STL-style container, or C-style array. |
+| `WhenSorted(m)`          | When `argument` is sorted using the `<` operator, it matches container matcher `m`. E.g. `WhenSorted(UnorderedElementsAre(1, 2, 3))` verifies that `argument` contains elements `1`, `2`, and `3`, ignoring order. |
+| `WhenSortedBy(comparator, m)` | The same as `WhenSorted(m)`, except that the given comparator instead of `<` is used to sort `argument`. E.g. `WhenSortedBy(std::greater<int>(), ElementsAre(3, 2, 1))`. |
+
+Notes:
+
+  * These matchers can also match:
+    1. a native array passed by reference (e.g. in `Foo(const int (&a)[5])`), and
+    1. an array passed as a pointer and a count (e.g. in `Bar(const T* buffer, int len)` -- see [Multi-argument Matchers](#Multiargument_Matchers.md)).
+  * The array being matched may be multi-dimensional (i.e. its elements can be arrays).
+  * `m` in `Pointwise(m, ...)` should be a matcher for `::testing::tuple<T, U>` where `T` and `U` are the element type of the actual container and the expected container, respectively. For example, to compare two `Foo` containers where `Foo` doesn't support `operator==` but has an `Equals()` method, one might write:
+
+```
+using ::testing::get;
+MATCHER(FooEq, "") {
+  return get<0>(arg).Equals(get<1>(arg));
+}
+...
+EXPECT_THAT(actual_foos, Pointwise(FooEq(), expected_foos));
+```
+
+## Member Matchers ##
+
+|`Field(&class::field, m)`|`argument.field` (or `argument->field` when `argument` is a plain pointer) matches matcher `m`, where `argument` is an object of type _class_.|
+|:------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------|
+|`Key(e)`                 |`argument.first` matches `e`, which can be either a value or a matcher. E.g. `Contains(Key(Le(5)))` can verify that a `map` contains a key `<= 5`.|
+|`Pair(m1, m2)`           |`argument` is an `std::pair` whose `first` field matches `m1` and `second` field matches `m2`.                                                |
+|`Property(&class::property, m)`|`argument.property()` (or `argument->property()` when `argument` is a plain pointer) matches matcher `m`, where `argument` is an object of type _class_.|
+
+## Matching the Result of a Function or Functor ##
+
+|`ResultOf(f, m)`|`f(argument)` matches matcher `m`, where `f` is a function or functor.|
+|:---------------|:---------------------------------------------------------------------|
+
+## Pointer Matchers ##
+
+|`Pointee(m)`|`argument` (either a smart pointer or a raw pointer) points to a value that matches matcher `m`.|
+|:-----------|:-----------------------------------------------------------------------------------------------|
+|`WhenDynamicCastTo<T>(m)`| when `argument` is passed through `dynamic_cast<T>()`, it matches matcher `m`.                 |
+
+## Multiargument Matchers ##
+
+Technically, all matchers match a _single_ value. A "multi-argument"
+matcher is just one that matches a _tuple_. The following matchers can
+be used to match a tuple `(x, y)`:
+
+|`Eq()`|`x == y`|
+|:-----|:-------|
+|`Ge()`|`x >= y`|
+|`Gt()`|`x > y` |
+|`Le()`|`x <= y`|
+|`Lt()`|`x < y` |
+|`Ne()`|`x != y`|
+
+You can use the following selectors to pick a subset of the arguments
+(or reorder them) to participate in the matching:
+
+|`AllArgs(m)`|Equivalent to `m`. Useful as syntactic sugar in `.With(AllArgs(m))`.|
+|:-----------|:-------------------------------------------------------------------|
+|`Args<N1, N2, ..., Nk>(m)`|The tuple of the `k` selected (using 0-based indices) arguments matches `m`, e.g. `Args<1, 2>(Eq())`.|
+
+## Composite Matchers ##
+
+You can make a matcher from one or more other matchers:
+
+|`AllOf(m1, m2, ..., mn)`|`argument` matches all of the matchers `m1` to `mn`.|
+|:-----------------------|:---------------------------------------------------|
+|`AnyOf(m1, m2, ..., mn)`|`argument` matches at least one of the matchers `m1` to `mn`.|
+|`Not(m)`                |`argument` doesn't match matcher `m`.               |
+
+## Adapters for Matchers ##
+
+|`MatcherCast<T>(m)`|casts matcher `m` to type `Matcher<T>`.|
+|:------------------|:--------------------------------------|
+|`SafeMatcherCast<T>(m)`| [safely casts](CookBook.md#casting-matchers) matcher `m` to type `Matcher<T>`. |
+|`Truly(predicate)` |`predicate(argument)` returns something considered by C++ to be true, where `predicate` is a function or functor.|
+
+## Matchers as Predicates ##
+
+|`Matches(m)(value)`|evaluates to `true` if `value` matches `m`. You can use `Matches(m)` alone as a unary functor.|
+|:------------------|:---------------------------------------------------------------------------------------------|
+|`ExplainMatchResult(m, value, result_listener)`|evaluates to `true` if `value` matches `m`, explaining the result to `result_listener`.       |
+|`Value(value, m)`  |evaluates to `true` if `value` matches `m`.                                                   |
+
+## Defining Matchers ##
+
+| `MATCHER(IsEven, "") { return (arg % 2) == 0; }` | Defines a matcher `IsEven()` to match an even number. |
+|:-------------------------------------------------|:------------------------------------------------------|
+| `MATCHER_P(IsDivisibleBy, n, "") { *result_listener << "where the remainder is " << (arg % n); return (arg % n) == 0; }` | Defines a macher `IsDivisibleBy(n)` to match a number divisible by `n`. |
+| `MATCHER_P2(IsBetween, a, b, std::string(negation ? "isn't" : "is") + " between " + PrintToString(a) + " and " + PrintToString(b)) { return a <= arg && arg <= b; }` | Defines a matcher `IsBetween(a, b)` to match a value in the range [`a`, `b`]. |
+
+**Notes:**
+
+  1. The `MATCHER*` macros cannot be used inside a function or class.
+  1. The matcher body must be _purely functional_ (i.e. it cannot have any side effect, and the result must not depend on anything other than the value being matched and the matcher parameters).
+  1. You can use `PrintToString(x)` to convert a value `x` of any type to a string.
+
+## Matchers as Test Assertions ##
+
+|`ASSERT_THAT(expression, m)`|Generates a [fatal failure](../../googletest/docs/Primer.md#assertions) if the value of `expression` doesn't match matcher `m`.|
+|:---------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------|
+|`EXPECT_THAT(expression, m)`|Generates a non-fatal failure if the value of `expression` doesn't match matcher `m`.                                                          |
+
+# Actions #
+
+**Actions** specify what a mock function should do when invoked.
+
+## Returning a Value ##
+
+|`Return()`|Return from a `void` mock function.|
+|:---------|:----------------------------------|
+|`Return(value)`|Return `value`. If the type of `value` is different to the mock function's return type, `value` is converted to the latter type <i>at the time the expectation is set</i>, not when the action is executed.|
+|`ReturnArg<N>()`|Return the `N`-th (0-based) argument.|
+|`ReturnNew<T>(a1, ..., ak)`|Return `new T(a1, ..., ak)`; a different object is created each time.|
+|`ReturnNull()`|Return a null pointer.             |
+|`ReturnPointee(ptr)`|Return the value pointed to by `ptr`.|
+|`ReturnRef(variable)`|Return a reference to `variable`.  |
+|`ReturnRefOfCopy(value)`|Return a reference to a copy of `value`; the copy lives as long as the action.|
+
+## Side Effects ##
+
+|`Assign(&variable, value)`|Assign `value` to variable.|
+|:-------------------------|:--------------------------|
+| `DeleteArg<N>()`         | Delete the `N`-th (0-based) argument, which must be a pointer. |
+| `SaveArg<N>(pointer)`    | Save the `N`-th (0-based) argument to `*pointer`. |
+| `SaveArgPointee<N>(pointer)` | Save the value pointed to by the `N`-th (0-based) argument to `*pointer`. |
+| `SetArgReferee<N>(value)` |	Assign value to the variable referenced by the `N`-th (0-based) argument. |
+|`SetArgPointee<N>(value)` |Assign `value` to the variable pointed by the `N`-th (0-based) argument.|
+|`SetArgumentPointee<N>(value)`|Same as `SetArgPointee<N>(value)`. Deprecated. Will be removed in v1.7.0.|
+|`SetArrayArgument<N>(first, last)`|Copies the elements in source range [`first`, `last`) to the array pointed to by the `N`-th (0-based) argument, which can be either a pointer or an iterator. The action does not take ownership of the elements in the source range.|
+|`SetErrnoAndReturn(error, value)`|Set `errno` to `error` and return `value`.|
+|`Throw(exception)`        |Throws the given exception, which can be any copyable value. Available since v1.1.0.|
+
+## Using a Function or a Functor as an Action ##
+
+|`Invoke(f)`|Invoke `f` with the arguments passed to the mock function, where `f` can be a global/static function or a functor.|
+|:----------|:-----------------------------------------------------------------------------------------------------------------|
+|`Invoke(object_pointer, &class::method)`|Invoke the {method on the object with the arguments passed to the mock function.                                  |
+|`InvokeWithoutArgs(f)`|Invoke `f`, which can be a global/static function or a functor. `f` must take no arguments.                       |
+|`InvokeWithoutArgs(object_pointer, &class::method)`|Invoke the method on the object, which takes no arguments.                                                        |
+|`InvokeArgument<N>(arg1, arg2, ..., argk)`|Invoke the mock function's `N`-th (0-based) argument, which must be a function or a functor, with the `k` arguments.|
+
+The return value of the invoked function is used as the return value
+of the action.
+
+When defining a function or functor to be used with `Invoke*()`, you can declare any unused parameters as `Unused`:
+```
+  double Distance(Unused, double x, double y) { return sqrt(x*x + y*y); }
+  ...
+  EXPECT_CALL(mock, Foo("Hi", _, _)).WillOnce(Invoke(Distance));
+```
+
+In `InvokeArgument<N>(...)`, if an argument needs to be passed by reference, wrap it inside `ByRef()`. For example,
+```
+  InvokeArgument<2>(5, string("Hi"), ByRef(foo))
+```
+calls the mock function's #2 argument, passing to it `5` and `string("Hi")` by value, and `foo` by reference.
+
+## Default Action ##
+
+|`DoDefault()`|Do the default action (specified by `ON_CALL()` or the built-in one).|
+|:------------|:--------------------------------------------------------------------|
+
+**Note:** due to technical reasons, `DoDefault()` cannot be used inside  a composite action - trying to do so will result in a run-time error.
+
+## Composite Actions ##
+
+|`DoAll(a1, a2, ..., an)`|Do all actions `a1` to `an` and return the result of `an` in each invocation. The first `n - 1` sub-actions must return void. |
+|:-----------------------|:-----------------------------------------------------------------------------------------------------------------------------|
+|`IgnoreResult(a)`       |Perform action `a` and ignore its result. `a` must not return void.                                                           |
+|`WithArg<N>(a)`         |Pass the `N`-th (0-based) argument of the mock function to action `a` and perform it.                                         |
+|`WithArgs<N1, N2, ..., Nk>(a)`|Pass the selected (0-based) arguments of the mock function to action `a` and perform it.                                      |
+|`WithoutArgs(a)`        |Perform action `a` without any arguments.                                                                                     |
+
+## Defining Actions ##
+
+| `ACTION(Sum) { return arg0 + arg1; }` | Defines an action `Sum()` to return the sum of the mock function's argument #0 and #1. |
+|:--------------------------------------|:---------------------------------------------------------------------------------------|
+| `ACTION_P(Plus, n) { return arg0 + n; }` | Defines an action `Plus(n)` to return the sum of the mock function's argument #0 and `n`. |
+| `ACTION_Pk(Foo, p1, ..., pk) { statements; }` | Defines a parameterized action `Foo(p1, ..., pk)` to execute the given `statements`.   |
+
+The `ACTION*` macros cannot be used inside a function or class.
+
+# Cardinalities #
+
+These are used in `Times()` to specify how many times a mock function will be called:
+
+|`AnyNumber()`|The function can be called any number of times.|
+|:------------|:----------------------------------------------|
+|`AtLeast(n)` |The call is expected at least `n` times.       |
+|`AtMost(n)`  |The call is expected at most `n` times.        |
+|`Between(m, n)`|The call is expected between `m` and `n` (inclusive) times.|
+|`Exactly(n) or n`|The call is expected exactly `n` times. In particular, the call should never happen when `n` is 0.|
+
+# Expectation Order #
+
+By default, the expectations can be matched in _any_ order.  If some
+or all expectations must be matched in a given order, there are two
+ways to specify it.  They can be used either independently or
+together.
+
+## The After Clause ##
+
+```
+using ::testing::Expectation;
+...
+Expectation init_x = EXPECT_CALL(foo, InitX());
+Expectation init_y = EXPECT_CALL(foo, InitY());
+EXPECT_CALL(foo, Bar())
+    .After(init_x, init_y);
+```
+says that `Bar()` can be called only after both `InitX()` and
+`InitY()` have been called.
+
+If you don't know how many pre-requisites an expectation has when you
+write it, you can use an `ExpectationSet` to collect them:
+
+```
+using ::testing::ExpectationSet;
+...
+ExpectationSet all_inits;
+for (int i = 0; i < element_count; i++) {
+  all_inits += EXPECT_CALL(foo, InitElement(i));
+}
+EXPECT_CALL(foo, Bar())
+    .After(all_inits);
+```
+says that `Bar()` can be called only after all elements have been
+initialized (but we don't care about which elements get initialized
+before the others).
+
+Modifying an `ExpectationSet` after using it in an `.After()` doesn't
+affect the meaning of the `.After()`.
+
+## Sequences ##
+
+When you have a long chain of sequential expectations, it's easier to
+specify the order using **sequences**, which don't require you to given
+each expectation in the chain a different name.  <i>All expected<br>
+calls</i> in the same sequence must occur in the order they are
+specified.
+
+```
+using ::testing::Sequence;
+Sequence s1, s2;
+...
+EXPECT_CALL(foo, Reset())
+    .InSequence(s1, s2)
+    .WillOnce(Return(true));
+EXPECT_CALL(foo, GetSize())
+    .InSequence(s1)
+    .WillOnce(Return(1));
+EXPECT_CALL(foo, Describe(A<const char*>()))
+    .InSequence(s2)
+    .WillOnce(Return("dummy"));
+```
+says that `Reset()` must be called before _both_ `GetSize()` _and_
+`Describe()`, and the latter two can occur in any order.
+
+To put many expectations in a sequence conveniently:
+```
+using ::testing::InSequence;
+{
+  InSequence dummy;
+
+  EXPECT_CALL(...)...;
+  EXPECT_CALL(...)...;
+  ...
+  EXPECT_CALL(...)...;
+}
+```
+says that all expected calls in the scope of `dummy` must occur in
+strict order. The name `dummy` is irrelevant.)
+
+# Verifying and Resetting a Mock #
+
+Google Mock will verify the expectations on a mock object when it is destructed, or you can do it earlier:
+```
+using ::testing::Mock;
+...
+// Verifies and removes the expectations on mock_obj;
+// returns true iff successful.
+Mock::VerifyAndClearExpectations(&mock_obj);
+...
+// Verifies and removes the expectations on mock_obj;
+// also removes the default actions set by ON_CALL();
+// returns true iff successful.
+Mock::VerifyAndClear(&mock_obj);
+```
+
+You can also tell Google Mock that a mock object can be leaked and doesn't
+need to be verified:
+```
+Mock::AllowLeak(&mock_obj);
+```
+
+# Mock Classes #
+
+Google Mock defines a convenient mock class template
+```
+class MockFunction<R(A1, ..., An)> {
+ public:
+  MOCK_METHODn(Call, R(A1, ..., An));
+};
+```
+See this [recipe](CookBook.md#using-check-points) for one application of it.
+
+# Flags #
+
+| `--gmock_catch_leaked_mocks=0` | Don't report leaked mock objects as failures. |
+|:-------------------------------|:----------------------------------------------|
+| `--gmock_verbose=LEVEL`        | Sets the default verbosity level (`info`, `warning`, or `error`) of Google Mock messages. |
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/CookBook.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/CookBook.md
new file mode 100644
index 0000000000..c52f1009d1
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/CookBook.md
@@ -0,0 +1,3675 @@
+
+
+You can find recipes for using Google Mock here. If you haven't yet,
+please read the [ForDummies](ForDummies.md) document first to make sure you understand
+the basics.
+
+**Note:** Google Mock lives in the `testing` name space. For
+readability, it is recommended to write `using ::testing::Foo;` once in
+your file before using the name `Foo` defined by Google Mock. We omit
+such `using` statements in this page for brevity, but you should do it
+in your own code.
+
+# Creating Mock Classes #
+
+## Mocking Private or Protected Methods ##
+
+You must always put a mock method definition (`MOCK_METHOD*`) in a
+`public:` section of the mock class, regardless of the method being
+mocked being `public`, `protected`, or `private` in the base class.
+This allows `ON_CALL` and `EXPECT_CALL` to reference the mock function
+from outside of the mock class.  (Yes, C++ allows a subclass to change
+the access level of a virtual function in the base class.)  Example:
+
+```
+class Foo {
+ public:
+  ...
+  virtual bool Transform(Gadget* g) = 0;
+
+ protected:
+  virtual void Resume();
+
+ private:
+  virtual int GetTimeOut();
+};
+
+class MockFoo : public Foo {
+ public:
+  ...
+  MOCK_METHOD1(Transform, bool(Gadget* g));
+
+  // The following must be in the public section, even though the
+  // methods are protected or private in the base class.
+  MOCK_METHOD0(Resume, void());
+  MOCK_METHOD0(GetTimeOut, int());
+};
+```
+
+## Mocking Overloaded Methods ##
+
+You can mock overloaded functions as usual. No special attention is required:
+
+```
+class Foo {
+  ...
+
+  // Must be virtual as we'll inherit from Foo.
+  virtual ~Foo();
+
+  // Overloaded on the types and/or numbers of arguments.
+  virtual int Add(Element x);
+  virtual int Add(int times, Element x);
+
+  // Overloaded on the const-ness of this object.
+  virtual Bar& GetBar();
+  virtual const Bar& GetBar() const;
+};
+
+class MockFoo : public Foo {
+  ...
+  MOCK_METHOD1(Add, int(Element x));
+  MOCK_METHOD2(Add, int(int times, Element x);
+
+  MOCK_METHOD0(GetBar, Bar&());
+  MOCK_CONST_METHOD0(GetBar, const Bar&());
+};
+```
+
+**Note:** if you don't mock all versions of the overloaded method, the
+compiler will give you a warning about some methods in the base class
+being hidden. To fix that, use `using` to bring them in scope:
+
+```
+class MockFoo : public Foo {
+  ...
+  using Foo::Add;
+  MOCK_METHOD1(Add, int(Element x));
+  // We don't want to mock int Add(int times, Element x);
+  ...
+};
+```
+
+## Mocking Class Templates ##
+
+To mock a class template, append `_T` to the `MOCK_*` macros:
+
+```
+template <typename Elem>
+class StackInterface {
+  ...
+  // Must be virtual as we'll inherit from StackInterface.
+  virtual ~StackInterface();
+
+  virtual int GetSize() const = 0;
+  virtual void Push(const Elem& x) = 0;
+};
+
+template <typename Elem>
+class MockStack : public StackInterface<Elem> {
+  ...
+  MOCK_CONST_METHOD0_T(GetSize, int());
+  MOCK_METHOD1_T(Push, void(const Elem& x));
+};
+```
+
+## Mocking Nonvirtual Methods ##
+
+Google Mock can mock non-virtual functions to be used in what we call _hi-perf
+dependency injection_.
+
+In this case, instead of sharing a common base class with the real
+class, your mock class will be _unrelated_ to the real class, but
+contain methods with the same signatures.  The syntax for mocking
+non-virtual methods is the _same_ as mocking virtual methods:
+
+```
+// A simple packet stream class.  None of its members is virtual.
+class ConcretePacketStream {
+ public:
+  void AppendPacket(Packet* new_packet);
+  const Packet* GetPacket(size_t packet_number) const;
+  size_t NumberOfPackets() const;
+  ...
+};
+
+// A mock packet stream class.  It inherits from no other, but defines
+// GetPacket() and NumberOfPackets().
+class MockPacketStream {
+ public:
+  MOCK_CONST_METHOD1(GetPacket, const Packet*(size_t packet_number));
+  MOCK_CONST_METHOD0(NumberOfPackets, size_t());
+  ...
+};
+```
+
+Note that the mock class doesn't define `AppendPacket()`, unlike the
+real class. That's fine as long as the test doesn't need to call it.
+
+Next, you need a way to say that you want to use
+`ConcretePacketStream` in production code, and use `MockPacketStream`
+in tests.  Since the functions are not virtual and the two classes are
+unrelated, you must specify your choice at _compile time_ (as opposed
+to run time).
+
+One way to do it is to templatize your code that needs to use a packet
+stream.  More specifically, you will give your code a template type
+argument for the type of the packet stream.  In production, you will
+instantiate your template with `ConcretePacketStream` as the type
+argument.  In tests, you will instantiate the same template with
+`MockPacketStream`.  For example, you may write:
+
+```
+template <class PacketStream>
+void CreateConnection(PacketStream* stream) { ... }
+
+template <class PacketStream>
+class PacketReader {
+ public:
+  void ReadPackets(PacketStream* stream, size_t packet_num);
+};
+```
+
+Then you can use `CreateConnection<ConcretePacketStream>()` and
+`PacketReader<ConcretePacketStream>` in production code, and use
+`CreateConnection<MockPacketStream>()` and
+`PacketReader<MockPacketStream>` in tests.
+
+```
+  MockPacketStream mock_stream;
+  EXPECT_CALL(mock_stream, ...)...;
+  .. set more expectations on mock_stream ...
+  PacketReader<MockPacketStream> reader(&mock_stream);
+  ... exercise reader ...
+```
+
+## Mocking Free Functions ##
+
+It's possible to use Google Mock to mock a free function (i.e. a
+C-style function or a static method).  You just need to rewrite your
+code to use an interface (abstract class).
+
+Instead of calling a free function (say, `OpenFile`) directly,
+introduce an interface for it and have a concrete subclass that calls
+the free function:
+
+```
+class FileInterface {
+ public:
+  ...
+  virtual bool Open(const char* path, const char* mode) = 0;
+};
+
+class File : public FileInterface {
+ public:
+  ...
+  virtual bool Open(const char* path, const char* mode) {
+    return OpenFile(path, mode);
+  }
+};
+```
+
+Your code should talk to `FileInterface` to open a file.  Now it's
+easy to mock out the function.
+
+This may seem much hassle, but in practice you often have multiple
+related functions that you can put in the same interface, so the
+per-function syntactic overhead will be much lower.
+
+If you are concerned about the performance overhead incurred by
+virtual functions, and profiling confirms your concern, you can
+combine this with the recipe for [mocking non-virtual methods](#Mocking_Nonvirtual_Methods.md).
+
+## The Nice, the Strict, and the Naggy ##
+
+If a mock method has no `EXPECT_CALL` spec but is called, Google Mock
+will print a warning about the "uninteresting call". The rationale is:
+
+  * New methods may be added to an interface after a test is written. We shouldn't fail a test just because a method it doesn't know about is called.
+  * However, this may also mean there's a bug in the test, so Google Mock shouldn't be silent either. If the user believes these calls are harmless, he can add an `EXPECT_CALL()` to suppress the warning.
+
+However, sometimes you may want to suppress all "uninteresting call"
+warnings, while sometimes you may want the opposite, i.e. to treat all
+of them as errors. Google Mock lets you make the decision on a
+per-mock-object basis.
+
+Suppose your test uses a mock class `MockFoo`:
+
+```
+TEST(...) {
+  MockFoo mock_foo;
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+}
+```
+
+If a method of `mock_foo` other than `DoThis()` is called, it will be
+reported by Google Mock as a warning. However, if you rewrite your
+test to use `NiceMock<MockFoo>` instead, the warning will be gone,
+resulting in a cleaner test output:
+
+```
+using ::testing::NiceMock;
+
+TEST(...) {
+  NiceMock<MockFoo> mock_foo;
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+}
+```
+
+`NiceMock<MockFoo>` is a subclass of `MockFoo`, so it can be used
+wherever `MockFoo` is accepted.
+
+It also works if `MockFoo`'s constructor takes some arguments, as
+`NiceMock<MockFoo>` "inherits" `MockFoo`'s constructors:
+
+```
+using ::testing::NiceMock;
+
+TEST(...) {
+  NiceMock<MockFoo> mock_foo(5, "hi");  // Calls MockFoo(5, "hi").
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+}
+```
+
+The usage of `StrictMock` is similar, except that it makes all
+uninteresting calls failures:
+
+```
+using ::testing::StrictMock;
+
+TEST(...) {
+  StrictMock<MockFoo> mock_foo;
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+
+  // The test will fail if a method of mock_foo other than DoThis()
+  // is called.
+}
+```
+
+There are some caveats though (I don't like them just as much as the
+next guy, but sadly they are side effects of C++'s limitations):
+
+  1. `NiceMock<MockFoo>` and `StrictMock<MockFoo>` only work for mock methods defined using the `MOCK_METHOD*` family of macros **directly** in the `MockFoo` class. If a mock method is defined in a **base class** of `MockFoo`, the "nice" or "strict" modifier may not affect it, depending on the compiler. In particular, nesting `NiceMock` and `StrictMock` (e.g. `NiceMock<StrictMock<MockFoo> >`) is **not** supported.
+  1. The constructors of the base mock (`MockFoo`) cannot have arguments passed by non-const reference, which happens to be banned by the [Google C++ style guide](http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml).
+  1. During the constructor or destructor of `MockFoo`, the mock object is _not_ nice or strict.  This may cause surprises if the constructor or destructor calls a mock method on `this` object. (This behavior, however, is consistent with C++'s general rule: if a constructor or destructor calls a virtual method of `this` object, that method is treated as non-virtual.  In other words, to the base class's constructor or destructor, `this` object behaves like an instance of the base class, not the derived class.  This rule is required for safety.  Otherwise a base constructor may use members of a derived class before they are initialized, or a base destructor may use members of a derived class after they have been destroyed.)
+
+Finally, you should be **very cautious** about when to use naggy or strict mocks, as they tend to make tests more brittle and harder to maintain. When you refactor your code without changing its externally visible behavior, ideally you should't need to update any tests. If your code interacts with a naggy mock, however, you may start to get spammed with warnings as the result of your change. Worse, if your code interacts with a strict mock, your tests may start to fail and you'll be forced to fix them. Our general recommendation is to use nice mocks (not yet the default) most of the time, use naggy mocks (the current default) when developing or debugging tests, and use strict mocks only as the last resort.
+
+## Simplifying the Interface without Breaking Existing Code ##
+
+Sometimes a method has a long list of arguments that is mostly
+uninteresting. For example,
+
+```
+class LogSink {
+ public:
+  ...
+  virtual void send(LogSeverity severity, const char* full_filename,
+                    const char* base_filename, int line,
+                    const struct tm* tm_time,
+                    const char* message, size_t message_len) = 0;
+};
+```
+
+This method's argument list is lengthy and hard to work with (let's
+say that the `message` argument is not even 0-terminated). If we mock
+it as is, using the mock will be awkward. If, however, we try to
+simplify this interface, we'll need to fix all clients depending on
+it, which is often infeasible.
+
+The trick is to re-dispatch the method in the mock class:
+
+```
+class ScopedMockLog : public LogSink {
+ public:
+  ...
+  virtual void send(LogSeverity severity, const char* full_filename,
+                    const char* base_filename, int line, const tm* tm_time,
+                    const char* message, size_t message_len) {
+    // We are only interested in the log severity, full file name, and
+    // log message.
+    Log(severity, full_filename, std::string(message, message_len));
+  }
+
+  // Implements the mock method:
+  //
+  //   void Log(LogSeverity severity,
+  //            const string& file_path,
+  //            const string& message);
+  MOCK_METHOD3(Log, void(LogSeverity severity, const string& file_path,
+                         const string& message));
+};
+```
+
+By defining a new mock method with a trimmed argument list, we make
+the mock class much more user-friendly.
+
+## Alternative to Mocking Concrete Classes ##
+
+Often you may find yourself using classes that don't implement
+interfaces. In order to test your code that uses such a class (let's
+call it `Concrete`), you may be tempted to make the methods of
+`Concrete` virtual and then mock it.
+
+Try not to do that.
+
+Making a non-virtual function virtual is a big decision. It creates an
+extension point where subclasses can tweak your class' behavior. This
+weakens your control on the class because now it's harder to maintain
+the class' invariants. You should make a function virtual only when
+there is a valid reason for a subclass to override it.
+
+Mocking concrete classes directly is problematic as it creates a tight
+coupling between the class and the tests - any small change in the
+class may invalidate your tests and make test maintenance a pain.
+
+To avoid such problems, many programmers have been practicing "coding
+to interfaces": instead of talking to the `Concrete` class, your code
+would define an interface and talk to it. Then you implement that
+interface as an adaptor on top of `Concrete`. In tests, you can easily
+mock that interface to observe how your code is doing.
+
+This technique incurs some overhead:
+
+  * You pay the cost of virtual function calls (usually not a problem).
+  * There is more abstraction for the programmers to learn.
+
+However, it can also bring significant benefits in addition to better
+testability:
+
+  * `Concrete`'s API may not fit your problem domain very well, as you may not be the only client it tries to serve. By designing your own interface, you have a chance to tailor it to your need - you may add higher-level functionalities, rename stuff, etc instead of just trimming the class. This allows you to write your code (user of the interface) in a more natural way, which means it will be more readable, more maintainable, and you'll be more productive.
+  * If `Concrete`'s implementation ever has to change, you don't have to rewrite everywhere it is used. Instead, you can absorb the change in your implementation of the interface, and your other code and tests will be insulated from this change.
+
+Some people worry that if everyone is practicing this technique, they
+will end up writing lots of redundant code. This concern is totally
+understandable. However, there are two reasons why it may not be the
+case:
+
+  * Different projects may need to use `Concrete` in different ways, so the best interfaces for them will be different. Therefore, each of them will have its own domain-specific interface on top of `Concrete`, and they will not be the same code.
+  * If enough projects want to use the same interface, they can always share it, just like they have been sharing `Concrete`. You can check in the interface and the adaptor somewhere near `Concrete` (perhaps in a `contrib` sub-directory) and let many projects use it.
+
+You need to weigh the pros and cons carefully for your particular
+problem, but I'd like to assure you that the Java community has been
+practicing this for a long time and it's a proven effective technique
+applicable in a wide variety of situations. :-)
+
+## Delegating Calls to a Fake ##
+
+Some times you have a non-trivial fake implementation of an
+interface. For example:
+
+```
+class Foo {
+ public:
+  virtual ~Foo() {}
+  virtual char DoThis(int n) = 0;
+  virtual void DoThat(const char* s, int* p) = 0;
+};
+
+class FakeFoo : public Foo {
+ public:
+  virtual char DoThis(int n) {
+    return (n > 0) ? '+' :
+        (n < 0) ? '-' : '0';
+  }
+
+  virtual void DoThat(const char* s, int* p) {
+    *p = strlen(s);
+  }
+};
+```
+
+Now you want to mock this interface such that you can set expectations
+on it. However, you also want to use `FakeFoo` for the default
+behavior, as duplicating it in the mock object is, well, a lot of
+work.
+
+When you define the mock class using Google Mock, you can have it
+delegate its default action to a fake class you already have, using
+this pattern:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+class MockFoo : public Foo {
+ public:
+  // Normal mock method definitions using Google Mock.
+  MOCK_METHOD1(DoThis, char(int n));
+  MOCK_METHOD2(DoThat, void(const char* s, int* p));
+
+  // Delegates the default actions of the methods to a FakeFoo object.
+  // This must be called *before* the custom ON_CALL() statements.
+  void DelegateToFake() {
+    ON_CALL(*this, DoThis(_))
+        .WillByDefault(Invoke(&fake_, &FakeFoo::DoThis));
+    ON_CALL(*this, DoThat(_, _))
+        .WillByDefault(Invoke(&fake_, &FakeFoo::DoThat));
+  }
+ private:
+  FakeFoo fake_;  // Keeps an instance of the fake in the mock.
+};
+```
+
+With that, you can use `MockFoo` in your tests as usual. Just remember
+that if you don't explicitly set an action in an `ON_CALL()` or
+`EXPECT_CALL()`, the fake will be called upon to do it:
+
+```
+using ::testing::_;
+
+TEST(AbcTest, Xyz) {
+  MockFoo foo;
+  foo.DelegateToFake(); // Enables the fake for delegation.
+
+  // Put your ON_CALL(foo, ...)s here, if any.
+
+  // No action specified, meaning to use the default action.
+  EXPECT_CALL(foo, DoThis(5));
+  EXPECT_CALL(foo, DoThat(_, _));
+
+  int n = 0;
+  EXPECT_EQ('+', foo.DoThis(5));  // FakeFoo::DoThis() is invoked.
+  foo.DoThat("Hi", &n);           // FakeFoo::DoThat() is invoked.
+  EXPECT_EQ(2, n);
+}
+```
+
+**Some tips:**
+
+  * If you want, you can still override the default action by providing your own `ON_CALL()` or using `.WillOnce()` / `.WillRepeatedly()` in `EXPECT_CALL()`.
+  * In `DelegateToFake()`, you only need to delegate the methods whose fake implementation you intend to use.
+  * The general technique discussed here works for overloaded methods, but you'll need to tell the compiler which version you mean. To disambiguate a mock function (the one you specify inside the parentheses of `ON_CALL()`), see the "Selecting Between Overloaded Functions" section on this page; to disambiguate a fake function (the one you place inside `Invoke()`), use a `static_cast` to specify the function's type. For instance, if class `Foo` has methods `char DoThis(int n)` and `bool DoThis(double x) const`, and you want to invoke the latter, you need to write `Invoke(&fake_, static_cast<bool (FakeFoo::*)(double) const>(&FakeFoo::DoThis))` instead of `Invoke(&fake_, &FakeFoo::DoThis)` (The strange-looking thing inside the angled brackets of `static_cast` is the type of a function pointer to the second `DoThis()` method.).
+  * Having to mix a mock and a fake is often a sign of something gone wrong. Perhaps you haven't got used to the interaction-based way of testing yet. Or perhaps your interface is taking on too many roles and should be split up. Therefore, **don't abuse this**. We would only recommend to do it as an intermediate step when you are refactoring your code.
+
+Regarding the tip on mixing a mock and a fake, here's an example on
+why it may be a bad sign: Suppose you have a class `System` for
+low-level system operations. In particular, it does file and I/O
+operations. And suppose you want to test how your code uses `System`
+to do I/O, and you just want the file operations to work normally. If
+you mock out the entire `System` class, you'll have to provide a fake
+implementation for the file operation part, which suggests that
+`System` is taking on too many roles.
+
+Instead, you can define a `FileOps` interface and an `IOOps` interface
+and split `System`'s functionalities into the two. Then you can mock
+`IOOps` without mocking `FileOps`.
+
+## Delegating Calls to a Real Object ##
+
+When using testing doubles (mocks, fakes, stubs, and etc), sometimes
+their behaviors will differ from those of the real objects. This
+difference could be either intentional (as in simulating an error such
+that you can test the error handling code) or unintentional. If your
+mocks have different behaviors than the real objects by mistake, you
+could end up with code that passes the tests but fails in production.
+
+You can use the _delegating-to-real_ technique to ensure that your
+mock has the same behavior as the real object while retaining the
+ability to validate calls. This technique is very similar to the
+delegating-to-fake technique, the difference being that we use a real
+object instead of a fake. Here's an example:
+
+```
+using ::testing::_;
+using ::testing::AtLeast;
+using ::testing::Invoke;
+
+class MockFoo : public Foo {
+ public:
+  MockFoo() {
+    // By default, all calls are delegated to the real object.
+    ON_CALL(*this, DoThis())
+        .WillByDefault(Invoke(&real_, &Foo::DoThis));
+    ON_CALL(*this, DoThat(_))
+        .WillByDefault(Invoke(&real_, &Foo::DoThat));
+    ...
+  }
+  MOCK_METHOD0(DoThis, ...);
+  MOCK_METHOD1(DoThat, ...);
+  ...
+ private:
+  Foo real_;
+};
+...
+
+  MockFoo mock;
+
+  EXPECT_CALL(mock, DoThis())
+      .Times(3);
+  EXPECT_CALL(mock, DoThat("Hi"))
+      .Times(AtLeast(1));
+  ... use mock in test ...
+```
+
+With this, Google Mock will verify that your code made the right calls
+(with the right arguments, in the right order, called the right number
+of times, etc), and a real object will answer the calls (so the
+behavior will be the same as in production). This gives you the best
+of both worlds.
+
+## Delegating Calls to a Parent Class ##
+
+Ideally, you should code to interfaces, whose methods are all pure
+virtual. In reality, sometimes you do need to mock a virtual method
+that is not pure (i.e, it already has an implementation). For example:
+
+```
+class Foo {
+ public:
+  virtual ~Foo();
+
+  virtual void Pure(int n) = 0;
+  virtual int Concrete(const char* str) { ... }
+};
+
+class MockFoo : public Foo {
+ public:
+  // Mocking a pure method.
+  MOCK_METHOD1(Pure, void(int n));
+  // Mocking a concrete method.  Foo::Concrete() is shadowed.
+  MOCK_METHOD1(Concrete, int(const char* str));
+};
+```
+
+Sometimes you may want to call `Foo::Concrete()` instead of
+`MockFoo::Concrete()`. Perhaps you want to do it as part of a stub
+action, or perhaps your test doesn't need to mock `Concrete()` at all
+(but it would be oh-so painful to have to define a new mock class
+whenever you don't need to mock one of its methods).
+
+The trick is to leave a back door in your mock class for accessing the
+real methods in the base class:
+
+```
+class MockFoo : public Foo {
+ public:
+  // Mocking a pure method.
+  MOCK_METHOD1(Pure, void(int n));
+  // Mocking a concrete method.  Foo::Concrete() is shadowed.
+  MOCK_METHOD1(Concrete, int(const char* str));
+
+  // Use this to call Concrete() defined in Foo.
+  int FooConcrete(const char* str) { return Foo::Concrete(str); }
+};
+```
+
+Now, you can call `Foo::Concrete()` inside an action by:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+...
+  EXPECT_CALL(foo, Concrete(_))
+      .WillOnce(Invoke(&foo, &MockFoo::FooConcrete));
+```
+
+or tell the mock object that you don't want to mock `Concrete()`:
+
+```
+using ::testing::Invoke;
+...
+  ON_CALL(foo, Concrete(_))
+      .WillByDefault(Invoke(&foo, &MockFoo::FooConcrete));
+```
+
+(Why don't we just write `Invoke(&foo, &Foo::Concrete)`? If you do
+that, `MockFoo::Concrete()` will be called (and cause an infinite
+recursion) since `Foo::Concrete()` is virtual. That's just how C++
+works.)
+
+# Using Matchers #
+
+## Matching Argument Values Exactly ##
+
+You can specify exactly which arguments a mock method is expecting:
+
+```
+using ::testing::Return;
+...
+  EXPECT_CALL(foo, DoThis(5))
+      .WillOnce(Return('a'));
+  EXPECT_CALL(foo, DoThat("Hello", bar));
+```
+
+## Using Simple Matchers ##
+
+You can use matchers to match arguments that have a certain property:
+
+```
+using ::testing::Ge;
+using ::testing::NotNull;
+using ::testing::Return;
+...
+  EXPECT_CALL(foo, DoThis(Ge(5)))  // The argument must be >= 5.
+      .WillOnce(Return('a'));
+  EXPECT_CALL(foo, DoThat("Hello", NotNull()));
+  // The second argument must not be NULL.
+```
+
+A frequently used matcher is `_`, which matches anything:
+
+```
+using ::testing::_;
+using ::testing::NotNull;
+...
+  EXPECT_CALL(foo, DoThat(_, NotNull()));
+```
+
+## Combining Matchers ##
+
+You can build complex matchers from existing ones using `AllOf()`,
+`AnyOf()`, and `Not()`:
+
+```
+using ::testing::AllOf;
+using ::testing::Gt;
+using ::testing::HasSubstr;
+using ::testing::Ne;
+using ::testing::Not;
+...
+  // The argument must be > 5 and != 10.
+  EXPECT_CALL(foo, DoThis(AllOf(Gt(5),
+                                Ne(10))));
+
+  // The first argument must not contain sub-string "blah".
+  EXPECT_CALL(foo, DoThat(Not(HasSubstr("blah")),
+                          NULL));
+```
+
+## Casting Matchers ##
+
+Google Mock matchers are statically typed, meaning that the compiler
+can catch your mistake if you use a matcher of the wrong type (for
+example, if you use `Eq(5)` to match a `string` argument). Good for
+you!
+
+Sometimes, however, you know what you're doing and want the compiler
+to give you some slack. One example is that you have a matcher for
+`long` and the argument you want to match is `int`. While the two
+types aren't exactly the same, there is nothing really wrong with
+using a `Matcher<long>` to match an `int` - after all, we can first
+convert the `int` argument to a `long` before giving it to the
+matcher.
+
+To support this need, Google Mock gives you the
+`SafeMatcherCast<T>(m)` function. It casts a matcher `m` to type
+`Matcher<T>`. To ensure safety, Google Mock checks that (let `U` be the
+type `m` accepts):
+
+  1. Type `T` can be implicitly cast to type `U`;
+  1. When both `T` and `U` are built-in arithmetic types (`bool`, integers, and floating-point numbers), the conversion from `T` to `U` is not lossy (in other words, any value representable by `T` can also be represented by `U`); and
+  1. When `U` is a reference, `T` must also be a reference (as the underlying matcher may be interested in the address of the `U` value).
+
+The code won't compile if any of these conditions isn't met.
+
+Here's one example:
+
+```
+using ::testing::SafeMatcherCast;
+
+// A base class and a child class.
+class Base { ... };
+class Derived : public Base { ... };
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(DoThis, void(Derived* derived));
+};
+...
+
+  MockFoo foo;
+  // m is a Matcher<Base*> we got from somewhere.
+  EXPECT_CALL(foo, DoThis(SafeMatcherCast<Derived*>(m)));
+```
+
+If you find `SafeMatcherCast<T>(m)` too limiting, you can use a similar
+function `MatcherCast<T>(m)`. The difference is that `MatcherCast` works
+as long as you can `static_cast` type `T` to type `U`.
+
+`MatcherCast` essentially lets you bypass C++'s type system
+(`static_cast` isn't always safe as it could throw away information,
+for example), so be careful not to misuse/abuse it.
+
+## Selecting Between Overloaded Functions ##
+
+If you expect an overloaded function to be called, the compiler may
+need some help on which overloaded version it is.
+
+To disambiguate functions overloaded on the const-ness of this object,
+use the `Const()` argument wrapper.
+
+```
+using ::testing::ReturnRef;
+
+class MockFoo : public Foo {
+  ...
+  MOCK_METHOD0(GetBar, Bar&());
+  MOCK_CONST_METHOD0(GetBar, const Bar&());
+};
+...
+
+  MockFoo foo;
+  Bar bar1, bar2;
+  EXPECT_CALL(foo, GetBar())         // The non-const GetBar().
+      .WillOnce(ReturnRef(bar1));
+  EXPECT_CALL(Const(foo), GetBar())  // The const GetBar().
+      .WillOnce(ReturnRef(bar2));
+```
+
+(`Const()` is defined by Google Mock and returns a `const` reference
+to its argument.)
+
+To disambiguate overloaded functions with the same number of arguments
+but different argument types, you may need to specify the exact type
+of a matcher, either by wrapping your matcher in `Matcher<type>()`, or
+using a matcher whose type is fixed (`TypedEq<type>`, `An<type>()`,
+etc):
+
+```
+using ::testing::An;
+using ::testing::Lt;
+using ::testing::Matcher;
+using ::testing::TypedEq;
+
+class MockPrinter : public Printer {
+ public:
+  MOCK_METHOD1(Print, void(int n));
+  MOCK_METHOD1(Print, void(char c));
+};
+
+TEST(PrinterTest, Print) {
+  MockPrinter printer;
+
+  EXPECT_CALL(printer, Print(An<int>()));            // void Print(int);
+  EXPECT_CALL(printer, Print(Matcher<int>(Lt(5))));  // void Print(int);
+  EXPECT_CALL(printer, Print(TypedEq<char>('a')));   // void Print(char);
+
+  printer.Print(3);
+  printer.Print(6);
+  printer.Print('a');
+}
+```
+
+## Performing Different Actions Based on the Arguments ##
+
+When a mock method is called, the _last_ matching expectation that's
+still active will be selected (think "newer overrides older"). So, you
+can make a method do different things depending on its argument values
+like this:
+
+```
+using ::testing::_;
+using ::testing::Lt;
+using ::testing::Return;
+...
+  // The default case.
+  EXPECT_CALL(foo, DoThis(_))
+      .WillRepeatedly(Return('b'));
+
+  // The more specific case.
+  EXPECT_CALL(foo, DoThis(Lt(5)))
+      .WillRepeatedly(Return('a'));
+```
+
+Now, if `foo.DoThis()` is called with a value less than 5, `'a'` will
+be returned; otherwise `'b'` will be returned.
+
+## Matching Multiple Arguments as a Whole ##
+
+Sometimes it's not enough to match the arguments individually. For
+example, we may want to say that the first argument must be less than
+the second argument. The `With()` clause allows us to match
+all arguments of a mock function as a whole. For example,
+
+```
+using ::testing::_;
+using ::testing::Lt;
+using ::testing::Ne;
+...
+  EXPECT_CALL(foo, InRange(Ne(0), _))
+      .With(Lt());
+```
+
+says that the first argument of `InRange()` must not be 0, and must be
+less than the second argument.
+
+The expression inside `With()` must be a matcher of type
+`Matcher< ::testing::tuple<A1, ..., An> >`, where `A1`, ..., `An` are the
+types of the function arguments.
+
+You can also write `AllArgs(m)` instead of `m` inside `.With()`. The
+two forms are equivalent, but `.With(AllArgs(Lt()))` is more readable
+than `.With(Lt())`.
+
+You can use `Args<k1, ..., kn>(m)` to match the `n` selected arguments
+(as a tuple) against `m`. For example,
+
+```
+using ::testing::_;
+using ::testing::AllOf;
+using ::testing::Args;
+using ::testing::Lt;
+...
+  EXPECT_CALL(foo, Blah(_, _, _))
+      .With(AllOf(Args<0, 1>(Lt()), Args<1, 2>(Lt())));
+```
+
+says that `Blah()` will be called with arguments `x`, `y`, and `z` where
+`x < y < z`.
+
+As a convenience and example, Google Mock provides some matchers for
+2-tuples, including the `Lt()` matcher above. See the [CheatSheet](CheatSheet.md) for
+the complete list.
+
+Note that if you want to pass the arguments to a predicate of your own
+(e.g. `.With(Args<0, 1>(Truly(&MyPredicate)))`), that predicate MUST be
+written to take a `::testing::tuple` as its argument; Google Mock will pass the `n` selected arguments as _one_ single tuple to the predicate.
+
+## Using Matchers as Predicates ##
+
+Have you noticed that a matcher is just a fancy predicate that also
+knows how to describe itself? Many existing algorithms take predicates
+as arguments (e.g. those defined in STL's `<algorithm>` header), and
+it would be a shame if Google Mock matchers are not allowed to
+participate.
+
+Luckily, you can use a matcher where a unary predicate functor is
+expected by wrapping it inside the `Matches()` function. For example,
+
+```
+#include <algorithm>
+#include <vector>
+
+std::vector<int> v;
+...
+// How many elements in v are >= 10?
+const int count = count_if(v.begin(), v.end(), Matches(Ge(10)));
+```
+
+Since you can build complex matchers from simpler ones easily using
+Google Mock, this gives you a way to conveniently construct composite
+predicates (doing the same using STL's `<functional>` header is just
+painful). For example, here's a predicate that's satisfied by any
+number that is >= 0, <= 100, and != 50:
+
+```
+Matches(AllOf(Ge(0), Le(100), Ne(50)))
+```
+
+## Using Matchers in Google Test Assertions ##
+
+Since matchers are basically predicates that also know how to describe
+themselves, there is a way to take advantage of them in
+[Google Test](../../googletest/) assertions. It's
+called `ASSERT_THAT` and `EXPECT_THAT`:
+
+```
+  ASSERT_THAT(value, matcher);  // Asserts that value matches matcher.
+  EXPECT_THAT(value, matcher);  // The non-fatal version.
+```
+
+For example, in a Google Test test you can write:
+
+```
+#include "gmock/gmock.h"
+
+using ::testing::AllOf;
+using ::testing::Ge;
+using ::testing::Le;
+using ::testing::MatchesRegex;
+using ::testing::StartsWith;
+...
+
+  EXPECT_THAT(Foo(), StartsWith("Hello"));
+  EXPECT_THAT(Bar(), MatchesRegex("Line \\d+"));
+  ASSERT_THAT(Baz(), AllOf(Ge(5), Le(10)));
+```
+
+which (as you can probably guess) executes `Foo()`, `Bar()`, and
+`Baz()`, and verifies that:
+
+  * `Foo()` returns a string that starts with `"Hello"`.
+  * `Bar()` returns a string that matches regular expression `"Line \\d+"`.
+  * `Baz()` returns a number in the range [5, 10].
+
+The nice thing about these macros is that _they read like
+English_. They generate informative messages too. For example, if the
+first `EXPECT_THAT()` above fails, the message will be something like:
+
+```
+Value of: Foo()
+  Actual: "Hi, world!"
+Expected: starts with "Hello"
+```
+
+**Credit:** The idea of `(ASSERT|EXPECT)_THAT` was stolen from the
+[Hamcrest](https://github.com/hamcrest/) project, which adds
+`assertThat()` to JUnit.
+
+## Using Predicates as Matchers ##
+
+Google Mock provides a built-in set of matchers. In case you find them
+lacking, you can use an arbitray unary predicate function or functor
+as a matcher - as long as the predicate accepts a value of the type
+you want. You do this by wrapping the predicate inside the `Truly()`
+function, for example:
+
+```
+using ::testing::Truly;
+
+int IsEven(int n) { return (n % 2) == 0 ? 1 : 0; }
+...
+
+  // Bar() must be called with an even number.
+  EXPECT_CALL(foo, Bar(Truly(IsEven)));
+```
+
+Note that the predicate function / functor doesn't have to return
+`bool`. It works as long as the return value can be used as the
+condition in statement `if (condition) ...`.
+
+## Matching Arguments that Are Not Copyable ##
+
+When you do an `EXPECT_CALL(mock_obj, Foo(bar))`, Google Mock saves
+away a copy of `bar`. When `Foo()` is called later, Google Mock
+compares the argument to `Foo()` with the saved copy of `bar`. This
+way, you don't need to worry about `bar` being modified or destroyed
+after the `EXPECT_CALL()` is executed. The same is true when you use
+matchers like `Eq(bar)`, `Le(bar)`, and so on.
+
+But what if `bar` cannot be copied (i.e. has no copy constructor)? You
+could define your own matcher function and use it with `Truly()`, as
+the previous couple of recipes have shown. Or, you may be able to get
+away from it if you can guarantee that `bar` won't be changed after
+the `EXPECT_CALL()` is executed. Just tell Google Mock that it should
+save a reference to `bar`, instead of a copy of it. Here's how:
+
+```
+using ::testing::Eq;
+using ::testing::ByRef;
+using ::testing::Lt;
+...
+  // Expects that Foo()'s argument == bar.
+  EXPECT_CALL(mock_obj, Foo(Eq(ByRef(bar))));
+
+  // Expects that Foo()'s argument < bar.
+  EXPECT_CALL(mock_obj, Foo(Lt(ByRef(bar))));
+```
+
+Remember: if you do this, don't change `bar` after the
+`EXPECT_CALL()`, or the result is undefined.
+
+## Validating a Member of an Object ##
+
+Often a mock function takes a reference to object as an argument. When
+matching the argument, you may not want to compare the entire object
+against a fixed object, as that may be over-specification. Instead,
+you may need to validate a certain member variable or the result of a
+certain getter method of the object. You can do this with `Field()`
+and `Property()`. More specifically,
+
+```
+Field(&Foo::bar, m)
+```
+
+is a matcher that matches a `Foo` object whose `bar` member variable
+satisfies matcher `m`.
+
+```
+Property(&Foo::baz, m)
+```
+
+is a matcher that matches a `Foo` object whose `baz()` method returns
+a value that satisfies matcher `m`.
+
+For example:
+
+> | `Field(&Foo::number, Ge(3))` | Matches `x` where `x.number >= 3`. |
+|:-----------------------------|:-----------------------------------|
+> | `Property(&Foo::name, StartsWith("John "))` | Matches `x` where `x.name()` starts with `"John "`. |
+
+Note that in `Property(&Foo::baz, ...)`, method `baz()` must take no
+argument and be declared as `const`.
+
+BTW, `Field()` and `Property()` can also match plain pointers to
+objects. For instance,
+
+```
+Field(&Foo::number, Ge(3))
+```
+
+matches a plain pointer `p` where `p->number >= 3`. If `p` is `NULL`,
+the match will always fail regardless of the inner matcher.
+
+What if you want to validate more than one members at the same time?
+Remember that there is `AllOf()`.
+
+## Validating the Value Pointed to by a Pointer Argument ##
+
+C++ functions often take pointers as arguments. You can use matchers
+like `IsNull()`, `NotNull()`, and other comparison matchers to match a
+pointer, but what if you want to make sure the value _pointed to_ by
+the pointer, instead of the pointer itself, has a certain property?
+Well, you can use the `Pointee(m)` matcher.
+
+`Pointee(m)` matches a pointer iff `m` matches the value the pointer
+points to. For example:
+
+```
+using ::testing::Ge;
+using ::testing::Pointee;
+...
+  EXPECT_CALL(foo, Bar(Pointee(Ge(3))));
+```
+
+expects `foo.Bar()` to be called with a pointer that points to a value
+greater than or equal to 3.
+
+One nice thing about `Pointee()` is that it treats a `NULL` pointer as
+a match failure, so you can write `Pointee(m)` instead of
+
+```
+  AllOf(NotNull(), Pointee(m))
+```
+
+without worrying that a `NULL` pointer will crash your test.
+
+Also, did we tell you that `Pointee()` works with both raw pointers
+**and** smart pointers (`linked_ptr`, `shared_ptr`, `scoped_ptr`, and
+etc)?
+
+What if you have a pointer to pointer? You guessed it - you can use
+nested `Pointee()` to probe deeper inside the value. For example,
+`Pointee(Pointee(Lt(3)))` matches a pointer that points to a pointer
+that points to a number less than 3 (what a mouthful...).
+
+## Testing a Certain Property of an Object ##
+
+Sometimes you want to specify that an object argument has a certain
+property, but there is no existing matcher that does this. If you want
+good error messages, you should define a matcher. If you want to do it
+quick and dirty, you could get away with writing an ordinary function.
+
+Let's say you have a mock function that takes an object of type `Foo`,
+which has an `int bar()` method and an `int baz()` method, and you
+want to constrain that the argument's `bar()` value plus its `baz()`
+value is a given number. Here's how you can define a matcher to do it:
+
+```
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+
+class BarPlusBazEqMatcher : public MatcherInterface<const Foo&> {
+ public:
+  explicit BarPlusBazEqMatcher(int expected_sum)
+      : expected_sum_(expected_sum) {}
+
+  virtual bool MatchAndExplain(const Foo& foo,
+                               MatchResultListener* listener) const {
+    return (foo.bar() + foo.baz()) == expected_sum_;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "bar() + baz() equals " << expected_sum_;
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "bar() + baz() does not equal " << expected_sum_;
+  }
+ private:
+  const int expected_sum_;
+};
+
+inline Matcher<const Foo&> BarPlusBazEq(int expected_sum) {
+  return MakeMatcher(new BarPlusBazEqMatcher(expected_sum));
+}
+
+...
+
+  EXPECT_CALL(..., DoThis(BarPlusBazEq(5)))...;
+```
+
+## Matching Containers ##
+
+Sometimes an STL container (e.g. list, vector, map, ...) is passed to
+a mock function and you may want to validate it. Since most STL
+containers support the `==` operator, you can write
+`Eq(expected_container)` or simply `expected_container` to match a
+container exactly.
+
+Sometimes, though, you may want to be more flexible (for example, the
+first element must be an exact match, but the second element can be
+any positive number, and so on). Also, containers used in tests often
+have a small number of elements, and having to define the expected
+container out-of-line is a bit of a hassle.
+
+You can use the `ElementsAre()` or `UnorderedElementsAre()` matcher in
+such cases:
+
+```
+using ::testing::_;
+using ::testing::ElementsAre;
+using ::testing::Gt;
+...
+
+  MOCK_METHOD1(Foo, void(const vector<int>& numbers));
+...
+
+  EXPECT_CALL(mock, Foo(ElementsAre(1, Gt(0), _, 5)));
+```
+
+The above matcher says that the container must have 4 elements, which
+must be 1, greater than 0, anything, and 5 respectively.
+
+If you instead write:
+
+```
+using ::testing::_;
+using ::testing::Gt;
+using ::testing::UnorderedElementsAre;
+...
+
+  MOCK_METHOD1(Foo, void(const vector<int>& numbers));
+...
+
+  EXPECT_CALL(mock, Foo(UnorderedElementsAre(1, Gt(0), _, 5)));
+```
+
+It means that the container must have 4 elements, which under some
+permutation must be 1, greater than 0, anything, and 5 respectively.
+
+`ElementsAre()` and `UnorderedElementsAre()` are overloaded to take 0
+to 10 arguments. If more are needed, you can place them in a C-style
+array and use `ElementsAreArray()` or `UnorderedElementsAreArray()`
+instead:
+
+```
+using ::testing::ElementsAreArray;
+...
+
+  // ElementsAreArray accepts an array of element values.
+  const int expected_vector1[] = { 1, 5, 2, 4, ... };
+  EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector1)));
+
+  // Or, an array of element matchers.
+  Matcher<int> expected_vector2 = { 1, Gt(2), _, 3, ... };
+  EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector2)));
+```
+
+In case the array needs to be dynamically created (and therefore the
+array size cannot be inferred by the compiler), you can give
+`ElementsAreArray()` an additional argument to specify the array size:
+
+```
+using ::testing::ElementsAreArray;
+...
+  int* const expected_vector3 = new int[count];
+  ... fill expected_vector3 with values ...
+  EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector3, count)));
+```
+
+**Tips:**
+
+  * `ElementsAre*()` can be used to match _any_ container that implements the STL iterator pattern (i.e. it has a `const_iterator` type and supports `begin()/end()`), not just the ones defined in STL. It will even work with container types yet to be written - as long as they follows the above pattern.
+  * You can use nested `ElementsAre*()` to match nested (multi-dimensional) containers.
+  * If the container is passed by pointer instead of by reference, just write `Pointee(ElementsAre*(...))`.
+  * The order of elements _matters_ for `ElementsAre*()`. Therefore don't use it with containers whose element order is undefined (e.g. `hash_map`).
+
+## Sharing Matchers ##
+
+Under the hood, a Google Mock matcher object consists of a pointer to
+a ref-counted implementation object. Copying matchers is allowed and
+very efficient, as only the pointer is copied. When the last matcher
+that references the implementation object dies, the implementation
+object will be deleted.
+
+Therefore, if you have some complex matcher that you want to use again
+and again, there is no need to build it everytime. Just assign it to a
+matcher variable and use that variable repeatedly! For example,
+
+```
+  Matcher<int> in_range = AllOf(Gt(5), Le(10));
+  ... use in_range as a matcher in multiple EXPECT_CALLs ...
+```
+
+# Setting Expectations #
+
+## Knowing When to Expect ##
+
+`ON_CALL` is likely the single most under-utilized construct in Google Mock.
+
+There are basically two constructs for defining the behavior of a mock object: `ON_CALL` and `EXPECT_CALL`. The difference? `ON_CALL` defines what happens when a mock method is called, but _doesn't imply any expectation on the method being called._ `EXPECT_CALL` not only defines the behavior, but also sets an expectation that _the method will be called with the given arguments, for the given number of times_ (and _in the given order_ when you specify the order too).
+
+Since `EXPECT_CALL` does more, isn't it better than `ON_CALL`? Not really. Every `EXPECT_CALL` adds a constraint on the behavior of the code under test. Having more constraints than necessary is _baaad_ - even worse than not having enough constraints.
+
+This may be counter-intuitive. How could tests that verify more be worse than tests that verify less? Isn't verification the whole point of tests?
+
+The answer, lies in _what_ a test should verify. **A good test verifies the contract of the code.** If a test over-specifies, it doesn't leave enough freedom to the implementation. As a result, changing the implementation without breaking the contract (e.g. refactoring and optimization), which should be perfectly fine to do, can break such tests. Then you have to spend time fixing them, only to see them broken again the next time the implementation is changed.
+
+Keep in mind that one doesn't have to verify more than one property in one test. In fact, **it's a good style to verify only one thing in one test.** If you do that, a bug will likely break only one or two tests instead of dozens (which case would you rather debug?). If you are also in the habit of giving tests descriptive names that tell what they verify, you can often easily guess what's wrong just from the test log itself.
+
+So use `ON_CALL` by default, and only use `EXPECT_CALL` when you actually intend to verify that the call is made. For example, you may have a bunch of `ON_CALL`s in your test fixture to set the common mock behavior shared by all tests in the same group, and write (scarcely) different `EXPECT_CALL`s in different `TEST_F`s to verify different aspects of the code's behavior. Compared with the style where each `TEST` has many `EXPECT_CALL`s, this leads to tests that are more resilient to implementational changes (and thus less likely to require maintenance) and makes the intent of the tests more obvious (so they are easier to maintain when you do need to maintain them).
+
+If you are bothered by the "Uninteresting mock function call" message printed when a mock method without an `EXPECT_CALL` is called, you may use a `NiceMock` instead to suppress all such messages for the mock object, or suppress the message for specific methods by adding `EXPECT_CALL(...).Times(AnyNumber())`. DO NOT suppress it by blindly adding an `EXPECT_CALL(...)`, or you'll have a test that's a pain to maintain.
+
+## Ignoring Uninteresting Calls ##
+
+If you are not interested in how a mock method is called, just don't
+say anything about it. In this case, if the method is ever called,
+Google Mock will perform its default action to allow the test program
+to continue. If you are not happy with the default action taken by
+Google Mock, you can override it using `DefaultValue<T>::Set()`
+(described later in this document) or `ON_CALL()`.
+
+Please note that once you expressed interest in a particular mock
+method (via `EXPECT_CALL()`), all invocations to it must match some
+expectation. If this function is called but the arguments don't match
+any `EXPECT_CALL()` statement, it will be an error.
+
+## Disallowing Unexpected Calls ##
+
+If a mock method shouldn't be called at all, explicitly say so:
+
+```
+using ::testing::_;
+...
+  EXPECT_CALL(foo, Bar(_))
+      .Times(0);
+```
+
+If some calls to the method are allowed, but the rest are not, just
+list all the expected calls:
+
+```
+using ::testing::AnyNumber;
+using ::testing::Gt;
+...
+  EXPECT_CALL(foo, Bar(5));
+  EXPECT_CALL(foo, Bar(Gt(10)))
+      .Times(AnyNumber());
+```
+
+A call to `foo.Bar()` that doesn't match any of the `EXPECT_CALL()`
+statements will be an error.
+
+## Understanding Uninteresting vs Unexpected Calls ##
+
+_Uninteresting_ calls and _unexpected_ calls are different concepts in Google Mock. _Very_ different.
+
+A call `x.Y(...)` is **uninteresting** if there's _not even a single_ `EXPECT_CALL(x, Y(...))` set. In other words, the test isn't interested in the `x.Y()` method at all, as evident in that the test doesn't care to say anything about it.
+
+A call `x.Y(...)` is **unexpected** if there are some `EXPECT_CALL(x, Y(...))s` set, but none of them matches the call. Put another way, the test is interested in the `x.Y()` method (therefore it _explicitly_ sets some `EXPECT_CALL` to verify how it's called); however, the verification fails as the test doesn't expect this particular call to happen.
+
+**An unexpected call is always an error,** as the code under test doesn't behave the way the test expects it to behave.
+
+**By default, an uninteresting call is not an error,** as it violates no constraint specified by the test. (Google Mock's philosophy is that saying nothing means there is no constraint.) However, it leads to a warning, as it _might_ indicate a problem (e.g. the test author might have forgotten to specify a constraint).
+
+In Google Mock, `NiceMock` and `StrictMock` can be used to make a mock class "nice" or "strict". How does this affect uninteresting calls and unexpected calls?
+
+A **nice mock** suppresses uninteresting call warnings. It is less chatty than the default mock, but otherwise is the same. If a test fails with a default mock, it will also fail using a nice mock instead. And vice versa. Don't expect making a mock nice to change the test's result.
+
+A **strict mock** turns uninteresting call warnings into errors. So making a mock strict may change the test's result.
+
+Let's look at an example:
+
+```
+TEST(...) {
+  NiceMock<MockDomainRegistry> mock_registry;
+  EXPECT_CALL(mock_registry, GetDomainOwner("google.com"))
+          .WillRepeatedly(Return("Larry Page"));
+
+  // Use mock_registry in code under test.
+  ... &mock_registry ...
+}
+```
+
+The sole `EXPECT_CALL` here says that all calls to `GetDomainOwner()` must have `"google.com"` as the argument. If `GetDomainOwner("yahoo.com")` is called, it will be an unexpected call, and thus an error. Having a nice mock doesn't change the severity of an unexpected call.
+
+So how do we tell Google Mock that `GetDomainOwner()` can be called with some other arguments as well? The standard technique is to add a "catch all" `EXPECT_CALL`:
+
+```
+  EXPECT_CALL(mock_registry, GetDomainOwner(_))
+        .Times(AnyNumber());  // catches all other calls to this method.
+  EXPECT_CALL(mock_registry, GetDomainOwner("google.com"))
+        .WillRepeatedly(Return("Larry Page"));
+```
+
+Remember that `_` is the wildcard matcher that matches anything. With this, if `GetDomainOwner("google.com")` is called, it will do what the second `EXPECT_CALL` says; if it is called with a different argument, it will do what the first `EXPECT_CALL` says.
+
+Note that the order of the two `EXPECT_CALLs` is important, as a newer `EXPECT_CALL` takes precedence over an older one.
+
+For more on uninteresting calls, nice mocks, and strict mocks, read ["The Nice, the Strict, and the Naggy"](#the-nice-the-strict-and-the-naggy).
+
+## Expecting Ordered Calls ##
+
+Although an `EXPECT_CALL()` statement defined earlier takes precedence
+when Google Mock tries to match a function call with an expectation,
+by default calls don't have to happen in the order `EXPECT_CALL()`
+statements are written. For example, if the arguments match the
+matchers in the third `EXPECT_CALL()`, but not those in the first two,
+then the third expectation will be used.
+
+If you would rather have all calls occur in the order of the
+expectations, put the `EXPECT_CALL()` statements in a block where you
+define a variable of type `InSequence`:
+
+```
+  using ::testing::_;
+  using ::testing::InSequence;
+
+  {
+    InSequence s;
+
+    EXPECT_CALL(foo, DoThis(5));
+    EXPECT_CALL(bar, DoThat(_))
+        .Times(2);
+    EXPECT_CALL(foo, DoThis(6));
+  }
+```
+
+In this example, we expect a call to `foo.DoThis(5)`, followed by two
+calls to `bar.DoThat()` where the argument can be anything, which are
+in turn followed by a call to `foo.DoThis(6)`. If a call occurred
+out-of-order, Google Mock will report an error.
+
+## Expecting Partially Ordered Calls ##
+
+Sometimes requiring everything to occur in a predetermined order can
+lead to brittle tests. For example, we may care about `A` occurring
+before both `B` and `C`, but aren't interested in the relative order
+of `B` and `C`. In this case, the test should reflect our real intent,
+instead of being overly constraining.
+
+Google Mock allows you to impose an arbitrary DAG (directed acyclic
+graph) on the calls. One way to express the DAG is to use the
+[After](CheatSheet.md#the-after-clause) clause of `EXPECT_CALL`.
+
+Another way is via the `InSequence()` clause (not the same as the
+`InSequence` class), which we borrowed from jMock 2. It's less
+flexible than `After()`, but more convenient when you have long chains
+of sequential calls, as it doesn't require you to come up with
+different names for the expectations in the chains.  Here's how it
+works:
+
+If we view `EXPECT_CALL()` statements as nodes in a graph, and add an
+edge from node A to node B wherever A must occur before B, we can get
+a DAG. We use the term "sequence" to mean a directed path in this
+DAG. Now, if we decompose the DAG into sequences, we just need to know
+which sequences each `EXPECT_CALL()` belongs to in order to be able to
+reconstruct the orginal DAG.
+
+So, to specify the partial order on the expectations we need to do two
+things: first to define some `Sequence` objects, and then for each
+`EXPECT_CALL()` say which `Sequence` objects it is part
+of. Expectations in the same sequence must occur in the order they are
+written. For example,
+
+```
+  using ::testing::Sequence;
+
+  Sequence s1, s2;
+
+  EXPECT_CALL(foo, A())
+      .InSequence(s1, s2);
+  EXPECT_CALL(bar, B())
+      .InSequence(s1);
+  EXPECT_CALL(bar, C())
+      .InSequence(s2);
+  EXPECT_CALL(foo, D())
+      .InSequence(s2);
+```
+
+specifies the following DAG (where `s1` is `A -> B`, and `s2` is `A ->
+C -> D`):
+
+```
+       +---> B
+       |
+  A ---|
+       |
+       +---> C ---> D
+```
+
+This means that A must occur before B and C, and C must occur before
+D. There's no restriction about the order other than these.
+
+## Controlling When an Expectation Retires ##
+
+When a mock method is called, Google Mock only consider expectations
+that are still active. An expectation is active when created, and
+becomes inactive (aka _retires_) when a call that has to occur later
+has occurred. For example, in
+
+```
+  using ::testing::_;
+  using ::testing::Sequence;
+
+  Sequence s1, s2;
+
+  EXPECT_CALL(log, Log(WARNING, _, "File too large."))     // #1
+      .Times(AnyNumber())
+      .InSequence(s1, s2);
+  EXPECT_CALL(log, Log(WARNING, _, "Data set is empty."))  // #2
+      .InSequence(s1);
+  EXPECT_CALL(log, Log(WARNING, _, "User not found."))     // #3
+      .InSequence(s2);
+```
+
+as soon as either #2 or #3 is matched, #1 will retire. If a warning
+`"File too large."` is logged after this, it will be an error.
+
+Note that an expectation doesn't retire automatically when it's
+saturated. For example,
+
+```
+using ::testing::_;
+...
+  EXPECT_CALL(log, Log(WARNING, _, _));                  // #1
+  EXPECT_CALL(log, Log(WARNING, _, "File too large."));  // #2
+```
+
+says that there will be exactly one warning with the message `"File
+too large."`. If the second warning contains this message too, #2 will
+match again and result in an upper-bound-violated error.
+
+If this is not what you want, you can ask an expectation to retire as
+soon as it becomes saturated:
+
+```
+using ::testing::_;
+...
+  EXPECT_CALL(log, Log(WARNING, _, _));                 // #1
+  EXPECT_CALL(log, Log(WARNING, _, "File too large."))  // #2
+      .RetiresOnSaturation();
+```
+
+Here #2 can be used only once, so if you have two warnings with the
+message `"File too large."`, the first will match #2 and the second
+will match #1 - there will be no error.
+
+# Using Actions #
+
+## Returning References from Mock Methods ##
+
+If a mock function's return type is a reference, you need to use
+`ReturnRef()` instead of `Return()` to return a result:
+
+```
+using ::testing::ReturnRef;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD0(GetBar, Bar&());
+};
+...
+
+  MockFoo foo;
+  Bar bar;
+  EXPECT_CALL(foo, GetBar())
+      .WillOnce(ReturnRef(bar));
+```
+
+## Returning Live Values from Mock Methods ##
+
+The `Return(x)` action saves a copy of `x` when the action is
+_created_, and always returns the same value whenever it's
+executed. Sometimes you may want to instead return the _live_ value of
+`x` (i.e. its value at the time when the action is _executed_.).
+
+If the mock function's return type is a reference, you can do it using
+`ReturnRef(x)`, as shown in the previous recipe ("Returning References
+from Mock Methods"). However, Google Mock doesn't let you use
+`ReturnRef()` in a mock function whose return type is not a reference,
+as doing that usually indicates a user error. So, what shall you do?
+
+You may be tempted to try `ByRef()`:
+
+```
+using testing::ByRef;
+using testing::Return;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD0(GetValue, int());
+};
+...
+  int x = 0;
+  MockFoo foo;
+  EXPECT_CALL(foo, GetValue())
+      .WillRepeatedly(Return(ByRef(x)));
+  x = 42;
+  EXPECT_EQ(42, foo.GetValue());
+```
+
+Unfortunately, it doesn't work here. The above code will fail with error:
+
+```
+Value of: foo.GetValue()
+  Actual: 0
+Expected: 42
+```
+
+The reason is that `Return(value)` converts `value` to the actual
+return type of the mock function at the time when the action is
+_created_, not when it is _executed_. (This behavior was chosen for
+the action to be safe when `value` is a proxy object that references
+some temporary objects.) As a result, `ByRef(x)` is converted to an
+`int` value (instead of a `const int&`) when the expectation is set,
+and `Return(ByRef(x))` will always return 0.
+
+`ReturnPointee(pointer)` was provided to solve this problem
+specifically. It returns the value pointed to by `pointer` at the time
+the action is _executed_:
+
+```
+using testing::ReturnPointee;
+...
+  int x = 0;
+  MockFoo foo;
+  EXPECT_CALL(foo, GetValue())
+      .WillRepeatedly(ReturnPointee(&x));  // Note the & here.
+  x = 42;
+  EXPECT_EQ(42, foo.GetValue());  // This will succeed now.
+```
+
+## Combining Actions ##
+
+Want to do more than one thing when a function is called? That's
+fine. `DoAll()` allow you to do sequence of actions every time. Only
+the return value of the last action in the sequence will be used.
+
+```
+using ::testing::DoAll;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(Bar, bool(int n));
+};
+...
+
+  EXPECT_CALL(foo, Bar(_))
+      .WillOnce(DoAll(action_1,
+                      action_2,
+                      ...
+                      action_n));
+```
+
+## Mocking Side Effects ##
+
+Sometimes a method exhibits its effect not via returning a value but
+via side effects. For example, it may change some global state or
+modify an output argument. To mock side effects, in general you can
+define your own action by implementing `::testing::ActionInterface`.
+
+If all you need to do is to change an output argument, the built-in
+`SetArgPointee()` action is convenient:
+
+```
+using ::testing::SetArgPointee;
+
+class MockMutator : public Mutator {
+ public:
+  MOCK_METHOD2(Mutate, void(bool mutate, int* value));
+  ...
+};
+...
+
+  MockMutator mutator;
+  EXPECT_CALL(mutator, Mutate(true, _))
+      .WillOnce(SetArgPointee<1>(5));
+```
+
+In this example, when `mutator.Mutate()` is called, we will assign 5
+to the `int` variable pointed to by argument #1
+(0-based).
+
+`SetArgPointee()` conveniently makes an internal copy of the
+value you pass to it, removing the need to keep the value in scope and
+alive. The implication however is that the value must have a copy
+constructor and assignment operator.
+
+If the mock method also needs to return a value as well, you can chain
+`SetArgPointee()` with `Return()` using `DoAll()`:
+
+```
+using ::testing::_;
+using ::testing::Return;
+using ::testing::SetArgPointee;
+
+class MockMutator : public Mutator {
+ public:
+  ...
+  MOCK_METHOD1(MutateInt, bool(int* value));
+};
+...
+
+  MockMutator mutator;
+  EXPECT_CALL(mutator, MutateInt(_))
+      .WillOnce(DoAll(SetArgPointee<0>(5),
+                      Return(true)));
+```
+
+If the output argument is an array, use the
+`SetArrayArgument<N>(first, last)` action instead. It copies the
+elements in source range `[first, last)` to the array pointed to by
+the `N`-th (0-based) argument:
+
+```
+using ::testing::NotNull;
+using ::testing::SetArrayArgument;
+
+class MockArrayMutator : public ArrayMutator {
+ public:
+  MOCK_METHOD2(Mutate, void(int* values, int num_values));
+  ...
+};
+...
+
+  MockArrayMutator mutator;
+  int values[5] = { 1, 2, 3, 4, 5 };
+  EXPECT_CALL(mutator, Mutate(NotNull(), 5))
+      .WillOnce(SetArrayArgument<0>(values, values + 5));
+```
+
+This also works when the argument is an output iterator:
+
+```
+using ::testing::_;
+using ::testing::SeArrayArgument;
+
+class MockRolodex : public Rolodex {
+ public:
+  MOCK_METHOD1(GetNames, void(std::back_insert_iterator<vector<string> >));
+  ...
+};
+...
+
+  MockRolodex rolodex;
+  vector<string> names;
+  names.push_back("George");
+  names.push_back("John");
+  names.push_back("Thomas");
+  EXPECT_CALL(rolodex, GetNames(_))
+      .WillOnce(SetArrayArgument<0>(names.begin(), names.end()));
+```
+
+## Changing a Mock Object's Behavior Based on the State ##
+
+If you expect a call to change the behavior of a mock object, you can use `::testing::InSequence` to specify different behaviors before and after the call:
+
+```
+using ::testing::InSequence;
+using ::testing::Return;
+
+...
+  {
+    InSequence seq;
+    EXPECT_CALL(my_mock, IsDirty())
+        .WillRepeatedly(Return(true));
+    EXPECT_CALL(my_mock, Flush());
+    EXPECT_CALL(my_mock, IsDirty())
+        .WillRepeatedly(Return(false));
+  }
+  my_mock.FlushIfDirty();
+```
+
+This makes `my_mock.IsDirty()` return `true` before `my_mock.Flush()` is called and return `false` afterwards.
+
+If the behavior change is more complex, you can store the effects in a variable and make a mock method get its return value from that variable:
+
+```
+using ::testing::_;
+using ::testing::SaveArg;
+using ::testing::Return;
+
+ACTION_P(ReturnPointee, p) { return *p; }
+...
+  int previous_value = 0;
+  EXPECT_CALL(my_mock, GetPrevValue())
+      .WillRepeatedly(ReturnPointee(&previous_value));
+  EXPECT_CALL(my_mock, UpdateValue(_))
+      .WillRepeatedly(SaveArg<0>(&previous_value));
+  my_mock.DoSomethingToUpdateValue();
+```
+
+Here `my_mock.GetPrevValue()` will always return the argument of the last `UpdateValue()` call.
+
+## Setting the Default Value for a Return Type ##
+
+If a mock method's return type is a built-in C++ type or pointer, by
+default it will return 0 when invoked. Also, in C++ 11 and above, a mock
+method whose return type has a default constructor will return a default-constructed
+value by default.  You only need to specify an
+action if this default value doesn't work for you.
+
+Sometimes, you may want to change this default value, or you may want
+to specify a default value for types Google Mock doesn't know
+about. You can do this using the `::testing::DefaultValue` class
+template:
+
+```
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD0(CalculateBar, Bar());
+};
+...
+
+  Bar default_bar;
+  // Sets the default return value for type Bar.
+  DefaultValue<Bar>::Set(default_bar);
+
+  MockFoo foo;
+
+  // We don't need to specify an action here, as the default
+  // return value works for us.
+  EXPECT_CALL(foo, CalculateBar());
+
+  foo.CalculateBar();  // This should return default_bar.
+
+  // Unsets the default return value.
+  DefaultValue<Bar>::Clear();
+```
+
+Please note that changing the default value for a type can make you
+tests hard to understand. We recommend you to use this feature
+judiciously. For example, you may want to make sure the `Set()` and
+`Clear()` calls are right next to the code that uses your mock.
+
+## Setting the Default Actions for a Mock Method ##
+
+You've learned how to change the default value of a given
+type. However, this may be too coarse for your purpose: perhaps you
+have two mock methods with the same return type and you want them to
+have different behaviors. The `ON_CALL()` macro allows you to
+customize your mock's behavior at the method level:
+
+```
+using ::testing::_;
+using ::testing::AnyNumber;
+using ::testing::Gt;
+using ::testing::Return;
+...
+  ON_CALL(foo, Sign(_))
+      .WillByDefault(Return(-1));
+  ON_CALL(foo, Sign(0))
+      .WillByDefault(Return(0));
+  ON_CALL(foo, Sign(Gt(0)))
+      .WillByDefault(Return(1));
+
+  EXPECT_CALL(foo, Sign(_))
+      .Times(AnyNumber());
+
+  foo.Sign(5);   // This should return 1.
+  foo.Sign(-9);  // This should return -1.
+  foo.Sign(0);   // This should return 0.
+```
+
+As you may have guessed, when there are more than one `ON_CALL()`
+statements, the news order take precedence over the older ones. In
+other words, the **last** one that matches the function arguments will
+be used. This matching order allows you to set up the common behavior
+in a mock object's constructor or the test fixture's set-up phase and
+specialize the mock's behavior later.
+
+## Using Functions/Methods/Functors as Actions ##
+
+If the built-in actions don't suit you, you can easily use an existing
+function, method, or functor as an action:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD2(Sum, int(int x, int y));
+  MOCK_METHOD1(ComplexJob, bool(int x));
+};
+
+int CalculateSum(int x, int y) { return x + y; }
+
+class Helper {
+ public:
+  bool ComplexJob(int x);
+};
+...
+
+  MockFoo foo;
+  Helper helper;
+  EXPECT_CALL(foo, Sum(_, _))
+      .WillOnce(Invoke(CalculateSum));
+  EXPECT_CALL(foo, ComplexJob(_))
+      .WillOnce(Invoke(&helper, &Helper::ComplexJob));
+
+  foo.Sum(5, 6);       // Invokes CalculateSum(5, 6).
+  foo.ComplexJob(10);  // Invokes helper.ComplexJob(10);
+```
+
+The only requirement is that the type of the function, etc must be
+_compatible_ with the signature of the mock function, meaning that the
+latter's arguments can be implicitly converted to the corresponding
+arguments of the former, and the former's return type can be
+implicitly converted to that of the latter. So, you can invoke
+something whose type is _not_ exactly the same as the mock function,
+as long as it's safe to do so - nice, huh?
+
+## Invoking a Function/Method/Functor Without Arguments ##
+
+`Invoke()` is very useful for doing actions that are more complex. It
+passes the mock function's arguments to the function or functor being
+invoked such that the callee has the full context of the call to work
+with. If the invoked function is not interested in some or all of the
+arguments, it can simply ignore them.
+
+Yet, a common pattern is that a test author wants to invoke a function
+without the arguments of the mock function. `Invoke()` allows her to
+do that using a wrapper function that throws away the arguments before
+invoking an underlining nullary function. Needless to say, this can be
+tedious and obscures the intent of the test.
+
+`InvokeWithoutArgs()` solves this problem. It's like `Invoke()` except
+that it doesn't pass the mock function's arguments to the
+callee. Here's an example:
+
+```
+using ::testing::_;
+using ::testing::InvokeWithoutArgs;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(ComplexJob, bool(int n));
+};
+
+bool Job1() { ... }
+...
+
+  MockFoo foo;
+  EXPECT_CALL(foo, ComplexJob(_))
+      .WillOnce(InvokeWithoutArgs(Job1));
+
+  foo.ComplexJob(10);  // Invokes Job1().
+```
+
+## Invoking an Argument of the Mock Function ##
+
+Sometimes a mock function will receive a function pointer or a functor
+(in other words, a "callable") as an argument, e.g.
+
+```
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD2(DoThis, bool(int n, bool (*fp)(int)));
+};
+```
+
+and you may want to invoke this callable argument:
+
+```
+using ::testing::_;
+...
+  MockFoo foo;
+  EXPECT_CALL(foo, DoThis(_, _))
+      .WillOnce(...);
+  // Will execute (*fp)(5), where fp is the
+  // second argument DoThis() receives.
+```
+
+Arghh, you need to refer to a mock function argument but C++ has no
+lambda (yet), so you have to define your own action. :-( Or do you
+really?
+
+Well, Google Mock has an action to solve _exactly_ this problem:
+
+```
+  InvokeArgument<N>(arg_1, arg_2, ..., arg_m)
+```
+
+will invoke the `N`-th (0-based) argument the mock function receives,
+with `arg_1`, `arg_2`, ..., and `arg_m`. No matter if the argument is
+a function pointer or a functor, Google Mock handles them both.
+
+With that, you could write:
+
+```
+using ::testing::_;
+using ::testing::InvokeArgument;
+...
+  EXPECT_CALL(foo, DoThis(_, _))
+      .WillOnce(InvokeArgument<1>(5));
+  // Will execute (*fp)(5), where fp is the
+  // second argument DoThis() receives.
+```
+
+What if the callable takes an argument by reference? No problem - just
+wrap it inside `ByRef()`:
+
+```
+...
+  MOCK_METHOD1(Bar, bool(bool (*fp)(int, const Helper&)));
+...
+using ::testing::_;
+using ::testing::ByRef;
+using ::testing::InvokeArgument;
+...
+
+  MockFoo foo;
+  Helper helper;
+  ...
+  EXPECT_CALL(foo, Bar(_))
+      .WillOnce(InvokeArgument<0>(5, ByRef(helper)));
+  // ByRef(helper) guarantees that a reference to helper, not a copy of it,
+  // will be passed to the callable.
+```
+
+What if the callable takes an argument by reference and we do **not**
+wrap the argument in `ByRef()`? Then `InvokeArgument()` will _make a
+copy_ of the argument, and pass a _reference to the copy_, instead of
+a reference to the original value, to the callable. This is especially
+handy when the argument is a temporary value:
+
+```
+...
+  MOCK_METHOD1(DoThat, bool(bool (*f)(const double& x, const string& s)));
+...
+using ::testing::_;
+using ::testing::InvokeArgument;
+...
+
+  MockFoo foo;
+  ...
+  EXPECT_CALL(foo, DoThat(_))
+      .WillOnce(InvokeArgument<0>(5.0, string("Hi")));
+  // Will execute (*f)(5.0, string("Hi")), where f is the function pointer
+  // DoThat() receives.  Note that the values 5.0 and string("Hi") are
+  // temporary and dead once the EXPECT_CALL() statement finishes.  Yet
+  // it's fine to perform this action later, since a copy of the values
+  // are kept inside the InvokeArgument action.
+```
+
+## Ignoring an Action's Result ##
+
+Sometimes you have an action that returns _something_, but you need an
+action that returns `void` (perhaps you want to use it in a mock
+function that returns `void`, or perhaps it needs to be used in
+`DoAll()` and it's not the last in the list). `IgnoreResult()` lets
+you do that. For example:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::Return;
+
+int Process(const MyData& data);
+string DoSomething();
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(Abc, void(const MyData& data));
+  MOCK_METHOD0(Xyz, bool());
+};
+...
+
+  MockFoo foo;
+  EXPECT_CALL(foo, Abc(_))
+  // .WillOnce(Invoke(Process));
+  // The above line won't compile as Process() returns int but Abc() needs
+  // to return void.
+      .WillOnce(IgnoreResult(Invoke(Process)));
+
+  EXPECT_CALL(foo, Xyz())
+      .WillOnce(DoAll(IgnoreResult(Invoke(DoSomething)),
+      // Ignores the string DoSomething() returns.
+                      Return(true)));
+```
+
+Note that you **cannot** use `IgnoreResult()` on an action that already
+returns `void`. Doing so will lead to ugly compiler errors.
+
+## Selecting an Action's Arguments ##
+
+Say you have a mock function `Foo()` that takes seven arguments, and
+you have a custom action that you want to invoke when `Foo()` is
+called. Trouble is, the custom action only wants three arguments:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+...
+  MOCK_METHOD7(Foo, bool(bool visible, const string& name, int x, int y,
+                         const map<pair<int, int>, double>& weight,
+                         double min_weight, double max_wight));
+...
+
+bool IsVisibleInQuadrant1(bool visible, int x, int y) {
+  return visible && x >= 0 && y >= 0;
+}
+...
+
+  EXPECT_CALL(mock, Foo(_, _, _, _, _, _, _))
+      .WillOnce(Invoke(IsVisibleInQuadrant1));  // Uh, won't compile. :-(
+```
+
+To please the compiler God, you can to define an "adaptor" that has
+the same signature as `Foo()` and calls the custom action with the
+right arguments:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+bool MyIsVisibleInQuadrant1(bool visible, const string& name, int x, int y,
+                            const map<pair<int, int>, double>& weight,
+                            double min_weight, double max_wight) {
+  return IsVisibleInQuadrant1(visible, x, y);
+}
+...
+
+  EXPECT_CALL(mock, Foo(_, _, _, _, _, _, _))
+      .WillOnce(Invoke(MyIsVisibleInQuadrant1));  // Now it works.
+```
+
+But isn't this awkward?
+
+Google Mock provides a generic _action adaptor_, so you can spend your
+time minding more important business than writing your own
+adaptors. Here's the syntax:
+
+```
+  WithArgs<N1, N2, ..., Nk>(action)
+```
+
+creates an action that passes the arguments of the mock function at
+the given indices (0-based) to the inner `action` and performs
+it. Using `WithArgs`, our original example can be written as:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::WithArgs;
+...
+  EXPECT_CALL(mock, Foo(_, _, _, _, _, _, _))
+      .WillOnce(WithArgs<0, 2, 3>(Invoke(IsVisibleInQuadrant1)));
+      // No need to define your own adaptor.
+```
+
+For better readability, Google Mock also gives you:
+
+  * `WithoutArgs(action)` when the inner `action` takes _no_ argument, and
+  * `WithArg<N>(action)` (no `s` after `Arg`) when the inner `action` takes _one_ argument.
+
+As you may have realized, `InvokeWithoutArgs(...)` is just syntactic
+sugar for `WithoutArgs(Invoke(...))`.
+
+Here are more tips:
+
+  * The inner action used in `WithArgs` and friends does not have to be `Invoke()` -- it can be anything.
+  * You can repeat an argument in the argument list if necessary, e.g. `WithArgs<2, 3, 3, 5>(...)`.
+  * You can change the order of the arguments, e.g. `WithArgs<3, 2, 1>(...)`.
+  * The types of the selected arguments do _not_ have to match the signature of the inner action exactly. It works as long as they can be implicitly converted to the corresponding arguments of the inner action. For example, if the 4-th argument of the mock function is an `int` and `my_action` takes a `double`, `WithArg<4>(my_action)` will work.
+
+## Ignoring Arguments in Action Functions ##
+
+The selecting-an-action's-arguments recipe showed us one way to make a
+mock function and an action with incompatible argument lists fit
+together. The downside is that wrapping the action in
+`WithArgs<...>()` can get tedious for people writing the tests.
+
+If you are defining a function, method, or functor to be used with
+`Invoke*()`, and you are not interested in some of its arguments, an
+alternative to `WithArgs` is to declare the uninteresting arguments as
+`Unused`. This makes the definition less cluttered and less fragile in
+case the types of the uninteresting arguments change. It could also
+increase the chance the action function can be reused. For example,
+given
+
+```
+  MOCK_METHOD3(Foo, double(const string& label, double x, double y));
+  MOCK_METHOD3(Bar, double(int index, double x, double y));
+```
+
+instead of
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+double DistanceToOriginWithLabel(const string& label, double x, double y) {
+  return sqrt(x*x + y*y);
+}
+
+double DistanceToOriginWithIndex(int index, double x, double y) {
+  return sqrt(x*x + y*y);
+}
+...
+
+  EXEPCT_CALL(mock, Foo("abc", _, _))
+      .WillOnce(Invoke(DistanceToOriginWithLabel));
+  EXEPCT_CALL(mock, Bar(5, _, _))
+      .WillOnce(Invoke(DistanceToOriginWithIndex));
+```
+
+you could write
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::Unused;
+
+double DistanceToOrigin(Unused, double x, double y) {
+  return sqrt(x*x + y*y);
+}
+...
+
+  EXEPCT_CALL(mock, Foo("abc", _, _))
+      .WillOnce(Invoke(DistanceToOrigin));
+  EXEPCT_CALL(mock, Bar(5, _, _))
+      .WillOnce(Invoke(DistanceToOrigin));
+```
+
+## Sharing Actions ##
+
+Just like matchers, a Google Mock action object consists of a pointer
+to a ref-counted implementation object. Therefore copying actions is
+also allowed and very efficient. When the last action that references
+the implementation object dies, the implementation object will be
+deleted.
+
+If you have some complex action that you want to use again and again,
+you may not have to build it from scratch everytime. If the action
+doesn't have an internal state (i.e. if it always does the same thing
+no matter how many times it has been called), you can assign it to an
+action variable and use that variable repeatedly. For example:
+
+```
+  Action<bool(int*)> set_flag = DoAll(SetArgPointee<0>(5),
+                                      Return(true));
+  ... use set_flag in .WillOnce() and .WillRepeatedly() ...
+```
+
+However, if the action has its own state, you may be surprised if you
+share the action object. Suppose you have an action factory
+`IncrementCounter(init)` which creates an action that increments and
+returns a counter whose initial value is `init`, using two actions
+created from the same expression and using a shared action will
+exihibit different behaviors. Example:
+
+```
+  EXPECT_CALL(foo, DoThis())
+      .WillRepeatedly(IncrementCounter(0));
+  EXPECT_CALL(foo, DoThat())
+      .WillRepeatedly(IncrementCounter(0));
+  foo.DoThis();  // Returns 1.
+  foo.DoThis();  // Returns 2.
+  foo.DoThat();  // Returns 1 - Blah() uses a different
+                 // counter than Bar()'s.
+```
+
+versus
+
+```
+  Action<int()> increment = IncrementCounter(0);
+
+  EXPECT_CALL(foo, DoThis())
+      .WillRepeatedly(increment);
+  EXPECT_CALL(foo, DoThat())
+      .WillRepeatedly(increment);
+  foo.DoThis();  // Returns 1.
+  foo.DoThis();  // Returns 2.
+  foo.DoThat();  // Returns 3 - the counter is shared.
+```
+
+# Misc Recipes on Using Google Mock #
+
+## Mocking Methods That Use Move-Only Types ##
+
+C++11 introduced <em>move-only types</em>.  A move-only-typed value can be moved from one object to another, but cannot be copied.  `std::unique_ptr<T>` is probably the most commonly used move-only type.
+
+Mocking a method that takes and/or returns move-only types presents some challenges, but nothing insurmountable.  This recipe shows you how you can do it.
+
+Let’s say we are working on a fictional project that lets one post and share snippets called “buzzes”.  Your code uses these types:
+
+```
+enum class AccessLevel { kInternal, kPublic };
+
+class Buzz {
+ public:
+  explicit Buzz(AccessLevel access) { … }
+  ...
+};
+
+class Buzzer {
+ public:
+  virtual ~Buzzer() {}
+  virtual std::unique_ptr<Buzz> MakeBuzz(const std::string& text) = 0;
+  virtual bool ShareBuzz(std::unique_ptr<Buzz> buzz, Time timestamp) = 0;
+  ...
+};
+```
+
+A `Buzz` object represents a snippet being posted.  A class that implements the `Buzzer` interface is capable of creating and sharing `Buzz`.  Methods in `Buzzer` may return a `unique_ptr<Buzz>` or take a `unique_ptr<Buzz>`.  Now we need to mock `Buzzer` in our tests.
+
+To mock a method that returns a move-only type, you just use the familiar `MOCK_METHOD` syntax as usual:
+
+```
+class MockBuzzer : public Buzzer {
+ public:
+  MOCK_METHOD1(MakeBuzz, std::unique_ptr<Buzz>(const std::string& text));
+  …
+};
+```
+
+However, if you attempt to use the same `MOCK_METHOD` pattern to mock a method that takes a move-only parameter, you’ll get a compiler error currently:
+
+```
+  // Does NOT compile!
+  MOCK_METHOD2(ShareBuzz, bool(std::unique_ptr<Buzz> buzz, Time timestamp));
+```
+
+While it’s highly desirable to make this syntax just work, it’s not trivial and the work hasn’t been done yet.  Fortunately, there is a trick you can apply today to get something that works nearly as well as this.
+
+The trick, is to delegate the `ShareBuzz()` method to a mock method (let’s call it `DoShareBuzz()`) that does not take move-only parameters:
+
+```
+class MockBuzzer : public Buzzer {
+ public:
+  MOCK_METHOD1(MakeBuzz, std::unique_ptr<Buzz>(const std::string& text));
+  MOCK_METHOD2(DoShareBuzz, bool(Buzz* buzz, Time timestamp));
+  bool ShareBuzz(std::unique_ptr<Buzz> buzz, Time timestamp) {
+    return DoShareBuzz(buzz.get(), timestamp);
+  }
+};
+```
+
+Note that there's no need to define or declare `DoShareBuzz()` in a base class.  You only need to define it as a `MOCK_METHOD` in the mock class.
+
+Now that we have the mock class defined, we can use it in tests.  In the following code examples, we assume that we have defined a `MockBuzzer` object named `mock_buzzer_`:
+
+```
+  MockBuzzer mock_buzzer_;
+```
+
+First let’s see how we can set expectations on the `MakeBuzz()` method, which returns a `unique_ptr<Buzz>`.
+
+As usual, if you set an expectation without an action (i.e. the `.WillOnce()` or `.WillRepeated()` clause), when that expectation fires, the default action for that method will be taken.  Since `unique_ptr<>` has a default constructor that returns a null `unique_ptr`, that’s what you’ll get if you don’t specify an action:
+
+```
+  // Use the default action.
+  EXPECT_CALL(mock_buzzer_, MakeBuzz("hello"));
+
+  // Triggers the previous EXPECT_CALL.
+  EXPECT_EQ(nullptr, mock_buzzer_.MakeBuzz("hello"));
+```
+
+If you are not happy with the default action, you can tweak it.  Depending on what you need, you may either tweak the default action for a specific (mock object, mock method) combination using `ON_CALL()`, or you may tweak the default action for all mock methods that return a specific type.  The usage of `ON_CALL()` is similar to `EXPECT_CALL()`, so we’ll skip it and just explain how to do the latter (tweaking the default action for a specific return type).  You do this via the `DefaultValue<>::SetFactory()` and `DefaultValue<>::Clear()` API:
+
+```
+  // Sets the default action for return type std::unique_ptr<Buzz> to
+  // creating a new Buzz every time.
+  DefaultValue<std::unique_ptr<Buzz>>::SetFactory(
+      [] { return MakeUnique<Buzz>(AccessLevel::kInternal); });
+
+  // When this fires, the default action of MakeBuzz() will run, which
+  // will return a new Buzz object.
+  EXPECT_CALL(mock_buzzer_, MakeBuzz("hello")).Times(AnyNumber());
+
+  auto buzz1 = mock_buzzer_.MakeBuzz("hello");
+  auto buzz2 = mock_buzzer_.MakeBuzz("hello");
+  EXPECT_NE(nullptr, buzz1);
+  EXPECT_NE(nullptr, buzz2);
+  EXPECT_NE(buzz1, buzz2);
+
+  // Resets the default action for return type std::unique_ptr<Buzz>,
+  // to avoid interfere with other tests.
+  DefaultValue<std::unique_ptr<Buzz>>::Clear();
+```
+
+What if you want the method to do something other than the default action?  If you just need to return a pre-defined move-only value, you can use the `Return(ByMove(...))` action:
+
+```
+  // When this fires, the unique_ptr<> specified by ByMove(...) will
+  // be returned.
+  EXPECT_CALL(mock_buzzer_, MakeBuzz("world"))
+      .WillOnce(Return(ByMove(MakeUnique<Buzz>(AccessLevel::kInternal))));
+
+  EXPECT_NE(nullptr, mock_buzzer_.MakeBuzz("world"));
+```
+
+Note that `ByMove()` is essential here - if you drop it, the code won’t compile.
+
+Quiz time!  What do you think will happen if a `Return(ByMove(...))` action is performed more than once (e.g. you write `….WillRepeatedly(Return(ByMove(...)));`)?  Come think of it, after the first time the action runs, the source value will be consumed (since it’s a move-only value), so the next time around, there’s no value to move from -- you’ll get a run-time error that `Return(ByMove(...))` can only be run once.
+
+If you need your mock method to do more than just moving a pre-defined value, remember that you can always use `Invoke()` to call a lambda or a callable object, which can do pretty much anything you want:
+
+```
+  EXPECT_CALL(mock_buzzer_, MakeBuzz("x"))
+      .WillRepeatedly(Invoke([](const std::string& text) {
+        return std::make_unique<Buzz>(AccessLevel::kInternal);
+      }));
+
+  EXPECT_NE(nullptr, mock_buzzer_.MakeBuzz("x"));
+  EXPECT_NE(nullptr, mock_buzzer_.MakeBuzz("x"));
+```
+
+Every time this `EXPECT_CALL` fires, a new `unique_ptr<Buzz>` will be created and returned.  You cannot do this with `Return(ByMove(...))`.
+
+Now there’s one topic we haven’t covered: how do you set expectations on `ShareBuzz()`, which takes a move-only-typed parameter?  The answer is you don’t.  Instead, you set expectations on the `DoShareBuzz()` mock method (remember that we defined a `MOCK_METHOD` for `DoShareBuzz()`, not `ShareBuzz()`):
+
+```
+  EXPECT_CALL(mock_buzzer_, DoShareBuzz(NotNull(), _));
+
+  // When one calls ShareBuzz() on the MockBuzzer like this, the call is
+  // forwarded to DoShareBuzz(), which is mocked.  Therefore this statement
+  // will trigger the above EXPECT_CALL.
+  mock_buzzer_.ShareBuzz(MakeUnique&lt;Buzz&gt;(AccessLevel::kInternal),
+                         ::base::Now());
+```
+
+Some of you may have spotted one problem with this approach: the `DoShareBuzz()` mock method differs from the real `ShareBuzz()` method in that it cannot take ownership of the buzz parameter - `ShareBuzz()` will always delete buzz after `DoShareBuzz()` returns.  What if you need to save the buzz object somewhere for later use when `ShareBuzz()` is called?  Indeed, you'd be stuck.
+
+Another problem with the `DoShareBuzz()` we had is that it can surprise people reading or maintaining the test, as one would expect that `DoShareBuzz()` has (logically) the same contract as `ShareBuzz()`.
+
+Fortunately, these problems can be fixed with a bit more code.  Let's try to get it right this time:
+
+```
+class MockBuzzer : public Buzzer {
+ public:
+  MockBuzzer() {
+    // Since DoShareBuzz(buzz, time) is supposed to take ownership of
+    // buzz, define a default behavior for DoShareBuzz(buzz, time) to
+    // delete buzz.
+    ON_CALL(*this, DoShareBuzz(_, _))
+        .WillByDefault(Invoke([](Buzz* buzz, Time timestamp) {
+          delete buzz;
+          return true;
+        }));
+  }
+
+  MOCK_METHOD1(MakeBuzz, std::unique_ptr<Buzz>(const std::string& text));
+
+  // Takes ownership of buzz.
+  MOCK_METHOD2(DoShareBuzz, bool(Buzz* buzz, Time timestamp));
+  bool ShareBuzz(std::unique_ptr<Buzz> buzz, Time timestamp) {
+    return DoShareBuzz(buzz.release(), timestamp);
+  }
+};
+```
+
+Now, the mock `DoShareBuzz()` method is free to save the buzz argument for later use if this is what you want:
+
+```
+  std::unique_ptr<Buzz> intercepted_buzz;
+  EXPECT_CALL(mock_buzzer_, DoShareBuzz(NotNull(), _))
+      .WillOnce(Invoke([&amp;intercepted_buzz](Buzz* buzz, Time timestamp) {
+        // Save buzz in intercepted_buzz for analysis later.
+        intercepted_buzz.reset(buzz);
+        return false;
+      }));
+
+  mock_buzzer_.ShareBuzz(std::make_unique<Buzz>(AccessLevel::kInternal),
+                         Now());
+  EXPECT_NE(nullptr, intercepted_buzz);
+```
+
+Using the tricks covered in this recipe, you are now able to mock methods that take and/or return move-only types.  Put your newly-acquired power to good use - when you design a new API, you can now feel comfortable using `unique_ptrs` as appropriate, without fearing that doing so will compromise your tests.
+
+## Making the Compilation Faster ##
+
+Believe it or not, the _vast majority_ of the time spent on compiling
+a mock class is in generating its constructor and destructor, as they
+perform non-trivial tasks (e.g. verification of the
+expectations). What's more, mock methods with different signatures
+have different types and thus their constructors/destructors need to
+be generated by the compiler separately. As a result, if you mock many
+different types of methods, compiling your mock class can get really
+slow.
+
+If you are experiencing slow compilation, you can move the definition
+of your mock class' constructor and destructor out of the class body
+and into a `.cpp` file. This way, even if you `#include` your mock
+class in N files, the compiler only needs to generate its constructor
+and destructor once, resulting in a much faster compilation.
+
+Let's illustrate the idea using an example. Here's the definition of a
+mock class before applying this recipe:
+
+```
+// File mock_foo.h.
+...
+class MockFoo : public Foo {
+ public:
+  // Since we don't declare the constructor or the destructor,
+  // the compiler will generate them in every translation unit
+  // where this mock class is used.
+
+  MOCK_METHOD0(DoThis, int());
+  MOCK_METHOD1(DoThat, bool(const char* str));
+  ... more mock methods ...
+};
+```
+
+After the change, it would look like:
+
+```
+// File mock_foo.h.
+...
+class MockFoo : public Foo {
+ public:
+  // The constructor and destructor are declared, but not defined, here.
+  MockFoo();
+  virtual ~MockFoo();
+
+  MOCK_METHOD0(DoThis, int());
+  MOCK_METHOD1(DoThat, bool(const char* str));
+  ... more mock methods ...
+};
+```
+and
+```
+// File mock_foo.cpp.
+#include "path/to/mock_foo.h"
+
+// The definitions may appear trivial, but the functions actually do a
+// lot of things through the constructors/destructors of the member
+// variables used to implement the mock methods.
+MockFoo::MockFoo() {}
+MockFoo::~MockFoo() {}
+```
+
+## Forcing a Verification ##
+
+When it's being destoyed, your friendly mock object will automatically
+verify that all expectations on it have been satisfied, and will
+generate [Google Test](../../googletest/) failures
+if not. This is convenient as it leaves you with one less thing to
+worry about. That is, unless you are not sure if your mock object will
+be destoyed.
+
+How could it be that your mock object won't eventually be destroyed?
+Well, it might be created on the heap and owned by the code you are
+testing. Suppose there's a bug in that code and it doesn't delete the
+mock object properly - you could end up with a passing test when
+there's actually a bug.
+
+Using a heap checker is a good idea and can alleviate the concern, but
+its implementation may not be 100% reliable. So, sometimes you do want
+to _force_ Google Mock to verify a mock object before it is
+(hopefully) destructed. You can do this with
+`Mock::VerifyAndClearExpectations(&mock_object)`:
+
+```
+TEST(MyServerTest, ProcessesRequest) {
+  using ::testing::Mock;
+
+  MockFoo* const foo = new MockFoo;
+  EXPECT_CALL(*foo, ...)...;
+  // ... other expectations ...
+
+  // server now owns foo.
+  MyServer server(foo);
+  server.ProcessRequest(...);
+
+  // In case that server's destructor will forget to delete foo,
+  // this will verify the expectations anyway.
+  Mock::VerifyAndClearExpectations(foo);
+}  // server is destroyed when it goes out of scope here.
+```
+
+**Tip:** The `Mock::VerifyAndClearExpectations()` function returns a
+`bool` to indicate whether the verification was successful (`true` for
+yes), so you can wrap that function call inside a `ASSERT_TRUE()` if
+there is no point going further when the verification has failed.
+
+## Using Check Points ##
+
+Sometimes you may want to "reset" a mock object at various check
+points in your test: at each check point, you verify that all existing
+expectations on the mock object have been satisfied, and then you set
+some new expectations on it as if it's newly created. This allows you
+to work with a mock object in "phases" whose sizes are each
+manageable.
+
+One such scenario is that in your test's `SetUp()` function, you may
+want to put the object you are testing into a certain state, with the
+help from a mock object. Once in the desired state, you want to clear
+all expectations on the mock, such that in the `TEST_F` body you can
+set fresh expectations on it.
+
+As you may have figured out, the `Mock::VerifyAndClearExpectations()`
+function we saw in the previous recipe can help you here. Or, if you
+are using `ON_CALL()` to set default actions on the mock object and
+want to clear the default actions as well, use
+`Mock::VerifyAndClear(&mock_object)` instead. This function does what
+`Mock::VerifyAndClearExpectations(&mock_object)` does and returns the
+same `bool`, **plus** it clears the `ON_CALL()` statements on
+`mock_object` too.
+
+Another trick you can use to achieve the same effect is to put the
+expectations in sequences and insert calls to a dummy "check-point"
+function at specific places. Then you can verify that the mock
+function calls do happen at the right time. For example, if you are
+exercising code:
+
+```
+Foo(1);
+Foo(2);
+Foo(3);
+```
+
+and want to verify that `Foo(1)` and `Foo(3)` both invoke
+`mock.Bar("a")`, but `Foo(2)` doesn't invoke anything. You can write:
+
+```
+using ::testing::MockFunction;
+
+TEST(FooTest, InvokesBarCorrectly) {
+  MyMock mock;
+  // Class MockFunction<F> has exactly one mock method.  It is named
+  // Call() and has type F.
+  MockFunction<void(string check_point_name)> check;
+  {
+    InSequence s;
+
+    EXPECT_CALL(mock, Bar("a"));
+    EXPECT_CALL(check, Call("1"));
+    EXPECT_CALL(check, Call("2"));
+    EXPECT_CALL(mock, Bar("a"));
+  }
+  Foo(1);
+  check.Call("1");
+  Foo(2);
+  check.Call("2");
+  Foo(3);
+}
+```
+
+The expectation spec says that the first `Bar("a")` must happen before
+check point "1", the second `Bar("a")` must happen after check point "2",
+and nothing should happen between the two check points. The explicit
+check points make it easy to tell which `Bar("a")` is called by which
+call to `Foo()`.
+
+## Mocking Destructors ##
+
+Sometimes you want to make sure a mock object is destructed at the
+right time, e.g. after `bar->A()` is called but before `bar->B()` is
+called. We already know that you can specify constraints on the order
+of mock function calls, so all we need to do is to mock the destructor
+of the mock function.
+
+This sounds simple, except for one problem: a destructor is a special
+function with special syntax and special semantics, and the
+`MOCK_METHOD0` macro doesn't work for it:
+
+```
+  MOCK_METHOD0(~MockFoo, void());  // Won't compile!
+```
+
+The good news is that you can use a simple pattern to achieve the same
+effect. First, add a mock function `Die()` to your mock class and call
+it in the destructor, like this:
+
+```
+class MockFoo : public Foo {
+  ...
+  // Add the following two lines to the mock class.
+  MOCK_METHOD0(Die, void());
+  virtual ~MockFoo() { Die(); }
+};
+```
+
+(If the name `Die()` clashes with an existing symbol, choose another
+name.) Now, we have translated the problem of testing when a `MockFoo`
+object dies to testing when its `Die()` method is called:
+
+```
+  MockFoo* foo = new MockFoo;
+  MockBar* bar = new MockBar;
+  ...
+  {
+    InSequence s;
+
+    // Expects *foo to die after bar->A() and before bar->B().
+    EXPECT_CALL(*bar, A());
+    EXPECT_CALL(*foo, Die());
+    EXPECT_CALL(*bar, B());
+  }
+```
+
+And that's that.
+
+## Using Google Mock and Threads ##
+
+**IMPORTANT NOTE:** What we describe in this recipe is **ONLY** true on
+platforms where Google Mock is thread-safe. Currently these are only
+platforms that support the pthreads library (this includes Linux and Mac).
+To make it thread-safe on other platforms we only need to implement
+some synchronization operations in `"gtest/internal/gtest-port.h"`.
+
+In a **unit** test, it's best if you could isolate and test a piece of
+code in a single-threaded context. That avoids race conditions and
+dead locks, and makes debugging your test much easier.
+
+Yet many programs are multi-threaded, and sometimes to test something
+we need to pound on it from more than one thread. Google Mock works
+for this purpose too.
+
+Remember the steps for using a mock:
+
+  1. Create a mock object `foo`.
+  1. Set its default actions and expectations using `ON_CALL()` and `EXPECT_CALL()`.
+  1. The code under test calls methods of `foo`.
+  1. Optionally, verify and reset the mock.
+  1. Destroy the mock yourself, or let the code under test destroy it. The destructor will automatically verify it.
+
+If you follow the following simple rules, your mocks and threads can
+live happily together:
+
+  * Execute your _test code_ (as opposed to the code being tested) in _one_ thread. This makes your test easy to follow.
+  * Obviously, you can do step #1 without locking.
+  * When doing step #2 and #5, make sure no other thread is accessing `foo`. Obvious too, huh?
+  * #3 and #4 can be done either in one thread or in multiple threads - anyway you want. Google Mock takes care of the locking, so you don't have to do any - unless required by your test logic.
+
+If you violate the rules (for example, if you set expectations on a
+mock while another thread is calling its methods), you get undefined
+behavior. That's not fun, so don't do it.
+
+Google Mock guarantees that the action for a mock function is done in
+the same thread that called the mock function. For example, in
+
+```
+  EXPECT_CALL(mock, Foo(1))
+      .WillOnce(action1);
+  EXPECT_CALL(mock, Foo(2))
+      .WillOnce(action2);
+```
+
+if `Foo(1)` is called in thread 1 and `Foo(2)` is called in thread 2,
+Google Mock will execute `action1` in thread 1 and `action2` in thread
+2.
+
+Google Mock does _not_ impose a sequence on actions performed in
+different threads (doing so may create deadlocks as the actions may
+need to cooperate). This means that the execution of `action1` and
+`action2` in the above example _may_ interleave. If this is a problem,
+you should add proper synchronization logic to `action1` and `action2`
+to make the test thread-safe.
+
+
+Also, remember that `DefaultValue<T>` is a global resource that
+potentially affects _all_ living mock objects in your
+program. Naturally, you won't want to mess with it from multiple
+threads or when there still are mocks in action.
+
+## Controlling How Much Information Google Mock Prints ##
+
+When Google Mock sees something that has the potential of being an
+error (e.g. a mock function with no expectation is called, a.k.a. an
+uninteresting call, which is allowed but perhaps you forgot to
+explicitly ban the call), it prints some warning messages, including
+the arguments of the function and the return value. Hopefully this
+will remind you to take a look and see if there is indeed a problem.
+
+Sometimes you are confident that your tests are correct and may not
+appreciate such friendly messages. Some other times, you are debugging
+your tests or learning about the behavior of the code you are testing,
+and wish you could observe every mock call that happens (including
+argument values and the return value). Clearly, one size doesn't fit
+all.
+
+You can control how much Google Mock tells you using the
+`--gmock_verbose=LEVEL` command-line flag, where `LEVEL` is a string
+with three possible values:
+
+  * `info`: Google Mock will print all informational messages, warnings, and errors (most verbose). At this setting, Google Mock will also log any calls to the `ON_CALL/EXPECT_CALL` macros.
+  * `warning`: Google Mock will print both warnings and errors (less verbose). This is the default.
+  * `error`: Google Mock will print errors only (least verbose).
+
+Alternatively, you can adjust the value of that flag from within your
+tests like so:
+
+```
+  ::testing::FLAGS_gmock_verbose = "error";
+```
+
+Now, judiciously use the right flag to enable Google Mock serve you better!
+
+## Gaining Super Vision into Mock Calls ##
+
+You have a test using Google Mock. It fails: Google Mock tells you
+that some expectations aren't satisfied. However, you aren't sure why:
+Is there a typo somewhere in the matchers? Did you mess up the order
+of the `EXPECT_CALL`s? Or is the code under test doing something
+wrong?  How can you find out the cause?
+
+Won't it be nice if you have X-ray vision and can actually see the
+trace of all `EXPECT_CALL`s and mock method calls as they are made?
+For each call, would you like to see its actual argument values and
+which `EXPECT_CALL` Google Mock thinks it matches?
+
+You can unlock this power by running your test with the
+`--gmock_verbose=info` flag. For example, given the test program:
+
+```
+using testing::_;
+using testing::HasSubstr;
+using testing::Return;
+
+class MockFoo {
+ public:
+  MOCK_METHOD2(F, void(const string& x, const string& y));
+};
+
+TEST(Foo, Bar) {
+  MockFoo mock;
+  EXPECT_CALL(mock, F(_, _)).WillRepeatedly(Return());
+  EXPECT_CALL(mock, F("a", "b"));
+  EXPECT_CALL(mock, F("c", HasSubstr("d")));
+
+  mock.F("a", "good");
+  mock.F("a", "b");
+}
+```
+
+if you run it with `--gmock_verbose=info`, you will see this output:
+
+```
+[ RUN      ] Foo.Bar
+
+foo_test.cc:14: EXPECT_CALL(mock, F(_, _)) invoked
+foo_test.cc:15: EXPECT_CALL(mock, F("a", "b")) invoked
+foo_test.cc:16: EXPECT_CALL(mock, F("c", HasSubstr("d"))) invoked
+foo_test.cc:14: Mock function call matches EXPECT_CALL(mock, F(_, _))...
+    Function call: F(@0x7fff7c8dad40"a", @0x7fff7c8dad10"good")
+foo_test.cc:15: Mock function call matches EXPECT_CALL(mock, F("a", "b"))...
+    Function call: F(@0x7fff7c8dada0"a", @0x7fff7c8dad70"b")
+foo_test.cc:16: Failure
+Actual function call count doesn't match EXPECT_CALL(mock, F("c", HasSubstr("d")))...
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] Foo.Bar
+```
+
+Suppose the bug is that the `"c"` in the third `EXPECT_CALL` is a typo
+and should actually be `"a"`. With the above message, you should see
+that the actual `F("a", "good")` call is matched by the first
+`EXPECT_CALL`, not the third as you thought. From that it should be
+obvious that the third `EXPECT_CALL` is written wrong. Case solved.
+
+## Running Tests in Emacs ##
+
+If you build and run your tests in Emacs, the source file locations of
+Google Mock and [Google Test](../../googletest/)
+errors will be highlighted. Just press `<Enter>` on one of them and
+you'll be taken to the offending line. Or, you can just type `C-x ``
+to jump to the next error.
+
+To make it even easier, you can add the following lines to your
+`~/.emacs` file:
+
+```
+(global-set-key "\M-m"   'compile)  ; m is for make
+(global-set-key [M-down] 'next-error)
+(global-set-key [M-up]   '(lambda () (interactive) (next-error -1)))
+```
+
+Then you can type `M-m` to start a build, or `M-up`/`M-down` to move
+back and forth between errors.
+
+## Fusing Google Mock Source Files ##
+
+Google Mock's implementation consists of dozens of files (excluding
+its own tests).  Sometimes you may want them to be packaged up in
+fewer files instead, such that you can easily copy them to a new
+machine and start hacking there.  For this we provide an experimental
+Python script `fuse_gmock_files.py` in the `scripts/` directory
+(starting with release 1.2.0).  Assuming you have Python 2.4 or above
+installed on your machine, just go to that directory and run
+```
+python fuse_gmock_files.py OUTPUT_DIR
+```
+
+and you should see an `OUTPUT_DIR` directory being created with files
+`gtest/gtest.h`, `gmock/gmock.h`, and `gmock-gtest-all.cc` in it.
+These three files contain everything you need to use Google Mock (and
+Google Test).  Just copy them to anywhere you want and you are ready
+to write tests and use mocks.  You can use the
+[scrpts/test/Makefile](../scripts/test/Makefile) file as an example on how to compile your tests
+against them.
+
+# Extending Google Mock #
+
+## Writing New Matchers Quickly ##
+
+The `MATCHER*` family of macros can be used to define custom matchers
+easily.  The syntax:
+
+```
+MATCHER(name, description_string_expression) { statements; }
+```
+
+will define a matcher with the given name that executes the
+statements, which must return a `bool` to indicate if the match
+succeeds.  Inside the statements, you can refer to the value being
+matched by `arg`, and refer to its type by `arg_type`.
+
+The description string is a `string`-typed expression that documents
+what the matcher does, and is used to generate the failure message
+when the match fails.  It can (and should) reference the special
+`bool` variable `negation`, and should evaluate to the description of
+the matcher when `negation` is `false`, or that of the matcher's
+negation when `negation` is `true`.
+
+For convenience, we allow the description string to be empty (`""`),
+in which case Google Mock will use the sequence of words in the
+matcher name as the description.
+
+For example:
+```
+MATCHER(IsDivisibleBy7, "") { return (arg % 7) == 0; }
+```
+allows you to write
+```
+  // Expects mock_foo.Bar(n) to be called where n is divisible by 7.
+  EXPECT_CALL(mock_foo, Bar(IsDivisibleBy7()));
+```
+or,
+```
+using ::testing::Not;
+...
+  EXPECT_THAT(some_expression, IsDivisibleBy7());
+  EXPECT_THAT(some_other_expression, Not(IsDivisibleBy7()));
+```
+If the above assertions fail, they will print something like:
+```
+  Value of: some_expression
+  Expected: is divisible by 7
+    Actual: 27
+...
+  Value of: some_other_expression
+  Expected: not (is divisible by 7)
+    Actual: 21
+```
+where the descriptions `"is divisible by 7"` and `"not (is divisible
+by 7)"` are automatically calculated from the matcher name
+`IsDivisibleBy7`.
+
+As you may have noticed, the auto-generated descriptions (especially
+those for the negation) may not be so great. You can always override
+them with a string expression of your own:
+```
+MATCHER(IsDivisibleBy7, std::string(negation ? "isn't" : "is") +
+                        " divisible by 7") {
+  return (arg % 7) == 0;
+}
+```
+
+Optionally, you can stream additional information to a hidden argument
+named `result_listener` to explain the match result. For example, a
+better definition of `IsDivisibleBy7` is:
+```
+MATCHER(IsDivisibleBy7, "") {
+  if ((arg % 7) == 0)
+    return true;
+
+  *result_listener << "the remainder is " << (arg % 7);
+  return false;
+}
+```
+
+With this definition, the above assertion will give a better message:
+```
+  Value of: some_expression
+  Expected: is divisible by 7
+    Actual: 27 (the remainder is 6)
+```
+
+You should let `MatchAndExplain()` print _any additional information_
+that can help a user understand the match result. Note that it should
+explain why the match succeeds in case of a success (unless it's
+obvious) - this is useful when the matcher is used inside
+`Not()`. There is no need to print the argument value itself, as
+Google Mock already prints it for you.
+
+**Notes:**
+
+  1. The type of the value being matched (`arg_type`) is determined by the context in which you use the matcher and is supplied to you by the compiler, so you don't need to worry about declaring it (nor can you).  This allows the matcher to be polymorphic.  For example, `IsDivisibleBy7()` can be used to match any type where the value of `(arg % 7) == 0` can be implicitly converted to a `bool`.  In the `Bar(IsDivisibleBy7())` example above, if method `Bar()` takes an `int`, `arg_type` will be `int`; if it takes an `unsigned long`, `arg_type` will be `unsigned long`; and so on.
+  1. Google Mock doesn't guarantee when or how many times a matcher will be invoked. Therefore the matcher logic must be _purely functional_ (i.e. it cannot have any side effect, and the result must not depend on anything other than the value being matched and the matcher parameters). This requirement must be satisfied no matter how you define the matcher (e.g. using one of the methods described in the following recipes). In particular, a matcher can never call a mock function, as that will affect the state of the mock object and Google Mock.
+
+## Writing New Parameterized Matchers Quickly ##
+
+Sometimes you'll want to define a matcher that has parameters.  For that you
+can use the macro:
+```
+MATCHER_P(name, param_name, description_string) { statements; }
+```
+where the description string can be either `""` or a string expression
+that references `negation` and `param_name`.
+
+For example:
+```
+MATCHER_P(HasAbsoluteValue, value, "") { return abs(arg) == value; }
+```
+will allow you to write:
+```
+  EXPECT_THAT(Blah("a"), HasAbsoluteValue(n));
+```
+which may lead to this message (assuming `n` is 10):
+```
+  Value of: Blah("a")
+  Expected: has absolute value 10
+    Actual: -9
+```
+
+Note that both the matcher description and its parameter are
+printed, making the message human-friendly.
+
+In the matcher definition body, you can write `foo_type` to
+reference the type of a parameter named `foo`.  For example, in the
+body of `MATCHER_P(HasAbsoluteValue, value)` above, you can write
+`value_type` to refer to the type of `value`.
+
+Google Mock also provides `MATCHER_P2`, `MATCHER_P3`, ..., up to
+`MATCHER_P10` to support multi-parameter matchers:
+```
+MATCHER_Pk(name, param_1, ..., param_k, description_string) { statements; }
+```
+
+Please note that the custom description string is for a particular
+**instance** of the matcher, where the parameters have been bound to
+actual values.  Therefore usually you'll want the parameter values to
+be part of the description.  Google Mock lets you do that by
+referencing the matcher parameters in the description string
+expression.
+
+For example,
+```
+  using ::testing::PrintToString;
+  MATCHER_P2(InClosedRange, low, hi,
+             std::string(negation ? "isn't" : "is") + " in range [" +
+             PrintToString(low) + ", " + PrintToString(hi) + "]") {
+    return low <= arg && arg <= hi;
+  }
+  ...
+  EXPECT_THAT(3, InClosedRange(4, 6));
+```
+would generate a failure that contains the message:
+```
+  Expected: is in range [4, 6]
+```
+
+If you specify `""` as the description, the failure message will
+contain the sequence of words in the matcher name followed by the
+parameter values printed as a tuple.  For example,
+```
+  MATCHER_P2(InClosedRange, low, hi, "") { ... }
+  ...
+  EXPECT_THAT(3, InClosedRange(4, 6));
+```
+would generate a failure that contains the text:
+```
+  Expected: in closed range (4, 6)
+```
+
+For the purpose of typing, you can view
+```
+MATCHER_Pk(Foo, p1, ..., pk, description_string) { ... }
+```
+as shorthand for
+```
+template <typename p1_type, ..., typename pk_type>
+FooMatcherPk<p1_type, ..., pk_type>
+Foo(p1_type p1, ..., pk_type pk) { ... }
+```
+
+When you write `Foo(v1, ..., vk)`, the compiler infers the types of
+the parameters `v1`, ..., and `vk` for you.  If you are not happy with
+the result of the type inference, you can specify the types by
+explicitly instantiating the template, as in `Foo<long, bool>(5, false)`.
+As said earlier, you don't get to (or need to) specify
+`arg_type` as that's determined by the context in which the matcher
+is used.
+
+You can assign the result of expression `Foo(p1, ..., pk)` to a
+variable of type `FooMatcherPk<p1_type, ..., pk_type>`.  This can be
+useful when composing matchers.  Matchers that don't have a parameter
+or have only one parameter have special types: you can assign `Foo()`
+to a `FooMatcher`-typed variable, and assign `Foo(p)` to a
+`FooMatcherP<p_type>`-typed variable.
+
+While you can instantiate a matcher template with reference types,
+passing the parameters by pointer usually makes your code more
+readable.  If, however, you still want to pass a parameter by
+reference, be aware that in the failure message generated by the
+matcher you will see the value of the referenced object but not its
+address.
+
+You can overload matchers with different numbers of parameters:
+```
+MATCHER_P(Blah, a, description_string_1) { ... }
+MATCHER_P2(Blah, a, b, description_string_2) { ... }
+```
+
+While it's tempting to always use the `MATCHER*` macros when defining
+a new matcher, you should also consider implementing
+`MatcherInterface` or using `MakePolymorphicMatcher()` instead (see
+the recipes that follow), especially if you need to use the matcher a
+lot.  While these approaches require more work, they give you more
+control on the types of the value being matched and the matcher
+parameters, which in general leads to better compiler error messages
+that pay off in the long run.  They also allow overloading matchers
+based on parameter types (as opposed to just based on the number of
+parameters).
+
+## Writing New Monomorphic Matchers ##
+
+A matcher of argument type `T` implements
+`::testing::MatcherInterface<T>` and does two things: it tests whether a
+value of type `T` matches the matcher, and can describe what kind of
+values it matches. The latter ability is used for generating readable
+error messages when expectations are violated.
+
+The interface looks like this:
+
+```
+class MatchResultListener {
+ public:
+  ...
+  // Streams x to the underlying ostream; does nothing if the ostream
+  // is NULL.
+  template <typename T>
+  MatchResultListener& operator<<(const T& x);
+
+  // Returns the underlying ostream.
+  ::std::ostream* stream();
+};
+
+template <typename T>
+class MatcherInterface {
+ public:
+  virtual ~MatcherInterface();
+
+  // Returns true iff the matcher matches x; also explains the match
+  // result to 'listener'.
+  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const = 0;
+
+  // Describes this matcher to an ostream.
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+
+  // Describes the negation of this matcher to an ostream.
+  virtual void DescribeNegationTo(::std::ostream* os) const;
+};
+```
+
+If you need a custom matcher but `Truly()` is not a good option (for
+example, you may not be happy with the way `Truly(predicate)`
+describes itself, or you may want your matcher to be polymorphic as
+`Eq(value)` is), you can define a matcher to do whatever you want in
+two steps: first implement the matcher interface, and then define a
+factory function to create a matcher instance. The second step is not
+strictly needed but it makes the syntax of using the matcher nicer.
+
+For example, you can define a matcher to test whether an `int` is
+divisible by 7 and then use it like this:
+```
+using ::testing::MakeMatcher;
+using ::testing::Matcher;
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+
+class DivisibleBy7Matcher : public MatcherInterface<int> {
+ public:
+  virtual bool MatchAndExplain(int n, MatchResultListener* listener) const {
+    return (n % 7) == 0;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "is divisible by 7";
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "is not divisible by 7";
+  }
+};
+
+inline Matcher<int> DivisibleBy7() {
+  return MakeMatcher(new DivisibleBy7Matcher);
+}
+...
+
+  EXPECT_CALL(foo, Bar(DivisibleBy7()));
+```
+
+You may improve the matcher message by streaming additional
+information to the `listener` argument in `MatchAndExplain()`:
+
+```
+class DivisibleBy7Matcher : public MatcherInterface<int> {
+ public:
+  virtual bool MatchAndExplain(int n,
+                               MatchResultListener* listener) const {
+    const int remainder = n % 7;
+    if (remainder != 0) {
+      *listener << "the remainder is " << remainder;
+    }
+    return remainder == 0;
+  }
+  ...
+};
+```
+
+Then, `EXPECT_THAT(x, DivisibleBy7());` may general a message like this:
+```
+Value of: x
+Expected: is divisible by 7
+  Actual: 23 (the remainder is 2)
+```
+
+## Writing New Polymorphic Matchers ##
+
+You've learned how to write your own matchers in the previous
+recipe. Just one problem: a matcher created using `MakeMatcher()` only
+works for one particular type of arguments. If you want a
+_polymorphic_ matcher that works with arguments of several types (for
+instance, `Eq(x)` can be used to match a `value` as long as `value` ==
+`x` compiles -- `value` and `x` don't have to share the same type),
+you can learn the trick from `"gmock/gmock-matchers.h"` but it's a bit
+involved.
+
+Fortunately, most of the time you can define a polymorphic matcher
+easily with the help of `MakePolymorphicMatcher()`. Here's how you can
+define `NotNull()` as an example:
+
+```
+using ::testing::MakePolymorphicMatcher;
+using ::testing::MatchResultListener;
+using ::testing::NotNull;
+using ::testing::PolymorphicMatcher;
+
+class NotNullMatcher {
+ public:
+  // To implement a polymorphic matcher, first define a COPYABLE class
+  // that has three members MatchAndExplain(), DescribeTo(), and
+  // DescribeNegationTo(), like the following.
+
+  // In this example, we want to use NotNull() with any pointer, so
+  // MatchAndExplain() accepts a pointer of any type as its first argument.
+  // In general, you can define MatchAndExplain() as an ordinary method or
+  // a method template, or even overload it.
+  template <typename T>
+  bool MatchAndExplain(T* p,
+                       MatchResultListener* /* listener */) const {
+    return p != NULL;
+  }
+
+  // Describes the property of a value matching this matcher.
+  void DescribeTo(::std::ostream* os) const { *os << "is not NULL"; }
+
+  // Describes the property of a value NOT matching this matcher.
+  void DescribeNegationTo(::std::ostream* os) const { *os << "is NULL"; }
+};
+
+// To construct a polymorphic matcher, pass an instance of the class
+// to MakePolymorphicMatcher().  Note the return type.
+inline PolymorphicMatcher<NotNullMatcher> NotNull() {
+  return MakePolymorphicMatcher(NotNullMatcher());
+}
+...
+
+  EXPECT_CALL(foo, Bar(NotNull()));  // The argument must be a non-NULL pointer.
+```
+
+**Note:** Your polymorphic matcher class does **not** need to inherit from
+`MatcherInterface` or any other class, and its methods do **not** need
+to be virtual.
+
+Like in a monomorphic matcher, you may explain the match result by
+streaming additional information to the `listener` argument in
+`MatchAndExplain()`.
+
+## Writing New Cardinalities ##
+
+A cardinality is used in `Times()` to tell Google Mock how many times
+you expect a call to occur. It doesn't have to be exact. For example,
+you can say `AtLeast(5)` or `Between(2, 4)`.
+
+If the built-in set of cardinalities doesn't suit you, you are free to
+define your own by implementing the following interface (in namespace
+`testing`):
+
+```
+class CardinalityInterface {
+ public:
+  virtual ~CardinalityInterface();
+
+  // Returns true iff call_count calls will satisfy this cardinality.
+  virtual bool IsSatisfiedByCallCount(int call_count) const = 0;
+
+  // Returns true iff call_count calls will saturate this cardinality.
+  virtual bool IsSaturatedByCallCount(int call_count) const = 0;
+
+  // Describes self to an ostream.
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+};
+```
+
+For example, to specify that a call must occur even number of times,
+you can write
+
+```
+using ::testing::Cardinality;
+using ::testing::CardinalityInterface;
+using ::testing::MakeCardinality;
+
+class EvenNumberCardinality : public CardinalityInterface {
+ public:
+  virtual bool IsSatisfiedByCallCount(int call_count) const {
+    return (call_count % 2) == 0;
+  }
+
+  virtual bool IsSaturatedByCallCount(int call_count) const {
+    return false;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "called even number of times";
+  }
+};
+
+Cardinality EvenNumber() {
+  return MakeCardinality(new EvenNumberCardinality);
+}
+...
+
+  EXPECT_CALL(foo, Bar(3))
+      .Times(EvenNumber());
+```
+
+## Writing New Actions Quickly ##
+
+If the built-in actions don't work for you, and you find it
+inconvenient to use `Invoke()`, you can use a macro from the `ACTION*`
+family to quickly define a new action that can be used in your code as
+if it's a built-in action.
+
+By writing
+```
+ACTION(name) { statements; }
+```
+in a namespace scope (i.e. not inside a class or function), you will
+define an action with the given name that executes the statements.
+The value returned by `statements` will be used as the return value of
+the action.  Inside the statements, you can refer to the K-th
+(0-based) argument of the mock function as `argK`.  For example:
+```
+ACTION(IncrementArg1) { return ++(*arg1); }
+```
+allows you to write
+```
+... WillOnce(IncrementArg1());
+```
+
+Note that you don't need to specify the types of the mock function
+arguments.  Rest assured that your code is type-safe though:
+you'll get a compiler error if `*arg1` doesn't support the `++`
+operator, or if the type of `++(*arg1)` isn't compatible with the mock
+function's return type.
+
+Another example:
+```
+ACTION(Foo) {
+  (*arg2)(5);
+  Blah();
+  *arg1 = 0;
+  return arg0;
+}
+```
+defines an action `Foo()` that invokes argument #2 (a function pointer)
+with 5, calls function `Blah()`, sets the value pointed to by argument
+#1 to 0, and returns argument #0.
+
+For more convenience and flexibility, you can also use the following
+pre-defined symbols in the body of `ACTION`:
+
+| `argK_type` | The type of the K-th (0-based) argument of the mock function |
+|:------------|:-------------------------------------------------------------|
+| `args`      | All arguments of the mock function as a tuple                |
+| `args_type` | The type of all arguments of the mock function as a tuple    |
+| `return_type` | The return type of the mock function                         |
+| `function_type` | The type of the mock function                                |
+
+For example, when using an `ACTION` as a stub action for mock function:
+```
+int DoSomething(bool flag, int* ptr);
+```
+we have:
+| **Pre-defined Symbol** | **Is Bound To** |
+|:-----------------------|:----------------|
+| `arg0`                 | the value of `flag` |
+| `arg0_type`            | the type `bool` |
+| `arg1`                 | the value of `ptr` |
+| `arg1_type`            | the type `int*` |
+| `args`                 | the tuple `(flag, ptr)` |
+| `args_type`            | the type `::testing::tuple<bool, int*>` |
+| `return_type`          | the type `int`  |
+| `function_type`        | the type `int(bool, int*)` |
+
+## Writing New Parameterized Actions Quickly ##
+
+Sometimes you'll want to parameterize an action you define.  For that
+we have another macro
+```
+ACTION_P(name, param) { statements; }
+```
+
+For example,
+```
+ACTION_P(Add, n) { return arg0 + n; }
+```
+will allow you to write
+```
+// Returns argument #0 + 5.
+... WillOnce(Add(5));
+```
+
+For convenience, we use the term _arguments_ for the values used to
+invoke the mock function, and the term _parameters_ for the values
+used to instantiate an action.
+
+Note that you don't need to provide the type of the parameter either.
+Suppose the parameter is named `param`, you can also use the
+Google-Mock-defined symbol `param_type` to refer to the type of the
+parameter as inferred by the compiler.  For example, in the body of
+`ACTION_P(Add, n)` above, you can write `n_type` for the type of `n`.
+
+Google Mock also provides `ACTION_P2`, `ACTION_P3`, and etc to support
+multi-parameter actions.  For example,
+```
+ACTION_P2(ReturnDistanceTo, x, y) {
+  double dx = arg0 - x;
+  double dy = arg1 - y;
+  return sqrt(dx*dx + dy*dy);
+}
+```
+lets you write
+```
+... WillOnce(ReturnDistanceTo(5.0, 26.5));
+```
+
+You can view `ACTION` as a degenerated parameterized action where the
+number of parameters is 0.
+
+You can also easily define actions overloaded on the number of parameters:
+```
+ACTION_P(Plus, a) { ... }
+ACTION_P2(Plus, a, b) { ... }
+```
+
+## Restricting the Type of an Argument or Parameter in an ACTION ##
+
+For maximum brevity and reusability, the `ACTION*` macros don't ask
+you to provide the types of the mock function arguments and the action
+parameters.  Instead, we let the compiler infer the types for us.
+
+Sometimes, however, we may want to be more explicit about the types.
+There are several tricks to do that.  For example:
+```
+ACTION(Foo) {
+  // Makes sure arg0 can be converted to int.
+  int n = arg0;
+  ... use n instead of arg0 here ...
+}
+
+ACTION_P(Bar, param) {
+  // Makes sure the type of arg1 is const char*.
+  ::testing::StaticAssertTypeEq<const char*, arg1_type>();
+
+  // Makes sure param can be converted to bool.
+  bool flag = param;
+}
+```
+where `StaticAssertTypeEq` is a compile-time assertion in Google Test
+that verifies two types are the same.
+
+## Writing New Action Templates Quickly ##
+
+Sometimes you want to give an action explicit template parameters that
+cannot be inferred from its value parameters.  `ACTION_TEMPLATE()`
+supports that and can be viewed as an extension to `ACTION()` and
+`ACTION_P*()`.
+
+The syntax:
+```
+ACTION_TEMPLATE(ActionName,
+                HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m),
+                AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; }
+```
+
+defines an action template that takes _m_ explicit template parameters
+and _n_ value parameters, where _m_ is between 1 and 10, and _n_ is
+between 0 and 10.  `name_i` is the name of the i-th template
+parameter, and `kind_i` specifies whether it's a `typename`, an
+integral constant, or a template.  `p_i` is the name of the i-th value
+parameter.
+
+Example:
+```
+// DuplicateArg<k, T>(output) converts the k-th argument of the mock
+// function to type T and copies it to *output.
+ACTION_TEMPLATE(DuplicateArg,
+                // Note the comma between int and k:
+                HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
+                AND_1_VALUE_PARAMS(output)) {
+  *output = T(::testing::get<k>(args));
+}
+```
+
+To create an instance of an action template, write:
+```
+  ActionName<t1, ..., t_m>(v1, ..., v_n)
+```
+where the `t`s are the template arguments and the
+`v`s are the value arguments.  The value argument
+types are inferred by the compiler.  For example:
+```
+using ::testing::_;
+...
+  int n;
+  EXPECT_CALL(mock, Foo(_, _))
+      .WillOnce(DuplicateArg<1, unsigned char>(&n));
+```
+
+If you want to explicitly specify the value argument types, you can
+provide additional template arguments:
+```
+  ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
+```
+where `u_i` is the desired type of `v_i`.
+
+`ACTION_TEMPLATE` and `ACTION`/`ACTION_P*` can be overloaded on the
+number of value parameters, but not on the number of template
+parameters.  Without the restriction, the meaning of the following is
+unclear:
+
+```
+  OverloadedAction<int, bool>(x);
+```
+
+Are we using a single-template-parameter action where `bool` refers to
+the type of `x`, or a two-template-parameter action where the compiler
+is asked to infer the type of `x`?
+
+## Using the ACTION Object's Type ##
+
+If you are writing a function that returns an `ACTION` object, you'll
+need to know its type.  The type depends on the macro used to define
+the action and the parameter types.  The rule is relatively simple:
+| **Given Definition** | **Expression** | **Has Type** |
+|:---------------------|:---------------|:-------------|
+| `ACTION(Foo)`        | `Foo()`        | `FooAction`  |
+| `ACTION_TEMPLATE(Foo, HAS_m_TEMPLATE_PARAMS(...), AND_0_VALUE_PARAMS())` |	`Foo<t1, ..., t_m>()` | `FooAction<t1, ..., t_m>` |
+| `ACTION_P(Bar, param)` | `Bar(int_value)` | `BarActionP<int>` |
+| `ACTION_TEMPLATE(Bar, HAS_m_TEMPLATE_PARAMS(...), AND_1_VALUE_PARAMS(p1))` | `Bar<t1, ..., t_m>(int_value)` | `FooActionP<t1, ..., t_m, int>` |
+| `ACTION_P2(Baz, p1, p2)` | `Baz(bool_value, int_value)` | `BazActionP2<bool, int>` |
+| `ACTION_TEMPLATE(Baz, HAS_m_TEMPLATE_PARAMS(...), AND_2_VALUE_PARAMS(p1, p2))` | `Baz<t1, ..., t_m>(bool_value, int_value)` | `FooActionP2<t1, ..., t_m, bool, int>` |
+| ...                  | ...            | ...          |
+
+Note that we have to pick different suffixes (`Action`, `ActionP`,
+`ActionP2`, and etc) for actions with different numbers of value
+parameters, or the action definitions cannot be overloaded on the
+number of them.
+
+## Writing New Monomorphic Actions ##
+
+While the `ACTION*` macros are very convenient, sometimes they are
+inappropriate.  For example, despite the tricks shown in the previous
+recipes, they don't let you directly specify the types of the mock
+function arguments and the action parameters, which in general leads
+to unoptimized compiler error messages that can baffle unfamiliar
+users.  They also don't allow overloading actions based on parameter
+types without jumping through some hoops.
+
+An alternative to the `ACTION*` macros is to implement
+`::testing::ActionInterface<F>`, where `F` is the type of the mock
+function in which the action will be used. For example:
+
+```
+template <typename F>class ActionInterface {
+ public:
+  virtual ~ActionInterface();
+
+  // Performs the action.  Result is the return type of function type
+  // F, and ArgumentTuple is the tuple of arguments of F.
+  //
+  // For example, if F is int(bool, const string&), then Result would
+  // be int, and ArgumentTuple would be ::testing::tuple<bool, const string&>.
+  virtual Result Perform(const ArgumentTuple& args) = 0;
+};
+
+using ::testing::_;
+using ::testing::Action;
+using ::testing::ActionInterface;
+using ::testing::MakeAction;
+
+typedef int IncrementMethod(int*);
+
+class IncrementArgumentAction : public ActionInterface<IncrementMethod> {
+ public:
+  virtual int Perform(const ::testing::tuple<int*>& args) {
+    int* p = ::testing::get<0>(args);  // Grabs the first argument.
+    return *p++;
+  }
+};
+
+Action<IncrementMethod> IncrementArgument() {
+  return MakeAction(new IncrementArgumentAction);
+}
+...
+
+  EXPECT_CALL(foo, Baz(_))
+      .WillOnce(IncrementArgument());
+
+  int n = 5;
+  foo.Baz(&n);  // Should return 5 and change n to 6.
+```
+
+## Writing New Polymorphic Actions ##
+
+The previous recipe showed you how to define your own action. This is
+all good, except that you need to know the type of the function in
+which the action will be used. Sometimes that can be a problem. For
+example, if you want to use the action in functions with _different_
+types (e.g. like `Return()` and `SetArgPointee()`).
+
+If an action can be used in several types of mock functions, we say
+it's _polymorphic_. The `MakePolymorphicAction()` function template
+makes it easy to define such an action:
+
+```
+namespace testing {
+
+template <typename Impl>
+PolymorphicAction<Impl> MakePolymorphicAction(const Impl& impl);
+
+}  // namespace testing
+```
+
+As an example, let's define an action that returns the second argument
+in the mock function's argument list. The first step is to define an
+implementation class:
+
+```
+class ReturnSecondArgumentAction {
+ public:
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple& args) const {
+    // To get the i-th (0-based) argument, use ::testing::get<i>(args).
+    return ::testing::get<1>(args);
+  }
+};
+```
+
+This implementation class does _not_ need to inherit from any
+particular class. What matters is that it must have a `Perform()`
+method template. This method template takes the mock function's
+arguments as a tuple in a **single** argument, and returns the result of
+the action. It can be either `const` or not, but must be invokable
+with exactly one template argument, which is the result type. In other
+words, you must be able to call `Perform<R>(args)` where `R` is the
+mock function's return type and `args` is its arguments in a tuple.
+
+Next, we use `MakePolymorphicAction()` to turn an instance of the
+implementation class into the polymorphic action we need. It will be
+convenient to have a wrapper for this:
+
+```
+using ::testing::MakePolymorphicAction;
+using ::testing::PolymorphicAction;
+
+PolymorphicAction<ReturnSecondArgumentAction> ReturnSecondArgument() {
+  return MakePolymorphicAction(ReturnSecondArgumentAction());
+}
+```
+
+Now, you can use this polymorphic action the same way you use the
+built-in ones:
+
+```
+using ::testing::_;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD2(DoThis, int(bool flag, int n));
+  MOCK_METHOD3(DoThat, string(int x, const char* str1, const char* str2));
+};
+...
+
+  MockFoo foo;
+  EXPECT_CALL(foo, DoThis(_, _))
+      .WillOnce(ReturnSecondArgument());
+  EXPECT_CALL(foo, DoThat(_, _, _))
+      .WillOnce(ReturnSecondArgument());
+  ...
+  foo.DoThis(true, 5);         // Will return 5.
+  foo.DoThat(1, "Hi", "Bye");  // Will return "Hi".
+```
+
+## Teaching Google Mock How to Print Your Values ##
+
+When an uninteresting or unexpected call occurs, Google Mock prints the
+argument values and the stack trace to help you debug.  Assertion
+macros like `EXPECT_THAT` and `EXPECT_EQ` also print the values in
+question when the assertion fails.  Google Mock and Google Test do this using
+Google Test's user-extensible value printer.
+
+This printer knows how to print built-in C++ types, native arrays, STL
+containers, and any type that supports the `<<` operator.  For other
+types, it prints the raw bytes in the value and hopes that you the
+user can figure it out.
+[Google Test's advanced guide](../../googletest/docs/AdvancedGuide.md#teaching-google-test-how-to-print-your-values)
+explains how to extend the printer to do a better job at
+printing your particular type than to dump the bytes.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/DesignDoc.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/DesignDoc.md
new file mode 100644
index 0000000000..3f515c3b6d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/DesignDoc.md
@@ -0,0 +1,280 @@
+This page discusses the design of new Google Mock features.
+
+
+
+# Macros for Defining Actions #
+
+## Problem ##
+
+Due to the lack of closures in C++, it currently requires some
+non-trivial effort to define a custom action in Google Mock.  For
+example, suppose you want to "increment the value pointed to by the
+second argument of the mock function and return it", you could write:
+
+```
+int IncrementArg1(Unused, int* p, Unused) {
+  return ++(*p);
+}
+
+... WillOnce(Invoke(IncrementArg1));
+```
+
+There are several things unsatisfactory about this approach:
+
+  * Even though the action only cares about the second argument of the mock function, its definition needs to list other arguments as dummies.  This is tedious.
+  * The defined action is usable only in mock functions that takes exactly 3 arguments - an unnecessary restriction.
+  * To use the action, one has to say `Invoke(IncrementArg1)`, which isn't as nice as `IncrementArg1()`.
+
+The latter two problems can be overcome using `MakePolymorphicAction()`,
+but it requires much more boilerplate code:
+
+```
+class IncrementArg1Action {
+ public:
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple& args) const {
+    return ++(*tr1::get<1>(args));
+  }
+};
+
+PolymorphicAction<IncrementArg1Action> IncrementArg1() {
+  return MakePolymorphicAction(IncrementArg1Action());
+}
+
+... WillOnce(IncrementArg1());
+```
+
+Our goal is to allow defining custom actions with the least amount of
+boiler-plate C++ requires.
+
+## Solution ##
+
+We propose to introduce a new macro:
+```
+ACTION(name) { statements; }
+```
+
+Using this in a namespace scope will define an action with the given
+name that executes the statements.  Inside the statements, you can
+refer to the K-th (0-based) argument of the mock function as `argK`.
+For example:
+```
+ACTION(IncrementArg1) { return ++(*arg1); }
+```
+allows you to write
+```
+... WillOnce(IncrementArg1());
+```
+
+Note that you don't need to specify the types of the mock function
+arguments, as brevity is a top design goal here.  Rest assured that
+your code is still type-safe though: you'll get a compiler error if
+`*arg1` doesn't support the `++` operator, or if the type of
+`++(*arg1)` isn't compatible with the mock function's return type.
+
+Another example:
+```
+ACTION(Foo) {
+  (*arg2)(5);
+  Blah();
+  *arg1 = 0;
+  return arg0;
+}
+```
+defines an action `Foo()` that invokes argument #2 (a function pointer)
+with 5, calls function `Blah()`, sets the value pointed to by argument
+#1 to 0, and returns argument #0.
+
+For more convenience and flexibility, you can also use the following
+pre-defined symbols in the body of `ACTION`:
+
+| `argK_type` | The type of the K-th (0-based) argument of the mock function |
+|:------------|:-------------------------------------------------------------|
+| `args`      | All arguments of the mock function as a tuple                |
+| `args_type` | The type of all arguments of the mock function as a tuple    |
+| `return_type` | The return type of the mock function                         |
+| `function_type` | The type of the mock function                                |
+
+For example, when using an `ACTION` as a stub action for mock function:
+```
+int DoSomething(bool flag, int* ptr);
+```
+we have:
+| **Pre-defined Symbol** | **Is Bound To** |
+|:-----------------------|:----------------|
+| `arg0`                 | the value of `flag` |
+| `arg0_type`            | the type `bool` |
+| `arg1`                 | the value of `ptr` |
+| `arg1_type`            | the type `int*` |
+| `args`                 | the tuple `(flag, ptr)` |
+| `args_type`            | the type `std::tr1::tuple<bool, int*>` |
+| `return_type`          | the type `int`  |
+| `function_type`        | the type `int(bool, int*)` |
+
+## Parameterized actions ##
+
+Sometimes you'll want to parameterize the action.   For that we propose
+another macro
+```
+ACTION_P(name, param) { statements; }
+```
+
+For example,
+```
+ACTION_P(Add, n) { return arg0 + n; }
+```
+will allow you to write
+```
+// Returns argument #0 + 5.
+... WillOnce(Add(5));
+```
+
+For convenience, we use the term _arguments_ for the values used to
+invoke the mock function, and the term _parameters_ for the values
+used to instantiate an action.
+
+Note that you don't need to provide the type of the parameter either.
+Suppose the parameter is named `param`, you can also use the
+Google-Mock-defined symbol `param_type` to refer to the type of the
+parameter as inferred by the compiler.
+
+We will also provide `ACTION_P2`, `ACTION_P3`, and etc to support
+multi-parameter actions.  For example,
+```
+ACTION_P2(ReturnDistanceTo, x, y) {
+  double dx = arg0 - x;
+  double dy = arg1 - y;
+  return sqrt(dx*dx + dy*dy);
+}
+```
+lets you write
+```
+... WillOnce(ReturnDistanceTo(5.0, 26.5));
+```
+
+You can view `ACTION` as a degenerated parameterized action where the
+number of parameters is 0.
+
+## Advanced Usages ##
+
+### Overloading Actions ###
+
+You can easily define actions overloaded on the number of parameters:
+```
+ACTION_P(Plus, a) { ... }
+ACTION_P2(Plus, a, b) { ... }
+```
+
+### Restricting the Type of an Argument or Parameter ###
+
+For maximum brevity and reusability, the `ACTION*` macros don't let
+you specify the types of the mock function arguments and the action
+parameters.  Instead, we let the compiler infer the types for us.
+
+Sometimes, however, we may want to be more explicit about the types.
+There are several tricks to do that.  For example:
+```
+ACTION(Foo) {
+  // Makes sure arg0 can be converted to int.
+  int n = arg0;
+  ... use n instead of arg0 here ...
+}
+
+ACTION_P(Bar, param) {
+  // Makes sure the type of arg1 is const char*.
+  ::testing::StaticAssertTypeEq<const char*, arg1_type>();
+
+  // Makes sure param can be converted to bool.
+  bool flag = param;
+}
+```
+where `StaticAssertTypeEq` is a compile-time assertion we plan to add to
+Google Test (the name is chosen to match `static_assert` in C++0x).
+
+### Using the ACTION Object's Type ###
+
+If you are writing a function that returns an `ACTION` object, you'll
+need to know its type.  The type depends on the macro used to define
+the action and the parameter types.  The rule is relatively simple:
+| **Given Definition** | **Expression** | **Has Type** |
+|:---------------------|:---------------|:-------------|
+| `ACTION(Foo)`        | `Foo()`        | `FooAction`  |
+| `ACTION_P(Bar, param)` | `Bar(int_value)` | `BarActionP<int>` |
+| `ACTION_P2(Baz, p1, p2)` | `Baz(bool_value, int_value)` | `BazActionP2<bool, int>` |
+| ...                  | ...            | ...          |
+
+Note that we have to pick different suffixes (`Action`, `ActionP`,
+`ActionP2`, and etc) for actions with different numbers of parameters,
+or the action definitions cannot be overloaded on the number of
+parameters.
+
+## When to Use ##
+
+While the new macros are very convenient, please also consider other
+means of implementing actions (e.g. via `ActionInterface` or
+`MakePolymorphicAction()`), especially if you need to use the defined
+action a lot.  While the other approaches require more work, they give
+you more control on the types of the mock function arguments and the
+action parameters, which in general leads to better compiler error
+messages that pay off in the long run.  They also allow overloading
+actions based on parameter types, as opposed to just the number of
+parameters.
+
+## Related Work ##
+
+As you may have realized, the `ACTION*` macros resemble closures (also
+known as lambda expressions or anonymous functions).  Indeed, both of
+them seek to lower the syntactic overhead for defining a function.
+
+C++0x will support lambdas, but they are not part of C++ right now.
+Some non-standard libraries (most notably BLL or Boost Lambda Library)
+try to alleviate this problem.  However, they are not a good choice
+for defining actions as:
+
+  * They are non-standard and not widely installed.  Google Mock only depends on standard libraries and `tr1::tuple`, which is part of the new C++ standard and comes with gcc 4+.  We want to keep it that way.
+  * They are not trivial to learn.
+  * They will become obsolete when C++0x's lambda feature is widely supported.  We don't want to make our users use a dying library.
+  * Since they are based on operators, they are rather ad hoc: you cannot use statements, and you cannot pass the lambda arguments to a function, for example.
+  * They have subtle semantics that easily confuses new users.  For example, in expression `_1++ + foo++`, `foo` will be incremented only once where the expression is evaluated, while `_1` will be incremented every time the unnamed function is invoked.  This is far from intuitive.
+
+`ACTION*` avoid all these problems.
+
+## Future Improvements ##
+
+There may be a need for composing `ACTION*` definitions (i.e. invoking
+another `ACTION` inside the definition of one `ACTION*`).  We are not
+sure we want it yet, as one can get a similar effect by putting
+`ACTION` definitions in function templates and composing the function
+templates.  We'll revisit this based on user feedback.
+
+The reason we don't allow `ACTION*()` inside a function body is that
+the current C++ standard doesn't allow function-local types to be used
+to instantiate templates.  The upcoming C++0x standard will lift this
+restriction.  Once this feature is widely supported by compilers, we
+can revisit the implementation and add support for using `ACTION*()`
+inside a function.
+
+C++0x will also support lambda expressions.  When they become
+available, we may want to support using lambdas as actions.
+
+# Macros for Defining Matchers #
+
+Once the macros for defining actions are implemented, we plan to do
+the same for matchers:
+
+```
+MATCHER(name) { statements; }
+```
+
+where you can refer to the value being matched as `arg`.  For example,
+given:
+
+```
+MATCHER(IsPositive) { return arg > 0; }
+```
+
+you can use `IsPositive()` as a matcher that matches a value iff it is
+greater than 0.
+
+We will also add `MATCHER_P`, `MATCHER_P2`, and etc for parameterized
+matchers.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/DevGuide.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/DevGuide.md
new file mode 100644
index 0000000000..f4bab75ca7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/DevGuide.md
@@ -0,0 +1,132 @@
+
+
+If you are interested in understanding the internals of Google Mock,
+building from source, or contributing ideas or modifications to the
+project, then this document is for you.
+
+# Introduction #
+
+First, let's give you some background of the project.
+
+## Licensing ##
+
+All Google Mock source and pre-built packages are provided under the [New BSD License](http://www.opensource.org/licenses/bsd-license.php).
+
+## The Google Mock Community ##
+
+The Google Mock community exists primarily through the [discussion group](http://groups.google.com/group/googlemock), the
+[issue tracker](https://github.com/google/googletest/issues) and, to a lesser extent, the [source control repository](../). You are definitely encouraged to contribute to the
+discussion and you can also help us to keep the effectiveness of the
+group high by following and promoting the guidelines listed here.
+
+### Please Be Friendly ###
+
+Showing courtesy and respect to others is a vital part of the Google
+culture, and we strongly encourage everyone participating in Google
+Mock development to join us in accepting nothing less. Of course,
+being courteous is not the same as failing to constructively disagree
+with each other, but it does mean that we should be respectful of each
+other when enumerating the 42 technical reasons that a particular
+proposal may not be the best choice. There's never a reason to be
+antagonistic or dismissive toward anyone who is sincerely trying to
+contribute to a discussion.
+
+Sure, C++ testing is serious business and all that, but it's also
+a lot of fun. Let's keep it that way. Let's strive to be one of the
+friendliest communities in all of open source.
+
+### Where to Discuss Google Mock ###
+
+As always, discuss Google Mock in the official [Google C++ Mocking Framework discussion group](http://groups.google.com/group/googlemock).  You don't have to actually submit
+code in order to sign up. Your participation itself is a valuable
+contribution.
+
+# Working with the Code #
+
+If you want to get your hands dirty with the code inside Google Mock,
+this is the section for you.
+
+## Checking Out the Source from Subversion ##
+
+Checking out the Google Mock source is most useful if you plan to
+tweak it yourself.  You check out the source for Google Mock using a
+[Subversion](http://subversion.tigris.org/) client as you would for any
+other project hosted on Google Code.  Please see the instruction on
+the [source code access page](../) for how to do it.
+
+## Compiling from Source ##
+
+Once you check out the code, you can find instructions on how to
+compile it in the [README](../README.md) file.
+
+## Testing ##
+
+A mocking framework is of no good if itself is not thoroughly tested.
+Tests should be written for any new code, and changes should be
+verified to not break existing tests before they are submitted for
+review. To perform the tests, follow the instructions in [README](http://code.google.com/p/googlemock/source/browse/trunk/README) and
+verify that there are no failures.
+
+# Contributing Code #
+
+We are excited that Google Mock is now open source, and hope to get
+great patches from the community. Before you fire up your favorite IDE
+and begin hammering away at that new feature, though, please take the
+time to read this section and understand the process. While it seems
+rigorous, we want to keep a high standard of quality in the code
+base.
+
+## Contributor License Agreements ##
+
+You must sign a Contributor License Agreement (CLA) before we can
+accept any code.  The CLA protects you and us.
+
+  * If you are an individual writing original source code and you're sure you own the intellectual property, then you'll need to sign an [individual CLA](http://code.google.com/legal/individual-cla-v1.0.html).
+  * If you work for a company that wants to allow you to contribute your work to Google Mock, then you'll need to sign a [corporate CLA](http://code.google.com/legal/corporate-cla-v1.0.html).
+
+Follow either of the two links above to access the appropriate CLA and
+instructions for how to sign and return it.
+
+## Coding Style ##
+
+To keep the source consistent, readable, diffable and easy to merge,
+we use a fairly rigid coding style, as defined by the [google-styleguide](https://github.com/google/styleguide) project.  All patches will be expected
+to conform to the style outlined [here](https://github.com/google/styleguide/blob/gh-pages/cppguide.xml).
+
+## Submitting Patches ##
+
+Please do submit code. Here's what you need to do:
+
+  1. Normally you should make your change against the SVN trunk instead of a branch or a tag, as the latter two are for release control and should be treated mostly as read-only.
+  1. Decide which code you want to submit. A submission should be a set of changes that addresses one issue in the [Google Mock issue tracker](http://code.google.com/p/googlemock/issues/list). Please don't mix more than one logical change per submittal, because it makes the history hard to follow. If you want to make a change that doesn't have a corresponding issue in the issue tracker, please create one.
+  1. Also, coordinate with team members that are listed on the issue in question. This ensures that work isn't being duplicated and communicating your plan early also generally leads to better patches.
+  1. Ensure that your code adheres to the [Google Mock source code style](#Coding_Style.md).
+  1. Ensure that there are unit tests for your code.
+  1. Sign a Contributor License Agreement.
+  1. Create a patch file using `svn diff`.
+  1. We use [Rietveld](http://codereview.appspot.com/) to do web-based code reviews.  You can read about the tool [here](https://github.com/rietveld-codereview/rietveld/wiki).  When you are ready, upload your patch via Rietveld and notify `googlemock@googlegroups.com` to review it.  There are several ways to upload the patch.  We recommend using the [upload\_gmock.py](../scripts/upload_gmock.py) script, which you can find in the `scripts/` folder in the SVN trunk.
+
+## Google Mock Committers ##
+
+The current members of the Google Mock engineering team are the only
+committers at present. In the great tradition of eating one's own
+dogfood, we will be requiring each new Google Mock engineering team
+member to earn the right to become a committer by following the
+procedures in this document, writing consistently great code, and
+demonstrating repeatedly that he or she truly gets the zen of Google
+Mock.
+
+# Release Process #
+
+We follow the typical release process for Subversion-based projects:
+
+  1. A release branch named `release-X.Y` is created.
+  1. Bugs are fixed and features are added in trunk; those individual patches are merged into the release branch until it's stable.
+  1. An individual point release (the `Z` in `X.Y.Z`) is made by creating a tag from the branch.
+  1. Repeat steps 2 and 3 throughout one release cycle (as determined by features or time).
+  1. Go back to step 1 to create another release branch and so on.
+
+
+---
+
+This page is based on the [Making GWT Better](http://code.google.com/webtoolkit/makinggwtbetter.html) guide from the [Google Web Toolkit](http://code.google.com/webtoolkit/) project.  Except as otherwise [noted](http://code.google.com/policies.html#restrictions), the content of this page is licensed under the [Creative Commons Attribution 2.5 License](http://creativecommons.org/licenses/by/2.5/).
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/Documentation.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/Documentation.md
new file mode 100644
index 0000000000..444151ee9e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/Documentation.md
@@ -0,0 +1,12 @@
+This page lists all documentation wiki pages for Google Mock **(the SVN trunk version)**
+- **if you use a released version of Google Mock, please read the documentation for that specific version instead.**
+
+  * [ForDummies](ForDummies.md) -- start here if you are new to Google Mock.
+  * [CheatSheet](CheatSheet.md) -- a quick reference.
+  * [CookBook](CookBook.md) -- recipes for doing various tasks using Google Mock.
+  * [FrequentlyAskedQuestions](FrequentlyAskedQuestions.md) -- check here before asking a question on the mailing list.
+
+To contribute code to Google Mock, read:
+
+  * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
+  * [Pump Manual](../googletest/docs/PumpManual.md) -- how we generate some of Google Mock's source files.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/ForDummies.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/ForDummies.md
new file mode 100644
index 0000000000..0da4cbe27b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/ForDummies.md
@@ -0,0 +1,439 @@
+
+
+(**Note:** If you get compiler errors that you don't understand, be sure to consult [Google Mock Doctor](FrequentlyAskedQuestions.md#how-am-i-supposed-to-make-sense-of-these-horrible-template-errors).)
+
+# What Is Google C++ Mocking Framework? #
+When you write a prototype or test, often it's not feasible or wise to rely on real objects entirely. A **mock object** implements the same interface as a real object (so it can be used as one), but lets you specify at run time how it will be used and what it should do (which methods will be called? in which order? how many times? with what arguments? what will they return? etc).
+
+**Note:** It is easy to confuse the term _fake objects_ with mock objects. Fakes and mocks actually mean very different things in the Test-Driven Development (TDD) community:
+
+  * **Fake** objects have working implementations, but usually take some shortcut (perhaps to make the operations less expensive), which makes them not suitable for production. An in-memory file system would be an example of a fake.
+  * **Mocks** are objects pre-programmed with _expectations_, which form a specification of the calls they are expected to receive.
+
+If all this seems too abstract for you, don't worry - the most important thing to remember is that a mock allows you to check the _interaction_ between itself and code that uses it. The difference between fakes and mocks will become much clearer once you start to use mocks.
+
+**Google C++ Mocking Framework** (or **Google Mock** for short) is a library (sometimes we also call it a "framework" to make it sound cool) for creating mock classes and using them. It does to C++ what [jMock](http://www.jmock.org/) and [EasyMock](http://www.easymock.org/) do to Java.
+
+Using Google Mock involves three basic steps:
+
+  1. Use some simple macros to describe the interface you want to mock, and they will expand to the implementation of your mock class;
+  1. Create some mock objects and specify its expectations and behavior using an intuitive syntax;
+  1. Exercise code that uses the mock objects. Google Mock will catch any violation of the expectations as soon as it arises.
+
+# Why Google Mock? #
+While mock objects help you remove unnecessary dependencies in tests and make them fast and reliable, using mocks manually in C++ is _hard_:
+
+  * Someone has to implement the mocks. The job is usually tedious and error-prone. No wonder people go great distance to avoid it.
+  * The quality of those manually written mocks is a bit, uh, unpredictable. You may see some really polished ones, but you may also see some that were hacked up in a hurry and have all sorts of ad hoc restrictions.
+  * The knowledge you gained from using one mock doesn't transfer to the next.
+
+In contrast, Java and Python programmers have some fine mock frameworks, which automate the creation of mocks. As a result, mocking is a proven effective technique and widely adopted practice in those communities. Having the right tool absolutely makes the difference.
+
+Google Mock was built to help C++ programmers. It was inspired by [jMock](http://www.jmock.org/) and [EasyMock](http://www.easymock.org/), but designed with C++'s specifics in mind. It is your friend if any of the following problems is bothering you:
+
+  * You are stuck with a sub-optimal design and wish you had done more prototyping before it was too late, but prototyping in C++ is by no means "rapid".
+  * Your tests are slow as they depend on too many libraries or use expensive resources (e.g. a database).
+  * Your tests are brittle as some resources they use are unreliable (e.g. the network).
+  * You want to test how your code handles a failure (e.g. a file checksum error), but it's not easy to cause one.
+  * You need to make sure that your module interacts with other modules in the right way, but it's hard to observe the interaction; therefore you resort to observing the side effects at the end of the action, which is awkward at best.
+  * You want to "mock out" your dependencies, except that they don't have mock implementations yet; and, frankly, you aren't thrilled by some of those hand-written mocks.
+
+We encourage you to use Google Mock as:
+
+  * a _design_ tool, for it lets you experiment with your interface design early and often. More iterations lead to better designs!
+  * a _testing_ tool to cut your tests' outbound dependencies and probe the interaction between your module and its collaborators.
+
+# Getting Started #
+Using Google Mock is easy! Inside your C++ source file, just `#include` `"gtest/gtest.h"` and `"gmock/gmock.h"`, and you are ready to go.
+
+# A Case for Mock Turtles #
+Let's look at an example. Suppose you are developing a graphics program that relies on a LOGO-like API for drawing. How would you test that it does the right thing? Well, you can run it and compare the screen with a golden screen snapshot, but let's admit it: tests like this are expensive to run and fragile (What if you just upgraded to a shiny new graphics card that has better anti-aliasing? Suddenly you have to update all your golden images.). It would be too painful if all your tests are like this. Fortunately, you learned about Dependency Injection and know the right thing to do: instead of having your application talk to the drawing API directly, wrap the API in an interface (say, `Turtle`) and code to that interface:
+
+```
+class Turtle {
+  ...
+  virtual ~Turtle() {}
+  virtual void PenUp() = 0;
+  virtual void PenDown() = 0;
+  virtual void Forward(int distance) = 0;
+  virtual void Turn(int degrees) = 0;
+  virtual void GoTo(int x, int y) = 0;
+  virtual int GetX() const = 0;
+  virtual int GetY() const = 0;
+};
+```
+
+(Note that the destructor of `Turtle` **must** be virtual, as is the case for **all** classes you intend to inherit from - otherwise the destructor of the derived class will not be called when you delete an object through a base pointer, and you'll get corrupted program states like memory leaks.)
+
+You can control whether the turtle's movement will leave a trace using `PenUp()` and `PenDown()`, and control its movement using `Forward()`, `Turn()`, and `GoTo()`. Finally, `GetX()` and `GetY()` tell you the current position of the turtle.
+
+Your program will normally use a real implementation of this interface. In tests, you can use a mock implementation instead. This allows you to easily check what drawing primitives your program is calling, with what arguments, and in which order. Tests written this way are much more robust (they won't break because your new machine does anti-aliasing differently), easier to read and maintain (the intent of a test is expressed in the code, not in some binary images), and run _much, much faster_.
+
+# Writing the Mock Class #
+If you are lucky, the mocks you need to use have already been implemented by some nice people. If, however, you find yourself in the position to write a mock class, relax - Google Mock turns this task into a fun game! (Well, almost.)
+
+## How to Define It ##
+Using the `Turtle` interface as example, here are the simple steps you need to follow:
+
+  1. Derive a class `MockTurtle` from `Turtle`.
+  1. Take a _virtual_ function of `Turtle` (while it's possible to [mock non-virtual methods using templates](CookBook.md#mocking-nonvirtual-methods), it's much more involved). Count how many arguments it has.
+  1. In the `public:` section of the child class, write `MOCK_METHODn();` (or `MOCK_CONST_METHODn();` if you are mocking a `const` method), where `n` is the number of the arguments; if you counted wrong, shame on you, and a compiler error will tell you so.
+  1. Now comes the fun part: you take the function signature, cut-and-paste the _function name_ as the _first_ argument to the macro, and leave what's left as the _second_ argument (in case you're curious, this is the _type of the function_).
+  1. Repeat until all virtual functions you want to mock are done.
+
+After the process, you should have something like:
+
+```
+#include "gmock/gmock.h"  // Brings in Google Mock.
+class MockTurtle : public Turtle {
+ public:
+  ...
+  MOCK_METHOD0(PenUp, void());
+  MOCK_METHOD0(PenDown, void());
+  MOCK_METHOD1(Forward, void(int distance));
+  MOCK_METHOD1(Turn, void(int degrees));
+  MOCK_METHOD2(GoTo, void(int x, int y));
+  MOCK_CONST_METHOD0(GetX, int());
+  MOCK_CONST_METHOD0(GetY, int());
+};
+```
+
+You don't need to define these mock methods somewhere else - the `MOCK_METHOD*` macros will generate the definitions for you. It's that simple! Once you get the hang of it, you can pump out mock classes faster than your source-control system can handle your check-ins.
+
+**Tip:** If even this is too much work for you, you'll find the
+`gmock_gen.py` tool in Google Mock's `scripts/generator/` directory (courtesy of the [cppclean](http://code.google.com/p/cppclean/) project) useful.  This command-line
+tool requires that you have Python 2.4 installed.  You give it a C++ file and the name of an abstract class defined in it,
+and it will print the definition of the mock class for you.  Due to the
+complexity of the C++ language, this script may not always work, but
+it can be quite handy when it does.  For more details, read the [user documentation](../scripts/generator/README).
+
+## Where to Put It ##
+When you define a mock class, you need to decide where to put its definition. Some people put it in a `*_test.cc`. This is fine when the interface being mocked (say, `Foo`) is owned by the same person or team. Otherwise, when the owner of `Foo` changes it, your test could break. (You can't really expect `Foo`'s maintainer to fix every test that uses `Foo`, can you?)
+
+So, the rule of thumb is: if you need to mock `Foo` and it's owned by others, define the mock class in `Foo`'s package (better, in a `testing` sub-package such that you can clearly separate production code and testing utilities), and put it in a `mock_foo.h`. Then everyone can reference `mock_foo.h` from their tests. If `Foo` ever changes, there is only one copy of `MockFoo` to change, and only tests that depend on the changed methods need to be fixed.
+
+Another way to do it: you can introduce a thin layer `FooAdaptor` on top of `Foo` and code to this new interface. Since you own `FooAdaptor`, you can absorb changes in `Foo` much more easily. While this is more work initially, carefully choosing the adaptor interface can make your code easier to write and more readable (a net win in the long run), as you can choose `FooAdaptor` to fit your specific domain much better than `Foo` does.
+
+# Using Mocks in Tests #
+Once you have a mock class, using it is easy. The typical work flow is:
+
+  1. Import the Google Mock names from the `testing` namespace such that you can use them unqualified (You only have to do it once per file. Remember that namespaces are a good idea and good for your health.).
+  1. Create some mock objects.
+  1. Specify your expectations on them (How many times will a method be called? With what arguments? What should it do? etc.).
+  1. Exercise some code that uses the mocks; optionally, check the result using Google Test assertions. If a mock method is called more than expected or with wrong arguments, you'll get an error immediately.
+  1. When a mock is destructed, Google Mock will automatically check whether all expectations on it have been satisfied.
+
+Here's an example:
+
+```
+#include "path/to/mock-turtle.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+using ::testing::AtLeast;                     // #1
+
+TEST(PainterTest, CanDrawSomething) {
+  MockTurtle turtle;                          // #2
+  EXPECT_CALL(turtle, PenDown())              // #3
+      .Times(AtLeast(1));
+
+  Painter painter(&turtle);                   // #4
+
+  EXPECT_TRUE(painter.DrawCircle(0, 0, 10));
+}                                             // #5
+
+int main(int argc, char** argv) {
+  // The following line must be executed to initialize Google Mock
+  // (and Google Test) before running the tests.
+  ::testing::InitGoogleMock(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+```
+
+As you might have guessed, this test checks that `PenDown()` is called at least once. If the `painter` object didn't call this method, your test will fail with a message like this:
+
+```
+path/to/my_test.cc:119: Failure
+Actual function call count doesn't match this expectation:
+Actually: never called;
+Expected: called at least once.
+```
+
+**Tip 1:** If you run the test from an Emacs buffer, you can hit `<Enter>` on the line number displayed in the error message to jump right to the failed expectation.
+
+**Tip 2:** If your mock objects are never deleted, the final verification won't happen. Therefore it's a good idea to use a heap leak checker in your tests when you allocate mocks on the heap.
+
+**Important note:** Google Mock requires expectations to be set **before** the mock functions are called, otherwise the behavior is **undefined**. In particular, you mustn't interleave `EXPECT_CALL()`s and calls to the mock functions.
+
+This means `EXPECT_CALL()` should be read as expecting that a call will occur _in the future_, not that a call has occurred. Why does Google Mock work like that? Well, specifying the expectation beforehand allows Google Mock to report a violation as soon as it arises, when the context (stack trace, etc) is still available. This makes debugging much easier.
+
+Admittedly, this test is contrived and doesn't do much. You can easily achieve the same effect without using Google Mock. However, as we shall reveal soon, Google Mock allows you to do _much more_ with the mocks.
+
+## Using Google Mock with Any Testing Framework ##
+If you want to use something other than Google Test (e.g. [CppUnit](http://sourceforge.net/projects/cppunit/) or
+[CxxTest](http://cxxtest.tigris.org/)) as your testing framework, just change the `main()` function in the previous section to:
+```
+int main(int argc, char** argv) {
+  // The following line causes Google Mock to throw an exception on failure,
+  // which will be interpreted by your testing framework as a test failure.
+  ::testing::GTEST_FLAG(throw_on_failure) = true;
+  ::testing::InitGoogleMock(&argc, argv);
+  ... whatever your testing framework requires ...
+}
+```
+
+This approach has a catch: it makes Google Mock throw an exception
+from a mock object's destructor sometimes.  With some compilers, this
+sometimes causes the test program to crash.  You'll still be able to
+notice that the test has failed, but it's not a graceful failure.
+
+A better solution is to use Google Test's
+[event listener API](../../googletest/docs/AdvancedGuide.md#extending-google-test-by-handling-test-events)
+to report a test failure to your testing framework properly.  You'll need to
+implement the `OnTestPartResult()` method of the event listener interface, but it
+should be straightforward.
+
+If this turns out to be too much work, we suggest that you stick with
+Google Test, which works with Google Mock seamlessly (in fact, it is
+technically part of Google Mock.).  If there is a reason that you
+cannot use Google Test, please let us know.
+
+# Setting Expectations #
+The key to using a mock object successfully is to set the _right expectations_ on it. If you set the expectations too strict, your test will fail as the result of unrelated changes. If you set them too loose, bugs can slip through. You want to do it just right such that your test can catch exactly the kind of bugs you intend it to catch. Google Mock provides the necessary means for you to do it "just right."
+
+## General Syntax ##
+In Google Mock we use the `EXPECT_CALL()` macro to set an expectation on a mock method. The general syntax is:
+
+```
+EXPECT_CALL(mock_object, method(matchers))
+    .Times(cardinality)
+    .WillOnce(action)
+    .WillRepeatedly(action);
+```
+
+The macro has two arguments: first the mock object, and then the method and its arguments. Note that the two are separated by a comma (`,`), not a period (`.`). (Why using a comma? The answer is that it was necessary for technical reasons.)
+
+The macro can be followed by some optional _clauses_ that provide more information about the expectation. We'll discuss how each clause works in the coming sections.
+
+This syntax is designed to make an expectation read like English. For example, you can probably guess that
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetX())
+    .Times(5)
+    .WillOnce(Return(100))
+    .WillOnce(Return(150))
+    .WillRepeatedly(Return(200));
+```
+
+says that the `turtle` object's `GetX()` method will be called five times, it will return 100 the first time, 150 the second time, and then 200 every time. Some people like to call this style of syntax a Domain-Specific Language (DSL).
+
+**Note:** Why do we use a macro to do this? It serves two purposes: first it makes expectations easily identifiable (either by `grep` or by a human reader), and second it allows Google Mock to include the source file location of a failed expectation in messages, making debugging easier.
+
+## Matchers: What Arguments Do We Expect? ##
+When a mock function takes arguments, we must specify what arguments we are expecting; for example:
+
+```
+// Expects the turtle to move forward by 100 units.
+EXPECT_CALL(turtle, Forward(100));
+```
+
+Sometimes you may not want to be too specific (Remember that talk about tests being too rigid? Over specification leads to brittle tests and obscures the intent of tests. Therefore we encourage you to specify only what's necessary - no more, no less.). If you care to check that `Forward()` will be called but aren't interested in its actual argument, write `_` as the argument, which means "anything goes":
+
+```
+using ::testing::_;
+...
+// Expects the turtle to move forward.
+EXPECT_CALL(turtle, Forward(_));
+```
+
+`_` is an instance of what we call **matchers**. A matcher is like a predicate and can test whether an argument is what we'd expect. You can use a matcher inside `EXPECT_CALL()` wherever a function argument is expected.
+
+A list of built-in matchers can be found in the [CheatSheet](CheatSheet.md). For example, here's the `Ge` (greater than or equal) matcher:
+
+```
+using ::testing::Ge;...
+EXPECT_CALL(turtle, Forward(Ge(100)));
+```
+
+This checks that the turtle will be told to go forward by at least 100 units.
+
+## Cardinalities: How Many Times Will It Be Called? ##
+The first clause we can specify following an `EXPECT_CALL()` is `Times()`. We call its argument a **cardinality** as it tells _how many times_ the call should occur. It allows us to repeat an expectation many times without actually writing it as many times. More importantly, a cardinality can be "fuzzy", just like a matcher can be. This allows a user to express the intent of a test exactly.
+
+An interesting special case is when we say `Times(0)`. You may have guessed - it means that the function shouldn't be called with the given arguments at all, and Google Mock will report a Google Test failure whenever the function is (wrongfully) called.
+
+We've seen `AtLeast(n)` as an example of fuzzy cardinalities earlier. For the list of built-in cardinalities you can use, see the [CheatSheet](CheatSheet.md).
+
+The `Times()` clause can be omitted. **If you omit `Times()`, Google Mock will infer the cardinality for you.** The rules are easy to remember:
+
+  * If **neither** `WillOnce()` **nor** `WillRepeatedly()` is in the `EXPECT_CALL()`, the inferred cardinality is `Times(1)`.
+  * If there are `n WillOnce()`'s but **no** `WillRepeatedly()`, where `n` >= 1, the cardinality is `Times(n)`.
+  * If there are `n WillOnce()`'s and **one** `WillRepeatedly()`, where `n` >= 0, the cardinality is `Times(AtLeast(n))`.
+
+**Quick quiz:** what do you think will happen if a function is expected to be called twice but actually called four times?
+
+## Actions: What Should It Do? ##
+Remember that a mock object doesn't really have a working implementation? We as users have to tell it what to do when a method is invoked. This is easy in Google Mock.
+
+First, if the return type of a mock function is a built-in type or a pointer, the function has a **default action** (a `void` function will just return, a `bool` function will return `false`, and other functions will return 0). In addition, in C++ 11 and above, a mock function whose return type is default-constructible (i.e. has a default constructor) has a default action of returning a default-constructed value.  If you don't say anything, this behavior will be used.
+
+Second, if a mock function doesn't have a default action, or the default action doesn't suit you, you can specify the action to be taken each time the expectation matches using a series of `WillOnce()` clauses followed by an optional `WillRepeatedly()`. For example,
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetX())
+    .WillOnce(Return(100))
+    .WillOnce(Return(200))
+    .WillOnce(Return(300));
+```
+
+This says that `turtle.GetX()` will be called _exactly three times_ (Google Mock inferred this from how many `WillOnce()` clauses we've written, since we didn't explicitly write `Times()`), and will return 100, 200, and 300 respectively.
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetY())
+    .WillOnce(Return(100))
+    .WillOnce(Return(200))
+    .WillRepeatedly(Return(300));
+```
+
+says that `turtle.GetY()` will be called _at least twice_ (Google Mock knows this as we've written two `WillOnce()` clauses and a `WillRepeatedly()` while having no explicit `Times()`), will return 100 the first time, 200 the second time, and 300 from the third time on.
+
+Of course, if you explicitly write a `Times()`, Google Mock will not try to infer the cardinality itself. What if the number you specified is larger than there are `WillOnce()` clauses? Well, after all `WillOnce()`s are used up, Google Mock will do the _default_ action for the function every time (unless, of course, you have a `WillRepeatedly()`.).
+
+What can we do inside `WillOnce()` besides `Return()`? You can return a reference using `ReturnRef(variable)`, or invoke a pre-defined function, among [others](CheatSheet.md#actions).
+
+**Important note:** The `EXPECT_CALL()` statement evaluates the action clause only once, even though the action may be performed many times. Therefore you must be careful about side effects. The following may not do what you want:
+
+```
+int n = 100;
+EXPECT_CALL(turtle, GetX())
+.Times(4)
+.WillRepeatedly(Return(n++));
+```
+
+Instead of returning 100, 101, 102, ..., consecutively, this mock function will always return 100 as `n++` is only evaluated once. Similarly, `Return(new Foo)` will create a new `Foo` object when the `EXPECT_CALL()` is executed, and will return the same pointer every time. If you want the side effect to happen every time, you need to define a custom action, which we'll teach in the [CookBook](CookBook.md).
+
+Time for another quiz! What do you think the following means?
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetY())
+.Times(4)
+.WillOnce(Return(100));
+```
+
+Obviously `turtle.GetY()` is expected to be called four times. But if you think it will return 100 every time, think twice! Remember that one `WillOnce()` clause will be consumed each time the function is invoked and the default action will be taken afterwards. So the right answer is that `turtle.GetY()` will return 100 the first time, but **return 0 from the second time on**, as returning 0 is the default action for `int` functions.
+
+## Using Multiple Expectations ##
+So far we've only shown examples where you have a single expectation. More realistically, you're going to specify expectations on multiple mock methods, which may be from multiple mock objects.
+
+By default, when a mock method is invoked, Google Mock will search the expectations in the **reverse order** they are defined, and stop when an active expectation that matches the arguments is found (you can think of it as "newer rules override older ones."). If the matching expectation cannot take any more calls, you will get an upper-bound-violated failure. Here's an example:
+
+```
+using ::testing::_;...
+EXPECT_CALL(turtle, Forward(_));  // #1
+EXPECT_CALL(turtle, Forward(10))  // #2
+    .Times(2);
+```
+
+If `Forward(10)` is called three times in a row, the third time it will be an error, as the last matching expectation (#2) has been saturated. If, however, the third `Forward(10)` call is replaced by `Forward(20)`, then it would be OK, as now #1 will be the matching expectation.
+
+**Side note:** Why does Google Mock search for a match in the _reverse_ order of the expectations? The reason is that this allows a user to set up the default expectations in a mock object's constructor or the test fixture's set-up phase and then customize the mock by writing more specific expectations in the test body. So, if you have two expectations on the same method, you want to put the one with more specific matchers **after** the other, or the more specific rule would be shadowed by the more general one that comes after it.
+
+## Ordered vs Unordered Calls ##
+By default, an expectation can match a call even though an earlier expectation hasn't been satisfied. In other words, the calls don't have to occur in the order the expectations are specified.
+
+Sometimes, you may want all the expected calls to occur in a strict order. To say this in Google Mock is easy:
+
+```
+using ::testing::InSequence;...
+TEST(FooTest, DrawsLineSegment) {
+  ...
+  {
+    InSequence dummy;
+
+    EXPECT_CALL(turtle, PenDown());
+    EXPECT_CALL(turtle, Forward(100));
+    EXPECT_CALL(turtle, PenUp());
+  }
+  Foo();
+}
+```
+
+By creating an object of type `InSequence`, all expectations in its scope are put into a _sequence_ and have to occur _sequentially_. Since we are just relying on the constructor and destructor of this object to do the actual work, its name is really irrelevant.
+
+In this example, we test that `Foo()` calls the three expected functions in the order as written. If a call is made out-of-order, it will be an error.
+
+(What if you care about the relative order of some of the calls, but not all of them? Can you specify an arbitrary partial order? The answer is ... yes! If you are impatient, the details can be found in the [CookBook](CookBook#Expecting_Partially_Ordered_Calls.md).)
+
+## All Expectations Are Sticky (Unless Said Otherwise) ##
+Now let's do a quick quiz to see how well you can use this mock stuff already. How would you test that the turtle is asked to go to the origin _exactly twice_ (you want to ignore any other instructions it receives)?
+
+After you've come up with your answer, take a look at ours and compare notes (solve it yourself first - don't cheat!):
+
+```
+using ::testing::_;...
+EXPECT_CALL(turtle, GoTo(_, _))  // #1
+    .Times(AnyNumber());
+EXPECT_CALL(turtle, GoTo(0, 0))  // #2
+    .Times(2);
+```
+
+Suppose `turtle.GoTo(0, 0)` is called three times. In the third time, Google Mock will see that the arguments match expectation #2 (remember that we always pick the last matching expectation). Now, since we said that there should be only two such calls, Google Mock will report an error immediately. This is basically what we've told you in the "Using Multiple Expectations" section above.
+
+This example shows that **expectations in Google Mock are "sticky" by default**, in the sense that they remain active even after we have reached their invocation upper bounds. This is an important rule to remember, as it affects the meaning of the spec, and is **different** to how it's done in many other mocking frameworks (Why'd we do that? Because we think our rule makes the common cases easier to express and understand.).
+
+Simple? Let's see if you've really understood it: what does the following code say?
+
+```
+using ::testing::Return;
+...
+for (int i = n; i > 0; i--) {
+  EXPECT_CALL(turtle, GetX())
+      .WillOnce(Return(10*i));
+}
+```
+
+If you think it says that `turtle.GetX()` will be called `n` times and will return 10, 20, 30, ..., consecutively, think twice! The problem is that, as we said, expectations are sticky. So, the second time `turtle.GetX()` is called, the last (latest) `EXPECT_CALL()` statement will match, and will immediately lead to an "upper bound exceeded" error - this piece of code is not very useful!
+
+One correct way of saying that `turtle.GetX()` will return 10, 20, 30, ..., is to explicitly say that the expectations are _not_ sticky. In other words, they should _retire_ as soon as they are saturated:
+
+```
+using ::testing::Return;
+...
+for (int i = n; i > 0; i--) {
+  EXPECT_CALL(turtle, GetX())
+    .WillOnce(Return(10*i))
+    .RetiresOnSaturation();
+}
+```
+
+And, there's a better way to do it: in this case, we expect the calls to occur in a specific order, and we line up the actions to match the order. Since the order is important here, we should make it explicit using a sequence:
+
+```
+using ::testing::InSequence;
+using ::testing::Return;
+...
+{
+  InSequence s;
+
+  for (int i = 1; i <= n; i++) {
+    EXPECT_CALL(turtle, GetX())
+        .WillOnce(Return(10*i))
+        .RetiresOnSaturation();
+  }
+}
+```
+
+By the way, the other situation where an expectation may _not_ be sticky is when it's in a sequence - as soon as another expectation that comes after it in the sequence has been used, it automatically retires (and will never be used to match any call).
+
+## Uninteresting Calls ##
+A mock object may have many methods, and not all of them are that interesting. For example, in some tests we may not care about how many times `GetX()` and `GetY()` get called.
+
+In Google Mock, if you are not interested in a method, just don't say anything about it. If a call to this method occurs, you'll see a warning in the test output, but it won't be a failure.
+
+# What Now? #
+Congratulations! You've learned enough about Google Mock to start using it. Now, you might want to join the [googlemock](http://groups.google.com/group/googlemock) discussion group and actually write some tests using Google Mock - it will be fun. Hey, it may even be addictive - you've been warned.
+
+Then, if you feel like increasing your mock quotient, you should move on to the [CookBook](CookBook.md). You can learn many advanced features of Google Mock there -- and advance your level of enjoyment and testing bliss.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/FrequentlyAskedQuestions.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/FrequentlyAskedQuestions.md
new file mode 100644
index 0000000000..5eac83f4b9
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/FrequentlyAskedQuestions.md
@@ -0,0 +1,628 @@
+
+
+Please send your questions to the
+[googlemock](http://groups.google.com/group/googlemock) discussion
+group. If you need help with compiler errors, make sure you have
+tried [Google Mock Doctor](#How_am_I_supposed_to_make_sense_of_these_horrible_template_error.md) first.
+
+## When I call a method on my mock object, the method for the real object is invoked instead.  What's the problem? ##
+
+In order for a method to be mocked, it must be _virtual_, unless you use the [high-perf dependency injection technique](CookBook.md#mocking-nonvirtual-methods).
+
+## I wrote some matchers.  After I upgraded to a new version of Google Mock, they no longer compile.  What's going on? ##
+
+After version 1.4.0 of Google Mock was released, we had an idea on how
+to make it easier to write matchers that can generate informative
+messages efficiently.  We experimented with this idea and liked what
+we saw.  Therefore we decided to implement it.
+
+Unfortunately, this means that if you have defined your own matchers
+by implementing `MatcherInterface` or using `MakePolymorphicMatcher()`,
+your definitions will no longer compile.  Matchers defined using the
+`MATCHER*` family of macros are not affected.
+
+Sorry for the hassle if your matchers are affected.  We believe it's
+in everyone's long-term interest to make this change sooner than
+later.  Fortunately, it's usually not hard to migrate an existing
+matcher to the new API.  Here's what you need to do:
+
+If you wrote your matcher like this:
+```
+// Old matcher definition that doesn't work with the latest
+// Google Mock.
+using ::testing::MatcherInterface;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetFoo() > 5;
+  }
+  ...
+};
+```
+
+you'll need to change it to:
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool MatchAndExplain(MyType value,
+                               MatchResultListener* listener) const {
+    // Returns true if value matches.
+    return value.GetFoo() > 5;
+  }
+  ...
+};
+```
+(i.e. rename `Matches()` to `MatchAndExplain()` and give it a second
+argument of type `MatchResultListener*`.)
+
+If you were also using `ExplainMatchResultTo()` to improve the matcher
+message:
+```
+// Old matcher definition that doesn't work with the lastest
+// Google Mock.
+using ::testing::MatcherInterface;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetFoo() > 5;
+  }
+
+  virtual void ExplainMatchResultTo(MyType value,
+                                    ::std::ostream* os) const {
+    // Prints some helpful information to os to help
+    // a user understand why value matches (or doesn't match).
+    *os << "the Foo property is " << value.GetFoo();
+  }
+  ...
+};
+```
+
+you should move the logic of `ExplainMatchResultTo()` into
+`MatchAndExplain()`, using the `MatchResultListener` argument where
+the `::std::ostream` was used:
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool MatchAndExplain(MyType value,
+                               MatchResultListener* listener) const {
+    // Returns true if value matches.
+    *listener << "the Foo property is " << value.GetFoo();
+    return value.GetFoo() > 5;
+  }
+  ...
+};
+```
+
+If your matcher is defined using `MakePolymorphicMatcher()`:
+```
+// Old matcher definition that doesn't work with the latest
+// Google Mock.
+using ::testing::MakePolymorphicMatcher;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetBar() < 42;
+  }
+  ...
+};
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+you should rename the `Matches()` method to `MatchAndExplain()` and
+add a `MatchResultListener*` argument (the same as what you need to do
+for matchers defined by implementing `MatcherInterface`):
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MakePolymorphicMatcher;
+using ::testing::MatchResultListener;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool MatchAndExplain(MyType value,
+                       MatchResultListener* listener) const {
+    // Returns true if value matches.
+    return value.GetBar() < 42;
+  }
+  ...
+};
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+If your polymorphic matcher uses `ExplainMatchResultTo()` for better
+failure messages:
+```
+// Old matcher definition that doesn't work with the latest
+// Google Mock.
+using ::testing::MakePolymorphicMatcher;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetBar() < 42;
+  }
+  ...
+};
+void ExplainMatchResultTo(const MyGreatMatcher& matcher,
+                          MyType value,
+                          ::std::ostream* os) {
+  // Prints some helpful information to os to help
+  // a user understand why value matches (or doesn't match).
+  *os << "the Bar property is " << value.GetBar();
+}
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+you'll need to move the logic inside `ExplainMatchResultTo()` to
+`MatchAndExplain()`:
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MakePolymorphicMatcher;
+using ::testing::MatchResultListener;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool MatchAndExplain(MyType value,
+                       MatchResultListener* listener) const {
+    // Returns true if value matches.
+    *listener << "the Bar property is " << value.GetBar();
+    return value.GetBar() < 42;
+  }
+  ...
+};
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+For more information, you can read these
+[two](CookBook.md#writing-new-monomorphic-matchers)
+[recipes](CookBook.md#writing-new-polymorphic-matchers)
+from the cookbook.  As always, you
+are welcome to post questions on `googlemock@googlegroups.com` if you
+need any help.
+
+## When using Google Mock, do I have to use Google Test as the testing framework?  I have my favorite testing framework and don't want to switch. ##
+
+Google Mock works out of the box with Google Test.  However, it's easy
+to configure it to work with any testing framework of your choice.
+[Here](ForDummies.md#using-google-mock-with-any-testing-framework) is how.
+
+## How am I supposed to make sense of these horrible template errors? ##
+
+If you are confused by the compiler errors gcc threw at you,
+try consulting the _Google Mock Doctor_ tool first.  What it does is to
+scan stdin for gcc error messages, and spit out diagnoses on the
+problems (we call them diseases) your code has.
+
+To "install", run command:
+```
+alias gmd='<path to googlemock>/scripts/gmock_doctor.py'
+```
+
+To use it, do:
+```
+<your-favorite-build-command> <your-test> 2>&1 | gmd
+```
+
+For example:
+```
+make my_test 2>&1 | gmd
+```
+
+Or you can run `gmd` and copy-n-paste gcc's error messages to it.
+
+## Can I mock a variadic function? ##
+
+You cannot mock a variadic function (i.e. a function taking ellipsis
+(`...`) arguments) directly in Google Mock.
+
+The problem is that in general, there is _no way_ for a mock object to
+know how many arguments are passed to the variadic method, and what
+the arguments' types are.  Only the _author of the base class_ knows
+the protocol, and we cannot look into his head.
+
+Therefore, to mock such a function, the _user_ must teach the mock
+object how to figure out the number of arguments and their types.  One
+way to do it is to provide overloaded versions of the function.
+
+Ellipsis arguments are inherited from C and not really a C++ feature.
+They are unsafe to use and don't work with arguments that have
+constructors or destructors.  Therefore we recommend to avoid them in
+C++ as much as possible.
+
+## MSVC gives me warning C4301 or C4373 when I define a mock method with a const parameter.  Why? ##
+
+If you compile this using Microsoft Visual C++ 2005 SP1:
+```
+class Foo {
+  ...
+  virtual void Bar(const int i) = 0;
+};
+
+class MockFoo : public Foo {
+  ...
+  MOCK_METHOD1(Bar, void(const int i));
+};
+```
+You may get the following warning:
+```
+warning C4301: 'MockFoo::Bar': overriding virtual function only differs from 'Foo::Bar' by const/volatile qualifier
+```
+
+This is a MSVC bug.  The same code compiles fine with gcc ,for
+example.  If you use Visual C++ 2008 SP1, you would get the warning:
+```
+warning C4373: 'MockFoo::Bar': virtual function overrides 'Foo::Bar', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers
+```
+
+In C++, if you _declare_ a function with a `const` parameter, the
+`const` modifier is _ignored_.  Therefore, the `Foo` base class above
+is equivalent to:
+```
+class Foo {
+  ...
+  virtual void Bar(int i) = 0;  // int or const int?  Makes no difference.
+};
+```
+
+In fact, you can _declare_ Bar() with an `int` parameter, and _define_
+it with a `const int` parameter.  The compiler will still match them
+up.
+
+Since making a parameter `const` is meaningless in the method
+_declaration_, we recommend to remove it in both `Foo` and `MockFoo`.
+That should workaround the VC bug.
+
+Note that we are talking about the _top-level_ `const` modifier here.
+If the function parameter is passed by pointer or reference, declaring
+the _pointee_ or _referee_ as `const` is still meaningful.  For
+example, the following two declarations are _not_ equivalent:
+```
+void Bar(int* p);        // Neither p nor *p is const.
+void Bar(const int* p);  // p is not const, but *p is.
+```
+
+## I have a huge mock class, and Microsoft Visual C++ runs out of memory when compiling it.  What can I do? ##
+
+We've noticed that when the `/clr` compiler flag is used, Visual C++
+uses 5~6 times as much memory when compiling a mock class.  We suggest
+to avoid `/clr` when compiling native C++ mocks.
+
+## I can't figure out why Google Mock thinks my expectations are not satisfied.  What should I do? ##
+
+You might want to run your test with
+`--gmock_verbose=info`.  This flag lets Google Mock print a trace
+of every mock function call it receives.  By studying the trace,
+you'll gain insights on why the expectations you set are not met.
+
+## How can I assert that a function is NEVER called? ##
+
+```
+EXPECT_CALL(foo, Bar(_))
+    .Times(0);
+```
+
+## I have a failed test where Google Mock tells me TWICE that a particular expectation is not satisfied.  Isn't this redundant? ##
+
+When Google Mock detects a failure, it prints relevant information
+(the mock function arguments, the state of relevant expectations, and
+etc) to help the user debug.  If another failure is detected, Google
+Mock will do the same, including printing the state of relevant
+expectations.
+
+Sometimes an expectation's state didn't change between two failures,
+and you'll see the same description of the state twice.  They are
+however _not_ redundant, as they refer to _different points in time_.
+The fact they are the same _is_ interesting information.
+
+## I get a heap check failure when using a mock object, but using a real object is fine.  What can be wrong? ##
+
+Does the class (hopefully a pure interface) you are mocking have a
+virtual destructor?
+
+Whenever you derive from a base class, make sure its destructor is
+virtual.  Otherwise Bad Things will happen.  Consider the following
+code:
+
+```
+class Base {
+ public:
+  // Not virtual, but should be.
+  ~Base() { ... }
+  ...
+};
+
+class Derived : public Base {
+ public:
+  ...
+ private:
+  std::string value_;
+};
+
+...
+  Base* p = new Derived;
+  ...
+  delete p;  // Surprise! ~Base() will be called, but ~Derived() will not
+             // - value_ is leaked.
+```
+
+By changing `~Base()` to virtual, `~Derived()` will be correctly
+called when `delete p` is executed, and the heap checker
+will be happy.
+
+## The "newer expectations override older ones" rule makes writing expectations awkward.  Why does Google Mock do that? ##
+
+When people complain about this, often they are referring to code like:
+
+```
+// foo.Bar() should be called twice, return 1 the first time, and return
+// 2 the second time.  However, I have to write the expectations in the
+// reverse order.  This sucks big time!!!
+EXPECT_CALL(foo, Bar())
+    .WillOnce(Return(2))
+    .RetiresOnSaturation();
+EXPECT_CALL(foo, Bar())
+    .WillOnce(Return(1))
+    .RetiresOnSaturation();
+```
+
+The problem is that they didn't pick the **best** way to express the test's
+intent.
+
+By default, expectations don't have to be matched in _any_ particular
+order.  If you want them to match in a certain order, you need to be
+explicit.  This is Google Mock's (and jMock's) fundamental philosophy: it's
+easy to accidentally over-specify your tests, and we want to make it
+harder to do so.
+
+There are two better ways to write the test spec.  You could either
+put the expectations in sequence:
+
+```
+// foo.Bar() should be called twice, return 1 the first time, and return
+// 2 the second time.  Using a sequence, we can write the expectations
+// in their natural order.
+{
+  InSequence s;
+  EXPECT_CALL(foo, Bar())
+      .WillOnce(Return(1))
+      .RetiresOnSaturation();
+  EXPECT_CALL(foo, Bar())
+      .WillOnce(Return(2))
+      .RetiresOnSaturation();
+}
+```
+
+or you can put the sequence of actions in the same expectation:
+
+```
+// foo.Bar() should be called twice, return 1 the first time, and return
+// 2 the second time.
+EXPECT_CALL(foo, Bar())
+    .WillOnce(Return(1))
+    .WillOnce(Return(2))
+    .RetiresOnSaturation();
+```
+
+Back to the original questions: why does Google Mock search the
+expectations (and `ON_CALL`s) from back to front?  Because this
+allows a user to set up a mock's behavior for the common case early
+(e.g. in the mock's constructor or the test fixture's set-up phase)
+and customize it with more specific rules later.  If Google Mock
+searches from front to back, this very useful pattern won't be
+possible.
+
+## Google Mock prints a warning when a function without EXPECT\_CALL is called, even if I have set its behavior using ON\_CALL.  Would it be reasonable not to show the warning in this case? ##
+
+When choosing between being neat and being safe, we lean toward the
+latter.  So the answer is that we think it's better to show the
+warning.
+
+Often people write `ON_CALL`s in the mock object's
+constructor or `SetUp()`, as the default behavior rarely changes from
+test to test.  Then in the test body they set the expectations, which
+are often different for each test.  Having an `ON_CALL` in the set-up
+part of a test doesn't mean that the calls are expected.  If there's
+no `EXPECT_CALL` and the method is called, it's possibly an error.  If
+we quietly let the call go through without notifying the user, bugs
+may creep in unnoticed.
+
+If, however, you are sure that the calls are OK, you can write
+
+```
+EXPECT_CALL(foo, Bar(_))
+    .WillRepeatedly(...);
+```
+
+instead of
+
+```
+ON_CALL(foo, Bar(_))
+    .WillByDefault(...);
+```
+
+This tells Google Mock that you do expect the calls and no warning should be
+printed.
+
+Also, you can control the verbosity using the `--gmock_verbose` flag.
+If you find the output too noisy when debugging, just choose a less
+verbose level.
+
+## How can I delete the mock function's argument in an action? ##
+
+If you find yourself needing to perform some action that's not
+supported by Google Mock directly, remember that you can define your own
+actions using
+[MakeAction()](CookBook.md#writing-new-actions) or
+[MakePolymorphicAction()](CookBook.md#writing_new_polymorphic_actions),
+or you can write a stub function and invoke it using
+[Invoke()](CookBook.md#using-functions_methods_functors).
+
+## MOCK\_METHODn()'s second argument looks funny.  Why don't you use the MOCK\_METHODn(Method, return\_type, arg\_1, ..., arg\_n) syntax? ##
+
+What?!  I think it's beautiful. :-)
+
+While which syntax looks more natural is a subjective matter to some
+extent, Google Mock's syntax was chosen for several practical advantages it
+has.
+
+Try to mock a function that takes a map as an argument:
+```
+virtual int GetSize(const map<int, std::string>& m);
+```
+
+Using the proposed syntax, it would be:
+```
+MOCK_METHOD1(GetSize, int, const map<int, std::string>& m);
+```
+
+Guess what?  You'll get a compiler error as the compiler thinks that
+`const map<int, std::string>& m` are **two**, not one, arguments. To work
+around this you can use `typedef` to give the map type a name, but
+that gets in the way of your work.  Google Mock's syntax avoids this
+problem as the function's argument types are protected inside a pair
+of parentheses:
+```
+// This compiles fine.
+MOCK_METHOD1(GetSize, int(const map<int, std::string>& m));
+```
+
+You still need a `typedef` if the return type contains an unprotected
+comma, but that's much rarer.
+
+Other advantages include:
+  1. `MOCK_METHOD1(Foo, int, bool)` can leave a reader wonder whether the method returns `int` or `bool`, while there won't be such confusion using Google Mock's syntax.
+  1. The way Google Mock describes a function type is nothing new, although many people may not be familiar with it.  The same syntax was used in C, and the `function` library in `tr1` uses this syntax extensively.  Since `tr1` will become a part of the new version of STL, we feel very comfortable to be consistent with it.
+  1. The function type syntax is also used in other parts of Google Mock's API (e.g. the action interface) in order to make the implementation tractable. A user needs to learn it anyway in order to utilize Google Mock's more advanced features.  We'd as well stick to the same syntax in `MOCK_METHOD*`!
+
+## My code calls a static/global function.  Can I mock it? ##
+
+You can, but you need to make some changes.
+
+In general, if you find yourself needing to mock a static function,
+it's a sign that your modules are too tightly coupled (and less
+flexible, less reusable, less testable, etc).  You are probably better
+off defining a small interface and call the function through that
+interface, which then can be easily mocked.  It's a bit of work
+initially, but usually pays for itself quickly.
+
+This Google Testing Blog
+[post](http://googletesting.blogspot.com/2008/06/defeat-static-cling.html)
+says it excellently.  Check it out.
+
+## My mock object needs to do complex stuff.  It's a lot of pain to specify the actions.  Google Mock sucks! ##
+
+I know it's not a question, but you get an answer for free any way. :-)
+
+With Google Mock, you can create mocks in C++ easily.  And people might be
+tempted to use them everywhere. Sometimes they work great, and
+sometimes you may find them, well, a pain to use. So, what's wrong in
+the latter case?
+
+When you write a test without using mocks, you exercise the code and
+assert that it returns the correct value or that the system is in an
+expected state.  This is sometimes called "state-based testing".
+
+Mocks are great for what some call "interaction-based" testing:
+instead of checking the system state at the very end, mock objects
+verify that they are invoked the right way and report an error as soon
+as it arises, giving you a handle on the precise context in which the
+error was triggered.  This is often more effective and economical to
+do than state-based testing.
+
+If you are doing state-based testing and using a test double just to
+simulate the real object, you are probably better off using a fake.
+Using a mock in this case causes pain, as it's not a strong point for
+mocks to perform complex actions.  If you experience this and think
+that mocks suck, you are just not using the right tool for your
+problem. Or, you might be trying to solve the wrong problem. :-)
+
+## I got a warning "Uninteresting function call encountered - default action taken.."  Should I panic? ##
+
+By all means, NO!  It's just an FYI.
+
+What it means is that you have a mock function, you haven't set any
+expectations on it (by Google Mock's rule this means that you are not
+interested in calls to this function and therefore it can be called
+any number of times), and it is called.  That's OK - you didn't say
+it's not OK to call the function!
+
+What if you actually meant to disallow this function to be called, but
+forgot to write `EXPECT_CALL(foo, Bar()).Times(0)`?  While
+one can argue that it's the user's fault, Google Mock tries to be nice and
+prints you a note.
+
+So, when you see the message and believe that there shouldn't be any
+uninteresting calls, you should investigate what's going on.  To make
+your life easier, Google Mock prints the function name and arguments
+when an uninteresting call is encountered.
+
+## I want to define a custom action.  Should I use Invoke() or implement the action interface? ##
+
+Either way is fine - you want to choose the one that's more convenient
+for your circumstance.
+
+Usually, if your action is for a particular function type, defining it
+using `Invoke()` should be easier; if your action can be used in
+functions of different types (e.g. if you are defining
+`Return(value)`), `MakePolymorphicAction()` is
+easiest.  Sometimes you want precise control on what types of
+functions the action can be used in, and implementing
+`ActionInterface` is the way to go here. See the implementation of
+`Return()` in `include/gmock/gmock-actions.h` for an example.
+
+## I'm using the set-argument-pointee action, and the compiler complains about "conflicting return type specified".  What does it mean? ##
+
+You got this error as Google Mock has no idea what value it should return
+when the mock method is called.  `SetArgPointee()` says what the
+side effect is, but doesn't say what the return value should be.  You
+need `DoAll()` to chain a `SetArgPointee()` with a `Return()`.
+
+See this [recipe](CookBook.md#mocking_side_effects) for more details and an example.
+
+
+## My question is not in your FAQ! ##
+
+If you cannot find the answer to your question in this FAQ, there are
+some other resources you can use:
+
+  1. read other [documentation](Documentation.md),
+  1. search the mailing list [archive](http://groups.google.com/group/googlemock/topics),
+  1. ask it on [googlemock@googlegroups.com](mailto:googlemock@googlegroups.com) and someone will answer it (to prevent spam, we require you to join the [discussion group](http://groups.google.com/group/googlemock) before you can post.).
+
+Please note that creating an issue in the
+[issue tracker](https://github.com/google/googletest/issues) is _not_
+a good way to get your answer, as it is monitored infrequently by a
+very small number of people.
+
+When asking a question, it's helpful to provide as much of the
+following information as possible (people cannot help you if there's
+not enough information in your question):
+
+  * the version (or the revision number if you check out from SVN directly) of Google Mock you use (Google Mock is under active development, so it's possible that your problem has been solved in a later version),
+  * your operating system,
+  * the name and version of your compiler,
+  * the complete command line flags you give to your compiler,
+  * the complete compiler error messages (if the question is about compilation),
+  * the _actual_ code (ideally, a minimal but complete program) that has the problem you encounter.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/KnownIssues.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/KnownIssues.md
new file mode 100644
index 0000000000..adadf5144b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/KnownIssues.md
@@ -0,0 +1,19 @@
+As any non-trivial software system, Google Mock has some known limitations and problems.  We are working on improving it, and welcome your help!  The follow is a list of issues we know about.
+
+
+
+## README contains outdated information on Google Mock's compatibility with other testing frameworks ##
+
+The `README` file in release 1.1.0 still says that Google Mock only works with Google Test.  Actually, you can configure Google Mock to work with any testing framework you choose.
+
+## Tests failing on machines using Power PC CPUs (e.g. some Macs) ##
+
+`gmock_output_test` and `gmock-printers_test` are known to fail with Power PC CPUs.  This is due to portability issues with these tests, and is not an indication of problems in Google Mock itself.  You can safely ignore them.
+
+## Failed to resolve libgtest.so.0 in tests when built against installed Google Test ##
+
+This only applies if you manually built and installed Google Test, and then built a Google Mock against it (either explicitly, or because gtest-config was in your path post-install). In this situation, Libtool has a known issue with certain systems' ldconfig setup:
+
+http://article.gmane.org/gmane.comp.sysutils.automake.general/9025
+
+This requires a manual run of "sudo ldconfig" after the "sudo make install" for Google Test before any binaries which link against it can be executed. This isn't a bug in our install, but we should at least have documented it or hacked a work-around into our install. We should have one of these solutions in our next release.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/CheatSheet.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/CheatSheet.md
new file mode 100644
index 0000000000..3c7bed4c6f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/CheatSheet.md
@@ -0,0 +1,525 @@
+
+
+# Defining a Mock Class #
+
+## Mocking a Normal Class ##
+
+Given
+```
+class Foo {
+  ...
+  virtual ~Foo();
+  virtual int GetSize() const = 0;
+  virtual string Describe(const char* name) = 0;
+  virtual string Describe(int type) = 0;
+  virtual bool Process(Bar elem, int count) = 0;
+};
+```
+(note that `~Foo()` **must** be virtual) we can define its mock as
+```
+#include <gmock/gmock.h>
+
+class MockFoo : public Foo {
+  MOCK_CONST_METHOD0(GetSize, int());
+  MOCK_METHOD1(Describe, string(const char* name));
+  MOCK_METHOD1(Describe, string(int type));
+  MOCK_METHOD2(Process, bool(Bar elem, int count));
+};
+```
+
+To create a "nice" mock object which ignores all uninteresting calls,
+or a "strict" mock object, which treats them as failures:
+```
+NiceMock<MockFoo> nice_foo;     // The type is a subclass of MockFoo.
+StrictMock<MockFoo> strict_foo; // The type is a subclass of MockFoo.
+```
+
+## Mocking a Class Template ##
+
+To mock
+```
+template <typename Elem>
+class StackInterface {
+ public:
+  ...
+  virtual ~StackInterface();
+  virtual int GetSize() const = 0;
+  virtual void Push(const Elem& x) = 0;
+};
+```
+(note that `~StackInterface()` **must** be virtual) just append `_T` to the `MOCK_*` macros:
+```
+template <typename Elem>
+class MockStack : public StackInterface<Elem> {
+ public:
+  ...
+  MOCK_CONST_METHOD0_T(GetSize, int());
+  MOCK_METHOD1_T(Push, void(const Elem& x));
+};
+```
+
+## Specifying Calling Conventions for Mock Functions ##
+
+If your mock function doesn't use the default calling convention, you
+can specify it by appending `_WITH_CALLTYPE` to any of the macros
+described in the previous two sections and supplying the calling
+convention as the first argument to the macro. For example,
+```
+  MOCK_METHOD_1_WITH_CALLTYPE(STDMETHODCALLTYPE, Foo, bool(int n));
+  MOCK_CONST_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, Bar, int(double x, double y));
+```
+where `STDMETHODCALLTYPE` is defined by `<objbase.h>` on Windows.
+
+# Using Mocks in Tests #
+
+The typical flow is:
+  1. Import the Google Mock names you need to use. All Google Mock names are in the `testing` namespace unless they are macros or otherwise noted.
+  1. Create the mock objects.
+  1. Optionally, set the default actions of the mock objects.
+  1. Set your expectations on the mock objects (How will they be called? What wil they do?).
+  1. Exercise code that uses the mock objects; if necessary, check the result using [Google Test](http://code.google.com/p/googletest/) assertions.
+  1. When a mock objects is destructed, Google Mock automatically verifies that all expectations on it have been satisfied.
+
+Here is an example:
+```
+using ::testing::Return;                            // #1
+
+TEST(BarTest, DoesThis) {
+  MockFoo foo;                                    // #2
+
+  ON_CALL(foo, GetSize())                         // #3
+      .WillByDefault(Return(1));
+  // ... other default actions ...
+
+  EXPECT_CALL(foo, Describe(5))                   // #4
+      .Times(3)
+      .WillRepeatedly(Return("Category 5"));
+  // ... other expectations ...
+
+  EXPECT_EQ("good", MyProductionFunction(&foo));  // #5
+}                                                 // #6
+```
+
+# Setting Default Actions #
+
+Google Mock has a **built-in default action** for any function that
+returns `void`, `bool`, a numeric value, or a pointer.
+
+To customize the default action for functions with return type `T` globally:
+```
+using ::testing::DefaultValue;
+
+DefaultValue<T>::Set(value);  // Sets the default value to be returned.
+// ... use the mocks ...
+DefaultValue<T>::Clear();     // Resets the default value.
+```
+
+To customize the default action for a particular method, use `ON_CALL()`:
+```
+ON_CALL(mock_object, method(matchers))
+    .With(multi_argument_matcher)  ?
+    .WillByDefault(action);
+```
+
+# Setting Expectations #
+
+`EXPECT_CALL()` sets **expectations** on a mock method (How will it be
+called? What will it do?):
+```
+EXPECT_CALL(mock_object, method(matchers))
+    .With(multi_argument_matcher)  ?
+    .Times(cardinality)            ?
+    .InSequence(sequences)         *
+    .After(expectations)           *
+    .WillOnce(action)              *
+    .WillRepeatedly(action)        ?
+    .RetiresOnSaturation();        ?
+```
+
+If `Times()` is omitted, the cardinality is assumed to be:
+
+  * `Times(1)` when there is neither `WillOnce()` nor `WillRepeatedly()`;
+  * `Times(n)` when there are `n WillOnce()`s but no `WillRepeatedly()`, where `n` >= 1; or
+  * `Times(AtLeast(n))` when there are `n WillOnce()`s and a `WillRepeatedly()`, where `n` >= 0.
+
+A method with no `EXPECT_CALL()` is free to be invoked _any number of times_, and the default action will be taken each time.
+
+# Matchers #
+
+A **matcher** matches a _single_ argument.  You can use it inside
+`ON_CALL()` or `EXPECT_CALL()`, or use it to validate a value
+directly:
+
+| `EXPECT_THAT(value, matcher)` | Asserts that `value` matches `matcher`. |
+|:------------------------------|:----------------------------------------|
+| `ASSERT_THAT(value, matcher)` | The same as `EXPECT_THAT(value, matcher)`, except that it generates a **fatal** failure. |
+
+Built-in matchers (where `argument` is the function argument) are
+divided into several categories:
+
+## Wildcard ##
+|`_`|`argument` can be any value of the correct type.|
+|:--|:-----------------------------------------------|
+|`A<type>()` or `An<type>()`|`argument` can be any value of type `type`.     |
+
+## Generic Comparison ##
+
+|`Eq(value)` or `value`|`argument == value`|
+|:---------------------|:------------------|
+|`Ge(value)`           |`argument >= value`|
+|`Gt(value)`           |`argument > value` |
+|`Le(value)`           |`argument <= value`|
+|`Lt(value)`           |`argument < value` |
+|`Ne(value)`           |`argument != value`|
+|`IsNull()`            |`argument` is a `NULL` pointer (raw or smart).|
+|`NotNull()`           |`argument` is a non-null pointer (raw or smart).|
+|`Ref(variable)`       |`argument` is a reference to `variable`.|
+|`TypedEq<type>(value)`|`argument` has type `type` and is equal to `value`. You may need to use this instead of `Eq(value)` when the mock function is overloaded.|
+
+Except `Ref()`, these matchers make a _copy_ of `value` in case it's
+modified or destructed later. If the compiler complains that `value`
+doesn't have a public copy constructor, try wrap it in `ByRef()`,
+e.g. `Eq(ByRef(non_copyable_value))`. If you do that, make sure
+`non_copyable_value` is not changed afterwards, or the meaning of your
+matcher will be changed.
+
+## Floating-Point Matchers ##
+
+|`DoubleEq(a_double)`|`argument` is a `double` value approximately equal to `a_double`, treating two NaNs as unequal.|
+|:-------------------|:----------------------------------------------------------------------------------------------|
+|`FloatEq(a_float)`  |`argument` is a `float` value approximately equal to `a_float`, treating two NaNs as unequal.  |
+|`NanSensitiveDoubleEq(a_double)`|`argument` is a `double` value approximately equal to `a_double`, treating two NaNs as equal.  |
+|`NanSensitiveFloatEq(a_float)`|`argument` is a `float` value approximately equal to `a_float`, treating two NaNs as equal.    |
+
+The above matchers use ULP-based comparison (the same as used in
+[Google Test](http://code.google.com/p/googletest/)). They
+automatically pick a reasonable error bound based on the absolute
+value of the expected value.  `DoubleEq()` and `FloatEq()` conform to
+the IEEE standard, which requires comparing two NaNs for equality to
+return false. The `NanSensitive*` version instead treats two NaNs as
+equal, which is often what a user wants.
+
+## String Matchers ##
+
+The `argument` can be either a C string or a C++ string object:
+
+|`ContainsRegex(string)`|`argument` matches the given regular expression.|
+|:----------------------|:-----------------------------------------------|
+|`EndsWith(suffix)`     |`argument` ends with string `suffix`.           |
+|`HasSubstr(string)`    |`argument` contains `string` as a sub-string.   |
+|`MatchesRegex(string)` |`argument` matches the given regular expression with the match starting at the first character and ending at the last character.|
+|`StartsWith(prefix)`   |`argument` starts with string `prefix`.         |
+|`StrCaseEq(string)`    |`argument` is equal to `string`, ignoring case. |
+|`StrCaseNe(string)`    |`argument` is not equal to `string`, ignoring case.|
+|`StrEq(string)`        |`argument` is equal to `string`.                |
+|`StrNe(string)`        |`argument` is not equal to `string`.            |
+
+`StrCaseEq()`, `StrCaseNe()`, `StrEq()`, and `StrNe()` work for wide
+strings as well.
+
+## Container Matchers ##
+
+Most STL-style containers support `==`, so you can use
+`Eq(expected_container)` or simply `expected_container` to match a
+container exactly.   If you want to write the elements in-line,
+match them more flexibly, or get more informative messages, you can use:
+
+| `Contains(e)` | `argument` contains an element that matches `e`, which can be either a value or a matcher. |
+|:--------------|:-------------------------------------------------------------------------------------------|
+|`ElementsAre(e0, e1, ..., en)`|`argument` has `n + 1` elements, where the i-th element matches `ei`, which can be a value or a matcher. 0 to 10 arguments are allowed.|
+|`ElementsAreArray(array)` or `ElementsAreArray(array, count)`|The same as `ElementsAre()` except that the expected element values/matchers come from a C-style array.|
+| `ContainerEq(container)` | The same as `Eq(container)` except that the failure message also includes which elements are in one container but not the other. |
+
+These matchers can also match:
+
+  1. a native array passed by reference (e.g. in `Foo(const int (&a)[5])`), and
+  1. an array passed as a pointer and a count (e.g. in `Bar(const T* buffer, int len)` -- see [Multi-argument Matchers](#Multiargument_Matchers.md)).
+
+where the array may be multi-dimensional (i.e. its elements can be arrays).
+
+## Member Matchers ##
+
+|`Field(&class::field, m)`|`argument.field` (or `argument->field` when `argument` is a plain pointer) matches matcher `m`, where `argument` is an object of type _class_.|
+|:------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------|
+|`Key(e)`                 |`argument.first` matches `e`, which can be either a value or a matcher. E.g. `Contains(Key(Le(5)))` can verify that a `map` contains a key `<= 5`.|
+|`Pair(m1, m2)`           |`argument` is an `std::pair` whose `first` field matches `m1` and `second` field matches `m2`.                                                |
+|`Property(&class::property, m)`|`argument.property()` (or `argument->property()` when `argument` is a plain pointer) matches matcher `m`, where `argument` is an object of type _class_.|
+
+## Matching the Result of a Function or Functor ##
+
+|`ResultOf(f, m)`|`f(argument)` matches matcher `m`, where `f` is a function or functor.|
+|:---------------|:---------------------------------------------------------------------|
+
+## Pointer Matchers ##
+
+|`Pointee(m)`|`argument` (either a smart pointer or a raw pointer) points to a value that matches matcher `m`.|
+|:-----------|:-----------------------------------------------------------------------------------------------|
+
+## Multiargument Matchers ##
+
+These are matchers on tuple types. They can be used in
+`.With()`. The following can be used on functions with <i>two<br>
+arguments</i> `x` and `y`:
+
+|`Eq()`|`x == y`|
+|:-----|:-------|
+|`Ge()`|`x >= y`|
+|`Gt()`|`x > y` |
+|`Le()`|`x <= y`|
+|`Lt()`|`x < y` |
+|`Ne()`|`x != y`|
+
+You can use the following selectors to pick a subset of the arguments
+(or reorder them) to participate in the matching:
+
+|`AllArgs(m)`|Equivalent to `m`. Useful as syntactic sugar in `.With(AllArgs(m))`.|
+|:-----------|:-------------------------------------------------------------------|
+|`Args<N1, N2, ..., Nk>(m)`|The `k` selected (using 0-based indices) arguments match `m`, e.g. `Args<1, 2>(Contains(5))`.|
+
+## Composite Matchers ##
+
+You can make a matcher from one or more other matchers:
+
+|`AllOf(m1, m2, ..., mn)`|`argument` matches all of the matchers `m1` to `mn`.|
+|:-----------------------|:---------------------------------------------------|
+|`AnyOf(m1, m2, ..., mn)`|`argument` matches at least one of the matchers `m1` to `mn`.|
+|`Not(m)`                |`argument` doesn't match matcher `m`.               |
+
+## Adapters for Matchers ##
+
+|`MatcherCast<T>(m)`|casts matcher `m` to type `Matcher<T>`.|
+|:------------------|:--------------------------------------|
+|`SafeMatcherCast<T>(m)`| [safely casts](V1_5_CookBook#Casting_Matchers.md) matcher `m` to type `Matcher<T>`. |
+|`Truly(predicate)` |`predicate(argument)` returns something considered by C++ to be true, where `predicate` is a function or functor.|
+
+## Matchers as Predicates ##
+
+|`Matches(m)`|a unary functor that returns `true` if the argument matches `m`.|
+|:-----------|:---------------------------------------------------------------|
+|`ExplainMatchResult(m, value, result_listener)`|returns `true` if `value` matches `m`, explaining the result to `result_listener`.|
+|`Value(x, m)`|returns `true` if the value of `x` matches `m`.                 |
+
+## Defining Matchers ##
+
+| `MATCHER(IsEven, "") { return (arg % 2) == 0; }` | Defines a matcher `IsEven()` to match an even number. |
+|:-------------------------------------------------|:------------------------------------------------------|
+| `MATCHER_P(IsDivisibleBy, n, "") { *result_listener << "where the remainder is " << (arg % n); return (arg % n) == 0; }` | Defines a macher `IsDivisibleBy(n)` to match a number divisible by `n`. |
+| `MATCHER_P2(IsBetween, a, b, "is between %(a)s and %(b)s") { return a <= arg && arg <= b; }` | Defines a matcher `IsBetween(a, b)` to match a value in the range [`a`, `b`]. |
+
+**Notes:**
+
+  1. The `MATCHER*` macros cannot be used inside a function or class.
+  1. The matcher body must be _purely functional_ (i.e. it cannot have any side effect, and the result must not depend on anything other than the value being matched and the matcher parameters).
+  1. You can use `PrintToString(x)` to convert a value `x` of any type to a string.
+
+## Matchers as Test Assertions ##
+
+|`ASSERT_THAT(expression, m)`|Generates a [fatal failure](http://code.google.com/p/googletest/wiki/GoogleTestPrimer#Assertions) if the value of `expression` doesn't match matcher `m`.|
+|:---------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------|
+|`EXPECT_THAT(expression, m)`|Generates a non-fatal failure if the value of `expression` doesn't match matcher `m`.                                                                    |
+
+# Actions #
+
+**Actions** specify what a mock function should do when invoked.
+
+## Returning a Value ##
+
+|`Return()`|Return from a `void` mock function.|
+|:---------|:----------------------------------|
+|`Return(value)`|Return `value`.                    |
+|`ReturnArg<N>()`|Return the `N`-th (0-based) argument.|
+|`ReturnNew<T>(a1, ..., ak)`|Return `new T(a1, ..., ak)`; a different object is created each time.|
+|`ReturnNull()`|Return a null pointer.             |
+|`ReturnRef(variable)`|Return a reference to `variable`.  |
+
+## Side Effects ##
+
+|`Assign(&variable, value)`|Assign `value` to variable.|
+|:-------------------------|:--------------------------|
+| `DeleteArg<N>()`         | Delete the `N`-th (0-based) argument, which must be a pointer. |
+| `SaveArg<N>(pointer)`    | Save the `N`-th (0-based) argument to `*pointer`. |
+| `SetArgReferee<N>(value)` |	Assign value to the variable referenced by the `N`-th (0-based) argument. |
+|`SetArgumentPointee<N>(value)`|Assign `value` to the variable pointed by the `N`-th (0-based) argument.|
+|`SetArrayArgument<N>(first, last)`|Copies the elements in source range [`first`, `last`) to the array pointed to by the `N`-th (0-based) argument, which can be either a pointer or an iterator. The action does not take ownership of the elements in the source range.|
+|`SetErrnoAndReturn(error, value)`|Set `errno` to `error` and return `value`.|
+|`Throw(exception)`        |Throws the given exception, which can be any copyable value. Available since v1.1.0.|
+
+## Using a Function or a Functor as an Action ##
+
+|`Invoke(f)`|Invoke `f` with the arguments passed to the mock function, where `f` can be a global/static function or a functor.|
+|:----------|:-----------------------------------------------------------------------------------------------------------------|
+|`Invoke(object_pointer, &class::method)`|Invoke the {method on the object with the arguments passed to the mock function.                                  |
+|`InvokeWithoutArgs(f)`|Invoke `f`, which can be a global/static function or a functor. `f` must take no arguments.                       |
+|`InvokeWithoutArgs(object_pointer, &class::method)`|Invoke the method on the object, which takes no arguments.                                                        |
+|`InvokeArgument<N>(arg1, arg2, ..., argk)`|Invoke the mock function's `N`-th (0-based) argument, which must be a function or a functor, with the `k` arguments.|
+
+The return value of the invoked function is used as the return value
+of the action.
+
+When defining a function or functor to be used with `Invoke*()`, you can declare any unused parameters as `Unused`:
+```
+  double Distance(Unused, double x, double y) { return sqrt(x*x + y*y); }
+  ...
+  EXPECT_CALL(mock, Foo("Hi", _, _)).WillOnce(Invoke(Distance));
+```
+
+In `InvokeArgument<N>(...)`, if an argument needs to be passed by reference, wrap it inside `ByRef()`. For example,
+```
+  InvokeArgument<2>(5, string("Hi"), ByRef(foo))
+```
+calls the mock function's #2 argument, passing to it `5` and `string("Hi")` by value, and `foo` by reference.
+
+## Default Action ##
+
+|`DoDefault()`|Do the default action (specified by `ON_CALL()` or the built-in one).|
+|:------------|:--------------------------------------------------------------------|
+
+**Note:** due to technical reasons, `DoDefault()` cannot be used inside  a composite action - trying to do so will result in a run-time error.
+
+## Composite Actions ##
+
+|`DoAll(a1, a2, ..., an)`|Do all actions `a1` to `an` and return the result of `an` in each invocation. The first `n - 1` sub-actions must return void. |
+|:-----------------------|:-----------------------------------------------------------------------------------------------------------------------------|
+|`IgnoreResult(a)`       |Perform action `a` and ignore its result. `a` must not return void.                                                           |
+|`WithArg<N>(a)`         |Pass the `N`-th (0-based) argument of the mock function to action `a` and perform it.                                         |
+|`WithArgs<N1, N2, ..., Nk>(a)`|Pass the selected (0-based) arguments of the mock function to action `a` and perform it.                                      |
+|`WithoutArgs(a)`        |Perform action `a` without any arguments.                                                                                     |
+
+## Defining Actions ##
+
+| `ACTION(Sum) { return arg0 + arg1; }` | Defines an action `Sum()` to return the sum of the mock function's argument #0 and #1. |
+|:--------------------------------------|:---------------------------------------------------------------------------------------|
+| `ACTION_P(Plus, n) { return arg0 + n; }` | Defines an action `Plus(n)` to return the sum of the mock function's argument #0 and `n`. |
+| `ACTION_Pk(Foo, p1, ..., pk) { statements; }` | Defines a parameterized action `Foo(p1, ..., pk)` to execute the given `statements`.   |
+
+The `ACTION*` macros cannot be used inside a function or class.
+
+# Cardinalities #
+
+These are used in `Times()` to specify how many times a mock function will be called:
+
+|`AnyNumber()`|The function can be called any number of times.|
+|:------------|:----------------------------------------------|
+|`AtLeast(n)` |The call is expected at least `n` times.       |
+|`AtMost(n)`  |The call is expected at most `n` times.        |
+|`Between(m, n)`|The call is expected between `m` and `n` (inclusive) times.|
+|`Exactly(n) or n`|The call is expected exactly `n` times. In particular, the call should never happen when `n` is 0.|
+
+# Expectation Order #
+
+By default, the expectations can be matched in _any_ order.  If some
+or all expectations must be matched in a given order, there are two
+ways to specify it.  They can be used either independently or
+together.
+
+## The After Clause ##
+
+```
+using ::testing::Expectation;
+...
+Expectation init_x = EXPECT_CALL(foo, InitX());
+Expectation init_y = EXPECT_CALL(foo, InitY());
+EXPECT_CALL(foo, Bar())
+    .After(init_x, init_y);
+```
+says that `Bar()` can be called only after both `InitX()` and
+`InitY()` have been called.
+
+If you don't know how many pre-requisites an expectation has when you
+write it, you can use an `ExpectationSet` to collect them:
+
+```
+using ::testing::ExpectationSet;
+...
+ExpectationSet all_inits;
+for (int i = 0; i < element_count; i++) {
+  all_inits += EXPECT_CALL(foo, InitElement(i));
+}
+EXPECT_CALL(foo, Bar())
+    .After(all_inits);
+```
+says that `Bar()` can be called only after all elements have been
+initialized (but we don't care about which elements get initialized
+before the others).
+
+Modifying an `ExpectationSet` after using it in an `.After()` doesn't
+affect the meaning of the `.After()`.
+
+## Sequences ##
+
+When you have a long chain of sequential expectations, it's easier to
+specify the order using **sequences**, which don't require you to given
+each expectation in the chain a different name.  <i>All expected<br>
+calls</i> in the same sequence must occur in the order they are
+specified.
+
+```
+using ::testing::Sequence;
+Sequence s1, s2;
+...
+EXPECT_CALL(foo, Reset())
+    .InSequence(s1, s2)
+    .WillOnce(Return(true));
+EXPECT_CALL(foo, GetSize())
+    .InSequence(s1)
+    .WillOnce(Return(1));
+EXPECT_CALL(foo, Describe(A<const char*>()))
+    .InSequence(s2)
+    .WillOnce(Return("dummy"));
+```
+says that `Reset()` must be called before _both_ `GetSize()` _and_
+`Describe()`, and the latter two can occur in any order.
+
+To put many expectations in a sequence conveniently:
+```
+using ::testing::InSequence;
+{
+  InSequence dummy;
+
+  EXPECT_CALL(...)...;
+  EXPECT_CALL(...)...;
+  ...
+  EXPECT_CALL(...)...;
+}
+```
+says that all expected calls in the scope of `dummy` must occur in
+strict order. The name `dummy` is irrelevant.)
+
+# Verifying and Resetting a Mock #
+
+Google Mock will verify the expectations on a mock object when it is destructed, or you can do it earlier:
+```
+using ::testing::Mock;
+...
+// Verifies and removes the expectations on mock_obj;
+// returns true iff successful.
+Mock::VerifyAndClearExpectations(&mock_obj);
+...
+// Verifies and removes the expectations on mock_obj;
+// also removes the default actions set by ON_CALL();
+// returns true iff successful.
+Mock::VerifyAndClear(&mock_obj);
+```
+
+You can also tell Google Mock that a mock object can be leaked and doesn't
+need to be verified:
+```
+Mock::AllowLeak(&mock_obj);
+```
+
+# Mock Classes #
+
+Google Mock defines a convenient mock class template
+```
+class MockFunction<R(A1, ..., An)> {
+ public:
+  MOCK_METHODn(Call, R(A1, ..., An));
+};
+```
+See this [recipe](V1_5_CookBook#Using_Check_Points.md) for one application of it.
+
+# Flags #
+
+| `--gmock_catch_leaked_mocks=0` | Don't report leaked mock objects as failures. |
+|:-------------------------------|:----------------------------------------------|
+| `--gmock_verbose=LEVEL`        | Sets the default verbosity level (`info`, `warning`, or `error`) of Google Mock messages. |
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/CookBook.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/CookBook.md
new file mode 100644
index 0000000000..26e153c6ba
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/CookBook.md
@@ -0,0 +1,3250 @@
+
+
+You can find recipes for using Google Mock here. If you haven't yet,
+please read the [ForDummies](V1_5_ForDummies.md) document first to make sure you understand
+the basics.
+
+**Note:** Google Mock lives in the `testing` name space. For
+readability, it is recommended to write `using ::testing::Foo;` once in
+your file before using the name `Foo` defined by Google Mock. We omit
+such `using` statements in this page for brevity, but you should do it
+in your own code.
+
+# Creating Mock Classes #
+
+## Mocking Private or Protected Methods ##
+
+You must always put a mock method definition (`MOCK_METHOD*`) in a
+`public:` section of the mock class, regardless of the method being
+mocked being `public`, `protected`, or `private` in the base class.
+This allows `ON_CALL` and `EXPECT_CALL` to reference the mock function
+from outside of the mock class.  (Yes, C++ allows a subclass to change
+the access level of a virtual function in the base class.)  Example:
+
+```
+class Foo {
+ public:
+  ...
+  virtual bool Transform(Gadget* g) = 0;
+
+ protected:
+  virtual void Resume();
+
+ private:
+  virtual int GetTimeOut();
+};
+
+class MockFoo : public Foo {
+ public:
+  ...
+  MOCK_METHOD1(Transform, bool(Gadget* g));
+
+  // The following must be in the public section, even though the
+  // methods are protected or private in the base class.
+  MOCK_METHOD0(Resume, void());
+  MOCK_METHOD0(GetTimeOut, int());
+};
+```
+
+## Mocking Overloaded Methods ##
+
+You can mock overloaded functions as usual. No special attention is required:
+
+```
+class Foo {
+  ...
+
+  // Must be virtual as we'll inherit from Foo.
+  virtual ~Foo();
+
+  // Overloaded on the types and/or numbers of arguments.
+  virtual int Add(Element x);
+  virtual int Add(int times, Element x);
+
+  // Overloaded on the const-ness of this object.
+  virtual Bar& GetBar();
+  virtual const Bar& GetBar() const;
+};
+
+class MockFoo : public Foo {
+  ...
+  MOCK_METHOD1(Add, int(Element x));
+  MOCK_METHOD2(Add, int(int times, Element x);
+
+  MOCK_METHOD0(GetBar, Bar&());
+  MOCK_CONST_METHOD0(GetBar, const Bar&());
+};
+```
+
+**Note:** if you don't mock all versions of the overloaded method, the
+compiler will give you a warning about some methods in the base class
+being hidden. To fix that, use `using` to bring them in scope:
+
+```
+class MockFoo : public Foo {
+  ...
+  using Foo::Add;
+  MOCK_METHOD1(Add, int(Element x));
+  // We don't want to mock int Add(int times, Element x);
+  ...
+};
+```
+
+## Mocking Class Templates ##
+
+To mock a class template, append `_T` to the `MOCK_*` macros:
+
+```
+template <typename Elem>
+class StackInterface {
+  ...
+  // Must be virtual as we'll inherit from StackInterface.
+  virtual ~StackInterface();
+
+  virtual int GetSize() const = 0;
+  virtual void Push(const Elem& x) = 0;
+};
+
+template <typename Elem>
+class MockStack : public StackInterface<Elem> {
+  ...
+  MOCK_CONST_METHOD0_T(GetSize, int());
+  MOCK_METHOD1_T(Push, void(const Elem& x));
+};
+```
+
+## Mocking Nonvirtual Methods ##
+
+Google Mock can mock non-virtual functions to be used in what we call _hi-perf
+dependency injection_.
+
+In this case, instead of sharing a common base class with the real
+class, your mock class will be _unrelated_ to the real class, but
+contain methods with the same signatures.  The syntax for mocking
+non-virtual methods is the _same_ as mocking virtual methods:
+
+```
+// A simple packet stream class.  None of its members is virtual.
+class ConcretePacketStream {
+ public:
+  void AppendPacket(Packet* new_packet);
+  const Packet* GetPacket(size_t packet_number) const;
+  size_t NumberOfPackets() const;
+  ...
+};
+
+// A mock packet stream class.  It inherits from no other, but defines
+// GetPacket() and NumberOfPackets().
+class MockPacketStream {
+ public:
+  MOCK_CONST_METHOD1(GetPacket, const Packet*(size_t packet_number));
+  MOCK_CONST_METHOD0(NumberOfPackets, size_t());
+  ...
+};
+```
+
+Note that the mock class doesn't define `AppendPacket()`, unlike the
+real class. That's fine as long as the test doesn't need to call it.
+
+Next, you need a way to say that you want to use
+`ConcretePacketStream` in production code, and use `MockPacketStream`
+in tests.  Since the functions are not virtual and the two classes are
+unrelated, you must specify your choice at _compile time_ (as opposed
+to run time).
+
+One way to do it is to templatize your code that needs to use a packet
+stream.  More specifically, you will give your code a template type
+argument for the type of the packet stream.  In production, you will
+instantiate your template with `ConcretePacketStream` as the type
+argument.  In tests, you will instantiate the same template with
+`MockPacketStream`.  For example, you may write:
+
+```
+template <class PacketStream>
+void CreateConnection(PacketStream* stream) { ... }
+
+template <class PacketStream>
+class PacketReader {
+ public:
+  void ReadPackets(PacketStream* stream, size_t packet_num);
+};
+```
+
+Then you can use `CreateConnection<ConcretePacketStream>()` and
+`PacketReader<ConcretePacketStream>` in production code, and use
+`CreateConnection<MockPacketStream>()` and
+`PacketReader<MockPacketStream>` in tests.
+
+```
+  MockPacketStream mock_stream;
+  EXPECT_CALL(mock_stream, ...)...;
+  .. set more expectations on mock_stream ...
+  PacketReader<MockPacketStream> reader(&mock_stream);
+  ... exercise reader ...
+```
+
+## Mocking Free Functions ##
+
+It's possible to use Google Mock to mock a free function (i.e. a
+C-style function or a static method).  You just need to rewrite your
+code to use an interface (abstract class).
+
+Instead of calling a free function (say, `OpenFile`) directly,
+introduce an interface for it and have a concrete subclass that calls
+the free function:
+
+```
+class FileInterface {
+ public:
+  ...
+  virtual bool Open(const char* path, const char* mode) = 0;
+};
+
+class File : public FileInterface {
+ public:
+  ...
+  virtual bool Open(const char* path, const char* mode) {
+    return OpenFile(path, mode);
+  }
+};
+```
+
+Your code should talk to `FileInterface` to open a file.  Now it's
+easy to mock out the function.
+
+This may seem much hassle, but in practice you often have multiple
+related functions that you can put in the same interface, so the
+per-function syntactic overhead will be much lower.
+
+If you are concerned about the performance overhead incurred by
+virtual functions, and profiling confirms your concern, you can
+combine this with the recipe for [mocking non-virtual methods](#Mocking_Nonvirtual_Methods.md).
+
+## Nice Mocks and Strict Mocks ##
+
+If a mock method has no `EXPECT_CALL` spec but is called, Google Mock
+will print a warning about the "uninteresting call". The rationale is:
+
+  * New methods may be added to an interface after a test is written. We shouldn't fail a test just because a method it doesn't know about is called.
+  * However, this may also mean there's a bug in the test, so Google Mock shouldn't be silent either. If the user believes these calls are harmless, he can add an `EXPECT_CALL()` to suppress the warning.
+
+However, sometimes you may want to suppress all "uninteresting call"
+warnings, while sometimes you may want the opposite, i.e. to treat all
+of them as errors. Google Mock lets you make the decision on a
+per-mock-object basis.
+
+Suppose your test uses a mock class `MockFoo`:
+
+```
+TEST(...) {
+  MockFoo mock_foo;
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+}
+```
+
+If a method of `mock_foo` other than `DoThis()` is called, it will be
+reported by Google Mock as a warning. However, if you rewrite your
+test to use `NiceMock<MockFoo>` instead, the warning will be gone,
+resulting in a cleaner test output:
+
+```
+using ::testing::NiceMock;
+
+TEST(...) {
+  NiceMock<MockFoo> mock_foo;
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+}
+```
+
+`NiceMock<MockFoo>` is a subclass of `MockFoo`, so it can be used
+wherever `MockFoo` is accepted.
+
+It also works if `MockFoo`'s constructor takes some arguments, as
+`NiceMock<MockFoo>` "inherits" `MockFoo`'s constructors:
+
+```
+using ::testing::NiceMock;
+
+TEST(...) {
+  NiceMock<MockFoo> mock_foo(5, "hi");  // Calls MockFoo(5, "hi").
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+}
+```
+
+The usage of `StrictMock` is similar, except that it makes all
+uninteresting calls failures:
+
+```
+using ::testing::StrictMock;
+
+TEST(...) {
+  StrictMock<MockFoo> mock_foo;
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+
+  // The test will fail if a method of mock_foo other than DoThis()
+  // is called.
+}
+```
+
+There are some caveats though (I don't like them just as much as the
+next guy, but sadly they are side effects of C++'s limitations):
+
+  1. `NiceMock<MockFoo>` and `StrictMock<MockFoo>` only work for mock methods defined using the `MOCK_METHOD*` family of macros **directly** in the `MockFoo` class. If a mock method is defined in a **base class** of `MockFoo`, the "nice" or "strict" modifier may not affect it, depending on the compiler. In particular, nesting `NiceMock` and `StrictMock` (e.g. `NiceMock<StrictMock<MockFoo> >`) is **not** supported.
+  1. The constructors of the base mock (`MockFoo`) cannot have arguments passed by non-const reference, which happens to be banned by the [Google C++ style guide](http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml).
+  1. During the constructor or destructor of `MockFoo`, the mock object is _not_ nice or strict.  This may cause surprises if the constructor or destructor calls a mock method on `this` object. (This behavior, however, is consistent with C++'s general rule: if a constructor or destructor calls a virtual method of `this` object, that method is treated as non-virtual.  In other words, to the base class's constructor or destructor, `this` object behaves like an instance of the base class, not the derived class.  This rule is required for safety.  Otherwise a base constructor may use members of a derived class before they are initialized, or a base destructor may use members of a derived class after they have been destroyed.)
+
+Finally, you should be **very cautious** when using this feature, as the
+decision you make applies to **all** future changes to the mock
+class. If an important change is made in the interface you are mocking
+(and thus in the mock class), it could break your tests (if you use
+`StrictMock`) or let bugs pass through without a warning (if you use
+`NiceMock`). Therefore, try to specify the mock's behavior using
+explicit `EXPECT_CALL` first, and only turn to `NiceMock` or
+`StrictMock` as the last resort.
+
+## Simplifying the Interface without Breaking Existing Code ##
+
+Sometimes a method has a long list of arguments that is mostly
+uninteresting. For example,
+
+```
+class LogSink {
+ public:
+  ...
+  virtual void send(LogSeverity severity, const char* full_filename,
+                    const char* base_filename, int line,
+                    const struct tm* tm_time,
+                    const char* message, size_t message_len) = 0;
+};
+```
+
+This method's argument list is lengthy and hard to work with (let's
+say that the `message` argument is not even 0-terminated). If we mock
+it as is, using the mock will be awkward. If, however, we try to
+simplify this interface, we'll need to fix all clients depending on
+it, which is often infeasible.
+
+The trick is to re-dispatch the method in the mock class:
+
+```
+class ScopedMockLog : public LogSink {
+ public:
+  ...
+  virtual void send(LogSeverity severity, const char* full_filename,
+                    const char* base_filename, int line, const tm* tm_time,
+                    const char* message, size_t message_len) {
+    // We are only interested in the log severity, full file name, and
+    // log message.
+    Log(severity, full_filename, std::string(message, message_len));
+  }
+
+  // Implements the mock method:
+  //
+  //   void Log(LogSeverity severity,
+  //            const string& file_path,
+  //            const string& message);
+  MOCK_METHOD3(Log, void(LogSeverity severity, const string& file_path,
+                         const string& message));
+};
+```
+
+By defining a new mock method with a trimmed argument list, we make
+the mock class much more user-friendly.
+
+## Alternative to Mocking Concrete Classes ##
+
+Often you may find yourself using classes that don't implement
+interfaces. In order to test your code that uses such a class (let's
+call it `Concrete`), you may be tempted to make the methods of
+`Concrete` virtual and then mock it.
+
+Try not to do that.
+
+Making a non-virtual function virtual is a big decision. It creates an
+extension point where subclasses can tweak your class' behavior. This
+weakens your control on the class because now it's harder to maintain
+the class' invariants. You should make a function virtual only when
+there is a valid reason for a subclass to override it.
+
+Mocking concrete classes directly is problematic as it creates a tight
+coupling between the class and the tests - any small change in the
+class may invalidate your tests and make test maintenance a pain.
+
+To avoid such problems, many programmers have been practicing "coding
+to interfaces": instead of talking to the `Concrete` class, your code
+would define an interface and talk to it. Then you implement that
+interface as an adaptor on top of `Concrete`. In tests, you can easily
+mock that interface to observe how your code is doing.
+
+This technique incurs some overhead:
+
+  * You pay the cost of virtual function calls (usually not a problem).
+  * There is more abstraction for the programmers to learn.
+
+However, it can also bring significant benefits in addition to better
+testability:
+
+  * `Concrete`'s API may not fit your problem domain very well, as you may not be the only client it tries to serve. By designing your own interface, you have a chance to tailor it to your need - you may add higher-level functionalities, rename stuff, etc instead of just trimming the class. This allows you to write your code (user of the interface) in a more natural way, which means it will be more readable, more maintainable, and you'll be more productive.
+  * If `Concrete`'s implementation ever has to change, you don't have to rewrite everywhere it is used. Instead, you can absorb the change in your implementation of the interface, and your other code and tests will be insulated from this change.
+
+Some people worry that if everyone is practicing this technique, they
+will end up writing lots of redundant code. This concern is totally
+understandable. However, there are two reasons why it may not be the
+case:
+
+  * Different projects may need to use `Concrete` in different ways, so the best interfaces for them will be different. Therefore, each of them will have its own domain-specific interface on top of `Concrete`, and they will not be the same code.
+  * If enough projects want to use the same interface, they can always share it, just like they have been sharing `Concrete`. You can check in the interface and the adaptor somewhere near `Concrete` (perhaps in a `contrib` sub-directory) and let many projects use it.
+
+You need to weigh the pros and cons carefully for your particular
+problem, but I'd like to assure you that the Java community has been
+practicing this for a long time and it's a proven effective technique
+applicable in a wide variety of situations. :-)
+
+## Delegating Calls to a Fake ##
+
+Some times you have a non-trivial fake implementation of an
+interface. For example:
+
+```
+class Foo {
+ public:
+  virtual ~Foo() {}
+  virtual char DoThis(int n) = 0;
+  virtual void DoThat(const char* s, int* p) = 0;
+};
+
+class FakeFoo : public Foo {
+ public:
+  virtual char DoThis(int n) {
+    return (n > 0) ? '+' :
+        (n < 0) ? '-' : '0';
+  }
+
+  virtual void DoThat(const char* s, int* p) {
+    *p = strlen(s);
+  }
+};
+```
+
+Now you want to mock this interface such that you can set expectations
+on it. However, you also want to use `FakeFoo` for the default
+behavior, as duplicating it in the mock object is, well, a lot of
+work.
+
+When you define the mock class using Google Mock, you can have it
+delegate its default action to a fake class you already have, using
+this pattern:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+class MockFoo : public Foo {
+ public:
+  // Normal mock method definitions using Google Mock.
+  MOCK_METHOD1(DoThis, char(int n));
+  MOCK_METHOD2(DoThat, void(const char* s, int* p));
+
+  // Delegates the default actions of the methods to a FakeFoo object.
+  // This must be called *before* the custom ON_CALL() statements.
+  void DelegateToFake() {
+    ON_CALL(*this, DoThis(_))
+        .WillByDefault(Invoke(&fake_, &FakeFoo::DoThis));
+    ON_CALL(*this, DoThat(_, _))
+        .WillByDefault(Invoke(&fake_, &FakeFoo::DoThat));
+  }
+ private:
+  FakeFoo fake_;  // Keeps an instance of the fake in the mock.
+};
+```
+
+With that, you can use `MockFoo` in your tests as usual. Just remember
+that if you don't explicitly set an action in an `ON_CALL()` or
+`EXPECT_CALL()`, the fake will be called upon to do it:
+
+```
+using ::testing::_;
+
+TEST(AbcTest, Xyz) {
+  MockFoo foo;
+  foo.DelegateToFake(); // Enables the fake for delegation.
+
+  // Put your ON_CALL(foo, ...)s here, if any.
+
+  // No action specified, meaning to use the default action.
+  EXPECT_CALL(foo, DoThis(5));
+  EXPECT_CALL(foo, DoThat(_, _));
+
+  int n = 0;
+  EXPECT_EQ('+', foo.DoThis(5));  // FakeFoo::DoThis() is invoked.
+  foo.DoThat("Hi", &n);           // FakeFoo::DoThat() is invoked.
+  EXPECT_EQ(2, n);
+}
+```
+
+**Some tips:**
+
+  * If you want, you can still override the default action by providing your own `ON_CALL()` or using `.WillOnce()` / `.WillRepeatedly()` in `EXPECT_CALL()`.
+  * In `DelegateToFake()`, you only need to delegate the methods whose fake implementation you intend to use.
+  * The general technique discussed here works for overloaded methods, but you'll need to tell the compiler which version you mean. To disambiguate a mock function (the one you specify inside the parentheses of `ON_CALL()`), see the "Selecting Between Overloaded Functions" section on this page; to disambiguate a fake function (the one you place inside `Invoke()`), use a `static_cast` to specify the function's type.
+  * Having to mix a mock and a fake is often a sign of something gone wrong. Perhaps you haven't got used to the interaction-based way of testing yet. Or perhaps your interface is taking on too many roles and should be split up. Therefore, **don't abuse this**. We would only recommend to do it as an intermediate step when you are refactoring your code.
+
+Regarding the tip on mixing a mock and a fake, here's an example on
+why it may be a bad sign: Suppose you have a class `System` for
+low-level system operations. In particular, it does file and I/O
+operations. And suppose you want to test how your code uses `System`
+to do I/O, and you just want the file operations to work normally. If
+you mock out the entire `System` class, you'll have to provide a fake
+implementation for the file operation part, which suggests that
+`System` is taking on too many roles.
+
+Instead, you can define a `FileOps` interface and an `IOOps` interface
+and split `System`'s functionalities into the two. Then you can mock
+`IOOps` without mocking `FileOps`.
+
+## Delegating Calls to a Real Object ##
+
+When using testing doubles (mocks, fakes, stubs, and etc), sometimes
+their behaviors will differ from those of the real objects. This
+difference could be either intentional (as in simulating an error such
+that you can test the error handling code) or unintentional. If your
+mocks have different behaviors than the real objects by mistake, you
+could end up with code that passes the tests but fails in production.
+
+You can use the _delegating-to-real_ technique to ensure that your
+mock has the same behavior as the real object while retaining the
+ability to validate calls. This technique is very similar to the
+delegating-to-fake technique, the difference being that we use a real
+object instead of a fake. Here's an example:
+
+```
+using ::testing::_;
+using ::testing::AtLeast;
+using ::testing::Invoke;
+
+class MockFoo : public Foo {
+ public:
+  MockFoo() {
+    // By default, all calls are delegated to the real object.
+    ON_CALL(*this, DoThis())
+        .WillByDefault(Invoke(&real_, &Foo::DoThis));
+    ON_CALL(*this, DoThat(_))
+        .WillByDefault(Invoke(&real_, &Foo::DoThat));
+    ...
+  }
+  MOCK_METHOD0(DoThis, ...);
+  MOCK_METHOD1(DoThat, ...);
+  ...
+ private:
+  Foo real_;
+};
+...
+
+  MockFoo mock;
+
+  EXPECT_CALL(mock, DoThis())
+      .Times(3);
+  EXPECT_CALL(mock, DoThat("Hi"))
+      .Times(AtLeast(1));
+  ... use mock in test ...
+```
+
+With this, Google Mock will verify that your code made the right calls
+(with the right arguments, in the right order, called the right number
+of times, etc), and a real object will answer the calls (so the
+behavior will be the same as in production). This gives you the best
+of both worlds.
+
+## Delegating Calls to a Parent Class ##
+
+Ideally, you should code to interfaces, whose methods are all pure
+virtual. In reality, sometimes you do need to mock a virtual method
+that is not pure (i.e, it already has an implementation). For example:
+
+```
+class Foo {
+ public:
+  virtual ~Foo();
+
+  virtual void Pure(int n) = 0;
+  virtual int Concrete(const char* str) { ... }
+};
+
+class MockFoo : public Foo {
+ public:
+  // Mocking a pure method.
+  MOCK_METHOD1(Pure, void(int n));
+  // Mocking a concrete method.  Foo::Concrete() is shadowed.
+  MOCK_METHOD1(Concrete, int(const char* str));
+};
+```
+
+Sometimes you may want to call `Foo::Concrete()` instead of
+`MockFoo::Concrete()`. Perhaps you want to do it as part of a stub
+action, or perhaps your test doesn't need to mock `Concrete()` at all
+(but it would be oh-so painful to have to define a new mock class
+whenever you don't need to mock one of its methods).
+
+The trick is to leave a back door in your mock class for accessing the
+real methods in the base class:
+
+```
+class MockFoo : public Foo {
+ public:
+  // Mocking a pure method.
+  MOCK_METHOD1(Pure, void(int n));
+  // Mocking a concrete method.  Foo::Concrete() is shadowed.
+  MOCK_METHOD1(Concrete, int(const char* str));
+
+  // Use this to call Concrete() defined in Foo.
+  int FooConcrete(const char* str) { return Foo::Concrete(str); }
+};
+```
+
+Now, you can call `Foo::Concrete()` inside an action by:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+...
+  EXPECT_CALL(foo, Concrete(_))
+      .WillOnce(Invoke(&foo, &MockFoo::FooConcrete));
+```
+
+or tell the mock object that you don't want to mock `Concrete()`:
+
+```
+using ::testing::Invoke;
+...
+  ON_CALL(foo, Concrete(_))
+      .WillByDefault(Invoke(&foo, &MockFoo::FooConcrete));
+```
+
+(Why don't we just write `Invoke(&foo, &Foo::Concrete)`? If you do
+that, `MockFoo::Concrete()` will be called (and cause an infinite
+recursion) since `Foo::Concrete()` is virtual. That's just how C++
+works.)
+
+# Using Matchers #
+
+## Matching Argument Values Exactly ##
+
+You can specify exactly which arguments a mock method is expecting:
+
+```
+using ::testing::Return;
+...
+  EXPECT_CALL(foo, DoThis(5))
+      .WillOnce(Return('a'));
+  EXPECT_CALL(foo, DoThat("Hello", bar));
+```
+
+## Using Simple Matchers ##
+
+You can use matchers to match arguments that have a certain property:
+
+```
+using ::testing::Ge;
+using ::testing::NotNull;
+using ::testing::Return;
+...
+  EXPECT_CALL(foo, DoThis(Ge(5)))  // The argument must be >= 5.
+      .WillOnce(Return('a'));
+  EXPECT_CALL(foo, DoThat("Hello", NotNull()));
+  // The second argument must not be NULL.
+```
+
+A frequently used matcher is `_`, which matches anything:
+
+```
+using ::testing::_;
+using ::testing::NotNull;
+...
+  EXPECT_CALL(foo, DoThat(_, NotNull()));
+```
+
+## Combining Matchers ##
+
+You can build complex matchers from existing ones using `AllOf()`,
+`AnyOf()`, and `Not()`:
+
+```
+using ::testing::AllOf;
+using ::testing::Gt;
+using ::testing::HasSubstr;
+using ::testing::Ne;
+using ::testing::Not;
+...
+  // The argument must be > 5 and != 10.
+  EXPECT_CALL(foo, DoThis(AllOf(Gt(5),
+                                Ne(10))));
+
+  // The first argument must not contain sub-string "blah".
+  EXPECT_CALL(foo, DoThat(Not(HasSubstr("blah")),
+                          NULL));
+```
+
+## Casting Matchers ##
+
+Google Mock matchers are statically typed, meaning that the compiler
+can catch your mistake if you use a matcher of the wrong type (for
+example, if you use `Eq(5)` to match a `string` argument). Good for
+you!
+
+Sometimes, however, you know what you're doing and want the compiler
+to give you some slack. One example is that you have a matcher for
+`long` and the argument you want to match is `int`. While the two
+types aren't exactly the same, there is nothing really wrong with
+using a `Matcher<long>` to match an `int` - after all, we can first
+convert the `int` argument to a `long` before giving it to the
+matcher.
+
+To support this need, Google Mock gives you the
+`SafeMatcherCast<T>(m)` function. It casts a matcher `m` to type
+`Matcher<T>`. To ensure safety, Google Mock checks that (let `U` be the
+type `m` accepts):
+
+  1. Type `T` can be implicitly cast to type `U`;
+  1. When both `T` and `U` are built-in arithmetic types (`bool`, integers, and floating-point numbers), the conversion from `T` to `U` is not lossy (in other words, any value representable by `T` can also be represented by `U`); and
+  1. When `U` is a reference, `T` must also be a reference (as the underlying matcher may be interested in the address of the `U` value).
+
+The code won't compile if any of these conditions isn't met.
+
+Here's one example:
+
+```
+using ::testing::SafeMatcherCast;
+
+// A base class and a child class.
+class Base { ... };
+class Derived : public Base { ... };
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(DoThis, void(Derived* derived));
+};
+...
+
+  MockFoo foo;
+  // m is a Matcher<Base*> we got from somewhere.
+  EXPECT_CALL(foo, DoThis(SafeMatcherCast<Derived*>(m)));
+```
+
+If you find `SafeMatcherCast<T>(m)` too limiting, you can use a similar
+function `MatcherCast<T>(m)`. The difference is that `MatcherCast` works
+as long as you can `static_cast` type `T` to type `U`.
+
+`MatcherCast` essentially lets you bypass C++'s type system
+(`static_cast` isn't always safe as it could throw away information,
+for example), so be careful not to misuse/abuse it.
+
+## Selecting Between Overloaded Functions ##
+
+If you expect an overloaded function to be called, the compiler may
+need some help on which overloaded version it is.
+
+To disambiguate functions overloaded on the const-ness of this object,
+use the `Const()` argument wrapper.
+
+```
+using ::testing::ReturnRef;
+
+class MockFoo : public Foo {
+  ...
+  MOCK_METHOD0(GetBar, Bar&());
+  MOCK_CONST_METHOD0(GetBar, const Bar&());
+};
+...
+
+  MockFoo foo;
+  Bar bar1, bar2;
+  EXPECT_CALL(foo, GetBar())         // The non-const GetBar().
+      .WillOnce(ReturnRef(bar1));
+  EXPECT_CALL(Const(foo), GetBar())  // The const GetBar().
+      .WillOnce(ReturnRef(bar2));
+```
+
+(`Const()` is defined by Google Mock and returns a `const` reference
+to its argument.)
+
+To disambiguate overloaded functions with the same number of arguments
+but different argument types, you may need to specify the exact type
+of a matcher, either by wrapping your matcher in `Matcher<type>()`, or
+using a matcher whose type is fixed (`TypedEq<type>`, `An<type>()`,
+etc):
+
+```
+using ::testing::An;
+using ::testing::Lt;
+using ::testing::Matcher;
+using ::testing::TypedEq;
+
+class MockPrinter : public Printer {
+ public:
+  MOCK_METHOD1(Print, void(int n));
+  MOCK_METHOD1(Print, void(char c));
+};
+
+TEST(PrinterTest, Print) {
+  MockPrinter printer;
+
+  EXPECT_CALL(printer, Print(An<int>()));            // void Print(int);
+  EXPECT_CALL(printer, Print(Matcher<int>(Lt(5))));  // void Print(int);
+  EXPECT_CALL(printer, Print(TypedEq<char>('a')));   // void Print(char);
+
+  printer.Print(3);
+  printer.Print(6);
+  printer.Print('a');
+}
+```
+
+## Performing Different Actions Based on the Arguments ##
+
+When a mock method is called, the _last_ matching expectation that's
+still active will be selected (think "newer overrides older"). So, you
+can make a method do different things depending on its argument values
+like this:
+
+```
+using ::testing::_;
+using ::testing::Lt;
+using ::testing::Return;
+...
+  // The default case.
+  EXPECT_CALL(foo, DoThis(_))
+      .WillRepeatedly(Return('b'));
+
+  // The more specific case.
+  EXPECT_CALL(foo, DoThis(Lt(5)))
+      .WillRepeatedly(Return('a'));
+```
+
+Now, if `foo.DoThis()` is called with a value less than 5, `'a'` will
+be returned; otherwise `'b'` will be returned.
+
+## Matching Multiple Arguments as a Whole ##
+
+Sometimes it's not enough to match the arguments individually. For
+example, we may want to say that the first argument must be less than
+the second argument. The `With()` clause allows us to match
+all arguments of a mock function as a whole. For example,
+
+```
+using ::testing::_;
+using ::testing::Lt;
+using ::testing::Ne;
+...
+  EXPECT_CALL(foo, InRange(Ne(0), _))
+      .With(Lt());
+```
+
+says that the first argument of `InRange()` must not be 0, and must be
+less than the second argument.
+
+The expression inside `With()` must be a matcher of type
+`Matcher<tr1::tuple<A1, ..., An> >`, where `A1`, ..., `An` are the
+types of the function arguments.
+
+You can also write `AllArgs(m)` instead of `m` inside `.With()`. The
+two forms are equivalent, but `.With(AllArgs(Lt()))` is more readable
+than `.With(Lt())`.
+
+You can use `Args<k1, ..., kn>(m)` to match the `n` selected arguments
+against `m`. For example,
+
+```
+using ::testing::_;
+using ::testing::AllOf;
+using ::testing::Args;
+using ::testing::Lt;
+...
+  EXPECT_CALL(foo, Blah(_, _, _))
+      .With(AllOf(Args<0, 1>(Lt()), Args<1, 2>(Lt())));
+```
+
+says that `Blah()` will be called with arguments `x`, `y`, and `z` where
+`x < y < z`.
+
+As a convenience and example, Google Mock provides some matchers for
+2-tuples, including the `Lt()` matcher above. See the [CheatSheet](V1_5_CheatSheet.md) for
+the complete list.
+
+## Using Matchers as Predicates ##
+
+Have you noticed that a matcher is just a fancy predicate that also
+knows how to describe itself? Many existing algorithms take predicates
+as arguments (e.g. those defined in STL's `<algorithm>` header), and
+it would be a shame if Google Mock matchers are not allowed to
+participate.
+
+Luckily, you can use a matcher where a unary predicate functor is
+expected by wrapping it inside the `Matches()` function. For example,
+
+```
+#include <algorithm>
+#include <vector>
+
+std::vector<int> v;
+...
+// How many elements in v are >= 10?
+const int count = count_if(v.begin(), v.end(), Matches(Ge(10)));
+```
+
+Since you can build complex matchers from simpler ones easily using
+Google Mock, this gives you a way to conveniently construct composite
+predicates (doing the same using STL's `<functional>` header is just
+painful). For example, here's a predicate that's satisfied by any
+number that is >= 0, <= 100, and != 50:
+
+```
+Matches(AllOf(Ge(0), Le(100), Ne(50)))
+```
+
+## Using Matchers in Google Test Assertions ##
+
+Since matchers are basically predicates that also know how to describe
+themselves, there is a way to take advantage of them in
+[Google Test](http://code.google.com/p/googletest/) assertions. It's
+called `ASSERT_THAT` and `EXPECT_THAT`:
+
+```
+  ASSERT_THAT(value, matcher);  // Asserts that value matches matcher.
+  EXPECT_THAT(value, matcher);  // The non-fatal version.
+```
+
+For example, in a Google Test test you can write:
+
+```
+#include <gmock/gmock.h>
+
+using ::testing::AllOf;
+using ::testing::Ge;
+using ::testing::Le;
+using ::testing::MatchesRegex;
+using ::testing::StartsWith;
+...
+
+  EXPECT_THAT(Foo(), StartsWith("Hello"));
+  EXPECT_THAT(Bar(), MatchesRegex("Line \\d+"));
+  ASSERT_THAT(Baz(), AllOf(Ge(5), Le(10)));
+```
+
+which (as you can probably guess) executes `Foo()`, `Bar()`, and
+`Baz()`, and verifies that:
+
+  * `Foo()` returns a string that starts with `"Hello"`.
+  * `Bar()` returns a string that matches regular expression `"Line \\d+"`.
+  * `Baz()` returns a number in the range [5, 10].
+
+The nice thing about these macros is that _they read like
+English_. They generate informative messages too. For example, if the
+first `EXPECT_THAT()` above fails, the message will be something like:
+
+```
+Value of: Foo()
+  Actual: "Hi, world!"
+Expected: starts with "Hello"
+```
+
+**Credit:** The idea of `(ASSERT|EXPECT)_THAT` was stolen from the
+[Hamcrest](http://code.google.com/p/hamcrest/) project, which adds
+`assertThat()` to JUnit.
+
+## Using Predicates as Matchers ##
+
+Google Mock provides a built-in set of matchers. In case you find them
+lacking, you can use an arbitray unary predicate function or functor
+as a matcher - as long as the predicate accepts a value of the type
+you want. You do this by wrapping the predicate inside the `Truly()`
+function, for example:
+
+```
+using ::testing::Truly;
+
+int IsEven(int n) { return (n % 2) == 0 ? 1 : 0; }
+...
+
+  // Bar() must be called with an even number.
+  EXPECT_CALL(foo, Bar(Truly(IsEven)));
+```
+
+Note that the predicate function / functor doesn't have to return
+`bool`. It works as long as the return value can be used as the
+condition in statement `if (condition) ...`.
+
+## Matching Arguments that Are Not Copyable ##
+
+When you do an `EXPECT_CALL(mock_obj, Foo(bar))`, Google Mock saves
+away a copy of `bar`. When `Foo()` is called later, Google Mock
+compares the argument to `Foo()` with the saved copy of `bar`. This
+way, you don't need to worry about `bar` being modified or destroyed
+after the `EXPECT_CALL()` is executed. The same is true when you use
+matchers like `Eq(bar)`, `Le(bar)`, and so on.
+
+But what if `bar` cannot be copied (i.e. has no copy constructor)? You
+could define your own matcher function and use it with `Truly()`, as
+the previous couple of recipes have shown. Or, you may be able to get
+away from it if you can guarantee that `bar` won't be changed after
+the `EXPECT_CALL()` is executed. Just tell Google Mock that it should
+save a reference to `bar`, instead of a copy of it. Here's how:
+
+```
+using ::testing::Eq;
+using ::testing::ByRef;
+using ::testing::Lt;
+...
+  // Expects that Foo()'s argument == bar.
+  EXPECT_CALL(mock_obj, Foo(Eq(ByRef(bar))));
+
+  // Expects that Foo()'s argument < bar.
+  EXPECT_CALL(mock_obj, Foo(Lt(ByRef(bar))));
+```
+
+Remember: if you do this, don't change `bar` after the
+`EXPECT_CALL()`, or the result is undefined.
+
+## Validating a Member of an Object ##
+
+Often a mock function takes a reference to object as an argument. When
+matching the argument, you may not want to compare the entire object
+against a fixed object, as that may be over-specification. Instead,
+you may need to validate a certain member variable or the result of a
+certain getter method of the object. You can do this with `Field()`
+and `Property()`. More specifically,
+
+```
+Field(&Foo::bar, m)
+```
+
+is a matcher that matches a `Foo` object whose `bar` member variable
+satisfies matcher `m`.
+
+```
+Property(&Foo::baz, m)
+```
+
+is a matcher that matches a `Foo` object whose `baz()` method returns
+a value that satisfies matcher `m`.
+
+For example:
+
+> | `Field(&Foo::number, Ge(3))` | Matches `x` where `x.number >= 3`. |
+|:-----------------------------|:-----------------------------------|
+> | `Property(&Foo::name, StartsWith("John "))` | Matches `x` where `x.name()` starts with `"John "`. |
+
+Note that in `Property(&Foo::baz, ...)`, method `baz()` must take no
+argument and be declared as `const`.
+
+BTW, `Field()` and `Property()` can also match plain pointers to
+objects. For instance,
+
+```
+Field(&Foo::number, Ge(3))
+```
+
+matches a plain pointer `p` where `p->number >= 3`. If `p` is `NULL`,
+the match will always fail regardless of the inner matcher.
+
+What if you want to validate more than one members at the same time?
+Remember that there is `AllOf()`.
+
+## Validating the Value Pointed to by a Pointer Argument ##
+
+C++ functions often take pointers as arguments. You can use matchers
+like `NULL`, `NotNull()`, and other comparison matchers to match a
+pointer, but what if you want to make sure the value _pointed to_ by
+the pointer, instead of the pointer itself, has a certain property?
+Well, you can use the `Pointee(m)` matcher.
+
+`Pointee(m)` matches a pointer iff `m` matches the value the pointer
+points to. For example:
+
+```
+using ::testing::Ge;
+using ::testing::Pointee;
+...
+  EXPECT_CALL(foo, Bar(Pointee(Ge(3))));
+```
+
+expects `foo.Bar()` to be called with a pointer that points to a value
+greater than or equal to 3.
+
+One nice thing about `Pointee()` is that it treats a `NULL` pointer as
+a match failure, so you can write `Pointee(m)` instead of
+
+```
+  AllOf(NotNull(), Pointee(m))
+```
+
+without worrying that a `NULL` pointer will crash your test.
+
+Also, did we tell you that `Pointee()` works with both raw pointers
+**and** smart pointers (`linked_ptr`, `shared_ptr`, `scoped_ptr`, and
+etc)?
+
+What if you have a pointer to pointer? You guessed it - you can use
+nested `Pointee()` to probe deeper inside the value. For example,
+`Pointee(Pointee(Lt(3)))` matches a pointer that points to a pointer
+that points to a number less than 3 (what a mouthful...).
+
+## Testing a Certain Property of an Object ##
+
+Sometimes you want to specify that an object argument has a certain
+property, but there is no existing matcher that does this. If you want
+good error messages, you should define a matcher. If you want to do it
+quick and dirty, you could get away with writing an ordinary function.
+
+Let's say you have a mock function that takes an object of type `Foo`,
+which has an `int bar()` method and an `int baz()` method, and you
+want to constrain that the argument's `bar()` value plus its `baz()`
+value is a given number. Here's how you can define a matcher to do it:
+
+```
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+
+class BarPlusBazEqMatcher : public MatcherInterface<const Foo&> {
+ public:
+  explicit BarPlusBazEqMatcher(int expected_sum)
+      : expected_sum_(expected_sum) {}
+
+  virtual bool MatchAndExplain(const Foo& foo,
+                               MatchResultListener* listener) const {
+    return (foo.bar() + foo.baz()) == expected_sum_;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "bar() + baz() equals " << expected_sum_;
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "bar() + baz() does not equal " << expected_sum_;
+  }
+ private:
+  const int expected_sum_;
+};
+
+inline Matcher<const Foo&> BarPlusBazEq(int expected_sum) {
+  return MakeMatcher(new BarPlusBazEqMatcher(expected_sum));
+}
+
+...
+
+  EXPECT_CALL(..., DoThis(BarPlusBazEq(5)))...;
+```
+
+## Matching Containers ##
+
+Sometimes an STL container (e.g. list, vector, map, ...) is passed to
+a mock function and you may want to validate it. Since most STL
+containers support the `==` operator, you can write
+`Eq(expected_container)` or simply `expected_container` to match a
+container exactly.
+
+Sometimes, though, you may want to be more flexible (for example, the
+first element must be an exact match, but the second element can be
+any positive number, and so on). Also, containers used in tests often
+have a small number of elements, and having to define the expected
+container out-of-line is a bit of a hassle.
+
+You can use the `ElementsAre()` matcher in such cases:
+
+```
+using ::testing::_;
+using ::testing::ElementsAre;
+using ::testing::Gt;
+...
+
+  MOCK_METHOD1(Foo, void(const vector<int>& numbers));
+...
+
+  EXPECT_CALL(mock, Foo(ElementsAre(1, Gt(0), _, 5)));
+```
+
+The above matcher says that the container must have 4 elements, which
+must be 1, greater than 0, anything, and 5 respectively.
+
+`ElementsAre()` is overloaded to take 0 to 10 arguments. If more are
+needed, you can place them in a C-style array and use
+`ElementsAreArray()` instead:
+
+```
+using ::testing::ElementsAreArray;
+...
+
+  // ElementsAreArray accepts an array of element values.
+  const int expected_vector1[] = { 1, 5, 2, 4, ... };
+  EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector1)));
+
+  // Or, an array of element matchers.
+  Matcher<int> expected_vector2 = { 1, Gt(2), _, 3, ... };
+  EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector2)));
+```
+
+In case the array needs to be dynamically created (and therefore the
+array size cannot be inferred by the compiler), you can give
+`ElementsAreArray()` an additional argument to specify the array size:
+
+```
+using ::testing::ElementsAreArray;
+...
+  int* const expected_vector3 = new int[count];
+  ... fill expected_vector3 with values ...
+  EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector3, count)));
+```
+
+**Tips:**
+
+  * `ElementAre*()` works with _any_ container that implements the STL iterator concept (i.e. it has a `const_iterator` type and supports `begin()/end()`) and supports `size()`, not just the ones defined in STL. It will even work with container types yet to be written - as long as they follows the above pattern.
+  * You can use nested `ElementAre*()` to match nested (multi-dimensional) containers.
+  * If the container is passed by pointer instead of by reference, just write `Pointee(ElementsAre*(...))`.
+  * The order of elements _matters_ for `ElementsAre*()`. Therefore don't use it with containers whose element order is undefined (e.g. `hash_map`).
+
+## Sharing Matchers ##
+
+Under the hood, a Google Mock matcher object consists of a pointer to
+a ref-counted implementation object. Copying matchers is allowed and
+very efficient, as only the pointer is copied. When the last matcher
+that references the implementation object dies, the implementation
+object will be deleted.
+
+Therefore, if you have some complex matcher that you want to use again
+and again, there is no need to build it everytime. Just assign it to a
+matcher variable and use that variable repeatedly! For example,
+
+```
+  Matcher<int> in_range = AllOf(Gt(5), Le(10));
+  ... use in_range as a matcher in multiple EXPECT_CALLs ...
+```
+
+# Setting Expectations #
+
+## Ignoring Uninteresting Calls ##
+
+If you are not interested in how a mock method is called, just don't
+say anything about it. In this case, if the method is ever called,
+Google Mock will perform its default action to allow the test program
+to continue. If you are not happy with the default action taken by
+Google Mock, you can override it using `DefaultValue<T>::Set()`
+(described later in this document) or `ON_CALL()`.
+
+Please note that once you expressed interest in a particular mock
+method (via `EXPECT_CALL()`), all invocations to it must match some
+expectation. If this function is called but the arguments don't match
+any `EXPECT_CALL()` statement, it will be an error.
+
+## Disallowing Unexpected Calls ##
+
+If a mock method shouldn't be called at all, explicitly say so:
+
+```
+using ::testing::_;
+...
+  EXPECT_CALL(foo, Bar(_))
+      .Times(0);
+```
+
+If some calls to the method are allowed, but the rest are not, just
+list all the expected calls:
+
+```
+using ::testing::AnyNumber;
+using ::testing::Gt;
+...
+  EXPECT_CALL(foo, Bar(5));
+  EXPECT_CALL(foo, Bar(Gt(10)))
+      .Times(AnyNumber());
+```
+
+A call to `foo.Bar()` that doesn't match any of the `EXPECT_CALL()`
+statements will be an error.
+
+## Expecting Ordered Calls ##
+
+Although an `EXPECT_CALL()` statement defined earlier takes precedence
+when Google Mock tries to match a function call with an expectation,
+by default calls don't have to happen in the order `EXPECT_CALL()`
+statements are written. For example, if the arguments match the
+matchers in the third `EXPECT_CALL()`, but not those in the first two,
+then the third expectation will be used.
+
+If you would rather have all calls occur in the order of the
+expectations, put the `EXPECT_CALL()` statements in a block where you
+define a variable of type `InSequence`:
+
+```
+  using ::testing::_;
+  using ::testing::InSequence;
+
+  {
+    InSequence s;
+
+    EXPECT_CALL(foo, DoThis(5));
+    EXPECT_CALL(bar, DoThat(_))
+        .Times(2);
+    EXPECT_CALL(foo, DoThis(6));
+  }
+```
+
+In this example, we expect a call to `foo.DoThis(5)`, followed by two
+calls to `bar.DoThat()` where the argument can be anything, which are
+in turn followed by a call to `foo.DoThis(6)`. If a call occurred
+out-of-order, Google Mock will report an error.
+
+## Expecting Partially Ordered Calls ##
+
+Sometimes requiring everything to occur in a predetermined order can
+lead to brittle tests. For example, we may care about `A` occurring
+before both `B` and `C`, but aren't interested in the relative order
+of `B` and `C`. In this case, the test should reflect our real intent,
+instead of being overly constraining.
+
+Google Mock allows you to impose an arbitrary DAG (directed acyclic
+graph) on the calls. One way to express the DAG is to use the
+[After](V1_5_CheatSheet#The_After_Clause.md) clause of `EXPECT_CALL`.
+
+Another way is via the `InSequence()` clause (not the same as the
+`InSequence` class), which we borrowed from jMock 2. It's less
+flexible than `After()`, but more convenient when you have long chains
+of sequential calls, as it doesn't require you to come up with
+different names for the expectations in the chains.  Here's how it
+works:
+
+If we view `EXPECT_CALL()` statements as nodes in a graph, and add an
+edge from node A to node B wherever A must occur before B, we can get
+a DAG. We use the term "sequence" to mean a directed path in this
+DAG. Now, if we decompose the DAG into sequences, we just need to know
+which sequences each `EXPECT_CALL()` belongs to in order to be able to
+reconstruct the orginal DAG.
+
+So, to specify the partial order on the expectations we need to do two
+things: first to define some `Sequence` objects, and then for each
+`EXPECT_CALL()` say which `Sequence` objects it is part
+of. Expectations in the same sequence must occur in the order they are
+written. For example,
+
+```
+  using ::testing::Sequence;
+
+  Sequence s1, s2;
+
+  EXPECT_CALL(foo, A())
+      .InSequence(s1, s2);
+  EXPECT_CALL(bar, B())
+      .InSequence(s1);
+  EXPECT_CALL(bar, C())
+      .InSequence(s2);
+  EXPECT_CALL(foo, D())
+      .InSequence(s2);
+```
+
+specifies the following DAG (where `s1` is `A -> B`, and `s2` is `A ->
+C -> D`):
+
+```
+       +---> B
+       |
+  A ---|
+       |
+       +---> C ---> D
+```
+
+This means that A must occur before B and C, and C must occur before
+D. There's no restriction about the order other than these.
+
+## Controlling When an Expectation Retires ##
+
+When a mock method is called, Google Mock only consider expectations
+that are still active. An expectation is active when created, and
+becomes inactive (aka _retires_) when a call that has to occur later
+has occurred. For example, in
+
+```
+  using ::testing::_;
+  using ::testing::Sequence;
+
+  Sequence s1, s2;
+
+  EXPECT_CALL(log, Log(WARNING, _, "File too large."))     // #1
+      .Times(AnyNumber())
+      .InSequence(s1, s2);
+  EXPECT_CALL(log, Log(WARNING, _, "Data set is empty."))  // #2
+      .InSequence(s1);
+  EXPECT_CALL(log, Log(WARNING, _, "User not found."))     // #3
+      .InSequence(s2);
+```
+
+as soon as either #2 or #3 is matched, #1 will retire. If a warning
+`"File too large."` is logged after this, it will be an error.
+
+Note that an expectation doesn't retire automatically when it's
+saturated. For example,
+
+```
+using ::testing::_;
+...
+  EXPECT_CALL(log, Log(WARNING, _, _));                  // #1
+  EXPECT_CALL(log, Log(WARNING, _, "File too large."));  // #2
+```
+
+says that there will be exactly one warning with the message `"File
+too large."`. If the second warning contains this message too, #2 will
+match again and result in an upper-bound-violated error.
+
+If this is not what you want, you can ask an expectation to retire as
+soon as it becomes saturated:
+
+```
+using ::testing::_;
+...
+  EXPECT_CALL(log, Log(WARNING, _, _));                 // #1
+  EXPECT_CALL(log, Log(WARNING, _, "File too large."))  // #2
+      .RetiresOnSaturation();
+```
+
+Here #2 can be used only once, so if you have two warnings with the
+message `"File too large."`, the first will match #2 and the second
+will match #1 - there will be no error.
+
+# Using Actions #
+
+## Returning References from Mock Methods ##
+
+If a mock function's return type is a reference, you need to use
+`ReturnRef()` instead of `Return()` to return a result:
+
+```
+using ::testing::ReturnRef;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD0(GetBar, Bar&());
+};
+...
+
+  MockFoo foo;
+  Bar bar;
+  EXPECT_CALL(foo, GetBar())
+      .WillOnce(ReturnRef(bar));
+```
+
+## Combining Actions ##
+
+Want to do more than one thing when a function is called? That's
+fine. `DoAll()` allow you to do sequence of actions every time. Only
+the return value of the last action in the sequence will be used.
+
+```
+using ::testing::DoAll;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(Bar, bool(int n));
+};
+...
+
+  EXPECT_CALL(foo, Bar(_))
+      .WillOnce(DoAll(action_1,
+                      action_2,
+                      ...
+                      action_n));
+```
+
+## Mocking Side Effects ##
+
+Sometimes a method exhibits its effect not via returning a value but
+via side effects. For example, it may change some global state or
+modify an output argument. To mock side effects, in general you can
+define your own action by implementing `::testing::ActionInterface`.
+
+If all you need to do is to change an output argument, the built-in
+`SetArgumentPointee()` action is convenient:
+
+```
+using ::testing::SetArgumentPointee;
+
+class MockMutator : public Mutator {
+ public:
+  MOCK_METHOD2(Mutate, void(bool mutate, int* value));
+  ...
+};
+...
+
+  MockMutator mutator;
+  EXPECT_CALL(mutator, Mutate(true, _))
+      .WillOnce(SetArgumentPointee<1>(5));
+```
+
+In this example, when `mutator.Mutate()` is called, we will assign 5
+to the `int` variable pointed to by argument #1
+(0-based).
+
+`SetArgumentPointee()` conveniently makes an internal copy of the
+value you pass to it, removing the need to keep the value in scope and
+alive. The implication however is that the value must have a copy
+constructor and assignment operator.
+
+If the mock method also needs to return a value as well, you can chain
+`SetArgumentPointee()` with `Return()` using `DoAll()`:
+
+```
+using ::testing::_;
+using ::testing::Return;
+using ::testing::SetArgumentPointee;
+
+class MockMutator : public Mutator {
+ public:
+  ...
+  MOCK_METHOD1(MutateInt, bool(int* value));
+};
+...
+
+  MockMutator mutator;
+  EXPECT_CALL(mutator, MutateInt(_))
+      .WillOnce(DoAll(SetArgumentPointee<0>(5),
+                      Return(true)));
+```
+
+If the output argument is an array, use the
+`SetArrayArgument<N>(first, last)` action instead. It copies the
+elements in source range `[first, last)` to the array pointed to by
+the `N`-th (0-based) argument:
+
+```
+using ::testing::NotNull;
+using ::testing::SetArrayArgument;
+
+class MockArrayMutator : public ArrayMutator {
+ public:
+  MOCK_METHOD2(Mutate, void(int* values, int num_values));
+  ...
+};
+...
+
+  MockArrayMutator mutator;
+  int values[5] = { 1, 2, 3, 4, 5 };
+  EXPECT_CALL(mutator, Mutate(NotNull(), 5))
+      .WillOnce(SetArrayArgument<0>(values, values + 5));
+```
+
+This also works when the argument is an output iterator:
+
+```
+using ::testing::_;
+using ::testing::SeArrayArgument;
+
+class MockRolodex : public Rolodex {
+ public:
+  MOCK_METHOD1(GetNames, void(std::back_insert_iterator<vector<string> >));
+  ...
+};
+...
+
+  MockRolodex rolodex;
+  vector<string> names;
+  names.push_back("George");
+  names.push_back("John");
+  names.push_back("Thomas");
+  EXPECT_CALL(rolodex, GetNames(_))
+      .WillOnce(SetArrayArgument<0>(names.begin(), names.end()));
+```
+
+## Changing a Mock Object's Behavior Based on the State ##
+
+If you expect a call to change the behavior of a mock object, you can use `::testing::InSequence` to specify different behaviors before and after the call:
+
+```
+using ::testing::InSequence;
+using ::testing::Return;
+
+...
+  {
+    InSequence seq;
+    EXPECT_CALL(my_mock, IsDirty())
+        .WillRepeatedly(Return(true));
+    EXPECT_CALL(my_mock, Flush());
+    EXPECT_CALL(my_mock, IsDirty())
+        .WillRepeatedly(Return(false));
+  }
+  my_mock.FlushIfDirty();
+```
+
+This makes `my_mock.IsDirty()` return `true` before `my_mock.Flush()` is called and return `false` afterwards.
+
+If the behavior change is more complex, you can store the effects in a variable and make a mock method get its return value from that variable:
+
+```
+using ::testing::_;
+using ::testing::SaveArg;
+using ::testing::Return;
+
+ACTION_P(ReturnPointee, p) { return *p; }
+...
+  int previous_value = 0;
+  EXPECT_CALL(my_mock, GetPrevValue())
+      .WillRepeatedly(ReturnPointee(&previous_value));
+  EXPECT_CALL(my_mock, UpdateValue(_))
+      .WillRepeatedly(SaveArg<0>(&previous_value));
+  my_mock.DoSomethingToUpdateValue();
+```
+
+Here `my_mock.GetPrevValue()` will always return the argument of the last `UpdateValue()` call.
+
+## Setting the Default Value for a Return Type ##
+
+If a mock method's return type is a built-in C++ type or pointer, by
+default it will return 0 when invoked. You only need to specify an
+action if this default value doesn't work for you.
+
+Sometimes, you may want to change this default value, or you may want
+to specify a default value for types Google Mock doesn't know
+about. You can do this using the `::testing::DefaultValue` class
+template:
+
+```
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD0(CalculateBar, Bar());
+};
+...
+
+  Bar default_bar;
+  // Sets the default return value for type Bar.
+  DefaultValue<Bar>::Set(default_bar);
+
+  MockFoo foo;
+
+  // We don't need to specify an action here, as the default
+  // return value works for us.
+  EXPECT_CALL(foo, CalculateBar());
+
+  foo.CalculateBar();  // This should return default_bar.
+
+  // Unsets the default return value.
+  DefaultValue<Bar>::Clear();
+```
+
+Please note that changing the default value for a type can make you
+tests hard to understand. We recommend you to use this feature
+judiciously. For example, you may want to make sure the `Set()` and
+`Clear()` calls are right next to the code that uses your mock.
+
+## Setting the Default Actions for a Mock Method ##
+
+You've learned how to change the default value of a given
+type. However, this may be too coarse for your purpose: perhaps you
+have two mock methods with the same return type and you want them to
+have different behaviors. The `ON_CALL()` macro allows you to
+customize your mock's behavior at the method level:
+
+```
+using ::testing::_;
+using ::testing::AnyNumber;
+using ::testing::Gt;
+using ::testing::Return;
+...
+  ON_CALL(foo, Sign(_))
+      .WillByDefault(Return(-1));
+  ON_CALL(foo, Sign(0))
+      .WillByDefault(Return(0));
+  ON_CALL(foo, Sign(Gt(0)))
+      .WillByDefault(Return(1));
+
+  EXPECT_CALL(foo, Sign(_))
+      .Times(AnyNumber());
+
+  foo.Sign(5);   // This should return 1.
+  foo.Sign(-9);  // This should return -1.
+  foo.Sign(0);   // This should return 0.
+```
+
+As you may have guessed, when there are more than one `ON_CALL()`
+statements, the news order take precedence over the older ones. In
+other words, the **last** one that matches the function arguments will
+be used. This matching order allows you to set up the common behavior
+in a mock object's constructor or the test fixture's set-up phase and
+specialize the mock's behavior later.
+
+## Using Functions/Methods/Functors as Actions ##
+
+If the built-in actions don't suit you, you can easily use an existing
+function, method, or functor as an action:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD2(Sum, int(int x, int y));
+  MOCK_METHOD1(ComplexJob, bool(int x));
+};
+
+int CalculateSum(int x, int y) { return x + y; }
+
+class Helper {
+ public:
+  bool ComplexJob(int x);
+};
+...
+
+  MockFoo foo;
+  Helper helper;
+  EXPECT_CALL(foo, Sum(_, _))
+      .WillOnce(Invoke(CalculateSum));
+  EXPECT_CALL(foo, ComplexJob(_))
+      .WillOnce(Invoke(&helper, &Helper::ComplexJob));
+
+  foo.Sum(5, 6);       // Invokes CalculateSum(5, 6).
+  foo.ComplexJob(10);  // Invokes helper.ComplexJob(10);
+```
+
+The only requirement is that the type of the function, etc must be
+_compatible_ with the signature of the mock function, meaning that the
+latter's arguments can be implicitly converted to the corresponding
+arguments of the former, and the former's return type can be
+implicitly converted to that of the latter. So, you can invoke
+something whose type is _not_ exactly the same as the mock function,
+as long as it's safe to do so - nice, huh?
+
+## Invoking a Function/Method/Functor Without Arguments ##
+
+`Invoke()` is very useful for doing actions that are more complex. It
+passes the mock function's arguments to the function or functor being
+invoked such that the callee has the full context of the call to work
+with. If the invoked function is not interested in some or all of the
+arguments, it can simply ignore them.
+
+Yet, a common pattern is that a test author wants to invoke a function
+without the arguments of the mock function. `Invoke()` allows her to
+do that using a wrapper function that throws away the arguments before
+invoking an underlining nullary function. Needless to say, this can be
+tedious and obscures the intent of the test.
+
+`InvokeWithoutArgs()` solves this problem. It's like `Invoke()` except
+that it doesn't pass the mock function's arguments to the
+callee. Here's an example:
+
+```
+using ::testing::_;
+using ::testing::InvokeWithoutArgs;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(ComplexJob, bool(int n));
+};
+
+bool Job1() { ... }
+...
+
+  MockFoo foo;
+  EXPECT_CALL(foo, ComplexJob(_))
+      .WillOnce(InvokeWithoutArgs(Job1));
+
+  foo.ComplexJob(10);  // Invokes Job1().
+```
+
+## Invoking an Argument of the Mock Function ##
+
+Sometimes a mock function will receive a function pointer or a functor
+(in other words, a "callable") as an argument, e.g.
+
+```
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD2(DoThis, bool(int n, bool (*fp)(int)));
+};
+```
+
+and you may want to invoke this callable argument:
+
+```
+using ::testing::_;
+...
+  MockFoo foo;
+  EXPECT_CALL(foo, DoThis(_, _))
+      .WillOnce(...);
+  // Will execute (*fp)(5), where fp is the
+  // second argument DoThis() receives.
+```
+
+Arghh, you need to refer to a mock function argument but C++ has no
+lambda (yet), so you have to define your own action. :-( Or do you
+really?
+
+Well, Google Mock has an action to solve _exactly_ this problem:
+
+```
+  InvokeArgument<N>(arg_1, arg_2, ..., arg_m)
+```
+
+will invoke the `N`-th (0-based) argument the mock function receives,
+with `arg_1`, `arg_2`, ..., and `arg_m`. No matter if the argument is
+a function pointer or a functor, Google Mock handles them both.
+
+With that, you could write:
+
+```
+using ::testing::_;
+using ::testing::InvokeArgument;
+...
+  EXPECT_CALL(foo, DoThis(_, _))
+      .WillOnce(InvokeArgument<1>(5));
+  // Will execute (*fp)(5), where fp is the
+  // second argument DoThis() receives.
+```
+
+What if the callable takes an argument by reference? No problem - just
+wrap it inside `ByRef()`:
+
+```
+...
+  MOCK_METHOD1(Bar, bool(bool (*fp)(int, const Helper&)));
+...
+using ::testing::_;
+using ::testing::ByRef;
+using ::testing::InvokeArgument;
+...
+
+  MockFoo foo;
+  Helper helper;
+  ...
+  EXPECT_CALL(foo, Bar(_))
+      .WillOnce(InvokeArgument<0>(5, ByRef(helper)));
+  // ByRef(helper) guarantees that a reference to helper, not a copy of it,
+  // will be passed to the callable.
+```
+
+What if the callable takes an argument by reference and we do **not**
+wrap the argument in `ByRef()`? Then `InvokeArgument()` will _make a
+copy_ of the argument, and pass a _reference to the copy_, instead of
+a reference to the original value, to the callable. This is especially
+handy when the argument is a temporary value:
+
+```
+...
+  MOCK_METHOD1(DoThat, bool(bool (*f)(const double& x, const string& s)));
+...
+using ::testing::_;
+using ::testing::InvokeArgument;
+...
+
+  MockFoo foo;
+  ...
+  EXPECT_CALL(foo, DoThat(_))
+      .WillOnce(InvokeArgument<0>(5.0, string("Hi")));
+  // Will execute (*f)(5.0, string("Hi")), where f is the function pointer
+  // DoThat() receives.  Note that the values 5.0 and string("Hi") are
+  // temporary and dead once the EXPECT_CALL() statement finishes.  Yet
+  // it's fine to perform this action later, since a copy of the values
+  // are kept inside the InvokeArgument action.
+```
+
+## Ignoring an Action's Result ##
+
+Sometimes you have an action that returns _something_, but you need an
+action that returns `void` (perhaps you want to use it in a mock
+function that returns `void`, or perhaps it needs to be used in
+`DoAll()` and it's not the last in the list). `IgnoreResult()` lets
+you do that. For example:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::Return;
+
+int Process(const MyData& data);
+string DoSomething();
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(Abc, void(const MyData& data));
+  MOCK_METHOD0(Xyz, bool());
+};
+...
+
+  MockFoo foo;
+  EXPECT_CALL(foo, Abc(_))
+  // .WillOnce(Invoke(Process));
+  // The above line won't compile as Process() returns int but Abc() needs
+  // to return void.
+      .WillOnce(IgnoreResult(Invoke(Process)));
+
+  EXPECT_CALL(foo, Xyz())
+      .WillOnce(DoAll(IgnoreResult(Invoke(DoSomething)),
+      // Ignores the string DoSomething() returns.
+                      Return(true)));
+```
+
+Note that you **cannot** use `IgnoreResult()` on an action that already
+returns `void`. Doing so will lead to ugly compiler errors.
+
+## Selecting an Action's Arguments ##
+
+Say you have a mock function `Foo()` that takes seven arguments, and
+you have a custom action that you want to invoke when `Foo()` is
+called. Trouble is, the custom action only wants three arguments:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+...
+  MOCK_METHOD7(Foo, bool(bool visible, const string& name, int x, int y,
+                         const map<pair<int, int>, double>& weight,
+                         double min_weight, double max_wight));
+...
+
+bool IsVisibleInQuadrant1(bool visible, int x, int y) {
+  return visible && x >= 0 && y >= 0;
+}
+...
+
+  EXPECT_CALL(mock, Foo(_, _, _, _, _, _, _))
+      .WillOnce(Invoke(IsVisibleInQuadrant1));  // Uh, won't compile. :-(
+```
+
+To please the compiler God, you can to define an "adaptor" that has
+the same signature as `Foo()` and calls the custom action with the
+right arguments:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+bool MyIsVisibleInQuadrant1(bool visible, const string& name, int x, int y,
+                            const map<pair<int, int>, double>& weight,
+                            double min_weight, double max_wight) {
+  return IsVisibleInQuadrant1(visible, x, y);
+}
+...
+
+  EXPECT_CALL(mock, Foo(_, _, _, _, _, _, _))
+      .WillOnce(Invoke(MyIsVisibleInQuadrant1));  // Now it works.
+```
+
+But isn't this awkward?
+
+Google Mock provides a generic _action adaptor_, so you can spend your
+time minding more important business than writing your own
+adaptors. Here's the syntax:
+
+```
+  WithArgs<N1, N2, ..., Nk>(action)
+```
+
+creates an action that passes the arguments of the mock function at
+the given indices (0-based) to the inner `action` and performs
+it. Using `WithArgs`, our original example can be written as:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::WithArgs;
+...
+  EXPECT_CALL(mock, Foo(_, _, _, _, _, _, _))
+      .WillOnce(WithArgs<0, 2, 3>(Invoke(IsVisibleInQuadrant1)));
+      // No need to define your own adaptor.
+```
+
+For better readability, Google Mock also gives you:
+
+  * `WithoutArgs(action)` when the inner `action` takes _no_ argument, and
+  * `WithArg<N>(action)` (no `s` after `Arg`) when the inner `action` takes _one_ argument.
+
+As you may have realized, `InvokeWithoutArgs(...)` is just syntactic
+sugar for `WithoutArgs(Inovke(...))`.
+
+Here are more tips:
+
+  * The inner action used in `WithArgs` and friends does not have to be `Invoke()` -- it can be anything.
+  * You can repeat an argument in the argument list if necessary, e.g. `WithArgs<2, 3, 3, 5>(...)`.
+  * You can change the order of the arguments, e.g. `WithArgs<3, 2, 1>(...)`.
+  * The types of the selected arguments do _not_ have to match the signature of the inner action exactly. It works as long as they can be implicitly converted to the corresponding arguments of the inner action. For example, if the 4-th argument of the mock function is an `int` and `my_action` takes a `double`, `WithArg<4>(my_action)` will work.
+
+## Ignoring Arguments in Action Functions ##
+
+The selecting-an-action's-arguments recipe showed us one way to make a
+mock function and an action with incompatible argument lists fit
+together. The downside is that wrapping the action in
+`WithArgs<...>()` can get tedious for people writing the tests.
+
+If you are defining a function, method, or functor to be used with
+`Invoke*()`, and you are not interested in some of its arguments, an
+alternative to `WithArgs` is to declare the uninteresting arguments as
+`Unused`. This makes the definition less cluttered and less fragile in
+case the types of the uninteresting arguments change. It could also
+increase the chance the action function can be reused. For example,
+given
+
+```
+  MOCK_METHOD3(Foo, double(const string& label, double x, double y));
+  MOCK_METHOD3(Bar, double(int index, double x, double y));
+```
+
+instead of
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+double DistanceToOriginWithLabel(const string& label, double x, double y) {
+  return sqrt(x*x + y*y);
+}
+
+double DistanceToOriginWithIndex(int index, double x, double y) {
+  return sqrt(x*x + y*y);
+}
+...
+
+  EXEPCT_CALL(mock, Foo("abc", _, _))
+      .WillOnce(Invoke(DistanceToOriginWithLabel));
+  EXEPCT_CALL(mock, Bar(5, _, _))
+      .WillOnce(Invoke(DistanceToOriginWithIndex));
+```
+
+you could write
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::Unused;
+
+double DistanceToOrigin(Unused, double x, double y) {
+  return sqrt(x*x + y*y);
+}
+...
+
+  EXEPCT_CALL(mock, Foo("abc", _, _))
+      .WillOnce(Invoke(DistanceToOrigin));
+  EXEPCT_CALL(mock, Bar(5, _, _))
+      .WillOnce(Invoke(DistanceToOrigin));
+```
+
+## Sharing Actions ##
+
+Just like matchers, a Google Mock action object consists of a pointer
+to a ref-counted implementation object. Therefore copying actions is
+also allowed and very efficient. When the last action that references
+the implementation object dies, the implementation object will be
+deleted.
+
+If you have some complex action that you want to use again and again,
+you may not have to build it from scratch everytime. If the action
+doesn't have an internal state (i.e. if it always does the same thing
+no matter how many times it has been called), you can assign it to an
+action variable and use that variable repeatedly. For example:
+
+```
+  Action<bool(int*)> set_flag = DoAll(SetArgumentPointee<0>(5),
+                                      Return(true));
+  ... use set_flag in .WillOnce() and .WillRepeatedly() ...
+```
+
+However, if the action has its own state, you may be surprised if you
+share the action object. Suppose you have an action factory
+`IncrementCounter(init)` which creates an action that increments and
+returns a counter whose initial value is `init`, using two actions
+created from the same expression and using a shared action will
+exihibit different behaviors. Example:
+
+```
+  EXPECT_CALL(foo, DoThis())
+      .WillRepeatedly(IncrementCounter(0));
+  EXPECT_CALL(foo, DoThat())
+      .WillRepeatedly(IncrementCounter(0));
+  foo.DoThis();  // Returns 1.
+  foo.DoThis();  // Returns 2.
+  foo.DoThat();  // Returns 1 - Blah() uses a different
+                 // counter than Bar()'s.
+```
+
+versus
+
+```
+  Action<int()> increment = IncrementCounter(0);
+
+  EXPECT_CALL(foo, DoThis())
+      .WillRepeatedly(increment);
+  EXPECT_CALL(foo, DoThat())
+      .WillRepeatedly(increment);
+  foo.DoThis();  // Returns 1.
+  foo.DoThis();  // Returns 2.
+  foo.DoThat();  // Returns 3 - the counter is shared.
+```
+
+# Misc Recipes on Using Google Mock #
+
+## Forcing a Verification ##
+
+When it's being destoyed, your friendly mock object will automatically
+verify that all expectations on it have been satisfied, and will
+generate [Google Test](http://code.google.com/p/googletest/) failures
+if not. This is convenient as it leaves you with one less thing to
+worry about. That is, unless you are not sure if your mock object will
+be destoyed.
+
+How could it be that your mock object won't eventually be destroyed?
+Well, it might be created on the heap and owned by the code you are
+testing. Suppose there's a bug in that code and it doesn't delete the
+mock object properly - you could end up with a passing test when
+there's actually a bug.
+
+Using a heap checker is a good idea and can alleviate the concern, but
+its implementation may not be 100% reliable. So, sometimes you do want
+to _force_ Google Mock to verify a mock object before it is
+(hopefully) destructed. You can do this with
+`Mock::VerifyAndClearExpectations(&mock_object)`:
+
+```
+TEST(MyServerTest, ProcessesRequest) {
+  using ::testing::Mock;
+
+  MockFoo* const foo = new MockFoo;
+  EXPECT_CALL(*foo, ...)...;
+  // ... other expectations ...
+
+  // server now owns foo.
+  MyServer server(foo);
+  server.ProcessRequest(...);
+
+  // In case that server's destructor will forget to delete foo,
+  // this will verify the expectations anyway.
+  Mock::VerifyAndClearExpectations(foo);
+}  // server is destroyed when it goes out of scope here.
+```
+
+**Tip:** The `Mock::VerifyAndClearExpectations()` function returns a
+`bool` to indicate whether the verification was successful (`true` for
+yes), so you can wrap that function call inside a `ASSERT_TRUE()` if
+there is no point going further when the verification has failed.
+
+## Using Check Points ##
+
+Sometimes you may want to "reset" a mock object at various check
+points in your test: at each check point, you verify that all existing
+expectations on the mock object have been satisfied, and then you set
+some new expectations on it as if it's newly created. This allows you
+to work with a mock object in "phases" whose sizes are each
+manageable.
+
+One such scenario is that in your test's `SetUp()` function, you may
+want to put the object you are testing into a certain state, with the
+help from a mock object. Once in the desired state, you want to clear
+all expectations on the mock, such that in the `TEST_F` body you can
+set fresh expectations on it.
+
+As you may have figured out, the `Mock::VerifyAndClearExpectations()`
+function we saw in the previous recipe can help you here. Or, if you
+are using `ON_CALL()` to set default actions on the mock object and
+want to clear the default actions as well, use
+`Mock::VerifyAndClear(&mock_object)` instead. This function does what
+`Mock::VerifyAndClearExpectations(&mock_object)` does and returns the
+same `bool`, **plus** it clears the `ON_CALL()` statements on
+`mock_object` too.
+
+Another trick you can use to achieve the same effect is to put the
+expectations in sequences and insert calls to a dummy "check-point"
+function at specific places. Then you can verify that the mock
+function calls do happen at the right time. For example, if you are
+exercising code:
+
+```
+Foo(1);
+Foo(2);
+Foo(3);
+```
+
+and want to verify that `Foo(1)` and `Foo(3)` both invoke
+`mock.Bar("a")`, but `Foo(2)` doesn't invoke anything. You can write:
+
+```
+using ::testing::MockFunction;
+
+TEST(FooTest, InvokesBarCorrectly) {
+  MyMock mock;
+  // Class MockFunction<F> has exactly one mock method.  It is named
+  // Call() and has type F.
+  MockFunction<void(string check_point_name)> check;
+  {
+    InSequence s;
+
+    EXPECT_CALL(mock, Bar("a"));
+    EXPECT_CALL(check, Call("1"));
+    EXPECT_CALL(check, Call("2"));
+    EXPECT_CALL(mock, Bar("a"));
+  }
+  Foo(1);
+  check.Call("1");
+  Foo(2);
+  check.Call("2");
+  Foo(3);
+}
+```
+
+The expectation spec says that the first `Bar("a")` must happen before
+check point "1", the second `Bar("a")` must happen after check point "2",
+and nothing should happen between the two check points. The explicit
+check points make it easy to tell which `Bar("a")` is called by which
+call to `Foo()`.
+
+## Mocking Destructors ##
+
+Sometimes you want to make sure a mock object is destructed at the
+right time, e.g. after `bar->A()` is called but before `bar->B()` is
+called. We already know that you can specify constraints on the order
+of mock function calls, so all we need to do is to mock the destructor
+of the mock function.
+
+This sounds simple, except for one problem: a destructor is a special
+function with special syntax and special semantics, and the
+`MOCK_METHOD0` macro doesn't work for it:
+
+```
+  MOCK_METHOD0(~MockFoo, void());  // Won't compile!
+```
+
+The good news is that you can use a simple pattern to achieve the same
+effect. First, add a mock function `Die()` to your mock class and call
+it in the destructor, like this:
+
+```
+class MockFoo : public Foo {
+  ...
+  // Add the following two lines to the mock class.
+  MOCK_METHOD0(Die, void());
+  virtual ~MockFoo() { Die(); }
+};
+```
+
+(If the name `Die()` clashes with an existing symbol, choose another
+name.) Now, we have translated the problem of testing when a `MockFoo`
+object dies to testing when its `Die()` method is called:
+
+```
+  MockFoo* foo = new MockFoo;
+  MockBar* bar = new MockBar;
+  ...
+  {
+    InSequence s;
+
+    // Expects *foo to die after bar->A() and before bar->B().
+    EXPECT_CALL(*bar, A());
+    EXPECT_CALL(*foo, Die());
+    EXPECT_CALL(*bar, B());
+  }
+```
+
+And that's that.
+
+## Using Google Mock and Threads ##
+
+**IMPORTANT NOTE:** What we describe in this recipe is **NOT** true yet,
+as Google Mock is not currently thread-safe.  However, all we need to
+make it thread-safe is to implement some synchronization operations in
+`<gtest/internal/gtest-port.h>` - and then the information below will
+become true.
+
+In a **unit** test, it's best if you could isolate and test a piece of
+code in a single-threaded context. That avoids race conditions and
+dead locks, and makes debugging your test much easier.
+
+Yet many programs are multi-threaded, and sometimes to test something
+we need to pound on it from more than one thread. Google Mock works
+for this purpose too.
+
+Remember the steps for using a mock:
+
+  1. Create a mock object `foo`.
+  1. Set its default actions and expectations using `ON_CALL()` and `EXPECT_CALL()`.
+  1. The code under test calls methods of `foo`.
+  1. Optionally, verify and reset the mock.
+  1. Destroy the mock yourself, or let the code under test destroy it. The destructor will automatically verify it.
+
+If you follow the following simple rules, your mocks and threads can
+live happily togeter:
+
+  * Execute your _test code_ (as opposed to the code being tested) in _one_ thread. This makes your test easy to follow.
+  * Obviously, you can do step #1 without locking.
+  * When doing step #2 and #5, make sure no other thread is accessing `foo`. Obvious too, huh?
+  * #3 and #4 can be done either in one thread or in multiple threads - anyway you want. Google Mock takes care of the locking, so you don't have to do any - unless required by your test logic.
+
+If you violate the rules (for example, if you set expectations on a
+mock while another thread is calling its methods), you get undefined
+behavior. That's not fun, so don't do it.
+
+Google Mock guarantees that the action for a mock function is done in
+the same thread that called the mock function. For example, in
+
+```
+  EXPECT_CALL(mock, Foo(1))
+      .WillOnce(action1);
+  EXPECT_CALL(mock, Foo(2))
+      .WillOnce(action2);
+```
+
+if `Foo(1)` is called in thread 1 and `Foo(2)` is called in thread 2,
+Google Mock will execute `action1` in thread 1 and `action2` in thread
+2.
+
+Google Mock does _not_ impose a sequence on actions performed in
+different threads (doing so may create deadlocks as the actions may
+need to cooperate). This means that the execution of `action1` and
+`action2` in the above example _may_ interleave. If this is a problem,
+you should add proper synchronization logic to `action1` and `action2`
+to make the test thread-safe.
+
+
+Also, remember that `DefaultValue<T>` is a global resource that
+potentially affects _all_ living mock objects in your
+program. Naturally, you won't want to mess with it from multiple
+threads or when there still are mocks in action.
+
+## Controlling How Much Information Google Mock Prints ##
+
+When Google Mock sees something that has the potential of being an
+error (e.g. a mock function with no expectation is called, a.k.a. an
+uninteresting call, which is allowed but perhaps you forgot to
+explicitly ban the call), it prints some warning messages, including
+the arguments of the function and the return value. Hopefully this
+will remind you to take a look and see if there is indeed a problem.
+
+Sometimes you are confident that your tests are correct and may not
+appreciate such friendly messages. Some other times, you are debugging
+your tests or learning about the behavior of the code you are testing,
+and wish you could observe every mock call that happens (including
+argument values and the return value). Clearly, one size doesn't fit
+all.
+
+You can control how much Google Mock tells you using the
+`--gmock_verbose=LEVEL` command-line flag, where `LEVEL` is a string
+with three possible values:
+
+  * `info`: Google Mock will print all informational messages, warnings, and errors (most verbose). At this setting, Google Mock will also log any calls to the `ON_CALL/EXPECT_CALL` macros.
+  * `warning`: Google Mock will print both warnings and errors (less verbose). This is the default.
+  * `error`: Google Mock will print errors only (least verbose).
+
+Alternatively, you can adjust the value of that flag from within your
+tests like so:
+
+```
+  ::testing::FLAGS_gmock_verbose = "error";
+```
+
+Now, judiciously use the right flag to enable Google Mock serve you better!
+
+## Running Tests in Emacs ##
+
+If you build and run your tests in Emacs, the source file locations of
+Google Mock and [Google Test](http://code.google.com/p/googletest/)
+errors will be highlighted. Just press `<Enter>` on one of them and
+you'll be taken to the offending line. Or, you can just type `C-x ``
+to jump to the next error.
+
+To make it even easier, you can add the following lines to your
+`~/.emacs` file:
+
+```
+(global-set-key "\M-m"   'compile)  ; m is for make
+(global-set-key [M-down] 'next-error)
+(global-set-key [M-up]   '(lambda () (interactive) (next-error -1)))
+```
+
+Then you can type `M-m` to start a build, or `M-up`/`M-down` to move
+back and forth between errors.
+
+## Fusing Google Mock Source Files ##
+
+Google Mock's implementation consists of dozens of files (excluding
+its own tests).  Sometimes you may want them to be packaged up in
+fewer files instead, such that you can easily copy them to a new
+machine and start hacking there.  For this we provide an experimental
+Python script `fuse_gmock_files.py` in the `scripts/` directory
+(starting with release 1.2.0).  Assuming you have Python 2.4 or above
+installed on your machine, just go to that directory and run
+```
+python fuse_gmock_files.py OUTPUT_DIR
+```
+
+and you should see an `OUTPUT_DIR` directory being created with files
+`gtest/gtest.h`, `gmock/gmock.h`, and `gmock-gtest-all.cc` in it.
+These three files contain everything you need to use Google Mock (and
+Google Test).  Just copy them to anywhere you want and you are ready
+to write tests and use mocks.  You can use the
+[scrpts/test/Makefile](http://code.google.com/p/googlemock/source/browse/trunk/scripts/test/Makefile) file as an example on how to compile your tests
+against them.
+
+# Extending Google Mock #
+
+## Writing New Matchers Quickly ##
+
+The `MATCHER*` family of macros can be used to define custom matchers
+easily.  The syntax:
+
+```
+MATCHER(name, "description string") { statements; }
+```
+
+will define a matcher with the given name that executes the
+statements, which must return a `bool` to indicate if the match
+succeeds.  Inside the statements, you can refer to the value being
+matched by `arg`, and refer to its type by `arg_type`.
+
+The description string documents what the matcher does, and is used to
+generate the failure message when the match fails.  Since a
+`MATCHER()` is usually defined in a header file shared by multiple C++
+source files, we require the description to be a C-string _literal_ to
+avoid possible side effects.  It can be empty (`""`), in which case
+Google Mock will use the sequence of words in the matcher name as the
+description.
+
+For example:
+```
+MATCHER(IsDivisibleBy7, "") { return (arg % 7) == 0; }
+```
+allows you to write
+```
+  // Expects mock_foo.Bar(n) to be called where n is divisible by 7.
+  EXPECT_CALL(mock_foo, Bar(IsDivisibleBy7()));
+```
+or,
+```
+  // Verifies that the value of some_expression is divisible by 7.
+  EXPECT_THAT(some_expression, IsDivisibleBy7());
+```
+If the above assertion fails, it will print something like:
+```
+  Value of: some_expression
+  Expected: is divisible by 7
+    Actual: 27
+```
+where the description `"is divisible by 7"` is automatically calculated from the
+matcher name `IsDivisibleBy7`.
+
+Optionally, you can stream additional information to a hidden argument
+named `result_listener` to explain the match result. For example, a
+better definition of `IsDivisibleBy7` is:
+```
+MATCHER(IsDivisibleBy7, "") {
+  if ((arg % 7) == 0)
+    return true;
+
+  *result_listener << "the remainder is " << (arg % 7);
+  return false;
+}
+```
+
+With this definition, the above assertion will give a better message:
+```
+  Value of: some_expression
+  Expected: is divisible by 7
+    Actual: 27 (the remainder is 6)
+```
+
+You should let `MatchAndExplain()` print _any additional information_
+that can help a user understand the match result. Note that it should
+explain why the match succeeds in case of a success (unless it's
+obvious) - this is useful when the matcher is used inside
+`Not()`. There is no need to print the argument value itself, as
+Google Mock already prints it for you.
+
+**Notes:**
+
+  1. The type of the value being matched (`arg_type`) is determined by the context in which you use the matcher and is supplied to you by the compiler, so you don't need to worry about declaring it (nor can you).  This allows the matcher to be polymorphic.  For example, `IsDivisibleBy7()` can be used to match any type where the value of `(arg % 7) == 0` can be implicitly converted to a `bool`.  In the `Bar(IsDivisibleBy7())` example above, if method `Bar()` takes an `int`, `arg_type` will be `int`; if it takes an `unsigned long`, `arg_type` will be `unsigned long`; and so on.
+  1. Google Mock doesn't guarantee when or how many times a matcher will be invoked. Therefore the matcher logic must be _purely functional_ (i.e. it cannot have any side effect, and the result must not depend on anything other than the value being matched and the matcher parameters). This requirement must be satisfied no matter how you define the matcher (e.g. using one of the methods described in the following recipes). In particular, a matcher can never call a mock function, as that will affect the state of the mock object and Google Mock.
+
+## Writing New Parameterized Matchers Quickly ##
+
+Sometimes you'll want to define a matcher that has parameters.  For that you
+can use the macro:
+```
+MATCHER_P(name, param_name, "description string") { statements; }
+```
+
+For example:
+```
+MATCHER_P(HasAbsoluteValue, value, "") { return abs(arg) == value; }
+```
+will allow you to write:
+```
+  EXPECT_THAT(Blah("a"), HasAbsoluteValue(n));
+```
+which may lead to this message (assuming `n` is 10):
+```
+  Value of: Blah("a")
+  Expected: has absolute value 10
+    Actual: -9
+```
+
+Note that both the matcher description and its parameter are
+printed, making the message human-friendly.
+
+In the matcher definition body, you can write `foo_type` to
+reference the type of a parameter named `foo`.  For example, in the
+body of `MATCHER_P(HasAbsoluteValue, value)` above, you can write
+`value_type` to refer to the type of `value`.
+
+Google Mock also provides `MATCHER_P2`, `MATCHER_P3`, ..., up to
+`MATCHER_P10` to support multi-parameter matchers:
+```
+MATCHER_Pk(name, param_1, ..., param_k, "description string") { statements; }
+```
+
+Please note that the custom description string is for a particular
+**instance** of the matcher, where the parameters have been bound to
+actual values.  Therefore usually you'll want the parameter values to
+be part of the description.  Google Mock lets you do that using
+Python-style interpolations.  The following syntaxes are supported
+currently:
+
+| `%%` | a single `%` character |
+|:-----|:-----------------------|
+| `%(*)s` | all parameters of the matcher printed as a tuple |
+| `%(foo)s` | value of the matcher parameter named `foo` |
+
+For example,
+```
+  MATCHER_P2(InClosedRange, low, hi, "is in range [%(low)s, %(hi)s]") {
+    return low <= arg && arg <= hi;
+  }
+  ...
+  EXPECT_THAT(3, InClosedRange(4, 6));
+```
+would generate a failure that contains the message:
+```
+  Expected: is in range [4, 6]
+```
+
+If you specify `""` as the description, the failure message will
+contain the sequence of words in the matcher name followed by the
+parameter values printed as a tuple.  For example,
+```
+  MATCHER_P2(InClosedRange, low, hi, "") { ... }
+  ...
+  EXPECT_THAT(3, InClosedRange(4, 6));
+```
+would generate a failure that contains the text:
+```
+  Expected: in closed range (4, 6)
+```
+
+For the purpose of typing, you can view
+```
+MATCHER_Pk(Foo, p1, ..., pk, "description string") { ... }
+```
+as shorthand for
+```
+template <typename p1_type, ..., typename pk_type>
+FooMatcherPk<p1_type, ..., pk_type>
+Foo(p1_type p1, ..., pk_type pk) { ... }
+```
+
+When you write `Foo(v1, ..., vk)`, the compiler infers the types of
+the parameters `v1`, ..., and `vk` for you.  If you are not happy with
+the result of the type inference, you can specify the types by
+explicitly instantiating the template, as in `Foo<long, bool>(5, false)`.
+As said earlier, you don't get to (or need to) specify
+`arg_type` as that's determined by the context in which the matcher
+is used.
+
+You can assign the result of expression `Foo(p1, ..., pk)` to a
+variable of type `FooMatcherPk<p1_type, ..., pk_type>`.  This can be
+useful when composing matchers.  Matchers that don't have a parameter
+or have only one parameter have special types: you can assign `Foo()`
+to a `FooMatcher`-typed variable, and assign `Foo(p)` to a
+`FooMatcherP<p_type>`-typed variable.
+
+While you can instantiate a matcher template with reference types,
+passing the parameters by pointer usually makes your code more
+readable.  If, however, you still want to pass a parameter by
+reference, be aware that in the failure message generated by the
+matcher you will see the value of the referenced object but not its
+address.
+
+You can overload matchers with different numbers of parameters:
+```
+MATCHER_P(Blah, a, "description string 1") { ... }
+MATCHER_P2(Blah, a, b, "description string 2") { ... }
+```
+
+While it's tempting to always use the `MATCHER*` macros when defining
+a new matcher, you should also consider implementing
+`MatcherInterface` or using `MakePolymorphicMatcher()` instead (see
+the recipes that follow), especially if you need to use the matcher a
+lot.  While these approaches require more work, they give you more
+control on the types of the value being matched and the matcher
+parameters, which in general leads to better compiler error messages
+that pay off in the long run.  They also allow overloading matchers
+based on parameter types (as opposed to just based on the number of
+parameters).
+
+## Writing New Monomorphic Matchers ##
+
+A matcher of argument type `T` implements
+`::testing::MatcherInterface<T>` and does two things: it tests whether a
+value of type `T` matches the matcher, and can describe what kind of
+values it matches. The latter ability is used for generating readable
+error messages when expectations are violated.
+
+The interface looks like this:
+
+```
+class MatchResultListener {
+ public:
+  ...
+  // Streams x to the underlying ostream; does nothing if the ostream
+  // is NULL.
+  template <typename T>
+  MatchResultListener& operator<<(const T& x);
+
+  // Returns the underlying ostream.
+  ::std::ostream* stream();
+};
+
+template <typename T>
+class MatcherInterface {
+ public:
+  virtual ~MatcherInterface();
+
+  // Returns true iff the matcher matches x; also explains the match
+  // result to 'listener'.
+  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const = 0;
+
+  // Describes this matcher to an ostream.
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+
+  // Describes the negation of this matcher to an ostream.
+  virtual void DescribeNegationTo(::std::ostream* os) const;
+};
+```
+
+If you need a custom matcher but `Truly()` is not a good option (for
+example, you may not be happy with the way `Truly(predicate)`
+describes itself, or you may want your matcher to be polymorphic as
+`Eq(value)` is), you can define a matcher to do whatever you want in
+two steps: first implement the matcher interface, and then define a
+factory function to create a matcher instance. The second step is not
+strictly needed but it makes the syntax of using the matcher nicer.
+
+For example, you can define a matcher to test whether an `int` is
+divisible by 7 and then use it like this:
+```
+using ::testing::MakeMatcher;
+using ::testing::Matcher;
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+
+class DivisibleBy7Matcher : public MatcherInterface<int> {
+ public:
+  virtual bool MatchAndExplain(int n, MatchResultListener* listener) const {
+    return (n % 7) == 0;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "is divisible by 7";
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "is not divisible by 7";
+  }
+};
+
+inline Matcher<int> DivisibleBy7() {
+  return MakeMatcher(new DivisibleBy7Matcher);
+}
+...
+
+  EXPECT_CALL(foo, Bar(DivisibleBy7()));
+```
+
+You may improve the matcher message by streaming additional
+information to the `listener` argument in `MatchAndExplain()`:
+
+```
+class DivisibleBy7Matcher : public MatcherInterface<int> {
+ public:
+  virtual bool MatchAndExplain(int n,
+                               MatchResultListener* listener) const {
+    const int remainder = n % 7;
+    if (remainder != 0) {
+      *listener << "the remainder is " << remainder;
+    }
+    return remainder == 0;
+  }
+  ...
+};
+```
+
+Then, `EXPECT_THAT(x, DivisibleBy7());` may general a message like this:
+```
+Value of: x
+Expected: is divisible by 7
+  Actual: 23 (the remainder is 2)
+```
+
+## Writing New Polymorphic Matchers ##
+
+You've learned how to write your own matchers in the previous
+recipe. Just one problem: a matcher created using `MakeMatcher()` only
+works for one particular type of arguments. If you want a
+_polymorphic_ matcher that works with arguments of several types (for
+instance, `Eq(x)` can be used to match a `value` as long as `value` ==
+`x` compiles -- `value` and `x` don't have to share the same type),
+you can learn the trick from `<gmock/gmock-matchers.h>` but it's a bit
+involved.
+
+Fortunately, most of the time you can define a polymorphic matcher
+easily with the help of `MakePolymorphicMatcher()`. Here's how you can
+define `NotNull()` as an example:
+
+```
+using ::testing::MakePolymorphicMatcher;
+using ::testing::MatchResultListener;
+using ::testing::NotNull;
+using ::testing::PolymorphicMatcher;
+
+class NotNullMatcher {
+ public:
+  // To implement a polymorphic matcher, first define a COPYABLE class
+  // that has three members MatchAndExplain(), DescribeTo(), and
+  // DescribeNegationTo(), like the following.
+
+  // In this example, we want to use NotNull() with any pointer, so
+  // MatchAndExplain() accepts a pointer of any type as its first argument.
+  // In general, you can define MatchAndExplain() as an ordinary method or
+  // a method template, or even overload it.
+  template <typename T>
+  bool MatchAndExplain(T* p,
+                       MatchResultListener* /* listener */) const {
+    return p != NULL;
+  }
+
+  // Describes the property of a value matching this matcher.
+  void DescribeTo(::std::ostream* os) const { *os << "is not NULL"; }
+
+  // Describes the property of a value NOT matching this matcher.
+  void DescribeNegationTo(::std::ostream* os) const { *os << "is NULL"; }
+};
+
+// To construct a polymorphic matcher, pass an instance of the class
+// to MakePolymorphicMatcher().  Note the return type.
+inline PolymorphicMatcher<NotNullMatcher> NotNull() {
+  return MakePolymorphicMatcher(NotNullMatcher());
+}
+...
+
+  EXPECT_CALL(foo, Bar(NotNull()));  // The argument must be a non-NULL pointer.
+```
+
+**Note:** Your polymorphic matcher class does **not** need to inherit from
+`MatcherInterface` or any other class, and its methods do **not** need
+to be virtual.
+
+Like in a monomorphic matcher, you may explain the match result by
+streaming additional information to the `listener` argument in
+`MatchAndExplain()`.
+
+## Writing New Cardinalities ##
+
+A cardinality is used in `Times()` to tell Google Mock how many times
+you expect a call to occur. It doesn't have to be exact. For example,
+you can say `AtLeast(5)` or `Between(2, 4)`.
+
+If the built-in set of cardinalities doesn't suit you, you are free to
+define your own by implementing the following interface (in namespace
+`testing`):
+
+```
+class CardinalityInterface {
+ public:
+  virtual ~CardinalityInterface();
+
+  // Returns true iff call_count calls will satisfy this cardinality.
+  virtual bool IsSatisfiedByCallCount(int call_count) const = 0;
+
+  // Returns true iff call_count calls will saturate this cardinality.
+  virtual bool IsSaturatedByCallCount(int call_count) const = 0;
+
+  // Describes self to an ostream.
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+};
+```
+
+For example, to specify that a call must occur even number of times,
+you can write
+
+```
+using ::testing::Cardinality;
+using ::testing::CardinalityInterface;
+using ::testing::MakeCardinality;
+
+class EvenNumberCardinality : public CardinalityInterface {
+ public:
+  virtual bool IsSatisfiedByCallCount(int call_count) const {
+    return (call_count % 2) == 0;
+  }
+
+  virtual bool IsSaturatedByCallCount(int call_count) const {
+    return false;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "called even number of times";
+  }
+};
+
+Cardinality EvenNumber() {
+  return MakeCardinality(new EvenNumberCardinality);
+}
+...
+
+  EXPECT_CALL(foo, Bar(3))
+      .Times(EvenNumber());
+```
+
+## Writing New Actions Quickly ##
+
+If the built-in actions don't work for you, and you find it
+inconvenient to use `Invoke()`, you can use a macro from the `ACTION*`
+family to quickly define a new action that can be used in your code as
+if it's a built-in action.
+
+By writing
+```
+ACTION(name) { statements; }
+```
+in a namespace scope (i.e. not inside a class or function), you will
+define an action with the given name that executes the statements.
+The value returned by `statements` will be used as the return value of
+the action.  Inside the statements, you can refer to the K-th
+(0-based) argument of the mock function as `argK`.  For example:
+```
+ACTION(IncrementArg1) { return ++(*arg1); }
+```
+allows you to write
+```
+... WillOnce(IncrementArg1());
+```
+
+Note that you don't need to specify the types of the mock function
+arguments.  Rest assured that your code is type-safe though:
+you'll get a compiler error if `*arg1` doesn't support the `++`
+operator, or if the type of `++(*arg1)` isn't compatible with the mock
+function's return type.
+
+Another example:
+```
+ACTION(Foo) {
+  (*arg2)(5);
+  Blah();
+  *arg1 = 0;
+  return arg0;
+}
+```
+defines an action `Foo()` that invokes argument #2 (a function pointer)
+with 5, calls function `Blah()`, sets the value pointed to by argument
+#1 to 0, and returns argument #0.
+
+For more convenience and flexibility, you can also use the following
+pre-defined symbols in the body of `ACTION`:
+
+| `argK_type` | The type of the K-th (0-based) argument of the mock function |
+|:------------|:-------------------------------------------------------------|
+| `args`      | All arguments of the mock function as a tuple                |
+| `args_type` | The type of all arguments of the mock function as a tuple    |
+| `return_type` | The return type of the mock function                         |
+| `function_type` | The type of the mock function                                |
+
+For example, when using an `ACTION` as a stub action for mock function:
+```
+int DoSomething(bool flag, int* ptr);
+```
+we have:
+| **Pre-defined Symbol** | **Is Bound To** |
+|:-----------------------|:----------------|
+| `arg0`                 | the value of `flag` |
+| `arg0_type`            | the type `bool` |
+| `arg1`                 | the value of `ptr` |
+| `arg1_type`            | the type `int*` |
+| `args`                 | the tuple `(flag, ptr)` |
+| `args_type`            | the type `std::tr1::tuple<bool, int*>` |
+| `return_type`          | the type `int`  |
+| `function_type`        | the type `int(bool, int*)` |
+
+## Writing New Parameterized Actions Quickly ##
+
+Sometimes you'll want to parameterize an action you define.  For that
+we have another macro
+```
+ACTION_P(name, param) { statements; }
+```
+
+For example,
+```
+ACTION_P(Add, n) { return arg0 + n; }
+```
+will allow you to write
+```
+// Returns argument #0 + 5.
+... WillOnce(Add(5));
+```
+
+For convenience, we use the term _arguments_ for the values used to
+invoke the mock function, and the term _parameters_ for the values
+used to instantiate an action.
+
+Note that you don't need to provide the type of the parameter either.
+Suppose the parameter is named `param`, you can also use the
+Google-Mock-defined symbol `param_type` to refer to the type of the
+parameter as inferred by the compiler.  For example, in the body of
+`ACTION_P(Add, n)` above, you can write `n_type` for the type of `n`.
+
+Google Mock also provides `ACTION_P2`, `ACTION_P3`, and etc to support
+multi-parameter actions.  For example,
+```
+ACTION_P2(ReturnDistanceTo, x, y) {
+  double dx = arg0 - x;
+  double dy = arg1 - y;
+  return sqrt(dx*dx + dy*dy);
+}
+```
+lets you write
+```
+... WillOnce(ReturnDistanceTo(5.0, 26.5));
+```
+
+You can view `ACTION` as a degenerated parameterized action where the
+number of parameters is 0.
+
+You can also easily define actions overloaded on the number of parameters:
+```
+ACTION_P(Plus, a) { ... }
+ACTION_P2(Plus, a, b) { ... }
+```
+
+## Restricting the Type of an Argument or Parameter in an ACTION ##
+
+For maximum brevity and reusability, the `ACTION*` macros don't ask
+you to provide the types of the mock function arguments and the action
+parameters.  Instead, we let the compiler infer the types for us.
+
+Sometimes, however, we may want to be more explicit about the types.
+There are several tricks to do that.  For example:
+```
+ACTION(Foo) {
+  // Makes sure arg0 can be converted to int.
+  int n = arg0;
+  ... use n instead of arg0 here ...
+}
+
+ACTION_P(Bar, param) {
+  // Makes sure the type of arg1 is const char*.
+  ::testing::StaticAssertTypeEq<const char*, arg1_type>();
+
+  // Makes sure param can be converted to bool.
+  bool flag = param;
+}
+```
+where `StaticAssertTypeEq` is a compile-time assertion in Google Test
+that verifies two types are the same.
+
+## Writing New Action Templates Quickly ##
+
+Sometimes you want to give an action explicit template parameters that
+cannot be inferred from its value parameters.  `ACTION_TEMPLATE()`
+supports that and can be viewed as an extension to `ACTION()` and
+`ACTION_P*()`.
+
+The syntax:
+```
+ACTION_TEMPLATE(ActionName,
+                HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m),
+                AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; }
+```
+
+defines an action template that takes _m_ explicit template parameters
+and _n_ value parameters, where _m_ is between 1 and 10, and _n_ is
+between 0 and 10.  `name_i` is the name of the i-th template
+parameter, and `kind_i` specifies whether it's a `typename`, an
+integral constant, or a template.  `p_i` is the name of the i-th value
+parameter.
+
+Example:
+```
+// DuplicateArg<k, T>(output) converts the k-th argument of the mock
+// function to type T and copies it to *output.
+ACTION_TEMPLATE(DuplicateArg,
+                // Note the comma between int and k:
+                HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
+                AND_1_VALUE_PARAMS(output)) {
+  *output = T(std::tr1::get<k>(args));
+}
+```
+
+To create an instance of an action template, write:
+```
+  ActionName<t1, ..., t_m>(v1, ..., v_n)
+```
+where the `t`s are the template arguments and the
+`v`s are the value arguments.  The value argument
+types are inferred by the compiler.  For example:
+```
+using ::testing::_;
+...
+  int n;
+  EXPECT_CALL(mock, Foo(_, _))
+      .WillOnce(DuplicateArg<1, unsigned char>(&n));
+```
+
+If you want to explicitly specify the value argument types, you can
+provide additional template arguments:
+```
+  ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
+```
+where `u_i` is the desired type of `v_i`.
+
+`ACTION_TEMPLATE` and `ACTION`/`ACTION_P*` can be overloaded on the
+number of value parameters, but not on the number of template
+parameters.  Without the restriction, the meaning of the following is
+unclear:
+
+```
+  OverloadedAction<int, bool>(x);
+```
+
+Are we using a single-template-parameter action where `bool` refers to
+the type of `x`, or a two-template-parameter action where the compiler
+is asked to infer the type of `x`?
+
+## Using the ACTION Object's Type ##
+
+If you are writing a function that returns an `ACTION` object, you'll
+need to know its type.  The type depends on the macro used to define
+the action and the parameter types.  The rule is relatively simple:
+| **Given Definition** | **Expression** | **Has Type** |
+|:---------------------|:---------------|:-------------|
+| `ACTION(Foo)`        | `Foo()`        | `FooAction`  |
+| `ACTION_TEMPLATE(Foo, HAS_m_TEMPLATE_PARAMS(...), AND_0_VALUE_PARAMS())` |	`Foo<t1, ..., t_m>()` | `FooAction<t1, ..., t_m>` |
+| `ACTION_P(Bar, param)` | `Bar(int_value)` | `BarActionP<int>` |
+| `ACTION_TEMPLATE(Bar, HAS_m_TEMPLATE_PARAMS(...), AND_1_VALUE_PARAMS(p1))` | `Bar<t1, ..., t_m>(int_value)` | `FooActionP<t1, ..., t_m, int>` |
+| `ACTION_P2(Baz, p1, p2)` | `Baz(bool_value, int_value)` | `BazActionP2<bool, int>` |
+| `ACTION_TEMPLATE(Baz, HAS_m_TEMPLATE_PARAMS(...), AND_2_VALUE_PARAMS(p1, p2))` | `Baz<t1, ..., t_m>(bool_value, int_value)` | `FooActionP2<t1, ..., t_m, bool, int>` |
+| ...                  | ...            | ...          |
+
+Note that we have to pick different suffixes (`Action`, `ActionP`,
+`ActionP2`, and etc) for actions with different numbers of value
+parameters, or the action definitions cannot be overloaded on the
+number of them.
+
+## Writing New Monomorphic Actions ##
+
+While the `ACTION*` macros are very convenient, sometimes they are
+inappropriate.  For example, despite the tricks shown in the previous
+recipes, they don't let you directly specify the types of the mock
+function arguments and the action parameters, which in general leads
+to unoptimized compiler error messages that can baffle unfamiliar
+users.  They also don't allow overloading actions based on parameter
+types without jumping through some hoops.
+
+An alternative to the `ACTION*` macros is to implement
+`::testing::ActionInterface<F>`, where `F` is the type of the mock
+function in which the action will be used. For example:
+
+```
+template <typename F>class ActionInterface {
+ public:
+  virtual ~ActionInterface();
+
+  // Performs the action.  Result is the return type of function type
+  // F, and ArgumentTuple is the tuple of arguments of F.
+  //
+  // For example, if F is int(bool, const string&), then Result would
+  // be int, and ArgumentTuple would be tr1::tuple<bool, const string&>.
+  virtual Result Perform(const ArgumentTuple& args) = 0;
+};
+
+using ::testing::_;
+using ::testing::Action;
+using ::testing::ActionInterface;
+using ::testing::MakeAction;
+
+typedef int IncrementMethod(int*);
+
+class IncrementArgumentAction : public ActionInterface<IncrementMethod> {
+ public:
+  virtual int Perform(const tr1::tuple<int*>& args) {
+    int* p = tr1::get<0>(args);  // Grabs the first argument.
+    return *p++;
+  }
+};
+
+Action<IncrementMethod> IncrementArgument() {
+  return MakeAction(new IncrementArgumentAction);
+}
+...
+
+  EXPECT_CALL(foo, Baz(_))
+      .WillOnce(IncrementArgument());
+
+  int n = 5;
+  foo.Baz(&n);  // Should return 5 and change n to 6.
+```
+
+## Writing New Polymorphic Actions ##
+
+The previous recipe showed you how to define your own action. This is
+all good, except that you need to know the type of the function in
+which the action will be used. Sometimes that can be a problem. For
+example, if you want to use the action in functions with _different_
+types (e.g. like `Return()` and `SetArgumentPointee()`).
+
+If an action can be used in several types of mock functions, we say
+it's _polymorphic_. The `MakePolymorphicAction()` function template
+makes it easy to define such an action:
+
+```
+namespace testing {
+
+template <typename Impl>
+PolymorphicAction<Impl> MakePolymorphicAction(const Impl& impl);
+
+}  // namespace testing
+```
+
+As an example, let's define an action that returns the second argument
+in the mock function's argument list. The first step is to define an
+implementation class:
+
+```
+class ReturnSecondArgumentAction {
+ public:
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple& args) const {
+    // To get the i-th (0-based) argument, use tr1::get<i>(args).
+    return tr1::get<1>(args);
+  }
+};
+```
+
+This implementation class does _not_ need to inherit from any
+particular class. What matters is that it must have a `Perform()`
+method template. This method template takes the mock function's
+arguments as a tuple in a **single** argument, and returns the result of
+the action. It can be either `const` or not, but must be invokable
+with exactly one template argument, which is the result type. In other
+words, you must be able to call `Perform<R>(args)` where `R` is the
+mock function's return type and `args` is its arguments in a tuple.
+
+Next, we use `MakePolymorphicAction()` to turn an instance of the
+implementation class into the polymorphic action we need. It will be
+convenient to have a wrapper for this:
+
+```
+using ::testing::MakePolymorphicAction;
+using ::testing::PolymorphicAction;
+
+PolymorphicAction<ReturnSecondArgumentAction> ReturnSecondArgument() {
+  return MakePolymorphicAction(ReturnSecondArgumentAction());
+}
+```
+
+Now, you can use this polymorphic action the same way you use the
+built-in ones:
+
+```
+using ::testing::_;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD2(DoThis, int(bool flag, int n));
+  MOCK_METHOD3(DoThat, string(int x, const char* str1, const char* str2));
+};
+...
+
+  MockFoo foo;
+  EXPECT_CALL(foo, DoThis(_, _))
+      .WillOnce(ReturnSecondArgument());
+  EXPECT_CALL(foo, DoThat(_, _, _))
+      .WillOnce(ReturnSecondArgument());
+  ...
+  foo.DoThis(true, 5);         // Will return 5.
+  foo.DoThat(1, "Hi", "Bye");  // Will return "Hi".
+```
+
+## Teaching Google Mock How to Print Your Values ##
+
+When an uninteresting or unexpected call occurs, Google Mock prints
+the argument values to help you debug.  The `EXPECT_THAT` and
+`ASSERT_THAT` assertions also print the value being validated when the
+test fails.  Google Mock does this using the user-extensible value
+printer defined in `<gmock/gmock-printers.h>`.
+
+This printer knows how to print the built-in C++ types, native arrays,
+STL containers, and any type that supports the `<<` operator. For
+other types, it prints the raw bytes in the value and hope you the
+user can figure it out.
+
+Did I say that the printer is `extensible`? That means you can teach
+it to do a better job at printing your particular type than to dump
+the bytes. To do that, you just need to define `<<` for your type:
+
+```
+#include <iostream>
+
+namespace foo {
+
+class Foo { ... };
+
+// It's important that the << operator is defined in the SAME
+// namespace that defines Foo.  C++'s look-up rules rely on that.
+::std::ostream& operator<<(::std::ostream& os, const Foo& foo) {
+  return os << foo.DebugString();  // Whatever needed to print foo to os.
+}
+
+}  // namespace foo
+```
+
+Sometimes, this might not be an option. For example, your team may
+consider it dangerous or bad style to have a `<<` operator for `Foo`,
+or `Foo` may already have a `<<` operator that doesn't do what you
+want (and you cannot change it). Don't despair though - Google Mock
+gives you a second chance to get it right. Namely, you can define a
+`PrintTo()` function like this:
+
+```
+#include <iostream>
+
+namespace foo {
+
+class Foo { ... };
+
+// It's important that PrintTo() is defined in the SAME
+// namespace that defines Foo.  C++'s look-up rules rely on that.
+void PrintTo(const Foo& foo, ::std::ostream* os) {
+  *os << foo.DebugString();  // Whatever needed to print foo to os.
+}
+
+}  // namespace foo
+```
+
+What if you have both `<<` and `PrintTo()`? In this case, the latter
+will override the former when Google Mock is concerned. This allows
+you to customize how the value should appear in Google Mock's output
+without affecting code that relies on the behavior of its `<<`
+operator.
+
+**Note:** When printing a pointer of type `T*`, Google Mock calls
+`PrintTo(T*, std::ostream* os)` instead of `operator<<(std::ostream&, T*)`.
+Therefore the only way to affect how a pointer is printed by Google
+Mock is to define `PrintTo()` for it. Also note that `T*` and `const T*`
+are different types, so you may need to define `PrintTo()` for both.
+
+Why does Google Mock treat pointers specially? There are several reasons:
+
+  * We cannot use `operator<<` to print a `signed char*` or `unsigned char*`, since it will print the pointer as a NUL-terminated C string, which likely will cause an access violation.
+  * We want `NULL` pointers to be printed as `"NULL"`, but `operator<<` prints it as `"0"`, `"nullptr"`, or something else, depending on the compiler.
+  * With some compilers, printing a `NULL` `char*` using `operator<<` will segfault.
+  * `operator<<` prints a function pointer as a `bool` (hence it always prints `"1"`), which is not very useful.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/Documentation.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/Documentation.md
new file mode 100644
index 0000000000..315b0a2989
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/Documentation.md
@@ -0,0 +1,11 @@
+This page lists all documentation wiki pages for Google Mock **version 1.5.0** -- **if you use a different version of Google Mock, please read the documentation for that specific version instead.**
+
+  * [ForDummies](V1_5_ForDummies.md) -- start here if you are new to Google Mock.
+  * [CheatSheet](V1_5_CheatSheet.md) -- a quick reference.
+  * [CookBook](V1_5_CookBook.md) -- recipes for doing various tasks using Google Mock.
+  * [FrequentlyAskedQuestions](V1_5_FrequentlyAskedQuestions.md) -- check here before asking a question on the mailing list.
+
+To contribute code to Google Mock, read:
+
+  * DevGuide -- read this _before_ writing your first patch.
+  * [Pump Manual](http://code.google.com/p/googletest/wiki/PumpManual) -- how we generate some of Google Mock's source files.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/ForDummies.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/ForDummies.md
new file mode 100644
index 0000000000..fcc3b56174
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/ForDummies.md
@@ -0,0 +1,439 @@
+
+
+(**Note:** If you get compiler errors that you don't understand, be sure to consult [Google Mock Doctor](V1_5_FrequentlyAskedQuestions#How_am_I_supposed_to_make_sense_of_these_horrible_template_error.md).)
+
+# What Is Google C++ Mocking Framework? #
+When you write a prototype or test, often it's not feasible or wise to rely on real objects entirely. A **mock object** implements the same interface as a real object (so it can be used as one), but lets you specify at run time how it will be used and what it should do (which methods will be called? in which order? how many times? with what arguments? what will they return? etc).
+
+**Note:** It is easy to confuse the term _fake objects_ with mock objects. Fakes and mocks actually mean very different things in the Test-Driven Development (TDD) community:
+
+  * **Fake** objects have working implementations, but usually take some shortcut (perhaps to make the operations less expensive), which makes them not suitable for production. An in-memory file system would be an example of a fake.
+  * **Mocks** are objects pre-programmed with _expectations_, which form a specification of the calls they are expected to receive.
+
+If all this seems too abstract for you, don't worry - the most important thing to remember is that a mock allows you to check the _interaction_ between itself and code that uses it. The difference between fakes and mocks will become much clearer once you start to use mocks.
+
+**Google C++ Mocking Framework** (or **Google Mock** for short) is a library (sometimes we also call it a "framework" to make it sound cool) for creating mock classes and using them. It does to C++ what [jMock](http://www.jmock.org/) and [EasyMock](http://www.easymock.org/) do to Java.
+
+Using Google Mock involves three basic steps:
+
+  1. Use some simple macros to describe the interface you want to mock, and they will expand to the implementation of your mock class;
+  1. Create some mock objects and specify its expectations and behavior using an intuitive syntax;
+  1. Exercise code that uses the mock objects. Google Mock will catch any violation of the expectations as soon as it arises.
+
+# Why Google Mock? #
+While mock objects help you remove unnecessary dependencies in tests and make them fast and reliable, using mocks manually in C++ is _hard_:
+
+  * Someone has to implement the mocks. The job is usually tedious and error-prone. No wonder people go great distance to avoid it.
+  * The quality of those manually written mocks is a bit, uh, unpredictable. You may see some really polished ones, but you may also see some that were hacked up in a hurry and have all sorts of ad hoc restrictions.
+  * The knowledge you gained from using one mock doesn't transfer to the next.
+
+In contrast, Java and Python programmers have some fine mock frameworks, which automate the creation of mocks. As a result, mocking is a proven effective technique and widely adopted practice in those communities. Having the right tool absolutely makes the difference.
+
+Google Mock was built to help C++ programmers. It was inspired by [jMock](http://www.jmock.org/) and [EasyMock](http://www.easymock.org/), but designed with C++'s specifics in mind. It is your friend if any of the following problems is bothering you:
+
+  * You are stuck with a sub-optimal design and wish you had done more prototyping before it was too late, but prototyping in C++ is by no means "rapid".
+  * Your tests are slow as they depend on too many libraries or use expensive resources (e.g. a database).
+  * Your tests are brittle as some resources they use are unreliable (e.g. the network).
+  * You want to test how your code handles a failure (e.g. a file checksum error), but it's not easy to cause one.
+  * You need to make sure that your module interacts with other modules in the right way, but it's hard to observe the interaction; therefore you resort to observing the side effects at the end of the action, which is awkward at best.
+  * You want to "mock out" your dependencies, except that they don't have mock implementations yet; and, frankly, you aren't thrilled by some of those hand-written mocks.
+
+We encourage you to use Google Mock as:
+
+  * a _design_ tool, for it lets you experiment with your interface design early and often. More iterations lead to better designs!
+  * a _testing_ tool to cut your tests' outbound dependencies and probe the interaction between your module and its collaborators.
+
+# Getting Started #
+Using Google Mock is easy! Inside your C++ source file, just `#include` `<gtest/gtest.h>` and `<gmock/gmock.h>`, and you are ready to go.
+
+# A Case for Mock Turtles #
+Let's look at an example. Suppose you are developing a graphics program that relies on a LOGO-like API for drawing. How would you test that it does the right thing? Well, you can run it and compare the screen with a golden screen snapshot, but let's admit it: tests like this are expensive to run and fragile (What if you just upgraded to a shiny new graphics card that has better anti-aliasing? Suddenly you have to update all your golden images.). It would be too painful if all your tests are like this. Fortunately, you learned about Dependency Injection and know the right thing to do: instead of having your application talk to the drawing API directly, wrap the API in an interface (say, `Turtle`) and code to that interface:
+
+```
+class Turtle {
+  ...
+  virtual ~Turtle() {}
+  virtual void PenUp() = 0;
+  virtual void PenDown() = 0;
+  virtual void Forward(int distance) = 0;
+  virtual void Turn(int degrees) = 0;
+  virtual void GoTo(int x, int y) = 0;
+  virtual int GetX() const = 0;
+  virtual int GetY() const = 0;
+};
+```
+
+(Note that the destructor of `Turtle` **must** be virtual, as is the case for **all** classes you intend to inherit from - otherwise the destructor of the derived class will not be called when you delete an object through a base pointer, and you'll get corrupted program states like memory leaks.)
+
+You can control whether the turtle's movement will leave a trace using `PenUp()` and `PenDown()`, and control its movement using `Forward()`, `Turn()`, and `GoTo()`. Finally, `GetX()` and `GetY()` tell you the current position of the turtle.
+
+Your program will normally use a real implementation of this interface. In tests, you can use a mock implementation instead. This allows you to easily check what drawing primitives your program is calling, with what arguments, and in which order. Tests written this way are much more robust (they won't break because your new machine does anti-aliasing differently), easier to read and maintain (the intent of a test is expressed in the code, not in some binary images), and run _much, much faster_.
+
+# Writing the Mock Class #
+If you are lucky, the mocks you need to use have already been implemented by some nice people. If, however, you find yourself in the position to write a mock class, relax - Google Mock turns this task into a fun game! (Well, almost.)
+
+## How to Define It ##
+Using the `Turtle` interface as example, here are the simple steps you need to follow:
+
+  1. Derive a class `MockTurtle` from `Turtle`.
+  1. Take a virtual function of `Turtle`. Count how many arguments it has.
+  1. In the `public:` section of the child class, write `MOCK_METHODn();` (or `MOCK_CONST_METHODn();` if you are mocking a `const` method), where `n` is the number of the arguments; if you counted wrong, shame on you, and a compiler error will tell you so.
+  1. Now comes the fun part: you take the function signature, cut-and-paste the _function name_ as the _first_ argument to the macro, and leave what's left as the _second_ argument (in case you're curious, this is the _type of the function_).
+  1. Repeat until all virtual functions you want to mock are done.
+
+After the process, you should have something like:
+
+```
+#include <gmock/gmock.h>  // Brings in Google Mock.
+class MockTurtle : public Turtle {
+ public:
+  ...
+  MOCK_METHOD0(PenUp, void());
+  MOCK_METHOD0(PenDown, void());
+  MOCK_METHOD1(Forward, void(int distance));
+  MOCK_METHOD1(Turn, void(int degrees));
+  MOCK_METHOD2(GoTo, void(int x, int y));
+  MOCK_CONST_METHOD0(GetX, int());
+  MOCK_CONST_METHOD0(GetY, int());
+};
+```
+
+You don't need to define these mock methods somewhere else - the `MOCK_METHOD*` macros will generate the definitions for you. It's that simple! Once you get the hang of it, you can pump out mock classes faster than your source-control system can handle your check-ins.
+
+**Tip:** If even this is too much work for you, you'll find the
+`gmock_gen.py` tool in Google Mock's `scripts/generator/` directory (courtesy of the [cppclean](http://code.google.com/p/cppclean/) project) useful.  This command-line
+tool requires that you have Python 2.4 installed.  You give it a C++ file and the name of an abstract class defined in it,
+and it will print the definition of the mock class for you.  Due to the
+complexity of the C++ language, this script may not always work, but
+it can be quite handy when it does.  For more details, read the [user documentation](http://code.google.com/p/googlemock/source/browse/trunk/scripts/generator/README).
+
+## Where to Put It ##
+When you define a mock class, you need to decide where to put its definition. Some people put it in a `*_test.cc`. This is fine when the interface being mocked (say, `Foo`) is owned by the same person or team. Otherwise, when the owner of `Foo` changes it, your test could break. (You can't really expect `Foo`'s maintainer to fix every test that uses `Foo`, can you?)
+
+So, the rule of thumb is: if you need to mock `Foo` and it's owned by others, define the mock class in `Foo`'s package (better, in a `testing` sub-package such that you can clearly separate production code and testing utilities), and put it in a `mock_foo.h`. Then everyone can reference `mock_foo.h` from their tests. If `Foo` ever changes, there is only one copy of `MockFoo` to change, and only tests that depend on the changed methods need to be fixed.
+
+Another way to do it: you can introduce a thin layer `FooAdaptor` on top of `Foo` and code to this new interface. Since you own `FooAdaptor`, you can absorb changes in `Foo` much more easily. While this is more work initially, carefully choosing the adaptor interface can make your code easier to write and more readable (a net win in the long run), as you can choose `FooAdaptor` to fit your specific domain much better than `Foo` does.
+
+# Using Mocks in Tests #
+Once you have a mock class, using it is easy. The typical work flow is:
+
+  1. Import the Google Mock names from the `testing` namespace such that you can use them unqualified (You only have to do it once per file. Remember that namespaces are a good idea and good for your health.).
+  1. Create some mock objects.
+  1. Specify your expectations on them (How many times will a method be called? With what arguments? What should it do? etc.).
+  1. Exercise some code that uses the mocks; optionally, check the result using Google Test assertions. If a mock method is called more than expected or with wrong arguments, you'll get an error immediately.
+  1. When a mock is destructed, Google Mock will automatically check whether all expectations on it have been satisfied.
+
+Here's an example:
+
+```
+#include "path/to/mock-turtle.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+using ::testing::AtLeast;                     // #1
+
+TEST(PainterTest, CanDrawSomething) {
+  MockTurtle turtle;                          // #2
+  EXPECT_CALL(turtle, PenDown())              // #3
+      .Times(AtLeast(1));
+
+  Painter painter(&turtle);                   // #4
+
+  EXPECT_TRUE(painter.DrawCircle(0, 0, 10));
+}                                             // #5
+
+int main(int argc, char** argv) {
+  // The following line must be executed to initialize Google Mock
+  // (and Google Test) before running the tests.
+  ::testing::InitGoogleMock(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+```
+
+As you might have guessed, this test checks that `PenDown()` is called at least once. If the `painter` object didn't call this method, your test will fail with a message like this:
+
+```
+path/to/my_test.cc:119: Failure
+Actual function call count doesn't match this expectation:
+Actually: never called;
+Expected: called at least once.
+```
+
+**Tip 1:** If you run the test from an Emacs buffer, you can hit `<Enter>` on the line number displayed in the error message to jump right to the failed expectation.
+
+**Tip 2:** If your mock objects are never deleted, the final verification won't happen. Therefore it's a good idea to use a heap leak checker in your tests when you allocate mocks on the heap.
+
+**Important note:** Google Mock requires expectations to be set **before** the mock functions are called, otherwise the behavior is **undefined**. In particular, you mustn't interleave `EXPECT_CALL()`s and calls to the mock functions.
+
+This means `EXPECT_CALL()` should be read as expecting that a call will occur _in the future_, not that a call has occurred. Why does Google Mock work like that? Well, specifying the expectation beforehand allows Google Mock to report a violation as soon as it arises, when the context (stack trace, etc) is still available. This makes debugging much easier.
+
+Admittedly, this test is contrived and doesn't do much. You can easily achieve the same effect without using Google Mock. However, as we shall reveal soon, Google Mock allows you to do _much more_ with the mocks.
+
+## Using Google Mock with Any Testing Framework ##
+If you want to use something other than Google Test (e.g. [CppUnit](http://apps.sourceforge.net/mediawiki/cppunit/index.php?title=Main_Page) or
+[CxxTest](http://cxxtest.tigris.org/)) as your testing framework, just change the `main()` function in the previous section to:
+```
+int main(int argc, char** argv) {
+  // The following line causes Google Mock to throw an exception on failure,
+  // which will be interpreted by your testing framework as a test failure.
+  ::testing::GTEST_FLAG(throw_on_failure) = true;
+  ::testing::InitGoogleMock(&argc, argv);
+  ... whatever your testing framework requires ...
+}
+```
+
+This approach has a catch: it makes Google Mock throw an exception
+from a mock object's destructor sometimes.  With some compilers, this
+sometimes causes the test program to crash.  You'll still be able to
+notice that the test has failed, but it's not a graceful failure.
+
+A better solution is to use Google Test's
+[event listener API](http://code.google.com/p/googletest/wiki/GoogleTestAdvancedGuide#Extending_Google_Test_by_Handling_Test_Events)
+to report a test failure to your testing framework properly.  You'll need to
+implement the `OnTestPartResult()` method of the event listener interface, but it
+should be straightforward.
+
+If this turns out to be too much work, we suggest that you stick with
+Google Test, which works with Google Mock seamlessly (in fact, it is
+technically part of Google Mock.).  If there is a reason that you
+cannot use Google Test, please let us know.
+
+# Setting Expectations #
+The key to using a mock object successfully is to set the _right expectations_ on it. If you set the expectations too strict, your test will fail as the result of unrelated changes. If you set them too loose, bugs can slip through. You want to do it just right such that your test can catch exactly the kind of bugs you intend it to catch. Google Mock provides the necessary means for you to do it "just right."
+
+## General Syntax ##
+In Google Mock we use the `EXPECT_CALL()` macro to set an expectation on a mock method. The general syntax is:
+
+```
+EXPECT_CALL(mock_object, method(matchers))
+    .Times(cardinality)
+    .WillOnce(action)
+    .WillRepeatedly(action);
+```
+
+The macro has two arguments: first the mock object, and then the method and its arguments. Note that the two are separated by a comma (`,`), not a period (`.`). (Why using a comma? The answer is that it was necessary for technical reasons.)
+
+The macro can be followed by some optional _clauses_ that provide more information about the expectation. We'll discuss how each clause works in the coming sections.
+
+This syntax is designed to make an expectation read like English. For example, you can probably guess that
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetX())
+    .Times(5)
+    .WillOnce(Return(100))
+    .WillOnce(Return(150))
+    .WillRepeatedly(Return(200));
+```
+
+says that the `turtle` object's `GetX()` method will be called five times, it will return 100 the first time, 150 the second time, and then 200 every time. Some people like to call this style of syntax a Domain-Specific Language (DSL).
+
+**Note:** Why do we use a macro to do this? It serves two purposes: first it makes expectations easily identifiable (either by `grep` or by a human reader), and second it allows Google Mock to include the source file location of a failed expectation in messages, making debugging easier.
+
+## Matchers: What Arguments Do We Expect? ##
+When a mock function takes arguments, we must specify what arguments we are expecting; for example:
+
+```
+// Expects the turtle to move forward by 100 units.
+EXPECT_CALL(turtle, Forward(100));
+```
+
+Sometimes you may not want to be too specific (Remember that talk about tests being too rigid? Over specification leads to brittle tests and obscures the intent of tests. Therefore we encourage you to specify only what's necessary - no more, no less.). If you care to check that `Forward()` will be called but aren't interested in its actual argument, write `_` as the argument, which means "anything goes":
+
+```
+using ::testing::_;
+...
+// Expects the turtle to move forward.
+EXPECT_CALL(turtle, Forward(_));
+```
+
+`_` is an instance of what we call **matchers**. A matcher is like a predicate and can test whether an argument is what we'd expect. You can use a matcher inside `EXPECT_CALL()` wherever a function argument is expected.
+
+A list of built-in matchers can be found in the [CheatSheet](V1_5_CheatSheet.md). For example, here's the `Ge` (greater than or equal) matcher:
+
+```
+using ::testing::Ge;...
+EXPECT_CALL(turtle, Forward(Ge(100)));
+```
+
+This checks that the turtle will be told to go forward by at least 100 units.
+
+## Cardinalities: How Many Times Will It Be Called? ##
+The first clause we can specify following an `EXPECT_CALL()` is `Times()`. We call its argument a **cardinality** as it tells _how many times_ the call should occur. It allows us to repeat an expectation many times without actually writing it as many times. More importantly, a cardinality can be "fuzzy", just like a matcher can be. This allows a user to express the intent of a test exactly.
+
+An interesting special case is when we say `Times(0)`. You may have guessed - it means that the function shouldn't be called with the given arguments at all, and Google Mock will report a Google Test failure whenever the function is (wrongfully) called.
+
+We've seen `AtLeast(n)` as an example of fuzzy cardinalities earlier. For the list of built-in cardinalities you can use, see the [CheatSheet](V1_5_CheatSheet.md).
+
+The `Times()` clause can be omitted. **If you omit `Times()`, Google Mock will infer the cardinality for you.** The rules are easy to remember:
+
+  * If **neither** `WillOnce()` **nor** `WillRepeatedly()` is in the `EXPECT_CALL()`, the inferred cardinality is `Times(1)`.
+  * If there are `n WillOnce()`'s but **no** `WillRepeatedly()`, where `n` >= 1, the cardinality is `Times(n)`.
+  * If there are `n WillOnce()`'s and **one** `WillRepeatedly()`, where `n` >= 0, the cardinality is `Times(AtLeast(n))`.
+
+**Quick quiz:** what do you think will happen if a function is expected to be called twice but actually called four times?
+
+## Actions: What Should It Do? ##
+Remember that a mock object doesn't really have a working implementation? We as users have to tell it what to do when a method is invoked. This is easy in Google Mock.
+
+First, if the return type of a mock function is a built-in type or a pointer, the function has a **default action** (a `void` function will just return, a `bool` function will return `false`, and other functions will return 0). If you don't say anything, this behavior will be used.
+
+Second, if a mock function doesn't have a default action, or the default action doesn't suit you, you can specify the action to be taken each time the expectation matches using a series of `WillOnce()` clauses followed by an optional `WillRepeatedly()`. For example,
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetX())
+    .WillOnce(Return(100))
+    .WillOnce(Return(200))
+    .WillOnce(Return(300));
+```
+
+This says that `turtle.GetX()` will be called _exactly three times_ (Google Mock inferred this from how many `WillOnce()` clauses we've written, since we didn't explicitly write `Times()`), and will return 100, 200, and 300 respectively.
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetY())
+    .WillOnce(Return(100))
+    .WillOnce(Return(200))
+    .WillRepeatedly(Return(300));
+```
+
+says that `turtle.GetY()` will be called _at least twice_ (Google Mock knows this as we've written two `WillOnce()` clauses and a `WillRepeatedly()` while having no explicit `Times()`), will return 100 the first time, 200 the second time, and 300 from the third time on.
+
+Of course, if you explicitly write a `Times()`, Google Mock will not try to infer the cardinality itself. What if the number you specified is larger than there are `WillOnce()` clauses? Well, after all `WillOnce()`s are used up, Google Mock will do the _default_ action for the function every time (unless, of course, you have a `WillRepeatedly()`.).
+
+What can we do inside `WillOnce()` besides `Return()`? You can return a reference using `ReturnRef(variable)`, or invoke a pre-defined function, among [others](V1_5_CheatSheet#Actions.md).
+
+**Important note:** The `EXPECT_CALL()` statement evaluates the action clause only once, even though the action may be performed many times. Therefore you must be careful about side effects. The following may not do what you want:
+
+```
+int n = 100;
+EXPECT_CALL(turtle, GetX())
+.Times(4)
+.WillOnce(Return(n++));
+```
+
+Instead of returning 100, 101, 102, ..., consecutively, this mock function will always return 100 as `n++` is only evaluated once. Similarly, `Return(new Foo)` will create a new `Foo` object when the `EXPECT_CALL()` is executed, and will return the same pointer every time. If you want the side effect to happen every time, you need to define a custom action, which we'll teach in the [CookBook](V1_5_CookBook.md).
+
+Time for another quiz! What do you think the following means?
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetY())
+.Times(4)
+.WillOnce(Return(100));
+```
+
+Obviously `turtle.GetY()` is expected to be called four times. But if you think it will return 100 every time, think twice! Remember that one `WillOnce()` clause will be consumed each time the function is invoked and the default action will be taken afterwards. So the right answer is that `turtle.GetY()` will return 100 the first time, but **return 0 from the second time on**, as returning 0 is the default action for `int` functions.
+
+## Using Multiple Expectations ##
+So far we've only shown examples where you have a single expectation. More realistically, you're going to specify expectations on multiple mock methods, which may be from multiple mock objects.
+
+By default, when a mock method is invoked, Google Mock will search the expectations in the **reverse order** they are defined, and stop when an active expectation that matches the arguments is found (you can think of it as "newer rules override older ones."). If the matching expectation cannot take any more calls, you will get an upper-bound-violated failure. Here's an example:
+
+```
+using ::testing::_;...
+EXPECT_CALL(turtle, Forward(_));  // #1
+EXPECT_CALL(turtle, Forward(10))  // #2
+    .Times(2);
+```
+
+If `Forward(10)` is called three times in a row, the third time it will be an error, as the last matching expectation (#2) has been saturated. If, however, the third `Forward(10)` call is replaced by `Forward(20)`, then it would be OK, as now #1 will be the matching expectation.
+
+**Side note:** Why does Google Mock search for a match in the _reverse_ order of the expectations? The reason is that this allows a user to set up the default expectations in a mock object's constructor or the test fixture's set-up phase and then customize the mock by writing more specific expectations in the test body. So, if you have two expectations on the same method, you want to put the one with more specific matchers **after** the other, or the more specific rule would be shadowed by the more general one that comes after it.
+
+## Ordered vs Unordered Calls ##
+By default, an expectation can match a call even though an earlier expectation hasn't been satisfied. In other words, the calls don't have to occur in the order the expectations are specified.
+
+Sometimes, you may want all the expected calls to occur in a strict order. To say this in Google Mock is easy:
+
+```
+using ::testing::InSequence;...
+TEST(FooTest, DrawsLineSegment) {
+  ...
+  {
+    InSequence dummy;
+
+    EXPECT_CALL(turtle, PenDown());
+    EXPECT_CALL(turtle, Forward(100));
+    EXPECT_CALL(turtle, PenUp());
+  }
+  Foo();
+}
+```
+
+By creating an object of type `InSequence`, all expectations in its scope are put into a _sequence_ and have to occur _sequentially_. Since we are just relying on the constructor and destructor of this object to do the actual work, its name is really irrelevant.
+
+In this example, we test that `Foo()` calls the three expected functions in the order as written. If a call is made out-of-order, it will be an error.
+
+(What if you care about the relative order of some of the calls, but not all of them? Can you specify an arbitrary partial order? The answer is ... yes! If you are impatient, the details can be found in the [CookBook](V1_5_CookBook.md).)
+
+## All Expectations Are Sticky (Unless Said Otherwise) ##
+Now let's do a quick quiz to see how well you can use this mock stuff already. How would you test that the turtle is asked to go to the origin _exactly twice_ (you want to ignore any other instructions it receives)?
+
+After you've come up with your answer, take a look at ours and compare notes (solve it yourself first - don't cheat!):
+
+```
+using ::testing::_;...
+EXPECT_CALL(turtle, GoTo(_, _))  // #1
+    .Times(AnyNumber());
+EXPECT_CALL(turtle, GoTo(0, 0))  // #2
+    .Times(2);
+```
+
+Suppose `turtle.GoTo(0, 0)` is called three times. In the third time, Google Mock will see that the arguments match expectation #2 (remember that we always pick the last matching expectation). Now, since we said that there should be only two such calls, Google Mock will report an error immediately. This is basically what we've told you in the "Using Multiple Expectations" section above.
+
+This example shows that **expectations in Google Mock are "sticky" by default**, in the sense that they remain active even after we have reached their invocation upper bounds. This is an important rule to remember, as it affects the meaning of the spec, and is **different** to how it's done in many other mocking frameworks (Why'd we do that? Because we think our rule makes the common cases easier to express and understand.).
+
+Simple? Let's see if you've really understood it: what does the following code say?
+
+```
+using ::testing::Return;
+...
+for (int i = n; i > 0; i--) {
+  EXPECT_CALL(turtle, GetX())
+      .WillOnce(Return(10*i));
+}
+```
+
+If you think it says that `turtle.GetX()` will be called `n` times and will return 10, 20, 30, ..., consecutively, think twice! The problem is that, as we said, expectations are sticky. So, the second time `turtle.GetX()` is called, the last (latest) `EXPECT_CALL()` statement will match, and will immediately lead to an "upper bound exceeded" error - this piece of code is not very useful!
+
+One correct way of saying that `turtle.GetX()` will return 10, 20, 30, ..., is to explicitly say that the expectations are _not_ sticky. In other words, they should _retire_ as soon as they are saturated:
+
+```
+using ::testing::Return;
+...
+for (int i = n; i > 0; i--) {
+  EXPECT_CALL(turtle, GetX())
+    .WillOnce(Return(10*i))
+    .RetiresOnSaturation();
+}
+```
+
+And, there's a better way to do it: in this case, we expect the calls to occur in a specific order, and we line up the actions to match the order. Since the order is important here, we should make it explicit using a sequence:
+
+```
+using ::testing::InSequence;
+using ::testing::Return;
+...
+{
+  InSequence s;
+
+  for (int i = 1; i <= n; i++) {
+    EXPECT_CALL(turtle, GetX())
+        .WillOnce(Return(10*i))
+        .RetiresOnSaturation();
+  }
+}
+```
+
+By the way, the other situation where an expectation may _not_ be sticky is when it's in a sequence - as soon as another expectation that comes after it in the sequence has been used, it automatically retires (and will never be used to match any call).
+
+## Uninteresting Calls ##
+A mock object may have many methods, and not all of them are that interesting. For example, in some tests we may not care about how many times `GetX()` and `GetY()` get called.
+
+In Google Mock, if you are not interested in a method, just don't say anything about it. If a call to this method occurs, you'll see a warning in the test output, but it won't be a failure.
+
+# What Now? #
+Congratulations! You've learned enough about Google Mock to start using it. Now, you might want to join the [googlemock](http://groups.google.com/group/googlemock) discussion group and actually write some tests using Google Mock - it will be fun. Hey, it may even be addictive - you've been warned.
+
+Then, if you feel like increasing your mock quotient, you should move on to the [CookBook](V1_5_CookBook.md). You can learn many advanced features of Google Mock there -- and advance your level of enjoyment and testing bliss.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/FrequentlyAskedQuestions.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/FrequentlyAskedQuestions.md
new file mode 100644
index 0000000000..7593243c3a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_5/FrequentlyAskedQuestions.md
@@ -0,0 +1,624 @@
+
+
+Please send your questions to the
+[googlemock](http://groups.google.com/group/googlemock) discussion
+group. If you need help with compiler errors, make sure you have
+tried [Google Mock Doctor](#How_am_I_supposed_to_make_sense_of_these_horrible_template_error.md) first.
+
+## I wrote some matchers.  After I upgraded to a new version of Google Mock, they no longer compile.  What's going on? ##
+
+After version 1.4.0 of Google Mock was released, we had an idea on how
+to make it easier to write matchers that can generate informative
+messages efficiently.  We experimented with this idea and liked what
+we saw.  Therefore we decided to implement it.
+
+Unfortunately, this means that if you have defined your own matchers
+by implementing `MatcherInterface` or using `MakePolymorphicMatcher()`,
+your definitions will no longer compile.  Matchers defined using the
+`MATCHER*` family of macros are not affected.
+
+Sorry for the hassle if your matchers are affected.  We believe it's
+in everyone's long-term interest to make this change sooner than
+later.  Fortunately, it's usually not hard to migrate an existing
+matcher to the new API.  Here's what you need to do:
+
+If you wrote your matcher like this:
+```
+// Old matcher definition that doesn't work with the latest
+// Google Mock.
+using ::testing::MatcherInterface;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetFoo() > 5;
+  }
+  ...
+};
+```
+
+you'll need to change it to:
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool MatchAndExplain(MyType value,
+                               MatchResultListener* listener) const {
+    // Returns true if value matches.
+    return value.GetFoo() > 5;
+  }
+  ...
+};
+```
+(i.e. rename `Matches()` to `MatchAndExplain()` and give it a second
+argument of type `MatchResultListener*`.)
+
+If you were also using `ExplainMatchResultTo()` to improve the matcher
+message:
+```
+// Old matcher definition that doesn't work with the lastest
+// Google Mock.
+using ::testing::MatcherInterface;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetFoo() > 5;
+  }
+
+  virtual void ExplainMatchResultTo(MyType value,
+                                    ::std::ostream* os) const {
+    // Prints some helpful information to os to help
+    // a user understand why value matches (or doesn't match).
+    *os << "the Foo property is " << value.GetFoo();
+  }
+  ...
+};
+```
+
+you should move the logic of `ExplainMatchResultTo()` into
+`MatchAndExplain()`, using the `MatchResultListener` argument where
+the `::std::ostream` was used:
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool MatchAndExplain(MyType value,
+                               MatchResultListener* listener) const {
+    // Returns true if value matches.
+    *listener << "the Foo property is " << value.GetFoo();
+    return value.GetFoo() > 5;
+  }
+  ...
+};
+```
+
+If your matcher is defined using `MakePolymorphicMatcher()`:
+```
+// Old matcher definition that doesn't work with the latest
+// Google Mock.
+using ::testing::MakePolymorphicMatcher;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetBar() < 42;
+  }
+  ...
+};
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+you should rename the `Matches()` method to `MatchAndExplain()` and
+add a `MatchResultListener*` argument (the same as what you need to do
+for matchers defined by implementing `MatcherInterface`):
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MakePolymorphicMatcher;
+using ::testing::MatchResultListener;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool MatchAndExplain(MyType value,
+                       MatchResultListener* listener) const {
+    // Returns true if value matches.
+    return value.GetBar() < 42;
+  }
+  ...
+};
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+If your polymorphic matcher uses `ExplainMatchResultTo()` for better
+failure messages:
+```
+// Old matcher definition that doesn't work with the latest
+// Google Mock.
+using ::testing::MakePolymorphicMatcher;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetBar() < 42;
+  }
+  ...
+};
+void ExplainMatchResultTo(const MyGreatMatcher& matcher,
+                          MyType value,
+                          ::std::ostream* os) {
+  // Prints some helpful information to os to help
+  // a user understand why value matches (or doesn't match).
+  *os << "the Bar property is " << value.GetBar();
+}
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+you'll need to move the logic inside `ExplainMatchResultTo()` to
+`MatchAndExplain()`:
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MakePolymorphicMatcher;
+using ::testing::MatchResultListener;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool MatchAndExplain(MyType value,
+                       MatchResultListener* listener) const {
+    // Returns true if value matches.
+    *listener << "the Bar property is " << value.GetBar();
+    return value.GetBar() < 42;
+  }
+  ...
+};
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+For more information, you can read these
+[two](V1_5_CookBook#Writing_New_Monomorphic_Matchers.md)
+[recipes](V1_5_CookBook#Writing_New_Polymorphic_Matchers.md)
+from the cookbook.  As always, you
+are welcome to post questions on `googlemock@googlegroups.com` if you
+need any help.
+
+## When using Google Mock, do I have to use Google Test as the testing framework?  I have my favorite testing framework and don't want to switch. ##
+
+Google Mock works out of the box with Google Test.  However, it's easy
+to configure it to work with any testing framework of your choice.
+[Here](V1_5_ForDummies#Using_Google_Mock_with_Any_Testing_Framework.md) is how.
+
+## How am I supposed to make sense of these horrible template errors? ##
+
+If you are confused by the compiler errors gcc threw at you,
+try consulting the _Google Mock Doctor_ tool first.  What it does is to
+scan stdin for gcc error messages, and spit out diagnoses on the
+problems (we call them diseases) your code has.
+
+To "install", run command:
+```
+alias gmd='<path to googlemock>/scripts/gmock_doctor.py'
+```
+
+To use it, do:
+```
+<your-favorite-build-command> <your-test> 2>&1 | gmd
+```
+
+For example:
+```
+make my_test 2>&1 | gmd
+```
+
+Or you can run `gmd` and copy-n-paste gcc's error messages to it.
+
+## Can I mock a variadic function? ##
+
+You cannot mock a variadic function (i.e. a function taking ellipsis
+(`...`) arguments) directly in Google Mock.
+
+The problem is that in general, there is _no way_ for a mock object to
+know how many arguments are passed to the variadic method, and what
+the arguments' types are.  Only the _author of the base class_ knows
+the protocol, and we cannot look into his head.
+
+Therefore, to mock such a function, the _user_ must teach the mock
+object how to figure out the number of arguments and their types.  One
+way to do it is to provide overloaded versions of the function.
+
+Ellipsis arguments are inherited from C and not really a C++ feature.
+They are unsafe to use and don't work with arguments that have
+constructors or destructors.  Therefore we recommend to avoid them in
+C++ as much as possible.
+
+## MSVC gives me warning C4301 or C4373 when I define a mock method with a const parameter.  Why? ##
+
+If you compile this using Microsoft Visual C++ 2005 SP1:
+```
+class Foo {
+  ...
+  virtual void Bar(const int i) = 0;
+};
+
+class MockFoo : public Foo {
+  ...
+  MOCK_METHOD1(Bar, void(const int i));
+};
+```
+You may get the following warning:
+```
+warning C4301: 'MockFoo::Bar': overriding virtual function only differs from 'Foo::Bar' by const/volatile qualifier
+```
+
+This is a MSVC bug.  The same code compiles fine with gcc ,for
+example.  If you use Visual C++ 2008 SP1, you would get the warning:
+```
+warning C4373: 'MockFoo::Bar': virtual function overrides 'Foo::Bar', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers
+```
+
+In C++, if you _declare_ a function with a `const` parameter, the
+`const` modifier is _ignored_.  Therefore, the `Foo` base class above
+is equivalent to:
+```
+class Foo {
+  ...
+  virtual void Bar(int i) = 0;  // int or const int?  Makes no difference.
+};
+```
+
+In fact, you can _declare_ Bar() with an `int` parameter, and _define_
+it with a `const int` parameter.  The compiler will still match them
+up.
+
+Since making a parameter `const` is meaningless in the method
+_declaration_, we recommend to remove it in both `Foo` and `MockFoo`.
+That should workaround the VC bug.
+
+Note that we are talking about the _top-level_ `const` modifier here.
+If the function parameter is passed by pointer or reference, declaring
+the _pointee_ or _referee_ as `const` is still meaningful.  For
+example, the following two declarations are _not_ equivalent:
+```
+void Bar(int* p);        // Neither p nor *p is const.
+void Bar(const int* p);  // p is not const, but *p is.
+```
+
+## I have a huge mock class, and Microsoft Visual C++ runs out of memory when compiling it.  What can I do? ##
+
+We've noticed that when the `/clr` compiler flag is used, Visual C++
+uses 5~6 times as much memory when compiling a mock class.  We suggest
+to avoid `/clr` when compiling native C++ mocks.
+
+## I can't figure out why Google Mock thinks my expectations are not satisfied.  What should I do? ##
+
+You might want to run your test with
+`--gmock_verbose=info`.  This flag lets Google Mock print a trace
+of every mock function call it receives.  By studying the trace,
+you'll gain insights on why the expectations you set are not met.
+
+## How can I assert that a function is NEVER called? ##
+
+```
+EXPECT_CALL(foo, Bar(_))
+    .Times(0);
+```
+
+## I have a failed test where Google Mock tells me TWICE that a particular expectation is not satisfied.  Isn't this redundant? ##
+
+When Google Mock detects a failure, it prints relevant information
+(the mock function arguments, the state of relevant expectations, and
+etc) to help the user debug.  If another failure is detected, Google
+Mock will do the same, including printing the state of relevant
+expectations.
+
+Sometimes an expectation's state didn't change between two failures,
+and you'll see the same description of the state twice.  They are
+however _not_ redundant, as they refer to _different points in time_.
+The fact they are the same _is_ interesting information.
+
+## I get a heap check failure when using a mock object, but using a real object is fine.  What can be wrong? ##
+
+Does the class (hopefully a pure interface) you are mocking have a
+virtual destructor?
+
+Whenever you derive from a base class, make sure its destructor is
+virtual.  Otherwise Bad Things will happen.  Consider the following
+code:
+
+```
+class Base {
+ public:
+  // Not virtual, but should be.
+  ~Base() { ... }
+  ...
+};
+
+class Derived : public Base {
+ public:
+  ...
+ private:
+  std::string value_;
+};
+
+...
+  Base* p = new Derived;
+  ...
+  delete p;  // Surprise! ~Base() will be called, but ~Derived() will not
+             // - value_ is leaked.
+```
+
+By changing `~Base()` to virtual, `~Derived()` will be correctly
+called when `delete p` is executed, and the heap checker
+will be happy.
+
+## The "newer expectations override older ones" rule makes writing expectations awkward.  Why does Google Mock do that? ##
+
+When people complain about this, often they are referring to code like:
+
+```
+// foo.Bar() should be called twice, return 1 the first time, and return
+// 2 the second time.  However, I have to write the expectations in the
+// reverse order.  This sucks big time!!!
+EXPECT_CALL(foo, Bar())
+    .WillOnce(Return(2))
+    .RetiresOnSaturation();
+EXPECT_CALL(foo, Bar())
+    .WillOnce(Return(1))
+    .RetiresOnSaturation();
+```
+
+The problem is that they didn't pick the **best** way to express the test's
+intent.
+
+By default, expectations don't have to be matched in _any_ particular
+order.  If you want them to match in a certain order, you need to be
+explicit.  This is Google Mock's (and jMock's) fundamental philosophy: it's
+easy to accidentally over-specify your tests, and we want to make it
+harder to do so.
+
+There are two better ways to write the test spec.  You could either
+put the expectations in sequence:
+
+```
+// foo.Bar() should be called twice, return 1 the first time, and return
+// 2 the second time.  Using a sequence, we can write the expectations
+// in their natural order.
+{
+  InSequence s;
+  EXPECT_CALL(foo, Bar())
+      .WillOnce(Return(1))
+      .RetiresOnSaturation();
+  EXPECT_CALL(foo, Bar())
+      .WillOnce(Return(2))
+      .RetiresOnSaturation();
+}
+```
+
+or you can put the sequence of actions in the same expectation:
+
+```
+// foo.Bar() should be called twice, return 1 the first time, and return
+// 2 the second time.
+EXPECT_CALL(foo, Bar())
+    .WillOnce(Return(1))
+    .WillOnce(Return(2))
+    .RetiresOnSaturation();
+```
+
+Back to the original questions: why does Google Mock search the
+expectations (and `ON_CALL`s) from back to front?  Because this
+allows a user to set up a mock's behavior for the common case early
+(e.g. in the mock's constructor or the test fixture's set-up phase)
+and customize it with more specific rules later.  If Google Mock
+searches from front to back, this very useful pattern won't be
+possible.
+
+## Google Mock prints a warning when a function without EXPECT\_CALL is called, even if I have set its behavior using ON\_CALL.  Would it be reasonable not to show the warning in this case? ##
+
+When choosing between being neat and being safe, we lean toward the
+latter.  So the answer is that we think it's better to show the
+warning.
+
+Often people write `ON_CALL`s in the mock object's
+constructor or `SetUp()`, as the default behavior rarely changes from
+test to test.  Then in the test body they set the expectations, which
+are often different for each test.  Having an `ON_CALL` in the set-up
+part of a test doesn't mean that the calls are expected.  If there's
+no `EXPECT_CALL` and the method is called, it's possibly an error.  If
+we quietly let the call go through without notifying the user, bugs
+may creep in unnoticed.
+
+If, however, you are sure that the calls are OK, you can write
+
+```
+EXPECT_CALL(foo, Bar(_))
+    .WillRepeatedly(...);
+```
+
+instead of
+
+```
+ON_CALL(foo, Bar(_))
+    .WillByDefault(...);
+```
+
+This tells Google Mock that you do expect the calls and no warning should be
+printed.
+
+Also, you can control the verbosity using the `--gmock_verbose` flag.
+If you find the output too noisy when debugging, just choose a less
+verbose level.
+
+## How can I delete the mock function's argument in an action? ##
+
+If you find yourself needing to perform some action that's not
+supported by Google Mock directly, remember that you can define your own
+actions using
+[MakeAction()](V1_5_CookBook#Writing_New_Actions.md) or
+[MakePolymorphicAction()](V1_5_CookBook#Writing_New_Polymorphic_Actions.md),
+or you can write a stub function and invoke it using
+[Invoke()](V1_5_CookBook#Using_Functions_Methods_Functors.md).
+
+## MOCK\_METHODn()'s second argument looks funny.  Why don't you use the MOCK\_METHODn(Method, return\_type, arg\_1, ..., arg\_n) syntax? ##
+
+What?!  I think it's beautiful. :-)
+
+While which syntax looks more natural is a subjective matter to some
+extent, Google Mock's syntax was chosen for several practical advantages it
+has.
+
+Try to mock a function that takes a map as an argument:
+```
+virtual int GetSize(const map<int, std::string>& m);
+```
+
+Using the proposed syntax, it would be:
+```
+MOCK_METHOD1(GetSize, int, const map<int, std::string>& m);
+```
+
+Guess what?  You'll get a compiler error as the compiler thinks that
+`const map<int, std::string>& m` are **two**, not one, arguments. To work
+around this you can use `typedef` to give the map type a name, but
+that gets in the way of your work.  Google Mock's syntax avoids this
+problem as the function's argument types are protected inside a pair
+of parentheses:
+```
+// This compiles fine.
+MOCK_METHOD1(GetSize, int(const map<int, std::string>& m));
+```
+
+You still need a `typedef` if the return type contains an unprotected
+comma, but that's much rarer.
+
+Other advantages include:
+  1. `MOCK_METHOD1(Foo, int, bool)` can leave a reader wonder whether the method returns `int` or `bool`, while there won't be such confusion using Google Mock's syntax.
+  1. The way Google Mock describes a function type is nothing new, although many people may not be familiar with it.  The same syntax was used in C, and the `function` library in `tr1` uses this syntax extensively.  Since `tr1` will become a part of the new version of STL, we feel very comfortable to be consistent with it.
+  1. The function type syntax is also used in other parts of Google Mock's API (e.g. the action interface) in order to make the implementation tractable. A user needs to learn it anyway in order to utilize Google Mock's more advanced features.  We'd as well stick to the same syntax in `MOCK_METHOD*`!
+
+## My code calls a static/global function.  Can I mock it? ##
+
+You can, but you need to make some changes.
+
+In general, if you find yourself needing to mock a static function,
+it's a sign that your modules are too tightly coupled (and less
+flexible, less reusable, less testable, etc).  You are probably better
+off defining a small interface and call the function through that
+interface, which then can be easily mocked.  It's a bit of work
+initially, but usually pays for itself quickly.
+
+This Google Testing Blog
+[post](http://googletesting.blogspot.com/2008/06/defeat-static-cling.html)
+says it excellently.  Check it out.
+
+## My mock object needs to do complex stuff.  It's a lot of pain to specify the actions.  Google Mock sucks! ##
+
+I know it's not a question, but you get an answer for free any way. :-)
+
+With Google Mock, you can create mocks in C++ easily.  And people might be
+tempted to use them everywhere. Sometimes they work great, and
+sometimes you may find them, well, a pain to use. So, what's wrong in
+the latter case?
+
+When you write a test without using mocks, you exercise the code and
+assert that it returns the correct value or that the system is in an
+expected state.  This is sometimes called "state-based testing".
+
+Mocks are great for what some call "interaction-based" testing:
+instead of checking the system state at the very end, mock objects
+verify that they are invoked the right way and report an error as soon
+as it arises, giving you a handle on the precise context in which the
+error was triggered.  This is often more effective and economical to
+do than state-based testing.
+
+If you are doing state-based testing and using a test double just to
+simulate the real object, you are probably better off using a fake.
+Using a mock in this case causes pain, as it's not a strong point for
+mocks to perform complex actions.  If you experience this and think
+that mocks suck, you are just not using the right tool for your
+problem. Or, you might be trying to solve the wrong problem. :-)
+
+## I got a warning "Uninteresting function call encountered - default action taken.."  Should I panic? ##
+
+By all means, NO!  It's just an FYI.
+
+What it means is that you have a mock function, you haven't set any
+expectations on it (by Google Mock's rule this means that you are not
+interested in calls to this function and therefore it can be called
+any number of times), and it is called.  That's OK - you didn't say
+it's not OK to call the function!
+
+What if you actually meant to disallow this function to be called, but
+forgot to write `EXPECT_CALL(foo, Bar()).Times(0)`?  While
+one can argue that it's the user's fault, Google Mock tries to be nice and
+prints you a note.
+
+So, when you see the message and believe that there shouldn't be any
+uninteresting calls, you should investigate what's going on.  To make
+your life easier, Google Mock prints the function name and arguments
+when an uninteresting call is encountered.
+
+## I want to define a custom action.  Should I use Invoke() or implement the action interface? ##
+
+Either way is fine - you want to choose the one that's more convenient
+for your circumstance.
+
+Usually, if your action is for a particular function type, defining it
+using `Invoke()` should be easier; if your action can be used in
+functions of different types (e.g. if you are defining
+`Return(value)`), `MakePolymorphicAction()` is
+easiest.  Sometimes you want precise control on what types of
+functions the action can be used in, and implementing
+`ActionInterface` is the way to go here. See the implementation of
+`Return()` in `include/gmock/gmock-actions.h` for an example.
+
+## I'm using the set-argument-pointee action, and the compiler complains about "conflicting return type specified".  What does it mean? ##
+
+You got this error as Google Mock has no idea what value it should return
+when the mock method is called.  `SetArgumentPointee()` says what the
+side effect is, but doesn't say what the return value should be.  You
+need `DoAll()` to chain a `SetArgumentPointee()` with a `Return()`.
+
+See this [recipe](V1_5_CookBook#Mocking_Side_Effects.md) for more details and an example.
+
+
+## My question is not in your FAQ! ##
+
+If you cannot find the answer to your question in this FAQ, there are
+some other resources you can use:
+
+  1. read other [wiki pages](http://code.google.com/p/googlemock/w/list),
+  1. search the mailing list [archive](http://groups.google.com/group/googlemock/topics),
+  1. ask it on [googlemock@googlegroups.com](mailto:googlemock@googlegroups.com) and someone will answer it (to prevent spam, we require you to join the [discussion group](http://groups.google.com/group/googlemock) before you can post.).
+
+Please note that creating an issue in the
+[issue tracker](http://code.google.com/p/googlemock/issues/list) is _not_
+a good way to get your answer, as it is monitored infrequently by a
+very small number of people.
+
+When asking a question, it's helpful to provide as much of the
+following information as possible (people cannot help you if there's
+not enough information in your question):
+
+  * the version (or the revision number if you check out from SVN directly) of Google Mock you use (Google Mock is under active development, so it's possible that your problem has been solved in a later version),
+  * your operating system,
+  * the name and version of your compiler,
+  * the complete command line flags you give to your compiler,
+  * the complete compiler error messages (if the question is about compilation),
+  * the _actual_ code (ideally, a minimal but complete program) that has the problem you encounter.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/CheatSheet.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/CheatSheet.md
new file mode 100644
index 0000000000..91de1d210e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/CheatSheet.md
@@ -0,0 +1,534 @@
+
+
+# Defining a Mock Class #
+
+## Mocking a Normal Class ##
+
+Given
+```
+class Foo {
+  ...
+  virtual ~Foo();
+  virtual int GetSize() const = 0;
+  virtual string Describe(const char* name) = 0;
+  virtual string Describe(int type) = 0;
+  virtual bool Process(Bar elem, int count) = 0;
+};
+```
+(note that `~Foo()` **must** be virtual) we can define its mock as
+```
+#include "gmock/gmock.h"
+
+class MockFoo : public Foo {
+  MOCK_CONST_METHOD0(GetSize, int());
+  MOCK_METHOD1(Describe, string(const char* name));
+  MOCK_METHOD1(Describe, string(int type));
+  MOCK_METHOD2(Process, bool(Bar elem, int count));
+};
+```
+
+To create a "nice" mock object which ignores all uninteresting calls,
+or a "strict" mock object, which treats them as failures:
+```
+NiceMock<MockFoo> nice_foo;     // The type is a subclass of MockFoo.
+StrictMock<MockFoo> strict_foo; // The type is a subclass of MockFoo.
+```
+
+## Mocking a Class Template ##
+
+To mock
+```
+template <typename Elem>
+class StackInterface {
+ public:
+  ...
+  virtual ~StackInterface();
+  virtual int GetSize() const = 0;
+  virtual void Push(const Elem& x) = 0;
+};
+```
+(note that `~StackInterface()` **must** be virtual) just append `_T` to the `MOCK_*` macros:
+```
+template <typename Elem>
+class MockStack : public StackInterface<Elem> {
+ public:
+  ...
+  MOCK_CONST_METHOD0_T(GetSize, int());
+  MOCK_METHOD1_T(Push, void(const Elem& x));
+};
+```
+
+## Specifying Calling Conventions for Mock Functions ##
+
+If your mock function doesn't use the default calling convention, you
+can specify it by appending `_WITH_CALLTYPE` to any of the macros
+described in the previous two sections and supplying the calling
+convention as the first argument to the macro. For example,
+```
+  MOCK_METHOD_1_WITH_CALLTYPE(STDMETHODCALLTYPE, Foo, bool(int n));
+  MOCK_CONST_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, Bar, int(double x, double y));
+```
+where `STDMETHODCALLTYPE` is defined by `<objbase.h>` on Windows.
+
+# Using Mocks in Tests #
+
+The typical flow is:
+  1. Import the Google Mock names you need to use. All Google Mock names are in the `testing` namespace unless they are macros or otherwise noted.
+  1. Create the mock objects.
+  1. Optionally, set the default actions of the mock objects.
+  1. Set your expectations on the mock objects (How will they be called? What wil they do?).
+  1. Exercise code that uses the mock objects; if necessary, check the result using [Google Test](http://code.google.com/p/googletest/) assertions.
+  1. When a mock objects is destructed, Google Mock automatically verifies that all expectations on it have been satisfied.
+
+Here is an example:
+```
+using ::testing::Return;                            // #1
+
+TEST(BarTest, DoesThis) {
+  MockFoo foo;                                    // #2
+
+  ON_CALL(foo, GetSize())                         // #3
+      .WillByDefault(Return(1));
+  // ... other default actions ...
+
+  EXPECT_CALL(foo, Describe(5))                   // #4
+      .Times(3)
+      .WillRepeatedly(Return("Category 5"));
+  // ... other expectations ...
+
+  EXPECT_EQ("good", MyProductionFunction(&foo));  // #5
+}                                                 // #6
+```
+
+# Setting Default Actions #
+
+Google Mock has a **built-in default action** for any function that
+returns `void`, `bool`, a numeric value, or a pointer.
+
+To customize the default action for functions with return type `T` globally:
+```
+using ::testing::DefaultValue;
+
+DefaultValue<T>::Set(value);  // Sets the default value to be returned.
+// ... use the mocks ...
+DefaultValue<T>::Clear();     // Resets the default value.
+```
+
+To customize the default action for a particular method, use `ON_CALL()`:
+```
+ON_CALL(mock_object, method(matchers))
+    .With(multi_argument_matcher)  ?
+    .WillByDefault(action);
+```
+
+# Setting Expectations #
+
+`EXPECT_CALL()` sets **expectations** on a mock method (How will it be
+called? What will it do?):
+```
+EXPECT_CALL(mock_object, method(matchers))
+    .With(multi_argument_matcher)  ?
+    .Times(cardinality)            ?
+    .InSequence(sequences)         *
+    .After(expectations)           *
+    .WillOnce(action)              *
+    .WillRepeatedly(action)        ?
+    .RetiresOnSaturation();        ?
+```
+
+If `Times()` is omitted, the cardinality is assumed to be:
+
+  * `Times(1)` when there is neither `WillOnce()` nor `WillRepeatedly()`;
+  * `Times(n)` when there are `n WillOnce()`s but no `WillRepeatedly()`, where `n` >= 1; or
+  * `Times(AtLeast(n))` when there are `n WillOnce()`s and a `WillRepeatedly()`, where `n` >= 0.
+
+A method with no `EXPECT_CALL()` is free to be invoked _any number of times_, and the default action will be taken each time.
+
+# Matchers #
+
+A **matcher** matches a _single_ argument.  You can use it inside
+`ON_CALL()` or `EXPECT_CALL()`, or use it to validate a value
+directly:
+
+| `EXPECT_THAT(value, matcher)` | Asserts that `value` matches `matcher`. |
+|:------------------------------|:----------------------------------------|
+| `ASSERT_THAT(value, matcher)` | The same as `EXPECT_THAT(value, matcher)`, except that it generates a **fatal** failure. |
+
+Built-in matchers (where `argument` is the function argument) are
+divided into several categories:
+
+## Wildcard ##
+|`_`|`argument` can be any value of the correct type.|
+|:--|:-----------------------------------------------|
+|`A<type>()` or `An<type>()`|`argument` can be any value of type `type`.     |
+
+## Generic Comparison ##
+
+|`Eq(value)` or `value`|`argument == value`|
+|:---------------------|:------------------|
+|`Ge(value)`           |`argument >= value`|
+|`Gt(value)`           |`argument > value` |
+|`Le(value)`           |`argument <= value`|
+|`Lt(value)`           |`argument < value` |
+|`Ne(value)`           |`argument != value`|
+|`IsNull()`            |`argument` is a `NULL` pointer (raw or smart).|
+|`NotNull()`           |`argument` is a non-null pointer (raw or smart).|
+|`Ref(variable)`       |`argument` is a reference to `variable`.|
+|`TypedEq<type>(value)`|`argument` has type `type` and is equal to `value`. You may need to use this instead of `Eq(value)` when the mock function is overloaded.|
+
+Except `Ref()`, these matchers make a _copy_ of `value` in case it's
+modified or destructed later. If the compiler complains that `value`
+doesn't have a public copy constructor, try wrap it in `ByRef()`,
+e.g. `Eq(ByRef(non_copyable_value))`. If you do that, make sure
+`non_copyable_value` is not changed afterwards, or the meaning of your
+matcher will be changed.
+
+## Floating-Point Matchers ##
+
+|`DoubleEq(a_double)`|`argument` is a `double` value approximately equal to `a_double`, treating two NaNs as unequal.|
+|:-------------------|:----------------------------------------------------------------------------------------------|
+|`FloatEq(a_float)`  |`argument` is a `float` value approximately equal to `a_float`, treating two NaNs as unequal.  |
+|`NanSensitiveDoubleEq(a_double)`|`argument` is a `double` value approximately equal to `a_double`, treating two NaNs as equal.  |
+|`NanSensitiveFloatEq(a_float)`|`argument` is a `float` value approximately equal to `a_float`, treating two NaNs as equal.    |
+
+These matchers use ULP-based comparison (the same as used in
+[Google Test](http://code.google.com/p/googletest/)). They
+automatically pick a reasonable error bound based on the absolute
+value of the expected value.  `DoubleEq()` and `FloatEq()` conform to
+the IEEE standard, which requires comparing two NaNs for equality to
+return false. The `NanSensitive*` version instead treats two NaNs as
+equal, which is often what a user wants.
+
+## String Matchers ##
+
+The `argument` can be either a C string or a C++ string object:
+
+|`ContainsRegex(string)`|`argument` matches the given regular expression.|
+|:----------------------|:-----------------------------------------------|
+|`EndsWith(suffix)`     |`argument` ends with string `suffix`.           |
+|`HasSubstr(string)`    |`argument` contains `string` as a sub-string.   |
+|`MatchesRegex(string)` |`argument` matches the given regular expression with the match starting at the first character and ending at the last character.|
+|`StartsWith(prefix)`   |`argument` starts with string `prefix`.         |
+|`StrCaseEq(string)`    |`argument` is equal to `string`, ignoring case. |
+|`StrCaseNe(string)`    |`argument` is not equal to `string`, ignoring case.|
+|`StrEq(string)`        |`argument` is equal to `string`.                |
+|`StrNe(string)`        |`argument` is not equal to `string`.            |
+
+`ContainsRegex()` and `MatchesRegex()` use the regular expression
+syntax defined
+[here](http://code.google.com/p/googletest/wiki/V1_6_AdvancedGuide#Regular_Expression_Syntax).
+`StrCaseEq()`, `StrCaseNe()`, `StrEq()`, and `StrNe()` work for wide
+strings as well.
+
+## Container Matchers ##
+
+Most STL-style containers support `==`, so you can use
+`Eq(expected_container)` or simply `expected_container` to match a
+container exactly.   If you want to write the elements in-line,
+match them more flexibly, or get more informative messages, you can use:
+
+| `Contains(e)` | `argument` contains an element that matches `e`, which can be either a value or a matcher. |
+|:--------------|:-------------------------------------------------------------------------------------------|
+| `Each(e)`     | `argument` is a container where _every_ element matches `e`, which can be either a value or a matcher. |
+| `ElementsAre(e0, e1, ..., en)` | `argument` has `n + 1` elements, where the i-th element matches `ei`, which can be a value or a matcher. 0 to 10 arguments are allowed. |
+| `ElementsAreArray(array)` or `ElementsAreArray(array, count)` | The same as `ElementsAre()` except that the expected element values/matchers come from a C-style array. |
+| `ContainerEq(container)` | The same as `Eq(container)` except that the failure message also includes which elements are in one container but not the other. |
+| `Pointwise(m, container)` | `argument` contains the same number of elements as in `container`, and for all i, (the i-th element in `argument`, the i-th element in `container`) match `m`, which is a matcher on 2-tuples. E.g. `Pointwise(Le(), upper_bounds)` verifies that each element in `argument` doesn't exceed the corresponding element in `upper_bounds`. |
+
+These matchers can also match:
+
+  1. a native array passed by reference (e.g. in `Foo(const int (&a)[5])`), and
+  1. an array passed as a pointer and a count (e.g. in `Bar(const T* buffer, int len)` -- see [Multi-argument Matchers](#Multiargument_Matchers.md)).
+
+where the array may be multi-dimensional (i.e. its elements can be arrays).
+
+## Member Matchers ##
+
+|`Field(&class::field, m)`|`argument.field` (or `argument->field` when `argument` is a plain pointer) matches matcher `m`, where `argument` is an object of type _class_.|
+|:------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------|
+|`Key(e)`                 |`argument.first` matches `e`, which can be either a value or a matcher. E.g. `Contains(Key(Le(5)))` can verify that a `map` contains a key `<= 5`.|
+|`Pair(m1, m2)`           |`argument` is an `std::pair` whose `first` field matches `m1` and `second` field matches `m2`.                                                |
+|`Property(&class::property, m)`|`argument.property()` (or `argument->property()` when `argument` is a plain pointer) matches matcher `m`, where `argument` is an object of type _class_.|
+
+## Matching the Result of a Function or Functor ##
+
+|`ResultOf(f, m)`|`f(argument)` matches matcher `m`, where `f` is a function or functor.|
+|:---------------|:---------------------------------------------------------------------|
+
+## Pointer Matchers ##
+
+|`Pointee(m)`|`argument` (either a smart pointer or a raw pointer) points to a value that matches matcher `m`.|
+|:-----------|:-----------------------------------------------------------------------------------------------|
+
+## Multiargument Matchers ##
+
+Technically, all matchers match a _single_ value. A "multi-argument"
+matcher is just one that matches a _tuple_. The following matchers can
+be used to match a tuple `(x, y)`:
+
+|`Eq()`|`x == y`|
+|:-----|:-------|
+|`Ge()`|`x >= y`|
+|`Gt()`|`x > y` |
+|`Le()`|`x <= y`|
+|`Lt()`|`x < y` |
+|`Ne()`|`x != y`|
+
+You can use the following selectors to pick a subset of the arguments
+(or reorder them) to participate in the matching:
+
+|`AllArgs(m)`|Equivalent to `m`. Useful as syntactic sugar in `.With(AllArgs(m))`.|
+|:-----------|:-------------------------------------------------------------------|
+|`Args<N1, N2, ..., Nk>(m)`|The tuple of the `k` selected (using 0-based indices) arguments matches `m`, e.g. `Args<1, 2>(Eq())`.|
+
+## Composite Matchers ##
+
+You can make a matcher from one or more other matchers:
+
+|`AllOf(m1, m2, ..., mn)`|`argument` matches all of the matchers `m1` to `mn`.|
+|:-----------------------|:---------------------------------------------------|
+|`AnyOf(m1, m2, ..., mn)`|`argument` matches at least one of the matchers `m1` to `mn`.|
+|`Not(m)`                |`argument` doesn't match matcher `m`.               |
+
+## Adapters for Matchers ##
+
+|`MatcherCast<T>(m)`|casts matcher `m` to type `Matcher<T>`.|
+|:------------------|:--------------------------------------|
+|`SafeMatcherCast<T>(m)`| [safely casts](http://code.google.com/p/googlemock/wiki/V1_6_CookBook#Casting_Matchers) matcher `m` to type `Matcher<T>`. |
+|`Truly(predicate)` |`predicate(argument)` returns something considered by C++ to be true, where `predicate` is a function or functor.|
+
+## Matchers as Predicates ##
+
+|`Matches(m)(value)`|evaluates to `true` if `value` matches `m`. You can use `Matches(m)` alone as a unary functor.|
+|:------------------|:---------------------------------------------------------------------------------------------|
+|`ExplainMatchResult(m, value, result_listener)`|evaluates to `true` if `value` matches `m`, explaining the result to `result_listener`.       |
+|`Value(value, m)`  |evaluates to `true` if `value` matches `m`.                                                   |
+
+## Defining Matchers ##
+
+| `MATCHER(IsEven, "") { return (arg % 2) == 0; }` | Defines a matcher `IsEven()` to match an even number. |
+|:-------------------------------------------------|:------------------------------------------------------|
+| `MATCHER_P(IsDivisibleBy, n, "") { *result_listener << "where the remainder is " << (arg % n); return (arg % n) == 0; }` | Defines a macher `IsDivisibleBy(n)` to match a number divisible by `n`. |
+| `MATCHER_P2(IsBetween, a, b, std::string(negation ? "isn't" : "is") + " between " + PrintToString(a) + " and " + PrintToString(b)) { return a <= arg && arg <= b; }` | Defines a matcher `IsBetween(a, b)` to match a value in the range [`a`, `b`]. |
+
+**Notes:**
+
+  1. The `MATCHER*` macros cannot be used inside a function or class.
+  1. The matcher body must be _purely functional_ (i.e. it cannot have any side effect, and the result must not depend on anything other than the value being matched and the matcher parameters).
+  1. You can use `PrintToString(x)` to convert a value `x` of any type to a string.
+
+## Matchers as Test Assertions ##
+
+|`ASSERT_THAT(expression, m)`|Generates a [fatal failure](http://code.google.com/p/googletest/wiki/V1_6_Primer#Assertions) if the value of `expression` doesn't match matcher `m`.|
+|:---------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------|
+|`EXPECT_THAT(expression, m)`|Generates a non-fatal failure if the value of `expression` doesn't match matcher `m`.                                                               |
+
+# Actions #
+
+**Actions** specify what a mock function should do when invoked.
+
+## Returning a Value ##
+
+|`Return()`|Return from a `void` mock function.|
+|:---------|:----------------------------------|
+|`Return(value)`|Return `value`. If the type of `value` is different to the mock function's return type, `value` is converted to the latter type <i>at the time the expectation is set</i>, not when the action is executed.|
+|`ReturnArg<N>()`|Return the `N`-th (0-based) argument.|
+|`ReturnNew<T>(a1, ..., ak)`|Return `new T(a1, ..., ak)`; a different object is created each time.|
+|`ReturnNull()`|Return a null pointer.             |
+|`ReturnPointee(ptr)`|Return the value pointed to by `ptr`.|
+|`ReturnRef(variable)`|Return a reference to `variable`.  |
+|`ReturnRefOfCopy(value)`|Return a reference to a copy of `value`; the copy lives as long as the action.|
+
+## Side Effects ##
+
+|`Assign(&variable, value)`|Assign `value` to variable.|
+|:-------------------------|:--------------------------|
+| `DeleteArg<N>()`         | Delete the `N`-th (0-based) argument, which must be a pointer. |
+| `SaveArg<N>(pointer)`    | Save the `N`-th (0-based) argument to `*pointer`. |
+| `SaveArgPointee<N>(pointer)` | Save the value pointed to by the `N`-th (0-based) argument to `*pointer`. |
+| `SetArgReferee<N>(value)` |	Assign value to the variable referenced by the `N`-th (0-based) argument. |
+|`SetArgPointee<N>(value)` |Assign `value` to the variable pointed by the `N`-th (0-based) argument.|
+|`SetArgumentPointee<N>(value)`|Same as `SetArgPointee<N>(value)`. Deprecated. Will be removed in v1.7.0.|
+|`SetArrayArgument<N>(first, last)`|Copies the elements in source range [`first`, `last`) to the array pointed to by the `N`-th (0-based) argument, which can be either a pointer or an iterator. The action does not take ownership of the elements in the source range.|
+|`SetErrnoAndReturn(error, value)`|Set `errno` to `error` and return `value`.|
+|`Throw(exception)`        |Throws the given exception, which can be any copyable value. Available since v1.1.0.|
+
+## Using a Function or a Functor as an Action ##
+
+|`Invoke(f)`|Invoke `f` with the arguments passed to the mock function, where `f` can be a global/static function or a functor.|
+|:----------|:-----------------------------------------------------------------------------------------------------------------|
+|`Invoke(object_pointer, &class::method)`|Invoke the {method on the object with the arguments passed to the mock function.                                  |
+|`InvokeWithoutArgs(f)`|Invoke `f`, which can be a global/static function or a functor. `f` must take no arguments.                       |
+|`InvokeWithoutArgs(object_pointer, &class::method)`|Invoke the method on the object, which takes no arguments.                                                        |
+|`InvokeArgument<N>(arg1, arg2, ..., argk)`|Invoke the mock function's `N`-th (0-based) argument, which must be a function or a functor, with the `k` arguments.|
+
+The return value of the invoked function is used as the return value
+of the action.
+
+When defining a function or functor to be used with `Invoke*()`, you can declare any unused parameters as `Unused`:
+```
+  double Distance(Unused, double x, double y) { return sqrt(x*x + y*y); }
+  ...
+  EXPECT_CALL(mock, Foo("Hi", _, _)).WillOnce(Invoke(Distance));
+```
+
+In `InvokeArgument<N>(...)`, if an argument needs to be passed by reference, wrap it inside `ByRef()`. For example,
+```
+  InvokeArgument<2>(5, string("Hi"), ByRef(foo))
+```
+calls the mock function's #2 argument, passing to it `5` and `string("Hi")` by value, and `foo` by reference.
+
+## Default Action ##
+
+|`DoDefault()`|Do the default action (specified by `ON_CALL()` or the built-in one).|
+|:------------|:--------------------------------------------------------------------|
+
+**Note:** due to technical reasons, `DoDefault()` cannot be used inside  a composite action - trying to do so will result in a run-time error.
+
+## Composite Actions ##
+
+|`DoAll(a1, a2, ..., an)`|Do all actions `a1` to `an` and return the result of `an` in each invocation. The first `n - 1` sub-actions must return void. |
+|:-----------------------|:-----------------------------------------------------------------------------------------------------------------------------|
+|`IgnoreResult(a)`       |Perform action `a` and ignore its result. `a` must not return void.                                                           |
+|`WithArg<N>(a)`         |Pass the `N`-th (0-based) argument of the mock function to action `a` and perform it.                                         |
+|`WithArgs<N1, N2, ..., Nk>(a)`|Pass the selected (0-based) arguments of the mock function to action `a` and perform it.                                      |
+|`WithoutArgs(a)`        |Perform action `a` without any arguments.                                                                                     |
+
+## Defining Actions ##
+
+| `ACTION(Sum) { return arg0 + arg1; }` | Defines an action `Sum()` to return the sum of the mock function's argument #0 and #1. |
+|:--------------------------------------|:---------------------------------------------------------------------------------------|
+| `ACTION_P(Plus, n) { return arg0 + n; }` | Defines an action `Plus(n)` to return the sum of the mock function's argument #0 and `n`. |
+| `ACTION_Pk(Foo, p1, ..., pk) { statements; }` | Defines a parameterized action `Foo(p1, ..., pk)` to execute the given `statements`.   |
+
+The `ACTION*` macros cannot be used inside a function or class.
+
+# Cardinalities #
+
+These are used in `Times()` to specify how many times a mock function will be called:
+
+|`AnyNumber()`|The function can be called any number of times.|
+|:------------|:----------------------------------------------|
+|`AtLeast(n)` |The call is expected at least `n` times.       |
+|`AtMost(n)`  |The call is expected at most `n` times.        |
+|`Between(m, n)`|The call is expected between `m` and `n` (inclusive) times.|
+|`Exactly(n) or n`|The call is expected exactly `n` times. In particular, the call should never happen when `n` is 0.|
+
+# Expectation Order #
+
+By default, the expectations can be matched in _any_ order.  If some
+or all expectations must be matched in a given order, there are two
+ways to specify it.  They can be used either independently or
+together.
+
+## The After Clause ##
+
+```
+using ::testing::Expectation;
+...
+Expectation init_x = EXPECT_CALL(foo, InitX());
+Expectation init_y = EXPECT_CALL(foo, InitY());
+EXPECT_CALL(foo, Bar())
+    .After(init_x, init_y);
+```
+says that `Bar()` can be called only after both `InitX()` and
+`InitY()` have been called.
+
+If you don't know how many pre-requisites an expectation has when you
+write it, you can use an `ExpectationSet` to collect them:
+
+```
+using ::testing::ExpectationSet;
+...
+ExpectationSet all_inits;
+for (int i = 0; i < element_count; i++) {
+  all_inits += EXPECT_CALL(foo, InitElement(i));
+}
+EXPECT_CALL(foo, Bar())
+    .After(all_inits);
+```
+says that `Bar()` can be called only after all elements have been
+initialized (but we don't care about which elements get initialized
+before the others).
+
+Modifying an `ExpectationSet` after using it in an `.After()` doesn't
+affect the meaning of the `.After()`.
+
+## Sequences ##
+
+When you have a long chain of sequential expectations, it's easier to
+specify the order using **sequences**, which don't require you to given
+each expectation in the chain a different name.  <i>All expected<br>
+calls</i> in the same sequence must occur in the order they are
+specified.
+
+```
+using ::testing::Sequence;
+Sequence s1, s2;
+...
+EXPECT_CALL(foo, Reset())
+    .InSequence(s1, s2)
+    .WillOnce(Return(true));
+EXPECT_CALL(foo, GetSize())
+    .InSequence(s1)
+    .WillOnce(Return(1));
+EXPECT_CALL(foo, Describe(A<const char*>()))
+    .InSequence(s2)
+    .WillOnce(Return("dummy"));
+```
+says that `Reset()` must be called before _both_ `GetSize()` _and_
+`Describe()`, and the latter two can occur in any order.
+
+To put many expectations in a sequence conveniently:
+```
+using ::testing::InSequence;
+{
+  InSequence dummy;
+
+  EXPECT_CALL(...)...;
+  EXPECT_CALL(...)...;
+  ...
+  EXPECT_CALL(...)...;
+}
+```
+says that all expected calls in the scope of `dummy` must occur in
+strict order. The name `dummy` is irrelevant.)
+
+# Verifying and Resetting a Mock #
+
+Google Mock will verify the expectations on a mock object when it is destructed, or you can do it earlier:
+```
+using ::testing::Mock;
+...
+// Verifies and removes the expectations on mock_obj;
+// returns true iff successful.
+Mock::VerifyAndClearExpectations(&mock_obj);
+...
+// Verifies and removes the expectations on mock_obj;
+// also removes the default actions set by ON_CALL();
+// returns true iff successful.
+Mock::VerifyAndClear(&mock_obj);
+```
+
+You can also tell Google Mock that a mock object can be leaked and doesn't
+need to be verified:
+```
+Mock::AllowLeak(&mock_obj);
+```
+
+# Mock Classes #
+
+Google Mock defines a convenient mock class template
+```
+class MockFunction<R(A1, ..., An)> {
+ public:
+  MOCK_METHODn(Call, R(A1, ..., An));
+};
+```
+See this [recipe](http://code.google.com/p/googlemock/wiki/V1_6_CookBook#Using_Check_Points) for one application of it.
+
+# Flags #
+
+| `--gmock_catch_leaked_mocks=0` | Don't report leaked mock objects as failures. |
+|:-------------------------------|:----------------------------------------------|
+| `--gmock_verbose=LEVEL`        | Sets the default verbosity level (`info`, `warning`, or `error`) of Google Mock messages. |
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/CookBook.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/CookBook.md
new file mode 100644
index 0000000000..f5975a0035
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/CookBook.md
@@ -0,0 +1,3342 @@
+
+
+You can find recipes for using Google Mock here. If you haven't yet,
+please read the [ForDummies](V1_6_ForDummies.md) document first to make sure you understand
+the basics.
+
+**Note:** Google Mock lives in the `testing` name space. For
+readability, it is recommended to write `using ::testing::Foo;` once in
+your file before using the name `Foo` defined by Google Mock. We omit
+such `using` statements in this page for brevity, but you should do it
+in your own code.
+
+# Creating Mock Classes #
+
+## Mocking Private or Protected Methods ##
+
+You must always put a mock method definition (`MOCK_METHOD*`) in a
+`public:` section of the mock class, regardless of the method being
+mocked being `public`, `protected`, or `private` in the base class.
+This allows `ON_CALL` and `EXPECT_CALL` to reference the mock function
+from outside of the mock class.  (Yes, C++ allows a subclass to change
+the access level of a virtual function in the base class.)  Example:
+
+```
+class Foo {
+ public:
+  ...
+  virtual bool Transform(Gadget* g) = 0;
+
+ protected:
+  virtual void Resume();
+
+ private:
+  virtual int GetTimeOut();
+};
+
+class MockFoo : public Foo {
+ public:
+  ...
+  MOCK_METHOD1(Transform, bool(Gadget* g));
+
+  // The following must be in the public section, even though the
+  // methods are protected or private in the base class.
+  MOCK_METHOD0(Resume, void());
+  MOCK_METHOD0(GetTimeOut, int());
+};
+```
+
+## Mocking Overloaded Methods ##
+
+You can mock overloaded functions as usual. No special attention is required:
+
+```
+class Foo {
+  ...
+
+  // Must be virtual as we'll inherit from Foo.
+  virtual ~Foo();
+
+  // Overloaded on the types and/or numbers of arguments.
+  virtual int Add(Element x);
+  virtual int Add(int times, Element x);
+
+  // Overloaded on the const-ness of this object.
+  virtual Bar& GetBar();
+  virtual const Bar& GetBar() const;
+};
+
+class MockFoo : public Foo {
+  ...
+  MOCK_METHOD1(Add, int(Element x));
+  MOCK_METHOD2(Add, int(int times, Element x);
+
+  MOCK_METHOD0(GetBar, Bar&());
+  MOCK_CONST_METHOD0(GetBar, const Bar&());
+};
+```
+
+**Note:** if you don't mock all versions of the overloaded method, the
+compiler will give you a warning about some methods in the base class
+being hidden. To fix that, use `using` to bring them in scope:
+
+```
+class MockFoo : public Foo {
+  ...
+  using Foo::Add;
+  MOCK_METHOD1(Add, int(Element x));
+  // We don't want to mock int Add(int times, Element x);
+  ...
+};
+```
+
+## Mocking Class Templates ##
+
+To mock a class template, append `_T` to the `MOCK_*` macros:
+
+```
+template <typename Elem>
+class StackInterface {
+  ...
+  // Must be virtual as we'll inherit from StackInterface.
+  virtual ~StackInterface();
+
+  virtual int GetSize() const = 0;
+  virtual void Push(const Elem& x) = 0;
+};
+
+template <typename Elem>
+class MockStack : public StackInterface<Elem> {
+  ...
+  MOCK_CONST_METHOD0_T(GetSize, int());
+  MOCK_METHOD1_T(Push, void(const Elem& x));
+};
+```
+
+## Mocking Nonvirtual Methods ##
+
+Google Mock can mock non-virtual functions to be used in what we call _hi-perf
+dependency injection_.
+
+In this case, instead of sharing a common base class with the real
+class, your mock class will be _unrelated_ to the real class, but
+contain methods with the same signatures.  The syntax for mocking
+non-virtual methods is the _same_ as mocking virtual methods:
+
+```
+// A simple packet stream class.  None of its members is virtual.
+class ConcretePacketStream {
+ public:
+  void AppendPacket(Packet* new_packet);
+  const Packet* GetPacket(size_t packet_number) const;
+  size_t NumberOfPackets() const;
+  ...
+};
+
+// A mock packet stream class.  It inherits from no other, but defines
+// GetPacket() and NumberOfPackets().
+class MockPacketStream {
+ public:
+  MOCK_CONST_METHOD1(GetPacket, const Packet*(size_t packet_number));
+  MOCK_CONST_METHOD0(NumberOfPackets, size_t());
+  ...
+};
+```
+
+Note that the mock class doesn't define `AppendPacket()`, unlike the
+real class. That's fine as long as the test doesn't need to call it.
+
+Next, you need a way to say that you want to use
+`ConcretePacketStream` in production code, and use `MockPacketStream`
+in tests.  Since the functions are not virtual and the two classes are
+unrelated, you must specify your choice at _compile time_ (as opposed
+to run time).
+
+One way to do it is to templatize your code that needs to use a packet
+stream.  More specifically, you will give your code a template type
+argument for the type of the packet stream.  In production, you will
+instantiate your template with `ConcretePacketStream` as the type
+argument.  In tests, you will instantiate the same template with
+`MockPacketStream`.  For example, you may write:
+
+```
+template <class PacketStream>
+void CreateConnection(PacketStream* stream) { ... }
+
+template <class PacketStream>
+class PacketReader {
+ public:
+  void ReadPackets(PacketStream* stream, size_t packet_num);
+};
+```
+
+Then you can use `CreateConnection<ConcretePacketStream>()` and
+`PacketReader<ConcretePacketStream>` in production code, and use
+`CreateConnection<MockPacketStream>()` and
+`PacketReader<MockPacketStream>` in tests.
+
+```
+  MockPacketStream mock_stream;
+  EXPECT_CALL(mock_stream, ...)...;
+  .. set more expectations on mock_stream ...
+  PacketReader<MockPacketStream> reader(&mock_stream);
+  ... exercise reader ...
+```
+
+## Mocking Free Functions ##
+
+It's possible to use Google Mock to mock a free function (i.e. a
+C-style function or a static method).  You just need to rewrite your
+code to use an interface (abstract class).
+
+Instead of calling a free function (say, `OpenFile`) directly,
+introduce an interface for it and have a concrete subclass that calls
+the free function:
+
+```
+class FileInterface {
+ public:
+  ...
+  virtual bool Open(const char* path, const char* mode) = 0;
+};
+
+class File : public FileInterface {
+ public:
+  ...
+  virtual bool Open(const char* path, const char* mode) {
+    return OpenFile(path, mode);
+  }
+};
+```
+
+Your code should talk to `FileInterface` to open a file.  Now it's
+easy to mock out the function.
+
+This may seem much hassle, but in practice you often have multiple
+related functions that you can put in the same interface, so the
+per-function syntactic overhead will be much lower.
+
+If you are concerned about the performance overhead incurred by
+virtual functions, and profiling confirms your concern, you can
+combine this with the recipe for [mocking non-virtual methods](#Mocking_Nonvirtual_Methods.md).
+
+## Nice Mocks and Strict Mocks ##
+
+If a mock method has no `EXPECT_CALL` spec but is called, Google Mock
+will print a warning about the "uninteresting call". The rationale is:
+
+  * New methods may be added to an interface after a test is written. We shouldn't fail a test just because a method it doesn't know about is called.
+  * However, this may also mean there's a bug in the test, so Google Mock shouldn't be silent either. If the user believes these calls are harmless, he can add an `EXPECT_CALL()` to suppress the warning.
+
+However, sometimes you may want to suppress all "uninteresting call"
+warnings, while sometimes you may want the opposite, i.e. to treat all
+of them as errors. Google Mock lets you make the decision on a
+per-mock-object basis.
+
+Suppose your test uses a mock class `MockFoo`:
+
+```
+TEST(...) {
+  MockFoo mock_foo;
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+}
+```
+
+If a method of `mock_foo` other than `DoThis()` is called, it will be
+reported by Google Mock as a warning. However, if you rewrite your
+test to use `NiceMock<MockFoo>` instead, the warning will be gone,
+resulting in a cleaner test output:
+
+```
+using ::testing::NiceMock;
+
+TEST(...) {
+  NiceMock<MockFoo> mock_foo;
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+}
+```
+
+`NiceMock<MockFoo>` is a subclass of `MockFoo`, so it can be used
+wherever `MockFoo` is accepted.
+
+It also works if `MockFoo`'s constructor takes some arguments, as
+`NiceMock<MockFoo>` "inherits" `MockFoo`'s constructors:
+
+```
+using ::testing::NiceMock;
+
+TEST(...) {
+  NiceMock<MockFoo> mock_foo(5, "hi");  // Calls MockFoo(5, "hi").
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+}
+```
+
+The usage of `StrictMock` is similar, except that it makes all
+uninteresting calls failures:
+
+```
+using ::testing::StrictMock;
+
+TEST(...) {
+  StrictMock<MockFoo> mock_foo;
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+
+  // The test will fail if a method of mock_foo other than DoThis()
+  // is called.
+}
+```
+
+There are some caveats though (I don't like them just as much as the
+next guy, but sadly they are side effects of C++'s limitations):
+
+  1. `NiceMock<MockFoo>` and `StrictMock<MockFoo>` only work for mock methods defined using the `MOCK_METHOD*` family of macros **directly** in the `MockFoo` class. If a mock method is defined in a **base class** of `MockFoo`, the "nice" or "strict" modifier may not affect it, depending on the compiler. In particular, nesting `NiceMock` and `StrictMock` (e.g. `NiceMock<StrictMock<MockFoo> >`) is **not** supported.
+  1. The constructors of the base mock (`MockFoo`) cannot have arguments passed by non-const reference, which happens to be banned by the [Google C++ style guide](http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml).
+  1. During the constructor or destructor of `MockFoo`, the mock object is _not_ nice or strict.  This may cause surprises if the constructor or destructor calls a mock method on `this` object. (This behavior, however, is consistent with C++'s general rule: if a constructor or destructor calls a virtual method of `this` object, that method is treated as non-virtual.  In other words, to the base class's constructor or destructor, `this` object behaves like an instance of the base class, not the derived class.  This rule is required for safety.  Otherwise a base constructor may use members of a derived class before they are initialized, or a base destructor may use members of a derived class after they have been destroyed.)
+
+Finally, you should be **very cautious** when using this feature, as the
+decision you make applies to **all** future changes to the mock
+class. If an important change is made in the interface you are mocking
+(and thus in the mock class), it could break your tests (if you use
+`StrictMock`) or let bugs pass through without a warning (if you use
+`NiceMock`). Therefore, try to specify the mock's behavior using
+explicit `EXPECT_CALL` first, and only turn to `NiceMock` or
+`StrictMock` as the last resort.
+
+## Simplifying the Interface without Breaking Existing Code ##
+
+Sometimes a method has a long list of arguments that is mostly
+uninteresting. For example,
+
+```
+class LogSink {
+ public:
+  ...
+  virtual void send(LogSeverity severity, const char* full_filename,
+                    const char* base_filename, int line,
+                    const struct tm* tm_time,
+                    const char* message, size_t message_len) = 0;
+};
+```
+
+This method's argument list is lengthy and hard to work with (let's
+say that the `message` argument is not even 0-terminated). If we mock
+it as is, using the mock will be awkward. If, however, we try to
+simplify this interface, we'll need to fix all clients depending on
+it, which is often infeasible.
+
+The trick is to re-dispatch the method in the mock class:
+
+```
+class ScopedMockLog : public LogSink {
+ public:
+  ...
+  virtual void send(LogSeverity severity, const char* full_filename,
+                    const char* base_filename, int line, const tm* tm_time,
+                    const char* message, size_t message_len) {
+    // We are only interested in the log severity, full file name, and
+    // log message.
+    Log(severity, full_filename, std::string(message, message_len));
+  }
+
+  // Implements the mock method:
+  //
+  //   void Log(LogSeverity severity,
+  //            const string& file_path,
+  //            const string& message);
+  MOCK_METHOD3(Log, void(LogSeverity severity, const string& file_path,
+                         const string& message));
+};
+```
+
+By defining a new mock method with a trimmed argument list, we make
+the mock class much more user-friendly.
+
+## Alternative to Mocking Concrete Classes ##
+
+Often you may find yourself using classes that don't implement
+interfaces. In order to test your code that uses such a class (let's
+call it `Concrete`), you may be tempted to make the methods of
+`Concrete` virtual and then mock it.
+
+Try not to do that.
+
+Making a non-virtual function virtual is a big decision. It creates an
+extension point where subclasses can tweak your class' behavior. This
+weakens your control on the class because now it's harder to maintain
+the class' invariants. You should make a function virtual only when
+there is a valid reason for a subclass to override it.
+
+Mocking concrete classes directly is problematic as it creates a tight
+coupling between the class and the tests - any small change in the
+class may invalidate your tests and make test maintenance a pain.
+
+To avoid such problems, many programmers have been practicing "coding
+to interfaces": instead of talking to the `Concrete` class, your code
+would define an interface and talk to it. Then you implement that
+interface as an adaptor on top of `Concrete`. In tests, you can easily
+mock that interface to observe how your code is doing.
+
+This technique incurs some overhead:
+
+  * You pay the cost of virtual function calls (usually not a problem).
+  * There is more abstraction for the programmers to learn.
+
+However, it can also bring significant benefits in addition to better
+testability:
+
+  * `Concrete`'s API may not fit your problem domain very well, as you may not be the only client it tries to serve. By designing your own interface, you have a chance to tailor it to your need - you may add higher-level functionalities, rename stuff, etc instead of just trimming the class. This allows you to write your code (user of the interface) in a more natural way, which means it will be more readable, more maintainable, and you'll be more productive.
+  * If `Concrete`'s implementation ever has to change, you don't have to rewrite everywhere it is used. Instead, you can absorb the change in your implementation of the interface, and your other code and tests will be insulated from this change.
+
+Some people worry that if everyone is practicing this technique, they
+will end up writing lots of redundant code. This concern is totally
+understandable. However, there are two reasons why it may not be the
+case:
+
+  * Different projects may need to use `Concrete` in different ways, so the best interfaces for them will be different. Therefore, each of them will have its own domain-specific interface on top of `Concrete`, and they will not be the same code.
+  * If enough projects want to use the same interface, they can always share it, just like they have been sharing `Concrete`. You can check in the interface and the adaptor somewhere near `Concrete` (perhaps in a `contrib` sub-directory) and let many projects use it.
+
+You need to weigh the pros and cons carefully for your particular
+problem, but I'd like to assure you that the Java community has been
+practicing this for a long time and it's a proven effective technique
+applicable in a wide variety of situations. :-)
+
+## Delegating Calls to a Fake ##
+
+Some times you have a non-trivial fake implementation of an
+interface. For example:
+
+```
+class Foo {
+ public:
+  virtual ~Foo() {}
+  virtual char DoThis(int n) = 0;
+  virtual void DoThat(const char* s, int* p) = 0;
+};
+
+class FakeFoo : public Foo {
+ public:
+  virtual char DoThis(int n) {
+    return (n > 0) ? '+' :
+        (n < 0) ? '-' : '0';
+  }
+
+  virtual void DoThat(const char* s, int* p) {
+    *p = strlen(s);
+  }
+};
+```
+
+Now you want to mock this interface such that you can set expectations
+on it. However, you also want to use `FakeFoo` for the default
+behavior, as duplicating it in the mock object is, well, a lot of
+work.
+
+When you define the mock class using Google Mock, you can have it
+delegate its default action to a fake class you already have, using
+this pattern:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+class MockFoo : public Foo {
+ public:
+  // Normal mock method definitions using Google Mock.
+  MOCK_METHOD1(DoThis, char(int n));
+  MOCK_METHOD2(DoThat, void(const char* s, int* p));
+
+  // Delegates the default actions of the methods to a FakeFoo object.
+  // This must be called *before* the custom ON_CALL() statements.
+  void DelegateToFake() {
+    ON_CALL(*this, DoThis(_))
+        .WillByDefault(Invoke(&fake_, &FakeFoo::DoThis));
+    ON_CALL(*this, DoThat(_, _))
+        .WillByDefault(Invoke(&fake_, &FakeFoo::DoThat));
+  }
+ private:
+  FakeFoo fake_;  // Keeps an instance of the fake in the mock.
+};
+```
+
+With that, you can use `MockFoo` in your tests as usual. Just remember
+that if you don't explicitly set an action in an `ON_CALL()` or
+`EXPECT_CALL()`, the fake will be called upon to do it:
+
+```
+using ::testing::_;
+
+TEST(AbcTest, Xyz) {
+  MockFoo foo;
+  foo.DelegateToFake(); // Enables the fake for delegation.
+
+  // Put your ON_CALL(foo, ...)s here, if any.
+
+  // No action specified, meaning to use the default action.
+  EXPECT_CALL(foo, DoThis(5));
+  EXPECT_CALL(foo, DoThat(_, _));
+
+  int n = 0;
+  EXPECT_EQ('+', foo.DoThis(5));  // FakeFoo::DoThis() is invoked.
+  foo.DoThat("Hi", &n);           // FakeFoo::DoThat() is invoked.
+  EXPECT_EQ(2, n);
+}
+```
+
+**Some tips:**
+
+  * If you want, you can still override the default action by providing your own `ON_CALL()` or using `.WillOnce()` / `.WillRepeatedly()` in `EXPECT_CALL()`.
+  * In `DelegateToFake()`, you only need to delegate the methods whose fake implementation you intend to use.
+  * The general technique discussed here works for overloaded methods, but you'll need to tell the compiler which version you mean. To disambiguate a mock function (the one you specify inside the parentheses of `ON_CALL()`), see the "Selecting Between Overloaded Functions" section on this page; to disambiguate a fake function (the one you place inside `Invoke()`), use a `static_cast` to specify the function's type.
+  * Having to mix a mock and a fake is often a sign of something gone wrong. Perhaps you haven't got used to the interaction-based way of testing yet. Or perhaps your interface is taking on too many roles and should be split up. Therefore, **don't abuse this**. We would only recommend to do it as an intermediate step when you are refactoring your code.
+
+Regarding the tip on mixing a mock and a fake, here's an example on
+why it may be a bad sign: Suppose you have a class `System` for
+low-level system operations. In particular, it does file and I/O
+operations. And suppose you want to test how your code uses `System`
+to do I/O, and you just want the file operations to work normally. If
+you mock out the entire `System` class, you'll have to provide a fake
+implementation for the file operation part, which suggests that
+`System` is taking on too many roles.
+
+Instead, you can define a `FileOps` interface and an `IOOps` interface
+and split `System`'s functionalities into the two. Then you can mock
+`IOOps` without mocking `FileOps`.
+
+## Delegating Calls to a Real Object ##
+
+When using testing doubles (mocks, fakes, stubs, and etc), sometimes
+their behaviors will differ from those of the real objects. This
+difference could be either intentional (as in simulating an error such
+that you can test the error handling code) or unintentional. If your
+mocks have different behaviors than the real objects by mistake, you
+could end up with code that passes the tests but fails in production.
+
+You can use the _delegating-to-real_ technique to ensure that your
+mock has the same behavior as the real object while retaining the
+ability to validate calls. This technique is very similar to the
+delegating-to-fake technique, the difference being that we use a real
+object instead of a fake. Here's an example:
+
+```
+using ::testing::_;
+using ::testing::AtLeast;
+using ::testing::Invoke;
+
+class MockFoo : public Foo {
+ public:
+  MockFoo() {
+    // By default, all calls are delegated to the real object.
+    ON_CALL(*this, DoThis())
+        .WillByDefault(Invoke(&real_, &Foo::DoThis));
+    ON_CALL(*this, DoThat(_))
+        .WillByDefault(Invoke(&real_, &Foo::DoThat));
+    ...
+  }
+  MOCK_METHOD0(DoThis, ...);
+  MOCK_METHOD1(DoThat, ...);
+  ...
+ private:
+  Foo real_;
+};
+...
+
+  MockFoo mock;
+
+  EXPECT_CALL(mock, DoThis())
+      .Times(3);
+  EXPECT_CALL(mock, DoThat("Hi"))
+      .Times(AtLeast(1));
+  ... use mock in test ...
+```
+
+With this, Google Mock will verify that your code made the right calls
+(with the right arguments, in the right order, called the right number
+of times, etc), and a real object will answer the calls (so the
+behavior will be the same as in production). This gives you the best
+of both worlds.
+
+## Delegating Calls to a Parent Class ##
+
+Ideally, you should code to interfaces, whose methods are all pure
+virtual. In reality, sometimes you do need to mock a virtual method
+that is not pure (i.e, it already has an implementation). For example:
+
+```
+class Foo {
+ public:
+  virtual ~Foo();
+
+  virtual void Pure(int n) = 0;
+  virtual int Concrete(const char* str) { ... }
+};
+
+class MockFoo : public Foo {
+ public:
+  // Mocking a pure method.
+  MOCK_METHOD1(Pure, void(int n));
+  // Mocking a concrete method.  Foo::Concrete() is shadowed.
+  MOCK_METHOD1(Concrete, int(const char* str));
+};
+```
+
+Sometimes you may want to call `Foo::Concrete()` instead of
+`MockFoo::Concrete()`. Perhaps you want to do it as part of a stub
+action, or perhaps your test doesn't need to mock `Concrete()` at all
+(but it would be oh-so painful to have to define a new mock class
+whenever you don't need to mock one of its methods).
+
+The trick is to leave a back door in your mock class for accessing the
+real methods in the base class:
+
+```
+class MockFoo : public Foo {
+ public:
+  // Mocking a pure method.
+  MOCK_METHOD1(Pure, void(int n));
+  // Mocking a concrete method.  Foo::Concrete() is shadowed.
+  MOCK_METHOD1(Concrete, int(const char* str));
+
+  // Use this to call Concrete() defined in Foo.
+  int FooConcrete(const char* str) { return Foo::Concrete(str); }
+};
+```
+
+Now, you can call `Foo::Concrete()` inside an action by:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+...
+  EXPECT_CALL(foo, Concrete(_))
+      .WillOnce(Invoke(&foo, &MockFoo::FooConcrete));
+```
+
+or tell the mock object that you don't want to mock `Concrete()`:
+
+```
+using ::testing::Invoke;
+...
+  ON_CALL(foo, Concrete(_))
+      .WillByDefault(Invoke(&foo, &MockFoo::FooConcrete));
+```
+
+(Why don't we just write `Invoke(&foo, &Foo::Concrete)`? If you do
+that, `MockFoo::Concrete()` will be called (and cause an infinite
+recursion) since `Foo::Concrete()` is virtual. That's just how C++
+works.)
+
+# Using Matchers #
+
+## Matching Argument Values Exactly ##
+
+You can specify exactly which arguments a mock method is expecting:
+
+```
+using ::testing::Return;
+...
+  EXPECT_CALL(foo, DoThis(5))
+      .WillOnce(Return('a'));
+  EXPECT_CALL(foo, DoThat("Hello", bar));
+```
+
+## Using Simple Matchers ##
+
+You can use matchers to match arguments that have a certain property:
+
+```
+using ::testing::Ge;
+using ::testing::NotNull;
+using ::testing::Return;
+...
+  EXPECT_CALL(foo, DoThis(Ge(5)))  // The argument must be >= 5.
+      .WillOnce(Return('a'));
+  EXPECT_CALL(foo, DoThat("Hello", NotNull()));
+  // The second argument must not be NULL.
+```
+
+A frequently used matcher is `_`, which matches anything:
+
+```
+using ::testing::_;
+using ::testing::NotNull;
+...
+  EXPECT_CALL(foo, DoThat(_, NotNull()));
+```
+
+## Combining Matchers ##
+
+You can build complex matchers from existing ones using `AllOf()`,
+`AnyOf()`, and `Not()`:
+
+```
+using ::testing::AllOf;
+using ::testing::Gt;
+using ::testing::HasSubstr;
+using ::testing::Ne;
+using ::testing::Not;
+...
+  // The argument must be > 5 and != 10.
+  EXPECT_CALL(foo, DoThis(AllOf(Gt(5),
+                                Ne(10))));
+
+  // The first argument must not contain sub-string "blah".
+  EXPECT_CALL(foo, DoThat(Not(HasSubstr("blah")),
+                          NULL));
+```
+
+## Casting Matchers ##
+
+Google Mock matchers are statically typed, meaning that the compiler
+can catch your mistake if you use a matcher of the wrong type (for
+example, if you use `Eq(5)` to match a `string` argument). Good for
+you!
+
+Sometimes, however, you know what you're doing and want the compiler
+to give you some slack. One example is that you have a matcher for
+`long` and the argument you want to match is `int`. While the two
+types aren't exactly the same, there is nothing really wrong with
+using a `Matcher<long>` to match an `int` - after all, we can first
+convert the `int` argument to a `long` before giving it to the
+matcher.
+
+To support this need, Google Mock gives you the
+`SafeMatcherCast<T>(m)` function. It casts a matcher `m` to type
+`Matcher<T>`. To ensure safety, Google Mock checks that (let `U` be the
+type `m` accepts):
+
+  1. Type `T` can be implicitly cast to type `U`;
+  1. When both `T` and `U` are built-in arithmetic types (`bool`, integers, and floating-point numbers), the conversion from `T` to `U` is not lossy (in other words, any value representable by `T` can also be represented by `U`); and
+  1. When `U` is a reference, `T` must also be a reference (as the underlying matcher may be interested in the address of the `U` value).
+
+The code won't compile if any of these conditions isn't met.
+
+Here's one example:
+
+```
+using ::testing::SafeMatcherCast;
+
+// A base class and a child class.
+class Base { ... };
+class Derived : public Base { ... };
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(DoThis, void(Derived* derived));
+};
+...
+
+  MockFoo foo;
+  // m is a Matcher<Base*> we got from somewhere.
+  EXPECT_CALL(foo, DoThis(SafeMatcherCast<Derived*>(m)));
+```
+
+If you find `SafeMatcherCast<T>(m)` too limiting, you can use a similar
+function `MatcherCast<T>(m)`. The difference is that `MatcherCast` works
+as long as you can `static_cast` type `T` to type `U`.
+
+`MatcherCast` essentially lets you bypass C++'s type system
+(`static_cast` isn't always safe as it could throw away information,
+for example), so be careful not to misuse/abuse it.
+
+## Selecting Between Overloaded Functions ##
+
+If you expect an overloaded function to be called, the compiler may
+need some help on which overloaded version it is.
+
+To disambiguate functions overloaded on the const-ness of this object,
+use the `Const()` argument wrapper.
+
+```
+using ::testing::ReturnRef;
+
+class MockFoo : public Foo {
+  ...
+  MOCK_METHOD0(GetBar, Bar&());
+  MOCK_CONST_METHOD0(GetBar, const Bar&());
+};
+...
+
+  MockFoo foo;
+  Bar bar1, bar2;
+  EXPECT_CALL(foo, GetBar())         // The non-const GetBar().
+      .WillOnce(ReturnRef(bar1));
+  EXPECT_CALL(Const(foo), GetBar())  // The const GetBar().
+      .WillOnce(ReturnRef(bar2));
+```
+
+(`Const()` is defined by Google Mock and returns a `const` reference
+to its argument.)
+
+To disambiguate overloaded functions with the same number of arguments
+but different argument types, you may need to specify the exact type
+of a matcher, either by wrapping your matcher in `Matcher<type>()`, or
+using a matcher whose type is fixed (`TypedEq<type>`, `An<type>()`,
+etc):
+
+```
+using ::testing::An;
+using ::testing::Lt;
+using ::testing::Matcher;
+using ::testing::TypedEq;
+
+class MockPrinter : public Printer {
+ public:
+  MOCK_METHOD1(Print, void(int n));
+  MOCK_METHOD1(Print, void(char c));
+};
+
+TEST(PrinterTest, Print) {
+  MockPrinter printer;
+
+  EXPECT_CALL(printer, Print(An<int>()));            // void Print(int);
+  EXPECT_CALL(printer, Print(Matcher<int>(Lt(5))));  // void Print(int);
+  EXPECT_CALL(printer, Print(TypedEq<char>('a')));   // void Print(char);
+
+  printer.Print(3);
+  printer.Print(6);
+  printer.Print('a');
+}
+```
+
+## Performing Different Actions Based on the Arguments ##
+
+When a mock method is called, the _last_ matching expectation that's
+still active will be selected (think "newer overrides older"). So, you
+can make a method do different things depending on its argument values
+like this:
+
+```
+using ::testing::_;
+using ::testing::Lt;
+using ::testing::Return;
+...
+  // The default case.
+  EXPECT_CALL(foo, DoThis(_))
+      .WillRepeatedly(Return('b'));
+
+  // The more specific case.
+  EXPECT_CALL(foo, DoThis(Lt(5)))
+      .WillRepeatedly(Return('a'));
+```
+
+Now, if `foo.DoThis()` is called with a value less than 5, `'a'` will
+be returned; otherwise `'b'` will be returned.
+
+## Matching Multiple Arguments as a Whole ##
+
+Sometimes it's not enough to match the arguments individually. For
+example, we may want to say that the first argument must be less than
+the second argument. The `With()` clause allows us to match
+all arguments of a mock function as a whole. For example,
+
+```
+using ::testing::_;
+using ::testing::Lt;
+using ::testing::Ne;
+...
+  EXPECT_CALL(foo, InRange(Ne(0), _))
+      .With(Lt());
+```
+
+says that the first argument of `InRange()` must not be 0, and must be
+less than the second argument.
+
+The expression inside `With()` must be a matcher of type
+`Matcher<tr1::tuple<A1, ..., An> >`, where `A1`, ..., `An` are the
+types of the function arguments.
+
+You can also write `AllArgs(m)` instead of `m` inside `.With()`. The
+two forms are equivalent, but `.With(AllArgs(Lt()))` is more readable
+than `.With(Lt())`.
+
+You can use `Args<k1, ..., kn>(m)` to match the `n` selected arguments
+(as a tuple) against `m`. For example,
+
+```
+using ::testing::_;
+using ::testing::AllOf;
+using ::testing::Args;
+using ::testing::Lt;
+...
+  EXPECT_CALL(foo, Blah(_, _, _))
+      .With(AllOf(Args<0, 1>(Lt()), Args<1, 2>(Lt())));
+```
+
+says that `Blah()` will be called with arguments `x`, `y`, and `z` where
+`x < y < z`.
+
+As a convenience and example, Google Mock provides some matchers for
+2-tuples, including the `Lt()` matcher above. See the [CheatSheet](V1_6_CheatSheet.md) for
+the complete list.
+
+Note that if you want to pass the arguments to a predicate of your own
+(e.g. `.With(Args<0, 1>(Truly(&MyPredicate)))`), that predicate MUST be
+written to take a `tr1::tuple` as its argument; Google Mock will pass the `n`
+selected arguments as _one_ single tuple to the predicate.
+
+## Using Matchers as Predicates ##
+
+Have you noticed that a matcher is just a fancy predicate that also
+knows how to describe itself? Many existing algorithms take predicates
+as arguments (e.g. those defined in STL's `<algorithm>` header), and
+it would be a shame if Google Mock matchers are not allowed to
+participate.
+
+Luckily, you can use a matcher where a unary predicate functor is
+expected by wrapping it inside the `Matches()` function. For example,
+
+```
+#include <algorithm>
+#include <vector>
+
+std::vector<int> v;
+...
+// How many elements in v are >= 10?
+const int count = count_if(v.begin(), v.end(), Matches(Ge(10)));
+```
+
+Since you can build complex matchers from simpler ones easily using
+Google Mock, this gives you a way to conveniently construct composite
+predicates (doing the same using STL's `<functional>` header is just
+painful). For example, here's a predicate that's satisfied by any
+number that is >= 0, <= 100, and != 50:
+
+```
+Matches(AllOf(Ge(0), Le(100), Ne(50)))
+```
+
+## Using Matchers in Google Test Assertions ##
+
+Since matchers are basically predicates that also know how to describe
+themselves, there is a way to take advantage of them in
+[Google Test](http://code.google.com/p/googletest/) assertions. It's
+called `ASSERT_THAT` and `EXPECT_THAT`:
+
+```
+  ASSERT_THAT(value, matcher);  // Asserts that value matches matcher.
+  EXPECT_THAT(value, matcher);  // The non-fatal version.
+```
+
+For example, in a Google Test test you can write:
+
+```
+#include "gmock/gmock.h"
+
+using ::testing::AllOf;
+using ::testing::Ge;
+using ::testing::Le;
+using ::testing::MatchesRegex;
+using ::testing::StartsWith;
+...
+
+  EXPECT_THAT(Foo(), StartsWith("Hello"));
+  EXPECT_THAT(Bar(), MatchesRegex("Line \\d+"));
+  ASSERT_THAT(Baz(), AllOf(Ge(5), Le(10)));
+```
+
+which (as you can probably guess) executes `Foo()`, `Bar()`, and
+`Baz()`, and verifies that:
+
+  * `Foo()` returns a string that starts with `"Hello"`.
+  * `Bar()` returns a string that matches regular expression `"Line \\d+"`.
+  * `Baz()` returns a number in the range [5, 10].
+
+The nice thing about these macros is that _they read like
+English_. They generate informative messages too. For example, if the
+first `EXPECT_THAT()` above fails, the message will be something like:
+
+```
+Value of: Foo()
+  Actual: "Hi, world!"
+Expected: starts with "Hello"
+```
+
+**Credit:** The idea of `(ASSERT|EXPECT)_THAT` was stolen from the
+[Hamcrest](http://code.google.com/p/hamcrest/) project, which adds
+`assertThat()` to JUnit.
+
+## Using Predicates as Matchers ##
+
+Google Mock provides a built-in set of matchers. In case you find them
+lacking, you can use an arbitray unary predicate function or functor
+as a matcher - as long as the predicate accepts a value of the type
+you want. You do this by wrapping the predicate inside the `Truly()`
+function, for example:
+
+```
+using ::testing::Truly;
+
+int IsEven(int n) { return (n % 2) == 0 ? 1 : 0; }
+...
+
+  // Bar() must be called with an even number.
+  EXPECT_CALL(foo, Bar(Truly(IsEven)));
+```
+
+Note that the predicate function / functor doesn't have to return
+`bool`. It works as long as the return value can be used as the
+condition in statement `if (condition) ...`.
+
+## Matching Arguments that Are Not Copyable ##
+
+When you do an `EXPECT_CALL(mock_obj, Foo(bar))`, Google Mock saves
+away a copy of `bar`. When `Foo()` is called later, Google Mock
+compares the argument to `Foo()` with the saved copy of `bar`. This
+way, you don't need to worry about `bar` being modified or destroyed
+after the `EXPECT_CALL()` is executed. The same is true when you use
+matchers like `Eq(bar)`, `Le(bar)`, and so on.
+
+But what if `bar` cannot be copied (i.e. has no copy constructor)? You
+could define your own matcher function and use it with `Truly()`, as
+the previous couple of recipes have shown. Or, you may be able to get
+away from it if you can guarantee that `bar` won't be changed after
+the `EXPECT_CALL()` is executed. Just tell Google Mock that it should
+save a reference to `bar`, instead of a copy of it. Here's how:
+
+```
+using ::testing::Eq;
+using ::testing::ByRef;
+using ::testing::Lt;
+...
+  // Expects that Foo()'s argument == bar.
+  EXPECT_CALL(mock_obj, Foo(Eq(ByRef(bar))));
+
+  // Expects that Foo()'s argument < bar.
+  EXPECT_CALL(mock_obj, Foo(Lt(ByRef(bar))));
+```
+
+Remember: if you do this, don't change `bar` after the
+`EXPECT_CALL()`, or the result is undefined.
+
+## Validating a Member of an Object ##
+
+Often a mock function takes a reference to object as an argument. When
+matching the argument, you may not want to compare the entire object
+against a fixed object, as that may be over-specification. Instead,
+you may need to validate a certain member variable or the result of a
+certain getter method of the object. You can do this with `Field()`
+and `Property()`. More specifically,
+
+```
+Field(&Foo::bar, m)
+```
+
+is a matcher that matches a `Foo` object whose `bar` member variable
+satisfies matcher `m`.
+
+```
+Property(&Foo::baz, m)
+```
+
+is a matcher that matches a `Foo` object whose `baz()` method returns
+a value that satisfies matcher `m`.
+
+For example:
+
+> | `Field(&Foo::number, Ge(3))` | Matches `x` where `x.number >= 3`. |
+|:-----------------------------|:-----------------------------------|
+> | `Property(&Foo::name, StartsWith("John "))` | Matches `x` where `x.name()` starts with `"John "`. |
+
+Note that in `Property(&Foo::baz, ...)`, method `baz()` must take no
+argument and be declared as `const`.
+
+BTW, `Field()` and `Property()` can also match plain pointers to
+objects. For instance,
+
+```
+Field(&Foo::number, Ge(3))
+```
+
+matches a plain pointer `p` where `p->number >= 3`. If `p` is `NULL`,
+the match will always fail regardless of the inner matcher.
+
+What if you want to validate more than one members at the same time?
+Remember that there is `AllOf()`.
+
+## Validating the Value Pointed to by a Pointer Argument ##
+
+C++ functions often take pointers as arguments. You can use matchers
+like `NULL`, `NotNull()`, and other comparison matchers to match a
+pointer, but what if you want to make sure the value _pointed to_ by
+the pointer, instead of the pointer itself, has a certain property?
+Well, you can use the `Pointee(m)` matcher.
+
+`Pointee(m)` matches a pointer iff `m` matches the value the pointer
+points to. For example:
+
+```
+using ::testing::Ge;
+using ::testing::Pointee;
+...
+  EXPECT_CALL(foo, Bar(Pointee(Ge(3))));
+```
+
+expects `foo.Bar()` to be called with a pointer that points to a value
+greater than or equal to 3.
+
+One nice thing about `Pointee()` is that it treats a `NULL` pointer as
+a match failure, so you can write `Pointee(m)` instead of
+
+```
+  AllOf(NotNull(), Pointee(m))
+```
+
+without worrying that a `NULL` pointer will crash your test.
+
+Also, did we tell you that `Pointee()` works with both raw pointers
+**and** smart pointers (`linked_ptr`, `shared_ptr`, `scoped_ptr`, and
+etc)?
+
+What if you have a pointer to pointer? You guessed it - you can use
+nested `Pointee()` to probe deeper inside the value. For example,
+`Pointee(Pointee(Lt(3)))` matches a pointer that points to a pointer
+that points to a number less than 3 (what a mouthful...).
+
+## Testing a Certain Property of an Object ##
+
+Sometimes you want to specify that an object argument has a certain
+property, but there is no existing matcher that does this. If you want
+good error messages, you should define a matcher. If you want to do it
+quick and dirty, you could get away with writing an ordinary function.
+
+Let's say you have a mock function that takes an object of type `Foo`,
+which has an `int bar()` method and an `int baz()` method, and you
+want to constrain that the argument's `bar()` value plus its `baz()`
+value is a given number. Here's how you can define a matcher to do it:
+
+```
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+
+class BarPlusBazEqMatcher : public MatcherInterface<const Foo&> {
+ public:
+  explicit BarPlusBazEqMatcher(int expected_sum)
+      : expected_sum_(expected_sum) {}
+
+  virtual bool MatchAndExplain(const Foo& foo,
+                               MatchResultListener* listener) const {
+    return (foo.bar() + foo.baz()) == expected_sum_;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "bar() + baz() equals " << expected_sum_;
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "bar() + baz() does not equal " << expected_sum_;
+  }
+ private:
+  const int expected_sum_;
+};
+
+inline Matcher<const Foo&> BarPlusBazEq(int expected_sum) {
+  return MakeMatcher(new BarPlusBazEqMatcher(expected_sum));
+}
+
+...
+
+  EXPECT_CALL(..., DoThis(BarPlusBazEq(5)))...;
+```
+
+## Matching Containers ##
+
+Sometimes an STL container (e.g. list, vector, map, ...) is passed to
+a mock function and you may want to validate it. Since most STL
+containers support the `==` operator, you can write
+`Eq(expected_container)` or simply `expected_container` to match a
+container exactly.
+
+Sometimes, though, you may want to be more flexible (for example, the
+first element must be an exact match, but the second element can be
+any positive number, and so on). Also, containers used in tests often
+have a small number of elements, and having to define the expected
+container out-of-line is a bit of a hassle.
+
+You can use the `ElementsAre()` matcher in such cases:
+
+```
+using ::testing::_;
+using ::testing::ElementsAre;
+using ::testing::Gt;
+...
+
+  MOCK_METHOD1(Foo, void(const vector<int>& numbers));
+...
+
+  EXPECT_CALL(mock, Foo(ElementsAre(1, Gt(0), _, 5)));
+```
+
+The above matcher says that the container must have 4 elements, which
+must be 1, greater than 0, anything, and 5 respectively.
+
+`ElementsAre()` is overloaded to take 0 to 10 arguments. If more are
+needed, you can place them in a C-style array and use
+`ElementsAreArray()` instead:
+
+```
+using ::testing::ElementsAreArray;
+...
+
+  // ElementsAreArray accepts an array of element values.
+  const int expected_vector1[] = { 1, 5, 2, 4, ... };
+  EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector1)));
+
+  // Or, an array of element matchers.
+  Matcher<int> expected_vector2 = { 1, Gt(2), _, 3, ... };
+  EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector2)));
+```
+
+In case the array needs to be dynamically created (and therefore the
+array size cannot be inferred by the compiler), you can give
+`ElementsAreArray()` an additional argument to specify the array size:
+
+```
+using ::testing::ElementsAreArray;
+...
+  int* const expected_vector3 = new int[count];
+  ... fill expected_vector3 with values ...
+  EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector3, count)));
+```
+
+**Tips:**
+
+  * `ElementAre*()` works with _any_ container that implements the STL iterator concept (i.e. it has a `const_iterator` type and supports `begin()/end()`) and supports `size()`, not just the ones defined in STL. It will even work with container types yet to be written - as long as they follows the above pattern.
+  * You can use nested `ElementAre*()` to match nested (multi-dimensional) containers.
+  * If the container is passed by pointer instead of by reference, just write `Pointee(ElementsAre*(...))`.
+  * The order of elements _matters_ for `ElementsAre*()`. Therefore don't use it with containers whose element order is undefined (e.g. `hash_map`).
+
+## Sharing Matchers ##
+
+Under the hood, a Google Mock matcher object consists of a pointer to
+a ref-counted implementation object. Copying matchers is allowed and
+very efficient, as only the pointer is copied. When the last matcher
+that references the implementation object dies, the implementation
+object will be deleted.
+
+Therefore, if you have some complex matcher that you want to use again
+and again, there is no need to build it everytime. Just assign it to a
+matcher variable and use that variable repeatedly! For example,
+
+```
+  Matcher<int> in_range = AllOf(Gt(5), Le(10));
+  ... use in_range as a matcher in multiple EXPECT_CALLs ...
+```
+
+# Setting Expectations #
+
+## Ignoring Uninteresting Calls ##
+
+If you are not interested in how a mock method is called, just don't
+say anything about it. In this case, if the method is ever called,
+Google Mock will perform its default action to allow the test program
+to continue. If you are not happy with the default action taken by
+Google Mock, you can override it using `DefaultValue<T>::Set()`
+(described later in this document) or `ON_CALL()`.
+
+Please note that once you expressed interest in a particular mock
+method (via `EXPECT_CALL()`), all invocations to it must match some
+expectation. If this function is called but the arguments don't match
+any `EXPECT_CALL()` statement, it will be an error.
+
+## Disallowing Unexpected Calls ##
+
+If a mock method shouldn't be called at all, explicitly say so:
+
+```
+using ::testing::_;
+...
+  EXPECT_CALL(foo, Bar(_))
+      .Times(0);
+```
+
+If some calls to the method are allowed, but the rest are not, just
+list all the expected calls:
+
+```
+using ::testing::AnyNumber;
+using ::testing::Gt;
+...
+  EXPECT_CALL(foo, Bar(5));
+  EXPECT_CALL(foo, Bar(Gt(10)))
+      .Times(AnyNumber());
+```
+
+A call to `foo.Bar()` that doesn't match any of the `EXPECT_CALL()`
+statements will be an error.
+
+## Expecting Ordered Calls ##
+
+Although an `EXPECT_CALL()` statement defined earlier takes precedence
+when Google Mock tries to match a function call with an expectation,
+by default calls don't have to happen in the order `EXPECT_CALL()`
+statements are written. For example, if the arguments match the
+matchers in the third `EXPECT_CALL()`, but not those in the first two,
+then the third expectation will be used.
+
+If you would rather have all calls occur in the order of the
+expectations, put the `EXPECT_CALL()` statements in a block where you
+define a variable of type `InSequence`:
+
+```
+  using ::testing::_;
+  using ::testing::InSequence;
+
+  {
+    InSequence s;
+
+    EXPECT_CALL(foo, DoThis(5));
+    EXPECT_CALL(bar, DoThat(_))
+        .Times(2);
+    EXPECT_CALL(foo, DoThis(6));
+  }
+```
+
+In this example, we expect a call to `foo.DoThis(5)`, followed by two
+calls to `bar.DoThat()` where the argument can be anything, which are
+in turn followed by a call to `foo.DoThis(6)`. If a call occurred
+out-of-order, Google Mock will report an error.
+
+## Expecting Partially Ordered Calls ##
+
+Sometimes requiring everything to occur in a predetermined order can
+lead to brittle tests. For example, we may care about `A` occurring
+before both `B` and `C`, but aren't interested in the relative order
+of `B` and `C`. In this case, the test should reflect our real intent,
+instead of being overly constraining.
+
+Google Mock allows you to impose an arbitrary DAG (directed acyclic
+graph) on the calls. One way to express the DAG is to use the
+[After](http://code.google.com/p/googlemock/wiki/V1_6_CheatSheet#The_After_Clause) clause of `EXPECT_CALL`.
+
+Another way is via the `InSequence()` clause (not the same as the
+`InSequence` class), which we borrowed from jMock 2. It's less
+flexible than `After()`, but more convenient when you have long chains
+of sequential calls, as it doesn't require you to come up with
+different names for the expectations in the chains.  Here's how it
+works:
+
+If we view `EXPECT_CALL()` statements as nodes in a graph, and add an
+edge from node A to node B wherever A must occur before B, we can get
+a DAG. We use the term "sequence" to mean a directed path in this
+DAG. Now, if we decompose the DAG into sequences, we just need to know
+which sequences each `EXPECT_CALL()` belongs to in order to be able to
+reconstruct the orginal DAG.
+
+So, to specify the partial order on the expectations we need to do two
+things: first to define some `Sequence` objects, and then for each
+`EXPECT_CALL()` say which `Sequence` objects it is part
+of. Expectations in the same sequence must occur in the order they are
+written. For example,
+
+```
+  using ::testing::Sequence;
+
+  Sequence s1, s2;
+
+  EXPECT_CALL(foo, A())
+      .InSequence(s1, s2);
+  EXPECT_CALL(bar, B())
+      .InSequence(s1);
+  EXPECT_CALL(bar, C())
+      .InSequence(s2);
+  EXPECT_CALL(foo, D())
+      .InSequence(s2);
+```
+
+specifies the following DAG (where `s1` is `A -> B`, and `s2` is `A ->
+C -> D`):
+
+```
+       +---> B
+       |
+  A ---|
+       |
+       +---> C ---> D
+```
+
+This means that A must occur before B and C, and C must occur before
+D. There's no restriction about the order other than these.
+
+## Controlling When an Expectation Retires ##
+
+When a mock method is called, Google Mock only consider expectations
+that are still active. An expectation is active when created, and
+becomes inactive (aka _retires_) when a call that has to occur later
+has occurred. For example, in
+
+```
+  using ::testing::_;
+  using ::testing::Sequence;
+
+  Sequence s1, s2;
+
+  EXPECT_CALL(log, Log(WARNING, _, "File too large."))     // #1
+      .Times(AnyNumber())
+      .InSequence(s1, s2);
+  EXPECT_CALL(log, Log(WARNING, _, "Data set is empty."))  // #2
+      .InSequence(s1);
+  EXPECT_CALL(log, Log(WARNING, _, "User not found."))     // #3
+      .InSequence(s2);
+```
+
+as soon as either #2 or #3 is matched, #1 will retire. If a warning
+`"File too large."` is logged after this, it will be an error.
+
+Note that an expectation doesn't retire automatically when it's
+saturated. For example,
+
+```
+using ::testing::_;
+...
+  EXPECT_CALL(log, Log(WARNING, _, _));                  // #1
+  EXPECT_CALL(log, Log(WARNING, _, "File too large."));  // #2
+```
+
+says that there will be exactly one warning with the message `"File
+too large."`. If the second warning contains this message too, #2 will
+match again and result in an upper-bound-violated error.
+
+If this is not what you want, you can ask an expectation to retire as
+soon as it becomes saturated:
+
+```
+using ::testing::_;
+...
+  EXPECT_CALL(log, Log(WARNING, _, _));                 // #1
+  EXPECT_CALL(log, Log(WARNING, _, "File too large."))  // #2
+      .RetiresOnSaturation();
+```
+
+Here #2 can be used only once, so if you have two warnings with the
+message `"File too large."`, the first will match #2 and the second
+will match #1 - there will be no error.
+
+# Using Actions #
+
+## Returning References from Mock Methods ##
+
+If a mock function's return type is a reference, you need to use
+`ReturnRef()` instead of `Return()` to return a result:
+
+```
+using ::testing::ReturnRef;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD0(GetBar, Bar&());
+};
+...
+
+  MockFoo foo;
+  Bar bar;
+  EXPECT_CALL(foo, GetBar())
+      .WillOnce(ReturnRef(bar));
+```
+
+## Returning Live Values from Mock Methods ##
+
+The `Return(x)` action saves a copy of `x` when the action is
+_created_, and always returns the same value whenever it's
+executed. Sometimes you may want to instead return the _live_ value of
+`x` (i.e. its value at the time when the action is _executed_.).
+
+If the mock function's return type is a reference, you can do it using
+`ReturnRef(x)`, as shown in the previous recipe ("Returning References
+from Mock Methods"). However, Google Mock doesn't let you use
+`ReturnRef()` in a mock function whose return type is not a reference,
+as doing that usually indicates a user error. So, what shall you do?
+
+You may be tempted to try `ByRef()`:
+
+```
+using testing::ByRef;
+using testing::Return;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD0(GetValue, int());
+};
+...
+  int x = 0;
+  MockFoo foo;
+  EXPECT_CALL(foo, GetValue())
+      .WillRepeatedly(Return(ByRef(x)));
+  x = 42;
+  EXPECT_EQ(42, foo.GetValue());
+```
+
+Unfortunately, it doesn't work here. The above code will fail with error:
+
+```
+Value of: foo.GetValue()
+  Actual: 0
+Expected: 42
+```
+
+The reason is that `Return(value)` converts `value` to the actual
+return type of the mock function at the time when the action is
+_created_, not when it is _executed_. (This behavior was chosen for
+the action to be safe when `value` is a proxy object that references
+some temporary objects.) As a result, `ByRef(x)` is converted to an
+`int` value (instead of a `const int&`) when the expectation is set,
+and `Return(ByRef(x))` will always return 0.
+
+`ReturnPointee(pointer)` was provided to solve this problem
+specifically. It returns the value pointed to by `pointer` at the time
+the action is _executed_:
+
+```
+using testing::ReturnPointee;
+...
+  int x = 0;
+  MockFoo foo;
+  EXPECT_CALL(foo, GetValue())
+      .WillRepeatedly(ReturnPointee(&x));  // Note the & here.
+  x = 42;
+  EXPECT_EQ(42, foo.GetValue());  // This will succeed now.
+```
+
+## Combining Actions ##
+
+Want to do more than one thing when a function is called? That's
+fine. `DoAll()` allow you to do sequence of actions every time. Only
+the return value of the last action in the sequence will be used.
+
+```
+using ::testing::DoAll;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(Bar, bool(int n));
+};
+...
+
+  EXPECT_CALL(foo, Bar(_))
+      .WillOnce(DoAll(action_1,
+                      action_2,
+                      ...
+                      action_n));
+```
+
+## Mocking Side Effects ##
+
+Sometimes a method exhibits its effect not via returning a value but
+via side effects. For example, it may change some global state or
+modify an output argument. To mock side effects, in general you can
+define your own action by implementing `::testing::ActionInterface`.
+
+If all you need to do is to change an output argument, the built-in
+`SetArgPointee()` action is convenient:
+
+```
+using ::testing::SetArgPointee;
+
+class MockMutator : public Mutator {
+ public:
+  MOCK_METHOD2(Mutate, void(bool mutate, int* value));
+  ...
+};
+...
+
+  MockMutator mutator;
+  EXPECT_CALL(mutator, Mutate(true, _))
+      .WillOnce(SetArgPointee<1>(5));
+```
+
+In this example, when `mutator.Mutate()` is called, we will assign 5
+to the `int` variable pointed to by argument #1
+(0-based).
+
+`SetArgPointee()` conveniently makes an internal copy of the
+value you pass to it, removing the need to keep the value in scope and
+alive. The implication however is that the value must have a copy
+constructor and assignment operator.
+
+If the mock method also needs to return a value as well, you can chain
+`SetArgPointee()` with `Return()` using `DoAll()`:
+
+```
+using ::testing::_;
+using ::testing::Return;
+using ::testing::SetArgPointee;
+
+class MockMutator : public Mutator {
+ public:
+  ...
+  MOCK_METHOD1(MutateInt, bool(int* value));
+};
+...
+
+  MockMutator mutator;
+  EXPECT_CALL(mutator, MutateInt(_))
+      .WillOnce(DoAll(SetArgPointee<0>(5),
+                      Return(true)));
+```
+
+If the output argument is an array, use the
+`SetArrayArgument<N>(first, last)` action instead. It copies the
+elements in source range `[first, last)` to the array pointed to by
+the `N`-th (0-based) argument:
+
+```
+using ::testing::NotNull;
+using ::testing::SetArrayArgument;
+
+class MockArrayMutator : public ArrayMutator {
+ public:
+  MOCK_METHOD2(Mutate, void(int* values, int num_values));
+  ...
+};
+...
+
+  MockArrayMutator mutator;
+  int values[5] = { 1, 2, 3, 4, 5 };
+  EXPECT_CALL(mutator, Mutate(NotNull(), 5))
+      .WillOnce(SetArrayArgument<0>(values, values + 5));
+```
+
+This also works when the argument is an output iterator:
+
+```
+using ::testing::_;
+using ::testing::SeArrayArgument;
+
+class MockRolodex : public Rolodex {
+ public:
+  MOCK_METHOD1(GetNames, void(std::back_insert_iterator<vector<string> >));
+  ...
+};
+...
+
+  MockRolodex rolodex;
+  vector<string> names;
+  names.push_back("George");
+  names.push_back("John");
+  names.push_back("Thomas");
+  EXPECT_CALL(rolodex, GetNames(_))
+      .WillOnce(SetArrayArgument<0>(names.begin(), names.end()));
+```
+
+## Changing a Mock Object's Behavior Based on the State ##
+
+If you expect a call to change the behavior of a mock object, you can use `::testing::InSequence` to specify different behaviors before and after the call:
+
+```
+using ::testing::InSequence;
+using ::testing::Return;
+
+...
+  {
+    InSequence seq;
+    EXPECT_CALL(my_mock, IsDirty())
+        .WillRepeatedly(Return(true));
+    EXPECT_CALL(my_mock, Flush());
+    EXPECT_CALL(my_mock, IsDirty())
+        .WillRepeatedly(Return(false));
+  }
+  my_mock.FlushIfDirty();
+```
+
+This makes `my_mock.IsDirty()` return `true` before `my_mock.Flush()` is called and return `false` afterwards.
+
+If the behavior change is more complex, you can store the effects in a variable and make a mock method get its return value from that variable:
+
+```
+using ::testing::_;
+using ::testing::SaveArg;
+using ::testing::Return;
+
+ACTION_P(ReturnPointee, p) { return *p; }
+...
+  int previous_value = 0;
+  EXPECT_CALL(my_mock, GetPrevValue())
+      .WillRepeatedly(ReturnPointee(&previous_value));
+  EXPECT_CALL(my_mock, UpdateValue(_))
+      .WillRepeatedly(SaveArg<0>(&previous_value));
+  my_mock.DoSomethingToUpdateValue();
+```
+
+Here `my_mock.GetPrevValue()` will always return the argument of the last `UpdateValue()` call.
+
+## Setting the Default Value for a Return Type ##
+
+If a mock method's return type is a built-in C++ type or pointer, by
+default it will return 0 when invoked. You only need to specify an
+action if this default value doesn't work for you.
+
+Sometimes, you may want to change this default value, or you may want
+to specify a default value for types Google Mock doesn't know
+about. You can do this using the `::testing::DefaultValue` class
+template:
+
+```
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD0(CalculateBar, Bar());
+};
+...
+
+  Bar default_bar;
+  // Sets the default return value for type Bar.
+  DefaultValue<Bar>::Set(default_bar);
+
+  MockFoo foo;
+
+  // We don't need to specify an action here, as the default
+  // return value works for us.
+  EXPECT_CALL(foo, CalculateBar());
+
+  foo.CalculateBar();  // This should return default_bar.
+
+  // Unsets the default return value.
+  DefaultValue<Bar>::Clear();
+```
+
+Please note that changing the default value for a type can make you
+tests hard to understand. We recommend you to use this feature
+judiciously. For example, you may want to make sure the `Set()` and
+`Clear()` calls are right next to the code that uses your mock.
+
+## Setting the Default Actions for a Mock Method ##
+
+You've learned how to change the default value of a given
+type. However, this may be too coarse for your purpose: perhaps you
+have two mock methods with the same return type and you want them to
+have different behaviors. The `ON_CALL()` macro allows you to
+customize your mock's behavior at the method level:
+
+```
+using ::testing::_;
+using ::testing::AnyNumber;
+using ::testing::Gt;
+using ::testing::Return;
+...
+  ON_CALL(foo, Sign(_))
+      .WillByDefault(Return(-1));
+  ON_CALL(foo, Sign(0))
+      .WillByDefault(Return(0));
+  ON_CALL(foo, Sign(Gt(0)))
+      .WillByDefault(Return(1));
+
+  EXPECT_CALL(foo, Sign(_))
+      .Times(AnyNumber());
+
+  foo.Sign(5);   // This should return 1.
+  foo.Sign(-9);  // This should return -1.
+  foo.Sign(0);   // This should return 0.
+```
+
+As you may have guessed, when there are more than one `ON_CALL()`
+statements, the news order take precedence over the older ones. In
+other words, the **last** one that matches the function arguments will
+be used. This matching order allows you to set up the common behavior
+in a mock object's constructor or the test fixture's set-up phase and
+specialize the mock's behavior later.
+
+## Using Functions/Methods/Functors as Actions ##
+
+If the built-in actions don't suit you, you can easily use an existing
+function, method, or functor as an action:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD2(Sum, int(int x, int y));
+  MOCK_METHOD1(ComplexJob, bool(int x));
+};
+
+int CalculateSum(int x, int y) { return x + y; }
+
+class Helper {
+ public:
+  bool ComplexJob(int x);
+};
+...
+
+  MockFoo foo;
+  Helper helper;
+  EXPECT_CALL(foo, Sum(_, _))
+      .WillOnce(Invoke(CalculateSum));
+  EXPECT_CALL(foo, ComplexJob(_))
+      .WillOnce(Invoke(&helper, &Helper::ComplexJob));
+
+  foo.Sum(5, 6);       // Invokes CalculateSum(5, 6).
+  foo.ComplexJob(10);  // Invokes helper.ComplexJob(10);
+```
+
+The only requirement is that the type of the function, etc must be
+_compatible_ with the signature of the mock function, meaning that the
+latter's arguments can be implicitly converted to the corresponding
+arguments of the former, and the former's return type can be
+implicitly converted to that of the latter. So, you can invoke
+something whose type is _not_ exactly the same as the mock function,
+as long as it's safe to do so - nice, huh?
+
+## Invoking a Function/Method/Functor Without Arguments ##
+
+`Invoke()` is very useful for doing actions that are more complex. It
+passes the mock function's arguments to the function or functor being
+invoked such that the callee has the full context of the call to work
+with. If the invoked function is not interested in some or all of the
+arguments, it can simply ignore them.
+
+Yet, a common pattern is that a test author wants to invoke a function
+without the arguments of the mock function. `Invoke()` allows her to
+do that using a wrapper function that throws away the arguments before
+invoking an underlining nullary function. Needless to say, this can be
+tedious and obscures the intent of the test.
+
+`InvokeWithoutArgs()` solves this problem. It's like `Invoke()` except
+that it doesn't pass the mock function's arguments to the
+callee. Here's an example:
+
+```
+using ::testing::_;
+using ::testing::InvokeWithoutArgs;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(ComplexJob, bool(int n));
+};
+
+bool Job1() { ... }
+...
+
+  MockFoo foo;
+  EXPECT_CALL(foo, ComplexJob(_))
+      .WillOnce(InvokeWithoutArgs(Job1));
+
+  foo.ComplexJob(10);  // Invokes Job1().
+```
+
+## Invoking an Argument of the Mock Function ##
+
+Sometimes a mock function will receive a function pointer or a functor
+(in other words, a "callable") as an argument, e.g.
+
+```
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD2(DoThis, bool(int n, bool (*fp)(int)));
+};
+```
+
+and you may want to invoke this callable argument:
+
+```
+using ::testing::_;
+...
+  MockFoo foo;
+  EXPECT_CALL(foo, DoThis(_, _))
+      .WillOnce(...);
+  // Will execute (*fp)(5), where fp is the
+  // second argument DoThis() receives.
+```
+
+Arghh, you need to refer to a mock function argument but C++ has no
+lambda (yet), so you have to define your own action. :-( Or do you
+really?
+
+Well, Google Mock has an action to solve _exactly_ this problem:
+
+```
+  InvokeArgument<N>(arg_1, arg_2, ..., arg_m)
+```
+
+will invoke the `N`-th (0-based) argument the mock function receives,
+with `arg_1`, `arg_2`, ..., and `arg_m`. No matter if the argument is
+a function pointer or a functor, Google Mock handles them both.
+
+With that, you could write:
+
+```
+using ::testing::_;
+using ::testing::InvokeArgument;
+...
+  EXPECT_CALL(foo, DoThis(_, _))
+      .WillOnce(InvokeArgument<1>(5));
+  // Will execute (*fp)(5), where fp is the
+  // second argument DoThis() receives.
+```
+
+What if the callable takes an argument by reference? No problem - just
+wrap it inside `ByRef()`:
+
+```
+...
+  MOCK_METHOD1(Bar, bool(bool (*fp)(int, const Helper&)));
+...
+using ::testing::_;
+using ::testing::ByRef;
+using ::testing::InvokeArgument;
+...
+
+  MockFoo foo;
+  Helper helper;
+  ...
+  EXPECT_CALL(foo, Bar(_))
+      .WillOnce(InvokeArgument<0>(5, ByRef(helper)));
+  // ByRef(helper) guarantees that a reference to helper, not a copy of it,
+  // will be passed to the callable.
+```
+
+What if the callable takes an argument by reference and we do **not**
+wrap the argument in `ByRef()`? Then `InvokeArgument()` will _make a
+copy_ of the argument, and pass a _reference to the copy_, instead of
+a reference to the original value, to the callable. This is especially
+handy when the argument is a temporary value:
+
+```
+...
+  MOCK_METHOD1(DoThat, bool(bool (*f)(const double& x, const string& s)));
+...
+using ::testing::_;
+using ::testing::InvokeArgument;
+...
+
+  MockFoo foo;
+  ...
+  EXPECT_CALL(foo, DoThat(_))
+      .WillOnce(InvokeArgument<0>(5.0, string("Hi")));
+  // Will execute (*f)(5.0, string("Hi")), where f is the function pointer
+  // DoThat() receives.  Note that the values 5.0 and string("Hi") are
+  // temporary and dead once the EXPECT_CALL() statement finishes.  Yet
+  // it's fine to perform this action later, since a copy of the values
+  // are kept inside the InvokeArgument action.
+```
+
+## Ignoring an Action's Result ##
+
+Sometimes you have an action that returns _something_, but you need an
+action that returns `void` (perhaps you want to use it in a mock
+function that returns `void`, or perhaps it needs to be used in
+`DoAll()` and it's not the last in the list). `IgnoreResult()` lets
+you do that. For example:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::Return;
+
+int Process(const MyData& data);
+string DoSomething();
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(Abc, void(const MyData& data));
+  MOCK_METHOD0(Xyz, bool());
+};
+...
+
+  MockFoo foo;
+  EXPECT_CALL(foo, Abc(_))
+  // .WillOnce(Invoke(Process));
+  // The above line won't compile as Process() returns int but Abc() needs
+  // to return void.
+      .WillOnce(IgnoreResult(Invoke(Process)));
+
+  EXPECT_CALL(foo, Xyz())
+      .WillOnce(DoAll(IgnoreResult(Invoke(DoSomething)),
+      // Ignores the string DoSomething() returns.
+                      Return(true)));
+```
+
+Note that you **cannot** use `IgnoreResult()` on an action that already
+returns `void`. Doing so will lead to ugly compiler errors.
+
+## Selecting an Action's Arguments ##
+
+Say you have a mock function `Foo()` that takes seven arguments, and
+you have a custom action that you want to invoke when `Foo()` is
+called. Trouble is, the custom action only wants three arguments:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+...
+  MOCK_METHOD7(Foo, bool(bool visible, const string& name, int x, int y,
+                         const map<pair<int, int>, double>& weight,
+                         double min_weight, double max_wight));
+...
+
+bool IsVisibleInQuadrant1(bool visible, int x, int y) {
+  return visible && x >= 0 && y >= 0;
+}
+...
+
+  EXPECT_CALL(mock, Foo(_, _, _, _, _, _, _))
+      .WillOnce(Invoke(IsVisibleInQuadrant1));  // Uh, won't compile. :-(
+```
+
+To please the compiler God, you can to define an "adaptor" that has
+the same signature as `Foo()` and calls the custom action with the
+right arguments:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+bool MyIsVisibleInQuadrant1(bool visible, const string& name, int x, int y,
+                            const map<pair<int, int>, double>& weight,
+                            double min_weight, double max_wight) {
+  return IsVisibleInQuadrant1(visible, x, y);
+}
+...
+
+  EXPECT_CALL(mock, Foo(_, _, _, _, _, _, _))
+      .WillOnce(Invoke(MyIsVisibleInQuadrant1));  // Now it works.
+```
+
+But isn't this awkward?
+
+Google Mock provides a generic _action adaptor_, so you can spend your
+time minding more important business than writing your own
+adaptors. Here's the syntax:
+
+```
+  WithArgs<N1, N2, ..., Nk>(action)
+```
+
+creates an action that passes the arguments of the mock function at
+the given indices (0-based) to the inner `action` and performs
+it. Using `WithArgs`, our original example can be written as:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::WithArgs;
+...
+  EXPECT_CALL(mock, Foo(_, _, _, _, _, _, _))
+      .WillOnce(WithArgs<0, 2, 3>(Invoke(IsVisibleInQuadrant1)));
+      // No need to define your own adaptor.
+```
+
+For better readability, Google Mock also gives you:
+
+  * `WithoutArgs(action)` when the inner `action` takes _no_ argument, and
+  * `WithArg<N>(action)` (no `s` after `Arg`) when the inner `action` takes _one_ argument.
+
+As you may have realized, `InvokeWithoutArgs(...)` is just syntactic
+sugar for `WithoutArgs(Inovke(...))`.
+
+Here are more tips:
+
+  * The inner action used in `WithArgs` and friends does not have to be `Invoke()` -- it can be anything.
+  * You can repeat an argument in the argument list if necessary, e.g. `WithArgs<2, 3, 3, 5>(...)`.
+  * You can change the order of the arguments, e.g. `WithArgs<3, 2, 1>(...)`.
+  * The types of the selected arguments do _not_ have to match the signature of the inner action exactly. It works as long as they can be implicitly converted to the corresponding arguments of the inner action. For example, if the 4-th argument of the mock function is an `int` and `my_action` takes a `double`, `WithArg<4>(my_action)` will work.
+
+## Ignoring Arguments in Action Functions ##
+
+The selecting-an-action's-arguments recipe showed us one way to make a
+mock function and an action with incompatible argument lists fit
+together. The downside is that wrapping the action in
+`WithArgs<...>()` can get tedious for people writing the tests.
+
+If you are defining a function, method, or functor to be used with
+`Invoke*()`, and you are not interested in some of its arguments, an
+alternative to `WithArgs` is to declare the uninteresting arguments as
+`Unused`. This makes the definition less cluttered and less fragile in
+case the types of the uninteresting arguments change. It could also
+increase the chance the action function can be reused. For example,
+given
+
+```
+  MOCK_METHOD3(Foo, double(const string& label, double x, double y));
+  MOCK_METHOD3(Bar, double(int index, double x, double y));
+```
+
+instead of
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+double DistanceToOriginWithLabel(const string& label, double x, double y) {
+  return sqrt(x*x + y*y);
+}
+
+double DistanceToOriginWithIndex(int index, double x, double y) {
+  return sqrt(x*x + y*y);
+}
+...
+
+  EXEPCT_CALL(mock, Foo("abc", _, _))
+      .WillOnce(Invoke(DistanceToOriginWithLabel));
+  EXEPCT_CALL(mock, Bar(5, _, _))
+      .WillOnce(Invoke(DistanceToOriginWithIndex));
+```
+
+you could write
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::Unused;
+
+double DistanceToOrigin(Unused, double x, double y) {
+  return sqrt(x*x + y*y);
+}
+...
+
+  EXEPCT_CALL(mock, Foo("abc", _, _))
+      .WillOnce(Invoke(DistanceToOrigin));
+  EXEPCT_CALL(mock, Bar(5, _, _))
+      .WillOnce(Invoke(DistanceToOrigin));
+```
+
+## Sharing Actions ##
+
+Just like matchers, a Google Mock action object consists of a pointer
+to a ref-counted implementation object. Therefore copying actions is
+also allowed and very efficient. When the last action that references
+the implementation object dies, the implementation object will be
+deleted.
+
+If you have some complex action that you want to use again and again,
+you may not have to build it from scratch everytime. If the action
+doesn't have an internal state (i.e. if it always does the same thing
+no matter how many times it has been called), you can assign it to an
+action variable and use that variable repeatedly. For example:
+
+```
+  Action<bool(int*)> set_flag = DoAll(SetArgPointee<0>(5),
+                                      Return(true));
+  ... use set_flag in .WillOnce() and .WillRepeatedly() ...
+```
+
+However, if the action has its own state, you may be surprised if you
+share the action object. Suppose you have an action factory
+`IncrementCounter(init)` which creates an action that increments and
+returns a counter whose initial value is `init`, using two actions
+created from the same expression and using a shared action will
+exihibit different behaviors. Example:
+
+```
+  EXPECT_CALL(foo, DoThis())
+      .WillRepeatedly(IncrementCounter(0));
+  EXPECT_CALL(foo, DoThat())
+      .WillRepeatedly(IncrementCounter(0));
+  foo.DoThis();  // Returns 1.
+  foo.DoThis();  // Returns 2.
+  foo.DoThat();  // Returns 1 - Blah() uses a different
+                 // counter than Bar()'s.
+```
+
+versus
+
+```
+  Action<int()> increment = IncrementCounter(0);
+
+  EXPECT_CALL(foo, DoThis())
+      .WillRepeatedly(increment);
+  EXPECT_CALL(foo, DoThat())
+      .WillRepeatedly(increment);
+  foo.DoThis();  // Returns 1.
+  foo.DoThis();  // Returns 2.
+  foo.DoThat();  // Returns 3 - the counter is shared.
+```
+
+# Misc Recipes on Using Google Mock #
+
+## Making the Compilation Faster ##
+
+Believe it or not, the _vast majority_ of the time spent on compiling
+a mock class is in generating its constructor and destructor, as they
+perform non-trivial tasks (e.g. verification of the
+expectations). What's more, mock methods with different signatures
+have different types and thus their constructors/destructors need to
+be generated by the compiler separately. As a result, if you mock many
+different types of methods, compiling your mock class can get really
+slow.
+
+If you are experiencing slow compilation, you can move the definition
+of your mock class' constructor and destructor out of the class body
+and into a `.cpp` file. This way, even if you `#include` your mock
+class in N files, the compiler only needs to generate its constructor
+and destructor once, resulting in a much faster compilation.
+
+Let's illustrate the idea using an example. Here's the definition of a
+mock class before applying this recipe:
+
+```
+// File mock_foo.h.
+...
+class MockFoo : public Foo {
+ public:
+  // Since we don't declare the constructor or the destructor,
+  // the compiler will generate them in every translation unit
+  // where this mock class is used.
+
+  MOCK_METHOD0(DoThis, int());
+  MOCK_METHOD1(DoThat, bool(const char* str));
+  ... more mock methods ...
+};
+```
+
+After the change, it would look like:
+
+```
+// File mock_foo.h.
+...
+class MockFoo : public Foo {
+ public:
+  // The constructor and destructor are declared, but not defined, here.
+  MockFoo();
+  virtual ~MockFoo();
+
+  MOCK_METHOD0(DoThis, int());
+  MOCK_METHOD1(DoThat, bool(const char* str));
+  ... more mock methods ...
+};
+```
+and
+```
+// File mock_foo.cpp.
+#include "path/to/mock_foo.h"
+
+// The definitions may appear trivial, but the functions actually do a
+// lot of things through the constructors/destructors of the member
+// variables used to implement the mock methods.
+MockFoo::MockFoo() {}
+MockFoo::~MockFoo() {}
+```
+
+## Forcing a Verification ##
+
+When it's being destoyed, your friendly mock object will automatically
+verify that all expectations on it have been satisfied, and will
+generate [Google Test](http://code.google.com/p/googletest/) failures
+if not. This is convenient as it leaves you with one less thing to
+worry about. That is, unless you are not sure if your mock object will
+be destoyed.
+
+How could it be that your mock object won't eventually be destroyed?
+Well, it might be created on the heap and owned by the code you are
+testing. Suppose there's a bug in that code and it doesn't delete the
+mock object properly - you could end up with a passing test when
+there's actually a bug.
+
+Using a heap checker is a good idea and can alleviate the concern, but
+its implementation may not be 100% reliable. So, sometimes you do want
+to _force_ Google Mock to verify a mock object before it is
+(hopefully) destructed. You can do this with
+`Mock::VerifyAndClearExpectations(&mock_object)`:
+
+```
+TEST(MyServerTest, ProcessesRequest) {
+  using ::testing::Mock;
+
+  MockFoo* const foo = new MockFoo;
+  EXPECT_CALL(*foo, ...)...;
+  // ... other expectations ...
+
+  // server now owns foo.
+  MyServer server(foo);
+  server.ProcessRequest(...);
+
+  // In case that server's destructor will forget to delete foo,
+  // this will verify the expectations anyway.
+  Mock::VerifyAndClearExpectations(foo);
+}  // server is destroyed when it goes out of scope here.
+```
+
+**Tip:** The `Mock::VerifyAndClearExpectations()` function returns a
+`bool` to indicate whether the verification was successful (`true` for
+yes), so you can wrap that function call inside a `ASSERT_TRUE()` if
+there is no point going further when the verification has failed.
+
+## Using Check Points ##
+
+Sometimes you may want to "reset" a mock object at various check
+points in your test: at each check point, you verify that all existing
+expectations on the mock object have been satisfied, and then you set
+some new expectations on it as if it's newly created. This allows you
+to work with a mock object in "phases" whose sizes are each
+manageable.
+
+One such scenario is that in your test's `SetUp()` function, you may
+want to put the object you are testing into a certain state, with the
+help from a mock object. Once in the desired state, you want to clear
+all expectations on the mock, such that in the `TEST_F` body you can
+set fresh expectations on it.
+
+As you may have figured out, the `Mock::VerifyAndClearExpectations()`
+function we saw in the previous recipe can help you here. Or, if you
+are using `ON_CALL()` to set default actions on the mock object and
+want to clear the default actions as well, use
+`Mock::VerifyAndClear(&mock_object)` instead. This function does what
+`Mock::VerifyAndClearExpectations(&mock_object)` does and returns the
+same `bool`, **plus** it clears the `ON_CALL()` statements on
+`mock_object` too.
+
+Another trick you can use to achieve the same effect is to put the
+expectations in sequences and insert calls to a dummy "check-point"
+function at specific places. Then you can verify that the mock
+function calls do happen at the right time. For example, if you are
+exercising code:
+
+```
+Foo(1);
+Foo(2);
+Foo(3);
+```
+
+and want to verify that `Foo(1)` and `Foo(3)` both invoke
+`mock.Bar("a")`, but `Foo(2)` doesn't invoke anything. You can write:
+
+```
+using ::testing::MockFunction;
+
+TEST(FooTest, InvokesBarCorrectly) {
+  MyMock mock;
+  // Class MockFunction<F> has exactly one mock method.  It is named
+  // Call() and has type F.
+  MockFunction<void(string check_point_name)> check;
+  {
+    InSequence s;
+
+    EXPECT_CALL(mock, Bar("a"));
+    EXPECT_CALL(check, Call("1"));
+    EXPECT_CALL(check, Call("2"));
+    EXPECT_CALL(mock, Bar("a"));
+  }
+  Foo(1);
+  check.Call("1");
+  Foo(2);
+  check.Call("2");
+  Foo(3);
+}
+```
+
+The expectation spec says that the first `Bar("a")` must happen before
+check point "1", the second `Bar("a")` must happen after check point "2",
+and nothing should happen between the two check points. The explicit
+check points make it easy to tell which `Bar("a")` is called by which
+call to `Foo()`.
+
+## Mocking Destructors ##
+
+Sometimes you want to make sure a mock object is destructed at the
+right time, e.g. after `bar->A()` is called but before `bar->B()` is
+called. We already know that you can specify constraints on the order
+of mock function calls, so all we need to do is to mock the destructor
+of the mock function.
+
+This sounds simple, except for one problem: a destructor is a special
+function with special syntax and special semantics, and the
+`MOCK_METHOD0` macro doesn't work for it:
+
+```
+  MOCK_METHOD0(~MockFoo, void());  // Won't compile!
+```
+
+The good news is that you can use a simple pattern to achieve the same
+effect. First, add a mock function `Die()` to your mock class and call
+it in the destructor, like this:
+
+```
+class MockFoo : public Foo {
+  ...
+  // Add the following two lines to the mock class.
+  MOCK_METHOD0(Die, void());
+  virtual ~MockFoo() { Die(); }
+};
+```
+
+(If the name `Die()` clashes with an existing symbol, choose another
+name.) Now, we have translated the problem of testing when a `MockFoo`
+object dies to testing when its `Die()` method is called:
+
+```
+  MockFoo* foo = new MockFoo;
+  MockBar* bar = new MockBar;
+  ...
+  {
+    InSequence s;
+
+    // Expects *foo to die after bar->A() and before bar->B().
+    EXPECT_CALL(*bar, A());
+    EXPECT_CALL(*foo, Die());
+    EXPECT_CALL(*bar, B());
+  }
+```
+
+And that's that.
+
+## Using Google Mock and Threads ##
+
+**IMPORTANT NOTE:** What we describe in this recipe is **ONLY** true on
+platforms where Google Mock is thread-safe. Currently these are only
+platforms that support the pthreads library (this includes Linux and Mac).
+To make it thread-safe on other platforms we only need to implement
+some synchronization operations in `"gtest/internal/gtest-port.h"`.
+
+In a **unit** test, it's best if you could isolate and test a piece of
+code in a single-threaded context. That avoids race conditions and
+dead locks, and makes debugging your test much easier.
+
+Yet many programs are multi-threaded, and sometimes to test something
+we need to pound on it from more than one thread. Google Mock works
+for this purpose too.
+
+Remember the steps for using a mock:
+
+  1. Create a mock object `foo`.
+  1. Set its default actions and expectations using `ON_CALL()` and `EXPECT_CALL()`.
+  1. The code under test calls methods of `foo`.
+  1. Optionally, verify and reset the mock.
+  1. Destroy the mock yourself, or let the code under test destroy it. The destructor will automatically verify it.
+
+If you follow the following simple rules, your mocks and threads can
+live happily togeter:
+
+  * Execute your _test code_ (as opposed to the code being tested) in _one_ thread. This makes your test easy to follow.
+  * Obviously, you can do step #1 without locking.
+  * When doing step #2 and #5, make sure no other thread is accessing `foo`. Obvious too, huh?
+  * #3 and #4 can be done either in one thread or in multiple threads - anyway you want. Google Mock takes care of the locking, so you don't have to do any - unless required by your test logic.
+
+If you violate the rules (for example, if you set expectations on a
+mock while another thread is calling its methods), you get undefined
+behavior. That's not fun, so don't do it.
+
+Google Mock guarantees that the action for a mock function is done in
+the same thread that called the mock function. For example, in
+
+```
+  EXPECT_CALL(mock, Foo(1))
+      .WillOnce(action1);
+  EXPECT_CALL(mock, Foo(2))
+      .WillOnce(action2);
+```
+
+if `Foo(1)` is called in thread 1 and `Foo(2)` is called in thread 2,
+Google Mock will execute `action1` in thread 1 and `action2` in thread
+2.
+
+Google Mock does _not_ impose a sequence on actions performed in
+different threads (doing so may create deadlocks as the actions may
+need to cooperate). This means that the execution of `action1` and
+`action2` in the above example _may_ interleave. If this is a problem,
+you should add proper synchronization logic to `action1` and `action2`
+to make the test thread-safe.
+
+
+Also, remember that `DefaultValue<T>` is a global resource that
+potentially affects _all_ living mock objects in your
+program. Naturally, you won't want to mess with it from multiple
+threads or when there still are mocks in action.
+
+## Controlling How Much Information Google Mock Prints ##
+
+When Google Mock sees something that has the potential of being an
+error (e.g. a mock function with no expectation is called, a.k.a. an
+uninteresting call, which is allowed but perhaps you forgot to
+explicitly ban the call), it prints some warning messages, including
+the arguments of the function and the return value. Hopefully this
+will remind you to take a look and see if there is indeed a problem.
+
+Sometimes you are confident that your tests are correct and may not
+appreciate such friendly messages. Some other times, you are debugging
+your tests or learning about the behavior of the code you are testing,
+and wish you could observe every mock call that happens (including
+argument values and the return value). Clearly, one size doesn't fit
+all.
+
+You can control how much Google Mock tells you using the
+`--gmock_verbose=LEVEL` command-line flag, where `LEVEL` is a string
+with three possible values:
+
+  * `info`: Google Mock will print all informational messages, warnings, and errors (most verbose). At this setting, Google Mock will also log any calls to the `ON_CALL/EXPECT_CALL` macros.
+  * `warning`: Google Mock will print both warnings and errors (less verbose). This is the default.
+  * `error`: Google Mock will print errors only (least verbose).
+
+Alternatively, you can adjust the value of that flag from within your
+tests like so:
+
+```
+  ::testing::FLAGS_gmock_verbose = "error";
+```
+
+Now, judiciously use the right flag to enable Google Mock serve you better!
+
+## Running Tests in Emacs ##
+
+If you build and run your tests in Emacs, the source file locations of
+Google Mock and [Google Test](http://code.google.com/p/googletest/)
+errors will be highlighted. Just press `<Enter>` on one of them and
+you'll be taken to the offending line. Or, you can just type `C-x ``
+to jump to the next error.
+
+To make it even easier, you can add the following lines to your
+`~/.emacs` file:
+
+```
+(global-set-key "\M-m"   'compile)  ; m is for make
+(global-set-key [M-down] 'next-error)
+(global-set-key [M-up]   '(lambda () (interactive) (next-error -1)))
+```
+
+Then you can type `M-m` to start a build, or `M-up`/`M-down` to move
+back and forth between errors.
+
+## Fusing Google Mock Source Files ##
+
+Google Mock's implementation consists of dozens of files (excluding
+its own tests).  Sometimes you may want them to be packaged up in
+fewer files instead, such that you can easily copy them to a new
+machine and start hacking there.  For this we provide an experimental
+Python script `fuse_gmock_files.py` in the `scripts/` directory
+(starting with release 1.2.0).  Assuming you have Python 2.4 or above
+installed on your machine, just go to that directory and run
+```
+python fuse_gmock_files.py OUTPUT_DIR
+```
+
+and you should see an `OUTPUT_DIR` directory being created with files
+`gtest/gtest.h`, `gmock/gmock.h`, and `gmock-gtest-all.cc` in it.
+These three files contain everything you need to use Google Mock (and
+Google Test).  Just copy them to anywhere you want and you are ready
+to write tests and use mocks.  You can use the
+[scrpts/test/Makefile](http://code.google.com/p/googlemock/source/browse/trunk/scripts/test/Makefile) file as an example on how to compile your tests
+against them.
+
+# Extending Google Mock #
+
+## Writing New Matchers Quickly ##
+
+The `MATCHER*` family of macros can be used to define custom matchers
+easily.  The syntax:
+
+```
+MATCHER(name, description_string_expression) { statements; }
+```
+
+will define a matcher with the given name that executes the
+statements, which must return a `bool` to indicate if the match
+succeeds.  Inside the statements, you can refer to the value being
+matched by `arg`, and refer to its type by `arg_type`.
+
+The description string is a `string`-typed expression that documents
+what the matcher does, and is used to generate the failure message
+when the match fails.  It can (and should) reference the special
+`bool` variable `negation`, and should evaluate to the description of
+the matcher when `negation` is `false`, or that of the matcher's
+negation when `negation` is `true`.
+
+For convenience, we allow the description string to be empty (`""`),
+in which case Google Mock will use the sequence of words in the
+matcher name as the description.
+
+For example:
+```
+MATCHER(IsDivisibleBy7, "") { return (arg % 7) == 0; }
+```
+allows you to write
+```
+  // Expects mock_foo.Bar(n) to be called where n is divisible by 7.
+  EXPECT_CALL(mock_foo, Bar(IsDivisibleBy7()));
+```
+or,
+```
+using ::testing::Not;
+...
+  EXPECT_THAT(some_expression, IsDivisibleBy7());
+  EXPECT_THAT(some_other_expression, Not(IsDivisibleBy7()));
+```
+If the above assertions fail, they will print something like:
+```
+  Value of: some_expression
+  Expected: is divisible by 7
+    Actual: 27
+...
+  Value of: some_other_expression
+  Expected: not (is divisible by 7)
+    Actual: 21
+```
+where the descriptions `"is divisible by 7"` and `"not (is divisible
+by 7)"` are automatically calculated from the matcher name
+`IsDivisibleBy7`.
+
+As you may have noticed, the auto-generated descriptions (especially
+those for the negation) may not be so great. You can always override
+them with a string expression of your own:
+```
+MATCHER(IsDivisibleBy7, std::string(negation ? "isn't" : "is") +
+                        " divisible by 7") {
+  return (arg % 7) == 0;
+}
+```
+
+Optionally, you can stream additional information to a hidden argument
+named `result_listener` to explain the match result. For example, a
+better definition of `IsDivisibleBy7` is:
+```
+MATCHER(IsDivisibleBy7, "") {
+  if ((arg % 7) == 0)
+    return true;
+
+  *result_listener << "the remainder is " << (arg % 7);
+  return false;
+}
+```
+
+With this definition, the above assertion will give a better message:
+```
+  Value of: some_expression
+  Expected: is divisible by 7
+    Actual: 27 (the remainder is 6)
+```
+
+You should let `MatchAndExplain()` print _any additional information_
+that can help a user understand the match result. Note that it should
+explain why the match succeeds in case of a success (unless it's
+obvious) - this is useful when the matcher is used inside
+`Not()`. There is no need to print the argument value itself, as
+Google Mock already prints it for you.
+
+**Notes:**
+
+  1. The type of the value being matched (`arg_type`) is determined by the context in which you use the matcher and is supplied to you by the compiler, so you don't need to worry about declaring it (nor can you).  This allows the matcher to be polymorphic.  For example, `IsDivisibleBy7()` can be used to match any type where the value of `(arg % 7) == 0` can be implicitly converted to a `bool`.  In the `Bar(IsDivisibleBy7())` example above, if method `Bar()` takes an `int`, `arg_type` will be `int`; if it takes an `unsigned long`, `arg_type` will be `unsigned long`; and so on.
+  1. Google Mock doesn't guarantee when or how many times a matcher will be invoked. Therefore the matcher logic must be _purely functional_ (i.e. it cannot have any side effect, and the result must not depend on anything other than the value being matched and the matcher parameters). This requirement must be satisfied no matter how you define the matcher (e.g. using one of the methods described in the following recipes). In particular, a matcher can never call a mock function, as that will affect the state of the mock object and Google Mock.
+
+## Writing New Parameterized Matchers Quickly ##
+
+Sometimes you'll want to define a matcher that has parameters.  For that you
+can use the macro:
+```
+MATCHER_P(name, param_name, description_string) { statements; }
+```
+where the description string can be either `""` or a string expression
+that references `negation` and `param_name`.
+
+For example:
+```
+MATCHER_P(HasAbsoluteValue, value, "") { return abs(arg) == value; }
+```
+will allow you to write:
+```
+  EXPECT_THAT(Blah("a"), HasAbsoluteValue(n));
+```
+which may lead to this message (assuming `n` is 10):
+```
+  Value of: Blah("a")
+  Expected: has absolute value 10
+    Actual: -9
+```
+
+Note that both the matcher description and its parameter are
+printed, making the message human-friendly.
+
+In the matcher definition body, you can write `foo_type` to
+reference the type of a parameter named `foo`.  For example, in the
+body of `MATCHER_P(HasAbsoluteValue, value)` above, you can write
+`value_type` to refer to the type of `value`.
+
+Google Mock also provides `MATCHER_P2`, `MATCHER_P3`, ..., up to
+`MATCHER_P10` to support multi-parameter matchers:
+```
+MATCHER_Pk(name, param_1, ..., param_k, description_string) { statements; }
+```
+
+Please note that the custom description string is for a particular
+**instance** of the matcher, where the parameters have been bound to
+actual values.  Therefore usually you'll want the parameter values to
+be part of the description.  Google Mock lets you do that by
+referencing the matcher parameters in the description string
+expression.
+
+For example,
+```
+  using ::testing::PrintToString;
+  MATCHER_P2(InClosedRange, low, hi,
+             std::string(negation ? "isn't" : "is") + " in range [" +
+             PrintToString(low) + ", " + PrintToString(hi) + "]") {
+    return low <= arg && arg <= hi;
+  }
+  ...
+  EXPECT_THAT(3, InClosedRange(4, 6));
+```
+would generate a failure that contains the message:
+```
+  Expected: is in range [4, 6]
+```
+
+If you specify `""` as the description, the failure message will
+contain the sequence of words in the matcher name followed by the
+parameter values printed as a tuple.  For example,
+```
+  MATCHER_P2(InClosedRange, low, hi, "") { ... }
+  ...
+  EXPECT_THAT(3, InClosedRange(4, 6));
+```
+would generate a failure that contains the text:
+```
+  Expected: in closed range (4, 6)
+```
+
+For the purpose of typing, you can view
+```
+MATCHER_Pk(Foo, p1, ..., pk, description_string) { ... }
+```
+as shorthand for
+```
+template <typename p1_type, ..., typename pk_type>
+FooMatcherPk<p1_type, ..., pk_type>
+Foo(p1_type p1, ..., pk_type pk) { ... }
+```
+
+When you write `Foo(v1, ..., vk)`, the compiler infers the types of
+the parameters `v1`, ..., and `vk` for you.  If you are not happy with
+the result of the type inference, you can specify the types by
+explicitly instantiating the template, as in `Foo<long, bool>(5, false)`.
+As said earlier, you don't get to (or need to) specify
+`arg_type` as that's determined by the context in which the matcher
+is used.
+
+You can assign the result of expression `Foo(p1, ..., pk)` to a
+variable of type `FooMatcherPk<p1_type, ..., pk_type>`.  This can be
+useful when composing matchers.  Matchers that don't have a parameter
+or have only one parameter have special types: you can assign `Foo()`
+to a `FooMatcher`-typed variable, and assign `Foo(p)` to a
+`FooMatcherP<p_type>`-typed variable.
+
+While you can instantiate a matcher template with reference types,
+passing the parameters by pointer usually makes your code more
+readable.  If, however, you still want to pass a parameter by
+reference, be aware that in the failure message generated by the
+matcher you will see the value of the referenced object but not its
+address.
+
+You can overload matchers with different numbers of parameters:
+```
+MATCHER_P(Blah, a, description_string_1) { ... }
+MATCHER_P2(Blah, a, b, description_string_2) { ... }
+```
+
+While it's tempting to always use the `MATCHER*` macros when defining
+a new matcher, you should also consider implementing
+`MatcherInterface` or using `MakePolymorphicMatcher()` instead (see
+the recipes that follow), especially if you need to use the matcher a
+lot.  While these approaches require more work, they give you more
+control on the types of the value being matched and the matcher
+parameters, which in general leads to better compiler error messages
+that pay off in the long run.  They also allow overloading matchers
+based on parameter types (as opposed to just based on the number of
+parameters).
+
+## Writing New Monomorphic Matchers ##
+
+A matcher of argument type `T` implements
+`::testing::MatcherInterface<T>` and does two things: it tests whether a
+value of type `T` matches the matcher, and can describe what kind of
+values it matches. The latter ability is used for generating readable
+error messages when expectations are violated.
+
+The interface looks like this:
+
+```
+class MatchResultListener {
+ public:
+  ...
+  // Streams x to the underlying ostream; does nothing if the ostream
+  // is NULL.
+  template <typename T>
+  MatchResultListener& operator<<(const T& x);
+
+  // Returns the underlying ostream.
+  ::std::ostream* stream();
+};
+
+template <typename T>
+class MatcherInterface {
+ public:
+  virtual ~MatcherInterface();
+
+  // Returns true iff the matcher matches x; also explains the match
+  // result to 'listener'.
+  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const = 0;
+
+  // Describes this matcher to an ostream.
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+
+  // Describes the negation of this matcher to an ostream.
+  virtual void DescribeNegationTo(::std::ostream* os) const;
+};
+```
+
+If you need a custom matcher but `Truly()` is not a good option (for
+example, you may not be happy with the way `Truly(predicate)`
+describes itself, or you may want your matcher to be polymorphic as
+`Eq(value)` is), you can define a matcher to do whatever you want in
+two steps: first implement the matcher interface, and then define a
+factory function to create a matcher instance. The second step is not
+strictly needed but it makes the syntax of using the matcher nicer.
+
+For example, you can define a matcher to test whether an `int` is
+divisible by 7 and then use it like this:
+```
+using ::testing::MakeMatcher;
+using ::testing::Matcher;
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+
+class DivisibleBy7Matcher : public MatcherInterface<int> {
+ public:
+  virtual bool MatchAndExplain(int n, MatchResultListener* listener) const {
+    return (n % 7) == 0;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "is divisible by 7";
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "is not divisible by 7";
+  }
+};
+
+inline Matcher<int> DivisibleBy7() {
+  return MakeMatcher(new DivisibleBy7Matcher);
+}
+...
+
+  EXPECT_CALL(foo, Bar(DivisibleBy7()));
+```
+
+You may improve the matcher message by streaming additional
+information to the `listener` argument in `MatchAndExplain()`:
+
+```
+class DivisibleBy7Matcher : public MatcherInterface<int> {
+ public:
+  virtual bool MatchAndExplain(int n,
+                               MatchResultListener* listener) const {
+    const int remainder = n % 7;
+    if (remainder != 0) {
+      *listener << "the remainder is " << remainder;
+    }
+    return remainder == 0;
+  }
+  ...
+};
+```
+
+Then, `EXPECT_THAT(x, DivisibleBy7());` may general a message like this:
+```
+Value of: x
+Expected: is divisible by 7
+  Actual: 23 (the remainder is 2)
+```
+
+## Writing New Polymorphic Matchers ##
+
+You've learned how to write your own matchers in the previous
+recipe. Just one problem: a matcher created using `MakeMatcher()` only
+works for one particular type of arguments. If you want a
+_polymorphic_ matcher that works with arguments of several types (for
+instance, `Eq(x)` can be used to match a `value` as long as `value` ==
+`x` compiles -- `value` and `x` don't have to share the same type),
+you can learn the trick from `"gmock/gmock-matchers.h"` but it's a bit
+involved.
+
+Fortunately, most of the time you can define a polymorphic matcher
+easily with the help of `MakePolymorphicMatcher()`. Here's how you can
+define `NotNull()` as an example:
+
+```
+using ::testing::MakePolymorphicMatcher;
+using ::testing::MatchResultListener;
+using ::testing::NotNull;
+using ::testing::PolymorphicMatcher;
+
+class NotNullMatcher {
+ public:
+  // To implement a polymorphic matcher, first define a COPYABLE class
+  // that has three members MatchAndExplain(), DescribeTo(), and
+  // DescribeNegationTo(), like the following.
+
+  // In this example, we want to use NotNull() with any pointer, so
+  // MatchAndExplain() accepts a pointer of any type as its first argument.
+  // In general, you can define MatchAndExplain() as an ordinary method or
+  // a method template, or even overload it.
+  template <typename T>
+  bool MatchAndExplain(T* p,
+                       MatchResultListener* /* listener */) const {
+    return p != NULL;
+  }
+
+  // Describes the property of a value matching this matcher.
+  void DescribeTo(::std::ostream* os) const { *os << "is not NULL"; }
+
+  // Describes the property of a value NOT matching this matcher.
+  void DescribeNegationTo(::std::ostream* os) const { *os << "is NULL"; }
+};
+
+// To construct a polymorphic matcher, pass an instance of the class
+// to MakePolymorphicMatcher().  Note the return type.
+inline PolymorphicMatcher<NotNullMatcher> NotNull() {
+  return MakePolymorphicMatcher(NotNullMatcher());
+}
+...
+
+  EXPECT_CALL(foo, Bar(NotNull()));  // The argument must be a non-NULL pointer.
+```
+
+**Note:** Your polymorphic matcher class does **not** need to inherit from
+`MatcherInterface` or any other class, and its methods do **not** need
+to be virtual.
+
+Like in a monomorphic matcher, you may explain the match result by
+streaming additional information to the `listener` argument in
+`MatchAndExplain()`.
+
+## Writing New Cardinalities ##
+
+A cardinality is used in `Times()` to tell Google Mock how many times
+you expect a call to occur. It doesn't have to be exact. For example,
+you can say `AtLeast(5)` or `Between(2, 4)`.
+
+If the built-in set of cardinalities doesn't suit you, you are free to
+define your own by implementing the following interface (in namespace
+`testing`):
+
+```
+class CardinalityInterface {
+ public:
+  virtual ~CardinalityInterface();
+
+  // Returns true iff call_count calls will satisfy this cardinality.
+  virtual bool IsSatisfiedByCallCount(int call_count) const = 0;
+
+  // Returns true iff call_count calls will saturate this cardinality.
+  virtual bool IsSaturatedByCallCount(int call_count) const = 0;
+
+  // Describes self to an ostream.
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+};
+```
+
+For example, to specify that a call must occur even number of times,
+you can write
+
+```
+using ::testing::Cardinality;
+using ::testing::CardinalityInterface;
+using ::testing::MakeCardinality;
+
+class EvenNumberCardinality : public CardinalityInterface {
+ public:
+  virtual bool IsSatisfiedByCallCount(int call_count) const {
+    return (call_count % 2) == 0;
+  }
+
+  virtual bool IsSaturatedByCallCount(int call_count) const {
+    return false;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "called even number of times";
+  }
+};
+
+Cardinality EvenNumber() {
+  return MakeCardinality(new EvenNumberCardinality);
+}
+...
+
+  EXPECT_CALL(foo, Bar(3))
+      .Times(EvenNumber());
+```
+
+## Writing New Actions Quickly ##
+
+If the built-in actions don't work for you, and you find it
+inconvenient to use `Invoke()`, you can use a macro from the `ACTION*`
+family to quickly define a new action that can be used in your code as
+if it's a built-in action.
+
+By writing
+```
+ACTION(name) { statements; }
+```
+in a namespace scope (i.e. not inside a class or function), you will
+define an action with the given name that executes the statements.
+The value returned by `statements` will be used as the return value of
+the action.  Inside the statements, you can refer to the K-th
+(0-based) argument of the mock function as `argK`.  For example:
+```
+ACTION(IncrementArg1) { return ++(*arg1); }
+```
+allows you to write
+```
+... WillOnce(IncrementArg1());
+```
+
+Note that you don't need to specify the types of the mock function
+arguments.  Rest assured that your code is type-safe though:
+you'll get a compiler error if `*arg1` doesn't support the `++`
+operator, or if the type of `++(*arg1)` isn't compatible with the mock
+function's return type.
+
+Another example:
+```
+ACTION(Foo) {
+  (*arg2)(5);
+  Blah();
+  *arg1 = 0;
+  return arg0;
+}
+```
+defines an action `Foo()` that invokes argument #2 (a function pointer)
+with 5, calls function `Blah()`, sets the value pointed to by argument
+#1 to 0, and returns argument #0.
+
+For more convenience and flexibility, you can also use the following
+pre-defined symbols in the body of `ACTION`:
+
+| `argK_type` | The type of the K-th (0-based) argument of the mock function |
+|:------------|:-------------------------------------------------------------|
+| `args`      | All arguments of the mock function as a tuple                |
+| `args_type` | The type of all arguments of the mock function as a tuple    |
+| `return_type` | The return type of the mock function                         |
+| `function_type` | The type of the mock function                                |
+
+For example, when using an `ACTION` as a stub action for mock function:
+```
+int DoSomething(bool flag, int* ptr);
+```
+we have:
+| **Pre-defined Symbol** | **Is Bound To** |
+|:-----------------------|:----------------|
+| `arg0`                 | the value of `flag` |
+| `arg0_type`            | the type `bool` |
+| `arg1`                 | the value of `ptr` |
+| `arg1_type`            | the type `int*` |
+| `args`                 | the tuple `(flag, ptr)` |
+| `args_type`            | the type `std::tr1::tuple<bool, int*>` |
+| `return_type`          | the type `int`  |
+| `function_type`        | the type `int(bool, int*)` |
+
+## Writing New Parameterized Actions Quickly ##
+
+Sometimes you'll want to parameterize an action you define.  For that
+we have another macro
+```
+ACTION_P(name, param) { statements; }
+```
+
+For example,
+```
+ACTION_P(Add, n) { return arg0 + n; }
+```
+will allow you to write
+```
+// Returns argument #0 + 5.
+... WillOnce(Add(5));
+```
+
+For convenience, we use the term _arguments_ for the values used to
+invoke the mock function, and the term _parameters_ for the values
+used to instantiate an action.
+
+Note that you don't need to provide the type of the parameter either.
+Suppose the parameter is named `param`, you can also use the
+Google-Mock-defined symbol `param_type` to refer to the type of the
+parameter as inferred by the compiler.  For example, in the body of
+`ACTION_P(Add, n)` above, you can write `n_type` for the type of `n`.
+
+Google Mock also provides `ACTION_P2`, `ACTION_P3`, and etc to support
+multi-parameter actions.  For example,
+```
+ACTION_P2(ReturnDistanceTo, x, y) {
+  double dx = arg0 - x;
+  double dy = arg1 - y;
+  return sqrt(dx*dx + dy*dy);
+}
+```
+lets you write
+```
+... WillOnce(ReturnDistanceTo(5.0, 26.5));
+```
+
+You can view `ACTION` as a degenerated parameterized action where the
+number of parameters is 0.
+
+You can also easily define actions overloaded on the number of parameters:
+```
+ACTION_P(Plus, a) { ... }
+ACTION_P2(Plus, a, b) { ... }
+```
+
+## Restricting the Type of an Argument or Parameter in an ACTION ##
+
+For maximum brevity and reusability, the `ACTION*` macros don't ask
+you to provide the types of the mock function arguments and the action
+parameters.  Instead, we let the compiler infer the types for us.
+
+Sometimes, however, we may want to be more explicit about the types.
+There are several tricks to do that.  For example:
+```
+ACTION(Foo) {
+  // Makes sure arg0 can be converted to int.
+  int n = arg0;
+  ... use n instead of arg0 here ...
+}
+
+ACTION_P(Bar, param) {
+  // Makes sure the type of arg1 is const char*.
+  ::testing::StaticAssertTypeEq<const char*, arg1_type>();
+
+  // Makes sure param can be converted to bool.
+  bool flag = param;
+}
+```
+where `StaticAssertTypeEq` is a compile-time assertion in Google Test
+that verifies two types are the same.
+
+## Writing New Action Templates Quickly ##
+
+Sometimes you want to give an action explicit template parameters that
+cannot be inferred from its value parameters.  `ACTION_TEMPLATE()`
+supports that and can be viewed as an extension to `ACTION()` and
+`ACTION_P*()`.
+
+The syntax:
+```
+ACTION_TEMPLATE(ActionName,
+                HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m),
+                AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; }
+```
+
+defines an action template that takes _m_ explicit template parameters
+and _n_ value parameters, where _m_ is between 1 and 10, and _n_ is
+between 0 and 10.  `name_i` is the name of the i-th template
+parameter, and `kind_i` specifies whether it's a `typename`, an
+integral constant, or a template.  `p_i` is the name of the i-th value
+parameter.
+
+Example:
+```
+// DuplicateArg<k, T>(output) converts the k-th argument of the mock
+// function to type T and copies it to *output.
+ACTION_TEMPLATE(DuplicateArg,
+                // Note the comma between int and k:
+                HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
+                AND_1_VALUE_PARAMS(output)) {
+  *output = T(std::tr1::get<k>(args));
+}
+```
+
+To create an instance of an action template, write:
+```
+  ActionName<t1, ..., t_m>(v1, ..., v_n)
+```
+where the `t`s are the template arguments and the
+`v`s are the value arguments.  The value argument
+types are inferred by the compiler.  For example:
+```
+using ::testing::_;
+...
+  int n;
+  EXPECT_CALL(mock, Foo(_, _))
+      .WillOnce(DuplicateArg<1, unsigned char>(&n));
+```
+
+If you want to explicitly specify the value argument types, you can
+provide additional template arguments:
+```
+  ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
+```
+where `u_i` is the desired type of `v_i`.
+
+`ACTION_TEMPLATE` and `ACTION`/`ACTION_P*` can be overloaded on the
+number of value parameters, but not on the number of template
+parameters.  Without the restriction, the meaning of the following is
+unclear:
+
+```
+  OverloadedAction<int, bool>(x);
+```
+
+Are we using a single-template-parameter action where `bool` refers to
+the type of `x`, or a two-template-parameter action where the compiler
+is asked to infer the type of `x`?
+
+## Using the ACTION Object's Type ##
+
+If you are writing a function that returns an `ACTION` object, you'll
+need to know its type.  The type depends on the macro used to define
+the action and the parameter types.  The rule is relatively simple:
+| **Given Definition** | **Expression** | **Has Type** |
+|:---------------------|:---------------|:-------------|
+| `ACTION(Foo)`        | `Foo()`        | `FooAction`  |
+| `ACTION_TEMPLATE(Foo, HAS_m_TEMPLATE_PARAMS(...), AND_0_VALUE_PARAMS())` |	`Foo<t1, ..., t_m>()` | `FooAction<t1, ..., t_m>` |
+| `ACTION_P(Bar, param)` | `Bar(int_value)` | `BarActionP<int>` |
+| `ACTION_TEMPLATE(Bar, HAS_m_TEMPLATE_PARAMS(...), AND_1_VALUE_PARAMS(p1))` | `Bar<t1, ..., t_m>(int_value)` | `FooActionP<t1, ..., t_m, int>` |
+| `ACTION_P2(Baz, p1, p2)` | `Baz(bool_value, int_value)` | `BazActionP2<bool, int>` |
+| `ACTION_TEMPLATE(Baz, HAS_m_TEMPLATE_PARAMS(...), AND_2_VALUE_PARAMS(p1, p2))` | `Baz<t1, ..., t_m>(bool_value, int_value)` | `FooActionP2<t1, ..., t_m, bool, int>` |
+| ...                  | ...            | ...          |
+
+Note that we have to pick different suffixes (`Action`, `ActionP`,
+`ActionP2`, and etc) for actions with different numbers of value
+parameters, or the action definitions cannot be overloaded on the
+number of them.
+
+## Writing New Monomorphic Actions ##
+
+While the `ACTION*` macros are very convenient, sometimes they are
+inappropriate.  For example, despite the tricks shown in the previous
+recipes, they don't let you directly specify the types of the mock
+function arguments and the action parameters, which in general leads
+to unoptimized compiler error messages that can baffle unfamiliar
+users.  They also don't allow overloading actions based on parameter
+types without jumping through some hoops.
+
+An alternative to the `ACTION*` macros is to implement
+`::testing::ActionInterface<F>`, where `F` is the type of the mock
+function in which the action will be used. For example:
+
+```
+template <typename F>class ActionInterface {
+ public:
+  virtual ~ActionInterface();
+
+  // Performs the action.  Result is the return type of function type
+  // F, and ArgumentTuple is the tuple of arguments of F.
+  //
+  // For example, if F is int(bool, const string&), then Result would
+  // be int, and ArgumentTuple would be tr1::tuple<bool, const string&>.
+  virtual Result Perform(const ArgumentTuple& args) = 0;
+};
+
+using ::testing::_;
+using ::testing::Action;
+using ::testing::ActionInterface;
+using ::testing::MakeAction;
+
+typedef int IncrementMethod(int*);
+
+class IncrementArgumentAction : public ActionInterface<IncrementMethod> {
+ public:
+  virtual int Perform(const tr1::tuple<int*>& args) {
+    int* p = tr1::get<0>(args);  // Grabs the first argument.
+    return *p++;
+  }
+};
+
+Action<IncrementMethod> IncrementArgument() {
+  return MakeAction(new IncrementArgumentAction);
+}
+...
+
+  EXPECT_CALL(foo, Baz(_))
+      .WillOnce(IncrementArgument());
+
+  int n = 5;
+  foo.Baz(&n);  // Should return 5 and change n to 6.
+```
+
+## Writing New Polymorphic Actions ##
+
+The previous recipe showed you how to define your own action. This is
+all good, except that you need to know the type of the function in
+which the action will be used. Sometimes that can be a problem. For
+example, if you want to use the action in functions with _different_
+types (e.g. like `Return()` and `SetArgPointee()`).
+
+If an action can be used in several types of mock functions, we say
+it's _polymorphic_. The `MakePolymorphicAction()` function template
+makes it easy to define such an action:
+
+```
+namespace testing {
+
+template <typename Impl>
+PolymorphicAction<Impl> MakePolymorphicAction(const Impl& impl);
+
+}  // namespace testing
+```
+
+As an example, let's define an action that returns the second argument
+in the mock function's argument list. The first step is to define an
+implementation class:
+
+```
+class ReturnSecondArgumentAction {
+ public:
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple& args) const {
+    // To get the i-th (0-based) argument, use tr1::get<i>(args).
+    return tr1::get<1>(args);
+  }
+};
+```
+
+This implementation class does _not_ need to inherit from any
+particular class. What matters is that it must have a `Perform()`
+method template. This method template takes the mock function's
+arguments as a tuple in a **single** argument, and returns the result of
+the action. It can be either `const` or not, but must be invokable
+with exactly one template argument, which is the result type. In other
+words, you must be able to call `Perform<R>(args)` where `R` is the
+mock function's return type and `args` is its arguments in a tuple.
+
+Next, we use `MakePolymorphicAction()` to turn an instance of the
+implementation class into the polymorphic action we need. It will be
+convenient to have a wrapper for this:
+
+```
+using ::testing::MakePolymorphicAction;
+using ::testing::PolymorphicAction;
+
+PolymorphicAction<ReturnSecondArgumentAction> ReturnSecondArgument() {
+  return MakePolymorphicAction(ReturnSecondArgumentAction());
+}
+```
+
+Now, you can use this polymorphic action the same way you use the
+built-in ones:
+
+```
+using ::testing::_;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD2(DoThis, int(bool flag, int n));
+  MOCK_METHOD3(DoThat, string(int x, const char* str1, const char* str2));
+};
+...
+
+  MockFoo foo;
+  EXPECT_CALL(foo, DoThis(_, _))
+      .WillOnce(ReturnSecondArgument());
+  EXPECT_CALL(foo, DoThat(_, _, _))
+      .WillOnce(ReturnSecondArgument());
+  ...
+  foo.DoThis(true, 5);         // Will return 5.
+  foo.DoThat(1, "Hi", "Bye");  // Will return "Hi".
+```
+
+## Teaching Google Mock How to Print Your Values ##
+
+When an uninteresting or unexpected call occurs, Google Mock prints the
+argument values and the stack trace to help you debug.  Assertion
+macros like `EXPECT_THAT` and `EXPECT_EQ` also print the values in
+question when the assertion fails.  Google Mock and Google Test do this using
+Google Test's user-extensible value printer.
+
+This printer knows how to print built-in C++ types, native arrays, STL
+containers, and any type that supports the `<<` operator.  For other
+types, it prints the raw bytes in the value and hopes that you the
+user can figure it out.
+[Google Test's advanced guide](http://code.google.com/p/googletest/wiki/V1_6_AdvancedGuide#Teaching_Google_Test_How_to_Print_Your_Values)
+explains how to extend the printer to do a better job at
+printing your particular type than to dump the bytes.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/Documentation.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/Documentation.md
new file mode 100644
index 0000000000..dcc9156c2a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/Documentation.md
@@ -0,0 +1,12 @@
+This page lists all documentation wiki pages for Google Mock **1.6**
+- **if you use a released version of Google Mock, please read the documentation for that specific version instead.**
+
+  * [ForDummies](V1_6_ForDummies.md) -- start here if you are new to Google Mock.
+  * [CheatSheet](V1_6_CheatSheet.md) -- a quick reference.
+  * [CookBook](V1_6_CookBook.md) -- recipes for doing various tasks using Google Mock.
+  * [FrequentlyAskedQuestions](V1_6_FrequentlyAskedQuestions.md) -- check here before asking a question on the mailing list.
+
+To contribute code to Google Mock, read:
+
+  * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
+  * [Pump Manual](http://code.google.com/p/googletest/wiki/V1_6_PumpManual) -- how we generate some of Google Mock's source files.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/ForDummies.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/ForDummies.md
new file mode 100644
index 0000000000..19ee63ab0c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/ForDummies.md
@@ -0,0 +1,439 @@
+
+
+(**Note:** If you get compiler errors that you don't understand, be sure to consult [Google Mock Doctor](http://code.google.com/p/googlemock/wiki/V1_6_FrequentlyAskedQuestions#How_am_I_supposed_to_make_sense_of_these_horrible_template_error).)
+
+# What Is Google C++ Mocking Framework? #
+When you write a prototype or test, often it's not feasible or wise to rely on real objects entirely. A **mock object** implements the same interface as a real object (so it can be used as one), but lets you specify at run time how it will be used and what it should do (which methods will be called? in which order? how many times? with what arguments? what will they return? etc).
+
+**Note:** It is easy to confuse the term _fake objects_ with mock objects. Fakes and mocks actually mean very different things in the Test-Driven Development (TDD) community:
+
+  * **Fake** objects have working implementations, but usually take some shortcut (perhaps to make the operations less expensive), which makes them not suitable for production. An in-memory file system would be an example of a fake.
+  * **Mocks** are objects pre-programmed with _expectations_, which form a specification of the calls they are expected to receive.
+
+If all this seems too abstract for you, don't worry - the most important thing to remember is that a mock allows you to check the _interaction_ between itself and code that uses it. The difference between fakes and mocks will become much clearer once you start to use mocks.
+
+**Google C++ Mocking Framework** (or **Google Mock** for short) is a library (sometimes we also call it a "framework" to make it sound cool) for creating mock classes and using them. It does to C++ what [jMock](http://www.jmock.org/) and [EasyMock](http://www.easymock.org/) do to Java.
+
+Using Google Mock involves three basic steps:
+
+  1. Use some simple macros to describe the interface you want to mock, and they will expand to the implementation of your mock class;
+  1. Create some mock objects and specify its expectations and behavior using an intuitive syntax;
+  1. Exercise code that uses the mock objects. Google Mock will catch any violation of the expectations as soon as it arises.
+
+# Why Google Mock? #
+While mock objects help you remove unnecessary dependencies in tests and make them fast and reliable, using mocks manually in C++ is _hard_:
+
+  * Someone has to implement the mocks. The job is usually tedious and error-prone. No wonder people go great distance to avoid it.
+  * The quality of those manually written mocks is a bit, uh, unpredictable. You may see some really polished ones, but you may also see some that were hacked up in a hurry and have all sorts of ad hoc restrictions.
+  * The knowledge you gained from using one mock doesn't transfer to the next.
+
+In contrast, Java and Python programmers have some fine mock frameworks, which automate the creation of mocks. As a result, mocking is a proven effective technique and widely adopted practice in those communities. Having the right tool absolutely makes the difference.
+
+Google Mock was built to help C++ programmers. It was inspired by [jMock](http://www.jmock.org/) and [EasyMock](http://www.easymock.org/), but designed with C++'s specifics in mind. It is your friend if any of the following problems is bothering you:
+
+  * You are stuck with a sub-optimal design and wish you had done more prototyping before it was too late, but prototyping in C++ is by no means "rapid".
+  * Your tests are slow as they depend on too many libraries or use expensive resources (e.g. a database).
+  * Your tests are brittle as some resources they use are unreliable (e.g. the network).
+  * You want to test how your code handles a failure (e.g. a file checksum error), but it's not easy to cause one.
+  * You need to make sure that your module interacts with other modules in the right way, but it's hard to observe the interaction; therefore you resort to observing the side effects at the end of the action, which is awkward at best.
+  * You want to "mock out" your dependencies, except that they don't have mock implementations yet; and, frankly, you aren't thrilled by some of those hand-written mocks.
+
+We encourage you to use Google Mock as:
+
+  * a _design_ tool, for it lets you experiment with your interface design early and often. More iterations lead to better designs!
+  * a _testing_ tool to cut your tests' outbound dependencies and probe the interaction between your module and its collaborators.
+
+# Getting Started #
+Using Google Mock is easy! Inside your C++ source file, just `#include` `"gtest/gtest.h"` and `"gmock/gmock.h"`, and you are ready to go.
+
+# A Case for Mock Turtles #
+Let's look at an example. Suppose you are developing a graphics program that relies on a LOGO-like API for drawing. How would you test that it does the right thing? Well, you can run it and compare the screen with a golden screen snapshot, but let's admit it: tests like this are expensive to run and fragile (What if you just upgraded to a shiny new graphics card that has better anti-aliasing? Suddenly you have to update all your golden images.). It would be too painful if all your tests are like this. Fortunately, you learned about Dependency Injection and know the right thing to do: instead of having your application talk to the drawing API directly, wrap the API in an interface (say, `Turtle`) and code to that interface:
+
+```
+class Turtle {
+  ...
+  virtual ~Turtle() {}
+  virtual void PenUp() = 0;
+  virtual void PenDown() = 0;
+  virtual void Forward(int distance) = 0;
+  virtual void Turn(int degrees) = 0;
+  virtual void GoTo(int x, int y) = 0;
+  virtual int GetX() const = 0;
+  virtual int GetY() const = 0;
+};
+```
+
+(Note that the destructor of `Turtle` **must** be virtual, as is the case for **all** classes you intend to inherit from - otherwise the destructor of the derived class will not be called when you delete an object through a base pointer, and you'll get corrupted program states like memory leaks.)
+
+You can control whether the turtle's movement will leave a trace using `PenUp()` and `PenDown()`, and control its movement using `Forward()`, `Turn()`, and `GoTo()`. Finally, `GetX()` and `GetY()` tell you the current position of the turtle.
+
+Your program will normally use a real implementation of this interface. In tests, you can use a mock implementation instead. This allows you to easily check what drawing primitives your program is calling, with what arguments, and in which order. Tests written this way are much more robust (they won't break because your new machine does anti-aliasing differently), easier to read and maintain (the intent of a test is expressed in the code, not in some binary images), and run _much, much faster_.
+
+# Writing the Mock Class #
+If you are lucky, the mocks you need to use have already been implemented by some nice people. If, however, you find yourself in the position to write a mock class, relax - Google Mock turns this task into a fun game! (Well, almost.)
+
+## How to Define It ##
+Using the `Turtle` interface as example, here are the simple steps you need to follow:
+
+  1. Derive a class `MockTurtle` from `Turtle`.
+  1. Take a _virtual_ function of `Turtle` (while it's possible to [mock non-virtual methods using templates](http://code.google.com/p/googlemock/wiki/V1_6_CookBook#Mocking_Nonvirtual_Methods), it's much more involved). Count how many arguments it has.
+  1. In the `public:` section of the child class, write `MOCK_METHODn();` (or `MOCK_CONST_METHODn();` if you are mocking a `const` method), where `n` is the number of the arguments; if you counted wrong, shame on you, and a compiler error will tell you so.
+  1. Now comes the fun part: you take the function signature, cut-and-paste the _function name_ as the _first_ argument to the macro, and leave what's left as the _second_ argument (in case you're curious, this is the _type of the function_).
+  1. Repeat until all virtual functions you want to mock are done.
+
+After the process, you should have something like:
+
+```
+#include "gmock/gmock.h"  // Brings in Google Mock.
+class MockTurtle : public Turtle {
+ public:
+  ...
+  MOCK_METHOD0(PenUp, void());
+  MOCK_METHOD0(PenDown, void());
+  MOCK_METHOD1(Forward, void(int distance));
+  MOCK_METHOD1(Turn, void(int degrees));
+  MOCK_METHOD2(GoTo, void(int x, int y));
+  MOCK_CONST_METHOD0(GetX, int());
+  MOCK_CONST_METHOD0(GetY, int());
+};
+```
+
+You don't need to define these mock methods somewhere else - the `MOCK_METHOD*` macros will generate the definitions for you. It's that simple! Once you get the hang of it, you can pump out mock classes faster than your source-control system can handle your check-ins.
+
+**Tip:** If even this is too much work for you, you'll find the
+`gmock_gen.py` tool in Google Mock's `scripts/generator/` directory (courtesy of the [cppclean](http://code.google.com/p/cppclean/) project) useful.  This command-line
+tool requires that you have Python 2.4 installed.  You give it a C++ file and the name of an abstract class defined in it,
+and it will print the definition of the mock class for you.  Due to the
+complexity of the C++ language, this script may not always work, but
+it can be quite handy when it does.  For more details, read the [user documentation](http://code.google.com/p/googlemock/source/browse/trunk/scripts/generator/README).
+
+## Where to Put It ##
+When you define a mock class, you need to decide where to put its definition. Some people put it in a `*_test.cc`. This is fine when the interface being mocked (say, `Foo`) is owned by the same person or team. Otherwise, when the owner of `Foo` changes it, your test could break. (You can't really expect `Foo`'s maintainer to fix every test that uses `Foo`, can you?)
+
+So, the rule of thumb is: if you need to mock `Foo` and it's owned by others, define the mock class in `Foo`'s package (better, in a `testing` sub-package such that you can clearly separate production code and testing utilities), and put it in a `mock_foo.h`. Then everyone can reference `mock_foo.h` from their tests. If `Foo` ever changes, there is only one copy of `MockFoo` to change, and only tests that depend on the changed methods need to be fixed.
+
+Another way to do it: you can introduce a thin layer `FooAdaptor` on top of `Foo` and code to this new interface. Since you own `FooAdaptor`, you can absorb changes in `Foo` much more easily. While this is more work initially, carefully choosing the adaptor interface can make your code easier to write and more readable (a net win in the long run), as you can choose `FooAdaptor` to fit your specific domain much better than `Foo` does.
+
+# Using Mocks in Tests #
+Once you have a mock class, using it is easy. The typical work flow is:
+
+  1. Import the Google Mock names from the `testing` namespace such that you can use them unqualified (You only have to do it once per file. Remember that namespaces are a good idea and good for your health.).
+  1. Create some mock objects.
+  1. Specify your expectations on them (How many times will a method be called? With what arguments? What should it do? etc.).
+  1. Exercise some code that uses the mocks; optionally, check the result using Google Test assertions. If a mock method is called more than expected or with wrong arguments, you'll get an error immediately.
+  1. When a mock is destructed, Google Mock will automatically check whether all expectations on it have been satisfied.
+
+Here's an example:
+
+```
+#include "path/to/mock-turtle.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+using ::testing::AtLeast;                     // #1
+
+TEST(PainterTest, CanDrawSomething) {
+  MockTurtle turtle;                          // #2
+  EXPECT_CALL(turtle, PenDown())              // #3
+      .Times(AtLeast(1));
+
+  Painter painter(&turtle);                   // #4
+
+  EXPECT_TRUE(painter.DrawCircle(0, 0, 10));
+}                                             // #5
+
+int main(int argc, char** argv) {
+  // The following line must be executed to initialize Google Mock
+  // (and Google Test) before running the tests.
+  ::testing::InitGoogleMock(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+```
+
+As you might have guessed, this test checks that `PenDown()` is called at least once. If the `painter` object didn't call this method, your test will fail with a message like this:
+
+```
+path/to/my_test.cc:119: Failure
+Actual function call count doesn't match this expectation:
+Actually: never called;
+Expected: called at least once.
+```
+
+**Tip 1:** If you run the test from an Emacs buffer, you can hit `<Enter>` on the line number displayed in the error message to jump right to the failed expectation.
+
+**Tip 2:** If your mock objects are never deleted, the final verification won't happen. Therefore it's a good idea to use a heap leak checker in your tests when you allocate mocks on the heap.
+
+**Important note:** Google Mock requires expectations to be set **before** the mock functions are called, otherwise the behavior is **undefined**. In particular, you mustn't interleave `EXPECT_CALL()`s and calls to the mock functions.
+
+This means `EXPECT_CALL()` should be read as expecting that a call will occur _in the future_, not that a call has occurred. Why does Google Mock work like that? Well, specifying the expectation beforehand allows Google Mock to report a violation as soon as it arises, when the context (stack trace, etc) is still available. This makes debugging much easier.
+
+Admittedly, this test is contrived and doesn't do much. You can easily achieve the same effect without using Google Mock. However, as we shall reveal soon, Google Mock allows you to do _much more_ with the mocks.
+
+## Using Google Mock with Any Testing Framework ##
+If you want to use something other than Google Test (e.g. [CppUnit](http://apps.sourceforge.net/mediawiki/cppunit/index.php?title=Main_Page) or
+[CxxTest](http://cxxtest.tigris.org/)) as your testing framework, just change the `main()` function in the previous section to:
+```
+int main(int argc, char** argv) {
+  // The following line causes Google Mock to throw an exception on failure,
+  // which will be interpreted by your testing framework as a test failure.
+  ::testing::GTEST_FLAG(throw_on_failure) = true;
+  ::testing::InitGoogleMock(&argc, argv);
+  ... whatever your testing framework requires ...
+}
+```
+
+This approach has a catch: it makes Google Mock throw an exception
+from a mock object's destructor sometimes.  With some compilers, this
+sometimes causes the test program to crash.  You'll still be able to
+notice that the test has failed, but it's not a graceful failure.
+
+A better solution is to use Google Test's
+[event listener API](http://code.google.com/p/googletest/wiki/V1_6_AdvancedGuide#Extending_Google_Test_by_Handling_Test_Events)
+to report a test failure to your testing framework properly.  You'll need to
+implement the `OnTestPartResult()` method of the event listener interface, but it
+should be straightforward.
+
+If this turns out to be too much work, we suggest that you stick with
+Google Test, which works with Google Mock seamlessly (in fact, it is
+technically part of Google Mock.).  If there is a reason that you
+cannot use Google Test, please let us know.
+
+# Setting Expectations #
+The key to using a mock object successfully is to set the _right expectations_ on it. If you set the expectations too strict, your test will fail as the result of unrelated changes. If you set them too loose, bugs can slip through. You want to do it just right such that your test can catch exactly the kind of bugs you intend it to catch. Google Mock provides the necessary means for you to do it "just right."
+
+## General Syntax ##
+In Google Mock we use the `EXPECT_CALL()` macro to set an expectation on a mock method. The general syntax is:
+
+```
+EXPECT_CALL(mock_object, method(matchers))
+    .Times(cardinality)
+    .WillOnce(action)
+    .WillRepeatedly(action);
+```
+
+The macro has two arguments: first the mock object, and then the method and its arguments. Note that the two are separated by a comma (`,`), not a period (`.`). (Why using a comma? The answer is that it was necessary for technical reasons.)
+
+The macro can be followed by some optional _clauses_ that provide more information about the expectation. We'll discuss how each clause works in the coming sections.
+
+This syntax is designed to make an expectation read like English. For example, you can probably guess that
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetX())
+    .Times(5)
+    .WillOnce(Return(100))
+    .WillOnce(Return(150))
+    .WillRepeatedly(Return(200));
+```
+
+says that the `turtle` object's `GetX()` method will be called five times, it will return 100 the first time, 150 the second time, and then 200 every time. Some people like to call this style of syntax a Domain-Specific Language (DSL).
+
+**Note:** Why do we use a macro to do this? It serves two purposes: first it makes expectations easily identifiable (either by `grep` or by a human reader), and second it allows Google Mock to include the source file location of a failed expectation in messages, making debugging easier.
+
+## Matchers: What Arguments Do We Expect? ##
+When a mock function takes arguments, we must specify what arguments we are expecting; for example:
+
+```
+// Expects the turtle to move forward by 100 units.
+EXPECT_CALL(turtle, Forward(100));
+```
+
+Sometimes you may not want to be too specific (Remember that talk about tests being too rigid? Over specification leads to brittle tests and obscures the intent of tests. Therefore we encourage you to specify only what's necessary - no more, no less.). If you care to check that `Forward()` will be called but aren't interested in its actual argument, write `_` as the argument, which means "anything goes":
+
+```
+using ::testing::_;
+...
+// Expects the turtle to move forward.
+EXPECT_CALL(turtle, Forward(_));
+```
+
+`_` is an instance of what we call **matchers**. A matcher is like a predicate and can test whether an argument is what we'd expect. You can use a matcher inside `EXPECT_CALL()` wherever a function argument is expected.
+
+A list of built-in matchers can be found in the [CheatSheet](V1_6_CheatSheet.md). For example, here's the `Ge` (greater than or equal) matcher:
+
+```
+using ::testing::Ge;...
+EXPECT_CALL(turtle, Forward(Ge(100)));
+```
+
+This checks that the turtle will be told to go forward by at least 100 units.
+
+## Cardinalities: How Many Times Will It Be Called? ##
+The first clause we can specify following an `EXPECT_CALL()` is `Times()`. We call its argument a **cardinality** as it tells _how many times_ the call should occur. It allows us to repeat an expectation many times without actually writing it as many times. More importantly, a cardinality can be "fuzzy", just like a matcher can be. This allows a user to express the intent of a test exactly.
+
+An interesting special case is when we say `Times(0)`. You may have guessed - it means that the function shouldn't be called with the given arguments at all, and Google Mock will report a Google Test failure whenever the function is (wrongfully) called.
+
+We've seen `AtLeast(n)` as an example of fuzzy cardinalities earlier. For the list of built-in cardinalities you can use, see the [CheatSheet](V1_6_CheatSheet.md).
+
+The `Times()` clause can be omitted. **If you omit `Times()`, Google Mock will infer the cardinality for you.** The rules are easy to remember:
+
+  * If **neither** `WillOnce()` **nor** `WillRepeatedly()` is in the `EXPECT_CALL()`, the inferred cardinality is `Times(1)`.
+  * If there are `n WillOnce()`'s but **no** `WillRepeatedly()`, where `n` >= 1, the cardinality is `Times(n)`.
+  * If there are `n WillOnce()`'s and **one** `WillRepeatedly()`, where `n` >= 0, the cardinality is `Times(AtLeast(n))`.
+
+**Quick quiz:** what do you think will happen if a function is expected to be called twice but actually called four times?
+
+## Actions: What Should It Do? ##
+Remember that a mock object doesn't really have a working implementation? We as users have to tell it what to do when a method is invoked. This is easy in Google Mock.
+
+First, if the return type of a mock function is a built-in type or a pointer, the function has a **default action** (a `void` function will just return, a `bool` function will return `false`, and other functions will return 0). If you don't say anything, this behavior will be used.
+
+Second, if a mock function doesn't have a default action, or the default action doesn't suit you, you can specify the action to be taken each time the expectation matches using a series of `WillOnce()` clauses followed by an optional `WillRepeatedly()`. For example,
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetX())
+    .WillOnce(Return(100))
+    .WillOnce(Return(200))
+    .WillOnce(Return(300));
+```
+
+This says that `turtle.GetX()` will be called _exactly three times_ (Google Mock inferred this from how many `WillOnce()` clauses we've written, since we didn't explicitly write `Times()`), and will return 100, 200, and 300 respectively.
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetY())
+    .WillOnce(Return(100))
+    .WillOnce(Return(200))
+    .WillRepeatedly(Return(300));
+```
+
+says that `turtle.GetY()` will be called _at least twice_ (Google Mock knows this as we've written two `WillOnce()` clauses and a `WillRepeatedly()` while having no explicit `Times()`), will return 100 the first time, 200 the second time, and 300 from the third time on.
+
+Of course, if you explicitly write a `Times()`, Google Mock will not try to infer the cardinality itself. What if the number you specified is larger than there are `WillOnce()` clauses? Well, after all `WillOnce()`s are used up, Google Mock will do the _default_ action for the function every time (unless, of course, you have a `WillRepeatedly()`.).
+
+What can we do inside `WillOnce()` besides `Return()`? You can return a reference using `ReturnRef(variable)`, or invoke a pre-defined function, among [others](http://code.google.com/p/googlemock/wiki/V1_6_CheatSheet#Actions).
+
+**Important note:** The `EXPECT_CALL()` statement evaluates the action clause only once, even though the action may be performed many times. Therefore you must be careful about side effects. The following may not do what you want:
+
+```
+int n = 100;
+EXPECT_CALL(turtle, GetX())
+.Times(4)
+.WillRepeatedly(Return(n++));
+```
+
+Instead of returning 100, 101, 102, ..., consecutively, this mock function will always return 100 as `n++` is only evaluated once. Similarly, `Return(new Foo)` will create a new `Foo` object when the `EXPECT_CALL()` is executed, and will return the same pointer every time. If you want the side effect to happen every time, you need to define a custom action, which we'll teach in the [CookBook](V1_6_CookBook.md).
+
+Time for another quiz! What do you think the following means?
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetY())
+.Times(4)
+.WillOnce(Return(100));
+```
+
+Obviously `turtle.GetY()` is expected to be called four times. But if you think it will return 100 every time, think twice! Remember that one `WillOnce()` clause will be consumed each time the function is invoked and the default action will be taken afterwards. So the right answer is that `turtle.GetY()` will return 100 the first time, but **return 0 from the second time on**, as returning 0 is the default action for `int` functions.
+
+## Using Multiple Expectations ##
+So far we've only shown examples where you have a single expectation. More realistically, you're going to specify expectations on multiple mock methods, which may be from multiple mock objects.
+
+By default, when a mock method is invoked, Google Mock will search the expectations in the **reverse order** they are defined, and stop when an active expectation that matches the arguments is found (you can think of it as "newer rules override older ones."). If the matching expectation cannot take any more calls, you will get an upper-bound-violated failure. Here's an example:
+
+```
+using ::testing::_;...
+EXPECT_CALL(turtle, Forward(_));  // #1
+EXPECT_CALL(turtle, Forward(10))  // #2
+    .Times(2);
+```
+
+If `Forward(10)` is called three times in a row, the third time it will be an error, as the last matching expectation (#2) has been saturated. If, however, the third `Forward(10)` call is replaced by `Forward(20)`, then it would be OK, as now #1 will be the matching expectation.
+
+**Side note:** Why does Google Mock search for a match in the _reverse_ order of the expectations? The reason is that this allows a user to set up the default expectations in a mock object's constructor or the test fixture's set-up phase and then customize the mock by writing more specific expectations in the test body. So, if you have two expectations on the same method, you want to put the one with more specific matchers **after** the other, or the more specific rule would be shadowed by the more general one that comes after it.
+
+## Ordered vs Unordered Calls ##
+By default, an expectation can match a call even though an earlier expectation hasn't been satisfied. In other words, the calls don't have to occur in the order the expectations are specified.
+
+Sometimes, you may want all the expected calls to occur in a strict order. To say this in Google Mock is easy:
+
+```
+using ::testing::InSequence;...
+TEST(FooTest, DrawsLineSegment) {
+  ...
+  {
+    InSequence dummy;
+
+    EXPECT_CALL(turtle, PenDown());
+    EXPECT_CALL(turtle, Forward(100));
+    EXPECT_CALL(turtle, PenUp());
+  }
+  Foo();
+}
+```
+
+By creating an object of type `InSequence`, all expectations in its scope are put into a _sequence_ and have to occur _sequentially_. Since we are just relying on the constructor and destructor of this object to do the actual work, its name is really irrelevant.
+
+In this example, we test that `Foo()` calls the three expected functions in the order as written. If a call is made out-of-order, it will be an error.
+
+(What if you care about the relative order of some of the calls, but not all of them? Can you specify an arbitrary partial order? The answer is ... yes! If you are impatient, the details can be found in the [CookBook](V1_6_CookBook.md).)
+
+## All Expectations Are Sticky (Unless Said Otherwise) ##
+Now let's do a quick quiz to see how well you can use this mock stuff already. How would you test that the turtle is asked to go to the origin _exactly twice_ (you want to ignore any other instructions it receives)?
+
+After you've come up with your answer, take a look at ours and compare notes (solve it yourself first - don't cheat!):
+
+```
+using ::testing::_;...
+EXPECT_CALL(turtle, GoTo(_, _))  // #1
+    .Times(AnyNumber());
+EXPECT_CALL(turtle, GoTo(0, 0))  // #2
+    .Times(2);
+```
+
+Suppose `turtle.GoTo(0, 0)` is called three times. In the third time, Google Mock will see that the arguments match expectation #2 (remember that we always pick the last matching expectation). Now, since we said that there should be only two such calls, Google Mock will report an error immediately. This is basically what we've told you in the "Using Multiple Expectations" section above.
+
+This example shows that **expectations in Google Mock are "sticky" by default**, in the sense that they remain active even after we have reached their invocation upper bounds. This is an important rule to remember, as it affects the meaning of the spec, and is **different** to how it's done in many other mocking frameworks (Why'd we do that? Because we think our rule makes the common cases easier to express and understand.).
+
+Simple? Let's see if you've really understood it: what does the following code say?
+
+```
+using ::testing::Return;
+...
+for (int i = n; i > 0; i--) {
+  EXPECT_CALL(turtle, GetX())
+      .WillOnce(Return(10*i));
+}
+```
+
+If you think it says that `turtle.GetX()` will be called `n` times and will return 10, 20, 30, ..., consecutively, think twice! The problem is that, as we said, expectations are sticky. So, the second time `turtle.GetX()` is called, the last (latest) `EXPECT_CALL()` statement will match, and will immediately lead to an "upper bound exceeded" error - this piece of code is not very useful!
+
+One correct way of saying that `turtle.GetX()` will return 10, 20, 30, ..., is to explicitly say that the expectations are _not_ sticky. In other words, they should _retire_ as soon as they are saturated:
+
+```
+using ::testing::Return;
+...
+for (int i = n; i > 0; i--) {
+  EXPECT_CALL(turtle, GetX())
+    .WillOnce(Return(10*i))
+    .RetiresOnSaturation();
+}
+```
+
+And, there's a better way to do it: in this case, we expect the calls to occur in a specific order, and we line up the actions to match the order. Since the order is important here, we should make it explicit using a sequence:
+
+```
+using ::testing::InSequence;
+using ::testing::Return;
+...
+{
+  InSequence s;
+
+  for (int i = 1; i <= n; i++) {
+    EXPECT_CALL(turtle, GetX())
+        .WillOnce(Return(10*i))
+        .RetiresOnSaturation();
+  }
+}
+```
+
+By the way, the other situation where an expectation may _not_ be sticky is when it's in a sequence - as soon as another expectation that comes after it in the sequence has been used, it automatically retires (and will never be used to match any call).
+
+## Uninteresting Calls ##
+A mock object may have many methods, and not all of them are that interesting. For example, in some tests we may not care about how many times `GetX()` and `GetY()` get called.
+
+In Google Mock, if you are not interested in a method, just don't say anything about it. If a call to this method occurs, you'll see a warning in the test output, but it won't be a failure.
+
+# What Now? #
+Congratulations! You've learned enough about Google Mock to start using it. Now, you might want to join the [googlemock](http://groups.google.com/group/googlemock) discussion group and actually write some tests using Google Mock - it will be fun. Hey, it may even be addictive - you've been warned.
+
+Then, if you feel like increasing your mock quotient, you should move on to the [CookBook](V1_6_CookBook.md). You can learn many advanced features of Google Mock there -- and advance your level of enjoyment and testing bliss.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/FrequentlyAskedQuestions.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/FrequentlyAskedQuestions.md
new file mode 100644
index 0000000000..f74715d2e3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_6/FrequentlyAskedQuestions.md
@@ -0,0 +1,628 @@
+
+
+Please send your questions to the
+[googlemock](http://groups.google.com/group/googlemock) discussion
+group. If you need help with compiler errors, make sure you have
+tried [Google Mock Doctor](#How_am_I_supposed_to_make_sense_of_these_horrible_template_error.md) first.
+
+## When I call a method on my mock object, the method for the real object is invoked instead.  What's the problem? ##
+
+In order for a method to be mocked, it must be _virtual_, unless you use the [high-perf dependency injection technique](http://code.google.com/p/googlemock/wiki/V1_6_CookBook#Mocking_Nonvirtual_Methods).
+
+## I wrote some matchers.  After I upgraded to a new version of Google Mock, they no longer compile.  What's going on? ##
+
+After version 1.4.0 of Google Mock was released, we had an idea on how
+to make it easier to write matchers that can generate informative
+messages efficiently.  We experimented with this idea and liked what
+we saw.  Therefore we decided to implement it.
+
+Unfortunately, this means that if you have defined your own matchers
+by implementing `MatcherInterface` or using `MakePolymorphicMatcher()`,
+your definitions will no longer compile.  Matchers defined using the
+`MATCHER*` family of macros are not affected.
+
+Sorry for the hassle if your matchers are affected.  We believe it's
+in everyone's long-term interest to make this change sooner than
+later.  Fortunately, it's usually not hard to migrate an existing
+matcher to the new API.  Here's what you need to do:
+
+If you wrote your matcher like this:
+```
+// Old matcher definition that doesn't work with the latest
+// Google Mock.
+using ::testing::MatcherInterface;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetFoo() > 5;
+  }
+  ...
+};
+```
+
+you'll need to change it to:
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool MatchAndExplain(MyType value,
+                               MatchResultListener* listener) const {
+    // Returns true if value matches.
+    return value.GetFoo() > 5;
+  }
+  ...
+};
+```
+(i.e. rename `Matches()` to `MatchAndExplain()` and give it a second
+argument of type `MatchResultListener*`.)
+
+If you were also using `ExplainMatchResultTo()` to improve the matcher
+message:
+```
+// Old matcher definition that doesn't work with the lastest
+// Google Mock.
+using ::testing::MatcherInterface;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetFoo() > 5;
+  }
+
+  virtual void ExplainMatchResultTo(MyType value,
+                                    ::std::ostream* os) const {
+    // Prints some helpful information to os to help
+    // a user understand why value matches (or doesn't match).
+    *os << "the Foo property is " << value.GetFoo();
+  }
+  ...
+};
+```
+
+you should move the logic of `ExplainMatchResultTo()` into
+`MatchAndExplain()`, using the `MatchResultListener` argument where
+the `::std::ostream` was used:
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool MatchAndExplain(MyType value,
+                               MatchResultListener* listener) const {
+    // Returns true if value matches.
+    *listener << "the Foo property is " << value.GetFoo();
+    return value.GetFoo() > 5;
+  }
+  ...
+};
+```
+
+If your matcher is defined using `MakePolymorphicMatcher()`:
+```
+// Old matcher definition that doesn't work with the latest
+// Google Mock.
+using ::testing::MakePolymorphicMatcher;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetBar() < 42;
+  }
+  ...
+};
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+you should rename the `Matches()` method to `MatchAndExplain()` and
+add a `MatchResultListener*` argument (the same as what you need to do
+for matchers defined by implementing `MatcherInterface`):
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MakePolymorphicMatcher;
+using ::testing::MatchResultListener;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool MatchAndExplain(MyType value,
+                       MatchResultListener* listener) const {
+    // Returns true if value matches.
+    return value.GetBar() < 42;
+  }
+  ...
+};
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+If your polymorphic matcher uses `ExplainMatchResultTo()` for better
+failure messages:
+```
+// Old matcher definition that doesn't work with the latest
+// Google Mock.
+using ::testing::MakePolymorphicMatcher;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetBar() < 42;
+  }
+  ...
+};
+void ExplainMatchResultTo(const MyGreatMatcher& matcher,
+                          MyType value,
+                          ::std::ostream* os) {
+  // Prints some helpful information to os to help
+  // a user understand why value matches (or doesn't match).
+  *os << "the Bar property is " << value.GetBar();
+}
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+you'll need to move the logic inside `ExplainMatchResultTo()` to
+`MatchAndExplain()`:
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MakePolymorphicMatcher;
+using ::testing::MatchResultListener;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool MatchAndExplain(MyType value,
+                       MatchResultListener* listener) const {
+    // Returns true if value matches.
+    *listener << "the Bar property is " << value.GetBar();
+    return value.GetBar() < 42;
+  }
+  ...
+};
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+For more information, you can read these
+[two](http://code.google.com/p/googlemock/wiki/V1_6_CookBook#Writing_New_Monomorphic_Matchers)
+[recipes](http://code.google.com/p/googlemock/wiki/V1_6_CookBook#Writing_New_Polymorphic_Matchers)
+from the cookbook.  As always, you
+are welcome to post questions on `googlemock@googlegroups.com` if you
+need any help.
+
+## When using Google Mock, do I have to use Google Test as the testing framework?  I have my favorite testing framework and don't want to switch. ##
+
+Google Mock works out of the box with Google Test.  However, it's easy
+to configure it to work with any testing framework of your choice.
+[Here](http://code.google.com/p/googlemock/wiki/V1_6_ForDummies#Using_Google_Mock_with_Any_Testing_Framework) is how.
+
+## How am I supposed to make sense of these horrible template errors? ##
+
+If you are confused by the compiler errors gcc threw at you,
+try consulting the _Google Mock Doctor_ tool first.  What it does is to
+scan stdin for gcc error messages, and spit out diagnoses on the
+problems (we call them diseases) your code has.
+
+To "install", run command:
+```
+alias gmd='<path to googlemock>/scripts/gmock_doctor.py'
+```
+
+To use it, do:
+```
+<your-favorite-build-command> <your-test> 2>&1 | gmd
+```
+
+For example:
+```
+make my_test 2>&1 | gmd
+```
+
+Or you can run `gmd` and copy-n-paste gcc's error messages to it.
+
+## Can I mock a variadic function? ##
+
+You cannot mock a variadic function (i.e. a function taking ellipsis
+(`...`) arguments) directly in Google Mock.
+
+The problem is that in general, there is _no way_ for a mock object to
+know how many arguments are passed to the variadic method, and what
+the arguments' types are.  Only the _author of the base class_ knows
+the protocol, and we cannot look into his head.
+
+Therefore, to mock such a function, the _user_ must teach the mock
+object how to figure out the number of arguments and their types.  One
+way to do it is to provide overloaded versions of the function.
+
+Ellipsis arguments are inherited from C and not really a C++ feature.
+They are unsafe to use and don't work with arguments that have
+constructors or destructors.  Therefore we recommend to avoid them in
+C++ as much as possible.
+
+## MSVC gives me warning C4301 or C4373 when I define a mock method with a const parameter.  Why? ##
+
+If you compile this using Microsoft Visual C++ 2005 SP1:
+```
+class Foo {
+  ...
+  virtual void Bar(const int i) = 0;
+};
+
+class MockFoo : public Foo {
+  ...
+  MOCK_METHOD1(Bar, void(const int i));
+};
+```
+You may get the following warning:
+```
+warning C4301: 'MockFoo::Bar': overriding virtual function only differs from 'Foo::Bar' by const/volatile qualifier
+```
+
+This is a MSVC bug.  The same code compiles fine with gcc ,for
+example.  If you use Visual C++ 2008 SP1, you would get the warning:
+```
+warning C4373: 'MockFoo::Bar': virtual function overrides 'Foo::Bar', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers
+```
+
+In C++, if you _declare_ a function with a `const` parameter, the
+`const` modifier is _ignored_.  Therefore, the `Foo` base class above
+is equivalent to:
+```
+class Foo {
+  ...
+  virtual void Bar(int i) = 0;  // int or const int?  Makes no difference.
+};
+```
+
+In fact, you can _declare_ Bar() with an `int` parameter, and _define_
+it with a `const int` parameter.  The compiler will still match them
+up.
+
+Since making a parameter `const` is meaningless in the method
+_declaration_, we recommend to remove it in both `Foo` and `MockFoo`.
+That should workaround the VC bug.
+
+Note that we are talking about the _top-level_ `const` modifier here.
+If the function parameter is passed by pointer or reference, declaring
+the _pointee_ or _referee_ as `const` is still meaningful.  For
+example, the following two declarations are _not_ equivalent:
+```
+void Bar(int* p);        // Neither p nor *p is const.
+void Bar(const int* p);  // p is not const, but *p is.
+```
+
+## I have a huge mock class, and Microsoft Visual C++ runs out of memory when compiling it.  What can I do? ##
+
+We've noticed that when the `/clr` compiler flag is used, Visual C++
+uses 5~6 times as much memory when compiling a mock class.  We suggest
+to avoid `/clr` when compiling native C++ mocks.
+
+## I can't figure out why Google Mock thinks my expectations are not satisfied.  What should I do? ##
+
+You might want to run your test with
+`--gmock_verbose=info`.  This flag lets Google Mock print a trace
+of every mock function call it receives.  By studying the trace,
+you'll gain insights on why the expectations you set are not met.
+
+## How can I assert that a function is NEVER called? ##
+
+```
+EXPECT_CALL(foo, Bar(_))
+    .Times(0);
+```
+
+## I have a failed test where Google Mock tells me TWICE that a particular expectation is not satisfied.  Isn't this redundant? ##
+
+When Google Mock detects a failure, it prints relevant information
+(the mock function arguments, the state of relevant expectations, and
+etc) to help the user debug.  If another failure is detected, Google
+Mock will do the same, including printing the state of relevant
+expectations.
+
+Sometimes an expectation's state didn't change between two failures,
+and you'll see the same description of the state twice.  They are
+however _not_ redundant, as they refer to _different points in time_.
+The fact they are the same _is_ interesting information.
+
+## I get a heap check failure when using a mock object, but using a real object is fine.  What can be wrong? ##
+
+Does the class (hopefully a pure interface) you are mocking have a
+virtual destructor?
+
+Whenever you derive from a base class, make sure its destructor is
+virtual.  Otherwise Bad Things will happen.  Consider the following
+code:
+
+```
+class Base {
+ public:
+  // Not virtual, but should be.
+  ~Base() { ... }
+  ...
+};
+
+class Derived : public Base {
+ public:
+  ...
+ private:
+  std::string value_;
+};
+
+...
+  Base* p = new Derived;
+  ...
+  delete p;  // Surprise! ~Base() will be called, but ~Derived() will not
+             // - value_ is leaked.
+```
+
+By changing `~Base()` to virtual, `~Derived()` will be correctly
+called when `delete p` is executed, and the heap checker
+will be happy.
+
+## The "newer expectations override older ones" rule makes writing expectations awkward.  Why does Google Mock do that? ##
+
+When people complain about this, often they are referring to code like:
+
+```
+// foo.Bar() should be called twice, return 1 the first time, and return
+// 2 the second time.  However, I have to write the expectations in the
+// reverse order.  This sucks big time!!!
+EXPECT_CALL(foo, Bar())
+    .WillOnce(Return(2))
+    .RetiresOnSaturation();
+EXPECT_CALL(foo, Bar())
+    .WillOnce(Return(1))
+    .RetiresOnSaturation();
+```
+
+The problem is that they didn't pick the **best** way to express the test's
+intent.
+
+By default, expectations don't have to be matched in _any_ particular
+order.  If you want them to match in a certain order, you need to be
+explicit.  This is Google Mock's (and jMock's) fundamental philosophy: it's
+easy to accidentally over-specify your tests, and we want to make it
+harder to do so.
+
+There are two better ways to write the test spec.  You could either
+put the expectations in sequence:
+
+```
+// foo.Bar() should be called twice, return 1 the first time, and return
+// 2 the second time.  Using a sequence, we can write the expectations
+// in their natural order.
+{
+  InSequence s;
+  EXPECT_CALL(foo, Bar())
+      .WillOnce(Return(1))
+      .RetiresOnSaturation();
+  EXPECT_CALL(foo, Bar())
+      .WillOnce(Return(2))
+      .RetiresOnSaturation();
+}
+```
+
+or you can put the sequence of actions in the same expectation:
+
+```
+// foo.Bar() should be called twice, return 1 the first time, and return
+// 2 the second time.
+EXPECT_CALL(foo, Bar())
+    .WillOnce(Return(1))
+    .WillOnce(Return(2))
+    .RetiresOnSaturation();
+```
+
+Back to the original questions: why does Google Mock search the
+expectations (and `ON_CALL`s) from back to front?  Because this
+allows a user to set up a mock's behavior for the common case early
+(e.g. in the mock's constructor or the test fixture's set-up phase)
+and customize it with more specific rules later.  If Google Mock
+searches from front to back, this very useful pattern won't be
+possible.
+
+## Google Mock prints a warning when a function without EXPECT\_CALL is called, even if I have set its behavior using ON\_CALL.  Would it be reasonable not to show the warning in this case? ##
+
+When choosing between being neat and being safe, we lean toward the
+latter.  So the answer is that we think it's better to show the
+warning.
+
+Often people write `ON_CALL`s in the mock object's
+constructor or `SetUp()`, as the default behavior rarely changes from
+test to test.  Then in the test body they set the expectations, which
+are often different for each test.  Having an `ON_CALL` in the set-up
+part of a test doesn't mean that the calls are expected.  If there's
+no `EXPECT_CALL` and the method is called, it's possibly an error.  If
+we quietly let the call go through without notifying the user, bugs
+may creep in unnoticed.
+
+If, however, you are sure that the calls are OK, you can write
+
+```
+EXPECT_CALL(foo, Bar(_))
+    .WillRepeatedly(...);
+```
+
+instead of
+
+```
+ON_CALL(foo, Bar(_))
+    .WillByDefault(...);
+```
+
+This tells Google Mock that you do expect the calls and no warning should be
+printed.
+
+Also, you can control the verbosity using the `--gmock_verbose` flag.
+If you find the output too noisy when debugging, just choose a less
+verbose level.
+
+## How can I delete the mock function's argument in an action? ##
+
+If you find yourself needing to perform some action that's not
+supported by Google Mock directly, remember that you can define your own
+actions using
+[MakeAction()](http://code.google.com/p/googlemock/wiki/V1_6_CookBook#Writing_New_Actions) or
+[MakePolymorphicAction()](http://code.google.com/p/googlemock/wiki/V1_6_CookBook#Writing_New_Polymorphic_Actions),
+or you can write a stub function and invoke it using
+[Invoke()](http://code.google.com/p/googlemock/wiki/V1_6_CookBook#Using_Functions_Methods_Functors).
+
+## MOCK\_METHODn()'s second argument looks funny.  Why don't you use the MOCK\_METHODn(Method, return\_type, arg\_1, ..., arg\_n) syntax? ##
+
+What?!  I think it's beautiful. :-)
+
+While which syntax looks more natural is a subjective matter to some
+extent, Google Mock's syntax was chosen for several practical advantages it
+has.
+
+Try to mock a function that takes a map as an argument:
+```
+virtual int GetSize(const map<int, std::string>& m);
+```
+
+Using the proposed syntax, it would be:
+```
+MOCK_METHOD1(GetSize, int, const map<int, std::string>& m);
+```
+
+Guess what?  You'll get a compiler error as the compiler thinks that
+`const map<int, std::string>& m` are **two**, not one, arguments. To work
+around this you can use `typedef` to give the map type a name, but
+that gets in the way of your work.  Google Mock's syntax avoids this
+problem as the function's argument types are protected inside a pair
+of parentheses:
+```
+// This compiles fine.
+MOCK_METHOD1(GetSize, int(const map<int, std::string>& m));
+```
+
+You still need a `typedef` if the return type contains an unprotected
+comma, but that's much rarer.
+
+Other advantages include:
+  1. `MOCK_METHOD1(Foo, int, bool)` can leave a reader wonder whether the method returns `int` or `bool`, while there won't be such confusion using Google Mock's syntax.
+  1. The way Google Mock describes a function type is nothing new, although many people may not be familiar with it.  The same syntax was used in C, and the `function` library in `tr1` uses this syntax extensively.  Since `tr1` will become a part of the new version of STL, we feel very comfortable to be consistent with it.
+  1. The function type syntax is also used in other parts of Google Mock's API (e.g. the action interface) in order to make the implementation tractable. A user needs to learn it anyway in order to utilize Google Mock's more advanced features.  We'd as well stick to the same syntax in `MOCK_METHOD*`!
+
+## My code calls a static/global function.  Can I mock it? ##
+
+You can, but you need to make some changes.
+
+In general, if you find yourself needing to mock a static function,
+it's a sign that your modules are too tightly coupled (and less
+flexible, less reusable, less testable, etc).  You are probably better
+off defining a small interface and call the function through that
+interface, which then can be easily mocked.  It's a bit of work
+initially, but usually pays for itself quickly.
+
+This Google Testing Blog
+[post](http://googletesting.blogspot.com/2008/06/defeat-static-cling.html)
+says it excellently.  Check it out.
+
+## My mock object needs to do complex stuff.  It's a lot of pain to specify the actions.  Google Mock sucks! ##
+
+I know it's not a question, but you get an answer for free any way. :-)
+
+With Google Mock, you can create mocks in C++ easily.  And people might be
+tempted to use them everywhere. Sometimes they work great, and
+sometimes you may find them, well, a pain to use. So, what's wrong in
+the latter case?
+
+When you write a test without using mocks, you exercise the code and
+assert that it returns the correct value or that the system is in an
+expected state.  This is sometimes called "state-based testing".
+
+Mocks are great for what some call "interaction-based" testing:
+instead of checking the system state at the very end, mock objects
+verify that they are invoked the right way and report an error as soon
+as it arises, giving you a handle on the precise context in which the
+error was triggered.  This is often more effective and economical to
+do than state-based testing.
+
+If you are doing state-based testing and using a test double just to
+simulate the real object, you are probably better off using a fake.
+Using a mock in this case causes pain, as it's not a strong point for
+mocks to perform complex actions.  If you experience this and think
+that mocks suck, you are just not using the right tool for your
+problem. Or, you might be trying to solve the wrong problem. :-)
+
+## I got a warning "Uninteresting function call encountered - default action taken.."  Should I panic? ##
+
+By all means, NO!  It's just an FYI.
+
+What it means is that you have a mock function, you haven't set any
+expectations on it (by Google Mock's rule this means that you are not
+interested in calls to this function and therefore it can be called
+any number of times), and it is called.  That's OK - you didn't say
+it's not OK to call the function!
+
+What if you actually meant to disallow this function to be called, but
+forgot to write `EXPECT_CALL(foo, Bar()).Times(0)`?  While
+one can argue that it's the user's fault, Google Mock tries to be nice and
+prints you a note.
+
+So, when you see the message and believe that there shouldn't be any
+uninteresting calls, you should investigate what's going on.  To make
+your life easier, Google Mock prints the function name and arguments
+when an uninteresting call is encountered.
+
+## I want to define a custom action.  Should I use Invoke() or implement the action interface? ##
+
+Either way is fine - you want to choose the one that's more convenient
+for your circumstance.
+
+Usually, if your action is for a particular function type, defining it
+using `Invoke()` should be easier; if your action can be used in
+functions of different types (e.g. if you are defining
+`Return(value)`), `MakePolymorphicAction()` is
+easiest.  Sometimes you want precise control on what types of
+functions the action can be used in, and implementing
+`ActionInterface` is the way to go here. See the implementation of
+`Return()` in `include/gmock/gmock-actions.h` for an example.
+
+## I'm using the set-argument-pointee action, and the compiler complains about "conflicting return type specified".  What does it mean? ##
+
+You got this error as Google Mock has no idea what value it should return
+when the mock method is called.  `SetArgPointee()` says what the
+side effect is, but doesn't say what the return value should be.  You
+need `DoAll()` to chain a `SetArgPointee()` with a `Return()`.
+
+See this [recipe](http://code.google.com/p/googlemock/wiki/V1_6_CookBook#Mocking_Side_Effects) for more details and an example.
+
+
+## My question is not in your FAQ! ##
+
+If you cannot find the answer to your question in this FAQ, there are
+some other resources you can use:
+
+  1. read other [wiki pages](http://code.google.com/p/googlemock/w/list),
+  1. search the mailing list [archive](http://groups.google.com/group/googlemock/topics),
+  1. ask it on [googlemock@googlegroups.com](mailto:googlemock@googlegroups.com) and someone will answer it (to prevent spam, we require you to join the [discussion group](http://groups.google.com/group/googlemock) before you can post.).
+
+Please note that creating an issue in the
+[issue tracker](http://code.google.com/p/googlemock/issues/list) is _not_
+a good way to get your answer, as it is monitored infrequently by a
+very small number of people.
+
+When asking a question, it's helpful to provide as much of the
+following information as possible (people cannot help you if there's
+not enough information in your question):
+
+  * the version (or the revision number if you check out from SVN directly) of Google Mock you use (Google Mock is under active development, so it's possible that your problem has been solved in a later version),
+  * your operating system,
+  * the name and version of your compiler,
+  * the complete command line flags you give to your compiler,
+  * the complete compiler error messages (if the question is about compilation),
+  * the _actual_ code (ideally, a minimal but complete program) that has the problem you encounter.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/CheatSheet.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/CheatSheet.md
new file mode 100644
index 0000000000..db421e51be
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/CheatSheet.md
@@ -0,0 +1,556 @@
+
+
+# Defining a Mock Class #
+
+## Mocking a Normal Class ##
+
+Given
+```
+class Foo {
+  ...
+  virtual ~Foo();
+  virtual int GetSize() const = 0;
+  virtual string Describe(const char* name) = 0;
+  virtual string Describe(int type) = 0;
+  virtual bool Process(Bar elem, int count) = 0;
+};
+```
+(note that `~Foo()` **must** be virtual) we can define its mock as
+```
+#include "gmock/gmock.h"
+
+class MockFoo : public Foo {
+  MOCK_CONST_METHOD0(GetSize, int());
+  MOCK_METHOD1(Describe, string(const char* name));
+  MOCK_METHOD1(Describe, string(int type));
+  MOCK_METHOD2(Process, bool(Bar elem, int count));
+};
+```
+
+To create a "nice" mock object which ignores all uninteresting calls,
+or a "strict" mock object, which treats them as failures:
+```
+NiceMock<MockFoo> nice_foo;     // The type is a subclass of MockFoo.
+StrictMock<MockFoo> strict_foo; // The type is a subclass of MockFoo.
+```
+
+## Mocking a Class Template ##
+
+To mock
+```
+template <typename Elem>
+class StackInterface {
+ public:
+  ...
+  virtual ~StackInterface();
+  virtual int GetSize() const = 0;
+  virtual void Push(const Elem& x) = 0;
+};
+```
+(note that `~StackInterface()` **must** be virtual) just append `_T` to the `MOCK_*` macros:
+```
+template <typename Elem>
+class MockStack : public StackInterface<Elem> {
+ public:
+  ...
+  MOCK_CONST_METHOD0_T(GetSize, int());
+  MOCK_METHOD1_T(Push, void(const Elem& x));
+};
+```
+
+## Specifying Calling Conventions for Mock Functions ##
+
+If your mock function doesn't use the default calling convention, you
+can specify it by appending `_WITH_CALLTYPE` to any of the macros
+described in the previous two sections and supplying the calling
+convention as the first argument to the macro. For example,
+```
+  MOCK_METHOD_1_WITH_CALLTYPE(STDMETHODCALLTYPE, Foo, bool(int n));
+  MOCK_CONST_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE, Bar, int(double x, double y));
+```
+where `STDMETHODCALLTYPE` is defined by `<objbase.h>` on Windows.
+
+# Using Mocks in Tests #
+
+The typical flow is:
+  1. Import the Google Mock names you need to use. All Google Mock names are in the `testing` namespace unless they are macros or otherwise noted.
+  1. Create the mock objects.
+  1. Optionally, set the default actions of the mock objects.
+  1. Set your expectations on the mock objects (How will they be called? What wil they do?).
+  1. Exercise code that uses the mock objects; if necessary, check the result using [Google Test](http://code.google.com/p/googletest/) assertions.
+  1. When a mock objects is destructed, Google Mock automatically verifies that all expectations on it have been satisfied.
+
+Here is an example:
+```
+using ::testing::Return;                            // #1
+
+TEST(BarTest, DoesThis) {
+  MockFoo foo;                                    // #2
+
+  ON_CALL(foo, GetSize())                         // #3
+      .WillByDefault(Return(1));
+  // ... other default actions ...
+
+  EXPECT_CALL(foo, Describe(5))                   // #4
+      .Times(3)
+      .WillRepeatedly(Return("Category 5"));
+  // ... other expectations ...
+
+  EXPECT_EQ("good", MyProductionFunction(&foo));  // #5
+}                                                 // #6
+```
+
+# Setting Default Actions #
+
+Google Mock has a **built-in default action** for any function that
+returns `void`, `bool`, a numeric value, or a pointer.
+
+To customize the default action for functions with return type `T` globally:
+```
+using ::testing::DefaultValue;
+
+DefaultValue<T>::Set(value);  // Sets the default value to be returned.
+// ... use the mocks ...
+DefaultValue<T>::Clear();     // Resets the default value.
+```
+
+To customize the default action for a particular method, use `ON_CALL()`:
+```
+ON_CALL(mock_object, method(matchers))
+    .With(multi_argument_matcher)  ?
+    .WillByDefault(action);
+```
+
+# Setting Expectations #
+
+`EXPECT_CALL()` sets **expectations** on a mock method (How will it be
+called? What will it do?):
+```
+EXPECT_CALL(mock_object, method(matchers))
+    .With(multi_argument_matcher)  ?
+    .Times(cardinality)            ?
+    .InSequence(sequences)         *
+    .After(expectations)           *
+    .WillOnce(action)              *
+    .WillRepeatedly(action)        ?
+    .RetiresOnSaturation();        ?
+```
+
+If `Times()` is omitted, the cardinality is assumed to be:
+
+  * `Times(1)` when there is neither `WillOnce()` nor `WillRepeatedly()`;
+  * `Times(n)` when there are `n WillOnce()`s but no `WillRepeatedly()`, where `n` >= 1; or
+  * `Times(AtLeast(n))` when there are `n WillOnce()`s and a `WillRepeatedly()`, where `n` >= 0.
+
+A method with no `EXPECT_CALL()` is free to be invoked _any number of times_, and the default action will be taken each time.
+
+# Matchers #
+
+A **matcher** matches a _single_ argument.  You can use it inside
+`ON_CALL()` or `EXPECT_CALL()`, or use it to validate a value
+directly:
+
+| `EXPECT_THAT(value, matcher)` | Asserts that `value` matches `matcher`. |
+|:------------------------------|:----------------------------------------|
+| `ASSERT_THAT(value, matcher)` | The same as `EXPECT_THAT(value, matcher)`, except that it generates a **fatal** failure. |
+
+Built-in matchers (where `argument` is the function argument) are
+divided into several categories:
+
+## Wildcard ##
+|`_`|`argument` can be any value of the correct type.|
+|:--|:-----------------------------------------------|
+|`A<type>()` or `An<type>()`|`argument` can be any value of type `type`.     |
+
+## Generic Comparison ##
+
+|`Eq(value)` or `value`|`argument == value`|
+|:---------------------|:------------------|
+|`Ge(value)`           |`argument >= value`|
+|`Gt(value)`           |`argument > value` |
+|`Le(value)`           |`argument <= value`|
+|`Lt(value)`           |`argument < value` |
+|`Ne(value)`           |`argument != value`|
+|`IsNull()`            |`argument` is a `NULL` pointer (raw or smart).|
+|`NotNull()`           |`argument` is a non-null pointer (raw or smart).|
+|`Ref(variable)`       |`argument` is a reference to `variable`.|
+|`TypedEq<type>(value)`|`argument` has type `type` and is equal to `value`. You may need to use this instead of `Eq(value)` when the mock function is overloaded.|
+
+Except `Ref()`, these matchers make a _copy_ of `value` in case it's
+modified or destructed later. If the compiler complains that `value`
+doesn't have a public copy constructor, try wrap it in `ByRef()`,
+e.g. `Eq(ByRef(non_copyable_value))`. If you do that, make sure
+`non_copyable_value` is not changed afterwards, or the meaning of your
+matcher will be changed.
+
+## Floating-Point Matchers ##
+
+|`DoubleEq(a_double)`|`argument` is a `double` value approximately equal to `a_double`, treating two NaNs as unequal.|
+|:-------------------|:----------------------------------------------------------------------------------------------|
+|`FloatEq(a_float)`  |`argument` is a `float` value approximately equal to `a_float`, treating two NaNs as unequal.  |
+|`NanSensitiveDoubleEq(a_double)`|`argument` is a `double` value approximately equal to `a_double`, treating two NaNs as equal.  |
+|`NanSensitiveFloatEq(a_float)`|`argument` is a `float` value approximately equal to `a_float`, treating two NaNs as equal.    |
+
+The above matchers use ULP-based comparison (the same as used in
+[Google Test](http://code.google.com/p/googletest/)). They
+automatically pick a reasonable error bound based on the absolute
+value of the expected value.  `DoubleEq()` and `FloatEq()` conform to
+the IEEE standard, which requires comparing two NaNs for equality to
+return false. The `NanSensitive*` version instead treats two NaNs as
+equal, which is often what a user wants.
+
+|`DoubleNear(a_double, max_abs_error)`|`argument` is a `double` value close to `a_double` (absolute error <= `max_abs_error`), treating two NaNs as unequal.|
+|:------------------------------------|:--------------------------------------------------------------------------------------------------------------------|
+|`FloatNear(a_float, max_abs_error)`  |`argument` is a `float` value close to `a_float` (absolute error <= `max_abs_error`), treating two NaNs as unequal.  |
+|`NanSensitiveDoubleNear(a_double, max_abs_error)`|`argument` is a `double` value close to `a_double` (absolute error <= `max_abs_error`), treating two NaNs as equal.  |
+|`NanSensitiveFloatNear(a_float, max_abs_error)`|`argument` is a `float` value close to `a_float` (absolute error <= `max_abs_error`), treating two NaNs as equal.    |
+
+## String Matchers ##
+
+The `argument` can be either a C string or a C++ string object:
+
+|`ContainsRegex(string)`|`argument` matches the given regular expression.|
+|:----------------------|:-----------------------------------------------|
+|`EndsWith(suffix)`     |`argument` ends with string `suffix`.           |
+|`HasSubstr(string)`    |`argument` contains `string` as a sub-string.   |
+|`MatchesRegex(string)` |`argument` matches the given regular expression with the match starting at the first character and ending at the last character.|
+|`StartsWith(prefix)`   |`argument` starts with string `prefix`.         |
+|`StrCaseEq(string)`    |`argument` is equal to `string`, ignoring case. |
+|`StrCaseNe(string)`    |`argument` is not equal to `string`, ignoring case.|
+|`StrEq(string)`        |`argument` is equal to `string`.                |
+|`StrNe(string)`        |`argument` is not equal to `string`.            |
+
+`ContainsRegex()` and `MatchesRegex()` use the regular expression
+syntax defined
+[here](http://code.google.com/p/googletest/wiki/AdvancedGuide#Regular_Expression_Syntax).
+`StrCaseEq()`, `StrCaseNe()`, `StrEq()`, and `StrNe()` work for wide
+strings as well.
+
+## Container Matchers ##
+
+Most STL-style containers support `==`, so you can use
+`Eq(expected_container)` or simply `expected_container` to match a
+container exactly.   If you want to write the elements in-line,
+match them more flexibly, or get more informative messages, you can use:
+
+| `ContainerEq(container)` | The same as `Eq(container)` except that the failure message also includes which elements are in one container but not the other. |
+|:-------------------------|:---------------------------------------------------------------------------------------------------------------------------------|
+| `Contains(e)`            | `argument` contains an element that matches `e`, which can be either a value or a matcher.                                       |
+| `Each(e)`                | `argument` is a container where _every_ element matches `e`, which can be either a value or a matcher.                           |
+| `ElementsAre(e0, e1, ..., en)` | `argument` has `n + 1` elements, where the i-th element matches `ei`, which can be a value or a matcher. 0 to 10 arguments are allowed. |
+| `ElementsAreArray({ e0, e1, ..., en })`, `ElementsAreArray(array)`, or `ElementsAreArray(array, count)` | The same as `ElementsAre()` except that the expected element values/matchers come from an initializer list, vector, or C-style array. |
+| `IsEmpty()`              | `argument` is an empty container (`container.empty()`).                                                                          |
+| `Pointwise(m, container)` | `argument` contains the same number of elements as in `container`, and for all i, (the i-th element in `argument`, the i-th element in `container`) match `m`, which is a matcher on 2-tuples. E.g. `Pointwise(Le(), upper_bounds)` verifies that each element in `argument` doesn't exceed the corresponding element in `upper_bounds`. See more detail below. |
+| `SizeIs(m)`              | `argument` is a container whose size matches `m`. E.g. `SizeIs(2)` or `SizeIs(Lt(2))`.                                           |
+| `UnorderedElementsAre(e0, e1, ..., en)` | `argument` has `n + 1` elements, and under some permutation each element matches an `ei` (for a different `i`), which can be a value or a matcher. 0 to 10 arguments are allowed. |
+| `UnorderedElementsAreArray({ e0, e1, ..., en })`, `UnorderedElementsAreArray(array)`, or `UnorderedElementsAreArray(array, count)` | The same as `UnorderedElementsAre()` except that the expected element values/matchers come from an initializer list, vector, or C-style array. |
+| `WhenSorted(m)`          | When `argument` is sorted using the `<` operator, it matches container matcher `m`. E.g. `WhenSorted(UnorderedElementsAre(1, 2, 3))` verifies that `argument` contains elements `1`, `2`, and `3`, ignoring order. |
+| `WhenSortedBy(comparator, m)` | The same as `WhenSorted(m)`, except that the given comparator instead of `<` is used to sort `argument`. E.g. `WhenSortedBy(std::greater<int>(), ElementsAre(3, 2, 1))`. |
+
+Notes:
+
+  * These matchers can also match:
+    1. a native array passed by reference (e.g. in `Foo(const int (&a)[5])`), and
+    1. an array passed as a pointer and a count (e.g. in `Bar(const T* buffer, int len)` -- see [Multi-argument Matchers](#Multiargument_Matchers.md)).
+  * The array being matched may be multi-dimensional (i.e. its elements can be arrays).
+  * `m` in `Pointwise(m, ...)` should be a matcher for `std::tr1::tuple<T, U>` where `T` and `U` are the element type of the actual container and the expected container, respectively. For example, to compare two `Foo` containers where `Foo` doesn't support `operator==` but has an `Equals()` method, one might write:
+
+```
+using ::std::tr1::get;
+MATCHER(FooEq, "") {
+  return get<0>(arg).Equals(get<1>(arg));
+}
+...
+EXPECT_THAT(actual_foos, Pointwise(FooEq(), expected_foos));
+```
+
+## Member Matchers ##
+
+|`Field(&class::field, m)`|`argument.field` (or `argument->field` when `argument` is a plain pointer) matches matcher `m`, where `argument` is an object of type _class_.|
+|:------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------|
+|`Key(e)`                 |`argument.first` matches `e`, which can be either a value or a matcher. E.g. `Contains(Key(Le(5)))` can verify that a `map` contains a key `<= 5`.|
+|`Pair(m1, m2)`           |`argument` is an `std::pair` whose `first` field matches `m1` and `second` field matches `m2`.                                                |
+|`Property(&class::property, m)`|`argument.property()` (or `argument->property()` when `argument` is a plain pointer) matches matcher `m`, where `argument` is an object of type _class_.|
+
+## Matching the Result of a Function or Functor ##
+
+|`ResultOf(f, m)`|`f(argument)` matches matcher `m`, where `f` is a function or functor.|
+|:---------------|:---------------------------------------------------------------------|
+
+## Pointer Matchers ##
+
+|`Pointee(m)`|`argument` (either a smart pointer or a raw pointer) points to a value that matches matcher `m`.|
+|:-----------|:-----------------------------------------------------------------------------------------------|
+
+## Multiargument Matchers ##
+
+Technically, all matchers match a _single_ value. A "multi-argument"
+matcher is just one that matches a _tuple_. The following matchers can
+be used to match a tuple `(x, y)`:
+
+|`Eq()`|`x == y`|
+|:-----|:-------|
+|`Ge()`|`x >= y`|
+|`Gt()`|`x > y` |
+|`Le()`|`x <= y`|
+|`Lt()`|`x < y` |
+|`Ne()`|`x != y`|
+
+You can use the following selectors to pick a subset of the arguments
+(or reorder them) to participate in the matching:
+
+|`AllArgs(m)`|Equivalent to `m`. Useful as syntactic sugar in `.With(AllArgs(m))`.|
+|:-----------|:-------------------------------------------------------------------|
+|`Args<N1, N2, ..., Nk>(m)`|The tuple of the `k` selected (using 0-based indices) arguments matches `m`, e.g. `Args<1, 2>(Eq())`.|
+
+## Composite Matchers ##
+
+You can make a matcher from one or more other matchers:
+
+|`AllOf(m1, m2, ..., mn)`|`argument` matches all of the matchers `m1` to `mn`.|
+|:-----------------------|:---------------------------------------------------|
+|`AnyOf(m1, m2, ..., mn)`|`argument` matches at least one of the matchers `m1` to `mn`.|
+|`Not(m)`                |`argument` doesn't match matcher `m`.               |
+
+## Adapters for Matchers ##
+
+|`MatcherCast<T>(m)`|casts matcher `m` to type `Matcher<T>`.|
+|:------------------|:--------------------------------------|
+|`SafeMatcherCast<T>(m)`| [safely casts](http://code.google.com/p/googlemock/wiki/V1_7_CookBook#Casting_Matchers) matcher `m` to type `Matcher<T>`. |
+|`Truly(predicate)` |`predicate(argument)` returns something considered by C++ to be true, where `predicate` is a function or functor.|
+
+## Matchers as Predicates ##
+
+|`Matches(m)(value)`|evaluates to `true` if `value` matches `m`. You can use `Matches(m)` alone as a unary functor.|
+|:------------------|:---------------------------------------------------------------------------------------------|
+|`ExplainMatchResult(m, value, result_listener)`|evaluates to `true` if `value` matches `m`, explaining the result to `result_listener`.       |
+|`Value(value, m)`  |evaluates to `true` if `value` matches `m`.                                                   |
+
+## Defining Matchers ##
+
+| `MATCHER(IsEven, "") { return (arg % 2) == 0; }` | Defines a matcher `IsEven()` to match an even number. |
+|:-------------------------------------------------|:------------------------------------------------------|
+| `MATCHER_P(IsDivisibleBy, n, "") { *result_listener << "where the remainder is " << (arg % n); return (arg % n) == 0; }` | Defines a macher `IsDivisibleBy(n)` to match a number divisible by `n`. |
+| `MATCHER_P2(IsBetween, a, b, std::string(negation ? "isn't" : "is") + " between " + PrintToString(a) + " and " + PrintToString(b)) { return a <= arg && arg <= b; }` | Defines a matcher `IsBetween(a, b)` to match a value in the range [`a`, `b`]. |
+
+**Notes:**
+
+  1. The `MATCHER*` macros cannot be used inside a function or class.
+  1. The matcher body must be _purely functional_ (i.e. it cannot have any side effect, and the result must not depend on anything other than the value being matched and the matcher parameters).
+  1. You can use `PrintToString(x)` to convert a value `x` of any type to a string.
+
+## Matchers as Test Assertions ##
+
+|`ASSERT_THAT(expression, m)`|Generates a [fatal failure](http://code.google.com/p/googletest/wiki/Primer#Assertions) if the value of `expression` doesn't match matcher `m`.|
+|:---------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------|
+|`EXPECT_THAT(expression, m)`|Generates a non-fatal failure if the value of `expression` doesn't match matcher `m`.                                                          |
+
+# Actions #
+
+**Actions** specify what a mock function should do when invoked.
+
+## Returning a Value ##
+
+|`Return()`|Return from a `void` mock function.|
+|:---------|:----------------------------------|
+|`Return(value)`|Return `value`. If the type of `value` is different to the mock function's return type, `value` is converted to the latter type <i>at the time the expectation is set</i>, not when the action is executed.|
+|`ReturnArg<N>()`|Return the `N`-th (0-based) argument.|
+|`ReturnNew<T>(a1, ..., ak)`|Return `new T(a1, ..., ak)`; a different object is created each time.|
+|`ReturnNull()`|Return a null pointer.             |
+|`ReturnPointee(ptr)`|Return the value pointed to by `ptr`.|
+|`ReturnRef(variable)`|Return a reference to `variable`.  |
+|`ReturnRefOfCopy(value)`|Return a reference to a copy of `value`; the copy lives as long as the action.|
+
+## Side Effects ##
+
+|`Assign(&variable, value)`|Assign `value` to variable.|
+|:-------------------------|:--------------------------|
+| `DeleteArg<N>()`         | Delete the `N`-th (0-based) argument, which must be a pointer. |
+| `SaveArg<N>(pointer)`    | Save the `N`-th (0-based) argument to `*pointer`. |
+| `SaveArgPointee<N>(pointer)` | Save the value pointed to by the `N`-th (0-based) argument to `*pointer`. |
+| `SetArgReferee<N>(value)` |	Assign value to the variable referenced by the `N`-th (0-based) argument. |
+|`SetArgPointee<N>(value)` |Assign `value` to the variable pointed by the `N`-th (0-based) argument.|
+|`SetArgumentPointee<N>(value)`|Same as `SetArgPointee<N>(value)`. Deprecated. Will be removed in v1.7.0.|
+|`SetArrayArgument<N>(first, last)`|Copies the elements in source range [`first`, `last`) to the array pointed to by the `N`-th (0-based) argument, which can be either a pointer or an iterator. The action does not take ownership of the elements in the source range.|
+|`SetErrnoAndReturn(error, value)`|Set `errno` to `error` and return `value`.|
+|`Throw(exception)`        |Throws the given exception, which can be any copyable value. Available since v1.1.0.|
+
+## Using a Function or a Functor as an Action ##
+
+|`Invoke(f)`|Invoke `f` with the arguments passed to the mock function, where `f` can be a global/static function or a functor.|
+|:----------|:-----------------------------------------------------------------------------------------------------------------|
+|`Invoke(object_pointer, &class::method)`|Invoke the {method on the object with the arguments passed to the mock function.                                  |
+|`InvokeWithoutArgs(f)`|Invoke `f`, which can be a global/static function or a functor. `f` must take no arguments.                       |
+|`InvokeWithoutArgs(object_pointer, &class::method)`|Invoke the method on the object, which takes no arguments.                                                        |
+|`InvokeArgument<N>(arg1, arg2, ..., argk)`|Invoke the mock function's `N`-th (0-based) argument, which must be a function or a functor, with the `k` arguments.|
+
+The return value of the invoked function is used as the return value
+of the action.
+
+When defining a function or functor to be used with `Invoke*()`, you can declare any unused parameters as `Unused`:
+```
+  double Distance(Unused, double x, double y) { return sqrt(x*x + y*y); }
+  ...
+  EXPECT_CALL(mock, Foo("Hi", _, _)).WillOnce(Invoke(Distance));
+```
+
+In `InvokeArgument<N>(...)`, if an argument needs to be passed by reference, wrap it inside `ByRef()`. For example,
+```
+  InvokeArgument<2>(5, string("Hi"), ByRef(foo))
+```
+calls the mock function's #2 argument, passing to it `5` and `string("Hi")` by value, and `foo` by reference.
+
+## Default Action ##
+
+|`DoDefault()`|Do the default action (specified by `ON_CALL()` or the built-in one).|
+|:------------|:--------------------------------------------------------------------|
+
+**Note:** due to technical reasons, `DoDefault()` cannot be used inside  a composite action - trying to do so will result in a run-time error.
+
+## Composite Actions ##
+
+|`DoAll(a1, a2, ..., an)`|Do all actions `a1` to `an` and return the result of `an` in each invocation. The first `n - 1` sub-actions must return void. |
+|:-----------------------|:-----------------------------------------------------------------------------------------------------------------------------|
+|`IgnoreResult(a)`       |Perform action `a` and ignore its result. `a` must not return void.                                                           |
+|`WithArg<N>(a)`         |Pass the `N`-th (0-based) argument of the mock function to action `a` and perform it.                                         |
+|`WithArgs<N1, N2, ..., Nk>(a)`|Pass the selected (0-based) arguments of the mock function to action `a` and perform it.                                      |
+|`WithoutArgs(a)`        |Perform action `a` without any arguments.                                                                                     |
+
+## Defining Actions ##
+
+| `ACTION(Sum) { return arg0 + arg1; }` | Defines an action `Sum()` to return the sum of the mock function's argument #0 and #1. |
+|:--------------------------------------|:---------------------------------------------------------------------------------------|
+| `ACTION_P(Plus, n) { return arg0 + n; }` | Defines an action `Plus(n)` to return the sum of the mock function's argument #0 and `n`. |
+| `ACTION_Pk(Foo, p1, ..., pk) { statements; }` | Defines a parameterized action `Foo(p1, ..., pk)` to execute the given `statements`.   |
+
+The `ACTION*` macros cannot be used inside a function or class.
+
+# Cardinalities #
+
+These are used in `Times()` to specify how many times a mock function will be called:
+
+|`AnyNumber()`|The function can be called any number of times.|
+|:------------|:----------------------------------------------|
+|`AtLeast(n)` |The call is expected at least `n` times.       |
+|`AtMost(n)`  |The call is expected at most `n` times.        |
+|`Between(m, n)`|The call is expected between `m` and `n` (inclusive) times.|
+|`Exactly(n) or n`|The call is expected exactly `n` times. In particular, the call should never happen when `n` is 0.|
+
+# Expectation Order #
+
+By default, the expectations can be matched in _any_ order.  If some
+or all expectations must be matched in a given order, there are two
+ways to specify it.  They can be used either independently or
+together.
+
+## The After Clause ##
+
+```
+using ::testing::Expectation;
+...
+Expectation init_x = EXPECT_CALL(foo, InitX());
+Expectation init_y = EXPECT_CALL(foo, InitY());
+EXPECT_CALL(foo, Bar())
+    .After(init_x, init_y);
+```
+says that `Bar()` can be called only after both `InitX()` and
+`InitY()` have been called.
+
+If you don't know how many pre-requisites an expectation has when you
+write it, you can use an `ExpectationSet` to collect them:
+
+```
+using ::testing::ExpectationSet;
+...
+ExpectationSet all_inits;
+for (int i = 0; i < element_count; i++) {
+  all_inits += EXPECT_CALL(foo, InitElement(i));
+}
+EXPECT_CALL(foo, Bar())
+    .After(all_inits);
+```
+says that `Bar()` can be called only after all elements have been
+initialized (but we don't care about which elements get initialized
+before the others).
+
+Modifying an `ExpectationSet` after using it in an `.After()` doesn't
+affect the meaning of the `.After()`.
+
+## Sequences ##
+
+When you have a long chain of sequential expectations, it's easier to
+specify the order using **sequences**, which don't require you to given
+each expectation in the chain a different name.  <i>All expected<br>
+calls</i> in the same sequence must occur in the order they are
+specified.
+
+```
+using ::testing::Sequence;
+Sequence s1, s2;
+...
+EXPECT_CALL(foo, Reset())
+    .InSequence(s1, s2)
+    .WillOnce(Return(true));
+EXPECT_CALL(foo, GetSize())
+    .InSequence(s1)
+    .WillOnce(Return(1));
+EXPECT_CALL(foo, Describe(A<const char*>()))
+    .InSequence(s2)
+    .WillOnce(Return("dummy"));
+```
+says that `Reset()` must be called before _both_ `GetSize()` _and_
+`Describe()`, and the latter two can occur in any order.
+
+To put many expectations in a sequence conveniently:
+```
+using ::testing::InSequence;
+{
+  InSequence dummy;
+
+  EXPECT_CALL(...)...;
+  EXPECT_CALL(...)...;
+  ...
+  EXPECT_CALL(...)...;
+}
+```
+says that all expected calls in the scope of `dummy` must occur in
+strict order. The name `dummy` is irrelevant.)
+
+# Verifying and Resetting a Mock #
+
+Google Mock will verify the expectations on a mock object when it is destructed, or you can do it earlier:
+```
+using ::testing::Mock;
+...
+// Verifies and removes the expectations on mock_obj;
+// returns true iff successful.
+Mock::VerifyAndClearExpectations(&mock_obj);
+...
+// Verifies and removes the expectations on mock_obj;
+// also removes the default actions set by ON_CALL();
+// returns true iff successful.
+Mock::VerifyAndClear(&mock_obj);
+```
+
+You can also tell Google Mock that a mock object can be leaked and doesn't
+need to be verified:
+```
+Mock::AllowLeak(&mock_obj);
+```
+
+# Mock Classes #
+
+Google Mock defines a convenient mock class template
+```
+class MockFunction<R(A1, ..., An)> {
+ public:
+  MOCK_METHODn(Call, R(A1, ..., An));
+};
+```
+See this [recipe](http://code.google.com/p/googlemock/wiki/V1_7_CookBook#Using_Check_Points) for one application of it.
+
+# Flags #
+
+| `--gmock_catch_leaked_mocks=0` | Don't report leaked mock objects as failures. |
+|:-------------------------------|:----------------------------------------------|
+| `--gmock_verbose=LEVEL`        | Sets the default verbosity level (`info`, `warning`, or `error`) of Google Mock messages. |
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/CookBook.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/CookBook.md
new file mode 100644
index 0000000000..419a001071
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/CookBook.md
@@ -0,0 +1,3432 @@
+
+
+You can find recipes for using Google Mock here. If you haven't yet,
+please read the [ForDummies](V1_7_ForDummies.md) document first to make sure you understand
+the basics.
+
+**Note:** Google Mock lives in the `testing` name space. For
+readability, it is recommended to write `using ::testing::Foo;` once in
+your file before using the name `Foo` defined by Google Mock. We omit
+such `using` statements in this page for brevity, but you should do it
+in your own code.
+
+# Creating Mock Classes #
+
+## Mocking Private or Protected Methods ##
+
+You must always put a mock method definition (`MOCK_METHOD*`) in a
+`public:` section of the mock class, regardless of the method being
+mocked being `public`, `protected`, or `private` in the base class.
+This allows `ON_CALL` and `EXPECT_CALL` to reference the mock function
+from outside of the mock class.  (Yes, C++ allows a subclass to change
+the access level of a virtual function in the base class.)  Example:
+
+```
+class Foo {
+ public:
+  ...
+  virtual bool Transform(Gadget* g) = 0;
+
+ protected:
+  virtual void Resume();
+
+ private:
+  virtual int GetTimeOut();
+};
+
+class MockFoo : public Foo {
+ public:
+  ...
+  MOCK_METHOD1(Transform, bool(Gadget* g));
+
+  // The following must be in the public section, even though the
+  // methods are protected or private in the base class.
+  MOCK_METHOD0(Resume, void());
+  MOCK_METHOD0(GetTimeOut, int());
+};
+```
+
+## Mocking Overloaded Methods ##
+
+You can mock overloaded functions as usual. No special attention is required:
+
+```
+class Foo {
+  ...
+
+  // Must be virtual as we'll inherit from Foo.
+  virtual ~Foo();
+
+  // Overloaded on the types and/or numbers of arguments.
+  virtual int Add(Element x);
+  virtual int Add(int times, Element x);
+
+  // Overloaded on the const-ness of this object.
+  virtual Bar& GetBar();
+  virtual const Bar& GetBar() const;
+};
+
+class MockFoo : public Foo {
+  ...
+  MOCK_METHOD1(Add, int(Element x));
+  MOCK_METHOD2(Add, int(int times, Element x);
+
+  MOCK_METHOD0(GetBar, Bar&());
+  MOCK_CONST_METHOD0(GetBar, const Bar&());
+};
+```
+
+**Note:** if you don't mock all versions of the overloaded method, the
+compiler will give you a warning about some methods in the base class
+being hidden. To fix that, use `using` to bring them in scope:
+
+```
+class MockFoo : public Foo {
+  ...
+  using Foo::Add;
+  MOCK_METHOD1(Add, int(Element x));
+  // We don't want to mock int Add(int times, Element x);
+  ...
+};
+```
+
+## Mocking Class Templates ##
+
+To mock a class template, append `_T` to the `MOCK_*` macros:
+
+```
+template <typename Elem>
+class StackInterface {
+  ...
+  // Must be virtual as we'll inherit from StackInterface.
+  virtual ~StackInterface();
+
+  virtual int GetSize() const = 0;
+  virtual void Push(const Elem& x) = 0;
+};
+
+template <typename Elem>
+class MockStack : public StackInterface<Elem> {
+  ...
+  MOCK_CONST_METHOD0_T(GetSize, int());
+  MOCK_METHOD1_T(Push, void(const Elem& x));
+};
+```
+
+## Mocking Nonvirtual Methods ##
+
+Google Mock can mock non-virtual functions to be used in what we call _hi-perf
+dependency injection_.
+
+In this case, instead of sharing a common base class with the real
+class, your mock class will be _unrelated_ to the real class, but
+contain methods with the same signatures.  The syntax for mocking
+non-virtual methods is the _same_ as mocking virtual methods:
+
+```
+// A simple packet stream class.  None of its members is virtual.
+class ConcretePacketStream {
+ public:
+  void AppendPacket(Packet* new_packet);
+  const Packet* GetPacket(size_t packet_number) const;
+  size_t NumberOfPackets() const;
+  ...
+};
+
+// A mock packet stream class.  It inherits from no other, but defines
+// GetPacket() and NumberOfPackets().
+class MockPacketStream {
+ public:
+  MOCK_CONST_METHOD1(GetPacket, const Packet*(size_t packet_number));
+  MOCK_CONST_METHOD0(NumberOfPackets, size_t());
+  ...
+};
+```
+
+Note that the mock class doesn't define `AppendPacket()`, unlike the
+real class. That's fine as long as the test doesn't need to call it.
+
+Next, you need a way to say that you want to use
+`ConcretePacketStream` in production code, and use `MockPacketStream`
+in tests.  Since the functions are not virtual and the two classes are
+unrelated, you must specify your choice at _compile time_ (as opposed
+to run time).
+
+One way to do it is to templatize your code that needs to use a packet
+stream.  More specifically, you will give your code a template type
+argument for the type of the packet stream.  In production, you will
+instantiate your template with `ConcretePacketStream` as the type
+argument.  In tests, you will instantiate the same template with
+`MockPacketStream`.  For example, you may write:
+
+```
+template <class PacketStream>
+void CreateConnection(PacketStream* stream) { ... }
+
+template <class PacketStream>
+class PacketReader {
+ public:
+  void ReadPackets(PacketStream* stream, size_t packet_num);
+};
+```
+
+Then you can use `CreateConnection<ConcretePacketStream>()` and
+`PacketReader<ConcretePacketStream>` in production code, and use
+`CreateConnection<MockPacketStream>()` and
+`PacketReader<MockPacketStream>` in tests.
+
+```
+  MockPacketStream mock_stream;
+  EXPECT_CALL(mock_stream, ...)...;
+  .. set more expectations on mock_stream ...
+  PacketReader<MockPacketStream> reader(&mock_stream);
+  ... exercise reader ...
+```
+
+## Mocking Free Functions ##
+
+It's possible to use Google Mock to mock a free function (i.e. a
+C-style function or a static method).  You just need to rewrite your
+code to use an interface (abstract class).
+
+Instead of calling a free function (say, `OpenFile`) directly,
+introduce an interface for it and have a concrete subclass that calls
+the free function:
+
+```
+class FileInterface {
+ public:
+  ...
+  virtual bool Open(const char* path, const char* mode) = 0;
+};
+
+class File : public FileInterface {
+ public:
+  ...
+  virtual bool Open(const char* path, const char* mode) {
+    return OpenFile(path, mode);
+  }
+};
+```
+
+Your code should talk to `FileInterface` to open a file.  Now it's
+easy to mock out the function.
+
+This may seem much hassle, but in practice you often have multiple
+related functions that you can put in the same interface, so the
+per-function syntactic overhead will be much lower.
+
+If you are concerned about the performance overhead incurred by
+virtual functions, and profiling confirms your concern, you can
+combine this with the recipe for [mocking non-virtual methods](#Mocking_Nonvirtual_Methods.md).
+
+## The Nice, the Strict, and the Naggy ##
+
+If a mock method has no `EXPECT_CALL` spec but is called, Google Mock
+will print a warning about the "uninteresting call". The rationale is:
+
+  * New methods may be added to an interface after a test is written. We shouldn't fail a test just because a method it doesn't know about is called.
+  * However, this may also mean there's a bug in the test, so Google Mock shouldn't be silent either. If the user believes these calls are harmless, he can add an `EXPECT_CALL()` to suppress the warning.
+
+However, sometimes you may want to suppress all "uninteresting call"
+warnings, while sometimes you may want the opposite, i.e. to treat all
+of them as errors. Google Mock lets you make the decision on a
+per-mock-object basis.
+
+Suppose your test uses a mock class `MockFoo`:
+
+```
+TEST(...) {
+  MockFoo mock_foo;
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+}
+```
+
+If a method of `mock_foo` other than `DoThis()` is called, it will be
+reported by Google Mock as a warning. However, if you rewrite your
+test to use `NiceMock<MockFoo>` instead, the warning will be gone,
+resulting in a cleaner test output:
+
+```
+using ::testing::NiceMock;
+
+TEST(...) {
+  NiceMock<MockFoo> mock_foo;
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+}
+```
+
+`NiceMock<MockFoo>` is a subclass of `MockFoo`, so it can be used
+wherever `MockFoo` is accepted.
+
+It also works if `MockFoo`'s constructor takes some arguments, as
+`NiceMock<MockFoo>` "inherits" `MockFoo`'s constructors:
+
+```
+using ::testing::NiceMock;
+
+TEST(...) {
+  NiceMock<MockFoo> mock_foo(5, "hi");  // Calls MockFoo(5, "hi").
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+}
+```
+
+The usage of `StrictMock` is similar, except that it makes all
+uninteresting calls failures:
+
+```
+using ::testing::StrictMock;
+
+TEST(...) {
+  StrictMock<MockFoo> mock_foo;
+  EXPECT_CALL(mock_foo, DoThis());
+  ... code that uses mock_foo ...
+
+  // The test will fail if a method of mock_foo other than DoThis()
+  // is called.
+}
+```
+
+There are some caveats though (I don't like them just as much as the
+next guy, but sadly they are side effects of C++'s limitations):
+
+  1. `NiceMock<MockFoo>` and `StrictMock<MockFoo>` only work for mock methods defined using the `MOCK_METHOD*` family of macros **directly** in the `MockFoo` class. If a mock method is defined in a **base class** of `MockFoo`, the "nice" or "strict" modifier may not affect it, depending on the compiler. In particular, nesting `NiceMock` and `StrictMock` (e.g. `NiceMock<StrictMock<MockFoo> >`) is **not** supported.
+  1. The constructors of the base mock (`MockFoo`) cannot have arguments passed by non-const reference, which happens to be banned by the [Google C++ style guide](http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml).
+  1. During the constructor or destructor of `MockFoo`, the mock object is _not_ nice or strict.  This may cause surprises if the constructor or destructor calls a mock method on `this` object. (This behavior, however, is consistent with C++'s general rule: if a constructor or destructor calls a virtual method of `this` object, that method is treated as non-virtual.  In other words, to the base class's constructor or destructor, `this` object behaves like an instance of the base class, not the derived class.  This rule is required for safety.  Otherwise a base constructor may use members of a derived class before they are initialized, or a base destructor may use members of a derived class after they have been destroyed.)
+
+Finally, you should be **very cautious** about when to use naggy or strict mocks, as they tend to make tests more brittle and harder to maintain. When you refactor your code without changing its externally visible behavior, ideally you should't need to update any tests. If your code interacts with a naggy mock, however, you may start to get spammed with warnings as the result of your change. Worse, if your code interacts with a strict mock, your tests may start to fail and you'll be forced to fix them. Our general recommendation is to use nice mocks (not yet the default) most of the time, use naggy mocks (the current default) when developing or debugging tests, and use strict mocks only as the last resort.
+
+## Simplifying the Interface without Breaking Existing Code ##
+
+Sometimes a method has a long list of arguments that is mostly
+uninteresting. For example,
+
+```
+class LogSink {
+ public:
+  ...
+  virtual void send(LogSeverity severity, const char* full_filename,
+                    const char* base_filename, int line,
+                    const struct tm* tm_time,
+                    const char* message, size_t message_len) = 0;
+};
+```
+
+This method's argument list is lengthy and hard to work with (let's
+say that the `message` argument is not even 0-terminated). If we mock
+it as is, using the mock will be awkward. If, however, we try to
+simplify this interface, we'll need to fix all clients depending on
+it, which is often infeasible.
+
+The trick is to re-dispatch the method in the mock class:
+
+```
+class ScopedMockLog : public LogSink {
+ public:
+  ...
+  virtual void send(LogSeverity severity, const char* full_filename,
+                    const char* base_filename, int line, const tm* tm_time,
+                    const char* message, size_t message_len) {
+    // We are only interested in the log severity, full file name, and
+    // log message.
+    Log(severity, full_filename, std::string(message, message_len));
+  }
+
+  // Implements the mock method:
+  //
+  //   void Log(LogSeverity severity,
+  //            const string& file_path,
+  //            const string& message);
+  MOCK_METHOD3(Log, void(LogSeverity severity, const string& file_path,
+                         const string& message));
+};
+```
+
+By defining a new mock method with a trimmed argument list, we make
+the mock class much more user-friendly.
+
+## Alternative to Mocking Concrete Classes ##
+
+Often you may find yourself using classes that don't implement
+interfaces. In order to test your code that uses such a class (let's
+call it `Concrete`), you may be tempted to make the methods of
+`Concrete` virtual and then mock it.
+
+Try not to do that.
+
+Making a non-virtual function virtual is a big decision. It creates an
+extension point where subclasses can tweak your class' behavior. This
+weakens your control on the class because now it's harder to maintain
+the class' invariants. You should make a function virtual only when
+there is a valid reason for a subclass to override it.
+
+Mocking concrete classes directly is problematic as it creates a tight
+coupling between the class and the tests - any small change in the
+class may invalidate your tests and make test maintenance a pain.
+
+To avoid such problems, many programmers have been practicing "coding
+to interfaces": instead of talking to the `Concrete` class, your code
+would define an interface and talk to it. Then you implement that
+interface as an adaptor on top of `Concrete`. In tests, you can easily
+mock that interface to observe how your code is doing.
+
+This technique incurs some overhead:
+
+  * You pay the cost of virtual function calls (usually not a problem).
+  * There is more abstraction for the programmers to learn.
+
+However, it can also bring significant benefits in addition to better
+testability:
+
+  * `Concrete`'s API may not fit your problem domain very well, as you may not be the only client it tries to serve. By designing your own interface, you have a chance to tailor it to your need - you may add higher-level functionalities, rename stuff, etc instead of just trimming the class. This allows you to write your code (user of the interface) in a more natural way, which means it will be more readable, more maintainable, and you'll be more productive.
+  * If `Concrete`'s implementation ever has to change, you don't have to rewrite everywhere it is used. Instead, you can absorb the change in your implementation of the interface, and your other code and tests will be insulated from this change.
+
+Some people worry that if everyone is practicing this technique, they
+will end up writing lots of redundant code. This concern is totally
+understandable. However, there are two reasons why it may not be the
+case:
+
+  * Different projects may need to use `Concrete` in different ways, so the best interfaces for them will be different. Therefore, each of them will have its own domain-specific interface on top of `Concrete`, and they will not be the same code.
+  * If enough projects want to use the same interface, they can always share it, just like they have been sharing `Concrete`. You can check in the interface and the adaptor somewhere near `Concrete` (perhaps in a `contrib` sub-directory) and let many projects use it.
+
+You need to weigh the pros and cons carefully for your particular
+problem, but I'd like to assure you that the Java community has been
+practicing this for a long time and it's a proven effective technique
+applicable in a wide variety of situations. :-)
+
+## Delegating Calls to a Fake ##
+
+Some times you have a non-trivial fake implementation of an
+interface. For example:
+
+```
+class Foo {
+ public:
+  virtual ~Foo() {}
+  virtual char DoThis(int n) = 0;
+  virtual void DoThat(const char* s, int* p) = 0;
+};
+
+class FakeFoo : public Foo {
+ public:
+  virtual char DoThis(int n) {
+    return (n > 0) ? '+' :
+        (n < 0) ? '-' : '0';
+  }
+
+  virtual void DoThat(const char* s, int* p) {
+    *p = strlen(s);
+  }
+};
+```
+
+Now you want to mock this interface such that you can set expectations
+on it. However, you also want to use `FakeFoo` for the default
+behavior, as duplicating it in the mock object is, well, a lot of
+work.
+
+When you define the mock class using Google Mock, you can have it
+delegate its default action to a fake class you already have, using
+this pattern:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+class MockFoo : public Foo {
+ public:
+  // Normal mock method definitions using Google Mock.
+  MOCK_METHOD1(DoThis, char(int n));
+  MOCK_METHOD2(DoThat, void(const char* s, int* p));
+
+  // Delegates the default actions of the methods to a FakeFoo object.
+  // This must be called *before* the custom ON_CALL() statements.
+  void DelegateToFake() {
+    ON_CALL(*this, DoThis(_))
+        .WillByDefault(Invoke(&fake_, &FakeFoo::DoThis));
+    ON_CALL(*this, DoThat(_, _))
+        .WillByDefault(Invoke(&fake_, &FakeFoo::DoThat));
+  }
+ private:
+  FakeFoo fake_;  // Keeps an instance of the fake in the mock.
+};
+```
+
+With that, you can use `MockFoo` in your tests as usual. Just remember
+that if you don't explicitly set an action in an `ON_CALL()` or
+`EXPECT_CALL()`, the fake will be called upon to do it:
+
+```
+using ::testing::_;
+
+TEST(AbcTest, Xyz) {
+  MockFoo foo;
+  foo.DelegateToFake(); // Enables the fake for delegation.
+
+  // Put your ON_CALL(foo, ...)s here, if any.
+
+  // No action specified, meaning to use the default action.
+  EXPECT_CALL(foo, DoThis(5));
+  EXPECT_CALL(foo, DoThat(_, _));
+
+  int n = 0;
+  EXPECT_EQ('+', foo.DoThis(5));  // FakeFoo::DoThis() is invoked.
+  foo.DoThat("Hi", &n);           // FakeFoo::DoThat() is invoked.
+  EXPECT_EQ(2, n);
+}
+```
+
+**Some tips:**
+
+  * If you want, you can still override the default action by providing your own `ON_CALL()` or using `.WillOnce()` / `.WillRepeatedly()` in `EXPECT_CALL()`.
+  * In `DelegateToFake()`, you only need to delegate the methods whose fake implementation you intend to use.
+  * The general technique discussed here works for overloaded methods, but you'll need to tell the compiler which version you mean. To disambiguate a mock function (the one you specify inside the parentheses of `ON_CALL()`), see the "Selecting Between Overloaded Functions" section on this page; to disambiguate a fake function (the one you place inside `Invoke()`), use a `static_cast` to specify the function's type. For instance, if class `Foo` has methods `char DoThis(int n)` and `bool DoThis(double x) const`, and you want to invoke the latter, you need to write `Invoke(&fake_, static_cast<bool (FakeFoo::*)(double) const>(&FakeFoo::DoThis))` instead of `Invoke(&fake_, &FakeFoo::DoThis)` (The strange-looking thing inside the angled brackets of `static_cast` is the type of a function pointer to the second `DoThis()` method.).
+  * Having to mix a mock and a fake is often a sign of something gone wrong. Perhaps you haven't got used to the interaction-based way of testing yet. Or perhaps your interface is taking on too many roles and should be split up. Therefore, **don't abuse this**. We would only recommend to do it as an intermediate step when you are refactoring your code.
+
+Regarding the tip on mixing a mock and a fake, here's an example on
+why it may be a bad sign: Suppose you have a class `System` for
+low-level system operations. In particular, it does file and I/O
+operations. And suppose you want to test how your code uses `System`
+to do I/O, and you just want the file operations to work normally. If
+you mock out the entire `System` class, you'll have to provide a fake
+implementation for the file operation part, which suggests that
+`System` is taking on too many roles.
+
+Instead, you can define a `FileOps` interface and an `IOOps` interface
+and split `System`'s functionalities into the two. Then you can mock
+`IOOps` without mocking `FileOps`.
+
+## Delegating Calls to a Real Object ##
+
+When using testing doubles (mocks, fakes, stubs, and etc), sometimes
+their behaviors will differ from those of the real objects. This
+difference could be either intentional (as in simulating an error such
+that you can test the error handling code) or unintentional. If your
+mocks have different behaviors than the real objects by mistake, you
+could end up with code that passes the tests but fails in production.
+
+You can use the _delegating-to-real_ technique to ensure that your
+mock has the same behavior as the real object while retaining the
+ability to validate calls. This technique is very similar to the
+delegating-to-fake technique, the difference being that we use a real
+object instead of a fake. Here's an example:
+
+```
+using ::testing::_;
+using ::testing::AtLeast;
+using ::testing::Invoke;
+
+class MockFoo : public Foo {
+ public:
+  MockFoo() {
+    // By default, all calls are delegated to the real object.
+    ON_CALL(*this, DoThis())
+        .WillByDefault(Invoke(&real_, &Foo::DoThis));
+    ON_CALL(*this, DoThat(_))
+        .WillByDefault(Invoke(&real_, &Foo::DoThat));
+    ...
+  }
+  MOCK_METHOD0(DoThis, ...);
+  MOCK_METHOD1(DoThat, ...);
+  ...
+ private:
+  Foo real_;
+};
+...
+
+  MockFoo mock;
+
+  EXPECT_CALL(mock, DoThis())
+      .Times(3);
+  EXPECT_CALL(mock, DoThat("Hi"))
+      .Times(AtLeast(1));
+  ... use mock in test ...
+```
+
+With this, Google Mock will verify that your code made the right calls
+(with the right arguments, in the right order, called the right number
+of times, etc), and a real object will answer the calls (so the
+behavior will be the same as in production). This gives you the best
+of both worlds.
+
+## Delegating Calls to a Parent Class ##
+
+Ideally, you should code to interfaces, whose methods are all pure
+virtual. In reality, sometimes you do need to mock a virtual method
+that is not pure (i.e, it already has an implementation). For example:
+
+```
+class Foo {
+ public:
+  virtual ~Foo();
+
+  virtual void Pure(int n) = 0;
+  virtual int Concrete(const char* str) { ... }
+};
+
+class MockFoo : public Foo {
+ public:
+  // Mocking a pure method.
+  MOCK_METHOD1(Pure, void(int n));
+  // Mocking a concrete method.  Foo::Concrete() is shadowed.
+  MOCK_METHOD1(Concrete, int(const char* str));
+};
+```
+
+Sometimes you may want to call `Foo::Concrete()` instead of
+`MockFoo::Concrete()`. Perhaps you want to do it as part of a stub
+action, or perhaps your test doesn't need to mock `Concrete()` at all
+(but it would be oh-so painful to have to define a new mock class
+whenever you don't need to mock one of its methods).
+
+The trick is to leave a back door in your mock class for accessing the
+real methods in the base class:
+
+```
+class MockFoo : public Foo {
+ public:
+  // Mocking a pure method.
+  MOCK_METHOD1(Pure, void(int n));
+  // Mocking a concrete method.  Foo::Concrete() is shadowed.
+  MOCK_METHOD1(Concrete, int(const char* str));
+
+  // Use this to call Concrete() defined in Foo.
+  int FooConcrete(const char* str) { return Foo::Concrete(str); }
+};
+```
+
+Now, you can call `Foo::Concrete()` inside an action by:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+...
+  EXPECT_CALL(foo, Concrete(_))
+      .WillOnce(Invoke(&foo, &MockFoo::FooConcrete));
+```
+
+or tell the mock object that you don't want to mock `Concrete()`:
+
+```
+using ::testing::Invoke;
+...
+  ON_CALL(foo, Concrete(_))
+      .WillByDefault(Invoke(&foo, &MockFoo::FooConcrete));
+```
+
+(Why don't we just write `Invoke(&foo, &Foo::Concrete)`? If you do
+that, `MockFoo::Concrete()` will be called (and cause an infinite
+recursion) since `Foo::Concrete()` is virtual. That's just how C++
+works.)
+
+# Using Matchers #
+
+## Matching Argument Values Exactly ##
+
+You can specify exactly which arguments a mock method is expecting:
+
+```
+using ::testing::Return;
+...
+  EXPECT_CALL(foo, DoThis(5))
+      .WillOnce(Return('a'));
+  EXPECT_CALL(foo, DoThat("Hello", bar));
+```
+
+## Using Simple Matchers ##
+
+You can use matchers to match arguments that have a certain property:
+
+```
+using ::testing::Ge;
+using ::testing::NotNull;
+using ::testing::Return;
+...
+  EXPECT_CALL(foo, DoThis(Ge(5)))  // The argument must be >= 5.
+      .WillOnce(Return('a'));
+  EXPECT_CALL(foo, DoThat("Hello", NotNull()));
+  // The second argument must not be NULL.
+```
+
+A frequently used matcher is `_`, which matches anything:
+
+```
+using ::testing::_;
+using ::testing::NotNull;
+...
+  EXPECT_CALL(foo, DoThat(_, NotNull()));
+```
+
+## Combining Matchers ##
+
+You can build complex matchers from existing ones using `AllOf()`,
+`AnyOf()`, and `Not()`:
+
+```
+using ::testing::AllOf;
+using ::testing::Gt;
+using ::testing::HasSubstr;
+using ::testing::Ne;
+using ::testing::Not;
+...
+  // The argument must be > 5 and != 10.
+  EXPECT_CALL(foo, DoThis(AllOf(Gt(5),
+                                Ne(10))));
+
+  // The first argument must not contain sub-string "blah".
+  EXPECT_CALL(foo, DoThat(Not(HasSubstr("blah")),
+                          NULL));
+```
+
+## Casting Matchers ##
+
+Google Mock matchers are statically typed, meaning that the compiler
+can catch your mistake if you use a matcher of the wrong type (for
+example, if you use `Eq(5)` to match a `string` argument). Good for
+you!
+
+Sometimes, however, you know what you're doing and want the compiler
+to give you some slack. One example is that you have a matcher for
+`long` and the argument you want to match is `int`. While the two
+types aren't exactly the same, there is nothing really wrong with
+using a `Matcher<long>` to match an `int` - after all, we can first
+convert the `int` argument to a `long` before giving it to the
+matcher.
+
+To support this need, Google Mock gives you the
+`SafeMatcherCast<T>(m)` function. It casts a matcher `m` to type
+`Matcher<T>`. To ensure safety, Google Mock checks that (let `U` be the
+type `m` accepts):
+
+  1. Type `T` can be implicitly cast to type `U`;
+  1. When both `T` and `U` are built-in arithmetic types (`bool`, integers, and floating-point numbers), the conversion from `T` to `U` is not lossy (in other words, any value representable by `T` can also be represented by `U`); and
+  1. When `U` is a reference, `T` must also be a reference (as the underlying matcher may be interested in the address of the `U` value).
+
+The code won't compile if any of these conditions isn't met.
+
+Here's one example:
+
+```
+using ::testing::SafeMatcherCast;
+
+// A base class and a child class.
+class Base { ... };
+class Derived : public Base { ... };
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(DoThis, void(Derived* derived));
+};
+...
+
+  MockFoo foo;
+  // m is a Matcher<Base*> we got from somewhere.
+  EXPECT_CALL(foo, DoThis(SafeMatcherCast<Derived*>(m)));
+```
+
+If you find `SafeMatcherCast<T>(m)` too limiting, you can use a similar
+function `MatcherCast<T>(m)`. The difference is that `MatcherCast` works
+as long as you can `static_cast` type `T` to type `U`.
+
+`MatcherCast` essentially lets you bypass C++'s type system
+(`static_cast` isn't always safe as it could throw away information,
+for example), so be careful not to misuse/abuse it.
+
+## Selecting Between Overloaded Functions ##
+
+If you expect an overloaded function to be called, the compiler may
+need some help on which overloaded version it is.
+
+To disambiguate functions overloaded on the const-ness of this object,
+use the `Const()` argument wrapper.
+
+```
+using ::testing::ReturnRef;
+
+class MockFoo : public Foo {
+  ...
+  MOCK_METHOD0(GetBar, Bar&());
+  MOCK_CONST_METHOD0(GetBar, const Bar&());
+};
+...
+
+  MockFoo foo;
+  Bar bar1, bar2;
+  EXPECT_CALL(foo, GetBar())         // The non-const GetBar().
+      .WillOnce(ReturnRef(bar1));
+  EXPECT_CALL(Const(foo), GetBar())  // The const GetBar().
+      .WillOnce(ReturnRef(bar2));
+```
+
+(`Const()` is defined by Google Mock and returns a `const` reference
+to its argument.)
+
+To disambiguate overloaded functions with the same number of arguments
+but different argument types, you may need to specify the exact type
+of a matcher, either by wrapping your matcher in `Matcher<type>()`, or
+using a matcher whose type is fixed (`TypedEq<type>`, `An<type>()`,
+etc):
+
+```
+using ::testing::An;
+using ::testing::Lt;
+using ::testing::Matcher;
+using ::testing::TypedEq;
+
+class MockPrinter : public Printer {
+ public:
+  MOCK_METHOD1(Print, void(int n));
+  MOCK_METHOD1(Print, void(char c));
+};
+
+TEST(PrinterTest, Print) {
+  MockPrinter printer;
+
+  EXPECT_CALL(printer, Print(An<int>()));            // void Print(int);
+  EXPECT_CALL(printer, Print(Matcher<int>(Lt(5))));  // void Print(int);
+  EXPECT_CALL(printer, Print(TypedEq<char>('a')));   // void Print(char);
+
+  printer.Print(3);
+  printer.Print(6);
+  printer.Print('a');
+}
+```
+
+## Performing Different Actions Based on the Arguments ##
+
+When a mock method is called, the _last_ matching expectation that's
+still active will be selected (think "newer overrides older"). So, you
+can make a method do different things depending on its argument values
+like this:
+
+```
+using ::testing::_;
+using ::testing::Lt;
+using ::testing::Return;
+...
+  // The default case.
+  EXPECT_CALL(foo, DoThis(_))
+      .WillRepeatedly(Return('b'));
+
+  // The more specific case.
+  EXPECT_CALL(foo, DoThis(Lt(5)))
+      .WillRepeatedly(Return('a'));
+```
+
+Now, if `foo.DoThis()` is called with a value less than 5, `'a'` will
+be returned; otherwise `'b'` will be returned.
+
+## Matching Multiple Arguments as a Whole ##
+
+Sometimes it's not enough to match the arguments individually. For
+example, we may want to say that the first argument must be less than
+the second argument. The `With()` clause allows us to match
+all arguments of a mock function as a whole. For example,
+
+```
+using ::testing::_;
+using ::testing::Lt;
+using ::testing::Ne;
+...
+  EXPECT_CALL(foo, InRange(Ne(0), _))
+      .With(Lt());
+```
+
+says that the first argument of `InRange()` must not be 0, and must be
+less than the second argument.
+
+The expression inside `With()` must be a matcher of type
+`Matcher<tr1::tuple<A1, ..., An> >`, where `A1`, ..., `An` are the
+types of the function arguments.
+
+You can also write `AllArgs(m)` instead of `m` inside `.With()`. The
+two forms are equivalent, but `.With(AllArgs(Lt()))` is more readable
+than `.With(Lt())`.
+
+You can use `Args<k1, ..., kn>(m)` to match the `n` selected arguments
+(as a tuple) against `m`. For example,
+
+```
+using ::testing::_;
+using ::testing::AllOf;
+using ::testing::Args;
+using ::testing::Lt;
+...
+  EXPECT_CALL(foo, Blah(_, _, _))
+      .With(AllOf(Args<0, 1>(Lt()), Args<1, 2>(Lt())));
+```
+
+says that `Blah()` will be called with arguments `x`, `y`, and `z` where
+`x < y < z`.
+
+As a convenience and example, Google Mock provides some matchers for
+2-tuples, including the `Lt()` matcher above. See the [CheatSheet](V1_7_CheatSheet.md) for
+the complete list.
+
+Note that if you want to pass the arguments to a predicate of your own
+(e.g. `.With(Args<0, 1>(Truly(&MyPredicate)))`), that predicate MUST be
+written to take a `tr1::tuple` as its argument; Google Mock will pass the `n`
+selected arguments as _one_ single tuple to the predicate.
+
+## Using Matchers as Predicates ##
+
+Have you noticed that a matcher is just a fancy predicate that also
+knows how to describe itself? Many existing algorithms take predicates
+as arguments (e.g. those defined in STL's `<algorithm>` header), and
+it would be a shame if Google Mock matchers are not allowed to
+participate.
+
+Luckily, you can use a matcher where a unary predicate functor is
+expected by wrapping it inside the `Matches()` function. For example,
+
+```
+#include <algorithm>
+#include <vector>
+
+std::vector<int> v;
+...
+// How many elements in v are >= 10?
+const int count = count_if(v.begin(), v.end(), Matches(Ge(10)));
+```
+
+Since you can build complex matchers from simpler ones easily using
+Google Mock, this gives you a way to conveniently construct composite
+predicates (doing the same using STL's `<functional>` header is just
+painful). For example, here's a predicate that's satisfied by any
+number that is >= 0, <= 100, and != 50:
+
+```
+Matches(AllOf(Ge(0), Le(100), Ne(50)))
+```
+
+## Using Matchers in Google Test Assertions ##
+
+Since matchers are basically predicates that also know how to describe
+themselves, there is a way to take advantage of them in
+[Google Test](http://code.google.com/p/googletest/) assertions. It's
+called `ASSERT_THAT` and `EXPECT_THAT`:
+
+```
+  ASSERT_THAT(value, matcher);  // Asserts that value matches matcher.
+  EXPECT_THAT(value, matcher);  // The non-fatal version.
+```
+
+For example, in a Google Test test you can write:
+
+```
+#include "gmock/gmock.h"
+
+using ::testing::AllOf;
+using ::testing::Ge;
+using ::testing::Le;
+using ::testing::MatchesRegex;
+using ::testing::StartsWith;
+...
+
+  EXPECT_THAT(Foo(), StartsWith("Hello"));
+  EXPECT_THAT(Bar(), MatchesRegex("Line \\d+"));
+  ASSERT_THAT(Baz(), AllOf(Ge(5), Le(10)));
+```
+
+which (as you can probably guess) executes `Foo()`, `Bar()`, and
+`Baz()`, and verifies that:
+
+  * `Foo()` returns a string that starts with `"Hello"`.
+  * `Bar()` returns a string that matches regular expression `"Line \\d+"`.
+  * `Baz()` returns a number in the range [5, 10].
+
+The nice thing about these macros is that _they read like
+English_. They generate informative messages too. For example, if the
+first `EXPECT_THAT()` above fails, the message will be something like:
+
+```
+Value of: Foo()
+  Actual: "Hi, world!"
+Expected: starts with "Hello"
+```
+
+**Credit:** The idea of `(ASSERT|EXPECT)_THAT` was stolen from the
+[Hamcrest](http://code.google.com/p/hamcrest/) project, which adds
+`assertThat()` to JUnit.
+
+## Using Predicates as Matchers ##
+
+Google Mock provides a built-in set of matchers. In case you find them
+lacking, you can use an arbitray unary predicate function or functor
+as a matcher - as long as the predicate accepts a value of the type
+you want. You do this by wrapping the predicate inside the `Truly()`
+function, for example:
+
+```
+using ::testing::Truly;
+
+int IsEven(int n) { return (n % 2) == 0 ? 1 : 0; }
+...
+
+  // Bar() must be called with an even number.
+  EXPECT_CALL(foo, Bar(Truly(IsEven)));
+```
+
+Note that the predicate function / functor doesn't have to return
+`bool`. It works as long as the return value can be used as the
+condition in statement `if (condition) ...`.
+
+## Matching Arguments that Are Not Copyable ##
+
+When you do an `EXPECT_CALL(mock_obj, Foo(bar))`, Google Mock saves
+away a copy of `bar`. When `Foo()` is called later, Google Mock
+compares the argument to `Foo()` with the saved copy of `bar`. This
+way, you don't need to worry about `bar` being modified or destroyed
+after the `EXPECT_CALL()` is executed. The same is true when you use
+matchers like `Eq(bar)`, `Le(bar)`, and so on.
+
+But what if `bar` cannot be copied (i.e. has no copy constructor)? You
+could define your own matcher function and use it with `Truly()`, as
+the previous couple of recipes have shown. Or, you may be able to get
+away from it if you can guarantee that `bar` won't be changed after
+the `EXPECT_CALL()` is executed. Just tell Google Mock that it should
+save a reference to `bar`, instead of a copy of it. Here's how:
+
+```
+using ::testing::Eq;
+using ::testing::ByRef;
+using ::testing::Lt;
+...
+  // Expects that Foo()'s argument == bar.
+  EXPECT_CALL(mock_obj, Foo(Eq(ByRef(bar))));
+
+  // Expects that Foo()'s argument < bar.
+  EXPECT_CALL(mock_obj, Foo(Lt(ByRef(bar))));
+```
+
+Remember: if you do this, don't change `bar` after the
+`EXPECT_CALL()`, or the result is undefined.
+
+## Validating a Member of an Object ##
+
+Often a mock function takes a reference to object as an argument. When
+matching the argument, you may not want to compare the entire object
+against a fixed object, as that may be over-specification. Instead,
+you may need to validate a certain member variable or the result of a
+certain getter method of the object. You can do this with `Field()`
+and `Property()`. More specifically,
+
+```
+Field(&Foo::bar, m)
+```
+
+is a matcher that matches a `Foo` object whose `bar` member variable
+satisfies matcher `m`.
+
+```
+Property(&Foo::baz, m)
+```
+
+is a matcher that matches a `Foo` object whose `baz()` method returns
+a value that satisfies matcher `m`.
+
+For example:
+
+> | `Field(&Foo::number, Ge(3))` | Matches `x` where `x.number >= 3`. |
+|:-----------------------------|:-----------------------------------|
+> | `Property(&Foo::name, StartsWith("John "))` | Matches `x` where `x.name()` starts with `"John "`. |
+
+Note that in `Property(&Foo::baz, ...)`, method `baz()` must take no
+argument and be declared as `const`.
+
+BTW, `Field()` and `Property()` can also match plain pointers to
+objects. For instance,
+
+```
+Field(&Foo::number, Ge(3))
+```
+
+matches a plain pointer `p` where `p->number >= 3`. If `p` is `NULL`,
+the match will always fail regardless of the inner matcher.
+
+What if you want to validate more than one members at the same time?
+Remember that there is `AllOf()`.
+
+## Validating the Value Pointed to by a Pointer Argument ##
+
+C++ functions often take pointers as arguments. You can use matchers
+like `IsNull()`, `NotNull()`, and other comparison matchers to match a
+pointer, but what if you want to make sure the value _pointed to_ by
+the pointer, instead of the pointer itself, has a certain property?
+Well, you can use the `Pointee(m)` matcher.
+
+`Pointee(m)` matches a pointer iff `m` matches the value the pointer
+points to. For example:
+
+```
+using ::testing::Ge;
+using ::testing::Pointee;
+...
+  EXPECT_CALL(foo, Bar(Pointee(Ge(3))));
+```
+
+expects `foo.Bar()` to be called with a pointer that points to a value
+greater than or equal to 3.
+
+One nice thing about `Pointee()` is that it treats a `NULL` pointer as
+a match failure, so you can write `Pointee(m)` instead of
+
+```
+  AllOf(NotNull(), Pointee(m))
+```
+
+without worrying that a `NULL` pointer will crash your test.
+
+Also, did we tell you that `Pointee()` works with both raw pointers
+**and** smart pointers (`linked_ptr`, `shared_ptr`, `scoped_ptr`, and
+etc)?
+
+What if you have a pointer to pointer? You guessed it - you can use
+nested `Pointee()` to probe deeper inside the value. For example,
+`Pointee(Pointee(Lt(3)))` matches a pointer that points to a pointer
+that points to a number less than 3 (what a mouthful...).
+
+## Testing a Certain Property of an Object ##
+
+Sometimes you want to specify that an object argument has a certain
+property, but there is no existing matcher that does this. If you want
+good error messages, you should define a matcher. If you want to do it
+quick and dirty, you could get away with writing an ordinary function.
+
+Let's say you have a mock function that takes an object of type `Foo`,
+which has an `int bar()` method and an `int baz()` method, and you
+want to constrain that the argument's `bar()` value plus its `baz()`
+value is a given number. Here's how you can define a matcher to do it:
+
+```
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+
+class BarPlusBazEqMatcher : public MatcherInterface<const Foo&> {
+ public:
+  explicit BarPlusBazEqMatcher(int expected_sum)
+      : expected_sum_(expected_sum) {}
+
+  virtual bool MatchAndExplain(const Foo& foo,
+                               MatchResultListener* listener) const {
+    return (foo.bar() + foo.baz()) == expected_sum_;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "bar() + baz() equals " << expected_sum_;
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "bar() + baz() does not equal " << expected_sum_;
+  }
+ private:
+  const int expected_sum_;
+};
+
+inline Matcher<const Foo&> BarPlusBazEq(int expected_sum) {
+  return MakeMatcher(new BarPlusBazEqMatcher(expected_sum));
+}
+
+...
+
+  EXPECT_CALL(..., DoThis(BarPlusBazEq(5)))...;
+```
+
+## Matching Containers ##
+
+Sometimes an STL container (e.g. list, vector, map, ...) is passed to
+a mock function and you may want to validate it. Since most STL
+containers support the `==` operator, you can write
+`Eq(expected_container)` or simply `expected_container` to match a
+container exactly.
+
+Sometimes, though, you may want to be more flexible (for example, the
+first element must be an exact match, but the second element can be
+any positive number, and so on). Also, containers used in tests often
+have a small number of elements, and having to define the expected
+container out-of-line is a bit of a hassle.
+
+You can use the `ElementsAre()` or `UnorderedElementsAre()` matcher in
+such cases:
+
+```
+using ::testing::_;
+using ::testing::ElementsAre;
+using ::testing::Gt;
+...
+
+  MOCK_METHOD1(Foo, void(const vector<int>& numbers));
+...
+
+  EXPECT_CALL(mock, Foo(ElementsAre(1, Gt(0), _, 5)));
+```
+
+The above matcher says that the container must have 4 elements, which
+must be 1, greater than 0, anything, and 5 respectively.
+
+If you instead write:
+
+```
+using ::testing::_;
+using ::testing::Gt;
+using ::testing::UnorderedElementsAre;
+...
+
+  MOCK_METHOD1(Foo, void(const vector<int>& numbers));
+...
+
+  EXPECT_CALL(mock, Foo(UnorderedElementsAre(1, Gt(0), _, 5)));
+```
+
+It means that the container must have 4 elements, which under some
+permutation must be 1, greater than 0, anything, and 5 respectively.
+
+`ElementsAre()` and `UnorderedElementsAre()` are overloaded to take 0
+to 10 arguments. If more are needed, you can place them in a C-style
+array and use `ElementsAreArray()` or `UnorderedElementsAreArray()`
+instead:
+
+```
+using ::testing::ElementsAreArray;
+...
+
+  // ElementsAreArray accepts an array of element values.
+  const int expected_vector1[] = { 1, 5, 2, 4, ... };
+  EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector1)));
+
+  // Or, an array of element matchers.
+  Matcher<int> expected_vector2 = { 1, Gt(2), _, 3, ... };
+  EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector2)));
+```
+
+In case the array needs to be dynamically created (and therefore the
+array size cannot be inferred by the compiler), you can give
+`ElementsAreArray()` an additional argument to specify the array size:
+
+```
+using ::testing::ElementsAreArray;
+...
+  int* const expected_vector3 = new int[count];
+  ... fill expected_vector3 with values ...
+  EXPECT_CALL(mock, Foo(ElementsAreArray(expected_vector3, count)));
+```
+
+**Tips:**
+
+  * `ElementsAre*()` can be used to match _any_ container that implements the STL iterator pattern (i.e. it has a `const_iterator` type and supports `begin()/end()`), not just the ones defined in STL. It will even work with container types yet to be written - as long as they follows the above pattern.
+  * You can use nested `ElementsAre*()` to match nested (multi-dimensional) containers.
+  * If the container is passed by pointer instead of by reference, just write `Pointee(ElementsAre*(...))`.
+  * The order of elements _matters_ for `ElementsAre*()`. Therefore don't use it with containers whose element order is undefined (e.g. `hash_map`).
+
+## Sharing Matchers ##
+
+Under the hood, a Google Mock matcher object consists of a pointer to
+a ref-counted implementation object. Copying matchers is allowed and
+very efficient, as only the pointer is copied. When the last matcher
+that references the implementation object dies, the implementation
+object will be deleted.
+
+Therefore, if you have some complex matcher that you want to use again
+and again, there is no need to build it everytime. Just assign it to a
+matcher variable and use that variable repeatedly! For example,
+
+```
+  Matcher<int> in_range = AllOf(Gt(5), Le(10));
+  ... use in_range as a matcher in multiple EXPECT_CALLs ...
+```
+
+# Setting Expectations #
+
+## Knowing When to Expect ##
+
+`ON_CALL` is likely the single most under-utilized construct in Google Mock.
+
+There are basically two constructs for defining the behavior of a mock object: `ON_CALL` and `EXPECT_CALL`. The difference? `ON_CALL` defines what happens when a mock method is called, but _doesn't imply any expectation on the method being called._ `EXPECT_CALL` not only defines the behavior, but also sets an expectation that _the method will be called with the given arguments, for the given number of times_ (and _in the given order_ when you specify the order too).
+
+Since `EXPECT_CALL` does more, isn't it better than `ON_CALL`? Not really. Every `EXPECT_CALL` adds a constraint on the behavior of the code under test. Having more constraints than necessary is _baaad_ - even worse than not having enough constraints.
+
+This may be counter-intuitive. How could tests that verify more be worse than tests that verify less? Isn't verification the whole point of tests?
+
+The answer, lies in _what_ a test should verify. **A good test verifies the contract of the code.** If a test over-specifies, it doesn't leave enough freedom to the implementation. As a result, changing the implementation without breaking the contract (e.g. refactoring and optimization), which should be perfectly fine to do, can break such tests. Then you have to spend time fixing them, only to see them broken again the next time the implementation is changed.
+
+Keep in mind that one doesn't have to verify more than one property in one test. In fact, **it's a good style to verify only one thing in one test.** If you do that, a bug will likely break only one or two tests instead of dozens (which case would you rather debug?). If you are also in the habit of giving tests descriptive names that tell what they verify, you can often easily guess what's wrong just from the test log itself.
+
+So use `ON_CALL` by default, and only use `EXPECT_CALL` when you actually intend to verify that the call is made. For example, you may have a bunch of `ON_CALL`s in your test fixture to set the common mock behavior shared by all tests in the same group, and write (scarcely) different `EXPECT_CALL`s in different `TEST_F`s to verify different aspects of the code's behavior. Compared with the style where each `TEST` has many `EXPECT_CALL`s, this leads to tests that are more resilient to implementational changes (and thus less likely to require maintenance) and makes the intent of the tests more obvious (so they are easier to maintain when you do need to maintain them).
+
+## Ignoring Uninteresting Calls ##
+
+If you are not interested in how a mock method is called, just don't
+say anything about it. In this case, if the method is ever called,
+Google Mock will perform its default action to allow the test program
+to continue. If you are not happy with the default action taken by
+Google Mock, you can override it using `DefaultValue<T>::Set()`
+(described later in this document) or `ON_CALL()`.
+
+Please note that once you expressed interest in a particular mock
+method (via `EXPECT_CALL()`), all invocations to it must match some
+expectation. If this function is called but the arguments don't match
+any `EXPECT_CALL()` statement, it will be an error.
+
+## Disallowing Unexpected Calls ##
+
+If a mock method shouldn't be called at all, explicitly say so:
+
+```
+using ::testing::_;
+...
+  EXPECT_CALL(foo, Bar(_))
+      .Times(0);
+```
+
+If some calls to the method are allowed, but the rest are not, just
+list all the expected calls:
+
+```
+using ::testing::AnyNumber;
+using ::testing::Gt;
+...
+  EXPECT_CALL(foo, Bar(5));
+  EXPECT_CALL(foo, Bar(Gt(10)))
+      .Times(AnyNumber());
+```
+
+A call to `foo.Bar()` that doesn't match any of the `EXPECT_CALL()`
+statements will be an error.
+
+## Expecting Ordered Calls ##
+
+Although an `EXPECT_CALL()` statement defined earlier takes precedence
+when Google Mock tries to match a function call with an expectation,
+by default calls don't have to happen in the order `EXPECT_CALL()`
+statements are written. For example, if the arguments match the
+matchers in the third `EXPECT_CALL()`, but not those in the first two,
+then the third expectation will be used.
+
+If you would rather have all calls occur in the order of the
+expectations, put the `EXPECT_CALL()` statements in a block where you
+define a variable of type `InSequence`:
+
+```
+  using ::testing::_;
+  using ::testing::InSequence;
+
+  {
+    InSequence s;
+
+    EXPECT_CALL(foo, DoThis(5));
+    EXPECT_CALL(bar, DoThat(_))
+        .Times(2);
+    EXPECT_CALL(foo, DoThis(6));
+  }
+```
+
+In this example, we expect a call to `foo.DoThis(5)`, followed by two
+calls to `bar.DoThat()` where the argument can be anything, which are
+in turn followed by a call to `foo.DoThis(6)`. If a call occurred
+out-of-order, Google Mock will report an error.
+
+## Expecting Partially Ordered Calls ##
+
+Sometimes requiring everything to occur in a predetermined order can
+lead to brittle tests. For example, we may care about `A` occurring
+before both `B` and `C`, but aren't interested in the relative order
+of `B` and `C`. In this case, the test should reflect our real intent,
+instead of being overly constraining.
+
+Google Mock allows you to impose an arbitrary DAG (directed acyclic
+graph) on the calls. One way to express the DAG is to use the
+[After](http://code.google.com/p/googlemock/wiki/V1_7_CheatSheet#The_After_Clause) clause of `EXPECT_CALL`.
+
+Another way is via the `InSequence()` clause (not the same as the
+`InSequence` class), which we borrowed from jMock 2. It's less
+flexible than `After()`, but more convenient when you have long chains
+of sequential calls, as it doesn't require you to come up with
+different names for the expectations in the chains.  Here's how it
+works:
+
+If we view `EXPECT_CALL()` statements as nodes in a graph, and add an
+edge from node A to node B wherever A must occur before B, we can get
+a DAG. We use the term "sequence" to mean a directed path in this
+DAG. Now, if we decompose the DAG into sequences, we just need to know
+which sequences each `EXPECT_CALL()` belongs to in order to be able to
+reconstruct the orginal DAG.
+
+So, to specify the partial order on the expectations we need to do two
+things: first to define some `Sequence` objects, and then for each
+`EXPECT_CALL()` say which `Sequence` objects it is part
+of. Expectations in the same sequence must occur in the order they are
+written. For example,
+
+```
+  using ::testing::Sequence;
+
+  Sequence s1, s2;
+
+  EXPECT_CALL(foo, A())
+      .InSequence(s1, s2);
+  EXPECT_CALL(bar, B())
+      .InSequence(s1);
+  EXPECT_CALL(bar, C())
+      .InSequence(s2);
+  EXPECT_CALL(foo, D())
+      .InSequence(s2);
+```
+
+specifies the following DAG (where `s1` is `A -> B`, and `s2` is `A ->
+C -> D`):
+
+```
+       +---> B
+       |
+  A ---|
+       |
+       +---> C ---> D
+```
+
+This means that A must occur before B and C, and C must occur before
+D. There's no restriction about the order other than these.
+
+## Controlling When an Expectation Retires ##
+
+When a mock method is called, Google Mock only consider expectations
+that are still active. An expectation is active when created, and
+becomes inactive (aka _retires_) when a call that has to occur later
+has occurred. For example, in
+
+```
+  using ::testing::_;
+  using ::testing::Sequence;
+
+  Sequence s1, s2;
+
+  EXPECT_CALL(log, Log(WARNING, _, "File too large."))     // #1
+      .Times(AnyNumber())
+      .InSequence(s1, s2);
+  EXPECT_CALL(log, Log(WARNING, _, "Data set is empty."))  // #2
+      .InSequence(s1);
+  EXPECT_CALL(log, Log(WARNING, _, "User not found."))     // #3
+      .InSequence(s2);
+```
+
+as soon as either #2 or #3 is matched, #1 will retire. If a warning
+`"File too large."` is logged after this, it will be an error.
+
+Note that an expectation doesn't retire automatically when it's
+saturated. For example,
+
+```
+using ::testing::_;
+...
+  EXPECT_CALL(log, Log(WARNING, _, _));                  // #1
+  EXPECT_CALL(log, Log(WARNING, _, "File too large."));  // #2
+```
+
+says that there will be exactly one warning with the message `"File
+too large."`. If the second warning contains this message too, #2 will
+match again and result in an upper-bound-violated error.
+
+If this is not what you want, you can ask an expectation to retire as
+soon as it becomes saturated:
+
+```
+using ::testing::_;
+...
+  EXPECT_CALL(log, Log(WARNING, _, _));                 // #1
+  EXPECT_CALL(log, Log(WARNING, _, "File too large."))  // #2
+      .RetiresOnSaturation();
+```
+
+Here #2 can be used only once, so if you have two warnings with the
+message `"File too large."`, the first will match #2 and the second
+will match #1 - there will be no error.
+
+# Using Actions #
+
+## Returning References from Mock Methods ##
+
+If a mock function's return type is a reference, you need to use
+`ReturnRef()` instead of `Return()` to return a result:
+
+```
+using ::testing::ReturnRef;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD0(GetBar, Bar&());
+};
+...
+
+  MockFoo foo;
+  Bar bar;
+  EXPECT_CALL(foo, GetBar())
+      .WillOnce(ReturnRef(bar));
+```
+
+## Returning Live Values from Mock Methods ##
+
+The `Return(x)` action saves a copy of `x` when the action is
+_created_, and always returns the same value whenever it's
+executed. Sometimes you may want to instead return the _live_ value of
+`x` (i.e. its value at the time when the action is _executed_.).
+
+If the mock function's return type is a reference, you can do it using
+`ReturnRef(x)`, as shown in the previous recipe ("Returning References
+from Mock Methods"). However, Google Mock doesn't let you use
+`ReturnRef()` in a mock function whose return type is not a reference,
+as doing that usually indicates a user error. So, what shall you do?
+
+You may be tempted to try `ByRef()`:
+
+```
+using testing::ByRef;
+using testing::Return;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD0(GetValue, int());
+};
+...
+  int x = 0;
+  MockFoo foo;
+  EXPECT_CALL(foo, GetValue())
+      .WillRepeatedly(Return(ByRef(x)));
+  x = 42;
+  EXPECT_EQ(42, foo.GetValue());
+```
+
+Unfortunately, it doesn't work here. The above code will fail with error:
+
+```
+Value of: foo.GetValue()
+  Actual: 0
+Expected: 42
+```
+
+The reason is that `Return(value)` converts `value` to the actual
+return type of the mock function at the time when the action is
+_created_, not when it is _executed_. (This behavior was chosen for
+the action to be safe when `value` is a proxy object that references
+some temporary objects.) As a result, `ByRef(x)` is converted to an
+`int` value (instead of a `const int&`) when the expectation is set,
+and `Return(ByRef(x))` will always return 0.
+
+`ReturnPointee(pointer)` was provided to solve this problem
+specifically. It returns the value pointed to by `pointer` at the time
+the action is _executed_:
+
+```
+using testing::ReturnPointee;
+...
+  int x = 0;
+  MockFoo foo;
+  EXPECT_CALL(foo, GetValue())
+      .WillRepeatedly(ReturnPointee(&x));  // Note the & here.
+  x = 42;
+  EXPECT_EQ(42, foo.GetValue());  // This will succeed now.
+```
+
+## Combining Actions ##
+
+Want to do more than one thing when a function is called? That's
+fine. `DoAll()` allow you to do sequence of actions every time. Only
+the return value of the last action in the sequence will be used.
+
+```
+using ::testing::DoAll;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(Bar, bool(int n));
+};
+...
+
+  EXPECT_CALL(foo, Bar(_))
+      .WillOnce(DoAll(action_1,
+                      action_2,
+                      ...
+                      action_n));
+```
+
+## Mocking Side Effects ##
+
+Sometimes a method exhibits its effect not via returning a value but
+via side effects. For example, it may change some global state or
+modify an output argument. To mock side effects, in general you can
+define your own action by implementing `::testing::ActionInterface`.
+
+If all you need to do is to change an output argument, the built-in
+`SetArgPointee()` action is convenient:
+
+```
+using ::testing::SetArgPointee;
+
+class MockMutator : public Mutator {
+ public:
+  MOCK_METHOD2(Mutate, void(bool mutate, int* value));
+  ...
+};
+...
+
+  MockMutator mutator;
+  EXPECT_CALL(mutator, Mutate(true, _))
+      .WillOnce(SetArgPointee<1>(5));
+```
+
+In this example, when `mutator.Mutate()` is called, we will assign 5
+to the `int` variable pointed to by argument #1
+(0-based).
+
+`SetArgPointee()` conveniently makes an internal copy of the
+value you pass to it, removing the need to keep the value in scope and
+alive. The implication however is that the value must have a copy
+constructor and assignment operator.
+
+If the mock method also needs to return a value as well, you can chain
+`SetArgPointee()` with `Return()` using `DoAll()`:
+
+```
+using ::testing::_;
+using ::testing::Return;
+using ::testing::SetArgPointee;
+
+class MockMutator : public Mutator {
+ public:
+  ...
+  MOCK_METHOD1(MutateInt, bool(int* value));
+};
+...
+
+  MockMutator mutator;
+  EXPECT_CALL(mutator, MutateInt(_))
+      .WillOnce(DoAll(SetArgPointee<0>(5),
+                      Return(true)));
+```
+
+If the output argument is an array, use the
+`SetArrayArgument<N>(first, last)` action instead. It copies the
+elements in source range `[first, last)` to the array pointed to by
+the `N`-th (0-based) argument:
+
+```
+using ::testing::NotNull;
+using ::testing::SetArrayArgument;
+
+class MockArrayMutator : public ArrayMutator {
+ public:
+  MOCK_METHOD2(Mutate, void(int* values, int num_values));
+  ...
+};
+...
+
+  MockArrayMutator mutator;
+  int values[5] = { 1, 2, 3, 4, 5 };
+  EXPECT_CALL(mutator, Mutate(NotNull(), 5))
+      .WillOnce(SetArrayArgument<0>(values, values + 5));
+```
+
+This also works when the argument is an output iterator:
+
+```
+using ::testing::_;
+using ::testing::SeArrayArgument;
+
+class MockRolodex : public Rolodex {
+ public:
+  MOCK_METHOD1(GetNames, void(std::back_insert_iterator<vector<string> >));
+  ...
+};
+...
+
+  MockRolodex rolodex;
+  vector<string> names;
+  names.push_back("George");
+  names.push_back("John");
+  names.push_back("Thomas");
+  EXPECT_CALL(rolodex, GetNames(_))
+      .WillOnce(SetArrayArgument<0>(names.begin(), names.end()));
+```
+
+## Changing a Mock Object's Behavior Based on the State ##
+
+If you expect a call to change the behavior of a mock object, you can use `::testing::InSequence` to specify different behaviors before and after the call:
+
+```
+using ::testing::InSequence;
+using ::testing::Return;
+
+...
+  {
+    InSequence seq;
+    EXPECT_CALL(my_mock, IsDirty())
+        .WillRepeatedly(Return(true));
+    EXPECT_CALL(my_mock, Flush());
+    EXPECT_CALL(my_mock, IsDirty())
+        .WillRepeatedly(Return(false));
+  }
+  my_mock.FlushIfDirty();
+```
+
+This makes `my_mock.IsDirty()` return `true` before `my_mock.Flush()` is called and return `false` afterwards.
+
+If the behavior change is more complex, you can store the effects in a variable and make a mock method get its return value from that variable:
+
+```
+using ::testing::_;
+using ::testing::SaveArg;
+using ::testing::Return;
+
+ACTION_P(ReturnPointee, p) { return *p; }
+...
+  int previous_value = 0;
+  EXPECT_CALL(my_mock, GetPrevValue())
+      .WillRepeatedly(ReturnPointee(&previous_value));
+  EXPECT_CALL(my_mock, UpdateValue(_))
+      .WillRepeatedly(SaveArg<0>(&previous_value));
+  my_mock.DoSomethingToUpdateValue();
+```
+
+Here `my_mock.GetPrevValue()` will always return the argument of the last `UpdateValue()` call.
+
+## Setting the Default Value for a Return Type ##
+
+If a mock method's return type is a built-in C++ type or pointer, by
+default it will return 0 when invoked. You only need to specify an
+action if this default value doesn't work for you.
+
+Sometimes, you may want to change this default value, or you may want
+to specify a default value for types Google Mock doesn't know
+about. You can do this using the `::testing::DefaultValue` class
+template:
+
+```
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD0(CalculateBar, Bar());
+};
+...
+
+  Bar default_bar;
+  // Sets the default return value for type Bar.
+  DefaultValue<Bar>::Set(default_bar);
+
+  MockFoo foo;
+
+  // We don't need to specify an action here, as the default
+  // return value works for us.
+  EXPECT_CALL(foo, CalculateBar());
+
+  foo.CalculateBar();  // This should return default_bar.
+
+  // Unsets the default return value.
+  DefaultValue<Bar>::Clear();
+```
+
+Please note that changing the default value for a type can make you
+tests hard to understand. We recommend you to use this feature
+judiciously. For example, you may want to make sure the `Set()` and
+`Clear()` calls are right next to the code that uses your mock.
+
+## Setting the Default Actions for a Mock Method ##
+
+You've learned how to change the default value of a given
+type. However, this may be too coarse for your purpose: perhaps you
+have two mock methods with the same return type and you want them to
+have different behaviors. The `ON_CALL()` macro allows you to
+customize your mock's behavior at the method level:
+
+```
+using ::testing::_;
+using ::testing::AnyNumber;
+using ::testing::Gt;
+using ::testing::Return;
+...
+  ON_CALL(foo, Sign(_))
+      .WillByDefault(Return(-1));
+  ON_CALL(foo, Sign(0))
+      .WillByDefault(Return(0));
+  ON_CALL(foo, Sign(Gt(0)))
+      .WillByDefault(Return(1));
+
+  EXPECT_CALL(foo, Sign(_))
+      .Times(AnyNumber());
+
+  foo.Sign(5);   // This should return 1.
+  foo.Sign(-9);  // This should return -1.
+  foo.Sign(0);   // This should return 0.
+```
+
+As you may have guessed, when there are more than one `ON_CALL()`
+statements, the news order take precedence over the older ones. In
+other words, the **last** one that matches the function arguments will
+be used. This matching order allows you to set up the common behavior
+in a mock object's constructor or the test fixture's set-up phase and
+specialize the mock's behavior later.
+
+## Using Functions/Methods/Functors as Actions ##
+
+If the built-in actions don't suit you, you can easily use an existing
+function, method, or functor as an action:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD2(Sum, int(int x, int y));
+  MOCK_METHOD1(ComplexJob, bool(int x));
+};
+
+int CalculateSum(int x, int y) { return x + y; }
+
+class Helper {
+ public:
+  bool ComplexJob(int x);
+};
+...
+
+  MockFoo foo;
+  Helper helper;
+  EXPECT_CALL(foo, Sum(_, _))
+      .WillOnce(Invoke(CalculateSum));
+  EXPECT_CALL(foo, ComplexJob(_))
+      .WillOnce(Invoke(&helper, &Helper::ComplexJob));
+
+  foo.Sum(5, 6);       // Invokes CalculateSum(5, 6).
+  foo.ComplexJob(10);  // Invokes helper.ComplexJob(10);
+```
+
+The only requirement is that the type of the function, etc must be
+_compatible_ with the signature of the mock function, meaning that the
+latter's arguments can be implicitly converted to the corresponding
+arguments of the former, and the former's return type can be
+implicitly converted to that of the latter. So, you can invoke
+something whose type is _not_ exactly the same as the mock function,
+as long as it's safe to do so - nice, huh?
+
+## Invoking a Function/Method/Functor Without Arguments ##
+
+`Invoke()` is very useful for doing actions that are more complex. It
+passes the mock function's arguments to the function or functor being
+invoked such that the callee has the full context of the call to work
+with. If the invoked function is not interested in some or all of the
+arguments, it can simply ignore them.
+
+Yet, a common pattern is that a test author wants to invoke a function
+without the arguments of the mock function. `Invoke()` allows her to
+do that using a wrapper function that throws away the arguments before
+invoking an underlining nullary function. Needless to say, this can be
+tedious and obscures the intent of the test.
+
+`InvokeWithoutArgs()` solves this problem. It's like `Invoke()` except
+that it doesn't pass the mock function's arguments to the
+callee. Here's an example:
+
+```
+using ::testing::_;
+using ::testing::InvokeWithoutArgs;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(ComplexJob, bool(int n));
+};
+
+bool Job1() { ... }
+...
+
+  MockFoo foo;
+  EXPECT_CALL(foo, ComplexJob(_))
+      .WillOnce(InvokeWithoutArgs(Job1));
+
+  foo.ComplexJob(10);  // Invokes Job1().
+```
+
+## Invoking an Argument of the Mock Function ##
+
+Sometimes a mock function will receive a function pointer or a functor
+(in other words, a "callable") as an argument, e.g.
+
+```
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD2(DoThis, bool(int n, bool (*fp)(int)));
+};
+```
+
+and you may want to invoke this callable argument:
+
+```
+using ::testing::_;
+...
+  MockFoo foo;
+  EXPECT_CALL(foo, DoThis(_, _))
+      .WillOnce(...);
+  // Will execute (*fp)(5), where fp is the
+  // second argument DoThis() receives.
+```
+
+Arghh, you need to refer to a mock function argument but C++ has no
+lambda (yet), so you have to define your own action. :-( Or do you
+really?
+
+Well, Google Mock has an action to solve _exactly_ this problem:
+
+```
+  InvokeArgument<N>(arg_1, arg_2, ..., arg_m)
+```
+
+will invoke the `N`-th (0-based) argument the mock function receives,
+with `arg_1`, `arg_2`, ..., and `arg_m`. No matter if the argument is
+a function pointer or a functor, Google Mock handles them both.
+
+With that, you could write:
+
+```
+using ::testing::_;
+using ::testing::InvokeArgument;
+...
+  EXPECT_CALL(foo, DoThis(_, _))
+      .WillOnce(InvokeArgument<1>(5));
+  // Will execute (*fp)(5), where fp is the
+  // second argument DoThis() receives.
+```
+
+What if the callable takes an argument by reference? No problem - just
+wrap it inside `ByRef()`:
+
+```
+...
+  MOCK_METHOD1(Bar, bool(bool (*fp)(int, const Helper&)));
+...
+using ::testing::_;
+using ::testing::ByRef;
+using ::testing::InvokeArgument;
+...
+
+  MockFoo foo;
+  Helper helper;
+  ...
+  EXPECT_CALL(foo, Bar(_))
+      .WillOnce(InvokeArgument<0>(5, ByRef(helper)));
+  // ByRef(helper) guarantees that a reference to helper, not a copy of it,
+  // will be passed to the callable.
+```
+
+What if the callable takes an argument by reference and we do **not**
+wrap the argument in `ByRef()`? Then `InvokeArgument()` will _make a
+copy_ of the argument, and pass a _reference to the copy_, instead of
+a reference to the original value, to the callable. This is especially
+handy when the argument is a temporary value:
+
+```
+...
+  MOCK_METHOD1(DoThat, bool(bool (*f)(const double& x, const string& s)));
+...
+using ::testing::_;
+using ::testing::InvokeArgument;
+...
+
+  MockFoo foo;
+  ...
+  EXPECT_CALL(foo, DoThat(_))
+      .WillOnce(InvokeArgument<0>(5.0, string("Hi")));
+  // Will execute (*f)(5.0, string("Hi")), where f is the function pointer
+  // DoThat() receives.  Note that the values 5.0 and string("Hi") are
+  // temporary and dead once the EXPECT_CALL() statement finishes.  Yet
+  // it's fine to perform this action later, since a copy of the values
+  // are kept inside the InvokeArgument action.
+```
+
+## Ignoring an Action's Result ##
+
+Sometimes you have an action that returns _something_, but you need an
+action that returns `void` (perhaps you want to use it in a mock
+function that returns `void`, or perhaps it needs to be used in
+`DoAll()` and it's not the last in the list). `IgnoreResult()` lets
+you do that. For example:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::Return;
+
+int Process(const MyData& data);
+string DoSomething();
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD1(Abc, void(const MyData& data));
+  MOCK_METHOD0(Xyz, bool());
+};
+...
+
+  MockFoo foo;
+  EXPECT_CALL(foo, Abc(_))
+  // .WillOnce(Invoke(Process));
+  // The above line won't compile as Process() returns int but Abc() needs
+  // to return void.
+      .WillOnce(IgnoreResult(Invoke(Process)));
+
+  EXPECT_CALL(foo, Xyz())
+      .WillOnce(DoAll(IgnoreResult(Invoke(DoSomething)),
+      // Ignores the string DoSomething() returns.
+                      Return(true)));
+```
+
+Note that you **cannot** use `IgnoreResult()` on an action that already
+returns `void`. Doing so will lead to ugly compiler errors.
+
+## Selecting an Action's Arguments ##
+
+Say you have a mock function `Foo()` that takes seven arguments, and
+you have a custom action that you want to invoke when `Foo()` is
+called. Trouble is, the custom action only wants three arguments:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+...
+  MOCK_METHOD7(Foo, bool(bool visible, const string& name, int x, int y,
+                         const map<pair<int, int>, double>& weight,
+                         double min_weight, double max_wight));
+...
+
+bool IsVisibleInQuadrant1(bool visible, int x, int y) {
+  return visible && x >= 0 && y >= 0;
+}
+...
+
+  EXPECT_CALL(mock, Foo(_, _, _, _, _, _, _))
+      .WillOnce(Invoke(IsVisibleInQuadrant1));  // Uh, won't compile. :-(
+```
+
+To please the compiler God, you can to define an "adaptor" that has
+the same signature as `Foo()` and calls the custom action with the
+right arguments:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+bool MyIsVisibleInQuadrant1(bool visible, const string& name, int x, int y,
+                            const map<pair<int, int>, double>& weight,
+                            double min_weight, double max_wight) {
+  return IsVisibleInQuadrant1(visible, x, y);
+}
+...
+
+  EXPECT_CALL(mock, Foo(_, _, _, _, _, _, _))
+      .WillOnce(Invoke(MyIsVisibleInQuadrant1));  // Now it works.
+```
+
+But isn't this awkward?
+
+Google Mock provides a generic _action adaptor_, so you can spend your
+time minding more important business than writing your own
+adaptors. Here's the syntax:
+
+```
+  WithArgs<N1, N2, ..., Nk>(action)
+```
+
+creates an action that passes the arguments of the mock function at
+the given indices (0-based) to the inner `action` and performs
+it. Using `WithArgs`, our original example can be written as:
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::WithArgs;
+...
+  EXPECT_CALL(mock, Foo(_, _, _, _, _, _, _))
+      .WillOnce(WithArgs<0, 2, 3>(Invoke(IsVisibleInQuadrant1)));
+      // No need to define your own adaptor.
+```
+
+For better readability, Google Mock also gives you:
+
+  * `WithoutArgs(action)` when the inner `action` takes _no_ argument, and
+  * `WithArg<N>(action)` (no `s` after `Arg`) when the inner `action` takes _one_ argument.
+
+As you may have realized, `InvokeWithoutArgs(...)` is just syntactic
+sugar for `WithoutArgs(Inovke(...))`.
+
+Here are more tips:
+
+  * The inner action used in `WithArgs` and friends does not have to be `Invoke()` -- it can be anything.
+  * You can repeat an argument in the argument list if necessary, e.g. `WithArgs<2, 3, 3, 5>(...)`.
+  * You can change the order of the arguments, e.g. `WithArgs<3, 2, 1>(...)`.
+  * The types of the selected arguments do _not_ have to match the signature of the inner action exactly. It works as long as they can be implicitly converted to the corresponding arguments of the inner action. For example, if the 4-th argument of the mock function is an `int` and `my_action` takes a `double`, `WithArg<4>(my_action)` will work.
+
+## Ignoring Arguments in Action Functions ##
+
+The selecting-an-action's-arguments recipe showed us one way to make a
+mock function and an action with incompatible argument lists fit
+together. The downside is that wrapping the action in
+`WithArgs<...>()` can get tedious for people writing the tests.
+
+If you are defining a function, method, or functor to be used with
+`Invoke*()`, and you are not interested in some of its arguments, an
+alternative to `WithArgs` is to declare the uninteresting arguments as
+`Unused`. This makes the definition less cluttered and less fragile in
+case the types of the uninteresting arguments change. It could also
+increase the chance the action function can be reused. For example,
+given
+
+```
+  MOCK_METHOD3(Foo, double(const string& label, double x, double y));
+  MOCK_METHOD3(Bar, double(int index, double x, double y));
+```
+
+instead of
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+
+double DistanceToOriginWithLabel(const string& label, double x, double y) {
+  return sqrt(x*x + y*y);
+}
+
+double DistanceToOriginWithIndex(int index, double x, double y) {
+  return sqrt(x*x + y*y);
+}
+...
+
+  EXEPCT_CALL(mock, Foo("abc", _, _))
+      .WillOnce(Invoke(DistanceToOriginWithLabel));
+  EXEPCT_CALL(mock, Bar(5, _, _))
+      .WillOnce(Invoke(DistanceToOriginWithIndex));
+```
+
+you could write
+
+```
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::Unused;
+
+double DistanceToOrigin(Unused, double x, double y) {
+  return sqrt(x*x + y*y);
+}
+...
+
+  EXEPCT_CALL(mock, Foo("abc", _, _))
+      .WillOnce(Invoke(DistanceToOrigin));
+  EXEPCT_CALL(mock, Bar(5, _, _))
+      .WillOnce(Invoke(DistanceToOrigin));
+```
+
+## Sharing Actions ##
+
+Just like matchers, a Google Mock action object consists of a pointer
+to a ref-counted implementation object. Therefore copying actions is
+also allowed and very efficient. When the last action that references
+the implementation object dies, the implementation object will be
+deleted.
+
+If you have some complex action that you want to use again and again,
+you may not have to build it from scratch everytime. If the action
+doesn't have an internal state (i.e. if it always does the same thing
+no matter how many times it has been called), you can assign it to an
+action variable and use that variable repeatedly. For example:
+
+```
+  Action<bool(int*)> set_flag = DoAll(SetArgPointee<0>(5),
+                                      Return(true));
+  ... use set_flag in .WillOnce() and .WillRepeatedly() ...
+```
+
+However, if the action has its own state, you may be surprised if you
+share the action object. Suppose you have an action factory
+`IncrementCounter(init)` which creates an action that increments and
+returns a counter whose initial value is `init`, using two actions
+created from the same expression and using a shared action will
+exihibit different behaviors. Example:
+
+```
+  EXPECT_CALL(foo, DoThis())
+      .WillRepeatedly(IncrementCounter(0));
+  EXPECT_CALL(foo, DoThat())
+      .WillRepeatedly(IncrementCounter(0));
+  foo.DoThis();  // Returns 1.
+  foo.DoThis();  // Returns 2.
+  foo.DoThat();  // Returns 1 - Blah() uses a different
+                 // counter than Bar()'s.
+```
+
+versus
+
+```
+  Action<int()> increment = IncrementCounter(0);
+
+  EXPECT_CALL(foo, DoThis())
+      .WillRepeatedly(increment);
+  EXPECT_CALL(foo, DoThat())
+      .WillRepeatedly(increment);
+  foo.DoThis();  // Returns 1.
+  foo.DoThis();  // Returns 2.
+  foo.DoThat();  // Returns 3 - the counter is shared.
+```
+
+# Misc Recipes on Using Google Mock #
+
+## Making the Compilation Faster ##
+
+Believe it or not, the _vast majority_ of the time spent on compiling
+a mock class is in generating its constructor and destructor, as they
+perform non-trivial tasks (e.g. verification of the
+expectations). What's more, mock methods with different signatures
+have different types and thus their constructors/destructors need to
+be generated by the compiler separately. As a result, if you mock many
+different types of methods, compiling your mock class can get really
+slow.
+
+If you are experiencing slow compilation, you can move the definition
+of your mock class' constructor and destructor out of the class body
+and into a `.cpp` file. This way, even if you `#include` your mock
+class in N files, the compiler only needs to generate its constructor
+and destructor once, resulting in a much faster compilation.
+
+Let's illustrate the idea using an example. Here's the definition of a
+mock class before applying this recipe:
+
+```
+// File mock_foo.h.
+...
+class MockFoo : public Foo {
+ public:
+  // Since we don't declare the constructor or the destructor,
+  // the compiler will generate them in every translation unit
+  // where this mock class is used.
+
+  MOCK_METHOD0(DoThis, int());
+  MOCK_METHOD1(DoThat, bool(const char* str));
+  ... more mock methods ...
+};
+```
+
+After the change, it would look like:
+
+```
+// File mock_foo.h.
+...
+class MockFoo : public Foo {
+ public:
+  // The constructor and destructor are declared, but not defined, here.
+  MockFoo();
+  virtual ~MockFoo();
+
+  MOCK_METHOD0(DoThis, int());
+  MOCK_METHOD1(DoThat, bool(const char* str));
+  ... more mock methods ...
+};
+```
+and
+```
+// File mock_foo.cpp.
+#include "path/to/mock_foo.h"
+
+// The definitions may appear trivial, but the functions actually do a
+// lot of things through the constructors/destructors of the member
+// variables used to implement the mock methods.
+MockFoo::MockFoo() {}
+MockFoo::~MockFoo() {}
+```
+
+## Forcing a Verification ##
+
+When it's being destoyed, your friendly mock object will automatically
+verify that all expectations on it have been satisfied, and will
+generate [Google Test](http://code.google.com/p/googletest/) failures
+if not. This is convenient as it leaves you with one less thing to
+worry about. That is, unless you are not sure if your mock object will
+be destoyed.
+
+How could it be that your mock object won't eventually be destroyed?
+Well, it might be created on the heap and owned by the code you are
+testing. Suppose there's a bug in that code and it doesn't delete the
+mock object properly - you could end up with a passing test when
+there's actually a bug.
+
+Using a heap checker is a good idea and can alleviate the concern, but
+its implementation may not be 100% reliable. So, sometimes you do want
+to _force_ Google Mock to verify a mock object before it is
+(hopefully) destructed. You can do this with
+`Mock::VerifyAndClearExpectations(&mock_object)`:
+
+```
+TEST(MyServerTest, ProcessesRequest) {
+  using ::testing::Mock;
+
+  MockFoo* const foo = new MockFoo;
+  EXPECT_CALL(*foo, ...)...;
+  // ... other expectations ...
+
+  // server now owns foo.
+  MyServer server(foo);
+  server.ProcessRequest(...);
+
+  // In case that server's destructor will forget to delete foo,
+  // this will verify the expectations anyway.
+  Mock::VerifyAndClearExpectations(foo);
+}  // server is destroyed when it goes out of scope here.
+```
+
+**Tip:** The `Mock::VerifyAndClearExpectations()` function returns a
+`bool` to indicate whether the verification was successful (`true` for
+yes), so you can wrap that function call inside a `ASSERT_TRUE()` if
+there is no point going further when the verification has failed.
+
+## Using Check Points ##
+
+Sometimes you may want to "reset" a mock object at various check
+points in your test: at each check point, you verify that all existing
+expectations on the mock object have been satisfied, and then you set
+some new expectations on it as if it's newly created. This allows you
+to work with a mock object in "phases" whose sizes are each
+manageable.
+
+One such scenario is that in your test's `SetUp()` function, you may
+want to put the object you are testing into a certain state, with the
+help from a mock object. Once in the desired state, you want to clear
+all expectations on the mock, such that in the `TEST_F` body you can
+set fresh expectations on it.
+
+As you may have figured out, the `Mock::VerifyAndClearExpectations()`
+function we saw in the previous recipe can help you here. Or, if you
+are using `ON_CALL()` to set default actions on the mock object and
+want to clear the default actions as well, use
+`Mock::VerifyAndClear(&mock_object)` instead. This function does what
+`Mock::VerifyAndClearExpectations(&mock_object)` does and returns the
+same `bool`, **plus** it clears the `ON_CALL()` statements on
+`mock_object` too.
+
+Another trick you can use to achieve the same effect is to put the
+expectations in sequences and insert calls to a dummy "check-point"
+function at specific places. Then you can verify that the mock
+function calls do happen at the right time. For example, if you are
+exercising code:
+
+```
+Foo(1);
+Foo(2);
+Foo(3);
+```
+
+and want to verify that `Foo(1)` and `Foo(3)` both invoke
+`mock.Bar("a")`, but `Foo(2)` doesn't invoke anything. You can write:
+
+```
+using ::testing::MockFunction;
+
+TEST(FooTest, InvokesBarCorrectly) {
+  MyMock mock;
+  // Class MockFunction<F> has exactly one mock method.  It is named
+  // Call() and has type F.
+  MockFunction<void(string check_point_name)> check;
+  {
+    InSequence s;
+
+    EXPECT_CALL(mock, Bar("a"));
+    EXPECT_CALL(check, Call("1"));
+    EXPECT_CALL(check, Call("2"));
+    EXPECT_CALL(mock, Bar("a"));
+  }
+  Foo(1);
+  check.Call("1");
+  Foo(2);
+  check.Call("2");
+  Foo(3);
+}
+```
+
+The expectation spec says that the first `Bar("a")` must happen before
+check point "1", the second `Bar("a")` must happen after check point "2",
+and nothing should happen between the two check points. The explicit
+check points make it easy to tell which `Bar("a")` is called by which
+call to `Foo()`.
+
+## Mocking Destructors ##
+
+Sometimes you want to make sure a mock object is destructed at the
+right time, e.g. after `bar->A()` is called but before `bar->B()` is
+called. We already know that you can specify constraints on the order
+of mock function calls, so all we need to do is to mock the destructor
+of the mock function.
+
+This sounds simple, except for one problem: a destructor is a special
+function with special syntax and special semantics, and the
+`MOCK_METHOD0` macro doesn't work for it:
+
+```
+  MOCK_METHOD0(~MockFoo, void());  // Won't compile!
+```
+
+The good news is that you can use a simple pattern to achieve the same
+effect. First, add a mock function `Die()` to your mock class and call
+it in the destructor, like this:
+
+```
+class MockFoo : public Foo {
+  ...
+  // Add the following two lines to the mock class.
+  MOCK_METHOD0(Die, void());
+  virtual ~MockFoo() { Die(); }
+};
+```
+
+(If the name `Die()` clashes with an existing symbol, choose another
+name.) Now, we have translated the problem of testing when a `MockFoo`
+object dies to testing when its `Die()` method is called:
+
+```
+  MockFoo* foo = new MockFoo;
+  MockBar* bar = new MockBar;
+  ...
+  {
+    InSequence s;
+
+    // Expects *foo to die after bar->A() and before bar->B().
+    EXPECT_CALL(*bar, A());
+    EXPECT_CALL(*foo, Die());
+    EXPECT_CALL(*bar, B());
+  }
+```
+
+And that's that.
+
+## Using Google Mock and Threads ##
+
+**IMPORTANT NOTE:** What we describe in this recipe is **ONLY** true on
+platforms where Google Mock is thread-safe. Currently these are only
+platforms that support the pthreads library (this includes Linux and Mac).
+To make it thread-safe on other platforms we only need to implement
+some synchronization operations in `"gtest/internal/gtest-port.h"`.
+
+In a **unit** test, it's best if you could isolate and test a piece of
+code in a single-threaded context. That avoids race conditions and
+dead locks, and makes debugging your test much easier.
+
+Yet many programs are multi-threaded, and sometimes to test something
+we need to pound on it from more than one thread. Google Mock works
+for this purpose too.
+
+Remember the steps for using a mock:
+
+  1. Create a mock object `foo`.
+  1. Set its default actions and expectations using `ON_CALL()` and `EXPECT_CALL()`.
+  1. The code under test calls methods of `foo`.
+  1. Optionally, verify and reset the mock.
+  1. Destroy the mock yourself, or let the code under test destroy it. The destructor will automatically verify it.
+
+If you follow the following simple rules, your mocks and threads can
+live happily togeter:
+
+  * Execute your _test code_ (as opposed to the code being tested) in _one_ thread. This makes your test easy to follow.
+  * Obviously, you can do step #1 without locking.
+  * When doing step #2 and #5, make sure no other thread is accessing `foo`. Obvious too, huh?
+  * #3 and #4 can be done either in one thread or in multiple threads - anyway you want. Google Mock takes care of the locking, so you don't have to do any - unless required by your test logic.
+
+If you violate the rules (for example, if you set expectations on a
+mock while another thread is calling its methods), you get undefined
+behavior. That's not fun, so don't do it.
+
+Google Mock guarantees that the action for a mock function is done in
+the same thread that called the mock function. For example, in
+
+```
+  EXPECT_CALL(mock, Foo(1))
+      .WillOnce(action1);
+  EXPECT_CALL(mock, Foo(2))
+      .WillOnce(action2);
+```
+
+if `Foo(1)` is called in thread 1 and `Foo(2)` is called in thread 2,
+Google Mock will execute `action1` in thread 1 and `action2` in thread
+2.
+
+Google Mock does _not_ impose a sequence on actions performed in
+different threads (doing so may create deadlocks as the actions may
+need to cooperate). This means that the execution of `action1` and
+`action2` in the above example _may_ interleave. If this is a problem,
+you should add proper synchronization logic to `action1` and `action2`
+to make the test thread-safe.
+
+
+Also, remember that `DefaultValue<T>` is a global resource that
+potentially affects _all_ living mock objects in your
+program. Naturally, you won't want to mess with it from multiple
+threads or when there still are mocks in action.
+
+## Controlling How Much Information Google Mock Prints ##
+
+When Google Mock sees something that has the potential of being an
+error (e.g. a mock function with no expectation is called, a.k.a. an
+uninteresting call, which is allowed but perhaps you forgot to
+explicitly ban the call), it prints some warning messages, including
+the arguments of the function and the return value. Hopefully this
+will remind you to take a look and see if there is indeed a problem.
+
+Sometimes you are confident that your tests are correct and may not
+appreciate such friendly messages. Some other times, you are debugging
+your tests or learning about the behavior of the code you are testing,
+and wish you could observe every mock call that happens (including
+argument values and the return value). Clearly, one size doesn't fit
+all.
+
+You can control how much Google Mock tells you using the
+`--gmock_verbose=LEVEL` command-line flag, where `LEVEL` is a string
+with three possible values:
+
+  * `info`: Google Mock will print all informational messages, warnings, and errors (most verbose). At this setting, Google Mock will also log any calls to the `ON_CALL/EXPECT_CALL` macros.
+  * `warning`: Google Mock will print both warnings and errors (less verbose). This is the default.
+  * `error`: Google Mock will print errors only (least verbose).
+
+Alternatively, you can adjust the value of that flag from within your
+tests like so:
+
+```
+  ::testing::FLAGS_gmock_verbose = "error";
+```
+
+Now, judiciously use the right flag to enable Google Mock serve you better!
+
+## Gaining Super Vision into Mock Calls ##
+
+You have a test using Google Mock. It fails: Google Mock tells you
+that some expectations aren't satisfied. However, you aren't sure why:
+Is there a typo somewhere in the matchers? Did you mess up the order
+of the `EXPECT_CALL`s? Or is the code under test doing something
+wrong?  How can you find out the cause?
+
+Won't it be nice if you have X-ray vision and can actually see the
+trace of all `EXPECT_CALL`s and mock method calls as they are made?
+For each call, would you like to see its actual argument values and
+which `EXPECT_CALL` Google Mock thinks it matches?
+
+You can unlock this power by running your test with the
+`--gmock_verbose=info` flag. For example, given the test program:
+
+```
+using testing::_;
+using testing::HasSubstr;
+using testing::Return;
+
+class MockFoo {
+ public:
+  MOCK_METHOD2(F, void(const string& x, const string& y));
+};
+
+TEST(Foo, Bar) {
+  MockFoo mock;
+  EXPECT_CALL(mock, F(_, _)).WillRepeatedly(Return());
+  EXPECT_CALL(mock, F("a", "b"));
+  EXPECT_CALL(mock, F("c", HasSubstr("d")));
+
+  mock.F("a", "good");
+  mock.F("a", "b");
+}
+```
+
+if you run it with `--gmock_verbose=info`, you will see this output:
+
+```
+[ RUN      ] Foo.Bar
+
+foo_test.cc:14: EXPECT_CALL(mock, F(_, _)) invoked
+foo_test.cc:15: EXPECT_CALL(mock, F("a", "b")) invoked
+foo_test.cc:16: EXPECT_CALL(mock, F("c", HasSubstr("d"))) invoked
+foo_test.cc:14: Mock function call matches EXPECT_CALL(mock, F(_, _))...
+    Function call: F(@0x7fff7c8dad40"a", @0x7fff7c8dad10"good")
+foo_test.cc:15: Mock function call matches EXPECT_CALL(mock, F("a", "b"))...
+    Function call: F(@0x7fff7c8dada0"a", @0x7fff7c8dad70"b")
+foo_test.cc:16: Failure
+Actual function call count doesn't match EXPECT_CALL(mock, F("c", HasSubstr("d")))...
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] Foo.Bar
+```
+
+Suppose the bug is that the `"c"` in the third `EXPECT_CALL` is a typo
+and should actually be `"a"`. With the above message, you should see
+that the actual `F("a", "good")` call is matched by the first
+`EXPECT_CALL`, not the third as you thought. From that it should be
+obvious that the third `EXPECT_CALL` is written wrong. Case solved.
+
+## Running Tests in Emacs ##
+
+If you build and run your tests in Emacs, the source file locations of
+Google Mock and [Google Test](http://code.google.com/p/googletest/)
+errors will be highlighted. Just press `<Enter>` on one of them and
+you'll be taken to the offending line. Or, you can just type `C-x ``
+to jump to the next error.
+
+To make it even easier, you can add the following lines to your
+`~/.emacs` file:
+
+```
+(global-set-key "\M-m"   'compile)  ; m is for make
+(global-set-key [M-down] 'next-error)
+(global-set-key [M-up]   '(lambda () (interactive) (next-error -1)))
+```
+
+Then you can type `M-m` to start a build, or `M-up`/`M-down` to move
+back and forth between errors.
+
+## Fusing Google Mock Source Files ##
+
+Google Mock's implementation consists of dozens of files (excluding
+its own tests).  Sometimes you may want them to be packaged up in
+fewer files instead, such that you can easily copy them to a new
+machine and start hacking there.  For this we provide an experimental
+Python script `fuse_gmock_files.py` in the `scripts/` directory
+(starting with release 1.2.0).  Assuming you have Python 2.4 or above
+installed on your machine, just go to that directory and run
+```
+python fuse_gmock_files.py OUTPUT_DIR
+```
+
+and you should see an `OUTPUT_DIR` directory being created with files
+`gtest/gtest.h`, `gmock/gmock.h`, and `gmock-gtest-all.cc` in it.
+These three files contain everything you need to use Google Mock (and
+Google Test).  Just copy them to anywhere you want and you are ready
+to write tests and use mocks.  You can use the
+[scrpts/test/Makefile](http://code.google.com/p/googlemock/source/browse/trunk/scripts/test/Makefile) file as an example on how to compile your tests
+against them.
+
+# Extending Google Mock #
+
+## Writing New Matchers Quickly ##
+
+The `MATCHER*` family of macros can be used to define custom matchers
+easily.  The syntax:
+
+```
+MATCHER(name, description_string_expression) { statements; }
+```
+
+will define a matcher with the given name that executes the
+statements, which must return a `bool` to indicate if the match
+succeeds.  Inside the statements, you can refer to the value being
+matched by `arg`, and refer to its type by `arg_type`.
+
+The description string is a `string`-typed expression that documents
+what the matcher does, and is used to generate the failure message
+when the match fails.  It can (and should) reference the special
+`bool` variable `negation`, and should evaluate to the description of
+the matcher when `negation` is `false`, or that of the matcher's
+negation when `negation` is `true`.
+
+For convenience, we allow the description string to be empty (`""`),
+in which case Google Mock will use the sequence of words in the
+matcher name as the description.
+
+For example:
+```
+MATCHER(IsDivisibleBy7, "") { return (arg % 7) == 0; }
+```
+allows you to write
+```
+  // Expects mock_foo.Bar(n) to be called where n is divisible by 7.
+  EXPECT_CALL(mock_foo, Bar(IsDivisibleBy7()));
+```
+or,
+```
+using ::testing::Not;
+...
+  EXPECT_THAT(some_expression, IsDivisibleBy7());
+  EXPECT_THAT(some_other_expression, Not(IsDivisibleBy7()));
+```
+If the above assertions fail, they will print something like:
+```
+  Value of: some_expression
+  Expected: is divisible by 7
+    Actual: 27
+...
+  Value of: some_other_expression
+  Expected: not (is divisible by 7)
+    Actual: 21
+```
+where the descriptions `"is divisible by 7"` and `"not (is divisible
+by 7)"` are automatically calculated from the matcher name
+`IsDivisibleBy7`.
+
+As you may have noticed, the auto-generated descriptions (especially
+those for the negation) may not be so great. You can always override
+them with a string expression of your own:
+```
+MATCHER(IsDivisibleBy7, std::string(negation ? "isn't" : "is") +
+                        " divisible by 7") {
+  return (arg % 7) == 0;
+}
+```
+
+Optionally, you can stream additional information to a hidden argument
+named `result_listener` to explain the match result. For example, a
+better definition of `IsDivisibleBy7` is:
+```
+MATCHER(IsDivisibleBy7, "") {
+  if ((arg % 7) == 0)
+    return true;
+
+  *result_listener << "the remainder is " << (arg % 7);
+  return false;
+}
+```
+
+With this definition, the above assertion will give a better message:
+```
+  Value of: some_expression
+  Expected: is divisible by 7
+    Actual: 27 (the remainder is 6)
+```
+
+You should let `MatchAndExplain()` print _any additional information_
+that can help a user understand the match result. Note that it should
+explain why the match succeeds in case of a success (unless it's
+obvious) - this is useful when the matcher is used inside
+`Not()`. There is no need to print the argument value itself, as
+Google Mock already prints it for you.
+
+**Notes:**
+
+  1. The type of the value being matched (`arg_type`) is determined by the context in which you use the matcher and is supplied to you by the compiler, so you don't need to worry about declaring it (nor can you).  This allows the matcher to be polymorphic.  For example, `IsDivisibleBy7()` can be used to match any type where the value of `(arg % 7) == 0` can be implicitly converted to a `bool`.  In the `Bar(IsDivisibleBy7())` example above, if method `Bar()` takes an `int`, `arg_type` will be `int`; if it takes an `unsigned long`, `arg_type` will be `unsigned long`; and so on.
+  1. Google Mock doesn't guarantee when or how many times a matcher will be invoked. Therefore the matcher logic must be _purely functional_ (i.e. it cannot have any side effect, and the result must not depend on anything other than the value being matched and the matcher parameters). This requirement must be satisfied no matter how you define the matcher (e.g. using one of the methods described in the following recipes). In particular, a matcher can never call a mock function, as that will affect the state of the mock object and Google Mock.
+
+## Writing New Parameterized Matchers Quickly ##
+
+Sometimes you'll want to define a matcher that has parameters.  For that you
+can use the macro:
+```
+MATCHER_P(name, param_name, description_string) { statements; }
+```
+where the description string can be either `""` or a string expression
+that references `negation` and `param_name`.
+
+For example:
+```
+MATCHER_P(HasAbsoluteValue, value, "") { return abs(arg) == value; }
+```
+will allow you to write:
+```
+  EXPECT_THAT(Blah("a"), HasAbsoluteValue(n));
+```
+which may lead to this message (assuming `n` is 10):
+```
+  Value of: Blah("a")
+  Expected: has absolute value 10
+    Actual: -9
+```
+
+Note that both the matcher description and its parameter are
+printed, making the message human-friendly.
+
+In the matcher definition body, you can write `foo_type` to
+reference the type of a parameter named `foo`.  For example, in the
+body of `MATCHER_P(HasAbsoluteValue, value)` above, you can write
+`value_type` to refer to the type of `value`.
+
+Google Mock also provides `MATCHER_P2`, `MATCHER_P3`, ..., up to
+`MATCHER_P10` to support multi-parameter matchers:
+```
+MATCHER_Pk(name, param_1, ..., param_k, description_string) { statements; }
+```
+
+Please note that the custom description string is for a particular
+**instance** of the matcher, where the parameters have been bound to
+actual values.  Therefore usually you'll want the parameter values to
+be part of the description.  Google Mock lets you do that by
+referencing the matcher parameters in the description string
+expression.
+
+For example,
+```
+  using ::testing::PrintToString;
+  MATCHER_P2(InClosedRange, low, hi,
+             std::string(negation ? "isn't" : "is") + " in range [" +
+             PrintToString(low) + ", " + PrintToString(hi) + "]") {
+    return low <= arg && arg <= hi;
+  }
+  ...
+  EXPECT_THAT(3, InClosedRange(4, 6));
+```
+would generate a failure that contains the message:
+```
+  Expected: is in range [4, 6]
+```
+
+If you specify `""` as the description, the failure message will
+contain the sequence of words in the matcher name followed by the
+parameter values printed as a tuple.  For example,
+```
+  MATCHER_P2(InClosedRange, low, hi, "") { ... }
+  ...
+  EXPECT_THAT(3, InClosedRange(4, 6));
+```
+would generate a failure that contains the text:
+```
+  Expected: in closed range (4, 6)
+```
+
+For the purpose of typing, you can view
+```
+MATCHER_Pk(Foo, p1, ..., pk, description_string) { ... }
+```
+as shorthand for
+```
+template <typename p1_type, ..., typename pk_type>
+FooMatcherPk<p1_type, ..., pk_type>
+Foo(p1_type p1, ..., pk_type pk) { ... }
+```
+
+When you write `Foo(v1, ..., vk)`, the compiler infers the types of
+the parameters `v1`, ..., and `vk` for you.  If you are not happy with
+the result of the type inference, you can specify the types by
+explicitly instantiating the template, as in `Foo<long, bool>(5, false)`.
+As said earlier, you don't get to (or need to) specify
+`arg_type` as that's determined by the context in which the matcher
+is used.
+
+You can assign the result of expression `Foo(p1, ..., pk)` to a
+variable of type `FooMatcherPk<p1_type, ..., pk_type>`.  This can be
+useful when composing matchers.  Matchers that don't have a parameter
+or have only one parameter have special types: you can assign `Foo()`
+to a `FooMatcher`-typed variable, and assign `Foo(p)` to a
+`FooMatcherP<p_type>`-typed variable.
+
+While you can instantiate a matcher template with reference types,
+passing the parameters by pointer usually makes your code more
+readable.  If, however, you still want to pass a parameter by
+reference, be aware that in the failure message generated by the
+matcher you will see the value of the referenced object but not its
+address.
+
+You can overload matchers with different numbers of parameters:
+```
+MATCHER_P(Blah, a, description_string_1) { ... }
+MATCHER_P2(Blah, a, b, description_string_2) { ... }
+```
+
+While it's tempting to always use the `MATCHER*` macros when defining
+a new matcher, you should also consider implementing
+`MatcherInterface` or using `MakePolymorphicMatcher()` instead (see
+the recipes that follow), especially if you need to use the matcher a
+lot.  While these approaches require more work, they give you more
+control on the types of the value being matched and the matcher
+parameters, which in general leads to better compiler error messages
+that pay off in the long run.  They also allow overloading matchers
+based on parameter types (as opposed to just based on the number of
+parameters).
+
+## Writing New Monomorphic Matchers ##
+
+A matcher of argument type `T` implements
+`::testing::MatcherInterface<T>` and does two things: it tests whether a
+value of type `T` matches the matcher, and can describe what kind of
+values it matches. The latter ability is used for generating readable
+error messages when expectations are violated.
+
+The interface looks like this:
+
+```
+class MatchResultListener {
+ public:
+  ...
+  // Streams x to the underlying ostream; does nothing if the ostream
+  // is NULL.
+  template <typename T>
+  MatchResultListener& operator<<(const T& x);
+
+  // Returns the underlying ostream.
+  ::std::ostream* stream();
+};
+
+template <typename T>
+class MatcherInterface {
+ public:
+  virtual ~MatcherInterface();
+
+  // Returns true iff the matcher matches x; also explains the match
+  // result to 'listener'.
+  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const = 0;
+
+  // Describes this matcher to an ostream.
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+
+  // Describes the negation of this matcher to an ostream.
+  virtual void DescribeNegationTo(::std::ostream* os) const;
+};
+```
+
+If you need a custom matcher but `Truly()` is not a good option (for
+example, you may not be happy with the way `Truly(predicate)`
+describes itself, or you may want your matcher to be polymorphic as
+`Eq(value)` is), you can define a matcher to do whatever you want in
+two steps: first implement the matcher interface, and then define a
+factory function to create a matcher instance. The second step is not
+strictly needed but it makes the syntax of using the matcher nicer.
+
+For example, you can define a matcher to test whether an `int` is
+divisible by 7 and then use it like this:
+```
+using ::testing::MakeMatcher;
+using ::testing::Matcher;
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+
+class DivisibleBy7Matcher : public MatcherInterface<int> {
+ public:
+  virtual bool MatchAndExplain(int n, MatchResultListener* listener) const {
+    return (n % 7) == 0;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "is divisible by 7";
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "is not divisible by 7";
+  }
+};
+
+inline Matcher<int> DivisibleBy7() {
+  return MakeMatcher(new DivisibleBy7Matcher);
+}
+...
+
+  EXPECT_CALL(foo, Bar(DivisibleBy7()));
+```
+
+You may improve the matcher message by streaming additional
+information to the `listener` argument in `MatchAndExplain()`:
+
+```
+class DivisibleBy7Matcher : public MatcherInterface<int> {
+ public:
+  virtual bool MatchAndExplain(int n,
+                               MatchResultListener* listener) const {
+    const int remainder = n % 7;
+    if (remainder != 0) {
+      *listener << "the remainder is " << remainder;
+    }
+    return remainder == 0;
+  }
+  ...
+};
+```
+
+Then, `EXPECT_THAT(x, DivisibleBy7());` may general a message like this:
+```
+Value of: x
+Expected: is divisible by 7
+  Actual: 23 (the remainder is 2)
+```
+
+## Writing New Polymorphic Matchers ##
+
+You've learned how to write your own matchers in the previous
+recipe. Just one problem: a matcher created using `MakeMatcher()` only
+works for one particular type of arguments. If you want a
+_polymorphic_ matcher that works with arguments of several types (for
+instance, `Eq(x)` can be used to match a `value` as long as `value` ==
+`x` compiles -- `value` and `x` don't have to share the same type),
+you can learn the trick from `"gmock/gmock-matchers.h"` but it's a bit
+involved.
+
+Fortunately, most of the time you can define a polymorphic matcher
+easily with the help of `MakePolymorphicMatcher()`. Here's how you can
+define `NotNull()` as an example:
+
+```
+using ::testing::MakePolymorphicMatcher;
+using ::testing::MatchResultListener;
+using ::testing::NotNull;
+using ::testing::PolymorphicMatcher;
+
+class NotNullMatcher {
+ public:
+  // To implement a polymorphic matcher, first define a COPYABLE class
+  // that has three members MatchAndExplain(), DescribeTo(), and
+  // DescribeNegationTo(), like the following.
+
+  // In this example, we want to use NotNull() with any pointer, so
+  // MatchAndExplain() accepts a pointer of any type as its first argument.
+  // In general, you can define MatchAndExplain() as an ordinary method or
+  // a method template, or even overload it.
+  template <typename T>
+  bool MatchAndExplain(T* p,
+                       MatchResultListener* /* listener */) const {
+    return p != NULL;
+  }
+
+  // Describes the property of a value matching this matcher.
+  void DescribeTo(::std::ostream* os) const { *os << "is not NULL"; }
+
+  // Describes the property of a value NOT matching this matcher.
+  void DescribeNegationTo(::std::ostream* os) const { *os << "is NULL"; }
+};
+
+// To construct a polymorphic matcher, pass an instance of the class
+// to MakePolymorphicMatcher().  Note the return type.
+inline PolymorphicMatcher<NotNullMatcher> NotNull() {
+  return MakePolymorphicMatcher(NotNullMatcher());
+}
+...
+
+  EXPECT_CALL(foo, Bar(NotNull()));  // The argument must be a non-NULL pointer.
+```
+
+**Note:** Your polymorphic matcher class does **not** need to inherit from
+`MatcherInterface` or any other class, and its methods do **not** need
+to be virtual.
+
+Like in a monomorphic matcher, you may explain the match result by
+streaming additional information to the `listener` argument in
+`MatchAndExplain()`.
+
+## Writing New Cardinalities ##
+
+A cardinality is used in `Times()` to tell Google Mock how many times
+you expect a call to occur. It doesn't have to be exact. For example,
+you can say `AtLeast(5)` or `Between(2, 4)`.
+
+If the built-in set of cardinalities doesn't suit you, you are free to
+define your own by implementing the following interface (in namespace
+`testing`):
+
+```
+class CardinalityInterface {
+ public:
+  virtual ~CardinalityInterface();
+
+  // Returns true iff call_count calls will satisfy this cardinality.
+  virtual bool IsSatisfiedByCallCount(int call_count) const = 0;
+
+  // Returns true iff call_count calls will saturate this cardinality.
+  virtual bool IsSaturatedByCallCount(int call_count) const = 0;
+
+  // Describes self to an ostream.
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+};
+```
+
+For example, to specify that a call must occur even number of times,
+you can write
+
+```
+using ::testing::Cardinality;
+using ::testing::CardinalityInterface;
+using ::testing::MakeCardinality;
+
+class EvenNumberCardinality : public CardinalityInterface {
+ public:
+  virtual bool IsSatisfiedByCallCount(int call_count) const {
+    return (call_count % 2) == 0;
+  }
+
+  virtual bool IsSaturatedByCallCount(int call_count) const {
+    return false;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "called even number of times";
+  }
+};
+
+Cardinality EvenNumber() {
+  return MakeCardinality(new EvenNumberCardinality);
+}
+...
+
+  EXPECT_CALL(foo, Bar(3))
+      .Times(EvenNumber());
+```
+
+## Writing New Actions Quickly ##
+
+If the built-in actions don't work for you, and you find it
+inconvenient to use `Invoke()`, you can use a macro from the `ACTION*`
+family to quickly define a new action that can be used in your code as
+if it's a built-in action.
+
+By writing
+```
+ACTION(name) { statements; }
+```
+in a namespace scope (i.e. not inside a class or function), you will
+define an action with the given name that executes the statements.
+The value returned by `statements` will be used as the return value of
+the action.  Inside the statements, you can refer to the K-th
+(0-based) argument of the mock function as `argK`.  For example:
+```
+ACTION(IncrementArg1) { return ++(*arg1); }
+```
+allows you to write
+```
+... WillOnce(IncrementArg1());
+```
+
+Note that you don't need to specify the types of the mock function
+arguments.  Rest assured that your code is type-safe though:
+you'll get a compiler error if `*arg1` doesn't support the `++`
+operator, or if the type of `++(*arg1)` isn't compatible with the mock
+function's return type.
+
+Another example:
+```
+ACTION(Foo) {
+  (*arg2)(5);
+  Blah();
+  *arg1 = 0;
+  return arg0;
+}
+```
+defines an action `Foo()` that invokes argument #2 (a function pointer)
+with 5, calls function `Blah()`, sets the value pointed to by argument
+#1 to 0, and returns argument #0.
+
+For more convenience and flexibility, you can also use the following
+pre-defined symbols in the body of `ACTION`:
+
+| `argK_type` | The type of the K-th (0-based) argument of the mock function |
+|:------------|:-------------------------------------------------------------|
+| `args`      | All arguments of the mock function as a tuple                |
+| `args_type` | The type of all arguments of the mock function as a tuple    |
+| `return_type` | The return type of the mock function                         |
+| `function_type` | The type of the mock function                                |
+
+For example, when using an `ACTION` as a stub action for mock function:
+```
+int DoSomething(bool flag, int* ptr);
+```
+we have:
+| **Pre-defined Symbol** | **Is Bound To** |
+|:-----------------------|:----------------|
+| `arg0`                 | the value of `flag` |
+| `arg0_type`            | the type `bool` |
+| `arg1`                 | the value of `ptr` |
+| `arg1_type`            | the type `int*` |
+| `args`                 | the tuple `(flag, ptr)` |
+| `args_type`            | the type `std::tr1::tuple<bool, int*>` |
+| `return_type`          | the type `int`  |
+| `function_type`        | the type `int(bool, int*)` |
+
+## Writing New Parameterized Actions Quickly ##
+
+Sometimes you'll want to parameterize an action you define.  For that
+we have another macro
+```
+ACTION_P(name, param) { statements; }
+```
+
+For example,
+```
+ACTION_P(Add, n) { return arg0 + n; }
+```
+will allow you to write
+```
+// Returns argument #0 + 5.
+... WillOnce(Add(5));
+```
+
+For convenience, we use the term _arguments_ for the values used to
+invoke the mock function, and the term _parameters_ for the values
+used to instantiate an action.
+
+Note that you don't need to provide the type of the parameter either.
+Suppose the parameter is named `param`, you can also use the
+Google-Mock-defined symbol `param_type` to refer to the type of the
+parameter as inferred by the compiler.  For example, in the body of
+`ACTION_P(Add, n)` above, you can write `n_type` for the type of `n`.
+
+Google Mock also provides `ACTION_P2`, `ACTION_P3`, and etc to support
+multi-parameter actions.  For example,
+```
+ACTION_P2(ReturnDistanceTo, x, y) {
+  double dx = arg0 - x;
+  double dy = arg1 - y;
+  return sqrt(dx*dx + dy*dy);
+}
+```
+lets you write
+```
+... WillOnce(ReturnDistanceTo(5.0, 26.5));
+```
+
+You can view `ACTION` as a degenerated parameterized action where the
+number of parameters is 0.
+
+You can also easily define actions overloaded on the number of parameters:
+```
+ACTION_P(Plus, a) { ... }
+ACTION_P2(Plus, a, b) { ... }
+```
+
+## Restricting the Type of an Argument or Parameter in an ACTION ##
+
+For maximum brevity and reusability, the `ACTION*` macros don't ask
+you to provide the types of the mock function arguments and the action
+parameters.  Instead, we let the compiler infer the types for us.
+
+Sometimes, however, we may want to be more explicit about the types.
+There are several tricks to do that.  For example:
+```
+ACTION(Foo) {
+  // Makes sure arg0 can be converted to int.
+  int n = arg0;
+  ... use n instead of arg0 here ...
+}
+
+ACTION_P(Bar, param) {
+  // Makes sure the type of arg1 is const char*.
+  ::testing::StaticAssertTypeEq<const char*, arg1_type>();
+
+  // Makes sure param can be converted to bool.
+  bool flag = param;
+}
+```
+where `StaticAssertTypeEq` is a compile-time assertion in Google Test
+that verifies two types are the same.
+
+## Writing New Action Templates Quickly ##
+
+Sometimes you want to give an action explicit template parameters that
+cannot be inferred from its value parameters.  `ACTION_TEMPLATE()`
+supports that and can be viewed as an extension to `ACTION()` and
+`ACTION_P*()`.
+
+The syntax:
+```
+ACTION_TEMPLATE(ActionName,
+                HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m),
+                AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; }
+```
+
+defines an action template that takes _m_ explicit template parameters
+and _n_ value parameters, where _m_ is between 1 and 10, and _n_ is
+between 0 and 10.  `name_i` is the name of the i-th template
+parameter, and `kind_i` specifies whether it's a `typename`, an
+integral constant, or a template.  `p_i` is the name of the i-th value
+parameter.
+
+Example:
+```
+// DuplicateArg<k, T>(output) converts the k-th argument of the mock
+// function to type T and copies it to *output.
+ACTION_TEMPLATE(DuplicateArg,
+                // Note the comma between int and k:
+                HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
+                AND_1_VALUE_PARAMS(output)) {
+  *output = T(std::tr1::get<k>(args));
+}
+```
+
+To create an instance of an action template, write:
+```
+  ActionName<t1, ..., t_m>(v1, ..., v_n)
+```
+where the `t`s are the template arguments and the
+`v`s are the value arguments.  The value argument
+types are inferred by the compiler.  For example:
+```
+using ::testing::_;
+...
+  int n;
+  EXPECT_CALL(mock, Foo(_, _))
+      .WillOnce(DuplicateArg<1, unsigned char>(&n));
+```
+
+If you want to explicitly specify the value argument types, you can
+provide additional template arguments:
+```
+  ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
+```
+where `u_i` is the desired type of `v_i`.
+
+`ACTION_TEMPLATE` and `ACTION`/`ACTION_P*` can be overloaded on the
+number of value parameters, but not on the number of template
+parameters.  Without the restriction, the meaning of the following is
+unclear:
+
+```
+  OverloadedAction<int, bool>(x);
+```
+
+Are we using a single-template-parameter action where `bool` refers to
+the type of `x`, or a two-template-parameter action where the compiler
+is asked to infer the type of `x`?
+
+## Using the ACTION Object's Type ##
+
+If you are writing a function that returns an `ACTION` object, you'll
+need to know its type.  The type depends on the macro used to define
+the action and the parameter types.  The rule is relatively simple:
+| **Given Definition** | **Expression** | **Has Type** |
+|:---------------------|:---------------|:-------------|
+| `ACTION(Foo)`        | `Foo()`        | `FooAction`  |
+| `ACTION_TEMPLATE(Foo, HAS_m_TEMPLATE_PARAMS(...), AND_0_VALUE_PARAMS())` |	`Foo<t1, ..., t_m>()` | `FooAction<t1, ..., t_m>` |
+| `ACTION_P(Bar, param)` | `Bar(int_value)` | `BarActionP<int>` |
+| `ACTION_TEMPLATE(Bar, HAS_m_TEMPLATE_PARAMS(...), AND_1_VALUE_PARAMS(p1))` | `Bar<t1, ..., t_m>(int_value)` | `FooActionP<t1, ..., t_m, int>` |
+| `ACTION_P2(Baz, p1, p2)` | `Baz(bool_value, int_value)` | `BazActionP2<bool, int>` |
+| `ACTION_TEMPLATE(Baz, HAS_m_TEMPLATE_PARAMS(...), AND_2_VALUE_PARAMS(p1, p2))` | `Baz<t1, ..., t_m>(bool_value, int_value)` | `FooActionP2<t1, ..., t_m, bool, int>` |
+| ...                  | ...            | ...          |
+
+Note that we have to pick different suffixes (`Action`, `ActionP`,
+`ActionP2`, and etc) for actions with different numbers of value
+parameters, or the action definitions cannot be overloaded on the
+number of them.
+
+## Writing New Monomorphic Actions ##
+
+While the `ACTION*` macros are very convenient, sometimes they are
+inappropriate.  For example, despite the tricks shown in the previous
+recipes, they don't let you directly specify the types of the mock
+function arguments and the action parameters, which in general leads
+to unoptimized compiler error messages that can baffle unfamiliar
+users.  They also don't allow overloading actions based on parameter
+types without jumping through some hoops.
+
+An alternative to the `ACTION*` macros is to implement
+`::testing::ActionInterface<F>`, where `F` is the type of the mock
+function in which the action will be used. For example:
+
+```
+template <typename F>class ActionInterface {
+ public:
+  virtual ~ActionInterface();
+
+  // Performs the action.  Result is the return type of function type
+  // F, and ArgumentTuple is the tuple of arguments of F.
+  //
+  // For example, if F is int(bool, const string&), then Result would
+  // be int, and ArgumentTuple would be tr1::tuple<bool, const string&>.
+  virtual Result Perform(const ArgumentTuple& args) = 0;
+};
+
+using ::testing::_;
+using ::testing::Action;
+using ::testing::ActionInterface;
+using ::testing::MakeAction;
+
+typedef int IncrementMethod(int*);
+
+class IncrementArgumentAction : public ActionInterface<IncrementMethod> {
+ public:
+  virtual int Perform(const tr1::tuple<int*>& args) {
+    int* p = tr1::get<0>(args);  // Grabs the first argument.
+    return *p++;
+  }
+};
+
+Action<IncrementMethod> IncrementArgument() {
+  return MakeAction(new IncrementArgumentAction);
+}
+...
+
+  EXPECT_CALL(foo, Baz(_))
+      .WillOnce(IncrementArgument());
+
+  int n = 5;
+  foo.Baz(&n);  // Should return 5 and change n to 6.
+```
+
+## Writing New Polymorphic Actions ##
+
+The previous recipe showed you how to define your own action. This is
+all good, except that you need to know the type of the function in
+which the action will be used. Sometimes that can be a problem. For
+example, if you want to use the action in functions with _different_
+types (e.g. like `Return()` and `SetArgPointee()`).
+
+If an action can be used in several types of mock functions, we say
+it's _polymorphic_. The `MakePolymorphicAction()` function template
+makes it easy to define such an action:
+
+```
+namespace testing {
+
+template <typename Impl>
+PolymorphicAction<Impl> MakePolymorphicAction(const Impl& impl);
+
+}  // namespace testing
+```
+
+As an example, let's define an action that returns the second argument
+in the mock function's argument list. The first step is to define an
+implementation class:
+
+```
+class ReturnSecondArgumentAction {
+ public:
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple& args) const {
+    // To get the i-th (0-based) argument, use tr1::get<i>(args).
+    return tr1::get<1>(args);
+  }
+};
+```
+
+This implementation class does _not_ need to inherit from any
+particular class. What matters is that it must have a `Perform()`
+method template. This method template takes the mock function's
+arguments as a tuple in a **single** argument, and returns the result of
+the action. It can be either `const` or not, but must be invokable
+with exactly one template argument, which is the result type. In other
+words, you must be able to call `Perform<R>(args)` where `R` is the
+mock function's return type and `args` is its arguments in a tuple.
+
+Next, we use `MakePolymorphicAction()` to turn an instance of the
+implementation class into the polymorphic action we need. It will be
+convenient to have a wrapper for this:
+
+```
+using ::testing::MakePolymorphicAction;
+using ::testing::PolymorphicAction;
+
+PolymorphicAction<ReturnSecondArgumentAction> ReturnSecondArgument() {
+  return MakePolymorphicAction(ReturnSecondArgumentAction());
+}
+```
+
+Now, you can use this polymorphic action the same way you use the
+built-in ones:
+
+```
+using ::testing::_;
+
+class MockFoo : public Foo {
+ public:
+  MOCK_METHOD2(DoThis, int(bool flag, int n));
+  MOCK_METHOD3(DoThat, string(int x, const char* str1, const char* str2));
+};
+...
+
+  MockFoo foo;
+  EXPECT_CALL(foo, DoThis(_, _))
+      .WillOnce(ReturnSecondArgument());
+  EXPECT_CALL(foo, DoThat(_, _, _))
+      .WillOnce(ReturnSecondArgument());
+  ...
+  foo.DoThis(true, 5);         // Will return 5.
+  foo.DoThat(1, "Hi", "Bye");  // Will return "Hi".
+```
+
+## Teaching Google Mock How to Print Your Values ##
+
+When an uninteresting or unexpected call occurs, Google Mock prints the
+argument values and the stack trace to help you debug.  Assertion
+macros like `EXPECT_THAT` and `EXPECT_EQ` also print the values in
+question when the assertion fails.  Google Mock and Google Test do this using
+Google Test's user-extensible value printer.
+
+This printer knows how to print built-in C++ types, native arrays, STL
+containers, and any type that supports the `<<` operator.  For other
+types, it prints the raw bytes in the value and hopes that you the
+user can figure it out.
+[Google Test's advanced guide](http://code.google.com/p/googletest/wiki/AdvancedGuide#Teaching_Google_Test_How_to_Print_Your_Values)
+explains how to extend the printer to do a better job at
+printing your particular type than to dump the bytes.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/Documentation.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/Documentation.md
new file mode 100644
index 0000000000..d9181f28e1
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/Documentation.md
@@ -0,0 +1,12 @@
+This page lists all documentation wiki pages for Google Mock **(the SVN trunk version)**
+- **if you use a released version of Google Mock, please read the documentation for that specific version instead.**
+
+  * [ForDummies](V1_7_ForDummies.md) -- start here if you are new to Google Mock.
+  * [CheatSheet](V1_7_CheatSheet.md) -- a quick reference.
+  * [CookBook](V1_7_CookBook.md) -- recipes for doing various tasks using Google Mock.
+  * [FrequentlyAskedQuestions](V1_7_FrequentlyAskedQuestions.md) -- check here before asking a question on the mailing list.
+
+To contribute code to Google Mock, read:
+
+  * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
+  * [Pump Manual](http://code.google.com/p/googletest/wiki/PumpManual) -- how we generate some of Google Mock's source files.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/ForDummies.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/ForDummies.md
new file mode 100644
index 0000000000..ee03c5b989
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/ForDummies.md
@@ -0,0 +1,439 @@
+
+
+(**Note:** If you get compiler errors that you don't understand, be sure to consult [Google Mock Doctor](http://code.google.com/p/googlemock/wiki/V1_7_FrequentlyAskedQuestions#How_am_I_supposed_to_make_sense_of_these_horrible_template_error).)
+
+# What Is Google C++ Mocking Framework? #
+When you write a prototype or test, often it's not feasible or wise to rely on real objects entirely. A **mock object** implements the same interface as a real object (so it can be used as one), but lets you specify at run time how it will be used and what it should do (which methods will be called? in which order? how many times? with what arguments? what will they return? etc).
+
+**Note:** It is easy to confuse the term _fake objects_ with mock objects. Fakes and mocks actually mean very different things in the Test-Driven Development (TDD) community:
+
+  * **Fake** objects have working implementations, but usually take some shortcut (perhaps to make the operations less expensive), which makes them not suitable for production. An in-memory file system would be an example of a fake.
+  * **Mocks** are objects pre-programmed with _expectations_, which form a specification of the calls they are expected to receive.
+
+If all this seems too abstract for you, don't worry - the most important thing to remember is that a mock allows you to check the _interaction_ between itself and code that uses it. The difference between fakes and mocks will become much clearer once you start to use mocks.
+
+**Google C++ Mocking Framework** (or **Google Mock** for short) is a library (sometimes we also call it a "framework" to make it sound cool) for creating mock classes and using them. It does to C++ what [jMock](http://www.jmock.org/) and [EasyMock](http://www.easymock.org/) do to Java.
+
+Using Google Mock involves three basic steps:
+
+  1. Use some simple macros to describe the interface you want to mock, and they will expand to the implementation of your mock class;
+  1. Create some mock objects and specify its expectations and behavior using an intuitive syntax;
+  1. Exercise code that uses the mock objects. Google Mock will catch any violation of the expectations as soon as it arises.
+
+# Why Google Mock? #
+While mock objects help you remove unnecessary dependencies in tests and make them fast and reliable, using mocks manually in C++ is _hard_:
+
+  * Someone has to implement the mocks. The job is usually tedious and error-prone. No wonder people go great distance to avoid it.
+  * The quality of those manually written mocks is a bit, uh, unpredictable. You may see some really polished ones, but you may also see some that were hacked up in a hurry and have all sorts of ad hoc restrictions.
+  * The knowledge you gained from using one mock doesn't transfer to the next.
+
+In contrast, Java and Python programmers have some fine mock frameworks, which automate the creation of mocks. As a result, mocking is a proven effective technique and widely adopted practice in those communities. Having the right tool absolutely makes the difference.
+
+Google Mock was built to help C++ programmers. It was inspired by [jMock](http://www.jmock.org/) and [EasyMock](http://www.easymock.org/), but designed with C++'s specifics in mind. It is your friend if any of the following problems is bothering you:
+
+  * You are stuck with a sub-optimal design and wish you had done more prototyping before it was too late, but prototyping in C++ is by no means "rapid".
+  * Your tests are slow as they depend on too many libraries or use expensive resources (e.g. a database).
+  * Your tests are brittle as some resources they use are unreliable (e.g. the network).
+  * You want to test how your code handles a failure (e.g. a file checksum error), but it's not easy to cause one.
+  * You need to make sure that your module interacts with other modules in the right way, but it's hard to observe the interaction; therefore you resort to observing the side effects at the end of the action, which is awkward at best.
+  * You want to "mock out" your dependencies, except that they don't have mock implementations yet; and, frankly, you aren't thrilled by some of those hand-written mocks.
+
+We encourage you to use Google Mock as:
+
+  * a _design_ tool, for it lets you experiment with your interface design early and often. More iterations lead to better designs!
+  * a _testing_ tool to cut your tests' outbound dependencies and probe the interaction between your module and its collaborators.
+
+# Getting Started #
+Using Google Mock is easy! Inside your C++ source file, just `#include` `"gtest/gtest.h"` and `"gmock/gmock.h"`, and you are ready to go.
+
+# A Case for Mock Turtles #
+Let's look at an example. Suppose you are developing a graphics program that relies on a LOGO-like API for drawing. How would you test that it does the right thing? Well, you can run it and compare the screen with a golden screen snapshot, but let's admit it: tests like this are expensive to run and fragile (What if you just upgraded to a shiny new graphics card that has better anti-aliasing? Suddenly you have to update all your golden images.). It would be too painful if all your tests are like this. Fortunately, you learned about Dependency Injection and know the right thing to do: instead of having your application talk to the drawing API directly, wrap the API in an interface (say, `Turtle`) and code to that interface:
+
+```
+class Turtle {
+  ...
+  virtual ~Turtle() {}
+  virtual void PenUp() = 0;
+  virtual void PenDown() = 0;
+  virtual void Forward(int distance) = 0;
+  virtual void Turn(int degrees) = 0;
+  virtual void GoTo(int x, int y) = 0;
+  virtual int GetX() const = 0;
+  virtual int GetY() const = 0;
+};
+```
+
+(Note that the destructor of `Turtle` **must** be virtual, as is the case for **all** classes you intend to inherit from - otherwise the destructor of the derived class will not be called when you delete an object through a base pointer, and you'll get corrupted program states like memory leaks.)
+
+You can control whether the turtle's movement will leave a trace using `PenUp()` and `PenDown()`, and control its movement using `Forward()`, `Turn()`, and `GoTo()`. Finally, `GetX()` and `GetY()` tell you the current position of the turtle.
+
+Your program will normally use a real implementation of this interface. In tests, you can use a mock implementation instead. This allows you to easily check what drawing primitives your program is calling, with what arguments, and in which order. Tests written this way are much more robust (they won't break because your new machine does anti-aliasing differently), easier to read and maintain (the intent of a test is expressed in the code, not in some binary images), and run _much, much faster_.
+
+# Writing the Mock Class #
+If you are lucky, the mocks you need to use have already been implemented by some nice people. If, however, you find yourself in the position to write a mock class, relax - Google Mock turns this task into a fun game! (Well, almost.)
+
+## How to Define It ##
+Using the `Turtle` interface as example, here are the simple steps you need to follow:
+
+  1. Derive a class `MockTurtle` from `Turtle`.
+  1. Take a _virtual_ function of `Turtle` (while it's possible to [mock non-virtual methods using templates](http://code.google.com/p/googlemock/wiki/V1_7_CookBook#Mocking_Nonvirtual_Methods), it's much more involved). Count how many arguments it has.
+  1. In the `public:` section of the child class, write `MOCK_METHODn();` (or `MOCK_CONST_METHODn();` if you are mocking a `const` method), where `n` is the number of the arguments; if you counted wrong, shame on you, and a compiler error will tell you so.
+  1. Now comes the fun part: you take the function signature, cut-and-paste the _function name_ as the _first_ argument to the macro, and leave what's left as the _second_ argument (in case you're curious, this is the _type of the function_).
+  1. Repeat until all virtual functions you want to mock are done.
+
+After the process, you should have something like:
+
+```
+#include "gmock/gmock.h"  // Brings in Google Mock.
+class MockTurtle : public Turtle {
+ public:
+  ...
+  MOCK_METHOD0(PenUp, void());
+  MOCK_METHOD0(PenDown, void());
+  MOCK_METHOD1(Forward, void(int distance));
+  MOCK_METHOD1(Turn, void(int degrees));
+  MOCK_METHOD2(GoTo, void(int x, int y));
+  MOCK_CONST_METHOD0(GetX, int());
+  MOCK_CONST_METHOD0(GetY, int());
+};
+```
+
+You don't need to define these mock methods somewhere else - the `MOCK_METHOD*` macros will generate the definitions for you. It's that simple! Once you get the hang of it, you can pump out mock classes faster than your source-control system can handle your check-ins.
+
+**Tip:** If even this is too much work for you, you'll find the
+`gmock_gen.py` tool in Google Mock's `scripts/generator/` directory (courtesy of the [cppclean](http://code.google.com/p/cppclean/) project) useful.  This command-line
+tool requires that you have Python 2.4 installed.  You give it a C++ file and the name of an abstract class defined in it,
+and it will print the definition of the mock class for you.  Due to the
+complexity of the C++ language, this script may not always work, but
+it can be quite handy when it does.  For more details, read the [user documentation](http://code.google.com/p/googlemock/source/browse/trunk/scripts/generator/README).
+
+## Where to Put It ##
+When you define a mock class, you need to decide where to put its definition. Some people put it in a `*_test.cc`. This is fine when the interface being mocked (say, `Foo`) is owned by the same person or team. Otherwise, when the owner of `Foo` changes it, your test could break. (You can't really expect `Foo`'s maintainer to fix every test that uses `Foo`, can you?)
+
+So, the rule of thumb is: if you need to mock `Foo` and it's owned by others, define the mock class in `Foo`'s package (better, in a `testing` sub-package such that you can clearly separate production code and testing utilities), and put it in a `mock_foo.h`. Then everyone can reference `mock_foo.h` from their tests. If `Foo` ever changes, there is only one copy of `MockFoo` to change, and only tests that depend on the changed methods need to be fixed.
+
+Another way to do it: you can introduce a thin layer `FooAdaptor` on top of `Foo` and code to this new interface. Since you own `FooAdaptor`, you can absorb changes in `Foo` much more easily. While this is more work initially, carefully choosing the adaptor interface can make your code easier to write and more readable (a net win in the long run), as you can choose `FooAdaptor` to fit your specific domain much better than `Foo` does.
+
+# Using Mocks in Tests #
+Once you have a mock class, using it is easy. The typical work flow is:
+
+  1. Import the Google Mock names from the `testing` namespace such that you can use them unqualified (You only have to do it once per file. Remember that namespaces are a good idea and good for your health.).
+  1. Create some mock objects.
+  1. Specify your expectations on them (How many times will a method be called? With what arguments? What should it do? etc.).
+  1. Exercise some code that uses the mocks; optionally, check the result using Google Test assertions. If a mock method is called more than expected or with wrong arguments, you'll get an error immediately.
+  1. When a mock is destructed, Google Mock will automatically check whether all expectations on it have been satisfied.
+
+Here's an example:
+
+```
+#include "path/to/mock-turtle.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+using ::testing::AtLeast;                     // #1
+
+TEST(PainterTest, CanDrawSomething) {
+  MockTurtle turtle;                          // #2
+  EXPECT_CALL(turtle, PenDown())              // #3
+      .Times(AtLeast(1));
+
+  Painter painter(&turtle);                   // #4
+
+  EXPECT_TRUE(painter.DrawCircle(0, 0, 10));
+}                                             // #5
+
+int main(int argc, char** argv) {
+  // The following line must be executed to initialize Google Mock
+  // (and Google Test) before running the tests.
+  ::testing::InitGoogleMock(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+```
+
+As you might have guessed, this test checks that `PenDown()` is called at least once. If the `painter` object didn't call this method, your test will fail with a message like this:
+
+```
+path/to/my_test.cc:119: Failure
+Actual function call count doesn't match this expectation:
+Actually: never called;
+Expected: called at least once.
+```
+
+**Tip 1:** If you run the test from an Emacs buffer, you can hit `<Enter>` on the line number displayed in the error message to jump right to the failed expectation.
+
+**Tip 2:** If your mock objects are never deleted, the final verification won't happen. Therefore it's a good idea to use a heap leak checker in your tests when you allocate mocks on the heap.
+
+**Important note:** Google Mock requires expectations to be set **before** the mock functions are called, otherwise the behavior is **undefined**. In particular, you mustn't interleave `EXPECT_CALL()`s and calls to the mock functions.
+
+This means `EXPECT_CALL()` should be read as expecting that a call will occur _in the future_, not that a call has occurred. Why does Google Mock work like that? Well, specifying the expectation beforehand allows Google Mock to report a violation as soon as it arises, when the context (stack trace, etc) is still available. This makes debugging much easier.
+
+Admittedly, this test is contrived and doesn't do much. You can easily achieve the same effect without using Google Mock. However, as we shall reveal soon, Google Mock allows you to do _much more_ with the mocks.
+
+## Using Google Mock with Any Testing Framework ##
+If you want to use something other than Google Test (e.g. [CppUnit](http://apps.sourceforge.net/mediawiki/cppunit/index.php?title=Main_Page) or
+[CxxTest](http://cxxtest.tigris.org/)) as your testing framework, just change the `main()` function in the previous section to:
+```
+int main(int argc, char** argv) {
+  // The following line causes Google Mock to throw an exception on failure,
+  // which will be interpreted by your testing framework as a test failure.
+  ::testing::GTEST_FLAG(throw_on_failure) = true;
+  ::testing::InitGoogleMock(&argc, argv);
+  ... whatever your testing framework requires ...
+}
+```
+
+This approach has a catch: it makes Google Mock throw an exception
+from a mock object's destructor sometimes.  With some compilers, this
+sometimes causes the test program to crash.  You'll still be able to
+notice that the test has failed, but it's not a graceful failure.
+
+A better solution is to use Google Test's
+[event listener API](http://code.google.com/p/googletest/wiki/AdvancedGuide#Extending_Google_Test_by_Handling_Test_Events)
+to report a test failure to your testing framework properly.  You'll need to
+implement the `OnTestPartResult()` method of the event listener interface, but it
+should be straightforward.
+
+If this turns out to be too much work, we suggest that you stick with
+Google Test, which works with Google Mock seamlessly (in fact, it is
+technically part of Google Mock.).  If there is a reason that you
+cannot use Google Test, please let us know.
+
+# Setting Expectations #
+The key to using a mock object successfully is to set the _right expectations_ on it. If you set the expectations too strict, your test will fail as the result of unrelated changes. If you set them too loose, bugs can slip through. You want to do it just right such that your test can catch exactly the kind of bugs you intend it to catch. Google Mock provides the necessary means for you to do it "just right."
+
+## General Syntax ##
+In Google Mock we use the `EXPECT_CALL()` macro to set an expectation on a mock method. The general syntax is:
+
+```
+EXPECT_CALL(mock_object, method(matchers))
+    .Times(cardinality)
+    .WillOnce(action)
+    .WillRepeatedly(action);
+```
+
+The macro has two arguments: first the mock object, and then the method and its arguments. Note that the two are separated by a comma (`,`), not a period (`.`). (Why using a comma? The answer is that it was necessary for technical reasons.)
+
+The macro can be followed by some optional _clauses_ that provide more information about the expectation. We'll discuss how each clause works in the coming sections.
+
+This syntax is designed to make an expectation read like English. For example, you can probably guess that
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetX())
+    .Times(5)
+    .WillOnce(Return(100))
+    .WillOnce(Return(150))
+    .WillRepeatedly(Return(200));
+```
+
+says that the `turtle` object's `GetX()` method will be called five times, it will return 100 the first time, 150 the second time, and then 200 every time. Some people like to call this style of syntax a Domain-Specific Language (DSL).
+
+**Note:** Why do we use a macro to do this? It serves two purposes: first it makes expectations easily identifiable (either by `grep` or by a human reader), and second it allows Google Mock to include the source file location of a failed expectation in messages, making debugging easier.
+
+## Matchers: What Arguments Do We Expect? ##
+When a mock function takes arguments, we must specify what arguments we are expecting; for example:
+
+```
+// Expects the turtle to move forward by 100 units.
+EXPECT_CALL(turtle, Forward(100));
+```
+
+Sometimes you may not want to be too specific (Remember that talk about tests being too rigid? Over specification leads to brittle tests and obscures the intent of tests. Therefore we encourage you to specify only what's necessary - no more, no less.). If you care to check that `Forward()` will be called but aren't interested in its actual argument, write `_` as the argument, which means "anything goes":
+
+```
+using ::testing::_;
+...
+// Expects the turtle to move forward.
+EXPECT_CALL(turtle, Forward(_));
+```
+
+`_` is an instance of what we call **matchers**. A matcher is like a predicate and can test whether an argument is what we'd expect. You can use a matcher inside `EXPECT_CALL()` wherever a function argument is expected.
+
+A list of built-in matchers can be found in the [CheatSheet](V1_7_CheatSheet.md). For example, here's the `Ge` (greater than or equal) matcher:
+
+```
+using ::testing::Ge;...
+EXPECT_CALL(turtle, Forward(Ge(100)));
+```
+
+This checks that the turtle will be told to go forward by at least 100 units.
+
+## Cardinalities: How Many Times Will It Be Called? ##
+The first clause we can specify following an `EXPECT_CALL()` is `Times()`. We call its argument a **cardinality** as it tells _how many times_ the call should occur. It allows us to repeat an expectation many times without actually writing it as many times. More importantly, a cardinality can be "fuzzy", just like a matcher can be. This allows a user to express the intent of a test exactly.
+
+An interesting special case is when we say `Times(0)`. You may have guessed - it means that the function shouldn't be called with the given arguments at all, and Google Mock will report a Google Test failure whenever the function is (wrongfully) called.
+
+We've seen `AtLeast(n)` as an example of fuzzy cardinalities earlier. For the list of built-in cardinalities you can use, see the [CheatSheet](V1_7_CheatSheet.md).
+
+The `Times()` clause can be omitted. **If you omit `Times()`, Google Mock will infer the cardinality for you.** The rules are easy to remember:
+
+  * If **neither** `WillOnce()` **nor** `WillRepeatedly()` is in the `EXPECT_CALL()`, the inferred cardinality is `Times(1)`.
+  * If there are `n WillOnce()`'s but **no** `WillRepeatedly()`, where `n` >= 1, the cardinality is `Times(n)`.
+  * If there are `n WillOnce()`'s and **one** `WillRepeatedly()`, where `n` >= 0, the cardinality is `Times(AtLeast(n))`.
+
+**Quick quiz:** what do you think will happen if a function is expected to be called twice but actually called four times?
+
+## Actions: What Should It Do? ##
+Remember that a mock object doesn't really have a working implementation? We as users have to tell it what to do when a method is invoked. This is easy in Google Mock.
+
+First, if the return type of a mock function is a built-in type or a pointer, the function has a **default action** (a `void` function will just return, a `bool` function will return `false`, and other functions will return 0). If you don't say anything, this behavior will be used.
+
+Second, if a mock function doesn't have a default action, or the default action doesn't suit you, you can specify the action to be taken each time the expectation matches using a series of `WillOnce()` clauses followed by an optional `WillRepeatedly()`. For example,
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetX())
+    .WillOnce(Return(100))
+    .WillOnce(Return(200))
+    .WillOnce(Return(300));
+```
+
+This says that `turtle.GetX()` will be called _exactly three times_ (Google Mock inferred this from how many `WillOnce()` clauses we've written, since we didn't explicitly write `Times()`), and will return 100, 200, and 300 respectively.
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetY())
+    .WillOnce(Return(100))
+    .WillOnce(Return(200))
+    .WillRepeatedly(Return(300));
+```
+
+says that `turtle.GetY()` will be called _at least twice_ (Google Mock knows this as we've written two `WillOnce()` clauses and a `WillRepeatedly()` while having no explicit `Times()`), will return 100 the first time, 200 the second time, and 300 from the third time on.
+
+Of course, if you explicitly write a `Times()`, Google Mock will not try to infer the cardinality itself. What if the number you specified is larger than there are `WillOnce()` clauses? Well, after all `WillOnce()`s are used up, Google Mock will do the _default_ action for the function every time (unless, of course, you have a `WillRepeatedly()`.).
+
+What can we do inside `WillOnce()` besides `Return()`? You can return a reference using `ReturnRef(variable)`, or invoke a pre-defined function, among [others](http://code.google.com/p/googlemock/wiki/V1_7_CheatSheet#Actions).
+
+**Important note:** The `EXPECT_CALL()` statement evaluates the action clause only once, even though the action may be performed many times. Therefore you must be careful about side effects. The following may not do what you want:
+
+```
+int n = 100;
+EXPECT_CALL(turtle, GetX())
+.Times(4)
+.WillRepeatedly(Return(n++));
+```
+
+Instead of returning 100, 101, 102, ..., consecutively, this mock function will always return 100 as `n++` is only evaluated once. Similarly, `Return(new Foo)` will create a new `Foo` object when the `EXPECT_CALL()` is executed, and will return the same pointer every time. If you want the side effect to happen every time, you need to define a custom action, which we'll teach in the [CookBook](V1_7_CookBook.md).
+
+Time for another quiz! What do you think the following means?
+
+```
+using ::testing::Return;...
+EXPECT_CALL(turtle, GetY())
+.Times(4)
+.WillOnce(Return(100));
+```
+
+Obviously `turtle.GetY()` is expected to be called four times. But if you think it will return 100 every time, think twice! Remember that one `WillOnce()` clause will be consumed each time the function is invoked and the default action will be taken afterwards. So the right answer is that `turtle.GetY()` will return 100 the first time, but **return 0 from the second time on**, as returning 0 is the default action for `int` functions.
+
+## Using Multiple Expectations ##
+So far we've only shown examples where you have a single expectation. More realistically, you're going to specify expectations on multiple mock methods, which may be from multiple mock objects.
+
+By default, when a mock method is invoked, Google Mock will search the expectations in the **reverse order** they are defined, and stop when an active expectation that matches the arguments is found (you can think of it as "newer rules override older ones."). If the matching expectation cannot take any more calls, you will get an upper-bound-violated failure. Here's an example:
+
+```
+using ::testing::_;...
+EXPECT_CALL(turtle, Forward(_));  // #1
+EXPECT_CALL(turtle, Forward(10))  // #2
+    .Times(2);
+```
+
+If `Forward(10)` is called three times in a row, the third time it will be an error, as the last matching expectation (#2) has been saturated. If, however, the third `Forward(10)` call is replaced by `Forward(20)`, then it would be OK, as now #1 will be the matching expectation.
+
+**Side note:** Why does Google Mock search for a match in the _reverse_ order of the expectations? The reason is that this allows a user to set up the default expectations in a mock object's constructor or the test fixture's set-up phase and then customize the mock by writing more specific expectations in the test body. So, if you have two expectations on the same method, you want to put the one with more specific matchers **after** the other, or the more specific rule would be shadowed by the more general one that comes after it.
+
+## Ordered vs Unordered Calls ##
+By default, an expectation can match a call even though an earlier expectation hasn't been satisfied. In other words, the calls don't have to occur in the order the expectations are specified.
+
+Sometimes, you may want all the expected calls to occur in a strict order. To say this in Google Mock is easy:
+
+```
+using ::testing::InSequence;...
+TEST(FooTest, DrawsLineSegment) {
+  ...
+  {
+    InSequence dummy;
+
+    EXPECT_CALL(turtle, PenDown());
+    EXPECT_CALL(turtle, Forward(100));
+    EXPECT_CALL(turtle, PenUp());
+  }
+  Foo();
+}
+```
+
+By creating an object of type `InSequence`, all expectations in its scope are put into a _sequence_ and have to occur _sequentially_. Since we are just relying on the constructor and destructor of this object to do the actual work, its name is really irrelevant.
+
+In this example, we test that `Foo()` calls the three expected functions in the order as written. If a call is made out-of-order, it will be an error.
+
+(What if you care about the relative order of some of the calls, but not all of them? Can you specify an arbitrary partial order? The answer is ... yes! If you are impatient, the details can be found in the [CookBook](V1_7_CookBook#Expecting_Partially_Ordered_Calls.md).)
+
+## All Expectations Are Sticky (Unless Said Otherwise) ##
+Now let's do a quick quiz to see how well you can use this mock stuff already. How would you test that the turtle is asked to go to the origin _exactly twice_ (you want to ignore any other instructions it receives)?
+
+After you've come up with your answer, take a look at ours and compare notes (solve it yourself first - don't cheat!):
+
+```
+using ::testing::_;...
+EXPECT_CALL(turtle, GoTo(_, _))  // #1
+    .Times(AnyNumber());
+EXPECT_CALL(turtle, GoTo(0, 0))  // #2
+    .Times(2);
+```
+
+Suppose `turtle.GoTo(0, 0)` is called three times. In the third time, Google Mock will see that the arguments match expectation #2 (remember that we always pick the last matching expectation). Now, since we said that there should be only two such calls, Google Mock will report an error immediately. This is basically what we've told you in the "Using Multiple Expectations" section above.
+
+This example shows that **expectations in Google Mock are "sticky" by default**, in the sense that they remain active even after we have reached their invocation upper bounds. This is an important rule to remember, as it affects the meaning of the spec, and is **different** to how it's done in many other mocking frameworks (Why'd we do that? Because we think our rule makes the common cases easier to express and understand.).
+
+Simple? Let's see if you've really understood it: what does the following code say?
+
+```
+using ::testing::Return;
+...
+for (int i = n; i > 0; i--) {
+  EXPECT_CALL(turtle, GetX())
+      .WillOnce(Return(10*i));
+}
+```
+
+If you think it says that `turtle.GetX()` will be called `n` times and will return 10, 20, 30, ..., consecutively, think twice! The problem is that, as we said, expectations are sticky. So, the second time `turtle.GetX()` is called, the last (latest) `EXPECT_CALL()` statement will match, and will immediately lead to an "upper bound exceeded" error - this piece of code is not very useful!
+
+One correct way of saying that `turtle.GetX()` will return 10, 20, 30, ..., is to explicitly say that the expectations are _not_ sticky. In other words, they should _retire_ as soon as they are saturated:
+
+```
+using ::testing::Return;
+...
+for (int i = n; i > 0; i--) {
+  EXPECT_CALL(turtle, GetX())
+    .WillOnce(Return(10*i))
+    .RetiresOnSaturation();
+}
+```
+
+And, there's a better way to do it: in this case, we expect the calls to occur in a specific order, and we line up the actions to match the order. Since the order is important here, we should make it explicit using a sequence:
+
+```
+using ::testing::InSequence;
+using ::testing::Return;
+...
+{
+  InSequence s;
+
+  for (int i = 1; i <= n; i++) {
+    EXPECT_CALL(turtle, GetX())
+        .WillOnce(Return(10*i))
+        .RetiresOnSaturation();
+  }
+}
+```
+
+By the way, the other situation where an expectation may _not_ be sticky is when it's in a sequence - as soon as another expectation that comes after it in the sequence has been used, it automatically retires (and will never be used to match any call).
+
+## Uninteresting Calls ##
+A mock object may have many methods, and not all of them are that interesting. For example, in some tests we may not care about how many times `GetX()` and `GetY()` get called.
+
+In Google Mock, if you are not interested in a method, just don't say anything about it. If a call to this method occurs, you'll see a warning in the test output, but it won't be a failure.
+
+# What Now? #
+Congratulations! You've learned enough about Google Mock to start using it. Now, you might want to join the [googlemock](http://groups.google.com/group/googlemock) discussion group and actually write some tests using Google Mock - it will be fun. Hey, it may even be addictive - you've been warned.
+
+Then, if you feel like increasing your mock quotient, you should move on to the [CookBook](V1_7_CookBook.md). You can learn many advanced features of Google Mock there -- and advance your level of enjoyment and testing bliss.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/FrequentlyAskedQuestions.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/FrequentlyAskedQuestions.md
new file mode 100644
index 0000000000..fa21233aa2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/docs/v1_7/FrequentlyAskedQuestions.md
@@ -0,0 +1,628 @@
+
+
+Please send your questions to the
+[googlemock](http://groups.google.com/group/googlemock) discussion
+group. If you need help with compiler errors, make sure you have
+tried [Google Mock Doctor](#How_am_I_supposed_to_make_sense_of_these_horrible_template_error.md) first.
+
+## When I call a method on my mock object, the method for the real object is invoked instead.  What's the problem? ##
+
+In order for a method to be mocked, it must be _virtual_, unless you use the [high-perf dependency injection technique](http://code.google.com/p/googlemock/wiki/V1_7_CookBook#Mocking_Nonvirtual_Methods).
+
+## I wrote some matchers.  After I upgraded to a new version of Google Mock, they no longer compile.  What's going on? ##
+
+After version 1.4.0 of Google Mock was released, we had an idea on how
+to make it easier to write matchers that can generate informative
+messages efficiently.  We experimented with this idea and liked what
+we saw.  Therefore we decided to implement it.
+
+Unfortunately, this means that if you have defined your own matchers
+by implementing `MatcherInterface` or using `MakePolymorphicMatcher()`,
+your definitions will no longer compile.  Matchers defined using the
+`MATCHER*` family of macros are not affected.
+
+Sorry for the hassle if your matchers are affected.  We believe it's
+in everyone's long-term interest to make this change sooner than
+later.  Fortunately, it's usually not hard to migrate an existing
+matcher to the new API.  Here's what you need to do:
+
+If you wrote your matcher like this:
+```
+// Old matcher definition that doesn't work with the latest
+// Google Mock.
+using ::testing::MatcherInterface;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetFoo() > 5;
+  }
+  ...
+};
+```
+
+you'll need to change it to:
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool MatchAndExplain(MyType value,
+                               MatchResultListener* listener) const {
+    // Returns true if value matches.
+    return value.GetFoo() > 5;
+  }
+  ...
+};
+```
+(i.e. rename `Matches()` to `MatchAndExplain()` and give it a second
+argument of type `MatchResultListener*`.)
+
+If you were also using `ExplainMatchResultTo()` to improve the matcher
+message:
+```
+// Old matcher definition that doesn't work with the lastest
+// Google Mock.
+using ::testing::MatcherInterface;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetFoo() > 5;
+  }
+
+  virtual void ExplainMatchResultTo(MyType value,
+                                    ::std::ostream* os) const {
+    // Prints some helpful information to os to help
+    // a user understand why value matches (or doesn't match).
+    *os << "the Foo property is " << value.GetFoo();
+  }
+  ...
+};
+```
+
+you should move the logic of `ExplainMatchResultTo()` into
+`MatchAndExplain()`, using the `MatchResultListener` argument where
+the `::std::ostream` was used:
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+...
+class MyWonderfulMatcher : public MatcherInterface<MyType> {
+ public:
+  ...
+  virtual bool MatchAndExplain(MyType value,
+                               MatchResultListener* listener) const {
+    // Returns true if value matches.
+    *listener << "the Foo property is " << value.GetFoo();
+    return value.GetFoo() > 5;
+  }
+  ...
+};
+```
+
+If your matcher is defined using `MakePolymorphicMatcher()`:
+```
+// Old matcher definition that doesn't work with the latest
+// Google Mock.
+using ::testing::MakePolymorphicMatcher;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetBar() < 42;
+  }
+  ...
+};
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+you should rename the `Matches()` method to `MatchAndExplain()` and
+add a `MatchResultListener*` argument (the same as what you need to do
+for matchers defined by implementing `MatcherInterface`):
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MakePolymorphicMatcher;
+using ::testing::MatchResultListener;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool MatchAndExplain(MyType value,
+                       MatchResultListener* listener) const {
+    // Returns true if value matches.
+    return value.GetBar() < 42;
+  }
+  ...
+};
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+If your polymorphic matcher uses `ExplainMatchResultTo()` for better
+failure messages:
+```
+// Old matcher definition that doesn't work with the latest
+// Google Mock.
+using ::testing::MakePolymorphicMatcher;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool Matches(MyType value) const {
+    // Returns true if value matches.
+    return value.GetBar() < 42;
+  }
+  ...
+};
+void ExplainMatchResultTo(const MyGreatMatcher& matcher,
+                          MyType value,
+                          ::std::ostream* os) {
+  // Prints some helpful information to os to help
+  // a user understand why value matches (or doesn't match).
+  *os << "the Bar property is " << value.GetBar();
+}
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+you'll need to move the logic inside `ExplainMatchResultTo()` to
+`MatchAndExplain()`:
+```
+// New matcher definition that works with the latest Google Mock.
+using ::testing::MakePolymorphicMatcher;
+using ::testing::MatchResultListener;
+...
+class MyGreatMatcher {
+ public:
+  ...
+  bool MatchAndExplain(MyType value,
+                       MatchResultListener* listener) const {
+    // Returns true if value matches.
+    *listener << "the Bar property is " << value.GetBar();
+    return value.GetBar() < 42;
+  }
+  ...
+};
+... MakePolymorphicMatcher(MyGreatMatcher()) ...
+```
+
+For more information, you can read these
+[two](http://code.google.com/p/googlemock/wiki/V1_7_CookBook#Writing_New_Monomorphic_Matchers)
+[recipes](http://code.google.com/p/googlemock/wiki/V1_7_CookBook#Writing_New_Polymorphic_Matchers)
+from the cookbook.  As always, you
+are welcome to post questions on `googlemock@googlegroups.com` if you
+need any help.
+
+## When using Google Mock, do I have to use Google Test as the testing framework?  I have my favorite testing framework and don't want to switch. ##
+
+Google Mock works out of the box with Google Test.  However, it's easy
+to configure it to work with any testing framework of your choice.
+[Here](http://code.google.com/p/googlemock/wiki/V1_7_ForDummies#Using_Google_Mock_with_Any_Testing_Framework) is how.
+
+## How am I supposed to make sense of these horrible template errors? ##
+
+If you are confused by the compiler errors gcc threw at you,
+try consulting the _Google Mock Doctor_ tool first.  What it does is to
+scan stdin for gcc error messages, and spit out diagnoses on the
+problems (we call them diseases) your code has.
+
+To "install", run command:
+```
+alias gmd='<path to googlemock>/scripts/gmock_doctor.py'
+```
+
+To use it, do:
+```
+<your-favorite-build-command> <your-test> 2>&1 | gmd
+```
+
+For example:
+```
+make my_test 2>&1 | gmd
+```
+
+Or you can run `gmd` and copy-n-paste gcc's error messages to it.
+
+## Can I mock a variadic function? ##
+
+You cannot mock a variadic function (i.e. a function taking ellipsis
+(`...`) arguments) directly in Google Mock.
+
+The problem is that in general, there is _no way_ for a mock object to
+know how many arguments are passed to the variadic method, and what
+the arguments' types are.  Only the _author of the base class_ knows
+the protocol, and we cannot look into his head.
+
+Therefore, to mock such a function, the _user_ must teach the mock
+object how to figure out the number of arguments and their types.  One
+way to do it is to provide overloaded versions of the function.
+
+Ellipsis arguments are inherited from C and not really a C++ feature.
+They are unsafe to use and don't work with arguments that have
+constructors or destructors.  Therefore we recommend to avoid them in
+C++ as much as possible.
+
+## MSVC gives me warning C4301 or C4373 when I define a mock method with a const parameter.  Why? ##
+
+If you compile this using Microsoft Visual C++ 2005 SP1:
+```
+class Foo {
+  ...
+  virtual void Bar(const int i) = 0;
+};
+
+class MockFoo : public Foo {
+  ...
+  MOCK_METHOD1(Bar, void(const int i));
+};
+```
+You may get the following warning:
+```
+warning C4301: 'MockFoo::Bar': overriding virtual function only differs from 'Foo::Bar' by const/volatile qualifier
+```
+
+This is a MSVC bug.  The same code compiles fine with gcc ,for
+example.  If you use Visual C++ 2008 SP1, you would get the warning:
+```
+warning C4373: 'MockFoo::Bar': virtual function overrides 'Foo::Bar', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers
+```
+
+In C++, if you _declare_ a function with a `const` parameter, the
+`const` modifier is _ignored_.  Therefore, the `Foo` base class above
+is equivalent to:
+```
+class Foo {
+  ...
+  virtual void Bar(int i) = 0;  // int or const int?  Makes no difference.
+};
+```
+
+In fact, you can _declare_ Bar() with an `int` parameter, and _define_
+it with a `const int` parameter.  The compiler will still match them
+up.
+
+Since making a parameter `const` is meaningless in the method
+_declaration_, we recommend to remove it in both `Foo` and `MockFoo`.
+That should workaround the VC bug.
+
+Note that we are talking about the _top-level_ `const` modifier here.
+If the function parameter is passed by pointer or reference, declaring
+the _pointee_ or _referee_ as `const` is still meaningful.  For
+example, the following two declarations are _not_ equivalent:
+```
+void Bar(int* p);        // Neither p nor *p is const.
+void Bar(const int* p);  // p is not const, but *p is.
+```
+
+## I have a huge mock class, and Microsoft Visual C++ runs out of memory when compiling it.  What can I do? ##
+
+We've noticed that when the `/clr` compiler flag is used, Visual C++
+uses 5~6 times as much memory when compiling a mock class.  We suggest
+to avoid `/clr` when compiling native C++ mocks.
+
+## I can't figure out why Google Mock thinks my expectations are not satisfied.  What should I do? ##
+
+You might want to run your test with
+`--gmock_verbose=info`.  This flag lets Google Mock print a trace
+of every mock function call it receives.  By studying the trace,
+you'll gain insights on why the expectations you set are not met.
+
+## How can I assert that a function is NEVER called? ##
+
+```
+EXPECT_CALL(foo, Bar(_))
+    .Times(0);
+```
+
+## I have a failed test where Google Mock tells me TWICE that a particular expectation is not satisfied.  Isn't this redundant? ##
+
+When Google Mock detects a failure, it prints relevant information
+(the mock function arguments, the state of relevant expectations, and
+etc) to help the user debug.  If another failure is detected, Google
+Mock will do the same, including printing the state of relevant
+expectations.
+
+Sometimes an expectation's state didn't change between two failures,
+and you'll see the same description of the state twice.  They are
+however _not_ redundant, as they refer to _different points in time_.
+The fact they are the same _is_ interesting information.
+
+## I get a heap check failure when using a mock object, but using a real object is fine.  What can be wrong? ##
+
+Does the class (hopefully a pure interface) you are mocking have a
+virtual destructor?
+
+Whenever you derive from a base class, make sure its destructor is
+virtual.  Otherwise Bad Things will happen.  Consider the following
+code:
+
+```
+class Base {
+ public:
+  // Not virtual, but should be.
+  ~Base() { ... }
+  ...
+};
+
+class Derived : public Base {
+ public:
+  ...
+ private:
+  std::string value_;
+};
+
+...
+  Base* p = new Derived;
+  ...
+  delete p;  // Surprise! ~Base() will be called, but ~Derived() will not
+             // - value_ is leaked.
+```
+
+By changing `~Base()` to virtual, `~Derived()` will be correctly
+called when `delete p` is executed, and the heap checker
+will be happy.
+
+## The "newer expectations override older ones" rule makes writing expectations awkward.  Why does Google Mock do that? ##
+
+When people complain about this, often they are referring to code like:
+
+```
+// foo.Bar() should be called twice, return 1 the first time, and return
+// 2 the second time.  However, I have to write the expectations in the
+// reverse order.  This sucks big time!!!
+EXPECT_CALL(foo, Bar())
+    .WillOnce(Return(2))
+    .RetiresOnSaturation();
+EXPECT_CALL(foo, Bar())
+    .WillOnce(Return(1))
+    .RetiresOnSaturation();
+```
+
+The problem is that they didn't pick the **best** way to express the test's
+intent.
+
+By default, expectations don't have to be matched in _any_ particular
+order.  If you want them to match in a certain order, you need to be
+explicit.  This is Google Mock's (and jMock's) fundamental philosophy: it's
+easy to accidentally over-specify your tests, and we want to make it
+harder to do so.
+
+There are two better ways to write the test spec.  You could either
+put the expectations in sequence:
+
+```
+// foo.Bar() should be called twice, return 1 the first time, and return
+// 2 the second time.  Using a sequence, we can write the expectations
+// in their natural order.
+{
+  InSequence s;
+  EXPECT_CALL(foo, Bar())
+      .WillOnce(Return(1))
+      .RetiresOnSaturation();
+  EXPECT_CALL(foo, Bar())
+      .WillOnce(Return(2))
+      .RetiresOnSaturation();
+}
+```
+
+or you can put the sequence of actions in the same expectation:
+
+```
+// foo.Bar() should be called twice, return 1 the first time, and return
+// 2 the second time.
+EXPECT_CALL(foo, Bar())
+    .WillOnce(Return(1))
+    .WillOnce(Return(2))
+    .RetiresOnSaturation();
+```
+
+Back to the original questions: why does Google Mock search the
+expectations (and `ON_CALL`s) from back to front?  Because this
+allows a user to set up a mock's behavior for the common case early
+(e.g. in the mock's constructor or the test fixture's set-up phase)
+and customize it with more specific rules later.  If Google Mock
+searches from front to back, this very useful pattern won't be
+possible.
+
+## Google Mock prints a warning when a function without EXPECT\_CALL is called, even if I have set its behavior using ON\_CALL.  Would it be reasonable not to show the warning in this case? ##
+
+When choosing between being neat and being safe, we lean toward the
+latter.  So the answer is that we think it's better to show the
+warning.
+
+Often people write `ON_CALL`s in the mock object's
+constructor or `SetUp()`, as the default behavior rarely changes from
+test to test.  Then in the test body they set the expectations, which
+are often different for each test.  Having an `ON_CALL` in the set-up
+part of a test doesn't mean that the calls are expected.  If there's
+no `EXPECT_CALL` and the method is called, it's possibly an error.  If
+we quietly let the call go through without notifying the user, bugs
+may creep in unnoticed.
+
+If, however, you are sure that the calls are OK, you can write
+
+```
+EXPECT_CALL(foo, Bar(_))
+    .WillRepeatedly(...);
+```
+
+instead of
+
+```
+ON_CALL(foo, Bar(_))
+    .WillByDefault(...);
+```
+
+This tells Google Mock that you do expect the calls and no warning should be
+printed.
+
+Also, you can control the verbosity using the `--gmock_verbose` flag.
+If you find the output too noisy when debugging, just choose a less
+verbose level.
+
+## How can I delete the mock function's argument in an action? ##
+
+If you find yourself needing to perform some action that's not
+supported by Google Mock directly, remember that you can define your own
+actions using
+[MakeAction()](http://code.google.com/p/googlemock/wiki/V1_7_CookBook#Writing_New_Actions) or
+[MakePolymorphicAction()](http://code.google.com/p/googlemock/wiki/V1_7_CookBook#Writing_New_Polymorphic_Actions),
+or you can write a stub function and invoke it using
+[Invoke()](http://code.google.com/p/googlemock/wiki/V1_7_CookBook#Using_Functions_Methods_Functors).
+
+## MOCK\_METHODn()'s second argument looks funny.  Why don't you use the MOCK\_METHODn(Method, return\_type, arg\_1, ..., arg\_n) syntax? ##
+
+What?!  I think it's beautiful. :-)
+
+While which syntax looks more natural is a subjective matter to some
+extent, Google Mock's syntax was chosen for several practical advantages it
+has.
+
+Try to mock a function that takes a map as an argument:
+```
+virtual int GetSize(const map<int, std::string>& m);
+```
+
+Using the proposed syntax, it would be:
+```
+MOCK_METHOD1(GetSize, int, const map<int, std::string>& m);
+```
+
+Guess what?  You'll get a compiler error as the compiler thinks that
+`const map<int, std::string>& m` are **two**, not one, arguments. To work
+around this you can use `typedef` to give the map type a name, but
+that gets in the way of your work.  Google Mock's syntax avoids this
+problem as the function's argument types are protected inside a pair
+of parentheses:
+```
+// This compiles fine.
+MOCK_METHOD1(GetSize, int(const map<int, std::string>& m));
+```
+
+You still need a `typedef` if the return type contains an unprotected
+comma, but that's much rarer.
+
+Other advantages include:
+  1. `MOCK_METHOD1(Foo, int, bool)` can leave a reader wonder whether the method returns `int` or `bool`, while there won't be such confusion using Google Mock's syntax.
+  1. The way Google Mock describes a function type is nothing new, although many people may not be familiar with it.  The same syntax was used in C, and the `function` library in `tr1` uses this syntax extensively.  Since `tr1` will become a part of the new version of STL, we feel very comfortable to be consistent with it.
+  1. The function type syntax is also used in other parts of Google Mock's API (e.g. the action interface) in order to make the implementation tractable. A user needs to learn it anyway in order to utilize Google Mock's more advanced features.  We'd as well stick to the same syntax in `MOCK_METHOD*`!
+
+## My code calls a static/global function.  Can I mock it? ##
+
+You can, but you need to make some changes.
+
+In general, if you find yourself needing to mock a static function,
+it's a sign that your modules are too tightly coupled (and less
+flexible, less reusable, less testable, etc).  You are probably better
+off defining a small interface and call the function through that
+interface, which then can be easily mocked.  It's a bit of work
+initially, but usually pays for itself quickly.
+
+This Google Testing Blog
+[post](http://googletesting.blogspot.com/2008/06/defeat-static-cling.html)
+says it excellently.  Check it out.
+
+## My mock object needs to do complex stuff.  It's a lot of pain to specify the actions.  Google Mock sucks! ##
+
+I know it's not a question, but you get an answer for free any way. :-)
+
+With Google Mock, you can create mocks in C++ easily.  And people might be
+tempted to use them everywhere. Sometimes they work great, and
+sometimes you may find them, well, a pain to use. So, what's wrong in
+the latter case?
+
+When you write a test without using mocks, you exercise the code and
+assert that it returns the correct value or that the system is in an
+expected state.  This is sometimes called "state-based testing".
+
+Mocks are great for what some call "interaction-based" testing:
+instead of checking the system state at the very end, mock objects
+verify that they are invoked the right way and report an error as soon
+as it arises, giving you a handle on the precise context in which the
+error was triggered.  This is often more effective and economical to
+do than state-based testing.
+
+If you are doing state-based testing and using a test double just to
+simulate the real object, you are probably better off using a fake.
+Using a mock in this case causes pain, as it's not a strong point for
+mocks to perform complex actions.  If you experience this and think
+that mocks suck, you are just not using the right tool for your
+problem. Or, you might be trying to solve the wrong problem. :-)
+
+## I got a warning "Uninteresting function call encountered - default action taken.."  Should I panic? ##
+
+By all means, NO!  It's just an FYI.
+
+What it means is that you have a mock function, you haven't set any
+expectations on it (by Google Mock's rule this means that you are not
+interested in calls to this function and therefore it can be called
+any number of times), and it is called.  That's OK - you didn't say
+it's not OK to call the function!
+
+What if you actually meant to disallow this function to be called, but
+forgot to write `EXPECT_CALL(foo, Bar()).Times(0)`?  While
+one can argue that it's the user's fault, Google Mock tries to be nice and
+prints you a note.
+
+So, when you see the message and believe that there shouldn't be any
+uninteresting calls, you should investigate what's going on.  To make
+your life easier, Google Mock prints the function name and arguments
+when an uninteresting call is encountered.
+
+## I want to define a custom action.  Should I use Invoke() or implement the action interface? ##
+
+Either way is fine - you want to choose the one that's more convenient
+for your circumstance.
+
+Usually, if your action is for a particular function type, defining it
+using `Invoke()` should be easier; if your action can be used in
+functions of different types (e.g. if you are defining
+`Return(value)`), `MakePolymorphicAction()` is
+easiest.  Sometimes you want precise control on what types of
+functions the action can be used in, and implementing
+`ActionInterface` is the way to go here. See the implementation of
+`Return()` in `include/gmock/gmock-actions.h` for an example.
+
+## I'm using the set-argument-pointee action, and the compiler complains about "conflicting return type specified".  What does it mean? ##
+
+You got this error as Google Mock has no idea what value it should return
+when the mock method is called.  `SetArgPointee()` says what the
+side effect is, but doesn't say what the return value should be.  You
+need `DoAll()` to chain a `SetArgPointee()` with a `Return()`.
+
+See this [recipe](http://code.google.com/p/googlemock/wiki/V1_7_CookBook#Mocking_Side_Effects) for more details and an example.
+
+
+## My question is not in your FAQ! ##
+
+If you cannot find the answer to your question in this FAQ, there are
+some other resources you can use:
+
+  1. read other [wiki pages](http://code.google.com/p/googlemock/w/list),
+  1. search the mailing list [archive](http://groups.google.com/group/googlemock/topics),
+  1. ask it on [googlemock@googlegroups.com](mailto:googlemock@googlegroups.com) and someone will answer it (to prevent spam, we require you to join the [discussion group](http://groups.google.com/group/googlemock) before you can post.).
+
+Please note that creating an issue in the
+[issue tracker](http://code.google.com/p/googlemock/issues/list) is _not_
+a good way to get your answer, as it is monitored infrequently by a
+very small number of people.
+
+When asking a question, it's helpful to provide as much of the
+following information as possible (people cannot help you if there's
+not enough information in your question):
+
+  * the version (or the revision number if you check out from SVN directly) of Google Mock you use (Google Mock is under active development, so it's possible that your problem has been solved in a later version),
+  * your operating system,
+  * the name and version of your compiler,
+  * the complete command line flags you give to your compiler,
+  * the complete compiler error messages (if the question is about compilation),
+  * the _actual_ code (ideally, a minimal but complete program) that has the problem you encounter.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-actions.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-actions.h
new file mode 100644
index 0000000000..b3f654af34
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-actions.h
@@ -0,0 +1,1205 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some commonly used actions.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
+
+#ifndef _WIN32_WCE
+# include <errno.h>
+#endif
+
+#include <algorithm>
+#include <string>
+
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
+
+#if GTEST_HAS_STD_TYPE_TRAITS_  // Defined by gtest-port.h via gmock-port.h.
+#include <type_traits>
+#endif
+
+namespace testing {
+
+// To implement an action Foo, define:
+//   1. a class FooAction that implements the ActionInterface interface, and
+//   2. a factory function that creates an Action object from a
+//      const FooAction*.
+//
+// The two-level delegation design follows that of Matcher, providing
+// consistency for extension developers.  It also eases ownership
+// management as Action objects can now be copied like plain values.
+
+namespace internal {
+
+template <typename F1, typename F2>
+class ActionAdaptor;
+
+// BuiltInDefaultValueGetter<T, true>::Get() returns a
+// default-constructed T value.  BuiltInDefaultValueGetter<T,
+// false>::Get() crashes with an error.
+//
+// This primary template is used when kDefaultConstructible is true.
+template <typename T, bool kDefaultConstructible>
+struct BuiltInDefaultValueGetter {
+  static T Get() { return T(); }
+};
+template <typename T>
+struct BuiltInDefaultValueGetter<T, false> {
+  static T Get() {
+    Assert(false, __FILE__, __LINE__,
+           "Default action undefined for the function return type.");
+    return internal::Invalid<T>();
+    // The above statement will never be reached, but is required in
+    // order for this function to compile.
+  }
+};
+
+// BuiltInDefaultValue<T>::Get() returns the "built-in" default value
+// for type T, which is NULL when T is a raw pointer type, 0 when T is
+// a numeric type, false when T is bool, or "" when T is string or
+// std::string.  In addition, in C++11 and above, it turns a
+// default-constructed T value if T is default constructible.  For any
+// other type T, the built-in default T value is undefined, and the
+// function will abort the process.
+template <typename T>
+class BuiltInDefaultValue {
+ public:
+#if GTEST_HAS_STD_TYPE_TRAITS_
+  // This function returns true iff type T has a built-in default value.
+  static bool Exists() {
+    return ::std::is_default_constructible<T>::value;
+  }
+
+  static T Get() {
+    return BuiltInDefaultValueGetter<
+        T, ::std::is_default_constructible<T>::value>::Get();
+  }
+
+#else  // GTEST_HAS_STD_TYPE_TRAITS_
+  // This function returns true iff type T has a built-in default value.
+  static bool Exists() {
+    return false;
+  }
+
+  static T Get() {
+    return BuiltInDefaultValueGetter<T, false>::Get();
+  }
+
+#endif  // GTEST_HAS_STD_TYPE_TRAITS_
+};
+
+// This partial specialization says that we use the same built-in
+// default value for T and const T.
+template <typename T>
+class BuiltInDefaultValue<const T> {
+ public:
+  static bool Exists() { return BuiltInDefaultValue<T>::Exists(); }
+  static T Get() { return BuiltInDefaultValue<T>::Get(); }
+};
+
+// This partial specialization defines the default values for pointer
+// types.
+template <typename T>
+class BuiltInDefaultValue<T*> {
+ public:
+  static bool Exists() { return true; }
+  static T* Get() { return NULL; }
+};
+
+// The following specializations define the default values for
+// specific types we care about.
+#define GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(type, value) \
+  template <> \
+  class BuiltInDefaultValue<type> { \
+   public: \
+    static bool Exists() { return true; } \
+    static type Get() { return value; } \
+  }
+
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(void, );  // NOLINT
+#if GTEST_HAS_GLOBAL_STRING
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(::string, "");
+#endif  // GTEST_HAS_GLOBAL_STRING
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(::std::string, "");
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(bool, false);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned char, '\0');
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed char, '\0');
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(char, '\0');
+
+// There's no need for a default action for signed wchar_t, as that
+// type is the same as wchar_t for gcc, and invalid for MSVC.
+//
+// There's also no need for a default action for unsigned wchar_t, as
+// that type is the same as unsigned int for gcc, and invalid for
+// MSVC.
+#if GMOCK_WCHAR_T_IS_NATIVE_
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(wchar_t, 0U);  // NOLINT
+#endif
+
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned short, 0U);  // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed short, 0);     // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned int, 0U);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed int, 0);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned long, 0UL);  // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed long, 0L);     // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(UInt64, 0);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(Int64, 0);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(float, 0);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(double, 0);
+
+#undef GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_
+
+}  // namespace internal
+
+// When an unexpected function call is encountered, Google Mock will
+// let it return a default value if the user has specified one for its
+// return type, or if the return type has a built-in default value;
+// otherwise Google Mock won't know what value to return and will have
+// to abort the process.
+//
+// The DefaultValue<T> class allows a user to specify the
+// default value for a type T that is both copyable and publicly
+// destructible (i.e. anything that can be used as a function return
+// type).  The usage is:
+//
+//   // Sets the default value for type T to be foo.
+//   DefaultValue<T>::Set(foo);
+template <typename T>
+class DefaultValue {
+ public:
+  // Sets the default value for type T; requires T to be
+  // copy-constructable and have a public destructor.
+  static void Set(T x) {
+    delete producer_;
+    producer_ = new FixedValueProducer(x);
+  }
+
+  // Provides a factory function to be called to generate the default value.
+  // This method can be used even if T is only move-constructible, but it is not
+  // limited to that case.
+  typedef T (*FactoryFunction)();
+  static void SetFactory(FactoryFunction factory) {
+    delete producer_;
+    producer_ = new FactoryValueProducer(factory);
+  }
+
+  // Unsets the default value for type T.
+  static void Clear() {
+    delete producer_;
+    producer_ = NULL;
+  }
+
+  // Returns true iff the user has set the default value for type T.
+  static bool IsSet() { return producer_ != NULL; }
+
+  // Returns true if T has a default return value set by the user or there
+  // exists a built-in default value.
+  static bool Exists() {
+    return IsSet() || internal::BuiltInDefaultValue<T>::Exists();
+  }
+
+  // Returns the default value for type T if the user has set one;
+  // otherwise returns the built-in default value. Requires that Exists()
+  // is true, which ensures that the return value is well-defined.
+  static T Get() {
+    return producer_ == NULL ?
+        internal::BuiltInDefaultValue<T>::Get() : producer_->Produce();
+  }
+
+ private:
+  class ValueProducer {
+   public:
+    virtual ~ValueProducer() {}
+    virtual T Produce() = 0;
+  };
+
+  class FixedValueProducer : public ValueProducer {
+   public:
+    explicit FixedValueProducer(T value) : value_(value) {}
+    virtual T Produce() { return value_; }
+
+   private:
+    const T value_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(FixedValueProducer);
+  };
+
+  class FactoryValueProducer : public ValueProducer {
+   public:
+    explicit FactoryValueProducer(FactoryFunction factory)
+        : factory_(factory) {}
+    virtual T Produce() { return factory_(); }
+
+   private:
+    const FactoryFunction factory_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(FactoryValueProducer);
+  };
+
+  static ValueProducer* producer_;
+};
+
+// This partial specialization allows a user to set default values for
+// reference types.
+template <typename T>
+class DefaultValue<T&> {
+ public:
+  // Sets the default value for type T&.
+  static void Set(T& x) {  // NOLINT
+    address_ = &x;
+  }
+
+  // Unsets the default value for type T&.
+  static void Clear() {
+    address_ = NULL;
+  }
+
+  // Returns true iff the user has set the default value for type T&.
+  static bool IsSet() { return address_ != NULL; }
+
+  // Returns true if T has a default return value set by the user or there
+  // exists a built-in default value.
+  static bool Exists() {
+    return IsSet() || internal::BuiltInDefaultValue<T&>::Exists();
+  }
+
+  // Returns the default value for type T& if the user has set one;
+  // otherwise returns the built-in default value if there is one;
+  // otherwise aborts the process.
+  static T& Get() {
+    return address_ == NULL ?
+        internal::BuiltInDefaultValue<T&>::Get() : *address_;
+  }
+
+ private:
+  static T* address_;
+};
+
+// This specialization allows DefaultValue<void>::Get() to
+// compile.
+template <>
+class DefaultValue<void> {
+ public:
+  static bool Exists() { return true; }
+  static void Get() {}
+};
+
+// Points to the user-set default value for type T.
+template <typename T>
+typename DefaultValue<T>::ValueProducer* DefaultValue<T>::producer_ = NULL;
+
+// Points to the user-set default value for type T&.
+template <typename T>
+T* DefaultValue<T&>::address_ = NULL;
+
+// Implement this interface to define an action for function type F.
+template <typename F>
+class ActionInterface {
+ public:
+  typedef typename internal::Function<F>::Result Result;
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  ActionInterface() {}
+  virtual ~ActionInterface() {}
+
+  // Performs the action.  This method is not const, as in general an
+  // action can have side effects and be stateful.  For example, a
+  // get-the-next-element-from-the-collection action will need to
+  // remember the current element.
+  virtual Result Perform(const ArgumentTuple& args) = 0;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionInterface);
+};
+
+// An Action<F> is a copyable and IMMUTABLE (except by assignment)
+// object that represents an action to be taken when a mock function
+// of type F is called.  The implementation of Action<T> is just a
+// linked_ptr to const ActionInterface<T>, so copying is fairly cheap.
+// Don't inherit from Action!
+//
+// You can view an object implementing ActionInterface<F> as a
+// concrete action (including its current state), and an Action<F>
+// object as a handle to it.
+template <typename F>
+class Action {
+ public:
+  typedef typename internal::Function<F>::Result Result;
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  // Constructs a null Action.  Needed for storing Action objects in
+  // STL containers.
+  Action() : impl_(NULL) {}
+
+  // Constructs an Action from its implementation.  A NULL impl is
+  // used to represent the "do-default" action.
+  explicit Action(ActionInterface<F>* impl) : impl_(impl) {}
+
+  // Copy constructor.
+  Action(const Action& action) : impl_(action.impl_) {}
+
+  // This constructor allows us to turn an Action<Func> object into an
+  // Action<F>, as long as F's arguments can be implicitly converted
+  // to Func's and Func's return type can be implicitly converted to
+  // F's.
+  template <typename Func>
+  explicit Action(const Action<Func>& action);
+
+  // Returns true iff this is the DoDefault() action.
+  bool IsDoDefault() const { return impl_.get() == NULL; }
+
+  // Performs the action.  Note that this method is const even though
+  // the corresponding method in ActionInterface is not.  The reason
+  // is that a const Action<F> means that it cannot be re-bound to
+  // another concrete action, not that the concrete action it binds to
+  // cannot change state.  (Think of the difference between a const
+  // pointer and a pointer to const.)
+  Result Perform(const ArgumentTuple& args) const {
+    internal::Assert(
+        !IsDoDefault(), __FILE__, __LINE__,
+        "You are using DoDefault() inside a composite action like "
+        "DoAll() or WithArgs().  This is not supported for technical "
+        "reasons.  Please instead spell out the default action, or "
+        "assign the default action to an Action variable and use "
+        "the variable in various places.");
+    return impl_->Perform(args);
+  }
+
+ private:
+  template <typename F1, typename F2>
+  friend class internal::ActionAdaptor;
+
+  internal::linked_ptr<ActionInterface<F> > impl_;
+};
+
+// The PolymorphicAction class template makes it easy to implement a
+// polymorphic action (i.e. an action that can be used in mock
+// functions of than one type, e.g. Return()).
+//
+// To define a polymorphic action, a user first provides a COPYABLE
+// implementation class that has a Perform() method template:
+//
+//   class FooAction {
+//    public:
+//     template <typename Result, typename ArgumentTuple>
+//     Result Perform(const ArgumentTuple& args) const {
+//       // Processes the arguments and returns a result, using
+//       // tr1::get<N>(args) to get the N-th (0-based) argument in the tuple.
+//     }
+//     ...
+//   };
+//
+// Then the user creates the polymorphic action using
+// MakePolymorphicAction(object) where object has type FooAction.  See
+// the definition of Return(void) and SetArgumentPointee<N>(value) for
+// complete examples.
+template <typename Impl>
+class PolymorphicAction {
+ public:
+  explicit PolymorphicAction(const Impl& impl) : impl_(impl) {}
+
+  template <typename F>
+  operator Action<F>() const {
+    return Action<F>(new MonomorphicImpl<F>(impl_));
+  }
+
+ private:
+  template <typename F>
+  class MonomorphicImpl : public ActionInterface<F> {
+   public:
+    typedef typename internal::Function<F>::Result Result;
+    typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
+
+    virtual Result Perform(const ArgumentTuple& args) {
+      return impl_.template Perform<Result>(args);
+    }
+
+   private:
+    Impl impl_;
+
+    GTEST_DISALLOW_ASSIGN_(MonomorphicImpl);
+  };
+
+  Impl impl_;
+
+  GTEST_DISALLOW_ASSIGN_(PolymorphicAction);
+};
+
+// Creates an Action from its implementation and returns it.  The
+// created Action object owns the implementation.
+template <typename F>
+Action<F> MakeAction(ActionInterface<F>* impl) {
+  return Action<F>(impl);
+}
+
+// Creates a polymorphic action from its implementation.  This is
+// easier to use than the PolymorphicAction<Impl> constructor as it
+// doesn't require you to explicitly write the template argument, e.g.
+//
+//   MakePolymorphicAction(foo);
+// vs
+//   PolymorphicAction<TypeOfFoo>(foo);
+template <typename Impl>
+inline PolymorphicAction<Impl> MakePolymorphicAction(const Impl& impl) {
+  return PolymorphicAction<Impl>(impl);
+}
+
+namespace internal {
+
+// Allows an Action<F2> object to pose as an Action<F1>, as long as F2
+// and F1 are compatible.
+template <typename F1, typename F2>
+class ActionAdaptor : public ActionInterface<F1> {
+ public:
+  typedef typename internal::Function<F1>::Result Result;
+  typedef typename internal::Function<F1>::ArgumentTuple ArgumentTuple;
+
+  explicit ActionAdaptor(const Action<F2>& from) : impl_(from.impl_) {}
+
+  virtual Result Perform(const ArgumentTuple& args) {
+    return impl_->Perform(args);
+  }
+
+ private:
+  const internal::linked_ptr<ActionInterface<F2> > impl_;
+
+  GTEST_DISALLOW_ASSIGN_(ActionAdaptor);
+};
+
+// Helper struct to specialize ReturnAction to execute a move instead of a copy
+// on return. Useful for move-only types, but could be used on any type.
+template <typename T>
+struct ByMoveWrapper {
+  explicit ByMoveWrapper(T value) : payload(internal::move(value)) {}
+  T payload;
+};
+
+// Implements the polymorphic Return(x) action, which can be used in
+// any function that returns the type of x, regardless of the argument
+// types.
+//
+// Note: The value passed into Return must be converted into
+// Function<F>::Result when this action is cast to Action<F> rather than
+// when that action is performed. This is important in scenarios like
+//
+// MOCK_METHOD1(Method, T(U));
+// ...
+// {
+//   Foo foo;
+//   X x(&foo);
+//   EXPECT_CALL(mock, Method(_)).WillOnce(Return(x));
+// }
+//
+// In the example above the variable x holds reference to foo which leaves
+// scope and gets destroyed.  If copying X just copies a reference to foo,
+// that copy will be left with a hanging reference.  If conversion to T
+// makes a copy of foo, the above code is safe. To support that scenario, we
+// need to make sure that the type conversion happens inside the EXPECT_CALL
+// statement, and conversion of the result of Return to Action<T(U)> is a
+// good place for that.
+//
+template <typename R>
+class ReturnAction {
+ public:
+  // Constructs a ReturnAction object from the value to be returned.
+  // 'value' is passed by value instead of by const reference in order
+  // to allow Return("string literal") to compile.
+  explicit ReturnAction(R value) : value_(new R(internal::move(value))) {}
+
+  // This template type conversion operator allows Return(x) to be
+  // used in ANY function that returns x's type.
+  template <typename F>
+  operator Action<F>() const {
+    // Assert statement belongs here because this is the best place to verify
+    // conditions on F. It produces the clearest error messages
+    // in most compilers.
+    // Impl really belongs in this scope as a local class but can't
+    // because MSVC produces duplicate symbols in different translation units
+    // in this case. Until MS fixes that bug we put Impl into the class scope
+    // and put the typedef both here (for use in assert statement) and
+    // in the Impl class. But both definitions must be the same.
+    typedef typename Function<F>::Result Result;
+    GTEST_COMPILE_ASSERT_(
+        !is_reference<Result>::value,
+        use_ReturnRef_instead_of_Return_to_return_a_reference);
+    return Action<F>(new Impl<R, F>(value_));
+  }
+
+ private:
+  // Implements the Return(x) action for a particular function type F.
+  template <typename R_, typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    // The implicit cast is necessary when Result has more than one
+    // single-argument constructor (e.g. Result is std::vector<int>) and R
+    // has a type conversion operator template.  In that case, value_(value)
+    // won't compile as the compiler doesn't known which constructor of
+    // Result to call.  ImplicitCast_ forces the compiler to convert R to
+    // Result without considering explicit constructors, thus resolving the
+    // ambiguity. value_ is then initialized using its copy constructor.
+    explicit Impl(const linked_ptr<R>& value)
+        : value_before_cast_(*value),
+          value_(ImplicitCast_<Result>(value_before_cast_)) {}
+
+    virtual Result Perform(const ArgumentTuple&) { return value_; }
+
+   private:
+    GTEST_COMPILE_ASSERT_(!is_reference<Result>::value,
+                          Result_cannot_be_a_reference_type);
+    // We save the value before casting just in case it is being cast to a
+    // wrapper type.
+    R value_before_cast_;
+    Result value_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl);
+  };
+
+  // Partially specialize for ByMoveWrapper. This version of ReturnAction will
+  // move its contents instead.
+  template <typename R_, typename F>
+  class Impl<ByMoveWrapper<R_>, F> : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(const linked_ptr<R>& wrapper)
+        : performed_(false), wrapper_(wrapper) {}
+
+    virtual Result Perform(const ArgumentTuple&) {
+      GTEST_CHECK_(!performed_)
+          << "A ByMove() action should only be performed once.";
+      performed_ = true;
+      return internal::move(wrapper_->payload);
+    }
+
+   private:
+    bool performed_;
+    const linked_ptr<R> wrapper_;
+
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+
+  const linked_ptr<R> value_;
+
+  GTEST_DISALLOW_ASSIGN_(ReturnAction);
+};
+
+// Implements the ReturnNull() action.
+class ReturnNullAction {
+ public:
+  // Allows ReturnNull() to be used in any pointer-returning function. In C++11
+  // this is enforced by returning nullptr, and in non-C++11 by asserting a
+  // pointer type on compile time.
+  template <typename Result, typename ArgumentTuple>
+  static Result Perform(const ArgumentTuple&) {
+#if GTEST_LANG_CXX11
+    return nullptr;
+#else
+    GTEST_COMPILE_ASSERT_(internal::is_pointer<Result>::value,
+                          ReturnNull_can_be_used_to_return_a_pointer_only);
+    return NULL;
+#endif  // GTEST_LANG_CXX11
+  }
+};
+
+// Implements the Return() action.
+class ReturnVoidAction {
+ public:
+  // Allows Return() to be used in any void-returning function.
+  template <typename Result, typename ArgumentTuple>
+  static void Perform(const ArgumentTuple&) {
+    CompileAssertTypesEqual<void, Result>();
+  }
+};
+
+// Implements the polymorphic ReturnRef(x) action, which can be used
+// in any function that returns a reference to the type of x,
+// regardless of the argument types.
+template <typename T>
+class ReturnRefAction {
+ public:
+  // Constructs a ReturnRefAction object from the reference to be returned.
+  explicit ReturnRefAction(T& ref) : ref_(ref) {}  // NOLINT
+
+  // This template type conversion operator allows ReturnRef(x) to be
+  // used in ANY function that returns a reference to x's type.
+  template <typename F>
+  operator Action<F>() const {
+    typedef typename Function<F>::Result Result;
+    // Asserts that the function return type is a reference.  This
+    // catches the user error of using ReturnRef(x) when Return(x)
+    // should be used, and generates some helpful error message.
+    GTEST_COMPILE_ASSERT_(internal::is_reference<Result>::value,
+                          use_Return_instead_of_ReturnRef_to_return_a_value);
+    return Action<F>(new Impl<F>(ref_));
+  }
+
+ private:
+  // Implements the ReturnRef(x) action for a particular function type F.
+  template <typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(T& ref) : ref_(ref) {}  // NOLINT
+
+    virtual Result Perform(const ArgumentTuple&) {
+      return ref_;
+    }
+
+   private:
+    T& ref_;
+
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+
+  T& ref_;
+
+  GTEST_DISALLOW_ASSIGN_(ReturnRefAction);
+};
+
+// Implements the polymorphic ReturnRefOfCopy(x) action, which can be
+// used in any function that returns a reference to the type of x,
+// regardless of the argument types.
+template <typename T>
+class ReturnRefOfCopyAction {
+ public:
+  // Constructs a ReturnRefOfCopyAction object from the reference to
+  // be returned.
+  explicit ReturnRefOfCopyAction(const T& value) : value_(value) {}  // NOLINT
+
+  // This template type conversion operator allows ReturnRefOfCopy(x) to be
+  // used in ANY function that returns a reference to x's type.
+  template <typename F>
+  operator Action<F>() const {
+    typedef typename Function<F>::Result Result;
+    // Asserts that the function return type is a reference.  This
+    // catches the user error of using ReturnRefOfCopy(x) when Return(x)
+    // should be used, and generates some helpful error message.
+    GTEST_COMPILE_ASSERT_(
+        internal::is_reference<Result>::value,
+        use_Return_instead_of_ReturnRefOfCopy_to_return_a_value);
+    return Action<F>(new Impl<F>(value_));
+  }
+
+ private:
+  // Implements the ReturnRefOfCopy(x) action for a particular function type F.
+  template <typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(const T& value) : value_(value) {}  // NOLINT
+
+    virtual Result Perform(const ArgumentTuple&) {
+      return value_;
+    }
+
+   private:
+    T value_;
+
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+
+  const T value_;
+
+  GTEST_DISALLOW_ASSIGN_(ReturnRefOfCopyAction);
+};
+
+// Implements the polymorphic DoDefault() action.
+class DoDefaultAction {
+ public:
+  // This template type conversion operator allows DoDefault() to be
+  // used in any function.
+  template <typename F>
+  operator Action<F>() const { return Action<F>(NULL); }
+};
+
+// Implements the Assign action to set a given pointer referent to a
+// particular value.
+template <typename T1, typename T2>
+class AssignAction {
+ public:
+  AssignAction(T1* ptr, T2 value) : ptr_(ptr), value_(value) {}
+
+  template <typename Result, typename ArgumentTuple>
+  void Perform(const ArgumentTuple& /* args */) const {
+    *ptr_ = value_;
+  }
+
+ private:
+  T1* const ptr_;
+  const T2 value_;
+
+  GTEST_DISALLOW_ASSIGN_(AssignAction);
+};
+
+#if !GTEST_OS_WINDOWS_MOBILE
+
+// Implements the SetErrnoAndReturn action to simulate return from
+// various system calls and libc functions.
+template <typename T>
+class SetErrnoAndReturnAction {
+ public:
+  SetErrnoAndReturnAction(int errno_value, T result)
+      : errno_(errno_value),
+        result_(result) {}
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple& /* args */) const {
+    errno = errno_;
+    return result_;
+  }
+
+ private:
+  const int errno_;
+  const T result_;
+
+  GTEST_DISALLOW_ASSIGN_(SetErrnoAndReturnAction);
+};
+
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
+// Implements the SetArgumentPointee<N>(x) action for any function
+// whose N-th argument (0-based) is a pointer to x's type.  The
+// template parameter kIsProto is true iff type A is ProtocolMessage,
+// proto2::Message, or a sub-class of those.
+template <size_t N, typename A, bool kIsProto>
+class SetArgumentPointeeAction {
+ public:
+  // Constructs an action that sets the variable pointed to by the
+  // N-th function argument to 'value'.
+  explicit SetArgumentPointeeAction(const A& value) : value_(value) {}
+
+  template <typename Result, typename ArgumentTuple>
+  void Perform(const ArgumentTuple& args) const {
+    CompileAssertTypesEqual<void, Result>();
+    *::testing::get<N>(args) = value_;
+  }
+
+ private:
+  const A value_;
+
+  GTEST_DISALLOW_ASSIGN_(SetArgumentPointeeAction);
+};
+
+template <size_t N, typename Proto>
+class SetArgumentPointeeAction<N, Proto, true> {
+ public:
+  // Constructs an action that sets the variable pointed to by the
+  // N-th function argument to 'proto'.  Both ProtocolMessage and
+  // proto2::Message have the CopyFrom() method, so the same
+  // implementation works for both.
+  explicit SetArgumentPointeeAction(const Proto& proto) : proto_(new Proto) {
+    proto_->CopyFrom(proto);
+  }
+
+  template <typename Result, typename ArgumentTuple>
+  void Perform(const ArgumentTuple& args) const {
+    CompileAssertTypesEqual<void, Result>();
+    ::testing::get<N>(args)->CopyFrom(*proto_);
+  }
+
+ private:
+  const internal::linked_ptr<Proto> proto_;
+
+  GTEST_DISALLOW_ASSIGN_(SetArgumentPointeeAction);
+};
+
+// Implements the InvokeWithoutArgs(f) action.  The template argument
+// FunctionImpl is the implementation type of f, which can be either a
+// function pointer or a functor.  InvokeWithoutArgs(f) can be used as an
+// Action<F> as long as f's type is compatible with F (i.e. f can be
+// assigned to a tr1::function<F>).
+template <typename FunctionImpl>
+class InvokeWithoutArgsAction {
+ public:
+  // The c'tor makes a copy of function_impl (either a function
+  // pointer or a functor).
+  explicit InvokeWithoutArgsAction(FunctionImpl function_impl)
+      : function_impl_(function_impl) {}
+
+  // Allows InvokeWithoutArgs(f) to be used as any action whose type is
+  // compatible with f.
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple&) { return function_impl_(); }
+
+ private:
+  FunctionImpl function_impl_;
+
+  GTEST_DISALLOW_ASSIGN_(InvokeWithoutArgsAction);
+};
+
+// Implements the InvokeWithoutArgs(object_ptr, &Class::Method) action.
+template <class Class, typename MethodPtr>
+class InvokeMethodWithoutArgsAction {
+ public:
+  InvokeMethodWithoutArgsAction(Class* obj_ptr, MethodPtr method_ptr)
+      : obj_ptr_(obj_ptr), method_ptr_(method_ptr) {}
+
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple&) const {
+    return (obj_ptr_->*method_ptr_)();
+  }
+
+ private:
+  Class* const obj_ptr_;
+  const MethodPtr method_ptr_;
+
+  GTEST_DISALLOW_ASSIGN_(InvokeMethodWithoutArgsAction);
+};
+
+// Implements the IgnoreResult(action) action.
+template <typename A>
+class IgnoreResultAction {
+ public:
+  explicit IgnoreResultAction(const A& action) : action_(action) {}
+
+  template <typename F>
+  operator Action<F>() const {
+    // Assert statement belongs here because this is the best place to verify
+    // conditions on F. It produces the clearest error messages
+    // in most compilers.
+    // Impl really belongs in this scope as a local class but can't
+    // because MSVC produces duplicate symbols in different translation units
+    // in this case. Until MS fixes that bug we put Impl into the class scope
+    // and put the typedef both here (for use in assert statement) and
+    // in the Impl class. But both definitions must be the same.
+    typedef typename internal::Function<F>::Result Result;
+
+    // Asserts at compile time that F returns void.
+    CompileAssertTypesEqual<void, Result>();
+
+    return Action<F>(new Impl<F>(action_));
+  }
+
+ private:
+  template <typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename internal::Function<F>::Result Result;
+    typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(const A& action) : action_(action) {}
+
+    virtual void Perform(const ArgumentTuple& args) {
+      // Performs the action and ignores its result.
+      action_.Perform(args);
+    }
+
+   private:
+    // Type OriginalFunction is the same as F except that its return
+    // type is IgnoredValue.
+    typedef typename internal::Function<F>::MakeResultIgnoredValue
+        OriginalFunction;
+
+    const Action<OriginalFunction> action_;
+
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+
+  const A action_;
+
+  GTEST_DISALLOW_ASSIGN_(IgnoreResultAction);
+};
+
+// A ReferenceWrapper<T> object represents a reference to type T,
+// which can be either const or not.  It can be explicitly converted
+// from, and implicitly converted to, a T&.  Unlike a reference,
+// ReferenceWrapper<T> can be copied and can survive template type
+// inference.  This is used to support by-reference arguments in the
+// InvokeArgument<N>(...) action.  The idea was from "reference
+// wrappers" in tr1, which we don't have in our source tree yet.
+template <typename T>
+class ReferenceWrapper {
+ public:
+  // Constructs a ReferenceWrapper<T> object from a T&.
+  explicit ReferenceWrapper(T& l_value) : pointer_(&l_value) {}  // NOLINT
+
+  // Allows a ReferenceWrapper<T> object to be implicitly converted to
+  // a T&.
+  operator T&() const { return *pointer_; }
+ private:
+  T* pointer_;
+};
+
+// Allows the expression ByRef(x) to be printed as a reference to x.
+template <typename T>
+void PrintTo(const ReferenceWrapper<T>& ref, ::std::ostream* os) {
+  T& value = ref;
+  UniversalPrinter<T&>::Print(value, os);
+}
+
+// Does two actions sequentially.  Used for implementing the DoAll(a1,
+// a2, ...) action.
+template <typename Action1, typename Action2>
+class DoBothAction {
+ public:
+  DoBothAction(Action1 action1, Action2 action2)
+      : action1_(action1), action2_(action2) {}
+
+  // This template type conversion operator allows DoAll(a1, ..., a_n)
+  // to be used in ANY function of compatible type.
+  template <typename F>
+  operator Action<F>() const {
+    return Action<F>(new Impl<F>(action1_, action2_));
+  }
+
+ private:
+  // Implements the DoAll(...) action for a particular function type F.
+  template <typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+    typedef typename Function<F>::MakeResultVoid VoidResult;
+
+    Impl(const Action<VoidResult>& action1, const Action<F>& action2)
+        : action1_(action1), action2_(action2) {}
+
+    virtual Result Perform(const ArgumentTuple& args) {
+      action1_.Perform(args);
+      return action2_.Perform(args);
+    }
+
+   private:
+    const Action<VoidResult> action1_;
+    const Action<F> action2_;
+
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+
+  Action1 action1_;
+  Action2 action2_;
+
+  GTEST_DISALLOW_ASSIGN_(DoBothAction);
+};
+
+}  // namespace internal
+
+// An Unused object can be implicitly constructed from ANY value.
+// This is handy when defining actions that ignore some or all of the
+// mock function arguments.  For example, given
+//
+//   MOCK_METHOD3(Foo, double(const string& label, double x, double y));
+//   MOCK_METHOD3(Bar, double(int index, double x, double y));
+//
+// instead of
+//
+//   double DistanceToOriginWithLabel(const string& label, double x, double y) {
+//     return sqrt(x*x + y*y);
+//   }
+//   double DistanceToOriginWithIndex(int index, double x, double y) {
+//     return sqrt(x*x + y*y);
+//   }
+//   ...
+//   EXEPCT_CALL(mock, Foo("abc", _, _))
+//       .WillOnce(Invoke(DistanceToOriginWithLabel));
+//   EXEPCT_CALL(mock, Bar(5, _, _))
+//       .WillOnce(Invoke(DistanceToOriginWithIndex));
+//
+// you could write
+//
+//   // We can declare any uninteresting argument as Unused.
+//   double DistanceToOrigin(Unused, double x, double y) {
+//     return sqrt(x*x + y*y);
+//   }
+//   ...
+//   EXEPCT_CALL(mock, Foo("abc", _, _)).WillOnce(Invoke(DistanceToOrigin));
+//   EXEPCT_CALL(mock, Bar(5, _, _)).WillOnce(Invoke(DistanceToOrigin));
+typedef internal::IgnoredValue Unused;
+
+// This constructor allows us to turn an Action<From> object into an
+// Action<To>, as long as To's arguments can be implicitly converted
+// to From's and From's return type cann be implicitly converted to
+// To's.
+template <typename To>
+template <typename From>
+Action<To>::Action(const Action<From>& from)
+    : impl_(new internal::ActionAdaptor<To, From>(from)) {}
+
+// Creates an action that returns 'value'.  'value' is passed by value
+// instead of const reference - otherwise Return("string literal")
+// will trigger a compiler error about using array as initializer.
+template <typename R>
+internal::ReturnAction<R> Return(R value) {
+  return internal::ReturnAction<R>(internal::move(value));
+}
+
+// Creates an action that returns NULL.
+inline PolymorphicAction<internal::ReturnNullAction> ReturnNull() {
+  return MakePolymorphicAction(internal::ReturnNullAction());
+}
+
+// Creates an action that returns from a void function.
+inline PolymorphicAction<internal::ReturnVoidAction> Return() {
+  return MakePolymorphicAction(internal::ReturnVoidAction());
+}
+
+// Creates an action that returns the reference to a variable.
+template <typename R>
+inline internal::ReturnRefAction<R> ReturnRef(R& x) {  // NOLINT
+  return internal::ReturnRefAction<R>(x);
+}
+
+// Creates an action that returns the reference to a copy of the
+// argument.  The copy is created when the action is constructed and
+// lives as long as the action.
+template <typename R>
+inline internal::ReturnRefOfCopyAction<R> ReturnRefOfCopy(const R& x) {
+  return internal::ReturnRefOfCopyAction<R>(x);
+}
+
+// Modifies the parent action (a Return() action) to perform a move of the
+// argument instead of a copy.
+// Return(ByMove()) actions can only be executed once and will assert this
+// invariant.
+template <typename R>
+internal::ByMoveWrapper<R> ByMove(R x) {
+  return internal::ByMoveWrapper<R>(internal::move(x));
+}
+
+// Creates an action that does the default action for the give mock function.
+inline internal::DoDefaultAction DoDefault() {
+  return internal::DoDefaultAction();
+}
+
+// Creates an action that sets the variable pointed by the N-th
+// (0-based) function argument to 'value'.
+template <size_t N, typename T>
+PolymorphicAction<
+  internal::SetArgumentPointeeAction<
+    N, T, internal::IsAProtocolMessage<T>::value> >
+SetArgPointee(const T& x) {
+  return MakePolymorphicAction(internal::SetArgumentPointeeAction<
+      N, T, internal::IsAProtocolMessage<T>::value>(x));
+}
+
+#if !((GTEST_GCC_VER_ && GTEST_GCC_VER_ < 40000) || GTEST_OS_SYMBIAN)
+// This overload allows SetArgPointee() to accept a string literal.
+// GCC prior to the version 4.0 and Symbian C++ compiler cannot distinguish
+// this overload from the templated version and emit a compile error.
+template <size_t N>
+PolymorphicAction<
+  internal::SetArgumentPointeeAction<N, const char*, false> >
+SetArgPointee(const char* p) {
+  return MakePolymorphicAction(internal::SetArgumentPointeeAction<
+      N, const char*, false>(p));
+}
+
+template <size_t N>
+PolymorphicAction<
+  internal::SetArgumentPointeeAction<N, const wchar_t*, false> >
+SetArgPointee(const wchar_t* p) {
+  return MakePolymorphicAction(internal::SetArgumentPointeeAction<
+      N, const wchar_t*, false>(p));
+}
+#endif
+
+// The following version is DEPRECATED.
+template <size_t N, typename T>
+PolymorphicAction<
+  internal::SetArgumentPointeeAction<
+    N, T, internal::IsAProtocolMessage<T>::value> >
+SetArgumentPointee(const T& x) {
+  return MakePolymorphicAction(internal::SetArgumentPointeeAction<
+      N, T, internal::IsAProtocolMessage<T>::value>(x));
+}
+
+// Creates an action that sets a pointer referent to a given value.
+template <typename T1, typename T2>
+PolymorphicAction<internal::AssignAction<T1, T2> > Assign(T1* ptr, T2 val) {
+  return MakePolymorphicAction(internal::AssignAction<T1, T2>(ptr, val));
+}
+
+#if !GTEST_OS_WINDOWS_MOBILE
+
+// Creates an action that sets errno and returns the appropriate error.
+template <typename T>
+PolymorphicAction<internal::SetErrnoAndReturnAction<T> >
+SetErrnoAndReturn(int errval, T result) {
+  return MakePolymorphicAction(
+      internal::SetErrnoAndReturnAction<T>(errval, result));
+}
+
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
+// Various overloads for InvokeWithoutArgs().
+
+// Creates an action that invokes 'function_impl' with no argument.
+template <typename FunctionImpl>
+PolymorphicAction<internal::InvokeWithoutArgsAction<FunctionImpl> >
+InvokeWithoutArgs(FunctionImpl function_impl) {
+  return MakePolymorphicAction(
+      internal::InvokeWithoutArgsAction<FunctionImpl>(function_impl));
+}
+
+// Creates an action that invokes the given method on the given object
+// with no argument.
+template <class Class, typename MethodPtr>
+PolymorphicAction<internal::InvokeMethodWithoutArgsAction<Class, MethodPtr> >
+InvokeWithoutArgs(Class* obj_ptr, MethodPtr method_ptr) {
+  return MakePolymorphicAction(
+      internal::InvokeMethodWithoutArgsAction<Class, MethodPtr>(
+          obj_ptr, method_ptr));
+}
+
+// Creates an action that performs an_action and throws away its
+// result.  In other words, it changes the return type of an_action to
+// void.  an_action MUST NOT return void, or the code won't compile.
+template <typename A>
+inline internal::IgnoreResultAction<A> IgnoreResult(const A& an_action) {
+  return internal::IgnoreResultAction<A>(an_action);
+}
+
+// Creates a reference wrapper for the given L-value.  If necessary,
+// you can explicitly specify the type of the reference.  For example,
+// suppose 'derived' is an object of type Derived, ByRef(derived)
+// would wrap a Derived&.  If you want to wrap a const Base& instead,
+// where Base is a base class of Derived, just write:
+//
+//   ByRef<const Base>(derived)
+template <typename T>
+inline internal::ReferenceWrapper<T> ByRef(T& l_value) {  // NOLINT
+  return internal::ReferenceWrapper<T>(l_value);
+}
+
+}  // namespace testing
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-cardinalities.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-cardinalities.h
new file mode 100644
index 0000000000..fc315f92ab
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-cardinalities.h
@@ -0,0 +1,147 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some commonly used cardinalities.  More
+// cardinalities can be defined by the user implementing the
+// CardinalityInterface interface if necessary.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
+
+#include <limits.h>
+#include <ostream>  // NOLINT
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+
+// To implement a cardinality Foo, define:
+//   1. a class FooCardinality that implements the
+//      CardinalityInterface interface, and
+//   2. a factory function that creates a Cardinality object from a
+//      const FooCardinality*.
+//
+// The two-level delegation design follows that of Matcher, providing
+// consistency for extension developers.  It also eases ownership
+// management as Cardinality objects can now be copied like plain values.
+
+// The implementation of a cardinality.
+class CardinalityInterface {
+ public:
+  virtual ~CardinalityInterface() {}
+
+  // Conservative estimate on the lower/upper bound of the number of
+  // calls allowed.
+  virtual int ConservativeLowerBound() const { return 0; }
+  virtual int ConservativeUpperBound() const { return INT_MAX; }
+
+  // Returns true iff call_count calls will satisfy this cardinality.
+  virtual bool IsSatisfiedByCallCount(int call_count) const = 0;
+
+  // Returns true iff call_count calls will saturate this cardinality.
+  virtual bool IsSaturatedByCallCount(int call_count) const = 0;
+
+  // Describes self to an ostream.
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+};
+
+// A Cardinality is a copyable and IMMUTABLE (except by assignment)
+// object that specifies how many times a mock function is expected to
+// be called.  The implementation of Cardinality is just a linked_ptr
+// to const CardinalityInterface, so copying is fairly cheap.
+// Don't inherit from Cardinality!
+class GTEST_API_ Cardinality {
+ public:
+  // Constructs a null cardinality.  Needed for storing Cardinality
+  // objects in STL containers.
+  Cardinality() {}
+
+  // Constructs a Cardinality from its implementation.
+  explicit Cardinality(const CardinalityInterface* impl) : impl_(impl) {}
+
+  // Conservative estimate on the lower/upper bound of the number of
+  // calls allowed.
+  int ConservativeLowerBound() const { return impl_->ConservativeLowerBound(); }
+  int ConservativeUpperBound() const { return impl_->ConservativeUpperBound(); }
+
+  // Returns true iff call_count calls will satisfy this cardinality.
+  bool IsSatisfiedByCallCount(int call_count) const {
+    return impl_->IsSatisfiedByCallCount(call_count);
+  }
+
+  // Returns true iff call_count calls will saturate this cardinality.
+  bool IsSaturatedByCallCount(int call_count) const {
+    return impl_->IsSaturatedByCallCount(call_count);
+  }
+
+  // Returns true iff call_count calls will over-saturate this
+  // cardinality, i.e. exceed the maximum number of allowed calls.
+  bool IsOverSaturatedByCallCount(int call_count) const {
+    return impl_->IsSaturatedByCallCount(call_count) &&
+        !impl_->IsSatisfiedByCallCount(call_count);
+  }
+
+  // Describes self to an ostream
+  void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); }
+
+  // Describes the given actual call count to an ostream.
+  static void DescribeActualCallCountTo(int actual_call_count,
+                                        ::std::ostream* os);
+
+ private:
+  internal::linked_ptr<const CardinalityInterface> impl_;
+};
+
+// Creates a cardinality that allows at least n calls.
+GTEST_API_ Cardinality AtLeast(int n);
+
+// Creates a cardinality that allows at most n calls.
+GTEST_API_ Cardinality AtMost(int n);
+
+// Creates a cardinality that allows any number of calls.
+GTEST_API_ Cardinality AnyNumber();
+
+// Creates a cardinality that allows between min and max calls.
+GTEST_API_ Cardinality Between(int min, int max);
+
+// Creates a cardinality that allows exactly n calls.
+GTEST_API_ Cardinality Exactly(int n);
+
+// Creates a cardinality from its implementation.
+inline Cardinality MakeCardinality(const CardinalityInterface* c) {
+  return Cardinality(c);
+}
+
+}  // namespace testing
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-actions.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-actions.h
new file mode 100644
index 0000000000..b5a889c0c3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-actions.h
@@ -0,0 +1,2377 @@
+// This file was GENERATED by a script.  DO NOT EDIT BY HAND!!!
+
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some commonly used variadic actions.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
+
+#include "gmock/gmock-actions.h"
+#include "gmock/internal/gmock-port.h"
+
+namespace testing {
+namespace internal {
+
+// InvokeHelper<F> knows how to unpack an N-tuple and invoke an N-ary
+// function or method with the unpacked values, where F is a function
+// type that takes N arguments.
+template <typename Result, typename ArgumentTuple>
+class InvokeHelper;
+
+template <typename R>
+class InvokeHelper<R, ::testing::tuple<> > {
+ public:
+  template <typename Function>
+  static R Invoke(Function function, const ::testing::tuple<>&) {
+           return function();
+  }
+
+  template <class Class, typename MethodPtr>
+  static R InvokeMethod(Class* obj_ptr,
+                        MethodPtr method_ptr,
+                        const ::testing::tuple<>&) {
+           return (obj_ptr->*method_ptr)();
+  }
+};
+
+template <typename R, typename A1>
+class InvokeHelper<R, ::testing::tuple<A1> > {
+ public:
+  template <typename Function>
+  static R Invoke(Function function, const ::testing::tuple<A1>& args) {
+           return function(get<0>(args));
+  }
+
+  template <class Class, typename MethodPtr>
+  static R InvokeMethod(Class* obj_ptr,
+                        MethodPtr method_ptr,
+                        const ::testing::tuple<A1>& args) {
+           return (obj_ptr->*method_ptr)(get<0>(args));
+  }
+};
+
+template <typename R, typename A1, typename A2>
+class InvokeHelper<R, ::testing::tuple<A1, A2> > {
+ public:
+  template <typename Function>
+  static R Invoke(Function function, const ::testing::tuple<A1, A2>& args) {
+           return function(get<0>(args), get<1>(args));
+  }
+
+  template <class Class, typename MethodPtr>
+  static R InvokeMethod(Class* obj_ptr,
+                        MethodPtr method_ptr,
+                        const ::testing::tuple<A1, A2>& args) {
+           return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3>
+class InvokeHelper<R, ::testing::tuple<A1, A2, A3> > {
+ public:
+  template <typename Function>
+  static R Invoke(Function function, const ::testing::tuple<A1, A2, A3>& args) {
+           return function(get<0>(args), get<1>(args), get<2>(args));
+  }
+
+  template <class Class, typename MethodPtr>
+  static R InvokeMethod(Class* obj_ptr,
+                        MethodPtr method_ptr,
+                        const ::testing::tuple<A1, A2, A3>& args) {
+           return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args),
+               get<2>(args));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4>
+class InvokeHelper<R, ::testing::tuple<A1, A2, A3, A4> > {
+ public:
+  template <typename Function>
+  static R Invoke(Function function, const ::testing::tuple<A1, A2, A3,
+      A4>& args) {
+           return function(get<0>(args), get<1>(args), get<2>(args),
+               get<3>(args));
+  }
+
+  template <class Class, typename MethodPtr>
+  static R InvokeMethod(Class* obj_ptr,
+                        MethodPtr method_ptr,
+                        const ::testing::tuple<A1, A2, A3, A4>& args) {
+           return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args),
+               get<2>(args), get<3>(args));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5>
+class InvokeHelper<R, ::testing::tuple<A1, A2, A3, A4, A5> > {
+ public:
+  template <typename Function>
+  static R Invoke(Function function, const ::testing::tuple<A1, A2, A3, A4,
+      A5>& args) {
+           return function(get<0>(args), get<1>(args), get<2>(args),
+               get<3>(args), get<4>(args));
+  }
+
+  template <class Class, typename MethodPtr>
+  static R InvokeMethod(Class* obj_ptr,
+                        MethodPtr method_ptr,
+                        const ::testing::tuple<A1, A2, A3, A4, A5>& args) {
+           return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args),
+               get<2>(args), get<3>(args), get<4>(args));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6>
+class InvokeHelper<R, ::testing::tuple<A1, A2, A3, A4, A5, A6> > {
+ public:
+  template <typename Function>
+  static R Invoke(Function function, const ::testing::tuple<A1, A2, A3, A4, A5,
+      A6>& args) {
+           return function(get<0>(args), get<1>(args), get<2>(args),
+               get<3>(args), get<4>(args), get<5>(args));
+  }
+
+  template <class Class, typename MethodPtr>
+  static R InvokeMethod(Class* obj_ptr,
+                        MethodPtr method_ptr,
+                        const ::testing::tuple<A1, A2, A3, A4, A5, A6>& args) {
+           return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args),
+               get<2>(args), get<3>(args), get<4>(args), get<5>(args));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6, typename A7>
+class InvokeHelper<R, ::testing::tuple<A1, A2, A3, A4, A5, A6, A7> > {
+ public:
+  template <typename Function>
+  static R Invoke(Function function, const ::testing::tuple<A1, A2, A3, A4, A5,
+      A6, A7>& args) {
+           return function(get<0>(args), get<1>(args), get<2>(args),
+               get<3>(args), get<4>(args), get<5>(args), get<6>(args));
+  }
+
+  template <class Class, typename MethodPtr>
+  static R InvokeMethod(Class* obj_ptr,
+                        MethodPtr method_ptr,
+                        const ::testing::tuple<A1, A2, A3, A4, A5, A6,
+                            A7>& args) {
+           return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args),
+               get<2>(args), get<3>(args), get<4>(args), get<5>(args),
+               get<6>(args));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6, typename A7, typename A8>
+class InvokeHelper<R, ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8> > {
+ public:
+  template <typename Function>
+  static R Invoke(Function function, const ::testing::tuple<A1, A2, A3, A4, A5,
+      A6, A7, A8>& args) {
+           return function(get<0>(args), get<1>(args), get<2>(args),
+               get<3>(args), get<4>(args), get<5>(args), get<6>(args),
+               get<7>(args));
+  }
+
+  template <class Class, typename MethodPtr>
+  static R InvokeMethod(Class* obj_ptr,
+                        MethodPtr method_ptr,
+                        const ::testing::tuple<A1, A2, A3, A4, A5, A6, A7,
+                            A8>& args) {
+           return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args),
+               get<2>(args), get<3>(args), get<4>(args), get<5>(args),
+               get<6>(args), get<7>(args));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6, typename A7, typename A8, typename A9>
+class InvokeHelper<R, ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8, A9> > {
+ public:
+  template <typename Function>
+  static R Invoke(Function function, const ::testing::tuple<A1, A2, A3, A4, A5,
+      A6, A7, A8, A9>& args) {
+           return function(get<0>(args), get<1>(args), get<2>(args),
+               get<3>(args), get<4>(args), get<5>(args), get<6>(args),
+               get<7>(args), get<8>(args));
+  }
+
+  template <class Class, typename MethodPtr>
+  static R InvokeMethod(Class* obj_ptr,
+                        MethodPtr method_ptr,
+                        const ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8,
+                            A9>& args) {
+           return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args),
+               get<2>(args), get<3>(args), get<4>(args), get<5>(args),
+               get<6>(args), get<7>(args), get<8>(args));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6, typename A7, typename A8, typename A9,
+    typename A10>
+class InvokeHelper<R, ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8, A9,
+    A10> > {
+ public:
+  template <typename Function>
+  static R Invoke(Function function, const ::testing::tuple<A1, A2, A3, A4, A5,
+      A6, A7, A8, A9, A10>& args) {
+           return function(get<0>(args), get<1>(args), get<2>(args),
+               get<3>(args), get<4>(args), get<5>(args), get<6>(args),
+               get<7>(args), get<8>(args), get<9>(args));
+  }
+
+  template <class Class, typename MethodPtr>
+  static R InvokeMethod(Class* obj_ptr,
+                        MethodPtr method_ptr,
+                        const ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8,
+                            A9, A10>& args) {
+           return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args),
+               get<2>(args), get<3>(args), get<4>(args), get<5>(args),
+               get<6>(args), get<7>(args), get<8>(args), get<9>(args));
+  }
+};
+
+// An INTERNAL macro for extracting the type of a tuple field.  It's
+// subject to change without notice - DO NOT USE IN USER CODE!
+#define GMOCK_FIELD_(Tuple, N) \
+    typename ::testing::tuple_element<N, Tuple>::type
+
+// SelectArgs<Result, ArgumentTuple, k1, k2, ..., k_n>::type is the
+// type of an n-ary function whose i-th (1-based) argument type is the
+// k{i}-th (0-based) field of ArgumentTuple, which must be a tuple
+// type, and whose return type is Result.  For example,
+//   SelectArgs<int, ::testing::tuple<bool, char, double, long>, 0, 3>::type
+// is int(bool, long).
+//
+// SelectArgs<Result, ArgumentTuple, k1, k2, ..., k_n>::Select(args)
+// returns the selected fields (k1, k2, ..., k_n) of args as a tuple.
+// For example,
+//   SelectArgs<int, tuple<bool, char, double>, 2, 0>::Select(
+//       ::testing::make_tuple(true, 'a', 2.5))
+// returns tuple (2.5, true).
+//
+// The numbers in list k1, k2, ..., k_n must be >= 0, where n can be
+// in the range [0, 10].  Duplicates are allowed and they don't have
+// to be in an ascending or descending order.
+
+template <typename Result, typename ArgumentTuple, int k1, int k2, int k3,
+    int k4, int k5, int k6, int k7, int k8, int k9, int k10>
+class SelectArgs {
+ public:
+  typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1),
+      GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3),
+      GMOCK_FIELD_(ArgumentTuple, k4), GMOCK_FIELD_(ArgumentTuple, k5),
+      GMOCK_FIELD_(ArgumentTuple, k6), GMOCK_FIELD_(ArgumentTuple, k7),
+      GMOCK_FIELD_(ArgumentTuple, k8), GMOCK_FIELD_(ArgumentTuple, k9),
+      GMOCK_FIELD_(ArgumentTuple, k10));
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& args) {
+    return SelectedArgs(get<k1>(args), get<k2>(args), get<k3>(args),
+        get<k4>(args), get<k5>(args), get<k6>(args), get<k7>(args),
+        get<k8>(args), get<k9>(args), get<k10>(args));
+  }
+};
+
+template <typename Result, typename ArgumentTuple>
+class SelectArgs<Result, ArgumentTuple,
+                 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1> {
+ public:
+  typedef Result type();
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& /* args */) {
+    return SelectedArgs();
+  }
+};
+
+template <typename Result, typename ArgumentTuple, int k1>
+class SelectArgs<Result, ArgumentTuple,
+                 k1, -1, -1, -1, -1, -1, -1, -1, -1, -1> {
+ public:
+  typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1));
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& args) {
+    return SelectedArgs(get<k1>(args));
+  }
+};
+
+template <typename Result, typename ArgumentTuple, int k1, int k2>
+class SelectArgs<Result, ArgumentTuple,
+                 k1, k2, -1, -1, -1, -1, -1, -1, -1, -1> {
+ public:
+  typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1),
+      GMOCK_FIELD_(ArgumentTuple, k2));
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& args) {
+    return SelectedArgs(get<k1>(args), get<k2>(args));
+  }
+};
+
+template <typename Result, typename ArgumentTuple, int k1, int k2, int k3>
+class SelectArgs<Result, ArgumentTuple,
+                 k1, k2, k3, -1, -1, -1, -1, -1, -1, -1> {
+ public:
+  typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1),
+      GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3));
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& args) {
+    return SelectedArgs(get<k1>(args), get<k2>(args), get<k3>(args));
+  }
+};
+
+template <typename Result, typename ArgumentTuple, int k1, int k2, int k3,
+    int k4>
+class SelectArgs<Result, ArgumentTuple,
+                 k1, k2, k3, k4, -1, -1, -1, -1, -1, -1> {
+ public:
+  typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1),
+      GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3),
+      GMOCK_FIELD_(ArgumentTuple, k4));
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& args) {
+    return SelectedArgs(get<k1>(args), get<k2>(args), get<k3>(args),
+        get<k4>(args));
+  }
+};
+
+template <typename Result, typename ArgumentTuple, int k1, int k2, int k3,
+    int k4, int k5>
+class SelectArgs<Result, ArgumentTuple,
+                 k1, k2, k3, k4, k5, -1, -1, -1, -1, -1> {
+ public:
+  typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1),
+      GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3),
+      GMOCK_FIELD_(ArgumentTuple, k4), GMOCK_FIELD_(ArgumentTuple, k5));
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& args) {
+    return SelectedArgs(get<k1>(args), get<k2>(args), get<k3>(args),
+        get<k4>(args), get<k5>(args));
+  }
+};
+
+template <typename Result, typename ArgumentTuple, int k1, int k2, int k3,
+    int k4, int k5, int k6>
+class SelectArgs<Result, ArgumentTuple,
+                 k1, k2, k3, k4, k5, k6, -1, -1, -1, -1> {
+ public:
+  typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1),
+      GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3),
+      GMOCK_FIELD_(ArgumentTuple, k4), GMOCK_FIELD_(ArgumentTuple, k5),
+      GMOCK_FIELD_(ArgumentTuple, k6));
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& args) {
+    return SelectedArgs(get<k1>(args), get<k2>(args), get<k3>(args),
+        get<k4>(args), get<k5>(args), get<k6>(args));
+  }
+};
+
+template <typename Result, typename ArgumentTuple, int k1, int k2, int k3,
+    int k4, int k5, int k6, int k7>
+class SelectArgs<Result, ArgumentTuple,
+                 k1, k2, k3, k4, k5, k6, k7, -1, -1, -1> {
+ public:
+  typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1),
+      GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3),
+      GMOCK_FIELD_(ArgumentTuple, k4), GMOCK_FIELD_(ArgumentTuple, k5),
+      GMOCK_FIELD_(ArgumentTuple, k6), GMOCK_FIELD_(ArgumentTuple, k7));
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& args) {
+    return SelectedArgs(get<k1>(args), get<k2>(args), get<k3>(args),
+        get<k4>(args), get<k5>(args), get<k6>(args), get<k7>(args));
+  }
+};
+
+template <typename Result, typename ArgumentTuple, int k1, int k2, int k3,
+    int k4, int k5, int k6, int k7, int k8>
+class SelectArgs<Result, ArgumentTuple,
+                 k1, k2, k3, k4, k5, k6, k7, k8, -1, -1> {
+ public:
+  typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1),
+      GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3),
+      GMOCK_FIELD_(ArgumentTuple, k4), GMOCK_FIELD_(ArgumentTuple, k5),
+      GMOCK_FIELD_(ArgumentTuple, k6), GMOCK_FIELD_(ArgumentTuple, k7),
+      GMOCK_FIELD_(ArgumentTuple, k8));
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& args) {
+    return SelectedArgs(get<k1>(args), get<k2>(args), get<k3>(args),
+        get<k4>(args), get<k5>(args), get<k6>(args), get<k7>(args),
+        get<k8>(args));
+  }
+};
+
+template <typename Result, typename ArgumentTuple, int k1, int k2, int k3,
+    int k4, int k5, int k6, int k7, int k8, int k9>
+class SelectArgs<Result, ArgumentTuple,
+                 k1, k2, k3, k4, k5, k6, k7, k8, k9, -1> {
+ public:
+  typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1),
+      GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3),
+      GMOCK_FIELD_(ArgumentTuple, k4), GMOCK_FIELD_(ArgumentTuple, k5),
+      GMOCK_FIELD_(ArgumentTuple, k6), GMOCK_FIELD_(ArgumentTuple, k7),
+      GMOCK_FIELD_(ArgumentTuple, k8), GMOCK_FIELD_(ArgumentTuple, k9));
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& args) {
+    return SelectedArgs(get<k1>(args), get<k2>(args), get<k3>(args),
+        get<k4>(args), get<k5>(args), get<k6>(args), get<k7>(args),
+        get<k8>(args), get<k9>(args));
+  }
+};
+
+#undef GMOCK_FIELD_
+
+// Implements the WithArgs action.
+template <typename InnerAction, int k1 = -1, int k2 = -1, int k3 = -1,
+    int k4 = -1, int k5 = -1, int k6 = -1, int k7 = -1, int k8 = -1,
+    int k9 = -1, int k10 = -1>
+class WithArgsAction {
+ public:
+  explicit WithArgsAction(const InnerAction& action) : action_(action) {}
+
+  template <typename F>
+  operator Action<F>() const { return MakeAction(new Impl<F>(action_)); }
+
+ private:
+  template <typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(const InnerAction& action) : action_(action) {}
+
+    virtual Result Perform(const ArgumentTuple& args) {
+      return action_.Perform(SelectArgs<Result, ArgumentTuple, k1, k2, k3, k4,
+          k5, k6, k7, k8, k9, k10>::Select(args));
+    }
+
+   private:
+    typedef typename SelectArgs<Result, ArgumentTuple,
+        k1, k2, k3, k4, k5, k6, k7, k8, k9, k10>::type InnerFunctionType;
+
+    Action<InnerFunctionType> action_;
+  };
+
+  const InnerAction action_;
+
+  GTEST_DISALLOW_ASSIGN_(WithArgsAction);
+};
+
+// A macro from the ACTION* family (defined later in this file)
+// defines an action that can be used in a mock function.  Typically,
+// these actions only care about a subset of the arguments of the mock
+// function.  For example, if such an action only uses the second
+// argument, it can be used in any mock function that takes >= 2
+// arguments where the type of the second argument is compatible.
+//
+// Therefore, the action implementation must be prepared to take more
+// arguments than it needs.  The ExcessiveArg type is used to
+// represent those excessive arguments.  In order to keep the compiler
+// error messages tractable, we define it in the testing namespace
+// instead of testing::internal.  However, this is an INTERNAL TYPE
+// and subject to change without notice, so a user MUST NOT USE THIS
+// TYPE DIRECTLY.
+struct ExcessiveArg {};
+
+// A helper class needed for implementing the ACTION* macros.
+template <typename Result, class Impl>
+class ActionHelper {
+ public:
+  static Result Perform(Impl* impl, const ::testing::tuple<>& args) {
+    return impl->template gmock_PerformImpl<>(args, ExcessiveArg(),
+        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
+        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
+        ExcessiveArg());
+  }
+
+  template <typename A0>
+  static Result Perform(Impl* impl, const ::testing::tuple<A0>& args) {
+    return impl->template gmock_PerformImpl<A0>(args, get<0>(args),
+        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
+        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
+        ExcessiveArg());
+  }
+
+  template <typename A0, typename A1>
+  static Result Perform(Impl* impl, const ::testing::tuple<A0, A1>& args) {
+    return impl->template gmock_PerformImpl<A0, A1>(args, get<0>(args),
+        get<1>(args), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
+        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
+        ExcessiveArg());
+  }
+
+  template <typename A0, typename A1, typename A2>
+  static Result Perform(Impl* impl, const ::testing::tuple<A0, A1, A2>& args) {
+    return impl->template gmock_PerformImpl<A0, A1, A2>(args, get<0>(args),
+        get<1>(args), get<2>(args), ExcessiveArg(), ExcessiveArg(),
+        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
+        ExcessiveArg());
+  }
+
+  template <typename A0, typename A1, typename A2, typename A3>
+  static Result Perform(Impl* impl, const ::testing::tuple<A0, A1, A2,
+      A3>& args) {
+    return impl->template gmock_PerformImpl<A0, A1, A2, A3>(args, get<0>(args),
+        get<1>(args), get<2>(args), get<3>(args), ExcessiveArg(),
+        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
+        ExcessiveArg());
+  }
+
+  template <typename A0, typename A1, typename A2, typename A3, typename A4>
+  static Result Perform(Impl* impl, const ::testing::tuple<A0, A1, A2, A3,
+      A4>& args) {
+    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4>(args,
+        get<0>(args), get<1>(args), get<2>(args), get<3>(args), get<4>(args),
+        ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
+        ExcessiveArg());
+  }
+
+  template <typename A0, typename A1, typename A2, typename A3, typename A4,
+      typename A5>
+  static Result Perform(Impl* impl, const ::testing::tuple<A0, A1, A2, A3, A4,
+      A5>& args) {
+    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5>(args,
+        get<0>(args), get<1>(args), get<2>(args), get<3>(args), get<4>(args),
+        get<5>(args), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(),
+        ExcessiveArg());
+  }
+
+  template <typename A0, typename A1, typename A2, typename A3, typename A4,
+      typename A5, typename A6>
+  static Result Perform(Impl* impl, const ::testing::tuple<A0, A1, A2, A3, A4,
+      A5, A6>& args) {
+    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5, A6>(args,
+        get<0>(args), get<1>(args), get<2>(args), get<3>(args), get<4>(args),
+        get<5>(args), get<6>(args), ExcessiveArg(), ExcessiveArg(),
+        ExcessiveArg());
+  }
+
+  template <typename A0, typename A1, typename A2, typename A3, typename A4,
+      typename A5, typename A6, typename A7>
+  static Result Perform(Impl* impl, const ::testing::tuple<A0, A1, A2, A3, A4,
+      A5, A6, A7>& args) {
+    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5, A6,
+        A7>(args, get<0>(args), get<1>(args), get<2>(args), get<3>(args),
+        get<4>(args), get<5>(args), get<6>(args), get<7>(args), ExcessiveArg(),
+        ExcessiveArg());
+  }
+
+  template <typename A0, typename A1, typename A2, typename A3, typename A4,
+      typename A5, typename A6, typename A7, typename A8>
+  static Result Perform(Impl* impl, const ::testing::tuple<A0, A1, A2, A3, A4,
+      A5, A6, A7, A8>& args) {
+    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5, A6, A7,
+        A8>(args, get<0>(args), get<1>(args), get<2>(args), get<3>(args),
+        get<4>(args), get<5>(args), get<6>(args), get<7>(args), get<8>(args),
+        ExcessiveArg());
+  }
+
+  template <typename A0, typename A1, typename A2, typename A3, typename A4,
+      typename A5, typename A6, typename A7, typename A8, typename A9>
+  static Result Perform(Impl* impl, const ::testing::tuple<A0, A1, A2, A3, A4,
+      A5, A6, A7, A8, A9>& args) {
+    return impl->template gmock_PerformImpl<A0, A1, A2, A3, A4, A5, A6, A7, A8,
+        A9>(args, get<0>(args), get<1>(args), get<2>(args), get<3>(args),
+        get<4>(args), get<5>(args), get<6>(args), get<7>(args), get<8>(args),
+        get<9>(args));
+  }
+};
+
+}  // namespace internal
+
+// Various overloads for Invoke().
+
+// WithArgs<N1, N2, ..., Nk>(an_action) creates an action that passes
+// the selected arguments of the mock function to an_action and
+// performs it.  It serves as an adaptor between actions with
+// different argument lists.  C++ doesn't support default arguments for
+// function templates, so we have to overload it.
+template <int k1, typename InnerAction>
+inline internal::WithArgsAction<InnerAction, k1>
+WithArgs(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction, k1>(action);
+}
+
+template <int k1, int k2, typename InnerAction>
+inline internal::WithArgsAction<InnerAction, k1, k2>
+WithArgs(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction, k1, k2>(action);
+}
+
+template <int k1, int k2, int k3, typename InnerAction>
+inline internal::WithArgsAction<InnerAction, k1, k2, k3>
+WithArgs(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction, k1, k2, k3>(action);
+}
+
+template <int k1, int k2, int k3, int k4, typename InnerAction>
+inline internal::WithArgsAction<InnerAction, k1, k2, k3, k4>
+WithArgs(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction, k1, k2, k3, k4>(action);
+}
+
+template <int k1, int k2, int k3, int k4, int k5, typename InnerAction>
+inline internal::WithArgsAction<InnerAction, k1, k2, k3, k4, k5>
+WithArgs(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction, k1, k2, k3, k4, k5>(action);
+}
+
+template <int k1, int k2, int k3, int k4, int k5, int k6, typename InnerAction>
+inline internal::WithArgsAction<InnerAction, k1, k2, k3, k4, k5, k6>
+WithArgs(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction, k1, k2, k3, k4, k5, k6>(action);
+}
+
+template <int k1, int k2, int k3, int k4, int k5, int k6, int k7,
+    typename InnerAction>
+inline internal::WithArgsAction<InnerAction, k1, k2, k3, k4, k5, k6, k7>
+WithArgs(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction, k1, k2, k3, k4, k5, k6,
+      k7>(action);
+}
+
+template <int k1, int k2, int k3, int k4, int k5, int k6, int k7, int k8,
+    typename InnerAction>
+inline internal::WithArgsAction<InnerAction, k1, k2, k3, k4, k5, k6, k7, k8>
+WithArgs(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction, k1, k2, k3, k4, k5, k6, k7,
+      k8>(action);
+}
+
+template <int k1, int k2, int k3, int k4, int k5, int k6, int k7, int k8,
+    int k9, typename InnerAction>
+inline internal::WithArgsAction<InnerAction, k1, k2, k3, k4, k5, k6, k7, k8, k9>
+WithArgs(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction, k1, k2, k3, k4, k5, k6, k7, k8,
+      k9>(action);
+}
+
+template <int k1, int k2, int k3, int k4, int k5, int k6, int k7, int k8,
+    int k9, int k10, typename InnerAction>
+inline internal::WithArgsAction<InnerAction, k1, k2, k3, k4, k5, k6, k7, k8,
+    k9, k10>
+WithArgs(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction, k1, k2, k3, k4, k5, k6, k7, k8,
+      k9, k10>(action);
+}
+
+// Creates an action that does actions a1, a2, ..., sequentially in
+// each invocation.
+template <typename Action1, typename Action2>
+inline internal::DoBothAction<Action1, Action2>
+DoAll(Action1 a1, Action2 a2) {
+  return internal::DoBothAction<Action1, Action2>(a1, a2);
+}
+
+template <typename Action1, typename Action2, typename Action3>
+inline internal::DoBothAction<Action1, internal::DoBothAction<Action2,
+    Action3> >
+DoAll(Action1 a1, Action2 a2, Action3 a3) {
+  return DoAll(a1, DoAll(a2, a3));
+}
+
+template <typename Action1, typename Action2, typename Action3,
+    typename Action4>
+inline internal::DoBothAction<Action1, internal::DoBothAction<Action2,
+    internal::DoBothAction<Action3, Action4> > >
+DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4) {
+  return DoAll(a1, DoAll(a2, a3, a4));
+}
+
+template <typename Action1, typename Action2, typename Action3,
+    typename Action4, typename Action5>
+inline internal::DoBothAction<Action1, internal::DoBothAction<Action2,
+    internal::DoBothAction<Action3, internal::DoBothAction<Action4,
+    Action5> > > >
+DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5) {
+  return DoAll(a1, DoAll(a2, a3, a4, a5));
+}
+
+template <typename Action1, typename Action2, typename Action3,
+    typename Action4, typename Action5, typename Action6>
+inline internal::DoBothAction<Action1, internal::DoBothAction<Action2,
+    internal::DoBothAction<Action3, internal::DoBothAction<Action4,
+    internal::DoBothAction<Action5, Action6> > > > >
+DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6) {
+  return DoAll(a1, DoAll(a2, a3, a4, a5, a6));
+}
+
+template <typename Action1, typename Action2, typename Action3,
+    typename Action4, typename Action5, typename Action6, typename Action7>
+inline internal::DoBothAction<Action1, internal::DoBothAction<Action2,
+    internal::DoBothAction<Action3, internal::DoBothAction<Action4,
+    internal::DoBothAction<Action5, internal::DoBothAction<Action6,
+    Action7> > > > > >
+DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6,
+    Action7 a7) {
+  return DoAll(a1, DoAll(a2, a3, a4, a5, a6, a7));
+}
+
+template <typename Action1, typename Action2, typename Action3,
+    typename Action4, typename Action5, typename Action6, typename Action7,
+    typename Action8>
+inline internal::DoBothAction<Action1, internal::DoBothAction<Action2,
+    internal::DoBothAction<Action3, internal::DoBothAction<Action4,
+    internal::DoBothAction<Action5, internal::DoBothAction<Action6,
+    internal::DoBothAction<Action7, Action8> > > > > > >
+DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6,
+    Action7 a7, Action8 a8) {
+  return DoAll(a1, DoAll(a2, a3, a4, a5, a6, a7, a8));
+}
+
+template <typename Action1, typename Action2, typename Action3,
+    typename Action4, typename Action5, typename Action6, typename Action7,
+    typename Action8, typename Action9>
+inline internal::DoBothAction<Action1, internal::DoBothAction<Action2,
+    internal::DoBothAction<Action3, internal::DoBothAction<Action4,
+    internal::DoBothAction<Action5, internal::DoBothAction<Action6,
+    internal::DoBothAction<Action7, internal::DoBothAction<Action8,
+    Action9> > > > > > > >
+DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6,
+    Action7 a7, Action8 a8, Action9 a9) {
+  return DoAll(a1, DoAll(a2, a3, a4, a5, a6, a7, a8, a9));
+}
+
+template <typename Action1, typename Action2, typename Action3,
+    typename Action4, typename Action5, typename Action6, typename Action7,
+    typename Action8, typename Action9, typename Action10>
+inline internal::DoBothAction<Action1, internal::DoBothAction<Action2,
+    internal::DoBothAction<Action3, internal::DoBothAction<Action4,
+    internal::DoBothAction<Action5, internal::DoBothAction<Action6,
+    internal::DoBothAction<Action7, internal::DoBothAction<Action8,
+    internal::DoBothAction<Action9, Action10> > > > > > > > >
+DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6,
+    Action7 a7, Action8 a8, Action9 a9, Action10 a10) {
+  return DoAll(a1, DoAll(a2, a3, a4, a5, a6, a7, a8, a9, a10));
+}
+
+}  // namespace testing
+
+// The ACTION* family of macros can be used in a namespace scope to
+// define custom actions easily.  The syntax:
+//
+//   ACTION(name) { statements; }
+//
+// will define an action with the given name that executes the
+// statements.  The value returned by the statements will be used as
+// the return value of the action.  Inside the statements, you can
+// refer to the K-th (0-based) argument of the mock function by
+// 'argK', and refer to its type by 'argK_type'.  For example:
+//
+//   ACTION(IncrementArg1) {
+//     arg1_type temp = arg1;
+//     return ++(*temp);
+//   }
+//
+// allows you to write
+//
+//   ...WillOnce(IncrementArg1());
+//
+// You can also refer to the entire argument tuple and its type by
+// 'args' and 'args_type', and refer to the mock function type and its
+// return type by 'function_type' and 'return_type'.
+//
+// Note that you don't need to specify the types of the mock function
+// arguments.  However rest assured that your code is still type-safe:
+// you'll get a compiler error if *arg1 doesn't support the ++
+// operator, or if the type of ++(*arg1) isn't compatible with the
+// mock function's return type, for example.
+//
+// Sometimes you'll want to parameterize the action.   For that you can use
+// another macro:
+//
+//   ACTION_P(name, param_name) { statements; }
+//
+// For example:
+//
+//   ACTION_P(Add, n) { return arg0 + n; }
+//
+// will allow you to write:
+//
+//   ...WillOnce(Add(5));
+//
+// Note that you don't need to provide the type of the parameter
+// either.  If you need to reference the type of a parameter named
+// 'foo', you can write 'foo_type'.  For example, in the body of
+// ACTION_P(Add, n) above, you can write 'n_type' to refer to the type
+// of 'n'.
+//
+// We also provide ACTION_P2, ACTION_P3, ..., up to ACTION_P10 to support
+// multi-parameter actions.
+//
+// For the purpose of typing, you can view
+//
+//   ACTION_Pk(Foo, p1, ..., pk) { ... }
+//
+// as shorthand for
+//
+//   template <typename p1_type, ..., typename pk_type>
+//   FooActionPk<p1_type, ..., pk_type> Foo(p1_type p1, ..., pk_type pk) { ... }
+//
+// In particular, you can provide the template type arguments
+// explicitly when invoking Foo(), as in Foo<long, bool>(5, false);
+// although usually you can rely on the compiler to infer the types
+// for you automatically.  You can assign the result of expression
+// Foo(p1, ..., pk) to a variable of type FooActionPk<p1_type, ...,
+// pk_type>.  This can be useful when composing actions.
+//
+// You can also overload actions with different numbers of parameters:
+//
+//   ACTION_P(Plus, a) { ... }
+//   ACTION_P2(Plus, a, b) { ... }
+//
+// While it's tempting to always use the ACTION* macros when defining
+// a new action, you should also consider implementing ActionInterface
+// or using MakePolymorphicAction() instead, especially if you need to
+// use the action a lot.  While these approaches require more work,
+// they give you more control on the types of the mock function
+// arguments and the action parameters, which in general leads to
+// better compiler error messages that pay off in the long run.  They
+// also allow overloading actions based on parameter types (as opposed
+// to just based on the number of parameters).
+//
+// CAVEAT:
+//
+// ACTION*() can only be used in a namespace scope.  The reason is
+// that C++ doesn't yet allow function-local types to be used to
+// instantiate templates.  The up-coming C++0x standard will fix this.
+// Once that's done, we'll consider supporting using ACTION*() inside
+// a function.
+//
+// MORE INFORMATION:
+//
+// To learn more about using these macros, please search for 'ACTION'
+// on http://code.google.com/p/googlemock/wiki/CookBook.
+
+// An internal macro needed for implementing ACTION*().
+#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_\
+    const args_type& args GTEST_ATTRIBUTE_UNUSED_, \
+    arg0_type arg0 GTEST_ATTRIBUTE_UNUSED_, \
+    arg1_type arg1 GTEST_ATTRIBUTE_UNUSED_, \
+    arg2_type arg2 GTEST_ATTRIBUTE_UNUSED_, \
+    arg3_type arg3 GTEST_ATTRIBUTE_UNUSED_, \
+    arg4_type arg4 GTEST_ATTRIBUTE_UNUSED_, \
+    arg5_type arg5 GTEST_ATTRIBUTE_UNUSED_, \
+    arg6_type arg6 GTEST_ATTRIBUTE_UNUSED_, \
+    arg7_type arg7 GTEST_ATTRIBUTE_UNUSED_, \
+    arg8_type arg8 GTEST_ATTRIBUTE_UNUSED_, \
+    arg9_type arg9 GTEST_ATTRIBUTE_UNUSED_
+
+// Sometimes you want to give an action explicit template parameters
+// that cannot be inferred from its value parameters.  ACTION() and
+// ACTION_P*() don't support that.  ACTION_TEMPLATE() remedies that
+// and can be viewed as an extension to ACTION() and ACTION_P*().
+//
+// The syntax:
+//
+//   ACTION_TEMPLATE(ActionName,
+//                   HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m),
+//                   AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; }
+//
+// defines an action template that takes m explicit template
+// parameters and n value parameters.  name_i is the name of the i-th
+// template parameter, and kind_i specifies whether it's a typename,
+// an integral constant, or a template.  p_i is the name of the i-th
+// value parameter.
+//
+// Example:
+//
+//   // DuplicateArg<k, T>(output) converts the k-th argument of the mock
+//   // function to type T and copies it to *output.
+//   ACTION_TEMPLATE(DuplicateArg,
+//                   HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
+//                   AND_1_VALUE_PARAMS(output)) {
+//     *output = T(::testing::get<k>(args));
+//   }
+//   ...
+//     int n;
+//     EXPECT_CALL(mock, Foo(_, _))
+//         .WillOnce(DuplicateArg<1, unsigned char>(&n));
+//
+// To create an instance of an action template, write:
+//
+//   ActionName<t1, ..., t_m>(v1, ..., v_n)
+//
+// where the ts are the template arguments and the vs are the value
+// arguments.  The value argument types are inferred by the compiler.
+// If you want to explicitly specify the value argument types, you can
+// provide additional template arguments:
+//
+//   ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
+//
+// where u_i is the desired type of v_i.
+//
+// ACTION_TEMPLATE and ACTION/ACTION_P* can be overloaded on the
+// number of value parameters, but not on the number of template
+// parameters.  Without the restriction, the meaning of the following
+// is unclear:
+//
+//   OverloadedAction<int, bool>(x);
+//
+// Are we using a single-template-parameter action where 'bool' refers
+// to the type of x, or are we using a two-template-parameter action
+// where the compiler is asked to infer the type of x?
+//
+// Implementation notes:
+//
+// GMOCK_INTERNAL_*_HAS_m_TEMPLATE_PARAMS and
+// GMOCK_INTERNAL_*_AND_n_VALUE_PARAMS are internal macros for
+// implementing ACTION_TEMPLATE.  The main trick we use is to create
+// new macro invocations when expanding a macro.  For example, we have
+//
+//   #define ACTION_TEMPLATE(name, template_params, value_params)
+//       ... GMOCK_INTERNAL_DECL_##template_params ...
+//
+// which causes ACTION_TEMPLATE(..., HAS_1_TEMPLATE_PARAMS(typename, T), ...)
+// to expand to
+//
+//       ... GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(typename, T) ...
+//
+// Since GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS is a macro, the
+// preprocessor will continue to expand it to
+//
+//       ... typename T ...
+//
+// This technique conforms to the C++ standard and is portable.  It
+// allows us to implement action templates using O(N) code, where N is
+// the maximum number of template/value parameters supported.  Without
+// using it, we'd have to devote O(N^2) amount of code to implement all
+// combinations of m and n.
+
+// Declares the template parameters.
+#define GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(kind0, name0) kind0 name0
+#define GMOCK_INTERNAL_DECL_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \
+    name1) kind0 name0, kind1 name1
+#define GMOCK_INTERNAL_DECL_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2) kind0 name0, kind1 name1, kind2 name2
+#define GMOCK_INTERNAL_DECL_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3) kind0 name0, kind1 name1, kind2 name2, \
+    kind3 name3
+#define GMOCK_INTERNAL_DECL_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4) kind0 name0, kind1 name1, \
+    kind2 name2, kind3 name3, kind4 name4
+#define GMOCK_INTERNAL_DECL_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5) kind0 name0, \
+    kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5
+#define GMOCK_INTERNAL_DECL_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
+    name6) kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4, \
+    kind5 name5, kind6 name6
+#define GMOCK_INTERNAL_DECL_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
+    kind7, name7) kind0 name0, kind1 name1, kind2 name2, kind3 name3, \
+    kind4 name4, kind5 name5, kind6 name6, kind7 name7
+#define GMOCK_INTERNAL_DECL_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
+    kind7, name7, kind8, name8) kind0 name0, kind1 name1, kind2 name2, \
+    kind3 name3, kind4 name4, kind5 name5, kind6 name6, kind7 name7, \
+    kind8 name8
+#define GMOCK_INTERNAL_DECL_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \
+    name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
+    name6, kind7, name7, kind8, name8, kind9, name9) kind0 name0, \
+    kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5, \
+    kind6 name6, kind7 name7, kind8 name8, kind9 name9
+
+// Lists the template parameters.
+#define GMOCK_INTERNAL_LIST_HAS_1_TEMPLATE_PARAMS(kind0, name0) name0
+#define GMOCK_INTERNAL_LIST_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \
+    name1) name0, name1
+#define GMOCK_INTERNAL_LIST_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2) name0, name1, name2
+#define GMOCK_INTERNAL_LIST_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3) name0, name1, name2, name3
+#define GMOCK_INTERNAL_LIST_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4) name0, name1, name2, name3, \
+    name4
+#define GMOCK_INTERNAL_LIST_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5) name0, name1, \
+    name2, name3, name4, name5
+#define GMOCK_INTERNAL_LIST_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
+    name6) name0, name1, name2, name3, name4, name5, name6
+#define GMOCK_INTERNAL_LIST_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
+    kind7, name7) name0, name1, name2, name3, name4, name5, name6, name7
+#define GMOCK_INTERNAL_LIST_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
+    kind7, name7, kind8, name8) name0, name1, name2, name3, name4, name5, \
+    name6, name7, name8
+#define GMOCK_INTERNAL_LIST_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \
+    name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
+    name6, kind7, name7, kind8, name8, kind9, name9) name0, name1, name2, \
+    name3, name4, name5, name6, name7, name8, name9
+
+// Declares the types of value parameters.
+#define GMOCK_INTERNAL_DECL_TYPE_AND_0_VALUE_PARAMS()
+#define GMOCK_INTERNAL_DECL_TYPE_AND_1_VALUE_PARAMS(p0) , typename p0##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_2_VALUE_PARAMS(p0, p1) , \
+    typename p0##_type, typename p1##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , \
+    typename p0##_type, typename p1##_type, typename p2##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \
+    typename p0##_type, typename p1##_type, typename p2##_type, \
+    typename p3##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \
+    typename p0##_type, typename p1##_type, typename p2##_type, \
+    typename p3##_type, typename p4##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \
+    typename p0##_type, typename p1##_type, typename p2##_type, \
+    typename p3##_type, typename p4##_type, typename p5##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6) , typename p0##_type, typename p1##_type, typename p2##_type, \
+    typename p3##_type, typename p4##_type, typename p5##_type, \
+    typename p6##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6, p7) , typename p0##_type, typename p1##_type, typename p2##_type, \
+    typename p3##_type, typename p4##_type, typename p5##_type, \
+    typename p6##_type, typename p7##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6, p7, p8) , typename p0##_type, typename p1##_type, typename p2##_type, \
+    typename p3##_type, typename p4##_type, typename p5##_type, \
+    typename p6##_type, typename p7##_type, typename p8##_type
+#define GMOCK_INTERNAL_DECL_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6, p7, p8, p9) , typename p0##_type, typename p1##_type, \
+    typename p2##_type, typename p3##_type, typename p4##_type, \
+    typename p5##_type, typename p6##_type, typename p7##_type, \
+    typename p8##_type, typename p9##_type
+
+// Initializes the value parameters.
+#define GMOCK_INTERNAL_INIT_AND_0_VALUE_PARAMS()\
+    ()
+#define GMOCK_INTERNAL_INIT_AND_1_VALUE_PARAMS(p0)\
+    (p0##_type gmock_p0) : p0(gmock_p0)
+#define GMOCK_INTERNAL_INIT_AND_2_VALUE_PARAMS(p0, p1)\
+    (p0##_type gmock_p0, p1##_type gmock_p1) : p0(gmock_p0), p1(gmock_p1)
+#define GMOCK_INTERNAL_INIT_AND_3_VALUE_PARAMS(p0, p1, p2)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2)
+#define GMOCK_INTERNAL_INIT_AND_4_VALUE_PARAMS(p0, p1, p2, p3)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3)
+#define GMOCK_INTERNAL_INIT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3, p4##_type gmock_p4) : p0(gmock_p0), p1(gmock_p1), \
+        p2(gmock_p2), p3(gmock_p3), p4(gmock_p4)
+#define GMOCK_INTERNAL_INIT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3, p4##_type gmock_p4, \
+        p5##_type gmock_p5) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3), p4(gmock_p4), p5(gmock_p5)
+#define GMOCK_INTERNAL_INIT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+        p6##_type gmock_p6) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6)
+#define GMOCK_INTERNAL_INIT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+        p6##_type gmock_p6, p7##_type gmock_p7) : p0(gmock_p0), p1(gmock_p1), \
+        p2(gmock_p2), p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), \
+        p7(gmock_p7)
+#define GMOCK_INTERNAL_INIT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+        p6##_type gmock_p6, p7##_type gmock_p7, \
+        p8##_type gmock_p8) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), p7(gmock_p7), \
+        p8(gmock_p8)
+#define GMOCK_INTERNAL_INIT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8, p9)\
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+        p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \
+        p9##_type gmock_p9) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), p7(gmock_p7), \
+        p8(gmock_p8), p9(gmock_p9)
+
+// Declares the fields for storing the value parameters.
+#define GMOCK_INTERNAL_DEFN_AND_0_VALUE_PARAMS()
+#define GMOCK_INTERNAL_DEFN_AND_1_VALUE_PARAMS(p0) p0##_type p0;
+#define GMOCK_INTERNAL_DEFN_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0; \
+    p1##_type p1;
+#define GMOCK_INTERNAL_DEFN_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0; \
+    p1##_type p1; p2##_type p2;
+#define GMOCK_INTERNAL_DEFN_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0; \
+    p1##_type p1; p2##_type p2; p3##_type p3;
+#define GMOCK_INTERNAL_DEFN_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \
+    p4) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4;
+#define GMOCK_INTERNAL_DEFN_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \
+    p5) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
+    p5##_type p5;
+#define GMOCK_INTERNAL_DEFN_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
+    p5##_type p5; p6##_type p6;
+#define GMOCK_INTERNAL_DEFN_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
+    p5##_type p5; p6##_type p6; p7##_type p7;
+#define GMOCK_INTERNAL_DEFN_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \
+    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8;
+#define GMOCK_INTERNAL_DEFN_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8, p9) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \
+    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8; \
+    p9##_type p9;
+
+// Lists the value parameters.
+#define GMOCK_INTERNAL_LIST_AND_0_VALUE_PARAMS()
+#define GMOCK_INTERNAL_LIST_AND_1_VALUE_PARAMS(p0) p0
+#define GMOCK_INTERNAL_LIST_AND_2_VALUE_PARAMS(p0, p1) p0, p1
+#define GMOCK_INTERNAL_LIST_AND_3_VALUE_PARAMS(p0, p1, p2) p0, p1, p2
+#define GMOCK_INTERNAL_LIST_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0, p1, p2, p3
+#define GMOCK_INTERNAL_LIST_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) p0, p1, \
+    p2, p3, p4
+#define GMOCK_INTERNAL_LIST_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) p0, \
+    p1, p2, p3, p4, p5
+#define GMOCK_INTERNAL_LIST_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6) p0, p1, p2, p3, p4, p5, p6
+#define GMOCK_INTERNAL_LIST_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7) p0, p1, p2, p3, p4, p5, p6, p7
+#define GMOCK_INTERNAL_LIST_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8) p0, p1, p2, p3, p4, p5, p6, p7, p8
+#define GMOCK_INTERNAL_LIST_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8, p9) p0, p1, p2, p3, p4, p5, p6, p7, p8, p9
+
+// Lists the value parameter types.
+#define GMOCK_INTERNAL_LIST_TYPE_AND_0_VALUE_PARAMS()
+#define GMOCK_INTERNAL_LIST_TYPE_AND_1_VALUE_PARAMS(p0) , p0##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_2_VALUE_PARAMS(p0, p1) , p0##_type, \
+    p1##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , p0##_type, \
+    p1##_type, p2##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \
+    p0##_type, p1##_type, p2##_type, p3##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \
+    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \
+    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type, \
+    p6##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6, p7) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+    p5##_type, p6##_type, p7##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6, p7, p8) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+    p5##_type, p6##_type, p7##_type, p8##_type
+#define GMOCK_INTERNAL_LIST_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6, p7, p8, p9) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+    p5##_type, p6##_type, p7##_type, p8##_type, p9##_type
+
+// Declares the value parameters.
+#define GMOCK_INTERNAL_DECL_AND_0_VALUE_PARAMS()
+#define GMOCK_INTERNAL_DECL_AND_1_VALUE_PARAMS(p0) p0##_type p0
+#define GMOCK_INTERNAL_DECL_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0, \
+    p1##_type p1
+#define GMOCK_INTERNAL_DECL_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0, \
+    p1##_type p1, p2##_type p2
+#define GMOCK_INTERNAL_DECL_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0, \
+    p1##_type p1, p2##_type p2, p3##_type p3
+#define GMOCK_INTERNAL_DECL_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \
+    p4) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4
+#define GMOCK_INTERNAL_DECL_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \
+    p5) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
+    p5##_type p5
+#define GMOCK_INTERNAL_DECL_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
+    p6) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
+    p5##_type p5, p6##_type p6
+#define GMOCK_INTERNAL_DECL_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
+    p5##_type p5, p6##_type p6, p7##_type p7
+#define GMOCK_INTERNAL_DECL_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
+    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8
+#define GMOCK_INTERNAL_DECL_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8, p9) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
+    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \
+    p9##_type p9
+
+// The suffix of the class template implementing the action template.
+#define GMOCK_INTERNAL_COUNT_AND_0_VALUE_PARAMS()
+#define GMOCK_INTERNAL_COUNT_AND_1_VALUE_PARAMS(p0) P
+#define GMOCK_INTERNAL_COUNT_AND_2_VALUE_PARAMS(p0, p1) P2
+#define GMOCK_INTERNAL_COUNT_AND_3_VALUE_PARAMS(p0, p1, p2) P3
+#define GMOCK_INTERNAL_COUNT_AND_4_VALUE_PARAMS(p0, p1, p2, p3) P4
+#define GMOCK_INTERNAL_COUNT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) P5
+#define GMOCK_INTERNAL_COUNT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) P6
+#define GMOCK_INTERNAL_COUNT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6) P7
+#define GMOCK_INTERNAL_COUNT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7) P8
+#define GMOCK_INTERNAL_COUNT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8) P9
+#define GMOCK_INTERNAL_COUNT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
+    p7, p8, p9) P10
+
+// The name of the class template implementing the action template.
+#define GMOCK_ACTION_CLASS_(name, value_params)\
+    GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
+
+#define ACTION_TEMPLATE(name, template_params, value_params)\
+  template <GMOCK_INTERNAL_DECL_##template_params\
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
+  class GMOCK_ACTION_CLASS_(name, value_params) {\
+   public:\
+    explicit GMOCK_ACTION_CLASS_(name, value_params)\
+        GMOCK_INTERNAL_INIT_##value_params {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      explicit gmock_Impl GMOCK_INTERNAL_INIT_##value_params {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <typename arg0_type, typename arg1_type, typename arg2_type, \
+          typename arg3_type, typename arg4_type, typename arg5_type, \
+          typename arg6_type, typename arg7_type, typename arg8_type, \
+          typename arg9_type>\
+      return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \
+          arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \
+          arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \
+          arg9_type arg9) const;\
+      GMOCK_INTERNAL_DEFN_##value_params\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(\
+          new gmock_Impl<F>(GMOCK_INTERNAL_LIST_##value_params));\
+    }\
+    GMOCK_INTERNAL_DEFN_##value_params\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(GMOCK_ACTION_CLASS_(name, value_params));\
+  };\
+  template <GMOCK_INTERNAL_DECL_##template_params\
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
+  inline GMOCK_ACTION_CLASS_(name, value_params)<\
+      GMOCK_INTERNAL_LIST_##template_params\
+      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(\
+          GMOCK_INTERNAL_DECL_##value_params) {\
+    return GMOCK_ACTION_CLASS_(name, value_params)<\
+        GMOCK_INTERNAL_LIST_##template_params\
+        GMOCK_INTERNAL_LIST_TYPE_##value_params>(\
+            GMOCK_INTERNAL_LIST_##value_params);\
+  }\
+  template <GMOCK_INTERNAL_DECL_##template_params\
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      GMOCK_ACTION_CLASS_(name, value_params)<\
+          GMOCK_INTERNAL_LIST_##template_params\
+          GMOCK_INTERNAL_LIST_TYPE_##value_params>::gmock_Impl<F>::\
+              gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+#define ACTION(name)\
+  class name##Action {\
+   public:\
+    name##Action() {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      gmock_Impl() {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <typename arg0_type, typename arg1_type, typename arg2_type, \
+          typename arg3_type, typename arg4_type, typename arg5_type, \
+          typename arg6_type, typename arg7_type, typename arg8_type, \
+          typename arg9_type>\
+      return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \
+          arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \
+          arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \
+          arg9_type arg9) const;\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(new gmock_Impl<F>());\
+    }\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##Action);\
+  };\
+  inline name##Action name() {\
+    return name##Action();\
+  }\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      name##Action::gmock_Impl<F>::gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+#define ACTION_P(name, p0)\
+  template <typename p0##_type>\
+  class name##ActionP {\
+   public:\
+    explicit name##ActionP(p0##_type gmock_p0) : p0(gmock_p0) {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      explicit gmock_Impl(p0##_type gmock_p0) : p0(gmock_p0) {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <typename arg0_type, typename arg1_type, typename arg2_type, \
+          typename arg3_type, typename arg4_type, typename arg5_type, \
+          typename arg6_type, typename arg7_type, typename arg8_type, \
+          typename arg9_type>\
+      return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \
+          arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \
+          arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \
+          arg9_type arg9) const;\
+      p0##_type p0;\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(new gmock_Impl<F>(p0));\
+    }\
+    p0##_type p0;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##ActionP);\
+  };\
+  template <typename p0##_type>\
+  inline name##ActionP<p0##_type> name(p0##_type p0) {\
+    return name##ActionP<p0##_type>(p0);\
+  }\
+  template <typename p0##_type>\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      name##ActionP<p0##_type>::gmock_Impl<F>::gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+#define ACTION_P2(name, p0, p1)\
+  template <typename p0##_type, typename p1##_type>\
+  class name##ActionP2 {\
+   public:\
+    name##ActionP2(p0##_type gmock_p0, p1##_type gmock_p1) : p0(gmock_p0), \
+        p1(gmock_p1) {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1) : p0(gmock_p0), \
+          p1(gmock_p1) {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <typename arg0_type, typename arg1_type, typename arg2_type, \
+          typename arg3_type, typename arg4_type, typename arg5_type, \
+          typename arg6_type, typename arg7_type, typename arg8_type, \
+          typename arg9_type>\
+      return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \
+          arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \
+          arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \
+          arg9_type arg9) const;\
+      p0##_type p0;\
+      p1##_type p1;\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1));\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##ActionP2);\
+  };\
+  template <typename p0##_type, typename p1##_type>\
+  inline name##ActionP2<p0##_type, p1##_type> name(p0##_type p0, \
+      p1##_type p1) {\
+    return name##ActionP2<p0##_type, p1##_type>(p0, p1);\
+  }\
+  template <typename p0##_type, typename p1##_type>\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      name##ActionP2<p0##_type, p1##_type>::gmock_Impl<F>::gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+#define ACTION_P3(name, p0, p1, p2)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type>\
+  class name##ActionP3 {\
+   public:\
+    name##ActionP3(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2) {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, \
+          p2##_type gmock_p2) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2) {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <typename arg0_type, typename arg1_type, typename arg2_type, \
+          typename arg3_type, typename arg4_type, typename arg5_type, \
+          typename arg6_type, typename arg7_type, typename arg8_type, \
+          typename arg9_type>\
+      return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \
+          arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \
+          arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \
+          arg9_type arg9) const;\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2));\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##ActionP3);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type>\
+  inline name##ActionP3<p0##_type, p1##_type, p2##_type> name(p0##_type p0, \
+      p1##_type p1, p2##_type p2) {\
+    return name##ActionP3<p0##_type, p1##_type, p2##_type>(p0, p1, p2);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type>\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      name##ActionP3<p0##_type, p1##_type, \
+          p2##_type>::gmock_Impl<F>::gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+#define ACTION_P4(name, p0, p1, p2, p3)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type>\
+  class name##ActionP4 {\
+   public:\
+    name##ActionP4(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3) : p0(gmock_p0), p1(gmock_p1), \
+        p2(gmock_p2), p3(gmock_p3) {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+          p3(gmock_p3) {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <typename arg0_type, typename arg1_type, typename arg2_type, \
+          typename arg3_type, typename arg4_type, typename arg5_type, \
+          typename arg6_type, typename arg7_type, typename arg8_type, \
+          typename arg9_type>\
+      return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \
+          arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \
+          arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \
+          arg9_type arg9) const;\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3));\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##ActionP4);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type>\
+  inline name##ActionP4<p0##_type, p1##_type, p2##_type, \
+      p3##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, \
+      p3##_type p3) {\
+    return name##ActionP4<p0##_type, p1##_type, p2##_type, p3##_type>(p0, p1, \
+        p2, p3);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type>\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      name##ActionP4<p0##_type, p1##_type, p2##_type, \
+          p3##_type>::gmock_Impl<F>::gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+#define ACTION_P5(name, p0, p1, p2, p3, p4)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type>\
+  class name##ActionP5 {\
+   public:\
+    name##ActionP5(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3, \
+        p4##_type gmock_p4) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3), p4(gmock_p4) {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3, p4##_type gmock_p4) : p0(gmock_p0), \
+          p1(gmock_p1), p2(gmock_p2), p3(gmock_p3), p4(gmock_p4) {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <typename arg0_type, typename arg1_type, typename arg2_type, \
+          typename arg3_type, typename arg4_type, typename arg5_type, \
+          typename arg6_type, typename arg7_type, typename arg8_type, \
+          typename arg9_type>\
+      return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \
+          arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \
+          arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \
+          arg9_type arg9) const;\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+      p4##_type p4;\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4));\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+    p4##_type p4;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##ActionP5);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type>\
+  inline name##ActionP5<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
+      p4##_type p4) {\
+    return name##ActionP5<p0##_type, p1##_type, p2##_type, p3##_type, \
+        p4##_type>(p0, p1, p2, p3, p4);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type>\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      name##ActionP5<p0##_type, p1##_type, p2##_type, p3##_type, \
+          p4##_type>::gmock_Impl<F>::gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+#define ACTION_P6(name, p0, p1, p2, p3, p4, p5)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type>\
+  class name##ActionP6 {\
+   public:\
+    name##ActionP6(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
+        p5##_type gmock_p5) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3), p4(gmock_p4), p5(gmock_p5) {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3, p4##_type gmock_p4, \
+          p5##_type gmock_p5) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+          p3(gmock_p3), p4(gmock_p4), p5(gmock_p5) {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <typename arg0_type, typename arg1_type, typename arg2_type, \
+          typename arg3_type, typename arg4_type, typename arg5_type, \
+          typename arg6_type, typename arg7_type, typename arg8_type, \
+          typename arg9_type>\
+      return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \
+          arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \
+          arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \
+          arg9_type arg9) const;\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+      p4##_type p4;\
+      p5##_type p5;\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5));\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+    p4##_type p4;\
+    p5##_type p5;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##ActionP6);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type>\
+  inline name##ActionP6<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type, p5##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, \
+      p3##_type p3, p4##_type p4, p5##_type p5) {\
+    return name##ActionP6<p0##_type, p1##_type, p2##_type, p3##_type, \
+        p4##_type, p5##_type>(p0, p1, p2, p3, p4, p5);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type>\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      name##ActionP6<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+          p5##_type>::gmock_Impl<F>::gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+#define ACTION_P7(name, p0, p1, p2, p3, p4, p5, p6)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type>\
+  class name##ActionP7 {\
+   public:\
+    name##ActionP7(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
+        p5##_type gmock_p5, p6##_type gmock_p6) : p0(gmock_p0), p1(gmock_p1), \
+        p2(gmock_p2), p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), \
+        p6(gmock_p6) {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+          p6##_type gmock_p6) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+          p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6) {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <typename arg0_type, typename arg1_type, typename arg2_type, \
+          typename arg3_type, typename arg4_type, typename arg5_type, \
+          typename arg6_type, typename arg7_type, typename arg8_type, \
+          typename arg9_type>\
+      return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \
+          arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \
+          arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \
+          arg9_type arg9) const;\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+      p4##_type p4;\
+      p5##_type p5;\
+      p6##_type p6;\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5, \
+          p6));\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+    p4##_type p4;\
+    p5##_type p5;\
+    p6##_type p6;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##ActionP7);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type>\
+  inline name##ActionP7<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type, p5##_type, p6##_type> name(p0##_type p0, p1##_type p1, \
+      p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \
+      p6##_type p6) {\
+    return name##ActionP7<p0##_type, p1##_type, p2##_type, p3##_type, \
+        p4##_type, p5##_type, p6##_type>(p0, p1, p2, p3, p4, p5, p6);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type>\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      name##ActionP7<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+          p5##_type, p6##_type>::gmock_Impl<F>::gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+#define ACTION_P8(name, p0, p1, p2, p3, p4, p5, p6, p7)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type>\
+  class name##ActionP8 {\
+   public:\
+    name##ActionP8(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
+        p5##_type gmock_p5, p6##_type gmock_p6, \
+        p7##_type gmock_p7) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), \
+        p7(gmock_p7) {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+          p6##_type gmock_p6, p7##_type gmock_p7) : p0(gmock_p0), \
+          p1(gmock_p1), p2(gmock_p2), p3(gmock_p3), p4(gmock_p4), \
+          p5(gmock_p5), p6(gmock_p6), p7(gmock_p7) {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <typename arg0_type, typename arg1_type, typename arg2_type, \
+          typename arg3_type, typename arg4_type, typename arg5_type, \
+          typename arg6_type, typename arg7_type, typename arg8_type, \
+          typename arg9_type>\
+      return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \
+          arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \
+          arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \
+          arg9_type arg9) const;\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+      p4##_type p4;\
+      p5##_type p5;\
+      p6##_type p6;\
+      p7##_type p7;\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5, \
+          p6, p7));\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+    p4##_type p4;\
+    p5##_type p5;\
+    p6##_type p6;\
+    p7##_type p7;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##ActionP8);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type>\
+  inline name##ActionP8<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type, p5##_type, p6##_type, p7##_type> name(p0##_type p0, \
+      p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \
+      p6##_type p6, p7##_type p7) {\
+    return name##ActionP8<p0##_type, p1##_type, p2##_type, p3##_type, \
+        p4##_type, p5##_type, p6##_type, p7##_type>(p0, p1, p2, p3, p4, p5, \
+        p6, p7);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type>\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      name##ActionP8<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+          p5##_type, p6##_type, \
+          p7##_type>::gmock_Impl<F>::gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+#define ACTION_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type, typename p8##_type>\
+  class name##ActionP9 {\
+   public:\
+    name##ActionP9(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
+        p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \
+        p8##_type gmock_p8) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), p7(gmock_p7), \
+        p8(gmock_p8) {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+          p6##_type gmock_p6, p7##_type gmock_p7, \
+          p8##_type gmock_p8) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+          p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), \
+          p7(gmock_p7), p8(gmock_p8) {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <typename arg0_type, typename arg1_type, typename arg2_type, \
+          typename arg3_type, typename arg4_type, typename arg5_type, \
+          typename arg6_type, typename arg7_type, typename arg8_type, \
+          typename arg9_type>\
+      return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \
+          arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \
+          arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \
+          arg9_type arg9) const;\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+      p4##_type p4;\
+      p5##_type p5;\
+      p6##_type p6;\
+      p7##_type p7;\
+      p8##_type p8;\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5, \
+          p6, p7, p8));\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+    p4##_type p4;\
+    p5##_type p5;\
+    p6##_type p6;\
+    p7##_type p7;\
+    p8##_type p8;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##ActionP9);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type, typename p8##_type>\
+  inline name##ActionP9<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type, p5##_type, p6##_type, p7##_type, \
+      p8##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
+      p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, \
+      p8##_type p8) {\
+    return name##ActionP9<p0##_type, p1##_type, p2##_type, p3##_type, \
+        p4##_type, p5##_type, p6##_type, p7##_type, p8##_type>(p0, p1, p2, \
+        p3, p4, p5, p6, p7, p8);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type, typename p8##_type>\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      name##ActionP9<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+          p5##_type, p6##_type, p7##_type, \
+          p8##_type>::gmock_Impl<F>::gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+#define ACTION_P10(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type, typename p8##_type, \
+      typename p9##_type>\
+  class name##ActionP10 {\
+   public:\
+    name##ActionP10(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
+        p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \
+        p8##_type gmock_p8, p9##_type gmock_p9) : p0(gmock_p0), p1(gmock_p1), \
+        p2(gmock_p2), p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), \
+        p7(gmock_p7), p8(gmock_p8), p9(gmock_p9) {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+          p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \
+          p9##_type gmock_p9) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+          p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), \
+          p7(gmock_p7), p8(gmock_p8), p9(gmock_p9) {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <typename arg0_type, typename arg1_type, typename arg2_type, \
+          typename arg3_type, typename arg4_type, typename arg5_type, \
+          typename arg6_type, typename arg7_type, typename arg8_type, \
+          typename arg9_type>\
+      return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \
+          arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \
+          arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \
+          arg9_type arg9) const;\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+      p4##_type p4;\
+      p5##_type p5;\
+      p6##_type p6;\
+      p7##_type p7;\
+      p8##_type p8;\
+      p9##_type p9;\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(new gmock_Impl<F>(p0, p1, p2, p3, p4, p5, \
+          p6, p7, p8, p9));\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+    p4##_type p4;\
+    p5##_type p5;\
+    p6##_type p6;\
+    p7##_type p7;\
+    p8##_type p8;\
+    p9##_type p9;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##ActionP10);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type, typename p8##_type, \
+      typename p9##_type>\
+  inline name##ActionP10<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, \
+      p9##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
+      p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \
+      p9##_type p9) {\
+    return name##ActionP10<p0##_type, p1##_type, p2##_type, p3##_type, \
+        p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, p9##_type>(p0, \
+        p1, p2, p3, p4, p5, p6, p7, p8, p9);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type, typename p8##_type, \
+      typename p9##_type>\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      name##ActionP10<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+          p5##_type, p6##_type, p7##_type, p8##_type, \
+          p9##_type>::gmock_Impl<F>::gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+namespace testing {
+
+
+// The ACTION*() macros trigger warning C4100 (unreferenced formal
+// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
+// the macro definition, as the warnings are generated when the macro
+// is expanded and macro expansion cannot contain #pragma.  Therefore
+// we suppress them here.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#endif
+
+// Various overloads for InvokeArgument<N>().
+//
+// The InvokeArgument<N>(a1, a2, ..., a_k) action invokes the N-th
+// (0-based) argument, which must be a k-ary callable, of the mock
+// function, with arguments a1, a2, ..., a_k.
+//
+// Notes:
+//
+//   1. The arguments are passed by value by default.  If you need to
+//   pass an argument by reference, wrap it inside ByRef().  For
+//   example,
+//
+//     InvokeArgument<1>(5, string("Hello"), ByRef(foo))
+//
+//   passes 5 and string("Hello") by value, and passes foo by
+//   reference.
+//
+//   2. If the callable takes an argument by reference but ByRef() is
+//   not used, it will receive the reference to a copy of the value,
+//   instead of the original value.  For example, when the 0-th
+//   argument of the mock function takes a const string&, the action
+//
+//     InvokeArgument<0>(string("Hello"))
+//
+//   makes a copy of the temporary string("Hello") object and passes a
+//   reference of the copy, instead of the original temporary object,
+//   to the callable.  This makes it easy for a user to define an
+//   InvokeArgument action from temporary values and have it performed
+//   later.
+
+namespace internal {
+namespace invoke_argument {
+
+// Appears in InvokeArgumentAdl's argument list to help avoid
+// accidental calls to user functions of the same name.
+struct AdlTag {};
+
+// InvokeArgumentAdl - a helper for InvokeArgument.
+// The basic overloads are provided here for generic functors.
+// Overloads for other custom-callables are provided in the
+// internal/custom/callback-actions.h header.
+
+template <typename R, typename F>
+R InvokeArgumentAdl(AdlTag, F f) {
+  return f();
+}
+template <typename R, typename F, typename A1>
+R InvokeArgumentAdl(AdlTag, F f, A1 a1) {
+  return f(a1);
+}
+template <typename R, typename F, typename A1, typename A2>
+R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2) {
+  return f(a1, a2);
+}
+template <typename R, typename F, typename A1, typename A2, typename A3>
+R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3) {
+  return f(a1, a2, a3);
+}
+template <typename R, typename F, typename A1, typename A2, typename A3,
+    typename A4>
+R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4) {
+  return f(a1, a2, a3, a4);
+}
+template <typename R, typename F, typename A1, typename A2, typename A3,
+    typename A4, typename A5>
+R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) {
+  return f(a1, a2, a3, a4, a5);
+}
+template <typename R, typename F, typename A1, typename A2, typename A3,
+    typename A4, typename A5, typename A6>
+R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) {
+  return f(a1, a2, a3, a4, a5, a6);
+}
+template <typename R, typename F, typename A1, typename A2, typename A3,
+    typename A4, typename A5, typename A6, typename A7>
+R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6,
+    A7 a7) {
+  return f(a1, a2, a3, a4, a5, a6, a7);
+}
+template <typename R, typename F, typename A1, typename A2, typename A3,
+    typename A4, typename A5, typename A6, typename A7, typename A8>
+R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6,
+    A7 a7, A8 a8) {
+  return f(a1, a2, a3, a4, a5, a6, a7, a8);
+}
+template <typename R, typename F, typename A1, typename A2, typename A3,
+    typename A4, typename A5, typename A6, typename A7, typename A8,
+    typename A9>
+R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6,
+    A7 a7, A8 a8, A9 a9) {
+  return f(a1, a2, a3, a4, a5, a6, a7, a8, a9);
+}
+template <typename R, typename F, typename A1, typename A2, typename A3,
+    typename A4, typename A5, typename A6, typename A7, typename A8,
+    typename A9, typename A10>
+R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6,
+    A7 a7, A8 a8, A9 a9, A10 a10) {
+  return f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
+}
+}  // namespace invoke_argument
+}  // namespace internal
+
+ACTION_TEMPLATE(InvokeArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_0_VALUE_PARAMS()) {
+  using internal::invoke_argument::InvokeArgumentAdl;
+  return InvokeArgumentAdl<return_type>(
+      internal::invoke_argument::AdlTag(),
+      ::testing::get<k>(args));
+}
+
+ACTION_TEMPLATE(InvokeArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_1_VALUE_PARAMS(p0)) {
+  using internal::invoke_argument::InvokeArgumentAdl;
+  return InvokeArgumentAdl<return_type>(
+      internal::invoke_argument::AdlTag(),
+      ::testing::get<k>(args), p0);
+}
+
+ACTION_TEMPLATE(InvokeArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_2_VALUE_PARAMS(p0, p1)) {
+  using internal::invoke_argument::InvokeArgumentAdl;
+  return InvokeArgumentAdl<return_type>(
+      internal::invoke_argument::AdlTag(),
+      ::testing::get<k>(args), p0, p1);
+}
+
+ACTION_TEMPLATE(InvokeArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_3_VALUE_PARAMS(p0, p1, p2)) {
+  using internal::invoke_argument::InvokeArgumentAdl;
+  return InvokeArgumentAdl<return_type>(
+      internal::invoke_argument::AdlTag(),
+      ::testing::get<k>(args), p0, p1, p2);
+}
+
+ACTION_TEMPLATE(InvokeArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_4_VALUE_PARAMS(p0, p1, p2, p3)) {
+  using internal::invoke_argument::InvokeArgumentAdl;
+  return InvokeArgumentAdl<return_type>(
+      internal::invoke_argument::AdlTag(),
+      ::testing::get<k>(args), p0, p1, p2, p3);
+}
+
+ACTION_TEMPLATE(InvokeArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)) {
+  using internal::invoke_argument::InvokeArgumentAdl;
+  return InvokeArgumentAdl<return_type>(
+      internal::invoke_argument::AdlTag(),
+      ::testing::get<k>(args), p0, p1, p2, p3, p4);
+}
+
+ACTION_TEMPLATE(InvokeArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)) {
+  using internal::invoke_argument::InvokeArgumentAdl;
+  return InvokeArgumentAdl<return_type>(
+      internal::invoke_argument::AdlTag(),
+      ::testing::get<k>(args), p0, p1, p2, p3, p4, p5);
+}
+
+ACTION_TEMPLATE(InvokeArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)) {
+  using internal::invoke_argument::InvokeArgumentAdl;
+  return InvokeArgumentAdl<return_type>(
+      internal::invoke_argument::AdlTag(),
+      ::testing::get<k>(args), p0, p1, p2, p3, p4, p5, p6);
+}
+
+ACTION_TEMPLATE(InvokeArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)) {
+  using internal::invoke_argument::InvokeArgumentAdl;
+  return InvokeArgumentAdl<return_type>(
+      internal::invoke_argument::AdlTag(),
+      ::testing::get<k>(args), p0, p1, p2, p3, p4, p5, p6, p7);
+}
+
+ACTION_TEMPLATE(InvokeArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8)) {
+  using internal::invoke_argument::InvokeArgumentAdl;
+  return InvokeArgumentAdl<return_type>(
+      internal::invoke_argument::AdlTag(),
+      ::testing::get<k>(args), p0, p1, p2, p3, p4, p5, p6, p7, p8);
+}
+
+ACTION_TEMPLATE(InvokeArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) {
+  using internal::invoke_argument::InvokeArgumentAdl;
+  return InvokeArgumentAdl<return_type>(
+      internal::invoke_argument::AdlTag(),
+      ::testing::get<k>(args), p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+}
+
+// Various overloads for ReturnNew<T>().
+//
+// The ReturnNew<T>(a1, a2, ..., a_k) action returns a pointer to a new
+// instance of type T, constructed on the heap with constructor arguments
+// a1, a2, ..., and a_k. The caller assumes ownership of the returned value.
+ACTION_TEMPLATE(ReturnNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_0_VALUE_PARAMS()) {
+  return new T();
+}
+
+ACTION_TEMPLATE(ReturnNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_1_VALUE_PARAMS(p0)) {
+  return new T(p0);
+}
+
+ACTION_TEMPLATE(ReturnNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_2_VALUE_PARAMS(p0, p1)) {
+  return new T(p0, p1);
+}
+
+ACTION_TEMPLATE(ReturnNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_3_VALUE_PARAMS(p0, p1, p2)) {
+  return new T(p0, p1, p2);
+}
+
+ACTION_TEMPLATE(ReturnNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_4_VALUE_PARAMS(p0, p1, p2, p3)) {
+  return new T(p0, p1, p2, p3);
+}
+
+ACTION_TEMPLATE(ReturnNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)) {
+  return new T(p0, p1, p2, p3, p4);
+}
+
+ACTION_TEMPLATE(ReturnNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)) {
+  return new T(p0, p1, p2, p3, p4, p5);
+}
+
+ACTION_TEMPLATE(ReturnNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)) {
+  return new T(p0, p1, p2, p3, p4, p5, p6);
+}
+
+ACTION_TEMPLATE(ReturnNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)) {
+  return new T(p0, p1, p2, p3, p4, p5, p6, p7);
+}
+
+ACTION_TEMPLATE(ReturnNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8)) {
+  return new T(p0, p1, p2, p3, p4, p5, p6, p7, p8);
+}
+
+ACTION_TEMPLATE(ReturnNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) {
+  return new T(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+}
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+}  // namespace testing
+
+// Include any custom actions added by the local installation.
+// We must include this header at the end to make sure it can use the
+// declarations from this file.
+#include "gmock/internal/custom/gmock-generated-actions.h"
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-actions.h.pump b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-actions.h.pump
new file mode 100644
index 0000000000..66d9f9d551
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-actions.h.pump
@@ -0,0 +1,794 @@
+$$ -*- mode: c++; -*-
+$$ This is a Pump source file.  Please use Pump to convert it to
+$$ gmock-generated-actions.h.
+$$
+$var n = 10  $$ The maximum arity we support.
+$$}} This meta comment fixes auto-indentation in editors.
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some commonly used variadic actions.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
+
+#include "gmock/gmock-actions.h"
+#include "gmock/internal/gmock-port.h"
+
+namespace testing {
+namespace internal {
+
+// InvokeHelper<F> knows how to unpack an N-tuple and invoke an N-ary
+// function or method with the unpacked values, where F is a function
+// type that takes N arguments.
+template <typename Result, typename ArgumentTuple>
+class InvokeHelper;
+
+
+$range i 0..n
+$for i [[
+$range j 1..i
+$var types = [[$for j [[, typename A$j]]]]
+$var as = [[$for j, [[A$j]]]]
+$var args = [[$if i==0 [[]] $else [[ args]]]]
+$var gets = [[$for j, [[get<$(j - 1)>(args)]]]]
+template <typename R$types>
+class InvokeHelper<R, ::testing::tuple<$as> > {
+ public:
+  template <typename Function>
+  static R Invoke(Function function, const ::testing::tuple<$as>&$args) {
+           return function($gets);
+  }
+
+  template <class Class, typename MethodPtr>
+  static R InvokeMethod(Class* obj_ptr,
+                        MethodPtr method_ptr,
+                        const ::testing::tuple<$as>&$args) {
+           return (obj_ptr->*method_ptr)($gets);
+  }
+};
+
+
+]]
+// An INTERNAL macro for extracting the type of a tuple field.  It's
+// subject to change without notice - DO NOT USE IN USER CODE!
+#define GMOCK_FIELD_(Tuple, N) \
+    typename ::testing::tuple_element<N, Tuple>::type
+
+$range i 1..n
+
+// SelectArgs<Result, ArgumentTuple, k1, k2, ..., k_n>::type is the
+// type of an n-ary function whose i-th (1-based) argument type is the
+// k{i}-th (0-based) field of ArgumentTuple, which must be a tuple
+// type, and whose return type is Result.  For example,
+//   SelectArgs<int, ::testing::tuple<bool, char, double, long>, 0, 3>::type
+// is int(bool, long).
+//
+// SelectArgs<Result, ArgumentTuple, k1, k2, ..., k_n>::Select(args)
+// returns the selected fields (k1, k2, ..., k_n) of args as a tuple.
+// For example,
+//   SelectArgs<int, tuple<bool, char, double>, 2, 0>::Select(
+//       ::testing::make_tuple(true, 'a', 2.5))
+// returns tuple (2.5, true).
+//
+// The numbers in list k1, k2, ..., k_n must be >= 0, where n can be
+// in the range [0, $n].  Duplicates are allowed and they don't have
+// to be in an ascending or descending order.
+
+template <typename Result, typename ArgumentTuple, $for i, [[int k$i]]>
+class SelectArgs {
+ public:
+  typedef Result type($for i, [[GMOCK_FIELD_(ArgumentTuple, k$i)]]);
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& args) {
+    return SelectedArgs($for i, [[get<k$i>(args)]]);
+  }
+};
+
+
+$for i [[
+$range j 1..n
+$range j1 1..i-1
+template <typename Result, typename ArgumentTuple$for j1[[, int k$j1]]>
+class SelectArgs<Result, ArgumentTuple,
+                 $for j, [[$if j <= i-1 [[k$j]] $else [[-1]]]]> {
+ public:
+  typedef Result type($for j1, [[GMOCK_FIELD_(ArgumentTuple, k$j1)]]);
+  typedef typename Function<type>::ArgumentTuple SelectedArgs;
+  static SelectedArgs Select(const ArgumentTuple& [[]]
+$if i == 1 [[/* args */]] $else [[args]]) {
+    return SelectedArgs($for j1, [[get<k$j1>(args)]]);
+  }
+};
+
+
+]]
+#undef GMOCK_FIELD_
+
+$var ks = [[$for i, [[k$i]]]]
+
+// Implements the WithArgs action.
+template <typename InnerAction, $for i, [[int k$i = -1]]>
+class WithArgsAction {
+ public:
+  explicit WithArgsAction(const InnerAction& action) : action_(action) {}
+
+  template <typename F>
+  operator Action<F>() const { return MakeAction(new Impl<F>(action_)); }
+
+ private:
+  template <typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(const InnerAction& action) : action_(action) {}
+
+    virtual Result Perform(const ArgumentTuple& args) {
+      return action_.Perform(SelectArgs<Result, ArgumentTuple, $ks>::Select(args));
+    }
+
+   private:
+    typedef typename SelectArgs<Result, ArgumentTuple,
+        $ks>::type InnerFunctionType;
+
+    Action<InnerFunctionType> action_;
+  };
+
+  const InnerAction action_;
+
+  GTEST_DISALLOW_ASSIGN_(WithArgsAction);
+};
+
+// A macro from the ACTION* family (defined later in this file)
+// defines an action that can be used in a mock function.  Typically,
+// these actions only care about a subset of the arguments of the mock
+// function.  For example, if such an action only uses the second
+// argument, it can be used in any mock function that takes >= 2
+// arguments where the type of the second argument is compatible.
+//
+// Therefore, the action implementation must be prepared to take more
+// arguments than it needs.  The ExcessiveArg type is used to
+// represent those excessive arguments.  In order to keep the compiler
+// error messages tractable, we define it in the testing namespace
+// instead of testing::internal.  However, this is an INTERNAL TYPE
+// and subject to change without notice, so a user MUST NOT USE THIS
+// TYPE DIRECTLY.
+struct ExcessiveArg {};
+
+// A helper class needed for implementing the ACTION* macros.
+template <typename Result, class Impl>
+class ActionHelper {
+ public:
+$range i 0..n
+$for i
+
+[[
+$var template = [[$if i==0 [[]] $else [[
+$range j 0..i-1
+  template <$for j, [[typename A$j]]>
+]]]]
+$range j 0..i-1
+$var As = [[$for j, [[A$j]]]]
+$var as = [[$for j, [[get<$j>(args)]]]]
+$range k 1..n-i
+$var eas = [[$for k, [[ExcessiveArg()]]]]
+$var arg_list = [[$if (i==0) | (i==n) [[$as$eas]] $else [[$as, $eas]]]]
+$template
+  static Result Perform(Impl* impl, const ::testing::tuple<$As>& args) {
+    return impl->template gmock_PerformImpl<$As>(args, $arg_list);
+  }
+
+]]
+};
+
+}  // namespace internal
+
+// Various overloads for Invoke().
+
+// WithArgs<N1, N2, ..., Nk>(an_action) creates an action that passes
+// the selected arguments of the mock function to an_action and
+// performs it.  It serves as an adaptor between actions with
+// different argument lists.  C++ doesn't support default arguments for
+// function templates, so we have to overload it.
+
+$range i 1..n
+$for i [[
+$range j 1..i
+template <$for j [[int k$j, ]]typename InnerAction>
+inline internal::WithArgsAction<InnerAction$for j [[, k$j]]>
+WithArgs(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction$for j [[, k$j]]>(action);
+}
+
+
+]]
+// Creates an action that does actions a1, a2, ..., sequentially in
+// each invocation.
+$range i 2..n
+$for i [[
+$range j 2..i
+$var types = [[$for j, [[typename Action$j]]]]
+$var Aas = [[$for j [[, Action$j a$j]]]]
+
+template <typename Action1, $types>
+$range k 1..i-1
+
+inline $for k [[internal::DoBothAction<Action$k, ]]Action$i$for k  [[>]]
+
+DoAll(Action1 a1$Aas) {
+$if i==2 [[
+
+  return internal::DoBothAction<Action1, Action2>(a1, a2);
+]] $else [[
+$range j2 2..i
+
+  return DoAll(a1, DoAll($for j2, [[a$j2]]));
+]]
+
+}
+
+]]
+
+}  // namespace testing
+
+// The ACTION* family of macros can be used in a namespace scope to
+// define custom actions easily.  The syntax:
+//
+//   ACTION(name) { statements; }
+//
+// will define an action with the given name that executes the
+// statements.  The value returned by the statements will be used as
+// the return value of the action.  Inside the statements, you can
+// refer to the K-th (0-based) argument of the mock function by
+// 'argK', and refer to its type by 'argK_type'.  For example:
+//
+//   ACTION(IncrementArg1) {
+//     arg1_type temp = arg1;
+//     return ++(*temp);
+//   }
+//
+// allows you to write
+//
+//   ...WillOnce(IncrementArg1());
+//
+// You can also refer to the entire argument tuple and its type by
+// 'args' and 'args_type', and refer to the mock function type and its
+// return type by 'function_type' and 'return_type'.
+//
+// Note that you don't need to specify the types of the mock function
+// arguments.  However rest assured that your code is still type-safe:
+// you'll get a compiler error if *arg1 doesn't support the ++
+// operator, or if the type of ++(*arg1) isn't compatible with the
+// mock function's return type, for example.
+//
+// Sometimes you'll want to parameterize the action.   For that you can use
+// another macro:
+//
+//   ACTION_P(name, param_name) { statements; }
+//
+// For example:
+//
+//   ACTION_P(Add, n) { return arg0 + n; }
+//
+// will allow you to write:
+//
+//   ...WillOnce(Add(5));
+//
+// Note that you don't need to provide the type of the parameter
+// either.  If you need to reference the type of a parameter named
+// 'foo', you can write 'foo_type'.  For example, in the body of
+// ACTION_P(Add, n) above, you can write 'n_type' to refer to the type
+// of 'n'.
+//
+// We also provide ACTION_P2, ACTION_P3, ..., up to ACTION_P$n to support
+// multi-parameter actions.
+//
+// For the purpose of typing, you can view
+//
+//   ACTION_Pk(Foo, p1, ..., pk) { ... }
+//
+// as shorthand for
+//
+//   template <typename p1_type, ..., typename pk_type>
+//   FooActionPk<p1_type, ..., pk_type> Foo(p1_type p1, ..., pk_type pk) { ... }
+//
+// In particular, you can provide the template type arguments
+// explicitly when invoking Foo(), as in Foo<long, bool>(5, false);
+// although usually you can rely on the compiler to infer the types
+// for you automatically.  You can assign the result of expression
+// Foo(p1, ..., pk) to a variable of type FooActionPk<p1_type, ...,
+// pk_type>.  This can be useful when composing actions.
+//
+// You can also overload actions with different numbers of parameters:
+//
+//   ACTION_P(Plus, a) { ... }
+//   ACTION_P2(Plus, a, b) { ... }
+//
+// While it's tempting to always use the ACTION* macros when defining
+// a new action, you should also consider implementing ActionInterface
+// or using MakePolymorphicAction() instead, especially if you need to
+// use the action a lot.  While these approaches require more work,
+// they give you more control on the types of the mock function
+// arguments and the action parameters, which in general leads to
+// better compiler error messages that pay off in the long run.  They
+// also allow overloading actions based on parameter types (as opposed
+// to just based on the number of parameters).
+//
+// CAVEAT:
+//
+// ACTION*() can only be used in a namespace scope.  The reason is
+// that C++ doesn't yet allow function-local types to be used to
+// instantiate templates.  The up-coming C++0x standard will fix this.
+// Once that's done, we'll consider supporting using ACTION*() inside
+// a function.
+//
+// MORE INFORMATION:
+//
+// To learn more about using these macros, please search for 'ACTION'
+// on http://code.google.com/p/googlemock/wiki/CookBook.
+
+$range i 0..n
+$range k 0..n-1
+
+// An internal macro needed for implementing ACTION*().
+#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_\
+    const args_type& args GTEST_ATTRIBUTE_UNUSED_
+$for k [[, \
+    arg$k[[]]_type arg$k GTEST_ATTRIBUTE_UNUSED_]]
+
+
+// Sometimes you want to give an action explicit template parameters
+// that cannot be inferred from its value parameters.  ACTION() and
+// ACTION_P*() don't support that.  ACTION_TEMPLATE() remedies that
+// and can be viewed as an extension to ACTION() and ACTION_P*().
+//
+// The syntax:
+//
+//   ACTION_TEMPLATE(ActionName,
+//                   HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m),
+//                   AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; }
+//
+// defines an action template that takes m explicit template
+// parameters and n value parameters.  name_i is the name of the i-th
+// template parameter, and kind_i specifies whether it's a typename,
+// an integral constant, or a template.  p_i is the name of the i-th
+// value parameter.
+//
+// Example:
+//
+//   // DuplicateArg<k, T>(output) converts the k-th argument of the mock
+//   // function to type T and copies it to *output.
+//   ACTION_TEMPLATE(DuplicateArg,
+//                   HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
+//                   AND_1_VALUE_PARAMS(output)) {
+//     *output = T(::testing::get<k>(args));
+//   }
+//   ...
+//     int n;
+//     EXPECT_CALL(mock, Foo(_, _))
+//         .WillOnce(DuplicateArg<1, unsigned char>(&n));
+//
+// To create an instance of an action template, write:
+//
+//   ActionName<t1, ..., t_m>(v1, ..., v_n)
+//
+// where the ts are the template arguments and the vs are the value
+// arguments.  The value argument types are inferred by the compiler.
+// If you want to explicitly specify the value argument types, you can
+// provide additional template arguments:
+//
+//   ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
+//
+// where u_i is the desired type of v_i.
+//
+// ACTION_TEMPLATE and ACTION/ACTION_P* can be overloaded on the
+// number of value parameters, but not on the number of template
+// parameters.  Without the restriction, the meaning of the following
+// is unclear:
+//
+//   OverloadedAction<int, bool>(x);
+//
+// Are we using a single-template-parameter action where 'bool' refers
+// to the type of x, or are we using a two-template-parameter action
+// where the compiler is asked to infer the type of x?
+//
+// Implementation notes:
+//
+// GMOCK_INTERNAL_*_HAS_m_TEMPLATE_PARAMS and
+// GMOCK_INTERNAL_*_AND_n_VALUE_PARAMS are internal macros for
+// implementing ACTION_TEMPLATE.  The main trick we use is to create
+// new macro invocations when expanding a macro.  For example, we have
+//
+//   #define ACTION_TEMPLATE(name, template_params, value_params)
+//       ... GMOCK_INTERNAL_DECL_##template_params ...
+//
+// which causes ACTION_TEMPLATE(..., HAS_1_TEMPLATE_PARAMS(typename, T), ...)
+// to expand to
+//
+//       ... GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(typename, T) ...
+//
+// Since GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS is a macro, the
+// preprocessor will continue to expand it to
+//
+//       ... typename T ...
+//
+// This technique conforms to the C++ standard and is portable.  It
+// allows us to implement action templates using O(N) code, where N is
+// the maximum number of template/value parameters supported.  Without
+// using it, we'd have to devote O(N^2) amount of code to implement all
+// combinations of m and n.
+
+// Declares the template parameters.
+
+$range j 1..n
+$for j [[
+$range m 0..j-1
+#define GMOCK_INTERNAL_DECL_HAS_$j[[]]
+_TEMPLATE_PARAMS($for m, [[kind$m, name$m]]) $for m, [[kind$m name$m]]
+
+
+]]
+
+// Lists the template parameters.
+
+$for j [[
+$range m 0..j-1
+#define GMOCK_INTERNAL_LIST_HAS_$j[[]]
+_TEMPLATE_PARAMS($for m, [[kind$m, name$m]]) $for m, [[name$m]]
+
+
+]]
+
+// Declares the types of value parameters.
+
+$for i [[
+$range j 0..i-1
+#define GMOCK_INTERNAL_DECL_TYPE_AND_$i[[]]
+_VALUE_PARAMS($for j, [[p$j]]) $for j [[, typename p$j##_type]]
+
+
+]]
+
+// Initializes the value parameters.
+
+$for i [[
+$range j 0..i-1
+#define GMOCK_INTERNAL_INIT_AND_$i[[]]_VALUE_PARAMS($for j, [[p$j]])\
+    ($for j, [[p$j##_type gmock_p$j]])$if i>0 [[ : ]]$for j, [[p$j(gmock_p$j)]]
+
+
+]]
+
+// Declares the fields for storing the value parameters.
+
+$for i [[
+$range j 0..i-1
+#define GMOCK_INTERNAL_DEFN_AND_$i[[]]
+_VALUE_PARAMS($for j, [[p$j]]) $for j [[p$j##_type p$j; ]]
+
+
+]]
+
+// Lists the value parameters.
+
+$for i [[
+$range j 0..i-1
+#define GMOCK_INTERNAL_LIST_AND_$i[[]]
+_VALUE_PARAMS($for j, [[p$j]]) $for j, [[p$j]]
+
+
+]]
+
+// Lists the value parameter types.
+
+$for i [[
+$range j 0..i-1
+#define GMOCK_INTERNAL_LIST_TYPE_AND_$i[[]]
+_VALUE_PARAMS($for j, [[p$j]]) $for j [[, p$j##_type]]
+
+
+]]
+
+// Declares the value parameters.
+
+$for i [[
+$range j 0..i-1
+#define GMOCK_INTERNAL_DECL_AND_$i[[]]_VALUE_PARAMS($for j, [[p$j]]) [[]]
+$for j, [[p$j##_type p$j]]
+
+
+]]
+
+// The suffix of the class template implementing the action template.
+$for i [[
+
+
+$range j 0..i-1
+#define GMOCK_INTERNAL_COUNT_AND_$i[[]]_VALUE_PARAMS($for j, [[p$j]]) [[]]
+$if i==1 [[P]] $elif i>=2 [[P$i]]
+]]
+
+
+// The name of the class template implementing the action template.
+#define GMOCK_ACTION_CLASS_(name, value_params)\
+    GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
+
+$range k 0..n-1
+
+#define ACTION_TEMPLATE(name, template_params, value_params)\
+  template <GMOCK_INTERNAL_DECL_##template_params\
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
+  class GMOCK_ACTION_CLASS_(name, value_params) {\
+   public:\
+    explicit GMOCK_ACTION_CLASS_(name, value_params)\
+        GMOCK_INTERNAL_INIT_##value_params {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      explicit gmock_Impl GMOCK_INTERNAL_INIT_##value_params {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <$for k, [[typename arg$k[[]]_type]]>\
+      return_type gmock_PerformImpl(const args_type& args[[]]
+$for k [[, arg$k[[]]_type arg$k]]) const;\
+      GMOCK_INTERNAL_DEFN_##value_params\
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(\
+          new gmock_Impl<F>(GMOCK_INTERNAL_LIST_##value_params));\
+    }\
+    GMOCK_INTERNAL_DEFN_##value_params\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(GMOCK_ACTION_CLASS_(name, value_params));\
+  };\
+  template <GMOCK_INTERNAL_DECL_##template_params\
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
+  inline GMOCK_ACTION_CLASS_(name, value_params)<\
+      GMOCK_INTERNAL_LIST_##template_params\
+      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(\
+          GMOCK_INTERNAL_DECL_##value_params) {\
+    return GMOCK_ACTION_CLASS_(name, value_params)<\
+        GMOCK_INTERNAL_LIST_##template_params\
+        GMOCK_INTERNAL_LIST_TYPE_##value_params>(\
+            GMOCK_INTERNAL_LIST_##value_params);\
+  }\
+  template <GMOCK_INTERNAL_DECL_##template_params\
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>\
+  template <typename F>\
+  template <typename arg0_type, typename arg1_type, typename arg2_type, \
+      typename arg3_type, typename arg4_type, typename arg5_type, \
+      typename arg6_type, typename arg7_type, typename arg8_type, \
+      typename arg9_type>\
+  typename ::testing::internal::Function<F>::Result\
+      GMOCK_ACTION_CLASS_(name, value_params)<\
+          GMOCK_INTERNAL_LIST_##template_params\
+          GMOCK_INTERNAL_LIST_TYPE_##value_params>::gmock_Impl<F>::\
+              gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+
+$for i
+
+[[
+$var template = [[$if i==0 [[]] $else [[
+$range j 0..i-1
+
+  template <$for j, [[typename p$j##_type]]>\
+]]]]
+$var class_name = [[name##Action[[$if i==0 [[]] $elif i==1 [[P]]
+                                                $else [[P$i]]]]]]
+$range j 0..i-1
+$var ctor_param_list = [[$for j, [[p$j##_type gmock_p$j]]]]
+$var param_types_and_names = [[$for j, [[p$j##_type p$j]]]]
+$var inits = [[$if i==0 [[]] $else [[ : $for j, [[p$j(gmock_p$j)]]]]]]
+$var param_field_decls = [[$for j
+[[
+
+      p$j##_type p$j;\
+]]]]
+$var param_field_decls2 = [[$for j
+[[
+
+    p$j##_type p$j;\
+]]]]
+$var params = [[$for j, [[p$j]]]]
+$var param_types = [[$if i==0 [[]] $else [[<$for j, [[p$j##_type]]>]]]]
+$var typename_arg_types = [[$for k, [[typename arg$k[[]]_type]]]]
+$var arg_types_and_names = [[$for k, [[arg$k[[]]_type arg$k]]]]
+$var macro_name = [[$if i==0 [[ACTION]] $elif i==1 [[ACTION_P]]
+                                        $else [[ACTION_P$i]]]]
+
+#define $macro_name(name$for j [[, p$j]])\$template
+  class $class_name {\
+   public:\
+    [[$if i==1 [[explicit ]]]]$class_name($ctor_param_list)$inits {}\
+    template <typename F>\
+    class gmock_Impl : public ::testing::ActionInterface<F> {\
+     public:\
+      typedef F function_type;\
+      typedef typename ::testing::internal::Function<F>::Result return_type;\
+      typedef typename ::testing::internal::Function<F>::ArgumentTuple\
+          args_type;\
+      [[$if i==1 [[explicit ]]]]gmock_Impl($ctor_param_list)$inits {}\
+      virtual return_type Perform(const args_type& args) {\
+        return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\
+            Perform(this, args);\
+      }\
+      template <$typename_arg_types>\
+      return_type gmock_PerformImpl(const args_type& args, [[]]
+$arg_types_and_names) const;\$param_field_decls
+     private:\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename F> operator ::testing::Action<F>() const {\
+      return ::testing::Action<F>(new gmock_Impl<F>($params));\
+    }\$param_field_decls2
+   private:\
+    GTEST_DISALLOW_ASSIGN_($class_name);\
+  };\$template
+  inline $class_name$param_types name($param_types_and_names) {\
+    return $class_name$param_types($params);\
+  }\$template
+  template <typename F>\
+  template <$typename_arg_types>\
+  typename ::testing::internal::Function<F>::Result\
+      $class_name$param_types::gmock_Impl<F>::gmock_PerformImpl(\
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
+]]
+$$ }  // This meta comment fixes auto-indentation in Emacs.  It won't
+$$    // show up in the generated code.
+
+
+namespace testing {
+
+
+// The ACTION*() macros trigger warning C4100 (unreferenced formal
+// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
+// the macro definition, as the warnings are generated when the macro
+// is expanded and macro expansion cannot contain #pragma.  Therefore
+// we suppress them here.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#endif
+
+// Various overloads for InvokeArgument<N>().
+//
+// The InvokeArgument<N>(a1, a2, ..., a_k) action invokes the N-th
+// (0-based) argument, which must be a k-ary callable, of the mock
+// function, with arguments a1, a2, ..., a_k.
+//
+// Notes:
+//
+//   1. The arguments are passed by value by default.  If you need to
+//   pass an argument by reference, wrap it inside ByRef().  For
+//   example,
+//
+//     InvokeArgument<1>(5, string("Hello"), ByRef(foo))
+//
+//   passes 5 and string("Hello") by value, and passes foo by
+//   reference.
+//
+//   2. If the callable takes an argument by reference but ByRef() is
+//   not used, it will receive the reference to a copy of the value,
+//   instead of the original value.  For example, when the 0-th
+//   argument of the mock function takes a const string&, the action
+//
+//     InvokeArgument<0>(string("Hello"))
+//
+//   makes a copy of the temporary string("Hello") object and passes a
+//   reference of the copy, instead of the original temporary object,
+//   to the callable.  This makes it easy for a user to define an
+//   InvokeArgument action from temporary values and have it performed
+//   later.
+
+namespace internal {
+namespace invoke_argument {
+
+// Appears in InvokeArgumentAdl's argument list to help avoid
+// accidental calls to user functions of the same name.
+struct AdlTag {};
+
+// InvokeArgumentAdl - a helper for InvokeArgument.
+// The basic overloads are provided here for generic functors.
+// Overloads for other custom-callables are provided in the
+// internal/custom/callback-actions.h header.
+
+$range i 0..n
+$for i
+[[
+$range j 1..i
+
+template <typename R, typename F[[$for j [[, typename A$j]]]]>
+R InvokeArgumentAdl(AdlTag, F f[[$for j [[, A$j a$j]]]]) {
+  return f([[$for j, [[a$j]]]]);
+}
+]]
+
+}  // namespace invoke_argument
+}  // namespace internal
+
+$range i 0..n
+$for i [[
+$range j 0..i-1
+
+ACTION_TEMPLATE(InvokeArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_$i[[]]_VALUE_PARAMS($for j, [[p$j]])) {
+  using internal::invoke_argument::InvokeArgumentAdl;
+  return InvokeArgumentAdl<return_type>(
+      internal::invoke_argument::AdlTag(),
+      ::testing::get<k>(args)$for j [[, p$j]]);
+}
+
+]]
+
+// Various overloads for ReturnNew<T>().
+//
+// The ReturnNew<T>(a1, a2, ..., a_k) action returns a pointer to a new
+// instance of type T, constructed on the heap with constructor arguments
+// a1, a2, ..., and a_k. The caller assumes ownership of the returned value.
+$range i 0..n
+$for i [[
+$range j 0..i-1
+$var ps = [[$for j, [[p$j]]]]
+
+ACTION_TEMPLATE(ReturnNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_$i[[]]_VALUE_PARAMS($ps)) {
+  return new T($ps);
+}
+
+]]
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+}  // namespace testing
+
+// Include any custom callback actions added by the local installation.
+// We must include this header at the end to make sure it can use the
+// declarations from this file.
+#include "gmock/internal/custom/gmock-generated-actions.h"
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-function-mockers.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-function-mockers.h
new file mode 100644
index 0000000000..4fa5ca9484
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-function-mockers.h
@@ -0,0 +1,1095 @@
+// This file was GENERATED by command:
+//     pump.py gmock-generated-function-mockers.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements function mockers of various arities.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
+
+#include "gmock/gmock-spec-builders.h"
+#include "gmock/internal/gmock-internal-utils.h"
+
+#if GTEST_HAS_STD_FUNCTION_
+# include <functional>
+#endif
+
+namespace testing {
+namespace internal {
+
+template <typename F>
+class FunctionMockerBase;
+
+// Note: class FunctionMocker really belongs to the ::testing
+// namespace.  However if we define it in ::testing, MSVC will
+// complain when classes in ::testing::internal declare it as a
+// friend class template.  To workaround this compiler bug, we define
+// FunctionMocker in ::testing::internal and import it into ::testing.
+template <typename F>
+class FunctionMocker;
+
+template <typename R>
+class FunctionMocker<R()> : public
+    internal::FunctionMockerBase<R()> {
+ public:
+  typedef R F();
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  MockSpec<F>& With() {
+    return this->current_spec();
+  }
+
+  R Invoke() {
+    // Even though gcc and MSVC don't enforce it, 'this->' is required
+    // by the C++ standard [14.6.4] here, as the base class type is
+    // dependent on the template argument (and thus shouldn't be
+    // looked into when resolving InvokeWith).
+    return this->InvokeWith(ArgumentTuple());
+  }
+};
+
+template <typename R, typename A1>
+class FunctionMocker<R(A1)> : public
+    internal::FunctionMockerBase<R(A1)> {
+ public:
+  typedef R F(A1);
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  MockSpec<F>& With(const Matcher<A1>& m1) {
+    this->current_spec().SetMatchers(::testing::make_tuple(m1));
+    return this->current_spec();
+  }
+
+  R Invoke(A1 a1) {
+    // Even though gcc and MSVC don't enforce it, 'this->' is required
+    // by the C++ standard [14.6.4] here, as the base class type is
+    // dependent on the template argument (and thus shouldn't be
+    // looked into when resolving InvokeWith).
+    return this->InvokeWith(ArgumentTuple(a1));
+  }
+};
+
+template <typename R, typename A1, typename A2>
+class FunctionMocker<R(A1, A2)> : public
+    internal::FunctionMockerBase<R(A1, A2)> {
+ public:
+  typedef R F(A1, A2);
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  MockSpec<F>& With(const Matcher<A1>& m1, const Matcher<A2>& m2) {
+    this->current_spec().SetMatchers(::testing::make_tuple(m1, m2));
+    return this->current_spec();
+  }
+
+  R Invoke(A1 a1, A2 a2) {
+    // Even though gcc and MSVC don't enforce it, 'this->' is required
+    // by the C++ standard [14.6.4] here, as the base class type is
+    // dependent on the template argument (and thus shouldn't be
+    // looked into when resolving InvokeWith).
+    return this->InvokeWith(ArgumentTuple(a1, a2));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3>
+class FunctionMocker<R(A1, A2, A3)> : public
+    internal::FunctionMockerBase<R(A1, A2, A3)> {
+ public:
+  typedef R F(A1, A2, A3);
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  MockSpec<F>& With(const Matcher<A1>& m1, const Matcher<A2>& m2,
+      const Matcher<A3>& m3) {
+    this->current_spec().SetMatchers(::testing::make_tuple(m1, m2, m3));
+    return this->current_spec();
+  }
+
+  R Invoke(A1 a1, A2 a2, A3 a3) {
+    // Even though gcc and MSVC don't enforce it, 'this->' is required
+    // by the C++ standard [14.6.4] here, as the base class type is
+    // dependent on the template argument (and thus shouldn't be
+    // looked into when resolving InvokeWith).
+    return this->InvokeWith(ArgumentTuple(a1, a2, a3));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4>
+class FunctionMocker<R(A1, A2, A3, A4)> : public
+    internal::FunctionMockerBase<R(A1, A2, A3, A4)> {
+ public:
+  typedef R F(A1, A2, A3, A4);
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  MockSpec<F>& With(const Matcher<A1>& m1, const Matcher<A2>& m2,
+      const Matcher<A3>& m3, const Matcher<A4>& m4) {
+    this->current_spec().SetMatchers(::testing::make_tuple(m1, m2, m3, m4));
+    return this->current_spec();
+  }
+
+  R Invoke(A1 a1, A2 a2, A3 a3, A4 a4) {
+    // Even though gcc and MSVC don't enforce it, 'this->' is required
+    // by the C++ standard [14.6.4] here, as the base class type is
+    // dependent on the template argument (and thus shouldn't be
+    // looked into when resolving InvokeWith).
+    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5>
+class FunctionMocker<R(A1, A2, A3, A4, A5)> : public
+    internal::FunctionMockerBase<R(A1, A2, A3, A4, A5)> {
+ public:
+  typedef R F(A1, A2, A3, A4, A5);
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  MockSpec<F>& With(const Matcher<A1>& m1, const Matcher<A2>& m2,
+      const Matcher<A3>& m3, const Matcher<A4>& m4, const Matcher<A5>& m5) {
+    this->current_spec().SetMatchers(::testing::make_tuple(m1, m2, m3, m4, m5));
+    return this->current_spec();
+  }
+
+  R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) {
+    // Even though gcc and MSVC don't enforce it, 'this->' is required
+    // by the C++ standard [14.6.4] here, as the base class type is
+    // dependent on the template argument (and thus shouldn't be
+    // looked into when resolving InvokeWith).
+    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6>
+class FunctionMocker<R(A1, A2, A3, A4, A5, A6)> : public
+    internal::FunctionMockerBase<R(A1, A2, A3, A4, A5, A6)> {
+ public:
+  typedef R F(A1, A2, A3, A4, A5, A6);
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  MockSpec<F>& With(const Matcher<A1>& m1, const Matcher<A2>& m2,
+      const Matcher<A3>& m3, const Matcher<A4>& m4, const Matcher<A5>& m5,
+      const Matcher<A6>& m6) {
+    this->current_spec().SetMatchers(::testing::make_tuple(m1, m2, m3, m4, m5,
+        m6));
+    return this->current_spec();
+  }
+
+  R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) {
+    // Even though gcc and MSVC don't enforce it, 'this->' is required
+    // by the C++ standard [14.6.4] here, as the base class type is
+    // dependent on the template argument (and thus shouldn't be
+    // looked into when resolving InvokeWith).
+    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6, typename A7>
+class FunctionMocker<R(A1, A2, A3, A4, A5, A6, A7)> : public
+    internal::FunctionMockerBase<R(A1, A2, A3, A4, A5, A6, A7)> {
+ public:
+  typedef R F(A1, A2, A3, A4, A5, A6, A7);
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  MockSpec<F>& With(const Matcher<A1>& m1, const Matcher<A2>& m2,
+      const Matcher<A3>& m3, const Matcher<A4>& m4, const Matcher<A5>& m5,
+      const Matcher<A6>& m6, const Matcher<A7>& m7) {
+    this->current_spec().SetMatchers(::testing::make_tuple(m1, m2, m3, m4, m5,
+        m6, m7));
+    return this->current_spec();
+  }
+
+  R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) {
+    // Even though gcc and MSVC don't enforce it, 'this->' is required
+    // by the C++ standard [14.6.4] here, as the base class type is
+    // dependent on the template argument (and thus shouldn't be
+    // looked into when resolving InvokeWith).
+    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6, typename A7, typename A8>
+class FunctionMocker<R(A1, A2, A3, A4, A5, A6, A7, A8)> : public
+    internal::FunctionMockerBase<R(A1, A2, A3, A4, A5, A6, A7, A8)> {
+ public:
+  typedef R F(A1, A2, A3, A4, A5, A6, A7, A8);
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  MockSpec<F>& With(const Matcher<A1>& m1, const Matcher<A2>& m2,
+      const Matcher<A3>& m3, const Matcher<A4>& m4, const Matcher<A5>& m5,
+      const Matcher<A6>& m6, const Matcher<A7>& m7, const Matcher<A8>& m8) {
+    this->current_spec().SetMatchers(::testing::make_tuple(m1, m2, m3, m4, m5,
+        m6, m7, m8));
+    return this->current_spec();
+  }
+
+  R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) {
+    // Even though gcc and MSVC don't enforce it, 'this->' is required
+    // by the C++ standard [14.6.4] here, as the base class type is
+    // dependent on the template argument (and thus shouldn't be
+    // looked into when resolving InvokeWith).
+    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6, typename A7, typename A8, typename A9>
+class FunctionMocker<R(A1, A2, A3, A4, A5, A6, A7, A8, A9)> : public
+    internal::FunctionMockerBase<R(A1, A2, A3, A4, A5, A6, A7, A8, A9)> {
+ public:
+  typedef R F(A1, A2, A3, A4, A5, A6, A7, A8, A9);
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  MockSpec<F>& With(const Matcher<A1>& m1, const Matcher<A2>& m2,
+      const Matcher<A3>& m3, const Matcher<A4>& m4, const Matcher<A5>& m5,
+      const Matcher<A6>& m6, const Matcher<A7>& m7, const Matcher<A8>& m8,
+      const Matcher<A9>& m9) {
+    this->current_spec().SetMatchers(::testing::make_tuple(m1, m2, m3, m4, m5,
+        m6, m7, m8, m9));
+    return this->current_spec();
+  }
+
+  R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) {
+    // Even though gcc and MSVC don't enforce it, 'this->' is required
+    // by the C++ standard [14.6.4] here, as the base class type is
+    // dependent on the template argument (and thus shouldn't be
+    // looked into when resolving InvokeWith).
+    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8, a9));
+  }
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6, typename A7, typename A8, typename A9,
+    typename A10>
+class FunctionMocker<R(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)> : public
+    internal::FunctionMockerBase<R(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)> {
+ public:
+  typedef R F(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10);
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  MockSpec<F>& With(const Matcher<A1>& m1, const Matcher<A2>& m2,
+      const Matcher<A3>& m3, const Matcher<A4>& m4, const Matcher<A5>& m5,
+      const Matcher<A6>& m6, const Matcher<A7>& m7, const Matcher<A8>& m8,
+      const Matcher<A9>& m9, const Matcher<A10>& m10) {
+    this->current_spec().SetMatchers(::testing::make_tuple(m1, m2, m3, m4, m5,
+        m6, m7, m8, m9, m10));
+    return this->current_spec();
+  }
+
+  R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9,
+      A10 a10) {
+    // Even though gcc and MSVC don't enforce it, 'this->' is required
+    // by the C++ standard [14.6.4] here, as the base class type is
+    // dependent on the template argument (and thus shouldn't be
+    // looked into when resolving InvokeWith).
+    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8, a9,
+        a10));
+  }
+};
+
+}  // namespace internal
+
+// The style guide prohibits "using" statements in a namespace scope
+// inside a header file.  However, the FunctionMocker class template
+// is meant to be defined in the ::testing namespace.  The following
+// line is just a trick for working around a bug in MSVC 8.0, which
+// cannot handle it if we define FunctionMocker in ::testing.
+using internal::FunctionMocker;
+
+// GMOCK_RESULT_(tn, F) expands to the result type of function type F.
+// We define this as a variadic macro in case F contains unprotected
+// commas (the same reason that we use variadic macros in other places
+// in this file).
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_RESULT_(tn, ...) \
+    tn ::testing::internal::Function<__VA_ARGS__>::Result
+
+// The type of argument N of the given function type.
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_ARG_(tn, N, ...) \
+    tn ::testing::internal::Function<__VA_ARGS__>::Argument##N
+
+// The matcher type for argument N of the given function type.
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_MATCHER_(tn, N, ...) \
+    const ::testing::Matcher<GMOCK_ARG_(tn, N, __VA_ARGS__)>&
+
+// The variable for mocking the given method.
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_MOCKER_(arity, constness, Method) \
+    GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
+
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_METHOD0_(tn, constness, ct, Method, ...) \
+  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
+      ) constness { \
+    GTEST_COMPILE_ASSERT_((::testing::tuple_size<                          \
+        tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value \
+            == 0), \
+        this_method_does_not_take_0_arguments); \
+    GMOCK_MOCKER_(0, constness, Method).SetOwnerAndName(this, #Method); \
+    return GMOCK_MOCKER_(0, constness, Method).Invoke(); \
+  } \
+  ::testing::MockSpec<__VA_ARGS__>& \
+      gmock_##Method() constness { \
+    GMOCK_MOCKER_(0, constness, Method).RegisterOwner(this); \
+    return GMOCK_MOCKER_(0, constness, Method).With(); \
+  } \
+  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(0, constness, \
+      Method)
+
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_METHOD1_(tn, constness, ct, Method, ...) \
+  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
+      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1) constness { \
+    GTEST_COMPILE_ASSERT_((::testing::tuple_size<                          \
+        tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value \
+            == 1), \
+        this_method_does_not_take_1_argument); \
+    GMOCK_MOCKER_(1, constness, Method).SetOwnerAndName(this, #Method); \
+    return GMOCK_MOCKER_(1, constness, Method).Invoke(gmock_a1); \
+  } \
+  ::testing::MockSpec<__VA_ARGS__>& \
+      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1) constness { \
+    GMOCK_MOCKER_(1, constness, Method).RegisterOwner(this); \
+    return GMOCK_MOCKER_(1, constness, Method).With(gmock_a1); \
+  } \
+  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(1, constness, \
+      Method)
+
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_METHOD2_(tn, constness, ct, Method, ...) \
+  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
+      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, \
+      GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2) constness { \
+    GTEST_COMPILE_ASSERT_((::testing::tuple_size<                          \
+        tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value \
+            == 2), \
+        this_method_does_not_take_2_arguments); \
+    GMOCK_MOCKER_(2, constness, Method).SetOwnerAndName(this, #Method); \
+    return GMOCK_MOCKER_(2, constness, Method).Invoke(gmock_a1, gmock_a2); \
+  } \
+  ::testing::MockSpec<__VA_ARGS__>& \
+      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
+                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2) constness { \
+    GMOCK_MOCKER_(2, constness, Method).RegisterOwner(this); \
+    return GMOCK_MOCKER_(2, constness, Method).With(gmock_a1, gmock_a2); \
+  } \
+  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(2, constness, \
+      Method)
+
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_METHOD3_(tn, constness, ct, Method, ...) \
+  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
+      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, \
+      GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2, \
+      GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3) constness { \
+    GTEST_COMPILE_ASSERT_((::testing::tuple_size<                          \
+        tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value \
+            == 3), \
+        this_method_does_not_take_3_arguments); \
+    GMOCK_MOCKER_(3, constness, Method).SetOwnerAndName(this, #Method); \
+    return GMOCK_MOCKER_(3, constness, Method).Invoke(gmock_a1, gmock_a2, \
+        gmock_a3); \
+  } \
+  ::testing::MockSpec<__VA_ARGS__>& \
+      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
+                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
+                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3) constness { \
+    GMOCK_MOCKER_(3, constness, Method).RegisterOwner(this); \
+    return GMOCK_MOCKER_(3, constness, Method).With(gmock_a1, gmock_a2, \
+        gmock_a3); \
+  } \
+  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(3, constness, \
+      Method)
+
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_METHOD4_(tn, constness, ct, Method, ...) \
+  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
+      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, \
+      GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2, \
+      GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
+      GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4) constness { \
+    GTEST_COMPILE_ASSERT_((::testing::tuple_size<                          \
+        tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value \
+            == 4), \
+        this_method_does_not_take_4_arguments); \
+    GMOCK_MOCKER_(4, constness, Method).SetOwnerAndName(this, #Method); \
+    return GMOCK_MOCKER_(4, constness, Method).Invoke(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4); \
+  } \
+  ::testing::MockSpec<__VA_ARGS__>& \
+      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
+                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
+                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
+                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4) constness { \
+    GMOCK_MOCKER_(4, constness, Method).RegisterOwner(this); \
+    return GMOCK_MOCKER_(4, constness, Method).With(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4); \
+  } \
+  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(4, constness, \
+      Method)
+
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_METHOD5_(tn, constness, ct, Method, ...) \
+  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
+      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, \
+      GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2, \
+      GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
+      GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, \
+      GMOCK_ARG_(tn, 5, __VA_ARGS__) gmock_a5) constness { \
+    GTEST_COMPILE_ASSERT_((::testing::tuple_size<                          \
+        tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value \
+            == 5), \
+        this_method_does_not_take_5_arguments); \
+    GMOCK_MOCKER_(5, constness, Method).SetOwnerAndName(this, #Method); \
+    return GMOCK_MOCKER_(5, constness, Method).Invoke(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4, gmock_a5); \
+  } \
+  ::testing::MockSpec<__VA_ARGS__>& \
+      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
+                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
+                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
+                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
+                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5) constness { \
+    GMOCK_MOCKER_(5, constness, Method).RegisterOwner(this); \
+    return GMOCK_MOCKER_(5, constness, Method).With(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4, gmock_a5); \
+  } \
+  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(5, constness, \
+      Method)
+
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_METHOD6_(tn, constness, ct, Method, ...) \
+  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
+      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, \
+      GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2, \
+      GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
+      GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, \
+      GMOCK_ARG_(tn, 5, __VA_ARGS__) gmock_a5, \
+      GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6) constness { \
+    GTEST_COMPILE_ASSERT_((::testing::tuple_size<                          \
+        tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value \
+            == 6), \
+        this_method_does_not_take_6_arguments); \
+    GMOCK_MOCKER_(6, constness, Method).SetOwnerAndName(this, #Method); \
+    return GMOCK_MOCKER_(6, constness, Method).Invoke(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4, gmock_a5, gmock_a6); \
+  } \
+  ::testing::MockSpec<__VA_ARGS__>& \
+      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
+                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
+                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
+                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
+                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
+                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6) constness { \
+    GMOCK_MOCKER_(6, constness, Method).RegisterOwner(this); \
+    return GMOCK_MOCKER_(6, constness, Method).With(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4, gmock_a5, gmock_a6); \
+  } \
+  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(6, constness, \
+      Method)
+
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_METHOD7_(tn, constness, ct, Method, ...) \
+  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
+      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, \
+      GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2, \
+      GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
+      GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, \
+      GMOCK_ARG_(tn, 5, __VA_ARGS__) gmock_a5, \
+      GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6, \
+      GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7) constness { \
+    GTEST_COMPILE_ASSERT_((::testing::tuple_size<                          \
+        tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value \
+            == 7), \
+        this_method_does_not_take_7_arguments); \
+    GMOCK_MOCKER_(7, constness, Method).SetOwnerAndName(this, #Method); \
+    return GMOCK_MOCKER_(7, constness, Method).Invoke(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7); \
+  } \
+  ::testing::MockSpec<__VA_ARGS__>& \
+      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
+                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
+                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
+                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
+                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
+                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6, \
+                     GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7) constness { \
+    GMOCK_MOCKER_(7, constness, Method).RegisterOwner(this); \
+    return GMOCK_MOCKER_(7, constness, Method).With(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7); \
+  } \
+  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(7, constness, \
+      Method)
+
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_METHOD8_(tn, constness, ct, Method, ...) \
+  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
+      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, \
+      GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2, \
+      GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
+      GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, \
+      GMOCK_ARG_(tn, 5, __VA_ARGS__) gmock_a5, \
+      GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6, \
+      GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7, \
+      GMOCK_ARG_(tn, 8, __VA_ARGS__) gmock_a8) constness { \
+    GTEST_COMPILE_ASSERT_((::testing::tuple_size<                          \
+        tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value \
+            == 8), \
+        this_method_does_not_take_8_arguments); \
+    GMOCK_MOCKER_(8, constness, Method).SetOwnerAndName(this, #Method); \
+    return GMOCK_MOCKER_(8, constness, Method).Invoke(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8); \
+  } \
+  ::testing::MockSpec<__VA_ARGS__>& \
+      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
+                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
+                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
+                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
+                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
+                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6, \
+                     GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7, \
+                     GMOCK_MATCHER_(tn, 8, __VA_ARGS__) gmock_a8) constness { \
+    GMOCK_MOCKER_(8, constness, Method).RegisterOwner(this); \
+    return GMOCK_MOCKER_(8, constness, Method).With(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8); \
+  } \
+  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(8, constness, \
+      Method)
+
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_METHOD9_(tn, constness, ct, Method, ...) \
+  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
+      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, \
+      GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2, \
+      GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
+      GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, \
+      GMOCK_ARG_(tn, 5, __VA_ARGS__) gmock_a5, \
+      GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6, \
+      GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7, \
+      GMOCK_ARG_(tn, 8, __VA_ARGS__) gmock_a8, \
+      GMOCK_ARG_(tn, 9, __VA_ARGS__) gmock_a9) constness { \
+    GTEST_COMPILE_ASSERT_((::testing::tuple_size<                          \
+        tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value \
+            == 9), \
+        this_method_does_not_take_9_arguments); \
+    GMOCK_MOCKER_(9, constness, Method).SetOwnerAndName(this, #Method); \
+    return GMOCK_MOCKER_(9, constness, Method).Invoke(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8, \
+        gmock_a9); \
+  } \
+  ::testing::MockSpec<__VA_ARGS__>& \
+      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
+                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
+                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
+                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
+                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
+                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6, \
+                     GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7, \
+                     GMOCK_MATCHER_(tn, 8, __VA_ARGS__) gmock_a8, \
+                     GMOCK_MATCHER_(tn, 9, __VA_ARGS__) gmock_a9) constness { \
+    GMOCK_MOCKER_(9, constness, Method).RegisterOwner(this); \
+    return GMOCK_MOCKER_(9, constness, Method).With(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8, \
+        gmock_a9); \
+  } \
+  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(9, constness, \
+      Method)
+
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_METHOD10_(tn, constness, ct, Method, ...) \
+  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
+      GMOCK_ARG_(tn, 1, __VA_ARGS__) gmock_a1, \
+      GMOCK_ARG_(tn, 2, __VA_ARGS__) gmock_a2, \
+      GMOCK_ARG_(tn, 3, __VA_ARGS__) gmock_a3, \
+      GMOCK_ARG_(tn, 4, __VA_ARGS__) gmock_a4, \
+      GMOCK_ARG_(tn, 5, __VA_ARGS__) gmock_a5, \
+      GMOCK_ARG_(tn, 6, __VA_ARGS__) gmock_a6, \
+      GMOCK_ARG_(tn, 7, __VA_ARGS__) gmock_a7, \
+      GMOCK_ARG_(tn, 8, __VA_ARGS__) gmock_a8, \
+      GMOCK_ARG_(tn, 9, __VA_ARGS__) gmock_a9, \
+      GMOCK_ARG_(tn, 10, __VA_ARGS__) gmock_a10) constness { \
+    GTEST_COMPILE_ASSERT_((::testing::tuple_size<                          \
+        tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value \
+            == 10), \
+        this_method_does_not_take_10_arguments); \
+    GMOCK_MOCKER_(10, constness, Method).SetOwnerAndName(this, #Method); \
+    return GMOCK_MOCKER_(10, constness, Method).Invoke(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8, gmock_a9, \
+        gmock_a10); \
+  } \
+  ::testing::MockSpec<__VA_ARGS__>& \
+      gmock_##Method(GMOCK_MATCHER_(tn, 1, __VA_ARGS__) gmock_a1, \
+                     GMOCK_MATCHER_(tn, 2, __VA_ARGS__) gmock_a2, \
+                     GMOCK_MATCHER_(tn, 3, __VA_ARGS__) gmock_a3, \
+                     GMOCK_MATCHER_(tn, 4, __VA_ARGS__) gmock_a4, \
+                     GMOCK_MATCHER_(tn, 5, __VA_ARGS__) gmock_a5, \
+                     GMOCK_MATCHER_(tn, 6, __VA_ARGS__) gmock_a6, \
+                     GMOCK_MATCHER_(tn, 7, __VA_ARGS__) gmock_a7, \
+                     GMOCK_MATCHER_(tn, 8, __VA_ARGS__) gmock_a8, \
+                     GMOCK_MATCHER_(tn, 9, __VA_ARGS__) gmock_a9, \
+                     GMOCK_MATCHER_(tn, 10, \
+                         __VA_ARGS__) gmock_a10) constness { \
+    GMOCK_MOCKER_(10, constness, Method).RegisterOwner(this); \
+    return GMOCK_MOCKER_(10, constness, Method).With(gmock_a1, gmock_a2, \
+        gmock_a3, gmock_a4, gmock_a5, gmock_a6, gmock_a7, gmock_a8, gmock_a9, \
+        gmock_a10); \
+  } \
+  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_(10, constness, \
+      Method)
+
+#define MOCK_METHOD0(m, ...) GMOCK_METHOD0_(, , , m, __VA_ARGS__)
+#define MOCK_METHOD1(m, ...) GMOCK_METHOD1_(, , , m, __VA_ARGS__)
+#define MOCK_METHOD2(m, ...) GMOCK_METHOD2_(, , , m, __VA_ARGS__)
+#define MOCK_METHOD3(m, ...) GMOCK_METHOD3_(, , , m, __VA_ARGS__)
+#define MOCK_METHOD4(m, ...) GMOCK_METHOD4_(, , , m, __VA_ARGS__)
+#define MOCK_METHOD5(m, ...) GMOCK_METHOD5_(, , , m, __VA_ARGS__)
+#define MOCK_METHOD6(m, ...) GMOCK_METHOD6_(, , , m, __VA_ARGS__)
+#define MOCK_METHOD7(m, ...) GMOCK_METHOD7_(, , , m, __VA_ARGS__)
+#define MOCK_METHOD8(m, ...) GMOCK_METHOD8_(, , , m, __VA_ARGS__)
+#define MOCK_METHOD9(m, ...) GMOCK_METHOD9_(, , , m, __VA_ARGS__)
+#define MOCK_METHOD10(m, ...) GMOCK_METHOD10_(, , , m, __VA_ARGS__)
+
+#define MOCK_CONST_METHOD0(m, ...) GMOCK_METHOD0_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD1(m, ...) GMOCK_METHOD1_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD2(m, ...) GMOCK_METHOD2_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD3(m, ...) GMOCK_METHOD3_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD4(m, ...) GMOCK_METHOD4_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD5(m, ...) GMOCK_METHOD5_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD6(m, ...) GMOCK_METHOD6_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD7(m, ...) GMOCK_METHOD7_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD8(m, ...) GMOCK_METHOD8_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD9(m, ...) GMOCK_METHOD9_(, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD10(m, ...) GMOCK_METHOD10_(, const, , m, __VA_ARGS__)
+
+#define MOCK_METHOD0_T(m, ...) GMOCK_METHOD0_(typename, , , m, __VA_ARGS__)
+#define MOCK_METHOD1_T(m, ...) GMOCK_METHOD1_(typename, , , m, __VA_ARGS__)
+#define MOCK_METHOD2_T(m, ...) GMOCK_METHOD2_(typename, , , m, __VA_ARGS__)
+#define MOCK_METHOD3_T(m, ...) GMOCK_METHOD3_(typename, , , m, __VA_ARGS__)
+#define MOCK_METHOD4_T(m, ...) GMOCK_METHOD4_(typename, , , m, __VA_ARGS__)
+#define MOCK_METHOD5_T(m, ...) GMOCK_METHOD5_(typename, , , m, __VA_ARGS__)
+#define MOCK_METHOD6_T(m, ...) GMOCK_METHOD6_(typename, , , m, __VA_ARGS__)
+#define MOCK_METHOD7_T(m, ...) GMOCK_METHOD7_(typename, , , m, __VA_ARGS__)
+#define MOCK_METHOD8_T(m, ...) GMOCK_METHOD8_(typename, , , m, __VA_ARGS__)
+#define MOCK_METHOD9_T(m, ...) GMOCK_METHOD9_(typename, , , m, __VA_ARGS__)
+#define MOCK_METHOD10_T(m, ...) GMOCK_METHOD10_(typename, , , m, __VA_ARGS__)
+
+#define MOCK_CONST_METHOD0_T(m, ...) \
+    GMOCK_METHOD0_(typename, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD1_T(m, ...) \
+    GMOCK_METHOD1_(typename, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD2_T(m, ...) \
+    GMOCK_METHOD2_(typename, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD3_T(m, ...) \
+    GMOCK_METHOD3_(typename, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD4_T(m, ...) \
+    GMOCK_METHOD4_(typename, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD5_T(m, ...) \
+    GMOCK_METHOD5_(typename, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD6_T(m, ...) \
+    GMOCK_METHOD6_(typename, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD7_T(m, ...) \
+    GMOCK_METHOD7_(typename, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD8_T(m, ...) \
+    GMOCK_METHOD8_(typename, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD9_T(m, ...) \
+    GMOCK_METHOD9_(typename, const, , m, __VA_ARGS__)
+#define MOCK_CONST_METHOD10_T(m, ...) \
+    GMOCK_METHOD10_(typename, const, , m, __VA_ARGS__)
+
+#define MOCK_METHOD0_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD0_(, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD1_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD1_(, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD2_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD2_(, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD3_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD3_(, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD4_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD4_(, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD5_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD5_(, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD6_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD6_(, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD7_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD7_(, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD8_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD8_(, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD9_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD9_(, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD10_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD10_(, , ct, m, __VA_ARGS__)
+
+#define MOCK_CONST_METHOD0_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD0_(, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD1_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD1_(, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD2_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD2_(, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD3_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD3_(, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD4_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD4_(, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD5_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD5_(, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD6_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD6_(, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD7_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD7_(, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD8_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD8_(, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD9_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD9_(, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD10_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD10_(, const, ct, m, __VA_ARGS__)
+
+#define MOCK_METHOD0_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD0_(typename, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD1_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD1_(typename, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD2_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD2_(typename, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD3_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD3_(typename, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD4_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD4_(typename, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD5_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD5_(typename, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD6_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD6_(typename, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD7_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD7_(typename, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD8_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD8_(typename, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD9_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD9_(typename, , ct, m, __VA_ARGS__)
+#define MOCK_METHOD10_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD10_(typename, , ct, m, __VA_ARGS__)
+
+#define MOCK_CONST_METHOD0_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD0_(typename, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD1_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD1_(typename, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD2_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD2_(typename, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD3_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD3_(typename, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD4_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD4_(typename, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD5_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD5_(typename, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD6_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD6_(typename, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD7_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD7_(typename, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD8_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD8_(typename, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD9_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD9_(typename, const, ct, m, __VA_ARGS__)
+#define MOCK_CONST_METHOD10_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD10_(typename, const, ct, m, __VA_ARGS__)
+
+// A MockFunction<F> class has one mock method whose type is F.  It is
+// useful when you just want your test code to emit some messages and
+// have Google Mock verify the right messages are sent (and perhaps at
+// the right times).  For example, if you are exercising code:
+//
+//   Foo(1);
+//   Foo(2);
+//   Foo(3);
+//
+// and want to verify that Foo(1) and Foo(3) both invoke
+// mock.Bar("a"), but Foo(2) doesn't invoke anything, you can write:
+//
+// TEST(FooTest, InvokesBarCorrectly) {
+//   MyMock mock;
+//   MockFunction<void(string check_point_name)> check;
+//   {
+//     InSequence s;
+//
+//     EXPECT_CALL(mock, Bar("a"));
+//     EXPECT_CALL(check, Call("1"));
+//     EXPECT_CALL(check, Call("2"));
+//     EXPECT_CALL(mock, Bar("a"));
+//   }
+//   Foo(1);
+//   check.Call("1");
+//   Foo(2);
+//   check.Call("2");
+//   Foo(3);
+// }
+//
+// The expectation spec says that the first Bar("a") must happen
+// before check point "1", the second Bar("a") must happen after check
+// point "2", and nothing should happen between the two check
+// points. The explicit check points make it easy to tell which
+// Bar("a") is called by which call to Foo().
+//
+// MockFunction<F> can also be used to exercise code that accepts
+// std::function<F> callbacks. To do so, use AsStdFunction() method
+// to create std::function proxy forwarding to original object's Call.
+// Example:
+//
+// TEST(FooTest, RunsCallbackWithBarArgument) {
+//   MockFunction<int(string)> callback;
+//   EXPECT_CALL(callback, Call("bar")).WillOnce(Return(1));
+//   Foo(callback.AsStdFunction());
+// }
+template <typename F>
+class MockFunction;
+
+template <typename R>
+class MockFunction<R()> {
+ public:
+  MockFunction() {}
+
+  MOCK_METHOD0_T(Call, R());
+
+#if GTEST_HAS_STD_FUNCTION_
+  std::function<R()> AsStdFunction() {
+    return [this]() -> R {
+      return this->Call();
+    };
+  }
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);
+};
+
+template <typename R, typename A0>
+class MockFunction<R(A0)> {
+ public:
+  MockFunction() {}
+
+  MOCK_METHOD1_T(Call, R(A0));
+
+#if GTEST_HAS_STD_FUNCTION_
+  std::function<R(A0)> AsStdFunction() {
+    return [this](A0 a0) -> R {
+      return this->Call(a0);
+    };
+  }
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);
+};
+
+template <typename R, typename A0, typename A1>
+class MockFunction<R(A0, A1)> {
+ public:
+  MockFunction() {}
+
+  MOCK_METHOD2_T(Call, R(A0, A1));
+
+#if GTEST_HAS_STD_FUNCTION_
+  std::function<R(A0, A1)> AsStdFunction() {
+    return [this](A0 a0, A1 a1) -> R {
+      return this->Call(a0, a1);
+    };
+  }
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);
+};
+
+template <typename R, typename A0, typename A1, typename A2>
+class MockFunction<R(A0, A1, A2)> {
+ public:
+  MockFunction() {}
+
+  MOCK_METHOD3_T(Call, R(A0, A1, A2));
+
+#if GTEST_HAS_STD_FUNCTION_
+  std::function<R(A0, A1, A2)> AsStdFunction() {
+    return [this](A0 a0, A1 a1, A2 a2) -> R {
+      return this->Call(a0, a1, a2);
+    };
+  }
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);
+};
+
+template <typename R, typename A0, typename A1, typename A2, typename A3>
+class MockFunction<R(A0, A1, A2, A3)> {
+ public:
+  MockFunction() {}
+
+  MOCK_METHOD4_T(Call, R(A0, A1, A2, A3));
+
+#if GTEST_HAS_STD_FUNCTION_
+  std::function<R(A0, A1, A2, A3)> AsStdFunction() {
+    return [this](A0 a0, A1 a1, A2 a2, A3 a3) -> R {
+      return this->Call(a0, a1, a2, a3);
+    };
+  }
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);
+};
+
+template <typename R, typename A0, typename A1, typename A2, typename A3,
+    typename A4>
+class MockFunction<R(A0, A1, A2, A3, A4)> {
+ public:
+  MockFunction() {}
+
+  MOCK_METHOD5_T(Call, R(A0, A1, A2, A3, A4));
+
+#if GTEST_HAS_STD_FUNCTION_
+  std::function<R(A0, A1, A2, A3, A4)> AsStdFunction() {
+    return [this](A0 a0, A1 a1, A2 a2, A3 a3, A4 a4) -> R {
+      return this->Call(a0, a1, a2, a3, a4);
+    };
+  }
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);
+};
+
+template <typename R, typename A0, typename A1, typename A2, typename A3,
+    typename A4, typename A5>
+class MockFunction<R(A0, A1, A2, A3, A4, A5)> {
+ public:
+  MockFunction() {}
+
+  MOCK_METHOD6_T(Call, R(A0, A1, A2, A3, A4, A5));
+
+#if GTEST_HAS_STD_FUNCTION_
+  std::function<R(A0, A1, A2, A3, A4, A5)> AsStdFunction() {
+    return [this](A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) -> R {
+      return this->Call(a0, a1, a2, a3, a4, a5);
+    };
+  }
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);
+};
+
+template <typename R, typename A0, typename A1, typename A2, typename A3,
+    typename A4, typename A5, typename A6>
+class MockFunction<R(A0, A1, A2, A3, A4, A5, A6)> {
+ public:
+  MockFunction() {}
+
+  MOCK_METHOD7_T(Call, R(A0, A1, A2, A3, A4, A5, A6));
+
+#if GTEST_HAS_STD_FUNCTION_
+  std::function<R(A0, A1, A2, A3, A4, A5, A6)> AsStdFunction() {
+    return [this](A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) -> R {
+      return this->Call(a0, a1, a2, a3, a4, a5, a6);
+    };
+  }
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);
+};
+
+template <typename R, typename A0, typename A1, typename A2, typename A3,
+    typename A4, typename A5, typename A6, typename A7>
+class MockFunction<R(A0, A1, A2, A3, A4, A5, A6, A7)> {
+ public:
+  MockFunction() {}
+
+  MOCK_METHOD8_T(Call, R(A0, A1, A2, A3, A4, A5, A6, A7));
+
+#if GTEST_HAS_STD_FUNCTION_
+  std::function<R(A0, A1, A2, A3, A4, A5, A6, A7)> AsStdFunction() {
+    return [this](A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) -> R {
+      return this->Call(a0, a1, a2, a3, a4, a5, a6, a7);
+    };
+  }
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);
+};
+
+template <typename R, typename A0, typename A1, typename A2, typename A3,
+    typename A4, typename A5, typename A6, typename A7, typename A8>
+class MockFunction<R(A0, A1, A2, A3, A4, A5, A6, A7, A8)> {
+ public:
+  MockFunction() {}
+
+  MOCK_METHOD9_T(Call, R(A0, A1, A2, A3, A4, A5, A6, A7, A8));
+
+#if GTEST_HAS_STD_FUNCTION_
+  std::function<R(A0, A1, A2, A3, A4, A5, A6, A7, A8)> AsStdFunction() {
+    return [this](A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7,
+        A8 a8) -> R {
+      return this->Call(a0, a1, a2, a3, a4, a5, a6, a7, a8);
+    };
+  }
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);
+};
+
+template <typename R, typename A0, typename A1, typename A2, typename A3,
+    typename A4, typename A5, typename A6, typename A7, typename A8,
+    typename A9>
+class MockFunction<R(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9)> {
+ public:
+  MockFunction() {}
+
+  MOCK_METHOD10_T(Call, R(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9));
+
+#if GTEST_HAS_STD_FUNCTION_
+  std::function<R(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9)> AsStdFunction() {
+    return [this](A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7,
+        A8 a8, A9 a9) -> R {
+      return this->Call(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9);
+    };
+  }
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);
+};
+
+}  // namespace testing
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-function-mockers.h.pump b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-function-mockers.h.pump
new file mode 100644
index 0000000000..811502d0ce
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-function-mockers.h.pump
@@ -0,0 +1,291 @@
+$$ -*- mode: c++; -*-
+$$ This is a Pump source file.  Please use Pump to convert it to
+$$ gmock-generated-function-mockers.h.
+$$
+$var n = 10  $$ The maximum arity we support.
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements function mockers of various arities.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
+
+#include "gmock/gmock-spec-builders.h"
+#include "gmock/internal/gmock-internal-utils.h"
+
+#if GTEST_HAS_STD_FUNCTION_
+# include <functional>
+#endif
+
+namespace testing {
+namespace internal {
+
+template <typename F>
+class FunctionMockerBase;
+
+// Note: class FunctionMocker really belongs to the ::testing
+// namespace.  However if we define it in ::testing, MSVC will
+// complain when classes in ::testing::internal declare it as a
+// friend class template.  To workaround this compiler bug, we define
+// FunctionMocker in ::testing::internal and import it into ::testing.
+template <typename F>
+class FunctionMocker;
+
+
+$range i 0..n
+$for i [[
+$range j 1..i
+$var typename_As = [[$for j [[, typename A$j]]]]
+$var As = [[$for j, [[A$j]]]]
+$var as = [[$for j, [[a$j]]]]
+$var Aas = [[$for j, [[A$j a$j]]]]
+$var ms = [[$for j, [[m$j]]]]
+$var matchers = [[$for j, [[const Matcher<A$j>& m$j]]]]
+template <typename R$typename_As>
+class FunctionMocker<R($As)> : public
+    internal::FunctionMockerBase<R($As)> {
+ public:
+  typedef R F($As);
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  MockSpec<F>& With($matchers) {
+
+$if i >= 1 [[
+    this->current_spec().SetMatchers(::testing::make_tuple($ms));
+
+]]
+    return this->current_spec();
+  }
+
+  R Invoke($Aas) {
+    // Even though gcc and MSVC don't enforce it, 'this->' is required
+    // by the C++ standard [14.6.4] here, as the base class type is
+    // dependent on the template argument (and thus shouldn't be
+    // looked into when resolving InvokeWith).
+    return this->InvokeWith(ArgumentTuple($as));
+  }
+};
+
+
+]]
+}  // namespace internal
+
+// The style guide prohibits "using" statements in a namespace scope
+// inside a header file.  However, the FunctionMocker class template
+// is meant to be defined in the ::testing namespace.  The following
+// line is just a trick for working around a bug in MSVC 8.0, which
+// cannot handle it if we define FunctionMocker in ::testing.
+using internal::FunctionMocker;
+
+// GMOCK_RESULT_(tn, F) expands to the result type of function type F.
+// We define this as a variadic macro in case F contains unprotected
+// commas (the same reason that we use variadic macros in other places
+// in this file).
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_RESULT_(tn, ...) \
+    tn ::testing::internal::Function<__VA_ARGS__>::Result
+
+// The type of argument N of the given function type.
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_ARG_(tn, N, ...) \
+    tn ::testing::internal::Function<__VA_ARGS__>::Argument##N
+
+// The matcher type for argument N of the given function type.
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_MATCHER_(tn, N, ...) \
+    const ::testing::Matcher<GMOCK_ARG_(tn, N, __VA_ARGS__)>&
+
+// The variable for mocking the given method.
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_MOCKER_(arity, constness, Method) \
+    GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
+
+
+$for i [[
+$range j 1..i
+$var arg_as = [[$for j, \
+      [[GMOCK_ARG_(tn, $j, __VA_ARGS__) gmock_a$j]]]]
+$var as = [[$for j, [[gmock_a$j]]]]
+$var matcher_as = [[$for j, \
+                     [[GMOCK_MATCHER_(tn, $j, __VA_ARGS__) gmock_a$j]]]]
+// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
+#define GMOCK_METHOD$i[[]]_(tn, constness, ct, Method, ...) \
+  GMOCK_RESULT_(tn, __VA_ARGS__) ct Method( \
+      $arg_as) constness { \
+    GTEST_COMPILE_ASSERT_((::testing::tuple_size<                          \
+        tn ::testing::internal::Function<__VA_ARGS__>::ArgumentTuple>::value == $i), \
+        this_method_does_not_take_$i[[]]_argument[[$if i != 1 [[s]]]]); \
+    GMOCK_MOCKER_($i, constness, Method).SetOwnerAndName(this, #Method); \
+    return GMOCK_MOCKER_($i, constness, Method).Invoke($as); \
+  } \
+  ::testing::MockSpec<__VA_ARGS__>& \
+      gmock_##Method($matcher_as) constness { \
+    GMOCK_MOCKER_($i, constness, Method).RegisterOwner(this); \
+    return GMOCK_MOCKER_($i, constness, Method).With($as); \
+  } \
+  mutable ::testing::FunctionMocker<__VA_ARGS__> GMOCK_MOCKER_($i, constness, Method)
+
+
+]]
+$for i [[
+#define MOCK_METHOD$i(m, ...) GMOCK_METHOD$i[[]]_(, , , m, __VA_ARGS__)
+
+]]
+
+
+$for i [[
+#define MOCK_CONST_METHOD$i(m, ...) GMOCK_METHOD$i[[]]_(, const, , m, __VA_ARGS__)
+
+]]
+
+
+$for i [[
+#define MOCK_METHOD$i[[]]_T(m, ...) GMOCK_METHOD$i[[]]_(typename, , , m, __VA_ARGS__)
+
+]]
+
+
+$for i [[
+#define MOCK_CONST_METHOD$i[[]]_T(m, ...) \
+    GMOCK_METHOD$i[[]]_(typename, const, , m, __VA_ARGS__)
+
+]]
+
+
+$for i [[
+#define MOCK_METHOD$i[[]]_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD$i[[]]_(, , ct, m, __VA_ARGS__)
+
+]]
+
+
+$for i [[
+#define MOCK_CONST_METHOD$i[[]]_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD$i[[]]_(, const, ct, m, __VA_ARGS__)
+
+]]
+
+
+$for i [[
+#define MOCK_METHOD$i[[]]_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD$i[[]]_(typename, , ct, m, __VA_ARGS__)
+
+]]
+
+
+$for i [[
+#define MOCK_CONST_METHOD$i[[]]_T_WITH_CALLTYPE(ct, m, ...) \
+    GMOCK_METHOD$i[[]]_(typename, const, ct, m, __VA_ARGS__)
+
+]]
+
+// A MockFunction<F> class has one mock method whose type is F.  It is
+// useful when you just want your test code to emit some messages and
+// have Google Mock verify the right messages are sent (and perhaps at
+// the right times).  For example, if you are exercising code:
+//
+//   Foo(1);
+//   Foo(2);
+//   Foo(3);
+//
+// and want to verify that Foo(1) and Foo(3) both invoke
+// mock.Bar("a"), but Foo(2) doesn't invoke anything, you can write:
+//
+// TEST(FooTest, InvokesBarCorrectly) {
+//   MyMock mock;
+//   MockFunction<void(string check_point_name)> check;
+//   {
+//     InSequence s;
+//
+//     EXPECT_CALL(mock, Bar("a"));
+//     EXPECT_CALL(check, Call("1"));
+//     EXPECT_CALL(check, Call("2"));
+//     EXPECT_CALL(mock, Bar("a"));
+//   }
+//   Foo(1);
+//   check.Call("1");
+//   Foo(2);
+//   check.Call("2");
+//   Foo(3);
+// }
+//
+// The expectation spec says that the first Bar("a") must happen
+// before check point "1", the second Bar("a") must happen after check
+// point "2", and nothing should happen between the two check
+// points. The explicit check points make it easy to tell which
+// Bar("a") is called by which call to Foo().
+//
+// MockFunction<F> can also be used to exercise code that accepts
+// std::function<F> callbacks. To do so, use AsStdFunction() method
+// to create std::function proxy forwarding to original object's Call.
+// Example:
+//
+// TEST(FooTest, RunsCallbackWithBarArgument) {
+//   MockFunction<int(string)> callback;
+//   EXPECT_CALL(callback, Call("bar")).WillOnce(Return(1));
+//   Foo(callback.AsStdFunction());
+// }
+template <typename F>
+class MockFunction;
+
+
+$for i [[
+$range j 0..i-1
+$var ArgTypes = [[$for j, [[A$j]]]]
+$var ArgNames = [[$for j, [[a$j]]]]
+$var ArgDecls = [[$for j, [[A$j a$j]]]]
+template <typename R$for j [[, typename A$j]]>
+class MockFunction<R($ArgTypes)> {
+ public:
+  MockFunction() {}
+
+  MOCK_METHOD$i[[]]_T(Call, R($ArgTypes));
+
+#if GTEST_HAS_STD_FUNCTION_
+  std::function<R($ArgTypes)> AsStdFunction() {
+    return [this]($ArgDecls) -> R {
+      return this->Call($ArgNames);
+    };
+  }
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);
+};
+
+
+]]
+}  // namespace testing
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-matchers.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-matchers.h
new file mode 100644
index 0000000000..57056fd91d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-matchers.h
@@ -0,0 +1,2179 @@
+// This file was GENERATED by command:
+//     pump.py gmock-generated-matchers.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some commonly used variadic matchers.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
+
+#include <iterator>
+#include <sstream>
+#include <string>
+#include <vector>
+#include "gmock/gmock-matchers.h"
+
+namespace testing {
+namespace internal {
+
+// The type of the i-th (0-based) field of Tuple.
+#define GMOCK_FIELD_TYPE_(Tuple, i) \
+    typename ::testing::tuple_element<i, Tuple>::type
+
+// TupleFields<Tuple, k0, ..., kn> is for selecting fields from a
+// tuple of type Tuple.  It has two members:
+//
+//   type: a tuple type whose i-th field is the ki-th field of Tuple.
+//   GetSelectedFields(t): returns fields k0, ..., and kn of t as a tuple.
+//
+// For example, in class TupleFields<tuple<bool, char, int>, 2, 0>, we have:
+//
+//   type is tuple<int, bool>, and
+//   GetSelectedFields(make_tuple(true, 'a', 42)) is (42, true).
+
+template <class Tuple, int k0 = -1, int k1 = -1, int k2 = -1, int k3 = -1,
+    int k4 = -1, int k5 = -1, int k6 = -1, int k7 = -1, int k8 = -1,
+    int k9 = -1>
+class TupleFields;
+
+// This generic version is used when there are 10 selectors.
+template <class Tuple, int k0, int k1, int k2, int k3, int k4, int k5, int k6,
+    int k7, int k8, int k9>
+class TupleFields {
+ public:
+  typedef ::testing::tuple<GMOCK_FIELD_TYPE_(Tuple, k0),
+      GMOCK_FIELD_TYPE_(Tuple, k1), GMOCK_FIELD_TYPE_(Tuple, k2),
+      GMOCK_FIELD_TYPE_(Tuple, k3), GMOCK_FIELD_TYPE_(Tuple, k4),
+      GMOCK_FIELD_TYPE_(Tuple, k5), GMOCK_FIELD_TYPE_(Tuple, k6),
+      GMOCK_FIELD_TYPE_(Tuple, k7), GMOCK_FIELD_TYPE_(Tuple, k8),
+      GMOCK_FIELD_TYPE_(Tuple, k9)> type;
+  static type GetSelectedFields(const Tuple& t) {
+    return type(get<k0>(t), get<k1>(t), get<k2>(t), get<k3>(t), get<k4>(t),
+        get<k5>(t), get<k6>(t), get<k7>(t), get<k8>(t), get<k9>(t));
+  }
+};
+
+// The following specialization is used for 0 ~ 9 selectors.
+
+template <class Tuple>
+class TupleFields<Tuple, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1> {
+ public:
+  typedef ::testing::tuple<> type;
+  static type GetSelectedFields(const Tuple& /* t */) {
+    return type();
+  }
+};
+
+template <class Tuple, int k0>
+class TupleFields<Tuple, k0, -1, -1, -1, -1, -1, -1, -1, -1, -1> {
+ public:
+  typedef ::testing::tuple<GMOCK_FIELD_TYPE_(Tuple, k0)> type;
+  static type GetSelectedFields(const Tuple& t) {
+    return type(get<k0>(t));
+  }
+};
+
+template <class Tuple, int k0, int k1>
+class TupleFields<Tuple, k0, k1, -1, -1, -1, -1, -1, -1, -1, -1> {
+ public:
+  typedef ::testing::tuple<GMOCK_FIELD_TYPE_(Tuple, k0),
+      GMOCK_FIELD_TYPE_(Tuple, k1)> type;
+  static type GetSelectedFields(const Tuple& t) {
+    return type(get<k0>(t), get<k1>(t));
+  }
+};
+
+template <class Tuple, int k0, int k1, int k2>
+class TupleFields<Tuple, k0, k1, k2, -1, -1, -1, -1, -1, -1, -1> {
+ public:
+  typedef ::testing::tuple<GMOCK_FIELD_TYPE_(Tuple, k0),
+      GMOCK_FIELD_TYPE_(Tuple, k1), GMOCK_FIELD_TYPE_(Tuple, k2)> type;
+  static type GetSelectedFields(const Tuple& t) {
+    return type(get<k0>(t), get<k1>(t), get<k2>(t));
+  }
+};
+
+template <class Tuple, int k0, int k1, int k2, int k3>
+class TupleFields<Tuple, k0, k1, k2, k3, -1, -1, -1, -1, -1, -1> {
+ public:
+  typedef ::testing::tuple<GMOCK_FIELD_TYPE_(Tuple, k0),
+      GMOCK_FIELD_TYPE_(Tuple, k1), GMOCK_FIELD_TYPE_(Tuple, k2),
+      GMOCK_FIELD_TYPE_(Tuple, k3)> type;
+  static type GetSelectedFields(const Tuple& t) {
+    return type(get<k0>(t), get<k1>(t), get<k2>(t), get<k3>(t));
+  }
+};
+
+template <class Tuple, int k0, int k1, int k2, int k3, int k4>
+class TupleFields<Tuple, k0, k1, k2, k3, k4, -1, -1, -1, -1, -1> {
+ public:
+  typedef ::testing::tuple<GMOCK_FIELD_TYPE_(Tuple, k0),
+      GMOCK_FIELD_TYPE_(Tuple, k1), GMOCK_FIELD_TYPE_(Tuple, k2),
+      GMOCK_FIELD_TYPE_(Tuple, k3), GMOCK_FIELD_TYPE_(Tuple, k4)> type;
+  static type GetSelectedFields(const Tuple& t) {
+    return type(get<k0>(t), get<k1>(t), get<k2>(t), get<k3>(t), get<k4>(t));
+  }
+};
+
+template <class Tuple, int k0, int k1, int k2, int k3, int k4, int k5>
+class TupleFields<Tuple, k0, k1, k2, k3, k4, k5, -1, -1, -1, -1> {
+ public:
+  typedef ::testing::tuple<GMOCK_FIELD_TYPE_(Tuple, k0),
+      GMOCK_FIELD_TYPE_(Tuple, k1), GMOCK_FIELD_TYPE_(Tuple, k2),
+      GMOCK_FIELD_TYPE_(Tuple, k3), GMOCK_FIELD_TYPE_(Tuple, k4),
+      GMOCK_FIELD_TYPE_(Tuple, k5)> type;
+  static type GetSelectedFields(const Tuple& t) {
+    return type(get<k0>(t), get<k1>(t), get<k2>(t), get<k3>(t), get<k4>(t),
+        get<k5>(t));
+  }
+};
+
+template <class Tuple, int k0, int k1, int k2, int k3, int k4, int k5, int k6>
+class TupleFields<Tuple, k0, k1, k2, k3, k4, k5, k6, -1, -1, -1> {
+ public:
+  typedef ::testing::tuple<GMOCK_FIELD_TYPE_(Tuple, k0),
+      GMOCK_FIELD_TYPE_(Tuple, k1), GMOCK_FIELD_TYPE_(Tuple, k2),
+      GMOCK_FIELD_TYPE_(Tuple, k3), GMOCK_FIELD_TYPE_(Tuple, k4),
+      GMOCK_FIELD_TYPE_(Tuple, k5), GMOCK_FIELD_TYPE_(Tuple, k6)> type;
+  static type GetSelectedFields(const Tuple& t) {
+    return type(get<k0>(t), get<k1>(t), get<k2>(t), get<k3>(t), get<k4>(t),
+        get<k5>(t), get<k6>(t));
+  }
+};
+
+template <class Tuple, int k0, int k1, int k2, int k3, int k4, int k5, int k6,
+    int k7>
+class TupleFields<Tuple, k0, k1, k2, k3, k4, k5, k6, k7, -1, -1> {
+ public:
+  typedef ::testing::tuple<GMOCK_FIELD_TYPE_(Tuple, k0),
+      GMOCK_FIELD_TYPE_(Tuple, k1), GMOCK_FIELD_TYPE_(Tuple, k2),
+      GMOCK_FIELD_TYPE_(Tuple, k3), GMOCK_FIELD_TYPE_(Tuple, k4),
+      GMOCK_FIELD_TYPE_(Tuple, k5), GMOCK_FIELD_TYPE_(Tuple, k6),
+      GMOCK_FIELD_TYPE_(Tuple, k7)> type;
+  static type GetSelectedFields(const Tuple& t) {
+    return type(get<k0>(t), get<k1>(t), get<k2>(t), get<k3>(t), get<k4>(t),
+        get<k5>(t), get<k6>(t), get<k7>(t));
+  }
+};
+
+template <class Tuple, int k0, int k1, int k2, int k3, int k4, int k5, int k6,
+    int k7, int k8>
+class TupleFields<Tuple, k0, k1, k2, k3, k4, k5, k6, k7, k8, -1> {
+ public:
+  typedef ::testing::tuple<GMOCK_FIELD_TYPE_(Tuple, k0),
+      GMOCK_FIELD_TYPE_(Tuple, k1), GMOCK_FIELD_TYPE_(Tuple, k2),
+      GMOCK_FIELD_TYPE_(Tuple, k3), GMOCK_FIELD_TYPE_(Tuple, k4),
+      GMOCK_FIELD_TYPE_(Tuple, k5), GMOCK_FIELD_TYPE_(Tuple, k6),
+      GMOCK_FIELD_TYPE_(Tuple, k7), GMOCK_FIELD_TYPE_(Tuple, k8)> type;
+  static type GetSelectedFields(const Tuple& t) {
+    return type(get<k0>(t), get<k1>(t), get<k2>(t), get<k3>(t), get<k4>(t),
+        get<k5>(t), get<k6>(t), get<k7>(t), get<k8>(t));
+  }
+};
+
+#undef GMOCK_FIELD_TYPE_
+
+// Implements the Args() matcher.
+template <class ArgsTuple, int k0 = -1, int k1 = -1, int k2 = -1, int k3 = -1,
+    int k4 = -1, int k5 = -1, int k6 = -1, int k7 = -1, int k8 = -1,
+    int k9 = -1>
+class ArgsMatcherImpl : public MatcherInterface<ArgsTuple> {
+ public:
+  // ArgsTuple may have top-level const or reference modifiers.
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(ArgsTuple) RawArgsTuple;
+  typedef typename internal::TupleFields<RawArgsTuple, k0, k1, k2, k3, k4, k5,
+      k6, k7, k8, k9>::type SelectedArgs;
+  typedef Matcher<const SelectedArgs&> MonomorphicInnerMatcher;
+
+  template <typename InnerMatcher>
+  explicit ArgsMatcherImpl(const InnerMatcher& inner_matcher)
+      : inner_matcher_(SafeMatcherCast<const SelectedArgs&>(inner_matcher)) {}
+
+  virtual bool MatchAndExplain(ArgsTuple args,
+                               MatchResultListener* listener) const {
+    const SelectedArgs& selected_args = GetSelectedArgs(args);
+    if (!listener->IsInterested())
+      return inner_matcher_.Matches(selected_args);
+
+    PrintIndices(listener->stream());
+    *listener << "are " << PrintToString(selected_args);
+
+    StringMatchResultListener inner_listener;
+    const bool match = inner_matcher_.MatchAndExplain(selected_args,
+                                                      &inner_listener);
+    PrintIfNotEmpty(inner_listener.str(), listener->stream());
+    return match;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "are a tuple ";
+    PrintIndices(os);
+    inner_matcher_.DescribeTo(os);
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "are a tuple ";
+    PrintIndices(os);
+    inner_matcher_.DescribeNegationTo(os);
+  }
+
+ private:
+  static SelectedArgs GetSelectedArgs(ArgsTuple args) {
+    return TupleFields<RawArgsTuple, k0, k1, k2, k3, k4, k5, k6, k7, k8,
+        k9>::GetSelectedFields(args);
+  }
+
+  // Prints the indices of the selected fields.
+  static void PrintIndices(::std::ostream* os) {
+    *os << "whose fields (";
+    const int indices[10] = { k0, k1, k2, k3, k4, k5, k6, k7, k8, k9 };
+    for (int i = 0; i < 10; i++) {
+      if (indices[i] < 0)
+        break;
+
+      if (i >= 1)
+        *os << ", ";
+
+      *os << "#" << indices[i];
+    }
+    *os << ") ";
+  }
+
+  const MonomorphicInnerMatcher inner_matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(ArgsMatcherImpl);
+};
+
+template <class InnerMatcher, int k0 = -1, int k1 = -1, int k2 = -1,
+    int k3 = -1, int k4 = -1, int k5 = -1, int k6 = -1, int k7 = -1,
+    int k8 = -1, int k9 = -1>
+class ArgsMatcher {
+ public:
+  explicit ArgsMatcher(const InnerMatcher& inner_matcher)
+      : inner_matcher_(inner_matcher) {}
+
+  template <typename ArgsTuple>
+  operator Matcher<ArgsTuple>() const {
+    return MakeMatcher(new ArgsMatcherImpl<ArgsTuple, k0, k1, k2, k3, k4, k5,
+        k6, k7, k8, k9>(inner_matcher_));
+  }
+
+ private:
+  const InnerMatcher inner_matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(ArgsMatcher);
+};
+
+// A set of metafunctions for computing the result type of AllOf.
+// AllOf(m1, ..., mN) returns
+// AllOfResultN<decltype(m1), ..., decltype(mN)>::type.
+
+// Although AllOf isn't defined for one argument, AllOfResult1 is defined
+// to simplify the implementation.
+template <typename M1>
+struct AllOfResult1 {
+  typedef M1 type;
+};
+
+template <typename M1, typename M2>
+struct AllOfResult2 {
+  typedef BothOfMatcher<
+      typename AllOfResult1<M1>::type,
+      typename AllOfResult1<M2>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3>
+struct AllOfResult3 {
+  typedef BothOfMatcher<
+      typename AllOfResult1<M1>::type,
+      typename AllOfResult2<M2, M3>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4>
+struct AllOfResult4 {
+  typedef BothOfMatcher<
+      typename AllOfResult2<M1, M2>::type,
+      typename AllOfResult2<M3, M4>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5>
+struct AllOfResult5 {
+  typedef BothOfMatcher<
+      typename AllOfResult2<M1, M2>::type,
+      typename AllOfResult3<M3, M4, M5>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6>
+struct AllOfResult6 {
+  typedef BothOfMatcher<
+      typename AllOfResult3<M1, M2, M3>::type,
+      typename AllOfResult3<M4, M5, M6>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7>
+struct AllOfResult7 {
+  typedef BothOfMatcher<
+      typename AllOfResult3<M1, M2, M3>::type,
+      typename AllOfResult4<M4, M5, M6, M7>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7, typename M8>
+struct AllOfResult8 {
+  typedef BothOfMatcher<
+      typename AllOfResult4<M1, M2, M3, M4>::type,
+      typename AllOfResult4<M5, M6, M7, M8>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7, typename M8, typename M9>
+struct AllOfResult9 {
+  typedef BothOfMatcher<
+      typename AllOfResult4<M1, M2, M3, M4>::type,
+      typename AllOfResult5<M5, M6, M7, M8, M9>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7, typename M8, typename M9, typename M10>
+struct AllOfResult10 {
+  typedef BothOfMatcher<
+      typename AllOfResult5<M1, M2, M3, M4, M5>::type,
+      typename AllOfResult5<M6, M7, M8, M9, M10>::type
+  > type;
+};
+
+// A set of metafunctions for computing the result type of AnyOf.
+// AnyOf(m1, ..., mN) returns
+// AnyOfResultN<decltype(m1), ..., decltype(mN)>::type.
+
+// Although AnyOf isn't defined for one argument, AnyOfResult1 is defined
+// to simplify the implementation.
+template <typename M1>
+struct AnyOfResult1 {
+  typedef M1 type;
+};
+
+template <typename M1, typename M2>
+struct AnyOfResult2 {
+  typedef EitherOfMatcher<
+      typename AnyOfResult1<M1>::type,
+      typename AnyOfResult1<M2>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3>
+struct AnyOfResult3 {
+  typedef EitherOfMatcher<
+      typename AnyOfResult1<M1>::type,
+      typename AnyOfResult2<M2, M3>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4>
+struct AnyOfResult4 {
+  typedef EitherOfMatcher<
+      typename AnyOfResult2<M1, M2>::type,
+      typename AnyOfResult2<M3, M4>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5>
+struct AnyOfResult5 {
+  typedef EitherOfMatcher<
+      typename AnyOfResult2<M1, M2>::type,
+      typename AnyOfResult3<M3, M4, M5>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6>
+struct AnyOfResult6 {
+  typedef EitherOfMatcher<
+      typename AnyOfResult3<M1, M2, M3>::type,
+      typename AnyOfResult3<M4, M5, M6>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7>
+struct AnyOfResult7 {
+  typedef EitherOfMatcher<
+      typename AnyOfResult3<M1, M2, M3>::type,
+      typename AnyOfResult4<M4, M5, M6, M7>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7, typename M8>
+struct AnyOfResult8 {
+  typedef EitherOfMatcher<
+      typename AnyOfResult4<M1, M2, M3, M4>::type,
+      typename AnyOfResult4<M5, M6, M7, M8>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7, typename M8, typename M9>
+struct AnyOfResult9 {
+  typedef EitherOfMatcher<
+      typename AnyOfResult4<M1, M2, M3, M4>::type,
+      typename AnyOfResult5<M5, M6, M7, M8, M9>::type
+  > type;
+};
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7, typename M8, typename M9, typename M10>
+struct AnyOfResult10 {
+  typedef EitherOfMatcher<
+      typename AnyOfResult5<M1, M2, M3, M4, M5>::type,
+      typename AnyOfResult5<M6, M7, M8, M9, M10>::type
+  > type;
+};
+
+}  // namespace internal
+
+// Args<N1, N2, ..., Nk>(a_matcher) matches a tuple if the selected
+// fields of it matches a_matcher.  C++ doesn't support default
+// arguments for function templates, so we have to overload it.
+template <typename InnerMatcher>
+inline internal::ArgsMatcher<InnerMatcher>
+Args(const InnerMatcher& matcher) {
+  return internal::ArgsMatcher<InnerMatcher>(matcher);
+}
+
+template <int k1, typename InnerMatcher>
+inline internal::ArgsMatcher<InnerMatcher, k1>
+Args(const InnerMatcher& matcher) {
+  return internal::ArgsMatcher<InnerMatcher, k1>(matcher);
+}
+
+template <int k1, int k2, typename InnerMatcher>
+inline internal::ArgsMatcher<InnerMatcher, k1, k2>
+Args(const InnerMatcher& matcher) {
+  return internal::ArgsMatcher<InnerMatcher, k1, k2>(matcher);
+}
+
+template <int k1, int k2, int k3, typename InnerMatcher>
+inline internal::ArgsMatcher<InnerMatcher, k1, k2, k3>
+Args(const InnerMatcher& matcher) {
+  return internal::ArgsMatcher<InnerMatcher, k1, k2, k3>(matcher);
+}
+
+template <int k1, int k2, int k3, int k4, typename InnerMatcher>
+inline internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4>
+Args(const InnerMatcher& matcher) {
+  return internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4>(matcher);
+}
+
+template <int k1, int k2, int k3, int k4, int k5, typename InnerMatcher>
+inline internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4, k5>
+Args(const InnerMatcher& matcher) {
+  return internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4, k5>(matcher);
+}
+
+template <int k1, int k2, int k3, int k4, int k5, int k6, typename InnerMatcher>
+inline internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4, k5, k6>
+Args(const InnerMatcher& matcher) {
+  return internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4, k5, k6>(matcher);
+}
+
+template <int k1, int k2, int k3, int k4, int k5, int k6, int k7,
+    typename InnerMatcher>
+inline internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4, k5, k6, k7>
+Args(const InnerMatcher& matcher) {
+  return internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4, k5, k6,
+      k7>(matcher);
+}
+
+template <int k1, int k2, int k3, int k4, int k5, int k6, int k7, int k8,
+    typename InnerMatcher>
+inline internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4, k5, k6, k7, k8>
+Args(const InnerMatcher& matcher) {
+  return internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4, k5, k6, k7,
+      k8>(matcher);
+}
+
+template <int k1, int k2, int k3, int k4, int k5, int k6, int k7, int k8,
+    int k9, typename InnerMatcher>
+inline internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4, k5, k6, k7, k8, k9>
+Args(const InnerMatcher& matcher) {
+  return internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4, k5, k6, k7, k8,
+      k9>(matcher);
+}
+
+template <int k1, int k2, int k3, int k4, int k5, int k6, int k7, int k8,
+    int k9, int k10, typename InnerMatcher>
+inline internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4, k5, k6, k7, k8, k9,
+    k10>
+Args(const InnerMatcher& matcher) {
+  return internal::ArgsMatcher<InnerMatcher, k1, k2, k3, k4, k5, k6, k7, k8,
+      k9, k10>(matcher);
+}
+
+// ElementsAre(e_1, e_2, ... e_n) matches an STL-style container with
+// n elements, where the i-th element in the container must
+// match the i-th argument in the list.  Each argument of
+// ElementsAre() can be either a value or a matcher.  We support up to
+// 10 arguments.
+//
+// The use of DecayArray in the implementation allows ElementsAre()
+// to accept string literals, whose type is const char[N], but we
+// want to treat them as const char*.
+//
+// NOTE: Since ElementsAre() cares about the order of the elements, it
+// must not be used with containers whose elements's order is
+// undefined (e.g. hash_map).
+
+inline internal::ElementsAreMatcher<
+    ::testing::tuple<> >
+ElementsAre() {
+  typedef ::testing::tuple<> Args;
+  return internal::ElementsAreMatcher<Args>(Args());
+}
+
+template <typename T1>
+inline internal::ElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type> >
+ElementsAre(const T1& e1) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type> Args;
+  return internal::ElementsAreMatcher<Args>(Args(e1));
+}
+
+template <typename T1, typename T2>
+inline internal::ElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type> >
+ElementsAre(const T1& e1, const T2& e2) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type> Args;
+  return internal::ElementsAreMatcher<Args>(Args(e1, e2));
+}
+
+template <typename T1, typename T2, typename T3>
+inline internal::ElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type> >
+ElementsAre(const T1& e1, const T2& e2, const T3& e3) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type> Args;
+  return internal::ElementsAreMatcher<Args>(Args(e1, e2, e3));
+}
+
+template <typename T1, typename T2, typename T3, typename T4>
+inline internal::ElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type> >
+ElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type> Args;
+  return internal::ElementsAreMatcher<Args>(Args(e1, e2, e3, e4));
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+inline internal::ElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type,
+        typename internal::DecayArray<T5>::type> >
+ElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4,
+    const T5& e5) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type,
+      typename internal::DecayArray<T5>::type> Args;
+  return internal::ElementsAreMatcher<Args>(Args(e1, e2, e3, e4, e5));
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+inline internal::ElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type,
+        typename internal::DecayArray<T5>::type,
+        typename internal::DecayArray<T6>::type> >
+ElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4,
+    const T5& e5, const T6& e6) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type,
+      typename internal::DecayArray<T5>::type,
+      typename internal::DecayArray<T6>::type> Args;
+  return internal::ElementsAreMatcher<Args>(Args(e1, e2, e3, e4, e5, e6));
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+inline internal::ElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type,
+        typename internal::DecayArray<T5>::type,
+        typename internal::DecayArray<T6>::type,
+        typename internal::DecayArray<T7>::type> >
+ElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4,
+    const T5& e5, const T6& e6, const T7& e7) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type,
+      typename internal::DecayArray<T5>::type,
+      typename internal::DecayArray<T6>::type,
+      typename internal::DecayArray<T7>::type> Args;
+  return internal::ElementsAreMatcher<Args>(Args(e1, e2, e3, e4, e5, e6, e7));
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+inline internal::ElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type,
+        typename internal::DecayArray<T5>::type,
+        typename internal::DecayArray<T6>::type,
+        typename internal::DecayArray<T7>::type,
+        typename internal::DecayArray<T8>::type> >
+ElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4,
+    const T5& e5, const T6& e6, const T7& e7, const T8& e8) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type,
+      typename internal::DecayArray<T5>::type,
+      typename internal::DecayArray<T6>::type,
+      typename internal::DecayArray<T7>::type,
+      typename internal::DecayArray<T8>::type> Args;
+  return internal::ElementsAreMatcher<Args>(Args(e1, e2, e3, e4, e5, e6, e7,
+      e8));
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+inline internal::ElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type,
+        typename internal::DecayArray<T5>::type,
+        typename internal::DecayArray<T6>::type,
+        typename internal::DecayArray<T7>::type,
+        typename internal::DecayArray<T8>::type,
+        typename internal::DecayArray<T9>::type> >
+ElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4,
+    const T5& e5, const T6& e6, const T7& e7, const T8& e8, const T9& e9) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type,
+      typename internal::DecayArray<T5>::type,
+      typename internal::DecayArray<T6>::type,
+      typename internal::DecayArray<T7>::type,
+      typename internal::DecayArray<T8>::type,
+      typename internal::DecayArray<T9>::type> Args;
+  return internal::ElementsAreMatcher<Args>(Args(e1, e2, e3, e4, e5, e6, e7,
+      e8, e9));
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+inline internal::ElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type,
+        typename internal::DecayArray<T5>::type,
+        typename internal::DecayArray<T6>::type,
+        typename internal::DecayArray<T7>::type,
+        typename internal::DecayArray<T8>::type,
+        typename internal::DecayArray<T9>::type,
+        typename internal::DecayArray<T10>::type> >
+ElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4,
+    const T5& e5, const T6& e6, const T7& e7, const T8& e8, const T9& e9,
+    const T10& e10) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type,
+      typename internal::DecayArray<T5>::type,
+      typename internal::DecayArray<T6>::type,
+      typename internal::DecayArray<T7>::type,
+      typename internal::DecayArray<T8>::type,
+      typename internal::DecayArray<T9>::type,
+      typename internal::DecayArray<T10>::type> Args;
+  return internal::ElementsAreMatcher<Args>(Args(e1, e2, e3, e4, e5, e6, e7,
+      e8, e9, e10));
+}
+
+// UnorderedElementsAre(e_1, e_2, ..., e_n) is an ElementsAre extension
+// that matches n elements in any order.  We support up to n=10 arguments.
+
+inline internal::UnorderedElementsAreMatcher<
+    ::testing::tuple<> >
+UnorderedElementsAre() {
+  typedef ::testing::tuple<> Args;
+  return internal::UnorderedElementsAreMatcher<Args>(Args());
+}
+
+template <typename T1>
+inline internal::UnorderedElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type> >
+UnorderedElementsAre(const T1& e1) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type> Args;
+  return internal::UnorderedElementsAreMatcher<Args>(Args(e1));
+}
+
+template <typename T1, typename T2>
+inline internal::UnorderedElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type> >
+UnorderedElementsAre(const T1& e1, const T2& e2) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type> Args;
+  return internal::UnorderedElementsAreMatcher<Args>(Args(e1, e2));
+}
+
+template <typename T1, typename T2, typename T3>
+inline internal::UnorderedElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type> >
+UnorderedElementsAre(const T1& e1, const T2& e2, const T3& e3) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type> Args;
+  return internal::UnorderedElementsAreMatcher<Args>(Args(e1, e2, e3));
+}
+
+template <typename T1, typename T2, typename T3, typename T4>
+inline internal::UnorderedElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type> >
+UnorderedElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type> Args;
+  return internal::UnorderedElementsAreMatcher<Args>(Args(e1, e2, e3, e4));
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+inline internal::UnorderedElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type,
+        typename internal::DecayArray<T5>::type> >
+UnorderedElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4,
+    const T5& e5) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type,
+      typename internal::DecayArray<T5>::type> Args;
+  return internal::UnorderedElementsAreMatcher<Args>(Args(e1, e2, e3, e4, e5));
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+inline internal::UnorderedElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type,
+        typename internal::DecayArray<T5>::type,
+        typename internal::DecayArray<T6>::type> >
+UnorderedElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4,
+    const T5& e5, const T6& e6) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type,
+      typename internal::DecayArray<T5>::type,
+      typename internal::DecayArray<T6>::type> Args;
+  return internal::UnorderedElementsAreMatcher<Args>(Args(e1, e2, e3, e4, e5,
+      e6));
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+inline internal::UnorderedElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type,
+        typename internal::DecayArray<T5>::type,
+        typename internal::DecayArray<T6>::type,
+        typename internal::DecayArray<T7>::type> >
+UnorderedElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4,
+    const T5& e5, const T6& e6, const T7& e7) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type,
+      typename internal::DecayArray<T5>::type,
+      typename internal::DecayArray<T6>::type,
+      typename internal::DecayArray<T7>::type> Args;
+  return internal::UnorderedElementsAreMatcher<Args>(Args(e1, e2, e3, e4, e5,
+      e6, e7));
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+inline internal::UnorderedElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type,
+        typename internal::DecayArray<T5>::type,
+        typename internal::DecayArray<T6>::type,
+        typename internal::DecayArray<T7>::type,
+        typename internal::DecayArray<T8>::type> >
+UnorderedElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4,
+    const T5& e5, const T6& e6, const T7& e7, const T8& e8) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type,
+      typename internal::DecayArray<T5>::type,
+      typename internal::DecayArray<T6>::type,
+      typename internal::DecayArray<T7>::type,
+      typename internal::DecayArray<T8>::type> Args;
+  return internal::UnorderedElementsAreMatcher<Args>(Args(e1, e2, e3, e4, e5,
+      e6, e7, e8));
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+inline internal::UnorderedElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type,
+        typename internal::DecayArray<T5>::type,
+        typename internal::DecayArray<T6>::type,
+        typename internal::DecayArray<T7>::type,
+        typename internal::DecayArray<T8>::type,
+        typename internal::DecayArray<T9>::type> >
+UnorderedElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4,
+    const T5& e5, const T6& e6, const T7& e7, const T8& e8, const T9& e9) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type,
+      typename internal::DecayArray<T5>::type,
+      typename internal::DecayArray<T6>::type,
+      typename internal::DecayArray<T7>::type,
+      typename internal::DecayArray<T8>::type,
+      typename internal::DecayArray<T9>::type> Args;
+  return internal::UnorderedElementsAreMatcher<Args>(Args(e1, e2, e3, e4, e5,
+      e6, e7, e8, e9));
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+inline internal::UnorderedElementsAreMatcher<
+    ::testing::tuple<
+        typename internal::DecayArray<T1>::type,
+        typename internal::DecayArray<T2>::type,
+        typename internal::DecayArray<T3>::type,
+        typename internal::DecayArray<T4>::type,
+        typename internal::DecayArray<T5>::type,
+        typename internal::DecayArray<T6>::type,
+        typename internal::DecayArray<T7>::type,
+        typename internal::DecayArray<T8>::type,
+        typename internal::DecayArray<T9>::type,
+        typename internal::DecayArray<T10>::type> >
+UnorderedElementsAre(const T1& e1, const T2& e2, const T3& e3, const T4& e4,
+    const T5& e5, const T6& e6, const T7& e7, const T8& e8, const T9& e9,
+    const T10& e10) {
+  typedef ::testing::tuple<
+      typename internal::DecayArray<T1>::type,
+      typename internal::DecayArray<T2>::type,
+      typename internal::DecayArray<T3>::type,
+      typename internal::DecayArray<T4>::type,
+      typename internal::DecayArray<T5>::type,
+      typename internal::DecayArray<T6>::type,
+      typename internal::DecayArray<T7>::type,
+      typename internal::DecayArray<T8>::type,
+      typename internal::DecayArray<T9>::type,
+      typename internal::DecayArray<T10>::type> Args;
+  return internal::UnorderedElementsAreMatcher<Args>(Args(e1, e2, e3, e4, e5,
+      e6, e7, e8, e9, e10));
+}
+
+// AllOf(m1, m2, ..., mk) matches any value that matches all of the given
+// sub-matchers.  AllOf is called fully qualified to prevent ADL from firing.
+
+template <typename M1, typename M2>
+inline typename internal::AllOfResult2<M1, M2>::type
+AllOf(M1 m1, M2 m2) {
+  return typename internal::AllOfResult2<M1, M2>::type(
+      m1,
+      m2);
+}
+
+template <typename M1, typename M2, typename M3>
+inline typename internal::AllOfResult3<M1, M2, M3>::type
+AllOf(M1 m1, M2 m2, M3 m3) {
+  return typename internal::AllOfResult3<M1, M2, M3>::type(
+      m1,
+      ::testing::AllOf(m2, m3));
+}
+
+template <typename M1, typename M2, typename M3, typename M4>
+inline typename internal::AllOfResult4<M1, M2, M3, M4>::type
+AllOf(M1 m1, M2 m2, M3 m3, M4 m4) {
+  return typename internal::AllOfResult4<M1, M2, M3, M4>::type(
+      ::testing::AllOf(m1, m2),
+      ::testing::AllOf(m3, m4));
+}
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5>
+inline typename internal::AllOfResult5<M1, M2, M3, M4, M5>::type
+AllOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5) {
+  return typename internal::AllOfResult5<M1, M2, M3, M4, M5>::type(
+      ::testing::AllOf(m1, m2),
+      ::testing::AllOf(m3, m4, m5));
+}
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6>
+inline typename internal::AllOfResult6<M1, M2, M3, M4, M5, M6>::type
+AllOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6) {
+  return typename internal::AllOfResult6<M1, M2, M3, M4, M5, M6>::type(
+      ::testing::AllOf(m1, m2, m3),
+      ::testing::AllOf(m4, m5, m6));
+}
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7>
+inline typename internal::AllOfResult7<M1, M2, M3, M4, M5, M6, M7>::type
+AllOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7) {
+  return typename internal::AllOfResult7<M1, M2, M3, M4, M5, M6, M7>::type(
+      ::testing::AllOf(m1, m2, m3),
+      ::testing::AllOf(m4, m5, m6, m7));
+}
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7, typename M8>
+inline typename internal::AllOfResult8<M1, M2, M3, M4, M5, M6, M7, M8>::type
+AllOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8) {
+  return typename internal::AllOfResult8<M1, M2, M3, M4, M5, M6, M7, M8>::type(
+      ::testing::AllOf(m1, m2, m3, m4),
+      ::testing::AllOf(m5, m6, m7, m8));
+}
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7, typename M8, typename M9>
+inline typename internal::AllOfResult9<M1, M2, M3, M4, M5, M6, M7, M8, M9>::type
+AllOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9) {
+  return typename internal::AllOfResult9<M1, M2, M3, M4, M5, M6, M7, M8,
+      M9>::type(
+      ::testing::AllOf(m1, m2, m3, m4),
+      ::testing::AllOf(m5, m6, m7, m8, m9));
+}
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7, typename M8, typename M9, typename M10>
+inline typename internal::AllOfResult10<M1, M2, M3, M4, M5, M6, M7, M8, M9,
+    M10>::type
+AllOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
+  return typename internal::AllOfResult10<M1, M2, M3, M4, M5, M6, M7, M8, M9,
+      M10>::type(
+      ::testing::AllOf(m1, m2, m3, m4, m5),
+      ::testing::AllOf(m6, m7, m8, m9, m10));
+}
+
+// AnyOf(m1, m2, ..., mk) matches any value that matches any of the given
+// sub-matchers.  AnyOf is called fully qualified to prevent ADL from firing.
+
+template <typename M1, typename M2>
+inline typename internal::AnyOfResult2<M1, M2>::type
+AnyOf(M1 m1, M2 m2) {
+  return typename internal::AnyOfResult2<M1, M2>::type(
+      m1,
+      m2);
+}
+
+template <typename M1, typename M2, typename M3>
+inline typename internal::AnyOfResult3<M1, M2, M3>::type
+AnyOf(M1 m1, M2 m2, M3 m3) {
+  return typename internal::AnyOfResult3<M1, M2, M3>::type(
+      m1,
+      ::testing::AnyOf(m2, m3));
+}
+
+template <typename M1, typename M2, typename M3, typename M4>
+inline typename internal::AnyOfResult4<M1, M2, M3, M4>::type
+AnyOf(M1 m1, M2 m2, M3 m3, M4 m4) {
+  return typename internal::AnyOfResult4<M1, M2, M3, M4>::type(
+      ::testing::AnyOf(m1, m2),
+      ::testing::AnyOf(m3, m4));
+}
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5>
+inline typename internal::AnyOfResult5<M1, M2, M3, M4, M5>::type
+AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5) {
+  return typename internal::AnyOfResult5<M1, M2, M3, M4, M5>::type(
+      ::testing::AnyOf(m1, m2),
+      ::testing::AnyOf(m3, m4, m5));
+}
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6>
+inline typename internal::AnyOfResult6<M1, M2, M3, M4, M5, M6>::type
+AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6) {
+  return typename internal::AnyOfResult6<M1, M2, M3, M4, M5, M6>::type(
+      ::testing::AnyOf(m1, m2, m3),
+      ::testing::AnyOf(m4, m5, m6));
+}
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7>
+inline typename internal::AnyOfResult7<M1, M2, M3, M4, M5, M6, M7>::type
+AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7) {
+  return typename internal::AnyOfResult7<M1, M2, M3, M4, M5, M6, M7>::type(
+      ::testing::AnyOf(m1, m2, m3),
+      ::testing::AnyOf(m4, m5, m6, m7));
+}
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7, typename M8>
+inline typename internal::AnyOfResult8<M1, M2, M3, M4, M5, M6, M7, M8>::type
+AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8) {
+  return typename internal::AnyOfResult8<M1, M2, M3, M4, M5, M6, M7, M8>::type(
+      ::testing::AnyOf(m1, m2, m3, m4),
+      ::testing::AnyOf(m5, m6, m7, m8));
+}
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7, typename M8, typename M9>
+inline typename internal::AnyOfResult9<M1, M2, M3, M4, M5, M6, M7, M8, M9>::type
+AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9) {
+  return typename internal::AnyOfResult9<M1, M2, M3, M4, M5, M6, M7, M8,
+      M9>::type(
+      ::testing::AnyOf(m1, m2, m3, m4),
+      ::testing::AnyOf(m5, m6, m7, m8, m9));
+}
+
+template <typename M1, typename M2, typename M3, typename M4, typename M5,
+    typename M6, typename M7, typename M8, typename M9, typename M10>
+inline typename internal::AnyOfResult10<M1, M2, M3, M4, M5, M6, M7, M8, M9,
+    M10>::type
+AnyOf(M1 m1, M2 m2, M3 m3, M4 m4, M5 m5, M6 m6, M7 m7, M8 m8, M9 m9, M10 m10) {
+  return typename internal::AnyOfResult10<M1, M2, M3, M4, M5, M6, M7, M8, M9,
+      M10>::type(
+      ::testing::AnyOf(m1, m2, m3, m4, m5),
+      ::testing::AnyOf(m6, m7, m8, m9, m10));
+}
+
+}  // namespace testing
+
+
+// The MATCHER* family of macros can be used in a namespace scope to
+// define custom matchers easily.
+//
+// Basic Usage
+// ===========
+//
+// The syntax
+//
+//   MATCHER(name, description_string) { statements; }
+//
+// defines a matcher with the given name that executes the statements,
+// which must return a bool to indicate if the match succeeds.  Inside
+// the statements, you can refer to the value being matched by 'arg',
+// and refer to its type by 'arg_type'.
+//
+// The description string documents what the matcher does, and is used
+// to generate the failure message when the match fails.  Since a
+// MATCHER() is usually defined in a header file shared by multiple
+// C++ source files, we require the description to be a C-string
+// literal to avoid possible side effects.  It can be empty, in which
+// case we'll use the sequence of words in the matcher name as the
+// description.
+//
+// For example:
+//
+//   MATCHER(IsEven, "") { return (arg % 2) == 0; }
+//
+// allows you to write
+//
+//   // Expects mock_foo.Bar(n) to be called where n is even.
+//   EXPECT_CALL(mock_foo, Bar(IsEven()));
+//
+// or,
+//
+//   // Verifies that the value of some_expression is even.
+//   EXPECT_THAT(some_expression, IsEven());
+//
+// If the above assertion fails, it will print something like:
+//
+//   Value of: some_expression
+//   Expected: is even
+//     Actual: 7
+//
+// where the description "is even" is automatically calculated from the
+// matcher name IsEven.
+//
+// Argument Type
+// =============
+//
+// Note that the type of the value being matched (arg_type) is
+// determined by the context in which you use the matcher and is
+// supplied to you by the compiler, so you don't need to worry about
+// declaring it (nor can you).  This allows the matcher to be
+// polymorphic.  For example, IsEven() can be used to match any type
+// where the value of "(arg % 2) == 0" can be implicitly converted to
+// a bool.  In the "Bar(IsEven())" example above, if method Bar()
+// takes an int, 'arg_type' will be int; if it takes an unsigned long,
+// 'arg_type' will be unsigned long; and so on.
+//
+// Parameterizing Matchers
+// =======================
+//
+// Sometimes you'll want to parameterize the matcher.  For that you
+// can use another macro:
+//
+//   MATCHER_P(name, param_name, description_string) { statements; }
+//
+// For example:
+//
+//   MATCHER_P(HasAbsoluteValue, value, "") { return abs(arg) == value; }
+//
+// will allow you to write:
+//
+//   EXPECT_THAT(Blah("a"), HasAbsoluteValue(n));
+//
+// which may lead to this message (assuming n is 10):
+//
+//   Value of: Blah("a")
+//   Expected: has absolute value 10
+//     Actual: -9
+//
+// Note that both the matcher description and its parameter are
+// printed, making the message human-friendly.
+//
+// In the matcher definition body, you can write 'foo_type' to
+// reference the type of a parameter named 'foo'.  For example, in the
+// body of MATCHER_P(HasAbsoluteValue, value) above, you can write
+// 'value_type' to refer to the type of 'value'.
+//
+// We also provide MATCHER_P2, MATCHER_P3, ..., up to MATCHER_P10 to
+// support multi-parameter matchers.
+//
+// Describing Parameterized Matchers
+// =================================
+//
+// The last argument to MATCHER*() is a string-typed expression.  The
+// expression can reference all of the matcher's parameters and a
+// special bool-typed variable named 'negation'.  When 'negation' is
+// false, the expression should evaluate to the matcher's description;
+// otherwise it should evaluate to the description of the negation of
+// the matcher.  For example,
+//
+//   using testing::PrintToString;
+//
+//   MATCHER_P2(InClosedRange, low, hi,
+//       string(negation ? "is not" : "is") + " in range [" +
+//       PrintToString(low) + ", " + PrintToString(hi) + "]") {
+//     return low <= arg && arg <= hi;
+//   }
+//   ...
+//   EXPECT_THAT(3, InClosedRange(4, 6));
+//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
+//
+// would generate two failures that contain the text:
+//
+//   Expected: is in range [4, 6]
+//   ...
+//   Expected: is not in range [2, 4]
+//
+// If you specify "" as the description, the failure message will
+// contain the sequence of words in the matcher name followed by the
+// parameter values printed as a tuple.  For example,
+//
+//   MATCHER_P2(InClosedRange, low, hi, "") { ... }
+//   ...
+//   EXPECT_THAT(3, InClosedRange(4, 6));
+//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
+//
+// would generate two failures that contain the text:
+//
+//   Expected: in closed range (4, 6)
+//   ...
+//   Expected: not (in closed range (2, 4))
+//
+// Types of Matcher Parameters
+// ===========================
+//
+// For the purpose of typing, you can view
+//
+//   MATCHER_Pk(Foo, p1, ..., pk, description_string) { ... }
+//
+// as shorthand for
+//
+//   template <typename p1_type, ..., typename pk_type>
+//   FooMatcherPk<p1_type, ..., pk_type>
+//   Foo(p1_type p1, ..., pk_type pk) { ... }
+//
+// When you write Foo(v1, ..., vk), the compiler infers the types of
+// the parameters v1, ..., and vk for you.  If you are not happy with
+// the result of the type inference, you can specify the types by
+// explicitly instantiating the template, as in Foo<long, bool>(5,
+// false).  As said earlier, you don't get to (or need to) specify
+// 'arg_type' as that's determined by the context in which the matcher
+// is used.  You can assign the result of expression Foo(p1, ..., pk)
+// to a variable of type FooMatcherPk<p1_type, ..., pk_type>.  This
+// can be useful when composing matchers.
+//
+// While you can instantiate a matcher template with reference types,
+// passing the parameters by pointer usually makes your code more
+// readable.  If, however, you still want to pass a parameter by
+// reference, be aware that in the failure message generated by the
+// matcher you will see the value of the referenced object but not its
+// address.
+//
+// Explaining Match Results
+// ========================
+//
+// Sometimes the matcher description alone isn't enough to explain why
+// the match has failed or succeeded.  For example, when expecting a
+// long string, it can be very helpful to also print the diff between
+// the expected string and the actual one.  To achieve that, you can
+// optionally stream additional information to a special variable
+// named result_listener, whose type is a pointer to class
+// MatchResultListener:
+//
+//   MATCHER_P(EqualsLongString, str, "") {
+//     if (arg == str) return true;
+//
+//     *result_listener << "the difference: "
+///                     << DiffStrings(str, arg);
+//     return false;
+//   }
+//
+// Overloading Matchers
+// ====================
+//
+// You can overload matchers with different numbers of parameters:
+//
+//   MATCHER_P(Blah, a, description_string1) { ... }
+//   MATCHER_P2(Blah, a, b, description_string2) { ... }
+//
+// Caveats
+// =======
+//
+// When defining a new matcher, you should also consider implementing
+// MatcherInterface or using MakePolymorphicMatcher().  These
+// approaches require more work than the MATCHER* macros, but also
+// give you more control on the types of the value being matched and
+// the matcher parameters, which may leads to better compiler error
+// messages when the matcher is used wrong.  They also allow
+// overloading matchers based on parameter types (as opposed to just
+// based on the number of parameters).
+//
+// MATCHER*() can only be used in a namespace scope.  The reason is
+// that C++ doesn't yet allow function-local types to be used to
+// instantiate templates.  The up-coming C++0x standard will fix this.
+// Once that's done, we'll consider supporting using MATCHER*() inside
+// a function.
+//
+// More Information
+// ================
+//
+// To learn more about using these macros, please search for 'MATCHER'
+// on http://code.google.com/p/googlemock/wiki/CookBook.
+
+#define MATCHER(name, description)\
+  class name##Matcher {\
+   public:\
+    template <typename arg_type>\
+    class gmock_Impl : public ::testing::MatcherInterface<arg_type> {\
+     public:\
+      gmock_Impl()\
+           {}\
+      virtual bool MatchAndExplain(\
+          arg_type arg, ::testing::MatchResultListener* result_listener) const;\
+      virtual void DescribeTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(false);\
+      }\
+      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(true);\
+      }\
+     private:\
+      ::testing::internal::string FormatDescription(bool negation) const {\
+        const ::testing::internal::string gmock_description = (description);\
+        if (!gmock_description.empty())\
+          return gmock_description;\
+        return ::testing::internal::FormatMatcherDescription(\
+            negation, #name, \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
+                ::testing::tuple<>()));\
+      }\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename arg_type>\
+    operator ::testing::Matcher<arg_type>() const {\
+      return ::testing::Matcher<arg_type>(\
+          new gmock_Impl<arg_type>());\
+    }\
+    name##Matcher() {\
+    }\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##Matcher);\
+  };\
+  inline name##Matcher name() {\
+    return name##Matcher();\
+  }\
+  template <typename arg_type>\
+  bool name##Matcher::gmock_Impl<arg_type>::MatchAndExplain(\
+      arg_type arg, \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
+          const
+
+#define MATCHER_P(name, p0, description)\
+  template <typename p0##_type>\
+  class name##MatcherP {\
+   public:\
+    template <typename arg_type>\
+    class gmock_Impl : public ::testing::MatcherInterface<arg_type> {\
+     public:\
+      explicit gmock_Impl(p0##_type gmock_p0)\
+           : p0(gmock_p0) {}\
+      virtual bool MatchAndExplain(\
+          arg_type arg, ::testing::MatchResultListener* result_listener) const;\
+      virtual void DescribeTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(false);\
+      }\
+      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(true);\
+      }\
+      p0##_type p0;\
+     private:\
+      ::testing::internal::string FormatDescription(bool negation) const {\
+        const ::testing::internal::string gmock_description = (description);\
+        if (!gmock_description.empty())\
+          return gmock_description;\
+        return ::testing::internal::FormatMatcherDescription(\
+            negation, #name, \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
+                ::testing::tuple<p0##_type>(p0)));\
+      }\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename arg_type>\
+    operator ::testing::Matcher<arg_type>() const {\
+      return ::testing::Matcher<arg_type>(\
+          new gmock_Impl<arg_type>(p0));\
+    }\
+    explicit name##MatcherP(p0##_type gmock_p0) : p0(gmock_p0) {\
+    }\
+    p0##_type p0;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##MatcherP);\
+  };\
+  template <typename p0##_type>\
+  inline name##MatcherP<p0##_type> name(p0##_type p0) {\
+    return name##MatcherP<p0##_type>(p0);\
+  }\
+  template <typename p0##_type>\
+  template <typename arg_type>\
+  bool name##MatcherP<p0##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
+      arg_type arg, \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
+          const
+
+#define MATCHER_P2(name, p0, p1, description)\
+  template <typename p0##_type, typename p1##_type>\
+  class name##MatcherP2 {\
+   public:\
+    template <typename arg_type>\
+    class gmock_Impl : public ::testing::MatcherInterface<arg_type> {\
+     public:\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1)\
+           : p0(gmock_p0), p1(gmock_p1) {}\
+      virtual bool MatchAndExplain(\
+          arg_type arg, ::testing::MatchResultListener* result_listener) const;\
+      virtual void DescribeTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(false);\
+      }\
+      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(true);\
+      }\
+      p0##_type p0;\
+      p1##_type p1;\
+     private:\
+      ::testing::internal::string FormatDescription(bool negation) const {\
+        const ::testing::internal::string gmock_description = (description);\
+        if (!gmock_description.empty())\
+          return gmock_description;\
+        return ::testing::internal::FormatMatcherDescription(\
+            negation, #name, \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
+                ::testing::tuple<p0##_type, p1##_type>(p0, p1)));\
+      }\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename arg_type>\
+    operator ::testing::Matcher<arg_type>() const {\
+      return ::testing::Matcher<arg_type>(\
+          new gmock_Impl<arg_type>(p0, p1));\
+    }\
+    name##MatcherP2(p0##_type gmock_p0, p1##_type gmock_p1) : p0(gmock_p0), \
+        p1(gmock_p1) {\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##MatcherP2);\
+  };\
+  template <typename p0##_type, typename p1##_type>\
+  inline name##MatcherP2<p0##_type, p1##_type> name(p0##_type p0, \
+      p1##_type p1) {\
+    return name##MatcherP2<p0##_type, p1##_type>(p0, p1);\
+  }\
+  template <typename p0##_type, typename p1##_type>\
+  template <typename arg_type>\
+  bool name##MatcherP2<p0##_type, \
+      p1##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
+      arg_type arg, \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
+          const
+
+#define MATCHER_P3(name, p0, p1, p2, description)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type>\
+  class name##MatcherP3 {\
+   public:\
+    template <typename arg_type>\
+    class gmock_Impl : public ::testing::MatcherInterface<arg_type> {\
+     public:\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2)\
+           : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2) {}\
+      virtual bool MatchAndExplain(\
+          arg_type arg, ::testing::MatchResultListener* result_listener) const;\
+      virtual void DescribeTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(false);\
+      }\
+      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(true);\
+      }\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+     private:\
+      ::testing::internal::string FormatDescription(bool negation) const {\
+        const ::testing::internal::string gmock_description = (description);\
+        if (!gmock_description.empty())\
+          return gmock_description;\
+        return ::testing::internal::FormatMatcherDescription(\
+            negation, #name, \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
+                ::testing::tuple<p0##_type, p1##_type, p2##_type>(p0, p1, \
+                    p2)));\
+      }\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename arg_type>\
+    operator ::testing::Matcher<arg_type>() const {\
+      return ::testing::Matcher<arg_type>(\
+          new gmock_Impl<arg_type>(p0, p1, p2));\
+    }\
+    name##MatcherP3(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2) {\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##MatcherP3);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type>\
+  inline name##MatcherP3<p0##_type, p1##_type, p2##_type> name(p0##_type p0, \
+      p1##_type p1, p2##_type p2) {\
+    return name##MatcherP3<p0##_type, p1##_type, p2##_type>(p0, p1, p2);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type>\
+  template <typename arg_type>\
+  bool name##MatcherP3<p0##_type, p1##_type, \
+      p2##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
+      arg_type arg, \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
+          const
+
+#define MATCHER_P4(name, p0, p1, p2, p3, description)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type>\
+  class name##MatcherP4 {\
+   public:\
+    template <typename arg_type>\
+    class gmock_Impl : public ::testing::MatcherInterface<arg_type> {\
+     public:\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3)\
+           : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), p3(gmock_p3) {}\
+      virtual bool MatchAndExplain(\
+          arg_type arg, ::testing::MatchResultListener* result_listener) const;\
+      virtual void DescribeTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(false);\
+      }\
+      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(true);\
+      }\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+     private:\
+      ::testing::internal::string FormatDescription(bool negation) const {\
+        const ::testing::internal::string gmock_description = (description);\
+        if (!gmock_description.empty())\
+          return gmock_description;\
+        return ::testing::internal::FormatMatcherDescription(\
+            negation, #name, \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
+                ::testing::tuple<p0##_type, p1##_type, p2##_type, \
+                    p3##_type>(p0, p1, p2, p3)));\
+      }\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename arg_type>\
+    operator ::testing::Matcher<arg_type>() const {\
+      return ::testing::Matcher<arg_type>(\
+          new gmock_Impl<arg_type>(p0, p1, p2, p3));\
+    }\
+    name##MatcherP4(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3) : p0(gmock_p0), p1(gmock_p1), \
+        p2(gmock_p2), p3(gmock_p3) {\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##MatcherP4);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type>\
+  inline name##MatcherP4<p0##_type, p1##_type, p2##_type, \
+      p3##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, \
+      p3##_type p3) {\
+    return name##MatcherP4<p0##_type, p1##_type, p2##_type, p3##_type>(p0, \
+        p1, p2, p3);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type>\
+  template <typename arg_type>\
+  bool name##MatcherP4<p0##_type, p1##_type, p2##_type, \
+      p3##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
+      arg_type arg, \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
+          const
+
+#define MATCHER_P5(name, p0, p1, p2, p3, p4, description)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type>\
+  class name##MatcherP5 {\
+   public:\
+    template <typename arg_type>\
+    class gmock_Impl : public ::testing::MatcherInterface<arg_type> {\
+     public:\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3, p4##_type gmock_p4)\
+           : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), p3(gmock_p3), \
+               p4(gmock_p4) {}\
+      virtual bool MatchAndExplain(\
+          arg_type arg, ::testing::MatchResultListener* result_listener) const;\
+      virtual void DescribeTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(false);\
+      }\
+      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(true);\
+      }\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+      p4##_type p4;\
+     private:\
+      ::testing::internal::string FormatDescription(bool negation) const {\
+        const ::testing::internal::string gmock_description = (description);\
+        if (!gmock_description.empty())\
+          return gmock_description;\
+        return ::testing::internal::FormatMatcherDescription(\
+            negation, #name, \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
+                ::testing::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
+                    p4##_type>(p0, p1, p2, p3, p4)));\
+      }\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename arg_type>\
+    operator ::testing::Matcher<arg_type>() const {\
+      return ::testing::Matcher<arg_type>(\
+          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4));\
+    }\
+    name##MatcherP5(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3, \
+        p4##_type gmock_p4) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3), p4(gmock_p4) {\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+    p4##_type p4;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##MatcherP5);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type>\
+  inline name##MatcherP5<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
+      p4##_type p4) {\
+    return name##MatcherP5<p0##_type, p1##_type, p2##_type, p3##_type, \
+        p4##_type>(p0, p1, p2, p3, p4);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type>\
+  template <typename arg_type>\
+  bool name##MatcherP5<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
+      arg_type arg, \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
+          const
+
+#define MATCHER_P6(name, p0, p1, p2, p3, p4, p5, description)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type>\
+  class name##MatcherP6 {\
+   public:\
+    template <typename arg_type>\
+    class gmock_Impl : public ::testing::MatcherInterface<arg_type> {\
+     public:\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5)\
+           : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), p3(gmock_p3), \
+               p4(gmock_p4), p5(gmock_p5) {}\
+      virtual bool MatchAndExplain(\
+          arg_type arg, ::testing::MatchResultListener* result_listener) const;\
+      virtual void DescribeTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(false);\
+      }\
+      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(true);\
+      }\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+      p4##_type p4;\
+      p5##_type p5;\
+     private:\
+      ::testing::internal::string FormatDescription(bool negation) const {\
+        const ::testing::internal::string gmock_description = (description);\
+        if (!gmock_description.empty())\
+          return gmock_description;\
+        return ::testing::internal::FormatMatcherDescription(\
+            negation, #name, \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
+                ::testing::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
+                    p4##_type, p5##_type>(p0, p1, p2, p3, p4, p5)));\
+      }\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename arg_type>\
+    operator ::testing::Matcher<arg_type>() const {\
+      return ::testing::Matcher<arg_type>(\
+          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5));\
+    }\
+    name##MatcherP6(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
+        p5##_type gmock_p5) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3), p4(gmock_p4), p5(gmock_p5) {\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+    p4##_type p4;\
+    p5##_type p5;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##MatcherP6);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type>\
+  inline name##MatcherP6<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type, p5##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, \
+      p3##_type p3, p4##_type p4, p5##_type p5) {\
+    return name##MatcherP6<p0##_type, p1##_type, p2##_type, p3##_type, \
+        p4##_type, p5##_type>(p0, p1, p2, p3, p4, p5);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type>\
+  template <typename arg_type>\
+  bool name##MatcherP6<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+      p5##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
+      arg_type arg, \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
+          const
+
+#define MATCHER_P7(name, p0, p1, p2, p3, p4, p5, p6, description)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type>\
+  class name##MatcherP7 {\
+   public:\
+    template <typename arg_type>\
+    class gmock_Impl : public ::testing::MatcherInterface<arg_type> {\
+     public:\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+          p6##_type gmock_p6)\
+           : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), p3(gmock_p3), \
+               p4(gmock_p4), p5(gmock_p5), p6(gmock_p6) {}\
+      virtual bool MatchAndExplain(\
+          arg_type arg, ::testing::MatchResultListener* result_listener) const;\
+      virtual void DescribeTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(false);\
+      }\
+      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(true);\
+      }\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+      p4##_type p4;\
+      p5##_type p5;\
+      p6##_type p6;\
+     private:\
+      ::testing::internal::string FormatDescription(bool negation) const {\
+        const ::testing::internal::string gmock_description = (description);\
+        if (!gmock_description.empty())\
+          return gmock_description;\
+        return ::testing::internal::FormatMatcherDescription(\
+            negation, #name, \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
+                ::testing::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
+                    p4##_type, p5##_type, p6##_type>(p0, p1, p2, p3, p4, p5, \
+                    p6)));\
+      }\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename arg_type>\
+    operator ::testing::Matcher<arg_type>() const {\
+      return ::testing::Matcher<arg_type>(\
+          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5, p6));\
+    }\
+    name##MatcherP7(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
+        p5##_type gmock_p5, p6##_type gmock_p6) : p0(gmock_p0), p1(gmock_p1), \
+        p2(gmock_p2), p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), \
+        p6(gmock_p6) {\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+    p4##_type p4;\
+    p5##_type p5;\
+    p6##_type p6;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##MatcherP7);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type>\
+  inline name##MatcherP7<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type, p5##_type, p6##_type> name(p0##_type p0, p1##_type p1, \
+      p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \
+      p6##_type p6) {\
+    return name##MatcherP7<p0##_type, p1##_type, p2##_type, p3##_type, \
+        p4##_type, p5##_type, p6##_type>(p0, p1, p2, p3, p4, p5, p6);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type>\
+  template <typename arg_type>\
+  bool name##MatcherP7<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+      p5##_type, p6##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
+      arg_type arg, \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
+          const
+
+#define MATCHER_P8(name, p0, p1, p2, p3, p4, p5, p6, p7, description)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type>\
+  class name##MatcherP8 {\
+   public:\
+    template <typename arg_type>\
+    class gmock_Impl : public ::testing::MatcherInterface<arg_type> {\
+     public:\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+          p6##_type gmock_p6, p7##_type gmock_p7)\
+           : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), p3(gmock_p3), \
+               p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), p7(gmock_p7) {}\
+      virtual bool MatchAndExplain(\
+          arg_type arg, ::testing::MatchResultListener* result_listener) const;\
+      virtual void DescribeTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(false);\
+      }\
+      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(true);\
+      }\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+      p4##_type p4;\
+      p5##_type p5;\
+      p6##_type p6;\
+      p7##_type p7;\
+     private:\
+      ::testing::internal::string FormatDescription(bool negation) const {\
+        const ::testing::internal::string gmock_description = (description);\
+        if (!gmock_description.empty())\
+          return gmock_description;\
+        return ::testing::internal::FormatMatcherDescription(\
+            negation, #name, \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
+                ::testing::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
+                    p4##_type, p5##_type, p6##_type, p7##_type>(p0, p1, p2, \
+                    p3, p4, p5, p6, p7)));\
+      }\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename arg_type>\
+    operator ::testing::Matcher<arg_type>() const {\
+      return ::testing::Matcher<arg_type>(\
+          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5, p6, p7));\
+    }\
+    name##MatcherP8(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
+        p5##_type gmock_p5, p6##_type gmock_p6, \
+        p7##_type gmock_p7) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), \
+        p7(gmock_p7) {\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+    p4##_type p4;\
+    p5##_type p5;\
+    p6##_type p6;\
+    p7##_type p7;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##MatcherP8);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type>\
+  inline name##MatcherP8<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type, p5##_type, p6##_type, p7##_type> name(p0##_type p0, \
+      p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \
+      p6##_type p6, p7##_type p7) {\
+    return name##MatcherP8<p0##_type, p1##_type, p2##_type, p3##_type, \
+        p4##_type, p5##_type, p6##_type, p7##_type>(p0, p1, p2, p3, p4, p5, \
+        p6, p7);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type>\
+  template <typename arg_type>\
+  bool name##MatcherP8<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+      p5##_type, p6##_type, \
+      p7##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
+      arg_type arg, \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
+          const
+
+#define MATCHER_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, description)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type, typename p8##_type>\
+  class name##MatcherP9 {\
+   public:\
+    template <typename arg_type>\
+    class gmock_Impl : public ::testing::MatcherInterface<arg_type> {\
+     public:\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+          p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8)\
+           : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), p3(gmock_p3), \
+               p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), p7(gmock_p7), \
+               p8(gmock_p8) {}\
+      virtual bool MatchAndExplain(\
+          arg_type arg, ::testing::MatchResultListener* result_listener) const;\
+      virtual void DescribeTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(false);\
+      }\
+      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(true);\
+      }\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+      p4##_type p4;\
+      p5##_type p5;\
+      p6##_type p6;\
+      p7##_type p7;\
+      p8##_type p8;\
+     private:\
+      ::testing::internal::string FormatDescription(bool negation) const {\
+        const ::testing::internal::string gmock_description = (description);\
+        if (!gmock_description.empty())\
+          return gmock_description;\
+        return ::testing::internal::FormatMatcherDescription(\
+            negation, #name, \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
+                ::testing::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
+                    p4##_type, p5##_type, p6##_type, p7##_type, \
+                    p8##_type>(p0, p1, p2, p3, p4, p5, p6, p7, p8)));\
+      }\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename arg_type>\
+    operator ::testing::Matcher<arg_type>() const {\
+      return ::testing::Matcher<arg_type>(\
+          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5, p6, p7, p8));\
+    }\
+    name##MatcherP9(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
+        p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \
+        p8##_type gmock_p8) : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), \
+        p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), p7(gmock_p7), \
+        p8(gmock_p8) {\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+    p4##_type p4;\
+    p5##_type p5;\
+    p6##_type p6;\
+    p7##_type p7;\
+    p8##_type p8;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##MatcherP9);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type, typename p8##_type>\
+  inline name##MatcherP9<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type, p5##_type, p6##_type, p7##_type, \
+      p8##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
+      p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, \
+      p8##_type p8) {\
+    return name##MatcherP9<p0##_type, p1##_type, p2##_type, p3##_type, \
+        p4##_type, p5##_type, p6##_type, p7##_type, p8##_type>(p0, p1, p2, \
+        p3, p4, p5, p6, p7, p8);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type, typename p8##_type>\
+  template <typename arg_type>\
+  bool name##MatcherP9<p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
+      p5##_type, p6##_type, p7##_type, \
+      p8##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
+      arg_type arg, \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
+          const
+
+#define MATCHER_P10(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, description)\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type, typename p8##_type, \
+      typename p9##_type>\
+  class name##MatcherP10 {\
+   public:\
+    template <typename arg_type>\
+    class gmock_Impl : public ::testing::MatcherInterface<arg_type> {\
+     public:\
+      gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
+          p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
+          p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \
+          p9##_type gmock_p9)\
+           : p0(gmock_p0), p1(gmock_p1), p2(gmock_p2), p3(gmock_p3), \
+               p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), p7(gmock_p7), \
+               p8(gmock_p8), p9(gmock_p9) {}\
+      virtual bool MatchAndExplain(\
+          arg_type arg, ::testing::MatchResultListener* result_listener) const;\
+      virtual void DescribeTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(false);\
+      }\
+      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(true);\
+      }\
+      p0##_type p0;\
+      p1##_type p1;\
+      p2##_type p2;\
+      p3##_type p3;\
+      p4##_type p4;\
+      p5##_type p5;\
+      p6##_type p6;\
+      p7##_type p7;\
+      p8##_type p8;\
+      p9##_type p9;\
+     private:\
+      ::testing::internal::string FormatDescription(bool negation) const {\
+        const ::testing::internal::string gmock_description = (description);\
+        if (!gmock_description.empty())\
+          return gmock_description;\
+        return ::testing::internal::FormatMatcherDescription(\
+            negation, #name, \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
+                ::testing::tuple<p0##_type, p1##_type, p2##_type, p3##_type, \
+                    p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, \
+                    p9##_type>(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)));\
+      }\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename arg_type>\
+    operator ::testing::Matcher<arg_type>() const {\
+      return ::testing::Matcher<arg_type>(\
+          new gmock_Impl<arg_type>(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9));\
+    }\
+    name##MatcherP10(p0##_type gmock_p0, p1##_type gmock_p1, \
+        p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \
+        p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \
+        p8##_type gmock_p8, p9##_type gmock_p9) : p0(gmock_p0), p1(gmock_p1), \
+        p2(gmock_p2), p3(gmock_p3), p4(gmock_p4), p5(gmock_p5), p6(gmock_p6), \
+        p7(gmock_p7), p8(gmock_p8), p9(gmock_p9) {\
+    }\
+    p0##_type p0;\
+    p1##_type p1;\
+    p2##_type p2;\
+    p3##_type p3;\
+    p4##_type p4;\
+    p5##_type p5;\
+    p6##_type p6;\
+    p7##_type p7;\
+    p8##_type p8;\
+    p9##_type p9;\
+   private:\
+    GTEST_DISALLOW_ASSIGN_(name##MatcherP10);\
+  };\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type, typename p8##_type, \
+      typename p9##_type>\
+  inline name##MatcherP10<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, \
+      p9##_type> name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
+      p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \
+      p9##_type p9) {\
+    return name##MatcherP10<p0##_type, p1##_type, p2##_type, p3##_type, \
+        p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, p9##_type>(p0, \
+        p1, p2, p3, p4, p5, p6, p7, p8, p9);\
+  }\
+  template <typename p0##_type, typename p1##_type, typename p2##_type, \
+      typename p3##_type, typename p4##_type, typename p5##_type, \
+      typename p6##_type, typename p7##_type, typename p8##_type, \
+      typename p9##_type>\
+  template <typename arg_type>\
+  bool name##MatcherP10<p0##_type, p1##_type, p2##_type, p3##_type, \
+      p4##_type, p5##_type, p6##_type, p7##_type, p8##_type, \
+      p9##_type>::gmock_Impl<arg_type>::MatchAndExplain(\
+      arg_type arg, \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
+          const
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-matchers.h.pump b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-matchers.h.pump
new file mode 100644
index 0000000000..de30c2c92b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-matchers.h.pump
@@ -0,0 +1,672 @@
+$$ -*- mode: c++; -*-
+$$ This is a Pump source file.  Please use Pump to convert it to
+$$ gmock-generated-actions.h.
+$$
+$var n = 10  $$ The maximum arity we support.
+$$ }} This line fixes auto-indentation of the following code in Emacs.
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some commonly used variadic matchers.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
+
+#include <iterator>
+#include <sstream>
+#include <string>
+#include <vector>
+#include "gmock/gmock-matchers.h"
+
+namespace testing {
+namespace internal {
+
+$range i 0..n-1
+
+// The type of the i-th (0-based) field of Tuple.
+#define GMOCK_FIELD_TYPE_(Tuple, i) \
+    typename ::testing::tuple_element<i, Tuple>::type
+
+// TupleFields<Tuple, k0, ..., kn> is for selecting fields from a
+// tuple of type Tuple.  It has two members:
+//
+//   type: a tuple type whose i-th field is the ki-th field of Tuple.
+//   GetSelectedFields(t): returns fields k0, ..., and kn of t as a tuple.
+//
+// For example, in class TupleFields<tuple<bool, char, int>, 2, 0>, we have:
+//
+//   type is tuple<int, bool>, and
+//   GetSelectedFields(make_tuple(true, 'a', 42)) is (42, true).
+
+template <class Tuple$for i [[, int k$i = -1]]>
+class TupleFields;
+
+// This generic version is used when there are $n selectors.
+template <class Tuple$for i [[, int k$i]]>
+class TupleFields {
+ public:
+  typedef ::testing::tuple<$for i, [[GMOCK_FIELD_TYPE_(Tuple, k$i)]]> type;
+  static type GetSelectedFields(const Tuple& t) {
+    return type($for i, [[get<k$i>(t)]]);
+  }
+};
+
+// The following specialization is used for 0 ~ $(n-1) selectors.
+
+$for i [[
+$$ }}}
+$range j 0..i-1
+$range k 0..n-1
+
+template <class Tuple$for j [[, int k$j]]>
+class TupleFields<Tuple, $for k, [[$if k < i [[k$k]] $else [[-1]]]]> {
+ public:
+  typedef ::testing::tuple<$for j, [[GMOCK_FIELD_TYPE_(Tuple, k$j)]]> type;
+  static type GetSelectedFields(const Tuple& $if i==0 [[/* t */]] $else [[t]]) {
+    return type($for j, [[get<k$j>(t)]]);
+  }
+};
+
+]]
+
+#undef GMOCK_FIELD_TYPE_
+
+// Implements the Args() matcher.
+
+$var ks = [[$for i, [[k$i]]]]
+template <class ArgsTuple$for i [[, int k$i = -1]]>
+class ArgsMatcherImpl : public MatcherInterface<ArgsTuple> {
+ public:
+  // ArgsTuple may have top-level const or reference modifiers.
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(ArgsTuple) RawArgsTuple;
+  typedef typename internal::TupleFields<RawArgsTuple, $ks>::type SelectedArgs;
+  typedef Matcher<const SelectedArgs&> MonomorphicInnerMatcher;
+
+  template <typename InnerMatcher>
+  explicit ArgsMatcherImpl(const InnerMatcher& inner_matcher)
+      : inner_matcher_(SafeMatcherCast<const SelectedArgs&>(inner_matcher)) {}
+
+  virtual bool MatchAndExplain(ArgsTuple args,
+                               MatchResultListener* listener) const {
+    const SelectedArgs& selected_args = GetSelectedArgs(args);
+    if (!listener->IsInterested())
+      return inner_matcher_.Matches(selected_args);
+
+    PrintIndices(listener->stream());
+    *listener << "are " << PrintToString(selected_args);
+
+    StringMatchResultListener inner_listener;
+    const bool match = inner_matcher_.MatchAndExplain(selected_args,
+                                                      &inner_listener);
+    PrintIfNotEmpty(inner_listener.str(), listener->stream());
+    return match;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "are a tuple ";
+    PrintIndices(os);
+    inner_matcher_.DescribeTo(os);
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "are a tuple ";
+    PrintIndices(os);
+    inner_matcher_.DescribeNegationTo(os);
+  }
+
+ private:
+  static SelectedArgs GetSelectedArgs(ArgsTuple args) {
+    return TupleFields<RawArgsTuple, $ks>::GetSelectedFields(args);
+  }
+
+  // Prints the indices of the selected fields.
+  static void PrintIndices(::std::ostream* os) {
+    *os << "whose fields (";
+    const int indices[$n] = { $ks };
+    for (int i = 0; i < $n; i++) {
+      if (indices[i] < 0)
+        break;
+
+      if (i >= 1)
+        *os << ", ";
+
+      *os << "#" << indices[i];
+    }
+    *os << ") ";
+  }
+
+  const MonomorphicInnerMatcher inner_matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(ArgsMatcherImpl);
+};
+
+template <class InnerMatcher$for i [[, int k$i = -1]]>
+class ArgsMatcher {
+ public:
+  explicit ArgsMatcher(const InnerMatcher& inner_matcher)
+      : inner_matcher_(inner_matcher) {}
+
+  template <typename ArgsTuple>
+  operator Matcher<ArgsTuple>() const {
+    return MakeMatcher(new ArgsMatcherImpl<ArgsTuple, $ks>(inner_matcher_));
+  }
+
+ private:
+  const InnerMatcher inner_matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(ArgsMatcher);
+};
+
+// A set of metafunctions for computing the result type of AllOf.
+// AllOf(m1, ..., mN) returns
+// AllOfResultN<decltype(m1), ..., decltype(mN)>::type.
+
+// Although AllOf isn't defined for one argument, AllOfResult1 is defined
+// to simplify the implementation.
+template <typename M1>
+struct AllOfResult1 {
+  typedef M1 type;
+};
+
+$range i 1..n
+
+$range i 2..n
+$for i [[
+$range j 2..i
+$var m = i/2
+$range k 1..m
+$range t m+1..i
+
+template <typename M1$for j [[, typename M$j]]>
+struct AllOfResult$i {
+  typedef BothOfMatcher<
+      typename AllOfResult$m<$for k, [[M$k]]>::type,
+      typename AllOfResult$(i-m)<$for t, [[M$t]]>::type
+  > type;
+};
+
+]]
+
+// A set of metafunctions for computing the result type of AnyOf.
+// AnyOf(m1, ..., mN) returns
+// AnyOfResultN<decltype(m1), ..., decltype(mN)>::type.
+
+// Although AnyOf isn't defined for one argument, AnyOfResult1 is defined
+// to simplify the implementation.
+template <typename M1>
+struct AnyOfResult1 {
+  typedef M1 type;
+};
+
+$range i 1..n
+
+$range i 2..n
+$for i [[
+$range j 2..i
+$var m = i/2
+$range k 1..m
+$range t m+1..i
+
+template <typename M1$for j [[, typename M$j]]>
+struct AnyOfResult$i {
+  typedef EitherOfMatcher<
+      typename AnyOfResult$m<$for k, [[M$k]]>::type,
+      typename AnyOfResult$(i-m)<$for t, [[M$t]]>::type
+  > type;
+};
+
+]]
+
+}  // namespace internal
+
+// Args<N1, N2, ..., Nk>(a_matcher) matches a tuple if the selected
+// fields of it matches a_matcher.  C++ doesn't support default
+// arguments for function templates, so we have to overload it.
+
+$range i 0..n
+$for i [[
+$range j 1..i
+template <$for j [[int k$j, ]]typename InnerMatcher>
+inline internal::ArgsMatcher<InnerMatcher$for j [[, k$j]]>
+Args(const InnerMatcher& matcher) {
+  return internal::ArgsMatcher<InnerMatcher$for j [[, k$j]]>(matcher);
+}
+
+
+]]
+// ElementsAre(e_1, e_2, ... e_n) matches an STL-style container with
+// n elements, where the i-th element in the container must
+// match the i-th argument in the list.  Each argument of
+// ElementsAre() can be either a value or a matcher.  We support up to
+// $n arguments.
+//
+// The use of DecayArray in the implementation allows ElementsAre()
+// to accept string literals, whose type is const char[N], but we
+// want to treat them as const char*.
+//
+// NOTE: Since ElementsAre() cares about the order of the elements, it
+// must not be used with containers whose elements's order is
+// undefined (e.g. hash_map).
+
+$range i 0..n
+$for i [[
+
+$range j 1..i
+
+$if i>0 [[
+
+template <$for j, [[typename T$j]]>
+]]
+
+inline internal::ElementsAreMatcher<
+    ::testing::tuple<
+$for j, [[
+
+        typename internal::DecayArray<T$j[[]]>::type]]> >
+ElementsAre($for j, [[const T$j& e$j]]) {
+  typedef ::testing::tuple<
+$for j, [[
+
+      typename internal::DecayArray<T$j[[]]>::type]]> Args;
+  return internal::ElementsAreMatcher<Args>(Args($for j, [[e$j]]));
+}
+
+]]
+
+// UnorderedElementsAre(e_1, e_2, ..., e_n) is an ElementsAre extension
+// that matches n elements in any order.  We support up to n=$n arguments.
+
+$range i 0..n
+$for i [[
+
+$range j 1..i
+
+$if i>0 [[
+
+template <$for j, [[typename T$j]]>
+]]
+
+inline internal::UnorderedElementsAreMatcher<
+    ::testing::tuple<
+$for j, [[
+
+        typename internal::DecayArray<T$j[[]]>::type]]> >
+UnorderedElementsAre($for j, [[const T$j& e$j]]) {
+  typedef ::testing::tuple<
+$for j, [[
+
+      typename internal::DecayArray<T$j[[]]>::type]]> Args;
+  return internal::UnorderedElementsAreMatcher<Args>(Args($for j, [[e$j]]));
+}
+
+]]
+
+// AllOf(m1, m2, ..., mk) matches any value that matches all of the given
+// sub-matchers.  AllOf is called fully qualified to prevent ADL from firing.
+
+$range i 2..n
+$for i [[
+$range j 1..i
+$var m = i/2
+$range k 1..m
+$range t m+1..i
+
+template <$for j, [[typename M$j]]>
+inline typename internal::AllOfResult$i<$for j, [[M$j]]>::type
+AllOf($for j, [[M$j m$j]]) {
+  return typename internal::AllOfResult$i<$for j, [[M$j]]>::type(
+      $if m == 1 [[m1]] $else [[::testing::AllOf($for k, [[m$k]])]],
+      $if m+1 == i [[m$i]] $else [[::testing::AllOf($for t, [[m$t]])]]);
+}
+
+]]
+
+// AnyOf(m1, m2, ..., mk) matches any value that matches any of the given
+// sub-matchers.  AnyOf is called fully qualified to prevent ADL from firing.
+
+$range i 2..n
+$for i [[
+$range j 1..i
+$var m = i/2
+$range k 1..m
+$range t m+1..i
+
+template <$for j, [[typename M$j]]>
+inline typename internal::AnyOfResult$i<$for j, [[M$j]]>::type
+AnyOf($for j, [[M$j m$j]]) {
+  return typename internal::AnyOfResult$i<$for j, [[M$j]]>::type(
+      $if m == 1 [[m1]] $else [[::testing::AnyOf($for k, [[m$k]])]],
+      $if m+1 == i [[m$i]] $else [[::testing::AnyOf($for t, [[m$t]])]]);
+}
+
+]]
+
+}  // namespace testing
+$$ } // This Pump meta comment fixes auto-indentation in Emacs. It will not
+$$   // show up in the generated code.
+
+
+// The MATCHER* family of macros can be used in a namespace scope to
+// define custom matchers easily.
+//
+// Basic Usage
+// ===========
+//
+// The syntax
+//
+//   MATCHER(name, description_string) { statements; }
+//
+// defines a matcher with the given name that executes the statements,
+// which must return a bool to indicate if the match succeeds.  Inside
+// the statements, you can refer to the value being matched by 'arg',
+// and refer to its type by 'arg_type'.
+//
+// The description string documents what the matcher does, and is used
+// to generate the failure message when the match fails.  Since a
+// MATCHER() is usually defined in a header file shared by multiple
+// C++ source files, we require the description to be a C-string
+// literal to avoid possible side effects.  It can be empty, in which
+// case we'll use the sequence of words in the matcher name as the
+// description.
+//
+// For example:
+//
+//   MATCHER(IsEven, "") { return (arg % 2) == 0; }
+//
+// allows you to write
+//
+//   // Expects mock_foo.Bar(n) to be called where n is even.
+//   EXPECT_CALL(mock_foo, Bar(IsEven()));
+//
+// or,
+//
+//   // Verifies that the value of some_expression is even.
+//   EXPECT_THAT(some_expression, IsEven());
+//
+// If the above assertion fails, it will print something like:
+//
+//   Value of: some_expression
+//   Expected: is even
+//     Actual: 7
+//
+// where the description "is even" is automatically calculated from the
+// matcher name IsEven.
+//
+// Argument Type
+// =============
+//
+// Note that the type of the value being matched (arg_type) is
+// determined by the context in which you use the matcher and is
+// supplied to you by the compiler, so you don't need to worry about
+// declaring it (nor can you).  This allows the matcher to be
+// polymorphic.  For example, IsEven() can be used to match any type
+// where the value of "(arg % 2) == 0" can be implicitly converted to
+// a bool.  In the "Bar(IsEven())" example above, if method Bar()
+// takes an int, 'arg_type' will be int; if it takes an unsigned long,
+// 'arg_type' will be unsigned long; and so on.
+//
+// Parameterizing Matchers
+// =======================
+//
+// Sometimes you'll want to parameterize the matcher.  For that you
+// can use another macro:
+//
+//   MATCHER_P(name, param_name, description_string) { statements; }
+//
+// For example:
+//
+//   MATCHER_P(HasAbsoluteValue, value, "") { return abs(arg) == value; }
+//
+// will allow you to write:
+//
+//   EXPECT_THAT(Blah("a"), HasAbsoluteValue(n));
+//
+// which may lead to this message (assuming n is 10):
+//
+//   Value of: Blah("a")
+//   Expected: has absolute value 10
+//     Actual: -9
+//
+// Note that both the matcher description and its parameter are
+// printed, making the message human-friendly.
+//
+// In the matcher definition body, you can write 'foo_type' to
+// reference the type of a parameter named 'foo'.  For example, in the
+// body of MATCHER_P(HasAbsoluteValue, value) above, you can write
+// 'value_type' to refer to the type of 'value'.
+//
+// We also provide MATCHER_P2, MATCHER_P3, ..., up to MATCHER_P$n to
+// support multi-parameter matchers.
+//
+// Describing Parameterized Matchers
+// =================================
+//
+// The last argument to MATCHER*() is a string-typed expression.  The
+// expression can reference all of the matcher's parameters and a
+// special bool-typed variable named 'negation'.  When 'negation' is
+// false, the expression should evaluate to the matcher's description;
+// otherwise it should evaluate to the description of the negation of
+// the matcher.  For example,
+//
+//   using testing::PrintToString;
+//
+//   MATCHER_P2(InClosedRange, low, hi,
+//       string(negation ? "is not" : "is") + " in range [" +
+//       PrintToString(low) + ", " + PrintToString(hi) + "]") {
+//     return low <= arg && arg <= hi;
+//   }
+//   ...
+//   EXPECT_THAT(3, InClosedRange(4, 6));
+//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
+//
+// would generate two failures that contain the text:
+//
+//   Expected: is in range [4, 6]
+//   ...
+//   Expected: is not in range [2, 4]
+//
+// If you specify "" as the description, the failure message will
+// contain the sequence of words in the matcher name followed by the
+// parameter values printed as a tuple.  For example,
+//
+//   MATCHER_P2(InClosedRange, low, hi, "") { ... }
+//   ...
+//   EXPECT_THAT(3, InClosedRange(4, 6));
+//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
+//
+// would generate two failures that contain the text:
+//
+//   Expected: in closed range (4, 6)
+//   ...
+//   Expected: not (in closed range (2, 4))
+//
+// Types of Matcher Parameters
+// ===========================
+//
+// For the purpose of typing, you can view
+//
+//   MATCHER_Pk(Foo, p1, ..., pk, description_string) { ... }
+//
+// as shorthand for
+//
+//   template <typename p1_type, ..., typename pk_type>
+//   FooMatcherPk<p1_type, ..., pk_type>
+//   Foo(p1_type p1, ..., pk_type pk) { ... }
+//
+// When you write Foo(v1, ..., vk), the compiler infers the types of
+// the parameters v1, ..., and vk for you.  If you are not happy with
+// the result of the type inference, you can specify the types by
+// explicitly instantiating the template, as in Foo<long, bool>(5,
+// false).  As said earlier, you don't get to (or need to) specify
+// 'arg_type' as that's determined by the context in which the matcher
+// is used.  You can assign the result of expression Foo(p1, ..., pk)
+// to a variable of type FooMatcherPk<p1_type, ..., pk_type>.  This
+// can be useful when composing matchers.
+//
+// While you can instantiate a matcher template with reference types,
+// passing the parameters by pointer usually makes your code more
+// readable.  If, however, you still want to pass a parameter by
+// reference, be aware that in the failure message generated by the
+// matcher you will see the value of the referenced object but not its
+// address.
+//
+// Explaining Match Results
+// ========================
+//
+// Sometimes the matcher description alone isn't enough to explain why
+// the match has failed or succeeded.  For example, when expecting a
+// long string, it can be very helpful to also print the diff between
+// the expected string and the actual one.  To achieve that, you can
+// optionally stream additional information to a special variable
+// named result_listener, whose type is a pointer to class
+// MatchResultListener:
+//
+//   MATCHER_P(EqualsLongString, str, "") {
+//     if (arg == str) return true;
+//
+//     *result_listener << "the difference: "
+///                     << DiffStrings(str, arg);
+//     return false;
+//   }
+//
+// Overloading Matchers
+// ====================
+//
+// You can overload matchers with different numbers of parameters:
+//
+//   MATCHER_P(Blah, a, description_string1) { ... }
+//   MATCHER_P2(Blah, a, b, description_string2) { ... }
+//
+// Caveats
+// =======
+//
+// When defining a new matcher, you should also consider implementing
+// MatcherInterface or using MakePolymorphicMatcher().  These
+// approaches require more work than the MATCHER* macros, but also
+// give you more control on the types of the value being matched and
+// the matcher parameters, which may leads to better compiler error
+// messages when the matcher is used wrong.  They also allow
+// overloading matchers based on parameter types (as opposed to just
+// based on the number of parameters).
+//
+// MATCHER*() can only be used in a namespace scope.  The reason is
+// that C++ doesn't yet allow function-local types to be used to
+// instantiate templates.  The up-coming C++0x standard will fix this.
+// Once that's done, we'll consider supporting using MATCHER*() inside
+// a function.
+//
+// More Information
+// ================
+//
+// To learn more about using these macros, please search for 'MATCHER'
+// on http://code.google.com/p/googlemock/wiki/CookBook.
+
+$range i 0..n
+$for i
+
+[[
+$var macro_name = [[$if i==0 [[MATCHER]] $elif i==1 [[MATCHER_P]]
+                                         $else [[MATCHER_P$i]]]]
+$var class_name = [[name##Matcher[[$if i==0 [[]] $elif i==1 [[P]]
+                                                 $else [[P$i]]]]]]
+$range j 0..i-1
+$var template = [[$if i==0 [[]] $else [[
+
+  template <$for j, [[typename p$j##_type]]>\
+]]]]
+$var ctor_param_list = [[$for j, [[p$j##_type gmock_p$j]]]]
+$var impl_ctor_param_list = [[$for j, [[p$j##_type gmock_p$j]]]]
+$var impl_inits = [[$if i==0 [[]] $else [[ : $for j, [[p$j(gmock_p$j)]]]]]]
+$var inits = [[$if i==0 [[]] $else [[ : $for j, [[p$j(gmock_p$j)]]]]]]
+$var params = [[$for j, [[p$j]]]]
+$var param_types = [[$if i==0 [[]] $else [[<$for j, [[p$j##_type]]>]]]]
+$var param_types_and_names = [[$for j, [[p$j##_type p$j]]]]
+$var param_field_decls = [[$for j
+[[
+
+      p$j##_type p$j;\
+]]]]
+$var param_field_decls2 = [[$for j
+[[
+
+    p$j##_type p$j;\
+]]]]
+
+#define $macro_name(name$for j [[, p$j]], description)\$template
+  class $class_name {\
+   public:\
+    template <typename arg_type>\
+    class gmock_Impl : public ::testing::MatcherInterface<arg_type> {\
+     public:\
+      [[$if i==1 [[explicit ]]]]gmock_Impl($impl_ctor_param_list)\
+          $impl_inits {}\
+      virtual bool MatchAndExplain(\
+          arg_type arg, ::testing::MatchResultListener* result_listener) const;\
+      virtual void DescribeTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(false);\
+      }\
+      virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\
+        *gmock_os << FormatDescription(true);\
+      }\$param_field_decls
+     private:\
+      ::testing::internal::string FormatDescription(bool negation) const {\
+        const ::testing::internal::string gmock_description = (description);\
+        if (!gmock_description.empty())\
+          return gmock_description;\
+        return ::testing::internal::FormatMatcherDescription(\
+            negation, #name, \
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(\
+                ::testing::tuple<$for j, [[p$j##_type]]>($for j, [[p$j]])));\
+      }\
+      GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
+    };\
+    template <typename arg_type>\
+    operator ::testing::Matcher<arg_type>() const {\
+      return ::testing::Matcher<arg_type>(\
+          new gmock_Impl<arg_type>($params));\
+    }\
+    [[$if i==1 [[explicit ]]]]$class_name($ctor_param_list)$inits {\
+    }\$param_field_decls2
+   private:\
+    GTEST_DISALLOW_ASSIGN_($class_name);\
+  };\$template
+  inline $class_name$param_types name($param_types_and_names) {\
+    return $class_name$param_types($params);\
+  }\$template
+  template <typename arg_type>\
+  bool $class_name$param_types::gmock_Impl<arg_type>::MatchAndExplain(\
+      arg_type arg, \
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_)\
+          const
+]]
+
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-nice-strict.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-nice-strict.h
new file mode 100644
index 0000000000..4095f4d5bc
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-nice-strict.h
@@ -0,0 +1,397 @@
+// This file was GENERATED by command:
+//     pump.py gmock-generated-nice-strict.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Implements class templates NiceMock, NaggyMock, and StrictMock.
+//
+// Given a mock class MockFoo that is created using Google Mock,
+// NiceMock<MockFoo> is a subclass of MockFoo that allows
+// uninteresting calls (i.e. calls to mock methods that have no
+// EXPECT_CALL specs), NaggyMock<MockFoo> is a subclass of MockFoo
+// that prints a warning when an uninteresting call occurs, and
+// StrictMock<MockFoo> is a subclass of MockFoo that treats all
+// uninteresting calls as errors.
+//
+// Currently a mock is naggy by default, so MockFoo and
+// NaggyMock<MockFoo> behave like the same.  However, we will soon
+// switch the default behavior of mocks to be nice, as that in general
+// leads to more maintainable tests.  When that happens, MockFoo will
+// stop behaving like NaggyMock<MockFoo> and start behaving like
+// NiceMock<MockFoo>.
+//
+// NiceMock, NaggyMock, and StrictMock "inherit" the constructors of
+// their respective base class, with up-to 10 arguments.  Therefore
+// you can write NiceMock<MockFoo>(5, "a") to construct a nice mock
+// where MockFoo has a constructor that accepts (int, const char*),
+// for example.
+//
+// A known limitation is that NiceMock<MockFoo>, NaggyMock<MockFoo>,
+// and StrictMock<MockFoo> only works for mock methods defined using
+// the MOCK_METHOD* family of macros DIRECTLY in the MockFoo class.
+// If a mock method is defined in a base class of MockFoo, the "nice"
+// or "strict" modifier may not affect it, depending on the compiler.
+// In particular, nesting NiceMock, NaggyMock, and StrictMock is NOT
+// supported.
+//
+// Another known limitation is that the constructors of the base mock
+// cannot have arguments passed by non-const reference, which are
+// banned by the Google C++ style guide anyway.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
+
+#include "gmock/gmock-spec-builders.h"
+#include "gmock/internal/gmock-port.h"
+
+namespace testing {
+
+template <class MockClass>
+class NiceMock : public MockClass {
+ public:
+  // We don't factor out the constructor body to a common method, as
+  // we have to avoid a possible clash with members of MockClass.
+  NiceMock() {
+    ::testing::Mock::AllowUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  // C++ doesn't (yet) allow inheritance of constructors, so we have
+  // to define it for each arity.
+  template <typename A1>
+  explicit NiceMock(const A1& a1) : MockClass(a1) {
+    ::testing::Mock::AllowUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+  template <typename A1, typename A2>
+  NiceMock(const A1& a1, const A2& a2) : MockClass(a1, a2) {
+    ::testing::Mock::AllowUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3>
+  NiceMock(const A1& a1, const A2& a2, const A3& a3) : MockClass(a1, a2, a3) {
+    ::testing::Mock::AllowUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4>
+  NiceMock(const A1& a1, const A2& a2, const A3& a3,
+      const A4& a4) : MockClass(a1, a2, a3, a4) {
+    ::testing::Mock::AllowUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5>
+  NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5) : MockClass(a1, a2, a3, a4, a5) {
+    ::testing::Mock::AllowUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6>
+  NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6) : MockClass(a1, a2, a3, a4, a5, a6) {
+    ::testing::Mock::AllowUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6, typename A7>
+  NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6, const A7& a7) : MockClass(a1, a2, a3, a4, a5,
+      a6, a7) {
+    ::testing::Mock::AllowUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6, typename A7, typename A8>
+  NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6, const A7& a7, const A8& a8) : MockClass(a1,
+      a2, a3, a4, a5, a6, a7, a8) {
+    ::testing::Mock::AllowUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6, typename A7, typename A8, typename A9>
+  NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6, const A7& a7, const A8& a8,
+      const A9& a9) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9) {
+    ::testing::Mock::AllowUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6, typename A7, typename A8, typename A9, typename A10>
+  NiceMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6, const A7& a7, const A8& a8, const A9& a9,
+      const A10& a10) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) {
+    ::testing::Mock::AllowUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  virtual ~NiceMock() {
+    ::testing::Mock::UnregisterCallReaction(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(NiceMock);
+};
+
+template <class MockClass>
+class NaggyMock : public MockClass {
+ public:
+  // We don't factor out the constructor body to a common method, as
+  // we have to avoid a possible clash with members of MockClass.
+  NaggyMock() {
+    ::testing::Mock::WarnUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  // C++ doesn't (yet) allow inheritance of constructors, so we have
+  // to define it for each arity.
+  template <typename A1>
+  explicit NaggyMock(const A1& a1) : MockClass(a1) {
+    ::testing::Mock::WarnUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+  template <typename A1, typename A2>
+  NaggyMock(const A1& a1, const A2& a2) : MockClass(a1, a2) {
+    ::testing::Mock::WarnUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3>
+  NaggyMock(const A1& a1, const A2& a2, const A3& a3) : MockClass(a1, a2, a3) {
+    ::testing::Mock::WarnUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4>
+  NaggyMock(const A1& a1, const A2& a2, const A3& a3,
+      const A4& a4) : MockClass(a1, a2, a3, a4) {
+    ::testing::Mock::WarnUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5>
+  NaggyMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5) : MockClass(a1, a2, a3, a4, a5) {
+    ::testing::Mock::WarnUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6>
+  NaggyMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6) : MockClass(a1, a2, a3, a4, a5, a6) {
+    ::testing::Mock::WarnUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6, typename A7>
+  NaggyMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6, const A7& a7) : MockClass(a1, a2, a3, a4, a5,
+      a6, a7) {
+    ::testing::Mock::WarnUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6, typename A7, typename A8>
+  NaggyMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6, const A7& a7, const A8& a8) : MockClass(a1,
+      a2, a3, a4, a5, a6, a7, a8) {
+    ::testing::Mock::WarnUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6, typename A7, typename A8, typename A9>
+  NaggyMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6, const A7& a7, const A8& a8,
+      const A9& a9) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9) {
+    ::testing::Mock::WarnUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6, typename A7, typename A8, typename A9, typename A10>
+  NaggyMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6, const A7& a7, const A8& a8, const A9& a9,
+      const A10& a10) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) {
+    ::testing::Mock::WarnUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  virtual ~NaggyMock() {
+    ::testing::Mock::UnregisterCallReaction(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(NaggyMock);
+};
+
+template <class MockClass>
+class StrictMock : public MockClass {
+ public:
+  // We don't factor out the constructor body to a common method, as
+  // we have to avoid a possible clash with members of MockClass.
+  StrictMock() {
+    ::testing::Mock::FailUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  // C++ doesn't (yet) allow inheritance of constructors, so we have
+  // to define it for each arity.
+  template <typename A1>
+  explicit StrictMock(const A1& a1) : MockClass(a1) {
+    ::testing::Mock::FailUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+  template <typename A1, typename A2>
+  StrictMock(const A1& a1, const A2& a2) : MockClass(a1, a2) {
+    ::testing::Mock::FailUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3>
+  StrictMock(const A1& a1, const A2& a2, const A3& a3) : MockClass(a1, a2, a3) {
+    ::testing::Mock::FailUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4>
+  StrictMock(const A1& a1, const A2& a2, const A3& a3,
+      const A4& a4) : MockClass(a1, a2, a3, a4) {
+    ::testing::Mock::FailUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5>
+  StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5) : MockClass(a1, a2, a3, a4, a5) {
+    ::testing::Mock::FailUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6>
+  StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6) : MockClass(a1, a2, a3, a4, a5, a6) {
+    ::testing::Mock::FailUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6, typename A7>
+  StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6, const A7& a7) : MockClass(a1, a2, a3, a4, a5,
+      a6, a7) {
+    ::testing::Mock::FailUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6, typename A7, typename A8>
+  StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6, const A7& a7, const A8& a8) : MockClass(a1,
+      a2, a3, a4, a5, a6, a7, a8) {
+    ::testing::Mock::FailUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6, typename A7, typename A8, typename A9>
+  StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6, const A7& a7, const A8& a8,
+      const A9& a9) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9) {
+    ::testing::Mock::FailUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  template <typename A1, typename A2, typename A3, typename A4, typename A5,
+      typename A6, typename A7, typename A8, typename A9, typename A10>
+  StrictMock(const A1& a1, const A2& a2, const A3& a3, const A4& a4,
+      const A5& a5, const A6& a6, const A7& a7, const A8& a8, const A9& a9,
+      const A10& a10) : MockClass(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) {
+    ::testing::Mock::FailUninterestingCalls(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  virtual ~StrictMock() {
+    ::testing::Mock::UnregisterCallReaction(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StrictMock);
+};
+
+// The following specializations catch some (relatively more common)
+// user errors of nesting nice and strict mocks.  They do NOT catch
+// all possible errors.
+
+// These specializations are declared but not defined, as NiceMock,
+// NaggyMock, and StrictMock cannot be nested.
+
+template <typename MockClass>
+class NiceMock<NiceMock<MockClass> >;
+template <typename MockClass>
+class NiceMock<NaggyMock<MockClass> >;
+template <typename MockClass>
+class NiceMock<StrictMock<MockClass> >;
+
+template <typename MockClass>
+class NaggyMock<NiceMock<MockClass> >;
+template <typename MockClass>
+class NaggyMock<NaggyMock<MockClass> >;
+template <typename MockClass>
+class NaggyMock<StrictMock<MockClass> >;
+
+template <typename MockClass>
+class StrictMock<NiceMock<MockClass> >;
+template <typename MockClass>
+class StrictMock<NaggyMock<MockClass> >;
+template <typename MockClass>
+class StrictMock<StrictMock<MockClass> >;
+
+}  // namespace testing
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-nice-strict.h.pump b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-nice-strict.h.pump
new file mode 100644
index 0000000000..3ee1ce7f30
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-generated-nice-strict.h.pump
@@ -0,0 +1,161 @@
+$$ -*- mode: c++; -*-
+$$ This is a Pump source file.  Please use Pump to convert it to
+$$ gmock-generated-nice-strict.h.
+$$
+$var n = 10  $$ The maximum arity we support.
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Implements class templates NiceMock, NaggyMock, and StrictMock.
+//
+// Given a mock class MockFoo that is created using Google Mock,
+// NiceMock<MockFoo> is a subclass of MockFoo that allows
+// uninteresting calls (i.e. calls to mock methods that have no
+// EXPECT_CALL specs), NaggyMock<MockFoo> is a subclass of MockFoo
+// that prints a warning when an uninteresting call occurs, and
+// StrictMock<MockFoo> is a subclass of MockFoo that treats all
+// uninteresting calls as errors.
+//
+// Currently a mock is naggy by default, so MockFoo and
+// NaggyMock<MockFoo> behave like the same.  However, we will soon
+// switch the default behavior of mocks to be nice, as that in general
+// leads to more maintainable tests.  When that happens, MockFoo will
+// stop behaving like NaggyMock<MockFoo> and start behaving like
+// NiceMock<MockFoo>.
+//
+// NiceMock, NaggyMock, and StrictMock "inherit" the constructors of
+// their respective base class, with up-to $n arguments.  Therefore
+// you can write NiceMock<MockFoo>(5, "a") to construct a nice mock
+// where MockFoo has a constructor that accepts (int, const char*),
+// for example.
+//
+// A known limitation is that NiceMock<MockFoo>, NaggyMock<MockFoo>,
+// and StrictMock<MockFoo> only works for mock methods defined using
+// the MOCK_METHOD* family of macros DIRECTLY in the MockFoo class.
+// If a mock method is defined in a base class of MockFoo, the "nice"
+// or "strict" modifier may not affect it, depending on the compiler.
+// In particular, nesting NiceMock, NaggyMock, and StrictMock is NOT
+// supported.
+//
+// Another known limitation is that the constructors of the base mock
+// cannot have arguments passed by non-const reference, which are
+// banned by the Google C++ style guide anyway.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
+
+#include "gmock/gmock-spec-builders.h"
+#include "gmock/internal/gmock-port.h"
+
+namespace testing {
+
+$range kind 0..2
+$for kind [[
+
+$var clazz=[[$if kind==0 [[NiceMock]]
+             $elif kind==1 [[NaggyMock]]
+             $else [[StrictMock]]]]
+
+$var method=[[$if kind==0 [[AllowUninterestingCalls]]
+             $elif kind==1 [[WarnUninterestingCalls]]
+             $else [[FailUninterestingCalls]]]]
+
+template <class MockClass>
+class $clazz : public MockClass {
+ public:
+  // We don't factor out the constructor body to a common method, as
+  // we have to avoid a possible clash with members of MockClass.
+  $clazz() {
+    ::testing::Mock::$method(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+  // C++ doesn't (yet) allow inheritance of constructors, so we have
+  // to define it for each arity.
+  template <typename A1>
+  explicit $clazz(const A1& a1) : MockClass(a1) {
+    ::testing::Mock::$method(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+$range i 2..n
+$for i [[
+$range j 1..i
+  template <$for j, [[typename A$j]]>
+  $clazz($for j, [[const A$j& a$j]]) : MockClass($for j, [[a$j]]) {
+    ::testing::Mock::$method(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+
+]]
+  virtual ~$clazz() {
+    ::testing::Mock::UnregisterCallReaction(
+        internal::ImplicitCast_<MockClass*>(this));
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_($clazz);
+};
+
+]]
+
+// The following specializations catch some (relatively more common)
+// user errors of nesting nice and strict mocks.  They do NOT catch
+// all possible errors.
+
+// These specializations are declared but not defined, as NiceMock,
+// NaggyMock, and StrictMock cannot be nested.
+
+template <typename MockClass>
+class NiceMock<NiceMock<MockClass> >;
+template <typename MockClass>
+class NiceMock<NaggyMock<MockClass> >;
+template <typename MockClass>
+class NiceMock<StrictMock<MockClass> >;
+
+template <typename MockClass>
+class NaggyMock<NiceMock<MockClass> >;
+template <typename MockClass>
+class NaggyMock<NaggyMock<MockClass> >;
+template <typename MockClass>
+class NaggyMock<StrictMock<MockClass> >;
+
+template <typename MockClass>
+class StrictMock<NiceMock<MockClass> >;
+template <typename MockClass>
+class StrictMock<NaggyMock<MockClass> >;
+template <typename MockClass>
+class StrictMock<StrictMock<MockClass> >;
+
+}  // namespace testing
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-matchers.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-matchers.h
new file mode 100644
index 0000000000..33b37a7a5d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-matchers.h
@@ -0,0 +1,4399 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some commonly used argument matchers.  More
+// matchers can be defined by the user implementing the
+// MatcherInterface<T> interface if necessary.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
+
+#include <math.h>
+#include <algorithm>
+#include <iterator>
+#include <limits>
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
+#if GTEST_HAS_STD_INITIALIZER_LIST_
+# include <initializer_list>  // NOLINT -- must be after gtest.h
+#endif
+
+namespace testing {
+
+// To implement a matcher Foo for type T, define:
+//   1. a class FooMatcherImpl that implements the
+//      MatcherInterface<T> interface, and
+//   2. a factory function that creates a Matcher<T> object from a
+//      FooMatcherImpl*.
+//
+// The two-level delegation design makes it possible to allow a user
+// to write "v" instead of "Eq(v)" where a Matcher is expected, which
+// is impossible if we pass matchers by pointers.  It also eases
+// ownership management as Matcher objects can now be copied like
+// plain values.
+
+// MatchResultListener is an abstract class.  Its << operator can be
+// used by a matcher to explain why a value matches or doesn't match.
+//
+// TODO(wan@google.com): add method
+//   bool InterestedInWhy(bool result) const;
+// to indicate whether the listener is interested in why the match
+// result is 'result'.
+class MatchResultListener {
+ public:
+  // Creates a listener object with the given underlying ostream.  The
+  // listener does not own the ostream, and does not dereference it
+  // in the constructor or destructor.
+  explicit MatchResultListener(::std::ostream* os) : stream_(os) {}
+  virtual ~MatchResultListener() = 0;  // Makes this class abstract.
+
+  // Streams x to the underlying ostream; does nothing if the ostream
+  // is NULL.
+  template <typename T>
+  MatchResultListener& operator<<(const T& x) {
+    if (stream_ != NULL)
+      *stream_ << x;
+    return *this;
+  }
+
+  // Returns the underlying ostream.
+  ::std::ostream* stream() { return stream_; }
+
+  // Returns true iff the listener is interested in an explanation of
+  // the match result.  A matcher's MatchAndExplain() method can use
+  // this information to avoid generating the explanation when no one
+  // intends to hear it.
+  bool IsInterested() const { return stream_ != NULL; }
+
+ private:
+  ::std::ostream* const stream_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MatchResultListener);
+};
+
+inline MatchResultListener::~MatchResultListener() {
+}
+
+// An instance of a subclass of this knows how to describe itself as a
+// matcher.
+class MatcherDescriberInterface {
+ public:
+  virtual ~MatcherDescriberInterface() {}
+
+  // Describes this matcher to an ostream.  The function should print
+  // a verb phrase that describes the property a value matching this
+  // matcher should have.  The subject of the verb phrase is the value
+  // being matched.  For example, the DescribeTo() method of the Gt(7)
+  // matcher prints "is greater than 7".
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+
+  // Describes the negation of this matcher to an ostream.  For
+  // example, if the description of this matcher is "is greater than
+  // 7", the negated description could be "is not greater than 7".
+  // You are not required to override this when implementing
+  // MatcherInterface, but it is highly advised so that your matcher
+  // can produce good error messages.
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "not (";
+    DescribeTo(os);
+    *os << ")";
+  }
+};
+
+// The implementation of a matcher.
+template <typename T>
+class MatcherInterface : public MatcherDescriberInterface {
+ public:
+  // Returns true iff the matcher matches x; also explains the match
+  // result to 'listener' if necessary (see the next paragraph), in
+  // the form of a non-restrictive relative clause ("which ...",
+  // "whose ...", etc) that describes x.  For example, the
+  // MatchAndExplain() method of the Pointee(...) matcher should
+  // generate an explanation like "which points to ...".
+  //
+  // Implementations of MatchAndExplain() should add an explanation of
+  // the match result *if and only if* they can provide additional
+  // information that's not already present (or not obvious) in the
+  // print-out of x and the matcher's description.  Whether the match
+  // succeeds is not a factor in deciding whether an explanation is
+  // needed, as sometimes the caller needs to print a failure message
+  // when the match succeeds (e.g. when the matcher is used inside
+  // Not()).
+  //
+  // For example, a "has at least 10 elements" matcher should explain
+  // what the actual element count is, regardless of the match result,
+  // as it is useful information to the reader; on the other hand, an
+  // "is empty" matcher probably only needs to explain what the actual
+  // size is when the match fails, as it's redundant to say that the
+  // size is 0 when the value is already known to be empty.
+  //
+  // You should override this method when defining a new matcher.
+  //
+  // It's the responsibility of the caller (Google Mock) to guarantee
+  // that 'listener' is not NULL.  This helps to simplify a matcher's
+  // implementation when it doesn't care about the performance, as it
+  // can talk to 'listener' without checking its validity first.
+  // However, in order to implement dummy listeners efficiently,
+  // listener->stream() may be NULL.
+  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const = 0;
+
+  // Inherits these methods from MatcherDescriberInterface:
+  //   virtual void DescribeTo(::std::ostream* os) const = 0;
+  //   virtual void DescribeNegationTo(::std::ostream* os) const;
+};
+
+// A match result listener that stores the explanation in a string.
+class StringMatchResultListener : public MatchResultListener {
+ public:
+  StringMatchResultListener() : MatchResultListener(&ss_) {}
+
+  // Returns the explanation accumulated so far.
+  internal::string str() const { return ss_.str(); }
+
+  // Clears the explanation accumulated so far.
+  void Clear() { ss_.str(""); }
+
+ private:
+  ::std::stringstream ss_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StringMatchResultListener);
+};
+
+namespace internal {
+
+struct AnyEq {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a == b; }
+};
+struct AnyNe {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a != b; }
+};
+struct AnyLt {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a < b; }
+};
+struct AnyGt {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a > b; }
+};
+struct AnyLe {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a <= b; }
+};
+struct AnyGe {
+  template <typename A, typename B>
+  bool operator()(const A& a, const B& b) const { return a >= b; }
+};
+
+// A match result listener that ignores the explanation.
+class DummyMatchResultListener : public MatchResultListener {
+ public:
+  DummyMatchResultListener() : MatchResultListener(NULL) {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DummyMatchResultListener);
+};
+
+// A match result listener that forwards the explanation to a given
+// ostream.  The difference between this and MatchResultListener is
+// that the former is concrete.
+class StreamMatchResultListener : public MatchResultListener {
+ public:
+  explicit StreamMatchResultListener(::std::ostream* os)
+      : MatchResultListener(os) {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamMatchResultListener);
+};
+
+// An internal class for implementing Matcher<T>, which will derive
+// from it.  We put functionalities common to all Matcher<T>
+// specializations here to avoid code duplication.
+template <typename T>
+class MatcherBase {
+ public:
+  // Returns true iff the matcher matches x; also explains the match
+  // result to 'listener'.
+  bool MatchAndExplain(T x, MatchResultListener* listener) const {
+    return impl_->MatchAndExplain(x, listener);
+  }
+
+  // Returns true iff this matcher matches x.
+  bool Matches(T x) const {
+    DummyMatchResultListener dummy;
+    return MatchAndExplain(x, &dummy);
+  }
+
+  // Describes this matcher to an ostream.
+  void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); }
+
+  // Describes the negation of this matcher to an ostream.
+  void DescribeNegationTo(::std::ostream* os) const {
+    impl_->DescribeNegationTo(os);
+  }
+
+  // Explains why x matches, or doesn't match, the matcher.
+  void ExplainMatchResultTo(T x, ::std::ostream* os) const {
+    StreamMatchResultListener listener(os);
+    MatchAndExplain(x, &listener);
+  }
+
+  // Returns the describer for this matcher object; retains ownership
+  // of the describer, which is only guaranteed to be alive when
+  // this matcher object is alive.
+  const MatcherDescriberInterface* GetDescriber() const {
+    return impl_.get();
+  }
+
+ protected:
+  MatcherBase() {}
+
+  // Constructs a matcher from its implementation.
+  explicit MatcherBase(const MatcherInterface<T>* impl)
+      : impl_(impl) {}
+
+  virtual ~MatcherBase() {}
+
+ private:
+  // shared_ptr (util/gtl/shared_ptr.h) and linked_ptr have similar
+  // interfaces.  The former dynamically allocates a chunk of memory
+  // to hold the reference count, while the latter tracks all
+  // references using a circular linked list without allocating
+  // memory.  It has been observed that linked_ptr performs better in
+  // typical scenarios.  However, shared_ptr can out-perform
+  // linked_ptr when there are many more uses of the copy constructor
+  // than the default constructor.
+  //
+  // If performance becomes a problem, we should see if using
+  // shared_ptr helps.
+  ::testing::internal::linked_ptr<const MatcherInterface<T> > impl_;
+};
+
+}  // namespace internal
+
+// A Matcher<T> is a copyable and IMMUTABLE (except by assignment)
+// object that can check whether a value of type T matches.  The
+// implementation of Matcher<T> is just a linked_ptr to const
+// MatcherInterface<T>, so copying is fairly cheap.  Don't inherit
+// from Matcher!
+template <typename T>
+class Matcher : public internal::MatcherBase<T> {
+ public:
+  // Constructs a null matcher.  Needed for storing Matcher objects in STL
+  // containers.  A default-constructed matcher is not yet initialized.  You
+  // cannot use it until a valid value has been assigned to it.
+  explicit Matcher() {}  // NOLINT
+
+  // Constructs a matcher from its implementation.
+  explicit Matcher(const MatcherInterface<T>* impl)
+      : internal::MatcherBase<T>(impl) {}
+
+  // Implicit constructor here allows people to write
+  // EXPECT_CALL(foo, Bar(5)) instead of EXPECT_CALL(foo, Bar(Eq(5))) sometimes
+  Matcher(T value);  // NOLINT
+};
+
+// The following two specializations allow the user to write str
+// instead of Eq(str) and "foo" instead of Eq("foo") when a string
+// matcher is expected.
+template <>
+class GTEST_API_ Matcher<const internal::string&>
+    : public internal::MatcherBase<const internal::string&> {
+ public:
+  Matcher() {}
+
+  explicit Matcher(const MatcherInterface<const internal::string&>* impl)
+      : internal::MatcherBase<const internal::string&>(impl) {}
+
+  // Allows the user to write str instead of Eq(str) sometimes, where
+  // str is a string object.
+  Matcher(const internal::string& s);  // NOLINT
+
+  // Allows the user to write "foo" instead of Eq("foo") sometimes.
+  Matcher(const char* s);  // NOLINT
+};
+
+template <>
+class GTEST_API_ Matcher<internal::string>
+    : public internal::MatcherBase<internal::string> {
+ public:
+  Matcher() {}
+
+  explicit Matcher(const MatcherInterface<internal::string>* impl)
+      : internal::MatcherBase<internal::string>(impl) {}
+
+  // Allows the user to write str instead of Eq(str) sometimes, where
+  // str is a string object.
+  Matcher(const internal::string& s);  // NOLINT
+
+  // Allows the user to write "foo" instead of Eq("foo") sometimes.
+  Matcher(const char* s);  // NOLINT
+};
+
+#if GTEST_HAS_STRING_PIECE_
+// The following two specializations allow the user to write str
+// instead of Eq(str) and "foo" instead of Eq("foo") when a StringPiece
+// matcher is expected.
+template <>
+class GTEST_API_ Matcher<const StringPiece&>
+    : public internal::MatcherBase<const StringPiece&> {
+ public:
+  Matcher() {}
+
+  explicit Matcher(const MatcherInterface<const StringPiece&>* impl)
+      : internal::MatcherBase<const StringPiece&>(impl) {}
+
+  // Allows the user to write str instead of Eq(str) sometimes, where
+  // str is a string object.
+  Matcher(const internal::string& s);  // NOLINT
+
+  // Allows the user to write "foo" instead of Eq("foo") sometimes.
+  Matcher(const char* s);  // NOLINT
+
+  // Allows the user to pass StringPieces directly.
+  Matcher(StringPiece s);  // NOLINT
+};
+
+template <>
+class GTEST_API_ Matcher<StringPiece>
+    : public internal::MatcherBase<StringPiece> {
+ public:
+  Matcher() {}
+
+  explicit Matcher(const MatcherInterface<StringPiece>* impl)
+      : internal::MatcherBase<StringPiece>(impl) {}
+
+  // Allows the user to write str instead of Eq(str) sometimes, where
+  // str is a string object.
+  Matcher(const internal::string& s);  // NOLINT
+
+  // Allows the user to write "foo" instead of Eq("foo") sometimes.
+  Matcher(const char* s);  // NOLINT
+
+  // Allows the user to pass StringPieces directly.
+  Matcher(StringPiece s);  // NOLINT
+};
+#endif  // GTEST_HAS_STRING_PIECE_
+
+// The PolymorphicMatcher class template makes it easy to implement a
+// polymorphic matcher (i.e. a matcher that can match values of more
+// than one type, e.g. Eq(n) and NotNull()).
+//
+// To define a polymorphic matcher, a user should provide an Impl
+// class that has a DescribeTo() method and a DescribeNegationTo()
+// method, and define a member function (or member function template)
+//
+//   bool MatchAndExplain(const Value& value,
+//                        MatchResultListener* listener) const;
+//
+// See the definition of NotNull() for a complete example.
+template <class Impl>
+class PolymorphicMatcher {
+ public:
+  explicit PolymorphicMatcher(const Impl& an_impl) : impl_(an_impl) {}
+
+  // Returns a mutable reference to the underlying matcher
+  // implementation object.
+  Impl& mutable_impl() { return impl_; }
+
+  // Returns an immutable reference to the underlying matcher
+  // implementation object.
+  const Impl& impl() const { return impl_; }
+
+  template <typename T>
+  operator Matcher<T>() const {
+    return Matcher<T>(new MonomorphicImpl<T>(impl_));
+  }
+
+ private:
+  template <typename T>
+  class MonomorphicImpl : public MatcherInterface<T> {
+   public:
+    explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
+
+    virtual void DescribeTo(::std::ostream* os) const {
+      impl_.DescribeTo(os);
+    }
+
+    virtual void DescribeNegationTo(::std::ostream* os) const {
+      impl_.DescribeNegationTo(os);
+    }
+
+    virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
+      return impl_.MatchAndExplain(x, listener);
+    }
+
+   private:
+    const Impl impl_;
+
+    GTEST_DISALLOW_ASSIGN_(MonomorphicImpl);
+  };
+
+  Impl impl_;
+
+  GTEST_DISALLOW_ASSIGN_(PolymorphicMatcher);
+};
+
+// Creates a matcher from its implementation.  This is easier to use
+// than the Matcher<T> constructor as it doesn't require you to
+// explicitly write the template argument, e.g.
+//
+//   MakeMatcher(foo);
+// vs
+//   Matcher<const string&>(foo);
+template <typename T>
+inline Matcher<T> MakeMatcher(const MatcherInterface<T>* impl) {
+  return Matcher<T>(impl);
+}
+
+// Creates a polymorphic matcher from its implementation.  This is
+// easier to use than the PolymorphicMatcher<Impl> constructor as it
+// doesn't require you to explicitly write the template argument, e.g.
+//
+//   MakePolymorphicMatcher(foo);
+// vs
+//   PolymorphicMatcher<TypeOfFoo>(foo);
+template <class Impl>
+inline PolymorphicMatcher<Impl> MakePolymorphicMatcher(const Impl& impl) {
+  return PolymorphicMatcher<Impl>(impl);
+}
+
+// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
+// and MUST NOT BE USED IN USER CODE!!!
+namespace internal {
+
+// The MatcherCastImpl class template is a helper for implementing
+// MatcherCast().  We need this helper in order to partially
+// specialize the implementation of MatcherCast() (C++ allows
+// class/struct templates to be partially specialized, but not
+// function templates.).
+
+// This general version is used when MatcherCast()'s argument is a
+// polymorphic matcher (i.e. something that can be converted to a
+// Matcher but is not one yet; for example, Eq(value)) or a value (for
+// example, "hello").
+template <typename T, typename M>
+class MatcherCastImpl {
+ public:
+  static Matcher<T> Cast(const M& polymorphic_matcher_or_value) {
+    // M can be a polymorhic matcher, in which case we want to use
+    // its conversion operator to create Matcher<T>.  Or it can be a value
+    // that should be passed to the Matcher<T>'s constructor.
+    //
+    // We can't call Matcher<T>(polymorphic_matcher_or_value) when M is a
+    // polymorphic matcher because it'll be ambiguous if T has an implicit
+    // constructor from M (this usually happens when T has an implicit
+    // constructor from any type).
+    //
+    // It won't work to unconditionally implict_cast
+    // polymorphic_matcher_or_value to Matcher<T> because it won't trigger
+    // a user-defined conversion from M to T if one exists (assuming M is
+    // a value).
+    return CastImpl(
+        polymorphic_matcher_or_value,
+        BooleanConstant<
+            internal::ImplicitlyConvertible<M, Matcher<T> >::value>());
+  }
+
+ private:
+  static Matcher<T> CastImpl(const M& value, BooleanConstant<false>) {
+    // M can't be implicitly converted to Matcher<T>, so M isn't a polymorphic
+    // matcher.  It must be a value then.  Use direct initialization to create
+    // a matcher.
+    return Matcher<T>(ImplicitCast_<T>(value));
+  }
+
+  static Matcher<T> CastImpl(const M& polymorphic_matcher_or_value,
+                             BooleanConstant<true>) {
+    // M is implicitly convertible to Matcher<T>, which means that either
+    // M is a polymorhpic matcher or Matcher<T> has an implicit constructor
+    // from M.  In both cases using the implicit conversion will produce a
+    // matcher.
+    //
+    // Even if T has an implicit constructor from M, it won't be called because
+    // creating Matcher<T> would require a chain of two user-defined conversions
+    // (first to create T from M and then to create Matcher<T> from T).
+    return polymorphic_matcher_or_value;
+  }
+};
+
+// This more specialized version is used when MatcherCast()'s argument
+// is already a Matcher.  This only compiles when type T can be
+// statically converted to type U.
+template <typename T, typename U>
+class MatcherCastImpl<T, Matcher<U> > {
+ public:
+  static Matcher<T> Cast(const Matcher<U>& source_matcher) {
+    return Matcher<T>(new Impl(source_matcher));
+  }
+
+ private:
+  class Impl : public MatcherInterface<T> {
+   public:
+    explicit Impl(const Matcher<U>& source_matcher)
+        : source_matcher_(source_matcher) {}
+
+    // We delegate the matching logic to the source matcher.
+    virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
+      return source_matcher_.MatchAndExplain(static_cast<U>(x), listener);
+    }
+
+    virtual void DescribeTo(::std::ostream* os) const {
+      source_matcher_.DescribeTo(os);
+    }
+
+    virtual void DescribeNegationTo(::std::ostream* os) const {
+      source_matcher_.DescribeNegationTo(os);
+    }
+
+   private:
+    const Matcher<U> source_matcher_;
+
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+};
+
+// This even more specialized version is used for efficiently casting
+// a matcher to its own type.
+template <typename T>
+class MatcherCastImpl<T, Matcher<T> > {
+ public:
+  static Matcher<T> Cast(const Matcher<T>& matcher) { return matcher; }
+};
+
+}  // namespace internal
+
+// In order to be safe and clear, casting between different matcher
+// types is done explicitly via MatcherCast<T>(m), which takes a
+// matcher m and returns a Matcher<T>.  It compiles only when T can be
+// statically converted to the argument type of m.
+template <typename T, typename M>
+inline Matcher<T> MatcherCast(const M& matcher) {
+  return internal::MatcherCastImpl<T, M>::Cast(matcher);
+}
+
+// Implements SafeMatcherCast().
+//
+// We use an intermediate class to do the actual safe casting as Nokia's
+// Symbian compiler cannot decide between
+// template <T, M> ... (M) and
+// template <T, U> ... (const Matcher<U>&)
+// for function templates but can for member function templates.
+template <typename T>
+class SafeMatcherCastImpl {
+ public:
+  // This overload handles polymorphic matchers and values only since
+  // monomorphic matchers are handled by the next one.
+  template <typename M>
+  static inline Matcher<T> Cast(const M& polymorphic_matcher_or_value) {
+    return internal::MatcherCastImpl<T, M>::Cast(polymorphic_matcher_or_value);
+  }
+
+  // This overload handles monomorphic matchers.
+  //
+  // In general, if type T can be implicitly converted to type U, we can
+  // safely convert a Matcher<U> to a Matcher<T> (i.e. Matcher is
+  // contravariant): just keep a copy of the original Matcher<U>, convert the
+  // argument from type T to U, and then pass it to the underlying Matcher<U>.
+  // The only exception is when U is a reference and T is not, as the
+  // underlying Matcher<U> may be interested in the argument's address, which
+  // is not preserved in the conversion from T to U.
+  template <typename U>
+  static inline Matcher<T> Cast(const Matcher<U>& matcher) {
+    // Enforce that T can be implicitly converted to U.
+    GTEST_COMPILE_ASSERT_((internal::ImplicitlyConvertible<T, U>::value),
+                          T_must_be_implicitly_convertible_to_U);
+    // Enforce that we are not converting a non-reference type T to a reference
+    // type U.
+    GTEST_COMPILE_ASSERT_(
+        internal::is_reference<T>::value || !internal::is_reference<U>::value,
+        cannot_convert_non_referentce_arg_to_reference);
+    // In case both T and U are arithmetic types, enforce that the
+    // conversion is not lossy.
+    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(T) RawT;
+    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(U) RawU;
+    const bool kTIsOther = GMOCK_KIND_OF_(RawT) == internal::kOther;
+    const bool kUIsOther = GMOCK_KIND_OF_(RawU) == internal::kOther;
+    GTEST_COMPILE_ASSERT_(
+        kTIsOther || kUIsOther ||
+        (internal::LosslessArithmeticConvertible<RawT, RawU>::value),
+        conversion_of_arithmetic_types_must_be_lossless);
+    return MatcherCast<T>(matcher);
+  }
+};
+
+template <typename T, typename M>
+inline Matcher<T> SafeMatcherCast(const M& polymorphic_matcher) {
+  return SafeMatcherCastImpl<T>::Cast(polymorphic_matcher);
+}
+
+// A<T>() returns a matcher that matches any value of type T.
+template <typename T>
+Matcher<T> A();
+
+// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
+// and MUST NOT BE USED IN USER CODE!!!
+namespace internal {
+
+// If the explanation is not empty, prints it to the ostream.
+inline void PrintIfNotEmpty(const internal::string& explanation,
+                            ::std::ostream* os) {
+  if (explanation != "" && os != NULL) {
+    *os << ", " << explanation;
+  }
+}
+
+// Returns true if the given type name is easy to read by a human.
+// This is used to decide whether printing the type of a value might
+// be helpful.
+inline bool IsReadableTypeName(const string& type_name) {
+  // We consider a type name readable if it's short or doesn't contain
+  // a template or function type.
+  return (type_name.length() <= 20 ||
+          type_name.find_first_of("<(") == string::npos);
+}
+
+// Matches the value against the given matcher, prints the value and explains
+// the match result to the listener. Returns the match result.
+// 'listener' must not be NULL.
+// Value cannot be passed by const reference, because some matchers take a
+// non-const argument.
+template <typename Value, typename T>
+bool MatchPrintAndExplain(Value& value, const Matcher<T>& matcher,
+                          MatchResultListener* listener) {
+  if (!listener->IsInterested()) {
+    // If the listener is not interested, we do not need to construct the
+    // inner explanation.
+    return matcher.Matches(value);
+  }
+
+  StringMatchResultListener inner_listener;
+  const bool match = matcher.MatchAndExplain(value, &inner_listener);
+
+  UniversalPrint(value, listener->stream());
+#if GTEST_HAS_RTTI
+  const string& type_name = GetTypeName<Value>();
+  if (IsReadableTypeName(type_name))
+    *listener->stream() << " (of type " << type_name << ")";
+#endif
+  PrintIfNotEmpty(inner_listener.str(), listener->stream());
+
+  return match;
+}
+
+// An internal helper class for doing compile-time loop on a tuple's
+// fields.
+template <size_t N>
+class TuplePrefix {
+ public:
+  // TuplePrefix<N>::Matches(matcher_tuple, value_tuple) returns true
+  // iff the first N fields of matcher_tuple matches the first N
+  // fields of value_tuple, respectively.
+  template <typename MatcherTuple, typename ValueTuple>
+  static bool Matches(const MatcherTuple& matcher_tuple,
+                      const ValueTuple& value_tuple) {
+    return TuplePrefix<N - 1>::Matches(matcher_tuple, value_tuple)
+        && get<N - 1>(matcher_tuple).Matches(get<N - 1>(value_tuple));
+  }
+
+  // TuplePrefix<N>::ExplainMatchFailuresTo(matchers, values, os)
+  // describes failures in matching the first N fields of matchers
+  // against the first N fields of values.  If there is no failure,
+  // nothing will be streamed to os.
+  template <typename MatcherTuple, typename ValueTuple>
+  static void ExplainMatchFailuresTo(const MatcherTuple& matchers,
+                                     const ValueTuple& values,
+                                     ::std::ostream* os) {
+    // First, describes failures in the first N - 1 fields.
+    TuplePrefix<N - 1>::ExplainMatchFailuresTo(matchers, values, os);
+
+    // Then describes the failure (if any) in the (N - 1)-th (0-based)
+    // field.
+    typename tuple_element<N - 1, MatcherTuple>::type matcher =
+        get<N - 1>(matchers);
+    typedef typename tuple_element<N - 1, ValueTuple>::type Value;
+    Value value = get<N - 1>(values);
+    StringMatchResultListener listener;
+    if (!matcher.MatchAndExplain(value, &listener)) {
+      // TODO(wan): include in the message the name of the parameter
+      // as used in MOCK_METHOD*() when possible.
+      *os << "  Expected arg #" << N - 1 << ": ";
+      get<N - 1>(matchers).DescribeTo(os);
+      *os << "\n           Actual: ";
+      // We remove the reference in type Value to prevent the
+      // universal printer from printing the address of value, which
+      // isn't interesting to the user most of the time.  The
+      // matcher's MatchAndExplain() method handles the case when
+      // the address is interesting.
+      internal::UniversalPrint(value, os);
+      PrintIfNotEmpty(listener.str(), os);
+      *os << "\n";
+    }
+  }
+};
+
+// The base case.
+template <>
+class TuplePrefix<0> {
+ public:
+  template <typename MatcherTuple, typename ValueTuple>
+  static bool Matches(const MatcherTuple& /* matcher_tuple */,
+                      const ValueTuple& /* value_tuple */) {
+    return true;
+  }
+
+  template <typename MatcherTuple, typename ValueTuple>
+  static void ExplainMatchFailuresTo(const MatcherTuple& /* matchers */,
+                                     const ValueTuple& /* values */,
+                                     ::std::ostream* /* os */) {}
+};
+
+// TupleMatches(matcher_tuple, value_tuple) returns true iff all
+// matchers in matcher_tuple match the corresponding fields in
+// value_tuple.  It is a compiler error if matcher_tuple and
+// value_tuple have different number of fields or incompatible field
+// types.
+template <typename MatcherTuple, typename ValueTuple>
+bool TupleMatches(const MatcherTuple& matcher_tuple,
+                  const ValueTuple& value_tuple) {
+  // Makes sure that matcher_tuple and value_tuple have the same
+  // number of fields.
+  GTEST_COMPILE_ASSERT_(tuple_size<MatcherTuple>::value ==
+                        tuple_size<ValueTuple>::value,
+                        matcher_and_value_have_different_numbers_of_fields);
+  return TuplePrefix<tuple_size<ValueTuple>::value>::
+      Matches(matcher_tuple, value_tuple);
+}
+
+// Describes failures in matching matchers against values.  If there
+// is no failure, nothing will be streamed to os.
+template <typename MatcherTuple, typename ValueTuple>
+void ExplainMatchFailureTupleTo(const MatcherTuple& matchers,
+                                const ValueTuple& values,
+                                ::std::ostream* os) {
+  TuplePrefix<tuple_size<MatcherTuple>::value>::ExplainMatchFailuresTo(
+      matchers, values, os);
+}
+
+// TransformTupleValues and its helper.
+//
+// TransformTupleValuesHelper hides the internal machinery that
+// TransformTupleValues uses to implement a tuple traversal.
+template <typename Tuple, typename Func, typename OutIter>
+class TransformTupleValuesHelper {
+ private:
+  typedef ::testing::tuple_size<Tuple> TupleSize;
+
+ public:
+  // For each member of tuple 't', taken in order, evaluates '*out++ = f(t)'.
+  // Returns the final value of 'out' in case the caller needs it.
+  static OutIter Run(Func f, const Tuple& t, OutIter out) {
+    return IterateOverTuple<Tuple, TupleSize::value>()(f, t, out);
+  }
+
+ private:
+  template <typename Tup, size_t kRemainingSize>
+  struct IterateOverTuple {
+    OutIter operator() (Func f, const Tup& t, OutIter out) const {
+      *out++ = f(::testing::get<TupleSize::value - kRemainingSize>(t));
+      return IterateOverTuple<Tup, kRemainingSize - 1>()(f, t, out);
+    }
+  };
+  template <typename Tup>
+  struct IterateOverTuple<Tup, 0> {
+    OutIter operator() (Func /* f */, const Tup& /* t */, OutIter out) const {
+      return out;
+    }
+  };
+};
+
+// Successively invokes 'f(element)' on each element of the tuple 't',
+// appending each result to the 'out' iterator. Returns the final value
+// of 'out'.
+template <typename Tuple, typename Func, typename OutIter>
+OutIter TransformTupleValues(Func f, const Tuple& t, OutIter out) {
+  return TransformTupleValuesHelper<Tuple, Func, OutIter>::Run(f, t, out);
+}
+
+// Implements A<T>().
+template <typename T>
+class AnyMatcherImpl : public MatcherInterface<T> {
+ public:
+  virtual bool MatchAndExplain(
+      T /* x */, MatchResultListener* /* listener */) const { return true; }
+  virtual void DescribeTo(::std::ostream* os) const { *os << "is anything"; }
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    // This is mostly for completeness' safe, as it's not very useful
+    // to write Not(A<bool>()).  However we cannot completely rule out
+    // such a possibility, and it doesn't hurt to be prepared.
+    *os << "never matches";
+  }
+};
+
+// Implements _, a matcher that matches any value of any
+// type.  This is a polymorphic matcher, so we need a template type
+// conversion operator to make it appearing as a Matcher<T> for any
+// type T.
+class AnythingMatcher {
+ public:
+  template <typename T>
+  operator Matcher<T>() const { return A<T>(); }
+};
+
+// Implements a matcher that compares a given value with a
+// pre-supplied value using one of the ==, <=, <, etc, operators.  The
+// two values being compared don't have to have the same type.
+//
+// The matcher defined here is polymorphic (for example, Eq(5) can be
+// used to match an int, a short, a double, etc).  Therefore we use
+// a template type conversion operator in the implementation.
+//
+// The following template definition assumes that the Rhs parameter is
+// a "bare" type (i.e. neither 'const T' nor 'T&').
+template <typename D, typename Rhs, typename Op>
+class ComparisonBase {
+ public:
+  explicit ComparisonBase(const Rhs& rhs) : rhs_(rhs) {}
+  template <typename Lhs>
+  operator Matcher<Lhs>() const {
+    return MakeMatcher(new Impl<Lhs>(rhs_));
+  }
+
+ private:
+  template <typename Lhs>
+  class Impl : public MatcherInterface<Lhs> {
+   public:
+    explicit Impl(const Rhs& rhs) : rhs_(rhs) {}
+    virtual bool MatchAndExplain(
+        Lhs lhs, MatchResultListener* /* listener */) const {
+      return Op()(lhs, rhs_);
+    }
+    virtual void DescribeTo(::std::ostream* os) const {
+      *os << D::Desc() << " ";
+      UniversalPrint(rhs_, os);
+    }
+    virtual void DescribeNegationTo(::std::ostream* os) const {
+      *os << D::NegatedDesc() <<  " ";
+      UniversalPrint(rhs_, os);
+    }
+   private:
+    Rhs rhs_;
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+  Rhs rhs_;
+  GTEST_DISALLOW_ASSIGN_(ComparisonBase);
+};
+
+template <typename Rhs>
+class EqMatcher : public ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq> {
+ public:
+  explicit EqMatcher(const Rhs& rhs)
+      : ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq>(rhs) { }
+  static const char* Desc() { return "is equal to"; }
+  static const char* NegatedDesc() { return "isn't equal to"; }
+};
+template <typename Rhs>
+class NeMatcher : public ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe> {
+ public:
+  explicit NeMatcher(const Rhs& rhs)
+      : ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe>(rhs) { }
+  static const char* Desc() { return "isn't equal to"; }
+  static const char* NegatedDesc() { return "is equal to"; }
+};
+template <typename Rhs>
+class LtMatcher : public ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt> {
+ public:
+  explicit LtMatcher(const Rhs& rhs)
+      : ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt>(rhs) { }
+  static const char* Desc() { return "is <"; }
+  static const char* NegatedDesc() { return "isn't <"; }
+};
+template <typename Rhs>
+class GtMatcher : public ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt> {
+ public:
+  explicit GtMatcher(const Rhs& rhs)
+      : ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt>(rhs) { }
+  static const char* Desc() { return "is >"; }
+  static const char* NegatedDesc() { return "isn't >"; }
+};
+template <typename Rhs>
+class LeMatcher : public ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe> {
+ public:
+  explicit LeMatcher(const Rhs& rhs)
+      : ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe>(rhs) { }
+  static const char* Desc() { return "is <="; }
+  static const char* NegatedDesc() { return "isn't <="; }
+};
+template <typename Rhs>
+class GeMatcher : public ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe> {
+ public:
+  explicit GeMatcher(const Rhs& rhs)
+      : ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe>(rhs) { }
+  static const char* Desc() { return "is >="; }
+  static const char* NegatedDesc() { return "isn't >="; }
+};
+
+// Implements the polymorphic IsNull() matcher, which matches any raw or smart
+// pointer that is NULL.
+class IsNullMatcher {
+ public:
+  template <typename Pointer>
+  bool MatchAndExplain(const Pointer& p,
+                       MatchResultListener* /* listener */) const {
+#if GTEST_LANG_CXX11
+    return p == nullptr;
+#else  // GTEST_LANG_CXX11
+    return GetRawPointer(p) == NULL;
+#endif  // GTEST_LANG_CXX11
+  }
+
+  void DescribeTo(::std::ostream* os) const { *os << "is NULL"; }
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "isn't NULL";
+  }
+};
+
+// Implements the polymorphic NotNull() matcher, which matches any raw or smart
+// pointer that is not NULL.
+class NotNullMatcher {
+ public:
+  template <typename Pointer>
+  bool MatchAndExplain(const Pointer& p,
+                       MatchResultListener* /* listener */) const {
+#if GTEST_LANG_CXX11
+    return p != nullptr;
+#else  // GTEST_LANG_CXX11
+    return GetRawPointer(p) != NULL;
+#endif  // GTEST_LANG_CXX11
+  }
+
+  void DescribeTo(::std::ostream* os) const { *os << "isn't NULL"; }
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "is NULL";
+  }
+};
+
+// Ref(variable) matches any argument that is a reference to
+// 'variable'.  This matcher is polymorphic as it can match any
+// super type of the type of 'variable'.
+//
+// The RefMatcher template class implements Ref(variable).  It can
+// only be instantiated with a reference type.  This prevents a user
+// from mistakenly using Ref(x) to match a non-reference function
+// argument.  For example, the following will righteously cause a
+// compiler error:
+//
+//   int n;
+//   Matcher<int> m1 = Ref(n);   // This won't compile.
+//   Matcher<int&> m2 = Ref(n);  // This will compile.
+template <typename T>
+class RefMatcher;
+
+template <typename T>
+class RefMatcher<T&> {
+  // Google Mock is a generic framework and thus needs to support
+  // mocking any function types, including those that take non-const
+  // reference arguments.  Therefore the template parameter T (and
+  // Super below) can be instantiated to either a const type or a
+  // non-const type.
+ public:
+  // RefMatcher() takes a T& instead of const T&, as we want the
+  // compiler to catch using Ref(const_value) as a matcher for a
+  // non-const reference.
+  explicit RefMatcher(T& x) : object_(x) {}  // NOLINT
+
+  template <typename Super>
+  operator Matcher<Super&>() const {
+    // By passing object_ (type T&) to Impl(), which expects a Super&,
+    // we make sure that Super is a super type of T.  In particular,
+    // this catches using Ref(const_value) as a matcher for a
+    // non-const reference, as you cannot implicitly convert a const
+    // reference to a non-const reference.
+    return MakeMatcher(new Impl<Super>(object_));
+  }
+
+ private:
+  template <typename Super>
+  class Impl : public MatcherInterface<Super&> {
+   public:
+    explicit Impl(Super& x) : object_(x) {}  // NOLINT
+
+    // MatchAndExplain() takes a Super& (as opposed to const Super&)
+    // in order to match the interface MatcherInterface<Super&>.
+    virtual bool MatchAndExplain(
+        Super& x, MatchResultListener* listener) const {
+      *listener << "which is located @" << static_cast<const void*>(&x);
+      return &x == &object_;
+    }
+
+    virtual void DescribeTo(::std::ostream* os) const {
+      *os << "references the variable ";
+      UniversalPrinter<Super&>::Print(object_, os);
+    }
+
+    virtual void DescribeNegationTo(::std::ostream* os) const {
+      *os << "does not reference the variable ";
+      UniversalPrinter<Super&>::Print(object_, os);
+    }
+
+   private:
+    const Super& object_;
+
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+
+  T& object_;
+
+  GTEST_DISALLOW_ASSIGN_(RefMatcher);
+};
+
+// Polymorphic helper functions for narrow and wide string matchers.
+inline bool CaseInsensitiveCStringEquals(const char* lhs, const char* rhs) {
+  return String::CaseInsensitiveCStringEquals(lhs, rhs);
+}
+
+inline bool CaseInsensitiveCStringEquals(const wchar_t* lhs,
+                                         const wchar_t* rhs) {
+  return String::CaseInsensitiveWideCStringEquals(lhs, rhs);
+}
+
+// String comparison for narrow or wide strings that can have embedded NUL
+// characters.
+template <typename StringType>
+bool CaseInsensitiveStringEquals(const StringType& s1,
+                                 const StringType& s2) {
+  // Are the heads equal?
+  if (!CaseInsensitiveCStringEquals(s1.c_str(), s2.c_str())) {
+    return false;
+  }
+
+  // Skip the equal heads.
+  const typename StringType::value_type nul = 0;
+  const size_t i1 = s1.find(nul), i2 = s2.find(nul);
+
+  // Are we at the end of either s1 or s2?
+  if (i1 == StringType::npos || i2 == StringType::npos) {
+    return i1 == i2;
+  }
+
+  // Are the tails equal?
+  return CaseInsensitiveStringEquals(s1.substr(i1 + 1), s2.substr(i2 + 1));
+}
+
+// String matchers.
+
+// Implements equality-based string matchers like StrEq, StrCaseNe, and etc.
+template <typename StringType>
+class StrEqualityMatcher {
+ public:
+  StrEqualityMatcher(const StringType& str, bool expect_eq,
+                     bool case_sensitive)
+      : string_(str), expect_eq_(expect_eq), case_sensitive_(case_sensitive) {}
+
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
+    if (s == NULL) {
+      return !expect_eq_;
+    }
+    return MatchAndExplain(StringType(s), listener);
+  }
+
+  // Matches anything that can convert to StringType.
+  //
+  // This is a template, not just a plain function with const StringType&,
+  // because StringPiece has some interfering non-explicit constructors.
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    const StringType& s2(s);
+    const bool eq = case_sensitive_ ? s2 == string_ :
+        CaseInsensitiveStringEquals(s2, string_);
+    return expect_eq_ == eq;
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    DescribeToHelper(expect_eq_, os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    DescribeToHelper(!expect_eq_, os);
+  }
+
+ private:
+  void DescribeToHelper(bool expect_eq, ::std::ostream* os) const {
+    *os << (expect_eq ? "is " : "isn't ");
+    *os << "equal to ";
+    if (!case_sensitive_) {
+      *os << "(ignoring case) ";
+    }
+    UniversalPrint(string_, os);
+  }
+
+  const StringType string_;
+  const bool expect_eq_;
+  const bool case_sensitive_;
+
+  GTEST_DISALLOW_ASSIGN_(StrEqualityMatcher);
+};
+
+// Implements the polymorphic HasSubstr(substring) matcher, which
+// can be used as a Matcher<T> as long as T can be converted to a
+// string.
+template <typename StringType>
+class HasSubstrMatcher {
+ public:
+  explicit HasSubstrMatcher(const StringType& substring)
+      : substring_(substring) {}
+
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
+    return s != NULL && MatchAndExplain(StringType(s), listener);
+  }
+
+  // Matches anything that can convert to StringType.
+  //
+  // This is a template, not just a plain function with const StringType&,
+  // because StringPiece has some interfering non-explicit constructors.
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    const StringType& s2(s);
+    return s2.find(substring_) != StringType::npos;
+  }
+
+  // Describes what this matcher matches.
+  void DescribeTo(::std::ostream* os) const {
+    *os << "has substring ";
+    UniversalPrint(substring_, os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "has no substring ";
+    UniversalPrint(substring_, os);
+  }
+
+ private:
+  const StringType substring_;
+
+  GTEST_DISALLOW_ASSIGN_(HasSubstrMatcher);
+};
+
+// Implements the polymorphic StartsWith(substring) matcher, which
+// can be used as a Matcher<T> as long as T can be converted to a
+// string.
+template <typename StringType>
+class StartsWithMatcher {
+ public:
+  explicit StartsWithMatcher(const StringType& prefix) : prefix_(prefix) {
+  }
+
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
+    return s != NULL && MatchAndExplain(StringType(s), listener);
+  }
+
+  // Matches anything that can convert to StringType.
+  //
+  // This is a template, not just a plain function with const StringType&,
+  // because StringPiece has some interfering non-explicit constructors.
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    const StringType& s2(s);
+    return s2.length() >= prefix_.length() &&
+        s2.substr(0, prefix_.length()) == prefix_;
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "starts with ";
+    UniversalPrint(prefix_, os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't start with ";
+    UniversalPrint(prefix_, os);
+  }
+
+ private:
+  const StringType prefix_;
+
+  GTEST_DISALLOW_ASSIGN_(StartsWithMatcher);
+};
+
+// Implements the polymorphic EndsWith(substring) matcher, which
+// can be used as a Matcher<T> as long as T can be converted to a
+// string.
+template <typename StringType>
+class EndsWithMatcher {
+ public:
+  explicit EndsWithMatcher(const StringType& suffix) : suffix_(suffix) {}
+
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
+    return s != NULL && MatchAndExplain(StringType(s), listener);
+  }
+
+  // Matches anything that can convert to StringType.
+  //
+  // This is a template, not just a plain function with const StringType&,
+  // because StringPiece has some interfering non-explicit constructors.
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    const StringType& s2(s);
+    return s2.length() >= suffix_.length() &&
+        s2.substr(s2.length() - suffix_.length()) == suffix_;
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "ends with ";
+    UniversalPrint(suffix_, os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't end with ";
+    UniversalPrint(suffix_, os);
+  }
+
+ private:
+  const StringType suffix_;
+
+  GTEST_DISALLOW_ASSIGN_(EndsWithMatcher);
+};
+
+// Implements polymorphic matchers MatchesRegex(regex) and
+// ContainsRegex(regex), which can be used as a Matcher<T> as long as
+// T can be converted to a string.
+class MatchesRegexMatcher {
+ public:
+  MatchesRegexMatcher(const RE* regex, bool full_match)
+      : regex_(regex), full_match_(full_match) {}
+
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
+    return s != NULL && MatchAndExplain(internal::string(s), listener);
+  }
+
+  // Matches anything that can convert to internal::string.
+  //
+  // This is a template, not just a plain function with const internal::string&,
+  // because StringPiece has some interfering non-explicit constructors.
+  template <class MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    const internal::string& s2(s);
+    return full_match_ ? RE::FullMatch(s2, *regex_) :
+        RE::PartialMatch(s2, *regex_);
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << (full_match_ ? "matches" : "contains")
+        << " regular expression ";
+    UniversalPrinter<internal::string>::Print(regex_->pattern(), os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't " << (full_match_ ? "match" : "contain")
+        << " regular expression ";
+    UniversalPrinter<internal::string>::Print(regex_->pattern(), os);
+  }
+
+ private:
+  const internal::linked_ptr<const RE> regex_;
+  const bool full_match_;
+
+  GTEST_DISALLOW_ASSIGN_(MatchesRegexMatcher);
+};
+
+// Implements a matcher that compares the two fields of a 2-tuple
+// using one of the ==, <=, <, etc, operators.  The two fields being
+// compared don't have to have the same type.
+//
+// The matcher defined here is polymorphic (for example, Eq() can be
+// used to match a tuple<int, short>, a tuple<const long&, double>,
+// etc).  Therefore we use a template type conversion operator in the
+// implementation.
+template <typename D, typename Op>
+class PairMatchBase {
+ public:
+  template <typename T1, typename T2>
+  operator Matcher< ::testing::tuple<T1, T2> >() const {
+    return MakeMatcher(new Impl< ::testing::tuple<T1, T2> >);
+  }
+  template <typename T1, typename T2>
+  operator Matcher<const ::testing::tuple<T1, T2>&>() const {
+    return MakeMatcher(new Impl<const ::testing::tuple<T1, T2>&>);
+  }
+
+ private:
+  static ::std::ostream& GetDesc(::std::ostream& os) {  // NOLINT
+    return os << D::Desc();
+  }
+
+  template <typename Tuple>
+  class Impl : public MatcherInterface<Tuple> {
+   public:
+    virtual bool MatchAndExplain(
+        Tuple args,
+        MatchResultListener* /* listener */) const {
+      return Op()(::testing::get<0>(args), ::testing::get<1>(args));
+    }
+    virtual void DescribeTo(::std::ostream* os) const {
+      *os << "are " << GetDesc;
+    }
+    virtual void DescribeNegationTo(::std::ostream* os) const {
+      *os << "aren't " << GetDesc;
+    }
+  };
+};
+
+class Eq2Matcher : public PairMatchBase<Eq2Matcher, AnyEq> {
+ public:
+  static const char* Desc() { return "an equal pair"; }
+};
+class Ne2Matcher : public PairMatchBase<Ne2Matcher, AnyNe> {
+ public:
+  static const char* Desc() { return "an unequal pair"; }
+};
+class Lt2Matcher : public PairMatchBase<Lt2Matcher, AnyLt> {
+ public:
+  static const char* Desc() { return "a pair where the first < the second"; }
+};
+class Gt2Matcher : public PairMatchBase<Gt2Matcher, AnyGt> {
+ public:
+  static const char* Desc() { return "a pair where the first > the second"; }
+};
+class Le2Matcher : public PairMatchBase<Le2Matcher, AnyLe> {
+ public:
+  static const char* Desc() { return "a pair where the first <= the second"; }
+};
+class Ge2Matcher : public PairMatchBase<Ge2Matcher, AnyGe> {
+ public:
+  static const char* Desc() { return "a pair where the first >= the second"; }
+};
+
+// Implements the Not(...) matcher for a particular argument type T.
+// We do not nest it inside the NotMatcher class template, as that
+// will prevent different instantiations of NotMatcher from sharing
+// the same NotMatcherImpl<T> class.
+template <typename T>
+class NotMatcherImpl : public MatcherInterface<T> {
+ public:
+  explicit NotMatcherImpl(const Matcher<T>& matcher)
+      : matcher_(matcher) {}
+
+  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
+    return !matcher_.MatchAndExplain(x, listener);
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    matcher_.DescribeNegationTo(os);
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    matcher_.DescribeTo(os);
+  }
+
+ private:
+  const Matcher<T> matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(NotMatcherImpl);
+};
+
+// Implements the Not(m) matcher, which matches a value that doesn't
+// match matcher m.
+template <typename InnerMatcher>
+class NotMatcher {
+ public:
+  explicit NotMatcher(InnerMatcher matcher) : matcher_(matcher) {}
+
+  // This template type conversion operator allows Not(m) to be used
+  // to match any type m can match.
+  template <typename T>
+  operator Matcher<T>() const {
+    return Matcher<T>(new NotMatcherImpl<T>(SafeMatcherCast<T>(matcher_)));
+  }
+
+ private:
+  InnerMatcher matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(NotMatcher);
+};
+
+// Implements the AllOf(m1, m2) matcher for a particular argument type
+// T. We do not nest it inside the BothOfMatcher class template, as
+// that will prevent different instantiations of BothOfMatcher from
+// sharing the same BothOfMatcherImpl<T> class.
+template <typename T>
+class BothOfMatcherImpl : public MatcherInterface<T> {
+ public:
+  BothOfMatcherImpl(const Matcher<T>& matcher1, const Matcher<T>& matcher2)
+      : matcher1_(matcher1), matcher2_(matcher2) {}
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "(";
+    matcher1_.DescribeTo(os);
+    *os << ") and (";
+    matcher2_.DescribeTo(os);
+    *os << ")";
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "(";
+    matcher1_.DescribeNegationTo(os);
+    *os << ") or (";
+    matcher2_.DescribeNegationTo(os);
+    *os << ")";
+  }
+
+  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
+    // If either matcher1_ or matcher2_ doesn't match x, we only need
+    // to explain why one of them fails.
+    StringMatchResultListener listener1;
+    if (!matcher1_.MatchAndExplain(x, &listener1)) {
+      *listener << listener1.str();
+      return false;
+    }
+
+    StringMatchResultListener listener2;
+    if (!matcher2_.MatchAndExplain(x, &listener2)) {
+      *listener << listener2.str();
+      return false;
+    }
+
+    // Otherwise we need to explain why *both* of them match.
+    const internal::string s1 = listener1.str();
+    const internal::string s2 = listener2.str();
+
+    if (s1 == "") {
+      *listener << s2;
+    } else {
+      *listener << s1;
+      if (s2 != "") {
+        *listener << ", and " << s2;
+      }
+    }
+    return true;
+  }
+
+ private:
+  const Matcher<T> matcher1_;
+  const Matcher<T> matcher2_;
+
+  GTEST_DISALLOW_ASSIGN_(BothOfMatcherImpl);
+};
+
+#if GTEST_LANG_CXX11
+// MatcherList provides mechanisms for storing a variable number of matchers in
+// a list structure (ListType) and creating a combining matcher from such a
+// list.
+// The template is defined recursively using the following template paramters:
+//   * kSize is the length of the MatcherList.
+//   * Head is the type of the first matcher of the list.
+//   * Tail denotes the types of the remaining matchers of the list.
+template <int kSize, typename Head, typename... Tail>
+struct MatcherList {
+  typedef MatcherList<kSize - 1, Tail...> MatcherListTail;
+  typedef ::std::pair<Head, typename MatcherListTail::ListType> ListType;
+
+  // BuildList stores variadic type values in a nested pair structure.
+  // Example:
+  // MatcherList<3, int, string, float>::BuildList(5, "foo", 2.0) will return
+  // the corresponding result of type pair<int, pair<string, float>>.
+  static ListType BuildList(const Head& matcher, const Tail&... tail) {
+    return ListType(matcher, MatcherListTail::BuildList(tail...));
+  }
+
+  // CreateMatcher<T> creates a Matcher<T> from a given list of matchers (built
+  // by BuildList()). CombiningMatcher<T> is used to combine the matchers of the
+  // list. CombiningMatcher<T> must implement MatcherInterface<T> and have a
+  // constructor taking two Matcher<T>s as input.
+  template <typename T, template <typename /* T */> class CombiningMatcher>
+  static Matcher<T> CreateMatcher(const ListType& matchers) {
+    return Matcher<T>(new CombiningMatcher<T>(
+        SafeMatcherCast<T>(matchers.first),
+        MatcherListTail::template CreateMatcher<T, CombiningMatcher>(
+            matchers.second)));
+  }
+};
+
+// The following defines the base case for the recursive definition of
+// MatcherList.
+template <typename Matcher1, typename Matcher2>
+struct MatcherList<2, Matcher1, Matcher2> {
+  typedef ::std::pair<Matcher1, Matcher2> ListType;
+
+  static ListType BuildList(const Matcher1& matcher1,
+                            const Matcher2& matcher2) {
+    return ::std::pair<Matcher1, Matcher2>(matcher1, matcher2);
+  }
+
+  template <typename T, template <typename /* T */> class CombiningMatcher>
+  static Matcher<T> CreateMatcher(const ListType& matchers) {
+    return Matcher<T>(new CombiningMatcher<T>(
+        SafeMatcherCast<T>(matchers.first),
+        SafeMatcherCast<T>(matchers.second)));
+  }
+};
+
+// VariadicMatcher is used for the variadic implementation of
+// AllOf(m_1, m_2, ...) and AnyOf(m_1, m_2, ...).
+// CombiningMatcher<T> is used to recursively combine the provided matchers
+// (of type Args...).
+template <template <typename T> class CombiningMatcher, typename... Args>
+class VariadicMatcher {
+ public:
+  VariadicMatcher(const Args&... matchers)  // NOLINT
+      : matchers_(MatcherListType::BuildList(matchers...)) {}
+
+  // This template type conversion operator allows an
+  // VariadicMatcher<Matcher1, Matcher2...> object to match any type that
+  // all of the provided matchers (Matcher1, Matcher2, ...) can match.
+  template <typename T>
+  operator Matcher<T>() const {
+    return MatcherListType::template CreateMatcher<T, CombiningMatcher>(
+        matchers_);
+  }
+
+ private:
+  typedef MatcherList<sizeof...(Args), Args...> MatcherListType;
+
+  const typename MatcherListType::ListType matchers_;
+
+  GTEST_DISALLOW_ASSIGN_(VariadicMatcher);
+};
+
+template <typename... Args>
+using AllOfMatcher = VariadicMatcher<BothOfMatcherImpl, Args...>;
+
+#endif  // GTEST_LANG_CXX11
+
+// Used for implementing the AllOf(m_1, ..., m_n) matcher, which
+// matches a value that matches all of the matchers m_1, ..., and m_n.
+template <typename Matcher1, typename Matcher2>
+class BothOfMatcher {
+ public:
+  BothOfMatcher(Matcher1 matcher1, Matcher2 matcher2)
+      : matcher1_(matcher1), matcher2_(matcher2) {}
+
+  // This template type conversion operator allows a
+  // BothOfMatcher<Matcher1, Matcher2> object to match any type that
+  // both Matcher1 and Matcher2 can match.
+  template <typename T>
+  operator Matcher<T>() const {
+    return Matcher<T>(new BothOfMatcherImpl<T>(SafeMatcherCast<T>(matcher1_),
+                                               SafeMatcherCast<T>(matcher2_)));
+  }
+
+ private:
+  Matcher1 matcher1_;
+  Matcher2 matcher2_;
+
+  GTEST_DISALLOW_ASSIGN_(BothOfMatcher);
+};
+
+// Implements the AnyOf(m1, m2) matcher for a particular argument type
+// T.  We do not nest it inside the AnyOfMatcher class template, as
+// that will prevent different instantiations of AnyOfMatcher from
+// sharing the same EitherOfMatcherImpl<T> class.
+template <typename T>
+class EitherOfMatcherImpl : public MatcherInterface<T> {
+ public:
+  EitherOfMatcherImpl(const Matcher<T>& matcher1, const Matcher<T>& matcher2)
+      : matcher1_(matcher1), matcher2_(matcher2) {}
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "(";
+    matcher1_.DescribeTo(os);
+    *os << ") or (";
+    matcher2_.DescribeTo(os);
+    *os << ")";
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "(";
+    matcher1_.DescribeNegationTo(os);
+    *os << ") and (";
+    matcher2_.DescribeNegationTo(os);
+    *os << ")";
+  }
+
+  virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
+    // If either matcher1_ or matcher2_ matches x, we just need to
+    // explain why *one* of them matches.
+    StringMatchResultListener listener1;
+    if (matcher1_.MatchAndExplain(x, &listener1)) {
+      *listener << listener1.str();
+      return true;
+    }
+
+    StringMatchResultListener listener2;
+    if (matcher2_.MatchAndExplain(x, &listener2)) {
+      *listener << listener2.str();
+      return true;
+    }
+
+    // Otherwise we need to explain why *both* of them fail.
+    const internal::string s1 = listener1.str();
+    const internal::string s2 = listener2.str();
+
+    if (s1 == "") {
+      *listener << s2;
+    } else {
+      *listener << s1;
+      if (s2 != "") {
+        *listener << ", and " << s2;
+      }
+    }
+    return false;
+  }
+
+ private:
+  const Matcher<T> matcher1_;
+  const Matcher<T> matcher2_;
+
+  GTEST_DISALLOW_ASSIGN_(EitherOfMatcherImpl);
+};
+
+#if GTEST_LANG_CXX11
+// AnyOfMatcher is used for the variadic implementation of AnyOf(m_1, m_2, ...).
+template <typename... Args>
+using AnyOfMatcher = VariadicMatcher<EitherOfMatcherImpl, Args...>;
+
+#endif  // GTEST_LANG_CXX11
+
+// Used for implementing the AnyOf(m_1, ..., m_n) matcher, which
+// matches a value that matches at least one of the matchers m_1, ...,
+// and m_n.
+template <typename Matcher1, typename Matcher2>
+class EitherOfMatcher {
+ public:
+  EitherOfMatcher(Matcher1 matcher1, Matcher2 matcher2)
+      : matcher1_(matcher1), matcher2_(matcher2) {}
+
+  // This template type conversion operator allows a
+  // EitherOfMatcher<Matcher1, Matcher2> object to match any type that
+  // both Matcher1 and Matcher2 can match.
+  template <typename T>
+  operator Matcher<T>() const {
+    return Matcher<T>(new EitherOfMatcherImpl<T>(
+        SafeMatcherCast<T>(matcher1_), SafeMatcherCast<T>(matcher2_)));
+  }
+
+ private:
+  Matcher1 matcher1_;
+  Matcher2 matcher2_;
+
+  GTEST_DISALLOW_ASSIGN_(EitherOfMatcher);
+};
+
+// Used for implementing Truly(pred), which turns a predicate into a
+// matcher.
+template <typename Predicate>
+class TrulyMatcher {
+ public:
+  explicit TrulyMatcher(Predicate pred) : predicate_(pred) {}
+
+  // This method template allows Truly(pred) to be used as a matcher
+  // for type T where T is the argument type of predicate 'pred'.  The
+  // argument is passed by reference as the predicate may be
+  // interested in the address of the argument.
+  template <typename T>
+  bool MatchAndExplain(T& x,  // NOLINT
+                       MatchResultListener* /* listener */) const {
+    // Without the if-statement, MSVC sometimes warns about converting
+    // a value to bool (warning 4800).
+    //
+    // We cannot write 'return !!predicate_(x);' as that doesn't work
+    // when predicate_(x) returns a class convertible to bool but
+    // having no operator!().
+    if (predicate_(x))
+      return true;
+    return false;
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "satisfies the given predicate";
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't satisfy the given predicate";
+  }
+
+ private:
+  Predicate predicate_;
+
+  GTEST_DISALLOW_ASSIGN_(TrulyMatcher);
+};
+
+// Used for implementing Matches(matcher), which turns a matcher into
+// a predicate.
+template <typename M>
+class MatcherAsPredicate {
+ public:
+  explicit MatcherAsPredicate(M matcher) : matcher_(matcher) {}
+
+  // This template operator() allows Matches(m) to be used as a
+  // predicate on type T where m is a matcher on type T.
+  //
+  // The argument x is passed by reference instead of by value, as
+  // some matcher may be interested in its address (e.g. as in
+  // Matches(Ref(n))(x)).
+  template <typename T>
+  bool operator()(const T& x) const {
+    // We let matcher_ commit to a particular type here instead of
+    // when the MatcherAsPredicate object was constructed.  This
+    // allows us to write Matches(m) where m is a polymorphic matcher
+    // (e.g. Eq(5)).
+    //
+    // If we write Matcher<T>(matcher_).Matches(x) here, it won't
+    // compile when matcher_ has type Matcher<const T&>; if we write
+    // Matcher<const T&>(matcher_).Matches(x) here, it won't compile
+    // when matcher_ has type Matcher<T>; if we just write
+    // matcher_.Matches(x), it won't compile when matcher_ is
+    // polymorphic, e.g. Eq(5).
+    //
+    // MatcherCast<const T&>() is necessary for making the code work
+    // in all of the above situations.
+    return MatcherCast<const T&>(matcher_).Matches(x);
+  }
+
+ private:
+  M matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(MatcherAsPredicate);
+};
+
+// For implementing ASSERT_THAT() and EXPECT_THAT().  The template
+// argument M must be a type that can be converted to a matcher.
+template <typename M>
+class PredicateFormatterFromMatcher {
+ public:
+  explicit PredicateFormatterFromMatcher(M m) : matcher_(internal::move(m)) {}
+
+  // This template () operator allows a PredicateFormatterFromMatcher
+  // object to act as a predicate-formatter suitable for using with
+  // Google Test's EXPECT_PRED_FORMAT1() macro.
+  template <typename T>
+  AssertionResult operator()(const char* value_text, const T& x) const {
+    // We convert matcher_ to a Matcher<const T&> *now* instead of
+    // when the PredicateFormatterFromMatcher object was constructed,
+    // as matcher_ may be polymorphic (e.g. NotNull()) and we won't
+    // know which type to instantiate it to until we actually see the
+    // type of x here.
+    //
+    // We write SafeMatcherCast<const T&>(matcher_) instead of
+    // Matcher<const T&>(matcher_), as the latter won't compile when
+    // matcher_ has type Matcher<T> (e.g. An<int>()).
+    // We don't write MatcherCast<const T&> either, as that allows
+    // potentially unsafe downcasting of the matcher argument.
+    const Matcher<const T&> matcher = SafeMatcherCast<const T&>(matcher_);
+    StringMatchResultListener listener;
+    if (MatchPrintAndExplain(x, matcher, &listener))
+      return AssertionSuccess();
+
+    ::std::stringstream ss;
+    ss << "Value of: " << value_text << "\n"
+       << "Expected: ";
+    matcher.DescribeTo(&ss);
+    ss << "\n  Actual: " << listener.str();
+    return AssertionFailure() << ss.str();
+  }
+
+ private:
+  const M matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(PredicateFormatterFromMatcher);
+};
+
+// A helper function for converting a matcher to a predicate-formatter
+// without the user needing to explicitly write the type.  This is
+// used for implementing ASSERT_THAT() and EXPECT_THAT().
+// Implementation detail: 'matcher' is received by-value to force decaying.
+template <typename M>
+inline PredicateFormatterFromMatcher<M>
+MakePredicateFormatterFromMatcher(M matcher) {
+  return PredicateFormatterFromMatcher<M>(internal::move(matcher));
+}
+
+// Implements the polymorphic floating point equality matcher, which matches
+// two float values using ULP-based approximation or, optionally, a
+// user-specified epsilon.  The template is meant to be instantiated with
+// FloatType being either float or double.
+template <typename FloatType>
+class FloatingEqMatcher {
+ public:
+  // Constructor for FloatingEqMatcher.
+  // The matcher's input will be compared with expected.  The matcher treats two
+  // NANs as equal if nan_eq_nan is true.  Otherwise, under IEEE standards,
+  // equality comparisons between NANs will always return false.  We specify a
+  // negative max_abs_error_ term to indicate that ULP-based approximation will
+  // be used for comparison.
+  FloatingEqMatcher(FloatType expected, bool nan_eq_nan) :
+    expected_(expected), nan_eq_nan_(nan_eq_nan), max_abs_error_(-1) {
+  }
+
+  // Constructor that supports a user-specified max_abs_error that will be used
+  // for comparison instead of ULP-based approximation.  The max absolute
+  // should be non-negative.
+  FloatingEqMatcher(FloatType expected, bool nan_eq_nan,
+                    FloatType max_abs_error)
+      : expected_(expected),
+        nan_eq_nan_(nan_eq_nan),
+        max_abs_error_(max_abs_error) {
+    GTEST_CHECK_(max_abs_error >= 0)
+        << ", where max_abs_error is" << max_abs_error;
+  }
+
+  // Implements floating point equality matcher as a Matcher<T>.
+  template <typename T>
+  class Impl : public MatcherInterface<T> {
+   public:
+    Impl(FloatType expected, bool nan_eq_nan, FloatType max_abs_error)
+        : expected_(expected),
+          nan_eq_nan_(nan_eq_nan),
+          max_abs_error_(max_abs_error) {}
+
+    virtual bool MatchAndExplain(T value,
+                                 MatchResultListener* listener) const {
+      const FloatingPoint<FloatType> actual(value), expected(expected_);
+
+      // Compares NaNs first, if nan_eq_nan_ is true.
+      if (actual.is_nan() || expected.is_nan()) {
+        if (actual.is_nan() && expected.is_nan()) {
+          return nan_eq_nan_;
+        }
+        // One is nan; the other is not nan.
+        return false;
+      }
+      if (HasMaxAbsError()) {
+        // We perform an equality check so that inf will match inf, regardless
+        // of error bounds.  If the result of value - expected_ would result in
+        // overflow or if either value is inf, the default result is infinity,
+        // which should only match if max_abs_error_ is also infinity.
+        if (value == expected_) {
+          return true;
+        }
+
+        const FloatType diff = value - expected_;
+        if (fabs(diff) <= max_abs_error_) {
+          return true;
+        }
+
+        if (listener->IsInterested()) {
+          *listener << "which is " << diff << " from " << expected_;
+        }
+        return false;
+      } else {
+        return actual.AlmostEquals(expected);
+      }
+    }
+
+    virtual void DescribeTo(::std::ostream* os) const {
+      // os->precision() returns the previously set precision, which we
+      // store to restore the ostream to its original configuration
+      // after outputting.
+      const ::std::streamsize old_precision = os->precision(
+          ::std::numeric_limits<FloatType>::digits10 + 2);
+      if (FloatingPoint<FloatType>(expected_).is_nan()) {
+        if (nan_eq_nan_) {
+          *os << "is NaN";
+        } else {
+          *os << "never matches";
+        }
+      } else {
+        *os << "is approximately " << expected_;
+        if (HasMaxAbsError()) {
+          *os << " (absolute error <= " << max_abs_error_ << ")";
+        }
+      }
+      os->precision(old_precision);
+    }
+
+    virtual void DescribeNegationTo(::std::ostream* os) const {
+      // As before, get original precision.
+      const ::std::streamsize old_precision = os->precision(
+          ::std::numeric_limits<FloatType>::digits10 + 2);
+      if (FloatingPoint<FloatType>(expected_).is_nan()) {
+        if (nan_eq_nan_) {
+          *os << "isn't NaN";
+        } else {
+          *os << "is anything";
+        }
+      } else {
+        *os << "isn't approximately " << expected_;
+        if (HasMaxAbsError()) {
+          *os << " (absolute error > " << max_abs_error_ << ")";
+        }
+      }
+      // Restore original precision.
+      os->precision(old_precision);
+    }
+
+   private:
+    bool HasMaxAbsError() const {
+      return max_abs_error_ >= 0;
+    }
+
+    const FloatType expected_;
+    const bool nan_eq_nan_;
+    // max_abs_error will be used for value comparison when >= 0.
+    const FloatType max_abs_error_;
+
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+
+  // The following 3 type conversion operators allow FloatEq(expected) and
+  // NanSensitiveFloatEq(expected) to be used as a Matcher<float>, a
+  // Matcher<const float&>, or a Matcher<float&>, but nothing else.
+  // (While Google's C++ coding style doesn't allow arguments passed
+  // by non-const reference, we may see them in code not conforming to
+  // the style.  Therefore Google Mock needs to support them.)
+  operator Matcher<FloatType>() const {
+    return MakeMatcher(
+        new Impl<FloatType>(expected_, nan_eq_nan_, max_abs_error_));
+  }
+
+  operator Matcher<const FloatType&>() const {
+    return MakeMatcher(
+        new Impl<const FloatType&>(expected_, nan_eq_nan_, max_abs_error_));
+  }
+
+  operator Matcher<FloatType&>() const {
+    return MakeMatcher(
+        new Impl<FloatType&>(expected_, nan_eq_nan_, max_abs_error_));
+  }
+
+ private:
+  const FloatType expected_;
+  const bool nan_eq_nan_;
+  // max_abs_error will be used for value comparison when >= 0.
+  const FloatType max_abs_error_;
+
+  GTEST_DISALLOW_ASSIGN_(FloatingEqMatcher);
+};
+
+// Implements the Pointee(m) matcher for matching a pointer whose
+// pointee matches matcher m.  The pointer can be either raw or smart.
+template <typename InnerMatcher>
+class PointeeMatcher {
+ public:
+  explicit PointeeMatcher(const InnerMatcher& matcher) : matcher_(matcher) {}
+
+  // This type conversion operator template allows Pointee(m) to be
+  // used as a matcher for any pointer type whose pointee type is
+  // compatible with the inner matcher, where type Pointer can be
+  // either a raw pointer or a smart pointer.
+  //
+  // The reason we do this instead of relying on
+  // MakePolymorphicMatcher() is that the latter is not flexible
+  // enough for implementing the DescribeTo() method of Pointee().
+  template <typename Pointer>
+  operator Matcher<Pointer>() const {
+    return MakeMatcher(new Impl<Pointer>(matcher_));
+  }
+
+ private:
+  // The monomorphic implementation that works for a particular pointer type.
+  template <typename Pointer>
+  class Impl : public MatcherInterface<Pointer> {
+   public:
+    typedef typename PointeeOf<GTEST_REMOVE_CONST_(  // NOLINT
+        GTEST_REMOVE_REFERENCE_(Pointer))>::type Pointee;
+
+    explicit Impl(const InnerMatcher& matcher)
+        : matcher_(MatcherCast<const Pointee&>(matcher)) {}
+
+    virtual void DescribeTo(::std::ostream* os) const {
+      *os << "points to a value that ";
+      matcher_.DescribeTo(os);
+    }
+
+    virtual void DescribeNegationTo(::std::ostream* os) const {
+      *os << "does not point to a value that ";
+      matcher_.DescribeTo(os);
+    }
+
+    virtual bool MatchAndExplain(Pointer pointer,
+                                 MatchResultListener* listener) const {
+      if (GetRawPointer(pointer) == NULL)
+        return false;
+
+      *listener << "which points to ";
+      return MatchPrintAndExplain(*pointer, matcher_, listener);
+    }
+
+   private:
+    const Matcher<const Pointee&> matcher_;
+
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+
+  const InnerMatcher matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(PointeeMatcher);
+};
+
+// Implements the WhenDynamicCastTo<T>(m) matcher that matches a pointer or
+// reference that matches inner_matcher when dynamic_cast<T> is applied.
+// The result of dynamic_cast<To> is forwarded to the inner matcher.
+// If To is a pointer and the cast fails, the inner matcher will receive NULL.
+// If To is a reference and the cast fails, this matcher returns false
+// immediately.
+template <typename To>
+class WhenDynamicCastToMatcherBase {
+ public:
+  explicit WhenDynamicCastToMatcherBase(const Matcher<To>& matcher)
+      : matcher_(matcher) {}
+
+  void DescribeTo(::std::ostream* os) const {
+    GetCastTypeDescription(os);
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    GetCastTypeDescription(os);
+    matcher_.DescribeNegationTo(os);
+  }
+
+ protected:
+  const Matcher<To> matcher_;
+
+  static string GetToName() {
+#if GTEST_HAS_RTTI
+    return GetTypeName<To>();
+#else  // GTEST_HAS_RTTI
+    return "the target type";
+#endif  // GTEST_HAS_RTTI
+  }
+
+ private:
+  static void GetCastTypeDescription(::std::ostream* os) {
+    *os << "when dynamic_cast to " << GetToName() << ", ";
+  }
+
+  GTEST_DISALLOW_ASSIGN_(WhenDynamicCastToMatcherBase);
+};
+
+// Primary template.
+// To is a pointer. Cast and forward the result.
+template <typename To>
+class WhenDynamicCastToMatcher : public WhenDynamicCastToMatcherBase<To> {
+ public:
+  explicit WhenDynamicCastToMatcher(const Matcher<To>& matcher)
+      : WhenDynamicCastToMatcherBase<To>(matcher) {}
+
+  template <typename From>
+  bool MatchAndExplain(From from, MatchResultListener* listener) const {
+    // TODO(sbenza): Add more detail on failures. ie did the dyn_cast fail?
+    To to = dynamic_cast<To>(from);
+    return MatchPrintAndExplain(to, this->matcher_, listener);
+  }
+};
+
+// Specialize for references.
+// In this case we return false if the dynamic_cast fails.
+template <typename To>
+class WhenDynamicCastToMatcher<To&> : public WhenDynamicCastToMatcherBase<To&> {
+ public:
+  explicit WhenDynamicCastToMatcher(const Matcher<To&>& matcher)
+      : WhenDynamicCastToMatcherBase<To&>(matcher) {}
+
+  template <typename From>
+  bool MatchAndExplain(From& from, MatchResultListener* listener) const {
+    // We don't want an std::bad_cast here, so do the cast with pointers.
+    To* to = dynamic_cast<To*>(&from);
+    if (to == NULL) {
+      *listener << "which cannot be dynamic_cast to " << this->GetToName();
+      return false;
+    }
+    return MatchPrintAndExplain(*to, this->matcher_, listener);
+  }
+};
+
+// Implements the Field() matcher for matching a field (i.e. member
+// variable) of an object.
+template <typename Class, typename FieldType>
+class FieldMatcher {
+ public:
+  FieldMatcher(FieldType Class::*field,
+               const Matcher<const FieldType&>& matcher)
+      : field_(field), matcher_(matcher) {}
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "is an object whose given field ";
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "is an object whose given field ";
+    matcher_.DescribeNegationTo(os);
+  }
+
+  template <typename T>
+  bool MatchAndExplain(const T& value, MatchResultListener* listener) const {
+    return MatchAndExplainImpl(
+        typename ::testing::internal::
+            is_pointer<GTEST_REMOVE_CONST_(T)>::type(),
+        value, listener);
+  }
+
+ private:
+  // The first argument of MatchAndExplainImpl() is needed to help
+  // Symbian's C++ compiler choose which overload to use.  Its type is
+  // true_type iff the Field() matcher is used to match a pointer.
+  bool MatchAndExplainImpl(false_type /* is_not_pointer */, const Class& obj,
+                           MatchResultListener* listener) const {
+    *listener << "whose given field is ";
+    return MatchPrintAndExplain(obj.*field_, matcher_, listener);
+  }
+
+  bool MatchAndExplainImpl(true_type /* is_pointer */, const Class* p,
+                           MatchResultListener* listener) const {
+    if (p == NULL)
+      return false;
+
+    *listener << "which points to an object ";
+    // Since *p has a field, it must be a class/struct/union type and
+    // thus cannot be a pointer.  Therefore we pass false_type() as
+    // the first argument.
+    return MatchAndExplainImpl(false_type(), *p, listener);
+  }
+
+  const FieldType Class::*field_;
+  const Matcher<const FieldType&> matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(FieldMatcher);
+};
+
+// Implements the Property() matcher for matching a property
+// (i.e. return value of a getter method) of an object.
+template <typename Class, typename PropertyType>
+class PropertyMatcher {
+ public:
+  // The property may have a reference type, so 'const PropertyType&'
+  // may cause double references and fail to compile.  That's why we
+  // need GTEST_REFERENCE_TO_CONST, which works regardless of
+  // PropertyType being a reference or not.
+  typedef GTEST_REFERENCE_TO_CONST_(PropertyType) RefToConstProperty;
+
+  PropertyMatcher(PropertyType (Class::*property)() const,
+                  const Matcher<RefToConstProperty>& matcher)
+      : property_(property), matcher_(matcher) {}
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "is an object whose given property ";
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "is an object whose given property ";
+    matcher_.DescribeNegationTo(os);
+  }
+
+  template <typename T>
+  bool MatchAndExplain(const T&value, MatchResultListener* listener) const {
+    return MatchAndExplainImpl(
+        typename ::testing::internal::
+            is_pointer<GTEST_REMOVE_CONST_(T)>::type(),
+        value, listener);
+  }
+
+ private:
+  // The first argument of MatchAndExplainImpl() is needed to help
+  // Symbian's C++ compiler choose which overload to use.  Its type is
+  // true_type iff the Property() matcher is used to match a pointer.
+  bool MatchAndExplainImpl(false_type /* is_not_pointer */, const Class& obj,
+                           MatchResultListener* listener) const {
+    *listener << "whose given property is ";
+    // Cannot pass the return value (for example, int) to MatchPrintAndExplain,
+    // which takes a non-const reference as argument.
+#if defined(_PREFAST_ ) && _MSC_VER == 1800
+    // Workaround bug in VC++ 2013's /analyze parser.
+    // https://connect.microsoft.com/VisualStudio/feedback/details/1106363/internal-compiler-error-with-analyze-due-to-failure-to-infer-move
+    posix::Abort();  // To make sure it is never run.
+    return false;
+#else
+    RefToConstProperty result = (obj.*property_)();
+    return MatchPrintAndExplain(result, matcher_, listener);
+#endif
+  }
+
+  bool MatchAndExplainImpl(true_type /* is_pointer */, const Class* p,
+                           MatchResultListener* listener) const {
+    if (p == NULL)
+      return false;
+
+    *listener << "which points to an object ";
+    // Since *p has a property method, it must be a class/struct/union
+    // type and thus cannot be a pointer.  Therefore we pass
+    // false_type() as the first argument.
+    return MatchAndExplainImpl(false_type(), *p, listener);
+  }
+
+  PropertyType (Class::*property_)() const;
+  const Matcher<RefToConstProperty> matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(PropertyMatcher);
+};
+
+// Type traits specifying various features of different functors for ResultOf.
+// The default template specifies features for functor objects.
+// Functor classes have to typedef argument_type and result_type
+// to be compatible with ResultOf.
+template <typename Functor>
+struct CallableTraits {
+  typedef typename Functor::result_type ResultType;
+  typedef Functor StorageType;
+
+  static void CheckIsValid(Functor /* functor */) {}
+  template <typename T>
+  static ResultType Invoke(Functor f, T arg) { return f(arg); }
+};
+
+// Specialization for function pointers.
+template <typename ArgType, typename ResType>
+struct CallableTraits<ResType(*)(ArgType)> {
+  typedef ResType ResultType;
+  typedef ResType(*StorageType)(ArgType);
+
+  static void CheckIsValid(ResType(*f)(ArgType)) {
+    GTEST_CHECK_(f != NULL)
+        << "NULL function pointer is passed into ResultOf().";
+  }
+  template <typename T>
+  static ResType Invoke(ResType(*f)(ArgType), T arg) {
+    return (*f)(arg);
+  }
+};
+
+// Implements the ResultOf() matcher for matching a return value of a
+// unary function of an object.
+template <typename Callable>
+class ResultOfMatcher {
+ public:
+  typedef typename CallableTraits<Callable>::ResultType ResultType;
+
+  ResultOfMatcher(Callable callable, const Matcher<ResultType>& matcher)
+      : callable_(callable), matcher_(matcher) {
+    CallableTraits<Callable>::CheckIsValid(callable_);
+  }
+
+  template <typename T>
+  operator Matcher<T>() const {
+    return Matcher<T>(new Impl<T>(callable_, matcher_));
+  }
+
+ private:
+  typedef typename CallableTraits<Callable>::StorageType CallableStorageType;
+
+  template <typename T>
+  class Impl : public MatcherInterface<T> {
+   public:
+    Impl(CallableStorageType callable, const Matcher<ResultType>& matcher)
+        : callable_(callable), matcher_(matcher) {}
+
+    virtual void DescribeTo(::std::ostream* os) const {
+      *os << "is mapped by the given callable to a value that ";
+      matcher_.DescribeTo(os);
+    }
+
+    virtual void DescribeNegationTo(::std::ostream* os) const {
+      *os << "is mapped by the given callable to a value that ";
+      matcher_.DescribeNegationTo(os);
+    }
+
+    virtual bool MatchAndExplain(T obj, MatchResultListener* listener) const {
+      *listener << "which is mapped by the given callable to ";
+      // Cannot pass the return value (for example, int) to
+      // MatchPrintAndExplain, which takes a non-const reference as argument.
+      ResultType result =
+          CallableTraits<Callable>::template Invoke<T>(callable_, obj);
+      return MatchPrintAndExplain(result, matcher_, listener);
+    }
+
+   private:
+    // Functors often define operator() as non-const method even though
+    // they are actualy stateless. But we need to use them even when
+    // 'this' is a const pointer. It's the user's responsibility not to
+    // use stateful callables with ResultOf(), which does't guarantee
+    // how many times the callable will be invoked.
+    mutable CallableStorageType callable_;
+    const Matcher<ResultType> matcher_;
+
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };  // class Impl
+
+  const CallableStorageType callable_;
+  const Matcher<ResultType> matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(ResultOfMatcher);
+};
+
+// Implements a matcher that checks the size of an STL-style container.
+template <typename SizeMatcher>
+class SizeIsMatcher {
+ public:
+  explicit SizeIsMatcher(const SizeMatcher& size_matcher)
+       : size_matcher_(size_matcher) {
+  }
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    return MakeMatcher(new Impl<Container>(size_matcher_));
+  }
+
+  template <typename Container>
+  class Impl : public MatcherInterface<Container> {
+   public:
+    typedef internal::StlContainerView<
+         GTEST_REMOVE_REFERENCE_AND_CONST_(Container)> ContainerView;
+    typedef typename ContainerView::type::size_type SizeType;
+    explicit Impl(const SizeMatcher& size_matcher)
+        : size_matcher_(MatcherCast<SizeType>(size_matcher)) {}
+
+    virtual void DescribeTo(::std::ostream* os) const {
+      *os << "size ";
+      size_matcher_.DescribeTo(os);
+    }
+    virtual void DescribeNegationTo(::std::ostream* os) const {
+      *os << "size ";
+      size_matcher_.DescribeNegationTo(os);
+    }
+
+    virtual bool MatchAndExplain(Container container,
+                                 MatchResultListener* listener) const {
+      SizeType size = container.size();
+      StringMatchResultListener size_listener;
+      const bool result = size_matcher_.MatchAndExplain(size, &size_listener);
+      *listener
+          << "whose size " << size << (result ? " matches" : " doesn't match");
+      PrintIfNotEmpty(size_listener.str(), listener->stream());
+      return result;
+    }
+
+   private:
+    const Matcher<SizeType> size_matcher_;
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+
+ private:
+  const SizeMatcher size_matcher_;
+  GTEST_DISALLOW_ASSIGN_(SizeIsMatcher);
+};
+
+// Implements a matcher that checks the begin()..end() distance of an STL-style
+// container.
+template <typename DistanceMatcher>
+class BeginEndDistanceIsMatcher {
+ public:
+  explicit BeginEndDistanceIsMatcher(const DistanceMatcher& distance_matcher)
+      : distance_matcher_(distance_matcher) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    return MakeMatcher(new Impl<Container>(distance_matcher_));
+  }
+
+  template <typename Container>
+  class Impl : public MatcherInterface<Container> {
+   public:
+    typedef internal::StlContainerView<
+        GTEST_REMOVE_REFERENCE_AND_CONST_(Container)> ContainerView;
+    typedef typename std::iterator_traits<
+        typename ContainerView::type::const_iterator>::difference_type
+        DistanceType;
+    explicit Impl(const DistanceMatcher& distance_matcher)
+        : distance_matcher_(MatcherCast<DistanceType>(distance_matcher)) {}
+
+    virtual void DescribeTo(::std::ostream* os) const {
+      *os << "distance between begin() and end() ";
+      distance_matcher_.DescribeTo(os);
+    }
+    virtual void DescribeNegationTo(::std::ostream* os) const {
+      *os << "distance between begin() and end() ";
+      distance_matcher_.DescribeNegationTo(os);
+    }
+
+    virtual bool MatchAndExplain(Container container,
+                                 MatchResultListener* listener) const {
+#if GTEST_HAS_STD_BEGIN_AND_END_
+      using std::begin;
+      using std::end;
+      DistanceType distance = std::distance(begin(container), end(container));
+#else
+      DistanceType distance = std::distance(container.begin(), container.end());
+#endif
+      StringMatchResultListener distance_listener;
+      const bool result =
+          distance_matcher_.MatchAndExplain(distance, &distance_listener);
+      *listener << "whose distance between begin() and end() " << distance
+                << (result ? " matches" : " doesn't match");
+      PrintIfNotEmpty(distance_listener.str(), listener->stream());
+      return result;
+    }
+
+   private:
+    const Matcher<DistanceType> distance_matcher_;
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+
+ private:
+  const DistanceMatcher distance_matcher_;
+  GTEST_DISALLOW_ASSIGN_(BeginEndDistanceIsMatcher);
+};
+
+// Implements an equality matcher for any STL-style container whose elements
+// support ==. This matcher is like Eq(), but its failure explanations provide
+// more detailed information that is useful when the container is used as a set.
+// The failure message reports elements that are in one of the operands but not
+// the other. The failure messages do not report duplicate or out-of-order
+// elements in the containers (which don't properly matter to sets, but can
+// occur if the containers are vectors or lists, for example).
+//
+// Uses the container's const_iterator, value_type, operator ==,
+// begin(), and end().
+template <typename Container>
+class ContainerEqMatcher {
+ public:
+  typedef internal::StlContainerView<Container> View;
+  typedef typename View::type StlContainer;
+  typedef typename View::const_reference StlContainerReference;
+
+  // We make a copy of expected in case the elements in it are modified
+  // after this matcher is created.
+  explicit ContainerEqMatcher(const Container& expected)
+      : expected_(View::Copy(expected)) {
+    // Makes sure the user doesn't instantiate this class template
+    // with a const or reference type.
+    (void)testing::StaticAssertTypeEq<Container,
+        GTEST_REMOVE_REFERENCE_AND_CONST_(Container)>();
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "equals ";
+    UniversalPrint(expected_, os);
+  }
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "does not equal ";
+    UniversalPrint(expected_, os);
+  }
+
+  template <typename LhsContainer>
+  bool MatchAndExplain(const LhsContainer& lhs,
+                       MatchResultListener* listener) const {
+    // GTEST_REMOVE_CONST_() is needed to work around an MSVC 8.0 bug
+    // that causes LhsContainer to be a const type sometimes.
+    typedef internal::StlContainerView<GTEST_REMOVE_CONST_(LhsContainer)>
+        LhsView;
+    typedef typename LhsView::type LhsStlContainer;
+    StlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
+    if (lhs_stl_container == expected_)
+      return true;
+
+    ::std::ostream* const os = listener->stream();
+    if (os != NULL) {
+      // Something is different. Check for extra values first.
+      bool printed_header = false;
+      for (typename LhsStlContainer::const_iterator it =
+               lhs_stl_container.begin();
+           it != lhs_stl_container.end(); ++it) {
+        if (internal::ArrayAwareFind(expected_.begin(), expected_.end(), *it) ==
+            expected_.end()) {
+          if (printed_header) {
+            *os << ", ";
+          } else {
+            *os << "which has these unexpected elements: ";
+            printed_header = true;
+          }
+          UniversalPrint(*it, os);
+        }
+      }
+
+      // Now check for missing values.
+      bool printed_header2 = false;
+      for (typename StlContainer::const_iterator it = expected_.begin();
+           it != expected_.end(); ++it) {
+        if (internal::ArrayAwareFind(
+                lhs_stl_container.begin(), lhs_stl_container.end(), *it) ==
+            lhs_stl_container.end()) {
+          if (printed_header2) {
+            *os << ", ";
+          } else {
+            *os << (printed_header ? ",\nand" : "which")
+                << " doesn't have these expected elements: ";
+            printed_header2 = true;
+          }
+          UniversalPrint(*it, os);
+        }
+      }
+    }
+
+    return false;
+  }
+
+ private:
+  const StlContainer expected_;
+
+  GTEST_DISALLOW_ASSIGN_(ContainerEqMatcher);
+};
+
+// A comparator functor that uses the < operator to compare two values.
+struct LessComparator {
+  template <typename T, typename U>
+  bool operator()(const T& lhs, const U& rhs) const { return lhs < rhs; }
+};
+
+// Implements WhenSortedBy(comparator, container_matcher).
+template <typename Comparator, typename ContainerMatcher>
+class WhenSortedByMatcher {
+ public:
+  WhenSortedByMatcher(const Comparator& comparator,
+                      const ContainerMatcher& matcher)
+      : comparator_(comparator), matcher_(matcher) {}
+
+  template <typename LhsContainer>
+  operator Matcher<LhsContainer>() const {
+    return MakeMatcher(new Impl<LhsContainer>(comparator_, matcher_));
+  }
+
+  template <typename LhsContainer>
+  class Impl : public MatcherInterface<LhsContainer> {
+   public:
+    typedef internal::StlContainerView<
+         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView;
+    typedef typename LhsView::type LhsStlContainer;
+    typedef typename LhsView::const_reference LhsStlContainerReference;
+    // Transforms std::pair<const Key, Value> into std::pair<Key, Value>
+    // so that we can match associative containers.
+    typedef typename RemoveConstFromKey<
+        typename LhsStlContainer::value_type>::type LhsValue;
+
+    Impl(const Comparator& comparator, const ContainerMatcher& matcher)
+        : comparator_(comparator), matcher_(matcher) {}
+
+    virtual void DescribeTo(::std::ostream* os) const {
+      *os << "(when sorted) ";
+      matcher_.DescribeTo(os);
+    }
+
+    virtual void DescribeNegationTo(::std::ostream* os) const {
+      *os << "(when sorted) ";
+      matcher_.DescribeNegationTo(os);
+    }
+
+    virtual bool MatchAndExplain(LhsContainer lhs,
+                                 MatchResultListener* listener) const {
+      LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
+      ::std::vector<LhsValue> sorted_container(lhs_stl_container.begin(),
+                                               lhs_stl_container.end());
+      ::std::sort(
+           sorted_container.begin(), sorted_container.end(), comparator_);
+
+      if (!listener->IsInterested()) {
+        // If the listener is not interested, we do not need to
+        // construct the inner explanation.
+        return matcher_.Matches(sorted_container);
+      }
+
+      *listener << "which is ";
+      UniversalPrint(sorted_container, listener->stream());
+      *listener << " when sorted";
+
+      StringMatchResultListener inner_listener;
+      const bool match = matcher_.MatchAndExplain(sorted_container,
+                                                  &inner_listener);
+      PrintIfNotEmpty(inner_listener.str(), listener->stream());
+      return match;
+    }
+
+   private:
+    const Comparator comparator_;
+    const Matcher<const ::std::vector<LhsValue>&> matcher_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl);
+  };
+
+ private:
+  const Comparator comparator_;
+  const ContainerMatcher matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(WhenSortedByMatcher);
+};
+
+// Implements Pointwise(tuple_matcher, rhs_container).  tuple_matcher
+// must be able to be safely cast to Matcher<tuple<const T1&, const
+// T2&> >, where T1 and T2 are the types of elements in the LHS
+// container and the RHS container respectively.
+template <typename TupleMatcher, typename RhsContainer>
+class PointwiseMatcher {
+ public:
+  typedef internal::StlContainerView<RhsContainer> RhsView;
+  typedef typename RhsView::type RhsStlContainer;
+  typedef typename RhsStlContainer::value_type RhsValue;
+
+  // Like ContainerEq, we make a copy of rhs in case the elements in
+  // it are modified after this matcher is created.
+  PointwiseMatcher(const TupleMatcher& tuple_matcher, const RhsContainer& rhs)
+      : tuple_matcher_(tuple_matcher), rhs_(RhsView::Copy(rhs)) {
+    // Makes sure the user doesn't instantiate this class template
+    // with a const or reference type.
+    (void)testing::StaticAssertTypeEq<RhsContainer,
+        GTEST_REMOVE_REFERENCE_AND_CONST_(RhsContainer)>();
+  }
+
+  template <typename LhsContainer>
+  operator Matcher<LhsContainer>() const {
+    return MakeMatcher(new Impl<LhsContainer>(tuple_matcher_, rhs_));
+  }
+
+  template <typename LhsContainer>
+  class Impl : public MatcherInterface<LhsContainer> {
+   public:
+    typedef internal::StlContainerView<
+         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView;
+    typedef typename LhsView::type LhsStlContainer;
+    typedef typename LhsView::const_reference LhsStlContainerReference;
+    typedef typename LhsStlContainer::value_type LhsValue;
+    // We pass the LHS value and the RHS value to the inner matcher by
+    // reference, as they may be expensive to copy.  We must use tuple
+    // instead of pair here, as a pair cannot hold references (C++ 98,
+    // 20.2.2 [lib.pairs]).
+    typedef ::testing::tuple<const LhsValue&, const RhsValue&> InnerMatcherArg;
+
+    Impl(const TupleMatcher& tuple_matcher, const RhsStlContainer& rhs)
+        // mono_tuple_matcher_ holds a monomorphic version of the tuple matcher.
+        : mono_tuple_matcher_(SafeMatcherCast<InnerMatcherArg>(tuple_matcher)),
+          rhs_(rhs) {}
+
+    virtual void DescribeTo(::std::ostream* os) const {
+      *os << "contains " << rhs_.size()
+          << " values, where each value and its corresponding value in ";
+      UniversalPrinter<RhsStlContainer>::Print(rhs_, os);
+      *os << " ";
+      mono_tuple_matcher_.DescribeTo(os);
+    }
+    virtual void DescribeNegationTo(::std::ostream* os) const {
+      *os << "doesn't contain exactly " << rhs_.size()
+          << " values, or contains a value x at some index i"
+          << " where x and the i-th value of ";
+      UniversalPrint(rhs_, os);
+      *os << " ";
+      mono_tuple_matcher_.DescribeNegationTo(os);
+    }
+
+    virtual bool MatchAndExplain(LhsContainer lhs,
+                                 MatchResultListener* listener) const {
+      LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
+      const size_t actual_size = lhs_stl_container.size();
+      if (actual_size != rhs_.size()) {
+        *listener << "which contains " << actual_size << " values";
+        return false;
+      }
+
+      typename LhsStlContainer::const_iterator left = lhs_stl_container.begin();
+      typename RhsStlContainer::const_iterator right = rhs_.begin();
+      for (size_t i = 0; i != actual_size; ++i, ++left, ++right) {
+        const InnerMatcherArg value_pair(*left, *right);
+
+        if (listener->IsInterested()) {
+          StringMatchResultListener inner_listener;
+          if (!mono_tuple_matcher_.MatchAndExplain(
+                  value_pair, &inner_listener)) {
+            *listener << "where the value pair (";
+            UniversalPrint(*left, listener->stream());
+            *listener << ", ";
+            UniversalPrint(*right, listener->stream());
+            *listener << ") at index #" << i << " don't match";
+            PrintIfNotEmpty(inner_listener.str(), listener->stream());
+            return false;
+          }
+        } else {
+          if (!mono_tuple_matcher_.Matches(value_pair))
+            return false;
+        }
+      }
+
+      return true;
+    }
+
+   private:
+    const Matcher<InnerMatcherArg> mono_tuple_matcher_;
+    const RhsStlContainer rhs_;
+
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+
+ private:
+  const TupleMatcher tuple_matcher_;
+  const RhsStlContainer rhs_;
+
+  GTEST_DISALLOW_ASSIGN_(PointwiseMatcher);
+};
+
+// Holds the logic common to ContainsMatcherImpl and EachMatcherImpl.
+template <typename Container>
+class QuantifierMatcherImpl : public MatcherInterface<Container> {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+  typedef StlContainerView<RawContainer> View;
+  typedef typename View::type StlContainer;
+  typedef typename View::const_reference StlContainerReference;
+  typedef typename StlContainer::value_type Element;
+
+  template <typename InnerMatcher>
+  explicit QuantifierMatcherImpl(InnerMatcher inner_matcher)
+      : inner_matcher_(
+           testing::SafeMatcherCast<const Element&>(inner_matcher)) {}
+
+  // Checks whether:
+  // * All elements in the container match, if all_elements_should_match.
+  // * Any element in the container matches, if !all_elements_should_match.
+  bool MatchAndExplainImpl(bool all_elements_should_match,
+                           Container container,
+                           MatchResultListener* listener) const {
+    StlContainerReference stl_container = View::ConstReference(container);
+    size_t i = 0;
+    for (typename StlContainer::const_iterator it = stl_container.begin();
+         it != stl_container.end(); ++it, ++i) {
+      StringMatchResultListener inner_listener;
+      const bool matches = inner_matcher_.MatchAndExplain(*it, &inner_listener);
+
+      if (matches != all_elements_should_match) {
+        *listener << "whose element #" << i
+                  << (matches ? " matches" : " doesn't match");
+        PrintIfNotEmpty(inner_listener.str(), listener->stream());
+        return !all_elements_should_match;
+      }
+    }
+    return all_elements_should_match;
+  }
+
+ protected:
+  const Matcher<const Element&> inner_matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(QuantifierMatcherImpl);
+};
+
+// Implements Contains(element_matcher) for the given argument type Container.
+// Symmetric to EachMatcherImpl.
+template <typename Container>
+class ContainsMatcherImpl : public QuantifierMatcherImpl<Container> {
+ public:
+  template <typename InnerMatcher>
+  explicit ContainsMatcherImpl(InnerMatcher inner_matcher)
+      : QuantifierMatcherImpl<Container>(inner_matcher) {}
+
+  // Describes what this matcher does.
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "contains at least one element that ";
+    this->inner_matcher_.DescribeTo(os);
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't contain any element that ";
+    this->inner_matcher_.DescribeTo(os);
+  }
+
+  virtual bool MatchAndExplain(Container container,
+                               MatchResultListener* listener) const {
+    return this->MatchAndExplainImpl(false, container, listener);
+  }
+
+ private:
+  GTEST_DISALLOW_ASSIGN_(ContainsMatcherImpl);
+};
+
+// Implements Each(element_matcher) for the given argument type Container.
+// Symmetric to ContainsMatcherImpl.
+template <typename Container>
+class EachMatcherImpl : public QuantifierMatcherImpl<Container> {
+ public:
+  template <typename InnerMatcher>
+  explicit EachMatcherImpl(InnerMatcher inner_matcher)
+      : QuantifierMatcherImpl<Container>(inner_matcher) {}
+
+  // Describes what this matcher does.
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "only contains elements that ";
+    this->inner_matcher_.DescribeTo(os);
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "contains some element that ";
+    this->inner_matcher_.DescribeNegationTo(os);
+  }
+
+  virtual bool MatchAndExplain(Container container,
+                               MatchResultListener* listener) const {
+    return this->MatchAndExplainImpl(true, container, listener);
+  }
+
+ private:
+  GTEST_DISALLOW_ASSIGN_(EachMatcherImpl);
+};
+
+// Implements polymorphic Contains(element_matcher).
+template <typename M>
+class ContainsMatcher {
+ public:
+  explicit ContainsMatcher(M m) : inner_matcher_(m) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    return MakeMatcher(new ContainsMatcherImpl<Container>(inner_matcher_));
+  }
+
+ private:
+  const M inner_matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(ContainsMatcher);
+};
+
+// Implements polymorphic Each(element_matcher).
+template <typename M>
+class EachMatcher {
+ public:
+  explicit EachMatcher(M m) : inner_matcher_(m) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    return MakeMatcher(new EachMatcherImpl<Container>(inner_matcher_));
+  }
+
+ private:
+  const M inner_matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(EachMatcher);
+};
+
+// Implements Key(inner_matcher) for the given argument pair type.
+// Key(inner_matcher) matches an std::pair whose 'first' field matches
+// inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an
+// std::map that contains at least one element whose key is >= 5.
+template <typename PairType>
+class KeyMatcherImpl : public MatcherInterface<PairType> {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(PairType) RawPairType;
+  typedef typename RawPairType::first_type KeyType;
+
+  template <typename InnerMatcher>
+  explicit KeyMatcherImpl(InnerMatcher inner_matcher)
+      : inner_matcher_(
+          testing::SafeMatcherCast<const KeyType&>(inner_matcher)) {
+  }
+
+  // Returns true iff 'key_value.first' (the key) matches the inner matcher.
+  virtual bool MatchAndExplain(PairType key_value,
+                               MatchResultListener* listener) const {
+    StringMatchResultListener inner_listener;
+    const bool match = inner_matcher_.MatchAndExplain(key_value.first,
+                                                      &inner_listener);
+    const internal::string explanation = inner_listener.str();
+    if (explanation != "") {
+      *listener << "whose first field is a value " << explanation;
+    }
+    return match;
+  }
+
+  // Describes what this matcher does.
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "has a key that ";
+    inner_matcher_.DescribeTo(os);
+  }
+
+  // Describes what the negation of this matcher does.
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't have a key that ";
+    inner_matcher_.DescribeTo(os);
+  }
+
+ private:
+  const Matcher<const KeyType&> inner_matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(KeyMatcherImpl);
+};
+
+// Implements polymorphic Key(matcher_for_key).
+template <typename M>
+class KeyMatcher {
+ public:
+  explicit KeyMatcher(M m) : matcher_for_key_(m) {}
+
+  template <typename PairType>
+  operator Matcher<PairType>() const {
+    return MakeMatcher(new KeyMatcherImpl<PairType>(matcher_for_key_));
+  }
+
+ private:
+  const M matcher_for_key_;
+
+  GTEST_DISALLOW_ASSIGN_(KeyMatcher);
+};
+
+// Implements Pair(first_matcher, second_matcher) for the given argument pair
+// type with its two matchers. See Pair() function below.
+template <typename PairType>
+class PairMatcherImpl : public MatcherInterface<PairType> {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(PairType) RawPairType;
+  typedef typename RawPairType::first_type FirstType;
+  typedef typename RawPairType::second_type SecondType;
+
+  template <typename FirstMatcher, typename SecondMatcher>
+  PairMatcherImpl(FirstMatcher first_matcher, SecondMatcher second_matcher)
+      : first_matcher_(
+            testing::SafeMatcherCast<const FirstType&>(first_matcher)),
+        second_matcher_(
+            testing::SafeMatcherCast<const SecondType&>(second_matcher)) {
+  }
+
+  // Describes what this matcher does.
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "has a first field that ";
+    first_matcher_.DescribeTo(os);
+    *os << ", and has a second field that ";
+    second_matcher_.DescribeTo(os);
+  }
+
+  // Describes what the negation of this matcher does.
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    *os << "has a first field that ";
+    first_matcher_.DescribeNegationTo(os);
+    *os << ", or has a second field that ";
+    second_matcher_.DescribeNegationTo(os);
+  }
+
+  // Returns true iff 'a_pair.first' matches first_matcher and 'a_pair.second'
+  // matches second_matcher.
+  virtual bool MatchAndExplain(PairType a_pair,
+                               MatchResultListener* listener) const {
+    if (!listener->IsInterested()) {
+      // If the listener is not interested, we don't need to construct the
+      // explanation.
+      return first_matcher_.Matches(a_pair.first) &&
+             second_matcher_.Matches(a_pair.second);
+    }
+    StringMatchResultListener first_inner_listener;
+    if (!first_matcher_.MatchAndExplain(a_pair.first,
+                                        &first_inner_listener)) {
+      *listener << "whose first field does not match";
+      PrintIfNotEmpty(first_inner_listener.str(), listener->stream());
+      return false;
+    }
+    StringMatchResultListener second_inner_listener;
+    if (!second_matcher_.MatchAndExplain(a_pair.second,
+                                         &second_inner_listener)) {
+      *listener << "whose second field does not match";
+      PrintIfNotEmpty(second_inner_listener.str(), listener->stream());
+      return false;
+    }
+    ExplainSuccess(first_inner_listener.str(), second_inner_listener.str(),
+                   listener);
+    return true;
+  }
+
+ private:
+  void ExplainSuccess(const internal::string& first_explanation,
+                      const internal::string& second_explanation,
+                      MatchResultListener* listener) const {
+    *listener << "whose both fields match";
+    if (first_explanation != "") {
+      *listener << ", where the first field is a value " << first_explanation;
+    }
+    if (second_explanation != "") {
+      *listener << ", ";
+      if (first_explanation != "") {
+        *listener << "and ";
+      } else {
+        *listener << "where ";
+      }
+      *listener << "the second field is a value " << second_explanation;
+    }
+  }
+
+  const Matcher<const FirstType&> first_matcher_;
+  const Matcher<const SecondType&> second_matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(PairMatcherImpl);
+};
+
+// Implements polymorphic Pair(first_matcher, second_matcher).
+template <typename FirstMatcher, typename SecondMatcher>
+class PairMatcher {
+ public:
+  PairMatcher(FirstMatcher first_matcher, SecondMatcher second_matcher)
+      : first_matcher_(first_matcher), second_matcher_(second_matcher) {}
+
+  template <typename PairType>
+  operator Matcher<PairType> () const {
+    return MakeMatcher(
+        new PairMatcherImpl<PairType>(
+            first_matcher_, second_matcher_));
+  }
+
+ private:
+  const FirstMatcher first_matcher_;
+  const SecondMatcher second_matcher_;
+
+  GTEST_DISALLOW_ASSIGN_(PairMatcher);
+};
+
+// Implements ElementsAre() and ElementsAreArray().
+template <typename Container>
+class ElementsAreMatcherImpl : public MatcherInterface<Container> {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+  typedef internal::StlContainerView<RawContainer> View;
+  typedef typename View::type StlContainer;
+  typedef typename View::const_reference StlContainerReference;
+  typedef typename StlContainer::value_type Element;
+
+  // Constructs the matcher from a sequence of element values or
+  // element matchers.
+  template <typename InputIter>
+  ElementsAreMatcherImpl(InputIter first, InputIter last) {
+    while (first != last) {
+      matchers_.push_back(MatcherCast<const Element&>(*first++));
+    }
+  }
+
+  // Describes what this matcher does.
+  virtual void DescribeTo(::std::ostream* os) const {
+    if (count() == 0) {
+      *os << "is empty";
+    } else if (count() == 1) {
+      *os << "has 1 element that ";
+      matchers_[0].DescribeTo(os);
+    } else {
+      *os << "has " << Elements(count()) << " where\n";
+      for (size_t i = 0; i != count(); ++i) {
+        *os << "element #" << i << " ";
+        matchers_[i].DescribeTo(os);
+        if (i + 1 < count()) {
+          *os << ",\n";
+        }
+      }
+    }
+  }
+
+  // Describes what the negation of this matcher does.
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    if (count() == 0) {
+      *os << "isn't empty";
+      return;
+    }
+
+    *os << "doesn't have " << Elements(count()) << ", or\n";
+    for (size_t i = 0; i != count(); ++i) {
+      *os << "element #" << i << " ";
+      matchers_[i].DescribeNegationTo(os);
+      if (i + 1 < count()) {
+        *os << ", or\n";
+      }
+    }
+  }
+
+  virtual bool MatchAndExplain(Container container,
+                               MatchResultListener* listener) const {
+    // To work with stream-like "containers", we must only walk
+    // through the elements in one pass.
+
+    const bool listener_interested = listener->IsInterested();
+
+    // explanations[i] is the explanation of the element at index i.
+    ::std::vector<internal::string> explanations(count());
+    StlContainerReference stl_container = View::ConstReference(container);
+    typename StlContainer::const_iterator it = stl_container.begin();
+    size_t exam_pos = 0;
+    bool mismatch_found = false;  // Have we found a mismatched element yet?
+
+    // Go through the elements and matchers in pairs, until we reach
+    // the end of either the elements or the matchers, or until we find a
+    // mismatch.
+    for (; it != stl_container.end() && exam_pos != count(); ++it, ++exam_pos) {
+      bool match;  // Does the current element match the current matcher?
+      if (listener_interested) {
+        StringMatchResultListener s;
+        match = matchers_[exam_pos].MatchAndExplain(*it, &s);
+        explanations[exam_pos] = s.str();
+      } else {
+        match = matchers_[exam_pos].Matches(*it);
+      }
+
+      if (!match) {
+        mismatch_found = true;
+        break;
+      }
+    }
+    // If mismatch_found is true, 'exam_pos' is the index of the mismatch.
+
+    // Find how many elements the actual container has.  We avoid
+    // calling size() s.t. this code works for stream-like "containers"
+    // that don't define size().
+    size_t actual_count = exam_pos;
+    for (; it != stl_container.end(); ++it) {
+      ++actual_count;
+    }
+
+    if (actual_count != count()) {
+      // The element count doesn't match.  If the container is empty,
+      // there's no need to explain anything as Google Mock already
+      // prints the empty container.  Otherwise we just need to show
+      // how many elements there actually are.
+      if (listener_interested && (actual_count != 0)) {
+        *listener << "which has " << Elements(actual_count);
+      }
+      return false;
+    }
+
+    if (mismatch_found) {
+      // The element count matches, but the exam_pos-th element doesn't match.
+      if (listener_interested) {
+        *listener << "whose element #" << exam_pos << " doesn't match";
+        PrintIfNotEmpty(explanations[exam_pos], listener->stream());
+      }
+      return false;
+    }
+
+    // Every element matches its expectation.  We need to explain why
+    // (the obvious ones can be skipped).
+    if (listener_interested) {
+      bool reason_printed = false;
+      for (size_t i = 0; i != count(); ++i) {
+        const internal::string& s = explanations[i];
+        if (!s.empty()) {
+          if (reason_printed) {
+            *listener << ",\nand ";
+          }
+          *listener << "whose element #" << i << " matches, " << s;
+          reason_printed = true;
+        }
+      }
+    }
+    return true;
+  }
+
+ private:
+  static Message Elements(size_t count) {
+    return Message() << count << (count == 1 ? " element" : " elements");
+  }
+
+  size_t count() const { return matchers_.size(); }
+
+  ::std::vector<Matcher<const Element&> > matchers_;
+
+  GTEST_DISALLOW_ASSIGN_(ElementsAreMatcherImpl);
+};
+
+// Connectivity matrix of (elements X matchers), in element-major order.
+// Initially, there are no edges.
+// Use NextGraph() to iterate over all possible edge configurations.
+// Use Randomize() to generate a random edge configuration.
+class GTEST_API_ MatchMatrix {
+ public:
+  MatchMatrix(size_t num_elements, size_t num_matchers)
+      : num_elements_(num_elements),
+        num_matchers_(num_matchers),
+        matched_(num_elements_* num_matchers_, 0) {
+  }
+
+  size_t LhsSize() const { return num_elements_; }
+  size_t RhsSize() const { return num_matchers_; }
+  bool HasEdge(size_t ilhs, size_t irhs) const {
+    return matched_[SpaceIndex(ilhs, irhs)] == 1;
+  }
+  void SetEdge(size_t ilhs, size_t irhs, bool b) {
+    matched_[SpaceIndex(ilhs, irhs)] = b ? 1 : 0;
+  }
+
+  // Treating the connectivity matrix as a (LhsSize()*RhsSize())-bit number,
+  // adds 1 to that number; returns false if incrementing the graph left it
+  // empty.
+  bool NextGraph();
+
+  void Randomize();
+
+  string DebugString() const;
+
+ private:
+  size_t SpaceIndex(size_t ilhs, size_t irhs) const {
+    return ilhs * num_matchers_ + irhs;
+  }
+
+  size_t num_elements_;
+  size_t num_matchers_;
+
+  // Each element is a char interpreted as bool. They are stored as a
+  // flattened array in lhs-major order, use 'SpaceIndex()' to translate
+  // a (ilhs, irhs) matrix coordinate into an offset.
+  ::std::vector<char> matched_;
+};
+
+typedef ::std::pair<size_t, size_t> ElementMatcherPair;
+typedef ::std::vector<ElementMatcherPair> ElementMatcherPairs;
+
+// Returns a maximum bipartite matching for the specified graph 'g'.
+// The matching is represented as a vector of {element, matcher} pairs.
+GTEST_API_ ElementMatcherPairs
+FindMaxBipartiteMatching(const MatchMatrix& g);
+
+GTEST_API_ bool FindPairing(const MatchMatrix& matrix,
+                            MatchResultListener* listener);
+
+// Untyped base class for implementing UnorderedElementsAre.  By
+// putting logic that's not specific to the element type here, we
+// reduce binary bloat and increase compilation speed.
+class GTEST_API_ UnorderedElementsAreMatcherImplBase {
+ protected:
+  // A vector of matcher describers, one for each element matcher.
+  // Does not own the describers (and thus can be used only when the
+  // element matchers are alive).
+  typedef ::std::vector<const MatcherDescriberInterface*> MatcherDescriberVec;
+
+  // Describes this UnorderedElementsAre matcher.
+  void DescribeToImpl(::std::ostream* os) const;
+
+  // Describes the negation of this UnorderedElementsAre matcher.
+  void DescribeNegationToImpl(::std::ostream* os) const;
+
+  bool VerifyAllElementsAndMatchersAreMatched(
+      const ::std::vector<string>& element_printouts,
+      const MatchMatrix& matrix,
+      MatchResultListener* listener) const;
+
+  MatcherDescriberVec& matcher_describers() {
+    return matcher_describers_;
+  }
+
+  static Message Elements(size_t n) {
+    return Message() << n << " element" << (n == 1 ? "" : "s");
+  }
+
+ private:
+  MatcherDescriberVec matcher_describers_;
+
+  GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcherImplBase);
+};
+
+// Implements unordered ElementsAre and unordered ElementsAreArray.
+template <typename Container>
+class UnorderedElementsAreMatcherImpl
+    : public MatcherInterface<Container>,
+      public UnorderedElementsAreMatcherImplBase {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+  typedef internal::StlContainerView<RawContainer> View;
+  typedef typename View::type StlContainer;
+  typedef typename View::const_reference StlContainerReference;
+  typedef typename StlContainer::const_iterator StlContainerConstIterator;
+  typedef typename StlContainer::value_type Element;
+
+  // Constructs the matcher from a sequence of element values or
+  // element matchers.
+  template <typename InputIter>
+  UnorderedElementsAreMatcherImpl(InputIter first, InputIter last) {
+    for (; first != last; ++first) {
+      matchers_.push_back(MatcherCast<const Element&>(*first));
+      matcher_describers().push_back(matchers_.back().GetDescriber());
+    }
+  }
+
+  // Describes what this matcher does.
+  virtual void DescribeTo(::std::ostream* os) const {
+    return UnorderedElementsAreMatcherImplBase::DescribeToImpl(os);
+  }
+
+  // Describes what the negation of this matcher does.
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    return UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(os);
+  }
+
+  virtual bool MatchAndExplain(Container container,
+                               MatchResultListener* listener) const {
+    StlContainerReference stl_container = View::ConstReference(container);
+    ::std::vector<string> element_printouts;
+    MatchMatrix matrix = AnalyzeElements(stl_container.begin(),
+                                         stl_container.end(),
+                                         &element_printouts,
+                                         listener);
+
+    const size_t actual_count = matrix.LhsSize();
+    if (actual_count == 0 && matchers_.empty()) {
+      return true;
+    }
+    if (actual_count != matchers_.size()) {
+      // The element count doesn't match.  If the container is empty,
+      // there's no need to explain anything as Google Mock already
+      // prints the empty container. Otherwise we just need to show
+      // how many elements there actually are.
+      if (actual_count != 0 && listener->IsInterested()) {
+        *listener << "which has " << Elements(actual_count);
+      }
+      return false;
+    }
+
+    return VerifyAllElementsAndMatchersAreMatched(element_printouts,
+                                                  matrix, listener) &&
+           FindPairing(matrix, listener);
+  }
+
+ private:
+  typedef ::std::vector<Matcher<const Element&> > MatcherVec;
+
+  template <typename ElementIter>
+  MatchMatrix AnalyzeElements(ElementIter elem_first, ElementIter elem_last,
+                              ::std::vector<string>* element_printouts,
+                              MatchResultListener* listener) const {
+    element_printouts->clear();
+    ::std::vector<char> did_match;
+    size_t num_elements = 0;
+    for (; elem_first != elem_last; ++num_elements, ++elem_first) {
+      if (listener->IsInterested()) {
+        element_printouts->push_back(PrintToString(*elem_first));
+      }
+      for (size_t irhs = 0; irhs != matchers_.size(); ++irhs) {
+        did_match.push_back(Matches(matchers_[irhs])(*elem_first));
+      }
+    }
+
+    MatchMatrix matrix(num_elements, matchers_.size());
+    ::std::vector<char>::const_iterator did_match_iter = did_match.begin();
+    for (size_t ilhs = 0; ilhs != num_elements; ++ilhs) {
+      for (size_t irhs = 0; irhs != matchers_.size(); ++irhs) {
+        matrix.SetEdge(ilhs, irhs, *did_match_iter++ != 0);
+      }
+    }
+    return matrix;
+  }
+
+  MatcherVec matchers_;
+
+  GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcherImpl);
+};
+
+// Functor for use in TransformTuple.
+// Performs MatcherCast<Target> on an input argument of any type.
+template <typename Target>
+struct CastAndAppendTransform {
+  template <typename Arg>
+  Matcher<Target> operator()(const Arg& a) const {
+    return MatcherCast<Target>(a);
+  }
+};
+
+// Implements UnorderedElementsAre.
+template <typename MatcherTuple>
+class UnorderedElementsAreMatcher {
+ public:
+  explicit UnorderedElementsAreMatcher(const MatcherTuple& args)
+      : matchers_(args) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+    typedef typename internal::StlContainerView<RawContainer>::type View;
+    typedef typename View::value_type Element;
+    typedef ::std::vector<Matcher<const Element&> > MatcherVec;
+    MatcherVec matchers;
+    matchers.reserve(::testing::tuple_size<MatcherTuple>::value);
+    TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
+                         ::std::back_inserter(matchers));
+    return MakeMatcher(new UnorderedElementsAreMatcherImpl<Container>(
+                           matchers.begin(), matchers.end()));
+  }
+
+ private:
+  const MatcherTuple matchers_;
+  GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcher);
+};
+
+// Implements ElementsAre.
+template <typename MatcherTuple>
+class ElementsAreMatcher {
+ public:
+  explicit ElementsAreMatcher(const MatcherTuple& args) : matchers_(args) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+    typedef typename internal::StlContainerView<RawContainer>::type View;
+    typedef typename View::value_type Element;
+    typedef ::std::vector<Matcher<const Element&> > MatcherVec;
+    MatcherVec matchers;
+    matchers.reserve(::testing::tuple_size<MatcherTuple>::value);
+    TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
+                         ::std::back_inserter(matchers));
+    return MakeMatcher(new ElementsAreMatcherImpl<Container>(
+                           matchers.begin(), matchers.end()));
+  }
+
+ private:
+  const MatcherTuple matchers_;
+  GTEST_DISALLOW_ASSIGN_(ElementsAreMatcher);
+};
+
+// Implements UnorderedElementsAreArray().
+template <typename T>
+class UnorderedElementsAreArrayMatcher {
+ public:
+  UnorderedElementsAreArrayMatcher() {}
+
+  template <typename Iter>
+  UnorderedElementsAreArrayMatcher(Iter first, Iter last)
+      : matchers_(first, last) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    return MakeMatcher(
+        new UnorderedElementsAreMatcherImpl<Container>(matchers_.begin(),
+                                                       matchers_.end()));
+  }
+
+ private:
+  ::std::vector<T> matchers_;
+
+  GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreArrayMatcher);
+};
+
+// Implements ElementsAreArray().
+template <typename T>
+class ElementsAreArrayMatcher {
+ public:
+  template <typename Iter>
+  ElementsAreArrayMatcher(Iter first, Iter last) : matchers_(first, last) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    return MakeMatcher(new ElementsAreMatcherImpl<Container>(
+        matchers_.begin(), matchers_.end()));
+  }
+
+ private:
+  const ::std::vector<T> matchers_;
+
+  GTEST_DISALLOW_ASSIGN_(ElementsAreArrayMatcher);
+};
+
+// Given a 2-tuple matcher tm of type Tuple2Matcher and a value second
+// of type Second, BoundSecondMatcher<Tuple2Matcher, Second>(tm,
+// second) is a polymorphic matcher that matches a value x iff tm
+// matches tuple (x, second).  Useful for implementing
+// UnorderedPointwise() in terms of UnorderedElementsAreArray().
+//
+// BoundSecondMatcher is copyable and assignable, as we need to put
+// instances of this class in a vector when implementing
+// UnorderedPointwise().
+template <typename Tuple2Matcher, typename Second>
+class BoundSecondMatcher {
+ public:
+  BoundSecondMatcher(const Tuple2Matcher& tm, const Second& second)
+      : tuple2_matcher_(tm), second_value_(second) {}
+
+  template <typename T>
+  operator Matcher<T>() const {
+    return MakeMatcher(new Impl<T>(tuple2_matcher_, second_value_));
+  }
+
+  // We have to define this for UnorderedPointwise() to compile in
+  // C++98 mode, as it puts BoundSecondMatcher instances in a vector,
+  // which requires the elements to be assignable in C++98.  The
+  // compiler cannot generate the operator= for us, as Tuple2Matcher
+  // and Second may not be assignable.
+  //
+  // However, this should never be called, so the implementation just
+  // need to assert.
+  void operator=(const BoundSecondMatcher& /*rhs*/) {
+    GTEST_LOG_(FATAL) << "BoundSecondMatcher should never be assigned.";
+  }
+
+ private:
+  template <typename T>
+  class Impl : public MatcherInterface<T> {
+   public:
+    typedef ::testing::tuple<T, Second> ArgTuple;
+
+    Impl(const Tuple2Matcher& tm, const Second& second)
+        : mono_tuple2_matcher_(SafeMatcherCast<const ArgTuple&>(tm)),
+          second_value_(second) {}
+
+    virtual void DescribeTo(::std::ostream* os) const {
+      *os << "and ";
+      UniversalPrint(second_value_, os);
+      *os << " ";
+      mono_tuple2_matcher_.DescribeTo(os);
+    }
+
+    virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
+      return mono_tuple2_matcher_.MatchAndExplain(ArgTuple(x, second_value_),
+                                                  listener);
+    }
+
+   private:
+    const Matcher<const ArgTuple&> mono_tuple2_matcher_;
+    const Second second_value_;
+
+    GTEST_DISALLOW_ASSIGN_(Impl);
+  };
+
+  const Tuple2Matcher tuple2_matcher_;
+  const Second second_value_;
+};
+
+// Given a 2-tuple matcher tm and a value second,
+// MatcherBindSecond(tm, second) returns a matcher that matches a
+// value x iff tm matches tuple (x, second).  Useful for implementing
+// UnorderedPointwise() in terms of UnorderedElementsAreArray().
+template <typename Tuple2Matcher, typename Second>
+BoundSecondMatcher<Tuple2Matcher, Second> MatcherBindSecond(
+    const Tuple2Matcher& tm, const Second& second) {
+  return BoundSecondMatcher<Tuple2Matcher, Second>(tm, second);
+}
+
+// Returns the description for a matcher defined using the MATCHER*()
+// macro where the user-supplied description string is "", if
+// 'negation' is false; otherwise returns the description of the
+// negation of the matcher.  'param_values' contains a list of strings
+// that are the print-out of the matcher's parameters.
+GTEST_API_ string FormatMatcherDescription(bool negation,
+                                           const char* matcher_name,
+                                           const Strings& param_values);
+
+}  // namespace internal
+
+// ElementsAreArray(first, last)
+// ElementsAreArray(pointer, count)
+// ElementsAreArray(array)
+// ElementsAreArray(container)
+// ElementsAreArray({ e1, e2, ..., en })
+//
+// The ElementsAreArray() functions are like ElementsAre(...), except
+// that they are given a homogeneous sequence rather than taking each
+// element as a function argument. The sequence can be specified as an
+// array, a pointer and count, a vector, an initializer list, or an
+// STL iterator range. In each of these cases, the underlying sequence
+// can be either a sequence of values or a sequence of matchers.
+//
+// All forms of ElementsAreArray() make a copy of the input matcher sequence.
+
+template <typename Iter>
+inline internal::ElementsAreArrayMatcher<
+    typename ::std::iterator_traits<Iter>::value_type>
+ElementsAreArray(Iter first, Iter last) {
+  typedef typename ::std::iterator_traits<Iter>::value_type T;
+  return internal::ElementsAreArrayMatcher<T>(first, last);
+}
+
+template <typename T>
+inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
+    const T* pointer, size_t count) {
+  return ElementsAreArray(pointer, pointer + count);
+}
+
+template <typename T, size_t N>
+inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
+    const T (&array)[N]) {
+  return ElementsAreArray(array, N);
+}
+
+template <typename Container>
+inline internal::ElementsAreArrayMatcher<typename Container::value_type>
+ElementsAreArray(const Container& container) {
+  return ElementsAreArray(container.begin(), container.end());
+}
+
+#if GTEST_HAS_STD_INITIALIZER_LIST_
+template <typename T>
+inline internal::ElementsAreArrayMatcher<T>
+ElementsAreArray(::std::initializer_list<T> xs) {
+  return ElementsAreArray(xs.begin(), xs.end());
+}
+#endif
+
+// UnorderedElementsAreArray(first, last)
+// UnorderedElementsAreArray(pointer, count)
+// UnorderedElementsAreArray(array)
+// UnorderedElementsAreArray(container)
+// UnorderedElementsAreArray({ e1, e2, ..., en })
+//
+// The UnorderedElementsAreArray() functions are like
+// ElementsAreArray(...), but allow matching the elements in any order.
+template <typename Iter>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename ::std::iterator_traits<Iter>::value_type>
+UnorderedElementsAreArray(Iter first, Iter last) {
+  typedef typename ::std::iterator_traits<Iter>::value_type T;
+  return internal::UnorderedElementsAreArrayMatcher<T>(first, last);
+}
+
+template <typename T>
+inline internal::UnorderedElementsAreArrayMatcher<T>
+UnorderedElementsAreArray(const T* pointer, size_t count) {
+  return UnorderedElementsAreArray(pointer, pointer + count);
+}
+
+template <typename T, size_t N>
+inline internal::UnorderedElementsAreArrayMatcher<T>
+UnorderedElementsAreArray(const T (&array)[N]) {
+  return UnorderedElementsAreArray(array, N);
+}
+
+template <typename Container>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename Container::value_type>
+UnorderedElementsAreArray(const Container& container) {
+  return UnorderedElementsAreArray(container.begin(), container.end());
+}
+
+#if GTEST_HAS_STD_INITIALIZER_LIST_
+template <typename T>
+inline internal::UnorderedElementsAreArrayMatcher<T>
+UnorderedElementsAreArray(::std::initializer_list<T> xs) {
+  return UnorderedElementsAreArray(xs.begin(), xs.end());
+}
+#endif
+
+// _ is a matcher that matches anything of any type.
+//
+// This definition is fine as:
+//
+//   1. The C++ standard permits using the name _ in a namespace that
+//      is not the global namespace or ::std.
+//   2. The AnythingMatcher class has no data member or constructor,
+//      so it's OK to create global variables of this type.
+//   3. c-style has approved of using _ in this case.
+const internal::AnythingMatcher _ = {};
+// Creates a matcher that matches any value of the given type T.
+template <typename T>
+inline Matcher<T> A() { return MakeMatcher(new internal::AnyMatcherImpl<T>()); }
+
+// Creates a matcher that matches any value of the given type T.
+template <typename T>
+inline Matcher<T> An() { return A<T>(); }
+
+// Creates a polymorphic matcher that matches anything equal to x.
+// Note: if the parameter of Eq() were declared as const T&, Eq("foo")
+// wouldn't compile.
+template <typename T>
+inline internal::EqMatcher<T> Eq(T x) { return internal::EqMatcher<T>(x); }
+
+// Constructs a Matcher<T> from a 'value' of type T.  The constructed
+// matcher matches any value that's equal to 'value'.
+template <typename T>
+Matcher<T>::Matcher(T value) { *this = Eq(value); }
+
+// Creates a monomorphic matcher that matches anything with type Lhs
+// and equal to rhs.  A user may need to use this instead of Eq(...)
+// in order to resolve an overloading ambiguity.
+//
+// TypedEq<T>(x) is just a convenient short-hand for Matcher<T>(Eq(x))
+// or Matcher<T>(x), but more readable than the latter.
+//
+// We could define similar monomorphic matchers for other comparison
+// operations (e.g. TypedLt, TypedGe, and etc), but decided not to do
+// it yet as those are used much less than Eq() in practice.  A user
+// can always write Matcher<T>(Lt(5)) to be explicit about the type,
+// for example.
+template <typename Lhs, typename Rhs>
+inline Matcher<Lhs> TypedEq(const Rhs& rhs) { return Eq(rhs); }
+
+// Creates a polymorphic matcher that matches anything >= x.
+template <typename Rhs>
+inline internal::GeMatcher<Rhs> Ge(Rhs x) {
+  return internal::GeMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches anything > x.
+template <typename Rhs>
+inline internal::GtMatcher<Rhs> Gt(Rhs x) {
+  return internal::GtMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches anything <= x.
+template <typename Rhs>
+inline internal::LeMatcher<Rhs> Le(Rhs x) {
+  return internal::LeMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches anything < x.
+template <typename Rhs>
+inline internal::LtMatcher<Rhs> Lt(Rhs x) {
+  return internal::LtMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches anything != x.
+template <typename Rhs>
+inline internal::NeMatcher<Rhs> Ne(Rhs x) {
+  return internal::NeMatcher<Rhs>(x);
+}
+
+// Creates a polymorphic matcher that matches any NULL pointer.
+inline PolymorphicMatcher<internal::IsNullMatcher > IsNull() {
+  return MakePolymorphicMatcher(internal::IsNullMatcher());
+}
+
+// Creates a polymorphic matcher that matches any non-NULL pointer.
+// This is convenient as Not(NULL) doesn't compile (the compiler
+// thinks that that expression is comparing a pointer with an integer).
+inline PolymorphicMatcher<internal::NotNullMatcher > NotNull() {
+  return MakePolymorphicMatcher(internal::NotNullMatcher());
+}
+
+// Creates a polymorphic matcher that matches any argument that
+// references variable x.
+template <typename T>
+inline internal::RefMatcher<T&> Ref(T& x) {  // NOLINT
+  return internal::RefMatcher<T&>(x);
+}
+
+// Creates a matcher that matches any double argument approximately
+// equal to rhs, where two NANs are considered unequal.
+inline internal::FloatingEqMatcher<double> DoubleEq(double rhs) {
+  return internal::FloatingEqMatcher<double>(rhs, false);
+}
+
+// Creates a matcher that matches any double argument approximately
+// equal to rhs, including NaN values when rhs is NaN.
+inline internal::FloatingEqMatcher<double> NanSensitiveDoubleEq(double rhs) {
+  return internal::FloatingEqMatcher<double>(rhs, true);
+}
+
+// Creates a matcher that matches any double argument approximately equal to
+// rhs, up to the specified max absolute error bound, where two NANs are
+// considered unequal.  The max absolute error bound must be non-negative.
+inline internal::FloatingEqMatcher<double> DoubleNear(
+    double rhs, double max_abs_error) {
+  return internal::FloatingEqMatcher<double>(rhs, false, max_abs_error);
+}
+
+// Creates a matcher that matches any double argument approximately equal to
+// rhs, up to the specified max absolute error bound, including NaN values when
+// rhs is NaN.  The max absolute error bound must be non-negative.
+inline internal::FloatingEqMatcher<double> NanSensitiveDoubleNear(
+    double rhs, double max_abs_error) {
+  return internal::FloatingEqMatcher<double>(rhs, true, max_abs_error);
+}
+
+// Creates a matcher that matches any float argument approximately
+// equal to rhs, where two NANs are considered unequal.
+inline internal::FloatingEqMatcher<float> FloatEq(float rhs) {
+  return internal::FloatingEqMatcher<float>(rhs, false);
+}
+
+// Creates a matcher that matches any float argument approximately
+// equal to rhs, including NaN values when rhs is NaN.
+inline internal::FloatingEqMatcher<float> NanSensitiveFloatEq(float rhs) {
+  return internal::FloatingEqMatcher<float>(rhs, true);
+}
+
+// Creates a matcher that matches any float argument approximately equal to
+// rhs, up to the specified max absolute error bound, where two NANs are
+// considered unequal.  The max absolute error bound must be non-negative.
+inline internal::FloatingEqMatcher<float> FloatNear(
+    float rhs, float max_abs_error) {
+  return internal::FloatingEqMatcher<float>(rhs, false, max_abs_error);
+}
+
+// Creates a matcher that matches any float argument approximately equal to
+// rhs, up to the specified max absolute error bound, including NaN values when
+// rhs is NaN.  The max absolute error bound must be non-negative.
+inline internal::FloatingEqMatcher<float> NanSensitiveFloatNear(
+    float rhs, float max_abs_error) {
+  return internal::FloatingEqMatcher<float>(rhs, true, max_abs_error);
+}
+
+// Creates a matcher that matches a pointer (raw or smart) that points
+// to a value that matches inner_matcher.
+template <typename InnerMatcher>
+inline internal::PointeeMatcher<InnerMatcher> Pointee(
+    const InnerMatcher& inner_matcher) {
+  return internal::PointeeMatcher<InnerMatcher>(inner_matcher);
+}
+
+// Creates a matcher that matches a pointer or reference that matches
+// inner_matcher when dynamic_cast<To> is applied.
+// The result of dynamic_cast<To> is forwarded to the inner matcher.
+// If To is a pointer and the cast fails, the inner matcher will receive NULL.
+// If To is a reference and the cast fails, this matcher returns false
+// immediately.
+template <typename To>
+inline PolymorphicMatcher<internal::WhenDynamicCastToMatcher<To> >
+WhenDynamicCastTo(const Matcher<To>& inner_matcher) {
+  return MakePolymorphicMatcher(
+      internal::WhenDynamicCastToMatcher<To>(inner_matcher));
+}
+
+// Creates a matcher that matches an object whose given field matches
+// 'matcher'.  For example,
+//   Field(&Foo::number, Ge(5))
+// matches a Foo object x iff x.number >= 5.
+template <typename Class, typename FieldType, typename FieldMatcher>
+inline PolymorphicMatcher<
+  internal::FieldMatcher<Class, FieldType> > Field(
+    FieldType Class::*field, const FieldMatcher& matcher) {
+  return MakePolymorphicMatcher(
+      internal::FieldMatcher<Class, FieldType>(
+          field, MatcherCast<const FieldType&>(matcher)));
+  // The call to MatcherCast() is required for supporting inner
+  // matchers of compatible types.  For example, it allows
+  //   Field(&Foo::bar, m)
+  // to compile where bar is an int32 and m is a matcher for int64.
+}
+
+// Creates a matcher that matches an object whose given property
+// matches 'matcher'.  For example,
+//   Property(&Foo::str, StartsWith("hi"))
+// matches a Foo object x iff x.str() starts with "hi".
+template <typename Class, typename PropertyType, typename PropertyMatcher>
+inline PolymorphicMatcher<
+  internal::PropertyMatcher<Class, PropertyType> > Property(
+    PropertyType (Class::*property)() const, const PropertyMatcher& matcher) {
+  return MakePolymorphicMatcher(
+      internal::PropertyMatcher<Class, PropertyType>(
+          property,
+          MatcherCast<GTEST_REFERENCE_TO_CONST_(PropertyType)>(matcher)));
+  // The call to MatcherCast() is required for supporting inner
+  // matchers of compatible types.  For example, it allows
+  //   Property(&Foo::bar, m)
+  // to compile where bar() returns an int32 and m is a matcher for int64.
+}
+
+// Creates a matcher that matches an object iff the result of applying
+// a callable to x matches 'matcher'.
+// For example,
+//   ResultOf(f, StartsWith("hi"))
+// matches a Foo object x iff f(x) starts with "hi".
+// callable parameter can be a function, function pointer, or a functor.
+// Callable has to satisfy the following conditions:
+//   * It is required to keep no state affecting the results of
+//     the calls on it and make no assumptions about how many calls
+//     will be made. Any state it keeps must be protected from the
+//     concurrent access.
+//   * If it is a function object, it has to define type result_type.
+//     We recommend deriving your functor classes from std::unary_function.
+template <typename Callable, typename ResultOfMatcher>
+internal::ResultOfMatcher<Callable> ResultOf(
+    Callable callable, const ResultOfMatcher& matcher) {
+  return internal::ResultOfMatcher<Callable>(
+          callable,
+          MatcherCast<typename internal::CallableTraits<Callable>::ResultType>(
+              matcher));
+  // The call to MatcherCast() is required for supporting inner
+  // matchers of compatible types.  For example, it allows
+  //   ResultOf(Function, m)
+  // to compile where Function() returns an int32 and m is a matcher for int64.
+}
+
+// String matchers.
+
+// Matches a string equal to str.
+inline PolymorphicMatcher<internal::StrEqualityMatcher<internal::string> >
+    StrEq(const internal::string& str) {
+  return MakePolymorphicMatcher(internal::StrEqualityMatcher<internal::string>(
+      str, true, true));
+}
+
+// Matches a string not equal to str.
+inline PolymorphicMatcher<internal::StrEqualityMatcher<internal::string> >
+    StrNe(const internal::string& str) {
+  return MakePolymorphicMatcher(internal::StrEqualityMatcher<internal::string>(
+      str, false, true));
+}
+
+// Matches a string equal to str, ignoring case.
+inline PolymorphicMatcher<internal::StrEqualityMatcher<internal::string> >
+    StrCaseEq(const internal::string& str) {
+  return MakePolymorphicMatcher(internal::StrEqualityMatcher<internal::string>(
+      str, true, false));
+}
+
+// Matches a string not equal to str, ignoring case.
+inline PolymorphicMatcher<internal::StrEqualityMatcher<internal::string> >
+    StrCaseNe(const internal::string& str) {
+  return MakePolymorphicMatcher(internal::StrEqualityMatcher<internal::string>(
+      str, false, false));
+}
+
+// Creates a matcher that matches any string, std::string, or C string
+// that contains the given substring.
+inline PolymorphicMatcher<internal::HasSubstrMatcher<internal::string> >
+    HasSubstr(const internal::string& substring) {
+  return MakePolymorphicMatcher(internal::HasSubstrMatcher<internal::string>(
+      substring));
+}
+
+// Matches a string that starts with 'prefix' (case-sensitive).
+inline PolymorphicMatcher<internal::StartsWithMatcher<internal::string> >
+    StartsWith(const internal::string& prefix) {
+  return MakePolymorphicMatcher(internal::StartsWithMatcher<internal::string>(
+      prefix));
+}
+
+// Matches a string that ends with 'suffix' (case-sensitive).
+inline PolymorphicMatcher<internal::EndsWithMatcher<internal::string> >
+    EndsWith(const internal::string& suffix) {
+  return MakePolymorphicMatcher(internal::EndsWithMatcher<internal::string>(
+      suffix));
+}
+
+// Matches a string that fully matches regular expression 'regex'.
+// The matcher takes ownership of 'regex'.
+inline PolymorphicMatcher<internal::MatchesRegexMatcher> MatchesRegex(
+    const internal::RE* regex) {
+  return MakePolymorphicMatcher(internal::MatchesRegexMatcher(regex, true));
+}
+inline PolymorphicMatcher<internal::MatchesRegexMatcher> MatchesRegex(
+    const internal::string& regex) {
+  return MatchesRegex(new internal::RE(regex));
+}
+
+// Matches a string that contains regular expression 'regex'.
+// The matcher takes ownership of 'regex'.
+inline PolymorphicMatcher<internal::MatchesRegexMatcher> ContainsRegex(
+    const internal::RE* regex) {
+  return MakePolymorphicMatcher(internal::MatchesRegexMatcher(regex, false));
+}
+inline PolymorphicMatcher<internal::MatchesRegexMatcher> ContainsRegex(
+    const internal::string& regex) {
+  return ContainsRegex(new internal::RE(regex));
+}
+
+#if GTEST_HAS_GLOBAL_WSTRING || GTEST_HAS_STD_WSTRING
+// Wide string matchers.
+
+// Matches a string equal to str.
+inline PolymorphicMatcher<internal::StrEqualityMatcher<internal::wstring> >
+    StrEq(const internal::wstring& str) {
+  return MakePolymorphicMatcher(internal::StrEqualityMatcher<internal::wstring>(
+      str, true, true));
+}
+
+// Matches a string not equal to str.
+inline PolymorphicMatcher<internal::StrEqualityMatcher<internal::wstring> >
+    StrNe(const internal::wstring& str) {
+  return MakePolymorphicMatcher(internal::StrEqualityMatcher<internal::wstring>(
+      str, false, true));
+}
+
+// Matches a string equal to str, ignoring case.
+inline PolymorphicMatcher<internal::StrEqualityMatcher<internal::wstring> >
+    StrCaseEq(const internal::wstring& str) {
+  return MakePolymorphicMatcher(internal::StrEqualityMatcher<internal::wstring>(
+      str, true, false));
+}
+
+// Matches a string not equal to str, ignoring case.
+inline PolymorphicMatcher<internal::StrEqualityMatcher<internal::wstring> >
+    StrCaseNe(const internal::wstring& str) {
+  return MakePolymorphicMatcher(internal::StrEqualityMatcher<internal::wstring>(
+      str, false, false));
+}
+
+// Creates a matcher that matches any wstring, std::wstring, or C wide string
+// that contains the given substring.
+inline PolymorphicMatcher<internal::HasSubstrMatcher<internal::wstring> >
+    HasSubstr(const internal::wstring& substring) {
+  return MakePolymorphicMatcher(internal::HasSubstrMatcher<internal::wstring>(
+      substring));
+}
+
+// Matches a string that starts with 'prefix' (case-sensitive).
+inline PolymorphicMatcher<internal::StartsWithMatcher<internal::wstring> >
+    StartsWith(const internal::wstring& prefix) {
+  return MakePolymorphicMatcher(internal::StartsWithMatcher<internal::wstring>(
+      prefix));
+}
+
+// Matches a string that ends with 'suffix' (case-sensitive).
+inline PolymorphicMatcher<internal::EndsWithMatcher<internal::wstring> >
+    EndsWith(const internal::wstring& suffix) {
+  return MakePolymorphicMatcher(internal::EndsWithMatcher<internal::wstring>(
+      suffix));
+}
+
+#endif  // GTEST_HAS_GLOBAL_WSTRING || GTEST_HAS_STD_WSTRING
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field == the second field.
+inline internal::Eq2Matcher Eq() { return internal::Eq2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field >= the second field.
+inline internal::Ge2Matcher Ge() { return internal::Ge2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field > the second field.
+inline internal::Gt2Matcher Gt() { return internal::Gt2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field <= the second field.
+inline internal::Le2Matcher Le() { return internal::Le2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field < the second field.
+inline internal::Lt2Matcher Lt() { return internal::Lt2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field != the second field.
+inline internal::Ne2Matcher Ne() { return internal::Ne2Matcher(); }
+
+// Creates a matcher that matches any value of type T that m doesn't
+// match.
+template <typename InnerMatcher>
+inline internal::NotMatcher<InnerMatcher> Not(InnerMatcher m) {
+  return internal::NotMatcher<InnerMatcher>(m);
+}
+
+// Returns a matcher that matches anything that satisfies the given
+// predicate.  The predicate can be any unary function or functor
+// whose return type can be implicitly converted to bool.
+template <typename Predicate>
+inline PolymorphicMatcher<internal::TrulyMatcher<Predicate> >
+Truly(Predicate pred) {
+  return MakePolymorphicMatcher(internal::TrulyMatcher<Predicate>(pred));
+}
+
+// Returns a matcher that matches the container size. The container must
+// support both size() and size_type which all STL-like containers provide.
+// Note that the parameter 'size' can be a value of type size_type as well as
+// matcher. For instance:
+//   EXPECT_THAT(container, SizeIs(2));     // Checks container has 2 elements.
+//   EXPECT_THAT(container, SizeIs(Le(2));  // Checks container has at most 2.
+template <typename SizeMatcher>
+inline internal::SizeIsMatcher<SizeMatcher>
+SizeIs(const SizeMatcher& size_matcher) {
+  return internal::SizeIsMatcher<SizeMatcher>(size_matcher);
+}
+
+// Returns a matcher that matches the distance between the container's begin()
+// iterator and its end() iterator, i.e. the size of the container. This matcher
+// can be used instead of SizeIs with containers such as std::forward_list which
+// do not implement size(). The container must provide const_iterator (with
+// valid iterator_traits), begin() and end().
+template <typename DistanceMatcher>
+inline internal::BeginEndDistanceIsMatcher<DistanceMatcher>
+BeginEndDistanceIs(const DistanceMatcher& distance_matcher) {
+  return internal::BeginEndDistanceIsMatcher<DistanceMatcher>(distance_matcher);
+}
+
+// Returns a matcher that matches an equal container.
+// This matcher behaves like Eq(), but in the event of mismatch lists the
+// values that are included in one container but not the other. (Duplicate
+// values and order differences are not explained.)
+template <typename Container>
+inline PolymorphicMatcher<internal::ContainerEqMatcher<  // NOLINT
+                            GTEST_REMOVE_CONST_(Container)> >
+    ContainerEq(const Container& rhs) {
+  // This following line is for working around a bug in MSVC 8.0,
+  // which causes Container to be a const type sometimes.
+  typedef GTEST_REMOVE_CONST_(Container) RawContainer;
+  return MakePolymorphicMatcher(
+      internal::ContainerEqMatcher<RawContainer>(rhs));
+}
+
+// Returns a matcher that matches a container that, when sorted using
+// the given comparator, matches container_matcher.
+template <typename Comparator, typename ContainerMatcher>
+inline internal::WhenSortedByMatcher<Comparator, ContainerMatcher>
+WhenSortedBy(const Comparator& comparator,
+             const ContainerMatcher& container_matcher) {
+  return internal::WhenSortedByMatcher<Comparator, ContainerMatcher>(
+      comparator, container_matcher);
+}
+
+// Returns a matcher that matches a container that, when sorted using
+// the < operator, matches container_matcher.
+template <typename ContainerMatcher>
+inline internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>
+WhenSorted(const ContainerMatcher& container_matcher) {
+  return
+      internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>(
+          internal::LessComparator(), container_matcher);
+}
+
+// Matches an STL-style container or a native array that contains the
+// same number of elements as in rhs, where its i-th element and rhs's
+// i-th element (as a pair) satisfy the given pair matcher, for all i.
+// TupleMatcher must be able to be safely cast to Matcher<tuple<const
+// T1&, const T2&> >, where T1 and T2 are the types of elements in the
+// LHS container and the RHS container respectively.
+template <typename TupleMatcher, typename Container>
+inline internal::PointwiseMatcher<TupleMatcher,
+                                  GTEST_REMOVE_CONST_(Container)>
+Pointwise(const TupleMatcher& tuple_matcher, const Container& rhs) {
+  // This following line is for working around a bug in MSVC 8.0,
+  // which causes Container to be a const type sometimes (e.g. when
+  // rhs is a const int[])..
+  typedef GTEST_REMOVE_CONST_(Container) RawContainer;
+  return internal::PointwiseMatcher<TupleMatcher, RawContainer>(
+      tuple_matcher, rhs);
+}
+
+#if GTEST_HAS_STD_INITIALIZER_LIST_
+
+// Supports the Pointwise(m, {a, b, c}) syntax.
+template <typename TupleMatcher, typename T>
+inline internal::PointwiseMatcher<TupleMatcher, std::vector<T> > Pointwise(
+    const TupleMatcher& tuple_matcher, std::initializer_list<T> rhs) {
+  return Pointwise(tuple_matcher, std::vector<T>(rhs));
+}
+
+#endif  // GTEST_HAS_STD_INITIALIZER_LIST_
+
+// UnorderedPointwise(pair_matcher, rhs) matches an STL-style
+// container or a native array that contains the same number of
+// elements as in rhs, where in some permutation of the container, its
+// i-th element and rhs's i-th element (as a pair) satisfy the given
+// pair matcher, for all i.  Tuple2Matcher must be able to be safely
+// cast to Matcher<tuple<const T1&, const T2&> >, where T1 and T2 are
+// the types of elements in the LHS container and the RHS container
+// respectively.
+//
+// This is like Pointwise(pair_matcher, rhs), except that the element
+// order doesn't matter.
+template <typename Tuple2Matcher, typename RhsContainer>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename internal::BoundSecondMatcher<
+        Tuple2Matcher, typename internal::StlContainerView<GTEST_REMOVE_CONST_(
+                           RhsContainer)>::type::value_type> >
+UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
+                   const RhsContainer& rhs_container) {
+  // This following line is for working around a bug in MSVC 8.0,
+  // which causes RhsContainer to be a const type sometimes (e.g. when
+  // rhs_container is a const int[]).
+  typedef GTEST_REMOVE_CONST_(RhsContainer) RawRhsContainer;
+
+  // RhsView allows the same code to handle RhsContainer being a
+  // STL-style container and it being a native C-style array.
+  typedef typename internal::StlContainerView<RawRhsContainer> RhsView;
+  typedef typename RhsView::type RhsStlContainer;
+  typedef typename RhsStlContainer::value_type Second;
+  const RhsStlContainer& rhs_stl_container =
+      RhsView::ConstReference(rhs_container);
+
+  // Create a matcher for each element in rhs_container.
+  ::std::vector<internal::BoundSecondMatcher<Tuple2Matcher, Second> > matchers;
+  for (typename RhsStlContainer::const_iterator it = rhs_stl_container.begin();
+       it != rhs_stl_container.end(); ++it) {
+    matchers.push_back(
+        internal::MatcherBindSecond(tuple2_matcher, *it));
+  }
+
+  // Delegate the work to UnorderedElementsAreArray().
+  return UnorderedElementsAreArray(matchers);
+}
+
+#if GTEST_HAS_STD_INITIALIZER_LIST_
+
+// Supports the UnorderedPointwise(m, {a, b, c}) syntax.
+template <typename Tuple2Matcher, typename T>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename internal::BoundSecondMatcher<Tuple2Matcher, T> >
+UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
+                   std::initializer_list<T> rhs) {
+  return UnorderedPointwise(tuple2_matcher, std::vector<T>(rhs));
+}
+
+#endif  // GTEST_HAS_STD_INITIALIZER_LIST_
+
+// Matches an STL-style container or a native array that contains at
+// least one element matching the given value or matcher.
+//
+// Examples:
+//   ::std::set<int> page_ids;
+//   page_ids.insert(3);
+//   page_ids.insert(1);
+//   EXPECT_THAT(page_ids, Contains(1));
+//   EXPECT_THAT(page_ids, Contains(Gt(2)));
+//   EXPECT_THAT(page_ids, Not(Contains(4)));
+//
+//   ::std::map<int, size_t> page_lengths;
+//   page_lengths[1] = 100;
+//   EXPECT_THAT(page_lengths,
+//               Contains(::std::pair<const int, size_t>(1, 100)));
+//
+//   const char* user_ids[] = { "joe", "mike", "tom" };
+//   EXPECT_THAT(user_ids, Contains(Eq(::std::string("tom"))));
+template <typename M>
+inline internal::ContainsMatcher<M> Contains(M matcher) {
+  return internal::ContainsMatcher<M>(matcher);
+}
+
+// Matches an STL-style container or a native array that contains only
+// elements matching the given value or matcher.
+//
+// Each(m) is semantically equivalent to Not(Contains(Not(m))). Only
+// the messages are different.
+//
+// Examples:
+//   ::std::set<int> page_ids;
+//   // Each(m) matches an empty container, regardless of what m is.
+//   EXPECT_THAT(page_ids, Each(Eq(1)));
+//   EXPECT_THAT(page_ids, Each(Eq(77)));
+//
+//   page_ids.insert(3);
+//   EXPECT_THAT(page_ids, Each(Gt(0)));
+//   EXPECT_THAT(page_ids, Not(Each(Gt(4))));
+//   page_ids.insert(1);
+//   EXPECT_THAT(page_ids, Not(Each(Lt(2))));
+//
+//   ::std::map<int, size_t> page_lengths;
+//   page_lengths[1] = 100;
+//   page_lengths[2] = 200;
+//   page_lengths[3] = 300;
+//   EXPECT_THAT(page_lengths, Not(Each(Pair(1, 100))));
+//   EXPECT_THAT(page_lengths, Each(Key(Le(3))));
+//
+//   const char* user_ids[] = { "joe", "mike", "tom" };
+//   EXPECT_THAT(user_ids, Not(Each(Eq(::std::string("tom")))));
+template <typename M>
+inline internal::EachMatcher<M> Each(M matcher) {
+  return internal::EachMatcher<M>(matcher);
+}
+
+// Key(inner_matcher) matches an std::pair whose 'first' field matches
+// inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an
+// std::map that contains at least one element whose key is >= 5.
+template <typename M>
+inline internal::KeyMatcher<M> Key(M inner_matcher) {
+  return internal::KeyMatcher<M>(inner_matcher);
+}
+
+// Pair(first_matcher, second_matcher) matches a std::pair whose 'first' field
+// matches first_matcher and whose 'second' field matches second_matcher.  For
+// example, EXPECT_THAT(map_type, ElementsAre(Pair(Ge(5), "foo"))) can be used
+// to match a std::map<int, string> that contains exactly one element whose key
+// is >= 5 and whose value equals "foo".
+template <typename FirstMatcher, typename SecondMatcher>
+inline internal::PairMatcher<FirstMatcher, SecondMatcher>
+Pair(FirstMatcher first_matcher, SecondMatcher second_matcher) {
+  return internal::PairMatcher<FirstMatcher, SecondMatcher>(
+      first_matcher, second_matcher);
+}
+
+// Returns a predicate that is satisfied by anything that matches the
+// given matcher.
+template <typename M>
+inline internal::MatcherAsPredicate<M> Matches(M matcher) {
+  return internal::MatcherAsPredicate<M>(matcher);
+}
+
+// Returns true iff the value matches the matcher.
+template <typename T, typename M>
+inline bool Value(const T& value, M matcher) {
+  return testing::Matches(matcher)(value);
+}
+
+// Matches the value against the given matcher and explains the match
+// result to listener.
+template <typename T, typename M>
+inline bool ExplainMatchResult(
+    M matcher, const T& value, MatchResultListener* listener) {
+  return SafeMatcherCast<const T&>(matcher).MatchAndExplain(value, listener);
+}
+
+#if GTEST_LANG_CXX11
+// Define variadic matcher versions. They are overloaded in
+// gmock-generated-matchers.h for the cases supported by pre C++11 compilers.
+template <typename... Args>
+inline internal::AllOfMatcher<Args...> AllOf(const Args&... matchers) {
+  return internal::AllOfMatcher<Args...>(matchers...);
+}
+
+template <typename... Args>
+inline internal::AnyOfMatcher<Args...> AnyOf(const Args&... matchers) {
+  return internal::AnyOfMatcher<Args...>(matchers...);
+}
+
+#endif  // GTEST_LANG_CXX11
+
+// AllArgs(m) is a synonym of m.  This is useful in
+//
+//   EXPECT_CALL(foo, Bar(_, _)).With(AllArgs(Eq()));
+//
+// which is easier to read than
+//
+//   EXPECT_CALL(foo, Bar(_, _)).With(Eq());
+template <typename InnerMatcher>
+inline InnerMatcher AllArgs(const InnerMatcher& matcher) { return matcher; }
+
+// These macros allow using matchers to check values in Google Test
+// tests.  ASSERT_THAT(value, matcher) and EXPECT_THAT(value, matcher)
+// succeed iff the value matches the matcher.  If the assertion fails,
+// the value and the description of the matcher will be printed.
+#define ASSERT_THAT(value, matcher) ASSERT_PRED_FORMAT1(\
+    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
+#define EXPECT_THAT(value, matcher) EXPECT_PRED_FORMAT1(\
+    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
+
+}  // namespace testing
+
+// Include any custom callback matchers added by the local installation.
+// We must include this header at the end to make sure it can use the
+// declarations from this file.
+#include "gmock/internal/custom/gmock-matchers.h"
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-more-actions.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-more-actions.h
new file mode 100644
index 0000000000..3d387b6b7d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-more-actions.h
@@ -0,0 +1,246 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some actions that depend on gmock-generated-actions.h.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
+
+#include <algorithm>
+
+#include "gmock/gmock-generated-actions.h"
+
+namespace testing {
+namespace internal {
+
+// Implements the Invoke(f) action.  The template argument
+// FunctionImpl is the implementation type of f, which can be either a
+// function pointer or a functor.  Invoke(f) can be used as an
+// Action<F> as long as f's type is compatible with F (i.e. f can be
+// assigned to a tr1::function<F>).
+template <typename FunctionImpl>
+class InvokeAction {
+ public:
+  // The c'tor makes a copy of function_impl (either a function
+  // pointer or a functor).
+  explicit InvokeAction(FunctionImpl function_impl)
+      : function_impl_(function_impl) {}
+
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple& args) {
+    return InvokeHelper<Result, ArgumentTuple>::Invoke(function_impl_, args);
+  }
+
+ private:
+  FunctionImpl function_impl_;
+
+  GTEST_DISALLOW_ASSIGN_(InvokeAction);
+};
+
+// Implements the Invoke(object_ptr, &Class::Method) action.
+template <class Class, typename MethodPtr>
+class InvokeMethodAction {
+ public:
+  InvokeMethodAction(Class* obj_ptr, MethodPtr method_ptr)
+      : method_ptr_(method_ptr), obj_ptr_(obj_ptr) {}
+
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple& args) const {
+    return InvokeHelper<Result, ArgumentTuple>::InvokeMethod(
+        obj_ptr_, method_ptr_, args);
+  }
+
+ private:
+  // The order of these members matters.  Reversing the order can trigger
+  // warning C4121 in MSVC (see
+  // http://computer-programming-forum.com/7-vc.net/6fbc30265f860ad1.htm ).
+  const MethodPtr method_ptr_;
+  Class* const obj_ptr_;
+
+  GTEST_DISALLOW_ASSIGN_(InvokeMethodAction);
+};
+
+// An internal replacement for std::copy which mimics its behavior. This is
+// necessary because Visual Studio deprecates ::std::copy, issuing warning 4996.
+// However Visual Studio 2010 and later do not honor #pragmas which disable that
+// warning.
+template<typename InputIterator, typename OutputIterator>
+inline OutputIterator CopyElements(InputIterator first,
+                                   InputIterator last,
+                                   OutputIterator output) {
+  for (; first != last; ++first, ++output) {
+    *output = *first;
+  }
+  return output;
+}
+
+}  // namespace internal
+
+// Various overloads for Invoke().
+
+// Creates an action that invokes 'function_impl' with the mock
+// function's arguments.
+template <typename FunctionImpl>
+PolymorphicAction<internal::InvokeAction<FunctionImpl> > Invoke(
+    FunctionImpl function_impl) {
+  return MakePolymorphicAction(
+      internal::InvokeAction<FunctionImpl>(function_impl));
+}
+
+// Creates an action that invokes the given method on the given object
+// with the mock function's arguments.
+template <class Class, typename MethodPtr>
+PolymorphicAction<internal::InvokeMethodAction<Class, MethodPtr> > Invoke(
+    Class* obj_ptr, MethodPtr method_ptr) {
+  return MakePolymorphicAction(
+      internal::InvokeMethodAction<Class, MethodPtr>(obj_ptr, method_ptr));
+}
+
+// WithoutArgs(inner_action) can be used in a mock function with a
+// non-empty argument list to perform inner_action, which takes no
+// argument.  In other words, it adapts an action accepting no
+// argument to one that accepts (and ignores) arguments.
+template <typename InnerAction>
+inline internal::WithArgsAction<InnerAction>
+WithoutArgs(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction>(action);
+}
+
+// WithArg<k>(an_action) creates an action that passes the k-th
+// (0-based) argument of the mock function to an_action and performs
+// it.  It adapts an action accepting one argument to one that accepts
+// multiple arguments.  For convenience, we also provide
+// WithArgs<k>(an_action) (defined below) as a synonym.
+template <int k, typename InnerAction>
+inline internal::WithArgsAction<InnerAction, k>
+WithArg(const InnerAction& action) {
+  return internal::WithArgsAction<InnerAction, k>(action);
+}
+
+// The ACTION*() macros trigger warning C4100 (unreferenced formal
+// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
+// the macro definition, as the warnings are generated when the macro
+// is expanded and macro expansion cannot contain #pragma.  Therefore
+// we suppress them here.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#endif
+
+// Action ReturnArg<k>() returns the k-th argument of the mock function.
+ACTION_TEMPLATE(ReturnArg,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_0_VALUE_PARAMS()) {
+  return ::testing::get<k>(args);
+}
+
+// Action SaveArg<k>(pointer) saves the k-th (0-based) argument of the
+// mock function to *pointer.
+ACTION_TEMPLATE(SaveArg,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_1_VALUE_PARAMS(pointer)) {
+  *pointer = ::testing::get<k>(args);
+}
+
+// Action SaveArgPointee<k>(pointer) saves the value pointed to
+// by the k-th (0-based) argument of the mock function to *pointer.
+ACTION_TEMPLATE(SaveArgPointee,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_1_VALUE_PARAMS(pointer)) {
+  *pointer = *::testing::get<k>(args);
+}
+
+// Action SetArgReferee<k>(value) assigns 'value' to the variable
+// referenced by the k-th (0-based) argument of the mock function.
+ACTION_TEMPLATE(SetArgReferee,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_1_VALUE_PARAMS(value)) {
+  typedef typename ::testing::tuple_element<k, args_type>::type argk_type;
+  // Ensures that argument #k is a reference.  If you get a compiler
+  // error on the next line, you are using SetArgReferee<k>(value) in
+  // a mock function whose k-th (0-based) argument is not a reference.
+  GTEST_COMPILE_ASSERT_(internal::is_reference<argk_type>::value,
+                        SetArgReferee_must_be_used_with_a_reference_argument);
+  ::testing::get<k>(args) = value;
+}
+
+// Action SetArrayArgument<k>(first, last) copies the elements in
+// source range [first, last) to the array pointed to by the k-th
+// (0-based) argument, which can be either a pointer or an
+// iterator. The action does not take ownership of the elements in the
+// source range.
+ACTION_TEMPLATE(SetArrayArgument,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_2_VALUE_PARAMS(first, last)) {
+  // Visual Studio deprecates ::std::copy, so we use our own copy in that case.
+#ifdef _MSC_VER
+  internal::CopyElements(first, last, ::testing::get<k>(args));
+#else
+  ::std::copy(first, last, ::testing::get<k>(args));
+#endif
+}
+
+// Action DeleteArg<k>() deletes the k-th (0-based) argument of the mock
+// function.
+ACTION_TEMPLATE(DeleteArg,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_0_VALUE_PARAMS()) {
+  delete ::testing::get<k>(args);
+}
+
+// This action returns the value pointed to by 'pointer'.
+ACTION_P(ReturnPointee, pointer) { return *pointer; }
+
+// Action Throw(exception) can be used in a mock function of any type
+// to throw the given exception.  Any copyable value can be thrown.
+#if GTEST_HAS_EXCEPTIONS
+
+// Suppresses the 'unreachable code' warning that VC generates in opt modes.
+# ifdef _MSC_VER
+#  pragma warning(push)          // Saves the current warning state.
+#  pragma warning(disable:4702)  // Temporarily disables warning 4702.
+# endif
+ACTION_P(Throw, exception) { throw exception; }
+# ifdef _MSC_VER
+#  pragma warning(pop)           // Restores the warning state.
+# endif
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+}  // namespace testing
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-more-matchers.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-more-matchers.h
new file mode 100644
index 0000000000..3db899f429
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-more-matchers.h
@@ -0,0 +1,58 @@
+// Copyright 2013, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: marcus.boerger@google.com (Marcus Boerger)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some matchers that depend on gmock-generated-matchers.h.
+//
+// Note that tests are implemented in gmock-matchers_test.cc rather than
+// gmock-more-matchers-test.cc.
+
+#ifndef GMOCK_GMOCK_MORE_MATCHERS_H_
+#define GMOCK_GMOCK_MORE_MATCHERS_H_
+
+#include "gmock/gmock-generated-matchers.h"
+
+namespace testing {
+
+// Defines a matcher that matches an empty container. The container must
+// support both size() and empty(), which all STL-like containers provide.
+MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") {
+  if (arg.empty()) {
+    return true;
+  }
+  *result_listener << "whose size is " << arg.size();
+  return false;
+}
+
+}  // namespace testing
+
+#endif  // GMOCK_GMOCK_MORE_MATCHERS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-spec-builders.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-spec-builders.h
new file mode 100644
index 0000000000..fed7de66bc
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock-spec-builders.h
@@ -0,0 +1,1847 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements the ON_CALL() and EXPECT_CALL() macros.
+//
+// A user can use the ON_CALL() macro to specify the default action of
+// a mock method.  The syntax is:
+//
+//   ON_CALL(mock_object, Method(argument-matchers))
+//       .With(multi-argument-matcher)
+//       .WillByDefault(action);
+//
+//  where the .With() clause is optional.
+//
+// A user can use the EXPECT_CALL() macro to specify an expectation on
+// a mock method.  The syntax is:
+//
+//   EXPECT_CALL(mock_object, Method(argument-matchers))
+//       .With(multi-argument-matchers)
+//       .Times(cardinality)
+//       .InSequence(sequences)
+//       .After(expectations)
+//       .WillOnce(action)
+//       .WillRepeatedly(action)
+//       .RetiresOnSaturation();
+//
+// where all clauses are optional, and .InSequence()/.After()/
+// .WillOnce() can appear any number of times.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
+
+#include <map>
+#include <set>
+#include <sstream>
+#include <string>
+#include <vector>
+
+#if GTEST_HAS_EXCEPTIONS
+# include <stdexcept>  // NOLINT
+#endif
+
+#include "gmock/gmock-actions.h"
+#include "gmock/gmock-cardinalities.h"
+#include "gmock/gmock-matchers.h"
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+
+// An abstract handle of an expectation.
+class Expectation;
+
+// A set of expectation handles.
+class ExpectationSet;
+
+// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
+// and MUST NOT BE USED IN USER CODE!!!
+namespace internal {
+
+// Implements a mock function.
+template <typename F> class FunctionMocker;
+
+// Base class for expectations.
+class ExpectationBase;
+
+// Implements an expectation.
+template <typename F> class TypedExpectation;
+
+// Helper class for testing the Expectation class template.
+class ExpectationTester;
+
+// Base class for function mockers.
+template <typename F> class FunctionMockerBase;
+
+// Protects the mock object registry (in class Mock), all function
+// mockers, and all expectations.
+//
+// The reason we don't use more fine-grained protection is: when a
+// mock function Foo() is called, it needs to consult its expectations
+// to see which one should be picked.  If another thread is allowed to
+// call a mock function (either Foo() or a different one) at the same
+// time, it could affect the "retired" attributes of Foo()'s
+// expectations when InSequence() is used, and thus affect which
+// expectation gets picked.  Therefore, we sequence all mock function
+// calls to ensure the integrity of the mock objects' states.
+GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_gmock_mutex);
+
+// Untyped base class for ActionResultHolder<R>.
+class UntypedActionResultHolderBase;
+
+// Abstract base class of FunctionMockerBase.  This is the
+// type-agnostic part of the function mocker interface.  Its pure
+// virtual methods are implemented by FunctionMockerBase.
+class GTEST_API_ UntypedFunctionMockerBase {
+ public:
+  UntypedFunctionMockerBase();
+  virtual ~UntypedFunctionMockerBase();
+
+  // Verifies that all expectations on this mock function have been
+  // satisfied.  Reports one or more Google Test non-fatal failures
+  // and returns false if not.
+  bool VerifyAndClearExpectationsLocked()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // Clears the ON_CALL()s set on this mock function.
+  virtual void ClearDefaultActionsLocked()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) = 0;
+
+  // In all of the following Untyped* functions, it's the caller's
+  // responsibility to guarantee the correctness of the arguments'
+  // types.
+
+  // Performs the default action with the given arguments and returns
+  // the action's result.  The call description string will be used in
+  // the error message to describe the call in the case the default
+  // action fails.
+  // L = *
+  virtual UntypedActionResultHolderBase* UntypedPerformDefaultAction(
+      const void* untyped_args,
+      const string& call_description) const = 0;
+
+  // Performs the given action with the given arguments and returns
+  // the action's result.
+  // L = *
+  virtual UntypedActionResultHolderBase* UntypedPerformAction(
+      const void* untyped_action,
+      const void* untyped_args) const = 0;
+
+  // Writes a message that the call is uninteresting (i.e. neither
+  // explicitly expected nor explicitly unexpected) to the given
+  // ostream.
+  virtual void UntypedDescribeUninterestingCall(
+      const void* untyped_args,
+      ::std::ostream* os) const
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
+
+  // Returns the expectation that matches the given function arguments
+  // (or NULL is there's no match); when a match is found,
+  // untyped_action is set to point to the action that should be
+  // performed (or NULL if the action is "do default"), and
+  // is_excessive is modified to indicate whether the call exceeds the
+  // expected number.
+  virtual const ExpectationBase* UntypedFindMatchingExpectation(
+      const void* untyped_args,
+      const void** untyped_action, bool* is_excessive,
+      ::std::ostream* what, ::std::ostream* why)
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
+
+  // Prints the given function arguments to the ostream.
+  virtual void UntypedPrintArgs(const void* untyped_args,
+                                ::std::ostream* os) const = 0;
+
+  // Sets the mock object this mock method belongs to, and registers
+  // this information in the global mock registry.  Will be called
+  // whenever an EXPECT_CALL() or ON_CALL() is executed on this mock
+  // method.
+  // TODO(wan@google.com): rename to SetAndRegisterOwner().
+  void RegisterOwner(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+  // Sets the mock object this mock method belongs to, and sets the
+  // name of the mock function.  Will be called upon each invocation
+  // of this mock function.
+  void SetOwnerAndName(const void* mock_obj, const char* name)
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+  // Returns the mock object this mock method belongs to.  Must be
+  // called after RegisterOwner() or SetOwnerAndName() has been
+  // called.
+  const void* MockObject() const
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+  // Returns the name of this mock method.  Must be called after
+  // SetOwnerAndName() has been called.
+  const char* Name() const
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+  // Returns the result of invoking this mock function with the given
+  // arguments.  This function can be safely called from multiple
+  // threads concurrently.  The caller is responsible for deleting the
+  // result.
+  UntypedActionResultHolderBase* UntypedInvokeWith(
+      const void* untyped_args)
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+ protected:
+  typedef std::vector<const void*> UntypedOnCallSpecs;
+
+  typedef std::vector<internal::linked_ptr<ExpectationBase> >
+  UntypedExpectations;
+
+  // Returns an Expectation object that references and co-owns exp,
+  // which must be an expectation on this mock function.
+  Expectation GetHandleOf(ExpectationBase* exp);
+
+  // Address of the mock object this mock method belongs to.  Only
+  // valid after this mock method has been called or
+  // ON_CALL/EXPECT_CALL has been invoked on it.
+  const void* mock_obj_;  // Protected by g_gmock_mutex.
+
+  // Name of the function being mocked.  Only valid after this mock
+  // method has been called.
+  const char* name_;  // Protected by g_gmock_mutex.
+
+  // All default action specs for this function mocker.
+  UntypedOnCallSpecs untyped_on_call_specs_;
+
+  // All expectations for this function mocker.
+  UntypedExpectations untyped_expectations_;
+};  // class UntypedFunctionMockerBase
+
+// Untyped base class for OnCallSpec<F>.
+class UntypedOnCallSpecBase {
+ public:
+  // The arguments are the location of the ON_CALL() statement.
+  UntypedOnCallSpecBase(const char* a_file, int a_line)
+      : file_(a_file), line_(a_line), last_clause_(kNone) {}
+
+  // Where in the source file was the default action spec defined?
+  const char* file() const { return file_; }
+  int line() const { return line_; }
+
+ protected:
+  // Gives each clause in the ON_CALL() statement a name.
+  enum Clause {
+    // Do not change the order of the enum members!  The run-time
+    // syntax checking relies on it.
+    kNone,
+    kWith,
+    kWillByDefault
+  };
+
+  // Asserts that the ON_CALL() statement has a certain property.
+  void AssertSpecProperty(bool property, const string& failure_message) const {
+    Assert(property, file_, line_, failure_message);
+  }
+
+  // Expects that the ON_CALL() statement has a certain property.
+  void ExpectSpecProperty(bool property, const string& failure_message) const {
+    Expect(property, file_, line_, failure_message);
+  }
+
+  const char* file_;
+  int line_;
+
+  // The last clause in the ON_CALL() statement as seen so far.
+  // Initially kNone and changes as the statement is parsed.
+  Clause last_clause_;
+};  // class UntypedOnCallSpecBase
+
+// This template class implements an ON_CALL spec.
+template <typename F>
+class OnCallSpec : public UntypedOnCallSpecBase {
+ public:
+  typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
+
+  // Constructs an OnCallSpec object from the information inside
+  // the parenthesis of an ON_CALL() statement.
+  OnCallSpec(const char* a_file, int a_line,
+             const ArgumentMatcherTuple& matchers)
+      : UntypedOnCallSpecBase(a_file, a_line),
+        matchers_(matchers),
+        // By default, extra_matcher_ should match anything.  However,
+        // we cannot initialize it with _ as that triggers a compiler
+        // bug in Symbian's C++ compiler (cannot decide between two
+        // overloaded constructors of Matcher<const ArgumentTuple&>).
+        extra_matcher_(A<const ArgumentTuple&>()) {
+  }
+
+  // Implements the .With() clause.
+  OnCallSpec& With(const Matcher<const ArgumentTuple&>& m) {
+    // Makes sure this is called at most once.
+    ExpectSpecProperty(last_clause_ < kWith,
+                       ".With() cannot appear "
+                       "more than once in an ON_CALL().");
+    last_clause_ = kWith;
+
+    extra_matcher_ = m;
+    return *this;
+  }
+
+  // Implements the .WillByDefault() clause.
+  OnCallSpec& WillByDefault(const Action<F>& action) {
+    ExpectSpecProperty(last_clause_ < kWillByDefault,
+                       ".WillByDefault() must appear "
+                       "exactly once in an ON_CALL().");
+    last_clause_ = kWillByDefault;
+
+    ExpectSpecProperty(!action.IsDoDefault(),
+                       "DoDefault() cannot be used in ON_CALL().");
+    action_ = action;
+    return *this;
+  }
+
+  // Returns true iff the given arguments match the matchers.
+  bool Matches(const ArgumentTuple& args) const {
+    return TupleMatches(matchers_, args) && extra_matcher_.Matches(args);
+  }
+
+  // Returns the action specified by the user.
+  const Action<F>& GetAction() const {
+    AssertSpecProperty(last_clause_ == kWillByDefault,
+                       ".WillByDefault() must appear exactly "
+                       "once in an ON_CALL().");
+    return action_;
+  }
+
+ private:
+  // The information in statement
+  //
+  //   ON_CALL(mock_object, Method(matchers))
+  //       .With(multi-argument-matcher)
+  //       .WillByDefault(action);
+  //
+  // is recorded in the data members like this:
+  //
+  //   source file that contains the statement => file_
+  //   line number of the statement            => line_
+  //   matchers                                => matchers_
+  //   multi-argument-matcher                  => extra_matcher_
+  //   action                                  => action_
+  ArgumentMatcherTuple matchers_;
+  Matcher<const ArgumentTuple&> extra_matcher_;
+  Action<F> action_;
+};  // class OnCallSpec
+
+// Possible reactions on uninteresting calls.
+enum CallReaction {
+  kAllow,
+  kWarn,
+  kFail,
+  kDefault = kWarn  // By default, warn about uninteresting calls.
+};
+
+}  // namespace internal
+
+// Utilities for manipulating mock objects.
+class GTEST_API_ Mock {
+ public:
+  // The following public methods can be called concurrently.
+
+  // Tells Google Mock to ignore mock_obj when checking for leaked
+  // mock objects.
+  static void AllowLeak(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Verifies and clears all expectations on the given mock object.
+  // If the expectations aren't satisfied, generates one or more
+  // Google Test non-fatal failures and returns false.
+  static bool VerifyAndClearExpectations(void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Verifies all expectations on the given mock object and clears its
+  // default actions and expectations.  Returns true iff the
+  // verification was successful.
+  static bool VerifyAndClear(void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+ private:
+  friend class internal::UntypedFunctionMockerBase;
+
+  // Needed for a function mocker to register itself (so that we know
+  // how to clear a mock object).
+  template <typename F>
+  friend class internal::FunctionMockerBase;
+
+  template <typename M>
+  friend class NiceMock;
+
+  template <typename M>
+  friend class NaggyMock;
+
+  template <typename M>
+  friend class StrictMock;
+
+  // Tells Google Mock to allow uninteresting calls on the given mock
+  // object.
+  static void AllowUninterestingCalls(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Tells Google Mock to warn the user about uninteresting calls on
+  // the given mock object.
+  static void WarnUninterestingCalls(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Tells Google Mock to fail uninteresting calls on the given mock
+  // object.
+  static void FailUninterestingCalls(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Tells Google Mock the given mock object is being destroyed and
+  // its entry in the call-reaction table should be removed.
+  static void UnregisterCallReaction(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Returns the reaction Google Mock will have on uninteresting calls
+  // made on the given mock object.
+  static internal::CallReaction GetReactionOnUninterestingCalls(
+      const void* mock_obj)
+          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Verifies that all expectations on the given mock object have been
+  // satisfied.  Reports one or more Google Test non-fatal failures
+  // and returns false if not.
+  static bool VerifyAndClearExpectationsLocked(void* mock_obj)
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
+
+  // Clears all ON_CALL()s set on the given mock object.
+  static void ClearDefaultActionsLocked(void* mock_obj)
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
+
+  // Registers a mock object and a mock method it owns.
+  static void Register(
+      const void* mock_obj,
+      internal::UntypedFunctionMockerBase* mocker)
+          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Tells Google Mock where in the source code mock_obj is used in an
+  // ON_CALL or EXPECT_CALL.  In case mock_obj is leaked, this
+  // information helps the user identify which object it is.
+  static void RegisterUseByOnCallOrExpectCall(
+      const void* mock_obj, const char* file, int line)
+          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Unregisters a mock method; removes the owning mock object from
+  // the registry when the last mock method associated with it has
+  // been unregistered.  This is called only in the destructor of
+  // FunctionMockerBase.
+  static void UnregisterLocked(internal::UntypedFunctionMockerBase* mocker)
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
+};  // class Mock
+
+// An abstract handle of an expectation.  Useful in the .After()
+// clause of EXPECT_CALL() for setting the (partial) order of
+// expectations.  The syntax:
+//
+//   Expectation e1 = EXPECT_CALL(...)...;
+//   EXPECT_CALL(...).After(e1)...;
+//
+// sets two expectations where the latter can only be matched after
+// the former has been satisfied.
+//
+// Notes:
+//   - This class is copyable and has value semantics.
+//   - Constness is shallow: a const Expectation object itself cannot
+//     be modified, but the mutable methods of the ExpectationBase
+//     object it references can be called via expectation_base().
+//   - The constructors and destructor are defined out-of-line because
+//     the Symbian WINSCW compiler wants to otherwise instantiate them
+//     when it sees this class definition, at which point it doesn't have
+//     ExpectationBase available yet, leading to incorrect destruction
+//     in the linked_ptr (or compilation errors if using a checking
+//     linked_ptr).
+class GTEST_API_ Expectation {
+ public:
+  // Constructs a null object that doesn't reference any expectation.
+  Expectation();
+
+  ~Expectation();
+
+  // This single-argument ctor must not be explicit, in order to support the
+  //   Expectation e = EXPECT_CALL(...);
+  // syntax.
+  //
+  // A TypedExpectation object stores its pre-requisites as
+  // Expectation objects, and needs to call the non-const Retire()
+  // method on the ExpectationBase objects they reference.  Therefore
+  // Expectation must receive a *non-const* reference to the
+  // ExpectationBase object.
+  Expectation(internal::ExpectationBase& exp);  // NOLINT
+
+  // The compiler-generated copy ctor and operator= work exactly as
+  // intended, so we don't need to define our own.
+
+  // Returns true iff rhs references the same expectation as this object does.
+  bool operator==(const Expectation& rhs) const {
+    return expectation_base_ == rhs.expectation_base_;
+  }
+
+  bool operator!=(const Expectation& rhs) const { return !(*this == rhs); }
+
+ private:
+  friend class ExpectationSet;
+  friend class Sequence;
+  friend class ::testing::internal::ExpectationBase;
+  friend class ::testing::internal::UntypedFunctionMockerBase;
+
+  template <typename F>
+  friend class ::testing::internal::FunctionMockerBase;
+
+  template <typename F>
+  friend class ::testing::internal::TypedExpectation;
+
+  // This comparator is needed for putting Expectation objects into a set.
+  class Less {
+   public:
+    bool operator()(const Expectation& lhs, const Expectation& rhs) const {
+      return lhs.expectation_base_.get() < rhs.expectation_base_.get();
+    }
+  };
+
+  typedef ::std::set<Expectation, Less> Set;
+
+  Expectation(
+      const internal::linked_ptr<internal::ExpectationBase>& expectation_base);
+
+  // Returns the expectation this object references.
+  const internal::linked_ptr<internal::ExpectationBase>&
+  expectation_base() const {
+    return expectation_base_;
+  }
+
+  // A linked_ptr that co-owns the expectation this handle references.
+  internal::linked_ptr<internal::ExpectationBase> expectation_base_;
+};
+
+// A set of expectation handles.  Useful in the .After() clause of
+// EXPECT_CALL() for setting the (partial) order of expectations.  The
+// syntax:
+//
+//   ExpectationSet es;
+//   es += EXPECT_CALL(...)...;
+//   es += EXPECT_CALL(...)...;
+//   EXPECT_CALL(...).After(es)...;
+//
+// sets three expectations where the last one can only be matched
+// after the first two have both been satisfied.
+//
+// This class is copyable and has value semantics.
+class ExpectationSet {
+ public:
+  // A bidirectional iterator that can read a const element in the set.
+  typedef Expectation::Set::const_iterator const_iterator;
+
+  // An object stored in the set.  This is an alias of Expectation.
+  typedef Expectation::Set::value_type value_type;
+
+  // Constructs an empty set.
+  ExpectationSet() {}
+
+  // This single-argument ctor must not be explicit, in order to support the
+  //   ExpectationSet es = EXPECT_CALL(...);
+  // syntax.
+  ExpectationSet(internal::ExpectationBase& exp) {  // NOLINT
+    *this += Expectation(exp);
+  }
+
+  // This single-argument ctor implements implicit conversion from
+  // Expectation and thus must not be explicit.  This allows either an
+  // Expectation or an ExpectationSet to be used in .After().
+  ExpectationSet(const Expectation& e) {  // NOLINT
+    *this += e;
+  }
+
+  // The compiler-generator ctor and operator= works exactly as
+  // intended, so we don't need to define our own.
+
+  // Returns true iff rhs contains the same set of Expectation objects
+  // as this does.
+  bool operator==(const ExpectationSet& rhs) const {
+    return expectations_ == rhs.expectations_;
+  }
+
+  bool operator!=(const ExpectationSet& rhs) const { return !(*this == rhs); }
+
+  // Implements the syntax
+  //   expectation_set += EXPECT_CALL(...);
+  ExpectationSet& operator+=(const Expectation& e) {
+    expectations_.insert(e);
+    return *this;
+  }
+
+  int size() const { return static_cast<int>(expectations_.size()); }
+
+  const_iterator begin() const { return expectations_.begin(); }
+  const_iterator end() const { return expectations_.end(); }
+
+ private:
+  Expectation::Set expectations_;
+};
+
+
+// Sequence objects are used by a user to specify the relative order
+// in which the expectations should match.  They are copyable (we rely
+// on the compiler-defined copy constructor and assignment operator).
+class GTEST_API_ Sequence {
+ public:
+  // Constructs an empty sequence.
+  Sequence() : last_expectation_(new Expectation) {}
+
+  // Adds an expectation to this sequence.  The caller must ensure
+  // that no other thread is accessing this Sequence object.
+  void AddExpectation(const Expectation& expectation) const;
+
+ private:
+  // The last expectation in this sequence.  We use a linked_ptr here
+  // because Sequence objects are copyable and we want the copies to
+  // be aliases.  The linked_ptr allows the copies to co-own and share
+  // the same Expectation object.
+  internal::linked_ptr<Expectation> last_expectation_;
+};  // class Sequence
+
+// An object of this type causes all EXPECT_CALL() statements
+// encountered in its scope to be put in an anonymous sequence.  The
+// work is done in the constructor and destructor.  You should only
+// create an InSequence object on the stack.
+//
+// The sole purpose for this class is to support easy definition of
+// sequential expectations, e.g.
+//
+//   {
+//     InSequence dummy;  // The name of the object doesn't matter.
+//
+//     // The following expectations must match in the order they appear.
+//     EXPECT_CALL(a, Bar())...;
+//     EXPECT_CALL(a, Baz())...;
+//     ...
+//     EXPECT_CALL(b, Xyz())...;
+//   }
+//
+// You can create InSequence objects in multiple threads, as long as
+// they are used to affect different mock objects.  The idea is that
+// each thread can create and set up its own mocks as if it's the only
+// thread.  However, for clarity of your tests we recommend you to set
+// up mocks in the main thread unless you have a good reason not to do
+// so.
+class GTEST_API_ InSequence {
+ public:
+  InSequence();
+  ~InSequence();
+ private:
+  bool sequence_created_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(InSequence);  // NOLINT
+} GTEST_ATTRIBUTE_UNUSED_;
+
+namespace internal {
+
+// Points to the implicit sequence introduced by a living InSequence
+// object (if any) in the current thread or NULL.
+GTEST_API_ extern ThreadLocal<Sequence*> g_gmock_implicit_sequence;
+
+// Base class for implementing expectations.
+//
+// There are two reasons for having a type-agnostic base class for
+// Expectation:
+//
+//   1. We need to store collections of expectations of different
+//   types (e.g. all pre-requisites of a particular expectation, all
+//   expectations in a sequence).  Therefore these expectation objects
+//   must share a common base class.
+//
+//   2. We can avoid binary code bloat by moving methods not depending
+//   on the template argument of Expectation to the base class.
+//
+// This class is internal and mustn't be used by user code directly.
+class GTEST_API_ ExpectationBase {
+ public:
+  // source_text is the EXPECT_CALL(...) source that created this Expectation.
+  ExpectationBase(const char* file, int line, const string& source_text);
+
+  virtual ~ExpectationBase();
+
+  // Where in the source file was the expectation spec defined?
+  const char* file() const { return file_; }
+  int line() const { return line_; }
+  const char* source_text() const { return source_text_.c_str(); }
+  // Returns the cardinality specified in the expectation spec.
+  const Cardinality& cardinality() const { return cardinality_; }
+
+  // Describes the source file location of this expectation.
+  void DescribeLocationTo(::std::ostream* os) const {
+    *os << FormatFileLocation(file(), line()) << " ";
+  }
+
+  // Describes how many times a function call matching this
+  // expectation has occurred.
+  void DescribeCallCountTo(::std::ostream* os) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // If this mock method has an extra matcher (i.e. .With(matcher)),
+  // describes it to the ostream.
+  virtual void MaybeDescribeExtraMatcherTo(::std::ostream* os) = 0;
+
+ protected:
+  friend class ::testing::Expectation;
+  friend class UntypedFunctionMockerBase;
+
+  enum Clause {
+    // Don't change the order of the enum members!
+    kNone,
+    kWith,
+    kTimes,
+    kInSequence,
+    kAfter,
+    kWillOnce,
+    kWillRepeatedly,
+    kRetiresOnSaturation
+  };
+
+  typedef std::vector<const void*> UntypedActions;
+
+  // Returns an Expectation object that references and co-owns this
+  // expectation.
+  virtual Expectation GetHandle() = 0;
+
+  // Asserts that the EXPECT_CALL() statement has the given property.
+  void AssertSpecProperty(bool property, const string& failure_message) const {
+    Assert(property, file_, line_, failure_message);
+  }
+
+  // Expects that the EXPECT_CALL() statement has the given property.
+  void ExpectSpecProperty(bool property, const string& failure_message) const {
+    Expect(property, file_, line_, failure_message);
+  }
+
+  // Explicitly specifies the cardinality of this expectation.  Used
+  // by the subclasses to implement the .Times() clause.
+  void SpecifyCardinality(const Cardinality& cardinality);
+
+  // Returns true iff the user specified the cardinality explicitly
+  // using a .Times().
+  bool cardinality_specified() const { return cardinality_specified_; }
+
+  // Sets the cardinality of this expectation spec.
+  void set_cardinality(const Cardinality& a_cardinality) {
+    cardinality_ = a_cardinality;
+  }
+
+  // The following group of methods should only be called after the
+  // EXPECT_CALL() statement, and only when g_gmock_mutex is held by
+  // the current thread.
+
+  // Retires all pre-requisites of this expectation.
+  void RetireAllPreRequisites()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // Returns true iff this expectation is retired.
+  bool is_retired() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return retired_;
+  }
+
+  // Retires this expectation.
+  void Retire()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    retired_ = true;
+  }
+
+  // Returns true iff this expectation is satisfied.
+  bool IsSatisfied() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return cardinality().IsSatisfiedByCallCount(call_count_);
+  }
+
+  // Returns true iff this expectation is saturated.
+  bool IsSaturated() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return cardinality().IsSaturatedByCallCount(call_count_);
+  }
+
+  // Returns true iff this expectation is over-saturated.
+  bool IsOverSaturated() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return cardinality().IsOverSaturatedByCallCount(call_count_);
+  }
+
+  // Returns true iff all pre-requisites of this expectation are satisfied.
+  bool AllPrerequisitesAreSatisfied() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // Adds unsatisfied pre-requisites of this expectation to 'result'.
+  void FindUnsatisfiedPrerequisites(ExpectationSet* result) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // Returns the number this expectation has been invoked.
+  int call_count() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return call_count_;
+  }
+
+  // Increments the number this expectation has been invoked.
+  void IncrementCallCount()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    call_count_++;
+  }
+
+  // Checks the action count (i.e. the number of WillOnce() and
+  // WillRepeatedly() clauses) against the cardinality if this hasn't
+  // been done before.  Prints a warning if there are too many or too
+  // few actions.
+  void CheckActionCountIfNotDone() const
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  friend class ::testing::Sequence;
+  friend class ::testing::internal::ExpectationTester;
+
+  template <typename Function>
+  friend class TypedExpectation;
+
+  // Implements the .Times() clause.
+  void UntypedTimes(const Cardinality& a_cardinality);
+
+  // This group of fields are part of the spec and won't change after
+  // an EXPECT_CALL() statement finishes.
+  const char* file_;          // The file that contains the expectation.
+  int line_;                  // The line number of the expectation.
+  const string source_text_;  // The EXPECT_CALL(...) source text.
+  // True iff the cardinality is specified explicitly.
+  bool cardinality_specified_;
+  Cardinality cardinality_;            // The cardinality of the expectation.
+  // The immediate pre-requisites (i.e. expectations that must be
+  // satisfied before this expectation can be matched) of this
+  // expectation.  We use linked_ptr in the set because we want an
+  // Expectation object to be co-owned by its FunctionMocker and its
+  // successors.  This allows multiple mock objects to be deleted at
+  // different times.
+  ExpectationSet immediate_prerequisites_;
+
+  // This group of fields are the current state of the expectation,
+  // and can change as the mock function is called.
+  int call_count_;  // How many times this expectation has been invoked.
+  bool retired_;    // True iff this expectation has retired.
+  UntypedActions untyped_actions_;
+  bool extra_matcher_specified_;
+  bool repeated_action_specified_;  // True if a WillRepeatedly() was specified.
+  bool retires_on_saturation_;
+  Clause last_clause_;
+  mutable bool action_count_checked_;  // Under mutex_.
+  mutable Mutex mutex_;  // Protects action_count_checked_.
+
+  GTEST_DISALLOW_ASSIGN_(ExpectationBase);
+};  // class ExpectationBase
+
+// Impements an expectation for the given function type.
+template <typename F>
+class TypedExpectation : public ExpectationBase {
+ public:
+  typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
+  typedef typename Function<F>::Result Result;
+
+  TypedExpectation(FunctionMockerBase<F>* owner,
+                   const char* a_file, int a_line, const string& a_source_text,
+                   const ArgumentMatcherTuple& m)
+      : ExpectationBase(a_file, a_line, a_source_text),
+        owner_(owner),
+        matchers_(m),
+        // By default, extra_matcher_ should match anything.  However,
+        // we cannot initialize it with _ as that triggers a compiler
+        // bug in Symbian's C++ compiler (cannot decide between two
+        // overloaded constructors of Matcher<const ArgumentTuple&>).
+        extra_matcher_(A<const ArgumentTuple&>()),
+        repeated_action_(DoDefault()) {}
+
+  virtual ~TypedExpectation() {
+    // Check the validity of the action count if it hasn't been done
+    // yet (for example, if the expectation was never used).
+    CheckActionCountIfNotDone();
+    for (UntypedActions::const_iterator it = untyped_actions_.begin();
+         it != untyped_actions_.end(); ++it) {
+      delete static_cast<const Action<F>*>(*it);
+    }
+  }
+
+  // Implements the .With() clause.
+  TypedExpectation& With(const Matcher<const ArgumentTuple&>& m) {
+    if (last_clause_ == kWith) {
+      ExpectSpecProperty(false,
+                         ".With() cannot appear "
+                         "more than once in an EXPECT_CALL().");
+    } else {
+      ExpectSpecProperty(last_clause_ < kWith,
+                         ".With() must be the first "
+                         "clause in an EXPECT_CALL().");
+    }
+    last_clause_ = kWith;
+
+    extra_matcher_ = m;
+    extra_matcher_specified_ = true;
+    return *this;
+  }
+
+  // Implements the .Times() clause.
+  TypedExpectation& Times(const Cardinality& a_cardinality) {
+    ExpectationBase::UntypedTimes(a_cardinality);
+    return *this;
+  }
+
+  // Implements the .Times() clause.
+  TypedExpectation& Times(int n) {
+    return Times(Exactly(n));
+  }
+
+  // Implements the .InSequence() clause.
+  TypedExpectation& InSequence(const Sequence& s) {
+    ExpectSpecProperty(last_clause_ <= kInSequence,
+                       ".InSequence() cannot appear after .After(),"
+                       " .WillOnce(), .WillRepeatedly(), or "
+                       ".RetiresOnSaturation().");
+    last_clause_ = kInSequence;
+
+    s.AddExpectation(GetHandle());
+    return *this;
+  }
+  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2) {
+    return InSequence(s1).InSequence(s2);
+  }
+  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
+                               const Sequence& s3) {
+    return InSequence(s1, s2).InSequence(s3);
+  }
+  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
+                               const Sequence& s3, const Sequence& s4) {
+    return InSequence(s1, s2, s3).InSequence(s4);
+  }
+  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
+                               const Sequence& s3, const Sequence& s4,
+                               const Sequence& s5) {
+    return InSequence(s1, s2, s3, s4).InSequence(s5);
+  }
+
+  // Implements that .After() clause.
+  TypedExpectation& After(const ExpectationSet& s) {
+    ExpectSpecProperty(last_clause_ <= kAfter,
+                       ".After() cannot appear after .WillOnce(),"
+                       " .WillRepeatedly(), or "
+                       ".RetiresOnSaturation().");
+    last_clause_ = kAfter;
+
+    for (ExpectationSet::const_iterator it = s.begin(); it != s.end(); ++it) {
+      immediate_prerequisites_ += *it;
+    }
+    return *this;
+  }
+  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2) {
+    return After(s1).After(s2);
+  }
+  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
+                          const ExpectationSet& s3) {
+    return After(s1, s2).After(s3);
+  }
+  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
+                          const ExpectationSet& s3, const ExpectationSet& s4) {
+    return After(s1, s2, s3).After(s4);
+  }
+  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
+                          const ExpectationSet& s3, const ExpectationSet& s4,
+                          const ExpectationSet& s5) {
+    return After(s1, s2, s3, s4).After(s5);
+  }
+
+  // Implements the .WillOnce() clause.
+  TypedExpectation& WillOnce(const Action<F>& action) {
+    ExpectSpecProperty(last_clause_ <= kWillOnce,
+                       ".WillOnce() cannot appear after "
+                       ".WillRepeatedly() or .RetiresOnSaturation().");
+    last_clause_ = kWillOnce;
+
+    untyped_actions_.push_back(new Action<F>(action));
+    if (!cardinality_specified()) {
+      set_cardinality(Exactly(static_cast<int>(untyped_actions_.size())));
+    }
+    return *this;
+  }
+
+  // Implements the .WillRepeatedly() clause.
+  TypedExpectation& WillRepeatedly(const Action<F>& action) {
+    if (last_clause_ == kWillRepeatedly) {
+      ExpectSpecProperty(false,
+                         ".WillRepeatedly() cannot appear "
+                         "more than once in an EXPECT_CALL().");
+    } else {
+      ExpectSpecProperty(last_clause_ < kWillRepeatedly,
+                         ".WillRepeatedly() cannot appear "
+                         "after .RetiresOnSaturation().");
+    }
+    last_clause_ = kWillRepeatedly;
+    repeated_action_specified_ = true;
+
+    repeated_action_ = action;
+    if (!cardinality_specified()) {
+      set_cardinality(AtLeast(static_cast<int>(untyped_actions_.size())));
+    }
+
+    // Now that no more action clauses can be specified, we check
+    // whether their count makes sense.
+    CheckActionCountIfNotDone();
+    return *this;
+  }
+
+  // Implements the .RetiresOnSaturation() clause.
+  TypedExpectation& RetiresOnSaturation() {
+    ExpectSpecProperty(last_clause_ < kRetiresOnSaturation,
+                       ".RetiresOnSaturation() cannot appear "
+                       "more than once.");
+    last_clause_ = kRetiresOnSaturation;
+    retires_on_saturation_ = true;
+
+    // Now that no more action clauses can be specified, we check
+    // whether their count makes sense.
+    CheckActionCountIfNotDone();
+    return *this;
+  }
+
+  // Returns the matchers for the arguments as specified inside the
+  // EXPECT_CALL() macro.
+  const ArgumentMatcherTuple& matchers() const {
+    return matchers_;
+  }
+
+  // Returns the matcher specified by the .With() clause.
+  const Matcher<const ArgumentTuple&>& extra_matcher() const {
+    return extra_matcher_;
+  }
+
+  // Returns the action specified by the .WillRepeatedly() clause.
+  const Action<F>& repeated_action() const { return repeated_action_; }
+
+  // If this mock method has an extra matcher (i.e. .With(matcher)),
+  // describes it to the ostream.
+  virtual void MaybeDescribeExtraMatcherTo(::std::ostream* os) {
+    if (extra_matcher_specified_) {
+      *os << "    Expected args: ";
+      extra_matcher_.DescribeTo(os);
+      *os << "\n";
+    }
+  }
+
+ private:
+  template <typename Function>
+  friend class FunctionMockerBase;
+
+  // Returns an Expectation object that references and co-owns this
+  // expectation.
+  virtual Expectation GetHandle() {
+    return owner_->GetHandleOf(this);
+  }
+
+  // The following methods will be called only after the EXPECT_CALL()
+  // statement finishes and when the current thread holds
+  // g_gmock_mutex.
+
+  // Returns true iff this expectation matches the given arguments.
+  bool Matches(const ArgumentTuple& args) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return TupleMatches(matchers_, args) && extra_matcher_.Matches(args);
+  }
+
+  // Returns true iff this expectation should handle the given arguments.
+  bool ShouldHandleArguments(const ArgumentTuple& args) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+
+    // In case the action count wasn't checked when the expectation
+    // was defined (e.g. if this expectation has no WillRepeatedly()
+    // or RetiresOnSaturation() clause), we check it when the
+    // expectation is used for the first time.
+    CheckActionCountIfNotDone();
+    return !is_retired() && AllPrerequisitesAreSatisfied() && Matches(args);
+  }
+
+  // Describes the result of matching the arguments against this
+  // expectation to the given ostream.
+  void ExplainMatchResultTo(
+      const ArgumentTuple& args,
+      ::std::ostream* os) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+
+    if (is_retired()) {
+      *os << "         Expected: the expectation is active\n"
+          << "           Actual: it is retired\n";
+    } else if (!Matches(args)) {
+      if (!TupleMatches(matchers_, args)) {
+        ExplainMatchFailureTupleTo(matchers_, args, os);
+      }
+      StringMatchResultListener listener;
+      if (!extra_matcher_.MatchAndExplain(args, &listener)) {
+        *os << "    Expected args: ";
+        extra_matcher_.DescribeTo(os);
+        *os << "\n           Actual: don't match";
+
+        internal::PrintIfNotEmpty(listener.str(), os);
+        *os << "\n";
+      }
+    } else if (!AllPrerequisitesAreSatisfied()) {
+      *os << "         Expected: all pre-requisites are satisfied\n"
+          << "           Actual: the following immediate pre-requisites "
+          << "are not satisfied:\n";
+      ExpectationSet unsatisfied_prereqs;
+      FindUnsatisfiedPrerequisites(&unsatisfied_prereqs);
+      int i = 0;
+      for (ExpectationSet::const_iterator it = unsatisfied_prereqs.begin();
+           it != unsatisfied_prereqs.end(); ++it) {
+        it->expectation_base()->DescribeLocationTo(os);
+        *os << "pre-requisite #" << i++ << "\n";
+      }
+      *os << "                   (end of pre-requisites)\n";
+    } else {
+      // This line is here just for completeness' sake.  It will never
+      // be executed as currently the ExplainMatchResultTo() function
+      // is called only when the mock function call does NOT match the
+      // expectation.
+      *os << "The call matches the expectation.\n";
+    }
+  }
+
+  // Returns the action that should be taken for the current invocation.
+  const Action<F>& GetCurrentAction(
+      const FunctionMockerBase<F>* mocker,
+      const ArgumentTuple& args) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    const int count = call_count();
+    Assert(count >= 1, __FILE__, __LINE__,
+           "call_count() is <= 0 when GetCurrentAction() is "
+           "called - this should never happen.");
+
+    const int action_count = static_cast<int>(untyped_actions_.size());
+    if (action_count > 0 && !repeated_action_specified_ &&
+        count > action_count) {
+      // If there is at least one WillOnce() and no WillRepeatedly(),
+      // we warn the user when the WillOnce() clauses ran out.
+      ::std::stringstream ss;
+      DescribeLocationTo(&ss);
+      ss << "Actions ran out in " << source_text() << "...\n"
+         << "Called " << count << " times, but only "
+         << action_count << " WillOnce()"
+         << (action_count == 1 ? " is" : "s are") << " specified - ";
+      mocker->DescribeDefaultActionTo(args, &ss);
+      Log(kWarning, ss.str(), 1);
+    }
+
+    return count <= action_count ?
+        *static_cast<const Action<F>*>(untyped_actions_[count - 1]) :
+        repeated_action();
+  }
+
+  // Given the arguments of a mock function call, if the call will
+  // over-saturate this expectation, returns the default action;
+  // otherwise, returns the next action in this expectation.  Also
+  // describes *what* happened to 'what', and explains *why* Google
+  // Mock does it to 'why'.  This method is not const as it calls
+  // IncrementCallCount().  A return value of NULL means the default
+  // action.
+  const Action<F>* GetActionForArguments(
+      const FunctionMockerBase<F>* mocker,
+      const ArgumentTuple& args,
+      ::std::ostream* what,
+      ::std::ostream* why)
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    if (IsSaturated()) {
+      // We have an excessive call.
+      IncrementCallCount();
+      *what << "Mock function called more times than expected - ";
+      mocker->DescribeDefaultActionTo(args, what);
+      DescribeCallCountTo(why);
+
+      // TODO(wan@google.com): allow the user to control whether
+      // unexpected calls should fail immediately or continue using a
+      // flag --gmock_unexpected_calls_are_fatal.
+      return NULL;
+    }
+
+    IncrementCallCount();
+    RetireAllPreRequisites();
+
+    if (retires_on_saturation_ && IsSaturated()) {
+      Retire();
+    }
+
+    // Must be done after IncrementCount()!
+    *what << "Mock function call matches " << source_text() <<"...\n";
+    return &(GetCurrentAction(mocker, args));
+  }
+
+  // All the fields below won't change once the EXPECT_CALL()
+  // statement finishes.
+  FunctionMockerBase<F>* const owner_;
+  ArgumentMatcherTuple matchers_;
+  Matcher<const ArgumentTuple&> extra_matcher_;
+  Action<F> repeated_action_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TypedExpectation);
+};  // class TypedExpectation
+
+// A MockSpec object is used by ON_CALL() or EXPECT_CALL() for
+// specifying the default behavior of, or expectation on, a mock
+// function.
+
+// Note: class MockSpec really belongs to the ::testing namespace.
+// However if we define it in ::testing, MSVC will complain when
+// classes in ::testing::internal declare it as a friend class
+// template.  To workaround this compiler bug, we define MockSpec in
+// ::testing::internal and import it into ::testing.
+
+// Logs a message including file and line number information.
+GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity,
+                                const char* file, int line,
+                                const string& message);
+
+template <typename F>
+class MockSpec {
+ public:
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+  typedef typename internal::Function<F>::ArgumentMatcherTuple
+      ArgumentMatcherTuple;
+
+  // Constructs a MockSpec object, given the function mocker object
+  // that the spec is associated with.
+  explicit MockSpec(internal::FunctionMockerBase<F>* function_mocker)
+      : function_mocker_(function_mocker) {}
+
+  // Adds a new default action spec to the function mocker and returns
+  // the newly created spec.
+  internal::OnCallSpec<F>& InternalDefaultActionSetAt(
+      const char* file, int line, const char* obj, const char* call) {
+    LogWithLocation(internal::kInfo, file, line,
+        string("ON_CALL(") + obj + ", " + call + ") invoked");
+    return function_mocker_->AddNewOnCallSpec(file, line, matchers_);
+  }
+
+  // Adds a new expectation spec to the function mocker and returns
+  // the newly created spec.
+  internal::TypedExpectation<F>& InternalExpectedAt(
+      const char* file, int line, const char* obj, const char* call) {
+    const string source_text(string("EXPECT_CALL(") + obj + ", " + call + ")");
+    LogWithLocation(internal::kInfo, file, line, source_text + " invoked");
+    return function_mocker_->AddNewExpectation(
+        file, line, source_text, matchers_);
+  }
+
+ private:
+  template <typename Function>
+  friend class internal::FunctionMocker;
+
+  void SetMatchers(const ArgumentMatcherTuple& matchers) {
+    matchers_ = matchers;
+  }
+
+  // The function mocker that owns this spec.
+  internal::FunctionMockerBase<F>* const function_mocker_;
+  // The argument matchers specified in the spec.
+  ArgumentMatcherTuple matchers_;
+
+  GTEST_DISALLOW_ASSIGN_(MockSpec);
+};  // class MockSpec
+
+// Wrapper type for generically holding an ordinary value or lvalue reference.
+// If T is not a reference type, it must be copyable or movable.
+// ReferenceOrValueWrapper<T> is movable, and will also be copyable unless
+// T is a move-only value type (which means that it will always be copyable
+// if the current platform does not support move semantics).
+//
+// The primary template defines handling for values, but function header
+// comments describe the contract for the whole template (including
+// specializations).
+template <typename T>
+class ReferenceOrValueWrapper {
+ public:
+  // Constructs a wrapper from the given value/reference.
+  explicit ReferenceOrValueWrapper(T value)
+      : value_(::testing::internal::move(value)) {
+  }
+
+  // Unwraps and returns the underlying value/reference, exactly as
+  // originally passed. The behavior of calling this more than once on
+  // the same object is unspecified.
+  T Unwrap() { return ::testing::internal::move(value_); }
+
+  // Provides nondestructive access to the underlying value/reference.
+  // Always returns a const reference (more precisely,
+  // const RemoveReference<T>&). The behavior of calling this after
+  // calling Unwrap on the same object is unspecified.
+  const T& Peek() const {
+    return value_;
+  }
+
+ private:
+  T value_;
+};
+
+// Specialization for lvalue reference types. See primary template
+// for documentation.
+template <typename T>
+class ReferenceOrValueWrapper<T&> {
+ public:
+  // Workaround for debatable pass-by-reference lint warning (c-library-team
+  // policy precludes NOLINT in this context)
+  typedef T& reference;
+  explicit ReferenceOrValueWrapper(reference ref)
+      : value_ptr_(&ref) {}
+  T& Unwrap() { return *value_ptr_; }
+  const T& Peek() const { return *value_ptr_; }
+
+ private:
+  T* value_ptr_;
+};
+
+// MSVC warns about using 'this' in base member initializer list, so
+// we need to temporarily disable the warning.  We have to do it for
+// the entire class to suppress the warning, even though it's about
+// the constructor only.
+
+#ifdef _MSC_VER
+# pragma warning(push)          // Saves the current warning state.
+# pragma warning(disable:4355)  // Temporarily disables warning 4355.
+#endif  // _MSV_VER
+
+// C++ treats the void type specially.  For example, you cannot define
+// a void-typed variable or pass a void value to a function.
+// ActionResultHolder<T> holds a value of type T, where T must be a
+// copyable type or void (T doesn't need to be default-constructable).
+// It hides the syntactic difference between void and other types, and
+// is used to unify the code for invoking both void-returning and
+// non-void-returning mock functions.
+
+// Untyped base class for ActionResultHolder<T>.
+class UntypedActionResultHolderBase {
+ public:
+  virtual ~UntypedActionResultHolderBase() {}
+
+  // Prints the held value as an action's result to os.
+  virtual void PrintAsActionResult(::std::ostream* os) const = 0;
+};
+
+// This generic definition is used when T is not void.
+template <typename T>
+class ActionResultHolder : public UntypedActionResultHolderBase {
+ public:
+  // Returns the held value. Must not be called more than once.
+  T Unwrap() {
+    return result_.Unwrap();
+  }
+
+  // Prints the held value as an action's result to os.
+  virtual void PrintAsActionResult(::std::ostream* os) const {
+    *os << "\n          Returns: ";
+    // T may be a reference type, so we don't use UniversalPrint().
+    UniversalPrinter<T>::Print(result_.Peek(), os);
+  }
+
+  // Performs the given mock function's default action and returns the
+  // result in a new-ed ActionResultHolder.
+  template <typename F>
+  static ActionResultHolder* PerformDefaultAction(
+      const FunctionMockerBase<F>* func_mocker,
+      const typename Function<F>::ArgumentTuple& args,
+      const string& call_description) {
+    return new ActionResultHolder(Wrapper(
+        func_mocker->PerformDefaultAction(args, call_description)));
+  }
+
+  // Performs the given action and returns the result in a new-ed
+  // ActionResultHolder.
+  template <typename F>
+  static ActionResultHolder*
+  PerformAction(const Action<F>& action,
+                const typename Function<F>::ArgumentTuple& args) {
+    return new ActionResultHolder(Wrapper(action.Perform(args)));
+  }
+
+ private:
+  typedef ReferenceOrValueWrapper<T> Wrapper;
+
+  explicit ActionResultHolder(Wrapper result)
+      : result_(::testing::internal::move(result)) {
+  }
+
+  Wrapper result_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder);
+};
+
+// Specialization for T = void.
+template <>
+class ActionResultHolder<void> : public UntypedActionResultHolderBase {
+ public:
+  void Unwrap() { }
+
+  virtual void PrintAsActionResult(::std::ostream* /* os */) const {}
+
+  // Performs the given mock function's default action and returns ownership
+  // of an empty ActionResultHolder*.
+  template <typename F>
+  static ActionResultHolder* PerformDefaultAction(
+      const FunctionMockerBase<F>* func_mocker,
+      const typename Function<F>::ArgumentTuple& args,
+      const string& call_description) {
+    func_mocker->PerformDefaultAction(args, call_description);
+    return new ActionResultHolder;
+  }
+
+  // Performs the given action and returns ownership of an empty
+  // ActionResultHolder*.
+  template <typename F>
+  static ActionResultHolder* PerformAction(
+      const Action<F>& action,
+      const typename Function<F>::ArgumentTuple& args) {
+    action.Perform(args);
+    return new ActionResultHolder;
+  }
+
+ private:
+  ActionResultHolder() {}
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder);
+};
+
+// The base of the function mocker class for the given function type.
+// We put the methods in this class instead of its child to avoid code
+// bloat.
+template <typename F>
+class FunctionMockerBase : public UntypedFunctionMockerBase {
+ public:
+  typedef typename Function<F>::Result Result;
+  typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
+
+  FunctionMockerBase() : current_spec_(this) {}
+
+  // The destructor verifies that all expectations on this mock
+  // function have been satisfied.  If not, it will report Google Test
+  // non-fatal failures for the violations.
+  virtual ~FunctionMockerBase()
+        GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    MutexLock l(&g_gmock_mutex);
+    VerifyAndClearExpectationsLocked();
+    Mock::UnregisterLocked(this);
+    ClearDefaultActionsLocked();
+  }
+
+  // Returns the ON_CALL spec that matches this mock function with the
+  // given arguments; returns NULL if no matching ON_CALL is found.
+  // L = *
+  const OnCallSpec<F>* FindOnCallSpec(
+      const ArgumentTuple& args) const {
+    for (UntypedOnCallSpecs::const_reverse_iterator it
+             = untyped_on_call_specs_.rbegin();
+         it != untyped_on_call_specs_.rend(); ++it) {
+      const OnCallSpec<F>* spec = static_cast<const OnCallSpec<F>*>(*it);
+      if (spec->Matches(args))
+        return spec;
+    }
+
+    return NULL;
+  }
+
+  // Performs the default action of this mock function on the given
+  // arguments and returns the result. Asserts (or throws if
+  // exceptions are enabled) with a helpful call descrption if there
+  // is no valid return value. This method doesn't depend on the
+  // mutable state of this object, and thus can be called concurrently
+  // without locking.
+  // L = *
+  Result PerformDefaultAction(const ArgumentTuple& args,
+                              const string& call_description) const {
+    const OnCallSpec<F>* const spec =
+        this->FindOnCallSpec(args);
+    if (spec != NULL) {
+      return spec->GetAction().Perform(args);
+    }
+    const string message = call_description +
+        "\n    The mock function has no default action "
+        "set, and its return type has no default value set.";
+#if GTEST_HAS_EXCEPTIONS
+    if (!DefaultValue<Result>::Exists()) {
+      throw std::runtime_error(message);
+    }
+#else
+    Assert(DefaultValue<Result>::Exists(), "", -1, message);
+#endif
+    return DefaultValue<Result>::Get();
+  }
+
+  // Performs the default action with the given arguments and returns
+  // the action's result.  The call description string will be used in
+  // the error message to describe the call in the case the default
+  // action fails.  The caller is responsible for deleting the result.
+  // L = *
+  virtual UntypedActionResultHolderBase* UntypedPerformDefaultAction(
+      const void* untyped_args,  // must point to an ArgumentTuple
+      const string& call_description) const {
+    const ArgumentTuple& args =
+        *static_cast<const ArgumentTuple*>(untyped_args);
+    return ResultHolder::PerformDefaultAction(this, args, call_description);
+  }
+
+  // Performs the given action with the given arguments and returns
+  // the action's result.  The caller is responsible for deleting the
+  // result.
+  // L = *
+  virtual UntypedActionResultHolderBase* UntypedPerformAction(
+      const void* untyped_action, const void* untyped_args) const {
+    // Make a copy of the action before performing it, in case the
+    // action deletes the mock object (and thus deletes itself).
+    const Action<F> action = *static_cast<const Action<F>*>(untyped_action);
+    const ArgumentTuple& args =
+        *static_cast<const ArgumentTuple*>(untyped_args);
+    return ResultHolder::PerformAction(action, args);
+  }
+
+  // Implements UntypedFunctionMockerBase::ClearDefaultActionsLocked():
+  // clears the ON_CALL()s set on this mock function.
+  virtual void ClearDefaultActionsLocked()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+
+    // Deleting our default actions may trigger other mock objects to be
+    // deleted, for example if an action contains a reference counted smart
+    // pointer to that mock object, and that is the last reference. So if we
+    // delete our actions within the context of the global mutex we may deadlock
+    // when this method is called again. Instead, make a copy of the set of
+    // actions to delete, clear our set within the mutex, and then delete the
+    // actions outside of the mutex.
+    UntypedOnCallSpecs specs_to_delete;
+    untyped_on_call_specs_.swap(specs_to_delete);
+
+    g_gmock_mutex.Unlock();
+    for (UntypedOnCallSpecs::const_iterator it =
+             specs_to_delete.begin();
+         it != specs_to_delete.end(); ++it) {
+      delete static_cast<const OnCallSpec<F>*>(*it);
+    }
+
+    // Lock the mutex again, since the caller expects it to be locked when we
+    // return.
+    g_gmock_mutex.Lock();
+  }
+
+ protected:
+  template <typename Function>
+  friend class MockSpec;
+
+  typedef ActionResultHolder<Result> ResultHolder;
+
+  // Returns the result of invoking this mock function with the given
+  // arguments.  This function can be safely called from multiple
+  // threads concurrently.
+  Result InvokeWith(const ArgumentTuple& args)
+        GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    scoped_ptr<ResultHolder> holder(
+        DownCast_<ResultHolder*>(this->UntypedInvokeWith(&args)));
+    return holder->Unwrap();
+  }
+
+  // Adds and returns a default action spec for this mock function.
+  OnCallSpec<F>& AddNewOnCallSpec(
+      const char* file, int line,
+      const ArgumentMatcherTuple& m)
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line);
+    OnCallSpec<F>* const on_call_spec = new OnCallSpec<F>(file, line, m);
+    untyped_on_call_specs_.push_back(on_call_spec);
+    return *on_call_spec;
+  }
+
+  // Adds and returns an expectation spec for this mock function.
+  TypedExpectation<F>& AddNewExpectation(
+      const char* file,
+      int line,
+      const string& source_text,
+      const ArgumentMatcherTuple& m)
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line);
+    TypedExpectation<F>* const expectation =
+        new TypedExpectation<F>(this, file, line, source_text, m);
+    const linked_ptr<ExpectationBase> untyped_expectation(expectation);
+    untyped_expectations_.push_back(untyped_expectation);
+
+    // Adds this expectation into the implicit sequence if there is one.
+    Sequence* const implicit_sequence = g_gmock_implicit_sequence.get();
+    if (implicit_sequence != NULL) {
+      implicit_sequence->AddExpectation(Expectation(untyped_expectation));
+    }
+
+    return *expectation;
+  }
+
+  // The current spec (either default action spec or expectation spec)
+  // being described on this function mocker.
+  MockSpec<F>& current_spec() { return current_spec_; }
+
+ private:
+  template <typename Func> friend class TypedExpectation;
+
+  // Some utilities needed for implementing UntypedInvokeWith().
+
+  // Describes what default action will be performed for the given
+  // arguments.
+  // L = *
+  void DescribeDefaultActionTo(const ArgumentTuple& args,
+                               ::std::ostream* os) const {
+    const OnCallSpec<F>* const spec = FindOnCallSpec(args);
+
+    if (spec == NULL) {
+      *os << (internal::type_equals<Result, void>::value ?
+              "returning directly.\n" :
+              "returning default value.\n");
+    } else {
+      *os << "taking default action specified at:\n"
+          << FormatFileLocation(spec->file(), spec->line()) << "\n";
+    }
+  }
+
+  // Writes a message that the call is uninteresting (i.e. neither
+  // explicitly expected nor explicitly unexpected) to the given
+  // ostream.
+  virtual void UntypedDescribeUninterestingCall(
+      const void* untyped_args,
+      ::std::ostream* os) const
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    const ArgumentTuple& args =
+        *static_cast<const ArgumentTuple*>(untyped_args);
+    *os << "Uninteresting mock function call - ";
+    DescribeDefaultActionTo(args, os);
+    *os << "    Function call: " << Name();
+    UniversalPrint(args, os);
+  }
+
+  // Returns the expectation that matches the given function arguments
+  // (or NULL is there's no match); when a match is found,
+  // untyped_action is set to point to the action that should be
+  // performed (or NULL if the action is "do default"), and
+  // is_excessive is modified to indicate whether the call exceeds the
+  // expected number.
+  //
+  // Critical section: We must find the matching expectation and the
+  // corresponding action that needs to be taken in an ATOMIC
+  // transaction.  Otherwise another thread may call this mock
+  // method in the middle and mess up the state.
+  //
+  // However, performing the action has to be left out of the critical
+  // section.  The reason is that we have no control on what the
+  // action does (it can invoke an arbitrary user function or even a
+  // mock function) and excessive locking could cause a dead lock.
+  virtual const ExpectationBase* UntypedFindMatchingExpectation(
+      const void* untyped_args,
+      const void** untyped_action, bool* is_excessive,
+      ::std::ostream* what, ::std::ostream* why)
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    const ArgumentTuple& args =
+        *static_cast<const ArgumentTuple*>(untyped_args);
+    MutexLock l(&g_gmock_mutex);
+    TypedExpectation<F>* exp = this->FindMatchingExpectationLocked(args);
+    if (exp == NULL) {  // A match wasn't found.
+      this->FormatUnexpectedCallMessageLocked(args, what, why);
+      return NULL;
+    }
+
+    // This line must be done before calling GetActionForArguments(),
+    // which will increment the call count for *exp and thus affect
+    // its saturation status.
+    *is_excessive = exp->IsSaturated();
+    const Action<F>* action = exp->GetActionForArguments(this, args, what, why);
+    if (action != NULL && action->IsDoDefault())
+      action = NULL;  // Normalize "do default" to NULL.
+    *untyped_action = action;
+    return exp;
+  }
+
+  // Prints the given function arguments to the ostream.
+  virtual void UntypedPrintArgs(const void* untyped_args,
+                                ::std::ostream* os) const {
+    const ArgumentTuple& args =
+        *static_cast<const ArgumentTuple*>(untyped_args);
+    UniversalPrint(args, os);
+  }
+
+  // Returns the expectation that matches the arguments, or NULL if no
+  // expectation matches them.
+  TypedExpectation<F>* FindMatchingExpectationLocked(
+      const ArgumentTuple& args) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    for (typename UntypedExpectations::const_reverse_iterator it =
+             untyped_expectations_.rbegin();
+         it != untyped_expectations_.rend(); ++it) {
+      TypedExpectation<F>* const exp =
+          static_cast<TypedExpectation<F>*>(it->get());
+      if (exp->ShouldHandleArguments(args)) {
+        return exp;
+      }
+    }
+    return NULL;
+  }
+
+  // Returns a message that the arguments don't match any expectation.
+  void FormatUnexpectedCallMessageLocked(
+      const ArgumentTuple& args,
+      ::std::ostream* os,
+      ::std::ostream* why) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    *os << "\nUnexpected mock function call - ";
+    DescribeDefaultActionTo(args, os);
+    PrintTriedExpectationsLocked(args, why);
+  }
+
+  // Prints a list of expectations that have been tried against the
+  // current mock function call.
+  void PrintTriedExpectationsLocked(
+      const ArgumentTuple& args,
+      ::std::ostream* why) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    const int count = static_cast<int>(untyped_expectations_.size());
+    *why << "Google Mock tried the following " << count << " "
+         << (count == 1 ? "expectation, but it didn't match" :
+             "expectations, but none matched")
+         << ":\n";
+    for (int i = 0; i < count; i++) {
+      TypedExpectation<F>* const expectation =
+          static_cast<TypedExpectation<F>*>(untyped_expectations_[i].get());
+      *why << "\n";
+      expectation->DescribeLocationTo(why);
+      if (count > 1) {
+        *why << "tried expectation #" << i << ": ";
+      }
+      *why << expectation->source_text() << "...\n";
+      expectation->ExplainMatchResultTo(args, why);
+      expectation->DescribeCallCountTo(why);
+    }
+  }
+
+  // The current spec (either default action spec or expectation spec)
+  // being described on this function mocker.
+  MockSpec<F> current_spec_;
+
+  // There is no generally useful and implementable semantics of
+  // copying a mock object, so copying a mock is usually a user error.
+  // Thus we disallow copying function mockers.  If the user really
+  // wants to copy a mock object, he should implement his own copy
+  // operation, for example:
+  //
+  //   class MockFoo : public Foo {
+  //    public:
+  //     // Defines a copy constructor explicitly.
+  //     MockFoo(const MockFoo& src) {}
+  //     ...
+  //   };
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(FunctionMockerBase);
+};  // class FunctionMockerBase
+
+#ifdef _MSC_VER
+# pragma warning(pop)  // Restores the warning state.
+#endif  // _MSV_VER
+
+// Implements methods of FunctionMockerBase.
+
+// Verifies that all expectations on this mock function have been
+// satisfied.  Reports one or more Google Test non-fatal failures and
+// returns false if not.
+
+// Reports an uninteresting call (whose description is in msg) in the
+// manner specified by 'reaction'.
+void ReportUninterestingCall(CallReaction reaction, const string& msg);
+
+}  // namespace internal
+
+// The style guide prohibits "using" statements in a namespace scope
+// inside a header file.  However, the MockSpec class template is
+// meant to be defined in the ::testing namespace.  The following line
+// is just a trick for working around a bug in MSVC 8.0, which cannot
+// handle it if we define MockSpec in ::testing.
+using internal::MockSpec;
+
+// Const(x) is a convenient function for obtaining a const reference
+// to x.  This is useful for setting expectations on an overloaded
+// const mock method, e.g.
+//
+//   class MockFoo : public FooInterface {
+//    public:
+//     MOCK_METHOD0(Bar, int());
+//     MOCK_CONST_METHOD0(Bar, int&());
+//   };
+//
+//   MockFoo foo;
+//   // Expects a call to non-const MockFoo::Bar().
+//   EXPECT_CALL(foo, Bar());
+//   // Expects a call to const MockFoo::Bar().
+//   EXPECT_CALL(Const(foo), Bar());
+template <typename T>
+inline const T& Const(const T& x) { return x; }
+
+// Constructs an Expectation object that references and co-owns exp.
+inline Expectation::Expectation(internal::ExpectationBase& exp)  // NOLINT
+    : expectation_base_(exp.GetHandle().expectation_base()) {}
+
+}  // namespace testing
+
+// A separate macro is required to avoid compile errors when the name
+// of the method used in call is a result of macro expansion.
+// See CompilesWithMethodNameExpandedFromMacro tests in
+// internal/gmock-spec-builders_test.cc for more details.
+#define GMOCK_ON_CALL_IMPL_(obj, call) \
+    ((obj).gmock_##call).InternalDefaultActionSetAt(__FILE__, __LINE__, \
+                                                    #obj, #call)
+#define ON_CALL(obj, call) GMOCK_ON_CALL_IMPL_(obj, call)
+
+#define GMOCK_EXPECT_CALL_IMPL_(obj, call) \
+    ((obj).gmock_##call).InternalExpectedAt(__FILE__, __LINE__, #obj, #call)
+#define EXPECT_CALL(obj, call) GMOCK_EXPECT_CALL_IMPL_(obj, call)
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock.h
new file mode 100644
index 0000000000..6735c71bf8
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/gmock.h
@@ -0,0 +1,94 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This is the main header file a user should include.
+
+#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_H_
+#define GMOCK_INCLUDE_GMOCK_GMOCK_H_
+
+// This file implements the following syntax:
+//
+//   ON_CALL(mock_object.Method(...))
+//     .With(...) ?
+//     .WillByDefault(...);
+//
+// where With() is optional and WillByDefault() must appear exactly
+// once.
+//
+//   EXPECT_CALL(mock_object.Method(...))
+//     .With(...) ?
+//     .Times(...) ?
+//     .InSequence(...) *
+//     .WillOnce(...) *
+//     .WillRepeatedly(...) ?
+//     .RetiresOnSaturation() ? ;
+//
+// where all clauses are optional and WillOnce() can be repeated.
+
+#include "gmock/gmock-actions.h"
+#include "gmock/gmock-cardinalities.h"
+#include "gmock/gmock-generated-actions.h"
+#include "gmock/gmock-generated-function-mockers.h"
+#include "gmock/gmock-generated-nice-strict.h"
+#include "gmock/gmock-generated-matchers.h"
+#include "gmock/gmock-matchers.h"
+#include "gmock/gmock-more-actions.h"
+#include "gmock/gmock-more-matchers.h"
+#include "gmock/internal/gmock-internal-utils.h"
+
+namespace testing {
+
+// Declares Google Mock flags that we want a user to use programmatically.
+GMOCK_DECLARE_bool_(catch_leaked_mocks);
+GMOCK_DECLARE_string_(verbose);
+
+// Initializes Google Mock.  This must be called before running the
+// tests.  In particular, it parses the command line for the flags
+// that Google Mock recognizes.  Whenever a Google Mock flag is seen,
+// it is removed from argv, and *argc is decremented.
+//
+// No value is returned.  Instead, the Google Mock flag variables are
+// updated.
+//
+// Since Google Test is needed for Google Mock to work, this function
+// also initializes Google Test and parses its flags, if that hasn't
+// been done.
+GTEST_API_ void InitGoogleMock(int* argc, char** argv);
+
+// This overloaded version can be used in Windows programs compiled in
+// UNICODE mode.
+GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv);
+
+}  // namespace testing
+
+#endif  // GMOCK_INCLUDE_GMOCK_GMOCK_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
new file mode 100644
index 0000000000..7dc3b1ad54
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
@@ -0,0 +1,8 @@
+// This file was GENERATED by command:
+//     pump.py gmock-generated-actions.h.pump
+// DO NOT EDIT BY HAND!!!
+
+#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
+#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
+
+#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
new file mode 100644
index 0000000000..d26c8a08a4
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
@@ -0,0 +1,10 @@
+$$ -*- mode: c++; -*-
+$$ This is a Pump source file (http://go/pump).  Please use Pump to convert
+$$ it to callback-actions.h.
+$$
+$var max_callback_arity = 5
+$$}} This meta comment fixes auto-indentation in editors.
+#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
+#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
+
+#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/custom/gmock-matchers.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/custom/gmock-matchers.h
new file mode 100644
index 0000000000..f2efef91db
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/custom/gmock-matchers.h
@@ -0,0 +1,39 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// ============================================================
+// An installation-specific extension point for gmock-matchers.h.
+// ============================================================
+//
+// Adds google3 callback support to CallableTraits.
+//
+#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_
+#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_
+
+#endif  //  GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/custom/gmock-port.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/custom/gmock-port.h
new file mode 100644
index 0000000000..9ce8bfe06b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/custom/gmock-port.h
@@ -0,0 +1,46 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Injection point for custom user configurations.
+// The following macros can be defined:
+//
+//   Flag related macros:
+//     GMOCK_DECLARE_bool_(name)
+//     GMOCK_DECLARE_int32_(name)
+//     GMOCK_DECLARE_string_(name)
+//     GMOCK_DEFINE_bool_(name, default_val, doc)
+//     GMOCK_DEFINE_int32_(name, default_val, doc)
+//     GMOCK_DEFINE_string_(name, default_val, doc)
+//
+// ** Custom implementation starts here **
+
+#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
+#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
+
+#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h
new file mode 100644
index 0000000000..7811e43f87
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h
@@ -0,0 +1,279 @@
+// This file was GENERATED by command:
+//     pump.py gmock-generated-internal-utils.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file contains template meta-programming utility classes needed
+// for implementing Google Mock.
+
+#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
+#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
+
+#include "gmock/internal/gmock-port.h"
+
+namespace testing {
+
+template <typename T>
+class Matcher;
+
+namespace internal {
+
+// An IgnoredValue object can be implicitly constructed from ANY value.
+// This is used in implementing the IgnoreResult(a) action.
+class IgnoredValue {
+ public:
+  // This constructor template allows any value to be implicitly
+  // converted to IgnoredValue.  The object has no data member and
+  // doesn't try to remember anything about the argument.  We
+  // deliberately omit the 'explicit' keyword in order to allow the
+  // conversion to be implicit.
+  template <typename T>
+  IgnoredValue(const T& /* ignored */) {}  // NOLINT(runtime/explicit)
+};
+
+// MatcherTuple<T>::type is a tuple type where each field is a Matcher
+// for the corresponding field in tuple type T.
+template <typename Tuple>
+struct MatcherTuple;
+
+template <>
+struct MatcherTuple< ::testing::tuple<> > {
+  typedef ::testing::tuple< > type;
+};
+
+template <typename A1>
+struct MatcherTuple< ::testing::tuple<A1> > {
+  typedef ::testing::tuple<Matcher<A1> > type;
+};
+
+template <typename A1, typename A2>
+struct MatcherTuple< ::testing::tuple<A1, A2> > {
+  typedef ::testing::tuple<Matcher<A1>, Matcher<A2> > type;
+};
+
+template <typename A1, typename A2, typename A3>
+struct MatcherTuple< ::testing::tuple<A1, A2, A3> > {
+  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3> > type;
+};
+
+template <typename A1, typename A2, typename A3, typename A4>
+struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4> > {
+  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>,
+      Matcher<A4> > type;
+};
+
+template <typename A1, typename A2, typename A3, typename A4, typename A5>
+struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5> > {
+  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>,
+      Matcher<A5> > type;
+};
+
+template <typename A1, typename A2, typename A3, typename A4, typename A5,
+    typename A6>
+struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6> > {
+  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>,
+      Matcher<A5>, Matcher<A6> > type;
+};
+
+template <typename A1, typename A2, typename A3, typename A4, typename A5,
+    typename A6, typename A7>
+struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6, A7> > {
+  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>,
+      Matcher<A5>, Matcher<A6>, Matcher<A7> > type;
+};
+
+template <typename A1, typename A2, typename A3, typename A4, typename A5,
+    typename A6, typename A7, typename A8>
+struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8> > {
+  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>,
+      Matcher<A5>, Matcher<A6>, Matcher<A7>, Matcher<A8> > type;
+};
+
+template <typename A1, typename A2, typename A3, typename A4, typename A5,
+    typename A6, typename A7, typename A8, typename A9>
+struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8, A9> > {
+  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>,
+      Matcher<A5>, Matcher<A6>, Matcher<A7>, Matcher<A8>, Matcher<A9> > type;
+};
+
+template <typename A1, typename A2, typename A3, typename A4, typename A5,
+    typename A6, typename A7, typename A8, typename A9, typename A10>
+struct MatcherTuple< ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8, A9,
+    A10> > {
+  typedef ::testing::tuple<Matcher<A1>, Matcher<A2>, Matcher<A3>, Matcher<A4>,
+      Matcher<A5>, Matcher<A6>, Matcher<A7>, Matcher<A8>, Matcher<A9>,
+      Matcher<A10> > type;
+};
+
+// Template struct Function<F>, where F must be a function type, contains
+// the following typedefs:
+//
+//   Result:               the function's return type.
+//   ArgumentN:            the type of the N-th argument, where N starts with 1.
+//   ArgumentTuple:        the tuple type consisting of all parameters of F.
+//   ArgumentMatcherTuple: the tuple type consisting of Matchers for all
+//                         parameters of F.
+//   MakeResultVoid:       the function type obtained by substituting void
+//                         for the return type of F.
+//   MakeResultIgnoredValue:
+//                         the function type obtained by substituting Something
+//                         for the return type of F.
+template <typename F>
+struct Function;
+
+template <typename R>
+struct Function<R()> {
+  typedef R Result;
+  typedef ::testing::tuple<> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid();
+  typedef IgnoredValue MakeResultIgnoredValue();
+};
+
+template <typename R, typename A1>
+struct Function<R(A1)>
+    : Function<R()> {
+  typedef A1 Argument1;
+  typedef ::testing::tuple<A1> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid(A1);
+  typedef IgnoredValue MakeResultIgnoredValue(A1);
+};
+
+template <typename R, typename A1, typename A2>
+struct Function<R(A1, A2)>
+    : Function<R(A1)> {
+  typedef A2 Argument2;
+  typedef ::testing::tuple<A1, A2> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid(A1, A2);
+  typedef IgnoredValue MakeResultIgnoredValue(A1, A2);
+};
+
+template <typename R, typename A1, typename A2, typename A3>
+struct Function<R(A1, A2, A3)>
+    : Function<R(A1, A2)> {
+  typedef A3 Argument3;
+  typedef ::testing::tuple<A1, A2, A3> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid(A1, A2, A3);
+  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3);
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4>
+struct Function<R(A1, A2, A3, A4)>
+    : Function<R(A1, A2, A3)> {
+  typedef A4 Argument4;
+  typedef ::testing::tuple<A1, A2, A3, A4> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid(A1, A2, A3, A4);
+  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4);
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5>
+struct Function<R(A1, A2, A3, A4, A5)>
+    : Function<R(A1, A2, A3, A4)> {
+  typedef A5 Argument5;
+  typedef ::testing::tuple<A1, A2, A3, A4, A5> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid(A1, A2, A3, A4, A5);
+  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5);
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6>
+struct Function<R(A1, A2, A3, A4, A5, A6)>
+    : Function<R(A1, A2, A3, A4, A5)> {
+  typedef A6 Argument6;
+  typedef ::testing::tuple<A1, A2, A3, A4, A5, A6> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6);
+  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6);
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6, typename A7>
+struct Function<R(A1, A2, A3, A4, A5, A6, A7)>
+    : Function<R(A1, A2, A3, A4, A5, A6)> {
+  typedef A7 Argument7;
+  typedef ::testing::tuple<A1, A2, A3, A4, A5, A6, A7> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6, A7);
+  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6, A7);
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6, typename A7, typename A8>
+struct Function<R(A1, A2, A3, A4, A5, A6, A7, A8)>
+    : Function<R(A1, A2, A3, A4, A5, A6, A7)> {
+  typedef A8 Argument8;
+  typedef ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6, A7, A8);
+  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6, A7, A8);
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6, typename A7, typename A8, typename A9>
+struct Function<R(A1, A2, A3, A4, A5, A6, A7, A8, A9)>
+    : Function<R(A1, A2, A3, A4, A5, A6, A7, A8)> {
+  typedef A9 Argument9;
+  typedef ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8, A9> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6, A7, A8, A9);
+  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6, A7, A8,
+      A9);
+};
+
+template <typename R, typename A1, typename A2, typename A3, typename A4,
+    typename A5, typename A6, typename A7, typename A8, typename A9,
+    typename A10>
+struct Function<R(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)>
+    : Function<R(A1, A2, A3, A4, A5, A6, A7, A8, A9)> {
+  typedef A10 Argument10;
+  typedef ::testing::tuple<A1, A2, A3, A4, A5, A6, A7, A8, A9,
+      A10> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10);
+  typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6, A7, A8,
+      A9, A10);
+};
+
+}  // namespace internal
+
+}  // namespace testing
+
+#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
new file mode 100644
index 0000000000..800af17c1d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
@@ -0,0 +1,136 @@
+$$ -*- mode: c++; -*-
+$$ This is a Pump source file.  Please use Pump to convert it to
+$$ gmock-generated-function-mockers.h.
+$$
+$var n = 10  $$ The maximum arity we support.
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file contains template meta-programming utility classes needed
+// for implementing Google Mock.
+
+#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
+#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
+
+#include "gmock/internal/gmock-port.h"
+
+namespace testing {
+
+template <typename T>
+class Matcher;
+
+namespace internal {
+
+// An IgnoredValue object can be implicitly constructed from ANY value.
+// This is used in implementing the IgnoreResult(a) action.
+class IgnoredValue {
+ public:
+  // This constructor template allows any value to be implicitly
+  // converted to IgnoredValue.  The object has no data member and
+  // doesn't try to remember anything about the argument.  We
+  // deliberately omit the 'explicit' keyword in order to allow the
+  // conversion to be implicit.
+  template <typename T>
+  IgnoredValue(const T& /* ignored */) {}  // NOLINT(runtime/explicit)
+};
+
+// MatcherTuple<T>::type is a tuple type where each field is a Matcher
+// for the corresponding field in tuple type T.
+template <typename Tuple>
+struct MatcherTuple;
+
+
+$range i 0..n
+$for i [[
+$range j 1..i
+$var typename_As = [[$for j, [[typename A$j]]]]
+$var As = [[$for j, [[A$j]]]]
+$var matcher_As = [[$for j, [[Matcher<A$j>]]]]
+template <$typename_As>
+struct MatcherTuple< ::testing::tuple<$As> > {
+  typedef ::testing::tuple<$matcher_As > type;
+};
+
+
+]]
+// Template struct Function<F>, where F must be a function type, contains
+// the following typedefs:
+//
+//   Result:               the function's return type.
+//   ArgumentN:            the type of the N-th argument, where N starts with 1.
+//   ArgumentTuple:        the tuple type consisting of all parameters of F.
+//   ArgumentMatcherTuple: the tuple type consisting of Matchers for all
+//                         parameters of F.
+//   MakeResultVoid:       the function type obtained by substituting void
+//                         for the return type of F.
+//   MakeResultIgnoredValue:
+//                         the function type obtained by substituting Something
+//                         for the return type of F.
+template <typename F>
+struct Function;
+
+template <typename R>
+struct Function<R()> {
+  typedef R Result;
+  typedef ::testing::tuple<> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid();
+  typedef IgnoredValue MakeResultIgnoredValue();
+};
+
+
+$range i 1..n
+$for i [[
+$range j 1..i
+$var typename_As = [[$for j [[, typename A$j]]]]
+$var As = [[$for j, [[A$j]]]]
+$var matcher_As = [[$for j, [[Matcher<A$j>]]]]
+$range k 1..i-1
+$var prev_As = [[$for k, [[A$k]]]]
+template <typename R$typename_As>
+struct Function<R($As)>
+    : Function<R($prev_As)> {
+  typedef A$i Argument$i;
+  typedef ::testing::tuple<$As> ArgumentTuple;
+  typedef typename MatcherTuple<ArgumentTuple>::type ArgumentMatcherTuple;
+  typedef void MakeResultVoid($As);
+  typedef IgnoredValue MakeResultIgnoredValue($As);
+};
+
+
+]]
+}  // namespace internal
+
+}  // namespace testing
+
+#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/gmock-internal-utils.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/gmock-internal-utils.h
new file mode 100644
index 0000000000..e2ddb05c91
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/gmock-internal-utils.h
@@ -0,0 +1,511 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file defines some utilities useful for implementing Google
+// Mock.  They are subject to change without notice, so please DO NOT
+// USE THEM IN USER CODE.
+
+#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
+#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
+
+#include <stdio.h>
+#include <ostream>  // NOLINT
+#include <string>
+
+#include "gmock/internal/gmock-generated-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+namespace internal {
+
+// Converts an identifier name to a space-separated list of lower-case
+// words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is
+// treated as one word.  For example, both "FooBar123" and
+// "foo_bar_123" are converted to "foo bar 123".
+GTEST_API_ string ConvertIdentifierNameToWords(const char* id_name);
+
+// PointeeOf<Pointer>::type is the type of a value pointed to by a
+// Pointer, which can be either a smart pointer or a raw pointer.  The
+// following default implementation is for the case where Pointer is a
+// smart pointer.
+template <typename Pointer>
+struct PointeeOf {
+  // Smart pointer classes define type element_type as the type of
+  // their pointees.
+  typedef typename Pointer::element_type type;
+};
+// This specialization is for the raw pointer case.
+template <typename T>
+struct PointeeOf<T*> { typedef T type; };  // NOLINT
+
+// GetRawPointer(p) returns the raw pointer underlying p when p is a
+// smart pointer, or returns p itself when p is already a raw pointer.
+// The following default implementation is for the smart pointer case.
+template <typename Pointer>
+inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) {
+  return p.get();
+}
+// This overloaded version is for the raw pointer case.
+template <typename Element>
+inline Element* GetRawPointer(Element* p) { return p; }
+
+// This comparator allows linked_ptr to be stored in sets.
+template <typename T>
+struct LinkedPtrLessThan {
+  bool operator()(const ::testing::internal::linked_ptr<T>& lhs,
+                  const ::testing::internal::linked_ptr<T>& rhs) const {
+    return lhs.get() < rhs.get();
+  }
+};
+
+// Symbian compilation can be done with wchar_t being either a native
+// type or a typedef.  Using Google Mock with OpenC without wchar_t
+// should require the definition of _STLP_NO_WCHAR_T.
+//
+// MSVC treats wchar_t as a native type usually, but treats it as the
+// same as unsigned short when the compiler option /Zc:wchar_t- is
+// specified.  It defines _NATIVE_WCHAR_T_DEFINED symbol when wchar_t
+// is a native type.
+#if (GTEST_OS_SYMBIAN && defined(_STLP_NO_WCHAR_T)) || \
+    (defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED))
+// wchar_t is a typedef.
+#else
+# define GMOCK_WCHAR_T_IS_NATIVE_ 1
+#endif
+
+// signed wchar_t and unsigned wchar_t are NOT in the C++ standard.
+// Using them is a bad practice and not portable.  So DON'T use them.
+//
+// Still, Google Mock is designed to work even if the user uses signed
+// wchar_t or unsigned wchar_t (obviously, assuming the compiler
+// supports them).
+//
+// To gcc,
+//   wchar_t == signed wchar_t != unsigned wchar_t == unsigned int
+#ifdef __GNUC__
+// signed/unsigned wchar_t are valid types.
+# define GMOCK_HAS_SIGNED_WCHAR_T_ 1
+#endif
+
+// In what follows, we use the term "kind" to indicate whether a type
+// is bool, an integer type (excluding bool), a floating-point type,
+// or none of them.  This categorization is useful for determining
+// when a matcher argument type can be safely converted to another
+// type in the implementation of SafeMatcherCast.
+enum TypeKind {
+  kBool, kInteger, kFloatingPoint, kOther
+};
+
+// KindOf<T>::value is the kind of type T.
+template <typename T> struct KindOf {
+  enum { value = kOther };  // The default kind.
+};
+
+// This macro declares that the kind of 'type' is 'kind'.
+#define GMOCK_DECLARE_KIND_(type, kind) \
+  template <> struct KindOf<type> { enum { value = kind }; }
+
+GMOCK_DECLARE_KIND_(bool, kBool);
+
+// All standard integer types.
+GMOCK_DECLARE_KIND_(char, kInteger);
+GMOCK_DECLARE_KIND_(signed char, kInteger);
+GMOCK_DECLARE_KIND_(unsigned char, kInteger);
+GMOCK_DECLARE_KIND_(short, kInteger);  // NOLINT
+GMOCK_DECLARE_KIND_(unsigned short, kInteger);  // NOLINT
+GMOCK_DECLARE_KIND_(int, kInteger);
+GMOCK_DECLARE_KIND_(unsigned int, kInteger);
+GMOCK_DECLARE_KIND_(long, kInteger);  // NOLINT
+GMOCK_DECLARE_KIND_(unsigned long, kInteger);  // NOLINT
+
+#if GMOCK_WCHAR_T_IS_NATIVE_
+GMOCK_DECLARE_KIND_(wchar_t, kInteger);
+#endif
+
+// Non-standard integer types.
+GMOCK_DECLARE_KIND_(Int64, kInteger);
+GMOCK_DECLARE_KIND_(UInt64, kInteger);
+
+// All standard floating-point types.
+GMOCK_DECLARE_KIND_(float, kFloatingPoint);
+GMOCK_DECLARE_KIND_(double, kFloatingPoint);
+GMOCK_DECLARE_KIND_(long double, kFloatingPoint);
+
+#undef GMOCK_DECLARE_KIND_
+
+// Evaluates to the kind of 'type'.
+#define GMOCK_KIND_OF_(type) \
+  static_cast< ::testing::internal::TypeKind>( \
+      ::testing::internal::KindOf<type>::value)
+
+// Evaluates to true iff integer type T is signed.
+#define GMOCK_IS_SIGNED_(T) (static_cast<T>(-1) < 0)
+
+// LosslessArithmeticConvertibleImpl<kFromKind, From, kToKind, To>::value
+// is true iff arithmetic type From can be losslessly converted to
+// arithmetic type To.
+//
+// It's the user's responsibility to ensure that both From and To are
+// raw (i.e. has no CV modifier, is not a pointer, and is not a
+// reference) built-in arithmetic types, kFromKind is the kind of
+// From, and kToKind is the kind of To; the value is
+// implementation-defined when the above pre-condition is violated.
+template <TypeKind kFromKind, typename From, TypeKind kToKind, typename To>
+struct LosslessArithmeticConvertibleImpl : public false_type {};
+
+// Converting bool to bool is lossless.
+template <>
+struct LosslessArithmeticConvertibleImpl<kBool, bool, kBool, bool>
+    : public true_type {};  // NOLINT
+
+// Converting bool to any integer type is lossless.
+template <typename To>
+struct LosslessArithmeticConvertibleImpl<kBool, bool, kInteger, To>
+    : public true_type {};  // NOLINT
+
+// Converting bool to any floating-point type is lossless.
+template <typename To>
+struct LosslessArithmeticConvertibleImpl<kBool, bool, kFloatingPoint, To>
+    : public true_type {};  // NOLINT
+
+// Converting an integer to bool is lossy.
+template <typename From>
+struct LosslessArithmeticConvertibleImpl<kInteger, From, kBool, bool>
+    : public false_type {};  // NOLINT
+
+// Converting an integer to another non-bool integer is lossless iff
+// the target type's range encloses the source type's range.
+template <typename From, typename To>
+struct LosslessArithmeticConvertibleImpl<kInteger, From, kInteger, To>
+    : public bool_constant<
+      // When converting from a smaller size to a larger size, we are
+      // fine as long as we are not converting from signed to unsigned.
+      ((sizeof(From) < sizeof(To)) &&
+       (!GMOCK_IS_SIGNED_(From) || GMOCK_IS_SIGNED_(To))) ||
+      // When converting between the same size, the signedness must match.
+      ((sizeof(From) == sizeof(To)) &&
+       (GMOCK_IS_SIGNED_(From) == GMOCK_IS_SIGNED_(To)))> {};  // NOLINT
+
+#undef GMOCK_IS_SIGNED_
+
+// Converting an integer to a floating-point type may be lossy, since
+// the format of a floating-point number is implementation-defined.
+template <typename From, typename To>
+struct LosslessArithmeticConvertibleImpl<kInteger, From, kFloatingPoint, To>
+    : public false_type {};  // NOLINT
+
+// Converting a floating-point to bool is lossy.
+template <typename From>
+struct LosslessArithmeticConvertibleImpl<kFloatingPoint, From, kBool, bool>
+    : public false_type {};  // NOLINT
+
+// Converting a floating-point to an integer is lossy.
+template <typename From, typename To>
+struct LosslessArithmeticConvertibleImpl<kFloatingPoint, From, kInteger, To>
+    : public false_type {};  // NOLINT
+
+// Converting a floating-point to another floating-point is lossless
+// iff the target type is at least as big as the source type.
+template <typename From, typename To>
+struct LosslessArithmeticConvertibleImpl<
+  kFloatingPoint, From, kFloatingPoint, To>
+    : public bool_constant<sizeof(From) <= sizeof(To)> {};  // NOLINT
+
+// LosslessArithmeticConvertible<From, To>::value is true iff arithmetic
+// type From can be losslessly converted to arithmetic type To.
+//
+// It's the user's responsibility to ensure that both From and To are
+// raw (i.e. has no CV modifier, is not a pointer, and is not a
+// reference) built-in arithmetic types; the value is
+// implementation-defined when the above pre-condition is violated.
+template <typename From, typename To>
+struct LosslessArithmeticConvertible
+    : public LosslessArithmeticConvertibleImpl<
+  GMOCK_KIND_OF_(From), From, GMOCK_KIND_OF_(To), To> {};  // NOLINT
+
+// This interface knows how to report a Google Mock failure (either
+// non-fatal or fatal).
+class FailureReporterInterface {
+ public:
+  // The type of a failure (either non-fatal or fatal).
+  enum FailureType {
+    kNonfatal, kFatal
+  };
+
+  virtual ~FailureReporterInterface() {}
+
+  // Reports a failure that occurred at the given source file location.
+  virtual void ReportFailure(FailureType type, const char* file, int line,
+                             const string& message) = 0;
+};
+
+// Returns the failure reporter used by Google Mock.
+GTEST_API_ FailureReporterInterface* GetFailureReporter();
+
+// Asserts that condition is true; aborts the process with the given
+// message if condition is false.  We cannot use LOG(FATAL) or CHECK()
+// as Google Mock might be used to mock the log sink itself.  We
+// inline this function to prevent it from showing up in the stack
+// trace.
+inline void Assert(bool condition, const char* file, int line,
+                   const string& msg) {
+  if (!condition) {
+    GetFailureReporter()->ReportFailure(FailureReporterInterface::kFatal,
+                                        file, line, msg);
+  }
+}
+inline void Assert(bool condition, const char* file, int line) {
+  Assert(condition, file, line, "Assertion failed.");
+}
+
+// Verifies that condition is true; generates a non-fatal failure if
+// condition is false.
+inline void Expect(bool condition, const char* file, int line,
+                   const string& msg) {
+  if (!condition) {
+    GetFailureReporter()->ReportFailure(FailureReporterInterface::kNonfatal,
+                                        file, line, msg);
+  }
+}
+inline void Expect(bool condition, const char* file, int line) {
+  Expect(condition, file, line, "Expectation failed.");
+}
+
+// Severity level of a log.
+enum LogSeverity {
+  kInfo = 0,
+  kWarning = 1
+};
+
+// Valid values for the --gmock_verbose flag.
+
+// All logs (informational and warnings) are printed.
+const char kInfoVerbosity[] = "info";
+// Only warnings are printed.
+const char kWarningVerbosity[] = "warning";
+// No logs are printed.
+const char kErrorVerbosity[] = "error";
+
+// Returns true iff a log with the given severity is visible according
+// to the --gmock_verbose flag.
+GTEST_API_ bool LogIsVisible(LogSeverity severity);
+
+// Prints the given message to stdout iff 'severity' >= the level
+// specified by the --gmock_verbose flag.  If stack_frames_to_skip >=
+// 0, also prints the stack trace excluding the top
+// stack_frames_to_skip frames.  In opt mode, any positive
+// stack_frames_to_skip is treated as 0, since we don't know which
+// function calls will be inlined by the compiler and need to be
+// conservative.
+GTEST_API_ void Log(LogSeverity severity,
+                    const string& message,
+                    int stack_frames_to_skip);
+
+// TODO(wan@google.com): group all type utilities together.
+
+// Type traits.
+
+// is_reference<T>::value is non-zero iff T is a reference type.
+template <typename T> struct is_reference : public false_type {};
+template <typename T> struct is_reference<T&> : public true_type {};
+
+// type_equals<T1, T2>::value is non-zero iff T1 and T2 are the same type.
+template <typename T1, typename T2> struct type_equals : public false_type {};
+template <typename T> struct type_equals<T, T> : public true_type {};
+
+// remove_reference<T>::type removes the reference from type T, if any.
+template <typename T> struct remove_reference { typedef T type; };  // NOLINT
+template <typename T> struct remove_reference<T&> { typedef T type; }; // NOLINT
+
+// DecayArray<T>::type turns an array type U[N] to const U* and preserves
+// other types.  Useful for saving a copy of a function argument.
+template <typename T> struct DecayArray { typedef T type; };  // NOLINT
+template <typename T, size_t N> struct DecayArray<T[N]> {
+  typedef const T* type;
+};
+// Sometimes people use arrays whose size is not available at the use site
+// (e.g. extern const char kNamePrefix[]).  This specialization covers that
+// case.
+template <typename T> struct DecayArray<T[]> {
+  typedef const T* type;
+};
+
+// Disable MSVC warnings for infinite recursion, since in this case the
+// the recursion is unreachable.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4717)
+#endif
+
+// Invalid<T>() is usable as an expression of type T, but will terminate
+// the program with an assertion failure if actually run.  This is useful
+// when a value of type T is needed for compilation, but the statement
+// will not really be executed (or we don't care if the statement
+// crashes).
+template <typename T>
+inline T Invalid() {
+  Assert(false, "", -1, "Internal error: attempt to return invalid value");
+  // This statement is unreachable, and would never terminate even if it
+  // could be reached. It is provided only to placate compiler warnings
+  // about missing return statements.
+  return Invalid<T>();
+}
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+// Given a raw type (i.e. having no top-level reference or const
+// modifier) RawContainer that's either an STL-style container or a
+// native array, class StlContainerView<RawContainer> has the
+// following members:
+//
+//   - type is a type that provides an STL-style container view to
+//     (i.e. implements the STL container concept for) RawContainer;
+//   - const_reference is a type that provides a reference to a const
+//     RawContainer;
+//   - ConstReference(raw_container) returns a const reference to an STL-style
+//     container view to raw_container, which is a RawContainer.
+//   - Copy(raw_container) returns an STL-style container view of a
+//     copy of raw_container, which is a RawContainer.
+//
+// This generic version is used when RawContainer itself is already an
+// STL-style container.
+template <class RawContainer>
+class StlContainerView {
+ public:
+  typedef RawContainer type;
+  typedef const type& const_reference;
+
+  static const_reference ConstReference(const RawContainer& container) {
+    // Ensures that RawContainer is not a const type.
+    testing::StaticAssertTypeEq<RawContainer,
+        GTEST_REMOVE_CONST_(RawContainer)>();
+    return container;
+  }
+  static type Copy(const RawContainer& container) { return container; }
+};
+
+// This specialization is used when RawContainer is a native array type.
+template <typename Element, size_t N>
+class StlContainerView<Element[N]> {
+ public:
+  typedef GTEST_REMOVE_CONST_(Element) RawElement;
+  typedef internal::NativeArray<RawElement> type;
+  // NativeArray<T> can represent a native array either by value or by
+  // reference (selected by a constructor argument), so 'const type'
+  // can be used to reference a const native array.  We cannot
+  // 'typedef const type& const_reference' here, as that would mean
+  // ConstReference() has to return a reference to a local variable.
+  typedef const type const_reference;
+
+  static const_reference ConstReference(const Element (&array)[N]) {
+    // Ensures that Element is not a const type.
+    testing::StaticAssertTypeEq<Element, RawElement>();
+#if GTEST_OS_SYMBIAN
+    // The Nokia Symbian compiler confuses itself in template instantiation
+    // for this call without the cast to Element*:
+    // function call '[testing::internal::NativeArray<char *>].NativeArray(
+    //     {lval} const char *[4], long, testing::internal::RelationToSource)'
+    //     does not match
+    // 'testing::internal::NativeArray<char *>::NativeArray(
+    //     char *const *, unsigned int, testing::internal::RelationToSource)'
+    // (instantiating: 'testing::internal::ContainsMatcherImpl
+    //     <const char * (&)[4]>::Matches(const char * (&)[4]) const')
+    // (instantiating: 'testing::internal::StlContainerView<char *[4]>::
+    //     ConstReference(const char * (&)[4])')
+    // (and though the N parameter type is mismatched in the above explicit
+    // conversion of it doesn't help - only the conversion of the array).
+    return type(const_cast<Element*>(&array[0]), N,
+                RelationToSourceReference());
+#else
+    return type(array, N, RelationToSourceReference());
+#endif  // GTEST_OS_SYMBIAN
+  }
+  static type Copy(const Element (&array)[N]) {
+#if GTEST_OS_SYMBIAN
+    return type(const_cast<Element*>(&array[0]), N, RelationToSourceCopy());
+#else
+    return type(array, N, RelationToSourceCopy());
+#endif  // GTEST_OS_SYMBIAN
+  }
+};
+
+// This specialization is used when RawContainer is a native array
+// represented as a (pointer, size) tuple.
+template <typename ElementPointer, typename Size>
+class StlContainerView< ::testing::tuple<ElementPointer, Size> > {
+ public:
+  typedef GTEST_REMOVE_CONST_(
+      typename internal::PointeeOf<ElementPointer>::type) RawElement;
+  typedef internal::NativeArray<RawElement> type;
+  typedef const type const_reference;
+
+  static const_reference ConstReference(
+      const ::testing::tuple<ElementPointer, Size>& array) {
+    return type(get<0>(array), get<1>(array), RelationToSourceReference());
+  }
+  static type Copy(const ::testing::tuple<ElementPointer, Size>& array) {
+    return type(get<0>(array), get<1>(array), RelationToSourceCopy());
+  }
+};
+
+// The following specialization prevents the user from instantiating
+// StlContainer with a reference type.
+template <typename T> class StlContainerView<T&>;
+
+// A type transform to remove constness from the first part of a pair.
+// Pairs like that are used as the value_type of associative containers,
+// and this transform produces a similar but assignable pair.
+template <typename T>
+struct RemoveConstFromKey {
+  typedef T type;
+};
+
+// Partially specialized to remove constness from std::pair<const K, V>.
+template <typename K, typename V>
+struct RemoveConstFromKey<std::pair<const K, V> > {
+  typedef std::pair<K, V> type;
+};
+
+// Mapping from booleans to types. Similar to boost::bool_<kValue> and
+// std::integral_constant<bool, kValue>.
+template <bool kValue>
+struct BooleanConstant {};
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
+
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/gmock-port.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/gmock-port.h
new file mode 100644
index 0000000000..63f4a6802e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/include/gmock/internal/gmock-port.h
@@ -0,0 +1,91 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vadimb@google.com (Vadim Berman)
+//
+// Low-level types and utilities for porting Google Mock to various
+// platforms.  All macros ending with _ and symbols defined in an
+// internal namespace are subject to change without notice.  Code
+// outside Google Mock MUST NOT USE THEM DIRECTLY.  Macros that don't
+// end with _ are part of Google Mock's public API and can be used by
+// code outside Google Mock.
+
+#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
+#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
+
+#include <assert.h>
+#include <stdlib.h>
+#include <iostream>
+
+// Most of the utilities needed for porting Google Mock are also
+// required for Google Test and are defined in gtest-port.h.
+//
+// Note to maintainers: to reduce code duplication, prefer adding
+// portability utilities to Google Test's gtest-port.h instead of
+// here, as Google Mock depends on Google Test.  Only add a utility
+// here if it's truly specific to Google Mock.
+#include "gtest/internal/gtest-linked_ptr.h"
+#include "gtest/internal/gtest-port.h"
+#include "gmock/internal/custom/gmock-port.h"
+
+// To avoid conditional compilation everywhere, we make it
+// gmock-port.h's responsibility to #include the header implementing
+// tr1/tuple.  gmock-port.h does this via gtest-port.h, which is
+// guaranteed to pull in the tuple header.
+
+// For MS Visual C++, check the compiler version. At least VS 2003 is
+// required to compile Google Mock.
+#if defined(_MSC_VER) && _MSC_VER < 1310
+# error "At least Visual C++ 2003 (7.1) is required to compile Google Mock."
+#endif
+
+// Macro for referencing flags.  This is public as we want the user to
+// use this syntax to reference Google Mock flags.
+#define GMOCK_FLAG(name) FLAGS_gmock_##name
+
+#if !defined(GMOCK_DECLARE_bool_)
+
+// Macros for declaring flags.
+#define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name)
+#define GMOCK_DECLARE_int32_(name) \
+    extern GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name)
+#define GMOCK_DECLARE_string_(name) \
+    extern GTEST_API_ ::std::string GMOCK_FLAG(name)
+
+// Macros for defining flags.
+#define GMOCK_DEFINE_bool_(name, default_val, doc) \
+    GTEST_API_ bool GMOCK_FLAG(name) = (default_val)
+#define GMOCK_DEFINE_int32_(name, default_val, doc) \
+    GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name) = (default_val)
+#define GMOCK_DEFINE_string_(name, default_val, doc) \
+    GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val)
+
+#endif  // !defined(GMOCK_DECLARE_bool_)
+
+#endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/make/Makefile b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/make/Makefile
new file mode 100644
index 0000000000..7c13e05fa9
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/make/Makefile
@@ -0,0 +1,101 @@
+# A sample Makefile for building both Google Mock and Google Test and
+# using them in user tests.  This file is self-contained, so you don't
+# need to use the Makefile in Google Test's source tree.  Please tweak
+# it to suit your environment and project.  You may want to move it to
+# your project's root directory.
+#
+# SYNOPSIS:
+#
+#   make [all]  - makes everything.
+#   make TARGET - makes the given target.
+#   make clean  - removes all files generated by make.
+
+# Please tweak the following variable definitions as needed by your
+# project, except GMOCK_HEADERS and GTEST_HEADERS, which you can use
+# in your own targets but shouldn't modify.
+
+# Points to the root of Google Test, relative to where this file is.
+# Remember to tweak this if you move this file, or if you want to use
+# a copy of Google Test at a different location.
+GTEST_DIR = ../../googletest
+
+# Points to the root of Google Mock, relative to where this file is.
+# Remember to tweak this if you move this file.
+GMOCK_DIR = ..
+
+# Where to find user code.
+USER_DIR = ../test
+
+# Flags passed to the preprocessor.
+# Set Google Test and Google Mock's header directories as system
+# directories, such that the compiler doesn't generate warnings in
+# these headers.
+CPPFLAGS += -isystem $(GTEST_DIR)/include -isystem $(GMOCK_DIR)/include
+
+# Flags passed to the C++ compiler.
+CXXFLAGS += -g -Wall -Wextra -pthread
+
+# All tests produced by this Makefile.  Remember to add new tests you
+# created to the list.
+TESTS = gmock_test
+
+# All Google Test headers.  Usually you shouldn't change this
+# definition.
+GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
+                $(GTEST_DIR)/include/gtest/internal/*.h
+
+# All Google Mock headers. Note that all Google Test headers are
+# included here too, as they are #included by Google Mock headers.
+# Usually you shouldn't change this definition.	
+GMOCK_HEADERS = $(GMOCK_DIR)/include/gmock/*.h \
+                $(GMOCK_DIR)/include/gmock/internal/*.h \
+                $(GTEST_HEADERS)
+
+# House-keeping build targets.
+
+all : $(TESTS)
+
+clean :
+	rm -f $(TESTS) gmock.a gmock_main.a *.o
+
+# Builds gmock.a and gmock_main.a.  These libraries contain both
+# Google Mock and Google Test.  A test should link with either gmock.a
+# or gmock_main.a, depending on whether it defines its own main()
+# function.  It's fine if your test only uses features from Google
+# Test (and not Google Mock).
+
+# Usually you shouldn't tweak such internal variables, indicated by a
+# trailing _.
+GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS)
+GMOCK_SRCS_ = $(GMOCK_DIR)/src/*.cc $(GMOCK_HEADERS)
+
+# For simplicity and to avoid depending on implementation details of
+# Google Mock and Google Test, the dependencies specified below are
+# conservative and not optimized.  This is fine as Google Mock and
+# Google Test compile fast and for ordinary users their source rarely
+# changes.
+gtest-all.o : $(GTEST_SRCS_)
+	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) -I$(GMOCK_DIR) $(CXXFLAGS) \
+            -c $(GTEST_DIR)/src/gtest-all.cc
+
+gmock-all.o : $(GMOCK_SRCS_)
+	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) -I$(GMOCK_DIR) $(CXXFLAGS) \
+            -c $(GMOCK_DIR)/src/gmock-all.cc
+
+gmock_main.o : $(GMOCK_SRCS_)
+	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) -I$(GMOCK_DIR) $(CXXFLAGS) \
+            -c $(GMOCK_DIR)/src/gmock_main.cc
+
+gmock.a : gmock-all.o gtest-all.o
+	$(AR) $(ARFLAGS) $@ $^
+
+gmock_main.a : gmock-all.o gtest-all.o gmock_main.o
+	$(AR) $(ARFLAGS) $@ $^
+
+# Builds a sample test.
+
+gmock_test.o : $(USER_DIR)/gmock_test.cc $(GMOCK_HEADERS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/gmock_test.cc
+
+gmock_test : gmock_test.o gmock_main.a
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock.sln b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock.sln
new file mode 100644
index 0000000000..b752f876b3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock.sln
@@ -0,0 +1,32 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcproj", "{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_test", "gmock_test.vcproj", "{F10D22F8-AC7B-4213-8720-608E7D878CD2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_main", "gmock_main.vcproj", "{E4EF614B-30DF-4954-8C53-580A0BF6B589}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.Build.0 = Debug|Win32
+		{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.ActiveCfg = Release|Win32
+		{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.Build.0 = Release|Win32
+		{F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.Build.0 = Debug|Win32
+		{F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.ActiveCfg = Release|Win32
+		{F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.Build.0 = Release|Win32
+		{E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.Build.0 = Debug|Win32
+		{E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.ActiveCfg = Release|Win32
+		{E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock.vcproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock.vcproj
new file mode 100644
index 0000000000..4bbfe98997
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock.vcproj
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gmock"
+	ProjectGUID="{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}"
+	RootNamespace="gmock"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\$(ProjectName)"
+			ConfigurationType="4"
+			InheritedPropertySheets=".\gmock_config.vsprops"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\.."
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\$(ProjectName)"
+			ConfigurationType="4"
+			InheritedPropertySheets=".\gmock_config.vsprops"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\include;..\.."
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\src\gmock-all.cc"
+				>
+			</File>
+			<File
+				RelativePath="$(GTestDir)\src\gtest-all.cc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="$(GTestDir)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="$(GTestDir)"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Public Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Private Header Files"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock_config.vsprops b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock_config.vsprops
new file mode 100644
index 0000000000..875939c183
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock_config.vsprops
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gmock_config"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="&quot;$(GTestDir)/include&quot;"
+	/>
+	<UserMacro
+		Name="GTestDir"
+		Value="../../../googletest"
+	/>
+</VisualStudioPropertySheet>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock_main.vcproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock_main.vcproj
new file mode 100644
index 0000000000..01505a9312
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock_main.vcproj
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gmock_main"
+	ProjectGUID="{E4EF614B-30DF-4954-8C53-580A0BF6B589}"
+	RootNamespace="gmock_main"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\$(ProjectName)"
+			ConfigurationType="4"
+			InheritedPropertySheets=".\gmock_config.vsprops"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\$(ProjectName)"
+			ConfigurationType="4"
+			InheritedPropertySheets=".\gmock_config.vsprops"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}"
+			RelativePathToProject=".\gmock.vcproj"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\src\gmock_main.cc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="../../include"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="../../include"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock_test.vcproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock_test.vcproj
new file mode 100644
index 0000000000..d1e01e71a8
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2005/gmock_test.vcproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gmock_test"
+	ProjectGUID="{F10D22F8-AC7B-4213-8720-608E7D878CD2}"
+	RootNamespace="gmock_test"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gmock_config.vsprops"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/bigobj"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\.."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gmock_config.vsprops"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/bigobj"
+				AdditionalIncludeDirectories="..\..\include;..\.."
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{E4EF614B-30DF-4954-8C53-580A0BF6B589}"
+			RelativePathToProject=".\gmock_main.vcproj"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\test\gmock_all_test.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock.sln b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock.sln
new file mode 100644
index 0000000000..d9496569bb
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock.sln
@@ -0,0 +1,32 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcxproj", "{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_test", "gmock_test.vcxproj", "{F10D22F8-AC7B-4213-8720-608E7D878CD2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_main", "gmock_main.vcxproj", "{E4EF614B-30DF-4954-8C53-580A0BF6B589}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.Build.0 = Debug|Win32
+		{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.ActiveCfg = Release|Win32
+		{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.Build.0 = Release|Win32
+		{F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.Build.0 = Debug|Win32
+		{F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.ActiveCfg = Release|Win32
+		{F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.Build.0 = Release|Win32
+		{E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.Build.0 = Debug|Win32
+		{E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.ActiveCfg = Release|Win32
+		{E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock.vcxproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock.vcxproj
new file mode 100644
index 0000000000..21a85ef6c7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock.vcxproj
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}</ProjectGuid>
+    <RootNamespace>gmock</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gmock_config.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gmock_config.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\gmock-all.cc" />
+    <ClCompile Include="$(GTestDir)\src\gtest-all.cc">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GTestDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GTestDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock_config.props b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock_config.props
new file mode 100644
index 0000000000..441f31cfe6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock_config.props
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <GTestDir>../../../googletest</GTestDir>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(GTestDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="GTestDir">
+      <Value>$(GTestDir)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock_main.vcxproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock_main.vcxproj
new file mode 100644
index 0000000000..27fecd5f8b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock_main.vcxproj
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E4EF614B-30DF-4954-8C53-580A0BF6B589}</ProjectGuid>
+    <RootNamespace>gmock_main</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gmock_config.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gmock_config.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="gmock.vcxproj">
+      <Project>{34681f0d-ce45-415d-b5f2-5c662dfe3bd5}</Project>
+      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\gmock_main.cc">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock_test.vcxproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock_test.vcxproj
new file mode 100644
index 0000000000..265439ec2b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2010/gmock_test.vcxproj
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F10D22F8-AC7B-4213-8720-608E7D878CD2}</ProjectGuid>
+    <RootNamespace>gmock_test</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gmock_config.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gmock_config.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="gmock_main.vcxproj">
+      <Project>{e4ef614b-30df-4954-8c53-580a0bf6b589}</Project>
+      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\test\gmock_all_test.cc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock.sln b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock.sln
new file mode 100644
index 0000000000..c59e07fcb7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock.sln
@@ -0,0 +1,32 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcxproj", "{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_test", "gmock_test.vcxproj", "{F10D22F8-AC7B-4213-8720-608E7D878CD2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_main", "gmock_main.vcxproj", "{E4EF614B-30DF-4954-8C53-580A0BF6B589}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.Build.0 = Debug|Win32
+		{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.ActiveCfg = Release|Win32
+		{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.Build.0 = Release|Win32
+		{F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.Build.0 = Debug|Win32
+		{F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.ActiveCfg = Release|Win32
+		{F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.Build.0 = Release|Win32
+		{E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.Build.0 = Debug|Win32
+		{E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.ActiveCfg = Release|Win32
+		{E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock.vcxproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock.vcxproj
new file mode 100644
index 0000000000..d5ddd09100
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock.vcxproj
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}</ProjectGuid>
+    <RootNamespace>gmock</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gmock_config.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gmock_config.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\gmock-all.cc" />
+    <ClCompile Include="$(GTestDir)\src\gtest-all.cc">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GTestDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GTestDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock_config.props b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock_config.props
new file mode 100644
index 0000000000..77bc95b192
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock_config.props
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <GTestDir>../../../googletest</GTestDir>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(GTestDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="GTestDir">
+      <Value>$(GTestDir)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock_main.vcxproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock_main.vcxproj
new file mode 100644
index 0000000000..76cc68b9a3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock_main.vcxproj
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E4EF614B-30DF-4954-8C53-580A0BF6B589}</ProjectGuid>
+    <RootNamespace>gmock_main</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gmock_config.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gmock_config.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="gmock.vcxproj">
+      <Project>{34681f0d-ce45-415d-b5f2-5c662dfe3bd5}</Project>
+      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\gmock_main.cc">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock_test.vcxproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock_test.vcxproj
new file mode 100644
index 0000000000..76ea5534ad
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/msvc/2015/gmock_test.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F10D22F8-AC7B-4213-8720-608E7D878CD2}</ProjectGuid>
+    <RootNamespace>gmock_test</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gmock_config.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gmock_config.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;$(GTestDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="gmock_main.vcxproj">
+      <Project>{e4ef614b-30df-4954-8c53-580a0bf6b589}</Project>
+      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\test\gmock_all_test.cc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/fuse_gmock_files.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/fuse_gmock_files.py
new file mode 100755
index 0000000000..cb7fdf2f78
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/fuse_gmock_files.py
@@ -0,0 +1,240 @@
+#!/usr/bin/env python
+#
+# Copyright 2009, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""fuse_gmock_files.py v0.1.0
+Fuses Google Mock and Google Test source code into two .h files and a .cc file.
+
+SYNOPSIS
+       fuse_gmock_files.py [GMOCK_ROOT_DIR] OUTPUT_DIR
+
+       Scans GMOCK_ROOT_DIR for Google Mock and Google Test source
+       code, assuming Google Test is in the GMOCK_ROOT_DIR/../googletest
+       directory, and generates three files:
+       OUTPUT_DIR/gtest/gtest.h, OUTPUT_DIR/gmock/gmock.h, and
+       OUTPUT_DIR/gmock-gtest-all.cc.  Then you can build your tests
+       by adding OUTPUT_DIR to the include search path and linking
+       with OUTPUT_DIR/gmock-gtest-all.cc.  These three files contain
+       everything you need to use Google Mock.  Hence you can
+       "install" Google Mock by copying them to wherever you want.
+
+       GMOCK_ROOT_DIR can be omitted and defaults to the parent
+       directory of the directory holding this script.
+
+EXAMPLES
+       ./fuse_gmock_files.py fused_gmock
+       ./fuse_gmock_files.py path/to/unpacked/gmock fused_gmock
+
+This tool is experimental.  In particular, it assumes that there is no
+conditional inclusion of Google Mock or Google Test headers.  Please
+report any problems to googlemock@googlegroups.com.  You can read
+http://code.google.com/p/googlemock/wiki/CookBook for more
+information.
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import re
+import sets
+import sys
+
+# We assume that this file is in the scripts/ directory in the Google
+# Mock root directory.
+DEFAULT_GMOCK_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
+
+# We need to call into googletest/scripts/fuse_gtest_files.py.
+sys.path.append(os.path.join(DEFAULT_GMOCK_ROOT_DIR, '../googletest/scripts'))
+import fuse_gtest_files
+gtest = fuse_gtest_files
+
+# Regex for matching '#include "gmock/..."'.
+INCLUDE_GMOCK_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(gmock/.+)"')
+
+# Where to find the source seed files.
+GMOCK_H_SEED = 'include/gmock/gmock.h'
+GMOCK_ALL_CC_SEED = 'src/gmock-all.cc'
+
+# Where to put the generated files.
+GTEST_H_OUTPUT = 'gtest/gtest.h'
+GMOCK_H_OUTPUT = 'gmock/gmock.h'
+GMOCK_GTEST_ALL_CC_OUTPUT = 'gmock-gtest-all.cc'
+
+
+def GetGTestRootDir(gmock_root):
+  """Returns the root directory of Google Test."""
+
+  return os.path.join(gmock_root, '../googletest')
+
+
+def ValidateGMockRootDir(gmock_root):
+  """Makes sure gmock_root points to a valid gmock root directory.
+
+  The function aborts the program on failure.
+  """
+
+  gtest.ValidateGTestRootDir(GetGTestRootDir(gmock_root))
+  gtest.VerifyFileExists(gmock_root, GMOCK_H_SEED)
+  gtest.VerifyFileExists(gmock_root, GMOCK_ALL_CC_SEED)
+
+
+def ValidateOutputDir(output_dir):
+  """Makes sure output_dir points to a valid output directory.
+
+  The function aborts the program on failure.
+  """
+
+  gtest.VerifyOutputFile(output_dir, gtest.GTEST_H_OUTPUT)
+  gtest.VerifyOutputFile(output_dir, GMOCK_H_OUTPUT)
+  gtest.VerifyOutputFile(output_dir, GMOCK_GTEST_ALL_CC_OUTPUT)
+
+
+def FuseGMockH(gmock_root, output_dir):
+  """Scans folder gmock_root to generate gmock/gmock.h in output_dir."""
+
+  output_file = file(os.path.join(output_dir, GMOCK_H_OUTPUT), 'w')
+  processed_files = sets.Set()  # Holds all gmock headers we've processed.
+
+  def ProcessFile(gmock_header_path):
+    """Processes the given gmock header file."""
+
+    # We don't process the same header twice.
+    if gmock_header_path in processed_files:
+      return
+
+    processed_files.add(gmock_header_path)
+
+    # Reads each line in the given gmock header.
+    for line in file(os.path.join(gmock_root, gmock_header_path), 'r'):
+      m = INCLUDE_GMOCK_FILE_REGEX.match(line)
+      if m:
+        # It's '#include "gmock/..."' - let's process it recursively.
+        ProcessFile('include/' + m.group(1))
+      else:
+        m = gtest.INCLUDE_GTEST_FILE_REGEX.match(line)
+        if m:
+          # It's '#include "gtest/foo.h"'.  We translate it to
+          # "gtest/gtest.h", regardless of what foo is, since all
+          # gtest headers are fused into gtest/gtest.h.
+
+          # There is no need to #include gtest.h twice.
+          if not gtest.GTEST_H_SEED in processed_files:
+            processed_files.add(gtest.GTEST_H_SEED)
+            output_file.write('#include "%s"\n' % (gtest.GTEST_H_OUTPUT,))
+        else:
+          # Otherwise we copy the line unchanged to the output file.
+          output_file.write(line)
+
+  ProcessFile(GMOCK_H_SEED)
+  output_file.close()
+
+
+def FuseGMockAllCcToFile(gmock_root, output_file):
+  """Scans folder gmock_root to fuse gmock-all.cc into output_file."""
+
+  processed_files = sets.Set()
+
+  def ProcessFile(gmock_source_file):
+    """Processes the given gmock source file."""
+
+    # We don't process the same #included file twice.
+    if gmock_source_file in processed_files:
+      return
+
+    processed_files.add(gmock_source_file)
+
+    # Reads each line in the given gmock source file.
+    for line in file(os.path.join(gmock_root, gmock_source_file), 'r'):
+      m = INCLUDE_GMOCK_FILE_REGEX.match(line)
+      if m:
+        # It's '#include "gmock/foo.h"'.  We treat it as '#include
+        # "gmock/gmock.h"', as all other gmock headers are being fused
+        # into gmock.h and cannot be #included directly.
+
+        # There is no need to #include "gmock/gmock.h" more than once.
+        if not GMOCK_H_SEED in processed_files:
+          processed_files.add(GMOCK_H_SEED)
+          output_file.write('#include "%s"\n' % (GMOCK_H_OUTPUT,))
+      else:
+        m = gtest.INCLUDE_GTEST_FILE_REGEX.match(line)
+        if m:
+          # It's '#include "gtest/..."'.
+          # There is no need to #include gtest.h as it has been
+          # #included by gtest-all.cc.
+          pass
+        else:
+          m = gtest.INCLUDE_SRC_FILE_REGEX.match(line)
+          if m:
+            # It's '#include "src/foo"' - let's process it recursively.
+            ProcessFile(m.group(1))
+          else:
+            # Otherwise we copy the line unchanged to the output file.
+            output_file.write(line)
+
+  ProcessFile(GMOCK_ALL_CC_SEED)
+
+
+def FuseGMockGTestAllCc(gmock_root, output_dir):
+  """Scans folder gmock_root to generate gmock-gtest-all.cc in output_dir."""
+
+  output_file = file(os.path.join(output_dir, GMOCK_GTEST_ALL_CC_OUTPUT), 'w')
+  # First, fuse gtest-all.cc into gmock-gtest-all.cc.
+  gtest.FuseGTestAllCcToFile(GetGTestRootDir(gmock_root), output_file)
+  # Next, append fused gmock-all.cc to gmock-gtest-all.cc.
+  FuseGMockAllCcToFile(gmock_root, output_file)
+  output_file.close()
+
+
+def FuseGMock(gmock_root, output_dir):
+  """Fuses gtest.h, gmock.h, and gmock-gtest-all.h."""
+
+  ValidateGMockRootDir(gmock_root)
+  ValidateOutputDir(output_dir)
+
+  gtest.FuseGTestH(GetGTestRootDir(gmock_root), output_dir)
+  FuseGMockH(gmock_root, output_dir)
+  FuseGMockGTestAllCc(gmock_root, output_dir)
+
+
+def main():
+  argc = len(sys.argv)
+  if argc == 2:
+    # fuse_gmock_files.py OUTPUT_DIR
+    FuseGMock(DEFAULT_GMOCK_ROOT_DIR, sys.argv[1])
+  elif argc == 3:
+    # fuse_gmock_files.py GMOCK_ROOT_DIR OUTPUT_DIR
+    FuseGMock(sys.argv[1], sys.argv[2])
+  else:
+    print __doc__
+    sys.exit(1)
+
+
+if __name__ == '__main__':
+  main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/LICENSE b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/LICENSE
new file mode 100644
index 0000000000..87ea063651
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/LICENSE
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [2007] Neal Norwitz
+   Portions Copyright [2007] Google Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/README b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/README
new file mode 100644
index 0000000000..d6f95974b6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/README
@@ -0,0 +1,35 @@
+
+The Google Mock class generator is an application that is part of cppclean.
+For more information about cppclean, see the README.cppclean file or
+visit http://code.google.com/p/cppclean/
+
+cppclean requires Python 2.3.5 or later.  If you don't have Python installed
+on your system, you will also need to install it.  You can download Python
+from:  http://www.python.org/download/releases/
+
+To use the Google Mock class generator, you need to call it
+on the command line passing the header file and class for which you want
+to generate a Google Mock class.
+
+Make sure to install the scripts somewhere in your path.  Then you can
+run the program.
+
+  gmock_gen.py header-file.h [ClassName]...
+
+If no ClassNames are specified, all classes in the file are emitted.
+
+To change the indentation from the default of 2, set INDENT in
+the environment.  For example to use an indent of 4 spaces:
+
+INDENT=4 gmock_gen.py header-file.h ClassName
+
+This version was made from SVN revision 281 in the cppclean repository.
+
+Known Limitations
+-----------------
+Not all code will be generated properly.  For example, when mocking templated
+classes, the template information is lost.  You will need to add the template
+information manually.
+
+Not all permutations of using multiple pointers/references will be rendered
+properly.  These will also have to be fixed manually.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/README.cppclean b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/README.cppclean
new file mode 100644
index 0000000000..65431b6175
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/README.cppclean
@@ -0,0 +1,115 @@
+Goal:
+-----
+  CppClean attempts to find problems in C++ source that slow development
+  in large code bases, for example various forms of unused code.
+  Unused code can be unused functions, methods, data members, types, etc
+  to unnecessary #include directives.  Unnecessary #includes can cause
+  considerable extra compiles increasing the edit-compile-run cycle.
+
+  The project home page is:   http://code.google.com/p/cppclean/
+
+
+Features:
+---------
+ * Find and print C++ language constructs: classes, methods, functions, etc.
+ * Find classes with virtual methods, no virtual destructor, and no bases
+ * Find global/static data that are potential problems when using threads
+ * Unnecessary forward class declarations
+ * Unnecessary function declarations
+ * Undeclared function definitions
+ * (planned) Find unnecessary header files #included
+   - No direct reference to anything in the header
+   - Header is unnecessary if classes were forward declared instead
+ * (planned) Source files that reference headers not directly #included,
+   ie, files that rely on a transitive #include from another header
+ * (planned) Unused members (private, protected, & public) methods and data
+ * (planned) Store AST in a SQL database so relationships can be queried
+
+AST is Abstract Syntax Tree, a representation of parsed source code.
+http://en.wikipedia.org/wiki/Abstract_syntax_tree
+
+
+System Requirements:
+--------------------
+ * Python 2.4 or later (2.3 probably works too)
+ * Works on Windows (untested), Mac OS X, and Unix
+
+
+How to Run:
+-----------
+  For all examples, it is assumed that cppclean resides in a directory called
+  /cppclean.
+
+  To print warnings for classes with virtual methods, no virtual destructor and
+  no base classes:
+
+      /cppclean/run.sh nonvirtual_dtors.py file1.h file2.h file3.cc ...
+
+  To print all the functions defined in header file(s):
+
+      /cppclean/run.sh functions.py file1.h file2.h ...
+
+  All the commands take multiple files on the command line.  Other programs
+  include: find_warnings, headers, methods, and types.  Some other programs
+  are available, but used primarily for debugging.
+
+  run.sh is a simple wrapper that sets PYTHONPATH to /cppclean and then
+  runs the program in /cppclean/cpp/PROGRAM.py.  There is currently
+  no equivalent for Windows.  Contributions for a run.bat file
+  would be greatly appreciated.
+
+
+How to Configure:
+-----------------
+  You can add a siteheaders.py file in /cppclean/cpp to configure where
+  to look for other headers (typically -I options passed to a compiler).
+  Currently two values are supported:  _TRANSITIVE and GetIncludeDirs.
+  _TRANSITIVE should be set to a boolean value (True or False) indicating
+  whether to transitively process all header files.  The default is False.
+
+  GetIncludeDirs is a function that takes a single argument and returns
+  a sequence of directories to include.  This can be a generator or
+  return a static list.
+
+      def GetIncludeDirs(filename):
+          return ['/some/path/with/other/headers']
+
+      # Here is a more complicated example.
+      def GetIncludeDirs(filename):
+          yield '/path1'
+          yield os.path.join('/path2', os.path.dirname(filename))
+          yield '/path3'
+
+
+How to Test:
+------------
+  For all examples, it is assumed that cppclean resides in a directory called
+  /cppclean.  The tests require
+
+  cd /cppclean
+  make test
+  # To generate expected results after a change:
+  make expected
+
+
+Current Status:
+---------------
+  The parser works pretty well for header files, parsing about 99% of Google's
+  header files.  Anything which inspects structure of C++ source files should
+  work reasonably well.  Function bodies are not transformed to an AST,
+  but left as tokens.  Much work is still needed on finding unused header files
+  and storing an AST in a database.
+
+
+Non-goals:
+----------
+ * Parsing all valid C++ source
+ * Handling invalid C++ source gracefully
+ * Compiling to machine code (or anything beyond an AST)
+
+
+Contact:
+--------
+  If you used cppclean, I would love to hear about your experiences
+  cppclean@googlegroups.com.  Even if you don't use cppclean, I'd like to
+  hear from you.  :-)  (You can contact me directly at:  nnorwitz@gmail.com)
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/__init__.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/__init__.py
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/ast.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/ast.py
new file mode 100755
index 0000000000..11cbe9126a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/ast.py
@@ -0,0 +1,1733 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 Neal Norwitz
+# Portions Copyright 2007 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Generate an Abstract Syntax Tree (AST) for C++."""
+
+__author__ = 'nnorwitz@google.com (Neal Norwitz)'
+
+
+# TODO:
+#  * Tokens should never be exported, need to convert to Nodes
+#    (return types, parameters, etc.)
+#  * Handle static class data for templatized classes
+#  * Handle casts (both C++ and C-style)
+#  * Handle conditions and loops (if/else, switch, for, while/do)
+#
+# TODO much, much later:
+#  * Handle #define
+#  * exceptions
+
+
+try:
+    # Python 3.x
+    import builtins
+except ImportError:
+    # Python 2.x
+    import __builtin__ as builtins
+
+import sys
+import traceback
+
+from cpp import keywords
+from cpp import tokenize
+from cpp import utils
+
+
+if not hasattr(builtins, 'reversed'):
+    # Support Python 2.3 and earlier.
+    def reversed(seq):
+        for i in range(len(seq)-1, -1, -1):
+            yield seq[i]
+
+if not hasattr(builtins, 'next'):
+    # Support Python 2.5 and earlier.
+    def next(obj):
+        return obj.next()
+
+
+VISIBILITY_PUBLIC, VISIBILITY_PROTECTED, VISIBILITY_PRIVATE = range(3)
+
+FUNCTION_NONE = 0x00
+FUNCTION_CONST = 0x01
+FUNCTION_VIRTUAL = 0x02
+FUNCTION_PURE_VIRTUAL = 0x04
+FUNCTION_CTOR = 0x08
+FUNCTION_DTOR = 0x10
+FUNCTION_ATTRIBUTE = 0x20
+FUNCTION_UNKNOWN_ANNOTATION = 0x40
+FUNCTION_THROW = 0x80
+FUNCTION_OVERRIDE = 0x100
+
+"""
+These are currently unused.  Should really handle these properly at some point.
+
+TYPE_MODIFIER_INLINE   = 0x010000
+TYPE_MODIFIER_EXTERN   = 0x020000
+TYPE_MODIFIER_STATIC   = 0x040000
+TYPE_MODIFIER_CONST    = 0x080000
+TYPE_MODIFIER_REGISTER = 0x100000
+TYPE_MODIFIER_VOLATILE = 0x200000
+TYPE_MODIFIER_MUTABLE  = 0x400000
+
+TYPE_MODIFIER_MAP = {
+    'inline': TYPE_MODIFIER_INLINE,
+    'extern': TYPE_MODIFIER_EXTERN,
+    'static': TYPE_MODIFIER_STATIC,
+    'const': TYPE_MODIFIER_CONST,
+    'register': TYPE_MODIFIER_REGISTER,
+    'volatile': TYPE_MODIFIER_VOLATILE,
+    'mutable': TYPE_MODIFIER_MUTABLE,
+    }
+"""
+
+_INTERNAL_TOKEN = 'internal'
+_NAMESPACE_POP = 'ns-pop'
+
+
+# TODO(nnorwitz): use this as a singleton for templated_types, etc
+# where we don't want to create a new empty dict each time.  It is also const.
+class _NullDict(object):
+    __contains__ = lambda self: False
+    keys = values = items = iterkeys = itervalues = iteritems = lambda self: ()
+
+
+# TODO(nnorwitz): move AST nodes into a separate module.
+class Node(object):
+    """Base AST node."""
+
+    def __init__(self, start, end):
+        self.start = start
+        self.end = end
+
+    def IsDeclaration(self):
+        """Returns bool if this node is a declaration."""
+        return False
+
+    def IsDefinition(self):
+        """Returns bool if this node is a definition."""
+        return False
+
+    def IsExportable(self):
+        """Returns bool if this node exportable from a header file."""
+        return False
+
+    def Requires(self, node):
+        """Does this AST node require the definition of the node passed in?"""
+        return False
+
+    def XXX__str__(self):
+        return self._StringHelper(self.__class__.__name__, '')
+
+    def _StringHelper(self, name, suffix):
+        if not utils.DEBUG:
+            return '%s(%s)' % (name, suffix)
+        return '%s(%d, %d, %s)' % (name, self.start, self.end, suffix)
+
+    def __repr__(self):
+        return str(self)
+
+
+class Define(Node):
+    def __init__(self, start, end, name, definition):
+        Node.__init__(self, start, end)
+        self.name = name
+        self.definition = definition
+
+    def __str__(self):
+        value = '%s %s' % (self.name, self.definition)
+        return self._StringHelper(self.__class__.__name__, value)
+
+
+class Include(Node):
+    def __init__(self, start, end, filename, system):
+        Node.__init__(self, start, end)
+        self.filename = filename
+        self.system = system
+
+    def __str__(self):
+        fmt = '"%s"'
+        if self.system:
+            fmt = '<%s>'
+        return self._StringHelper(self.__class__.__name__, fmt % self.filename)
+
+
+class Goto(Node):
+    def __init__(self, start, end, label):
+        Node.__init__(self, start, end)
+        self.label = label
+
+    def __str__(self):
+        return self._StringHelper(self.__class__.__name__, str(self.label))
+
+
+class Expr(Node):
+    def __init__(self, start, end, expr):
+        Node.__init__(self, start, end)
+        self.expr = expr
+
+    def Requires(self, node):
+        # TODO(nnorwitz): impl.
+        return False
+
+    def __str__(self):
+        return self._StringHelper(self.__class__.__name__, str(self.expr))
+
+
+class Return(Expr):
+    pass
+
+
+class Delete(Expr):
+    pass
+
+
+class Friend(Expr):
+    def __init__(self, start, end, expr, namespace):
+        Expr.__init__(self, start, end, expr)
+        self.namespace = namespace[:]
+
+
+class Using(Node):
+    def __init__(self, start, end, names):
+        Node.__init__(self, start, end)
+        self.names = names
+
+    def __str__(self):
+        return self._StringHelper(self.__class__.__name__, str(self.names))
+
+
+class Parameter(Node):
+    def __init__(self, start, end, name, parameter_type, default):
+        Node.__init__(self, start, end)
+        self.name = name
+        self.type = parameter_type
+        self.default = default
+
+    def Requires(self, node):
+        # TODO(nnorwitz): handle namespaces, etc.
+        return self.type.name == node.name
+
+    def __str__(self):
+        name = str(self.type)
+        suffix = '%s %s' % (name, self.name)
+        if self.default:
+            suffix += ' = ' + ''.join([d.name for d in self.default])
+        return self._StringHelper(self.__class__.__name__, suffix)
+
+
+class _GenericDeclaration(Node):
+    def __init__(self, start, end, name, namespace):
+        Node.__init__(self, start, end)
+        self.name = name
+        self.namespace = namespace[:]
+
+    def FullName(self):
+        prefix = ''
+        if self.namespace and self.namespace[-1]:
+            prefix = '::'.join(self.namespace) + '::'
+        return prefix + self.name
+
+    def _TypeStringHelper(self, suffix):
+        if self.namespace:
+            names = [n or '<anonymous>' for n in self.namespace]
+            suffix += ' in ' + '::'.join(names)
+        return self._StringHelper(self.__class__.__name__, suffix)
+
+
+# TODO(nnorwitz): merge with Parameter in some way?
+class VariableDeclaration(_GenericDeclaration):
+    def __init__(self, start, end, name, var_type, initial_value, namespace):
+        _GenericDeclaration.__init__(self, start, end, name, namespace)
+        self.type = var_type
+        self.initial_value = initial_value
+
+    def Requires(self, node):
+        # TODO(nnorwitz): handle namespaces, etc.
+        return self.type.name == node.name
+
+    def ToString(self):
+        """Return a string that tries to reconstitute the variable decl."""
+        suffix = '%s %s' % (self.type, self.name)
+        if self.initial_value:
+            suffix += ' = ' + self.initial_value
+        return suffix
+
+    def __str__(self):
+        return self._StringHelper(self.__class__.__name__, self.ToString())
+
+
+class Typedef(_GenericDeclaration):
+    def __init__(self, start, end, name, alias, namespace):
+        _GenericDeclaration.__init__(self, start, end, name, namespace)
+        self.alias = alias
+
+    def IsDefinition(self):
+        return True
+
+    def IsExportable(self):
+        return True
+
+    def Requires(self, node):
+        # TODO(nnorwitz): handle namespaces, etc.
+        name = node.name
+        for token in self.alias:
+            if token is not None and name == token.name:
+                return True
+        return False
+
+    def __str__(self):
+        suffix = '%s, %s' % (self.name, self.alias)
+        return self._TypeStringHelper(suffix)
+
+
+class _NestedType(_GenericDeclaration):
+    def __init__(self, start, end, name, fields, namespace):
+        _GenericDeclaration.__init__(self, start, end, name, namespace)
+        self.fields = fields
+
+    def IsDefinition(self):
+        return True
+
+    def IsExportable(self):
+        return True
+
+    def __str__(self):
+        suffix = '%s, {%s}' % (self.name, self.fields)
+        return self._TypeStringHelper(suffix)
+
+
+class Union(_NestedType):
+    pass
+
+
+class Enum(_NestedType):
+    pass
+
+
+class Class(_GenericDeclaration):
+    def __init__(self, start, end, name, bases, templated_types, body, namespace):
+        _GenericDeclaration.__init__(self, start, end, name, namespace)
+        self.bases = bases
+        self.body = body
+        self.templated_types = templated_types
+
+    def IsDeclaration(self):
+        return self.bases is None and self.body is None
+
+    def IsDefinition(self):
+        return not self.IsDeclaration()
+
+    def IsExportable(self):
+        return not self.IsDeclaration()
+
+    def Requires(self, node):
+        # TODO(nnorwitz): handle namespaces, etc.
+        if self.bases:
+            for token_list in self.bases:
+                # TODO(nnorwitz): bases are tokens, do name comparision.
+                for token in token_list:
+                    if token.name == node.name:
+                        return True
+        # TODO(nnorwitz): search in body too.
+        return False
+
+    def __str__(self):
+        name = self.name
+        if self.templated_types:
+            name += '<%s>' % self.templated_types
+        suffix = '%s, %s, %s' % (name, self.bases, self.body)
+        return self._TypeStringHelper(suffix)
+
+
+class Struct(Class):
+    pass
+
+
+class Function(_GenericDeclaration):
+    def __init__(self, start, end, name, return_type, parameters,
+                 modifiers, templated_types, body, namespace):
+        _GenericDeclaration.__init__(self, start, end, name, namespace)
+        converter = TypeConverter(namespace)
+        self.return_type = converter.CreateReturnType(return_type)
+        self.parameters = converter.ToParameters(parameters)
+        self.modifiers = modifiers
+        self.body = body
+        self.templated_types = templated_types
+
+    def IsDeclaration(self):
+        return self.body is None
+
+    def IsDefinition(self):
+        return self.body is not None
+
+    def IsExportable(self):
+        if self.return_type and 'static' in self.return_type.modifiers:
+            return False
+        return None not in self.namespace
+
+    def Requires(self, node):
+        if self.parameters:
+            # TODO(nnorwitz): parameters are tokens, do name comparision.
+            for p in self.parameters:
+                if p.name == node.name:
+                    return True
+        # TODO(nnorwitz): search in body too.
+        return False
+
+    def __str__(self):
+        # TODO(nnorwitz): add templated_types.
+        suffix = ('%s %s(%s), 0x%02x, %s' %
+                  (self.return_type, self.name, self.parameters,
+                   self.modifiers, self.body))
+        return self._TypeStringHelper(suffix)
+
+
+class Method(Function):
+    def __init__(self, start, end, name, in_class, return_type, parameters,
+                 modifiers, templated_types, body, namespace):
+        Function.__init__(self, start, end, name, return_type, parameters,
+                          modifiers, templated_types, body, namespace)
+        # TODO(nnorwitz): in_class could also be a namespace which can
+        # mess up finding functions properly.
+        self.in_class = in_class
+
+
+class Type(_GenericDeclaration):
+    """Type used for any variable (eg class, primitive, struct, etc)."""
+
+    def __init__(self, start, end, name, templated_types, modifiers,
+                 reference, pointer, array):
+        """
+        Args:
+          name: str name of main type
+          templated_types: [Class (Type?)] template type info between <>
+          modifiers: [str] type modifiers (keywords) eg, const, mutable, etc.
+          reference, pointer, array: bools
+        """
+        _GenericDeclaration.__init__(self, start, end, name, [])
+        self.templated_types = templated_types
+        if not name and modifiers:
+            self.name = modifiers.pop()
+        self.modifiers = modifiers
+        self.reference = reference
+        self.pointer = pointer
+        self.array = array
+
+    def __str__(self):
+        prefix = ''
+        if self.modifiers:
+            prefix = ' '.join(self.modifiers) + ' '
+        name = str(self.name)
+        if self.templated_types:
+            name += '<%s>' % self.templated_types
+        suffix = prefix + name
+        if self.reference:
+            suffix += '&'
+        if self.pointer:
+            suffix += '*'
+        if self.array:
+            suffix += '[]'
+        return self._TypeStringHelper(suffix)
+
+    # By definition, Is* are always False.  A Type can only exist in
+    # some sort of variable declaration, parameter, or return value.
+    def IsDeclaration(self):
+        return False
+
+    def IsDefinition(self):
+        return False
+
+    def IsExportable(self):
+        return False
+
+
+class TypeConverter(object):
+
+    def __init__(self, namespace_stack):
+        self.namespace_stack = namespace_stack
+
+    def _GetTemplateEnd(self, tokens, start):
+        count = 1
+        end = start
+        while 1:
+            token = tokens[end]
+            end += 1
+            if token.name == '<':
+                count += 1
+            elif token.name == '>':
+                count -= 1
+                if count == 0:
+                    break
+        return tokens[start:end-1], end
+
+    def ToType(self, tokens):
+        """Convert [Token,...] to [Class(...), ] useful for base classes.
+        For example, code like class Foo : public Bar<x, y> { ... };
+        the "Bar<x, y>" portion gets converted to an AST.
+
+        Returns:
+          [Class(...), ...]
+        """
+        result = []
+        name_tokens = []
+        reference = pointer = array = False
+
+        def AddType(templated_types):
+            # Partition tokens into name and modifier tokens.
+            names = []
+            modifiers = []
+            for t in name_tokens:
+                if keywords.IsKeyword(t.name):
+                    modifiers.append(t.name)
+                else:
+                    names.append(t.name)
+            name = ''.join(names)
+            if name_tokens:
+                result.append(Type(name_tokens[0].start, name_tokens[-1].end,
+                                   name, templated_types, modifiers,
+                                   reference, pointer, array))
+            del name_tokens[:]
+
+        i = 0
+        end = len(tokens)
+        while i < end:
+            token = tokens[i]
+            if token.name == '<':
+                new_tokens, new_end = self._GetTemplateEnd(tokens, i+1)
+                AddType(self.ToType(new_tokens))
+                # If there is a comma after the template, we need to consume
+                # that here otherwise it becomes part of the name.
+                i = new_end
+                reference = pointer = array = False
+            elif token.name == ',':
+                AddType([])
+                reference = pointer = array = False
+            elif token.name == '*':
+                pointer = True
+            elif token.name == '&':
+                reference = True
+            elif token.name == '[':
+               pointer = True
+            elif token.name == ']':
+                pass
+            else:
+                name_tokens.append(token)
+            i += 1
+
+        if name_tokens:
+            # No '<' in the tokens, just a simple name and no template.
+            AddType([])
+        return result
+
+    def DeclarationToParts(self, parts, needs_name_removed):
+        name = None
+        default = []
+        if needs_name_removed:
+            # Handle default (initial) values properly.
+            for i, t in enumerate(parts):
+                if t.name == '=':
+                    default = parts[i+1:]
+                    name = parts[i-1].name
+                    if name == ']' and parts[i-2].name == '[':
+                        name = parts[i-3].name
+                        i -= 1
+                    parts = parts[:i-1]
+                    break
+            else:
+                if parts[-1].token_type == tokenize.NAME:
+                    name = parts.pop().name
+                else:
+                    # TODO(nnorwitz): this is a hack that happens for code like
+                    # Register(Foo<T>); where it thinks this is a function call
+                    # but it's actually a declaration.
+                    name = '???'
+        modifiers = []
+        type_name = []
+        other_tokens = []
+        templated_types = []
+        i = 0
+        end = len(parts)
+        while i < end:
+            p = parts[i]
+            if keywords.IsKeyword(p.name):
+                modifiers.append(p.name)
+            elif p.name == '<':
+                templated_tokens, new_end = self._GetTemplateEnd(parts, i+1)
+                templated_types = self.ToType(templated_tokens)
+                i = new_end - 1
+                # Don't add a spurious :: to data members being initialized.
+                next_index = i + 1
+                if next_index < end and parts[next_index].name == '::':
+                    i += 1
+            elif p.name in ('[', ']', '='):
+                # These are handled elsewhere.
+                other_tokens.append(p)
+            elif p.name not in ('*', '&', '>'):
+                # Ensure that names have a space between them.
+                if (type_name and type_name[-1].token_type == tokenize.NAME and
+                    p.token_type == tokenize.NAME):
+                    type_name.append(tokenize.Token(tokenize.SYNTAX, ' ', 0, 0))
+                type_name.append(p)
+            else:
+                other_tokens.append(p)
+            i += 1
+        type_name = ''.join([t.name for t in type_name])
+        return name, type_name, templated_types, modifiers, default, other_tokens
+
+    def ToParameters(self, tokens):
+        if not tokens:
+            return []
+
+        result = []
+        name = type_name = ''
+        type_modifiers = []
+        pointer = reference = array = False
+        first_token = None
+        default = []
+
+        def AddParameter(end):
+            if default:
+                del default[0]  # Remove flag.
+            parts = self.DeclarationToParts(type_modifiers, True)
+            (name, type_name, templated_types, modifiers,
+             unused_default, unused_other_tokens) = parts
+            parameter_type = Type(first_token.start, first_token.end,
+                                  type_name, templated_types, modifiers,
+                                  reference, pointer, array)
+            p = Parameter(first_token.start, end, name,
+                          parameter_type, default)
+            result.append(p)
+
+        template_count = 0
+        for s in tokens:
+            if not first_token:
+                first_token = s
+            if s.name == '<':
+                template_count += 1
+            elif s.name == '>':
+                template_count -= 1
+            if template_count > 0:
+                type_modifiers.append(s)
+                continue
+
+            if s.name == ',':
+                AddParameter(s.start)
+                name = type_name = ''
+                type_modifiers = []
+                pointer = reference = array = False
+                first_token = None
+                default = []
+            elif s.name == '*':
+                pointer = True
+            elif s.name == '&':
+                reference = True
+            elif s.name == '[':
+                array = True
+            elif s.name == ']':
+                pass  # Just don't add to type_modifiers.
+            elif s.name == '=':
+                # Got a default value.  Add any value (None) as a flag.
+                default.append(None)
+            elif default:
+                default.append(s)
+            else:
+                type_modifiers.append(s)
+        AddParameter(tokens[-1].end)
+        return result
+
+    def CreateReturnType(self, return_type_seq):
+        if not return_type_seq:
+            return None
+        start = return_type_seq[0].start
+        end = return_type_seq[-1].end
+        _, name, templated_types, modifiers, default, other_tokens = \
+           self.DeclarationToParts(return_type_seq, False)
+        names = [n.name for n in other_tokens]
+        reference = '&' in names
+        pointer = '*' in names
+        array = '[' in names
+        return Type(start, end, name, templated_types, modifiers,
+                    reference, pointer, array)
+
+    def GetTemplateIndices(self, names):
+        # names is a list of strings.
+        start = names.index('<')
+        end = len(names) - 1
+        while end > 0:
+            if names[end] == '>':
+                break
+            end -= 1
+        return start, end+1
+
+class AstBuilder(object):
+    def __init__(self, token_stream, filename, in_class='', visibility=None,
+                 namespace_stack=[]):
+        self.tokens = token_stream
+        self.filename = filename
+        # TODO(nnorwitz): use a better data structure (deque) for the queue.
+        # Switching directions of the "queue" improved perf by about 25%.
+        # Using a deque should be even better since we access from both sides.
+        self.token_queue = []
+        self.namespace_stack = namespace_stack[:]
+        self.in_class = in_class
+        if in_class is None:
+            self.in_class_name_only = None
+        else:
+            self.in_class_name_only = in_class.split('::')[-1]
+        self.visibility = visibility
+        self.in_function = False
+        self.current_token = None
+        # Keep the state whether we are currently handling a typedef or not.
+        self._handling_typedef = False
+
+        self.converter = TypeConverter(self.namespace_stack)
+
+    def HandleError(self, msg, token):
+        printable_queue = list(reversed(self.token_queue[-20:]))
+        sys.stderr.write('Got %s in %s @ %s %s\n' %
+                         (msg, self.filename, token, printable_queue))
+
+    def Generate(self):
+        while 1:
+            token = self._GetNextToken()
+            if not token:
+                break
+
+            # Get the next token.
+            self.current_token = token
+
+            # Dispatch on the next token type.
+            if token.token_type == _INTERNAL_TOKEN:
+                if token.name == _NAMESPACE_POP:
+                    self.namespace_stack.pop()
+                continue
+
+            try:
+                result = self._GenerateOne(token)
+                if result is not None:
+                    yield result
+            except:
+                self.HandleError('exception', token)
+                raise
+
+    def _CreateVariable(self, pos_token, name, type_name, type_modifiers,
+                        ref_pointer_name_seq, templated_types, value=None):
+        reference = '&' in ref_pointer_name_seq
+        pointer = '*' in ref_pointer_name_seq
+        array = '[' in ref_pointer_name_seq
+        var_type = Type(pos_token.start, pos_token.end, type_name,
+                        templated_types, type_modifiers,
+                        reference, pointer, array)
+        return VariableDeclaration(pos_token.start, pos_token.end,
+                                   name, var_type, value, self.namespace_stack)
+
+    def _GenerateOne(self, token):
+        if token.token_type == tokenize.NAME:
+            if (keywords.IsKeyword(token.name) and
+                not keywords.IsBuiltinType(token.name)):
+                method = getattr(self, 'handle_' + token.name)
+                return method()
+            elif token.name == self.in_class_name_only:
+                # The token name is the same as the class, must be a ctor if
+                # there is a paren.  Otherwise, it's the return type.
+                # Peek ahead to get the next token to figure out which.
+                next = self._GetNextToken()
+                self._AddBackToken(next)
+                if next.token_type == tokenize.SYNTAX and next.name == '(':
+                    return self._GetMethod([token], FUNCTION_CTOR, None, True)
+                # Fall through--handle like any other method.
+
+            # Handle data or function declaration/definition.
+            syntax = tokenize.SYNTAX
+            temp_tokens, last_token = \
+                self._GetVarTokensUpTo(syntax, '(', ';', '{', '[')
+            temp_tokens.insert(0, token)
+            if last_token.name == '(':
+                # If there is an assignment before the paren,
+                # this is an expression, not a method.
+                expr = bool([e for e in temp_tokens if e.name == '='])
+                if expr:
+                    new_temp = self._GetTokensUpTo(tokenize.SYNTAX, ';')
+                    temp_tokens.append(last_token)
+                    temp_tokens.extend(new_temp)
+                    last_token = tokenize.Token(tokenize.SYNTAX, ';', 0, 0)
+
+            if last_token.name == '[':
+                # Handle array, this isn't a method, unless it's an operator.
+                # TODO(nnorwitz): keep the size somewhere.
+                # unused_size = self._GetTokensUpTo(tokenize.SYNTAX, ']')
+                temp_tokens.append(last_token)
+                if temp_tokens[-2].name == 'operator':
+                    temp_tokens.append(self._GetNextToken())
+                else:
+                    temp_tokens2, last_token = \
+                        self._GetVarTokensUpTo(tokenize.SYNTAX, ';')
+                    temp_tokens.extend(temp_tokens2)
+
+            if last_token.name == ';':
+                # Handle data, this isn't a method.
+                parts = self.converter.DeclarationToParts(temp_tokens, True)
+                (name, type_name, templated_types, modifiers, default,
+                 unused_other_tokens) = parts
+
+                t0 = temp_tokens[0]
+                names = [t.name for t in temp_tokens]
+                if templated_types:
+                    start, end = self.converter.GetTemplateIndices(names)
+                    names = names[:start] + names[end:]
+                default = ''.join([t.name for t in default])
+                return self._CreateVariable(t0, name, type_name, modifiers,
+                                            names, templated_types, default)
+            if last_token.name == '{':
+                self._AddBackTokens(temp_tokens[1:])
+                self._AddBackToken(last_token)
+                method_name = temp_tokens[0].name
+                method = getattr(self, 'handle_' + method_name, None)
+                if not method:
+                    # Must be declaring a variable.
+                    # TODO(nnorwitz): handle the declaration.
+                    return None
+                return method()
+            return self._GetMethod(temp_tokens, 0, None, False)
+        elif token.token_type == tokenize.SYNTAX:
+            if token.name == '~' and self.in_class:
+                # Must be a dtor (probably not in method body).
+                token = self._GetNextToken()
+                # self.in_class can contain A::Name, but the dtor will only
+                # be Name.  Make sure to compare against the right value.
+                if (token.token_type == tokenize.NAME and
+                    token.name == self.in_class_name_only):
+                    return self._GetMethod([token], FUNCTION_DTOR, None, True)
+            # TODO(nnorwitz): handle a lot more syntax.
+        elif token.token_type == tokenize.PREPROCESSOR:
+            # TODO(nnorwitz): handle more preprocessor directives.
+            # token starts with a #, so remove it and strip whitespace.
+            name = token.name[1:].lstrip()
+            if name.startswith('include'):
+                # Remove "include".
+                name = name[7:].strip()
+                assert name
+                # Handle #include \<newline> "header-on-second-line.h".
+                if name.startswith('\\'):
+                    name = name[1:].strip()
+                assert name[0] in '<"', token
+                assert name[-1] in '>"', token
+                system = name[0] == '<'
+                filename = name[1:-1]
+                return Include(token.start, token.end, filename, system)
+            if name.startswith('define'):
+                # Remove "define".
+                name = name[6:].strip()
+                assert name
+                value = ''
+                for i, c in enumerate(name):
+                    if c.isspace():
+                        value = name[i:].lstrip()
+                        name = name[:i]
+                        break
+                return Define(token.start, token.end, name, value)
+            if name.startswith('if') and name[2:3].isspace():
+                condition = name[3:].strip()
+                if condition.startswith('0') or condition.startswith('(0)'):
+                    self._SkipIf0Blocks()
+        return None
+
+    def _GetTokensUpTo(self, expected_token_type, expected_token):
+        return self._GetVarTokensUpTo(expected_token_type, expected_token)[0]
+
+    def _GetVarTokensUpTo(self, expected_token_type, *expected_tokens):
+        last_token = self._GetNextToken()
+        tokens = []
+        while (last_token.token_type != expected_token_type or
+               last_token.name not in expected_tokens):
+            tokens.append(last_token)
+            last_token = self._GetNextToken()
+        return tokens, last_token
+
+    # TODO(nnorwitz): remove _IgnoreUpTo() it shouldn't be necesary.
+    def _IgnoreUpTo(self, token_type, token):
+        unused_tokens = self._GetTokensUpTo(token_type, token)
+
+    def _SkipIf0Blocks(self):
+        count = 1
+        while 1:
+            token = self._GetNextToken()
+            if token.token_type != tokenize.PREPROCESSOR:
+                continue
+
+            name = token.name[1:].lstrip()
+            if name.startswith('endif'):
+                count -= 1
+                if count == 0:
+                    break
+            elif name.startswith('if'):
+                count += 1
+
+    def _GetMatchingChar(self, open_paren, close_paren, GetNextToken=None):
+        if GetNextToken is None:
+            GetNextToken = self._GetNextToken
+        # Assumes the current token is open_paren and we will consume
+        # and return up to the close_paren.
+        count = 1
+        token = GetNextToken()
+        while 1:
+            if token.token_type == tokenize.SYNTAX:
+                if token.name == open_paren:
+                    count += 1
+                elif token.name == close_paren:
+                    count -= 1
+                    if count == 0:
+                        break
+            yield token
+            token = GetNextToken()
+        yield token
+
+    def _GetParameters(self):
+        return self._GetMatchingChar('(', ')')
+
+    def GetScope(self):
+        return self._GetMatchingChar('{', '}')
+
+    def _GetNextToken(self):
+        if self.token_queue:
+            return self.token_queue.pop()
+        return next(self.tokens)
+
+    def _AddBackToken(self, token):
+        if token.whence == tokenize.WHENCE_STREAM:
+            token.whence = tokenize.WHENCE_QUEUE
+            self.token_queue.insert(0, token)
+        else:
+            assert token.whence == tokenize.WHENCE_QUEUE, token
+            self.token_queue.append(token)
+
+    def _AddBackTokens(self, tokens):
+        if tokens:
+            if tokens[-1].whence == tokenize.WHENCE_STREAM:
+                for token in tokens:
+                    token.whence = tokenize.WHENCE_QUEUE
+                self.token_queue[:0] = reversed(tokens)
+            else:
+                assert tokens[-1].whence == tokenize.WHENCE_QUEUE, tokens
+                self.token_queue.extend(reversed(tokens))
+
+    def GetName(self, seq=None):
+        """Returns ([tokens], next_token_info)."""
+        GetNextToken = self._GetNextToken
+        if seq is not None:
+            it = iter(seq)
+            GetNextToken = lambda: next(it)
+        next_token = GetNextToken()
+        tokens = []
+        last_token_was_name = False
+        while (next_token.token_type == tokenize.NAME or
+               (next_token.token_type == tokenize.SYNTAX and
+                next_token.name in ('::', '<'))):
+            # Two NAMEs in a row means the identifier should terminate.
+            # It's probably some sort of variable declaration.
+            if last_token_was_name and next_token.token_type == tokenize.NAME:
+                break
+            last_token_was_name = next_token.token_type == tokenize.NAME
+            tokens.append(next_token)
+            # Handle templated names.
+            if next_token.name == '<':
+                tokens.extend(self._GetMatchingChar('<', '>', GetNextToken))
+                last_token_was_name = True
+            next_token = GetNextToken()
+        return tokens, next_token
+
+    def GetMethod(self, modifiers, templated_types):
+        return_type_and_name = self._GetTokensUpTo(tokenize.SYNTAX, '(')
+        assert len(return_type_and_name) >= 1
+        return self._GetMethod(return_type_and_name, modifiers, templated_types,
+                               False)
+
+    def _GetMethod(self, return_type_and_name, modifiers, templated_types,
+                   get_paren):
+        template_portion = None
+        if get_paren:
+            token = self._GetNextToken()
+            assert token.token_type == tokenize.SYNTAX, token
+            if token.name == '<':
+                # Handle templatized dtors.
+                template_portion = [token]
+                template_portion.extend(self._GetMatchingChar('<', '>'))
+                token = self._GetNextToken()
+            assert token.token_type == tokenize.SYNTAX, token
+            assert token.name == '(', token
+
+        name = return_type_and_name.pop()
+        # Handle templatized ctors.
+        if name.name == '>':
+            index = 1
+            while return_type_and_name[index].name != '<':
+                index += 1
+            template_portion = return_type_and_name[index:] + [name]
+            del return_type_and_name[index:]
+            name = return_type_and_name.pop()
+        elif name.name == ']':
+            rt = return_type_and_name
+            assert rt[-1].name == '[', return_type_and_name
+            assert rt[-2].name == 'operator', return_type_and_name
+            name_seq = return_type_and_name[-2:]
+            del return_type_and_name[-2:]
+            name = tokenize.Token(tokenize.NAME, 'operator[]',
+                                  name_seq[0].start, name.end)
+            # Get the open paren so _GetParameters() below works.
+            unused_open_paren = self._GetNextToken()
+
+        # TODO(nnorwitz): store template_portion.
+        return_type = return_type_and_name
+        indices = name
+        if return_type:
+            indices = return_type[0]
+
+        # Force ctor for templatized ctors.
+        if name.name == self.in_class and not modifiers:
+            modifiers |= FUNCTION_CTOR
+        parameters = list(self._GetParameters())
+        del parameters[-1]              # Remove trailing ')'.
+
+        # Handling operator() is especially weird.
+        if name.name == 'operator' and not parameters:
+            token = self._GetNextToken()
+            assert token.name == '(', token
+            parameters = list(self._GetParameters())
+            del parameters[-1]          # Remove trailing ')'.
+
+        token = self._GetNextToken()
+        while token.token_type == tokenize.NAME:
+            modifier_token = token
+            token = self._GetNextToken()
+            if modifier_token.name == 'const':
+                modifiers |= FUNCTION_CONST
+            elif modifier_token.name == '__attribute__':
+                # TODO(nnorwitz): handle more __attribute__ details.
+                modifiers |= FUNCTION_ATTRIBUTE
+                assert token.name == '(', token
+                # Consume everything between the (parens).
+                unused_tokens = list(self._GetMatchingChar('(', ')'))
+                token = self._GetNextToken()
+            elif modifier_token.name == 'throw':
+                modifiers |= FUNCTION_THROW
+                assert token.name == '(', token
+                # Consume everything between the (parens).
+                unused_tokens = list(self._GetMatchingChar('(', ')'))
+                token = self._GetNextToken()
+            elif modifier_token.name == 'override':
+                modifiers |= FUNCTION_OVERRIDE
+            elif modifier_token.name == modifier_token.name.upper():
+                # HACK(nnorwitz):  assume that all upper-case names
+                # are some macro we aren't expanding.
+                modifiers |= FUNCTION_UNKNOWN_ANNOTATION
+            else:
+                self.HandleError('unexpected token', modifier_token)
+
+        assert token.token_type == tokenize.SYNTAX, token
+        # Handle ctor initializers.
+        if token.name == ':':
+            # TODO(nnorwitz): anything else to handle for initializer list?
+            while token.name != ';' and token.name != '{':
+                token = self._GetNextToken()
+
+        # Handle pointer to functions that are really data but look
+        # like method declarations.
+        if token.name == '(':
+            if parameters[0].name == '*':
+                # name contains the return type.
+                name = parameters.pop()
+                # parameters contains the name of the data.
+                modifiers = [p.name for p in parameters]
+                # Already at the ( to open the parameter list.
+                function_parameters = list(self._GetMatchingChar('(', ')'))
+                del function_parameters[-1]  # Remove trailing ')'.
+                # TODO(nnorwitz): store the function_parameters.
+                token = self._GetNextToken()
+                assert token.token_type == tokenize.SYNTAX, token
+                assert token.name == ';', token
+                return self._CreateVariable(indices, name.name, indices.name,
+                                            modifiers, '', None)
+            # At this point, we got something like:
+            #  return_type (type::*name_)(params);
+            # This is a data member called name_ that is a function pointer.
+            # With this code: void (sq_type::*field_)(string&);
+            # We get: name=void return_type=[] parameters=sq_type ... field_
+            # TODO(nnorwitz): is return_type always empty?
+            # TODO(nnorwitz): this isn't even close to being correct.
+            # Just put in something so we don't crash and can move on.
+            real_name = parameters[-1]
+            modifiers = [p.name for p in self._GetParameters()]
+            del modifiers[-1]           # Remove trailing ')'.
+            return self._CreateVariable(indices, real_name.name, indices.name,
+                                        modifiers, '', None)
+
+        if token.name == '{':
+            body = list(self.GetScope())
+            del body[-1]                # Remove trailing '}'.
+        else:
+            body = None
+            if token.name == '=':
+                token = self._GetNextToken()
+
+                if token.name == 'default' or token.name == 'delete':
+                    # Ignore explicitly defaulted and deleted special members
+                    # in C++11.
+                    token = self._GetNextToken()
+                else:
+                    # Handle pure-virtual declarations.
+                    assert token.token_type == tokenize.CONSTANT, token
+                    assert token.name == '0', token
+                    modifiers |= FUNCTION_PURE_VIRTUAL
+                    token = self._GetNextToken()
+
+            if token.name == '[':
+                # TODO(nnorwitz): store tokens and improve parsing.
+                # template <typename T, size_t N> char (&ASH(T (&seq)[N]))[N];
+                tokens = list(self._GetMatchingChar('[', ']'))
+                token = self._GetNextToken()
+
+            assert token.name == ';', (token, return_type_and_name, parameters)
+
+        # Looks like we got a method, not a function.
+        if len(return_type) > 2 and return_type[-1].name == '::':
+            return_type, in_class = \
+                         self._GetReturnTypeAndClassName(return_type)
+            return Method(indices.start, indices.end, name.name, in_class,
+                          return_type, parameters, modifiers, templated_types,
+                          body, self.namespace_stack)
+        return Function(indices.start, indices.end, name.name, return_type,
+                        parameters, modifiers, templated_types, body,
+                        self.namespace_stack)
+
+    def _GetReturnTypeAndClassName(self, token_seq):
+        # Splitting the return type from the class name in a method
+        # can be tricky.  For example, Return::Type::Is::Hard::To::Find().
+        # Where is the return type and where is the class name?
+        # The heuristic used is to pull the last name as the class name.
+        # This includes all the templated type info.
+        # TODO(nnorwitz): if there is only One name like in the
+        # example above, punt and assume the last bit is the class name.
+
+        # Ignore a :: prefix, if exists so we can find the first real name.
+        i = 0
+        if token_seq[0].name == '::':
+            i = 1
+        # Ignore a :: suffix, if exists.
+        end = len(token_seq) - 1
+        if token_seq[end-1].name == '::':
+            end -= 1
+
+        # Make a copy of the sequence so we can append a sentinel
+        # value. This is required for GetName will has to have some
+        # terminating condition beyond the last name.
+        seq_copy = token_seq[i:end]
+        seq_copy.append(tokenize.Token(tokenize.SYNTAX, '', 0, 0))
+        names = []
+        while i < end:
+            # Iterate through the sequence parsing out each name.
+            new_name, next = self.GetName(seq_copy[i:])
+            assert new_name, 'Got empty new_name, next=%s' % next
+            # We got a pointer or ref.  Add it to the name.
+            if next and next.token_type == tokenize.SYNTAX:
+                new_name.append(next)
+            names.append(new_name)
+            i += len(new_name)
+
+        # Now that we have the names, it's time to undo what we did.
+
+        # Remove the sentinel value.
+        names[-1].pop()
+        # Flatten the token sequence for the return type.
+        return_type = [e for seq in names[:-1] for e in seq]
+        # The class name is the last name.
+        class_name = names[-1]
+        return return_type, class_name
+
+    def handle_bool(self):
+        pass
+
+    def handle_char(self):
+        pass
+
+    def handle_int(self):
+        pass
+
+    def handle_long(self):
+        pass
+
+    def handle_short(self):
+        pass
+
+    def handle_double(self):
+        pass
+
+    def handle_float(self):
+        pass
+
+    def handle_void(self):
+        pass
+
+    def handle_wchar_t(self):
+        pass
+
+    def handle_unsigned(self):
+        pass
+
+    def handle_signed(self):
+        pass
+
+    def _GetNestedType(self, ctor):
+        name = None
+        name_tokens, token = self.GetName()
+        if name_tokens:
+            name = ''.join([t.name for t in name_tokens])
+
+        # Handle forward declarations.
+        if token.token_type == tokenize.SYNTAX and token.name == ';':
+            return ctor(token.start, token.end, name, None,
+                        self.namespace_stack)
+
+        if token.token_type == tokenize.NAME and self._handling_typedef:
+            self._AddBackToken(token)
+            return ctor(token.start, token.end, name, None,
+                        self.namespace_stack)
+
+        # Must be the type declaration.
+        fields = list(self._GetMatchingChar('{', '}'))
+        del fields[-1]                  # Remove trailing '}'.
+        if token.token_type == tokenize.SYNTAX and token.name == '{':
+            next = self._GetNextToken()
+            new_type = ctor(token.start, token.end, name, fields,
+                            self.namespace_stack)
+            # A name means this is an anonymous type and the name
+            # is the variable declaration.
+            if next.token_type != tokenize.NAME:
+                return new_type
+            name = new_type
+            token = next
+
+        # Must be variable declaration using the type prefixed with keyword.
+        assert token.token_type == tokenize.NAME, token
+        return self._CreateVariable(token, token.name, name, [], '', None)
+
+    def handle_struct(self):
+        # Special case the handling typedef/aliasing of structs here.
+        # It would be a pain to handle in the class code.
+        name_tokens, var_token = self.GetName()
+        if name_tokens:
+            next_token = self._GetNextToken()
+            is_syntax = (var_token.token_type == tokenize.SYNTAX and
+                         var_token.name[0] in '*&')
+            is_variable = (var_token.token_type == tokenize.NAME and
+                           next_token.name == ';')
+            variable = var_token
+            if is_syntax and not is_variable:
+                variable = next_token
+                temp = self._GetNextToken()
+                if temp.token_type == tokenize.SYNTAX and temp.name == '(':
+                    # Handle methods declared to return a struct.
+                    t0 = name_tokens[0]
+                    struct = tokenize.Token(tokenize.NAME, 'struct',
+                                            t0.start-7, t0.start-2)
+                    type_and_name = [struct]
+                    type_and_name.extend(name_tokens)
+                    type_and_name.extend((var_token, next_token))
+                    return self._GetMethod(type_and_name, 0, None, False)
+                assert temp.name == ';', (temp, name_tokens, var_token)
+            if is_syntax or (is_variable and not self._handling_typedef):
+                modifiers = ['struct']
+                type_name = ''.join([t.name for t in name_tokens])
+                position = name_tokens[0]
+                return self._CreateVariable(position, variable.name, type_name,
+                                            modifiers, var_token.name, None)
+            name_tokens.extend((var_token, next_token))
+            self._AddBackTokens(name_tokens)
+        else:
+            self._AddBackToken(var_token)
+        return self._GetClass(Struct, VISIBILITY_PUBLIC, None)
+
+    def handle_union(self):
+        return self._GetNestedType(Union)
+
+    def handle_enum(self):
+        return self._GetNestedType(Enum)
+
+    def handle_auto(self):
+        # TODO(nnorwitz): warn about using auto?  Probably not since it
+        # will be reclaimed and useful for C++0x.
+        pass
+
+    def handle_register(self):
+        pass
+
+    def handle_const(self):
+        pass
+
+    def handle_inline(self):
+        pass
+
+    def handle_extern(self):
+        pass
+
+    def handle_static(self):
+        pass
+
+    def handle_virtual(self):
+        # What follows must be a method.
+        token = token2 = self._GetNextToken()
+        if token.name == 'inline':
+            # HACK(nnorwitz): handle inline dtors by ignoring 'inline'.
+            token2 = self._GetNextToken()
+        if token2.token_type == tokenize.SYNTAX and token2.name == '~':
+            return self.GetMethod(FUNCTION_VIRTUAL + FUNCTION_DTOR, None)
+        assert token.token_type == tokenize.NAME or token.name == '::', token
+        return_type_and_name = self._GetTokensUpTo(tokenize.SYNTAX, '(')  # )
+        return_type_and_name.insert(0, token)
+        if token2 is not token:
+            return_type_and_name.insert(1, token2)
+        return self._GetMethod(return_type_and_name, FUNCTION_VIRTUAL,
+                               None, False)
+
+    def handle_volatile(self):
+        pass
+
+    def handle_mutable(self):
+        pass
+
+    def handle_public(self):
+        assert self.in_class
+        self.visibility = VISIBILITY_PUBLIC
+
+    def handle_protected(self):
+        assert self.in_class
+        self.visibility = VISIBILITY_PROTECTED
+
+    def handle_private(self):
+        assert self.in_class
+        self.visibility = VISIBILITY_PRIVATE
+
+    def handle_friend(self):
+        tokens = self._GetTokensUpTo(tokenize.SYNTAX, ';')
+        assert tokens
+        t0 = tokens[0]
+        return Friend(t0.start, t0.end, tokens, self.namespace_stack)
+
+    def handle_static_cast(self):
+        pass
+
+    def handle_const_cast(self):
+        pass
+
+    def handle_dynamic_cast(self):
+        pass
+
+    def handle_reinterpret_cast(self):
+        pass
+
+    def handle_new(self):
+        pass
+
+    def handle_delete(self):
+        tokens = self._GetTokensUpTo(tokenize.SYNTAX, ';')
+        assert tokens
+        return Delete(tokens[0].start, tokens[0].end, tokens)
+
+    def handle_typedef(self):
+        token = self._GetNextToken()
+        if (token.token_type == tokenize.NAME and
+            keywords.IsKeyword(token.name)):
+            # Token must be struct/enum/union/class.
+            method = getattr(self, 'handle_' + token.name)
+            self._handling_typedef = True
+            tokens = [method()]
+            self._handling_typedef = False
+        else:
+            tokens = [token]
+
+        # Get the remainder of the typedef up to the semi-colon.
+        tokens.extend(self._GetTokensUpTo(tokenize.SYNTAX, ';'))
+
+        # TODO(nnorwitz): clean all this up.
+        assert tokens
+        name = tokens.pop()
+        indices = name
+        if tokens:
+            indices = tokens[0]
+        if not indices:
+            indices = token
+        if name.name == ')':
+            # HACK(nnorwitz): Handle pointers to functions "properly".
+            if (len(tokens) >= 4 and
+                tokens[1].name == '(' and tokens[2].name == '*'):
+                tokens.append(name)
+                name = tokens[3]
+        elif name.name == ']':
+            # HACK(nnorwitz): Handle arrays properly.
+            if len(tokens) >= 2:
+                tokens.append(name)
+                name = tokens[1]
+        new_type = tokens
+        if tokens and isinstance(tokens[0], tokenize.Token):
+            new_type = self.converter.ToType(tokens)[0]
+        return Typedef(indices.start, indices.end, name.name,
+                       new_type, self.namespace_stack)
+
+    def handle_typeid(self):
+        pass  # Not needed yet.
+
+    def handle_typename(self):
+        pass  # Not needed yet.
+
+    def _GetTemplatedTypes(self):
+        result = {}
+        tokens = list(self._GetMatchingChar('<', '>'))
+        len_tokens = len(tokens) - 1    # Ignore trailing '>'.
+        i = 0
+        while i < len_tokens:
+            key = tokens[i].name
+            i += 1
+            if keywords.IsKeyword(key) or key == ',':
+                continue
+            type_name = default = None
+            if i < len_tokens:
+                i += 1
+                if tokens[i-1].name == '=':
+                    assert i < len_tokens, '%s %s' % (i, tokens)
+                    default, unused_next_token = self.GetName(tokens[i:])
+                    i += len(default)
+                else:
+                    if tokens[i-1].name != ',':
+                        # We got something like: Type variable.
+                        # Re-adjust the key (variable) and type_name (Type).
+                        key = tokens[i-1].name
+                        type_name = tokens[i-2]
+
+            result[key] = (type_name, default)
+        return result
+
+    def handle_template(self):
+        token = self._GetNextToken()
+        assert token.token_type == tokenize.SYNTAX, token
+        assert token.name == '<', token
+        templated_types = self._GetTemplatedTypes()
+        # TODO(nnorwitz): for now, just ignore the template params.
+        token = self._GetNextToken()
+        if token.token_type == tokenize.NAME:
+            if token.name == 'class':
+                return self._GetClass(Class, VISIBILITY_PRIVATE, templated_types)
+            elif token.name == 'struct':
+                return self._GetClass(Struct, VISIBILITY_PUBLIC, templated_types)
+            elif token.name == 'friend':
+                return self.handle_friend()
+        self._AddBackToken(token)
+        tokens, last = self._GetVarTokensUpTo(tokenize.SYNTAX, '(', ';')
+        tokens.append(last)
+        self._AddBackTokens(tokens)
+        if last.name == '(':
+            return self.GetMethod(FUNCTION_NONE, templated_types)
+        # Must be a variable definition.
+        return None
+
+    def handle_true(self):
+        pass  # Nothing to do.
+
+    def handle_false(self):
+        pass  # Nothing to do.
+
+    def handle_asm(self):
+        pass  # Not needed yet.
+
+    def handle_class(self):
+        return self._GetClass(Class, VISIBILITY_PRIVATE, None)
+
+    def _GetBases(self):
+        # Get base classes.
+        bases = []
+        while 1:
+            token = self._GetNextToken()
+            assert token.token_type == tokenize.NAME, token
+            # TODO(nnorwitz): store kind of inheritance...maybe.
+            if token.name not in ('public', 'protected', 'private'):
+                # If inheritance type is not specified, it is private.
+                # Just put the token back so we can form a name.
+                # TODO(nnorwitz): it would be good to warn about this.
+                self._AddBackToken(token)
+            else:
+                # Check for virtual inheritance.
+                token = self._GetNextToken()
+                if token.name != 'virtual':
+                    self._AddBackToken(token)
+                else:
+                    # TODO(nnorwitz): store that we got virtual for this base.
+                    pass
+            base, next_token = self.GetName()
+            bases_ast = self.converter.ToType(base)
+            assert len(bases_ast) == 1, bases_ast
+            bases.append(bases_ast[0])
+            assert next_token.token_type == tokenize.SYNTAX, next_token
+            if next_token.name == '{':
+                token = next_token
+                break
+            # Support multiple inheritance.
+            assert next_token.name == ',', next_token
+        return bases, token
+
+    def _GetClass(self, class_type, visibility, templated_types):
+        class_name = None
+        class_token = self._GetNextToken()
+        if class_token.token_type != tokenize.NAME:
+            assert class_token.token_type == tokenize.SYNTAX, class_token
+            token = class_token
+        else:
+            # Skip any macro (e.g. storage class specifiers) after the
+            # 'class' keyword.
+            next_token = self._GetNextToken()
+            if next_token.token_type == tokenize.NAME:
+                self._AddBackToken(next_token)
+            else:
+                self._AddBackTokens([class_token, next_token])
+            name_tokens, token = self.GetName()
+            class_name = ''.join([t.name for t in name_tokens])
+        bases = None
+        if token.token_type == tokenize.SYNTAX:
+            if token.name == ';':
+                # Forward declaration.
+                return class_type(class_token.start, class_token.end,
+                                  class_name, None, templated_types, None,
+                                  self.namespace_stack)
+            if token.name in '*&':
+                # Inline forward declaration.  Could be method or data.
+                name_token = self._GetNextToken()
+                next_token = self._GetNextToken()
+                if next_token.name == ';':
+                    # Handle data
+                    modifiers = ['class']
+                    return self._CreateVariable(class_token, name_token.name,
+                                                class_name,
+                                                modifiers, token.name, None)
+                else:
+                    # Assume this is a method.
+                    tokens = (class_token, token, name_token, next_token)
+                    self._AddBackTokens(tokens)
+                    return self.GetMethod(FUNCTION_NONE, None)
+            if token.name == ':':
+                bases, token = self._GetBases()
+
+        body = None
+        if token.token_type == tokenize.SYNTAX and token.name == '{':
+            assert token.token_type == tokenize.SYNTAX, token
+            assert token.name == '{', token
+
+            ast = AstBuilder(self.GetScope(), self.filename, class_name,
+                             visibility, self.namespace_stack)
+            body = list(ast.Generate())
+
+            if not self._handling_typedef:
+                token = self._GetNextToken()
+                if token.token_type != tokenize.NAME:
+                    assert token.token_type == tokenize.SYNTAX, token
+                    assert token.name == ';', token
+                else:
+                    new_class = class_type(class_token.start, class_token.end,
+                                           class_name, bases, None,
+                                           body, self.namespace_stack)
+
+                    modifiers = []
+                    return self._CreateVariable(class_token,
+                                                token.name, new_class,
+                                                modifiers, token.name, None)
+        else:
+            if not self._handling_typedef:
+                self.HandleError('non-typedef token', token)
+            self._AddBackToken(token)
+
+        return class_type(class_token.start, class_token.end, class_name,
+                          bases, templated_types, body, self.namespace_stack)
+
+    def handle_namespace(self):
+        token = self._GetNextToken()
+        # Support anonymous namespaces.
+        name = None
+        if token.token_type == tokenize.NAME:
+            name = token.name
+            token = self._GetNextToken()
+        self.namespace_stack.append(name)
+        assert token.token_type == tokenize.SYNTAX, token
+        # Create an internal token that denotes when the namespace is complete.
+        internal_token = tokenize.Token(_INTERNAL_TOKEN, _NAMESPACE_POP,
+                                        None, None)
+        internal_token.whence = token.whence
+        if token.name == '=':
+            # TODO(nnorwitz): handle aliasing namespaces.
+            name, next_token = self.GetName()
+            assert next_token.name == ';', next_token
+            self._AddBackToken(internal_token)
+        else:
+            assert token.name == '{', token
+            tokens = list(self.GetScope())
+            # Replace the trailing } with the internal namespace pop token.
+            tokens[-1] = internal_token
+            # Handle namespace with nothing in it.
+            self._AddBackTokens(tokens)
+        return None
+
+    def handle_using(self):
+        tokens = self._GetTokensUpTo(tokenize.SYNTAX, ';')
+        assert tokens
+        return Using(tokens[0].start, tokens[0].end, tokens)
+
+    def handle_explicit(self):
+        assert self.in_class
+        # Nothing much to do.
+        # TODO(nnorwitz): maybe verify the method name == class name.
+        # This must be a ctor.
+        return self.GetMethod(FUNCTION_CTOR, None)
+
+    def handle_this(self):
+        pass  # Nothing to do.
+
+    def handle_operator(self):
+        # Pull off the next token(s?) and make that part of the method name.
+        pass
+
+    def handle_sizeof(self):
+        pass
+
+    def handle_case(self):
+        pass
+
+    def handle_switch(self):
+        pass
+
+    def handle_default(self):
+        token = self._GetNextToken()
+        assert token.token_type == tokenize.SYNTAX
+        assert token.name == ':'
+
+    def handle_if(self):
+        pass
+
+    def handle_else(self):
+        pass
+
+    def handle_return(self):
+        tokens = self._GetTokensUpTo(tokenize.SYNTAX, ';')
+        if not tokens:
+            return Return(self.current_token.start, self.current_token.end, None)
+        return Return(tokens[0].start, tokens[0].end, tokens)
+
+    def handle_goto(self):
+        tokens = self._GetTokensUpTo(tokenize.SYNTAX, ';')
+        assert len(tokens) == 1, str(tokens)
+        return Goto(tokens[0].start, tokens[0].end, tokens[0].name)
+
+    def handle_try(self):
+        pass  # Not needed yet.
+
+    def handle_catch(self):
+        pass  # Not needed yet.
+
+    def handle_throw(self):
+        pass  # Not needed yet.
+
+    def handle_while(self):
+        pass
+
+    def handle_do(self):
+        pass
+
+    def handle_for(self):
+        pass
+
+    def handle_break(self):
+        self._IgnoreUpTo(tokenize.SYNTAX, ';')
+
+    def handle_continue(self):
+        self._IgnoreUpTo(tokenize.SYNTAX, ';')
+
+
+def BuilderFromSource(source, filename):
+    """Utility method that returns an AstBuilder from source code.
+
+    Args:
+      source: 'C++ source code'
+      filename: 'file1'
+
+    Returns:
+      AstBuilder
+    """
+    return AstBuilder(tokenize.GetTokens(source), filename)
+
+
+def PrintIndentifiers(filename, should_print):
+    """Prints all identifiers for a C++ source file.
+
+    Args:
+      filename: 'file1'
+      should_print: predicate with signature: bool Function(token)
+    """
+    source = utils.ReadFile(filename, False)
+    if source is None:
+        sys.stderr.write('Unable to find: %s\n' % filename)
+        return
+
+    #print('Processing %s' % actual_filename)
+    builder = BuilderFromSource(source, filename)
+    try:
+        for node in builder.Generate():
+            if should_print(node):
+                print(node.name)
+    except KeyboardInterrupt:
+        return
+    except:
+        pass
+
+
+def PrintAllIndentifiers(filenames, should_print):
+    """Prints all identifiers for each C++ source file in filenames.
+
+    Args:
+      filenames: ['file1', 'file2', ...]
+      should_print: predicate with signature: bool Function(token)
+    """
+    for path in filenames:
+        PrintIndentifiers(path, should_print)
+
+
+def main(argv):
+    for filename in argv[1:]:
+        source = utils.ReadFile(filename)
+        if source is None:
+            continue
+
+        print('Processing %s' % filename)
+        builder = BuilderFromSource(source, filename)
+        try:
+            entire_ast = filter(None, builder.Generate())
+        except KeyboardInterrupt:
+            return
+        except:
+            # Already printed a warning, print the traceback and continue.
+            traceback.print_exc()
+        else:
+            if utils.DEBUG:
+                for ast in entire_ast:
+                    print(ast)
+
+
+if __name__ == '__main__':
+    main(sys.argv)
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/gmock_class.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/gmock_class.py
new file mode 100755
index 0000000000..f9966cbb4b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/gmock_class.py
@@ -0,0 +1,227 @@
+#!/usr/bin/env python
+#
+# Copyright 2008 Google Inc.  All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Generate Google Mock classes from base classes.
+
+This program will read in a C++ source file and output the Google Mock
+classes for the specified classes.  If no class is specified, all
+classes in the source file are emitted.
+
+Usage:
+  gmock_class.py header-file.h [ClassName]...
+
+Output is sent to stdout.
+"""
+
+__author__ = 'nnorwitz@google.com (Neal Norwitz)'
+
+
+import os
+import re
+import sys
+
+from cpp import ast
+from cpp import utils
+
+# Preserve compatibility with Python 2.3.
+try:
+  _dummy = set
+except NameError:
+  import sets
+  set = sets.Set
+
+_VERSION = (1, 0, 1)  # The version of this script.
+# How many spaces to indent.  Can set me with the INDENT environment variable.
+_INDENT = 2
+
+
+def _GenerateMethods(output_lines, source, class_node):
+  function_type = (ast.FUNCTION_VIRTUAL | ast.FUNCTION_PURE_VIRTUAL |
+                   ast.FUNCTION_OVERRIDE)
+  ctor_or_dtor = ast.FUNCTION_CTOR | ast.FUNCTION_DTOR
+  indent = ' ' * _INDENT
+
+  for node in class_node.body:
+    # We only care about virtual functions.
+    if (isinstance(node, ast.Function) and
+        node.modifiers & function_type and
+        not node.modifiers & ctor_or_dtor):
+      # Pick out all the elements we need from the original function.
+      const = ''
+      if node.modifiers & ast.FUNCTION_CONST:
+        const = 'CONST_'
+      return_type = 'void'
+      if node.return_type:
+        # Add modifiers like 'const'.
+        modifiers = ''
+        if node.return_type.modifiers:
+          modifiers = ' '.join(node.return_type.modifiers) + ' '
+        return_type = modifiers + node.return_type.name
+        template_args = [arg.name for arg in node.return_type.templated_types]
+        if template_args:
+          return_type += '<' + ', '.join(template_args) + '>'
+          if len(template_args) > 1:
+            for line in [
+                '// The following line won\'t really compile, as the return',
+                '// type has multiple template arguments.  To fix it, use a',
+                '// typedef for the return type.']:
+              output_lines.append(indent + line)
+        if node.return_type.pointer:
+          return_type += '*'
+        if node.return_type.reference:
+          return_type += '&'
+        num_parameters = len(node.parameters)
+        if len(node.parameters) == 1:
+          first_param = node.parameters[0]
+          if source[first_param.start:first_param.end].strip() == 'void':
+            # We must treat T(void) as a function with no parameters.
+            num_parameters = 0
+      tmpl = ''
+      if class_node.templated_types:
+        tmpl = '_T'
+      mock_method_macro = 'MOCK_%sMETHOD%d%s' % (const, num_parameters, tmpl)
+
+      args = ''
+      if node.parameters:
+        # Due to the parser limitations, it is impossible to keep comments
+        # while stripping the default parameters.  When defaults are
+        # present, we choose to strip them and comments (and produce
+        # compilable code).
+        # TODO(nnorwitz@google.com): Investigate whether it is possible to
+        # preserve parameter name when reconstructing parameter text from
+        # the AST.
+        if len([param for param in node.parameters if param.default]) > 0:
+          args = ', '.join(param.type.name for param in node.parameters)
+        else:
+          # Get the full text of the parameters from the start
+          # of the first parameter to the end of the last parameter.
+          start = node.parameters[0].start
+          end = node.parameters[-1].end
+          # Remove // comments.
+          args_strings = re.sub(r'//.*', '', source[start:end])
+          # Condense multiple spaces and eliminate newlines putting the
+          # parameters together on a single line.  Ensure there is a
+          # space in an argument which is split by a newline without
+          # intervening whitespace, e.g.: int\nBar
+          args = re.sub('  +', ' ', args_strings.replace('\n', ' '))
+
+      # Create the mock method definition.
+      output_lines.extend(['%s%s(%s,' % (indent, mock_method_macro, node.name),
+                           '%s%s(%s));' % (indent*3, return_type, args)])
+
+
+def _GenerateMocks(filename, source, ast_list, desired_class_names):
+  processed_class_names = set()
+  lines = []
+  for node in ast_list:
+    if (isinstance(node, ast.Class) and node.body and
+        # desired_class_names being None means that all classes are selected.
+        (not desired_class_names or node.name in desired_class_names)):
+      class_name = node.name
+      parent_name = class_name
+      processed_class_names.add(class_name)
+      class_node = node
+      # Add namespace before the class.
+      if class_node.namespace:
+        lines.extend(['namespace %s {' % n for n in class_node.namespace])  # }
+        lines.append('')
+
+      # Add template args for templated classes.
+      if class_node.templated_types:
+        # TODO(paulchang): The AST doesn't preserve template argument order,
+        # so we have to make up names here.
+        # TODO(paulchang): Handle non-type template arguments (e.g.
+        # template<typename T, int N>).
+        template_arg_count = len(class_node.templated_types.keys())
+        template_args = ['T%d' % n for n in range(template_arg_count)]
+        template_decls = ['typename ' + arg for arg in template_args]
+        lines.append('template <' + ', '.join(template_decls) + '>')
+        parent_name += '<' + ', '.join(template_args) + '>'
+
+      # Add the class prolog.
+      lines.append('class Mock%s : public %s {'  # }
+                   % (class_name, parent_name))
+      lines.append('%spublic:' % (' ' * (_INDENT // 2)))
+
+      # Add all the methods.
+      _GenerateMethods(lines, source, class_node)
+
+      # Close the class.
+      if lines:
+        # If there are no virtual methods, no need for a public label.
+        if len(lines) == 2:
+          del lines[-1]
+
+        # Only close the class if there really is a class.
+        lines.append('};')
+        lines.append('')  # Add an extra newline.
+
+      # Close the namespace.
+      if class_node.namespace:
+        for i in range(len(class_node.namespace)-1, -1, -1):
+          lines.append('}  // namespace %s' % class_node.namespace[i])
+        lines.append('')  # Add an extra newline.
+
+  if desired_class_names:
+    missing_class_name_list = list(desired_class_names - processed_class_names)
+    if missing_class_name_list:
+      missing_class_name_list.sort()
+      sys.stderr.write('Class(es) not found in %s: %s\n' %
+                       (filename, ', '.join(missing_class_name_list)))
+  elif not processed_class_names:
+    sys.stderr.write('No class found in %s\n' % filename)
+
+  return lines
+
+
+def main(argv=sys.argv):
+  if len(argv) < 2:
+    sys.stderr.write('Google Mock Class Generator v%s\n\n' %
+                     '.'.join(map(str, _VERSION)))
+    sys.stderr.write(__doc__)
+    return 1
+
+  global _INDENT
+  try:
+    _INDENT = int(os.environ['INDENT'])
+  except KeyError:
+    pass
+  except:
+    sys.stderr.write('Unable to use indent of %s\n' % os.environ.get('INDENT'))
+
+  filename = argv[1]
+  desired_class_names = None  # None means all classes in the source file.
+  if len(argv) >= 3:
+    desired_class_names = set(argv[2:])
+  source = utils.ReadFile(filename)
+  if source is None:
+    return 1
+
+  builder = ast.BuilderFromSource(source, filename)
+  try:
+    entire_ast = filter(None, builder.Generate())
+  except KeyboardInterrupt:
+    return
+  except:
+    # An error message was already printed since we couldn't parse.
+    sys.exit(1)
+  else:
+    lines = _GenerateMocks(filename, source, entire_ast, desired_class_names)
+    sys.stdout.write('\n'.join(lines))
+
+
+if __name__ == '__main__':
+  main(sys.argv)
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/gmock_class_test.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/gmock_class_test.py
new file mode 100755
index 0000000000..018f90a650
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/gmock_class_test.py
@@ -0,0 +1,448 @@
+#!/usr/bin/env python
+#
+# Copyright 2009 Neal Norwitz All Rights Reserved.
+# Portions Copyright 2009 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Tests for gmock.scripts.generator.cpp.gmock_class."""
+
+__author__ = 'nnorwitz@google.com (Neal Norwitz)'
+
+
+import os
+import sys
+import unittest
+
+# Allow the cpp imports below to work when run as a standalone script.
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+
+from cpp import ast
+from cpp import gmock_class
+
+
+class TestCase(unittest.TestCase):
+  """Helper class that adds assert methods."""
+
+  def StripLeadingWhitespace(self, lines):
+    """Strip leading whitespace in each line in 'lines'."""
+    return '\n'.join([s.lstrip() for s in lines.split('\n')])
+
+  def assertEqualIgnoreLeadingWhitespace(self, expected_lines, lines):
+    """Specialized assert that ignores the indent level."""
+    self.assertEqual(expected_lines, self.StripLeadingWhitespace(lines))
+
+
+class GenerateMethodsTest(TestCase):
+
+  def GenerateMethodSource(self, cpp_source):
+    """Convert C++ source to Google Mock output source lines."""
+    method_source_lines = []
+    # <test> is a pseudo-filename, it is not read or written.
+    builder = ast.BuilderFromSource(cpp_source, '<test>')
+    ast_list = list(builder.Generate())
+    gmock_class._GenerateMethods(method_source_lines, cpp_source, ast_list[0])
+    return '\n'.join(method_source_lines)
+
+  def testSimpleMethod(self):
+    source = """
+class Foo {
+ public:
+  virtual int Bar();
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD0(Bar,\nint());',
+        self.GenerateMethodSource(source))
+
+  def testSimpleConstructorsAndDestructor(self):
+    source = """
+class Foo {
+ public:
+  Foo();
+  Foo(int x);
+  Foo(const Foo& f);
+  Foo(Foo&& f);
+  ~Foo();
+  virtual int Bar() = 0;
+};
+"""
+    # The constructors and destructor should be ignored.
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD0(Bar,\nint());',
+        self.GenerateMethodSource(source))
+
+  def testVirtualDestructor(self):
+    source = """
+class Foo {
+ public:
+  virtual ~Foo();
+  virtual int Bar() = 0;
+};
+"""
+    # The destructor should be ignored.
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD0(Bar,\nint());',
+        self.GenerateMethodSource(source))
+
+  def testExplicitlyDefaultedConstructorsAndDestructor(self):
+    source = """
+class Foo {
+ public:
+  Foo() = default;
+  Foo(const Foo& f) = default;
+  Foo(Foo&& f) = default;
+  ~Foo() = default;
+  virtual int Bar() = 0;
+};
+"""
+    # The constructors and destructor should be ignored.
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD0(Bar,\nint());',
+        self.GenerateMethodSource(source))
+
+  def testExplicitlyDeletedConstructorsAndDestructor(self):
+    source = """
+class Foo {
+ public:
+  Foo() = delete;
+  Foo(const Foo& f) = delete;
+  Foo(Foo&& f) = delete;
+  ~Foo() = delete;
+  virtual int Bar() = 0;
+};
+"""
+    # The constructors and destructor should be ignored.
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD0(Bar,\nint());',
+        self.GenerateMethodSource(source))
+
+  def testSimpleOverrideMethod(self):
+    source = """
+class Foo {
+ public:
+  int Bar() override;
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD0(Bar,\nint());',
+        self.GenerateMethodSource(source))
+
+  def testSimpleConstMethod(self):
+    source = """
+class Foo {
+ public:
+  virtual void Bar(bool flag) const;
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_CONST_METHOD1(Bar,\nvoid(bool flag));',
+        self.GenerateMethodSource(source))
+
+  def testExplicitVoid(self):
+    source = """
+class Foo {
+ public:
+  virtual int Bar(void);
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD0(Bar,\nint(void));',
+        self.GenerateMethodSource(source))
+
+  def testStrangeNewlineInParameter(self):
+    source = """
+class Foo {
+ public:
+  virtual void Bar(int
+a) = 0;
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD1(Bar,\nvoid(int a));',
+        self.GenerateMethodSource(source))
+
+  def testDefaultParameters(self):
+    source = """
+class Foo {
+ public:
+  virtual void Bar(int a, char c = 'x') = 0;
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD2(Bar,\nvoid(int, char));',
+        self.GenerateMethodSource(source))
+
+  def testMultipleDefaultParameters(self):
+    source = """
+class Foo {
+ public:
+  virtual void Bar(int a = 42, char c = 'x') = 0;
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD2(Bar,\nvoid(int, char));',
+        self.GenerateMethodSource(source))
+
+  def testRemovesCommentsWhenDefaultsArePresent(self):
+    source = """
+class Foo {
+ public:
+  virtual void Bar(int a = 42 /* a comment */,
+                   char /* other comment */ c= 'x') = 0;
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD2(Bar,\nvoid(int, char));',
+        self.GenerateMethodSource(source))
+
+  def testDoubleSlashCommentsInParameterListAreRemoved(self):
+    source = """
+class Foo {
+ public:
+  virtual void Bar(int a,  // inline comments should be elided.
+                   int b   // inline comments should be elided.
+                   ) const = 0;
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_CONST_METHOD2(Bar,\nvoid(int a, int b));',
+        self.GenerateMethodSource(source))
+
+  def testCStyleCommentsInParameterListAreNotRemoved(self):
+    # NOTE(nnorwitz): I'm not sure if it's the best behavior to keep these
+    # comments.  Also note that C style comments after the last parameter
+    # are still elided.
+    source = """
+class Foo {
+ public:
+  virtual const string& Bar(int /* keeper */, int b);
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD2(Bar,\nconst string&(int /* keeper */, int b));',
+        self.GenerateMethodSource(source))
+
+  def testArgsOfTemplateTypes(self):
+    source = """
+class Foo {
+ public:
+  virtual int Bar(const vector<int>& v, map<int, string>* output);
+};"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD2(Bar,\n'
+        'int(const vector<int>& v, map<int, string>* output));',
+        self.GenerateMethodSource(source))
+
+  def testReturnTypeWithOneTemplateArg(self):
+    source = """
+class Foo {
+ public:
+  virtual vector<int>* Bar(int n);
+};"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD1(Bar,\nvector<int>*(int n));',
+        self.GenerateMethodSource(source))
+
+  def testReturnTypeWithManyTemplateArgs(self):
+    source = """
+class Foo {
+ public:
+  virtual map<int, string> Bar();
+};"""
+    # Comparing the comment text is brittle - we'll think of something
+    # better in case this gets annoying, but for now let's keep it simple.
+    self.assertEqualIgnoreLeadingWhitespace(
+        '// The following line won\'t really compile, as the return\n'
+        '// type has multiple template arguments.  To fix it, use a\n'
+        '// typedef for the return type.\n'
+        'MOCK_METHOD0(Bar,\nmap<int, string>());',
+        self.GenerateMethodSource(source))
+
+  def testSimpleMethodInTemplatedClass(self):
+    source = """
+template<class T>
+class Foo {
+ public:
+  virtual int Bar();
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD0_T(Bar,\nint());',
+        self.GenerateMethodSource(source))
+
+  def testPointerArgWithoutNames(self):
+    source = """
+class Foo {
+  virtual int Bar(C*);
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD1(Bar,\nint(C*));',
+        self.GenerateMethodSource(source))
+
+  def testReferenceArgWithoutNames(self):
+    source = """
+class Foo {
+  virtual int Bar(C&);
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD1(Bar,\nint(C&));',
+        self.GenerateMethodSource(source))
+
+  def testArrayArgWithoutNames(self):
+    source = """
+class Foo {
+  virtual int Bar(C[]);
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        'MOCK_METHOD1(Bar,\nint(C[]));',
+        self.GenerateMethodSource(source))
+
+
+class GenerateMocksTest(TestCase):
+
+  def GenerateMocks(self, cpp_source):
+    """Convert C++ source to complete Google Mock output source."""
+    # <test> is a pseudo-filename, it is not read or written.
+    filename = '<test>'
+    builder = ast.BuilderFromSource(cpp_source, filename)
+    ast_list = list(builder.Generate())
+    lines = gmock_class._GenerateMocks(filename, cpp_source, ast_list, None)
+    return '\n'.join(lines)
+
+  def testNamespaces(self):
+    source = """
+namespace Foo {
+namespace Bar { class Forward; }
+namespace Baz {
+
+class Test {
+ public:
+  virtual void Foo();
+};
+
+}  // namespace Baz
+}  // namespace Foo
+"""
+    expected = """\
+namespace Foo {
+namespace Baz {
+
+class MockTest : public Test {
+public:
+MOCK_METHOD0(Foo,
+void());
+};
+
+}  // namespace Baz
+}  // namespace Foo
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        expected, self.GenerateMocks(source))
+
+  def testClassWithStorageSpecifierMacro(self):
+    source = """
+class STORAGE_SPECIFIER Test {
+ public:
+  virtual void Foo();
+};
+"""
+    expected = """\
+class MockTest : public Test {
+public:
+MOCK_METHOD0(Foo,
+void());
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        expected, self.GenerateMocks(source))
+
+  def testTemplatedForwardDeclaration(self):
+    source = """
+template <class T> class Forward;  // Forward declaration should be ignored.
+class Test {
+ public:
+  virtual void Foo();
+};
+"""
+    expected = """\
+class MockTest : public Test {
+public:
+MOCK_METHOD0(Foo,
+void());
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        expected, self.GenerateMocks(source))
+
+  def testTemplatedClass(self):
+    source = """
+template <typename S, typename T>
+class Test {
+ public:
+  virtual void Foo();
+};
+"""
+    expected = """\
+template <typename T0, typename T1>
+class MockTest : public Test<T0, T1> {
+public:
+MOCK_METHOD0_T(Foo,
+void());
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        expected, self.GenerateMocks(source))
+
+  def testTemplateInATemplateTypedef(self):
+    source = """
+class Test {
+ public:
+  typedef std::vector<std::list<int>> FooType;
+  virtual void Bar(const FooType& test_arg);
+};
+"""
+    expected = """\
+class MockTest : public Test {
+public:
+MOCK_METHOD1(Bar,
+void(const FooType& test_arg));
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        expected, self.GenerateMocks(source))
+
+  def testTemplateInATemplateTypedefWithComma(self):
+    source = """
+class Test {
+ public:
+  typedef std::function<void(
+      const vector<std::list<int>>&, int> FooType;
+  virtual void Bar(const FooType& test_arg);
+};
+"""
+    expected = """\
+class MockTest : public Test {
+public:
+MOCK_METHOD1(Bar,
+void(const FooType& test_arg));
+};
+"""
+    self.assertEqualIgnoreLeadingWhitespace(
+        expected, self.GenerateMocks(source))
+
+if __name__ == '__main__':
+  unittest.main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/keywords.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/keywords.py
new file mode 100755
index 0000000000..f694450e37
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/keywords.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 Neal Norwitz
+# Portions Copyright 2007 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""C++ keywords and helper utilities for determining keywords."""
+
+__author__ = 'nnorwitz@google.com (Neal Norwitz)'
+
+
+try:
+    # Python 3.x
+    import builtins
+except ImportError:
+    # Python 2.x
+    import __builtin__ as builtins
+
+
+if not hasattr(builtins, 'set'):
+    # Nominal support for Python 2.3.
+    from sets import Set as set
+
+
+TYPES = set('bool char int long short double float void wchar_t unsigned signed'.split())
+TYPE_MODIFIERS = set('auto register const inline extern static virtual volatile mutable'.split())
+ACCESS = set('public protected private friend'.split())
+
+CASTS = set('static_cast const_cast dynamic_cast reinterpret_cast'.split())
+
+OTHERS = set('true false asm class namespace using explicit this operator sizeof'.split())
+OTHER_TYPES = set('new delete typedef struct union enum typeid typename template'.split())
+
+CONTROL = set('case switch default if else return goto'.split())
+EXCEPTION = set('try catch throw'.split())
+LOOP = set('while do for break continue'.split())
+
+ALL = TYPES | TYPE_MODIFIERS | ACCESS | CASTS | OTHERS | OTHER_TYPES | CONTROL | EXCEPTION | LOOP
+
+
+def IsKeyword(token):
+    return token in ALL
+
+def IsBuiltinType(token):
+    if token in ('virtual', 'inline'):
+        # These only apply to methods, they can't be types by themselves.
+        return False
+    return token in TYPES or token in TYPE_MODIFIERS
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/tokenize.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/tokenize.py
new file mode 100755
index 0000000000..359d5562d7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/tokenize.py
@@ -0,0 +1,287 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 Neal Norwitz
+# Portions Copyright 2007 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Tokenize C++ source code."""
+
+__author__ = 'nnorwitz@google.com (Neal Norwitz)'
+
+
+try:
+    # Python 3.x
+    import builtins
+except ImportError:
+    # Python 2.x
+    import __builtin__ as builtins
+
+
+import sys
+
+from cpp import utils
+
+
+if not hasattr(builtins, 'set'):
+    # Nominal support for Python 2.3.
+    from sets import Set as set
+
+
+# Add $ as a valid identifier char since so much code uses it.
+_letters = 'abcdefghijklmnopqrstuvwxyz'
+VALID_IDENTIFIER_CHARS = set(_letters + _letters.upper() + '_0123456789$')
+HEX_DIGITS = set('0123456789abcdefABCDEF')
+INT_OR_FLOAT_DIGITS = set('01234567890eE-+')
+
+
+# C++0x string preffixes.
+_STR_PREFIXES = set(('R', 'u8', 'u8R', 'u', 'uR', 'U', 'UR', 'L', 'LR'))
+
+
+# Token types.
+UNKNOWN = 'UNKNOWN'
+SYNTAX = 'SYNTAX'
+CONSTANT = 'CONSTANT'
+NAME = 'NAME'
+PREPROCESSOR = 'PREPROCESSOR'
+
+# Where the token originated from.  This can be used for backtracking.
+# It is always set to WHENCE_STREAM in this code.
+WHENCE_STREAM, WHENCE_QUEUE = range(2)
+
+
+class Token(object):
+    """Data container to represent a C++ token.
+
+    Tokens can be identifiers, syntax char(s), constants, or
+    pre-processor directives.
+
+    start contains the index of the first char of the token in the source
+    end contains the index of the last char of the token in the source
+    """
+
+    def __init__(self, token_type, name, start, end):
+        self.token_type = token_type
+        self.name = name
+        self.start = start
+        self.end = end
+        self.whence = WHENCE_STREAM
+
+    def __str__(self):
+        if not utils.DEBUG:
+            return 'Token(%r)' % self.name
+        return 'Token(%r, %s, %s)' % (self.name, self.start, self.end)
+
+    __repr__ = __str__
+
+
+def _GetString(source, start, i):
+    i = source.find('"', i+1)
+    while source[i-1] == '\\':
+        # Count the trailing backslashes.
+        backslash_count = 1
+        j = i - 2
+        while source[j] == '\\':
+            backslash_count += 1
+            j -= 1
+        # When trailing backslashes are even, they escape each other.
+        if (backslash_count % 2) == 0:
+            break
+        i = source.find('"', i+1)
+    return i + 1
+
+
+def _GetChar(source, start, i):
+    # NOTE(nnorwitz): may not be quite correct, should be good enough.
+    i = source.find("'", i+1)
+    while source[i-1] == '\\':
+        # Need to special case '\\'.
+        if (i - 2) > start and source[i-2] == '\\':
+            break
+        i = source.find("'", i+1)
+    # Try to handle unterminated single quotes (in a #if 0 block).
+    if i < 0:
+        i = start
+    return i + 1
+
+
+def GetTokens(source):
+    """Returns a sequence of Tokens.
+
+    Args:
+      source: string of C++ source code.
+
+    Yields:
+      Token that represents the next token in the source.
+    """
+    # Cache various valid character sets for speed.
+    valid_identifier_chars = VALID_IDENTIFIER_CHARS
+    hex_digits = HEX_DIGITS
+    int_or_float_digits = INT_OR_FLOAT_DIGITS
+    int_or_float_digits2 = int_or_float_digits | set('.')
+
+    # Only ignore errors while in a #if 0 block.
+    ignore_errors = False
+    count_ifs = 0
+
+    i = 0
+    end = len(source)
+    while i < end:
+        # Skip whitespace.
+        while i < end and source[i].isspace():
+            i += 1
+        if i >= end:
+            return
+
+        token_type = UNKNOWN
+        start = i
+        c = source[i]
+        if c.isalpha() or c == '_':              # Find a string token.
+            token_type = NAME
+            while source[i] in valid_identifier_chars:
+                i += 1
+            # String and character constants can look like a name if
+            # they are something like L"".
+            if (source[i] == "'" and (i - start) == 1 and
+                source[start:i] in 'uUL'):
+                # u, U, and L are valid C++0x character preffixes.
+                token_type = CONSTANT
+                i = _GetChar(source, start, i)
+            elif source[i] == "'" and source[start:i] in _STR_PREFIXES:
+                token_type = CONSTANT
+                i = _GetString(source, start, i)
+        elif c == '/' and source[i+1] == '/':    # Find // comments.
+            i = source.find('\n', i)
+            if i == -1:  # Handle EOF.
+                i = end
+            continue
+        elif c == '/' and source[i+1] == '*':    # Find /* comments. */
+            i = source.find('*/', i) + 2
+            continue
+        elif c in ':+-<>&|*=':                   # : or :: (plus other chars).
+            token_type = SYNTAX
+            i += 1
+            new_ch = source[i]
+            if new_ch == c and c != '>':         # Treat ">>" as two tokens.
+                i += 1
+            elif c == '-' and new_ch == '>':
+                i += 1
+            elif new_ch == '=':
+                i += 1
+        elif c in '()[]{}~!?^%;/.,':             # Handle single char tokens.
+            token_type = SYNTAX
+            i += 1
+            if c == '.' and source[i].isdigit():
+                token_type = CONSTANT
+                i += 1
+                while source[i] in int_or_float_digits:
+                    i += 1
+                # Handle float suffixes.
+                for suffix in ('l', 'f'):
+                    if suffix == source[i:i+1].lower():
+                        i += 1
+                        break
+        elif c.isdigit():                        # Find integer.
+            token_type = CONSTANT
+            if c == '0' and source[i+1] in 'xX':
+                # Handle hex digits.
+                i += 2
+                while source[i] in hex_digits:
+                    i += 1
+            else:
+                while source[i] in int_or_float_digits2:
+                    i += 1
+            # Handle integer (and float) suffixes.
+            for suffix in ('ull', 'll', 'ul', 'l', 'f', 'u'):
+                size = len(suffix)
+                if suffix == source[i:i+size].lower():
+                    i += size
+                    break
+        elif c == '"':                           # Find string.
+            token_type = CONSTANT
+            i = _GetString(source, start, i)
+        elif c == "'":                           # Find char.
+            token_type = CONSTANT
+            i = _GetChar(source, start, i)
+        elif c == '#':                           # Find pre-processor command.
+            token_type = PREPROCESSOR
+            got_if = source[i:i+3] == '#if' and source[i+3:i+4].isspace()
+            if got_if:
+                count_ifs += 1
+            elif source[i:i+6] == '#endif':
+                count_ifs -= 1
+                if count_ifs == 0:
+                    ignore_errors = False
+
+            # TODO(nnorwitz): handle preprocessor statements (\ continuations).
+            while 1:
+                i1 = source.find('\n', i)
+                i2 = source.find('//', i)
+                i3 = source.find('/*', i)
+                i4 = source.find('"', i)
+                # NOTE(nnorwitz): doesn't handle comments in #define macros.
+                # Get the first important symbol (newline, comment, EOF/end).
+                i = min([x for x in (i1, i2, i3, i4, end) if x != -1])
+
+                # Handle #include "dir//foo.h" properly.
+                if source[i] == '"':
+                    i = source.find('"', i+1) + 1
+                    assert i > 0
+                    continue
+                # Keep going if end of the line and the line ends with \.
+                if not (i == i1 and source[i-1] == '\\'):
+                    if got_if:
+                        condition = source[start+4:i].lstrip()
+                        if (condition.startswith('0') or
+                            condition.startswith('(0)')):
+                            ignore_errors = True
+                    break
+                i += 1
+        elif c == '\\':                          # Handle \ in code.
+            # This is different from the pre-processor \ handling.
+            i += 1
+            continue
+        elif ignore_errors:
+            # The tokenizer seems to be in pretty good shape.  This
+            # raise is conditionally disabled so that bogus code
+            # in an #if 0 block can be handled.  Since we will ignore
+            # it anyways, this is probably fine.  So disable the
+            # exception and  return the bogus char.
+            i += 1
+        else:
+            sys.stderr.write('Got invalid token in %s @ %d token:%s: %r\n' %
+                             ('?', i, c, source[i-10:i+10]))
+            raise RuntimeError('unexpected token')
+
+        if i <= 0:
+            print('Invalid index, exiting now.')
+            return
+        yield Token(token_type, source[start:i], start, i)
+
+
+if __name__ == '__main__':
+    def main(argv):
+        """Driver mostly for testing purposes."""
+        for filename in argv[1:]:
+            source = utils.ReadFile(filename)
+            if source is None:
+                continue
+
+            for token in GetTokens(source):
+                print('%-12s: %s' % (token.token_type, token.name))
+                # print('\r%6.2f%%' % (100.0 * index / token.end),)
+            sys.stdout.write('\n')
+
+
+    main(sys.argv)
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/utils.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/utils.py
new file mode 100755
index 0000000000..eab36eec33
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/cpp/utils.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 Neal Norwitz
+# Portions Copyright 2007 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Generic utilities for C++ parsing."""
+
+__author__ = 'nnorwitz@google.com (Neal Norwitz)'
+
+
+import sys
+
+
+# Set to True to see the start/end token indices.
+DEBUG = True
+
+
+def ReadFile(filename, print_error=True):
+    """Returns the contents of a file."""
+    try:
+        fp = open(filename)
+        try:
+            return fp.read()
+        finally:
+            fp.close()
+    except IOError:
+        if print_error:
+            print('Error reading %s: %s' % (filename, sys.exc_info()[1]))
+        return None
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/gmock_gen.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/gmock_gen.py
new file mode 100755
index 0000000000..8cc0d135d6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/generator/gmock_gen.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+#
+# Copyright 2008 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Driver for starting up Google Mock class generator."""
+
+__author__ = 'nnorwitz@google.com (Neal Norwitz)'
+
+import os
+import sys
+
+if __name__ == '__main__':
+  # Add the directory of this script to the path so we can import gmock_class.
+  sys.path.append(os.path.dirname(__file__))
+
+  from cpp import gmock_class
+  # Fix the docstring in case they require the usage.
+  gmock_class.__doc__ = gmock_class.__doc__.replace('gmock_class.py', __file__)
+  gmock_class.main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/gmock-config.in b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/gmock-config.in
new file mode 100755
index 0000000000..2baefe94d6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/gmock-config.in
@@ -0,0 +1,303 @@
+#!/bin/sh
+
+# These variables are automatically filled in by the configure script.
+name="@PACKAGE_TARNAME@"
+version="@PACKAGE_VERSION@"
+
+show_usage()
+{
+  echo "Usage: gmock-config [OPTIONS...]"
+}
+
+show_help()
+{
+  show_usage
+  cat <<\EOF
+
+The `gmock-config' script provides access to the necessary compile and linking
+flags to connect with Google C++ Mocking Framework, both in a build prior to
+installation, and on the system proper after installation. The installation
+overrides may be issued in combination with any other queries, but will only
+affect installation queries if called on a built but not installed gmock. The
+installation queries may not be issued with any other types of queries, and
+only one installation query may be made at a time. The version queries and
+compiler flag queries may be combined as desired but not mixed. Different
+version queries are always combined with logical "and" semantics, and only the
+last of any particular query is used while all previous ones ignored. All
+versions must be specified as a sequence of numbers separated by periods.
+Compiler flag queries output the union of the sets of flags when combined.
+
+ Examples:
+  gmock-config --min-version=1.0 || echo "Insufficient Google Mock version."
+
+  g++ $(gmock-config --cppflags --cxxflags) -o foo.o -c foo.cpp
+  g++ $(gmock-config --ldflags --libs) -o foo foo.o
+
+  # When using a built but not installed Google Mock:
+  g++ $(../../my_gmock_build/scripts/gmock-config ...) ...
+
+  # When using an installed Google Mock, but with installation overrides:
+  export GMOCK_PREFIX="/opt"
+  g++ $(gmock-config --libdir="/opt/lib64" ...) ...
+
+ Help:
+  --usage                    brief usage information
+  --help                     display this help message
+
+ Installation Overrides:
+  --prefix=<dir>             overrides the installation prefix
+  --exec-prefix=<dir>        overrides the executable installation prefix
+  --libdir=<dir>             overrides the library installation prefix
+  --includedir=<dir>         overrides the header file installation prefix
+
+ Installation Queries:
+  --prefix                   installation prefix
+  --exec-prefix              executable installation prefix
+  --libdir                   library installation directory
+  --includedir               header file installation directory
+  --version                  the version of the Google Mock installation
+
+ Version Queries:
+  --min-version=VERSION      return 0 if the version is at least VERSION
+  --exact-version=VERSION    return 0 if the version is exactly VERSION
+  --max-version=VERSION      return 0 if the version is at most VERSION
+
+ Compilation Flag Queries:
+  --cppflags                 compile flags specific to the C-like preprocessors
+  --cxxflags                 compile flags appropriate for C++ programs
+  --ldflags                  linker flags
+  --libs                     libraries for linking
+
+EOF
+}
+
+# This function bounds our version with a min and a max. It uses some clever
+# POSIX-compliant variable expansion to portably do all the work in the shell
+# and avoid any dependency on a particular "sed" or "awk" implementation.
+# Notable is that it will only ever compare the first 3 components of versions.
+# Further components will be cleanly stripped off. All versions must be
+# unadorned, so "v1.0" will *not* work. The minimum version must be in $1, and
+# the max in $2. TODO(chandlerc@google.com): If this ever breaks, we should
+# investigate expanding this via autom4te from AS_VERSION_COMPARE rather than
+# continuing to maintain our own shell version.
+check_versions()
+{
+  major_version=${version%%.*}
+  minor_version="0"
+  point_version="0"
+  if test "${version#*.}" != "${version}"; then
+    minor_version=${version#*.}
+    minor_version=${minor_version%%.*}
+  fi
+  if test "${version#*.*.}" != "${version}"; then
+    point_version=${version#*.*.}
+    point_version=${point_version%%.*}
+  fi
+
+  min_version="$1"
+  min_major_version=${min_version%%.*}
+  min_minor_version="0"
+  min_point_version="0"
+  if test "${min_version#*.}" != "${min_version}"; then
+    min_minor_version=${min_version#*.}
+    min_minor_version=${min_minor_version%%.*}
+  fi
+  if test "${min_version#*.*.}" != "${min_version}"; then
+    min_point_version=${min_version#*.*.}
+    min_point_version=${min_point_version%%.*}
+  fi
+
+  max_version="$2"
+  max_major_version=${max_version%%.*}
+  max_minor_version="0"
+  max_point_version="0"
+  if test "${max_version#*.}" != "${max_version}"; then
+    max_minor_version=${max_version#*.}
+    max_minor_version=${max_minor_version%%.*}
+  fi
+  if test "${max_version#*.*.}" != "${max_version}"; then
+    max_point_version=${max_version#*.*.}
+    max_point_version=${max_point_version%%.*}
+  fi
+
+  test $(($major_version)) -lt $(($min_major_version)) && exit 1
+  if test $(($major_version)) -eq $(($min_major_version)); then
+    test $(($minor_version)) -lt $(($min_minor_version)) && exit 1
+    if test $(($minor_version)) -eq $(($min_minor_version)); then
+      test $(($point_version)) -lt $(($min_point_version)) && exit 1
+    fi
+  fi
+
+  test $(($major_version)) -gt $(($max_major_version)) && exit 1
+  if test $(($major_version)) -eq $(($max_major_version)); then
+    test $(($minor_version)) -gt $(($max_minor_version)) && exit 1
+    if test $(($minor_version)) -eq $(($max_minor_version)); then
+      test $(($point_version)) -gt $(($max_point_version)) && exit 1
+    fi
+  fi
+
+  exit 0
+}
+
+# Show the usage line when no arguments are specified.
+if test $# -eq 0; then
+  show_usage
+  exit 1
+fi
+
+while test $# -gt 0; do
+  case $1 in
+    --usage)          show_usage;         exit 0;;
+    --help)           show_help;          exit 0;;
+
+    # Installation overrides
+    --prefix=*)       GMOCK_PREFIX=${1#--prefix=};;
+    --exec-prefix=*)  GMOCK_EXEC_PREFIX=${1#--exec-prefix=};;
+    --libdir=*)       GMOCK_LIBDIR=${1#--libdir=};;
+    --includedir=*)   GMOCK_INCLUDEDIR=${1#--includedir=};;
+
+    # Installation queries
+    --prefix|--exec-prefix|--libdir|--includedir|--version)
+      if test -n "${do_query}"; then
+        show_usage
+        exit 1
+      fi
+      do_query=${1#--}
+      ;;
+
+    # Version checking
+    --min-version=*)
+      do_check_versions=yes
+      min_version=${1#--min-version=}
+      ;;
+    --max-version=*)
+      do_check_versions=yes
+      max_version=${1#--max-version=}
+      ;;
+    --exact-version=*)
+      do_check_versions=yes
+      exact_version=${1#--exact-version=}
+      ;;
+
+    # Compiler flag output
+    --cppflags)       echo_cppflags=yes;;
+    --cxxflags)       echo_cxxflags=yes;;
+    --ldflags)        echo_ldflags=yes;;
+    --libs)           echo_libs=yes;;
+
+    # Everything else is an error
+    *)                show_usage;         exit 1;;
+  esac
+  shift
+done
+
+# These have defaults filled in by the configure script but can also be
+# overridden by environment variables or command line parameters.
+prefix="${GMOCK_PREFIX:-@prefix@}"
+exec_prefix="${GMOCK_EXEC_PREFIX:-@exec_prefix@}"
+libdir="${GMOCK_LIBDIR:-@libdir@}"
+includedir="${GMOCK_INCLUDEDIR:-@includedir@}"
+
+# We try and detect if our binary is not located at its installed location. If
+# it's not, we provide variables pointing to the source and build tree rather
+# than to the install tree. We also locate Google Test using the configured
+# gtest-config script rather than searching the PATH and our bindir for one.
+# This allows building against a just-built gmock rather than an installed
+# gmock.
+bindir="@bindir@"
+this_relative_bindir=`dirname $0`
+this_bindir=`cd ${this_relative_bindir}; pwd -P`
+if test "${this_bindir}" = "${this_bindir%${bindir}}"; then
+  # The path to the script doesn't end in the bindir sequence from Autoconf,
+  # assume that we are in a build tree.
+  build_dir=`dirname ${this_bindir}`
+  src_dir=`cd ${this_bindir}/@top_srcdir@; pwd -P`
+
+  # TODO(chandlerc@google.com): This is a dangerous dependency on libtool, we
+  # should work to remove it, and/or remove libtool altogether, replacing it
+  # with direct references to the library and a link path.
+  gmock_libs="${build_dir}/lib/libgmock.la"
+  gmock_ldflags=""
+
+  # We provide hooks to include from either the source or build dir, where the
+  # build dir is always preferred. This will potentially allow us to write
+  # build rules for generated headers and have them automatically be preferred
+  # over provided versions.
+  gmock_cppflags="-I${build_dir}/include -I${src_dir}/include"
+  gmock_cxxflags=""
+
+  # Directly invoke the gtest-config script used during the build process.
+  gtest_config="@GTEST_CONFIG@"
+else
+  # We're using an installed gmock, although it may be staged under some
+  # prefix. Assume (as our own libraries do) that we can resolve the prefix,
+  # and are present in the dynamic link paths.
+  gmock_ldflags="-L${libdir}"
+  gmock_libs="-l${name}"
+  gmock_cppflags="-I${includedir}"
+  gmock_cxxflags=""
+
+  # We also prefer any gtest-config script installed in our prefix. Lacking
+  # one, we look in the PATH for one.
+  gtest_config="${bindir}/gtest-config"
+  if test ! -x "${gtest_config}"; then
+    gtest_config=`which gtest-config`
+  fi
+fi
+
+# Ensure that we have located a Google Test to link against.
+if ! test -x "${gtest_config}"; then
+  echo "Unable to locate Google Test, check your Google Mock configuration" \
+       "and installation" >&2
+  exit 1
+elif ! "${gtest_config}" "--exact-version=@GTEST_VERSION@"; then
+  echo "The Google Test found is not the same version as Google Mock was " \
+       "built against" >&2
+  exit 1
+fi
+
+# Add the necessary Google Test bits into the various flag variables
+gmock_cppflags="${gmock_cppflags} `${gtest_config} --cppflags`"
+gmock_cxxflags="${gmock_cxxflags} `${gtest_config} --cxxflags`"
+gmock_ldflags="${gmock_ldflags} `${gtest_config} --ldflags`"
+gmock_libs="${gmock_libs} `${gtest_config} --libs`"
+
+# Do an installation query if requested.
+if test -n "$do_query"; then
+  case $do_query in
+    prefix)           echo $prefix;       exit 0;;
+    exec-prefix)      echo $exec_prefix;  exit 0;;
+    libdir)           echo $libdir;       exit 0;;
+    includedir)       echo $includedir;   exit 0;;
+    version)          echo $version;      exit 0;;
+    *)                show_usage;         exit 1;;
+  esac
+fi
+
+# Do a version check if requested.
+if test "$do_check_versions" = "yes"; then
+  # Make sure we didn't receive a bad combination of parameters.
+  test "$echo_cppflags" = "yes" && show_usage && exit 1
+  test "$echo_cxxflags" = "yes" && show_usage && exit 1
+  test "$echo_ldflags" = "yes"  && show_usage && exit 1
+  test "$echo_libs" = "yes"     && show_usage && exit 1
+
+  if test "$exact_version" != ""; then
+    check_versions $exact_version $exact_version
+    # unreachable
+  else
+    check_versions ${min_version:-0.0.0} ${max_version:-9999.9999.9999}
+    # unreachable
+  fi
+fi
+
+# Do the output in the correct order so that these can be used in-line of
+# a compiler invocation.
+output=""
+test "$echo_cppflags" = "yes" && output="$output $gmock_cppflags"
+test "$echo_cxxflags" = "yes" && output="$output $gmock_cxxflags"
+test "$echo_ldflags" = "yes"  && output="$output $gmock_ldflags"
+test "$echo_libs" = "yes"     && output="$output $gmock_libs"
+echo $output
+
+exit 0
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/gmock_doctor.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/gmock_doctor.py
new file mode 100755
index 0000000000..74992bc744
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/gmock_doctor.py
@@ -0,0 +1,640 @@
+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Converts compiler's errors in code using Google Mock to plain English."""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import re
+import sys
+
+_VERSION = '1.0.3'
+
+_EMAIL = 'googlemock@googlegroups.com'
+
+_COMMON_GMOCK_SYMBOLS = [
+    # Matchers
+    '_',
+    'A',
+    'AddressSatisfies',
+    'AllOf',
+    'An',
+    'AnyOf',
+    'ContainerEq',
+    'Contains',
+    'ContainsRegex',
+    'DoubleEq',
+    'ElementsAre',
+    'ElementsAreArray',
+    'EndsWith',
+    'Eq',
+    'Field',
+    'FloatEq',
+    'Ge',
+    'Gt',
+    'HasSubstr',
+    'IsInitializedProto',
+    'Le',
+    'Lt',
+    'MatcherCast',
+    'Matches',
+    'MatchesRegex',
+    'NanSensitiveDoubleEq',
+    'NanSensitiveFloatEq',
+    'Ne',
+    'Not',
+    'NotNull',
+    'Pointee',
+    'Property',
+    'Ref',
+    'ResultOf',
+    'SafeMatcherCast',
+    'StartsWith',
+    'StrCaseEq',
+    'StrCaseNe',
+    'StrEq',
+    'StrNe',
+    'Truly',
+    'TypedEq',
+    'Value',
+
+    # Actions
+    'Assign',
+    'ByRef',
+    'DeleteArg',
+    'DoAll',
+    'DoDefault',
+    'IgnoreResult',
+    'Invoke',
+    'InvokeArgument',
+    'InvokeWithoutArgs',
+    'Return',
+    'ReturnNew',
+    'ReturnNull',
+    'ReturnRef',
+    'SaveArg',
+    'SetArgReferee',
+    'SetArgPointee',
+    'SetArgumentPointee',
+    'SetArrayArgument',
+    'SetErrnoAndReturn',
+    'Throw',
+    'WithArg',
+    'WithArgs',
+    'WithoutArgs',
+
+    # Cardinalities
+    'AnyNumber',
+    'AtLeast',
+    'AtMost',
+    'Between',
+    'Exactly',
+
+    # Sequences
+    'InSequence',
+    'Sequence',
+
+    # Misc
+    'DefaultValue',
+    'Mock',
+    ]
+
+# Regex for matching source file path and line number in the compiler's errors.
+_GCC_FILE_LINE_RE = r'(?P<file>.*):(?P<line>\d+):(\d+:)?\s+'
+_CLANG_FILE_LINE_RE = r'(?P<file>.*):(?P<line>\d+):(?P<column>\d+):\s+'
+_CLANG_NON_GMOCK_FILE_LINE_RE = (
+    r'(?P<file>.*[/\\^](?!gmock-)[^/\\]+):(?P<line>\d+):(?P<column>\d+):\s+')
+
+
+def _FindAllMatches(regex, s):
+  """Generates all matches of regex in string s."""
+
+  r = re.compile(regex)
+  return r.finditer(s)
+
+
+def _GenericDiagnoser(short_name, long_name, diagnoses, msg):
+  """Diagnoses the given disease by pattern matching.
+
+  Can provide different diagnoses for different patterns.
+
+  Args:
+    short_name: Short name of the disease.
+    long_name:  Long name of the disease.
+    diagnoses:  A list of pairs (regex, pattern for formatting the diagnosis
+                for matching regex).
+    msg:        Compiler's error messages.
+  Yields:
+    Tuples of the form
+      (short name of disease, long name of disease, diagnosis).
+  """
+  for regex, diagnosis in diagnoses:
+    if re.search(regex, msg):
+      diagnosis = '%(file)s:%(line)s:' + diagnosis
+      for m in _FindAllMatches(regex, msg):
+        yield (short_name, long_name, diagnosis % m.groupdict())
+
+
+def _NeedToReturnReferenceDiagnoser(msg):
+  """Diagnoses the NRR disease, given the error messages by the compiler."""
+
+  gcc_regex = (r'In member function \'testing::internal::ReturnAction<R>.*\n'
+               + _GCC_FILE_LINE_RE + r'instantiated from here\n'
+               r'.*gmock-actions\.h.*error: creating array with negative size')
+  clang_regex = (r'error:.*array.*negative.*\r?\n'
+                 r'(.*\n)*?' +
+                 _CLANG_NON_GMOCK_FILE_LINE_RE +
+                 r'note: in instantiation of function template specialization '
+                 r'\'testing::internal::ReturnAction<(?P<type>.*)>'
+                 r'::operator Action<.*>\' requested here')
+  clang11_re = (r'use_ReturnRef_instead_of_Return_to_return_a_reference.*'
+                r'(.*\n)*?' + _CLANG_NON_GMOCK_FILE_LINE_RE)
+
+  diagnosis = """
+You are using a Return() action in a function that returns a reference to
+%(type)s.  Please use ReturnRef() instead."""
+  return _GenericDiagnoser('NRR', 'Need to Return Reference',
+                           [(clang_regex, diagnosis),
+                            (clang11_re, diagnosis % {'type': 'a type'}),
+                            (gcc_regex, diagnosis % {'type': 'a type'})],
+                           msg)
+
+
+def _NeedToReturnSomethingDiagnoser(msg):
+  """Diagnoses the NRS disease, given the error messages by the compiler."""
+
+  gcc_regex = (_GCC_FILE_LINE_RE + r'(instantiated from here\n.'
+               r'*gmock.*actions\.h.*error: void value not ignored)'
+               r'|(error: control reaches end of non-void function)')
+  clang_regex1 = (_CLANG_FILE_LINE_RE +
+                  r'error: cannot initialize return object '
+                  r'of type \'Result\' \(aka \'(?P<return_type>.*)\'\) '
+                  r'with an rvalue of type \'void\'')
+  clang_regex2 = (_CLANG_FILE_LINE_RE +
+                  r'error: cannot initialize return object '
+                  r'of type \'(?P<return_type>.*)\' '
+                  r'with an rvalue of type \'void\'')
+  diagnosis = """
+You are using an action that returns void, but it needs to return
+%(return_type)s.  Please tell it *what* to return.  Perhaps you can use
+the pattern DoAll(some_action, Return(some_value))?"""
+  return _GenericDiagnoser(
+      'NRS',
+      'Need to Return Something',
+      [(gcc_regex, diagnosis % {'return_type': '*something*'}),
+       (clang_regex1, diagnosis),
+       (clang_regex2, diagnosis)],
+      msg)
+
+
+def _NeedToReturnNothingDiagnoser(msg):
+  """Diagnoses the NRN disease, given the error messages by the compiler."""
+
+  gcc_regex = (_GCC_FILE_LINE_RE + r'instantiated from here\n'
+               r'.*gmock-actions\.h.*error: instantiation of '
+               r'\'testing::internal::ReturnAction<R>::Impl<F>::value_\' '
+               r'as type \'void\'')
+  clang_regex1 = (r'error: field has incomplete type '
+                  r'\'Result\' \(aka \'void\'\)(\r)?\n'
+                  r'(.*\n)*?' +
+                  _CLANG_NON_GMOCK_FILE_LINE_RE + r'note: in instantiation '
+                  r'of function template specialization '
+                  r'\'testing::internal::ReturnAction<(?P<return_type>.*)>'
+                  r'::operator Action<void \(.*\)>\' requested here')
+  clang_regex2 = (r'error: field has incomplete type '
+                  r'\'Result\' \(aka \'void\'\)(\r)?\n'
+                  r'(.*\n)*?' +
+                  _CLANG_NON_GMOCK_FILE_LINE_RE + r'note: in instantiation '
+                  r'of function template specialization '
+                  r'\'testing::internal::DoBothAction<.*>'
+                  r'::operator Action<(?P<return_type>.*) \(.*\)>\' '
+                  r'requested here')
+  diagnosis = """
+You are using an action that returns %(return_type)s, but it needs to return
+void.  Please use a void-returning action instead.
+
+All actions but the last in DoAll(...) must return void.  Perhaps you need
+to re-arrange the order of actions in a DoAll(), if you are using one?"""
+  return _GenericDiagnoser(
+      'NRN',
+      'Need to Return Nothing',
+      [(gcc_regex, diagnosis % {'return_type': '*something*'}),
+       (clang_regex1, diagnosis),
+       (clang_regex2, diagnosis)],
+      msg)
+
+
+def _IncompleteByReferenceArgumentDiagnoser(msg):
+  """Diagnoses the IBRA disease, given the error messages by the compiler."""
+
+  gcc_regex = (_GCC_FILE_LINE_RE + r'instantiated from here\n'
+               r'.*gtest-printers\.h.*error: invalid application of '
+               r'\'sizeof\' to incomplete type \'(?P<type>.*)\'')
+
+  clang_regex = (r'.*gtest-printers\.h.*error: invalid application of '
+                 r'\'sizeof\' to an incomplete type '
+                 r'\'(?P<type>.*)( const)?\'\r?\n'
+                 r'(.*\n)*?' +
+                 _CLANG_NON_GMOCK_FILE_LINE_RE +
+                 r'note: in instantiation of member function '
+                 r'\'testing::internal2::TypeWithoutFormatter<.*>::'
+                 r'PrintValue\' requested here')
+  diagnosis = """
+In order to mock this function, Google Mock needs to see the definition
+of type "%(type)s" - declaration alone is not enough.  Either #include
+the header that defines it, or change the argument to be passed
+by pointer."""
+
+  return _GenericDiagnoser('IBRA', 'Incomplete By-Reference Argument Type',
+                           [(gcc_regex, diagnosis),
+                            (clang_regex, diagnosis)],
+                           msg)
+
+
+def _OverloadedFunctionMatcherDiagnoser(msg):
+  """Diagnoses the OFM disease, given the error messages by the compiler."""
+
+  gcc_regex = (_GCC_FILE_LINE_RE + r'error: no matching function for '
+               r'call to \'Truly\(<unresolved overloaded function type>\)')
+  clang_regex = (_CLANG_FILE_LINE_RE + r'error: no matching function for '
+                 r'call to \'Truly')
+  diagnosis = """
+The argument you gave to Truly() is an overloaded function.  Please tell
+your compiler which overloaded version you want to use.
+
+For example, if you want to use the version whose signature is
+  bool Foo(int n);
+you should write
+  Truly(static_cast<bool (*)(int n)>(Foo))"""
+  return _GenericDiagnoser('OFM', 'Overloaded Function Matcher',
+                           [(gcc_regex, diagnosis),
+                            (clang_regex, diagnosis)],
+                           msg)
+
+
+def _OverloadedFunctionActionDiagnoser(msg):
+  """Diagnoses the OFA disease, given the error messages by the compiler."""
+
+  gcc_regex = (_GCC_FILE_LINE_RE + r'error: no matching function for call to '
+               r'\'Invoke\(<unresolved overloaded function type>')
+  clang_regex = (_CLANG_FILE_LINE_RE + r'error: no matching '
+                 r'function for call to \'Invoke\'\r?\n'
+                 r'(.*\n)*?'
+                 r'.*\bgmock-generated-actions\.h:\d+:\d+:\s+'
+                 r'note: candidate template ignored:\s+'
+                 r'couldn\'t infer template argument \'FunctionImpl\'')
+  diagnosis = """
+Function you are passing to Invoke is overloaded.  Please tell your compiler
+which overloaded version you want to use.
+
+For example, if you want to use the version whose signature is
+  bool MyFunction(int n, double x);
+you should write something like
+  Invoke(static_cast<bool (*)(int n, double x)>(MyFunction))"""
+  return _GenericDiagnoser('OFA', 'Overloaded Function Action',
+                           [(gcc_regex, diagnosis),
+                            (clang_regex, diagnosis)],
+                           msg)
+
+
+def _OverloadedMethodActionDiagnoser(msg):
+  """Diagnoses the OMA disease, given the error messages by the compiler."""
+
+  gcc_regex = (_GCC_FILE_LINE_RE + r'error: no matching function for '
+               r'call to \'Invoke\(.+, <unresolved overloaded function '
+               r'type>\)')
+  clang_regex = (_CLANG_FILE_LINE_RE + r'error: no matching function '
+                 r'for call to \'Invoke\'\r?\n'
+                 r'(.*\n)*?'
+                 r'.*\bgmock-generated-actions\.h:\d+:\d+: '
+                 r'note: candidate function template not viable: '
+                 r'requires .*, but 2 (arguments )?were provided')
+  diagnosis = """
+The second argument you gave to Invoke() is an overloaded method.  Please
+tell your compiler which overloaded version you want to use.
+
+For example, if you want to use the version whose signature is
+  class Foo {
+    ...
+    bool Bar(int n, double x);
+  };
+you should write something like
+  Invoke(foo, static_cast<bool (Foo::*)(int n, double x)>(&Foo::Bar))"""
+  return _GenericDiagnoser('OMA', 'Overloaded Method Action',
+                           [(gcc_regex, diagnosis),
+                            (clang_regex, diagnosis)],
+                           msg)
+
+
+def _MockObjectPointerDiagnoser(msg):
+  """Diagnoses the MOP disease, given the error messages by the compiler."""
+
+  gcc_regex = (_GCC_FILE_LINE_RE + r'error: request for member '
+               r'\'gmock_(?P<method>.+)\' in \'(?P<mock_object>.+)\', '
+               r'which is of non-class type \'(.*::)*(?P<class_name>.+)\*\'')
+  clang_regex = (_CLANG_FILE_LINE_RE + r'error: member reference type '
+                 r'\'(?P<class_name>.*?) *\' is a pointer; '
+                 r'(did you mean|maybe you meant) to use \'->\'\?')
+  diagnosis = """
+The first argument to ON_CALL() and EXPECT_CALL() must be a mock *object*,
+not a *pointer* to it.  Please write '*(%(mock_object)s)' instead of
+'%(mock_object)s' as your first argument.
+
+For example, given the mock class:
+
+  class %(class_name)s : public ... {
+    ...
+    MOCK_METHOD0(%(method)s, ...);
+  };
+
+and the following mock instance:
+
+  %(class_name)s* mock_ptr = ...
+
+you should use the EXPECT_CALL like this:
+
+  EXPECT_CALL(*mock_ptr, %(method)s(...));"""
+
+  return _GenericDiagnoser(
+      'MOP',
+      'Mock Object Pointer',
+      [(gcc_regex, diagnosis),
+       (clang_regex, diagnosis % {'mock_object': 'mock_object',
+                                  'method': 'method',
+                                  'class_name': '%(class_name)s'})],
+       msg)
+
+
+def _NeedToUseSymbolDiagnoser(msg):
+  """Diagnoses the NUS disease, given the error messages by the compiler."""
+
+  gcc_regex = (_GCC_FILE_LINE_RE + r'error: \'(?P<symbol>.+)\' '
+               r'(was not declared in this scope|has not been declared)')
+  clang_regex = (_CLANG_FILE_LINE_RE +
+                 r'error: (use of undeclared identifier|unknown type name|'
+                 r'no template named) \'(?P<symbol>[^\']+)\'')
+  diagnosis = """
+'%(symbol)s' is defined by Google Mock in the testing namespace.
+Did you forget to write
+  using testing::%(symbol)s;
+?"""
+  for m in (list(_FindAllMatches(gcc_regex, msg)) +
+            list(_FindAllMatches(clang_regex, msg))):
+    symbol = m.groupdict()['symbol']
+    if symbol in _COMMON_GMOCK_SYMBOLS:
+      yield ('NUS', 'Need to Use Symbol', diagnosis % m.groupdict())
+
+
+def _NeedToUseReturnNullDiagnoser(msg):
+  """Diagnoses the NRNULL disease, given the error messages by the compiler."""
+
+  gcc_regex = ('instantiated from \'testing::internal::ReturnAction<R>'
+               '::operator testing::Action<Func>\(\) const.*\n' +
+               _GCC_FILE_LINE_RE + r'instantiated from here\n'
+               r'.*error: no matching function for call to \'ImplicitCast_\('
+               r'(:?long )?int&\)')
+  clang_regex = (r'\bgmock-actions.h:.* error: no matching function for '
+                 r'call to \'ImplicitCast_\'\r?\n'
+                 r'(.*\n)*?' +
+                 _CLANG_NON_GMOCK_FILE_LINE_RE + r'note: in instantiation '
+                 r'of function template specialization '
+                 r'\'testing::internal::ReturnAction<(int|long)>::operator '
+                 r'Action<(?P<type>.*)\(\)>\' requested here')
+  diagnosis = """
+You are probably calling Return(NULL) and the compiler isn't sure how to turn
+NULL into %(type)s. Use ReturnNull() instead.
+Note: the line number may be off; please fix all instances of Return(NULL)."""
+  return _GenericDiagnoser(
+      'NRNULL', 'Need to use ReturnNull',
+      [(clang_regex, diagnosis),
+       (gcc_regex, diagnosis % {'type': 'the right type'})],
+      msg)
+
+
+def _TypeInTemplatedBaseDiagnoser(msg):
+  """Diagnoses the TTB disease, given the error messages by the compiler."""
+
+  # This version works when the type is used as the mock function's return
+  # type.
+  gcc_4_3_1_regex_type_in_retval = (
+      r'In member function \'int .*\n' + _GCC_FILE_LINE_RE +
+      r'error: a function call cannot appear in a constant-expression')
+  gcc_4_4_0_regex_type_in_retval = (
+      r'error: a function call cannot appear in a constant-expression'
+      + _GCC_FILE_LINE_RE + r'error: template argument 1 is invalid\n')
+  # This version works when the type is used as the mock function's sole
+  # parameter type.
+  gcc_regex_type_of_sole_param = (
+      _GCC_FILE_LINE_RE +
+      r'error: \'(?P<type>.+)\' was not declared in this scope\n'
+      r'.*error: template argument 1 is invalid\n')
+  # This version works when the type is used as a parameter of a mock
+  # function that has multiple parameters.
+  gcc_regex_type_of_a_param = (
+      r'error: expected `;\' before \'::\' token\n'
+      + _GCC_FILE_LINE_RE +
+      r'error: \'(?P<type>.+)\' was not declared in this scope\n'
+      r'.*error: template argument 1 is invalid\n'
+      r'.*error: \'.+\' was not declared in this scope')
+  clang_regex_type_of_retval_or_sole_param = (
+      _CLANG_FILE_LINE_RE +
+      r'error: use of undeclared identifier \'(?P<type>.*)\'\n'
+      r'(.*\n)*?'
+      r'(?P=file):(?P=line):\d+: error: '
+      r'non-friend class member \'Result\' cannot have a qualified name'
+      )
+  clang_regex_type_of_a_param = (
+      _CLANG_FILE_LINE_RE +
+      r'error: C\+\+ requires a type specifier for all declarations\n'
+      r'(.*\n)*?'
+      r'(?P=file):(?P=line):(?P=column): error: '
+      r'C\+\+ requires a type specifier for all declarations'
+      )
+  clang_regex_unknown_type = (
+      _CLANG_FILE_LINE_RE +
+      r'error: unknown type name \'(?P<type>[^\']+)\''
+      )
+
+  diagnosis = """
+In a mock class template, types or typedefs defined in the base class
+template are *not* automatically visible.  This is how C++ works.  Before
+you can use a type or typedef named %(type)s defined in base class Base<T>, you
+need to make it visible.  One way to do it is:
+
+  typedef typename Base<T>::%(type)s %(type)s;"""
+
+  for diag in _GenericDiagnoser(
+      'TTB', 'Type in Template Base',
+      [(gcc_4_3_1_regex_type_in_retval, diagnosis % {'type': 'Foo'}),
+       (gcc_4_4_0_regex_type_in_retval, diagnosis % {'type': 'Foo'}),
+       (gcc_regex_type_of_sole_param, diagnosis),
+       (gcc_regex_type_of_a_param, diagnosis),
+       (clang_regex_type_of_retval_or_sole_param, diagnosis),
+       (clang_regex_type_of_a_param, diagnosis % {'type': 'Foo'})],
+      msg):
+    yield diag
+  # Avoid overlap with the NUS pattern.
+  for m in _FindAllMatches(clang_regex_unknown_type, msg):
+    type_ = m.groupdict()['type']
+    if type_ not in _COMMON_GMOCK_SYMBOLS:
+      yield ('TTB', 'Type in Template Base', diagnosis % m.groupdict())
+
+
+def _WrongMockMethodMacroDiagnoser(msg):
+  """Diagnoses the WMM disease, given the error messages by the compiler."""
+
+  gcc_regex = (_GCC_FILE_LINE_RE +
+               r'.*this_method_does_not_take_(?P<wrong_args>\d+)_argument.*\n'
+               r'.*\n'
+               r'.*candidates are.*FunctionMocker<[^>]+A(?P<args>\d+)\)>')
+  clang_regex = (_CLANG_NON_GMOCK_FILE_LINE_RE +
+                 r'error:.*array.*negative.*r?\n'
+                 r'(.*\n)*?'
+                 r'(?P=file):(?P=line):(?P=column): error: too few arguments '
+                 r'to function call, expected (?P<args>\d+), '
+                 r'have (?P<wrong_args>\d+)')
+  clang11_re = (_CLANG_NON_GMOCK_FILE_LINE_RE +
+                r'.*this_method_does_not_take_'
+                r'(?P<wrong_args>\d+)_argument.*')
+  diagnosis = """
+You are using MOCK_METHOD%(wrong_args)s to define a mock method that has
+%(args)s arguments. Use MOCK_METHOD%(args)s (or MOCK_CONST_METHOD%(args)s,
+MOCK_METHOD%(args)s_T, MOCK_CONST_METHOD%(args)s_T as appropriate) instead."""
+  return _GenericDiagnoser('WMM', 'Wrong MOCK_METHODn Macro',
+                           [(gcc_regex, diagnosis),
+                            (clang11_re, diagnosis % {'wrong_args': 'm',
+                                                      'args': 'n'}),
+                            (clang_regex, diagnosis)],
+                           msg)
+
+
+def _WrongParenPositionDiagnoser(msg):
+  """Diagnoses the WPP disease, given the error messages by the compiler."""
+
+  gcc_regex = (_GCC_FILE_LINE_RE +
+               r'error:.*testing::internal::MockSpec<.* has no member named \''
+               r'(?P<method>\w+)\'')
+  clang_regex = (_CLANG_NON_GMOCK_FILE_LINE_RE +
+                 r'error: no member named \'(?P<method>\w+)\' in '
+                 r'\'testing::internal::MockSpec<.*>\'')
+  diagnosis = """
+The closing parenthesis of ON_CALL or EXPECT_CALL should be *before*
+".%(method)s".  For example, you should write:
+  EXPECT_CALL(my_mock, Foo(_)).%(method)s(...);
+instead of:
+  EXPECT_CALL(my_mock, Foo(_).%(method)s(...));"""
+  return _GenericDiagnoser('WPP', 'Wrong Parenthesis Position',
+                           [(gcc_regex, diagnosis),
+                            (clang_regex, diagnosis)],
+                           msg)
+
+
+_DIAGNOSERS = [
+    _IncompleteByReferenceArgumentDiagnoser,
+    _MockObjectPointerDiagnoser,
+    _NeedToReturnNothingDiagnoser,
+    _NeedToReturnReferenceDiagnoser,
+    _NeedToReturnSomethingDiagnoser,
+    _NeedToUseReturnNullDiagnoser,
+    _NeedToUseSymbolDiagnoser,
+    _OverloadedFunctionActionDiagnoser,
+    _OverloadedFunctionMatcherDiagnoser,
+    _OverloadedMethodActionDiagnoser,
+    _TypeInTemplatedBaseDiagnoser,
+    _WrongMockMethodMacroDiagnoser,
+    _WrongParenPositionDiagnoser,
+    ]
+
+
+def Diagnose(msg):
+  """Generates all possible diagnoses given the compiler error message."""
+
+  msg = re.sub(r'\x1b\[[^m]*m', '', msg)  # Strips all color formatting.
+  # Assuming the string is using the UTF-8 encoding, replaces the left and
+  # the right single quote characters with apostrophes.
+  msg = re.sub(r'(\xe2\x80\x98|\xe2\x80\x99)', "'", msg)
+
+  diagnoses = []
+  for diagnoser in _DIAGNOSERS:
+    for diag in diagnoser(msg):
+      diagnosis = '[%s - %s]\n%s' % diag
+      if not diagnosis in diagnoses:
+        diagnoses.append(diagnosis)
+  return diagnoses
+
+
+def main():
+  print ('Google Mock Doctor v%s - '
+         'diagnoses problems in code using Google Mock.' % _VERSION)
+
+  if sys.stdin.isatty():
+    print ('Please copy and paste the compiler errors here.  Press c-D when '
+           'you are done:')
+  else:
+    print ('Waiting for compiler errors on stdin . . .')
+
+  msg = sys.stdin.read().strip()
+  diagnoses = Diagnose(msg)
+  count = len(diagnoses)
+  if not count:
+    print ("""
+Your compiler complained:
+8<------------------------------------------------------------
+%s
+------------------------------------------------------------>8
+
+Uh-oh, I'm not smart enough to figure out what the problem is. :-(
+However...
+If you send your source code and the compiler's error messages to
+%s, you can be helped and I can get smarter --
+win-win for us!""" % (msg, _EMAIL))
+  else:
+    print ('------------------------------------------------------------')
+    print ('Your code appears to have the following',)
+    if count > 1:
+      print ('%s diseases:' % (count,))
+    else:
+      print ('disease:')
+    i = 0
+    for d in diagnoses:
+      i += 1
+      if count > 1:
+        print ('\n#%s:' % (i,))
+      print (d)
+    print ("""
+How did I do?  If you think I'm wrong or unhelpful, please send your
+source code and the compiler's error messages to %s.
+Then you can be helped and I can get smarter -- I promise I won't be upset!""" %
+           _EMAIL)
+
+
+if __name__ == '__main__':
+  main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/upload.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/upload.py
new file mode 100755
index 0000000000..6e6f9a1471
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/upload.py
@@ -0,0 +1,1387 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Tool for uploading diffs from a version control system to the codereview app.
+
+Usage summary: upload.py [options] [-- diff_options]
+
+Diff options are passed to the diff command of the underlying system.
+
+Supported version control systems:
+  Git
+  Mercurial
+  Subversion
+
+It is important for Git/Mercurial users to specify a tree/node/branch to diff
+against by using the '--rev' option.
+"""
+# This code is derived from appcfg.py in the App Engine SDK (open source),
+# and from ASPN recipe #146306.
+
+import cookielib
+import getpass
+import logging
+import md5
+import mimetypes
+import optparse
+import os
+import re
+import socket
+import subprocess
+import sys
+import urllib
+import urllib2
+import urlparse
+
+try:
+  import readline
+except ImportError:
+  pass
+
+# The logging verbosity:
+#  0: Errors only.
+#  1: Status messages.
+#  2: Info logs.
+#  3: Debug logs.
+verbosity = 1
+
+# Max size of patch or base file.
+MAX_UPLOAD_SIZE = 900 * 1024
+
+
+def GetEmail(prompt):
+  """Prompts the user for their email address and returns it.
+
+  The last used email address is saved to a file and offered up as a suggestion
+  to the user. If the user presses enter without typing in anything the last
+  used email address is used. If the user enters a new address, it is saved
+  for next time we prompt.
+
+  """
+  last_email_file_name = os.path.expanduser("~/.last_codereview_email_address")
+  last_email = ""
+  if os.path.exists(last_email_file_name):
+    try:
+      last_email_file = open(last_email_file_name, "r")
+      last_email = last_email_file.readline().strip("\n")
+      last_email_file.close()
+      prompt += " [%s]" % last_email
+    except IOError, e:
+      pass
+  email = raw_input(prompt + ": ").strip()
+  if email:
+    try:
+      last_email_file = open(last_email_file_name, "w")
+      last_email_file.write(email)
+      last_email_file.close()
+    except IOError, e:
+      pass
+  else:
+    email = last_email
+  return email
+
+
+def StatusUpdate(msg):
+  """Print a status message to stdout.
+
+  If 'verbosity' is greater than 0, print the message.
+
+  Args:
+    msg: The string to print.
+  """
+  if verbosity > 0:
+    print msg
+
+
+def ErrorExit(msg):
+  """Print an error message to stderr and exit."""
+  print >>sys.stderr, msg
+  sys.exit(1)
+
+
+class ClientLoginError(urllib2.HTTPError):
+  """Raised to indicate there was an error authenticating with ClientLogin."""
+
+  def __init__(self, url, code, msg, headers, args):
+    urllib2.HTTPError.__init__(self, url, code, msg, headers, None)
+    self.args = args
+    self.reason = args["Error"]
+
+
+class AbstractRpcServer(object):
+  """Provides a common interface for a simple RPC server."""
+
+  def __init__(self, host, auth_function, host_override=None, extra_headers={},
+               save_cookies=False):
+    """Creates a new HttpRpcServer.
+
+    Args:
+      host: The host to send requests to.
+      auth_function: A function that takes no arguments and returns an
+        (email, password) tuple when called. Will be called if authentication
+        is required.
+      host_override: The host header to send to the server (defaults to host).
+      extra_headers: A dict of extra headers to append to every request.
+      save_cookies: If True, save the authentication cookies to local disk.
+        If False, use an in-memory cookiejar instead.  Subclasses must
+        implement this functionality.  Defaults to False.
+    """
+    self.host = host
+    self.host_override = host_override
+    self.auth_function = auth_function
+    self.authenticated = False
+    self.extra_headers = extra_headers
+    self.save_cookies = save_cookies
+    self.opener = self._GetOpener()
+    if self.host_override:
+      logging.info("Server: %s; Host: %s", self.host, self.host_override)
+    else:
+      logging.info("Server: %s", self.host)
+
+  def _GetOpener(self):
+    """Returns an OpenerDirector for making HTTP requests.
+
+    Returns:
+      A urllib2.OpenerDirector object.
+    """
+    raise NotImplementedError()
+
+  def _CreateRequest(self, url, data=None):
+    """Creates a new urllib request."""
+    logging.debug("Creating request for: '%s' with payload:\n%s", url, data)
+    req = urllib2.Request(url, data=data)
+    if self.host_override:
+      req.add_header("Host", self.host_override)
+    for key, value in self.extra_headers.iteritems():
+      req.add_header(key, value)
+    return req
+
+  def _GetAuthToken(self, email, password):
+    """Uses ClientLogin to authenticate the user, returning an auth token.
+
+    Args:
+      email:    The user's email address
+      password: The user's password
+
+    Raises:
+      ClientLoginError: If there was an error authenticating with ClientLogin.
+      HTTPError: If there was some other form of HTTP error.
+
+    Returns:
+      The authentication token returned by ClientLogin.
+    """
+    account_type = "GOOGLE"
+    if self.host.endswith(".google.com"):
+      # Needed for use inside Google.
+      account_type = "HOSTED"
+    req = self._CreateRequest(
+        url="https://www.google.com/accounts/ClientLogin",
+        data=urllib.urlencode({
+            "Email": email,
+            "Passwd": password,
+            "service": "ah",
+            "source": "rietveld-codereview-upload",
+            "accountType": account_type,
+        }),
+    )
+    try:
+      response = self.opener.open(req)
+      response_body = response.read()
+      response_dict = dict(x.split("=")
+                           for x in response_body.split("\n") if x)
+      return response_dict["Auth"]
+    except urllib2.HTTPError, e:
+      if e.code == 403:
+        body = e.read()
+        response_dict = dict(x.split("=", 1) for x in body.split("\n") if x)
+        raise ClientLoginError(req.get_full_url(), e.code, e.msg,
+                               e.headers, response_dict)
+      else:
+        raise
+
+  def _GetAuthCookie(self, auth_token):
+    """Fetches authentication cookies for an authentication token.
+
+    Args:
+      auth_token: The authentication token returned by ClientLogin.
+
+    Raises:
+      HTTPError: If there was an error fetching the authentication cookies.
+    """
+    # This is a dummy value to allow us to identify when we're successful.
+    continue_location = "http://localhost/"
+    args = {"continue": continue_location, "auth": auth_token}
+    req = self._CreateRequest("http://%s/_ah/login?%s" %
+                              (self.host, urllib.urlencode(args)))
+    try:
+      response = self.opener.open(req)
+    except urllib2.HTTPError, e:
+      response = e
+    if (response.code != 302 or
+        response.info()["location"] != continue_location):
+      raise urllib2.HTTPError(req.get_full_url(), response.code, response.msg,
+                              response.headers, response.fp)
+    self.authenticated = True
+
+  def _Authenticate(self):
+    """Authenticates the user.
+
+    The authentication process works as follows:
+     1) We get a username and password from the user
+     2) We use ClientLogin to obtain an AUTH token for the user
+        (see http://code.google.com/apis/accounts/AuthForInstalledApps.html).
+     3) We pass the auth token to /_ah/login on the server to obtain an
+        authentication cookie. If login was successful, it tries to redirect
+        us to the URL we provided.
+
+    If we attempt to access the upload API without first obtaining an
+    authentication cookie, it returns a 401 response and directs us to
+    authenticate ourselves with ClientLogin.
+    """
+    for i in range(3):
+      credentials = self.auth_function()
+      try:
+        auth_token = self._GetAuthToken(credentials[0], credentials[1])
+      except ClientLoginError, e:
+        if e.reason == "BadAuthentication":
+          print >>sys.stderr, "Invalid username or password."
+          continue
+        if e.reason == "CaptchaRequired":
+          print >>sys.stderr, (
+              "Please go to\n"
+              "https://www.google.com/accounts/DisplayUnlockCaptcha\n"
+              "and verify you are a human.  Then try again.")
+          break
+        if e.reason == "NotVerified":
+          print >>sys.stderr, "Account not verified."
+          break
+        if e.reason == "TermsNotAgreed":
+          print >>sys.stderr, "User has not agreed to TOS."
+          break
+        if e.reason == "AccountDeleted":
+          print >>sys.stderr, "The user account has been deleted."
+          break
+        if e.reason == "AccountDisabled":
+          print >>sys.stderr, "The user account has been disabled."
+          break
+        if e.reason == "ServiceDisabled":
+          print >>sys.stderr, ("The user's access to the service has been "
+                               "disabled.")
+          break
+        if e.reason == "ServiceUnavailable":
+          print >>sys.stderr, "The service is not available; try again later."
+          break
+        raise
+      self._GetAuthCookie(auth_token)
+      return
+
+  def Send(self, request_path, payload=None,
+           content_type="application/octet-stream",
+           timeout=None,
+           **kwargs):
+    """Sends an RPC and returns the response.
+
+    Args:
+      request_path: The path to send the request to, eg /api/appversion/create.
+      payload: The body of the request, or None to send an empty request.
+      content_type: The Content-Type header to use.
+      timeout: timeout in seconds; default None i.e. no timeout.
+        (Note: for large requests on OS X, the timeout doesn't work right.)
+      kwargs: Any keyword arguments are converted into query string parameters.
+
+    Returns:
+      The response body, as a string.
+    """
+    # TODO: Don't require authentication.  Let the server say
+    # whether it is necessary.
+    if not self.authenticated:
+      self._Authenticate()
+
+    old_timeout = socket.getdefaulttimeout()
+    socket.setdefaulttimeout(timeout)
+    try:
+      tries = 0
+      while True:
+        tries += 1
+        args = dict(kwargs)
+        url = "http://%s%s" % (self.host, request_path)
+        if args:
+          url += "?" + urllib.urlencode(args)
+        req = self._CreateRequest(url=url, data=payload)
+        req.add_header("Content-Type", content_type)
+        try:
+          f = self.opener.open(req)
+          response = f.read()
+          f.close()
+          return response
+        except urllib2.HTTPError, e:
+          if tries > 3:
+            raise
+          elif e.code == 401:
+            self._Authenticate()
+##           elif e.code >= 500 and e.code < 600:
+##             # Server Error - try again.
+##             continue
+          else:
+            raise
+    finally:
+      socket.setdefaulttimeout(old_timeout)
+
+
+class HttpRpcServer(AbstractRpcServer):
+  """Provides a simplified RPC-style interface for HTTP requests."""
+
+  def _Authenticate(self):
+    """Save the cookie jar after authentication."""
+    super(HttpRpcServer, self)._Authenticate()
+    if self.save_cookies:
+      StatusUpdate("Saving authentication cookies to %s" % self.cookie_file)
+      self.cookie_jar.save()
+
+  def _GetOpener(self):
+    """Returns an OpenerDirector that supports cookies and ignores redirects.
+
+    Returns:
+      A urllib2.OpenerDirector object.
+    """
+    opener = urllib2.OpenerDirector()
+    opener.add_handler(urllib2.ProxyHandler())
+    opener.add_handler(urllib2.UnknownHandler())
+    opener.add_handler(urllib2.HTTPHandler())
+    opener.add_handler(urllib2.HTTPDefaultErrorHandler())
+    opener.add_handler(urllib2.HTTPSHandler())
+    opener.add_handler(urllib2.HTTPErrorProcessor())
+    if self.save_cookies:
+      self.cookie_file = os.path.expanduser("~/.codereview_upload_cookies")
+      self.cookie_jar = cookielib.MozillaCookieJar(self.cookie_file)
+      if os.path.exists(self.cookie_file):
+        try:
+          self.cookie_jar.load()
+          self.authenticated = True
+          StatusUpdate("Loaded authentication cookies from %s" %
+                       self.cookie_file)
+        except (cookielib.LoadError, IOError):
+          # Failed to load cookies - just ignore them.
+          pass
+      else:
+        # Create an empty cookie file with mode 600
+        fd = os.open(self.cookie_file, os.O_CREAT, 0600)
+        os.close(fd)
+      # Always chmod the cookie file
+      os.chmod(self.cookie_file, 0600)
+    else:
+      # Don't save cookies across runs of update.py.
+      self.cookie_jar = cookielib.CookieJar()
+    opener.add_handler(urllib2.HTTPCookieProcessor(self.cookie_jar))
+    return opener
+
+
+parser = optparse.OptionParser(usage="%prog [options] [-- diff_options]")
+parser.add_option("-y", "--assume_yes", action="store_true",
+                  dest="assume_yes", default=False,
+                  help="Assume that the answer to yes/no questions is 'yes'.")
+# Logging
+group = parser.add_option_group("Logging options")
+group.add_option("-q", "--quiet", action="store_const", const=0,
+                 dest="verbose", help="Print errors only.")
+group.add_option("-v", "--verbose", action="store_const", const=2,
+                 dest="verbose", default=1,
+                 help="Print info level logs (default).")
+group.add_option("--noisy", action="store_const", const=3,
+                 dest="verbose", help="Print all logs.")
+# Review server
+group = parser.add_option_group("Review server options")
+group.add_option("-s", "--server", action="store", dest="server",
+                 default="codereview.appspot.com",
+                 metavar="SERVER",
+                 help=("The server to upload to. The format is host[:port]. "
+                       "Defaults to 'codereview.appspot.com'."))
+group.add_option("-e", "--email", action="store", dest="email",
+                 metavar="EMAIL", default=None,
+                 help="The username to use. Will prompt if omitted.")
+group.add_option("-H", "--host", action="store", dest="host",
+                 metavar="HOST", default=None,
+                 help="Overrides the Host header sent with all RPCs.")
+group.add_option("--no_cookies", action="store_false",
+                 dest="save_cookies", default=True,
+                 help="Do not save authentication cookies to local disk.")
+# Issue
+group = parser.add_option_group("Issue options")
+group.add_option("-d", "--description", action="store", dest="description",
+                 metavar="DESCRIPTION", default=None,
+                 help="Optional description when creating an issue.")
+group.add_option("-f", "--description_file", action="store",
+                 dest="description_file", metavar="DESCRIPTION_FILE",
+                 default=None,
+                 help="Optional path of a file that contains "
+                      "the description when creating an issue.")
+group.add_option("-r", "--reviewers", action="store", dest="reviewers",
+                 metavar="REVIEWERS", default=None,
+                 help="Add reviewers (comma separated email addresses).")
+group.add_option("--cc", action="store", dest="cc",
+                 metavar="CC", default=None,
+                 help="Add CC (comma separated email addresses).")
+# Upload options
+group = parser.add_option_group("Patch options")
+group.add_option("-m", "--message", action="store", dest="message",
+                 metavar="MESSAGE", default=None,
+                 help="A message to identify the patch. "
+                      "Will prompt if omitted.")
+group.add_option("-i", "--issue", type="int", action="store",
+                 metavar="ISSUE", default=None,
+                 help="Issue number to which to add. Defaults to new issue.")
+group.add_option("--download_base", action="store_true",
+                 dest="download_base", default=False,
+                 help="Base files will be downloaded by the server "
+                 "(side-by-side diffs may not work on files with CRs).")
+group.add_option("--rev", action="store", dest="revision",
+                 metavar="REV", default=None,
+                 help="Branch/tree/revision to diff against (used by DVCS).")
+group.add_option("--send_mail", action="store_true",
+                 dest="send_mail", default=False,
+                 help="Send notification email to reviewers.")
+
+
+def GetRpcServer(options):
+  """Returns an instance of an AbstractRpcServer.
+
+  Returns:
+    A new AbstractRpcServer, on which RPC calls can be made.
+  """
+
+  rpc_server_class = HttpRpcServer
+
+  def GetUserCredentials():
+    """Prompts the user for a username and password."""
+    email = options.email
+    if email is None:
+      email = GetEmail("Email (login for uploading to %s)" % options.server)
+    password = getpass.getpass("Password for %s: " % email)
+    return (email, password)
+
+  # If this is the dev_appserver, use fake authentication.
+  host = (options.host or options.server).lower()
+  if host == "localhost" or host.startswith("localhost:"):
+    email = options.email
+    if email is None:
+      email = "test@example.com"
+      logging.info("Using debug user %s.  Override with --email" % email)
+    server = rpc_server_class(
+        options.server,
+        lambda: (email, "password"),
+        host_override=options.host,
+        extra_headers={"Cookie":
+                       'dev_appserver_login="%s:False"' % email},
+        save_cookies=options.save_cookies)
+    # Don't try to talk to ClientLogin.
+    server.authenticated = True
+    return server
+
+  return rpc_server_class(options.server, GetUserCredentials,
+                          host_override=options.host,
+                          save_cookies=options.save_cookies)
+
+
+def EncodeMultipartFormData(fields, files):
+  """Encode form fields for multipart/form-data.
+
+  Args:
+    fields: A sequence of (name, value) elements for regular form fields.
+    files: A sequence of (name, filename, value) elements for data to be
+           uploaded as files.
+  Returns:
+    (content_type, body) ready for httplib.HTTP instance.
+
+  Source:
+    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/146306
+  """
+  BOUNDARY = '-M-A-G-I-C---B-O-U-N-D-A-R-Y-'
+  CRLF = '\r\n'
+  lines = []
+  for (key, value) in fields:
+    lines.append('--' + BOUNDARY)
+    lines.append('Content-Disposition: form-data; name="%s"' % key)
+    lines.append('')
+    lines.append(value)
+  for (key, filename, value) in files:
+    lines.append('--' + BOUNDARY)
+    lines.append('Content-Disposition: form-data; name="%s"; filename="%s"' %
+             (key, filename))
+    lines.append('Content-Type: %s' % GetContentType(filename))
+    lines.append('')
+    lines.append(value)
+  lines.append('--' + BOUNDARY + '--')
+  lines.append('')
+  body = CRLF.join(lines)
+  content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
+  return content_type, body
+
+
+def GetContentType(filename):
+  """Helper to guess the content-type from the filename."""
+  return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
+
+
+# Use a shell for subcommands on Windows to get a PATH search.
+use_shell = sys.platform.startswith("win")
+
+def RunShellWithReturnCode(command, print_output=False,
+                           universal_newlines=True):
+  """Executes a command and returns the output from stdout and the return code.
+
+  Args:
+    command: Command to execute.
+    print_output: If True, the output is printed to stdout.
+                  If False, both stdout and stderr are ignored.
+    universal_newlines: Use universal_newlines flag (default: True).
+
+  Returns:
+    Tuple (output, return code)
+  """
+  logging.info("Running %s", command)
+  p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                       shell=use_shell, universal_newlines=universal_newlines)
+  if print_output:
+    output_array = []
+    while True:
+      line = p.stdout.readline()
+      if not line:
+        break
+      print line.strip("\n")
+      output_array.append(line)
+    output = "".join(output_array)
+  else:
+    output = p.stdout.read()
+  p.wait()
+  errout = p.stderr.read()
+  if print_output and errout:
+    print >>sys.stderr, errout
+  p.stdout.close()
+  p.stderr.close()
+  return output, p.returncode
+
+
+def RunShell(command, silent_ok=False, universal_newlines=True,
+             print_output=False):
+  data, retcode = RunShellWithReturnCode(command, print_output,
+                                         universal_newlines)
+  if retcode:
+    ErrorExit("Got error status from %s:\n%s" % (command, data))
+  if not silent_ok and not data:
+    ErrorExit("No output from %s" % command)
+  return data
+
+
+class VersionControlSystem(object):
+  """Abstract base class providing an interface to the VCS."""
+
+  def __init__(self, options):
+    """Constructor.
+
+    Args:
+      options: Command line options.
+    """
+    self.options = options
+
+  def GenerateDiff(self, args):
+    """Return the current diff as a string.
+
+    Args:
+      args: Extra arguments to pass to the diff command.
+    """
+    raise NotImplementedError(
+        "abstract method -- subclass %s must override" % self.__class__)
+
+  def GetUnknownFiles(self):
+    """Return a list of files unknown to the VCS."""
+    raise NotImplementedError(
+        "abstract method -- subclass %s must override" % self.__class__)
+
+  def CheckForUnknownFiles(self):
+    """Show an "are you sure?" prompt if there are unknown files."""
+    unknown_files = self.GetUnknownFiles()
+    if unknown_files:
+      print "The following files are not added to version control:"
+      for line in unknown_files:
+        print line
+      prompt = "Are you sure to continue?(y/N) "
+      answer = raw_input(prompt).strip()
+      if answer != "y":
+        ErrorExit("User aborted")
+
+  def GetBaseFile(self, filename):
+    """Get the content of the upstream version of a file.
+
+    Returns:
+      A tuple (base_content, new_content, is_binary, status)
+        base_content: The contents of the base file.
+        new_content: For text files, this is empty.  For binary files, this is
+          the contents of the new file, since the diff output won't contain
+          information to reconstruct the current file.
+        is_binary: True iff the file is binary.
+        status: The status of the file.
+    """
+
+    raise NotImplementedError(
+        "abstract method -- subclass %s must override" % self.__class__)
+
+
+  def GetBaseFiles(self, diff):
+    """Helper that calls GetBase file for each file in the patch.
+
+    Returns:
+      A dictionary that maps from filename to GetBaseFile's tuple.  Filenames
+      are retrieved based on lines that start with "Index:" or
+      "Property changes on:".
+    """
+    files = {}
+    for line in diff.splitlines(True):
+      if line.startswith('Index:') or line.startswith('Property changes on:'):
+        unused, filename = line.split(':', 1)
+        # On Windows if a file has property changes its filename uses '\'
+        # instead of '/'.
+        filename = filename.strip().replace('\\', '/')
+        files[filename] = self.GetBaseFile(filename)
+    return files
+
+
+  def UploadBaseFiles(self, issue, rpc_server, patch_list, patchset, options,
+                      files):
+    """Uploads the base files (and if necessary, the current ones as well)."""
+
+    def UploadFile(filename, file_id, content, is_binary, status, is_base):
+      """Uploads a file to the server."""
+      file_too_large = False
+      if is_base:
+        type = "base"
+      else:
+        type = "current"
+      if len(content) > MAX_UPLOAD_SIZE:
+        print ("Not uploading the %s file for %s because it's too large." %
+               (type, filename))
+        file_too_large = True
+        content = ""
+      checksum = md5.new(content).hexdigest()
+      if options.verbose > 0 and not file_too_large:
+        print "Uploading %s file for %s" % (type, filename)
+      url = "/%d/upload_content/%d/%d" % (int(issue), int(patchset), file_id)
+      form_fields = [("filename", filename),
+                     ("status", status),
+                     ("checksum", checksum),
+                     ("is_binary", str(is_binary)),
+                     ("is_current", str(not is_base)),
+                    ]
+      if file_too_large:
+        form_fields.append(("file_too_large", "1"))
+      if options.email:
+        form_fields.append(("user", options.email))
+      ctype, body = EncodeMultipartFormData(form_fields,
+                                            [("data", filename, content)])
+      response_body = rpc_server.Send(url, body,
+                                      content_type=ctype)
+      if not response_body.startswith("OK"):
+        StatusUpdate("  --> %s" % response_body)
+        sys.exit(1)
+
+    patches = dict()
+    [patches.setdefault(v, k) for k, v in patch_list]
+    for filename in patches.keys():
+      base_content, new_content, is_binary, status = files[filename]
+      file_id_str = patches.get(filename)
+      if file_id_str.find("nobase") != -1:
+        base_content = None
+        file_id_str = file_id_str[file_id_str.rfind("_") + 1:]
+      file_id = int(file_id_str)
+      if base_content != None:
+        UploadFile(filename, file_id, base_content, is_binary, status, True)
+      if new_content != None:
+        UploadFile(filename, file_id, new_content, is_binary, status, False)
+
+  def IsImage(self, filename):
+    """Returns true if the filename has an image extension."""
+    mimetype =  mimetypes.guess_type(filename)[0]
+    if not mimetype:
+      return False
+    return mimetype.startswith("image/")
+
+
+class SubversionVCS(VersionControlSystem):
+  """Implementation of the VersionControlSystem interface for Subversion."""
+
+  def __init__(self, options):
+    super(SubversionVCS, self).__init__(options)
+    if self.options.revision:
+      match = re.match(r"(\d+)(:(\d+))?", self.options.revision)
+      if not match:
+        ErrorExit("Invalid Subversion revision %s." % self.options.revision)
+      self.rev_start = match.group(1)
+      self.rev_end = match.group(3)
+    else:
+      self.rev_start = self.rev_end = None
+    # Cache output from "svn list -r REVNO dirname".
+    # Keys: dirname, Values: 2-tuple (ouput for start rev and end rev).
+    self.svnls_cache = {}
+    # SVN base URL is required to fetch files deleted in an older revision.
+    # Result is cached to not guess it over and over again in GetBaseFile().
+    required = self.options.download_base or self.options.revision is not None
+    self.svn_base = self._GuessBase(required)
+
+  def GuessBase(self, required):
+    """Wrapper for _GuessBase."""
+    return self.svn_base
+
+  def _GuessBase(self, required):
+    """Returns the SVN base URL.
+
+    Args:
+      required: If true, exits if the url can't be guessed, otherwise None is
+        returned.
+    """
+    info = RunShell(["svn", "info"])
+    for line in info.splitlines():
+      words = line.split()
+      if len(words) == 2 and words[0] == "URL:":
+        url = words[1]
+        scheme, netloc, path, params, query, fragment = urlparse.urlparse(url)
+        username, netloc = urllib.splituser(netloc)
+        if username:
+          logging.info("Removed username from base URL")
+        if netloc.endswith("svn.python.org"):
+          if netloc == "svn.python.org":
+            if path.startswith("/projects/"):
+              path = path[9:]
+          elif netloc != "pythondev@svn.python.org":
+            ErrorExit("Unrecognized Python URL: %s" % url)
+          base = "http://svn.python.org/view/*checkout*%s/" % path
+          logging.info("Guessed Python base = %s", base)
+        elif netloc.endswith("svn.collab.net"):
+          if path.startswith("/repos/"):
+            path = path[6:]
+          base = "http://svn.collab.net/viewvc/*checkout*%s/" % path
+          logging.info("Guessed CollabNet base = %s", base)
+        elif netloc.endswith(".googlecode.com"):
+          path = path + "/"
+          base = urlparse.urlunparse(("http", netloc, path, params,
+                                      query, fragment))
+          logging.info("Guessed Google Code base = %s", base)
+        else:
+          path = path + "/"
+          base = urlparse.urlunparse((scheme, netloc, path, params,
+                                      query, fragment))
+          logging.info("Guessed base = %s", base)
+        return base
+    if required:
+      ErrorExit("Can't find URL in output from svn info")
+    return None
+
+  def GenerateDiff(self, args):
+    cmd = ["svn", "diff"]
+    if self.options.revision:
+      cmd += ["-r", self.options.revision]
+    cmd.extend(args)
+    data = RunShell(cmd)
+    count = 0
+    for line in data.splitlines():
+      if line.startswith("Index:") or line.startswith("Property changes on:"):
+        count += 1
+        logging.info(line)
+    if not count:
+      ErrorExit("No valid patches found in output from svn diff")
+    return data
+
+  def _CollapseKeywords(self, content, keyword_str):
+    """Collapses SVN keywords."""
+    # svn cat translates keywords but svn diff doesn't. As a result of this
+    # behavior patching.PatchChunks() fails with a chunk mismatch error.
+    # This part was originally written by the Review Board development team
+    # who had the same problem (http://reviews.review-board.org/r/276/).
+    # Mapping of keywords to known aliases
+    svn_keywords = {
+      # Standard keywords
+      'Date':                ['Date', 'LastChangedDate'],
+      'Revision':            ['Revision', 'LastChangedRevision', 'Rev'],
+      'Author':              ['Author', 'LastChangedBy'],
+      'HeadURL':             ['HeadURL', 'URL'],
+      'Id':                  ['Id'],
+
+      # Aliases
+      'LastChangedDate':     ['LastChangedDate', 'Date'],
+      'LastChangedRevision': ['LastChangedRevision', 'Rev', 'Revision'],
+      'LastChangedBy':       ['LastChangedBy', 'Author'],
+      'URL':                 ['URL', 'HeadURL'],
+    }
+
+    def repl(m):
+       if m.group(2):
+         return "$%s::%s$" % (m.group(1), " " * len(m.group(3)))
+       return "$%s$" % m.group(1)
+    keywords = [keyword
+                for name in keyword_str.split(" ")
+                for keyword in svn_keywords.get(name, [])]
+    return re.sub(r"\$(%s):(:?)([^\$]+)\$" % '|'.join(keywords), repl, content)
+
+  def GetUnknownFiles(self):
+    status = RunShell(["svn", "status", "--ignore-externals"], silent_ok=True)
+    unknown_files = []
+    for line in status.split("\n"):
+      if line and line[0] == "?":
+        unknown_files.append(line)
+    return unknown_files
+
+  def ReadFile(self, filename):
+    """Returns the contents of a file."""
+    file = open(filename, 'rb')
+    result = ""
+    try:
+      result = file.read()
+    finally:
+      file.close()
+    return result
+
+  def GetStatus(self, filename):
+    """Returns the status of a file."""
+    if not self.options.revision:
+      status = RunShell(["svn", "status", "--ignore-externals", filename])
+      if not status:
+        ErrorExit("svn status returned no output for %s" % filename)
+      status_lines = status.splitlines()
+      # If file is in a cl, the output will begin with
+      # "\n--- Changelist 'cl_name':\n".  See
+      # http://svn.collab.net/repos/svn/trunk/notes/changelist-design.txt
+      if (len(status_lines) == 3 and
+          not status_lines[0] and
+          status_lines[1].startswith("--- Changelist")):
+        status = status_lines[2]
+      else:
+        status = status_lines[0]
+    # If we have a revision to diff against we need to run "svn list"
+    # for the old and the new revision and compare the results to get
+    # the correct status for a file.
+    else:
+      dirname, relfilename = os.path.split(filename)
+      if dirname not in self.svnls_cache:
+        cmd = ["svn", "list", "-r", self.rev_start, dirname or "."]
+        out, returncode = RunShellWithReturnCode(cmd)
+        if returncode:
+          ErrorExit("Failed to get status for %s." % filename)
+        old_files = out.splitlines()
+        args = ["svn", "list"]
+        if self.rev_end:
+          args += ["-r", self.rev_end]
+        cmd = args + [dirname or "."]
+        out, returncode = RunShellWithReturnCode(cmd)
+        if returncode:
+          ErrorExit("Failed to run command %s" % cmd)
+        self.svnls_cache[dirname] = (old_files, out.splitlines())
+      old_files, new_files = self.svnls_cache[dirname]
+      if relfilename in old_files and relfilename not in new_files:
+        status = "D   "
+      elif relfilename in old_files and relfilename in new_files:
+        status = "M   "
+      else:
+        status = "A   "
+    return status
+
+  def GetBaseFile(self, filename):
+    status = self.GetStatus(filename)
+    base_content = None
+    new_content = None
+
+    # If a file is copied its status will be "A  +", which signifies
+    # "addition-with-history".  See "svn st" for more information.  We need to
+    # upload the original file or else diff parsing will fail if the file was
+    # edited.
+    if status[0] == "A" and status[3] != "+":
+      # We'll need to upload the new content if we're adding a binary file
+      # since diff's output won't contain it.
+      mimetype = RunShell(["svn", "propget", "svn:mime-type", filename],
+                          silent_ok=True)
+      base_content = ""
+      is_binary = mimetype and not mimetype.startswith("text/")
+      if is_binary and self.IsImage(filename):
+        new_content = self.ReadFile(filename)
+    elif (status[0] in ("M", "D", "R") or
+          (status[0] == "A" and status[3] == "+") or  # Copied file.
+          (status[0] == " " and status[1] == "M")):  # Property change.
+      args = []
+      if self.options.revision:
+        url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start)
+      else:
+        # Don't change filename, it's needed later.
+        url = filename
+        args += ["-r", "BASE"]
+      cmd = ["svn"] + args + ["propget", "svn:mime-type", url]
+      mimetype, returncode = RunShellWithReturnCode(cmd)
+      if returncode:
+        # File does not exist in the requested revision.
+        # Reset mimetype, it contains an error message.
+        mimetype = ""
+      get_base = False
+      is_binary = mimetype and not mimetype.startswith("text/")
+      if status[0] == " ":
+        # Empty base content just to force an upload.
+        base_content = ""
+      elif is_binary:
+        if self.IsImage(filename):
+          get_base = True
+          if status[0] == "M":
+            if not self.rev_end:
+              new_content = self.ReadFile(filename)
+            else:
+              url = "%s/%s@%s" % (self.svn_base, filename, self.rev_end)
+              new_content = RunShell(["svn", "cat", url],
+                                     universal_newlines=True, silent_ok=True)
+        else:
+          base_content = ""
+      else:
+        get_base = True
+
+      if get_base:
+        if is_binary:
+          universal_newlines = False
+        else:
+          universal_newlines = True
+        if self.rev_start:
+          # "svn cat -r REV delete_file.txt" doesn't work. cat requires
+          # the full URL with "@REV" appended instead of using "-r" option.
+          url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start)
+          base_content = RunShell(["svn", "cat", url],
+                                  universal_newlines=universal_newlines,
+                                  silent_ok=True)
+        else:
+          base_content = RunShell(["svn", "cat", filename],
+                                  universal_newlines=universal_newlines,
+                                  silent_ok=True)
+        if not is_binary:
+          args = []
+          if self.rev_start:
+            url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start)
+          else:
+            url = filename
+            args += ["-r", "BASE"]
+          cmd = ["svn"] + args + ["propget", "svn:keywords", url]
+          keywords, returncode = RunShellWithReturnCode(cmd)
+          if keywords and not returncode:
+            base_content = self._CollapseKeywords(base_content, keywords)
+    else:
+      StatusUpdate("svn status returned unexpected output: %s" % status)
+      sys.exit(1)
+    return base_content, new_content, is_binary, status[0:5]
+
+
+class GitVCS(VersionControlSystem):
+  """Implementation of the VersionControlSystem interface for Git."""
+
+  def __init__(self, options):
+    super(GitVCS, self).__init__(options)
+    # Map of filename -> hash of base file.
+    self.base_hashes = {}
+
+  def GenerateDiff(self, extra_args):
+    # This is more complicated than svn's GenerateDiff because we must convert
+    # the diff output to include an svn-style "Index:" line as well as record
+    # the hashes of the base files, so we can upload them along with our diff.
+    if self.options.revision:
+      extra_args = [self.options.revision] + extra_args
+    gitdiff = RunShell(["git", "diff", "--full-index"] + extra_args)
+    svndiff = []
+    filecount = 0
+    filename = None
+    for line in gitdiff.splitlines():
+      match = re.match(r"diff --git a/(.*) b/.*$", line)
+      if match:
+        filecount += 1
+        filename = match.group(1)
+        svndiff.append("Index: %s\n" % filename)
+      else:
+        # The "index" line in a git diff looks like this (long hashes elided):
+        #   index 82c0d44..b2cee3f 100755
+        # We want to save the left hash, as that identifies the base file.
+        match = re.match(r"index (\w+)\.\.", line)
+        if match:
+          self.base_hashes[filename] = match.group(1)
+      svndiff.append(line + "\n")
+    if not filecount:
+      ErrorExit("No valid patches found in output from git diff")
+    return "".join(svndiff)
+
+  def GetUnknownFiles(self):
+    status = RunShell(["git", "ls-files", "--exclude-standard", "--others"],
+                      silent_ok=True)
+    return status.splitlines()
+
+  def GetBaseFile(self, filename):
+    hash = self.base_hashes[filename]
+    base_content = None
+    new_content = None
+    is_binary = False
+    if hash == "0" * 40:  # All-zero hash indicates no base file.
+      status = "A"
+      base_content = ""
+    else:
+      status = "M"
+      base_content, returncode = RunShellWithReturnCode(["git", "show", hash])
+      if returncode:
+        ErrorExit("Got error status from 'git show %s'" % hash)
+    return (base_content, new_content, is_binary, status)
+
+
+class MercurialVCS(VersionControlSystem):
+  """Implementation of the VersionControlSystem interface for Mercurial."""
+
+  def __init__(self, options, repo_dir):
+    super(MercurialVCS, self).__init__(options)
+    # Absolute path to repository (we can be in a subdir)
+    self.repo_dir = os.path.normpath(repo_dir)
+    # Compute the subdir
+    cwd = os.path.normpath(os.getcwd())
+    assert cwd.startswith(self.repo_dir)
+    self.subdir = cwd[len(self.repo_dir):].lstrip(r"\/")
+    if self.options.revision:
+      self.base_rev = self.options.revision
+    else:
+      self.base_rev = RunShell(["hg", "parent", "-q"]).split(':')[1].strip()
+
+  def _GetRelPath(self, filename):
+    """Get relative path of a file according to the current directory,
+    given its logical path in the repo."""
+    assert filename.startswith(self.subdir), filename
+    return filename[len(self.subdir):].lstrip(r"\/")
+
+  def GenerateDiff(self, extra_args):
+    # If no file specified, restrict to the current subdir
+    extra_args = extra_args or ["."]
+    cmd = ["hg", "diff", "--git", "-r", self.base_rev] + extra_args
+    data = RunShell(cmd, silent_ok=True)
+    svndiff = []
+    filecount = 0
+    for line in data.splitlines():
+      m = re.match("diff --git a/(\S+) b/(\S+)", line)
+      if m:
+        # Modify line to make it look like as it comes from svn diff.
+        # With this modification no changes on the server side are required
+        # to make upload.py work with Mercurial repos.
+        # NOTE: for proper handling of moved/copied files, we have to use
+        # the second filename.
+        filename = m.group(2)
+        svndiff.append("Index: %s" % filename)
+        svndiff.append("=" * 67)
+        filecount += 1
+        logging.info(line)
+      else:
+        svndiff.append(line)
+    if not filecount:
+      ErrorExit("No valid patches found in output from hg diff")
+    return "\n".join(svndiff) + "\n"
+
+  def GetUnknownFiles(self):
+    """Return a list of files unknown to the VCS."""
+    args = []
+    status = RunShell(["hg", "status", "--rev", self.base_rev, "-u", "."],
+        silent_ok=True)
+    unknown_files = []
+    for line in status.splitlines():
+      st, fn = line.split(" ", 1)
+      if st == "?":
+        unknown_files.append(fn)
+    return unknown_files
+
+  def GetBaseFile(self, filename):
+    # "hg status" and "hg cat" both take a path relative to the current subdir
+    # rather than to the repo root, but "hg diff" has given us the full path
+    # to the repo root.
+    base_content = ""
+    new_content = None
+    is_binary = False
+    oldrelpath = relpath = self._GetRelPath(filename)
+    # "hg status -C" returns two lines for moved/copied files, one otherwise
+    out = RunShell(["hg", "status", "-C", "--rev", self.base_rev, relpath])
+    out = out.splitlines()
+    # HACK: strip error message about missing file/directory if it isn't in
+    # the working copy
+    if out[0].startswith('%s: ' % relpath):
+      out = out[1:]
+    if len(out) > 1:
+      # Moved/copied => considered as modified, use old filename to
+      # retrieve base contents
+      oldrelpath = out[1].strip()
+      status = "M"
+    else:
+      status, _ = out[0].split(' ', 1)
+    if status != "A":
+      base_content = RunShell(["hg", "cat", "-r", self.base_rev, oldrelpath],
+        silent_ok=True)
+      is_binary = "\0" in base_content  # Mercurial's heuristic
+    if status != "R":
+      new_content = open(relpath, "rb").read()
+      is_binary = is_binary or "\0" in new_content
+    if is_binary and base_content:
+      # Fetch again without converting newlines
+      base_content = RunShell(["hg", "cat", "-r", self.base_rev, oldrelpath],
+        silent_ok=True, universal_newlines=False)
+    if not is_binary or not self.IsImage(relpath):
+      new_content = None
+    return base_content, new_content, is_binary, status
+
+
+# NOTE: The SplitPatch function is duplicated in engine.py, keep them in sync.
+def SplitPatch(data):
+  """Splits a patch into separate pieces for each file.
+
+  Args:
+    data: A string containing the output of svn diff.
+
+  Returns:
+    A list of 2-tuple (filename, text) where text is the svn diff output
+      pertaining to filename.
+  """
+  patches = []
+  filename = None
+  diff = []
+  for line in data.splitlines(True):
+    new_filename = None
+    if line.startswith('Index:'):
+      unused, new_filename = line.split(':', 1)
+      new_filename = new_filename.strip()
+    elif line.startswith('Property changes on:'):
+      unused, temp_filename = line.split(':', 1)
+      # When a file is modified, paths use '/' between directories, however
+      # when a property is modified '\' is used on Windows.  Make them the same
+      # otherwise the file shows up twice.
+      temp_filename = temp_filename.strip().replace('\\', '/')
+      if temp_filename != filename:
+        # File has property changes but no modifications, create a new diff.
+        new_filename = temp_filename
+    if new_filename:
+      if filename and diff:
+        patches.append((filename, ''.join(diff)))
+      filename = new_filename
+      diff = [line]
+      continue
+    if diff is not None:
+      diff.append(line)
+  if filename and diff:
+    patches.append((filename, ''.join(diff)))
+  return patches
+
+
+def UploadSeparatePatches(issue, rpc_server, patchset, data, options):
+  """Uploads a separate patch for each file in the diff output.
+
+  Returns a list of [patch_key, filename] for each file.
+  """
+  patches = SplitPatch(data)
+  rv = []
+  for patch in patches:
+    if len(patch[1]) > MAX_UPLOAD_SIZE:
+      print ("Not uploading the patch for " + patch[0] +
+             " because the file is too large.")
+      continue
+    form_fields = [("filename", patch[0])]
+    if not options.download_base:
+      form_fields.append(("content_upload", "1"))
+    files = [("data", "data.diff", patch[1])]
+    ctype, body = EncodeMultipartFormData(form_fields, files)
+    url = "/%d/upload_patch/%d" % (int(issue), int(patchset))
+    print "Uploading patch for " + patch[0]
+    response_body = rpc_server.Send(url, body, content_type=ctype)
+    lines = response_body.splitlines()
+    if not lines or lines[0] != "OK":
+      StatusUpdate("  --> %s" % response_body)
+      sys.exit(1)
+    rv.append([lines[1], patch[0]])
+  return rv
+
+
+def GuessVCS(options):
+  """Helper to guess the version control system.
+
+  This examines the current directory, guesses which VersionControlSystem
+  we're using, and returns an instance of the appropriate class.  Exit with an
+  error if we can't figure it out.
+
+  Returns:
+    A VersionControlSystem instance. Exits if the VCS can't be guessed.
+  """
+  # Mercurial has a command to get the base directory of a repository
+  # Try running it, but don't die if we don't have hg installed.
+  # NOTE: we try Mercurial first as it can sit on top of an SVN working copy.
+  try:
+    out, returncode = RunShellWithReturnCode(["hg", "root"])
+    if returncode == 0:
+      return MercurialVCS(options, out.strip())
+  except OSError, (errno, message):
+    if errno != 2:  # ENOENT -- they don't have hg installed.
+      raise
+
+  # Subversion has a .svn in all working directories.
+  if os.path.isdir('.svn'):
+    logging.info("Guessed VCS = Subversion")
+    return SubversionVCS(options)
+
+  # Git has a command to test if you're in a git tree.
+  # Try running it, but don't die if we don't have git installed.
+  try:
+    out, returncode = RunShellWithReturnCode(["git", "rev-parse",
+                                              "--is-inside-work-tree"])
+    if returncode == 0:
+      return GitVCS(options)
+  except OSError, (errno, message):
+    if errno != 2:  # ENOENT -- they don't have git installed.
+      raise
+
+  ErrorExit(("Could not guess version control system. "
+             "Are you in a working copy directory?"))
+
+
+def RealMain(argv, data=None):
+  """The real main function.
+
+  Args:
+    argv: Command line arguments.
+    data: Diff contents. If None (default) the diff is generated by
+      the VersionControlSystem implementation returned by GuessVCS().
+
+  Returns:
+    A 2-tuple (issue id, patchset id).
+    The patchset id is None if the base files are not uploaded by this
+    script (applies only to SVN checkouts).
+  """
+  logging.basicConfig(format=("%(asctime).19s %(levelname)s %(filename)s:"
+                              "%(lineno)s %(message)s "))
+  os.environ['LC_ALL'] = 'C'
+  options, args = parser.parse_args(argv[1:])
+  global verbosity
+  verbosity = options.verbose
+  if verbosity >= 3:
+    logging.getLogger().setLevel(logging.DEBUG)
+  elif verbosity >= 2:
+    logging.getLogger().setLevel(logging.INFO)
+  vcs = GuessVCS(options)
+  if isinstance(vcs, SubversionVCS):
+    # base field is only allowed for Subversion.
+    # Note: Fetching base files may become deprecated in future releases.
+    base = vcs.GuessBase(options.download_base)
+  else:
+    base = None
+  if not base and options.download_base:
+    options.download_base = True
+    logging.info("Enabled upload of base file")
+  if not options.assume_yes:
+    vcs.CheckForUnknownFiles()
+  if data is None:
+    data = vcs.GenerateDiff(args)
+  files = vcs.GetBaseFiles(data)
+  if verbosity >= 1:
+    print "Upload server:", options.server, "(change with -s/--server)"
+  if options.issue:
+    prompt = "Message describing this patch set: "
+  else:
+    prompt = "New issue subject: "
+  message = options.message or raw_input(prompt).strip()
+  if not message:
+    ErrorExit("A non-empty message is required")
+  rpc_server = GetRpcServer(options)
+  form_fields = [("subject", message)]
+  if base:
+    form_fields.append(("base", base))
+  if options.issue:
+    form_fields.append(("issue", str(options.issue)))
+  if options.email:
+    form_fields.append(("user", options.email))
+  if options.reviewers:
+    for reviewer in options.reviewers.split(','):
+      if "@" in reviewer and not reviewer.split("@")[1].count(".") == 1:
+        ErrorExit("Invalid email address: %s" % reviewer)
+    form_fields.append(("reviewers", options.reviewers))
+  if options.cc:
+    for cc in options.cc.split(','):
+      if "@" in cc and not cc.split("@")[1].count(".") == 1:
+        ErrorExit("Invalid email address: %s" % cc)
+    form_fields.append(("cc", options.cc))
+  description = options.description
+  if options.description_file:
+    if options.description:
+      ErrorExit("Can't specify description and description_file")
+    file = open(options.description_file, 'r')
+    description = file.read()
+    file.close()
+  if description:
+    form_fields.append(("description", description))
+  # Send a hash of all the base file so the server can determine if a copy
+  # already exists in an earlier patchset.
+  base_hashes = ""
+  for file, info in files.iteritems():
+    if not info[0] is None:
+      checksum = md5.new(info[0]).hexdigest()
+      if base_hashes:
+        base_hashes += "|"
+      base_hashes += checksum + ":" + file
+  form_fields.append(("base_hashes", base_hashes))
+  # If we're uploading base files, don't send the email before the uploads, so
+  # that it contains the file status.
+  if options.send_mail and options.download_base:
+    form_fields.append(("send_mail", "1"))
+  if not options.download_base:
+    form_fields.append(("content_upload", "1"))
+  if len(data) > MAX_UPLOAD_SIZE:
+    print "Patch is large, so uploading file patches separately."
+    uploaded_diff_file = []
+    form_fields.append(("separate_patches", "1"))
+  else:
+    uploaded_diff_file = [("data", "data.diff", data)]
+  ctype, body = EncodeMultipartFormData(form_fields, uploaded_diff_file)
+  response_body = rpc_server.Send("/upload", body, content_type=ctype)
+  patchset = None
+  if not options.download_base or not uploaded_diff_file:
+    lines = response_body.splitlines()
+    if len(lines) >= 2:
+      msg = lines[0]
+      patchset = lines[1].strip()
+      patches = [x.split(" ", 1) for x in lines[2:]]
+    else:
+      msg = response_body
+  else:
+    msg = response_body
+  StatusUpdate(msg)
+  if not response_body.startswith("Issue created.") and \
+  not response_body.startswith("Issue updated."):
+    sys.exit(0)
+  issue = msg[msg.rfind("/")+1:]
+
+  if not uploaded_diff_file:
+    result = UploadSeparatePatches(issue, rpc_server, patchset, data, options)
+    if not options.download_base:
+      patches = result
+
+  if not options.download_base:
+    vcs.UploadBaseFiles(issue, rpc_server, patches, patchset, options, files)
+    if options.send_mail:
+      rpc_server.Send("/" + issue + "/mail", payload="")
+  return issue, patchset
+
+
+def main():
+  try:
+    RealMain(sys.argv)
+  except KeyboardInterrupt:
+    print
+    StatusUpdate("Interrupted.")
+    sys.exit(1)
+
+
+if __name__ == "__main__":
+  main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/upload_gmock.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/upload_gmock.py
new file mode 100755
index 0000000000..5dc484b391
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/scripts/upload_gmock.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+#
+# Copyright 2009, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""upload_gmock.py v0.1.0 -- uploads a Google Mock patch for review.
+
+This simple wrapper passes all command line flags and
+--cc=googlemock@googlegroups.com to upload.py.
+
+USAGE: upload_gmock.py [options for upload.py]
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import sys
+
+CC_FLAG = '--cc='
+GMOCK_GROUP = 'googlemock@googlegroups.com'
+
+
+def main():
+  # Finds the path to upload.py, assuming it is in the same directory
+  # as this file.
+  my_dir = os.path.dirname(os.path.abspath(__file__))
+  upload_py_path = os.path.join(my_dir, 'upload.py')
+
+  # Adds Google Mock discussion group to the cc line if it's not there
+  # already.
+  upload_py_argv = [upload_py_path]
+  found_cc_flag = False
+  for arg in sys.argv[1:]:
+    if arg.startswith(CC_FLAG):
+      found_cc_flag = True
+      cc_line = arg[len(CC_FLAG):]
+      cc_list = [addr for addr in cc_line.split(',') if addr]
+      if GMOCK_GROUP not in cc_list:
+        cc_list.append(GMOCK_GROUP)
+      upload_py_argv.append(CC_FLAG + ','.join(cc_list))
+    else:
+      upload_py_argv.append(arg)
+
+  if not found_cc_flag:
+    upload_py_argv.append(CC_FLAG + GMOCK_GROUP)
+
+  # Invokes upload.py with the modified command line flags.
+  os.execv(upload_py_path, upload_py_argv)
+
+
+if __name__ == '__main__':
+  main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-all.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-all.cc
new file mode 100644
index 0000000000..7aebce7afe
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-all.cc
@@ -0,0 +1,47 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Google C++ Mocking Framework (Google Mock)
+//
+// This file #includes all Google Mock implementation .cc files.  The
+// purpose is to allow a user to build Google Mock by compiling this
+// file alone.
+
+// This line ensures that gmock.h can be compiled on its own, even
+// when it's fused.
+#include "gmock/gmock.h"
+
+// The following lines pull in the real gmock *.cc files.
+#include "src/gmock-cardinalities.cc"
+#include "src/gmock-internal-utils.cc"
+#include "src/gmock-matchers.cc"
+#include "src/gmock-spec-builders.cc"
+#include "src/gmock.cc"
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-cardinalities.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-cardinalities.cc
new file mode 100644
index 0000000000..50ec7286ee
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-cardinalities.cc
@@ -0,0 +1,156 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements cardinalities.
+
+#include "gmock/gmock-cardinalities.h"
+
+#include <limits.h>
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <string>
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+
+namespace {
+
+// Implements the Between(m, n) cardinality.
+class BetweenCardinalityImpl : public CardinalityInterface {
+ public:
+  BetweenCardinalityImpl(int min, int max)
+      : min_(min >= 0 ? min : 0),
+        max_(max >= min_ ? max : min_) {
+    std::stringstream ss;
+    if (min < 0) {
+      ss << "The invocation lower bound must be >= 0, "
+         << "but is actually " << min << ".";
+      internal::Expect(false, __FILE__, __LINE__, ss.str());
+    } else if (max < 0) {
+      ss << "The invocation upper bound must be >= 0, "
+         << "but is actually " << max << ".";
+      internal::Expect(false, __FILE__, __LINE__, ss.str());
+    } else if (min > max) {
+      ss << "The invocation upper bound (" << max
+         << ") must be >= the invocation lower bound (" << min
+         << ").";
+      internal::Expect(false, __FILE__, __LINE__, ss.str());
+    }
+  }
+
+  // Conservative estimate on the lower/upper bound of the number of
+  // calls allowed.
+  virtual int ConservativeLowerBound() const { return min_; }
+  virtual int ConservativeUpperBound() const { return max_; }
+
+  virtual bool IsSatisfiedByCallCount(int call_count) const {
+    return min_ <= call_count && call_count <= max_;
+  }
+
+  virtual bool IsSaturatedByCallCount(int call_count) const {
+    return call_count >= max_;
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const;
+
+ private:
+  const int min_;
+  const int max_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(BetweenCardinalityImpl);
+};
+
+// Formats "n times" in a human-friendly way.
+inline internal::string FormatTimes(int n) {
+  if (n == 1) {
+    return "once";
+  } else if (n == 2) {
+    return "twice";
+  } else {
+    std::stringstream ss;
+    ss << n << " times";
+    return ss.str();
+  }
+}
+
+// Describes the Between(m, n) cardinality in human-friendly text.
+void BetweenCardinalityImpl::DescribeTo(::std::ostream* os) const {
+  if (min_ == 0) {
+    if (max_ == 0) {
+      *os << "never called";
+    } else if (max_ == INT_MAX) {
+      *os << "called any number of times";
+    } else {
+      *os << "called at most " << FormatTimes(max_);
+    }
+  } else if (min_ == max_) {
+    *os << "called " << FormatTimes(min_);
+  } else if (max_ == INT_MAX) {
+    *os << "called at least " << FormatTimes(min_);
+  } else {
+    // 0 < min_ < max_ < INT_MAX
+    *os << "called between " << min_ << " and " << max_ << " times";
+  }
+}
+
+}  // Unnamed namespace
+
+// Describes the given call count to an ostream.
+void Cardinality::DescribeActualCallCountTo(int actual_call_count,
+                                            ::std::ostream* os) {
+  if (actual_call_count > 0) {
+    *os << "called " << FormatTimes(actual_call_count);
+  } else {
+    *os << "never called";
+  }
+}
+
+// Creates a cardinality that allows at least n calls.
+GTEST_API_ Cardinality AtLeast(int n) { return Between(n, INT_MAX); }
+
+// Creates a cardinality that allows at most n calls.
+GTEST_API_ Cardinality AtMost(int n) { return Between(0, n); }
+
+// Creates a cardinality that allows any number of calls.
+GTEST_API_ Cardinality AnyNumber() { return AtLeast(0); }
+
+// Creates a cardinality that allows between min and max calls.
+GTEST_API_ Cardinality Between(int min, int max) {
+  return Cardinality(new BetweenCardinalityImpl(min, max));
+}
+
+// Creates a cardinality that allows exactly n calls.
+GTEST_API_ Cardinality Exactly(int n) { return Between(n, n); }
+
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-internal-utils.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-internal-utils.cc
new file mode 100644
index 0000000000..fb5308018a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-internal-utils.cc
@@ -0,0 +1,174 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file defines some utilities useful for implementing Google
+// Mock.  They are subject to change without notice, so please DO NOT
+// USE THEM IN USER CODE.
+
+#include "gmock/internal/gmock-internal-utils.h"
+
+#include <ctype.h>
+#include <ostream>  // NOLINT
+#include <string>
+#include "gmock/gmock.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+namespace internal {
+
+// Converts an identifier name to a space-separated list of lower-case
+// words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is
+// treated as one word.  For example, both "FooBar123" and
+// "foo_bar_123" are converted to "foo bar 123".
+GTEST_API_ string ConvertIdentifierNameToWords(const char* id_name) {
+  string result;
+  char prev_char = '\0';
+  for (const char* p = id_name; *p != '\0'; prev_char = *(p++)) {
+    // We don't care about the current locale as the input is
+    // guaranteed to be a valid C++ identifier name.
+    const bool starts_new_word = IsUpper(*p) ||
+        (!IsAlpha(prev_char) && IsLower(*p)) ||
+        (!IsDigit(prev_char) && IsDigit(*p));
+
+    if (IsAlNum(*p)) {
+      if (starts_new_word && result != "")
+        result += ' ';
+      result += ToLower(*p);
+    }
+  }
+  return result;
+}
+
+// This class reports Google Mock failures as Google Test failures.  A
+// user can define another class in a similar fashion if he intends to
+// use Google Mock with a testing framework other than Google Test.
+class GoogleTestFailureReporter : public FailureReporterInterface {
+ public:
+  virtual void ReportFailure(FailureType type, const char* file, int line,
+                             const string& message) {
+    AssertHelper(type == kFatal ?
+                 TestPartResult::kFatalFailure :
+                 TestPartResult::kNonFatalFailure,
+                 file,
+                 line,
+                 message.c_str()) = Message();
+    if (type == kFatal) {
+      posix::Abort();
+    }
+  }
+};
+
+// Returns the global failure reporter.  Will create a
+// GoogleTestFailureReporter and return it the first time called.
+GTEST_API_ FailureReporterInterface* GetFailureReporter() {
+  // Points to the global failure reporter used by Google Mock.  gcc
+  // guarantees that the following use of failure_reporter is
+  // thread-safe.  We may need to add additional synchronization to
+  // protect failure_reporter if we port Google Mock to other
+  // compilers.
+  static FailureReporterInterface* const failure_reporter =
+      new GoogleTestFailureReporter();
+  return failure_reporter;
+}
+
+// Protects global resources (stdout in particular) used by Log().
+static GTEST_DEFINE_STATIC_MUTEX_(g_log_mutex);
+
+// Returns true iff a log with the given severity is visible according
+// to the --gmock_verbose flag.
+GTEST_API_ bool LogIsVisible(LogSeverity severity) {
+  if (GMOCK_FLAG(verbose) == kInfoVerbosity) {
+    // Always show the log if --gmock_verbose=info.
+    return true;
+  } else if (GMOCK_FLAG(verbose) == kErrorVerbosity) {
+    // Always hide it if --gmock_verbose=error.
+    return false;
+  } else {
+    // If --gmock_verbose is neither "info" nor "error", we treat it
+    // as "warning" (its default value).
+    return severity == kWarning;
+  }
+}
+
+// Prints the given message to stdout iff 'severity' >= the level
+// specified by the --gmock_verbose flag.  If stack_frames_to_skip >=
+// 0, also prints the stack trace excluding the top
+// stack_frames_to_skip frames.  In opt mode, any positive
+// stack_frames_to_skip is treated as 0, since we don't know which
+// function calls will be inlined by the compiler and need to be
+// conservative.
+GTEST_API_ void Log(LogSeverity severity,
+                    const string& message,
+                    int stack_frames_to_skip) {
+  if (!LogIsVisible(severity))
+    return;
+
+  // Ensures that logs from different threads don't interleave.
+  MutexLock l(&g_log_mutex);
+
+  // "using ::std::cout;" doesn't work with Symbian's STLport, where cout is a
+  // macro.
+
+  if (severity == kWarning) {
+    // Prints a GMOCK WARNING marker to make the warnings easily searchable.
+    std::cout << "\nGMOCK WARNING:";
+  }
+  // Pre-pends a new-line to message if it doesn't start with one.
+  if (message.empty() || message[0] != '\n') {
+    std::cout << "\n";
+  }
+  std::cout << message;
+  if (stack_frames_to_skip >= 0) {
+#ifdef NDEBUG
+    // In opt mode, we have to be conservative and skip no stack frame.
+    const int actual_to_skip = 0;
+#else
+    // In dbg mode, we can do what the caller tell us to do (plus one
+    // for skipping this function's stack frame).
+    const int actual_to_skip = stack_frames_to_skip + 1;
+#endif  // NDEBUG
+
+    // Appends a new-line to message if it doesn't end with one.
+    if (!message.empty() && *message.rbegin() != '\n') {
+      std::cout << "\n";
+    }
+    std::cout << "Stack trace:\n"
+         << ::testing::internal::GetCurrentOsStackTraceExceptTop(
+             ::testing::UnitTest::GetInstance(), actual_to_skip);
+  }
+  std::cout << ::std::flush;
+}
+
+}  // namespace internal
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-matchers.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-matchers.cc
new file mode 100644
index 0000000000..e7424510fc
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-matchers.cc
@@ -0,0 +1,498 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements Matcher<const string&>, Matcher<string>, and
+// utilities for defining matchers.
+
+#include "gmock/gmock-matchers.h"
+#include "gmock/gmock-generated-matchers.h"
+
+#include <string.h>
+#include <sstream>
+#include <string>
+
+namespace testing {
+
+// Constructs a matcher that matches a const string& whose value is
+// equal to s.
+Matcher<const internal::string&>::Matcher(const internal::string& s) {
+  *this = Eq(s);
+}
+
+// Constructs a matcher that matches a const string& whose value is
+// equal to s.
+Matcher<const internal::string&>::Matcher(const char* s) {
+  *this = Eq(internal::string(s));
+}
+
+// Constructs a matcher that matches a string whose value is equal to s.
+Matcher<internal::string>::Matcher(const internal::string& s) { *this = Eq(s); }
+
+// Constructs a matcher that matches a string whose value is equal to s.
+Matcher<internal::string>::Matcher(const char* s) {
+  *this = Eq(internal::string(s));
+}
+
+#if GTEST_HAS_STRING_PIECE_
+// Constructs a matcher that matches a const StringPiece& whose value is
+// equal to s.
+Matcher<const StringPiece&>::Matcher(const internal::string& s) {
+  *this = Eq(s);
+}
+
+// Constructs a matcher that matches a const StringPiece& whose value is
+// equal to s.
+Matcher<const StringPiece&>::Matcher(const char* s) {
+  *this = Eq(internal::string(s));
+}
+
+// Constructs a matcher that matches a const StringPiece& whose value is
+// equal to s.
+Matcher<const StringPiece&>::Matcher(StringPiece s) {
+  *this = Eq(s.ToString());
+}
+
+// Constructs a matcher that matches a StringPiece whose value is equal to s.
+Matcher<StringPiece>::Matcher(const internal::string& s) {
+  *this = Eq(s);
+}
+
+// Constructs a matcher that matches a StringPiece whose value is equal to s.
+Matcher<StringPiece>::Matcher(const char* s) {
+  *this = Eq(internal::string(s));
+}
+
+// Constructs a matcher that matches a StringPiece whose value is equal to s.
+Matcher<StringPiece>::Matcher(StringPiece s) {
+  *this = Eq(s.ToString());
+}
+#endif  // GTEST_HAS_STRING_PIECE_
+
+namespace internal {
+
+// Joins a vector of strings as if they are fields of a tuple; returns
+// the joined string.
+GTEST_API_ string JoinAsTuple(const Strings& fields) {
+  switch (fields.size()) {
+    case 0:
+      return "";
+    case 1:
+      return fields[0];
+    default:
+      string result = "(" + fields[0];
+      for (size_t i = 1; i < fields.size(); i++) {
+        result += ", ";
+        result += fields[i];
+      }
+      result += ")";
+      return result;
+  }
+}
+
+// Returns the description for a matcher defined using the MATCHER*()
+// macro where the user-supplied description string is "", if
+// 'negation' is false; otherwise returns the description of the
+// negation of the matcher.  'param_values' contains a list of strings
+// that are the print-out of the matcher's parameters.
+GTEST_API_ string FormatMatcherDescription(bool negation,
+                                           const char* matcher_name,
+                                           const Strings& param_values) {
+  string result = ConvertIdentifierNameToWords(matcher_name);
+  if (param_values.size() >= 1)
+    result += " " + JoinAsTuple(param_values);
+  return negation ? "not (" + result + ")" : result;
+}
+
+// FindMaxBipartiteMatching and its helper class.
+//
+// Uses the well-known Ford-Fulkerson max flow method to find a maximum
+// bipartite matching. Flow is considered to be from left to right.
+// There is an implicit source node that is connected to all of the left
+// nodes, and an implicit sink node that is connected to all of the
+// right nodes. All edges have unit capacity.
+//
+// Neither the flow graph nor the residual flow graph are represented
+// explicitly. Instead, they are implied by the information in 'graph' and
+// a vector<int> called 'left_' whose elements are initialized to the
+// value kUnused. This represents the initial state of the algorithm,
+// where the flow graph is empty, and the residual flow graph has the
+// following edges:
+//   - An edge from source to each left_ node
+//   - An edge from each right_ node to sink
+//   - An edge from each left_ node to each right_ node, if the
+//     corresponding edge exists in 'graph'.
+//
+// When the TryAugment() method adds a flow, it sets left_[l] = r for some
+// nodes l and r. This induces the following changes:
+//   - The edges (source, l), (l, r), and (r, sink) are added to the
+//     flow graph.
+//   - The same three edges are removed from the residual flow graph.
+//   - The reverse edges (l, source), (r, l), and (sink, r) are added
+//     to the residual flow graph, which is a directional graph
+//     representing unused flow capacity.
+//
+// When the method augments a flow (moving left_[l] from some r1 to some
+// other r2), this can be thought of as "undoing" the above steps with
+// respect to r1 and "redoing" them with respect to r2.
+//
+// It bears repeating that the flow graph and residual flow graph are
+// never represented explicitly, but can be derived by looking at the
+// information in 'graph' and in left_.
+//
+// As an optimization, there is a second vector<int> called right_ which
+// does not provide any new information. Instead, it enables more
+// efficient queries about edges entering or leaving the right-side nodes
+// of the flow or residual flow graphs. The following invariants are
+// maintained:
+//
+// left[l] == kUnused or right[left[l]] == l
+// right[r] == kUnused or left[right[r]] == r
+//
+// . [ source ]                                        .
+// .   |||                                             .
+// .   |||                                             .
+// .   ||\--> left[0]=1  ---\    right[0]=-1 ----\     .
+// .   ||                   |                    |     .
+// .   |\---> left[1]=-1    \--> right[1]=0  ---\|     .
+// .   |                                        ||     .
+// .   \----> left[2]=2  ------> right[2]=2  --\||     .
+// .                                           |||     .
+// .         elements           matchers       vvv     .
+// .                                         [ sink ]  .
+//
+// See Also:
+//   [1] Cormen, et al (2001). "Section 26.2: The Ford-Fulkerson method".
+//       "Introduction to Algorithms (Second ed.)", pp. 651-664.
+//   [2] "Ford-Fulkerson algorithm", Wikipedia,
+//       'http://en.wikipedia.org/wiki/Ford%E2%80%93Fulkerson_algorithm'
+class MaxBipartiteMatchState {
+ public:
+  explicit MaxBipartiteMatchState(const MatchMatrix& graph)
+      : graph_(&graph),
+        left_(graph_->LhsSize(), kUnused),
+        right_(graph_->RhsSize(), kUnused) {
+  }
+
+  // Returns the edges of a maximal match, each in the form {left, right}.
+  ElementMatcherPairs Compute() {
+    // 'seen' is used for path finding { 0: unseen, 1: seen }.
+    ::std::vector<char> seen;
+    // Searches the residual flow graph for a path from each left node to
+    // the sink in the residual flow graph, and if one is found, add flow
+    // to the graph. It's okay to search through the left nodes once. The
+    // edge from the implicit source node to each previously-visited left
+    // node will have flow if that left node has any path to the sink
+    // whatsoever. Subsequent augmentations can only add flow to the
+    // network, and cannot take away that previous flow unit from the source.
+    // Since the source-to-left edge can only carry one flow unit (or,
+    // each element can be matched to only one matcher), there is no need
+    // to visit the left nodes more than once looking for augmented paths.
+    // The flow is known to be possible or impossible by looking at the
+    // node once.
+    for (size_t ilhs = 0; ilhs < graph_->LhsSize(); ++ilhs) {
+      // Reset the path-marking vector and try to find a path from
+      // source to sink starting at the left_[ilhs] node.
+      GTEST_CHECK_(left_[ilhs] == kUnused)
+          << "ilhs: " << ilhs << ", left_[ilhs]: " << left_[ilhs];
+      // 'seen' initialized to 'graph_->RhsSize()' copies of 0.
+      seen.assign(graph_->RhsSize(), 0);
+      TryAugment(ilhs, &seen);
+    }
+    ElementMatcherPairs result;
+    for (size_t ilhs = 0; ilhs < left_.size(); ++ilhs) {
+      size_t irhs = left_[ilhs];
+      if (irhs == kUnused) continue;
+      result.push_back(ElementMatcherPair(ilhs, irhs));
+    }
+    return result;
+  }
+
+ private:
+  static const size_t kUnused = static_cast<size_t>(-1);
+
+  // Perform a depth-first search from left node ilhs to the sink.  If a
+  // path is found, flow is added to the network by linking the left and
+  // right vector elements corresponding each segment of the path.
+  // Returns true if a path to sink was found, which means that a unit of
+  // flow was added to the network. The 'seen' vector elements correspond
+  // to right nodes and are marked to eliminate cycles from the search.
+  //
+  // Left nodes will only be explored at most once because they
+  // are accessible from at most one right node in the residual flow
+  // graph.
+  //
+  // Note that left_[ilhs] is the only element of left_ that TryAugment will
+  // potentially transition from kUnused to another value. Any other
+  // left_ element holding kUnused before TryAugment will be holding it
+  // when TryAugment returns.
+  //
+  bool TryAugment(size_t ilhs, ::std::vector<char>* seen) {
+    for (size_t irhs = 0; irhs < graph_->RhsSize(); ++irhs) {
+      if ((*seen)[irhs])
+        continue;
+      if (!graph_->HasEdge(ilhs, irhs))
+        continue;
+      // There's an available edge from ilhs to irhs.
+      (*seen)[irhs] = 1;
+      // Next a search is performed to determine whether
+      // this edge is a dead end or leads to the sink.
+      //
+      // right_[irhs] == kUnused means that there is residual flow from
+      // right node irhs to the sink, so we can use that to finish this
+      // flow path and return success.
+      //
+      // Otherwise there is residual flow to some ilhs. We push flow
+      // along that path and call ourselves recursively to see if this
+      // ultimately leads to sink.
+      if (right_[irhs] == kUnused || TryAugment(right_[irhs], seen)) {
+        // Add flow from left_[ilhs] to right_[irhs].
+        left_[ilhs] = irhs;
+        right_[irhs] = ilhs;
+        return true;
+      }
+    }
+    return false;
+  }
+
+  const MatchMatrix* graph_;  // not owned
+  // Each element of the left_ vector represents a left hand side node
+  // (i.e. an element) and each element of right_ is a right hand side
+  // node (i.e. a matcher). The values in the left_ vector indicate
+  // outflow from that node to a node on the the right_ side. The values
+  // in the right_ indicate inflow, and specify which left_ node is
+  // feeding that right_ node, if any. For example, left_[3] == 1 means
+  // there's a flow from element #3 to matcher #1. Such a flow would also
+  // be redundantly represented in the right_ vector as right_[1] == 3.
+  // Elements of left_ and right_ are either kUnused or mutually
+  // referent. Mutually referent means that left_[right_[i]] = i and
+  // right_[left_[i]] = i.
+  ::std::vector<size_t> left_;
+  ::std::vector<size_t> right_;
+
+  GTEST_DISALLOW_ASSIGN_(MaxBipartiteMatchState);
+};
+
+const size_t MaxBipartiteMatchState::kUnused;
+
+GTEST_API_ ElementMatcherPairs
+FindMaxBipartiteMatching(const MatchMatrix& g) {
+  return MaxBipartiteMatchState(g).Compute();
+}
+
+static void LogElementMatcherPairVec(const ElementMatcherPairs& pairs,
+                                     ::std::ostream* stream) {
+  typedef ElementMatcherPairs::const_iterator Iter;
+  ::std::ostream& os = *stream;
+  os << "{";
+  const char *sep = "";
+  for (Iter it = pairs.begin(); it != pairs.end(); ++it) {
+    os << sep << "\n  ("
+       << "element #" << it->first << ", "
+       << "matcher #" << it->second << ")";
+    sep = ",";
+  }
+  os << "\n}";
+}
+
+// Tries to find a pairing, and explains the result.
+GTEST_API_ bool FindPairing(const MatchMatrix& matrix,
+                            MatchResultListener* listener) {
+  ElementMatcherPairs matches = FindMaxBipartiteMatching(matrix);
+
+  size_t max_flow = matches.size();
+  bool result = (max_flow == matrix.RhsSize());
+
+  if (!result) {
+    if (listener->IsInterested()) {
+      *listener << "where no permutation of the elements can "
+                   "satisfy all matchers, and the closest match is "
+                << max_flow << " of " << matrix.RhsSize()
+                << " matchers with the pairings:\n";
+      LogElementMatcherPairVec(matches, listener->stream());
+    }
+    return false;
+  }
+
+  if (matches.size() > 1) {
+    if (listener->IsInterested()) {
+      const char *sep = "where:\n";
+      for (size_t mi = 0; mi < matches.size(); ++mi) {
+        *listener << sep << " - element #" << matches[mi].first
+                  << " is matched by matcher #" << matches[mi].second;
+        sep = ",\n";
+      }
+    }
+  }
+  return true;
+}
+
+bool MatchMatrix::NextGraph() {
+  for (size_t ilhs = 0; ilhs < LhsSize(); ++ilhs) {
+    for (size_t irhs = 0; irhs < RhsSize(); ++irhs) {
+      char& b = matched_[SpaceIndex(ilhs, irhs)];
+      if (!b) {
+        b = 1;
+        return true;
+      }
+      b = 0;
+    }
+  }
+  return false;
+}
+
+void MatchMatrix::Randomize() {
+  for (size_t ilhs = 0; ilhs < LhsSize(); ++ilhs) {
+    for (size_t irhs = 0; irhs < RhsSize(); ++irhs) {
+      char& b = matched_[SpaceIndex(ilhs, irhs)];
+      b = static_cast<char>(rand() & 1);  // NOLINT
+    }
+  }
+}
+
+string MatchMatrix::DebugString() const {
+  ::std::stringstream ss;
+  const char *sep = "";
+  for (size_t i = 0; i < LhsSize(); ++i) {
+    ss << sep;
+    for (size_t j = 0; j < RhsSize(); ++j) {
+      ss << HasEdge(i, j);
+    }
+    sep = ";";
+  }
+  return ss.str();
+}
+
+void UnorderedElementsAreMatcherImplBase::DescribeToImpl(
+    ::std::ostream* os) const {
+  if (matcher_describers_.empty()) {
+    *os << "is empty";
+    return;
+  }
+  if (matcher_describers_.size() == 1) {
+    *os << "has " << Elements(1) << " and that element ";
+    matcher_describers_[0]->DescribeTo(os);
+    return;
+  }
+  *os << "has " << Elements(matcher_describers_.size())
+      << " and there exists some permutation of elements such that:\n";
+  const char* sep = "";
+  for (size_t i = 0; i != matcher_describers_.size(); ++i) {
+    *os << sep << " - element #" << i << " ";
+    matcher_describers_[i]->DescribeTo(os);
+    sep = ", and\n";
+  }
+}
+
+void UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(
+    ::std::ostream* os) const {
+  if (matcher_describers_.empty()) {
+    *os << "isn't empty";
+    return;
+  }
+  if (matcher_describers_.size() == 1) {
+    *os << "doesn't have " << Elements(1)
+        << ", or has " << Elements(1) << " that ";
+    matcher_describers_[0]->DescribeNegationTo(os);
+    return;
+  }
+  *os << "doesn't have " << Elements(matcher_describers_.size())
+      << ", or there exists no permutation of elements such that:\n";
+  const char* sep = "";
+  for (size_t i = 0; i != matcher_describers_.size(); ++i) {
+    *os << sep << " - element #" << i << " ";
+    matcher_describers_[i]->DescribeTo(os);
+    sep = ", and\n";
+  }
+}
+
+// Checks that all matchers match at least one element, and that all
+// elements match at least one matcher. This enables faster matching
+// and better error reporting.
+// Returns false, writing an explanation to 'listener', if and only
+// if the success criteria are not met.
+bool UnorderedElementsAreMatcherImplBase::
+VerifyAllElementsAndMatchersAreMatched(
+    const ::std::vector<string>& element_printouts,
+    const MatchMatrix& matrix,
+    MatchResultListener* listener) const {
+  bool result = true;
+  ::std::vector<char> element_matched(matrix.LhsSize(), 0);
+  ::std::vector<char> matcher_matched(matrix.RhsSize(), 0);
+
+  for (size_t ilhs = 0; ilhs < matrix.LhsSize(); ilhs++) {
+    for (size_t irhs = 0; irhs < matrix.RhsSize(); irhs++) {
+      char matched = matrix.HasEdge(ilhs, irhs);
+      element_matched[ilhs] |= matched;
+      matcher_matched[irhs] |= matched;
+    }
+  }
+
+  {
+    const char* sep =
+        "where the following matchers don't match any elements:\n";
+    for (size_t mi = 0; mi < matcher_matched.size(); ++mi) {
+      if (matcher_matched[mi])
+        continue;
+      result = false;
+      if (listener->IsInterested()) {
+        *listener << sep << "matcher #" << mi << ": ";
+        matcher_describers_[mi]->DescribeTo(listener->stream());
+        sep = ",\n";
+      }
+    }
+  }
+
+  {
+    const char* sep =
+        "where the following elements don't match any matchers:\n";
+    const char* outer_sep = "";
+    if (!result) {
+      outer_sep = "\nand ";
+    }
+    for (size_t ei = 0; ei < element_matched.size(); ++ei) {
+      if (element_matched[ei])
+        continue;
+      result = false;
+      if (listener->IsInterested()) {
+        *listener << outer_sep << sep << "element #" << ei << ": "
+                  << element_printouts[ei];
+        sep = ",\n";
+        outer_sep = "";
+      }
+    }
+  }
+  return result;
+}
+
+}  // namespace internal
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-spec-builders.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-spec-builders.cc
new file mode 100644
index 0000000000..9551342070
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock-spec-builders.cc
@@ -0,0 +1,823 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements the spec builder syntax (ON_CALL and
+// EXPECT_CALL).
+
+#include "gmock/gmock-spec-builders.h"
+
+#include <stdlib.h>
+#include <iostream>  // NOLINT
+#include <map>
+#include <set>
+#include <string>
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC
+# include <unistd.h>  // NOLINT
+#endif
+
+namespace testing {
+namespace internal {
+
+// Protects the mock object registry (in class Mock), all function
+// mockers, and all expectations.
+GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_gmock_mutex);
+
+// Logs a message including file and line number information.
+GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity,
+                                const char* file, int line,
+                                const string& message) {
+  ::std::ostringstream s;
+  s << file << ":" << line << ": " << message << ::std::endl;
+  Log(severity, s.str(), 0);
+}
+
+// Constructs an ExpectationBase object.
+ExpectationBase::ExpectationBase(const char* a_file,
+                                 int a_line,
+                                 const string& a_source_text)
+    : file_(a_file),
+      line_(a_line),
+      source_text_(a_source_text),
+      cardinality_specified_(false),
+      cardinality_(Exactly(1)),
+      call_count_(0),
+      retired_(false),
+      extra_matcher_specified_(false),
+      repeated_action_specified_(false),
+      retires_on_saturation_(false),
+      last_clause_(kNone),
+      action_count_checked_(false) {}
+
+// Destructs an ExpectationBase object.
+ExpectationBase::~ExpectationBase() {}
+
+// Explicitly specifies the cardinality of this expectation.  Used by
+// the subclasses to implement the .Times() clause.
+void ExpectationBase::SpecifyCardinality(const Cardinality& a_cardinality) {
+  cardinality_specified_ = true;
+  cardinality_ = a_cardinality;
+}
+
+// Retires all pre-requisites of this expectation.
+void ExpectationBase::RetireAllPreRequisites()
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  if (is_retired()) {
+    // We can take this short-cut as we never retire an expectation
+    // until we have retired all its pre-requisites.
+    return;
+  }
+
+  for (ExpectationSet::const_iterator it = immediate_prerequisites_.begin();
+       it != immediate_prerequisites_.end(); ++it) {
+    ExpectationBase* const prerequisite = it->expectation_base().get();
+    if (!prerequisite->is_retired()) {
+      prerequisite->RetireAllPreRequisites();
+      prerequisite->Retire();
+    }
+  }
+}
+
+// Returns true iff all pre-requisites of this expectation have been
+// satisfied.
+bool ExpectationBase::AllPrerequisitesAreSatisfied() const
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  g_gmock_mutex.AssertHeld();
+  for (ExpectationSet::const_iterator it = immediate_prerequisites_.begin();
+       it != immediate_prerequisites_.end(); ++it) {
+    if (!(it->expectation_base()->IsSatisfied()) ||
+        !(it->expectation_base()->AllPrerequisitesAreSatisfied()))
+      return false;
+  }
+  return true;
+}
+
+// Adds unsatisfied pre-requisites of this expectation to 'result'.
+void ExpectationBase::FindUnsatisfiedPrerequisites(ExpectationSet* result) const
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  g_gmock_mutex.AssertHeld();
+  for (ExpectationSet::const_iterator it = immediate_prerequisites_.begin();
+       it != immediate_prerequisites_.end(); ++it) {
+    if (it->expectation_base()->IsSatisfied()) {
+      // If *it is satisfied and has a call count of 0, some of its
+      // pre-requisites may not be satisfied yet.
+      if (it->expectation_base()->call_count_ == 0) {
+        it->expectation_base()->FindUnsatisfiedPrerequisites(result);
+      }
+    } else {
+      // Now that we know *it is unsatisfied, we are not so interested
+      // in whether its pre-requisites are satisfied.  Therefore we
+      // don't recursively call FindUnsatisfiedPrerequisites() here.
+      *result += *it;
+    }
+  }
+}
+
+// Describes how many times a function call matching this
+// expectation has occurred.
+void ExpectationBase::DescribeCallCountTo(::std::ostream* os) const
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  g_gmock_mutex.AssertHeld();
+
+  // Describes how many times the function is expected to be called.
+  *os << "         Expected: to be ";
+  cardinality().DescribeTo(os);
+  *os << "\n           Actual: ";
+  Cardinality::DescribeActualCallCountTo(call_count(), os);
+
+  // Describes the state of the expectation (e.g. is it satisfied?
+  // is it active?).
+  *os << " - " << (IsOverSaturated() ? "over-saturated" :
+                   IsSaturated() ? "saturated" :
+                   IsSatisfied() ? "satisfied" : "unsatisfied")
+      << " and "
+      << (is_retired() ? "retired" : "active");
+}
+
+// Checks the action count (i.e. the number of WillOnce() and
+// WillRepeatedly() clauses) against the cardinality if this hasn't
+// been done before.  Prints a warning if there are too many or too
+// few actions.
+void ExpectationBase::CheckActionCountIfNotDone() const
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  bool should_check = false;
+  {
+    MutexLock l(&mutex_);
+    if (!action_count_checked_) {
+      action_count_checked_ = true;
+      should_check = true;
+    }
+  }
+
+  if (should_check) {
+    if (!cardinality_specified_) {
+      // The cardinality was inferred - no need to check the action
+      // count against it.
+      return;
+    }
+
+    // The cardinality was explicitly specified.
+    const int action_count = static_cast<int>(untyped_actions_.size());
+    const int upper_bound = cardinality().ConservativeUpperBound();
+    const int lower_bound = cardinality().ConservativeLowerBound();
+    bool too_many;  // True if there are too many actions, or false
+    // if there are too few.
+    if (action_count > upper_bound ||
+        (action_count == upper_bound && repeated_action_specified_)) {
+      too_many = true;
+    } else if (0 < action_count && action_count < lower_bound &&
+               !repeated_action_specified_) {
+      too_many = false;
+    } else {
+      return;
+    }
+
+    ::std::stringstream ss;
+    DescribeLocationTo(&ss);
+    ss << "Too " << (too_many ? "many" : "few")
+       << " actions specified in " << source_text() << "...\n"
+       << "Expected to be ";
+    cardinality().DescribeTo(&ss);
+    ss << ", but has " << (too_many ? "" : "only ")
+       << action_count << " WillOnce()"
+       << (action_count == 1 ? "" : "s");
+    if (repeated_action_specified_) {
+      ss << " and a WillRepeatedly()";
+    }
+    ss << ".";
+    Log(kWarning, ss.str(), -1);  // -1 means "don't print stack trace".
+  }
+}
+
+// Implements the .Times() clause.
+void ExpectationBase::UntypedTimes(const Cardinality& a_cardinality) {
+  if (last_clause_ == kTimes) {
+    ExpectSpecProperty(false,
+                       ".Times() cannot appear "
+                       "more than once in an EXPECT_CALL().");
+  } else {
+    ExpectSpecProperty(last_clause_ < kTimes,
+                       ".Times() cannot appear after "
+                       ".InSequence(), .WillOnce(), .WillRepeatedly(), "
+                       "or .RetiresOnSaturation().");
+  }
+  last_clause_ = kTimes;
+
+  SpecifyCardinality(a_cardinality);
+}
+
+// Points to the implicit sequence introduced by a living InSequence
+// object (if any) in the current thread or NULL.
+GTEST_API_ ThreadLocal<Sequence*> g_gmock_implicit_sequence;
+
+// Reports an uninteresting call (whose description is in msg) in the
+// manner specified by 'reaction'.
+void ReportUninterestingCall(CallReaction reaction, const string& msg) {
+  // Include a stack trace only if --gmock_verbose=info is specified.
+  const int stack_frames_to_skip =
+      GMOCK_FLAG(verbose) == kInfoVerbosity ? 3 : -1;
+  switch (reaction) {
+    case kAllow:
+      Log(kInfo, msg, stack_frames_to_skip);
+      break;
+    case kWarn:
+      Log(kWarning,
+          msg +
+          "\nNOTE: You can safely ignore the above warning unless this "
+          "call should not happen.  Do not suppress it by blindly adding "
+          "an EXPECT_CALL() if you don't mean to enforce the call.  "
+          "See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#"
+          "knowing-when-to-expect for details.\n",
+          stack_frames_to_skip);
+      break;
+    default:  // FAIL
+      Expect(false, NULL, -1, msg);
+  }
+}
+
+UntypedFunctionMockerBase::UntypedFunctionMockerBase()
+    : mock_obj_(NULL), name_("") {}
+
+UntypedFunctionMockerBase::~UntypedFunctionMockerBase() {}
+
+// Sets the mock object this mock method belongs to, and registers
+// this information in the global mock registry.  Will be called
+// whenever an EXPECT_CALL() or ON_CALL() is executed on this mock
+// method.
+void UntypedFunctionMockerBase::RegisterOwner(const void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  {
+    MutexLock l(&g_gmock_mutex);
+    mock_obj_ = mock_obj;
+  }
+  Mock::Register(mock_obj, this);
+}
+
+// Sets the mock object this mock method belongs to, and sets the name
+// of the mock function.  Will be called upon each invocation of this
+// mock function.
+void UntypedFunctionMockerBase::SetOwnerAndName(const void* mock_obj,
+                                                const char* name)
+    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  // We protect name_ under g_gmock_mutex in case this mock function
+  // is called from two threads concurrently.
+  MutexLock l(&g_gmock_mutex);
+  mock_obj_ = mock_obj;
+  name_ = name;
+}
+
+// Returns the name of the function being mocked.  Must be called
+// after RegisterOwner() or SetOwnerAndName() has been called.
+const void* UntypedFunctionMockerBase::MockObject() const
+    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  const void* mock_obj;
+  {
+    // We protect mock_obj_ under g_gmock_mutex in case this mock
+    // function is called from two threads concurrently.
+    MutexLock l(&g_gmock_mutex);
+    Assert(mock_obj_ != NULL, __FILE__, __LINE__,
+           "MockObject() must not be called before RegisterOwner() or "
+           "SetOwnerAndName() has been called.");
+    mock_obj = mock_obj_;
+  }
+  return mock_obj;
+}
+
+// Returns the name of this mock method.  Must be called after
+// SetOwnerAndName() has been called.
+const char* UntypedFunctionMockerBase::Name() const
+    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  const char* name;
+  {
+    // We protect name_ under g_gmock_mutex in case this mock
+    // function is called from two threads concurrently.
+    MutexLock l(&g_gmock_mutex);
+    Assert(name_ != NULL, __FILE__, __LINE__,
+           "Name() must not be called before SetOwnerAndName() has "
+           "been called.");
+    name = name_;
+  }
+  return name;
+}
+
+// Calculates the result of invoking this mock function with the given
+// arguments, prints it, and returns it.  The caller is responsible
+// for deleting the result.
+UntypedActionResultHolderBase*
+UntypedFunctionMockerBase::UntypedInvokeWith(const void* const untyped_args)
+    GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  if (untyped_expectations_.size() == 0) {
+    // No expectation is set on this mock method - we have an
+    // uninteresting call.
+
+    // We must get Google Mock's reaction on uninteresting calls
+    // made on this mock object BEFORE performing the action,
+    // because the action may DELETE the mock object and make the
+    // following expression meaningless.
+    const CallReaction reaction =
+        Mock::GetReactionOnUninterestingCalls(MockObject());
+
+    // True iff we need to print this call's arguments and return
+    // value.  This definition must be kept in sync with
+    // the behavior of ReportUninterestingCall().
+    const bool need_to_report_uninteresting_call =
+        // If the user allows this uninteresting call, we print it
+        // only when he wants informational messages.
+        reaction == kAllow ? LogIsVisible(kInfo) :
+        // If the user wants this to be a warning, we print it only
+        // when he wants to see warnings.
+        reaction == kWarn ? LogIsVisible(kWarning) :
+        // Otherwise, the user wants this to be an error, and we
+        // should always print detailed information in the error.
+        true;
+
+    if (!need_to_report_uninteresting_call) {
+      // Perform the action without printing the call information.
+      return this->UntypedPerformDefaultAction(untyped_args, "");
+    }
+
+    // Warns about the uninteresting call.
+    ::std::stringstream ss;
+    this->UntypedDescribeUninterestingCall(untyped_args, &ss);
+
+    // Calculates the function result.
+    UntypedActionResultHolderBase* const result =
+        this->UntypedPerformDefaultAction(untyped_args, ss.str());
+
+    // Prints the function result.
+    if (result != NULL)
+      result->PrintAsActionResult(&ss);
+
+    ReportUninterestingCall(reaction, ss.str());
+    return result;
+  }
+
+  bool is_excessive = false;
+  ::std::stringstream ss;
+  ::std::stringstream why;
+  ::std::stringstream loc;
+  const void* untyped_action = NULL;
+
+  // The UntypedFindMatchingExpectation() function acquires and
+  // releases g_gmock_mutex.
+  const ExpectationBase* const untyped_expectation =
+      this->UntypedFindMatchingExpectation(
+          untyped_args, &untyped_action, &is_excessive,
+          &ss, &why);
+  const bool found = untyped_expectation != NULL;
+
+  // True iff we need to print the call's arguments and return value.
+  // This definition must be kept in sync with the uses of Expect()
+  // and Log() in this function.
+  const bool need_to_report_call =
+      !found || is_excessive || LogIsVisible(kInfo);
+  if (!need_to_report_call) {
+    // Perform the action without printing the call information.
+    return
+        untyped_action == NULL ?
+        this->UntypedPerformDefaultAction(untyped_args, "") :
+        this->UntypedPerformAction(untyped_action, untyped_args);
+  }
+
+  ss << "    Function call: " << Name();
+  this->UntypedPrintArgs(untyped_args, &ss);
+
+  // In case the action deletes a piece of the expectation, we
+  // generate the message beforehand.
+  if (found && !is_excessive) {
+    untyped_expectation->DescribeLocationTo(&loc);
+  }
+
+  UntypedActionResultHolderBase* const result =
+      untyped_action == NULL ?
+      this->UntypedPerformDefaultAction(untyped_args, ss.str()) :
+      this->UntypedPerformAction(untyped_action, untyped_args);
+  if (result != NULL)
+    result->PrintAsActionResult(&ss);
+  ss << "\n" << why.str();
+
+  if (!found) {
+    // No expectation matches this call - reports a failure.
+    Expect(false, NULL, -1, ss.str());
+  } else if (is_excessive) {
+    // We had an upper-bound violation and the failure message is in ss.
+    Expect(false, untyped_expectation->file(),
+           untyped_expectation->line(), ss.str());
+  } else {
+    // We had an expected call and the matching expectation is
+    // described in ss.
+    Log(kInfo, loc.str() + ss.str(), 2);
+  }
+
+  return result;
+}
+
+// Returns an Expectation object that references and co-owns exp,
+// which must be an expectation on this mock function.
+Expectation UntypedFunctionMockerBase::GetHandleOf(ExpectationBase* exp) {
+  for (UntypedExpectations::const_iterator it =
+           untyped_expectations_.begin();
+       it != untyped_expectations_.end(); ++it) {
+    if (it->get() == exp) {
+      return Expectation(*it);
+    }
+  }
+
+  Assert(false, __FILE__, __LINE__, "Cannot find expectation.");
+  return Expectation();
+  // The above statement is just to make the code compile, and will
+  // never be executed.
+}
+
+// Verifies that all expectations on this mock function have been
+// satisfied.  Reports one or more Google Test non-fatal failures
+// and returns false if not.
+bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked()
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+  g_gmock_mutex.AssertHeld();
+  bool expectations_met = true;
+  for (UntypedExpectations::const_iterator it =
+           untyped_expectations_.begin();
+       it != untyped_expectations_.end(); ++it) {
+    ExpectationBase* const untyped_expectation = it->get();
+    if (untyped_expectation->IsOverSaturated()) {
+      // There was an upper-bound violation.  Since the error was
+      // already reported when it occurred, there is no need to do
+      // anything here.
+      expectations_met = false;
+    } else if (!untyped_expectation->IsSatisfied()) {
+      expectations_met = false;
+      ::std::stringstream ss;
+      ss  << "Actual function call count doesn't match "
+          << untyped_expectation->source_text() << "...\n";
+      // No need to show the source file location of the expectation
+      // in the description, as the Expect() call that follows already
+      // takes care of it.
+      untyped_expectation->MaybeDescribeExtraMatcherTo(&ss);
+      untyped_expectation->DescribeCallCountTo(&ss);
+      Expect(false, untyped_expectation->file(),
+             untyped_expectation->line(), ss.str());
+    }
+  }
+
+  // Deleting our expectations may trigger other mock objects to be deleted, for
+  // example if an action contains a reference counted smart pointer to that
+  // mock object, and that is the last reference. So if we delete our
+  // expectations within the context of the global mutex we may deadlock when
+  // this method is called again. Instead, make a copy of the set of
+  // expectations to delete, clear our set within the mutex, and then clear the
+  // copied set outside of it.
+  UntypedExpectations expectations_to_delete;
+  untyped_expectations_.swap(expectations_to_delete);
+
+  g_gmock_mutex.Unlock();
+  expectations_to_delete.clear();
+  g_gmock_mutex.Lock();
+
+  return expectations_met;
+}
+
+}  // namespace internal
+
+// Class Mock.
+
+namespace {
+
+typedef std::set<internal::UntypedFunctionMockerBase*> FunctionMockers;
+
+// The current state of a mock object.  Such information is needed for
+// detecting leaked mock objects and explicitly verifying a mock's
+// expectations.
+struct MockObjectState {
+  MockObjectState()
+      : first_used_file(NULL), first_used_line(-1), leakable(false) {}
+
+  // Where in the source file an ON_CALL or EXPECT_CALL is first
+  // invoked on this mock object.
+  const char* first_used_file;
+  int first_used_line;
+  ::std::string first_used_test_case;
+  ::std::string first_used_test;
+  bool leakable;  // true iff it's OK to leak the object.
+  FunctionMockers function_mockers;  // All registered methods of the object.
+};
+
+// A global registry holding the state of all mock objects that are
+// alive.  A mock object is added to this registry the first time
+// Mock::AllowLeak(), ON_CALL(), or EXPECT_CALL() is called on it.  It
+// is removed from the registry in the mock object's destructor.
+class MockObjectRegistry {
+ public:
+  // Maps a mock object (identified by its address) to its state.
+  typedef std::map<const void*, MockObjectState> StateMap;
+
+  // This destructor will be called when a program exits, after all
+  // tests in it have been run.  By then, there should be no mock
+  // object alive.  Therefore we report any living object as test
+  // failure, unless the user explicitly asked us to ignore it.
+  ~MockObjectRegistry() {
+    // "using ::std::cout;" doesn't work with Symbian's STLport, where cout is
+    // a macro.
+
+    if (!GMOCK_FLAG(catch_leaked_mocks))
+      return;
+
+    int leaked_count = 0;
+    for (StateMap::const_iterator it = states_.begin(); it != states_.end();
+         ++it) {
+      if (it->second.leakable)  // The user said it's fine to leak this object.
+        continue;
+
+      // TODO(wan@google.com): Print the type of the leaked object.
+      // This can help the user identify the leaked object.
+      std::cout << "\n";
+      const MockObjectState& state = it->second;
+      std::cout << internal::FormatFileLocation(state.first_used_file,
+                                                state.first_used_line);
+      std::cout << " ERROR: this mock object";
+      if (state.first_used_test != "") {
+        std::cout << " (used in test " << state.first_used_test_case << "."
+             << state.first_used_test << ")";
+      }
+      std::cout << " should be deleted but never is. Its address is @"
+           << it->first << ".";
+      leaked_count++;
+    }
+    if (leaked_count > 0) {
+      std::cout << "\nERROR: " << leaked_count
+           << " leaked mock " << (leaked_count == 1 ? "object" : "objects")
+           << " found at program exit.\n";
+      std::cout.flush();
+      ::std::cerr.flush();
+      // RUN_ALL_TESTS() has already returned when this destructor is
+      // called.  Therefore we cannot use the normal Google Test
+      // failure reporting mechanism.
+      _exit(1);  // We cannot call exit() as it is not reentrant and
+                 // may already have been called.
+    }
+  }
+
+  StateMap& states() { return states_; }
+
+ private:
+  StateMap states_;
+};
+
+// Protected by g_gmock_mutex.
+MockObjectRegistry g_mock_object_registry;
+
+// Maps a mock object to the reaction Google Mock should have when an
+// uninteresting method is called.  Protected by g_gmock_mutex.
+std::map<const void*, internal::CallReaction> g_uninteresting_call_reaction;
+
+// Sets the reaction Google Mock should have when an uninteresting
+// method of the given mock object is called.
+void SetReactionOnUninterestingCalls(const void* mock_obj,
+                                     internal::CallReaction reaction)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  g_uninteresting_call_reaction[mock_obj] = reaction;
+}
+
+}  // namespace
+
+// Tells Google Mock to allow uninteresting calls on the given mock
+// object.
+void Mock::AllowUninterestingCalls(const void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  SetReactionOnUninterestingCalls(mock_obj, internal::kAllow);
+}
+
+// Tells Google Mock to warn the user about uninteresting calls on the
+// given mock object.
+void Mock::WarnUninterestingCalls(const void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  SetReactionOnUninterestingCalls(mock_obj, internal::kWarn);
+}
+
+// Tells Google Mock to fail uninteresting calls on the given mock
+// object.
+void Mock::FailUninterestingCalls(const void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  SetReactionOnUninterestingCalls(mock_obj, internal::kFail);
+}
+
+// Tells Google Mock the given mock object is being destroyed and its
+// entry in the call-reaction table should be removed.
+void Mock::UnregisterCallReaction(const void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  g_uninteresting_call_reaction.erase(mock_obj);
+}
+
+// Returns the reaction Google Mock will have on uninteresting calls
+// made on the given mock object.
+internal::CallReaction Mock::GetReactionOnUninterestingCalls(
+    const void* mock_obj)
+        GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  return (g_uninteresting_call_reaction.count(mock_obj) == 0) ?
+      internal::kDefault : g_uninteresting_call_reaction[mock_obj];
+}
+
+// Tells Google Mock to ignore mock_obj when checking for leaked mock
+// objects.
+void Mock::AllowLeak(const void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  g_mock_object_registry.states()[mock_obj].leakable = true;
+}
+
+// Verifies and clears all expectations on the given mock object.  If
+// the expectations aren't satisfied, generates one or more Google
+// Test non-fatal failures and returns false.
+bool Mock::VerifyAndClearExpectations(void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  return VerifyAndClearExpectationsLocked(mock_obj);
+}
+
+// Verifies all expectations on the given mock object and clears its
+// default actions and expectations.  Returns true iff the
+// verification was successful.
+bool Mock::VerifyAndClear(void* mock_obj)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  ClearDefaultActionsLocked(mock_obj);
+  return VerifyAndClearExpectationsLocked(mock_obj);
+}
+
+// Verifies and clears all expectations on the given mock object.  If
+// the expectations aren't satisfied, generates one or more Google
+// Test non-fatal failures and returns false.
+bool Mock::VerifyAndClearExpectationsLocked(void* mock_obj)
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
+  internal::g_gmock_mutex.AssertHeld();
+  if (g_mock_object_registry.states().count(mock_obj) == 0) {
+    // No EXPECT_CALL() was set on the given mock object.
+    return true;
+  }
+
+  // Verifies and clears the expectations on each mock method in the
+  // given mock object.
+  bool expectations_met = true;
+  FunctionMockers& mockers =
+      g_mock_object_registry.states()[mock_obj].function_mockers;
+  for (FunctionMockers::const_iterator it = mockers.begin();
+       it != mockers.end(); ++it) {
+    if (!(*it)->VerifyAndClearExpectationsLocked()) {
+      expectations_met = false;
+    }
+  }
+
+  // We don't clear the content of mockers, as they may still be
+  // needed by ClearDefaultActionsLocked().
+  return expectations_met;
+}
+
+// Registers a mock object and a mock method it owns.
+void Mock::Register(const void* mock_obj,
+                    internal::UntypedFunctionMockerBase* mocker)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  g_mock_object_registry.states()[mock_obj].function_mockers.insert(mocker);
+}
+
+// Tells Google Mock where in the source code mock_obj is used in an
+// ON_CALL or EXPECT_CALL.  In case mock_obj is leaked, this
+// information helps the user identify which object it is.
+void Mock::RegisterUseByOnCallOrExpectCall(const void* mock_obj,
+                                           const char* file, int line)
+    GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
+  internal::MutexLock l(&internal::g_gmock_mutex);
+  MockObjectState& state = g_mock_object_registry.states()[mock_obj];
+  if (state.first_used_file == NULL) {
+    state.first_used_file = file;
+    state.first_used_line = line;
+    const TestInfo* const test_info =
+        UnitTest::GetInstance()->current_test_info();
+    if (test_info != NULL) {
+      // TODO(wan@google.com): record the test case name when the
+      // ON_CALL or EXPECT_CALL is invoked from SetUpTestCase() or
+      // TearDownTestCase().
+      state.first_used_test_case = test_info->test_case_name();
+      state.first_used_test = test_info->name();
+    }
+  }
+}
+
+// Unregisters a mock method; removes the owning mock object from the
+// registry when the last mock method associated with it has been
+// unregistered.  This is called only in the destructor of
+// FunctionMockerBase.
+void Mock::UnregisterLocked(internal::UntypedFunctionMockerBase* mocker)
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
+  internal::g_gmock_mutex.AssertHeld();
+  for (MockObjectRegistry::StateMap::iterator it =
+           g_mock_object_registry.states().begin();
+       it != g_mock_object_registry.states().end(); ++it) {
+    FunctionMockers& mockers = it->second.function_mockers;
+    if (mockers.erase(mocker) > 0) {
+      // mocker was in mockers and has been just removed.
+      if (mockers.empty()) {
+        g_mock_object_registry.states().erase(it);
+      }
+      return;
+    }
+  }
+}
+
+// Clears all ON_CALL()s set on the given mock object.
+void Mock::ClearDefaultActionsLocked(void* mock_obj)
+    GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) {
+  internal::g_gmock_mutex.AssertHeld();
+
+  if (g_mock_object_registry.states().count(mock_obj) == 0) {
+    // No ON_CALL() was set on the given mock object.
+    return;
+  }
+
+  // Clears the default actions for each mock method in the given mock
+  // object.
+  FunctionMockers& mockers =
+      g_mock_object_registry.states()[mock_obj].function_mockers;
+  for (FunctionMockers::const_iterator it = mockers.begin();
+       it != mockers.end(); ++it) {
+    (*it)->ClearDefaultActionsLocked();
+  }
+
+  // We don't clear the content of mockers, as they may still be
+  // needed by VerifyAndClearExpectationsLocked().
+}
+
+Expectation::Expectation() {}
+
+Expectation::Expectation(
+    const internal::linked_ptr<internal::ExpectationBase>& an_expectation_base)
+    : expectation_base_(an_expectation_base) {}
+
+Expectation::~Expectation() {}
+
+// Adds an expectation to a sequence.
+void Sequence::AddExpectation(const Expectation& expectation) const {
+  if (*last_expectation_ != expectation) {
+    if (last_expectation_->expectation_base() != NULL) {
+      expectation.expectation_base()->immediate_prerequisites_
+          += *last_expectation_;
+    }
+    *last_expectation_ = expectation;
+  }
+}
+
+// Creates the implicit sequence if there isn't one.
+InSequence::InSequence() {
+  if (internal::g_gmock_implicit_sequence.get() == NULL) {
+    internal::g_gmock_implicit_sequence.set(new Sequence);
+    sequence_created_ = true;
+  } else {
+    sequence_created_ = false;
+  }
+}
+
+// Deletes the implicit sequence if it was created by the constructor
+// of this object.
+InSequence::~InSequence() {
+  if (sequence_created_) {
+    delete internal::g_gmock_implicit_sequence.get();
+    internal::g_gmock_implicit_sequence.set(NULL);
+  }
+}
+
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock.cc
new file mode 100644
index 0000000000..eac3d842ba
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock.cc
@@ -0,0 +1,183 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "gmock/gmock.h"
+#include "gmock/internal/gmock-port.h"
+
+namespace testing {
+
+// TODO(wan@google.com): support using environment variables to
+// control the flag values, like what Google Test does.
+
+GMOCK_DEFINE_bool_(catch_leaked_mocks, true,
+                   "true iff Google Mock should report leaked mock objects "
+                   "as failures.");
+
+GMOCK_DEFINE_string_(verbose, internal::kWarningVerbosity,
+                     "Controls how verbose Google Mock's output is."
+                     "  Valid values:\n"
+                     "  info    - prints all messages.\n"
+                     "  warning - prints warnings and errors.\n"
+                     "  error   - prints errors only.");
+
+namespace internal {
+
+// Parses a string as a command line flag.  The string should have the
+// format "--gmock_flag=value".  When def_optional is true, the
+// "=value" part can be omitted.
+//
+// Returns the value of the flag, or NULL if the parsing failed.
+static const char* ParseGoogleMockFlagValue(const char* str,
+                                            const char* flag,
+                                            bool def_optional) {
+  // str and flag must not be NULL.
+  if (str == NULL || flag == NULL) return NULL;
+
+  // The flag must start with "--gmock_".
+  const std::string flag_str = std::string("--gmock_") + flag;
+  const size_t flag_len = flag_str.length();
+  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return NULL;
+
+  // Skips the flag name.
+  const char* flag_end = str + flag_len;
+
+  // When def_optional is true, it's OK to not have a "=value" part.
+  if (def_optional && (flag_end[0] == '\0')) {
+    return flag_end;
+  }
+
+  // If def_optional is true and there are more characters after the
+  // flag name, or if def_optional is false, there must be a '=' after
+  // the flag name.
+  if (flag_end[0] != '=') return NULL;
+
+  // Returns the string after "=".
+  return flag_end + 1;
+}
+
+// Parses a string for a Google Mock bool flag, in the form of
+// "--gmock_flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+static bool ParseGoogleMockBoolFlag(const char* str, const char* flag,
+                                    bool* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseGoogleMockFlagValue(str, flag, true);
+
+  // Aborts if the parsing failed.
+  if (value_str == NULL) return false;
+
+  // Converts the string value to a bool.
+  *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
+  return true;
+}
+
+// Parses a string for a Google Mock string flag, in the form of
+// "--gmock_flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+template <typename String>
+static bool ParseGoogleMockStringFlag(const char* str, const char* flag,
+                                      String* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseGoogleMockFlagValue(str, flag, false);
+
+  // Aborts if the parsing failed.
+  if (value_str == NULL) return false;
+
+  // Sets *value to the value of the flag.
+  *value = value_str;
+  return true;
+}
+
+// The internal implementation of InitGoogleMock().
+//
+// The type parameter CharType can be instantiated to either char or
+// wchar_t.
+template <typename CharType>
+void InitGoogleMockImpl(int* argc, CharType** argv) {
+  // Makes sure Google Test is initialized.  InitGoogleTest() is
+  // idempotent, so it's fine if the user has already called it.
+  InitGoogleTest(argc, argv);
+  if (*argc <= 0) return;
+
+  for (int i = 1; i != *argc; i++) {
+    const std::string arg_string = StreamableToString(argv[i]);
+    const char* const arg = arg_string.c_str();
+
+    // Do we see a Google Mock flag?
+    if (ParseGoogleMockBoolFlag(arg, "catch_leaked_mocks",
+                                &GMOCK_FLAG(catch_leaked_mocks)) ||
+        ParseGoogleMockStringFlag(arg, "verbose", &GMOCK_FLAG(verbose))) {
+      // Yes.  Shift the remainder of the argv list left by one.  Note
+      // that argv has (*argc + 1) elements, the last one always being
+      // NULL.  The following loop moves the trailing NULL element as
+      // well.
+      for (int j = i; j != *argc; j++) {
+        argv[j] = argv[j + 1];
+      }
+
+      // Decrements the argument count.
+      (*argc)--;
+
+      // We also need to decrement the iterator as we just removed
+      // an element.
+      i--;
+    }
+  }
+}
+
+}  // namespace internal
+
+// Initializes Google Mock.  This must be called before running the
+// tests.  In particular, it parses a command line for the flags that
+// Google Mock recognizes.  Whenever a Google Mock flag is seen, it is
+// removed from argv, and *argc is decremented.
+//
+// No value is returned.  Instead, the Google Mock flag variables are
+// updated.
+//
+// Since Google Test is needed for Google Mock to work, this function
+// also initializes Google Test and parses its flags, if that hasn't
+// been done.
+GTEST_API_ void InitGoogleMock(int* argc, char** argv) {
+  internal::InitGoogleMockImpl(argc, argv);
+}
+
+// This overloaded version can be used in Windows programs compiled in
+// UNICODE mode.
+GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv) {
+  internal::InitGoogleMockImpl(argc, argv);
+}
+
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock_main.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock_main.cc
new file mode 100644
index 0000000000..bd5be03be2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/src/gmock_main.cc
@@ -0,0 +1,54 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include <iostream>
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+// MS C++ compiler/linker has a bug on Windows (not on Windows CE), which
+// causes a link error when _tmain is defined in a static library and UNICODE
+// is enabled. For this reason instead of _tmain, main function is used on
+// Windows. See the following link to track the current status of this bug:
+// http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=394464  // NOLINT
+#if GTEST_OS_WINDOWS_MOBILE
+# include <tchar.h>  // NOLINT
+
+GTEST_API_ int _tmain(int argc, TCHAR** argv) {
+#else
+GTEST_API_ int main(int argc, char** argv) {
+#endif  // GTEST_OS_WINDOWS_MOBILE
+  std::cout << "Running main() from gmock_main.cc\n";
+  // Since Google Mock depends on Google Test, InitGoogleMock() is
+  // also responsible for initializing Google Test.  Therefore there's
+  // no need for calling testing::InitGoogleTest() separately.
+  testing::InitGoogleMock(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-actions_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-actions_test.cc
new file mode 100644
index 0000000000..f470de4c55
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-actions_test.cc
@@ -0,0 +1,1411 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests the built-in actions.
+
+#include "gmock/gmock-actions.h"
+#include <algorithm>
+#include <iterator>
+#include <memory>
+#include <string>
+#include "gmock/gmock.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+
+namespace {
+
+// This list should be kept sorted.
+using testing::Action;
+using testing::ActionInterface;
+using testing::Assign;
+using testing::ByMove;
+using testing::ByRef;
+using testing::DefaultValue;
+using testing::DoDefault;
+using testing::IgnoreResult;
+using testing::Invoke;
+using testing::InvokeWithoutArgs;
+using testing::MakePolymorphicAction;
+using testing::Ne;
+using testing::PolymorphicAction;
+using testing::Return;
+using testing::ReturnNull;
+using testing::ReturnRef;
+using testing::ReturnRefOfCopy;
+using testing::SetArgPointee;
+using testing::SetArgumentPointee;
+using testing::_;
+using testing::get;
+using testing::internal::BuiltInDefaultValue;
+using testing::internal::Int64;
+using testing::internal::UInt64;
+using testing::make_tuple;
+using testing::tuple;
+using testing::tuple_element;
+
+#if !GTEST_OS_WINDOWS_MOBILE
+using testing::SetErrnoAndReturn;
+#endif
+
+#if GTEST_HAS_PROTOBUF_
+using testing::internal::TestMessage;
+#endif  // GTEST_HAS_PROTOBUF_
+
+// Tests that BuiltInDefaultValue<T*>::Get() returns NULL.
+TEST(BuiltInDefaultValueTest, IsNullForPointerTypes) {
+  EXPECT_TRUE(BuiltInDefaultValue<int*>::Get() == NULL);
+  EXPECT_TRUE(BuiltInDefaultValue<const char*>::Get() == NULL);
+  EXPECT_TRUE(BuiltInDefaultValue<void*>::Get() == NULL);
+}
+
+// Tests that BuiltInDefaultValue<T*>::Exists() return true.
+TEST(BuiltInDefaultValueTest, ExistsForPointerTypes) {
+  EXPECT_TRUE(BuiltInDefaultValue<int*>::Exists());
+  EXPECT_TRUE(BuiltInDefaultValue<const char*>::Exists());
+  EXPECT_TRUE(BuiltInDefaultValue<void*>::Exists());
+}
+
+// Tests that BuiltInDefaultValue<T>::Get() returns 0 when T is a
+// built-in numeric type.
+TEST(BuiltInDefaultValueTest, IsZeroForNumericTypes) {
+  EXPECT_EQ(0U, BuiltInDefaultValue<unsigned char>::Get());
+  EXPECT_EQ(0, BuiltInDefaultValue<signed char>::Get());
+  EXPECT_EQ(0, BuiltInDefaultValue<char>::Get());
+#if GMOCK_HAS_SIGNED_WCHAR_T_
+  EXPECT_EQ(0U, BuiltInDefaultValue<unsigned wchar_t>::Get());
+  EXPECT_EQ(0, BuiltInDefaultValue<signed wchar_t>::Get());
+#endif
+#if GMOCK_WCHAR_T_IS_NATIVE_
+  EXPECT_EQ(0, BuiltInDefaultValue<wchar_t>::Get());
+#endif
+  EXPECT_EQ(0U, BuiltInDefaultValue<unsigned short>::Get());  // NOLINT
+  EXPECT_EQ(0, BuiltInDefaultValue<signed short>::Get());  // NOLINT
+  EXPECT_EQ(0, BuiltInDefaultValue<short>::Get());  // NOLINT
+  EXPECT_EQ(0U, BuiltInDefaultValue<unsigned int>::Get());
+  EXPECT_EQ(0, BuiltInDefaultValue<signed int>::Get());
+  EXPECT_EQ(0, BuiltInDefaultValue<int>::Get());
+  EXPECT_EQ(0U, BuiltInDefaultValue<unsigned long>::Get());  // NOLINT
+  EXPECT_EQ(0, BuiltInDefaultValue<signed long>::Get());  // NOLINT
+  EXPECT_EQ(0, BuiltInDefaultValue<long>::Get());  // NOLINT
+  EXPECT_EQ(0U, BuiltInDefaultValue<UInt64>::Get());
+  EXPECT_EQ(0, BuiltInDefaultValue<Int64>::Get());
+  EXPECT_EQ(0, BuiltInDefaultValue<float>::Get());
+  EXPECT_EQ(0, BuiltInDefaultValue<double>::Get());
+}
+
+// Tests that BuiltInDefaultValue<T>::Exists() returns true when T is a
+// built-in numeric type.
+TEST(BuiltInDefaultValueTest, ExistsForNumericTypes) {
+  EXPECT_TRUE(BuiltInDefaultValue<unsigned char>::Exists());
+  EXPECT_TRUE(BuiltInDefaultValue<signed char>::Exists());
+  EXPECT_TRUE(BuiltInDefaultValue<char>::Exists());
+#if GMOCK_HAS_SIGNED_WCHAR_T_
+  EXPECT_TRUE(BuiltInDefaultValue<unsigned wchar_t>::Exists());
+  EXPECT_TRUE(BuiltInDefaultValue<signed wchar_t>::Exists());
+#endif
+#if GMOCK_WCHAR_T_IS_NATIVE_
+  EXPECT_TRUE(BuiltInDefaultValue<wchar_t>::Exists());
+#endif
+  EXPECT_TRUE(BuiltInDefaultValue<unsigned short>::Exists());  // NOLINT
+  EXPECT_TRUE(BuiltInDefaultValue<signed short>::Exists());  // NOLINT
+  EXPECT_TRUE(BuiltInDefaultValue<short>::Exists());  // NOLINT
+  EXPECT_TRUE(BuiltInDefaultValue<unsigned int>::Exists());
+  EXPECT_TRUE(BuiltInDefaultValue<signed int>::Exists());
+  EXPECT_TRUE(BuiltInDefaultValue<int>::Exists());
+  EXPECT_TRUE(BuiltInDefaultValue<unsigned long>::Exists());  // NOLINT
+  EXPECT_TRUE(BuiltInDefaultValue<signed long>::Exists());  // NOLINT
+  EXPECT_TRUE(BuiltInDefaultValue<long>::Exists());  // NOLINT
+  EXPECT_TRUE(BuiltInDefaultValue<UInt64>::Exists());
+  EXPECT_TRUE(BuiltInDefaultValue<Int64>::Exists());
+  EXPECT_TRUE(BuiltInDefaultValue<float>::Exists());
+  EXPECT_TRUE(BuiltInDefaultValue<double>::Exists());
+}
+
+// Tests that BuiltInDefaultValue<bool>::Get() returns false.
+TEST(BuiltInDefaultValueTest, IsFalseForBool) {
+  EXPECT_FALSE(BuiltInDefaultValue<bool>::Get());
+}
+
+// Tests that BuiltInDefaultValue<bool>::Exists() returns true.
+TEST(BuiltInDefaultValueTest, BoolExists) {
+  EXPECT_TRUE(BuiltInDefaultValue<bool>::Exists());
+}
+
+// Tests that BuiltInDefaultValue<T>::Get() returns "" when T is a
+// string type.
+TEST(BuiltInDefaultValueTest, IsEmptyStringForString) {
+#if GTEST_HAS_GLOBAL_STRING
+  EXPECT_EQ("", BuiltInDefaultValue< ::string>::Get());
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+  EXPECT_EQ("", BuiltInDefaultValue< ::std::string>::Get());
+}
+
+// Tests that BuiltInDefaultValue<T>::Exists() returns true when T is a
+// string type.
+TEST(BuiltInDefaultValueTest, ExistsForString) {
+#if GTEST_HAS_GLOBAL_STRING
+  EXPECT_TRUE(BuiltInDefaultValue< ::string>::Exists());
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+  EXPECT_TRUE(BuiltInDefaultValue< ::std::string>::Exists());
+}
+
+// Tests that BuiltInDefaultValue<const T>::Get() returns the same
+// value as BuiltInDefaultValue<T>::Get() does.
+TEST(BuiltInDefaultValueTest, WorksForConstTypes) {
+  EXPECT_EQ("", BuiltInDefaultValue<const std::string>::Get());
+  EXPECT_EQ(0, BuiltInDefaultValue<const int>::Get());
+  EXPECT_TRUE(BuiltInDefaultValue<char* const>::Get() == NULL);
+  EXPECT_FALSE(BuiltInDefaultValue<const bool>::Get());
+}
+
+// A type that's default constructible.
+class MyDefaultConstructible {
+ public:
+  MyDefaultConstructible() : value_(42) {}
+
+  int value() const { return value_; }
+
+ private:
+  int value_;
+};
+
+// A type that's not default constructible.
+class MyNonDefaultConstructible {
+ public:
+  // Does not have a default ctor.
+  explicit MyNonDefaultConstructible(int a_value) : value_(a_value) {}
+
+  int value() const { return value_; }
+
+ private:
+  int value_;
+};
+
+#if GTEST_HAS_STD_TYPE_TRAITS_
+
+TEST(BuiltInDefaultValueTest, ExistsForDefaultConstructibleType) {
+  EXPECT_TRUE(BuiltInDefaultValue<MyDefaultConstructible>::Exists());
+}
+
+TEST(BuiltInDefaultValueTest, IsDefaultConstructedForDefaultConstructibleType) {
+  EXPECT_EQ(42, BuiltInDefaultValue<MyDefaultConstructible>::Get().value());
+}
+
+#endif  // GTEST_HAS_STD_TYPE_TRAITS_
+
+TEST(BuiltInDefaultValueTest, DoesNotExistForNonDefaultConstructibleType) {
+  EXPECT_FALSE(BuiltInDefaultValue<MyNonDefaultConstructible>::Exists());
+}
+
+// Tests that BuiltInDefaultValue<T&>::Get() aborts the program.
+TEST(BuiltInDefaultValueDeathTest, IsUndefinedForReferences) {
+  EXPECT_DEATH_IF_SUPPORTED({
+    BuiltInDefaultValue<int&>::Get();
+  }, "");
+  EXPECT_DEATH_IF_SUPPORTED({
+    BuiltInDefaultValue<const char&>::Get();
+  }, "");
+}
+
+TEST(BuiltInDefaultValueDeathTest, IsUndefinedForNonDefaultConstructibleType) {
+  EXPECT_DEATH_IF_SUPPORTED({
+    BuiltInDefaultValue<MyNonDefaultConstructible>::Get();
+  }, "");
+}
+
+// Tests that DefaultValue<T>::IsSet() is false initially.
+TEST(DefaultValueTest, IsInitiallyUnset) {
+  EXPECT_FALSE(DefaultValue<int>::IsSet());
+  EXPECT_FALSE(DefaultValue<MyDefaultConstructible>::IsSet());
+  EXPECT_FALSE(DefaultValue<const MyNonDefaultConstructible>::IsSet());
+}
+
+// Tests that DefaultValue<T> can be set and then unset.
+TEST(DefaultValueTest, CanBeSetAndUnset) {
+  EXPECT_TRUE(DefaultValue<int>::Exists());
+  EXPECT_FALSE(DefaultValue<const MyNonDefaultConstructible>::Exists());
+
+  DefaultValue<int>::Set(1);
+  DefaultValue<const MyNonDefaultConstructible>::Set(
+      MyNonDefaultConstructible(42));
+
+  EXPECT_EQ(1, DefaultValue<int>::Get());
+  EXPECT_EQ(42, DefaultValue<const MyNonDefaultConstructible>::Get().value());
+
+  EXPECT_TRUE(DefaultValue<int>::Exists());
+  EXPECT_TRUE(DefaultValue<const MyNonDefaultConstructible>::Exists());
+
+  DefaultValue<int>::Clear();
+  DefaultValue<const MyNonDefaultConstructible>::Clear();
+
+  EXPECT_FALSE(DefaultValue<int>::IsSet());
+  EXPECT_FALSE(DefaultValue<const MyNonDefaultConstructible>::IsSet());
+
+  EXPECT_TRUE(DefaultValue<int>::Exists());
+  EXPECT_FALSE(DefaultValue<const MyNonDefaultConstructible>::Exists());
+}
+
+// Tests that DefaultValue<T>::Get() returns the
+// BuiltInDefaultValue<T>::Get() when DefaultValue<T>::IsSet() is
+// false.
+TEST(DefaultValueDeathTest, GetReturnsBuiltInDefaultValueWhenUnset) {
+  EXPECT_FALSE(DefaultValue<int>::IsSet());
+  EXPECT_TRUE(DefaultValue<int>::Exists());
+  EXPECT_FALSE(DefaultValue<MyNonDefaultConstructible>::IsSet());
+  EXPECT_FALSE(DefaultValue<MyNonDefaultConstructible>::Exists());
+
+  EXPECT_EQ(0, DefaultValue<int>::Get());
+
+  EXPECT_DEATH_IF_SUPPORTED({
+    DefaultValue<MyNonDefaultConstructible>::Get();
+  }, "");
+}
+
+#if GTEST_HAS_STD_UNIQUE_PTR_
+TEST(DefaultValueTest, GetWorksForMoveOnlyIfSet) {
+  EXPECT_TRUE(DefaultValue<std::unique_ptr<int>>::Exists());
+  EXPECT_TRUE(DefaultValue<std::unique_ptr<int>>::Get() == NULL);
+  DefaultValue<std::unique_ptr<int>>::SetFactory([] {
+    return std::unique_ptr<int>(new int(42));
+  });
+  EXPECT_TRUE(DefaultValue<std::unique_ptr<int>>::Exists());
+  std::unique_ptr<int> i = DefaultValue<std::unique_ptr<int>>::Get();
+  EXPECT_EQ(42, *i);
+}
+#endif  // GTEST_HAS_STD_UNIQUE_PTR_
+
+// Tests that DefaultValue<void>::Get() returns void.
+TEST(DefaultValueTest, GetWorksForVoid) {
+  return DefaultValue<void>::Get();
+}
+
+// Tests using DefaultValue with a reference type.
+
+// Tests that DefaultValue<T&>::IsSet() is false initially.
+TEST(DefaultValueOfReferenceTest, IsInitiallyUnset) {
+  EXPECT_FALSE(DefaultValue<int&>::IsSet());
+  EXPECT_FALSE(DefaultValue<MyDefaultConstructible&>::IsSet());
+  EXPECT_FALSE(DefaultValue<MyNonDefaultConstructible&>::IsSet());
+}
+
+// Tests that DefaultValue<T&>::Exists is false initiallly.
+TEST(DefaultValueOfReferenceTest, IsInitiallyNotExisting) {
+  EXPECT_FALSE(DefaultValue<int&>::Exists());
+  EXPECT_FALSE(DefaultValue<MyDefaultConstructible&>::Exists());
+  EXPECT_FALSE(DefaultValue<MyNonDefaultConstructible&>::Exists());
+}
+
+// Tests that DefaultValue<T&> can be set and then unset.
+TEST(DefaultValueOfReferenceTest, CanBeSetAndUnset) {
+  int n = 1;
+  DefaultValue<const int&>::Set(n);
+  MyNonDefaultConstructible x(42);
+  DefaultValue<MyNonDefaultConstructible&>::Set(x);
+
+  EXPECT_TRUE(DefaultValue<const int&>::Exists());
+  EXPECT_TRUE(DefaultValue<MyNonDefaultConstructible&>::Exists());
+
+  EXPECT_EQ(&n, &(DefaultValue<const int&>::Get()));
+  EXPECT_EQ(&x, &(DefaultValue<MyNonDefaultConstructible&>::Get()));
+
+  DefaultValue<const int&>::Clear();
+  DefaultValue<MyNonDefaultConstructible&>::Clear();
+
+  EXPECT_FALSE(DefaultValue<const int&>::Exists());
+  EXPECT_FALSE(DefaultValue<MyNonDefaultConstructible&>::Exists());
+
+  EXPECT_FALSE(DefaultValue<const int&>::IsSet());
+  EXPECT_FALSE(DefaultValue<MyNonDefaultConstructible&>::IsSet());
+}
+
+// Tests that DefaultValue<T&>::Get() returns the
+// BuiltInDefaultValue<T&>::Get() when DefaultValue<T&>::IsSet() is
+// false.
+TEST(DefaultValueOfReferenceDeathTest, GetReturnsBuiltInDefaultValueWhenUnset) {
+  EXPECT_FALSE(DefaultValue<int&>::IsSet());
+  EXPECT_FALSE(DefaultValue<MyNonDefaultConstructible&>::IsSet());
+
+  EXPECT_DEATH_IF_SUPPORTED({
+    DefaultValue<int&>::Get();
+  }, "");
+  EXPECT_DEATH_IF_SUPPORTED({
+    DefaultValue<MyNonDefaultConstructible>::Get();
+  }, "");
+}
+
+// Tests that ActionInterface can be implemented by defining the
+// Perform method.
+
+typedef int MyGlobalFunction(bool, int);
+
+class MyActionImpl : public ActionInterface<MyGlobalFunction> {
+ public:
+  virtual int Perform(const tuple<bool, int>& args) {
+    return get<0>(args) ? get<1>(args) : 0;
+  }
+};
+
+TEST(ActionInterfaceTest, CanBeImplementedByDefiningPerform) {
+  MyActionImpl my_action_impl;
+  (void)my_action_impl;
+}
+
+TEST(ActionInterfaceTest, MakeAction) {
+  Action<MyGlobalFunction> action = MakeAction(new MyActionImpl);
+
+  // When exercising the Perform() method of Action<F>, we must pass
+  // it a tuple whose size and type are compatible with F's argument
+  // types.  For example, if F is int(), then Perform() takes a
+  // 0-tuple; if F is void(bool, int), then Perform() takes a
+  // tuple<bool, int>, and so on.
+  EXPECT_EQ(5, action.Perform(make_tuple(true, 5)));
+}
+
+// Tests that Action<F> can be contructed from a pointer to
+// ActionInterface<F>.
+TEST(ActionTest, CanBeConstructedFromActionInterface) {
+  Action<MyGlobalFunction> action(new MyActionImpl);
+}
+
+// Tests that Action<F> delegates actual work to ActionInterface<F>.
+TEST(ActionTest, DelegatesWorkToActionInterface) {
+  const Action<MyGlobalFunction> action(new MyActionImpl);
+
+  EXPECT_EQ(5, action.Perform(make_tuple(true, 5)));
+  EXPECT_EQ(0, action.Perform(make_tuple(false, 1)));
+}
+
+// Tests that Action<F> can be copied.
+TEST(ActionTest, IsCopyable) {
+  Action<MyGlobalFunction> a1(new MyActionImpl);
+  Action<MyGlobalFunction> a2(a1);  // Tests the copy constructor.
+
+  // a1 should continue to work after being copied from.
+  EXPECT_EQ(5, a1.Perform(make_tuple(true, 5)));
+  EXPECT_EQ(0, a1.Perform(make_tuple(false, 1)));
+
+  // a2 should work like the action it was copied from.
+  EXPECT_EQ(5, a2.Perform(make_tuple(true, 5)));
+  EXPECT_EQ(0, a2.Perform(make_tuple(false, 1)));
+
+  a2 = a1;  // Tests the assignment operator.
+
+  // a1 should continue to work after being copied from.
+  EXPECT_EQ(5, a1.Perform(make_tuple(true, 5)));
+  EXPECT_EQ(0, a1.Perform(make_tuple(false, 1)));
+
+  // a2 should work like the action it was copied from.
+  EXPECT_EQ(5, a2.Perform(make_tuple(true, 5)));
+  EXPECT_EQ(0, a2.Perform(make_tuple(false, 1)));
+}
+
+// Tests that an Action<From> object can be converted to a
+// compatible Action<To> object.
+
+class IsNotZero : public ActionInterface<bool(int)> {  // NOLINT
+ public:
+  virtual bool Perform(const tuple<int>& arg) {
+    return get<0>(arg) != 0;
+  }
+};
+
+#if !GTEST_OS_SYMBIAN
+// Compiling this test on Nokia's Symbian compiler fails with:
+//  'Result' is not a member of class 'testing::internal::Function<int>'
+//  (point of instantiation: '@unnamed@gmock_actions_test_cc@::
+//      ActionTest_CanBeConvertedToOtherActionType_Test::TestBody()')
+// with no obvious fix.
+TEST(ActionTest, CanBeConvertedToOtherActionType) {
+  const Action<bool(int)> a1(new IsNotZero);  // NOLINT
+  const Action<int(char)> a2 = Action<int(char)>(a1);  // NOLINT
+  EXPECT_EQ(1, a2.Perform(make_tuple('a')));
+  EXPECT_EQ(0, a2.Perform(make_tuple('\0')));
+}
+#endif  // !GTEST_OS_SYMBIAN
+
+// The following two classes are for testing MakePolymorphicAction().
+
+// Implements a polymorphic action that returns the second of the
+// arguments it receives.
+class ReturnSecondArgumentAction {
+ public:
+  // We want to verify that MakePolymorphicAction() can work with a
+  // polymorphic action whose Perform() method template is either
+  // const or not.  This lets us verify the non-const case.
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple& args) { return get<1>(args); }
+};
+
+// Implements a polymorphic action that can be used in a nullary
+// function to return 0.
+class ReturnZeroFromNullaryFunctionAction {
+ public:
+  // For testing that MakePolymorphicAction() works when the
+  // implementation class' Perform() method template takes only one
+  // template parameter.
+  //
+  // We want to verify that MakePolymorphicAction() can work with a
+  // polymorphic action whose Perform() method template is either
+  // const or not.  This lets us verify the const case.
+  template <typename Result>
+  Result Perform(const tuple<>&) const { return 0; }
+};
+
+// These functions verify that MakePolymorphicAction() returns a
+// PolymorphicAction<T> where T is the argument's type.
+
+PolymorphicAction<ReturnSecondArgumentAction> ReturnSecondArgument() {
+  return MakePolymorphicAction(ReturnSecondArgumentAction());
+}
+
+PolymorphicAction<ReturnZeroFromNullaryFunctionAction>
+ReturnZeroFromNullaryFunction() {
+  return MakePolymorphicAction(ReturnZeroFromNullaryFunctionAction());
+}
+
+// Tests that MakePolymorphicAction() turns a polymorphic action
+// implementation class into a polymorphic action.
+TEST(MakePolymorphicActionTest, ConstructsActionFromImpl) {
+  Action<int(bool, int, double)> a1 = ReturnSecondArgument();  // NOLINT
+  EXPECT_EQ(5, a1.Perform(make_tuple(false, 5, 2.0)));
+}
+
+// Tests that MakePolymorphicAction() works when the implementation
+// class' Perform() method template has only one template parameter.
+TEST(MakePolymorphicActionTest, WorksWhenPerformHasOneTemplateParameter) {
+  Action<int()> a1 = ReturnZeroFromNullaryFunction();
+  EXPECT_EQ(0, a1.Perform(make_tuple()));
+
+  Action<void*()> a2 = ReturnZeroFromNullaryFunction();
+  EXPECT_TRUE(a2.Perform(make_tuple()) == NULL);
+}
+
+// Tests that Return() works as an action for void-returning
+// functions.
+TEST(ReturnTest, WorksForVoid) {
+  const Action<void(int)> ret = Return();  // NOLINT
+  return ret.Perform(make_tuple(1));
+}
+
+// Tests that Return(v) returns v.
+TEST(ReturnTest, ReturnsGivenValue) {
+  Action<int()> ret = Return(1);  // NOLINT
+  EXPECT_EQ(1, ret.Perform(make_tuple()));
+
+  ret = Return(-5);
+  EXPECT_EQ(-5, ret.Perform(make_tuple()));
+}
+
+// Tests that Return("string literal") works.
+TEST(ReturnTest, AcceptsStringLiteral) {
+  Action<const char*()> a1 = Return("Hello");
+  EXPECT_STREQ("Hello", a1.Perform(make_tuple()));
+
+  Action<std::string()> a2 = Return("world");
+  EXPECT_EQ("world", a2.Perform(make_tuple()));
+}
+
+// Test struct which wraps a vector of integers. Used in
+// 'SupportsWrapperReturnType' test.
+struct IntegerVectorWrapper {
+  std::vector<int> * v;
+  IntegerVectorWrapper(std::vector<int>& _v) : v(&_v) {}  // NOLINT
+};
+
+// Tests that Return() works when return type is a wrapper type.
+TEST(ReturnTest, SupportsWrapperReturnType) {
+  // Initialize vector of integers.
+  std::vector<int> v;
+  for (int i = 0; i < 5; ++i) v.push_back(i);
+
+  // Return() called with 'v' as argument. The Action will return the same data
+  // as 'v' (copy) but it will be wrapped in an IntegerVectorWrapper.
+  Action<IntegerVectorWrapper()> a = Return(v);
+  const std::vector<int>& result = *(a.Perform(make_tuple()).v);
+  EXPECT_THAT(result, ::testing::ElementsAre(0, 1, 2, 3, 4));
+}
+
+// Tests that Return(v) is covaraint.
+
+struct Base {
+  bool operator==(const Base&) { return true; }
+};
+
+struct Derived : public Base {
+  bool operator==(const Derived&) { return true; }
+};
+
+TEST(ReturnTest, IsCovariant) {
+  Base base;
+  Derived derived;
+  Action<Base*()> ret = Return(&base);
+  EXPECT_EQ(&base, ret.Perform(make_tuple()));
+
+  ret = Return(&derived);
+  EXPECT_EQ(&derived, ret.Perform(make_tuple()));
+}
+
+// Tests that the type of the value passed into Return is converted into T
+// when the action is cast to Action<T(...)> rather than when the action is
+// performed. See comments on testing::internal::ReturnAction in
+// gmock-actions.h for more information.
+class FromType {
+ public:
+  explicit FromType(bool* is_converted) : converted_(is_converted) {}
+  bool* converted() const { return converted_; }
+
+ private:
+  bool* const converted_;
+
+  GTEST_DISALLOW_ASSIGN_(FromType);
+};
+
+class ToType {
+ public:
+  // Must allow implicit conversion due to use in ImplicitCast_<T>.
+  ToType(const FromType& x) { *x.converted() = true; }  // NOLINT
+};
+
+TEST(ReturnTest, ConvertsArgumentWhenConverted) {
+  bool converted = false;
+  FromType x(&converted);
+  Action<ToType()> action(Return(x));
+  EXPECT_TRUE(converted) << "Return must convert its argument in its own "
+                         << "conversion operator.";
+  converted = false;
+  action.Perform(tuple<>());
+  EXPECT_FALSE(converted) << "Action must NOT convert its argument "
+                          << "when performed.";
+}
+
+class DestinationType {};
+
+class SourceType {
+ public:
+  // Note: a non-const typecast operator.
+  operator DestinationType() { return DestinationType(); }
+};
+
+TEST(ReturnTest, CanConvertArgumentUsingNonConstTypeCastOperator) {
+  SourceType s;
+  Action<DestinationType()> action(Return(s));
+}
+
+// Tests that ReturnNull() returns NULL in a pointer-returning function.
+TEST(ReturnNullTest, WorksInPointerReturningFunction) {
+  const Action<int*()> a1 = ReturnNull();
+  EXPECT_TRUE(a1.Perform(make_tuple()) == NULL);
+
+  const Action<const char*(bool)> a2 = ReturnNull();  // NOLINT
+  EXPECT_TRUE(a2.Perform(make_tuple(true)) == NULL);
+}
+
+#if GTEST_HAS_STD_UNIQUE_PTR_
+// Tests that ReturnNull() returns NULL for shared_ptr and unique_ptr returning
+// functions.
+TEST(ReturnNullTest, WorksInSmartPointerReturningFunction) {
+  const Action<std::unique_ptr<const int>()> a1 = ReturnNull();
+  EXPECT_TRUE(a1.Perform(make_tuple()) == nullptr);
+
+  const Action<std::shared_ptr<int>(std::string)> a2 = ReturnNull();
+  EXPECT_TRUE(a2.Perform(make_tuple("foo")) == nullptr);
+}
+#endif  // GTEST_HAS_STD_UNIQUE_PTR_
+
+// Tests that ReturnRef(v) works for reference types.
+TEST(ReturnRefTest, WorksForReference) {
+  const int n = 0;
+  const Action<const int&(bool)> ret = ReturnRef(n);  // NOLINT
+
+  EXPECT_EQ(&n, &ret.Perform(make_tuple(true)));
+}
+
+// Tests that ReturnRef(v) is covariant.
+TEST(ReturnRefTest, IsCovariant) {
+  Base base;
+  Derived derived;
+  Action<Base&()> a = ReturnRef(base);
+  EXPECT_EQ(&base, &a.Perform(make_tuple()));
+
+  a = ReturnRef(derived);
+  EXPECT_EQ(&derived, &a.Perform(make_tuple()));
+}
+
+// Tests that ReturnRefOfCopy(v) works for reference types.
+TEST(ReturnRefOfCopyTest, WorksForReference) {
+  int n = 42;
+  const Action<const int&()> ret = ReturnRefOfCopy(n);
+
+  EXPECT_NE(&n, &ret.Perform(make_tuple()));
+  EXPECT_EQ(42, ret.Perform(make_tuple()));
+
+  n = 43;
+  EXPECT_NE(&n, &ret.Perform(make_tuple()));
+  EXPECT_EQ(42, ret.Perform(make_tuple()));
+}
+
+// Tests that ReturnRefOfCopy(v) is covariant.
+TEST(ReturnRefOfCopyTest, IsCovariant) {
+  Base base;
+  Derived derived;
+  Action<Base&()> a = ReturnRefOfCopy(base);
+  EXPECT_NE(&base, &a.Perform(make_tuple()));
+
+  a = ReturnRefOfCopy(derived);
+  EXPECT_NE(&derived, &a.Perform(make_tuple()));
+}
+
+// Tests that DoDefault() does the default action for the mock method.
+
+class MockClass {
+ public:
+  MockClass() {}
+
+  MOCK_METHOD1(IntFunc, int(bool flag));  // NOLINT
+  MOCK_METHOD0(Foo, MyNonDefaultConstructible());
+#if GTEST_HAS_STD_UNIQUE_PTR_
+  MOCK_METHOD0(MakeUnique, std::unique_ptr<int>());
+  MOCK_METHOD0(MakeUniqueBase, std::unique_ptr<Base>());
+  MOCK_METHOD0(MakeVectorUnique, std::vector<std::unique_ptr<int>>());
+#endif
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockClass);
+};
+
+// Tests that DoDefault() returns the built-in default value for the
+// return type by default.
+TEST(DoDefaultTest, ReturnsBuiltInDefaultValueByDefault) {
+  MockClass mock;
+  EXPECT_CALL(mock, IntFunc(_))
+      .WillOnce(DoDefault());
+  EXPECT_EQ(0, mock.IntFunc(true));
+}
+
+// Tests that DoDefault() throws (when exceptions are enabled) or aborts
+// the process when there is no built-in default value for the return type.
+TEST(DoDefaultDeathTest, DiesForUnknowType) {
+  MockClass mock;
+  EXPECT_CALL(mock, Foo())
+      .WillRepeatedly(DoDefault());
+#if GTEST_HAS_EXCEPTIONS
+  EXPECT_ANY_THROW(mock.Foo());
+#else
+  EXPECT_DEATH_IF_SUPPORTED({
+    mock.Foo();
+  }, "");
+#endif
+}
+
+// Tests that using DoDefault() inside a composite action leads to a
+// run-time error.
+
+void VoidFunc(bool /* flag */) {}
+
+TEST(DoDefaultDeathTest, DiesIfUsedInCompositeAction) {
+  MockClass mock;
+  EXPECT_CALL(mock, IntFunc(_))
+      .WillRepeatedly(DoAll(Invoke(VoidFunc),
+                            DoDefault()));
+
+  // Ideally we should verify the error message as well.  Sadly,
+  // EXPECT_DEATH() can only capture stderr, while Google Mock's
+  // errors are printed on stdout.  Therefore we have to settle for
+  // not verifying the message.
+  EXPECT_DEATH_IF_SUPPORTED({
+    mock.IntFunc(true);
+  }, "");
+}
+
+// Tests that DoDefault() returns the default value set by
+// DefaultValue<T>::Set() when it's not overriden by an ON_CALL().
+TEST(DoDefaultTest, ReturnsUserSpecifiedPerTypeDefaultValueWhenThereIsOne) {
+  DefaultValue<int>::Set(1);
+  MockClass mock;
+  EXPECT_CALL(mock, IntFunc(_))
+      .WillOnce(DoDefault());
+  EXPECT_EQ(1, mock.IntFunc(false));
+  DefaultValue<int>::Clear();
+}
+
+// Tests that DoDefault() does the action specified by ON_CALL().
+TEST(DoDefaultTest, DoesWhatOnCallSpecifies) {
+  MockClass mock;
+  ON_CALL(mock, IntFunc(_))
+      .WillByDefault(Return(2));
+  EXPECT_CALL(mock, IntFunc(_))
+      .WillOnce(DoDefault());
+  EXPECT_EQ(2, mock.IntFunc(false));
+}
+
+// Tests that using DoDefault() in ON_CALL() leads to a run-time failure.
+TEST(DoDefaultTest, CannotBeUsedInOnCall) {
+  MockClass mock;
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    ON_CALL(mock, IntFunc(_))
+      .WillByDefault(DoDefault());
+  }, "DoDefault() cannot be used in ON_CALL()");
+}
+
+// Tests that SetArgPointee<N>(v) sets the variable pointed to by
+// the N-th (0-based) argument to v.
+TEST(SetArgPointeeTest, SetsTheNthPointee) {
+  typedef void MyFunction(bool, int*, char*);
+  Action<MyFunction> a = SetArgPointee<1>(2);
+
+  int n = 0;
+  char ch = '\0';
+  a.Perform(make_tuple(true, &n, &ch));
+  EXPECT_EQ(2, n);
+  EXPECT_EQ('\0', ch);
+
+  a = SetArgPointee<2>('a');
+  n = 0;
+  ch = '\0';
+  a.Perform(make_tuple(true, &n, &ch));
+  EXPECT_EQ(0, n);
+  EXPECT_EQ('a', ch);
+}
+
+#if !((GTEST_GCC_VER_ && GTEST_GCC_VER_ < 40000) || GTEST_OS_SYMBIAN)
+// Tests that SetArgPointee<N>() accepts a string literal.
+// GCC prior to v4.0 and the Symbian compiler do not support this.
+TEST(SetArgPointeeTest, AcceptsStringLiteral) {
+  typedef void MyFunction(std::string*, const char**);
+  Action<MyFunction> a = SetArgPointee<0>("hi");
+  std::string str;
+  const char* ptr = NULL;
+  a.Perform(make_tuple(&str, &ptr));
+  EXPECT_EQ("hi", str);
+  EXPECT_TRUE(ptr == NULL);
+
+  a = SetArgPointee<1>("world");
+  str = "";
+  a.Perform(make_tuple(&str, &ptr));
+  EXPECT_EQ("", str);
+  EXPECT_STREQ("world", ptr);
+}
+
+TEST(SetArgPointeeTest, AcceptsWideStringLiteral) {
+  typedef void MyFunction(const wchar_t**);
+  Action<MyFunction> a = SetArgPointee<0>(L"world");
+  const wchar_t* ptr = NULL;
+  a.Perform(make_tuple(&ptr));
+  EXPECT_STREQ(L"world", ptr);
+
+# if GTEST_HAS_STD_WSTRING
+
+  typedef void MyStringFunction(std::wstring*);
+  Action<MyStringFunction> a2 = SetArgPointee<0>(L"world");
+  std::wstring str = L"";
+  a2.Perform(make_tuple(&str));
+  EXPECT_EQ(L"world", str);
+
+# endif
+}
+#endif
+
+// Tests that SetArgPointee<N>() accepts a char pointer.
+TEST(SetArgPointeeTest, AcceptsCharPointer) {
+  typedef void MyFunction(bool, std::string*, const char**);
+  const char* const hi = "hi";
+  Action<MyFunction> a = SetArgPointee<1>(hi);
+  std::string str;
+  const char* ptr = NULL;
+  a.Perform(make_tuple(true, &str, &ptr));
+  EXPECT_EQ("hi", str);
+  EXPECT_TRUE(ptr == NULL);
+
+  char world_array[] = "world";
+  char* const world = world_array;
+  a = SetArgPointee<2>(world);
+  str = "";
+  a.Perform(make_tuple(true, &str, &ptr));
+  EXPECT_EQ("", str);
+  EXPECT_EQ(world, ptr);
+}
+
+TEST(SetArgPointeeTest, AcceptsWideCharPointer) {
+  typedef void MyFunction(bool, const wchar_t**);
+  const wchar_t* const hi = L"hi";
+  Action<MyFunction> a = SetArgPointee<1>(hi);
+  const wchar_t* ptr = NULL;
+  a.Perform(make_tuple(true, &ptr));
+  EXPECT_EQ(hi, ptr);
+
+# if GTEST_HAS_STD_WSTRING
+
+  typedef void MyStringFunction(bool, std::wstring*);
+  wchar_t world_array[] = L"world";
+  wchar_t* const world = world_array;
+  Action<MyStringFunction> a2 = SetArgPointee<1>(world);
+  std::wstring str;
+  a2.Perform(make_tuple(true, &str));
+  EXPECT_EQ(world_array, str);
+# endif
+}
+
+#if GTEST_HAS_PROTOBUF_
+
+// Tests that SetArgPointee<N>(proto_buffer) sets the v1 protobuf
+// variable pointed to by the N-th (0-based) argument to proto_buffer.
+TEST(SetArgPointeeTest, SetsTheNthPointeeOfProtoBufferType) {
+  TestMessage* const msg = new TestMessage;
+  msg->set_member("yes");
+  TestMessage orig_msg;
+  orig_msg.CopyFrom(*msg);
+
+  Action<void(bool, TestMessage*)> a = SetArgPointee<1>(*msg);
+  // SetArgPointee<N>(proto_buffer) makes a copy of proto_buffer
+  // s.t. the action works even when the original proto_buffer has
+  // died.  We ensure this behavior by deleting msg before using the
+  // action.
+  delete msg;
+
+  TestMessage dest;
+  EXPECT_FALSE(orig_msg.Equals(dest));
+  a.Perform(make_tuple(true, &dest));
+  EXPECT_TRUE(orig_msg.Equals(dest));
+}
+
+// Tests that SetArgPointee<N>(proto_buffer) sets the
+// ::ProtocolMessage variable pointed to by the N-th (0-based)
+// argument to proto_buffer.
+TEST(SetArgPointeeTest, SetsTheNthPointeeOfProtoBufferBaseType) {
+  TestMessage* const msg = new TestMessage;
+  msg->set_member("yes");
+  TestMessage orig_msg;
+  orig_msg.CopyFrom(*msg);
+
+  Action<void(bool, ::ProtocolMessage*)> a = SetArgPointee<1>(*msg);
+  // SetArgPointee<N>(proto_buffer) makes a copy of proto_buffer
+  // s.t. the action works even when the original proto_buffer has
+  // died.  We ensure this behavior by deleting msg before using the
+  // action.
+  delete msg;
+
+  TestMessage dest;
+  ::ProtocolMessage* const dest_base = &dest;
+  EXPECT_FALSE(orig_msg.Equals(dest));
+  a.Perform(make_tuple(true, dest_base));
+  EXPECT_TRUE(orig_msg.Equals(dest));
+}
+
+// Tests that SetArgPointee<N>(proto2_buffer) sets the v2
+// protobuf variable pointed to by the N-th (0-based) argument to
+// proto2_buffer.
+TEST(SetArgPointeeTest, SetsTheNthPointeeOfProto2BufferType) {
+  using testing::internal::FooMessage;
+  FooMessage* const msg = new FooMessage;
+  msg->set_int_field(2);
+  msg->set_string_field("hi");
+  FooMessage orig_msg;
+  orig_msg.CopyFrom(*msg);
+
+  Action<void(bool, FooMessage*)> a = SetArgPointee<1>(*msg);
+  // SetArgPointee<N>(proto2_buffer) makes a copy of
+  // proto2_buffer s.t. the action works even when the original
+  // proto2_buffer has died.  We ensure this behavior by deleting msg
+  // before using the action.
+  delete msg;
+
+  FooMessage dest;
+  dest.set_int_field(0);
+  a.Perform(make_tuple(true, &dest));
+  EXPECT_EQ(2, dest.int_field());
+  EXPECT_EQ("hi", dest.string_field());
+}
+
+// Tests that SetArgPointee<N>(proto2_buffer) sets the
+// proto2::Message variable pointed to by the N-th (0-based) argument
+// to proto2_buffer.
+TEST(SetArgPointeeTest, SetsTheNthPointeeOfProto2BufferBaseType) {
+  using testing::internal::FooMessage;
+  FooMessage* const msg = new FooMessage;
+  msg->set_int_field(2);
+  msg->set_string_field("hi");
+  FooMessage orig_msg;
+  orig_msg.CopyFrom(*msg);
+
+  Action<void(bool, ::proto2::Message*)> a = SetArgPointee<1>(*msg);
+  // SetArgPointee<N>(proto2_buffer) makes a copy of
+  // proto2_buffer s.t. the action works even when the original
+  // proto2_buffer has died.  We ensure this behavior by deleting msg
+  // before using the action.
+  delete msg;
+
+  FooMessage dest;
+  dest.set_int_field(0);
+  ::proto2::Message* const dest_base = &dest;
+  a.Perform(make_tuple(true, dest_base));
+  EXPECT_EQ(2, dest.int_field());
+  EXPECT_EQ("hi", dest.string_field());
+}
+
+#endif  // GTEST_HAS_PROTOBUF_
+
+// Tests that SetArgumentPointee<N>(v) sets the variable pointed to by
+// the N-th (0-based) argument to v.
+TEST(SetArgumentPointeeTest, SetsTheNthPointee) {
+  typedef void MyFunction(bool, int*, char*);
+  Action<MyFunction> a = SetArgumentPointee<1>(2);
+
+  int n = 0;
+  char ch = '\0';
+  a.Perform(make_tuple(true, &n, &ch));
+  EXPECT_EQ(2, n);
+  EXPECT_EQ('\0', ch);
+
+  a = SetArgumentPointee<2>('a');
+  n = 0;
+  ch = '\0';
+  a.Perform(make_tuple(true, &n, &ch));
+  EXPECT_EQ(0, n);
+  EXPECT_EQ('a', ch);
+}
+
+#if GTEST_HAS_PROTOBUF_
+
+// Tests that SetArgumentPointee<N>(proto_buffer) sets the v1 protobuf
+// variable pointed to by the N-th (0-based) argument to proto_buffer.
+TEST(SetArgumentPointeeTest, SetsTheNthPointeeOfProtoBufferType) {
+  TestMessage* const msg = new TestMessage;
+  msg->set_member("yes");
+  TestMessage orig_msg;
+  orig_msg.CopyFrom(*msg);
+
+  Action<void(bool, TestMessage*)> a = SetArgumentPointee<1>(*msg);
+  // SetArgumentPointee<N>(proto_buffer) makes a copy of proto_buffer
+  // s.t. the action works even when the original proto_buffer has
+  // died.  We ensure this behavior by deleting msg before using the
+  // action.
+  delete msg;
+
+  TestMessage dest;
+  EXPECT_FALSE(orig_msg.Equals(dest));
+  a.Perform(make_tuple(true, &dest));
+  EXPECT_TRUE(orig_msg.Equals(dest));
+}
+
+// Tests that SetArgumentPointee<N>(proto_buffer) sets the
+// ::ProtocolMessage variable pointed to by the N-th (0-based)
+// argument to proto_buffer.
+TEST(SetArgumentPointeeTest, SetsTheNthPointeeOfProtoBufferBaseType) {
+  TestMessage* const msg = new TestMessage;
+  msg->set_member("yes");
+  TestMessage orig_msg;
+  orig_msg.CopyFrom(*msg);
+
+  Action<void(bool, ::ProtocolMessage*)> a = SetArgumentPointee<1>(*msg);
+  // SetArgumentPointee<N>(proto_buffer) makes a copy of proto_buffer
+  // s.t. the action works even when the original proto_buffer has
+  // died.  We ensure this behavior by deleting msg before using the
+  // action.
+  delete msg;
+
+  TestMessage dest;
+  ::ProtocolMessage* const dest_base = &dest;
+  EXPECT_FALSE(orig_msg.Equals(dest));
+  a.Perform(make_tuple(true, dest_base));
+  EXPECT_TRUE(orig_msg.Equals(dest));
+}
+
+// Tests that SetArgumentPointee<N>(proto2_buffer) sets the v2
+// protobuf variable pointed to by the N-th (0-based) argument to
+// proto2_buffer.
+TEST(SetArgumentPointeeTest, SetsTheNthPointeeOfProto2BufferType) {
+  using testing::internal::FooMessage;
+  FooMessage* const msg = new FooMessage;
+  msg->set_int_field(2);
+  msg->set_string_field("hi");
+  FooMessage orig_msg;
+  orig_msg.CopyFrom(*msg);
+
+  Action<void(bool, FooMessage*)> a = SetArgumentPointee<1>(*msg);
+  // SetArgumentPointee<N>(proto2_buffer) makes a copy of
+  // proto2_buffer s.t. the action works even when the original
+  // proto2_buffer has died.  We ensure this behavior by deleting msg
+  // before using the action.
+  delete msg;
+
+  FooMessage dest;
+  dest.set_int_field(0);
+  a.Perform(make_tuple(true, &dest));
+  EXPECT_EQ(2, dest.int_field());
+  EXPECT_EQ("hi", dest.string_field());
+}
+
+// Tests that SetArgumentPointee<N>(proto2_buffer) sets the
+// proto2::Message variable pointed to by the N-th (0-based) argument
+// to proto2_buffer.
+TEST(SetArgumentPointeeTest, SetsTheNthPointeeOfProto2BufferBaseType) {
+  using testing::internal::FooMessage;
+  FooMessage* const msg = new FooMessage;
+  msg->set_int_field(2);
+  msg->set_string_field("hi");
+  FooMessage orig_msg;
+  orig_msg.CopyFrom(*msg);
+
+  Action<void(bool, ::proto2::Message*)> a = SetArgumentPointee<1>(*msg);
+  // SetArgumentPointee<N>(proto2_buffer) makes a copy of
+  // proto2_buffer s.t. the action works even when the original
+  // proto2_buffer has died.  We ensure this behavior by deleting msg
+  // before using the action.
+  delete msg;
+
+  FooMessage dest;
+  dest.set_int_field(0);
+  ::proto2::Message* const dest_base = &dest;
+  a.Perform(make_tuple(true, dest_base));
+  EXPECT_EQ(2, dest.int_field());
+  EXPECT_EQ("hi", dest.string_field());
+}
+
+#endif  // GTEST_HAS_PROTOBUF_
+
+// Sample functions and functors for testing Invoke() and etc.
+int Nullary() { return 1; }
+
+class NullaryFunctor {
+ public:
+  int operator()() { return 2; }
+};
+
+bool g_done = false;
+void VoidNullary() { g_done = true; }
+
+class VoidNullaryFunctor {
+ public:
+  void operator()() { g_done = true; }
+};
+
+class Foo {
+ public:
+  Foo() : value_(123) {}
+
+  int Nullary() const { return value_; }
+
+ private:
+  int value_;
+};
+
+// Tests InvokeWithoutArgs(function).
+TEST(InvokeWithoutArgsTest, Function) {
+  // As an action that takes one argument.
+  Action<int(int)> a = InvokeWithoutArgs(Nullary);  // NOLINT
+  EXPECT_EQ(1, a.Perform(make_tuple(2)));
+
+  // As an action that takes two arguments.
+  Action<int(int, double)> a2 = InvokeWithoutArgs(Nullary);  // NOLINT
+  EXPECT_EQ(1, a2.Perform(make_tuple(2, 3.5)));
+
+  // As an action that returns void.
+  Action<void(int)> a3 = InvokeWithoutArgs(VoidNullary);  // NOLINT
+  g_done = false;
+  a3.Perform(make_tuple(1));
+  EXPECT_TRUE(g_done);
+}
+
+// Tests InvokeWithoutArgs(functor).
+TEST(InvokeWithoutArgsTest, Functor) {
+  // As an action that takes no argument.
+  Action<int()> a = InvokeWithoutArgs(NullaryFunctor());  // NOLINT
+  EXPECT_EQ(2, a.Perform(make_tuple()));
+
+  // As an action that takes three arguments.
+  Action<int(int, double, char)> a2 =  // NOLINT
+      InvokeWithoutArgs(NullaryFunctor());
+  EXPECT_EQ(2, a2.Perform(make_tuple(3, 3.5, 'a')));
+
+  // As an action that returns void.
+  Action<void()> a3 = InvokeWithoutArgs(VoidNullaryFunctor());
+  g_done = false;
+  a3.Perform(make_tuple());
+  EXPECT_TRUE(g_done);
+}
+
+// Tests InvokeWithoutArgs(obj_ptr, method).
+TEST(InvokeWithoutArgsTest, Method) {
+  Foo foo;
+  Action<int(bool, char)> a =  // NOLINT
+      InvokeWithoutArgs(&foo, &Foo::Nullary);
+  EXPECT_EQ(123, a.Perform(make_tuple(true, 'a')));
+}
+
+// Tests using IgnoreResult() on a polymorphic action.
+TEST(IgnoreResultTest, PolymorphicAction) {
+  Action<void(int)> a = IgnoreResult(Return(5));  // NOLINT
+  a.Perform(make_tuple(1));
+}
+
+// Tests using IgnoreResult() on a monomorphic action.
+
+int ReturnOne() {
+  g_done = true;
+  return 1;
+}
+
+TEST(IgnoreResultTest, MonomorphicAction) {
+  g_done = false;
+  Action<void()> a = IgnoreResult(Invoke(ReturnOne));
+  a.Perform(make_tuple());
+  EXPECT_TRUE(g_done);
+}
+
+// Tests using IgnoreResult() on an action that returns a class type.
+
+MyNonDefaultConstructible ReturnMyNonDefaultConstructible(double /* x */) {
+  g_done = true;
+  return MyNonDefaultConstructible(42);
+}
+
+TEST(IgnoreResultTest, ActionReturningClass) {
+  g_done = false;
+  Action<void(int)> a =
+      IgnoreResult(Invoke(ReturnMyNonDefaultConstructible));  // NOLINT
+  a.Perform(make_tuple(2));
+  EXPECT_TRUE(g_done);
+}
+
+TEST(AssignTest, Int) {
+  int x = 0;
+  Action<void(int)> a = Assign(&x, 5);
+  a.Perform(make_tuple(0));
+  EXPECT_EQ(5, x);
+}
+
+TEST(AssignTest, String) {
+  ::std::string x;
+  Action<void(void)> a = Assign(&x, "Hello, world");
+  a.Perform(make_tuple());
+  EXPECT_EQ("Hello, world", x);
+}
+
+TEST(AssignTest, CompatibleTypes) {
+  double x = 0;
+  Action<void(int)> a = Assign(&x, 5);
+  a.Perform(make_tuple(0));
+  EXPECT_DOUBLE_EQ(5, x);
+}
+
+#if !GTEST_OS_WINDOWS_MOBILE
+
+class SetErrnoAndReturnTest : public testing::Test {
+ protected:
+  virtual void SetUp() { errno = 0; }
+  virtual void TearDown() { errno = 0; }
+};
+
+TEST_F(SetErrnoAndReturnTest, Int) {
+  Action<int(void)> a = SetErrnoAndReturn(ENOTTY, -5);
+  EXPECT_EQ(-5, a.Perform(make_tuple()));
+  EXPECT_EQ(ENOTTY, errno);
+}
+
+TEST_F(SetErrnoAndReturnTest, Ptr) {
+  int x;
+  Action<int*(void)> a = SetErrnoAndReturn(ENOTTY, &x);
+  EXPECT_EQ(&x, a.Perform(make_tuple()));
+  EXPECT_EQ(ENOTTY, errno);
+}
+
+TEST_F(SetErrnoAndReturnTest, CompatibleTypes) {
+  Action<double()> a = SetErrnoAndReturn(EINVAL, 5);
+  EXPECT_DOUBLE_EQ(5.0, a.Perform(make_tuple()));
+  EXPECT_EQ(EINVAL, errno);
+}
+
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
+// Tests ByRef().
+
+// Tests that ReferenceWrapper<T> is copyable.
+TEST(ByRefTest, IsCopyable) {
+  const std::string s1 = "Hi";
+  const std::string s2 = "Hello";
+
+  ::testing::internal::ReferenceWrapper<const std::string> ref_wrapper =
+      ByRef(s1);
+  const std::string& r1 = ref_wrapper;
+  EXPECT_EQ(&s1, &r1);
+
+  // Assigns a new value to ref_wrapper.
+  ref_wrapper = ByRef(s2);
+  const std::string& r2 = ref_wrapper;
+  EXPECT_EQ(&s2, &r2);
+
+  ::testing::internal::ReferenceWrapper<const std::string> ref_wrapper1 =
+      ByRef(s1);
+  // Copies ref_wrapper1 to ref_wrapper.
+  ref_wrapper = ref_wrapper1;
+  const std::string& r3 = ref_wrapper;
+  EXPECT_EQ(&s1, &r3);
+}
+
+// Tests using ByRef() on a const value.
+TEST(ByRefTest, ConstValue) {
+  const int n = 0;
+  // int& ref = ByRef(n);  // This shouldn't compile - we have a
+                           // negative compilation test to catch it.
+  const int& const_ref = ByRef(n);
+  EXPECT_EQ(&n, &const_ref);
+}
+
+// Tests using ByRef() on a non-const value.
+TEST(ByRefTest, NonConstValue) {
+  int n = 0;
+
+  // ByRef(n) can be used as either an int&,
+  int& ref = ByRef(n);
+  EXPECT_EQ(&n, &ref);
+
+  // or a const int&.
+  const int& const_ref = ByRef(n);
+  EXPECT_EQ(&n, &const_ref);
+}
+
+// Tests explicitly specifying the type when using ByRef().
+TEST(ByRefTest, ExplicitType) {
+  int n = 0;
+  const int& r1 = ByRef<const int>(n);
+  EXPECT_EQ(&n, &r1);
+
+  // ByRef<char>(n);  // This shouldn't compile - we have a negative
+                      // compilation test to catch it.
+
+  Derived d;
+  Derived& r2 = ByRef<Derived>(d);
+  EXPECT_EQ(&d, &r2);
+
+  const Derived& r3 = ByRef<const Derived>(d);
+  EXPECT_EQ(&d, &r3);
+
+  Base& r4 = ByRef<Base>(d);
+  EXPECT_EQ(&d, &r4);
+
+  const Base& r5 = ByRef<const Base>(d);
+  EXPECT_EQ(&d, &r5);
+
+  // The following shouldn't compile - we have a negative compilation
+  // test for it.
+  //
+  // Base b;
+  // ByRef<Derived>(b);
+}
+
+// Tests that Google Mock prints expression ByRef(x) as a reference to x.
+TEST(ByRefTest, PrintsCorrectly) {
+  int n = 42;
+  ::std::stringstream expected, actual;
+  testing::internal::UniversalPrinter<const int&>::Print(n, &expected);
+  testing::internal::UniversalPrint(ByRef(n), &actual);
+  EXPECT_EQ(expected.str(), actual.str());
+}
+
+#if GTEST_HAS_STD_UNIQUE_PTR_
+
+std::unique_ptr<int> UniquePtrSource() {
+  return std::unique_ptr<int>(new int(19));
+}
+
+std::vector<std::unique_ptr<int>> VectorUniquePtrSource() {
+  std::vector<std::unique_ptr<int>> out;
+  out.emplace_back(new int(7));
+  return out;
+}
+
+TEST(MockMethodTest, CanReturnMoveOnlyValue_Return) {
+  MockClass mock;
+  std::unique_ptr<int> i(new int(19));
+  EXPECT_CALL(mock, MakeUnique()).WillOnce(Return(ByMove(std::move(i))));
+  EXPECT_CALL(mock, MakeVectorUnique())
+      .WillOnce(Return(ByMove(VectorUniquePtrSource())));
+  Derived* d = new Derived;
+  EXPECT_CALL(mock, MakeUniqueBase())
+      .WillOnce(Return(ByMove(std::unique_ptr<Derived>(d))));
+
+  std::unique_ptr<int> result1 = mock.MakeUnique();
+  EXPECT_EQ(19, *result1);
+
+  std::vector<std::unique_ptr<int>> vresult = mock.MakeVectorUnique();
+  EXPECT_EQ(1u, vresult.size());
+  EXPECT_NE(nullptr, vresult[0]);
+  EXPECT_EQ(7, *vresult[0]);
+
+  std::unique_ptr<Base> result2 = mock.MakeUniqueBase();
+  EXPECT_EQ(d, result2.get());
+}
+
+TEST(MockMethodTest, CanReturnMoveOnlyValue_DoAllReturn) {
+  testing::MockFunction<void()> mock_function;
+  MockClass mock;
+  std::unique_ptr<int> i(new int(19));
+  EXPECT_CALL(mock_function, Call());
+  EXPECT_CALL(mock, MakeUnique()).WillOnce(DoAll(
+      InvokeWithoutArgs(&mock_function, &testing::MockFunction<void()>::Call),
+      Return(ByMove(std::move(i)))));
+
+  std::unique_ptr<int> result1 = mock.MakeUnique();
+  EXPECT_EQ(19, *result1);
+}
+
+TEST(MockMethodTest, CanReturnMoveOnlyValue_Invoke) {
+  MockClass mock;
+
+  // Check default value
+  DefaultValue<std::unique_ptr<int>>::SetFactory([] {
+    return std::unique_ptr<int>(new int(42));
+  });
+  EXPECT_EQ(42, *mock.MakeUnique());
+
+  EXPECT_CALL(mock, MakeUnique()).WillRepeatedly(Invoke(UniquePtrSource));
+  EXPECT_CALL(mock, MakeVectorUnique())
+      .WillRepeatedly(Invoke(VectorUniquePtrSource));
+  std::unique_ptr<int> result1 = mock.MakeUnique();
+  EXPECT_EQ(19, *result1);
+  std::unique_ptr<int> result2 = mock.MakeUnique();
+  EXPECT_EQ(19, *result2);
+  EXPECT_NE(result1, result2);
+
+  std::vector<std::unique_ptr<int>> vresult = mock.MakeVectorUnique();
+  EXPECT_EQ(1u, vresult.size());
+  EXPECT_NE(nullptr, vresult[0]);
+  EXPECT_EQ(7, *vresult[0]);
+}
+
+#endif  // GTEST_HAS_STD_UNIQUE_PTR_
+
+}  // Unnamed namespace
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-cardinalities_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-cardinalities_test.cc
new file mode 100644
index 0000000000..64815e57a3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-cardinalities_test.cc
@@ -0,0 +1,428 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests the built-in cardinalities.
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+
+namespace {
+
+using std::stringstream;
+using testing::AnyNumber;
+using testing::AtLeast;
+using testing::AtMost;
+using testing::Between;
+using testing::Cardinality;
+using testing::CardinalityInterface;
+using testing::Exactly;
+using testing::IsSubstring;
+using testing::MakeCardinality;
+
+class MockFoo {
+ public:
+  MockFoo() {}
+  MOCK_METHOD0(Bar, int());  // NOLINT
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
+};
+
+// Tests that Cardinality objects can be default constructed.
+TEST(CardinalityTest, IsDefaultConstructable) {
+  Cardinality c;
+}
+
+// Tests that Cardinality objects are copyable.
+TEST(CardinalityTest, IsCopyable) {
+  // Tests the copy constructor.
+  Cardinality c = Exactly(1);
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(0));
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(1));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(1));
+
+  // Tests the assignment operator.
+  c = Exactly(2);
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(1));
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(2));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(2));
+}
+
+TEST(CardinalityTest, IsOverSaturatedByCallCountWorks) {
+  const Cardinality c = AtMost(5);
+  EXPECT_FALSE(c.IsOverSaturatedByCallCount(4));
+  EXPECT_FALSE(c.IsOverSaturatedByCallCount(5));
+  EXPECT_TRUE(c.IsOverSaturatedByCallCount(6));
+}
+
+// Tests that Cardinality::DescribeActualCallCountTo() creates the
+// correct description.
+TEST(CardinalityTest, CanDescribeActualCallCount) {
+  stringstream ss0;
+  Cardinality::DescribeActualCallCountTo(0, &ss0);
+  EXPECT_EQ("never called", ss0.str());
+
+  stringstream ss1;
+  Cardinality::DescribeActualCallCountTo(1, &ss1);
+  EXPECT_EQ("called once", ss1.str());
+
+  stringstream ss2;
+  Cardinality::DescribeActualCallCountTo(2, &ss2);
+  EXPECT_EQ("called twice", ss2.str());
+
+  stringstream ss3;
+  Cardinality::DescribeActualCallCountTo(3, &ss3);
+  EXPECT_EQ("called 3 times", ss3.str());
+}
+
+// Tests AnyNumber()
+TEST(AnyNumber, Works) {
+  const Cardinality c = AnyNumber();
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(0));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(0));
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(1));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(1));
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(9));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(9));
+
+  stringstream ss;
+  c.DescribeTo(&ss);
+  EXPECT_PRED_FORMAT2(IsSubstring, "called any number of times",
+                      ss.str());
+}
+
+TEST(AnyNumberTest, HasCorrectBounds) {
+  const Cardinality c = AnyNumber();
+  EXPECT_EQ(0, c.ConservativeLowerBound());
+  EXPECT_EQ(INT_MAX, c.ConservativeUpperBound());
+}
+
+// Tests AtLeast(n).
+
+TEST(AtLeastTest, OnNegativeNumber) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    AtLeast(-1);
+  }, "The invocation lower bound must be >= 0");
+}
+
+TEST(AtLeastTest, OnZero) {
+  const Cardinality c = AtLeast(0);
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(0));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(0));
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(1));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(1));
+
+  stringstream ss;
+  c.DescribeTo(&ss);
+  EXPECT_PRED_FORMAT2(IsSubstring, "any number of times",
+                      ss.str());
+}
+
+TEST(AtLeastTest, OnPositiveNumber) {
+  const Cardinality c = AtLeast(2);
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(0));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(0));
+
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(1));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(1));
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(2));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(2));
+
+  stringstream ss1;
+  AtLeast(1).DescribeTo(&ss1);
+  EXPECT_PRED_FORMAT2(IsSubstring, "at least once",
+                      ss1.str());
+
+  stringstream ss2;
+  c.DescribeTo(&ss2);
+  EXPECT_PRED_FORMAT2(IsSubstring, "at least twice",
+                      ss2.str());
+
+  stringstream ss3;
+  AtLeast(3).DescribeTo(&ss3);
+  EXPECT_PRED_FORMAT2(IsSubstring, "at least 3 times",
+                      ss3.str());
+}
+
+TEST(AtLeastTest, HasCorrectBounds) {
+  const Cardinality c = AtLeast(2);
+  EXPECT_EQ(2, c.ConservativeLowerBound());
+  EXPECT_EQ(INT_MAX, c.ConservativeUpperBound());
+}
+
+// Tests AtMost(n).
+
+TEST(AtMostTest, OnNegativeNumber) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    AtMost(-1);
+  }, "The invocation upper bound must be >= 0");
+}
+
+TEST(AtMostTest, OnZero) {
+  const Cardinality c = AtMost(0);
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(0));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(0));
+
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(1));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(1));
+
+  stringstream ss;
+  c.DescribeTo(&ss);
+  EXPECT_PRED_FORMAT2(IsSubstring, "never called",
+                      ss.str());
+}
+
+TEST(AtMostTest, OnPositiveNumber) {
+  const Cardinality c = AtMost(2);
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(0));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(0));
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(1));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(1));
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(2));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(2));
+
+  stringstream ss1;
+  AtMost(1).DescribeTo(&ss1);
+  EXPECT_PRED_FORMAT2(IsSubstring, "called at most once",
+                      ss1.str());
+
+  stringstream ss2;
+  c.DescribeTo(&ss2);
+  EXPECT_PRED_FORMAT2(IsSubstring, "called at most twice",
+                      ss2.str());
+
+  stringstream ss3;
+  AtMost(3).DescribeTo(&ss3);
+  EXPECT_PRED_FORMAT2(IsSubstring, "called at most 3 times",
+                      ss3.str());
+}
+
+TEST(AtMostTest, HasCorrectBounds) {
+  const Cardinality c = AtMost(2);
+  EXPECT_EQ(0, c.ConservativeLowerBound());
+  EXPECT_EQ(2, c.ConservativeUpperBound());
+}
+
+// Tests Between(m, n).
+
+TEST(BetweenTest, OnNegativeStart) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    Between(-1, 2);
+  }, "The invocation lower bound must be >= 0, but is actually -1");
+}
+
+TEST(BetweenTest, OnNegativeEnd) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    Between(1, -2);
+  }, "The invocation upper bound must be >= 0, but is actually -2");
+}
+
+TEST(BetweenTest, OnStartBiggerThanEnd) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    Between(2, 1);
+  }, "The invocation upper bound (1) must be >= "
+     "the invocation lower bound (2)");
+}
+
+TEST(BetweenTest, OnZeroStartAndZeroEnd) {
+  const Cardinality c = Between(0, 0);
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(0));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(0));
+
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(1));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(1));
+
+  stringstream ss;
+  c.DescribeTo(&ss);
+  EXPECT_PRED_FORMAT2(IsSubstring, "never called",
+                      ss.str());
+}
+
+TEST(BetweenTest, OnZeroStartAndNonZeroEnd) {
+  const Cardinality c = Between(0, 2);
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(0));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(0));
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(2));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(2));
+
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(4));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(4));
+
+  stringstream ss;
+  c.DescribeTo(&ss);
+  EXPECT_PRED_FORMAT2(IsSubstring, "called at most twice",
+                      ss.str());
+}
+
+TEST(BetweenTest, OnSameStartAndEnd) {
+  const Cardinality c = Between(3, 3);
+
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(2));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(2));
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(3));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(3));
+
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(4));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(4));
+
+  stringstream ss;
+  c.DescribeTo(&ss);
+  EXPECT_PRED_FORMAT2(IsSubstring, "called 3 times",
+                      ss.str());
+}
+
+TEST(BetweenTest, OnDifferentStartAndEnd) {
+  const Cardinality c = Between(3, 5);
+
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(2));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(2));
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(3));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(3));
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(5));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(5));
+
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(6));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(6));
+
+  stringstream ss;
+  c.DescribeTo(&ss);
+  EXPECT_PRED_FORMAT2(IsSubstring, "called between 3 and 5 times",
+                      ss.str());
+}
+
+TEST(BetweenTest, HasCorrectBounds) {
+  const Cardinality c = Between(3, 5);
+  EXPECT_EQ(3, c.ConservativeLowerBound());
+  EXPECT_EQ(5, c.ConservativeUpperBound());
+}
+
+// Tests Exactly(n).
+
+TEST(ExactlyTest, OnNegativeNumber) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    Exactly(-1);
+  }, "The invocation lower bound must be >= 0");
+}
+
+TEST(ExactlyTest, OnZero) {
+  const Cardinality c = Exactly(0);
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(0));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(0));
+
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(1));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(1));
+
+  stringstream ss;
+  c.DescribeTo(&ss);
+  EXPECT_PRED_FORMAT2(IsSubstring, "never called",
+                      ss.str());
+}
+
+TEST(ExactlyTest, OnPositiveNumber) {
+  const Cardinality c = Exactly(2);
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(0));
+  EXPECT_FALSE(c.IsSaturatedByCallCount(0));
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(2));
+  EXPECT_TRUE(c.IsSaturatedByCallCount(2));
+
+  stringstream ss1;
+  Exactly(1).DescribeTo(&ss1);
+  EXPECT_PRED_FORMAT2(IsSubstring, "called once",
+                      ss1.str());
+
+  stringstream ss2;
+  c.DescribeTo(&ss2);
+  EXPECT_PRED_FORMAT2(IsSubstring, "called twice",
+                      ss2.str());
+
+  stringstream ss3;
+  Exactly(3).DescribeTo(&ss3);
+  EXPECT_PRED_FORMAT2(IsSubstring, "called 3 times",
+                      ss3.str());
+}
+
+TEST(ExactlyTest, HasCorrectBounds) {
+  const Cardinality c = Exactly(3);
+  EXPECT_EQ(3, c.ConservativeLowerBound());
+  EXPECT_EQ(3, c.ConservativeUpperBound());
+}
+
+// Tests that a user can make his own cardinality by implementing
+// CardinalityInterface and calling MakeCardinality().
+
+class EvenCardinality : public CardinalityInterface {
+ public:
+  // Returns true iff call_count calls will satisfy this cardinality.
+  virtual bool IsSatisfiedByCallCount(int call_count) const {
+    return (call_count % 2 == 0);
+  }
+
+  // Returns true iff call_count calls will saturate this cardinality.
+  virtual bool IsSaturatedByCallCount(int /* call_count */) const {
+    return false;
+  }
+
+  // Describes self to an ostream.
+  virtual void DescribeTo(::std::ostream* ss) const {
+    *ss << "called even number of times";
+  }
+};
+
+TEST(MakeCardinalityTest, ConstructsCardinalityFromInterface) {
+  const Cardinality c = MakeCardinality(new EvenCardinality);
+
+  EXPECT_TRUE(c.IsSatisfiedByCallCount(2));
+  EXPECT_FALSE(c.IsSatisfiedByCallCount(3));
+
+  EXPECT_FALSE(c.IsSaturatedByCallCount(10000));
+
+  stringstream ss;
+  c.DescribeTo(&ss);
+  EXPECT_EQ("called even number of times", ss.str());
+}
+
+}  // Unnamed namespace
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-generated-actions_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-generated-actions_test.cc
new file mode 100644
index 0000000000..5ca5bc7892
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-generated-actions_test.cc
@@ -0,0 +1,1228 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests the built-in actions generated by a script.
+
+#include "gmock/gmock-generated-actions.h"
+
+#include <functional>
+#include <sstream>
+#include <string>
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+namespace gmock_generated_actions_test {
+
+using ::std::plus;
+using ::std::string;
+using testing::get;
+using testing::make_tuple;
+using testing::tuple;
+using testing::tuple_element;
+using testing::_;
+using testing::Action;
+using testing::ActionInterface;
+using testing::ByRef;
+using testing::DoAll;
+using testing::Invoke;
+using testing::Return;
+using testing::ReturnNew;
+using testing::SetArgPointee;
+using testing::StaticAssertTypeEq;
+using testing::Unused;
+using testing::WithArgs;
+
+// For suppressing compiler warnings on conversion possibly losing precision.
+inline short Short(short n) { return n; }  // NOLINT
+inline char Char(char ch) { return ch; }
+
+// Sample functions and functors for testing various actions.
+int Nullary() { return 1; }
+
+class NullaryFunctor {
+ public:
+  int operator()() { return 2; }
+};
+
+bool g_done = false;
+
+bool Unary(int x) { return x < 0; }
+
+const char* Plus1(const char* s) { return s + 1; }
+
+bool ByConstRef(const string& s) { return s == "Hi"; }
+
+const double g_double = 0;
+bool ReferencesGlobalDouble(const double& x) { return &x == &g_double; }
+
+string ByNonConstRef(string& s) { return s += "+"; }  // NOLINT
+
+struct UnaryFunctor {
+  int operator()(bool x) { return x ? 1 : -1; }
+};
+
+const char* Binary(const char* input, short n) { return input + n; }  // NOLINT
+
+void VoidBinary(int, char) { g_done = true; }
+
+int Ternary(int x, char y, short z) { return x + y + z; }  // NOLINT
+
+void VoidTernary(int, char, bool) { g_done = true; }
+
+int SumOf4(int a, int b, int c, int d) { return a + b + c + d; }
+
+string Concat4(const char* s1, const char* s2, const char* s3,
+               const char* s4) {
+  return string(s1) + s2 + s3 + s4;
+}
+
+int SumOf5(int a, int b, int c, int d, int e) { return a + b + c + d + e; }
+
+struct SumOf5Functor {
+  int operator()(int a, int b, int c, int d, int e) {
+    return a + b + c + d + e;
+  }
+};
+
+string Concat5(const char* s1, const char* s2, const char* s3,
+               const char* s4, const char* s5) {
+  return string(s1) + s2 + s3 + s4 + s5;
+}
+
+int SumOf6(int a, int b, int c, int d, int e, int f) {
+  return a + b + c + d + e + f;
+}
+
+struct SumOf6Functor {
+  int operator()(int a, int b, int c, int d, int e, int f) {
+    return a + b + c + d + e + f;
+  }
+};
+
+string Concat6(const char* s1, const char* s2, const char* s3,
+               const char* s4, const char* s5, const char* s6) {
+  return string(s1) + s2 + s3 + s4 + s5 + s6;
+}
+
+string Concat7(const char* s1, const char* s2, const char* s3,
+               const char* s4, const char* s5, const char* s6,
+               const char* s7) {
+  return string(s1) + s2 + s3 + s4 + s5 + s6 + s7;
+}
+
+string Concat8(const char* s1, const char* s2, const char* s3,
+               const char* s4, const char* s5, const char* s6,
+               const char* s7, const char* s8) {
+  return string(s1) + s2 + s3 + s4 + s5 + s6 + s7 + s8;
+}
+
+string Concat9(const char* s1, const char* s2, const char* s3,
+               const char* s4, const char* s5, const char* s6,
+               const char* s7, const char* s8, const char* s9) {
+  return string(s1) + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9;
+}
+
+string Concat10(const char* s1, const char* s2, const char* s3,
+                const char* s4, const char* s5, const char* s6,
+                const char* s7, const char* s8, const char* s9,
+                const char* s10) {
+  return string(s1) + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9 + s10;
+}
+
+// A helper that turns the type of a C-string literal from const
+// char[N] to const char*.
+inline const char* CharPtr(const char* s) { return s; }
+
+// Tests InvokeArgument<N>(...).
+
+// Tests using InvokeArgument with a nullary function.
+TEST(InvokeArgumentTest, Function0) {
+  Action<int(int, int(*)())> a = InvokeArgument<1>();  // NOLINT
+  EXPECT_EQ(1, a.Perform(make_tuple(2, &Nullary)));
+}
+
+// Tests using InvokeArgument with a unary function.
+TEST(InvokeArgumentTest, Functor1) {
+  Action<int(UnaryFunctor)> a = InvokeArgument<0>(true);  // NOLINT
+  EXPECT_EQ(1, a.Perform(make_tuple(UnaryFunctor())));
+}
+
+// Tests using InvokeArgument with a 5-ary function.
+TEST(InvokeArgumentTest, Function5) {
+  Action<int(int(*)(int, int, int, int, int))> a =  // NOLINT
+      InvokeArgument<0>(10000, 2000, 300, 40, 5);
+  EXPECT_EQ(12345, a.Perform(make_tuple(&SumOf5)));
+}
+
+// Tests using InvokeArgument with a 5-ary functor.
+TEST(InvokeArgumentTest, Functor5) {
+  Action<int(SumOf5Functor)> a =  // NOLINT
+      InvokeArgument<0>(10000, 2000, 300, 40, 5);
+  EXPECT_EQ(12345, a.Perform(make_tuple(SumOf5Functor())));
+}
+
+// Tests using InvokeArgument with a 6-ary function.
+TEST(InvokeArgumentTest, Function6) {
+  Action<int(int(*)(int, int, int, int, int, int))> a =  // NOLINT
+      InvokeArgument<0>(100000, 20000, 3000, 400, 50, 6);
+  EXPECT_EQ(123456, a.Perform(make_tuple(&SumOf6)));
+}
+
+// Tests using InvokeArgument with a 6-ary functor.
+TEST(InvokeArgumentTest, Functor6) {
+  Action<int(SumOf6Functor)> a =  // NOLINT
+      InvokeArgument<0>(100000, 20000, 3000, 400, 50, 6);
+  EXPECT_EQ(123456, a.Perform(make_tuple(SumOf6Functor())));
+}
+
+// Tests using InvokeArgument with a 7-ary function.
+TEST(InvokeArgumentTest, Function7) {
+  Action<string(string(*)(const char*, const char*, const char*,
+                          const char*, const char*, const char*,
+                          const char*))> a =
+      InvokeArgument<0>("1", "2", "3", "4", "5", "6", "7");
+  EXPECT_EQ("1234567", a.Perform(make_tuple(&Concat7)));
+}
+
+// Tests using InvokeArgument with a 8-ary function.
+TEST(InvokeArgumentTest, Function8) {
+  Action<string(string(*)(const char*, const char*, const char*,
+                          const char*, const char*, const char*,
+                          const char*, const char*))> a =
+      InvokeArgument<0>("1", "2", "3", "4", "5", "6", "7", "8");
+  EXPECT_EQ("12345678", a.Perform(make_tuple(&Concat8)));
+}
+
+// Tests using InvokeArgument with a 9-ary function.
+TEST(InvokeArgumentTest, Function9) {
+  Action<string(string(*)(const char*, const char*, const char*,
+                          const char*, const char*, const char*,
+                          const char*, const char*, const char*))> a =
+      InvokeArgument<0>("1", "2", "3", "4", "5", "6", "7", "8", "9");
+  EXPECT_EQ("123456789", a.Perform(make_tuple(&Concat9)));
+}
+
+// Tests using InvokeArgument with a 10-ary function.
+TEST(InvokeArgumentTest, Function10) {
+  Action<string(string(*)(const char*, const char*, const char*,
+                          const char*, const char*, const char*,
+                          const char*, const char*, const char*,
+                          const char*))> a =
+      InvokeArgument<0>("1", "2", "3", "4", "5", "6", "7", "8", "9", "0");
+  EXPECT_EQ("1234567890", a.Perform(make_tuple(&Concat10)));
+}
+
+// Tests using InvokeArgument with a function that takes a pointer argument.
+TEST(InvokeArgumentTest, ByPointerFunction) {
+  Action<const char*(const char*(*)(const char* input, short n))> a =  // NOLINT
+      InvokeArgument<0>(static_cast<const char*>("Hi"), Short(1));
+  EXPECT_STREQ("i", a.Perform(make_tuple(&Binary)));
+}
+
+// Tests using InvokeArgument with a function that takes a const char*
+// by passing it a C-string literal.
+TEST(InvokeArgumentTest, FunctionWithCStringLiteral) {
+  Action<const char*(const char*(*)(const char* input, short n))> a =  // NOLINT
+      InvokeArgument<0>("Hi", Short(1));
+  EXPECT_STREQ("i", a.Perform(make_tuple(&Binary)));
+}
+
+// Tests using InvokeArgument with a function that takes a const reference.
+TEST(InvokeArgumentTest, ByConstReferenceFunction) {
+  Action<bool(bool(*function)(const string& s))> a =  // NOLINT
+      InvokeArgument<0>(string("Hi"));
+  // When action 'a' is constructed, it makes a copy of the temporary
+  // string object passed to it, so it's OK to use 'a' later, when the
+  // temporary object has already died.
+  EXPECT_TRUE(a.Perform(make_tuple(&ByConstRef)));
+}
+
+// Tests using InvokeArgument with ByRef() and a function that takes a
+// const reference.
+TEST(InvokeArgumentTest, ByExplicitConstReferenceFunction) {
+  Action<bool(bool(*)(const double& x))> a =  // NOLINT
+      InvokeArgument<0>(ByRef(g_double));
+  // The above line calls ByRef() on a const value.
+  EXPECT_TRUE(a.Perform(make_tuple(&ReferencesGlobalDouble)));
+
+  double x = 0;
+  a = InvokeArgument<0>(ByRef(x));  // This calls ByRef() on a non-const.
+  EXPECT_FALSE(a.Perform(make_tuple(&ReferencesGlobalDouble)));
+}
+
+// Tests using WithArgs and with an action that takes 1 argument.
+TEST(WithArgsTest, OneArg) {
+  Action<bool(double x, int n)> a = WithArgs<1>(Invoke(Unary));  // NOLINT
+  EXPECT_TRUE(a.Perform(make_tuple(1.5, -1)));
+  EXPECT_FALSE(a.Perform(make_tuple(1.5, 1)));
+}
+
+// Tests using WithArgs with an action that takes 2 arguments.
+TEST(WithArgsTest, TwoArgs) {
+  Action<const char*(const char* s, double x, short n)> a =
+      WithArgs<0, 2>(Invoke(Binary));
+  const char s[] = "Hello";
+  EXPECT_EQ(s + 2, a.Perform(make_tuple(CharPtr(s), 0.5, Short(2))));
+}
+
+// Tests using WithArgs with an action that takes 3 arguments.
+TEST(WithArgsTest, ThreeArgs) {
+  Action<int(int, double, char, short)> a =  // NOLINT
+      WithArgs<0, 2, 3>(Invoke(Ternary));
+  EXPECT_EQ(123, a.Perform(make_tuple(100, 6.5, Char(20), Short(3))));
+}
+
+// Tests using WithArgs with an action that takes 4 arguments.
+TEST(WithArgsTest, FourArgs) {
+  Action<string(const char*, const char*, double, const char*, const char*)> a =
+      WithArgs<4, 3, 1, 0>(Invoke(Concat4));
+  EXPECT_EQ("4310", a.Perform(make_tuple(CharPtr("0"), CharPtr("1"), 2.5,
+                                         CharPtr("3"), CharPtr("4"))));
+}
+
+// Tests using WithArgs with an action that takes 5 arguments.
+TEST(WithArgsTest, FiveArgs) {
+  Action<string(const char*, const char*, const char*,
+                const char*, const char*)> a =
+      WithArgs<4, 3, 2, 1, 0>(Invoke(Concat5));
+  EXPECT_EQ("43210",
+            a.Perform(make_tuple(CharPtr("0"), CharPtr("1"), CharPtr("2"),
+                                 CharPtr("3"), CharPtr("4"))));
+}
+
+// Tests using WithArgs with an action that takes 6 arguments.
+TEST(WithArgsTest, SixArgs) {
+  Action<string(const char*, const char*, const char*)> a =
+      WithArgs<0, 1, 2, 2, 1, 0>(Invoke(Concat6));
+  EXPECT_EQ("012210",
+            a.Perform(make_tuple(CharPtr("0"), CharPtr("1"), CharPtr("2"))));
+}
+
+// Tests using WithArgs with an action that takes 7 arguments.
+TEST(WithArgsTest, SevenArgs) {
+  Action<string(const char*, const char*, const char*, const char*)> a =
+      WithArgs<0, 1, 2, 3, 2, 1, 0>(Invoke(Concat7));
+  EXPECT_EQ("0123210",
+            a.Perform(make_tuple(CharPtr("0"), CharPtr("1"), CharPtr("2"),
+                                 CharPtr("3"))));
+}
+
+// Tests using WithArgs with an action that takes 8 arguments.
+TEST(WithArgsTest, EightArgs) {
+  Action<string(const char*, const char*, const char*, const char*)> a =
+      WithArgs<0, 1, 2, 3, 0, 1, 2, 3>(Invoke(Concat8));
+  EXPECT_EQ("01230123",
+            a.Perform(make_tuple(CharPtr("0"), CharPtr("1"), CharPtr("2"),
+                                 CharPtr("3"))));
+}
+
+// Tests using WithArgs with an action that takes 9 arguments.
+TEST(WithArgsTest, NineArgs) {
+  Action<string(const char*, const char*, const char*, const char*)> a =
+      WithArgs<0, 1, 2, 3, 1, 2, 3, 2, 3>(Invoke(Concat9));
+  EXPECT_EQ("012312323",
+            a.Perform(make_tuple(CharPtr("0"), CharPtr("1"), CharPtr("2"),
+                                 CharPtr("3"))));
+}
+
+// Tests using WithArgs with an action that takes 10 arguments.
+TEST(WithArgsTest, TenArgs) {
+  Action<string(const char*, const char*, const char*, const char*)> a =
+      WithArgs<0, 1, 2, 3, 2, 1, 0, 1, 2, 3>(Invoke(Concat10));
+  EXPECT_EQ("0123210123",
+            a.Perform(make_tuple(CharPtr("0"), CharPtr("1"), CharPtr("2"),
+                                 CharPtr("3"))));
+}
+
+// Tests using WithArgs with an action that is not Invoke().
+class SubstractAction : public ActionInterface<int(int, int)> {  // NOLINT
+ public:
+  virtual int Perform(const tuple<int, int>& args) {
+    return get<0>(args) - get<1>(args);
+  }
+};
+
+TEST(WithArgsTest, NonInvokeAction) {
+  Action<int(const string&, int, int)> a =  // NOLINT
+      WithArgs<2, 1>(MakeAction(new SubstractAction));
+  string s("hello");
+  EXPECT_EQ(8, a.Perform(tuple<const string&, int, int>(s, 2, 10)));
+}
+
+// Tests using WithArgs to pass all original arguments in the original order.
+TEST(WithArgsTest, Identity) {
+  Action<int(int x, char y, short z)> a =  // NOLINT
+      WithArgs<0, 1, 2>(Invoke(Ternary));
+  EXPECT_EQ(123, a.Perform(make_tuple(100, Char(20), Short(3))));
+}
+
+// Tests using WithArgs with repeated arguments.
+TEST(WithArgsTest, RepeatedArguments) {
+  Action<int(bool, int m, int n)> a =  // NOLINT
+      WithArgs<1, 1, 1, 1>(Invoke(SumOf4));
+  EXPECT_EQ(4, a.Perform(make_tuple(false, 1, 10)));
+}
+
+// Tests using WithArgs with reversed argument order.
+TEST(WithArgsTest, ReversedArgumentOrder) {
+  Action<const char*(short n, const char* input)> a =  // NOLINT
+      WithArgs<1, 0>(Invoke(Binary));
+  const char s[] = "Hello";
+  EXPECT_EQ(s + 2, a.Perform(make_tuple(Short(2), CharPtr(s))));
+}
+
+// Tests using WithArgs with compatible, but not identical, argument types.
+TEST(WithArgsTest, ArgsOfCompatibleTypes) {
+  Action<long(short x, char y, double z, char c)> a =  // NOLINT
+      WithArgs<0, 1, 3>(Invoke(Ternary));
+  EXPECT_EQ(123, a.Perform(make_tuple(Short(100), Char(20), 5.6, Char(3))));
+}
+
+// Tests using WithArgs with an action that returns void.
+TEST(WithArgsTest, VoidAction) {
+  Action<void(double x, char c, int n)> a = WithArgs<2, 1>(Invoke(VoidBinary));
+  g_done = false;
+  a.Perform(make_tuple(1.5, 'a', 3));
+  EXPECT_TRUE(g_done);
+}
+
+// Tests DoAll(a1, a2).
+TEST(DoAllTest, TwoActions) {
+  int n = 0;
+  Action<int(int*)> a = DoAll(SetArgPointee<0>(1),  // NOLINT
+                              Return(2));
+  EXPECT_EQ(2, a.Perform(make_tuple(&n)));
+  EXPECT_EQ(1, n);
+}
+
+// Tests DoAll(a1, a2, a3).
+TEST(DoAllTest, ThreeActions) {
+  int m = 0, n = 0;
+  Action<int(int*, int*)> a = DoAll(SetArgPointee<0>(1),  // NOLINT
+                                    SetArgPointee<1>(2),
+                                    Return(3));
+  EXPECT_EQ(3, a.Perform(make_tuple(&m, &n)));
+  EXPECT_EQ(1, m);
+  EXPECT_EQ(2, n);
+}
+
+// Tests DoAll(a1, a2, a3, a4).
+TEST(DoAllTest, FourActions) {
+  int m = 0, n = 0;
+  char ch = '\0';
+  Action<int(int*, int*, char*)> a =  // NOLINT
+      DoAll(SetArgPointee<0>(1),
+            SetArgPointee<1>(2),
+            SetArgPointee<2>('a'),
+            Return(3));
+  EXPECT_EQ(3, a.Perform(make_tuple(&m, &n, &ch)));
+  EXPECT_EQ(1, m);
+  EXPECT_EQ(2, n);
+  EXPECT_EQ('a', ch);
+}
+
+// Tests DoAll(a1, a2, a3, a4, a5).
+TEST(DoAllTest, FiveActions) {
+  int m = 0, n = 0;
+  char a = '\0', b = '\0';
+  Action<int(int*, int*, char*, char*)> action =  // NOLINT
+      DoAll(SetArgPointee<0>(1),
+            SetArgPointee<1>(2),
+            SetArgPointee<2>('a'),
+            SetArgPointee<3>('b'),
+            Return(3));
+  EXPECT_EQ(3, action.Perform(make_tuple(&m, &n, &a, &b)));
+  EXPECT_EQ(1, m);
+  EXPECT_EQ(2, n);
+  EXPECT_EQ('a', a);
+  EXPECT_EQ('b', b);
+}
+
+// Tests DoAll(a1, a2, ..., a6).
+TEST(DoAllTest, SixActions) {
+  int m = 0, n = 0;
+  char a = '\0', b = '\0', c = '\0';
+  Action<int(int*, int*, char*, char*, char*)> action =  // NOLINT
+      DoAll(SetArgPointee<0>(1),
+            SetArgPointee<1>(2),
+            SetArgPointee<2>('a'),
+            SetArgPointee<3>('b'),
+            SetArgPointee<4>('c'),
+            Return(3));
+  EXPECT_EQ(3, action.Perform(make_tuple(&m, &n, &a, &b, &c)));
+  EXPECT_EQ(1, m);
+  EXPECT_EQ(2, n);
+  EXPECT_EQ('a', a);
+  EXPECT_EQ('b', b);
+  EXPECT_EQ('c', c);
+}
+
+// Tests DoAll(a1, a2, ..., a7).
+TEST(DoAllTest, SevenActions) {
+  int m = 0, n = 0;
+  char a = '\0', b = '\0', c = '\0', d = '\0';
+  Action<int(int*, int*, char*, char*, char*, char*)> action =  // NOLINT
+      DoAll(SetArgPointee<0>(1),
+            SetArgPointee<1>(2),
+            SetArgPointee<2>('a'),
+            SetArgPointee<3>('b'),
+            SetArgPointee<4>('c'),
+            SetArgPointee<5>('d'),
+            Return(3));
+  EXPECT_EQ(3, action.Perform(make_tuple(&m, &n, &a, &b, &c, &d)));
+  EXPECT_EQ(1, m);
+  EXPECT_EQ(2, n);
+  EXPECT_EQ('a', a);
+  EXPECT_EQ('b', b);
+  EXPECT_EQ('c', c);
+  EXPECT_EQ('d', d);
+}
+
+// Tests DoAll(a1, a2, ..., a8).
+TEST(DoAllTest, EightActions) {
+  int m = 0, n = 0;
+  char a = '\0', b = '\0', c = '\0', d = '\0', e = '\0';
+  Action<int(int*, int*, char*, char*, char*, char*,  // NOLINT
+             char*)> action =
+      DoAll(SetArgPointee<0>(1),
+            SetArgPointee<1>(2),
+            SetArgPointee<2>('a'),
+            SetArgPointee<3>('b'),
+            SetArgPointee<4>('c'),
+            SetArgPointee<5>('d'),
+            SetArgPointee<6>('e'),
+            Return(3));
+  EXPECT_EQ(3, action.Perform(make_tuple(&m, &n, &a, &b, &c, &d, &e)));
+  EXPECT_EQ(1, m);
+  EXPECT_EQ(2, n);
+  EXPECT_EQ('a', a);
+  EXPECT_EQ('b', b);
+  EXPECT_EQ('c', c);
+  EXPECT_EQ('d', d);
+  EXPECT_EQ('e', e);
+}
+
+// Tests DoAll(a1, a2, ..., a9).
+TEST(DoAllTest, NineActions) {
+  int m = 0, n = 0;
+  char a = '\0', b = '\0', c = '\0', d = '\0', e = '\0', f = '\0';
+  Action<int(int*, int*, char*, char*, char*, char*,  // NOLINT
+             char*, char*)> action =
+      DoAll(SetArgPointee<0>(1),
+            SetArgPointee<1>(2),
+            SetArgPointee<2>('a'),
+            SetArgPointee<3>('b'),
+            SetArgPointee<4>('c'),
+            SetArgPointee<5>('d'),
+            SetArgPointee<6>('e'),
+            SetArgPointee<7>('f'),
+            Return(3));
+  EXPECT_EQ(3, action.Perform(make_tuple(&m, &n, &a, &b, &c, &d, &e, &f)));
+  EXPECT_EQ(1, m);
+  EXPECT_EQ(2, n);
+  EXPECT_EQ('a', a);
+  EXPECT_EQ('b', b);
+  EXPECT_EQ('c', c);
+  EXPECT_EQ('d', d);
+  EXPECT_EQ('e', e);
+  EXPECT_EQ('f', f);
+}
+
+// Tests DoAll(a1, a2, ..., a10).
+TEST(DoAllTest, TenActions) {
+  int m = 0, n = 0;
+  char a = '\0', b = '\0', c = '\0', d = '\0';
+  char e = '\0', f = '\0', g = '\0';
+  Action<int(int*, int*, char*, char*, char*, char*,  // NOLINT
+             char*, char*, char*)> action =
+      DoAll(SetArgPointee<0>(1),
+            SetArgPointee<1>(2),
+            SetArgPointee<2>('a'),
+            SetArgPointee<3>('b'),
+            SetArgPointee<4>('c'),
+            SetArgPointee<5>('d'),
+            SetArgPointee<6>('e'),
+            SetArgPointee<7>('f'),
+            SetArgPointee<8>('g'),
+            Return(3));
+  EXPECT_EQ(3, action.Perform(make_tuple(&m, &n, &a, &b, &c, &d, &e, &f, &g)));
+  EXPECT_EQ(1, m);
+  EXPECT_EQ(2, n);
+  EXPECT_EQ('a', a);
+  EXPECT_EQ('b', b);
+  EXPECT_EQ('c', c);
+  EXPECT_EQ('d', d);
+  EXPECT_EQ('e', e);
+  EXPECT_EQ('f', f);
+  EXPECT_EQ('g', g);
+}
+
+// The ACTION*() macros trigger warning C4100 (unreferenced formal
+// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
+// the macro definition, as the warnings are generated when the macro
+// is expanded and macro expansion cannot contain #pragma.  Therefore
+// we suppress them here.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#endif
+
+// Tests the ACTION*() macro family.
+
+// Tests that ACTION() can define an action that doesn't reference the
+// mock function arguments.
+ACTION(Return5) { return 5; }
+
+TEST(ActionMacroTest, WorksWhenNotReferencingArguments) {
+  Action<double()> a1 = Return5();
+  EXPECT_DOUBLE_EQ(5, a1.Perform(make_tuple()));
+
+  Action<int(double, bool)> a2 = Return5();
+  EXPECT_EQ(5, a2.Perform(make_tuple(1, true)));
+}
+
+// Tests that ACTION() can define an action that returns void.
+ACTION(IncrementArg1) { (*arg1)++; }
+
+TEST(ActionMacroTest, WorksWhenReturningVoid) {
+  Action<void(int, int*)> a1 = IncrementArg1();
+  int n = 0;
+  a1.Perform(make_tuple(5, &n));
+  EXPECT_EQ(1, n);
+}
+
+// Tests that the body of ACTION() can reference the type of the
+// argument.
+ACTION(IncrementArg2) {
+  StaticAssertTypeEq<int*, arg2_type>();
+  arg2_type temp = arg2;
+  (*temp)++;
+}
+
+TEST(ActionMacroTest, CanReferenceArgumentType) {
+  Action<void(int, bool, int*)> a1 = IncrementArg2();
+  int n = 0;
+  a1.Perform(make_tuple(5, false, &n));
+  EXPECT_EQ(1, n);
+}
+
+// Tests that the body of ACTION() can reference the argument tuple
+// via args_type and args.
+ACTION(Sum2) {
+  StaticAssertTypeEq<tuple<int, char, int*>, args_type>();
+  args_type args_copy = args;
+  return get<0>(args_copy) + get<1>(args_copy);
+}
+
+TEST(ActionMacroTest, CanReferenceArgumentTuple) {
+  Action<int(int, char, int*)> a1 = Sum2();
+  int dummy = 0;
+  EXPECT_EQ(11, a1.Perform(make_tuple(5, Char(6), &dummy)));
+}
+
+// Tests that the body of ACTION() can reference the mock function
+// type.
+int Dummy(bool flag) { return flag? 1 : 0; }
+
+ACTION(InvokeDummy) {
+  StaticAssertTypeEq<int(bool), function_type>();
+  function_type* fp = &Dummy;
+  return (*fp)(true);
+}
+
+TEST(ActionMacroTest, CanReferenceMockFunctionType) {
+  Action<int(bool)> a1 = InvokeDummy();
+  EXPECT_EQ(1, a1.Perform(make_tuple(true)));
+  EXPECT_EQ(1, a1.Perform(make_tuple(false)));
+}
+
+// Tests that the body of ACTION() can reference the mock function's
+// return type.
+ACTION(InvokeDummy2) {
+  StaticAssertTypeEq<int, return_type>();
+  return_type result = Dummy(true);
+  return result;
+}
+
+TEST(ActionMacroTest, CanReferenceMockFunctionReturnType) {
+  Action<int(bool)> a1 = InvokeDummy2();
+  EXPECT_EQ(1, a1.Perform(make_tuple(true)));
+  EXPECT_EQ(1, a1.Perform(make_tuple(false)));
+}
+
+// Tests that ACTION() works for arguments passed by const reference.
+ACTION(ReturnAddrOfConstBoolReferenceArg) {
+  StaticAssertTypeEq<const bool&, arg1_type>();
+  return &arg1;
+}
+
+TEST(ActionMacroTest, WorksForConstReferenceArg) {
+  Action<const bool*(int, const bool&)> a = ReturnAddrOfConstBoolReferenceArg();
+  const bool b = false;
+  EXPECT_EQ(&b, a.Perform(tuple<int, const bool&>(0, b)));
+}
+
+// Tests that ACTION() works for arguments passed by non-const reference.
+ACTION(ReturnAddrOfIntReferenceArg) {
+  StaticAssertTypeEq<int&, arg0_type>();
+  return &arg0;
+}
+
+TEST(ActionMacroTest, WorksForNonConstReferenceArg) {
+  Action<int*(int&, bool, int)> a = ReturnAddrOfIntReferenceArg();
+  int n = 0;
+  EXPECT_EQ(&n, a.Perform(tuple<int&, bool, int>(n, true, 1)));
+}
+
+// Tests that ACTION() can be used in a namespace.
+namespace action_test {
+ACTION(Sum) { return arg0 + arg1; }
+}  // namespace action_test
+
+TEST(ActionMacroTest, WorksInNamespace) {
+  Action<int(int, int)> a1 = action_test::Sum();
+  EXPECT_EQ(3, a1.Perform(make_tuple(1, 2)));
+}
+
+// Tests that the same ACTION definition works for mock functions with
+// different argument numbers.
+ACTION(PlusTwo) { return arg0 + 2; }
+
+TEST(ActionMacroTest, WorksForDifferentArgumentNumbers) {
+  Action<int(int)> a1 = PlusTwo();
+  EXPECT_EQ(4, a1.Perform(make_tuple(2)));
+
+  Action<double(float, void*)> a2 = PlusTwo();
+  int dummy;
+  EXPECT_DOUBLE_EQ(6, a2.Perform(make_tuple(4.0f, &dummy)));
+}
+
+// Tests that ACTION_P can define a parameterized action.
+ACTION_P(Plus, n) { return arg0 + n; }
+
+TEST(ActionPMacroTest, DefinesParameterizedAction) {
+  Action<int(int m, bool t)> a1 = Plus(9);
+  EXPECT_EQ(10, a1.Perform(make_tuple(1, true)));
+}
+
+// Tests that the body of ACTION_P can reference the argument types
+// and the parameter type.
+ACTION_P(TypedPlus, n) {
+  arg0_type t1 = arg0;
+  n_type t2 = n;
+  return t1 + t2;
+}
+
+TEST(ActionPMacroTest, CanReferenceArgumentAndParameterTypes) {
+  Action<int(char m, bool t)> a1 = TypedPlus(9);
+  EXPECT_EQ(10, a1.Perform(make_tuple(Char(1), true)));
+}
+
+// Tests that a parameterized action can be used in any mock function
+// whose type is compatible.
+TEST(ActionPMacroTest, WorksInCompatibleMockFunction) {
+  Action<std::string(const std::string& s)> a1 = Plus("tail");
+  const std::string re = "re";
+  EXPECT_EQ("retail", a1.Perform(tuple<const std::string&>(re)));
+}
+
+// Tests that we can use ACTION*() to define actions overloaded on the
+// number of parameters.
+
+ACTION(OverloadedAction) { return arg0 ? arg1 : "hello"; }
+
+ACTION_P(OverloadedAction, default_value) {
+  return arg0 ? arg1 : default_value;
+}
+
+ACTION_P2(OverloadedAction, true_value, false_value) {
+  return arg0 ? true_value : false_value;
+}
+
+TEST(ActionMacroTest, CanDefineOverloadedActions) {
+  typedef Action<const char*(bool, const char*)> MyAction;
+
+  const MyAction a1 = OverloadedAction();
+  EXPECT_STREQ("hello", a1.Perform(make_tuple(false, CharPtr("world"))));
+  EXPECT_STREQ("world", a1.Perform(make_tuple(true, CharPtr("world"))));
+
+  const MyAction a2 = OverloadedAction("hi");
+  EXPECT_STREQ("hi", a2.Perform(make_tuple(false, CharPtr("world"))));
+  EXPECT_STREQ("world", a2.Perform(make_tuple(true, CharPtr("world"))));
+
+  const MyAction a3 = OverloadedAction("hi", "you");
+  EXPECT_STREQ("hi", a3.Perform(make_tuple(true, CharPtr("world"))));
+  EXPECT_STREQ("you", a3.Perform(make_tuple(false, CharPtr("world"))));
+}
+
+// Tests ACTION_Pn where n >= 3.
+
+ACTION_P3(Plus, m, n, k) { return arg0 + m + n + k; }
+
+TEST(ActionPnMacroTest, WorksFor3Parameters) {
+  Action<double(int m, bool t)> a1 = Plus(100, 20, 3.4);
+  EXPECT_DOUBLE_EQ(3123.4, a1.Perform(make_tuple(3000, true)));
+
+  Action<std::string(const std::string& s)> a2 = Plus("tail", "-", ">");
+  const std::string re = "re";
+  EXPECT_EQ("retail->", a2.Perform(tuple<const std::string&>(re)));
+}
+
+ACTION_P4(Plus, p0, p1, p2, p3) { return arg0 + p0 + p1 + p2 + p3; }
+
+TEST(ActionPnMacroTest, WorksFor4Parameters) {
+  Action<int(int)> a1 = Plus(1, 2, 3, 4);
+  EXPECT_EQ(10 + 1 + 2 + 3 + 4, a1.Perform(make_tuple(10)));
+}
+
+ACTION_P5(Plus, p0, p1, p2, p3, p4) { return arg0 + p0 + p1 + p2 + p3 + p4; }
+
+TEST(ActionPnMacroTest, WorksFor5Parameters) {
+  Action<int(int)> a1 = Plus(1, 2, 3, 4, 5);
+  EXPECT_EQ(10 + 1 + 2 + 3 + 4 + 5, a1.Perform(make_tuple(10)));
+}
+
+ACTION_P6(Plus, p0, p1, p2, p3, p4, p5) {
+  return arg0 + p0 + p1 + p2 + p3 + p4 + p5;
+}
+
+TEST(ActionPnMacroTest, WorksFor6Parameters) {
+  Action<int(int)> a1 = Plus(1, 2, 3, 4, 5, 6);
+  EXPECT_EQ(10 + 1 + 2 + 3 + 4 + 5 + 6, a1.Perform(make_tuple(10)));
+}
+
+ACTION_P7(Plus, p0, p1, p2, p3, p4, p5, p6) {
+  return arg0 + p0 + p1 + p2 + p3 + p4 + p5 + p6;
+}
+
+TEST(ActionPnMacroTest, WorksFor7Parameters) {
+  Action<int(int)> a1 = Plus(1, 2, 3, 4, 5, 6, 7);
+  EXPECT_EQ(10 + 1 + 2 + 3 + 4 + 5 + 6 + 7, a1.Perform(make_tuple(10)));
+}
+
+ACTION_P8(Plus, p0, p1, p2, p3, p4, p5, p6, p7) {
+  return arg0 + p0 + p1 + p2 + p3 + p4 + p5 + p6 + p7;
+}
+
+TEST(ActionPnMacroTest, WorksFor8Parameters) {
+  Action<int(int)> a1 = Plus(1, 2, 3, 4, 5, 6, 7, 8);
+  EXPECT_EQ(10 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8, a1.Perform(make_tuple(10)));
+}
+
+ACTION_P9(Plus, p0, p1, p2, p3, p4, p5, p6, p7, p8) {
+  return arg0 + p0 + p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8;
+}
+
+TEST(ActionPnMacroTest, WorksFor9Parameters) {
+  Action<int(int)> a1 = Plus(1, 2, 3, 4, 5, 6, 7, 8, 9);
+  EXPECT_EQ(10 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9, a1.Perform(make_tuple(10)));
+}
+
+ACTION_P10(Plus, p0, p1, p2, p3, p4, p5, p6, p7, p8, last_param) {
+  arg0_type t0 = arg0;
+  last_param_type t9 = last_param;
+  return t0 + p0 + p1 + p2 + p3 + p4 + p5 + p6 + p7 + p8 + t9;
+}
+
+TEST(ActionPnMacroTest, WorksFor10Parameters) {
+  Action<int(int)> a1 = Plus(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+  EXPECT_EQ(10 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10,
+            a1.Perform(make_tuple(10)));
+}
+
+// Tests that the action body can promote the parameter types.
+
+ACTION_P2(PadArgument, prefix, suffix) {
+  // The following lines promote the two parameters to desired types.
+  std::string prefix_str(prefix);
+  char suffix_char = static_cast<char>(suffix);
+  return prefix_str + arg0 + suffix_char;
+}
+
+TEST(ActionPnMacroTest, SimpleTypePromotion) {
+  Action<std::string(const char*)> no_promo =
+      PadArgument(std::string("foo"), 'r');
+  Action<std::string(const char*)> promo =
+      PadArgument("foo", static_cast<int>('r'));
+  EXPECT_EQ("foobar", no_promo.Perform(make_tuple(CharPtr("ba"))));
+  EXPECT_EQ("foobar", promo.Perform(make_tuple(CharPtr("ba"))));
+}
+
+// Tests that we can partially restrict parameter types using a
+// straight-forward pattern.
+
+// Defines a generic action that doesn't restrict the types of its
+// parameters.
+ACTION_P3(ConcatImpl, a, b, c) {
+  std::stringstream ss;
+  ss << a << b << c;
+  return ss.str();
+}
+
+// Next, we try to restrict that either the first parameter is a
+// string, or the second parameter is an int.
+
+// Defines a partially specialized wrapper that restricts the first
+// parameter to std::string.
+template <typename T1, typename T2>
+// ConcatImplActionP3 is the class template ACTION_P3 uses to
+// implement ConcatImpl.  We shouldn't change the name as this
+// pattern requires the user to use it directly.
+ConcatImplActionP3<std::string, T1, T2>
+Concat(const std::string& a, T1 b, T2 c) {
+  GTEST_INTENTIONAL_CONST_COND_PUSH_()
+  if (true) {
+  GTEST_INTENTIONAL_CONST_COND_POP_()
+    // This branch verifies that ConcatImpl() can be invoked without
+    // explicit template arguments.
+    return ConcatImpl(a, b, c);
+  } else {
+    // This branch verifies that ConcatImpl() can also be invoked with
+    // explicit template arguments.  It doesn't really need to be
+    // executed as this is a compile-time verification.
+    return ConcatImpl<std::string, T1, T2>(a, b, c);
+  }
+}
+
+// Defines another partially specialized wrapper that restricts the
+// second parameter to int.
+template <typename T1, typename T2>
+ConcatImplActionP3<T1, int, T2>
+Concat(T1 a, int b, T2 c) {
+  return ConcatImpl(a, b, c);
+}
+
+TEST(ActionPnMacroTest, CanPartiallyRestrictParameterTypes) {
+  Action<const std::string()> a1 = Concat("Hello", "1", 2);
+  EXPECT_EQ("Hello12", a1.Perform(make_tuple()));
+
+  a1 = Concat(1, 2, 3);
+  EXPECT_EQ("123", a1.Perform(make_tuple()));
+}
+
+// Verifies the type of an ACTION*.
+
+ACTION(DoFoo) {}
+ACTION_P(DoFoo, p) {}
+ACTION_P2(DoFoo, p0, p1) {}
+
+TEST(ActionPnMacroTest, TypesAreCorrect) {
+  // DoFoo() must be assignable to a DoFooAction variable.
+  DoFooAction a0 = DoFoo();
+
+  // DoFoo(1) must be assignable to a DoFooActionP variable.
+  DoFooActionP<int> a1 = DoFoo(1);
+
+  // DoFoo(p1, ..., pk) must be assignable to a DoFooActionPk
+  // variable, and so on.
+  DoFooActionP2<int, char> a2 = DoFoo(1, '2');
+  PlusActionP3<int, int, char> a3 = Plus(1, 2, '3');
+  PlusActionP4<int, int, int, char> a4 = Plus(1, 2, 3, '4');
+  PlusActionP5<int, int, int, int, char> a5 = Plus(1, 2, 3, 4, '5');
+  PlusActionP6<int, int, int, int, int, char> a6 = Plus(1, 2, 3, 4, 5, '6');
+  PlusActionP7<int, int, int, int, int, int, char> a7 =
+      Plus(1, 2, 3, 4, 5, 6, '7');
+  PlusActionP8<int, int, int, int, int, int, int, char> a8 =
+      Plus(1, 2, 3, 4, 5, 6, 7, '8');
+  PlusActionP9<int, int, int, int, int, int, int, int, char> a9 =
+      Plus(1, 2, 3, 4, 5, 6, 7, 8, '9');
+  PlusActionP10<int, int, int, int, int, int, int, int, int, char> a10 =
+      Plus(1, 2, 3, 4, 5, 6, 7, 8, 9, '0');
+
+  // Avoid "unused variable" warnings.
+  (void)a0;
+  (void)a1;
+  (void)a2;
+  (void)a3;
+  (void)a4;
+  (void)a5;
+  (void)a6;
+  (void)a7;
+  (void)a8;
+  (void)a9;
+  (void)a10;
+}
+
+// Tests that an ACTION_P*() action can be explicitly instantiated
+// with reference-typed parameters.
+
+ACTION_P(Plus1, x) { return x; }
+ACTION_P2(Plus2, x, y) { return x + y; }
+ACTION_P3(Plus3, x, y, z) { return x + y + z; }
+ACTION_P10(Plus10, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9) {
+  return a0 + a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9;
+}
+
+TEST(ActionPnMacroTest, CanExplicitlyInstantiateWithReferenceTypes) {
+  int x = 1, y = 2, z = 3;
+  const tuple<> empty = make_tuple();
+
+  Action<int()> a = Plus1<int&>(x);
+  EXPECT_EQ(1, a.Perform(empty));
+
+  a = Plus2<const int&, int&>(x, y);
+  EXPECT_EQ(3, a.Perform(empty));
+
+  a = Plus3<int&, const int&, int&>(x, y, z);
+  EXPECT_EQ(6, a.Perform(empty));
+
+  int n[10] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+  a = Plus10<const int&, int&, const int&, int&, const int&, int&, const int&,
+      int&, const int&, int&>(n[0], n[1], n[2], n[3], n[4], n[5], n[6], n[7],
+                              n[8], n[9]);
+  EXPECT_EQ(55, a.Perform(empty));
+}
+
+class NullaryConstructorClass {
+ public:
+  NullaryConstructorClass() : value_(123) {}
+  int value_;
+};
+
+// Tests using ReturnNew() with a nullary constructor.
+TEST(ReturnNewTest, NoArgs) {
+  Action<NullaryConstructorClass*()> a = ReturnNew<NullaryConstructorClass>();
+  NullaryConstructorClass* c = a.Perform(make_tuple());
+  EXPECT_EQ(123, c->value_);
+  delete c;
+}
+
+class UnaryConstructorClass {
+ public:
+  explicit UnaryConstructorClass(int value) : value_(value) {}
+  int value_;
+};
+
+// Tests using ReturnNew() with a unary constructor.
+TEST(ReturnNewTest, Unary) {
+  Action<UnaryConstructorClass*()> a = ReturnNew<UnaryConstructorClass>(4000);
+  UnaryConstructorClass* c = a.Perform(make_tuple());
+  EXPECT_EQ(4000, c->value_);
+  delete c;
+}
+
+TEST(ReturnNewTest, UnaryWorksWhenMockMethodHasArgs) {
+  Action<UnaryConstructorClass*(bool, int)> a =
+      ReturnNew<UnaryConstructorClass>(4000);
+  UnaryConstructorClass* c = a.Perform(make_tuple(false, 5));
+  EXPECT_EQ(4000, c->value_);
+  delete c;
+}
+
+TEST(ReturnNewTest, UnaryWorksWhenMockMethodReturnsPointerToConst) {
+  Action<const UnaryConstructorClass*()> a =
+      ReturnNew<UnaryConstructorClass>(4000);
+  const UnaryConstructorClass* c = a.Perform(make_tuple());
+  EXPECT_EQ(4000, c->value_);
+  delete c;
+}
+
+class TenArgConstructorClass {
+ public:
+  TenArgConstructorClass(int a1, int a2, int a3, int a4, int a5,
+                         int a6, int a7, int a8, int a9, int a10)
+    : value_(a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9 + a10) {
+  }
+  int value_;
+};
+
+// Tests using ReturnNew() with a 10-argument constructor.
+TEST(ReturnNewTest, ConstructorThatTakes10Arguments) {
+  Action<TenArgConstructorClass*()> a =
+      ReturnNew<TenArgConstructorClass>(1000000000, 200000000, 30000000,
+                                        4000000, 500000, 60000,
+                                        7000, 800, 90, 0);
+  TenArgConstructorClass* c = a.Perform(make_tuple());
+  EXPECT_EQ(1234567890, c->value_);
+  delete c;
+}
+
+// Tests that ACTION_TEMPLATE works when there is no value parameter.
+ACTION_TEMPLATE(CreateNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_0_VALUE_PARAMS()) {
+  return new T;
+}
+
+TEST(ActionTemplateTest, WorksWithoutValueParam) {
+  const Action<int*()> a = CreateNew<int>();
+  int* p = a.Perform(make_tuple());
+  delete p;
+}
+
+// Tests that ACTION_TEMPLATE works when there are value parameters.
+ACTION_TEMPLATE(CreateNew,
+                HAS_1_TEMPLATE_PARAMS(typename, T),
+                AND_1_VALUE_PARAMS(a0)) {
+  return new T(a0);
+}
+
+TEST(ActionTemplateTest, WorksWithValueParams) {
+  const Action<int*()> a = CreateNew<int>(42);
+  int* p = a.Perform(make_tuple());
+  EXPECT_EQ(42, *p);
+  delete p;
+}
+
+// Tests that ACTION_TEMPLATE works for integral template parameters.
+ACTION_TEMPLATE(MyDeleteArg,
+                HAS_1_TEMPLATE_PARAMS(int, k),
+                AND_0_VALUE_PARAMS()) {
+  delete get<k>(args);
+}
+
+// Resets a bool variable in the destructor.
+class BoolResetter {
+ public:
+  explicit BoolResetter(bool* value) : value_(value) {}
+  ~BoolResetter() { *value_ = false; }
+ private:
+  bool* value_;
+};
+
+TEST(ActionTemplateTest, WorksForIntegralTemplateParams) {
+  const Action<void(int*, BoolResetter*)> a = MyDeleteArg<1>();
+  int n = 0;
+  bool b = true;
+  BoolResetter* resetter = new BoolResetter(&b);
+  a.Perform(make_tuple(&n, resetter));
+  EXPECT_FALSE(b);  // Verifies that resetter is deleted.
+}
+
+// Tests that ACTION_TEMPLATES works for template template parameters.
+ACTION_TEMPLATE(ReturnSmartPointer,
+                HAS_1_TEMPLATE_PARAMS(template <typename Pointee> class,
+                                      Pointer),
+                AND_1_VALUE_PARAMS(pointee)) {
+  return Pointer<pointee_type>(new pointee_type(pointee));
+}
+
+TEST(ActionTemplateTest, WorksForTemplateTemplateParameters) {
+  using ::testing::internal::linked_ptr;
+  const Action<linked_ptr<int>()> a = ReturnSmartPointer<linked_ptr>(42);
+  linked_ptr<int> p = a.Perform(make_tuple());
+  EXPECT_EQ(42, *p);
+}
+
+// Tests that ACTION_TEMPLATE works for 10 template parameters.
+template <typename T1, typename T2, typename T3, int k4, bool k5,
+          unsigned int k6, typename T7, typename T8, typename T9>
+struct GiantTemplate {
+ public:
+  explicit GiantTemplate(int a_value) : value(a_value) {}
+  int value;
+};
+
+ACTION_TEMPLATE(ReturnGiant,
+                HAS_10_TEMPLATE_PARAMS(
+                    typename, T1,
+                    typename, T2,
+                    typename, T3,
+                    int, k4,
+                    bool, k5,
+                    unsigned int, k6,
+                    class, T7,
+                    class, T8,
+                    class, T9,
+                    template <typename T> class, T10),
+                AND_1_VALUE_PARAMS(value)) {
+  return GiantTemplate<T10<T1>, T2, T3, k4, k5, k6, T7, T8, T9>(value);
+}
+
+TEST(ActionTemplateTest, WorksFor10TemplateParameters) {
+  using ::testing::internal::linked_ptr;
+  typedef GiantTemplate<linked_ptr<int>, bool, double, 5,
+      true, 6, char, unsigned, int> Giant;
+  const Action<Giant()> a = ReturnGiant<
+      int, bool, double, 5, true, 6, char, unsigned, int, linked_ptr>(42);
+  Giant giant = a.Perform(make_tuple());
+  EXPECT_EQ(42, giant.value);
+}
+
+// Tests that ACTION_TEMPLATE works for 10 value parameters.
+ACTION_TEMPLATE(ReturnSum,
+                HAS_1_TEMPLATE_PARAMS(typename, Number),
+                AND_10_VALUE_PARAMS(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10)) {
+  return static_cast<Number>(v1) + v2 + v3 + v4 + v5 + v6 + v7 + v8 + v9 + v10;
+}
+
+TEST(ActionTemplateTest, WorksFor10ValueParameters) {
+  const Action<int()> a = ReturnSum<int>(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+  EXPECT_EQ(55, a.Perform(make_tuple()));
+}
+
+// Tests that ACTION_TEMPLATE and ACTION/ACTION_P* can be overloaded
+// on the number of value parameters.
+
+ACTION(ReturnSum) { return 0; }
+
+ACTION_P(ReturnSum, x) { return x; }
+
+ACTION_TEMPLATE(ReturnSum,
+                HAS_1_TEMPLATE_PARAMS(typename, Number),
+                AND_2_VALUE_PARAMS(v1, v2)) {
+  return static_cast<Number>(v1) + v2;
+}
+
+ACTION_TEMPLATE(ReturnSum,
+                HAS_1_TEMPLATE_PARAMS(typename, Number),
+                AND_3_VALUE_PARAMS(v1, v2, v3)) {
+  return static_cast<Number>(v1) + v2 + v3;
+}
+
+ACTION_TEMPLATE(ReturnSum,
+                HAS_2_TEMPLATE_PARAMS(typename, Number, int, k),
+                AND_4_VALUE_PARAMS(v1, v2, v3, v4)) {
+  return static_cast<Number>(v1) + v2 + v3 + v4 + k;
+}
+
+TEST(ActionTemplateTest, CanBeOverloadedOnNumberOfValueParameters) {
+  const Action<int()> a0 = ReturnSum();
+  const Action<int()> a1 = ReturnSum(1);
+  const Action<int()> a2 = ReturnSum<int>(1, 2);
+  const Action<int()> a3 = ReturnSum<int>(1, 2, 3);
+  const Action<int()> a4 = ReturnSum<int, 10000>(2000, 300, 40, 5);
+  EXPECT_EQ(0, a0.Perform(make_tuple()));
+  EXPECT_EQ(1, a1.Perform(make_tuple()));
+  EXPECT_EQ(3, a2.Perform(make_tuple()));
+  EXPECT_EQ(6, a3.Perform(make_tuple()));
+  EXPECT_EQ(12345, a4.Perform(make_tuple()));
+}
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+}  // namespace gmock_generated_actions_test
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-generated-function-mockers_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-generated-function-mockers_test.cc
new file mode 100644
index 0000000000..a86a613578
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-generated-function-mockers_test.cc
@@ -0,0 +1,622 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests the function mocker classes.
+
+#include "gmock/gmock-generated-function-mockers.h"
+
+#if GTEST_OS_WINDOWS
+// MSDN says the header file to be included for STDMETHOD is BaseTyps.h but
+// we are getting compiler errors if we use basetyps.h, hence including
+// objbase.h for definition of STDMETHOD.
+# include <objbase.h>
+#endif  // GTEST_OS_WINDOWS
+
+#include <map>
+#include <string>
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+// There is a bug in MSVC (fixed in VS 2008) that prevents creating a
+// mock for a function with const arguments, so we don't test such
+// cases for MSVC versions older than 2008.
+#if !GTEST_OS_WINDOWS || (_MSC_VER >= 1500)
+# define GMOCK_ALLOWS_CONST_PARAM_FUNCTIONS
+#endif  // !GTEST_OS_WINDOWS || (_MSC_VER >= 1500)
+
+namespace testing {
+namespace gmock_generated_function_mockers_test {
+
+using testing::internal::string;
+using testing::_;
+using testing::A;
+using testing::An;
+using testing::AnyNumber;
+using testing::Const;
+using testing::DoDefault;
+using testing::Eq;
+using testing::Lt;
+using testing::MockFunction;
+using testing::Ref;
+using testing::Return;
+using testing::ReturnRef;
+using testing::TypedEq;
+
+class FooInterface {
+ public:
+  virtual ~FooInterface() {}
+
+  virtual void VoidReturning(int x) = 0;
+
+  virtual int Nullary() = 0;
+  virtual bool Unary(int x) = 0;
+  virtual long Binary(short x, int y) = 0;  // NOLINT
+  virtual int Decimal(bool b, char c, short d, int e, long f,  // NOLINT
+                      float g, double h, unsigned i, char* j, const string& k)
+      = 0;
+
+  virtual bool TakesNonConstReference(int& n) = 0;  // NOLINT
+  virtual string TakesConstReference(const int& n) = 0;
+#ifdef GMOCK_ALLOWS_CONST_PARAM_FUNCTIONS
+  virtual bool TakesConst(const int x) = 0;
+#endif  // GMOCK_ALLOWS_CONST_PARAM_FUNCTIONS
+
+  virtual int OverloadedOnArgumentNumber() = 0;
+  virtual int OverloadedOnArgumentNumber(int n) = 0;
+
+  virtual int OverloadedOnArgumentType(int n) = 0;
+  virtual char OverloadedOnArgumentType(char c) = 0;
+
+  virtual int OverloadedOnConstness() = 0;
+  virtual char OverloadedOnConstness() const = 0;
+
+  virtual int TypeWithHole(int (*func)()) = 0;
+  virtual int TypeWithComma(const std::map<int, string>& a_map) = 0;
+
+#if GTEST_OS_WINDOWS
+  STDMETHOD_(int, CTNullary)() = 0;
+  STDMETHOD_(bool, CTUnary)(int x) = 0;
+  STDMETHOD_(int, CTDecimal)(bool b, char c, short d, int e, long f,  // NOLINT
+      float g, double h, unsigned i, char* j, const string& k) = 0;
+  STDMETHOD_(char, CTConst)(int x) const = 0;
+#endif  // GTEST_OS_WINDOWS
+};
+
+// Const qualifiers on arguments were once (incorrectly) considered
+// significant in determining whether two virtual functions had the same
+// signature. This was fixed in Visual Studio 2008. However, the compiler
+// still emits a warning that alerts about this change in behavior.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable : 4373)
+#endif
+class MockFoo : public FooInterface {
+ public:
+  MockFoo() {}
+
+  // Makes sure that a mock function parameter can be named.
+  MOCK_METHOD1(VoidReturning, void(int n));  // NOLINT
+
+  MOCK_METHOD0(Nullary, int());  // NOLINT
+
+  // Makes sure that a mock function parameter can be unnamed.
+  MOCK_METHOD1(Unary, bool(int));  // NOLINT
+  MOCK_METHOD2(Binary, long(short, int));  // NOLINT
+  MOCK_METHOD10(Decimal, int(bool, char, short, int, long, float,  // NOLINT
+                             double, unsigned, char*, const string& str));
+
+  MOCK_METHOD1(TakesNonConstReference, bool(int&));  // NOLINT
+  MOCK_METHOD1(TakesConstReference, string(const int&));
+
+#ifdef GMOCK_ALLOWS_CONST_PARAM_FUNCTIONS
+  MOCK_METHOD1(TakesConst, bool(const int));  // NOLINT
+#endif
+
+  // Tests that the function return type can contain unprotected comma.
+  MOCK_METHOD0(ReturnTypeWithComma, std::map<int, string>());
+  MOCK_CONST_METHOD1(ReturnTypeWithComma,
+                     std::map<int, string>(int));  // NOLINT
+
+  MOCK_METHOD0(OverloadedOnArgumentNumber, int());  // NOLINT
+  MOCK_METHOD1(OverloadedOnArgumentNumber, int(int));  // NOLINT
+
+  MOCK_METHOD1(OverloadedOnArgumentType, int(int));  // NOLINT
+  MOCK_METHOD1(OverloadedOnArgumentType, char(char));  // NOLINT
+
+  MOCK_METHOD0(OverloadedOnConstness, int());  // NOLINT
+  MOCK_CONST_METHOD0(OverloadedOnConstness, char());  // NOLINT
+
+  MOCK_METHOD1(TypeWithHole, int(int (*)()));  // NOLINT
+  MOCK_METHOD1(TypeWithComma, int(const std::map<int, string>&));  // NOLINT
+
+#if GTEST_OS_WINDOWS
+  MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, CTNullary, int());
+  MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, CTUnary, bool(int));
+  MOCK_METHOD10_WITH_CALLTYPE(STDMETHODCALLTYPE, CTDecimal, int(bool b, char c,
+      short d, int e, long f, float g, double h, unsigned i, char* j,
+      const string& k));
+  MOCK_CONST_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, CTConst, char(int));
+
+  // Tests that the function return type can contain unprotected comma.
+  MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, CTReturnTypeWithComma,
+                             std::map<int, string>());
+#endif  // GTEST_OS_WINDOWS
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
+};
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+class FunctionMockerTest : public testing::Test {
+ protected:
+  FunctionMockerTest() : foo_(&mock_foo_) {}
+
+  FooInterface* const foo_;
+  MockFoo mock_foo_;
+};
+
+// Tests mocking a void-returning function.
+TEST_F(FunctionMockerTest, MocksVoidFunction) {
+  EXPECT_CALL(mock_foo_, VoidReturning(Lt(100)));
+  foo_->VoidReturning(0);
+}
+
+// Tests mocking a nullary function.
+TEST_F(FunctionMockerTest, MocksNullaryFunction) {
+  EXPECT_CALL(mock_foo_, Nullary())
+      .WillOnce(DoDefault())
+      .WillOnce(Return(1));
+
+  EXPECT_EQ(0, foo_->Nullary());
+  EXPECT_EQ(1, foo_->Nullary());
+}
+
+// Tests mocking a unary function.
+TEST_F(FunctionMockerTest, MocksUnaryFunction) {
+  EXPECT_CALL(mock_foo_, Unary(Eq(2)))
+      .Times(2)
+      .WillOnce(Return(true));
+
+  EXPECT_TRUE(foo_->Unary(2));
+  EXPECT_FALSE(foo_->Unary(2));
+}
+
+// Tests mocking a binary function.
+TEST_F(FunctionMockerTest, MocksBinaryFunction) {
+  EXPECT_CALL(mock_foo_, Binary(2, _))
+      .WillOnce(Return(3));
+
+  EXPECT_EQ(3, foo_->Binary(2, 1));
+}
+
+// Tests mocking a decimal function.
+TEST_F(FunctionMockerTest, MocksDecimalFunction) {
+  EXPECT_CALL(mock_foo_, Decimal(true, 'a', 0, 0, 1L, A<float>(),
+                                 Lt(100), 5U, NULL, "hi"))
+      .WillOnce(Return(5));
+
+  EXPECT_EQ(5, foo_->Decimal(true, 'a', 0, 0, 1, 0, 0, 5, NULL, "hi"));
+}
+
+// Tests mocking a function that takes a non-const reference.
+TEST_F(FunctionMockerTest, MocksFunctionWithNonConstReferenceArgument) {
+  int a = 0;
+  EXPECT_CALL(mock_foo_, TakesNonConstReference(Ref(a)))
+      .WillOnce(Return(true));
+
+  EXPECT_TRUE(foo_->TakesNonConstReference(a));
+}
+
+// Tests mocking a function that takes a const reference.
+TEST_F(FunctionMockerTest, MocksFunctionWithConstReferenceArgument) {
+  int a = 0;
+  EXPECT_CALL(mock_foo_, TakesConstReference(Ref(a)))
+      .WillOnce(Return("Hello"));
+
+  EXPECT_EQ("Hello", foo_->TakesConstReference(a));
+}
+
+#ifdef GMOCK_ALLOWS_CONST_PARAM_FUNCTIONS
+// Tests mocking a function that takes a const variable.
+TEST_F(FunctionMockerTest, MocksFunctionWithConstArgument) {
+  EXPECT_CALL(mock_foo_, TakesConst(Lt(10)))
+      .WillOnce(DoDefault());
+
+  EXPECT_FALSE(foo_->TakesConst(5));
+}
+#endif  // GMOCK_ALLOWS_CONST_PARAM_FUNCTIONS
+
+// Tests mocking functions overloaded on the number of arguments.
+TEST_F(FunctionMockerTest, MocksFunctionsOverloadedOnArgumentNumber) {
+  EXPECT_CALL(mock_foo_, OverloadedOnArgumentNumber())
+      .WillOnce(Return(1));
+  EXPECT_CALL(mock_foo_, OverloadedOnArgumentNumber(_))
+      .WillOnce(Return(2));
+
+  EXPECT_EQ(2, foo_->OverloadedOnArgumentNumber(1));
+  EXPECT_EQ(1, foo_->OverloadedOnArgumentNumber());
+}
+
+// Tests mocking functions overloaded on the types of argument.
+TEST_F(FunctionMockerTest, MocksFunctionsOverloadedOnArgumentType) {
+  EXPECT_CALL(mock_foo_, OverloadedOnArgumentType(An<int>()))
+      .WillOnce(Return(1));
+  EXPECT_CALL(mock_foo_, OverloadedOnArgumentType(TypedEq<char>('a')))
+      .WillOnce(Return('b'));
+
+  EXPECT_EQ(1, foo_->OverloadedOnArgumentType(0));
+  EXPECT_EQ('b', foo_->OverloadedOnArgumentType('a'));
+}
+
+// Tests mocking functions overloaded on the const-ness of this object.
+TEST_F(FunctionMockerTest, MocksFunctionsOverloadedOnConstnessOfThis) {
+  EXPECT_CALL(mock_foo_, OverloadedOnConstness());
+  EXPECT_CALL(Const(mock_foo_), OverloadedOnConstness())
+      .WillOnce(Return('a'));
+
+  EXPECT_EQ(0, foo_->OverloadedOnConstness());
+  EXPECT_EQ('a', Const(*foo_).OverloadedOnConstness());
+}
+
+TEST_F(FunctionMockerTest, MocksReturnTypeWithComma) {
+  const std::map<int, string> a_map;
+  EXPECT_CALL(mock_foo_, ReturnTypeWithComma())
+      .WillOnce(Return(a_map));
+  EXPECT_CALL(mock_foo_, ReturnTypeWithComma(42))
+      .WillOnce(Return(a_map));
+
+  EXPECT_EQ(a_map, mock_foo_.ReturnTypeWithComma());
+  EXPECT_EQ(a_map, mock_foo_.ReturnTypeWithComma(42));
+}
+
+#if GTEST_OS_WINDOWS
+// Tests mocking a nullary function with calltype.
+TEST_F(FunctionMockerTest, MocksNullaryFunctionWithCallType) {
+  EXPECT_CALL(mock_foo_, CTNullary())
+      .WillOnce(Return(-1))
+      .WillOnce(Return(0));
+
+  EXPECT_EQ(-1, foo_->CTNullary());
+  EXPECT_EQ(0, foo_->CTNullary());
+}
+
+// Tests mocking a unary function with calltype.
+TEST_F(FunctionMockerTest, MocksUnaryFunctionWithCallType) {
+  EXPECT_CALL(mock_foo_, CTUnary(Eq(2)))
+      .Times(2)
+      .WillOnce(Return(true))
+      .WillOnce(Return(false));
+
+  EXPECT_TRUE(foo_->CTUnary(2));
+  EXPECT_FALSE(foo_->CTUnary(2));
+}
+
+// Tests mocking a decimal function with calltype.
+TEST_F(FunctionMockerTest, MocksDecimalFunctionWithCallType) {
+  EXPECT_CALL(mock_foo_, CTDecimal(true, 'a', 0, 0, 1L, A<float>(),
+                                   Lt(100), 5U, NULL, "hi"))
+      .WillOnce(Return(10));
+
+  EXPECT_EQ(10, foo_->CTDecimal(true, 'a', 0, 0, 1, 0, 0, 5, NULL, "hi"));
+}
+
+// Tests mocking functions overloaded on the const-ness of this object.
+TEST_F(FunctionMockerTest, MocksFunctionsConstFunctionWithCallType) {
+  EXPECT_CALL(Const(mock_foo_), CTConst(_))
+      .WillOnce(Return('a'));
+
+  EXPECT_EQ('a', Const(*foo_).CTConst(0));
+}
+
+TEST_F(FunctionMockerTest, MocksReturnTypeWithCommaAndCallType) {
+  const std::map<int, string> a_map;
+  EXPECT_CALL(mock_foo_, CTReturnTypeWithComma())
+      .WillOnce(Return(a_map));
+
+  EXPECT_EQ(a_map, mock_foo_.CTReturnTypeWithComma());
+}
+
+#endif  // GTEST_OS_WINDOWS
+
+class MockB {
+ public:
+  MockB() {}
+
+  MOCK_METHOD0(DoB, void());
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockB);
+};
+
+// Tests that functions with no EXPECT_CALL() ruls can be called any
+// number of times.
+TEST(ExpectCallTest, UnmentionedFunctionCanBeCalledAnyNumberOfTimes) {
+  {
+    MockB b;
+  }
+
+  {
+    MockB b;
+    b.DoB();
+  }
+
+  {
+    MockB b;
+    b.DoB();
+    b.DoB();
+  }
+}
+
+// Tests mocking template interfaces.
+
+template <typename T>
+class StackInterface {
+ public:
+  virtual ~StackInterface() {}
+
+  // Template parameter appears in function parameter.
+  virtual void Push(const T& value) = 0;
+  virtual void Pop() = 0;
+  virtual int GetSize() const = 0;
+  // Template parameter appears in function return type.
+  virtual const T& GetTop() const = 0;
+};
+
+template <typename T>
+class MockStack : public StackInterface<T> {
+ public:
+  MockStack() {}
+
+  MOCK_METHOD1_T(Push, void(const T& elem));
+  MOCK_METHOD0_T(Pop, void());
+  MOCK_CONST_METHOD0_T(GetSize, int());  // NOLINT
+  MOCK_CONST_METHOD0_T(GetTop, const T&());
+
+  // Tests that the function return type can contain unprotected comma.
+  MOCK_METHOD0_T(ReturnTypeWithComma, std::map<int, int>());
+  MOCK_CONST_METHOD1_T(ReturnTypeWithComma, std::map<int, int>(int));  // NOLINT
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockStack);
+};
+
+// Tests that template mock works.
+TEST(TemplateMockTest, Works) {
+  MockStack<int> mock;
+
+  EXPECT_CALL(mock, GetSize())
+      .WillOnce(Return(0))
+      .WillOnce(Return(1))
+      .WillOnce(Return(0));
+  EXPECT_CALL(mock, Push(_));
+  int n = 5;
+  EXPECT_CALL(mock, GetTop())
+      .WillOnce(ReturnRef(n));
+  EXPECT_CALL(mock, Pop())
+      .Times(AnyNumber());
+
+  EXPECT_EQ(0, mock.GetSize());
+  mock.Push(5);
+  EXPECT_EQ(1, mock.GetSize());
+  EXPECT_EQ(5, mock.GetTop());
+  mock.Pop();
+  EXPECT_EQ(0, mock.GetSize());
+}
+
+TEST(TemplateMockTest, MethodWithCommaInReturnTypeWorks) {
+  MockStack<int> mock;
+
+  const std::map<int, int> a_map;
+  EXPECT_CALL(mock, ReturnTypeWithComma())
+      .WillOnce(Return(a_map));
+  EXPECT_CALL(mock, ReturnTypeWithComma(1))
+      .WillOnce(Return(a_map));
+
+  EXPECT_EQ(a_map, mock.ReturnTypeWithComma());
+  EXPECT_EQ(a_map, mock.ReturnTypeWithComma(1));
+}
+
+#if GTEST_OS_WINDOWS
+// Tests mocking template interfaces with calltype.
+
+template <typename T>
+class StackInterfaceWithCallType {
+ public:
+  virtual ~StackInterfaceWithCallType() {}
+
+  // Template parameter appears in function parameter.
+  STDMETHOD_(void, Push)(const T& value) = 0;
+  STDMETHOD_(void, Pop)() = 0;
+  STDMETHOD_(int, GetSize)() const = 0;
+  // Template parameter appears in function return type.
+  STDMETHOD_(const T&, GetTop)() const = 0;
+};
+
+template <typename T>
+class MockStackWithCallType : public StackInterfaceWithCallType<T> {
+ public:
+  MockStackWithCallType() {}
+
+  MOCK_METHOD1_T_WITH_CALLTYPE(STDMETHODCALLTYPE, Push, void(const T& elem));
+  MOCK_METHOD0_T_WITH_CALLTYPE(STDMETHODCALLTYPE, Pop, void());
+  MOCK_CONST_METHOD0_T_WITH_CALLTYPE(STDMETHODCALLTYPE, GetSize, int());
+  MOCK_CONST_METHOD0_T_WITH_CALLTYPE(STDMETHODCALLTYPE, GetTop, const T&());
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockStackWithCallType);
+};
+
+// Tests that template mock with calltype works.
+TEST(TemplateMockTestWithCallType, Works) {
+  MockStackWithCallType<int> mock;
+
+  EXPECT_CALL(mock, GetSize())
+      .WillOnce(Return(0))
+      .WillOnce(Return(1))
+      .WillOnce(Return(0));
+  EXPECT_CALL(mock, Push(_));
+  int n = 5;
+  EXPECT_CALL(mock, GetTop())
+      .WillOnce(ReturnRef(n));
+  EXPECT_CALL(mock, Pop())
+      .Times(AnyNumber());
+
+  EXPECT_EQ(0, mock.GetSize());
+  mock.Push(5);
+  EXPECT_EQ(1, mock.GetSize());
+  EXPECT_EQ(5, mock.GetTop());
+  mock.Pop();
+  EXPECT_EQ(0, mock.GetSize());
+}
+#endif  // GTEST_OS_WINDOWS
+
+#define MY_MOCK_METHODS1_ \
+    MOCK_METHOD0(Overloaded, void()); \
+    MOCK_CONST_METHOD1(Overloaded, int(int n)); \
+    MOCK_METHOD2(Overloaded, bool(bool f, int n))
+
+class MockOverloadedOnArgNumber {
+ public:
+  MockOverloadedOnArgNumber() {}
+
+  MY_MOCK_METHODS1_;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockOverloadedOnArgNumber);
+};
+
+TEST(OverloadedMockMethodTest, CanOverloadOnArgNumberInMacroBody) {
+  MockOverloadedOnArgNumber mock;
+  EXPECT_CALL(mock, Overloaded());
+  EXPECT_CALL(mock, Overloaded(1)).WillOnce(Return(2));
+  EXPECT_CALL(mock, Overloaded(true, 1)).WillOnce(Return(true));
+
+  mock.Overloaded();
+  EXPECT_EQ(2, mock.Overloaded(1));
+  EXPECT_TRUE(mock.Overloaded(true, 1));
+}
+
+#define MY_MOCK_METHODS2_ \
+    MOCK_CONST_METHOD1(Overloaded, int(int n)); \
+    MOCK_METHOD1(Overloaded, int(int n));
+
+class MockOverloadedOnConstness {
+ public:
+  MockOverloadedOnConstness() {}
+
+  MY_MOCK_METHODS2_;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockOverloadedOnConstness);
+};
+
+TEST(OverloadedMockMethodTest, CanOverloadOnConstnessInMacroBody) {
+  MockOverloadedOnConstness mock;
+  const MockOverloadedOnConstness* const_mock = &mock;
+  EXPECT_CALL(mock, Overloaded(1)).WillOnce(Return(2));
+  EXPECT_CALL(*const_mock, Overloaded(1)).WillOnce(Return(3));
+
+  EXPECT_EQ(2, mock.Overloaded(1));
+  EXPECT_EQ(3, const_mock->Overloaded(1));
+}
+
+TEST(MockFunctionTest, WorksForVoidNullary) {
+  MockFunction<void()> foo;
+  EXPECT_CALL(foo, Call());
+  foo.Call();
+}
+
+TEST(MockFunctionTest, WorksForNonVoidNullary) {
+  MockFunction<int()> foo;
+  EXPECT_CALL(foo, Call())
+      .WillOnce(Return(1))
+      .WillOnce(Return(2));
+  EXPECT_EQ(1, foo.Call());
+  EXPECT_EQ(2, foo.Call());
+}
+
+TEST(MockFunctionTest, WorksForVoidUnary) {
+  MockFunction<void(int)> foo;
+  EXPECT_CALL(foo, Call(1));
+  foo.Call(1);
+}
+
+TEST(MockFunctionTest, WorksForNonVoidBinary) {
+  MockFunction<int(bool, int)> foo;
+  EXPECT_CALL(foo, Call(false, 42))
+      .WillOnce(Return(1))
+      .WillOnce(Return(2));
+  EXPECT_CALL(foo, Call(true, Ge(100)))
+      .WillOnce(Return(3));
+  EXPECT_EQ(1, foo.Call(false, 42));
+  EXPECT_EQ(2, foo.Call(false, 42));
+  EXPECT_EQ(3, foo.Call(true, 120));
+}
+
+TEST(MockFunctionTest, WorksFor10Arguments) {
+  MockFunction<int(bool a0, char a1, int a2, int a3, int a4,
+                   int a5, int a6, char a7, int a8, bool a9)> foo;
+  EXPECT_CALL(foo, Call(_, 'a', _, _, _, _, _, _, _, _))
+      .WillOnce(Return(1))
+      .WillOnce(Return(2));
+  EXPECT_EQ(1, foo.Call(false, 'a', 0, 0, 0, 0, 0, 'b', 0, true));
+  EXPECT_EQ(2, foo.Call(true, 'a', 0, 0, 0, 0, 0, 'b', 1, false));
+}
+
+#if GTEST_HAS_STD_FUNCTION_
+TEST(MockFunctionTest, AsStdFunction) {
+  MockFunction<int(int)> foo;
+  auto call = [](const std::function<int(int)> &f, int i) {
+    return f(i);
+  };
+  EXPECT_CALL(foo, Call(1)).WillOnce(Return(-1));
+  EXPECT_CALL(foo, Call(2)).WillOnce(Return(-2));
+  EXPECT_EQ(-1, call(foo.AsStdFunction(), 1));
+  EXPECT_EQ(-2, call(foo.AsStdFunction(), 2));
+}
+
+TEST(MockFunctionTest, AsStdFunctionReturnsReference) {
+  MockFunction<int&()> foo;
+  int value = 1;
+  EXPECT_CALL(foo, Call()).WillOnce(ReturnRef(value));
+  int& ref = foo.AsStdFunction()();
+  EXPECT_EQ(1, ref);
+  value = 2;
+  EXPECT_EQ(2, ref);
+}
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+}  // namespace gmock_generated_function_mockers_test
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-generated-internal-utils_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-generated-internal-utils_test.cc
new file mode 100644
index 0000000000..e0a535a346
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-generated-internal-utils_test.cc
@@ -0,0 +1,127 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests the internal utilities.
+
+#include "gmock/internal/gmock-generated-internal-utils.h"
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gtest/gtest.h"
+
+namespace {
+
+using ::testing::tuple;
+using ::testing::Matcher;
+using ::testing::internal::CompileAssertTypesEqual;
+using ::testing::internal::MatcherTuple;
+using ::testing::internal::Function;
+using ::testing::internal::IgnoredValue;
+
+// Tests the MatcherTuple template struct.
+
+TEST(MatcherTupleTest, ForSize0) {
+  CompileAssertTypesEqual<tuple<>, MatcherTuple<tuple<> >::type>();
+}
+
+TEST(MatcherTupleTest, ForSize1) {
+  CompileAssertTypesEqual<tuple<Matcher<int> >,
+                          MatcherTuple<tuple<int> >::type>();
+}
+
+TEST(MatcherTupleTest, ForSize2) {
+  CompileAssertTypesEqual<tuple<Matcher<int>, Matcher<char> >,
+                          MatcherTuple<tuple<int, char> >::type>();
+}
+
+TEST(MatcherTupleTest, ForSize5) {
+  CompileAssertTypesEqual<tuple<Matcher<int>, Matcher<char>, Matcher<bool>,
+                                Matcher<double>, Matcher<char*> >,
+                          MatcherTuple<tuple<int, char, bool, double, char*>
+                                      >::type>();
+}
+
+// Tests the Function template struct.
+
+TEST(FunctionTest, Nullary) {
+  typedef Function<int()> F;  // NOLINT
+  CompileAssertTypesEqual<int, F::Result>();
+  CompileAssertTypesEqual<tuple<>, F::ArgumentTuple>();
+  CompileAssertTypesEqual<tuple<>, F::ArgumentMatcherTuple>();
+  CompileAssertTypesEqual<void(), F::MakeResultVoid>();
+  CompileAssertTypesEqual<IgnoredValue(), F::MakeResultIgnoredValue>();
+}
+
+TEST(FunctionTest, Unary) {
+  typedef Function<int(bool)> F;  // NOLINT
+  CompileAssertTypesEqual<int, F::Result>();
+  CompileAssertTypesEqual<bool, F::Argument1>();
+  CompileAssertTypesEqual<tuple<bool>, F::ArgumentTuple>();
+  CompileAssertTypesEqual<tuple<Matcher<bool> >, F::ArgumentMatcherTuple>();
+  CompileAssertTypesEqual<void(bool), F::MakeResultVoid>();  // NOLINT
+  CompileAssertTypesEqual<IgnoredValue(bool),  // NOLINT
+      F::MakeResultIgnoredValue>();
+}
+
+TEST(FunctionTest, Binary) {
+  typedef Function<int(bool, const long&)> F;  // NOLINT
+  CompileAssertTypesEqual<int, F::Result>();
+  CompileAssertTypesEqual<bool, F::Argument1>();
+  CompileAssertTypesEqual<const long&, F::Argument2>();  // NOLINT
+  CompileAssertTypesEqual<tuple<bool, const long&>, F::ArgumentTuple>();  // NOLINT
+  CompileAssertTypesEqual<tuple<Matcher<bool>, Matcher<const long&> >,  // NOLINT
+                          F::ArgumentMatcherTuple>();
+  CompileAssertTypesEqual<void(bool, const long&), F::MakeResultVoid>();  // NOLINT
+  CompileAssertTypesEqual<IgnoredValue(bool, const long&),  // NOLINT
+      F::MakeResultIgnoredValue>();
+}
+
+TEST(FunctionTest, LongArgumentList) {
+  typedef Function<char(bool, int, char*, int&, const long&)> F;  // NOLINT
+  CompileAssertTypesEqual<char, F::Result>();
+  CompileAssertTypesEqual<bool, F::Argument1>();
+  CompileAssertTypesEqual<int, F::Argument2>();
+  CompileAssertTypesEqual<char*, F::Argument3>();
+  CompileAssertTypesEqual<int&, F::Argument4>();
+  CompileAssertTypesEqual<const long&, F::Argument5>();  // NOLINT
+  CompileAssertTypesEqual<tuple<bool, int, char*, int&, const long&>,  // NOLINT
+                          F::ArgumentTuple>();
+  CompileAssertTypesEqual<tuple<Matcher<bool>, Matcher<int>, Matcher<char*>,
+                                Matcher<int&>, Matcher<const long&> >,  // NOLINT
+                          F::ArgumentMatcherTuple>();
+  CompileAssertTypesEqual<void(bool, int, char*, int&, const long&),  // NOLINT
+                          F::MakeResultVoid>();
+  CompileAssertTypesEqual<
+      IgnoredValue(bool, int, char*, int&, const long&),  // NOLINT
+      F::MakeResultIgnoredValue>();
+}
+
+}  // Unnamed namespace
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-generated-matchers_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-generated-matchers_test.cc
new file mode 100644
index 0000000000..0e9f77f5eb
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-generated-matchers_test.cc
@@ -0,0 +1,1286 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests the built-in matchers generated by a script.
+
+#include "gmock/gmock-generated-matchers.h"
+
+#include <list>
+#include <map>
+#include <set>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+
+namespace {
+
+using std::list;
+using std::map;
+using std::pair;
+using std::set;
+using std::stringstream;
+using std::vector;
+using testing::get;
+using testing::make_tuple;
+using testing::tuple;
+using testing::_;
+using testing::Args;
+using testing::Contains;
+using testing::ElementsAre;
+using testing::ElementsAreArray;
+using testing::Eq;
+using testing::Ge;
+using testing::Gt;
+using testing::Le;
+using testing::Lt;
+using testing::MakeMatcher;
+using testing::Matcher;
+using testing::MatcherInterface;
+using testing::MatchResultListener;
+using testing::Ne;
+using testing::Not;
+using testing::Pointee;
+using testing::PrintToString;
+using testing::Ref;
+using testing::StaticAssertTypeEq;
+using testing::StrEq;
+using testing::Value;
+using testing::internal::ElementsAreArrayMatcher;
+using testing::internal::string;
+
+// Returns the description of the given matcher.
+template <typename T>
+string Describe(const Matcher<T>& m) {
+  stringstream ss;
+  m.DescribeTo(&ss);
+  return ss.str();
+}
+
+// Returns the description of the negation of the given matcher.
+template <typename T>
+string DescribeNegation(const Matcher<T>& m) {
+  stringstream ss;
+  m.DescribeNegationTo(&ss);
+  return ss.str();
+}
+
+// Returns the reason why x matches, or doesn't match, m.
+template <typename MatcherType, typename Value>
+string Explain(const MatcherType& m, const Value& x) {
+  stringstream ss;
+  m.ExplainMatchResultTo(x, &ss);
+  return ss.str();
+}
+
+// Tests Args<k0, ..., kn>(m).
+
+TEST(ArgsTest, AcceptsZeroTemplateArg) {
+  const tuple<int, bool> t(5, true);
+  EXPECT_THAT(t, Args<>(Eq(tuple<>())));
+  EXPECT_THAT(t, Not(Args<>(Ne(tuple<>()))));
+}
+
+TEST(ArgsTest, AcceptsOneTemplateArg) {
+  const tuple<int, bool> t(5, true);
+  EXPECT_THAT(t, Args<0>(Eq(make_tuple(5))));
+  EXPECT_THAT(t, Args<1>(Eq(make_tuple(true))));
+  EXPECT_THAT(t, Not(Args<1>(Eq(make_tuple(false)))));
+}
+
+TEST(ArgsTest, AcceptsTwoTemplateArgs) {
+  const tuple<short, int, long> t(4, 5, 6L);  // NOLINT
+
+  EXPECT_THAT(t, (Args<0, 1>(Lt())));
+  EXPECT_THAT(t, (Args<1, 2>(Lt())));
+  EXPECT_THAT(t, Not(Args<0, 2>(Gt())));
+}
+
+TEST(ArgsTest, AcceptsRepeatedTemplateArgs) {
+  const tuple<short, int, long> t(4, 5, 6L);  // NOLINT
+  EXPECT_THAT(t, (Args<0, 0>(Eq())));
+  EXPECT_THAT(t, Not(Args<1, 1>(Ne())));
+}
+
+TEST(ArgsTest, AcceptsDecreasingTemplateArgs) {
+  const tuple<short, int, long> t(4, 5, 6L);  // NOLINT
+  EXPECT_THAT(t, (Args<2, 0>(Gt())));
+  EXPECT_THAT(t, Not(Args<2, 1>(Lt())));
+}
+
+// The MATCHER*() macros trigger warning C4100 (unreferenced formal
+// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
+// the macro definition, as the warnings are generated when the macro
+// is expanded and macro expansion cannot contain #pragma.  Therefore
+// we suppress them here.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#endif
+
+MATCHER(SumIsZero, "") {
+  return get<0>(arg) + get<1>(arg) + get<2>(arg) == 0;
+}
+
+TEST(ArgsTest, AcceptsMoreTemplateArgsThanArityOfOriginalTuple) {
+  EXPECT_THAT(make_tuple(-1, 2), (Args<0, 0, 1>(SumIsZero())));
+  EXPECT_THAT(make_tuple(1, 2), Not(Args<0, 0, 1>(SumIsZero())));
+}
+
+TEST(ArgsTest, CanBeNested) {
+  const tuple<short, int, long, int> t(4, 5, 6L, 6);  // NOLINT
+  EXPECT_THAT(t, (Args<1, 2, 3>(Args<1, 2>(Eq()))));
+  EXPECT_THAT(t, (Args<0, 1, 3>(Args<0, 2>(Lt()))));
+}
+
+TEST(ArgsTest, CanMatchTupleByValue) {
+  typedef tuple<char, int, int> Tuple3;
+  const Matcher<Tuple3> m = Args<1, 2>(Lt());
+  EXPECT_TRUE(m.Matches(Tuple3('a', 1, 2)));
+  EXPECT_FALSE(m.Matches(Tuple3('b', 2, 2)));
+}
+
+TEST(ArgsTest, CanMatchTupleByReference) {
+  typedef tuple<char, char, int> Tuple3;
+  const Matcher<const Tuple3&> m = Args<0, 1>(Lt());
+  EXPECT_TRUE(m.Matches(Tuple3('a', 'b', 2)));
+  EXPECT_FALSE(m.Matches(Tuple3('b', 'b', 2)));
+}
+
+// Validates that arg is printed as str.
+MATCHER_P(PrintsAs, str, "") {
+  return testing::PrintToString(arg) == str;
+}
+
+TEST(ArgsTest, AcceptsTenTemplateArgs) {
+  EXPECT_THAT(make_tuple(0, 1L, 2, 3L, 4, 5, 6, 7, 8, 9),
+              (Args<9, 8, 7, 6, 5, 4, 3, 2, 1, 0>(
+                  PrintsAs("(9, 8, 7, 6, 5, 4, 3, 2, 1, 0)"))));
+  EXPECT_THAT(make_tuple(0, 1L, 2, 3L, 4, 5, 6, 7, 8, 9),
+              Not(Args<9, 8, 7, 6, 5, 4, 3, 2, 1, 0>(
+                      PrintsAs("(0, 8, 7, 6, 5, 4, 3, 2, 1, 0)"))));
+}
+
+TEST(ArgsTest, DescirbesSelfCorrectly) {
+  const Matcher<tuple<int, bool, char> > m = Args<2, 0>(Lt());
+  EXPECT_EQ("are a tuple whose fields (#2, #0) are a pair where "
+            "the first < the second",
+            Describe(m));
+}
+
+TEST(ArgsTest, DescirbesNestedArgsCorrectly) {
+  const Matcher<const tuple<int, bool, char, int>&> m =
+      Args<0, 2, 3>(Args<2, 0>(Lt()));
+  EXPECT_EQ("are a tuple whose fields (#0, #2, #3) are a tuple "
+            "whose fields (#2, #0) are a pair where the first < the second",
+            Describe(m));
+}
+
+TEST(ArgsTest, DescribesNegationCorrectly) {
+  const Matcher<tuple<int, char> > m = Args<1, 0>(Gt());
+  EXPECT_EQ("are a tuple whose fields (#1, #0) aren't a pair "
+            "where the first > the second",
+            DescribeNegation(m));
+}
+
+TEST(ArgsTest, ExplainsMatchResultWithoutInnerExplanation) {
+  const Matcher<tuple<bool, int, int> > m = Args<1, 2>(Eq());
+  EXPECT_EQ("whose fields (#1, #2) are (42, 42)",
+            Explain(m, make_tuple(false, 42, 42)));
+  EXPECT_EQ("whose fields (#1, #2) are (42, 43)",
+            Explain(m, make_tuple(false, 42, 43)));
+}
+
+// For testing Args<>'s explanation.
+class LessThanMatcher : public MatcherInterface<tuple<char, int> > {
+ public:
+  virtual void DescribeTo(::std::ostream* os) const {}
+
+  virtual bool MatchAndExplain(tuple<char, int> value,
+                               MatchResultListener* listener) const {
+    const int diff = get<0>(value) - get<1>(value);
+    if (diff > 0) {
+      *listener << "where the first value is " << diff
+                << " more than the second";
+    }
+    return diff < 0;
+  }
+};
+
+Matcher<tuple<char, int> > LessThan() {
+  return MakeMatcher(new LessThanMatcher);
+}
+
+TEST(ArgsTest, ExplainsMatchResultWithInnerExplanation) {
+  const Matcher<tuple<char, int, int> > m = Args<0, 2>(LessThan());
+  EXPECT_EQ("whose fields (#0, #2) are ('a' (97, 0x61), 42), "
+            "where the first value is 55 more than the second",
+            Explain(m, make_tuple('a', 42, 42)));
+  EXPECT_EQ("whose fields (#0, #2) are ('\\0', 43)",
+            Explain(m, make_tuple('\0', 42, 43)));
+}
+
+// For testing ExplainMatchResultTo().
+class GreaterThanMatcher : public MatcherInterface<int> {
+ public:
+  explicit GreaterThanMatcher(int rhs) : rhs_(rhs) {}
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "is greater than " << rhs_;
+  }
+
+  virtual bool MatchAndExplain(int lhs,
+                               MatchResultListener* listener) const {
+    const int diff = lhs - rhs_;
+    if (diff > 0) {
+      *listener << "which is " << diff << " more than " << rhs_;
+    } else if (diff == 0) {
+      *listener << "which is the same as " << rhs_;
+    } else {
+      *listener << "which is " << -diff << " less than " << rhs_;
+    }
+
+    return lhs > rhs_;
+  }
+
+ private:
+  int rhs_;
+};
+
+Matcher<int> GreaterThan(int n) {
+  return MakeMatcher(new GreaterThanMatcher(n));
+}
+
+// Tests for ElementsAre().
+
+TEST(ElementsAreTest, CanDescribeExpectingNoElement) {
+  Matcher<const vector<int>&> m = ElementsAre();
+  EXPECT_EQ("is empty", Describe(m));
+}
+
+TEST(ElementsAreTest, CanDescribeExpectingOneElement) {
+  Matcher<vector<int> > m = ElementsAre(Gt(5));
+  EXPECT_EQ("has 1 element that is > 5", Describe(m));
+}
+
+TEST(ElementsAreTest, CanDescribeExpectingManyElements) {
+  Matcher<list<string> > m = ElementsAre(StrEq("one"), "two");
+  EXPECT_EQ("has 2 elements where\n"
+            "element #0 is equal to \"one\",\n"
+            "element #1 is equal to \"two\"", Describe(m));
+}
+
+TEST(ElementsAreTest, CanDescribeNegationOfExpectingNoElement) {
+  Matcher<vector<int> > m = ElementsAre();
+  EXPECT_EQ("isn't empty", DescribeNegation(m));
+}
+
+TEST(ElementsAreTest, CanDescribeNegationOfExpectingOneElment) {
+  Matcher<const list<int>& > m = ElementsAre(Gt(5));
+  EXPECT_EQ("doesn't have 1 element, or\n"
+            "element #0 isn't > 5", DescribeNegation(m));
+}
+
+TEST(ElementsAreTest, CanDescribeNegationOfExpectingManyElements) {
+  Matcher<const list<string>& > m = ElementsAre("one", "two");
+  EXPECT_EQ("doesn't have 2 elements, or\n"
+            "element #0 isn't equal to \"one\", or\n"
+            "element #1 isn't equal to \"two\"", DescribeNegation(m));
+}
+
+TEST(ElementsAreTest, DoesNotExplainTrivialMatch) {
+  Matcher<const list<int>& > m = ElementsAre(1, Ne(2));
+
+  list<int> test_list;
+  test_list.push_back(1);
+  test_list.push_back(3);
+  EXPECT_EQ("", Explain(m, test_list));  // No need to explain anything.
+}
+
+TEST(ElementsAreTest, ExplainsNonTrivialMatch) {
+  Matcher<const vector<int>& > m =
+      ElementsAre(GreaterThan(1), 0, GreaterThan(2));
+
+  const int a[] = { 10, 0, 100 };
+  vector<int> test_vector(a, a + GTEST_ARRAY_SIZE_(a));
+  EXPECT_EQ("whose element #0 matches, which is 9 more than 1,\n"
+            "and whose element #2 matches, which is 98 more than 2",
+            Explain(m, test_vector));
+}
+
+TEST(ElementsAreTest, CanExplainMismatchWrongSize) {
+  Matcher<const list<int>& > m = ElementsAre(1, 3);
+
+  list<int> test_list;
+  // No need to explain when the container is empty.
+  EXPECT_EQ("", Explain(m, test_list));
+
+  test_list.push_back(1);
+  EXPECT_EQ("which has 1 element", Explain(m, test_list));
+}
+
+TEST(ElementsAreTest, CanExplainMismatchRightSize) {
+  Matcher<const vector<int>& > m = ElementsAre(1, GreaterThan(5));
+
+  vector<int> v;
+  v.push_back(2);
+  v.push_back(1);
+  EXPECT_EQ("whose element #0 doesn't match", Explain(m, v));
+
+  v[0] = 1;
+  EXPECT_EQ("whose element #1 doesn't match, which is 4 less than 5",
+            Explain(m, v));
+}
+
+TEST(ElementsAreTest, MatchesOneElementVector) {
+  vector<string> test_vector;
+  test_vector.push_back("test string");
+
+  EXPECT_THAT(test_vector, ElementsAre(StrEq("test string")));
+}
+
+TEST(ElementsAreTest, MatchesOneElementList) {
+  list<string> test_list;
+  test_list.push_back("test string");
+
+  EXPECT_THAT(test_list, ElementsAre("test string"));
+}
+
+TEST(ElementsAreTest, MatchesThreeElementVector) {
+  vector<string> test_vector;
+  test_vector.push_back("one");
+  test_vector.push_back("two");
+  test_vector.push_back("three");
+
+  EXPECT_THAT(test_vector, ElementsAre("one", StrEq("two"), _));
+}
+
+TEST(ElementsAreTest, MatchesOneElementEqMatcher) {
+  vector<int> test_vector;
+  test_vector.push_back(4);
+
+  EXPECT_THAT(test_vector, ElementsAre(Eq(4)));
+}
+
+TEST(ElementsAreTest, MatchesOneElementAnyMatcher) {
+  vector<int> test_vector;
+  test_vector.push_back(4);
+
+  EXPECT_THAT(test_vector, ElementsAre(_));
+}
+
+TEST(ElementsAreTest, MatchesOneElementValue) {
+  vector<int> test_vector;
+  test_vector.push_back(4);
+
+  EXPECT_THAT(test_vector, ElementsAre(4));
+}
+
+TEST(ElementsAreTest, MatchesThreeElementsMixedMatchers) {
+  vector<int> test_vector;
+  test_vector.push_back(1);
+  test_vector.push_back(2);
+  test_vector.push_back(3);
+
+  EXPECT_THAT(test_vector, ElementsAre(1, Eq(2), _));
+}
+
+TEST(ElementsAreTest, MatchesTenElementVector) {
+  const int a[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+  vector<int> test_vector(a, a + GTEST_ARRAY_SIZE_(a));
+
+  EXPECT_THAT(test_vector,
+              // The element list can contain values and/or matchers
+              // of different types.
+              ElementsAre(0, Ge(0), _, 3, 4, Ne(2), Eq(6), 7, 8, _));
+}
+
+TEST(ElementsAreTest, DoesNotMatchWrongSize) {
+  vector<string> test_vector;
+  test_vector.push_back("test string");
+  test_vector.push_back("test string");
+
+  Matcher<vector<string> > m = ElementsAre(StrEq("test string"));
+  EXPECT_FALSE(m.Matches(test_vector));
+}
+
+TEST(ElementsAreTest, DoesNotMatchWrongValue) {
+  vector<string> test_vector;
+  test_vector.push_back("other string");
+
+  Matcher<vector<string> > m = ElementsAre(StrEq("test string"));
+  EXPECT_FALSE(m.Matches(test_vector));
+}
+
+TEST(ElementsAreTest, DoesNotMatchWrongOrder) {
+  vector<string> test_vector;
+  test_vector.push_back("one");
+  test_vector.push_back("three");
+  test_vector.push_back("two");
+
+  Matcher<vector<string> > m = ElementsAre(
+    StrEq("one"), StrEq("two"), StrEq("three"));
+  EXPECT_FALSE(m.Matches(test_vector));
+}
+
+TEST(ElementsAreTest, WorksForNestedContainer) {
+  const char* strings[] = {
+    "Hi",
+    "world"
+  };
+
+  vector<list<char> > nested;
+  for (size_t i = 0; i < GTEST_ARRAY_SIZE_(strings); i++) {
+    nested.push_back(list<char>(strings[i], strings[i] + strlen(strings[i])));
+  }
+
+  EXPECT_THAT(nested, ElementsAre(ElementsAre('H', Ne('e')),
+                                  ElementsAre('w', 'o', _, _, 'd')));
+  EXPECT_THAT(nested, Not(ElementsAre(ElementsAre('H', 'e'),
+                                      ElementsAre('w', 'o', _, _, 'd'))));
+}
+
+TEST(ElementsAreTest, WorksWithByRefElementMatchers) {
+  int a[] = { 0, 1, 2 };
+  vector<int> v(a, a + GTEST_ARRAY_SIZE_(a));
+
+  EXPECT_THAT(v, ElementsAre(Ref(v[0]), Ref(v[1]), Ref(v[2])));
+  EXPECT_THAT(v, Not(ElementsAre(Ref(v[0]), Ref(v[1]), Ref(a[2]))));
+}
+
+TEST(ElementsAreTest, WorksWithContainerPointerUsingPointee) {
+  int a[] = { 0, 1, 2 };
+  vector<int> v(a, a + GTEST_ARRAY_SIZE_(a));
+
+  EXPECT_THAT(&v, Pointee(ElementsAre(0, 1, _)));
+  EXPECT_THAT(&v, Not(Pointee(ElementsAre(0, _, 3))));
+}
+
+TEST(ElementsAreTest, WorksWithNativeArrayPassedByReference) {
+  int array[] = { 0, 1, 2 };
+  EXPECT_THAT(array, ElementsAre(0, 1, _));
+  EXPECT_THAT(array, Not(ElementsAre(1, _, _)));
+  EXPECT_THAT(array, Not(ElementsAre(0, _)));
+}
+
+class NativeArrayPassedAsPointerAndSize {
+ public:
+  NativeArrayPassedAsPointerAndSize() {}
+
+  MOCK_METHOD2(Helper, void(int* array, int size));
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(NativeArrayPassedAsPointerAndSize);
+};
+
+TEST(ElementsAreTest, WorksWithNativeArrayPassedAsPointerAndSize) {
+  int array[] = { 0, 1 };
+  ::testing::tuple<int*, size_t> array_as_tuple(array, 2);
+  EXPECT_THAT(array_as_tuple, ElementsAre(0, 1));
+  EXPECT_THAT(array_as_tuple, Not(ElementsAre(0)));
+
+  NativeArrayPassedAsPointerAndSize helper;
+  EXPECT_CALL(helper, Helper(_, _))
+      .With(ElementsAre(0, 1));
+  helper.Helper(array, 2);
+}
+
+TEST(ElementsAreTest, WorksWithTwoDimensionalNativeArray) {
+  const char a2[][3] = { "hi", "lo" };
+  EXPECT_THAT(a2, ElementsAre(ElementsAre('h', 'i', '\0'),
+                              ElementsAre('l', 'o', '\0')));
+  EXPECT_THAT(a2, ElementsAre(StrEq("hi"), StrEq("lo")));
+  EXPECT_THAT(a2, ElementsAre(Not(ElementsAre('h', 'o', '\0')),
+                              ElementsAre('l', 'o', '\0')));
+}
+
+TEST(ElementsAreTest, AcceptsStringLiteral) {
+  string array[] = { "hi", "one", "two" };
+  EXPECT_THAT(array, ElementsAre("hi", "one", "two"));
+  EXPECT_THAT(array, Not(ElementsAre("hi", "one", "too")));
+}
+
+#ifndef _MSC_VER
+
+// The following test passes a value of type const char[] to a
+// function template that expects const T&.  Some versions of MSVC
+// generates a compiler error C2665 for that.  We believe it's a bug
+// in MSVC.  Therefore this test is #if-ed out for MSVC.
+
+// Declared here with the size unknown.  Defined AFTER the following test.
+extern const char kHi[];
+
+TEST(ElementsAreTest, AcceptsArrayWithUnknownSize) {
+  // The size of kHi is not known in this test, but ElementsAre() should
+  // still accept it.
+
+  string array1[] = { "hi" };
+  EXPECT_THAT(array1, ElementsAre(kHi));
+
+  string array2[] = { "ho" };
+  EXPECT_THAT(array2, Not(ElementsAre(kHi)));
+}
+
+const char kHi[] = "hi";
+
+#endif  // _MSC_VER
+
+TEST(ElementsAreTest, MakesCopyOfArguments) {
+  int x = 1;
+  int y = 2;
+  // This should make a copy of x and y.
+  ::testing::internal::ElementsAreMatcher<testing::tuple<int, int> >
+          polymorphic_matcher = ElementsAre(x, y);
+  // Changing x and y now shouldn't affect the meaning of the above matcher.
+  x = y = 0;
+  const int array1[] = { 1, 2 };
+  EXPECT_THAT(array1, polymorphic_matcher);
+  const int array2[] = { 0, 0 };
+  EXPECT_THAT(array2, Not(polymorphic_matcher));
+}
+
+
+// Tests for ElementsAreArray().  Since ElementsAreArray() shares most
+// of the implementation with ElementsAre(), we don't test it as
+// thoroughly here.
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithValueArray) {
+  const int a[] = { 1, 2, 3 };
+
+  vector<int> test_vector(a, a + GTEST_ARRAY_SIZE_(a));
+  EXPECT_THAT(test_vector, ElementsAreArray(a));
+
+  test_vector[2] = 0;
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(a)));
+}
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithArraySize) {
+  const char* a[] = { "one", "two", "three" };
+
+  vector<string> test_vector(a, a + GTEST_ARRAY_SIZE_(a));
+  EXPECT_THAT(test_vector, ElementsAreArray(a, GTEST_ARRAY_SIZE_(a)));
+
+  const char** p = a;
+  test_vector[0] = "1";
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(p, GTEST_ARRAY_SIZE_(a))));
+}
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithoutArraySize) {
+  const char* a[] = { "one", "two", "three" };
+
+  vector<string> test_vector(a, a + GTEST_ARRAY_SIZE_(a));
+  EXPECT_THAT(test_vector, ElementsAreArray(a));
+
+  test_vector[0] = "1";
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(a)));
+}
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithMatcherArray) {
+  const Matcher<string> kMatcherArray[] =
+    { StrEq("one"), StrEq("two"), StrEq("three") };
+
+  vector<string> test_vector;
+  test_vector.push_back("one");
+  test_vector.push_back("two");
+  test_vector.push_back("three");
+  EXPECT_THAT(test_vector, ElementsAreArray(kMatcherArray));
+
+  test_vector.push_back("three");
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(kMatcherArray)));
+}
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithVector) {
+  const int a[] = { 1, 2, 3 };
+  vector<int> test_vector(a, a + GTEST_ARRAY_SIZE_(a));
+  const vector<int> expected(a, a + GTEST_ARRAY_SIZE_(a));
+  EXPECT_THAT(test_vector, ElementsAreArray(expected));
+  test_vector.push_back(4);
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(expected)));
+}
+
+#if GTEST_HAS_STD_INITIALIZER_LIST_
+
+TEST(ElementsAreArrayTest, TakesInitializerList) {
+  const int a[5] = { 1, 2, 3, 4, 5 };
+  EXPECT_THAT(a, ElementsAreArray({ 1, 2, 3, 4, 5 }));
+  EXPECT_THAT(a, Not(ElementsAreArray({ 1, 2, 3, 5, 4 })));
+  EXPECT_THAT(a, Not(ElementsAreArray({ 1, 2, 3, 4, 6 })));
+}
+
+TEST(ElementsAreArrayTest, TakesInitializerListOfCStrings) {
+  const string a[5] = { "a", "b", "c", "d", "e" };
+  EXPECT_THAT(a, ElementsAreArray({ "a", "b", "c", "d", "e" }));
+  EXPECT_THAT(a, Not(ElementsAreArray({ "a", "b", "c", "e", "d" })));
+  EXPECT_THAT(a, Not(ElementsAreArray({ "a", "b", "c", "d", "ef" })));
+}
+
+TEST(ElementsAreArrayTest, TakesInitializerListOfSameTypedMatchers) {
+  const int a[5] = { 1, 2, 3, 4, 5 };
+  EXPECT_THAT(a, ElementsAreArray(
+      { Eq(1), Eq(2), Eq(3), Eq(4), Eq(5) }));
+  EXPECT_THAT(a, Not(ElementsAreArray(
+      { Eq(1), Eq(2), Eq(3), Eq(4), Eq(6) })));
+}
+
+TEST(ElementsAreArrayTest,
+     TakesInitializerListOfDifferentTypedMatchers) {
+  const int a[5] = { 1, 2, 3, 4, 5 };
+  // The compiler cannot infer the type of the initializer list if its
+  // elements have different types.  We must explicitly specify the
+  // unified element type in this case.
+  EXPECT_THAT(a, ElementsAreArray<Matcher<int> >(
+      { Eq(1), Ne(-2), Ge(3), Le(4), Eq(5) }));
+  EXPECT_THAT(a, Not(ElementsAreArray<Matcher<int> >(
+      { Eq(1), Ne(-2), Ge(3), Le(4), Eq(6) })));
+}
+
+#endif  // GTEST_HAS_STD_INITIALIZER_LIST_
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithMatcherVector) {
+  const int a[] = { 1, 2, 3 };
+  const Matcher<int> kMatchers[] = { Eq(1), Eq(2), Eq(3) };
+  vector<int> test_vector(a, a + GTEST_ARRAY_SIZE_(a));
+  const vector<Matcher<int> > expected(
+      kMatchers, kMatchers + GTEST_ARRAY_SIZE_(kMatchers));
+  EXPECT_THAT(test_vector, ElementsAreArray(expected));
+  test_vector.push_back(4);
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(expected)));
+}
+
+TEST(ElementsAreArrayTest, CanBeCreatedWithIteratorRange) {
+  const int a[] = { 1, 2, 3 };
+  const vector<int> test_vector(a, a + GTEST_ARRAY_SIZE_(a));
+  const vector<int> expected(a, a + GTEST_ARRAY_SIZE_(a));
+  EXPECT_THAT(test_vector, ElementsAreArray(expected.begin(), expected.end()));
+  // Pointers are iterators, too.
+  EXPECT_THAT(test_vector, ElementsAreArray(a, a + GTEST_ARRAY_SIZE_(a)));
+  // The empty range of NULL pointers should also be okay.
+  int* const null_int = NULL;
+  EXPECT_THAT(test_vector, Not(ElementsAreArray(null_int, null_int)));
+  EXPECT_THAT((vector<int>()), ElementsAreArray(null_int, null_int));
+}
+
+// Since ElementsAre() and ElementsAreArray() share much of the
+// implementation, we only do a sanity test for native arrays here.
+TEST(ElementsAreArrayTest, WorksWithNativeArray) {
+  ::std::string a[] = { "hi", "ho" };
+  ::std::string b[] = { "hi", "ho" };
+
+  EXPECT_THAT(a, ElementsAreArray(b));
+  EXPECT_THAT(a, ElementsAreArray(b, 2));
+  EXPECT_THAT(a, Not(ElementsAreArray(b, 1)));
+}
+
+TEST(ElementsAreArrayTest, SourceLifeSpan) {
+  const int a[] = { 1, 2, 3 };
+  vector<int> test_vector(a, a + GTEST_ARRAY_SIZE_(a));
+  vector<int> expect(a, a + GTEST_ARRAY_SIZE_(a));
+  ElementsAreArrayMatcher<int> matcher_maker =
+      ElementsAreArray(expect.begin(), expect.end());
+  EXPECT_THAT(test_vector, matcher_maker);
+  // Changing in place the values that initialized matcher_maker should not
+  // affect matcher_maker anymore. It should have made its own copy of them.
+  typedef vector<int>::iterator Iter;
+  for (Iter it = expect.begin(); it != expect.end(); ++it) { *it += 10; }
+  EXPECT_THAT(test_vector, matcher_maker);
+  test_vector.push_back(3);
+  EXPECT_THAT(test_vector, Not(matcher_maker));
+}
+
+// Tests for the MATCHER*() macro family.
+
+// Tests that a simple MATCHER() definition works.
+
+MATCHER(IsEven, "") { return (arg % 2) == 0; }
+
+TEST(MatcherMacroTest, Works) {
+  const Matcher<int> m = IsEven();
+  EXPECT_TRUE(m.Matches(6));
+  EXPECT_FALSE(m.Matches(7));
+
+  EXPECT_EQ("is even", Describe(m));
+  EXPECT_EQ("not (is even)", DescribeNegation(m));
+  EXPECT_EQ("", Explain(m, 6));
+  EXPECT_EQ("", Explain(m, 7));
+}
+
+// This also tests that the description string can reference 'negation'.
+MATCHER(IsEven2, negation ? "is odd" : "is even") {
+  if ((arg % 2) == 0) {
+    // Verifies that we can stream to result_listener, a listener
+    // supplied by the MATCHER macro implicitly.
+    *result_listener << "OK";
+    return true;
+  } else {
+    *result_listener << "% 2 == " << (arg % 2);
+    return false;
+  }
+}
+
+// This also tests that the description string can reference matcher
+// parameters.
+MATCHER_P2(EqSumOf, x, y,
+           string(negation ? "doesn't equal" : "equals") + " the sum of " +
+           PrintToString(x) + " and " + PrintToString(y)) {
+  if (arg == (x + y)) {
+    *result_listener << "OK";
+    return true;
+  } else {
+    // Verifies that we can stream to the underlying stream of
+    // result_listener.
+    if (result_listener->stream() != NULL) {
+      *result_listener->stream() << "diff == " << (x + y - arg);
+    }
+    return false;
+  }
+}
+
+// Tests that the matcher description can reference 'negation' and the
+// matcher parameters.
+TEST(MatcherMacroTest, DescriptionCanReferenceNegationAndParameters) {
+  const Matcher<int> m1 = IsEven2();
+  EXPECT_EQ("is even", Describe(m1));
+  EXPECT_EQ("is odd", DescribeNegation(m1));
+
+  const Matcher<int> m2 = EqSumOf(5, 9);
+  EXPECT_EQ("equals the sum of 5 and 9", Describe(m2));
+  EXPECT_EQ("doesn't equal the sum of 5 and 9", DescribeNegation(m2));
+}
+
+// Tests explaining match result in a MATCHER* macro.
+TEST(MatcherMacroTest, CanExplainMatchResult) {
+  const Matcher<int> m1 = IsEven2();
+  EXPECT_EQ("OK", Explain(m1, 4));
+  EXPECT_EQ("% 2 == 1", Explain(m1, 5));
+
+  const Matcher<int> m2 = EqSumOf(1, 2);
+  EXPECT_EQ("OK", Explain(m2, 3));
+  EXPECT_EQ("diff == -1", Explain(m2, 4));
+}
+
+// Tests that the body of MATCHER() can reference the type of the
+// value being matched.
+
+MATCHER(IsEmptyString, "") {
+  StaticAssertTypeEq< ::std::string, arg_type>();
+  return arg == "";
+}
+
+MATCHER(IsEmptyStringByRef, "") {
+  StaticAssertTypeEq<const ::std::string&, arg_type>();
+  return arg == "";
+}
+
+TEST(MatcherMacroTest, CanReferenceArgType) {
+  const Matcher< ::std::string> m1 = IsEmptyString();
+  EXPECT_TRUE(m1.Matches(""));
+
+  const Matcher<const ::std::string&> m2 = IsEmptyStringByRef();
+  EXPECT_TRUE(m2.Matches(""));
+}
+
+// Tests that MATCHER() can be used in a namespace.
+
+namespace matcher_test {
+MATCHER(IsOdd, "") { return (arg % 2) != 0; }
+}  // namespace matcher_test
+
+TEST(MatcherMacroTest, WorksInNamespace) {
+  Matcher<int> m = matcher_test::IsOdd();
+  EXPECT_FALSE(m.Matches(4));
+  EXPECT_TRUE(m.Matches(5));
+}
+
+// Tests that Value() can be used to compose matchers.
+MATCHER(IsPositiveOdd, "") {
+  return Value(arg, matcher_test::IsOdd()) && arg > 0;
+}
+
+TEST(MatcherMacroTest, CanBeComposedUsingValue) {
+  EXPECT_THAT(3, IsPositiveOdd());
+  EXPECT_THAT(4, Not(IsPositiveOdd()));
+  EXPECT_THAT(-1, Not(IsPositiveOdd()));
+}
+
+// Tests that a simple MATCHER_P() definition works.
+
+MATCHER_P(IsGreaterThan32And, n, "") { return arg > 32 && arg > n; }
+
+TEST(MatcherPMacroTest, Works) {
+  const Matcher<int> m = IsGreaterThan32And(5);
+  EXPECT_TRUE(m.Matches(36));
+  EXPECT_FALSE(m.Matches(5));
+
+  EXPECT_EQ("is greater than 32 and 5", Describe(m));
+  EXPECT_EQ("not (is greater than 32 and 5)", DescribeNegation(m));
+  EXPECT_EQ("", Explain(m, 36));
+  EXPECT_EQ("", Explain(m, 5));
+}
+
+// Tests that the description is calculated correctly from the matcher name.
+MATCHER_P(_is_Greater_Than32and_, n, "") { return arg > 32 && arg > n; }
+
+TEST(MatcherPMacroTest, GeneratesCorrectDescription) {
+  const Matcher<int> m = _is_Greater_Than32and_(5);
+
+  EXPECT_EQ("is greater than 32 and 5", Describe(m));
+  EXPECT_EQ("not (is greater than 32 and 5)", DescribeNegation(m));
+  EXPECT_EQ("", Explain(m, 36));
+  EXPECT_EQ("", Explain(m, 5));
+}
+
+// Tests that a MATCHER_P matcher can be explicitly instantiated with
+// a reference parameter type.
+
+class UncopyableFoo {
+ public:
+  explicit UncopyableFoo(char value) : value_(value) {}
+ private:
+  UncopyableFoo(const UncopyableFoo&);
+  void operator=(const UncopyableFoo&);
+
+  char value_;
+};
+
+MATCHER_P(ReferencesUncopyable, variable, "") { return &arg == &variable; }
+
+TEST(MatcherPMacroTest, WorksWhenExplicitlyInstantiatedWithReference) {
+  UncopyableFoo foo1('1'), foo2('2');
+  const Matcher<const UncopyableFoo&> m =
+      ReferencesUncopyable<const UncopyableFoo&>(foo1);
+
+  EXPECT_TRUE(m.Matches(foo1));
+  EXPECT_FALSE(m.Matches(foo2));
+
+  // We don't want the address of the parameter printed, as most
+  // likely it will just annoy the user.  If the address is
+  // interesting, the user should consider passing the parameter by
+  // pointer instead.
+  EXPECT_EQ("references uncopyable 1-byte object <31>", Describe(m));
+}
+
+
+// Tests that the body of MATCHER_Pn() can reference the parameter
+// types.
+
+MATCHER_P3(ParamTypesAreIntLongAndChar, foo, bar, baz, "") {
+  StaticAssertTypeEq<int, foo_type>();
+  StaticAssertTypeEq<long, bar_type>();  // NOLINT
+  StaticAssertTypeEq<char, baz_type>();
+  return arg == 0;
+}
+
+TEST(MatcherPnMacroTest, CanReferenceParamTypes) {
+  EXPECT_THAT(0, ParamTypesAreIntLongAndChar(10, 20L, 'a'));
+}
+
+// Tests that a MATCHER_Pn matcher can be explicitly instantiated with
+// reference parameter types.
+
+MATCHER_P2(ReferencesAnyOf, variable1, variable2, "") {
+  return &arg == &variable1 || &arg == &variable2;
+}
+
+TEST(MatcherPnMacroTest, WorksWhenExplicitlyInstantiatedWithReferences) {
+  UncopyableFoo foo1('1'), foo2('2'), foo3('3');
+  const Matcher<const UncopyableFoo&> m =
+      ReferencesAnyOf<const UncopyableFoo&, const UncopyableFoo&>(foo1, foo2);
+
+  EXPECT_TRUE(m.Matches(foo1));
+  EXPECT_TRUE(m.Matches(foo2));
+  EXPECT_FALSE(m.Matches(foo3));
+}
+
+TEST(MatcherPnMacroTest,
+     GeneratesCorretDescriptionWhenExplicitlyInstantiatedWithReferences) {
+  UncopyableFoo foo1('1'), foo2('2');
+  const Matcher<const UncopyableFoo&> m =
+      ReferencesAnyOf<const UncopyableFoo&, const UncopyableFoo&>(foo1, foo2);
+
+  // We don't want the addresses of the parameters printed, as most
+  // likely they will just annoy the user.  If the addresses are
+  // interesting, the user should consider passing the parameters by
+  // pointers instead.
+  EXPECT_EQ("references any of (1-byte object <31>, 1-byte object <32>)",
+            Describe(m));
+}
+
+// Tests that a simple MATCHER_P2() definition works.
+
+MATCHER_P2(IsNotInClosedRange, low, hi, "") { return arg < low || arg > hi; }
+
+TEST(MatcherPnMacroTest, Works) {
+  const Matcher<const long&> m = IsNotInClosedRange(10, 20);  // NOLINT
+  EXPECT_TRUE(m.Matches(36L));
+  EXPECT_FALSE(m.Matches(15L));
+
+  EXPECT_EQ("is not in closed range (10, 20)", Describe(m));
+  EXPECT_EQ("not (is not in closed range (10, 20))", DescribeNegation(m));
+  EXPECT_EQ("", Explain(m, 36L));
+  EXPECT_EQ("", Explain(m, 15L));
+}
+
+// Tests that MATCHER*() definitions can be overloaded on the number
+// of parameters; also tests MATCHER_Pn() where n >= 3.
+
+MATCHER(EqualsSumOf, "") { return arg == 0; }
+MATCHER_P(EqualsSumOf, a, "") { return arg == a; }
+MATCHER_P2(EqualsSumOf, a, b, "") { return arg == a + b; }
+MATCHER_P3(EqualsSumOf, a, b, c, "") { return arg == a + b + c; }
+MATCHER_P4(EqualsSumOf, a, b, c, d, "") { return arg == a + b + c + d; }
+MATCHER_P5(EqualsSumOf, a, b, c, d, e, "") { return arg == a + b + c + d + e; }
+MATCHER_P6(EqualsSumOf, a, b, c, d, e, f, "") {
+  return arg == a + b + c + d + e + f;
+}
+MATCHER_P7(EqualsSumOf, a, b, c, d, e, f, g, "") {
+  return arg == a + b + c + d + e + f + g;
+}
+MATCHER_P8(EqualsSumOf, a, b, c, d, e, f, g, h, "") {
+  return arg == a + b + c + d + e + f + g + h;
+}
+MATCHER_P9(EqualsSumOf, a, b, c, d, e, f, g, h, i, "") {
+  return arg == a + b + c + d + e + f + g + h + i;
+}
+MATCHER_P10(EqualsSumOf, a, b, c, d, e, f, g, h, i, j, "") {
+  return arg == a + b + c + d + e + f + g + h + i + j;
+}
+
+TEST(MatcherPnMacroTest, CanBeOverloadedOnNumberOfParameters) {
+  EXPECT_THAT(0, EqualsSumOf());
+  EXPECT_THAT(1, EqualsSumOf(1));
+  EXPECT_THAT(12, EqualsSumOf(10, 2));
+  EXPECT_THAT(123, EqualsSumOf(100, 20, 3));
+  EXPECT_THAT(1234, EqualsSumOf(1000, 200, 30, 4));
+  EXPECT_THAT(12345, EqualsSumOf(10000, 2000, 300, 40, 5));
+  EXPECT_THAT("abcdef",
+              EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f'));
+  EXPECT_THAT("abcdefg",
+              EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g'));
+  EXPECT_THAT("abcdefgh",
+              EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g',
+                          "h"));
+  EXPECT_THAT("abcdefghi",
+              EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g',
+                          "h", 'i'));
+  EXPECT_THAT("abcdefghij",
+              EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g',
+                          "h", 'i', ::std::string("j")));
+
+  EXPECT_THAT(1, Not(EqualsSumOf()));
+  EXPECT_THAT(-1, Not(EqualsSumOf(1)));
+  EXPECT_THAT(-12, Not(EqualsSumOf(10, 2)));
+  EXPECT_THAT(-123, Not(EqualsSumOf(100, 20, 3)));
+  EXPECT_THAT(-1234, Not(EqualsSumOf(1000, 200, 30, 4)));
+  EXPECT_THAT(-12345, Not(EqualsSumOf(10000, 2000, 300, 40, 5)));
+  EXPECT_THAT("abcdef ",
+              Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f')));
+  EXPECT_THAT("abcdefg ",
+              Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f',
+                              'g')));
+  EXPECT_THAT("abcdefgh ",
+              Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g',
+                              "h")));
+  EXPECT_THAT("abcdefghi ",
+              Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g',
+                              "h", 'i')));
+  EXPECT_THAT("abcdefghij ",
+              Not(EqualsSumOf(::std::string("a"), 'b', 'c', "d", "e", 'f', 'g',
+                              "h", 'i', ::std::string("j"))));
+}
+
+// Tests that a MATCHER_Pn() definition can be instantiated with any
+// compatible parameter types.
+TEST(MatcherPnMacroTest, WorksForDifferentParameterTypes) {
+  EXPECT_THAT(123, EqualsSumOf(100L, 20, static_cast<char>(3)));
+  EXPECT_THAT("abcd", EqualsSumOf(::std::string("a"), "b", 'c', "d"));
+
+  EXPECT_THAT(124, Not(EqualsSumOf(100L, 20, static_cast<char>(3))));
+  EXPECT_THAT("abcde", Not(EqualsSumOf(::std::string("a"), "b", 'c', "d")));
+}
+
+// Tests that the matcher body can promote the parameter types.
+
+MATCHER_P2(EqConcat, prefix, suffix, "") {
+  // The following lines promote the two parameters to desired types.
+  std::string prefix_str(prefix);
+  char suffix_char = static_cast<char>(suffix);
+  return arg == prefix_str + suffix_char;
+}
+
+TEST(MatcherPnMacroTest, SimpleTypePromotion) {
+  Matcher<std::string> no_promo =
+      EqConcat(std::string("foo"), 't');
+  Matcher<const std::string&> promo =
+      EqConcat("foo", static_cast<int>('t'));
+  EXPECT_FALSE(no_promo.Matches("fool"));
+  EXPECT_FALSE(promo.Matches("fool"));
+  EXPECT_TRUE(no_promo.Matches("foot"));
+  EXPECT_TRUE(promo.Matches("foot"));
+}
+
+// Verifies the type of a MATCHER*.
+
+TEST(MatcherPnMacroTest, TypesAreCorrect) {
+  // EqualsSumOf() must be assignable to a EqualsSumOfMatcher variable.
+  EqualsSumOfMatcher a0 = EqualsSumOf();
+
+  // EqualsSumOf(1) must be assignable to a EqualsSumOfMatcherP variable.
+  EqualsSumOfMatcherP<int> a1 = EqualsSumOf(1);
+
+  // EqualsSumOf(p1, ..., pk) must be assignable to a EqualsSumOfMatcherPk
+  // variable, and so on.
+  EqualsSumOfMatcherP2<int, char> a2 = EqualsSumOf(1, '2');
+  EqualsSumOfMatcherP3<int, int, char> a3 = EqualsSumOf(1, 2, '3');
+  EqualsSumOfMatcherP4<int, int, int, char> a4 = EqualsSumOf(1, 2, 3, '4');
+  EqualsSumOfMatcherP5<int, int, int, int, char> a5 =
+      EqualsSumOf(1, 2, 3, 4, '5');
+  EqualsSumOfMatcherP6<int, int, int, int, int, char> a6 =
+      EqualsSumOf(1, 2, 3, 4, 5, '6');
+  EqualsSumOfMatcherP7<int, int, int, int, int, int, char> a7 =
+      EqualsSumOf(1, 2, 3, 4, 5, 6, '7');
+  EqualsSumOfMatcherP8<int, int, int, int, int, int, int, char> a8 =
+      EqualsSumOf(1, 2, 3, 4, 5, 6, 7, '8');
+  EqualsSumOfMatcherP9<int, int, int, int, int, int, int, int, char> a9 =
+      EqualsSumOf(1, 2, 3, 4, 5, 6, 7, 8, '9');
+  EqualsSumOfMatcherP10<int, int, int, int, int, int, int, int, int, char> a10 =
+      EqualsSumOf(1, 2, 3, 4, 5, 6, 7, 8, 9, '0');
+
+  // Avoid "unused variable" warnings.
+  (void)a0;
+  (void)a1;
+  (void)a2;
+  (void)a3;
+  (void)a4;
+  (void)a5;
+  (void)a6;
+  (void)a7;
+  (void)a8;
+  (void)a9;
+  (void)a10;
+}
+
+// Tests that matcher-typed parameters can be used in Value() inside a
+// MATCHER_Pn definition.
+
+// Succeeds if arg matches exactly 2 of the 3 matchers.
+MATCHER_P3(TwoOf, m1, m2, m3, "") {
+  const int count = static_cast<int>(Value(arg, m1))
+      + static_cast<int>(Value(arg, m2)) + static_cast<int>(Value(arg, m3));
+  return count == 2;
+}
+
+TEST(MatcherPnMacroTest, CanUseMatcherTypedParameterInValue) {
+  EXPECT_THAT(42, TwoOf(Gt(0), Lt(50), Eq(10)));
+  EXPECT_THAT(0, Not(TwoOf(Gt(-1), Lt(1), Eq(0))));
+}
+
+// Tests Contains().
+
+TEST(ContainsTest, ListMatchesWhenElementIsInContainer) {
+  list<int> some_list;
+  some_list.push_back(3);
+  some_list.push_back(1);
+  some_list.push_back(2);
+  EXPECT_THAT(some_list, Contains(1));
+  EXPECT_THAT(some_list, Contains(Gt(2.5)));
+  EXPECT_THAT(some_list, Contains(Eq(2.0f)));
+
+  list<string> another_list;
+  another_list.push_back("fee");
+  another_list.push_back("fie");
+  another_list.push_back("foe");
+  another_list.push_back("fum");
+  EXPECT_THAT(another_list, Contains(string("fee")));
+}
+
+TEST(ContainsTest, ListDoesNotMatchWhenElementIsNotInContainer) {
+  list<int> some_list;
+  some_list.push_back(3);
+  some_list.push_back(1);
+  EXPECT_THAT(some_list, Not(Contains(4)));
+}
+
+TEST(ContainsTest, SetMatchesWhenElementIsInContainer) {
+  set<int> some_set;
+  some_set.insert(3);
+  some_set.insert(1);
+  some_set.insert(2);
+  EXPECT_THAT(some_set, Contains(Eq(1.0)));
+  EXPECT_THAT(some_set, Contains(Eq(3.0f)));
+  EXPECT_THAT(some_set, Contains(2));
+
+  set<const char*> another_set;
+  another_set.insert("fee");
+  another_set.insert("fie");
+  another_set.insert("foe");
+  another_set.insert("fum");
+  EXPECT_THAT(another_set, Contains(Eq(string("fum"))));
+}
+
+TEST(ContainsTest, SetDoesNotMatchWhenElementIsNotInContainer) {
+  set<int> some_set;
+  some_set.insert(3);
+  some_set.insert(1);
+  EXPECT_THAT(some_set, Not(Contains(4)));
+
+  set<const char*> c_string_set;
+  c_string_set.insert("hello");
+  EXPECT_THAT(c_string_set, Not(Contains(string("hello").c_str())));
+}
+
+TEST(ContainsTest, ExplainsMatchResultCorrectly) {
+  const int a[2] = { 1, 2 };
+  Matcher<const int (&)[2]> m = Contains(2);
+  EXPECT_EQ("whose element #1 matches", Explain(m, a));
+
+  m = Contains(3);
+  EXPECT_EQ("", Explain(m, a));
+
+  m = Contains(GreaterThan(0));
+  EXPECT_EQ("whose element #0 matches, which is 1 more than 0", Explain(m, a));
+
+  m = Contains(GreaterThan(10));
+  EXPECT_EQ("", Explain(m, a));
+}
+
+TEST(ContainsTest, DescribesItselfCorrectly) {
+  Matcher<vector<int> > m = Contains(1);
+  EXPECT_EQ("contains at least one element that is equal to 1", Describe(m));
+
+  Matcher<vector<int> > m2 = Not(m);
+  EXPECT_EQ("doesn't contain any element that is equal to 1", Describe(m2));
+}
+
+TEST(ContainsTest, MapMatchesWhenElementIsInContainer) {
+  map<const char*, int> my_map;
+  const char* bar = "a string";
+  my_map[bar] = 2;
+  EXPECT_THAT(my_map, Contains(pair<const char* const, int>(bar, 2)));
+
+  map<string, int> another_map;
+  another_map["fee"] = 1;
+  another_map["fie"] = 2;
+  another_map["foe"] = 3;
+  another_map["fum"] = 4;
+  EXPECT_THAT(another_map, Contains(pair<const string, int>(string("fee"), 1)));
+  EXPECT_THAT(another_map, Contains(pair<const string, int>("fie", 2)));
+}
+
+TEST(ContainsTest, MapDoesNotMatchWhenElementIsNotInContainer) {
+  map<int, int> some_map;
+  some_map[1] = 11;
+  some_map[2] = 22;
+  EXPECT_THAT(some_map, Not(Contains(pair<const int, int>(2, 23))));
+}
+
+TEST(ContainsTest, ArrayMatchesWhenElementIsInContainer) {
+  const char* string_array[] = { "fee", "fie", "foe", "fum" };
+  EXPECT_THAT(string_array, Contains(Eq(string("fum"))));
+}
+
+TEST(ContainsTest, ArrayDoesNotMatchWhenElementIsNotInContainer) {
+  int int_array[] = { 1, 2, 3, 4 };
+  EXPECT_THAT(int_array, Not(Contains(5)));
+}
+
+TEST(ContainsTest, AcceptsMatcher) {
+  const int a[] = { 1, 2, 3 };
+  EXPECT_THAT(a, Contains(Gt(2)));
+  EXPECT_THAT(a, Not(Contains(Gt(4))));
+}
+
+TEST(ContainsTest, WorksForNativeArrayAsTuple) {
+  const int a[] = { 1, 2 };
+  const int* const pointer = a;
+  EXPECT_THAT(make_tuple(pointer, 2), Contains(1));
+  EXPECT_THAT(make_tuple(pointer, 2), Not(Contains(Gt(3))));
+}
+
+TEST(ContainsTest, WorksForTwoDimensionalNativeArray) {
+  int a[][3] = { { 1, 2, 3 }, { 4, 5, 6 } };
+  EXPECT_THAT(a, Contains(ElementsAre(4, 5, 6)));
+  EXPECT_THAT(a, Contains(Contains(5)));
+  EXPECT_THAT(a, Not(Contains(ElementsAre(3, 4, 5))));
+  EXPECT_THAT(a, Contains(Not(Contains(5))));
+}
+
+TEST(AllOfTest, HugeMatcher) {
+  // Verify that using AllOf with many arguments doesn't cause
+  // the compiler to exceed template instantiation depth limit.
+  EXPECT_THAT(0, testing::AllOf(_, _, _, _, _, _, _, _, _,
+                                testing::AllOf(_, _, _, _, _, _, _, _, _, _)));
+}
+
+TEST(AnyOfTest, HugeMatcher) {
+  // Verify that using AnyOf with many arguments doesn't cause
+  // the compiler to exceed template instantiation depth limit.
+  EXPECT_THAT(0, testing::AnyOf(_, _, _, _, _, _, _, _, _,
+                                testing::AnyOf(_, _, _, _, _, _, _, _, _, _)));
+}
+
+namespace adl_test {
+
+// Verifies that the implementation of ::testing::AllOf and ::testing::AnyOf
+// don't issue unqualified recursive calls.  If they do, the argument dependent
+// name lookup will cause AllOf/AnyOf in the 'adl_test' namespace to be found
+// as a candidate and the compilation will break due to an ambiguous overload.
+
+// The matcher must be in the same namespace as AllOf/AnyOf to make argument
+// dependent lookup find those.
+MATCHER(M, "") { return true; }
+
+template <typename T1, typename T2>
+bool AllOf(const T1& t1, const T2& t2) { return true; }
+
+TEST(AllOfTest, DoesNotCallAllOfUnqualified) {
+  EXPECT_THAT(42, testing::AllOf(
+      M(), M(), M(), M(), M(), M(), M(), M(), M(), M()));
+}
+
+template <typename T1, typename T2> bool
+AnyOf(const T1& t1, const T2& t2) { return true; }
+
+TEST(AnyOfTest, DoesNotCallAnyOfUnqualified) {
+  EXPECT_THAT(42, testing::AnyOf(
+      M(), M(), M(), M(), M(), M(), M(), M(), M(), M()));
+}
+
+}  // namespace adl_test
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+}  // namespace
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-internal-utils_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-internal-utils_test.cc
new file mode 100644
index 0000000000..9d5ec60927
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-internal-utils_test.cc
@@ -0,0 +1,699 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests the internal utilities.
+
+#include "gmock/internal/gmock-internal-utils.h"
+#include <stdlib.h>
+#include <map>
+#include <memory>
+#include <string>
+#include <sstream>
+#include <vector>
+#include "gmock/gmock.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+#if GTEST_OS_CYGWIN
+# include <sys/types.h>  // For ssize_t. NOLINT
+#endif
+
+class ProtocolMessage;
+
+namespace proto2 {
+class Message;
+}  // namespace proto2
+
+namespace testing {
+namespace internal {
+
+namespace {
+
+TEST(ConvertIdentifierNameToWordsTest, WorksWhenNameContainsNoWord) {
+  EXPECT_EQ("", ConvertIdentifierNameToWords(""));
+  EXPECT_EQ("", ConvertIdentifierNameToWords("_"));
+  EXPECT_EQ("", ConvertIdentifierNameToWords("__"));
+}
+
+TEST(ConvertIdentifierNameToWordsTest, WorksWhenNameContainsDigits) {
+  EXPECT_EQ("1", ConvertIdentifierNameToWords("_1"));
+  EXPECT_EQ("2", ConvertIdentifierNameToWords("2_"));
+  EXPECT_EQ("34", ConvertIdentifierNameToWords("_34_"));
+  EXPECT_EQ("34 56", ConvertIdentifierNameToWords("_34_56"));
+}
+
+TEST(ConvertIdentifierNameToWordsTest, WorksWhenNameContainsCamelCaseWords) {
+  EXPECT_EQ("a big word", ConvertIdentifierNameToWords("ABigWord"));
+  EXPECT_EQ("foo bar", ConvertIdentifierNameToWords("FooBar"));
+  EXPECT_EQ("foo", ConvertIdentifierNameToWords("Foo_"));
+  EXPECT_EQ("foo bar", ConvertIdentifierNameToWords("_Foo_Bar_"));
+  EXPECT_EQ("foo and bar", ConvertIdentifierNameToWords("_Foo__And_Bar"));
+}
+
+TEST(ConvertIdentifierNameToWordsTest, WorksWhenNameContains_SeparatedWords) {
+  EXPECT_EQ("foo bar", ConvertIdentifierNameToWords("foo_bar"));
+  EXPECT_EQ("foo", ConvertIdentifierNameToWords("_foo_"));
+  EXPECT_EQ("foo bar", ConvertIdentifierNameToWords("_foo_bar_"));
+  EXPECT_EQ("foo and bar", ConvertIdentifierNameToWords("_foo__and_bar"));
+}
+
+TEST(ConvertIdentifierNameToWordsTest, WorksWhenNameIsMixture) {
+  EXPECT_EQ("foo bar 123", ConvertIdentifierNameToWords("Foo_bar123"));
+  EXPECT_EQ("chapter 11 section 1",
+            ConvertIdentifierNameToWords("_Chapter11Section_1_"));
+}
+
+TEST(PointeeOfTest, WorksForSmartPointers) {
+  CompileAssertTypesEqual<const char,
+      PointeeOf<internal::linked_ptr<const char> >::type>();
+#if GTEST_HAS_STD_UNIQUE_PTR_
+  CompileAssertTypesEqual<int, PointeeOf<std::unique_ptr<int> >::type>();
+#endif  // GTEST_HAS_STD_UNIQUE_PTR_
+#if GTEST_HAS_STD_SHARED_PTR_
+  CompileAssertTypesEqual<std::string,
+                          PointeeOf<std::shared_ptr<std::string> >::type>();
+#endif  // GTEST_HAS_STD_SHARED_PTR_
+}
+
+TEST(PointeeOfTest, WorksForRawPointers) {
+  CompileAssertTypesEqual<int, PointeeOf<int*>::type>();
+  CompileAssertTypesEqual<const char, PointeeOf<const char*>::type>();
+  CompileAssertTypesEqual<void, PointeeOf<void*>::type>();
+}
+
+TEST(GetRawPointerTest, WorksForSmartPointers) {
+#if GTEST_HAS_STD_UNIQUE_PTR_
+  const char* const raw_p1 = new const char('a');  // NOLINT
+  const std::unique_ptr<const char> p1(raw_p1);
+  EXPECT_EQ(raw_p1, GetRawPointer(p1));
+#endif  // GTEST_HAS_STD_UNIQUE_PTR_
+#if GTEST_HAS_STD_SHARED_PTR_
+  double* const raw_p2 = new double(2.5);  // NOLINT
+  const std::shared_ptr<double> p2(raw_p2);
+  EXPECT_EQ(raw_p2, GetRawPointer(p2));
+#endif  // GTEST_HAS_STD_SHARED_PTR_
+
+  const char* const raw_p4 = new const char('a');  // NOLINT
+  const internal::linked_ptr<const char> p4(raw_p4);
+  EXPECT_EQ(raw_p4, GetRawPointer(p4));
+}
+
+TEST(GetRawPointerTest, WorksForRawPointers) {
+  int* p = NULL;
+  // Don't use EXPECT_EQ as no NULL-testing magic on Symbian.
+  EXPECT_TRUE(NULL == GetRawPointer(p));
+  int n = 1;
+  EXPECT_EQ(&n, GetRawPointer(&n));
+}
+
+// Tests KindOf<T>.
+
+class Base {};
+class Derived : public Base {};
+
+TEST(KindOfTest, Bool) {
+  EXPECT_EQ(kBool, GMOCK_KIND_OF_(bool));  // NOLINT
+}
+
+TEST(KindOfTest, Integer) {
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(char));  // NOLINT
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(signed char));  // NOLINT
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(unsigned char));  // NOLINT
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(short));  // NOLINT
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(unsigned short));  // NOLINT
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(int));  // NOLINT
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(unsigned int));  // NOLINT
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(long));  // NOLINT
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(unsigned long));  // NOLINT
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(wchar_t));  // NOLINT
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(Int64));  // NOLINT
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(UInt64));  // NOLINT
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(size_t));  // NOLINT
+#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN
+  // ssize_t is not defined on Windows and possibly some other OSes.
+  EXPECT_EQ(kInteger, GMOCK_KIND_OF_(ssize_t));  // NOLINT
+#endif
+}
+
+TEST(KindOfTest, FloatingPoint) {
+  EXPECT_EQ(kFloatingPoint, GMOCK_KIND_OF_(float));  // NOLINT
+  EXPECT_EQ(kFloatingPoint, GMOCK_KIND_OF_(double));  // NOLINT
+  EXPECT_EQ(kFloatingPoint, GMOCK_KIND_OF_(long double));  // NOLINT
+}
+
+TEST(KindOfTest, Other) {
+  EXPECT_EQ(kOther, GMOCK_KIND_OF_(void*));  // NOLINT
+  EXPECT_EQ(kOther, GMOCK_KIND_OF_(char**));  // NOLINT
+  EXPECT_EQ(kOther, GMOCK_KIND_OF_(Base));  // NOLINT
+}
+
+// Tests LosslessArithmeticConvertible<T, U>.
+
+TEST(LosslessArithmeticConvertibleTest, BoolToBool) {
+  EXPECT_TRUE((LosslessArithmeticConvertible<bool, bool>::value));
+}
+
+TEST(LosslessArithmeticConvertibleTest, BoolToInteger) {
+  EXPECT_TRUE((LosslessArithmeticConvertible<bool, char>::value));
+  EXPECT_TRUE((LosslessArithmeticConvertible<bool, int>::value));
+  EXPECT_TRUE(
+      (LosslessArithmeticConvertible<bool, unsigned long>::value));  // NOLINT
+}
+
+TEST(LosslessArithmeticConvertibleTest, BoolToFloatingPoint) {
+  EXPECT_TRUE((LosslessArithmeticConvertible<bool, float>::value));
+  EXPECT_TRUE((LosslessArithmeticConvertible<bool, double>::value));
+}
+
+TEST(LosslessArithmeticConvertibleTest, IntegerToBool) {
+  EXPECT_FALSE((LosslessArithmeticConvertible<unsigned char, bool>::value));
+  EXPECT_FALSE((LosslessArithmeticConvertible<int, bool>::value));
+}
+
+TEST(LosslessArithmeticConvertibleTest, IntegerToInteger) {
+  // Unsigned => larger signed is fine.
+  EXPECT_TRUE((LosslessArithmeticConvertible<unsigned char, int>::value));
+
+  // Unsigned => larger unsigned is fine.
+  EXPECT_TRUE(
+      (LosslessArithmeticConvertible<unsigned short, UInt64>::value)); // NOLINT
+
+  // Signed => unsigned is not fine.
+  EXPECT_FALSE((LosslessArithmeticConvertible<short, UInt64>::value)); // NOLINT
+  EXPECT_FALSE((LosslessArithmeticConvertible<
+      signed char, unsigned int>::value));  // NOLINT
+
+  // Same size and same signedness: fine too.
+  EXPECT_TRUE((LosslessArithmeticConvertible<
+               unsigned char, unsigned char>::value));
+  EXPECT_TRUE((LosslessArithmeticConvertible<int, int>::value));
+  EXPECT_TRUE((LosslessArithmeticConvertible<wchar_t, wchar_t>::value));
+  EXPECT_TRUE((LosslessArithmeticConvertible<
+               unsigned long, unsigned long>::value));  // NOLINT
+
+  // Same size, different signedness: not fine.
+  EXPECT_FALSE((LosslessArithmeticConvertible<
+                unsigned char, signed char>::value));
+  EXPECT_FALSE((LosslessArithmeticConvertible<int, unsigned int>::value));
+  EXPECT_FALSE((LosslessArithmeticConvertible<UInt64, Int64>::value));
+
+  // Larger size => smaller size is not fine.
+  EXPECT_FALSE((LosslessArithmeticConvertible<long, char>::value));  // NOLINT
+  EXPECT_FALSE((LosslessArithmeticConvertible<int, signed char>::value));
+  EXPECT_FALSE((LosslessArithmeticConvertible<Int64, unsigned int>::value));
+}
+
+TEST(LosslessArithmeticConvertibleTest, IntegerToFloatingPoint) {
+  // Integers cannot be losslessly converted to floating-points, as
+  // the format of the latter is implementation-defined.
+  EXPECT_FALSE((LosslessArithmeticConvertible<char, float>::value));
+  EXPECT_FALSE((LosslessArithmeticConvertible<int, double>::value));
+  EXPECT_FALSE((LosslessArithmeticConvertible<
+                short, long double>::value));  // NOLINT
+}
+
+TEST(LosslessArithmeticConvertibleTest, FloatingPointToBool) {
+  EXPECT_FALSE((LosslessArithmeticConvertible<float, bool>::value));
+  EXPECT_FALSE((LosslessArithmeticConvertible<double, bool>::value));
+}
+
+TEST(LosslessArithmeticConvertibleTest, FloatingPointToInteger) {
+  EXPECT_FALSE((LosslessArithmeticConvertible<float, long>::value));  // NOLINT
+  EXPECT_FALSE((LosslessArithmeticConvertible<double, Int64>::value));
+  EXPECT_FALSE((LosslessArithmeticConvertible<long double, int>::value));
+}
+
+TEST(LosslessArithmeticConvertibleTest, FloatingPointToFloatingPoint) {
+  // Smaller size => larger size is fine.
+  EXPECT_TRUE((LosslessArithmeticConvertible<float, double>::value));
+  EXPECT_TRUE((LosslessArithmeticConvertible<float, long double>::value));
+  EXPECT_TRUE((LosslessArithmeticConvertible<double, long double>::value));
+
+  // Same size: fine.
+  EXPECT_TRUE((LosslessArithmeticConvertible<float, float>::value));
+  EXPECT_TRUE((LosslessArithmeticConvertible<double, double>::value));
+
+  // Larger size => smaller size is not fine.
+  EXPECT_FALSE((LosslessArithmeticConvertible<double, float>::value));
+  GTEST_INTENTIONAL_CONST_COND_PUSH_()
+  if (sizeof(double) == sizeof(long double)) {  // NOLINT
+  GTEST_INTENTIONAL_CONST_COND_POP_()
+    // In some implementations (e.g. MSVC), double and long double
+    // have the same size.
+    EXPECT_TRUE((LosslessArithmeticConvertible<long double, double>::value));
+  } else {
+    EXPECT_FALSE((LosslessArithmeticConvertible<long double, double>::value));
+  }
+}
+
+// Tests the TupleMatches() template function.
+
+TEST(TupleMatchesTest, WorksForSize0) {
+  tuple<> matchers;
+  tuple<> values;
+
+  EXPECT_TRUE(TupleMatches(matchers, values));
+}
+
+TEST(TupleMatchesTest, WorksForSize1) {
+  tuple<Matcher<int> > matchers(Eq(1));
+  tuple<int> values1(1),
+      values2(2);
+
+  EXPECT_TRUE(TupleMatches(matchers, values1));
+  EXPECT_FALSE(TupleMatches(matchers, values2));
+}
+
+TEST(TupleMatchesTest, WorksForSize2) {
+  tuple<Matcher<int>, Matcher<char> > matchers(Eq(1), Eq('a'));
+  tuple<int, char> values1(1, 'a'),
+      values2(1, 'b'),
+      values3(2, 'a'),
+      values4(2, 'b');
+
+  EXPECT_TRUE(TupleMatches(matchers, values1));
+  EXPECT_FALSE(TupleMatches(matchers, values2));
+  EXPECT_FALSE(TupleMatches(matchers, values3));
+  EXPECT_FALSE(TupleMatches(matchers, values4));
+}
+
+TEST(TupleMatchesTest, WorksForSize5) {
+  tuple<Matcher<int>, Matcher<char>, Matcher<bool>, Matcher<long>,  // NOLINT
+      Matcher<string> >
+      matchers(Eq(1), Eq('a'), Eq(true), Eq(2L), Eq("hi"));
+  tuple<int, char, bool, long, string>  // NOLINT
+      values1(1, 'a', true, 2L, "hi"),
+      values2(1, 'a', true, 2L, "hello"),
+      values3(2, 'a', true, 2L, "hi");
+
+  EXPECT_TRUE(TupleMatches(matchers, values1));
+  EXPECT_FALSE(TupleMatches(matchers, values2));
+  EXPECT_FALSE(TupleMatches(matchers, values3));
+}
+
+// Tests that Assert(true, ...) succeeds.
+TEST(AssertTest, SucceedsOnTrue) {
+  Assert(true, __FILE__, __LINE__, "This should succeed.");
+  Assert(true, __FILE__, __LINE__);  // This should succeed too.
+}
+
+// Tests that Assert(false, ...) generates a fatal failure.
+TEST(AssertTest, FailsFatallyOnFalse) {
+  EXPECT_DEATH_IF_SUPPORTED({
+    Assert(false, __FILE__, __LINE__, "This should fail.");
+  }, "");
+
+  EXPECT_DEATH_IF_SUPPORTED({
+    Assert(false, __FILE__, __LINE__);
+  }, "");
+}
+
+// Tests that Expect(true, ...) succeeds.
+TEST(ExpectTest, SucceedsOnTrue) {
+  Expect(true, __FILE__, __LINE__, "This should succeed.");
+  Expect(true, __FILE__, __LINE__);  // This should succeed too.
+}
+
+// Tests that Expect(false, ...) generates a non-fatal failure.
+TEST(ExpectTest, FailsNonfatallyOnFalse) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    Expect(false, __FILE__, __LINE__, "This should fail.");
+  }, "This should fail");
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    Expect(false, __FILE__, __LINE__);
+  }, "Expectation failed");
+}
+
+// Tests LogIsVisible().
+
+class LogIsVisibleTest : public ::testing::Test {
+ protected:
+  virtual void SetUp() {
+    original_verbose_ = GMOCK_FLAG(verbose);
+  }
+
+  virtual void TearDown() { GMOCK_FLAG(verbose) = original_verbose_; }
+
+  string original_verbose_;
+};
+
+TEST_F(LogIsVisibleTest, AlwaysReturnsTrueIfVerbosityIsInfo) {
+  GMOCK_FLAG(verbose) = kInfoVerbosity;
+  EXPECT_TRUE(LogIsVisible(kInfo));
+  EXPECT_TRUE(LogIsVisible(kWarning));
+}
+
+TEST_F(LogIsVisibleTest, AlwaysReturnsFalseIfVerbosityIsError) {
+  GMOCK_FLAG(verbose) = kErrorVerbosity;
+  EXPECT_FALSE(LogIsVisible(kInfo));
+  EXPECT_FALSE(LogIsVisible(kWarning));
+}
+
+TEST_F(LogIsVisibleTest, WorksWhenVerbosityIsWarning) {
+  GMOCK_FLAG(verbose) = kWarningVerbosity;
+  EXPECT_FALSE(LogIsVisible(kInfo));
+  EXPECT_TRUE(LogIsVisible(kWarning));
+}
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Tests the Log() function.
+
+// Verifies that Log() behaves correctly for the given verbosity level
+// and log severity.
+void TestLogWithSeverity(const string& verbosity, LogSeverity severity,
+                         bool should_print) {
+  const string old_flag = GMOCK_FLAG(verbose);
+  GMOCK_FLAG(verbose) = verbosity;
+  CaptureStdout();
+  Log(severity, "Test log.\n", 0);
+  if (should_print) {
+    EXPECT_THAT(GetCapturedStdout().c_str(),
+                ContainsRegex(
+                    severity == kWarning ?
+                    "^\nGMOCK WARNING:\nTest log\\.\nStack trace:\n" :
+                    "^\nTest log\\.\nStack trace:\n"));
+  } else {
+    EXPECT_STREQ("", GetCapturedStdout().c_str());
+  }
+  GMOCK_FLAG(verbose) = old_flag;
+}
+
+// Tests that when the stack_frames_to_skip parameter is negative,
+// Log() doesn't include the stack trace in the output.
+TEST(LogTest, NoStackTraceWhenStackFramesToSkipIsNegative) {
+  const string saved_flag = GMOCK_FLAG(verbose);
+  GMOCK_FLAG(verbose) = kInfoVerbosity;
+  CaptureStdout();
+  Log(kInfo, "Test log.\n", -1);
+  EXPECT_STREQ("\nTest log.\n", GetCapturedStdout().c_str());
+  GMOCK_FLAG(verbose) = saved_flag;
+}
+
+struct MockStackTraceGetter : testing::internal::OsStackTraceGetterInterface {
+  virtual string CurrentStackTrace(int max_depth, int skip_count) {
+    return (testing::Message() << max_depth << "::" << skip_count << "\n")
+        .GetString();
+  }
+  virtual void UponLeavingGTest() {}
+};
+
+// Tests that in opt mode, a positive stack_frames_to_skip argument is
+// treated as 0.
+TEST(LogTest, NoSkippingStackFrameInOptMode) {
+  MockStackTraceGetter* mock_os_stack_trace_getter = new MockStackTraceGetter;
+  GetUnitTestImpl()->set_os_stack_trace_getter(mock_os_stack_trace_getter);
+
+  CaptureStdout();
+  Log(kWarning, "Test log.\n", 100);
+  const string log = GetCapturedStdout();
+
+  string expected_trace =
+      (testing::Message() << GTEST_FLAG(stack_trace_depth) << "::").GetString();
+  string expected_message =
+      "\nGMOCK WARNING:\n"
+      "Test log.\n"
+      "Stack trace:\n" +
+      expected_trace;
+  EXPECT_THAT(log, HasSubstr(expected_message));
+  int skip_count = atoi(log.substr(expected_message.size()).c_str());
+
+# if defined(NDEBUG)
+  // In opt mode, no stack frame should be skipped.
+  const int expected_skip_count = 0;
+# else
+  // In dbg mode, the stack frames should be skipped.
+  const int expected_skip_count = 100;
+# endif
+
+  // Note that each inner implementation layer will +1 the number to remove
+  // itself from the trace. This means that the value is a little higher than
+  // expected, but close enough.
+  EXPECT_THAT(skip_count,
+              AllOf(Ge(expected_skip_count), Le(expected_skip_count + 10)));
+
+  // Restores the default OS stack trace getter.
+  GetUnitTestImpl()->set_os_stack_trace_getter(NULL);
+}
+
+// Tests that all logs are printed when the value of the
+// --gmock_verbose flag is "info".
+TEST(LogTest, AllLogsArePrintedWhenVerbosityIsInfo) {
+  TestLogWithSeverity(kInfoVerbosity, kInfo, true);
+  TestLogWithSeverity(kInfoVerbosity, kWarning, true);
+}
+
+// Tests that only warnings are printed when the value of the
+// --gmock_verbose flag is "warning".
+TEST(LogTest, OnlyWarningsArePrintedWhenVerbosityIsWarning) {
+  TestLogWithSeverity(kWarningVerbosity, kInfo, false);
+  TestLogWithSeverity(kWarningVerbosity, kWarning, true);
+}
+
+// Tests that no logs are printed when the value of the
+// --gmock_verbose flag is "error".
+TEST(LogTest, NoLogsArePrintedWhenVerbosityIsError) {
+  TestLogWithSeverity(kErrorVerbosity, kInfo, false);
+  TestLogWithSeverity(kErrorVerbosity, kWarning, false);
+}
+
+// Tests that only warnings are printed when the value of the
+// --gmock_verbose flag is invalid.
+TEST(LogTest, OnlyWarningsArePrintedWhenVerbosityIsInvalid) {
+  TestLogWithSeverity("invalid", kInfo, false);
+  TestLogWithSeverity("invalid", kWarning, true);
+}
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+TEST(TypeTraitsTest, true_type) {
+  EXPECT_TRUE(true_type::value);
+}
+
+TEST(TypeTraitsTest, false_type) {
+  EXPECT_FALSE(false_type::value);
+}
+
+TEST(TypeTraitsTest, is_reference) {
+  EXPECT_FALSE(is_reference<int>::value);
+  EXPECT_FALSE(is_reference<char*>::value);
+  EXPECT_TRUE(is_reference<const int&>::value);
+}
+
+TEST(TypeTraitsTest, is_pointer) {
+  EXPECT_FALSE(is_pointer<int>::value);
+  EXPECT_FALSE(is_pointer<char&>::value);
+  EXPECT_TRUE(is_pointer<const int*>::value);
+}
+
+TEST(TypeTraitsTest, type_equals) {
+  EXPECT_FALSE((type_equals<int, const int>::value));
+  EXPECT_FALSE((type_equals<int, int&>::value));
+  EXPECT_FALSE((type_equals<int, double>::value));
+  EXPECT_TRUE((type_equals<char, char>::value));
+}
+
+TEST(TypeTraitsTest, remove_reference) {
+  EXPECT_TRUE((type_equals<char, remove_reference<char&>::type>::value));
+  EXPECT_TRUE((type_equals<const int,
+               remove_reference<const int&>::type>::value));
+  EXPECT_TRUE((type_equals<int, remove_reference<int>::type>::value));
+  EXPECT_TRUE((type_equals<double*, remove_reference<double*>::type>::value));
+}
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Verifies that Log() behaves correctly for the given verbosity level
+// and log severity.
+std::string GrabOutput(void(*logger)(), const char* verbosity) {
+  const string saved_flag = GMOCK_FLAG(verbose);
+  GMOCK_FLAG(verbose) = verbosity;
+  CaptureStdout();
+  logger();
+  GMOCK_FLAG(verbose) = saved_flag;
+  return GetCapturedStdout();
+}
+
+class DummyMock {
+ public:
+  MOCK_METHOD0(TestMethod, void());
+  MOCK_METHOD1(TestMethodArg, void(int dummy));
+};
+
+void ExpectCallLogger() {
+  DummyMock mock;
+  EXPECT_CALL(mock, TestMethod());
+  mock.TestMethod();
+};
+
+// Verifies that EXPECT_CALL logs if the --gmock_verbose flag is set to "info".
+TEST(ExpectCallTest, LogsWhenVerbosityIsInfo) {
+  EXPECT_THAT(std::string(GrabOutput(ExpectCallLogger, kInfoVerbosity)),
+              HasSubstr("EXPECT_CALL(mock, TestMethod())"));
+}
+
+// Verifies that EXPECT_CALL doesn't log
+// if the --gmock_verbose flag is set to "warning".
+TEST(ExpectCallTest, DoesNotLogWhenVerbosityIsWarning) {
+  EXPECT_STREQ("", GrabOutput(ExpectCallLogger, kWarningVerbosity).c_str());
+}
+
+// Verifies that EXPECT_CALL doesn't log
+// if the --gmock_verbose flag is set to "error".
+TEST(ExpectCallTest,  DoesNotLogWhenVerbosityIsError) {
+  EXPECT_STREQ("", GrabOutput(ExpectCallLogger, kErrorVerbosity).c_str());
+}
+
+void OnCallLogger() {
+  DummyMock mock;
+  ON_CALL(mock, TestMethod());
+};
+
+// Verifies that ON_CALL logs if the --gmock_verbose flag is set to "info".
+TEST(OnCallTest, LogsWhenVerbosityIsInfo) {
+  EXPECT_THAT(std::string(GrabOutput(OnCallLogger, kInfoVerbosity)),
+              HasSubstr("ON_CALL(mock, TestMethod())"));
+}
+
+// Verifies that ON_CALL doesn't log
+// if the --gmock_verbose flag is set to "warning".
+TEST(OnCallTest, DoesNotLogWhenVerbosityIsWarning) {
+  EXPECT_STREQ("", GrabOutput(OnCallLogger, kWarningVerbosity).c_str());
+}
+
+// Verifies that ON_CALL doesn't log if
+// the --gmock_verbose flag is set to "error".
+TEST(OnCallTest, DoesNotLogWhenVerbosityIsError) {
+  EXPECT_STREQ("", GrabOutput(OnCallLogger, kErrorVerbosity).c_str());
+}
+
+void OnCallAnyArgumentLogger() {
+  DummyMock mock;
+  ON_CALL(mock, TestMethodArg(_));
+}
+
+// Verifies that ON_CALL prints provided _ argument.
+TEST(OnCallTest, LogsAnythingArgument) {
+  EXPECT_THAT(std::string(GrabOutput(OnCallAnyArgumentLogger, kInfoVerbosity)),
+              HasSubstr("ON_CALL(mock, TestMethodArg(_)"));
+}
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+// Tests StlContainerView.
+
+TEST(StlContainerViewTest, WorksForStlContainer) {
+  StaticAssertTypeEq<std::vector<int>,
+      StlContainerView<std::vector<int> >::type>();
+  StaticAssertTypeEq<const std::vector<double>&,
+      StlContainerView<std::vector<double> >::const_reference>();
+
+  typedef std::vector<char> Chars;
+  Chars v1;
+  const Chars& v2(StlContainerView<Chars>::ConstReference(v1));
+  EXPECT_EQ(&v1, &v2);
+
+  v1.push_back('a');
+  Chars v3 = StlContainerView<Chars>::Copy(v1);
+  EXPECT_THAT(v3, Eq(v3));
+}
+
+TEST(StlContainerViewTest, WorksForStaticNativeArray) {
+  StaticAssertTypeEq<NativeArray<int>,
+      StlContainerView<int[3]>::type>();
+  StaticAssertTypeEq<NativeArray<double>,
+      StlContainerView<const double[4]>::type>();
+  StaticAssertTypeEq<NativeArray<char[3]>,
+      StlContainerView<const char[2][3]>::type>();
+
+  StaticAssertTypeEq<const NativeArray<int>,
+      StlContainerView<int[2]>::const_reference>();
+
+  int a1[3] = { 0, 1, 2 };
+  NativeArray<int> a2 = StlContainerView<int[3]>::ConstReference(a1);
+  EXPECT_EQ(3U, a2.size());
+  EXPECT_EQ(a1, a2.begin());
+
+  const NativeArray<int> a3 = StlContainerView<int[3]>::Copy(a1);
+  ASSERT_EQ(3U, a3.size());
+  EXPECT_EQ(0, a3.begin()[0]);
+  EXPECT_EQ(1, a3.begin()[1]);
+  EXPECT_EQ(2, a3.begin()[2]);
+
+  // Makes sure a1 and a3 aren't aliases.
+  a1[0] = 3;
+  EXPECT_EQ(0, a3.begin()[0]);
+}
+
+TEST(StlContainerViewTest, WorksForDynamicNativeArray) {
+  StaticAssertTypeEq<NativeArray<int>,
+      StlContainerView<tuple<const int*, size_t> >::type>();
+  StaticAssertTypeEq<NativeArray<double>,
+      StlContainerView<tuple<linked_ptr<double>, int> >::type>();
+
+  StaticAssertTypeEq<const NativeArray<int>,
+      StlContainerView<tuple<const int*, int> >::const_reference>();
+
+  int a1[3] = { 0, 1, 2 };
+  const int* const p1 = a1;
+  NativeArray<int> a2 = StlContainerView<tuple<const int*, int> >::
+      ConstReference(make_tuple(p1, 3));
+  EXPECT_EQ(3U, a2.size());
+  EXPECT_EQ(a1, a2.begin());
+
+  const NativeArray<int> a3 = StlContainerView<tuple<int*, size_t> >::
+      Copy(make_tuple(static_cast<int*>(a1), 3));
+  ASSERT_EQ(3U, a3.size());
+  EXPECT_EQ(0, a3.begin()[0]);
+  EXPECT_EQ(1, a3.begin()[1]);
+  EXPECT_EQ(2, a3.begin()[2]);
+
+  // Makes sure a1 and a3 aren't aliases.
+  a1[0] = 3;
+  EXPECT_EQ(0, a3.begin()[0]);
+}
+
+}  // namespace
+}  // namespace internal
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-matchers_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-matchers_test.cc
new file mode 100644
index 0000000000..9f62c3d826
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-matchers_test.cc
@@ -0,0 +1,5652 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests some commonly used argument matchers.
+
+#include "gmock/gmock-matchers.h"
+#include "gmock/gmock-more-matchers.h"
+
+#include <string.h>
+#include <time.h>
+#include <deque>
+#include <functional>
+#include <iostream>
+#include <iterator>
+#include <limits>
+#include <list>
+#include <map>
+#include <set>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+
+#if GTEST_HAS_STD_FORWARD_LIST_
+# include <forward_list>  // NOLINT
+#endif
+
+namespace testing {
+
+namespace internal {
+GTEST_API_ string JoinAsTuple(const Strings& fields);
+}  // namespace internal
+
+namespace gmock_matchers_test {
+
+using std::greater;
+using std::less;
+using std::list;
+using std::make_pair;
+using std::map;
+using std::multimap;
+using std::multiset;
+using std::ostream;
+using std::pair;
+using std::set;
+using std::stringstream;
+using std::vector;
+using testing::A;
+using testing::AllArgs;
+using testing::AllOf;
+using testing::An;
+using testing::AnyOf;
+using testing::ByRef;
+using testing::ContainsRegex;
+using testing::DoubleEq;
+using testing::DoubleNear;
+using testing::EndsWith;
+using testing::Eq;
+using testing::ExplainMatchResult;
+using testing::Field;
+using testing::FloatEq;
+using testing::FloatNear;
+using testing::Ge;
+using testing::Gt;
+using testing::HasSubstr;
+using testing::IsEmpty;
+using testing::IsNull;
+using testing::Key;
+using testing::Le;
+using testing::Lt;
+using testing::MakeMatcher;
+using testing::MakePolymorphicMatcher;
+using testing::MatchResultListener;
+using testing::Matcher;
+using testing::MatcherCast;
+using testing::MatcherInterface;
+using testing::Matches;
+using testing::MatchesRegex;
+using testing::NanSensitiveDoubleEq;
+using testing::NanSensitiveDoubleNear;
+using testing::NanSensitiveFloatEq;
+using testing::NanSensitiveFloatNear;
+using testing::Ne;
+using testing::Not;
+using testing::NotNull;
+using testing::Pair;
+using testing::Pointee;
+using testing::Pointwise;
+using testing::PolymorphicMatcher;
+using testing::Property;
+using testing::Ref;
+using testing::ResultOf;
+using testing::SizeIs;
+using testing::StartsWith;
+using testing::StrCaseEq;
+using testing::StrCaseNe;
+using testing::StrEq;
+using testing::StrNe;
+using testing::StringMatchResultListener;
+using testing::Truly;
+using testing::TypedEq;
+using testing::UnorderedPointwise;
+using testing::Value;
+using testing::WhenSorted;
+using testing::WhenSortedBy;
+using testing::_;
+using testing::get;
+using testing::internal::DummyMatchResultListener;
+using testing::internal::ElementMatcherPair;
+using testing::internal::ElementMatcherPairs;
+using testing::internal::ExplainMatchFailureTupleTo;
+using testing::internal::FloatingEqMatcher;
+using testing::internal::FormatMatcherDescription;
+using testing::internal::IsReadableTypeName;
+using testing::internal::JoinAsTuple;
+using testing::internal::linked_ptr;
+using testing::internal::MatchMatrix;
+using testing::internal::RE;
+using testing::internal::scoped_ptr;
+using testing::internal::StreamMatchResultListener;
+using testing::internal::Strings;
+using testing::internal::linked_ptr;
+using testing::internal::scoped_ptr;
+using testing::internal::string;
+using testing::make_tuple;
+using testing::tuple;
+
+// For testing ExplainMatchResultTo().
+class GreaterThanMatcher : public MatcherInterface<int> {
+ public:
+  explicit GreaterThanMatcher(int rhs) : rhs_(rhs) {}
+
+  virtual void DescribeTo(ostream* os) const {
+    *os << "is > " << rhs_;
+  }
+
+  virtual bool MatchAndExplain(int lhs,
+                               MatchResultListener* listener) const {
+    const int diff = lhs - rhs_;
+    if (diff > 0) {
+      *listener << "which is " << diff << " more than " << rhs_;
+    } else if (diff == 0) {
+      *listener << "which is the same as " << rhs_;
+    } else {
+      *listener << "which is " << -diff << " less than " << rhs_;
+    }
+
+    return lhs > rhs_;
+  }
+
+ private:
+  int rhs_;
+};
+
+Matcher<int> GreaterThan(int n) {
+  return MakeMatcher(new GreaterThanMatcher(n));
+}
+
+string OfType(const string& type_name) {
+#if GTEST_HAS_RTTI
+  return " (of type " + type_name + ")";
+#else
+  return "";
+#endif
+}
+
+// Returns the description of the given matcher.
+template <typename T>
+string Describe(const Matcher<T>& m) {
+  stringstream ss;
+  m.DescribeTo(&ss);
+  return ss.str();
+}
+
+// Returns the description of the negation of the given matcher.
+template <typename T>
+string DescribeNegation(const Matcher<T>& m) {
+  stringstream ss;
+  m.DescribeNegationTo(&ss);
+  return ss.str();
+}
+
+// Returns the reason why x matches, or doesn't match, m.
+template <typename MatcherType, typename Value>
+string Explain(const MatcherType& m, const Value& x) {
+  StringMatchResultListener listener;
+  ExplainMatchResult(m, x, &listener);
+  return listener.str();
+}
+
+TEST(MatchResultListenerTest, StreamingWorks) {
+  StringMatchResultListener listener;
+  listener << "hi" << 5;
+  EXPECT_EQ("hi5", listener.str());
+
+  listener.Clear();
+  EXPECT_EQ("", listener.str());
+
+  listener << 42;
+  EXPECT_EQ("42", listener.str());
+
+  // Streaming shouldn't crash when the underlying ostream is NULL.
+  DummyMatchResultListener dummy;
+  dummy << "hi" << 5;
+}
+
+TEST(MatchResultListenerTest, CanAccessUnderlyingStream) {
+  EXPECT_TRUE(DummyMatchResultListener().stream() == NULL);
+  EXPECT_TRUE(StreamMatchResultListener(NULL).stream() == NULL);
+
+  EXPECT_EQ(&std::cout, StreamMatchResultListener(&std::cout).stream());
+}
+
+TEST(MatchResultListenerTest, IsInterestedWorks) {
+  EXPECT_TRUE(StringMatchResultListener().IsInterested());
+  EXPECT_TRUE(StreamMatchResultListener(&std::cout).IsInterested());
+
+  EXPECT_FALSE(DummyMatchResultListener().IsInterested());
+  EXPECT_FALSE(StreamMatchResultListener(NULL).IsInterested());
+}
+
+// Makes sure that the MatcherInterface<T> interface doesn't
+// change.
+class EvenMatcherImpl : public MatcherInterface<int> {
+ public:
+  virtual bool MatchAndExplain(int x,
+                               MatchResultListener* /* listener */) const {
+    return x % 2 == 0;
+  }
+
+  virtual void DescribeTo(ostream* os) const {
+    *os << "is an even number";
+  }
+
+  // We deliberately don't define DescribeNegationTo() and
+  // ExplainMatchResultTo() here, to make sure the definition of these
+  // two methods is optional.
+};
+
+// Makes sure that the MatcherInterface API doesn't change.
+TEST(MatcherInterfaceTest, CanBeImplementedUsingPublishedAPI) {
+  EvenMatcherImpl m;
+}
+
+// Tests implementing a monomorphic matcher using MatchAndExplain().
+
+class NewEvenMatcherImpl : public MatcherInterface<int> {
+ public:
+  virtual bool MatchAndExplain(int x, MatchResultListener* listener) const {
+    const bool match = x % 2 == 0;
+    // Verifies that we can stream to a listener directly.
+    *listener << "value % " << 2;
+    if (listener->stream() != NULL) {
+      // Verifies that we can stream to a listener's underlying stream
+      // too.
+      *listener->stream() << " == " << (x % 2);
+    }
+    return match;
+  }
+
+  virtual void DescribeTo(ostream* os) const {
+    *os << "is an even number";
+  }
+};
+
+TEST(MatcherInterfaceTest, CanBeImplementedUsingNewAPI) {
+  Matcher<int> m = MakeMatcher(new NewEvenMatcherImpl);
+  EXPECT_TRUE(m.Matches(2));
+  EXPECT_FALSE(m.Matches(3));
+  EXPECT_EQ("value % 2 == 0", Explain(m, 2));
+  EXPECT_EQ("value % 2 == 1", Explain(m, 3));
+}
+
+// Tests default-constructing a matcher.
+TEST(MatcherTest, CanBeDefaultConstructed) {
+  Matcher<double> m;
+}
+
+// Tests that Matcher<T> can be constructed from a MatcherInterface<T>*.
+TEST(MatcherTest, CanBeConstructedFromMatcherInterface) {
+  const MatcherInterface<int>* impl = new EvenMatcherImpl;
+  Matcher<int> m(impl);
+  EXPECT_TRUE(m.Matches(4));
+  EXPECT_FALSE(m.Matches(5));
+}
+
+// Tests that value can be used in place of Eq(value).
+TEST(MatcherTest, CanBeImplicitlyConstructedFromValue) {
+  Matcher<int> m1 = 5;
+  EXPECT_TRUE(m1.Matches(5));
+  EXPECT_FALSE(m1.Matches(6));
+}
+
+// Tests that NULL can be used in place of Eq(NULL).
+TEST(MatcherTest, CanBeImplicitlyConstructedFromNULL) {
+  Matcher<int*> m1 = NULL;
+  EXPECT_TRUE(m1.Matches(NULL));
+  int n = 0;
+  EXPECT_FALSE(m1.Matches(&n));
+}
+
+// Tests that matchers are copyable.
+TEST(MatcherTest, IsCopyable) {
+  // Tests the copy constructor.
+  Matcher<bool> m1 = Eq(false);
+  EXPECT_TRUE(m1.Matches(false));
+  EXPECT_FALSE(m1.Matches(true));
+
+  // Tests the assignment operator.
+  m1 = Eq(true);
+  EXPECT_TRUE(m1.Matches(true));
+  EXPECT_FALSE(m1.Matches(false));
+}
+
+// Tests that Matcher<T>::DescribeTo() calls
+// MatcherInterface<T>::DescribeTo().
+TEST(MatcherTest, CanDescribeItself) {
+  EXPECT_EQ("is an even number",
+            Describe(Matcher<int>(new EvenMatcherImpl)));
+}
+
+// Tests Matcher<T>::MatchAndExplain().
+TEST(MatcherTest, MatchAndExplain) {
+  Matcher<int> m = GreaterThan(0);
+  StringMatchResultListener listener1;
+  EXPECT_TRUE(m.MatchAndExplain(42, &listener1));
+  EXPECT_EQ("which is 42 more than 0", listener1.str());
+
+  StringMatchResultListener listener2;
+  EXPECT_FALSE(m.MatchAndExplain(-9, &listener2));
+  EXPECT_EQ("which is 9 less than 0", listener2.str());
+}
+
+// Tests that a C-string literal can be implicitly converted to a
+// Matcher<string> or Matcher<const string&>.
+TEST(StringMatcherTest, CanBeImplicitlyConstructedFromCStringLiteral) {
+  Matcher<string> m1 = "hi";
+  EXPECT_TRUE(m1.Matches("hi"));
+  EXPECT_FALSE(m1.Matches("hello"));
+
+  Matcher<const string&> m2 = "hi";
+  EXPECT_TRUE(m2.Matches("hi"));
+  EXPECT_FALSE(m2.Matches("hello"));
+}
+
+// Tests that a string object can be implicitly converted to a
+// Matcher<string> or Matcher<const string&>.
+TEST(StringMatcherTest, CanBeImplicitlyConstructedFromString) {
+  Matcher<string> m1 = string("hi");
+  EXPECT_TRUE(m1.Matches("hi"));
+  EXPECT_FALSE(m1.Matches("hello"));
+
+  Matcher<const string&> m2 = string("hi");
+  EXPECT_TRUE(m2.Matches("hi"));
+  EXPECT_FALSE(m2.Matches("hello"));
+}
+
+#if GTEST_HAS_STRING_PIECE_
+// Tests that a C-string literal can be implicitly converted to a
+// Matcher<StringPiece> or Matcher<const StringPiece&>.
+TEST(StringPieceMatcherTest, CanBeImplicitlyConstructedFromCStringLiteral) {
+  Matcher<StringPiece> m1 = "cats";
+  EXPECT_TRUE(m1.Matches("cats"));
+  EXPECT_FALSE(m1.Matches("dogs"));
+
+  Matcher<const StringPiece&> m2 = "cats";
+  EXPECT_TRUE(m2.Matches("cats"));
+  EXPECT_FALSE(m2.Matches("dogs"));
+}
+
+// Tests that a string object can be implicitly converted to a
+// Matcher<StringPiece> or Matcher<const StringPiece&>.
+TEST(StringPieceMatcherTest, CanBeImplicitlyConstructedFromString) {
+  Matcher<StringPiece> m1 = string("cats");
+  EXPECT_TRUE(m1.Matches("cats"));
+  EXPECT_FALSE(m1.Matches("dogs"));
+
+  Matcher<const StringPiece&> m2 = string("cats");
+  EXPECT_TRUE(m2.Matches("cats"));
+  EXPECT_FALSE(m2.Matches("dogs"));
+}
+
+// Tests that a StringPiece object can be implicitly converted to a
+// Matcher<StringPiece> or Matcher<const StringPiece&>.
+TEST(StringPieceMatcherTest, CanBeImplicitlyConstructedFromStringPiece) {
+  Matcher<StringPiece> m1 = StringPiece("cats");
+  EXPECT_TRUE(m1.Matches("cats"));
+  EXPECT_FALSE(m1.Matches("dogs"));
+
+  Matcher<const StringPiece&> m2 = StringPiece("cats");
+  EXPECT_TRUE(m2.Matches("cats"));
+  EXPECT_FALSE(m2.Matches("dogs"));
+}
+#endif  // GTEST_HAS_STRING_PIECE_
+
+// Tests that MakeMatcher() constructs a Matcher<T> from a
+// MatcherInterface* without requiring the user to explicitly
+// write the type.
+TEST(MakeMatcherTest, ConstructsMatcherFromMatcherInterface) {
+  const MatcherInterface<int>* dummy_impl = NULL;
+  Matcher<int> m = MakeMatcher(dummy_impl);
+}
+
+// Tests that MakePolymorphicMatcher() can construct a polymorphic
+// matcher from its implementation using the old API.
+const int g_bar = 1;
+class ReferencesBarOrIsZeroImpl {
+ public:
+  template <typename T>
+  bool MatchAndExplain(const T& x,
+                       MatchResultListener* /* listener */) const {
+    const void* p = &x;
+    return p == &g_bar || x == 0;
+  }
+
+  void DescribeTo(ostream* os) const { *os << "g_bar or zero"; }
+
+  void DescribeNegationTo(ostream* os) const {
+    *os << "doesn't reference g_bar and is not zero";
+  }
+};
+
+// This function verifies that MakePolymorphicMatcher() returns a
+// PolymorphicMatcher<T> where T is the argument's type.
+PolymorphicMatcher<ReferencesBarOrIsZeroImpl> ReferencesBarOrIsZero() {
+  return MakePolymorphicMatcher(ReferencesBarOrIsZeroImpl());
+}
+
+TEST(MakePolymorphicMatcherTest, ConstructsMatcherUsingOldAPI) {
+  // Using a polymorphic matcher to match a reference type.
+  Matcher<const int&> m1 = ReferencesBarOrIsZero();
+  EXPECT_TRUE(m1.Matches(0));
+  // Verifies that the identity of a by-reference argument is preserved.
+  EXPECT_TRUE(m1.Matches(g_bar));
+  EXPECT_FALSE(m1.Matches(1));
+  EXPECT_EQ("g_bar or zero", Describe(m1));
+
+  // Using a polymorphic matcher to match a value type.
+  Matcher<double> m2 = ReferencesBarOrIsZero();
+  EXPECT_TRUE(m2.Matches(0.0));
+  EXPECT_FALSE(m2.Matches(0.1));
+  EXPECT_EQ("g_bar or zero", Describe(m2));
+}
+
+// Tests implementing a polymorphic matcher using MatchAndExplain().
+
+class PolymorphicIsEvenImpl {
+ public:
+  void DescribeTo(ostream* os) const { *os << "is even"; }
+
+  void DescribeNegationTo(ostream* os) const {
+    *os << "is odd";
+  }
+
+  template <typename T>
+  bool MatchAndExplain(const T& x, MatchResultListener* listener) const {
+    // Verifies that we can stream to the listener directly.
+    *listener << "% " << 2;
+    if (listener->stream() != NULL) {
+      // Verifies that we can stream to the listener's underlying stream
+      // too.
+      *listener->stream() << " == " << (x % 2);
+    }
+    return (x % 2) == 0;
+  }
+};
+
+PolymorphicMatcher<PolymorphicIsEvenImpl> PolymorphicIsEven() {
+  return MakePolymorphicMatcher(PolymorphicIsEvenImpl());
+}
+
+TEST(MakePolymorphicMatcherTest, ConstructsMatcherUsingNewAPI) {
+  // Using PolymorphicIsEven() as a Matcher<int>.
+  const Matcher<int> m1 = PolymorphicIsEven();
+  EXPECT_TRUE(m1.Matches(42));
+  EXPECT_FALSE(m1.Matches(43));
+  EXPECT_EQ("is even", Describe(m1));
+
+  const Matcher<int> not_m1 = Not(m1);
+  EXPECT_EQ("is odd", Describe(not_m1));
+
+  EXPECT_EQ("% 2 == 0", Explain(m1, 42));
+
+  // Using PolymorphicIsEven() as a Matcher<char>.
+  const Matcher<char> m2 = PolymorphicIsEven();
+  EXPECT_TRUE(m2.Matches('\x42'));
+  EXPECT_FALSE(m2.Matches('\x43'));
+  EXPECT_EQ("is even", Describe(m2));
+
+  const Matcher<char> not_m2 = Not(m2);
+  EXPECT_EQ("is odd", Describe(not_m2));
+
+  EXPECT_EQ("% 2 == 0", Explain(m2, '\x42'));
+}
+
+// Tests that MatcherCast<T>(m) works when m is a polymorphic matcher.
+TEST(MatcherCastTest, FromPolymorphicMatcher) {
+  Matcher<int> m = MatcherCast<int>(Eq(5));
+  EXPECT_TRUE(m.Matches(5));
+  EXPECT_FALSE(m.Matches(6));
+}
+
+// For testing casting matchers between compatible types.
+class IntValue {
+ public:
+  // An int can be statically (although not implicitly) cast to a
+  // IntValue.
+  explicit IntValue(int a_value) : value_(a_value) {}
+
+  int value() const { return value_; }
+ private:
+  int value_;
+};
+
+// For testing casting matchers between compatible types.
+bool IsPositiveIntValue(const IntValue& foo) {
+  return foo.value() > 0;
+}
+
+// Tests that MatcherCast<T>(m) works when m is a Matcher<U> where T
+// can be statically converted to U.
+TEST(MatcherCastTest, FromCompatibleType) {
+  Matcher<double> m1 = Eq(2.0);
+  Matcher<int> m2 = MatcherCast<int>(m1);
+  EXPECT_TRUE(m2.Matches(2));
+  EXPECT_FALSE(m2.Matches(3));
+
+  Matcher<IntValue> m3 = Truly(IsPositiveIntValue);
+  Matcher<int> m4 = MatcherCast<int>(m3);
+  // In the following, the arguments 1 and 0 are statically converted
+  // to IntValue objects, and then tested by the IsPositiveIntValue()
+  // predicate.
+  EXPECT_TRUE(m4.Matches(1));
+  EXPECT_FALSE(m4.Matches(0));
+}
+
+// Tests that MatcherCast<T>(m) works when m is a Matcher<const T&>.
+TEST(MatcherCastTest, FromConstReferenceToNonReference) {
+  Matcher<const int&> m1 = Eq(0);
+  Matcher<int> m2 = MatcherCast<int>(m1);
+  EXPECT_TRUE(m2.Matches(0));
+  EXPECT_FALSE(m2.Matches(1));
+}
+
+// Tests that MatcherCast<T>(m) works when m is a Matcher<T&>.
+TEST(MatcherCastTest, FromReferenceToNonReference) {
+  Matcher<int&> m1 = Eq(0);
+  Matcher<int> m2 = MatcherCast<int>(m1);
+  EXPECT_TRUE(m2.Matches(0));
+  EXPECT_FALSE(m2.Matches(1));
+}
+
+// Tests that MatcherCast<const T&>(m) works when m is a Matcher<T>.
+TEST(MatcherCastTest, FromNonReferenceToConstReference) {
+  Matcher<int> m1 = Eq(0);
+  Matcher<const int&> m2 = MatcherCast<const int&>(m1);
+  EXPECT_TRUE(m2.Matches(0));
+  EXPECT_FALSE(m2.Matches(1));
+}
+
+// Tests that MatcherCast<T&>(m) works when m is a Matcher<T>.
+TEST(MatcherCastTest, FromNonReferenceToReference) {
+  Matcher<int> m1 = Eq(0);
+  Matcher<int&> m2 = MatcherCast<int&>(m1);
+  int n = 0;
+  EXPECT_TRUE(m2.Matches(n));
+  n = 1;
+  EXPECT_FALSE(m2.Matches(n));
+}
+
+// Tests that MatcherCast<T>(m) works when m is a Matcher<T>.
+TEST(MatcherCastTest, FromSameType) {
+  Matcher<int> m1 = Eq(0);
+  Matcher<int> m2 = MatcherCast<int>(m1);
+  EXPECT_TRUE(m2.Matches(0));
+  EXPECT_FALSE(m2.Matches(1));
+}
+
+// Implicitly convertible from any type.
+struct ConvertibleFromAny {
+  ConvertibleFromAny(int a_value) : value(a_value) {}
+  template <typename T>
+  explicit ConvertibleFromAny(const T& /*a_value*/) : value(-1) {
+    ADD_FAILURE() << "Conversion constructor called";
+  }
+  int value;
+};
+
+bool operator==(const ConvertibleFromAny& a, const ConvertibleFromAny& b) {
+  return a.value == b.value;
+}
+
+ostream& operator<<(ostream& os, const ConvertibleFromAny& a) {
+  return os << a.value;
+}
+
+TEST(MatcherCastTest, ConversionConstructorIsUsed) {
+  Matcher<ConvertibleFromAny> m = MatcherCast<ConvertibleFromAny>(1);
+  EXPECT_TRUE(m.Matches(ConvertibleFromAny(1)));
+  EXPECT_FALSE(m.Matches(ConvertibleFromAny(2)));
+}
+
+TEST(MatcherCastTest, FromConvertibleFromAny) {
+  Matcher<ConvertibleFromAny> m =
+      MatcherCast<ConvertibleFromAny>(Eq(ConvertibleFromAny(1)));
+  EXPECT_TRUE(m.Matches(ConvertibleFromAny(1)));
+  EXPECT_FALSE(m.Matches(ConvertibleFromAny(2)));
+}
+
+struct IntReferenceWrapper {
+  IntReferenceWrapper(const int& a_value) : value(&a_value) {}
+  const int* value;
+};
+
+bool operator==(const IntReferenceWrapper& a, const IntReferenceWrapper& b) {
+  return a.value == b.value;
+}
+
+TEST(MatcherCastTest, ValueIsNotCopied) {
+  int n = 42;
+  Matcher<IntReferenceWrapper> m = MatcherCast<IntReferenceWrapper>(n);
+  // Verify that the matcher holds a reference to n, not to its temporary copy.
+  EXPECT_TRUE(m.Matches(n));
+}
+
+class Base {
+ public:
+  virtual ~Base() {}
+  Base() {}
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Base);
+};
+
+class Derived : public Base {
+ public:
+  Derived() : Base() {}
+  int i;
+};
+
+class OtherDerived : public Base {};
+
+// Tests that SafeMatcherCast<T>(m) works when m is a polymorphic matcher.
+TEST(SafeMatcherCastTest, FromPolymorphicMatcher) {
+  Matcher<char> m2 = SafeMatcherCast<char>(Eq(32));
+  EXPECT_TRUE(m2.Matches(' '));
+  EXPECT_FALSE(m2.Matches('\n'));
+}
+
+// Tests that SafeMatcherCast<T>(m) works when m is a Matcher<U> where
+// T and U are arithmetic types and T can be losslessly converted to
+// U.
+TEST(SafeMatcherCastTest, FromLosslesslyConvertibleArithmeticType) {
+  Matcher<double> m1 = DoubleEq(1.0);
+  Matcher<float> m2 = SafeMatcherCast<float>(m1);
+  EXPECT_TRUE(m2.Matches(1.0f));
+  EXPECT_FALSE(m2.Matches(2.0f));
+
+  Matcher<char> m3 = SafeMatcherCast<char>(TypedEq<int>('a'));
+  EXPECT_TRUE(m3.Matches('a'));
+  EXPECT_FALSE(m3.Matches('b'));
+}
+
+// Tests that SafeMatcherCast<T>(m) works when m is a Matcher<U> where T and U
+// are pointers or references to a derived and a base class, correspondingly.
+TEST(SafeMatcherCastTest, FromBaseClass) {
+  Derived d, d2;
+  Matcher<Base*> m1 = Eq(&d);
+  Matcher<Derived*> m2 = SafeMatcherCast<Derived*>(m1);
+  EXPECT_TRUE(m2.Matches(&d));
+  EXPECT_FALSE(m2.Matches(&d2));
+
+  Matcher<Base&> m3 = Ref(d);
+  Matcher<Derived&> m4 = SafeMatcherCast<Derived&>(m3);
+  EXPECT_TRUE(m4.Matches(d));
+  EXPECT_FALSE(m4.Matches(d2));
+}
+
+// Tests that SafeMatcherCast<T&>(m) works when m is a Matcher<const T&>.
+TEST(SafeMatcherCastTest, FromConstReferenceToReference) {
+  int n = 0;
+  Matcher<const int&> m1 = Ref(n);
+  Matcher<int&> m2 = SafeMatcherCast<int&>(m1);
+  int n1 = 0;
+  EXPECT_TRUE(m2.Matches(n));
+  EXPECT_FALSE(m2.Matches(n1));
+}
+
+// Tests that MatcherCast<const T&>(m) works when m is a Matcher<T>.
+TEST(SafeMatcherCastTest, FromNonReferenceToConstReference) {
+  Matcher<int> m1 = Eq(0);
+  Matcher<const int&> m2 = SafeMatcherCast<const int&>(m1);
+  EXPECT_TRUE(m2.Matches(0));
+  EXPECT_FALSE(m2.Matches(1));
+}
+
+// Tests that SafeMatcherCast<T&>(m) works when m is a Matcher<T>.
+TEST(SafeMatcherCastTest, FromNonReferenceToReference) {
+  Matcher<int> m1 = Eq(0);
+  Matcher<int&> m2 = SafeMatcherCast<int&>(m1);
+  int n = 0;
+  EXPECT_TRUE(m2.Matches(n));
+  n = 1;
+  EXPECT_FALSE(m2.Matches(n));
+}
+
+// Tests that SafeMatcherCast<T>(m) works when m is a Matcher<T>.
+TEST(SafeMatcherCastTest, FromSameType) {
+  Matcher<int> m1 = Eq(0);
+  Matcher<int> m2 = SafeMatcherCast<int>(m1);
+  EXPECT_TRUE(m2.Matches(0));
+  EXPECT_FALSE(m2.Matches(1));
+}
+
+TEST(SafeMatcherCastTest, ConversionConstructorIsUsed) {
+  Matcher<ConvertibleFromAny> m = SafeMatcherCast<ConvertibleFromAny>(1);
+  EXPECT_TRUE(m.Matches(ConvertibleFromAny(1)));
+  EXPECT_FALSE(m.Matches(ConvertibleFromAny(2)));
+}
+
+TEST(SafeMatcherCastTest, FromConvertibleFromAny) {
+  Matcher<ConvertibleFromAny> m =
+      SafeMatcherCast<ConvertibleFromAny>(Eq(ConvertibleFromAny(1)));
+  EXPECT_TRUE(m.Matches(ConvertibleFromAny(1)));
+  EXPECT_FALSE(m.Matches(ConvertibleFromAny(2)));
+}
+
+TEST(SafeMatcherCastTest, ValueIsNotCopied) {
+  int n = 42;
+  Matcher<IntReferenceWrapper> m = SafeMatcherCast<IntReferenceWrapper>(n);
+  // Verify that the matcher holds a reference to n, not to its temporary copy.
+  EXPECT_TRUE(m.Matches(n));
+}
+
+TEST(ExpectThat, TakesLiterals) {
+  EXPECT_THAT(1, 1);
+  EXPECT_THAT(1.0, 1.0);
+  EXPECT_THAT(string(), "");
+}
+
+TEST(ExpectThat, TakesFunctions) {
+  struct Helper {
+    static void Func() {}
+  };
+  void (*func)() = Helper::Func;
+  EXPECT_THAT(func, Helper::Func);
+  EXPECT_THAT(func, &Helper::Func);
+}
+
+// Tests that A<T>() matches any value of type T.
+TEST(ATest, MatchesAnyValue) {
+  // Tests a matcher for a value type.
+  Matcher<double> m1 = A<double>();
+  EXPECT_TRUE(m1.Matches(91.43));
+  EXPECT_TRUE(m1.Matches(-15.32));
+
+  // Tests a matcher for a reference type.
+  int a = 2;
+  int b = -6;
+  Matcher<int&> m2 = A<int&>();
+  EXPECT_TRUE(m2.Matches(a));
+  EXPECT_TRUE(m2.Matches(b));
+}
+
+TEST(ATest, WorksForDerivedClass) {
+  Base base;
+  Derived derived;
+  EXPECT_THAT(&base, A<Base*>());
+  // This shouldn't compile: EXPECT_THAT(&base, A<Derived*>());
+  EXPECT_THAT(&derived, A<Base*>());
+  EXPECT_THAT(&derived, A<Derived*>());
+}
+
+// Tests that A<T>() describes itself properly.
+TEST(ATest, CanDescribeSelf) {
+  EXPECT_EQ("is anything", Describe(A<bool>()));
+}
+
+// Tests that An<T>() matches any value of type T.
+TEST(AnTest, MatchesAnyValue) {
+  // Tests a matcher for a value type.
+  Matcher<int> m1 = An<int>();
+  EXPECT_TRUE(m1.Matches(9143));
+  EXPECT_TRUE(m1.Matches(-1532));
+
+  // Tests a matcher for a reference type.
+  int a = 2;
+  int b = -6;
+  Matcher<int&> m2 = An<int&>();
+  EXPECT_TRUE(m2.Matches(a));
+  EXPECT_TRUE(m2.Matches(b));
+}
+
+// Tests that An<T>() describes itself properly.
+TEST(AnTest, CanDescribeSelf) {
+  EXPECT_EQ("is anything", Describe(An<int>()));
+}
+
+// Tests that _ can be used as a matcher for any type and matches any
+// value of that type.
+TEST(UnderscoreTest, MatchesAnyValue) {
+  // Uses _ as a matcher for a value type.
+  Matcher<int> m1 = _;
+  EXPECT_TRUE(m1.Matches(123));
+  EXPECT_TRUE(m1.Matches(-242));
+
+  // Uses _ as a matcher for a reference type.
+  bool a = false;
+  const bool b = true;
+  Matcher<const bool&> m2 = _;
+  EXPECT_TRUE(m2.Matches(a));
+  EXPECT_TRUE(m2.Matches(b));
+}
+
+// Tests that _ describes itself properly.
+TEST(UnderscoreTest, CanDescribeSelf) {
+  Matcher<int> m = _;
+  EXPECT_EQ("is anything", Describe(m));
+}
+
+// Tests that Eq(x) matches any value equal to x.
+TEST(EqTest, MatchesEqualValue) {
+  // 2 C-strings with same content but different addresses.
+  const char a1[] = "hi";
+  const char a2[] = "hi";
+
+  Matcher<const char*> m1 = Eq(a1);
+  EXPECT_TRUE(m1.Matches(a1));
+  EXPECT_FALSE(m1.Matches(a2));
+}
+
+// Tests that Eq(v) describes itself properly.
+
+class Unprintable {
+ public:
+  Unprintable() : c_('a') {}
+
+ private:
+  char c_;
+};
+
+inline bool operator==(const Unprintable& /* lhs */, 
+                       const Unprintable& /* rhs */) { 
+    return true; 
+}
+
+TEST(EqTest, CanDescribeSelf) {
+  Matcher<Unprintable> m = Eq(Unprintable());
+  EXPECT_EQ("is equal to 1-byte object <61>", Describe(m));
+}
+
+// Tests that Eq(v) can be used to match any type that supports
+// comparing with type T, where T is v's type.
+TEST(EqTest, IsPolymorphic) {
+  Matcher<int> m1 = Eq(1);
+  EXPECT_TRUE(m1.Matches(1));
+  EXPECT_FALSE(m1.Matches(2));
+
+  Matcher<char> m2 = Eq(1);
+  EXPECT_TRUE(m2.Matches('\1'));
+  EXPECT_FALSE(m2.Matches('a'));
+}
+
+// Tests that TypedEq<T>(v) matches values of type T that's equal to v.
+TEST(TypedEqTest, ChecksEqualityForGivenType) {
+  Matcher<char> m1 = TypedEq<char>('a');
+  EXPECT_TRUE(m1.Matches('a'));
+  EXPECT_FALSE(m1.Matches('b'));
+
+  Matcher<int> m2 = TypedEq<int>(6);
+  EXPECT_TRUE(m2.Matches(6));
+  EXPECT_FALSE(m2.Matches(7));
+}
+
+// Tests that TypedEq(v) describes itself properly.
+TEST(TypedEqTest, CanDescribeSelf) {
+  EXPECT_EQ("is equal to 2", Describe(TypedEq<int>(2)));
+}
+
+// Tests that TypedEq<T>(v) has type Matcher<T>.
+
+// Type<T>::IsTypeOf(v) compiles iff the type of value v is T, where T
+// is a "bare" type (i.e. not in the form of const U or U&).  If v's
+// type is not T, the compiler will generate a message about
+// "undefined referece".
+template <typename T>
+struct Type {
+  static bool IsTypeOf(const T& /* v */) { return true; }
+
+  template <typename T2>
+  static void IsTypeOf(T2 v);
+};
+
+TEST(TypedEqTest, HasSpecifiedType) {
+  // Verfies that the type of TypedEq<T>(v) is Matcher<T>.
+  Type<Matcher<int> >::IsTypeOf(TypedEq<int>(5));
+  Type<Matcher<double> >::IsTypeOf(TypedEq<double>(5));
+}
+
+// Tests that Ge(v) matches anything >= v.
+TEST(GeTest, ImplementsGreaterThanOrEqual) {
+  Matcher<int> m1 = Ge(0);
+  EXPECT_TRUE(m1.Matches(1));
+  EXPECT_TRUE(m1.Matches(0));
+  EXPECT_FALSE(m1.Matches(-1));
+}
+
+// Tests that Ge(v) describes itself properly.
+TEST(GeTest, CanDescribeSelf) {
+  Matcher<int> m = Ge(5);
+  EXPECT_EQ("is >= 5", Describe(m));
+}
+
+// Tests that Gt(v) matches anything > v.
+TEST(GtTest, ImplementsGreaterThan) {
+  Matcher<double> m1 = Gt(0);
+  EXPECT_TRUE(m1.Matches(1.0));
+  EXPECT_FALSE(m1.Matches(0.0));
+  EXPECT_FALSE(m1.Matches(-1.0));
+}
+
+// Tests that Gt(v) describes itself properly.
+TEST(GtTest, CanDescribeSelf) {
+  Matcher<int> m = Gt(5);
+  EXPECT_EQ("is > 5", Describe(m));
+}
+
+// Tests that Le(v) matches anything <= v.
+TEST(LeTest, ImplementsLessThanOrEqual) {
+  Matcher<char> m1 = Le('b');
+  EXPECT_TRUE(m1.Matches('a'));
+  EXPECT_TRUE(m1.Matches('b'));
+  EXPECT_FALSE(m1.Matches('c'));
+}
+
+// Tests that Le(v) describes itself properly.
+TEST(LeTest, CanDescribeSelf) {
+  Matcher<int> m = Le(5);
+  EXPECT_EQ("is <= 5", Describe(m));
+}
+
+// Tests that Lt(v) matches anything < v.
+TEST(LtTest, ImplementsLessThan) {
+  Matcher<const string&> m1 = Lt("Hello");
+  EXPECT_TRUE(m1.Matches("Abc"));
+  EXPECT_FALSE(m1.Matches("Hello"));
+  EXPECT_FALSE(m1.Matches("Hello, world!"));
+}
+
+// Tests that Lt(v) describes itself properly.
+TEST(LtTest, CanDescribeSelf) {
+  Matcher<int> m = Lt(5);
+  EXPECT_EQ("is < 5", Describe(m));
+}
+
+// Tests that Ne(v) matches anything != v.
+TEST(NeTest, ImplementsNotEqual) {
+  Matcher<int> m1 = Ne(0);
+  EXPECT_TRUE(m1.Matches(1));
+  EXPECT_TRUE(m1.Matches(-1));
+  EXPECT_FALSE(m1.Matches(0));
+}
+
+// Tests that Ne(v) describes itself properly.
+TEST(NeTest, CanDescribeSelf) {
+  Matcher<int> m = Ne(5);
+  EXPECT_EQ("isn't equal to 5", Describe(m));
+}
+
+// Tests that IsNull() matches any NULL pointer of any type.
+TEST(IsNullTest, MatchesNullPointer) {
+  Matcher<int*> m1 = IsNull();
+  int* p1 = NULL;
+  int n = 0;
+  EXPECT_TRUE(m1.Matches(p1));
+  EXPECT_FALSE(m1.Matches(&n));
+
+  Matcher<const char*> m2 = IsNull();
+  const char* p2 = NULL;
+  EXPECT_TRUE(m2.Matches(p2));
+  EXPECT_FALSE(m2.Matches("hi"));
+
+#if !GTEST_OS_SYMBIAN
+  // Nokia's Symbian compiler generates:
+  // gmock-matchers.h: ambiguous access to overloaded function
+  // gmock-matchers.h: 'testing::Matcher<void *>::Matcher(void *)'
+  // gmock-matchers.h: 'testing::Matcher<void *>::Matcher(const testing::
+  //     MatcherInterface<void *> *)'
+  // gmock-matchers.h:  (point of instantiation: 'testing::
+  //     gmock_matchers_test::IsNullTest_MatchesNullPointer_Test::TestBody()')
+  // gmock-matchers.h:   (instantiating: 'testing::PolymorphicMatc
+  Matcher<void*> m3 = IsNull();
+  void* p3 = NULL;
+  EXPECT_TRUE(m3.Matches(p3));
+  EXPECT_FALSE(m3.Matches(reinterpret_cast<void*>(0xbeef)));
+#endif
+}
+
+TEST(IsNullTest, LinkedPtr) {
+  const Matcher<linked_ptr<int> > m = IsNull();
+  const linked_ptr<int> null_p;
+  const linked_ptr<int> non_null_p(new int);
+
+  EXPECT_TRUE(m.Matches(null_p));
+  EXPECT_FALSE(m.Matches(non_null_p));
+}
+
+TEST(IsNullTest, ReferenceToConstLinkedPtr) {
+  const Matcher<const linked_ptr<double>&> m = IsNull();
+  const linked_ptr<double> null_p;
+  const linked_ptr<double> non_null_p(new double);
+
+  EXPECT_TRUE(m.Matches(null_p));
+  EXPECT_FALSE(m.Matches(non_null_p));
+}
+
+#if GTEST_HAS_STD_FUNCTION_
+TEST(IsNullTest, StdFunction) {
+  const Matcher<std::function<void()>> m = IsNull();
+
+  EXPECT_TRUE(m.Matches(std::function<void()>()));
+  EXPECT_FALSE(m.Matches([]{}));
+}
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+// Tests that IsNull() describes itself properly.
+TEST(IsNullTest, CanDescribeSelf) {
+  Matcher<int*> m = IsNull();
+  EXPECT_EQ("is NULL", Describe(m));
+  EXPECT_EQ("isn't NULL", DescribeNegation(m));
+}
+
+// Tests that NotNull() matches any non-NULL pointer of any type.
+TEST(NotNullTest, MatchesNonNullPointer) {
+  Matcher<int*> m1 = NotNull();
+  int* p1 = NULL;
+  int n = 0;
+  EXPECT_FALSE(m1.Matches(p1));
+  EXPECT_TRUE(m1.Matches(&n));
+
+  Matcher<const char*> m2 = NotNull();
+  const char* p2 = NULL;
+  EXPECT_FALSE(m2.Matches(p2));
+  EXPECT_TRUE(m2.Matches("hi"));
+}
+
+TEST(NotNullTest, LinkedPtr) {
+  const Matcher<linked_ptr<int> > m = NotNull();
+  const linked_ptr<int> null_p;
+  const linked_ptr<int> non_null_p(new int);
+
+  EXPECT_FALSE(m.Matches(null_p));
+  EXPECT_TRUE(m.Matches(non_null_p));
+}
+
+TEST(NotNullTest, ReferenceToConstLinkedPtr) {
+  const Matcher<const linked_ptr<double>&> m = NotNull();
+  const linked_ptr<double> null_p;
+  const linked_ptr<double> non_null_p(new double);
+
+  EXPECT_FALSE(m.Matches(null_p));
+  EXPECT_TRUE(m.Matches(non_null_p));
+}
+
+#if GTEST_HAS_STD_FUNCTION_
+TEST(NotNullTest, StdFunction) {
+  const Matcher<std::function<void()>> m = NotNull();
+
+  EXPECT_TRUE(m.Matches([]{}));
+  EXPECT_FALSE(m.Matches(std::function<void()>()));
+}
+#endif  // GTEST_HAS_STD_FUNCTION_
+
+// Tests that NotNull() describes itself properly.
+TEST(NotNullTest, CanDescribeSelf) {
+  Matcher<int*> m = NotNull();
+  EXPECT_EQ("isn't NULL", Describe(m));
+}
+
+// Tests that Ref(variable) matches an argument that references
+// 'variable'.
+TEST(RefTest, MatchesSameVariable) {
+  int a = 0;
+  int b = 0;
+  Matcher<int&> m = Ref(a);
+  EXPECT_TRUE(m.Matches(a));
+  EXPECT_FALSE(m.Matches(b));
+}
+
+// Tests that Ref(variable) describes itself properly.
+TEST(RefTest, CanDescribeSelf) {
+  int n = 5;
+  Matcher<int&> m = Ref(n);
+  stringstream ss;
+  ss << "references the variable @" << &n << " 5";
+  EXPECT_EQ(string(ss.str()), Describe(m));
+}
+
+// Test that Ref(non_const_varialbe) can be used as a matcher for a
+// const reference.
+TEST(RefTest, CanBeUsedAsMatcherForConstReference) {
+  int a = 0;
+  int b = 0;
+  Matcher<const int&> m = Ref(a);
+  EXPECT_TRUE(m.Matches(a));
+  EXPECT_FALSE(m.Matches(b));
+}
+
+// Tests that Ref(variable) is covariant, i.e. Ref(derived) can be
+// used wherever Ref(base) can be used (Ref(derived) is a sub-type
+// of Ref(base), but not vice versa.
+
+TEST(RefTest, IsCovariant) {
+  Base base, base2;
+  Derived derived;
+  Matcher<const Base&> m1 = Ref(base);
+  EXPECT_TRUE(m1.Matches(base));
+  EXPECT_FALSE(m1.Matches(base2));
+  EXPECT_FALSE(m1.Matches(derived));
+
+  m1 = Ref(derived);
+  EXPECT_TRUE(m1.Matches(derived));
+  EXPECT_FALSE(m1.Matches(base));
+  EXPECT_FALSE(m1.Matches(base2));
+}
+
+TEST(RefTest, ExplainsResult) {
+  int n = 0;
+  EXPECT_THAT(Explain(Matcher<const int&>(Ref(n)), n),
+              StartsWith("which is located @"));
+
+  int m = 0;
+  EXPECT_THAT(Explain(Matcher<const int&>(Ref(n)), m),
+              StartsWith("which is located @"));
+}
+
+// Tests string comparison matchers.
+
+TEST(StrEqTest, MatchesEqualString) {
+  Matcher<const char*> m = StrEq(string("Hello"));
+  EXPECT_TRUE(m.Matches("Hello"));
+  EXPECT_FALSE(m.Matches("hello"));
+  EXPECT_FALSE(m.Matches(NULL));
+
+  Matcher<const string&> m2 = StrEq("Hello");
+  EXPECT_TRUE(m2.Matches("Hello"));
+  EXPECT_FALSE(m2.Matches("Hi"));
+}
+
+TEST(StrEqTest, CanDescribeSelf) {
+  Matcher<string> m = StrEq("Hi-\'\"?\\\a\b\f\n\r\t\v\xD3");
+  EXPECT_EQ("is equal to \"Hi-\'\\\"?\\\\\\a\\b\\f\\n\\r\\t\\v\\xD3\"",
+      Describe(m));
+
+  string str("01204500800");
+  str[3] = '\0';
+  Matcher<string> m2 = StrEq(str);
+  EXPECT_EQ("is equal to \"012\\04500800\"", Describe(m2));
+  str[0] = str[6] = str[7] = str[9] = str[10] = '\0';
+  Matcher<string> m3 = StrEq(str);
+  EXPECT_EQ("is equal to \"\\012\\045\\0\\08\\0\\0\"", Describe(m3));
+}
+
+TEST(StrNeTest, MatchesUnequalString) {
+  Matcher<const char*> m = StrNe("Hello");
+  EXPECT_TRUE(m.Matches(""));
+  EXPECT_TRUE(m.Matches(NULL));
+  EXPECT_FALSE(m.Matches("Hello"));
+
+  Matcher<string> m2 = StrNe(string("Hello"));
+  EXPECT_TRUE(m2.Matches("hello"));
+  EXPECT_FALSE(m2.Matches("Hello"));
+}
+
+TEST(StrNeTest, CanDescribeSelf) {
+  Matcher<const char*> m = StrNe("Hi");
+  EXPECT_EQ("isn't equal to \"Hi\"", Describe(m));
+}
+
+TEST(StrCaseEqTest, MatchesEqualStringIgnoringCase) {
+  Matcher<const char*> m = StrCaseEq(string("Hello"));
+  EXPECT_TRUE(m.Matches("Hello"));
+  EXPECT_TRUE(m.Matches("hello"));
+  EXPECT_FALSE(m.Matches("Hi"));
+  EXPECT_FALSE(m.Matches(NULL));
+
+  Matcher<const string&> m2 = StrCaseEq("Hello");
+  EXPECT_TRUE(m2.Matches("hello"));
+  EXPECT_FALSE(m2.Matches("Hi"));
+}
+
+TEST(StrCaseEqTest, MatchesEqualStringWith0IgnoringCase) {
+  string str1("oabocdooeoo");
+  string str2("OABOCDOOEOO");
+  Matcher<const string&> m0 = StrCaseEq(str1);
+  EXPECT_FALSE(m0.Matches(str2 + string(1, '\0')));
+
+  str1[3] = str2[3] = '\0';
+  Matcher<const string&> m1 = StrCaseEq(str1);
+  EXPECT_TRUE(m1.Matches(str2));
+
+  str1[0] = str1[6] = str1[7] = str1[10] = '\0';
+  str2[0] = str2[6] = str2[7] = str2[10] = '\0';
+  Matcher<const string&> m2 = StrCaseEq(str1);
+  str1[9] = str2[9] = '\0';
+  EXPECT_FALSE(m2.Matches(str2));
+
+  Matcher<const string&> m3 = StrCaseEq(str1);
+  EXPECT_TRUE(m3.Matches(str2));
+
+  EXPECT_FALSE(m3.Matches(str2 + "x"));
+  str2.append(1, '\0');
+  EXPECT_FALSE(m3.Matches(str2));
+  EXPECT_FALSE(m3.Matches(string(str2, 0, 9)));
+}
+
+TEST(StrCaseEqTest, CanDescribeSelf) {
+  Matcher<string> m = StrCaseEq("Hi");
+  EXPECT_EQ("is equal to (ignoring case) \"Hi\"", Describe(m));
+}
+
+TEST(StrCaseNeTest, MatchesUnequalStringIgnoringCase) {
+  Matcher<const char*> m = StrCaseNe("Hello");
+  EXPECT_TRUE(m.Matches("Hi"));
+  EXPECT_TRUE(m.Matches(NULL));
+  EXPECT_FALSE(m.Matches("Hello"));
+  EXPECT_FALSE(m.Matches("hello"));
+
+  Matcher<string> m2 = StrCaseNe(string("Hello"));
+  EXPECT_TRUE(m2.Matches(""));
+  EXPECT_FALSE(m2.Matches("Hello"));
+}
+
+TEST(StrCaseNeTest, CanDescribeSelf) {
+  Matcher<const char*> m = StrCaseNe("Hi");
+  EXPECT_EQ("isn't equal to (ignoring case) \"Hi\"", Describe(m));
+}
+
+// Tests that HasSubstr() works for matching string-typed values.
+TEST(HasSubstrTest, WorksForStringClasses) {
+  const Matcher<string> m1 = HasSubstr("foo");
+  EXPECT_TRUE(m1.Matches(string("I love food.")));
+  EXPECT_FALSE(m1.Matches(string("tofo")));
+
+  const Matcher<const std::string&> m2 = HasSubstr("foo");
+  EXPECT_TRUE(m2.Matches(std::string("I love food.")));
+  EXPECT_FALSE(m2.Matches(std::string("tofo")));
+}
+
+// Tests that HasSubstr() works for matching C-string-typed values.
+TEST(HasSubstrTest, WorksForCStrings) {
+  const Matcher<char*> m1 = HasSubstr("foo");
+  EXPECT_TRUE(m1.Matches(const_cast<char*>("I love food.")));
+  EXPECT_FALSE(m1.Matches(const_cast<char*>("tofo")));
+  EXPECT_FALSE(m1.Matches(NULL));
+
+  const Matcher<const char*> m2 = HasSubstr("foo");
+  EXPECT_TRUE(m2.Matches("I love food."));
+  EXPECT_FALSE(m2.Matches("tofo"));
+  EXPECT_FALSE(m2.Matches(NULL));
+}
+
+// Tests that HasSubstr(s) describes itself properly.
+TEST(HasSubstrTest, CanDescribeSelf) {
+  Matcher<string> m = HasSubstr("foo\n\"");
+  EXPECT_EQ("has substring \"foo\\n\\\"\"", Describe(m));
+}
+
+TEST(KeyTest, CanDescribeSelf) {
+  Matcher<const pair<std::string, int>&> m = Key("foo");
+  EXPECT_EQ("has a key that is equal to \"foo\"", Describe(m));
+  EXPECT_EQ("doesn't have a key that is equal to \"foo\"", DescribeNegation(m));
+}
+
+TEST(KeyTest, ExplainsResult) {
+  Matcher<pair<int, bool> > m = Key(GreaterThan(10));
+  EXPECT_EQ("whose first field is a value which is 5 less than 10",
+            Explain(m, make_pair(5, true)));
+  EXPECT_EQ("whose first field is a value which is 5 more than 10",
+            Explain(m, make_pair(15, true)));
+}
+
+TEST(KeyTest, MatchesCorrectly) {
+  pair<int, std::string> p(25, "foo");
+  EXPECT_THAT(p, Key(25));
+  EXPECT_THAT(p, Not(Key(42)));
+  EXPECT_THAT(p, Key(Ge(20)));
+  EXPECT_THAT(p, Not(Key(Lt(25))));
+}
+
+TEST(KeyTest, SafelyCastsInnerMatcher) {
+  Matcher<int> is_positive = Gt(0);
+  Matcher<int> is_negative = Lt(0);
+  pair<char, bool> p('a', true);
+  EXPECT_THAT(p, Key(is_positive));
+  EXPECT_THAT(p, Not(Key(is_negative)));
+}
+
+TEST(KeyTest, InsideContainsUsingMap) {
+  map<int, char> container;
+  container.insert(make_pair(1, 'a'));
+  container.insert(make_pair(2, 'b'));
+  container.insert(make_pair(4, 'c'));
+  EXPECT_THAT(container, Contains(Key(1)));
+  EXPECT_THAT(container, Not(Contains(Key(3))));
+}
+
+TEST(KeyTest, InsideContainsUsingMultimap) {
+  multimap<int, char> container;
+  container.insert(make_pair(1, 'a'));
+  container.insert(make_pair(2, 'b'));
+  container.insert(make_pair(4, 'c'));
+
+  EXPECT_THAT(container, Not(Contains(Key(25))));
+  container.insert(make_pair(25, 'd'));
+  EXPECT_THAT(container, Contains(Key(25)));
+  container.insert(make_pair(25, 'e'));
+  EXPECT_THAT(container, Contains(Key(25)));
+
+  EXPECT_THAT(container, Contains(Key(1)));
+  EXPECT_THAT(container, Not(Contains(Key(3))));
+}
+
+TEST(PairTest, Typing) {
+  // Test verifies the following type conversions can be compiled.
+  Matcher<const pair<const char*, int>&> m1 = Pair("foo", 42);
+  Matcher<const pair<const char*, int> > m2 = Pair("foo", 42);
+  Matcher<pair<const char*, int> > m3 = Pair("foo", 42);
+
+  Matcher<pair<int, const std::string> > m4 = Pair(25, "42");
+  Matcher<pair<const std::string, int> > m5 = Pair("25", 42);
+}
+
+TEST(PairTest, CanDescribeSelf) {
+  Matcher<const pair<std::string, int>&> m1 = Pair("foo", 42);
+  EXPECT_EQ("has a first field that is equal to \"foo\""
+            ", and has a second field that is equal to 42",
+            Describe(m1));
+  EXPECT_EQ("has a first field that isn't equal to \"foo\""
+            ", or has a second field that isn't equal to 42",
+            DescribeNegation(m1));
+  // Double and triple negation (1 or 2 times not and description of negation).
+  Matcher<const pair<int, int>&> m2 = Not(Pair(Not(13), 42));
+  EXPECT_EQ("has a first field that isn't equal to 13"
+            ", and has a second field that is equal to 42",
+            DescribeNegation(m2));
+}
+
+TEST(PairTest, CanExplainMatchResultTo) {
+  // If neither field matches, Pair() should explain about the first
+  // field.
+  const Matcher<pair<int, int> > m = Pair(GreaterThan(0), GreaterThan(0));
+  EXPECT_EQ("whose first field does not match, which is 1 less than 0",
+            Explain(m, make_pair(-1, -2)));
+
+  // If the first field matches but the second doesn't, Pair() should
+  // explain about the second field.
+  EXPECT_EQ("whose second field does not match, which is 2 less than 0",
+            Explain(m, make_pair(1, -2)));
+
+  // If the first field doesn't match but the second does, Pair()
+  // should explain about the first field.
+  EXPECT_EQ("whose first field does not match, which is 1 less than 0",
+            Explain(m, make_pair(-1, 2)));
+
+  // If both fields match, Pair() should explain about them both.
+  EXPECT_EQ("whose both fields match, where the first field is a value "
+            "which is 1 more than 0, and the second field is a value "
+            "which is 2 more than 0",
+            Explain(m, make_pair(1, 2)));
+
+  // If only the first match has an explanation, only this explanation should
+  // be printed.
+  const Matcher<pair<int, int> > explain_first = Pair(GreaterThan(0), 0);
+  EXPECT_EQ("whose both fields match, where the first field is a value "
+            "which is 1 more than 0",
+            Explain(explain_first, make_pair(1, 0)));
+
+  // If only the second match has an explanation, only this explanation should
+  // be printed.
+  const Matcher<pair<int, int> > explain_second = Pair(0, GreaterThan(0));
+  EXPECT_EQ("whose both fields match, where the second field is a value "
+            "which is 1 more than 0",
+            Explain(explain_second, make_pair(0, 1)));
+}
+
+TEST(PairTest, MatchesCorrectly) {
+  pair<int, std::string> p(25, "foo");
+
+  // Both fields match.
+  EXPECT_THAT(p, Pair(25, "foo"));
+  EXPECT_THAT(p, Pair(Ge(20), HasSubstr("o")));
+
+  // 'first' doesnt' match, but 'second' matches.
+  EXPECT_THAT(p, Not(Pair(42, "foo")));
+  EXPECT_THAT(p, Not(Pair(Lt(25), "foo")));
+
+  // 'first' matches, but 'second' doesn't match.
+  EXPECT_THAT(p, Not(Pair(25, "bar")));
+  EXPECT_THAT(p, Not(Pair(25, Not("foo"))));
+
+  // Neither field matches.
+  EXPECT_THAT(p, Not(Pair(13, "bar")));
+  EXPECT_THAT(p, Not(Pair(Lt(13), HasSubstr("a"))));
+}
+
+TEST(PairTest, SafelyCastsInnerMatchers) {
+  Matcher<int> is_positive = Gt(0);
+  Matcher<int> is_negative = Lt(0);
+  pair<char, bool> p('a', true);
+  EXPECT_THAT(p, Pair(is_positive, _));
+  EXPECT_THAT(p, Not(Pair(is_negative, _)));
+  EXPECT_THAT(p, Pair(_, is_positive));
+  EXPECT_THAT(p, Not(Pair(_, is_negative)));
+}
+
+TEST(PairTest, InsideContainsUsingMap) {
+  map<int, char> container;
+  container.insert(make_pair(1, 'a'));
+  container.insert(make_pair(2, 'b'));
+  container.insert(make_pair(4, 'c'));
+  EXPECT_THAT(container, Contains(Pair(1, 'a')));
+  EXPECT_THAT(container, Contains(Pair(1, _)));
+  EXPECT_THAT(container, Contains(Pair(_, 'a')));
+  EXPECT_THAT(container, Not(Contains(Pair(3, _))));
+}
+
+// Tests StartsWith(s).
+
+TEST(StartsWithTest, MatchesStringWithGivenPrefix) {
+  const Matcher<const char*> m1 = StartsWith(string(""));
+  EXPECT_TRUE(m1.Matches("Hi"));
+  EXPECT_TRUE(m1.Matches(""));
+  EXPECT_FALSE(m1.Matches(NULL));
+
+  const Matcher<const string&> m2 = StartsWith("Hi");
+  EXPECT_TRUE(m2.Matches("Hi"));
+  EXPECT_TRUE(m2.Matches("Hi Hi!"));
+  EXPECT_TRUE(m2.Matches("High"));
+  EXPECT_FALSE(m2.Matches("H"));
+  EXPECT_FALSE(m2.Matches(" Hi"));
+}
+
+TEST(StartsWithTest, CanDescribeSelf) {
+  Matcher<const std::string> m = StartsWith("Hi");
+  EXPECT_EQ("starts with \"Hi\"", Describe(m));
+}
+
+// Tests EndsWith(s).
+
+TEST(EndsWithTest, MatchesStringWithGivenSuffix) {
+  const Matcher<const char*> m1 = EndsWith("");
+  EXPECT_TRUE(m1.Matches("Hi"));
+  EXPECT_TRUE(m1.Matches(""));
+  EXPECT_FALSE(m1.Matches(NULL));
+
+  const Matcher<const string&> m2 = EndsWith(string("Hi"));
+  EXPECT_TRUE(m2.Matches("Hi"));
+  EXPECT_TRUE(m2.Matches("Wow Hi Hi"));
+  EXPECT_TRUE(m2.Matches("Super Hi"));
+  EXPECT_FALSE(m2.Matches("i"));
+  EXPECT_FALSE(m2.Matches("Hi "));
+}
+
+TEST(EndsWithTest, CanDescribeSelf) {
+  Matcher<const std::string> m = EndsWith("Hi");
+  EXPECT_EQ("ends with \"Hi\"", Describe(m));
+}
+
+// Tests MatchesRegex().
+
+TEST(MatchesRegexTest, MatchesStringMatchingGivenRegex) {
+  const Matcher<const char*> m1 = MatchesRegex("a.*z");
+  EXPECT_TRUE(m1.Matches("az"));
+  EXPECT_TRUE(m1.Matches("abcz"));
+  EXPECT_FALSE(m1.Matches(NULL));
+
+  const Matcher<const string&> m2 = MatchesRegex(new RE("a.*z"));
+  EXPECT_TRUE(m2.Matches("azbz"));
+  EXPECT_FALSE(m2.Matches("az1"));
+  EXPECT_FALSE(m2.Matches("1az"));
+}
+
+TEST(MatchesRegexTest, CanDescribeSelf) {
+  Matcher<const std::string> m1 = MatchesRegex(string("Hi.*"));
+  EXPECT_EQ("matches regular expression \"Hi.*\"", Describe(m1));
+
+  Matcher<const char*> m2 = MatchesRegex(new RE("a.*"));
+  EXPECT_EQ("matches regular expression \"a.*\"", Describe(m2));
+}
+
+// Tests ContainsRegex().
+
+TEST(ContainsRegexTest, MatchesStringContainingGivenRegex) {
+  const Matcher<const char*> m1 = ContainsRegex(string("a.*z"));
+  EXPECT_TRUE(m1.Matches("az"));
+  EXPECT_TRUE(m1.Matches("0abcz1"));
+  EXPECT_FALSE(m1.Matches(NULL));
+
+  const Matcher<const string&> m2 = ContainsRegex(new RE("a.*z"));
+  EXPECT_TRUE(m2.Matches("azbz"));
+  EXPECT_TRUE(m2.Matches("az1"));
+  EXPECT_FALSE(m2.Matches("1a"));
+}
+
+TEST(ContainsRegexTest, CanDescribeSelf) {
+  Matcher<const std::string> m1 = ContainsRegex("Hi.*");
+  EXPECT_EQ("contains regular expression \"Hi.*\"", Describe(m1));
+
+  Matcher<const char*> m2 = ContainsRegex(new RE("a.*"));
+  EXPECT_EQ("contains regular expression \"a.*\"", Describe(m2));
+}
+
+// Tests for wide strings.
+#if GTEST_HAS_STD_WSTRING
+TEST(StdWideStrEqTest, MatchesEqual) {
+  Matcher<const wchar_t*> m = StrEq(::std::wstring(L"Hello"));
+  EXPECT_TRUE(m.Matches(L"Hello"));
+  EXPECT_FALSE(m.Matches(L"hello"));
+  EXPECT_FALSE(m.Matches(NULL));
+
+  Matcher<const ::std::wstring&> m2 = StrEq(L"Hello");
+  EXPECT_TRUE(m2.Matches(L"Hello"));
+  EXPECT_FALSE(m2.Matches(L"Hi"));
+
+  Matcher<const ::std::wstring&> m3 = StrEq(L"\xD3\x576\x8D3\xC74D");
+  EXPECT_TRUE(m3.Matches(L"\xD3\x576\x8D3\xC74D"));
+  EXPECT_FALSE(m3.Matches(L"\xD3\x576\x8D3\xC74E"));
+
+  ::std::wstring str(L"01204500800");
+  str[3] = L'\0';
+  Matcher<const ::std::wstring&> m4 = StrEq(str);
+  EXPECT_TRUE(m4.Matches(str));
+  str[0] = str[6] = str[7] = str[9] = str[10] = L'\0';
+  Matcher<const ::std::wstring&> m5 = StrEq(str);
+  EXPECT_TRUE(m5.Matches(str));
+}
+
+TEST(StdWideStrEqTest, CanDescribeSelf) {
+  Matcher< ::std::wstring> m = StrEq(L"Hi-\'\"?\\\a\b\f\n\r\t\v");
+  EXPECT_EQ("is equal to L\"Hi-\'\\\"?\\\\\\a\\b\\f\\n\\r\\t\\v\"",
+    Describe(m));
+
+  Matcher< ::std::wstring> m2 = StrEq(L"\xD3\x576\x8D3\xC74D");
+  EXPECT_EQ("is equal to L\"\\xD3\\x576\\x8D3\\xC74D\"",
+    Describe(m2));
+
+  ::std::wstring str(L"01204500800");
+  str[3] = L'\0';
+  Matcher<const ::std::wstring&> m4 = StrEq(str);
+  EXPECT_EQ("is equal to L\"012\\04500800\"", Describe(m4));
+  str[0] = str[6] = str[7] = str[9] = str[10] = L'\0';
+  Matcher<const ::std::wstring&> m5 = StrEq(str);
+  EXPECT_EQ("is equal to L\"\\012\\045\\0\\08\\0\\0\"", Describe(m5));
+}
+
+TEST(StdWideStrNeTest, MatchesUnequalString) {
+  Matcher<const wchar_t*> m = StrNe(L"Hello");
+  EXPECT_TRUE(m.Matches(L""));
+  EXPECT_TRUE(m.Matches(NULL));
+  EXPECT_FALSE(m.Matches(L"Hello"));
+
+  Matcher< ::std::wstring> m2 = StrNe(::std::wstring(L"Hello"));
+  EXPECT_TRUE(m2.Matches(L"hello"));
+  EXPECT_FALSE(m2.Matches(L"Hello"));
+}
+
+TEST(StdWideStrNeTest, CanDescribeSelf) {
+  Matcher<const wchar_t*> m = StrNe(L"Hi");
+  EXPECT_EQ("isn't equal to L\"Hi\"", Describe(m));
+}
+
+TEST(StdWideStrCaseEqTest, MatchesEqualStringIgnoringCase) {
+  Matcher<const wchar_t*> m = StrCaseEq(::std::wstring(L"Hello"));
+  EXPECT_TRUE(m.Matches(L"Hello"));
+  EXPECT_TRUE(m.Matches(L"hello"));
+  EXPECT_FALSE(m.Matches(L"Hi"));
+  EXPECT_FALSE(m.Matches(NULL));
+
+  Matcher<const ::std::wstring&> m2 = StrCaseEq(L"Hello");
+  EXPECT_TRUE(m2.Matches(L"hello"));
+  EXPECT_FALSE(m2.Matches(L"Hi"));
+}
+
+TEST(StdWideStrCaseEqTest, MatchesEqualStringWith0IgnoringCase) {
+  ::std::wstring str1(L"oabocdooeoo");
+  ::std::wstring str2(L"OABOCDOOEOO");
+  Matcher<const ::std::wstring&> m0 = StrCaseEq(str1);
+  EXPECT_FALSE(m0.Matches(str2 + ::std::wstring(1, L'\0')));
+
+  str1[3] = str2[3] = L'\0';
+  Matcher<const ::std::wstring&> m1 = StrCaseEq(str1);
+  EXPECT_TRUE(m1.Matches(str2));
+
+  str1[0] = str1[6] = str1[7] = str1[10] = L'\0';
+  str2[0] = str2[6] = str2[7] = str2[10] = L'\0';
+  Matcher<const ::std::wstring&> m2 = StrCaseEq(str1);
+  str1[9] = str2[9] = L'\0';
+  EXPECT_FALSE(m2.Matches(str2));
+
+  Matcher<const ::std::wstring&> m3 = StrCaseEq(str1);
+  EXPECT_TRUE(m3.Matches(str2));
+
+  EXPECT_FALSE(m3.Matches(str2 + L"x"));
+  str2.append(1, L'\0');
+  EXPECT_FALSE(m3.Matches(str2));
+  EXPECT_FALSE(m3.Matches(::std::wstring(str2, 0, 9)));
+}
+
+TEST(StdWideStrCaseEqTest, CanDescribeSelf) {
+  Matcher< ::std::wstring> m = StrCaseEq(L"Hi");
+  EXPECT_EQ("is equal to (ignoring case) L\"Hi\"", Describe(m));
+}
+
+TEST(StdWideStrCaseNeTest, MatchesUnequalStringIgnoringCase) {
+  Matcher<const wchar_t*> m = StrCaseNe(L"Hello");
+  EXPECT_TRUE(m.Matches(L"Hi"));
+  EXPECT_TRUE(m.Matches(NULL));
+  EXPECT_FALSE(m.Matches(L"Hello"));
+  EXPECT_FALSE(m.Matches(L"hello"));
+
+  Matcher< ::std::wstring> m2 = StrCaseNe(::std::wstring(L"Hello"));
+  EXPECT_TRUE(m2.Matches(L""));
+  EXPECT_FALSE(m2.Matches(L"Hello"));
+}
+
+TEST(StdWideStrCaseNeTest, CanDescribeSelf) {
+  Matcher<const wchar_t*> m = StrCaseNe(L"Hi");
+  EXPECT_EQ("isn't equal to (ignoring case) L\"Hi\"", Describe(m));
+}
+
+// Tests that HasSubstr() works for matching wstring-typed values.
+TEST(StdWideHasSubstrTest, WorksForStringClasses) {
+  const Matcher< ::std::wstring> m1 = HasSubstr(L"foo");
+  EXPECT_TRUE(m1.Matches(::std::wstring(L"I love food.")));
+  EXPECT_FALSE(m1.Matches(::std::wstring(L"tofo")));
+
+  const Matcher<const ::std::wstring&> m2 = HasSubstr(L"foo");
+  EXPECT_TRUE(m2.Matches(::std::wstring(L"I love food.")));
+  EXPECT_FALSE(m2.Matches(::std::wstring(L"tofo")));
+}
+
+// Tests that HasSubstr() works for matching C-wide-string-typed values.
+TEST(StdWideHasSubstrTest, WorksForCStrings) {
+  const Matcher<wchar_t*> m1 = HasSubstr(L"foo");
+  EXPECT_TRUE(m1.Matches(const_cast<wchar_t*>(L"I love food.")));
+  EXPECT_FALSE(m1.Matches(const_cast<wchar_t*>(L"tofo")));
+  EXPECT_FALSE(m1.Matches(NULL));
+
+  const Matcher<const wchar_t*> m2 = HasSubstr(L"foo");
+  EXPECT_TRUE(m2.Matches(L"I love food."));
+  EXPECT_FALSE(m2.Matches(L"tofo"));
+  EXPECT_FALSE(m2.Matches(NULL));
+}
+
+// Tests that HasSubstr(s) describes itself properly.
+TEST(StdWideHasSubstrTest, CanDescribeSelf) {
+  Matcher< ::std::wstring> m = HasSubstr(L"foo\n\"");
+  EXPECT_EQ("has substring L\"foo\\n\\\"\"", Describe(m));
+}
+
+// Tests StartsWith(s).
+
+TEST(StdWideStartsWithTest, MatchesStringWithGivenPrefix) {
+  const Matcher<const wchar_t*> m1 = StartsWith(::std::wstring(L""));
+  EXPECT_TRUE(m1.Matches(L"Hi"));
+  EXPECT_TRUE(m1.Matches(L""));
+  EXPECT_FALSE(m1.Matches(NULL));
+
+  const Matcher<const ::std::wstring&> m2 = StartsWith(L"Hi");
+  EXPECT_TRUE(m2.Matches(L"Hi"));
+  EXPECT_TRUE(m2.Matches(L"Hi Hi!"));
+  EXPECT_TRUE(m2.Matches(L"High"));
+  EXPECT_FALSE(m2.Matches(L"H"));
+  EXPECT_FALSE(m2.Matches(L" Hi"));
+}
+
+TEST(StdWideStartsWithTest, CanDescribeSelf) {
+  Matcher<const ::std::wstring> m = StartsWith(L"Hi");
+  EXPECT_EQ("starts with L\"Hi\"", Describe(m));
+}
+
+// Tests EndsWith(s).
+
+TEST(StdWideEndsWithTest, MatchesStringWithGivenSuffix) {
+  const Matcher<const wchar_t*> m1 = EndsWith(L"");
+  EXPECT_TRUE(m1.Matches(L"Hi"));
+  EXPECT_TRUE(m1.Matches(L""));
+  EXPECT_FALSE(m1.Matches(NULL));
+
+  const Matcher<const ::std::wstring&> m2 = EndsWith(::std::wstring(L"Hi"));
+  EXPECT_TRUE(m2.Matches(L"Hi"));
+  EXPECT_TRUE(m2.Matches(L"Wow Hi Hi"));
+  EXPECT_TRUE(m2.Matches(L"Super Hi"));
+  EXPECT_FALSE(m2.Matches(L"i"));
+  EXPECT_FALSE(m2.Matches(L"Hi "));
+}
+
+TEST(StdWideEndsWithTest, CanDescribeSelf) {
+  Matcher<const ::std::wstring> m = EndsWith(L"Hi");
+  EXPECT_EQ("ends with L\"Hi\"", Describe(m));
+}
+
+#endif  // GTEST_HAS_STD_WSTRING
+
+#if GTEST_HAS_GLOBAL_WSTRING
+TEST(GlobalWideStrEqTest, MatchesEqual) {
+  Matcher<const wchar_t*> m = StrEq(::wstring(L"Hello"));
+  EXPECT_TRUE(m.Matches(L"Hello"));
+  EXPECT_FALSE(m.Matches(L"hello"));
+  EXPECT_FALSE(m.Matches(NULL));
+
+  Matcher<const ::wstring&> m2 = StrEq(L"Hello");
+  EXPECT_TRUE(m2.Matches(L"Hello"));
+  EXPECT_FALSE(m2.Matches(L"Hi"));
+
+  Matcher<const ::wstring&> m3 = StrEq(L"\xD3\x576\x8D3\xC74D");
+  EXPECT_TRUE(m3.Matches(L"\xD3\x576\x8D3\xC74D"));
+  EXPECT_FALSE(m3.Matches(L"\xD3\x576\x8D3\xC74E"));
+
+  ::wstring str(L"01204500800");
+  str[3] = L'\0';
+  Matcher<const ::wstring&> m4 = StrEq(str);
+  EXPECT_TRUE(m4.Matches(str));
+  str[0] = str[6] = str[7] = str[9] = str[10] = L'\0';
+  Matcher<const ::wstring&> m5 = StrEq(str);
+  EXPECT_TRUE(m5.Matches(str));
+}
+
+TEST(GlobalWideStrEqTest, CanDescribeSelf) {
+  Matcher< ::wstring> m = StrEq(L"Hi-\'\"?\\\a\b\f\n\r\t\v");
+  EXPECT_EQ("is equal to L\"Hi-\'\\\"?\\\\\\a\\b\\f\\n\\r\\t\\v\"",
+    Describe(m));
+
+  Matcher< ::wstring> m2 = StrEq(L"\xD3\x576\x8D3\xC74D");
+  EXPECT_EQ("is equal to L\"\\xD3\\x576\\x8D3\\xC74D\"",
+    Describe(m2));
+
+  ::wstring str(L"01204500800");
+  str[3] = L'\0';
+  Matcher<const ::wstring&> m4 = StrEq(str);
+  EXPECT_EQ("is equal to L\"012\\04500800\"", Describe(m4));
+  str[0] = str[6] = str[7] = str[9] = str[10] = L'\0';
+  Matcher<const ::wstring&> m5 = StrEq(str);
+  EXPECT_EQ("is equal to L\"\\012\\045\\0\\08\\0\\0\"", Describe(m5));
+}
+
+TEST(GlobalWideStrNeTest, MatchesUnequalString) {
+  Matcher<const wchar_t*> m = StrNe(L"Hello");
+  EXPECT_TRUE(m.Matches(L""));
+  EXPECT_TRUE(m.Matches(NULL));
+  EXPECT_FALSE(m.Matches(L"Hello"));
+
+  Matcher< ::wstring> m2 = StrNe(::wstring(L"Hello"));
+  EXPECT_TRUE(m2.Matches(L"hello"));
+  EXPECT_FALSE(m2.Matches(L"Hello"));
+}
+
+TEST(GlobalWideStrNeTest, CanDescribeSelf) {
+  Matcher<const wchar_t*> m = StrNe(L"Hi");
+  EXPECT_EQ("isn't equal to L\"Hi\"", Describe(m));
+}
+
+TEST(GlobalWideStrCaseEqTest, MatchesEqualStringIgnoringCase) {
+  Matcher<const wchar_t*> m = StrCaseEq(::wstring(L"Hello"));
+  EXPECT_TRUE(m.Matches(L"Hello"));
+  EXPECT_TRUE(m.Matches(L"hello"));
+  EXPECT_FALSE(m.Matches(L"Hi"));
+  EXPECT_FALSE(m.Matches(NULL));
+
+  Matcher<const ::wstring&> m2 = StrCaseEq(L"Hello");
+  EXPECT_TRUE(m2.Matches(L"hello"));
+  EXPECT_FALSE(m2.Matches(L"Hi"));
+}
+
+TEST(GlobalWideStrCaseEqTest, MatchesEqualStringWith0IgnoringCase) {
+  ::wstring str1(L"oabocdooeoo");
+  ::wstring str2(L"OABOCDOOEOO");
+  Matcher<const ::wstring&> m0 = StrCaseEq(str1);
+  EXPECT_FALSE(m0.Matches(str2 + ::wstring(1, L'\0')));
+
+  str1[3] = str2[3] = L'\0';
+  Matcher<const ::wstring&> m1 = StrCaseEq(str1);
+  EXPECT_TRUE(m1.Matches(str2));
+
+  str1[0] = str1[6] = str1[7] = str1[10] = L'\0';
+  str2[0] = str2[6] = str2[7] = str2[10] = L'\0';
+  Matcher<const ::wstring&> m2 = StrCaseEq(str1);
+  str1[9] = str2[9] = L'\0';
+  EXPECT_FALSE(m2.Matches(str2));
+
+  Matcher<const ::wstring&> m3 = StrCaseEq(str1);
+  EXPECT_TRUE(m3.Matches(str2));
+
+  EXPECT_FALSE(m3.Matches(str2 + L"x"));
+  str2.append(1, L'\0');
+  EXPECT_FALSE(m3.Matches(str2));
+  EXPECT_FALSE(m3.Matches(::wstring(str2, 0, 9)));
+}
+
+TEST(GlobalWideStrCaseEqTest, CanDescribeSelf) {
+  Matcher< ::wstring> m = StrCaseEq(L"Hi");
+  EXPECT_EQ("is equal to (ignoring case) L\"Hi\"", Describe(m));
+}
+
+TEST(GlobalWideStrCaseNeTest, MatchesUnequalStringIgnoringCase) {
+  Matcher<const wchar_t*> m = StrCaseNe(L"Hello");
+  EXPECT_TRUE(m.Matches(L"Hi"));
+  EXPECT_TRUE(m.Matches(NULL));
+  EXPECT_FALSE(m.Matches(L"Hello"));
+  EXPECT_FALSE(m.Matches(L"hello"));
+
+  Matcher< ::wstring> m2 = StrCaseNe(::wstring(L"Hello"));
+  EXPECT_TRUE(m2.Matches(L""));
+  EXPECT_FALSE(m2.Matches(L"Hello"));
+}
+
+TEST(GlobalWideStrCaseNeTest, CanDescribeSelf) {
+  Matcher<const wchar_t*> m = StrCaseNe(L"Hi");
+  EXPECT_EQ("isn't equal to (ignoring case) L\"Hi\"", Describe(m));
+}
+
+// Tests that HasSubstr() works for matching wstring-typed values.
+TEST(GlobalWideHasSubstrTest, WorksForStringClasses) {
+  const Matcher< ::wstring> m1 = HasSubstr(L"foo");
+  EXPECT_TRUE(m1.Matches(::wstring(L"I love food.")));
+  EXPECT_FALSE(m1.Matches(::wstring(L"tofo")));
+
+  const Matcher<const ::wstring&> m2 = HasSubstr(L"foo");
+  EXPECT_TRUE(m2.Matches(::wstring(L"I love food.")));
+  EXPECT_FALSE(m2.Matches(::wstring(L"tofo")));
+}
+
+// Tests that HasSubstr() works for matching C-wide-string-typed values.
+TEST(GlobalWideHasSubstrTest, WorksForCStrings) {
+  const Matcher<wchar_t*> m1 = HasSubstr(L"foo");
+  EXPECT_TRUE(m1.Matches(const_cast<wchar_t*>(L"I love food.")));
+  EXPECT_FALSE(m1.Matches(const_cast<wchar_t*>(L"tofo")));
+  EXPECT_FALSE(m1.Matches(NULL));
+
+  const Matcher<const wchar_t*> m2 = HasSubstr(L"foo");
+  EXPECT_TRUE(m2.Matches(L"I love food."));
+  EXPECT_FALSE(m2.Matches(L"tofo"));
+  EXPECT_FALSE(m2.Matches(NULL));
+}
+
+// Tests that HasSubstr(s) describes itself properly.
+TEST(GlobalWideHasSubstrTest, CanDescribeSelf) {
+  Matcher< ::wstring> m = HasSubstr(L"foo\n\"");
+  EXPECT_EQ("has substring L\"foo\\n\\\"\"", Describe(m));
+}
+
+// Tests StartsWith(s).
+
+TEST(GlobalWideStartsWithTest, MatchesStringWithGivenPrefix) {
+  const Matcher<const wchar_t*> m1 = StartsWith(::wstring(L""));
+  EXPECT_TRUE(m1.Matches(L"Hi"));
+  EXPECT_TRUE(m1.Matches(L""));
+  EXPECT_FALSE(m1.Matches(NULL));
+
+  const Matcher<const ::wstring&> m2 = StartsWith(L"Hi");
+  EXPECT_TRUE(m2.Matches(L"Hi"));
+  EXPECT_TRUE(m2.Matches(L"Hi Hi!"));
+  EXPECT_TRUE(m2.Matches(L"High"));
+  EXPECT_FALSE(m2.Matches(L"H"));
+  EXPECT_FALSE(m2.Matches(L" Hi"));
+}
+
+TEST(GlobalWideStartsWithTest, CanDescribeSelf) {
+  Matcher<const ::wstring> m = StartsWith(L"Hi");
+  EXPECT_EQ("starts with L\"Hi\"", Describe(m));
+}
+
+// Tests EndsWith(s).
+
+TEST(GlobalWideEndsWithTest, MatchesStringWithGivenSuffix) {
+  const Matcher<const wchar_t*> m1 = EndsWith(L"");
+  EXPECT_TRUE(m1.Matches(L"Hi"));
+  EXPECT_TRUE(m1.Matches(L""));
+  EXPECT_FALSE(m1.Matches(NULL));
+
+  const Matcher<const ::wstring&> m2 = EndsWith(::wstring(L"Hi"));
+  EXPECT_TRUE(m2.Matches(L"Hi"));
+  EXPECT_TRUE(m2.Matches(L"Wow Hi Hi"));
+  EXPECT_TRUE(m2.Matches(L"Super Hi"));
+  EXPECT_FALSE(m2.Matches(L"i"));
+  EXPECT_FALSE(m2.Matches(L"Hi "));
+}
+
+TEST(GlobalWideEndsWithTest, CanDescribeSelf) {
+  Matcher<const ::wstring> m = EndsWith(L"Hi");
+  EXPECT_EQ("ends with L\"Hi\"", Describe(m));
+}
+
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+
+typedef ::testing::tuple<long, int> Tuple2;  // NOLINT
+
+// Tests that Eq() matches a 2-tuple where the first field == the
+// second field.
+TEST(Eq2Test, MatchesEqualArguments) {
+  Matcher<const Tuple2&> m = Eq();
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 5)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 6)));
+}
+
+// Tests that Eq() describes itself properly.
+TEST(Eq2Test, CanDescribeSelf) {
+  Matcher<const Tuple2&> m = Eq();
+  EXPECT_EQ("are an equal pair", Describe(m));
+}
+
+// Tests that Ge() matches a 2-tuple where the first field >= the
+// second field.
+TEST(Ge2Test, MatchesGreaterThanOrEqualArguments) {
+  Matcher<const Tuple2&> m = Ge();
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 4)));
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 5)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 6)));
+}
+
+// Tests that Ge() describes itself properly.
+TEST(Ge2Test, CanDescribeSelf) {
+  Matcher<const Tuple2&> m = Ge();
+  EXPECT_EQ("are a pair where the first >= the second", Describe(m));
+}
+
+// Tests that Gt() matches a 2-tuple where the first field > the
+// second field.
+TEST(Gt2Test, MatchesGreaterThanArguments) {
+  Matcher<const Tuple2&> m = Gt();
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 4)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 5)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 6)));
+}
+
+// Tests that Gt() describes itself properly.
+TEST(Gt2Test, CanDescribeSelf) {
+  Matcher<const Tuple2&> m = Gt();
+  EXPECT_EQ("are a pair where the first > the second", Describe(m));
+}
+
+// Tests that Le() matches a 2-tuple where the first field <= the
+// second field.
+TEST(Le2Test, MatchesLessThanOrEqualArguments) {
+  Matcher<const Tuple2&> m = Le();
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 6)));
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 5)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 4)));
+}
+
+// Tests that Le() describes itself properly.
+TEST(Le2Test, CanDescribeSelf) {
+  Matcher<const Tuple2&> m = Le();
+  EXPECT_EQ("are a pair where the first <= the second", Describe(m));
+}
+
+// Tests that Lt() matches a 2-tuple where the first field < the
+// second field.
+TEST(Lt2Test, MatchesLessThanArguments) {
+  Matcher<const Tuple2&> m = Lt();
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 6)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 5)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 4)));
+}
+
+// Tests that Lt() describes itself properly.
+TEST(Lt2Test, CanDescribeSelf) {
+  Matcher<const Tuple2&> m = Lt();
+  EXPECT_EQ("are a pair where the first < the second", Describe(m));
+}
+
+// Tests that Ne() matches a 2-tuple where the first field != the
+// second field.
+TEST(Ne2Test, MatchesUnequalArguments) {
+  Matcher<const Tuple2&> m = Ne();
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 6)));
+  EXPECT_TRUE(m.Matches(Tuple2(5L, 4)));
+  EXPECT_FALSE(m.Matches(Tuple2(5L, 5)));
+}
+
+// Tests that Ne() describes itself properly.
+TEST(Ne2Test, CanDescribeSelf) {
+  Matcher<const Tuple2&> m = Ne();
+  EXPECT_EQ("are an unequal pair", Describe(m));
+}
+
+// Tests that Not(m) matches any value that doesn't match m.
+TEST(NotTest, NegatesMatcher) {
+  Matcher<int> m;
+  m = Not(Eq(2));
+  EXPECT_TRUE(m.Matches(3));
+  EXPECT_FALSE(m.Matches(2));
+}
+
+// Tests that Not(m) describes itself properly.
+TEST(NotTest, CanDescribeSelf) {
+  Matcher<int> m = Not(Eq(5));
+  EXPECT_EQ("isn't equal to 5", Describe(m));
+}
+
+// Tests that monomorphic matchers are safely cast by the Not matcher.
+TEST(NotTest, NotMatcherSafelyCastsMonomorphicMatchers) {
+  // greater_than_5 is a monomorphic matcher.
+  Matcher<int> greater_than_5 = Gt(5);
+
+  Matcher<const int&> m = Not(greater_than_5);
+  Matcher<int&> m2 = Not(greater_than_5);
+  Matcher<int&> m3 = Not(m);
+}
+
+// Helper to allow easy testing of AllOf matchers with num parameters.
+void AllOfMatches(int num, const Matcher<int>& m) {
+  SCOPED_TRACE(Describe(m));
+  EXPECT_TRUE(m.Matches(0));
+  for (int i = 1; i <= num; ++i) {
+    EXPECT_FALSE(m.Matches(i));
+  }
+  EXPECT_TRUE(m.Matches(num + 1));
+}
+
+// Tests that AllOf(m1, ..., mn) matches any value that matches all of
+// the given matchers.
+TEST(AllOfTest, MatchesWhenAllMatch) {
+  Matcher<int> m;
+  m = AllOf(Le(2), Ge(1));
+  EXPECT_TRUE(m.Matches(1));
+  EXPECT_TRUE(m.Matches(2));
+  EXPECT_FALSE(m.Matches(0));
+  EXPECT_FALSE(m.Matches(3));
+
+  m = AllOf(Gt(0), Ne(1), Ne(2));
+  EXPECT_TRUE(m.Matches(3));
+  EXPECT_FALSE(m.Matches(2));
+  EXPECT_FALSE(m.Matches(1));
+  EXPECT_FALSE(m.Matches(0));
+
+  m = AllOf(Gt(0), Ne(1), Ne(2), Ne(3));
+  EXPECT_TRUE(m.Matches(4));
+  EXPECT_FALSE(m.Matches(3));
+  EXPECT_FALSE(m.Matches(2));
+  EXPECT_FALSE(m.Matches(1));
+  EXPECT_FALSE(m.Matches(0));
+
+  m = AllOf(Ge(0), Lt(10), Ne(3), Ne(5), Ne(7));
+  EXPECT_TRUE(m.Matches(0));
+  EXPECT_TRUE(m.Matches(1));
+  EXPECT_FALSE(m.Matches(3));
+
+  // The following tests for varying number of sub-matchers. Due to the way
+  // the sub-matchers are handled it is enough to test every sub-matcher once
+  // with sub-matchers using the same matcher type. Varying matcher types are
+  // checked for above.
+  AllOfMatches(2, AllOf(Ne(1), Ne(2)));
+  AllOfMatches(3, AllOf(Ne(1), Ne(2), Ne(3)));
+  AllOfMatches(4, AllOf(Ne(1), Ne(2), Ne(3), Ne(4)));
+  AllOfMatches(5, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5)));
+  AllOfMatches(6, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6)));
+  AllOfMatches(7, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7)));
+  AllOfMatches(8, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7),
+                        Ne(8)));
+  AllOfMatches(9, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7),
+                        Ne(8), Ne(9)));
+  AllOfMatches(10, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8),
+                         Ne(9), Ne(10)));
+}
+
+#if GTEST_LANG_CXX11
+// Tests the variadic version of the AllOfMatcher.
+TEST(AllOfTest, VariadicMatchesWhenAllMatch) {
+  // Make sure AllOf is defined in the right namespace and does not depend on
+  // ADL.
+  ::testing::AllOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
+  Matcher<int> m = AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8),
+                         Ne(9), Ne(10), Ne(11));
+  EXPECT_THAT(Describe(m), EndsWith("and (isn't equal to 11))))))))))"));
+  AllOfMatches(11, m);
+  AllOfMatches(50, AllOf(Ne(1), Ne(2), Ne(3), Ne(4), Ne(5), Ne(6), Ne(7), Ne(8),
+                         Ne(9), Ne(10), Ne(11), Ne(12), Ne(13), Ne(14), Ne(15),
+                         Ne(16), Ne(17), Ne(18), Ne(19), Ne(20), Ne(21), Ne(22),
+                         Ne(23), Ne(24), Ne(25), Ne(26), Ne(27), Ne(28), Ne(29),
+                         Ne(30), Ne(31), Ne(32), Ne(33), Ne(34), Ne(35), Ne(36),
+                         Ne(37), Ne(38), Ne(39), Ne(40), Ne(41), Ne(42), Ne(43),
+                         Ne(44), Ne(45), Ne(46), Ne(47), Ne(48), Ne(49),
+                         Ne(50)));
+}
+
+#endif  // GTEST_LANG_CXX11
+
+// Tests that AllOf(m1, ..., mn) describes itself properly.
+TEST(AllOfTest, CanDescribeSelf) {
+  Matcher<int> m;
+  m = AllOf(Le(2), Ge(1));
+  EXPECT_EQ("(is <= 2) and (is >= 1)", Describe(m));
+
+  m = AllOf(Gt(0), Ne(1), Ne(2));
+  EXPECT_EQ("(is > 0) and "
+            "((isn't equal to 1) and "
+            "(isn't equal to 2))",
+            Describe(m));
+
+
+  m = AllOf(Gt(0), Ne(1), Ne(2), Ne(3));
+  EXPECT_EQ("((is > 0) and "
+            "(isn't equal to 1)) and "
+            "((isn't equal to 2) and "
+            "(isn't equal to 3))",
+            Describe(m));
+
+
+  m = AllOf(Ge(0), Lt(10), Ne(3), Ne(5), Ne(7));
+  EXPECT_EQ("((is >= 0) and "
+            "(is < 10)) and "
+            "((isn't equal to 3) and "
+            "((isn't equal to 5) and "
+            "(isn't equal to 7)))",
+            Describe(m));
+}
+
+// Tests that AllOf(m1, ..., mn) describes its negation properly.
+TEST(AllOfTest, CanDescribeNegation) {
+  Matcher<int> m;
+  m = AllOf(Le(2), Ge(1));
+  EXPECT_EQ("(isn't <= 2) or "
+            "(isn't >= 1)",
+            DescribeNegation(m));
+
+  m = AllOf(Gt(0), Ne(1), Ne(2));
+  EXPECT_EQ("(isn't > 0) or "
+            "((is equal to 1) or "
+            "(is equal to 2))",
+            DescribeNegation(m));
+
+
+  m = AllOf(Gt(0), Ne(1), Ne(2), Ne(3));
+  EXPECT_EQ("((isn't > 0) or "
+            "(is equal to 1)) or "
+            "((is equal to 2) or "
+            "(is equal to 3))",
+            DescribeNegation(m));
+
+
+  m = AllOf(Ge(0), Lt(10), Ne(3), Ne(5), Ne(7));
+  EXPECT_EQ("((isn't >= 0) or "
+            "(isn't < 10)) or "
+            "((is equal to 3) or "
+            "((is equal to 5) or "
+            "(is equal to 7)))",
+            DescribeNegation(m));
+}
+
+// Tests that monomorphic matchers are safely cast by the AllOf matcher.
+TEST(AllOfTest, AllOfMatcherSafelyCastsMonomorphicMatchers) {
+  // greater_than_5 and less_than_10 are monomorphic matchers.
+  Matcher<int> greater_than_5 = Gt(5);
+  Matcher<int> less_than_10 = Lt(10);
+
+  Matcher<const int&> m = AllOf(greater_than_5, less_than_10);
+  Matcher<int&> m2 = AllOf(greater_than_5, less_than_10);
+  Matcher<int&> m3 = AllOf(greater_than_5, m2);
+
+  // Tests that BothOf works when composing itself.
+  Matcher<const int&> m4 = AllOf(greater_than_5, less_than_10, less_than_10);
+  Matcher<int&> m5 = AllOf(greater_than_5, less_than_10, less_than_10);
+}
+
+TEST(AllOfTest, ExplainsResult) {
+  Matcher<int> m;
+
+  // Successful match.  Both matchers need to explain.  The second
+  // matcher doesn't give an explanation, so only the first matcher's
+  // explanation is printed.
+  m = AllOf(GreaterThan(10), Lt(30));
+  EXPECT_EQ("which is 15 more than 10", Explain(m, 25));
+
+  // Successful match.  Both matchers need to explain.
+  m = AllOf(GreaterThan(10), GreaterThan(20));
+  EXPECT_EQ("which is 20 more than 10, and which is 10 more than 20",
+            Explain(m, 30));
+
+  // Successful match.  All matchers need to explain.  The second
+  // matcher doesn't given an explanation.
+  m = AllOf(GreaterThan(10), Lt(30), GreaterThan(20));
+  EXPECT_EQ("which is 15 more than 10, and which is 5 more than 20",
+            Explain(m, 25));
+
+  // Successful match.  All matchers need to explain.
+  m = AllOf(GreaterThan(10), GreaterThan(20), GreaterThan(30));
+  EXPECT_EQ("which is 30 more than 10, and which is 20 more than 20, "
+            "and which is 10 more than 30",
+            Explain(m, 40));
+
+  // Failed match.  The first matcher, which failed, needs to
+  // explain.
+  m = AllOf(GreaterThan(10), GreaterThan(20));
+  EXPECT_EQ("which is 5 less than 10", Explain(m, 5));
+
+  // Failed match.  The second matcher, which failed, needs to
+  // explain.  Since it doesn't given an explanation, nothing is
+  // printed.
+  m = AllOf(GreaterThan(10), Lt(30));
+  EXPECT_EQ("", Explain(m, 40));
+
+  // Failed match.  The second matcher, which failed, needs to
+  // explain.
+  m = AllOf(GreaterThan(10), GreaterThan(20));
+  EXPECT_EQ("which is 5 less than 20", Explain(m, 15));
+}
+
+// Helper to allow easy testing of AnyOf matchers with num parameters.
+void AnyOfMatches(int num, const Matcher<int>& m) {
+  SCOPED_TRACE(Describe(m));
+  EXPECT_FALSE(m.Matches(0));
+  for (int i = 1; i <= num; ++i) {
+    EXPECT_TRUE(m.Matches(i));
+  }
+  EXPECT_FALSE(m.Matches(num + 1));
+}
+
+// Tests that AnyOf(m1, ..., mn) matches any value that matches at
+// least one of the given matchers.
+TEST(AnyOfTest, MatchesWhenAnyMatches) {
+  Matcher<int> m;
+  m = AnyOf(Le(1), Ge(3));
+  EXPECT_TRUE(m.Matches(1));
+  EXPECT_TRUE(m.Matches(4));
+  EXPECT_FALSE(m.Matches(2));
+
+  m = AnyOf(Lt(0), Eq(1), Eq(2));
+  EXPECT_TRUE(m.Matches(-1));
+  EXPECT_TRUE(m.Matches(1));
+  EXPECT_TRUE(m.Matches(2));
+  EXPECT_FALSE(m.Matches(0));
+
+  m = AnyOf(Lt(0), Eq(1), Eq(2), Eq(3));
+  EXPECT_TRUE(m.Matches(-1));
+  EXPECT_TRUE(m.Matches(1));
+  EXPECT_TRUE(m.Matches(2));
+  EXPECT_TRUE(m.Matches(3));
+  EXPECT_FALSE(m.Matches(0));
+
+  m = AnyOf(Le(0), Gt(10), 3, 5, 7);
+  EXPECT_TRUE(m.Matches(0));
+  EXPECT_TRUE(m.Matches(11));
+  EXPECT_TRUE(m.Matches(3));
+  EXPECT_FALSE(m.Matches(2));
+
+  // The following tests for varying number of sub-matchers. Due to the way
+  // the sub-matchers are handled it is enough to test every sub-matcher once
+  // with sub-matchers using the same matcher type. Varying matcher types are
+  // checked for above.
+  AnyOfMatches(2, AnyOf(1, 2));
+  AnyOfMatches(3, AnyOf(1, 2, 3));
+  AnyOfMatches(4, AnyOf(1, 2, 3, 4));
+  AnyOfMatches(5, AnyOf(1, 2, 3, 4, 5));
+  AnyOfMatches(6, AnyOf(1, 2, 3, 4, 5, 6));
+  AnyOfMatches(7, AnyOf(1, 2, 3, 4, 5, 6, 7));
+  AnyOfMatches(8, AnyOf(1, 2, 3, 4, 5, 6, 7, 8));
+  AnyOfMatches(9, AnyOf(1, 2, 3, 4, 5, 6, 7, 8, 9));
+  AnyOfMatches(10, AnyOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
+}
+
+#if GTEST_LANG_CXX11
+// Tests the variadic version of the AnyOfMatcher.
+TEST(AnyOfTest, VariadicMatchesWhenAnyMatches) {
+  // Also make sure AnyOf is defined in the right namespace and does not depend
+  // on ADL.
+  Matcher<int> m = ::testing::AnyOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
+
+  EXPECT_THAT(Describe(m), EndsWith("or (is equal to 11))))))))))"));
+  AnyOfMatches(11, m);
+  AnyOfMatches(50, AnyOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+                         11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+                         21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+                         31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+                         41, 42, 43, 44, 45, 46, 47, 48, 49, 50));
+}
+
+#endif  // GTEST_LANG_CXX11
+
+// Tests that AnyOf(m1, ..., mn) describes itself properly.
+TEST(AnyOfTest, CanDescribeSelf) {
+  Matcher<int> m;
+  m = AnyOf(Le(1), Ge(3));
+  EXPECT_EQ("(is <= 1) or (is >= 3)",
+            Describe(m));
+
+  m = AnyOf(Lt(0), Eq(1), Eq(2));
+  EXPECT_EQ("(is < 0) or "
+            "((is equal to 1) or (is equal to 2))",
+            Describe(m));
+
+  m = AnyOf(Lt(0), Eq(1), Eq(2), Eq(3));
+  EXPECT_EQ("((is < 0) or "
+            "(is equal to 1)) or "
+            "((is equal to 2) or "
+            "(is equal to 3))",
+            Describe(m));
+
+  m = AnyOf(Le(0), Gt(10), 3, 5, 7);
+  EXPECT_EQ("((is <= 0) or "
+            "(is > 10)) or "
+            "((is equal to 3) or "
+            "((is equal to 5) or "
+            "(is equal to 7)))",
+            Describe(m));
+}
+
+// Tests that AnyOf(m1, ..., mn) describes its negation properly.
+TEST(AnyOfTest, CanDescribeNegation) {
+  Matcher<int> m;
+  m = AnyOf(Le(1), Ge(3));
+  EXPECT_EQ("(isn't <= 1) and (isn't >= 3)",
+            DescribeNegation(m));
+
+  m = AnyOf(Lt(0), Eq(1), Eq(2));
+  EXPECT_EQ("(isn't < 0) and "
+            "((isn't equal to 1) and (isn't equal to 2))",
+            DescribeNegation(m));
+
+  m = AnyOf(Lt(0), Eq(1), Eq(2), Eq(3));
+  EXPECT_EQ("((isn't < 0) and "
+            "(isn't equal to 1)) and "
+            "((isn't equal to 2) and "
+            "(isn't equal to 3))",
+            DescribeNegation(m));
+
+  m = AnyOf(Le(0), Gt(10), 3, 5, 7);
+  EXPECT_EQ("((isn't <= 0) and "
+            "(isn't > 10)) and "
+            "((isn't equal to 3) and "
+            "((isn't equal to 5) and "
+            "(isn't equal to 7)))",
+            DescribeNegation(m));
+}
+
+// Tests that monomorphic matchers are safely cast by the AnyOf matcher.
+TEST(AnyOfTest, AnyOfMatcherSafelyCastsMonomorphicMatchers) {
+  // greater_than_5 and less_than_10 are monomorphic matchers.
+  Matcher<int> greater_than_5 = Gt(5);
+  Matcher<int> less_than_10 = Lt(10);
+
+  Matcher<const int&> m = AnyOf(greater_than_5, less_than_10);
+  Matcher<int&> m2 = AnyOf(greater_than_5, less_than_10);
+  Matcher<int&> m3 = AnyOf(greater_than_5, m2);
+
+  // Tests that EitherOf works when composing itself.
+  Matcher<const int&> m4 = AnyOf(greater_than_5, less_than_10, less_than_10);
+  Matcher<int&> m5 = AnyOf(greater_than_5, less_than_10, less_than_10);
+}
+
+TEST(AnyOfTest, ExplainsResult) {
+  Matcher<int> m;
+
+  // Failed match.  Both matchers need to explain.  The second
+  // matcher doesn't give an explanation, so only the first matcher's
+  // explanation is printed.
+  m = AnyOf(GreaterThan(10), Lt(0));
+  EXPECT_EQ("which is 5 less than 10", Explain(m, 5));
+
+  // Failed match.  Both matchers need to explain.
+  m = AnyOf(GreaterThan(10), GreaterThan(20));
+  EXPECT_EQ("which is 5 less than 10, and which is 15 less than 20",
+            Explain(m, 5));
+
+  // Failed match.  All matchers need to explain.  The second
+  // matcher doesn't given an explanation.
+  m = AnyOf(GreaterThan(10), Gt(20), GreaterThan(30));
+  EXPECT_EQ("which is 5 less than 10, and which is 25 less than 30",
+            Explain(m, 5));
+
+  // Failed match.  All matchers need to explain.
+  m = AnyOf(GreaterThan(10), GreaterThan(20), GreaterThan(30));
+  EXPECT_EQ("which is 5 less than 10, and which is 15 less than 20, "
+            "and which is 25 less than 30",
+            Explain(m, 5));
+
+  // Successful match.  The first matcher, which succeeded, needs to
+  // explain.
+  m = AnyOf(GreaterThan(10), GreaterThan(20));
+  EXPECT_EQ("which is 5 more than 10", Explain(m, 15));
+
+  // Successful match.  The second matcher, which succeeded, needs to
+  // explain.  Since it doesn't given an explanation, nothing is
+  // printed.
+  m = AnyOf(GreaterThan(10), Lt(30));
+  EXPECT_EQ("", Explain(m, 0));
+
+  // Successful match.  The second matcher, which succeeded, needs to
+  // explain.
+  m = AnyOf(GreaterThan(30), GreaterThan(20));
+  EXPECT_EQ("which is 5 more than 20", Explain(m, 25));
+}
+
+// The following predicate function and predicate functor are for
+// testing the Truly(predicate) matcher.
+
+// Returns non-zero if the input is positive.  Note that the return
+// type of this function is not bool.  It's OK as Truly() accepts any
+// unary function or functor whose return type can be implicitly
+// converted to bool.
+int IsPositive(double x) {
+  return x > 0 ? 1 : 0;
+}
+
+// This functor returns true if the input is greater than the given
+// number.
+class IsGreaterThan {
+ public:
+  explicit IsGreaterThan(int threshold) : threshold_(threshold) {}
+
+  bool operator()(int n) const { return n > threshold_; }
+
+ private:
+  int threshold_;
+};
+
+// For testing Truly().
+const int foo = 0;
+
+// This predicate returns true iff the argument references foo and has
+// a zero value.
+bool ReferencesFooAndIsZero(const int& n) {
+  return (&n == &foo) && (n == 0);
+}
+
+// Tests that Truly(predicate) matches what satisfies the given
+// predicate.
+TEST(TrulyTest, MatchesWhatSatisfiesThePredicate) {
+  Matcher<double> m = Truly(IsPositive);
+  EXPECT_TRUE(m.Matches(2.0));
+  EXPECT_FALSE(m.Matches(-1.5));
+}
+
+// Tests that Truly(predicate_functor) works too.
+TEST(TrulyTest, CanBeUsedWithFunctor) {
+  Matcher<int> m = Truly(IsGreaterThan(5));
+  EXPECT_TRUE(m.Matches(6));
+  EXPECT_FALSE(m.Matches(4));
+}
+
+// A class that can be implicitly converted to bool.
+class ConvertibleToBool {
+ public:
+  explicit ConvertibleToBool(int number) : number_(number) {}
+  operator bool() const { return number_ != 0; }
+
+ private:
+  int number_;
+};
+
+ConvertibleToBool IsNotZero(int number) {
+  return ConvertibleToBool(number);
+}
+
+// Tests that the predicate used in Truly() may return a class that's
+// implicitly convertible to bool, even when the class has no
+// operator!().
+TEST(TrulyTest, PredicateCanReturnAClassConvertibleToBool) {
+  Matcher<int> m = Truly(IsNotZero);
+  EXPECT_TRUE(m.Matches(1));
+  EXPECT_FALSE(m.Matches(0));
+}
+
+// Tests that Truly(predicate) can describe itself properly.
+TEST(TrulyTest, CanDescribeSelf) {
+  Matcher<double> m = Truly(IsPositive);
+  EXPECT_EQ("satisfies the given predicate",
+            Describe(m));
+}
+
+// Tests that Truly(predicate) works when the matcher takes its
+// argument by reference.
+TEST(TrulyTest, WorksForByRefArguments) {
+  Matcher<const int&> m = Truly(ReferencesFooAndIsZero);
+  EXPECT_TRUE(m.Matches(foo));
+  int n = 0;
+  EXPECT_FALSE(m.Matches(n));
+}
+
+// Tests that Matches(m) is a predicate satisfied by whatever that
+// matches matcher m.
+TEST(MatchesTest, IsSatisfiedByWhatMatchesTheMatcher) {
+  EXPECT_TRUE(Matches(Ge(0))(1));
+  EXPECT_FALSE(Matches(Eq('a'))('b'));
+}
+
+// Tests that Matches(m) works when the matcher takes its argument by
+// reference.
+TEST(MatchesTest, WorksOnByRefArguments) {
+  int m = 0, n = 0;
+  EXPECT_TRUE(Matches(AllOf(Ref(n), Eq(0)))(n));
+  EXPECT_FALSE(Matches(Ref(m))(n));
+}
+
+// Tests that a Matcher on non-reference type can be used in
+// Matches().
+TEST(MatchesTest, WorksWithMatcherOnNonRefType) {
+  Matcher<int> eq5 = Eq(5);
+  EXPECT_TRUE(Matches(eq5)(5));
+  EXPECT_FALSE(Matches(eq5)(2));
+}
+
+// Tests Value(value, matcher).  Since Value() is a simple wrapper for
+// Matches(), which has been tested already, we don't spend a lot of
+// effort on testing Value().
+TEST(ValueTest, WorksWithPolymorphicMatcher) {
+  EXPECT_TRUE(Value("hi", StartsWith("h")));
+  EXPECT_FALSE(Value(5, Gt(10)));
+}
+
+TEST(ValueTest, WorksWithMonomorphicMatcher) {
+  const Matcher<int> is_zero = Eq(0);
+  EXPECT_TRUE(Value(0, is_zero));
+  EXPECT_FALSE(Value('a', is_zero));
+
+  int n = 0;
+  const Matcher<const int&> ref_n = Ref(n);
+  EXPECT_TRUE(Value(n, ref_n));
+  EXPECT_FALSE(Value(1, ref_n));
+}
+
+TEST(ExplainMatchResultTest, WorksWithPolymorphicMatcher) {
+  StringMatchResultListener listener1;
+  EXPECT_TRUE(ExplainMatchResult(PolymorphicIsEven(), 42, &listener1));
+  EXPECT_EQ("% 2 == 0", listener1.str());
+
+  StringMatchResultListener listener2;
+  EXPECT_FALSE(ExplainMatchResult(Ge(42), 1.5, &listener2));
+  EXPECT_EQ("", listener2.str());
+}
+
+TEST(ExplainMatchResultTest, WorksWithMonomorphicMatcher) {
+  const Matcher<int> is_even = PolymorphicIsEven();
+  StringMatchResultListener listener1;
+  EXPECT_TRUE(ExplainMatchResult(is_even, 42, &listener1));
+  EXPECT_EQ("% 2 == 0", listener1.str());
+
+  const Matcher<const double&> is_zero = Eq(0);
+  StringMatchResultListener listener2;
+  EXPECT_FALSE(ExplainMatchResult(is_zero, 1.5, &listener2));
+  EXPECT_EQ("", listener2.str());
+}
+
+MATCHER_P(Really, inner_matcher, "") {
+  return ExplainMatchResult(inner_matcher, arg, result_listener);
+}
+
+TEST(ExplainMatchResultTest, WorksInsideMATCHER) {
+  EXPECT_THAT(0, Really(Eq(0)));
+}
+
+TEST(AllArgsTest, WorksForTuple) {
+  EXPECT_THAT(make_tuple(1, 2L), AllArgs(Lt()));
+  EXPECT_THAT(make_tuple(2L, 1), Not(AllArgs(Lt())));
+}
+
+TEST(AllArgsTest, WorksForNonTuple) {
+  EXPECT_THAT(42, AllArgs(Gt(0)));
+  EXPECT_THAT('a', Not(AllArgs(Eq('b'))));
+}
+
+class AllArgsHelper {
+ public:
+  AllArgsHelper() {}
+
+  MOCK_METHOD2(Helper, int(char x, int y));
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(AllArgsHelper);
+};
+
+TEST(AllArgsTest, WorksInWithClause) {
+  AllArgsHelper helper;
+  ON_CALL(helper, Helper(_, _))
+      .With(AllArgs(Lt()))
+      .WillByDefault(Return(1));
+  EXPECT_CALL(helper, Helper(_, _));
+  EXPECT_CALL(helper, Helper(_, _))
+      .With(AllArgs(Gt()))
+      .WillOnce(Return(2));
+
+  EXPECT_EQ(1, helper.Helper('\1', 2));
+  EXPECT_EQ(2, helper.Helper('a', 1));
+}
+
+// Tests that ASSERT_THAT() and EXPECT_THAT() work when the value
+// matches the matcher.
+TEST(MatcherAssertionTest, WorksWhenMatcherIsSatisfied) {
+  ASSERT_THAT(5, Ge(2)) << "This should succeed.";
+  ASSERT_THAT("Foo", EndsWith("oo"));
+  EXPECT_THAT(2, AllOf(Le(7), Ge(0))) << "This should succeed too.";
+  EXPECT_THAT("Hello", StartsWith("Hell"));
+}
+
+// Tests that ASSERT_THAT() and EXPECT_THAT() work when the value
+// doesn't match the matcher.
+TEST(MatcherAssertionTest, WorksWhenMatcherIsNotSatisfied) {
+  // 'n' must be static as it is used in an EXPECT_FATAL_FAILURE(),
+  // which cannot reference auto variables.
+  static unsigned short n;  // NOLINT
+  n = 5;
+
+  // VC++ prior to version 8.0 SP1 has a bug where it will not see any
+  // functions declared in the namespace scope from within nested classes.
+  // EXPECT/ASSERT_(NON)FATAL_FAILURE macros use nested classes so that all
+  // namespace-level functions invoked inside them need to be explicitly
+  // resolved.
+  EXPECT_FATAL_FAILURE(ASSERT_THAT(n, ::testing::Gt(10)),
+                       "Value of: n\n"
+                       "Expected: is > 10\n"
+                       "  Actual: 5" + OfType("unsigned short"));
+  n = 0;
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_THAT(n, ::testing::AllOf(::testing::Le(7), ::testing::Ge(5))),
+      "Value of: n\n"
+      "Expected: (is <= 7) and (is >= 5)\n"
+      "  Actual: 0" + OfType("unsigned short"));
+}
+
+// Tests that ASSERT_THAT() and EXPECT_THAT() work when the argument
+// has a reference type.
+TEST(MatcherAssertionTest, WorksForByRefArguments) {
+  // We use a static variable here as EXPECT_FATAL_FAILURE() cannot
+  // reference auto variables.
+  static int n;
+  n = 0;
+  EXPECT_THAT(n, AllOf(Le(7), Ref(n)));
+  EXPECT_FATAL_FAILURE(ASSERT_THAT(n, ::testing::Not(::testing::Ref(n))),
+                       "Value of: n\n"
+                       "Expected: does not reference the variable @");
+  // Tests the "Actual" part.
+  EXPECT_FATAL_FAILURE(ASSERT_THAT(n, ::testing::Not(::testing::Ref(n))),
+                       "Actual: 0" + OfType("int") + ", which is located @");
+}
+
+#if !GTEST_OS_SYMBIAN
+// Tests that ASSERT_THAT() and EXPECT_THAT() work when the matcher is
+// monomorphic.
+
+// ASSERT_THAT("hello", starts_with_he) fails to compile with Nokia's
+// Symbian compiler: it tries to compile
+// template<T, U> class MatcherCastImpl { ...
+//   virtual bool MatchAndExplain(T x, ...) const {
+//     return source_matcher_.MatchAndExplain(static_cast<U>(x), ...);
+// with U == string and T == const char*
+// With ASSERT_THAT("hello"...) changed to ASSERT_THAT(string("hello") ... )
+// the compiler silently crashes with no output.
+// If MatcherCastImpl is changed to use U(x) instead of static_cast<U>(x)
+// the code compiles but the converted string is bogus.
+TEST(MatcherAssertionTest, WorksForMonomorphicMatcher) {
+  Matcher<const char*> starts_with_he = StartsWith("he");
+  ASSERT_THAT("hello", starts_with_he);
+
+  Matcher<const string&> ends_with_ok = EndsWith("ok");
+  ASSERT_THAT("book", ends_with_ok);
+  const string bad = "bad";
+  EXPECT_NONFATAL_FAILURE(EXPECT_THAT(bad, ends_with_ok),
+                          "Value of: bad\n"
+                          "Expected: ends with \"ok\"\n"
+                          "  Actual: \"bad\"");
+  Matcher<int> is_greater_than_5 = Gt(5);
+  EXPECT_NONFATAL_FAILURE(EXPECT_THAT(5, is_greater_than_5),
+                          "Value of: 5\n"
+                          "Expected: is > 5\n"
+                          "  Actual: 5" + OfType("int"));
+}
+#endif  // !GTEST_OS_SYMBIAN
+
+// Tests floating-point matchers.
+template <typename RawType>
+class FloatingPointTest : public testing::Test {
+ protected:
+  typedef testing::internal::FloatingPoint<RawType> Floating;
+  typedef typename Floating::Bits Bits;
+
+  FloatingPointTest()
+      : max_ulps_(Floating::kMaxUlps),
+        zero_bits_(Floating(0).bits()),
+        one_bits_(Floating(1).bits()),
+        infinity_bits_(Floating(Floating::Infinity()).bits()),
+        close_to_positive_zero_(AsBits(zero_bits_ + max_ulps_/2)),
+        close_to_negative_zero_(AsBits(zero_bits_ + max_ulps_ - max_ulps_/2)),
+        further_from_negative_zero_(-AsBits(
+            zero_bits_ + max_ulps_ + 1 - max_ulps_/2)),
+        close_to_one_(AsBits(one_bits_ + max_ulps_)),
+        further_from_one_(AsBits(one_bits_ + max_ulps_ + 1)),
+        infinity_(Floating::Infinity()),
+        close_to_infinity_(AsBits(infinity_bits_ - max_ulps_)),
+        further_from_infinity_(AsBits(infinity_bits_ - max_ulps_ - 1)),
+        max_(Floating::Max()),
+        nan1_(AsBits(Floating::kExponentBitMask | 1)),
+        nan2_(AsBits(Floating::kExponentBitMask | 200)) {
+  }
+
+  void TestSize() {
+    EXPECT_EQ(sizeof(RawType), sizeof(Bits));
+  }
+
+  // A battery of tests for FloatingEqMatcher::Matches.
+  // matcher_maker is a pointer to a function which creates a FloatingEqMatcher.
+  void TestMatches(
+      testing::internal::FloatingEqMatcher<RawType> (*matcher_maker)(RawType)) {
+    Matcher<RawType> m1 = matcher_maker(0.0);
+    EXPECT_TRUE(m1.Matches(-0.0));
+    EXPECT_TRUE(m1.Matches(close_to_positive_zero_));
+    EXPECT_TRUE(m1.Matches(close_to_negative_zero_));
+    EXPECT_FALSE(m1.Matches(1.0));
+
+    Matcher<RawType> m2 = matcher_maker(close_to_positive_zero_);
+    EXPECT_FALSE(m2.Matches(further_from_negative_zero_));
+
+    Matcher<RawType> m3 = matcher_maker(1.0);
+    EXPECT_TRUE(m3.Matches(close_to_one_));
+    EXPECT_FALSE(m3.Matches(further_from_one_));
+
+    // Test commutativity: matcher_maker(0.0).Matches(1.0) was tested above.
+    EXPECT_FALSE(m3.Matches(0.0));
+
+    Matcher<RawType> m4 = matcher_maker(-infinity_);
+    EXPECT_TRUE(m4.Matches(-close_to_infinity_));
+
+    Matcher<RawType> m5 = matcher_maker(infinity_);
+    EXPECT_TRUE(m5.Matches(close_to_infinity_));
+
+    // This is interesting as the representations of infinity_ and nan1_
+    // are only 1 DLP apart.
+    EXPECT_FALSE(m5.Matches(nan1_));
+
+    // matcher_maker can produce a Matcher<const RawType&>, which is needed in
+    // some cases.
+    Matcher<const RawType&> m6 = matcher_maker(0.0);
+    EXPECT_TRUE(m6.Matches(-0.0));
+    EXPECT_TRUE(m6.Matches(close_to_positive_zero_));
+    EXPECT_FALSE(m6.Matches(1.0));
+
+    // matcher_maker can produce a Matcher<RawType&>, which is needed in some
+    // cases.
+    Matcher<RawType&> m7 = matcher_maker(0.0);
+    RawType x = 0.0;
+    EXPECT_TRUE(m7.Matches(x));
+    x = 0.01f;
+    EXPECT_FALSE(m7.Matches(x));
+  }
+
+  // Pre-calculated numbers to be used by the tests.
+
+  const size_t max_ulps_;
+
+  const Bits zero_bits_;  // The bits that represent 0.0.
+  const Bits one_bits_;  // The bits that represent 1.0.
+  const Bits infinity_bits_;  // The bits that represent +infinity.
+
+  // Some numbers close to 0.0.
+  const RawType close_to_positive_zero_;
+  const RawType close_to_negative_zero_;
+  const RawType further_from_negative_zero_;
+
+  // Some numbers close to 1.0.
+  const RawType close_to_one_;
+  const RawType further_from_one_;
+
+  // Some numbers close to +infinity.
+  const RawType infinity_;
+  const RawType close_to_infinity_;
+  const RawType further_from_infinity_;
+
+  // Maximum representable value that's not infinity.
+  const RawType max_;
+
+  // Some NaNs.
+  const RawType nan1_;
+  const RawType nan2_;
+
+ private:
+  template <typename T>
+  static RawType AsBits(T value) {
+    return Floating::ReinterpretBits(static_cast<Bits>(value));
+  }
+};
+
+// Tests floating-point matchers with fixed epsilons.
+template <typename RawType>
+class FloatingPointNearTest : public FloatingPointTest<RawType> {
+ protected:
+  typedef FloatingPointTest<RawType> ParentType;
+
+  // A battery of tests for FloatingEqMatcher::Matches with a fixed epsilon.
+  // matcher_maker is a pointer to a function which creates a FloatingEqMatcher.
+  void TestNearMatches(
+      testing::internal::FloatingEqMatcher<RawType>
+          (*matcher_maker)(RawType, RawType)) {
+    Matcher<RawType> m1 = matcher_maker(0.0, 0.0);
+    EXPECT_TRUE(m1.Matches(0.0));
+    EXPECT_TRUE(m1.Matches(-0.0));
+    EXPECT_FALSE(m1.Matches(ParentType::close_to_positive_zero_));
+    EXPECT_FALSE(m1.Matches(ParentType::close_to_negative_zero_));
+    EXPECT_FALSE(m1.Matches(1.0));
+
+    Matcher<RawType> m2 = matcher_maker(0.0, 1.0);
+    EXPECT_TRUE(m2.Matches(0.0));
+    EXPECT_TRUE(m2.Matches(-0.0));
+    EXPECT_TRUE(m2.Matches(1.0));
+    EXPECT_TRUE(m2.Matches(-1.0));
+    EXPECT_FALSE(m2.Matches(ParentType::close_to_one_));
+    EXPECT_FALSE(m2.Matches(-ParentType::close_to_one_));
+
+    // Check that inf matches inf, regardless of the of the specified max
+    // absolute error.
+    Matcher<RawType> m3 = matcher_maker(ParentType::infinity_, 0.0);
+    EXPECT_TRUE(m3.Matches(ParentType::infinity_));
+    EXPECT_FALSE(m3.Matches(ParentType::close_to_infinity_));
+    EXPECT_FALSE(m3.Matches(-ParentType::infinity_));
+
+    Matcher<RawType> m4 = matcher_maker(-ParentType::infinity_, 0.0);
+    EXPECT_TRUE(m4.Matches(-ParentType::infinity_));
+    EXPECT_FALSE(m4.Matches(-ParentType::close_to_infinity_));
+    EXPECT_FALSE(m4.Matches(ParentType::infinity_));
+
+    // Test various overflow scenarios.
+    Matcher<RawType> m5 = matcher_maker(ParentType::max_, ParentType::max_);
+    EXPECT_TRUE(m5.Matches(ParentType::max_));
+    EXPECT_FALSE(m5.Matches(-ParentType::max_));
+
+    Matcher<RawType> m6 = matcher_maker(-ParentType::max_, ParentType::max_);
+    EXPECT_FALSE(m6.Matches(ParentType::max_));
+    EXPECT_TRUE(m6.Matches(-ParentType::max_));
+
+    Matcher<RawType> m7 = matcher_maker(ParentType::max_, 0);
+    EXPECT_TRUE(m7.Matches(ParentType::max_));
+    EXPECT_FALSE(m7.Matches(-ParentType::max_));
+
+    Matcher<RawType> m8 = matcher_maker(-ParentType::max_, 0);
+    EXPECT_FALSE(m8.Matches(ParentType::max_));
+    EXPECT_TRUE(m8.Matches(-ParentType::max_));
+
+    // The difference between max() and -max() normally overflows to infinity,
+    // but it should still match if the max_abs_error is also infinity.
+    Matcher<RawType> m9 = matcher_maker(
+        ParentType::max_, ParentType::infinity_);
+    EXPECT_TRUE(m8.Matches(-ParentType::max_));
+
+    // matcher_maker can produce a Matcher<const RawType&>, which is needed in
+    // some cases.
+    Matcher<const RawType&> m10 = matcher_maker(0.0, 1.0);
+    EXPECT_TRUE(m10.Matches(-0.0));
+    EXPECT_TRUE(m10.Matches(ParentType::close_to_positive_zero_));
+    EXPECT_FALSE(m10.Matches(ParentType::close_to_one_));
+
+    // matcher_maker can produce a Matcher<RawType&>, which is needed in some
+    // cases.
+    Matcher<RawType&> m11 = matcher_maker(0.0, 1.0);
+    RawType x = 0.0;
+    EXPECT_TRUE(m11.Matches(x));
+    x = 1.0f;
+    EXPECT_TRUE(m11.Matches(x));
+    x = -1.0f;
+    EXPECT_TRUE(m11.Matches(x));
+    x = 1.1f;
+    EXPECT_FALSE(m11.Matches(x));
+    x = -1.1f;
+    EXPECT_FALSE(m11.Matches(x));
+  }
+};
+
+// Instantiate FloatingPointTest for testing floats.
+typedef FloatingPointTest<float> FloatTest;
+
+TEST_F(FloatTest, FloatEqApproximatelyMatchesFloats) {
+  TestMatches(&FloatEq);
+}
+
+TEST_F(FloatTest, NanSensitiveFloatEqApproximatelyMatchesFloats) {
+  TestMatches(&NanSensitiveFloatEq);
+}
+
+TEST_F(FloatTest, FloatEqCannotMatchNaN) {
+  // FloatEq never matches NaN.
+  Matcher<float> m = FloatEq(nan1_);
+  EXPECT_FALSE(m.Matches(nan1_));
+  EXPECT_FALSE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST_F(FloatTest, NanSensitiveFloatEqCanMatchNaN) {
+  // NanSensitiveFloatEq will match NaN.
+  Matcher<float> m = NanSensitiveFloatEq(nan1_);
+  EXPECT_TRUE(m.Matches(nan1_));
+  EXPECT_TRUE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST_F(FloatTest, FloatEqCanDescribeSelf) {
+  Matcher<float> m1 = FloatEq(2.0f);
+  EXPECT_EQ("is approximately 2", Describe(m1));
+  EXPECT_EQ("isn't approximately 2", DescribeNegation(m1));
+
+  Matcher<float> m2 = FloatEq(0.5f);
+  EXPECT_EQ("is approximately 0.5", Describe(m2));
+  EXPECT_EQ("isn't approximately 0.5", DescribeNegation(m2));
+
+  Matcher<float> m3 = FloatEq(nan1_);
+  EXPECT_EQ("never matches", Describe(m3));
+  EXPECT_EQ("is anything", DescribeNegation(m3));
+}
+
+TEST_F(FloatTest, NanSensitiveFloatEqCanDescribeSelf) {
+  Matcher<float> m1 = NanSensitiveFloatEq(2.0f);
+  EXPECT_EQ("is approximately 2", Describe(m1));
+  EXPECT_EQ("isn't approximately 2", DescribeNegation(m1));
+
+  Matcher<float> m2 = NanSensitiveFloatEq(0.5f);
+  EXPECT_EQ("is approximately 0.5", Describe(m2));
+  EXPECT_EQ("isn't approximately 0.5", DescribeNegation(m2));
+
+  Matcher<float> m3 = NanSensitiveFloatEq(nan1_);
+  EXPECT_EQ("is NaN", Describe(m3));
+  EXPECT_EQ("isn't NaN", DescribeNegation(m3));
+}
+
+// Instantiate FloatingPointTest for testing floats with a user-specified
+// max absolute error.
+typedef FloatingPointNearTest<float> FloatNearTest;
+
+TEST_F(FloatNearTest, FloatNearMatches) {
+  TestNearMatches(&FloatNear);
+}
+
+TEST_F(FloatNearTest, NanSensitiveFloatNearApproximatelyMatchesFloats) {
+  TestNearMatches(&NanSensitiveFloatNear);
+}
+
+TEST_F(FloatNearTest, FloatNearCanDescribeSelf) {
+  Matcher<float> m1 = FloatNear(2.0f, 0.5f);
+  EXPECT_EQ("is approximately 2 (absolute error <= 0.5)", Describe(m1));
+  EXPECT_EQ(
+      "isn't approximately 2 (absolute error > 0.5)", DescribeNegation(m1));
+
+  Matcher<float> m2 = FloatNear(0.5f, 0.5f);
+  EXPECT_EQ("is approximately 0.5 (absolute error <= 0.5)", Describe(m2));
+  EXPECT_EQ(
+      "isn't approximately 0.5 (absolute error > 0.5)", DescribeNegation(m2));
+
+  Matcher<float> m3 = FloatNear(nan1_, 0.0);
+  EXPECT_EQ("never matches", Describe(m3));
+  EXPECT_EQ("is anything", DescribeNegation(m3));
+}
+
+TEST_F(FloatNearTest, NanSensitiveFloatNearCanDescribeSelf) {
+  Matcher<float> m1 = NanSensitiveFloatNear(2.0f, 0.5f);
+  EXPECT_EQ("is approximately 2 (absolute error <= 0.5)", Describe(m1));
+  EXPECT_EQ(
+      "isn't approximately 2 (absolute error > 0.5)", DescribeNegation(m1));
+
+  Matcher<float> m2 = NanSensitiveFloatNear(0.5f, 0.5f);
+  EXPECT_EQ("is approximately 0.5 (absolute error <= 0.5)", Describe(m2));
+  EXPECT_EQ(
+      "isn't approximately 0.5 (absolute error > 0.5)", DescribeNegation(m2));
+
+  Matcher<float> m3 = NanSensitiveFloatNear(nan1_, 0.1f);
+  EXPECT_EQ("is NaN", Describe(m3));
+  EXPECT_EQ("isn't NaN", DescribeNegation(m3));
+}
+
+TEST_F(FloatNearTest, FloatNearCannotMatchNaN) {
+  // FloatNear never matches NaN.
+  Matcher<float> m = FloatNear(ParentType::nan1_, 0.1f);
+  EXPECT_FALSE(m.Matches(nan1_));
+  EXPECT_FALSE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST_F(FloatNearTest, NanSensitiveFloatNearCanMatchNaN) {
+  // NanSensitiveFloatNear will match NaN.
+  Matcher<float> m = NanSensitiveFloatNear(nan1_, 0.1f);
+  EXPECT_TRUE(m.Matches(nan1_));
+  EXPECT_TRUE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+// Instantiate FloatingPointTest for testing doubles.
+typedef FloatingPointTest<double> DoubleTest;
+
+TEST_F(DoubleTest, DoubleEqApproximatelyMatchesDoubles) {
+  TestMatches(&DoubleEq);
+}
+
+TEST_F(DoubleTest, NanSensitiveDoubleEqApproximatelyMatchesDoubles) {
+  TestMatches(&NanSensitiveDoubleEq);
+}
+
+TEST_F(DoubleTest, DoubleEqCannotMatchNaN) {
+  // DoubleEq never matches NaN.
+  Matcher<double> m = DoubleEq(nan1_);
+  EXPECT_FALSE(m.Matches(nan1_));
+  EXPECT_FALSE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST_F(DoubleTest, NanSensitiveDoubleEqCanMatchNaN) {
+  // NanSensitiveDoubleEq will match NaN.
+  Matcher<double> m = NanSensitiveDoubleEq(nan1_);
+  EXPECT_TRUE(m.Matches(nan1_));
+  EXPECT_TRUE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST_F(DoubleTest, DoubleEqCanDescribeSelf) {
+  Matcher<double> m1 = DoubleEq(2.0);
+  EXPECT_EQ("is approximately 2", Describe(m1));
+  EXPECT_EQ("isn't approximately 2", DescribeNegation(m1));
+
+  Matcher<double> m2 = DoubleEq(0.5);
+  EXPECT_EQ("is approximately 0.5", Describe(m2));
+  EXPECT_EQ("isn't approximately 0.5", DescribeNegation(m2));
+
+  Matcher<double> m3 = DoubleEq(nan1_);
+  EXPECT_EQ("never matches", Describe(m3));
+  EXPECT_EQ("is anything", DescribeNegation(m3));
+}
+
+TEST_F(DoubleTest, NanSensitiveDoubleEqCanDescribeSelf) {
+  Matcher<double> m1 = NanSensitiveDoubleEq(2.0);
+  EXPECT_EQ("is approximately 2", Describe(m1));
+  EXPECT_EQ("isn't approximately 2", DescribeNegation(m1));
+
+  Matcher<double> m2 = NanSensitiveDoubleEq(0.5);
+  EXPECT_EQ("is approximately 0.5", Describe(m2));
+  EXPECT_EQ("isn't approximately 0.5", DescribeNegation(m2));
+
+  Matcher<double> m3 = NanSensitiveDoubleEq(nan1_);
+  EXPECT_EQ("is NaN", Describe(m3));
+  EXPECT_EQ("isn't NaN", DescribeNegation(m3));
+}
+
+// Instantiate FloatingPointTest for testing floats with a user-specified
+// max absolute error.
+typedef FloatingPointNearTest<double> DoubleNearTest;
+
+TEST_F(DoubleNearTest, DoubleNearMatches) {
+  TestNearMatches(&DoubleNear);
+}
+
+TEST_F(DoubleNearTest, NanSensitiveDoubleNearApproximatelyMatchesDoubles) {
+  TestNearMatches(&NanSensitiveDoubleNear);
+}
+
+TEST_F(DoubleNearTest, DoubleNearCanDescribeSelf) {
+  Matcher<double> m1 = DoubleNear(2.0, 0.5);
+  EXPECT_EQ("is approximately 2 (absolute error <= 0.5)", Describe(m1));
+  EXPECT_EQ(
+      "isn't approximately 2 (absolute error > 0.5)", DescribeNegation(m1));
+
+  Matcher<double> m2 = DoubleNear(0.5, 0.5);
+  EXPECT_EQ("is approximately 0.5 (absolute error <= 0.5)", Describe(m2));
+  EXPECT_EQ(
+      "isn't approximately 0.5 (absolute error > 0.5)", DescribeNegation(m2));
+
+  Matcher<double> m3 = DoubleNear(nan1_, 0.0);
+  EXPECT_EQ("never matches", Describe(m3));
+  EXPECT_EQ("is anything", DescribeNegation(m3));
+}
+
+TEST_F(DoubleNearTest, ExplainsResultWhenMatchFails) {
+  EXPECT_EQ("", Explain(DoubleNear(2.0, 0.1), 2.05));
+  EXPECT_EQ("which is 0.2 from 2", Explain(DoubleNear(2.0, 0.1), 2.2));
+  EXPECT_EQ("which is -0.3 from 2", Explain(DoubleNear(2.0, 0.1), 1.7));
+
+  const string explanation = Explain(DoubleNear(2.1, 1e-10), 2.1 + 1.2e-10);
+  // Different C++ implementations may print floating-point numbers
+  // slightly differently.
+  EXPECT_TRUE(explanation == "which is 1.2e-10 from 2.1" ||  // GCC
+              explanation == "which is 1.2e-010 from 2.1")   // MSVC
+      << " where explanation is \"" << explanation << "\".";
+}
+
+TEST_F(DoubleNearTest, NanSensitiveDoubleNearCanDescribeSelf) {
+  Matcher<double> m1 = NanSensitiveDoubleNear(2.0, 0.5);
+  EXPECT_EQ("is approximately 2 (absolute error <= 0.5)", Describe(m1));
+  EXPECT_EQ(
+      "isn't approximately 2 (absolute error > 0.5)", DescribeNegation(m1));
+
+  Matcher<double> m2 = NanSensitiveDoubleNear(0.5, 0.5);
+  EXPECT_EQ("is approximately 0.5 (absolute error <= 0.5)", Describe(m2));
+  EXPECT_EQ(
+      "isn't approximately 0.5 (absolute error > 0.5)", DescribeNegation(m2));
+
+  Matcher<double> m3 = NanSensitiveDoubleNear(nan1_, 0.1);
+  EXPECT_EQ("is NaN", Describe(m3));
+  EXPECT_EQ("isn't NaN", DescribeNegation(m3));
+}
+
+TEST_F(DoubleNearTest, DoubleNearCannotMatchNaN) {
+  // DoubleNear never matches NaN.
+  Matcher<double> m = DoubleNear(ParentType::nan1_, 0.1);
+  EXPECT_FALSE(m.Matches(nan1_));
+  EXPECT_FALSE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST_F(DoubleNearTest, NanSensitiveDoubleNearCanMatchNaN) {
+  // NanSensitiveDoubleNear will match NaN.
+  Matcher<double> m = NanSensitiveDoubleNear(nan1_, 0.1);
+  EXPECT_TRUE(m.Matches(nan1_));
+  EXPECT_TRUE(m.Matches(nan2_));
+  EXPECT_FALSE(m.Matches(1.0));
+}
+
+TEST(PointeeTest, RawPointer) {
+  const Matcher<int*> m = Pointee(Ge(0));
+
+  int n = 1;
+  EXPECT_TRUE(m.Matches(&n));
+  n = -1;
+  EXPECT_FALSE(m.Matches(&n));
+  EXPECT_FALSE(m.Matches(NULL));
+}
+
+TEST(PointeeTest, RawPointerToConst) {
+  const Matcher<const double*> m = Pointee(Ge(0));
+
+  double x = 1;
+  EXPECT_TRUE(m.Matches(&x));
+  x = -1;
+  EXPECT_FALSE(m.Matches(&x));
+  EXPECT_FALSE(m.Matches(NULL));
+}
+
+TEST(PointeeTest, ReferenceToConstRawPointer) {
+  const Matcher<int* const &> m = Pointee(Ge(0));
+
+  int n = 1;
+  EXPECT_TRUE(m.Matches(&n));
+  n = -1;
+  EXPECT_FALSE(m.Matches(&n));
+  EXPECT_FALSE(m.Matches(NULL));
+}
+
+TEST(PointeeTest, ReferenceToNonConstRawPointer) {
+  const Matcher<double* &> m = Pointee(Ge(0));
+
+  double x = 1.0;
+  double* p = &x;
+  EXPECT_TRUE(m.Matches(p));
+  x = -1;
+  EXPECT_FALSE(m.Matches(p));
+  p = NULL;
+  EXPECT_FALSE(m.Matches(p));
+}
+
+MATCHER_P(FieldIIs, inner_matcher, "") {
+  return ExplainMatchResult(inner_matcher, arg.i, result_listener);
+}
+
+#if GTEST_HAS_RTTI
+
+TEST(WhenDynamicCastToTest, SameType) {
+  Derived derived;
+  derived.i = 4;
+
+  // Right type. A pointer is passed down.
+  Base* as_base_ptr = &derived;
+  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<Derived*>(Not(IsNull())));
+  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<Derived*>(Pointee(FieldIIs(4))));
+  EXPECT_THAT(as_base_ptr,
+              Not(WhenDynamicCastTo<Derived*>(Pointee(FieldIIs(5)))));
+}
+
+TEST(WhenDynamicCastToTest, WrongTypes) {
+  Base base;
+  Derived derived;
+  OtherDerived other_derived;
+
+  // Wrong types. NULL is passed.
+  EXPECT_THAT(&base, Not(WhenDynamicCastTo<Derived*>(Pointee(_))));
+  EXPECT_THAT(&base, WhenDynamicCastTo<Derived*>(IsNull()));
+  Base* as_base_ptr = &derived;
+  EXPECT_THAT(as_base_ptr, Not(WhenDynamicCastTo<OtherDerived*>(Pointee(_))));
+  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<OtherDerived*>(IsNull()));
+  as_base_ptr = &other_derived;
+  EXPECT_THAT(as_base_ptr, Not(WhenDynamicCastTo<Derived*>(Pointee(_))));
+  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<Derived*>(IsNull()));
+}
+
+TEST(WhenDynamicCastToTest, AlreadyNull) {
+  // Already NULL.
+  Base* as_base_ptr = NULL;
+  EXPECT_THAT(as_base_ptr, WhenDynamicCastTo<Derived*>(IsNull()));
+}
+
+struct AmbiguousCastTypes {
+  class VirtualDerived : public virtual Base {};
+  class DerivedSub1 : public VirtualDerived {};
+  class DerivedSub2 : public VirtualDerived {};
+  class ManyDerivedInHierarchy : public DerivedSub1, public DerivedSub2 {};
+};
+
+TEST(WhenDynamicCastToTest, AmbiguousCast) {
+  AmbiguousCastTypes::DerivedSub1 sub1;
+  AmbiguousCastTypes::ManyDerivedInHierarchy many_derived;
+  // Multiply derived from Base. dynamic_cast<> returns NULL.
+  Base* as_base_ptr =
+      static_cast<AmbiguousCastTypes::DerivedSub1*>(&many_derived);
+  EXPECT_THAT(as_base_ptr,
+              WhenDynamicCastTo<AmbiguousCastTypes::VirtualDerived*>(IsNull()));
+  as_base_ptr = &sub1;
+  EXPECT_THAT(
+      as_base_ptr,
+      WhenDynamicCastTo<AmbiguousCastTypes::VirtualDerived*>(Not(IsNull())));
+}
+
+TEST(WhenDynamicCastToTest, Describe) {
+  Matcher<Base*> matcher = WhenDynamicCastTo<Derived*>(Pointee(_));
+  const string prefix =
+      "when dynamic_cast to " + internal::GetTypeName<Derived*>() + ", ";
+  EXPECT_EQ(prefix + "points to a value that is anything", Describe(matcher));
+  EXPECT_EQ(prefix + "does not point to a value that is anything",
+            DescribeNegation(matcher));
+}
+
+TEST(WhenDynamicCastToTest, Explain) {
+  Matcher<Base*> matcher = WhenDynamicCastTo<Derived*>(Pointee(_));
+  Base* null = NULL;
+  EXPECT_THAT(Explain(matcher, null), HasSubstr("NULL"));
+  Derived derived;
+  EXPECT_TRUE(matcher.Matches(&derived));
+  EXPECT_THAT(Explain(matcher, &derived), HasSubstr("which points to "));
+
+  // With references, the matcher itself can fail. Test for that one.
+  Matcher<const Base&> ref_matcher = WhenDynamicCastTo<const OtherDerived&>(_);
+  EXPECT_THAT(Explain(ref_matcher, derived),
+              HasSubstr("which cannot be dynamic_cast"));
+}
+
+TEST(WhenDynamicCastToTest, GoodReference) {
+  Derived derived;
+  derived.i = 4;
+  Base& as_base_ref = derived;
+  EXPECT_THAT(as_base_ref, WhenDynamicCastTo<const Derived&>(FieldIIs(4)));
+  EXPECT_THAT(as_base_ref, WhenDynamicCastTo<const Derived&>(Not(FieldIIs(5))));
+}
+
+TEST(WhenDynamicCastToTest, BadReference) {
+  Derived derived;
+  Base& as_base_ref = derived;
+  EXPECT_THAT(as_base_ref, Not(WhenDynamicCastTo<const OtherDerived&>(_)));
+}
+
+#endif  // GTEST_HAS_RTTI
+
+// Minimal const-propagating pointer.
+template <typename T>
+class ConstPropagatingPtr {
+ public:
+  typedef T element_type;
+
+  ConstPropagatingPtr() : val_() {}
+  explicit ConstPropagatingPtr(T* t) : val_(t) {}
+  ConstPropagatingPtr(const ConstPropagatingPtr& other) : val_(other.val_) {}
+
+  T* get() { return val_; }
+  T& operator*() { return *val_; }
+  // Most smart pointers return non-const T* and T& from the next methods.
+  const T* get() const { return val_; }
+  const T& operator*() const { return *val_; }
+
+ private:
+  T* val_;
+};
+
+TEST(PointeeTest, WorksWithConstPropagatingPointers) {
+  const Matcher< ConstPropagatingPtr<int> > m = Pointee(Lt(5));
+  int three = 3;
+  const ConstPropagatingPtr<int> co(&three);
+  ConstPropagatingPtr<int> o(&three);
+  EXPECT_TRUE(m.Matches(o));
+  EXPECT_TRUE(m.Matches(co));
+  *o = 6;
+  EXPECT_FALSE(m.Matches(o));
+  EXPECT_FALSE(m.Matches(ConstPropagatingPtr<int>()));
+}
+
+TEST(PointeeTest, NeverMatchesNull) {
+  const Matcher<const char*> m = Pointee(_);
+  EXPECT_FALSE(m.Matches(NULL));
+}
+
+// Tests that we can write Pointee(value) instead of Pointee(Eq(value)).
+TEST(PointeeTest, MatchesAgainstAValue) {
+  const Matcher<int*> m = Pointee(5);
+
+  int n = 5;
+  EXPECT_TRUE(m.Matches(&n));
+  n = -1;
+  EXPECT_FALSE(m.Matches(&n));
+  EXPECT_FALSE(m.Matches(NULL));
+}
+
+TEST(PointeeTest, CanDescribeSelf) {
+  const Matcher<int*> m = Pointee(Gt(3));
+  EXPECT_EQ("points to a value that is > 3", Describe(m));
+  EXPECT_EQ("does not point to a value that is > 3",
+            DescribeNegation(m));
+}
+
+TEST(PointeeTest, CanExplainMatchResult) {
+  const Matcher<const string*> m = Pointee(StartsWith("Hi"));
+
+  EXPECT_EQ("", Explain(m, static_cast<const string*>(NULL)));
+
+  const Matcher<long*> m2 = Pointee(GreaterThan(1));  // NOLINT
+  long n = 3;  // NOLINT
+  EXPECT_EQ("which points to 3" + OfType("long") + ", which is 2 more than 1",
+            Explain(m2, &n));
+}
+
+TEST(PointeeTest, AlwaysExplainsPointee) {
+  const Matcher<int*> m = Pointee(0);
+  int n = 42;
+  EXPECT_EQ("which points to 42" + OfType("int"), Explain(m, &n));
+}
+
+// An uncopyable class.
+class Uncopyable {
+ public:
+  Uncopyable() : value_(-1) {}
+  explicit Uncopyable(int a_value) : value_(a_value) {}
+
+  int value() const { return value_; }
+  void set_value(int i) { value_ = i; }
+
+ private:
+  int value_;
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Uncopyable);
+};
+
+// Returns true iff x.value() is positive.
+bool ValueIsPositive(const Uncopyable& x) { return x.value() > 0; }
+
+MATCHER_P(UncopyableIs, inner_matcher, "") {
+  return ExplainMatchResult(inner_matcher, arg.value(), result_listener);
+}
+
+// A user-defined struct for testing Field().
+struct AStruct {
+  AStruct() : x(0), y(1.0), z(5), p(NULL) {}
+  AStruct(const AStruct& rhs)
+      : x(rhs.x), y(rhs.y), z(rhs.z.value()), p(rhs.p) {}
+
+  int x;           // A non-const field.
+  const double y;  // A const field.
+  Uncopyable z;    // An uncopyable field.
+  const char* p;   // A pointer field.
+
+ private:
+  GTEST_DISALLOW_ASSIGN_(AStruct);
+};
+
+// A derived struct for testing Field().
+struct DerivedStruct : public AStruct {
+  char ch;
+
+ private:
+  GTEST_DISALLOW_ASSIGN_(DerivedStruct);
+};
+
+// Tests that Field(&Foo::field, ...) works when field is non-const.
+TEST(FieldTest, WorksForNonConstField) {
+  Matcher<AStruct> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  EXPECT_TRUE(m.Matches(a));
+  a.x = -1;
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Field(&Foo::field, ...) works when field is const.
+TEST(FieldTest, WorksForConstField) {
+  AStruct a;
+
+  Matcher<AStruct> m = Field(&AStruct::y, Ge(0.0));
+  EXPECT_TRUE(m.Matches(a));
+  m = Field(&AStruct::y, Le(0.0));
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Field(&Foo::field, ...) works when field is not copyable.
+TEST(FieldTest, WorksForUncopyableField) {
+  AStruct a;
+
+  Matcher<AStruct> m = Field(&AStruct::z, Truly(ValueIsPositive));
+  EXPECT_TRUE(m.Matches(a));
+  m = Field(&AStruct::z, Not(Truly(ValueIsPositive)));
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Field(&Foo::field, ...) works when field is a pointer.
+TEST(FieldTest, WorksForPointerField) {
+  // Matching against NULL.
+  Matcher<AStruct> m = Field(&AStruct::p, static_cast<const char*>(NULL));
+  AStruct a;
+  EXPECT_TRUE(m.Matches(a));
+  a.p = "hi";
+  EXPECT_FALSE(m.Matches(a));
+
+  // Matching a pointer that is not NULL.
+  m = Field(&AStruct::p, StartsWith("hi"));
+  a.p = "hill";
+  EXPECT_TRUE(m.Matches(a));
+  a.p = "hole";
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Field() works when the object is passed by reference.
+TEST(FieldTest, WorksForByRefArgument) {
+  Matcher<const AStruct&> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  EXPECT_TRUE(m.Matches(a));
+  a.x = -1;
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Field(&Foo::field, ...) works when the argument's type
+// is a sub-type of Foo.
+TEST(FieldTest, WorksForArgumentOfSubType) {
+  // Note that the matcher expects DerivedStruct but we say AStruct
+  // inside Field().
+  Matcher<const DerivedStruct&> m = Field(&AStruct::x, Ge(0));
+
+  DerivedStruct d;
+  EXPECT_TRUE(m.Matches(d));
+  d.x = -1;
+  EXPECT_FALSE(m.Matches(d));
+}
+
+// Tests that Field(&Foo::field, m) works when field's type and m's
+// argument type are compatible but not the same.
+TEST(FieldTest, WorksForCompatibleMatcherType) {
+  // The field is an int, but the inner matcher expects a signed char.
+  Matcher<const AStruct&> m = Field(&AStruct::x,
+                                    Matcher<signed char>(Ge(0)));
+
+  AStruct a;
+  EXPECT_TRUE(m.Matches(a));
+  a.x = -1;
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Field() can describe itself.
+TEST(FieldTest, CanDescribeSelf) {
+  Matcher<const AStruct&> m = Field(&AStruct::x, Ge(0));
+
+  EXPECT_EQ("is an object whose given field is >= 0", Describe(m));
+  EXPECT_EQ("is an object whose given field isn't >= 0", DescribeNegation(m));
+}
+
+// Tests that Field() can explain the match result.
+TEST(FieldTest, CanExplainMatchResult) {
+  Matcher<const AStruct&> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  a.x = 1;
+  EXPECT_EQ("whose given field is 1" + OfType("int"), Explain(m, a));
+
+  m = Field(&AStruct::x, GreaterThan(0));
+  EXPECT_EQ(
+      "whose given field is 1" + OfType("int") + ", which is 1 more than 0",
+      Explain(m, a));
+}
+
+// Tests that Field() works when the argument is a pointer to const.
+TEST(FieldForPointerTest, WorksForPointerToConst) {
+  Matcher<const AStruct*> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  EXPECT_TRUE(m.Matches(&a));
+  a.x = -1;
+  EXPECT_FALSE(m.Matches(&a));
+}
+
+// Tests that Field() works when the argument is a pointer to non-const.
+TEST(FieldForPointerTest, WorksForPointerToNonConst) {
+  Matcher<AStruct*> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  EXPECT_TRUE(m.Matches(&a));
+  a.x = -1;
+  EXPECT_FALSE(m.Matches(&a));
+}
+
+// Tests that Field() works when the argument is a reference to a const pointer.
+TEST(FieldForPointerTest, WorksForReferenceToConstPointer) {
+  Matcher<AStruct* const&> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  EXPECT_TRUE(m.Matches(&a));
+  a.x = -1;
+  EXPECT_FALSE(m.Matches(&a));
+}
+
+// Tests that Field() does not match the NULL pointer.
+TEST(FieldForPointerTest, DoesNotMatchNull) {
+  Matcher<const AStruct*> m = Field(&AStruct::x, _);
+  EXPECT_FALSE(m.Matches(NULL));
+}
+
+// Tests that Field(&Foo::field, ...) works when the argument's type
+// is a sub-type of const Foo*.
+TEST(FieldForPointerTest, WorksForArgumentOfSubType) {
+  // Note that the matcher expects DerivedStruct but we say AStruct
+  // inside Field().
+  Matcher<DerivedStruct*> m = Field(&AStruct::x, Ge(0));
+
+  DerivedStruct d;
+  EXPECT_TRUE(m.Matches(&d));
+  d.x = -1;
+  EXPECT_FALSE(m.Matches(&d));
+}
+
+// Tests that Field() can describe itself when used to match a pointer.
+TEST(FieldForPointerTest, CanDescribeSelf) {
+  Matcher<const AStruct*> m = Field(&AStruct::x, Ge(0));
+
+  EXPECT_EQ("is an object whose given field is >= 0", Describe(m));
+  EXPECT_EQ("is an object whose given field isn't >= 0", DescribeNegation(m));
+}
+
+// Tests that Field() can explain the result of matching a pointer.
+TEST(FieldForPointerTest, CanExplainMatchResult) {
+  Matcher<const AStruct*> m = Field(&AStruct::x, Ge(0));
+
+  AStruct a;
+  a.x = 1;
+  EXPECT_EQ("", Explain(m, static_cast<const AStruct*>(NULL)));
+  EXPECT_EQ("which points to an object whose given field is 1" + OfType("int"),
+            Explain(m, &a));
+
+  m = Field(&AStruct::x, GreaterThan(0));
+  EXPECT_EQ("which points to an object whose given field is 1" + OfType("int") +
+            ", which is 1 more than 0", Explain(m, &a));
+}
+
+// A user-defined class for testing Property().
+class AClass {
+ public:
+  AClass() : n_(0) {}
+
+  // A getter that returns a non-reference.
+  int n() const { return n_; }
+
+  void set_n(int new_n) { n_ = new_n; }
+
+  // A getter that returns a reference to const.
+  const string& s() const { return s_; }
+
+  void set_s(const string& new_s) { s_ = new_s; }
+
+  // A getter that returns a reference to non-const.
+  double& x() const { return x_; }
+ private:
+  int n_;
+  string s_;
+
+  static double x_;
+};
+
+double AClass::x_ = 0.0;
+
+// A derived class for testing Property().
+class DerivedClass : public AClass {
+ public:
+  int k() const { return k_; }
+ private:
+  int k_;
+};
+
+// Tests that Property(&Foo::property, ...) works when property()
+// returns a non-reference.
+TEST(PropertyTest, WorksForNonReferenceProperty) {
+  Matcher<const AClass&> m = Property(&AClass::n, Ge(0));
+
+  AClass a;
+  a.set_n(1);
+  EXPECT_TRUE(m.Matches(a));
+
+  a.set_n(-1);
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Property(&Foo::property, ...) works when property()
+// returns a reference to const.
+TEST(PropertyTest, WorksForReferenceToConstProperty) {
+  Matcher<const AClass&> m = Property(&AClass::s, StartsWith("hi"));
+
+  AClass a;
+  a.set_s("hill");
+  EXPECT_TRUE(m.Matches(a));
+
+  a.set_s("hole");
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Property(&Foo::property, ...) works when property()
+// returns a reference to non-const.
+TEST(PropertyTest, WorksForReferenceToNonConstProperty) {
+  double x = 0.0;
+  AClass a;
+
+  Matcher<const AClass&> m = Property(&AClass::x, Ref(x));
+  EXPECT_FALSE(m.Matches(a));
+
+  m = Property(&AClass::x, Not(Ref(x)));
+  EXPECT_TRUE(m.Matches(a));
+}
+
+// Tests that Property(&Foo::property, ...) works when the argument is
+// passed by value.
+TEST(PropertyTest, WorksForByValueArgument) {
+  Matcher<AClass> m = Property(&AClass::s, StartsWith("hi"));
+
+  AClass a;
+  a.set_s("hill");
+  EXPECT_TRUE(m.Matches(a));
+
+  a.set_s("hole");
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Property(&Foo::property, ...) works when the argument's
+// type is a sub-type of Foo.
+TEST(PropertyTest, WorksForArgumentOfSubType) {
+  // The matcher expects a DerivedClass, but inside the Property() we
+  // say AClass.
+  Matcher<const DerivedClass&> m = Property(&AClass::n, Ge(0));
+
+  DerivedClass d;
+  d.set_n(1);
+  EXPECT_TRUE(m.Matches(d));
+
+  d.set_n(-1);
+  EXPECT_FALSE(m.Matches(d));
+}
+
+// Tests that Property(&Foo::property, m) works when property()'s type
+// and m's argument type are compatible but different.
+TEST(PropertyTest, WorksForCompatibleMatcherType) {
+  // n() returns an int but the inner matcher expects a signed char.
+  Matcher<const AClass&> m = Property(&AClass::n,
+                                      Matcher<signed char>(Ge(0)));
+
+  AClass a;
+  EXPECT_TRUE(m.Matches(a));
+  a.set_n(-1);
+  EXPECT_FALSE(m.Matches(a));
+}
+
+// Tests that Property() can describe itself.
+TEST(PropertyTest, CanDescribeSelf) {
+  Matcher<const AClass&> m = Property(&AClass::n, Ge(0));
+
+  EXPECT_EQ("is an object whose given property is >= 0", Describe(m));
+  EXPECT_EQ("is an object whose given property isn't >= 0",
+            DescribeNegation(m));
+}
+
+// Tests that Property() can explain the match result.
+TEST(PropertyTest, CanExplainMatchResult) {
+  Matcher<const AClass&> m = Property(&AClass::n, Ge(0));
+
+  AClass a;
+  a.set_n(1);
+  EXPECT_EQ("whose given property is 1" + OfType("int"), Explain(m, a));
+
+  m = Property(&AClass::n, GreaterThan(0));
+  EXPECT_EQ(
+      "whose given property is 1" + OfType("int") + ", which is 1 more than 0",
+      Explain(m, a));
+}
+
+// Tests that Property() works when the argument is a pointer to const.
+TEST(PropertyForPointerTest, WorksForPointerToConst) {
+  Matcher<const AClass*> m = Property(&AClass::n, Ge(0));
+
+  AClass a;
+  a.set_n(1);
+  EXPECT_TRUE(m.Matches(&a));
+
+  a.set_n(-1);
+  EXPECT_FALSE(m.Matches(&a));
+}
+
+// Tests that Property() works when the argument is a pointer to non-const.
+TEST(PropertyForPointerTest, WorksForPointerToNonConst) {
+  Matcher<AClass*> m = Property(&AClass::s, StartsWith("hi"));
+
+  AClass a;
+  a.set_s("hill");
+  EXPECT_TRUE(m.Matches(&a));
+
+  a.set_s("hole");
+  EXPECT_FALSE(m.Matches(&a));
+}
+
+// Tests that Property() works when the argument is a reference to a
+// const pointer.
+TEST(PropertyForPointerTest, WorksForReferenceToConstPointer) {
+  Matcher<AClass* const&> m = Property(&AClass::s, StartsWith("hi"));
+
+  AClass a;
+  a.set_s("hill");
+  EXPECT_TRUE(m.Matches(&a));
+
+  a.set_s("hole");
+  EXPECT_FALSE(m.Matches(&a));
+}
+
+// Tests that Property() does not match the NULL pointer.
+TEST(PropertyForPointerTest, WorksForReferenceToNonConstProperty) {
+  Matcher<const AClass*> m = Property(&AClass::x, _);
+  EXPECT_FALSE(m.Matches(NULL));
+}
+
+// Tests that Property(&Foo::property, ...) works when the argument's
+// type is a sub-type of const Foo*.
+TEST(PropertyForPointerTest, WorksForArgumentOfSubType) {
+  // The matcher expects a DerivedClass, but inside the Property() we
+  // say AClass.
+  Matcher<const DerivedClass*> m = Property(&AClass::n, Ge(0));
+
+  DerivedClass d;
+  d.set_n(1);
+  EXPECT_TRUE(m.Matches(&d));
+
+  d.set_n(-1);
+  EXPECT_FALSE(m.Matches(&d));
+}
+
+// Tests that Property() can describe itself when used to match a pointer.
+TEST(PropertyForPointerTest, CanDescribeSelf) {
+  Matcher<const AClass*> m = Property(&AClass::n, Ge(0));
+
+  EXPECT_EQ("is an object whose given property is >= 0", Describe(m));
+  EXPECT_EQ("is an object whose given property isn't >= 0",
+            DescribeNegation(m));
+}
+
+// Tests that Property() can explain the result of matching a pointer.
+TEST(PropertyForPointerTest, CanExplainMatchResult) {
+  Matcher<const AClass*> m = Property(&AClass::n, Ge(0));
+
+  AClass a;
+  a.set_n(1);
+  EXPECT_EQ("", Explain(m, static_cast<const AClass*>(NULL)));
+  EXPECT_EQ(
+      "which points to an object whose given property is 1" + OfType("int"),
+      Explain(m, &a));
+
+  m = Property(&AClass::n, GreaterThan(0));
+  EXPECT_EQ("which points to an object whose given property is 1" +
+            OfType("int") + ", which is 1 more than 0",
+            Explain(m, &a));
+}
+
+// Tests ResultOf.
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f is a
+// function pointer.
+string IntToStringFunction(int input) { return input == 1 ? "foo" : "bar"; }
+
+TEST(ResultOfTest, WorksForFunctionPointers) {
+  Matcher<int> matcher = ResultOf(&IntToStringFunction, Eq(string("foo")));
+
+  EXPECT_TRUE(matcher.Matches(1));
+  EXPECT_FALSE(matcher.Matches(2));
+}
+
+// Tests that ResultOf() can describe itself.
+TEST(ResultOfTest, CanDescribeItself) {
+  Matcher<int> matcher = ResultOf(&IntToStringFunction, StrEq("foo"));
+
+  EXPECT_EQ("is mapped by the given callable to a value that "
+            "is equal to \"foo\"", Describe(matcher));
+  EXPECT_EQ("is mapped by the given callable to a value that "
+            "isn't equal to \"foo\"", DescribeNegation(matcher));
+}
+
+// Tests that ResultOf() can explain the match result.
+int IntFunction(int input) { return input == 42 ? 80 : 90; }
+
+TEST(ResultOfTest, CanExplainMatchResult) {
+  Matcher<int> matcher = ResultOf(&IntFunction, Ge(85));
+  EXPECT_EQ("which is mapped by the given callable to 90" + OfType("int"),
+            Explain(matcher, 36));
+
+  matcher = ResultOf(&IntFunction, GreaterThan(85));
+  EXPECT_EQ("which is mapped by the given callable to 90" + OfType("int") +
+            ", which is 5 more than 85", Explain(matcher, 36));
+}
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f(x)
+// returns a non-reference.
+TEST(ResultOfTest, WorksForNonReferenceResults) {
+  Matcher<int> matcher = ResultOf(&IntFunction, Eq(80));
+
+  EXPECT_TRUE(matcher.Matches(42));
+  EXPECT_FALSE(matcher.Matches(36));
+}
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f(x)
+// returns a reference to non-const.
+double& DoubleFunction(double& input) { return input; }  // NOLINT
+
+Uncopyable& RefUncopyableFunction(Uncopyable& obj) {  // NOLINT
+  return obj;
+}
+
+TEST(ResultOfTest, WorksForReferenceToNonConstResults) {
+  double x = 3.14;
+  double x2 = x;
+  Matcher<double&> matcher = ResultOf(&DoubleFunction, Ref(x));
+
+  EXPECT_TRUE(matcher.Matches(x));
+  EXPECT_FALSE(matcher.Matches(x2));
+
+  // Test that ResultOf works with uncopyable objects
+  Uncopyable obj(0);
+  Uncopyable obj2(0);
+  Matcher<Uncopyable&> matcher2 =
+      ResultOf(&RefUncopyableFunction, Ref(obj));
+
+  EXPECT_TRUE(matcher2.Matches(obj));
+  EXPECT_FALSE(matcher2.Matches(obj2));
+}
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f(x)
+// returns a reference to const.
+const string& StringFunction(const string& input) { return input; }
+
+TEST(ResultOfTest, WorksForReferenceToConstResults) {
+  string s = "foo";
+  string s2 = s;
+  Matcher<const string&> matcher = ResultOf(&StringFunction, Ref(s));
+
+  EXPECT_TRUE(matcher.Matches(s));
+  EXPECT_FALSE(matcher.Matches(s2));
+}
+
+// Tests that ResultOf(f, m) works when f(x) and m's
+// argument types are compatible but different.
+TEST(ResultOfTest, WorksForCompatibleMatcherTypes) {
+  // IntFunction() returns int but the inner matcher expects a signed char.
+  Matcher<int> matcher = ResultOf(IntFunction, Matcher<signed char>(Ge(85)));
+
+  EXPECT_TRUE(matcher.Matches(36));
+  EXPECT_FALSE(matcher.Matches(42));
+}
+
+// Tests that the program aborts when ResultOf is passed
+// a NULL function pointer.
+TEST(ResultOfDeathTest, DiesOnNullFunctionPointers) {
+  EXPECT_DEATH_IF_SUPPORTED(
+      ResultOf(static_cast<string(*)(int dummy)>(NULL), Eq(string("foo"))),
+               "NULL function pointer is passed into ResultOf\\(\\)\\.");
+}
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f is a
+// function reference.
+TEST(ResultOfTest, WorksForFunctionReferences) {
+  Matcher<int> matcher = ResultOf(IntToStringFunction, StrEq("foo"));
+  EXPECT_TRUE(matcher.Matches(1));
+  EXPECT_FALSE(matcher.Matches(2));
+}
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f is a
+// function object.
+struct Functor : public ::std::unary_function<int, string> {
+  result_type operator()(argument_type input) const {
+    return IntToStringFunction(input);
+  }
+};
+
+TEST(ResultOfTest, WorksForFunctors) {
+  Matcher<int> matcher = ResultOf(Functor(), Eq(string("foo")));
+
+  EXPECT_TRUE(matcher.Matches(1));
+  EXPECT_FALSE(matcher.Matches(2));
+}
+
+// Tests that ResultOf(f, ...) compiles and works as expected when f is a
+// functor with more then one operator() defined. ResultOf() must work
+// for each defined operator().
+struct PolymorphicFunctor {
+  typedef int result_type;
+  int operator()(int n) { return n; }
+  int operator()(const char* s) { return static_cast<int>(strlen(s)); }
+};
+
+TEST(ResultOfTest, WorksForPolymorphicFunctors) {
+  Matcher<int> matcher_int = ResultOf(PolymorphicFunctor(), Ge(5));
+
+  EXPECT_TRUE(matcher_int.Matches(10));
+  EXPECT_FALSE(matcher_int.Matches(2));
+
+  Matcher<const char*> matcher_string = ResultOf(PolymorphicFunctor(), Ge(5));
+
+  EXPECT_TRUE(matcher_string.Matches("long string"));
+  EXPECT_FALSE(matcher_string.Matches("shrt"));
+}
+
+const int* ReferencingFunction(const int& n) { return &n; }
+
+struct ReferencingFunctor {
+  typedef const int* result_type;
+  result_type operator()(const int& n) { return &n; }
+};
+
+TEST(ResultOfTest, WorksForReferencingCallables) {
+  const int n = 1;
+  const int n2 = 1;
+  Matcher<const int&> matcher2 = ResultOf(ReferencingFunction, Eq(&n));
+  EXPECT_TRUE(matcher2.Matches(n));
+  EXPECT_FALSE(matcher2.Matches(n2));
+
+  Matcher<const int&> matcher3 = ResultOf(ReferencingFunctor(), Eq(&n));
+  EXPECT_TRUE(matcher3.Matches(n));
+  EXPECT_FALSE(matcher3.Matches(n2));
+}
+
+class DivisibleByImpl {
+ public:
+  explicit DivisibleByImpl(int a_divider) : divider_(a_divider) {}
+
+  // For testing using ExplainMatchResultTo() with polymorphic matchers.
+  template <typename T>
+  bool MatchAndExplain(const T& n, MatchResultListener* listener) const {
+    *listener << "which is " << (n % divider_) << " modulo "
+              << divider_;
+    return (n % divider_) == 0;
+  }
+
+  void DescribeTo(ostream* os) const {
+    *os << "is divisible by " << divider_;
+  }
+
+  void DescribeNegationTo(ostream* os) const {
+    *os << "is not divisible by " << divider_;
+  }
+
+  void set_divider(int a_divider) { divider_ = a_divider; }
+  int divider() const { return divider_; }
+
+ private:
+  int divider_;
+};
+
+PolymorphicMatcher<DivisibleByImpl> DivisibleBy(int n) {
+  return MakePolymorphicMatcher(DivisibleByImpl(n));
+}
+
+// Tests that when AllOf() fails, only the first failing matcher is
+// asked to explain why.
+TEST(ExplainMatchResultTest, AllOf_False_False) {
+  const Matcher<int> m = AllOf(DivisibleBy(4), DivisibleBy(3));
+  EXPECT_EQ("which is 1 modulo 4", Explain(m, 5));
+}
+
+// Tests that when AllOf() fails, only the first failing matcher is
+// asked to explain why.
+TEST(ExplainMatchResultTest, AllOf_False_True) {
+  const Matcher<int> m = AllOf(DivisibleBy(4), DivisibleBy(3));
+  EXPECT_EQ("which is 2 modulo 4", Explain(m, 6));
+}
+
+// Tests that when AllOf() fails, only the first failing matcher is
+// asked to explain why.
+TEST(ExplainMatchResultTest, AllOf_True_False) {
+  const Matcher<int> m = AllOf(Ge(1), DivisibleBy(3));
+  EXPECT_EQ("which is 2 modulo 3", Explain(m, 5));
+}
+
+// Tests that when AllOf() succeeds, all matchers are asked to explain
+// why.
+TEST(ExplainMatchResultTest, AllOf_True_True) {
+  const Matcher<int> m = AllOf(DivisibleBy(2), DivisibleBy(3));
+  EXPECT_EQ("which is 0 modulo 2, and which is 0 modulo 3", Explain(m, 6));
+}
+
+TEST(ExplainMatchResultTest, AllOf_True_True_2) {
+  const Matcher<int> m = AllOf(Ge(2), Le(3));
+  EXPECT_EQ("", Explain(m, 2));
+}
+
+TEST(ExplainmatcherResultTest, MonomorphicMatcher) {
+  const Matcher<int> m = GreaterThan(5);
+  EXPECT_EQ("which is 1 more than 5", Explain(m, 6));
+}
+
+// The following two tests verify that values without a public copy
+// ctor can be used as arguments to matchers like Eq(), Ge(), and etc
+// with the help of ByRef().
+
+class NotCopyable {
+ public:
+  explicit NotCopyable(int a_value) : value_(a_value) {}
+
+  int value() const { return value_; }
+
+  bool operator==(const NotCopyable& rhs) const {
+    return value() == rhs.value();
+  }
+
+  bool operator>=(const NotCopyable& rhs) const {
+    return value() >= rhs.value();
+  }
+ private:
+  int value_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(NotCopyable);
+};
+
+TEST(ByRefTest, AllowsNotCopyableConstValueInMatchers) {
+  const NotCopyable const_value1(1);
+  const Matcher<const NotCopyable&> m = Eq(ByRef(const_value1));
+
+  const NotCopyable n1(1), n2(2);
+  EXPECT_TRUE(m.Matches(n1));
+  EXPECT_FALSE(m.Matches(n2));
+}
+
+TEST(ByRefTest, AllowsNotCopyableValueInMatchers) {
+  NotCopyable value2(2);
+  const Matcher<NotCopyable&> m = Ge(ByRef(value2));
+
+  NotCopyable n1(1), n2(2);
+  EXPECT_FALSE(m.Matches(n1));
+  EXPECT_TRUE(m.Matches(n2));
+}
+
+TEST(IsEmptyTest, ImplementsIsEmpty) {
+  vector<int> container;
+  EXPECT_THAT(container, IsEmpty());
+  container.push_back(0);
+  EXPECT_THAT(container, Not(IsEmpty()));
+  container.push_back(1);
+  EXPECT_THAT(container, Not(IsEmpty()));
+}
+
+TEST(IsEmptyTest, WorksWithString) {
+  string text;
+  EXPECT_THAT(text, IsEmpty());
+  text = "foo";
+  EXPECT_THAT(text, Not(IsEmpty()));
+  text = string("\0", 1);
+  EXPECT_THAT(text, Not(IsEmpty()));
+}
+
+TEST(IsEmptyTest, CanDescribeSelf) {
+  Matcher<vector<int> > m = IsEmpty();
+  EXPECT_EQ("is empty", Describe(m));
+  EXPECT_EQ("isn't empty", DescribeNegation(m));
+}
+
+TEST(IsEmptyTest, ExplainsResult) {
+  Matcher<vector<int> > m = IsEmpty();
+  vector<int> container;
+  EXPECT_EQ("", Explain(m, container));
+  container.push_back(0);
+  EXPECT_EQ("whose size is 1", Explain(m, container));
+}
+
+TEST(SizeIsTest, ImplementsSizeIs) {
+  vector<int> container;
+  EXPECT_THAT(container, SizeIs(0));
+  EXPECT_THAT(container, Not(SizeIs(1)));
+  container.push_back(0);
+  EXPECT_THAT(container, Not(SizeIs(0)));
+  EXPECT_THAT(container, SizeIs(1));
+  container.push_back(0);
+  EXPECT_THAT(container, Not(SizeIs(0)));
+  EXPECT_THAT(container, SizeIs(2));
+}
+
+TEST(SizeIsTest, WorksWithMap) {
+  map<string, int> container;
+  EXPECT_THAT(container, SizeIs(0));
+  EXPECT_THAT(container, Not(SizeIs(1)));
+  container.insert(make_pair("foo", 1));
+  EXPECT_THAT(container, Not(SizeIs(0)));
+  EXPECT_THAT(container, SizeIs(1));
+  container.insert(make_pair("bar", 2));
+  EXPECT_THAT(container, Not(SizeIs(0)));
+  EXPECT_THAT(container, SizeIs(2));
+}
+
+TEST(SizeIsTest, WorksWithReferences) {
+  vector<int> container;
+  Matcher<const vector<int>&> m = SizeIs(1);
+  EXPECT_THAT(container, Not(m));
+  container.push_back(0);
+  EXPECT_THAT(container, m);
+}
+
+TEST(SizeIsTest, CanDescribeSelf) {
+  Matcher<vector<int> > m = SizeIs(2);
+  EXPECT_EQ("size is equal to 2", Describe(m));
+  EXPECT_EQ("size isn't equal to 2", DescribeNegation(m));
+}
+
+TEST(SizeIsTest, ExplainsResult) {
+  Matcher<vector<int> > m1 = SizeIs(2);
+  Matcher<vector<int> > m2 = SizeIs(Lt(2u));
+  Matcher<vector<int> > m3 = SizeIs(AnyOf(0, 3));
+  Matcher<vector<int> > m4 = SizeIs(GreaterThan(1));
+  vector<int> container;
+  EXPECT_EQ("whose size 0 doesn't match", Explain(m1, container));
+  EXPECT_EQ("whose size 0 matches", Explain(m2, container));
+  EXPECT_EQ("whose size 0 matches", Explain(m3, container));
+  EXPECT_EQ("whose size 0 doesn't match, which is 1 less than 1",
+            Explain(m4, container));
+  container.push_back(0);
+  container.push_back(0);
+  EXPECT_EQ("whose size 2 matches", Explain(m1, container));
+  EXPECT_EQ("whose size 2 doesn't match", Explain(m2, container));
+  EXPECT_EQ("whose size 2 doesn't match", Explain(m3, container));
+  EXPECT_EQ("whose size 2 matches, which is 1 more than 1",
+            Explain(m4, container));
+}
+
+#if GTEST_HAS_TYPED_TEST
+// Tests ContainerEq with different container types, and
+// different element types.
+
+template <typename T>
+class ContainerEqTest : public testing::Test {};
+
+typedef testing::Types<
+    set<int>,
+    vector<size_t>,
+    multiset<size_t>,
+    list<int> >
+    ContainerEqTestTypes;
+
+TYPED_TEST_CASE(ContainerEqTest, ContainerEqTestTypes);
+
+// Tests that the filled container is equal to itself.
+TYPED_TEST(ContainerEqTest, EqualsSelf) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  TypeParam my_set(vals, vals + 6);
+  const Matcher<TypeParam> m = ContainerEq(my_set);
+  EXPECT_TRUE(m.Matches(my_set));
+  EXPECT_EQ("", Explain(m, my_set));
+}
+
+// Tests that missing values are reported.
+TYPED_TEST(ContainerEqTest, ValueMissing) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {2, 1, 8, 5};
+  TypeParam my_set(vals, vals + 6);
+  TypeParam test_set(test_vals, test_vals + 4);
+  const Matcher<TypeParam> m = ContainerEq(my_set);
+  EXPECT_FALSE(m.Matches(test_set));
+  EXPECT_EQ("which doesn't have these expected elements: 3",
+            Explain(m, test_set));
+}
+
+// Tests that added values are reported.
+TYPED_TEST(ContainerEqTest, ValueAdded) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {1, 2, 3, 5, 8, 46};
+  TypeParam my_set(vals, vals + 6);
+  TypeParam test_set(test_vals, test_vals + 6);
+  const Matcher<const TypeParam&> m = ContainerEq(my_set);
+  EXPECT_FALSE(m.Matches(test_set));
+  EXPECT_EQ("which has these unexpected elements: 46", Explain(m, test_set));
+}
+
+// Tests that added and missing values are reported together.
+TYPED_TEST(ContainerEqTest, ValueAddedAndRemoved) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {1, 2, 3, 8, 46};
+  TypeParam my_set(vals, vals + 6);
+  TypeParam test_set(test_vals, test_vals + 5);
+  const Matcher<TypeParam> m = ContainerEq(my_set);
+  EXPECT_FALSE(m.Matches(test_set));
+  EXPECT_EQ("which has these unexpected elements: 46,\n"
+            "and doesn't have these expected elements: 5",
+            Explain(m, test_set));
+}
+
+// Tests duplicated value -- expect no explanation.
+TYPED_TEST(ContainerEqTest, DuplicateDifference) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {1, 2, 3, 5, 8};
+  TypeParam my_set(vals, vals + 6);
+  TypeParam test_set(test_vals, test_vals + 5);
+  const Matcher<const TypeParam&> m = ContainerEq(my_set);
+  // Depending on the container, match may be true or false
+  // But in any case there should be no explanation.
+  EXPECT_EQ("", Explain(m, test_set));
+}
+#endif  // GTEST_HAS_TYPED_TEST
+
+// Tests that mutliple missing values are reported.
+// Using just vector here, so order is predicatble.
+TEST(ContainerEqExtraTest, MultipleValuesMissing) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {2, 1, 5};
+  vector<int> my_set(vals, vals + 6);
+  vector<int> test_set(test_vals, test_vals + 3);
+  const Matcher<vector<int> > m = ContainerEq(my_set);
+  EXPECT_FALSE(m.Matches(test_set));
+  EXPECT_EQ("which doesn't have these expected elements: 3, 8",
+            Explain(m, test_set));
+}
+
+// Tests that added values are reported.
+// Using just vector here, so order is predicatble.
+TEST(ContainerEqExtraTest, MultipleValuesAdded) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {1, 2, 92, 3, 5, 8, 46};
+  list<size_t> my_set(vals, vals + 6);
+  list<size_t> test_set(test_vals, test_vals + 7);
+  const Matcher<const list<size_t>&> m = ContainerEq(my_set);
+  EXPECT_FALSE(m.Matches(test_set));
+  EXPECT_EQ("which has these unexpected elements: 92, 46",
+            Explain(m, test_set));
+}
+
+// Tests that added and missing values are reported together.
+TEST(ContainerEqExtraTest, MultipleValuesAddedAndRemoved) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {1, 2, 3, 92, 46};
+  list<size_t> my_set(vals, vals + 6);
+  list<size_t> test_set(test_vals, test_vals + 5);
+  const Matcher<const list<size_t> > m = ContainerEq(my_set);
+  EXPECT_FALSE(m.Matches(test_set));
+  EXPECT_EQ("which has these unexpected elements: 92, 46,\n"
+            "and doesn't have these expected elements: 5, 8",
+            Explain(m, test_set));
+}
+
+// Tests to see that duplicate elements are detected,
+// but (as above) not reported in the explanation.
+TEST(ContainerEqExtraTest, MultiSetOfIntDuplicateDifference) {
+  static const int vals[] = {1, 1, 2, 3, 5, 8};
+  static const int test_vals[] = {1, 2, 3, 5, 8};
+  vector<int> my_set(vals, vals + 6);
+  vector<int> test_set(test_vals, test_vals + 5);
+  const Matcher<vector<int> > m = ContainerEq(my_set);
+  EXPECT_TRUE(m.Matches(my_set));
+  EXPECT_FALSE(m.Matches(test_set));
+  // There is nothing to report when both sets contain all the same values.
+  EXPECT_EQ("", Explain(m, test_set));
+}
+
+// Tests that ContainerEq works for non-trivial associative containers,
+// like maps.
+TEST(ContainerEqExtraTest, WorksForMaps) {
+  map<int, std::string> my_map;
+  my_map[0] = "a";
+  my_map[1] = "b";
+
+  map<int, std::string> test_map;
+  test_map[0] = "aa";
+  test_map[1] = "b";
+
+  const Matcher<const map<int, std::string>&> m = ContainerEq(my_map);
+  EXPECT_TRUE(m.Matches(my_map));
+  EXPECT_FALSE(m.Matches(test_map));
+
+  EXPECT_EQ("which has these unexpected elements: (0, \"aa\"),\n"
+            "and doesn't have these expected elements: (0, \"a\")",
+            Explain(m, test_map));
+}
+
+TEST(ContainerEqExtraTest, WorksForNativeArray) {
+  int a1[] = {1, 2, 3};
+  int a2[] = {1, 2, 3};
+  int b[] = {1, 2, 4};
+
+  EXPECT_THAT(a1, ContainerEq(a2));
+  EXPECT_THAT(a1, Not(ContainerEq(b)));
+}
+
+TEST(ContainerEqExtraTest, WorksForTwoDimensionalNativeArray) {
+  const char a1[][3] = {"hi", "lo"};
+  const char a2[][3] = {"hi", "lo"};
+  const char b[][3] = {"lo", "hi"};
+
+  // Tests using ContainerEq() in the first dimension.
+  EXPECT_THAT(a1, ContainerEq(a2));
+  EXPECT_THAT(a1, Not(ContainerEq(b)));
+
+  // Tests using ContainerEq() in the second dimension.
+  EXPECT_THAT(a1, ElementsAre(ContainerEq(a2[0]), ContainerEq(a2[1])));
+  EXPECT_THAT(a1, ElementsAre(Not(ContainerEq(b[0])), ContainerEq(a2[1])));
+}
+
+TEST(ContainerEqExtraTest, WorksForNativeArrayAsTuple) {
+  const int a1[] = {1, 2, 3};
+  const int a2[] = {1, 2, 3};
+  const int b[] = {1, 2, 3, 4};
+
+  const int* const p1 = a1;
+  EXPECT_THAT(make_tuple(p1, 3), ContainerEq(a2));
+  EXPECT_THAT(make_tuple(p1, 3), Not(ContainerEq(b)));
+
+  const int c[] = {1, 3, 2};
+  EXPECT_THAT(make_tuple(p1, 3), Not(ContainerEq(c)));
+}
+
+TEST(ContainerEqExtraTest, CopiesNativeArrayParameter) {
+  std::string a1[][3] = {
+    {"hi", "hello", "ciao"},
+    {"bye", "see you", "ciao"}
+  };
+
+  std::string a2[][3] = {
+    {"hi", "hello", "ciao"},
+    {"bye", "see you", "ciao"}
+  };
+
+  const Matcher<const std::string(&)[2][3]> m = ContainerEq(a2);
+  EXPECT_THAT(a1, m);
+
+  a2[0][0] = "ha";
+  EXPECT_THAT(a1, m);
+}
+
+TEST(WhenSortedByTest, WorksForEmptyContainer) {
+  const vector<int> numbers;
+  EXPECT_THAT(numbers, WhenSortedBy(less<int>(), ElementsAre()));
+  EXPECT_THAT(numbers, Not(WhenSortedBy(less<int>(), ElementsAre(1))));
+}
+
+TEST(WhenSortedByTest, WorksForNonEmptyContainer) {
+  vector<unsigned> numbers;
+  numbers.push_back(3);
+  numbers.push_back(1);
+  numbers.push_back(2);
+  numbers.push_back(2);
+  EXPECT_THAT(numbers, WhenSortedBy(greater<unsigned>(),
+                                    ElementsAre(3, 2, 2, 1)));
+  EXPECT_THAT(numbers, Not(WhenSortedBy(greater<unsigned>(),
+                                        ElementsAre(1, 2, 2, 3))));
+}
+
+TEST(WhenSortedByTest, WorksForNonVectorContainer) {
+  list<string> words;
+  words.push_back("say");
+  words.push_back("hello");
+  words.push_back("world");
+  EXPECT_THAT(words, WhenSortedBy(less<string>(),
+                                  ElementsAre("hello", "say", "world")));
+  EXPECT_THAT(words, Not(WhenSortedBy(less<string>(),
+                                      ElementsAre("say", "hello", "world"))));
+}
+
+TEST(WhenSortedByTest, WorksForNativeArray) {
+  const int numbers[] = {1, 3, 2, 4};
+  const int sorted_numbers[] = {1, 2, 3, 4};
+  EXPECT_THAT(numbers, WhenSortedBy(less<int>(), ElementsAre(1, 2, 3, 4)));
+  EXPECT_THAT(numbers, WhenSortedBy(less<int>(),
+                                    ElementsAreArray(sorted_numbers)));
+  EXPECT_THAT(numbers, Not(WhenSortedBy(less<int>(), ElementsAre(1, 3, 2, 4))));
+}
+
+TEST(WhenSortedByTest, CanDescribeSelf) {
+  const Matcher<vector<int> > m = WhenSortedBy(less<int>(), ElementsAre(1, 2));
+  EXPECT_EQ("(when sorted) has 2 elements where\n"
+            "element #0 is equal to 1,\n"
+            "element #1 is equal to 2",
+            Describe(m));
+  EXPECT_EQ("(when sorted) doesn't have 2 elements, or\n"
+            "element #0 isn't equal to 1, or\n"
+            "element #1 isn't equal to 2",
+            DescribeNegation(m));
+}
+
+TEST(WhenSortedByTest, ExplainsMatchResult) {
+  const int a[] = {2, 1};
+  EXPECT_EQ("which is { 1, 2 } when sorted, whose element #0 doesn't match",
+            Explain(WhenSortedBy(less<int>(), ElementsAre(2, 3)), a));
+  EXPECT_EQ("which is { 1, 2 } when sorted",
+            Explain(WhenSortedBy(less<int>(), ElementsAre(1, 2)), a));
+}
+
+// WhenSorted() is a simple wrapper on WhenSortedBy().  Hence we don't
+// need to test it as exhaustively as we test the latter.
+
+TEST(WhenSortedTest, WorksForEmptyContainer) {
+  const vector<int> numbers;
+  EXPECT_THAT(numbers, WhenSorted(ElementsAre()));
+  EXPECT_THAT(numbers, Not(WhenSorted(ElementsAre(1))));
+}
+
+TEST(WhenSortedTest, WorksForNonEmptyContainer) {
+  list<string> words;
+  words.push_back("3");
+  words.push_back("1");
+  words.push_back("2");
+  words.push_back("2");
+  EXPECT_THAT(words, WhenSorted(ElementsAre("1", "2", "2", "3")));
+  EXPECT_THAT(words, Not(WhenSorted(ElementsAre("3", "1", "2", "2"))));
+}
+
+TEST(WhenSortedTest, WorksForMapTypes) {
+    map<string, int> word_counts;
+    word_counts["and"] = 1;
+    word_counts["the"] = 1;
+    word_counts["buffalo"] = 2;
+    EXPECT_THAT(word_counts, WhenSorted(ElementsAre(
+            Pair("and", 1), Pair("buffalo", 2), Pair("the", 1))));
+    EXPECT_THAT(word_counts, Not(WhenSorted(ElementsAre(
+            Pair("and", 1), Pair("the", 1), Pair("buffalo", 2)))));
+}
+
+TEST(WhenSortedTest, WorksForMultiMapTypes) {
+    multimap<int, int> ifib;
+    ifib.insert(make_pair(8, 6));
+    ifib.insert(make_pair(2, 3));
+    ifib.insert(make_pair(1, 1));
+    ifib.insert(make_pair(3, 4));
+    ifib.insert(make_pair(1, 2));
+    ifib.insert(make_pair(5, 5));
+    EXPECT_THAT(ifib, WhenSorted(ElementsAre(Pair(1, 1),
+                                             Pair(1, 2),
+                                             Pair(2, 3),
+                                             Pair(3, 4),
+                                             Pair(5, 5),
+                                             Pair(8, 6))));
+    EXPECT_THAT(ifib, Not(WhenSorted(ElementsAre(Pair(8, 6),
+                                                 Pair(2, 3),
+                                                 Pair(1, 1),
+                                                 Pair(3, 4),
+                                                 Pair(1, 2),
+                                                 Pair(5, 5)))));
+}
+
+TEST(WhenSortedTest, WorksForPolymorphicMatcher) {
+    std::deque<int> d;
+    d.push_back(2);
+    d.push_back(1);
+    EXPECT_THAT(d, WhenSorted(ElementsAre(1, 2)));
+    EXPECT_THAT(d, Not(WhenSorted(ElementsAre(2, 1))));
+}
+
+TEST(WhenSortedTest, WorksForVectorConstRefMatcher) {
+    std::deque<int> d;
+    d.push_back(2);
+    d.push_back(1);
+    Matcher<const std::vector<int>&> vector_match = ElementsAre(1, 2);
+    EXPECT_THAT(d, WhenSorted(vector_match));
+    Matcher<const std::vector<int>&> not_vector_match = ElementsAre(2, 1);
+    EXPECT_THAT(d, Not(WhenSorted(not_vector_match)));
+}
+
+// Deliberately bare pseudo-container.
+// Offers only begin() and end() accessors, yielding InputIterator.
+template <typename T>
+class Streamlike {
+ private:
+  class ConstIter;
+ public:
+  typedef ConstIter const_iterator;
+  typedef T value_type;
+
+  template <typename InIter>
+  Streamlike(InIter first, InIter last) : remainder_(first, last) {}
+
+  const_iterator begin() const {
+    return const_iterator(this, remainder_.begin());
+  }
+  const_iterator end() const {
+    return const_iterator(this, remainder_.end());
+  }
+
+ private:
+  class ConstIter : public std::iterator<std::input_iterator_tag,
+                                         value_type,
+                                         ptrdiff_t,
+                                         const value_type*,
+                                         const value_type&> {
+   public:
+    ConstIter(const Streamlike* s,
+              typename std::list<value_type>::iterator pos)
+        : s_(s), pos_(pos) {}
+
+    const value_type& operator*() const { return *pos_; }
+    const value_type* operator->() const { return &*pos_; }
+    ConstIter& operator++() {
+      s_->remainder_.erase(pos_++);
+      return *this;
+    }
+
+    // *iter++ is required to work (see std::istreambuf_iterator).
+    // (void)iter++ is also required to work.
+    class PostIncrProxy {
+     public:
+      explicit PostIncrProxy(const value_type& value) : value_(value) {}
+      value_type operator*() const { return value_; }
+     private:
+      value_type value_;
+    };
+    PostIncrProxy operator++(int) {
+      PostIncrProxy proxy(**this);
+      ++(*this);
+      return proxy;
+    }
+
+    friend bool operator==(const ConstIter& a, const ConstIter& b) {
+      return a.s_ == b.s_ && a.pos_ == b.pos_;
+    }
+    friend bool operator!=(const ConstIter& a, const ConstIter& b) {
+      return !(a == b);
+    }
+
+   private:
+    const Streamlike* s_;
+    typename std::list<value_type>::iterator pos_;
+  };
+
+  friend std::ostream& operator<<(std::ostream& os, const Streamlike& s) {
+    os << "[";
+    typedef typename std::list<value_type>::const_iterator Iter;
+    const char* sep = "";
+    for (Iter it = s.remainder_.begin(); it != s.remainder_.end(); ++it) {
+      os << sep << *it;
+      sep = ",";
+    }
+    os << "]";
+    return os;
+  }
+
+  mutable std::list<value_type> remainder_;  // modified by iteration
+};
+
+TEST(StreamlikeTest, Iteration) {
+  const int a[5] = {2, 1, 4, 5, 3};
+  Streamlike<int> s(a, a + 5);
+  Streamlike<int>::const_iterator it = s.begin();
+  const int* ip = a;
+  while (it != s.end()) {
+    SCOPED_TRACE(ip - a);
+    EXPECT_EQ(*ip++, *it++);
+  }
+}
+
+#if GTEST_HAS_STD_FORWARD_LIST_
+TEST(BeginEndDistanceIsTest, WorksWithForwardList) {
+  std::forward_list<int> container;
+  EXPECT_THAT(container, BeginEndDistanceIs(0));
+  EXPECT_THAT(container, Not(BeginEndDistanceIs(1)));
+  container.push_front(0);
+  EXPECT_THAT(container, Not(BeginEndDistanceIs(0)));
+  EXPECT_THAT(container, BeginEndDistanceIs(1));
+  container.push_front(0);
+  EXPECT_THAT(container, Not(BeginEndDistanceIs(0)));
+  EXPECT_THAT(container, BeginEndDistanceIs(2));
+}
+#endif  // GTEST_HAS_STD_FORWARD_LIST_
+
+TEST(BeginEndDistanceIsTest, WorksWithNonStdList) {
+  const int a[5] = {1, 2, 3, 4, 5};
+  Streamlike<int> s(a, a + 5);
+  EXPECT_THAT(s, BeginEndDistanceIs(5));
+}
+
+TEST(BeginEndDistanceIsTest, CanDescribeSelf) {
+  Matcher<vector<int> > m = BeginEndDistanceIs(2);
+  EXPECT_EQ("distance between begin() and end() is equal to 2", Describe(m));
+  EXPECT_EQ("distance between begin() and end() isn't equal to 2",
+            DescribeNegation(m));
+}
+
+TEST(BeginEndDistanceIsTest, ExplainsResult) {
+  Matcher<vector<int> > m1 = BeginEndDistanceIs(2);
+  Matcher<vector<int> > m2 = BeginEndDistanceIs(Lt(2));
+  Matcher<vector<int> > m3 = BeginEndDistanceIs(AnyOf(0, 3));
+  Matcher<vector<int> > m4 = BeginEndDistanceIs(GreaterThan(1));
+  vector<int> container;
+  EXPECT_EQ("whose distance between begin() and end() 0 doesn't match",
+            Explain(m1, container));
+  EXPECT_EQ("whose distance between begin() and end() 0 matches",
+            Explain(m2, container));
+  EXPECT_EQ("whose distance between begin() and end() 0 matches",
+            Explain(m3, container));
+  EXPECT_EQ(
+      "whose distance between begin() and end() 0 doesn't match, which is 1 "
+      "less than 1",
+      Explain(m4, container));
+  container.push_back(0);
+  container.push_back(0);
+  EXPECT_EQ("whose distance between begin() and end() 2 matches",
+            Explain(m1, container));
+  EXPECT_EQ("whose distance between begin() and end() 2 doesn't match",
+            Explain(m2, container));
+  EXPECT_EQ("whose distance between begin() and end() 2 doesn't match",
+            Explain(m3, container));
+  EXPECT_EQ(
+      "whose distance between begin() and end() 2 matches, which is 1 more "
+      "than 1",
+      Explain(m4, container));
+}
+
+TEST(WhenSortedTest, WorksForStreamlike) {
+  // Streamlike 'container' provides only minimal iterator support.
+  // Its iterators are tagged with input_iterator_tag.
+  const int a[5] = {2, 1, 4, 5, 3};
+  Streamlike<int> s(a, a + GTEST_ARRAY_SIZE_(a));
+  EXPECT_THAT(s, WhenSorted(ElementsAre(1, 2, 3, 4, 5)));
+  EXPECT_THAT(s, Not(WhenSorted(ElementsAre(2, 1, 4, 5, 3))));
+}
+
+TEST(WhenSortedTest, WorksForVectorConstRefMatcherOnStreamlike) {
+  const int a[] = {2, 1, 4, 5, 3};
+  Streamlike<int> s(a, a + GTEST_ARRAY_SIZE_(a));
+  Matcher<const std::vector<int>&> vector_match = ElementsAre(1, 2, 3, 4, 5);
+  EXPECT_THAT(s, WhenSorted(vector_match));
+  EXPECT_THAT(s, Not(WhenSorted(ElementsAre(2, 1, 4, 5, 3))));
+}
+
+// Tests using ElementsAre() and ElementsAreArray() with stream-like
+// "containers".
+
+TEST(ElemensAreStreamTest, WorksForStreamlike) {
+  const int a[5] = {1, 2, 3, 4, 5};
+  Streamlike<int> s(a, a + GTEST_ARRAY_SIZE_(a));
+  EXPECT_THAT(s, ElementsAre(1, 2, 3, 4, 5));
+  EXPECT_THAT(s, Not(ElementsAre(2, 1, 4, 5, 3)));
+}
+
+TEST(ElemensAreArrayStreamTest, WorksForStreamlike) {
+  const int a[5] = {1, 2, 3, 4, 5};
+  Streamlike<int> s(a, a + GTEST_ARRAY_SIZE_(a));
+
+  vector<int> expected;
+  expected.push_back(1);
+  expected.push_back(2);
+  expected.push_back(3);
+  expected.push_back(4);
+  expected.push_back(5);
+  EXPECT_THAT(s, ElementsAreArray(expected));
+
+  expected[3] = 0;
+  EXPECT_THAT(s, Not(ElementsAreArray(expected)));
+}
+
+TEST(ElementsAreTest, WorksWithUncopyable) {
+  Uncopyable objs[2];
+  objs[0].set_value(-3);
+  objs[1].set_value(1);
+  EXPECT_THAT(objs, ElementsAre(UncopyableIs(-3), Truly(ValueIsPositive)));
+}
+
+TEST(ElementsAreTest, TakesStlContainer) {
+  const int actual[] = {3, 1, 2};
+
+  ::std::list<int> expected;
+  expected.push_back(3);
+  expected.push_back(1);
+  expected.push_back(2);
+  EXPECT_THAT(actual, ElementsAreArray(expected));
+
+  expected.push_back(4);
+  EXPECT_THAT(actual, Not(ElementsAreArray(expected)));
+}
+
+// Tests for UnorderedElementsAreArray()
+
+TEST(UnorderedElementsAreArrayTest, SucceedsWhenExpected) {
+  const int a[] = {0, 1, 2, 3, 4};
+  std::vector<int> s(a, a + GTEST_ARRAY_SIZE_(a));
+  do {
+    StringMatchResultListener listener;
+    EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAreArray(a),
+                                   s, &listener)) << listener.str();
+  } while (std::next_permutation(s.begin(), s.end()));
+}
+
+TEST(UnorderedElementsAreArrayTest, VectorBool) {
+  const bool a[] = {0, 1, 0, 1, 1};
+  const bool b[] = {1, 0, 1, 1, 0};
+  std::vector<bool> expected(a, a + GTEST_ARRAY_SIZE_(a));
+  std::vector<bool> actual(b, b + GTEST_ARRAY_SIZE_(b));
+  StringMatchResultListener listener;
+  EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAreArray(expected),
+                                 actual, &listener)) << listener.str();
+}
+
+TEST(UnorderedElementsAreArrayTest, WorksForStreamlike) {
+  // Streamlike 'container' provides only minimal iterator support.
+  // Its iterators are tagged with input_iterator_tag, and it has no
+  // size() or empty() methods.
+  const int a[5] = {2, 1, 4, 5, 3};
+  Streamlike<int> s(a, a + GTEST_ARRAY_SIZE_(a));
+
+  ::std::vector<int> expected;
+  expected.push_back(1);
+  expected.push_back(2);
+  expected.push_back(3);
+  expected.push_back(4);
+  expected.push_back(5);
+  EXPECT_THAT(s, UnorderedElementsAreArray(expected));
+
+  expected.push_back(6);
+  EXPECT_THAT(s, Not(UnorderedElementsAreArray(expected)));
+}
+
+TEST(UnorderedElementsAreArrayTest, TakesStlContainer) {
+  const int actual[] = {3, 1, 2};
+
+  ::std::list<int> expected;
+  expected.push_back(1);
+  expected.push_back(2);
+  expected.push_back(3);
+  EXPECT_THAT(actual, UnorderedElementsAreArray(expected));
+
+  expected.push_back(4);
+  EXPECT_THAT(actual, Not(UnorderedElementsAreArray(expected)));
+}
+
+#if GTEST_HAS_STD_INITIALIZER_LIST_
+
+TEST(UnorderedElementsAreArrayTest, TakesInitializerList) {
+  const int a[5] = {2, 1, 4, 5, 3};
+  EXPECT_THAT(a, UnorderedElementsAreArray({1, 2, 3, 4, 5}));
+  EXPECT_THAT(a, Not(UnorderedElementsAreArray({1, 2, 3, 4, 6})));
+}
+
+TEST(UnorderedElementsAreArrayTest, TakesInitializerListOfCStrings) {
+  const string a[5] = {"a", "b", "c", "d", "e"};
+  EXPECT_THAT(a, UnorderedElementsAreArray({"a", "b", "c", "d", "e"}));
+  EXPECT_THAT(a, Not(UnorderedElementsAreArray({"a", "b", "c", "d", "ef"})));
+}
+
+TEST(UnorderedElementsAreArrayTest, TakesInitializerListOfSameTypedMatchers) {
+  const int a[5] = {2, 1, 4, 5, 3};
+  EXPECT_THAT(a, UnorderedElementsAreArray(
+      {Eq(1), Eq(2), Eq(3), Eq(4), Eq(5)}));
+  EXPECT_THAT(a, Not(UnorderedElementsAreArray(
+      {Eq(1), Eq(2), Eq(3), Eq(4), Eq(6)})));
+}
+
+TEST(UnorderedElementsAreArrayTest,
+     TakesInitializerListOfDifferentTypedMatchers) {
+  const int a[5] = {2, 1, 4, 5, 3};
+  // The compiler cannot infer the type of the initializer list if its
+  // elements have different types.  We must explicitly specify the
+  // unified element type in this case.
+  EXPECT_THAT(a, UnorderedElementsAreArray<Matcher<int> >(
+      {Eq(1), Ne(-2), Ge(3), Le(4), Eq(5)}));
+  EXPECT_THAT(a, Not(UnorderedElementsAreArray<Matcher<int> >(
+      {Eq(1), Ne(-2), Ge(3), Le(4), Eq(6)})));
+}
+
+#endif  // GTEST_HAS_STD_INITIALIZER_LIST_
+
+class UnorderedElementsAreTest : public testing::Test {
+ protected:
+  typedef std::vector<int> IntVec;
+};
+
+TEST_F(UnorderedElementsAreTest, WorksWithUncopyable) {
+  Uncopyable objs[2];
+  objs[0].set_value(-3);
+  objs[1].set_value(1);
+  EXPECT_THAT(objs,
+              UnorderedElementsAre(Truly(ValueIsPositive), UncopyableIs(-3)));
+}
+
+TEST_F(UnorderedElementsAreTest, SucceedsWhenExpected) {
+  const int a[] = {1, 2, 3};
+  std::vector<int> s(a, a + GTEST_ARRAY_SIZE_(a));
+  do {
+    StringMatchResultListener listener;
+    EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAre(1, 2, 3),
+                                   s, &listener)) << listener.str();
+  } while (std::next_permutation(s.begin(), s.end()));
+}
+
+TEST_F(UnorderedElementsAreTest, FailsWhenAnElementMatchesNoMatcher) {
+  const int a[] = {1, 2, 3};
+  std::vector<int> s(a, a + GTEST_ARRAY_SIZE_(a));
+  std::vector<Matcher<int> > mv;
+  mv.push_back(1);
+  mv.push_back(2);
+  mv.push_back(2);
+  // The element with value '3' matches nothing: fail fast.
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAreArray(mv),
+                                  s, &listener)) << listener.str();
+}
+
+TEST_F(UnorderedElementsAreTest, WorksForStreamlike) {
+  // Streamlike 'container' provides only minimal iterator support.
+  // Its iterators are tagged with input_iterator_tag, and it has no
+  // size() or empty() methods.
+  const int a[5] = {2, 1, 4, 5, 3};
+  Streamlike<int> s(a, a + GTEST_ARRAY_SIZE_(a));
+
+  EXPECT_THAT(s, UnorderedElementsAre(1, 2, 3, 4, 5));
+  EXPECT_THAT(s, Not(UnorderedElementsAre(2, 2, 3, 4, 5)));
+}
+
+// One naive implementation of the matcher runs in O(N!) time, which is too
+// slow for many real-world inputs. This test shows that our matcher can match
+// 100 inputs very quickly (a few milliseconds).  An O(100!) is 10^158
+// iterations and obviously effectively incomputable.
+// [ RUN      ] UnorderedElementsAreTest.Performance
+// [       OK ] UnorderedElementsAreTest.Performance (4 ms)
+TEST_F(UnorderedElementsAreTest, Performance) {
+  std::vector<int> s;
+  std::vector<Matcher<int> > mv;
+  for (int i = 0; i < 100; ++i) {
+    s.push_back(i);
+    mv.push_back(_);
+  }
+  mv[50] = Eq(0);
+  StringMatchResultListener listener;
+  EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAreArray(mv),
+                                 s, &listener)) << listener.str();
+}
+
+// Another variant of 'Performance' with similar expectations.
+// [ RUN      ] UnorderedElementsAreTest.PerformanceHalfStrict
+// [       OK ] UnorderedElementsAreTest.PerformanceHalfStrict (4 ms)
+TEST_F(UnorderedElementsAreTest, PerformanceHalfStrict) {
+  std::vector<int> s;
+  std::vector<Matcher<int> > mv;
+  for (int i = 0; i < 100; ++i) {
+    s.push_back(i);
+    if (i & 1) {
+      mv.push_back(_);
+    } else {
+      mv.push_back(i);
+    }
+  }
+  StringMatchResultListener listener;
+  EXPECT_TRUE(ExplainMatchResult(UnorderedElementsAreArray(mv),
+                                 s, &listener)) << listener.str();
+}
+
+TEST_F(UnorderedElementsAreTest, FailMessageCountWrong) {
+  std::vector<int> v;
+  v.push_back(4);
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 2, 3),
+                                  v, &listener)) << listener.str();
+  EXPECT_THAT(listener.str(), Eq("which has 1 element"));
+}
+
+TEST_F(UnorderedElementsAreTest, FailMessageCountWrongZero) {
+  std::vector<int> v;
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 2, 3),
+                                  v, &listener)) << listener.str();
+  EXPECT_THAT(listener.str(), Eq(""));
+}
+
+TEST_F(UnorderedElementsAreTest, FailMessageUnmatchedMatchers) {
+  std::vector<int> v;
+  v.push_back(1);
+  v.push_back(1);
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 2),
+                                  v, &listener)) << listener.str();
+  EXPECT_THAT(
+      listener.str(),
+      Eq("where the following matchers don't match any elements:\n"
+         "matcher #1: is equal to 2"));
+}
+
+TEST_F(UnorderedElementsAreTest, FailMessageUnmatchedElements) {
+  std::vector<int> v;
+  v.push_back(1);
+  v.push_back(2);
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 1),
+                                  v, &listener)) << listener.str();
+  EXPECT_THAT(
+      listener.str(),
+      Eq("where the following elements don't match any matchers:\n"
+         "element #1: 2"));
+}
+
+TEST_F(UnorderedElementsAreTest, FailMessageUnmatchedMatcherAndElement) {
+  std::vector<int> v;
+  v.push_back(2);
+  v.push_back(3);
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(UnorderedElementsAre(1, 2),
+                                  v, &listener)) << listener.str();
+  EXPECT_THAT(
+      listener.str(),
+      Eq("where"
+         " the following matchers don't match any elements:\n"
+         "matcher #0: is equal to 1\n"
+         "and"
+         " where"
+         " the following elements don't match any matchers:\n"
+         "element #1: 3"));
+}
+
+// Test helper for formatting element, matcher index pairs in expectations.
+static string EMString(int element, int matcher) {
+  stringstream ss;
+  ss << "(element #" << element << ", matcher #" << matcher << ")";
+  return ss.str();
+}
+
+TEST_F(UnorderedElementsAreTest, FailMessageImperfectMatchOnly) {
+  // A situation where all elements and matchers have a match
+  // associated with them, but the max matching is not perfect.
+  std::vector<string> v;
+  v.push_back("a");
+  v.push_back("b");
+  v.push_back("c");
+  StringMatchResultListener listener;
+  EXPECT_FALSE(ExplainMatchResult(
+      UnorderedElementsAre("a", "a", AnyOf("b", "c")), v, &listener))
+      << listener.str();
+
+  string prefix =
+      "where no permutation of the elements can satisfy all matchers, "
+      "and the closest match is 2 of 3 matchers with the "
+      "pairings:\n";
+
+  // We have to be a bit loose here, because there are 4 valid max matches.
+  EXPECT_THAT(
+      listener.str(),
+      AnyOf(prefix + "{\n  " + EMString(0, 0) +
+                     ",\n  " + EMString(1, 2) + "\n}",
+            prefix + "{\n  " + EMString(0, 1) +
+                     ",\n  " + EMString(1, 2) + "\n}",
+            prefix + "{\n  " + EMString(0, 0) +
+                     ",\n  " + EMString(2, 2) + "\n}",
+            prefix + "{\n  " + EMString(0, 1) +
+                     ",\n  " + EMString(2, 2) + "\n}"));
+}
+
+TEST_F(UnorderedElementsAreTest, Describe) {
+  EXPECT_THAT(Describe<IntVec>(UnorderedElementsAre()),
+              Eq("is empty"));
+  EXPECT_THAT(
+      Describe<IntVec>(UnorderedElementsAre(345)),
+      Eq("has 1 element and that element is equal to 345"));
+  EXPECT_THAT(
+      Describe<IntVec>(UnorderedElementsAre(111, 222, 333)),
+      Eq("has 3 elements and there exists some permutation "
+         "of elements such that:\n"
+         " - element #0 is equal to 111, and\n"
+         " - element #1 is equal to 222, and\n"
+         " - element #2 is equal to 333"));
+}
+
+TEST_F(UnorderedElementsAreTest, DescribeNegation) {
+  EXPECT_THAT(DescribeNegation<IntVec>(UnorderedElementsAre()),
+              Eq("isn't empty"));
+  EXPECT_THAT(
+      DescribeNegation<IntVec>(UnorderedElementsAre(345)),
+      Eq("doesn't have 1 element, or has 1 element that isn't equal to 345"));
+  EXPECT_THAT(
+      DescribeNegation<IntVec>(UnorderedElementsAre(123, 234, 345)),
+      Eq("doesn't have 3 elements, or there exists no permutation "
+         "of elements such that:\n"
+         " - element #0 is equal to 123, and\n"
+         " - element #1 is equal to 234, and\n"
+         " - element #2 is equal to 345"));
+}
+
+namespace {
+
+// Used as a check on the more complex max flow method used in the
+// real testing::internal::FindMaxBipartiteMatching. This method is
+// compatible but runs in worst-case factorial time, so we only
+// use it in testing for small problem sizes.
+template <typename Graph>
+class BacktrackingMaxBPMState {
+ public:
+  // Does not take ownership of 'g'.
+  explicit BacktrackingMaxBPMState(const Graph* g) : graph_(g) { }
+
+  ElementMatcherPairs Compute() {
+    if (graph_->LhsSize() == 0 || graph_->RhsSize() == 0) {
+      return best_so_far_;
+    }
+    lhs_used_.assign(graph_->LhsSize(), kUnused);
+    rhs_used_.assign(graph_->RhsSize(), kUnused);
+    for (size_t irhs = 0; irhs < graph_->RhsSize(); ++irhs) {
+      matches_.clear();
+      RecurseInto(irhs);
+      if (best_so_far_.size() == graph_->RhsSize())
+        break;
+    }
+    return best_so_far_;
+  }
+
+ private:
+  static const size_t kUnused = static_cast<size_t>(-1);
+
+  void PushMatch(size_t lhs, size_t rhs) {
+    matches_.push_back(ElementMatcherPair(lhs, rhs));
+    lhs_used_[lhs] = rhs;
+    rhs_used_[rhs] = lhs;
+    if (matches_.size() > best_so_far_.size()) {
+      best_so_far_ = matches_;
+    }
+  }
+
+  void PopMatch() {
+    const ElementMatcherPair& back = matches_.back();
+    lhs_used_[back.first] = kUnused;
+    rhs_used_[back.second] = kUnused;
+    matches_.pop_back();
+  }
+
+  bool RecurseInto(size_t irhs) {
+    if (rhs_used_[irhs] != kUnused) {
+      return true;
+    }
+    for (size_t ilhs = 0; ilhs < graph_->LhsSize(); ++ilhs) {
+      if (lhs_used_[ilhs] != kUnused) {
+        continue;
+      }
+      if (!graph_->HasEdge(ilhs, irhs)) {
+        continue;
+      }
+      PushMatch(ilhs, irhs);
+      if (best_so_far_.size() == graph_->RhsSize()) {
+        return false;
+      }
+      for (size_t mi = irhs + 1; mi < graph_->RhsSize(); ++mi) {
+        if (!RecurseInto(mi)) return false;
+      }
+      PopMatch();
+    }
+    return true;
+  }
+
+  const Graph* graph_;  // not owned
+  std::vector<size_t> lhs_used_;
+  std::vector<size_t> rhs_used_;
+  ElementMatcherPairs matches_;
+  ElementMatcherPairs best_so_far_;
+};
+
+template <typename Graph>
+const size_t BacktrackingMaxBPMState<Graph>::kUnused;
+
+}  // namespace
+
+// Implement a simple backtracking algorithm to determine if it is possible
+// to find one element per matcher, without reusing elements.
+template <typename Graph>
+ElementMatcherPairs
+FindBacktrackingMaxBPM(const Graph& g) {
+  return BacktrackingMaxBPMState<Graph>(&g).Compute();
+}
+
+class BacktrackingBPMTest : public ::testing::Test { };
+
+// Tests the MaxBipartiteMatching algorithm with square matrices.
+// The single int param is the # of nodes on each of the left and right sides.
+class BipartiteTest : public ::testing::TestWithParam<int> { };
+
+// Verify all match graphs up to some moderate number of edges.
+TEST_P(BipartiteTest, Exhaustive) {
+  int nodes = GetParam();
+  MatchMatrix graph(nodes, nodes);
+  do {
+    ElementMatcherPairs matches =
+        internal::FindMaxBipartiteMatching(graph);
+    EXPECT_EQ(FindBacktrackingMaxBPM(graph).size(), matches.size())
+        << "graph: " << graph.DebugString();
+    // Check that all elements of matches are in the graph.
+    // Check that elements of first and second are unique.
+    std::vector<bool> seen_element(graph.LhsSize());
+    std::vector<bool> seen_matcher(graph.RhsSize());
+    SCOPED_TRACE(PrintToString(matches));
+    for (size_t i = 0; i < matches.size(); ++i) {
+      size_t ilhs = matches[i].first;
+      size_t irhs = matches[i].second;
+      EXPECT_TRUE(graph.HasEdge(ilhs, irhs));
+      EXPECT_FALSE(seen_element[ilhs]);
+      EXPECT_FALSE(seen_matcher[irhs]);
+      seen_element[ilhs] = true;
+      seen_matcher[irhs] = true;
+    }
+  } while (graph.NextGraph());
+}
+
+INSTANTIATE_TEST_CASE_P(AllGraphs, BipartiteTest,
+                        ::testing::Range(0, 5));
+
+// Parameterized by a pair interpreted as (LhsSize, RhsSize).
+class BipartiteNonSquareTest
+    : public ::testing::TestWithParam<std::pair<size_t, size_t> > {
+};
+
+TEST_F(BipartiteNonSquareTest, SimpleBacktracking) {
+  //   .......
+  // 0:-----\ :
+  // 1:---\ | :
+  // 2:---\ | :
+  // 3:-\ | | :
+  //  :.......:
+  //    0 1 2
+  MatchMatrix g(4, 3);
+  static const int kEdges[][2] = {{0, 2}, {1, 1}, {2, 1}, {3, 0}};
+  for (size_t i = 0; i < GTEST_ARRAY_SIZE_(kEdges); ++i) {
+    g.SetEdge(kEdges[i][0], kEdges[i][1], true);
+  }
+  EXPECT_THAT(FindBacktrackingMaxBPM(g),
+              ElementsAre(Pair(3, 0),
+                          Pair(AnyOf(1, 2), 1),
+                          Pair(0, 2))) << g.DebugString();
+}
+
+// Verify a few nonsquare matrices.
+TEST_P(BipartiteNonSquareTest, Exhaustive) {
+  size_t nlhs = GetParam().first;
+  size_t nrhs = GetParam().second;
+  MatchMatrix graph(nlhs, nrhs);
+  do {
+    EXPECT_EQ(FindBacktrackingMaxBPM(graph).size(),
+              internal::FindMaxBipartiteMatching(graph).size())
+        << "graph: " << graph.DebugString()
+        << "\nbacktracking: "
+        << PrintToString(FindBacktrackingMaxBPM(graph))
+        << "\nmax flow: "
+        << PrintToString(internal::FindMaxBipartiteMatching(graph));
+  } while (graph.NextGraph());
+}
+
+INSTANTIATE_TEST_CASE_P(AllGraphs, BipartiteNonSquareTest,
+    testing::Values(
+        std::make_pair(1, 2),
+        std::make_pair(2, 1),
+        std::make_pair(3, 2),
+        std::make_pair(2, 3),
+        std::make_pair(4, 1),
+        std::make_pair(1, 4),
+        std::make_pair(4, 3),
+        std::make_pair(3, 4)));
+
+class BipartiteRandomTest
+    : public ::testing::TestWithParam<std::pair<int, int> > {
+};
+
+// Verifies a large sample of larger graphs.
+TEST_P(BipartiteRandomTest, LargerNets) {
+  int nodes = GetParam().first;
+  int iters = GetParam().second;
+  MatchMatrix graph(nodes, nodes);
+
+  testing::internal::Int32 seed = GTEST_FLAG(random_seed);
+  if (seed == 0) {
+    seed = static_cast<testing::internal::Int32>(time(NULL));
+  }
+
+  for (; iters > 0; --iters, ++seed) {
+    srand(static_cast<int>(seed));
+    graph.Randomize();
+    EXPECT_EQ(FindBacktrackingMaxBPM(graph).size(),
+              internal::FindMaxBipartiteMatching(graph).size())
+        << " graph: " << graph.DebugString()
+        << "\nTo reproduce the failure, rerun the test with the flag"
+           " --" << GTEST_FLAG_PREFIX_ << "random_seed=" << seed;
+  }
+}
+
+// Test argument is a std::pair<int, int> representing (nodes, iters).
+INSTANTIATE_TEST_CASE_P(Samples, BipartiteRandomTest,
+    testing::Values(
+        std::make_pair(5, 10000),
+        std::make_pair(6, 5000),
+        std::make_pair(7, 2000),
+        std::make_pair(8, 500),
+        std::make_pair(9, 100)));
+
+// Tests IsReadableTypeName().
+
+TEST(IsReadableTypeNameTest, ReturnsTrueForShortNames) {
+  EXPECT_TRUE(IsReadableTypeName("int"));
+  EXPECT_TRUE(IsReadableTypeName("const unsigned char*"));
+  EXPECT_TRUE(IsReadableTypeName("MyMap<int, void*>"));
+  EXPECT_TRUE(IsReadableTypeName("void (*)(int, bool)"));
+}
+
+TEST(IsReadableTypeNameTest, ReturnsTrueForLongNonTemplateNonFunctionNames) {
+  EXPECT_TRUE(IsReadableTypeName("my_long_namespace::MyClassName"));
+  EXPECT_TRUE(IsReadableTypeName("int [5][6][7][8][9][10][11]"));
+  EXPECT_TRUE(IsReadableTypeName("my_namespace::MyOuterClass::MyInnerClass"));
+}
+
+TEST(IsReadableTypeNameTest, ReturnsFalseForLongTemplateNames) {
+  EXPECT_FALSE(
+      IsReadableTypeName("basic_string<char, std::char_traits<char> >"));
+  EXPECT_FALSE(IsReadableTypeName("std::vector<int, std::alloc_traits<int> >"));
+}
+
+TEST(IsReadableTypeNameTest, ReturnsFalseForLongFunctionTypeNames) {
+  EXPECT_FALSE(IsReadableTypeName("void (&)(int, bool, char, float)"));
+}
+
+// Tests JoinAsTuple().
+
+TEST(JoinAsTupleTest, JoinsEmptyTuple) {
+  EXPECT_EQ("", JoinAsTuple(Strings()));
+}
+
+TEST(JoinAsTupleTest, JoinsOneTuple) {
+  const char* fields[] = {"1"};
+  EXPECT_EQ("1", JoinAsTuple(Strings(fields, fields + 1)));
+}
+
+TEST(JoinAsTupleTest, JoinsTwoTuple) {
+  const char* fields[] = {"1", "a"};
+  EXPECT_EQ("(1, a)", JoinAsTuple(Strings(fields, fields + 2)));
+}
+
+TEST(JoinAsTupleTest, JoinsTenTuple) {
+  const char* fields[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"};
+  EXPECT_EQ("(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)",
+            JoinAsTuple(Strings(fields, fields + 10)));
+}
+
+// Tests FormatMatcherDescription().
+
+TEST(FormatMatcherDescriptionTest, WorksForEmptyDescription) {
+  EXPECT_EQ("is even",
+            FormatMatcherDescription(false, "IsEven", Strings()));
+  EXPECT_EQ("not (is even)",
+            FormatMatcherDescription(true, "IsEven", Strings()));
+
+  const char* params[] = {"5"};
+  EXPECT_EQ("equals 5",
+            FormatMatcherDescription(false, "Equals",
+                                     Strings(params, params + 1)));
+
+  const char* params2[] = {"5", "8"};
+  EXPECT_EQ("is in range (5, 8)",
+            FormatMatcherDescription(false, "IsInRange",
+                                     Strings(params2, params2 + 2)));
+}
+
+// Tests PolymorphicMatcher::mutable_impl().
+TEST(PolymorphicMatcherTest, CanAccessMutableImpl) {
+  PolymorphicMatcher<DivisibleByImpl> m(DivisibleByImpl(42));
+  DivisibleByImpl& impl = m.mutable_impl();
+  EXPECT_EQ(42, impl.divider());
+
+  impl.set_divider(0);
+  EXPECT_EQ(0, m.mutable_impl().divider());
+}
+
+// Tests PolymorphicMatcher::impl().
+TEST(PolymorphicMatcherTest, CanAccessImpl) {
+  const PolymorphicMatcher<DivisibleByImpl> m(DivisibleByImpl(42));
+  const DivisibleByImpl& impl = m.impl();
+  EXPECT_EQ(42, impl.divider());
+}
+
+TEST(MatcherTupleTest, ExplainsMatchFailure) {
+  stringstream ss1;
+  ExplainMatchFailureTupleTo(make_tuple(Matcher<char>(Eq('a')), GreaterThan(5)),
+                             make_tuple('a', 10), &ss1);
+  EXPECT_EQ("", ss1.str());  // Successful match.
+
+  stringstream ss2;
+  ExplainMatchFailureTupleTo(make_tuple(GreaterThan(5), Matcher<char>(Eq('a'))),
+                             make_tuple(2, 'b'), &ss2);
+  EXPECT_EQ("  Expected arg #0: is > 5\n"
+            "           Actual: 2, which is 3 less than 5\n"
+            "  Expected arg #1: is equal to 'a' (97, 0x61)\n"
+            "           Actual: 'b' (98, 0x62)\n",
+            ss2.str());  // Failed match where both arguments need explanation.
+
+  stringstream ss3;
+  ExplainMatchFailureTupleTo(make_tuple(GreaterThan(5), Matcher<char>(Eq('a'))),
+                             make_tuple(2, 'a'), &ss3);
+  EXPECT_EQ("  Expected arg #0: is > 5\n"
+            "           Actual: 2, which is 3 less than 5\n",
+            ss3.str());  // Failed match where only one argument needs
+                         // explanation.
+}
+
+// Tests Each().
+
+TEST(EachTest, ExplainsMatchResultCorrectly) {
+  set<int> a;  // empty
+
+  Matcher<set<int> > m = Each(2);
+  EXPECT_EQ("", Explain(m, a));
+
+  Matcher<const int(&)[1]> n = Each(1);  // NOLINT
+
+  const int b[1] = {1};
+  EXPECT_EQ("", Explain(n, b));
+
+  n = Each(3);
+  EXPECT_EQ("whose element #0 doesn't match", Explain(n, b));
+
+  a.insert(1);
+  a.insert(2);
+  a.insert(3);
+  m = Each(GreaterThan(0));
+  EXPECT_EQ("", Explain(m, a));
+
+  m = Each(GreaterThan(10));
+  EXPECT_EQ("whose element #0 doesn't match, which is 9 less than 10",
+            Explain(m, a));
+}
+
+TEST(EachTest, DescribesItselfCorrectly) {
+  Matcher<vector<int> > m = Each(1);
+  EXPECT_EQ("only contains elements that is equal to 1", Describe(m));
+
+  Matcher<vector<int> > m2 = Not(m);
+  EXPECT_EQ("contains some element that isn't equal to 1", Describe(m2));
+}
+
+TEST(EachTest, MatchesVectorWhenAllElementsMatch) {
+  vector<int> some_vector;
+  EXPECT_THAT(some_vector, Each(1));
+  some_vector.push_back(3);
+  EXPECT_THAT(some_vector, Not(Each(1)));
+  EXPECT_THAT(some_vector, Each(3));
+  some_vector.push_back(1);
+  some_vector.push_back(2);
+  EXPECT_THAT(some_vector, Not(Each(3)));
+  EXPECT_THAT(some_vector, Each(Lt(3.5)));
+
+  vector<string> another_vector;
+  another_vector.push_back("fee");
+  EXPECT_THAT(another_vector, Each(string("fee")));
+  another_vector.push_back("fie");
+  another_vector.push_back("foe");
+  another_vector.push_back("fum");
+  EXPECT_THAT(another_vector, Not(Each(string("fee"))));
+}
+
+TEST(EachTest, MatchesMapWhenAllElementsMatch) {
+  map<const char*, int> my_map;
+  const char* bar = "a string";
+  my_map[bar] = 2;
+  EXPECT_THAT(my_map, Each(make_pair(bar, 2)));
+
+  map<string, int> another_map;
+  EXPECT_THAT(another_map, Each(make_pair(string("fee"), 1)));
+  another_map["fee"] = 1;
+  EXPECT_THAT(another_map, Each(make_pair(string("fee"), 1)));
+  another_map["fie"] = 2;
+  another_map["foe"] = 3;
+  another_map["fum"] = 4;
+  EXPECT_THAT(another_map, Not(Each(make_pair(string("fee"), 1))));
+  EXPECT_THAT(another_map, Not(Each(make_pair(string("fum"), 1))));
+  EXPECT_THAT(another_map, Each(Pair(_, Gt(0))));
+}
+
+TEST(EachTest, AcceptsMatcher) {
+  const int a[] = {1, 2, 3};
+  EXPECT_THAT(a, Each(Gt(0)));
+  EXPECT_THAT(a, Not(Each(Gt(1))));
+}
+
+TEST(EachTest, WorksForNativeArrayAsTuple) {
+  const int a[] = {1, 2};
+  const int* const pointer = a;
+  EXPECT_THAT(make_tuple(pointer, 2), Each(Gt(0)));
+  EXPECT_THAT(make_tuple(pointer, 2), Not(Each(Gt(1))));
+}
+
+// For testing Pointwise().
+class IsHalfOfMatcher {
+ public:
+  template <typename T1, typename T2>
+  bool MatchAndExplain(const tuple<T1, T2>& a_pair,
+                       MatchResultListener* listener) const {
+    if (get<0>(a_pair) == get<1>(a_pair)/2) {
+      *listener << "where the second is " << get<1>(a_pair);
+      return true;
+    } else {
+      *listener << "where the second/2 is " << get<1>(a_pair)/2;
+      return false;
+    }
+  }
+
+  void DescribeTo(ostream* os) const {
+    *os << "are a pair where the first is half of the second";
+  }
+
+  void DescribeNegationTo(ostream* os) const {
+    *os << "are a pair where the first isn't half of the second";
+  }
+};
+
+PolymorphicMatcher<IsHalfOfMatcher> IsHalfOf() {
+  return MakePolymorphicMatcher(IsHalfOfMatcher());
+}
+
+TEST(PointwiseTest, DescribesSelf) {
+  vector<int> rhs;
+  rhs.push_back(1);
+  rhs.push_back(2);
+  rhs.push_back(3);
+  const Matcher<const vector<int>&> m = Pointwise(IsHalfOf(), rhs);
+  EXPECT_EQ("contains 3 values, where each value and its corresponding value "
+            "in { 1, 2, 3 } are a pair where the first is half of the second",
+            Describe(m));
+  EXPECT_EQ("doesn't contain exactly 3 values, or contains a value x at some "
+            "index i where x and the i-th value of { 1, 2, 3 } are a pair "
+            "where the first isn't half of the second",
+            DescribeNegation(m));
+}
+
+TEST(PointwiseTest, MakesCopyOfRhs) {
+  list<signed char> rhs;
+  rhs.push_back(2);
+  rhs.push_back(4);
+
+  int lhs[] = {1, 2};
+  const Matcher<const int (&)[2]> m = Pointwise(IsHalfOf(), rhs);
+  EXPECT_THAT(lhs, m);
+
+  // Changing rhs now shouldn't affect m, which made a copy of rhs.
+  rhs.push_back(6);
+  EXPECT_THAT(lhs, m);
+}
+
+TEST(PointwiseTest, WorksForLhsNativeArray) {
+  const int lhs[] = {1, 2, 3};
+  vector<int> rhs;
+  rhs.push_back(2);
+  rhs.push_back(4);
+  rhs.push_back(6);
+  EXPECT_THAT(lhs, Pointwise(Lt(), rhs));
+  EXPECT_THAT(lhs, Not(Pointwise(Gt(), rhs)));
+}
+
+TEST(PointwiseTest, WorksForRhsNativeArray) {
+  const int rhs[] = {1, 2, 3};
+  vector<int> lhs;
+  lhs.push_back(2);
+  lhs.push_back(4);
+  lhs.push_back(6);
+  EXPECT_THAT(lhs, Pointwise(Gt(), rhs));
+  EXPECT_THAT(lhs, Not(Pointwise(Lt(), rhs)));
+}
+
+#if GTEST_HAS_STD_INITIALIZER_LIST_
+
+TEST(PointwiseTest, WorksForRhsInitializerList) {
+  const vector<int> lhs{2, 4, 6};
+  EXPECT_THAT(lhs, Pointwise(Gt(), {1, 2, 3}));
+  EXPECT_THAT(lhs, Not(Pointwise(Lt(), {3, 3, 7})));
+}
+
+#endif  // GTEST_HAS_STD_INITIALIZER_LIST_
+
+TEST(PointwiseTest, RejectsWrongSize) {
+  const double lhs[2] = {1, 2};
+  const int rhs[1] = {0};
+  EXPECT_THAT(lhs, Not(Pointwise(Gt(), rhs)));
+  EXPECT_EQ("which contains 2 values",
+            Explain(Pointwise(Gt(), rhs), lhs));
+
+  const int rhs2[3] = {0, 1, 2};
+  EXPECT_THAT(lhs, Not(Pointwise(Gt(), rhs2)));
+}
+
+TEST(PointwiseTest, RejectsWrongContent) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {2, 6, 4};
+  EXPECT_THAT(lhs, Not(Pointwise(IsHalfOf(), rhs)));
+  EXPECT_EQ("where the value pair (2, 6) at index #1 don't match, "
+            "where the second/2 is 3",
+            Explain(Pointwise(IsHalfOf(), rhs), lhs));
+}
+
+TEST(PointwiseTest, AcceptsCorrectContent) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {2, 4, 6};
+  EXPECT_THAT(lhs, Pointwise(IsHalfOf(), rhs));
+  EXPECT_EQ("", Explain(Pointwise(IsHalfOf(), rhs), lhs));
+}
+
+TEST(PointwiseTest, AllowsMonomorphicInnerMatcher) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {2, 4, 6};
+  const Matcher<tuple<const double&, const int&> > m1 = IsHalfOf();
+  EXPECT_THAT(lhs, Pointwise(m1, rhs));
+  EXPECT_EQ("", Explain(Pointwise(m1, rhs), lhs));
+
+  // This type works as a tuple<const double&, const int&> can be
+  // implicitly cast to tuple<double, int>.
+  const Matcher<tuple<double, int> > m2 = IsHalfOf();
+  EXPECT_THAT(lhs, Pointwise(m2, rhs));
+  EXPECT_EQ("", Explain(Pointwise(m2, rhs), lhs));
+}
+
+TEST(UnorderedPointwiseTest, DescribesSelf) {
+  vector<int> rhs;
+  rhs.push_back(1);
+  rhs.push_back(2);
+  rhs.push_back(3);
+  const Matcher<const vector<int>&> m = UnorderedPointwise(IsHalfOf(), rhs);
+  EXPECT_EQ(
+      "has 3 elements and there exists some permutation of elements such "
+      "that:\n"
+      " - element #0 and 1 are a pair where the first is half of the second, "
+      "and\n"
+      " - element #1 and 2 are a pair where the first is half of the second, "
+      "and\n"
+      " - element #2 and 3 are a pair where the first is half of the second",
+      Describe(m));
+  EXPECT_EQ(
+      "doesn't have 3 elements, or there exists no permutation of elements "
+      "such that:\n"
+      " - element #0 and 1 are a pair where the first is half of the second, "
+      "and\n"
+      " - element #1 and 2 are a pair where the first is half of the second, "
+      "and\n"
+      " - element #2 and 3 are a pair where the first is half of the second",
+      DescribeNegation(m));
+}
+
+TEST(UnorderedPointwiseTest, MakesCopyOfRhs) {
+  list<signed char> rhs;
+  rhs.push_back(2);
+  rhs.push_back(4);
+
+  int lhs[] = {2, 1};
+  const Matcher<const int (&)[2]> m = UnorderedPointwise(IsHalfOf(), rhs);
+  EXPECT_THAT(lhs, m);
+
+  // Changing rhs now shouldn't affect m, which made a copy of rhs.
+  rhs.push_back(6);
+  EXPECT_THAT(lhs, m);
+}
+
+TEST(UnorderedPointwiseTest, WorksForLhsNativeArray) {
+  const int lhs[] = {1, 2, 3};
+  vector<int> rhs;
+  rhs.push_back(4);
+  rhs.push_back(6);
+  rhs.push_back(2);
+  EXPECT_THAT(lhs, UnorderedPointwise(Lt(), rhs));
+  EXPECT_THAT(lhs, Not(UnorderedPointwise(Gt(), rhs)));
+}
+
+TEST(UnorderedPointwiseTest, WorksForRhsNativeArray) {
+  const int rhs[] = {1, 2, 3};
+  vector<int> lhs;
+  lhs.push_back(4);
+  lhs.push_back(2);
+  lhs.push_back(6);
+  EXPECT_THAT(lhs, UnorderedPointwise(Gt(), rhs));
+  EXPECT_THAT(lhs, Not(UnorderedPointwise(Lt(), rhs)));
+}
+
+#if GTEST_HAS_STD_INITIALIZER_LIST_
+
+TEST(UnorderedPointwiseTest, WorksForRhsInitializerList) {
+  const vector<int> lhs{2, 4, 6};
+  EXPECT_THAT(lhs, UnorderedPointwise(Gt(), {5, 1, 3}));
+  EXPECT_THAT(lhs, Not(UnorderedPointwise(Lt(), {1, 1, 7})));
+}
+
+#endif  // GTEST_HAS_STD_INITIALIZER_LIST_
+
+TEST(UnorderedPointwiseTest, RejectsWrongSize) {
+  const double lhs[2] = {1, 2};
+  const int rhs[1] = {0};
+  EXPECT_THAT(lhs, Not(UnorderedPointwise(Gt(), rhs)));
+  EXPECT_EQ("which has 2 elements",
+            Explain(UnorderedPointwise(Gt(), rhs), lhs));
+
+  const int rhs2[3] = {0, 1, 2};
+  EXPECT_THAT(lhs, Not(UnorderedPointwise(Gt(), rhs2)));
+}
+
+TEST(UnorderedPointwiseTest, RejectsWrongContent) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {2, 6, 6};
+  EXPECT_THAT(lhs, Not(UnorderedPointwise(IsHalfOf(), rhs)));
+  EXPECT_EQ("where the following elements don't match any matchers:\n"
+            "element #1: 2",
+            Explain(UnorderedPointwise(IsHalfOf(), rhs), lhs));
+}
+
+TEST(UnorderedPointwiseTest, AcceptsCorrectContentInSameOrder) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {2, 4, 6};
+  EXPECT_THAT(lhs, UnorderedPointwise(IsHalfOf(), rhs));
+}
+
+TEST(UnorderedPointwiseTest, AcceptsCorrectContentInDifferentOrder) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {6, 4, 2};
+  EXPECT_THAT(lhs, UnorderedPointwise(IsHalfOf(), rhs));
+}
+
+TEST(UnorderedPointwiseTest, AllowsMonomorphicInnerMatcher) {
+  const double lhs[3] = {1, 2, 3};
+  const int rhs[3] = {4, 6, 2};
+  const Matcher<tuple<const double&, const int&> > m1 = IsHalfOf();
+  EXPECT_THAT(lhs, UnorderedPointwise(m1, rhs));
+
+  // This type works as a tuple<const double&, const int&> can be
+  // implicitly cast to tuple<double, int>.
+  const Matcher<tuple<double, int> > m2 = IsHalfOf();
+  EXPECT_THAT(lhs, UnorderedPointwise(m2, rhs));
+}
+
+}  // namespace gmock_matchers_test
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-more-actions_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-more-actions_test.cc
new file mode 100644
index 0000000000..77e15bd586
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-more-actions_test.cc
@@ -0,0 +1,708 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests the built-in actions in gmock-more-actions.h.
+
+#include "gmock/gmock-more-actions.h"
+
+#include <functional>
+#include <sstream>
+#include <string>
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "gtest/internal/gtest-linked_ptr.h"
+
+namespace testing {
+namespace gmock_more_actions_test {
+
+using ::std::plus;
+using ::std::string;
+using testing::get;
+using testing::make_tuple;
+using testing::tuple;
+using testing::tuple_element;
+using testing::_;
+using testing::Action;
+using testing::ActionInterface;
+using testing::DeleteArg;
+using testing::Invoke;
+using testing::Return;
+using testing::ReturnArg;
+using testing::ReturnPointee;
+using testing::SaveArg;
+using testing::SaveArgPointee;
+using testing::SetArgReferee;
+using testing::StaticAssertTypeEq;
+using testing::Unused;
+using testing::WithArg;
+using testing::WithoutArgs;
+using testing::internal::linked_ptr;
+
+// For suppressing compiler warnings on conversion possibly losing precision.
+inline short Short(short n) { return n; }  // NOLINT
+inline char Char(char ch) { return ch; }
+
+// Sample functions and functors for testing Invoke() and etc.
+int Nullary() { return 1; }
+
+class NullaryFunctor {
+ public:
+  int operator()() { return 2; }
+};
+
+bool g_done = false;
+void VoidNullary() { g_done = true; }
+
+class VoidNullaryFunctor {
+ public:
+  void operator()() { g_done = true; }
+};
+
+bool Unary(int x) { return x < 0; }
+
+const char* Plus1(const char* s) { return s + 1; }
+
+void VoidUnary(int /* n */) { g_done = true; }
+
+bool ByConstRef(const string& s) { return s == "Hi"; }
+
+const double g_double = 0;
+bool ReferencesGlobalDouble(const double& x) { return &x == &g_double; }
+
+string ByNonConstRef(string& s) { return s += "+"; }  // NOLINT
+
+struct UnaryFunctor {
+  int operator()(bool x) { return x ? 1 : -1; }
+};
+
+const char* Binary(const char* input, short n) { return input + n; }  // NOLINT
+
+void VoidBinary(int, char) { g_done = true; }
+
+int Ternary(int x, char y, short z) { return x + y + z; }  // NOLINT
+
+void VoidTernary(int, char, bool) { g_done = true; }
+
+int SumOf4(int a, int b, int c, int d) { return a + b + c + d; }
+
+int SumOfFirst2(int a, int b, Unused, Unused) { return a + b; }
+
+void VoidFunctionWithFourArguments(char, int, float, double) { g_done = true; }
+
+string Concat4(const char* s1, const char* s2, const char* s3,
+               const char* s4) {
+  return string(s1) + s2 + s3 + s4;
+}
+
+int SumOf5(int a, int b, int c, int d, int e) { return a + b + c + d + e; }
+
+struct SumOf5Functor {
+  int operator()(int a, int b, int c, int d, int e) {
+    return a + b + c + d + e;
+  }
+};
+
+string Concat5(const char* s1, const char* s2, const char* s3,
+               const char* s4, const char* s5) {
+  return string(s1) + s2 + s3 + s4 + s5;
+}
+
+int SumOf6(int a, int b, int c, int d, int e, int f) {
+  return a + b + c + d + e + f;
+}
+
+struct SumOf6Functor {
+  int operator()(int a, int b, int c, int d, int e, int f) {
+    return a + b + c + d + e + f;
+  }
+};
+
+string Concat6(const char* s1, const char* s2, const char* s3,
+               const char* s4, const char* s5, const char* s6) {
+  return string(s1) + s2 + s3 + s4 + s5 + s6;
+}
+
+string Concat7(const char* s1, const char* s2, const char* s3,
+               const char* s4, const char* s5, const char* s6,
+               const char* s7) {
+  return string(s1) + s2 + s3 + s4 + s5 + s6 + s7;
+}
+
+string Concat8(const char* s1, const char* s2, const char* s3,
+               const char* s4, const char* s5, const char* s6,
+               const char* s7, const char* s8) {
+  return string(s1) + s2 + s3 + s4 + s5 + s6 + s7 + s8;
+}
+
+string Concat9(const char* s1, const char* s2, const char* s3,
+               const char* s4, const char* s5, const char* s6,
+               const char* s7, const char* s8, const char* s9) {
+  return string(s1) + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9;
+}
+
+string Concat10(const char* s1, const char* s2, const char* s3,
+                const char* s4, const char* s5, const char* s6,
+                const char* s7, const char* s8, const char* s9,
+                const char* s10) {
+  return string(s1) + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9 + s10;
+}
+
+class Foo {
+ public:
+  Foo() : value_(123) {}
+
+  int Nullary() const { return value_; }
+
+  short Unary(long x) { return static_cast<short>(value_ + x); }  // NOLINT
+
+  string Binary(const string& str, char c) const { return str + c; }
+
+  int Ternary(int x, bool y, char z) { return value_ + x + y*z; }
+
+  int SumOf4(int a, int b, int c, int d) const {
+    return a + b + c + d + value_;
+  }
+
+  int SumOfLast2(Unused, Unused, int a, int b) const { return a + b; }
+
+  int SumOf5(int a, int b, int c, int d, int e) { return a + b + c + d + e; }
+
+  int SumOf6(int a, int b, int c, int d, int e, int f) {
+    return a + b + c + d + e + f;
+  }
+
+  string Concat7(const char* s1, const char* s2, const char* s3,
+                 const char* s4, const char* s5, const char* s6,
+                 const char* s7) {
+    return string(s1) + s2 + s3 + s4 + s5 + s6 + s7;
+  }
+
+  string Concat8(const char* s1, const char* s2, const char* s3,
+                 const char* s4, const char* s5, const char* s6,
+                 const char* s7, const char* s8) {
+    return string(s1) + s2 + s3 + s4 + s5 + s6 + s7 + s8;
+  }
+
+  string Concat9(const char* s1, const char* s2, const char* s3,
+                 const char* s4, const char* s5, const char* s6,
+                 const char* s7, const char* s8, const char* s9) {
+    return string(s1) + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9;
+  }
+
+  string Concat10(const char* s1, const char* s2, const char* s3,
+                  const char* s4, const char* s5, const char* s6,
+                  const char* s7, const char* s8, const char* s9,
+                  const char* s10) {
+    return string(s1) + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9 + s10;
+  }
+
+ private:
+  int value_;
+};
+
+// Tests using Invoke() with a nullary function.
+TEST(InvokeTest, Nullary) {
+  Action<int()> a = Invoke(Nullary);  // NOLINT
+  EXPECT_EQ(1, a.Perform(make_tuple()));
+}
+
+// Tests using Invoke() with a unary function.
+TEST(InvokeTest, Unary) {
+  Action<bool(int)> a = Invoke(Unary);  // NOLINT
+  EXPECT_FALSE(a.Perform(make_tuple(1)));
+  EXPECT_TRUE(a.Perform(make_tuple(-1)));
+}
+
+// Tests using Invoke() with a binary function.
+TEST(InvokeTest, Binary) {
+  Action<const char*(const char*, short)> a = Invoke(Binary);  // NOLINT
+  const char* p = "Hello";
+  EXPECT_EQ(p + 2, a.Perform(make_tuple(p, Short(2))));
+}
+
+// Tests using Invoke() with a ternary function.
+TEST(InvokeTest, Ternary) {
+  Action<int(int, char, short)> a = Invoke(Ternary);  // NOLINT
+  EXPECT_EQ(6, a.Perform(make_tuple(1, '\2', Short(3))));
+}
+
+// Tests using Invoke() with a 4-argument function.
+TEST(InvokeTest, FunctionThatTakes4Arguments) {
+  Action<int(int, int, int, int)> a = Invoke(SumOf4);  // NOLINT
+  EXPECT_EQ(1234, a.Perform(make_tuple(1000, 200, 30, 4)));
+}
+
+// Tests using Invoke() with a 5-argument function.
+TEST(InvokeTest, FunctionThatTakes5Arguments) {
+  Action<int(int, int, int, int, int)> a = Invoke(SumOf5);  // NOLINT
+  EXPECT_EQ(12345, a.Perform(make_tuple(10000, 2000, 300, 40, 5)));
+}
+
+// Tests using Invoke() with a 6-argument function.
+TEST(InvokeTest, FunctionThatTakes6Arguments) {
+  Action<int(int, int, int, int, int, int)> a = Invoke(SumOf6);  // NOLINT
+  EXPECT_EQ(123456, a.Perform(make_tuple(100000, 20000, 3000, 400, 50, 6)));
+}
+
+// A helper that turns the type of a C-string literal from const
+// char[N] to const char*.
+inline const char* CharPtr(const char* s) { return s; }
+
+// Tests using Invoke() with a 7-argument function.
+TEST(InvokeTest, FunctionThatTakes7Arguments) {
+  Action<string(const char*, const char*, const char*, const char*,
+                const char*, const char*, const char*)> a =
+      Invoke(Concat7);
+  EXPECT_EQ("1234567",
+            a.Perform(make_tuple(CharPtr("1"), CharPtr("2"), CharPtr("3"),
+                                 CharPtr("4"), CharPtr("5"), CharPtr("6"),
+                                 CharPtr("7"))));
+}
+
+// Tests using Invoke() with a 8-argument function.
+TEST(InvokeTest, FunctionThatTakes8Arguments) {
+  Action<string(const char*, const char*, const char*, const char*,
+                const char*, const char*, const char*, const char*)> a =
+      Invoke(Concat8);
+  EXPECT_EQ("12345678",
+            a.Perform(make_tuple(CharPtr("1"), CharPtr("2"), CharPtr("3"),
+                                 CharPtr("4"), CharPtr("5"), CharPtr("6"),
+                                 CharPtr("7"), CharPtr("8"))));
+}
+
+// Tests using Invoke() with a 9-argument function.
+TEST(InvokeTest, FunctionThatTakes9Arguments) {
+  Action<string(const char*, const char*, const char*, const char*,
+                const char*, const char*, const char*, const char*,
+                const char*)> a = Invoke(Concat9);
+  EXPECT_EQ("123456789",
+            a.Perform(make_tuple(CharPtr("1"), CharPtr("2"), CharPtr("3"),
+                                 CharPtr("4"), CharPtr("5"), CharPtr("6"),
+                                 CharPtr("7"), CharPtr("8"), CharPtr("9"))));
+}
+
+// Tests using Invoke() with a 10-argument function.
+TEST(InvokeTest, FunctionThatTakes10Arguments) {
+  Action<string(const char*, const char*, const char*, const char*,
+                const char*, const char*, const char*, const char*,
+                const char*, const char*)> a = Invoke(Concat10);
+  EXPECT_EQ("1234567890",
+            a.Perform(make_tuple(CharPtr("1"), CharPtr("2"), CharPtr("3"),
+                                 CharPtr("4"), CharPtr("5"), CharPtr("6"),
+                                 CharPtr("7"), CharPtr("8"), CharPtr("9"),
+                                 CharPtr("0"))));
+}
+
+// Tests using Invoke() with functions with parameters declared as Unused.
+TEST(InvokeTest, FunctionWithUnusedParameters) {
+  Action<int(int, int, double, const string&)> a1 =
+      Invoke(SumOfFirst2);
+  string s("hi");
+  EXPECT_EQ(12, a1.Perform(
+    tuple<int, int, double, const string&>(10, 2, 5.6, s)));
+
+  Action<int(int, int, bool, int*)> a2 =
+      Invoke(SumOfFirst2);
+  EXPECT_EQ(23, a2.Perform(make_tuple(20, 3, true, static_cast<int*>(NULL))));
+}
+
+// Tests using Invoke() with methods with parameters declared as Unused.
+TEST(InvokeTest, MethodWithUnusedParameters) {
+  Foo foo;
+  Action<int(string, bool, int, int)> a1 =
+      Invoke(&foo, &Foo::SumOfLast2);
+  EXPECT_EQ(12, a1.Perform(make_tuple(CharPtr("hi"), true, 10, 2)));
+
+  Action<int(char, double, int, int)> a2 =
+      Invoke(&foo, &Foo::SumOfLast2);
+  EXPECT_EQ(23, a2.Perform(make_tuple('a', 2.5, 20, 3)));
+}
+
+// Tests using Invoke() with a functor.
+TEST(InvokeTest, Functor) {
+  Action<long(long, int)> a = Invoke(plus<long>());  // NOLINT
+  EXPECT_EQ(3L, a.Perform(make_tuple(1, 2)));
+}
+
+// Tests using Invoke(f) as an action of a compatible type.
+TEST(InvokeTest, FunctionWithCompatibleType) {
+  Action<long(int, short, char, bool)> a = Invoke(SumOf4);  // NOLINT
+  EXPECT_EQ(4321, a.Perform(make_tuple(4000, Short(300), Char(20), true)));
+}
+
+// Tests using Invoke() with an object pointer and a method pointer.
+
+// Tests using Invoke() with a nullary method.
+TEST(InvokeMethodTest, Nullary) {
+  Foo foo;
+  Action<int()> a = Invoke(&foo, &Foo::Nullary);  // NOLINT
+  EXPECT_EQ(123, a.Perform(make_tuple()));
+}
+
+// Tests using Invoke() with a unary method.
+TEST(InvokeMethodTest, Unary) {
+  Foo foo;
+  Action<short(long)> a = Invoke(&foo, &Foo::Unary);  // NOLINT
+  EXPECT_EQ(4123, a.Perform(make_tuple(4000)));
+}
+
+// Tests using Invoke() with a binary method.
+TEST(InvokeMethodTest, Binary) {
+  Foo foo;
+  Action<string(const string&, char)> a = Invoke(&foo, &Foo::Binary);
+  string s("Hell");
+  EXPECT_EQ("Hello", a.Perform(
+      tuple<const string&, char>(s, 'o')));
+}
+
+// Tests using Invoke() with a ternary method.
+TEST(InvokeMethodTest, Ternary) {
+  Foo foo;
+  Action<int(int, bool, char)> a = Invoke(&foo, &Foo::Ternary);  // NOLINT
+  EXPECT_EQ(1124, a.Perform(make_tuple(1000, true, Char(1))));
+}
+
+// Tests using Invoke() with a 4-argument method.
+TEST(InvokeMethodTest, MethodThatTakes4Arguments) {
+  Foo foo;
+  Action<int(int, int, int, int)> a = Invoke(&foo, &Foo::SumOf4);  // NOLINT
+  EXPECT_EQ(1357, a.Perform(make_tuple(1000, 200, 30, 4)));
+}
+
+// Tests using Invoke() with a 5-argument method.
+TEST(InvokeMethodTest, MethodThatTakes5Arguments) {
+  Foo foo;
+  Action<int(int, int, int, int, int)> a = Invoke(&foo, &Foo::SumOf5);  // NOLINT
+  EXPECT_EQ(12345, a.Perform(make_tuple(10000, 2000, 300, 40, 5)));
+}
+
+// Tests using Invoke() with a 6-argument method.
+TEST(InvokeMethodTest, MethodThatTakes6Arguments) {
+  Foo foo;
+  Action<int(int, int, int, int, int, int)> a =  // NOLINT
+      Invoke(&foo, &Foo::SumOf6);
+  EXPECT_EQ(123456, a.Perform(make_tuple(100000, 20000, 3000, 400, 50, 6)));
+}
+
+// Tests using Invoke() with a 7-argument method.
+TEST(InvokeMethodTest, MethodThatTakes7Arguments) {
+  Foo foo;
+  Action<string(const char*, const char*, const char*, const char*,
+                const char*, const char*, const char*)> a =
+      Invoke(&foo, &Foo::Concat7);
+  EXPECT_EQ("1234567",
+            a.Perform(make_tuple(CharPtr("1"), CharPtr("2"), CharPtr("3"),
+                                 CharPtr("4"), CharPtr("5"), CharPtr("6"),
+                                 CharPtr("7"))));
+}
+
+// Tests using Invoke() with a 8-argument method.
+TEST(InvokeMethodTest, MethodThatTakes8Arguments) {
+  Foo foo;
+  Action<string(const char*, const char*, const char*, const char*,
+                const char*, const char*, const char*, const char*)> a =
+      Invoke(&foo, &Foo::Concat8);
+  EXPECT_EQ("12345678",
+            a.Perform(make_tuple(CharPtr("1"), CharPtr("2"), CharPtr("3"),
+                                 CharPtr("4"), CharPtr("5"), CharPtr("6"),
+                                 CharPtr("7"), CharPtr("8"))));
+}
+
+// Tests using Invoke() with a 9-argument method.
+TEST(InvokeMethodTest, MethodThatTakes9Arguments) {
+  Foo foo;
+  Action<string(const char*, const char*, const char*, const char*,
+                const char*, const char*, const char*, const char*,
+                const char*)> a = Invoke(&foo, &Foo::Concat9);
+  EXPECT_EQ("123456789",
+            a.Perform(make_tuple(CharPtr("1"), CharPtr("2"), CharPtr("3"),
+                                 CharPtr("4"), CharPtr("5"), CharPtr("6"),
+                                 CharPtr("7"), CharPtr("8"), CharPtr("9"))));
+}
+
+// Tests using Invoke() with a 10-argument method.
+TEST(InvokeMethodTest, MethodThatTakes10Arguments) {
+  Foo foo;
+  Action<string(const char*, const char*, const char*, const char*,
+                const char*, const char*, const char*, const char*,
+                const char*, const char*)> a = Invoke(&foo, &Foo::Concat10);
+  EXPECT_EQ("1234567890",
+            a.Perform(make_tuple(CharPtr("1"), CharPtr("2"), CharPtr("3"),
+                                 CharPtr("4"), CharPtr("5"), CharPtr("6"),
+                                 CharPtr("7"), CharPtr("8"), CharPtr("9"),
+                                 CharPtr("0"))));
+}
+
+// Tests using Invoke(f) as an action of a compatible type.
+TEST(InvokeMethodTest, MethodWithCompatibleType) {
+  Foo foo;
+  Action<long(int, short, char, bool)> a =  // NOLINT
+      Invoke(&foo, &Foo::SumOf4);
+  EXPECT_EQ(4444, a.Perform(make_tuple(4000, Short(300), Char(20), true)));
+}
+
+// Tests using WithoutArgs with an action that takes no argument.
+TEST(WithoutArgsTest, NoArg) {
+  Action<int(int n)> a = WithoutArgs(Invoke(Nullary));  // NOLINT
+  EXPECT_EQ(1, a.Perform(make_tuple(2)));
+}
+
+// Tests using WithArg with an action that takes 1 argument.
+TEST(WithArgTest, OneArg) {
+  Action<bool(double x, int n)> b = WithArg<1>(Invoke(Unary));  // NOLINT
+  EXPECT_TRUE(b.Perform(make_tuple(1.5, -1)));
+  EXPECT_FALSE(b.Perform(make_tuple(1.5, 1)));
+}
+
+TEST(ReturnArgActionTest, WorksForOneArgIntArg0) {
+  const Action<int(int)> a = ReturnArg<0>();
+  EXPECT_EQ(5, a.Perform(make_tuple(5)));
+}
+
+TEST(ReturnArgActionTest, WorksForMultiArgBoolArg0) {
+  const Action<bool(bool, bool, bool)> a = ReturnArg<0>();
+  EXPECT_TRUE(a.Perform(make_tuple(true, false, false)));
+}
+
+TEST(ReturnArgActionTest, WorksForMultiArgStringArg2) {
+  const Action<string(int, int, string, int)> a = ReturnArg<2>();
+  EXPECT_EQ("seven", a.Perform(make_tuple(5, 6, string("seven"), 8)));
+}
+
+TEST(SaveArgActionTest, WorksForSameType) {
+  int result = 0;
+  const Action<void(int n)> a1 = SaveArg<0>(&result);
+  a1.Perform(make_tuple(5));
+  EXPECT_EQ(5, result);
+}
+
+TEST(SaveArgActionTest, WorksForCompatibleType) {
+  int result = 0;
+  const Action<void(bool, char)> a1 = SaveArg<1>(&result);
+  a1.Perform(make_tuple(true, 'a'));
+  EXPECT_EQ('a', result);
+}
+
+TEST(SaveArgPointeeActionTest, WorksForSameType) {
+  int result = 0;
+  const int value = 5;
+  const Action<void(const int*)> a1 = SaveArgPointee<0>(&result);
+  a1.Perform(make_tuple(&value));
+  EXPECT_EQ(5, result);
+}
+
+TEST(SaveArgPointeeActionTest, WorksForCompatibleType) {
+  int result = 0;
+  char value = 'a';
+  const Action<void(bool, char*)> a1 = SaveArgPointee<1>(&result);
+  a1.Perform(make_tuple(true, &value));
+  EXPECT_EQ('a', result);
+}
+
+TEST(SaveArgPointeeActionTest, WorksForLinkedPtr) {
+  int result = 0;
+  linked_ptr<int> value(new int(5));
+  const Action<void(linked_ptr<int>)> a1 = SaveArgPointee<0>(&result);
+  a1.Perform(make_tuple(value));
+  EXPECT_EQ(5, result);
+}
+
+TEST(SetArgRefereeActionTest, WorksForSameType) {
+  int value = 0;
+  const Action<void(int&)> a1 = SetArgReferee<0>(1);
+  a1.Perform(tuple<int&>(value));
+  EXPECT_EQ(1, value);
+}
+
+TEST(SetArgRefereeActionTest, WorksForCompatibleType) {
+  int value = 0;
+  const Action<void(int, int&)> a1 = SetArgReferee<1>('a');
+  a1.Perform(tuple<int, int&>(0, value));
+  EXPECT_EQ('a', value);
+}
+
+TEST(SetArgRefereeActionTest, WorksWithExtraArguments) {
+  int value = 0;
+  const Action<void(bool, int, int&, const char*)> a1 = SetArgReferee<2>('a');
+  a1.Perform(tuple<bool, int, int&, const char*>(true, 0, value, "hi"));
+  EXPECT_EQ('a', value);
+}
+
+// A class that can be used to verify that its destructor is called: it will set
+// the bool provided to the constructor to true when destroyed.
+class DeletionTester {
+ public:
+  explicit DeletionTester(bool* is_deleted)
+    : is_deleted_(is_deleted) {
+    // Make sure the bit is set to false.
+    *is_deleted_ = false;
+  }
+
+  ~DeletionTester() {
+    *is_deleted_ = true;
+  }
+
+ private:
+  bool* is_deleted_;
+};
+
+TEST(DeleteArgActionTest, OneArg) {
+  bool is_deleted = false;
+  DeletionTester* t = new DeletionTester(&is_deleted);
+  const Action<void(DeletionTester*)> a1 = DeleteArg<0>();      // NOLINT
+  EXPECT_FALSE(is_deleted);
+  a1.Perform(make_tuple(t));
+  EXPECT_TRUE(is_deleted);
+}
+
+TEST(DeleteArgActionTest, TenArgs) {
+  bool is_deleted = false;
+  DeletionTester* t = new DeletionTester(&is_deleted);
+  const Action<void(bool, int, int, const char*, bool,
+                    int, int, int, int, DeletionTester*)> a1 = DeleteArg<9>();
+  EXPECT_FALSE(is_deleted);
+  a1.Perform(make_tuple(true, 5, 6, CharPtr("hi"), false, 7, 8, 9, 10, t));
+  EXPECT_TRUE(is_deleted);
+}
+
+#if GTEST_HAS_EXCEPTIONS
+
+TEST(ThrowActionTest, ThrowsGivenExceptionInVoidFunction) {
+  const Action<void(int n)> a = Throw('a');
+  EXPECT_THROW(a.Perform(make_tuple(0)), char);
+}
+
+class MyException {};
+
+TEST(ThrowActionTest, ThrowsGivenExceptionInNonVoidFunction) {
+  const Action<double(char ch)> a = Throw(MyException());
+  EXPECT_THROW(a.Perform(make_tuple('0')), MyException);
+}
+
+TEST(ThrowActionTest, ThrowsGivenExceptionInNullaryFunction) {
+  const Action<double()> a = Throw(MyException());
+  EXPECT_THROW(a.Perform(make_tuple()), MyException);
+}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// Tests that SetArrayArgument<N>(first, last) sets the elements of the array
+// pointed to by the N-th (0-based) argument to values in range [first, last).
+TEST(SetArrayArgumentTest, SetsTheNthArray) {
+  typedef void MyFunction(bool, int*, char*);
+  int numbers[] = { 1, 2, 3 };
+  Action<MyFunction> a = SetArrayArgument<1>(numbers, numbers + 3);
+
+  int n[4] = {};
+  int* pn = n;
+  char ch[4] = {};
+  char* pch = ch;
+  a.Perform(make_tuple(true, pn, pch));
+  EXPECT_EQ(1, n[0]);
+  EXPECT_EQ(2, n[1]);
+  EXPECT_EQ(3, n[2]);
+  EXPECT_EQ(0, n[3]);
+  EXPECT_EQ('\0', ch[0]);
+  EXPECT_EQ('\0', ch[1]);
+  EXPECT_EQ('\0', ch[2]);
+  EXPECT_EQ('\0', ch[3]);
+
+  // Tests first and last are iterators.
+  std::string letters = "abc";
+  a = SetArrayArgument<2>(letters.begin(), letters.end());
+  std::fill_n(n, 4, 0);
+  std::fill_n(ch, 4, '\0');
+  a.Perform(make_tuple(true, pn, pch));
+  EXPECT_EQ(0, n[0]);
+  EXPECT_EQ(0, n[1]);
+  EXPECT_EQ(0, n[2]);
+  EXPECT_EQ(0, n[3]);
+  EXPECT_EQ('a', ch[0]);
+  EXPECT_EQ('b', ch[1]);
+  EXPECT_EQ('c', ch[2]);
+  EXPECT_EQ('\0', ch[3]);
+}
+
+// Tests SetArrayArgument<N>(first, last) where first == last.
+TEST(SetArrayArgumentTest, SetsTheNthArrayWithEmptyRange) {
+  typedef void MyFunction(bool, int*);
+  int numbers[] = { 1, 2, 3 };
+  Action<MyFunction> a = SetArrayArgument<1>(numbers, numbers);
+
+  int n[4] = {};
+  int* pn = n;
+  a.Perform(make_tuple(true, pn));
+  EXPECT_EQ(0, n[0]);
+  EXPECT_EQ(0, n[1]);
+  EXPECT_EQ(0, n[2]);
+  EXPECT_EQ(0, n[3]);
+}
+
+// Tests SetArrayArgument<N>(first, last) where *first is convertible
+// (but not equal) to the argument type.
+TEST(SetArrayArgumentTest, SetsTheNthArrayWithConvertibleType) {
+  typedef void MyFunction(bool, int*);
+  char chars[] = { 97, 98, 99 };
+  Action<MyFunction> a = SetArrayArgument<1>(chars, chars + 3);
+
+  int codes[4] = { 111, 222, 333, 444 };
+  int* pcodes = codes;
+  a.Perform(make_tuple(true, pcodes));
+  EXPECT_EQ(97, codes[0]);
+  EXPECT_EQ(98, codes[1]);
+  EXPECT_EQ(99, codes[2]);
+  EXPECT_EQ(444, codes[3]);
+}
+
+// Test SetArrayArgument<N>(first, last) with iterator as argument.
+TEST(SetArrayArgumentTest, SetsTheNthArrayWithIteratorArgument) {
+  typedef void MyFunction(bool, std::back_insert_iterator<std::string>);
+  std::string letters = "abc";
+  Action<MyFunction> a = SetArrayArgument<1>(letters.begin(), letters.end());
+
+  std::string s;
+  a.Perform(make_tuple(true, back_inserter(s)));
+  EXPECT_EQ(letters, s);
+}
+
+TEST(ReturnPointeeTest, Works) {
+  int n = 42;
+  const Action<int()> a = ReturnPointee(&n);
+  EXPECT_EQ(42, a.Perform(make_tuple()));
+
+  n = 43;
+  EXPECT_EQ(43, a.Perform(make_tuple()));
+}
+
+}  // namespace gmock_generated_actions_test
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-nice-strict_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-nice-strict_test.cc
new file mode 100644
index 0000000000..d0adcbbed8
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-nice-strict_test.cc
@@ -0,0 +1,424 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "gmock/gmock-generated-nice-strict.h"
+
+#include <string>
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+
+// This must not be defined inside the ::testing namespace, or it will
+// clash with ::testing::Mock.
+class Mock {
+ public:
+  Mock() {}
+
+  MOCK_METHOD0(DoThis, void());
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mock);
+};
+
+namespace testing {
+namespace gmock_nice_strict_test {
+
+using testing::internal::string;
+using testing::GMOCK_FLAG(verbose);
+using testing::HasSubstr;
+using testing::NaggyMock;
+using testing::NiceMock;
+using testing::StrictMock;
+
+#if GTEST_HAS_STREAM_REDIRECTION
+using testing::internal::CaptureStdout;
+using testing::internal::GetCapturedStdout;
+#endif
+
+// Defines some mock classes needed by the tests.
+
+class Foo {
+ public:
+  virtual ~Foo() {}
+
+  virtual void DoThis() = 0;
+  virtual int DoThat(bool flag) = 0;
+};
+
+class MockFoo : public Foo {
+ public:
+  MockFoo() {}
+  void Delete() { delete this; }
+
+  MOCK_METHOD0(DoThis, void());
+  MOCK_METHOD1(DoThat, int(bool flag));
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
+};
+
+class MockBar {
+ public:
+  explicit MockBar(const string& s) : str_(s) {}
+
+  MockBar(char a1, char a2, string a3, string a4, int a5, int a6,
+          const string& a7, const string& a8, bool a9, bool a10) {
+    str_ = string() + a1 + a2 + a3 + a4 + static_cast<char>(a5) +
+        static_cast<char>(a6) + a7 + a8 + (a9 ? 'T' : 'F') + (a10 ? 'T' : 'F');
+  }
+
+  virtual ~MockBar() {}
+
+  const string& str() const { return str_; }
+
+  MOCK_METHOD0(This, int());
+  MOCK_METHOD2(That, string(int, bool));
+
+ private:
+  string str_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockBar);
+};
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Tests that a raw mock generates warnings for uninteresting calls.
+TEST(RawMockTest, WarningForUninterestingCall) {
+  const string saved_flag = GMOCK_FLAG(verbose);
+  GMOCK_FLAG(verbose) = "warning";
+
+  MockFoo raw_foo;
+
+  CaptureStdout();
+  raw_foo.DoThis();
+  raw_foo.DoThat(true);
+  EXPECT_THAT(GetCapturedStdout(),
+              HasSubstr("Uninteresting mock function call"));
+
+  GMOCK_FLAG(verbose) = saved_flag;
+}
+
+// Tests that a raw mock generates warnings for uninteresting calls
+// that delete the mock object.
+TEST(RawMockTest, WarningForUninterestingCallAfterDeath) {
+  const string saved_flag = GMOCK_FLAG(verbose);
+  GMOCK_FLAG(verbose) = "warning";
+
+  MockFoo* const raw_foo = new MockFoo;
+
+  ON_CALL(*raw_foo, DoThis())
+      .WillByDefault(Invoke(raw_foo, &MockFoo::Delete));
+
+  CaptureStdout();
+  raw_foo->DoThis();
+  EXPECT_THAT(GetCapturedStdout(),
+              HasSubstr("Uninteresting mock function call"));
+
+  GMOCK_FLAG(verbose) = saved_flag;
+}
+
+// Tests that a raw mock generates informational logs for
+// uninteresting calls.
+TEST(RawMockTest, InfoForUninterestingCall) {
+  MockFoo raw_foo;
+
+  const string saved_flag = GMOCK_FLAG(verbose);
+  GMOCK_FLAG(verbose) = "info";
+  CaptureStdout();
+  raw_foo.DoThis();
+  EXPECT_THAT(GetCapturedStdout(),
+              HasSubstr("Uninteresting mock function call"));
+
+  GMOCK_FLAG(verbose) = saved_flag;
+}
+
+// Tests that a nice mock generates no warning for uninteresting calls.
+TEST(NiceMockTest, NoWarningForUninterestingCall) {
+  NiceMock<MockFoo> nice_foo;
+
+  CaptureStdout();
+  nice_foo.DoThis();
+  nice_foo.DoThat(true);
+  EXPECT_EQ("", GetCapturedStdout());
+}
+
+// Tests that a nice mock generates no warning for uninteresting calls
+// that delete the mock object.
+TEST(NiceMockTest, NoWarningForUninterestingCallAfterDeath) {
+  NiceMock<MockFoo>* const nice_foo = new NiceMock<MockFoo>;
+
+  ON_CALL(*nice_foo, DoThis())
+      .WillByDefault(Invoke(nice_foo, &MockFoo::Delete));
+
+  CaptureStdout();
+  nice_foo->DoThis();
+  EXPECT_EQ("", GetCapturedStdout());
+}
+
+// Tests that a nice mock generates informational logs for
+// uninteresting calls.
+TEST(NiceMockTest, InfoForUninterestingCall) {
+  NiceMock<MockFoo> nice_foo;
+
+  const string saved_flag = GMOCK_FLAG(verbose);
+  GMOCK_FLAG(verbose) = "info";
+  CaptureStdout();
+  nice_foo.DoThis();
+  EXPECT_THAT(GetCapturedStdout(),
+              HasSubstr("Uninteresting mock function call"));
+
+  GMOCK_FLAG(verbose) = saved_flag;
+}
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+// Tests that a nice mock allows expected calls.
+TEST(NiceMockTest, AllowsExpectedCall) {
+  NiceMock<MockFoo> nice_foo;
+
+  EXPECT_CALL(nice_foo, DoThis());
+  nice_foo.DoThis();
+}
+
+// Tests that an unexpected call on a nice mock fails.
+TEST(NiceMockTest, UnexpectedCallFails) {
+  NiceMock<MockFoo> nice_foo;
+
+  EXPECT_CALL(nice_foo, DoThis()).Times(0);
+  EXPECT_NONFATAL_FAILURE(nice_foo.DoThis(), "called more times than expected");
+}
+
+// Tests that NiceMock works with a mock class that has a non-default
+// constructor.
+TEST(NiceMockTest, NonDefaultConstructor) {
+  NiceMock<MockBar> nice_bar("hi");
+  EXPECT_EQ("hi", nice_bar.str());
+
+  nice_bar.This();
+  nice_bar.That(5, true);
+}
+
+// Tests that NiceMock works with a mock class that has a 10-ary
+// non-default constructor.
+TEST(NiceMockTest, NonDefaultConstructor10) {
+  NiceMock<MockBar> nice_bar('a', 'b', "c", "d", 'e', 'f',
+                             "g", "h", true, false);
+  EXPECT_EQ("abcdefghTF", nice_bar.str());
+
+  nice_bar.This();
+  nice_bar.That(5, true);
+}
+
+#if !GTEST_OS_SYMBIAN && !GTEST_OS_WINDOWS_MOBILE
+// Tests that NiceMock<Mock> compiles where Mock is a user-defined
+// class (as opposed to ::testing::Mock).  We had to work around an
+// MSVC 8.0 bug that caused the symbol Mock used in the definition of
+// NiceMock to be looked up in the wrong context, and this test
+// ensures that our fix works.
+//
+// We have to skip this test on Symbian and Windows Mobile, as it
+// causes the program to crash there, for reasons unclear to us yet.
+TEST(NiceMockTest, AcceptsClassNamedMock) {
+  NiceMock< ::Mock> nice;
+  EXPECT_CALL(nice, DoThis());
+  nice.DoThis();
+}
+#endif  // !GTEST_OS_SYMBIAN && !GTEST_OS_WINDOWS_MOBILE
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Tests that a naggy mock generates warnings for uninteresting calls.
+TEST(NaggyMockTest, WarningForUninterestingCall) {
+  const string saved_flag = GMOCK_FLAG(verbose);
+  GMOCK_FLAG(verbose) = "warning";
+
+  NaggyMock<MockFoo> naggy_foo;
+
+  CaptureStdout();
+  naggy_foo.DoThis();
+  naggy_foo.DoThat(true);
+  EXPECT_THAT(GetCapturedStdout(),
+              HasSubstr("Uninteresting mock function call"));
+
+  GMOCK_FLAG(verbose) = saved_flag;
+}
+
+// Tests that a naggy mock generates a warning for an uninteresting call
+// that deletes the mock object.
+TEST(NaggyMockTest, WarningForUninterestingCallAfterDeath) {
+  const string saved_flag = GMOCK_FLAG(verbose);
+  GMOCK_FLAG(verbose) = "warning";
+
+  NaggyMock<MockFoo>* const naggy_foo = new NaggyMock<MockFoo>;
+
+  ON_CALL(*naggy_foo, DoThis())
+      .WillByDefault(Invoke(naggy_foo, &MockFoo::Delete));
+
+  CaptureStdout();
+  naggy_foo->DoThis();
+  EXPECT_THAT(GetCapturedStdout(),
+              HasSubstr("Uninteresting mock function call"));
+
+  GMOCK_FLAG(verbose) = saved_flag;
+}
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+// Tests that a naggy mock allows expected calls.
+TEST(NaggyMockTest, AllowsExpectedCall) {
+  NaggyMock<MockFoo> naggy_foo;
+
+  EXPECT_CALL(naggy_foo, DoThis());
+  naggy_foo.DoThis();
+}
+
+// Tests that an unexpected call on a naggy mock fails.
+TEST(NaggyMockTest, UnexpectedCallFails) {
+  NaggyMock<MockFoo> naggy_foo;
+
+  EXPECT_CALL(naggy_foo, DoThis()).Times(0);
+  EXPECT_NONFATAL_FAILURE(naggy_foo.DoThis(),
+                          "called more times than expected");
+}
+
+// Tests that NaggyMock works with a mock class that has a non-default
+// constructor.
+TEST(NaggyMockTest, NonDefaultConstructor) {
+  NaggyMock<MockBar> naggy_bar("hi");
+  EXPECT_EQ("hi", naggy_bar.str());
+
+  naggy_bar.This();
+  naggy_bar.That(5, true);
+}
+
+// Tests that NaggyMock works with a mock class that has a 10-ary
+// non-default constructor.
+TEST(NaggyMockTest, NonDefaultConstructor10) {
+  NaggyMock<MockBar> naggy_bar('0', '1', "2", "3", '4', '5',
+                               "6", "7", true, false);
+  EXPECT_EQ("01234567TF", naggy_bar.str());
+
+  naggy_bar.This();
+  naggy_bar.That(5, true);
+}
+
+#if !GTEST_OS_SYMBIAN && !GTEST_OS_WINDOWS_MOBILE
+// Tests that NaggyMock<Mock> compiles where Mock is a user-defined
+// class (as opposed to ::testing::Mock).  We had to work around an
+// MSVC 8.0 bug that caused the symbol Mock used in the definition of
+// NaggyMock to be looked up in the wrong context, and this test
+// ensures that our fix works.
+//
+// We have to skip this test on Symbian and Windows Mobile, as it
+// causes the program to crash there, for reasons unclear to us yet.
+TEST(NaggyMockTest, AcceptsClassNamedMock) {
+  NaggyMock< ::Mock> naggy;
+  EXPECT_CALL(naggy, DoThis());
+  naggy.DoThis();
+}
+#endif  // !GTEST_OS_SYMBIAN && !GTEST_OS_WINDOWS_MOBILE
+
+// Tests that a strict mock allows expected calls.
+TEST(StrictMockTest, AllowsExpectedCall) {
+  StrictMock<MockFoo> strict_foo;
+
+  EXPECT_CALL(strict_foo, DoThis());
+  strict_foo.DoThis();
+}
+
+// Tests that an unexpected call on a strict mock fails.
+TEST(StrictMockTest, UnexpectedCallFails) {
+  StrictMock<MockFoo> strict_foo;
+
+  EXPECT_CALL(strict_foo, DoThis()).Times(0);
+  EXPECT_NONFATAL_FAILURE(strict_foo.DoThis(),
+                          "called more times than expected");
+}
+
+// Tests that an uninteresting call on a strict mock fails.
+TEST(StrictMockTest, UninterestingCallFails) {
+  StrictMock<MockFoo> strict_foo;
+
+  EXPECT_NONFATAL_FAILURE(strict_foo.DoThis(),
+                          "Uninteresting mock function call");
+}
+
+// Tests that an uninteresting call on a strict mock fails, even if
+// the call deletes the mock object.
+TEST(StrictMockTest, UninterestingCallFailsAfterDeath) {
+  StrictMock<MockFoo>* const strict_foo = new StrictMock<MockFoo>;
+
+  ON_CALL(*strict_foo, DoThis())
+      .WillByDefault(Invoke(strict_foo, &MockFoo::Delete));
+
+  EXPECT_NONFATAL_FAILURE(strict_foo->DoThis(),
+                          "Uninteresting mock function call");
+}
+
+// Tests that StrictMock works with a mock class that has a
+// non-default constructor.
+TEST(StrictMockTest, NonDefaultConstructor) {
+  StrictMock<MockBar> strict_bar("hi");
+  EXPECT_EQ("hi", strict_bar.str());
+
+  EXPECT_NONFATAL_FAILURE(strict_bar.That(5, true),
+                          "Uninteresting mock function call");
+}
+
+// Tests that StrictMock works with a mock class that has a 10-ary
+// non-default constructor.
+TEST(StrictMockTest, NonDefaultConstructor10) {
+  StrictMock<MockBar> strict_bar('a', 'b', "c", "d", 'e', 'f',
+                                 "g", "h", true, false);
+  EXPECT_EQ("abcdefghTF", strict_bar.str());
+
+  EXPECT_NONFATAL_FAILURE(strict_bar.That(5, true),
+                          "Uninteresting mock function call");
+}
+
+#if !GTEST_OS_SYMBIAN && !GTEST_OS_WINDOWS_MOBILE
+// Tests that StrictMock<Mock> compiles where Mock is a user-defined
+// class (as opposed to ::testing::Mock).  We had to work around an
+// MSVC 8.0 bug that caused the symbol Mock used in the definition of
+// StrictMock to be looked up in the wrong context, and this test
+// ensures that our fix works.
+//
+// We have to skip this test on Symbian and Windows Mobile, as it
+// causes the program to crash there, for reasons unclear to us yet.
+TEST(StrictMockTest, AcceptsClassNamedMock) {
+  StrictMock< ::Mock> strict;
+  EXPECT_CALL(strict, DoThis());
+  strict.DoThis();
+}
+#endif  // !GTEST_OS_SYMBIAN && !GTEST_OS_WINDOWS_MOBILE
+
+}  // namespace gmock_nice_strict_test
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-port_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-port_test.cc
new file mode 100644
index 0000000000..d6a8d44466
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-port_test.cc
@@ -0,0 +1,43 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests the internal cross-platform support utilities.
+
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
+// NOTE: if this file is left without tests for some reason, put a dummy
+// test here to make references to symbols in the gtest library and avoid
+// 'undefined symbol' linker errors in gmock_main:
+
+TEST(DummyTest, Dummy) {}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-spec-builders_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-spec-builders_test.cc
new file mode 100644
index 0000000000..59ea87c894
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock-spec-builders_test.cc
@@ -0,0 +1,2644 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests the spec builder syntax.
+
+#include "gmock/gmock-spec-builders.h"
+
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <string>
+
+#include "gmock/gmock.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+#include "gtest/internal/gtest-port.h"
+
+namespace testing {
+namespace internal {
+
+// Helper class for testing the Expectation class template.
+class ExpectationTester {
+ public:
+  // Sets the call count of the given expectation to the given number.
+  void SetCallCount(int n, ExpectationBase* exp) {
+    exp->call_count_ = n;
+  }
+};
+
+}  // namespace internal
+}  // namespace testing
+
+namespace {
+
+using testing::_;
+using testing::AnyNumber;
+using testing::AtLeast;
+using testing::AtMost;
+using testing::Between;
+using testing::Cardinality;
+using testing::CardinalityInterface;
+using testing::ContainsRegex;
+using testing::Const;
+using testing::DoAll;
+using testing::DoDefault;
+using testing::Eq;
+using testing::Expectation;
+using testing::ExpectationSet;
+using testing::GMOCK_FLAG(verbose);
+using testing::Gt;
+using testing::InSequence;
+using testing::Invoke;
+using testing::InvokeWithoutArgs;
+using testing::IsNotSubstring;
+using testing::IsSubstring;
+using testing::Lt;
+using testing::Message;
+using testing::Mock;
+using testing::NaggyMock;
+using testing::Ne;
+using testing::Return;
+using testing::Sequence;
+using testing::SetArgPointee;
+using testing::internal::ExpectationTester;
+using testing::internal::FormatFileLocation;
+using testing::internal::kErrorVerbosity;
+using testing::internal::kInfoVerbosity;
+using testing::internal::kWarningVerbosity;
+using testing::internal::linked_ptr;
+using testing::internal::string;
+
+#if GTEST_HAS_STREAM_REDIRECTION
+using testing::HasSubstr;
+using testing::internal::CaptureStdout;
+using testing::internal::GetCapturedStdout;
+#endif
+
+class Incomplete;
+
+class MockIncomplete {
+ public:
+  // This line verifies that a mock method can take a by-reference
+  // argument of an incomplete type.
+  MOCK_METHOD1(ByRefFunc, void(const Incomplete& x));
+};
+
+// Tells Google Mock how to print a value of type Incomplete.
+void PrintTo(const Incomplete& x, ::std::ostream* os);
+
+TEST(MockMethodTest, CanInstantiateWithIncompleteArgType) {
+  // Even though this mock class contains a mock method that takes
+  // by-reference an argument whose type is incomplete, we can still
+  // use the mock, as long as Google Mock knows how to print the
+  // argument.
+  MockIncomplete incomplete;
+  EXPECT_CALL(incomplete, ByRefFunc(_))
+      .Times(AnyNumber());
+}
+
+// The definition of the printer for the argument type doesn't have to
+// be visible where the mock is used.
+void PrintTo(const Incomplete& /* x */, ::std::ostream* os) {
+  *os << "incomplete";
+}
+
+class Result {};
+
+// A type that's not default constructible.
+class NonDefaultConstructible {
+ public:
+  explicit NonDefaultConstructible(int /* dummy */) {}
+};
+
+class MockA {
+ public:
+  MockA() {}
+
+  MOCK_METHOD1(DoA, void(int n));
+  MOCK_METHOD1(ReturnResult, Result(int n));
+  MOCK_METHOD0(ReturnNonDefaultConstructible, NonDefaultConstructible());
+  MOCK_METHOD2(Binary, bool(int x, int y));
+  MOCK_METHOD2(ReturnInt, int(int x, int y));
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockA);
+};
+
+class MockB {
+ public:
+  MockB() {}
+
+  MOCK_CONST_METHOD0(DoB, int());  // NOLINT
+  MOCK_METHOD1(DoB, int(int n));  // NOLINT
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockB);
+};
+
+class ReferenceHoldingMock {
+ public:
+  ReferenceHoldingMock() {}
+
+  MOCK_METHOD1(AcceptReference, void(linked_ptr<MockA>*));
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ReferenceHoldingMock);
+};
+
+// Tests that EXPECT_CALL and ON_CALL compile in a presence of macro
+// redefining a mock method name. This could happen, for example, when
+// the tested code #includes Win32 API headers which define many APIs
+// as macros, e.g. #define TextOut TextOutW.
+
+#define Method MethodW
+
+class CC {
+ public:
+  virtual ~CC() {}
+  virtual int Method() = 0;
+};
+class MockCC : public CC {
+ public:
+  MockCC() {}
+
+  MOCK_METHOD0(Method, int());
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockCC);
+};
+
+// Tests that a method with expanded name compiles.
+TEST(OnCallSyntaxTest, CompilesWithMethodNameExpandedFromMacro) {
+  MockCC cc;
+  ON_CALL(cc, Method());
+}
+
+// Tests that the method with expanded name not only compiles but runs
+// and returns a correct value, too.
+TEST(OnCallSyntaxTest, WorksWithMethodNameExpandedFromMacro) {
+  MockCC cc;
+  ON_CALL(cc, Method()).WillByDefault(Return(42));
+  EXPECT_EQ(42, cc.Method());
+}
+
+// Tests that a method with expanded name compiles.
+TEST(ExpectCallSyntaxTest, CompilesWithMethodNameExpandedFromMacro) {
+  MockCC cc;
+  EXPECT_CALL(cc, Method());
+  cc.Method();
+}
+
+// Tests that it works, too.
+TEST(ExpectCallSyntaxTest, WorksWithMethodNameExpandedFromMacro) {
+  MockCC cc;
+  EXPECT_CALL(cc, Method()).WillOnce(Return(42));
+  EXPECT_EQ(42, cc.Method());
+}
+
+#undef Method  // Done with macro redefinition tests.
+
+// Tests that ON_CALL evaluates its arguments exactly once as promised
+// by Google Mock.
+TEST(OnCallSyntaxTest, EvaluatesFirstArgumentOnce) {
+  MockA a;
+  MockA* pa = &a;
+
+  ON_CALL(*pa++, DoA(_));
+  EXPECT_EQ(&a + 1, pa);
+}
+
+TEST(OnCallSyntaxTest, EvaluatesSecondArgumentOnce) {
+  MockA a;
+  int n = 0;
+
+  ON_CALL(a, DoA(n++));
+  EXPECT_EQ(1, n);
+}
+
+// Tests that the syntax of ON_CALL() is enforced at run time.
+
+TEST(OnCallSyntaxTest, WithIsOptional) {
+  MockA a;
+
+  ON_CALL(a, DoA(5))
+      .WillByDefault(Return());
+  ON_CALL(a, DoA(_))
+      .With(_)
+      .WillByDefault(Return());
+}
+
+TEST(OnCallSyntaxTest, WithCanAppearAtMostOnce) {
+  MockA a;
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    ON_CALL(a, ReturnResult(_))
+        .With(_)
+        .With(_)
+        .WillByDefault(Return(Result()));
+  }, ".With() cannot appear more than once in an ON_CALL()");
+}
+
+TEST(OnCallSyntaxTest, WillByDefaultIsMandatory) {
+  MockA a;
+
+  EXPECT_DEATH_IF_SUPPORTED({
+    ON_CALL(a, DoA(5));
+    a.DoA(5);
+  }, "");
+}
+
+TEST(OnCallSyntaxTest, WillByDefaultCanAppearAtMostOnce) {
+  MockA a;
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    ON_CALL(a, DoA(5))
+        .WillByDefault(Return())
+        .WillByDefault(Return());
+  }, ".WillByDefault() must appear exactly once in an ON_CALL()");
+}
+
+// Tests that EXPECT_CALL evaluates its arguments exactly once as
+// promised by Google Mock.
+TEST(ExpectCallSyntaxTest, EvaluatesFirstArgumentOnce) {
+  MockA a;
+  MockA* pa = &a;
+
+  EXPECT_CALL(*pa++, DoA(_));
+  a.DoA(0);
+  EXPECT_EQ(&a + 1, pa);
+}
+
+TEST(ExpectCallSyntaxTest, EvaluatesSecondArgumentOnce) {
+  MockA a;
+  int n = 0;
+
+  EXPECT_CALL(a, DoA(n++));
+  a.DoA(0);
+  EXPECT_EQ(1, n);
+}
+
+// Tests that the syntax of EXPECT_CALL() is enforced at run time.
+
+TEST(ExpectCallSyntaxTest, WithIsOptional) {
+  MockA a;
+
+  EXPECT_CALL(a, DoA(5))
+      .Times(0);
+  EXPECT_CALL(a, DoA(6))
+      .With(_)
+      .Times(0);
+}
+
+TEST(ExpectCallSyntaxTest, WithCanAppearAtMostOnce) {
+  MockA a;
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_CALL(a, DoA(6))
+        .With(_)
+        .With(_);
+  }, ".With() cannot appear more than once in an EXPECT_CALL()");
+
+  a.DoA(6);
+}
+
+TEST(ExpectCallSyntaxTest, WithMustBeFirstClause) {
+  MockA a;
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_CALL(a, DoA(1))
+        .Times(1)
+        .With(_);
+  }, ".With() must be the first clause in an EXPECT_CALL()");
+
+  a.DoA(1);
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_CALL(a, DoA(2))
+        .WillOnce(Return())
+        .With(_);
+  }, ".With() must be the first clause in an EXPECT_CALL()");
+
+  a.DoA(2);
+}
+
+TEST(ExpectCallSyntaxTest, TimesCanBeInferred) {
+  MockA a;
+
+  EXPECT_CALL(a, DoA(1))
+      .WillOnce(Return());
+
+  EXPECT_CALL(a, DoA(2))
+      .WillOnce(Return())
+      .WillRepeatedly(Return());
+
+  a.DoA(1);
+  a.DoA(2);
+  a.DoA(2);
+}
+
+TEST(ExpectCallSyntaxTest, TimesCanAppearAtMostOnce) {
+  MockA a;
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_CALL(a, DoA(1))
+        .Times(1)
+        .Times(2);
+  }, ".Times() cannot appear more than once in an EXPECT_CALL()");
+
+  a.DoA(1);
+  a.DoA(1);
+}
+
+TEST(ExpectCallSyntaxTest, TimesMustBeBeforeInSequence) {
+  MockA a;
+  Sequence s;
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_CALL(a, DoA(1))
+        .InSequence(s)
+        .Times(1);
+  }, ".Times() cannot appear after ");
+
+  a.DoA(1);
+}
+
+TEST(ExpectCallSyntaxTest, InSequenceIsOptional) {
+  MockA a;
+  Sequence s;
+
+  EXPECT_CALL(a, DoA(1));
+  EXPECT_CALL(a, DoA(2))
+      .InSequence(s);
+
+  a.DoA(1);
+  a.DoA(2);
+}
+
+TEST(ExpectCallSyntaxTest, InSequenceCanAppearMultipleTimes) {
+  MockA a;
+  Sequence s1, s2;
+
+  EXPECT_CALL(a, DoA(1))
+      .InSequence(s1, s2)
+      .InSequence(s1);
+
+  a.DoA(1);
+}
+
+TEST(ExpectCallSyntaxTest, InSequenceMustBeBeforeAfter) {
+  MockA a;
+  Sequence s;
+
+  Expectation e = EXPECT_CALL(a, DoA(1))
+      .Times(AnyNumber());
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_CALL(a, DoA(2))
+        .After(e)
+        .InSequence(s);
+  }, ".InSequence() cannot appear after ");
+
+  a.DoA(2);
+}
+
+TEST(ExpectCallSyntaxTest, InSequenceMustBeBeforeWillOnce) {
+  MockA a;
+  Sequence s;
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_CALL(a, DoA(1))
+        .WillOnce(Return())
+        .InSequence(s);
+  }, ".InSequence() cannot appear after ");
+
+  a.DoA(1);
+}
+
+TEST(ExpectCallSyntaxTest, AfterMustBeBeforeWillOnce) {
+  MockA a;
+
+  Expectation e = EXPECT_CALL(a, DoA(1));
+  EXPECT_NONFATAL_FAILURE({
+    EXPECT_CALL(a, DoA(2))
+        .WillOnce(Return())
+        .After(e);
+  }, ".After() cannot appear after ");
+
+  a.DoA(1);
+  a.DoA(2);
+}
+
+TEST(ExpectCallSyntaxTest, WillIsOptional) {
+  MockA a;
+
+  EXPECT_CALL(a, DoA(1));
+  EXPECT_CALL(a, DoA(2))
+      .WillOnce(Return());
+
+  a.DoA(1);
+  a.DoA(2);
+}
+
+TEST(ExpectCallSyntaxTest, WillCanAppearMultipleTimes) {
+  MockA a;
+
+  EXPECT_CALL(a, DoA(1))
+      .Times(AnyNumber())
+      .WillOnce(Return())
+      .WillOnce(Return())
+      .WillOnce(Return());
+}
+
+TEST(ExpectCallSyntaxTest, WillMustBeBeforeWillRepeatedly) {
+  MockA a;
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_CALL(a, DoA(1))
+        .WillRepeatedly(Return())
+        .WillOnce(Return());
+  }, ".WillOnce() cannot appear after ");
+
+  a.DoA(1);
+}
+
+TEST(ExpectCallSyntaxTest, WillRepeatedlyIsOptional) {
+  MockA a;
+
+  EXPECT_CALL(a, DoA(1))
+      .WillOnce(Return());
+  EXPECT_CALL(a, DoA(2))
+      .WillOnce(Return())
+      .WillRepeatedly(Return());
+
+  a.DoA(1);
+  a.DoA(2);
+  a.DoA(2);
+}
+
+TEST(ExpectCallSyntaxTest, WillRepeatedlyCannotAppearMultipleTimes) {
+  MockA a;
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_CALL(a, DoA(1))
+        .WillRepeatedly(Return())
+        .WillRepeatedly(Return());
+  }, ".WillRepeatedly() cannot appear more than once in an "
+     "EXPECT_CALL()");
+}
+
+TEST(ExpectCallSyntaxTest, WillRepeatedlyMustBeBeforeRetiresOnSaturation) {
+  MockA a;
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_CALL(a, DoA(1))
+        .RetiresOnSaturation()
+        .WillRepeatedly(Return());
+  }, ".WillRepeatedly() cannot appear after ");
+}
+
+TEST(ExpectCallSyntaxTest, RetiresOnSaturationIsOptional) {
+  MockA a;
+
+  EXPECT_CALL(a, DoA(1));
+  EXPECT_CALL(a, DoA(1))
+      .RetiresOnSaturation();
+
+  a.DoA(1);
+  a.DoA(1);
+}
+
+TEST(ExpectCallSyntaxTest, RetiresOnSaturationCannotAppearMultipleTimes) {
+  MockA a;
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_CALL(a, DoA(1))
+        .RetiresOnSaturation()
+        .RetiresOnSaturation();
+  }, ".RetiresOnSaturation() cannot appear more than once");
+
+  a.DoA(1);
+}
+
+TEST(ExpectCallSyntaxTest, DefaultCardinalityIsOnce) {
+  {
+    MockA a;
+    EXPECT_CALL(a, DoA(1));
+    a.DoA(1);
+  }
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    MockA a;
+    EXPECT_CALL(a, DoA(1));
+  }, "to be called once");
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    MockA a;
+    EXPECT_CALL(a, DoA(1));
+    a.DoA(1);
+    a.DoA(1);
+  }, "to be called once");
+}
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Tests that Google Mock doesn't print a warning when the number of
+// WillOnce() is adequate.
+TEST(ExpectCallSyntaxTest, DoesNotWarnOnAdequateActionCount) {
+  CaptureStdout();
+  {
+    MockB b;
+
+    // It's always fine to omit WillOnce() entirely.
+    EXPECT_CALL(b, DoB())
+        .Times(0);
+    EXPECT_CALL(b, DoB(1))
+        .Times(AtMost(1));
+    EXPECT_CALL(b, DoB(2))
+        .Times(1)
+        .WillRepeatedly(Return(1));
+
+    // It's fine for the number of WillOnce()s to equal the upper bound.
+    EXPECT_CALL(b, DoB(3))
+        .Times(Between(1, 2))
+        .WillOnce(Return(1))
+        .WillOnce(Return(2));
+
+    // It's fine for the number of WillOnce()s to be smaller than the
+    // upper bound when there is a WillRepeatedly().
+    EXPECT_CALL(b, DoB(4))
+        .Times(AtMost(3))
+        .WillOnce(Return(1))
+        .WillRepeatedly(Return(2));
+
+    // Satisfies the above expectations.
+    b.DoB(2);
+    b.DoB(3);
+  }
+  EXPECT_STREQ("", GetCapturedStdout().c_str());
+}
+
+// Tests that Google Mock warns on having too many actions in an
+// expectation compared to its cardinality.
+TEST(ExpectCallSyntaxTest, WarnsOnTooManyActions) {
+  CaptureStdout();
+  {
+    MockB b;
+
+    // Warns when the number of WillOnce()s is larger than the upper bound.
+    EXPECT_CALL(b, DoB())
+        .Times(0)
+        .WillOnce(Return(1));  // #1
+    EXPECT_CALL(b, DoB())
+        .Times(AtMost(1))
+        .WillOnce(Return(1))
+        .WillOnce(Return(2));  // #2
+    EXPECT_CALL(b, DoB(1))
+        .Times(1)
+        .WillOnce(Return(1))
+        .WillOnce(Return(2))
+        .RetiresOnSaturation();  // #3
+
+    // Warns when the number of WillOnce()s equals the upper bound and
+    // there is a WillRepeatedly().
+    EXPECT_CALL(b, DoB())
+        .Times(0)
+        .WillRepeatedly(Return(1));  // #4
+    EXPECT_CALL(b, DoB(2))
+        .Times(1)
+        .WillOnce(Return(1))
+        .WillRepeatedly(Return(2));  // #5
+
+    // Satisfies the above expectations.
+    b.DoB(1);
+    b.DoB(2);
+  }
+  const std::string output = GetCapturedStdout();
+  EXPECT_PRED_FORMAT2(
+      IsSubstring,
+      "Too many actions specified in EXPECT_CALL(b, DoB())...\n"
+      "Expected to be never called, but has 1 WillOnce().",
+      output);  // #1
+  EXPECT_PRED_FORMAT2(
+      IsSubstring,
+      "Too many actions specified in EXPECT_CALL(b, DoB())...\n"
+      "Expected to be called at most once, "
+      "but has 2 WillOnce()s.",
+      output);  // #2
+  EXPECT_PRED_FORMAT2(
+      IsSubstring,
+      "Too many actions specified in EXPECT_CALL(b, DoB(1))...\n"
+      "Expected to be called once, but has 2 WillOnce()s.",
+      output);  // #3
+  EXPECT_PRED_FORMAT2(
+      IsSubstring,
+      "Too many actions specified in EXPECT_CALL(b, DoB())...\n"
+      "Expected to be never called, but has 0 WillOnce()s "
+      "and a WillRepeatedly().",
+      output);  // #4
+  EXPECT_PRED_FORMAT2(
+      IsSubstring,
+      "Too many actions specified in EXPECT_CALL(b, DoB(2))...\n"
+      "Expected to be called once, but has 1 WillOnce() "
+      "and a WillRepeatedly().",
+      output);  // #5
+}
+
+// Tests that Google Mock warns on having too few actions in an
+// expectation compared to its cardinality.
+TEST(ExpectCallSyntaxTest, WarnsOnTooFewActions) {
+  MockB b;
+
+  EXPECT_CALL(b, DoB())
+      .Times(Between(2, 3))
+      .WillOnce(Return(1));
+
+  CaptureStdout();
+  b.DoB();
+  const std::string output = GetCapturedStdout();
+  EXPECT_PRED_FORMAT2(
+      IsSubstring,
+      "Too few actions specified in EXPECT_CALL(b, DoB())...\n"
+      "Expected to be called between 2 and 3 times, "
+      "but has only 1 WillOnce().",
+      output);
+  b.DoB();
+}
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+// Tests the semantics of ON_CALL().
+
+// Tests that the built-in default action is taken when no ON_CALL()
+// is specified.
+TEST(OnCallTest, TakesBuiltInDefaultActionWhenNoOnCall) {
+  MockB b;
+  EXPECT_CALL(b, DoB());
+
+  EXPECT_EQ(0, b.DoB());
+}
+
+// Tests that the built-in default action is taken when no ON_CALL()
+// matches the invocation.
+TEST(OnCallTest, TakesBuiltInDefaultActionWhenNoOnCallMatches) {
+  MockB b;
+  ON_CALL(b, DoB(1))
+      .WillByDefault(Return(1));
+  EXPECT_CALL(b, DoB(_));
+
+  EXPECT_EQ(0, b.DoB(2));
+}
+
+// Tests that the last matching ON_CALL() action is taken.
+TEST(OnCallTest, PicksLastMatchingOnCall) {
+  MockB b;
+  ON_CALL(b, DoB(_))
+      .WillByDefault(Return(3));
+  ON_CALL(b, DoB(2))
+      .WillByDefault(Return(2));
+  ON_CALL(b, DoB(1))
+      .WillByDefault(Return(1));
+  EXPECT_CALL(b, DoB(_));
+
+  EXPECT_EQ(2, b.DoB(2));
+}
+
+// Tests the semantics of EXPECT_CALL().
+
+// Tests that any call is allowed when no EXPECT_CALL() is specified.
+TEST(ExpectCallTest, AllowsAnyCallWhenNoSpec) {
+  MockB b;
+  EXPECT_CALL(b, DoB());
+  // There is no expectation on DoB(int).
+
+  b.DoB();
+
+  // DoB(int) can be called any number of times.
+  b.DoB(1);
+  b.DoB(2);
+}
+
+// Tests that the last matching EXPECT_CALL() fires.
+TEST(ExpectCallTest, PicksLastMatchingExpectCall) {
+  MockB b;
+  EXPECT_CALL(b, DoB(_))
+      .WillRepeatedly(Return(2));
+  EXPECT_CALL(b, DoB(1))
+      .WillRepeatedly(Return(1));
+
+  EXPECT_EQ(1, b.DoB(1));
+}
+
+// Tests lower-bound violation.
+TEST(ExpectCallTest, CatchesTooFewCalls) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    MockB b;
+    EXPECT_CALL(b, DoB(5))
+        .Times(AtLeast(2));
+
+    b.DoB(5);
+  }, "Actual function call count doesn't match EXPECT_CALL(b, DoB(5))...\n"
+     "         Expected: to be called at least twice\n"
+     "           Actual: called once - unsatisfied and active");
+}
+
+// Tests that the cardinality can be inferred when no Times(...) is
+// specified.
+TEST(ExpectCallTest, InfersCardinalityWhenThereIsNoWillRepeatedly) {
+  {
+    MockB b;
+    EXPECT_CALL(b, DoB())
+        .WillOnce(Return(1))
+        .WillOnce(Return(2));
+
+    EXPECT_EQ(1, b.DoB());
+    EXPECT_EQ(2, b.DoB());
+  }
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    MockB b;
+    EXPECT_CALL(b, DoB())
+        .WillOnce(Return(1))
+        .WillOnce(Return(2));
+
+    EXPECT_EQ(1, b.DoB());
+  }, "to be called twice");
+
+  {  // NOLINT
+    MockB b;
+    EXPECT_CALL(b, DoB())
+        .WillOnce(Return(1))
+        .WillOnce(Return(2));
+
+    EXPECT_EQ(1, b.DoB());
+    EXPECT_EQ(2, b.DoB());
+    EXPECT_NONFATAL_FAILURE(b.DoB(), "to be called twice");
+  }
+}
+
+TEST(ExpectCallTest, InfersCardinality1WhenThereIsWillRepeatedly) {
+  {
+    MockB b;
+    EXPECT_CALL(b, DoB())
+        .WillOnce(Return(1))
+        .WillRepeatedly(Return(2));
+
+    EXPECT_EQ(1, b.DoB());
+  }
+
+  {  // NOLINT
+    MockB b;
+    EXPECT_CALL(b, DoB())
+        .WillOnce(Return(1))
+        .WillRepeatedly(Return(2));
+
+    EXPECT_EQ(1, b.DoB());
+    EXPECT_EQ(2, b.DoB());
+    EXPECT_EQ(2, b.DoB());
+  }
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    MockB b;
+    EXPECT_CALL(b, DoB())
+        .WillOnce(Return(1))
+        .WillRepeatedly(Return(2));
+  }, "to be called at least once");
+}
+
+// Tests that the n-th action is taken for the n-th matching
+// invocation.
+TEST(ExpectCallTest, NthMatchTakesNthAction) {
+  MockB b;
+  EXPECT_CALL(b, DoB())
+      .WillOnce(Return(1))
+      .WillOnce(Return(2))
+      .WillOnce(Return(3));
+
+  EXPECT_EQ(1, b.DoB());
+  EXPECT_EQ(2, b.DoB());
+  EXPECT_EQ(3, b.DoB());
+}
+
+// Tests that the WillRepeatedly() action is taken when the WillOnce(...)
+// list is exhausted.
+TEST(ExpectCallTest, TakesRepeatedActionWhenWillListIsExhausted) {
+  MockB b;
+  EXPECT_CALL(b, DoB())
+      .WillOnce(Return(1))
+      .WillRepeatedly(Return(2));
+
+  EXPECT_EQ(1, b.DoB());
+  EXPECT_EQ(2, b.DoB());
+  EXPECT_EQ(2, b.DoB());
+}
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Tests that the default action is taken when the WillOnce(...) list is
+// exhausted and there is no WillRepeatedly().
+TEST(ExpectCallTest, TakesDefaultActionWhenWillListIsExhausted) {
+  MockB b;
+  EXPECT_CALL(b, DoB(_))
+      .Times(1);
+  EXPECT_CALL(b, DoB())
+      .Times(AnyNumber())
+      .WillOnce(Return(1))
+      .WillOnce(Return(2));
+
+  CaptureStdout();
+  EXPECT_EQ(0, b.DoB(1));  // Shouldn't generate a warning as the
+                           // expectation has no action clause at all.
+  EXPECT_EQ(1, b.DoB());
+  EXPECT_EQ(2, b.DoB());
+  const std::string output1 = GetCapturedStdout();
+  EXPECT_STREQ("", output1.c_str());
+
+  CaptureStdout();
+  EXPECT_EQ(0, b.DoB());
+  EXPECT_EQ(0, b.DoB());
+  const std::string output2 = GetCapturedStdout();
+  EXPECT_THAT(output2.c_str(),
+              HasSubstr("Actions ran out in EXPECT_CALL(b, DoB())...\n"
+                        "Called 3 times, but only 2 WillOnce()s are specified"
+                        " - returning default value."));
+  EXPECT_THAT(output2.c_str(),
+              HasSubstr("Actions ran out in EXPECT_CALL(b, DoB())...\n"
+                        "Called 4 times, but only 2 WillOnce()s are specified"
+                        " - returning default value."));
+}
+
+TEST(FunctionMockerMessageTest, ReportsExpectCallLocationForExhausedActions) {
+  MockB b;
+  std::string expect_call_location = FormatFileLocation(__FILE__, __LINE__ + 1);
+  EXPECT_CALL(b, DoB()).Times(AnyNumber()).WillOnce(Return(1));
+
+  EXPECT_EQ(1, b.DoB());
+
+  CaptureStdout();
+  EXPECT_EQ(0, b.DoB());
+  const std::string output = GetCapturedStdout();
+  // The warning message should contain the call location.
+  EXPECT_PRED_FORMAT2(IsSubstring, expect_call_location, output);
+}
+
+TEST(FunctionMockerMessageTest,
+     ReportsDefaultActionLocationOfUninterestingCallsForNaggyMock) {
+  std::string on_call_location;
+  CaptureStdout();
+  {
+    NaggyMock<MockB> b;
+    on_call_location = FormatFileLocation(__FILE__, __LINE__ + 1);
+    ON_CALL(b, DoB(_)).WillByDefault(Return(0));
+    b.DoB(0);
+  }
+  EXPECT_PRED_FORMAT2(IsSubstring, on_call_location, GetCapturedStdout());
+}
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+// Tests that an uninteresting call performs the default action.
+TEST(UninterestingCallTest, DoesDefaultAction) {
+  // When there is an ON_CALL() statement, the action specified by it
+  // should be taken.
+  MockA a;
+  ON_CALL(a, Binary(_, _))
+      .WillByDefault(Return(true));
+  EXPECT_TRUE(a.Binary(1, 2));
+
+  // When there is no ON_CALL(), the default value for the return type
+  // should be returned.
+  MockB b;
+  EXPECT_EQ(0, b.DoB());
+}
+
+// Tests that an unexpected call performs the default action.
+TEST(UnexpectedCallTest, DoesDefaultAction) {
+  // When there is an ON_CALL() statement, the action specified by it
+  // should be taken.
+  MockA a;
+  ON_CALL(a, Binary(_, _))
+      .WillByDefault(Return(true));
+  EXPECT_CALL(a, Binary(0, 0));
+  a.Binary(0, 0);
+  bool result = false;
+  EXPECT_NONFATAL_FAILURE(result = a.Binary(1, 2),
+                          "Unexpected mock function call");
+  EXPECT_TRUE(result);
+
+  // When there is no ON_CALL(), the default value for the return type
+  // should be returned.
+  MockB b;
+  EXPECT_CALL(b, DoB(0))
+      .Times(0);
+  int n = -1;
+  EXPECT_NONFATAL_FAILURE(n = b.DoB(1),
+                          "Unexpected mock function call");
+  EXPECT_EQ(0, n);
+}
+
+// Tests that when an unexpected void function generates the right
+// failure message.
+TEST(UnexpectedCallTest, GeneratesFailureForVoidFunction) {
+  // First, tests the message when there is only one EXPECT_CALL().
+  MockA a1;
+  EXPECT_CALL(a1, DoA(1));
+  a1.DoA(1);
+  // Ideally we should match the failure message against a regex, but
+  // EXPECT_NONFATAL_FAILURE doesn't support that, so we test for
+  // multiple sub-strings instead.
+  EXPECT_NONFATAL_FAILURE(
+      a1.DoA(9),
+      "Unexpected mock function call - returning directly.\n"
+      "    Function call: DoA(9)\n"
+      "Google Mock tried the following 1 expectation, but it didn't match:");
+  EXPECT_NONFATAL_FAILURE(
+      a1.DoA(9),
+      "  Expected arg #0: is equal to 1\n"
+      "           Actual: 9\n"
+      "         Expected: to be called once\n"
+      "           Actual: called once - saturated and active");
+
+  // Next, tests the message when there are more than one EXPECT_CALL().
+  MockA a2;
+  EXPECT_CALL(a2, DoA(1));
+  EXPECT_CALL(a2, DoA(3));
+  a2.DoA(1);
+  EXPECT_NONFATAL_FAILURE(
+      a2.DoA(2),
+      "Unexpected mock function call - returning directly.\n"
+      "    Function call: DoA(2)\n"
+      "Google Mock tried the following 2 expectations, but none matched:");
+  EXPECT_NONFATAL_FAILURE(
+      a2.DoA(2),
+      "tried expectation #0: EXPECT_CALL(a2, DoA(1))...\n"
+      "  Expected arg #0: is equal to 1\n"
+      "           Actual: 2\n"
+      "         Expected: to be called once\n"
+      "           Actual: called once - saturated and active");
+  EXPECT_NONFATAL_FAILURE(
+      a2.DoA(2),
+      "tried expectation #1: EXPECT_CALL(a2, DoA(3))...\n"
+      "  Expected arg #0: is equal to 3\n"
+      "           Actual: 2\n"
+      "         Expected: to be called once\n"
+      "           Actual: never called - unsatisfied and active");
+  a2.DoA(3);
+}
+
+// Tests that an unexpected non-void function generates the right
+// failure message.
+TEST(UnexpectedCallTest, GeneartesFailureForNonVoidFunction) {
+  MockB b1;
+  EXPECT_CALL(b1, DoB(1));
+  b1.DoB(1);
+  EXPECT_NONFATAL_FAILURE(
+      b1.DoB(2),
+      "Unexpected mock function call - returning default value.\n"
+      "    Function call: DoB(2)\n"
+      "          Returns: 0\n"
+      "Google Mock tried the following 1 expectation, but it didn't match:");
+  EXPECT_NONFATAL_FAILURE(
+      b1.DoB(2),
+      "  Expected arg #0: is equal to 1\n"
+      "           Actual: 2\n"
+      "         Expected: to be called once\n"
+      "           Actual: called once - saturated and active");
+}
+
+// Tests that Google Mock explains that an retired expectation doesn't
+// match the call.
+TEST(UnexpectedCallTest, RetiredExpectation) {
+  MockB b;
+  EXPECT_CALL(b, DoB(1))
+      .RetiresOnSaturation();
+
+  b.DoB(1);
+  EXPECT_NONFATAL_FAILURE(
+      b.DoB(1),
+      "         Expected: the expectation is active\n"
+      "           Actual: it is retired");
+}
+
+// Tests that Google Mock explains that an expectation that doesn't
+// match the arguments doesn't match the call.
+TEST(UnexpectedCallTest, UnmatchedArguments) {
+  MockB b;
+  EXPECT_CALL(b, DoB(1));
+
+  EXPECT_NONFATAL_FAILURE(
+      b.DoB(2),
+      "  Expected arg #0: is equal to 1\n"
+      "           Actual: 2\n");
+  b.DoB(1);
+}
+
+// Tests that Google Mock explains that an expectation with
+// unsatisfied pre-requisites doesn't match the call.
+TEST(UnexpectedCallTest, UnsatisifiedPrerequisites) {
+  Sequence s1, s2;
+  MockB b;
+  EXPECT_CALL(b, DoB(1))
+      .InSequence(s1);
+  EXPECT_CALL(b, DoB(2))
+      .Times(AnyNumber())
+      .InSequence(s1);
+  EXPECT_CALL(b, DoB(3))
+      .InSequence(s2);
+  EXPECT_CALL(b, DoB(4))
+      .InSequence(s1, s2);
+
+  ::testing::TestPartResultArray failures;
+  {
+    ::testing::ScopedFakeTestPartResultReporter reporter(&failures);
+    b.DoB(4);
+    // Now 'failures' contains the Google Test failures generated by
+    // the above statement.
+  }
+
+  // There should be one non-fatal failure.
+  ASSERT_EQ(1, failures.size());
+  const ::testing::TestPartResult& r = failures.GetTestPartResult(0);
+  EXPECT_EQ(::testing::TestPartResult::kNonFatalFailure, r.type());
+
+  // Verifies that the failure message contains the two unsatisfied
+  // pre-requisites but not the satisfied one.
+#if GTEST_USES_PCRE
+  EXPECT_THAT(r.message(), ContainsRegex(
+      // PCRE has trouble using (.|\n) to match any character, but
+      // supports the (?s) prefix for using . to match any character.
+      "(?s)the following immediate pre-requisites are not satisfied:\n"
+      ".*: pre-requisite #0\n"
+      ".*: pre-requisite #1"));
+#elif GTEST_USES_POSIX_RE
+  EXPECT_THAT(r.message(), ContainsRegex(
+      // POSIX RE doesn't understand the (?s) prefix, but has no trouble
+      // with (.|\n).
+      "the following immediate pre-requisites are not satisfied:\n"
+      "(.|\n)*: pre-requisite #0\n"
+      "(.|\n)*: pre-requisite #1"));
+#else
+  // We can only use Google Test's own simple regex.
+  EXPECT_THAT(r.message(), ContainsRegex(
+      "the following immediate pre-requisites are not satisfied:"));
+  EXPECT_THAT(r.message(), ContainsRegex(": pre-requisite #0"));
+  EXPECT_THAT(r.message(), ContainsRegex(": pre-requisite #1"));
+#endif  // GTEST_USES_PCRE
+
+  b.DoB(1);
+  b.DoB(3);
+  b.DoB(4);
+}
+
+TEST(UndefinedReturnValueTest,
+     ReturnValueIsMandatoryWhenNotDefaultConstructible) {
+  MockA a;
+  // TODO(wan@google.com): We should really verify the output message,
+  // but we cannot yet due to that EXPECT_DEATH only captures stderr
+  // while Google Mock logs to stdout.
+#if GTEST_HAS_EXCEPTIONS
+  EXPECT_ANY_THROW(a.ReturnNonDefaultConstructible());
+#else
+  EXPECT_DEATH_IF_SUPPORTED(a.ReturnNonDefaultConstructible(), "");
+#endif
+}
+
+// Tests that an excessive call (one whose arguments match the
+// matchers but is called too many times) performs the default action.
+TEST(ExcessiveCallTest, DoesDefaultAction) {
+  // When there is an ON_CALL() statement, the action specified by it
+  // should be taken.
+  MockA a;
+  ON_CALL(a, Binary(_, _))
+      .WillByDefault(Return(true));
+  EXPECT_CALL(a, Binary(0, 0));
+  a.Binary(0, 0);
+  bool result = false;
+  EXPECT_NONFATAL_FAILURE(result = a.Binary(0, 0),
+                          "Mock function called more times than expected");
+  EXPECT_TRUE(result);
+
+  // When there is no ON_CALL(), the default value for the return type
+  // should be returned.
+  MockB b;
+  EXPECT_CALL(b, DoB(0))
+      .Times(0);
+  int n = -1;
+  EXPECT_NONFATAL_FAILURE(n = b.DoB(0),
+                          "Mock function called more times than expected");
+  EXPECT_EQ(0, n);
+}
+
+// Tests that when a void function is called too many times,
+// the failure message contains the argument values.
+TEST(ExcessiveCallTest, GeneratesFailureForVoidFunction) {
+  MockA a;
+  EXPECT_CALL(a, DoA(_))
+      .Times(0);
+  EXPECT_NONFATAL_FAILURE(
+      a.DoA(9),
+      "Mock function called more times than expected - returning directly.\n"
+      "    Function call: DoA(9)\n"
+      "         Expected: to be never called\n"
+      "           Actual: called once - over-saturated and active");
+}
+
+// Tests that when a non-void function is called too many times, the
+// failure message contains the argument values and the return value.
+TEST(ExcessiveCallTest, GeneratesFailureForNonVoidFunction) {
+  MockB b;
+  EXPECT_CALL(b, DoB(_));
+  b.DoB(1);
+  EXPECT_NONFATAL_FAILURE(
+      b.DoB(2),
+      "Mock function called more times than expected - "
+      "returning default value.\n"
+      "    Function call: DoB(2)\n"
+      "          Returns: 0\n"
+      "         Expected: to be called once\n"
+      "           Actual: called twice - over-saturated and active");
+}
+
+// Tests using sequences.
+
+TEST(InSequenceTest, AllExpectationInScopeAreInSequence) {
+  MockA a;
+  {
+    InSequence dummy;
+
+    EXPECT_CALL(a, DoA(1));
+    EXPECT_CALL(a, DoA(2));
+  }
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    a.DoA(2);
+  }, "Unexpected mock function call");
+
+  a.DoA(1);
+  a.DoA(2);
+}
+
+TEST(InSequenceTest, NestedInSequence) {
+  MockA a;
+  {
+    InSequence dummy;
+
+    EXPECT_CALL(a, DoA(1));
+    {
+      InSequence dummy2;
+
+      EXPECT_CALL(a, DoA(2));
+      EXPECT_CALL(a, DoA(3));
+    }
+  }
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    a.DoA(1);
+    a.DoA(3);
+  }, "Unexpected mock function call");
+
+  a.DoA(2);
+  a.DoA(3);
+}
+
+TEST(InSequenceTest, ExpectationsOutOfScopeAreNotAffected) {
+  MockA a;
+  {
+    InSequence dummy;
+
+    EXPECT_CALL(a, DoA(1));
+    EXPECT_CALL(a, DoA(2));
+  }
+  EXPECT_CALL(a, DoA(3));
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    a.DoA(2);
+  }, "Unexpected mock function call");
+
+  a.DoA(3);
+  a.DoA(1);
+  a.DoA(2);
+}
+
+// Tests that any order is allowed when no sequence is used.
+TEST(SequenceTest, AnyOrderIsOkByDefault) {
+  {
+    MockA a;
+    MockB b;
+
+    EXPECT_CALL(a, DoA(1));
+    EXPECT_CALL(b, DoB())
+        .Times(AnyNumber());
+
+    a.DoA(1);
+    b.DoB();
+  }
+
+  {  // NOLINT
+    MockA a;
+    MockB b;
+
+    EXPECT_CALL(a, DoA(1));
+    EXPECT_CALL(b, DoB())
+        .Times(AnyNumber());
+
+    b.DoB();
+    a.DoA(1);
+  }
+}
+
+// Tests that the calls must be in strict order when a complete order
+// is specified.
+TEST(SequenceTest, CallsMustBeInStrictOrderWhenSaidSo1) {
+  MockA a;
+  ON_CALL(a, ReturnResult(_))
+      .WillByDefault(Return(Result()));
+
+  Sequence s;
+  EXPECT_CALL(a, ReturnResult(1))
+      .InSequence(s);
+  EXPECT_CALL(a, ReturnResult(2))
+      .InSequence(s);
+  EXPECT_CALL(a, ReturnResult(3))
+      .InSequence(s);
+
+  a.ReturnResult(1);
+
+  // May only be called after a.ReturnResult(2).
+  EXPECT_NONFATAL_FAILURE(a.ReturnResult(3), "Unexpected mock function call");
+
+  a.ReturnResult(2);
+  a.ReturnResult(3);
+}
+
+// Tests that the calls must be in strict order when a complete order
+// is specified.
+TEST(SequenceTest, CallsMustBeInStrictOrderWhenSaidSo2) {
+  MockA a;
+  ON_CALL(a, ReturnResult(_))
+      .WillByDefault(Return(Result()));
+
+  Sequence s;
+  EXPECT_CALL(a, ReturnResult(1))
+      .InSequence(s);
+  EXPECT_CALL(a, ReturnResult(2))
+      .InSequence(s);
+
+  // May only be called after a.ReturnResult(1).
+  EXPECT_NONFATAL_FAILURE(a.ReturnResult(2), "Unexpected mock function call");
+
+  a.ReturnResult(1);
+  a.ReturnResult(2);
+}
+
+// Tests specifying a DAG using multiple sequences.
+class PartialOrderTest : public testing::Test {
+ protected:
+  PartialOrderTest() {
+    ON_CALL(a_, ReturnResult(_))
+        .WillByDefault(Return(Result()));
+
+    // Specifies this partial ordering:
+    //
+    // a.ReturnResult(1) ==>
+    //                       a.ReturnResult(2) * n  ==>  a.ReturnResult(3)
+    // b.DoB() * 2       ==>
+    Sequence x, y;
+    EXPECT_CALL(a_, ReturnResult(1))
+        .InSequence(x);
+    EXPECT_CALL(b_, DoB())
+        .Times(2)
+        .InSequence(y);
+    EXPECT_CALL(a_, ReturnResult(2))
+        .Times(AnyNumber())
+        .InSequence(x, y);
+    EXPECT_CALL(a_, ReturnResult(3))
+        .InSequence(x);
+  }
+
+  MockA a_;
+  MockB b_;
+};
+
+TEST_F(PartialOrderTest, CallsMustConformToSpecifiedDag1) {
+  a_.ReturnResult(1);
+  b_.DoB();
+
+  // May only be called after the second DoB().
+  EXPECT_NONFATAL_FAILURE(a_.ReturnResult(2), "Unexpected mock function call");
+
+  b_.DoB();
+  a_.ReturnResult(3);
+}
+
+TEST_F(PartialOrderTest, CallsMustConformToSpecifiedDag2) {
+  // May only be called after ReturnResult(1).
+  EXPECT_NONFATAL_FAILURE(a_.ReturnResult(2), "Unexpected mock function call");
+
+  a_.ReturnResult(1);
+  b_.DoB();
+  b_.DoB();
+  a_.ReturnResult(3);
+}
+
+TEST_F(PartialOrderTest, CallsMustConformToSpecifiedDag3) {
+  // May only be called last.
+  EXPECT_NONFATAL_FAILURE(a_.ReturnResult(3), "Unexpected mock function call");
+
+  a_.ReturnResult(1);
+  b_.DoB();
+  b_.DoB();
+  a_.ReturnResult(3);
+}
+
+TEST_F(PartialOrderTest, CallsMustConformToSpecifiedDag4) {
+  a_.ReturnResult(1);
+  b_.DoB();
+  b_.DoB();
+  a_.ReturnResult(3);
+
+  // May only be called before ReturnResult(3).
+  EXPECT_NONFATAL_FAILURE(a_.ReturnResult(2), "Unexpected mock function call");
+}
+
+TEST(SequenceTest, Retirement) {
+  MockA a;
+  Sequence s;
+
+  EXPECT_CALL(a, DoA(1))
+      .InSequence(s);
+  EXPECT_CALL(a, DoA(_))
+      .InSequence(s)
+      .RetiresOnSaturation();
+  EXPECT_CALL(a, DoA(1))
+      .InSequence(s);
+
+  a.DoA(1);
+  a.DoA(2);
+  a.DoA(1);
+}
+
+// Tests Expectation.
+
+TEST(ExpectationTest, ConstrutorsWork) {
+  MockA a;
+  Expectation e1;  // Default ctor.
+
+  // Ctor from various forms of EXPECT_CALL.
+  Expectation e2 = EXPECT_CALL(a, DoA(2));
+  Expectation e3 = EXPECT_CALL(a, DoA(3)).With(_);
+  {
+    Sequence s;
+    Expectation e4 = EXPECT_CALL(a, DoA(4)).Times(1);
+    Expectation e5 = EXPECT_CALL(a, DoA(5)).InSequence(s);
+  }
+  Expectation e6 = EXPECT_CALL(a, DoA(6)).After(e2);
+  Expectation e7 = EXPECT_CALL(a, DoA(7)).WillOnce(Return());
+  Expectation e8 = EXPECT_CALL(a, DoA(8)).WillRepeatedly(Return());
+  Expectation e9 = EXPECT_CALL(a, DoA(9)).RetiresOnSaturation();
+
+  Expectation e10 = e2;  // Copy ctor.
+
+  EXPECT_THAT(e1, Ne(e2));
+  EXPECT_THAT(e2, Eq(e10));
+
+  a.DoA(2);
+  a.DoA(3);
+  a.DoA(4);
+  a.DoA(5);
+  a.DoA(6);
+  a.DoA(7);
+  a.DoA(8);
+  a.DoA(9);
+}
+
+TEST(ExpectationTest, AssignmentWorks) {
+  MockA a;
+  Expectation e1;
+  Expectation e2 = EXPECT_CALL(a, DoA(1));
+
+  EXPECT_THAT(e1, Ne(e2));
+
+  e1 = e2;
+  EXPECT_THAT(e1, Eq(e2));
+
+  a.DoA(1);
+}
+
+// Tests ExpectationSet.
+
+TEST(ExpectationSetTest, MemberTypesAreCorrect) {
+  ::testing::StaticAssertTypeEq<Expectation, ExpectationSet::value_type>();
+}
+
+TEST(ExpectationSetTest, ConstructorsWork) {
+  MockA a;
+
+  Expectation e1;
+  const Expectation e2;
+  ExpectationSet es1;  // Default ctor.
+  ExpectationSet es2 = EXPECT_CALL(a, DoA(1));  // Ctor from EXPECT_CALL.
+  ExpectationSet es3 = e1;  // Ctor from Expectation.
+  ExpectationSet es4(e1);   // Ctor from Expectation; alternative syntax.
+  ExpectationSet es5 = e2;  // Ctor from const Expectation.
+  ExpectationSet es6(e2);   // Ctor from const Expectation; alternative syntax.
+  ExpectationSet es7 = es2;  // Copy ctor.
+
+  EXPECT_EQ(0, es1.size());
+  EXPECT_EQ(1, es2.size());
+  EXPECT_EQ(1, es3.size());
+  EXPECT_EQ(1, es4.size());
+  EXPECT_EQ(1, es5.size());
+  EXPECT_EQ(1, es6.size());
+  EXPECT_EQ(1, es7.size());
+
+  EXPECT_THAT(es3, Ne(es2));
+  EXPECT_THAT(es4, Eq(es3));
+  EXPECT_THAT(es5, Eq(es4));
+  EXPECT_THAT(es6, Eq(es5));
+  EXPECT_THAT(es7, Eq(es2));
+  a.DoA(1);
+}
+
+TEST(ExpectationSetTest, AssignmentWorks) {
+  ExpectationSet es1;
+  ExpectationSet es2 = Expectation();
+
+  es1 = es2;
+  EXPECT_EQ(1, es1.size());
+  EXPECT_THAT(*(es1.begin()), Eq(Expectation()));
+  EXPECT_THAT(es1, Eq(es2));
+}
+
+TEST(ExpectationSetTest, InsertionWorks) {
+  ExpectationSet es1;
+  Expectation e1;
+  es1 += e1;
+  EXPECT_EQ(1, es1.size());
+  EXPECT_THAT(*(es1.begin()), Eq(e1));
+
+  MockA a;
+  Expectation e2 = EXPECT_CALL(a, DoA(1));
+  es1 += e2;
+  EXPECT_EQ(2, es1.size());
+
+  ExpectationSet::const_iterator it1 = es1.begin();
+  ExpectationSet::const_iterator it2 = it1;
+  ++it2;
+  EXPECT_TRUE(*it1 == e1 || *it2 == e1);  // e1 must be in the set.
+  EXPECT_TRUE(*it1 == e2 || *it2 == e2);  // e2 must be in the set too.
+  a.DoA(1);
+}
+
+TEST(ExpectationSetTest, SizeWorks) {
+  ExpectationSet es;
+  EXPECT_EQ(0, es.size());
+
+  es += Expectation();
+  EXPECT_EQ(1, es.size());
+
+  MockA a;
+  es += EXPECT_CALL(a, DoA(1));
+  EXPECT_EQ(2, es.size());
+
+  a.DoA(1);
+}
+
+TEST(ExpectationSetTest, IsEnumerable) {
+  ExpectationSet es;
+  EXPECT_TRUE(es.begin() == es.end());
+
+  es += Expectation();
+  ExpectationSet::const_iterator it = es.begin();
+  EXPECT_TRUE(it != es.end());
+  EXPECT_THAT(*it, Eq(Expectation()));
+  ++it;
+  EXPECT_TRUE(it== es.end());
+}
+
+// Tests the .After() clause.
+
+TEST(AfterTest, SucceedsWhenPartialOrderIsSatisfied) {
+  MockA a;
+  ExpectationSet es;
+  es += EXPECT_CALL(a, DoA(1));
+  es += EXPECT_CALL(a, DoA(2));
+  EXPECT_CALL(a, DoA(3))
+      .After(es);
+
+  a.DoA(1);
+  a.DoA(2);
+  a.DoA(3);
+}
+
+TEST(AfterTest, SucceedsWhenTotalOrderIsSatisfied) {
+  MockA a;
+  MockB b;
+  // The following also verifies that const Expectation objects work
+  // too.  Do not remove the const modifiers.
+  const Expectation e1 = EXPECT_CALL(a, DoA(1));
+  const Expectation e2 = EXPECT_CALL(b, DoB())
+      .Times(2)
+      .After(e1);
+  EXPECT_CALL(a, DoA(2)).After(e2);
+
+  a.DoA(1);
+  b.DoB();
+  b.DoB();
+  a.DoA(2);
+}
+
+// Calls must be in strict order when specified so using .After().
+TEST(AfterTest, CallsMustBeInStrictOrderWhenSpecifiedSo1) {
+  MockA a;
+  MockB b;
+
+  // Define ordering:
+  //   a.DoA(1) ==> b.DoB() ==> a.DoA(2)
+  Expectation e1 = EXPECT_CALL(a, DoA(1));
+  Expectation e2 = EXPECT_CALL(b, DoB())
+      .After(e1);
+  EXPECT_CALL(a, DoA(2))
+      .After(e2);
+
+  a.DoA(1);
+
+  // May only be called after DoB().
+  EXPECT_NONFATAL_FAILURE(a.DoA(2), "Unexpected mock function call");
+
+  b.DoB();
+  a.DoA(2);
+}
+
+// Calls must be in strict order when specified so using .After().
+TEST(AfterTest, CallsMustBeInStrictOrderWhenSpecifiedSo2) {
+  MockA a;
+  MockB b;
+
+  // Define ordering:
+  //   a.DoA(1) ==> b.DoB() * 2 ==> a.DoA(2)
+  Expectation e1 = EXPECT_CALL(a, DoA(1));
+  Expectation e2 = EXPECT_CALL(b, DoB())
+      .Times(2)
+      .After(e1);
+  EXPECT_CALL(a, DoA(2))
+      .After(e2);
+
+  a.DoA(1);
+  b.DoB();
+
+  // May only be called after the second DoB().
+  EXPECT_NONFATAL_FAILURE(a.DoA(2), "Unexpected mock function call");
+
+  b.DoB();
+  a.DoA(2);
+}
+
+// Calls must satisfy the partial order when specified so.
+TEST(AfterTest, CallsMustSatisfyPartialOrderWhenSpecifiedSo) {
+  MockA a;
+  ON_CALL(a, ReturnResult(_))
+      .WillByDefault(Return(Result()));
+
+  // Define ordering:
+  //   a.DoA(1) ==>
+  //   a.DoA(2) ==> a.ReturnResult(3)
+  Expectation e = EXPECT_CALL(a, DoA(1));
+  const ExpectationSet es = EXPECT_CALL(a, DoA(2));
+  EXPECT_CALL(a, ReturnResult(3))
+      .After(e, es);
+
+  // May only be called last.
+  EXPECT_NONFATAL_FAILURE(a.ReturnResult(3), "Unexpected mock function call");
+
+  a.DoA(2);
+  a.DoA(1);
+  a.ReturnResult(3);
+}
+
+// Calls must satisfy the partial order when specified so.
+TEST(AfterTest, CallsMustSatisfyPartialOrderWhenSpecifiedSo2) {
+  MockA a;
+
+  // Define ordering:
+  //   a.DoA(1) ==>
+  //   a.DoA(2) ==> a.DoA(3)
+  Expectation e = EXPECT_CALL(a, DoA(1));
+  const ExpectationSet es = EXPECT_CALL(a, DoA(2));
+  EXPECT_CALL(a, DoA(3))
+      .After(e, es);
+
+  a.DoA(2);
+
+  // May only be called last.
+  EXPECT_NONFATAL_FAILURE(a.DoA(3), "Unexpected mock function call");
+
+  a.DoA(1);
+  a.DoA(3);
+}
+
+// .After() can be combined with .InSequence().
+TEST(AfterTest, CanBeUsedWithInSequence) {
+  MockA a;
+  Sequence s;
+  Expectation e = EXPECT_CALL(a, DoA(1));
+  EXPECT_CALL(a, DoA(2)).InSequence(s);
+  EXPECT_CALL(a, DoA(3))
+      .InSequence(s)
+      .After(e);
+
+  a.DoA(1);
+
+  // May only be after DoA(2).
+  EXPECT_NONFATAL_FAILURE(a.DoA(3), "Unexpected mock function call");
+
+  a.DoA(2);
+  a.DoA(3);
+}
+
+// .After() can be called multiple times.
+TEST(AfterTest, CanBeCalledManyTimes) {
+  MockA a;
+  Expectation e1 = EXPECT_CALL(a, DoA(1));
+  Expectation e2 = EXPECT_CALL(a, DoA(2));
+  Expectation e3 = EXPECT_CALL(a, DoA(3));
+  EXPECT_CALL(a, DoA(4))
+      .After(e1)
+      .After(e2)
+      .After(e3);
+
+  a.DoA(3);
+  a.DoA(1);
+  a.DoA(2);
+  a.DoA(4);
+}
+
+// .After() accepts up to 5 arguments.
+TEST(AfterTest, AcceptsUpToFiveArguments) {
+  MockA a;
+  Expectation e1 = EXPECT_CALL(a, DoA(1));
+  Expectation e2 = EXPECT_CALL(a, DoA(2));
+  Expectation e3 = EXPECT_CALL(a, DoA(3));
+  ExpectationSet es1 = EXPECT_CALL(a, DoA(4));
+  ExpectationSet es2 = EXPECT_CALL(a, DoA(5));
+  EXPECT_CALL(a, DoA(6))
+      .After(e1, e2, e3, es1, es2);
+
+  a.DoA(5);
+  a.DoA(2);
+  a.DoA(4);
+  a.DoA(1);
+  a.DoA(3);
+  a.DoA(6);
+}
+
+// .After() allows input to contain duplicated Expectations.
+TEST(AfterTest, AcceptsDuplicatedInput) {
+  MockA a;
+  ON_CALL(a, ReturnResult(_))
+      .WillByDefault(Return(Result()));
+
+  // Define ordering:
+  //   DoA(1) ==>
+  //   DoA(2) ==> ReturnResult(3)
+  Expectation e1 = EXPECT_CALL(a, DoA(1));
+  Expectation e2 = EXPECT_CALL(a, DoA(2));
+  ExpectationSet es;
+  es += e1;
+  es += e2;
+  EXPECT_CALL(a, ReturnResult(3))
+      .After(e1, e2, es, e1);
+
+  a.DoA(1);
+
+  // May only be after DoA(2).
+  EXPECT_NONFATAL_FAILURE(a.ReturnResult(3), "Unexpected mock function call");
+
+  a.DoA(2);
+  a.ReturnResult(3);
+}
+
+// An Expectation added to an ExpectationSet after it has been used in
+// an .After() has no effect.
+TEST(AfterTest, ChangesToExpectationSetHaveNoEffectAfterwards) {
+  MockA a;
+  ExpectationSet es1 = EXPECT_CALL(a, DoA(1));
+  Expectation e2 = EXPECT_CALL(a, DoA(2));
+  EXPECT_CALL(a, DoA(3))
+      .After(es1);
+  es1 += e2;
+
+  a.DoA(1);
+  a.DoA(3);
+  a.DoA(2);
+}
+
+// Tests that Google Mock correctly handles calls to mock functions
+// after a mock object owning one of their pre-requisites has died.
+
+// Tests that calls that satisfy the original spec are successful.
+TEST(DeletingMockEarlyTest, Success1) {
+  MockB* const b1 = new MockB;
+  MockA* const a = new MockA;
+  MockB* const b2 = new MockB;
+
+  {
+    InSequence dummy;
+    EXPECT_CALL(*b1, DoB(_))
+        .WillOnce(Return(1));
+    EXPECT_CALL(*a, Binary(_, _))
+        .Times(AnyNumber())
+        .WillRepeatedly(Return(true));
+    EXPECT_CALL(*b2, DoB(_))
+        .Times(AnyNumber())
+        .WillRepeatedly(Return(2));
+  }
+
+  EXPECT_EQ(1, b1->DoB(1));
+  delete b1;
+  // a's pre-requisite has died.
+  EXPECT_TRUE(a->Binary(0, 1));
+  delete b2;
+  // a's successor has died.
+  EXPECT_TRUE(a->Binary(1, 2));
+  delete a;
+}
+
+// Tests that calls that satisfy the original spec are successful.
+TEST(DeletingMockEarlyTest, Success2) {
+  MockB* const b1 = new MockB;
+  MockA* const a = new MockA;
+  MockB* const b2 = new MockB;
+
+  {
+    InSequence dummy;
+    EXPECT_CALL(*b1, DoB(_))
+        .WillOnce(Return(1));
+    EXPECT_CALL(*a, Binary(_, _))
+        .Times(AnyNumber());
+    EXPECT_CALL(*b2, DoB(_))
+        .Times(AnyNumber())
+        .WillRepeatedly(Return(2));
+  }
+
+  delete a;  // a is trivially satisfied.
+  EXPECT_EQ(1, b1->DoB(1));
+  EXPECT_EQ(2, b2->DoB(2));
+  delete b1;
+  delete b2;
+}
+
+// Tests that it's OK to delete a mock object itself in its action.
+
+// Suppresses warning on unreferenced formal parameter in MSVC with
+// -W4.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#endif
+
+ACTION_P(Delete, ptr) { delete ptr; }
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+TEST(DeletingMockEarlyTest, CanDeleteSelfInActionReturningVoid) {
+  MockA* const a = new MockA;
+  EXPECT_CALL(*a, DoA(_)).WillOnce(Delete(a));
+  a->DoA(42);  // This will cause a to be deleted.
+}
+
+TEST(DeletingMockEarlyTest, CanDeleteSelfInActionReturningValue) {
+  MockA* const a = new MockA;
+  EXPECT_CALL(*a, ReturnResult(_))
+      .WillOnce(DoAll(Delete(a), Return(Result())));
+  a->ReturnResult(42);  // This will cause a to be deleted.
+}
+
+// Tests that calls that violate the original spec yield failures.
+TEST(DeletingMockEarlyTest, Failure1) {
+  MockB* const b1 = new MockB;
+  MockA* const a = new MockA;
+  MockB* const b2 = new MockB;
+
+  {
+    InSequence dummy;
+    EXPECT_CALL(*b1, DoB(_))
+        .WillOnce(Return(1));
+    EXPECT_CALL(*a, Binary(_, _))
+        .Times(AnyNumber());
+    EXPECT_CALL(*b2, DoB(_))
+        .Times(AnyNumber())
+        .WillRepeatedly(Return(2));
+  }
+
+  delete a;  // a is trivially satisfied.
+  EXPECT_NONFATAL_FAILURE({
+    b2->DoB(2);
+  }, "Unexpected mock function call");
+  EXPECT_EQ(1, b1->DoB(1));
+  delete b1;
+  delete b2;
+}
+
+// Tests that calls that violate the original spec yield failures.
+TEST(DeletingMockEarlyTest, Failure2) {
+  MockB* const b1 = new MockB;
+  MockA* const a = new MockA;
+  MockB* const b2 = new MockB;
+
+  {
+    InSequence dummy;
+    EXPECT_CALL(*b1, DoB(_));
+    EXPECT_CALL(*a, Binary(_, _))
+        .Times(AnyNumber());
+    EXPECT_CALL(*b2, DoB(_))
+        .Times(AnyNumber());
+  }
+
+  EXPECT_NONFATAL_FAILURE(delete b1,
+                          "Actual: never called");
+  EXPECT_NONFATAL_FAILURE(a->Binary(0, 1),
+                          "Unexpected mock function call");
+  EXPECT_NONFATAL_FAILURE(b2->DoB(1),
+                          "Unexpected mock function call");
+  delete a;
+  delete b2;
+}
+
+class EvenNumberCardinality : public CardinalityInterface {
+ public:
+  // Returns true iff call_count calls will satisfy this cardinality.
+  virtual bool IsSatisfiedByCallCount(int call_count) const {
+    return call_count % 2 == 0;
+  }
+
+  // Returns true iff call_count calls will saturate this cardinality.
+  virtual bool IsSaturatedByCallCount(int /* call_count */) const {
+    return false;
+  }
+
+  // Describes self to an ostream.
+  virtual void DescribeTo(::std::ostream* os) const {
+    *os << "called even number of times";
+  }
+};
+
+Cardinality EvenNumber() {
+  return Cardinality(new EvenNumberCardinality);
+}
+
+TEST(ExpectationBaseTest,
+     AllPrerequisitesAreSatisfiedWorksForNonMonotonicCardinality) {
+  MockA* a = new MockA;
+  Sequence s;
+
+  EXPECT_CALL(*a, DoA(1))
+      .Times(EvenNumber())
+      .InSequence(s);
+  EXPECT_CALL(*a, DoA(2))
+      .Times(AnyNumber())
+      .InSequence(s);
+  EXPECT_CALL(*a, DoA(3))
+      .Times(AnyNumber());
+
+  a->DoA(3);
+  a->DoA(1);
+  EXPECT_NONFATAL_FAILURE(a->DoA(2), "Unexpected mock function call");
+  EXPECT_NONFATAL_FAILURE(delete a, "to be called even number of times");
+}
+
+// The following tests verify the message generated when a mock
+// function is called.
+
+struct Printable {
+};
+
+inline void operator<<(::std::ostream& os, const Printable&) {
+  os << "Printable";
+}
+
+struct Unprintable {
+  Unprintable() : value(0) {}
+  int value;
+};
+
+class MockC {
+ public:
+  MockC() {}
+
+  MOCK_METHOD6(VoidMethod, void(bool cond, int n, string s, void* p,
+                                const Printable& x, Unprintable y));
+  MOCK_METHOD0(NonVoidMethod, int());  // NOLINT
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockC);
+};
+
+class VerboseFlagPreservingFixture : public testing::Test {
+ protected:
+  VerboseFlagPreservingFixture()
+      : saved_verbose_flag_(GMOCK_FLAG(verbose)) {}
+
+  ~VerboseFlagPreservingFixture() { GMOCK_FLAG(verbose) = saved_verbose_flag_; }
+
+ private:
+  const string saved_verbose_flag_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(VerboseFlagPreservingFixture);
+};
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Tests that an uninteresting mock function call on a naggy mock
+// generates a warning without the stack trace when
+// --gmock_verbose=warning is specified.
+TEST(FunctionCallMessageTest,
+     UninterestingCallOnNaggyMockGeneratesNoStackTraceWhenVerboseWarning) {
+  GMOCK_FLAG(verbose) = kWarningVerbosity;
+  NaggyMock<MockC> c;
+  CaptureStdout();
+  c.VoidMethod(false, 5, "Hi", NULL, Printable(), Unprintable());
+  const std::string output = GetCapturedStdout();
+  EXPECT_PRED_FORMAT2(IsSubstring, "GMOCK WARNING", output);
+  EXPECT_PRED_FORMAT2(IsNotSubstring, "Stack trace:", output);
+}
+
+// Tests that an uninteresting mock function call on a naggy mock
+// generates a warning containing the stack trace when
+// --gmock_verbose=info is specified.
+TEST(FunctionCallMessageTest,
+     UninterestingCallOnNaggyMockGeneratesFyiWithStackTraceWhenVerboseInfo) {
+  GMOCK_FLAG(verbose) = kInfoVerbosity;
+  NaggyMock<MockC> c;
+  CaptureStdout();
+  c.VoidMethod(false, 5, "Hi", NULL, Printable(), Unprintable());
+  const std::string output = GetCapturedStdout();
+  EXPECT_PRED_FORMAT2(IsSubstring, "GMOCK WARNING", output);
+  EXPECT_PRED_FORMAT2(IsSubstring, "Stack trace:", output);
+
+# ifndef NDEBUG
+
+  // We check the stack trace content in dbg-mode only, as opt-mode
+  // may inline the call we are interested in seeing.
+
+  // Verifies that a void mock function's name appears in the stack
+  // trace.
+  EXPECT_PRED_FORMAT2(IsSubstring, "VoidMethod(", output);
+
+  // Verifies that a non-void mock function's name appears in the
+  // stack trace.
+  CaptureStdout();
+  c.NonVoidMethod();
+  const std::string output2 = GetCapturedStdout();
+  EXPECT_PRED_FORMAT2(IsSubstring, "NonVoidMethod(", output2);
+
+# endif  // NDEBUG
+}
+
+// Tests that an uninteresting mock function call on a naggy mock
+// causes the function arguments and return value to be printed.
+TEST(FunctionCallMessageTest,
+     UninterestingCallOnNaggyMockPrintsArgumentsAndReturnValue) {
+  // A non-void mock function.
+  NaggyMock<MockB> b;
+  CaptureStdout();
+  b.DoB();
+  const std::string output1 = GetCapturedStdout();
+  EXPECT_PRED_FORMAT2(
+      IsSubstring,
+      "Uninteresting mock function call - returning default value.\n"
+      "    Function call: DoB()\n"
+      "          Returns: 0\n", output1.c_str());
+  // Makes sure the return value is printed.
+
+  // A void mock function.
+  NaggyMock<MockC> c;
+  CaptureStdout();
+  c.VoidMethod(false, 5, "Hi", NULL, Printable(), Unprintable());
+  const std::string output2 = GetCapturedStdout();
+  EXPECT_THAT(output2.c_str(),
+              ContainsRegex(
+                  "Uninteresting mock function call - returning directly\\.\n"
+                  "    Function call: VoidMethod"
+                  "\\(false, 5, \"Hi\", NULL, @.+ "
+                  "Printable, 4-byte object <00-00 00-00>\\)"));
+  // A void function has no return value to print.
+}
+
+// Tests how the --gmock_verbose flag affects Google Mock's output.
+
+class GMockVerboseFlagTest : public VerboseFlagPreservingFixture {
+ public:
+  // Verifies that the given Google Mock output is correct.  (When
+  // should_print is true, the output should match the given regex and
+  // contain the given function name in the stack trace.  When it's
+  // false, the output should be empty.)
+  void VerifyOutput(const std::string& output, bool should_print,
+                    const string& expected_substring,
+                    const string& function_name) {
+    if (should_print) {
+      EXPECT_THAT(output.c_str(), HasSubstr(expected_substring));
+# ifndef NDEBUG
+      // We check the stack trace content in dbg-mode only, as opt-mode
+      // may inline the call we are interested in seeing.
+      EXPECT_THAT(output.c_str(), HasSubstr(function_name));
+# else
+      // Suppresses 'unused function parameter' warnings.
+      static_cast<void>(function_name);
+# endif  // NDEBUG
+    } else {
+      EXPECT_STREQ("", output.c_str());
+    }
+  }
+
+  // Tests how the flag affects expected calls.
+  void TestExpectedCall(bool should_print) {
+    MockA a;
+    EXPECT_CALL(a, DoA(5));
+    EXPECT_CALL(a, Binary(_, 1))
+        .WillOnce(Return(true));
+
+    // A void-returning function.
+    CaptureStdout();
+    a.DoA(5);
+    VerifyOutput(
+        GetCapturedStdout(),
+        should_print,
+        "Mock function call matches EXPECT_CALL(a, DoA(5))...\n"
+        "    Function call: DoA(5)\n"
+        "Stack trace:\n",
+        "DoA");
+
+    // A non-void-returning function.
+    CaptureStdout();
+    a.Binary(2, 1);
+    VerifyOutput(
+        GetCapturedStdout(),
+        should_print,
+        "Mock function call matches EXPECT_CALL(a, Binary(_, 1))...\n"
+        "    Function call: Binary(2, 1)\n"
+        "          Returns: true\n"
+        "Stack trace:\n",
+        "Binary");
+  }
+
+  // Tests how the flag affects uninteresting calls on a naggy mock.
+  void TestUninterestingCallOnNaggyMock(bool should_print) {
+    NaggyMock<MockA> a;
+    const string note =
+        "NOTE: You can safely ignore the above warning unless this "
+        "call should not happen.  Do not suppress it by blindly adding "
+        "an EXPECT_CALL() if you don't mean to enforce the call.  "
+        "See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#"
+        "knowing-when-to-expect for details.";
+
+    // A void-returning function.
+    CaptureStdout();
+    a.DoA(5);
+    VerifyOutput(
+        GetCapturedStdout(),
+        should_print,
+        "\nGMOCK WARNING:\n"
+        "Uninteresting mock function call - returning directly.\n"
+        "    Function call: DoA(5)\n" +
+        note,
+        "DoA");
+
+    // A non-void-returning function.
+    CaptureStdout();
+    a.Binary(2, 1);
+    VerifyOutput(
+        GetCapturedStdout(),
+        should_print,
+        "\nGMOCK WARNING:\n"
+        "Uninteresting mock function call - returning default value.\n"
+        "    Function call: Binary(2, 1)\n"
+        "          Returns: false\n" +
+        note,
+        "Binary");
+  }
+};
+
+// Tests that --gmock_verbose=info causes both expected and
+// uninteresting calls to be reported.
+TEST_F(GMockVerboseFlagTest, Info) {
+  GMOCK_FLAG(verbose) = kInfoVerbosity;
+  TestExpectedCall(true);
+  TestUninterestingCallOnNaggyMock(true);
+}
+
+// Tests that --gmock_verbose=warning causes uninteresting calls to be
+// reported.
+TEST_F(GMockVerboseFlagTest, Warning) {
+  GMOCK_FLAG(verbose) = kWarningVerbosity;
+  TestExpectedCall(false);
+  TestUninterestingCallOnNaggyMock(true);
+}
+
+// Tests that --gmock_verbose=warning causes neither expected nor
+// uninteresting calls to be reported.
+TEST_F(GMockVerboseFlagTest, Error) {
+  GMOCK_FLAG(verbose) = kErrorVerbosity;
+  TestExpectedCall(false);
+  TestUninterestingCallOnNaggyMock(false);
+}
+
+// Tests that --gmock_verbose=SOME_INVALID_VALUE has the same effect
+// as --gmock_verbose=warning.
+TEST_F(GMockVerboseFlagTest, InvalidFlagIsTreatedAsWarning) {
+  GMOCK_FLAG(verbose) = "invalid";  // Treated as "warning".
+  TestExpectedCall(false);
+  TestUninterestingCallOnNaggyMock(true);
+}
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+// A helper class that generates a failure when printed.  We use it to
+// ensure that Google Mock doesn't print a value (even to an internal
+// buffer) when it is not supposed to do so.
+class PrintMeNot {};
+
+void PrintTo(PrintMeNot /* dummy */, ::std::ostream* /* os */) {
+  ADD_FAILURE() << "Google Mock is printing a value that shouldn't be "
+                << "printed even to an internal buffer.";
+}
+
+class LogTestHelper {
+ public:
+  LogTestHelper() {}
+
+  MOCK_METHOD1(Foo, PrintMeNot(PrintMeNot));
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(LogTestHelper);
+};
+
+class GMockLogTest : public VerboseFlagPreservingFixture {
+ protected:
+  LogTestHelper helper_;
+};
+
+TEST_F(GMockLogTest, DoesNotPrintGoodCallInternallyIfVerbosityIsWarning) {
+  GMOCK_FLAG(verbose) = kWarningVerbosity;
+  EXPECT_CALL(helper_, Foo(_))
+      .WillOnce(Return(PrintMeNot()));
+  helper_.Foo(PrintMeNot());  // This is an expected call.
+}
+
+TEST_F(GMockLogTest, DoesNotPrintGoodCallInternallyIfVerbosityIsError) {
+  GMOCK_FLAG(verbose) = kErrorVerbosity;
+  EXPECT_CALL(helper_, Foo(_))
+      .WillOnce(Return(PrintMeNot()));
+  helper_.Foo(PrintMeNot());  // This is an expected call.
+}
+
+TEST_F(GMockLogTest, DoesNotPrintWarningInternallyIfVerbosityIsError) {
+  GMOCK_FLAG(verbose) = kErrorVerbosity;
+  ON_CALL(helper_, Foo(_))
+      .WillByDefault(Return(PrintMeNot()));
+  helper_.Foo(PrintMeNot());  // This should generate a warning.
+}
+
+// Tests Mock::AllowLeak().
+
+TEST(AllowLeakTest, AllowsLeakingUnusedMockObject) {
+  MockA* a = new MockA;
+  Mock::AllowLeak(a);
+}
+
+TEST(AllowLeakTest, CanBeCalledBeforeOnCall) {
+  MockA* a = new MockA;
+  Mock::AllowLeak(a);
+  ON_CALL(*a, DoA(_)).WillByDefault(Return());
+  a->DoA(0);
+}
+
+TEST(AllowLeakTest, CanBeCalledAfterOnCall) {
+  MockA* a = new MockA;
+  ON_CALL(*a, DoA(_)).WillByDefault(Return());
+  Mock::AllowLeak(a);
+}
+
+TEST(AllowLeakTest, CanBeCalledBeforeExpectCall) {
+  MockA* a = new MockA;
+  Mock::AllowLeak(a);
+  EXPECT_CALL(*a, DoA(_));
+  a->DoA(0);
+}
+
+TEST(AllowLeakTest, CanBeCalledAfterExpectCall) {
+  MockA* a = new MockA;
+  EXPECT_CALL(*a, DoA(_)).Times(AnyNumber());
+  Mock::AllowLeak(a);
+}
+
+TEST(AllowLeakTest, WorksWhenBothOnCallAndExpectCallArePresent) {
+  MockA* a = new MockA;
+  ON_CALL(*a, DoA(_)).WillByDefault(Return());
+  EXPECT_CALL(*a, DoA(_)).Times(AnyNumber());
+  Mock::AllowLeak(a);
+}
+
+// Tests that we can verify and clear a mock object's expectations
+// when none of its methods has expectations.
+TEST(VerifyAndClearExpectationsTest, NoMethodHasExpectations) {
+  MockB b;
+  ASSERT_TRUE(Mock::VerifyAndClearExpectations(&b));
+
+  // There should be no expectations on the methods now, so we can
+  // freely call them.
+  EXPECT_EQ(0, b.DoB());
+  EXPECT_EQ(0, b.DoB(1));
+}
+
+// Tests that we can verify and clear a mock object's expectations
+// when some, but not all, of its methods have expectations *and* the
+// verification succeeds.
+TEST(VerifyAndClearExpectationsTest, SomeMethodsHaveExpectationsAndSucceed) {
+  MockB b;
+  EXPECT_CALL(b, DoB())
+      .WillOnce(Return(1));
+  b.DoB();
+  ASSERT_TRUE(Mock::VerifyAndClearExpectations(&b));
+
+  // There should be no expectations on the methods now, so we can
+  // freely call them.
+  EXPECT_EQ(0, b.DoB());
+  EXPECT_EQ(0, b.DoB(1));
+}
+
+// Tests that we can verify and clear a mock object's expectations
+// when some, but not all, of its methods have expectations *and* the
+// verification fails.
+TEST(VerifyAndClearExpectationsTest, SomeMethodsHaveExpectationsAndFail) {
+  MockB b;
+  EXPECT_CALL(b, DoB())
+      .WillOnce(Return(1));
+  bool result = true;
+  EXPECT_NONFATAL_FAILURE(result = Mock::VerifyAndClearExpectations(&b),
+                          "Actual: never called");
+  ASSERT_FALSE(result);
+
+  // There should be no expectations on the methods now, so we can
+  // freely call them.
+  EXPECT_EQ(0, b.DoB());
+  EXPECT_EQ(0, b.DoB(1));
+}
+
+// Tests that we can verify and clear a mock object's expectations
+// when all of its methods have expectations.
+TEST(VerifyAndClearExpectationsTest, AllMethodsHaveExpectations) {
+  MockB b;
+  EXPECT_CALL(b, DoB())
+      .WillOnce(Return(1));
+  EXPECT_CALL(b, DoB(_))
+      .WillOnce(Return(2));
+  b.DoB();
+  b.DoB(1);
+  ASSERT_TRUE(Mock::VerifyAndClearExpectations(&b));
+
+  // There should be no expectations on the methods now, so we can
+  // freely call them.
+  EXPECT_EQ(0, b.DoB());
+  EXPECT_EQ(0, b.DoB(1));
+}
+
+// Tests that we can verify and clear a mock object's expectations
+// when a method has more than one expectation.
+TEST(VerifyAndClearExpectationsTest, AMethodHasManyExpectations) {
+  MockB b;
+  EXPECT_CALL(b, DoB(0))
+      .WillOnce(Return(1));
+  EXPECT_CALL(b, DoB(_))
+      .WillOnce(Return(2));
+  b.DoB(1);
+  bool result = true;
+  EXPECT_NONFATAL_FAILURE(result = Mock::VerifyAndClearExpectations(&b),
+                          "Actual: never called");
+  ASSERT_FALSE(result);
+
+  // There should be no expectations on the methods now, so we can
+  // freely call them.
+  EXPECT_EQ(0, b.DoB());
+  EXPECT_EQ(0, b.DoB(1));
+}
+
+// Tests that we can call VerifyAndClearExpectations() on the same
+// mock object multiple times.
+TEST(VerifyAndClearExpectationsTest, CanCallManyTimes) {
+  MockB b;
+  EXPECT_CALL(b, DoB());
+  b.DoB();
+  Mock::VerifyAndClearExpectations(&b);
+
+  EXPECT_CALL(b, DoB(_))
+      .WillOnce(Return(1));
+  b.DoB(1);
+  Mock::VerifyAndClearExpectations(&b);
+  Mock::VerifyAndClearExpectations(&b);
+
+  // There should be no expectations on the methods now, so we can
+  // freely call them.
+  EXPECT_EQ(0, b.DoB());
+  EXPECT_EQ(0, b.DoB(1));
+}
+
+// Tests that we can clear a mock object's default actions when none
+// of its methods has default actions.
+TEST(VerifyAndClearTest, NoMethodHasDefaultActions) {
+  MockB b;
+  // If this crashes or generates a failure, the test will catch it.
+  Mock::VerifyAndClear(&b);
+  EXPECT_EQ(0, b.DoB());
+}
+
+// Tests that we can clear a mock object's default actions when some,
+// but not all of its methods have default actions.
+TEST(VerifyAndClearTest, SomeMethodsHaveDefaultActions) {
+  MockB b;
+  ON_CALL(b, DoB())
+      .WillByDefault(Return(1));
+
+  Mock::VerifyAndClear(&b);
+
+  // Verifies that the default action of int DoB() was removed.
+  EXPECT_EQ(0, b.DoB());
+}
+
+// Tests that we can clear a mock object's default actions when all of
+// its methods have default actions.
+TEST(VerifyAndClearTest, AllMethodsHaveDefaultActions) {
+  MockB b;
+  ON_CALL(b, DoB())
+      .WillByDefault(Return(1));
+  ON_CALL(b, DoB(_))
+      .WillByDefault(Return(2));
+
+  Mock::VerifyAndClear(&b);
+
+  // Verifies that the default action of int DoB() was removed.
+  EXPECT_EQ(0, b.DoB());
+
+  // Verifies that the default action of int DoB(int) was removed.
+  EXPECT_EQ(0, b.DoB(0));
+}
+
+// Tests that we can clear a mock object's default actions when a
+// method has more than one ON_CALL() set on it.
+TEST(VerifyAndClearTest, AMethodHasManyDefaultActions) {
+  MockB b;
+  ON_CALL(b, DoB(0))
+      .WillByDefault(Return(1));
+  ON_CALL(b, DoB(_))
+      .WillByDefault(Return(2));
+
+  Mock::VerifyAndClear(&b);
+
+  // Verifies that the default actions (there are two) of int DoB(int)
+  // were removed.
+  EXPECT_EQ(0, b.DoB(0));
+  EXPECT_EQ(0, b.DoB(1));
+}
+
+// Tests that we can call VerifyAndClear() on a mock object multiple
+// times.
+TEST(VerifyAndClearTest, CanCallManyTimes) {
+  MockB b;
+  ON_CALL(b, DoB())
+      .WillByDefault(Return(1));
+  Mock::VerifyAndClear(&b);
+  Mock::VerifyAndClear(&b);
+
+  ON_CALL(b, DoB(_))
+      .WillByDefault(Return(1));
+  Mock::VerifyAndClear(&b);
+
+  EXPECT_EQ(0, b.DoB());
+  EXPECT_EQ(0, b.DoB(1));
+}
+
+// Tests that VerifyAndClear() works when the verification succeeds.
+TEST(VerifyAndClearTest, Success) {
+  MockB b;
+  ON_CALL(b, DoB())
+      .WillByDefault(Return(1));
+  EXPECT_CALL(b, DoB(1))
+      .WillOnce(Return(2));
+
+  b.DoB();
+  b.DoB(1);
+  ASSERT_TRUE(Mock::VerifyAndClear(&b));
+
+  // There should be no expectations on the methods now, so we can
+  // freely call them.
+  EXPECT_EQ(0, b.DoB());
+  EXPECT_EQ(0, b.DoB(1));
+}
+
+// Tests that VerifyAndClear() works when the verification fails.
+TEST(VerifyAndClearTest, Failure) {
+  MockB b;
+  ON_CALL(b, DoB(_))
+      .WillByDefault(Return(1));
+  EXPECT_CALL(b, DoB())
+      .WillOnce(Return(2));
+
+  b.DoB(1);
+  bool result = true;
+  EXPECT_NONFATAL_FAILURE(result = Mock::VerifyAndClear(&b),
+                          "Actual: never called");
+  ASSERT_FALSE(result);
+
+  // There should be no expectations on the methods now, so we can
+  // freely call them.
+  EXPECT_EQ(0, b.DoB());
+  EXPECT_EQ(0, b.DoB(1));
+}
+
+// Tests that VerifyAndClear() works when the default actions and
+// expectations are set on a const mock object.
+TEST(VerifyAndClearTest, Const) {
+  MockB b;
+  ON_CALL(Const(b), DoB())
+      .WillByDefault(Return(1));
+
+  EXPECT_CALL(Const(b), DoB())
+      .WillOnce(DoDefault())
+      .WillOnce(Return(2));
+
+  b.DoB();
+  b.DoB();
+  ASSERT_TRUE(Mock::VerifyAndClear(&b));
+
+  // There should be no expectations on the methods now, so we can
+  // freely call them.
+  EXPECT_EQ(0, b.DoB());
+  EXPECT_EQ(0, b.DoB(1));
+}
+
+// Tests that we can set default actions and expectations on a mock
+// object after VerifyAndClear() has been called on it.
+TEST(VerifyAndClearTest, CanSetDefaultActionsAndExpectationsAfterwards) {
+  MockB b;
+  ON_CALL(b, DoB())
+      .WillByDefault(Return(1));
+  EXPECT_CALL(b, DoB(_))
+      .WillOnce(Return(2));
+  b.DoB(1);
+
+  Mock::VerifyAndClear(&b);
+
+  EXPECT_CALL(b, DoB())
+      .WillOnce(Return(3));
+  ON_CALL(b, DoB(_))
+      .WillByDefault(Return(4));
+
+  EXPECT_EQ(3, b.DoB());
+  EXPECT_EQ(4, b.DoB(1));
+}
+
+// Tests that calling VerifyAndClear() on one mock object does not
+// affect other mock objects (either of the same type or not).
+TEST(VerifyAndClearTest, DoesNotAffectOtherMockObjects) {
+  MockA a;
+  MockB b1;
+  MockB b2;
+
+  ON_CALL(a, Binary(_, _))
+      .WillByDefault(Return(true));
+  EXPECT_CALL(a, Binary(_, _))
+      .WillOnce(DoDefault())
+      .WillOnce(Return(false));
+
+  ON_CALL(b1, DoB())
+      .WillByDefault(Return(1));
+  EXPECT_CALL(b1, DoB(_))
+      .WillOnce(Return(2));
+
+  ON_CALL(b2, DoB())
+      .WillByDefault(Return(3));
+  EXPECT_CALL(b2, DoB(_));
+
+  b2.DoB(0);
+  Mock::VerifyAndClear(&b2);
+
+  // Verifies that the default actions and expectations of a and b1
+  // are still in effect.
+  EXPECT_TRUE(a.Binary(0, 0));
+  EXPECT_FALSE(a.Binary(0, 0));
+
+  EXPECT_EQ(1, b1.DoB());
+  EXPECT_EQ(2, b1.DoB(0));
+}
+
+TEST(VerifyAndClearTest,
+     DestroyingChainedMocksDoesNotDeadlockThroughExpectations) {
+  linked_ptr<MockA> a(new MockA);
+  ReferenceHoldingMock test_mock;
+
+  // EXPECT_CALL stores a reference to a inside test_mock.
+  EXPECT_CALL(test_mock, AcceptReference(_))
+      .WillRepeatedly(SetArgPointee<0>(a));
+
+  // Throw away the reference to the mock that we have in a. After this, the
+  // only reference to it is stored by test_mock.
+  a.reset();
+
+  // When test_mock goes out of scope, it destroys the last remaining reference
+  // to the mock object originally pointed to by a. This will cause the MockA
+  // destructor to be called from inside the ReferenceHoldingMock destructor.
+  // The state of all mocks is protected by a single global lock, but there
+  // should be no deadlock.
+}
+
+TEST(VerifyAndClearTest,
+     DestroyingChainedMocksDoesNotDeadlockThroughDefaultAction) {
+  linked_ptr<MockA> a(new MockA);
+  ReferenceHoldingMock test_mock;
+
+  // ON_CALL stores a reference to a inside test_mock.
+  ON_CALL(test_mock, AcceptReference(_))
+      .WillByDefault(SetArgPointee<0>(a));
+
+  // Throw away the reference to the mock that we have in a. After this, the
+  // only reference to it is stored by test_mock.
+  a.reset();
+
+  // When test_mock goes out of scope, it destroys the last remaining reference
+  // to the mock object originally pointed to by a. This will cause the MockA
+  // destructor to be called from inside the ReferenceHoldingMock destructor.
+  // The state of all mocks is protected by a single global lock, but there
+  // should be no deadlock.
+}
+
+// Tests that a mock function's action can call a mock function
+// (either the same function or a different one) either as an explicit
+// action or as a default action without causing a dead lock.  It
+// verifies that the action is not performed inside the critical
+// section.
+TEST(SynchronizationTest, CanCallMockMethodInAction) {
+  MockA a;
+  MockC c;
+  ON_CALL(a, DoA(_))
+      .WillByDefault(IgnoreResult(InvokeWithoutArgs(&c,
+                                                    &MockC::NonVoidMethod)));
+  EXPECT_CALL(a, DoA(1));
+  EXPECT_CALL(a, DoA(1))
+      .WillOnce(Invoke(&a, &MockA::DoA))
+      .RetiresOnSaturation();
+  EXPECT_CALL(c, NonVoidMethod());
+
+  a.DoA(1);
+  // This will match the second EXPECT_CALL() and trigger another a.DoA(1),
+  // which will in turn match the first EXPECT_CALL() and trigger a call to
+  // c.NonVoidMethod() that was specified by the ON_CALL() since the first
+  // EXPECT_CALL() did not specify an action.
+}
+
+}  // namespace
+
+// Allows the user to define his own main and then invoke gmock_main
+// from it. This might be necessary on some platforms which require
+// specific setup and teardown.
+#if GMOCK_RENAME_MAIN
+int gmock_main(int argc, char **argv) {
+#else
+int main(int argc, char **argv) {
+#endif  // GMOCK_RENAME_MAIN
+  testing::InitGoogleMock(&argc, argv);
+
+  // Ensures that the tests pass no matter what value of
+  // --gmock_catch_leaked_mocks and --gmock_verbose the user specifies.
+  testing::GMOCK_FLAG(catch_leaked_mocks) = true;
+  testing::GMOCK_FLAG(verbose) = testing::internal::kWarningVerbosity;
+
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_all_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_all_test.cc
new file mode 100644
index 0000000000..56d6c49ccc
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_all_test.cc
@@ -0,0 +1,51 @@
+// Copyright 2009, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Tests for Google C++ Mocking Framework (Google Mock)
+//
+// Some users use a build system that Google Mock doesn't support directly,
+// yet they still want to build and run Google Mock's own tests.  This file
+// includes most such tests, making it easier for these users to maintain
+// their build scripts (they just need to build this file, even though the
+// below list of actual *_test.cc files might change).
+#include "test/gmock-actions_test.cc"
+#include "test/gmock-cardinalities_test.cc"
+#include "test/gmock-generated-actions_test.cc"
+#include "test/gmock-generated-function-mockers_test.cc"
+#include "test/gmock-generated-internal-utils_test.cc"
+#include "test/gmock-generated-matchers_test.cc"
+#include "test/gmock-internal-utils_test.cc"
+#include "test/gmock-matchers_test.cc"
+#include "test/gmock-more-actions_test.cc"
+#include "test/gmock-nice-strict_test.cc"
+#include "test/gmock-port_test.cc"
+#include "test/gmock-spec-builders_test.cc"
+#include "test/gmock_test.cc"
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_ex_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_ex_test.cc
new file mode 100644
index 0000000000..3afed86ab9
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_ex_test.cc
@@ -0,0 +1,81 @@
+// Copyright 2013, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Tests Google Mock's functionality that depends on exceptions.
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+namespace {
+
+using testing::HasSubstr;
+using testing::internal::GoogleTestFailureException;
+
+// A type that cannot be default constructed.
+class NonDefaultConstructible {
+ public:
+  explicit NonDefaultConstructible(int /* dummy */) {}
+};
+
+class MockFoo {
+ public:
+  // A mock method that returns a user-defined type.  Google Mock
+  // doesn't know what the default value for this type is.
+  MOCK_METHOD0(GetNonDefaultConstructible, NonDefaultConstructible());
+};
+
+#if GTEST_HAS_EXCEPTIONS
+
+TEST(DefaultValueTest, ThrowsRuntimeErrorWhenNoDefaultValue) {
+  MockFoo mock;
+  try {
+    // No expectation is set on this method, so Google Mock must
+    // return the default value.  However, since Google Mock knows
+    // nothing about the return type, it doesn't know what to return,
+    // and has to throw (when exceptions are enabled) or abort
+    // (otherwise).
+    mock.GetNonDefaultConstructible();
+    FAIL() << "GetNonDefaultConstructible()'s return type has no default "
+           << "value, so Google Mock should have thrown.";
+  } catch (const GoogleTestFailureException& /* unused */) {
+    FAIL() << "Google Test does not try to catch an exception of type "
+           << "GoogleTestFailureException, which is used for reporting "
+           << "a failure to other testing frameworks.  Google Mock should "
+           << "not throw a GoogleTestFailureException as it will kill the "
+           << "entire test program instead of just the current TEST.";
+  } catch (const std::exception& ex) {
+    EXPECT_THAT(ex.what(), HasSubstr("has no default value"));
+  }
+}
+
+#endif
+
+}  // unnamed namespace
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_leak_test.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_leak_test.py
new file mode 100755
index 0000000000..997680ce1a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_leak_test.py
@@ -0,0 +1,108 @@
+#!/usr/bin/env python
+#
+# Copyright 2009, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Tests that leaked mock objects can be caught be Google Mock."""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+
+import gmock_test_utils
+
+
+PROGRAM_PATH = gmock_test_utils.GetTestExecutablePath('gmock_leak_test_')
+TEST_WITH_EXPECT_CALL = [PROGRAM_PATH, '--gtest_filter=*ExpectCall*']
+TEST_WITH_ON_CALL = [PROGRAM_PATH, '--gtest_filter=*OnCall*']
+TEST_MULTIPLE_LEAKS = [PROGRAM_PATH, '--gtest_filter=*MultipleLeaked*']
+
+environ = gmock_test_utils.environ
+SetEnvVar = gmock_test_utils.SetEnvVar
+
+# Tests in this file run a Google-Test-based test program and expect it
+# to terminate prematurely.  Therefore they are incompatible with
+# the premature-exit-file protocol by design.  Unset the
+# premature-exit filepath to prevent Google Test from creating
+# the file.
+SetEnvVar(gmock_test_utils.PREMATURE_EXIT_FILE_ENV_VAR, None)
+
+
+class GMockLeakTest(gmock_test_utils.TestCase):
+
+  def testCatchesLeakedMockByDefault(self):
+    self.assertNotEqual(
+        0,
+        gmock_test_utils.Subprocess(TEST_WITH_EXPECT_CALL,
+                                    env=environ).exit_code)
+    self.assertNotEqual(
+        0,
+        gmock_test_utils.Subprocess(TEST_WITH_ON_CALL,
+                                    env=environ).exit_code)
+
+  def testDoesNotCatchLeakedMockWhenDisabled(self):
+    self.assertEquals(
+        0,
+        gmock_test_utils.Subprocess(TEST_WITH_EXPECT_CALL +
+                                    ['--gmock_catch_leaked_mocks=0'],
+                                    env=environ).exit_code)
+    self.assertEquals(
+        0,
+        gmock_test_utils.Subprocess(TEST_WITH_ON_CALL +
+                                    ['--gmock_catch_leaked_mocks=0'],
+                                    env=environ).exit_code)
+
+  def testCatchesLeakedMockWhenEnabled(self):
+    self.assertNotEqual(
+        0,
+        gmock_test_utils.Subprocess(TEST_WITH_EXPECT_CALL +
+                                    ['--gmock_catch_leaked_mocks'],
+                                    env=environ).exit_code)
+    self.assertNotEqual(
+        0,
+        gmock_test_utils.Subprocess(TEST_WITH_ON_CALL +
+                                    ['--gmock_catch_leaked_mocks'],
+                                    env=environ).exit_code)
+
+  def testCatchesLeakedMockWhenEnabledWithExplictFlagValue(self):
+    self.assertNotEqual(
+        0,
+        gmock_test_utils.Subprocess(TEST_WITH_EXPECT_CALL +
+                                    ['--gmock_catch_leaked_mocks=1'],
+                                    env=environ).exit_code)
+
+  def testCatchesMultipleLeakedMocks(self):
+    self.assertNotEqual(
+        0,
+        gmock_test_utils.Subprocess(TEST_MULTIPLE_LEAKS +
+                                    ['--gmock_catch_leaked_mocks'],
+                                    env=environ).exit_code)
+
+
+if __name__ == '__main__':
+  gmock_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_leak_test_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_leak_test_.cc
new file mode 100644
index 0000000000..1d27d22f62
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_leak_test_.cc
@@ -0,0 +1,100 @@
+// Copyright 2009, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This program is for verifying that a leaked mock object can be
+// caught by Google Mock's leak detector.
+
+#include "gmock/gmock.h"
+
+namespace {
+
+using ::testing::Return;
+
+class FooInterface {
+ public:
+  virtual ~FooInterface() {}
+  virtual void DoThis() = 0;
+};
+
+class MockFoo : public FooInterface {
+ public:
+  MockFoo() {}
+
+  MOCK_METHOD0(DoThis, void());
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
+};
+
+TEST(LeakTest, LeakedMockWithExpectCallCausesFailureWhenLeakCheckingIsEnabled) {
+  MockFoo* foo = new MockFoo;
+
+  EXPECT_CALL(*foo, DoThis());
+  foo->DoThis();
+
+  // In order to test the leak detector, we deliberately leak foo.
+
+  // Makes sure Google Mock's leak detector can change the exit code
+  // to 1 even when the code is already exiting with 0.
+  exit(0);
+}
+
+TEST(LeakTest, LeakedMockWithOnCallCausesFailureWhenLeakCheckingIsEnabled) {
+  MockFoo* foo = new MockFoo;
+
+  ON_CALL(*foo, DoThis()).WillByDefault(Return());
+
+  // In order to test the leak detector, we deliberately leak foo.
+
+  // Makes sure Google Mock's leak detector can change the exit code
+  // to 1 even when the code is already exiting with 0.
+  exit(0);
+}
+
+TEST(LeakTest, CatchesMultipleLeakedMockObjects) {
+  MockFoo* foo1 = new MockFoo;
+  MockFoo* foo2 = new MockFoo;
+
+  ON_CALL(*foo1, DoThis()).WillByDefault(Return());
+  EXPECT_CALL(*foo2, DoThis());
+  foo2->DoThis();
+
+  // In order to test the leak detector, we deliberately leak foo1 and
+  // foo2.
+
+  // Makes sure Google Mock's leak detector can change the exit code
+  // to 1 even when the code is already exiting with 0.
+  exit(0);
+}
+
+}  // namespace
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_link2_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_link2_test.cc
new file mode 100644
index 0000000000..4c310c3d83
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_link2_test.cc
@@ -0,0 +1,40 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan), vladl@google.com (Vlad Losev)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file is for verifying that various Google Mock constructs do not
+// produce linker errors when instantiated in different translation units.
+// Please see gmock_link_test.h for details.
+
+#define LinkTest LinkTest2
+
+#include  "test/gmock_link_test.h"
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_link_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_link_test.cc
new file mode 100644
index 0000000000..61e97d10ca
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_link_test.cc
@@ -0,0 +1,40 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan), vladl@google.com (Vlad Losev)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file is for verifying that various Google Mock constructs do not
+// produce linker errors when instantiated in different translation units.
+// Please see gmock_link_test.h for details.
+
+#define LinkTest LinkTest1
+
+#include  "test/gmock_link_test.h"
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_link_test.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_link_test.h
new file mode 100644
index 0000000000..1f55f5bd7f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_link_test.h
@@ -0,0 +1,669 @@
+// Copyright 2009, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests that:
+// a. A header file defining a mock class can be included in multiple
+//    translation units without causing a link error.
+// b. Actions and matchers can be instantiated with identical template
+//    arguments in different translation units without causing link
+//    errors.
+//    The following constructs are currently tested:
+//    Actions:
+//      Return()
+//      Return(value)
+//      ReturnNull
+//      ReturnRef
+//      Assign
+//      SetArgPointee
+//      SetArrayArgument
+//      SetErrnoAndReturn
+//      Invoke(function)
+//      Invoke(object, method)
+//      InvokeWithoutArgs(function)
+//      InvokeWithoutArgs(object, method)
+//      InvokeArgument
+//      WithArg
+//      WithArgs
+//      WithoutArgs
+//      DoAll
+//      DoDefault
+//      IgnoreResult
+//      Throw
+//      ACTION()-generated
+//      ACTION_P()-generated
+//      ACTION_P2()-generated
+//    Matchers:
+//      _
+//      A
+//      An
+//      Eq
+//      Gt, Lt, Ge, Le, Ne
+//      NotNull
+//      Ref
+//      TypedEq
+//      DoubleEq
+//      FloatEq
+//      NanSensitiveDoubleEq
+//      NanSensitiveFloatEq
+//      ContainsRegex
+//      MatchesRegex
+//      EndsWith
+//      HasSubstr
+//      StartsWith
+//      StrCaseEq
+//      StrCaseNe
+//      StrEq
+//      StrNe
+//      ElementsAre
+//      ElementsAreArray
+//      ContainerEq
+//      Field
+//      Property
+//      ResultOf(function)
+//      Pointee
+//      Truly(predicate)
+//      AllOf
+//      AnyOf
+//      Not
+//      MatcherCast<T>
+//
+//  Please note: this test does not verify the functioning of these
+//  constructs, only that the programs using them will link successfully.
+//
+// Implementation note:
+// This test requires identical definitions of Interface and Mock to be
+// included in different translation units.  We achieve this by writing
+// them in this header and #including it in gmock_link_test.cc and
+// gmock_link2_test.cc.  Because the symbols generated by the compiler for
+// those constructs must be identical in both translation units,
+// definitions of Interface and Mock tests MUST be kept in the SAME
+// NON-ANONYMOUS namespace in this file.  The test fixture class LinkTest
+// is defined as LinkTest1 in gmock_link_test.cc and as LinkTest2 in
+// gmock_link2_test.cc to avoid producing linker errors.
+
+#ifndef GMOCK_TEST_GMOCK_LINK_TEST_H_
+#define GMOCK_TEST_GMOCK_LINK_TEST_H_
+
+#include "gmock/gmock.h"
+
+#if !GTEST_OS_WINDOWS_MOBILE
+# include <errno.h>
+#endif
+
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+#include <iostream>
+#include <vector>
+
+using testing::_;
+using testing::A;
+using testing::AllOf;
+using testing::AnyOf;
+using testing::Assign;
+using testing::ContainerEq;
+using testing::DoAll;
+using testing::DoDefault;
+using testing::DoubleEq;
+using testing::ElementsAre;
+using testing::ElementsAreArray;
+using testing::EndsWith;
+using testing::Eq;
+using testing::Field;
+using testing::FloatEq;
+using testing::Ge;
+using testing::Gt;
+using testing::HasSubstr;
+using testing::IgnoreResult;
+using testing::Invoke;
+using testing::InvokeArgument;
+using testing::InvokeWithoutArgs;
+using testing::IsNull;
+using testing::Le;
+using testing::Lt;
+using testing::Matcher;
+using testing::MatcherCast;
+using testing::NanSensitiveDoubleEq;
+using testing::NanSensitiveFloatEq;
+using testing::Ne;
+using testing::Not;
+using testing::NotNull;
+using testing::Pointee;
+using testing::Property;
+using testing::Ref;
+using testing::ResultOf;
+using testing::Return;
+using testing::ReturnNull;
+using testing::ReturnRef;
+using testing::SetArgPointee;
+using testing::SetArrayArgument;
+using testing::StartsWith;
+using testing::StrCaseEq;
+using testing::StrCaseNe;
+using testing::StrEq;
+using testing::StrNe;
+using testing::Truly;
+using testing::TypedEq;
+using testing::WithArg;
+using testing::WithArgs;
+using testing::WithoutArgs;
+
+#if !GTEST_OS_WINDOWS_MOBILE
+using testing::SetErrnoAndReturn;
+#endif
+
+#if GTEST_HAS_EXCEPTIONS
+using testing::Throw;
+#endif
+
+using testing::ContainsRegex;
+using testing::MatchesRegex;
+
+class Interface {
+ public:
+  virtual ~Interface() {}
+  virtual void VoidFromString(char* str) = 0;
+  virtual char* StringFromString(char* str) = 0;
+  virtual int IntFromString(char* str) = 0;
+  virtual int& IntRefFromString(char* str) = 0;
+  virtual void VoidFromFunc(void(*func)(char* str)) = 0;
+  virtual void VoidFromIntRef(int& n) = 0;  // NOLINT
+  virtual void VoidFromFloat(float n) = 0;
+  virtual void VoidFromDouble(double n) = 0;
+  virtual void VoidFromVector(const std::vector<int>& v) = 0;
+};
+
+class Mock: public Interface {
+ public:
+  Mock() {}
+
+  MOCK_METHOD1(VoidFromString, void(char* str));
+  MOCK_METHOD1(StringFromString, char*(char* str));
+  MOCK_METHOD1(IntFromString, int(char* str));
+  MOCK_METHOD1(IntRefFromString, int&(char* str));
+  MOCK_METHOD1(VoidFromFunc, void(void(*func)(char* str)));
+  MOCK_METHOD1(VoidFromIntRef, void(int& n));  // NOLINT
+  MOCK_METHOD1(VoidFromFloat, void(float n));
+  MOCK_METHOD1(VoidFromDouble, void(double n));
+  MOCK_METHOD1(VoidFromVector, void(const std::vector<int>& v));
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mock);
+};
+
+class InvokeHelper {
+ public:
+  static void StaticVoidFromVoid() {}
+  void VoidFromVoid() {}
+  static void StaticVoidFromString(char* /* str */) {}
+  void VoidFromString(char* /* str */) {}
+  static int StaticIntFromString(char* /* str */) { return 1; }
+  static bool StaticBoolFromString(const char* /* str */) { return true; }
+};
+
+class FieldHelper {
+ public:
+  explicit FieldHelper(int a_field) : field_(a_field) {}
+  int field() const { return field_; }
+  int field_;  // NOLINT -- need external access to field_ to test
+               //           the Field matcher.
+};
+
+// Tests the linkage of the ReturnVoid action.
+TEST(LinkTest, TestReturnVoid) {
+  Mock mock;
+
+  EXPECT_CALL(mock, VoidFromString(_)).WillOnce(Return());
+  mock.VoidFromString(NULL);
+}
+
+// Tests the linkage of the Return action.
+TEST(LinkTest, TestReturn) {
+  Mock mock;
+  char ch = 'x';
+
+  EXPECT_CALL(mock, StringFromString(_)).WillOnce(Return(&ch));
+  mock.StringFromString(NULL);
+}
+
+// Tests the linkage of the ReturnNull action.
+TEST(LinkTest, TestReturnNull) {
+  Mock mock;
+
+  EXPECT_CALL(mock, VoidFromString(_)).WillOnce(Return());
+  mock.VoidFromString(NULL);
+}
+
+// Tests the linkage of the ReturnRef action.
+TEST(LinkTest, TestReturnRef) {
+  Mock mock;
+  int n = 42;
+
+  EXPECT_CALL(mock, IntRefFromString(_)).WillOnce(ReturnRef(n));
+  mock.IntRefFromString(NULL);
+}
+
+// Tests the linkage of the Assign action.
+TEST(LinkTest, TestAssign) {
+  Mock mock;
+  char ch = 'x';
+
+  EXPECT_CALL(mock, VoidFromString(_)).WillOnce(Assign(&ch, 'y'));
+  mock.VoidFromString(NULL);
+}
+
+// Tests the linkage of the SetArgPointee action.
+TEST(LinkTest, TestSetArgPointee) {
+  Mock mock;
+  char ch = 'x';
+
+  EXPECT_CALL(mock, VoidFromString(_)).WillOnce(SetArgPointee<0>('y'));
+  mock.VoidFromString(&ch);
+}
+
+// Tests the linkage of the SetArrayArgument action.
+TEST(LinkTest, TestSetArrayArgument) {
+  Mock mock;
+  char ch = 'x';
+  char ch2 = 'y';
+
+  EXPECT_CALL(mock, VoidFromString(_)).WillOnce(SetArrayArgument<0>(&ch2,
+                                                                    &ch2 + 1));
+  mock.VoidFromString(&ch);
+}
+
+#if !GTEST_OS_WINDOWS_MOBILE
+
+// Tests the linkage of the SetErrnoAndReturn action.
+TEST(LinkTest, TestSetErrnoAndReturn) {
+  Mock mock;
+
+  int saved_errno = errno;
+  EXPECT_CALL(mock, IntFromString(_)).WillOnce(SetErrnoAndReturn(1, -1));
+  mock.IntFromString(NULL);
+  errno = saved_errno;
+}
+
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
+// Tests the linkage of the Invoke(function) and Invoke(object, method) actions.
+TEST(LinkTest, TestInvoke) {
+  Mock mock;
+  InvokeHelper test_invoke_helper;
+
+  EXPECT_CALL(mock, VoidFromString(_))
+      .WillOnce(Invoke(&InvokeHelper::StaticVoidFromString))
+      .WillOnce(Invoke(&test_invoke_helper, &InvokeHelper::VoidFromString));
+  mock.VoidFromString(NULL);
+  mock.VoidFromString(NULL);
+}
+
+// Tests the linkage of the InvokeWithoutArgs action.
+TEST(LinkTest, TestInvokeWithoutArgs) {
+  Mock mock;
+  InvokeHelper test_invoke_helper;
+
+  EXPECT_CALL(mock, VoidFromString(_))
+      .WillOnce(InvokeWithoutArgs(&InvokeHelper::StaticVoidFromVoid))
+      .WillOnce(InvokeWithoutArgs(&test_invoke_helper,
+                                  &InvokeHelper::VoidFromVoid));
+  mock.VoidFromString(NULL);
+  mock.VoidFromString(NULL);
+}
+
+// Tests the linkage of the InvokeArgument action.
+TEST(LinkTest, TestInvokeArgument) {
+  Mock mock;
+  char ch = 'x';
+
+  EXPECT_CALL(mock, VoidFromFunc(_)).WillOnce(InvokeArgument<0>(&ch));
+  mock.VoidFromFunc(InvokeHelper::StaticVoidFromString);
+}
+
+// Tests the linkage of the WithArg action.
+TEST(LinkTest, TestWithArg) {
+  Mock mock;
+
+  EXPECT_CALL(mock, VoidFromString(_))
+      .WillOnce(WithArg<0>(Invoke(&InvokeHelper::StaticVoidFromString)));
+  mock.VoidFromString(NULL);
+}
+
+// Tests the linkage of the WithArgs action.
+TEST(LinkTest, TestWithArgs) {
+  Mock mock;
+
+  EXPECT_CALL(mock, VoidFromString(_))
+      .WillOnce(WithArgs<0>(Invoke(&InvokeHelper::StaticVoidFromString)));
+  mock.VoidFromString(NULL);
+}
+
+// Tests the linkage of the WithoutArgs action.
+TEST(LinkTest, TestWithoutArgs) {
+  Mock mock;
+
+  EXPECT_CALL(mock, VoidFromString(_)).WillOnce(WithoutArgs(Return()));
+  mock.VoidFromString(NULL);
+}
+
+// Tests the linkage of the DoAll action.
+TEST(LinkTest, TestDoAll) {
+  Mock mock;
+  char ch = 'x';
+
+  EXPECT_CALL(mock, VoidFromString(_))
+      .WillOnce(DoAll(SetArgPointee<0>('y'), Return()));
+  mock.VoidFromString(&ch);
+}
+
+// Tests the linkage of the DoDefault action.
+TEST(LinkTest, TestDoDefault) {
+  Mock mock;
+  char ch = 'x';
+
+  ON_CALL(mock, VoidFromString(_)).WillByDefault(Return());
+  EXPECT_CALL(mock, VoidFromString(_)).WillOnce(DoDefault());
+  mock.VoidFromString(&ch);
+}
+
+// Tests the linkage of the IgnoreResult action.
+TEST(LinkTest, TestIgnoreResult) {
+  Mock mock;
+
+  EXPECT_CALL(mock, VoidFromString(_)).WillOnce(IgnoreResult(Return(42)));
+  mock.VoidFromString(NULL);
+}
+
+#if GTEST_HAS_EXCEPTIONS
+// Tests the linkage of the Throw action.
+TEST(LinkTest, TestThrow) {
+  Mock mock;
+
+  EXPECT_CALL(mock, VoidFromString(_)).WillOnce(Throw(42));
+  EXPECT_THROW(mock.VoidFromString(NULL), int);
+}
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// The ACTION*() macros trigger warning C4100 (unreferenced formal
+// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
+// the macro definition, as the warnings are generated when the macro
+// is expanded and macro expansion cannot contain #pragma.  Therefore
+// we suppress them here.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#endif
+
+// Tests the linkage of actions created using ACTION macro.
+namespace {
+ACTION(Return1) { return 1; }
+}
+
+TEST(LinkTest, TestActionMacro) {
+  Mock mock;
+
+  EXPECT_CALL(mock, IntFromString(_)).WillOnce(Return1());
+  mock.IntFromString(NULL);
+}
+
+// Tests the linkage of actions created using ACTION_P macro.
+namespace {
+ACTION_P(ReturnArgument, ret_value) { return ret_value; }
+}
+
+TEST(LinkTest, TestActionPMacro) {
+  Mock mock;
+
+  EXPECT_CALL(mock, IntFromString(_)).WillOnce(ReturnArgument(42));
+  mock.IntFromString(NULL);
+}
+
+// Tests the linkage of actions created using ACTION_P2 macro.
+namespace {
+ACTION_P2(ReturnEqualsEitherOf, first, second) {
+  return arg0 == first || arg0 == second;
+}
+}
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+TEST(LinkTest, TestActionP2Macro) {
+  Mock mock;
+  char ch = 'x';
+
+  EXPECT_CALL(mock, IntFromString(_))
+      .WillOnce(ReturnEqualsEitherOf("one", "two"));
+  mock.IntFromString(&ch);
+}
+
+// Tests the linkage of the "_" matcher.
+TEST(LinkTest, TestMatcherAnything) {
+  Mock mock;
+
+  ON_CALL(mock, VoidFromString(_)).WillByDefault(Return());
+}
+
+// Tests the linkage of the A matcher.
+TEST(LinkTest, TestMatcherA) {
+  Mock mock;
+
+  ON_CALL(mock, VoidFromString(A<char*>())).WillByDefault(Return());
+}
+
+// Tests the linkage of the Eq and the "bare value" matcher.
+TEST(LinkTest, TestMatchersEq) {
+  Mock mock;
+  const char* p = "x";
+
+  ON_CALL(mock, VoidFromString(Eq(p))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromString(const_cast<char*>("y")))
+      .WillByDefault(Return());
+}
+
+// Tests the linkage of the Lt, Gt, Le, Ge, and Ne matchers.
+TEST(LinkTest, TestMatchersRelations) {
+  Mock mock;
+
+  ON_CALL(mock, VoidFromFloat(Lt(1.0f))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromFloat(Gt(1.0f))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromFloat(Le(1.0f))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromFloat(Ge(1.0f))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromFloat(Ne(1.0f))).WillByDefault(Return());
+}
+
+// Tests the linkage of the NotNull matcher.
+TEST(LinkTest, TestMatcherNotNull) {
+  Mock mock;
+
+  ON_CALL(mock, VoidFromString(NotNull())).WillByDefault(Return());
+}
+
+// Tests the linkage of the IsNull matcher.
+TEST(LinkTest, TestMatcherIsNull) {
+  Mock mock;
+
+  ON_CALL(mock, VoidFromString(IsNull())).WillByDefault(Return());
+}
+
+// Tests the linkage of the Ref matcher.
+TEST(LinkTest, TestMatcherRef) {
+  Mock mock;
+  int a = 0;
+
+  ON_CALL(mock, VoidFromIntRef(Ref(a))).WillByDefault(Return());
+}
+
+// Tests the linkage of the TypedEq matcher.
+TEST(LinkTest, TestMatcherTypedEq) {
+  Mock mock;
+  long a = 0;
+
+  ON_CALL(mock, VoidFromIntRef(TypedEq<int&>(a))).WillByDefault(Return());
+}
+
+// Tests the linkage of the FloatEq, DoubleEq, NanSensitiveFloatEq and
+// NanSensitiveDoubleEq matchers.
+TEST(LinkTest, TestMatchersFloatingPoint) {
+  Mock mock;
+  float a = 0;
+
+  ON_CALL(mock, VoidFromFloat(FloatEq(a))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromDouble(DoubleEq(a))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromFloat(NanSensitiveFloatEq(a))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromDouble(NanSensitiveDoubleEq(a)))
+      .WillByDefault(Return());
+}
+
+// Tests the linkage of the ContainsRegex matcher.
+TEST(LinkTest, TestMatcherContainsRegex) {
+  Mock mock;
+
+  ON_CALL(mock, VoidFromString(ContainsRegex(".*"))).WillByDefault(Return());
+}
+
+// Tests the linkage of the MatchesRegex matcher.
+TEST(LinkTest, TestMatcherMatchesRegex) {
+  Mock mock;
+
+  ON_CALL(mock, VoidFromString(MatchesRegex(".*"))).WillByDefault(Return());
+}
+
+// Tests the linkage of the StartsWith, EndsWith, and HasSubstr matchers.
+TEST(LinkTest, TestMatchersSubstrings) {
+  Mock mock;
+
+  ON_CALL(mock, VoidFromString(StartsWith("a"))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromString(EndsWith("c"))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromString(HasSubstr("b"))).WillByDefault(Return());
+}
+
+// Tests the linkage of the StrEq, StrNe, StrCaseEq, and StrCaseNe matchers.
+TEST(LinkTest, TestMatchersStringEquality) {
+  Mock mock;
+  ON_CALL(mock, VoidFromString(StrEq("a"))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromString(StrNe("a"))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromString(StrCaseEq("a"))).WillByDefault(Return());
+  ON_CALL(mock, VoidFromString(StrCaseNe("a"))).WillByDefault(Return());
+}
+
+// Tests the linkage of the ElementsAre matcher.
+TEST(LinkTest, TestMatcherElementsAre) {
+  Mock mock;
+
+  ON_CALL(mock, VoidFromVector(ElementsAre('a', _))).WillByDefault(Return());
+}
+
+// Tests the linkage of the ElementsAreArray matcher.
+TEST(LinkTest, TestMatcherElementsAreArray) {
+  Mock mock;
+  char arr[] = { 'a', 'b' };
+
+  ON_CALL(mock, VoidFromVector(ElementsAreArray(arr))).WillByDefault(Return());
+}
+
+// Tests the linkage of the ContainerEq matcher.
+TEST(LinkTest, TestMatcherContainerEq) {
+  Mock mock;
+  std::vector<int> v;
+
+  ON_CALL(mock, VoidFromVector(ContainerEq(v))).WillByDefault(Return());
+}
+
+// Tests the linkage of the Field matcher.
+TEST(LinkTest, TestMatcherField) {
+  FieldHelper helper(0);
+
+  Matcher<const FieldHelper&> m = Field(&FieldHelper::field_, Eq(0));
+  EXPECT_TRUE(m.Matches(helper));
+
+  Matcher<const FieldHelper*> m2 = Field(&FieldHelper::field_, Eq(0));
+  EXPECT_TRUE(m2.Matches(&helper));
+}
+
+// Tests the linkage of the Property matcher.
+TEST(LinkTest, TestMatcherProperty) {
+  FieldHelper helper(0);
+
+  Matcher<const FieldHelper&> m = Property(&FieldHelper::field, Eq(0));
+  EXPECT_TRUE(m.Matches(helper));
+
+  Matcher<const FieldHelper*> m2 = Property(&FieldHelper::field, Eq(0));
+  EXPECT_TRUE(m2.Matches(&helper));
+}
+
+// Tests the linkage of the ResultOf matcher.
+TEST(LinkTest, TestMatcherResultOf) {
+  Matcher<char*> m = ResultOf(&InvokeHelper::StaticIntFromString, Eq(1));
+  EXPECT_TRUE(m.Matches(NULL));
+}
+
+// Tests the linkage of the ResultOf matcher.
+TEST(LinkTest, TestMatcherPointee) {
+  int n = 1;
+
+  Matcher<int*> m = Pointee(Eq(1));
+  EXPECT_TRUE(m.Matches(&n));
+}
+
+// Tests the linkage of the Truly matcher.
+TEST(LinkTest, TestMatcherTruly) {
+  Matcher<const char*> m = Truly(&InvokeHelper::StaticBoolFromString);
+  EXPECT_TRUE(m.Matches(NULL));
+}
+
+// Tests the linkage of the AllOf matcher.
+TEST(LinkTest, TestMatcherAllOf) {
+  Matcher<int> m = AllOf(_, Eq(1));
+  EXPECT_TRUE(m.Matches(1));
+}
+
+// Tests the linkage of the AnyOf matcher.
+TEST(LinkTest, TestMatcherAnyOf) {
+  Matcher<int> m = AnyOf(_, Eq(1));
+  EXPECT_TRUE(m.Matches(1));
+}
+
+// Tests the linkage of the Not matcher.
+TEST(LinkTest, TestMatcherNot) {
+  Matcher<int> m = Not(_);
+  EXPECT_FALSE(m.Matches(1));
+}
+
+// Tests the linkage of the MatcherCast<T>() function.
+TEST(LinkTest, TestMatcherCast) {
+  Matcher<const char*> m = MatcherCast<const char*>(_);
+  EXPECT_TRUE(m.Matches(NULL));
+}
+
+#endif  // GMOCK_TEST_GMOCK_LINK_TEST_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_output_test.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_output_test.py
new file mode 100755
index 0000000000..eced8a81f2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_output_test.py
@@ -0,0 +1,180 @@
+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Tests the text output of Google C++ Mocking Framework.
+
+SYNOPSIS
+       gmock_output_test.py --build_dir=BUILD/DIR --gengolden
+         # where BUILD/DIR contains the built gmock_output_test_ file.
+       gmock_output_test.py --gengolden
+       gmock_output_test.py
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import re
+import sys
+
+import gmock_test_utils
+
+
+# The flag for generating the golden file
+GENGOLDEN_FLAG = '--gengolden'
+
+PROGRAM_PATH = gmock_test_utils.GetTestExecutablePath('gmock_output_test_')
+COMMAND = [PROGRAM_PATH, '--gtest_stack_trace_depth=0', '--gtest_print_time=0']
+GOLDEN_NAME = 'gmock_output_test_golden.txt'
+GOLDEN_PATH = os.path.join(gmock_test_utils.GetSourceDir(), GOLDEN_NAME)
+
+
+def ToUnixLineEnding(s):
+  """Changes all Windows/Mac line endings in s to UNIX line endings."""
+
+  return s.replace('\r\n', '\n').replace('\r', '\n')
+
+
+def RemoveReportHeaderAndFooter(output):
+  """Removes Google Test result report's header and footer from the output."""
+
+  output = re.sub(r'.*gtest_main.*\n', '', output)
+  output = re.sub(r'\[.*\d+ tests.*\n', '', output)
+  output = re.sub(r'\[.* test environment .*\n', '', output)
+  output = re.sub(r'\[=+\] \d+ tests .* ran.*', '', output)
+  output = re.sub(r'.* FAILED TESTS\n', '', output)
+  return output
+
+
+def RemoveLocations(output):
+  """Removes all file location info from a Google Test program's output.
+
+  Args:
+       output:  the output of a Google Test program.
+
+  Returns:
+       output with all file location info (in the form of
+       'DIRECTORY/FILE_NAME:LINE_NUMBER: 'or
+       'DIRECTORY\\FILE_NAME(LINE_NUMBER): ') replaced by
+       'FILE:#: '.
+  """
+
+  return re.sub(r'.*[/\\](.+)(\:\d+|\(\d+\))\:', 'FILE:#:', output)
+
+
+def NormalizeErrorMarker(output):
+  """Normalizes the error marker, which is different on Windows vs on Linux."""
+
+  return re.sub(r' error: ', ' Failure\n', output)
+
+
+def RemoveMemoryAddresses(output):
+  """Removes memory addresses from the test output."""
+
+  return re.sub(r'@\w+', '@0x#', output)
+
+
+def RemoveTestNamesOfLeakedMocks(output):
+  """Removes the test names of leaked mock objects from the test output."""
+
+  return re.sub(r'\(used in test .+\) ', '', output)
+
+
+def GetLeakyTests(output):
+  """Returns a list of test names that leak mock objects."""
+
+  # findall() returns a list of all matches of the regex in output.
+  # For example, if '(used in test FooTest.Bar)' is in output, the
+  # list will contain 'FooTest.Bar'.
+  return re.findall(r'\(used in test (.+)\)', output)
+
+
+def GetNormalizedOutputAndLeakyTests(output):
+  """Normalizes the output of gmock_output_test_.
+
+  Args:
+    output: The test output.
+
+  Returns:
+    A tuple (the normalized test output, the list of test names that have
+    leaked mocks).
+  """
+
+  output = ToUnixLineEnding(output)
+  output = RemoveReportHeaderAndFooter(output)
+  output = NormalizeErrorMarker(output)
+  output = RemoveLocations(output)
+  output = RemoveMemoryAddresses(output)
+  return (RemoveTestNamesOfLeakedMocks(output), GetLeakyTests(output))
+
+
+def GetShellCommandOutput(cmd):
+  """Runs a command in a sub-process, and returns its STDOUT in a string."""
+
+  return gmock_test_utils.Subprocess(cmd, capture_stderr=False).output
+
+
+def GetNormalizedCommandOutputAndLeakyTests(cmd):
+  """Runs a command and returns its normalized output and a list of leaky tests.
+
+  Args:
+    cmd:  the shell command.
+  """
+
+  # Disables exception pop-ups on Windows.
+  os.environ['GTEST_CATCH_EXCEPTIONS'] = '1'
+  return GetNormalizedOutputAndLeakyTests(GetShellCommandOutput(cmd))
+
+
+class GMockOutputTest(gmock_test_utils.TestCase):
+  def testOutput(self):
+    (output, leaky_tests) = GetNormalizedCommandOutputAndLeakyTests(COMMAND)
+    golden_file = open(GOLDEN_PATH, 'rb')
+    golden = golden_file.read()
+    golden_file.close()
+
+    # The normalized output should match the golden file.
+    self.assertEquals(golden, output)
+
+    # The raw output should contain 2 leaked mock object errors for
+    # test GMockOutputTest.CatchesLeakedMocks.
+    self.assertEquals(['GMockOutputTest.CatchesLeakedMocks',
+                       'GMockOutputTest.CatchesLeakedMocks'],
+                      leaky_tests)
+
+
+if __name__ == '__main__':
+  if sys.argv[1:] == [GENGOLDEN_FLAG]:
+    (output, _) = GetNormalizedCommandOutputAndLeakyTests(COMMAND)
+    golden_file = open(GOLDEN_PATH, 'wb')
+    golden_file.write(output)
+    golden_file.close()
+  else:
+    gmock_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_output_test_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_output_test_.cc
new file mode 100644
index 0000000000..44cba342ad
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_output_test_.cc
@@ -0,0 +1,291 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Tests Google Mock's output in various scenarios.  This ensures that
+// Google Mock's messages are readable and useful.
+
+#include "gmock/gmock.h"
+
+#include <stdio.h>
+#include <string>
+
+#include "gtest/gtest.h"
+
+using testing::_;
+using testing::AnyNumber;
+using testing::Ge;
+using testing::InSequence;
+using testing::NaggyMock;
+using testing::Ref;
+using testing::Return;
+using testing::Sequence;
+
+class MockFoo {
+ public:
+  MockFoo() {}
+
+  MOCK_METHOD3(Bar, char(const std::string& s, int i, double x));
+  MOCK_METHOD2(Bar2, bool(int x, int y));
+  MOCK_METHOD2(Bar3, void(int x, int y));
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
+};
+
+class GMockOutputTest : public testing::Test {
+ protected:
+  NaggyMock<MockFoo> foo_;
+};
+
+TEST_F(GMockOutputTest, ExpectedCall) {
+  testing::GMOCK_FLAG(verbose) = "info";
+
+  EXPECT_CALL(foo_, Bar2(0, _));
+  foo_.Bar2(0, 0);  // Expected call
+
+  testing::GMOCK_FLAG(verbose) = "warning";
+}
+
+TEST_F(GMockOutputTest, ExpectedCallToVoidFunction) {
+  testing::GMOCK_FLAG(verbose) = "info";
+
+  EXPECT_CALL(foo_, Bar3(0, _));
+  foo_.Bar3(0, 0);  // Expected call
+
+  testing::GMOCK_FLAG(verbose) = "warning";
+}
+
+TEST_F(GMockOutputTest, ExplicitActionsRunOut) {
+  EXPECT_CALL(foo_, Bar2(_, _))
+      .Times(2)
+      .WillOnce(Return(false));
+  foo_.Bar2(2, 2);
+  foo_.Bar2(1, 1);  // Explicit actions in EXPECT_CALL run out.
+}
+
+TEST_F(GMockOutputTest, UnexpectedCall) {
+  EXPECT_CALL(foo_, Bar2(0, _));
+
+  foo_.Bar2(1, 0);  // Unexpected call
+  foo_.Bar2(0, 0);  // Expected call
+}
+
+TEST_F(GMockOutputTest, UnexpectedCallToVoidFunction) {
+  EXPECT_CALL(foo_, Bar3(0, _));
+
+  foo_.Bar3(1, 0);  // Unexpected call
+  foo_.Bar3(0, 0);  // Expected call
+}
+
+TEST_F(GMockOutputTest, ExcessiveCall) {
+  EXPECT_CALL(foo_, Bar2(0, _));
+
+  foo_.Bar2(0, 0);  // Expected call
+  foo_.Bar2(0, 1);  // Excessive call
+}
+
+TEST_F(GMockOutputTest, ExcessiveCallToVoidFunction) {
+  EXPECT_CALL(foo_, Bar3(0, _));
+
+  foo_.Bar3(0, 0);  // Expected call
+  foo_.Bar3(0, 1);  // Excessive call
+}
+
+TEST_F(GMockOutputTest, UninterestingCall) {
+  foo_.Bar2(0, 1);  // Uninteresting call
+}
+
+TEST_F(GMockOutputTest, UninterestingCallToVoidFunction) {
+  foo_.Bar3(0, 1);  // Uninteresting call
+}
+
+TEST_F(GMockOutputTest, RetiredExpectation) {
+  EXPECT_CALL(foo_, Bar2(_, _))
+      .RetiresOnSaturation();
+  EXPECT_CALL(foo_, Bar2(0, 0));
+
+  foo_.Bar2(1, 1);
+  foo_.Bar2(1, 1);  // Matches a retired expectation
+  foo_.Bar2(0, 0);
+}
+
+TEST_F(GMockOutputTest, UnsatisfiedPrerequisite) {
+  {
+    InSequence s;
+    EXPECT_CALL(foo_, Bar(_, 0, _));
+    EXPECT_CALL(foo_, Bar2(0, 0));
+    EXPECT_CALL(foo_, Bar2(1, _));
+  }
+
+  foo_.Bar2(1, 0);  // Has one immediate unsatisfied pre-requisite
+  foo_.Bar("Hi", 0, 0);
+  foo_.Bar2(0, 0);
+  foo_.Bar2(1, 0);
+}
+
+TEST_F(GMockOutputTest, UnsatisfiedPrerequisites) {
+  Sequence s1, s2;
+
+  EXPECT_CALL(foo_, Bar(_, 0, _))
+      .InSequence(s1);
+  EXPECT_CALL(foo_, Bar2(0, 0))
+      .InSequence(s2);
+  EXPECT_CALL(foo_, Bar2(1, _))
+      .InSequence(s1, s2);
+
+  foo_.Bar2(1, 0);  // Has two immediate unsatisfied pre-requisites
+  foo_.Bar("Hi", 0, 0);
+  foo_.Bar2(0, 0);
+  foo_.Bar2(1, 0);
+}
+
+TEST_F(GMockOutputTest, UnsatisfiedWith) {
+  EXPECT_CALL(foo_, Bar2(_, _)).With(Ge());
+}
+
+TEST_F(GMockOutputTest, UnsatisfiedExpectation) {
+  EXPECT_CALL(foo_, Bar(_, _, _));
+  EXPECT_CALL(foo_, Bar2(0, _))
+      .Times(2);
+
+  foo_.Bar2(0, 1);
+}
+
+TEST_F(GMockOutputTest, MismatchArguments) {
+  const std::string s = "Hi";
+  EXPECT_CALL(foo_, Bar(Ref(s), _, Ge(0)));
+
+  foo_.Bar("Ho", 0, -0.1);  // Mismatch arguments
+  foo_.Bar(s, 0, 0);
+}
+
+TEST_F(GMockOutputTest, MismatchWith) {
+  EXPECT_CALL(foo_, Bar2(Ge(2), Ge(1)))
+      .With(Ge());
+
+  foo_.Bar2(2, 3);  // Mismatch With()
+  foo_.Bar2(2, 1);
+}
+
+TEST_F(GMockOutputTest, MismatchArgumentsAndWith) {
+  EXPECT_CALL(foo_, Bar2(Ge(2), Ge(1)))
+      .With(Ge());
+
+  foo_.Bar2(1, 3);  // Mismatch arguments and mismatch With()
+  foo_.Bar2(2, 1);
+}
+
+TEST_F(GMockOutputTest, UnexpectedCallWithDefaultAction) {
+  ON_CALL(foo_, Bar2(_, _))
+      .WillByDefault(Return(true));   // Default action #1
+  ON_CALL(foo_, Bar2(1, _))
+      .WillByDefault(Return(false));  // Default action #2
+
+  EXPECT_CALL(foo_, Bar2(2, 2));
+  foo_.Bar2(1, 0);  // Unexpected call, takes default action #2.
+  foo_.Bar2(0, 0);  // Unexpected call, takes default action #1.
+  foo_.Bar2(2, 2);  // Expected call.
+}
+
+TEST_F(GMockOutputTest, ExcessiveCallWithDefaultAction) {
+  ON_CALL(foo_, Bar2(_, _))
+      .WillByDefault(Return(true));   // Default action #1
+  ON_CALL(foo_, Bar2(1, _))
+      .WillByDefault(Return(false));  // Default action #2
+
+  EXPECT_CALL(foo_, Bar2(2, 2));
+  EXPECT_CALL(foo_, Bar2(1, 1));
+
+  foo_.Bar2(2, 2);  // Expected call.
+  foo_.Bar2(2, 2);  // Excessive call, takes default action #1.
+  foo_.Bar2(1, 1);  // Expected call.
+  foo_.Bar2(1, 1);  // Excessive call, takes default action #2.
+}
+
+TEST_F(GMockOutputTest, UninterestingCallWithDefaultAction) {
+  ON_CALL(foo_, Bar2(_, _))
+      .WillByDefault(Return(true));   // Default action #1
+  ON_CALL(foo_, Bar2(1, _))
+      .WillByDefault(Return(false));  // Default action #2
+
+  foo_.Bar2(2, 2);  // Uninteresting call, takes default action #1.
+  foo_.Bar2(1, 1);  // Uninteresting call, takes default action #2.
+}
+
+TEST_F(GMockOutputTest, ExplicitActionsRunOutWithDefaultAction) {
+  ON_CALL(foo_, Bar2(_, _))
+      .WillByDefault(Return(true));   // Default action #1
+
+  EXPECT_CALL(foo_, Bar2(_, _))
+      .Times(2)
+      .WillOnce(Return(false));
+  foo_.Bar2(2, 2);
+  foo_.Bar2(1, 1);  // Explicit actions in EXPECT_CALL run out.
+}
+
+TEST_F(GMockOutputTest, CatchesLeakedMocks) {
+  MockFoo* foo1 = new MockFoo;
+  MockFoo* foo2 = new MockFoo;
+
+  // Invokes ON_CALL on foo1.
+  ON_CALL(*foo1, Bar(_, _, _)).WillByDefault(Return('a'));
+
+  // Invokes EXPECT_CALL on foo2.
+  EXPECT_CALL(*foo2, Bar2(_, _));
+  EXPECT_CALL(*foo2, Bar2(1, _));
+  EXPECT_CALL(*foo2, Bar3(_, _)).Times(AnyNumber());
+  foo2->Bar2(2, 1);
+  foo2->Bar2(1, 1);
+
+  // Both foo1 and foo2 are deliberately leaked.
+}
+
+void TestCatchesLeakedMocksInAdHocTests() {
+  MockFoo* foo = new MockFoo;
+
+  // Invokes EXPECT_CALL on foo.
+  EXPECT_CALL(*foo, Bar2(_, _));
+  foo->Bar2(2, 1);
+
+  // foo is deliberately leaked.
+}
+
+int main(int argc, char **argv) {
+  testing::InitGoogleMock(&argc, argv);
+
+  // Ensures that the tests pass no matter what value of
+  // --gmock_catch_leaked_mocks and --gmock_verbose the user specifies.
+  testing::GMOCK_FLAG(catch_leaked_mocks) = true;
+  testing::GMOCK_FLAG(verbose) = "warning";
+
+  TestCatchesLeakedMocksInAdHocTests();
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_output_test_golden.txt b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_output_test_golden.txt
new file mode 100644
index 0000000000..689d5eeb03
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_output_test_golden.txt
@@ -0,0 +1,310 @@
+[ RUN      ] GMockOutputTest.ExpectedCall
+
+FILE:#: EXPECT_CALL(foo_, Bar2(0, _)) invoked
+Stack trace:
+
+FILE:#: Mock function call matches EXPECT_CALL(foo_, Bar2(0, _))...
+    Function call: Bar2(0, 0)
+          Returns: false
+Stack trace:
+[       OK ] GMockOutputTest.ExpectedCall
+[ RUN      ] GMockOutputTest.ExpectedCallToVoidFunction
+
+FILE:#: EXPECT_CALL(foo_, Bar3(0, _)) invoked
+Stack trace:
+
+FILE:#: Mock function call matches EXPECT_CALL(foo_, Bar3(0, _))...
+    Function call: Bar3(0, 0)
+Stack trace:
+[       OK ] GMockOutputTest.ExpectedCallToVoidFunction
+[ RUN      ] GMockOutputTest.ExplicitActionsRunOut
+
+GMOCK WARNING:
+FILE:#: Too few actions specified in EXPECT_CALL(foo_, Bar2(_, _))...
+Expected to be called twice, but has only 1 WillOnce().
+GMOCK WARNING:
+FILE:#: Actions ran out in EXPECT_CALL(foo_, Bar2(_, _))...
+Called 2 times, but only 1 WillOnce() is specified - returning default value.
+Stack trace:
+[       OK ] GMockOutputTest.ExplicitActionsRunOut
+[ RUN      ] GMockOutputTest.UnexpectedCall
+unknown file: Failure
+
+Unexpected mock function call - returning default value.
+    Function call: Bar2(1, 0)
+          Returns: false
+Google Mock tried the following 1 expectation, but it didn't match:
+
+FILE:#: EXPECT_CALL(foo_, Bar2(0, _))...
+  Expected arg #0: is equal to 0
+           Actual: 1
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] GMockOutputTest.UnexpectedCall
+[ RUN      ] GMockOutputTest.UnexpectedCallToVoidFunction
+unknown file: Failure
+
+Unexpected mock function call - returning directly.
+    Function call: Bar3(1, 0)
+Google Mock tried the following 1 expectation, but it didn't match:
+
+FILE:#: EXPECT_CALL(foo_, Bar3(0, _))...
+  Expected arg #0: is equal to 0
+           Actual: 1
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] GMockOutputTest.UnexpectedCallToVoidFunction
+[ RUN      ] GMockOutputTest.ExcessiveCall
+FILE:#: Failure
+Mock function called more times than expected - returning default value.
+    Function call: Bar2(0, 1)
+          Returns: false
+         Expected: to be called once
+           Actual: called twice - over-saturated and active
+[  FAILED  ] GMockOutputTest.ExcessiveCall
+[ RUN      ] GMockOutputTest.ExcessiveCallToVoidFunction
+FILE:#: Failure
+Mock function called more times than expected - returning directly.
+    Function call: Bar3(0, 1)
+         Expected: to be called once
+           Actual: called twice - over-saturated and active
+[  FAILED  ] GMockOutputTest.ExcessiveCallToVoidFunction
+[ RUN      ] GMockOutputTest.UninterestingCall
+
+GMOCK WARNING:
+Uninteresting mock function call - returning default value.
+    Function call: Bar2(0, 1)
+          Returns: false
+NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#knowing-when-to-expect for details.
+[       OK ] GMockOutputTest.UninterestingCall
+[ RUN      ] GMockOutputTest.UninterestingCallToVoidFunction
+
+GMOCK WARNING:
+Uninteresting mock function call - returning directly.
+    Function call: Bar3(0, 1)
+NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#knowing-when-to-expect for details.
+[       OK ] GMockOutputTest.UninterestingCallToVoidFunction
+[ RUN      ] GMockOutputTest.RetiredExpectation
+unknown file: Failure
+
+Unexpected mock function call - returning default value.
+    Function call: Bar2(1, 1)
+          Returns: false
+Google Mock tried the following 2 expectations, but none matched:
+
+FILE:#: tried expectation #0: EXPECT_CALL(foo_, Bar2(_, _))...
+         Expected: the expectation is active
+           Actual: it is retired
+         Expected: to be called once
+           Actual: called once - saturated and retired
+FILE:#: tried expectation #1: EXPECT_CALL(foo_, Bar2(0, 0))...
+  Expected arg #0: is equal to 0
+           Actual: 1
+  Expected arg #1: is equal to 0
+           Actual: 1
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] GMockOutputTest.RetiredExpectation
+[ RUN      ] GMockOutputTest.UnsatisfiedPrerequisite
+unknown file: Failure
+
+Unexpected mock function call - returning default value.
+    Function call: Bar2(1, 0)
+          Returns: false
+Google Mock tried the following 2 expectations, but none matched:
+
+FILE:#: tried expectation #0: EXPECT_CALL(foo_, Bar2(0, 0))...
+  Expected arg #0: is equal to 0
+           Actual: 1
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+FILE:#: tried expectation #1: EXPECT_CALL(foo_, Bar2(1, _))...
+         Expected: all pre-requisites are satisfied
+           Actual: the following immediate pre-requisites are not satisfied:
+FILE:#: pre-requisite #0
+                   (end of pre-requisites)
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] GMockOutputTest.UnsatisfiedPrerequisite
+[ RUN      ] GMockOutputTest.UnsatisfiedPrerequisites
+unknown file: Failure
+
+Unexpected mock function call - returning default value.
+    Function call: Bar2(1, 0)
+          Returns: false
+Google Mock tried the following 2 expectations, but none matched:
+
+FILE:#: tried expectation #0: EXPECT_CALL(foo_, Bar2(0, 0))...
+  Expected arg #0: is equal to 0
+           Actual: 1
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+FILE:#: tried expectation #1: EXPECT_CALL(foo_, Bar2(1, _))...
+         Expected: all pre-requisites are satisfied
+           Actual: the following immediate pre-requisites are not satisfied:
+FILE:#: pre-requisite #0
+FILE:#: pre-requisite #1
+                   (end of pre-requisites)
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] GMockOutputTest.UnsatisfiedPrerequisites
+[ RUN      ] GMockOutputTest.UnsatisfiedWith
+FILE:#: Failure
+Actual function call count doesn't match EXPECT_CALL(foo_, Bar2(_, _))...
+    Expected args: are a pair where the first >= the second
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] GMockOutputTest.UnsatisfiedWith
+[ RUN      ] GMockOutputTest.UnsatisfiedExpectation
+FILE:#: Failure
+Actual function call count doesn't match EXPECT_CALL(foo_, Bar2(0, _))...
+         Expected: to be called twice
+           Actual: called once - unsatisfied and active
+FILE:#: Failure
+Actual function call count doesn't match EXPECT_CALL(foo_, Bar(_, _, _))...
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] GMockOutputTest.UnsatisfiedExpectation
+[ RUN      ] GMockOutputTest.MismatchArguments
+unknown file: Failure
+
+Unexpected mock function call - returning default value.
+    Function call: Bar(@0x# "Ho", 0, -0.1)
+          Returns: '\0'
+Google Mock tried the following 1 expectation, but it didn't match:
+
+FILE:#: EXPECT_CALL(foo_, Bar(Ref(s), _, Ge(0)))...
+  Expected arg #0: references the variable @0x# "Hi"
+           Actual: "Ho", which is located @0x#
+  Expected arg #2: is >= 0
+           Actual: -0.1
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] GMockOutputTest.MismatchArguments
+[ RUN      ] GMockOutputTest.MismatchWith
+unknown file: Failure
+
+Unexpected mock function call - returning default value.
+    Function call: Bar2(2, 3)
+          Returns: false
+Google Mock tried the following 1 expectation, but it didn't match:
+
+FILE:#: EXPECT_CALL(foo_, Bar2(Ge(2), Ge(1)))...
+    Expected args: are a pair where the first >= the second
+           Actual: don't match
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] GMockOutputTest.MismatchWith
+[ RUN      ] GMockOutputTest.MismatchArgumentsAndWith
+unknown file: Failure
+
+Unexpected mock function call - returning default value.
+    Function call: Bar2(1, 3)
+          Returns: false
+Google Mock tried the following 1 expectation, but it didn't match:
+
+FILE:#: EXPECT_CALL(foo_, Bar2(Ge(2), Ge(1)))...
+  Expected arg #0: is >= 2
+           Actual: 1
+    Expected args: are a pair where the first >= the second
+           Actual: don't match
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] GMockOutputTest.MismatchArgumentsAndWith
+[ RUN      ] GMockOutputTest.UnexpectedCallWithDefaultAction
+unknown file: Failure
+
+Unexpected mock function call - taking default action specified at:
+FILE:#:
+    Function call: Bar2(1, 0)
+          Returns: false
+Google Mock tried the following 1 expectation, but it didn't match:
+
+FILE:#: EXPECT_CALL(foo_, Bar2(2, 2))...
+  Expected arg #0: is equal to 2
+           Actual: 1
+  Expected arg #1: is equal to 2
+           Actual: 0
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+unknown file: Failure
+
+Unexpected mock function call - taking default action specified at:
+FILE:#:
+    Function call: Bar2(0, 0)
+          Returns: true
+Google Mock tried the following 1 expectation, but it didn't match:
+
+FILE:#: EXPECT_CALL(foo_, Bar2(2, 2))...
+  Expected arg #0: is equal to 2
+           Actual: 0
+  Expected arg #1: is equal to 2
+           Actual: 0
+         Expected: to be called once
+           Actual: never called - unsatisfied and active
+[  FAILED  ] GMockOutputTest.UnexpectedCallWithDefaultAction
+[ RUN      ] GMockOutputTest.ExcessiveCallWithDefaultAction
+FILE:#: Failure
+Mock function called more times than expected - taking default action specified at:
+FILE:#:
+    Function call: Bar2(2, 2)
+          Returns: true
+         Expected: to be called once
+           Actual: called twice - over-saturated and active
+FILE:#: Failure
+Mock function called more times than expected - taking default action specified at:
+FILE:#:
+    Function call: Bar2(1, 1)
+          Returns: false
+         Expected: to be called once
+           Actual: called twice - over-saturated and active
+[  FAILED  ] GMockOutputTest.ExcessiveCallWithDefaultAction
+[ RUN      ] GMockOutputTest.UninterestingCallWithDefaultAction
+
+GMOCK WARNING:
+Uninteresting mock function call - taking default action specified at:
+FILE:#:
+    Function call: Bar2(2, 2)
+          Returns: true
+NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#knowing-when-to-expect for details.
+
+GMOCK WARNING:
+Uninteresting mock function call - taking default action specified at:
+FILE:#:
+    Function call: Bar2(1, 1)
+          Returns: false
+NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#knowing-when-to-expect for details.
+[       OK ] GMockOutputTest.UninterestingCallWithDefaultAction
+[ RUN      ] GMockOutputTest.ExplicitActionsRunOutWithDefaultAction
+
+GMOCK WARNING:
+FILE:#: Too few actions specified in EXPECT_CALL(foo_, Bar2(_, _))...
+Expected to be called twice, but has only 1 WillOnce().
+GMOCK WARNING:
+FILE:#: Actions ran out in EXPECT_CALL(foo_, Bar2(_, _))...
+Called 2 times, but only 1 WillOnce() is specified - taking default action specified at:
+FILE:#:
+Stack trace:
+[       OK ] GMockOutputTest.ExplicitActionsRunOutWithDefaultAction
+[ RUN      ] GMockOutputTest.CatchesLeakedMocks
+[       OK ] GMockOutputTest.CatchesLeakedMocks
+[  FAILED  ] GMockOutputTest.UnexpectedCall
+[  FAILED  ] GMockOutputTest.UnexpectedCallToVoidFunction
+[  FAILED  ] GMockOutputTest.ExcessiveCall
+[  FAILED  ] GMockOutputTest.ExcessiveCallToVoidFunction
+[  FAILED  ] GMockOutputTest.RetiredExpectation
+[  FAILED  ] GMockOutputTest.UnsatisfiedPrerequisite
+[  FAILED  ] GMockOutputTest.UnsatisfiedPrerequisites
+[  FAILED  ] GMockOutputTest.UnsatisfiedWith
+[  FAILED  ] GMockOutputTest.UnsatisfiedExpectation
+[  FAILED  ] GMockOutputTest.MismatchArguments
+[  FAILED  ] GMockOutputTest.MismatchWith
+[  FAILED  ] GMockOutputTest.MismatchArgumentsAndWith
+[  FAILED  ] GMockOutputTest.UnexpectedCallWithDefaultAction
+[  FAILED  ] GMockOutputTest.ExcessiveCallWithDefaultAction
+
+
+FILE:#: ERROR: this mock object should be deleted but never is. Its address is @0x#.
+FILE:#: ERROR: this mock object should be deleted but never is. Its address is @0x#.
+FILE:#: ERROR: this mock object should be deleted but never is. Its address is @0x#.
+ERROR: 3 leaked mock objects found at program exit.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_stress_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_stress_test.cc
new file mode 100644
index 0000000000..0e97aeed0b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_stress_test.cc
@@ -0,0 +1,322 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Tests that Google Mock constructs can be used in a large number of
+// threads concurrently.
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+namespace {
+
+// From <gtest/internal/gtest-port.h>.
+using ::testing::internal::ThreadWithParam;
+
+// The maximum number of test threads (not including helper threads)
+// to create.
+const int kMaxTestThreads = 50;
+
+// How many times to repeat a task in a test thread.
+const int kRepeat = 50;
+
+class MockFoo {
+ public:
+  MOCK_METHOD1(Bar, int(int n));  // NOLINT
+  MOCK_METHOD2(Baz, char(const char* s1, const internal::string& s2));  // NOLINT
+};
+
+// Helper for waiting for the given thread to finish and then deleting it.
+template <typename T>
+void JoinAndDelete(ThreadWithParam<T>* t) {
+  t->Join();
+  delete t;
+}
+
+using internal::linked_ptr;
+
+// Helper classes for testing using linked_ptr concurrently.
+
+class Base {
+ public:
+  explicit Base(int a_x) : x_(a_x) {}
+  virtual ~Base() {}
+  int x() const { return x_; }
+ private:
+  int x_;
+};
+
+class Derived1 : public Base {
+ public:
+  Derived1(int a_x, int a_y) : Base(a_x), y_(a_y) {}
+  int y() const { return y_; }
+ private:
+  int y_;
+};
+
+class Derived2 : public Base {
+ public:
+  Derived2(int a_x, int a_z) : Base(a_x), z_(a_z) {}
+  int z() const { return z_; }
+ private:
+  int z_;
+};
+
+linked_ptr<Derived1> pointer1(new Derived1(1, 2));
+linked_ptr<Derived2> pointer2(new Derived2(3, 4));
+
+struct Dummy {};
+
+// Tests that we can copy from a linked_ptr and read it concurrently.
+void TestConcurrentCopyAndReadLinkedPtr(Dummy /* dummy */) {
+  // Reads pointer1 and pointer2 while they are being copied from in
+  // another thread.
+  EXPECT_EQ(1, pointer1->x());
+  EXPECT_EQ(2, pointer1->y());
+  EXPECT_EQ(3, pointer2->x());
+  EXPECT_EQ(4, pointer2->z());
+
+  // Copies from pointer1.
+  linked_ptr<Derived1> p1(pointer1);
+  EXPECT_EQ(1, p1->x());
+  EXPECT_EQ(2, p1->y());
+
+  // Assigns from pointer2 where the LHS was empty.
+  linked_ptr<Base> p2;
+  p2 = pointer1;
+  EXPECT_EQ(1, p2->x());
+
+  // Assigns from pointer2 where the LHS was not empty.
+  p2 = pointer2;
+  EXPECT_EQ(3, p2->x());
+}
+
+const linked_ptr<Derived1> p0(new Derived1(1, 2));
+
+// Tests that we can concurrently modify two linked_ptrs that point to
+// the same object.
+void TestConcurrentWriteToEqualLinkedPtr(Dummy /* dummy */) {
+  // p1 and p2 point to the same, shared thing.  One thread resets p1.
+  // Another thread assigns to p2.  This will cause the same
+  // underlying "ring" to be updated concurrently.
+  linked_ptr<Derived1> p1(p0);
+  linked_ptr<Derived1> p2(p0);
+
+  EXPECT_EQ(1, p1->x());
+  EXPECT_EQ(2, p1->y());
+
+  EXPECT_EQ(1, p2->x());
+  EXPECT_EQ(2, p2->y());
+
+  p1.reset();
+  p2 = p0;
+
+  EXPECT_EQ(1, p2->x());
+  EXPECT_EQ(2, p2->y());
+}
+
+// Tests that different mock objects can be used in their respective
+// threads.  This should generate no Google Test failure.
+void TestConcurrentMockObjects(Dummy /* dummy */) {
+  // Creates a mock and does some typical operations on it.
+  MockFoo foo;
+  ON_CALL(foo, Bar(_))
+      .WillByDefault(Return(1));
+  ON_CALL(foo, Baz(_, _))
+      .WillByDefault(Return('b'));
+  ON_CALL(foo, Baz(_, "you"))
+      .WillByDefault(Return('a'));
+
+  EXPECT_CALL(foo, Bar(0))
+      .Times(AtMost(3));
+  EXPECT_CALL(foo, Baz(_, _));
+  EXPECT_CALL(foo, Baz("hi", "you"))
+      .WillOnce(Return('z'))
+      .WillRepeatedly(DoDefault());
+
+  EXPECT_EQ(1, foo.Bar(0));
+  EXPECT_EQ(1, foo.Bar(0));
+  EXPECT_EQ('z', foo.Baz("hi", "you"));
+  EXPECT_EQ('a', foo.Baz("hi", "you"));
+  EXPECT_EQ('b', foo.Baz("hi", "me"));
+}
+
+// Tests invoking methods of the same mock object in multiple threads.
+
+struct Helper1Param {
+  MockFoo* mock_foo;
+  int* count;
+};
+
+void Helper1(Helper1Param param) {
+  for (int i = 0; i < kRepeat; i++) {
+    const char ch = param.mock_foo->Baz("a", "b");
+    if (ch == 'a') {
+      // It was an expected call.
+      (*param.count)++;
+    } else {
+      // It was an excessive call.
+      EXPECT_EQ('\0', ch);
+    }
+
+    // An unexpected call.
+    EXPECT_EQ('\0', param.mock_foo->Baz("x", "y")) << "Expected failure.";
+
+    // An uninteresting call.
+    EXPECT_EQ(1, param.mock_foo->Bar(5));
+  }
+}
+
+// This should generate 3*kRepeat + 1 failures in total.
+void TestConcurrentCallsOnSameObject(Dummy /* dummy */) {
+  MockFoo foo;
+
+  ON_CALL(foo, Bar(_))
+      .WillByDefault(Return(1));
+  EXPECT_CALL(foo, Baz(_, "b"))
+      .Times(kRepeat)
+      .WillRepeatedly(Return('a'));
+  EXPECT_CALL(foo, Baz(_, "c"));  // Expected to be unsatisfied.
+
+  // This chunk of code should generate kRepeat failures about
+  // excessive calls, and 2*kRepeat failures about unexpected calls.
+  int count1 = 0;
+  const Helper1Param param = { &foo, &count1 };
+  ThreadWithParam<Helper1Param>* const t =
+      new ThreadWithParam<Helper1Param>(Helper1, param, NULL);
+
+  int count2 = 0;
+  const Helper1Param param2 = { &foo, &count2 };
+  Helper1(param2);
+  JoinAndDelete(t);
+
+  EXPECT_EQ(kRepeat, count1 + count2);
+
+  // foo's destructor should generate one failure about unsatisfied
+  // expectation.
+}
+
+// Tests using the same mock object in multiple threads when the
+// expectations are partially ordered.
+
+void Helper2(MockFoo* foo) {
+  for (int i = 0; i < kRepeat; i++) {
+    foo->Bar(2);
+    foo->Bar(3);
+  }
+}
+
+// This should generate no Google Test failures.
+void TestPartiallyOrderedExpectationsWithThreads(Dummy /* dummy */) {
+  MockFoo foo;
+  Sequence s1, s2;
+
+  {
+    InSequence dummy;
+    EXPECT_CALL(foo, Bar(0));
+    EXPECT_CALL(foo, Bar(1))
+        .InSequence(s1, s2);
+  }
+
+  EXPECT_CALL(foo, Bar(2))
+      .Times(2*kRepeat)
+      .InSequence(s1)
+      .RetiresOnSaturation();
+  EXPECT_CALL(foo, Bar(3))
+      .Times(2*kRepeat)
+      .InSequence(s2);
+
+  {
+    InSequence dummy;
+    EXPECT_CALL(foo, Bar(2))
+        .InSequence(s1, s2);
+    EXPECT_CALL(foo, Bar(4));
+  }
+
+  foo.Bar(0);
+  foo.Bar(1);
+
+  ThreadWithParam<MockFoo*>* const t =
+      new ThreadWithParam<MockFoo*>(Helper2, &foo, NULL);
+  Helper2(&foo);
+  JoinAndDelete(t);
+
+  foo.Bar(2);
+  foo.Bar(4);
+}
+
+// Tests using Google Mock constructs in many threads concurrently.
+TEST(StressTest, CanUseGMockWithThreads) {
+  void (*test_routines[])(Dummy dummy) = {
+    &TestConcurrentCopyAndReadLinkedPtr,
+    &TestConcurrentWriteToEqualLinkedPtr,
+    &TestConcurrentMockObjects,
+    &TestConcurrentCallsOnSameObject,
+    &TestPartiallyOrderedExpectationsWithThreads,
+  };
+
+  const int kRoutines = sizeof(test_routines)/sizeof(test_routines[0]);
+  const int kCopiesOfEachRoutine = kMaxTestThreads / kRoutines;
+  const int kTestThreads = kCopiesOfEachRoutine * kRoutines;
+  ThreadWithParam<Dummy>* threads[kTestThreads] = {};
+  for (int i = 0; i < kTestThreads; i++) {
+    // Creates a thread to run the test function.
+    threads[i] =
+        new ThreadWithParam<Dummy>(test_routines[i % kRoutines], Dummy(), NULL);
+    GTEST_LOG_(INFO) << "Thread #" << i << " running . . .";
+  }
+
+  // At this point, we have many threads running.
+  for (int i = 0; i < kTestThreads; i++) {
+    JoinAndDelete(threads[i]);
+  }
+
+  // Ensures that the correct number of failures have been reported.
+  const TestInfo* const info = UnitTest::GetInstance()->current_test_info();
+  const TestResult& result = *info->result();
+  const int kExpectedFailures = (3*kRepeat + 1)*kCopiesOfEachRoutine;
+  GTEST_CHECK_(kExpectedFailures == result.total_part_count())
+      << "Expected " << kExpectedFailures << " failures, but got "
+      << result.total_part_count();
+}
+
+}  // namespace
+}  // namespace testing
+
+int main(int argc, char **argv) {
+  testing::InitGoogleMock(&argc, argv);
+
+  const int exit_code = RUN_ALL_TESTS();  // Expected to fail.
+  GTEST_CHECK_(exit_code != 0) << "RUN_ALL_TESTS() did not fail as expected";
+
+  printf("\nPASS\n");
+  return 0;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_test.cc
new file mode 100644
index 0000000000..d8d0c57b16
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_test.cc
@@ -0,0 +1,220 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file tests code in gmock.cc.
+
+#include "gmock/gmock.h"
+
+#include <string>
+#include "gtest/gtest.h"
+
+#if !defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+
+using testing::GMOCK_FLAG(verbose);
+using testing::InitGoogleMock;
+
+// Verifies that calling InitGoogleMock() on argv results in new_argv,
+// and the gmock_verbose flag's value is set to expected_gmock_verbose.
+template <typename Char, int M, int N>
+void TestInitGoogleMock(const Char* (&argv)[M], const Char* (&new_argv)[N],
+                        const ::std::string& expected_gmock_verbose) {
+  const ::std::string old_verbose = GMOCK_FLAG(verbose);
+
+  int argc = M;
+  InitGoogleMock(&argc, const_cast<Char**>(argv));
+  ASSERT_EQ(N, argc) << "The new argv has wrong number of elements.";
+
+  for (int i = 0; i < N; i++) {
+    EXPECT_STREQ(new_argv[i], argv[i]);
+  }
+
+  EXPECT_EQ(expected_gmock_verbose, GMOCK_FLAG(verbose).c_str());
+  GMOCK_FLAG(verbose) = old_verbose;  // Restores the gmock_verbose flag.
+}
+
+TEST(InitGoogleMockTest, ParsesInvalidCommandLine) {
+  const char* argv[] = {
+    NULL
+  };
+
+  const char* new_argv[] = {
+    NULL
+  };
+
+  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose));
+}
+
+TEST(InitGoogleMockTest, ParsesEmptyCommandLine) {
+  const char* argv[] = {
+    "foo.exe",
+    NULL
+  };
+
+  const char* new_argv[] = {
+    "foo.exe",
+    NULL
+  };
+
+  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose));
+}
+
+TEST(InitGoogleMockTest, ParsesSingleFlag) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gmock_verbose=info",
+    NULL
+  };
+
+  const char* new_argv[] = {
+    "foo.exe",
+    NULL
+  };
+
+  TestInitGoogleMock(argv, new_argv, "info");
+}
+
+TEST(InitGoogleMockTest, ParsesUnrecognizedFlag) {
+  const char* argv[] = {
+    "foo.exe",
+    "--non_gmock_flag=blah",
+    NULL
+  };
+
+  const char* new_argv[] = {
+    "foo.exe",
+    "--non_gmock_flag=blah",
+    NULL
+  };
+
+  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose));
+}
+
+TEST(InitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
+  const char* argv[] = {
+    "foo.exe",
+    "--non_gmock_flag=blah",
+    "--gmock_verbose=error",
+    NULL
+  };
+
+  const char* new_argv[] = {
+    "foo.exe",
+    "--non_gmock_flag=blah",
+    NULL
+  };
+
+  TestInitGoogleMock(argv, new_argv, "error");
+}
+
+TEST(WideInitGoogleMockTest, ParsesInvalidCommandLine) {
+  const wchar_t* argv[] = {
+    NULL
+  };
+
+  const wchar_t* new_argv[] = {
+    NULL
+  };
+
+  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose));
+}
+
+TEST(WideInitGoogleMockTest, ParsesEmptyCommandLine) {
+  const wchar_t* argv[] = {
+    L"foo.exe",
+    NULL
+  };
+
+  const wchar_t* new_argv[] = {
+    L"foo.exe",
+    NULL
+  };
+
+  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose));
+}
+
+TEST(WideInitGoogleMockTest, ParsesSingleFlag) {
+  const wchar_t* argv[] = {
+    L"foo.exe",
+    L"--gmock_verbose=info",
+    NULL
+  };
+
+  const wchar_t* new_argv[] = {
+    L"foo.exe",
+    NULL
+  };
+
+  TestInitGoogleMock(argv, new_argv, "info");
+}
+
+TEST(WideInitGoogleMockTest, ParsesUnrecognizedFlag) {
+  const wchar_t* argv[] = {
+    L"foo.exe",
+    L"--non_gmock_flag=blah",
+    NULL
+  };
+
+  const wchar_t* new_argv[] = {
+    L"foo.exe",
+    L"--non_gmock_flag=blah",
+    NULL
+  };
+
+  TestInitGoogleMock(argv, new_argv, GMOCK_FLAG(verbose));
+}
+
+TEST(WideInitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
+  const wchar_t* argv[] = {
+    L"foo.exe",
+    L"--non_gmock_flag=blah",
+    L"--gmock_verbose=error",
+    NULL
+  };
+
+  const wchar_t* new_argv[] = {
+    L"foo.exe",
+    L"--non_gmock_flag=blah",
+    NULL
+  };
+
+  TestInitGoogleMock(argv, new_argv, "error");
+}
+
+#endif  // !defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+
+// Makes sure Google Mock flags can be accessed in code.
+TEST(FlagTest, IsAccessibleInCode) {
+  bool dummy = testing::GMOCK_FLAG(catch_leaked_mocks) &&
+      testing::GMOCK_FLAG(verbose) == "";
+  (void)dummy;  // Avoids the "unused local variable" warning.
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_test_utils.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_test_utils.py
new file mode 100755
index 0000000000..20e3d3d446
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googlemock/test/gmock_test_utils.py
@@ -0,0 +1,112 @@
+#!/usr/bin/env python
+#
+# Copyright 2006, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test utilities for Google C++ Mocking Framework."""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import sys
+
+
+# Determines path to gtest_test_utils and imports it.
+SCRIPT_DIR = os.path.dirname(__file__) or '.'
+
+# isdir resolves symbolic links.
+gtest_tests_util_dir = os.path.join(SCRIPT_DIR, '../gtest/test')
+if os.path.isdir(gtest_tests_util_dir):
+  GTEST_TESTS_UTIL_DIR = gtest_tests_util_dir
+else:
+  GTEST_TESTS_UTIL_DIR = os.path.join(SCRIPT_DIR, '../../gtest/test')
+
+sys.path.append(GTEST_TESTS_UTIL_DIR)
+import gtest_test_utils  # pylint: disable-msg=C6204
+
+
+def GetSourceDir():
+  """Returns the absolute path of the directory where the .py files are."""
+
+  return gtest_test_utils.GetSourceDir()
+
+
+def GetTestExecutablePath(executable_name):
+  """Returns the absolute path of the test binary given its name.
+
+  The function will print a message and abort the program if the resulting file
+  doesn't exist.
+
+  Args:
+    executable_name: name of the test binary that the test script runs.
+
+  Returns:
+    The absolute path of the test binary.
+  """
+
+  return gtest_test_utils.GetTestExecutablePath(executable_name)
+
+
+def GetExitStatus(exit_code):
+  """Returns the argument to exit(), or -1 if exit() wasn't called.
+
+  Args:
+    exit_code: the result value of os.system(command).
+  """
+
+  if os.name == 'nt':
+    # On Windows, os.WEXITSTATUS() doesn't work and os.system() returns
+    # the argument to exit() directly.
+    return exit_code
+  else:
+    # On Unix, os.WEXITSTATUS() must be used to extract the exit status
+    # from the result of os.system().
+    if os.WIFEXITED(exit_code):
+      return os.WEXITSTATUS(exit_code)
+    else:
+      return -1
+
+
+# Suppresses the "Invalid const name" lint complaint
+# pylint: disable-msg=C6409
+
+# Exposes utilities from gtest_test_utils.
+Subprocess = gtest_test_utils.Subprocess
+TestCase = gtest_test_utils.TestCase
+environ = gtest_test_utils.environ
+SetEnvVar = gtest_test_utils.SetEnvVar
+PREMATURE_EXIT_FILE_ENV_VAR = gtest_test_utils.PREMATURE_EXIT_FILE_ENV_VAR
+
+# pylint: enable-msg=C6409
+
+
+def Main():
+  """Runs the unit test."""
+
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/.gitignore b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/.gitignore
new file mode 100644
index 0000000000..4b7be4b91b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/.gitignore
@@ -0,0 +1,2 @@
+# python
+*.pyc
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/CHANGES b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/CHANGES
new file mode 100644
index 0000000000..0552132421
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/CHANGES
@@ -0,0 +1,157 @@
+Changes for 1.7.0:
+
+* New feature: death tests are supported on OpenBSD and in iOS
+  simulator now.
+* New feature: Google Test now implements a protocol to allow
+  a test runner to detect that a test program has exited
+  prematurely and report it as a failure (before it would be
+  falsely reported as a success if the exit code is 0).
+* New feature: Test::RecordProperty() can now be used outside of the
+  lifespan of a test method, in which case it will be attributed to
+  the current test case or the test program in the XML report.
+* New feature (potentially breaking): --gtest_list_tests now prints
+  the type parameters and value parameters for each test.
+* Improvement: char pointers and char arrays are now escaped properly
+  in failure messages.
+* Improvement: failure summary in XML reports now includes file and
+  line information.
+* Improvement: the <testsuites> XML element now has a timestamp attribute.
+* Improvement: When --gtest_filter is specified, XML report now doesn't
+  contain information about tests that are filtered out.
+* Fixed the bug where long --gtest_filter flag values are truncated in
+  death tests.
+* Potentially breaking change: RUN_ALL_TESTS() is now implemented as a
+  function instead of a macro in order to work better with Clang.
+* Compatibility fixes with C++ 11 and various platforms.
+* Bug/warning fixes.
+
+Changes for 1.6.0:
+
+* New feature: ADD_FAILURE_AT() for reporting a test failure at the
+  given source location -- useful for writing testing utilities.
+* New feature: the universal value printer is moved from Google Mock
+  to Google Test.
+* New feature: type parameters and value parameters are reported in
+  the XML report now.
+* A gtest_disable_pthreads CMake option.
+* Colored output works in GNU Screen sessions now.
+* Parameters of value-parameterized tests are now printed in the
+  textual output.
+* Failures from ad hoc test assertions run before RUN_ALL_TESTS() are
+  now correctly reported.
+* Arguments of ASSERT_XY and EXPECT_XY no longer need to support << to
+  ostream.
+* More complete handling of exceptions.
+* GTEST_ASSERT_XY can be used instead of ASSERT_XY in case the latter
+  name is already used by another library.
+* --gtest_catch_exceptions is now true by default, allowing a test
+  program to continue after an exception is thrown.
+* Value-parameterized test fixtures can now derive from Test and
+  WithParamInterface<T> separately, easing conversion of legacy tests.
+* Death test messages are clearly marked to make them more
+  distinguishable from other messages.
+* Compatibility fixes for Android, Google Native Client, MinGW, HP UX,
+  PowerPC, Lucid autotools, libCStd, Sun C++, Borland C++ Builder (Code Gear),
+  IBM XL C++ (Visual Age C++), and C++0x.
+* Bug fixes and implementation clean-ups.
+* Potentially incompatible changes: disables the harmful 'make install'
+  command in autotools.
+
+Changes for 1.5.0:
+
+ * New feature: assertions can be safely called in multiple threads
+   where the pthreads library is available.
+ * New feature: predicates used inside EXPECT_TRUE() and friends
+   can now generate custom failure messages.
+ * New feature: Google Test can now be compiled as a DLL.
+ * New feature: fused source files are included.
+ * New feature: prints help when encountering unrecognized Google Test flags.
+ * Experimental feature: CMake build script (requires CMake 2.6.4+).
+ * Experimental feature: the Pump script for meta programming.
+ * double values streamed to an assertion are printed with enough precision
+   to differentiate any two different values.
+ * Google Test now works on Solaris and AIX.
+ * Build and test script improvements.
+ * Bug fixes and implementation clean-ups.
+
+ Potentially breaking changes:
+
+ * Stopped supporting VC++ 7.1 with exceptions disabled.
+ * Dropped support for 'make install'.
+
+Changes for 1.4.0:
+
+ * New feature: the event listener API
+ * New feature: test shuffling
+ * New feature: the XML report format is closer to junitreport and can
+   be parsed by Hudson now.
+ * New feature: when a test runs under Visual Studio, its failures are
+   integrated in the IDE.
+ * New feature: /MD(d) versions of VC++ projects.
+ * New feature: elapsed time for the tests is printed by default.
+ * New feature: comes with a TR1 tuple implementation such that Boost
+   is no longer needed for Combine().
+ * New feature: EXPECT_DEATH_IF_SUPPORTED macro and friends.
+ * New feature: the Xcode project can now produce static gtest
+   libraries in addition to a framework.
+ * Compatibility fixes for Solaris, Cygwin, minGW, Windows Mobile,
+   Symbian, gcc, and C++Builder.
+ * Bug fixes and implementation clean-ups.
+
+Changes for 1.3.0:
+
+ * New feature: death tests on Windows, Cygwin, and Mac.
+ * New feature: ability to use Google Test assertions in other testing
+   frameworks.
+ * New feature: ability to run disabled test via
+   --gtest_also_run_disabled_tests.
+ * New feature: the --help flag for printing the usage.
+ * New feature: access to Google Test flag values in user code.
+ * New feature: a script that packs Google Test into one .h and one
+   .cc file for easy deployment.
+ * New feature: support for distributing test functions to multiple
+   machines (requires support from the test runner).
+ * Bug fixes and implementation clean-ups.
+
+Changes for 1.2.1:
+
+ * Compatibility fixes for Linux IA-64 and IBM z/OS.
+ * Added support for using Boost and other TR1 implementations.
+ * Changes to the build scripts to support upcoming release of Google C++
+   Mocking Framework.
+ * Added Makefile to the distribution package.
+ * Improved build instructions in README.
+
+Changes for 1.2.0:
+
+ * New feature: value-parameterized tests.
+ * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS)
+   macros.
+ * Changed the XML report format to match JUnit/Ant's.
+ * Added tests to the Xcode project.
+ * Added scons/SConscript for building with SCons.
+ * Added src/gtest-all.cc for building Google Test from a single file.
+ * Fixed compatibility with Solaris and z/OS.
+ * Enabled running Python tests on systems with python 2.3 installed,
+   e.g. Mac OS X 10.4.
+ * Bug fixes.
+
+Changes for 1.1.0:
+
+ * New feature: type-parameterized tests.
+ * New feature: exception assertions.
+ * New feature: printing elapsed time of tests.
+ * Improved the robustness of death tests.
+ * Added an Xcode project and samples.
+ * Adjusted the output format on Windows to be understandable by Visual Studio.
+ * Minor bug fixes.
+
+Changes for 1.0.1:
+
+ * Added project files for Visual Studio 7.1.
+ * Fixed issues with compiling on Mac OS X.
+ * Fixed issues with compiling on Cygwin.
+
+Changes for 1.0.0:
+
+ * Initial Open Source release of Google Test
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/CMakeLists.txt b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/CMakeLists.txt
new file mode 100644
index 0000000000..621d0f0421
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/CMakeLists.txt
@@ -0,0 +1,286 @@
+########################################################################
+# CMake build script for Google Test.
+#
+# To run the tests for Google Test itself on Linux, use 'make test' or
+# ctest.  You can select which tests to run using 'ctest -R regex'.
+# For more options, run 'ctest --help'.
+
+# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
+# make it prominent in the GUI.
+option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
+
+# When other libraries are using a shared version of runtime libraries,
+# Google Test also has to use one.
+option(
+  gtest_force_shared_crt
+  "Use shared (DLL) run-time lib even when Google Test is built as static lib."
+  OFF)
+
+option(gtest_build_tests "Build all of gtest's own tests." OFF)
+
+option(gtest_build_samples "Build gtest's sample programs." OFF)
+
+option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF)
+
+option(
+  gtest_hide_internal_symbols
+  "Build gtest with internal symbols hidden in shared libraries."
+  OFF)
+
+# Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
+include(cmake/hermetic_build.cmake OPTIONAL)
+
+if (COMMAND pre_project_set_up_hermetic_build)
+  pre_project_set_up_hermetic_build()
+endif()
+
+########################################################################
+#
+# Project-wide settings
+
+# Name of the project.
+#
+# CMake files in this project can refer to the root source directory
+# as ${gtest_SOURCE_DIR} and to the root binary directory as
+# ${gtest_BINARY_DIR}.
+# Language "C" is required for find_package(Threads).
+project(gtest CXX C)
+cmake_minimum_required(VERSION 2.6.2)
+
+if (COMMAND set_up_hermetic_build)
+  set_up_hermetic_build()
+endif()
+
+if (gtest_hide_internal_symbols)
+  set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+  set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+endif()
+
+# Define helper functions and macros used by Google Test.
+include(cmake/internal_utils.cmake)
+
+config_compiler_and_linker()  # Defined in internal_utils.cmake.
+
+# Where Google Test's .h files can be found.
+include_directories(
+  ${gtest_SOURCE_DIR}/include
+  ${gtest_SOURCE_DIR})
+
+# Where Google Test's libraries can be found.
+link_directories(${gtest_BINARY_DIR}/src)
+
+# Summary of tuple support for Microsoft Visual Studio:
+# Compiler    version(MS)  version(cmake)  Support
+# ----------  -----------  --------------  -----------------------------
+# <= VS 2010  <= 10        <= 1600         Use Google Tests's own tuple.
+# VS 2012     11           1700            std::tr1::tuple + _VARIADIC_MAX=10
+# VS 2013     12           1800            std::tr1::tuple
+if (MSVC AND MSVC_VERSION EQUAL 1700)
+  add_definitions(/D _VARIADIC_MAX=10)
+endif()
+
+########################################################################
+#
+# Defines the gtest & gtest_main libraries.  User tests should link
+# with one of them.
+
+# Google Test libraries.  We build them using more strict warnings than what
+# are used for other targets, to ensure that gtest can be compiled by a user
+# aggressive about warnings.
+cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
+cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
+target_link_libraries(gtest_main gtest)
+
+# If the CMake version supports it, attach header directory information
+# to the targets for when we are part of a parent build (ie being pulled
+# in via add_subdirectory() rather than being a standalone build).
+if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
+  target_include_directories(gtest      INTERFACE "${gtest_SOURCE_DIR}/include")
+  target_include_directories(gtest_main INTERFACE "${gtest_SOURCE_DIR}/include")
+endif()
+
+########################################################################
+#
+# Install rules
+install(TARGETS gtest gtest_main
+  DESTINATION lib)
+install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
+  DESTINATION include)
+
+########################################################################
+#
+# Samples on how to link user tests with gtest or gtest_main.
+#
+# They are not built by default.  To build them, set the
+# gtest_build_samples option to ON.  You can do it by running ccmake
+# or specifying the -Dgtest_build_samples=ON flag when running cmake.
+
+if (gtest_build_samples)
+  cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc)
+  cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc)
+  cxx_executable(sample3_unittest samples gtest_main)
+  cxx_executable(sample4_unittest samples gtest_main samples/sample4.cc)
+  cxx_executable(sample5_unittest samples gtest_main samples/sample1.cc)
+  cxx_executable(sample6_unittest samples gtest_main)
+  cxx_executable(sample7_unittest samples gtest_main)
+  cxx_executable(sample8_unittest samples gtest_main)
+  cxx_executable(sample9_unittest samples gtest)
+  cxx_executable(sample10_unittest samples gtest)
+endif()
+
+########################################################################
+#
+# Google Test's own tests.
+#
+# You can skip this section if you aren't interested in testing
+# Google Test itself.
+#
+# The tests are not built by default.  To build them, set the
+# gtest_build_tests option to ON.  You can do it by running ccmake
+# or specifying the -Dgtest_build_tests=ON flag when running cmake.
+
+if (gtest_build_tests)
+  # This must be set in the root directory for the tests to be run by
+  # 'make test' or ctest.
+  enable_testing()
+
+  ############################################################
+  # C++ tests built with standard compiler flags.
+
+  cxx_test(gtest-death-test_test gtest_main)
+  cxx_test(gtest_environment_test gtest)
+  cxx_test(gtest-filepath_test gtest_main)
+  cxx_test(gtest-linked_ptr_test gtest_main)
+  cxx_test(gtest-listener_test gtest_main)
+  cxx_test(gtest_main_unittest gtest_main)
+  cxx_test(gtest-message_test gtest_main)
+  cxx_test(gtest_no_test_unittest gtest)
+  cxx_test(gtest-options_test gtest_main)
+  cxx_test(gtest-param-test_test gtest
+    test/gtest-param-test2_test.cc)
+  cxx_test(gtest-port_test gtest_main)
+  cxx_test(gtest_pred_impl_unittest gtest_main)
+  cxx_test(gtest_premature_exit_test gtest
+    test/gtest_premature_exit_test.cc)
+  cxx_test(gtest-printers_test gtest_main)
+  cxx_test(gtest_prod_test gtest_main
+    test/production.cc)
+  cxx_test(gtest_repeat_test gtest)
+  cxx_test(gtest_sole_header_test gtest_main)
+  cxx_test(gtest_stress_test gtest)
+  cxx_test(gtest-test-part_test gtest_main)
+  cxx_test(gtest_throw_on_failure_ex_test gtest)
+  cxx_test(gtest-typed-test_test gtest_main
+    test/gtest-typed-test2_test.cc)
+  cxx_test(gtest_unittest gtest_main)
+  cxx_test(gtest-unittest-api_test gtest)
+
+  ############################################################
+  # C++ tests built with non-standard compiler flags.
+
+  # MSVC 7.1 does not support STL with exceptions disabled.
+  if (NOT MSVC OR MSVC_VERSION GREATER 1310)
+    cxx_library(gtest_no_exception "${cxx_no_exception}"
+      src/gtest-all.cc)
+    cxx_library(gtest_main_no_exception "${cxx_no_exception}"
+      src/gtest-all.cc src/gtest_main.cc)
+  endif()
+  cxx_library(gtest_main_no_rtti "${cxx_no_rtti}"
+    src/gtest-all.cc src/gtest_main.cc)
+
+  cxx_test_with_flags(gtest-death-test_ex_nocatch_test
+    "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0"
+    gtest test/gtest-death-test_ex_test.cc)
+  cxx_test_with_flags(gtest-death-test_ex_catch_test
+    "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1"
+    gtest test/gtest-death-test_ex_test.cc)
+
+  cxx_test_with_flags(gtest_no_rtti_unittest "${cxx_no_rtti}"
+    gtest_main_no_rtti test/gtest_unittest.cc)
+
+  cxx_shared_library(gtest_dll "${cxx_default}"
+    src/gtest-all.cc src/gtest_main.cc)
+
+  cxx_executable_with_flags(gtest_dll_test_ "${cxx_default}"
+    gtest_dll test/gtest_all_test.cc)
+  set_target_properties(gtest_dll_test_
+                        PROPERTIES
+                        COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
+
+  if (NOT MSVC OR MSVC_VERSION LESS 1600)  # 1600 is Visual Studio 2010.
+    # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that
+    # conflict with our own definitions. Therefore using our own tuple does not
+    # work on those compilers.
+    cxx_library(gtest_main_use_own_tuple "${cxx_use_own_tuple}"
+      src/gtest-all.cc src/gtest_main.cc)
+
+    cxx_test_with_flags(gtest-tuple_test "${cxx_use_own_tuple}"
+      gtest_main_use_own_tuple test/gtest-tuple_test.cc)
+
+    cxx_test_with_flags(gtest_use_own_tuple_test "${cxx_use_own_tuple}"
+      gtest_main_use_own_tuple
+      test/gtest-param-test_test.cc test/gtest-param-test2_test.cc)
+  endif()
+
+  ############################################################
+  # Python tests.
+
+  cxx_executable(gtest_break_on_failure_unittest_ test gtest)
+  py_test(gtest_break_on_failure_unittest)
+
+  # Visual Studio .NET 2003 does not support STL with exceptions disabled.
+  if (NOT MSVC OR MSVC_VERSION GREATER 1310)  # 1310 is Visual Studio .NET 2003
+    cxx_executable_with_flags(
+      gtest_catch_exceptions_no_ex_test_
+      "${cxx_no_exception}"
+      gtest_main_no_exception
+      test/gtest_catch_exceptions_test_.cc)
+  endif()
+
+  cxx_executable_with_flags(
+    gtest_catch_exceptions_ex_test_
+    "${cxx_exception}"
+    gtest_main
+    test/gtest_catch_exceptions_test_.cc)
+  py_test(gtest_catch_exceptions_test)
+
+  cxx_executable(gtest_color_test_ test gtest)
+  py_test(gtest_color_test)
+
+  cxx_executable(gtest_env_var_test_ test gtest)
+  py_test(gtest_env_var_test)
+
+  cxx_executable(gtest_filter_unittest_ test gtest)
+  py_test(gtest_filter_unittest)
+
+  cxx_executable(gtest_help_test_ test gtest_main)
+  py_test(gtest_help_test)
+
+  cxx_executable(gtest_list_tests_unittest_ test gtest)
+  py_test(gtest_list_tests_unittest)
+
+  cxx_executable(gtest_output_test_ test gtest)
+  py_test(gtest_output_test)
+
+  cxx_executable(gtest_shuffle_test_ test gtest)
+  py_test(gtest_shuffle_test)
+
+  # MSVC 7.1 does not support STL with exceptions disabled.
+  if (NOT MSVC OR MSVC_VERSION GREATER 1310)
+    cxx_executable(gtest_throw_on_failure_test_ test gtest_no_exception)
+    set_target_properties(gtest_throw_on_failure_test_
+      PROPERTIES
+      COMPILE_FLAGS "${cxx_no_exception}")
+    py_test(gtest_throw_on_failure_test)
+  endif()
+
+  cxx_executable(gtest_uninitialized_test_ test gtest)
+  py_test(gtest_uninitialized_test)
+
+  cxx_executable(gtest_xml_outfile1_test_ test gtest_main)
+  cxx_executable(gtest_xml_outfile2_test_ test gtest_main)
+  py_test(gtest_xml_outfiles_test)
+
+  cxx_executable(gtest_xml_output_unittest_ test gtest)
+  py_test(gtest_xml_output_unittest)
+endif()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/CONTRIBUTORS b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/CONTRIBUTORS
new file mode 100644
index 0000000000..feae2fc044
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/CONTRIBUTORS
@@ -0,0 +1,37 @@
+# This file contains a list of people who've made non-trivial
+# contribution to the Google C++ Testing Framework project.  People
+# who commit code to the project are encouraged to add their names
+# here.  Please keep the list sorted by first names.
+
+Ajay Joshi <jaj@google.com>
+Balázs Dán <balazs.dan@gmail.com>
+Bharat Mediratta <bharat@menalto.com>
+Chandler Carruth <chandlerc@google.com>
+Chris Prince <cprince@google.com>
+Chris Taylor <taylorc@google.com>
+Dan Egnor <egnor@google.com>
+Eric Roman <eroman@chromium.org>
+Hady Zalek <hady.zalek@gmail.com>
+Jeffrey Yasskin <jyasskin@google.com>
+Jói Sigurðsson <joi@google.com>
+Keir Mierle <mierle@gmail.com>
+Keith Ray <keith.ray@gmail.com>
+Kenton Varda <kenton@google.com>
+Manuel Klimek <klimek@google.com>
+Markus Heule <markus.heule@gmail.com>
+Mika Raento <mikie@iki.fi>
+Miklós Fazekas <mfazekas@szemafor.com>
+Pasi Valminen <pasi.valminen@gmail.com>
+Patrick Hanna <phanna@google.com>
+Patrick Riley <pfr@google.com>
+Peter Kaminski <piotrk@google.com>
+Preston Jackson <preston.a.jackson@gmail.com>
+Rainer Klaffenboeck <rainer.klaffenboeck@dynatrace.com>
+Russ Cox <rsc@google.com>
+Russ Rufer <russ@pentad.com>
+Sean Mcafee <eefacm@gmail.com>
+Sigurður Ásgeirsson <siggi@google.com>
+Tracy Bialik <tracy@pentad.com>
+Vadim Berman <vadimb@google.com>
+Vlad Losev <vladl@google.com>
+Zhanyong Wan <wan@google.com>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/LICENSE b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/LICENSE
new file mode 100644
index 0000000000..1941a11f8c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/LICENSE
@@ -0,0 +1,28 @@
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/Makefile.am b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/Makefile.am
new file mode 100644
index 0000000000..29797e4e9d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/Makefile.am
@@ -0,0 +1,310 @@
+# Automake file
+
+ACLOCAL_AMFLAGS = -I m4
+
+# Nonstandard package files for distribution
+EXTRA_DIST = \
+  CHANGES \
+  CONTRIBUTORS \
+  LICENSE \
+  include/gtest/gtest-param-test.h.pump \
+  include/gtest/internal/gtest-param-util-generated.h.pump \
+  include/gtest/internal/gtest-tuple.h.pump \
+  include/gtest/internal/gtest-type-util.h.pump \
+  make/Makefile \
+  scripts/fuse_gtest_files.py \
+  scripts/gen_gtest_pred_impl.py \
+  scripts/pump.py \
+  scripts/test/Makefile
+
+# gtest source files that we don't compile directly.  They are
+# #included by gtest-all.cc.
+GTEST_SRC = \
+  src/gtest-death-test.cc \
+  src/gtest-filepath.cc \
+  src/gtest-internal-inl.h \
+  src/gtest-port.cc \
+  src/gtest-printers.cc \
+  src/gtest-test-part.cc \
+  src/gtest-typed-test.cc \
+  src/gtest.cc
+
+EXTRA_DIST += $(GTEST_SRC)
+
+# Sample files that we don't compile.
+EXTRA_DIST += \
+  samples/prime_tables.h \
+  samples/sample2_unittest.cc \
+  samples/sample3_unittest.cc \
+  samples/sample4_unittest.cc \
+  samples/sample5_unittest.cc \
+  samples/sample6_unittest.cc \
+  samples/sample7_unittest.cc \
+  samples/sample8_unittest.cc \
+  samples/sample9_unittest.cc
+
+# C++ test files that we don't compile directly.
+EXTRA_DIST += \
+  test/gtest-death-test_ex_test.cc \
+  test/gtest-death-test_test.cc \
+  test/gtest-filepath_test.cc \
+  test/gtest-linked_ptr_test.cc \
+  test/gtest-listener_test.cc \
+  test/gtest-message_test.cc \
+  test/gtest-options_test.cc \
+  test/gtest-param-test2_test.cc \
+  test/gtest-param-test2_test.cc \
+  test/gtest-param-test_test.cc \
+  test/gtest-param-test_test.cc \
+  test/gtest-param-test_test.h \
+  test/gtest-port_test.cc \
+  test/gtest_premature_exit_test.cc \
+  test/gtest-printers_test.cc \
+  test/gtest-test-part_test.cc \
+  test/gtest-tuple_test.cc \
+  test/gtest-typed-test2_test.cc \
+  test/gtest-typed-test_test.cc \
+  test/gtest-typed-test_test.h \
+  test/gtest-unittest-api_test.cc \
+  test/gtest_break_on_failure_unittest_.cc \
+  test/gtest_catch_exceptions_test_.cc \
+  test/gtest_color_test_.cc \
+  test/gtest_env_var_test_.cc \
+  test/gtest_environment_test.cc \
+  test/gtest_filter_unittest_.cc \
+  test/gtest_help_test_.cc \
+  test/gtest_list_tests_unittest_.cc \
+  test/gtest_main_unittest.cc \
+  test/gtest_no_test_unittest.cc \
+  test/gtest_output_test_.cc \
+  test/gtest_pred_impl_unittest.cc \
+  test/gtest_prod_test.cc \
+  test/gtest_repeat_test.cc \
+  test/gtest_shuffle_test_.cc \
+  test/gtest_sole_header_test.cc \
+  test/gtest_stress_test.cc \
+  test/gtest_throw_on_failure_ex_test.cc \
+  test/gtest_throw_on_failure_test_.cc \
+  test/gtest_uninitialized_test_.cc \
+  test/gtest_unittest.cc \
+  test/gtest_unittest.cc \
+  test/gtest_xml_outfile1_test_.cc \
+  test/gtest_xml_outfile2_test_.cc \
+  test/gtest_xml_output_unittest_.cc \
+  test/production.cc \
+  test/production.h
+
+# Python tests that we don't run.
+EXTRA_DIST += \
+  test/gtest_break_on_failure_unittest.py \
+  test/gtest_catch_exceptions_test.py \
+  test/gtest_color_test.py \
+  test/gtest_env_var_test.py \
+  test/gtest_filter_unittest.py \
+  test/gtest_help_test.py \
+  test/gtest_list_tests_unittest.py \
+  test/gtest_output_test.py \
+  test/gtest_output_test_golden_lin.txt \
+  test/gtest_shuffle_test.py \
+  test/gtest_test_utils.py \
+  test/gtest_throw_on_failure_test.py \
+  test/gtest_uninitialized_test.py \
+  test/gtest_xml_outfiles_test.py \
+  test/gtest_xml_output_unittest.py \
+  test/gtest_xml_test_utils.py
+
+# CMake script
+EXTRA_DIST += \
+  CMakeLists.txt \
+  cmake/internal_utils.cmake
+
+# MSVC project files
+EXTRA_DIST += \
+  msvc/gtest-md.sln \
+  msvc/gtest-md.vcproj \
+  msvc/gtest.sln \
+  msvc/gtest.vcproj \
+  msvc/gtest_main-md.vcproj \
+  msvc/gtest_main.vcproj \
+  msvc/gtest_prod_test-md.vcproj \
+  msvc/gtest_prod_test.vcproj \
+  msvc/gtest_unittest-md.vcproj \
+  msvc/gtest_unittest.vcproj
+
+# xcode project files
+EXTRA_DIST += \
+  xcode/Config/DebugProject.xcconfig \
+  xcode/Config/FrameworkTarget.xcconfig \
+  xcode/Config/General.xcconfig \
+  xcode/Config/ReleaseProject.xcconfig \
+  xcode/Config/StaticLibraryTarget.xcconfig \
+  xcode/Config/TestTarget.xcconfig \
+  xcode/Resources/Info.plist \
+  xcode/Scripts/runtests.sh \
+  xcode/Scripts/versiongenerate.py \
+  xcode/gtest.xcodeproj/project.pbxproj
+
+# xcode sample files
+EXTRA_DIST += \
+  xcode/Samples/FrameworkSample/Info.plist \
+  xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj \
+  xcode/Samples/FrameworkSample/runtests.sh \
+  xcode/Samples/FrameworkSample/widget.cc \
+  xcode/Samples/FrameworkSample/widget.h \
+  xcode/Samples/FrameworkSample/widget_test.cc
+
+# C++Builder project files
+EXTRA_DIST += \
+  codegear/gtest.cbproj \
+  codegear/gtest.groupproj \
+  codegear/gtest_all.cc \
+  codegear/gtest_link.cc \
+  codegear/gtest_main.cbproj \
+  codegear/gtest_unittest.cbproj
+
+# Distribute and install M4 macro
+m4datadir = $(datadir)/aclocal
+m4data_DATA = m4/gtest.m4
+EXTRA_DIST += $(m4data_DATA)
+
+# We define the global AM_CPPFLAGS as everything we compile includes from these
+# directories.
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include
+
+# Modifies compiler and linker flags for pthreads compatibility.
+if HAVE_PTHREADS
+  AM_CXXFLAGS = @PTHREAD_CFLAGS@ -DGTEST_HAS_PTHREAD=1
+  AM_LIBS = @PTHREAD_LIBS@
+else
+  AM_CXXFLAGS = -DGTEST_HAS_PTHREAD=0
+endif
+
+# Build rules for libraries.
+lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
+
+lib_libgtest_la_SOURCES = src/gtest-all.cc
+
+pkginclude_HEADERS = \
+  include/gtest/gtest-death-test.h \
+  include/gtest/gtest-message.h \
+  include/gtest/gtest-param-test.h \
+  include/gtest/gtest-printers.h \
+  include/gtest/gtest-spi.h \
+  include/gtest/gtest-test-part.h \
+  include/gtest/gtest-typed-test.h \
+  include/gtest/gtest.h \
+  include/gtest/gtest_pred_impl.h \
+  include/gtest/gtest_prod.h
+
+pkginclude_internaldir = $(pkgincludedir)/internal
+pkginclude_internal_HEADERS = \
+  include/gtest/internal/gtest-death-test-internal.h \
+  include/gtest/internal/gtest-filepath.h \
+  include/gtest/internal/gtest-internal.h \
+  include/gtest/internal/gtest-linked_ptr.h \
+  include/gtest/internal/gtest-param-util-generated.h \
+  include/gtest/internal/gtest-param-util.h \
+  include/gtest/internal/gtest-port.h \
+  include/gtest/internal/gtest-port-arch.h \
+  include/gtest/internal/gtest-string.h \
+  include/gtest/internal/gtest-tuple.h \
+  include/gtest/internal/gtest-type-util.h \
+  include/gtest/internal/custom/gtest.h \
+  include/gtest/internal/custom/gtest-port.h \
+  include/gtest/internal/custom/gtest-printers.h
+
+lib_libgtest_main_la_SOURCES = src/gtest_main.cc
+lib_libgtest_main_la_LIBADD = lib/libgtest.la
+
+# Bulid rules for samples and tests. Automake's naming for some of
+# these variables isn't terribly obvious, so this is a brief
+# reference:
+#
+# TESTS -- Programs run automatically by "make check"
+# check_PROGRAMS -- Programs built by "make check" but not necessarily run
+
+noinst_LTLIBRARIES = samples/libsamples.la
+
+samples_libsamples_la_SOURCES = \
+  samples/sample1.cc \
+  samples/sample1.h \
+  samples/sample2.cc \
+  samples/sample2.h \
+  samples/sample3-inl.h \
+  samples/sample4.cc \
+  samples/sample4.h
+
+TESTS=
+TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \
+                    GTEST_BUILD_DIR="$(top_builddir)/test"
+check_PROGRAMS=
+
+# A simple sample on using gtest.
+TESTS += samples/sample1_unittest
+check_PROGRAMS += samples/sample1_unittest
+samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc
+samples_sample1_unittest_LDADD = lib/libgtest_main.la \
+                                 lib/libgtest.la \
+                                 samples/libsamples.la
+
+# Another sample.  It also verifies that libgtest works.
+TESTS += samples/sample10_unittest
+check_PROGRAMS += samples/sample10_unittest
+samples_sample10_unittest_SOURCES = samples/sample10_unittest.cc
+samples_sample10_unittest_LDADD = lib/libgtest.la
+
+# This tests most constructs of gtest and verifies that libgtest_main
+# and libgtest work.
+TESTS += test/gtest_all_test
+check_PROGRAMS += test/gtest_all_test
+test_gtest_all_test_SOURCES = test/gtest_all_test.cc
+test_gtest_all_test_LDADD = lib/libgtest_main.la \
+                            lib/libgtest.la
+
+# Tests that fused gtest files compile and work.
+FUSED_GTEST_SRC = \
+  fused-src/gtest/gtest-all.cc \
+  fused-src/gtest/gtest.h \
+  fused-src/gtest/gtest_main.cc
+
+if HAVE_PYTHON
+TESTS += test/fused_gtest_test
+check_PROGRAMS += test/fused_gtest_test
+test_fused_gtest_test_SOURCES = $(FUSED_GTEST_SRC) \
+                                samples/sample1.cc samples/sample1_unittest.cc
+test_fused_gtest_test_CPPFLAGS = -I"$(srcdir)/fused-src"
+
+# Build rules for putting fused Google Test files into the distribution
+# package. The user can also create those files by manually running
+# scripts/fuse_gtest_files.py.
+$(test_fused_gtest_test_SOURCES): fused-gtest
+
+fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
+             $(GTEST_SRC) src/gtest-all.cc src/gtest_main.cc \
+             scripts/fuse_gtest_files.py
+	mkdir -p "$(srcdir)/fused-src"
+	chmod -R u+w "$(srcdir)/fused-src"
+	rm -f "$(srcdir)/fused-src/gtest/gtest-all.cc"
+	rm -f "$(srcdir)/fused-src/gtest/gtest.h"
+	"$(srcdir)/scripts/fuse_gtest_files.py" "$(srcdir)/fused-src"
+	cp -f "$(srcdir)/src/gtest_main.cc" "$(srcdir)/fused-src/gtest/"
+
+maintainer-clean-local:
+	rm -rf "$(srcdir)/fused-src"
+endif
+
+# Death tests may produce core dumps in the build directory. In case
+# this happens, clean them to keep distcleancheck happy.
+CLEANFILES = core
+
+# Disables 'make install' as installing a compiled version of Google
+# Test can lead to undefined behavior due to violation of the
+# One-Definition Rule.
+
+install-exec-local:
+	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
+	false
+
+install-data-local:
+	echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system."
+	false
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/README.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/README.md
new file mode 100644
index 0000000000..edd4408054
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/README.md
@@ -0,0 +1,280 @@
+
+### Generic Build Instructions ###
+
+#### Setup ####
+
+To build Google Test and your tests that use it, you need to tell your
+build system where to find its headers and source files.  The exact
+way to do it depends on which build system you use, and is usually
+straightforward.
+
+#### Build ####
+
+Suppose you put Google Test in directory `${GTEST_DIR}`.  To build it,
+create a library build target (or a project as called by Visual Studio
+and Xcode) to compile
+
+    ${GTEST_DIR}/src/gtest-all.cc
+
+with `${GTEST_DIR}/include` in the system header search path and `${GTEST_DIR}`
+in the normal header search path.  Assuming a Linux-like system and gcc,
+something like the following will do:
+
+    g++ -isystem ${GTEST_DIR}/include -I${GTEST_DIR} \
+        -pthread -c ${GTEST_DIR}/src/gtest-all.cc
+    ar -rv libgtest.a gtest-all.o
+
+(We need `-pthread` as Google Test uses threads.)
+
+Next, you should compile your test source file with
+`${GTEST_DIR}/include` in the system header search path, and link it
+with gtest and any other necessary libraries:
+
+    g++ -isystem ${GTEST_DIR}/include -pthread path/to/your_test.cc libgtest.a \
+        -o your_test
+
+As an example, the make/ directory contains a Makefile that you can
+use to build Google Test on systems where GNU make is available
+(e.g. Linux, Mac OS X, and Cygwin).  It doesn't try to build Google
+Test's own tests.  Instead, it just builds the Google Test library and
+a sample test.  You can use it as a starting point for your own build
+script.
+
+If the default settings are correct for your environment, the
+following commands should succeed:
+
+    cd ${GTEST_DIR}/make
+    make
+    ./sample1_unittest
+
+If you see errors, try to tweak the contents of `make/Makefile` to make
+them go away.  There are instructions in `make/Makefile` on how to do
+it.
+
+### Using CMake ###
+
+Google Test comes with a CMake build script (
+[CMakeLists.txt](CMakeLists.txt)) that can be used on a wide range of platforms ("C" stands for
+cross-platform.). If you don't have CMake installed already, you can
+download it for free from <http://www.cmake.org/>.
+
+CMake works by generating native makefiles or build projects that can
+be used in the compiler environment of your choice.  The typical
+workflow starts with:
+
+    mkdir mybuild       # Create a directory to hold the build output.
+    cd mybuild
+    cmake ${GTEST_DIR}  # Generate native build scripts.
+
+If you want to build Google Test's samples, you should replace the
+last command with
+
+    cmake -Dgtest_build_samples=ON ${GTEST_DIR}
+
+If you are on a \*nix system, you should now see a Makefile in the
+current directory.  Just type 'make' to build gtest.
+
+If you use Windows and have Visual Studio installed, a `gtest.sln` file
+and several `.vcproj` files will be created.  You can then build them
+using Visual Studio.
+
+On Mac OS X with Xcode installed, a `.xcodeproj` file will be generated.
+
+### Legacy Build Scripts ###
+
+Before settling on CMake, we have been providing hand-maintained build
+projects/scripts for Visual Studio, Xcode, and Autotools.  While we
+continue to provide them for convenience, they are not actively
+maintained any more.  We highly recommend that you follow the
+instructions in the previous two sections to integrate Google Test
+with your existing build system.
+
+If you still need to use the legacy build scripts, here's how:
+
+The msvc\ folder contains two solutions with Visual C++ projects.
+Open the `gtest.sln` or `gtest-md.sln` file using Visual Studio, and you
+are ready to build Google Test the same way you build any Visual
+Studio project.  Files that have names ending with -md use DLL
+versions of Microsoft runtime libraries (the /MD or the /MDd compiler
+option).  Files without that suffix use static versions of the runtime
+libraries (the /MT or the /MTd option).  Please note that one must use
+the same option to compile both gtest and the test code.  If you use
+Visual Studio 2005 or above, we recommend the -md version as /MD is
+the default for new projects in these versions of Visual Studio.
+
+On Mac OS X, open the `gtest.xcodeproj` in the `xcode/` folder using
+Xcode.  Build the "gtest" target.  The universal binary framework will
+end up in your selected build directory (selected in the Xcode
+"Preferences..." -> "Building" pane and defaults to xcode/build).
+Alternatively, at the command line, enter:
+
+    xcodebuild
+
+This will build the "Release" configuration of gtest.framework in your
+default build location.  See the "xcodebuild" man page for more
+information about building different configurations and building in
+different locations.
+
+If you wish to use the Google Test Xcode project with Xcode 4.x and
+above, you need to either:
+
+ * update the SDK configuration options in xcode/Config/General.xconfig.
+   Comment options `SDKROOT`, `MACOS_DEPLOYMENT_TARGET`, and `GCC_VERSION`. If
+   you choose this route you lose the ability to target earlier versions
+   of MacOS X.
+ * Install an SDK for an earlier version. This doesn't appear to be
+   supported by Apple, but has been reported to work
+   (http://stackoverflow.com/questions/5378518).
+
+### Tweaking Google Test ###
+
+Google Test can be used in diverse environments.  The default
+configuration may not work (or may not work well) out of the box in
+some environments.  However, you can easily tweak Google Test by
+defining control macros on the compiler command line.  Generally,
+these macros are named like `GTEST_XYZ` and you define them to either 1
+or 0 to enable or disable a certain feature.
+
+We list the most frequently used macros below.  For a complete list,
+see file [include/gtest/internal/gtest-port.h](include/gtest/internal/gtest-port.h).
+
+### Choosing a TR1 Tuple Library ###
+
+Some Google Test features require the C++ Technical Report 1 (TR1)
+tuple library, which is not yet available with all compilers.  The
+good news is that Google Test implements a subset of TR1 tuple that's
+enough for its own need, and will automatically use this when the
+compiler doesn't provide TR1 tuple.
+
+Usually you don't need to care about which tuple library Google Test
+uses.  However, if your project already uses TR1 tuple, you need to
+tell Google Test to use the same TR1 tuple library the rest of your
+project uses, or the two tuple implementations will clash.  To do
+that, add
+
+    -DGTEST_USE_OWN_TR1_TUPLE=0
+
+to the compiler flags while compiling Google Test and your tests.  If
+you want to force Google Test to use its own tuple library, just add
+
+    -DGTEST_USE_OWN_TR1_TUPLE=1
+
+to the compiler flags instead.
+
+If you don't want Google Test to use tuple at all, add
+
+    -DGTEST_HAS_TR1_TUPLE=0
+
+and all features using tuple will be disabled.
+
+### Multi-threaded Tests ###
+
+Google Test is thread-safe where the pthread library is available.
+After `#include "gtest/gtest.h"`, you can check the `GTEST_IS_THREADSAFE`
+macro to see whether this is the case (yes if the macro is `#defined` to
+1, no if it's undefined.).
+
+If Google Test doesn't correctly detect whether pthread is available
+in your environment, you can force it with
+
+    -DGTEST_HAS_PTHREAD=1
+
+or
+
+    -DGTEST_HAS_PTHREAD=0
+
+When Google Test uses pthread, you may need to add flags to your
+compiler and/or linker to select the pthread library, or you'll get
+link errors.  If you use the CMake script or the deprecated Autotools
+script, this is taken care of for you.  If you use your own build
+script, you'll need to read your compiler and linker's manual to
+figure out what flags to add.
+
+### As a Shared Library (DLL) ###
+
+Google Test is compact, so most users can build and link it as a
+static library for the simplicity.  You can choose to use Google Test
+as a shared library (known as a DLL on Windows) if you prefer.
+
+To compile *gtest* as a shared library, add
+
+    -DGTEST_CREATE_SHARED_LIBRARY=1
+
+to the compiler flags.  You'll also need to tell the linker to produce
+a shared library instead - consult your linker's manual for how to do
+it.
+
+To compile your *tests* that use the gtest shared library, add
+
+    -DGTEST_LINKED_AS_SHARED_LIBRARY=1
+
+to the compiler flags.
+
+Note: while the above steps aren't technically necessary today when
+using some compilers (e.g. GCC), they may become necessary in the
+future, if we decide to improve the speed of loading the library (see
+<http://gcc.gnu.org/wiki/Visibility> for details).  Therefore you are
+recommended to always add the above flags when using Google Test as a
+shared library.  Otherwise a future release of Google Test may break
+your build script.
+
+### Avoiding Macro Name Clashes ###
+
+In C++, macros don't obey namespaces.  Therefore two libraries that
+both define a macro of the same name will clash if you `#include` both
+definitions.  In case a Google Test macro clashes with another
+library, you can force Google Test to rename its macro to avoid the
+conflict.
+
+Specifically, if both Google Test and some other code define macro
+FOO, you can add
+
+    -DGTEST_DONT_DEFINE_FOO=1
+
+to the compiler flags to tell Google Test to change the macro's name
+from `FOO` to `GTEST_FOO`.  Currently `FOO` can be `FAIL`, `SUCCEED`,
+or `TEST`.  For example, with `-DGTEST_DONT_DEFINE_TEST=1`, you'll
+need to write
+
+    GTEST_TEST(SomeTest, DoesThis) { ... }
+
+instead of
+
+    TEST(SomeTest, DoesThis) { ... }
+
+in order to define a test.
+
+## Developing Google Test ##
+
+This section discusses how to make your own changes to Google Test.
+
+### Testing Google Test Itself ###
+
+To make sure your changes work as intended and don't break existing
+functionality, you'll want to compile and run Google Test's own tests.
+For that you can use CMake:
+
+    mkdir mybuild
+    cd mybuild
+    cmake -Dgtest_build_tests=ON ${GTEST_DIR}
+
+Make sure you have Python installed, as some of Google Test's tests
+are written in Python.  If the cmake command complains about not being
+able to find Python (`Could NOT find PythonInterp (missing:
+PYTHON_EXECUTABLE)`), try telling it explicitly where your Python
+executable can be found:
+
+    cmake -DPYTHON_EXECUTABLE=path/to/python -Dgtest_build_tests=ON ${GTEST_DIR}
+
+Next, you can build Google Test and all of its own tests.  On \*nix,
+this is usually done by 'make'.  To run the tests, do
+
+    make test
+
+All tests should pass.
+
+Normally you don't need to worry about regenerating the source files,
+unless you need to modify them.  In that case, you should modify the
+corresponding .pump files instead and run the pump.py Python script to
+regenerate them.  You can find pump.py in the [scripts/](scripts/) directory.
+Read the [Pump manual](docs/PumpManual.md) for how to use it.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/build-aux/.keep b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/build-aux/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake
new file mode 100644
index 0000000000..777b91ed4b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake
@@ -0,0 +1,254 @@
+# Defines functions and macros useful for building Google Test and
+# Google Mock.
+#
+# Note:
+#
+# - This file will be run twice when building Google Mock (once via
+#   Google Test's CMakeLists.txt, and once via Google Mock's).
+#   Therefore it shouldn't have any side effects other than defining
+#   the functions and macros.
+#
+# - The functions/macros defined in this file may depend on Google
+#   Test and Google Mock's option() definitions, and thus must be
+#   called *after* the options have been defined.
+
+# Tweaks CMake's default compiler/linker settings to suit Google Test's needs.
+#
+# This must be a macro(), as inside a function string() can only
+# update variables in the function scope.
+macro(fix_default_compiler_settings_)
+  if (MSVC)
+    # For MSVC, CMake sets certain flags to defaults we want to override.
+    # This replacement code is taken from sample in the CMake Wiki at
+    # http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace.
+    foreach (flag_var
+             CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+             CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+      if (NOT BUILD_SHARED_LIBS AND NOT gtest_force_shared_crt)
+        # When Google Test is built as a shared library, it should also use
+        # shared runtime libraries.  Otherwise, it may end up with multiple
+        # copies of runtime library data in different modules, resulting in
+        # hard-to-find crashes. When it is built as a static library, it is
+        # preferable to use CRT as static libraries, as we don't have to rely
+        # on CRT DLLs being available. CMake always defaults to using shared
+        # CRT libraries, so we override that default here.
+        string(REPLACE "/MD" "-MT" ${flag_var} "${${flag_var}}")
+      endif()
+
+      # We prefer more strict warning checking for building Google Test.
+      # Replaces /W3 with /W4 in defaults.
+      string(REPLACE "/W3" "/W4" ${flag_var} "${${flag_var}}")
+    endforeach()
+  endif()
+endmacro()
+
+# Defines the compiler/linker flags used to build Google Test and
+# Google Mock.  You can tweak these definitions to suit your need.  A
+# variable's value is empty before it's explicitly assigned to.
+macro(config_compiler_and_linker)
+  if (NOT gtest_disable_pthreads)
+    # Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT.
+    find_package(Threads)
+  endif()
+
+  fix_default_compiler_settings_()
+  if (MSVC)
+    # Newlines inside flags variables break CMake's NMake generator.
+    # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds.
+    set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J -Zi")
+    if (MSVC_VERSION LESS 1400)  # 1400 is Visual Studio 2005
+      # Suppress spurious warnings MSVC 7.1 sometimes issues.
+      # Forcing value to bool.
+      set(cxx_base_flags "${cxx_base_flags} -wd4800")
+      # Copy constructor and assignment operator could not be generated.
+      set(cxx_base_flags "${cxx_base_flags} -wd4511 -wd4512")
+      # Compatibility warnings not applicable to Google Test.
+      # Resolved overload was found by argument-dependent lookup.
+      set(cxx_base_flags "${cxx_base_flags} -wd4675")
+    endif()
+    if (MSVC_VERSION LESS 1500)  # 1500 is Visual Studio 2008
+      # Conditional expression is constant.
+      # When compiling with /W4, we get several instances of C4127
+      # (Conditional expression is constant). In our code, we disable that
+      # warning on a case-by-case basis. However, on Visual Studio 2005,
+      # the warning fires on std::list. Therefore on that compiler and earlier,
+      # we disable the warning project-wide.
+      set(cxx_base_flags "${cxx_base_flags} -wd4127")
+    endif()
+    if (NOT (MSVC_VERSION LESS 1700))  # 1700 is Visual Studio 2012.
+      # Suppress "unreachable code" warning on VS 2012 and later.
+      # http://stackoverflow.com/questions/3232669 explains the issue.
+      set(cxx_base_flags "${cxx_base_flags} -wd4702")
+    endif()
+    if (NOT (MSVC_VERSION GREATER 1900))  # 1900 is Visual Studio 2015
+      # BigObj required for tests.
+      set(cxx_base_flags "${cxx_base_flags} -bigobj")
+    endif()
+
+    set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32")
+    set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN")
+    set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")
+    set(cxx_no_exception_flags "-D_HAS_EXCEPTIONS=0")
+    set(cxx_no_rtti_flags "-GR-")
+  elseif (CMAKE_COMPILER_IS_GNUCXX)
+    set(cxx_base_flags "-Wall -Wshadow")
+    set(cxx_exception_flags "-fexceptions")
+    set(cxx_no_exception_flags "-fno-exceptions")
+    # Until version 4.3.2, GCC doesn't define a macro to indicate
+    # whether RTTI is enabled.  Therefore we define GTEST_HAS_RTTI
+    # explicitly.
+    set(cxx_no_rtti_flags "-fno-rtti -DGTEST_HAS_RTTI=0")
+    set(cxx_strict_flags
+      "-Wextra -Wno-unused-parameter -Wno-missing-field-initializers")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
+    set(cxx_exception_flags "-features=except")
+    # Sun Pro doesn't provide macros to indicate whether exceptions and
+    # RTTI are enabled, so we define GTEST_HAS_* explicitly.
+    set(cxx_no_exception_flags "-features=no%except -DGTEST_HAS_EXCEPTIONS=0")
+    set(cxx_no_rtti_flags "-features=no%rtti -DGTEST_HAS_RTTI=0")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "VisualAge" OR
+      CMAKE_CXX_COMPILER_ID STREQUAL "XL")
+    # CMake 2.8 changes Visual Age's compiler ID to "XL".
+    set(cxx_exception_flags "-qeh")
+    set(cxx_no_exception_flags "-qnoeh")
+    # Until version 9.0, Visual Age doesn't define a macro to indicate
+    # whether RTTI is enabled.  Therefore we define GTEST_HAS_RTTI
+    # explicitly.
+    set(cxx_no_rtti_flags "-qnortti -DGTEST_HAS_RTTI=0")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "HP")
+    set(cxx_base_flags "-AA -mt")
+    set(cxx_exception_flags "-DGTEST_HAS_EXCEPTIONS=1")
+    set(cxx_no_exception_flags "+noeh -DGTEST_HAS_EXCEPTIONS=0")
+    # RTTI can not be disabled in HP aCC compiler.
+    set(cxx_no_rtti_flags "")
+  endif()
+
+  if (CMAKE_USE_PTHREADS_INIT)  # The pthreads library is available and allowed.
+    set(cxx_base_flags "${cxx_base_flags} -DGTEST_HAS_PTHREAD=1")
+  else()
+    set(cxx_base_flags "${cxx_base_flags} -DGTEST_HAS_PTHREAD=0")
+  endif()
+
+  # For building gtest's own tests and samples.
+  set(cxx_exception "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_exception_flags}")
+  set(cxx_no_exception
+    "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_no_exception_flags}")
+  set(cxx_default "${cxx_exception}")
+  set(cxx_no_rtti "${cxx_default} ${cxx_no_rtti_flags}")
+  set(cxx_use_own_tuple "${cxx_default} -DGTEST_USE_OWN_TR1_TUPLE=1")
+
+  # For building the gtest libraries.
+  set(cxx_strict "${cxx_default} ${cxx_strict_flags}")
+endmacro()
+
+# Defines the gtest & gtest_main libraries.  User tests should link
+# with one of them.
+function(cxx_library_with_type name type cxx_flags)
+  # type can be either STATIC or SHARED to denote a static or shared library.
+  # ARGN refers to additional arguments after 'cxx_flags'.
+  add_library(${name} ${type} ${ARGN})
+  set_target_properties(${name}
+    PROPERTIES
+    COMPILE_FLAGS "${cxx_flags}")
+  if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED")
+    set_target_properties(${name}
+      PROPERTIES
+      COMPILE_DEFINITIONS "GTEST_CREATE_SHARED_LIBRARY=1")
+  endif()
+  if (CMAKE_USE_PTHREADS_INIT)
+    target_link_libraries(${name} ${CMAKE_THREAD_LIBS_INIT})
+  endif()
+endfunction()
+
+########################################################################
+#
+# Helper functions for creating build targets.
+
+function(cxx_shared_library name cxx_flags)
+  cxx_library_with_type(${name} SHARED "${cxx_flags}" ${ARGN})
+endfunction()
+
+function(cxx_library name cxx_flags)
+  cxx_library_with_type(${name} "" "${cxx_flags}" ${ARGN})
+endfunction()
+
+# cxx_executable_with_flags(name cxx_flags libs srcs...)
+#
+# creates a named C++ executable that depends on the given libraries and
+# is built from the given source files with the given compiler flags.
+function(cxx_executable_with_flags name cxx_flags libs)
+  add_executable(${name} ${ARGN})
+  if (cxx_flags)
+    set_target_properties(${name}
+      PROPERTIES
+      COMPILE_FLAGS "${cxx_flags}")
+  endif()
+  if (BUILD_SHARED_LIBS)
+    set_target_properties(${name}
+      PROPERTIES
+      COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
+  endif()
+  # To support mixing linking in static and dynamic libraries, link each
+  # library in with an extra call to target_link_libraries.
+  foreach (lib "${libs}")
+    target_link_libraries(${name} ${lib})
+  endforeach()
+endfunction()
+
+# cxx_executable(name dir lib srcs...)
+#
+# creates a named target that depends on the given libs and is built
+# from the given source files.  dir/name.cc is implicitly included in
+# the source file list.
+function(cxx_executable name dir libs)
+  cxx_executable_with_flags(
+    ${name} "${cxx_default}" "${libs}" "${dir}/${name}.cc" ${ARGN})
+endfunction()
+
+# Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE.
+find_package(PythonInterp)
+
+# cxx_test_with_flags(name cxx_flags libs srcs...)
+#
+# creates a named C++ test that depends on the given libs and is built
+# from the given source files with the given compiler flags.
+function(cxx_test_with_flags name cxx_flags libs)
+  cxx_executable_with_flags(${name} "${cxx_flags}" "${libs}" ${ARGN})
+  add_test(${name} ${name})
+endfunction()
+
+# cxx_test(name libs srcs...)
+#
+# creates a named test target that depends on the given libs and is
+# built from the given source files.  Unlike cxx_test_with_flags,
+# test/name.cc is already implicitly included in the source file list.
+function(cxx_test name libs)
+  cxx_test_with_flags("${name}" "${cxx_default}" "${libs}"
+    "test/${name}.cc" ${ARGN})
+endfunction()
+
+# py_test(name)
+#
+# creates a Python test with the given name whose main module is in
+# test/name.py.  It does nothing if Python is not installed.
+function(py_test name)
+  # We are not supporting Python tests on Linux yet as they consider
+  # all Linux environments to be google3 and try to use google3 features.
+  if (PYTHONINTERP_FOUND)
+    # ${CMAKE_BINARY_DIR} is known at configuration time, so we can
+    # directly bind it from cmake. ${CTEST_CONFIGURATION_TYPE} is known
+    # only at ctest runtime (by calling ctest -c <Configuration>), so
+    # we have to escape $ to delay variable substitution here.
+    if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
+      add_test(
+        NAME ${name}
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
+            --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
+    else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
+      add_test(
+        ${name}
+        ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
+          --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE})
+    endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
+  endif()
+endfunction()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest.cbproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest.cbproj
new file mode 100644
index 0000000000..95c3054b85
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest.cbproj
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{bca37a72-5b07-46cf-b44e-89f8e06451a2}</ProjectGuid>
+    <Config Condition="'$(Config)'==''">Release</Config>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+    <Base>true</Base>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
+    <Base>true</Base>
+    <Cfg_1>true</Cfg_1>
+    <CfgParent>Base</CfgParent>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
+    <Base>true</Base>
+    <Cfg_2>true</Cfg_2>
+    <CfgParent>Base</CfgParent>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Base)'!=''">
+    <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+    <OutputExt>lib</OutputExt>
+    <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+    <Defines>NO_STRICT</Defines>
+    <DynamicRTL>true</DynamicRTL>
+    <UsePackages>true</UsePackages>
+    <ProjectType>CppStaticLibrary</ProjectType>
+    <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>
+    <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi</PackageImports>
+    <BCC_wpar>false</BCC_wpar>
+    <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</IncludePath>
+    <AllPackageLibs>rtl.lib;vcl.lib</AllPackageLibs>
+    <TLIB_PageSize>32</TLIB_PageSize>
+    <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</ILINK_LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Cfg_1)'!=''">
+    <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+    <DCC_Optimize>false</DCC_Optimize>
+    <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+    <Defines>_DEBUG;$(Defines)</Defines>
+    <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+    <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+    <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
+    <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+    <DCC_Define>DEBUG</DCC_Define>
+    <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+    <IntermediateOutputDir>Debug</IntermediateOutputDir>
+    <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+    <BCC_StackFrames>true</BCC_StackFrames>
+    <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+    <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+    <TASM_Debugging>Full</TASM_Debugging>
+    <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Cfg_2)'!=''">
+    <Defines>NDEBUG;$(Defines)</Defines>
+    <IntermediateOutputDir>Release</IntermediateOutputDir>
+    <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+    <TASM_Debugging>None</TASM_Debugging>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>
+    <Borland.ProjectType>CppStaticLibrary</Borland.ProjectType>
+    <BorlandProject>
+<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>
+      
+      
+      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
+    </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">1</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines><HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Count">1</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item0">32</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item1">16</HistoryLists_hlTLIB_PageSize></HistoryLists_hlTLIB_PageSize></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />
+  <ItemGroup>
+    <None Include="..\include\gtest\gtest-death-test.h">
+      <BuildOrder>3</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\gtest-message.h">
+      <BuildOrder>4</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\gtest-param-test.h">
+      <BuildOrder>5</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\gtest-spi.h">
+      <BuildOrder>6</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\gtest-test-part.h">
+      <BuildOrder>7</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\gtest-typed-test.h">
+      <BuildOrder>8</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\gtest.h">
+      <BuildOrder>0</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\gtest_pred_impl.h">
+      <BuildOrder>1</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\gtest_prod.h">
+      <BuildOrder>2</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\internal\gtest-death-test-internal.h">
+      <BuildOrder>9</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\internal\gtest-filepath.h">
+      <BuildOrder>10</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\internal\gtest-internal.h">
+      <BuildOrder>11</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\internal\gtest-linked_ptr.h">
+      <BuildOrder>12</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\internal\gtest-param-util-generated.h">
+      <BuildOrder>14</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\internal\gtest-param-util.h">
+      <BuildOrder>13</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\internal\gtest-port.h">
+      <BuildOrder>15</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\internal\gtest-string.h">
+      <BuildOrder>16</BuildOrder>
+    </None>
+    <None Include="..\include\gtest\internal\gtest-type-util.h">
+      <BuildOrder>17</BuildOrder>
+    </None>
+    <CppCompile Include="gtest_all.cc">
+      <BuildOrder>18</BuildOrder>
+    </CppCompile>
+    <BuildConfiguration Include="Debug">
+      <Key>Cfg_1</Key>
+    </BuildConfiguration>
+    <BuildConfiguration Include="Release">
+      <Key>Cfg_2</Key>
+    </BuildConfiguration>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest.groupproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest.groupproj
new file mode 100644
index 0000000000..faf31cab64
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest.groupproj
@@ -0,0 +1,54 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{c1d923e0-6cba-4332-9b6f-3420acbf5091}</ProjectGuid>
+  </PropertyGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Projects Include="gtest.cbproj" />
+    <Projects Include="gtest_main.cbproj" />
+    <Projects Include="gtest_unittest.cbproj" />
+  </ItemGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Default.Personality</Borland.Personality>
+    <Borland.ProjectType />
+    <BorlandProject>
+<BorlandProject xmlns=""><Default.Personality></Default.Personality></BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Target Name="gtest">
+    <MSBuild Projects="gtest.cbproj" Targets="" />
+  </Target>
+  <Target Name="gtest:Clean">
+    <MSBuild Projects="gtest.cbproj" Targets="Clean" />
+  </Target>
+  <Target Name="gtest:Make">
+    <MSBuild Projects="gtest.cbproj" Targets="Make" />
+  </Target>
+  <Target Name="gtest_main">
+    <MSBuild Projects="gtest_main.cbproj" Targets="" />
+  </Target>
+  <Target Name="gtest_main:Clean">
+    <MSBuild Projects="gtest_main.cbproj" Targets="Clean" />
+  </Target>
+  <Target Name="gtest_main:Make">
+    <MSBuild Projects="gtest_main.cbproj" Targets="Make" />
+  </Target>
+  <Target Name="gtest_unittest">
+    <MSBuild Projects="gtest_unittest.cbproj" Targets="" />
+  </Target>
+  <Target Name="gtest_unittest:Clean">
+    <MSBuild Projects="gtest_unittest.cbproj" Targets="Clean" />
+  </Target>
+  <Target Name="gtest_unittest:Make">
+    <MSBuild Projects="gtest_unittest.cbproj" Targets="Make" />
+  </Target>
+  <Target Name="Build">
+    <CallTarget Targets="gtest;gtest_main;gtest_unittest" />
+  </Target>
+  <Target Name="Clean">
+    <CallTarget Targets="gtest:Clean;gtest_main:Clean;gtest_unittest:Clean" />
+  </Target>
+  <Target Name="Make">
+    <CallTarget Targets="gtest:Make;gtest_main:Make;gtest_unittest:Make" />
+  </Target>
+  <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
+</Project>
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest_all.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest_all.cc
new file mode 100644
index 0000000000..121b2d80e8
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest_all.cc
@@ -0,0 +1,38 @@
+// Copyright 2009, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: Josh Kelley (joshkel@gmail.com)
+//
+// Google C++ Testing Framework (Google Test)
+//
+// C++Builder's IDE cannot build a static library from files with hyphens
+// in their name.  See http://qc.codegear.com/wc/qcmain.aspx?d=70977 .
+// This file serves as a workaround.
+
+#include "src/gtest-all.cc"
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest_link.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest_link.cc
new file mode 100644
index 0000000000..918eccd19b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest_link.cc
@@ -0,0 +1,40 @@
+// Copyright 2009, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: Josh Kelley (joshkel@gmail.com)
+//
+// Google C++ Testing Framework (Google Test)
+//
+// Links gtest.lib and gtest_main.lib into the current project in C++Builder.
+// This means that these libraries can't be renamed, but it's the only way to
+// ensure that Debug versus Release test builds are linked against the
+// appropriate Debug or Release build of the libraries.
+
+#pragma link "gtest.lib"
+#pragma link "gtest_main.lib"
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest_main.cbproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest_main.cbproj
new file mode 100644
index 0000000000..d76ce1398f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest_main.cbproj
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{bca37a72-5b07-46cf-b44e-89f8e06451a2}</ProjectGuid>
+    <Config Condition="'$(Config)'==''">Release</Config>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+    <Base>true</Base>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
+    <Base>true</Base>
+    <Cfg_1>true</Cfg_1>
+    <CfgParent>Base</CfgParent>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
+    <Base>true</Base>
+    <Cfg_2>true</Cfg_2>
+    <CfgParent>Base</CfgParent>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Base)'!=''">
+    <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+    <OutputExt>lib</OutputExt>
+    <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+    <Defines>NO_STRICT</Defines>
+    <DynamicRTL>true</DynamicRTL>
+    <UsePackages>true</UsePackages>
+    <ProjectType>CppStaticLibrary</ProjectType>
+    <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>
+    <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi</PackageImports>
+    <BCC_wpar>false</BCC_wpar>
+    <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</IncludePath>
+    <AllPackageLibs>rtl.lib;vcl.lib</AllPackageLibs>
+    <TLIB_PageSize>32</TLIB_PageSize>
+    <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</ILINK_LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Cfg_1)'!=''">
+    <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+    <DCC_Optimize>false</DCC_Optimize>
+    <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+    <Defines>_DEBUG;$(Defines)</Defines>
+    <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+    <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+    <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
+    <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+    <DCC_Define>DEBUG</DCC_Define>
+    <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+    <IntermediateOutputDir>Debug</IntermediateOutputDir>
+    <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+    <BCC_StackFrames>true</BCC_StackFrames>
+    <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+    <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+    <TASM_Debugging>Full</TASM_Debugging>
+    <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Cfg_2)'!=''">
+    <Defines>NDEBUG;$(Defines)</Defines>
+    <IntermediateOutputDir>Release</IntermediateOutputDir>
+    <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+    <TASM_Debugging>None</TASM_Debugging>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>
+    <Borland.ProjectType>CppStaticLibrary</Borland.ProjectType>
+    <BorlandProject>
+<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
+    </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">1</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines><HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Count">1</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item0">32</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item1">16</HistoryLists_hlTLIB_PageSize></HistoryLists_hlTLIB_PageSize></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />
+  <ItemGroup>
+    <CppCompile Include="..\src\gtest_main.cc">
+      <BuildOrder>0</BuildOrder>
+    </CppCompile>
+    <BuildConfiguration Include="Debug">
+      <Key>Cfg_1</Key>
+    </BuildConfiguration>
+    <BuildConfiguration Include="Release">
+      <Key>Cfg_2</Key>
+    </BuildConfiguration>
+  </ItemGroup>
+</Project>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest_unittest.cbproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest_unittest.cbproj
new file mode 100644
index 0000000000..dc5db8e4da
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/codegear/gtest_unittest.cbproj
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{eea63393-5ac5-4b9c-8909-d75fef2daa41}</ProjectGuid>
+    <Config Condition="'$(Config)'==''">Release</Config>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+    <Base>true</Base>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
+    <Base>true</Base>
+    <Cfg_1>true</Cfg_1>
+    <CfgParent>Base</CfgParent>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
+    <Base>true</Base>
+    <Cfg_2>true</Cfg_2>
+    <CfgParent>Base</CfgParent>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Base)'!=''">
+    <OutputExt>exe</OutputExt>
+    <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+    <Defines>NO_STRICT</Defines>
+    <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+    <DynamicRTL>true</DynamicRTL>
+    <ILINK_ObjectSearchPath>..\test</ILINK_ObjectSearchPath>
+    <UsePackages>true</UsePackages>
+    <ProjectType>CppConsoleApplication</ProjectType>
+    <NoVCL>true</NoVCL>
+    <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>
+    <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi</PackageImports>
+    <BCC_wpar>false</BCC_wpar>
+    <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..</IncludePath>
+    <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</ILINK_LibraryPath>
+    <Multithreaded>true</Multithreaded>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Cfg_1)'!=''">
+    <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+    <DCC_Optimize>false</DCC_Optimize>
+    <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+    <Defines>_DEBUG;$(Defines)</Defines>
+    <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+    <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+    <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
+    <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+    <DCC_Define>DEBUG</DCC_Define>
+    <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+    <IntermediateOutputDir>Debug</IntermediateOutputDir>
+    <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+    <BCC_StackFrames>true</BCC_StackFrames>
+    <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+    <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+    <TASM_Debugging>Full</TASM_Debugging>
+    <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Cfg_2)'!=''">
+    <Defines>NDEBUG;$(Defines)</Defines>
+    <IntermediateOutputDir>Release</IntermediateOutputDir>
+    <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+    <TASM_Debugging>None</TASM_Debugging>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>
+    <Borland.ProjectType>CppConsoleApplication</Borland.ProjectType>
+    <BorlandProject>
+<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>
+      
+      
+      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
+    </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item1">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item2">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(OUTPUTDIR);..\test</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">2</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item1">STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />
+  <ItemGroup>
+    <CppCompile Include="..\test\gtest_unittest.cc">
+      <BuildOrder>0</BuildOrder>
+    </CppCompile>
+    <CppCompile Include="gtest_link.cc">
+      <BuildOrder>1</BuildOrder>
+    </CppCompile>
+    <BuildConfiguration Include="Debug">
+      <Key>Cfg_1</Key>
+    </BuildConfiguration>
+    <BuildConfiguration Include="Release">
+      <Key>Cfg_2</Key>
+    </BuildConfiguration>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/configure.ac b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/configure.ac
new file mode 100644
index 0000000000..cc592e1583
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/configure.ac
@@ -0,0 +1,68 @@
+m4_include(m4/acx_pthread.m4)
+
+# At this point, the Xcode project assumes the version string will be three
+# integers separated by periods and surrounded by square brackets (e.g.
+# "[1.0.1]"). It also asumes that there won't be any closing parenthesis
+# between "AC_INIT(" and the closing ")" including comments and strings.
+AC_INIT([Google C++ Testing Framework],
+        [1.7.0],
+        [googletestframework@googlegroups.com],
+        [gtest])
+
+# Provide various options to initialize the Autoconf and configure processes.
+AC_PREREQ([2.59])
+AC_CONFIG_SRCDIR([./LICENSE])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_HEADERS([build-aux/config.h])
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([scripts/gtest-config], [chmod +x scripts/gtest-config])
+
+# Initialize Automake with various options. We require at least v1.9, prevent
+# pedantic complaints about package files, and enable various distribution
+# targets.
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 dist-zip foreign subdir-objects])
+
+# Check for programs used in building Google Test.
+AC_PROG_CC
+AC_PROG_CXX
+AC_LANG([C++])
+AC_PROG_LIBTOOL
+
+# TODO(chandlerc@google.com): Currently we aren't running the Python tests
+# against the interpreter detected by AM_PATH_PYTHON, and so we condition
+# HAVE_PYTHON by requiring "python" to be in the PATH, and that interpreter's
+# version to be >= 2.3. This will allow the scripts to use a "/usr/bin/env"
+# hashbang.
+PYTHON=  # We *do not* allow the user to specify a python interpreter
+AC_PATH_PROG([PYTHON],[python],[:])
+AS_IF([test "$PYTHON" != ":"],
+      [AM_PYTHON_CHECK_VERSION([$PYTHON],[2.3],[:],[PYTHON=":"])])
+AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != ":"])
+
+# Configure pthreads.
+AC_ARG_WITH([pthreads],
+            [AS_HELP_STRING([--with-pthreads],
+               [use pthreads (default is yes)])],
+            [with_pthreads=$withval],
+            [with_pthreads=check])
+
+have_pthreads=no
+AS_IF([test "x$with_pthreads" != "xno"],
+      [ACX_PTHREAD(
+        [],
+        [AS_IF([test "x$with_pthreads" != "xcheck"],
+               [AC_MSG_FAILURE(
+                 [--with-pthreads was specified, but unable to be used])])])
+       have_pthreads="$acx_pthread_ok"])
+AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" = "xyes"])
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_LIBS)
+
+# TODO(chandlerc@google.com) Check for the necessary system headers.
+
+# TODO(chandlerc@google.com) Check the types, structures, and other compiler
+# and architecture characteristics.
+
+# Output the generated files. No further autoconf macros may be used.
+AC_OUTPUT
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/AdvancedGuide.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/AdvancedGuide.md
new file mode 100644
index 0000000000..93a65200da
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/AdvancedGuide.md
@@ -0,0 +1,2182 @@
+
+
+Now that you have read [Primer](Primer.md) and learned how to write tests
+using Google Test, it's time to learn some new tricks. This document
+will show you more assertions as well as how to construct complex
+failure messages, propagate fatal failures, reuse and speed up your
+test fixtures, and use various flags with your tests.
+
+# More Assertions #
+
+This section covers some less frequently used, but still significant,
+assertions.
+
+## Explicit Success and Failure ##
+
+These three assertions do not actually test a value or expression. Instead,
+they generate a success or failure directly. Like the macros that actually
+perform a test, you may stream a custom failure message into the them.
+
+| `SUCCEED();` |
+|:-------------|
+
+Generates a success. This does NOT make the overall test succeed. A test is
+considered successful only if none of its assertions fail during its execution.
+
+Note: `SUCCEED()` is purely documentary and currently doesn't generate any
+user-visible output. However, we may add `SUCCEED()` messages to Google Test's
+output in the future.
+
+| `FAIL();`  | `ADD_FAILURE();` | `ADD_FAILURE_AT("`_file\_path_`", `_line\_number_`);` |
+|:-----------|:-----------------|:------------------------------------------------------|
+
+`FAIL()` generates a fatal failure, while `ADD_FAILURE()` and `ADD_FAILURE_AT()` generate a nonfatal
+failure. These are useful when control flow, rather than a Boolean expression,
+deteremines the test's success or failure. For example, you might want to write
+something like:
+
+```
+switch(expression) {
+  case 1: ... some checks ...
+  case 2: ... some other checks
+  ...
+  default: FAIL() << "We shouldn't get here.";
+}
+```
+
+Note: you can only use `FAIL()` in functions that return `void`. See the [Assertion Placement section](#assertion-placement) for more information.
+
+_Availability_: Linux, Windows, Mac.
+
+## Exception Assertions ##
+
+These are for verifying that a piece of code throws (or does not
+throw) an exception of the given type:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_THROW(`_statement_, _exception\_type_`);`  | `EXPECT_THROW(`_statement_, _exception\_type_`);`  | _statement_ throws an exception of the given type  |
+| `ASSERT_ANY_THROW(`_statement_`);`                | `EXPECT_ANY_THROW(`_statement_`);`                | _statement_ throws an exception of any type        |
+| `ASSERT_NO_THROW(`_statement_`);`                 | `EXPECT_NO_THROW(`_statement_`);`                 | _statement_ doesn't throw any exception            |
+
+Examples:
+
+```
+ASSERT_THROW(Foo(5), bar_exception);
+
+EXPECT_NO_THROW({
+  int n = 5;
+  Bar(&n);
+});
+```
+
+_Availability_: Linux, Windows, Mac; since version 1.1.0.
+
+## Predicate Assertions for Better Error Messages ##
+
+Even though Google Test has a rich set of assertions, they can never be
+complete, as it's impossible (nor a good idea) to anticipate all the scenarios
+a user might run into. Therefore, sometimes a user has to use `EXPECT_TRUE()`
+to check a complex expression, for lack of a better macro. This has the problem
+of not showing you the values of the parts of the expression, making it hard to
+understand what went wrong. As a workaround, some users choose to construct the
+failure message by themselves, streaming it into `EXPECT_TRUE()`. However, this
+is awkward especially when the expression has side-effects or is expensive to
+evaluate.
+
+Google Test gives you three different options to solve this problem:
+
+### Using an Existing Boolean Function ###
+
+If you already have a function or a functor that returns `bool` (or a type
+that can be implicitly converted to `bool`), you can use it in a _predicate
+assertion_ to get the function arguments printed for free:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_PRED1(`_pred1, val1_`);`       | `EXPECT_PRED1(`_pred1, val1_`);` | _pred1(val1)_ returns true |
+| `ASSERT_PRED2(`_pred2, val1, val2_`);` | `EXPECT_PRED2(`_pred2, val1, val2_`);` |  _pred2(val1, val2)_ returns true |
+|  ...                | ...                    | ...          |
+
+In the above, _predn_ is an _n_-ary predicate function or functor, where
+_val1_, _val2_, ..., and _valn_ are its arguments. The assertion succeeds
+if the predicate returns `true` when applied to the given arguments, and fails
+otherwise. When the assertion fails, it prints the value of each argument. In
+either case, the arguments are evaluated exactly once.
+
+Here's an example. Given
+
+```
+// Returns true iff m and n have no common divisors except 1.
+bool MutuallyPrime(int m, int n) { ... }
+const int a = 3;
+const int b = 4;
+const int c = 10;
+```
+
+the assertion `EXPECT_PRED2(MutuallyPrime, a, b);` will succeed, while the
+assertion `EXPECT_PRED2(MutuallyPrime, b, c);` will fail with the message
+
+<pre>
+!MutuallyPrime(b, c) is false, where<br>
+b is 4<br>
+c is 10<br>
+</pre>
+
+**Notes:**
+
+  1. If you see a compiler error "no matching function to call" when using `ASSERT_PRED*` or `EXPECT_PRED*`, please see [this FAQ](FAQ.md#the-compiler-complains-no-matching-function-to-call-when-i-use-assert_predn-how-do-i-fix-it) for how to resolve it.
+  1. Currently we only provide predicate assertions of arity <= 5. If you need a higher-arity assertion, let us know.
+
+_Availability_: Linux, Windows, Mac
+
+### Using a Function That Returns an AssertionResult ###
+
+While `EXPECT_PRED*()` and friends are handy for a quick job, the
+syntax is not satisfactory: you have to use different macros for
+different arities, and it feels more like Lisp than C++.  The
+`::testing::AssertionResult` class solves this problem.
+
+An `AssertionResult` object represents the result of an assertion
+(whether it's a success or a failure, and an associated message).  You
+can create an `AssertionResult` using one of these factory
+functions:
+
+```
+namespace testing {
+
+// Returns an AssertionResult object to indicate that an assertion has
+// succeeded.
+AssertionResult AssertionSuccess();
+
+// Returns an AssertionResult object to indicate that an assertion has
+// failed.
+AssertionResult AssertionFailure();
+
+}
+```
+
+You can then use the `<<` operator to stream messages to the
+`AssertionResult` object.
+
+To provide more readable messages in Boolean assertions
+(e.g. `EXPECT_TRUE()`), write a predicate function that returns
+`AssertionResult` instead of `bool`. For example, if you define
+`IsEven()` as:
+
+```
+::testing::AssertionResult IsEven(int n) {
+  if ((n % 2) == 0)
+    return ::testing::AssertionSuccess();
+  else
+    return ::testing::AssertionFailure() << n << " is odd";
+}
+```
+
+instead of:
+
+```
+bool IsEven(int n) {
+  return (n % 2) == 0;
+}
+```
+
+the failed assertion `EXPECT_TRUE(IsEven(Fib(4)))` will print:
+
+<pre>
+Value of: IsEven(Fib(4))<br>
+Actual: false (*3 is odd*)<br>
+Expected: true<br>
+</pre>
+
+instead of a more opaque
+
+<pre>
+Value of: IsEven(Fib(4))<br>
+Actual: false<br>
+Expected: true<br>
+</pre>
+
+If you want informative messages in `EXPECT_FALSE` and `ASSERT_FALSE`
+as well, and are fine with making the predicate slower in the success
+case, you can supply a success message:
+
+```
+::testing::AssertionResult IsEven(int n) {
+  if ((n % 2) == 0)
+    return ::testing::AssertionSuccess() << n << " is even";
+  else
+    return ::testing::AssertionFailure() << n << " is odd";
+}
+```
+
+Then the statement `EXPECT_FALSE(IsEven(Fib(6)))` will print
+
+<pre>
+Value of: IsEven(Fib(6))<br>
+Actual: true (8 is even)<br>
+Expected: false<br>
+</pre>
+
+_Availability_: Linux, Windows, Mac; since version 1.4.1.
+
+### Using a Predicate-Formatter ###
+
+If you find the default message generated by `(ASSERT|EXPECT)_PRED*` and
+`(ASSERT|EXPECT)_(TRUE|FALSE)` unsatisfactory, or some arguments to your
+predicate do not support streaming to `ostream`, you can instead use the
+following _predicate-formatter assertions_ to _fully_ customize how the
+message is formatted:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_PRED_FORMAT1(`_pred\_format1, val1_`);`        | `EXPECT_PRED_FORMAT1(`_pred\_format1, val1_`);` | _pred\_format1(val1)_ is successful |
+| `ASSERT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | `EXPECT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | _pred\_format2(val1, val2)_ is successful |
+| `...`               | `...`                  | `...`        |
+
+The difference between this and the previous two groups of macros is that instead of
+a predicate, `(ASSERT|EXPECT)_PRED_FORMAT*` take a _predicate-formatter_
+(_pred\_formatn_), which is a function or functor with the signature:
+
+`::testing::AssertionResult PredicateFormattern(const char* `_expr1_`, const char* `_expr2_`, ... const char* `_exprn_`, T1 `_val1_`, T2 `_val2_`, ... Tn `_valn_`);`
+
+where _val1_, _val2_, ..., and _valn_ are the values of the predicate
+arguments, and _expr1_, _expr2_, ..., and _exprn_ are the corresponding
+expressions as they appear in the source code. The types `T1`, `T2`, ..., and
+`Tn` can be either value types or reference types. For example, if an
+argument has type `Foo`, you can declare it as either `Foo` or `const Foo&`,
+whichever is appropriate.
+
+A predicate-formatter returns a `::testing::AssertionResult` object to indicate
+whether the assertion has succeeded or not. The only way to create such an
+object is to call one of these factory functions:
+
+As an example, let's improve the failure message in the previous example, which uses `EXPECT_PRED2()`:
+
+```
+// Returns the smallest prime common divisor of m and n,
+// or 1 when m and n are mutually prime.
+int SmallestPrimeCommonDivisor(int m, int n) { ... }
+
+// A predicate-formatter for asserting that two integers are mutually prime.
+::testing::AssertionResult AssertMutuallyPrime(const char* m_expr,
+                                               const char* n_expr,
+                                               int m,
+                                               int n) {
+  if (MutuallyPrime(m, n))
+    return ::testing::AssertionSuccess();
+
+  return ::testing::AssertionFailure()
+      << m_expr << " and " << n_expr << " (" << m << " and " << n
+      << ") are not mutually prime, " << "as they have a common divisor "
+      << SmallestPrimeCommonDivisor(m, n);
+}
+```
+
+With this predicate-formatter, we can use
+
+```
+EXPECT_PRED_FORMAT2(AssertMutuallyPrime, b, c);
+```
+
+to generate the message
+
+<pre>
+b and c (4 and 10) are not mutually prime, as they have a common divisor 2.<br>
+</pre>
+
+As you may have realized, many of the assertions we introduced earlier are
+special cases of `(EXPECT|ASSERT)_PRED_FORMAT*`. In fact, most of them are
+indeed defined using `(EXPECT|ASSERT)_PRED_FORMAT*`.
+
+_Availability_: Linux, Windows, Mac.
+
+
+## Floating-Point Comparison ##
+
+Comparing floating-point numbers is tricky. Due to round-off errors, it is
+very unlikely that two floating-points will match exactly. Therefore,
+`ASSERT_EQ` 's naive comparison usually doesn't work. And since floating-points
+can have a wide value range, no single fixed error bound works. It's better to
+compare by a fixed relative error bound, except for values close to 0 due to
+the loss of precision there.
+
+In general, for floating-point comparison to make sense, the user needs to
+carefully choose the error bound. If they don't want or care to, comparing in
+terms of Units in the Last Place (ULPs) is a good default, and Google Test
+provides assertions to do this. Full details about ULPs are quite long; if you
+want to learn more, see
+[this article on float comparison](http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm).
+
+### Floating-Point Macros ###
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_FLOAT_EQ(`_val1, val2_`);`  | `EXPECT_FLOAT_EQ(`_val1, val2_`);` | the two `float` values are almost equal |
+| `ASSERT_DOUBLE_EQ(`_val1, val2_`);` | `EXPECT_DOUBLE_EQ(`_val1, val2_`);` | the two `double` values are almost equal |
+
+By "almost equal", we mean the two values are within 4 ULP's from each
+other.
+
+The following assertions allow you to choose the acceptable error bound:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_NEAR(`_val1, val2, abs\_error_`);` | `EXPECT_NEAR`_(val1, val2, abs\_error_`);` | the difference between _val1_ and _val2_ doesn't exceed the given absolute error |
+
+_Availability_: Linux, Windows, Mac.
+
+### Floating-Point Predicate-Format Functions ###
+
+Some floating-point operations are useful, but not that often used. In order
+to avoid an explosion of new macros, we provide them as predicate-format
+functions that can be used in predicate assertion macros (e.g.
+`EXPECT_PRED_FORMAT2`, etc).
+
+```
+EXPECT_PRED_FORMAT2(::testing::FloatLE, val1, val2);
+EXPECT_PRED_FORMAT2(::testing::DoubleLE, val1, val2);
+```
+
+Verifies that _val1_ is less than, or almost equal to, _val2_. You can
+replace `EXPECT_PRED_FORMAT2` in the above table with `ASSERT_PRED_FORMAT2`.
+
+_Availability_: Linux, Windows, Mac.
+
+## Windows HRESULT assertions ##
+
+These assertions test for `HRESULT` success or failure.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_HRESULT_SUCCEEDED(`_expression_`);` | `EXPECT_HRESULT_SUCCEEDED(`_expression_`);` | _expression_ is a success `HRESULT` |
+| `ASSERT_HRESULT_FAILED(`_expression_`);`    | `EXPECT_HRESULT_FAILED(`_expression_`);`    | _expression_ is a failure `HRESULT` |
+
+The generated output contains the human-readable error message
+associated with the `HRESULT` code returned by _expression_.
+
+You might use them like this:
+
+```
+CComPtr shell;
+ASSERT_HRESULT_SUCCEEDED(shell.CoCreateInstance(L"Shell.Application"));
+CComVariant empty;
+ASSERT_HRESULT_SUCCEEDED(shell->ShellExecute(CComBSTR(url), empty, empty, empty, empty));
+```
+
+_Availability_: Windows.
+
+## Type Assertions ##
+
+You can call the function
+```
+::testing::StaticAssertTypeEq<T1, T2>();
+```
+to assert that types `T1` and `T2` are the same.  The function does
+nothing if the assertion is satisfied.  If the types are different,
+the function call will fail to compile, and the compiler error message
+will likely (depending on the compiler) show you the actual values of
+`T1` and `T2`.  This is mainly useful inside template code.
+
+_Caveat:_ When used inside a member function of a class template or a
+function template, `StaticAssertTypeEq<T1, T2>()` is effective _only if_
+the function is instantiated.  For example, given:
+```
+template <typename T> class Foo {
+ public:
+  void Bar() { ::testing::StaticAssertTypeEq<int, T>(); }
+};
+```
+the code:
+```
+void Test1() { Foo<bool> foo; }
+```
+will _not_ generate a compiler error, as `Foo<bool>::Bar()` is never
+actually instantiated.  Instead, you need:
+```
+void Test2() { Foo<bool> foo; foo.Bar(); }
+```
+to cause a compiler error.
+
+_Availability:_ Linux, Windows, Mac; since version 1.3.0.
+
+## Assertion Placement ##
+
+You can use assertions in any C++ function. In particular, it doesn't
+have to be a method of the test fixture class. The one constraint is
+that assertions that generate a fatal failure (`FAIL*` and `ASSERT_*`)
+can only be used in void-returning functions. This is a consequence of
+Google Test not using exceptions. By placing it in a non-void function
+you'll get a confusing compile error like
+`"error: void value not ignored as it ought to be"`.
+
+If you need to use assertions in a function that returns non-void, one option
+is to make the function return the value in an out parameter instead. For
+example, you can rewrite `T2 Foo(T1 x)` to `void Foo(T1 x, T2* result)`. You
+need to make sure that `*result` contains some sensible value even when the
+function returns prematurely. As the function now returns `void`, you can use
+any assertion inside of it.
+
+If changing the function's type is not an option, you should just use
+assertions that generate non-fatal failures, such as `ADD_FAILURE*` and
+`EXPECT_*`.
+
+_Note_: Constructors and destructors are not considered void-returning
+functions, according to the C++ language specification, and so you may not use
+fatal assertions in them. You'll get a compilation error if you try. A simple
+workaround is to transfer the entire body of the constructor or destructor to a
+private void-returning method. However, you should be aware that a fatal
+assertion failure in a constructor does not terminate the current test, as your
+intuition might suggest; it merely returns from the constructor early, possibly
+leaving your object in a partially-constructed state. Likewise, a fatal
+assertion failure in a destructor may leave your object in a
+partially-destructed state. Use assertions carefully in these situations!
+
+# Teaching Google Test How to Print Your Values #
+
+When a test assertion such as `EXPECT_EQ` fails, Google Test prints the
+argument values to help you debug.  It does this using a
+user-extensible value printer.
+
+This printer knows how to print built-in C++ types, native arrays, STL
+containers, and any type that supports the `<<` operator.  For other
+types, it prints the raw bytes in the value and hopes that you the
+user can figure it out.
+
+As mentioned earlier, the printer is _extensible_.  That means
+you can teach it to do a better job at printing your particular type
+than to dump the bytes.  To do that, define `<<` for your type:
+
+```
+#include <iostream>
+
+namespace foo {
+
+class Bar { ... };  // We want Google Test to be able to print instances of this.
+
+// It's important that the << operator is defined in the SAME
+// namespace that defines Bar.  C++'s look-up rules rely on that.
+::std::ostream& operator<<(::std::ostream& os, const Bar& bar) {
+  return os << bar.DebugString();  // whatever needed to print bar to os
+}
+
+}  // namespace foo
+```
+
+Sometimes, this might not be an option: your team may consider it bad
+style to have a `<<` operator for `Bar`, or `Bar` may already have a
+`<<` operator that doesn't do what you want (and you cannot change
+it).  If so, you can instead define a `PrintTo()` function like this:
+
+```
+#include <iostream>
+
+namespace foo {
+
+class Bar { ... };
+
+// It's important that PrintTo() is defined in the SAME
+// namespace that defines Bar.  C++'s look-up rules rely on that.
+void PrintTo(const Bar& bar, ::std::ostream* os) {
+  *os << bar.DebugString();  // whatever needed to print bar to os
+}
+
+}  // namespace foo
+```
+
+If you have defined both `<<` and `PrintTo()`, the latter will be used
+when Google Test is concerned.  This allows you to customize how the value
+appears in Google Test's output without affecting code that relies on the
+behavior of its `<<` operator.
+
+If you want to print a value `x` using Google Test's value printer
+yourself, just call `::testing::PrintToString(`_x_`)`, which
+returns an `std::string`:
+
+```
+vector<pair<Bar, int> > bar_ints = GetBarIntVector();
+
+EXPECT_TRUE(IsCorrectBarIntVector(bar_ints))
+    << "bar_ints = " << ::testing::PrintToString(bar_ints);
+```
+
+# Death Tests #
+
+In many applications, there are assertions that can cause application failure
+if a condition is not met. These sanity checks, which ensure that the program
+is in a known good state, are there to fail at the earliest possible time after
+some program state is corrupted. If the assertion checks the wrong condition,
+then the program may proceed in an erroneous state, which could lead to memory
+corruption, security holes, or worse. Hence it is vitally important to test
+that such assertion statements work as expected.
+
+Since these precondition checks cause the processes to die, we call such tests
+_death tests_. More generally, any test that checks that a program terminates
+(except by throwing an exception) in an expected fashion is also a death test.
+
+Note that if a piece of code throws an exception, we don't consider it "death"
+for the purpose of death tests, as the caller of the code could catch the exception
+and avoid the crash. If you want to verify exceptions thrown by your code,
+see [Exception Assertions](#exception-assertions).
+
+If you want to test `EXPECT_*()/ASSERT_*()` failures in your test code, see [Catching Failures](#catching-failures).
+
+## How to Write a Death Test ##
+
+Google Test has the following macros to support death tests:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_DEATH(`_statement, regex_`);` | `EXPECT_DEATH(`_statement, regex_`);` | _statement_ crashes with the given error |
+| `ASSERT_DEATH_IF_SUPPORTED(`_statement, regex_`);` | `EXPECT_DEATH_IF_SUPPORTED(`_statement, regex_`);` | if death tests are supported, verifies that _statement_ crashes with the given error; otherwise verifies nothing |
+| `ASSERT_EXIT(`_statement, predicate, regex_`);` | `EXPECT_EXIT(`_statement, predicate, regex_`);` |_statement_ exits with the given error and its exit code matches _predicate_ |
+
+where _statement_ is a statement that is expected to cause the process to
+die, _predicate_ is a function or function object that evaluates an integer
+exit status, and _regex_ is a regular expression that the stderr output of
+_statement_ is expected to match. Note that _statement_ can be _any valid
+statement_ (including _compound statement_) and doesn't have to be an
+expression.
+
+As usual, the `ASSERT` variants abort the current test function, while the
+`EXPECT` variants do not.
+
+**Note:** We use the word "crash" here to mean that the process
+terminates with a _non-zero_ exit status code.  There are two
+possibilities: either the process has called `exit()` or `_exit()`
+with a non-zero value, or it may be killed by a signal.
+
+This means that if _statement_ terminates the process with a 0 exit
+code, it is _not_ considered a crash by `EXPECT_DEATH`.  Use
+`EXPECT_EXIT` instead if this is the case, or if you want to restrict
+the exit code more precisely.
+
+A predicate here must accept an `int` and return a `bool`. The death test
+succeeds only if the predicate returns `true`. Google Test defines a few
+predicates that handle the most common cases:
+
+```
+::testing::ExitedWithCode(exit_code)
+```
+
+This expression is `true` if the program exited normally with the given exit
+code.
+
+```
+::testing::KilledBySignal(signal_number)  // Not available on Windows.
+```
+
+This expression is `true` if the program was killed by the given signal.
+
+The `*_DEATH` macros are convenient wrappers for `*_EXIT` that use a predicate
+that verifies the process' exit code is non-zero.
+
+Note that a death test only cares about three things:
+
+  1. does _statement_ abort or exit the process?
+  1. (in the case of `ASSERT_EXIT` and `EXPECT_EXIT`) does the exit status satisfy _predicate_?  Or (in the case of `ASSERT_DEATH` and `EXPECT_DEATH`) is the exit status non-zero?  And
+  1. does the stderr output match _regex_?
+
+In particular, if _statement_ generates an `ASSERT_*` or `EXPECT_*` failure, it will **not** cause the death test to fail, as Google Test assertions don't abort the process.
+
+To write a death test, simply use one of the above macros inside your test
+function. For example,
+
+```
+TEST(MyDeathTest, Foo) {
+  // This death test uses a compound statement.
+  ASSERT_DEATH({ int n = 5; Foo(&n); }, "Error on line .* of Foo()");
+}
+TEST(MyDeathTest, NormalExit) {
+  EXPECT_EXIT(NormalExit(), ::testing::ExitedWithCode(0), "Success");
+}
+TEST(MyDeathTest, KillMyself) {
+  EXPECT_EXIT(KillMyself(), ::testing::KilledBySignal(SIGKILL), "Sending myself unblockable signal");
+}
+```
+
+verifies that:
+
+  * calling `Foo(5)` causes the process to die with the given error message,
+  * calling `NormalExit()` causes the process to print `"Success"` to stderr and exit with exit code 0, and
+  * calling `KillMyself()` kills the process with signal `SIGKILL`.
+
+The test function body may contain other assertions and statements as well, if
+necessary.
+
+_Important:_ We strongly recommend you to follow the convention of naming your
+test case (not test) `*DeathTest` when it contains a death test, as
+demonstrated in the above example. The `Death Tests And Threads` section below
+explains why.
+
+If a test fixture class is shared by normal tests and death tests, you
+can use typedef to introduce an alias for the fixture class and avoid
+duplicating its code:
+```
+class FooTest : public ::testing::Test { ... };
+
+typedef FooTest FooDeathTest;
+
+TEST_F(FooTest, DoesThis) {
+  // normal test
+}
+
+TEST_F(FooDeathTest, DoesThat) {
+  // death test
+}
+```
+
+_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Cygwin, and Mac (the latter three are supported since v1.3.0).  `(ASSERT|EXPECT)_DEATH_IF_SUPPORTED` are new in v1.4.0.
+
+## Regular Expression Syntax ##
+
+On POSIX systems (e.g. Linux, Cygwin, and Mac), Google Test uses the
+[POSIX extended regular expression](http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04)
+syntax in death tests. To learn about this syntax, you may want to read this [Wikipedia entry](http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions).
+
+On Windows, Google Test uses its own simple regular expression
+implementation. It lacks many features you can find in POSIX extended
+regular expressions.  For example, we don't support union (`"x|y"`),
+grouping (`"(xy)"`), brackets (`"[xy]"`), and repetition count
+(`"x{5,7}"`), among others. Below is what we do support (Letter `A` denotes a
+literal character, period (`.`), or a single `\\` escape sequence; `x`
+and `y` denote regular expressions.):
+
+| `c` | matches any literal character `c` |
+|:----|:----------------------------------|
+| `\\d` | matches any decimal digit         |
+| `\\D` | matches any character that's not a decimal digit |
+| `\\f` | matches `\f`                      |
+| `\\n` | matches `\n`                      |
+| `\\r` | matches `\r`                      |
+| `\\s` | matches any ASCII whitespace, including `\n` |
+| `\\S` | matches any character that's not a whitespace |
+| `\\t` | matches `\t`                      |
+| `\\v` | matches `\v`                      |
+| `\\w` | matches any letter, `_`, or decimal digit |
+| `\\W` | matches any character that `\\w` doesn't match |
+| `\\c` | matches any literal character `c`, which must be a punctuation |
+| `\\.` | matches the `.` character         |
+| `.` | matches any single character except `\n` |
+| `A?` | matches 0 or 1 occurrences of `A` |
+| `A*` | matches 0 or many occurrences of `A` |
+| `A+` | matches 1 or many occurrences of `A` |
+| `^` | matches the beginning of a string (not that of each line) |
+| `$` | matches the end of a string (not that of each line) |
+| `xy` | matches `x` followed by `y`       |
+
+To help you determine which capability is available on your system,
+Google Test defines macro `GTEST_USES_POSIX_RE=1` when it uses POSIX
+extended regular expressions, or `GTEST_USES_SIMPLE_RE=1` when it uses
+the simple version.  If you want your death tests to work in both
+cases, you can either `#if` on these macros or use the more limited
+syntax only.
+
+## How It Works ##
+
+Under the hood, `ASSERT_EXIT()` spawns a new process and executes the
+death test statement in that process. The details of of how precisely
+that happens depend on the platform and the variable
+`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the
+command-line flag `--gtest_death_test_style`).
+
+  * On POSIX systems, `fork()` (or `clone()` on Linux) is used to spawn the child, after which:
+    * If the variable's value is `"fast"`, the death test statement is immediately executed.
+    * If the variable's value is `"threadsafe"`, the child process re-executes the unit test binary just as it was originally invoked, but with some extra flags to cause just the single death test under consideration to be run.
+  * On Windows, the child is spawned using the `CreateProcess()` API, and re-executes the binary to cause just the single death test under consideration to be run - much like the `threadsafe` mode on POSIX.
+
+Other values for the variable are illegal and will cause the death test to
+fail. Currently, the flag's default value is `"fast"`. However, we reserve the
+right to change it in the future. Therefore, your tests should not depend on
+this.
+
+In either case, the parent process waits for the child process to complete, and checks that
+
+  1. the child's exit status satisfies the predicate, and
+  1. the child's stderr matches the regular expression.
+
+If the death test statement runs to completion without dying, the child
+process will nonetheless terminate, and the assertion fails.
+
+## Death Tests And Threads ##
+
+The reason for the two death test styles has to do with thread safety. Due to
+well-known problems with forking in the presence of threads, death tests should
+be run in a single-threaded context. Sometimes, however, it isn't feasible to
+arrange that kind of environment. For example, statically-initialized modules
+may start threads before main is ever reached. Once threads have been created,
+it may be difficult or impossible to clean them up.
+
+Google Test has three features intended to raise awareness of threading issues.
+
+  1. A warning is emitted if multiple threads are running when a death test is encountered.
+  1. Test cases with a name ending in "DeathTest" are run before all other tests.
+  1. It uses `clone()` instead of `fork()` to spawn the child process on Linux (`clone()` is not available on Cygwin and Mac), as `fork()` is more likely to cause the child to hang when the parent process has multiple threads.
+
+It's perfectly fine to create threads inside a death test statement; they are
+executed in a separate process and cannot affect the parent.
+
+## Death Test Styles ##
+
+The "threadsafe" death test style was introduced in order to help mitigate the
+risks of testing in a possibly multithreaded environment. It trades increased
+test execution time (potentially dramatically so) for improved thread safety.
+We suggest using the faster, default "fast" style unless your test has specific
+problems with it.
+
+You can choose a particular style of death tests by setting the flag
+programmatically:
+
+```
+::testing::FLAGS_gtest_death_test_style = "threadsafe";
+```
+
+You can do this in `main()` to set the style for all death tests in the
+binary, or in individual tests. Recall that flags are saved before running each
+test and restored afterwards, so you need not do that yourself. For example:
+
+```
+TEST(MyDeathTest, TestOne) {
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
+  // This test is run in the "threadsafe" style:
+  ASSERT_DEATH(ThisShouldDie(), "");
+}
+
+TEST(MyDeathTest, TestTwo) {
+  // This test is run in the "fast" style:
+  ASSERT_DEATH(ThisShouldDie(), "");
+}
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  ::testing::FLAGS_gtest_death_test_style = "fast";
+  return RUN_ALL_TESTS();
+}
+```
+
+## Caveats ##
+
+The _statement_ argument of `ASSERT_EXIT()` can be any valid C++ statement.
+If it leaves the current function via a `return` statement or by throwing an exception,
+the death test is considered to have failed.  Some Google Test macros may return
+from the current function (e.g. `ASSERT_TRUE()`), so be sure to avoid them in _statement_.
+
+Since _statement_ runs in the child process, any in-memory side effect (e.g.
+modifying a variable, releasing memory, etc) it causes will _not_ be observable
+in the parent process. In particular, if you release memory in a death test,
+your program will fail the heap check as the parent process will never see the
+memory reclaimed. To solve this problem, you can
+
+  1. try not to free memory in a death test;
+  1. free the memory again in the parent process; or
+  1. do not use the heap checker in your program.
+
+Due to an implementation detail, you cannot place multiple death test
+assertions on the same line; otherwise, compilation will fail with an unobvious
+error message.
+
+Despite the improved thread safety afforded by the "threadsafe" style of death
+test, thread problems such as deadlock are still possible in the presence of
+handlers registered with `pthread_atfork(3)`.
+
+# Using Assertions in Sub-routines #
+
+## Adding Traces to Assertions ##
+
+If a test sub-routine is called from several places, when an assertion
+inside it fails, it can be hard to tell which invocation of the
+sub-routine the failure is from.  You can alleviate this problem using
+extra logging or custom failure messages, but that usually clutters up
+your tests. A better solution is to use the `SCOPED_TRACE` macro:
+
+| `SCOPED_TRACE(`_message_`);` |
+|:-----------------------------|
+
+where _message_ can be anything streamable to `std::ostream`. This
+macro will cause the current file name, line number, and the given
+message to be added in every failure message. The effect will be
+undone when the control leaves the current lexical scope.
+
+For example,
+
+```
+10: void Sub1(int n) {
+11:   EXPECT_EQ(1, Bar(n));
+12:   EXPECT_EQ(2, Bar(n + 1));
+13: }
+14:
+15: TEST(FooTest, Bar) {
+16:   {
+17:     SCOPED_TRACE("A");  // This trace point will be included in
+18:                         // every failure in this scope.
+19:     Sub1(1);
+20:   }
+21:   // Now it won't.
+22:   Sub1(9);
+23: }
+```
+
+could result in messages like these:
+
+```
+path/to/foo_test.cc:11: Failure
+Value of: Bar(n)
+Expected: 1
+  Actual: 2
+   Trace:
+path/to/foo_test.cc:17: A
+
+path/to/foo_test.cc:12: Failure
+Value of: Bar(n + 1)
+Expected: 2
+  Actual: 3
+```
+
+Without the trace, it would've been difficult to know which invocation
+of `Sub1()` the two failures come from respectively. (You could add an
+extra message to each assertion in `Sub1()` to indicate the value of
+`n`, but that's tedious.)
+
+Some tips on using `SCOPED_TRACE`:
+
+  1. With a suitable message, it's often enough to use `SCOPED_TRACE` at the beginning of a sub-routine, instead of at each call site.
+  1. When calling sub-routines inside a loop, make the loop iterator part of the message in `SCOPED_TRACE` such that you can know which iteration the failure is from.
+  1. Sometimes the line number of the trace point is enough for identifying the particular invocation of a sub-routine. In this case, you don't have to choose a unique message for `SCOPED_TRACE`. You can simply use `""`.
+  1. You can use `SCOPED_TRACE` in an inner scope when there is one in the outer scope. In this case, all active trace points will be included in the failure messages, in reverse order they are encountered.
+  1. The trace dump is clickable in Emacs' compilation buffer - hit return on a line number and you'll be taken to that line in the source file!
+
+_Availability:_ Linux, Windows, Mac.
+
+## Propagating Fatal Failures ##
+
+A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that
+when they fail they only abort the _current function_, not the entire test. For
+example, the following test will segfault:
+```
+void Subroutine() {
+  // Generates a fatal failure and aborts the current function.
+  ASSERT_EQ(1, 2);
+  // The following won't be executed.
+  ...
+}
+
+TEST(FooTest, Bar) {
+  Subroutine();
+  // The intended behavior is for the fatal failure
+  // in Subroutine() to abort the entire test.
+  // The actual behavior: the function goes on after Subroutine() returns.
+  int* p = NULL;
+  *p = 3; // Segfault!
+}
+```
+
+Since we don't use exceptions, it is technically impossible to
+implement the intended behavior here.  To alleviate this, Google Test
+provides two solutions.  You could use either the
+`(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the
+`HasFatalFailure()` function.  They are described in the following two
+subsections.
+
+### Asserting on Subroutines ###
+
+As shown above, if your test calls a subroutine that has an `ASSERT_*`
+failure in it, the test will continue after the subroutine
+returns. This may not be what you want.
+
+Often people want fatal failures to propagate like exceptions.  For
+that Google Test offers the following macros:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_NO_FATAL_FAILURE(`_statement_`);` | `EXPECT_NO_FATAL_FAILURE(`_statement_`);` | _statement_ doesn't generate any new fatal failures in the current thread. |
+
+Only failures in the thread that executes the assertion are checked to
+determine the result of this type of assertions.  If _statement_
+creates new threads, failures in these threads are ignored.
+
+Examples:
+
+```
+ASSERT_NO_FATAL_FAILURE(Foo());
+
+int i;
+EXPECT_NO_FATAL_FAILURE({
+  i = Bar();
+});
+```
+
+_Availability:_ Linux, Windows, Mac. Assertions from multiple threads
+are currently not supported.
+
+### Checking for Failures in the Current Test ###
+
+`HasFatalFailure()` in the `::testing::Test` class returns `true` if an
+assertion in the current test has suffered a fatal failure. This
+allows functions to catch fatal failures in a sub-routine and return
+early.
+
+```
+class Test {
+ public:
+  ...
+  static bool HasFatalFailure();
+};
+```
+
+The typical usage, which basically simulates the behavior of a thrown
+exception, is:
+
+```
+TEST(FooTest, Bar) {
+  Subroutine();
+  // Aborts if Subroutine() had a fatal failure.
+  if (HasFatalFailure())
+    return;
+  // The following won't be executed.
+  ...
+}
+```
+
+If `HasFatalFailure()` is used outside of `TEST()` , `TEST_F()` , or a test
+fixture, you must add the `::testing::Test::` prefix, as in:
+
+```
+if (::testing::Test::HasFatalFailure())
+  return;
+```
+
+Similarly, `HasNonfatalFailure()` returns `true` if the current test
+has at least one non-fatal failure, and `HasFailure()` returns `true`
+if the current test has at least one failure of either kind.
+
+_Availability:_ Linux, Windows, Mac.  `HasNonfatalFailure()` and
+`HasFailure()` are available since version 1.4.0.
+
+# Logging Additional Information #
+
+In your test code, you can call `RecordProperty("key", value)` to log
+additional information, where `value` can be either a string or an `int`. The _last_ value recorded for a key will be emitted to the XML output
+if you specify one. For example, the test
+
+```
+TEST_F(WidgetUsageTest, MinAndMaxWidgets) {
+  RecordProperty("MaximumWidgets", ComputeMaxUsage());
+  RecordProperty("MinimumWidgets", ComputeMinUsage());
+}
+```
+
+will output XML like this:
+
+```
+...
+  <testcase name="MinAndMaxWidgets" status="run" time="6" classname="WidgetUsageTest"
+            MaximumWidgets="12"
+            MinimumWidgets="9" />
+...
+```
+
+_Note_:
+  * `RecordProperty()` is a static member of the `Test` class. Therefore it needs to be prefixed with `::testing::Test::` if used outside of the `TEST` body and the test fixture class.
+  * `key` must be a valid XML attribute name, and cannot conflict with the ones already used by Google Test (`name`, `status`, `time`, `classname`, `type_param`, and `value_param`).
+  * Calling `RecordProperty()` outside of the lifespan of a test is allowed. If it's called outside of a test but between a test case's `SetUpTestCase()` and `TearDownTestCase()` methods, it will be attributed to the XML element for the test case. If it's called outside of all test cases (e.g. in a test environment), it will be attributed to the top-level XML element.
+
+_Availability_: Linux, Windows, Mac.
+
+# Sharing Resources Between Tests in the Same Test Case #
+
+
+
+Google Test creates a new test fixture object for each test in order to make
+tests independent and easier to debug. However, sometimes tests use resources
+that are expensive to set up, making the one-copy-per-test model prohibitively
+expensive.
+
+If the tests don't change the resource, there's no harm in them sharing a
+single resource copy. So, in addition to per-test set-up/tear-down, Google Test
+also supports per-test-case set-up/tear-down. To use it:
+
+  1. In your test fixture class (say `FooTest` ), define as `static` some member variables to hold the shared resources.
+  1. In the same test fixture class, define a `static void SetUpTestCase()` function (remember not to spell it as **`SetupTestCase`** with a small `u`!) to set up the shared resources and a `static void TearDownTestCase()` function to tear them down.
+
+That's it! Google Test automatically calls `SetUpTestCase()` before running the
+_first test_ in the `FooTest` test case (i.e. before creating the first
+`FooTest` object), and calls `TearDownTestCase()` after running the _last test_
+in it (i.e. after deleting the last `FooTest` object). In between, the tests
+can use the shared resources.
+
+Remember that the test order is undefined, so your code can't depend on a test
+preceding or following another. Also, the tests must either not modify the
+state of any shared resource, or, if they do modify the state, they must
+restore the state to its original value before passing control to the next
+test.
+
+Here's an example of per-test-case set-up and tear-down:
+```
+class FooTest : public ::testing::Test {
+ protected:
+  // Per-test-case set-up.
+  // Called before the first test in this test case.
+  // Can be omitted if not needed.
+  static void SetUpTestCase() {
+    shared_resource_ = new ...;
+  }
+
+  // Per-test-case tear-down.
+  // Called after the last test in this test case.
+  // Can be omitted if not needed.
+  static void TearDownTestCase() {
+    delete shared_resource_;
+    shared_resource_ = NULL;
+  }
+
+  // You can define per-test set-up and tear-down logic as usual.
+  virtual void SetUp() { ... }
+  virtual void TearDown() { ... }
+
+  // Some expensive resource shared by all tests.
+  static T* shared_resource_;
+};
+
+T* FooTest::shared_resource_ = NULL;
+
+TEST_F(FooTest, Test1) {
+  ... you can refer to shared_resource here ...
+}
+TEST_F(FooTest, Test2) {
+  ... you can refer to shared_resource here ...
+}
+```
+
+_Availability:_ Linux, Windows, Mac.
+
+# Global Set-Up and Tear-Down #
+
+Just as you can do set-up and tear-down at the test level and the test case
+level, you can also do it at the test program level. Here's how.
+
+First, you subclass the `::testing::Environment` class to define a test
+environment, which knows how to set-up and tear-down:
+
+```
+class Environment {
+ public:
+  virtual ~Environment() {}
+  // Override this to define how to set up the environment.
+  virtual void SetUp() {}
+  // Override this to define how to tear down the environment.
+  virtual void TearDown() {}
+};
+```
+
+Then, you register an instance of your environment class with Google Test by
+calling the `::testing::AddGlobalTestEnvironment()` function:
+
+```
+Environment* AddGlobalTestEnvironment(Environment* env);
+```
+
+Now, when `RUN_ALL_TESTS()` is called, it first calls the `SetUp()` method of
+the environment object, then runs the tests if there was no fatal failures, and
+finally calls `TearDown()` of the environment object.
+
+It's OK to register multiple environment objects. In this case, their `SetUp()`
+will be called in the order they are registered, and their `TearDown()` will be
+called in the reverse order.
+
+Note that Google Test takes ownership of the registered environment objects.
+Therefore **do not delete them** by yourself.
+
+You should call `AddGlobalTestEnvironment()` before `RUN_ALL_TESTS()` is
+called, probably in `main()`. If you use `gtest_main`, you need to      call
+this before `main()` starts for it to take effect. One way to do this is to
+define a global variable like this:
+
+```
+::testing::Environment* const foo_env = ::testing::AddGlobalTestEnvironment(new FooEnvironment);
+```
+
+However, we strongly recommend you to write your own `main()` and call
+`AddGlobalTestEnvironment()` there, as relying on initialization of global
+variables makes the code harder to read and may cause problems when you
+register multiple environments from different translation units and the
+environments have dependencies among them (remember that the compiler doesn't
+guarantee the order in which global variables from different translation units
+are initialized).
+
+_Availability:_ Linux, Windows, Mac.
+
+
+# Value Parameterized Tests #
+
+_Value-parameterized tests_ allow you to test your code with different
+parameters without writing multiple copies of the same test.
+
+Suppose you write a test for your code and then realize that your code is affected by a presence of a Boolean command line flag.
+
+```
+TEST(MyCodeTest, TestFoo) {
+  // A code to test foo().
+}
+```
+
+Usually people factor their test code into a function with a Boolean parameter in such situations. The function sets the flag, then executes the testing code.
+
+```
+void TestFooHelper(bool flag_value) {
+  flag = flag_value;
+  // A code to test foo().
+}
+
+TEST(MyCodeTest, TestFoo) {
+  TestFooHelper(false);
+  TestFooHelper(true);
+}
+```
+
+But this setup has serious drawbacks. First, when a test assertion fails in your tests, it becomes unclear what value of the parameter caused it to fail. You can stream a clarifying message into your `EXPECT`/`ASSERT` statements, but it you'll have to do it with all of them. Second, you have to add one such helper function per test. What if you have ten tests? Twenty? A hundred?
+
+Value-parameterized tests will let you write your test only once and then easily instantiate and run it with an arbitrary number of parameter values.
+
+Here are some other situations when value-parameterized tests come handy:
+
+  * You want to test different implementations of an OO interface.
+  * You want to test your code over various inputs (a.k.a. data-driven testing). This feature is easy to abuse, so please exercise your good sense when doing it!
+
+## How to Write Value-Parameterized Tests ##
+
+To write value-parameterized tests, first you should define a fixture
+class.  It must be derived from both `::testing::Test` and
+`::testing::WithParamInterface<T>` (the latter is a pure interface),
+where `T` is the type of your parameter values.  For convenience, you
+can just derive the fixture class from `::testing::TestWithParam<T>`,
+which itself is derived from both `::testing::Test` and
+`::testing::WithParamInterface<T>`. `T` can be any copyable type. If
+it's a raw pointer, you are responsible for managing the lifespan of
+the pointed values.
+
+```
+class FooTest : public ::testing::TestWithParam<const char*> {
+  // You can implement all the usual fixture class members here.
+  // To access the test parameter, call GetParam() from class
+  // TestWithParam<T>.
+};
+
+// Or, when you want to add parameters to a pre-existing fixture class:
+class BaseTest : public ::testing::Test {
+  ...
+};
+class BarTest : public BaseTest,
+                public ::testing::WithParamInterface<const char*> {
+  ...
+};
+```
+
+Then, use the `TEST_P` macro to define as many test patterns using
+this fixture as you want.  The `_P` suffix is for "parameterized" or
+"pattern", whichever you prefer to think.
+
+```
+TEST_P(FooTest, DoesBlah) {
+  // Inside a test, access the test parameter with the GetParam() method
+  // of the TestWithParam<T> class:
+  EXPECT_TRUE(foo.Blah(GetParam()));
+  ...
+}
+
+TEST_P(FooTest, HasBlahBlah) {
+  ...
+}
+```
+
+Finally, you can use `INSTANTIATE_TEST_CASE_P` to instantiate the test
+case with any set of parameters you want. Google Test defines a number of
+functions for generating test parameters. They return what we call
+(surprise!) _parameter generators_. Here is a summary of them,
+which are all in the `testing` namespace:
+
+| `Range(begin, end[, step])` | Yields values `{begin, begin+step, begin+step+step, ...}`. The values do not include `end`. `step` defaults to 1. |
+|:----------------------------|:------------------------------------------------------------------------------------------------------------------|
+| `Values(v1, v2, ..., vN)`   | Yields values `{v1, v2, ..., vN}`.                                                                                |
+| `ValuesIn(container)` and `ValuesIn(begin, end)` | Yields values from a C-style array, an STL-style container, or an iterator range `[begin, end)`. `container`, `begin`, and `end` can be expressions whose values are determined at run time.  |
+| `Bool()`                    | Yields sequence `{false, true}`.                                                                                  |
+| `Combine(g1, g2, ..., gN)`  | Yields all combinations (the Cartesian product for the math savvy) of the values generated by the `N` generators. This is only available if your system provides the `<tr1/tuple>` header. If you are sure your system does, and Google Test disagrees, you can override it by defining `GTEST_HAS_TR1_TUPLE=1`. See comments in [include/gtest/internal/gtest-port.h](../include/gtest/internal/gtest-port.h) for more information. |
+
+For more details, see the comments at the definitions of these functions in the [source code](../include/gtest/gtest-param-test.h).
+
+The following statement will instantiate tests from the `FooTest` test case
+each with parameter values `"meeny"`, `"miny"`, and `"moe"`.
+
+```
+INSTANTIATE_TEST_CASE_P(InstantiationName,
+                        FooTest,
+                        ::testing::Values("meeny", "miny", "moe"));
+```
+
+To distinguish different instances of the pattern (yes, you can
+instantiate it more than once), the first argument to
+`INSTANTIATE_TEST_CASE_P` is a prefix that will be added to the actual
+test case name. Remember to pick unique prefixes for different
+instantiations. The tests from the instantiation above will have these
+names:
+
+  * `InstantiationName/FooTest.DoesBlah/0` for `"meeny"`
+  * `InstantiationName/FooTest.DoesBlah/1` for `"miny"`
+  * `InstantiationName/FooTest.DoesBlah/2` for `"moe"`
+  * `InstantiationName/FooTest.HasBlahBlah/0` for `"meeny"`
+  * `InstantiationName/FooTest.HasBlahBlah/1` for `"miny"`
+  * `InstantiationName/FooTest.HasBlahBlah/2` for `"moe"`
+
+You can use these names in [--gtest\_filter](#running-a-subset-of-the-tests).
+
+This statement will instantiate all tests from `FooTest` again, each
+with parameter values `"cat"` and `"dog"`:
+
+```
+const char* pets[] = {"cat", "dog"};
+INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest,
+                        ::testing::ValuesIn(pets));
+```
+
+The tests from the instantiation above will have these names:
+
+  * `AnotherInstantiationName/FooTest.DoesBlah/0` for `"cat"`
+  * `AnotherInstantiationName/FooTest.DoesBlah/1` for `"dog"`
+  * `AnotherInstantiationName/FooTest.HasBlahBlah/0` for `"cat"`
+  * `AnotherInstantiationName/FooTest.HasBlahBlah/1` for `"dog"`
+
+Please note that `INSTANTIATE_TEST_CASE_P` will instantiate _all_
+tests in the given test case, whether their definitions come before or
+_after_ the `INSTANTIATE_TEST_CASE_P` statement.
+
+You can see
+[these](../samples/sample7_unittest.cc)
+[files](../samples/sample8_unittest.cc) for more examples.
+
+_Availability_: Linux, Windows (requires MSVC 8.0 or above), Mac; since version 1.2.0.
+
+## Creating Value-Parameterized Abstract Tests ##
+
+In the above, we define and instantiate `FooTest` in the same source
+file. Sometimes you may want to define value-parameterized tests in a
+library and let other people instantiate them later. This pattern is
+known as <i>abstract tests</i>. As an example of its application, when you
+are designing an interface you can write a standard suite of abstract
+tests (perhaps using a factory function as the test parameter) that
+all implementations of the interface are expected to pass. When
+someone implements the interface, he can instantiate your suite to get
+all the interface-conformance tests for free.
+
+To define abstract tests, you should organize your code like this:
+
+  1. Put the definition of the parameterized test fixture class (e.g. `FooTest`) in a header file, say `foo_param_test.h`. Think of this as _declaring_ your abstract tests.
+  1. Put the `TEST_P` definitions in `foo_param_test.cc`, which includes `foo_param_test.h`. Think of this as _implementing_ your abstract tests.
+
+Once they are defined, you can instantiate them by including
+`foo_param_test.h`, invoking `INSTANTIATE_TEST_CASE_P()`, and linking
+with `foo_param_test.cc`. You can instantiate the same abstract test
+case multiple times, possibly in different source files.
+
+# Typed Tests #
+
+Suppose you have multiple implementations of the same interface and
+want to make sure that all of them satisfy some common requirements.
+Or, you may have defined several types that are supposed to conform to
+the same "concept" and you want to verify it.  In both cases, you want
+the same test logic repeated for different types.
+
+While you can write one `TEST` or `TEST_F` for each type you want to
+test (and you may even factor the test logic into a function template
+that you invoke from the `TEST`), it's tedious and doesn't scale:
+if you want _m_ tests over _n_ types, you'll end up writing _m\*n_
+`TEST`s.
+
+_Typed tests_ allow you to repeat the same test logic over a list of
+types.  You only need to write the test logic once, although you must
+know the type list when writing typed tests.  Here's how you do it:
+
+First, define a fixture class template.  It should be parameterized
+by a type.  Remember to derive it from `::testing::Test`:
+
+```
+template <typename T>
+class FooTest : public ::testing::Test {
+ public:
+  ...
+  typedef std::list<T> List;
+  static T shared_;
+  T value_;
+};
+```
+
+Next, associate a list of types with the test case, which will be
+repeated for each type in the list:
+
+```
+typedef ::testing::Types<char, int, unsigned int> MyTypes;
+TYPED_TEST_CASE(FooTest, MyTypes);
+```
+
+The `typedef` is necessary for the `TYPED_TEST_CASE` macro to parse
+correctly.  Otherwise the compiler will think that each comma in the
+type list introduces a new macro argument.
+
+Then, use `TYPED_TEST()` instead of `TEST_F()` to define a typed test
+for this test case.  You can repeat this as many times as you want:
+
+```
+TYPED_TEST(FooTest, DoesBlah) {
+  // Inside a test, refer to the special name TypeParam to get the type
+  // parameter.  Since we are inside a derived class template, C++ requires
+  // us to visit the members of FooTest via 'this'.
+  TypeParam n = this->value_;
+
+  // To visit static members of the fixture, add the 'TestFixture::'
+  // prefix.
+  n += TestFixture::shared_;
+
+  // To refer to typedefs in the fixture, add the 'typename TestFixture::'
+  // prefix.  The 'typename' is required to satisfy the compiler.
+  typename TestFixture::List values;
+  values.push_back(n);
+  ...
+}
+
+TYPED_TEST(FooTest, HasPropertyA) { ... }
+```
+
+You can see `samples/sample6_unittest.cc` for a complete example.
+
+_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac;
+since version 1.1.0.
+
+# Type-Parameterized Tests #
+
+_Type-parameterized tests_ are like typed tests, except that they
+don't require you to know the list of types ahead of time.  Instead,
+you can define the test logic first and instantiate it with different
+type lists later.  You can even instantiate it more than once in the
+same program.
+
+If you are designing an interface or concept, you can define a suite
+of type-parameterized tests to verify properties that any valid
+implementation of the interface/concept should have.  Then, the author
+of each implementation can just instantiate the test suite with his
+type to verify that it conforms to the requirements, without having to
+write similar tests repeatedly.  Here's an example:
+
+First, define a fixture class template, as we did with typed tests:
+
+```
+template <typename T>
+class FooTest : public ::testing::Test {
+  ...
+};
+```
+
+Next, declare that you will define a type-parameterized test case:
+
+```
+TYPED_TEST_CASE_P(FooTest);
+```
+
+The `_P` suffix is for "parameterized" or "pattern", whichever you
+prefer to think.
+
+Then, use `TYPED_TEST_P()` to define a type-parameterized test.  You
+can repeat this as many times as you want:
+
+```
+TYPED_TEST_P(FooTest, DoesBlah) {
+  // Inside a test, refer to TypeParam to get the type parameter.
+  TypeParam n = 0;
+  ...
+}
+
+TYPED_TEST_P(FooTest, HasPropertyA) { ... }
+```
+
+Now the tricky part: you need to register all test patterns using the
+`REGISTER_TYPED_TEST_CASE_P` macro before you can instantiate them.
+The first argument of the macro is the test case name; the rest are
+the names of the tests in this test case:
+
+```
+REGISTER_TYPED_TEST_CASE_P(FooTest,
+                           DoesBlah, HasPropertyA);
+```
+
+Finally, you are free to instantiate the pattern with the types you
+want.  If you put the above code in a header file, you can `#include`
+it in multiple C++ source files and instantiate it multiple times.
+
+```
+typedef ::testing::Types<char, int, unsigned int> MyTypes;
+INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
+```
+
+To distinguish different instances of the pattern, the first argument
+to the `INSTANTIATE_TYPED_TEST_CASE_P` macro is a prefix that will be
+added to the actual test case name.  Remember to pick unique prefixes
+for different instances.
+
+In the special case where the type list contains only one type, you
+can write that type directly without `::testing::Types<...>`, like this:
+
+```
+INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int);
+```
+
+You can see `samples/sample6_unittest.cc` for a complete example.
+
+_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac;
+since version 1.1.0.
+
+# Testing Private Code #
+
+If you change your software's internal implementation, your tests should not
+break as long as the change is not observable by users. Therefore, per the
+_black-box testing principle_, most of the time you should test your code
+through its public interfaces.
+
+If you still find yourself needing to test internal implementation code,
+consider if there's a better design that wouldn't require you to do so. If you
+absolutely have to test non-public interface code though, you can. There are
+two cases to consider:
+
+  * Static functions (_not_ the same as static member functions!) or unnamed namespaces, and
+  * Private or protected class members
+
+## Static Functions ##
+
+Both static functions and definitions/declarations in an unnamed namespace are
+only visible within the same translation unit. To test them, you can `#include`
+the entire `.cc` file being tested in your `*_test.cc` file. (`#include`ing `.cc`
+files is not a good way to reuse code - you should not do this in production
+code!)
+
+However, a better approach is to move the private code into the
+`foo::internal` namespace, where `foo` is the namespace your project normally
+uses, and put the private declarations in a `*-internal.h` file. Your
+production `.cc` files and your tests are allowed to include this internal
+header, but your clients are not. This way, you can fully test your internal
+implementation without leaking it to your clients.
+
+## Private Class Members ##
+
+Private class members are only accessible from within the class or by friends.
+To access a class' private members, you can declare your test fixture as a
+friend to the class and define accessors in your fixture. Tests using the
+fixture can then access the private members of your production class via the
+accessors in the fixture. Note that even though your fixture is a friend to
+your production class, your tests are not automatically friends to it, as they
+are technically defined in sub-classes of the fixture.
+
+Another way to test private members is to refactor them into an implementation
+class, which is then declared in a `*-internal.h` file. Your clients aren't
+allowed to include this header but your tests can. Such is called the Pimpl
+(Private Implementation) idiom.
+
+Or, you can declare an individual test as a friend of your class by adding this
+line in the class body:
+
+```
+FRIEND_TEST(TestCaseName, TestName);
+```
+
+For example,
+```
+// foo.h
+#include "gtest/gtest_prod.h"
+
+// Defines FRIEND_TEST.
+class Foo {
+  ...
+ private:
+  FRIEND_TEST(FooTest, BarReturnsZeroOnNull);
+  int Bar(void* x);
+};
+
+// foo_test.cc
+...
+TEST(FooTest, BarReturnsZeroOnNull) {
+  Foo foo;
+  EXPECT_EQ(0, foo.Bar(NULL));
+  // Uses Foo's private member Bar().
+}
+```
+
+Pay special attention when your class is defined in a namespace, as you should
+define your test fixtures and tests in the same namespace if you want them to
+be friends of your class. For example, if the code to be tested looks like:
+
+```
+namespace my_namespace {
+
+class Foo {
+  friend class FooTest;
+  FRIEND_TEST(FooTest, Bar);
+  FRIEND_TEST(FooTest, Baz);
+  ...
+  definition of the class Foo
+  ...
+};
+
+}  // namespace my_namespace
+```
+
+Your test code should be something like:
+
+```
+namespace my_namespace {
+class FooTest : public ::testing::Test {
+ protected:
+  ...
+};
+
+TEST_F(FooTest, Bar) { ... }
+TEST_F(FooTest, Baz) { ... }
+
+}  // namespace my_namespace
+```
+
+# Catching Failures #
+
+If you are building a testing utility on top of Google Test, you'll
+want to test your utility.  What framework would you use to test it?
+Google Test, of course.
+
+The challenge is to verify that your testing utility reports failures
+correctly.  In frameworks that report a failure by throwing an
+exception, you could catch the exception and assert on it.  But Google
+Test doesn't use exceptions, so how do we test that a piece of code
+generates an expected failure?
+
+`"gtest/gtest-spi.h"` contains some constructs to do this.  After 
+`#include`ing this header, you can use
+
+| `EXPECT_FATAL_FAILURE(`_statement, substring_`);` |
+|:--------------------------------------------------|
+
+to assert that _statement_ generates a fatal (e.g. `ASSERT_*`) failure
+whose message contains the given _substring_, or use
+
+| `EXPECT_NONFATAL_FAILURE(`_statement, substring_`);` |
+|:-----------------------------------------------------|
+
+if you are expecting a non-fatal (e.g. `EXPECT_*`) failure.
+
+For technical reasons, there are some caveats:
+
+  1. You cannot stream a failure message to either macro.
+  1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot reference local non-static variables or non-static members of `this` object.
+  1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot return a value.
+
+_Note:_ Google Test is designed with threads in mind. Once the
+synchronization primitives in `"gtest/internal/gtest-port.h"` have
+been implemented, Google Test will become thread-safe, meaning that
+you can then use assertions in multiple threads concurrently. Before
+that, however, Google Test only supports single-threaded usage. Once
+thread-safe, `EXPECT_FATAL_FAILURE()` and `EXPECT_NONFATAL_FAILURE()`
+will capture failures in the current thread only. If _statement_
+creates new threads, failures in these threads will be ignored. If
+you want to capture failures from all threads instead, you should use
+the following macros:
+
+| `EXPECT_FATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` |
+|:-----------------------------------------------------------------|
+| `EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` |
+
+# Getting the Current Test's Name #
+
+Sometimes a function may need to know the name of the currently running test.
+For example, you may be using the `SetUp()` method of your test fixture to set
+the golden file name based on which test is running. The `::testing::TestInfo`
+class has this information:
+
+```
+namespace testing {
+
+class TestInfo {
+ public:
+  // Returns the test case name and the test name, respectively.
+  //
+  // Do NOT delete or free the return value - it's managed by the
+  // TestInfo class.
+  const char* test_case_name() const;
+  const char* name() const;
+};
+
+}  // namespace testing
+```
+
+
+> To obtain a `TestInfo` object for the currently running test, call
+`current_test_info()` on the `UnitTest` singleton object:
+
+```
+// Gets information about the currently running test.
+// Do NOT delete the returned object - it's managed by the UnitTest class.
+const ::testing::TestInfo* const test_info =
+  ::testing::UnitTest::GetInstance()->current_test_info();
+printf("We are in test %s of test case %s.\n",
+       test_info->name(), test_info->test_case_name());
+```
+
+`current_test_info()` returns a null pointer if no test is running. In
+particular, you cannot find the test case name in `TestCaseSetUp()`,
+`TestCaseTearDown()` (where you know the test case name implicitly), or
+functions called from them.
+
+_Availability:_ Linux, Windows, Mac.
+
+# Extending Google Test by Handling Test Events #
+
+Google Test provides an <b>event listener API</b> to let you receive
+notifications about the progress of a test program and test
+failures. The events you can listen to include the start and end of
+the test program, a test case, or a test method, among others. You may
+use this API to augment or replace the standard console output,
+replace the XML output, or provide a completely different form of
+output, such as a GUI or a database. You can also use test events as
+checkpoints to implement a resource leak checker, for example.
+
+_Availability:_ Linux, Windows, Mac; since v1.4.0.
+
+## Defining Event Listeners ##
+
+To define a event listener, you subclass either
+[testing::TestEventListener](../include/gtest/gtest.h#L991)
+or [testing::EmptyTestEventListener](../include/gtest/gtest.h#L1044).
+The former is an (abstract) interface, where <i>each pure virtual method<br>
+can be overridden to handle a test event</i> (For example, when a test
+starts, the `OnTestStart()` method will be called.). The latter provides
+an empty implementation of all methods in the interface, such that a
+subclass only needs to override the methods it cares about.
+
+When an event is fired, its context is passed to the handler function
+as an argument. The following argument types are used:
+  * [UnitTest](../include/gtest/gtest.h#L1151) reflects the state of the entire test program,
+  * [TestCase](../include/gtest/gtest.h#L778) has information about a test case, which can contain one or more tests,
+  * [TestInfo](../include/gtest/gtest.h#L644) contains the state of a test, and
+  * [TestPartResult](../include/gtest/gtest-test-part.h#L47) represents the result of a test assertion.
+
+An event handler function can examine the argument it receives to find
+out interesting information about the event and the test program's
+state.  Here's an example:
+
+```
+  class MinimalistPrinter : public ::testing::EmptyTestEventListener {
+    // Called before a test starts.
+    virtual void OnTestStart(const ::testing::TestInfo& test_info) {
+      printf("*** Test %s.%s starting.\n",
+             test_info.test_case_name(), test_info.name());
+    }
+
+    // Called after a failed assertion or a SUCCEED() invocation.
+    virtual void OnTestPartResult(
+        const ::testing::TestPartResult& test_part_result) {
+      printf("%s in %s:%d\n%s\n",
+             test_part_result.failed() ? "*** Failure" : "Success",
+             test_part_result.file_name(),
+             test_part_result.line_number(),
+             test_part_result.summary());
+    }
+
+    // Called after a test ends.
+    virtual void OnTestEnd(const ::testing::TestInfo& test_info) {
+      printf("*** Test %s.%s ending.\n",
+             test_info.test_case_name(), test_info.name());
+    }
+  };
+```
+
+## Using Event Listeners ##
+
+To use the event listener you have defined, add an instance of it to
+the Google Test event listener list (represented by class
+[TestEventListeners](../include/gtest/gtest.h#L1064)
+- note the "s" at the end of the name) in your
+`main()` function, before calling `RUN_ALL_TESTS()`:
+```
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  // Gets hold of the event listener list.
+  ::testing::TestEventListeners& listeners =
+      ::testing::UnitTest::GetInstance()->listeners();
+  // Adds a listener to the end.  Google Test takes the ownership.
+  listeners.Append(new MinimalistPrinter);
+  return RUN_ALL_TESTS();
+}
+```
+
+There's only one problem: the default test result printer is still in
+effect, so its output will mingle with the output from your minimalist
+printer. To suppress the default printer, just release it from the
+event listener list and delete it. You can do so by adding one line:
+```
+  ...
+  delete listeners.Release(listeners.default_result_printer());
+  listeners.Append(new MinimalistPrinter);
+  return RUN_ALL_TESTS();
+```
+
+Now, sit back and enjoy a completely different output from your
+tests. For more details, you can read this
+[sample](../samples/sample9_unittest.cc).
+
+You may append more than one listener to the list. When an `On*Start()`
+or `OnTestPartResult()` event is fired, the listeners will receive it in
+the order they appear in the list (since new listeners are added to
+the end of the list, the default text printer and the default XML
+generator will receive the event first). An `On*End()` event will be
+received by the listeners in the _reverse_ order. This allows output by
+listeners added later to be framed by output from listeners added
+earlier.
+
+## Generating Failures in Listeners ##
+
+You may use failure-raising macros (`EXPECT_*()`, `ASSERT_*()`,
+`FAIL()`, etc) when processing an event. There are some restrictions:
+
+  1. You cannot generate any failure in `OnTestPartResult()` (otherwise it will cause `OnTestPartResult()` to be called recursively).
+  1. A listener that handles `OnTestPartResult()` is not allowed to generate any failure.
+
+When you add listeners to the listener list, you should put listeners
+that handle `OnTestPartResult()` _before_ listeners that can generate
+failures. This ensures that failures generated by the latter are
+attributed to the right test by the former.
+
+We have a sample of failure-raising listener
+[here](../samples/sample10_unittest.cc).
+
+# Running Test Programs: Advanced Options #
+
+Google Test test programs are ordinary executables. Once built, you can run
+them directly and affect their behavior via the following environment variables
+and/or command line flags. For the flags to work, your programs must call
+`::testing::InitGoogleTest()` before calling `RUN_ALL_TESTS()`.
+
+To see a list of supported flags and their usage, please run your test
+program with the `--help` flag.  You can also use `-h`, `-?`, or `/?`
+for short.  This feature is added in version 1.3.0.
+
+If an option is specified both by an environment variable and by a
+flag, the latter takes precedence.  Most of the options can also be
+set/read in code: to access the value of command line flag
+`--gtest_foo`, write `::testing::GTEST_FLAG(foo)`.  A common pattern is
+to set the value of a flag before calling `::testing::InitGoogleTest()`
+to change the default value of the flag:
+```
+int main(int argc, char** argv) {
+  // Disables elapsed time by default.
+  ::testing::GTEST_FLAG(print_time) = false;
+
+  // This allows the user to override the flag on the command line.
+  ::testing::InitGoogleTest(&argc, argv);
+
+  return RUN_ALL_TESTS();
+}
+```
+
+## Selecting Tests ##
+
+This section shows various options for choosing which tests to run.
+
+### Listing Test Names ###
+
+Sometimes it is necessary to list the available tests in a program before
+running them so that a filter may be applied if needed. Including the flag
+`--gtest_list_tests` overrides all other flags and lists tests in the following
+format:
+```
+TestCase1.
+  TestName1
+  TestName2
+TestCase2.
+  TestName
+```
+
+None of the tests listed are actually run if the flag is provided. There is no
+corresponding environment variable for this flag.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Running a Subset of the Tests ###
+
+By default, a Google Test program runs all tests the user has defined.
+Sometimes, you want to run only a subset of the tests (e.g. for debugging or
+quickly verifying a change). If you set the `GTEST_FILTER` environment variable
+or the `--gtest_filter` flag to a filter string, Google Test will only run the
+tests whose full names (in the form of `TestCaseName.TestName`) match the
+filter.
+
+The format of a filter is a '`:`'-separated list of wildcard patterns (called
+the positive patterns) optionally followed by a '`-`' and another
+'`:`'-separated pattern list (called the negative patterns). A test matches the
+filter if and only if it matches any of the positive patterns but does not
+match any of the negative patterns.
+
+A pattern may contain `'*'` (matches any string) or `'?'` (matches any single
+character). For convenience, the filter `'*-NegativePatterns'` can be also
+written as `'-NegativePatterns'`.
+
+For example:
+
+  * `./foo_test` Has no flag, and thus runs all its tests.
+  * `./foo_test --gtest_filter=*` Also runs everything, due to the single match-everything `*` value.
+  * `./foo_test --gtest_filter=FooTest.*` Runs everything in test case `FooTest`.
+  * `./foo_test --gtest_filter=*Null*:*Constructor*` Runs any test whose full name contains either `"Null"` or `"Constructor"`.
+  * `./foo_test --gtest_filter=-*DeathTest.*` Runs all non-death tests.
+  * `./foo_test --gtest_filter=FooTest.*-FooTest.Bar` Runs everything in test case `FooTest` except `FooTest.Bar`.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Temporarily Disabling Tests ###
+
+If you have a broken test that you cannot fix right away, you can add the
+`DISABLED_` prefix to its name. This will exclude it from execution. This is
+better than commenting out the code or using `#if 0`, as disabled tests are
+still compiled (and thus won't rot).
+
+If you need to disable all tests in a test case, you can either add `DISABLED_`
+to the front of the name of each test, or alternatively add it to the front of
+the test case name.
+
+For example, the following tests won't be run by Google Test, even though they
+will still be compiled:
+
+```
+// Tests that Foo does Abc.
+TEST(FooTest, DISABLED_DoesAbc) { ... }
+
+class DISABLED_BarTest : public ::testing::Test { ... };
+
+// Tests that Bar does Xyz.
+TEST_F(DISABLED_BarTest, DoesXyz) { ... }
+```
+
+_Note:_ This feature should only be used for temporary pain-relief. You still
+have to fix the disabled tests at a later date. As a reminder, Google Test will
+print a banner warning you if a test program contains any disabled tests.
+
+_Tip:_ You can easily count the number of disabled tests you have
+using `grep`. This number can be used as a metric for improving your
+test quality.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Temporarily Enabling Disabled Tests ###
+
+To include [disabled tests](#temporarily-disabling-tests) in test
+execution, just invoke the test program with the
+`--gtest_also_run_disabled_tests` flag or set the
+`GTEST_ALSO_RUN_DISABLED_TESTS` environment variable to a value other
+than `0`.  You can combine this with the
+[--gtest\_filter](#running-a-subset-of-the-tests) flag to further select
+which disabled tests to run.
+
+_Availability:_ Linux, Windows, Mac; since version 1.3.0.
+
+## Repeating the Tests ##
+
+Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it
+will fail only 1% of the time, making it rather hard to reproduce the bug under
+a debugger. This can be a major source of frustration.
+
+The `--gtest_repeat` flag allows you to repeat all (or selected) test methods
+in a program many times. Hopefully, a flaky test will eventually fail and give
+you a chance to debug. Here's how to use it:
+
+| `$ foo_test --gtest_repeat=1000` | Repeat foo\_test 1000 times and don't stop at failures. |
+|:---------------------------------|:--------------------------------------------------------|
+| `$ foo_test --gtest_repeat=-1`   | A negative count means repeating forever.               |
+| `$ foo_test --gtest_repeat=1000 --gtest_break_on_failure` | Repeat foo\_test 1000 times, stopping at the first failure. This is especially useful when running under a debugger: when the testfails, it will drop into the debugger and you can then inspect variables and stacks. |
+| `$ foo_test --gtest_repeat=1000 --gtest_filter=FooBar` | Repeat the tests whose name matches the filter 1000 times. |
+
+If your test program contains global set-up/tear-down code registered
+using `AddGlobalTestEnvironment()`, it will be repeated in each
+iteration as well, as the flakiness may be in it. You can also specify
+the repeat count by setting the `GTEST_REPEAT` environment variable.
+
+_Availability:_ Linux, Windows, Mac.
+
+## Shuffling the Tests ##
+
+You can specify the `--gtest_shuffle` flag (or set the `GTEST_SHUFFLE`
+environment variable to `1`) to run the tests in a program in a random
+order. This helps to reveal bad dependencies between tests.
+
+By default, Google Test uses a random seed calculated from the current
+time. Therefore you'll get a different order every time. The console
+output includes the random seed value, such that you can reproduce an
+order-related test failure later. To specify the random seed
+explicitly, use the `--gtest_random_seed=SEED` flag (or set the
+`GTEST_RANDOM_SEED` environment variable), where `SEED` is an integer
+between 0 and 99999. The seed value 0 is special: it tells Google Test
+to do the default behavior of calculating the seed from the current
+time.
+
+If you combine this with `--gtest_repeat=N`, Google Test will pick a
+different random seed and re-shuffle the tests in each iteration.
+
+_Availability:_ Linux, Windows, Mac; since v1.4.0.
+
+## Controlling Test Output ##
+
+This section teaches how to tweak the way test results are reported.
+
+### Colored Terminal Output ###
+
+Google Test can use colors in its terminal output to make it easier to spot
+the separation between tests, and whether tests passed.
+
+You can set the GTEST\_COLOR environment variable or set the `--gtest_color`
+command line flag to `yes`, `no`, or `auto` (the default) to enable colors,
+disable colors, or let Google Test decide. When the value is `auto`, Google
+Test will use colors if and only if the output goes to a terminal and (on
+non-Windows platforms) the `TERM` environment variable is set to `xterm` or
+`xterm-color`.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Suppressing the Elapsed Time ###
+
+By default, Google Test prints the time it takes to run each test.  To
+suppress that, run the test program with the `--gtest_print_time=0`
+command line flag.  Setting the `GTEST_PRINT_TIME` environment
+variable to `0` has the same effect.
+
+_Availability:_ Linux, Windows, Mac.  (In Google Test 1.3.0 and lower,
+the default behavior is that the elapsed time is **not** printed.)
+
+### Generating an XML Report ###
+
+Google Test can emit a detailed XML report to a file in addition to its normal
+textual output. The report contains the duration of each test, and thus can
+help you identify slow tests.
+
+To generate the XML report, set the `GTEST_OUTPUT` environment variable or the
+`--gtest_output` flag to the string `"xml:_path_to_output_file_"`, which will
+create the file at the given location. You can also just use the string
+`"xml"`, in which case the output can be found in the `test_detail.xml` file in
+the current directory.
+
+If you specify a directory (for example, `"xml:output/directory/"` on Linux or
+`"xml:output\directory\"` on Windows), Google Test will create the XML file in
+that directory, named after the test executable (e.g. `foo_test.xml` for test
+program `foo_test` or `foo_test.exe`). If the file already exists (perhaps left
+over from a previous run), Google Test will pick a different name (e.g.
+`foo_test_1.xml`) to avoid overwriting it.
+
+The report uses the format described here.  It is based on the
+`junitreport` Ant task and can be parsed by popular continuous build
+systems like [Hudson](https://hudson.dev.java.net/). Since that format
+was originally intended for Java, a little interpretation is required
+to make it apply to Google Test tests, as shown here:
+
+```
+<testsuites name="AllTests" ...>
+  <testsuite name="test_case_name" ...>
+    <testcase name="test_name" ...>
+      <failure message="..."/>
+      <failure message="..."/>
+      <failure message="..."/>
+    </testcase>
+  </testsuite>
+</testsuites>
+```
+
+  * The root `<testsuites>` element corresponds to the entire test program.
+  * `<testsuite>` elements correspond to Google Test test cases.
+  * `<testcase>` elements correspond to Google Test test functions.
+
+For instance, the following program
+
+```
+TEST(MathTest, Addition) { ... }
+TEST(MathTest, Subtraction) { ... }
+TEST(LogicTest, NonContradiction) { ... }
+```
+
+could generate this report:
+
+```
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="3" failures="1" errors="0" time="35" name="AllTests">
+  <testsuite name="MathTest" tests="2" failures="1" errors="0" time="15">
+    <testcase name="Addition" status="run" time="7" classname="">
+      <failure message="Value of: add(1, 1)&#x0A; Actual: 3&#x0A;Expected: 2" type=""/>
+      <failure message="Value of: add(1, -1)&#x0A; Actual: 1&#x0A;Expected: 0" type=""/>
+    </testcase>
+    <testcase name="Subtraction" status="run" time="5" classname="">
+    </testcase>
+  </testsuite>
+  <testsuite name="LogicTest" tests="1" failures="0" errors="0" time="5">
+    <testcase name="NonContradiction" status="run" time="5" classname="">
+    </testcase>
+  </testsuite>
+</testsuites>
+```
+
+Things to note:
+
+  * The `tests` attribute of a `<testsuites>` or `<testsuite>` element tells how many test functions the Google Test program or test case contains, while the `failures` attribute tells how many of them failed.
+  * The `time` attribute expresses the duration of the test, test case, or entire test program in milliseconds.
+  * Each `<failure>` element corresponds to a single failed Google Test assertion.
+  * Some JUnit concepts don't apply to Google Test, yet we have to conform to the DTD. Therefore you'll see some dummy elements and attributes in the report. You can safely ignore these parts.
+
+_Availability:_ Linux, Windows, Mac.
+
+## Controlling How Failures Are Reported ##
+
+### Turning Assertion Failures into Break-Points ###
+
+When running test programs under a debugger, it's very convenient if the
+debugger can catch an assertion failure and automatically drop into interactive
+mode. Google Test's _break-on-failure_ mode supports this behavior.
+
+To enable it, set the `GTEST_BREAK_ON_FAILURE` environment variable to a value
+other than `0` . Alternatively, you can use the `--gtest_break_on_failure`
+command line flag.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Disabling Catching Test-Thrown Exceptions ###
+
+Google Test can be used either with or without exceptions enabled.  If
+a test throws a C++ exception or (on Windows) a structured exception
+(SEH), by default Google Test catches it, reports it as a test
+failure, and continues with the next test method.  This maximizes the
+coverage of a test run.  Also, on Windows an uncaught exception will
+cause a pop-up window, so catching the exceptions allows you to run
+the tests automatically.
+
+When debugging the test failures, however, you may instead want the
+exceptions to be handled by the debugger, such that you can examine
+the call stack when an exception is thrown.  To achieve that, set the
+`GTEST_CATCH_EXCEPTIONS` environment variable to `0`, or use the
+`--gtest_catch_exceptions=0` flag when running the tests.
+
+**Availability**: Linux, Windows, Mac.
+
+### Letting Another Testing Framework Drive ###
+
+If you work on a project that has already been using another testing
+framework and is not ready to completely switch to Google Test yet,
+you can get much of Google Test's benefit by using its assertions in
+your existing tests.  Just change your `main()` function to look
+like:
+
+```
+#include "gtest/gtest.h"
+
+int main(int argc, char** argv) {
+  ::testing::GTEST_FLAG(throw_on_failure) = true;
+  // Important: Google Test must be initialized.
+  ::testing::InitGoogleTest(&argc, argv);
+
+  ... whatever your existing testing framework requires ...
+}
+```
+
+With that, you can use Google Test assertions in addition to the
+native assertions your testing framework provides, for example:
+
+```
+void TestFooDoesBar() {
+  Foo foo;
+  EXPECT_LE(foo.Bar(1), 100);     // A Google Test assertion.
+  CPPUNIT_ASSERT(foo.IsEmpty());  // A native assertion.
+}
+```
+
+If a Google Test assertion fails, it will print an error message and
+throw an exception, which will be treated as a failure by your host
+testing framework.  If you compile your code with exceptions disabled,
+a failed Google Test assertion will instead exit your program with a
+non-zero code, which will also signal a test failure to your test
+runner.
+
+If you don't write `::testing::GTEST_FLAG(throw_on_failure) = true;` in
+your `main()`, you can alternatively enable this feature by specifying
+the `--gtest_throw_on_failure` flag on the command-line or setting the
+`GTEST_THROW_ON_FAILURE` environment variable to a non-zero value.
+
+Death tests are _not_ supported when other test framework is used to organize tests.
+
+_Availability:_ Linux, Windows, Mac; since v1.3.0.
+
+## Distributing Test Functions to Multiple Machines ##
+
+If you have more than one machine you can use to run a test program,
+you might want to run the test functions in parallel and get the
+result faster.  We call this technique _sharding_, where each machine
+is called a _shard_.
+
+Google Test is compatible with test sharding.  To take advantage of
+this feature, your test runner (not part of Google Test) needs to do
+the following:
+
+  1. Allocate a number of machines (shards) to run the tests.
+  1. On each shard, set the `GTEST_TOTAL_SHARDS` environment variable to the total number of shards.  It must be the same for all shards.
+  1. On each shard, set the `GTEST_SHARD_INDEX` environment variable to the index of the shard.  Different shards must be assigned different indices, which must be in the range `[0, GTEST_TOTAL_SHARDS - 1]`.
+  1. Run the same test program on all shards.  When Google Test sees the above two environment variables, it will select a subset of the test functions to run.  Across all shards, each test function in the program will be run exactly once.
+  1. Wait for all shards to finish, then collect and report the results.
+
+Your project may have tests that were written without Google Test and
+thus don't understand this protocol.  In order for your test runner to
+figure out which test supports sharding, it can set the environment
+variable `GTEST_SHARD_STATUS_FILE` to a non-existent file path.  If a
+test program supports sharding, it will create this file to
+acknowledge the fact (the actual contents of the file are not
+important at this time; although we may stick some useful information
+in it in the future.); otherwise it will not create it.
+
+Here's an example to make it clear.  Suppose you have a test program
+`foo_test` that contains the following 5 test functions:
+```
+TEST(A, V)
+TEST(A, W)
+TEST(B, X)
+TEST(B, Y)
+TEST(B, Z)
+```
+and you have 3 machines at your disposal.  To run the test functions in
+parallel, you would set `GTEST_TOTAL_SHARDS` to 3 on all machines, and
+set `GTEST_SHARD_INDEX` to 0, 1, and 2 on the machines respectively.
+Then you would run the same `foo_test` on each machine.
+
+Google Test reserves the right to change how the work is distributed
+across the shards, but here's one possible scenario:
+
+  * Machine #0 runs `A.V` and `B.X`.
+  * Machine #1 runs `A.W` and `B.Y`.
+  * Machine #2 runs `B.Z`.
+
+_Availability:_ Linux, Windows, Mac; since version 1.3.0.
+
+# Fusing Google Test Source Files #
+
+Google Test's implementation consists of ~30 files (excluding its own
+tests).  Sometimes you may want them to be packaged up in two files (a
+`.h` and a `.cc`) instead, such that you can easily copy them to a new
+machine and start hacking there.  For this we provide an experimental
+Python script `fuse_gtest_files.py` in the `scripts/` directory (since release 1.3.0).
+Assuming you have Python 2.4 or above installed on your machine, just
+go to that directory and run
+```
+python fuse_gtest_files.py OUTPUT_DIR
+```
+
+and you should see an `OUTPUT_DIR` directory being created with files
+`gtest/gtest.h` and `gtest/gtest-all.cc` in it.  These files contain
+everything you need to use Google Test.  Just copy them to anywhere
+you want and you are ready to write tests.  You can use the
+[scripts/test/Makefile](../scripts/test/Makefile)
+file as an example on how to compile your tests against them.
+
+# Where to Go from Here #
+
+Congratulations! You've now learned more advanced Google Test tools and are
+ready to tackle more complex testing tasks. If you want to dive even deeper, you
+can read the [Frequently-Asked Questions](FAQ.md).
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/DevGuide.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/DevGuide.md
new file mode 100644
index 0000000000..06467a3277
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/DevGuide.md
@@ -0,0 +1,126 @@
+
+
+If you are interested in understanding the internals of Google Test,
+building from source, or contributing ideas or modifications to the
+project, then this document is for you.
+
+# Introduction #
+
+First, let's give you some background of the project.
+
+## Licensing ##
+
+All Google Test source and pre-built packages are provided under the [New BSD License](http://www.opensource.org/licenses/bsd-license.php).
+
+## The Google Test Community ##
+
+The Google Test community exists primarily through the [discussion group](http://groups.google.com/group/googletestframework) and the GitHub repository.
+You are definitely encouraged to contribute to the
+discussion and you can also help us to keep the effectiveness of the
+group high by following and promoting the guidelines listed here.
+
+### Please Be Friendly ###
+
+Showing courtesy and respect to others is a vital part of the Google
+culture, and we strongly encourage everyone participating in Google
+Test development to join us in accepting nothing less. Of course,
+being courteous is not the same as failing to constructively disagree
+with each other, but it does mean that we should be respectful of each
+other when enumerating the 42 technical reasons that a particular
+proposal may not be the best choice. There's never a reason to be
+antagonistic or dismissive toward anyone who is sincerely trying to
+contribute to a discussion.
+
+Sure, C++ testing is serious business and all that, but it's also
+a lot of fun. Let's keep it that way. Let's strive to be one of the
+friendliest communities in all of open source.
+
+As always, discuss Google Test in the official GoogleTest discussion group.
+You don't have to actually submit code in order to sign up. Your participation
+itself is a valuable contribution.
+
+# Working with the Code #
+
+If you want to get your hands dirty with the code inside Google Test,
+this is the section for you.
+
+## Compiling from Source ##
+
+Once you check out the code, you can find instructions on how to
+compile it in the [README](../README.md) file.
+
+## Testing ##
+
+A testing framework is of no good if itself is not thoroughly tested.
+Tests should be written for any new code, and changes should be
+verified to not break existing tests before they are submitted for
+review. To perform the tests, follow the instructions in
+[README](../README.md) and verify that there are no failures.
+
+# Contributing Code #
+
+We are excited that Google Test is now open source, and hope to get
+great patches from the community. Before you fire up your favorite IDE
+and begin hammering away at that new feature, though, please take the
+time to read this section and understand the process. While it seems
+rigorous, we want to keep a high standard of quality in the code
+base.
+
+## Contributor License Agreements ##
+
+You must sign a Contributor License Agreement (CLA) before we can
+accept any code.  The CLA protects you and us.
+
+  * If you are an individual writing original source code and you're sure you own the intellectual property, then you'll need to sign an [individual CLA](http://code.google.com/legal/individual-cla-v1.0.html).
+  * If you work for a company that wants to allow you to contribute your work to Google Test, then you'll need to sign a [corporate CLA](http://code.google.com/legal/corporate-cla-v1.0.html).
+
+Follow either of the two links above to access the appropriate CLA and
+instructions for how to sign and return it.
+
+## Coding Style ##
+
+To keep the source consistent, readable, diffable and easy to merge,
+we use a fairly rigid coding style, as defined by the [google-styleguide](http://code.google.com/p/google-styleguide/) project.  All patches will be expected
+to conform to the style outlined [here](http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml).
+
+## Updating Generated Code ##
+
+Some of Google Test's source files are generated by the Pump tool (a
+Python script).  If you need to update such files, please modify the
+source (`foo.h.pump`) and re-generate the C++ file using Pump.  You
+can read the PumpManual for details.
+
+## Submitting Patches ##
+
+Please do submit code. Here's what you need to do:
+
+  1. A submission should be a set of changes that addresses one issue in the [issue tracker](https://github.com/google/googletest/issues). Please don't mix more than one logical change per submittal, because it makes the history hard to follow. If you want to make a change that doesn't have a corresponding issue in the issue tracker, please create one.
+  1. Also, coordinate with team members that are listed on the issue in question. This ensures that work isn't being duplicated and communicating your plan early also generally leads to better patches.
+  1. Ensure that your code adheres to the [Google Test source code style](#Coding_Style.md).
+  1. Ensure that there are unit tests for your code.
+  1. Sign a Contributor License Agreement.
+  1. Create a Pull Request in the usual way.
+
+## Google Test Committers ##
+
+The current members of the Google Test engineering team are the only
+committers at present. In the great tradition of eating one's own
+dogfood, we will be requiring each new Google Test engineering team
+member to earn the right to become a committer by following the
+procedures in this document, writing consistently great code, and
+demonstrating repeatedly that he or she truly gets the zen of Google
+Test.
+
+# Release Process #
+
+We follow a typical release process:
+
+  1. A release branch named `release-X.Y` is created.
+  1. Bugs are fixed and features are added in trunk; those individual patches are merged into the release branch until it's stable.
+  1. An individual point release (the `Z` in `X.Y.Z`) is made by creating a tag from the branch.
+  1. Repeat steps 2 and 3 throughout one release cycle (as determined by features or time).
+  1. Go back to step 1 to create another release branch and so on.
+
+---
+
+This page is based on the [Making GWT Better](http://code.google.com/webtoolkit/makinggwtbetter.html) guide from the [Google Web Toolkit](http://code.google.com/webtoolkit/) project.  Except as otherwise [noted](http://code.google.com/policies.html#restrictions), the content of this page is licensed under the [Creative Commons Attribution 2.5 License](http://creativecommons.org/licenses/by/2.5/).
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/Documentation.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/Documentation.md
new file mode 100644
index 0000000000..8ca1aac759
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/Documentation.md
@@ -0,0 +1,14 @@
+This page lists all documentation wiki pages for Google Test **(the SVN trunk version)**
+-- **if you use a released version of Google Test, please read the
+documentation for that specific version instead.**
+
+  * [Primer](Primer.md) -- start here if you are new to Google Test.
+  * [Samples](Samples.md) -- learn from examples.
+  * [AdvancedGuide](AdvancedGuide.md) -- learn more about Google Test.
+  * [XcodeGuide](XcodeGuide.md) -- how to use Google Test in Xcode on Mac.
+  * [Frequently-Asked Questions](FAQ.md) -- check here before asking a question on the mailing list.
+
+To contribute code to Google Test, read:
+
+  * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
+  * [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/FAQ.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/FAQ.md
new file mode 100644
index 0000000000..5fd6cb7238
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/FAQ.md
@@ -0,0 +1,1087 @@
+
+
+If you cannot find the answer to your question here, and you have read
+[Primer](Primer.md) and [AdvancedGuide](AdvancedGuide.md), send it to
+googletestframework@googlegroups.com.
+
+## Why should I use Google Test instead of my favorite C++ testing framework? ##
+
+First, let us say clearly that we don't want to get into the debate of
+which C++ testing framework is **the best**.  There exist many fine
+frameworks for writing C++ tests, and we have tremendous respect for
+the developers and users of them.  We don't think there is (or will
+be) a single best framework - you have to pick the right tool for the
+particular task you are tackling.
+
+We created Google Test because we couldn't find the right combination
+of features and conveniences in an existing framework to satisfy _our_
+needs.  The following is a list of things that _we_ like about Google
+Test.  We don't claim them to be unique to Google Test - rather, the
+combination of them makes Google Test the choice for us.  We hope this
+list can help you decide whether it is for you too.
+
+  * Google Test is designed to be portable: it doesn't require exceptions or RTTI; it works around various bugs in various compilers and environments; etc.  As a result, it works on Linux, Mac OS X, Windows and several embedded operating systems.
+  * Nonfatal assertions (`EXPECT_*`) have proven to be great time savers, as they allow a test to report multiple failures in a single edit-compile-test cycle.
+  * It's easy to write assertions that generate informative messages: you just use the stream syntax to append any additional information, e.g. `ASSERT_EQ(5, Foo(i)) << " where i = " << i;`.  It doesn't require a new set of macros or special functions.
+  * Google Test automatically detects your tests and doesn't require you to enumerate them in order to run them.
+  * Death tests are pretty handy for ensuring that your asserts in production code are triggered by the right conditions.
+  * `SCOPED_TRACE` helps you understand the context of an assertion failure when it comes from inside a sub-routine or loop.
+  * You can decide which tests to run using name patterns.  This saves time when you want to quickly reproduce a test failure.
+  * Google Test can generate XML test result reports that can be parsed by popular continuous build system like Hudson.
+  * Simple things are easy in Google Test, while hard things are possible: in addition to advanced features like [global test environments](AdvancedGuide.md#global-set-up-and-tear-down) and tests parameterized by [values](AdvancedGuide.md#value-parameterized-tests) or [types](docs/AdvancedGuide.md#typed-tests), Google Test supports various ways for the user to extend the framework -- if Google Test doesn't do something out of the box, chances are that a user can implement the feature using Google Test's public API, without changing Google Test itself.  In particular, you can:
+    * expand your testing vocabulary by defining [custom predicates](AdvancedGuide.md#predicate-assertions-for-better-error-messages),
+    * teach Google Test how to [print your types](AdvancedGuide.md#teaching-google-test-how-to-print-your-values),
+    * define your own testing macros or utilities and verify them using Google Test's [Service Provider Interface](AdvancedGuide.md#catching-failures), and
+    * reflect on the test cases or change the test output format by intercepting the [test events](AdvancedGuide.md#extending-google-test-by-handling-test-events).
+
+## I'm getting warnings when compiling Google Test.  Would you fix them? ##
+
+We strive to minimize compiler warnings Google Test generates.  Before releasing a new version, we test to make sure that it doesn't generate warnings when compiled using its CMake script on Windows, Linux, and Mac OS.
+
+Unfortunately, this doesn't mean you are guaranteed to see no warnings when compiling Google Test in your environment:
+
+  * You may be using a different compiler as we use, or a different version of the same compiler.  We cannot possibly test for all compilers.
+  * You may be compiling on a different platform as we do.
+  * Your project may be using different compiler flags as we do.
+
+It is not always possible to make Google Test warning-free for everyone.  Or, it may not be desirable if the warning is rarely enabled and fixing the violations makes the code more complex.
+
+If you see warnings when compiling Google Test, we suggest that you use the `-isystem` flag (assuming your are using GCC) to mark Google Test headers as system headers.  That'll suppress warnings from Google Test headers.
+
+## Why should not test case names and test names contain underscore? ##
+
+Underscore (`_`) is special, as C++ reserves the following to be used by
+the compiler and the standard library:
+
+  1. any identifier that starts with an `_` followed by an upper-case letter, and
+  1. any identifier that containers two consecutive underscores (i.e. `__`) _anywhere_ in its name.
+
+User code is _prohibited_ from using such identifiers.
+
+Now let's look at what this means for `TEST` and `TEST_F`.
+
+Currently `TEST(TestCaseName, TestName)` generates a class named
+`TestCaseName_TestName_Test`.  What happens if `TestCaseName` or `TestName`
+contains `_`?
+
+  1. If `TestCaseName` starts with an `_` followed by an upper-case letter (say, `_Foo`), we end up with `_Foo_TestName_Test`, which is reserved and thus invalid.
+  1. If `TestCaseName` ends with an `_` (say, `Foo_`), we get `Foo__TestName_Test`, which is invalid.
+  1. If `TestName` starts with an `_` (say, `_Bar`), we get `TestCaseName__Bar_Test`, which is invalid.
+  1. If `TestName` ends with an `_` (say, `Bar_`), we get `TestCaseName_Bar__Test`, which is invalid.
+
+So clearly `TestCaseName` and `TestName` cannot start or end with `_`
+(Actually, `TestCaseName` can start with `_` -- as long as the `_` isn't
+followed by an upper-case letter.  But that's getting complicated.  So
+for simplicity we just say that it cannot start with `_`.).
+
+It may seem fine for `TestCaseName` and `TestName` to contain `_` in the
+middle.  However, consider this:
+``` cpp
+TEST(Time, Flies_Like_An_Arrow) { ... }
+TEST(Time_Flies, Like_An_Arrow) { ... }
+```
+
+Now, the two `TEST`s will both generate the same class
+(`Time_Files_Like_An_Arrow_Test`).  That's not good.
+
+So for simplicity, we just ask the users to avoid `_` in `TestCaseName`
+and `TestName`.  The rule is more constraining than necessary, but it's
+simple and easy to remember.  It also gives Google Test some wiggle
+room in case its implementation needs to change in the future.
+
+If you violate the rule, there may not be immediately consequences,
+but your test may (just may) break with a new compiler (or a new
+version of the compiler you are using) or with a new version of Google
+Test.  Therefore it's best to follow the rule.
+
+## Why is it not recommended to install a pre-compiled copy of Google Test (for example, into /usr/local)? ##
+
+In the early days, we said that you could install
+compiled Google Test libraries on `*`nix systems using `make install`.
+Then every user of your machine can write tests without
+recompiling Google Test.
+
+This seemed like a good idea, but it has a
+got-cha: every user needs to compile his tests using the _same_ compiler
+flags used to compile the installed Google Test libraries; otherwise
+he may run into undefined behaviors (i.e. the tests can behave
+strangely and may even crash for no obvious reasons).
+
+Why?  Because C++ has this thing called the One-Definition Rule: if
+two C++ source files contain different definitions of the same
+class/function/variable, and you link them together, you violate the
+rule.  The linker may or may not catch the error (in many cases it's
+not required by the C++ standard to catch the violation).  If it
+doesn't, you get strange run-time behaviors that are unexpected and
+hard to debug.
+
+If you compile Google Test and your test code using different compiler
+flags, they may see different definitions of the same
+class/function/variable (e.g. due to the use of `#if` in Google Test).
+Therefore, for your sanity, we recommend to avoid installing pre-compiled
+Google Test libraries.  Instead, each project should compile
+Google Test itself such that it can be sure that the same flags are
+used for both Google Test and the tests.
+
+## How do I generate 64-bit binaries on Windows (using Visual Studio 2008)? ##
+
+(Answered by Trevor Robinson)
+
+Load the supplied Visual Studio solution file, either `msvc\gtest-md.sln` or
+`msvc\gtest.sln`. Go through the migration wizard to migrate the
+solution and project files to Visual Studio 2008. Select
+`Configuration Manager...` from the `Build` menu. Select `<New...>` from
+the `Active solution platform` dropdown.  Select `x64` from the new
+platform dropdown, leave `Copy settings from` set to `Win32` and
+`Create new project platforms` checked, then click `OK`. You now have
+`Win32` and `x64` platform configurations, selectable from the
+`Standard` toolbar, which allow you to toggle between building 32-bit or
+64-bit binaries (or both at once using Batch Build).
+
+In order to prevent build output files from overwriting one another,
+you'll need to change the `Intermediate Directory` settings for the
+newly created platform configuration across all the projects. To do
+this, multi-select (e.g. using shift-click) all projects (but not the
+solution) in the `Solution Explorer`. Right-click one of them and
+select `Properties`. In the left pane, select `Configuration Properties`,
+and from the `Configuration` dropdown, select `All Configurations`.
+Make sure the selected platform is `x64`. For the
+`Intermediate Directory` setting, change the value from
+`$(PlatformName)\$(ConfigurationName)` to
+`$(OutDir)\$(ProjectName)`. Click `OK` and then build the
+solution. When the build is complete, the 64-bit binaries will be in
+the `msvc\x64\Debug` directory.
+
+## Can I use Google Test on MinGW? ##
+
+We haven't tested this ourselves, but Per Abrahamsen reported that he
+was able to compile and install Google Test successfully when using
+MinGW from Cygwin.  You'll need to configure it with:
+
+`PATH/TO/configure CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin"`
+
+You should be able to replace the `-mno-cygwin` option with direct links
+to the real MinGW binaries, but we haven't tried that.
+
+Caveats:
+
+  * There are many warnings when compiling.
+  * `make check` will produce some errors as not all tests for Google Test itself are compatible with MinGW.
+
+We also have reports on successful cross compilation of Google Test
+MinGW binaries on Linux using
+[these instructions](http://wiki.wxwidgets.org/Cross-Compiling_Under_Linux#Cross-compiling_under_Linux_for_MS_Windows)
+on the WxWidgets site.
+
+Please contact `googletestframework@googlegroups.com` if you are
+interested in improving the support for MinGW.
+
+## Why does Google Test support EXPECT\_EQ(NULL, ptr) and ASSERT\_EQ(NULL, ptr) but not EXPECT\_NE(NULL, ptr) and ASSERT\_NE(NULL, ptr)? ##
+
+Due to some peculiarity of C++, it requires some non-trivial template
+meta programming tricks to support using `NULL` as an argument of the
+`EXPECT_XX()` and `ASSERT_XX()` macros. Therefore we only do it where
+it's most needed (otherwise we make the implementation of Google Test
+harder to maintain and more error-prone than necessary).
+
+The `EXPECT_EQ()` macro takes the _expected_ value as its first
+argument and the _actual_ value as the second. It's reasonable that
+someone wants to write `EXPECT_EQ(NULL, some_expression)`, and this
+indeed was requested several times. Therefore we implemented it.
+
+The need for `EXPECT_NE(NULL, ptr)` isn't nearly as strong. When the
+assertion fails, you already know that `ptr` must be `NULL`, so it
+doesn't add any information to print ptr in this case. That means
+`EXPECT_TRUE(ptr != NULL)` works just as well.
+
+If we were to support `EXPECT_NE(NULL, ptr)`, for consistency we'll
+have to support `EXPECT_NE(ptr, NULL)` as well, as unlike `EXPECT_EQ`,
+we don't have a convention on the order of the two arguments for
+`EXPECT_NE`. This means using the template meta programming tricks
+twice in the implementation, making it even harder to understand and
+maintain. We believe the benefit doesn't justify the cost.
+
+Finally, with the growth of Google Mock's [matcher](../../googlemock/docs/CookBook.md#using-matchers-in-google-test-assertions) library, we are
+encouraging people to use the unified `EXPECT_THAT(value, matcher)`
+syntax more often in tests. One significant advantage of the matcher
+approach is that matchers can be easily combined to form new matchers,
+while the `EXPECT_NE`, etc, macros cannot be easily
+combined. Therefore we want to invest more in the matchers than in the
+`EXPECT_XX()` macros.
+
+## Does Google Test support running tests in parallel? ##
+
+Test runners tend to be tightly coupled with the build/test
+environment, and Google Test doesn't try to solve the problem of
+running tests in parallel.  Instead, we tried to make Google Test work
+nicely with test runners.  For example, Google Test's XML report
+contains the time spent on each test, and its `gtest_list_tests` and
+`gtest_filter` flags can be used for splitting the execution of test
+methods into multiple processes.  These functionalities can help the
+test runner run the tests in parallel.
+
+## Why don't Google Test run the tests in different threads to speed things up? ##
+
+It's difficult to write thread-safe code.  Most tests are not written
+with thread-safety in mind, and thus may not work correctly in a
+multi-threaded setting.
+
+If you think about it, it's already hard to make your code work when
+you know what other threads are doing.  It's much harder, and
+sometimes even impossible, to make your code work when you don't know
+what other threads are doing (remember that test methods can be added,
+deleted, or modified after your test was written).  If you want to run
+the tests in parallel, you'd better run them in different processes.
+
+## Why aren't Google Test assertions implemented using exceptions? ##
+
+Our original motivation was to be able to use Google Test in projects
+that disable exceptions.  Later we realized some additional benefits
+of this approach:
+
+  1. Throwing in a destructor is undefined behavior in C++.  Not using exceptions means Google Test's assertions are safe to use in destructors.
+  1. The `EXPECT_*` family of macros will continue even after a failure, allowing multiple failures in a `TEST` to be reported in a single run. This is a popular feature, as in C++ the edit-compile-test cycle is usually quite long and being able to fixing more than one thing at a time is a blessing.
+  1. If assertions are implemented using exceptions, a test may falsely ignore a failure if it's caught by user code:
+``` cpp
+try { ... ASSERT_TRUE(...) ... }
+catch (...) { ... }
+```
+The above code will pass even if the `ASSERT_TRUE` throws.  While it's unlikely for someone to write this in a test, it's possible to run into this pattern when you write assertions in callbacks that are called by the code under test.
+
+The downside of not using exceptions is that `ASSERT_*` (implemented
+using `return`) will only abort the current function, not the current
+`TEST`.
+
+## Why do we use two different macros for tests with and without fixtures? ##
+
+Unfortunately, C++'s macro system doesn't allow us to use the same
+macro for both cases.  One possibility is to provide only one macro
+for tests with fixtures, and require the user to define an empty
+fixture sometimes:
+
+``` cpp
+class FooTest : public ::testing::Test {};
+
+TEST_F(FooTest, DoesThis) { ... }
+```
+or
+``` cpp
+typedef ::testing::Test FooTest;
+
+TEST_F(FooTest, DoesThat) { ... }
+```
+
+Yet, many people think this is one line too many. :-) Our goal was to
+make it really easy to write tests, so we tried to make simple tests
+trivial to create.  That means using a separate macro for such tests.
+
+We think neither approach is ideal, yet either of them is reasonable.
+In the end, it probably doesn't matter much either way.
+
+## Why don't we use structs as test fixtures? ##
+
+We like to use structs only when representing passive data.  This
+distinction between structs and classes is good for documenting the
+intent of the code's author.  Since test fixtures have logic like
+`SetUp()` and `TearDown()`, they are better defined as classes.
+
+## Why are death tests implemented as assertions instead of using a test runner? ##
+
+Our goal was to make death tests as convenient for a user as C++
+possibly allows.  In particular:
+
+  * The runner-style requires to split the information into two pieces: the definition of the death test itself, and the specification for the runner on how to run the death test and what to expect.  The death test would be written in C++, while the runner spec may or may not be.  A user needs to carefully keep the two in sync. `ASSERT_DEATH(statement, expected_message)` specifies all necessary information in one place, in one language, without boilerplate code. It is very declarative.
+  * `ASSERT_DEATH` has a similar syntax and error-reporting semantics as other Google Test assertions, and thus is easy to learn.
+  * `ASSERT_DEATH` can be mixed with other assertions and other logic at your will.  You are not limited to one death test per test method. For example, you can write something like:
+``` cpp
+    if (FooCondition()) {
+      ASSERT_DEATH(Bar(), "blah");
+    } else {
+      ASSERT_EQ(5, Bar());
+    }
+```
+If you prefer one death test per test method, you can write your tests in that style too, but we don't want to impose that on the users.  The fewer artificial limitations the better.
+  * `ASSERT_DEATH` can reference local variables in the current function, and you can decide how many death tests you want based on run-time information.  For example,
+``` cpp
+    const int count = GetCount();  // Only known at run time.
+    for (int i = 1; i <= count; i++) {
+      ASSERT_DEATH({
+        double* buffer = new double[i];
+        ... initializes buffer ...
+        Foo(buffer, i)
+      }, "blah blah");
+    }
+```
+The runner-based approach tends to be more static and less flexible, or requires more user effort to get this kind of flexibility.
+
+Another interesting thing about `ASSERT_DEATH` is that it calls `fork()`
+to create a child process to run the death test.  This is lightening
+fast, as `fork()` uses copy-on-write pages and incurs almost zero
+overhead, and the child process starts from the user-supplied
+statement directly, skipping all global and local initialization and
+any code leading to the given statement.  If you launch the child
+process from scratch, it can take seconds just to load everything and
+start running if the test links to many libraries dynamically.
+
+## My death test modifies some state, but the change seems lost after the death test finishes. Why? ##
+
+Death tests (`EXPECT_DEATH`, etc) are executed in a sub-process s.t. the
+expected crash won't kill the test program (i.e. the parent process). As a
+result, any in-memory side effects they incur are observable in their
+respective sub-processes, but not in the parent process. You can think of them
+as running in a parallel universe, more or less.
+
+## The compiler complains about "undefined references" to some static const member variables, but I did define them in the class body. What's wrong? ##
+
+If your class has a static data member:
+
+``` cpp
+// foo.h
+class Foo {
+  ...
+  static const int kBar = 100;
+};
+```
+
+You also need to define it _outside_ of the class body in `foo.cc`:
+
+``` cpp
+const int Foo::kBar;  // No initializer here.
+```
+
+Otherwise your code is **invalid C++**, and may break in unexpected ways. In
+particular, using it in Google Test comparison assertions (`EXPECT_EQ`, etc)
+will generate an "undefined reference" linker error.
+
+## I have an interface that has several implementations. Can I write a set of tests once and repeat them over all the implementations? ##
+
+Google Test doesn't yet have good support for this kind of tests, or
+data-driven tests in general. We hope to be able to make improvements in this
+area soon.
+
+## Can I derive a test fixture from another? ##
+
+Yes.
+
+Each test fixture has a corresponding and same named test case. This means only
+one test case can use a particular fixture. Sometimes, however, multiple test
+cases may want to use the same or slightly different fixtures. For example, you
+may want to make sure that all of a GUI library's test cases don't leak
+important system resources like fonts and brushes.
+
+In Google Test, you share a fixture among test cases by putting the shared
+logic in a base test fixture, then deriving from that base a separate fixture
+for each test case that wants to use this common logic. You then use `TEST_F()`
+to write tests using each derived fixture.
+
+Typically, your code looks like this:
+
+``` cpp
+// Defines a base test fixture.
+class BaseTest : public ::testing::Test {
+  protected:
+   ...
+};
+
+// Derives a fixture FooTest from BaseTest.
+class FooTest : public BaseTest {
+  protected:
+    virtual void SetUp() {
+      BaseTest::SetUp();  // Sets up the base fixture first.
+      ... additional set-up work ...
+    }
+    virtual void TearDown() {
+      ... clean-up work for FooTest ...
+      BaseTest::TearDown();  // Remember to tear down the base fixture
+                             // after cleaning up FooTest!
+    }
+    ... functions and variables for FooTest ...
+};
+
+// Tests that use the fixture FooTest.
+TEST_F(FooTest, Bar) { ... }
+TEST_F(FooTest, Baz) { ... }
+
+... additional fixtures derived from BaseTest ...
+```
+
+If necessary, you can continue to derive test fixtures from a derived fixture.
+Google Test has no limit on how deep the hierarchy can be.
+
+For a complete example using derived test fixtures, see
+[sample5](../samples/sample5_unittest.cc).
+
+## My compiler complains "void value not ignored as it ought to be." What does this mean? ##
+
+You're probably using an `ASSERT_*()` in a function that doesn't return `void`.
+`ASSERT_*()` can only be used in `void` functions.
+
+## My death test hangs (or seg-faults). How do I fix it? ##
+
+In Google Test, death tests are run in a child process and the way they work is
+delicate. To write death tests you really need to understand how they work.
+Please make sure you have read this.
+
+In particular, death tests don't like having multiple threads in the parent
+process. So the first thing you can try is to eliminate creating threads
+outside of `EXPECT_DEATH()`.
+
+Sometimes this is impossible as some library you must use may be creating
+threads before `main()` is even reached. In this case, you can try to minimize
+the chance of conflicts by either moving as many activities as possible inside
+`EXPECT_DEATH()` (in the extreme case, you want to move everything inside), or
+leaving as few things as possible in it. Also, you can try to set the death
+test style to `"threadsafe"`, which is safer but slower, and see if it helps.
+
+If you go with thread-safe death tests, remember that they rerun the test
+program from the beginning in the child process. Therefore make sure your
+program can run side-by-side with itself and is deterministic.
+
+In the end, this boils down to good concurrent programming. You have to make
+sure that there is no race conditions or dead locks in your program. No silver
+bullet - sorry!
+
+## Should I use the constructor/destructor of the test fixture or the set-up/tear-down function? ##
+
+The first thing to remember is that Google Test does not reuse the
+same test fixture object across multiple tests. For each `TEST_F`,
+Google Test will create a fresh test fixture object, _immediately_
+call `SetUp()`, run the test body, call `TearDown()`, and then
+_immediately_ delete the test fixture object.
+
+When you need to write per-test set-up and tear-down logic, you have
+the choice between using the test fixture constructor/destructor or
+`SetUp()/TearDown()`. The former is usually preferred, as it has the
+following benefits:
+
+  * By initializing a member variable in the constructor, we have the option to make it `const`, which helps prevent accidental changes to its value and makes the tests more obviously correct.
+  * In case we need to subclass the test fixture class, the subclass' constructor is guaranteed to call the base class' constructor first, and the subclass' destructor is guaranteed to call the base class' destructor afterward. With `SetUp()/TearDown()`, a subclass may make the mistake of forgetting to call the base class' `SetUp()/TearDown()` or call them at the wrong moment.
+
+You may still want to use `SetUp()/TearDown()` in the following rare cases:
+  * If the tear-down operation could throw an exception, you must use `TearDown()` as opposed to the destructor, as throwing in a destructor leads to undefined behavior and usually will kill your program right away. Note that many standard libraries (like STL) may throw when exceptions are enabled in the compiler. Therefore you should prefer `TearDown()` if you want to write portable tests that work with or without exceptions.
+  * The assertion macros throw an exception when flag `--gtest_throw_on_failure` is specified. Therefore, you shouldn't use Google Test assertions in a destructor if you plan to run your tests with this flag.
+  * In a constructor or destructor, you cannot make a virtual function call on this object. (You can call a method declared as virtual, but it will be statically bound.) Therefore, if you need to call a method that will be overriden in a derived class, you have to use `SetUp()/TearDown()`.
+
+## The compiler complains "no matching function to call" when I use ASSERT\_PREDn. How do I fix it? ##
+
+If the predicate function you use in `ASSERT_PRED*` or `EXPECT_PRED*` is
+overloaded or a template, the compiler will have trouble figuring out which
+overloaded version it should use. `ASSERT_PRED_FORMAT*` and
+`EXPECT_PRED_FORMAT*` don't have this problem.
+
+If you see this error, you might want to switch to
+`(ASSERT|EXPECT)_PRED_FORMAT*`, which will also give you a better failure
+message. If, however, that is not an option, you can resolve the problem by
+explicitly telling the compiler which version to pick.
+
+For example, suppose you have
+
+``` cpp
+bool IsPositive(int n) {
+  return n > 0;
+}
+bool IsPositive(double x) {
+  return x > 0;
+}
+```
+
+you will get a compiler error if you write
+
+``` cpp
+EXPECT_PRED1(IsPositive, 5);
+```
+
+However, this will work:
+
+``` cpp
+EXPECT_PRED1(*static_cast<bool (*)(int)>*(IsPositive), 5);
+```
+
+(The stuff inside the angled brackets for the `static_cast` operator is the
+type of the function pointer for the `int`-version of `IsPositive()`.)
+
+As another example, when you have a template function
+
+``` cpp
+template <typename T>
+bool IsNegative(T x) {
+  return x < 0;
+}
+```
+
+you can use it in a predicate assertion like this:
+
+``` cpp
+ASSERT_PRED1(IsNegative*<int>*, -5);
+```
+
+Things are more interesting if your template has more than one parameters. The
+following won't compile:
+
+``` cpp
+ASSERT_PRED2(*GreaterThan<int, int>*, 5, 0);
+```
+
+
+as the C++ pre-processor thinks you are giving `ASSERT_PRED2` 4 arguments,
+which is one more than expected. The workaround is to wrap the predicate
+function in parentheses:
+
+``` cpp
+ASSERT_PRED2(*(GreaterThan<int, int>)*, 5, 0);
+```
+
+
+## My compiler complains about "ignoring return value" when I call RUN\_ALL\_TESTS(). Why? ##
+
+Some people had been ignoring the return value of `RUN_ALL_TESTS()`. That is,
+instead of
+
+``` cpp
+return RUN_ALL_TESTS();
+```
+
+they write
+
+``` cpp
+RUN_ALL_TESTS();
+```
+
+This is wrong and dangerous. A test runner needs to see the return value of
+`RUN_ALL_TESTS()` in order to determine if a test has passed. If your `main()`
+function ignores it, your test will be considered successful even if it has a
+Google Test assertion failure. Very bad.
+
+To help the users avoid this dangerous bug, the implementation of
+`RUN_ALL_TESTS()` causes gcc to raise this warning, when the return value is
+ignored. If you see this warning, the fix is simple: just make sure its value
+is used as the return value of `main()`.
+
+## My compiler complains that a constructor (or destructor) cannot return a value. What's going on? ##
+
+Due to a peculiarity of C++, in order to support the syntax for streaming
+messages to an `ASSERT_*`, e.g.
+
+``` cpp
+ASSERT_EQ(1, Foo()) << "blah blah" << foo;
+```
+
+we had to give up using `ASSERT*` and `FAIL*` (but not `EXPECT*` and
+`ADD_FAILURE*`) in constructors and destructors. The workaround is to move the
+content of your constructor/destructor to a private void member function, or
+switch to `EXPECT_*()` if that works. This section in the user's guide explains
+it.
+
+## My set-up function is not called. Why? ##
+
+C++ is case-sensitive. It should be spelled as `SetUp()`.  Did you
+spell it as `Setup()`?
+
+Similarly, sometimes people spell `SetUpTestCase()` as `SetupTestCase()` and
+wonder why it's never called.
+
+## How do I jump to the line of a failure in Emacs directly? ##
+
+Google Test's failure message format is understood by Emacs and many other
+IDEs, like acme and XCode. If a Google Test message is in a compilation buffer
+in Emacs, then it's clickable. You can now hit `enter` on a message to jump to
+the corresponding source code, or use `C-x `` to jump to the next failure.
+
+## I have several test cases which share the same test fixture logic, do I have to define a new test fixture class for each of them? This seems pretty tedious. ##
+
+You don't have to. Instead of
+
+``` cpp
+class FooTest : public BaseTest {};
+
+TEST_F(FooTest, Abc) { ... }
+TEST_F(FooTest, Def) { ... }
+
+class BarTest : public BaseTest {};
+
+TEST_F(BarTest, Abc) { ... }
+TEST_F(BarTest, Def) { ... }
+```
+
+you can simply `typedef` the test fixtures:
+``` cpp
+typedef BaseTest FooTest;
+
+TEST_F(FooTest, Abc) { ... }
+TEST_F(FooTest, Def) { ... }
+
+typedef BaseTest BarTest;
+
+TEST_F(BarTest, Abc) { ... }
+TEST_F(BarTest, Def) { ... }
+```
+
+## The Google Test output is buried in a whole bunch of log messages. What do I do? ##
+
+The Google Test output is meant to be a concise and human-friendly report. If
+your test generates textual output itself, it will mix with the Google Test
+output, making it hard to read. However, there is an easy solution to this
+problem.
+
+Since most log messages go to stderr, we decided to let Google Test output go
+to stdout. This way, you can easily separate the two using redirection. For
+example:
+```
+./my_test > googletest_output.txt
+```
+
+## Why should I prefer test fixtures over global variables? ##
+
+There are several good reasons:
+  1. It's likely your test needs to change the states of its global variables. This makes it difficult to keep side effects from escaping one test and contaminating others, making debugging difficult. By using fixtures, each test has a fresh set of variables that's different (but with the same names). Thus, tests are kept independent of each other.
+  1. Global variables pollute the global namespace.
+  1. Test fixtures can be reused via subclassing, which cannot be done easily with global variables. This is useful if many test cases have something in common.
+
+## How do I test private class members without writing FRIEND\_TEST()s? ##
+
+You should try to write testable code, which means classes should be easily
+tested from their public interface. One way to achieve this is the Pimpl idiom:
+you move all private members of a class into a helper class, and make all
+members of the helper class public.
+
+You have several other options that don't require using `FRIEND_TEST`:
+  * Write the tests as members of the fixture class:
+``` cpp
+class Foo {
+  friend class FooTest;
+  ...
+};
+
+class FooTest : public ::testing::Test {
+ protected:
+  ...
+  void Test1() {...} // This accesses private members of class Foo.
+  void Test2() {...} // So does this one.
+};
+
+TEST_F(FooTest, Test1) {
+  Test1();
+}
+
+TEST_F(FooTest, Test2) {
+  Test2();
+}
+```
+  * In the fixture class, write accessors for the tested class' private members, then use the accessors in your tests:
+``` cpp
+class Foo {
+  friend class FooTest;
+  ...
+};
+
+class FooTest : public ::testing::Test {
+ protected:
+  ...
+  T1 get_private_member1(Foo* obj) {
+    return obj->private_member1_;
+  }
+};
+
+TEST_F(FooTest, Test1) {
+  ...
+  get_private_member1(x)
+  ...
+}
+```
+  * If the methods are declared **protected**, you can change their access level in a test-only subclass:
+``` cpp
+class YourClass {
+  ...
+ protected: // protected access for testability.
+  int DoSomethingReturningInt();
+  ...
+};
+
+// in the your_class_test.cc file:
+class TestableYourClass : public YourClass {
+  ...
+ public: using YourClass::DoSomethingReturningInt; // changes access rights
+  ...
+};
+
+TEST_F(YourClassTest, DoSomethingTest) {
+  TestableYourClass obj;
+  assertEquals(expected_value, obj.DoSomethingReturningInt());
+}
+```
+
+## How do I test private class static members without writing FRIEND\_TEST()s? ##
+
+We find private static methods clutter the header file.  They are
+implementation details and ideally should be kept out of a .h. So often I make
+them free functions instead.
+
+Instead of:
+``` cpp
+// foo.h
+class Foo {
+  ...
+ private:
+  static bool Func(int n);
+};
+
+// foo.cc
+bool Foo::Func(int n) { ... }
+
+// foo_test.cc
+EXPECT_TRUE(Foo::Func(12345));
+```
+
+You probably should better write:
+``` cpp
+// foo.h
+class Foo {
+  ...
+};
+
+// foo.cc
+namespace internal {
+  bool Func(int n) { ... }
+}
+
+// foo_test.cc
+namespace internal {
+  bool Func(int n);
+}
+
+EXPECT_TRUE(internal::Func(12345));
+```
+
+## I would like to run a test several times with different parameters. Do I need to write several similar copies of it? ##
+
+No. You can use a feature called [value-parameterized tests](AdvancedGuide.md#Value_Parameterized_Tests) which
+lets you repeat your tests with different parameters, without defining it more than once.
+
+## How do I test a file that defines main()? ##
+
+To test a `foo.cc` file, you need to compile and link it into your unit test
+program. However, when the file contains a definition for the `main()`
+function, it will clash with the `main()` of your unit test, and will result in
+a build error.
+
+The right solution is to split it into three files:
+  1. `foo.h` which contains the declarations,
+  1. `foo.cc` which contains the definitions except `main()`, and
+  1. `foo_main.cc` which contains nothing but the definition of `main()`.
+
+Then `foo.cc` can be easily tested.
+
+If you are adding tests to an existing file and don't want an intrusive change
+like this, there is a hack: just include the entire `foo.cc` file in your unit
+test. For example:
+``` cpp
+// File foo_unittest.cc
+
+// The headers section
+...
+
+// Renames main() in foo.cc to make room for the unit test main()
+#define main FooMain
+
+#include "a/b/foo.cc"
+
+// The tests start here.
+...
+```
+
+
+However, please remember this is a hack and should only be used as the last
+resort.
+
+## What can the statement argument in ASSERT\_DEATH() be? ##
+
+`ASSERT_DEATH(_statement_, _regex_)` (or any death assertion macro) can be used
+wherever `_statement_` is valid. So basically `_statement_` can be any C++
+statement that makes sense in the current context. In particular, it can
+reference global and/or local variables, and can be:
+  * a simple function call (often the case),
+  * a complex expression, or
+  * a compound statement.
+
+Some examples are shown here:
+
+``` cpp
+// A death test can be a simple function call.
+TEST(MyDeathTest, FunctionCall) {
+  ASSERT_DEATH(Xyz(5), "Xyz failed");
+}
+
+// Or a complex expression that references variables and functions.
+TEST(MyDeathTest, ComplexExpression) {
+  const bool c = Condition();
+  ASSERT_DEATH((c ? Func1(0) : object2.Method("test")),
+               "(Func1|Method) failed");
+}
+
+// Death assertions can be used any where in a function. In
+// particular, they can be inside a loop.
+TEST(MyDeathTest, InsideLoop) {
+  // Verifies that Foo(0), Foo(1), ..., and Foo(4) all die.
+  for (int i = 0; i < 5; i++) {
+    EXPECT_DEATH_M(Foo(i), "Foo has \\d+ errors",
+                   ::testing::Message() << "where i is " << i);
+  }
+}
+
+// A death assertion can contain a compound statement.
+TEST(MyDeathTest, CompoundStatement) {
+  // Verifies that at lease one of Bar(0), Bar(1), ..., and
+  // Bar(4) dies.
+  ASSERT_DEATH({
+    for (int i = 0; i < 5; i++) {
+      Bar(i);
+    }
+  },
+  "Bar has \\d+ errors");}
+```
+
+`googletest_unittest.cc` contains more examples if you are interested.
+
+## What syntax does the regular expression in ASSERT\_DEATH use? ##
+
+On POSIX systems, Google Test uses the POSIX Extended regular
+expression syntax
+(http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions).
+On Windows, it uses a limited variant of regular expression
+syntax. For more details, see the
+[regular expression syntax](AdvancedGuide.md#Regular_Expression_Syntax).
+
+## I have a fixture class Foo, but TEST\_F(Foo, Bar) gives me error "no matching function for call to Foo::Foo()". Why? ##
+
+Google Test needs to be able to create objects of your test fixture class, so
+it must have a default constructor. Normally the compiler will define one for
+you. However, there are cases where you have to define your own:
+  * If you explicitly declare a non-default constructor for class `Foo`, then you need to define a default constructor, even if it would be empty.
+  * If `Foo` has a const non-static data member, then you have to define the default constructor _and_ initialize the const member in the initializer list of the constructor. (Early versions of `gcc` doesn't force you to initialize the const member. It's a bug that has been fixed in `gcc 4`.)
+
+## Why does ASSERT\_DEATH complain about previous threads that were already joined? ##
+
+With the Linux pthread library, there is no turning back once you cross the
+line from single thread to multiple threads. The first time you create a
+thread, a manager thread is created in addition, so you get 3, not 2, threads.
+Later when the thread you create joins the main thread, the thread count
+decrements by 1, but the manager thread will never be killed, so you still have
+2 threads, which means you cannot safely run a death test.
+
+The new NPTL thread library doesn't suffer from this problem, as it doesn't
+create a manager thread. However, if you don't control which machine your test
+runs on, you shouldn't depend on this.
+
+## Why does Google Test require the entire test case, instead of individual tests, to be named FOODeathTest when it uses ASSERT\_DEATH? ##
+
+Google Test does not interleave tests from different test cases. That is, it
+runs all tests in one test case first, and then runs all tests in the next test
+case, and so on. Google Test does this because it needs to set up a test case
+before the first test in it is run, and tear it down afterwords. Splitting up
+the test case would require multiple set-up and tear-down processes, which is
+inefficient and makes the semantics unclean.
+
+If we were to determine the order of tests based on test name instead of test
+case name, then we would have a problem with the following situation:
+
+``` cpp
+TEST_F(FooTest, AbcDeathTest) { ... }
+TEST_F(FooTest, Uvw) { ... }
+
+TEST_F(BarTest, DefDeathTest) { ... }
+TEST_F(BarTest, Xyz) { ... }
+```
+
+Since `FooTest.AbcDeathTest` needs to run before `BarTest.Xyz`, and we don't
+interleave tests from different test cases, we need to run all tests in the
+`FooTest` case before running any test in the `BarTest` case. This contradicts
+with the requirement to run `BarTest.DefDeathTest` before `FooTest.Uvw`.
+
+## But I don't like calling my entire test case FOODeathTest when it contains both death tests and non-death tests. What do I do? ##
+
+You don't have to, but if you like, you may split up the test case into
+`FooTest` and `FooDeathTest`, where the names make it clear that they are
+related:
+
+``` cpp
+class FooTest : public ::testing::Test { ... };
+
+TEST_F(FooTest, Abc) { ... }
+TEST_F(FooTest, Def) { ... }
+
+typedef FooTest FooDeathTest;
+
+TEST_F(FooDeathTest, Uvw) { ... EXPECT_DEATH(...) ... }
+TEST_F(FooDeathTest, Xyz) { ... ASSERT_DEATH(...) ... }
+```
+
+## The compiler complains about "no match for 'operator<<'" when I use an assertion. What gives? ##
+
+If you use a user-defined type `FooType` in an assertion, you must make sure
+there is an `std::ostream& operator<<(std::ostream&, const FooType&)` function
+defined such that we can print a value of `FooType`.
+
+In addition, if `FooType` is declared in a name space, the `<<` operator also
+needs to be defined in the _same_ name space.
+
+## How do I suppress the memory leak messages on Windows? ##
+
+Since the statically initialized Google Test singleton requires allocations on
+the heap, the Visual C++ memory leak detector will report memory leaks at the
+end of the program run. The easiest way to avoid this is to use the
+`_CrtMemCheckpoint` and `_CrtMemDumpAllObjectsSince` calls to not report any
+statically initialized heap objects. See MSDN for more details and additional
+heap check/debug routines.
+
+## I am building my project with Google Test in Visual Studio and all I'm getting is a bunch of linker errors (or warnings). Help! ##
+
+You may get a number of the following linker error or warnings if you
+attempt to link your test project with the Google Test library when
+your project and the are not built using the same compiler settings.
+
+  * LNK2005: symbol already defined in object
+  * LNK4217: locally defined symbol 'symbol' imported in function 'function'
+  * LNK4049: locally defined symbol 'symbol' imported
+
+The Google Test project (gtest.vcproj) has the Runtime Library option
+set to /MT (use multi-threaded static libraries, /MTd for debug). If
+your project uses something else, for example /MD (use multi-threaded
+DLLs, /MDd for debug), you need to change the setting in the Google
+Test project to match your project's.
+
+To update this setting open the project properties in the Visual
+Studio IDE then select the branch Configuration Properties | C/C++ |
+Code Generation and change the option "Runtime Library".  You may also try
+using gtest-md.vcproj instead of gtest.vcproj.
+
+## I put my tests in a library and Google Test doesn't run them. What's happening? ##
+Have you read a
+[warning](Primer.md#important-note-for-visual-c-users) on
+the Google Test Primer page?
+
+## I want to use Google Test with Visual Studio but don't know where to start. ##
+Many people are in your position and one of the posted his solution to
+our mailing list.
+
+## I am seeing compile errors mentioning std::type\_traits when I try to use Google Test on Solaris. ##
+Google Test uses parts of the standard C++ library that SunStudio does not support.
+Our users reported success using alternative implementations. Try running the build after runing this commad:
+
+`export CC=cc CXX=CC CXXFLAGS='-library=stlport4'`
+
+## How can my code detect if it is running in a test? ##
+
+If you write code that sniffs whether it's running in a test and does
+different things accordingly, you are leaking test-only logic into
+production code and there is no easy way to ensure that the test-only
+code paths aren't run by mistake in production.  Such cleverness also
+leads to
+[Heisenbugs](http://en.wikipedia.org/wiki/Unusual_software_bug#Heisenbug).
+Therefore we strongly advise against the practice, and Google Test doesn't
+provide a way to do it.
+
+In general, the recommended way to cause the code to behave
+differently under test is [dependency injection](http://jamesshore.com/Blog/Dependency-Injection-Demystified.html).
+You can inject different functionality from the test and from the
+production code.  Since your production code doesn't link in the
+for-test logic at all, there is no danger in accidentally running it.
+
+However, if you _really_, _really_, _really_ have no choice, and if
+you follow the rule of ending your test program names with `_test`,
+you can use the _horrible_ hack of sniffing your executable name
+(`argv[0]` in `main()`) to know whether the code is under test.
+
+## Google Test defines a macro that clashes with one defined by another library. How do I deal with that? ##
+
+In C++, macros don't obey namespaces.  Therefore two libraries that
+both define a macro of the same name will clash if you `#include` both
+definitions.  In case a Google Test macro clashes with another
+library, you can force Google Test to rename its macro to avoid the
+conflict.
+
+Specifically, if both Google Test and some other code define macro
+`FOO`, you can add
+```
+  -DGTEST_DONT_DEFINE_FOO=1
+```
+to the compiler flags to tell Google Test to change the macro's name
+from `FOO` to `GTEST_FOO`. For example, with `-DGTEST_DONT_DEFINE_TEST=1`, you'll need to write
+``` cpp
+  GTEST_TEST(SomeTest, DoesThis) { ... }
+```
+instead of
+``` cpp
+  TEST(SomeTest, DoesThis) { ... }
+```
+in order to define a test.
+
+Currently, the following `TEST`, `FAIL`, `SUCCEED`, and the basic comparison assertion macros can have alternative names. You can see the full list of covered macros [here](http://www.google.com/codesearch?q=if+!GTEST_DONT_DEFINE_\w%2B+package:http://googletest\.googlecode\.com+file:/include/gtest/gtest.h). More information can be found in the "Avoiding Macro Name Clashes" section of the README file.
+
+
+## Is it OK if I have two separate `TEST(Foo, Bar)` test methods defined in different namespaces? ##
+
+Yes.
+
+The rule is **all test methods in the same test case must use the same fixture class**. This means that the following is **allowed** because both tests use the same fixture class (`::testing::Test`).
+
+``` cpp
+namespace foo {
+TEST(CoolTest, DoSomething) {
+  SUCCEED();
+}
+}  // namespace foo
+
+namespace bar {
+TEST(CoolTest, DoSomething) {
+  SUCCEED();
+}
+}  // namespace foo
+```
+
+However, the following code is **not allowed** and will produce a runtime error from Google Test because the test methods are using different test fixture classes with the same test case name.
+
+``` cpp
+namespace foo {
+class CoolTest : public ::testing::Test {};  // Fixture foo::CoolTest
+TEST_F(CoolTest, DoSomething) {
+  SUCCEED();
+}
+}  // namespace foo
+
+namespace bar {
+class CoolTest : public ::testing::Test {};  // Fixture: bar::CoolTest
+TEST_F(CoolTest, DoSomething) {
+  SUCCEED();
+}
+}  // namespace foo
+```
+
+## How do I build Google Testing Framework with Xcode 4? ##
+
+If you try to build Google Test's Xcode project with Xcode 4.0 or later, you may encounter an error message that looks like
+"Missing SDK in target gtest\_framework: /Developer/SDKs/MacOSX10.4u.sdk". That means that Xcode does not support the SDK the project is targeting. See the Xcode section in the [README](../README.md) file on how to resolve this.
+
+## My question is not covered in your FAQ! ##
+
+If you cannot find the answer to your question in this FAQ, there are
+some other resources you can use:
+
+  1. read other [wiki pages](../docs),
+  1. search the mailing list [archive](https://groups.google.com/forum/#!forum/googletestframework),
+  1. ask it on [googletestframework@googlegroups.com](mailto:googletestframework@googlegroups.com) and someone will answer it (to prevent spam, we require you to join the [discussion group](http://groups.google.com/group/googletestframework) before you can post.).
+
+Please note that creating an issue in the
+[issue tracker](https://github.com/google/googletest/issues) is _not_
+a good way to get your answer, as it is monitored infrequently by a
+very small number of people.
+
+When asking a question, it's helpful to provide as much of the
+following information as possible (people cannot help you if there's
+not enough information in your question):
+
+  * the version (or the commit hash if you check out from Git directly) of Google Test you use (Google Test is under active development, so it's possible that your problem has been solved in a later version),
+  * your operating system,
+  * the name and version of your compiler,
+  * the complete command line flags you give to your compiler,
+  * the complete compiler error messages (if the question is about compilation),
+  * the _actual_ code (ideally, a minimal but complete program) that has the problem you encounter.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/Primer.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/Primer.md
new file mode 100644
index 0000000000..474c1d2ab6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/Primer.md
@@ -0,0 +1,502 @@
+
+
+# Introduction: Why Google C++ Testing Framework? #
+
+_Google C++ Testing Framework_ helps you write better C++ tests.
+
+No matter whether you work on Linux, Windows, or a Mac, if you write C++ code,
+Google Test can help you.
+
+So what makes a good test, and how does Google C++ Testing Framework fit in? We believe:
+  1. Tests should be _independent_ and _repeatable_. It's a pain to debug a test that succeeds or fails as a result of other tests.  Google C++ Testing Framework isolates the tests by running each of them on a different object. When a test fails, Google C++ Testing Framework allows you to run it in isolation for quick debugging.
+  1. Tests should be well _organized_ and reflect the structure of the tested code.  Google C++ Testing Framework groups related tests into test cases that can share data and subroutines. This common pattern is easy to recognize and makes tests easy to maintain. Such consistency is especially helpful when people switch projects and start to work on a new code base.
+  1. Tests should be _portable_ and _reusable_. The open-source community has a lot of code that is platform-neutral, its tests should also be platform-neutral.  Google C++ Testing Framework works on different OSes, with different compilers (gcc, MSVC, and others), with or without exceptions, so Google C++ Testing Framework tests can easily work with a variety of configurations.  (Note that the current release only contains build scripts for Linux - we are actively working on scripts for other platforms.)
+  1. When tests fail, they should provide as much _information_ about the problem as possible. Google C++ Testing Framework doesn't stop at the first test failure. Instead, it only stops the current test and continues with the next. You can also set up tests that report non-fatal failures after which the current test continues. Thus, you can detect and fix multiple bugs in a single run-edit-compile cycle.
+  1. The testing framework should liberate test writers from housekeeping chores and let them focus on the test _content_.  Google C++ Testing Framework automatically keeps track of all tests defined, and doesn't require the user to enumerate them in order to run them.
+  1. Tests should be _fast_. With Google C++ Testing Framework, you can reuse shared resources across tests and pay for the set-up/tear-down only once, without making tests depend on each other.
+
+Since Google C++ Testing Framework is based on the popular xUnit
+architecture, you'll feel right at home if you've used JUnit or PyUnit before.
+If not, it will take you about 10 minutes to learn the basics and get started.
+So let's go!
+
+_Note:_ We sometimes refer to Google C++ Testing Framework informally
+as _Google Test_.
+
+# Setting up a New Test Project #
+
+To write a test program using Google Test, you need to compile Google
+Test into a library and link your test with it.  We provide build
+files for some popular build systems: `msvc/` for Visual Studio,
+`xcode/` for Mac Xcode, `make/` for GNU make, `codegear/` for Borland
+C++ Builder, and the autotools script (deprecated) and
+`CMakeLists.txt` for CMake (recommended) in the Google Test root
+directory.  If your build system is not on this list, you can take a
+look at `make/Makefile` to learn how Google Test should be compiled
+(basically you want to compile `src/gtest-all.cc` with `GTEST_ROOT`
+and `GTEST_ROOT/include` in the header search path, where `GTEST_ROOT`
+is the Google Test root directory).
+
+Once you are able to compile the Google Test library, you should
+create a project or build target for your test program.  Make sure you
+have `GTEST_ROOT/include` in the header search path so that the
+compiler can find `"gtest/gtest.h"` when compiling your test.  Set up
+your test project to link with the Google Test library (for example,
+in Visual Studio, this is done by adding a dependency on
+`gtest.vcproj`).
+
+If you still have questions, take a look at how Google Test's own
+tests are built and use them as examples.
+
+# Basic Concepts #
+
+When using Google Test, you start by writing _assertions_, which are statements
+that check whether a condition is true. An assertion's result can be _success_,
+_nonfatal failure_, or _fatal failure_. If a fatal failure occurs, it aborts
+the current function; otherwise the program continues normally.
+
+_Tests_ use assertions to verify the tested code's behavior. If a test crashes
+or has a failed assertion, then it _fails_; otherwise it _succeeds_.
+
+A _test case_ contains one or many tests. You should group your tests into test
+cases that reflect the structure of the tested code. When multiple tests in a
+test case need to share common objects and subroutines, you can put them into a
+_test fixture_ class.
+
+A _test program_ can contain multiple test cases.
+
+We'll now explain how to write a test program, starting at the individual
+assertion level and building up to tests and test cases.
+
+# Assertions #
+
+Google Test assertions are macros that resemble function calls. You test a
+class or function by making assertions about its behavior. When an assertion
+fails, Google Test prints the assertion's source file and line number location,
+along with a failure message. You may also supply a custom failure message
+which will be appended to Google Test's message.
+
+The assertions come in pairs that test the same thing but have different
+effects on the current function. `ASSERT_*` versions generate fatal failures
+when they fail, and **abort the current function**. `EXPECT_*` versions generate
+nonfatal failures, which don't abort the current function. Usually `EXPECT_*`
+are preferred, as they allow more than one failures to be reported in a test.
+However, you should use `ASSERT_*` if it doesn't make sense to continue when
+the assertion in question fails.
+
+Since a failed `ASSERT_*` returns from the current function immediately,
+possibly skipping clean-up code that comes after it, it may cause a space leak.
+Depending on the nature of the leak, it may or may not be worth fixing - so
+keep this in mind if you get a heap checker error in addition to assertion
+errors.
+
+To provide a custom failure message, simply stream it into the macro using the
+`<<` operator, or a sequence of such operators. An example:
+```
+ASSERT_EQ(x.size(), y.size()) << "Vectors x and y are of unequal length";
+
+for (int i = 0; i < x.size(); ++i) {
+  EXPECT_EQ(x[i], y[i]) << "Vectors x and y differ at index " << i;
+}
+```
+
+Anything that can be streamed to an `ostream` can be streamed to an assertion
+macro--in particular, C strings and `string` objects. If a wide string
+(`wchar_t*`, `TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is
+streamed to an assertion, it will be translated to UTF-8 when printed.
+
+## Basic Assertions ##
+
+These assertions do basic true/false condition testing.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_TRUE(`_condition_`)`;  | `EXPECT_TRUE(`_condition_`)`;   | _condition_ is true |
+| `ASSERT_FALSE(`_condition_`)`; | `EXPECT_FALSE(`_condition_`)`;  | _condition_ is false |
+
+Remember, when they fail, `ASSERT_*` yields a fatal failure and
+returns from the current function, while `EXPECT_*` yields a nonfatal
+failure, allowing the function to continue running. In either case, an
+assertion failure means its containing test fails.
+
+_Availability_: Linux, Windows, Mac.
+
+## Binary Comparison ##
+
+This section describes assertions that compare two values.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+|`ASSERT_EQ(`_val1_`, `_val2_`);`|`EXPECT_EQ(`_val1_`, `_val2_`);`| _val1_ `==` _val2_ |
+|`ASSERT_NE(`_val1_`, `_val2_`);`|`EXPECT_NE(`_val1_`, `_val2_`);`| _val1_ `!=` _val2_ |
+|`ASSERT_LT(`_val1_`, `_val2_`);`|`EXPECT_LT(`_val1_`, `_val2_`);`| _val1_ `<` _val2_ |
+|`ASSERT_LE(`_val1_`, `_val2_`);`|`EXPECT_LE(`_val1_`, `_val2_`);`| _val1_ `<=` _val2_ |
+|`ASSERT_GT(`_val1_`, `_val2_`);`|`EXPECT_GT(`_val1_`, `_val2_`);`| _val1_ `>` _val2_ |
+|`ASSERT_GE(`_val1_`, `_val2_`);`|`EXPECT_GE(`_val1_`, `_val2_`);`| _val1_ `>=` _val2_ |
+
+In the event of a failure, Google Test prints both _val1_ and _val2_.
+
+Value arguments must be comparable by the assertion's comparison
+operator or you'll get a compiler error.  We used to require the
+arguments to support the `<<` operator for streaming to an `ostream`,
+but it's no longer necessary since v1.6.0 (if `<<` is supported, it
+will be called to print the arguments when the assertion fails;
+otherwise Google Test will attempt to print them in the best way it
+can. For more details and how to customize the printing of the
+arguments, see this Google Mock [recipe](../../googlemock/docs/CookBook.md#teaching-google-mock-how-to-print-your-values).).
+
+These assertions can work with a user-defined type, but only if you define the
+corresponding comparison operator (e.g. `==`, `<`, etc).  If the corresponding
+operator is defined, prefer using the `ASSERT_*()` macros because they will
+print out not only the result of the comparison, but the two operands as well.
+
+Arguments are always evaluated exactly once. Therefore, it's OK for the
+arguments to have side effects. However, as with any ordinary C/C++ function,
+the arguments' evaluation order is undefined (i.e. the compiler is free to
+choose any order) and your code should not depend on any particular argument
+evaluation order.
+
+`ASSERT_EQ()` does pointer equality on pointers. If used on two C strings, it
+tests if they are in the same memory location, not if they have the same value.
+Therefore, if you want to compare C strings (e.g. `const char*`) by value, use
+`ASSERT_STREQ()` , which will be described later on. In particular, to assert
+that a C string is `NULL`, use `ASSERT_STREQ(NULL, c_string)` . However, to
+compare two `string` objects, you should use `ASSERT_EQ`.
+
+Macros in this section work with both narrow and wide string objects (`string`
+and `wstring`).
+
+_Availability_: Linux, Windows, Mac.
+
+_Historical note_: Before February 2016 `*_EQ` had a convention of calling it as
+`ASSERT_EQ(expected, actual)`, so lots of existing code uses this order.
+Now `*_EQ` treats both parameters in the same way.
+
+## String Comparison ##
+
+The assertions in this group compare two **C strings**. If you want to compare
+two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_STREQ(`_str1_`, `_str2_`);`    | `EXPECT_STREQ(`_str1_`, `_str_2`);`     | the two C strings have the same content |
+| `ASSERT_STRNE(`_str1_`, `_str2_`);`    | `EXPECT_STRNE(`_str1_`, `_str2_`);`     | the two C strings have different content |
+| `ASSERT_STRCASEEQ(`_str1_`, `_str2_`);`| `EXPECT_STRCASEEQ(`_str1_`, `_str2_`);` | the two C strings have the same content, ignoring case |
+| `ASSERT_STRCASENE(`_str1_`, `_str2_`);`| `EXPECT_STRCASENE(`_str1_`, `_str2_`);` | the two C strings have different content, ignoring case |
+
+Note that "CASE" in an assertion name means that case is ignored.
+
+`*STREQ*` and `*STRNE*` also accept wide C strings (`wchar_t*`). If a
+comparison of two wide strings fails, their values will be printed as UTF-8
+narrow strings.
+
+A `NULL` pointer and an empty string are considered _different_.
+
+_Availability_: Linux, Windows, Mac.
+
+See also: For more string comparison tricks (substring, prefix, suffix, and
+regular expression matching, for example), see the [Advanced Google Test Guide](AdvancedGuide.md).
+
+# Simple Tests #
+
+To create a test:
+  1. Use the `TEST()` macro to define and name a test function, These are ordinary C++ functions that don't return a value.
+  1. In this function, along with any valid C++ statements you want to include, use the various Google Test assertions to check values.
+  1. The test's result is determined by the assertions; if any assertion in the test fails (either fatally or non-fatally), or if the test crashes, the entire test fails. Otherwise, it succeeds.
+
+```
+TEST(test_case_name, test_name) {
+ ... test body ...
+}
+```
+
+
+`TEST()` arguments go from general to specific. The _first_ argument is the
+name of the test case, and the _second_ argument is the test's name within the
+test case. Both names must be valid C++ identifiers, and they should not contain underscore (`_`). A test's _full name_ consists of its containing test case and its
+individual name. Tests from different test cases can have the same individual
+name.
+
+For example, let's take a simple integer function:
+```
+int Factorial(int n); // Returns the factorial of n
+```
+
+A test case for this function might look like:
+```
+// Tests factorial of 0.
+TEST(FactorialTest, HandlesZeroInput) {
+  EXPECT_EQ(1, Factorial(0));
+}
+
+// Tests factorial of positive numbers.
+TEST(FactorialTest, HandlesPositiveInput) {
+  EXPECT_EQ(1, Factorial(1));
+  EXPECT_EQ(2, Factorial(2));
+  EXPECT_EQ(6, Factorial(3));
+  EXPECT_EQ(40320, Factorial(8));
+}
+```
+
+Google Test groups the test results by test cases, so logically-related tests
+should be in the same test case; in other words, the first argument to their
+`TEST()` should be the same. In the above example, we have two tests,
+`HandlesZeroInput` and `HandlesPositiveInput`, that belong to the same test
+case `FactorialTest`.
+
+_Availability_: Linux, Windows, Mac.
+
+# Test Fixtures: Using the Same Data Configuration for Multiple Tests #
+
+If you find yourself writing two or more tests that operate on similar data,
+you can use a _test fixture_. It allows you to reuse the same configuration of
+objects for several different tests.
+
+To create a fixture, just:
+  1. Derive a class from `::testing::Test` . Start its body with `protected:` or `public:` as we'll want to access fixture members from sub-classes.
+  1. Inside the class, declare any objects you plan to use.
+  1. If necessary, write a default constructor or `SetUp()` function to prepare the objects for each test. A common mistake is to spell `SetUp()` as `Setup()` with a small `u` - don't let that happen to you.
+  1. If necessary, write a destructor or `TearDown()` function to release any resources you allocated in `SetUp()` . To learn when you should use the constructor/destructor and when you should use `SetUp()/TearDown()`, read this [FAQ entry](FAQ.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function).
+  1. If needed, define subroutines for your tests to share.
+
+When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to
+access objects and subroutines in the test fixture:
+```
+TEST_F(test_case_name, test_name) {
+ ... test body ...
+}
+```
+
+Like `TEST()`, the first argument is the test case name, but for `TEST_F()`
+this must be the name of the test fixture class. You've probably guessed: `_F`
+is for fixture.
+
+Unfortunately, the C++ macro system does not allow us to create a single macro
+that can handle both types of tests. Using the wrong macro causes a compiler
+error.
+
+Also, you must first define a test fixture class before using it in a
+`TEST_F()`, or you'll get the compiler error "`virtual outside class
+declaration`".
+
+For each test defined with `TEST_F()`, Google Test will:
+  1. Create a _fresh_ test fixture at runtime
+  1. Immediately initialize it via `SetUp()` ,
+  1. Run the test
+  1. Clean up by calling `TearDown()`
+  1. Delete the test fixture.  Note that different tests in the same test case have different test fixture objects, and Google Test always deletes a test fixture before it creates the next one. Google Test does not reuse the same test fixture for multiple tests. Any changes one test makes to the fixture do not affect other tests.
+
+As an example, let's write tests for a FIFO queue class named `Queue`, which
+has the following interface:
+```
+template <typename E> // E is the element type.
+class Queue {
+ public:
+  Queue();
+  void Enqueue(const E& element);
+  E* Dequeue(); // Returns NULL if the queue is empty.
+  size_t size() const;
+  ...
+};
+```
+
+First, define a fixture class. By convention, you should give it the name
+`FooTest` where `Foo` is the class being tested.
+```
+class QueueTest : public ::testing::Test {
+ protected:
+  virtual void SetUp() {
+    q1_.Enqueue(1);
+    q2_.Enqueue(2);
+    q2_.Enqueue(3);
+  }
+
+  // virtual void TearDown() {}
+
+  Queue<int> q0_;
+  Queue<int> q1_;
+  Queue<int> q2_;
+};
+```
+
+In this case, `TearDown()` is not needed since we don't have to clean up after
+each test, other than what's already done by the destructor.
+
+Now we'll write tests using `TEST_F()` and this fixture.
+```
+TEST_F(QueueTest, IsEmptyInitially) {
+  EXPECT_EQ(0, q0_.size());
+}
+
+TEST_F(QueueTest, DequeueWorks) {
+  int* n = q0_.Dequeue();
+  EXPECT_EQ(NULL, n);
+
+  n = q1_.Dequeue();
+  ASSERT_TRUE(n != NULL);
+  EXPECT_EQ(1, *n);
+  EXPECT_EQ(0, q1_.size());
+  delete n;
+
+  n = q2_.Dequeue();
+  ASSERT_TRUE(n != NULL);
+  EXPECT_EQ(2, *n);
+  EXPECT_EQ(1, q2_.size());
+  delete n;
+}
+```
+
+The above uses both `ASSERT_*` and `EXPECT_*` assertions. The rule of thumb is
+to use `EXPECT_*` when you want the test to continue to reveal more errors
+after the assertion failure, and use `ASSERT_*` when continuing after failure
+doesn't make sense. For example, the second assertion in the `Dequeue` test is
+`ASSERT_TRUE(n != NULL)`, as we need to dereference the pointer `n` later,
+which would lead to a segfault when `n` is `NULL`.
+
+When these tests run, the following happens:
+  1. Google Test constructs a `QueueTest` object (let's call it `t1` ).
+  1. `t1.SetUp()` initializes `t1` .
+  1. The first test ( `IsEmptyInitially` ) runs on `t1` .
+  1. `t1.TearDown()` cleans up after the test finishes.
+  1. `t1` is destructed.
+  1. The above steps are repeated on another `QueueTest` object, this time running the `DequeueWorks` test.
+
+_Availability_: Linux, Windows, Mac.
+
+_Note_: Google Test automatically saves all _Google Test_ flags when a test
+object is constructed, and restores them when it is destructed.
+
+# Invoking the Tests #
+
+`TEST()` and `TEST_F()` implicitly register their tests with Google Test. So, unlike with many other C++ testing frameworks, you don't have to re-list all your defined tests in order to run them.
+
+After defining your tests, you can run them with `RUN_ALL_TESTS()` , which returns `0` if all the tests are successful, or `1` otherwise. Note that `RUN_ALL_TESTS()` runs _all tests_ in your link unit -- they can be from different test cases, or even different source files.
+
+When invoked, the `RUN_ALL_TESTS()` macro:
+  1. Saves the state of all  Google Test flags.
+  1. Creates a test fixture object for the first test.
+  1. Initializes it via `SetUp()`.
+  1. Runs the test on the fixture object.
+  1. Cleans up the fixture via `TearDown()`.
+  1. Deletes the fixture.
+  1. Restores the state of all Google Test flags.
+  1. Repeats the above steps for the next test, until all tests have run.
+
+In addition, if the text fixture's constructor generates a fatal failure in
+step 2, there is no point for step 3 - 5 and they are thus skipped. Similarly,
+if step 3 generates a fatal failure, step 4 will be skipped.
+
+_Important_: You must not ignore the return value of `RUN_ALL_TESTS()`, or `gcc`
+will give you a compiler error. The rationale for this design is that the
+automated testing service determines whether a test has passed based on its
+exit code, not on its stdout/stderr output; thus your `main()` function must
+return the value of `RUN_ALL_TESTS()`.
+
+Also, you should call `RUN_ALL_TESTS()` only **once**. Calling it more than once
+conflicts with some advanced Google Test features (e.g. thread-safe death
+tests) and thus is not supported.
+
+_Availability_: Linux, Windows, Mac.
+
+# Writing the main() Function #
+
+You can start from this boilerplate:
+```
+#include "this/package/foo.h"
+#include "gtest/gtest.h"
+
+namespace {
+
+// The fixture for testing class Foo.
+class FooTest : public ::testing::Test {
+ protected:
+  // You can remove any or all of the following functions if its body
+  // is empty.
+
+  FooTest() {
+    // You can do set-up work for each test here.
+  }
+
+  virtual ~FooTest() {
+    // You can do clean-up work that doesn't throw exceptions here.
+  }
+
+  // If the constructor and destructor are not enough for setting up
+  // and cleaning up each test, you can define the following methods:
+
+  virtual void SetUp() {
+    // Code here will be called immediately after the constructor (right
+    // before each test).
+  }
+
+  virtual void TearDown() {
+    // Code here will be called immediately after each test (right
+    // before the destructor).
+  }
+
+  // Objects declared here can be used by all tests in the test case for Foo.
+};
+
+// Tests that the Foo::Bar() method does Abc.
+TEST_F(FooTest, MethodBarDoesAbc) {
+  const string input_filepath = "this/package/testdata/myinputfile.dat";
+  const string output_filepath = "this/package/testdata/myoutputfile.dat";
+  Foo f;
+  EXPECT_EQ(0, f.Bar(input_filepath, output_filepath));
+}
+
+// Tests that Foo does Xyz.
+TEST_F(FooTest, DoesXyz) {
+  // Exercises the Xyz feature of Foo.
+}
+
+}  // namespace
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+```
+
+The `::testing::InitGoogleTest()` function parses the command line for Google
+Test flags, and removes all recognized flags. This allows the user to control a
+test program's behavior via various flags, which we'll cover in [AdvancedGuide](AdvancedGuide.md).
+You must call this function before calling `RUN_ALL_TESTS()`, or the flags
+won't be properly initialized.
+
+On Windows, `InitGoogleTest()` also works with wide strings, so it can be used
+in programs compiled in `UNICODE` mode as well.
+
+But maybe you think that writing all those main() functions is too much work? We agree with you completely and that's why Google Test provides a basic implementation of main(). If it fits your needs, then just link your test with gtest\_main library and you are good to go.
+
+## Important note for Visual C++ users ##
+If you put your tests into a library and your `main()` function is in a different library or in your .exe file, those tests will not run. The reason is a [bug](https://connect.microsoft.com/feedback/viewfeedback.aspx?FeedbackID=244410&siteid=210) in Visual C++. When you define your tests, Google Test creates certain static objects to register them. These objects are not referenced from elsewhere but their constructors are still supposed to run. When Visual C++ linker sees that nothing in the library is referenced from other places it throws the library out. You have to reference your library with tests from your main program to keep the linker from discarding it. Here is how to do it. Somewhere in your library code declare a function:
+```
+__declspec(dllexport) int PullInMyLibrary() { return 0; }
+```
+If you put your tests in a static library (not DLL) then `__declspec(dllexport)` is not required. Now, in your main program, write a code that invokes that function:
+```
+int PullInMyLibrary();
+static int dummy = PullInMyLibrary();
+```
+This will keep your tests referenced and will make them register themselves at startup.
+
+In addition, if you define your tests in a static library, add `/OPT:NOREF` to your main program linker options. If you use MSVC++ IDE, go to your .exe project properties/Configuration Properties/Linker/Optimization and set References setting to `Keep Unreferenced Data (/OPT:NOREF)`. This will keep Visual C++ linker from discarding individual symbols generated by your tests from the final executable.
+
+There is one more pitfall, though. If you use Google Test as a static library (that's how it is defined in gtest.vcproj) your tests must also reside in a static library. If you have to have them in a DLL, you _must_ change Google Test to build into a DLL as well. Otherwise your tests will not run correctly or will not run at all. The general conclusion here is: make your life easier - do not write your tests in libraries!
+
+# Where to Go from Here #
+
+Congratulations! You've learned the Google Test basics. You can start writing
+and running Google Test tests, read some [samples](Samples.md), or continue with
+[AdvancedGuide](AdvancedGuide.md), which describes many more useful Google Test features.
+
+# Known Limitations #
+
+Google Test is designed to be thread-safe.  The implementation is
+thread-safe on systems where the `pthreads` library is available.  It
+is currently _unsafe_ to use Google Test assertions from two threads
+concurrently on other systems (e.g. Windows).  In most tests this is
+not an issue as usually the assertions are done in the main thread. If
+you want to help, you can volunteer to implement the necessary
+synchronization primitives in `gtest-port.h` for your platform.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/PumpManual.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/PumpManual.md
new file mode 100644
index 0000000000..8184f153ca
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/PumpManual.md
@@ -0,0 +1,177 @@
+
+
+<b>P</b>ump is <b>U</b>seful for <b>M</b>eta <b>P</b>rogramming.
+
+# The Problem #
+
+Template and macro libraries often need to define many classes,
+functions, or macros that vary only (or almost only) in the number of
+arguments they take. It's a lot of repetitive, mechanical, and
+error-prone work.
+
+Variadic templates and variadic macros can alleviate the problem.
+However, while both are being considered by the C++ committee, neither
+is in the standard yet or widely supported by compilers.  Thus they
+are often not a good choice, especially when your code needs to be
+portable. And their capabilities are still limited.
+
+As a result, authors of such libraries often have to write scripts to
+generate their implementation. However, our experience is that it's
+tedious to write such scripts, which tend to reflect the structure of
+the generated code poorly and are often hard to read and edit. For
+example, a small change needed in the generated code may require some
+non-intuitive, non-trivial changes in the script. This is especially
+painful when experimenting with the code.
+
+# Our Solution #
+
+Pump (for Pump is Useful for Meta Programming, Pretty Useful for Meta
+Programming, or Practical Utility for Meta Programming, whichever you
+prefer) is a simple meta-programming tool for C++. The idea is that a
+programmer writes a `foo.pump` file which contains C++ code plus meta
+code that manipulates the C++ code. The meta code can handle
+iterations over a range, nested iterations, local meta variable
+definitions, simple arithmetic, and conditional expressions. You can
+view it as a small Domain-Specific Language. The meta language is
+designed to be non-intrusive (s.t. it won't confuse Emacs' C++ mode,
+for example) and concise, making Pump code intuitive and easy to
+maintain.
+
+## Highlights ##
+
+  * The implementation is in a single Python script and thus ultra portable: no build or installation is needed and it works cross platforms.
+  * Pump tries to be smart with respect to [Google's style guide](http://code.google.com/p/google-styleguide/): it breaks long lines (easy to have when they are generated) at acceptable places to fit within 80 columns and indent the continuation lines correctly.
+  * The format is human-readable and more concise than XML.
+  * The format works relatively well with Emacs' C++ mode.
+
+## Examples ##
+
+The following Pump code (where meta keywords start with `$`, `[[` and `]]` are meta brackets, and `$$` starts a meta comment that ends with the line):
+
+```
+$var n = 3     $$ Defines a meta variable n.
+$range i 0..n  $$ Declares the range of meta iterator i (inclusive).
+$for i [[
+               $$ Meta loop.
+// Foo$i does blah for $i-ary predicates.
+$range j 1..i
+template <size_t N $for j [[, typename A$j]]>
+class Foo$i {
+$if i == 0 [[
+  blah a;
+]] $elif i <= 2 [[
+  blah b;
+]] $else [[
+  blah c;
+]]
+};
+
+]]
+```
+
+will be translated by the Pump compiler to:
+
+```
+// Foo0 does blah for 0-ary predicates.
+template <size_t N>
+class Foo0 {
+  blah a;
+};
+
+// Foo1 does blah for 1-ary predicates.
+template <size_t N, typename A1>
+class Foo1 {
+  blah b;
+};
+
+// Foo2 does blah for 2-ary predicates.
+template <size_t N, typename A1, typename A2>
+class Foo2 {
+  blah b;
+};
+
+// Foo3 does blah for 3-ary predicates.
+template <size_t N, typename A1, typename A2, typename A3>
+class Foo3 {
+  blah c;
+};
+```
+
+In another example,
+
+```
+$range i 1..n
+Func($for i + [[a$i]]);
+$$ The text between i and [[ is the separator between iterations.
+```
+
+will generate one of the following lines (without the comments), depending on the value of `n`:
+
+```
+Func();              // If n is 0.
+Func(a1);            // If n is 1.
+Func(a1 + a2);       // If n is 2.
+Func(a1 + a2 + a3);  // If n is 3.
+// And so on...
+```
+
+## Constructs ##
+
+We support the following meta programming constructs:
+
+| `$var id = exp` | Defines a named constant value. `$id` is valid util the end of the current meta lexical block. |
+|:----------------|:-----------------------------------------------------------------------------------------------|
+| `$range id exp..exp` | Sets the range of an iteration variable, which can be reused in multiple loops later.          |
+| `$for id sep [[ code ]]` | Iteration. The range of `id` must have been defined earlier. `$id` is valid in `code`.         |
+| `$($)`          | Generates a single `$` character.                                                              |
+| `$id`           | Value of the named constant or iteration variable.                                             |
+| `$(exp)`        | Value of the expression.                                                                       |
+| `$if exp [[ code ]] else_branch` | Conditional.                                                                                   |
+| `[[ code ]]`    | Meta lexical block.                                                                            |
+| `cpp_code`      | Raw C++ code.                                                                                  |
+| `$$ comment`    | Meta comment.                                                                                  |
+
+**Note:** To give the user some freedom in formatting the Pump source
+code, Pump ignores a new-line character if it's right after `$for foo`
+or next to `[[` or `]]`. Without this rule you'll often be forced to write
+very long lines to get the desired output. Therefore sometimes you may
+need to insert an extra new-line in such places for a new-line to show
+up in your output.
+
+## Grammar ##
+
+```
+code ::= atomic_code*
+atomic_code ::= $var id = exp
+    | $var id = [[ code ]]
+    | $range id exp..exp
+    | $for id sep [[ code ]]
+    | $($)
+    | $id
+    | $(exp)
+    | $if exp [[ code ]] else_branch
+    | [[ code ]]
+    | cpp_code
+sep ::= cpp_code | empty_string
+else_branch ::= $else [[ code ]]
+    | $elif exp [[ code ]] else_branch
+    | empty_string
+exp ::= simple_expression_in_Python_syntax
+```
+
+## Code ##
+
+You can find the source code of Pump in [scripts/pump.py](../scripts/pump.py). It is still
+very unpolished and lacks automated tests, although it has been
+successfully used many times. If you find a chance to use it in your
+project, please let us know what you think!  We also welcome help on
+improving Pump.
+
+## Real Examples ##
+
+You can find real-world applications of Pump in [Google Test](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgoogletest\.googlecode\.com) and [Google Mock](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgooglemock\.googlecode\.com).  The source file `foo.h.pump` generates `foo.h`.
+
+## Tips ##
+
+  * If a meta variable is followed by a letter or digit, you can separate them using `[[]]`, which inserts an empty string. For example `Foo$j[[]]Helper` generate `Foo1Helper` when `j` is 1.
+  * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/Samples.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/Samples.md
new file mode 100644
index 0000000000..f21d200567
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/Samples.md
@@ -0,0 +1,14 @@
+If you're like us, you'd like to look at some Google Test sample code.  The
+[samples folder](../samples) has a number of well-commented samples showing how to use a
+variety of Google Test features.
+
+  * [Sample #1](../samples/sample1_unittest.cc) shows the basic steps of using Google Test to test C++ functions.
+  * [Sample #2](../samples/sample2_unittest.cc) shows a more complex unit test for a class with multiple member functions.
+  * [Sample #3](../samples/sample3_unittest.cc) uses a test fixture.
+  * [Sample #4](../samples/sample4_unittest.cc) is another basic example of using Google Test.
+  * [Sample #5](../samples/sample5_unittest.cc) teaches how to reuse a test fixture in multiple test cases by deriving sub-fixtures from it.
+  * [Sample #6](../samples/sample6_unittest.cc) demonstrates type-parameterized tests.
+  * [Sample #7](../samples/sample7_unittest.cc) teaches the basics of value-parameterized tests.
+  * [Sample #8](../samples/sample8_unittest.cc) shows using `Combine()` in value-parameterized tests.
+  * [Sample #9](../samples/sample9_unittest.cc) shows use of the listener API to modify Google Test's console output and the use of its reflection API to inspect test results.
+  * [Sample #10](../samples/sample10_unittest.cc) shows use of the listener API to implement a primitive memory leak checker.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_AdvancedGuide.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_AdvancedGuide.md
new file mode 100644
index 0000000000..34e19c26fd
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_AdvancedGuide.md
@@ -0,0 +1,2096 @@
+
+
+Now that you have read [Primer](V1_5_Primer.md) and learned how to write tests
+using Google Test, it's time to learn some new tricks. This document
+will show you more assertions as well as how to construct complex
+failure messages, propagate fatal failures, reuse and speed up your
+test fixtures, and use various flags with your tests.
+
+# More Assertions #
+
+This section covers some less frequently used, but still significant,
+assertions.
+
+## Explicit Success and Failure ##
+
+These three assertions do not actually test a value or expression. Instead,
+they generate a success or failure directly. Like the macros that actually
+perform a test, you may stream a custom failure message into the them.
+
+| `SUCCEED();` |
+|:-------------|
+
+Generates a success. This does NOT make the overall test succeed. A test is
+considered successful only if none of its assertions fail during its execution.
+
+Note: `SUCCEED()` is purely documentary and currently doesn't generate any
+user-visible output. However, we may add `SUCCEED()` messages to Google Test's
+output in the future.
+
+| `FAIL();`  | `ADD_FAILURE();` |
+|:-----------|:-----------------|
+
+`FAIL*` generates a fatal failure while `ADD_FAILURE*` generates a nonfatal
+failure. These are useful when control flow, rather than a Boolean expression,
+deteremines the test's success or failure. For example, you might want to write
+something like:
+
+```
+switch(expression) {
+  case 1: ... some checks ...
+  case 2: ... some other checks
+  ...
+  default: FAIL() << "We shouldn't get here.";
+}
+```
+
+_Availability_: Linux, Windows, Mac.
+
+## Exception Assertions ##
+
+These are for verifying that a piece of code throws (or does not
+throw) an exception of the given type:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_THROW(`_statement_, _exception\_type_`);`  | `EXPECT_THROW(`_statement_, _exception\_type_`);`  | _statement_ throws an exception of the given type  |
+| `ASSERT_ANY_THROW(`_statement_`);`                | `EXPECT_ANY_THROW(`_statement_`);`                | _statement_ throws an exception of any type        |
+| `ASSERT_NO_THROW(`_statement_`);`                 | `EXPECT_NO_THROW(`_statement_`);`                 | _statement_ doesn't throw any exception            |
+
+Examples:
+
+```
+ASSERT_THROW(Foo(5), bar_exception);
+
+EXPECT_NO_THROW({
+  int n = 5;
+  Bar(&n);
+});
+```
+
+_Availability_: Linux, Windows, Mac; since version 1.1.0.
+
+## Predicate Assertions for Better Error Messages ##
+
+Even though Google Test has a rich set of assertions, they can never be
+complete, as it's impossible (nor a good idea) to anticipate all the scenarios
+a user might run into. Therefore, sometimes a user has to use `EXPECT_TRUE()`
+to check a complex expression, for lack of a better macro. This has the problem
+of not showing you the values of the parts of the expression, making it hard to
+understand what went wrong. As a workaround, some users choose to construct the
+failure message by themselves, streaming it into `EXPECT_TRUE()`. However, this
+is awkward especially when the expression has side-effects or is expensive to
+evaluate.
+
+Google Test gives you three different options to solve this problem:
+
+### Using an Existing Boolean Function ###
+
+If you already have a function or a functor that returns `bool` (or a type
+that can be implicitly converted to `bool`), you can use it in a _predicate
+assertion_ to get the function arguments printed for free:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_PRED1(`_pred1, val1_`);`       | `EXPECT_PRED1(`_pred1, val1_`);` | _pred1(val1)_ returns true |
+| `ASSERT_PRED2(`_pred2, val1, val2_`);` | `EXPECT_PRED2(`_pred2, val1, val2_`);` |  _pred2(val1, val2)_ returns true |
+|  ...                | ...                    | ...          |
+
+In the above, _predn_ is an _n_-ary predicate function or functor, where
+_val1_, _val2_, ..., and _valn_ are its arguments. The assertion succeeds
+if the predicate returns `true` when applied to the given arguments, and fails
+otherwise. When the assertion fails, it prints the value of each argument. In
+either case, the arguments are evaluated exactly once.
+
+Here's an example. Given
+
+```
+// Returns true iff m and n have no common divisors except 1.
+bool MutuallyPrime(int m, int n) { ... }
+const int a = 3;
+const int b = 4;
+const int c = 10;
+```
+
+the assertion `EXPECT_PRED2(MutuallyPrime, a, b);` will succeed, while the
+assertion `EXPECT_PRED2(MutuallyPrime, b, c);` will fail with the message
+
+<pre>
+!MutuallyPrime(b, c) is false, where<br>
+b is 4<br>
+c is 10<br>
+</pre>
+
+**Notes:**
+
+  1. If you see a compiler error "no matching function to call" when using `ASSERT_PRED*` or `EXPECT_PRED*`, please see [this](V1_5_FAQ.md#the-compiler-complains-about-undefined-references-to-some-static-const-member-variables-but-i-did-define-them-in-the-class-body-whats-wrong) for how to resolve it.
+  1. Currently we only provide predicate assertions of arity <= 5. If you need a higher-arity assertion, let us know.
+
+_Availability_: Linux, Windows, Mac
+
+### Using a Function That Returns an AssertionResult ###
+
+While `EXPECT_PRED*()` and friends are handy for a quick job, the
+syntax is not satisfactory: you have to use different macros for
+different arities, and it feels more like Lisp than C++.  The
+`::testing::AssertionResult` class solves this problem.
+
+An `AssertionResult` object represents the result of an assertion
+(whether it's a success or a failure, and an associated message).  You
+can create an `AssertionResult` using one of these factory
+functions:
+
+```
+namespace testing {
+
+// Returns an AssertionResult object to indicate that an assertion has
+// succeeded.
+AssertionResult AssertionSuccess();
+
+// Returns an AssertionResult object to indicate that an assertion has
+// failed.
+AssertionResult AssertionFailure();
+
+}
+```
+
+You can then use the `<<` operator to stream messages to the
+`AssertionResult` object.
+
+To provide more readable messages in Boolean assertions
+(e.g. `EXPECT_TRUE()`), write a predicate function that returns
+`AssertionResult` instead of `bool`. For example, if you define
+`IsEven()` as:
+
+```
+::testing::AssertionResult IsEven(int n) {
+  if ((n % 2) == 0)
+    return ::testing::AssertionSuccess();
+  else
+    return ::testing::AssertionFailure() << n << " is odd";
+}
+```
+
+instead of:
+
+```
+bool IsEven(int n) {
+  return (n % 2) == 0;
+}
+```
+
+the failed assertion `EXPECT_TRUE(IsEven(Fib(4)))` will print:
+
+<pre>
+Value of: !IsEven(Fib(4))<br>
+Actual: false (*3 is odd*)<br>
+Expected: true<br>
+</pre>
+
+instead of a more opaque
+
+<pre>
+Value of: !IsEven(Fib(4))<br>
+Actual: false<br>
+Expected: true<br>
+</pre>
+
+If you want informative messages in `EXPECT_FALSE` and `ASSERT_FALSE`
+as well, and are fine with making the predicate slower in the success
+case, you can supply a success message:
+
+```
+::testing::AssertionResult IsEven(int n) {
+  if ((n % 2) == 0)
+    return ::testing::AssertionSuccess() << n << " is even";
+  else
+    return ::testing::AssertionFailure() << n << " is odd";
+}
+```
+
+Then the statement `EXPECT_FALSE(IsEven(Fib(6)))` will print
+
+<pre>
+Value of: !IsEven(Fib(6))<br>
+Actual: true (8 is even)<br>
+Expected: false<br>
+</pre>
+
+_Availability_: Linux, Windows, Mac; since version 1.4.1.
+
+### Using a Predicate-Formatter ###
+
+If you find the default message generated by `(ASSERT|EXPECT)_PRED*` and
+`(ASSERT|EXPECT)_(TRUE|FALSE)` unsatisfactory, or some arguments to your
+predicate do not support streaming to `ostream`, you can instead use the
+following _predicate-formatter assertions_ to _fully_ customize how the
+message is formatted:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_PRED_FORMAT1(`_pred\_format1, val1_`);`        | `EXPECT_PRED_FORMAT1(`_pred\_format1, val1_`); | _pred\_format1(val1)_ is successful |
+| `ASSERT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | `EXPECT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | _pred\_format2(val1, val2)_ is successful |
+| `...`               | `...`                  | `...`        |
+
+The difference between this and the previous two groups of macros is that instead of
+a predicate, `(ASSERT|EXPECT)_PRED_FORMAT*` take a _predicate-formatter_
+(_pred\_formatn_), which is a function or functor with the signature:
+
+`::testing::AssertionResult PredicateFormattern(const char* `_expr1_`, const char* `_expr2_`, ... const char* `_exprn_`, T1 `_val1_`, T2 `_val2_`, ... Tn `_valn_`);`
+
+where _val1_, _val2_, ..., and _valn_ are the values of the predicate
+arguments, and _expr1_, _expr2_, ..., and _exprn_ are the corresponding
+expressions as they appear in the source code. The types `T1`, `T2`, ..., and
+`Tn` can be either value types or reference types. For example, if an
+argument has type `Foo`, you can declare it as either `Foo` or `const Foo&`,
+whichever is appropriate.
+
+A predicate-formatter returns a `::testing::AssertionResult` object to indicate
+whether the assertion has succeeded or not. The only way to create such an
+object is to call one of these factory functions:
+
+As an example, let's improve the failure message in the previous example, which uses `EXPECT_PRED2()`:
+
+```
+// Returns the smallest prime common divisor of m and n,
+// or 1 when m and n are mutually prime.
+int SmallestPrimeCommonDivisor(int m, int n) { ... }
+
+// A predicate-formatter for asserting that two integers are mutually prime.
+::testing::AssertionResult AssertMutuallyPrime(const char* m_expr,
+                                               const char* n_expr,
+                                               int m,
+                                               int n) {
+  if (MutuallyPrime(m, n))
+    return ::testing::AssertionSuccess();
+
+  return ::testing::AssertionFailure()
+      << m_expr << " and " << n_expr << " (" << m << " and " << n
+      << ") are not mutually prime, " << "as they have a common divisor "
+      << SmallestPrimeCommonDivisor(m, n);
+}
+```
+
+With this predicate-formatter, we can use
+
+```
+EXPECT_PRED_FORMAT2(AssertMutuallyPrime, b, c);
+```
+
+to generate the message
+
+<pre>
+b and c (4 and 10) are not mutually prime, as they have a common divisor 2.<br>
+</pre>
+
+As you may have realized, many of the assertions we introduced earlier are
+special cases of `(EXPECT|ASSERT)_PRED_FORMAT*`. In fact, most of them are
+indeed defined using `(EXPECT|ASSERT)_PRED_FORMAT*`.
+
+_Availability_: Linux, Windows, Mac.
+
+
+## Floating-Point Comparison ##
+
+Comparing floating-point numbers is tricky. Due to round-off errors, it is
+very unlikely that two floating-points will match exactly. Therefore,
+`ASSERT_EQ` 's naive comparison usually doesn't work. And since floating-points
+can have a wide value range, no single fixed error bound works. It's better to
+compare by a fixed relative error bound, except for values close to 0 due to
+the loss of precision there.
+
+In general, for floating-point comparison to make sense, the user needs to
+carefully choose the error bound. If they don't want or care to, comparing in
+terms of Units in the Last Place (ULPs) is a good default, and Google Test
+provides assertions to do this. Full details about ULPs are quite long; if you
+want to learn more, see
+[this article on float comparison](http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm).
+
+### Floating-Point Macros ###
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_FLOAT_EQ(`_expected, actual_`);`  | `EXPECT_FLOAT_EQ(`_expected, actual_`);` | the two `float` values are almost equal |
+| `ASSERT_DOUBLE_EQ(`_expected, actual_`);` | `EXPECT_DOUBLE_EQ(`_expected, actual_`);` | the two `double` values are almost equal |
+
+By "almost equal", we mean the two values are within 4 ULP's from each
+other.
+
+The following assertions allow you to choose the acceptable error bound:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_NEAR(`_val1, val2, abs\_error_`);` | `EXPECT_NEAR`_(val1, val2, abs\_error_`);` | the difference between _val1_ and _val2_ doesn't exceed the given absolute error |
+
+_Availability_: Linux, Windows, Mac.
+
+### Floating-Point Predicate-Format Functions ###
+
+Some floating-point operations are useful, but not that often used. In order
+to avoid an explosion of new macros, we provide them as predicate-format
+functions that can be used in predicate assertion macros (e.g.
+`EXPECT_PRED_FORMAT2`, etc).
+
+```
+EXPECT_PRED_FORMAT2(::testing::FloatLE, val1, val2);
+EXPECT_PRED_FORMAT2(::testing::DoubleLE, val1, val2);
+```
+
+Verifies that _val1_ is less than, or almost equal to, _val2_. You can
+replace `EXPECT_PRED_FORMAT2` in the above table with `ASSERT_PRED_FORMAT2`.
+
+_Availability_: Linux, Windows, Mac.
+
+## Windows HRESULT assertions ##
+
+These assertions test for `HRESULT` success or failure.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_HRESULT_SUCCEEDED(`_expression_`);` | `EXPECT_HRESULT_SUCCEEDED(`_expression_`);` | _expression_ is a success `HRESULT` |
+| `ASSERT_HRESULT_FAILED(`_expression_`);`    | `EXPECT_HRESULT_FAILED(`_expression_`);`    | _expression_ is a failure `HRESULT` |
+
+The generated output contains the human-readable error message
+associated with the `HRESULT` code returned by _expression_.
+
+You might use them like this:
+
+```
+CComPtr shell;
+ASSERT_HRESULT_SUCCEEDED(shell.CoCreateInstance(L"Shell.Application"));
+CComVariant empty;
+ASSERT_HRESULT_SUCCEEDED(shell->ShellExecute(CComBSTR(url), empty, empty, empty, empty));
+```
+
+_Availability_: Windows.
+
+## Type Assertions ##
+
+You can call the function
+```
+::testing::StaticAssertTypeEq<T1, T2>();
+```
+to assert that types `T1` and `T2` are the same.  The function does
+nothing if the assertion is satisfied.  If the types are different,
+the function call will fail to compile, and the compiler error message
+will likely (depending on the compiler) show you the actual values of
+`T1` and `T2`.  This is mainly useful inside template code.
+
+_Caveat:_ When used inside a member function of a class template or a
+function template, `StaticAssertTypeEq<T1, T2>()` is effective _only if_
+the function is instantiated.  For example, given:
+```
+template <typename T> class Foo {
+ public:
+  void Bar() { ::testing::StaticAssertTypeEq<int, T>(); }
+};
+```
+the code:
+```
+void Test1() { Foo<bool> foo; }
+```
+will _not_ generate a compiler error, as `Foo<bool>::Bar()` is never
+actually instantiated.  Instead, you need:
+```
+void Test2() { Foo<bool> foo; foo.Bar(); }
+```
+to cause a compiler error.
+
+_Availability:_ Linux, Windows, Mac; since version 1.3.0.
+
+## Assertion Placement ##
+
+You can use assertions in any C++ function. In particular, it doesn't
+have to be a method of the test fixture class. The one constraint is
+that assertions that generate a fatal failure (`FAIL*` and `ASSERT_*`)
+can only be used in void-returning functions. This is a consequence of
+Google Test not using exceptions. By placing it in a non-void function
+you'll get a confusing compile error like
+`"error: void value not ignored as it ought to be"`.
+
+If you need to use assertions in a function that returns non-void, one option
+is to make the function return the value in an out parameter instead. For
+example, you can rewrite `T2 Foo(T1 x)` to `void Foo(T1 x, T2* result)`. You
+need to make sure that `*result` contains some sensible value even when the
+function returns prematurely. As the function now returns `void`, you can use
+any assertion inside of it.
+
+If changing the function's type is not an option, you should just use
+assertions that generate non-fatal failures, such as `ADD_FAILURE*` and
+`EXPECT_*`.
+
+_Note_: Constructors and destructors are not considered void-returning
+functions, according to the C++ language specification, and so you may not use
+fatal assertions in them. You'll get a compilation error if you try. A simple
+workaround is to transfer the entire body of the constructor or destructor to a
+private void-returning method. However, you should be aware that a fatal
+assertion failure in a constructor does not terminate the current test, as your
+intuition might suggest; it merely returns from the constructor early, possibly
+leaving your object in a partially-constructed state. Likewise, a fatal
+assertion failure in a destructor may leave your object in a
+partially-destructed state. Use assertions carefully in these situations!
+
+# Death Tests #
+
+In many applications, there are assertions that can cause application failure
+if a condition is not met. These sanity checks, which ensure that the program
+is in a known good state, are there to fail at the earliest possible time after
+some program state is corrupted. If the assertion checks the wrong condition,
+then the program may proceed in an erroneous state, which could lead to memory
+corruption, security holes, or worse. Hence it is vitally important to test
+that such assertion statements work as expected.
+
+Since these precondition checks cause the processes to die, we call such tests
+_death tests_. More generally, any test that checks that a program terminates
+in an expected fashion is also a death test.
+
+If you want to test `EXPECT_*()/ASSERT_*()` failures in your test code, see [Catching Failures](#catching-failures).
+
+## How to Write a Death Test ##
+
+Google Test has the following macros to support death tests:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_DEATH(`_statement, regex_`); | `EXPECT_DEATH(`_statement, regex_`); | _statement_ crashes with the given error |
+| `ASSERT_DEATH_IF_SUPPORTED(`_statement, regex_`); | `EXPECT_DEATH_IF_SUPPORTED(`_statement, regex_`); | if death tests are supported, verifies that _statement_ crashes with the given error; otherwise verifies nothing |
+| `ASSERT_EXIT(`_statement, predicate, regex_`); | `EXPECT_EXIT(`_statement, predicate, regex_`); |_statement_ exits with the given error and its exit code matches _predicate_ |
+
+where _statement_ is a statement that is expected to cause the process to
+die, _predicate_ is a function or function object that evaluates an integer
+exit status, and _regex_ is a regular expression that the stderr output of
+_statement_ is expected to match. Note that _statement_ can be _any valid
+statement_ (including _compound statement_) and doesn't have to be an
+expression.
+
+As usual, the `ASSERT` variants abort the current test function, while the
+`EXPECT` variants do not.
+
+**Note:** We use the word "crash" here to mean that the process
+terminates with a _non-zero_ exit status code.  There are two
+possibilities: either the process has called `exit()` or `_exit()`
+with a non-zero value, or it may be killed by a signal.
+
+This means that if _statement_ terminates the process with a 0 exit
+code, it is _not_ considered a crash by `EXPECT_DEATH`.  Use
+`EXPECT_EXIT` instead if this is the case, or if you want to restrict
+the exit code more precisely.
+
+A predicate here must accept an `int` and return a `bool`. The death test
+succeeds only if the predicate returns `true`. Google Test defines a few
+predicates that handle the most common cases:
+
+```
+::testing::ExitedWithCode(exit_code)
+```
+
+This expression is `true` if the program exited normally with the given exit
+code.
+
+```
+::testing::KilledBySignal(signal_number)  // Not available on Windows.
+```
+
+This expression is `true` if the program was killed by the given signal.
+
+The `*_DEATH` macros are convenient wrappers for `*_EXIT` that use a predicate
+that verifies the process' exit code is non-zero.
+
+Note that a death test only cares about three things:
+
+  1. does _statement_ abort or exit the process?
+  1. (in the case of `ASSERT_EXIT` and `EXPECT_EXIT`) does the exit status satisfy _predicate_?  Or (in the case of `ASSERT_DEATH` and `EXPECT_DEATH`) is the exit status non-zero?  And
+  1. does the stderr output match _regex_?
+
+In particular, if _statement_ generates an `ASSERT_*` or `EXPECT_*` failure, it will **not** cause the death test to fail, as Google Test assertions don't abort the process.
+
+To write a death test, simply use one of the above macros inside your test
+function. For example,
+
+```
+TEST(My*DeathTest*, Foo) {
+  // This death test uses a compound statement.
+  ASSERT_DEATH({ int n = 5; Foo(&n); }, "Error on line .* of Foo()");
+}
+TEST(MyDeathTest, NormalExit) {
+  EXPECT_EXIT(NormalExit(), ::testing::ExitedWithCode(0), "Success");
+}
+TEST(MyDeathTest, KillMyself) {
+  EXPECT_EXIT(KillMyself(), ::testing::KilledBySignal(SIGKILL), "Sending myself unblockable signal");
+}
+```
+
+verifies that:
+
+  * calling `Foo(5)` causes the process to die with the given error message,
+  * calling `NormalExit()` causes the process to print `"Success"` to stderr and exit with exit code 0, and
+  * calling `KillMyself()` kills the process with signal `SIGKILL`.
+
+The test function body may contain other assertions and statements as well, if
+necessary.
+
+_Important:_ We strongly recommend you to follow the convention of naming your
+test case (not test) `*DeathTest` when it contains a death test, as
+demonstrated in the above example. The `Death Tests And Threads` section below
+explains why.
+
+If a test fixture class is shared by normal tests and death tests, you
+can use typedef to introduce an alias for the fixture class and avoid
+duplicating its code:
+```
+class FooTest : public ::testing::Test { ... };
+
+typedef FooTest FooDeathTest;
+
+TEST_F(FooTest, DoesThis) {
+  // normal test
+}
+
+TEST_F(FooDeathTest, DoesThat) {
+  // death test
+}
+```
+
+_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Cygwin, and Mac (the latter three are supported since v1.3.0).  `(ASSERT|EXPECT)_DEATH_IF_SUPPORTED` are new in v1.4.0.
+
+## Regular Expression Syntax ##
+
+On POSIX systems (e.g. Linux, Cygwin, and Mac), Google Test uses the
+[POSIX extended regular expression](http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04)
+syntax in death tests. To learn about this syntax, you may want to read this [Wikipedia entry](http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions).
+
+On Windows, Google Test uses its own simple regular expression
+implementation. It lacks many features you can find in POSIX extended
+regular expressions.  For example, we don't support union (`"x|y"`),
+grouping (`"(xy)"`), brackets (`"[xy]"`), and repetition count
+(`"x{5,7}"`), among others. Below is what we do support (`A` denotes a
+literal character, period (`.`), or a single `\\` escape sequence; `x`
+and `y` denote regular expressions.):
+
+| `c` | matches any literal character `c` |
+|:----|:----------------------------------|
+| `\\d` | matches any decimal digit         |
+| `\\D` | matches any character that's not a decimal digit |
+| `\\f` | matches `\f`                      |
+| `\\n` | matches `\n`                      |
+| `\\r` | matches `\r`                      |
+| `\\s` | matches any ASCII whitespace, including `\n` |
+| `\\S` | matches any character that's not a whitespace |
+| `\\t` | matches `\t`                      |
+| `\\v` | matches `\v`                      |
+| `\\w` | matches any letter, `_`, or decimal digit |
+| `\\W` | matches any character that `\\w` doesn't match |
+| `\\c` | matches any literal character `c`, which must be a punctuation |
+| `.` | matches any single character except `\n` |
+| `A?` | matches 0 or 1 occurrences of `A` |
+| `A*` | matches 0 or many occurrences of `A` |
+| `A+` | matches 1 or many occurrences of `A` |
+| `^` | matches the beginning of a string (not that of each line) |
+| `$` | matches the end of a string (not that of each line) |
+| `xy` | matches `x` followed by `y`       |
+
+To help you determine which capability is available on your system,
+Google Test defines macro `GTEST_USES_POSIX_RE=1` when it uses POSIX
+extended regular expressions, or `GTEST_USES_SIMPLE_RE=1` when it uses
+the simple version.  If you want your death tests to work in both
+cases, you can either `#if` on these macros or use the more limited
+syntax only.
+
+## How It Works ##
+
+Under the hood, `ASSERT_EXIT()` spawns a new process and executes the
+death test statement in that process. The details of of how precisely
+that happens depend on the platform and the variable
+`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the
+command-line flag `--gtest_death_test_style`).
+
+  * On POSIX systems, `fork()` (or `clone()` on Linux) is used to spawn the child, after which:
+    * If the variable's value is `"fast"`, the death test statement is immediately executed.
+    * If the variable's value is `"threadsafe"`, the child process re-executes the unit test binary just as it was originally invoked, but with some extra flags to cause just the single death test under consideration to be run.
+  * On Windows, the child is spawned using the `CreateProcess()` API, and re-executes the binary to cause just the single death test under consideration to be run - much like the `threadsafe` mode on POSIX.
+
+Other values for the variable are illegal and will cause the death test to
+fail. Currently, the flag's default value is `"fast"`. However, we reserve the
+right to change it in the future. Therefore, your tests should not depend on
+this.
+
+In either case, the parent process waits for the child process to complete, and checks that
+
+  1. the child's exit status satisfies the predicate, and
+  1. the child's stderr matches the regular expression.
+
+If the death test statement runs to completion without dying, the child
+process will nonetheless terminate, and the assertion fails.
+
+## Death Tests And Threads ##
+
+The reason for the two death test styles has to do with thread safety. Due to
+well-known problems with forking in the presence of threads, death tests should
+be run in a single-threaded context. Sometimes, however, it isn't feasible to
+arrange that kind of environment. For example, statically-initialized modules
+may start threads before main is ever reached. Once threads have been created,
+it may be difficult or impossible to clean them up.
+
+Google Test has three features intended to raise awareness of threading issues.
+
+  1. A warning is emitted if multiple threads are running when a death test is encountered.
+  1. Test cases with a name ending in "DeathTest" are run before all other tests.
+  1. It uses `clone()` instead of `fork()` to spawn the child process on Linux (`clone()` is not available on Cygwin and Mac), as `fork()` is more likely to cause the child to hang when the parent process has multiple threads.
+
+It's perfectly fine to create threads inside a death test statement; they are
+executed in a separate process and cannot affect the parent.
+
+## Death Test Styles ##
+
+The "threadsafe" death test style was introduced in order to help mitigate the
+risks of testing in a possibly multithreaded environment. It trades increased
+test execution time (potentially dramatically so) for improved thread safety.
+We suggest using the faster, default "fast" style unless your test has specific
+problems with it.
+
+You can choose a particular style of death tests by setting the flag
+programmatically:
+
+```
+::testing::FLAGS_gtest_death_test_style = "threadsafe";
+```
+
+You can do this in `main()` to set the style for all death tests in the
+binary, or in individual tests. Recall that flags are saved before running each
+test and restored afterwards, so you need not do that yourself. For example:
+
+```
+TEST(MyDeathTest, TestOne) {
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
+  // This test is run in the "threadsafe" style:
+  ASSERT_DEATH(ThisShouldDie(), "");
+}
+
+TEST(MyDeathTest, TestTwo) {
+  // This test is run in the "fast" style:
+  ASSERT_DEATH(ThisShouldDie(), "");
+}
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  ::testing::FLAGS_gtest_death_test_style = "fast";
+  return RUN_ALL_TESTS();
+}
+```
+
+## Caveats ##
+
+The _statement_ argument of `ASSERT_EXIT()` can be any valid C++ statement
+except that it can not return from the current function. This means
+_statement_ should not contain `return` or a macro that might return (e.g.
+`ASSERT_TRUE()` ). If _statement_ returns before it crashes, Google Test will
+print an error message, and the test will fail.
+
+Since _statement_ runs in the child process, any in-memory side effect (e.g.
+modifying a variable, releasing memory, etc) it causes will _not_ be observable
+in the parent process. In particular, if you release memory in a death test,
+your program will fail the heap check as the parent process will never see the
+memory reclaimed. To solve this problem, you can
+
+  1. try not to free memory in a death test;
+  1. free the memory again in the parent process; or
+  1. do not use the heap checker in your program.
+
+Due to an implementation detail, you cannot place multiple death test
+assertions on the same line; otherwise, compilation will fail with an unobvious
+error message.
+
+Despite the improved thread safety afforded by the "threadsafe" style of death
+test, thread problems such as deadlock are still possible in the presence of
+handlers registered with `pthread_atfork(3)`.
+
+# Using Assertions in Sub-routines #
+
+## Adding Traces to Assertions ##
+
+If a test sub-routine is called from several places, when an assertion
+inside it fails, it can be hard to tell which invocation of the
+sub-routine the failure is from.  You can alleviate this problem using
+extra logging or custom failure messages, but that usually clutters up
+your tests. A better solution is to use the `SCOPED_TRACE` macro:
+
+| `SCOPED_TRACE(`_message_`);` |
+|:-----------------------------|
+
+where _message_ can be anything streamable to `std::ostream`. This
+macro will cause the current file name, line number, and the given
+message to be added in every failure message. The effect will be
+undone when the control leaves the current lexical scope.
+
+For example,
+
+```
+10: void Sub1(int n) {
+11:   EXPECT_EQ(1, Bar(n));
+12:   EXPECT_EQ(2, Bar(n + 1));
+13: }
+14:
+15: TEST(FooTest, Bar) {
+16:   {
+17:     SCOPED_TRACE("A");  // This trace point will be included in
+18:                         // every failure in this scope.
+19:     Sub1(1);
+20:   }
+21:   // Now it won't.
+22:   Sub1(9);
+23: }
+```
+
+could result in messages like these:
+
+```
+path/to/foo_test.cc:11: Failure
+Value of: Bar(n)
+Expected: 1
+  Actual: 2
+   Trace:
+path/to/foo_test.cc:17: A
+
+path/to/foo_test.cc:12: Failure
+Value of: Bar(n + 1)
+Expected: 2
+  Actual: 3
+```
+
+Without the trace, it would've been difficult to know which invocation
+of `Sub1()` the two failures come from respectively. (You could add an
+extra message to each assertion in `Sub1()` to indicate the value of
+`n`, but that's tedious.)
+
+Some tips on using `SCOPED_TRACE`:
+
+  1. With a suitable message, it's often enough to use `SCOPED_TRACE` at the beginning of a sub-routine, instead of at each call site.
+  1. When calling sub-routines inside a loop, make the loop iterator part of the message in `SCOPED_TRACE` such that you can know which iteration the failure is from.
+  1. Sometimes the line number of the trace point is enough for identifying the particular invocation of a sub-routine. In this case, you don't have to choose a unique message for `SCOPED_TRACE`. You can simply use `""`.
+  1. You can use `SCOPED_TRACE` in an inner scope when there is one in the outer scope. In this case, all active trace points will be included in the failure messages, in reverse order they are encountered.
+  1. The trace dump is clickable in Emacs' compilation buffer - hit return on a line number and you'll be taken to that line in the source file!
+
+_Availability:_ Linux, Windows, Mac.
+
+## Propagating Fatal Failures ##
+
+A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that
+when they fail they only abort the _current function_, not the entire test. For
+example, the following test will segfault:
+```
+void Subroutine() {
+  // Generates a fatal failure and aborts the current function.
+  ASSERT_EQ(1, 2);
+  // The following won't be executed.
+  ...
+}
+
+TEST(FooTest, Bar) {
+  Subroutine();
+  // The intended behavior is for the fatal failure
+  // in Subroutine() to abort the entire test.
+  // The actual behavior: the function goes on after Subroutine() returns.
+  int* p = NULL;
+  *p = 3; // Segfault!
+}
+```
+
+Since we don't use exceptions, it is technically impossible to
+implement the intended behavior here.  To alleviate this, Google Test
+provides two solutions.  You could use either the
+`(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the
+`HasFatalFailure()` function.  They are described in the following two
+subsections.
+
+
+
+### Asserting on Subroutines ###
+
+As shown above, if your test calls a subroutine that has an `ASSERT_*`
+failure in it, the test will continue after the subroutine
+returns. This may not be what you want.
+
+Often people want fatal failures to propagate like exceptions.  For
+that Google Test offers the following macros:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_NO_FATAL_FAILURE(`_statement_`);` | `EXPECT_NO_FATAL_FAILURE(`_statement_`);` | _statement_ doesn't generate any new fatal failures in the current thread. |
+
+Only failures in the thread that executes the assertion are checked to
+determine the result of this type of assertions.  If _statement_
+creates new threads, failures in these threads are ignored.
+
+Examples:
+
+```
+ASSERT_NO_FATAL_FAILURE(Foo());
+
+int i;
+EXPECT_NO_FATAL_FAILURE({
+  i = Bar();
+});
+```
+
+_Availability:_ Linux, Windows, Mac. Assertions from multiple threads
+are currently not supported.
+
+### Checking for Failures in the Current Test ###
+
+`HasFatalFailure()` in the `::testing::Test` class returns `true` if an
+assertion in the current test has suffered a fatal failure. This
+allows functions to catch fatal failures in a sub-routine and return
+early.
+
+```
+class Test {
+ public:
+  ...
+  static bool HasFatalFailure();
+};
+```
+
+The typical usage, which basically simulates the behavior of a thrown
+exception, is:
+
+```
+TEST(FooTest, Bar) {
+  Subroutine();
+  // Aborts if Subroutine() had a fatal failure.
+  if (HasFatalFailure())
+    return;
+  // The following won't be executed.
+  ...
+}
+```
+
+If `HasFatalFailure()` is used outside of `TEST()` , `TEST_F()` , or a test
+fixture, you must add the `::testing::Test::` prefix, as in:
+
+```
+if (::testing::Test::HasFatalFailure())
+  return;
+```
+
+Similarly, `HasNonfatalFailure()` returns `true` if the current test
+has at least one non-fatal failure, and `HasFailure()` returns `true`
+if the current test has at least one failure of either kind.
+
+_Availability:_ Linux, Windows, Mac.  `HasNonfatalFailure()` and
+`HasFailure()` are available since version 1.4.0.
+
+# Logging Additional Information #
+
+In your test code, you can call `RecordProperty("key", value)` to log
+additional information, where `value` can be either a C string or a 32-bit
+integer. The _last_ value recorded for a key will be emitted to the XML output
+if you specify one. For example, the test
+
+```
+TEST_F(WidgetUsageTest, MinAndMaxWidgets) {
+  RecordProperty("MaximumWidgets", ComputeMaxUsage());
+  RecordProperty("MinimumWidgets", ComputeMinUsage());
+}
+```
+
+will output XML like this:
+
+```
+...
+  <testcase name="MinAndMaxWidgets" status="run" time="6" classname="WidgetUsageTest"
+            MaximumWidgets="12"
+            MinimumWidgets="9" />
+...
+```
+
+_Note_:
+  * `RecordProperty()` is a static member of the `Test` class. Therefore it needs to be prefixed with `::testing::Test::` if used outside of the `TEST` body and the test fixture class.
+  * `key` must be a valid XML attribute name, and cannot conflict with the ones already used by Google Test (`name`, `status`,     `time`, and `classname`).
+
+_Availability_: Linux, Windows, Mac.
+
+# Sharing Resources Between Tests in the Same Test Case #
+
+
+
+Google Test creates a new test fixture object for each test in order to make
+tests independent and easier to debug. However, sometimes tests use resources
+that are expensive to set up, making the one-copy-per-test model prohibitively
+expensive.
+
+If the tests don't change the resource, there's no harm in them sharing a
+single resource copy. So, in addition to per-test set-up/tear-down, Google Test
+also supports per-test-case set-up/tear-down. To use it:
+
+  1. In your test fixture class (say `FooTest` ), define as `static` some member variables to hold the shared resources.
+  1. In the same test fixture class, define a `static void SetUpTestCase()` function (remember not to spell it as **`SetupTestCase`** with a small `u`!) to set up the shared resources and a `static void TearDownTestCase()` function to tear them down.
+
+That's it! Google Test automatically calls `SetUpTestCase()` before running the
+_first test_ in the `FooTest` test case (i.e. before creating the first
+`FooTest` object), and calls `TearDownTestCase()` after running the _last test_
+in it (i.e. after deleting the last `FooTest` object). In between, the tests
+can use the shared resources.
+
+Remember that the test order is undefined, so your code can't depend on a test
+preceding or following another. Also, the tests must either not modify the
+state of any shared resource, or, if they do modify the state, they must
+restore the state to its original value before passing control to the next
+test.
+
+Here's an example of per-test-case set-up and tear-down:
+```
+class FooTest : public ::testing::Test {
+ protected:
+  // Per-test-case set-up.
+  // Called before the first test in this test case.
+  // Can be omitted if not needed.
+  static void SetUpTestCase() {
+    shared_resource_ = new ...;
+  }
+
+  // Per-test-case tear-down.
+  // Called after the last test in this test case.
+  // Can be omitted if not needed.
+  static void TearDownTestCase() {
+    delete shared_resource_;
+    shared_resource_ = NULL;
+  }
+
+  // You can define per-test set-up and tear-down logic as usual.
+  virtual void SetUp() { ... }
+  virtual void TearDown() { ... }
+
+  // Some expensive resource shared by all tests.
+  static T* shared_resource_;
+};
+
+T* FooTest::shared_resource_ = NULL;
+
+TEST_F(FooTest, Test1) {
+  ... you can refer to shared_resource here ...
+}
+TEST_F(FooTest, Test2) {
+  ... you can refer to shared_resource here ...
+}
+```
+
+_Availability:_ Linux, Windows, Mac.
+
+# Global Set-Up and Tear-Down #
+
+Just as you can do set-up and tear-down at the test level and the test case
+level, you can also do it at the test program level. Here's how.
+
+First, you subclass the `::testing::Environment` class to define a test
+environment, which knows how to set-up and tear-down:
+
+```
+class Environment {
+ public:
+  virtual ~Environment() {}
+  // Override this to define how to set up the environment.
+  virtual void SetUp() {}
+  // Override this to define how to tear down the environment.
+  virtual void TearDown() {}
+};
+```
+
+Then, you register an instance of your environment class with Google Test by
+calling the `::testing::AddGlobalTestEnvironment()` function:
+
+```
+Environment* AddGlobalTestEnvironment(Environment* env);
+```
+
+Now, when `RUN_ALL_TESTS()` is called, it first calls the `SetUp()` method of
+the environment object, then runs the tests if there was no fatal failures, and
+finally calls `TearDown()` of the environment object.
+
+It's OK to register multiple environment objects. In this case, their `SetUp()`
+will be called in the order they are registered, and their `TearDown()` will be
+called in the reverse order.
+
+Note that Google Test takes ownership of the registered environment objects.
+Therefore **do not delete them** by yourself.
+
+You should call `AddGlobalTestEnvironment()` before `RUN_ALL_TESTS()` is
+called, probably in `main()`. If you use `gtest_main`, you need to      call
+this before `main()` starts for it to take effect. One way to do this is to
+define a global variable like this:
+
+```
+::testing::Environment* const foo_env = ::testing::AddGlobalTestEnvironment(new FooEnvironment);
+```
+
+However, we strongly recommend you to write your own `main()` and call
+`AddGlobalTestEnvironment()` there, as relying on initialization of global
+variables makes the code harder to read and may cause problems when you
+register multiple environments from different translation units and the
+environments have dependencies among them (remember that the compiler doesn't
+guarantee the order in which global variables from different translation units
+are initialized).
+
+_Availability:_ Linux, Windows, Mac.
+
+
+# Value Parameterized Tests #
+
+_Value-parameterized tests_ allow you to test your code with different
+parameters without writing multiple copies of the same test.
+
+Suppose you write a test for your code and then realize that your code is affected by a presence of a Boolean command line flag.
+
+```
+TEST(MyCodeTest, TestFoo) {
+  // A code to test foo().
+}
+```
+
+Usually people factor their test code into a function with a Boolean parameter in such situations. The function sets the flag, then executes the testing code.
+
+```
+void TestFooHelper(bool flag_value) {
+  flag = flag_value;
+  // A code to test foo().
+}
+
+TEST(MyCodeTest, TestFooo) {
+  TestFooHelper(false);
+  TestFooHelper(true);
+}
+```
+
+But this setup has serious drawbacks. First, when a test assertion fails in your tests, it becomes unclear what value of the parameter caused it to fail. You can stream a clarifying message into your `EXPECT`/`ASSERT` statements, but it you'll have to do it with all of them. Second, you have to add one such helper function per test. What if you have ten tests? Twenty? A hundred?
+
+Value-parameterized tests will let you write your test only once and then easily instantiate and run it with an arbitrary number of parameter values.
+
+Here are some other situations when value-parameterized tests come handy:
+
+  * You wan to test different implementations of an OO interface.
+  * You want to test your code over various inputs (a.k.a. data-driven testing). This feature is easy to abuse, so please exercise your good sense when doing it!
+
+## How to Write Value-Parameterized Tests ##
+
+To write value-parameterized tests, first you should define a fixture
+class. It must be derived from `::testing::TestWithParam<T>`, where `T`
+is the type of your parameter values. `TestWithParam<T>` is itself
+derived from `::testing::Test`. `T` can be any copyable type. If it's
+a raw pointer, you are responsible for managing the lifespan of the
+pointed values.
+
+```
+class FooTest : public ::testing::TestWithParam<const char*> {
+  // You can implement all the usual fixture class members here.
+  // To access the test parameter, call GetParam() from class
+  // TestWithParam<T>.
+};
+```
+
+Then, use the `TEST_P` macro to define as many test patterns using
+this fixture as you want.  The `_P` suffix is for "parameterized" or
+"pattern", whichever you prefer to think.
+
+```
+TEST_P(FooTest, DoesBlah) {
+  // Inside a test, access the test parameter with the GetParam() method
+  // of the TestWithParam<T> class:
+  EXPECT_TRUE(foo.Blah(GetParam()));
+  ...
+}
+
+TEST_P(FooTest, HasBlahBlah) {
+  ...
+}
+```
+
+Finally, you can use `INSTANTIATE_TEST_CASE_P` to instantiate the test
+case with any set of parameters you want. Google Test defines a number of
+functions for generating test parameters. They return what we call
+(surprise!) _parameter generators_. Here is a summary of them,
+which are all in the `testing` namespace:
+
+| `Range(begin, end[, step])` | Yields values `{begin, begin+step, begin+step+step, ...}`. The values do not include `end`. `step` defaults to 1. |
+|:----------------------------|:------------------------------------------------------------------------------------------------------------------|
+| `Values(v1, v2, ..., vN)`   | Yields values `{v1, v2, ..., vN}`.                                                                                |
+| `ValuesIn(container)` and `ValuesIn(begin, end)` | Yields values from a C-style array, an STL-style container, or an iterator range `[begin, end)`.                  |
+| `Bool()`                    | Yields sequence `{false, true}`.                                                                                  |
+| `Combine(g1, g2, ..., gN)`  | Yields all combinations (the Cartesian product for the math savvy) of the values generated by the `N` generators. This is only available if your system provides the `<tr1/tuple>` header. If you are sure your system does, and Google Test disagrees, you can override it by defining `GTEST_HAS_TR1_TUPLE=1`. See comments in [include/gtest/internal/gtest-port.h](../include/gtest/internal/gtest-port.h) for more information. |
+
+For more details, see the comments at the definitions of these functions in the [source code](../include/gtest/gtest-param-test.h).
+
+The following statement will instantiate tests from the `FooTest` test case
+each with parameter values `"meeny"`, `"miny"`, and `"moe"`.
+
+```
+INSTANTIATE_TEST_CASE_P(InstantiationName,
+                        FooTest,
+                        ::testing::Values("meeny", "miny", "moe"));
+```
+
+To distinguish different instances of the pattern (yes, you can
+instantiate it more than once), the first argument to
+`INSTANTIATE_TEST_CASE_P` is a prefix that will be added to the actual
+test case name. Remember to pick unique prefixes for different
+instantiations. The tests from the instantiation above will have these
+names:
+
+  * `InstantiationName/FooTest.DoesBlah/0` for `"meeny"`
+  * `InstantiationName/FooTest.DoesBlah/1` for `"miny"`
+  * `InstantiationName/FooTest.DoesBlah/2` for `"moe"`
+  * `InstantiationName/FooTest.HasBlahBlah/0` for `"meeny"`
+  * `InstantiationName/FooTest.HasBlahBlah/1` for `"miny"`
+  * `InstantiationName/FooTest.HasBlahBlah/2` for `"moe"`
+
+You can use these names in [--gtest\-filter](#running-a-subset-of-the-tests).
+
+This statement will instantiate all tests from `FooTest` again, each
+with parameter values `"cat"` and `"dog"`:
+
+```
+const char* pets[] = {"cat", "dog"};
+INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest,
+                        ::testing::ValuesIn(pets));
+```
+
+The tests from the instantiation above will have these names:
+
+  * `AnotherInstantiationName/FooTest.DoesBlah/0` for `"cat"`
+  * `AnotherInstantiationName/FooTest.DoesBlah/1` for `"dog"`
+  * `AnotherInstantiationName/FooTest.HasBlahBlah/0` for `"cat"`
+  * `AnotherInstantiationName/FooTest.HasBlahBlah/1` for `"dog"`
+
+Please note that `INSTANTIATE_TEST_CASE_P` will instantiate _all_
+tests in the given test case, whether their definitions come before or
+_after_ the `INSTANTIATE_TEST_CASE_P` statement.
+
+You can see
+[these](../samples/sample7_unittest.cc)
+[files](../samples/sample8_unittest.cc) for more examples.
+
+_Availability_: Linux, Windows (requires MSVC 8.0 or above), Mac; since version 1.2.0.
+
+## Creating Value-Parameterized Abstract Tests ##
+
+In the above, we define and instantiate `FooTest` in the same source
+file. Sometimes you may want to define value-parameterized tests in a
+library and let other people instantiate them later. This pattern is
+known as <i>abstract tests</i>. As an example of its application, when you
+are designing an interface you can write a standard suite of abstract
+tests (perhaps using a factory function as the test parameter) that
+all implementations of the interface are expected to pass. When
+someone implements the interface, he can instantiate your suite to get
+all the interface-conformance tests for free.
+
+To define abstract tests, you should organize your code like this:
+
+  1. Put the definition of the parameterized test fixture class (e.g. `FooTest`) in a header file, say `foo_param_test.h`. Think of this as _declaring_ your abstract tests.
+  1. Put the `TEST_P` definitions in `foo_param_test.cc`, which includes `foo_param_test.h`. Think of this as _implementing_ your abstract tests.
+
+Once they are defined, you can instantiate them by including
+`foo_param_test.h`, invoking `INSTANTIATE_TEST_CASE_P()`, and linking
+with `foo_param_test.cc`. You can instantiate the same abstract test
+case multiple times, possibly in different source files.
+
+# Typed Tests #
+
+Suppose you have multiple implementations of the same interface and
+want to make sure that all of them satisfy some common requirements.
+Or, you may have defined several types that are supposed to conform to
+the same "concept" and you want to verify it.  In both cases, you want
+the same test logic repeated for different types.
+
+While you can write one `TEST` or `TEST_F` for each type you want to
+test (and you may even factor the test logic into a function template
+that you invoke from the `TEST`), it's tedious and doesn't scale:
+if you want _m_ tests over _n_ types, you'll end up writing _m\*n_
+`TEST`s.
+
+_Typed tests_ allow you to repeat the same test logic over a list of
+types.  You only need to write the test logic once, although you must
+know the type list when writing typed tests.  Here's how you do it:
+
+First, define a fixture class template.  It should be parameterized
+by a type.  Remember to derive it from `::testing::Test`:
+
+```
+template <typename T>
+class FooTest : public ::testing::Test {
+ public:
+  ...
+  typedef std::list<T> List;
+  static T shared_;
+  T value_;
+};
+```
+
+Next, associate a list of types with the test case, which will be
+repeated for each type in the list:
+
+```
+typedef ::testing::Types<char, int, unsigned int> MyTypes;
+TYPED_TEST_CASE(FooTest, MyTypes);
+```
+
+The `typedef` is necessary for the `TYPED_TEST_CASE` macro to parse
+correctly.  Otherwise the compiler will think that each comma in the
+type list introduces a new macro argument.
+
+Then, use `TYPED_TEST()` instead of `TEST_F()` to define a typed test
+for this test case.  You can repeat this as many times as you want:
+
+```
+TYPED_TEST(FooTest, DoesBlah) {
+  // Inside a test, refer to the special name TypeParam to get the type
+  // parameter.  Since we are inside a derived class template, C++ requires
+  // us to visit the members of FooTest via 'this'.
+  TypeParam n = this->value_;
+
+  // To visit static members of the fixture, add the 'TestFixture::'
+  // prefix.
+  n += TestFixture::shared_;
+
+  // To refer to typedefs in the fixture, add the 'typename TestFixture::'
+  // prefix.  The 'typename' is required to satisfy the compiler.
+  typename TestFixture::List values;
+  values.push_back(n);
+  ...
+}
+
+TYPED_TEST(FooTest, HasPropertyA) { ... }
+```
+
+You can see `samples/sample6_unittest.cc` for a complete example.
+
+_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac;
+since version 1.1.0.
+
+# Type-Parameterized Tests #
+
+_Type-parameterized tests_ are like typed tests, except that they
+don't require you to know the list of types ahead of time.  Instead,
+you can define the test logic first and instantiate it with different
+type lists later.  You can even instantiate it more than once in the
+same program.
+
+If you are designing an interface or concept, you can define a suite
+of type-parameterized tests to verify properties that any valid
+implementation of the interface/concept should have.  Then, the author
+of each implementation can just instantiate the test suite with his
+type to verify that it conforms to the requirements, without having to
+write similar tests repeatedly.  Here's an example:
+
+First, define a fixture class template, as we did with typed tests:
+
+```
+template <typename T>
+class FooTest : public ::testing::Test {
+  ...
+};
+```
+
+Next, declare that you will define a type-parameterized test case:
+
+```
+TYPED_TEST_CASE_P(FooTest);
+```
+
+The `_P` suffix is for "parameterized" or "pattern", whichever you
+prefer to think.
+
+Then, use `TYPED_TEST_P()` to define a type-parameterized test.  You
+can repeat this as many times as you want:
+
+```
+TYPED_TEST_P(FooTest, DoesBlah) {
+  // Inside a test, refer to TypeParam to get the type parameter.
+  TypeParam n = 0;
+  ...
+}
+
+TYPED_TEST_P(FooTest, HasPropertyA) { ... }
+```
+
+Now the tricky part: you need to register all test patterns using the
+`REGISTER_TYPED_TEST_CASE_P` macro before you can instantiate them.
+The first argument of the macro is the test case name; the rest are
+the names of the tests in this test case:
+
+```
+REGISTER_TYPED_TEST_CASE_P(FooTest,
+                           DoesBlah, HasPropertyA);
+```
+
+Finally, you are free to instantiate the pattern with the types you
+want.  If you put the above code in a header file, you can `#include`
+it in multiple C++ source files and instantiate it multiple times.
+
+```
+typedef ::testing::Types<char, int, unsigned int> MyTypes;
+INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
+```
+
+To distinguish different instances of the pattern, the first argument
+to the `INSTANTIATE_TYPED_TEST_CASE_P` macro is a prefix that will be
+added to the actual test case name.  Remember to pick unique prefixes
+for different instances.
+
+In the special case where the type list contains only one type, you
+can write that type directly without `::testing::Types<...>`, like this:
+
+```
+INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int);
+```
+
+You can see `samples/sample6_unittest.cc` for a complete example.
+
+_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac;
+since version 1.1.0.
+
+# Testing Private Code #
+
+If you change your software's internal implementation, your tests should not
+break as long as the change is not observable by users. Therefore, per the
+_black-box testing principle_, most of the time you should test your code
+through its public interfaces.
+
+If you still find yourself needing to test internal implementation code,
+consider if there's a better design that wouldn't require you to do so. If you
+absolutely have to test non-public interface code though, you can. There are
+two cases to consider:
+
+  * Static functions (_not_ the same as static member functions!) or unnamed namespaces, and
+  * Private or protected class members
+
+## Static Functions ##
+
+Both static functions and definitions/declarations in an unnamed namespace are
+only visible within the same translation unit. To test them, you can `#include`
+the entire `.cc` file being tested in your `*_test.cc` file. (`#include`ing `.cc`
+files is not a good way to reuse code - you should not do this in production
+code!)
+
+However, a better approach is to move the private code into the
+`foo::internal` namespace, where `foo` is the namespace your project normally
+uses, and put the private declarations in a `*-internal.h` file. Your
+production `.cc` files and your tests are allowed to include this internal
+header, but your clients are not. This way, you can fully test your internal
+implementation without leaking it to your clients.
+
+## Private Class Members ##
+
+Private class members are only accessible from within the class or by friends.
+To access a class' private members, you can declare your test fixture as a
+friend to the class and define accessors in your fixture. Tests using the
+fixture can then access the private members of your production class via the
+accessors in the fixture. Note that even though your fixture is a friend to
+your production class, your tests are not automatically friends to it, as they
+are technically defined in sub-classes of the fixture.
+
+Another way to test private members is to refactor them into an implementation
+class, which is then declared in a `*-internal.h` file. Your clients aren't
+allowed to include this header but your tests can. Such is called the Pimpl
+(Private Implementation) idiom.
+
+Or, you can declare an individual test as a friend of your class by adding this
+line in the class body:
+
+```
+FRIEND_TEST(TestCaseName, TestName);
+```
+
+For example,
+```
+// foo.h
+#include <gtest/gtest_prod.h>
+
+// Defines FRIEND_TEST.
+class Foo {
+  ...
+ private:
+  FRIEND_TEST(FooTest, BarReturnsZeroOnNull);
+  int Bar(void* x);
+};
+
+// foo_test.cc
+...
+TEST(FooTest, BarReturnsZeroOnNull) {
+  Foo foo;
+  EXPECT_EQ(0, foo.Bar(NULL));
+  // Uses Foo's private member Bar().
+}
+```
+
+Pay special attention when your class is defined in a namespace, as you should
+define your test fixtures and tests in the same namespace if you want them to
+be friends of your class. For example, if the code to be tested looks like:
+
+```
+namespace my_namespace {
+
+class Foo {
+  friend class FooTest;
+  FRIEND_TEST(FooTest, Bar);
+  FRIEND_TEST(FooTest, Baz);
+  ...
+  definition of the class Foo
+  ...
+};
+
+}  // namespace my_namespace
+```
+
+Your test code should be something like:
+
+```
+namespace my_namespace {
+class FooTest : public ::testing::Test {
+ protected:
+  ...
+};
+
+TEST_F(FooTest, Bar) { ... }
+TEST_F(FooTest, Baz) { ... }
+
+}  // namespace my_namespace
+```
+
+# Catching Failures #
+
+If you are building a testing utility on top of Google Test, you'll
+want to test your utility.  What framework would you use to test it?
+Google Test, of course.
+
+The challenge is to verify that your testing utility reports failures
+correctly.  In frameworks that report a failure by throwing an
+exception, you could catch the exception and assert on it.  But Google
+Test doesn't use exceptions, so how do we test that a piece of code
+generates an expected failure?
+
+`<gtest/gtest-spi.h>` contains some constructs to do this.  After
+`#include`ing this header, you can use
+
+| `EXPECT_FATAL_FAILURE(`_statement, substring_`);` |
+|:--------------------------------------------------|
+
+to assert that _statement_ generates a fatal (e.g. `ASSERT_*`) failure
+whose message contains the given _substring_, or use
+
+| `EXPECT_NONFATAL_FAILURE(`_statement, substring_`);` |
+|:-----------------------------------------------------|
+
+if you are expecting a non-fatal (e.g. `EXPECT_*`) failure.
+
+For technical reasons, there are some caveats:
+
+  1. You cannot stream a failure message to either macro.
+  1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot reference local non-static variables or non-static members of `this` object.
+  1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot return a value.
+
+_Note:_ Google Test is designed with threads in mind.  Once the
+synchronization primitives in `<gtest/internal/gtest-port.h>` have
+been implemented, Google Test will become thread-safe, meaning that
+you can then use assertions in multiple threads concurrently.  Before
+
+that, however, Google Test only supports single-threaded usage.  Once
+thread-safe, `EXPECT_FATAL_FAILURE()` and `EXPECT_NONFATAL_FAILURE()`
+will capture failures in the current thread only. If _statement_
+creates new threads, failures in these threads will be ignored.  If
+you want to capture failures from all threads instead, you should use
+the following macros:
+
+| `EXPECT_FATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` |
+|:-----------------------------------------------------------------|
+| `EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` |
+
+# Getting the Current Test's Name #
+
+Sometimes a function may need to know the name of the currently running test.
+For example, you may be using the `SetUp()` method of your test fixture to set
+the golden file name based on which test is running. The `::testing::TestInfo`
+class has this information:
+
+```
+namespace testing {
+
+class TestInfo {
+ public:
+  // Returns the test case name and the test name, respectively.
+  //
+  // Do NOT delete or free the return value - it's managed by the
+  // TestInfo class.
+  const char* test_case_name() const;
+  const char* name() const;
+};
+
+}  // namespace testing
+```
+
+
+> To obtain a `TestInfo` object for the currently running test, call
+`current_test_info()` on the `UnitTest` singleton object:
+
+```
+// Gets information about the currently running test.
+// Do NOT delete the returned object - it's managed by the UnitTest class.
+const ::testing::TestInfo* const test_info =
+  ::testing::UnitTest::GetInstance()->current_test_info();
+printf("We are in test %s of test case %s.\n",
+       test_info->name(), test_info->test_case_name());
+```
+
+`current_test_info()` returns a null pointer if no test is running. In
+particular, you cannot find the test case name in `TestCaseSetUp()`,
+`TestCaseTearDown()` (where you know the test case name implicitly), or
+functions called from them.
+
+_Availability:_ Linux, Windows, Mac.
+
+# Extending Google Test by Handling Test Events #
+
+Google Test provides an <b>event listener API</b> to let you receive
+notifications about the progress of a test program and test
+failures. The events you can listen to include the start and end of
+the test program, a test case, or a test method, among others. You may
+use this API to augment or replace the standard console output,
+replace the XML output, or provide a completely different form of
+output, such as a GUI or a database. You can also use test events as
+checkpoints to implement a resource leak checker, for example.
+
+_Availability:_ Linux, Windows, Mac; since v1.4.0.
+
+## Defining Event Listeners ##
+
+To define a event listener, you subclass either
+[testing::TestEventListener](../include/gtest/gtest.h#L855)
+or [testing::EmptyTestEventListener](../include/gtest/gtest.h#L905).
+The former is an (abstract) interface, where <i>each pure virtual method<br>
+can be overridden to handle a test event</i> (For example, when a test
+starts, the `OnTestStart()` method will be called.). The latter provides
+an empty implementation of all methods in the interface, such that a
+subclass only needs to override the methods it cares about.
+
+When an event is fired, its context is passed to the handler function
+as an argument. The following argument types are used:
+  * [UnitTest](../include/gtest/gtest.h#L1007) reflects the state of the entire test program,
+  * [TestCase](../include/gtest/gtest.h#L689) has information about a test case, which can contain one or more tests,
+  * [TestInfo](../include/gtest/gtest.h#L599) contains the state of a test, and
+  * [TestPartResult](../include/gtest/gtest-test-part.h#L42) represents the result of a test assertion.
+
+An event handler function can examine the argument it receives to find
+out interesting information about the event and the test program's
+state.  Here's an example:
+
+```
+  class MinimalistPrinter : public ::testing::EmptyTestEventListener {
+    // Called before a test starts.
+    virtual void OnTestStart(const ::testing::TestInfo& test_info) {
+      printf("*** Test %s.%s starting.\n",
+             test_info.test_case_name(), test_info.name());
+    }
+
+    // Called after a failed assertion or a SUCCESS().
+    virtual void OnTestPartResult(
+        const ::testing::TestPartResult& test_part_result) {
+      printf("%s in %s:%d\n%s\n",
+             test_part_result.failed() ? "*** Failure" : "Success",
+             test_part_result.file_name(),
+             test_part_result.line_number(),
+             test_part_result.summary());
+    }
+
+    // Called after a test ends.
+    virtual void OnTestEnd(const ::testing::TestInfo& test_info) {
+      printf("*** Test %s.%s ending.\n",
+             test_info.test_case_name(), test_info.name());
+    }
+  };
+```
+
+## Using Event Listeners ##
+
+To use the event listener you have defined, add an instance of it to
+the Google Test event listener list (represented by class
+[TestEventListeners](../include/gtest/gtest.h#L929)
+- note the "s" at the end of the name) in your
+`main()` function, before calling `RUN_ALL_TESTS()`:
+```
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  // Gets hold of the event listener list.
+  ::testing::TestEventListeners& listeners =
+      ::testing::UnitTest::GetInstance()->listeners();
+  // Adds a listener to the end.  Google Test takes the ownership.
+  listeners.Append(new MinimalistPrinter);
+  return RUN_ALL_TESTS();
+}
+```
+
+There's only one problem: the default test result printer is still in
+effect, so its output will mingle with the output from your minimalist
+printer. To suppress the default printer, just release it from the
+event listener list and delete it. You can do so by adding one line:
+```
+  ...
+  delete listeners.Release(listeners.default_result_printer());
+  listeners.Append(new MinimalistPrinter);
+  return RUN_ALL_TESTS();
+```
+
+Now, sit back and enjoy a completely different output from your
+tests. For more details, you can read this
+[sample](../samples/sample9_unittest.cc).
+
+You may append more than one listener to the list. When an `On*Start()`
+or `OnTestPartResult()` event is fired, the listeners will receive it in
+the order they appear in the list (since new listeners are added to
+the end of the list, the default text printer and the default XML
+generator will receive the event first). An `On*End()` event will be
+received by the listeners in the _reverse_ order. This allows output by
+listeners added later to be framed by output from listeners added
+earlier.
+
+## Generating Failures in Listeners ##
+
+You may use failure-raising macros (`EXPECT_*()`, `ASSERT_*()`,
+`FAIL()`, etc) when processing an event. There are some restrictions:
+
+  1. You cannot generate any failure in `OnTestPartResult()` (otherwise it will cause `OnTestPartResult()` to be called recursively).
+  1. A listener that handles `OnTestPartResult()` is not allowed to generate any failure.
+
+When you add listeners to the listener list, you should put listeners
+that handle `OnTestPartResult()` _before_ listeners that can generate
+failures. This ensures that failures generated by the latter are
+attributed to the right test by the former.
+
+We have a sample of failure-raising listener
+[here](../samples/sample10_unittest.cc).
+
+# Running Test Programs: Advanced Options #
+
+Google Test test programs are ordinary executables. Once built, you can run
+them directly and affect their behavior via the following environment variables
+and/or command line flags. For the flags to work, your programs must call
+`::testing::InitGoogleTest()` before calling `RUN_ALL_TESTS()`.
+
+To see a list of supported flags and their usage, please run your test
+program with the `--help` flag.  You can also use `-h`, `-?`, or `/?`
+for short.  This feature is added in version 1.3.0.
+
+If an option is specified both by an environment variable and by a
+flag, the latter takes precedence.  Most of the options can also be
+set/read in code: to access the value of command line flag
+`--gtest_foo`, write `::testing::GTEST_FLAG(foo)`.  A common pattern is
+to set the value of a flag before calling `::testing::InitGoogleTest()`
+to change the default value of the flag:
+```
+int main(int argc, char** argv) {
+  // Disables elapsed time by default.
+  ::testing::GTEST_FLAG(print_time) = false;
+
+  // This allows the user to override the flag on the command line.
+  ::testing::InitGoogleTest(&argc, argv);
+
+  return RUN_ALL_TESTS();
+}
+```
+
+## Selecting Tests ##
+
+This section shows various options for choosing which tests to run.
+
+### Listing Test Names ###
+
+Sometimes it is necessary to list the available tests in a program before
+running them so that a filter may be applied if needed. Including the flag
+`--gtest_list_tests` overrides all other flags and lists tests in the following
+format:
+```
+TestCase1.
+  TestName1
+  TestName2
+TestCase2.
+  TestName
+```
+
+None of the tests listed are actually run if the flag is provided. There is no
+corresponding environment variable for this flag.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Running a Subset of the Tests ###
+
+By default, a Google Test program runs all tests the user has defined.
+Sometimes, you want to run only a subset of the tests (e.g. for debugging or
+quickly verifying a change). If you set the `GTEST_FILTER` environment variable
+or the `--gtest_filter` flag to a filter string, Google Test will only run the
+tests whose full names (in the form of `TestCaseName.TestName`) match the
+filter.
+
+The format of a filter is a '`:`'-separated list of wildcard patterns (called
+the positive patterns) optionally followed by a '`-`' and another
+'`:`'-separated pattern list (called the negative patterns). A test matches the
+filter if and only if it matches any of the positive patterns but does not
+match any of the negative patterns.
+
+A pattern may contain `'*'` (matches any string) or `'?'` (matches any single
+character). For convenience, the filter `'*-NegativePatterns'` can be also
+written as `'-NegativePatterns'`.
+
+For example:
+
+  * `./foo_test` Has no flag, and thus runs all its tests.
+  * `./foo_test --gtest_filter=*` Also runs everything, due to the single match-everything `*` value.
+  * `./foo_test --gtest_filter=FooTest.*` Runs everything in test case `FooTest`.
+  * `./foo_test --gtest_filter=*Null*:*Constructor*` Runs any test whose full name contains either `"Null"` or `"Constructor"`.
+  * `./foo_test --gtest_filter=-*DeathTest.*` Runs all non-death tests.
+  * `./foo_test --gtest_filter=FooTest.*-FooTest.Bar` Runs everything in test case `FooTest` except `FooTest.Bar`.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Temporarily Disabling Tests ###
+
+If you have a broken test that you cannot fix right away, you can add the
+`DISABLED_` prefix to its name. This will exclude it from execution. This is
+better than commenting out the code or using `#if 0`, as disabled tests are
+still compiled (and thus won't rot).
+
+If you need to disable all tests in a test case, you can either add `DISABLED_`
+to the front of the name of each test, or alternatively add it to the front of
+the test case name.
+
+For example, the following tests won't be run by Google Test, even though they
+will still be compiled:
+
+```
+// Tests that Foo does Abc.
+TEST(FooTest, DISABLED_DoesAbc) { ... }
+
+class DISABLED_BarTest : public ::testing::Test { ... };
+
+// Tests that Bar does Xyz.
+TEST_F(DISABLED_BarTest, DoesXyz) { ... }
+```
+
+_Note:_ This feature should only be used for temporary pain-relief. You still
+have to fix the disabled tests at a later date. As a reminder, Google Test will
+print a banner warning you if a test program contains any disabled tests.
+
+_Tip:_ You can easily count the number of disabled tests you have
+using `grep`. This number can be used as a metric for improving your
+test quality.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Temporarily Enabling Disabled Tests ###
+
+To include [disabled tests](#temporarily-disabling-tests) in test
+execution, just invoke the test program with the
+`--gtest_also_run_disabled_tests` flag or set the
+`GTEST_ALSO_RUN_DISABLED_TESTS` environment variable to a value other
+than `0`.  You can combine this with the
+[--gtest\_filter](#running-a-subset-of-the-tests) flag to further select
+which disabled tests to run.
+
+_Availability:_ Linux, Windows, Mac; since version 1.3.0.
+
+## Repeating the Tests ##
+
+Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it
+will fail only 1% of the time, making it rather hard to reproduce the bug under
+a debugger. This can be a major source of frustration.
+
+The `--gtest_repeat` flag allows you to repeat all (or selected) test methods
+in a program many times. Hopefully, a flaky test will eventually fail and give
+you a chance to debug. Here's how to use it:
+
+| `$ foo_test --gtest_repeat=1000` | Repeat foo\_test 1000 times and don't stop at failures. |
+|:---------------------------------|:--------------------------------------------------------|
+| `$ foo_test --gtest_repeat=-1`   | A negative count means repeating forever.               |
+| `$ foo_test --gtest_repeat=1000 --gtest_break_on_failure` | Repeat foo\_test 1000 times, stopping at the first failure. This is especially useful when running under a debugger: when the testfails, it will drop into the debugger and you can then inspect variables and stacks. |
+| `$ foo_test --gtest_repeat=1000 --gtest_filter=FooBar` | Repeat the tests whose name matches the filter 1000 times. |
+
+If your test program contains global set-up/tear-down code registered
+using `AddGlobalTestEnvironment()`, it will be repeated in each
+iteration as well, as the flakiness may be in it. You can also specify
+the repeat count by setting the `GTEST_REPEAT` environment variable.
+
+_Availability:_ Linux, Windows, Mac.
+
+## Shuffling the Tests ##
+
+You can specify the `--gtest_shuffle` flag (or set the `GTEST_SHUFFLE`
+environment variable to `1`) to run the tests in a program in a random
+order. This helps to reveal bad dependencies between tests.
+
+By default, Google Test uses a random seed calculated from the current
+time. Therefore you'll get a different order every time. The console
+output includes the random seed value, such that you can reproduce an
+order-related test failure later. To specify the random seed
+explicitly, use the `--gtest_random_seed=SEED` flag (or set the
+`GTEST_RANDOM_SEED` environment variable), where `SEED` is an integer
+between 0 and 99999. The seed value 0 is special: it tells Google Test
+to do the default behavior of calculating the seed from the current
+time.
+
+If you combine this with `--gtest_repeat=N`, Google Test will pick a
+different random seed and re-shuffle the tests in each iteration.
+
+_Availability:_ Linux, Windows, Mac; since v1.4.0.
+
+## Controlling Test Output ##
+
+This section teaches how to tweak the way test results are reported.
+
+### Colored Terminal Output ###
+
+Google Test can use colors in its terminal output to make it easier to spot
+the separation between tests, and whether tests passed.
+
+You can set the GTEST\_COLOR environment variable or set the `--gtest_color`
+command line flag to `yes`, `no`, or `auto` (the default) to enable colors,
+disable colors, or let Google Test decide. When the value is `auto`, Google
+Test will use colors if and only if the output goes to a terminal and (on
+non-Windows platforms) the `TERM` environment variable is set to `xterm` or
+`xterm-color`.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Suppressing the Elapsed Time ###
+
+By default, Google Test prints the time it takes to run each test.  To
+suppress that, run the test program with the `--gtest_print_time=0`
+command line flag.  Setting the `GTEST_PRINT_TIME` environment
+variable to `0` has the same effect.
+
+_Availability:_ Linux, Windows, Mac.  (In Google Test 1.3.0 and lower,
+the default behavior is that the elapsed time is **not** printed.)
+
+### Generating an XML Report ###
+
+Google Test can emit a detailed XML report to a file in addition to its normal
+textual output. The report contains the duration of each test, and thus can
+help you identify slow tests.
+
+To generate the XML report, set the `GTEST_OUTPUT` environment variable or the
+`--gtest_output` flag to the string `"xml:_path_to_output_file_"`, which will
+create the file at the given location. You can also just use the string
+`"xml"`, in which case the output can be found in the `test_detail.xml` file in
+the current directory.
+
+If you specify a directory (for example, `"xml:output/directory/"` on Linux or
+`"xml:output\directory\"` on Windows), Google Test will create the XML file in
+that directory, named after the test executable (e.g. `foo_test.xml` for test
+program `foo_test` or `foo_test.exe`). If the file already exists (perhaps left
+over from a previous run), Google Test will pick a different name (e.g.
+`foo_test_1.xml`) to avoid overwriting it.
+
+The report uses the format described here.  It is based on the
+`junitreport` Ant task and can be parsed by popular continuous build
+systems like [Hudson](https://hudson.dev.java.net/). Since that format
+was originally intended for Java, a little interpretation is required
+to make it apply to Google Test tests, as shown here:
+
+```
+<testsuites name="AllTests" ...>
+  <testsuite name="test_case_name" ...>
+    <testcase name="test_name" ...>
+      <failure message="..."/>
+      <failure message="..."/>
+      <failure message="..."/>
+    </testcase>
+  </testsuite>
+</testsuites>
+```
+
+  * The root `<testsuites>` element corresponds to the entire test program.
+  * `<testsuite>` elements correspond to Google Test test cases.
+  * `<testcase>` elements correspond to Google Test test functions.
+
+For instance, the following program
+
+```
+TEST(MathTest, Addition) { ... }
+TEST(MathTest, Subtraction) { ... }
+TEST(LogicTest, NonContradiction) { ... }
+```
+
+could generate this report:
+
+```
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="3" failures="1" errors="0" time="35" name="AllTests">
+  <testsuite name="MathTest" tests="2" failures="1"* errors="0" time="15">
+    <testcase name="Addition" status="run" time="7" classname="">
+      <failure message="Value of: add(1, 1)&#x0A; Actual: 3&#x0A;Expected: 2" type=""/>
+      <failure message="Value of: add(1, -1)&#x0A; Actual: 1&#x0A;Expected: 0" type=""/>
+    </testcase>
+    <testcase name="Subtraction" status="run" time="5" classname="">
+    </testcase>
+  </testsuite>
+  <testsuite name="LogicTest" tests="1" failures="0" errors="0" time="5">
+    <testcase name="NonContradiction" status="run" time="5" classname="">
+    </testcase>
+  </testsuite>
+</testsuites>
+```
+
+Things to note:
+
+  * The `tests` attribute of a `<testsuites>` or `<testsuite>` element tells how many test functions the Google Test program or test case contains, while the `failures` attribute tells how many of them failed.
+  * The `time` attribute expresses the duration of the test, test case, or entire test program in milliseconds.
+  * Each `<failure>` element corresponds to a single failed Google Test assertion.
+  * Some JUnit concepts don't apply to Google Test, yet we have to conform to the DTD. Therefore you'll see some dummy elements and attributes in the report. You can safely ignore these parts.
+
+_Availability:_ Linux, Windows, Mac.
+
+## Controlling How Failures Are Reported ##
+
+### Turning Assertion Failures into Break-Points ###
+
+When running test programs under a debugger, it's very convenient if the
+debugger can catch an assertion failure and automatically drop into interactive
+mode. Google Test's _break-on-failure_ mode supports this behavior.
+
+To enable it, set the `GTEST_BREAK_ON_FAILURE` environment variable to a value
+other than `0` . Alternatively, you can use the `--gtest_break_on_failure`
+command line flag.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Suppressing Pop-ups Caused by Exceptions ###
+
+On Windows, Google Test may be used with exceptions enabled. Even when
+exceptions are disabled, an application can still throw structured exceptions
+(SEH's). If a test throws an exception, by default Google Test doesn't try to
+catch it. Instead, you'll see a pop-up dialog, at which point you can attach
+the process to a debugger and easily find out what went wrong.
+
+However, if you don't want to see the pop-ups (for example, if you run the
+tests in a batch job), set the `GTEST_CATCH_EXCEPTIONS` environment variable to
+a non- `0` value, or use the `--gtest_catch_exceptions` flag. Google Test now
+catches all test-thrown exceptions and logs them as failures.
+
+_Availability:_ Windows. `GTEST_CATCH_EXCEPTIONS` and
+`--gtest_catch_exceptions` have no effect on Google Test's behavior on Linux or
+Mac, even if exceptions are enabled. It is possible to add support for catching
+exceptions on these platforms, but it is not implemented yet.
+
+### Letting Another Testing Framework Drive ###
+
+If you work on a project that has already been using another testing
+framework and is not ready to completely switch to Google Test yet,
+you can get much of Google Test's benefit by using its assertions in
+your existing tests.  Just change your `main()` function to look
+like:
+
+```
+#include <gtest/gtest.h>
+
+int main(int argc, char** argv) {
+  ::testing::GTEST_FLAG(throw_on_failure) = true;
+  // Important: Google Test must be initialized.
+  ::testing::InitGoogleTest(&argc, argv);
+
+  ... whatever your existing testing framework requires ...
+}
+```
+
+With that, you can use Google Test assertions in addition to the
+native assertions your testing framework provides, for example:
+
+```
+void TestFooDoesBar() {
+  Foo foo;
+  EXPECT_LE(foo.Bar(1), 100);     // A Google Test assertion.
+  CPPUNIT_ASSERT(foo.IsEmpty());  // A native assertion.
+}
+```
+
+If a Google Test assertion fails, it will print an error message and
+throw an exception, which will be treated as a failure by your host
+testing framework.  If you compile your code with exceptions disabled,
+a failed Google Test assertion will instead exit your program with a
+non-zero code, which will also signal a test failure to your test
+runner.
+
+If you don't write `::testing::GTEST_FLAG(throw_on_failure) = true;` in
+your `main()`, you can alternatively enable this feature by specifying
+the `--gtest_throw_on_failure` flag on the command-line or setting the
+`GTEST_THROW_ON_FAILURE` environment variable to a non-zero value.
+
+_Availability:_ Linux, Windows, Mac; since v1.3.0.
+
+## Distributing Test Functions to Multiple Machines ##
+
+If you have more than one machine you can use to run a test program,
+you might want to run the test functions in parallel and get the
+result faster.  We call this technique _sharding_, where each machine
+is called a _shard_.
+
+Google Test is compatible with test sharding.  To take advantage of
+this feature, your test runner (not part of Google Test) needs to do
+the following:
+
+  1. Allocate a number of machines (shards) to run the tests.
+  1. On each shard, set the `GTEST_TOTAL_SHARDS` environment variable to the total number of shards.  It must be the same for all shards.
+  1. On each shard, set the `GTEST_SHARD_INDEX` environment variable to the index of the shard.  Different shards must be assigned different indices, which must be in the range `[0, GTEST_TOTAL_SHARDS - 1]`.
+  1. Run the same test program on all shards.  When Google Test sees the above two environment variables, it will select a subset of the test functions to run.  Across all shards, each test function in the program will be run exactly once.
+  1. Wait for all shards to finish, then collect and report the results.
+
+Your project may have tests that were written without Google Test and
+thus don't understand this protocol.  In order for your test runner to
+figure out which test supports sharding, it can set the environment
+variable `GTEST_SHARD_STATUS_FILE` to a non-existent file path.  If a
+test program supports sharding, it will create this file to
+acknowledge the fact (the actual contents of the file are not
+important at this time; although we may stick some useful information
+in it in the future.); otherwise it will not create it.
+
+Here's an example to make it clear.  Suppose you have a test program
+`foo_test` that contains the following 5 test functions:
+```
+TEST(A, V)
+TEST(A, W)
+TEST(B, X)
+TEST(B, Y)
+TEST(B, Z)
+```
+and you have 3 machines at your disposal.  To run the test functions in
+parallel, you would set `GTEST_TOTAL_SHARDS` to 3 on all machines, and
+set `GTEST_SHARD_INDEX` to 0, 1, and 2 on the machines respectively.
+Then you would run the same `foo_test` on each machine.
+
+Google Test reserves the right to change how the work is distributed
+across the shards, but here's one possible scenario:
+
+  * Machine #0 runs `A.V` and `B.X`.
+  * Machine #1 runs `A.W` and `B.Y`.
+  * Machine #2 runs `B.Z`.
+
+_Availability:_ Linux, Windows, Mac; since version 1.3.0.
+
+# Fusing Google Test Source Files #
+
+Google Test's implementation consists of ~30 files (excluding its own
+tests).  Sometimes you may want them to be packaged up in two files (a
+`.h` and a `.cc`) instead, such that you can easily copy them to a new
+machine and start hacking there.  For this we provide an experimental
+Python script `fuse_gtest_files.py` in the `scripts/` directory (since release 1.3.0).
+Assuming you have Python 2.4 or above installed on your machine, just
+go to that directory and run
+```
+python fuse_gtest_files.py OUTPUT_DIR
+```
+
+and you should see an `OUTPUT_DIR` directory being created with files
+`gtest/gtest.h` and `gtest/gtest-all.cc` in it.  These files contain
+everything you need to use Google Test.  Just copy them to anywhere
+you want and you are ready to write tests.  You can use the
+[scrpts/test/Makefile](../scripts/test/Makefile)
+file as an example on how to compile your tests against them.
+
+# Where to Go from Here #
+
+Congratulations! You've now learned more advanced Google Test tools and are
+ready to tackle more complex testing tasks. If you want to dive even deeper, you
+can read the [FAQ](V1_5_FAQ.md).
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_Documentation.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_Documentation.md
new file mode 100644
index 0000000000..46bba2ec86
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_Documentation.md
@@ -0,0 +1,12 @@
+This page lists all official documentation wiki pages for Google Test **1.5.0** -- **if you use a different version of Google Test, make sure to read the documentation for that version instead.**
+
+  * [Primer](V1_5_Primer.md) -- start here if you are new to Google Test.
+  * [Samples](Samples.md) -- learn from examples.
+  * [AdvancedGuide](V1_5_AdvancedGuide.md) -- learn more about Google Test.
+  * [XcodeGuide](V1_5_XcodeGuide.md) -- how to use Google Test in Xcode on Mac.
+  * [Frequently-Asked Questions](V1_5_FAQ.md) -- check here before asking a question on the mailing list.
+
+To contribute code to Google Test, read:
+
+  * DevGuide -- read this _before_ writing your first patch.
+  * [PumpManual](V1_5_PumpManual.md) -- how we generate some of Google Test's source files.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_FAQ.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_FAQ.md
new file mode 100644
index 0000000000..e870aff000
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_FAQ.md
@@ -0,0 +1,886 @@
+
+
+If you cannot find the answer to your question here, and you have read
+[Primer](V1_5_Primer.md) and [AdvancedGuide](V1_5_AdvancedGuide.md), send it to
+googletestframework@googlegroups.com.
+
+## Why should I use Google Test instead of my favorite C++ testing framework? ##
+
+First, let's say clearly that we don't want to get into the debate of
+which C++ testing framework is **the best**.  There exist many fine
+frameworks for writing C++ tests, and we have tremendous respect for
+the developers and users of them.  We don't think there is (or will
+be) a single best framework - you have to pick the right tool for the
+particular task you are tackling.
+
+We created Google Test because we couldn't find the right combination
+of features and conveniences in an existing framework to satisfy _our_
+needs.  The following is a list of things that _we_ like about Google
+Test.  We don't claim them to be unique to Google Test - rather, the
+combination of them makes Google Test the choice for us.  We hope this
+list can help you decide whether it is for you too.
+
+  * Google Test is designed to be portable.  It works where many STL types (e.g. `std::string` and `std::vector`) don't compile.  It doesn't require exceptions or RTTI.  As a result, it runs on Linux, Mac OS X, Windows and several embedded operating systems.
+  * Nonfatal assertions (`EXPECT_*`) have proven to be great time savers, as they allow a test to report multiple failures in a single edit-compile-test cycle.
+  * It's easy to write assertions that generate informative messages: you just use the stream syntax to append any additional information, e.g. `ASSERT_EQ(5, Foo(i)) << " where i = " << i;`.  It doesn't require a new set of macros or special functions.
+  * Google Test automatically detects your tests and doesn't require you to enumerate them in order to run them.
+  * No framework can anticipate all your needs, so Google Test provides `EXPECT_PRED*` to make it easy to extend your assertion vocabulary.  For a nicer syntax, you can define your own assertion macros trivially in terms of `EXPECT_PRED*`.
+  * Death tests are pretty handy for ensuring that your asserts in production code are triggered by the right conditions.
+  * `SCOPED_TRACE` helps you understand the context of an assertion failure when it comes from inside a sub-routine or loop.
+  * You can decide which tests to run using name patterns.  This saves time when you want to quickly reproduce a test failure.
+
+## How do I generate 64-bit binaries on Windows (using Visual Studio 2008)? ##
+
+(Answered by Trevor Robinson)
+
+Load the supplied Visual Studio solution file, either `msvc\gtest-md.sln` or
+`msvc\gtest.sln`. Go through the migration wizard to migrate the
+solution and project files to Visual Studio 2008. Select
+`Configuration Manager...` from the `Build` menu. Select `<New...>` from
+the `Active solution platform` dropdown.  Select `x64` from the new
+platform dropdown, leave `Copy settings from` set to `Win32` and
+`Create new project platforms` checked, then click `OK`. You now have
+`Win32` and `x64` platform configurations, selectable from the
+`Standard` toolbar, which allow you to toggle between building 32-bit or
+64-bit binaries (or both at once using Batch Build).
+
+In order to prevent build output files from overwriting one another,
+you'll need to change the `Intermediate Directory` settings for the
+newly created platform configuration across all the projects. To do
+this, multi-select (e.g. using shift-click) all projects (but not the
+solution) in the `Solution Explorer`. Right-click one of them and
+select `Properties`. In the left pane, select `Configuration Properties`,
+and from the `Configuration` dropdown, select `All Configurations`.
+Make sure the selected platform is `x64`. For the
+`Intermediate Directory` setting, change the value from
+`$(PlatformName)\$(ConfigurationName)` to
+`$(OutDir)\$(ProjectName)`. Click `OK` and then build the
+solution. When the build is complete, the 64-bit binaries will be in
+the `msvc\x64\Debug` directory.
+
+## Can I use Google Test on MinGW? ##
+
+We haven't tested this ourselves, but Per Abrahamsen reported that he
+was able to compile and install Google Test successfully when using
+MinGW from Cygwin.  You'll need to configure it with:
+
+`PATH/TO/configure CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin"`
+
+You should be able to replace the `-mno-cygwin` option with direct links
+to the real MinGW binaries, but we haven't tried that.
+
+Caveats:
+
+  * There are many warnings when compiling.
+  * `make check` will produce some errors as not all tests for Google Test itself are compatible with MinGW.
+
+We also have reports on successful cross compilation of Google Test MinGW binaries on Linux using [these instructions](http://wiki.wxwidgets.org/Cross-Compiling_Under_Linux#Cross-compiling_under_Linux_for_MS_Windows) on the WxWidgets site.
+
+Please contact `googletestframework@googlegroups.com` if you are
+interested in improving the support for MinGW.
+
+## Why does Google Test support EXPECT\_EQ(NULL, ptr) and ASSERT\_EQ(NULL, ptr) but not EXPECT\_NE(NULL, ptr) and ASSERT\_NE(NULL, ptr)? ##
+
+Due to some peculiarity of C++, it requires some non-trivial template
+meta programming tricks to support using `NULL` as an argument of the
+`EXPECT_XX()` and `ASSERT_XX()` macros. Therefore we only do it where
+it's most needed (otherwise we make the implementation of Google Test
+harder to maintain and more error-prone than necessary).
+
+The `EXPECT_EQ()` macro takes the _expected_ value as its first
+argument and the _actual_ value as the second. It's reasonable that
+someone wants to write `EXPECT_EQ(NULL, some_expression)`, and this
+indeed was requested several times. Therefore we implemented it.
+
+The need for `EXPECT_NE(NULL, ptr)` isn't nearly as strong. When the
+assertion fails, you already know that `ptr` must be `NULL`, so it
+doesn't add any information to print ptr in this case. That means
+`EXPECT_TRUE(ptr ! NULL)` works just as well.
+
+If we were to support `EXPECT_NE(NULL, ptr)`, for consistency we'll
+have to support `EXPECT_NE(ptr, NULL)` as well, as unlike `EXPECT_EQ`,
+we don't have a convention on the order of the two arguments for
+`EXPECT_NE`. This means using the template meta programming tricks
+twice in the implementation, making it even harder to understand and
+maintain. We believe the benefit doesn't justify the cost.
+
+Finally, with the growth of Google Mock's [matcher](../../CookBook.md#using-matchers-in-google-test-assertions) library, we are
+encouraging people to use the unified `EXPECT_THAT(value, matcher)`
+syntax more often in tests. One significant advantage of the matcher
+approach is that matchers can be easily combined to form new matchers,
+while the `EXPECT_NE`, etc, macros cannot be easily
+combined. Therefore we want to invest more in the matchers than in the
+`EXPECT_XX()` macros.
+
+## Does Google Test support running tests in parallel? ##
+
+Test runners tend to be tightly coupled with the build/test
+environment, and Google Test doesn't try to solve the problem of
+running tests in parallel.  Instead, we tried to make Google Test work
+nicely with test runners.  For example, Google Test's XML report
+contains the time spent on each test, and its `gtest_list_tests` and
+`gtest_filter` flags can be used for splitting the execution of test
+methods into multiple processes.  These functionalities can help the
+test runner run the tests in parallel.
+
+## Why don't Google Test run the tests in different threads to speed things up? ##
+
+It's difficult to write thread-safe code.  Most tests are not written
+with thread-safety in mind, and thus may not work correctly in a
+multi-threaded setting.
+
+If you think about it, it's already hard to make your code work when
+you know what other threads are doing.  It's much harder, and
+sometimes even impossible, to make your code work when you don't know
+what other threads are doing (remember that test methods can be added,
+deleted, or modified after your test was written).  If you want to run
+the tests in parallel, you'd better run them in different processes.
+
+## Why aren't Google Test assertions implemented using exceptions? ##
+
+Our original motivation was to be able to use Google Test in projects
+that disable exceptions.  Later we realized some additional benefits
+of this approach:
+
+  1. Throwing in a destructor is undefined behavior in C++.  Not using exceptions means Google Test's assertions are safe to use in destructors.
+  1. The `EXPECT_*` family of macros will continue even after a failure, allowing multiple failures in a `TEST` to be reported in a single run. This is a popular feature, as in C++ the edit-compile-test cycle is usually quite long and being able to fixing more than one thing at a time is a blessing.
+  1. If assertions are implemented using exceptions, a test may falsely ignore a failure if it's caught by user code:
+```
+try { ... ASSERT_TRUE(...) ... }
+catch (...) { ... }
+```
+The above code will pass even if the `ASSERT_TRUE` throws.  While it's unlikely for someone to write this in a test, it's possible to run into this pattern when you write assertions in callbacks that are called by the code under test.
+
+The downside of not using exceptions is that `ASSERT_*` (implemented
+using `return`) will only abort the current function, not the current
+`TEST`.
+
+## Why do we use two different macros for tests with and without fixtures? ##
+
+Unfortunately, C++'s macro system doesn't allow us to use the same
+macro for both cases.  One possibility is to provide only one macro
+for tests with fixtures, and require the user to define an empty
+fixture sometimes:
+
+```
+class FooTest : public ::testing::Test {};
+
+TEST_F(FooTest, DoesThis) { ... }
+```
+or
+```
+typedef ::testing::Test FooTest;
+
+TEST_F(FooTest, DoesThat) { ... }
+```
+
+Yet, many people think this is one line too many. :-) Our goal was to
+make it really easy to write tests, so we tried to make simple tests
+trivial to create.  That means using a separate macro for such tests.
+
+We think neither approach is ideal, yet either of them is reasonable.
+In the end, it probably doesn't matter much either way.
+
+## Why don't we use structs as test fixtures? ##
+
+We like to use structs only when representing passive data.  This
+distinction between structs and classes is good for documenting the
+intent of the code's author.  Since test fixtures have logic like
+`SetUp()` and `TearDown()`, they are better defined as classes.
+
+## Why are death tests implemented as assertions instead of using a test runner? ##
+
+Our goal was to make death tests as convenient for a user as C++
+possibly allows.  In particular:
+
+  * The runner-style requires to split the information into two pieces: the definition of the death test itself, and the specification for the runner on how to run the death test and what to expect.  The death test would be written in C++, while the runner spec may or may not be.  A user needs to carefully keep the two in sync. `ASSERT_DEATH(statement, expected_message)` specifies all necessary information in one place, in one language, without boilerplate code. It is very declarative.
+  * `ASSERT_DEATH` has a similar syntax and error-reporting semantics as other Google Test assertions, and thus is easy to learn.
+  * `ASSERT_DEATH` can be mixed with other assertions and other logic at your will.  You are not limited to one death test per test method. For example, you can write something like:
+```
+    if (FooCondition()) {
+      ASSERT_DEATH(Bar(), "blah");
+    } else {
+      ASSERT_EQ(5, Bar());
+    }
+```
+If you prefer one death test per test method, you can write your tests in that style too, but we don't want to impose that on the users.  The fewer artificial limitations the better.
+  * `ASSERT_DEATH` can reference local variables in the current function, and you can decide how many death tests you want based on run-time information.  For example,
+```
+    const int count = GetCount();  // Only known at run time.
+    for (int i = 1; i <= count; i++) {
+      ASSERT_DEATH({
+        double* buffer = new double[i];
+        ... initializes buffer ...
+        Foo(buffer, i)
+      }, "blah blah");
+    }
+```
+The runner-based approach tends to be more static and less flexible, or requires more user effort to get this kind of flexibility.
+
+Another interesting thing about `ASSERT_DEATH` is that it calls `fork()`
+to create a child process to run the death test.  This is lightening
+fast, as `fork()` uses copy-on-write pages and incurs almost zero
+overhead, and the child process starts from the user-supplied
+statement directly, skipping all global and local initialization and
+any code leading to the given statement.  If you launch the child
+process from scratch, it can take seconds just to load everything and
+start running if the test links to many libraries dynamically.
+
+## My death test modifies some state, but the change seems lost after the death test finishes. Why? ##
+
+Death tests (`EXPECT_DEATH`, etc) are executed in a sub-process s.t. the
+expected crash won't kill the test program (i.e. the parent process). As a
+result, any in-memory side effects they incur are observable in their
+respective sub-processes, but not in the parent process. You can think of them
+as running in a parallel universe, more or less.
+
+## The compiler complains about "undefined references" to some static const member variables, but I did define them in the class body. What's wrong? ##
+
+If your class has a static data member:
+
+```
+// foo.h
+class Foo {
+  ...
+  static const int kBar = 100;
+};
+```
+
+You also need to define it _outside_ of the class body in `foo.cc`:
+
+```
+const int Foo::kBar;  // No initializer here.
+```
+
+Otherwise your code is **invalid C++**, and may break in unexpected ways. In
+particular, using it in Google Test comparison assertions (`EXPECT_EQ`, etc)
+will generate an "undefined reference" linker error.
+
+## I have an interface that has several implementations. Can I write a set of tests once and repeat them over all the implementations? ##
+
+Google Test doesn't yet have good support for this kind of tests, or
+data-driven tests in general. We hope to be able to make improvements in this
+area soon.
+
+## Can I derive a test fixture from another? ##
+
+Yes.
+
+Each test fixture has a corresponding and same named test case. This means only
+one test case can use a particular fixture. Sometimes, however, multiple test
+cases may want to use the same or slightly different fixtures. For example, you
+may want to make sure that all of a GUI library's test cases don't leak
+important system resources like fonts and brushes.
+
+In Google Test, you share a fixture among test cases by putting the shared
+logic in a base test fixture, then deriving from that base a separate fixture
+for each test case that wants to use this common logic. You then use `TEST_F()`
+to write tests using each derived fixture.
+
+Typically, your code looks like this:
+
+```
+// Defines a base test fixture.
+class BaseTest : public ::testing::Test {
+  protected:
+   ...
+};
+
+// Derives a fixture FooTest from BaseTest.
+class FooTest : public BaseTest {
+  protected:
+    virtual void SetUp() {
+      BaseTest::SetUp();  // Sets up the base fixture first.
+      ... additional set-up work ...
+    }
+    virtual void TearDown() {
+      ... clean-up work for FooTest ...
+      BaseTest::TearDown();  // Remember to tear down the base fixture
+                             // after cleaning up FooTest!
+    }
+    ... functions and variables for FooTest ...
+};
+
+// Tests that use the fixture FooTest.
+TEST_F(FooTest, Bar) { ... }
+TEST_F(FooTest, Baz) { ... }
+
+... additional fixtures derived from BaseTest ...
+```
+
+If necessary, you can continue to derive test fixtures from a derived fixture.
+Google Test has no limit on how deep the hierarchy can be.
+
+For a complete example using derived test fixtures, see
+`samples/sample5_unittest.cc`.
+
+## My compiler complains "void value not ignored as it ought to be." What does this mean? ##
+
+You're probably using an `ASSERT_*()` in a function that doesn't return `void`.
+`ASSERT_*()` can only be used in `void` functions.
+
+## My death test hangs (or seg-faults). How do I fix it? ##
+
+In Google Test, death tests are run in a child process and the way they work is
+delicate. To write death tests you really need to understand how they work.
+Please make sure you have read this.
+
+In particular, death tests don't like having multiple threads in the parent
+process. So the first thing you can try is to eliminate creating threads
+outside of `EXPECT_DEATH()`.
+
+Sometimes this is impossible as some library you must use may be creating
+threads before `main()` is even reached. In this case, you can try to minimize
+the chance of conflicts by either moving as many activities as possible inside
+`EXPECT_DEATH()` (in the extreme case, you want to move everything inside), or
+leaving as few things as possible in it. Also, you can try to set the death
+test style to `"threadsafe"`, which is safer but slower, and see if it helps.
+
+If you go with thread-safe death tests, remember that they rerun the test
+program from the beginning in the child process. Therefore make sure your
+program can run side-by-side with itself and is deterministic.
+
+In the end, this boils down to good concurrent programming. You have to make
+sure that there is no race conditions or dead locks in your program. No silver
+bullet - sorry!
+
+## Should I use the constructor/destructor of the test fixture or the set-up/tear-down function? ##
+
+The first thing to remember is that Google Test does not reuse the
+same test fixture object across multiple tests. For each `TEST_F`,
+Google Test will create a fresh test fixture object, _immediately_
+call `SetUp()`, run the test, call `TearDown()`, and then
+_immediately_ delete the test fixture object. Therefore, there is no
+need to write a `SetUp()` or `TearDown()` function if the constructor
+or destructor already does the job.
+
+You may still want to use `SetUp()/TearDown()` in the following cases:
+  * If the tear-down operation could throw an exception, you must use `TearDown()` as opposed to the destructor, as throwing in a destructor leads to undefined behavior and usually will kill your program right away. Note that many standard libraries (like STL) may throw when exceptions are enabled in the compiler. Therefore you should prefer `TearDown()` if you want to write portable tests that work with or without exceptions.
+  * The Google Test team is considering making the assertion macros throw on platforms where exceptions are enabled (e.g. Windows, Mac OS, and Linux client-side), which will eliminate the need for the user to propagate failures from a subroutine to its caller. Therefore, you shouldn't use Google Test assertions in a destructor if your code could run on such a platform.
+  * In a constructor or destructor, you cannot make a virtual function call on this object. (You can call a method declared as virtual, but it will be statically bound.) Therefore, if you need to call a method that will be overriden in a derived class, you have to use `SetUp()/TearDown()`.
+
+## The compiler complains "no matching function to call" when I use ASSERT\_PREDn. How do I fix it? ##
+
+If the predicate function you use in `ASSERT_PRED*` or `EXPECT_PRED*` is
+overloaded or a template, the compiler will have trouble figuring out which
+overloaded version it should use. `ASSERT_PRED_FORMAT*` and
+`EXPECT_PRED_FORMAT*` don't have this problem.
+
+If you see this error, you might want to switch to
+`(ASSERT|EXPECT)_PRED_FORMAT*`, which will also give you a better failure
+message. If, however, that is not an option, you can resolve the problem by
+explicitly telling the compiler which version to pick.
+
+For example, suppose you have
+
+```
+bool IsPositive(int n) {
+  return n > 0;
+}
+bool IsPositive(double x) {
+  return x > 0;
+}
+```
+
+you will get a compiler error if you write
+
+```
+EXPECT_PRED1(IsPositive, 5);
+```
+
+However, this will work:
+
+```
+EXPECT_PRED1(*static_cast<bool (*)(int)>*(IsPositive), 5);
+```
+
+(The stuff inside the angled brackets for the `static_cast` operator is the
+type of the function pointer for the `int`-version of `IsPositive()`.)
+
+As another example, when you have a template function
+
+```
+template <typename T>
+bool IsNegative(T x) {
+  return x < 0;
+}
+```
+
+you can use it in a predicate assertion like this:
+
+```
+ASSERT_PRED1(IsNegative*<int>*, -5);
+```
+
+Things are more interesting if your template has more than one parameters. The
+following won't compile:
+
+```
+ASSERT_PRED2(*GreaterThan<int, int>*, 5, 0);
+```
+
+
+as the C++ pre-processor thinks you are giving `ASSERT_PRED2` 4 arguments,
+which is one more than expected. The workaround is to wrap the predicate
+function in parentheses:
+
+```
+ASSERT_PRED2(*(GreaterThan<int, int>)*, 5, 0);
+```
+
+
+## My compiler complains about "ignoring return value" when I call RUN\_ALL\_TESTS(). Why? ##
+
+Some people had been ignoring the return value of `RUN_ALL_TESTS()`. That is,
+instead of
+
+```
+return RUN_ALL_TESTS();
+```
+
+they write
+
+```
+RUN_ALL_TESTS();
+```
+
+This is wrong and dangerous. A test runner needs to see the return value of
+`RUN_ALL_TESTS()` in order to determine if a test has passed. If your `main()`
+function ignores it, your test will be considered successful even if it has a
+Google Test assertion failure. Very bad.
+
+To help the users avoid this dangerous bug, the implementation of
+`RUN_ALL_TESTS()` causes gcc to raise this warning, when the return value is
+ignored. If you see this warning, the fix is simple: just make sure its value
+is used as the return value of `main()`.
+
+## My compiler complains that a constructor (or destructor) cannot return a value. What's going on? ##
+
+Due to a peculiarity of C++, in order to support the syntax for streaming
+messages to an `ASSERT_*`, e.g.
+
+```
+ASSERT_EQ(1, Foo()) << "blah blah" << foo;
+```
+
+we had to give up using `ASSERT*` and `FAIL*` (but not `EXPECT*` and
+`ADD_FAILURE*`) in constructors and destructors. The workaround is to move the
+content of your constructor/destructor to a private void member function, or
+switch to `EXPECT_*()` if that works. This section in the user's guide explains
+it.
+
+## My set-up function is not called. Why? ##
+
+C++ is case-sensitive. It should be spelled as `SetUp()`.  Did you
+spell it as `Setup()`?
+
+Similarly, sometimes people spell `SetUpTestCase()` as `SetupTestCase()` and
+wonder why it's never called.
+
+## How do I jump to the line of a failure in Emacs directly? ##
+
+Google Test's failure message format is understood by Emacs and many other
+IDEs, like acme and XCode. If a Google Test message is in a compilation buffer
+in Emacs, then it's clickable. You can now hit `enter` on a message to jump to
+the corresponding source code, or use `C-x `` to jump to the next failure.
+
+## I have several test cases which share the same test fixture logic, do I have to define a new test fixture class for each of them? This seems pretty tedious. ##
+
+You don't have to. Instead of
+
+```
+class FooTest : public BaseTest {};
+
+TEST_F(FooTest, Abc) { ... }
+TEST_F(FooTest, Def) { ... }
+
+class BarTest : public BaseTest {};
+
+TEST_F(BarTest, Abc) { ... }
+TEST_F(BarTest, Def) { ... }
+```
+
+you can simply `typedef` the test fixtures:
+```
+typedef BaseTest FooTest;
+
+TEST_F(FooTest, Abc) { ... }
+TEST_F(FooTest, Def) { ... }
+
+typedef BaseTest BarTest;
+
+TEST_F(BarTest, Abc) { ... }
+TEST_F(BarTest, Def) { ... }
+```
+
+## The Google Test output is buried in a whole bunch of log messages. What do I do? ##
+
+The Google Test output is meant to be a concise and human-friendly report. If
+your test generates textual output itself, it will mix with the Google Test
+output, making it hard to read. However, there is an easy solution to this
+problem.
+
+Since most log messages go to stderr, we decided to let Google Test output go
+to stdout. This way, you can easily separate the two using redirection. For
+example:
+```
+./my_test > googletest_output.txt
+```
+
+## Why should I prefer test fixtures over global variables? ##
+
+There are several good reasons:
+  1. It's likely your test needs to change the states of its global variables. This makes it difficult to keep side effects from escaping one test and contaminating others, making debugging difficult. By using fixtures, each test has a fresh set of variables that's different (but with the same names). Thus, tests are kept independent of each other.
+  1. Global variables pollute the global namespace.
+  1. Test fixtures can be reused via subclassing, which cannot be done easily with global variables. This is useful if many test cases have something in common.
+
+## How do I test private class members without writing FRIEND\_TEST()s? ##
+
+You should try to write testable code, which means classes should be easily
+tested from their public interface. One way to achieve this is the Pimpl idiom:
+you move all private members of a class into a helper class, and make all
+members of the helper class public.
+
+You have several other options that don't require using `FRIEND_TEST`:
+  * Write the tests as members of the fixture class:
+```
+class Foo {
+  friend class FooTest;
+  ...
+};
+
+class FooTest : public ::testing::Test {
+ protected:
+  ...
+  void Test1() {...} // This accesses private members of class Foo.
+  void Test2() {...} // So does this one.
+};
+
+TEST_F(FooTest, Test1) {
+  Test1();
+}
+
+TEST_F(FooTest, Test2) {
+  Test2();
+}
+```
+  * In the fixture class, write accessors for the tested class' private members, then use the accessors in your tests:
+```
+class Foo {
+  friend class FooTest;
+  ...
+};
+
+class FooTest : public ::testing::Test {
+ protected:
+  ...
+  T1 get_private_member1(Foo* obj) {
+    return obj->private_member1_;
+  }
+};
+
+TEST_F(FooTest, Test1) {
+  ...
+  get_private_member1(x)
+  ...
+}
+```
+  * If the methods are declared **protected**, you can change their access level in a test-only subclass:
+```
+class YourClass {
+  ...
+ protected: // protected access for testability.
+  int DoSomethingReturningInt();
+  ...
+};
+
+// in the your_class_test.cc file:
+class TestableYourClass : public YourClass {
+  ...
+ public: using YourClass::DoSomethingReturningInt; // changes access rights
+  ...
+};
+
+TEST_F(YourClassTest, DoSomethingTest) {
+  TestableYourClass obj;
+  assertEquals(expected_value, obj.DoSomethingReturningInt());
+}
+```
+
+## How do I test private class static members without writing FRIEND\_TEST()s? ##
+
+We find private static methods clutter the header file.  They are
+implementation details and ideally should be kept out of a .h. So often I make
+them free functions instead.
+
+Instead of:
+```
+// foo.h
+class Foo {
+  ...
+ private:
+  static bool Func(int n);
+};
+
+// foo.cc
+bool Foo::Func(int n) { ... }
+
+// foo_test.cc
+EXPECT_TRUE(Foo::Func(12345));
+```
+
+You probably should better write:
+```
+// foo.h
+class Foo {
+  ...
+};
+
+// foo.cc
+namespace internal {
+  bool Func(int n) { ... }
+}
+
+// foo_test.cc
+namespace internal {
+  bool Func(int n);
+}
+
+EXPECT_TRUE(internal::Func(12345));
+```
+
+## I would like to run a test several times with different parameters. Do I need to write several similar copies of it? ##
+
+No. You can use a feature called [value-parameterized tests](V1_5_AdvancedGuide.md#Value_Parameterized_Tests) which
+lets you repeat your tests with different parameters, without defining it more than once.
+
+## How do I test a file that defines main()? ##
+
+To test a `foo.cc` file, you need to compile and link it into your unit test
+program. However, when the file contains a definition for the `main()`
+function, it will clash with the `main()` of your unit test, and will result in
+a build error.
+
+The right solution is to split it into three files:
+  1. `foo.h` which contains the declarations,
+  1. `foo.cc` which contains the definitions except `main()`, and
+  1. `foo_main.cc` which contains nothing but the definition of `main()`.
+
+Then `foo.cc` can be easily tested.
+
+If you are adding tests to an existing file and don't want an intrusive change
+like this, there is a hack: just include the entire `foo.cc` file in your unit
+test. For example:
+```
+// File foo_unittest.cc
+
+// The headers section
+...
+
+// Renames main() in foo.cc to make room for the unit test main()
+#define main FooMain
+
+#include "a/b/foo.cc"
+
+// The tests start here.
+...
+```
+
+
+However, please remember this is a hack and should only be used as the last
+resort.
+
+## What can the statement argument in ASSERT\_DEATH() be? ##
+
+`ASSERT_DEATH(_statement_, _regex_)` (or any death assertion macro) can be used
+wherever `_statement_` is valid. So basically `_statement_` can be any C++
+statement that makes sense in the current context. In particular, it can
+reference global and/or local variables, and can be:
+  * a simple function call (often the case),
+  * a complex expression, or
+  * a compound statement.
+
+> Some examples are shown here:
+
+```
+// A death test can be a simple function call.
+TEST(MyDeathTest, FunctionCall) {
+  ASSERT_DEATH(Xyz(5), "Xyz failed");
+}
+
+// Or a complex expression that references variables and functions.
+TEST(MyDeathTest, ComplexExpression) {
+  const bool c = Condition();
+  ASSERT_DEATH((c ? Func1(0) : object2.Method("test")),
+               "(Func1|Method) failed");
+}
+
+// Death assertions can be used any where in a function. In
+// particular, they can be inside a loop.
+TEST(MyDeathTest, InsideLoop) {
+  // Verifies that Foo(0), Foo(1), ..., and Foo(4) all die.
+  for (int i = 0; i < 5; i++) {
+    EXPECT_DEATH_M(Foo(i), "Foo has \\d+ errors",
+                   ::testing::Message() << "where i is " << i);
+  }
+}
+
+// A death assertion can contain a compound statement.
+TEST(MyDeathTest, CompoundStatement) {
+  // Verifies that at lease one of Bar(0), Bar(1), ..., and
+  // Bar(4) dies.
+  ASSERT_DEATH({
+    for (int i = 0; i < 5; i++) {
+      Bar(i);
+    }
+  },
+  "Bar has \\d+ errors");}
+```
+
+`googletest_unittest.cc` contains more examples if you are interested.
+
+## What syntax does the regular expression in ASSERT\_DEATH use? ##
+
+On POSIX systems, Google Test uses the POSIX Extended regular
+expression syntax
+(http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions). On
+Windows, it uses a limited variant of regular expression syntax. For
+more details, see the [regular expression syntax](V1_5_AdvancedGuide.md#Regular_Expression_Syntax).
+
+## I have a fixture class Foo, but TEST\_F(Foo, Bar) gives me error "no matching function for call to Foo::Foo()". Why? ##
+
+Google Test needs to be able to create objects of your test fixture class, so
+it must have a default constructor. Normally the compiler will define one for
+you. However, there are cases where you have to define your own:
+  * If you explicitly declare a non-default constructor for class `Foo`, then you need to define a default constructor, even if it would be empty.
+  * If `Foo` has a const non-static data member, then you have to define the default constructor _and_ initialize the const member in the initializer list of the constructor. (Early versions of `gcc` doesn't force you to initialize the const member. It's a bug that has been fixed in `gcc 4`.)
+
+## Why does ASSERT\_DEATH complain about previous threads that were already joined? ##
+
+With the Linux pthread library, there is no turning back once you cross the
+line from single thread to multiple threads. The first time you create a
+thread, a manager thread is created in addition, so you get 3, not 2, threads.
+Later when the thread you create joins the main thread, the thread count
+decrements by 1, but the manager thread will never be killed, so you still have
+2 threads, which means you cannot safely run a death test.
+
+The new NPTL thread library doesn't suffer from this problem, as it doesn't
+create a manager thread. However, if you don't control which machine your test
+runs on, you shouldn't depend on this.
+
+## Why does Google Test require the entire test case, instead of individual tests, to be named FOODeathTest when it uses ASSERT\_DEATH? ##
+
+Google Test does not interleave tests from different test cases. That is, it
+runs all tests in one test case first, and then runs all tests in the next test
+case, and so on. Google Test does this because it needs to set up a test case
+before the first test in it is run, and tear it down afterwords. Splitting up
+the test case would require multiple set-up and tear-down processes, which is
+inefficient and makes the semantics unclean.
+
+If we were to determine the order of tests based on test name instead of test
+case name, then we would have a problem with the following situation:
+
+```
+TEST_F(FooTest, AbcDeathTest) { ... }
+TEST_F(FooTest, Uvw) { ... }
+
+TEST_F(BarTest, DefDeathTest) { ... }
+TEST_F(BarTest, Xyz) { ... }
+```
+
+Since `FooTest.AbcDeathTest` needs to run before `BarTest.Xyz`, and we don't
+interleave tests from different test cases, we need to run all tests in the
+`FooTest` case before running any test in the `BarTest` case. This contradicts
+with the requirement to run `BarTest.DefDeathTest` before `FooTest.Uvw`.
+
+## But I don't like calling my entire test case FOODeathTest when it contains both death tests and non-death tests. What do I do? ##
+
+You don't have to, but if you like, you may split up the test case into
+`FooTest` and `FooDeathTest`, where the names make it clear that they are
+related:
+
+```
+class FooTest : public ::testing::Test { ... };
+
+TEST_F(FooTest, Abc) { ... }
+TEST_F(FooTest, Def) { ... }
+
+typedef FooTest FooDeathTest;
+
+TEST_F(FooDeathTest, Uvw) { ... EXPECT_DEATH(...) ... }
+TEST_F(FooDeathTest, Xyz) { ... ASSERT_DEATH(...) ... }
+```
+
+## The compiler complains about "no match for 'operator<<'" when I use an assertion. What gives? ##
+
+If you use a user-defined type `FooType` in an assertion, you must make sure
+there is an `std::ostream& operator<<(std::ostream&, const FooType&)` function
+defined such that we can print a value of `FooType`.
+
+In addition, if `FooType` is declared in a name space, the `<<` operator also
+needs to be defined in the _same_ name space.
+
+## How do I suppress the memory leak messages on Windows? ##
+
+Since the statically initialized Google Test singleton requires allocations on
+the heap, the Visual C++ memory leak detector will report memory leaks at the
+end of the program run. The easiest way to avoid this is to use the
+`_CrtMemCheckpoint` and `_CrtMemDumpAllObjectsSince` calls to not report any
+statically initialized heap objects. See MSDN for more details and additional
+heap check/debug routines.
+
+## I am building my project with Google Test in Visual Studio and all I'm getting is a bunch of linker errors (or warnings). Help! ##
+
+You may get a number of the following linker error or warnings if you
+attempt to link your test project with the Google Test library when
+your project and the are not built using the same compiler settings.
+
+  * LNK2005: symbol already defined in object
+  * LNK4217: locally defined symbol 'symbol' imported in function 'function'
+  * LNK4049: locally defined symbol 'symbol' imported
+
+The Google Test project (gtest.vcproj) has the Runtime Library option
+set to /MT (use multi-threaded static libraries, /MTd for debug). If
+your project uses something else, for example /MD (use multi-threaded
+DLLs, /MDd for debug), you need to change the setting in the Google
+Test project to match your project's.
+
+To update this setting open the project properties in the Visual
+Studio IDE then select the branch Configuration Properties | C/C++ |
+Code Generation and change the option "Runtime Library".  You may also try
+using gtest-md.vcproj instead of gtest.vcproj.
+
+## I put my tests in a library and Google Test doesn't run them. What's happening? ##
+Have you read a
+[warning](V1_5_Primer.md#important-note-for-visual-c-users) on
+the Google Test Primer page?
+
+## I want to use Google Test with Visual Studio but don't know where to start. ##
+Many people are in your position and one of the posted his solution to
+our mailing list. Here is his link:
+http://hassanjamilahmad.blogspot.com/2009/07/gtest-starters-help.html.
+
+## My question is not covered in your FAQ! ##
+
+If you cannot find the answer to your question in this FAQ, there are
+some other resources you can use:
+
+  1. read other [wiki pages](http://code.google.com/p/googletest/w/list),
+  1. search the mailing list [archive](http://groups.google.com/group/googletestframework/topics),
+  1. ask it on [googletestframework@googlegroups.com](mailto:googletestframework@googlegroups.com) and someone will answer it (to prevent spam, we require you to join the [discussion group](http://groups.google.com/group/googletestframework) before you can post.).
+
+Please note that creating an issue in the
+[issue tracker](http://code.google.com/p/googletest/issues/list) is _not_
+a good way to get your answer, as it is monitored infrequently by a
+very small number of people.
+
+When asking a question, it's helpful to provide as much of the
+following information as possible (people cannot help you if there's
+not enough information in your question):
+
+  * the version (or the revision number if you check out from SVN directly) of Google Test you use (Google Test is under active development, so it's possible that your problem has been solved in a later version),
+  * your operating system,
+  * the name and version of your compiler,
+  * the complete command line flags you give to your compiler,
+  * the complete compiler error messages (if the question is about compilation),
+  * the _actual_ code (ideally, a minimal but complete program) that has the problem you encounter.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_Primer.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_Primer.md
new file mode 100644
index 0000000000..6960d2ce4c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_Primer.md
@@ -0,0 +1,497 @@
+
+
+# Introduction: Why Google C++ Testing Framework? #
+
+_Google C++ Testing Framework_ helps you write better C++ tests.
+
+No matter whether you work on Linux, Windows, or a Mac, if you write C++ code,
+Google Test can help you.
+
+So what makes a good test, and how does Google C++ Testing Framework fit in? We believe:
+  1. Tests should be _independent_ and _repeatable_. It's a pain to debug a test that succeeds or fails as a result of other tests.  Google C++ Testing Framework isolates the tests by running each of them on a different object. When a test fails, Google C++ Testing Framework allows you to run it in isolation for quick debugging.
+  1. Tests should be well _organized_ and reflect the structure of the tested code.  Google C++ Testing Framework groups related tests into test cases that can share data and subroutines. This common pattern is easy to recognize and makes tests easy to maintain. Such consistency is especially helpful when people switch projects and start to work on a new code base.
+  1. Tests should be _portable_ and _reusable_. The open-source community has a lot of code that is platform-neutral, its tests should also be platform-neutral.  Google C++ Testing Framework works on different OSes, with different compilers (gcc, MSVC, and others), with or without exceptions, so Google C++ Testing Framework tests can easily work with a variety of configurations.  (Note that the current release only contains build scripts for Linux - we are actively working on scripts for other platforms.)
+  1. When tests fail, they should provide as much _information_ about the problem as possible. Google C++ Testing Framework doesn't stop at the first test failure. Instead, it only stops the current test and continues with the next. You can also set up tests that report non-fatal failures after which the current test continues. Thus, you can detect and fix multiple bugs in a single run-edit-compile cycle.
+  1. The testing framework should liberate test writers from housekeeping chores and let them focus on the test _content_.  Google C++ Testing Framework automatically keeps track of all tests defined, and doesn't require the user to enumerate them in order to run them.
+  1. Tests should be _fast_. With Google C++ Testing Framework, you can reuse shared resources across tests and pay for the set-up/tear-down only once, without making tests depend on each other.
+
+Since Google C++ Testing Framework is based on the popular xUnit
+architecture, you'll feel right at home if you've used JUnit or PyUnit before.
+If not, it will take you about 10 minutes to learn the basics and get started.
+So let's go!
+
+_Note:_ We sometimes refer to Google C++ Testing Framework informally
+as _Google Test_.
+
+# Setting up a New Test Project #
+
+To write a test program using Google Test, you need to compile Google
+Test into a library and link your test with it.  We provide build
+files for some popular build systems (`msvc/` for Visual Studio,
+`xcode/` for Mac Xcode, `make/` for GNU make, `codegear/` for Borland
+C++ Builder, and the autotools script in the
+Google Test root directory).  If your build system is not on this
+list, you can take a look at `make/Makefile` to learn how Google Test
+should be compiled (basically you want to compile `src/gtest-all.cc`
+with `GTEST_ROOT` and `GTEST_ROOT/include` in the header search path,
+where `GTEST_ROOT` is the Google Test root directory).
+
+Once you are able to compile the Google Test library, you should
+create a project or build target for your test program.  Make sure you
+have `GTEST_ROOT/include` in the header search path so that the
+compiler can find `<gtest/gtest.h>` when compiling your test.  Set up
+your test project to link with the Google Test library (for example,
+in Visual Studio, this is done by adding a dependency on
+`gtest.vcproj`).
+
+If you still have questions, take a look at how Google Test's own
+tests are built and use them as examples.
+
+# Basic Concepts #
+
+When using Google Test, you start by writing _assertions_, which are statements
+that check whether a condition is true. An assertion's result can be _success_,
+_nonfatal failure_, or _fatal failure_. If a fatal failure occurs, it aborts
+the current function; otherwise the program continues normally.
+
+_Tests_ use assertions to verify the tested code's behavior. If a test crashes
+or has a failed assertion, then it _fails_; otherwise it _succeeds_.
+
+A _test case_ contains one or many tests. You should group your tests into test
+cases that reflect the structure of the tested code. When multiple tests in a
+test case need to share common objects and subroutines, you can put them into a
+_test fixture_ class.
+
+A _test program_ can contain multiple test cases.
+
+We'll now explain how to write a test program, starting at the individual
+assertion level and building up to tests and test cases.
+
+# Assertions #
+
+Google Test assertions are macros that resemble function calls. You test a
+class or function by making assertions about its behavior. When an assertion
+fails, Google Test prints the assertion's source file and line number location,
+along with a failure message. You may also supply a custom failure message
+which will be appended to Google Test's message.
+
+The assertions come in pairs that test the same thing but have different
+effects on the current function. `ASSERT_*` versions generate fatal failures
+when they fail, and **abort the current function**. `EXPECT_*` versions generate
+nonfatal failures, which don't abort the current function. Usually `EXPECT_*`
+are preferred, as they allow more than one failures to be reported in a test.
+However, you should use `ASSERT_*` if it doesn't make sense to continue when
+the assertion in question fails.
+
+Since a failed `ASSERT_*` returns from the current function immediately,
+possibly skipping clean-up code that comes after it, it may cause a space leak.
+Depending on the nature of the leak, it may or may not be worth fixing - so
+keep this in mind if you get a heap checker error in addition to assertion
+errors.
+
+To provide a custom failure message, simply stream it into the macro using the
+`<<` operator, or a sequence of such operators. An example:
+```
+ASSERT_EQ(x.size(), y.size()) << "Vectors x and y are of unequal length";
+
+for (int i = 0; i < x.size(); ++i) {
+  EXPECT_EQ(x[i], y[i]) << "Vectors x and y differ at index " << i;
+}
+```
+
+Anything that can be streamed to an `ostream` can be streamed to an assertion
+macro--in particular, C strings and `string` objects. If a wide string
+(`wchar_t*`, `TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is
+streamed to an assertion, it will be translated to UTF-8 when printed.
+
+## Basic Assertions ##
+
+These assertions do basic true/false condition testing.
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_TRUE(`_condition_`)`;  | `EXPECT_TRUE(`_condition_`)`;   | _condition_ is true |
+| `ASSERT_FALSE(`_condition_`)`; | `EXPECT_FALSE(`_condition_`)`;  | _condition_ is false |
+
+Remember, when they fail, `ASSERT_*` yields a fatal failure and
+returns from the current function, while `EXPECT_*` yields a nonfatal
+failure, allowing the function to continue running. In either case, an
+assertion failure means its containing test fails.
+
+_Availability_: Linux, Windows, Mac.
+
+## Binary Comparison ##
+
+This section describes assertions that compare two values.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+|`ASSERT_EQ(`_expected_`, `_actual_`);`|`EXPECT_EQ(`_expected_`, `_actual_`);`| _expected_ `==` _actual_ |
+|`ASSERT_NE(`_val1_`, `_val2_`);`      |`EXPECT_NE(`_val1_`, `_val2_`);`      | _val1_ `!=` _val2_ |
+|`ASSERT_LT(`_val1_`, `_val2_`);`      |`EXPECT_LT(`_val1_`, `_val2_`);`      | _val1_ `<` _val2_ |
+|`ASSERT_LE(`_val1_`, `_val2_`);`      |`EXPECT_LE(`_val1_`, `_val2_`);`      | _val1_ `<=` _val2_ |
+|`ASSERT_GT(`_val1_`, `_val2_`);`      |`EXPECT_GT(`_val1_`, `_val2_`);`      | _val1_ `>` _val2_ |
+|`ASSERT_GE(`_val1_`, `_val2_`);`      |`EXPECT_GE(`_val1_`, `_val2_`);`      | _val1_ `>=` _val2_ |
+
+In the event of a failure, Google Test prints both _val1_ and _val2_
+. In `ASSERT_EQ*` and `EXPECT_EQ*` (and all other equality assertions
+we'll introduce later), you should put the expression you want to test
+in the position of _actual_, and put its expected value in _expected_,
+as Google Test's failure messages are optimized for this convention.
+
+Value arguments must be comparable by the assertion's comparison operator or
+you'll get a compiler error. Values must also support the `<<` operator for
+streaming to an `ostream`. All built-in types support this.
+
+These assertions can work with a user-defined type, but only if you define the
+corresponding comparison operator (e.g. `==`, `<`, etc).  If the corresponding
+operator is defined, prefer using the `ASSERT_*()` macros because they will
+print out not only the result of the comparison, but the two operands as well.
+
+Arguments are always evaluated exactly once. Therefore, it's OK for the
+arguments to have side effects. However, as with any ordinary C/C++ function,
+the arguments' evaluation order is undefined (i.e. the compiler is free to
+choose any order) and your code should not depend on any particular argument
+evaluation order.
+
+`ASSERT_EQ()` does pointer equality on pointers. If used on two C strings, it
+tests if they are in the same memory location, not if they have the same value.
+Therefore, if you want to compare C strings (e.g. `const char*`) by value, use
+`ASSERT_STREQ()` , which will be described later on. In particular, to assert
+that a C string is `NULL`, use `ASSERT_STREQ(NULL, c_string)` . However, to
+compare two `string` objects, you should use `ASSERT_EQ`.
+
+Macros in this section work with both narrow and wide string objects (`string`
+and `wstring`).
+
+_Availability_: Linux, Windows, Mac.
+
+## String Comparison ##
+
+The assertions in this group compare two **C strings**. If you want to compare
+two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_STREQ(`_expected\_str_`, `_actual\_str_`);`    | `EXPECT_STREQ(`_expected\_str_`, `_actual\_str_`);`     | the two C strings have the same content |
+| `ASSERT_STRNE(`_str1_`, `_str2_`);`    | `EXPECT_STRNE(`_str1_`, `_str2_`);`     | the two C strings have different content |
+| `ASSERT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);`| `EXPECT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);` | the two C strings have the same content, ignoring case |
+| `ASSERT_STRCASENE(`_str1_`, `_str2_`);`| `EXPECT_STRCASENE(`_str1_`, `_str2_`);` | the two C strings have different content, ignoring case |
+
+Note that "CASE" in an assertion name means that case is ignored.
+
+`*STREQ*` and `*STRNE*` also accept wide C strings (`wchar_t*`). If a
+comparison of two wide strings fails, their values will be printed as UTF-8
+narrow strings.
+
+A `NULL` pointer and an empty string are considered _different_.
+
+_Availability_: Linux, Windows, Mac.
+
+See also: For more string comparison tricks (substring, prefix, suffix, and
+regular expression matching, for example), see the [AdvancedGuide Advanced
+Google Test Guide].
+
+# Simple Tests #
+
+To create a test:
+  1. Use the `TEST()` macro to define and name a test function, These are ordinary C++ functions that don't return a value.
+  1. In this function, along with any valid C++ statements you want to include, use the various Google Test assertions to check values.
+  1. The test's result is determined by the assertions; if any assertion in the test fails (either fatally or non-fatally), or if the test crashes, the entire test fails. Otherwise, it succeeds.
+
+```
+TEST(test_case_name, test_name) {
+ ... test body ...
+}
+```
+
+
+`TEST()` arguments go from general to specific. The _first_ argument is the
+name of the test case, and the _second_ argument is the test's name within the
+test case. Remember that a test case can contain any number of individual
+tests. A test's _full name_ consists of its containing test case and its
+individual name. Tests from different test cases can have the same individual
+name.
+
+For example, let's take a simple integer function:
+```
+int Factorial(int n); // Returns the factorial of n
+```
+
+A test case for this function might look like:
+```
+// Tests factorial of 0.
+TEST(FactorialTest, HandlesZeroInput) {
+  EXPECT_EQ(1, Factorial(0));
+}
+
+// Tests factorial of positive numbers.
+TEST(FactorialTest, HandlesPositiveInput) {
+  EXPECT_EQ(1, Factorial(1));
+  EXPECT_EQ(2, Factorial(2));
+  EXPECT_EQ(6, Factorial(3));
+  EXPECT_EQ(40320, Factorial(8));
+}
+```
+
+Google Test groups the test results by test cases, so logically-related tests
+should be in the same test case; in other words, the first argument to their
+`TEST()` should be the same. In the above example, we have two tests,
+`HandlesZeroInput` and `HandlesPositiveInput`, that belong to the same test
+case `FactorialTest`.
+
+_Availability_: Linux, Windows, Mac.
+
+# Test Fixtures: Using the Same Data Configuration for Multiple Tests #
+
+If you find yourself writing two or more tests that operate on similar data,
+you can use a _test fixture_. It allows you to reuse the same configuration of
+objects for several different tests.
+
+To create a fixture, just:
+  1. Derive a class from `::testing::Test` . Start its body with `protected:` or `public:` as we'll want to access fixture members from sub-classes.
+  1. Inside the class, declare any objects you plan to use.
+  1. If necessary, write a default constructor or `SetUp()` function to prepare the objects for each test. A common mistake is to spell `SetUp()` as `Setup()` with a small `u` - don't let that happen to you.
+  1. If necessary, write a destructor or `TearDown()` function to release any resources you allocated in `SetUp()` . To learn when you should use the constructor/destructor and when you should use `SetUp()/TearDown()`, read this [FAQ entry](V1_5_FAQ.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function).
+  1. If needed, define subroutines for your tests to share.
+
+When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to
+access objects and subroutines in the test fixture:
+```
+TEST_F(test_case_name, test_name) {
+ ... test body ...
+}
+```
+
+Like `TEST()`, the first argument is the test case name, but for `TEST_F()`
+this must be the name of the test fixture class. You've probably guessed: `_F`
+is for fixture.
+
+Unfortunately, the C++ macro system does not allow us to create a single macro
+that can handle both types of tests. Using the wrong macro causes a compiler
+error.
+
+Also, you must first define a test fixture class before using it in a
+`TEST_F()`, or you'll get the compiler error "`virtual outside class
+declaration`".
+
+For each test defined with `TEST_F()`, Google Test will:
+  1. Create a _fresh_ test fixture at runtime
+  1. Immediately initialize it via `SetUp()` ,
+  1. Run the test
+  1. Clean up by calling `TearDown()`
+  1. Delete the test fixture.  Note that different tests in the same test case have different test fixture objects, and Google Test always deletes a test fixture before it creates the next one. Google Test does not reuse the same test fixture for multiple tests. Any changes one test makes to the fixture do not affect other tests.
+
+As an example, let's write tests for a FIFO queue class named `Queue`, which
+has the following interface:
+```
+template <typename E> // E is the element type.
+class Queue {
+ public:
+  Queue();
+  void Enqueue(const E& element);
+  E* Dequeue(); // Returns NULL if the queue is empty.
+  size_t size() const;
+  ...
+};
+```
+
+First, define a fixture class. By convention, you should give it the name
+`FooTest` where `Foo` is the class being tested.
+```
+class QueueTest : public ::testing::Test {
+ protected:
+  virtual void SetUp() {
+    q1_.Enqueue(1);
+    q2_.Enqueue(2);
+    q2_.Enqueue(3);
+  }
+
+  // virtual void TearDown() {}
+
+  Queue<int> q0_;
+  Queue<int> q1_;
+  Queue<int> q2_;
+};
+```
+
+In this case, `TearDown()` is not needed since we don't have to clean up after
+each test, other than what's already done by the destructor.
+
+Now we'll write tests using `TEST_F()` and this fixture.
+```
+TEST_F(QueueTest, IsEmptyInitially) {
+  EXPECT_EQ(0, q0_.size());
+}
+
+TEST_F(QueueTest, DequeueWorks) {
+  int* n = q0_.Dequeue();
+  EXPECT_EQ(NULL, n);
+
+  n = q1_.Dequeue();
+  ASSERT_TRUE(n != NULL);
+  EXPECT_EQ(1, *n);
+  EXPECT_EQ(0, q1_.size());
+  delete n;
+
+  n = q2_.Dequeue();
+  ASSERT_TRUE(n != NULL);
+  EXPECT_EQ(2, *n);
+  EXPECT_EQ(1, q2_.size());
+  delete n;
+}
+```
+
+The above uses both `ASSERT_*` and `EXPECT_*` assertions. The rule of thumb is
+to use `EXPECT_*` when you want the test to continue to reveal more errors
+after the assertion failure, and use `ASSERT_*` when continuing after failure
+doesn't make sense. For example, the second assertion in the `Dequeue` test is
+`ASSERT_TRUE(n != NULL)`, as we need to dereference the pointer `n` later,
+which would lead to a segfault when `n` is `NULL`.
+
+When these tests run, the following happens:
+  1. Google Test constructs a `QueueTest` object (let's call it `t1` ).
+  1. `t1.SetUp()` initializes `t1` .
+  1. The first test ( `IsEmptyInitially` ) runs on `t1` .
+  1. `t1.TearDown()` cleans up after the test finishes.
+  1. `t1` is destructed.
+  1. The above steps are repeated on another `QueueTest` object, this time running the `DequeueWorks` test.
+
+_Availability_: Linux, Windows, Mac.
+
+_Note_: Google Test automatically saves all _Google Test_ flags when a test
+object is constructed, and restores them when it is destructed.
+
+# Invoking the Tests #
+
+`TEST()` and `TEST_F()` implicitly register their tests with Google Test. So, unlike with many other C++ testing frameworks, you don't have to re-list all your defined tests in order to run them.
+
+After defining your tests, you can run them with `RUN_ALL_TESTS()` , which returns `0` if all the tests are successful, or `1` otherwise. Note that `RUN_ALL_TESTS()` runs _all tests_ in your link unit -- they can be from different test cases, or even different source files.
+
+When invoked, the `RUN_ALL_TESTS()` macro:
+  1. Saves the state of all  Google Test flags.
+  1. Creates a test fixture object for the first test.
+  1. Initializes it via `SetUp()`.
+  1. Runs the test on the fixture object.
+  1. Cleans up the fixture via `TearDown()`.
+  1. Deletes the fixture.
+  1. Restores the state of all Google Test flags.
+  1. Repeats the above steps for the next test, until all tests have run.
+
+In addition, if the text fixture's constructor generates a fatal failure in
+step 2, there is no point for step 3 - 5 and they are thus skipped. Similarly,
+if step 3 generates a fatal failure, step 4 will be skipped.
+
+_Important_: You must not ignore the return value of `RUN_ALL_TESTS()`, or `gcc`
+will give you a compiler error. The rationale for this design is that the
+automated testing service determines whether a test has passed based on its
+exit code, not on its stdout/stderr output; thus your `main()` function must
+return the value of `RUN_ALL_TESTS()`.
+
+Also, you should call `RUN_ALL_TESTS()` only **once**. Calling it more than once
+conflicts with some advanced Google Test features (e.g. thread-safe death
+tests) and thus is not supported.
+
+_Availability_: Linux, Windows, Mac.
+
+# Writing the main() Function #
+
+You can start from this boilerplate:
+```
+#include "this/package/foo.h"
+#include <gtest/gtest.h>
+
+namespace {
+
+// The fixture for testing class Foo.
+class FooTest : public ::testing::Test {
+ protected:
+  // You can remove any or all of the following functions if its body
+  // is empty.
+
+  FooTest() {
+    // You can do set-up work for each test here.
+  }
+
+  virtual ~FooTest() {
+    // You can do clean-up work that doesn't throw exceptions here.
+  }
+
+  // If the constructor and destructor are not enough for setting up
+  // and cleaning up each test, you can define the following methods:
+
+  virtual void SetUp() {
+    // Code here will be called immediately after the constructor (right
+    // before each test).
+  }
+
+  virtual void TearDown() {
+    // Code here will be called immediately after each test (right
+    // before the destructor).
+  }
+
+  // Objects declared here can be used by all tests in the test case for Foo.
+};
+
+// Tests that the Foo::Bar() method does Abc.
+TEST_F(FooTest, MethodBarDoesAbc) {
+  const string input_filepath = "this/package/testdata/myinputfile.dat";
+  const string output_filepath = "this/package/testdata/myoutputfile.dat";
+  Foo f;
+  EXPECT_EQ(0, f.Bar(input_filepath, output_filepath));
+}
+
+// Tests that Foo does Xyz.
+TEST_F(FooTest, DoesXyz) {
+  // Exercises the Xyz feature of Foo.
+}
+
+}  // namespace
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+```
+
+The `::testing::InitGoogleTest()` function parses the command line for Google
+Test flags, and removes all recognized flags. This allows the user to control a
+test program's behavior via various flags, which we'll cover in [AdvancedGuide](V1_5_AdvancedGuide.md).
+You must call this function before calling `RUN_ALL_TESTS()`, or the flags
+won't be properly initialized.
+
+On Windows, `InitGoogleTest()` also works with wide strings, so it can be used
+in programs compiled in `UNICODE` mode as well.
+
+But maybe you think that writing all those main() functions is too much work? We agree with you completely and that's why Google Test provides a basic implementation of main(). If it fits your needs, then just link your test with gtest\_main library and you are good to go.
+
+## Important note for Visual C++ users ##
+If you put your tests into a library and your `main()` function is in a different library or in your .exe file, those tests will not run. The reason is a [bug](https://connect.microsoft.com/feedback/viewfeedback.aspx?FeedbackID=244410&siteid=210) in Visual C++. When you define your tests, Google Test creates certain static objects to register them. These objects are not referenced from elsewhere but their constructors are still supposed to run. When Visual C++ linker sees that nothing in the library is referenced from other places it throws the library out. You have to reference your library with tests from your main program to keep the linker from discarding it. Here is how to do it. Somewhere in your library code declare a function:
+```
+__declspec(dllexport) int PullInMyLibrary() { return 0; }
+```
+If you put your tests in a static library (not DLL) then `__declspec(dllexport)` is not required. Now, in your main program, write a code that invokes that function:
+```
+int PullInMyLibrary();
+static int dummy = PullInMyLibrary();
+```
+This will keep your tests referenced and will make them register themselves at startup.
+
+In addition, if you define your tests in a static library, add `/OPT:NOREF` to your main program linker options. If you use MSVC++ IDE, go to your .exe project properties/Configuration Properties/Linker/Optimization and set References setting to `Keep Unreferenced Data (/OPT:NOREF)`. This will keep Visual C++ linker from discarding individual symbols generated by your tests from the final executable.
+
+There is one more pitfall, though. If you use Google Test as a static library (that's how it is defined in gtest.vcproj) your tests must also reside in a static library. If you have to have them in a DLL, you _must_ change Google Test to build into a DLL as well. Otherwise your tests will not run correctly or will not run at all. The general conclusion here is: make your life easier - do not write your tests in libraries!
+
+# Where to Go from Here #
+
+Congratulations! You've learned the Google Test basics. You can start writing
+and running Google Test tests, read some [samples](Samples.md), or continue with
+[AdvancedGuide](V1_5_AdvancedGuide.md), which describes many more useful Google Test features.
+
+# Known Limitations #
+
+Google Test is designed to be thread-safe.  The implementation is
+thread-safe on systems where the `pthreads` library is available.  It
+is currently _unsafe_ to use Google Test assertions from two threads
+concurrently on other systems (e.g. Windows).  In most tests this is
+not an issue as usually the assertions are done in the main thread. If
+you want to help, you can volunteer to implement the necessary
+synchronization primitives in `gtest-port.h` for your platform.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_PumpManual.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_PumpManual.md
new file mode 100644
index 0000000000..15710789dd
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_PumpManual.md
@@ -0,0 +1,177 @@
+
+
+<b>P</b>ump is <b>U</b>seful for <b>M</b>eta <b>P</b>rogramming.
+
+# The Problem #
+
+Template and macro libraries often need to define many classes,
+functions, or macros that vary only (or almost only) in the number of
+arguments they take. It's a lot of repetitive, mechanical, and
+error-prone work.
+
+Variadic templates and variadic macros can alleviate the problem.
+However, while both are being considered by the C++ committee, neither
+is in the standard yet or widely supported by compilers.  Thus they
+are often not a good choice, especially when your code needs to be
+portable. And their capabilities are still limited.
+
+As a result, authors of such libraries often have to write scripts to
+generate their implementation. However, our experience is that it's
+tedious to write such scripts, which tend to reflect the structure of
+the generated code poorly and are often hard to read and edit. For
+example, a small change needed in the generated code may require some
+non-intuitive, non-trivial changes in the script. This is especially
+painful when experimenting with the code.
+
+# Our Solution #
+
+Pump (for Pump is Useful for Meta Programming, Pretty Useful for Meta
+Programming, or Practical Utility for Meta Programming, whichever you
+prefer) is a simple meta-programming tool for C++. The idea is that a
+programmer writes a `foo.pump` file which contains C++ code plus meta
+code that manipulates the C++ code. The meta code can handle
+iterations over a range, nested iterations, local meta variable
+definitions, simple arithmetic, and conditional expressions. You can
+view it as a small Domain-Specific Language. The meta language is
+designed to be non-intrusive (s.t. it won't confuse Emacs' C++ mode,
+for example) and concise, making Pump code intuitive and easy to
+maintain.
+
+## Highlights ##
+
+  * The implementation is in a single Python script and thus ultra portable: no build or installation is needed and it works cross platforms.
+  * Pump tries to be smart with respect to [Google's style guide](http://code.google.com/p/google-styleguide/): it breaks long lines (easy to have when they are generated) at acceptable places to fit within 80 columns and indent the continuation lines correctly.
+  * The format is human-readable and more concise than XML.
+  * The format works relatively well with Emacs' C++ mode.
+
+## Examples ##
+
+The following Pump code (where meta keywords start with `$`, `[[` and `]]` are meta brackets, and `$$` starts a meta comment that ends with the line):
+
+```
+$var n = 3     $$ Defines a meta variable n.
+$range i 0..n  $$ Declares the range of meta iterator i (inclusive).
+$for i [[
+               $$ Meta loop.
+// Foo$i does blah for $i-ary predicates.
+$range j 1..i
+template <size_t N $for j [[, typename A$j]]>
+class Foo$i {
+$if i == 0 [[
+  blah a;
+]] $elif i <= 2 [[
+  blah b;
+]] $else [[
+  blah c;
+]]
+};
+
+]]
+```
+
+will be translated by the Pump compiler to:
+
+```
+// Foo0 does blah for 0-ary predicates.
+template <size_t N>
+class Foo0 {
+  blah a;
+};
+
+// Foo1 does blah for 1-ary predicates.
+template <size_t N, typename A1>
+class Foo1 {
+  blah b;
+};
+
+// Foo2 does blah for 2-ary predicates.
+template <size_t N, typename A1, typename A2>
+class Foo2 {
+  blah b;
+};
+
+// Foo3 does blah for 3-ary predicates.
+template <size_t N, typename A1, typename A2, typename A3>
+class Foo3 {
+  blah c;
+};
+```
+
+In another example,
+
+```
+$range i 1..n
+Func($for i + [[a$i]]);
+$$ The text between i and [[ is the separator between iterations.
+```
+
+will generate one of the following lines (without the comments), depending on the value of `n`:
+
+```
+Func();              // If n is 0.
+Func(a1);            // If n is 1.
+Func(a1 + a2);       // If n is 2.
+Func(a1 + a2 + a3);  // If n is 3.
+// And so on...
+```
+
+## Constructs ##
+
+We support the following meta programming constructs:
+
+| `$var id = exp` | Defines a named constant value. `$id` is valid util the end of the current meta lexical block. |
+|:----------------|:-----------------------------------------------------------------------------------------------|
+| $range id exp..exp | Sets the range of an iteration variable, which can be reused in multiple loops later.          |
+| $for id sep [[code ](.md)] | Iteration. The range of `id` must have been defined earlier. `$id` is valid in `code`.         |
+| `$($)`          | Generates a single `$` character.                                                              |
+| `$id`           | Value of the named constant or iteration variable.                                             |
+| `$(exp)`        | Value of the expression.                                                                       |
+| `$if exp [[ code ]] else_branch` | Conditional.                                                                                   |
+| `[[ code ]]`    | Meta lexical block.                                                                            |
+| `cpp_code`      | Raw C++ code.                                                                                  |
+| `$$ comment`    | Meta comment.                                                                                  |
+
+**Note:** To give the user some freedom in formatting the Pump source
+code, Pump ignores a new-line character if it's right after `$for foo`
+or next to `[[` or `]]`. Without this rule you'll often be forced to write
+very long lines to get the desired output. Therefore sometimes you may
+need to insert an extra new-line in such places for a new-line to show
+up in your output.
+
+## Grammar ##
+
+```
+code ::= atomic_code*
+atomic_code ::= $var id = exp
+    | $var id = [[ code ]]
+    | $range id exp..exp
+    | $for id sep [[ code ]]
+    | $($)
+    | $id
+    | $(exp)
+    | $if exp [[ code ]] else_branch
+    | [[ code ]]
+    | cpp_code
+sep ::= cpp_code | empty_string
+else_branch ::= $else [[ code ]]
+    | $elif exp [[ code ]] else_branch
+    | empty_string
+exp ::= simple_expression_in_Python_syntax
+```
+
+## Code ##
+
+You can find the source code of Pump in [scripts/pump.py](http://code.google.com/p/googletest/source/browse/trunk/scripts/pump.py). It is still
+very unpolished and lacks automated tests, although it has been
+successfully used many times. If you find a chance to use it in your
+project, please let us know what you think!  We also welcome help on
+improving Pump.
+
+## Real Examples ##
+
+You can find real-world applications of Pump in [Google Test](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgoogletest\.googlecode\.com) and [Google Mock](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgooglemock\.googlecode\.com).  The source file `foo.h.pump` generates `foo.h`.
+
+## Tips ##
+
+  * If a meta variable is followed by a letter or digit, you can separate them using `[[]]`, which inserts an empty string. For example `Foo$j[[]]Helper` generate `Foo1Helper` when `j` is 1.
+  * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_XcodeGuide.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_XcodeGuide.md
new file mode 100644
index 0000000000..bf24bf51bf
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_5_XcodeGuide.md
@@ -0,0 +1,93 @@
+
+
+This guide will explain how to use the Google Testing Framework in your Xcode projects on Mac OS X. This tutorial begins by quickly explaining what to do for experienced users. After the quick start, the guide goes provides additional explanation about each step.
+
+# Quick Start #
+
+Here is the quick guide for using Google Test in your Xcode project.
+
+  1. Download the source from the [website](http://code.google.com/p/googletest) using this command: `svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only`
+  1. Open up the `gtest.xcodeproj` in the `googletest-read-only/xcode/` directory and build the gtest.framework.
+  1. Create a new "Shell Tool" target in your Xcode project called something like "UnitTests"
+  1. Add the gtest.framework to your project and add it to the "Link Binary with Libraries" build phase of "UnitTests"
+  1. Add your unit test source code to the "Compile Sources" build phase of "UnitTests"
+  1. Edit the "UnitTests" executable and add an environment variable named "DYLD\_FRAMEWORK\_PATH" with a value equal to the path to the framework containing the gtest.framework relative to the compiled executable.
+  1. Build and Go
+
+The following sections further explain each of the steps listed above in depth, describing in more detail how to complete it including some variations.
+
+# Get the Source #
+
+Currently, the gtest.framework discussed here isn't available in a tagged release of Google Test, it is only available in the trunk. As explained at the Google Test [site](http://code.google.com/p/googletest/source/checkout">svn), you can get the code from anonymous SVN with this command:
+
+```
+svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only
+```
+
+Alternatively, if you are working with Subversion in your own code base, you can add Google Test as an external dependency to your own Subversion repository. By following this approach, everyone that checks out your svn repository will also receive a copy of Google Test (a specific version, if you wish) without having to check it out explicitly. This makes the set up of your project simpler and reduces the copied code in the repository.
+
+To use `svn:externals`, decide where you would like to have the external source reside. You might choose to put the external source inside the trunk, because you want it to be part of the branch when you make a release. However, keeping it outside the trunk in a version-tagged directory called something like `third-party/googletest/1.0.1`, is another option. Once the location is established, use `svn propedit svn:externals _directory_` to set the svn:externals property on a directory in your repository. This directory won't contain the code, but be its versioned parent directory.
+
+The command `svn propedit` will bring up your Subversion editor, making editing the long, (potentially multi-line) property simpler. This same method can be used to check out a tagged branch, by using the appropriate URL (e.g. `http://googletest.googlecode.com/svn/tags/release-1.0.1`). Additionally, the svn:externals property allows the specification of a particular revision of the trunk with the `-r_##_` option (e.g. `externals/src/googletest -r60 http://googletest.googlecode.com/svn/trunk`).
+
+Here is an example of using the svn:externals properties on a trunk (read via `svn propget`) of a project. This value checks out a copy of Google Test into the `trunk/externals/src/googletest/` directory.
+
+```
+[Computer:svn] user$ svn propget svn:externals trunk
+externals/src/googletest http://googletest.googlecode.com/svn/trunk
+```
+
+# Add the Framework to Your Project #
+
+The next step is to build and add the gtest.framework to your own project. This guide describes two common ways below.
+
+  * **Option 1** --- The simplest way to add Google Test to your own project, is to open gtest.xcodeproj (found in the xcode/ directory of the Google Test trunk) and build the framework manually. Then, add the built framework into your project using the "Add->Existing Framework..." from the context menu or "Project->Add..." from the main menu. The gtest.framework is relocatable and contains the headers and object code that you'll need to make tests. This method requires rebuilding every time you upgrade Google Test in your project.
+  * **Option 2** --- If you are going to be living off the trunk of Google Test, incorporating its latest features into your unit tests (or are a Google Test developer yourself). You'll want to rebuild the framework every time the source updates. to do this, you'll need to add the gtest.xcodeproj file, not the framework itself, to your own Xcode project. Then, from the build products that are revealed by the project's disclosure triangle, you can find the gtest.framework, which can be added to your targets (discussed below).
+
+# Make a Test Target #
+
+To start writing tests, make a new "Shell Tool" target. This target template is available under BSD, Cocoa, or Carbon. Add your unit test source code to the "Compile Sources" build phase of the target.
+
+Next, you'll want to add gtest.framework in two different ways, depending upon which option you chose above.
+
+  * **Option 1** --- During compilation, Xcode will need to know that you are linking against the gtest.framework. Add the gtest.framework to the "Link Binary with Libraries" build phase of your test target. This will include the Google Test headers in your header search path, and will tell the linker where to find the library.
+  * **Option 2** --- If your working out of the trunk, you'll also want to add gtest.framework to your "Link Binary with Libraries" build phase of your test target. In addition, you'll  want to add the gtest.framework as a dependency to your unit test target. This way, Xcode will make sure that gtest.framework is up to date, every time your build your target. Finally, if you don't share build directories with Google Test, you'll have to copy the gtest.framework into your own build products directory using a "Run Script" build phase.
+
+# Set Up the Executable Run Environment #
+
+Since the unit test executable is a shell tool, it doesn't have a bundle with a `Contents/Frameworks` directory, in which to place gtest.framework. Instead, the dynamic linker must be told at runtime to search for the framework in another location. This can be accomplished by setting the "DYLD\_FRAMEWORK\_PATH" environment variable in the "Edit Active Executable ..." Arguments tab, under "Variables to be set in the environment:". The path for this value is the path (relative or absolute) of the directory containing the gtest.framework.
+
+If you haven't set up the DYLD\_FRAMEWORK\_PATH, correctly, you might get a message like this:
+
+```
+[Session started at 2008-08-15 06:23:57 -0600.]
+  dyld: Library not loaded: @loader_path/../Frameworks/gtest.framework/Versions/A/gtest
+    Referenced from: /Users/username/Documents/Sandbox/gtestSample/build/Debug/WidgetFrameworkTest
+    Reason: image not found
+```
+
+To correct this problem, got to the directory containing the executable named in "Referenced from:" value in the error message above. Then, with the terminal in this location, find the relative path to the directory containing the gtest.framework. That is the value you'll need to set as the DYLD\_FRAMEWORK\_PATH.
+
+# Build and Go #
+
+Now, when you click "Build and Go", the test will be executed. Dumping out something like this:
+
+```
+[Session started at 2008-08-06 06:36:13 -0600.]
+[==========] Running 2 tests from 1 test case.
+[----------] Global test environment set-up.
+[----------] 2 tests from WidgetInitializerTest
+[ RUN      ] WidgetInitializerTest.TestConstructor
+[       OK ] WidgetInitializerTest.TestConstructor
+[ RUN      ] WidgetInitializerTest.TestConversion
+[       OK ] WidgetInitializerTest.TestConversion
+[----------] Global test environment tear-down
+[==========] 2 tests from 1 test case ran.
+[  PASSED  ] 2 tests.
+
+The Debugger has exited with status 0.  
+```
+
+# Summary #
+
+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_AdvancedGuide.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_AdvancedGuide.md
new file mode 100644
index 0000000000..78864b1667
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_AdvancedGuide.md
@@ -0,0 +1,2178 @@
+
+
+Now that you have read [Primer](V1_6_Primer.md) and learned how to write tests
+using Google Test, it's time to learn some new tricks. This document
+will show you more assertions as well as how to construct complex
+failure messages, propagate fatal failures, reuse and speed up your
+test fixtures, and use various flags with your tests.
+
+# More Assertions #
+
+This section covers some less frequently used, but still significant,
+assertions.
+
+## Explicit Success and Failure ##
+
+These three assertions do not actually test a value or expression. Instead,
+they generate a success or failure directly. Like the macros that actually
+perform a test, you may stream a custom failure message into the them.
+
+| `SUCCEED();` |
+|:-------------|
+
+Generates a success. This does NOT make the overall test succeed. A test is
+considered successful only if none of its assertions fail during its execution.
+
+Note: `SUCCEED()` is purely documentary and currently doesn't generate any
+user-visible output. However, we may add `SUCCEED()` messages to Google Test's
+output in the future.
+
+| `FAIL();`  | `ADD_FAILURE();` | `ADD_FAILURE_AT("`_file\_path_`", `_line\_number_`);` |
+|:-----------|:-----------------|:------------------------------------------------------|
+
+`FAIL()` generates a fatal failure, while `ADD_FAILURE()` and `ADD_FAILURE_AT()` generate a nonfatal
+failure. These are useful when control flow, rather than a Boolean expression,
+deteremines the test's success or failure. For example, you might want to write
+something like:
+
+```
+switch(expression) {
+  case 1: ... some checks ...
+  case 2: ... some other checks
+  ...
+  default: FAIL() << "We shouldn't get here.";
+}
+```
+
+_Availability_: Linux, Windows, Mac.
+
+## Exception Assertions ##
+
+These are for verifying that a piece of code throws (or does not
+throw) an exception of the given type:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_THROW(`_statement_, _exception\_type_`);`  | `EXPECT_THROW(`_statement_, _exception\_type_`);`  | _statement_ throws an exception of the given type  |
+| `ASSERT_ANY_THROW(`_statement_`);`                | `EXPECT_ANY_THROW(`_statement_`);`                | _statement_ throws an exception of any type        |
+| `ASSERT_NO_THROW(`_statement_`);`                 | `EXPECT_NO_THROW(`_statement_`);`                 | _statement_ doesn't throw any exception            |
+
+Examples:
+
+```
+ASSERT_THROW(Foo(5), bar_exception);
+
+EXPECT_NO_THROW({
+  int n = 5;
+  Bar(&n);
+});
+```
+
+_Availability_: Linux, Windows, Mac; since version 1.1.0.
+
+## Predicate Assertions for Better Error Messages ##
+
+Even though Google Test has a rich set of assertions, they can never be
+complete, as it's impossible (nor a good idea) to anticipate all the scenarios
+a user might run into. Therefore, sometimes a user has to use `EXPECT_TRUE()`
+to check a complex expression, for lack of a better macro. This has the problem
+of not showing you the values of the parts of the expression, making it hard to
+understand what went wrong. As a workaround, some users choose to construct the
+failure message by themselves, streaming it into `EXPECT_TRUE()`. However, this
+is awkward especially when the expression has side-effects or is expensive to
+evaluate.
+
+Google Test gives you three different options to solve this problem:
+
+### Using an Existing Boolean Function ###
+
+If you already have a function or a functor that returns `bool` (or a type
+that can be implicitly converted to `bool`), you can use it in a _predicate
+assertion_ to get the function arguments printed for free:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_PRED1(`_pred1, val1_`);`       | `EXPECT_PRED1(`_pred1, val1_`);` | _pred1(val1)_ returns true |
+| `ASSERT_PRED2(`_pred2, val1, val2_`);` | `EXPECT_PRED2(`_pred2, val1, val2_`);` |  _pred2(val1, val2)_ returns true |
+|  ...                | ...                    | ...          |
+
+In the above, _predn_ is an _n_-ary predicate function or functor, where
+_val1_, _val2_, ..., and _valn_ are its arguments. The assertion succeeds
+if the predicate returns `true` when applied to the given arguments, and fails
+otherwise. When the assertion fails, it prints the value of each argument. In
+either case, the arguments are evaluated exactly once.
+
+Here's an example. Given
+
+```
+// Returns true iff m and n have no common divisors except 1.
+bool MutuallyPrime(int m, int n) { ... }
+const int a = 3;
+const int b = 4;
+const int c = 10;
+```
+
+the assertion `EXPECT_PRED2(MutuallyPrime, a, b);` will succeed, while the
+assertion `EXPECT_PRED2(MutuallyPrime, b, c);` will fail with the message
+
+<pre>
+!MutuallyPrime(b, c) is false, where<br>
+b is 4<br>
+c is 10<br>
+</pre>
+
+**Notes:**
+
+  1. If you see a compiler error "no matching function to call" when using `ASSERT_PRED*` or `EXPECT_PRED*`, please see [this](v1_6_FAQ.md#ithe-compiler-complains-about-undefined-references-to-some-static-const-member-variables-but-i-did-define-them-in-the-class-body-whats-wrong) for how to resolve it.
+  1. Currently we only provide predicate assertions of arity <= 5. If you need a higher-arity assertion, let us know.
+
+_Availability_: Linux, Windows, Mac
+
+### Using a Function That Returns an AssertionResult ###
+
+While `EXPECT_PRED*()` and friends are handy for a quick job, the
+syntax is not satisfactory: you have to use different macros for
+different arities, and it feels more like Lisp than C++.  The
+`::testing::AssertionResult` class solves this problem.
+
+An `AssertionResult` object represents the result of an assertion
+(whether it's a success or a failure, and an associated message).  You
+can create an `AssertionResult` using one of these factory
+functions:
+
+```
+namespace testing {
+
+// Returns an AssertionResult object to indicate that an assertion has
+// succeeded.
+AssertionResult AssertionSuccess();
+
+// Returns an AssertionResult object to indicate that an assertion has
+// failed.
+AssertionResult AssertionFailure();
+
+}
+```
+
+You can then use the `<<` operator to stream messages to the
+`AssertionResult` object.
+
+To provide more readable messages in Boolean assertions
+(e.g. `EXPECT_TRUE()`), write a predicate function that returns
+`AssertionResult` instead of `bool`. For example, if you define
+`IsEven()` as:
+
+```
+::testing::AssertionResult IsEven(int n) {
+  if ((n % 2) == 0)
+    return ::testing::AssertionSuccess();
+  else
+    return ::testing::AssertionFailure() << n << " is odd";
+}
+```
+
+instead of:
+
+```
+bool IsEven(int n) {
+  return (n % 2) == 0;
+}
+```
+
+the failed assertion `EXPECT_TRUE(IsEven(Fib(4)))` will print:
+
+<pre>
+Value of: !IsEven(Fib(4))<br>
+Actual: false (*3 is odd*)<br>
+Expected: true<br>
+</pre>
+
+instead of a more opaque
+
+<pre>
+Value of: !IsEven(Fib(4))<br>
+Actual: false<br>
+Expected: true<br>
+</pre>
+
+If you want informative messages in `EXPECT_FALSE` and `ASSERT_FALSE`
+as well, and are fine with making the predicate slower in the success
+case, you can supply a success message:
+
+```
+::testing::AssertionResult IsEven(int n) {
+  if ((n % 2) == 0)
+    return ::testing::AssertionSuccess() << n << " is even";
+  else
+    return ::testing::AssertionFailure() << n << " is odd";
+}
+```
+
+Then the statement `EXPECT_FALSE(IsEven(Fib(6)))` will print
+
+<pre>
+Value of: !IsEven(Fib(6))<br>
+Actual: true (8 is even)<br>
+Expected: false<br>
+</pre>
+
+_Availability_: Linux, Windows, Mac; since version 1.4.1.
+
+### Using a Predicate-Formatter ###
+
+If you find the default message generated by `(ASSERT|EXPECT)_PRED*` and
+`(ASSERT|EXPECT)_(TRUE|FALSE)` unsatisfactory, or some arguments to your
+predicate do not support streaming to `ostream`, you can instead use the
+following _predicate-formatter assertions_ to _fully_ customize how the
+message is formatted:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_PRED_FORMAT1(`_pred\_format1, val1_`);`        | `EXPECT_PRED_FORMAT1(`_pred\_format1, val1_`); | _pred\_format1(val1)_ is successful |
+| `ASSERT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | `EXPECT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | _pred\_format2(val1, val2)_ is successful |
+| `...`               | `...`                  | `...`        |
+
+The difference between this and the previous two groups of macros is that instead of
+a predicate, `(ASSERT|EXPECT)_PRED_FORMAT*` take a _predicate-formatter_
+(_pred\_formatn_), which is a function or functor with the signature:
+
+`::testing::AssertionResult PredicateFormattern(const char* `_expr1_`, const char* `_expr2_`, ... const char* `_exprn_`, T1 `_val1_`, T2 `_val2_`, ... Tn `_valn_`);`
+
+where _val1_, _val2_, ..., and _valn_ are the values of the predicate
+arguments, and _expr1_, _expr2_, ..., and _exprn_ are the corresponding
+expressions as they appear in the source code. The types `T1`, `T2`, ..., and
+`Tn` can be either value types or reference types. For example, if an
+argument has type `Foo`, you can declare it as either `Foo` or `const Foo&`,
+whichever is appropriate.
+
+A predicate-formatter returns a `::testing::AssertionResult` object to indicate
+whether the assertion has succeeded or not. The only way to create such an
+object is to call one of these factory functions:
+
+As an example, let's improve the failure message in the previous example, which uses `EXPECT_PRED2()`:
+
+```
+// Returns the smallest prime common divisor of m and n,
+// or 1 when m and n are mutually prime.
+int SmallestPrimeCommonDivisor(int m, int n) { ... }
+
+// A predicate-formatter for asserting that two integers are mutually prime.
+::testing::AssertionResult AssertMutuallyPrime(const char* m_expr,
+                                               const char* n_expr,
+                                               int m,
+                                               int n) {
+  if (MutuallyPrime(m, n))
+    return ::testing::AssertionSuccess();
+
+  return ::testing::AssertionFailure()
+      << m_expr << " and " << n_expr << " (" << m << " and " << n
+      << ") are not mutually prime, " << "as they have a common divisor "
+      << SmallestPrimeCommonDivisor(m, n);
+}
+```
+
+With this predicate-formatter, we can use
+
+```
+EXPECT_PRED_FORMAT2(AssertMutuallyPrime, b, c);
+```
+
+to generate the message
+
+<pre>
+b and c (4 and 10) are not mutually prime, as they have a common divisor 2.<br>
+</pre>
+
+As you may have realized, many of the assertions we introduced earlier are
+special cases of `(EXPECT|ASSERT)_PRED_FORMAT*`. In fact, most of them are
+indeed defined using `(EXPECT|ASSERT)_PRED_FORMAT*`.
+
+_Availability_: Linux, Windows, Mac.
+
+
+## Floating-Point Comparison ##
+
+Comparing floating-point numbers is tricky. Due to round-off errors, it is
+very unlikely that two floating-points will match exactly. Therefore,
+`ASSERT_EQ` 's naive comparison usually doesn't work. And since floating-points
+can have a wide value range, no single fixed error bound works. It's better to
+compare by a fixed relative error bound, except for values close to 0 due to
+the loss of precision there.
+
+In general, for floating-point comparison to make sense, the user needs to
+carefully choose the error bound. If they don't want or care to, comparing in
+terms of Units in the Last Place (ULPs) is a good default, and Google Test
+provides assertions to do this. Full details about ULPs are quite long; if you
+want to learn more, see
+[this article on float comparison](http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm).
+
+### Floating-Point Macros ###
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_FLOAT_EQ(`_expected, actual_`);`  | `EXPECT_FLOAT_EQ(`_expected, actual_`);` | the two `float` values are almost equal |
+| `ASSERT_DOUBLE_EQ(`_expected, actual_`);` | `EXPECT_DOUBLE_EQ(`_expected, actual_`);` | the two `double` values are almost equal |
+
+By "almost equal", we mean the two values are within 4 ULP's from each
+other.
+
+The following assertions allow you to choose the acceptable error bound:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_NEAR(`_val1, val2, abs\_error_`);` | `EXPECT_NEAR`_(val1, val2, abs\_error_`);` | the difference between _val1_ and _val2_ doesn't exceed the given absolute error |
+
+_Availability_: Linux, Windows, Mac.
+
+### Floating-Point Predicate-Format Functions ###
+
+Some floating-point operations are useful, but not that often used. In order
+to avoid an explosion of new macros, we provide them as predicate-format
+functions that can be used in predicate assertion macros (e.g.
+`EXPECT_PRED_FORMAT2`, etc).
+
+```
+EXPECT_PRED_FORMAT2(::testing::FloatLE, val1, val2);
+EXPECT_PRED_FORMAT2(::testing::DoubleLE, val1, val2);
+```
+
+Verifies that _val1_ is less than, or almost equal to, _val2_. You can
+replace `EXPECT_PRED_FORMAT2` in the above table with `ASSERT_PRED_FORMAT2`.
+
+_Availability_: Linux, Windows, Mac.
+
+## Windows HRESULT assertions ##
+
+These assertions test for `HRESULT` success or failure.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_HRESULT_SUCCEEDED(`_expression_`);` | `EXPECT_HRESULT_SUCCEEDED(`_expression_`);` | _expression_ is a success `HRESULT` |
+| `ASSERT_HRESULT_FAILED(`_expression_`);`    | `EXPECT_HRESULT_FAILED(`_expression_`);`    | _expression_ is a failure `HRESULT` |
+
+The generated output contains the human-readable error message
+associated with the `HRESULT` code returned by _expression_.
+
+You might use them like this:
+
+```
+CComPtr shell;
+ASSERT_HRESULT_SUCCEEDED(shell.CoCreateInstance(L"Shell.Application"));
+CComVariant empty;
+ASSERT_HRESULT_SUCCEEDED(shell->ShellExecute(CComBSTR(url), empty, empty, empty, empty));
+```
+
+_Availability_: Windows.
+
+## Type Assertions ##
+
+You can call the function
+```
+::testing::StaticAssertTypeEq<T1, T2>();
+```
+to assert that types `T1` and `T2` are the same.  The function does
+nothing if the assertion is satisfied.  If the types are different,
+the function call will fail to compile, and the compiler error message
+will likely (depending on the compiler) show you the actual values of
+`T1` and `T2`.  This is mainly useful inside template code.
+
+_Caveat:_ When used inside a member function of a class template or a
+function template, `StaticAssertTypeEq<T1, T2>()` is effective _only if_
+the function is instantiated.  For example, given:
+```
+template <typename T> class Foo {
+ public:
+  void Bar() { ::testing::StaticAssertTypeEq<int, T>(); }
+};
+```
+the code:
+```
+void Test1() { Foo<bool> foo; }
+```
+will _not_ generate a compiler error, as `Foo<bool>::Bar()` is never
+actually instantiated.  Instead, you need:
+```
+void Test2() { Foo<bool> foo; foo.Bar(); }
+```
+to cause a compiler error.
+
+_Availability:_ Linux, Windows, Mac; since version 1.3.0.
+
+## Assertion Placement ##
+
+You can use assertions in any C++ function. In particular, it doesn't
+have to be a method of the test fixture class. The one constraint is
+that assertions that generate a fatal failure (`FAIL*` and `ASSERT_*`)
+can only be used in void-returning functions. This is a consequence of
+Google Test not using exceptions. By placing it in a non-void function
+you'll get a confusing compile error like
+`"error: void value not ignored as it ought to be"`.
+
+If you need to use assertions in a function that returns non-void, one option
+is to make the function return the value in an out parameter instead. For
+example, you can rewrite `T2 Foo(T1 x)` to `void Foo(T1 x, T2* result)`. You
+need to make sure that `*result` contains some sensible value even when the
+function returns prematurely. As the function now returns `void`, you can use
+any assertion inside of it.
+
+If changing the function's type is not an option, you should just use
+assertions that generate non-fatal failures, such as `ADD_FAILURE*` and
+`EXPECT_*`.
+
+_Note_: Constructors and destructors are not considered void-returning
+functions, according to the C++ language specification, and so you may not use
+fatal assertions in them. You'll get a compilation error if you try. A simple
+workaround is to transfer the entire body of the constructor or destructor to a
+private void-returning method. However, you should be aware that a fatal
+assertion failure in a constructor does not terminate the current test, as your
+intuition might suggest; it merely returns from the constructor early, possibly
+leaving your object in a partially-constructed state. Likewise, a fatal
+assertion failure in a destructor may leave your object in a
+partially-destructed state. Use assertions carefully in these situations!
+
+# Teaching Google Test How to Print Your Values #
+
+When a test assertion such as `EXPECT_EQ` fails, Google Test prints the
+argument values to help you debug.  It does this using a
+user-extensible value printer.
+
+This printer knows how to print built-in C++ types, native arrays, STL
+containers, and any type that supports the `<<` operator.  For other
+types, it prints the raw bytes in the value and hopes that you the
+user can figure it out.
+
+As mentioned earlier, the printer is _extensible_.  That means
+you can teach it to do a better job at printing your particular type
+than to dump the bytes.  To do that, define `<<` for your type:
+
+```
+#include <iostream>
+
+namespace foo {
+
+class Bar { ... };  // We want Google Test to be able to print instances of this.
+
+// It's important that the << operator is defined in the SAME
+// namespace that defines Bar.  C++'s look-up rules rely on that.
+::std::ostream& operator<<(::std::ostream& os, const Bar& bar) {
+  return os << bar.DebugString();  // whatever needed to print bar to os
+}
+
+}  // namespace foo
+```
+
+Sometimes, this might not be an option: your team may consider it bad
+style to have a `<<` operator for `Bar`, or `Bar` may already have a
+`<<` operator that doesn't do what you want (and you cannot change
+it).  If so, you can instead define a `PrintTo()` function like this:
+
+```
+#include <iostream>
+
+namespace foo {
+
+class Bar { ... };
+
+// It's important that PrintTo() is defined in the SAME
+// namespace that defines Bar.  C++'s look-up rules rely on that.
+void PrintTo(const Bar& bar, ::std::ostream* os) {
+  *os << bar.DebugString();  // whatever needed to print bar to os
+}
+
+}  // namespace foo
+```
+
+If you have defined both `<<` and `PrintTo()`, the latter will be used
+when Google Test is concerned.  This allows you to customize how the value
+appears in Google Test's output without affecting code that relies on the
+behavior of its `<<` operator.
+
+If you want to print a value `x` using Google Test's value printer
+yourself, just call `::testing::PrintToString(`_x_`)`, which
+returns an `std::string`:
+
+```
+vector<pair<Bar, int> > bar_ints = GetBarIntVector();
+
+EXPECT_TRUE(IsCorrectBarIntVector(bar_ints))
+    << "bar_ints = " << ::testing::PrintToString(bar_ints);
+```
+
+# Death Tests #
+
+In many applications, there are assertions that can cause application failure
+if a condition is not met. These sanity checks, which ensure that the program
+is in a known good state, are there to fail at the earliest possible time after
+some program state is corrupted. If the assertion checks the wrong condition,
+then the program may proceed in an erroneous state, which could lead to memory
+corruption, security holes, or worse. Hence it is vitally important to test
+that such assertion statements work as expected.
+
+Since these precondition checks cause the processes to die, we call such tests
+_death tests_. More generally, any test that checks that a program terminates
+(except by throwing an exception) in an expected fashion is also a death test.
+
+Note that if a piece of code throws an exception, we don't consider it "death"
+for the purpose of death tests, as the caller of the code could catch the exception
+and avoid the crash. If you want to verify exceptions thrown by your code,
+see [Exception Assertions](#exception-assertions).
+
+If you want to test `EXPECT_*()/ASSERT_*()` failures in your test code, see [Catching Failures](#catching-failures).
+
+## How to Write a Death Test ##
+
+Google Test has the following macros to support death tests:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_DEATH(`_statement, regex_`); | `EXPECT_DEATH(`_statement, regex_`); | _statement_ crashes with the given error |
+| `ASSERT_DEATH_IF_SUPPORTED(`_statement, regex_`); | `EXPECT_DEATH_IF_SUPPORTED(`_statement, regex_`); | if death tests are supported, verifies that _statement_ crashes with the given error; otherwise verifies nothing |
+| `ASSERT_EXIT(`_statement, predicate, regex_`); | `EXPECT_EXIT(`_statement, predicate, regex_`); |_statement_ exits with the given error and its exit code matches _predicate_ |
+
+where _statement_ is a statement that is expected to cause the process to
+die, _predicate_ is a function or function object that evaluates an integer
+exit status, and _regex_ is a regular expression that the stderr output of
+_statement_ is expected to match. Note that _statement_ can be _any valid
+statement_ (including _compound statement_) and doesn't have to be an
+expression.
+
+As usual, the `ASSERT` variants abort the current test function, while the
+`EXPECT` variants do not.
+
+**Note:** We use the word "crash" here to mean that the process
+terminates with a _non-zero_ exit status code.  There are two
+possibilities: either the process has called `exit()` or `_exit()`
+with a non-zero value, or it may be killed by a signal.
+
+This means that if _statement_ terminates the process with a 0 exit
+code, it is _not_ considered a crash by `EXPECT_DEATH`.  Use
+`EXPECT_EXIT` instead if this is the case, or if you want to restrict
+the exit code more precisely.
+
+A predicate here must accept an `int` and return a `bool`. The death test
+succeeds only if the predicate returns `true`. Google Test defines a few
+predicates that handle the most common cases:
+
+```
+::testing::ExitedWithCode(exit_code)
+```
+
+This expression is `true` if the program exited normally with the given exit
+code.
+
+```
+::testing::KilledBySignal(signal_number)  // Not available on Windows.
+```
+
+This expression is `true` if the program was killed by the given signal.
+
+The `*_DEATH` macros are convenient wrappers for `*_EXIT` that use a predicate
+that verifies the process' exit code is non-zero.
+
+Note that a death test only cares about three things:
+
+  1. does _statement_ abort or exit the process?
+  1. (in the case of `ASSERT_EXIT` and `EXPECT_EXIT`) does the exit status satisfy _predicate_?  Or (in the case of `ASSERT_DEATH` and `EXPECT_DEATH`) is the exit status non-zero?  And
+  1. does the stderr output match _regex_?
+
+In particular, if _statement_ generates an `ASSERT_*` or `EXPECT_*` failure, it will **not** cause the death test to fail, as Google Test assertions don't abort the process.
+
+To write a death test, simply use one of the above macros inside your test
+function. For example,
+
+```
+TEST(My*DeathTest*, Foo) {
+  // This death test uses a compound statement.
+  ASSERT_DEATH({ int n = 5; Foo(&n); }, "Error on line .* of Foo()");
+}
+TEST(MyDeathTest, NormalExit) {
+  EXPECT_EXIT(NormalExit(), ::testing::ExitedWithCode(0), "Success");
+}
+TEST(MyDeathTest, KillMyself) {
+  EXPECT_EXIT(KillMyself(), ::testing::KilledBySignal(SIGKILL), "Sending myself unblockable signal");
+}
+```
+
+verifies that:
+
+  * calling `Foo(5)` causes the process to die with the given error message,
+  * calling `NormalExit()` causes the process to print `"Success"` to stderr and exit with exit code 0, and
+  * calling `KillMyself()` kills the process with signal `SIGKILL`.
+
+The test function body may contain other assertions and statements as well, if
+necessary.
+
+_Important:_ We strongly recommend you to follow the convention of naming your
+test case (not test) `*DeathTest` when it contains a death test, as
+demonstrated in the above example. The `Death Tests And Threads` section below
+explains why.
+
+If a test fixture class is shared by normal tests and death tests, you
+can use typedef to introduce an alias for the fixture class and avoid
+duplicating its code:
+```
+class FooTest : public ::testing::Test { ... };
+
+typedef FooTest FooDeathTest;
+
+TEST_F(FooTest, DoesThis) {
+  // normal test
+}
+
+TEST_F(FooDeathTest, DoesThat) {
+  // death test
+}
+```
+
+_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Cygwin, and Mac (the latter three are supported since v1.3.0).  `(ASSERT|EXPECT)_DEATH_IF_SUPPORTED` are new in v1.4.0.
+
+## Regular Expression Syntax ##
+
+On POSIX systems (e.g. Linux, Cygwin, and Mac), Google Test uses the
+[POSIX extended regular expression](http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04)
+syntax in death tests. To learn about this syntax, you may want to read this [Wikipedia entry](http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions).
+
+On Windows, Google Test uses its own simple regular expression
+implementation. It lacks many features you can find in POSIX extended
+regular expressions.  For example, we don't support union (`"x|y"`),
+grouping (`"(xy)"`), brackets (`"[xy]"`), and repetition count
+(`"x{5,7}"`), among others. Below is what we do support (`A` denotes a
+literal character, period (`.`), or a single `\\` escape sequence; `x`
+and `y` denote regular expressions.):
+
+| `c` | matches any literal character `c` |
+|:----|:----------------------------------|
+| `\\d` | matches any decimal digit         |
+| `\\D` | matches any character that's not a decimal digit |
+| `\\f` | matches `\f`                      |
+| `\\n` | matches `\n`                      |
+| `\\r` | matches `\r`                      |
+| `\\s` | matches any ASCII whitespace, including `\n` |
+| `\\S` | matches any character that's not a whitespace |
+| `\\t` | matches `\t`                      |
+| `\\v` | matches `\v`                      |
+| `\\w` | matches any letter, `_`, or decimal digit |
+| `\\W` | matches any character that `\\w` doesn't match |
+| `\\c` | matches any literal character `c`, which must be a punctuation |
+| `.` | matches any single character except `\n` |
+| `A?` | matches 0 or 1 occurrences of `A` |
+| `A*` | matches 0 or many occurrences of `A` |
+| `A+` | matches 1 or many occurrences of `A` |
+| `^` | matches the beginning of a string (not that of each line) |
+| `$` | matches the end of a string (not that of each line) |
+| `xy` | matches `x` followed by `y`       |
+
+To help you determine which capability is available on your system,
+Google Test defines macro `GTEST_USES_POSIX_RE=1` when it uses POSIX
+extended regular expressions, or `GTEST_USES_SIMPLE_RE=1` when it uses
+the simple version.  If you want your death tests to work in both
+cases, you can either `#if` on these macros or use the more limited
+syntax only.
+
+## How It Works ##
+
+Under the hood, `ASSERT_EXIT()` spawns a new process and executes the
+death test statement in that process. The details of of how precisely
+that happens depend on the platform and the variable
+`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the
+command-line flag `--gtest_death_test_style`).
+
+  * On POSIX systems, `fork()` (or `clone()` on Linux) is used to spawn the child, after which:
+    * If the variable's value is `"fast"`, the death test statement is immediately executed.
+    * If the variable's value is `"threadsafe"`, the child process re-executes the unit test binary just as it was originally invoked, but with some extra flags to cause just the single death test under consideration to be run.
+  * On Windows, the child is spawned using the `CreateProcess()` API, and re-executes the binary to cause just the single death test under consideration to be run - much like the `threadsafe` mode on POSIX.
+
+Other values for the variable are illegal and will cause the death test to
+fail. Currently, the flag's default value is `"fast"`. However, we reserve the
+right to change it in the future. Therefore, your tests should not depend on
+this.
+
+In either case, the parent process waits for the child process to complete, and checks that
+
+  1. the child's exit status satisfies the predicate, and
+  1. the child's stderr matches the regular expression.
+
+If the death test statement runs to completion without dying, the child
+process will nonetheless terminate, and the assertion fails.
+
+## Death Tests And Threads ##
+
+The reason for the two death test styles has to do with thread safety. Due to
+well-known problems with forking in the presence of threads, death tests should
+be run in a single-threaded context. Sometimes, however, it isn't feasible to
+arrange that kind of environment. For example, statically-initialized modules
+may start threads before main is ever reached. Once threads have been created,
+it may be difficult or impossible to clean them up.
+
+Google Test has three features intended to raise awareness of threading issues.
+
+  1. A warning is emitted if multiple threads are running when a death test is encountered.
+  1. Test cases with a name ending in "DeathTest" are run before all other tests.
+  1. It uses `clone()` instead of `fork()` to spawn the child process on Linux (`clone()` is not available on Cygwin and Mac), as `fork()` is more likely to cause the child to hang when the parent process has multiple threads.
+
+It's perfectly fine to create threads inside a death test statement; they are
+executed in a separate process and cannot affect the parent.
+
+## Death Test Styles ##
+
+The "threadsafe" death test style was introduced in order to help mitigate the
+risks of testing in a possibly multithreaded environment. It trades increased
+test execution time (potentially dramatically so) for improved thread safety.
+We suggest using the faster, default "fast" style unless your test has specific
+problems with it.
+
+You can choose a particular style of death tests by setting the flag
+programmatically:
+
+```
+::testing::FLAGS_gtest_death_test_style = "threadsafe";
+```
+
+You can do this in `main()` to set the style for all death tests in the
+binary, or in individual tests. Recall that flags are saved before running each
+test and restored afterwards, so you need not do that yourself. For example:
+
+```
+TEST(MyDeathTest, TestOne) {
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
+  // This test is run in the "threadsafe" style:
+  ASSERT_DEATH(ThisShouldDie(), "");
+}
+
+TEST(MyDeathTest, TestTwo) {
+  // This test is run in the "fast" style:
+  ASSERT_DEATH(ThisShouldDie(), "");
+}
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  ::testing::FLAGS_gtest_death_test_style = "fast";
+  return RUN_ALL_TESTS();
+}
+```
+
+## Caveats ##
+
+The _statement_ argument of `ASSERT_EXIT()` can be any valid C++ statement.
+If it leaves the current function via a `return` statement or by throwing an exception,
+the death test is considered to have failed.  Some Google Test macros may return
+from the current function (e.g. `ASSERT_TRUE()`), so be sure to avoid them in _statement_.
+
+Since _statement_ runs in the child process, any in-memory side effect (e.g.
+modifying a variable, releasing memory, etc) it causes will _not_ be observable
+in the parent process. In particular, if you release memory in a death test,
+your program will fail the heap check as the parent process will never see the
+memory reclaimed. To solve this problem, you can
+
+  1. try not to free memory in a death test;
+  1. free the memory again in the parent process; or
+  1. do not use the heap checker in your program.
+
+Due to an implementation detail, you cannot place multiple death test
+assertions on the same line; otherwise, compilation will fail with an unobvious
+error message.
+
+Despite the improved thread safety afforded by the "threadsafe" style of death
+test, thread problems such as deadlock are still possible in the presence of
+handlers registered with `pthread_atfork(3)`.
+
+# Using Assertions in Sub-routines #
+
+## Adding Traces to Assertions ##
+
+If a test sub-routine is called from several places, when an assertion
+inside it fails, it can be hard to tell which invocation of the
+sub-routine the failure is from.  You can alleviate this problem using
+extra logging or custom failure messages, but that usually clutters up
+your tests. A better solution is to use the `SCOPED_TRACE` macro:
+
+| `SCOPED_TRACE(`_message_`);` |
+|:-----------------------------|
+
+where _message_ can be anything streamable to `std::ostream`. This
+macro will cause the current file name, line number, and the given
+message to be added in every failure message. The effect will be
+undone when the control leaves the current lexical scope.
+
+For example,
+
+```
+10: void Sub1(int n) {
+11:   EXPECT_EQ(1, Bar(n));
+12:   EXPECT_EQ(2, Bar(n + 1));
+13: }
+14:
+15: TEST(FooTest, Bar) {
+16:   {
+17:     SCOPED_TRACE("A");  // This trace point will be included in
+18:                         // every failure in this scope.
+19:     Sub1(1);
+20:   }
+21:   // Now it won't.
+22:   Sub1(9);
+23: }
+```
+
+could result in messages like these:
+
+```
+path/to/foo_test.cc:11: Failure
+Value of: Bar(n)
+Expected: 1
+  Actual: 2
+   Trace:
+path/to/foo_test.cc:17: A
+
+path/to/foo_test.cc:12: Failure
+Value of: Bar(n + 1)
+Expected: 2
+  Actual: 3
+```
+
+Without the trace, it would've been difficult to know which invocation
+of `Sub1()` the two failures come from respectively. (You could add an
+extra message to each assertion in `Sub1()` to indicate the value of
+`n`, but that's tedious.)
+
+Some tips on using `SCOPED_TRACE`:
+
+  1. With a suitable message, it's often enough to use `SCOPED_TRACE` at the beginning of a sub-routine, instead of at each call site.
+  1. When calling sub-routines inside a loop, make the loop iterator part of the message in `SCOPED_TRACE` such that you can know which iteration the failure is from.
+  1. Sometimes the line number of the trace point is enough for identifying the particular invocation of a sub-routine. In this case, you don't have to choose a unique message for `SCOPED_TRACE`. You can simply use `""`.
+  1. You can use `SCOPED_TRACE` in an inner scope when there is one in the outer scope. In this case, all active trace points will be included in the failure messages, in reverse order they are encountered.
+  1. The trace dump is clickable in Emacs' compilation buffer - hit return on a line number and you'll be taken to that line in the source file!
+
+_Availability:_ Linux, Windows, Mac.
+
+## Propagating Fatal Failures ##
+
+A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that
+when they fail they only abort the _current function_, not the entire test. For
+example, the following test will segfault:
+```
+void Subroutine() {
+  // Generates a fatal failure and aborts the current function.
+  ASSERT_EQ(1, 2);
+  // The following won't be executed.
+  ...
+}
+
+TEST(FooTest, Bar) {
+  Subroutine();
+  // The intended behavior is for the fatal failure
+  // in Subroutine() to abort the entire test.
+  // The actual behavior: the function goes on after Subroutine() returns.
+  int* p = NULL;
+  *p = 3; // Segfault!
+}
+```
+
+Since we don't use exceptions, it is technically impossible to
+implement the intended behavior here.  To alleviate this, Google Test
+provides two solutions.  You could use either the
+`(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the
+`HasFatalFailure()` function.  They are described in the following two
+subsections.
+
+### Asserting on Subroutines ###
+
+As shown above, if your test calls a subroutine that has an `ASSERT_*`
+failure in it, the test will continue after the subroutine
+returns. This may not be what you want.
+
+Often people want fatal failures to propagate like exceptions.  For
+that Google Test offers the following macros:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_NO_FATAL_FAILURE(`_statement_`);` | `EXPECT_NO_FATAL_FAILURE(`_statement_`);` | _statement_ doesn't generate any new fatal failures in the current thread. |
+
+Only failures in the thread that executes the assertion are checked to
+determine the result of this type of assertions.  If _statement_
+creates new threads, failures in these threads are ignored.
+
+Examples:
+
+```
+ASSERT_NO_FATAL_FAILURE(Foo());
+
+int i;
+EXPECT_NO_FATAL_FAILURE({
+  i = Bar();
+});
+```
+
+_Availability:_ Linux, Windows, Mac. Assertions from multiple threads
+are currently not supported.
+
+### Checking for Failures in the Current Test ###
+
+`HasFatalFailure()` in the `::testing::Test` class returns `true` if an
+assertion in the current test has suffered a fatal failure. This
+allows functions to catch fatal failures in a sub-routine and return
+early.
+
+```
+class Test {
+ public:
+  ...
+  static bool HasFatalFailure();
+};
+```
+
+The typical usage, which basically simulates the behavior of a thrown
+exception, is:
+
+```
+TEST(FooTest, Bar) {
+  Subroutine();
+  // Aborts if Subroutine() had a fatal failure.
+  if (HasFatalFailure())
+    return;
+  // The following won't be executed.
+  ...
+}
+```
+
+If `HasFatalFailure()` is used outside of `TEST()` , `TEST_F()` , or a test
+fixture, you must add the `::testing::Test::` prefix, as in:
+
+```
+if (::testing::Test::HasFatalFailure())
+  return;
+```
+
+Similarly, `HasNonfatalFailure()` returns `true` if the current test
+has at least one non-fatal failure, and `HasFailure()` returns `true`
+if the current test has at least one failure of either kind.
+
+_Availability:_ Linux, Windows, Mac.  `HasNonfatalFailure()` and
+`HasFailure()` are available since version 1.4.0.
+
+# Logging Additional Information #
+
+In your test code, you can call `RecordProperty("key", value)` to log
+additional information, where `value` can be either a C string or a 32-bit
+integer. The _last_ value recorded for a key will be emitted to the XML output
+if you specify one. For example, the test
+
+```
+TEST_F(WidgetUsageTest, MinAndMaxWidgets) {
+  RecordProperty("MaximumWidgets", ComputeMaxUsage());
+  RecordProperty("MinimumWidgets", ComputeMinUsage());
+}
+```
+
+will output XML like this:
+
+```
+...
+  <testcase name="MinAndMaxWidgets" status="run" time="6" classname="WidgetUsageTest"
+            MaximumWidgets="12"
+            MinimumWidgets="9" />
+...
+```
+
+_Note_:
+  * `RecordProperty()` is a static member of the `Test` class. Therefore it needs to be prefixed with `::testing::Test::` if used outside of the `TEST` body and the test fixture class.
+  * `key` must be a valid XML attribute name, and cannot conflict with the ones already used by Google Test (`name`, `status`,     `time`, and `classname`).
+
+_Availability_: Linux, Windows, Mac.
+
+# Sharing Resources Between Tests in the Same Test Case #
+
+
+
+Google Test creates a new test fixture object for each test in order to make
+tests independent and easier to debug. However, sometimes tests use resources
+that are expensive to set up, making the one-copy-per-test model prohibitively
+expensive.
+
+If the tests don't change the resource, there's no harm in them sharing a
+single resource copy. So, in addition to per-test set-up/tear-down, Google Test
+also supports per-test-case set-up/tear-down. To use it:
+
+  1. In your test fixture class (say `FooTest` ), define as `static` some member variables to hold the shared resources.
+  1. In the same test fixture class, define a `static void SetUpTestCase()` function (remember not to spell it as **`SetupTestCase`** with a small `u`!) to set up the shared resources and a `static void TearDownTestCase()` function to tear them down.
+
+That's it! Google Test automatically calls `SetUpTestCase()` before running the
+_first test_ in the `FooTest` test case (i.e. before creating the first
+`FooTest` object), and calls `TearDownTestCase()` after running the _last test_
+in it (i.e. after deleting the last `FooTest` object). In between, the tests
+can use the shared resources.
+
+Remember that the test order is undefined, so your code can't depend on a test
+preceding or following another. Also, the tests must either not modify the
+state of any shared resource, or, if they do modify the state, they must
+restore the state to its original value before passing control to the next
+test.
+
+Here's an example of per-test-case set-up and tear-down:
+```
+class FooTest : public ::testing::Test {
+ protected:
+  // Per-test-case set-up.
+  // Called before the first test in this test case.
+  // Can be omitted if not needed.
+  static void SetUpTestCase() {
+    shared_resource_ = new ...;
+  }
+
+  // Per-test-case tear-down.
+  // Called after the last test in this test case.
+  // Can be omitted if not needed.
+  static void TearDownTestCase() {
+    delete shared_resource_;
+    shared_resource_ = NULL;
+  }
+
+  // You can define per-test set-up and tear-down logic as usual.
+  virtual void SetUp() { ... }
+  virtual void TearDown() { ... }
+
+  // Some expensive resource shared by all tests.
+  static T* shared_resource_;
+};
+
+T* FooTest::shared_resource_ = NULL;
+
+TEST_F(FooTest, Test1) {
+  ... you can refer to shared_resource here ...
+}
+TEST_F(FooTest, Test2) {
+  ... you can refer to shared_resource here ...
+}
+```
+
+_Availability:_ Linux, Windows, Mac.
+
+# Global Set-Up and Tear-Down #
+
+Just as you can do set-up and tear-down at the test level and the test case
+level, you can also do it at the test program level. Here's how.
+
+First, you subclass the `::testing::Environment` class to define a test
+environment, which knows how to set-up and tear-down:
+
+```
+class Environment {
+ public:
+  virtual ~Environment() {}
+  // Override this to define how to set up the environment.
+  virtual void SetUp() {}
+  // Override this to define how to tear down the environment.
+  virtual void TearDown() {}
+};
+```
+
+Then, you register an instance of your environment class with Google Test by
+calling the `::testing::AddGlobalTestEnvironment()` function:
+
+```
+Environment* AddGlobalTestEnvironment(Environment* env);
+```
+
+Now, when `RUN_ALL_TESTS()` is called, it first calls the `SetUp()` method of
+the environment object, then runs the tests if there was no fatal failures, and
+finally calls `TearDown()` of the environment object.
+
+It's OK to register multiple environment objects. In this case, their `SetUp()`
+will be called in the order they are registered, and their `TearDown()` will be
+called in the reverse order.
+
+Note that Google Test takes ownership of the registered environment objects.
+Therefore **do not delete them** by yourself.
+
+You should call `AddGlobalTestEnvironment()` before `RUN_ALL_TESTS()` is
+called, probably in `main()`. If you use `gtest_main`, you need to      call
+this before `main()` starts for it to take effect. One way to do this is to
+define a global variable like this:
+
+```
+::testing::Environment* const foo_env = ::testing::AddGlobalTestEnvironment(new FooEnvironment);
+```
+
+However, we strongly recommend you to write your own `main()` and call
+`AddGlobalTestEnvironment()` there, as relying on initialization of global
+variables makes the code harder to read and may cause problems when you
+register multiple environments from different translation units and the
+environments have dependencies among them (remember that the compiler doesn't
+guarantee the order in which global variables from different translation units
+are initialized).
+
+_Availability:_ Linux, Windows, Mac.
+
+
+# Value Parameterized Tests #
+
+_Value-parameterized tests_ allow you to test your code with different
+parameters without writing multiple copies of the same test.
+
+Suppose you write a test for your code and then realize that your code is affected by a presence of a Boolean command line flag.
+
+```
+TEST(MyCodeTest, TestFoo) {
+  // A code to test foo().
+}
+```
+
+Usually people factor their test code into a function with a Boolean parameter in such situations. The function sets the flag, then executes the testing code.
+
+```
+void TestFooHelper(bool flag_value) {
+  flag = flag_value;
+  // A code to test foo().
+}
+
+TEST(MyCodeTest, TestFooo) {
+  TestFooHelper(false);
+  TestFooHelper(true);
+}
+```
+
+But this setup has serious drawbacks. First, when a test assertion fails in your tests, it becomes unclear what value of the parameter caused it to fail. You can stream a clarifying message into your `EXPECT`/`ASSERT` statements, but it you'll have to do it with all of them. Second, you have to add one such helper function per test. What if you have ten tests? Twenty? A hundred?
+
+Value-parameterized tests will let you write your test only once and then easily instantiate and run it with an arbitrary number of parameter values.
+
+Here are some other situations when value-parameterized tests come handy:
+
+  * You want to test different implementations of an OO interface.
+  * You want to test your code over various inputs (a.k.a. data-driven testing). This feature is easy to abuse, so please exercise your good sense when doing it!
+
+## How to Write Value-Parameterized Tests ##
+
+To write value-parameterized tests, first you should define a fixture
+class.  It must be derived from both `::testing::Test` and
+`::testing::WithParamInterface<T>` (the latter is a pure interface),
+where `T` is the type of your parameter values.  For convenience, you
+can just derive the fixture class from `::testing::TestWithParam<T>`,
+which itself is derived from both `::testing::Test` and
+`::testing::WithParamInterface<T>`. `T` can be any copyable type. If
+it's a raw pointer, you are responsible for managing the lifespan of
+the pointed values.
+
+```
+class FooTest : public ::testing::TestWithParam<const char*> {
+  // You can implement all the usual fixture class members here.
+  // To access the test parameter, call GetParam() from class
+  // TestWithParam<T>.
+};
+
+// Or, when you want to add parameters to a pre-existing fixture class:
+class BaseTest : public ::testing::Test {
+  ...
+};
+class BarTest : public BaseTest,
+                public ::testing::WithParamInterface<const char*> {
+  ...
+};
+```
+
+Then, use the `TEST_P` macro to define as many test patterns using
+this fixture as you want.  The `_P` suffix is for "parameterized" or
+"pattern", whichever you prefer to think.
+
+```
+TEST_P(FooTest, DoesBlah) {
+  // Inside a test, access the test parameter with the GetParam() method
+  // of the TestWithParam<T> class:
+  EXPECT_TRUE(foo.Blah(GetParam()));
+  ...
+}
+
+TEST_P(FooTest, HasBlahBlah) {
+  ...
+}
+```
+
+Finally, you can use `INSTANTIATE_TEST_CASE_P` to instantiate the test
+case with any set of parameters you want. Google Test defines a number of
+functions for generating test parameters. They return what we call
+(surprise!) _parameter generators_. Here is a summary of them,
+which are all in the `testing` namespace:
+
+| `Range(begin, end[, step])` | Yields values `{begin, begin+step, begin+step+step, ...}`. The values do not include `end`. `step` defaults to 1. |
+|:----------------------------|:------------------------------------------------------------------------------------------------------------------|
+| `Values(v1, v2, ..., vN)`   | Yields values `{v1, v2, ..., vN}`.                                                                                |
+| `ValuesIn(container)` and `ValuesIn(begin, end)` | Yields values from a C-style array, an STL-style container, or an iterator range `[begin, end)`. `container`, `begin`, and `end` can be expressions whose values are determined at run time.  |
+| `Bool()`                    | Yields sequence `{false, true}`.                                                                                  |
+| `Combine(g1, g2, ..., gN)`  | Yields all combinations (the Cartesian product for the math savvy) of the values generated by the `N` generators. This is only available if your system provides the `<tr1/tuple>` header. If you are sure your system does, and Google Test disagrees, you can override it by defining `GTEST_HAS_TR1_TUPLE=1`. See comments in [include/gtest/internal/gtest-port.h](../include/gtest/internal/gtest-port.h) for more information. |
+
+For more details, see the comments at the definitions of these functions in the [source code](../include/gtest/gtest-param-test.h).
+
+The following statement will instantiate tests from the `FooTest` test case
+each with parameter values `"meeny"`, `"miny"`, and `"moe"`.
+
+```
+INSTANTIATE_TEST_CASE_P(InstantiationName,
+                        FooTest,
+                        ::testing::Values("meeny", "miny", "moe"));
+```
+
+To distinguish different instances of the pattern (yes, you can
+instantiate it more than once), the first argument to
+`INSTANTIATE_TEST_CASE_P` is a prefix that will be added to the actual
+test case name. Remember to pick unique prefixes for different
+instantiations. The tests from the instantiation above will have these
+names:
+
+  * `InstantiationName/FooTest.DoesBlah/0` for `"meeny"`
+  * `InstantiationName/FooTest.DoesBlah/1` for `"miny"`
+  * `InstantiationName/FooTest.DoesBlah/2` for `"moe"`
+  * `InstantiationName/FooTest.HasBlahBlah/0` for `"meeny"`
+  * `InstantiationName/FooTest.HasBlahBlah/1` for `"miny"`
+  * `InstantiationName/FooTest.HasBlahBlah/2` for `"moe"`
+
+You can use these names in [--gtest\-filter](#running-a-subset-of-the-tests).
+
+This statement will instantiate all tests from `FooTest` again, each
+with parameter values `"cat"` and `"dog"`:
+
+```
+const char* pets[] = {"cat", "dog"};
+INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest,
+                        ::testing::ValuesIn(pets));
+```
+
+The tests from the instantiation above will have these names:
+
+  * `AnotherInstantiationName/FooTest.DoesBlah/0` for `"cat"`
+  * `AnotherInstantiationName/FooTest.DoesBlah/1` for `"dog"`
+  * `AnotherInstantiationName/FooTest.HasBlahBlah/0` for `"cat"`
+  * `AnotherInstantiationName/FooTest.HasBlahBlah/1` for `"dog"`
+
+Please note that `INSTANTIATE_TEST_CASE_P` will instantiate _all_
+tests in the given test case, whether their definitions come before or
+_after_ the `INSTANTIATE_TEST_CASE_P` statement.
+
+You can see
+[these](../samples/sample7_unittest.cc)
+[files](../samples/sample8_unittest.cc) for more examples.
+
+_Availability_: Linux, Windows (requires MSVC 8.0 or above), Mac; since version 1.2.0.
+
+## Creating Value-Parameterized Abstract Tests ##
+
+In the above, we define and instantiate `FooTest` in the same source
+file. Sometimes you may want to define value-parameterized tests in a
+library and let other people instantiate them later. This pattern is
+known as <i>abstract tests</i>. As an example of its application, when you
+are designing an interface you can write a standard suite of abstract
+tests (perhaps using a factory function as the test parameter) that
+all implementations of the interface are expected to pass. When
+someone implements the interface, he can instantiate your suite to get
+all the interface-conformance tests for free.
+
+To define abstract tests, you should organize your code like this:
+
+  1. Put the definition of the parameterized test fixture class (e.g. `FooTest`) in a header file, say `foo_param_test.h`. Think of this as _declaring_ your abstract tests.
+  1. Put the `TEST_P` definitions in `foo_param_test.cc`, which includes `foo_param_test.h`. Think of this as _implementing_ your abstract tests.
+
+Once they are defined, you can instantiate them by including
+`foo_param_test.h`, invoking `INSTANTIATE_TEST_CASE_P()`, and linking
+with `foo_param_test.cc`. You can instantiate the same abstract test
+case multiple times, possibly in different source files.
+
+# Typed Tests #
+
+Suppose you have multiple implementations of the same interface and
+want to make sure that all of them satisfy some common requirements.
+Or, you may have defined several types that are supposed to conform to
+the same "concept" and you want to verify it.  In both cases, you want
+the same test logic repeated for different types.
+
+While you can write one `TEST` or `TEST_F` for each type you want to
+test (and you may even factor the test logic into a function template
+that you invoke from the `TEST`), it's tedious and doesn't scale:
+if you want _m_ tests over _n_ types, you'll end up writing _m\*n_
+`TEST`s.
+
+_Typed tests_ allow you to repeat the same test logic over a list of
+types.  You only need to write the test logic once, although you must
+know the type list when writing typed tests.  Here's how you do it:
+
+First, define a fixture class template.  It should be parameterized
+by a type.  Remember to derive it from `::testing::Test`:
+
+```
+template <typename T>
+class FooTest : public ::testing::Test {
+ public:
+  ...
+  typedef std::list<T> List;
+  static T shared_;
+  T value_;
+};
+```
+
+Next, associate a list of types with the test case, which will be
+repeated for each type in the list:
+
+```
+typedef ::testing::Types<char, int, unsigned int> MyTypes;
+TYPED_TEST_CASE(FooTest, MyTypes);
+```
+
+The `typedef` is necessary for the `TYPED_TEST_CASE` macro to parse
+correctly.  Otherwise the compiler will think that each comma in the
+type list introduces a new macro argument.
+
+Then, use `TYPED_TEST()` instead of `TEST_F()` to define a typed test
+for this test case.  You can repeat this as many times as you want:
+
+```
+TYPED_TEST(FooTest, DoesBlah) {
+  // Inside a test, refer to the special name TypeParam to get the type
+  // parameter.  Since we are inside a derived class template, C++ requires
+  // us to visit the members of FooTest via 'this'.
+  TypeParam n = this->value_;
+
+  // To visit static members of the fixture, add the 'TestFixture::'
+  // prefix.
+  n += TestFixture::shared_;
+
+  // To refer to typedefs in the fixture, add the 'typename TestFixture::'
+  // prefix.  The 'typename' is required to satisfy the compiler.
+  typename TestFixture::List values;
+  values.push_back(n);
+  ...
+}
+
+TYPED_TEST(FooTest, HasPropertyA) { ... }
+```
+
+You can see `samples/sample6_unittest.cc` for a complete example.
+
+_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac;
+since version 1.1.0.
+
+# Type-Parameterized Tests #
+
+_Type-parameterized tests_ are like typed tests, except that they
+don't require you to know the list of types ahead of time.  Instead,
+you can define the test logic first and instantiate it with different
+type lists later.  You can even instantiate it more than once in the
+same program.
+
+If you are designing an interface or concept, you can define a suite
+of type-parameterized tests to verify properties that any valid
+implementation of the interface/concept should have.  Then, the author
+of each implementation can just instantiate the test suite with his
+type to verify that it conforms to the requirements, without having to
+write similar tests repeatedly.  Here's an example:
+
+First, define a fixture class template, as we did with typed tests:
+
+```
+template <typename T>
+class FooTest : public ::testing::Test {
+  ...
+};
+```
+
+Next, declare that you will define a type-parameterized test case:
+
+```
+TYPED_TEST_CASE_P(FooTest);
+```
+
+The `_P` suffix is for "parameterized" or "pattern", whichever you
+prefer to think.
+
+Then, use `TYPED_TEST_P()` to define a type-parameterized test.  You
+can repeat this as many times as you want:
+
+```
+TYPED_TEST_P(FooTest, DoesBlah) {
+  // Inside a test, refer to TypeParam to get the type parameter.
+  TypeParam n = 0;
+  ...
+}
+
+TYPED_TEST_P(FooTest, HasPropertyA) { ... }
+```
+
+Now the tricky part: you need to register all test patterns using the
+`REGISTER_TYPED_TEST_CASE_P` macro before you can instantiate them.
+The first argument of the macro is the test case name; the rest are
+the names of the tests in this test case:
+
+```
+REGISTER_TYPED_TEST_CASE_P(FooTest,
+                           DoesBlah, HasPropertyA);
+```
+
+Finally, you are free to instantiate the pattern with the types you
+want.  If you put the above code in a header file, you can `#include`
+it in multiple C++ source files and instantiate it multiple times.
+
+```
+typedef ::testing::Types<char, int, unsigned int> MyTypes;
+INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
+```
+
+To distinguish different instances of the pattern, the first argument
+to the `INSTANTIATE_TYPED_TEST_CASE_P` macro is a prefix that will be
+added to the actual test case name.  Remember to pick unique prefixes
+for different instances.
+
+In the special case where the type list contains only one type, you
+can write that type directly without `::testing::Types<...>`, like this:
+
+```
+INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int);
+```
+
+You can see `samples/sample6_unittest.cc` for a complete example.
+
+_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac;
+since version 1.1.0.
+
+# Testing Private Code #
+
+If you change your software's internal implementation, your tests should not
+break as long as the change is not observable by users. Therefore, per the
+_black-box testing principle_, most of the time you should test your code
+through its public interfaces.
+
+If you still find yourself needing to test internal implementation code,
+consider if there's a better design that wouldn't require you to do so. If you
+absolutely have to test non-public interface code though, you can. There are
+two cases to consider:
+
+  * Static functions (_not_ the same as static member functions!) or unnamed namespaces, and
+  * Private or protected class members
+
+## Static Functions ##
+
+Both static functions and definitions/declarations in an unnamed namespace are
+only visible within the same translation unit. To test them, you can `#include`
+the entire `.cc` file being tested in your `*_test.cc` file. (`#include`ing `.cc`
+files is not a good way to reuse code - you should not do this in production
+code!)
+
+However, a better approach is to move the private code into the
+`foo::internal` namespace, where `foo` is the namespace your project normally
+uses, and put the private declarations in a `*-internal.h` file. Your
+production `.cc` files and your tests are allowed to include this internal
+header, but your clients are not. This way, you can fully test your internal
+implementation without leaking it to your clients.
+
+## Private Class Members ##
+
+Private class members are only accessible from within the class or by friends.
+To access a class' private members, you can declare your test fixture as a
+friend to the class and define accessors in your fixture. Tests using the
+fixture can then access the private members of your production class via the
+accessors in the fixture. Note that even though your fixture is a friend to
+your production class, your tests are not automatically friends to it, as they
+are technically defined in sub-classes of the fixture.
+
+Another way to test private members is to refactor them into an implementation
+class, which is then declared in a `*-internal.h` file. Your clients aren't
+allowed to include this header but your tests can. Such is called the Pimpl
+(Private Implementation) idiom.
+
+Or, you can declare an individual test as a friend of your class by adding this
+line in the class body:
+
+```
+FRIEND_TEST(TestCaseName, TestName);
+```
+
+For example,
+```
+// foo.h
+#include "gtest/gtest_prod.h"
+
+// Defines FRIEND_TEST.
+class Foo {
+  ...
+ private:
+  FRIEND_TEST(FooTest, BarReturnsZeroOnNull);
+  int Bar(void* x);
+};
+
+// foo_test.cc
+...
+TEST(FooTest, BarReturnsZeroOnNull) {
+  Foo foo;
+  EXPECT_EQ(0, foo.Bar(NULL));
+  // Uses Foo's private member Bar().
+}
+```
+
+Pay special attention when your class is defined in a namespace, as you should
+define your test fixtures and tests in the same namespace if you want them to
+be friends of your class. For example, if the code to be tested looks like:
+
+```
+namespace my_namespace {
+
+class Foo {
+  friend class FooTest;
+  FRIEND_TEST(FooTest, Bar);
+  FRIEND_TEST(FooTest, Baz);
+  ...
+  definition of the class Foo
+  ...
+};
+
+}  // namespace my_namespace
+```
+
+Your test code should be something like:
+
+```
+namespace my_namespace {
+class FooTest : public ::testing::Test {
+ protected:
+  ...
+};
+
+TEST_F(FooTest, Bar) { ... }
+TEST_F(FooTest, Baz) { ... }
+
+}  // namespace my_namespace
+```
+
+# Catching Failures #
+
+If you are building a testing utility on top of Google Test, you'll
+want to test your utility.  What framework would you use to test it?
+Google Test, of course.
+
+The challenge is to verify that your testing utility reports failures
+correctly.  In frameworks that report a failure by throwing an
+exception, you could catch the exception and assert on it.  But Google
+Test doesn't use exceptions, so how do we test that a piece of code
+generates an expected failure?
+
+`"gtest/gtest-spi.h"` contains some constructs to do this.  After
+`#include`ing this header, you can use
+
+| `EXPECT_FATAL_FAILURE(`_statement, substring_`);` |
+|:--------------------------------------------------|
+
+to assert that _statement_ generates a fatal (e.g. `ASSERT_*`) failure
+whose message contains the given _substring_, or use
+
+| `EXPECT_NONFATAL_FAILURE(`_statement, substring_`);` |
+|:-----------------------------------------------------|
+
+if you are expecting a non-fatal (e.g. `EXPECT_*`) failure.
+
+For technical reasons, there are some caveats:
+
+  1. You cannot stream a failure message to either macro.
+  1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot reference local non-static variables or non-static members of `this` object.
+  1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot return a value.
+
+_Note:_ Google Test is designed with threads in mind.  Once the
+synchronization primitives in `"gtest/internal/gtest-port.h"` have
+been implemented, Google Test will become thread-safe, meaning that
+you can then use assertions in multiple threads concurrently.  Before
+
+that, however, Google Test only supports single-threaded usage.  Once
+thread-safe, `EXPECT_FATAL_FAILURE()` and `EXPECT_NONFATAL_FAILURE()`
+will capture failures in the current thread only. If _statement_
+creates new threads, failures in these threads will be ignored.  If
+you want to capture failures from all threads instead, you should use
+the following macros:
+
+| `EXPECT_FATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` |
+|:-----------------------------------------------------------------|
+| `EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` |
+
+# Getting the Current Test's Name #
+
+Sometimes a function may need to know the name of the currently running test.
+For example, you may be using the `SetUp()` method of your test fixture to set
+the golden file name based on which test is running. The `::testing::TestInfo`
+class has this information:
+
+```
+namespace testing {
+
+class TestInfo {
+ public:
+  // Returns the test case name and the test name, respectively.
+  //
+  // Do NOT delete or free the return value - it's managed by the
+  // TestInfo class.
+  const char* test_case_name() const;
+  const char* name() const;
+};
+
+}  // namespace testing
+```
+
+
+> To obtain a `TestInfo` object for the currently running test, call
+`current_test_info()` on the `UnitTest` singleton object:
+
+```
+// Gets information about the currently running test.
+// Do NOT delete the returned object - it's managed by the UnitTest class.
+const ::testing::TestInfo* const test_info =
+  ::testing::UnitTest::GetInstance()->current_test_info();
+printf("We are in test %s of test case %s.\n",
+       test_info->name(), test_info->test_case_name());
+```
+
+`current_test_info()` returns a null pointer if no test is running. In
+particular, you cannot find the test case name in `TestCaseSetUp()`,
+`TestCaseTearDown()` (where you know the test case name implicitly), or
+functions called from them.
+
+_Availability:_ Linux, Windows, Mac.
+
+# Extending Google Test by Handling Test Events #
+
+Google Test provides an <b>event listener API</b> to let you receive
+notifications about the progress of a test program and test
+failures. The events you can listen to include the start and end of
+the test program, a test case, or a test method, among others. You may
+use this API to augment or replace the standard console output,
+replace the XML output, or provide a completely different form of
+output, such as a GUI or a database. You can also use test events as
+checkpoints to implement a resource leak checker, for example.
+
+_Availability:_ Linux, Windows, Mac; since v1.4.0.
+
+## Defining Event Listeners ##
+
+To define a event listener, you subclass either
+[testing::TestEventListener](../include/gtest/gtest.h#L855)
+or [testing::EmptyTestEventListener](../include/gtest/gtest.h#L905).
+The former is an (abstract) interface, where <i>each pure virtual method<br>
+can be overridden to handle a test event</i> (For example, when a test
+starts, the `OnTestStart()` method will be called.). The latter provides
+an empty implementation of all methods in the interface, such that a
+subclass only needs to override the methods it cares about.
+
+When an event is fired, its context is passed to the handler function
+as an argument. The following argument types are used:
+  * [UnitTest](../include/gtest/gtest.h#L1007) reflects the state of the entire test program,
+  * [TestCase](../include/gtest/gtest.h#L689) has information about a test case, which can contain one or more tests,
+  * [TestInfo](../include/gtest/gtest.h#L599) contains the state of a test, and
+  * [TestPartResult](../include/gtest/gtest-test-part.h#L42) represents the result of a test assertion.
+
+An event handler function can examine the argument it receives to find
+out interesting information about the event and the test program's
+state.  Here's an example:
+
+```
+  class MinimalistPrinter : public ::testing::EmptyTestEventListener {
+    // Called before a test starts.
+    virtual void OnTestStart(const ::testing::TestInfo& test_info) {
+      printf("*** Test %s.%s starting.\n",
+             test_info.test_case_name(), test_info.name());
+    }
+
+    // Called after a failed assertion or a SUCCEED() invocation.
+    virtual void OnTestPartResult(
+        const ::testing::TestPartResult& test_part_result) {
+      printf("%s in %s:%d\n%s\n",
+             test_part_result.failed() ? "*** Failure" : "Success",
+             test_part_result.file_name(),
+             test_part_result.line_number(),
+             test_part_result.summary());
+    }
+
+    // Called after a test ends.
+    virtual void OnTestEnd(const ::testing::TestInfo& test_info) {
+      printf("*** Test %s.%s ending.\n",
+             test_info.test_case_name(), test_info.name());
+    }
+  };
+```
+
+## Using Event Listeners ##
+
+To use the event listener you have defined, add an instance of it to
+the Google Test event listener list (represented by class
+[TestEventListeners](../include/gtest/gtest.h#L929)
+- note the "s" at the end of the name) in your
+`main()` function, before calling `RUN_ALL_TESTS()`:
+```
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  // Gets hold of the event listener list.
+  ::testing::TestEventListeners& listeners =
+      ::testing::UnitTest::GetInstance()->listeners();
+  // Adds a listener to the end.  Google Test takes the ownership.
+  listeners.Append(new MinimalistPrinter);
+  return RUN_ALL_TESTS();
+}
+```
+
+There's only one problem: the default test result printer is still in
+effect, so its output will mingle with the output from your minimalist
+printer. To suppress the default printer, just release it from the
+event listener list and delete it. You can do so by adding one line:
+```
+  ...
+  delete listeners.Release(listeners.default_result_printer());
+  listeners.Append(new MinimalistPrinter);
+  return RUN_ALL_TESTS();
+```
+
+Now, sit back and enjoy a completely different output from your
+tests. For more details, you can read this
+[sample](../samples/sample9_unittest.cc).
+
+You may append more than one listener to the list. When an `On*Start()`
+or `OnTestPartResult()` event is fired, the listeners will receive it in
+the order they appear in the list (since new listeners are added to
+the end of the list, the default text printer and the default XML
+generator will receive the event first). An `On*End()` event will be
+received by the listeners in the _reverse_ order. This allows output by
+listeners added later to be framed by output from listeners added
+earlier.
+
+## Generating Failures in Listeners ##
+
+You may use failure-raising macros (`EXPECT_*()`, `ASSERT_*()`,
+`FAIL()`, etc) when processing an event. There are some restrictions:
+
+  1. You cannot generate any failure in `OnTestPartResult()` (otherwise it will cause `OnTestPartResult()` to be called recursively).
+  1. A listener that handles `OnTestPartResult()` is not allowed to generate any failure.
+
+When you add listeners to the listener list, you should put listeners
+that handle `OnTestPartResult()` _before_ listeners that can generate
+failures. This ensures that failures generated by the latter are
+attributed to the right test by the former.
+
+We have a sample of failure-raising listener
+[here](../samples/sample10_unittest.cc).
+
+# Running Test Programs: Advanced Options #
+
+Google Test test programs are ordinary executables. Once built, you can run
+them directly and affect their behavior via the following environment variables
+and/or command line flags. For the flags to work, your programs must call
+`::testing::InitGoogleTest()` before calling `RUN_ALL_TESTS()`.
+
+To see a list of supported flags and their usage, please run your test
+program with the `--help` flag.  You can also use `-h`, `-?`, or `/?`
+for short.  This feature is added in version 1.3.0.
+
+If an option is specified both by an environment variable and by a
+flag, the latter takes precedence.  Most of the options can also be
+set/read in code: to access the value of command line flag
+`--gtest_foo`, write `::testing::GTEST_FLAG(foo)`.  A common pattern is
+to set the value of a flag before calling `::testing::InitGoogleTest()`
+to change the default value of the flag:
+```
+int main(int argc, char** argv) {
+  // Disables elapsed time by default.
+  ::testing::GTEST_FLAG(print_time) = false;
+
+  // This allows the user to override the flag on the command line.
+  ::testing::InitGoogleTest(&argc, argv);
+
+  return RUN_ALL_TESTS();
+}
+```
+
+## Selecting Tests ##
+
+This section shows various options for choosing which tests to run.
+
+### Listing Test Names ###
+
+Sometimes it is necessary to list the available tests in a program before
+running them so that a filter may be applied if needed. Including the flag
+`--gtest_list_tests` overrides all other flags and lists tests in the following
+format:
+```
+TestCase1.
+  TestName1
+  TestName2
+TestCase2.
+  TestName
+```
+
+None of the tests listed are actually run if the flag is provided. There is no
+corresponding environment variable for this flag.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Running a Subset of the Tests ###
+
+By default, a Google Test program runs all tests the user has defined.
+Sometimes, you want to run only a subset of the tests (e.g. for debugging or
+quickly verifying a change). If you set the `GTEST_FILTER` environment variable
+or the `--gtest_filter` flag to a filter string, Google Test will only run the
+tests whose full names (in the form of `TestCaseName.TestName`) match the
+filter.
+
+The format of a filter is a '`:`'-separated list of wildcard patterns (called
+the positive patterns) optionally followed by a '`-`' and another
+'`:`'-separated pattern list (called the negative patterns). A test matches the
+filter if and only if it matches any of the positive patterns but does not
+match any of the negative patterns.
+
+A pattern may contain `'*'` (matches any string) or `'?'` (matches any single
+character). For convenience, the filter `'*-NegativePatterns'` can be also
+written as `'-NegativePatterns'`.
+
+For example:
+
+  * `./foo_test` Has no flag, and thus runs all its tests.
+  * `./foo_test --gtest_filter=*` Also runs everything, due to the single match-everything `*` value.
+  * `./foo_test --gtest_filter=FooTest.*` Runs everything in test case `FooTest`.
+  * `./foo_test --gtest_filter=*Null*:*Constructor*` Runs any test whose full name contains either `"Null"` or `"Constructor"`.
+  * `./foo_test --gtest_filter=-*DeathTest.*` Runs all non-death tests.
+  * `./foo_test --gtest_filter=FooTest.*-FooTest.Bar` Runs everything in test case `FooTest` except `FooTest.Bar`.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Temporarily Disabling Tests ###
+
+If you have a broken test that you cannot fix right away, you can add the
+`DISABLED_` prefix to its name. This will exclude it from execution. This is
+better than commenting out the code or using `#if 0`, as disabled tests are
+still compiled (and thus won't rot).
+
+If you need to disable all tests in a test case, you can either add `DISABLED_`
+to the front of the name of each test, or alternatively add it to the front of
+the test case name.
+
+For example, the following tests won't be run by Google Test, even though they
+will still be compiled:
+
+```
+// Tests that Foo does Abc.
+TEST(FooTest, DISABLED_DoesAbc) { ... }
+
+class DISABLED_BarTest : public ::testing::Test { ... };
+
+// Tests that Bar does Xyz.
+TEST_F(DISABLED_BarTest, DoesXyz) { ... }
+```
+
+_Note:_ This feature should only be used for temporary pain-relief. You still
+have to fix the disabled tests at a later date. As a reminder, Google Test will
+print a banner warning you if a test program contains any disabled tests.
+
+_Tip:_ You can easily count the number of disabled tests you have
+using `grep`. This number can be used as a metric for improving your
+test quality.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Temporarily Enabling Disabled Tests ###
+
+To include [disabled tests](#temporarily-disabling-tests) in test
+execution, just invoke the test program with the
+`--gtest_also_run_disabled_tests` flag or set the
+`GTEST_ALSO_RUN_DISABLED_TESTS` environment variable to a value other
+than `0`.  You can combine this with the
+[--gtest\-filter](#running-a-subset-of-the_tests) flag to further select
+which disabled tests to run.
+
+_Availability:_ Linux, Windows, Mac; since version 1.3.0.
+
+## Repeating the Tests ##
+
+Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it
+will fail only 1% of the time, making it rather hard to reproduce the bug under
+a debugger. This can be a major source of frustration.
+
+The `--gtest_repeat` flag allows you to repeat all (or selected) test methods
+in a program many times. Hopefully, a flaky test will eventually fail and give
+you a chance to debug. Here's how to use it:
+
+| `$ foo_test --gtest_repeat=1000` | Repeat foo\_test 1000 times and don't stop at failures. |
+|:---------------------------------|:--------------------------------------------------------|
+| `$ foo_test --gtest_repeat=-1`   | A negative count means repeating forever.               |
+| `$ foo_test --gtest_repeat=1000 --gtest_break_on_failure` | Repeat foo\_test 1000 times, stopping at the first failure. This is especially useful when running under a debugger: when the testfails, it will drop into the debugger and you can then inspect variables and stacks. |
+| `$ foo_test --gtest_repeat=1000 --gtest_filter=FooBar` | Repeat the tests whose name matches the filter 1000 times. |
+
+If your test program contains global set-up/tear-down code registered
+using `AddGlobalTestEnvironment()`, it will be repeated in each
+iteration as well, as the flakiness may be in it. You can also specify
+the repeat count by setting the `GTEST_REPEAT` environment variable.
+
+_Availability:_ Linux, Windows, Mac.
+
+## Shuffling the Tests ##
+
+You can specify the `--gtest_shuffle` flag (or set the `GTEST_SHUFFLE`
+environment variable to `1`) to run the tests in a program in a random
+order. This helps to reveal bad dependencies between tests.
+
+By default, Google Test uses a random seed calculated from the current
+time. Therefore you'll get a different order every time. The console
+output includes the random seed value, such that you can reproduce an
+order-related test failure later. To specify the random seed
+explicitly, use the `--gtest_random_seed=SEED` flag (or set the
+`GTEST_RANDOM_SEED` environment variable), where `SEED` is an integer
+between 0 and 99999. The seed value 0 is special: it tells Google Test
+to do the default behavior of calculating the seed from the current
+time.
+
+If you combine this with `--gtest_repeat=N`, Google Test will pick a
+different random seed and re-shuffle the tests in each iteration.
+
+_Availability:_ Linux, Windows, Mac; since v1.4.0.
+
+## Controlling Test Output ##
+
+This section teaches how to tweak the way test results are reported.
+
+### Colored Terminal Output ###
+
+Google Test can use colors in its terminal output to make it easier to spot
+the separation between tests, and whether tests passed.
+
+You can set the GTEST\_COLOR environment variable or set the `--gtest_color`
+command line flag to `yes`, `no`, or `auto` (the default) to enable colors,
+disable colors, or let Google Test decide. When the value is `auto`, Google
+Test will use colors if and only if the output goes to a terminal and (on
+non-Windows platforms) the `TERM` environment variable is set to `xterm` or
+`xterm-color`.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Suppressing the Elapsed Time ###
+
+By default, Google Test prints the time it takes to run each test.  To
+suppress that, run the test program with the `--gtest_print_time=0`
+command line flag.  Setting the `GTEST_PRINT_TIME` environment
+variable to `0` has the same effect.
+
+_Availability:_ Linux, Windows, Mac.  (In Google Test 1.3.0 and lower,
+the default behavior is that the elapsed time is **not** printed.)
+
+### Generating an XML Report ###
+
+Google Test can emit a detailed XML report to a file in addition to its normal
+textual output. The report contains the duration of each test, and thus can
+help you identify slow tests.
+
+To generate the XML report, set the `GTEST_OUTPUT` environment variable or the
+`--gtest_output` flag to the string `"xml:_path_to_output_file_"`, which will
+create the file at the given location. You can also just use the string
+`"xml"`, in which case the output can be found in the `test_detail.xml` file in
+the current directory.
+
+If you specify a directory (for example, `"xml:output/directory/"` on Linux or
+`"xml:output\directory\"` on Windows), Google Test will create the XML file in
+that directory, named after the test executable (e.g. `foo_test.xml` for test
+program `foo_test` or `foo_test.exe`). If the file already exists (perhaps left
+over from a previous run), Google Test will pick a different name (e.g.
+`foo_test_1.xml`) to avoid overwriting it.
+
+The report uses the format described here.  It is based on the
+`junitreport` Ant task and can be parsed by popular continuous build
+systems like [Hudson](https://hudson.dev.java.net/). Since that format
+was originally intended for Java, a little interpretation is required
+to make it apply to Google Test tests, as shown here:
+
+```
+<testsuites name="AllTests" ...>
+  <testsuite name="test_case_name" ...>
+    <testcase name="test_name" ...>
+      <failure message="..."/>
+      <failure message="..."/>
+      <failure message="..."/>
+    </testcase>
+  </testsuite>
+</testsuites>
+```
+
+  * The root `<testsuites>` element corresponds to the entire test program.
+  * `<testsuite>` elements correspond to Google Test test cases.
+  * `<testcase>` elements correspond to Google Test test functions.
+
+For instance, the following program
+
+```
+TEST(MathTest, Addition) { ... }
+TEST(MathTest, Subtraction) { ... }
+TEST(LogicTest, NonContradiction) { ... }
+```
+
+could generate this report:
+
+```
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="3" failures="1" errors="0" time="35" name="AllTests">
+  <testsuite name="MathTest" tests="2" failures="1" errors="0" time="15">
+    <testcase name="Addition" status="run" time="7" classname="">
+      <failure message="Value of: add(1, 1)&#x0A; Actual: 3&#x0A;Expected: 2" type=""/>
+      <failure message="Value of: add(1, -1)&#x0A; Actual: 1&#x0A;Expected: 0" type=""/>
+    </testcase>
+    <testcase name="Subtraction" status="run" time="5" classname="">
+    </testcase>
+  </testsuite>
+  <testsuite name="LogicTest" tests="1" failures="0" errors="0" time="5">
+    <testcase name="NonContradiction" status="run" time="5" classname="">
+    </testcase>
+  </testsuite>
+</testsuites>
+```
+
+Things to note:
+
+  * The `tests` attribute of a `<testsuites>` or `<testsuite>` element tells how many test functions the Google Test program or test case contains, while the `failures` attribute tells how many of them failed.
+  * The `time` attribute expresses the duration of the test, test case, or entire test program in milliseconds.
+  * Each `<failure>` element corresponds to a single failed Google Test assertion.
+  * Some JUnit concepts don't apply to Google Test, yet we have to conform to the DTD. Therefore you'll see some dummy elements and attributes in the report. You can safely ignore these parts.
+
+_Availability:_ Linux, Windows, Mac.
+
+## Controlling How Failures Are Reported ##
+
+### Turning Assertion Failures into Break-Points ###
+
+When running test programs under a debugger, it's very convenient if the
+debugger can catch an assertion failure and automatically drop into interactive
+mode. Google Test's _break-on-failure_ mode supports this behavior.
+
+To enable it, set the `GTEST_BREAK_ON_FAILURE` environment variable to a value
+other than `0` . Alternatively, you can use the `--gtest_break_on_failure`
+command line flag.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Disabling Catching Test-Thrown Exceptions ###
+
+Google Test can be used either with or without exceptions enabled.  If
+a test throws a C++ exception or (on Windows) a structured exception
+(SEH), by default Google Test catches it, reports it as a test
+failure, and continues with the next test method.  This maximizes the
+coverage of a test run.  Also, on Windows an uncaught exception will
+cause a pop-up window, so catching the exceptions allows you to run
+the tests automatically.
+
+When debugging the test failures, however, you may instead want the
+exceptions to be handled by the debugger, such that you can examine
+the call stack when an exception is thrown.  To achieve that, set the
+`GTEST_CATCH_EXCEPTIONS` environment variable to `0`, or use the
+`--gtest_catch_exceptions=0` flag when running the tests.
+
+**Availability**: Linux, Windows, Mac.
+
+### Letting Another Testing Framework Drive ###
+
+If you work on a project that has already been using another testing
+framework and is not ready to completely switch to Google Test yet,
+you can get much of Google Test's benefit by using its assertions in
+your existing tests.  Just change your `main()` function to look
+like:
+
+```
+#include "gtest/gtest.h"
+
+int main(int argc, char** argv) {
+  ::testing::GTEST_FLAG(throw_on_failure) = true;
+  // Important: Google Test must be initialized.
+  ::testing::InitGoogleTest(&argc, argv);
+
+  ... whatever your existing testing framework requires ...
+}
+```
+
+With that, you can use Google Test assertions in addition to the
+native assertions your testing framework provides, for example:
+
+```
+void TestFooDoesBar() {
+  Foo foo;
+  EXPECT_LE(foo.Bar(1), 100);     // A Google Test assertion.
+  CPPUNIT_ASSERT(foo.IsEmpty());  // A native assertion.
+}
+```
+
+If a Google Test assertion fails, it will print an error message and
+throw an exception, which will be treated as a failure by your host
+testing framework.  If you compile your code with exceptions disabled,
+a failed Google Test assertion will instead exit your program with a
+non-zero code, which will also signal a test failure to your test
+runner.
+
+If you don't write `::testing::GTEST_FLAG(throw_on_failure) = true;` in
+your `main()`, you can alternatively enable this feature by specifying
+the `--gtest_throw_on_failure` flag on the command-line or setting the
+`GTEST_THROW_ON_FAILURE` environment variable to a non-zero value.
+
+_Availability:_ Linux, Windows, Mac; since v1.3.0.
+
+## Distributing Test Functions to Multiple Machines ##
+
+If you have more than one machine you can use to run a test program,
+you might want to run the test functions in parallel and get the
+result faster.  We call this technique _sharding_, where each machine
+is called a _shard_.
+
+Google Test is compatible with test sharding.  To take advantage of
+this feature, your test runner (not part of Google Test) needs to do
+the following:
+
+  1. Allocate a number of machines (shards) to run the tests.
+  1. On each shard, set the `GTEST_TOTAL_SHARDS` environment variable to the total number of shards.  It must be the same for all shards.
+  1. On each shard, set the `GTEST_SHARD_INDEX` environment variable to the index of the shard.  Different shards must be assigned different indices, which must be in the range `[0, GTEST_TOTAL_SHARDS - 1]`.
+  1. Run the same test program on all shards.  When Google Test sees the above two environment variables, it will select a subset of the test functions to run.  Across all shards, each test function in the program will be run exactly once.
+  1. Wait for all shards to finish, then collect and report the results.
+
+Your project may have tests that were written without Google Test and
+thus don't understand this protocol.  In order for your test runner to
+figure out which test supports sharding, it can set the environment
+variable `GTEST_SHARD_STATUS_FILE` to a non-existent file path.  If a
+test program supports sharding, it will create this file to
+acknowledge the fact (the actual contents of the file are not
+important at this time; although we may stick some useful information
+in it in the future.); otherwise it will not create it.
+
+Here's an example to make it clear.  Suppose you have a test program
+`foo_test` that contains the following 5 test functions:
+```
+TEST(A, V)
+TEST(A, W)
+TEST(B, X)
+TEST(B, Y)
+TEST(B, Z)
+```
+and you have 3 machines at your disposal.  To run the test functions in
+parallel, you would set `GTEST_TOTAL_SHARDS` to 3 on all machines, and
+set `GTEST_SHARD_INDEX` to 0, 1, and 2 on the machines respectively.
+Then you would run the same `foo_test` on each machine.
+
+Google Test reserves the right to change how the work is distributed
+across the shards, but here's one possible scenario:
+
+  * Machine #0 runs `A.V` and `B.X`.
+  * Machine #1 runs `A.W` and `B.Y`.
+  * Machine #2 runs `B.Z`.
+
+_Availability:_ Linux, Windows, Mac; since version 1.3.0.
+
+# Fusing Google Test Source Files #
+
+Google Test's implementation consists of ~30 files (excluding its own
+tests).  Sometimes you may want them to be packaged up in two files (a
+`.h` and a `.cc`) instead, such that you can easily copy them to a new
+machine and start hacking there.  For this we provide an experimental
+Python script `fuse_gtest_files.py` in the `scripts/` directory (since release 1.3.0).
+Assuming you have Python 2.4 or above installed on your machine, just
+go to that directory and run
+```
+python fuse_gtest_files.py OUTPUT_DIR
+```
+
+and you should see an `OUTPUT_DIR` directory being created with files
+`gtest/gtest.h` and `gtest/gtest-all.cc` in it.  These files contain
+everything you need to use Google Test.  Just copy them to anywhere
+you want and you are ready to write tests.  You can use the
+[scripts/test/Makefile](../scripts/test/Makefile)
+file as an example on how to compile your tests against them.
+
+# Where to Go from Here #
+
+Congratulations! You've now learned more advanced Google Test tools and are
+ready to tackle more complex testing tasks. If you want to dive even deeper, you
+can read the [Frequently-Asked Questions](V1_6_FAQ.md).
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_Documentation.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_Documentation.md
new file mode 100644
index 0000000000..ca924660a3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_Documentation.md
@@ -0,0 +1,14 @@
+This page lists all documentation wiki pages for Google Test **1.6**
+-- **if you use a released version of Google Test, please read the
+documentation for that specific version instead.**
+
+  * [Primer](V1_6_Primer.md) -- start here if you are new to Google Test.
+  * [Samples](V1_6_Samples.md) -- learn from examples.
+  * [AdvancedGuide](V1_6_AdvancedGuide.md) -- learn more about Google Test.
+  * [XcodeGuide](V1_6_XcodeGuide.md) -- how to use Google Test in Xcode on Mac.
+  * [Frequently-Asked Questions](V1_6_FAQ.md) -- check here before asking a question on the mailing list.
+
+To contribute code to Google Test, read:
+
+  * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
+  * [PumpManual](V1_6_PumpManual.md) -- how we generate some of Google Test's source files.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_FAQ.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_FAQ.md
new file mode 100644
index 0000000000..2b7f784077
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_FAQ.md
@@ -0,0 +1,1038 @@
+
+
+If you cannot find the answer to your question here, and you have read
+[Primer](V1_6_Primer.md) and [AdvancedGuide](V1_6_AdvancedGuide.md), send it to
+googletestframework@googlegroups.com.
+
+## Why should I use Google Test instead of my favorite C++ testing framework? ##
+
+First, let us say clearly that we don't want to get into the debate of
+which C++ testing framework is **the best**.  There exist many fine
+frameworks for writing C++ tests, and we have tremendous respect for
+the developers and users of them.  We don't think there is (or will
+be) a single best framework - you have to pick the right tool for the
+particular task you are tackling.
+
+We created Google Test because we couldn't find the right combination
+of features and conveniences in an existing framework to satisfy _our_
+needs.  The following is a list of things that _we_ like about Google
+Test.  We don't claim them to be unique to Google Test - rather, the
+combination of them makes Google Test the choice for us.  We hope this
+list can help you decide whether it is for you too.
+
+  * Google Test is designed to be portable: it doesn't require exceptions or RTTI; it works around various bugs in various compilers and environments; etc.  As a result, it works on Linux, Mac OS X, Windows and several embedded operating systems.
+  * Nonfatal assertions (`EXPECT_*`) have proven to be great time savers, as they allow a test to report multiple failures in a single edit-compile-test cycle.
+  * It's easy to write assertions that generate informative messages: you just use the stream syntax to append any additional information, e.g. `ASSERT_EQ(5, Foo(i)) << " where i = " << i;`.  It doesn't require a new set of macros or special functions.
+  * Google Test automatically detects your tests and doesn't require you to enumerate them in order to run them.
+  * Death tests are pretty handy for ensuring that your asserts in production code are triggered by the right conditions.
+  * `SCOPED_TRACE` helps you understand the context of an assertion failure when it comes from inside a sub-routine or loop.
+  * You can decide which tests to run using name patterns.  This saves time when you want to quickly reproduce a test failure.
+  * Google Test can generate XML test result reports that can be parsed by popular continuous build system like Hudson.
+  * Simple things are easy in Google Test, while hard things are possible: in addition to advanced features like [global test environments](V1_6_AdvancedGuide.md#Global_Set-Up_and_Tear-Down) and tests parameterized by [values](V1_6_AdvancedGuide.md#value-parameterized-tests) or [types](V1_6_AdvancedGuide.md#typed-tests), Google Test supports various ways for the user to extend the framework -- if Google Test doesn't do something out of the box, chances are that a user can implement the feature using Google Test's public API, without changing Google Test itself.  In particular, you can:
+    * expand your testing vocabulary by defining [custom predicates](V1_6_AdvancedGuide.md#predicate-assertions-for-better-error-messages),
+    * teach Google Test how to [print your types](V1_6_AdvancedGuide.md#teaching-google-test-how-to-print-your-values),
+    * define your own testing macros or utilities and verify them using Google Test's [Service Provider Interface](V1_6_AdvancedGuide.md#catching-failures), and
+    * reflect on the test cases or change the test output format by intercepting the [test events](V1_6_AdvancedGuide.md#extending-google-test-by-handling-test-events).
+
+## I'm getting warnings when compiling Google Test.  Would you fix them? ##
+
+We strive to minimize compiler warnings Google Test generates.  Before releasing a new version, we test to make sure that it doesn't generate warnings when compiled using its CMake script on Windows, Linux, and Mac OS.
+
+Unfortunately, this doesn't mean you are guaranteed to see no warnings when compiling Google Test in your environment:
+
+  * You may be using a different compiler as we use, or a different version of the same compiler.  We cannot possibly test for all compilers.
+  * You may be compiling on a different platform as we do.
+  * Your project may be using different compiler flags as we do.
+
+It is not always possible to make Google Test warning-free for everyone.  Or, it may not be desirable if the warning is rarely enabled and fixing the violations makes the code more complex.
+
+If you see warnings when compiling Google Test, we suggest that you use the `-isystem` flag (assuming your are using GCC) to mark Google Test headers as system headers.  That'll suppress warnings from Google Test headers.
+
+## Why should not test case names and test names contain underscore? ##
+
+Underscore (`_`) is special, as C++ reserves the following to be used by
+the compiler and the standard library:
+
+  1. any identifier that starts with an `_` followed by an upper-case letter, and
+  1. any identifier that containers two consecutive underscores (i.e. `__`) _anywhere_ in its name.
+
+User code is _prohibited_ from using such identifiers.
+
+Now let's look at what this means for `TEST` and `TEST_F`.
+
+Currently `TEST(TestCaseName, TestName)` generates a class named
+`TestCaseName_TestName_Test`.  What happens if `TestCaseName` or `TestName`
+contains `_`?
+
+  1. If `TestCaseName` starts with an `_` followed by an upper-case letter (say, `_Foo`), we end up with `_Foo_TestName_Test`, which is reserved and thus invalid.
+  1. If `TestCaseName` ends with an `_` (say, `Foo_`), we get `Foo__TestName_Test`, which is invalid.
+  1. If `TestName` starts with an `_` (say, `_Bar`), we get `TestCaseName__Bar_Test`, which is invalid.
+  1. If `TestName` ends with an `_` (say, `Bar_`), we get `TestCaseName_Bar__Test`, which is invalid.
+
+So clearly `TestCaseName` and `TestName` cannot start or end with `_`
+(Actually, `TestCaseName` can start with `_` -- as long as the `_` isn't
+followed by an upper-case letter.  But that's getting complicated.  So
+for simplicity we just say that it cannot start with `_`.).
+
+It may seem fine for `TestCaseName` and `TestName` to contain `_` in the
+middle.  However, consider this:
+```
+TEST(Time, Flies_Like_An_Arrow) { ... }
+TEST(Time_Flies, Like_An_Arrow) { ... }
+```
+
+Now, the two `TEST`s will both generate the same class
+(`Time_Files_Like_An_Arrow_Test`).  That's not good.
+
+So for simplicity, we just ask the users to avoid `_` in `TestCaseName`
+and `TestName`.  The rule is more constraining than necessary, but it's
+simple and easy to remember.  It also gives Google Test some wiggle
+room in case its implementation needs to change in the future.
+
+If you violate the rule, there may not be immediately consequences,
+but your test may (just may) break with a new compiler (or a new
+version of the compiler you are using) or with a new version of Google
+Test.  Therefore it's best to follow the rule.
+
+## Why is it not recommended to install a pre-compiled copy of Google Test (for example, into /usr/local)? ##
+
+In the early days, we said that you could install
+compiled Google Test libraries on `*`nix systems using `make install`.
+Then every user of your machine can write tests without
+recompiling Google Test.
+
+This seemed like a good idea, but it has a
+got-cha: every user needs to compile his tests using the _same_ compiler
+flags used to compile the installed Google Test libraries; otherwise
+he may run into undefined behaviors (i.e. the tests can behave
+strangely and may even crash for no obvious reasons).
+
+Why?  Because C++ has this thing called the One-Definition Rule: if
+two C++ source files contain different definitions of the same
+class/function/variable, and you link them together, you violate the
+rule.  The linker may or may not catch the error (in many cases it's
+not required by the C++ standard to catch the violation).  If it
+doesn't, you get strange run-time behaviors that are unexpected and
+hard to debug.
+
+If you compile Google Test and your test code using different compiler
+flags, they may see different definitions of the same
+class/function/variable (e.g. due to the use of `#if` in Google Test).
+Therefore, for your sanity, we recommend to avoid installing pre-compiled
+Google Test libraries.  Instead, each project should compile
+Google Test itself such that it can be sure that the same flags are
+used for both Google Test and the tests.
+
+## How do I generate 64-bit binaries on Windows (using Visual Studio 2008)? ##
+
+(Answered by Trevor Robinson)
+
+Load the supplied Visual Studio solution file, either `msvc\gtest-md.sln` or
+`msvc\gtest.sln`. Go through the migration wizard to migrate the
+solution and project files to Visual Studio 2008. Select
+`Configuration Manager...` from the `Build` menu. Select `<New...>` from
+the `Active solution platform` dropdown.  Select `x64` from the new
+platform dropdown, leave `Copy settings from` set to `Win32` and
+`Create new project platforms` checked, then click `OK`. You now have
+`Win32` and `x64` platform configurations, selectable from the
+`Standard` toolbar, which allow you to toggle between building 32-bit or
+64-bit binaries (or both at once using Batch Build).
+
+In order to prevent build output files from overwriting one another,
+you'll need to change the `Intermediate Directory` settings for the
+newly created platform configuration across all the projects. To do
+this, multi-select (e.g. using shift-click) all projects (but not the
+solution) in the `Solution Explorer`. Right-click one of them and
+select `Properties`. In the left pane, select `Configuration Properties`,
+and from the `Configuration` dropdown, select `All Configurations`.
+Make sure the selected platform is `x64`. For the
+`Intermediate Directory` setting, change the value from
+`$(PlatformName)\$(ConfigurationName)` to
+`$(OutDir)\$(ProjectName)`. Click `OK` and then build the
+solution. When the build is complete, the 64-bit binaries will be in
+the `msvc\x64\Debug` directory.
+
+## Can I use Google Test on MinGW? ##
+
+We haven't tested this ourselves, but Per Abrahamsen reported that he
+was able to compile and install Google Test successfully when using
+MinGW from Cygwin.  You'll need to configure it with:
+
+`PATH/TO/configure CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin"`
+
+You should be able to replace the `-mno-cygwin` option with direct links
+to the real MinGW binaries, but we haven't tried that.
+
+Caveats:
+
+  * There are many warnings when compiling.
+  * `make check` will produce some errors as not all tests for Google Test itself are compatible with MinGW.
+
+We also have reports on successful cross compilation of Google Test
+MinGW binaries on Linux using
+[these instructions](http://wiki.wxwidgets.org/Cross-Compiling_Under_Linux#Cross-compiling_under_Linux_for_MS_Windows)
+on the WxWidgets site.
+
+Please contact `googletestframework@googlegroups.com` if you are
+interested in improving the support for MinGW.
+
+## Why does Google Test support EXPECT\_EQ(NULL, ptr) and ASSERT\_EQ(NULL, ptr) but not EXPECT\_NE(NULL, ptr) and ASSERT\_NE(NULL, ptr)? ##
+
+Due to some peculiarity of C++, it requires some non-trivial template
+meta programming tricks to support using `NULL` as an argument of the
+`EXPECT_XX()` and `ASSERT_XX()` macros. Therefore we only do it where
+it's most needed (otherwise we make the implementation of Google Test
+harder to maintain and more error-prone than necessary).
+
+The `EXPECT_EQ()` macro takes the _expected_ value as its first
+argument and the _actual_ value as the second. It's reasonable that
+someone wants to write `EXPECT_EQ(NULL, some_expression)`, and this
+indeed was requested several times. Therefore we implemented it.
+
+The need for `EXPECT_NE(NULL, ptr)` isn't nearly as strong. When the
+assertion fails, you already know that `ptr` must be `NULL`, so it
+doesn't add any information to print ptr in this case. That means
+`EXPECT_TRUE(ptr ! NULL)` works just as well.
+
+If we were to support `EXPECT_NE(NULL, ptr)`, for consistency we'll
+have to support `EXPECT_NE(ptr, NULL)` as well, as unlike `EXPECT_EQ`,
+we don't have a convention on the order of the two arguments for
+`EXPECT_NE`. This means using the template meta programming tricks
+twice in the implementation, making it even harder to understand and
+maintain. We believe the benefit doesn't justify the cost.
+
+Finally, with the growth of Google Mock's [matcher](../../CookBook.md#using-matchers-in-google-test-assertions) library, we are
+encouraging people to use the unified `EXPECT_THAT(value, matcher)`
+syntax more often in tests. One significant advantage of the matcher
+approach is that matchers can be easily combined to form new matchers,
+while the `EXPECT_NE`, etc, macros cannot be easily
+combined. Therefore we want to invest more in the matchers than in the
+`EXPECT_XX()` macros.
+
+## Does Google Test support running tests in parallel? ##
+
+Test runners tend to be tightly coupled with the build/test
+environment, and Google Test doesn't try to solve the problem of
+running tests in parallel.  Instead, we tried to make Google Test work
+nicely with test runners.  For example, Google Test's XML report
+contains the time spent on each test, and its `gtest_list_tests` and
+`gtest_filter` flags can be used for splitting the execution of test
+methods into multiple processes.  These functionalities can help the
+test runner run the tests in parallel.
+
+## Why don't Google Test run the tests in different threads to speed things up? ##
+
+It's difficult to write thread-safe code.  Most tests are not written
+with thread-safety in mind, and thus may not work correctly in a
+multi-threaded setting.
+
+If you think about it, it's already hard to make your code work when
+you know what other threads are doing.  It's much harder, and
+sometimes even impossible, to make your code work when you don't know
+what other threads are doing (remember that test methods can be added,
+deleted, or modified after your test was written).  If you want to run
+the tests in parallel, you'd better run them in different processes.
+
+## Why aren't Google Test assertions implemented using exceptions? ##
+
+Our original motivation was to be able to use Google Test in projects
+that disable exceptions.  Later we realized some additional benefits
+of this approach:
+
+  1. Throwing in a destructor is undefined behavior in C++.  Not using exceptions means Google Test's assertions are safe to use in destructors.
+  1. The `EXPECT_*` family of macros will continue even after a failure, allowing multiple failures in a `TEST` to be reported in a single run. This is a popular feature, as in C++ the edit-compile-test cycle is usually quite long and being able to fixing more than one thing at a time is a blessing.
+  1. If assertions are implemented using exceptions, a test may falsely ignore a failure if it's caught by user code:
+```
+try { ... ASSERT_TRUE(...) ... }
+catch (...) { ... }
+```
+The above code will pass even if the `ASSERT_TRUE` throws.  While it's unlikely for someone to write this in a test, it's possible to run into this pattern when you write assertions in callbacks that are called by the code under test.
+
+The downside of not using exceptions is that `ASSERT_*` (implemented
+using `return`) will only abort the current function, not the current
+`TEST`.
+
+## Why do we use two different macros for tests with and without fixtures? ##
+
+Unfortunately, C++'s macro system doesn't allow us to use the same
+macro for both cases.  One possibility is to provide only one macro
+for tests with fixtures, and require the user to define an empty
+fixture sometimes:
+
+```
+class FooTest : public ::testing::Test {};
+
+TEST_F(FooTest, DoesThis) { ... }
+```
+or
+```
+typedef ::testing::Test FooTest;
+
+TEST_F(FooTest, DoesThat) { ... }
+```
+
+Yet, many people think this is one line too many. :-) Our goal was to
+make it really easy to write tests, so we tried to make simple tests
+trivial to create.  That means using a separate macro for such tests.
+
+We think neither approach is ideal, yet either of them is reasonable.
+In the end, it probably doesn't matter much either way.
+
+## Why don't we use structs as test fixtures? ##
+
+We like to use structs only when representing passive data.  This
+distinction between structs and classes is good for documenting the
+intent of the code's author.  Since test fixtures have logic like
+`SetUp()` and `TearDown()`, they are better defined as classes.
+
+## Why are death tests implemented as assertions instead of using a test runner? ##
+
+Our goal was to make death tests as convenient for a user as C++
+possibly allows.  In particular:
+
+  * The runner-style requires to split the information into two pieces: the definition of the death test itself, and the specification for the runner on how to run the death test and what to expect.  The death test would be written in C++, while the runner spec may or may not be.  A user needs to carefully keep the two in sync. `ASSERT_DEATH(statement, expected_message)` specifies all necessary information in one place, in one language, without boilerplate code. It is very declarative.
+  * `ASSERT_DEATH` has a similar syntax and error-reporting semantics as other Google Test assertions, and thus is easy to learn.
+  * `ASSERT_DEATH` can be mixed with other assertions and other logic at your will.  You are not limited to one death test per test method. For example, you can write something like:
+```
+    if (FooCondition()) {
+      ASSERT_DEATH(Bar(), "blah");
+    } else {
+      ASSERT_EQ(5, Bar());
+    }
+```
+If you prefer one death test per test method, you can write your tests in that style too, but we don't want to impose that on the users.  The fewer artificial limitations the better.
+  * `ASSERT_DEATH` can reference local variables in the current function, and you can decide how many death tests you want based on run-time information.  For example,
+```
+    const int count = GetCount();  // Only known at run time.
+    for (int i = 1; i <= count; i++) {
+      ASSERT_DEATH({
+        double* buffer = new double[i];
+        ... initializes buffer ...
+        Foo(buffer, i)
+      }, "blah blah");
+    }
+```
+The runner-based approach tends to be more static and less flexible, or requires more user effort to get this kind of flexibility.
+
+Another interesting thing about `ASSERT_DEATH` is that it calls `fork()`
+to create a child process to run the death test.  This is lightening
+fast, as `fork()` uses copy-on-write pages and incurs almost zero
+overhead, and the child process starts from the user-supplied
+statement directly, skipping all global and local initialization and
+any code leading to the given statement.  If you launch the child
+process from scratch, it can take seconds just to load everything and
+start running if the test links to many libraries dynamically.
+
+## My death test modifies some state, but the change seems lost after the death test finishes. Why? ##
+
+Death tests (`EXPECT_DEATH`, etc) are executed in a sub-process s.t. the
+expected crash won't kill the test program (i.e. the parent process). As a
+result, any in-memory side effects they incur are observable in their
+respective sub-processes, but not in the parent process. You can think of them
+as running in a parallel universe, more or less.
+
+## The compiler complains about "undefined references" to some static const member variables, but I did define them in the class body. What's wrong? ##
+
+If your class has a static data member:
+
+```
+// foo.h
+class Foo {
+  ...
+  static const int kBar = 100;
+};
+```
+
+You also need to define it _outside_ of the class body in `foo.cc`:
+
+```
+const int Foo::kBar;  // No initializer here.
+```
+
+Otherwise your code is **invalid C++**, and may break in unexpected ways. In
+particular, using it in Google Test comparison assertions (`EXPECT_EQ`, etc)
+will generate an "undefined reference" linker error.
+
+## I have an interface that has several implementations. Can I write a set of tests once and repeat them over all the implementations? ##
+
+Google Test doesn't yet have good support for this kind of tests, or
+data-driven tests in general. We hope to be able to make improvements in this
+area soon.
+
+## Can I derive a test fixture from another? ##
+
+Yes.
+
+Each test fixture has a corresponding and same named test case. This means only
+one test case can use a particular fixture. Sometimes, however, multiple test
+cases may want to use the same or slightly different fixtures. For example, you
+may want to make sure that all of a GUI library's test cases don't leak
+important system resources like fonts and brushes.
+
+In Google Test, you share a fixture among test cases by putting the shared
+logic in a base test fixture, then deriving from that base a separate fixture
+for each test case that wants to use this common logic. You then use `TEST_F()`
+to write tests using each derived fixture.
+
+Typically, your code looks like this:
+
+```
+// Defines a base test fixture.
+class BaseTest : public ::testing::Test {
+  protected:
+   ...
+};
+
+// Derives a fixture FooTest from BaseTest.
+class FooTest : public BaseTest {
+  protected:
+    virtual void SetUp() {
+      BaseTest::SetUp();  // Sets up the base fixture first.
+      ... additional set-up work ...
+    }
+    virtual void TearDown() {
+      ... clean-up work for FooTest ...
+      BaseTest::TearDown();  // Remember to tear down the base fixture
+                             // after cleaning up FooTest!
+    }
+    ... functions and variables for FooTest ...
+};
+
+// Tests that use the fixture FooTest.
+TEST_F(FooTest, Bar) { ... }
+TEST_F(FooTest, Baz) { ... }
+
+... additional fixtures derived from BaseTest ...
+```
+
+If necessary, you can continue to derive test fixtures from a derived fixture.
+Google Test has no limit on how deep the hierarchy can be.
+
+For a complete example using derived test fixtures, see
+[sample5](../samples/sample5_unittest.cc).
+
+## My compiler complains "void value not ignored as it ought to be." What does this mean? ##
+
+You're probably using an `ASSERT_*()` in a function that doesn't return `void`.
+`ASSERT_*()` can only be used in `void` functions.
+
+## My death test hangs (or seg-faults). How do I fix it? ##
+
+In Google Test, death tests are run in a child process and the way they work is
+delicate. To write death tests you really need to understand how they work.
+Please make sure you have read this.
+
+In particular, death tests don't like having multiple threads in the parent
+process. So the first thing you can try is to eliminate creating threads
+outside of `EXPECT_DEATH()`.
+
+Sometimes this is impossible as some library you must use may be creating
+threads before `main()` is even reached. In this case, you can try to minimize
+the chance of conflicts by either moving as many activities as possible inside
+`EXPECT_DEATH()` (in the extreme case, you want to move everything inside), or
+leaving as few things as possible in it. Also, you can try to set the death
+test style to `"threadsafe"`, which is safer but slower, and see if it helps.
+
+If you go with thread-safe death tests, remember that they rerun the test
+program from the beginning in the child process. Therefore make sure your
+program can run side-by-side with itself and is deterministic.
+
+In the end, this boils down to good concurrent programming. You have to make
+sure that there is no race conditions or dead locks in your program. No silver
+bullet - sorry!
+
+## Should I use the constructor/destructor of the test fixture or the set-up/tear-down function? ##
+
+The first thing to remember is that Google Test does not reuse the
+same test fixture object across multiple tests. For each `TEST_F`,
+Google Test will create a fresh test fixture object, _immediately_
+call `SetUp()`, run the test, call `TearDown()`, and then
+_immediately_ delete the test fixture object. Therefore, there is no
+need to write a `SetUp()` or `TearDown()` function if the constructor
+or destructor already does the job.
+
+You may still want to use `SetUp()/TearDown()` in the following cases:
+  * If the tear-down operation could throw an exception, you must use `TearDown()` as opposed to the destructor, as throwing in a destructor leads to undefined behavior and usually will kill your program right away. Note that many standard libraries (like STL) may throw when exceptions are enabled in the compiler. Therefore you should prefer `TearDown()` if you want to write portable tests that work with or without exceptions.
+  * The Google Test team is considering making the assertion macros throw on platforms where exceptions are enabled (e.g. Windows, Mac OS, and Linux client-side), which will eliminate the need for the user to propagate failures from a subroutine to its caller. Therefore, you shouldn't use Google Test assertions in a destructor if your code could run on such a platform.
+  * In a constructor or destructor, you cannot make a virtual function call on this object. (You can call a method declared as virtual, but it will be statically bound.) Therefore, if you need to call a method that will be overriden in a derived class, you have to use `SetUp()/TearDown()`.
+
+## The compiler complains "no matching function to call" when I use ASSERT\_PREDn. How do I fix it? ##
+
+If the predicate function you use in `ASSERT_PRED*` or `EXPECT_PRED*` is
+overloaded or a template, the compiler will have trouble figuring out which
+overloaded version it should use. `ASSERT_PRED_FORMAT*` and
+`EXPECT_PRED_FORMAT*` don't have this problem.
+
+If you see this error, you might want to switch to
+`(ASSERT|EXPECT)_PRED_FORMAT*`, which will also give you a better failure
+message. If, however, that is not an option, you can resolve the problem by
+explicitly telling the compiler which version to pick.
+
+For example, suppose you have
+
+```
+bool IsPositive(int n) {
+  return n > 0;
+}
+bool IsPositive(double x) {
+  return x > 0;
+}
+```
+
+you will get a compiler error if you write
+
+```
+EXPECT_PRED1(IsPositive, 5);
+```
+
+However, this will work:
+
+```
+EXPECT_PRED1(*static_cast<bool (*)(int)>*(IsPositive), 5);
+```
+
+(The stuff inside the angled brackets for the `static_cast` operator is the
+type of the function pointer for the `int`-version of `IsPositive()`.)
+
+As another example, when you have a template function
+
+```
+template <typename T>
+bool IsNegative(T x) {
+  return x < 0;
+}
+```
+
+you can use it in a predicate assertion like this:
+
+```
+ASSERT_PRED1(IsNegative*<int>*, -5);
+```
+
+Things are more interesting if your template has more than one parameters. The
+following won't compile:
+
+```
+ASSERT_PRED2(*GreaterThan<int, int>*, 5, 0);
+```
+
+
+as the C++ pre-processor thinks you are giving `ASSERT_PRED2` 4 arguments,
+which is one more than expected. The workaround is to wrap the predicate
+function in parentheses:
+
+```
+ASSERT_PRED2(*(GreaterThan<int, int>)*, 5, 0);
+```
+
+
+## My compiler complains about "ignoring return value" when I call RUN\_ALL\_TESTS(). Why? ##
+
+Some people had been ignoring the return value of `RUN_ALL_TESTS()`. That is,
+instead of
+
+```
+return RUN_ALL_TESTS();
+```
+
+they write
+
+```
+RUN_ALL_TESTS();
+```
+
+This is wrong and dangerous. A test runner needs to see the return value of
+`RUN_ALL_TESTS()` in order to determine if a test has passed. If your `main()`
+function ignores it, your test will be considered successful even if it has a
+Google Test assertion failure. Very bad.
+
+To help the users avoid this dangerous bug, the implementation of
+`RUN_ALL_TESTS()` causes gcc to raise this warning, when the return value is
+ignored. If you see this warning, the fix is simple: just make sure its value
+is used as the return value of `main()`.
+
+## My compiler complains that a constructor (or destructor) cannot return a value. What's going on? ##
+
+Due to a peculiarity of C++, in order to support the syntax for streaming
+messages to an `ASSERT_*`, e.g.
+
+```
+ASSERT_EQ(1, Foo()) << "blah blah" << foo;
+```
+
+we had to give up using `ASSERT*` and `FAIL*` (but not `EXPECT*` and
+`ADD_FAILURE*`) in constructors and destructors. The workaround is to move the
+content of your constructor/destructor to a private void member function, or
+switch to `EXPECT_*()` if that works. This section in the user's guide explains
+it.
+
+## My set-up function is not called. Why? ##
+
+C++ is case-sensitive. It should be spelled as `SetUp()`.  Did you
+spell it as `Setup()`?
+
+Similarly, sometimes people spell `SetUpTestCase()` as `SetupTestCase()` and
+wonder why it's never called.
+
+## How do I jump to the line of a failure in Emacs directly? ##
+
+Google Test's failure message format is understood by Emacs and many other
+IDEs, like acme and XCode. If a Google Test message is in a compilation buffer
+in Emacs, then it's clickable. You can now hit `enter` on a message to jump to
+the corresponding source code, or use `C-x `` to jump to the next failure.
+
+## I have several test cases which share the same test fixture logic, do I have to define a new test fixture class for each of them? This seems pretty tedious. ##
+
+You don't have to. Instead of
+
+```
+class FooTest : public BaseTest {};
+
+TEST_F(FooTest, Abc) { ... }
+TEST_F(FooTest, Def) { ... }
+
+class BarTest : public BaseTest {};
+
+TEST_F(BarTest, Abc) { ... }
+TEST_F(BarTest, Def) { ... }
+```
+
+you can simply `typedef` the test fixtures:
+```
+typedef BaseTest FooTest;
+
+TEST_F(FooTest, Abc) { ... }
+TEST_F(FooTest, Def) { ... }
+
+typedef BaseTest BarTest;
+
+TEST_F(BarTest, Abc) { ... }
+TEST_F(BarTest, Def) { ... }
+```
+
+## The Google Test output is buried in a whole bunch of log messages. What do I do? ##
+
+The Google Test output is meant to be a concise and human-friendly report. If
+your test generates textual output itself, it will mix with the Google Test
+output, making it hard to read. However, there is an easy solution to this
+problem.
+
+Since most log messages go to stderr, we decided to let Google Test output go
+to stdout. This way, you can easily separate the two using redirection. For
+example:
+```
+./my_test > googletest_output.txt
+```
+
+## Why should I prefer test fixtures over global variables? ##
+
+There are several good reasons:
+  1. It's likely your test needs to change the states of its global variables. This makes it difficult to keep side effects from escaping one test and contaminating others, making debugging difficult. By using fixtures, each test has a fresh set of variables that's different (but with the same names). Thus, tests are kept independent of each other.
+  1. Global variables pollute the global namespace.
+  1. Test fixtures can be reused via subclassing, which cannot be done easily with global variables. This is useful if many test cases have something in common.
+
+## How do I test private class members without writing FRIEND\_TEST()s? ##
+
+You should try to write testable code, which means classes should be easily
+tested from their public interface. One way to achieve this is the Pimpl idiom:
+you move all private members of a class into a helper class, and make all
+members of the helper class public.
+
+You have several other options that don't require using `FRIEND_TEST`:
+  * Write the tests as members of the fixture class:
+```
+class Foo {
+  friend class FooTest;
+  ...
+};
+
+class FooTest : public ::testing::Test {
+ protected:
+  ...
+  void Test1() {...} // This accesses private members of class Foo.
+  void Test2() {...} // So does this one.
+};
+
+TEST_F(FooTest, Test1) {
+  Test1();
+}
+
+TEST_F(FooTest, Test2) {
+  Test2();
+}
+```
+  * In the fixture class, write accessors for the tested class' private members, then use the accessors in your tests:
+```
+class Foo {
+  friend class FooTest;
+  ...
+};
+
+class FooTest : public ::testing::Test {
+ protected:
+  ...
+  T1 get_private_member1(Foo* obj) {
+    return obj->private_member1_;
+  }
+};
+
+TEST_F(FooTest, Test1) {
+  ...
+  get_private_member1(x)
+  ...
+}
+```
+  * If the methods are declared **protected**, you can change their access level in a test-only subclass:
+```
+class YourClass {
+  ...
+ protected: // protected access for testability.
+  int DoSomethingReturningInt();
+  ...
+};
+
+// in the your_class_test.cc file:
+class TestableYourClass : public YourClass {
+  ...
+ public: using YourClass::DoSomethingReturningInt; // changes access rights
+  ...
+};
+
+TEST_F(YourClassTest, DoSomethingTest) {
+  TestableYourClass obj;
+  assertEquals(expected_value, obj.DoSomethingReturningInt());
+}
+```
+
+## How do I test private class static members without writing FRIEND\_TEST()s? ##
+
+We find private static methods clutter the header file.  They are
+implementation details and ideally should be kept out of a .h. So often I make
+them free functions instead.
+
+Instead of:
+```
+// foo.h
+class Foo {
+  ...
+ private:
+  static bool Func(int n);
+};
+
+// foo.cc
+bool Foo::Func(int n) { ... }
+
+// foo_test.cc
+EXPECT_TRUE(Foo::Func(12345));
+```
+
+You probably should better write:
+```
+// foo.h
+class Foo {
+  ...
+};
+
+// foo.cc
+namespace internal {
+  bool Func(int n) { ... }
+}
+
+// foo_test.cc
+namespace internal {
+  bool Func(int n);
+}
+
+EXPECT_TRUE(internal::Func(12345));
+```
+
+## I would like to run a test several times with different parameters. Do I need to write several similar copies of it? ##
+
+No. You can use a feature called [value-parameterized tests](V1_6_AdvancedGuide.md#Value_Parameterized_Tests) which
+lets you repeat your tests with different parameters, without defining it more than once.
+
+## How do I test a file that defines main()? ##
+
+To test a `foo.cc` file, you need to compile and link it into your unit test
+program. However, when the file contains a definition for the `main()`
+function, it will clash with the `main()` of your unit test, and will result in
+a build error.
+
+The right solution is to split it into three files:
+  1. `foo.h` which contains the declarations,
+  1. `foo.cc` which contains the definitions except `main()`, and
+  1. `foo_main.cc` which contains nothing but the definition of `main()`.
+
+Then `foo.cc` can be easily tested.
+
+If you are adding tests to an existing file and don't want an intrusive change
+like this, there is a hack: just include the entire `foo.cc` file in your unit
+test. For example:
+```
+// File foo_unittest.cc
+
+// The headers section
+...
+
+// Renames main() in foo.cc to make room for the unit test main()
+#define main FooMain
+
+#include "a/b/foo.cc"
+
+// The tests start here.
+...
+```
+
+
+However, please remember this is a hack and should only be used as the last
+resort.
+
+## What can the statement argument in ASSERT\_DEATH() be? ##
+
+`ASSERT_DEATH(_statement_, _regex_)` (or any death assertion macro) can be used
+wherever `_statement_` is valid. So basically `_statement_` can be any C++
+statement that makes sense in the current context. In particular, it can
+reference global and/or local variables, and can be:
+  * a simple function call (often the case),
+  * a complex expression, or
+  * a compound statement.
+
+> Some examples are shown here:
+
+```
+// A death test can be a simple function call.
+TEST(MyDeathTest, FunctionCall) {
+  ASSERT_DEATH(Xyz(5), "Xyz failed");
+}
+
+// Or a complex expression that references variables and functions.
+TEST(MyDeathTest, ComplexExpression) {
+  const bool c = Condition();
+  ASSERT_DEATH((c ? Func1(0) : object2.Method("test")),
+               "(Func1|Method) failed");
+}
+
+// Death assertions can be used any where in a function. In
+// particular, they can be inside a loop.
+TEST(MyDeathTest, InsideLoop) {
+  // Verifies that Foo(0), Foo(1), ..., and Foo(4) all die.
+  for (int i = 0; i < 5; i++) {
+    EXPECT_DEATH_M(Foo(i), "Foo has \\d+ errors",
+                   ::testing::Message() << "where i is " << i);
+  }
+}
+
+// A death assertion can contain a compound statement.
+TEST(MyDeathTest, CompoundStatement) {
+  // Verifies that at lease one of Bar(0), Bar(1), ..., and
+  // Bar(4) dies.
+  ASSERT_DEATH({
+    for (int i = 0; i < 5; i++) {
+      Bar(i);
+    }
+  },
+  "Bar has \\d+ errors");}
+```
+
+`googletest_unittest.cc` contains more examples if you are interested.
+
+## What syntax does the regular expression in ASSERT\_DEATH use? ##
+
+On POSIX systems, Google Test uses the POSIX Extended regular
+expression syntax
+(http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions).
+On Windows, it uses a limited variant of regular expression
+syntax. For more details, see the
+[regular expression syntax](V1_6_AdvancedGuide.md#Regular_Expression_Syntax).
+
+## I have a fixture class Foo, but TEST\_F(Foo, Bar) gives me error "no matching function for call to Foo::Foo()". Why? ##
+
+Google Test needs to be able to create objects of your test fixture class, so
+it must have a default constructor. Normally the compiler will define one for
+you. However, there are cases where you have to define your own:
+  * If you explicitly declare a non-default constructor for class `Foo`, then you need to define a default constructor, even if it would be empty.
+  * If `Foo` has a const non-static data member, then you have to define the default constructor _and_ initialize the const member in the initializer list of the constructor. (Early versions of `gcc` doesn't force you to initialize the const member. It's a bug that has been fixed in `gcc 4`.)
+
+## Why does ASSERT\_DEATH complain about previous threads that were already joined? ##
+
+With the Linux pthread library, there is no turning back once you cross the
+line from single thread to multiple threads. The first time you create a
+thread, a manager thread is created in addition, so you get 3, not 2, threads.
+Later when the thread you create joins the main thread, the thread count
+decrements by 1, but the manager thread will never be killed, so you still have
+2 threads, which means you cannot safely run a death test.
+
+The new NPTL thread library doesn't suffer from this problem, as it doesn't
+create a manager thread. However, if you don't control which machine your test
+runs on, you shouldn't depend on this.
+
+## Why does Google Test require the entire test case, instead of individual tests, to be named FOODeathTest when it uses ASSERT\_DEATH? ##
+
+Google Test does not interleave tests from different test cases. That is, it
+runs all tests in one test case first, and then runs all tests in the next test
+case, and so on. Google Test does this because it needs to set up a test case
+before the first test in it is run, and tear it down afterwords. Splitting up
+the test case would require multiple set-up and tear-down processes, which is
+inefficient and makes the semantics unclean.
+
+If we were to determine the order of tests based on test name instead of test
+case name, then we would have a problem with the following situation:
+
+```
+TEST_F(FooTest, AbcDeathTest) { ... }
+TEST_F(FooTest, Uvw) { ... }
+
+TEST_F(BarTest, DefDeathTest) { ... }
+TEST_F(BarTest, Xyz) { ... }
+```
+
+Since `FooTest.AbcDeathTest` needs to run before `BarTest.Xyz`, and we don't
+interleave tests from different test cases, we need to run all tests in the
+`FooTest` case before running any test in the `BarTest` case. This contradicts
+with the requirement to run `BarTest.DefDeathTest` before `FooTest.Uvw`.
+
+## But I don't like calling my entire test case FOODeathTest when it contains both death tests and non-death tests. What do I do? ##
+
+You don't have to, but if you like, you may split up the test case into
+`FooTest` and `FooDeathTest`, where the names make it clear that they are
+related:
+
+```
+class FooTest : public ::testing::Test { ... };
+
+TEST_F(FooTest, Abc) { ... }
+TEST_F(FooTest, Def) { ... }
+
+typedef FooTest FooDeathTest;
+
+TEST_F(FooDeathTest, Uvw) { ... EXPECT_DEATH(...) ... }
+TEST_F(FooDeathTest, Xyz) { ... ASSERT_DEATH(...) ... }
+```
+
+## The compiler complains about "no match for 'operator<<'" when I use an assertion. What gives? ##
+
+If you use a user-defined type `FooType` in an assertion, you must make sure
+there is an `std::ostream& operator<<(std::ostream&, const FooType&)` function
+defined such that we can print a value of `FooType`.
+
+In addition, if `FooType` is declared in a name space, the `<<` operator also
+needs to be defined in the _same_ name space.
+
+## How do I suppress the memory leak messages on Windows? ##
+
+Since the statically initialized Google Test singleton requires allocations on
+the heap, the Visual C++ memory leak detector will report memory leaks at the
+end of the program run. The easiest way to avoid this is to use the
+`_CrtMemCheckpoint` and `_CrtMemDumpAllObjectsSince` calls to not report any
+statically initialized heap objects. See MSDN for more details and additional
+heap check/debug routines.
+
+## I am building my project with Google Test in Visual Studio and all I'm getting is a bunch of linker errors (or warnings). Help! ##
+
+You may get a number of the following linker error or warnings if you
+attempt to link your test project with the Google Test library when
+your project and the are not built using the same compiler settings.
+
+  * LNK2005: symbol already defined in object
+  * LNK4217: locally defined symbol 'symbol' imported in function 'function'
+  * LNK4049: locally defined symbol 'symbol' imported
+
+The Google Test project (gtest.vcproj) has the Runtime Library option
+set to /MT (use multi-threaded static libraries, /MTd for debug). If
+your project uses something else, for example /MD (use multi-threaded
+DLLs, /MDd for debug), you need to change the setting in the Google
+Test project to match your project's.
+
+To update this setting open the project properties in the Visual
+Studio IDE then select the branch Configuration Properties | C/C++ |
+Code Generation and change the option "Runtime Library".  You may also try
+using gtest-md.vcproj instead of gtest.vcproj.
+
+## I put my tests in a library and Google Test doesn't run them. What's happening? ##
+Have you read a
+[warning](V1_6_Primer.md#important-note-for-visual-c-users) on
+the Google Test Primer page?
+
+## I want to use Google Test with Visual Studio but don't know where to start. ##
+Many people are in your position and one of the posted his solution to
+our mailing list. Here is his link:
+http://hassanjamilahmad.blogspot.com/2009/07/gtest-starters-help.html.
+
+## I am seeing compile errors mentioning std::type\_traits when I try to use Google Test on Solaris. ##
+Google Test uses parts of the standard C++ library that SunStudio does not support.
+Our users reported success using alternative implementations. Try running the build after runing this commad:
+
+`export CC=cc CXX=CC CXXFLAGS='-library=stlport4'`
+
+## How can my code detect if it is running in a test? ##
+
+If you write code that sniffs whether it's running in a test and does
+different things accordingly, you are leaking test-only logic into
+production code and there is no easy way to ensure that the test-only
+code paths aren't run by mistake in production.  Such cleverness also
+leads to
+[Heisenbugs](http://en.wikipedia.org/wiki/Unusual_software_bug#Heisenbug).
+Therefore we strongly advise against the practice, and Google Test doesn't
+provide a way to do it.
+
+In general, the recommended way to cause the code to behave
+differently under test is [dependency injection](http://jamesshore.com/Blog/Dependency-Injection-Demystified.html).
+You can inject different functionality from the test and from the
+production code.  Since your production code doesn't link in the
+for-test logic at all, there is no danger in accidentally running it.
+
+However, if you _really_, _really_, _really_ have no choice, and if
+you follow the rule of ending your test program names with `_test`,
+you can use the _horrible_ hack of sniffing your executable name
+(`argv[0]` in `main()`) to know whether the code is under test.
+
+## Google Test defines a macro that clashes with one defined by another library. How do I deal with that? ##
+
+In C++, macros don't obey namespaces.  Therefore two libraries that
+both define a macro of the same name will clash if you `#include` both
+definitions.  In case a Google Test macro clashes with another
+library, you can force Google Test to rename its macro to avoid the
+conflict.
+
+Specifically, if both Google Test and some other code define macro
+`FOO`, you can add
+```
+  -DGTEST_DONT_DEFINE_FOO=1
+```
+to the compiler flags to tell Google Test to change the macro's name
+from `FOO` to `GTEST_FOO`. For example, with `-DGTEST_DONT_DEFINE_TEST=1`, you'll need to write
+```
+  GTEST_TEST(SomeTest, DoesThis) { ... }
+```
+instead of
+```
+  TEST(SomeTest, DoesThis) { ... }
+```
+in order to define a test.
+
+Currently, the following `TEST`, `FAIL`, `SUCCEED`, and the basic comparison assertion macros can have alternative names. You can see the full list of covered macros [here](http://www.google.com/codesearch?q=if+!GTEST_DONT_DEFINE_\w%2B+package:http://googletest\.googlecode\.com+file:/include/gtest/gtest.h). More information can be found in the "Avoiding Macro Name Clashes" section of the README file.
+
+## My question is not covered in your FAQ! ##
+
+If you cannot find the answer to your question in this FAQ, there are
+some other resources you can use:
+
+  1. read other [wiki pages](http://code.google.com/p/googletest/w/list),
+  1. search the mailing list [archive](http://groups.google.com/group/googletestframework/topics),
+  1. ask it on [googletestframework@googlegroups.com](mailto:googletestframework@googlegroups.com) and someone will answer it (to prevent spam, we require you to join the [discussion group](http://groups.google.com/group/googletestframework) before you can post.).
+
+Please note that creating an issue in the
+[issue tracker](http://code.google.com/p/googletest/issues/list) is _not_
+a good way to get your answer, as it is monitored infrequently by a
+very small number of people.
+
+When asking a question, it's helpful to provide as much of the
+following information as possible (people cannot help you if there's
+not enough information in your question):
+
+  * the version (or the revision number if you check out from SVN directly) of Google Test you use (Google Test is under active development, so it's possible that your problem has been solved in a later version),
+  * your operating system,
+  * the name and version of your compiler,
+  * the complete command line flags you give to your compiler,
+  * the complete compiler error messages (if the question is about compilation),
+  * the _actual_ code (ideally, a minimal but complete program) that has the problem you encounter.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_Primer.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_Primer.md
new file mode 100644
index 0000000000..8d840ef45b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_Primer.md
@@ -0,0 +1,501 @@
+
+
+# Introduction: Why Google C++ Testing Framework? #
+
+_Google C++ Testing Framework_ helps you write better C++ tests.
+
+No matter whether you work on Linux, Windows, or a Mac, if you write C++ code,
+Google Test can help you.
+
+So what makes a good test, and how does Google C++ Testing Framework fit in? We believe:
+  1. Tests should be _independent_ and _repeatable_. It's a pain to debug a test that succeeds or fails as a result of other tests.  Google C++ Testing Framework isolates the tests by running each of them on a different object. When a test fails, Google C++ Testing Framework allows you to run it in isolation for quick debugging.
+  1. Tests should be well _organized_ and reflect the structure of the tested code.  Google C++ Testing Framework groups related tests into test cases that can share data and subroutines. This common pattern is easy to recognize and makes tests easy to maintain. Such consistency is especially helpful when people switch projects and start to work on a new code base.
+  1. Tests should be _portable_ and _reusable_. The open-source community has a lot of code that is platform-neutral, its tests should also be platform-neutral.  Google C++ Testing Framework works on different OSes, with different compilers (gcc, MSVC, and others), with or without exceptions, so Google C++ Testing Framework tests can easily work with a variety of configurations.  (Note that the current release only contains build scripts for Linux - we are actively working on scripts for other platforms.)
+  1. When tests fail, they should provide as much _information_ about the problem as possible. Google C++ Testing Framework doesn't stop at the first test failure. Instead, it only stops the current test and continues with the next. You can also set up tests that report non-fatal failures after which the current test continues. Thus, you can detect and fix multiple bugs in a single run-edit-compile cycle.
+  1. The testing framework should liberate test writers from housekeeping chores and let them focus on the test _content_.  Google C++ Testing Framework automatically keeps track of all tests defined, and doesn't require the user to enumerate them in order to run them.
+  1. Tests should be _fast_. With Google C++ Testing Framework, you can reuse shared resources across tests and pay for the set-up/tear-down only once, without making tests depend on each other.
+
+Since Google C++ Testing Framework is based on the popular xUnit
+architecture, you'll feel right at home if you've used JUnit or PyUnit before.
+If not, it will take you about 10 minutes to learn the basics and get started.
+So let's go!
+
+_Note:_ We sometimes refer to Google C++ Testing Framework informally
+as _Google Test_.
+
+# Setting up a New Test Project #
+
+To write a test program using Google Test, you need to compile Google
+Test into a library and link your test with it.  We provide build
+files for some popular build systems: `msvc/` for Visual Studio,
+`xcode/` for Mac Xcode, `make/` for GNU make, `codegear/` for Borland
+C++ Builder, and the autotools script (deprecated) and
+`CMakeLists.txt` for CMake (recommended) in the Google Test root
+directory.  If your build system is not on this list, you can take a
+look at `make/Makefile` to learn how Google Test should be compiled
+(basically you want to compile `src/gtest-all.cc` with `GTEST_ROOT`
+and `GTEST_ROOT/include` in the header search path, where `GTEST_ROOT`
+is the Google Test root directory).
+
+Once you are able to compile the Google Test library, you should
+create a project or build target for your test program.  Make sure you
+have `GTEST_ROOT/include` in the header search path so that the
+compiler can find `"gtest/gtest.h"` when compiling your test.  Set up
+your test project to link with the Google Test library (for example,
+in Visual Studio, this is done by adding a dependency on
+`gtest.vcproj`).
+
+If you still have questions, take a look at how Google Test's own
+tests are built and use them as examples.
+
+# Basic Concepts #
+
+When using Google Test, you start by writing _assertions_, which are statements
+that check whether a condition is true. An assertion's result can be _success_,
+_nonfatal failure_, or _fatal failure_. If a fatal failure occurs, it aborts
+the current function; otherwise the program continues normally.
+
+_Tests_ use assertions to verify the tested code's behavior. If a test crashes
+or has a failed assertion, then it _fails_; otherwise it _succeeds_.
+
+A _test case_ contains one or many tests. You should group your tests into test
+cases that reflect the structure of the tested code. When multiple tests in a
+test case need to share common objects and subroutines, you can put them into a
+_test fixture_ class.
+
+A _test program_ can contain multiple test cases.
+
+We'll now explain how to write a test program, starting at the individual
+assertion level and building up to tests and test cases.
+
+# Assertions #
+
+Google Test assertions are macros that resemble function calls. You test a
+class or function by making assertions about its behavior. When an assertion
+fails, Google Test prints the assertion's source file and line number location,
+along with a failure message. You may also supply a custom failure message
+which will be appended to Google Test's message.
+
+The assertions come in pairs that test the same thing but have different
+effects on the current function. `ASSERT_*` versions generate fatal failures
+when they fail, and **abort the current function**. `EXPECT_*` versions generate
+nonfatal failures, which don't abort the current function. Usually `EXPECT_*`
+are preferred, as they allow more than one failures to be reported in a test.
+However, you should use `ASSERT_*` if it doesn't make sense to continue when
+the assertion in question fails.
+
+Since a failed `ASSERT_*` returns from the current function immediately,
+possibly skipping clean-up code that comes after it, it may cause a space leak.
+Depending on the nature of the leak, it may or may not be worth fixing - so
+keep this in mind if you get a heap checker error in addition to assertion
+errors.
+
+To provide a custom failure message, simply stream it into the macro using the
+`<<` operator, or a sequence of such operators. An example:
+```
+ASSERT_EQ(x.size(), y.size()) << "Vectors x and y are of unequal length";
+
+for (int i = 0; i < x.size(); ++i) {
+  EXPECT_EQ(x[i], y[i]) << "Vectors x and y differ at index " << i;
+}
+```
+
+Anything that can be streamed to an `ostream` can be streamed to an assertion
+macro--in particular, C strings and `string` objects. If a wide string
+(`wchar_t*`, `TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is
+streamed to an assertion, it will be translated to UTF-8 when printed.
+
+## Basic Assertions ##
+
+These assertions do basic true/false condition testing.
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_TRUE(`_condition_`)`;  | `EXPECT_TRUE(`_condition_`)`;   | _condition_ is true |
+| `ASSERT_FALSE(`_condition_`)`; | `EXPECT_FALSE(`_condition_`)`;  | _condition_ is false |
+
+Remember, when they fail, `ASSERT_*` yields a fatal failure and
+returns from the current function, while `EXPECT_*` yields a nonfatal
+failure, allowing the function to continue running. In either case, an
+assertion failure means its containing test fails.
+
+_Availability_: Linux, Windows, Mac.
+
+## Binary Comparison ##
+
+This section describes assertions that compare two values.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+|`ASSERT_EQ(`_expected_`, `_actual_`);`|`EXPECT_EQ(`_expected_`, `_actual_`);`| _expected_ `==` _actual_ |
+|`ASSERT_NE(`_val1_`, `_val2_`);`      |`EXPECT_NE(`_val1_`, `_val2_`);`      | _val1_ `!=` _val2_ |
+|`ASSERT_LT(`_val1_`, `_val2_`);`      |`EXPECT_LT(`_val1_`, `_val2_`);`      | _val1_ `<` _val2_ |
+|`ASSERT_LE(`_val1_`, `_val2_`);`      |`EXPECT_LE(`_val1_`, `_val2_`);`      | _val1_ `<=` _val2_ |
+|`ASSERT_GT(`_val1_`, `_val2_`);`      |`EXPECT_GT(`_val1_`, `_val2_`);`      | _val1_ `>` _val2_ |
+|`ASSERT_GE(`_val1_`, `_val2_`);`      |`EXPECT_GE(`_val1_`, `_val2_`);`      | _val1_ `>=` _val2_ |
+
+In the event of a failure, Google Test prints both _val1_ and _val2_
+. In `ASSERT_EQ*` and `EXPECT_EQ*` (and all other equality assertions
+we'll introduce later), you should put the expression you want to test
+in the position of _actual_, and put its expected value in _expected_,
+as Google Test's failure messages are optimized for this convention.
+
+Value arguments must be comparable by the assertion's comparison
+operator or you'll get a compiler error.  We used to require the
+arguments to support the `<<` operator for streaming to an `ostream`,
+but it's no longer necessary since v1.6.0 (if `<<` is supported, it
+will be called to print the arguments when the assertion fails;
+otherwise Google Test will attempt to print them in the best way it
+can. For more details and how to customize the printing of the
+arguments, see this Google Mock [recipe](../../googlemock/docs/CookBook.md#teaching-google-mock-how-to-print-your-values).).
+
+These assertions can work with a user-defined type, but only if you define the
+corresponding comparison operator (e.g. `==`, `<`, etc).  If the corresponding
+operator is defined, prefer using the `ASSERT_*()` macros because they will
+print out not only the result of the comparison, but the two operands as well.
+
+Arguments are always evaluated exactly once. Therefore, it's OK for the
+arguments to have side effects. However, as with any ordinary C/C++ function,
+the arguments' evaluation order is undefined (i.e. the compiler is free to
+choose any order) and your code should not depend on any particular argument
+evaluation order.
+
+`ASSERT_EQ()` does pointer equality on pointers. If used on two C strings, it
+tests if they are in the same memory location, not if they have the same value.
+Therefore, if you want to compare C strings (e.g. `const char*`) by value, use
+`ASSERT_STREQ()` , which will be described later on. In particular, to assert
+that a C string is `NULL`, use `ASSERT_STREQ(NULL, c_string)` . However, to
+compare two `string` objects, you should use `ASSERT_EQ`.
+
+Macros in this section work with both narrow and wide string objects (`string`
+and `wstring`).
+
+_Availability_: Linux, Windows, Mac.
+
+## String Comparison ##
+
+The assertions in this group compare two **C strings**. If you want to compare
+two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_STREQ(`_expected\_str_`, `_actual\_str_`);`    | `EXPECT_STREQ(`_expected\_str_`, `_actual\_str_`);`     | the two C strings have the same content |
+| `ASSERT_STRNE(`_str1_`, `_str2_`);`    | `EXPECT_STRNE(`_str1_`, `_str2_`);`     | the two C strings have different content |
+| `ASSERT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);`| `EXPECT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);` | the two C strings have the same content, ignoring case |
+| `ASSERT_STRCASENE(`_str1_`, `_str2_`);`| `EXPECT_STRCASENE(`_str1_`, `_str2_`);` | the two C strings have different content, ignoring case |
+
+Note that "CASE" in an assertion name means that case is ignored.
+
+`*STREQ*` and `*STRNE*` also accept wide C strings (`wchar_t*`). If a
+comparison of two wide strings fails, their values will be printed as UTF-8
+narrow strings.
+
+A `NULL` pointer and an empty string are considered _different_.
+
+_Availability_: Linux, Windows, Mac.
+
+See also: For more string comparison tricks (substring, prefix, suffix, and
+regular expression matching, for example), see the [Advanced Google Test Guide](V1_6_AdvancedGuide.md).
+
+# Simple Tests #
+
+To create a test:
+  1. Use the `TEST()` macro to define and name a test function, These are ordinary C++ functions that don't return a value.
+  1. In this function, along with any valid C++ statements you want to include, use the various Google Test assertions to check values.
+  1. The test's result is determined by the assertions; if any assertion in the test fails (either fatally or non-fatally), or if the test crashes, the entire test fails. Otherwise, it succeeds.
+
+```
+TEST(test_case_name, test_name) {
+ ... test body ...
+}
+```
+
+
+`TEST()` arguments go from general to specific. The _first_ argument is the
+name of the test case, and the _second_ argument is the test's name within the
+test case. Both names must be valid C++ identifiers, and they should not contain underscore (`_`). A test's _full name_ consists of its containing test case and its
+individual name. Tests from different test cases can have the same individual
+name.
+
+For example, let's take a simple integer function:
+```
+int Factorial(int n); // Returns the factorial of n
+```
+
+A test case for this function might look like:
+```
+// Tests factorial of 0.
+TEST(FactorialTest, HandlesZeroInput) {
+  EXPECT_EQ(1, Factorial(0));
+}
+
+// Tests factorial of positive numbers.
+TEST(FactorialTest, HandlesPositiveInput) {
+  EXPECT_EQ(1, Factorial(1));
+  EXPECT_EQ(2, Factorial(2));
+  EXPECT_EQ(6, Factorial(3));
+  EXPECT_EQ(40320, Factorial(8));
+}
+```
+
+Google Test groups the test results by test cases, so logically-related tests
+should be in the same test case; in other words, the first argument to their
+`TEST()` should be the same. In the above example, we have two tests,
+`HandlesZeroInput` and `HandlesPositiveInput`, that belong to the same test
+case `FactorialTest`.
+
+_Availability_: Linux, Windows, Mac.
+
+# Test Fixtures: Using the Same Data Configuration for Multiple Tests #
+
+If you find yourself writing two or more tests that operate on similar data,
+you can use a _test fixture_. It allows you to reuse the same configuration of
+objects for several different tests.
+
+To create a fixture, just:
+  1. Derive a class from `::testing::Test` . Start its body with `protected:` or `public:` as we'll want to access fixture members from sub-classes.
+  1. Inside the class, declare any objects you plan to use.
+  1. If necessary, write a default constructor or `SetUp()` function to prepare the objects for each test. A common mistake is to spell `SetUp()` as `Setup()` with a small `u` - don't let that happen to you.
+  1. If necessary, write a destructor or `TearDown()` function to release any resources you allocated in `SetUp()` . To learn when you should use the constructor/destructor and when you should use `SetUp()/TearDown()`, read this [FAQ entry](V1_6_FAQ.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function).
+  1. If needed, define subroutines for your tests to share.
+
+When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to
+access objects and subroutines in the test fixture:
+```
+TEST_F(test_case_name, test_name) {
+ ... test body ...
+}
+```
+
+Like `TEST()`, the first argument is the test case name, but for `TEST_F()`
+this must be the name of the test fixture class. You've probably guessed: `_F`
+is for fixture.
+
+Unfortunately, the C++ macro system does not allow us to create a single macro
+that can handle both types of tests. Using the wrong macro causes a compiler
+error.
+
+Also, you must first define a test fixture class before using it in a
+`TEST_F()`, or you'll get the compiler error "`virtual outside class
+declaration`".
+
+For each test defined with `TEST_F()`, Google Test will:
+  1. Create a _fresh_ test fixture at runtime
+  1. Immediately initialize it via `SetUp()` ,
+  1. Run the test
+  1. Clean up by calling `TearDown()`
+  1. Delete the test fixture.  Note that different tests in the same test case have different test fixture objects, and Google Test always deletes a test fixture before it creates the next one. Google Test does not reuse the same test fixture for multiple tests. Any changes one test makes to the fixture do not affect other tests.
+
+As an example, let's write tests for a FIFO queue class named `Queue`, which
+has the following interface:
+```
+template <typename E> // E is the element type.
+class Queue {
+ public:
+  Queue();
+  void Enqueue(const E& element);
+  E* Dequeue(); // Returns NULL if the queue is empty.
+  size_t size() const;
+  ...
+};
+```
+
+First, define a fixture class. By convention, you should give it the name
+`FooTest` where `Foo` is the class being tested.
+```
+class QueueTest : public ::testing::Test {
+ protected:
+  virtual void SetUp() {
+    q1_.Enqueue(1);
+    q2_.Enqueue(2);
+    q2_.Enqueue(3);
+  }
+
+  // virtual void TearDown() {}
+
+  Queue<int> q0_;
+  Queue<int> q1_;
+  Queue<int> q2_;
+};
+```
+
+In this case, `TearDown()` is not needed since we don't have to clean up after
+each test, other than what's already done by the destructor.
+
+Now we'll write tests using `TEST_F()` and this fixture.
+```
+TEST_F(QueueTest, IsEmptyInitially) {
+  EXPECT_EQ(0, q0_.size());
+}
+
+TEST_F(QueueTest, DequeueWorks) {
+  int* n = q0_.Dequeue();
+  EXPECT_EQ(NULL, n);
+
+  n = q1_.Dequeue();
+  ASSERT_TRUE(n != NULL);
+  EXPECT_EQ(1, *n);
+  EXPECT_EQ(0, q1_.size());
+  delete n;
+
+  n = q2_.Dequeue();
+  ASSERT_TRUE(n != NULL);
+  EXPECT_EQ(2, *n);
+  EXPECT_EQ(1, q2_.size());
+  delete n;
+}
+```
+
+The above uses both `ASSERT_*` and `EXPECT_*` assertions. The rule of thumb is
+to use `EXPECT_*` when you want the test to continue to reveal more errors
+after the assertion failure, and use `ASSERT_*` when continuing after failure
+doesn't make sense. For example, the second assertion in the `Dequeue` test is
+`ASSERT_TRUE(n != NULL)`, as we need to dereference the pointer `n` later,
+which would lead to a segfault when `n` is `NULL`.
+
+When these tests run, the following happens:
+  1. Google Test constructs a `QueueTest` object (let's call it `t1` ).
+  1. `t1.SetUp()` initializes `t1` .
+  1. The first test ( `IsEmptyInitially` ) runs on `t1` .
+  1. `t1.TearDown()` cleans up after the test finishes.
+  1. `t1` is destructed.
+  1. The above steps are repeated on another `QueueTest` object, this time running the `DequeueWorks` test.
+
+_Availability_: Linux, Windows, Mac.
+
+_Note_: Google Test automatically saves all _Google Test_ flags when a test
+object is constructed, and restores them when it is destructed.
+
+# Invoking the Tests #
+
+`TEST()` and `TEST_F()` implicitly register their tests with Google Test. So, unlike with many other C++ testing frameworks, you don't have to re-list all your defined tests in order to run them.
+
+After defining your tests, you can run them with `RUN_ALL_TESTS()` , which returns `0` if all the tests are successful, or `1` otherwise. Note that `RUN_ALL_TESTS()` runs _all tests_ in your link unit -- they can be from different test cases, or even different source files.
+
+When invoked, the `RUN_ALL_TESTS()` macro:
+  1. Saves the state of all  Google Test flags.
+  1. Creates a test fixture object for the first test.
+  1. Initializes it via `SetUp()`.
+  1. Runs the test on the fixture object.
+  1. Cleans up the fixture via `TearDown()`.
+  1. Deletes the fixture.
+  1. Restores the state of all Google Test flags.
+  1. Repeats the above steps for the next test, until all tests have run.
+
+In addition, if the text fixture's constructor generates a fatal failure in
+step 2, there is no point for step 3 - 5 and they are thus skipped. Similarly,
+if step 3 generates a fatal failure, step 4 will be skipped.
+
+_Important_: You must not ignore the return value of `RUN_ALL_TESTS()`, or `gcc`
+will give you a compiler error. The rationale for this design is that the
+automated testing service determines whether a test has passed based on its
+exit code, not on its stdout/stderr output; thus your `main()` function must
+return the value of `RUN_ALL_TESTS()`.
+
+Also, you should call `RUN_ALL_TESTS()` only **once**. Calling it more than once
+conflicts with some advanced Google Test features (e.g. thread-safe death
+tests) and thus is not supported.
+
+_Availability_: Linux, Windows, Mac.
+
+# Writing the main() Function #
+
+You can start from this boilerplate:
+```
+#include "this/package/foo.h"
+#include "gtest/gtest.h"
+
+namespace {
+
+// The fixture for testing class Foo.
+class FooTest : public ::testing::Test {
+ protected:
+  // You can remove any or all of the following functions if its body
+  // is empty.
+
+  FooTest() {
+    // You can do set-up work for each test here.
+  }
+
+  virtual ~FooTest() {
+    // You can do clean-up work that doesn't throw exceptions here.
+  }
+
+  // If the constructor and destructor are not enough for setting up
+  // and cleaning up each test, you can define the following methods:
+
+  virtual void SetUp() {
+    // Code here will be called immediately after the constructor (right
+    // before each test).
+  }
+
+  virtual void TearDown() {
+    // Code here will be called immediately after each test (right
+    // before the destructor).
+  }
+
+  // Objects declared here can be used by all tests in the test case for Foo.
+};
+
+// Tests that the Foo::Bar() method does Abc.
+TEST_F(FooTest, MethodBarDoesAbc) {
+  const string input_filepath = "this/package/testdata/myinputfile.dat";
+  const string output_filepath = "this/package/testdata/myoutputfile.dat";
+  Foo f;
+  EXPECT_EQ(0, f.Bar(input_filepath, output_filepath));
+}
+
+// Tests that Foo does Xyz.
+TEST_F(FooTest, DoesXyz) {
+  // Exercises the Xyz feature of Foo.
+}
+
+}  // namespace
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+```
+
+The `::testing::InitGoogleTest()` function parses the command line for Google
+Test flags, and removes all recognized flags. This allows the user to control a
+test program's behavior via various flags, which we'll cover in [AdvancedGuide](V1_6_AdvancedGuide.md).
+You must call this function before calling `RUN_ALL_TESTS()`, or the flags
+won't be properly initialized.
+
+On Windows, `InitGoogleTest()` also works with wide strings, so it can be used
+in programs compiled in `UNICODE` mode as well.
+
+But maybe you think that writing all those main() functions is too much work? We agree with you completely and that's why Google Test provides a basic implementation of main(). If it fits your needs, then just link your test with gtest\_main library and you are good to go.
+
+## Important note for Visual C++ users ##
+If you put your tests into a library and your `main()` function is in a different library or in your .exe file, those tests will not run. The reason is a [bug](https://connect.microsoft.com/feedback/viewfeedback.aspx?FeedbackID=244410&siteid=210) in Visual C++. When you define your tests, Google Test creates certain static objects to register them. These objects are not referenced from elsewhere but their constructors are still supposed to run. When Visual C++ linker sees that nothing in the library is referenced from other places it throws the library out. You have to reference your library with tests from your main program to keep the linker from discarding it. Here is how to do it. Somewhere in your library code declare a function:
+```
+__declspec(dllexport) int PullInMyLibrary() { return 0; }
+```
+If you put your tests in a static library (not DLL) then `__declspec(dllexport)` is not required. Now, in your main program, write a code that invokes that function:
+```
+int PullInMyLibrary();
+static int dummy = PullInMyLibrary();
+```
+This will keep your tests referenced and will make them register themselves at startup.
+
+In addition, if you define your tests in a static library, add `/OPT:NOREF` to your main program linker options. If you use MSVC++ IDE, go to your .exe project properties/Configuration Properties/Linker/Optimization and set References setting to `Keep Unreferenced Data (/OPT:NOREF)`. This will keep Visual C++ linker from discarding individual symbols generated by your tests from the final executable.
+
+There is one more pitfall, though. If you use Google Test as a static library (that's how it is defined in gtest.vcproj) your tests must also reside in a static library. If you have to have them in a DLL, you _must_ change Google Test to build into a DLL as well. Otherwise your tests will not run correctly or will not run at all. The general conclusion here is: make your life easier - do not write your tests in libraries!
+
+# Where to Go from Here #
+
+Congratulations! You've learned the Google Test basics. You can start writing
+and running Google Test tests, read some [samples](V1_6_Samples.md), or continue with
+[AdvancedGuide](V1_6_AdvancedGuide.md), which describes many more useful Google Test features.
+
+# Known Limitations #
+
+Google Test is designed to be thread-safe.  The implementation is
+thread-safe on systems where the `pthreads` library is available.  It
+is currently _unsafe_ to use Google Test assertions from two threads
+concurrently on other systems (e.g. Windows).  In most tests this is
+not an issue as usually the assertions are done in the main thread. If
+you want to help, you can volunteer to implement the necessary
+synchronization primitives in `gtest-port.h` for your platform.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_PumpManual.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_PumpManual.md
new file mode 100644
index 0000000000..8184f153ca
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_PumpManual.md
@@ -0,0 +1,177 @@
+
+
+<b>P</b>ump is <b>U</b>seful for <b>M</b>eta <b>P</b>rogramming.
+
+# The Problem #
+
+Template and macro libraries often need to define many classes,
+functions, or macros that vary only (or almost only) in the number of
+arguments they take. It's a lot of repetitive, mechanical, and
+error-prone work.
+
+Variadic templates and variadic macros can alleviate the problem.
+However, while both are being considered by the C++ committee, neither
+is in the standard yet or widely supported by compilers.  Thus they
+are often not a good choice, especially when your code needs to be
+portable. And their capabilities are still limited.
+
+As a result, authors of such libraries often have to write scripts to
+generate their implementation. However, our experience is that it's
+tedious to write such scripts, which tend to reflect the structure of
+the generated code poorly and are often hard to read and edit. For
+example, a small change needed in the generated code may require some
+non-intuitive, non-trivial changes in the script. This is especially
+painful when experimenting with the code.
+
+# Our Solution #
+
+Pump (for Pump is Useful for Meta Programming, Pretty Useful for Meta
+Programming, or Practical Utility for Meta Programming, whichever you
+prefer) is a simple meta-programming tool for C++. The idea is that a
+programmer writes a `foo.pump` file which contains C++ code plus meta
+code that manipulates the C++ code. The meta code can handle
+iterations over a range, nested iterations, local meta variable
+definitions, simple arithmetic, and conditional expressions. You can
+view it as a small Domain-Specific Language. The meta language is
+designed to be non-intrusive (s.t. it won't confuse Emacs' C++ mode,
+for example) and concise, making Pump code intuitive and easy to
+maintain.
+
+## Highlights ##
+
+  * The implementation is in a single Python script and thus ultra portable: no build or installation is needed and it works cross platforms.
+  * Pump tries to be smart with respect to [Google's style guide](http://code.google.com/p/google-styleguide/): it breaks long lines (easy to have when they are generated) at acceptable places to fit within 80 columns and indent the continuation lines correctly.
+  * The format is human-readable and more concise than XML.
+  * The format works relatively well with Emacs' C++ mode.
+
+## Examples ##
+
+The following Pump code (where meta keywords start with `$`, `[[` and `]]` are meta brackets, and `$$` starts a meta comment that ends with the line):
+
+```
+$var n = 3     $$ Defines a meta variable n.
+$range i 0..n  $$ Declares the range of meta iterator i (inclusive).
+$for i [[
+               $$ Meta loop.
+// Foo$i does blah for $i-ary predicates.
+$range j 1..i
+template <size_t N $for j [[, typename A$j]]>
+class Foo$i {
+$if i == 0 [[
+  blah a;
+]] $elif i <= 2 [[
+  blah b;
+]] $else [[
+  blah c;
+]]
+};
+
+]]
+```
+
+will be translated by the Pump compiler to:
+
+```
+// Foo0 does blah for 0-ary predicates.
+template <size_t N>
+class Foo0 {
+  blah a;
+};
+
+// Foo1 does blah for 1-ary predicates.
+template <size_t N, typename A1>
+class Foo1 {
+  blah b;
+};
+
+// Foo2 does blah for 2-ary predicates.
+template <size_t N, typename A1, typename A2>
+class Foo2 {
+  blah b;
+};
+
+// Foo3 does blah for 3-ary predicates.
+template <size_t N, typename A1, typename A2, typename A3>
+class Foo3 {
+  blah c;
+};
+```
+
+In another example,
+
+```
+$range i 1..n
+Func($for i + [[a$i]]);
+$$ The text between i and [[ is the separator between iterations.
+```
+
+will generate one of the following lines (without the comments), depending on the value of `n`:
+
+```
+Func();              // If n is 0.
+Func(a1);            // If n is 1.
+Func(a1 + a2);       // If n is 2.
+Func(a1 + a2 + a3);  // If n is 3.
+// And so on...
+```
+
+## Constructs ##
+
+We support the following meta programming constructs:
+
+| `$var id = exp` | Defines a named constant value. `$id` is valid util the end of the current meta lexical block. |
+|:----------------|:-----------------------------------------------------------------------------------------------|
+| `$range id exp..exp` | Sets the range of an iteration variable, which can be reused in multiple loops later.          |
+| `$for id sep [[ code ]]` | Iteration. The range of `id` must have been defined earlier. `$id` is valid in `code`.         |
+| `$($)`          | Generates a single `$` character.                                                              |
+| `$id`           | Value of the named constant or iteration variable.                                             |
+| `$(exp)`        | Value of the expression.                                                                       |
+| `$if exp [[ code ]] else_branch` | Conditional.                                                                                   |
+| `[[ code ]]`    | Meta lexical block.                                                                            |
+| `cpp_code`      | Raw C++ code.                                                                                  |
+| `$$ comment`    | Meta comment.                                                                                  |
+
+**Note:** To give the user some freedom in formatting the Pump source
+code, Pump ignores a new-line character if it's right after `$for foo`
+or next to `[[` or `]]`. Without this rule you'll often be forced to write
+very long lines to get the desired output. Therefore sometimes you may
+need to insert an extra new-line in such places for a new-line to show
+up in your output.
+
+## Grammar ##
+
+```
+code ::= atomic_code*
+atomic_code ::= $var id = exp
+    | $var id = [[ code ]]
+    | $range id exp..exp
+    | $for id sep [[ code ]]
+    | $($)
+    | $id
+    | $(exp)
+    | $if exp [[ code ]] else_branch
+    | [[ code ]]
+    | cpp_code
+sep ::= cpp_code | empty_string
+else_branch ::= $else [[ code ]]
+    | $elif exp [[ code ]] else_branch
+    | empty_string
+exp ::= simple_expression_in_Python_syntax
+```
+
+## Code ##
+
+You can find the source code of Pump in [scripts/pump.py](../scripts/pump.py). It is still
+very unpolished and lacks automated tests, although it has been
+successfully used many times. If you find a chance to use it in your
+project, please let us know what you think!  We also welcome help on
+improving Pump.
+
+## Real Examples ##
+
+You can find real-world applications of Pump in [Google Test](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgoogletest\.googlecode\.com) and [Google Mock](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgooglemock\.googlecode\.com).  The source file `foo.h.pump` generates `foo.h`.
+
+## Tips ##
+
+  * If a meta variable is followed by a letter or digit, you can separate them using `[[]]`, which inserts an empty string. For example `Foo$j[[]]Helper` generate `Foo1Helper` when `j` is 1.
+  * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_Samples.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_Samples.md
new file mode 100644
index 0000000000..f21d200567
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_Samples.md
@@ -0,0 +1,14 @@
+If you're like us, you'd like to look at some Google Test sample code.  The
+[samples folder](../samples) has a number of well-commented samples showing how to use a
+variety of Google Test features.
+
+  * [Sample #1](../samples/sample1_unittest.cc) shows the basic steps of using Google Test to test C++ functions.
+  * [Sample #2](../samples/sample2_unittest.cc) shows a more complex unit test for a class with multiple member functions.
+  * [Sample #3](../samples/sample3_unittest.cc) uses a test fixture.
+  * [Sample #4](../samples/sample4_unittest.cc) is another basic example of using Google Test.
+  * [Sample #5](../samples/sample5_unittest.cc) teaches how to reuse a test fixture in multiple test cases by deriving sub-fixtures from it.
+  * [Sample #6](../samples/sample6_unittest.cc) demonstrates type-parameterized tests.
+  * [Sample #7](../samples/sample7_unittest.cc) teaches the basics of value-parameterized tests.
+  * [Sample #8](../samples/sample8_unittest.cc) shows using `Combine()` in value-parameterized tests.
+  * [Sample #9](../samples/sample9_unittest.cc) shows use of the listener API to modify Google Test's console output and the use of its reflection API to inspect test results.
+  * [Sample #10](../samples/sample10_unittest.cc) shows use of the listener API to implement a primitive memory leak checker.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_XcodeGuide.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_XcodeGuide.md
new file mode 100644
index 0000000000..bf24bf51bf
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_6_XcodeGuide.md
@@ -0,0 +1,93 @@
+
+
+This guide will explain how to use the Google Testing Framework in your Xcode projects on Mac OS X. This tutorial begins by quickly explaining what to do for experienced users. After the quick start, the guide goes provides additional explanation about each step.
+
+# Quick Start #
+
+Here is the quick guide for using Google Test in your Xcode project.
+
+  1. Download the source from the [website](http://code.google.com/p/googletest) using this command: `svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only`
+  1. Open up the `gtest.xcodeproj` in the `googletest-read-only/xcode/` directory and build the gtest.framework.
+  1. Create a new "Shell Tool" target in your Xcode project called something like "UnitTests"
+  1. Add the gtest.framework to your project and add it to the "Link Binary with Libraries" build phase of "UnitTests"
+  1. Add your unit test source code to the "Compile Sources" build phase of "UnitTests"
+  1. Edit the "UnitTests" executable and add an environment variable named "DYLD\_FRAMEWORK\_PATH" with a value equal to the path to the framework containing the gtest.framework relative to the compiled executable.
+  1. Build and Go
+
+The following sections further explain each of the steps listed above in depth, describing in more detail how to complete it including some variations.
+
+# Get the Source #
+
+Currently, the gtest.framework discussed here isn't available in a tagged release of Google Test, it is only available in the trunk. As explained at the Google Test [site](http://code.google.com/p/googletest/source/checkout">svn), you can get the code from anonymous SVN with this command:
+
+```
+svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only
+```
+
+Alternatively, if you are working with Subversion in your own code base, you can add Google Test as an external dependency to your own Subversion repository. By following this approach, everyone that checks out your svn repository will also receive a copy of Google Test (a specific version, if you wish) without having to check it out explicitly. This makes the set up of your project simpler and reduces the copied code in the repository.
+
+To use `svn:externals`, decide where you would like to have the external source reside. You might choose to put the external source inside the trunk, because you want it to be part of the branch when you make a release. However, keeping it outside the trunk in a version-tagged directory called something like `third-party/googletest/1.0.1`, is another option. Once the location is established, use `svn propedit svn:externals _directory_` to set the svn:externals property on a directory in your repository. This directory won't contain the code, but be its versioned parent directory.
+
+The command `svn propedit` will bring up your Subversion editor, making editing the long, (potentially multi-line) property simpler. This same method can be used to check out a tagged branch, by using the appropriate URL (e.g. `http://googletest.googlecode.com/svn/tags/release-1.0.1`). Additionally, the svn:externals property allows the specification of a particular revision of the trunk with the `-r_##_` option (e.g. `externals/src/googletest -r60 http://googletest.googlecode.com/svn/trunk`).
+
+Here is an example of using the svn:externals properties on a trunk (read via `svn propget`) of a project. This value checks out a copy of Google Test into the `trunk/externals/src/googletest/` directory.
+
+```
+[Computer:svn] user$ svn propget svn:externals trunk
+externals/src/googletest http://googletest.googlecode.com/svn/trunk
+```
+
+# Add the Framework to Your Project #
+
+The next step is to build and add the gtest.framework to your own project. This guide describes two common ways below.
+
+  * **Option 1** --- The simplest way to add Google Test to your own project, is to open gtest.xcodeproj (found in the xcode/ directory of the Google Test trunk) and build the framework manually. Then, add the built framework into your project using the "Add->Existing Framework..." from the context menu or "Project->Add..." from the main menu. The gtest.framework is relocatable and contains the headers and object code that you'll need to make tests. This method requires rebuilding every time you upgrade Google Test in your project.
+  * **Option 2** --- If you are going to be living off the trunk of Google Test, incorporating its latest features into your unit tests (or are a Google Test developer yourself). You'll want to rebuild the framework every time the source updates. to do this, you'll need to add the gtest.xcodeproj file, not the framework itself, to your own Xcode project. Then, from the build products that are revealed by the project's disclosure triangle, you can find the gtest.framework, which can be added to your targets (discussed below).
+
+# Make a Test Target #
+
+To start writing tests, make a new "Shell Tool" target. This target template is available under BSD, Cocoa, or Carbon. Add your unit test source code to the "Compile Sources" build phase of the target.
+
+Next, you'll want to add gtest.framework in two different ways, depending upon which option you chose above.
+
+  * **Option 1** --- During compilation, Xcode will need to know that you are linking against the gtest.framework. Add the gtest.framework to the "Link Binary with Libraries" build phase of your test target. This will include the Google Test headers in your header search path, and will tell the linker where to find the library.
+  * **Option 2** --- If your working out of the trunk, you'll also want to add gtest.framework to your "Link Binary with Libraries" build phase of your test target. In addition, you'll  want to add the gtest.framework as a dependency to your unit test target. This way, Xcode will make sure that gtest.framework is up to date, every time your build your target. Finally, if you don't share build directories with Google Test, you'll have to copy the gtest.framework into your own build products directory using a "Run Script" build phase.
+
+# Set Up the Executable Run Environment #
+
+Since the unit test executable is a shell tool, it doesn't have a bundle with a `Contents/Frameworks` directory, in which to place gtest.framework. Instead, the dynamic linker must be told at runtime to search for the framework in another location. This can be accomplished by setting the "DYLD\_FRAMEWORK\_PATH" environment variable in the "Edit Active Executable ..." Arguments tab, under "Variables to be set in the environment:". The path for this value is the path (relative or absolute) of the directory containing the gtest.framework.
+
+If you haven't set up the DYLD\_FRAMEWORK\_PATH, correctly, you might get a message like this:
+
+```
+[Session started at 2008-08-15 06:23:57 -0600.]
+  dyld: Library not loaded: @loader_path/../Frameworks/gtest.framework/Versions/A/gtest
+    Referenced from: /Users/username/Documents/Sandbox/gtestSample/build/Debug/WidgetFrameworkTest
+    Reason: image not found
+```
+
+To correct this problem, got to the directory containing the executable named in "Referenced from:" value in the error message above. Then, with the terminal in this location, find the relative path to the directory containing the gtest.framework. That is the value you'll need to set as the DYLD\_FRAMEWORK\_PATH.
+
+# Build and Go #
+
+Now, when you click "Build and Go", the test will be executed. Dumping out something like this:
+
+```
+[Session started at 2008-08-06 06:36:13 -0600.]
+[==========] Running 2 tests from 1 test case.
+[----------] Global test environment set-up.
+[----------] 2 tests from WidgetInitializerTest
+[ RUN      ] WidgetInitializerTest.TestConstructor
+[       OK ] WidgetInitializerTest.TestConstructor
+[ RUN      ] WidgetInitializerTest.TestConversion
+[       OK ] WidgetInitializerTest.TestConversion
+[----------] Global test environment tear-down
+[==========] 2 tests from 1 test case ran.
+[  PASSED  ] 2 tests.
+
+The Debugger has exited with status 0.  
+```
+
+# Summary #
+
+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_AdvancedGuide.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_AdvancedGuide.md
new file mode 100644
index 0000000000..dd4af8f366
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_AdvancedGuide.md
@@ -0,0 +1,2181 @@
+
+
+Now that you have read [Primer](V1_7_Primer.md) and learned how to write tests
+using Google Test, it's time to learn some new tricks. This document
+will show you more assertions as well as how to construct complex
+failure messages, propagate fatal failures, reuse and speed up your
+test fixtures, and use various flags with your tests.
+
+# More Assertions #
+
+This section covers some less frequently used, but still significant,
+assertions.
+
+## Explicit Success and Failure ##
+
+These three assertions do not actually test a value or expression. Instead,
+they generate a success or failure directly. Like the macros that actually
+perform a test, you may stream a custom failure message into the them.
+
+| `SUCCEED();` |
+|:-------------|
+
+Generates a success. This does NOT make the overall test succeed. A test is
+considered successful only if none of its assertions fail during its execution.
+
+Note: `SUCCEED()` is purely documentary and currently doesn't generate any
+user-visible output. However, we may add `SUCCEED()` messages to Google Test's
+output in the future.
+
+| `FAIL();`  | `ADD_FAILURE();` | `ADD_FAILURE_AT("`_file\_path_`", `_line\_number_`);` |
+|:-----------|:-----------------|:------------------------------------------------------|
+
+`FAIL()` generates a fatal failure, while `ADD_FAILURE()` and `ADD_FAILURE_AT()` generate a nonfatal
+failure. These are useful when control flow, rather than a Boolean expression,
+deteremines the test's success or failure. For example, you might want to write
+something like:
+
+```
+switch(expression) {
+  case 1: ... some checks ...
+  case 2: ... some other checks
+  ...
+  default: FAIL() << "We shouldn't get here.";
+}
+```
+
+_Availability_: Linux, Windows, Mac.
+
+## Exception Assertions ##
+
+These are for verifying that a piece of code throws (or does not
+throw) an exception of the given type:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_THROW(`_statement_, _exception\_type_`);`  | `EXPECT_THROW(`_statement_, _exception\_type_`);`  | _statement_ throws an exception of the given type  |
+| `ASSERT_ANY_THROW(`_statement_`);`                | `EXPECT_ANY_THROW(`_statement_`);`                | _statement_ throws an exception of any type        |
+| `ASSERT_NO_THROW(`_statement_`);`                 | `EXPECT_NO_THROW(`_statement_`);`                 | _statement_ doesn't throw any exception            |
+
+Examples:
+
+```
+ASSERT_THROW(Foo(5), bar_exception);
+
+EXPECT_NO_THROW({
+  int n = 5;
+  Bar(&n);
+});
+```
+
+_Availability_: Linux, Windows, Mac; since version 1.1.0.
+
+## Predicate Assertions for Better Error Messages ##
+
+Even though Google Test has a rich set of assertions, they can never be
+complete, as it's impossible (nor a good idea) to anticipate all the scenarios
+a user might run into. Therefore, sometimes a user has to use `EXPECT_TRUE()`
+to check a complex expression, for lack of a better macro. This has the problem
+of not showing you the values of the parts of the expression, making it hard to
+understand what went wrong. As a workaround, some users choose to construct the
+failure message by themselves, streaming it into `EXPECT_TRUE()`. However, this
+is awkward especially when the expression has side-effects or is expensive to
+evaluate.
+
+Google Test gives you three different options to solve this problem:
+
+### Using an Existing Boolean Function ###
+
+If you already have a function or a functor that returns `bool` (or a type
+that can be implicitly converted to `bool`), you can use it in a _predicate
+assertion_ to get the function arguments printed for free:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_PRED1(`_pred1, val1_`);`       | `EXPECT_PRED1(`_pred1, val1_`);` | _pred1(val1)_ returns true |
+| `ASSERT_PRED2(`_pred2, val1, val2_`);` | `EXPECT_PRED2(`_pred2, val1, val2_`);` |  _pred2(val1, val2)_ returns true |
+|  ...                | ...                    | ...          |
+
+In the above, _predn_ is an _n_-ary predicate function or functor, where
+_val1_, _val2_, ..., and _valn_ are its arguments. The assertion succeeds
+if the predicate returns `true` when applied to the given arguments, and fails
+otherwise. When the assertion fails, it prints the value of each argument. In
+either case, the arguments are evaluated exactly once.
+
+Here's an example. Given
+
+```
+// Returns true iff m and n have no common divisors except 1.
+bool MutuallyPrime(int m, int n) { ... }
+const int a = 3;
+const int b = 4;
+const int c = 10;
+```
+
+the assertion `EXPECT_PRED2(MutuallyPrime, a, b);` will succeed, while the
+assertion `EXPECT_PRED2(MutuallyPrime, b, c);` will fail with the message
+
+<pre>
+!MutuallyPrime(b, c) is false, where<br>
+b is 4<br>
+c is 10<br>
+</pre>
+
+**Notes:**
+
+  1. If you see a compiler error "no matching function to call" when using `ASSERT_PRED*` or `EXPECT_PRED*`, please see [this](V1_7_FAQ.md#the-compiler-complains-about-undefined-references-to-some-static-const-member-variables-but-i-did-define-them-in-the-class-body-whats-wrong) for how to resolve it.
+  1. Currently we only provide predicate assertions of arity <= 5. If you need a higher-arity assertion, let us know.
+
+_Availability_: Linux, Windows, Mac
+
+### Using a Function That Returns an AssertionResult ###
+
+While `EXPECT_PRED*()` and friends are handy for a quick job, the
+syntax is not satisfactory: you have to use different macros for
+different arities, and it feels more like Lisp than C++.  The
+`::testing::AssertionResult` class solves this problem.
+
+An `AssertionResult` object represents the result of an assertion
+(whether it's a success or a failure, and an associated message).  You
+can create an `AssertionResult` using one of these factory
+functions:
+
+```
+namespace testing {
+
+// Returns an AssertionResult object to indicate that an assertion has
+// succeeded.
+AssertionResult AssertionSuccess();
+
+// Returns an AssertionResult object to indicate that an assertion has
+// failed.
+AssertionResult AssertionFailure();
+
+}
+```
+
+You can then use the `<<` operator to stream messages to the
+`AssertionResult` object.
+
+To provide more readable messages in Boolean assertions
+(e.g. `EXPECT_TRUE()`), write a predicate function that returns
+`AssertionResult` instead of `bool`. For example, if you define
+`IsEven()` as:
+
+```
+::testing::AssertionResult IsEven(int n) {
+  if ((n % 2) == 0)
+    return ::testing::AssertionSuccess();
+  else
+    return ::testing::AssertionFailure() << n << " is odd";
+}
+```
+
+instead of:
+
+```
+bool IsEven(int n) {
+  return (n % 2) == 0;
+}
+```
+
+the failed assertion `EXPECT_TRUE(IsEven(Fib(4)))` will print:
+
+<pre>
+Value of: IsEven(Fib(4))<br>
+Actual: false (*3 is odd*)<br>
+Expected: true<br>
+</pre>
+
+instead of a more opaque
+
+<pre>
+Value of: IsEven(Fib(4))<br>
+Actual: false<br>
+Expected: true<br>
+</pre>
+
+If you want informative messages in `EXPECT_FALSE` and `ASSERT_FALSE`
+as well, and are fine with making the predicate slower in the success
+case, you can supply a success message:
+
+```
+::testing::AssertionResult IsEven(int n) {
+  if ((n % 2) == 0)
+    return ::testing::AssertionSuccess() << n << " is even";
+  else
+    return ::testing::AssertionFailure() << n << " is odd";
+}
+```
+
+Then the statement `EXPECT_FALSE(IsEven(Fib(6)))` will print
+
+<pre>
+Value of: IsEven(Fib(6))<br>
+Actual: true (8 is even)<br>
+Expected: false<br>
+</pre>
+
+_Availability_: Linux, Windows, Mac; since version 1.4.1.
+
+### Using a Predicate-Formatter ###
+
+If you find the default message generated by `(ASSERT|EXPECT)_PRED*` and
+`(ASSERT|EXPECT)_(TRUE|FALSE)` unsatisfactory, or some arguments to your
+predicate do not support streaming to `ostream`, you can instead use the
+following _predicate-formatter assertions_ to _fully_ customize how the
+message is formatted:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_PRED_FORMAT1(`_pred\_format1, val1_`);`        | `EXPECT_PRED_FORMAT1(`_pred\_format1, val1_`); | _pred\_format1(val1)_ is successful |
+| `ASSERT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | `EXPECT_PRED_FORMAT2(`_pred\_format2, val1, val2_`);` | _pred\_format2(val1, val2)_ is successful |
+| `...`               | `...`                  | `...`        |
+
+The difference between this and the previous two groups of macros is that instead of
+a predicate, `(ASSERT|EXPECT)_PRED_FORMAT*` take a _predicate-formatter_
+(_pred\_formatn_), which is a function or functor with the signature:
+
+`::testing::AssertionResult PredicateFormattern(const char* `_expr1_`, const char* `_expr2_`, ... const char* `_exprn_`, T1 `_val1_`, T2 `_val2_`, ... Tn `_valn_`);`
+
+where _val1_, _val2_, ..., and _valn_ are the values of the predicate
+arguments, and _expr1_, _expr2_, ..., and _exprn_ are the corresponding
+expressions as they appear in the source code. The types `T1`, `T2`, ..., and
+`Tn` can be either value types or reference types. For example, if an
+argument has type `Foo`, you can declare it as either `Foo` or `const Foo&`,
+whichever is appropriate.
+
+A predicate-formatter returns a `::testing::AssertionResult` object to indicate
+whether the assertion has succeeded or not. The only way to create such an
+object is to call one of these factory functions:
+
+As an example, let's improve the failure message in the previous example, which uses `EXPECT_PRED2()`:
+
+```
+// Returns the smallest prime common divisor of m and n,
+// or 1 when m and n are mutually prime.
+int SmallestPrimeCommonDivisor(int m, int n) { ... }
+
+// A predicate-formatter for asserting that two integers are mutually prime.
+::testing::AssertionResult AssertMutuallyPrime(const char* m_expr,
+                                               const char* n_expr,
+                                               int m,
+                                               int n) {
+  if (MutuallyPrime(m, n))
+    return ::testing::AssertionSuccess();
+
+  return ::testing::AssertionFailure()
+      << m_expr << " and " << n_expr << " (" << m << " and " << n
+      << ") are not mutually prime, " << "as they have a common divisor "
+      << SmallestPrimeCommonDivisor(m, n);
+}
+```
+
+With this predicate-formatter, we can use
+
+```
+EXPECT_PRED_FORMAT2(AssertMutuallyPrime, b, c);
+```
+
+to generate the message
+
+<pre>
+b and c (4 and 10) are not mutually prime, as they have a common divisor 2.<br>
+</pre>
+
+As you may have realized, many of the assertions we introduced earlier are
+special cases of `(EXPECT|ASSERT)_PRED_FORMAT*`. In fact, most of them are
+indeed defined using `(EXPECT|ASSERT)_PRED_FORMAT*`.
+
+_Availability_: Linux, Windows, Mac.
+
+
+## Floating-Point Comparison ##
+
+Comparing floating-point numbers is tricky. Due to round-off errors, it is
+very unlikely that two floating-points will match exactly. Therefore,
+`ASSERT_EQ` 's naive comparison usually doesn't work. And since floating-points
+can have a wide value range, no single fixed error bound works. It's better to
+compare by a fixed relative error bound, except for values close to 0 due to
+the loss of precision there.
+
+In general, for floating-point comparison to make sense, the user needs to
+carefully choose the error bound. If they don't want or care to, comparing in
+terms of Units in the Last Place (ULPs) is a good default, and Google Test
+provides assertions to do this. Full details about ULPs are quite long; if you
+want to learn more, see
+[this article on float comparison](http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm).
+
+### Floating-Point Macros ###
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_FLOAT_EQ(`_expected, actual_`);`  | `EXPECT_FLOAT_EQ(`_expected, actual_`);` | the two `float` values are almost equal |
+| `ASSERT_DOUBLE_EQ(`_expected, actual_`);` | `EXPECT_DOUBLE_EQ(`_expected, actual_`);` | the two `double` values are almost equal |
+
+By "almost equal", we mean the two values are within 4 ULP's from each
+other.
+
+The following assertions allow you to choose the acceptable error bound:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_NEAR(`_val1, val2, abs\_error_`);` | `EXPECT_NEAR`_(val1, val2, abs\_error_`);` | the difference between _val1_ and _val2_ doesn't exceed the given absolute error |
+
+_Availability_: Linux, Windows, Mac.
+
+### Floating-Point Predicate-Format Functions ###
+
+Some floating-point operations are useful, but not that often used. In order
+to avoid an explosion of new macros, we provide them as predicate-format
+functions that can be used in predicate assertion macros (e.g.
+`EXPECT_PRED_FORMAT2`, etc).
+
+```
+EXPECT_PRED_FORMAT2(::testing::FloatLE, val1, val2);
+EXPECT_PRED_FORMAT2(::testing::DoubleLE, val1, val2);
+```
+
+Verifies that _val1_ is less than, or almost equal to, _val2_. You can
+replace `EXPECT_PRED_FORMAT2` in the above table with `ASSERT_PRED_FORMAT2`.
+
+_Availability_: Linux, Windows, Mac.
+
+## Windows HRESULT assertions ##
+
+These assertions test for `HRESULT` success or failure.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_HRESULT_SUCCEEDED(`_expression_`);` | `EXPECT_HRESULT_SUCCEEDED(`_expression_`);` | _expression_ is a success `HRESULT` |
+| `ASSERT_HRESULT_FAILED(`_expression_`);`    | `EXPECT_HRESULT_FAILED(`_expression_`);`    | _expression_ is a failure `HRESULT` |
+
+The generated output contains the human-readable error message
+associated with the `HRESULT` code returned by _expression_.
+
+You might use them like this:
+
+```
+CComPtr shell;
+ASSERT_HRESULT_SUCCEEDED(shell.CoCreateInstance(L"Shell.Application"));
+CComVariant empty;
+ASSERT_HRESULT_SUCCEEDED(shell->ShellExecute(CComBSTR(url), empty, empty, empty, empty));
+```
+
+_Availability_: Windows.
+
+## Type Assertions ##
+
+You can call the function
+```
+::testing::StaticAssertTypeEq<T1, T2>();
+```
+to assert that types `T1` and `T2` are the same.  The function does
+nothing if the assertion is satisfied.  If the types are different,
+the function call will fail to compile, and the compiler error message
+will likely (depending on the compiler) show you the actual values of
+`T1` and `T2`.  This is mainly useful inside template code.
+
+_Caveat:_ When used inside a member function of a class template or a
+function template, `StaticAssertTypeEq<T1, T2>()` is effective _only if_
+the function is instantiated.  For example, given:
+```
+template <typename T> class Foo {
+ public:
+  void Bar() { ::testing::StaticAssertTypeEq<int, T>(); }
+};
+```
+the code:
+```
+void Test1() { Foo<bool> foo; }
+```
+will _not_ generate a compiler error, as `Foo<bool>::Bar()` is never
+actually instantiated.  Instead, you need:
+```
+void Test2() { Foo<bool> foo; foo.Bar(); }
+```
+to cause a compiler error.
+
+_Availability:_ Linux, Windows, Mac; since version 1.3.0.
+
+## Assertion Placement ##
+
+You can use assertions in any C++ function. In particular, it doesn't
+have to be a method of the test fixture class. The one constraint is
+that assertions that generate a fatal failure (`FAIL*` and `ASSERT_*`)
+can only be used in void-returning functions. This is a consequence of
+Google Test not using exceptions. By placing it in a non-void function
+you'll get a confusing compile error like
+`"error: void value not ignored as it ought to be"`.
+
+If you need to use assertions in a function that returns non-void, one option
+is to make the function return the value in an out parameter instead. For
+example, you can rewrite `T2 Foo(T1 x)` to `void Foo(T1 x, T2* result)`. You
+need to make sure that `*result` contains some sensible value even when the
+function returns prematurely. As the function now returns `void`, you can use
+any assertion inside of it.
+
+If changing the function's type is not an option, you should just use
+assertions that generate non-fatal failures, such as `ADD_FAILURE*` and
+`EXPECT_*`.
+
+_Note_: Constructors and destructors are not considered void-returning
+functions, according to the C++ language specification, and so you may not use
+fatal assertions in them. You'll get a compilation error if you try. A simple
+workaround is to transfer the entire body of the constructor or destructor to a
+private void-returning method. However, you should be aware that a fatal
+assertion failure in a constructor does not terminate the current test, as your
+intuition might suggest; it merely returns from the constructor early, possibly
+leaving your object in a partially-constructed state. Likewise, a fatal
+assertion failure in a destructor may leave your object in a
+partially-destructed state. Use assertions carefully in these situations!
+
+# Teaching Google Test How to Print Your Values #
+
+When a test assertion such as `EXPECT_EQ` fails, Google Test prints the
+argument values to help you debug.  It does this using a
+user-extensible value printer.
+
+This printer knows how to print built-in C++ types, native arrays, STL
+containers, and any type that supports the `<<` operator.  For other
+types, it prints the raw bytes in the value and hopes that you the
+user can figure it out.
+
+As mentioned earlier, the printer is _extensible_.  That means
+you can teach it to do a better job at printing your particular type
+than to dump the bytes.  To do that, define `<<` for your type:
+
+```
+#include <iostream>
+
+namespace foo {
+
+class Bar { ... };  // We want Google Test to be able to print instances of this.
+
+// It's important that the << operator is defined in the SAME
+// namespace that defines Bar.  C++'s look-up rules rely on that.
+::std::ostream& operator<<(::std::ostream& os, const Bar& bar) {
+  return os << bar.DebugString();  // whatever needed to print bar to os
+}
+
+}  // namespace foo
+```
+
+Sometimes, this might not be an option: your team may consider it bad
+style to have a `<<` operator for `Bar`, or `Bar` may already have a
+`<<` operator that doesn't do what you want (and you cannot change
+it).  If so, you can instead define a `PrintTo()` function like this:
+
+```
+#include <iostream>
+
+namespace foo {
+
+class Bar { ... };
+
+// It's important that PrintTo() is defined in the SAME
+// namespace that defines Bar.  C++'s look-up rules rely on that.
+void PrintTo(const Bar& bar, ::std::ostream* os) {
+  *os << bar.DebugString();  // whatever needed to print bar to os
+}
+
+}  // namespace foo
+```
+
+If you have defined both `<<` and `PrintTo()`, the latter will be used
+when Google Test is concerned.  This allows you to customize how the value
+appears in Google Test's output without affecting code that relies on the
+behavior of its `<<` operator.
+
+If you want to print a value `x` using Google Test's value printer
+yourself, just call `::testing::PrintToString(`_x_`)`, which
+returns an `std::string`:
+
+```
+vector<pair<Bar, int> > bar_ints = GetBarIntVector();
+
+EXPECT_TRUE(IsCorrectBarIntVector(bar_ints))
+    << "bar_ints = " << ::testing::PrintToString(bar_ints);
+```
+
+# Death Tests #
+
+In many applications, there are assertions that can cause application failure
+if a condition is not met. These sanity checks, which ensure that the program
+is in a known good state, are there to fail at the earliest possible time after
+some program state is corrupted. If the assertion checks the wrong condition,
+then the program may proceed in an erroneous state, which could lead to memory
+corruption, security holes, or worse. Hence it is vitally important to test
+that such assertion statements work as expected.
+
+Since these precondition checks cause the processes to die, we call such tests
+_death tests_. More generally, any test that checks that a program terminates
+(except by throwing an exception) in an expected fashion is also a death test.
+
+Note that if a piece of code throws an exception, we don't consider it "death"
+for the purpose of death tests, as the caller of the code could catch the exception
+and avoid the crash. If you want to verify exceptions thrown by your code,
+see [Exception Assertions](#exception-assertions).
+
+If you want to test `EXPECT_*()/ASSERT_*()` failures in your test code, see [Catching Failures](#catching-failures).
+
+## How to Write a Death Test ##
+
+Google Test has the following macros to support death tests:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_DEATH(`_statement, regex_`); | `EXPECT_DEATH(`_statement, regex_`); | _statement_ crashes with the given error |
+| `ASSERT_DEATH_IF_SUPPORTED(`_statement, regex_`); | `EXPECT_DEATH_IF_SUPPORTED(`_statement, regex_`); | if death tests are supported, verifies that _statement_ crashes with the given error; otherwise verifies nothing |
+| `ASSERT_EXIT(`_statement, predicate, regex_`); | `EXPECT_EXIT(`_statement, predicate, regex_`); |_statement_ exits with the given error and its exit code matches _predicate_ |
+
+where _statement_ is a statement that is expected to cause the process to
+die, _predicate_ is a function or function object that evaluates an integer
+exit status, and _regex_ is a regular expression that the stderr output of
+_statement_ is expected to match. Note that _statement_ can be _any valid
+statement_ (including _compound statement_) and doesn't have to be an
+expression.
+
+As usual, the `ASSERT` variants abort the current test function, while the
+`EXPECT` variants do not.
+
+**Note:** We use the word "crash" here to mean that the process
+terminates with a _non-zero_ exit status code.  There are two
+possibilities: either the process has called `exit()` or `_exit()`
+with a non-zero value, or it may be killed by a signal.
+
+This means that if _statement_ terminates the process with a 0 exit
+code, it is _not_ considered a crash by `EXPECT_DEATH`.  Use
+`EXPECT_EXIT` instead if this is the case, or if you want to restrict
+the exit code more precisely.
+
+A predicate here must accept an `int` and return a `bool`. The death test
+succeeds only if the predicate returns `true`. Google Test defines a few
+predicates that handle the most common cases:
+
+```
+::testing::ExitedWithCode(exit_code)
+```
+
+This expression is `true` if the program exited normally with the given exit
+code.
+
+```
+::testing::KilledBySignal(signal_number)  // Not available on Windows.
+```
+
+This expression is `true` if the program was killed by the given signal.
+
+The `*_DEATH` macros are convenient wrappers for `*_EXIT` that use a predicate
+that verifies the process' exit code is non-zero.
+
+Note that a death test only cares about three things:
+
+  1. does _statement_ abort or exit the process?
+  1. (in the case of `ASSERT_EXIT` and `EXPECT_EXIT`) does the exit status satisfy _predicate_?  Or (in the case of `ASSERT_DEATH` and `EXPECT_DEATH`) is the exit status non-zero?  And
+  1. does the stderr output match _regex_?
+
+In particular, if _statement_ generates an `ASSERT_*` or `EXPECT_*` failure, it will **not** cause the death test to fail, as Google Test assertions don't abort the process.
+
+To write a death test, simply use one of the above macros inside your test
+function. For example,
+
+```
+TEST(MyDeathTest, Foo) {
+  // This death test uses a compound statement.
+  ASSERT_DEATH({ int n = 5; Foo(&n); }, "Error on line .* of Foo()");
+}
+TEST(MyDeathTest, NormalExit) {
+  EXPECT_EXIT(NormalExit(), ::testing::ExitedWithCode(0), "Success");
+}
+TEST(MyDeathTest, KillMyself) {
+  EXPECT_EXIT(KillMyself(), ::testing::KilledBySignal(SIGKILL), "Sending myself unblockable signal");
+}
+```
+
+verifies that:
+
+  * calling `Foo(5)` causes the process to die with the given error message,
+  * calling `NormalExit()` causes the process to print `"Success"` to stderr and exit with exit code 0, and
+  * calling `KillMyself()` kills the process with signal `SIGKILL`.
+
+The test function body may contain other assertions and statements as well, if
+necessary.
+
+_Important:_ We strongly recommend you to follow the convention of naming your
+test case (not test) `*DeathTest` when it contains a death test, as
+demonstrated in the above example. The `Death Tests And Threads` section below
+explains why.
+
+If a test fixture class is shared by normal tests and death tests, you
+can use typedef to introduce an alias for the fixture class and avoid
+duplicating its code:
+```
+class FooTest : public ::testing::Test { ... };
+
+typedef FooTest FooDeathTest;
+
+TEST_F(FooTest, DoesThis) {
+  // normal test
+}
+
+TEST_F(FooDeathTest, DoesThat) {
+  // death test
+}
+```
+
+_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Cygwin, and Mac (the latter three are supported since v1.3.0).  `(ASSERT|EXPECT)_DEATH_IF_SUPPORTED` are new in v1.4.0.
+
+## Regular Expression Syntax ##
+
+On POSIX systems (e.g. Linux, Cygwin, and Mac), Google Test uses the
+[POSIX extended regular expression](http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04)
+syntax in death tests. To learn about this syntax, you may want to read this [Wikipedia entry](http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions).
+
+On Windows, Google Test uses its own simple regular expression
+implementation. It lacks many features you can find in POSIX extended
+regular expressions.  For example, we don't support union (`"x|y"`),
+grouping (`"(xy)"`), brackets (`"[xy]"`), and repetition count
+(`"x{5,7}"`), among others. Below is what we do support (Letter `A` denotes a
+literal character, period (`.`), or a single `\\` escape sequence; `x`
+and `y` denote regular expressions.):
+
+| `c` | matches any literal character `c` |
+|:----|:----------------------------------|
+| `\\d` | matches any decimal digit         |
+| `\\D` | matches any character that's not a decimal digit |
+| `\\f` | matches `\f`                      |
+| `\\n` | matches `\n`                      |
+| `\\r` | matches `\r`                      |
+| `\\s` | matches any ASCII whitespace, including `\n` |
+| `\\S` | matches any character that's not a whitespace |
+| `\\t` | matches `\t`                      |
+| `\\v` | matches `\v`                      |
+| `\\w` | matches any letter, `_`, or decimal digit |
+| `\\W` | matches any character that `\\w` doesn't match |
+| `\\c` | matches any literal character `c`, which must be a punctuation |
+| `\\.` | matches the `.` character         |
+| `.` | matches any single character except `\n` |
+| `A?` | matches 0 or 1 occurrences of `A` |
+| `A*` | matches 0 or many occurrences of `A` |
+| `A+` | matches 1 or many occurrences of `A` |
+| `^` | matches the beginning of a string (not that of each line) |
+| `$` | matches the end of a string (not that of each line) |
+| `xy` | matches `x` followed by `y`       |
+
+To help you determine which capability is available on your system,
+Google Test defines macro `GTEST_USES_POSIX_RE=1` when it uses POSIX
+extended regular expressions, or `GTEST_USES_SIMPLE_RE=1` when it uses
+the simple version.  If you want your death tests to work in both
+cases, you can either `#if` on these macros or use the more limited
+syntax only.
+
+## How It Works ##
+
+Under the hood, `ASSERT_EXIT()` spawns a new process and executes the
+death test statement in that process. The details of of how precisely
+that happens depend on the platform and the variable
+`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the
+command-line flag `--gtest_death_test_style`).
+
+  * On POSIX systems, `fork()` (or `clone()` on Linux) is used to spawn the child, after which:
+    * If the variable's value is `"fast"`, the death test statement is immediately executed.
+    * If the variable's value is `"threadsafe"`, the child process re-executes the unit test binary just as it was originally invoked, but with some extra flags to cause just the single death test under consideration to be run.
+  * On Windows, the child is spawned using the `CreateProcess()` API, and re-executes the binary to cause just the single death test under consideration to be run - much like the `threadsafe` mode on POSIX.
+
+Other values for the variable are illegal and will cause the death test to
+fail. Currently, the flag's default value is `"fast"`. However, we reserve the
+right to change it in the future. Therefore, your tests should not depend on
+this.
+
+In either case, the parent process waits for the child process to complete, and checks that
+
+  1. the child's exit status satisfies the predicate, and
+  1. the child's stderr matches the regular expression.
+
+If the death test statement runs to completion without dying, the child
+process will nonetheless terminate, and the assertion fails.
+
+## Death Tests And Threads ##
+
+The reason for the two death test styles has to do with thread safety. Due to
+well-known problems with forking in the presence of threads, death tests should
+be run in a single-threaded context. Sometimes, however, it isn't feasible to
+arrange that kind of environment. For example, statically-initialized modules
+may start threads before main is ever reached. Once threads have been created,
+it may be difficult or impossible to clean them up.
+
+Google Test has three features intended to raise awareness of threading issues.
+
+  1. A warning is emitted if multiple threads are running when a death test is encountered.
+  1. Test cases with a name ending in "DeathTest" are run before all other tests.
+  1. It uses `clone()` instead of `fork()` to spawn the child process on Linux (`clone()` is not available on Cygwin and Mac), as `fork()` is more likely to cause the child to hang when the parent process has multiple threads.
+
+It's perfectly fine to create threads inside a death test statement; they are
+executed in a separate process and cannot affect the parent.
+
+## Death Test Styles ##
+
+The "threadsafe" death test style was introduced in order to help mitigate the
+risks of testing in a possibly multithreaded environment. It trades increased
+test execution time (potentially dramatically so) for improved thread safety.
+We suggest using the faster, default "fast" style unless your test has specific
+problems with it.
+
+You can choose a particular style of death tests by setting the flag
+programmatically:
+
+```
+::testing::FLAGS_gtest_death_test_style = "threadsafe";
+```
+
+You can do this in `main()` to set the style for all death tests in the
+binary, or in individual tests. Recall that flags are saved before running each
+test and restored afterwards, so you need not do that yourself. For example:
+
+```
+TEST(MyDeathTest, TestOne) {
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
+  // This test is run in the "threadsafe" style:
+  ASSERT_DEATH(ThisShouldDie(), "");
+}
+
+TEST(MyDeathTest, TestTwo) {
+  // This test is run in the "fast" style:
+  ASSERT_DEATH(ThisShouldDie(), "");
+}
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  ::testing::FLAGS_gtest_death_test_style = "fast";
+  return RUN_ALL_TESTS();
+}
+```
+
+## Caveats ##
+
+The _statement_ argument of `ASSERT_EXIT()` can be any valid C++ statement.
+If it leaves the current function via a `return` statement or by throwing an exception,
+the death test is considered to have failed.  Some Google Test macros may return
+from the current function (e.g. `ASSERT_TRUE()`), so be sure to avoid them in _statement_.
+
+Since _statement_ runs in the child process, any in-memory side effect (e.g.
+modifying a variable, releasing memory, etc) it causes will _not_ be observable
+in the parent process. In particular, if you release memory in a death test,
+your program will fail the heap check as the parent process will never see the
+memory reclaimed. To solve this problem, you can
+
+  1. try not to free memory in a death test;
+  1. free the memory again in the parent process; or
+  1. do not use the heap checker in your program.
+
+Due to an implementation detail, you cannot place multiple death test
+assertions on the same line; otherwise, compilation will fail with an unobvious
+error message.
+
+Despite the improved thread safety afforded by the "threadsafe" style of death
+test, thread problems such as deadlock are still possible in the presence of
+handlers registered with `pthread_atfork(3)`.
+
+# Using Assertions in Sub-routines #
+
+## Adding Traces to Assertions ##
+
+If a test sub-routine is called from several places, when an assertion
+inside it fails, it can be hard to tell which invocation of the
+sub-routine the failure is from.  You can alleviate this problem using
+extra logging or custom failure messages, but that usually clutters up
+your tests. A better solution is to use the `SCOPED_TRACE` macro:
+
+| `SCOPED_TRACE(`_message_`);` |
+|:-----------------------------|
+
+where _message_ can be anything streamable to `std::ostream`. This
+macro will cause the current file name, line number, and the given
+message to be added in every failure message. The effect will be
+undone when the control leaves the current lexical scope.
+
+For example,
+
+```
+10: void Sub1(int n) {
+11:   EXPECT_EQ(1, Bar(n));
+12:   EXPECT_EQ(2, Bar(n + 1));
+13: }
+14:
+15: TEST(FooTest, Bar) {
+16:   {
+17:     SCOPED_TRACE("A");  // This trace point will be included in
+18:                         // every failure in this scope.
+19:     Sub1(1);
+20:   }
+21:   // Now it won't.
+22:   Sub1(9);
+23: }
+```
+
+could result in messages like these:
+
+```
+path/to/foo_test.cc:11: Failure
+Value of: Bar(n)
+Expected: 1
+  Actual: 2
+   Trace:
+path/to/foo_test.cc:17: A
+
+path/to/foo_test.cc:12: Failure
+Value of: Bar(n + 1)
+Expected: 2
+  Actual: 3
+```
+
+Without the trace, it would've been difficult to know which invocation
+of `Sub1()` the two failures come from respectively. (You could add an
+extra message to each assertion in `Sub1()` to indicate the value of
+`n`, but that's tedious.)
+
+Some tips on using `SCOPED_TRACE`:
+
+  1. With a suitable message, it's often enough to use `SCOPED_TRACE` at the beginning of a sub-routine, instead of at each call site.
+  1. When calling sub-routines inside a loop, make the loop iterator part of the message in `SCOPED_TRACE` such that you can know which iteration the failure is from.
+  1. Sometimes the line number of the trace point is enough for identifying the particular invocation of a sub-routine. In this case, you don't have to choose a unique message for `SCOPED_TRACE`. You can simply use `""`.
+  1. You can use `SCOPED_TRACE` in an inner scope when there is one in the outer scope. In this case, all active trace points will be included in the failure messages, in reverse order they are encountered.
+  1. The trace dump is clickable in Emacs' compilation buffer - hit return on a line number and you'll be taken to that line in the source file!
+
+_Availability:_ Linux, Windows, Mac.
+
+## Propagating Fatal Failures ##
+
+A common pitfall when using `ASSERT_*` and `FAIL*` is not understanding that
+when they fail they only abort the _current function_, not the entire test. For
+example, the following test will segfault:
+```
+void Subroutine() {
+  // Generates a fatal failure and aborts the current function.
+  ASSERT_EQ(1, 2);
+  // The following won't be executed.
+  ...
+}
+
+TEST(FooTest, Bar) {
+  Subroutine();
+  // The intended behavior is for the fatal failure
+  // in Subroutine() to abort the entire test.
+  // The actual behavior: the function goes on after Subroutine() returns.
+  int* p = NULL;
+  *p = 3; // Segfault!
+}
+```
+
+Since we don't use exceptions, it is technically impossible to
+implement the intended behavior here.  To alleviate this, Google Test
+provides two solutions.  You could use either the
+`(ASSERT|EXPECT)_NO_FATAL_FAILURE` assertions or the
+`HasFatalFailure()` function.  They are described in the following two
+subsections.
+
+### Asserting on Subroutines ###
+
+As shown above, if your test calls a subroutine that has an `ASSERT_*`
+failure in it, the test will continue after the subroutine
+returns. This may not be what you want.
+
+Often people want fatal failures to propagate like exceptions.  For
+that Google Test offers the following macros:
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_NO_FATAL_FAILURE(`_statement_`);` | `EXPECT_NO_FATAL_FAILURE(`_statement_`);` | _statement_ doesn't generate any new fatal failures in the current thread. |
+
+Only failures in the thread that executes the assertion are checked to
+determine the result of this type of assertions.  If _statement_
+creates new threads, failures in these threads are ignored.
+
+Examples:
+
+```
+ASSERT_NO_FATAL_FAILURE(Foo());
+
+int i;
+EXPECT_NO_FATAL_FAILURE({
+  i = Bar();
+});
+```
+
+_Availability:_ Linux, Windows, Mac. Assertions from multiple threads
+are currently not supported.
+
+### Checking for Failures in the Current Test ###
+
+`HasFatalFailure()` in the `::testing::Test` class returns `true` if an
+assertion in the current test has suffered a fatal failure. This
+allows functions to catch fatal failures in a sub-routine and return
+early.
+
+```
+class Test {
+ public:
+  ...
+  static bool HasFatalFailure();
+};
+```
+
+The typical usage, which basically simulates the behavior of a thrown
+exception, is:
+
+```
+TEST(FooTest, Bar) {
+  Subroutine();
+  // Aborts if Subroutine() had a fatal failure.
+  if (HasFatalFailure())
+    return;
+  // The following won't be executed.
+  ...
+}
+```
+
+If `HasFatalFailure()` is used outside of `TEST()` , `TEST_F()` , or a test
+fixture, you must add the `::testing::Test::` prefix, as in:
+
+```
+if (::testing::Test::HasFatalFailure())
+  return;
+```
+
+Similarly, `HasNonfatalFailure()` returns `true` if the current test
+has at least one non-fatal failure, and `HasFailure()` returns `true`
+if the current test has at least one failure of either kind.
+
+_Availability:_ Linux, Windows, Mac.  `HasNonfatalFailure()` and
+`HasFailure()` are available since version 1.4.0.
+
+# Logging Additional Information #
+
+In your test code, you can call `RecordProperty("key", value)` to log
+additional information, where `value` can be either a string or an `int`. The _last_ value recorded for a key will be emitted to the XML output
+if you specify one. For example, the test
+
+```
+TEST_F(WidgetUsageTest, MinAndMaxWidgets) {
+  RecordProperty("MaximumWidgets", ComputeMaxUsage());
+  RecordProperty("MinimumWidgets", ComputeMinUsage());
+}
+```
+
+will output XML like this:
+
+```
+...
+  <testcase name="MinAndMaxWidgets" status="run" time="6" classname="WidgetUsageTest"
+            MaximumWidgets="12"
+            MinimumWidgets="9" />
+...
+```
+
+_Note_:
+  * `RecordProperty()` is a static member of the `Test` class. Therefore it needs to be prefixed with `::testing::Test::` if used outside of the `TEST` body and the test fixture class.
+  * `key` must be a valid XML attribute name, and cannot conflict with the ones already used by Google Test (`name`, `status`, `time`, `classname`, `type_param`, and `value_param`).
+  * Calling `RecordProperty()` outside of the lifespan of a test is allowed. If it's called outside of a test but between a test case's `SetUpTestCase()` and `TearDownTestCase()` methods, it will be attributed to the XML element for the test case. If it's called outside of all test cases (e.g. in a test environment), it will be attributed to the top-level XML element.
+
+_Availability_: Linux, Windows, Mac.
+
+# Sharing Resources Between Tests in the Same Test Case #
+
+
+
+Google Test creates a new test fixture object for each test in order to make
+tests independent and easier to debug. However, sometimes tests use resources
+that are expensive to set up, making the one-copy-per-test model prohibitively
+expensive.
+
+If the tests don't change the resource, there's no harm in them sharing a
+single resource copy. So, in addition to per-test set-up/tear-down, Google Test
+also supports per-test-case set-up/tear-down. To use it:
+
+  1. In your test fixture class (say `FooTest` ), define as `static` some member variables to hold the shared resources.
+  1. In the same test fixture class, define a `static void SetUpTestCase()` function (remember not to spell it as **`SetupTestCase`** with a small `u`!) to set up the shared resources and a `static void TearDownTestCase()` function to tear them down.
+
+That's it! Google Test automatically calls `SetUpTestCase()` before running the
+_first test_ in the `FooTest` test case (i.e. before creating the first
+`FooTest` object), and calls `TearDownTestCase()` after running the _last test_
+in it (i.e. after deleting the last `FooTest` object). In between, the tests
+can use the shared resources.
+
+Remember that the test order is undefined, so your code can't depend on a test
+preceding or following another. Also, the tests must either not modify the
+state of any shared resource, or, if they do modify the state, they must
+restore the state to its original value before passing control to the next
+test.
+
+Here's an example of per-test-case set-up and tear-down:
+```
+class FooTest : public ::testing::Test {
+ protected:
+  // Per-test-case set-up.
+  // Called before the first test in this test case.
+  // Can be omitted if not needed.
+  static void SetUpTestCase() {
+    shared_resource_ = new ...;
+  }
+
+  // Per-test-case tear-down.
+  // Called after the last test in this test case.
+  // Can be omitted if not needed.
+  static void TearDownTestCase() {
+    delete shared_resource_;
+    shared_resource_ = NULL;
+  }
+
+  // You can define per-test set-up and tear-down logic as usual.
+  virtual void SetUp() { ... }
+  virtual void TearDown() { ... }
+
+  // Some expensive resource shared by all tests.
+  static T* shared_resource_;
+};
+
+T* FooTest::shared_resource_ = NULL;
+
+TEST_F(FooTest, Test1) {
+  ... you can refer to shared_resource here ...
+}
+TEST_F(FooTest, Test2) {
+  ... you can refer to shared_resource here ...
+}
+```
+
+_Availability:_ Linux, Windows, Mac.
+
+# Global Set-Up and Tear-Down #
+
+Just as you can do set-up and tear-down at the test level and the test case
+level, you can also do it at the test program level. Here's how.
+
+First, you subclass the `::testing::Environment` class to define a test
+environment, which knows how to set-up and tear-down:
+
+```
+class Environment {
+ public:
+  virtual ~Environment() {}
+  // Override this to define how to set up the environment.
+  virtual void SetUp() {}
+  // Override this to define how to tear down the environment.
+  virtual void TearDown() {}
+};
+```
+
+Then, you register an instance of your environment class with Google Test by
+calling the `::testing::AddGlobalTestEnvironment()` function:
+
+```
+Environment* AddGlobalTestEnvironment(Environment* env);
+```
+
+Now, when `RUN_ALL_TESTS()` is called, it first calls the `SetUp()` method of
+the environment object, then runs the tests if there was no fatal failures, and
+finally calls `TearDown()` of the environment object.
+
+It's OK to register multiple environment objects. In this case, their `SetUp()`
+will be called in the order they are registered, and their `TearDown()` will be
+called in the reverse order.
+
+Note that Google Test takes ownership of the registered environment objects.
+Therefore **do not delete them** by yourself.
+
+You should call `AddGlobalTestEnvironment()` before `RUN_ALL_TESTS()` is
+called, probably in `main()`. If you use `gtest_main`, you need to      call
+this before `main()` starts for it to take effect. One way to do this is to
+define a global variable like this:
+
+```
+::testing::Environment* const foo_env = ::testing::AddGlobalTestEnvironment(new FooEnvironment);
+```
+
+However, we strongly recommend you to write your own `main()` and call
+`AddGlobalTestEnvironment()` there, as relying on initialization of global
+variables makes the code harder to read and may cause problems when you
+register multiple environments from different translation units and the
+environments have dependencies among them (remember that the compiler doesn't
+guarantee the order in which global variables from different translation units
+are initialized).
+
+_Availability:_ Linux, Windows, Mac.
+
+
+# Value Parameterized Tests #
+
+_Value-parameterized tests_ allow you to test your code with different
+parameters without writing multiple copies of the same test.
+
+Suppose you write a test for your code and then realize that your code is affected by a presence of a Boolean command line flag.
+
+```
+TEST(MyCodeTest, TestFoo) {
+  // A code to test foo().
+}
+```
+
+Usually people factor their test code into a function with a Boolean parameter in such situations. The function sets the flag, then executes the testing code.
+
+```
+void TestFooHelper(bool flag_value) {
+  flag = flag_value;
+  // A code to test foo().
+}
+
+TEST(MyCodeTest, TestFoo) {
+  TestFooHelper(false);
+  TestFooHelper(true);
+}
+```
+
+But this setup has serious drawbacks. First, when a test assertion fails in your tests, it becomes unclear what value of the parameter caused it to fail. You can stream a clarifying message into your `EXPECT`/`ASSERT` statements, but it you'll have to do it with all of them. Second, you have to add one such helper function per test. What if you have ten tests? Twenty? A hundred?
+
+Value-parameterized tests will let you write your test only once and then easily instantiate and run it with an arbitrary number of parameter values.
+
+Here are some other situations when value-parameterized tests come handy:
+
+  * You want to test different implementations of an OO interface.
+  * You want to test your code over various inputs (a.k.a. data-driven testing). This feature is easy to abuse, so please exercise your good sense when doing it!
+
+## How to Write Value-Parameterized Tests ##
+
+To write value-parameterized tests, first you should define a fixture
+class.  It must be derived from both `::testing::Test` and
+`::testing::WithParamInterface<T>` (the latter is a pure interface),
+where `T` is the type of your parameter values.  For convenience, you
+can just derive the fixture class from `::testing::TestWithParam<T>`,
+which itself is derived from both `::testing::Test` and
+`::testing::WithParamInterface<T>`. `T` can be any copyable type. If
+it's a raw pointer, you are responsible for managing the lifespan of
+the pointed values.
+
+```
+class FooTest : public ::testing::TestWithParam<const char*> {
+  // You can implement all the usual fixture class members here.
+  // To access the test parameter, call GetParam() from class
+  // TestWithParam<T>.
+};
+
+// Or, when you want to add parameters to a pre-existing fixture class:
+class BaseTest : public ::testing::Test {
+  ...
+};
+class BarTest : public BaseTest,
+                public ::testing::WithParamInterface<const char*> {
+  ...
+};
+```
+
+Then, use the `TEST_P` macro to define as many test patterns using
+this fixture as you want.  The `_P` suffix is for "parameterized" or
+"pattern", whichever you prefer to think.
+
+```
+TEST_P(FooTest, DoesBlah) {
+  // Inside a test, access the test parameter with the GetParam() method
+  // of the TestWithParam<T> class:
+  EXPECT_TRUE(foo.Blah(GetParam()));
+  ...
+}
+
+TEST_P(FooTest, HasBlahBlah) {
+  ...
+}
+```
+
+Finally, you can use `INSTANTIATE_TEST_CASE_P` to instantiate the test
+case with any set of parameters you want. Google Test defines a number of
+functions for generating test parameters. They return what we call
+(surprise!) _parameter generators_. Here is a summary of them,
+which are all in the `testing` namespace:
+
+| `Range(begin, end[, step])` | Yields values `{begin, begin+step, begin+step+step, ...}`. The values do not include `end`. `step` defaults to 1. |
+|:----------------------------|:------------------------------------------------------------------------------------------------------------------|
+| `Values(v1, v2, ..., vN)`   | Yields values `{v1, v2, ..., vN}`.                                                                                |
+| `ValuesIn(container)` and `ValuesIn(begin, end)` | Yields values from a C-style array, an STL-style container, or an iterator range `[begin, end)`. `container`, `begin`, and `end` can be expressions whose values are determined at run time.  |
+| `Bool()`                    | Yields sequence `{false, true}`.                                                                                  |
+| `Combine(g1, g2, ..., gN)`  | Yields all combinations (the Cartesian product for the math savvy) of the values generated by the `N` generators. This is only available if your system provides the `<tr1/tuple>` header. If you are sure your system does, and Google Test disagrees, you can override it by defining `GTEST_HAS_TR1_TUPLE=1`. See comments in [include/gtest/internal/gtest-port.h](../include/gtest/internal/gtest-port.h) for more information. |
+
+For more details, see the comments at the definitions of these functions in the [source code](../include/gtest/gtest-param-test.h).
+
+The following statement will instantiate tests from the `FooTest` test case
+each with parameter values `"meeny"`, `"miny"`, and `"moe"`.
+
+```
+INSTANTIATE_TEST_CASE_P(InstantiationName,
+                        FooTest,
+                        ::testing::Values("meeny", "miny", "moe"));
+```
+
+To distinguish different instances of the pattern (yes, you can
+instantiate it more than once), the first argument to
+`INSTANTIATE_TEST_CASE_P` is a prefix that will be added to the actual
+test case name. Remember to pick unique prefixes for different
+instantiations. The tests from the instantiation above will have these
+names:
+
+  * `InstantiationName/FooTest.DoesBlah/0` for `"meeny"`
+  * `InstantiationName/FooTest.DoesBlah/1` for `"miny"`
+  * `InstantiationName/FooTest.DoesBlah/2` for `"moe"`
+  * `InstantiationName/FooTest.HasBlahBlah/0` for `"meeny"`
+  * `InstantiationName/FooTest.HasBlahBlah/1` for `"miny"`
+  * `InstantiationName/FooTest.HasBlahBlah/2` for `"moe"`
+
+You can use these names in [--gtest\_filter](#running-a-subset-of-the-tests).
+
+This statement will instantiate all tests from `FooTest` again, each
+with parameter values `"cat"` and `"dog"`:
+
+```
+const char* pets[] = {"cat", "dog"};
+INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest,
+                        ::testing::ValuesIn(pets));
+```
+
+The tests from the instantiation above will have these names:
+
+  * `AnotherInstantiationName/FooTest.DoesBlah/0` for `"cat"`
+  * `AnotherInstantiationName/FooTest.DoesBlah/1` for `"dog"`
+  * `AnotherInstantiationName/FooTest.HasBlahBlah/0` for `"cat"`
+  * `AnotherInstantiationName/FooTest.HasBlahBlah/1` for `"dog"`
+
+Please note that `INSTANTIATE_TEST_CASE_P` will instantiate _all_
+tests in the given test case, whether their definitions come before or
+_after_ the `INSTANTIATE_TEST_CASE_P` statement.
+
+You can see
+[these](../samples/sample7_unittest.cc)
+[files](../samples/sample8_unittest.cc) for more examples.
+
+_Availability_: Linux, Windows (requires MSVC 8.0 or above), Mac; since version 1.2.0.
+
+## Creating Value-Parameterized Abstract Tests ##
+
+In the above, we define and instantiate `FooTest` in the same source
+file. Sometimes you may want to define value-parameterized tests in a
+library and let other people instantiate them later. This pattern is
+known as <i>abstract tests</i>. As an example of its application, when you
+are designing an interface you can write a standard suite of abstract
+tests (perhaps using a factory function as the test parameter) that
+all implementations of the interface are expected to pass. When
+someone implements the interface, he can instantiate your suite to get
+all the interface-conformance tests for free.
+
+To define abstract tests, you should organize your code like this:
+
+  1. Put the definition of the parameterized test fixture class (e.g. `FooTest`) in a header file, say `foo_param_test.h`. Think of this as _declaring_ your abstract tests.
+  1. Put the `TEST_P` definitions in `foo_param_test.cc`, which includes `foo_param_test.h`. Think of this as _implementing_ your abstract tests.
+
+Once they are defined, you can instantiate them by including
+`foo_param_test.h`, invoking `INSTANTIATE_TEST_CASE_P()`, and linking
+with `foo_param_test.cc`. You can instantiate the same abstract test
+case multiple times, possibly in different source files.
+
+# Typed Tests #
+
+Suppose you have multiple implementations of the same interface and
+want to make sure that all of them satisfy some common requirements.
+Or, you may have defined several types that are supposed to conform to
+the same "concept" and you want to verify it.  In both cases, you want
+the same test logic repeated for different types.
+
+While you can write one `TEST` or `TEST_F` for each type you want to
+test (and you may even factor the test logic into a function template
+that you invoke from the `TEST`), it's tedious and doesn't scale:
+if you want _m_ tests over _n_ types, you'll end up writing _m\*n_
+`TEST`s.
+
+_Typed tests_ allow you to repeat the same test logic over a list of
+types.  You only need to write the test logic once, although you must
+know the type list when writing typed tests.  Here's how you do it:
+
+First, define a fixture class template.  It should be parameterized
+by a type.  Remember to derive it from `::testing::Test`:
+
+```
+template <typename T>
+class FooTest : public ::testing::Test {
+ public:
+  ...
+  typedef std::list<T> List;
+  static T shared_;
+  T value_;
+};
+```
+
+Next, associate a list of types with the test case, which will be
+repeated for each type in the list:
+
+```
+typedef ::testing::Types<char, int, unsigned int> MyTypes;
+TYPED_TEST_CASE(FooTest, MyTypes);
+```
+
+The `typedef` is necessary for the `TYPED_TEST_CASE` macro to parse
+correctly.  Otherwise the compiler will think that each comma in the
+type list introduces a new macro argument.
+
+Then, use `TYPED_TEST()` instead of `TEST_F()` to define a typed test
+for this test case.  You can repeat this as many times as you want:
+
+```
+TYPED_TEST(FooTest, DoesBlah) {
+  // Inside a test, refer to the special name TypeParam to get the type
+  // parameter.  Since we are inside a derived class template, C++ requires
+  // us to visit the members of FooTest via 'this'.
+  TypeParam n = this->value_;
+
+  // To visit static members of the fixture, add the 'TestFixture::'
+  // prefix.
+  n += TestFixture::shared_;
+
+  // To refer to typedefs in the fixture, add the 'typename TestFixture::'
+  // prefix.  The 'typename' is required to satisfy the compiler.
+  typename TestFixture::List values;
+  values.push_back(n);
+  ...
+}
+
+TYPED_TEST(FooTest, HasPropertyA) { ... }
+```
+
+You can see `samples/sample6_unittest.cc` for a complete example.
+
+_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac;
+since version 1.1.0.
+
+# Type-Parameterized Tests #
+
+_Type-parameterized tests_ are like typed tests, except that they
+don't require you to know the list of types ahead of time.  Instead,
+you can define the test logic first and instantiate it with different
+type lists later.  You can even instantiate it more than once in the
+same program.
+
+If you are designing an interface or concept, you can define a suite
+of type-parameterized tests to verify properties that any valid
+implementation of the interface/concept should have.  Then, the author
+of each implementation can just instantiate the test suite with his
+type to verify that it conforms to the requirements, without having to
+write similar tests repeatedly.  Here's an example:
+
+First, define a fixture class template, as we did with typed tests:
+
+```
+template <typename T>
+class FooTest : public ::testing::Test {
+  ...
+};
+```
+
+Next, declare that you will define a type-parameterized test case:
+
+```
+TYPED_TEST_CASE_P(FooTest);
+```
+
+The `_P` suffix is for "parameterized" or "pattern", whichever you
+prefer to think.
+
+Then, use `TYPED_TEST_P()` to define a type-parameterized test.  You
+can repeat this as many times as you want:
+
+```
+TYPED_TEST_P(FooTest, DoesBlah) {
+  // Inside a test, refer to TypeParam to get the type parameter.
+  TypeParam n = 0;
+  ...
+}
+
+TYPED_TEST_P(FooTest, HasPropertyA) { ... }
+```
+
+Now the tricky part: you need to register all test patterns using the
+`REGISTER_TYPED_TEST_CASE_P` macro before you can instantiate them.
+The first argument of the macro is the test case name; the rest are
+the names of the tests in this test case:
+
+```
+REGISTER_TYPED_TEST_CASE_P(FooTest,
+                           DoesBlah, HasPropertyA);
+```
+
+Finally, you are free to instantiate the pattern with the types you
+want.  If you put the above code in a header file, you can `#include`
+it in multiple C++ source files and instantiate it multiple times.
+
+```
+typedef ::testing::Types<char, int, unsigned int> MyTypes;
+INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
+```
+
+To distinguish different instances of the pattern, the first argument
+to the `INSTANTIATE_TYPED_TEST_CASE_P` macro is a prefix that will be
+added to the actual test case name.  Remember to pick unique prefixes
+for different instances.
+
+In the special case where the type list contains only one type, you
+can write that type directly without `::testing::Types<...>`, like this:
+
+```
+INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int);
+```
+
+You can see `samples/sample6_unittest.cc` for a complete example.
+
+_Availability:_ Linux, Windows (requires MSVC 8.0 or above), Mac;
+since version 1.1.0.
+
+# Testing Private Code #
+
+If you change your software's internal implementation, your tests should not
+break as long as the change is not observable by users. Therefore, per the
+_black-box testing principle_, most of the time you should test your code
+through its public interfaces.
+
+If you still find yourself needing to test internal implementation code,
+consider if there's a better design that wouldn't require you to do so. If you
+absolutely have to test non-public interface code though, you can. There are
+two cases to consider:
+
+  * Static functions (_not_ the same as static member functions!) or unnamed namespaces, and
+  * Private or protected class members
+
+## Static Functions ##
+
+Both static functions and definitions/declarations in an unnamed namespace are
+only visible within the same translation unit. To test them, you can `#include`
+the entire `.cc` file being tested in your `*_test.cc` file. (`#include`ing `.cc`
+files is not a good way to reuse code - you should not do this in production
+code!)
+
+However, a better approach is to move the private code into the
+`foo::internal` namespace, where `foo` is the namespace your project normally
+uses, and put the private declarations in a `*-internal.h` file. Your
+production `.cc` files and your tests are allowed to include this internal
+header, but your clients are not. This way, you can fully test your internal
+implementation without leaking it to your clients.
+
+## Private Class Members ##
+
+Private class members are only accessible from within the class or by friends.
+To access a class' private members, you can declare your test fixture as a
+friend to the class and define accessors in your fixture. Tests using the
+fixture can then access the private members of your production class via the
+accessors in the fixture. Note that even though your fixture is a friend to
+your production class, your tests are not automatically friends to it, as they
+are technically defined in sub-classes of the fixture.
+
+Another way to test private members is to refactor them into an implementation
+class, which is then declared in a `*-internal.h` file. Your clients aren't
+allowed to include this header but your tests can. Such is called the Pimpl
+(Private Implementation) idiom.
+
+Or, you can declare an individual test as a friend of your class by adding this
+line in the class body:
+
+```
+FRIEND_TEST(TestCaseName, TestName);
+```
+
+For example,
+```
+// foo.h
+#include "gtest/gtest_prod.h"
+
+// Defines FRIEND_TEST.
+class Foo {
+  ...
+ private:
+  FRIEND_TEST(FooTest, BarReturnsZeroOnNull);
+  int Bar(void* x);
+};
+
+// foo_test.cc
+...
+TEST(FooTest, BarReturnsZeroOnNull) {
+  Foo foo;
+  EXPECT_EQ(0, foo.Bar(NULL));
+  // Uses Foo's private member Bar().
+}
+```
+
+Pay special attention when your class is defined in a namespace, as you should
+define your test fixtures and tests in the same namespace if you want them to
+be friends of your class. For example, if the code to be tested looks like:
+
+```
+namespace my_namespace {
+
+class Foo {
+  friend class FooTest;
+  FRIEND_TEST(FooTest, Bar);
+  FRIEND_TEST(FooTest, Baz);
+  ...
+  definition of the class Foo
+  ...
+};
+
+}  // namespace my_namespace
+```
+
+Your test code should be something like:
+
+```
+namespace my_namespace {
+class FooTest : public ::testing::Test {
+ protected:
+  ...
+};
+
+TEST_F(FooTest, Bar) { ... }
+TEST_F(FooTest, Baz) { ... }
+
+}  // namespace my_namespace
+```
+
+# Catching Failures #
+
+If you are building a testing utility on top of Google Test, you'll
+want to test your utility.  What framework would you use to test it?
+Google Test, of course.
+
+The challenge is to verify that your testing utility reports failures
+correctly.  In frameworks that report a failure by throwing an
+exception, you could catch the exception and assert on it.  But Google
+Test doesn't use exceptions, so how do we test that a piece of code
+generates an expected failure?
+
+`"gtest/gtest-spi.h"` contains some constructs to do this.  After
+`#include`ing this header, you can use
+
+| `EXPECT_FATAL_FAILURE(`_statement, substring_`);` |
+|:--------------------------------------------------|
+
+to assert that _statement_ generates a fatal (e.g. `ASSERT_*`) failure
+whose message contains the given _substring_, or use
+
+| `EXPECT_NONFATAL_FAILURE(`_statement, substring_`);` |
+|:-----------------------------------------------------|
+
+if you are expecting a non-fatal (e.g. `EXPECT_*`) failure.
+
+For technical reasons, there are some caveats:
+
+  1. You cannot stream a failure message to either macro.
+  1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot reference local non-static variables or non-static members of `this` object.
+  1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot return a value.
+
+_Note:_ Google Test is designed with threads in mind.  Once the
+synchronization primitives in `"gtest/internal/gtest-port.h"` have
+been implemented, Google Test will become thread-safe, meaning that
+you can then use assertions in multiple threads concurrently.  Before
+
+that, however, Google Test only supports single-threaded usage.  Once
+thread-safe, `EXPECT_FATAL_FAILURE()` and `EXPECT_NONFATAL_FAILURE()`
+will capture failures in the current thread only. If _statement_
+creates new threads, failures in these threads will be ignored.  If
+you want to capture failures from all threads instead, you should use
+the following macros:
+
+| `EXPECT_FATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` |
+|:-----------------------------------------------------------------|
+| `EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(`_statement, substring_`);` |
+
+# Getting the Current Test's Name #
+
+Sometimes a function may need to know the name of the currently running test.
+For example, you may be using the `SetUp()` method of your test fixture to set
+the golden file name based on which test is running. The `::testing::TestInfo`
+class has this information:
+
+```
+namespace testing {
+
+class TestInfo {
+ public:
+  // Returns the test case name and the test name, respectively.
+  //
+  // Do NOT delete or free the return value - it's managed by the
+  // TestInfo class.
+  const char* test_case_name() const;
+  const char* name() const;
+};
+
+}  // namespace testing
+```
+
+
+> To obtain a `TestInfo` object for the currently running test, call
+`current_test_info()` on the `UnitTest` singleton object:
+
+```
+// Gets information about the currently running test.
+// Do NOT delete the returned object - it's managed by the UnitTest class.
+const ::testing::TestInfo* const test_info =
+  ::testing::UnitTest::GetInstance()->current_test_info();
+printf("We are in test %s of test case %s.\n",
+       test_info->name(), test_info->test_case_name());
+```
+
+`current_test_info()` returns a null pointer if no test is running. In
+particular, you cannot find the test case name in `TestCaseSetUp()`,
+`TestCaseTearDown()` (where you know the test case name implicitly), or
+functions called from them.
+
+_Availability:_ Linux, Windows, Mac.
+
+# Extending Google Test by Handling Test Events #
+
+Google Test provides an <b>event listener API</b> to let you receive
+notifications about the progress of a test program and test
+failures. The events you can listen to include the start and end of
+the test program, a test case, or a test method, among others. You may
+use this API to augment or replace the standard console output,
+replace the XML output, or provide a completely different form of
+output, such as a GUI or a database. You can also use test events as
+checkpoints to implement a resource leak checker, for example.
+
+_Availability:_ Linux, Windows, Mac; since v1.4.0.
+
+## Defining Event Listeners ##
+
+To define a event listener, you subclass either
+[testing::TestEventListener](../include/gtest/gtest.h#L855)
+or [testing::EmptyTestEventListener](../include/gtest/gtest.h#L905).
+The former is an (abstract) interface, where <i>each pure virtual method<br>
+can be overridden to handle a test event</i> (For example, when a test
+starts, the `OnTestStart()` method will be called.). The latter provides
+an empty implementation of all methods in the interface, such that a
+subclass only needs to override the methods it cares about.
+
+When an event is fired, its context is passed to the handler function
+as an argument. The following argument types are used:
+  * [UnitTest](../include/gtest/gtest.h#L1007) reflects the state of the entire test program,
+  * [TestCase](../include/gtest/gtest.h#L689) has information about a test case, which can contain one or more tests,
+  * [TestInfo](../include/gtest/gtest.h#L599) contains the state of a test, and
+  * [TestPartResult](../include/gtest/gtest-test-part.h#L42) represents the result of a test assertion.
+
+An event handler function can examine the argument it receives to find
+out interesting information about the event and the test program's
+state.  Here's an example:
+
+```
+  class MinimalistPrinter : public ::testing::EmptyTestEventListener {
+    // Called before a test starts.
+    virtual void OnTestStart(const ::testing::TestInfo& test_info) {
+      printf("*** Test %s.%s starting.\n",
+             test_info.test_case_name(), test_info.name());
+    }
+
+    // Called after a failed assertion or a SUCCEED() invocation.
+    virtual void OnTestPartResult(
+        const ::testing::TestPartResult& test_part_result) {
+      printf("%s in %s:%d\n%s\n",
+             test_part_result.failed() ? "*** Failure" : "Success",
+             test_part_result.file_name(),
+             test_part_result.line_number(),
+             test_part_result.summary());
+    }
+
+    // Called after a test ends.
+    virtual void OnTestEnd(const ::testing::TestInfo& test_info) {
+      printf("*** Test %s.%s ending.\n",
+             test_info.test_case_name(), test_info.name());
+    }
+  };
+```
+
+## Using Event Listeners ##
+
+To use the event listener you have defined, add an instance of it to
+the Google Test event listener list (represented by class
+[TestEventListeners](../include/gtest/gtest.h#L929)
+- note the "s" at the end of the name) in your
+`main()` function, before calling `RUN_ALL_TESTS()`:
+```
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  // Gets hold of the event listener list.
+  ::testing::TestEventListeners& listeners =
+      ::testing::UnitTest::GetInstance()->listeners();
+  // Adds a listener to the end.  Google Test takes the ownership.
+  listeners.Append(new MinimalistPrinter);
+  return RUN_ALL_TESTS();
+}
+```
+
+There's only one problem: the default test result printer is still in
+effect, so its output will mingle with the output from your minimalist
+printer. To suppress the default printer, just release it from the
+event listener list and delete it. You can do so by adding one line:
+```
+  ...
+  delete listeners.Release(listeners.default_result_printer());
+  listeners.Append(new MinimalistPrinter);
+  return RUN_ALL_TESTS();
+```
+
+Now, sit back and enjoy a completely different output from your
+tests. For more details, you can read this
+[sample](../samples/sample9_unittest.cc).
+
+You may append more than one listener to the list. When an `On*Start()`
+or `OnTestPartResult()` event is fired, the listeners will receive it in
+the order they appear in the list (since new listeners are added to
+the end of the list, the default text printer and the default XML
+generator will receive the event first). An `On*End()` event will be
+received by the listeners in the _reverse_ order. This allows output by
+listeners added later to be framed by output from listeners added
+earlier.
+
+## Generating Failures in Listeners ##
+
+You may use failure-raising macros (`EXPECT_*()`, `ASSERT_*()`,
+`FAIL()`, etc) when processing an event. There are some restrictions:
+
+  1. You cannot generate any failure in `OnTestPartResult()` (otherwise it will cause `OnTestPartResult()` to be called recursively).
+  1. A listener that handles `OnTestPartResult()` is not allowed to generate any failure.
+
+When you add listeners to the listener list, you should put listeners
+that handle `OnTestPartResult()` _before_ listeners that can generate
+failures. This ensures that failures generated by the latter are
+attributed to the right test by the former.
+
+We have a sample of failure-raising listener
+[here](../samples/sample10_unittest.cc).
+
+# Running Test Programs: Advanced Options #
+
+Google Test test programs are ordinary executables. Once built, you can run
+them directly and affect their behavior via the following environment variables
+and/or command line flags. For the flags to work, your programs must call
+`::testing::InitGoogleTest()` before calling `RUN_ALL_TESTS()`.
+
+To see a list of supported flags and their usage, please run your test
+program with the `--help` flag.  You can also use `-h`, `-?`, or `/?`
+for short.  This feature is added in version 1.3.0.
+
+If an option is specified both by an environment variable and by a
+flag, the latter takes precedence.  Most of the options can also be
+set/read in code: to access the value of command line flag
+`--gtest_foo`, write `::testing::GTEST_FLAG(foo)`.  A common pattern is
+to set the value of a flag before calling `::testing::InitGoogleTest()`
+to change the default value of the flag:
+```
+int main(int argc, char** argv) {
+  // Disables elapsed time by default.
+  ::testing::GTEST_FLAG(print_time) = false;
+
+  // This allows the user to override the flag on the command line.
+  ::testing::InitGoogleTest(&argc, argv);
+
+  return RUN_ALL_TESTS();
+}
+```
+
+## Selecting Tests ##
+
+This section shows various options for choosing which tests to run.
+
+### Listing Test Names ###
+
+Sometimes it is necessary to list the available tests in a program before
+running them so that a filter may be applied if needed. Including the flag
+`--gtest_list_tests` overrides all other flags and lists tests in the following
+format:
+```
+TestCase1.
+  TestName1
+  TestName2
+TestCase2.
+  TestName
+```
+
+None of the tests listed are actually run if the flag is provided. There is no
+corresponding environment variable for this flag.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Running a Subset of the Tests ###
+
+By default, a Google Test program runs all tests the user has defined.
+Sometimes, you want to run only a subset of the tests (e.g. for debugging or
+quickly verifying a change). If you set the `GTEST_FILTER` environment variable
+or the `--gtest_filter` flag to a filter string, Google Test will only run the
+tests whose full names (in the form of `TestCaseName.TestName`) match the
+filter.
+
+The format of a filter is a '`:`'-separated list of wildcard patterns (called
+the positive patterns) optionally followed by a '`-`' and another
+'`:`'-separated pattern list (called the negative patterns). A test matches the
+filter if and only if it matches any of the positive patterns but does not
+match any of the negative patterns.
+
+A pattern may contain `'*'` (matches any string) or `'?'` (matches any single
+character). For convenience, the filter `'*-NegativePatterns'` can be also
+written as `'-NegativePatterns'`.
+
+For example:
+
+  * `./foo_test` Has no flag, and thus runs all its tests.
+  * `./foo_test --gtest_filter=*` Also runs everything, due to the single match-everything `*` value.
+  * `./foo_test --gtest_filter=FooTest.*` Runs everything in test case `FooTest`.
+  * `./foo_test --gtest_filter=*Null*:*Constructor*` Runs any test whose full name contains either `"Null"` or `"Constructor"`.
+  * `./foo_test --gtest_filter=-*DeathTest.*` Runs all non-death tests.
+  * `./foo_test --gtest_filter=FooTest.*-FooTest.Bar` Runs everything in test case `FooTest` except `FooTest.Bar`.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Temporarily Disabling Tests ###
+
+If you have a broken test that you cannot fix right away, you can add the
+`DISABLED_` prefix to its name. This will exclude it from execution. This is
+better than commenting out the code or using `#if 0`, as disabled tests are
+still compiled (and thus won't rot).
+
+If you need to disable all tests in a test case, you can either add `DISABLED_`
+to the front of the name of each test, or alternatively add it to the front of
+the test case name.
+
+For example, the following tests won't be run by Google Test, even though they
+will still be compiled:
+
+```
+// Tests that Foo does Abc.
+TEST(FooTest, DISABLED_DoesAbc) { ... }
+
+class DISABLED_BarTest : public ::testing::Test { ... };
+
+// Tests that Bar does Xyz.
+TEST_F(DISABLED_BarTest, DoesXyz) { ... }
+```
+
+_Note:_ This feature should only be used for temporary pain-relief. You still
+have to fix the disabled tests at a later date. As a reminder, Google Test will
+print a banner warning you if a test program contains any disabled tests.
+
+_Tip:_ You can easily count the number of disabled tests you have
+using `grep`. This number can be used as a metric for improving your
+test quality.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Temporarily Enabling Disabled Tests ###
+
+To include [disabled tests](#temporarily-disabling-tests) in test
+execution, just invoke the test program with the
+`--gtest_also_run_disabled_tests` flag or set the
+`GTEST_ALSO_RUN_DISABLED_TESTS` environment variable to a value other
+than `0`.  You can combine this with the
+[--gtest\_filter](#running-a-subset-of-the-tests) flag to further select
+which disabled tests to run.
+
+_Availability:_ Linux, Windows, Mac; since version 1.3.0.
+
+## Repeating the Tests ##
+
+Once in a while you'll run into a test whose result is hit-or-miss. Perhaps it
+will fail only 1% of the time, making it rather hard to reproduce the bug under
+a debugger. This can be a major source of frustration.
+
+The `--gtest_repeat` flag allows you to repeat all (or selected) test methods
+in a program many times. Hopefully, a flaky test will eventually fail and give
+you a chance to debug. Here's how to use it:
+
+| `$ foo_test --gtest_repeat=1000` | Repeat foo\_test 1000 times and don't stop at failures. |
+|:---------------------------------|:--------------------------------------------------------|
+| `$ foo_test --gtest_repeat=-1`   | A negative count means repeating forever.               |
+| `$ foo_test --gtest_repeat=1000 --gtest_break_on_failure` | Repeat foo\_test 1000 times, stopping at the first failure. This is especially useful when running under a debugger: when the testfails, it will drop into the debugger and you can then inspect variables and stacks. |
+| `$ foo_test --gtest_repeat=1000 --gtest_filter=FooBar` | Repeat the tests whose name matches the filter 1000 times. |
+
+If your test program contains global set-up/tear-down code registered
+using `AddGlobalTestEnvironment()`, it will be repeated in each
+iteration as well, as the flakiness may be in it. You can also specify
+the repeat count by setting the `GTEST_REPEAT` environment variable.
+
+_Availability:_ Linux, Windows, Mac.
+
+## Shuffling the Tests ##
+
+You can specify the `--gtest_shuffle` flag (or set the `GTEST_SHUFFLE`
+environment variable to `1`) to run the tests in a program in a random
+order. This helps to reveal bad dependencies between tests.
+
+By default, Google Test uses a random seed calculated from the current
+time. Therefore you'll get a different order every time. The console
+output includes the random seed value, such that you can reproduce an
+order-related test failure later. To specify the random seed
+explicitly, use the `--gtest_random_seed=SEED` flag (or set the
+`GTEST_RANDOM_SEED` environment variable), where `SEED` is an integer
+between 0 and 99999. The seed value 0 is special: it tells Google Test
+to do the default behavior of calculating the seed from the current
+time.
+
+If you combine this with `--gtest_repeat=N`, Google Test will pick a
+different random seed and re-shuffle the tests in each iteration.
+
+_Availability:_ Linux, Windows, Mac; since v1.4.0.
+
+## Controlling Test Output ##
+
+This section teaches how to tweak the way test results are reported.
+
+### Colored Terminal Output ###
+
+Google Test can use colors in its terminal output to make it easier to spot
+the separation between tests, and whether tests passed.
+
+You can set the GTEST\_COLOR environment variable or set the `--gtest_color`
+command line flag to `yes`, `no`, or `auto` (the default) to enable colors,
+disable colors, or let Google Test decide. When the value is `auto`, Google
+Test will use colors if and only if the output goes to a terminal and (on
+non-Windows platforms) the `TERM` environment variable is set to `xterm` or
+`xterm-color`.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Suppressing the Elapsed Time ###
+
+By default, Google Test prints the time it takes to run each test.  To
+suppress that, run the test program with the `--gtest_print_time=0`
+command line flag.  Setting the `GTEST_PRINT_TIME` environment
+variable to `0` has the same effect.
+
+_Availability:_ Linux, Windows, Mac.  (In Google Test 1.3.0 and lower,
+the default behavior is that the elapsed time is **not** printed.)
+
+### Generating an XML Report ###
+
+Google Test can emit a detailed XML report to a file in addition to its normal
+textual output. The report contains the duration of each test, and thus can
+help you identify slow tests.
+
+To generate the XML report, set the `GTEST_OUTPUT` environment variable or the
+`--gtest_output` flag to the string `"xml:_path_to_output_file_"`, which will
+create the file at the given location. You can also just use the string
+`"xml"`, in which case the output can be found in the `test_detail.xml` file in
+the current directory.
+
+If you specify a directory (for example, `"xml:output/directory/"` on Linux or
+`"xml:output\directory\"` on Windows), Google Test will create the XML file in
+that directory, named after the test executable (e.g. `foo_test.xml` for test
+program `foo_test` or `foo_test.exe`). If the file already exists (perhaps left
+over from a previous run), Google Test will pick a different name (e.g.
+`foo_test_1.xml`) to avoid overwriting it.
+
+The report uses the format described here.  It is based on the
+`junitreport` Ant task and can be parsed by popular continuous build
+systems like [Jenkins](http://jenkins-ci.org/). Since that format
+was originally intended for Java, a little interpretation is required
+to make it apply to Google Test tests, as shown here:
+
+```
+<testsuites name="AllTests" ...>
+  <testsuite name="test_case_name" ...>
+    <testcase name="test_name" ...>
+      <failure message="..."/>
+      <failure message="..."/>
+      <failure message="..."/>
+    </testcase>
+  </testsuite>
+</testsuites>
+```
+
+  * The root `<testsuites>` element corresponds to the entire test program.
+  * `<testsuite>` elements correspond to Google Test test cases.
+  * `<testcase>` elements correspond to Google Test test functions.
+
+For instance, the following program
+
+```
+TEST(MathTest, Addition) { ... }
+TEST(MathTest, Subtraction) { ... }
+TEST(LogicTest, NonContradiction) { ... }
+```
+
+could generate this report:
+
+```
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="3" failures="1" errors="0" time="35" name="AllTests">
+  <testsuite name="MathTest" tests="2" failures="1" errors="0" time="15">
+    <testcase name="Addition" status="run" time="7" classname="">
+      <failure message="Value of: add(1, 1)&#x0A; Actual: 3&#x0A;Expected: 2" type=""/>
+      <failure message="Value of: add(1, -1)&#x0A; Actual: 1&#x0A;Expected: 0" type=""/>
+    </testcase>
+    <testcase name="Subtraction" status="run" time="5" classname="">
+    </testcase>
+  </testsuite>
+  <testsuite name="LogicTest" tests="1" failures="0" errors="0" time="5">
+    <testcase name="NonContradiction" status="run" time="5" classname="">
+    </testcase>
+  </testsuite>
+</testsuites>
+```
+
+Things to note:
+
+  * The `tests` attribute of a `<testsuites>` or `<testsuite>` element tells how many test functions the Google Test program or test case contains, while the `failures` attribute tells how many of them failed.
+  * The `time` attribute expresses the duration of the test, test case, or entire test program in milliseconds.
+  * Each `<failure>` element corresponds to a single failed Google Test assertion.
+  * Some JUnit concepts don't apply to Google Test, yet we have to conform to the DTD. Therefore you'll see some dummy elements and attributes in the report. You can safely ignore these parts.
+
+_Availability:_ Linux, Windows, Mac.
+
+## Controlling How Failures Are Reported ##
+
+### Turning Assertion Failures into Break-Points ###
+
+When running test programs under a debugger, it's very convenient if the
+debugger can catch an assertion failure and automatically drop into interactive
+mode. Google Test's _break-on-failure_ mode supports this behavior.
+
+To enable it, set the `GTEST_BREAK_ON_FAILURE` environment variable to a value
+other than `0` . Alternatively, you can use the `--gtest_break_on_failure`
+command line flag.
+
+_Availability:_ Linux, Windows, Mac.
+
+### Disabling Catching Test-Thrown Exceptions ###
+
+Google Test can be used either with or without exceptions enabled.  If
+a test throws a C++ exception or (on Windows) a structured exception
+(SEH), by default Google Test catches it, reports it as a test
+failure, and continues with the next test method.  This maximizes the
+coverage of a test run.  Also, on Windows an uncaught exception will
+cause a pop-up window, so catching the exceptions allows you to run
+the tests automatically.
+
+When debugging the test failures, however, you may instead want the
+exceptions to be handled by the debugger, such that you can examine
+the call stack when an exception is thrown.  To achieve that, set the
+`GTEST_CATCH_EXCEPTIONS` environment variable to `0`, or use the
+`--gtest_catch_exceptions=0` flag when running the tests.
+
+**Availability**: Linux, Windows, Mac.
+
+### Letting Another Testing Framework Drive ###
+
+If you work on a project that has already been using another testing
+framework and is not ready to completely switch to Google Test yet,
+you can get much of Google Test's benefit by using its assertions in
+your existing tests.  Just change your `main()` function to look
+like:
+
+```
+#include "gtest/gtest.h"
+
+int main(int argc, char** argv) {
+  ::testing::GTEST_FLAG(throw_on_failure) = true;
+  // Important: Google Test must be initialized.
+  ::testing::InitGoogleTest(&argc, argv);
+
+  ... whatever your existing testing framework requires ...
+}
+```
+
+With that, you can use Google Test assertions in addition to the
+native assertions your testing framework provides, for example:
+
+```
+void TestFooDoesBar() {
+  Foo foo;
+  EXPECT_LE(foo.Bar(1), 100);     // A Google Test assertion.
+  CPPUNIT_ASSERT(foo.IsEmpty());  // A native assertion.
+}
+```
+
+If a Google Test assertion fails, it will print an error message and
+throw an exception, which will be treated as a failure by your host
+testing framework.  If you compile your code with exceptions disabled,
+a failed Google Test assertion will instead exit your program with a
+non-zero code, which will also signal a test failure to your test
+runner.
+
+If you don't write `::testing::GTEST_FLAG(throw_on_failure) = true;` in
+your `main()`, you can alternatively enable this feature by specifying
+the `--gtest_throw_on_failure` flag on the command-line or setting the
+`GTEST_THROW_ON_FAILURE` environment variable to a non-zero value.
+
+Death tests are _not_ supported when other test framework is used to organize tests.
+
+_Availability:_ Linux, Windows, Mac; since v1.3.0.
+
+## Distributing Test Functions to Multiple Machines ##
+
+If you have more than one machine you can use to run a test program,
+you might want to run the test functions in parallel and get the
+result faster.  We call this technique _sharding_, where each machine
+is called a _shard_.
+
+Google Test is compatible with test sharding.  To take advantage of
+this feature, your test runner (not part of Google Test) needs to do
+the following:
+
+  1. Allocate a number of machines (shards) to run the tests.
+  1. On each shard, set the `GTEST_TOTAL_SHARDS` environment variable to the total number of shards.  It must be the same for all shards.
+  1. On each shard, set the `GTEST_SHARD_INDEX` environment variable to the index of the shard.  Different shards must be assigned different indices, which must be in the range `[0, GTEST_TOTAL_SHARDS - 1]`.
+  1. Run the same test program on all shards.  When Google Test sees the above two environment variables, it will select a subset of the test functions to run.  Across all shards, each test function in the program will be run exactly once.
+  1. Wait for all shards to finish, then collect and report the results.
+
+Your project may have tests that were written without Google Test and
+thus don't understand this protocol.  In order for your test runner to
+figure out which test supports sharding, it can set the environment
+variable `GTEST_SHARD_STATUS_FILE` to a non-existent file path.  If a
+test program supports sharding, it will create this file to
+acknowledge the fact (the actual contents of the file are not
+important at this time; although we may stick some useful information
+in it in the future.); otherwise it will not create it.
+
+Here's an example to make it clear.  Suppose you have a test program
+`foo_test` that contains the following 5 test functions:
+```
+TEST(A, V)
+TEST(A, W)
+TEST(B, X)
+TEST(B, Y)
+TEST(B, Z)
+```
+and you have 3 machines at your disposal.  To run the test functions in
+parallel, you would set `GTEST_TOTAL_SHARDS` to 3 on all machines, and
+set `GTEST_SHARD_INDEX` to 0, 1, and 2 on the machines respectively.
+Then you would run the same `foo_test` on each machine.
+
+Google Test reserves the right to change how the work is distributed
+across the shards, but here's one possible scenario:
+
+  * Machine #0 runs `A.V` and `B.X`.
+  * Machine #1 runs `A.W` and `B.Y`.
+  * Machine #2 runs `B.Z`.
+
+_Availability:_ Linux, Windows, Mac; since version 1.3.0.
+
+# Fusing Google Test Source Files #
+
+Google Test's implementation consists of ~30 files (excluding its own
+tests).  Sometimes you may want them to be packaged up in two files (a
+`.h` and a `.cc`) instead, such that you can easily copy them to a new
+machine and start hacking there.  For this we provide an experimental
+Python script `fuse_gtest_files.py` in the `scripts/` directory (since release 1.3.0).
+Assuming you have Python 2.4 or above installed on your machine, just
+go to that directory and run
+```
+python fuse_gtest_files.py OUTPUT_DIR
+```
+
+and you should see an `OUTPUT_DIR` directory being created with files
+`gtest/gtest.h` and `gtest/gtest-all.cc` in it.  These files contain
+everything you need to use Google Test.  Just copy them to anywhere
+you want and you are ready to write tests.  You can use the
+[scripts/test/Makefile](../scripts/test/Makefile)
+file as an example on how to compile your tests against them.
+
+# Where to Go from Here #
+
+Congratulations! You've now learned more advanced Google Test tools and are
+ready to tackle more complex testing tasks. If you want to dive even deeper, you
+can read the [Frequently-Asked Questions](V1_7_FAQ.md).
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_Documentation.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_Documentation.md
new file mode 100644
index 0000000000..282697a50b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_Documentation.md
@@ -0,0 +1,14 @@
+This page lists all documentation wiki pages for Google Test **(the SVN trunk version)**
+-- **if you use a released version of Google Test, please read the
+documentation for that specific version instead.**
+
+  * [Primer](V1_7_Primer.md) -- start here if you are new to Google Test.
+  * [Samples](V1_7_Samples.md) -- learn from examples.
+  * [AdvancedGuide](V1_7_AdvancedGuide.md) -- learn more about Google Test.
+  * [XcodeGuide](V1_7_XcodeGuide.md) -- how to use Google Test in Xcode on Mac.
+  * [Frequently-Asked Questions](V1_7_FAQ.md) -- check here before asking a question on the mailing list.
+
+To contribute code to Google Test, read:
+
+  * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
+  * [PumpManual](V1_7_PumpManual.md) -- how we generate some of Google Test's source files.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_FAQ.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_FAQ.md
new file mode 100644
index 0000000000..3dd914dcf1
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_FAQ.md
@@ -0,0 +1,1082 @@
+
+
+If you cannot find the answer to your question here, and you have read
+[Primer](V1_7_Primer.md) and [AdvancedGuide](V1_7_AdvancedGuide.md), send it to
+googletestframework@googlegroups.com.
+
+## Why should I use Google Test instead of my favorite C++ testing framework? ##
+
+First, let us say clearly that we don't want to get into the debate of
+which C++ testing framework is **the best**.  There exist many fine
+frameworks for writing C++ tests, and we have tremendous respect for
+the developers and users of them.  We don't think there is (or will
+be) a single best framework - you have to pick the right tool for the
+particular task you are tackling.
+
+We created Google Test because we couldn't find the right combination
+of features and conveniences in an existing framework to satisfy _our_
+needs.  The following is a list of things that _we_ like about Google
+Test.  We don't claim them to be unique to Google Test - rather, the
+combination of them makes Google Test the choice for us.  We hope this
+list can help you decide whether it is for you too.
+
+  * Google Test is designed to be portable: it doesn't require exceptions or RTTI; it works around various bugs in various compilers and environments; etc.  As a result, it works on Linux, Mac OS X, Windows and several embedded operating systems.
+  * Nonfatal assertions (`EXPECT_*`) have proven to be great time savers, as they allow a test to report multiple failures in a single edit-compile-test cycle.
+  * It's easy to write assertions that generate informative messages: you just use the stream syntax to append any additional information, e.g. `ASSERT_EQ(5, Foo(i)) << " where i = " << i;`.  It doesn't require a new set of macros or special functions.
+  * Google Test automatically detects your tests and doesn't require you to enumerate them in order to run them.
+  * Death tests are pretty handy for ensuring that your asserts in production code are triggered by the right conditions.
+  * `SCOPED_TRACE` helps you understand the context of an assertion failure when it comes from inside a sub-routine or loop.
+  * You can decide which tests to run using name patterns.  This saves time when you want to quickly reproduce a test failure.
+  * Google Test can generate XML test result reports that can be parsed by popular continuous build system like Hudson.
+  * Simple things are easy in Google Test, while hard things are possible: in addition to advanced features like [global test environments](V1_7_AdvancedGuide.md#global-set-up-and-tear-down) and tests parameterized by [values](V1_7_AdvancedGuide.md#value-parameterized-tests) or [types](V1_7_AdvancedGuide.md#typed-tests), Google Test supports various ways for the user to extend the framework -- if Google Test doesn't do something out of the box, chances are that a user can implement the feature using Google Test's public API, without changing Google Test itself.  In particular, you can:
+    * expand your testing vocabulary by defining [custom predicates](V1_7_AdvancedGuide.md#predicate-assertions-for-better-error-messages),
+    * teach Google Test how to [print your types](V1_7_AdvancedGuide.md#teaching-google-test-how-to-print-your-values),
+    * define your own testing macros or utilities and verify them using Google Test's [Service Provider Interface](V1_7_AdvancedGuide.md#catching-failures), and
+    * reflect on the test cases or change the test output format by intercepting the [test events](V1_7_AdvancedGuide.md#extending-google-test-by-handling-test-events).
+
+## I'm getting warnings when compiling Google Test.  Would you fix them? ##
+
+We strive to minimize compiler warnings Google Test generates.  Before releasing a new version, we test to make sure that it doesn't generate warnings when compiled using its CMake script on Windows, Linux, and Mac OS.
+
+Unfortunately, this doesn't mean you are guaranteed to see no warnings when compiling Google Test in your environment:
+
+  * You may be using a different compiler as we use, or a different version of the same compiler.  We cannot possibly test for all compilers.
+  * You may be compiling on a different platform as we do.
+  * Your project may be using different compiler flags as we do.
+
+It is not always possible to make Google Test warning-free for everyone.  Or, it may not be desirable if the warning is rarely enabled and fixing the violations makes the code more complex.
+
+If you see warnings when compiling Google Test, we suggest that you use the `-isystem` flag (assuming your are using GCC) to mark Google Test headers as system headers.  That'll suppress warnings from Google Test headers.
+
+## Why should not test case names and test names contain underscore? ##
+
+Underscore (`_`) is special, as C++ reserves the following to be used by
+the compiler and the standard library:
+
+  1. any identifier that starts with an `_` followed by an upper-case letter, and
+  1. any identifier that containers two consecutive underscores (i.e. `__`) _anywhere_ in its name.
+
+User code is _prohibited_ from using such identifiers.
+
+Now let's look at what this means for `TEST` and `TEST_F`.
+
+Currently `TEST(TestCaseName, TestName)` generates a class named
+`TestCaseName_TestName_Test`.  What happens if `TestCaseName` or `TestName`
+contains `_`?
+
+  1. If `TestCaseName` starts with an `_` followed by an upper-case letter (say, `_Foo`), we end up with `_Foo_TestName_Test`, which is reserved and thus invalid.
+  1. If `TestCaseName` ends with an `_` (say, `Foo_`), we get `Foo__TestName_Test`, which is invalid.
+  1. If `TestName` starts with an `_` (say, `_Bar`), we get `TestCaseName__Bar_Test`, which is invalid.
+  1. If `TestName` ends with an `_` (say, `Bar_`), we get `TestCaseName_Bar__Test`, which is invalid.
+
+So clearly `TestCaseName` and `TestName` cannot start or end with `_`
+(Actually, `TestCaseName` can start with `_` -- as long as the `_` isn't
+followed by an upper-case letter.  But that's getting complicated.  So
+for simplicity we just say that it cannot start with `_`.).
+
+It may seem fine for `TestCaseName` and `TestName` to contain `_` in the
+middle.  However, consider this:
+```
+TEST(Time, Flies_Like_An_Arrow) { ... }
+TEST(Time_Flies, Like_An_Arrow) { ... }
+```
+
+Now, the two `TEST`s will both generate the same class
+(`Time_Files_Like_An_Arrow_Test`).  That's not good.
+
+So for simplicity, we just ask the users to avoid `_` in `TestCaseName`
+and `TestName`.  The rule is more constraining than necessary, but it's
+simple and easy to remember.  It also gives Google Test some wiggle
+room in case its implementation needs to change in the future.
+
+If you violate the rule, there may not be immediately consequences,
+but your test may (just may) break with a new compiler (or a new
+version of the compiler you are using) or with a new version of Google
+Test.  Therefore it's best to follow the rule.
+
+## Why is it not recommended to install a pre-compiled copy of Google Test (for example, into /usr/local)? ##
+
+In the early days, we said that you could install
+compiled Google Test libraries on `*`nix systems using `make install`.
+Then every user of your machine can write tests without
+recompiling Google Test.
+
+This seemed like a good idea, but it has a
+got-cha: every user needs to compile his tests using the _same_ compiler
+flags used to compile the installed Google Test libraries; otherwise
+he may run into undefined behaviors (i.e. the tests can behave
+strangely and may even crash for no obvious reasons).
+
+Why?  Because C++ has this thing called the One-Definition Rule: if
+two C++ source files contain different definitions of the same
+class/function/variable, and you link them together, you violate the
+rule.  The linker may or may not catch the error (in many cases it's
+not required by the C++ standard to catch the violation).  If it
+doesn't, you get strange run-time behaviors that are unexpected and
+hard to debug.
+
+If you compile Google Test and your test code using different compiler
+flags, they may see different definitions of the same
+class/function/variable (e.g. due to the use of `#if` in Google Test).
+Therefore, for your sanity, we recommend to avoid installing pre-compiled
+Google Test libraries.  Instead, each project should compile
+Google Test itself such that it can be sure that the same flags are
+used for both Google Test and the tests.
+
+## How do I generate 64-bit binaries on Windows (using Visual Studio 2008)? ##
+
+(Answered by Trevor Robinson)
+
+Load the supplied Visual Studio solution file, either `msvc\gtest-md.sln` or
+`msvc\gtest.sln`. Go through the migration wizard to migrate the
+solution and project files to Visual Studio 2008. Select
+`Configuration Manager...` from the `Build` menu. Select `<New...>` from
+the `Active solution platform` dropdown.  Select `x64` from the new
+platform dropdown, leave `Copy settings from` set to `Win32` and
+`Create new project platforms` checked, then click `OK`. You now have
+`Win32` and `x64` platform configurations, selectable from the
+`Standard` toolbar, which allow you to toggle between building 32-bit or
+64-bit binaries (or both at once using Batch Build).
+
+In order to prevent build output files from overwriting one another,
+you'll need to change the `Intermediate Directory` settings for the
+newly created platform configuration across all the projects. To do
+this, multi-select (e.g. using shift-click) all projects (but not the
+solution) in the `Solution Explorer`. Right-click one of them and
+select `Properties`. In the left pane, select `Configuration Properties`,
+and from the `Configuration` dropdown, select `All Configurations`.
+Make sure the selected platform is `x64`. For the
+`Intermediate Directory` setting, change the value from
+`$(PlatformName)\$(ConfigurationName)` to
+`$(OutDir)\$(ProjectName)`. Click `OK` and then build the
+solution. When the build is complete, the 64-bit binaries will be in
+the `msvc\x64\Debug` directory.
+
+## Can I use Google Test on MinGW? ##
+
+We haven't tested this ourselves, but Per Abrahamsen reported that he
+was able to compile and install Google Test successfully when using
+MinGW from Cygwin.  You'll need to configure it with:
+
+`PATH/TO/configure CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin"`
+
+You should be able to replace the `-mno-cygwin` option with direct links
+to the real MinGW binaries, but we haven't tried that.
+
+Caveats:
+
+  * There are many warnings when compiling.
+  * `make check` will produce some errors as not all tests for Google Test itself are compatible with MinGW.
+
+We also have reports on successful cross compilation of Google Test
+MinGW binaries on Linux using
+[these instructions](http://wiki.wxwidgets.org/Cross-Compiling_Under_Linux#Cross-compiling_under_Linux_for_MS_Windows)
+on the WxWidgets site.
+
+Please contact `googletestframework@googlegroups.com` if you are
+interested in improving the support for MinGW.
+
+## Why does Google Test support EXPECT\_EQ(NULL, ptr) and ASSERT\_EQ(NULL, ptr) but not EXPECT\_NE(NULL, ptr) and ASSERT\_NE(NULL, ptr)? ##
+
+Due to some peculiarity of C++, it requires some non-trivial template
+meta programming tricks to support using `NULL` as an argument of the
+`EXPECT_XX()` and `ASSERT_XX()` macros. Therefore we only do it where
+it's most needed (otherwise we make the implementation of Google Test
+harder to maintain and more error-prone than necessary).
+
+The `EXPECT_EQ()` macro takes the _expected_ value as its first
+argument and the _actual_ value as the second. It's reasonable that
+someone wants to write `EXPECT_EQ(NULL, some_expression)`, and this
+indeed was requested several times. Therefore we implemented it.
+
+The need for `EXPECT_NE(NULL, ptr)` isn't nearly as strong. When the
+assertion fails, you already know that `ptr` must be `NULL`, so it
+doesn't add any information to print ptr in this case. That means
+`EXPECT_TRUE(ptr != NULL)` works just as well.
+
+If we were to support `EXPECT_NE(NULL, ptr)`, for consistency we'll
+have to support `EXPECT_NE(ptr, NULL)` as well, as unlike `EXPECT_EQ`,
+we don't have a convention on the order of the two arguments for
+`EXPECT_NE`. This means using the template meta programming tricks
+twice in the implementation, making it even harder to understand and
+maintain. We believe the benefit doesn't justify the cost.
+
+Finally, with the growth of Google Mock's [matcher](../../CookBook.md#using-matchers-in-google-test-assertions) library, we are
+encouraging people to use the unified `EXPECT_THAT(value, matcher)`
+syntax more often in tests. One significant advantage of the matcher
+approach is that matchers can be easily combined to form new matchers,
+while the `EXPECT_NE`, etc, macros cannot be easily
+combined. Therefore we want to invest more in the matchers than in the
+`EXPECT_XX()` macros.
+
+## Does Google Test support running tests in parallel? ##
+
+Test runners tend to be tightly coupled with the build/test
+environment, and Google Test doesn't try to solve the problem of
+running tests in parallel.  Instead, we tried to make Google Test work
+nicely with test runners.  For example, Google Test's XML report
+contains the time spent on each test, and its `gtest_list_tests` and
+`gtest_filter` flags can be used for splitting the execution of test
+methods into multiple processes.  These functionalities can help the
+test runner run the tests in parallel.
+
+## Why don't Google Test run the tests in different threads to speed things up? ##
+
+It's difficult to write thread-safe code.  Most tests are not written
+with thread-safety in mind, and thus may not work correctly in a
+multi-threaded setting.
+
+If you think about it, it's already hard to make your code work when
+you know what other threads are doing.  It's much harder, and
+sometimes even impossible, to make your code work when you don't know
+what other threads are doing (remember that test methods can be added,
+deleted, or modified after your test was written).  If you want to run
+the tests in parallel, you'd better run them in different processes.
+
+## Why aren't Google Test assertions implemented using exceptions? ##
+
+Our original motivation was to be able to use Google Test in projects
+that disable exceptions.  Later we realized some additional benefits
+of this approach:
+
+  1. Throwing in a destructor is undefined behavior in C++.  Not using exceptions means Google Test's assertions are safe to use in destructors.
+  1. The `EXPECT_*` family of macros will continue even after a failure, allowing multiple failures in a `TEST` to be reported in a single run. This is a popular feature, as in C++ the edit-compile-test cycle is usually quite long and being able to fixing more than one thing at a time is a blessing.
+  1. If assertions are implemented using exceptions, a test may falsely ignore a failure if it's caught by user code:
+```
+try { ... ASSERT_TRUE(...) ... }
+catch (...) { ... }
+```
+The above code will pass even if the `ASSERT_TRUE` throws.  While it's unlikely for someone to write this in a test, it's possible to run into this pattern when you write assertions in callbacks that are called by the code under test.
+
+The downside of not using exceptions is that `ASSERT_*` (implemented
+using `return`) will only abort the current function, not the current
+`TEST`.
+
+## Why do we use two different macros for tests with and without fixtures? ##
+
+Unfortunately, C++'s macro system doesn't allow us to use the same
+macro for both cases.  One possibility is to provide only one macro
+for tests with fixtures, and require the user to define an empty
+fixture sometimes:
+
+```
+class FooTest : public ::testing::Test {};
+
+TEST_F(FooTest, DoesThis) { ... }
+```
+or
+```
+typedef ::testing::Test FooTest;
+
+TEST_F(FooTest, DoesThat) { ... }
+```
+
+Yet, many people think this is one line too many. :-) Our goal was to
+make it really easy to write tests, so we tried to make simple tests
+trivial to create.  That means using a separate macro for such tests.
+
+We think neither approach is ideal, yet either of them is reasonable.
+In the end, it probably doesn't matter much either way.
+
+## Why don't we use structs as test fixtures? ##
+
+We like to use structs only when representing passive data.  This
+distinction between structs and classes is good for documenting the
+intent of the code's author.  Since test fixtures have logic like
+`SetUp()` and `TearDown()`, they are better defined as classes.
+
+## Why are death tests implemented as assertions instead of using a test runner? ##
+
+Our goal was to make death tests as convenient for a user as C++
+possibly allows.  In particular:
+
+  * The runner-style requires to split the information into two pieces: the definition of the death test itself, and the specification for the runner on how to run the death test and what to expect.  The death test would be written in C++, while the runner spec may or may not be.  A user needs to carefully keep the two in sync. `ASSERT_DEATH(statement, expected_message)` specifies all necessary information in one place, in one language, without boilerplate code. It is very declarative.
+  * `ASSERT_DEATH` has a similar syntax and error-reporting semantics as other Google Test assertions, and thus is easy to learn.
+  * `ASSERT_DEATH` can be mixed with other assertions and other logic at your will.  You are not limited to one death test per test method. For example, you can write something like:
+```
+    if (FooCondition()) {
+      ASSERT_DEATH(Bar(), "blah");
+    } else {
+      ASSERT_EQ(5, Bar());
+    }
+```
+If you prefer one death test per test method, you can write your tests in that style too, but we don't want to impose that on the users.  The fewer artificial limitations the better.
+  * `ASSERT_DEATH` can reference local variables in the current function, and you can decide how many death tests you want based on run-time information.  For example,
+```
+    const int count = GetCount();  // Only known at run time.
+    for (int i = 1; i <= count; i++) {
+      ASSERT_DEATH({
+        double* buffer = new double[i];
+        ... initializes buffer ...
+        Foo(buffer, i)
+      }, "blah blah");
+    }
+```
+The runner-based approach tends to be more static and less flexible, or requires more user effort to get this kind of flexibility.
+
+Another interesting thing about `ASSERT_DEATH` is that it calls `fork()`
+to create a child process to run the death test.  This is lightening
+fast, as `fork()` uses copy-on-write pages and incurs almost zero
+overhead, and the child process starts from the user-supplied
+statement directly, skipping all global and local initialization and
+any code leading to the given statement.  If you launch the child
+process from scratch, it can take seconds just to load everything and
+start running if the test links to many libraries dynamically.
+
+## My death test modifies some state, but the change seems lost after the death test finishes. Why? ##
+
+Death tests (`EXPECT_DEATH`, etc) are executed in a sub-process s.t. the
+expected crash won't kill the test program (i.e. the parent process). As a
+result, any in-memory side effects they incur are observable in their
+respective sub-processes, but not in the parent process. You can think of them
+as running in a parallel universe, more or less.
+
+## The compiler complains about "undefined references" to some static const member variables, but I did define them in the class body. What's wrong? ##
+
+If your class has a static data member:
+
+```
+// foo.h
+class Foo {
+  ...
+  static const int kBar = 100;
+};
+```
+
+You also need to define it _outside_ of the class body in `foo.cc`:
+
+```
+const int Foo::kBar;  // No initializer here.
+```
+
+Otherwise your code is **invalid C++**, and may break in unexpected ways. In
+particular, using it in Google Test comparison assertions (`EXPECT_EQ`, etc)
+will generate an "undefined reference" linker error.
+
+## I have an interface that has several implementations. Can I write a set of tests once and repeat them over all the implementations? ##
+
+Google Test doesn't yet have good support for this kind of tests, or
+data-driven tests in general. We hope to be able to make improvements in this
+area soon.
+
+## Can I derive a test fixture from another? ##
+
+Yes.
+
+Each test fixture has a corresponding and same named test case. This means only
+one test case can use a particular fixture. Sometimes, however, multiple test
+cases may want to use the same or slightly different fixtures. For example, you
+may want to make sure that all of a GUI library's test cases don't leak
+important system resources like fonts and brushes.
+
+In Google Test, you share a fixture among test cases by putting the shared
+logic in a base test fixture, then deriving from that base a separate fixture
+for each test case that wants to use this common logic. You then use `TEST_F()`
+to write tests using each derived fixture.
+
+Typically, your code looks like this:
+
+```
+// Defines a base test fixture.
+class BaseTest : public ::testing::Test {
+  protected:
+   ...
+};
+
+// Derives a fixture FooTest from BaseTest.
+class FooTest : public BaseTest {
+  protected:
+    virtual void SetUp() {
+      BaseTest::SetUp();  // Sets up the base fixture first.
+      ... additional set-up work ...
+    }
+    virtual void TearDown() {
+      ... clean-up work for FooTest ...
+      BaseTest::TearDown();  // Remember to tear down the base fixture
+                             // after cleaning up FooTest!
+    }
+    ... functions and variables for FooTest ...
+};
+
+// Tests that use the fixture FooTest.
+TEST_F(FooTest, Bar) { ... }
+TEST_F(FooTest, Baz) { ... }
+
+... additional fixtures derived from BaseTest ...
+```
+
+If necessary, you can continue to derive test fixtures from a derived fixture.
+Google Test has no limit on how deep the hierarchy can be.
+
+For a complete example using derived test fixtures, see
+[sample5](../samples/sample5_unittest.cc).
+
+## My compiler complains "void value not ignored as it ought to be." What does this mean? ##
+
+You're probably using an `ASSERT_*()` in a function that doesn't return `void`.
+`ASSERT_*()` can only be used in `void` functions.
+
+## My death test hangs (or seg-faults). How do I fix it? ##
+
+In Google Test, death tests are run in a child process and the way they work is
+delicate. To write death tests you really need to understand how they work.
+Please make sure you have read this.
+
+In particular, death tests don't like having multiple threads in the parent
+process. So the first thing you can try is to eliminate creating threads
+outside of `EXPECT_DEATH()`.
+
+Sometimes this is impossible as some library you must use may be creating
+threads before `main()` is even reached. In this case, you can try to minimize
+the chance of conflicts by either moving as many activities as possible inside
+`EXPECT_DEATH()` (in the extreme case, you want to move everything inside), or
+leaving as few things as possible in it. Also, you can try to set the death
+test style to `"threadsafe"`, which is safer but slower, and see if it helps.
+
+If you go with thread-safe death tests, remember that they rerun the test
+program from the beginning in the child process. Therefore make sure your
+program can run side-by-side with itself and is deterministic.
+
+In the end, this boils down to good concurrent programming. You have to make
+sure that there is no race conditions or dead locks in your program. No silver
+bullet - sorry!
+
+## Should I use the constructor/destructor of the test fixture or the set-up/tear-down function? ##
+
+The first thing to remember is that Google Test does not reuse the
+same test fixture object across multiple tests. For each `TEST_F`,
+Google Test will create a fresh test fixture object, _immediately_
+call `SetUp()`, run the test, call `TearDown()`, and then
+_immediately_ delete the test fixture object. Therefore, there is no
+need to write a `SetUp()` or `TearDown()` function if the constructor
+or destructor already does the job.
+
+You may still want to use `SetUp()/TearDown()` in the following cases:
+  * If the tear-down operation could throw an exception, you must use `TearDown()` as opposed to the destructor, as throwing in a destructor leads to undefined behavior and usually will kill your program right away. Note that many standard libraries (like STL) may throw when exceptions are enabled in the compiler. Therefore you should prefer `TearDown()` if you want to write portable tests that work with or without exceptions.
+  * The assertion macros throw an exception when flag `--gtest_throw_on_failure` is specified. Therefore, you shouldn't use Google Test assertions in a destructor if you plan to run your tests with this flag.
+  * In a constructor or destructor, you cannot make a virtual function call on this object. (You can call a method declared as virtual, but it will be statically bound.) Therefore, if you need to call a method that will be overriden in a derived class, you have to use `SetUp()/TearDown()`.
+
+## The compiler complains "no matching function to call" when I use ASSERT\_PREDn. How do I fix it? ##
+
+If the predicate function you use in `ASSERT_PRED*` or `EXPECT_PRED*` is
+overloaded or a template, the compiler will have trouble figuring out which
+overloaded version it should use. `ASSERT_PRED_FORMAT*` and
+`EXPECT_PRED_FORMAT*` don't have this problem.
+
+If you see this error, you might want to switch to
+`(ASSERT|EXPECT)_PRED_FORMAT*`, which will also give you a better failure
+message. If, however, that is not an option, you can resolve the problem by
+explicitly telling the compiler which version to pick.
+
+For example, suppose you have
+
+```
+bool IsPositive(int n) {
+  return n > 0;
+}
+bool IsPositive(double x) {
+  return x > 0;
+}
+```
+
+you will get a compiler error if you write
+
+```
+EXPECT_PRED1(IsPositive, 5);
+```
+
+However, this will work:
+
+```
+EXPECT_PRED1(*static_cast<bool (*)(int)>*(IsPositive), 5);
+```
+
+(The stuff inside the angled brackets for the `static_cast` operator is the
+type of the function pointer for the `int`-version of `IsPositive()`.)
+
+As another example, when you have a template function
+
+```
+template <typename T>
+bool IsNegative(T x) {
+  return x < 0;
+}
+```
+
+you can use it in a predicate assertion like this:
+
+```
+ASSERT_PRED1(IsNegative*<int>*, -5);
+```
+
+Things are more interesting if your template has more than one parameters. The
+following won't compile:
+
+```
+ASSERT_PRED2(*GreaterThan<int, int>*, 5, 0);
+```
+
+
+as the C++ pre-processor thinks you are giving `ASSERT_PRED2` 4 arguments,
+which is one more than expected. The workaround is to wrap the predicate
+function in parentheses:
+
+```
+ASSERT_PRED2(*(GreaterThan<int, int>)*, 5, 0);
+```
+
+
+## My compiler complains about "ignoring return value" when I call RUN\_ALL\_TESTS(). Why? ##
+
+Some people had been ignoring the return value of `RUN_ALL_TESTS()`. That is,
+instead of
+
+```
+return RUN_ALL_TESTS();
+```
+
+they write
+
+```
+RUN_ALL_TESTS();
+```
+
+This is wrong and dangerous. A test runner needs to see the return value of
+`RUN_ALL_TESTS()` in order to determine if a test has passed. If your `main()`
+function ignores it, your test will be considered successful even if it has a
+Google Test assertion failure. Very bad.
+
+To help the users avoid this dangerous bug, the implementation of
+`RUN_ALL_TESTS()` causes gcc to raise this warning, when the return value is
+ignored. If you see this warning, the fix is simple: just make sure its value
+is used as the return value of `main()`.
+
+## My compiler complains that a constructor (or destructor) cannot return a value. What's going on? ##
+
+Due to a peculiarity of C++, in order to support the syntax for streaming
+messages to an `ASSERT_*`, e.g.
+
+```
+ASSERT_EQ(1, Foo()) << "blah blah" << foo;
+```
+
+we had to give up using `ASSERT*` and `FAIL*` (but not `EXPECT*` and
+`ADD_FAILURE*`) in constructors and destructors. The workaround is to move the
+content of your constructor/destructor to a private void member function, or
+switch to `EXPECT_*()` if that works. This section in the user's guide explains
+it.
+
+## My set-up function is not called. Why? ##
+
+C++ is case-sensitive. It should be spelled as `SetUp()`.  Did you
+spell it as `Setup()`?
+
+Similarly, sometimes people spell `SetUpTestCase()` as `SetupTestCase()` and
+wonder why it's never called.
+
+## How do I jump to the line of a failure in Emacs directly? ##
+
+Google Test's failure message format is understood by Emacs and many other
+IDEs, like acme and XCode. If a Google Test message is in a compilation buffer
+in Emacs, then it's clickable. You can now hit `enter` on a message to jump to
+the corresponding source code, or use `C-x `` to jump to the next failure.
+
+## I have several test cases which share the same test fixture logic, do I have to define a new test fixture class for each of them? This seems pretty tedious. ##
+
+You don't have to. Instead of
+
+```
+class FooTest : public BaseTest {};
+
+TEST_F(FooTest, Abc) { ... }
+TEST_F(FooTest, Def) { ... }
+
+class BarTest : public BaseTest {};
+
+TEST_F(BarTest, Abc) { ... }
+TEST_F(BarTest, Def) { ... }
+```
+
+you can simply `typedef` the test fixtures:
+```
+typedef BaseTest FooTest;
+
+TEST_F(FooTest, Abc) { ... }
+TEST_F(FooTest, Def) { ... }
+
+typedef BaseTest BarTest;
+
+TEST_F(BarTest, Abc) { ... }
+TEST_F(BarTest, Def) { ... }
+```
+
+## The Google Test output is buried in a whole bunch of log messages. What do I do? ##
+
+The Google Test output is meant to be a concise and human-friendly report. If
+your test generates textual output itself, it will mix with the Google Test
+output, making it hard to read. However, there is an easy solution to this
+problem.
+
+Since most log messages go to stderr, we decided to let Google Test output go
+to stdout. This way, you can easily separate the two using redirection. For
+example:
+```
+./my_test > googletest_output.txt
+```
+
+## Why should I prefer test fixtures over global variables? ##
+
+There are several good reasons:
+  1. It's likely your test needs to change the states of its global variables. This makes it difficult to keep side effects from escaping one test and contaminating others, making debugging difficult. By using fixtures, each test has a fresh set of variables that's different (but with the same names). Thus, tests are kept independent of each other.
+  1. Global variables pollute the global namespace.
+  1. Test fixtures can be reused via subclassing, which cannot be done easily with global variables. This is useful if many test cases have something in common.
+
+## How do I test private class members without writing FRIEND\_TEST()s? ##
+
+You should try to write testable code, which means classes should be easily
+tested from their public interface. One way to achieve this is the Pimpl idiom:
+you move all private members of a class into a helper class, and make all
+members of the helper class public.
+
+You have several other options that don't require using `FRIEND_TEST`:
+  * Write the tests as members of the fixture class:
+```
+class Foo {
+  friend class FooTest;
+  ...
+};
+
+class FooTest : public ::testing::Test {
+ protected:
+  ...
+  void Test1() {...} // This accesses private members of class Foo.
+  void Test2() {...} // So does this one.
+};
+
+TEST_F(FooTest, Test1) {
+  Test1();
+}
+
+TEST_F(FooTest, Test2) {
+  Test2();
+}
+```
+  * In the fixture class, write accessors for the tested class' private members, then use the accessors in your tests:
+```
+class Foo {
+  friend class FooTest;
+  ...
+};
+
+class FooTest : public ::testing::Test {
+ protected:
+  ...
+  T1 get_private_member1(Foo* obj) {
+    return obj->private_member1_;
+  }
+};
+
+TEST_F(FooTest, Test1) {
+  ...
+  get_private_member1(x)
+  ...
+}
+```
+  * If the methods are declared **protected**, you can change their access level in a test-only subclass:
+```
+class YourClass {
+  ...
+ protected: // protected access for testability.
+  int DoSomethingReturningInt();
+  ...
+};
+
+// in the your_class_test.cc file:
+class TestableYourClass : public YourClass {
+  ...
+ public: using YourClass::DoSomethingReturningInt; // changes access rights
+  ...
+};
+
+TEST_F(YourClassTest, DoSomethingTest) {
+  TestableYourClass obj;
+  assertEquals(expected_value, obj.DoSomethingReturningInt());
+}
+```
+
+## How do I test private class static members without writing FRIEND\_TEST()s? ##
+
+We find private static methods clutter the header file.  They are
+implementation details and ideally should be kept out of a .h. So often I make
+them free functions instead.
+
+Instead of:
+```
+// foo.h
+class Foo {
+  ...
+ private:
+  static bool Func(int n);
+};
+
+// foo.cc
+bool Foo::Func(int n) { ... }
+
+// foo_test.cc
+EXPECT_TRUE(Foo::Func(12345));
+```
+
+You probably should better write:
+```
+// foo.h
+class Foo {
+  ...
+};
+
+// foo.cc
+namespace internal {
+  bool Func(int n) { ... }
+}
+
+// foo_test.cc
+namespace internal {
+  bool Func(int n);
+}
+
+EXPECT_TRUE(internal::Func(12345));
+```
+
+## I would like to run a test several times with different parameters. Do I need to write several similar copies of it? ##
+
+No. You can use a feature called [value-parameterized tests](V1_7_AdvancedGuide.md#Value_Parameterized_Tests) which
+lets you repeat your tests with different parameters, without defining it more than once.
+
+## How do I test a file that defines main()? ##
+
+To test a `foo.cc` file, you need to compile and link it into your unit test
+program. However, when the file contains a definition for the `main()`
+function, it will clash with the `main()` of your unit test, and will result in
+a build error.
+
+The right solution is to split it into three files:
+  1. `foo.h` which contains the declarations,
+  1. `foo.cc` which contains the definitions except `main()`, and
+  1. `foo_main.cc` which contains nothing but the definition of `main()`.
+
+Then `foo.cc` can be easily tested.
+
+If you are adding tests to an existing file and don't want an intrusive change
+like this, there is a hack: just include the entire `foo.cc` file in your unit
+test. For example:
+```
+// File foo_unittest.cc
+
+// The headers section
+...
+
+// Renames main() in foo.cc to make room for the unit test main()
+#define main FooMain
+
+#include "a/b/foo.cc"
+
+// The tests start here.
+...
+```
+
+
+However, please remember this is a hack and should only be used as the last
+resort.
+
+## What can the statement argument in ASSERT\_DEATH() be? ##
+
+`ASSERT_DEATH(_statement_, _regex_)` (or any death assertion macro) can be used
+wherever `_statement_` is valid. So basically `_statement_` can be any C++
+statement that makes sense in the current context. In particular, it can
+reference global and/or local variables, and can be:
+  * a simple function call (often the case),
+  * a complex expression, or
+  * a compound statement.
+
+> Some examples are shown here:
+
+```
+// A death test can be a simple function call.
+TEST(MyDeathTest, FunctionCall) {
+  ASSERT_DEATH(Xyz(5), "Xyz failed");
+}
+
+// Or a complex expression that references variables and functions.
+TEST(MyDeathTest, ComplexExpression) {
+  const bool c = Condition();
+  ASSERT_DEATH((c ? Func1(0) : object2.Method("test")),
+               "(Func1|Method) failed");
+}
+
+// Death assertions can be used any where in a function. In
+// particular, they can be inside a loop.
+TEST(MyDeathTest, InsideLoop) {
+  // Verifies that Foo(0), Foo(1), ..., and Foo(4) all die.
+  for (int i = 0; i < 5; i++) {
+    EXPECT_DEATH_M(Foo(i), "Foo has \\d+ errors",
+                   ::testing::Message() << "where i is " << i);
+  }
+}
+
+// A death assertion can contain a compound statement.
+TEST(MyDeathTest, CompoundStatement) {
+  // Verifies that at lease one of Bar(0), Bar(1), ..., and
+  // Bar(4) dies.
+  ASSERT_DEATH({
+    for (int i = 0; i < 5; i++) {
+      Bar(i);
+    }
+  },
+  "Bar has \\d+ errors");}
+```
+
+`googletest_unittest.cc` contains more examples if you are interested.
+
+## What syntax does the regular expression in ASSERT\_DEATH use? ##
+
+On POSIX systems, Google Test uses the POSIX Extended regular
+expression syntax
+(http://en.wikipedia.org/wiki/Regular_expression#POSIX_Extended_Regular_Expressions).
+On Windows, it uses a limited variant of regular expression
+syntax. For more details, see the
+[regular expression syntax](V1_7_AdvancedGuide.md#Regular_Expression_Syntax).
+
+## I have a fixture class Foo, but TEST\_F(Foo, Bar) gives me error "no matching function for call to Foo::Foo()". Why? ##
+
+Google Test needs to be able to create objects of your test fixture class, so
+it must have a default constructor. Normally the compiler will define one for
+you. However, there are cases where you have to define your own:
+  * If you explicitly declare a non-default constructor for class `Foo`, then you need to define a default constructor, even if it would be empty.
+  * If `Foo` has a const non-static data member, then you have to define the default constructor _and_ initialize the const member in the initializer list of the constructor. (Early versions of `gcc` doesn't force you to initialize the const member. It's a bug that has been fixed in `gcc 4`.)
+
+## Why does ASSERT\_DEATH complain about previous threads that were already joined? ##
+
+With the Linux pthread library, there is no turning back once you cross the
+line from single thread to multiple threads. The first time you create a
+thread, a manager thread is created in addition, so you get 3, not 2, threads.
+Later when the thread you create joins the main thread, the thread count
+decrements by 1, but the manager thread will never be killed, so you still have
+2 threads, which means you cannot safely run a death test.
+
+The new NPTL thread library doesn't suffer from this problem, as it doesn't
+create a manager thread. However, if you don't control which machine your test
+runs on, you shouldn't depend on this.
+
+## Why does Google Test require the entire test case, instead of individual tests, to be named FOODeathTest when it uses ASSERT\_DEATH? ##
+
+Google Test does not interleave tests from different test cases. That is, it
+runs all tests in one test case first, and then runs all tests in the next test
+case, and so on. Google Test does this because it needs to set up a test case
+before the first test in it is run, and tear it down afterwords. Splitting up
+the test case would require multiple set-up and tear-down processes, which is
+inefficient and makes the semantics unclean.
+
+If we were to determine the order of tests based on test name instead of test
+case name, then we would have a problem with the following situation:
+
+```
+TEST_F(FooTest, AbcDeathTest) { ... }
+TEST_F(FooTest, Uvw) { ... }
+
+TEST_F(BarTest, DefDeathTest) { ... }
+TEST_F(BarTest, Xyz) { ... }
+```
+
+Since `FooTest.AbcDeathTest` needs to run before `BarTest.Xyz`, and we don't
+interleave tests from different test cases, we need to run all tests in the
+`FooTest` case before running any test in the `BarTest` case. This contradicts
+with the requirement to run `BarTest.DefDeathTest` before `FooTest.Uvw`.
+
+## But I don't like calling my entire test case FOODeathTest when it contains both death tests and non-death tests. What do I do? ##
+
+You don't have to, but if you like, you may split up the test case into
+`FooTest` and `FooDeathTest`, where the names make it clear that they are
+related:
+
+```
+class FooTest : public ::testing::Test { ... };
+
+TEST_F(FooTest, Abc) { ... }
+TEST_F(FooTest, Def) { ... }
+
+typedef FooTest FooDeathTest;
+
+TEST_F(FooDeathTest, Uvw) { ... EXPECT_DEATH(...) ... }
+TEST_F(FooDeathTest, Xyz) { ... ASSERT_DEATH(...) ... }
+```
+
+## The compiler complains about "no match for 'operator<<'" when I use an assertion. What gives? ##
+
+If you use a user-defined type `FooType` in an assertion, you must make sure
+there is an `std::ostream& operator<<(std::ostream&, const FooType&)` function
+defined such that we can print a value of `FooType`.
+
+In addition, if `FooType` is declared in a name space, the `<<` operator also
+needs to be defined in the _same_ name space.
+
+## How do I suppress the memory leak messages on Windows? ##
+
+Since the statically initialized Google Test singleton requires allocations on
+the heap, the Visual C++ memory leak detector will report memory leaks at the
+end of the program run. The easiest way to avoid this is to use the
+`_CrtMemCheckpoint` and `_CrtMemDumpAllObjectsSince` calls to not report any
+statically initialized heap objects. See MSDN for more details and additional
+heap check/debug routines.
+
+## I am building my project with Google Test in Visual Studio and all I'm getting is a bunch of linker errors (or warnings). Help! ##
+
+You may get a number of the following linker error or warnings if you
+attempt to link your test project with the Google Test library when
+your project and the are not built using the same compiler settings.
+
+  * LNK2005: symbol already defined in object
+  * LNK4217: locally defined symbol 'symbol' imported in function 'function'
+  * LNK4049: locally defined symbol 'symbol' imported
+
+The Google Test project (gtest.vcproj) has the Runtime Library option
+set to /MT (use multi-threaded static libraries, /MTd for debug). If
+your project uses something else, for example /MD (use multi-threaded
+DLLs, /MDd for debug), you need to change the setting in the Google
+Test project to match your project's.
+
+To update this setting open the project properties in the Visual
+Studio IDE then select the branch Configuration Properties | C/C++ |
+Code Generation and change the option "Runtime Library".  You may also try
+using gtest-md.vcproj instead of gtest.vcproj.
+
+## I put my tests in a library and Google Test doesn't run them. What's happening? ##
+Have you read a
+[warning](V1_7_Primer.md#important-note-for-visual-c-users) on
+the Google Test Primer page?
+
+## I want to use Google Test with Visual Studio but don't know where to start. ##
+Many people are in your position and one of the posted his solution to
+our mailing list. Here is his link:
+http://hassanjamilahmad.blogspot.com/2009/07/gtest-starters-help.html.
+
+## I am seeing compile errors mentioning std::type\_traits when I try to use Google Test on Solaris. ##
+Google Test uses parts of the standard C++ library that SunStudio does not support.
+Our users reported success using alternative implementations. Try running the build after runing this commad:
+
+`export CC=cc CXX=CC CXXFLAGS='-library=stlport4'`
+
+## How can my code detect if it is running in a test? ##
+
+If you write code that sniffs whether it's running in a test and does
+different things accordingly, you are leaking test-only logic into
+production code and there is no easy way to ensure that the test-only
+code paths aren't run by mistake in production.  Such cleverness also
+leads to
+[Heisenbugs](http://en.wikipedia.org/wiki/Unusual_software_bug#Heisenbug).
+Therefore we strongly advise against the practice, and Google Test doesn't
+provide a way to do it.
+
+In general, the recommended way to cause the code to behave
+differently under test is [dependency injection](http://jamesshore.com/Blog/Dependency-Injection-Demystified.html).
+You can inject different functionality from the test and from the
+production code.  Since your production code doesn't link in the
+for-test logic at all, there is no danger in accidentally running it.
+
+However, if you _really_, _really_, _really_ have no choice, and if
+you follow the rule of ending your test program names with `_test`,
+you can use the _horrible_ hack of sniffing your executable name
+(`argv[0]` in `main()`) to know whether the code is under test.
+
+## Google Test defines a macro that clashes with one defined by another library. How do I deal with that? ##
+
+In C++, macros don't obey namespaces.  Therefore two libraries that
+both define a macro of the same name will clash if you `#include` both
+definitions.  In case a Google Test macro clashes with another
+library, you can force Google Test to rename its macro to avoid the
+conflict.
+
+Specifically, if both Google Test and some other code define macro
+`FOO`, you can add
+```
+  -DGTEST_DONT_DEFINE_FOO=1
+```
+to the compiler flags to tell Google Test to change the macro's name
+from `FOO` to `GTEST_FOO`. For example, with `-DGTEST_DONT_DEFINE_TEST=1`, you'll need to write
+```
+  GTEST_TEST(SomeTest, DoesThis) { ... }
+```
+instead of
+```
+  TEST(SomeTest, DoesThis) { ... }
+```
+in order to define a test.
+
+Currently, the following `TEST`, `FAIL`, `SUCCEED`, and the basic comparison assertion macros can have alternative names. You can see the full list of covered macros [here](http://www.google.com/codesearch?q=if+!GTEST_DONT_DEFINE_\w%2B+package:http://googletest\.googlecode\.com+file:/include/gtest/gtest.h). More information can be found in the "Avoiding Macro Name Clashes" section of the README file.
+
+
+## Is it OK if I have two separate `TEST(Foo, Bar)` test methods defined in different namespaces? ##
+
+Yes.
+
+The rule is **all test methods in the same test case must use the same fixture class**. This means that the following is **allowed** because both tests use the same fixture class (`::testing::Test`).
+
+```
+namespace foo {
+TEST(CoolTest, DoSomething) {
+  SUCCEED();
+}
+}  // namespace foo
+
+namespace bar {
+TEST(CoolTest, DoSomething) {
+  SUCCEED();
+}
+}  // namespace foo
+```
+
+However, the following code is **not allowed** and will produce a runtime error from Google Test because the test methods are using different test fixture classes with the same test case name.
+
+```
+namespace foo {
+class CoolTest : public ::testing::Test {};  // Fixture foo::CoolTest
+TEST_F(CoolTest, DoSomething) {
+  SUCCEED();
+}
+}  // namespace foo
+
+namespace bar {
+class CoolTest : public ::testing::Test {};  // Fixture: bar::CoolTest
+TEST_F(CoolTest, DoSomething) {
+  SUCCEED();
+}
+}  // namespace foo
+```
+
+## How do I build Google Testing Framework with Xcode 4? ##
+
+If you try to build Google Test's Xcode project with Xcode 4.0 or later, you may encounter an error message that looks like
+"Missing SDK in target gtest\_framework: /Developer/SDKs/MacOSX10.4u.sdk". That means that Xcode does not support the SDK the project is targeting. See the Xcode section in the [README](../../README.MD) file on how to resolve this.
+
+## My question is not covered in your FAQ! ##
+
+If you cannot find the answer to your question in this FAQ, there are
+some other resources you can use:
+
+  1. read other [wiki pages](http://code.google.com/p/googletest/w/list),
+  1. search the mailing list [archive](http://groups.google.com/group/googletestframework/topics),
+  1. ask it on [googletestframework@googlegroups.com](mailto:googletestframework@googlegroups.com) and someone will answer it (to prevent spam, we require you to join the [discussion group](http://groups.google.com/group/googletestframework) before you can post.).
+
+Please note that creating an issue in the
+[issue tracker](http://code.google.com/p/googletest/issues/list) is _not_
+a good way to get your answer, as it is monitored infrequently by a
+very small number of people.
+
+When asking a question, it's helpful to provide as much of the
+following information as possible (people cannot help you if there's
+not enough information in your question):
+
+  * the version (or the revision number if you check out from SVN directly) of Google Test you use (Google Test is under active development, so it's possible that your problem has been solved in a later version),
+  * your operating system,
+  * the name and version of your compiler,
+  * the complete command line flags you give to your compiler,
+  * the complete compiler error messages (if the question is about compilation),
+  * the _actual_ code (ideally, a minimal but complete program) that has the problem you encounter.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_Primer.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_Primer.md
new file mode 100644
index 0000000000..b1827c7355
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_Primer.md
@@ -0,0 +1,501 @@
+
+
+# Introduction: Why Google C++ Testing Framework? #
+
+_Google C++ Testing Framework_ helps you write better C++ tests.
+
+No matter whether you work on Linux, Windows, or a Mac, if you write C++ code,
+Google Test can help you.
+
+So what makes a good test, and how does Google C++ Testing Framework fit in? We believe:
+  1. Tests should be _independent_ and _repeatable_. It's a pain to debug a test that succeeds or fails as a result of other tests.  Google C++ Testing Framework isolates the tests by running each of them on a different object. When a test fails, Google C++ Testing Framework allows you to run it in isolation for quick debugging.
+  1. Tests should be well _organized_ and reflect the structure of the tested code.  Google C++ Testing Framework groups related tests into test cases that can share data and subroutines. This common pattern is easy to recognize and makes tests easy to maintain. Such consistency is especially helpful when people switch projects and start to work on a new code base.
+  1. Tests should be _portable_ and _reusable_. The open-source community has a lot of code that is platform-neutral, its tests should also be platform-neutral.  Google C++ Testing Framework works on different OSes, with different compilers (gcc, MSVC, and others), with or without exceptions, so Google C++ Testing Framework tests can easily work with a variety of configurations.  (Note that the current release only contains build scripts for Linux - we are actively working on scripts for other platforms.)
+  1. When tests fail, they should provide as much _information_ about the problem as possible. Google C++ Testing Framework doesn't stop at the first test failure. Instead, it only stops the current test and continues with the next. You can also set up tests that report non-fatal failures after which the current test continues. Thus, you can detect and fix multiple bugs in a single run-edit-compile cycle.
+  1. The testing framework should liberate test writers from housekeeping chores and let them focus on the test _content_.  Google C++ Testing Framework automatically keeps track of all tests defined, and doesn't require the user to enumerate them in order to run them.
+  1. Tests should be _fast_. With Google C++ Testing Framework, you can reuse shared resources across tests and pay for the set-up/tear-down only once, without making tests depend on each other.
+
+Since Google C++ Testing Framework is based on the popular xUnit
+architecture, you'll feel right at home if you've used JUnit or PyUnit before.
+If not, it will take you about 10 minutes to learn the basics and get started.
+So let's go!
+
+_Note:_ We sometimes refer to Google C++ Testing Framework informally
+as _Google Test_.
+
+# Setting up a New Test Project #
+
+To write a test program using Google Test, you need to compile Google
+Test into a library and link your test with it.  We provide build
+files for some popular build systems: `msvc/` for Visual Studio,
+`xcode/` for Mac Xcode, `make/` for GNU make, `codegear/` for Borland
+C++ Builder, and the autotools script (deprecated) and
+`CMakeLists.txt` for CMake (recommended) in the Google Test root
+directory.  If your build system is not on this list, you can take a
+look at `make/Makefile` to learn how Google Test should be compiled
+(basically you want to compile `src/gtest-all.cc` with `GTEST_ROOT`
+and `GTEST_ROOT/include` in the header search path, where `GTEST_ROOT`
+is the Google Test root directory).
+
+Once you are able to compile the Google Test library, you should
+create a project or build target for your test program.  Make sure you
+have `GTEST_ROOT/include` in the header search path so that the
+compiler can find `"gtest/gtest.h"` when compiling your test.  Set up
+your test project to link with the Google Test library (for example,
+in Visual Studio, this is done by adding a dependency on
+`gtest.vcproj`).
+
+If you still have questions, take a look at how Google Test's own
+tests are built and use them as examples.
+
+# Basic Concepts #
+
+When using Google Test, you start by writing _assertions_, which are statements
+that check whether a condition is true. An assertion's result can be _success_,
+_nonfatal failure_, or _fatal failure_. If a fatal failure occurs, it aborts
+the current function; otherwise the program continues normally.
+
+_Tests_ use assertions to verify the tested code's behavior. If a test crashes
+or has a failed assertion, then it _fails_; otherwise it _succeeds_.
+
+A _test case_ contains one or many tests. You should group your tests into test
+cases that reflect the structure of the tested code. When multiple tests in a
+test case need to share common objects and subroutines, you can put them into a
+_test fixture_ class.
+
+A _test program_ can contain multiple test cases.
+
+We'll now explain how to write a test program, starting at the individual
+assertion level and building up to tests and test cases.
+
+# Assertions #
+
+Google Test assertions are macros that resemble function calls. You test a
+class or function by making assertions about its behavior. When an assertion
+fails, Google Test prints the assertion's source file and line number location,
+along with a failure message. You may also supply a custom failure message
+which will be appended to Google Test's message.
+
+The assertions come in pairs that test the same thing but have different
+effects on the current function. `ASSERT_*` versions generate fatal failures
+when they fail, and **abort the current function**. `EXPECT_*` versions generate
+nonfatal failures, which don't abort the current function. Usually `EXPECT_*`
+are preferred, as they allow more than one failures to be reported in a test.
+However, you should use `ASSERT_*` if it doesn't make sense to continue when
+the assertion in question fails.
+
+Since a failed `ASSERT_*` returns from the current function immediately,
+possibly skipping clean-up code that comes after it, it may cause a space leak.
+Depending on the nature of the leak, it may or may not be worth fixing - so
+keep this in mind if you get a heap checker error in addition to assertion
+errors.
+
+To provide a custom failure message, simply stream it into the macro using the
+`<<` operator, or a sequence of such operators. An example:
+```
+ASSERT_EQ(x.size(), y.size()) << "Vectors x and y are of unequal length";
+
+for (int i = 0; i < x.size(); ++i) {
+  EXPECT_EQ(x[i], y[i]) << "Vectors x and y differ at index " << i;
+}
+```
+
+Anything that can be streamed to an `ostream` can be streamed to an assertion
+macro--in particular, C strings and `string` objects. If a wide string
+(`wchar_t*`, `TCHAR*` in `UNICODE` mode on Windows, or `std::wstring`) is
+streamed to an assertion, it will be translated to UTF-8 when printed.
+
+## Basic Assertions ##
+
+These assertions do basic true/false condition testing.
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_TRUE(`_condition_`)`;  | `EXPECT_TRUE(`_condition_`)`;   | _condition_ is true |
+| `ASSERT_FALSE(`_condition_`)`; | `EXPECT_FALSE(`_condition_`)`;  | _condition_ is false |
+
+Remember, when they fail, `ASSERT_*` yields a fatal failure and
+returns from the current function, while `EXPECT_*` yields a nonfatal
+failure, allowing the function to continue running. In either case, an
+assertion failure means its containing test fails.
+
+_Availability_: Linux, Windows, Mac.
+
+## Binary Comparison ##
+
+This section describes assertions that compare two values.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+|`ASSERT_EQ(`_expected_`, `_actual_`);`|`EXPECT_EQ(`_expected_`, `_actual_`);`| _expected_ `==` _actual_ |
+|`ASSERT_NE(`_val1_`, `_val2_`);`      |`EXPECT_NE(`_val1_`, `_val2_`);`      | _val1_ `!=` _val2_ |
+|`ASSERT_LT(`_val1_`, `_val2_`);`      |`EXPECT_LT(`_val1_`, `_val2_`);`      | _val1_ `<` _val2_ |
+|`ASSERT_LE(`_val1_`, `_val2_`);`      |`EXPECT_LE(`_val1_`, `_val2_`);`      | _val1_ `<=` _val2_ |
+|`ASSERT_GT(`_val1_`, `_val2_`);`      |`EXPECT_GT(`_val1_`, `_val2_`);`      | _val1_ `>` _val2_ |
+|`ASSERT_GE(`_val1_`, `_val2_`);`      |`EXPECT_GE(`_val1_`, `_val2_`);`      | _val1_ `>=` _val2_ |
+
+In the event of a failure, Google Test prints both _val1_ and _val2_
+. In `ASSERT_EQ*` and `EXPECT_EQ*` (and all other equality assertions
+we'll introduce later), you should put the expression you want to test
+in the position of _actual_, and put its expected value in _expected_,
+as Google Test's failure messages are optimized for this convention.
+
+Value arguments must be comparable by the assertion's comparison
+operator or you'll get a compiler error.  We used to require the
+arguments to support the `<<` operator for streaming to an `ostream`,
+but it's no longer necessary since v1.6.0 (if `<<` is supported, it
+will be called to print the arguments when the assertion fails;
+otherwise Google Test will attempt to print them in the best way it
+can. For more details and how to customize the printing of the
+arguments, see this Google Mock [recipe](../../googlemock/docs/CookBook.md#teaching-google-mock-how-to-print-your-values).).
+
+These assertions can work with a user-defined type, but only if you define the
+corresponding comparison operator (e.g. `==`, `<`, etc).  If the corresponding
+operator is defined, prefer using the `ASSERT_*()` macros because they will
+print out not only the result of the comparison, but the two operands as well.
+
+Arguments are always evaluated exactly once. Therefore, it's OK for the
+arguments to have side effects. However, as with any ordinary C/C++ function,
+the arguments' evaluation order is undefined (i.e. the compiler is free to
+choose any order) and your code should not depend on any particular argument
+evaluation order.
+
+`ASSERT_EQ()` does pointer equality on pointers. If used on two C strings, it
+tests if they are in the same memory location, not if they have the same value.
+Therefore, if you want to compare C strings (e.g. `const char*`) by value, use
+`ASSERT_STREQ()` , which will be described later on. In particular, to assert
+that a C string is `NULL`, use `ASSERT_STREQ(NULL, c_string)` . However, to
+compare two `string` objects, you should use `ASSERT_EQ`.
+
+Macros in this section work with both narrow and wide string objects (`string`
+and `wstring`).
+
+_Availability_: Linux, Windows, Mac.
+
+## String Comparison ##
+
+The assertions in this group compare two **C strings**. If you want to compare
+two `string` objects, use `EXPECT_EQ`, `EXPECT_NE`, and etc instead.
+
+| **Fatal assertion** | **Nonfatal assertion** | **Verifies** |
+|:--------------------|:-----------------------|:-------------|
+| `ASSERT_STREQ(`_expected\_str_`, `_actual\_str_`);`    | `EXPECT_STREQ(`_expected\_str_`, `_actual\_str_`);`     | the two C strings have the same content |
+| `ASSERT_STRNE(`_str1_`, `_str2_`);`    | `EXPECT_STRNE(`_str1_`, `_str2_`);`     | the two C strings have different content |
+| `ASSERT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);`| `EXPECT_STRCASEEQ(`_expected\_str_`, `_actual\_str_`);` | the two C strings have the same content, ignoring case |
+| `ASSERT_STRCASENE(`_str1_`, `_str2_`);`| `EXPECT_STRCASENE(`_str1_`, `_str2_`);` | the two C strings have different content, ignoring case |
+
+Note that "CASE" in an assertion name means that case is ignored.
+
+`*STREQ*` and `*STRNE*` also accept wide C strings (`wchar_t*`). If a
+comparison of two wide strings fails, their values will be printed as UTF-8
+narrow strings.
+
+A `NULL` pointer and an empty string are considered _different_.
+
+_Availability_: Linux, Windows, Mac.
+
+See also: For more string comparison tricks (substring, prefix, suffix, and
+regular expression matching, for example), see the [Advanced Google Test Guide](V1_7_AdvancedGuide.md).
+
+# Simple Tests #
+
+To create a test:
+  1. Use the `TEST()` macro to define and name a test function, These are ordinary C++ functions that don't return a value.
+  1. In this function, along with any valid C++ statements you want to include, use the various Google Test assertions to check values.
+  1. The test's result is determined by the assertions; if any assertion in the test fails (either fatally or non-fatally), or if the test crashes, the entire test fails. Otherwise, it succeeds.
+
+```
+TEST(test_case_name, test_name) {
+ ... test body ...
+}
+```
+
+
+`TEST()` arguments go from general to specific. The _first_ argument is the
+name of the test case, and the _second_ argument is the test's name within the
+test case. Both names must be valid C++ identifiers, and they should not contain underscore (`_`). A test's _full name_ consists of its containing test case and its
+individual name. Tests from different test cases can have the same individual
+name.
+
+For example, let's take a simple integer function:
+```
+int Factorial(int n); // Returns the factorial of n
+```
+
+A test case for this function might look like:
+```
+// Tests factorial of 0.
+TEST(FactorialTest, HandlesZeroInput) {
+  EXPECT_EQ(1, Factorial(0));
+}
+
+// Tests factorial of positive numbers.
+TEST(FactorialTest, HandlesPositiveInput) {
+  EXPECT_EQ(1, Factorial(1));
+  EXPECT_EQ(2, Factorial(2));
+  EXPECT_EQ(6, Factorial(3));
+  EXPECT_EQ(40320, Factorial(8));
+}
+```
+
+Google Test groups the test results by test cases, so logically-related tests
+should be in the same test case; in other words, the first argument to their
+`TEST()` should be the same. In the above example, we have two tests,
+`HandlesZeroInput` and `HandlesPositiveInput`, that belong to the same test
+case `FactorialTest`.
+
+_Availability_: Linux, Windows, Mac.
+
+# Test Fixtures: Using the Same Data Configuration for Multiple Tests #
+
+If you find yourself writing two or more tests that operate on similar data,
+you can use a _test fixture_. It allows you to reuse the same configuration of
+objects for several different tests.
+
+To create a fixture, just:
+  1. Derive a class from `::testing::Test` . Start its body with `protected:` or `public:` as we'll want to access fixture members from sub-classes.
+  1. Inside the class, declare any objects you plan to use.
+  1. If necessary, write a default constructor or `SetUp()` function to prepare the objects for each test. A common mistake is to spell `SetUp()` as `Setup()` with a small `u` - don't let that happen to you.
+  1. If necessary, write a destructor or `TearDown()` function to release any resources you allocated in `SetUp()` . To learn when you should use the constructor/destructor and when you should use `SetUp()/TearDown()`, read this [FAQ entry](V1_7_FAQ.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function).
+  1. If needed, define subroutines for your tests to share.
+
+When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to
+access objects and subroutines in the test fixture:
+```
+TEST_F(test_case_name, test_name) {
+ ... test body ...
+}
+```
+
+Like `TEST()`, the first argument is the test case name, but for `TEST_F()`
+this must be the name of the test fixture class. You've probably guessed: `_F`
+is for fixture.
+
+Unfortunately, the C++ macro system does not allow us to create a single macro
+that can handle both types of tests. Using the wrong macro causes a compiler
+error.
+
+Also, you must first define a test fixture class before using it in a
+`TEST_F()`, or you'll get the compiler error "`virtual outside class
+declaration`".
+
+For each test defined with `TEST_F()`, Google Test will:
+  1. Create a _fresh_ test fixture at runtime
+  1. Immediately initialize it via `SetUp()` ,
+  1. Run the test
+  1. Clean up by calling `TearDown()`
+  1. Delete the test fixture.  Note that different tests in the same test case have different test fixture objects, and Google Test always deletes a test fixture before it creates the next one. Google Test does not reuse the same test fixture for multiple tests. Any changes one test makes to the fixture do not affect other tests.
+
+As an example, let's write tests for a FIFO queue class named `Queue`, which
+has the following interface:
+```
+template <typename E> // E is the element type.
+class Queue {
+ public:
+  Queue();
+  void Enqueue(const E& element);
+  E* Dequeue(); // Returns NULL if the queue is empty.
+  size_t size() const;
+  ...
+};
+```
+
+First, define a fixture class. By convention, you should give it the name
+`FooTest` where `Foo` is the class being tested.
+```
+class QueueTest : public ::testing::Test {
+ protected:
+  virtual void SetUp() {
+    q1_.Enqueue(1);
+    q2_.Enqueue(2);
+    q2_.Enqueue(3);
+  }
+
+  // virtual void TearDown() {}
+
+  Queue<int> q0_;
+  Queue<int> q1_;
+  Queue<int> q2_;
+};
+```
+
+In this case, `TearDown()` is not needed since we don't have to clean up after
+each test, other than what's already done by the destructor.
+
+Now we'll write tests using `TEST_F()` and this fixture.
+```
+TEST_F(QueueTest, IsEmptyInitially) {
+  EXPECT_EQ(0, q0_.size());
+}
+
+TEST_F(QueueTest, DequeueWorks) {
+  int* n = q0_.Dequeue();
+  EXPECT_EQ(NULL, n);
+
+  n = q1_.Dequeue();
+  ASSERT_TRUE(n != NULL);
+  EXPECT_EQ(1, *n);
+  EXPECT_EQ(0, q1_.size());
+  delete n;
+
+  n = q2_.Dequeue();
+  ASSERT_TRUE(n != NULL);
+  EXPECT_EQ(2, *n);
+  EXPECT_EQ(1, q2_.size());
+  delete n;
+}
+```
+
+The above uses both `ASSERT_*` and `EXPECT_*` assertions. The rule of thumb is
+to use `EXPECT_*` when you want the test to continue to reveal more errors
+after the assertion failure, and use `ASSERT_*` when continuing after failure
+doesn't make sense. For example, the second assertion in the `Dequeue` test is
+`ASSERT_TRUE(n != NULL)`, as we need to dereference the pointer `n` later,
+which would lead to a segfault when `n` is `NULL`.
+
+When these tests run, the following happens:
+  1. Google Test constructs a `QueueTest` object (let's call it `t1` ).
+  1. `t1.SetUp()` initializes `t1` .
+  1. The first test ( `IsEmptyInitially` ) runs on `t1` .
+  1. `t1.TearDown()` cleans up after the test finishes.
+  1. `t1` is destructed.
+  1. The above steps are repeated on another `QueueTest` object, this time running the `DequeueWorks` test.
+
+_Availability_: Linux, Windows, Mac.
+
+_Note_: Google Test automatically saves all _Google Test_ flags when a test
+object is constructed, and restores them when it is destructed.
+
+# Invoking the Tests #
+
+`TEST()` and `TEST_F()` implicitly register their tests with Google Test. So, unlike with many other C++ testing frameworks, you don't have to re-list all your defined tests in order to run them.
+
+After defining your tests, you can run them with `RUN_ALL_TESTS()` , which returns `0` if all the tests are successful, or `1` otherwise. Note that `RUN_ALL_TESTS()` runs _all tests_ in your link unit -- they can be from different test cases, or even different source files.
+
+When invoked, the `RUN_ALL_TESTS()` macro:
+  1. Saves the state of all  Google Test flags.
+  1. Creates a test fixture object for the first test.
+  1. Initializes it via `SetUp()`.
+  1. Runs the test on the fixture object.
+  1. Cleans up the fixture via `TearDown()`.
+  1. Deletes the fixture.
+  1. Restores the state of all Google Test flags.
+  1. Repeats the above steps for the next test, until all tests have run.
+
+In addition, if the text fixture's constructor generates a fatal failure in
+step 2, there is no point for step 3 - 5 and they are thus skipped. Similarly,
+if step 3 generates a fatal failure, step 4 will be skipped.
+
+_Important_: You must not ignore the return value of `RUN_ALL_TESTS()`, or `gcc`
+will give you a compiler error. The rationale for this design is that the
+automated testing service determines whether a test has passed based on its
+exit code, not on its stdout/stderr output; thus your `main()` function must
+return the value of `RUN_ALL_TESTS()`.
+
+Also, you should call `RUN_ALL_TESTS()` only **once**. Calling it more than once
+conflicts with some advanced Google Test features (e.g. thread-safe death
+tests) and thus is not supported.
+
+_Availability_: Linux, Windows, Mac.
+
+# Writing the main() Function #
+
+You can start from this boilerplate:
+```
+#include "this/package/foo.h"
+#include "gtest/gtest.h"
+
+namespace {
+
+// The fixture for testing class Foo.
+class FooTest : public ::testing::Test {
+ protected:
+  // You can remove any or all of the following functions if its body
+  // is empty.
+
+  FooTest() {
+    // You can do set-up work for each test here.
+  }
+
+  virtual ~FooTest() {
+    // You can do clean-up work that doesn't throw exceptions here.
+  }
+
+  // If the constructor and destructor are not enough for setting up
+  // and cleaning up each test, you can define the following methods:
+
+  virtual void SetUp() {
+    // Code here will be called immediately after the constructor (right
+    // before each test).
+  }
+
+  virtual void TearDown() {
+    // Code here will be called immediately after each test (right
+    // before the destructor).
+  }
+
+  // Objects declared here can be used by all tests in the test case for Foo.
+};
+
+// Tests that the Foo::Bar() method does Abc.
+TEST_F(FooTest, MethodBarDoesAbc) {
+  const string input_filepath = "this/package/testdata/myinputfile.dat";
+  const string output_filepath = "this/package/testdata/myoutputfile.dat";
+  Foo f;
+  EXPECT_EQ(0, f.Bar(input_filepath, output_filepath));
+}
+
+// Tests that Foo does Xyz.
+TEST_F(FooTest, DoesXyz) {
+  // Exercises the Xyz feature of Foo.
+}
+
+}  // namespace
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+```
+
+The `::testing::InitGoogleTest()` function parses the command line for Google
+Test flags, and removes all recognized flags. This allows the user to control a
+test program's behavior via various flags, which we'll cover in [AdvancedGuide](V1_7_AdvancedGuide.md).
+You must call this function before calling `RUN_ALL_TESTS()`, or the flags
+won't be properly initialized.
+
+On Windows, `InitGoogleTest()` also works with wide strings, so it can be used
+in programs compiled in `UNICODE` mode as well.
+
+But maybe you think that writing all those main() functions is too much work? We agree with you completely and that's why Google Test provides a basic implementation of main(). If it fits your needs, then just link your test with gtest\_main library and you are good to go.
+
+## Important note for Visual C++ users ##
+If you put your tests into a library and your `main()` function is in a different library or in your .exe file, those tests will not run. The reason is a [bug](https://connect.microsoft.com/feedback/viewfeedback.aspx?FeedbackID=244410&siteid=210) in Visual C++. When you define your tests, Google Test creates certain static objects to register them. These objects are not referenced from elsewhere but their constructors are still supposed to run. When Visual C++ linker sees that nothing in the library is referenced from other places it throws the library out. You have to reference your library with tests from your main program to keep the linker from discarding it. Here is how to do it. Somewhere in your library code declare a function:
+```
+__declspec(dllexport) int PullInMyLibrary() { return 0; }
+```
+If you put your tests in a static library (not DLL) then `__declspec(dllexport)` is not required. Now, in your main program, write a code that invokes that function:
+```
+int PullInMyLibrary();
+static int dummy = PullInMyLibrary();
+```
+This will keep your tests referenced and will make them register themselves at startup.
+
+In addition, if you define your tests in a static library, add `/OPT:NOREF` to your main program linker options. If you use MSVC++ IDE, go to your .exe project properties/Configuration Properties/Linker/Optimization and set References setting to `Keep Unreferenced Data (/OPT:NOREF)`. This will keep Visual C++ linker from discarding individual symbols generated by your tests from the final executable.
+
+There is one more pitfall, though. If you use Google Test as a static library (that's how it is defined in gtest.vcproj) your tests must also reside in a static library. If you have to have them in a DLL, you _must_ change Google Test to build into a DLL as well. Otherwise your tests will not run correctly or will not run at all. The general conclusion here is: make your life easier - do not write your tests in libraries!
+
+# Where to Go from Here #
+
+Congratulations! You've learned the Google Test basics. You can start writing
+and running Google Test tests, read some [samples](V1_7_Samples.md), or continue with
+[AdvancedGuide](V1_7_AdvancedGuide.md), which describes many more useful Google Test features.
+
+# Known Limitations #
+
+Google Test is designed to be thread-safe.  The implementation is
+thread-safe on systems where the `pthreads` library is available.  It
+is currently _unsafe_ to use Google Test assertions from two threads
+concurrently on other systems (e.g. Windows).  In most tests this is
+not an issue as usually the assertions are done in the main thread. If
+you want to help, you can volunteer to implement the necessary
+synchronization primitives in `gtest-port.h` for your platform.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_PumpManual.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_PumpManual.md
new file mode 100644
index 0000000000..8184f153ca
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_PumpManual.md
@@ -0,0 +1,177 @@
+
+
+<b>P</b>ump is <b>U</b>seful for <b>M</b>eta <b>P</b>rogramming.
+
+# The Problem #
+
+Template and macro libraries often need to define many classes,
+functions, or macros that vary only (or almost only) in the number of
+arguments they take. It's a lot of repetitive, mechanical, and
+error-prone work.
+
+Variadic templates and variadic macros can alleviate the problem.
+However, while both are being considered by the C++ committee, neither
+is in the standard yet or widely supported by compilers.  Thus they
+are often not a good choice, especially when your code needs to be
+portable. And their capabilities are still limited.
+
+As a result, authors of such libraries often have to write scripts to
+generate their implementation. However, our experience is that it's
+tedious to write such scripts, which tend to reflect the structure of
+the generated code poorly and are often hard to read and edit. For
+example, a small change needed in the generated code may require some
+non-intuitive, non-trivial changes in the script. This is especially
+painful when experimenting with the code.
+
+# Our Solution #
+
+Pump (for Pump is Useful for Meta Programming, Pretty Useful for Meta
+Programming, or Practical Utility for Meta Programming, whichever you
+prefer) is a simple meta-programming tool for C++. The idea is that a
+programmer writes a `foo.pump` file which contains C++ code plus meta
+code that manipulates the C++ code. The meta code can handle
+iterations over a range, nested iterations, local meta variable
+definitions, simple arithmetic, and conditional expressions. You can
+view it as a small Domain-Specific Language. The meta language is
+designed to be non-intrusive (s.t. it won't confuse Emacs' C++ mode,
+for example) and concise, making Pump code intuitive and easy to
+maintain.
+
+## Highlights ##
+
+  * The implementation is in a single Python script and thus ultra portable: no build or installation is needed and it works cross platforms.
+  * Pump tries to be smart with respect to [Google's style guide](http://code.google.com/p/google-styleguide/): it breaks long lines (easy to have when they are generated) at acceptable places to fit within 80 columns and indent the continuation lines correctly.
+  * The format is human-readable and more concise than XML.
+  * The format works relatively well with Emacs' C++ mode.
+
+## Examples ##
+
+The following Pump code (where meta keywords start with `$`, `[[` and `]]` are meta brackets, and `$$` starts a meta comment that ends with the line):
+
+```
+$var n = 3     $$ Defines a meta variable n.
+$range i 0..n  $$ Declares the range of meta iterator i (inclusive).
+$for i [[
+               $$ Meta loop.
+// Foo$i does blah for $i-ary predicates.
+$range j 1..i
+template <size_t N $for j [[, typename A$j]]>
+class Foo$i {
+$if i == 0 [[
+  blah a;
+]] $elif i <= 2 [[
+  blah b;
+]] $else [[
+  blah c;
+]]
+};
+
+]]
+```
+
+will be translated by the Pump compiler to:
+
+```
+// Foo0 does blah for 0-ary predicates.
+template <size_t N>
+class Foo0 {
+  blah a;
+};
+
+// Foo1 does blah for 1-ary predicates.
+template <size_t N, typename A1>
+class Foo1 {
+  blah b;
+};
+
+// Foo2 does blah for 2-ary predicates.
+template <size_t N, typename A1, typename A2>
+class Foo2 {
+  blah b;
+};
+
+// Foo3 does blah for 3-ary predicates.
+template <size_t N, typename A1, typename A2, typename A3>
+class Foo3 {
+  blah c;
+};
+```
+
+In another example,
+
+```
+$range i 1..n
+Func($for i + [[a$i]]);
+$$ The text between i and [[ is the separator between iterations.
+```
+
+will generate one of the following lines (without the comments), depending on the value of `n`:
+
+```
+Func();              // If n is 0.
+Func(a1);            // If n is 1.
+Func(a1 + a2);       // If n is 2.
+Func(a1 + a2 + a3);  // If n is 3.
+// And so on...
+```
+
+## Constructs ##
+
+We support the following meta programming constructs:
+
+| `$var id = exp` | Defines a named constant value. `$id` is valid util the end of the current meta lexical block. |
+|:----------------|:-----------------------------------------------------------------------------------------------|
+| `$range id exp..exp` | Sets the range of an iteration variable, which can be reused in multiple loops later.          |
+| `$for id sep [[ code ]]` | Iteration. The range of `id` must have been defined earlier. `$id` is valid in `code`.         |
+| `$($)`          | Generates a single `$` character.                                                              |
+| `$id`           | Value of the named constant or iteration variable.                                             |
+| `$(exp)`        | Value of the expression.                                                                       |
+| `$if exp [[ code ]] else_branch` | Conditional.                                                                                   |
+| `[[ code ]]`    | Meta lexical block.                                                                            |
+| `cpp_code`      | Raw C++ code.                                                                                  |
+| `$$ comment`    | Meta comment.                                                                                  |
+
+**Note:** To give the user some freedom in formatting the Pump source
+code, Pump ignores a new-line character if it's right after `$for foo`
+or next to `[[` or `]]`. Without this rule you'll often be forced to write
+very long lines to get the desired output. Therefore sometimes you may
+need to insert an extra new-line in such places for a new-line to show
+up in your output.
+
+## Grammar ##
+
+```
+code ::= atomic_code*
+atomic_code ::= $var id = exp
+    | $var id = [[ code ]]
+    | $range id exp..exp
+    | $for id sep [[ code ]]
+    | $($)
+    | $id
+    | $(exp)
+    | $if exp [[ code ]] else_branch
+    | [[ code ]]
+    | cpp_code
+sep ::= cpp_code | empty_string
+else_branch ::= $else [[ code ]]
+    | $elif exp [[ code ]] else_branch
+    | empty_string
+exp ::= simple_expression_in_Python_syntax
+```
+
+## Code ##
+
+You can find the source code of Pump in [scripts/pump.py](../scripts/pump.py). It is still
+very unpolished and lacks automated tests, although it has been
+successfully used many times. If you find a chance to use it in your
+project, please let us know what you think!  We also welcome help on
+improving Pump.
+
+## Real Examples ##
+
+You can find real-world applications of Pump in [Google Test](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgoogletest\.googlecode\.com) and [Google Mock](http://www.google.com/codesearch?q=file%3A\.pump%24+package%3Ahttp%3A%2F%2Fgooglemock\.googlecode\.com).  The source file `foo.h.pump` generates `foo.h`.
+
+## Tips ##
+
+  * If a meta variable is followed by a letter or digit, you can separate them using `[[]]`, which inserts an empty string. For example `Foo$j[[]]Helper` generate `Foo1Helper` when `j` is 1.
+  * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_Samples.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_Samples.md
new file mode 100644
index 0000000000..f21d200567
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_Samples.md
@@ -0,0 +1,14 @@
+If you're like us, you'd like to look at some Google Test sample code.  The
+[samples folder](../samples) has a number of well-commented samples showing how to use a
+variety of Google Test features.
+
+  * [Sample #1](../samples/sample1_unittest.cc) shows the basic steps of using Google Test to test C++ functions.
+  * [Sample #2](../samples/sample2_unittest.cc) shows a more complex unit test for a class with multiple member functions.
+  * [Sample #3](../samples/sample3_unittest.cc) uses a test fixture.
+  * [Sample #4](../samples/sample4_unittest.cc) is another basic example of using Google Test.
+  * [Sample #5](../samples/sample5_unittest.cc) teaches how to reuse a test fixture in multiple test cases by deriving sub-fixtures from it.
+  * [Sample #6](../samples/sample6_unittest.cc) demonstrates type-parameterized tests.
+  * [Sample #7](../samples/sample7_unittest.cc) teaches the basics of value-parameterized tests.
+  * [Sample #8](../samples/sample8_unittest.cc) shows using `Combine()` in value-parameterized tests.
+  * [Sample #9](../samples/sample9_unittest.cc) shows use of the listener API to modify Google Test's console output and the use of its reflection API to inspect test results.
+  * [Sample #10](../samples/sample10_unittest.cc) shows use of the listener API to implement a primitive memory leak checker.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_XcodeGuide.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_XcodeGuide.md
new file mode 100644
index 0000000000..bf24bf51bf
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/V1_7_XcodeGuide.md
@@ -0,0 +1,93 @@
+
+
+This guide will explain how to use the Google Testing Framework in your Xcode projects on Mac OS X. This tutorial begins by quickly explaining what to do for experienced users. After the quick start, the guide goes provides additional explanation about each step.
+
+# Quick Start #
+
+Here is the quick guide for using Google Test in your Xcode project.
+
+  1. Download the source from the [website](http://code.google.com/p/googletest) using this command: `svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only`
+  1. Open up the `gtest.xcodeproj` in the `googletest-read-only/xcode/` directory and build the gtest.framework.
+  1. Create a new "Shell Tool" target in your Xcode project called something like "UnitTests"
+  1. Add the gtest.framework to your project and add it to the "Link Binary with Libraries" build phase of "UnitTests"
+  1. Add your unit test source code to the "Compile Sources" build phase of "UnitTests"
+  1. Edit the "UnitTests" executable and add an environment variable named "DYLD\_FRAMEWORK\_PATH" with a value equal to the path to the framework containing the gtest.framework relative to the compiled executable.
+  1. Build and Go
+
+The following sections further explain each of the steps listed above in depth, describing in more detail how to complete it including some variations.
+
+# Get the Source #
+
+Currently, the gtest.framework discussed here isn't available in a tagged release of Google Test, it is only available in the trunk. As explained at the Google Test [site](http://code.google.com/p/googletest/source/checkout">svn), you can get the code from anonymous SVN with this command:
+
+```
+svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only
+```
+
+Alternatively, if you are working with Subversion in your own code base, you can add Google Test as an external dependency to your own Subversion repository. By following this approach, everyone that checks out your svn repository will also receive a copy of Google Test (a specific version, if you wish) without having to check it out explicitly. This makes the set up of your project simpler and reduces the copied code in the repository.
+
+To use `svn:externals`, decide where you would like to have the external source reside. You might choose to put the external source inside the trunk, because you want it to be part of the branch when you make a release. However, keeping it outside the trunk in a version-tagged directory called something like `third-party/googletest/1.0.1`, is another option. Once the location is established, use `svn propedit svn:externals _directory_` to set the svn:externals property on a directory in your repository. This directory won't contain the code, but be its versioned parent directory.
+
+The command `svn propedit` will bring up your Subversion editor, making editing the long, (potentially multi-line) property simpler. This same method can be used to check out a tagged branch, by using the appropriate URL (e.g. `http://googletest.googlecode.com/svn/tags/release-1.0.1`). Additionally, the svn:externals property allows the specification of a particular revision of the trunk with the `-r_##_` option (e.g. `externals/src/googletest -r60 http://googletest.googlecode.com/svn/trunk`).
+
+Here is an example of using the svn:externals properties on a trunk (read via `svn propget`) of a project. This value checks out a copy of Google Test into the `trunk/externals/src/googletest/` directory.
+
+```
+[Computer:svn] user$ svn propget svn:externals trunk
+externals/src/googletest http://googletest.googlecode.com/svn/trunk
+```
+
+# Add the Framework to Your Project #
+
+The next step is to build and add the gtest.framework to your own project. This guide describes two common ways below.
+
+  * **Option 1** --- The simplest way to add Google Test to your own project, is to open gtest.xcodeproj (found in the xcode/ directory of the Google Test trunk) and build the framework manually. Then, add the built framework into your project using the "Add->Existing Framework..." from the context menu or "Project->Add..." from the main menu. The gtest.framework is relocatable and contains the headers and object code that you'll need to make tests. This method requires rebuilding every time you upgrade Google Test in your project.
+  * **Option 2** --- If you are going to be living off the trunk of Google Test, incorporating its latest features into your unit tests (or are a Google Test developer yourself). You'll want to rebuild the framework every time the source updates. to do this, you'll need to add the gtest.xcodeproj file, not the framework itself, to your own Xcode project. Then, from the build products that are revealed by the project's disclosure triangle, you can find the gtest.framework, which can be added to your targets (discussed below).
+
+# Make a Test Target #
+
+To start writing tests, make a new "Shell Tool" target. This target template is available under BSD, Cocoa, or Carbon. Add your unit test source code to the "Compile Sources" build phase of the target.
+
+Next, you'll want to add gtest.framework in two different ways, depending upon which option you chose above.
+
+  * **Option 1** --- During compilation, Xcode will need to know that you are linking against the gtest.framework. Add the gtest.framework to the "Link Binary with Libraries" build phase of your test target. This will include the Google Test headers in your header search path, and will tell the linker where to find the library.
+  * **Option 2** --- If your working out of the trunk, you'll also want to add gtest.framework to your "Link Binary with Libraries" build phase of your test target. In addition, you'll  want to add the gtest.framework as a dependency to your unit test target. This way, Xcode will make sure that gtest.framework is up to date, every time your build your target. Finally, if you don't share build directories with Google Test, you'll have to copy the gtest.framework into your own build products directory using a "Run Script" build phase.
+
+# Set Up the Executable Run Environment #
+
+Since the unit test executable is a shell tool, it doesn't have a bundle with a `Contents/Frameworks` directory, in which to place gtest.framework. Instead, the dynamic linker must be told at runtime to search for the framework in another location. This can be accomplished by setting the "DYLD\_FRAMEWORK\_PATH" environment variable in the "Edit Active Executable ..." Arguments tab, under "Variables to be set in the environment:". The path for this value is the path (relative or absolute) of the directory containing the gtest.framework.
+
+If you haven't set up the DYLD\_FRAMEWORK\_PATH, correctly, you might get a message like this:
+
+```
+[Session started at 2008-08-15 06:23:57 -0600.]
+  dyld: Library not loaded: @loader_path/../Frameworks/gtest.framework/Versions/A/gtest
+    Referenced from: /Users/username/Documents/Sandbox/gtestSample/build/Debug/WidgetFrameworkTest
+    Reason: image not found
+```
+
+To correct this problem, got to the directory containing the executable named in "Referenced from:" value in the error message above. Then, with the terminal in this location, find the relative path to the directory containing the gtest.framework. That is the value you'll need to set as the DYLD\_FRAMEWORK\_PATH.
+
+# Build and Go #
+
+Now, when you click "Build and Go", the test will be executed. Dumping out something like this:
+
+```
+[Session started at 2008-08-06 06:36:13 -0600.]
+[==========] Running 2 tests from 1 test case.
+[----------] Global test environment set-up.
+[----------] 2 tests from WidgetInitializerTest
+[ RUN      ] WidgetInitializerTest.TestConstructor
+[       OK ] WidgetInitializerTest.TestConstructor
+[ RUN      ] WidgetInitializerTest.TestConversion
+[       OK ] WidgetInitializerTest.TestConversion
+[----------] Global test environment tear-down
+[==========] 2 tests from 1 test case ran.
+[  PASSED  ] 2 tests.
+
+The Debugger has exited with status 0.  
+```
+
+# Summary #
+
+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/XcodeGuide.md b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/XcodeGuide.md
new file mode 100644
index 0000000000..bf24bf51bf
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/docs/XcodeGuide.md
@@ -0,0 +1,93 @@
+
+
+This guide will explain how to use the Google Testing Framework in your Xcode projects on Mac OS X. This tutorial begins by quickly explaining what to do for experienced users. After the quick start, the guide goes provides additional explanation about each step.
+
+# Quick Start #
+
+Here is the quick guide for using Google Test in your Xcode project.
+
+  1. Download the source from the [website](http://code.google.com/p/googletest) using this command: `svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only`
+  1. Open up the `gtest.xcodeproj` in the `googletest-read-only/xcode/` directory and build the gtest.framework.
+  1. Create a new "Shell Tool" target in your Xcode project called something like "UnitTests"
+  1. Add the gtest.framework to your project and add it to the "Link Binary with Libraries" build phase of "UnitTests"
+  1. Add your unit test source code to the "Compile Sources" build phase of "UnitTests"
+  1. Edit the "UnitTests" executable and add an environment variable named "DYLD\_FRAMEWORK\_PATH" with a value equal to the path to the framework containing the gtest.framework relative to the compiled executable.
+  1. Build and Go
+
+The following sections further explain each of the steps listed above in depth, describing in more detail how to complete it including some variations.
+
+# Get the Source #
+
+Currently, the gtest.framework discussed here isn't available in a tagged release of Google Test, it is only available in the trunk. As explained at the Google Test [site](http://code.google.com/p/googletest/source/checkout">svn), you can get the code from anonymous SVN with this command:
+
+```
+svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only
+```
+
+Alternatively, if you are working with Subversion in your own code base, you can add Google Test as an external dependency to your own Subversion repository. By following this approach, everyone that checks out your svn repository will also receive a copy of Google Test (a specific version, if you wish) without having to check it out explicitly. This makes the set up of your project simpler and reduces the copied code in the repository.
+
+To use `svn:externals`, decide where you would like to have the external source reside. You might choose to put the external source inside the trunk, because you want it to be part of the branch when you make a release. However, keeping it outside the trunk in a version-tagged directory called something like `third-party/googletest/1.0.1`, is another option. Once the location is established, use `svn propedit svn:externals _directory_` to set the svn:externals property on a directory in your repository. This directory won't contain the code, but be its versioned parent directory.
+
+The command `svn propedit` will bring up your Subversion editor, making editing the long, (potentially multi-line) property simpler. This same method can be used to check out a tagged branch, by using the appropriate URL (e.g. `http://googletest.googlecode.com/svn/tags/release-1.0.1`). Additionally, the svn:externals property allows the specification of a particular revision of the trunk with the `-r_##_` option (e.g. `externals/src/googletest -r60 http://googletest.googlecode.com/svn/trunk`).
+
+Here is an example of using the svn:externals properties on a trunk (read via `svn propget`) of a project. This value checks out a copy of Google Test into the `trunk/externals/src/googletest/` directory.
+
+```
+[Computer:svn] user$ svn propget svn:externals trunk
+externals/src/googletest http://googletest.googlecode.com/svn/trunk
+```
+
+# Add the Framework to Your Project #
+
+The next step is to build and add the gtest.framework to your own project. This guide describes two common ways below.
+
+  * **Option 1** --- The simplest way to add Google Test to your own project, is to open gtest.xcodeproj (found in the xcode/ directory of the Google Test trunk) and build the framework manually. Then, add the built framework into your project using the "Add->Existing Framework..." from the context menu or "Project->Add..." from the main menu. The gtest.framework is relocatable and contains the headers and object code that you'll need to make tests. This method requires rebuilding every time you upgrade Google Test in your project.
+  * **Option 2** --- If you are going to be living off the trunk of Google Test, incorporating its latest features into your unit tests (or are a Google Test developer yourself). You'll want to rebuild the framework every time the source updates. to do this, you'll need to add the gtest.xcodeproj file, not the framework itself, to your own Xcode project. Then, from the build products that are revealed by the project's disclosure triangle, you can find the gtest.framework, which can be added to your targets (discussed below).
+
+# Make a Test Target #
+
+To start writing tests, make a new "Shell Tool" target. This target template is available under BSD, Cocoa, or Carbon. Add your unit test source code to the "Compile Sources" build phase of the target.
+
+Next, you'll want to add gtest.framework in two different ways, depending upon which option you chose above.
+
+  * **Option 1** --- During compilation, Xcode will need to know that you are linking against the gtest.framework. Add the gtest.framework to the "Link Binary with Libraries" build phase of your test target. This will include the Google Test headers in your header search path, and will tell the linker where to find the library.
+  * **Option 2** --- If your working out of the trunk, you'll also want to add gtest.framework to your "Link Binary with Libraries" build phase of your test target. In addition, you'll  want to add the gtest.framework as a dependency to your unit test target. This way, Xcode will make sure that gtest.framework is up to date, every time your build your target. Finally, if you don't share build directories with Google Test, you'll have to copy the gtest.framework into your own build products directory using a "Run Script" build phase.
+
+# Set Up the Executable Run Environment #
+
+Since the unit test executable is a shell tool, it doesn't have a bundle with a `Contents/Frameworks` directory, in which to place gtest.framework. Instead, the dynamic linker must be told at runtime to search for the framework in another location. This can be accomplished by setting the "DYLD\_FRAMEWORK\_PATH" environment variable in the "Edit Active Executable ..." Arguments tab, under "Variables to be set in the environment:". The path for this value is the path (relative or absolute) of the directory containing the gtest.framework.
+
+If you haven't set up the DYLD\_FRAMEWORK\_PATH, correctly, you might get a message like this:
+
+```
+[Session started at 2008-08-15 06:23:57 -0600.]
+  dyld: Library not loaded: @loader_path/../Frameworks/gtest.framework/Versions/A/gtest
+    Referenced from: /Users/username/Documents/Sandbox/gtestSample/build/Debug/WidgetFrameworkTest
+    Reason: image not found
+```
+
+To correct this problem, got to the directory containing the executable named in "Referenced from:" value in the error message above. Then, with the terminal in this location, find the relative path to the directory containing the gtest.framework. That is the value you'll need to set as the DYLD\_FRAMEWORK\_PATH.
+
+# Build and Go #
+
+Now, when you click "Build and Go", the test will be executed. Dumping out something like this:
+
+```
+[Session started at 2008-08-06 06:36:13 -0600.]
+[==========] Running 2 tests from 1 test case.
+[----------] Global test environment set-up.
+[----------] 2 tests from WidgetInitializerTest
+[ RUN      ] WidgetInitializerTest.TestConstructor
+[       OK ] WidgetInitializerTest.TestConstructor
+[ RUN      ] WidgetInitializerTest.TestConversion
+[       OK ] WidgetInitializerTest.TestConversion
+[----------] Global test environment tear-down
+[==========] 2 tests from 1 test case ran.
+[  PASSED  ] 2 tests.
+
+The Debugger has exited with status 0.  
+```
+
+# Summary #
+
+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-death-test.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-death-test.h
new file mode 100644
index 0000000000..957a69c6a9
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-death-test.h
@@ -0,0 +1,294 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file defines the public API for death tests.  It is
+// #included by gtest.h so a user doesn't need to include this
+// directly.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
+#define GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
+
+#include "gtest/internal/gtest-death-test-internal.h"
+
+namespace testing {
+
+// This flag controls the style of death tests.  Valid values are "threadsafe",
+// meaning that the death test child process will re-execute the test binary
+// from the start, running only a single death test, or "fast",
+// meaning that the child process will execute the test logic immediately
+// after forking.
+GTEST_DECLARE_string_(death_test_style);
+
+#if GTEST_HAS_DEATH_TEST
+
+namespace internal {
+
+// Returns a Boolean value indicating whether the caller is currently
+// executing in the context of the death test child process.  Tools such as
+// Valgrind heap checkers may need this to modify their behavior in death
+// tests.  IMPORTANT: This is an internal utility.  Using it may break the
+// implementation of death tests.  User code MUST NOT use it.
+GTEST_API_ bool InDeathTestChild();
+
+}  // namespace internal
+
+// The following macros are useful for writing death tests.
+
+// Here's what happens when an ASSERT_DEATH* or EXPECT_DEATH* is
+// executed:
+//
+//   1. It generates a warning if there is more than one active
+//   thread.  This is because it's safe to fork() or clone() only
+//   when there is a single thread.
+//
+//   2. The parent process clone()s a sub-process and runs the death
+//   test in it; the sub-process exits with code 0 at the end of the
+//   death test, if it hasn't exited already.
+//
+//   3. The parent process waits for the sub-process to terminate.
+//
+//   4. The parent process checks the exit code and error message of
+//   the sub-process.
+//
+// Examples:
+//
+//   ASSERT_DEATH(server.SendMessage(56, "Hello"), "Invalid port number");
+//   for (int i = 0; i < 5; i++) {
+//     EXPECT_DEATH(server.ProcessRequest(i),
+//                  "Invalid request .* in ProcessRequest()")
+//                  << "Failed to die on request " << i;
+//   }
+//
+//   ASSERT_EXIT(server.ExitNow(), ::testing::ExitedWithCode(0), "Exiting");
+//
+//   bool KilledBySIGHUP(int exit_code) {
+//     return WIFSIGNALED(exit_code) && WTERMSIG(exit_code) == SIGHUP;
+//   }
+//
+//   ASSERT_EXIT(client.HangUpServer(), KilledBySIGHUP, "Hanging up!");
+//
+// On the regular expressions used in death tests:
+//
+//   On POSIX-compliant systems (*nix), we use the <regex.h> library,
+//   which uses the POSIX extended regex syntax.
+//
+//   On other platforms (e.g. Windows), we only support a simple regex
+//   syntax implemented as part of Google Test.  This limited
+//   implementation should be enough most of the time when writing
+//   death tests; though it lacks many features you can find in PCRE
+//   or POSIX extended regex syntax.  For example, we don't support
+//   union ("x|y"), grouping ("(xy)"), brackets ("[xy]"), and
+//   repetition count ("x{5,7}"), among others.
+//
+//   Below is the syntax that we do support.  We chose it to be a
+//   subset of both PCRE and POSIX extended regex, so it's easy to
+//   learn wherever you come from.  In the following: 'A' denotes a
+//   literal character, period (.), or a single \\ escape sequence;
+//   'x' and 'y' denote regular expressions; 'm' and 'n' are for
+//   natural numbers.
+//
+//     c     matches any literal character c
+//     \\d   matches any decimal digit
+//     \\D   matches any character that's not a decimal digit
+//     \\f   matches \f
+//     \\n   matches \n
+//     \\r   matches \r
+//     \\s   matches any ASCII whitespace, including \n
+//     \\S   matches any character that's not a whitespace
+//     \\t   matches \t
+//     \\v   matches \v
+//     \\w   matches any letter, _, or decimal digit
+//     \\W   matches any character that \\w doesn't match
+//     \\c   matches any literal character c, which must be a punctuation
+//     .     matches any single character except \n
+//     A?    matches 0 or 1 occurrences of A
+//     A*    matches 0 or many occurrences of A
+//     A+    matches 1 or many occurrences of A
+//     ^     matches the beginning of a string (not that of each line)
+//     $     matches the end of a string (not that of each line)
+//     xy    matches x followed by y
+//
+//   If you accidentally use PCRE or POSIX extended regex features
+//   not implemented by us, you will get a run-time failure.  In that
+//   case, please try to rewrite your regular expression within the
+//   above syntax.
+//
+//   This implementation is *not* meant to be as highly tuned or robust
+//   as a compiled regex library, but should perform well enough for a
+//   death test, which already incurs significant overhead by launching
+//   a child process.
+//
+// Known caveats:
+//
+//   A "threadsafe" style death test obtains the path to the test
+//   program from argv[0] and re-executes it in the sub-process.  For
+//   simplicity, the current implementation doesn't search the PATH
+//   when launching the sub-process.  This means that the user must
+//   invoke the test program via a path that contains at least one
+//   path separator (e.g. path/to/foo_test and
+//   /absolute/path/to/bar_test are fine, but foo_test is not).  This
+//   is rarely a problem as people usually don't put the test binary
+//   directory in PATH.
+//
+// TODO(wan@google.com): make thread-safe death tests search the PATH.
+
+// Asserts that a given statement causes the program to exit, with an
+// integer exit status that satisfies predicate, and emitting error output
+// that matches regex.
+# define ASSERT_EXIT(statement, predicate, regex) \
+    GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_FATAL_FAILURE_)
+
+// Like ASSERT_EXIT, but continues on to successive tests in the
+// test case, if any:
+# define EXPECT_EXIT(statement, predicate, regex) \
+    GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_NONFATAL_FAILURE_)
+
+// Asserts that a given statement causes the program to exit, either by
+// explicitly exiting with a nonzero exit code or being killed by a
+// signal, and emitting error output that matches regex.
+# define ASSERT_DEATH(statement, regex) \
+    ASSERT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
+
+// Like ASSERT_DEATH, but continues on to successive tests in the
+// test case, if any:
+# define EXPECT_DEATH(statement, regex) \
+    EXPECT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
+
+// Two predicate classes that can be used in {ASSERT,EXPECT}_EXIT*:
+
+// Tests that an exit code describes a normal exit with a given exit code.
+class GTEST_API_ ExitedWithCode {
+ public:
+  explicit ExitedWithCode(int exit_code);
+  bool operator()(int exit_status) const;
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ExitedWithCode& other);
+
+  const int exit_code_;
+};
+
+# if !GTEST_OS_WINDOWS
+// Tests that an exit code describes an exit due to termination by a
+// given signal.
+class GTEST_API_ KilledBySignal {
+ public:
+  explicit KilledBySignal(int signum);
+  bool operator()(int exit_status) const;
+ private:
+  const int signum_;
+};
+# endif  // !GTEST_OS_WINDOWS
+
+// EXPECT_DEBUG_DEATH asserts that the given statements die in debug mode.
+// The death testing framework causes this to have interesting semantics,
+// since the sideeffects of the call are only visible in opt mode, and not
+// in debug mode.
+//
+// In practice, this can be used to test functions that utilize the
+// LOG(DFATAL) macro using the following style:
+//
+// int DieInDebugOr12(int* sideeffect) {
+//   if (sideeffect) {
+//     *sideeffect = 12;
+//   }
+//   LOG(DFATAL) << "death";
+//   return 12;
+// }
+//
+// TEST(TestCase, TestDieOr12WorksInDgbAndOpt) {
+//   int sideeffect = 0;
+//   // Only asserts in dbg.
+//   EXPECT_DEBUG_DEATH(DieInDebugOr12(&sideeffect), "death");
+//
+// #ifdef NDEBUG
+//   // opt-mode has sideeffect visible.
+//   EXPECT_EQ(12, sideeffect);
+// #else
+//   // dbg-mode no visible sideeffect.
+//   EXPECT_EQ(0, sideeffect);
+// #endif
+// }
+//
+// This will assert that DieInDebugReturn12InOpt() crashes in debug
+// mode, usually due to a DCHECK or LOG(DFATAL), but returns the
+// appropriate fallback value (12 in this case) in opt mode. If you
+// need to test that a function has appropriate side-effects in opt
+// mode, include assertions against the side-effects.  A general
+// pattern for this is:
+//
+// EXPECT_DEBUG_DEATH({
+//   // Side-effects here will have an effect after this statement in
+//   // opt mode, but none in debug mode.
+//   EXPECT_EQ(12, DieInDebugOr12(&sideeffect));
+// }, "death");
+//
+# ifdef NDEBUG
+
+#  define EXPECT_DEBUG_DEATH(statement, regex) \
+  GTEST_EXECUTE_STATEMENT_(statement, regex)
+
+#  define ASSERT_DEBUG_DEATH(statement, regex) \
+  GTEST_EXECUTE_STATEMENT_(statement, regex)
+
+# else
+
+#  define EXPECT_DEBUG_DEATH(statement, regex) \
+  EXPECT_DEATH(statement, regex)
+
+#  define ASSERT_DEBUG_DEATH(statement, regex) \
+  ASSERT_DEATH(statement, regex)
+
+# endif  // NDEBUG for EXPECT_DEBUG_DEATH
+#endif  // GTEST_HAS_DEATH_TEST
+
+// EXPECT_DEATH_IF_SUPPORTED(statement, regex) and
+// ASSERT_DEATH_IF_SUPPORTED(statement, regex) expand to real death tests if
+// death tests are supported; otherwise they just issue a warning.  This is
+// useful when you are combining death test assertions with normal test
+// assertions in one test.
+#if GTEST_HAS_DEATH_TEST
+# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
+    EXPECT_DEATH(statement, regex)
+# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
+    ASSERT_DEATH(statement, regex)
+#else
+# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, )
+# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, return)
+#endif
+
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-message.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-message.h
new file mode 100644
index 0000000000..fe879bca79
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-message.h
@@ -0,0 +1,250 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file defines the Message class.
+//
+// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
+// leave some internal implementation details in this header file.
+// They are clearly marked by comments like this:
+//
+//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+//
+// Such code is NOT meant to be used by a user directly, and is subject
+// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
+// program!
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
+#define GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
+
+#include <limits>
+
+#include "gtest/internal/gtest-port.h"
+
+// Ensures that there is at least one operator<< in the global namespace.
+// See Message& operator<<(...) below for why.
+void operator<<(const testing::internal::Secret&, int);
+
+namespace testing {
+
+// The Message class works like an ostream repeater.
+//
+// Typical usage:
+//
+//   1. You stream a bunch of values to a Message object.
+//      It will remember the text in a stringstream.
+//   2. Then you stream the Message object to an ostream.
+//      This causes the text in the Message to be streamed
+//      to the ostream.
+//
+// For example;
+//
+//   testing::Message foo;
+//   foo << 1 << " != " << 2;
+//   std::cout << foo;
+//
+// will print "1 != 2".
+//
+// Message is not intended to be inherited from.  In particular, its
+// destructor is not virtual.
+//
+// Note that stringstream behaves differently in gcc and in MSVC.  You
+// can stream a NULL char pointer to it in the former, but not in the
+// latter (it causes an access violation if you do).  The Message
+// class hides this difference by treating a NULL char pointer as
+// "(null)".
+class GTEST_API_ Message {
+ private:
+  // The type of basic IO manipulators (endl, ends, and flush) for
+  // narrow streams.
+  typedef std::ostream& (*BasicNarrowIoManip)(std::ostream&);
+
+ public:
+  // Constructs an empty Message.
+  Message();
+
+  // Copy constructor.
+  Message(const Message& msg) : ss_(new ::std::stringstream) {  // NOLINT
+    *ss_ << msg.GetString();
+  }
+
+  // Constructs a Message from a C-string.
+  explicit Message(const char* str) : ss_(new ::std::stringstream) {
+    *ss_ << str;
+  }
+
+#if GTEST_OS_SYMBIAN
+  // Streams a value (either a pointer or not) to this object.
+  template <typename T>
+  inline Message& operator <<(const T& value) {
+    StreamHelper(typename internal::is_pointer<T>::type(), value);
+    return *this;
+  }
+#else
+  // Streams a non-pointer value to this object.
+  template <typename T>
+  inline Message& operator <<(const T& val) {
+    // Some libraries overload << for STL containers.  These
+    // overloads are defined in the global namespace instead of ::std.
+    //
+    // C++'s symbol lookup rule (i.e. Koenig lookup) says that these
+    // overloads are visible in either the std namespace or the global
+    // namespace, but not other namespaces, including the testing
+    // namespace which Google Test's Message class is in.
+    //
+    // To allow STL containers (and other types that has a << operator
+    // defined in the global namespace) to be used in Google Test
+    // assertions, testing::Message must access the custom << operator
+    // from the global namespace.  With this using declaration,
+    // overloads of << defined in the global namespace and those
+    // visible via Koenig lookup are both exposed in this function.
+    using ::operator <<;
+    *ss_ << val;
+    return *this;
+  }
+
+  // Streams a pointer value to this object.
+  //
+  // This function is an overload of the previous one.  When you
+  // stream a pointer to a Message, this definition will be used as it
+  // is more specialized.  (The C++ Standard, section
+  // [temp.func.order].)  If you stream a non-pointer, then the
+  // previous definition will be used.
+  //
+  // The reason for this overload is that streaming a NULL pointer to
+  // ostream is undefined behavior.  Depending on the compiler, you
+  // may get "0", "(nil)", "(null)", or an access violation.  To
+  // ensure consistent result across compilers, we always treat NULL
+  // as "(null)".
+  template <typename T>
+  inline Message& operator <<(T* const& pointer) {  // NOLINT
+    if (pointer == NULL) {
+      *ss_ << "(null)";
+    } else {
+      *ss_ << pointer;
+    }
+    return *this;
+  }
+#endif  // GTEST_OS_SYMBIAN
+
+  // Since the basic IO manipulators are overloaded for both narrow
+  // and wide streams, we have to provide this specialized definition
+  // of operator <<, even though its body is the same as the
+  // templatized version above.  Without this definition, streaming
+  // endl or other basic IO manipulators to Message will confuse the
+  // compiler.
+  Message& operator <<(BasicNarrowIoManip val) {
+    *ss_ << val;
+    return *this;
+  }
+
+  // Instead of 1/0, we want to see true/false for bool values.
+  Message& operator <<(bool b) {
+    return *this << (b ? "true" : "false");
+  }
+
+  // These two overloads allow streaming a wide C string to a Message
+  // using the UTF-8 encoding.
+  Message& operator <<(const wchar_t* wide_c_str);
+  Message& operator <<(wchar_t* wide_c_str);
+
+#if GTEST_HAS_STD_WSTRING
+  // Converts the given wide string to a narrow string using the UTF-8
+  // encoding, and streams the result to this Message object.
+  Message& operator <<(const ::std::wstring& wstr);
+#endif  // GTEST_HAS_STD_WSTRING
+
+#if GTEST_HAS_GLOBAL_WSTRING
+  // Converts the given wide string to a narrow string using the UTF-8
+  // encoding, and streams the result to this Message object.
+  Message& operator <<(const ::wstring& wstr);
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+  // Gets the text streamed to this object so far as an std::string.
+  // Each '\0' character in the buffer is replaced with "\\0".
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  std::string GetString() const;
+
+ private:
+
+#if GTEST_OS_SYMBIAN
+  // These are needed as the Nokia Symbian Compiler cannot decide between
+  // const T& and const T* in a function template. The Nokia compiler _can_
+  // decide between class template specializations for T and T*, so a
+  // tr1::type_traits-like is_pointer works, and we can overload on that.
+  template <typename T>
+  inline void StreamHelper(internal::true_type /*is_pointer*/, T* pointer) {
+    if (pointer == NULL) {
+      *ss_ << "(null)";
+    } else {
+      *ss_ << pointer;
+    }
+  }
+  template <typename T>
+  inline void StreamHelper(internal::false_type /*is_pointer*/,
+                           const T& value) {
+    // See the comments in Message& operator <<(const T&) above for why
+    // we need this using statement.
+    using ::operator <<;
+    *ss_ << value;
+  }
+#endif  // GTEST_OS_SYMBIAN
+
+  // We'll hold the text streamed to this object here.
+  const internal::scoped_ptr< ::std::stringstream> ss_;
+
+  // We declare (but don't implement) this to prevent the compiler
+  // from implementing the assignment operator.
+  void operator=(const Message&);
+};
+
+// Streams a Message to an ostream.
+inline std::ostream& operator <<(std::ostream& os, const Message& sb) {
+  return os << sb.GetString();
+}
+
+namespace internal {
+
+// Converts a streamable value to an std::string.  A NULL pointer is
+// converted to "(null)".  When the input value is a ::string,
+// ::std::string, ::wstring, or ::std::wstring object, each NUL
+// character in it is replaced with "\\0".
+template <typename T>
+std::string StreamableToString(const T& streamable) {
+  return (Message() << streamable).GetString();
+}
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-param-test.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-param-test.h
new file mode 100644
index 0000000000..038f9ba79e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-param-test.h
@@ -0,0 +1,1444 @@
+// This file was GENERATED by command:
+//     pump.py gtest-param-test.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: vladl@google.com (Vlad Losev)
+//
+// Macros and functions for implementing parameterized tests
+// in Google C++ Testing Framework (Google Test)
+//
+// This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+
+
+// Value-parameterized tests allow you to test your code with different
+// parameters without writing multiple copies of the same test.
+//
+// Here is how you use value-parameterized tests:
+
+#if 0
+
+// To write value-parameterized tests, first you should define a fixture
+// class. It is usually derived from testing::TestWithParam<T> (see below for
+// another inheritance scheme that's sometimes useful in more complicated
+// class hierarchies), where the type of your parameter values.
+// TestWithParam<T> is itself derived from testing::Test. T can be any
+// copyable type. If it's a raw pointer, you are responsible for managing the
+// lifespan of the pointed values.
+
+class FooTest : public ::testing::TestWithParam<const char*> {
+  // You can implement all the usual class fixture members here.
+};
+
+// Then, use the TEST_P macro to define as many parameterized tests
+// for this fixture as you want. The _P suffix is for "parameterized"
+// or "pattern", whichever you prefer to think.
+
+TEST_P(FooTest, DoesBlah) {
+  // Inside a test, access the test parameter with the GetParam() method
+  // of the TestWithParam<T> class:
+  EXPECT_TRUE(foo.Blah(GetParam()));
+  ...
+}
+
+TEST_P(FooTest, HasBlahBlah) {
+  ...
+}
+
+// Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test
+// case with any set of parameters you want. Google Test defines a number
+// of functions for generating test parameters. They return what we call
+// (surprise!) parameter generators. Here is a  summary of them, which
+// are all in the testing namespace:
+//
+//
+//  Range(begin, end [, step]) - Yields values {begin, begin+step,
+//                               begin+step+step, ...}. The values do not
+//                               include end. step defaults to 1.
+//  Values(v1, v2, ..., vN)    - Yields values {v1, v2, ..., vN}.
+//  ValuesIn(container)        - Yields values from a C-style array, an STL
+//  ValuesIn(begin,end)          container, or an iterator range [begin, end).
+//  Bool()                     - Yields sequence {false, true}.
+//  Combine(g1, g2, ..., gN)   - Yields all combinations (the Cartesian product
+//                               for the math savvy) of the values generated
+//                               by the N generators.
+//
+// For more details, see comments at the definitions of these functions below
+// in this file.
+//
+// The following statement will instantiate tests from the FooTest test case
+// each with parameter values "meeny", "miny", and "moe".
+
+INSTANTIATE_TEST_CASE_P(InstantiationName,
+                        FooTest,
+                        Values("meeny", "miny", "moe"));
+
+// To distinguish different instances of the pattern, (yes, you
+// can instantiate it more then once) the first argument to the
+// INSTANTIATE_TEST_CASE_P macro is a prefix that will be added to the
+// actual test case name. Remember to pick unique prefixes for different
+// instantiations. The tests from the instantiation above will have
+// these names:
+//
+//    * InstantiationName/FooTest.DoesBlah/0 for "meeny"
+//    * InstantiationName/FooTest.DoesBlah/1 for "miny"
+//    * InstantiationName/FooTest.DoesBlah/2 for "moe"
+//    * InstantiationName/FooTest.HasBlahBlah/0 for "meeny"
+//    * InstantiationName/FooTest.HasBlahBlah/1 for "miny"
+//    * InstantiationName/FooTest.HasBlahBlah/2 for "moe"
+//
+// You can use these names in --gtest_filter.
+//
+// This statement will instantiate all tests from FooTest again, each
+// with parameter values "cat" and "dog":
+
+const char* pets[] = {"cat", "dog"};
+INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
+
+// The tests from the instantiation above will have these names:
+//
+//    * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog"
+//
+// Please note that INSTANTIATE_TEST_CASE_P will instantiate all tests
+// in the given test case, whether their definitions come before or
+// AFTER the INSTANTIATE_TEST_CASE_P statement.
+//
+// Please also note that generator expressions (including parameters to the
+// generators) are evaluated in InitGoogleTest(), after main() has started.
+// This allows the user on one hand, to adjust generator parameters in order
+// to dynamically determine a set of tests to run and on the other hand,
+// give the user a chance to inspect the generated tests with Google Test
+// reflection API before RUN_ALL_TESTS() is executed.
+//
+// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc
+// for more examples.
+//
+// In the future, we plan to publish the API for defining new parameter
+// generators. But for now this interface remains part of the internal
+// implementation and is subject to change.
+//
+//
+// A parameterized test fixture must be derived from testing::Test and from
+// testing::WithParamInterface<T>, where T is the type of the parameter
+// values. Inheriting from TestWithParam<T> satisfies that requirement because
+// TestWithParam<T> inherits from both Test and WithParamInterface. In more
+// complicated hierarchies, however, it is occasionally useful to inherit
+// separately from Test and WithParamInterface. For example:
+
+class BaseTest : public ::testing::Test {
+  // You can inherit all the usual members for a non-parameterized test
+  // fixture here.
+};
+
+class DerivedTest : public BaseTest, public ::testing::WithParamInterface<int> {
+  // The usual test fixture members go here too.
+};
+
+TEST_F(BaseTest, HasFoo) {
+  // This is an ordinary non-parameterized test.
+}
+
+TEST_P(DerivedTest, DoesBlah) {
+  // GetParam works just the same here as if you inherit from TestWithParam.
+  EXPECT_TRUE(foo.Blah(GetParam()));
+}
+
+#endif  // 0
+
+#include "gtest/internal/gtest-port.h"
+
+#if !GTEST_OS_SYMBIAN
+# include <utility>
+#endif
+
+// scripts/fuse_gtest.py depends on gtest's own header being #included
+// *unconditionally*.  Therefore these #includes cannot be moved
+// inside #if GTEST_HAS_PARAM_TEST.
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-param-util.h"
+#include "gtest/internal/gtest-param-util-generated.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+namespace testing {
+
+// Functions producing parameter generators.
+//
+// Google Test uses these generators to produce parameters for value-
+// parameterized tests. When a parameterized test case is instantiated
+// with a particular generator, Google Test creates and runs tests
+// for each element in the sequence produced by the generator.
+//
+// In the following sample, tests from test case FooTest are instantiated
+// each three times with parameter values 3, 5, and 8:
+//
+// class FooTest : public TestWithParam<int> { ... };
+//
+// TEST_P(FooTest, TestThis) {
+// }
+// TEST_P(FooTest, TestThat) {
+// }
+// INSTANTIATE_TEST_CASE_P(TestSequence, FooTest, Values(3, 5, 8));
+//
+
+// Range() returns generators providing sequences of values in a range.
+//
+// Synopsis:
+// Range(start, end)
+//   - returns a generator producing a sequence of values {start, start+1,
+//     start+2, ..., }.
+// Range(start, end, step)
+//   - returns a generator producing a sequence of values {start, start+step,
+//     start+step+step, ..., }.
+// Notes:
+//   * The generated sequences never include end. For example, Range(1, 5)
+//     returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2)
+//     returns a generator producing {1, 3, 5, 7}.
+//   * start and end must have the same type. That type may be any integral or
+//     floating-point type or a user defined type satisfying these conditions:
+//     * It must be assignable (have operator=() defined).
+//     * It must have operator+() (operator+(int-compatible type) for
+//       two-operand version).
+//     * It must have operator<() defined.
+//     Elements in the resulting sequences will also have that type.
+//   * Condition start < end must be satisfied in order for resulting sequences
+//     to contain any elements.
+//
+template <typename T, typename IncrementT>
+internal::ParamGenerator<T> Range(T start, T end, IncrementT step) {
+  return internal::ParamGenerator<T>(
+      new internal::RangeGenerator<T, IncrementT>(start, end, step));
+}
+
+template <typename T>
+internal::ParamGenerator<T> Range(T start, T end) {
+  return Range(start, end, 1);
+}
+
+// ValuesIn() function allows generation of tests with parameters coming from
+// a container.
+//
+// Synopsis:
+// ValuesIn(const T (&array)[N])
+//   - returns a generator producing sequences with elements from
+//     a C-style array.
+// ValuesIn(const Container& container)
+//   - returns a generator producing sequences with elements from
+//     an STL-style container.
+// ValuesIn(Iterator begin, Iterator end)
+//   - returns a generator producing sequences with elements from
+//     a range [begin, end) defined by a pair of STL-style iterators. These
+//     iterators can also be plain C pointers.
+//
+// Please note that ValuesIn copies the values from the containers
+// passed in and keeps them to generate tests in RUN_ALL_TESTS().
+//
+// Examples:
+//
+// This instantiates tests from test case StringTest
+// each with C-string values of "foo", "bar", and "baz":
+//
+// const char* strings[] = {"foo", "bar", "baz"};
+// INSTANTIATE_TEST_CASE_P(StringSequence, SrtingTest, ValuesIn(strings));
+//
+// This instantiates tests from test case StlStringTest
+// each with STL strings with values "a" and "b":
+//
+// ::std::vector< ::std::string> GetParameterStrings() {
+//   ::std::vector< ::std::string> v;
+//   v.push_back("a");
+//   v.push_back("b");
+//   return v;
+// }
+//
+// INSTANTIATE_TEST_CASE_P(CharSequence,
+//                         StlStringTest,
+//                         ValuesIn(GetParameterStrings()));
+//
+//
+// This will also instantiate tests from CharTest
+// each with parameter values 'a' and 'b':
+//
+// ::std::list<char> GetParameterChars() {
+//   ::std::list<char> list;
+//   list.push_back('a');
+//   list.push_back('b');
+//   return list;
+// }
+// ::std::list<char> l = GetParameterChars();
+// INSTANTIATE_TEST_CASE_P(CharSequence2,
+//                         CharTest,
+//                         ValuesIn(l.begin(), l.end()));
+//
+template <typename ForwardIterator>
+internal::ParamGenerator<
+  typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
+ValuesIn(ForwardIterator begin, ForwardIterator end) {
+  typedef typename ::testing::internal::IteratorTraits<ForwardIterator>
+      ::value_type ParamType;
+  return internal::ParamGenerator<ParamType>(
+      new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end));
+}
+
+template <typename T, size_t N>
+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]) {
+  return ValuesIn(array, array + N);
+}
+
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container) {
+  return ValuesIn(container.begin(), container.end());
+}
+
+// Values() allows generating tests from explicitly specified list of
+// parameters.
+//
+// Synopsis:
+// Values(T v1, T v2, ..., T vN)
+//   - returns a generator producing sequences with elements v1, v2, ..., vN.
+//
+// For example, this instantiates tests from test case BarTest each
+// with values "one", "two", and "three":
+//
+// INSTANTIATE_TEST_CASE_P(NumSequence, BarTest, Values("one", "two", "three"));
+//
+// This instantiates tests from test case BazTest each with values 1, 2, 3.5.
+// The exact type of values will depend on the type of parameter in BazTest.
+//
+// INSTANTIATE_TEST_CASE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5));
+//
+// Currently, Values() supports from 1 to 50 parameters.
+//
+template <typename T1>
+internal::ValueArray1<T1> Values(T1 v1) {
+  return internal::ValueArray1<T1>(v1);
+}
+
+template <typename T1, typename T2>
+internal::ValueArray2<T1, T2> Values(T1 v1, T2 v2) {
+  return internal::ValueArray2<T1, T2>(v1, v2);
+}
+
+template <typename T1, typename T2, typename T3>
+internal::ValueArray3<T1, T2, T3> Values(T1 v1, T2 v2, T3 v3) {
+  return internal::ValueArray3<T1, T2, T3>(v1, v2, v3);
+}
+
+template <typename T1, typename T2, typename T3, typename T4>
+internal::ValueArray4<T1, T2, T3, T4> Values(T1 v1, T2 v2, T3 v3, T4 v4) {
+  return internal::ValueArray4<T1, T2, T3, T4>(v1, v2, v3, v4);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+internal::ValueArray5<T1, T2, T3, T4, T5> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5) {
+  return internal::ValueArray5<T1, T2, T3, T4, T5>(v1, v2, v3, v4, v5);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+internal::ValueArray6<T1, T2, T3, T4, T5, T6> Values(T1 v1, T2 v2, T3 v3,
+    T4 v4, T5 v5, T6 v6) {
+  return internal::ValueArray6<T1, T2, T3, T4, T5, T6>(v1, v2, v3, v4, v5, v6);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+internal::ValueArray7<T1, T2, T3, T4, T5, T6, T7> Values(T1 v1, T2 v2, T3 v3,
+    T4 v4, T5 v5, T6 v6, T7 v7) {
+  return internal::ValueArray7<T1, T2, T3, T4, T5, T6, T7>(v1, v2, v3, v4, v5,
+      v6, v7);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+internal::ValueArray8<T1, T2, T3, T4, T5, T6, T7, T8> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8) {
+  return internal::ValueArray8<T1, T2, T3, T4, T5, T6, T7, T8>(v1, v2, v3, v4,
+      v5, v6, v7, v8);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+internal::ValueArray9<T1, T2, T3, T4, T5, T6, T7, T8, T9> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9) {
+  return internal::ValueArray9<T1, T2, T3, T4, T5, T6, T7, T8, T9>(v1, v2, v3,
+      v4, v5, v6, v7, v8, v9);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+internal::ValueArray10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Values(T1 v1,
+    T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10) {
+  return internal::ValueArray10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(v1,
+      v2, v3, v4, v5, v6, v7, v8, v9, v10);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11>
+internal::ValueArray11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10,
+    T11> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11) {
+  return internal::ValueArray11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10,
+      T11>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12>
+internal::ValueArray12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+    T12> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12) {
+  return internal::ValueArray12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13>
+internal::ValueArray13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+    T13> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13) {
+  return internal::ValueArray13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14>
+internal::ValueArray14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14) {
+  return internal::ValueArray14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13,
+      v14);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15>
+internal::ValueArray15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8,
+    T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15) {
+  return internal::ValueArray15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12,
+      v13, v14, v15);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16>
+internal::ValueArray16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16) {
+  return internal::ValueArray16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11,
+      v12, v13, v14, v15, v16);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17>
+internal::ValueArray17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17) {
+  return internal::ValueArray17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10,
+      v11, v12, v13, v14, v15, v16, v17);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18>
+internal::ValueArray18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6,
+    T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18) {
+  return internal::ValueArray18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18>(v1, v2, v3, v4, v5, v6, v7, v8, v9,
+      v10, v11, v12, v13, v14, v15, v16, v17, v18);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19>
+internal::ValueArray19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5,
+    T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14,
+    T15 v15, T16 v16, T17 v17, T18 v18, T19 v19) {
+  return internal::ValueArray19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19>(v1, v2, v3, v4, v5, v6, v7, v8,
+      v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20>
+internal::ValueArray20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20) {
+  return internal::ValueArray20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20>(v1, v2, v3, v4, v5, v6, v7,
+      v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21>
+internal::ValueArray21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21) {
+  return internal::ValueArray21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>(v1, v2, v3, v4, v5, v6,
+      v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22>
+internal::ValueArray22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22> Values(T1 v1, T2 v2, T3 v3,
+    T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22) {
+  return internal::ValueArray22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>(v1, v2, v3, v4,
+      v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23>
+internal::ValueArray23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23) {
+  return internal::ValueArray23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23>(v1, v2, v3,
+      v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22, v23);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24>
+internal::ValueArray24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23, T24 v24) {
+  return internal::ValueArray24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24>(v1, v2,
+      v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+      v19, v20, v21, v22, v23, v24);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25>
+internal::ValueArray25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> Values(T1 v1,
+    T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11,
+    T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19,
+    T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25) {
+  return internal::ValueArray25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25>(v1,
+      v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17,
+      v18, v19, v20, v21, v22, v23, v24, v25);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26>
+internal::ValueArray26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+    T26> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26) {
+  return internal::ValueArray26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+      v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27>
+internal::ValueArray27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+    T27> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27) {
+  return internal::ValueArray27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14,
+      v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28>
+internal::ValueArray28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+    T28> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28) {
+  return internal::ValueArray28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13,
+      v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27,
+      v28);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29>
+internal::ValueArray29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29) {
+  return internal::ValueArray29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12,
+      v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26,
+      v27, v28, v29);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30>
+internal::ValueArray30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8,
+    T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16,
+    T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24,
+    T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30) {
+  return internal::ValueArray30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11,
+      v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25,
+      v26, v27, v28, v29, v30);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31>
+internal::ValueArray31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31) {
+  return internal::ValueArray31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10,
+      v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24,
+      v25, v26, v27, v28, v29, v30, v31);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32>
+internal::ValueArray32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32) {
+  return internal::ValueArray32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32>(v1, v2, v3, v4, v5, v6, v7, v8, v9,
+      v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23,
+      v24, v25, v26, v27, v28, v29, v30, v31, v32);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33>
+internal::ValueArray33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6,
+    T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32, T33 v33) {
+  return internal::ValueArray33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33>(v1, v2, v3, v4, v5, v6, v7, v8,
+      v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23,
+      v24, v25, v26, v27, v28, v29, v30, v31, v32, v33);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34>
+internal::ValueArray34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5,
+    T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14,
+    T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22,
+    T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30,
+    T31 v31, T32 v32, T33 v33, T34 v34) {
+  return internal::ValueArray34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34>(v1, v2, v3, v4, v5, v6, v7,
+      v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22,
+      v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35>
+internal::ValueArray35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21,
+    T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29,
+    T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35) {
+  return internal::ValueArray35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35>(v1, v2, v3, v4, v5, v6,
+      v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21,
+      v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36>
+internal::ValueArray36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21,
+    T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29,
+    T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36) {
+  return internal::ValueArray36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36>(v1, v2, v3, v4,
+      v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33,
+      v34, v35, v36);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37>
+internal::ValueArray37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37> Values(T1 v1, T2 v2, T3 v3,
+    T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28,
+    T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36,
+    T37 v37) {
+  return internal::ValueArray37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37>(v1, v2, v3,
+      v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33,
+      v34, v35, v36, v37);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38>
+internal::ValueArray38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28,
+    T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36,
+    T37 v37, T38 v38) {
+  return internal::ValueArray38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38>(v1, v2,
+      v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+      v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32,
+      v33, v34, v35, v36, v37, v38);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39>
+internal::ValueArray39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28,
+    T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36,
+    T37 v37, T38 v38, T39 v39) {
+  return internal::ValueArray39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39>(v1,
+      v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17,
+      v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+      v32, v33, v34, v35, v36, v37, v38, v39);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40>
+internal::ValueArray40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> Values(T1 v1,
+    T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11,
+    T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19,
+    T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27,
+    T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35,
+    T36 v36, T37 v37, T38 v38, T39 v39, T40 v40) {
+  return internal::ValueArray40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+      v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29,
+      v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41>
+internal::ValueArray41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+    T41> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+    T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41) {
+  return internal::ValueArray41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14,
+      v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28,
+      v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42>
+internal::ValueArray42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+    T42> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+    T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+    T42 v42) {
+  return internal::ValueArray42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13,
+      v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27,
+      v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41,
+      v42);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43>
+internal::ValueArray43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+    T43> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+    T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+    T42 v42, T43 v43) {
+  return internal::ValueArray43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12,
+      v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26,
+      v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40,
+      v41, v42, v43);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44>
+internal::ValueArray44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+    T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+    T42 v42, T43 v43, T44 v44) {
+  return internal::ValueArray44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11,
+      v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25,
+      v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39,
+      v40, v41, v42, v43, v44);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45>
+internal::ValueArray45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8,
+    T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16,
+    T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24,
+    T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32,
+    T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40,
+    T41 v41, T42 v42, T43 v43, T44 v44, T45 v45) {
+  return internal::ValueArray45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10,
+      v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24,
+      v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38,
+      v39, v40, v41, v42, v43, v44, v45);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46>
+internal::ValueArray46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39,
+    T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46) {
+  return internal::ValueArray46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46>(v1, v2, v3, v4, v5, v6, v7, v8, v9,
+      v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23,
+      v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37,
+      v38, v39, v40, v41, v42, v43, v44, v45, v46);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47>
+internal::ValueArray47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39,
+    T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47) {
+  return internal::ValueArray47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46, T47>(v1, v2, v3, v4, v5, v6, v7, v8,
+      v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23,
+      v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37,
+      v38, v39, v40, v41, v42, v43, v44, v45, v46, v47);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48>
+internal::ValueArray48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47, T48> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6,
+    T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39,
+    T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47,
+    T48 v48) {
+  return internal::ValueArray48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46, T47, T48>(v1, v2, v3, v4, v5, v6, v7,
+      v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22,
+      v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36,
+      v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49>
+internal::ValueArray49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47, T48, T49> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5,
+    T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14,
+    T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22,
+    T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30,
+    T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38,
+    T39 v39, T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46,
+    T47 v47, T48 v48, T49 v49) {
+  return internal::ValueArray49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46, T47, T48, T49>(v1, v2, v3, v4, v5, v6,
+      v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21,
+      v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35,
+      v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49, typename T50>
+internal::ValueArray50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47, T48, T49, T50> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21,
+    T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29,
+    T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37,
+    T38 v38, T39 v39, T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45,
+    T46 v46, T47 v47, T48 v48, T49 v49, T50 v50) {
+  return internal::ValueArray50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46, T47, T48, T49, T50>(v1, v2, v3, v4,
+      v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33,
+      v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47,
+      v48, v49, v50);
+}
+
+// Bool() allows generating tests with parameters in a set of (false, true).
+//
+// Synopsis:
+// Bool()
+//   - returns a generator producing sequences with elements {false, true}.
+//
+// It is useful when testing code that depends on Boolean flags. Combinations
+// of multiple flags can be tested when several Bool()'s are combined using
+// Combine() function.
+//
+// In the following example all tests in the test case FlagDependentTest
+// will be instantiated twice with parameters false and true.
+//
+// class FlagDependentTest : public testing::TestWithParam<bool> {
+//   virtual void SetUp() {
+//     external_flag = GetParam();
+//   }
+// }
+// INSTANTIATE_TEST_CASE_P(BoolSequence, FlagDependentTest, Bool());
+//
+inline internal::ParamGenerator<bool> Bool() {
+  return Values(false, true);
+}
+
+# if GTEST_HAS_COMBINE
+// Combine() allows the user to combine two or more sequences to produce
+// values of a Cartesian product of those sequences' elements.
+//
+// Synopsis:
+// Combine(gen1, gen2, ..., genN)
+//   - returns a generator producing sequences with elements coming from
+//     the Cartesian product of elements from the sequences generated by
+//     gen1, gen2, ..., genN. The sequence elements will have a type of
+//     tuple<T1, T2, ..., TN> where T1, T2, ..., TN are the types
+//     of elements from sequences produces by gen1, gen2, ..., genN.
+//
+// Combine can have up to 10 arguments. This number is currently limited
+// by the maximum number of elements in the tuple implementation used by Google
+// Test.
+//
+// Example:
+//
+// This will instantiate tests in test case AnimalTest each one with
+// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
+// tuple("dog", BLACK), and tuple("dog", WHITE):
+//
+// enum Color { BLACK, GRAY, WHITE };
+// class AnimalTest
+//     : public testing::TestWithParam<tuple<const char*, Color> > {...};
+//
+// TEST_P(AnimalTest, AnimalLooksNice) {...}
+//
+// INSTANTIATE_TEST_CASE_P(AnimalVariations, AnimalTest,
+//                         Combine(Values("cat", "dog"),
+//                                 Values(BLACK, WHITE)));
+//
+// This will instantiate tests in FlagDependentTest with all variations of two
+// Boolean flags:
+//
+// class FlagDependentTest
+//     : public testing::TestWithParam<tuple<bool, bool> > {
+//   virtual void SetUp() {
+//     // Assigns external_flag_1 and external_flag_2 values from the tuple.
+//     tie(external_flag_1, external_flag_2) = GetParam();
+//   }
+// };
+//
+// TEST_P(FlagDependentTest, TestFeature1) {
+//   // Test your code using external_flag_1 and external_flag_2 here.
+// }
+// INSTANTIATE_TEST_CASE_P(TwoBoolSequence, FlagDependentTest,
+//                         Combine(Bool(), Bool()));
+//
+template <typename Generator1, typename Generator2>
+internal::CartesianProductHolder2<Generator1, Generator2> Combine(
+    const Generator1& g1, const Generator2& g2) {
+  return internal::CartesianProductHolder2<Generator1, Generator2>(
+      g1, g2);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3>
+internal::CartesianProductHolder3<Generator1, Generator2, Generator3> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3) {
+  return internal::CartesianProductHolder3<Generator1, Generator2, Generator3>(
+      g1, g2, g3);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4>
+internal::CartesianProductHolder4<Generator1, Generator2, Generator3,
+    Generator4> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4) {
+  return internal::CartesianProductHolder4<Generator1, Generator2, Generator3,
+      Generator4>(
+      g1, g2, g3, g4);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5>
+internal::CartesianProductHolder5<Generator1, Generator2, Generator3,
+    Generator4, Generator5> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5) {
+  return internal::CartesianProductHolder5<Generator1, Generator2, Generator3,
+      Generator4, Generator5>(
+      g1, g2, g3, g4, g5);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6>
+internal::CartesianProductHolder6<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6) {
+  return internal::CartesianProductHolder6<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6>(
+      g1, g2, g3, g4, g5, g6);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6,
+    typename Generator7>
+internal::CartesianProductHolder7<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6, Generator7> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6,
+        const Generator7& g7) {
+  return internal::CartesianProductHolder7<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6, Generator7>(
+      g1, g2, g3, g4, g5, g6, g7);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6,
+    typename Generator7, typename Generator8>
+internal::CartesianProductHolder8<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6, Generator7, Generator8> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6,
+        const Generator7& g7, const Generator8& g8) {
+  return internal::CartesianProductHolder8<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6, Generator7, Generator8>(
+      g1, g2, g3, g4, g5, g6, g7, g8);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6,
+    typename Generator7, typename Generator8, typename Generator9>
+internal::CartesianProductHolder9<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6, Generator7, Generator8,
+    Generator9> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6,
+        const Generator7& g7, const Generator8& g8, const Generator9& g9) {
+  return internal::CartesianProductHolder9<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6, Generator7, Generator8, Generator9>(
+      g1, g2, g3, g4, g5, g6, g7, g8, g9);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6,
+    typename Generator7, typename Generator8, typename Generator9,
+    typename Generator10>
+internal::CartesianProductHolder10<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6, Generator7, Generator8, Generator9,
+    Generator10> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6,
+        const Generator7& g7, const Generator8& g8, const Generator9& g9,
+        const Generator10& g10) {
+  return internal::CartesianProductHolder10<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6, Generator7, Generator8, Generator9,
+      Generator10>(
+      g1, g2, g3, g4, g5, g6, g7, g8, g9, g10);
+}
+# endif  // GTEST_HAS_COMBINE
+
+
+
+# define TEST_P(test_case_name, test_name) \
+  class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \
+      : public test_case_name { \
+   public: \
+    GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \
+    virtual void TestBody(); \
+   private: \
+    static int AddToRegistry() { \
+      ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
+          GetTestCasePatternHolder<test_case_name>(\
+              #test_case_name, \
+              ::testing::internal::CodeLocation(\
+                  __FILE__, __LINE__))->AddTestPattern(\
+                      #test_case_name, \
+                      #test_name, \
+                      new ::testing::internal::TestMetaFactory< \
+                          GTEST_TEST_CLASS_NAME_(\
+                              test_case_name, test_name)>()); \
+      return 0; \
+    } \
+    static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(\
+        GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
+  }; \
+  int GTEST_TEST_CLASS_NAME_(test_case_name, \
+                             test_name)::gtest_registering_dummy_ = \
+      GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \
+  void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody()
+
+// The optional last argument to INSTANTIATE_TEST_CASE_P allows the user
+// to specify a function or functor that generates custom test name suffixes
+// based on the test parameters. The function should accept one argument of
+// type testing::TestParamInfo<class ParamType>, and return std::string.
+//
+// testing::PrintToStringParamName is a builtin test suffix generator that
+// returns the value of testing::PrintToString(GetParam()). It does not work
+// for std::string or C strings.
+//
+// Note: test names must be non-empty, unique, and may only contain ASCII
+// alphanumeric characters or underscore.
+
+# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \
+  ::testing::internal::ParamGenerator<test_case_name::ParamType> \
+      gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \
+  ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \
+      const ::testing::TestParamInfo<test_case_name::ParamType>& info) { \
+    return ::testing::internal::GetParamNameGen<test_case_name::ParamType> \
+        (__VA_ARGS__)(info); \
+  } \
+  int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \
+      ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
+          GetTestCasePatternHolder<test_case_name>(\
+              #test_case_name, \
+              ::testing::internal::CodeLocation(\
+                  __FILE__, __LINE__))->AddTestCaseInstantiation(\
+                      #prefix, \
+                      &gtest_##prefix##test_case_name##_EvalGenerator_, \
+                      &gtest_##prefix##test_case_name##_EvalGenerateName_, \
+                      __FILE__, __LINE__)
+
+}  // namespace testing
+
+#endif  // GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-param-test.h.pump b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-param-test.h.pump
new file mode 100644
index 0000000000..3078d6d2a1
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-param-test.h.pump
@@ -0,0 +1,510 @@
+$$ -*- mode: c++; -*-
+$var n = 50  $$ Maximum length of Values arguments we want to support.
+$var maxtuple = 10  $$ Maximum number of Combine arguments we want to support.
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: vladl@google.com (Vlad Losev)
+//
+// Macros and functions for implementing parameterized tests
+// in Google C++ Testing Framework (Google Test)
+//
+// This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+
+
+// Value-parameterized tests allow you to test your code with different
+// parameters without writing multiple copies of the same test.
+//
+// Here is how you use value-parameterized tests:
+
+#if 0
+
+// To write value-parameterized tests, first you should define a fixture
+// class. It is usually derived from testing::TestWithParam<T> (see below for
+// another inheritance scheme that's sometimes useful in more complicated
+// class hierarchies), where the type of your parameter values.
+// TestWithParam<T> is itself derived from testing::Test. T can be any
+// copyable type. If it's a raw pointer, you are responsible for managing the
+// lifespan of the pointed values.
+
+class FooTest : public ::testing::TestWithParam<const char*> {
+  // You can implement all the usual class fixture members here.
+};
+
+// Then, use the TEST_P macro to define as many parameterized tests
+// for this fixture as you want. The _P suffix is for "parameterized"
+// or "pattern", whichever you prefer to think.
+
+TEST_P(FooTest, DoesBlah) {
+  // Inside a test, access the test parameter with the GetParam() method
+  // of the TestWithParam<T> class:
+  EXPECT_TRUE(foo.Blah(GetParam()));
+  ...
+}
+
+TEST_P(FooTest, HasBlahBlah) {
+  ...
+}
+
+// Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test
+// case with any set of parameters you want. Google Test defines a number
+// of functions for generating test parameters. They return what we call
+// (surprise!) parameter generators. Here is a  summary of them, which
+// are all in the testing namespace:
+//
+//
+//  Range(begin, end [, step]) - Yields values {begin, begin+step,
+//                               begin+step+step, ...}. The values do not
+//                               include end. step defaults to 1.
+//  Values(v1, v2, ..., vN)    - Yields values {v1, v2, ..., vN}.
+//  ValuesIn(container)        - Yields values from a C-style array, an STL
+//  ValuesIn(begin,end)          container, or an iterator range [begin, end).
+//  Bool()                     - Yields sequence {false, true}.
+//  Combine(g1, g2, ..., gN)   - Yields all combinations (the Cartesian product
+//                               for the math savvy) of the values generated
+//                               by the N generators.
+//
+// For more details, see comments at the definitions of these functions below
+// in this file.
+//
+// The following statement will instantiate tests from the FooTest test case
+// each with parameter values "meeny", "miny", and "moe".
+
+INSTANTIATE_TEST_CASE_P(InstantiationName,
+                        FooTest,
+                        Values("meeny", "miny", "moe"));
+
+// To distinguish different instances of the pattern, (yes, you
+// can instantiate it more then once) the first argument to the
+// INSTANTIATE_TEST_CASE_P macro is a prefix that will be added to the
+// actual test case name. Remember to pick unique prefixes for different
+// instantiations. The tests from the instantiation above will have
+// these names:
+//
+//    * InstantiationName/FooTest.DoesBlah/0 for "meeny"
+//    * InstantiationName/FooTest.DoesBlah/1 for "miny"
+//    * InstantiationName/FooTest.DoesBlah/2 for "moe"
+//    * InstantiationName/FooTest.HasBlahBlah/0 for "meeny"
+//    * InstantiationName/FooTest.HasBlahBlah/1 for "miny"
+//    * InstantiationName/FooTest.HasBlahBlah/2 for "moe"
+//
+// You can use these names in --gtest_filter.
+//
+// This statement will instantiate all tests from FooTest again, each
+// with parameter values "cat" and "dog":
+
+const char* pets[] = {"cat", "dog"};
+INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
+
+// The tests from the instantiation above will have these names:
+//
+//    * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog"
+//
+// Please note that INSTANTIATE_TEST_CASE_P will instantiate all tests
+// in the given test case, whether their definitions come before or
+// AFTER the INSTANTIATE_TEST_CASE_P statement.
+//
+// Please also note that generator expressions (including parameters to the
+// generators) are evaluated in InitGoogleTest(), after main() has started.
+// This allows the user on one hand, to adjust generator parameters in order
+// to dynamically determine a set of tests to run and on the other hand,
+// give the user a chance to inspect the generated tests with Google Test
+// reflection API before RUN_ALL_TESTS() is executed.
+//
+// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc
+// for more examples.
+//
+// In the future, we plan to publish the API for defining new parameter
+// generators. But for now this interface remains part of the internal
+// implementation and is subject to change.
+//
+//
+// A parameterized test fixture must be derived from testing::Test and from
+// testing::WithParamInterface<T>, where T is the type of the parameter
+// values. Inheriting from TestWithParam<T> satisfies that requirement because
+// TestWithParam<T> inherits from both Test and WithParamInterface. In more
+// complicated hierarchies, however, it is occasionally useful to inherit
+// separately from Test and WithParamInterface. For example:
+
+class BaseTest : public ::testing::Test {
+  // You can inherit all the usual members for a non-parameterized test
+  // fixture here.
+};
+
+class DerivedTest : public BaseTest, public ::testing::WithParamInterface<int> {
+  // The usual test fixture members go here too.
+};
+
+TEST_F(BaseTest, HasFoo) {
+  // This is an ordinary non-parameterized test.
+}
+
+TEST_P(DerivedTest, DoesBlah) {
+  // GetParam works just the same here as if you inherit from TestWithParam.
+  EXPECT_TRUE(foo.Blah(GetParam()));
+}
+
+#endif  // 0
+
+#include "gtest/internal/gtest-port.h"
+
+#if !GTEST_OS_SYMBIAN
+# include <utility>
+#endif
+
+// scripts/fuse_gtest.py depends on gtest's own header being #included
+// *unconditionally*.  Therefore these #includes cannot be moved
+// inside #if GTEST_HAS_PARAM_TEST.
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-param-util.h"
+#include "gtest/internal/gtest-param-util-generated.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+namespace testing {
+
+// Functions producing parameter generators.
+//
+// Google Test uses these generators to produce parameters for value-
+// parameterized tests. When a parameterized test case is instantiated
+// with a particular generator, Google Test creates and runs tests
+// for each element in the sequence produced by the generator.
+//
+// In the following sample, tests from test case FooTest are instantiated
+// each three times with parameter values 3, 5, and 8:
+//
+// class FooTest : public TestWithParam<int> { ... };
+//
+// TEST_P(FooTest, TestThis) {
+// }
+// TEST_P(FooTest, TestThat) {
+// }
+// INSTANTIATE_TEST_CASE_P(TestSequence, FooTest, Values(3, 5, 8));
+//
+
+// Range() returns generators providing sequences of values in a range.
+//
+// Synopsis:
+// Range(start, end)
+//   - returns a generator producing a sequence of values {start, start+1,
+//     start+2, ..., }.
+// Range(start, end, step)
+//   - returns a generator producing a sequence of values {start, start+step,
+//     start+step+step, ..., }.
+// Notes:
+//   * The generated sequences never include end. For example, Range(1, 5)
+//     returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2)
+//     returns a generator producing {1, 3, 5, 7}.
+//   * start and end must have the same type. That type may be any integral or
+//     floating-point type or a user defined type satisfying these conditions:
+//     * It must be assignable (have operator=() defined).
+//     * It must have operator+() (operator+(int-compatible type) for
+//       two-operand version).
+//     * It must have operator<() defined.
+//     Elements in the resulting sequences will also have that type.
+//   * Condition start < end must be satisfied in order for resulting sequences
+//     to contain any elements.
+//
+template <typename T, typename IncrementT>
+internal::ParamGenerator<T> Range(T start, T end, IncrementT step) {
+  return internal::ParamGenerator<T>(
+      new internal::RangeGenerator<T, IncrementT>(start, end, step));
+}
+
+template <typename T>
+internal::ParamGenerator<T> Range(T start, T end) {
+  return Range(start, end, 1);
+}
+
+// ValuesIn() function allows generation of tests with parameters coming from
+// a container.
+//
+// Synopsis:
+// ValuesIn(const T (&array)[N])
+//   - returns a generator producing sequences with elements from
+//     a C-style array.
+// ValuesIn(const Container& container)
+//   - returns a generator producing sequences with elements from
+//     an STL-style container.
+// ValuesIn(Iterator begin, Iterator end)
+//   - returns a generator producing sequences with elements from
+//     a range [begin, end) defined by a pair of STL-style iterators. These
+//     iterators can also be plain C pointers.
+//
+// Please note that ValuesIn copies the values from the containers
+// passed in and keeps them to generate tests in RUN_ALL_TESTS().
+//
+// Examples:
+//
+// This instantiates tests from test case StringTest
+// each with C-string values of "foo", "bar", and "baz":
+//
+// const char* strings[] = {"foo", "bar", "baz"};
+// INSTANTIATE_TEST_CASE_P(StringSequence, SrtingTest, ValuesIn(strings));
+//
+// This instantiates tests from test case StlStringTest
+// each with STL strings with values "a" and "b":
+//
+// ::std::vector< ::std::string> GetParameterStrings() {
+//   ::std::vector< ::std::string> v;
+//   v.push_back("a");
+//   v.push_back("b");
+//   return v;
+// }
+//
+// INSTANTIATE_TEST_CASE_P(CharSequence,
+//                         StlStringTest,
+//                         ValuesIn(GetParameterStrings()));
+//
+//
+// This will also instantiate tests from CharTest
+// each with parameter values 'a' and 'b':
+//
+// ::std::list<char> GetParameterChars() {
+//   ::std::list<char> list;
+//   list.push_back('a');
+//   list.push_back('b');
+//   return list;
+// }
+// ::std::list<char> l = GetParameterChars();
+// INSTANTIATE_TEST_CASE_P(CharSequence2,
+//                         CharTest,
+//                         ValuesIn(l.begin(), l.end()));
+//
+template <typename ForwardIterator>
+internal::ParamGenerator<
+  typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
+ValuesIn(ForwardIterator begin, ForwardIterator end) {
+  typedef typename ::testing::internal::IteratorTraits<ForwardIterator>
+      ::value_type ParamType;
+  return internal::ParamGenerator<ParamType>(
+      new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end));
+}
+
+template <typename T, size_t N>
+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]) {
+  return ValuesIn(array, array + N);
+}
+
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container) {
+  return ValuesIn(container.begin(), container.end());
+}
+
+// Values() allows generating tests from explicitly specified list of
+// parameters.
+//
+// Synopsis:
+// Values(T v1, T v2, ..., T vN)
+//   - returns a generator producing sequences with elements v1, v2, ..., vN.
+//
+// For example, this instantiates tests from test case BarTest each
+// with values "one", "two", and "three":
+//
+// INSTANTIATE_TEST_CASE_P(NumSequence, BarTest, Values("one", "two", "three"));
+//
+// This instantiates tests from test case BazTest each with values 1, 2, 3.5.
+// The exact type of values will depend on the type of parameter in BazTest.
+//
+// INSTANTIATE_TEST_CASE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5));
+//
+// Currently, Values() supports from 1 to $n parameters.
+//
+$range i 1..n
+$for i [[
+$range j 1..i
+
+template <$for j, [[typename T$j]]>
+internal::ValueArray$i<$for j, [[T$j]]> Values($for j, [[T$j v$j]]) {
+  return internal::ValueArray$i<$for j, [[T$j]]>($for j, [[v$j]]);
+}
+
+]]
+
+// Bool() allows generating tests with parameters in a set of (false, true).
+//
+// Synopsis:
+// Bool()
+//   - returns a generator producing sequences with elements {false, true}.
+//
+// It is useful when testing code that depends on Boolean flags. Combinations
+// of multiple flags can be tested when several Bool()'s are combined using
+// Combine() function.
+//
+// In the following example all tests in the test case FlagDependentTest
+// will be instantiated twice with parameters false and true.
+//
+// class FlagDependentTest : public testing::TestWithParam<bool> {
+//   virtual void SetUp() {
+//     external_flag = GetParam();
+//   }
+// }
+// INSTANTIATE_TEST_CASE_P(BoolSequence, FlagDependentTest, Bool());
+//
+inline internal::ParamGenerator<bool> Bool() {
+  return Values(false, true);
+}
+
+# if GTEST_HAS_COMBINE
+// Combine() allows the user to combine two or more sequences to produce
+// values of a Cartesian product of those sequences' elements.
+//
+// Synopsis:
+// Combine(gen1, gen2, ..., genN)
+//   - returns a generator producing sequences with elements coming from
+//     the Cartesian product of elements from the sequences generated by
+//     gen1, gen2, ..., genN. The sequence elements will have a type of
+//     tuple<T1, T2, ..., TN> where T1, T2, ..., TN are the types
+//     of elements from sequences produces by gen1, gen2, ..., genN.
+//
+// Combine can have up to $maxtuple arguments. This number is currently limited
+// by the maximum number of elements in the tuple implementation used by Google
+// Test.
+//
+// Example:
+//
+// This will instantiate tests in test case AnimalTest each one with
+// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
+// tuple("dog", BLACK), and tuple("dog", WHITE):
+//
+// enum Color { BLACK, GRAY, WHITE };
+// class AnimalTest
+//     : public testing::TestWithParam<tuple<const char*, Color> > {...};
+//
+// TEST_P(AnimalTest, AnimalLooksNice) {...}
+//
+// INSTANTIATE_TEST_CASE_P(AnimalVariations, AnimalTest,
+//                         Combine(Values("cat", "dog"),
+//                                 Values(BLACK, WHITE)));
+//
+// This will instantiate tests in FlagDependentTest with all variations of two
+// Boolean flags:
+//
+// class FlagDependentTest
+//     : public testing::TestWithParam<tuple<bool, bool> > {
+//   virtual void SetUp() {
+//     // Assigns external_flag_1 and external_flag_2 values from the tuple.
+//     tie(external_flag_1, external_flag_2) = GetParam();
+//   }
+// };
+//
+// TEST_P(FlagDependentTest, TestFeature1) {
+//   // Test your code using external_flag_1 and external_flag_2 here.
+// }
+// INSTANTIATE_TEST_CASE_P(TwoBoolSequence, FlagDependentTest,
+//                         Combine(Bool(), Bool()));
+//
+$range i 2..maxtuple
+$for i [[
+$range j 1..i
+
+template <$for j, [[typename Generator$j]]>
+internal::CartesianProductHolder$i<$for j, [[Generator$j]]> Combine(
+    $for j, [[const Generator$j& g$j]]) {
+  return internal::CartesianProductHolder$i<$for j, [[Generator$j]]>(
+      $for j, [[g$j]]);
+}
+
+]]
+# endif  // GTEST_HAS_COMBINE
+
+
+
+# define TEST_P(test_case_name, test_name) \
+  class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \
+      : public test_case_name { \
+   public: \
+    GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \
+    virtual void TestBody(); \
+   private: \
+    static int AddToRegistry() { \
+      ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
+          GetTestCasePatternHolder<test_case_name>(\
+              #test_case_name, \
+              ::testing::internal::CodeLocation(\
+                  __FILE__, __LINE__))->AddTestPattern(\
+                      #test_case_name, \
+                      #test_name, \
+                      new ::testing::internal::TestMetaFactory< \
+                          GTEST_TEST_CLASS_NAME_(\
+                              test_case_name, test_name)>()); \
+      return 0; \
+    } \
+    static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(\
+        GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
+  }; \
+  int GTEST_TEST_CLASS_NAME_(test_case_name, \
+                             test_name)::gtest_registering_dummy_ = \
+      GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \
+  void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody()
+
+// The optional last argument to INSTANTIATE_TEST_CASE_P allows the user
+// to specify a function or functor that generates custom test name suffixes
+// based on the test parameters. The function should accept one argument of
+// type testing::TestParamInfo<class ParamType>, and return std::string.
+//
+// testing::PrintToStringParamName is a builtin test suffix generator that
+// returns the value of testing::PrintToString(GetParam()).
+//
+// Note: test names must be non-empty, unique, and may only contain ASCII
+// alphanumeric characters or underscore. Because PrintToString adds quotes
+// to std::string and C strings, it won't work for these types.
+
+# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \
+  ::testing::internal::ParamGenerator<test_case_name::ParamType> \
+      gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \
+  ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \
+      const ::testing::TestParamInfo<test_case_name::ParamType>& info) { \
+    return ::testing::internal::GetParamNameGen<test_case_name::ParamType> \
+        (__VA_ARGS__)(info); \
+  } \
+  int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \
+      ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
+          GetTestCasePatternHolder<test_case_name>(\
+              #test_case_name, \
+              ::testing::internal::CodeLocation(\
+                  __FILE__, __LINE__))->AddTestCaseInstantiation(\
+                      #prefix, \
+                      &gtest_##prefix##test_case_name##_EvalGenerator_, \
+                      &gtest_##prefix##test_case_name##_EvalGenerateName_, \
+                      __FILE__, __LINE__)
+
+}  // namespace testing
+
+#endif  // GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-printers.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-printers.h
new file mode 100644
index 0000000000..8a33164cb3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-printers.h
@@ -0,0 +1,993 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Test - The Google C++ Testing Framework
+//
+// This file implements a universal value printer that can print a
+// value of any type T:
+//
+//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
+//
+// A user can teach this function how to print a class type T by
+// defining either operator<<() or PrintTo() in the namespace that
+// defines T.  More specifically, the FIRST defined function in the
+// following list will be used (assuming T is defined in namespace
+// foo):
+//
+//   1. foo::PrintTo(const T&, ostream*)
+//   2. operator<<(ostream&, const T&) defined in either foo or the
+//      global namespace.
+//
+// If none of the above is defined, it will print the debug string of
+// the value if it is a protocol buffer, or print the raw bytes in the
+// value otherwise.
+//
+// To aid debugging: when T is a reference type, the address of the
+// value is also printed; when T is a (const) char pointer, both the
+// pointer value and the NUL-terminated string it points to are
+// printed.
+//
+// We also provide some convenient wrappers:
+//
+//   // Prints a value to a string.  For a (const or not) char
+//   // pointer, the NUL-terminated string (but not the pointer) is
+//   // printed.
+//   std::string ::testing::PrintToString(const T& value);
+//
+//   // Prints a value tersely: for a reference type, the referenced
+//   // value (but not the address) is printed; for a (const or not) char
+//   // pointer, the NUL-terminated string (but not the pointer) is
+//   // printed.
+//   void ::testing::internal::UniversalTersePrint(const T& value, ostream*);
+//
+//   // Prints value using the type inferred by the compiler.  The difference
+//   // from UniversalTersePrint() is that this function prints both the
+//   // pointer and the NUL-terminated string for a (const or not) char pointer.
+//   void ::testing::internal::UniversalPrint(const T& value, ostream*);
+//
+//   // Prints the fields of a tuple tersely to a string vector, one
+//   // element for each field. Tuple support must be enabled in
+//   // gtest-port.h.
+//   std::vector<string> UniversalTersePrintTupleFieldsToStrings(
+//       const Tuple& value);
+//
+// Known limitation:
+//
+// The print primitives print the elements of an STL-style container
+// using the compiler-inferred type of *iter where iter is a
+// const_iterator of the container.  When const_iterator is an input
+// iterator but not a forward iterator, this inferred type may not
+// match value_type, and the print output may be incorrect.  In
+// practice, this is rarely a problem as for most containers
+// const_iterator is a forward iterator.  We'll fix this if there's an
+// actual need for it.  Note that this fix cannot rely on value_type
+// being defined as many user-defined container types don't have
+// value_type.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
+
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+#include "gtest/internal/gtest-port.h"
+#include "gtest/internal/gtest-internal.h"
+
+#if GTEST_HAS_STD_TUPLE_
+# include <tuple>
+#endif
+
+namespace testing {
+
+// Definitions in the 'internal' and 'internal2' name spaces are
+// subject to change without notice.  DO NOT USE THEM IN USER CODE!
+namespace internal2 {
+
+// Prints the given number of bytes in the given object to the given
+// ostream.
+GTEST_API_ void PrintBytesInObjectTo(const unsigned char* obj_bytes,
+                                     size_t count,
+                                     ::std::ostream* os);
+
+// For selecting which printer to use when a given type has neither <<
+// nor PrintTo().
+enum TypeKind {
+  kProtobuf,              // a protobuf type
+  kConvertibleToInteger,  // a type implicitly convertible to BiggestInt
+                          // (e.g. a named or unnamed enum type)
+  kOtherType              // anything else
+};
+
+// TypeWithoutFormatter<T, kTypeKind>::PrintValue(value, os) is called
+// by the universal printer to print a value of type T when neither
+// operator<< nor PrintTo() is defined for T, where kTypeKind is the
+// "kind" of T as defined by enum TypeKind.
+template <typename T, TypeKind kTypeKind>
+class TypeWithoutFormatter {
+ public:
+  // This default version is called when kTypeKind is kOtherType.
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    PrintBytesInObjectTo(reinterpret_cast<const unsigned char*>(&value),
+                         sizeof(value), os);
+  }
+};
+
+// We print a protobuf using its ShortDebugString() when the string
+// doesn't exceed this many characters; otherwise we print it using
+// DebugString() for better readability.
+const size_t kProtobufOneLinerMaxLength = 50;
+
+template <typename T>
+class TypeWithoutFormatter<T, kProtobuf> {
+ public:
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    const ::testing::internal::string short_str = value.ShortDebugString();
+    const ::testing::internal::string pretty_str =
+        short_str.length() <= kProtobufOneLinerMaxLength ?
+        short_str : ("\n" + value.DebugString());
+    *os << ("<" + pretty_str + ">");
+  }
+};
+
+template <typename T>
+class TypeWithoutFormatter<T, kConvertibleToInteger> {
+ public:
+  // Since T has no << operator or PrintTo() but can be implicitly
+  // converted to BiggestInt, we print it as a BiggestInt.
+  //
+  // Most likely T is an enum type (either named or unnamed), in which
+  // case printing it as an integer is the desired behavior.  In case
+  // T is not an enum, printing it as an integer is the best we can do
+  // given that it has no user-defined printer.
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    const internal::BiggestInt kBigInt = value;
+    *os << kBigInt;
+  }
+};
+
+// Prints the given value to the given ostream.  If the value is a
+// protocol message, its debug string is printed; if it's an enum or
+// of a type implicitly convertible to BiggestInt, it's printed as an
+// integer; otherwise the bytes in the value are printed.  This is
+// what UniversalPrinter<T>::Print() does when it knows nothing about
+// type T and T has neither << operator nor PrintTo().
+//
+// A user can override this behavior for a class type Foo by defining
+// a << operator in the namespace where Foo is defined.
+//
+// We put this operator in namespace 'internal2' instead of 'internal'
+// to simplify the implementation, as much code in 'internal' needs to
+// use << in STL, which would conflict with our own << were it defined
+// in 'internal'.
+//
+// Note that this operator<< takes a generic std::basic_ostream<Char,
+// CharTraits> type instead of the more restricted std::ostream.  If
+// we define it to take an std::ostream instead, we'll get an
+// "ambiguous overloads" compiler error when trying to print a type
+// Foo that supports streaming to std::basic_ostream<Char,
+// CharTraits>, as the compiler cannot tell whether
+// operator<<(std::ostream&, const T&) or
+// operator<<(std::basic_stream<Char, CharTraits>, const Foo&) is more
+// specific.
+template <typename Char, typename CharTraits, typename T>
+::std::basic_ostream<Char, CharTraits>& operator<<(
+    ::std::basic_ostream<Char, CharTraits>& os, const T& x) {
+  TypeWithoutFormatter<T,
+      (internal::IsAProtocolMessage<T>::value ? kProtobuf :
+       internal::ImplicitlyConvertible<const T&, internal::BiggestInt>::value ?
+       kConvertibleToInteger : kOtherType)>::PrintValue(x, &os);
+  return os;
+}
+
+}  // namespace internal2
+}  // namespace testing
+
+// This namespace MUST NOT BE NESTED IN ::testing, or the name look-up
+// magic needed for implementing UniversalPrinter won't work.
+namespace testing_internal {
+
+// Used to print a value that is not an STL-style container when the
+// user doesn't define PrintTo() for it.
+template <typename T>
+void DefaultPrintNonContainerTo(const T& value, ::std::ostream* os) {
+  // With the following statement, during unqualified name lookup,
+  // testing::internal2::operator<< appears as if it was declared in
+  // the nearest enclosing namespace that contains both
+  // ::testing_internal and ::testing::internal2, i.e. the global
+  // namespace.  For more details, refer to the C++ Standard section
+  // 7.3.4-1 [namespace.udir].  This allows us to fall back onto
+  // testing::internal2::operator<< in case T doesn't come with a <<
+  // operator.
+  //
+  // We cannot write 'using ::testing::internal2::operator<<;', which
+  // gcc 3.3 fails to compile due to a compiler bug.
+  using namespace ::testing::internal2;  // NOLINT
+
+  // Assuming T is defined in namespace foo, in the next statement,
+  // the compiler will consider all of:
+  //
+  //   1. foo::operator<< (thanks to Koenig look-up),
+  //   2. ::operator<< (as the current namespace is enclosed in ::),
+  //   3. testing::internal2::operator<< (thanks to the using statement above).
+  //
+  // The operator<< whose type matches T best will be picked.
+  //
+  // We deliberately allow #2 to be a candidate, as sometimes it's
+  // impossible to define #1 (e.g. when foo is ::std, defining
+  // anything in it is undefined behavior unless you are a compiler
+  // vendor.).
+  *os << value;
+}
+
+}  // namespace testing_internal
+
+namespace testing {
+namespace internal {
+
+// FormatForComparison<ToPrint, OtherOperand>::Format(value) formats a
+// value of type ToPrint that is an operand of a comparison assertion
+// (e.g. ASSERT_EQ).  OtherOperand is the type of the other operand in
+// the comparison, and is used to help determine the best way to
+// format the value.  In particular, when the value is a C string
+// (char pointer) and the other operand is an STL string object, we
+// want to format the C string as a string, since we know it is
+// compared by value with the string object.  If the value is a char
+// pointer but the other operand is not an STL string object, we don't
+// know whether the pointer is supposed to point to a NUL-terminated
+// string, and thus want to print it as a pointer to be safe.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+// The default case.
+template <typename ToPrint, typename OtherOperand>
+class FormatForComparison {
+ public:
+  static ::std::string Format(const ToPrint& value) {
+    return ::testing::PrintToString(value);
+  }
+};
+
+// Array.
+template <typename ToPrint, size_t N, typename OtherOperand>
+class FormatForComparison<ToPrint[N], OtherOperand> {
+ public:
+  static ::std::string Format(const ToPrint* value) {
+    return FormatForComparison<const ToPrint*, OtherOperand>::Format(value);
+  }
+};
+
+// By default, print C string as pointers to be safe, as we don't know
+// whether they actually point to a NUL-terminated string.
+
+#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType)                \
+  template <typename OtherOperand>                                      \
+  class FormatForComparison<CharType*, OtherOperand> {                  \
+   public:                                                              \
+    static ::std::string Format(CharType* value) {                      \
+      return ::testing::PrintToString(static_cast<const void*>(value)); \
+    }                                                                   \
+  }
+
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t);
+
+#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_
+
+// If a C string is compared with an STL string object, we know it's meant
+// to point to a NUL-terminated string, and thus can print it as a string.
+
+#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \
+  template <>                                                           \
+  class FormatForComparison<CharType*, OtherStringType> {               \
+   public:                                                              \
+    static ::std::string Format(CharType* value) {                      \
+      return ::testing::PrintToString(value);                           \
+    }                                                                   \
+  }
+
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
+
+#if GTEST_HAS_GLOBAL_STRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::string);
+#endif
+
+#if GTEST_HAS_GLOBAL_WSTRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::wstring);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::wstring);
+#endif
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring);
+#endif
+
+#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_
+
+// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc)
+// operand to be used in a failure message.  The type (but not value)
+// of the other operand may affect the format.  This allows us to
+// print a char* as a raw pointer when it is compared against another
+// char* or void*, and print it as a C string when it is compared
+// against an std::string object, for example.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+template <typename T1, typename T2>
+std::string FormatForComparisonFailureMessage(
+    const T1& value, const T2& /* other_operand */) {
+  return FormatForComparison<T1, T2>::Format(value);
+}
+
+// UniversalPrinter<T>::Print(value, ostream_ptr) prints the given
+// value to the given ostream.  The caller must ensure that
+// 'ostream_ptr' is not NULL, or the behavior is undefined.
+//
+// We define UniversalPrinter as a class template (as opposed to a
+// function template), as we need to partially specialize it for
+// reference types, which cannot be done with function templates.
+template <typename T>
+class UniversalPrinter;
+
+template <typename T>
+void UniversalPrint(const T& value, ::std::ostream* os);
+
+// Used to print an STL-style container when the user doesn't define
+// a PrintTo() for it.
+template <typename C>
+void DefaultPrintTo(IsContainer /* dummy */,
+                    false_type /* is not a pointer */,
+                    const C& container, ::std::ostream* os) {
+  const size_t kMaxCount = 32;  // The maximum number of elements to print.
+  *os << '{';
+  size_t count = 0;
+  for (typename C::const_iterator it = container.begin();
+       it != container.end(); ++it, ++count) {
+    if (count > 0) {
+      *os << ',';
+      if (count == kMaxCount) {  // Enough has been printed.
+        *os << " ...";
+        break;
+      }
+    }
+    *os << ' ';
+    // We cannot call PrintTo(*it, os) here as PrintTo() doesn't
+    // handle *it being a native array.
+    internal::UniversalPrint(*it, os);
+  }
+
+  if (count > 0) {
+    *os << ' ';
+  }
+  *os << '}';
+}
+
+// Used to print a pointer that is neither a char pointer nor a member
+// pointer, when the user doesn't define PrintTo() for it.  (A member
+// variable pointer or member function pointer doesn't really point to
+// a location in the address space.  Their representation is
+// implementation-defined.  Therefore they will be printed as raw
+// bytes.)
+template <typename T>
+void DefaultPrintTo(IsNotContainer /* dummy */,
+                    true_type /* is a pointer */,
+                    T* p, ::std::ostream* os) {
+  if (p == NULL) {
+    *os << "NULL";
+  } else {
+    // C++ doesn't allow casting from a function pointer to any object
+    // pointer.
+    //
+    // IsTrue() silences warnings: "Condition is always true",
+    // "unreachable code".
+    if (IsTrue(ImplicitlyConvertible<T*, const void*>::value)) {
+      // T is not a function type.  We just call << to print p,
+      // relying on ADL to pick up user-defined << for their pointer
+      // types, if any.
+      *os << p;
+    } else {
+      // T is a function type, so '*os << p' doesn't do what we want
+      // (it just prints p as bool).  We want to print p as a const
+      // void*.  However, we cannot cast it to const void* directly,
+      // even using reinterpret_cast, as earlier versions of gcc
+      // (e.g. 3.4.5) cannot compile the cast when p is a function
+      // pointer.  Casting to UInt64 first solves the problem.
+      *os << reinterpret_cast<const void*>(
+          reinterpret_cast<internal::UInt64>(p));
+    }
+  }
+}
+
+// Used to print a non-container, non-pointer value when the user
+// doesn't define PrintTo() for it.
+template <typename T>
+void DefaultPrintTo(IsNotContainer /* dummy */,
+                    false_type /* is not a pointer */,
+                    const T& value, ::std::ostream* os) {
+  ::testing_internal::DefaultPrintNonContainerTo(value, os);
+}
+
+// Prints the given value using the << operator if it has one;
+// otherwise prints the bytes in it.  This is what
+// UniversalPrinter<T>::Print() does when PrintTo() is not specialized
+// or overloaded for type T.
+//
+// A user can override this behavior for a class type Foo by defining
+// an overload of PrintTo() in the namespace where Foo is defined.  We
+// give the user this option as sometimes defining a << operator for
+// Foo is not desirable (e.g. the coding style may prevent doing it,
+// or there is already a << operator but it doesn't do what the user
+// wants).
+template <typename T>
+void PrintTo(const T& value, ::std::ostream* os) {
+  // DefaultPrintTo() is overloaded.  The type of its first two
+  // arguments determine which version will be picked.  If T is an
+  // STL-style container, the version for container will be called; if
+  // T is a pointer, the pointer version will be called; otherwise the
+  // generic version will be called.
+  //
+  // Note that we check for container types here, prior to we check
+  // for protocol message types in our operator<<.  The rationale is:
+  //
+  // For protocol messages, we want to give people a chance to
+  // override Google Mock's format by defining a PrintTo() or
+  // operator<<.  For STL containers, other formats can be
+  // incompatible with Google Mock's format for the container
+  // elements; therefore we check for container types here to ensure
+  // that our format is used.
+  //
+  // The second argument of DefaultPrintTo() is needed to bypass a bug
+  // in Symbian's C++ compiler that prevents it from picking the right
+  // overload between:
+  //
+  //   PrintTo(const T& x, ...);
+  //   PrintTo(T* x, ...);
+  DefaultPrintTo(IsContainerTest<T>(0), is_pointer<T>(), value, os);
+}
+
+// The following list of PrintTo() overloads tells
+// UniversalPrinter<T>::Print() how to print standard types (built-in
+// types, strings, plain arrays, and pointers).
+
+// Overloads for various char types.
+GTEST_API_ void PrintTo(unsigned char c, ::std::ostream* os);
+GTEST_API_ void PrintTo(signed char c, ::std::ostream* os);
+inline void PrintTo(char c, ::std::ostream* os) {
+  // When printing a plain char, we always treat it as unsigned.  This
+  // way, the output won't be affected by whether the compiler thinks
+  // char is signed or not.
+  PrintTo(static_cast<unsigned char>(c), os);
+}
+
+// Overloads for other simple built-in types.
+inline void PrintTo(bool x, ::std::ostream* os) {
+  *os << (x ? "true" : "false");
+}
+
+// Overload for wchar_t type.
+// Prints a wchar_t as a symbol if it is printable or as its internal
+// code otherwise and also as its decimal code (except for L'\0').
+// The L'\0' char is printed as "L'\\0'". The decimal code is printed
+// as signed integer when wchar_t is implemented by the compiler
+// as a signed type and is printed as an unsigned integer when wchar_t
+// is implemented as an unsigned type.
+GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os);
+
+// Overloads for C strings.
+GTEST_API_ void PrintTo(const char* s, ::std::ostream* os);
+inline void PrintTo(char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const char*>(s), os);
+}
+
+// signed/unsigned char is often used for representing binary data, so
+// we print pointers to it as void* to be safe.
+inline void PrintTo(const signed char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(signed char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(const unsigned char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(unsigned char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+
+// MSVC can be configured to define wchar_t as a typedef of unsigned
+// short.  It defines _NATIVE_WCHAR_T_DEFINED when wchar_t is a native
+// type.  When wchar_t is a typedef, defining an overload for const
+// wchar_t* would cause unsigned short* be printed as a wide string,
+// possibly causing invalid memory accesses.
+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
+// Overloads for wide C strings
+GTEST_API_ void PrintTo(const wchar_t* s, ::std::ostream* os);
+inline void PrintTo(wchar_t* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const wchar_t*>(s), os);
+}
+#endif
+
+// Overload for C arrays.  Multi-dimensional arrays are printed
+// properly.
+
+// Prints the given number of elements in an array, without printing
+// the curly braces.
+template <typename T>
+void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) {
+  UniversalPrint(a[0], os);
+  for (size_t i = 1; i != count; i++) {
+    *os << ", ";
+    UniversalPrint(a[i], os);
+  }
+}
+
+// Overloads for ::string and ::std::string.
+#if GTEST_HAS_GLOBAL_STRING
+GTEST_API_ void PrintStringTo(const ::string&s, ::std::ostream* os);
+inline void PrintTo(const ::string& s, ::std::ostream* os) {
+  PrintStringTo(s, os);
+}
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+GTEST_API_ void PrintStringTo(const ::std::string&s, ::std::ostream* os);
+inline void PrintTo(const ::std::string& s, ::std::ostream* os) {
+  PrintStringTo(s, os);
+}
+
+// Overloads for ::wstring and ::std::wstring.
+#if GTEST_HAS_GLOBAL_WSTRING
+GTEST_API_ void PrintWideStringTo(const ::wstring&s, ::std::ostream* os);
+inline void PrintTo(const ::wstring& s, ::std::ostream* os) {
+  PrintWideStringTo(s, os);
+}
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os);
+inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
+  PrintWideStringTo(s, os);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
+// Helper function for printing a tuple.  T must be instantiated with
+// a tuple type.
+template <typename T>
+void PrintTupleTo(const T& t, ::std::ostream* os);
+#endif  // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
+
+#if GTEST_HAS_TR1_TUPLE
+// Overload for ::std::tr1::tuple.  Needed for printing function arguments,
+// which are packed as tuples.
+
+// Overloaded PrintTo() for tuples of various arities.  We support
+// tuples of up-to 10 fields.  The following implementation works
+// regardless of whether tr1::tuple is implemented using the
+// non-standard variadic template feature or not.
+
+inline void PrintTo(const ::std::tr1::tuple<>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1>
+void PrintTo(const ::std::tr1::tuple<T1>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2>
+void PrintTo(const ::std::tr1::tuple<T1, T2>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7, typename T8>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7, typename T8, typename T9>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7, typename T8, typename T9, typename T10>
+void PrintTo(
+    const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>& t,
+    ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+#endif  // GTEST_HAS_TR1_TUPLE
+
+#if GTEST_HAS_STD_TUPLE_
+template <typename... Types>
+void PrintTo(const ::std::tuple<Types...>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+#endif  // GTEST_HAS_STD_TUPLE_
+
+// Overload for std::pair.
+template <typename T1, typename T2>
+void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) {
+  *os << '(';
+  // We cannot use UniversalPrint(value.first, os) here, as T1 may be
+  // a reference type.  The same for printing value.second.
+  UniversalPrinter<T1>::Print(value.first, os);
+  *os << ", ";
+  UniversalPrinter<T2>::Print(value.second, os);
+  *os << ')';
+}
+
+// Implements printing a non-reference type T by letting the compiler
+// pick the right overload of PrintTo() for T.
+template <typename T>
+class UniversalPrinter {
+ public:
+  // MSVC warns about adding const to a function type, so we want to
+  // disable the warning.
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
+
+  // Note: we deliberately don't call this PrintTo(), as that name
+  // conflicts with ::testing::internal::PrintTo in the body of the
+  // function.
+  static void Print(const T& value, ::std::ostream* os) {
+    // By default, ::testing::internal::PrintTo() is used for printing
+    // the value.
+    //
+    // Thanks to Koenig look-up, if T is a class and has its own
+    // PrintTo() function defined in its namespace, that function will
+    // be visible here.  Since it is more specific than the generic ones
+    // in ::testing::internal, it will be picked by the compiler in the
+    // following statement - exactly what we want.
+    PrintTo(value, os);
+  }
+
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+};
+
+// UniversalPrintArray(begin, len, os) prints an array of 'len'
+// elements, starting at address 'begin'.
+template <typename T>
+void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) {
+  if (len == 0) {
+    *os << "{}";
+  } else {
+    *os << "{ ";
+    const size_t kThreshold = 18;
+    const size_t kChunkSize = 8;
+    // If the array has more than kThreshold elements, we'll have to
+    // omit some details by printing only the first and the last
+    // kChunkSize elements.
+    // TODO(wan@google.com): let the user control the threshold using a flag.
+    if (len <= kThreshold) {
+      PrintRawArrayTo(begin, len, os);
+    } else {
+      PrintRawArrayTo(begin, kChunkSize, os);
+      *os << ", ..., ";
+      PrintRawArrayTo(begin + len - kChunkSize, kChunkSize, os);
+    }
+    *os << " }";
+  }
+}
+// This overload prints a (const) char array compactly.
+GTEST_API_ void UniversalPrintArray(
+    const char* begin, size_t len, ::std::ostream* os);
+
+// This overload prints a (const) wchar_t array compactly.
+GTEST_API_ void UniversalPrintArray(
+    const wchar_t* begin, size_t len, ::std::ostream* os);
+
+// Implements printing an array type T[N].
+template <typename T, size_t N>
+class UniversalPrinter<T[N]> {
+ public:
+  // Prints the given array, omitting some elements when there are too
+  // many.
+  static void Print(const T (&a)[N], ::std::ostream* os) {
+    UniversalPrintArray(a, N, os);
+  }
+};
+
+// Implements printing a reference type T&.
+template <typename T>
+class UniversalPrinter<T&> {
+ public:
+  // MSVC warns about adding const to a function type, so we want to
+  // disable the warning.
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
+
+  static void Print(const T& value, ::std::ostream* os) {
+    // Prints the address of the value.  We use reinterpret_cast here
+    // as static_cast doesn't compile when T is a function type.
+    *os << "@" << reinterpret_cast<const void*>(&value) << " ";
+
+    // Then prints the value itself.
+    UniversalPrint(value, os);
+  }
+
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+};
+
+// Prints a value tersely: for a reference type, the referenced value
+// (but not the address) is printed; for a (const) char pointer, the
+// NUL-terminated string (but not the pointer) is printed.
+
+template <typename T>
+class UniversalTersePrinter {
+ public:
+  static void Print(const T& value, ::std::ostream* os) {
+    UniversalPrint(value, os);
+  }
+};
+template <typename T>
+class UniversalTersePrinter<T&> {
+ public:
+  static void Print(const T& value, ::std::ostream* os) {
+    UniversalPrint(value, os);
+  }
+};
+template <typename T, size_t N>
+class UniversalTersePrinter<T[N]> {
+ public:
+  static void Print(const T (&value)[N], ::std::ostream* os) {
+    UniversalPrinter<T[N]>::Print(value, os);
+  }
+};
+template <>
+class UniversalTersePrinter<const char*> {
+ public:
+  static void Print(const char* str, ::std::ostream* os) {
+    if (str == NULL) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(string(str), os);
+    }
+  }
+};
+template <>
+class UniversalTersePrinter<char*> {
+ public:
+  static void Print(char* str, ::std::ostream* os) {
+    UniversalTersePrinter<const char*>::Print(str, os);
+  }
+};
+
+#if GTEST_HAS_STD_WSTRING
+template <>
+class UniversalTersePrinter<const wchar_t*> {
+ public:
+  static void Print(const wchar_t* str, ::std::ostream* os) {
+    if (str == NULL) {
+      *os << "NULL";
+    } else {
+      UniversalPrint(::std::wstring(str), os);
+    }
+  }
+};
+#endif
+
+template <>
+class UniversalTersePrinter<wchar_t*> {
+ public:
+  static void Print(wchar_t* str, ::std::ostream* os) {
+    UniversalTersePrinter<const wchar_t*>::Print(str, os);
+  }
+};
+
+template <typename T>
+void UniversalTersePrint(const T& value, ::std::ostream* os) {
+  UniversalTersePrinter<T>::Print(value, os);
+}
+
+// Prints a value using the type inferred by the compiler.  The
+// difference between this and UniversalTersePrint() is that for a
+// (const) char pointer, this prints both the pointer and the
+// NUL-terminated string.
+template <typename T>
+void UniversalPrint(const T& value, ::std::ostream* os) {
+  // A workarond for the bug in VC++ 7.1 that prevents us from instantiating
+  // UniversalPrinter with T directly.
+  typedef T T1;
+  UniversalPrinter<T1>::Print(value, os);
+}
+
+typedef ::std::vector<string> Strings;
+
+// TuplePolicy<TupleT> must provide:
+// - tuple_size
+//     size of tuple TupleT.
+// - get<size_t I>(const TupleT& t)
+//     static function extracting element I of tuple TupleT.
+// - tuple_element<size_t I>::type
+//     type of element I of tuple TupleT.
+template <typename TupleT>
+struct TuplePolicy;
+
+#if GTEST_HAS_TR1_TUPLE
+template <typename TupleT>
+struct TuplePolicy {
+  typedef TupleT Tuple;
+  static const size_t tuple_size = ::std::tr1::tuple_size<Tuple>::value;
+
+  template <size_t I>
+  struct tuple_element : ::std::tr1::tuple_element<I, Tuple> {};
+
+  template <size_t I>
+  static typename AddReference<
+      const typename ::std::tr1::tuple_element<I, Tuple>::type>::type get(
+      const Tuple& tuple) {
+    return ::std::tr1::get<I>(tuple);
+  }
+};
+template <typename TupleT>
+const size_t TuplePolicy<TupleT>::tuple_size;
+#endif  // GTEST_HAS_TR1_TUPLE
+
+#if GTEST_HAS_STD_TUPLE_
+template <typename... Types>
+struct TuplePolicy< ::std::tuple<Types...> > {
+  typedef ::std::tuple<Types...> Tuple;
+  static const size_t tuple_size = ::std::tuple_size<Tuple>::value;
+
+  template <size_t I>
+  struct tuple_element : ::std::tuple_element<I, Tuple> {};
+
+  template <size_t I>
+  static const typename ::std::tuple_element<I, Tuple>::type& get(
+      const Tuple& tuple) {
+    return ::std::get<I>(tuple);
+  }
+};
+template <typename... Types>
+const size_t TuplePolicy< ::std::tuple<Types...> >::tuple_size;
+#endif  // GTEST_HAS_STD_TUPLE_
+
+#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
+// This helper template allows PrintTo() for tuples and
+// UniversalTersePrintTupleFieldsToStrings() to be defined by
+// induction on the number of tuple fields.  The idea is that
+// TuplePrefixPrinter<N>::PrintPrefixTo(t, os) prints the first N
+// fields in tuple t, and can be defined in terms of
+// TuplePrefixPrinter<N - 1>.
+//
+// The inductive case.
+template <size_t N>
+struct TuplePrefixPrinter {
+  // Prints the first N fields of a tuple.
+  template <typename Tuple>
+  static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
+    TuplePrefixPrinter<N - 1>::PrintPrefixTo(t, os);
+    GTEST_INTENTIONAL_CONST_COND_PUSH_()
+    if (N > 1) {
+    GTEST_INTENTIONAL_CONST_COND_POP_()
+      *os << ", ";
+    }
+    UniversalPrinter<
+        typename TuplePolicy<Tuple>::template tuple_element<N - 1>::type>
+        ::Print(TuplePolicy<Tuple>::template get<N - 1>(t), os);
+  }
+
+  // Tersely prints the first N fields of a tuple to a string vector,
+  // one element for each field.
+  template <typename Tuple>
+  static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) {
+    TuplePrefixPrinter<N - 1>::TersePrintPrefixToStrings(t, strings);
+    ::std::stringstream ss;
+    UniversalTersePrint(TuplePolicy<Tuple>::template get<N - 1>(t), &ss);
+    strings->push_back(ss.str());
+  }
+};
+
+// Base case.
+template <>
+struct TuplePrefixPrinter<0> {
+  template <typename Tuple>
+  static void PrintPrefixTo(const Tuple&, ::std::ostream*) {}
+
+  template <typename Tuple>
+  static void TersePrintPrefixToStrings(const Tuple&, Strings*) {}
+};
+
+// Helper function for printing a tuple.
+// Tuple must be either std::tr1::tuple or std::tuple type.
+template <typename Tuple>
+void PrintTupleTo(const Tuple& t, ::std::ostream* os) {
+  *os << "(";
+  TuplePrefixPrinter<TuplePolicy<Tuple>::tuple_size>::PrintPrefixTo(t, os);
+  *os << ")";
+}
+
+// Prints the fields of a tuple tersely to a string vector, one
+// element for each field.  See the comment before
+// UniversalTersePrint() for how we define "tersely".
+template <typename Tuple>
+Strings UniversalTersePrintTupleFieldsToStrings(const Tuple& value) {
+  Strings result;
+  TuplePrefixPrinter<TuplePolicy<Tuple>::tuple_size>::
+      TersePrintPrefixToStrings(value, &result);
+  return result;
+}
+#endif  // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
+
+}  // namespace internal
+
+template <typename T>
+::std::string PrintToString(const T& value) {
+  ::std::stringstream ss;
+  internal::UniversalTersePrinter<T>::Print(value, &ss);
+  return ss.str();
+}
+
+}  // namespace testing
+
+// Include any custom printer added by the local installation.
+// We must include this header at the end to make sure it can use the
+// declarations from this file.
+#include "gtest/internal/custom/gtest-printers.h"
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-spi.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-spi.h
new file mode 100644
index 0000000000..f63fa9a1b2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-spi.h
@@ -0,0 +1,232 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Utilities for testing Google Test itself and code that uses Google Test
+// (e.g. frameworks built on top of Google Test).
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_
+#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_
+
+#include "gtest/gtest.h"
+
+namespace testing {
+
+// This helper class can be used to mock out Google Test failure reporting
+// so that we can test Google Test or code that builds on Google Test.
+//
+// An object of this class appends a TestPartResult object to the
+// TestPartResultArray object given in the constructor whenever a Google Test
+// failure is reported. It can either intercept only failures that are
+// generated in the same thread that created this object or it can intercept
+// all generated failures. The scope of this mock object can be controlled with
+// the second argument to the two arguments constructor.
+class GTEST_API_ ScopedFakeTestPartResultReporter
+    : public TestPartResultReporterInterface {
+ public:
+  // The two possible mocking modes of this object.
+  enum InterceptMode {
+    INTERCEPT_ONLY_CURRENT_THREAD,  // Intercepts only thread local failures.
+    INTERCEPT_ALL_THREADS           // Intercepts all failures.
+  };
+
+  // The c'tor sets this object as the test part result reporter used
+  // by Google Test.  The 'result' parameter specifies where to report the
+  // results. This reporter will only catch failures generated in the current
+  // thread. DEPRECATED
+  explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result);
+
+  // Same as above, but you can choose the interception scope of this object.
+  ScopedFakeTestPartResultReporter(InterceptMode intercept_mode,
+                                   TestPartResultArray* result);
+
+  // The d'tor restores the previous test part result reporter.
+  virtual ~ScopedFakeTestPartResultReporter();
+
+  // Appends the TestPartResult object to the TestPartResultArray
+  // received in the constructor.
+  //
+  // This method is from the TestPartResultReporterInterface
+  // interface.
+  virtual void ReportTestPartResult(const TestPartResult& result);
+ private:
+  void Init();
+
+  const InterceptMode intercept_mode_;
+  TestPartResultReporterInterface* old_reporter_;
+  TestPartResultArray* const result_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter);
+};
+
+namespace internal {
+
+// A helper class for implementing EXPECT_FATAL_FAILURE() and
+// EXPECT_NONFATAL_FAILURE().  Its destructor verifies that the given
+// TestPartResultArray contains exactly one failure that has the given
+// type and contains the given substring.  If that's not the case, a
+// non-fatal failure will be generated.
+class GTEST_API_ SingleFailureChecker {
+ public:
+  // The constructor remembers the arguments.
+  SingleFailureChecker(const TestPartResultArray* results,
+                       TestPartResult::Type type,
+                       const string& substr);
+  ~SingleFailureChecker();
+ private:
+  const TestPartResultArray* const results_;
+  const TestPartResult::Type type_;
+  const string substr_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker);
+};
+
+}  // namespace internal
+
+}  // namespace testing
+
+// A set of macros for testing Google Test assertions or code that's expected
+// to generate Google Test fatal failures.  It verifies that the given
+// statement will cause exactly one fatal Google Test failure with 'substr'
+// being part of the failure message.
+//
+// There are two different versions of this macro. EXPECT_FATAL_FAILURE only
+// affects and considers failures generated in the current thread and
+// EXPECT_FATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
+//
+// The verification of the assertion is done correctly even when the statement
+// throws an exception or aborts the current function.
+//
+// Known restrictions:
+//   - 'statement' cannot reference local non-static variables or
+//     non-static members of the current object.
+//   - 'statement' cannot return a value.
+//   - You cannot stream a failure message to this macro.
+//
+// Note that even though the implementations of the following two
+// macros are much alike, we cannot refactor them to use a common
+// helper macro, due to some peculiarity in how the preprocessor
+// works.  The AcceptsMacroThatExpandsToUnprotectedComma test in
+// gtest_unittest.cc will fail to compile if we do that.
+#define EXPECT_FATAL_FAILURE(statement, substr) \
+  do { \
+    class GTestExpectFatalFailureHelper {\
+     public:\
+      static void Execute() { statement; }\
+    };\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter:: \
+          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
+      GTestExpectFatalFailureHelper::Execute();\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+#define EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
+  do { \
+    class GTestExpectFatalFailureHelper {\
+     public:\
+      static void Execute() { statement; }\
+    };\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter:: \
+          INTERCEPT_ALL_THREADS, &gtest_failures);\
+      GTestExpectFatalFailureHelper::Execute();\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+// A macro for testing Google Test assertions or code that's expected to
+// generate Google Test non-fatal failures.  It asserts that the given
+// statement will cause exactly one non-fatal Google Test failure with 'substr'
+// being part of the failure message.
+//
+// There are two different versions of this macro. EXPECT_NONFATAL_FAILURE only
+// affects and considers failures generated in the current thread and
+// EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS does the same but for all threads.
+//
+// 'statement' is allowed to reference local variables and members of
+// the current object.
+//
+// The verification of the assertion is done correctly even when the statement
+// throws an exception or aborts the current function.
+//
+// Known restrictions:
+//   - You cannot stream a failure message to this macro.
+//
+// Note that even though the implementations of the following two
+// macros are much alike, we cannot refactor them to use a common
+// helper macro, due to some peculiarity in how the preprocessor
+// works.  If we do that, the code won't compile when the user gives
+// EXPECT_NONFATAL_FAILURE() a statement that contains a macro that
+// expands to code containing an unprotected comma.  The
+// AcceptsMacroThatExpandsToUnprotectedComma test in gtest_unittest.cc
+// catches that.
+//
+// For the same reason, we have to write
+//   if (::testing::internal::AlwaysTrue()) { statement; }
+// instead of
+//   GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
+// to avoid an MSVC warning on unreachable code.
+#define EXPECT_NONFATAL_FAILURE(statement, substr) \
+  do {\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
+        (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter:: \
+          INTERCEPT_ONLY_CURRENT_THREAD, &gtest_failures);\
+      if (::testing::internal::AlwaysTrue()) { statement; }\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+#define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \
+  do {\
+    ::testing::TestPartResultArray gtest_failures;\
+    ::testing::internal::SingleFailureChecker gtest_checker(\
+        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
+        (substr));\
+    {\
+      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\
+          ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \
+          &gtest_failures);\
+      if (::testing::internal::AlwaysTrue()) { statement; }\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_SPI_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-test-part.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-test-part.h
new file mode 100644
index 0000000000..77eb844839
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-test-part.h
@@ -0,0 +1,179 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: mheule@google.com (Markus Heule)
+//
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
+#define GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
+
+#include <iosfwd>
+#include <vector>
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-string.h"
+
+namespace testing {
+
+// A copyable object representing the result of a test part (i.e. an
+// assertion or an explicit FAIL(), ADD_FAILURE(), or SUCCESS()).
+//
+// Don't inherit from TestPartResult as its destructor is not virtual.
+class GTEST_API_ TestPartResult {
+ public:
+  // The possible outcomes of a test part (i.e. an assertion or an
+  // explicit SUCCEED(), FAIL(), or ADD_FAILURE()).
+  enum Type {
+    kSuccess,          // Succeeded.
+    kNonFatalFailure,  // Failed but the test can continue.
+    kFatalFailure      // Failed and the test should be terminated.
+  };
+
+  // C'tor.  TestPartResult does NOT have a default constructor.
+  // Always use this constructor (with parameters) to create a
+  // TestPartResult object.
+  TestPartResult(Type a_type,
+                 const char* a_file_name,
+                 int a_line_number,
+                 const char* a_message)
+      : type_(a_type),
+        file_name_(a_file_name == NULL ? "" : a_file_name),
+        line_number_(a_line_number),
+        summary_(ExtractSummary(a_message)),
+        message_(a_message) {
+  }
+
+  // Gets the outcome of the test part.
+  Type type() const { return type_; }
+
+  // Gets the name of the source file where the test part took place, or
+  // NULL if it's unknown.
+  const char* file_name() const {
+    return file_name_.empty() ? NULL : file_name_.c_str();
+  }
+
+  // Gets the line in the source file where the test part took place,
+  // or -1 if it's unknown.
+  int line_number() const { return line_number_; }
+
+  // Gets the summary of the failure message.
+  const char* summary() const { return summary_.c_str(); }
+
+  // Gets the message associated with the test part.
+  const char* message() const { return message_.c_str(); }
+
+  // Returns true iff the test part passed.
+  bool passed() const { return type_ == kSuccess; }
+
+  // Returns true iff the test part failed.
+  bool failed() const { return type_ != kSuccess; }
+
+  // Returns true iff the test part non-fatally failed.
+  bool nonfatally_failed() const { return type_ == kNonFatalFailure; }
+
+  // Returns true iff the test part fatally failed.
+  bool fatally_failed() const { return type_ == kFatalFailure; }
+
+ private:
+  Type type_;
+
+  // Gets the summary of the failure message by omitting the stack
+  // trace in it.
+  static std::string ExtractSummary(const char* message);
+
+  // The name of the source file where the test part took place, or
+  // "" if the source file is unknown.
+  std::string file_name_;
+  // The line in the source file where the test part took place, or -1
+  // if the line number is unknown.
+  int line_number_;
+  std::string summary_;  // The test failure summary.
+  std::string message_;  // The test failure message.
+};
+
+// Prints a TestPartResult object.
+std::ostream& operator<<(std::ostream& os, const TestPartResult& result);
+
+// An array of TestPartResult objects.
+//
+// Don't inherit from TestPartResultArray as its destructor is not
+// virtual.
+class GTEST_API_ TestPartResultArray {
+ public:
+  TestPartResultArray() {}
+
+  // Appends the given TestPartResult to the array.
+  void Append(const TestPartResult& result);
+
+  // Returns the TestPartResult at the given index (0-based).
+  const TestPartResult& GetTestPartResult(int index) const;
+
+  // Returns the number of TestPartResult objects in the array.
+  int size() const;
+
+ private:
+  std::vector<TestPartResult> array_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestPartResultArray);
+};
+
+// This interface knows how to report a test part result.
+class TestPartResultReporterInterface {
+ public:
+  virtual ~TestPartResultReporterInterface() {}
+
+  virtual void ReportTestPartResult(const TestPartResult& result) = 0;
+};
+
+namespace internal {
+
+// This helper class is used by {ASSERT|EXPECT}_NO_FATAL_FAILURE to check if a
+// statement generates new fatal failures. To do so it registers itself as the
+// current test part result reporter. Besides checking if fatal failures were
+// reported, it only delegates the reporting to the former result reporter.
+// The original result reporter is restored in the destructor.
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+class GTEST_API_ HasNewFatalFailureHelper
+    : public TestPartResultReporterInterface {
+ public:
+  HasNewFatalFailureHelper();
+  virtual ~HasNewFatalFailureHelper();
+  virtual void ReportTestPartResult(const TestPartResult& result);
+  bool has_new_fatal_failure() const { return has_new_fatal_failure_; }
+ private:
+  bool has_new_fatal_failure_;
+  TestPartResultReporterInterface* original_reporter_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(HasNewFatalFailureHelper);
+};
+
+}  // namespace internal
+
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-typed-test.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-typed-test.h
new file mode 100644
index 0000000000..5f69d5678e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest-typed-test.h
@@ -0,0 +1,263 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
+#define GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
+
+// This header implements typed tests and type-parameterized tests.
+
+// Typed (aka type-driven) tests repeat the same test for types in a
+// list.  You must know which types you want to test with when writing
+// typed tests. Here's how you do it:
+
+#if 0
+
+// First, define a fixture class template.  It should be parameterized
+// by a type.  Remember to derive it from testing::Test.
+template <typename T>
+class FooTest : public testing::Test {
+ public:
+  ...
+  typedef std::list<T> List;
+  static T shared_;
+  T value_;
+};
+
+// Next, associate a list of types with the test case, which will be
+// repeated for each type in the list.  The typedef is necessary for
+// the macro to parse correctly.
+typedef testing::Types<char, int, unsigned int> MyTypes;
+TYPED_TEST_CASE(FooTest, MyTypes);
+
+// If the type list contains only one type, you can write that type
+// directly without Types<...>:
+//   TYPED_TEST_CASE(FooTest, int);
+
+// Then, use TYPED_TEST() instead of TEST_F() to define as many typed
+// tests for this test case as you want.
+TYPED_TEST(FooTest, DoesBlah) {
+  // Inside a test, refer to TypeParam to get the type parameter.
+  // Since we are inside a derived class template, C++ requires use to
+  // visit the members of FooTest via 'this'.
+  TypeParam n = this->value_;
+
+  // To visit static members of the fixture, add the TestFixture::
+  // prefix.
+  n += TestFixture::shared_;
+
+  // To refer to typedefs in the fixture, add the "typename
+  // TestFixture::" prefix.
+  typename TestFixture::List values;
+  values.push_back(n);
+  ...
+}
+
+TYPED_TEST(FooTest, HasPropertyA) { ... }
+
+#endif  // 0
+
+// Type-parameterized tests are abstract test patterns parameterized
+// by a type.  Compared with typed tests, type-parameterized tests
+// allow you to define the test pattern without knowing what the type
+// parameters are.  The defined pattern can be instantiated with
+// different types any number of times, in any number of translation
+// units.
+//
+// If you are designing an interface or concept, you can define a
+// suite of type-parameterized tests to verify properties that any
+// valid implementation of the interface/concept should have.  Then,
+// each implementation can easily instantiate the test suite to verify
+// that it conforms to the requirements, without having to write
+// similar tests repeatedly.  Here's an example:
+
+#if 0
+
+// First, define a fixture class template.  It should be parameterized
+// by a type.  Remember to derive it from testing::Test.
+template <typename T>
+class FooTest : public testing::Test {
+  ...
+};
+
+// Next, declare that you will define a type-parameterized test case
+// (the _P suffix is for "parameterized" or "pattern", whichever you
+// prefer):
+TYPED_TEST_CASE_P(FooTest);
+
+// Then, use TYPED_TEST_P() to define as many type-parameterized tests
+// for this type-parameterized test case as you want.
+TYPED_TEST_P(FooTest, DoesBlah) {
+  // Inside a test, refer to TypeParam to get the type parameter.
+  TypeParam n = 0;
+  ...
+}
+
+TYPED_TEST_P(FooTest, HasPropertyA) { ... }
+
+// Now the tricky part: you need to register all test patterns before
+// you can instantiate them.  The first argument of the macro is the
+// test case name; the rest are the names of the tests in this test
+// case.
+REGISTER_TYPED_TEST_CASE_P(FooTest,
+                           DoesBlah, HasPropertyA);
+
+// Finally, you are free to instantiate the pattern with the types you
+// want.  If you put the above code in a header file, you can #include
+// it in multiple C++ source files and instantiate it multiple times.
+//
+// To distinguish different instances of the pattern, the first
+// argument to the INSTANTIATE_* macro is a prefix that will be added
+// to the actual test case name.  Remember to pick unique prefixes for
+// different instances.
+typedef testing::Types<char, int, unsigned int> MyTypes;
+INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes);
+
+// If the type list contains only one type, you can write that type
+// directly without Types<...>:
+//   INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int);
+
+#endif  // 0
+
+#include "gtest/internal/gtest-port.h"
+#include "gtest/internal/gtest-type-util.h"
+
+// Implements typed tests.
+
+#if GTEST_HAS_TYPED_TEST
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Expands to the name of the typedef for the type parameters of the
+// given test case.
+# define GTEST_TYPE_PARAMS_(TestCaseName) gtest_type_params_##TestCaseName##_
+
+// The 'Types' template argument below must have spaces around it
+// since some compilers may choke on '>>' when passing a template
+// instance (e.g. Types<int>)
+# define TYPED_TEST_CASE(CaseName, Types) \
+  typedef ::testing::internal::TypeList< Types >::type \
+      GTEST_TYPE_PARAMS_(CaseName)
+
+# define TYPED_TEST(CaseName, TestName) \
+  template <typename gtest_TypeParam_> \
+  class GTEST_TEST_CLASS_NAME_(CaseName, TestName) \
+      : public CaseName<gtest_TypeParam_> { \
+   private: \
+    typedef CaseName<gtest_TypeParam_> TestFixture; \
+    typedef gtest_TypeParam_ TypeParam; \
+    virtual void TestBody(); \
+  }; \
+  bool gtest_##CaseName##_##TestName##_registered_ GTEST_ATTRIBUTE_UNUSED_ = \
+      ::testing::internal::TypeParameterizedTest< \
+          CaseName, \
+          ::testing::internal::TemplateSel< \
+              GTEST_TEST_CLASS_NAME_(CaseName, TestName)>, \
+          GTEST_TYPE_PARAMS_(CaseName)>::Register(\
+              "", ::testing::internal::CodeLocation(__FILE__, __LINE__), \
+              #CaseName, #TestName, 0); \
+  template <typename gtest_TypeParam_> \
+  void GTEST_TEST_CLASS_NAME_(CaseName, TestName)<gtest_TypeParam_>::TestBody()
+
+#endif  // GTEST_HAS_TYPED_TEST
+
+// Implements type-parameterized tests.
+
+#if GTEST_HAS_TYPED_TEST_P
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Expands to the namespace name that the type-parameterized tests for
+// the given type-parameterized test case are defined in.  The exact
+// name of the namespace is subject to change without notice.
+# define GTEST_CASE_NAMESPACE_(TestCaseName) \
+  gtest_case_##TestCaseName##_
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Expands to the name of the variable used to remember the names of
+// the defined tests in the given test case.
+# define GTEST_TYPED_TEST_CASE_P_STATE_(TestCaseName) \
+  gtest_typed_test_case_p_state_##TestCaseName##_
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE DIRECTLY.
+//
+// Expands to the name of the variable used to remember the names of
+// the registered tests in the given test case.
+# define GTEST_REGISTERED_TEST_NAMES_(TestCaseName) \
+  gtest_registered_test_names_##TestCaseName##_
+
+// The variables defined in the type-parameterized test macros are
+// static as typically these macros are used in a .h file that can be
+// #included in multiple translation units linked together.
+# define TYPED_TEST_CASE_P(CaseName) \
+  static ::testing::internal::TypedTestCasePState \
+      GTEST_TYPED_TEST_CASE_P_STATE_(CaseName)
+
+# define TYPED_TEST_P(CaseName, TestName) \
+  namespace GTEST_CASE_NAMESPACE_(CaseName) { \
+  template <typename gtest_TypeParam_> \
+  class TestName : public CaseName<gtest_TypeParam_> { \
+   private: \
+    typedef CaseName<gtest_TypeParam_> TestFixture; \
+    typedef gtest_TypeParam_ TypeParam; \
+    virtual void TestBody(); \
+  }; \
+  static bool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \
+      GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).AddTestName(\
+          __FILE__, __LINE__, #CaseName, #TestName); \
+  } \
+  template <typename gtest_TypeParam_> \
+  void GTEST_CASE_NAMESPACE_(CaseName)::TestName<gtest_TypeParam_>::TestBody()
+
+# define REGISTER_TYPED_TEST_CASE_P(CaseName, ...) \
+  namespace GTEST_CASE_NAMESPACE_(CaseName) { \
+  typedef ::testing::internal::Templates<__VA_ARGS__>::type gtest_AllTests_; \
+  } \
+  static const char* const GTEST_REGISTERED_TEST_NAMES_(CaseName) = \
+      GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).VerifyRegisteredTestNames(\
+          __FILE__, __LINE__, #__VA_ARGS__)
+
+// The 'Types' template argument below must have spaces around it
+// since some compilers may choke on '>>' when passing a template
+// instance (e.g. Types<int>)
+# define INSTANTIATE_TYPED_TEST_CASE_P(Prefix, CaseName, Types) \
+  bool gtest_##Prefix##_##CaseName GTEST_ATTRIBUTE_UNUSED_ = \
+      ::testing::internal::TypeParameterizedTestCase<CaseName, \
+          GTEST_CASE_NAMESPACE_(CaseName)::gtest_AllTests_, \
+          ::testing::internal::TypeList< Types >::type>::Register(\
+              #Prefix, \
+              ::testing::internal::CodeLocation(__FILE__, __LINE__), \
+              &GTEST_TYPED_TEST_CASE_P_STATE_(CaseName), \
+              #CaseName, GTEST_REGISTERED_TEST_NAMES_(CaseName))
+
+#endif  // GTEST_HAS_TYPED_TEST_P
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest.h
new file mode 100644
index 0000000000..f846c5bd66
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest.h
@@ -0,0 +1,2236 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file defines the public API for Google Test.  It should be
+// included by any test program that uses Google Test.
+//
+// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
+// leave some internal implementation details in this header file.
+// They are clearly marked by comments like this:
+//
+//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+//
+// Such code is NOT meant to be used by a user directly, and is subject
+// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
+// program!
+//
+// Acknowledgment: Google Test borrowed the idea of automatic test
+// registration from Barthelemy Dagenais' (barthelemy@prologique.com)
+// easyUnit framework.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_H_
+#define GTEST_INCLUDE_GTEST_GTEST_H_
+
+#include <limits>
+#include <ostream>
+#include <vector>
+
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-string.h"
+#include "gtest/gtest-death-test.h"
+#include "gtest/gtest-message.h"
+#include "gtest/gtest-param-test.h"
+#include "gtest/gtest-printers.h"
+#include "gtest/gtest_prod.h"
+#include "gtest/gtest-test-part.h"
+#include "gtest/gtest-typed-test.h"
+
+// Depending on the platform, different string classes are available.
+// On Linux, in addition to ::std::string, Google also makes use of
+// class ::string, which has the same interface as ::std::string, but
+// has a different implementation.
+//
+// You can define GTEST_HAS_GLOBAL_STRING to 1 to indicate that
+// ::string is available AND is a distinct type to ::std::string, or
+// define it to 0 to indicate otherwise.
+//
+// If ::std::string and ::string are the same class on your platform
+// due to aliasing, you should define GTEST_HAS_GLOBAL_STRING to 0.
+//
+// If you do not define GTEST_HAS_GLOBAL_STRING, it is defined
+// heuristically.
+
+namespace testing {
+
+// Declares the flags.
+
+// This flag temporary enables the disabled tests.
+GTEST_DECLARE_bool_(also_run_disabled_tests);
+
+// This flag brings the debugger on an assertion failure.
+GTEST_DECLARE_bool_(break_on_failure);
+
+// This flag controls whether Google Test catches all test-thrown exceptions
+// and logs them as failures.
+GTEST_DECLARE_bool_(catch_exceptions);
+
+// This flag enables using colors in terminal output. Available values are
+// "yes" to enable colors, "no" (disable colors), or "auto" (the default)
+// to let Google Test decide.
+GTEST_DECLARE_string_(color);
+
+// This flag sets up the filter to select by name using a glob pattern
+// the tests to run. If the filter is not given all tests are executed.
+GTEST_DECLARE_string_(filter);
+
+// This flag causes the Google Test to list tests. None of the tests listed
+// are actually run if the flag is provided.
+GTEST_DECLARE_bool_(list_tests);
+
+// This flag controls whether Google Test emits a detailed XML report to a file
+// in addition to its normal textual output.
+GTEST_DECLARE_string_(output);
+
+// This flags control whether Google Test prints the elapsed time for each
+// test.
+GTEST_DECLARE_bool_(print_time);
+
+// This flag specifies the random number seed.
+GTEST_DECLARE_int32_(random_seed);
+
+// This flag sets how many times the tests are repeated. The default value
+// is 1. If the value is -1 the tests are repeating forever.
+GTEST_DECLARE_int32_(repeat);
+
+// This flag controls whether Google Test includes Google Test internal
+// stack frames in failure stack traces.
+GTEST_DECLARE_bool_(show_internal_stack_frames);
+
+// When this flag is specified, tests' order is randomized on every iteration.
+GTEST_DECLARE_bool_(shuffle);
+
+// This flag specifies the maximum number of stack frames to be
+// printed in a failure message.
+GTEST_DECLARE_int32_(stack_trace_depth);
+
+// When this flag is specified, a failed assertion will throw an
+// exception if exceptions are enabled, or exit the program with a
+// non-zero code otherwise.
+GTEST_DECLARE_bool_(throw_on_failure);
+
+// When this flag is set with a "host:port" string, on supported
+// platforms test results are streamed to the specified port on
+// the specified host machine.
+GTEST_DECLARE_string_(stream_result_to);
+
+// The upper limit for valid stack trace depths.
+const int kMaxStackTraceDepth = 100;
+
+namespace internal {
+
+class AssertHelper;
+class DefaultGlobalTestPartResultReporter;
+class ExecDeathTest;
+class NoExecDeathTest;
+class FinalSuccessChecker;
+class GTestFlagSaver;
+class StreamingListenerTest;
+class TestResultAccessor;
+class TestEventListenersAccessor;
+class TestEventRepeater;
+class UnitTestRecordPropertyTestHelper;
+class WindowsDeathTest;
+class UnitTestImpl* GetUnitTestImpl();
+void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
+                                    const std::string& message);
+
+}  // namespace internal
+
+// The friend relationship of some of these classes is cyclic.
+// If we don't forward declare them the compiler might confuse the classes
+// in friendship clauses with same named classes on the scope.
+class Test;
+class TestCase;
+class TestInfo;
+class UnitTest;
+
+// A class for indicating whether an assertion was successful.  When
+// the assertion wasn't successful, the AssertionResult object
+// remembers a non-empty message that describes how it failed.
+//
+// To create an instance of this class, use one of the factory functions
+// (AssertionSuccess() and AssertionFailure()).
+//
+// This class is useful for two purposes:
+//   1. Defining predicate functions to be used with Boolean test assertions
+//      EXPECT_TRUE/EXPECT_FALSE and their ASSERT_ counterparts
+//   2. Defining predicate-format functions to be
+//      used with predicate assertions (ASSERT_PRED_FORMAT*, etc).
+//
+// For example, if you define IsEven predicate:
+//
+//   testing::AssertionResult IsEven(int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess();
+//     else
+//       return testing::AssertionFailure() << n << " is odd";
+//   }
+//
+// Then the failed expectation EXPECT_TRUE(IsEven(Fib(5)))
+// will print the message
+//
+//   Value of: IsEven(Fib(5))
+//     Actual: false (5 is odd)
+//   Expected: true
+//
+// instead of a more opaque
+//
+//   Value of: IsEven(Fib(5))
+//     Actual: false
+//   Expected: true
+//
+// in case IsEven is a simple Boolean predicate.
+//
+// If you expect your predicate to be reused and want to support informative
+// messages in EXPECT_FALSE and ASSERT_FALSE (negative assertions show up
+// about half as often as positive ones in our tests), supply messages for
+// both success and failure cases:
+//
+//   testing::AssertionResult IsEven(int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess() << n << " is even";
+//     else
+//       return testing::AssertionFailure() << n << " is odd";
+//   }
+//
+// Then a statement EXPECT_FALSE(IsEven(Fib(6))) will print
+//
+//   Value of: IsEven(Fib(6))
+//     Actual: true (8 is even)
+//   Expected: false
+//
+// NB: Predicates that support negative Boolean assertions have reduced
+// performance in positive ones so be careful not to use them in tests
+// that have lots (tens of thousands) of positive Boolean assertions.
+//
+// To use this class with EXPECT_PRED_FORMAT assertions such as:
+//
+//   // Verifies that Foo() returns an even number.
+//   EXPECT_PRED_FORMAT1(IsEven, Foo());
+//
+// you need to define:
+//
+//   testing::AssertionResult IsEven(const char* expr, int n) {
+//     if ((n % 2) == 0)
+//       return testing::AssertionSuccess();
+//     else
+//       return testing::AssertionFailure()
+//         << "Expected: " << expr << " is even\n  Actual: it's " << n;
+//   }
+//
+// If Foo() returns 5, you will see the following message:
+//
+//   Expected: Foo() is even
+//     Actual: it's 5
+//
+class GTEST_API_ AssertionResult {
+ public:
+  // Copy constructor.
+  // Used in EXPECT_TRUE/FALSE(assertion_result).
+  AssertionResult(const AssertionResult& other);
+
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */)
+
+  // Used in the EXPECT_TRUE/FALSE(bool_expression).
+  //
+  // T must be contextually convertible to bool.
+  //
+  // The second parameter prevents this overload from being considered if
+  // the argument is implicitly convertible to AssertionResult. In that case
+  // we want AssertionResult's copy constructor to be used.
+  template <typename T>
+  explicit AssertionResult(
+      const T& success,
+      typename internal::EnableIf<
+          !internal::ImplicitlyConvertible<T, AssertionResult>::value>::type*
+          /*enabler*/ = NULL)
+      : success_(success) {}
+
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+
+  // Assignment operator.
+  AssertionResult& operator=(AssertionResult other) {
+    swap(other);
+    return *this;
+  }
+
+  // Returns true iff the assertion succeeded.
+  operator bool() const { return success_; }  // NOLINT
+
+  // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
+  AssertionResult operator!() const;
+
+  // Returns the text streamed into this AssertionResult. Test assertions
+  // use it when they fail (i.e., the predicate's outcome doesn't match the
+  // assertion's expectation). When nothing has been streamed into the
+  // object, returns an empty string.
+  const char* message() const {
+    return message_.get() != NULL ?  message_->c_str() : "";
+  }
+  // TODO(vladl@google.com): Remove this after making sure no clients use it.
+  // Deprecated; please use message() instead.
+  const char* failure_message() const { return message(); }
+
+  // Streams a custom failure message into this object.
+  template <typename T> AssertionResult& operator<<(const T& value) {
+    AppendMessage(Message() << value);
+    return *this;
+  }
+
+  // Allows streaming basic output manipulators such as endl or flush into
+  // this object.
+  AssertionResult& operator<<(
+      ::std::ostream& (*basic_manipulator)(::std::ostream& stream)) {
+    AppendMessage(Message() << basic_manipulator);
+    return *this;
+  }
+
+ private:
+  // Appends the contents of message to message_.
+  void AppendMessage(const Message& a_message) {
+    if (message_.get() == NULL)
+      message_.reset(new ::std::string);
+    message_->append(a_message.GetString().c_str());
+  }
+
+  // Swap the contents of this AssertionResult with other.
+  void swap(AssertionResult& other);
+
+  // Stores result of the assertion predicate.
+  bool success_;
+  // Stores the message describing the condition in case the expectation
+  // construct is not satisfied with the predicate's outcome.
+  // Referenced via a pointer to avoid taking too much stack frame space
+  // with test assertions.
+  internal::scoped_ptr< ::std::string> message_;
+};
+
+// Makes a successful assertion result.
+GTEST_API_ AssertionResult AssertionSuccess();
+
+// Makes a failed assertion result.
+GTEST_API_ AssertionResult AssertionFailure();
+
+// Makes a failed assertion result with the given failure message.
+// Deprecated; use AssertionFailure() << msg.
+GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
+
+// The abstract class that all tests inherit from.
+//
+// In Google Test, a unit test program contains one or many TestCases, and
+// each TestCase contains one or many Tests.
+//
+// When you define a test using the TEST macro, you don't need to
+// explicitly derive from Test - the TEST macro automatically does
+// this for you.
+//
+// The only time you derive from Test is when defining a test fixture
+// to be used a TEST_F.  For example:
+//
+//   class FooTest : public testing::Test {
+//    protected:
+//     void SetUp() override { ... }
+//     void TearDown() override { ... }
+//     ...
+//   };
+//
+//   TEST_F(FooTest, Bar) { ... }
+//   TEST_F(FooTest, Baz) { ... }
+//
+// Test is not copyable.
+class GTEST_API_ Test {
+ public:
+  friend class TestInfo;
+
+  // Defines types for pointers to functions that set up and tear down
+  // a test case.
+  typedef internal::SetUpTestCaseFunc SetUpTestCaseFunc;
+  typedef internal::TearDownTestCaseFunc TearDownTestCaseFunc;
+
+  // The d'tor is virtual as we intend to inherit from Test.
+  virtual ~Test();
+
+  // Sets up the stuff shared by all tests in this test case.
+  //
+  // Google Test will call Foo::SetUpTestCase() before running the first
+  // test in test case Foo.  Hence a sub-class can define its own
+  // SetUpTestCase() method to shadow the one defined in the super
+  // class.
+  static void SetUpTestCase() {}
+
+  // Tears down the stuff shared by all tests in this test case.
+  //
+  // Google Test will call Foo::TearDownTestCase() after running the last
+  // test in test case Foo.  Hence a sub-class can define its own
+  // TearDownTestCase() method to shadow the one defined in the super
+  // class.
+  static void TearDownTestCase() {}
+
+  // Returns true iff the current test has a fatal failure.
+  static bool HasFatalFailure();
+
+  // Returns true iff the current test has a non-fatal failure.
+  static bool HasNonfatalFailure();
+
+  // Returns true iff the current test has a (either fatal or
+  // non-fatal) failure.
+  static bool HasFailure() { return HasFatalFailure() || HasNonfatalFailure(); }
+
+  // Logs a property for the current test, test case, or for the entire
+  // invocation of the test program when used outside of the context of a
+  // test case.  Only the last value for a given key is remembered.  These
+  // are public static so they can be called from utility functions that are
+  // not members of the test fixture.  Calls to RecordProperty made during
+  // lifespan of the test (from the moment its constructor starts to the
+  // moment its destructor finishes) will be output in XML as attributes of
+  // the <testcase> element.  Properties recorded from fixture's
+  // SetUpTestCase or TearDownTestCase are logged as attributes of the
+  // corresponding <testsuite> element.  Calls to RecordProperty made in the
+  // global context (before or after invocation of RUN_ALL_TESTS and from
+  // SetUp/TearDown method of Environment objects registered with Google
+  // Test) will be output as attributes of the <testsuites> element.
+  static void RecordProperty(const std::string& key, const std::string& value);
+  static void RecordProperty(const std::string& key, int value);
+
+ protected:
+  // Creates a Test object.
+  Test();
+
+  // Sets up the test fixture.
+  virtual void SetUp();
+
+  // Tears down the test fixture.
+  virtual void TearDown();
+
+ private:
+  // Returns true iff the current test has the same fixture class as
+  // the first test in the current test case.
+  static bool HasSameFixtureClass();
+
+  // Runs the test after the test fixture has been set up.
+  //
+  // A sub-class must implement this to define the test logic.
+  //
+  // DO NOT OVERRIDE THIS FUNCTION DIRECTLY IN A USER PROGRAM.
+  // Instead, use the TEST or TEST_F macro.
+  virtual void TestBody() = 0;
+
+  // Sets up, executes, and tears down the test.
+  void Run();
+
+  // Deletes self.  We deliberately pick an unusual name for this
+  // internal method to avoid clashing with names used in user TESTs.
+  void DeleteSelf_() { delete this; }
+
+  const internal::scoped_ptr< GTEST_FLAG_SAVER_ > gtest_flag_saver_;
+
+  // Often a user misspells SetUp() as Setup() and spends a long time
+  // wondering why it is never called by Google Test.  The declaration of
+  // the following method is solely for catching such an error at
+  // compile time:
+  //
+  //   - The return type is deliberately chosen to be not void, so it
+  //   will be a conflict if void Setup() is declared in the user's
+  //   test fixture.
+  //
+  //   - This method is private, so it will be another compiler error
+  //   if the method is called from the user's test fixture.
+  //
+  // DO NOT OVERRIDE THIS FUNCTION.
+  //
+  // If you see an error about overriding the following function or
+  // about it being private, you have mis-spelled SetUp() as Setup().
+  struct Setup_should_be_spelled_SetUp {};
+  virtual Setup_should_be_spelled_SetUp* Setup() { return NULL; }
+
+  // We disallow copying Tests.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Test);
+};
+
+typedef internal::TimeInMillis TimeInMillis;
+
+// A copyable object representing a user specified test property which can be
+// output as a key/value string pair.
+//
+// Don't inherit from TestProperty as its destructor is not virtual.
+class TestProperty {
+ public:
+  // C'tor.  TestProperty does NOT have a default constructor.
+  // Always use this constructor (with parameters) to create a
+  // TestProperty object.
+  TestProperty(const std::string& a_key, const std::string& a_value) :
+    key_(a_key), value_(a_value) {
+  }
+
+  // Gets the user supplied key.
+  const char* key() const {
+    return key_.c_str();
+  }
+
+  // Gets the user supplied value.
+  const char* value() const {
+    return value_.c_str();
+  }
+
+  // Sets a new value, overriding the one supplied in the constructor.
+  void SetValue(const std::string& new_value) {
+    value_ = new_value;
+  }
+
+ private:
+  // The key supplied by the user.
+  std::string key_;
+  // The value supplied by the user.
+  std::string value_;
+};
+
+// The result of a single Test.  This includes a list of
+// TestPartResults, a list of TestProperties, a count of how many
+// death tests there are in the Test, and how much time it took to run
+// the Test.
+//
+// TestResult is not copyable.
+class GTEST_API_ TestResult {
+ public:
+  // Creates an empty TestResult.
+  TestResult();
+
+  // D'tor.  Do not inherit from TestResult.
+  ~TestResult();
+
+  // Gets the number of all test parts.  This is the sum of the number
+  // of successful test parts and the number of failed test parts.
+  int total_part_count() const;
+
+  // Returns the number of the test properties.
+  int test_property_count() const;
+
+  // Returns true iff the test passed (i.e. no test part failed).
+  bool Passed() const { return !Failed(); }
+
+  // Returns true iff the test failed.
+  bool Failed() const;
+
+  // Returns true iff the test fatally failed.
+  bool HasFatalFailure() const;
+
+  // Returns true iff the test has a non-fatal failure.
+  bool HasNonfatalFailure() const;
+
+  // Returns the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const { return elapsed_time_; }
+
+  // Returns the i-th test part result among all the results. i can range
+  // from 0 to test_property_count() - 1. If i is not in that range, aborts
+  // the program.
+  const TestPartResult& GetTestPartResult(int i) const;
+
+  // Returns the i-th test property. i can range from 0 to
+  // test_property_count() - 1. If i is not in that range, aborts the
+  // program.
+  const TestProperty& GetTestProperty(int i) const;
+
+ private:
+  friend class TestInfo;
+  friend class TestCase;
+  friend class UnitTest;
+  friend class internal::DefaultGlobalTestPartResultReporter;
+  friend class internal::ExecDeathTest;
+  friend class internal::TestResultAccessor;
+  friend class internal::UnitTestImpl;
+  friend class internal::WindowsDeathTest;
+
+  // Gets the vector of TestPartResults.
+  const std::vector<TestPartResult>& test_part_results() const {
+    return test_part_results_;
+  }
+
+  // Gets the vector of TestProperties.
+  const std::vector<TestProperty>& test_properties() const {
+    return test_properties_;
+  }
+
+  // Sets the elapsed time.
+  void set_elapsed_time(TimeInMillis elapsed) { elapsed_time_ = elapsed; }
+
+  // Adds a test property to the list. The property is validated and may add
+  // a non-fatal failure if invalid (e.g., if it conflicts with reserved
+  // key names). If a property is already recorded for the same key, the
+  // value will be updated, rather than storing multiple values for the same
+  // key.  xml_element specifies the element for which the property is being
+  // recorded and is used for validation.
+  void RecordProperty(const std::string& xml_element,
+                      const TestProperty& test_property);
+
+  // Adds a failure if the key is a reserved attribute of Google Test
+  // testcase tags.  Returns true if the property is valid.
+  // TODO(russr): Validate attribute names are legal and human readable.
+  static bool ValidateTestProperty(const std::string& xml_element,
+                                   const TestProperty& test_property);
+
+  // Adds a test part result to the list.
+  void AddTestPartResult(const TestPartResult& test_part_result);
+
+  // Returns the death test count.
+  int death_test_count() const { return death_test_count_; }
+
+  // Increments the death test count, returning the new count.
+  int increment_death_test_count() { return ++death_test_count_; }
+
+  // Clears the test part results.
+  void ClearTestPartResults();
+
+  // Clears the object.
+  void Clear();
+
+  // Protects mutable state of the property vector and of owned
+  // properties, whose values may be updated.
+  internal::Mutex test_properites_mutex_;
+
+  // The vector of TestPartResults
+  std::vector<TestPartResult> test_part_results_;
+  // The vector of TestProperties
+  std::vector<TestProperty> test_properties_;
+  // Running count of death tests.
+  int death_test_count_;
+  // The elapsed time, in milliseconds.
+  TimeInMillis elapsed_time_;
+
+  // We disallow copying TestResult.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestResult);
+};  // class TestResult
+
+// A TestInfo object stores the following information about a test:
+//
+//   Test case name
+//   Test name
+//   Whether the test should be run
+//   A function pointer that creates the test object when invoked
+//   Test result
+//
+// The constructor of TestInfo registers itself with the UnitTest
+// singleton such that the RUN_ALL_TESTS() macro knows which tests to
+// run.
+class GTEST_API_ TestInfo {
+ public:
+  // Destructs a TestInfo object.  This function is not virtual, so
+  // don't inherit from TestInfo.
+  ~TestInfo();
+
+  // Returns the test case name.
+  const char* test_case_name() const { return test_case_name_.c_str(); }
+
+  // Returns the test name.
+  const char* name() const { return name_.c_str(); }
+
+  // Returns the name of the parameter type, or NULL if this is not a typed
+  // or a type-parameterized test.
+  const char* type_param() const {
+    if (type_param_.get() != NULL)
+      return type_param_->c_str();
+    return NULL;
+  }
+
+  // Returns the text representation of the value parameter, or NULL if this
+  // is not a value-parameterized test.
+  const char* value_param() const {
+    if (value_param_.get() != NULL)
+      return value_param_->c_str();
+    return NULL;
+  }
+
+  // Returns the file name where this test is defined.
+  const char* file() const { return location_.file.c_str(); }
+
+  // Returns the line where this test is defined.
+  int line() const { return location_.line; }
+
+  // Returns true if this test should run, that is if the test is not
+  // disabled (or it is disabled but the also_run_disabled_tests flag has
+  // been specified) and its full name matches the user-specified filter.
+  //
+  // Google Test allows the user to filter the tests by their full names.
+  // The full name of a test Bar in test case Foo is defined as
+  // "Foo.Bar".  Only the tests that match the filter will run.
+  //
+  // A filter is a colon-separated list of glob (not regex) patterns,
+  // optionally followed by a '-' and a colon-separated list of
+  // negative patterns (tests to exclude).  A test is run if it
+  // matches one of the positive patterns and does not match any of
+  // the negative patterns.
+  //
+  // For example, *A*:Foo.* is a filter that matches any string that
+  // contains the character 'A' or starts with "Foo.".
+  bool should_run() const { return should_run_; }
+
+  // Returns true iff this test will appear in the XML report.
+  bool is_reportable() const {
+    // For now, the XML report includes all tests matching the filter.
+    // In the future, we may trim tests that are excluded because of
+    // sharding.
+    return matches_filter_;
+  }
+
+  // Returns the result of the test.
+  const TestResult* result() const { return &result_; }
+
+ private:
+#if GTEST_HAS_DEATH_TEST
+  friend class internal::DefaultDeathTestFactory;
+#endif  // GTEST_HAS_DEATH_TEST
+  friend class Test;
+  friend class TestCase;
+  friend class internal::UnitTestImpl;
+  friend class internal::StreamingListenerTest;
+  friend TestInfo* internal::MakeAndRegisterTestInfo(
+      const char* test_case_name,
+      const char* name,
+      const char* type_param,
+      const char* value_param,
+      internal::CodeLocation code_location,
+      internal::TypeId fixture_class_id,
+      Test::SetUpTestCaseFunc set_up_tc,
+      Test::TearDownTestCaseFunc tear_down_tc,
+      internal::TestFactoryBase* factory);
+
+  // Constructs a TestInfo object. The newly constructed instance assumes
+  // ownership of the factory object.
+  TestInfo(const std::string& test_case_name,
+           const std::string& name,
+           const char* a_type_param,   // NULL if not a type-parameterized test
+           const char* a_value_param,  // NULL if not a value-parameterized test
+           internal::CodeLocation a_code_location,
+           internal::TypeId fixture_class_id,
+           internal::TestFactoryBase* factory);
+
+  // Increments the number of death tests encountered in this test so
+  // far.
+  int increment_death_test_count() {
+    return result_.increment_death_test_count();
+  }
+
+  // Creates the test object, runs it, records its result, and then
+  // deletes it.
+  void Run();
+
+  static void ClearTestResult(TestInfo* test_info) {
+    test_info->result_.Clear();
+  }
+
+  // These fields are immutable properties of the test.
+  const std::string test_case_name_;     // Test case name
+  const std::string name_;               // Test name
+  // Name of the parameter type, or NULL if this is not a typed or a
+  // type-parameterized test.
+  const internal::scoped_ptr<const ::std::string> type_param_;
+  // Text representation of the value parameter, or NULL if this is not a
+  // value-parameterized test.
+  const internal::scoped_ptr<const ::std::string> value_param_;
+  internal::CodeLocation location_;
+  const internal::TypeId fixture_class_id_;   // ID of the test fixture class
+  bool should_run_;                 // True iff this test should run
+  bool is_disabled_;                // True iff this test is disabled
+  bool matches_filter_;             // True if this test matches the
+                                    // user-specified filter.
+  internal::TestFactoryBase* const factory_;  // The factory that creates
+                                              // the test object
+
+  // This field is mutable and needs to be reset before running the
+  // test for the second time.
+  TestResult result_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestInfo);
+};
+
+// A test case, which consists of a vector of TestInfos.
+//
+// TestCase is not copyable.
+class GTEST_API_ TestCase {
+ public:
+  // Creates a TestCase with the given name.
+  //
+  // TestCase does NOT have a default constructor.  Always use this
+  // constructor to create a TestCase object.
+  //
+  // Arguments:
+  //
+  //   name:         name of the test case
+  //   a_type_param: the name of the test's type parameter, or NULL if
+  //                 this is not a type-parameterized test.
+  //   set_up_tc:    pointer to the function that sets up the test case
+  //   tear_down_tc: pointer to the function that tears down the test case
+  TestCase(const char* name, const char* a_type_param,
+           Test::SetUpTestCaseFunc set_up_tc,
+           Test::TearDownTestCaseFunc tear_down_tc);
+
+  // Destructor of TestCase.
+  virtual ~TestCase();
+
+  // Gets the name of the TestCase.
+  const char* name() const { return name_.c_str(); }
+
+  // Returns the name of the parameter type, or NULL if this is not a
+  // type-parameterized test case.
+  const char* type_param() const {
+    if (type_param_.get() != NULL)
+      return type_param_->c_str();
+    return NULL;
+  }
+
+  // Returns true if any test in this test case should run.
+  bool should_run() const { return should_run_; }
+
+  // Gets the number of successful tests in this test case.
+  int successful_test_count() const;
+
+  // Gets the number of failed tests in this test case.
+  int failed_test_count() const;
+
+  // Gets the number of disabled tests that will be reported in the XML report.
+  int reportable_disabled_test_count() const;
+
+  // Gets the number of disabled tests in this test case.
+  int disabled_test_count() const;
+
+  // Gets the number of tests to be printed in the XML report.
+  int reportable_test_count() const;
+
+  // Get the number of tests in this test case that should run.
+  int test_to_run_count() const;
+
+  // Gets the number of all tests in this test case.
+  int total_test_count() const;
+
+  // Returns true iff the test case passed.
+  bool Passed() const { return !Failed(); }
+
+  // Returns true iff the test case failed.
+  bool Failed() const { return failed_test_count() > 0; }
+
+  // Returns the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const { return elapsed_time_; }
+
+  // Returns the i-th test among all the tests. i can range from 0 to
+  // total_test_count() - 1. If i is not in that range, returns NULL.
+  const TestInfo* GetTestInfo(int i) const;
+
+  // Returns the TestResult that holds test properties recorded during
+  // execution of SetUpTestCase and TearDownTestCase.
+  const TestResult& ad_hoc_test_result() const { return ad_hoc_test_result_; }
+
+ private:
+  friend class Test;
+  friend class internal::UnitTestImpl;
+
+  // Gets the (mutable) vector of TestInfos in this TestCase.
+  std::vector<TestInfo*>& test_info_list() { return test_info_list_; }
+
+  // Gets the (immutable) vector of TestInfos in this TestCase.
+  const std::vector<TestInfo*>& test_info_list() const {
+    return test_info_list_;
+  }
+
+  // Returns the i-th test among all the tests. i can range from 0 to
+  // total_test_count() - 1. If i is not in that range, returns NULL.
+  TestInfo* GetMutableTestInfo(int i);
+
+  // Sets the should_run member.
+  void set_should_run(bool should) { should_run_ = should; }
+
+  // Adds a TestInfo to this test case.  Will delete the TestInfo upon
+  // destruction of the TestCase object.
+  void AddTestInfo(TestInfo * test_info);
+
+  // Clears the results of all tests in this test case.
+  void ClearResult();
+
+  // Clears the results of all tests in the given test case.
+  static void ClearTestCaseResult(TestCase* test_case) {
+    test_case->ClearResult();
+  }
+
+  // Runs every test in this TestCase.
+  void Run();
+
+  // Runs SetUpTestCase() for this TestCase.  This wrapper is needed
+  // for catching exceptions thrown from SetUpTestCase().
+  void RunSetUpTestCase() { (*set_up_tc_)(); }
+
+  // Runs TearDownTestCase() for this TestCase.  This wrapper is
+  // needed for catching exceptions thrown from TearDownTestCase().
+  void RunTearDownTestCase() { (*tear_down_tc_)(); }
+
+  // Returns true iff test passed.
+  static bool TestPassed(const TestInfo* test_info) {
+    return test_info->should_run() && test_info->result()->Passed();
+  }
+
+  // Returns true iff test failed.
+  static bool TestFailed(const TestInfo* test_info) {
+    return test_info->should_run() && test_info->result()->Failed();
+  }
+
+  // Returns true iff the test is disabled and will be reported in the XML
+  // report.
+  static bool TestReportableDisabled(const TestInfo* test_info) {
+    return test_info->is_reportable() && test_info->is_disabled_;
+  }
+
+  // Returns true iff test is disabled.
+  static bool TestDisabled(const TestInfo* test_info) {
+    return test_info->is_disabled_;
+  }
+
+  // Returns true iff this test will appear in the XML report.
+  static bool TestReportable(const TestInfo* test_info) {
+    return test_info->is_reportable();
+  }
+
+  // Returns true if the given test should run.
+  static bool ShouldRunTest(const TestInfo* test_info) {
+    return test_info->should_run();
+  }
+
+  // Shuffles the tests in this test case.
+  void ShuffleTests(internal::Random* random);
+
+  // Restores the test order to before the first shuffle.
+  void UnshuffleTests();
+
+  // Name of the test case.
+  std::string name_;
+  // Name of the parameter type, or NULL if this is not a typed or a
+  // type-parameterized test.
+  const internal::scoped_ptr<const ::std::string> type_param_;
+  // The vector of TestInfos in their original order.  It owns the
+  // elements in the vector.
+  std::vector<TestInfo*> test_info_list_;
+  // Provides a level of indirection for the test list to allow easy
+  // shuffling and restoring the test order.  The i-th element in this
+  // vector is the index of the i-th test in the shuffled test list.
+  std::vector<int> test_indices_;
+  // Pointer to the function that sets up the test case.
+  Test::SetUpTestCaseFunc set_up_tc_;
+  // Pointer to the function that tears down the test case.
+  Test::TearDownTestCaseFunc tear_down_tc_;
+  // True iff any test in this test case should run.
+  bool should_run_;
+  // Elapsed time, in milliseconds.
+  TimeInMillis elapsed_time_;
+  // Holds test properties recorded during execution of SetUpTestCase and
+  // TearDownTestCase.
+  TestResult ad_hoc_test_result_;
+
+  // We disallow copying TestCases.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestCase);
+};
+
+// An Environment object is capable of setting up and tearing down an
+// environment.  You should subclass this to define your own
+// environment(s).
+//
+// An Environment object does the set-up and tear-down in virtual
+// methods SetUp() and TearDown() instead of the constructor and the
+// destructor, as:
+//
+//   1. You cannot safely throw from a destructor.  This is a problem
+//      as in some cases Google Test is used where exceptions are enabled, and
+//      we may want to implement ASSERT_* using exceptions where they are
+//      available.
+//   2. You cannot use ASSERT_* directly in a constructor or
+//      destructor.
+class Environment {
+ public:
+  // The d'tor is virtual as we need to subclass Environment.
+  virtual ~Environment() {}
+
+  // Override this to define how to set up the environment.
+  virtual void SetUp() {}
+
+  // Override this to define how to tear down the environment.
+  virtual void TearDown() {}
+ private:
+  // If you see an error about overriding the following function or
+  // about it being private, you have mis-spelled SetUp() as Setup().
+  struct Setup_should_be_spelled_SetUp {};
+  virtual Setup_should_be_spelled_SetUp* Setup() { return NULL; }
+};
+
+// The interface for tracing execution of tests. The methods are organized in
+// the order the corresponding events are fired.
+class TestEventListener {
+ public:
+  virtual ~TestEventListener() {}
+
+  // Fired before any test activity starts.
+  virtual void OnTestProgramStart(const UnitTest& unit_test) = 0;
+
+  // Fired before each iteration of tests starts.  There may be more than
+  // one iteration if GTEST_FLAG(repeat) is set. iteration is the iteration
+  // index, starting from 0.
+  virtual void OnTestIterationStart(const UnitTest& unit_test,
+                                    int iteration) = 0;
+
+  // Fired before environment set-up for each iteration of tests starts.
+  virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test) = 0;
+
+  // Fired after environment set-up for each iteration of tests ends.
+  virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) = 0;
+
+  // Fired before the test case starts.
+  virtual void OnTestCaseStart(const TestCase& test_case) = 0;
+
+  // Fired before the test starts.
+  virtual void OnTestStart(const TestInfo& test_info) = 0;
+
+  // Fired after a failed assertion or a SUCCEED() invocation.
+  virtual void OnTestPartResult(const TestPartResult& test_part_result) = 0;
+
+  // Fired after the test ends.
+  virtual void OnTestEnd(const TestInfo& test_info) = 0;
+
+  // Fired after the test case ends.
+  virtual void OnTestCaseEnd(const TestCase& test_case) = 0;
+
+  // Fired before environment tear-down for each iteration of tests starts.
+  virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test) = 0;
+
+  // Fired after environment tear-down for each iteration of tests ends.
+  virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) = 0;
+
+  // Fired after each iteration of tests finishes.
+  virtual void OnTestIterationEnd(const UnitTest& unit_test,
+                                  int iteration) = 0;
+
+  // Fired after all test activities have ended.
+  virtual void OnTestProgramEnd(const UnitTest& unit_test) = 0;
+};
+
+// The convenience class for users who need to override just one or two
+// methods and are not concerned that a possible change to a signature of
+// the methods they override will not be caught during the build.  For
+// comments about each method please see the definition of TestEventListener
+// above.
+class EmptyTestEventListener : public TestEventListener {
+ public:
+  virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {}
+  virtual void OnTestIterationStart(const UnitTest& /*unit_test*/,
+                                    int /*iteration*/) {}
+  virtual void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) {}
+  virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {}
+  virtual void OnTestCaseStart(const TestCase& /*test_case*/) {}
+  virtual void OnTestStart(const TestInfo& /*test_info*/) {}
+  virtual void OnTestPartResult(const TestPartResult& /*test_part_result*/) {}
+  virtual void OnTestEnd(const TestInfo& /*test_info*/) {}
+  virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {}
+  virtual void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) {}
+  virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {}
+  virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/,
+                                  int /*iteration*/) {}
+  virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {}
+};
+
+// TestEventListeners lets users add listeners to track events in Google Test.
+class GTEST_API_ TestEventListeners {
+ public:
+  TestEventListeners();
+  ~TestEventListeners();
+
+  // Appends an event listener to the end of the list. Google Test assumes
+  // the ownership of the listener (i.e. it will delete the listener when
+  // the test program finishes).
+  void Append(TestEventListener* listener);
+
+  // Removes the given event listener from the list and returns it.  It then
+  // becomes the caller's responsibility to delete the listener. Returns
+  // NULL if the listener is not found in the list.
+  TestEventListener* Release(TestEventListener* listener);
+
+  // Returns the standard listener responsible for the default console
+  // output.  Can be removed from the listeners list to shut down default
+  // console output.  Note that removing this object from the listener list
+  // with Release transfers its ownership to the caller and makes this
+  // function return NULL the next time.
+  TestEventListener* default_result_printer() const {
+    return default_result_printer_;
+  }
+
+  // Returns the standard listener responsible for the default XML output
+  // controlled by the --gtest_output=xml flag.  Can be removed from the
+  // listeners list by users who want to shut down the default XML output
+  // controlled by this flag and substitute it with custom one.  Note that
+  // removing this object from the listener list with Release transfers its
+  // ownership to the caller and makes this function return NULL the next
+  // time.
+  TestEventListener* default_xml_generator() const {
+    return default_xml_generator_;
+  }
+
+ private:
+  friend class TestCase;
+  friend class TestInfo;
+  friend class internal::DefaultGlobalTestPartResultReporter;
+  friend class internal::NoExecDeathTest;
+  friend class internal::TestEventListenersAccessor;
+  friend class internal::UnitTestImpl;
+
+  // Returns repeater that broadcasts the TestEventListener events to all
+  // subscribers.
+  TestEventListener* repeater();
+
+  // Sets the default_result_printer attribute to the provided listener.
+  // The listener is also added to the listener list and previous
+  // default_result_printer is removed from it and deleted. The listener can
+  // also be NULL in which case it will not be added to the list. Does
+  // nothing if the previous and the current listener objects are the same.
+  void SetDefaultResultPrinter(TestEventListener* listener);
+
+  // Sets the default_xml_generator attribute to the provided listener.  The
+  // listener is also added to the listener list and previous
+  // default_xml_generator is removed from it and deleted. The listener can
+  // also be NULL in which case it will not be added to the list. Does
+  // nothing if the previous and the current listener objects are the same.
+  void SetDefaultXmlGenerator(TestEventListener* listener);
+
+  // Controls whether events will be forwarded by the repeater to the
+  // listeners in the list.
+  bool EventForwardingEnabled() const;
+  void SuppressEventForwarding();
+
+  // The actual list of listeners.
+  internal::TestEventRepeater* repeater_;
+  // Listener responsible for the standard result output.
+  TestEventListener* default_result_printer_;
+  // Listener responsible for the creation of the XML output file.
+  TestEventListener* default_xml_generator_;
+
+  // We disallow copying TestEventListeners.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventListeners);
+};
+
+// A UnitTest consists of a vector of TestCases.
+//
+// This is a singleton class.  The only instance of UnitTest is
+// created when UnitTest::GetInstance() is first called.  This
+// instance is never deleted.
+//
+// UnitTest is not copyable.
+//
+// This class is thread-safe as long as the methods are called
+// according to their specification.
+class GTEST_API_ UnitTest {
+ public:
+  // Gets the singleton UnitTest object.  The first time this method
+  // is called, a UnitTest object is constructed and returned.
+  // Consecutive calls will return the same object.
+  static UnitTest* GetInstance();
+
+  // Runs all tests in this UnitTest object and prints the result.
+  // Returns 0 if successful, or 1 otherwise.
+  //
+  // This method can only be called from the main thread.
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  int Run() GTEST_MUST_USE_RESULT_;
+
+  // Returns the working directory when the first TEST() or TEST_F()
+  // was executed.  The UnitTest object owns the string.
+  const char* original_working_dir() const;
+
+  // Returns the TestCase object for the test that's currently running,
+  // or NULL if no test is running.
+  const TestCase* current_test_case() const
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Returns the TestInfo object for the test that's currently running,
+  // or NULL if no test is running.
+  const TestInfo* current_test_info() const
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Returns the random seed used at the start of the current test run.
+  int random_seed() const;
+
+#if GTEST_HAS_PARAM_TEST
+  // Returns the ParameterizedTestCaseRegistry object used to keep track of
+  // value-parameterized tests and instantiate and register them.
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  internal::ParameterizedTestCaseRegistry& parameterized_test_registry()
+      GTEST_LOCK_EXCLUDED_(mutex_);
+#endif  // GTEST_HAS_PARAM_TEST
+
+  // Gets the number of successful test cases.
+  int successful_test_case_count() const;
+
+  // Gets the number of failed test cases.
+  int failed_test_case_count() const;
+
+  // Gets the number of all test cases.
+  int total_test_case_count() const;
+
+  // Gets the number of all test cases that contain at least one test
+  // that should run.
+  int test_case_to_run_count() const;
+
+  // Gets the number of successful tests.
+  int successful_test_count() const;
+
+  // Gets the number of failed tests.
+  int failed_test_count() const;
+
+  // Gets the number of disabled tests that will be reported in the XML report.
+  int reportable_disabled_test_count() const;
+
+  // Gets the number of disabled tests.
+  int disabled_test_count() const;
+
+  // Gets the number of tests to be printed in the XML report.
+  int reportable_test_count() const;
+
+  // Gets the number of all tests.
+  int total_test_count() const;
+
+  // Gets the number of tests that should run.
+  int test_to_run_count() const;
+
+  // Gets the time of the test program start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp() const;
+
+  // Gets the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const;
+
+  // Returns true iff the unit test passed (i.e. all test cases passed).
+  bool Passed() const;
+
+  // Returns true iff the unit test failed (i.e. some test case failed
+  // or something outside of all tests failed).
+  bool Failed() const;
+
+  // Gets the i-th test case among all the test cases. i can range from 0 to
+  // total_test_case_count() - 1. If i is not in that range, returns NULL.
+  const TestCase* GetTestCase(int i) const;
+
+  // Returns the TestResult containing information on test failures and
+  // properties logged outside of individual test cases.
+  const TestResult& ad_hoc_test_result() const;
+
+  // Returns the list of event listeners that can be used to track events
+  // inside Google Test.
+  TestEventListeners& listeners();
+
+ private:
+  // Registers and returns a global test environment.  When a test
+  // program is run, all global test environments will be set-up in
+  // the order they were registered.  After all tests in the program
+  // have finished, all global test environments will be torn-down in
+  // the *reverse* order they were registered.
+  //
+  // The UnitTest object takes ownership of the given environment.
+  //
+  // This method can only be called from the main thread.
+  Environment* AddEnvironment(Environment* env);
+
+  // Adds a TestPartResult to the current TestResult object.  All
+  // Google Test assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc)
+  // eventually call this to report their results.  The user code
+  // should use the assertion macros instead of calling this directly.
+  void AddTestPartResult(TestPartResult::Type result_type,
+                         const char* file_name,
+                         int line_number,
+                         const std::string& message,
+                         const std::string& os_stack_trace)
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Adds a TestProperty to the current TestResult object when invoked from
+  // inside a test, to current TestCase's ad_hoc_test_result_ when invoked
+  // from SetUpTestCase or TearDownTestCase, or to the global property set
+  // when invoked elsewhere.  If the result already contains a property with
+  // the same key, the value will be updated.
+  void RecordProperty(const std::string& key, const std::string& value);
+
+  // Gets the i-th test case among all the test cases. i can range from 0 to
+  // total_test_case_count() - 1. If i is not in that range, returns NULL.
+  TestCase* GetMutableTestCase(int i);
+
+  // Accessors for the implementation object.
+  internal::UnitTestImpl* impl() { return impl_; }
+  const internal::UnitTestImpl* impl() const { return impl_; }
+
+  // These classes and funcions are friends as they need to access private
+  // members of UnitTest.
+  friend class Test;
+  friend class internal::AssertHelper;
+  friend class internal::ScopedTrace;
+  friend class internal::StreamingListenerTest;
+  friend class internal::UnitTestRecordPropertyTestHelper;
+  friend Environment* AddGlobalTestEnvironment(Environment* env);
+  friend internal::UnitTestImpl* internal::GetUnitTestImpl();
+  friend void internal::ReportFailureInUnknownLocation(
+      TestPartResult::Type result_type,
+      const std::string& message);
+
+  // Creates an empty UnitTest.
+  UnitTest();
+
+  // D'tor
+  virtual ~UnitTest();
+
+  // Pushes a trace defined by SCOPED_TRACE() on to the per-thread
+  // Google Test trace stack.
+  void PushGTestTrace(const internal::TraceInfo& trace)
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Pops a trace from the per-thread Google Test trace stack.
+  void PopGTestTrace()
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  // Protects mutable state in *impl_.  This is mutable as some const
+  // methods need to lock it too.
+  mutable internal::Mutex mutex_;
+
+  // Opaque implementation object.  This field is never changed once
+  // the object is constructed.  We don't mark it as const here, as
+  // doing so will cause a warning in the constructor of UnitTest.
+  // Mutable state in *impl_ is protected by mutex_.
+  internal::UnitTestImpl* impl_;
+
+  // We disallow copying UnitTest.
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTest);
+};
+
+// A convenient wrapper for adding an environment for the test
+// program.
+//
+// You should call this before RUN_ALL_TESTS() is called, probably in
+// main().  If you use gtest_main, you need to call this before main()
+// starts for it to take effect.  For example, you can define a global
+// variable like this:
+//
+//   testing::Environment* const foo_env =
+//       testing::AddGlobalTestEnvironment(new FooEnvironment);
+//
+// However, we strongly recommend you to write your own main() and
+// call AddGlobalTestEnvironment() there, as relying on initialization
+// of global variables makes the code harder to read and may cause
+// problems when you register multiple environments from different
+// translation units and the environments have dependencies among them
+// (remember that the compiler doesn't guarantee the order in which
+// global variables from different translation units are initialized).
+inline Environment* AddGlobalTestEnvironment(Environment* env) {
+  return UnitTest::GetInstance()->AddEnvironment(env);
+}
+
+// Initializes Google Test.  This must be called before calling
+// RUN_ALL_TESTS().  In particular, it parses a command line for the
+// flags that Google Test recognizes.  Whenever a Google Test flag is
+// seen, it is removed from argv, and *argc is decremented.
+//
+// No value is returned.  Instead, the Google Test flag variables are
+// updated.
+//
+// Calling the function for the second time has no user-visible effect.
+GTEST_API_ void InitGoogleTest(int* argc, char** argv);
+
+// This overloaded version can be used in Windows programs compiled in
+// UNICODE mode.
+GTEST_API_ void InitGoogleTest(int* argc, wchar_t** argv);
+
+namespace internal {
+
+// Separate the error generating code from the code path to reduce the stack
+// frame size of CmpHelperEQ. This helps reduce the overhead of some sanitizers
+// when calling EXPECT_* in a tight loop.
+template <typename T1, typename T2>
+AssertionResult CmpHelperEQFailure(const char* lhs_expression,
+                                   const char* rhs_expression,
+                                   const T1& lhs, const T2& rhs) {
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   FormatForComparisonFailureMessage(lhs, rhs),
+                   FormatForComparisonFailureMessage(rhs, lhs),
+                   false);
+}
+
+// The helper function for {ASSERT|EXPECT}_EQ.
+template <typename T1, typename T2>
+AssertionResult CmpHelperEQ(const char* lhs_expression,
+                            const char* rhs_expression,
+                            const T1& lhs,
+                            const T2& rhs) {
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4389 /* signed/unsigned mismatch */)
+  if (lhs == rhs) {
+    return AssertionSuccess();
+  }
+GTEST_DISABLE_MSC_WARNINGS_POP_()
+
+  return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs);
+}
+
+// With this overloaded version, we allow anonymous enums to be used
+// in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous enums
+// can be implicitly cast to BiggestInt.
+GTEST_API_ AssertionResult CmpHelperEQ(const char* lhs_expression,
+                                       const char* rhs_expression,
+                                       BiggestInt lhs,
+                                       BiggestInt rhs);
+
+// The helper class for {ASSERT|EXPECT}_EQ.  The template argument
+// lhs_is_null_literal is true iff the first argument to ASSERT_EQ()
+// is a null pointer literal.  The following default implementation is
+// for lhs_is_null_literal being false.
+template <bool lhs_is_null_literal>
+class EqHelper {
+ public:
+  // This templatized version is for the general case.
+  template <typename T1, typename T2>
+  static AssertionResult Compare(const char* lhs_expression,
+                                 const char* rhs_expression,
+                                 const T1& lhs,
+                                 const T2& rhs) {
+    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
+  }
+
+  // With this overloaded version, we allow anonymous enums to be used
+  // in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous
+  // enums can be implicitly cast to BiggestInt.
+  //
+  // Even though its body looks the same as the above version, we
+  // cannot merge the two, as it will make anonymous enums unhappy.
+  static AssertionResult Compare(const char* lhs_expression,
+                                 const char* rhs_expression,
+                                 BiggestInt lhs,
+                                 BiggestInt rhs) {
+    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
+  }
+};
+
+// This specialization is used when the first argument to ASSERT_EQ()
+// is a null pointer literal, like NULL, false, or 0.
+template <>
+class EqHelper<true> {
+ public:
+  // We define two overloaded versions of Compare().  The first
+  // version will be picked when the second argument to ASSERT_EQ() is
+  // NOT a pointer, e.g. ASSERT_EQ(0, AnIntFunction()) or
+  // EXPECT_EQ(false, a_bool).
+  template <typename T1, typename T2>
+  static AssertionResult Compare(
+      const char* lhs_expression,
+      const char* rhs_expression,
+      const T1& lhs,
+      const T2& rhs,
+      // The following line prevents this overload from being considered if T2
+      // is not a pointer type.  We need this because ASSERT_EQ(NULL, my_ptr)
+      // expands to Compare("", "", NULL, my_ptr), which requires a conversion
+      // to match the Secret* in the other overload, which would otherwise make
+      // this template match better.
+      typename EnableIf<!is_pointer<T2>::value>::type* = 0) {
+    return CmpHelperEQ(lhs_expression, rhs_expression, lhs, rhs);
+  }
+
+  // This version will be picked when the second argument to ASSERT_EQ() is a
+  // pointer, e.g. ASSERT_EQ(NULL, a_pointer).
+  template <typename T>
+  static AssertionResult Compare(
+      const char* lhs_expression,
+      const char* rhs_expression,
+      // We used to have a second template parameter instead of Secret*.  That
+      // template parameter would deduce to 'long', making this a better match
+      // than the first overload even without the first overload's EnableIf.
+      // Unfortunately, gcc with -Wconversion-null warns when "passing NULL to
+      // non-pointer argument" (even a deduced integral argument), so the old
+      // implementation caused warnings in user code.
+      Secret* /* lhs (NULL) */,
+      T* rhs) {
+    // We already know that 'lhs' is a null pointer.
+    return CmpHelperEQ(lhs_expression, rhs_expression,
+                       static_cast<T*>(NULL), rhs);
+  }
+};
+
+// Separate the error generating code from the code path to reduce the stack
+// frame size of CmpHelperOP. This helps reduce the overhead of some sanitizers
+// when calling EXPECT_OP in a tight loop.
+template <typename T1, typename T2>
+AssertionResult CmpHelperOpFailure(const char* expr1, const char* expr2,
+                                   const T1& val1, const T2& val2,
+                                   const char* op) {
+  return AssertionFailure()
+         << "Expected: (" << expr1 << ") " << op << " (" << expr2
+         << "), actual: " << FormatForComparisonFailureMessage(val1, val2)
+         << " vs " << FormatForComparisonFailureMessage(val2, val1);
+}
+
+// A macro for implementing the helper functions needed to implement
+// ASSERT_?? and EXPECT_??.  It is here just to avoid copy-and-paste
+// of similar code.
+//
+// For each templatized helper function, we also define an overloaded
+// version for BiggestInt in order to reduce code bloat and allow
+// anonymous enums to be used with {ASSERT|EXPECT}_?? when compiled
+// with gcc 4.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+#define GTEST_IMPL_CMP_HELPER_(op_name, op)\
+template <typename T1, typename T2>\
+AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
+                                   const T1& val1, const T2& val2) {\
+  if (val1 op val2) {\
+    return AssertionSuccess();\
+  } else {\
+    return CmpHelperOpFailure(expr1, expr2, val1, val2, #op);\
+  }\
+}\
+GTEST_API_ AssertionResult CmpHelper##op_name(\
+    const char* expr1, const char* expr2, BiggestInt val1, BiggestInt val2)
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+// Implements the helper function for {ASSERT|EXPECT}_NE
+GTEST_IMPL_CMP_HELPER_(NE, !=);
+// Implements the helper function for {ASSERT|EXPECT}_LE
+GTEST_IMPL_CMP_HELPER_(LE, <=);
+// Implements the helper function for {ASSERT|EXPECT}_LT
+GTEST_IMPL_CMP_HELPER_(LT, <);
+// Implements the helper function for {ASSERT|EXPECT}_GE
+GTEST_IMPL_CMP_HELPER_(GE, >=);
+// Implements the helper function for {ASSERT|EXPECT}_GT
+GTEST_IMPL_CMP_HELPER_(GT, >);
+
+#undef GTEST_IMPL_CMP_HELPER_
+
+// The helper function for {ASSERT|EXPECT}_STREQ.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const char* s1,
+                                          const char* s2);
+
+// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* s1_expression,
+                                              const char* s2_expression,
+                                              const char* s1,
+                                              const char* s2);
+
+// The helper function for {ASSERT|EXPECT}_STRNE.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const char* s1,
+                                          const char* s2);
+
+// The helper function for {ASSERT|EXPECT}_STRCASENE.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
+                                              const char* s2_expression,
+                                              const char* s1,
+                                              const char* s2);
+
+
+// Helper function for *_STREQ on wide strings.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTREQ(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const wchar_t* s1,
+                                          const wchar_t* s2);
+
+// Helper function for *_STRNE on wide strings.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                                          const char* s2_expression,
+                                          const wchar_t* s1,
+                                          const wchar_t* s2);
+
+}  // namespace internal
+
+// IsSubstring() and IsNotSubstring() are intended to be used as the
+// first argument to {EXPECT,ASSERT}_PRED_FORMAT2(), not by
+// themselves.  They check whether needle is a substring of haystack
+// (NULL is considered a substring of itself only), and return an
+// appropriate error message when they fail.
+//
+// The {needle,haystack}_expr arguments are the stringified
+// expressions that generated the two real arguments.
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack);
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack);
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack);
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_API_ AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack);
+GTEST_API_ AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack);
+#endif  // GTEST_HAS_STD_WSTRING
+
+namespace internal {
+
+// Helper template function for comparing floating-points.
+//
+// Template parameter:
+//
+//   RawType: the raw floating-point type (either float or double)
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+template <typename RawType>
+AssertionResult CmpHelperFloatingPointEQ(const char* lhs_expression,
+                                         const char* rhs_expression,
+                                         RawType lhs_value,
+                                         RawType rhs_value) {
+  const FloatingPoint<RawType> lhs(lhs_value), rhs(rhs_value);
+
+  if (lhs.AlmostEquals(rhs)) {
+    return AssertionSuccess();
+  }
+
+  ::std::stringstream lhs_ss;
+  lhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+         << lhs_value;
+
+  ::std::stringstream rhs_ss;
+  rhs_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+         << rhs_value;
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   StringStreamToString(&lhs_ss),
+                   StringStreamToString(&rhs_ss),
+                   false);
+}
+
+// Helper function for implementing ASSERT_NEAR.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+GTEST_API_ AssertionResult DoubleNearPredFormat(const char* expr1,
+                                                const char* expr2,
+                                                const char* abs_error_expr,
+                                                double val1,
+                                                double val2,
+                                                double abs_error);
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+// A class that enables one to stream messages to assertion macros
+class GTEST_API_ AssertHelper {
+ public:
+  // Constructor.
+  AssertHelper(TestPartResult::Type type,
+               const char* file,
+               int line,
+               const char* message);
+  ~AssertHelper();
+
+  // Message assignment is a semantic trick to enable assertion
+  // streaming; see the GTEST_MESSAGE_ macro below.
+  void operator=(const Message& message) const;
+
+ private:
+  // We put our data in a struct so that the size of the AssertHelper class can
+  // be as small as possible.  This is important because gcc is incapable of
+  // re-using stack space even for temporary variables, so every EXPECT_EQ
+  // reserves stack space for another AssertHelper.
+  struct AssertHelperData {
+    AssertHelperData(TestPartResult::Type t,
+                     const char* srcfile,
+                     int line_num,
+                     const char* msg)
+        : type(t), file(srcfile), line(line_num), message(msg) { }
+
+    TestPartResult::Type const type;
+    const char* const file;
+    int const line;
+    std::string const message;
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelperData);
+  };
+
+  AssertHelperData* const data_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelper);
+};
+
+}  // namespace internal
+
+#if GTEST_HAS_PARAM_TEST
+// The pure interface class that all value-parameterized tests inherit from.
+// A value-parameterized class must inherit from both ::testing::Test and
+// ::testing::WithParamInterface. In most cases that just means inheriting
+// from ::testing::TestWithParam, but more complicated test hierarchies
+// may need to inherit from Test and WithParamInterface at different levels.
+//
+// This interface has support for accessing the test parameter value via
+// the GetParam() method.
+//
+// Use it with one of the parameter generator defining functions, like Range(),
+// Values(), ValuesIn(), Bool(), and Combine().
+//
+// class FooTest : public ::testing::TestWithParam<int> {
+//  protected:
+//   FooTest() {
+//     // Can use GetParam() here.
+//   }
+//   virtual ~FooTest() {
+//     // Can use GetParam() here.
+//   }
+//   virtual void SetUp() {
+//     // Can use GetParam() here.
+//   }
+//   virtual void TearDown {
+//     // Can use GetParam() here.
+//   }
+// };
+// TEST_P(FooTest, DoesBar) {
+//   // Can use GetParam() method here.
+//   Foo foo;
+//   ASSERT_TRUE(foo.DoesBar(GetParam()));
+// }
+// INSTANTIATE_TEST_CASE_P(OneToTenRange, FooTest, ::testing::Range(1, 10));
+
+template <typename T>
+class WithParamInterface {
+ public:
+  typedef T ParamType;
+  virtual ~WithParamInterface() {}
+
+  // The current parameter value. Is also available in the test fixture's
+  // constructor. This member function is non-static, even though it only
+  // references static data, to reduce the opportunity for incorrect uses
+  // like writing 'WithParamInterface<bool>::GetParam()' for a test that
+  // uses a fixture whose parameter type is int.
+  const ParamType& GetParam() const {
+    GTEST_CHECK_(parameter_ != NULL)
+        << "GetParam() can only be called inside a value-parameterized test "
+        << "-- did you intend to write TEST_P instead of TEST_F?";
+    return *parameter_;
+  }
+
+ private:
+  // Sets parameter value. The caller is responsible for making sure the value
+  // remains alive and unchanged throughout the current test.
+  static void SetParam(const ParamType* parameter) {
+    parameter_ = parameter;
+  }
+
+  // Static value used for accessing parameter during a test lifetime.
+  static const ParamType* parameter_;
+
+  // TestClass must be a subclass of WithParamInterface<T> and Test.
+  template <class TestClass> friend class internal::ParameterizedTestFactory;
+};
+
+template <typename T>
+const T* WithParamInterface<T>::parameter_ = NULL;
+
+// Most value-parameterized classes can ignore the existence of
+// WithParamInterface, and can just inherit from ::testing::TestWithParam.
+
+template <typename T>
+class TestWithParam : public Test, public WithParamInterface<T> {
+};
+
+#endif  // GTEST_HAS_PARAM_TEST
+
+// Macros for indicating success/failure in test code.
+
+// ADD_FAILURE unconditionally adds a failure to the current test.
+// SUCCEED generates a success - it doesn't automatically make the
+// current test successful, as a test is only successful when it has
+// no failure.
+//
+// EXPECT_* verifies that a certain condition is satisfied.  If not,
+// it behaves like ADD_FAILURE.  In particular:
+//
+//   EXPECT_TRUE  verifies that a Boolean condition is true.
+//   EXPECT_FALSE verifies that a Boolean condition is false.
+//
+// FAIL and ASSERT_* are similar to ADD_FAILURE and EXPECT_*, except
+// that they will also abort the current function on failure.  People
+// usually want the fail-fast behavior of FAIL and ASSERT_*, but those
+// writing data-driven tests often find themselves using ADD_FAILURE
+// and EXPECT_* more.
+
+// Generates a nonfatal failure with a generic message.
+#define ADD_FAILURE() GTEST_NONFATAL_FAILURE_("Failed")
+
+// Generates a nonfatal failure at the given source file location with
+// a generic message.
+#define ADD_FAILURE_AT(file, line) \
+  GTEST_MESSAGE_AT_(file, line, "Failed", \
+                    ::testing::TestPartResult::kNonFatalFailure)
+
+// Generates a fatal failure with a generic message.
+#define GTEST_FAIL() GTEST_FATAL_FAILURE_("Failed")
+
+// Define this macro to 1 to omit the definition of FAIL(), which is a
+// generic name and clashes with some other libraries.
+#if !GTEST_DONT_DEFINE_FAIL
+# define FAIL() GTEST_FAIL()
+#endif
+
+// Generates a success with a generic message.
+#define GTEST_SUCCEED() GTEST_SUCCESS_("Succeeded")
+
+// Define this macro to 1 to omit the definition of SUCCEED(), which
+// is a generic name and clashes with some other libraries.
+#if !GTEST_DONT_DEFINE_SUCCEED
+# define SUCCEED() GTEST_SUCCEED()
+#endif
+
+// Macros for testing exceptions.
+//
+//    * {ASSERT|EXPECT}_THROW(statement, expected_exception):
+//         Tests that the statement throws the expected exception.
+//    * {ASSERT|EXPECT}_NO_THROW(statement):
+//         Tests that the statement doesn't throw any exception.
+//    * {ASSERT|EXPECT}_ANY_THROW(statement):
+//         Tests that the statement throws an exception.
+
+#define EXPECT_THROW(statement, expected_exception) \
+  GTEST_TEST_THROW_(statement, expected_exception, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_NO_THROW(statement) \
+  GTEST_TEST_NO_THROW_(statement, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_ANY_THROW(statement) \
+  GTEST_TEST_ANY_THROW_(statement, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_THROW(statement, expected_exception) \
+  GTEST_TEST_THROW_(statement, expected_exception, GTEST_FATAL_FAILURE_)
+#define ASSERT_NO_THROW(statement) \
+  GTEST_TEST_NO_THROW_(statement, GTEST_FATAL_FAILURE_)
+#define ASSERT_ANY_THROW(statement) \
+  GTEST_TEST_ANY_THROW_(statement, GTEST_FATAL_FAILURE_)
+
+// Boolean assertions. Condition can be either a Boolean expression or an
+// AssertionResult. For more information on how to use AssertionResult with
+// these macros see comments on that class.
+#define EXPECT_TRUE(condition) \
+  GTEST_TEST_BOOLEAN_((condition), #condition, false, true, \
+                      GTEST_NONFATAL_FAILURE_)
+#define EXPECT_FALSE(condition) \
+  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
+                      GTEST_NONFATAL_FAILURE_)
+#define ASSERT_TRUE(condition) \
+  GTEST_TEST_BOOLEAN_((condition), #condition, false, true, \
+                      GTEST_FATAL_FAILURE_)
+#define ASSERT_FALSE(condition) \
+  GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \
+                      GTEST_FATAL_FAILURE_)
+
+// Includes the auto-generated header that implements a family of
+// generic predicate assertion macros.
+#include "gtest/gtest_pred_impl.h"
+
+// Macros for testing equalities and inequalities.
+//
+//    * {ASSERT|EXPECT}_EQ(v1, v2): Tests that v1 == v2
+//    * {ASSERT|EXPECT}_NE(v1, v2): Tests that v1 != v2
+//    * {ASSERT|EXPECT}_LT(v1, v2): Tests that v1 < v2
+//    * {ASSERT|EXPECT}_LE(v1, v2): Tests that v1 <= v2
+//    * {ASSERT|EXPECT}_GT(v1, v2): Tests that v1 > v2
+//    * {ASSERT|EXPECT}_GE(v1, v2): Tests that v1 >= v2
+//
+// When they are not, Google Test prints both the tested expressions and
+// their actual values.  The values must be compatible built-in types,
+// or you will get a compiler error.  By "compatible" we mean that the
+// values can be compared by the respective operator.
+//
+// Note:
+//
+//   1. It is possible to make a user-defined type work with
+//   {ASSERT|EXPECT}_??(), but that requires overloading the
+//   comparison operators and is thus discouraged by the Google C++
+//   Usage Guide.  Therefore, you are advised to use the
+//   {ASSERT|EXPECT}_TRUE() macro to assert that two objects are
+//   equal.
+//
+//   2. The {ASSERT|EXPECT}_??() macros do pointer comparisons on
+//   pointers (in particular, C strings).  Therefore, if you use it
+//   with two C strings, you are testing how their locations in memory
+//   are related, not how their content is related.  To compare two C
+//   strings by content, use {ASSERT|EXPECT}_STR*().
+//
+//   3. {ASSERT|EXPECT}_EQ(v1, v2) is preferred to
+//   {ASSERT|EXPECT}_TRUE(v1 == v2), as the former tells you
+//   what the actual value is when it fails, and similarly for the
+//   other comparisons.
+//
+//   4. Do not depend on the order in which {ASSERT|EXPECT}_??()
+//   evaluate their arguments, which is undefined.
+//
+//   5. These macros evaluate their arguments exactly once.
+//
+// Examples:
+//
+//   EXPECT_NE(5, Foo());
+//   EXPECT_EQ(NULL, a_pointer);
+//   ASSERT_LT(i, array_size);
+//   ASSERT_GT(records.size(), 0) << "There is no record left.";
+
+#define EXPECT_EQ(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal:: \
+                      EqHelper<GTEST_IS_NULL_LITERAL_(val1)>::Compare, \
+                      val1, val2)
+#define EXPECT_NE(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
+#define EXPECT_LE(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
+#define EXPECT_LT(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
+#define EXPECT_GE(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
+#define EXPECT_GT(val1, val2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
+
+#define GTEST_ASSERT_EQ(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal:: \
+                      EqHelper<GTEST_IS_NULL_LITERAL_(val1)>::Compare, \
+                      val1, val2)
+#define GTEST_ASSERT_NE(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
+#define GTEST_ASSERT_LE(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
+#define GTEST_ASSERT_LT(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
+#define GTEST_ASSERT_GE(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
+#define GTEST_ASSERT_GT(val1, val2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
+
+// Define macro GTEST_DONT_DEFINE_ASSERT_XY to 1 to omit the definition of
+// ASSERT_XY(), which clashes with some users' own code.
+
+#if !GTEST_DONT_DEFINE_ASSERT_EQ
+# define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_NE
+# define ASSERT_NE(val1, val2) GTEST_ASSERT_NE(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_LE
+# define ASSERT_LE(val1, val2) GTEST_ASSERT_LE(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_LT
+# define ASSERT_LT(val1, val2) GTEST_ASSERT_LT(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_GE
+# define ASSERT_GE(val1, val2) GTEST_ASSERT_GE(val1, val2)
+#endif
+
+#if !GTEST_DONT_DEFINE_ASSERT_GT
+# define ASSERT_GT(val1, val2) GTEST_ASSERT_GT(val1, val2)
+#endif
+
+// C-string Comparisons.  All tests treat NULL and any non-NULL string
+// as different.  Two NULLs are equal.
+//
+//    * {ASSERT|EXPECT}_STREQ(s1, s2):     Tests that s1 == s2
+//    * {ASSERT|EXPECT}_STRNE(s1, s2):     Tests that s1 != s2
+//    * {ASSERT|EXPECT}_STRCASEEQ(s1, s2): Tests that s1 == s2, ignoring case
+//    * {ASSERT|EXPECT}_STRCASENE(s1, s2): Tests that s1 != s2, ignoring case
+//
+// For wide or narrow string objects, you can use the
+// {ASSERT|EXPECT}_??() macros.
+//
+// Don't depend on the order in which the arguments are evaluated,
+// which is undefined.
+//
+// These macros evaluate their arguments exactly once.
+
+#define EXPECT_STREQ(s1, s2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
+#define EXPECT_STRNE(s1, s2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
+#define EXPECT_STRCASEEQ(s1, s2) \
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
+#define EXPECT_STRCASENE(s1, s2)\
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
+
+#define ASSERT_STREQ(s1, s2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, s1, s2)
+#define ASSERT_STRNE(s1, s2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2)
+#define ASSERT_STRCASEEQ(s1, s2) \
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, s1, s2)
+#define ASSERT_STRCASENE(s1, s2)\
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2)
+
+// Macros for comparing floating-point numbers.
+//
+//    * {ASSERT|EXPECT}_FLOAT_EQ(val1, val2):
+//         Tests that two float values are almost equal.
+//    * {ASSERT|EXPECT}_DOUBLE_EQ(val1, val2):
+//         Tests that two double values are almost equal.
+//    * {ASSERT|EXPECT}_NEAR(v1, v2, abs_error):
+//         Tests that v1 and v2 are within the given distance to each other.
+//
+// Google Test uses ULP-based comparison to automatically pick a default
+// error bound that is appropriate for the operands.  See the
+// FloatingPoint template class in gtest-internal.h if you are
+// interested in the implementation details.
+
+#define EXPECT_FLOAT_EQ(val1, val2)\
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
+                      val1, val2)
+
+#define EXPECT_DOUBLE_EQ(val1, val2)\
+  EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
+                      val1, val2)
+
+#define ASSERT_FLOAT_EQ(val1, val2)\
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<float>, \
+                      val1, val2)
+
+#define ASSERT_DOUBLE_EQ(val1, val2)\
+  ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ<double>, \
+                      val1, val2)
+
+#define EXPECT_NEAR(val1, val2, abs_error)\
+  EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
+                      val1, val2, abs_error)
+
+#define ASSERT_NEAR(val1, val2, abs_error)\
+  ASSERT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \
+                      val1, val2, abs_error)
+
+// These predicate format functions work on floating-point values, and
+// can be used in {ASSERT|EXPECT}_PRED_FORMAT2*(), e.g.
+//
+//   EXPECT_PRED_FORMAT2(testing::DoubleLE, Foo(), 5.0);
+
+// Asserts that val1 is less than, or almost equal to, val2.  Fails
+// otherwise.  In particular, it fails if either val1 or val2 is NaN.
+GTEST_API_ AssertionResult FloatLE(const char* expr1, const char* expr2,
+                                   float val1, float val2);
+GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2,
+                                    double val1, double val2);
+
+
+#if GTEST_OS_WINDOWS
+
+// Macros that test for HRESULT failure and success, these are only useful
+// on Windows, and rely on Windows SDK macros and APIs to compile.
+//
+//    * {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}(expr)
+//
+// When expr unexpectedly fails or succeeds, Google Test prints the
+// expected result and the actual result with both a human-readable
+// string representation of the error, if available, as well as the
+// hex result code.
+# define EXPECT_HRESULT_SUCCEEDED(expr) \
+    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
+
+# define ASSERT_HRESULT_SUCCEEDED(expr) \
+    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr))
+
+# define EXPECT_HRESULT_FAILED(expr) \
+    EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
+
+# define ASSERT_HRESULT_FAILED(expr) \
+    ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr))
+
+#endif  // GTEST_OS_WINDOWS
+
+// Macros that execute statement and check that it doesn't generate new fatal
+// failures in the current thread.
+//
+//   * {ASSERT|EXPECT}_NO_FATAL_FAILURE(statement);
+//
+// Examples:
+//
+//   EXPECT_NO_FATAL_FAILURE(Process());
+//   ASSERT_NO_FATAL_FAILURE(Process()) << "Process() failed";
+//
+#define ASSERT_NO_FATAL_FAILURE(statement) \
+    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_FATAL_FAILURE_)
+#define EXPECT_NO_FATAL_FAILURE(statement) \
+    GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_NONFATAL_FAILURE_)
+
+// Causes a trace (including the source file path, the current line
+// number, and the given message) to be included in every test failure
+// message generated by code in the current scope.  The effect is
+// undone when the control leaves the current scope.
+//
+// The message argument can be anything streamable to std::ostream.
+//
+// In the implementation, we include the current line number as part
+// of the dummy variable name, thus allowing multiple SCOPED_TRACE()s
+// to appear in the same block - as long as they are on different
+// lines.
+#define SCOPED_TRACE(message) \
+  ::testing::internal::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\
+    __FILE__, __LINE__, ::testing::Message() << (message))
+
+// Compile-time assertion for type equality.
+// StaticAssertTypeEq<type1, type2>() compiles iff type1 and type2 are
+// the same type.  The value it returns is not interesting.
+//
+// Instead of making StaticAssertTypeEq a class template, we make it a
+// function template that invokes a helper class template.  This
+// prevents a user from misusing StaticAssertTypeEq<T1, T2> by
+// defining objects of that type.
+//
+// CAVEAT:
+//
+// When used inside a method of a class template,
+// StaticAssertTypeEq<T1, T2>() is effective ONLY IF the method is
+// instantiated.  For example, given:
+//
+//   template <typename T> class Foo {
+//    public:
+//     void Bar() { testing::StaticAssertTypeEq<int, T>(); }
+//   };
+//
+// the code:
+//
+//   void Test1() { Foo<bool> foo; }
+//
+// will NOT generate a compiler error, as Foo<bool>::Bar() is never
+// actually instantiated.  Instead, you need:
+//
+//   void Test2() { Foo<bool> foo; foo.Bar(); }
+//
+// to cause a compiler error.
+template <typename T1, typename T2>
+bool StaticAssertTypeEq() {
+  (void)internal::StaticAssertTypeEqHelper<T1, T2>();
+  return true;
+}
+
+// Defines a test.
+//
+// The first parameter is the name of the test case, and the second
+// parameter is the name of the test within the test case.
+//
+// The convention is to end the test case name with "Test".  For
+// example, a test case for the Foo class can be named FooTest.
+//
+// Test code should appear between braces after an invocation of
+// this macro.  Example:
+//
+//   TEST(FooTest, InitializesCorrectly) {
+//     Foo foo;
+//     EXPECT_TRUE(foo.StatusIsOK());
+//   }
+
+// Note that we call GetTestTypeId() instead of GetTypeId<
+// ::testing::Test>() here to get the type ID of testing::Test.  This
+// is to work around a suspected linker bug when using Google Test as
+// a framework on Mac OS X.  The bug causes GetTypeId<
+// ::testing::Test>() to return different values depending on whether
+// the call is from the Google Test framework itself or from user test
+// code.  GetTestTypeId() is guaranteed to always return the same
+// value, as it always calls GetTypeId<>() from the Google Test
+// framework.
+#define GTEST_TEST(test_case_name, test_name)\
+  GTEST_TEST_(test_case_name, test_name, \
+              ::testing::Test, ::testing::internal::GetTestTypeId())
+
+// Define this macro to 1 to omit the definition of TEST(), which
+// is a generic name and clashes with some other libraries.
+#if !GTEST_DONT_DEFINE_TEST
+# define TEST(test_case_name, test_name) GTEST_TEST(test_case_name, test_name)
+#endif
+
+// Defines a test that uses a test fixture.
+//
+// The first parameter is the name of the test fixture class, which
+// also doubles as the test case name.  The second parameter is the
+// name of the test within the test case.
+//
+// A test fixture class must be declared earlier.  The user should put
+// his test code between braces after using this macro.  Example:
+//
+//   class FooTest : public testing::Test {
+//    protected:
+//     virtual void SetUp() { b_.AddElement(3); }
+//
+//     Foo a_;
+//     Foo b_;
+//   };
+//
+//   TEST_F(FooTest, InitializesCorrectly) {
+//     EXPECT_TRUE(a_.StatusIsOK());
+//   }
+//
+//   TEST_F(FooTest, ReturnsElementCountCorrectly) {
+//     EXPECT_EQ(0, a_.size());
+//     EXPECT_EQ(1, b_.size());
+//   }
+
+#define TEST_F(test_fixture, test_name)\
+  GTEST_TEST_(test_fixture, test_name, test_fixture, \
+              ::testing::internal::GetTypeId<test_fixture>())
+
+}  // namespace testing
+
+// Use this function in main() to run all tests.  It returns 0 if all
+// tests are successful, or 1 otherwise.
+//
+// RUN_ALL_TESTS() should be invoked after the command line has been
+// parsed by InitGoogleTest().
+//
+// This function was formerly a macro; thus, it is in the global
+// namespace and has an all-caps name.
+int RUN_ALL_TESTS() GTEST_MUST_USE_RESULT_;
+
+inline int RUN_ALL_TESTS() {
+  return ::testing::UnitTest::GetInstance()->Run();
+}
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest_pred_impl.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest_pred_impl.h
new file mode 100644
index 0000000000..30ae712f50
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest_pred_impl.h
@@ -0,0 +1,358 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// This file is AUTOMATICALLY GENERATED on 10/31/2011 by command
+// 'gen_gtest_pred_impl.py 5'.  DO NOT EDIT BY HAND!
+//
+// Implements a family of generic predicate assertion macros.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
+
+// Makes sure this header is not included before gtest.h.
+#ifndef GTEST_INCLUDE_GTEST_GTEST_H_
+# error Do not include gtest_pred_impl.h directly.  Include gtest.h instead.
+#endif  // GTEST_INCLUDE_GTEST_GTEST_H_
+
+// This header implements a family of generic predicate assertion
+// macros:
+//
+//   ASSERT_PRED_FORMAT1(pred_format, v1)
+//   ASSERT_PRED_FORMAT2(pred_format, v1, v2)
+//   ...
+//
+// where pred_format is a function or functor that takes n (in the
+// case of ASSERT_PRED_FORMATn) values and their source expression
+// text, and returns a testing::AssertionResult.  See the definition
+// of ASSERT_EQ in gtest.h for an example.
+//
+// If you don't care about formatting, you can use the more
+// restrictive version:
+//
+//   ASSERT_PRED1(pred, v1)
+//   ASSERT_PRED2(pred, v1, v2)
+//   ...
+//
+// where pred is an n-ary function or functor that returns bool,
+// and the values v1, v2, ..., must support the << operator for
+// streaming to std::ostream.
+//
+// We also define the EXPECT_* variations.
+//
+// For now we only support predicates whose arity is at most 5.
+// Please email googletestframework@googlegroups.com if you need
+// support for higher arities.
+
+// GTEST_ASSERT_ is the basic statement to which all of the assertions
+// in this file reduce.  Don't use this in your code.
+
+#define GTEST_ASSERT_(expression, on_failure) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (const ::testing::AssertionResult gtest_ar = (expression)) \
+    ; \
+  else \
+    on_failure(gtest_ar.failure_message())
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED1.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1>
+AssertionResult AssertPred1Helper(const char* pred_text,
+                                  const char* e1,
+                                  Pred pred,
+                                  const T1& v1) {
+  if (pred(v1)) return AssertionSuccess();
+
+  return AssertionFailure() << pred_text << "("
+                            << e1 << ") evaluates to false, where"
+                            << "\n" << e1 << " evaluates to " << v1;
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT1.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT1_(pred_format, v1, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, v1), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED1.  Don't use
+// this in your code.
+#define GTEST_PRED1_(pred, v1, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred1Helper(#pred, \
+                                             #v1, \
+                                             pred, \
+                                             v1), on_failure)
+
+// Unary predicate assertion macros.
+#define EXPECT_PRED_FORMAT1(pred_format, v1) \
+  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED1(pred, v1) \
+  GTEST_PRED1_(pred, v1, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT1(pred_format, v1) \
+  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED1(pred, v1) \
+  GTEST_PRED1_(pred, v1, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED2.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2>
+AssertionResult AssertPred2Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2) {
+  if (pred(v1, v2)) return AssertionSuccess();
+
+  return AssertionFailure() << pred_text << "("
+                            << e1 << ", "
+                            << e2 << ") evaluates to false, where"
+                            << "\n" << e1 << " evaluates to " << v1
+                            << "\n" << e2 << " evaluates to " << v2;
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT2.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT2_(pred_format, v1, v2, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED2.  Don't use
+// this in your code.
+#define GTEST_PRED2_(pred, v1, v2, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred2Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             pred, \
+                                             v1, \
+                                             v2), on_failure)
+
+// Binary predicate assertion macros.
+#define EXPECT_PRED_FORMAT2(pred_format, v1, v2) \
+  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED2(pred, v1, v2) \
+  GTEST_PRED2_(pred, v1, v2, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT2(pred_format, v1, v2) \
+  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED2(pred, v1, v2) \
+  GTEST_PRED2_(pred, v1, v2, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED3.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2,
+          typename T3>
+AssertionResult AssertPred3Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  const char* e3,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2,
+                                  const T3& v3) {
+  if (pred(v1, v2, v3)) return AssertionSuccess();
+
+  return AssertionFailure() << pred_text << "("
+                            << e1 << ", "
+                            << e2 << ", "
+                            << e3 << ") evaluates to false, where"
+                            << "\n" << e1 << " evaluates to " << v1
+                            << "\n" << e2 << " evaluates to " << v2
+                            << "\n" << e3 << " evaluates to " << v3;
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT3.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, v1, v2, v3), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED3.  Don't use
+// this in your code.
+#define GTEST_PRED3_(pred, v1, v2, v3, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred3Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             #v3, \
+                                             pred, \
+                                             v1, \
+                                             v2, \
+                                             v3), on_failure)
+
+// Ternary predicate assertion macros.
+#define EXPECT_PRED_FORMAT3(pred_format, v1, v2, v3) \
+  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED3(pred, v1, v2, v3) \
+  GTEST_PRED3_(pred, v1, v2, v3, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT3(pred_format, v1, v2, v3) \
+  GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED3(pred, v1, v2, v3) \
+  GTEST_PRED3_(pred, v1, v2, v3, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED4.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2,
+          typename T3,
+          typename T4>
+AssertionResult AssertPred4Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  const char* e3,
+                                  const char* e4,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2,
+                                  const T3& v3,
+                                  const T4& v4) {
+  if (pred(v1, v2, v3, v4)) return AssertionSuccess();
+
+  return AssertionFailure() << pred_text << "("
+                            << e1 << ", "
+                            << e2 << ", "
+                            << e3 << ", "
+                            << e4 << ") evaluates to false, where"
+                            << "\n" << e1 << " evaluates to " << v1
+                            << "\n" << e2 << " evaluates to " << v2
+                            << "\n" << e3 << " evaluates to " << v3
+                            << "\n" << e4 << " evaluates to " << v4;
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT4.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, v1, v2, v3, v4), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED4.  Don't use
+// this in your code.
+#define GTEST_PRED4_(pred, v1, v2, v3, v4, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred4Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             #v3, \
+                                             #v4, \
+                                             pred, \
+                                             v1, \
+                                             v2, \
+                                             v3, \
+                                             v4), on_failure)
+
+// 4-ary predicate assertion macros.
+#define EXPECT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
+  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED4(pred, v1, v2, v3, v4) \
+  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \
+  GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED4(pred, v1, v2, v3, v4) \
+  GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_FATAL_FAILURE_)
+
+
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED5.  Don't use
+// this in your code.
+template <typename Pred,
+          typename T1,
+          typename T2,
+          typename T3,
+          typename T4,
+          typename T5>
+AssertionResult AssertPred5Helper(const char* pred_text,
+                                  const char* e1,
+                                  const char* e2,
+                                  const char* e3,
+                                  const char* e4,
+                                  const char* e5,
+                                  Pred pred,
+                                  const T1& v1,
+                                  const T2& v2,
+                                  const T3& v3,
+                                  const T4& v4,
+                                  const T5& v5) {
+  if (pred(v1, v2, v3, v4, v5)) return AssertionSuccess();
+
+  return AssertionFailure() << pred_text << "("
+                            << e1 << ", "
+                            << e2 << ", "
+                            << e3 << ", "
+                            << e4 << ", "
+                            << e5 << ") evaluates to false, where"
+                            << "\n" << e1 << " evaluates to " << v1
+                            << "\n" << e2 << " evaluates to " << v2
+                            << "\n" << e3 << " evaluates to " << v3
+                            << "\n" << e4 << " evaluates to " << v4
+                            << "\n" << e5 << " evaluates to " << v5;
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT5.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, on_failure)\
+  GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, #v5, v1, v2, v3, v4, v5), \
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED5.  Don't use
+// this in your code.
+#define GTEST_PRED5_(pred, v1, v2, v3, v4, v5, on_failure)\
+  GTEST_ASSERT_(::testing::AssertPred5Helper(#pred, \
+                                             #v1, \
+                                             #v2, \
+                                             #v3, \
+                                             #v4, \
+                                             #v5, \
+                                             pred, \
+                                             v1, \
+                                             v2, \
+                                             v3, \
+                                             v4, \
+                                             v5), on_failure)
+
+// 5-ary predicate assertion macros.
+#define EXPECT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
+  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED5(pred, v1, v2, v3, v4, v5) \
+  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \
+  GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED5(pred, v1, v2, v3, v4, v5) \
+  GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_)
+
+
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest_prod.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest_prod.h
new file mode 100644
index 0000000000..da80ddc6c7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/gtest_prod.h
@@ -0,0 +1,58 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Google C++ Testing Framework definitions useful in production code.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PROD_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PROD_H_
+
+// When you need to test the private or protected members of a class,
+// use the FRIEND_TEST macro to declare your tests as friends of the
+// class.  For example:
+//
+// class MyClass {
+//  private:
+//   void MyMethod();
+//   FRIEND_TEST(MyClassTest, MyMethod);
+// };
+//
+// class MyClassTest : public testing::Test {
+//   // ...
+// };
+//
+// TEST_F(MyClassTest, MyMethod) {
+//   // Can call MyClass::MyMethod() here.
+// }
+
+#define FRIEND_TEST(test_case_name, test_name)\
+friend class test_case_name##_##test_name##_Test
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_PROD_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/custom/gtest-port.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/custom/gtest-port.h
new file mode 100644
index 0000000000..7e744bd3bb
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/custom/gtest-port.h
@@ -0,0 +1,69 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Injection point for custom user configurations.
+// The following macros can be defined:
+//
+//   Flag related macros:
+//     GTEST_FLAG(flag_name)
+//     GTEST_USE_OWN_FLAGFILE_FLAG_  - Define to 0 when the system provides its
+//                                     own flagfile flag parsing.
+//     GTEST_DECLARE_bool_(name)
+//     GTEST_DECLARE_int32_(name)
+//     GTEST_DECLARE_string_(name)
+//     GTEST_DEFINE_bool_(name, default_val, doc)
+//     GTEST_DEFINE_int32_(name, default_val, doc)
+//     GTEST_DEFINE_string_(name, default_val, doc)
+//
+//   Test filtering:
+//     GTEST_TEST_FILTER_ENV_VAR_ - The name of an environment variable that
+//                                  will be used if --GTEST_FLAG(test_filter)
+//                                  is not provided.
+//
+//   Logging:
+//     GTEST_LOG_(severity)
+//     GTEST_CHECK_(condition)
+//     Functions LogToStderr() and FlushInfoLog() have to be provided too.
+//
+//   Threading:
+//     GTEST_HAS_NOTIFICATION_ - Enabled if Notification is already provided.
+//     GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ - Enabled if Mutex and ThreadLocal are
+//                                         already provided.
+//     Must also provide GTEST_DECLARE_STATIC_MUTEX_(mutex) and
+//     GTEST_DEFINE_STATIC_MUTEX_(mutex)
+//
+//     GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
+//     GTEST_LOCK_EXCLUDED_(locks)
+//
+// ** Custom implementation starts here **
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/custom/gtest-printers.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/custom/gtest-printers.h
new file mode 100644
index 0000000000..60c1ea050b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/custom/gtest-printers.h
@@ -0,0 +1,42 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// This file provides an injection point for custom printers in a local
+// installation of gTest.
+// It will be included from gtest-printers.h and the overrides in this file
+// will be visible to everyone.
+// See documentation at gtest/gtest-printers.h for details on how to define a
+// custom printer.
+//
+// ** Custom implementation starts here **
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/custom/gtest.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/custom/gtest.h
new file mode 100644
index 0000000000..c27412a898
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/custom/gtest.h
@@ -0,0 +1,41 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Injection point for custom user configurations.
+// The following macros can be defined:
+//
+// GTEST_OS_STACK_TRACE_GETTER_  - The name of an implementation of
+//                                 OsStackTraceGetterInterface.
+//
+// ** Custom implementation starts here **
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-death-test-internal.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-death-test-internal.h
new file mode 100644
index 0000000000..2b3a78f5bf
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-death-test-internal.h
@@ -0,0 +1,319 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file defines internal utilities needed for implementing
+// death tests.  They are subject to change without notice.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
+
+#include "gtest/internal/gtest-internal.h"
+
+#include <stdio.h>
+
+namespace testing {
+namespace internal {
+
+GTEST_DECLARE_string_(internal_run_death_test);
+
+// Names of the flags (needed for parsing Google Test flags).
+const char kDeathTestStyleFlag[] = "death_test_style";
+const char kDeathTestUseFork[] = "death_test_use_fork";
+const char kInternalRunDeathTestFlag[] = "internal_run_death_test";
+
+#if GTEST_HAS_DEATH_TEST
+
+// DeathTest is a class that hides much of the complexity of the
+// GTEST_DEATH_TEST_ macro.  It is abstract; its static Create method
+// returns a concrete class that depends on the prevailing death test
+// style, as defined by the --gtest_death_test_style and/or
+// --gtest_internal_run_death_test flags.
+
+// In describing the results of death tests, these terms are used with
+// the corresponding definitions:
+//
+// exit status:  The integer exit information in the format specified
+//               by wait(2)
+// exit code:    The integer code passed to exit(3), _exit(2), or
+//               returned from main()
+class GTEST_API_ DeathTest {
+ public:
+  // Create returns false if there was an error determining the
+  // appropriate action to take for the current death test; for example,
+  // if the gtest_death_test_style flag is set to an invalid value.
+  // The LastMessage method will return a more detailed message in that
+  // case.  Otherwise, the DeathTest pointer pointed to by the "test"
+  // argument is set.  If the death test should be skipped, the pointer
+  // is set to NULL; otherwise, it is set to the address of a new concrete
+  // DeathTest object that controls the execution of the current test.
+  static bool Create(const char* statement, const RE* regex,
+                     const char* file, int line, DeathTest** test);
+  DeathTest();
+  virtual ~DeathTest() { }
+
+  // A helper class that aborts a death test when it's deleted.
+  class ReturnSentinel {
+   public:
+    explicit ReturnSentinel(DeathTest* test) : test_(test) { }
+    ~ReturnSentinel() { test_->Abort(TEST_ENCOUNTERED_RETURN_STATEMENT); }
+   private:
+    DeathTest* const test_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ReturnSentinel);
+  } GTEST_ATTRIBUTE_UNUSED_;
+
+  // An enumeration of possible roles that may be taken when a death
+  // test is encountered.  EXECUTE means that the death test logic should
+  // be executed immediately.  OVERSEE means that the program should prepare
+  // the appropriate environment for a child process to execute the death
+  // test, then wait for it to complete.
+  enum TestRole { OVERSEE_TEST, EXECUTE_TEST };
+
+  // An enumeration of the three reasons that a test might be aborted.
+  enum AbortReason {
+    TEST_ENCOUNTERED_RETURN_STATEMENT,
+    TEST_THREW_EXCEPTION,
+    TEST_DID_NOT_DIE
+  };
+
+  // Assumes one of the above roles.
+  virtual TestRole AssumeRole() = 0;
+
+  // Waits for the death test to finish and returns its status.
+  virtual int Wait() = 0;
+
+  // Returns true if the death test passed; that is, the test process
+  // exited during the test, its exit status matches a user-supplied
+  // predicate, and its stderr output matches a user-supplied regular
+  // expression.
+  // The user-supplied predicate may be a macro expression rather
+  // than a function pointer or functor, or else Wait and Passed could
+  // be combined.
+  virtual bool Passed(bool exit_status_ok) = 0;
+
+  // Signals that the death test did not die as expected.
+  virtual void Abort(AbortReason reason) = 0;
+
+  // Returns a human-readable outcome message regarding the outcome of
+  // the last death test.
+  static const char* LastMessage();
+
+  static void set_last_death_test_message(const std::string& message);
+
+ private:
+  // A string containing a description of the outcome of the last death test.
+  static std::string last_death_test_message_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DeathTest);
+};
+
+// Factory interface for death tests.  May be mocked out for testing.
+class DeathTestFactory {
+ public:
+  virtual ~DeathTestFactory() { }
+  virtual bool Create(const char* statement, const RE* regex,
+                      const char* file, int line, DeathTest** test) = 0;
+};
+
+// A concrete DeathTestFactory implementation for normal use.
+class DefaultDeathTestFactory : public DeathTestFactory {
+ public:
+  virtual bool Create(const char* statement, const RE* regex,
+                      const char* file, int line, DeathTest** test);
+};
+
+// Returns true if exit_status describes a process that was terminated
+// by a signal, or exited normally with a nonzero exit code.
+GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
+
+// Traps C++ exceptions escaping statement and reports them as test
+// failures. Note that trapping SEH exceptions is not implemented here.
+# if GTEST_HAS_EXCEPTIONS
+#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
+  try { \
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+  } catch (const ::std::exception& gtest_exception) { \
+    fprintf(\
+        stderr, \
+        "\n%s: Caught std::exception-derived exception escaping the " \
+        "death test statement. Exception message: %s\n", \
+        ::testing::internal::FormatFileLocation(__FILE__, __LINE__).c_str(), \
+        gtest_exception.what()); \
+    fflush(stderr); \
+    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
+  } catch (...) { \
+    death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \
+  }
+
+# else
+#  define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \
+  GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
+
+# endif
+
+// This macro is for implementing ASSERT_DEATH*, EXPECT_DEATH*,
+// ASSERT_EXIT*, and EXPECT_EXIT*.
+# define GTEST_DEATH_TEST_(statement, predicate, regex, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+    const ::testing::internal::RE& gtest_regex = (regex); \
+    ::testing::internal::DeathTest* gtest_dt; \
+    if (!::testing::internal::DeathTest::Create(#statement, &gtest_regex, \
+        __FILE__, __LINE__, &gtest_dt)) { \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \
+    } \
+    if (gtest_dt != NULL) { \
+      ::testing::internal::scoped_ptr< ::testing::internal::DeathTest> \
+          gtest_dt_ptr(gtest_dt); \
+      switch (gtest_dt->AssumeRole()) { \
+        case ::testing::internal::DeathTest::OVERSEE_TEST: \
+          if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) { \
+            goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \
+          } \
+          break; \
+        case ::testing::internal::DeathTest::EXECUTE_TEST: { \
+          ::testing::internal::DeathTest::ReturnSentinel \
+              gtest_sentinel(gtest_dt); \
+          GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt); \
+          gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE); \
+          break; \
+        } \
+        default: \
+          break; \
+      } \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__): \
+      fail(::testing::internal::DeathTest::LastMessage())
+// The symbol "fail" here expands to something into which a message
+// can be streamed.
+
+// This macro is for implementing ASSERT/EXPECT_DEBUG_DEATH when compiled in
+// NDEBUG mode. In this case we need the statements to be executed, the regex is
+// ignored, and the macro must accept a streamed message even though the message
+// is never printed.
+# define GTEST_EXECUTE_STATEMENT_(statement, regex) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+     GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+  } else \
+    ::testing::Message()
+
+// A class representing the parsed contents of the
+// --gtest_internal_run_death_test flag, as it existed when
+// RUN_ALL_TESTS was called.
+class InternalRunDeathTestFlag {
+ public:
+  InternalRunDeathTestFlag(const std::string& a_file,
+                           int a_line,
+                           int an_index,
+                           int a_write_fd)
+      : file_(a_file), line_(a_line), index_(an_index),
+        write_fd_(a_write_fd) {}
+
+  ~InternalRunDeathTestFlag() {
+    if (write_fd_ >= 0)
+      posix::Close(write_fd_);
+  }
+
+  const std::string& file() const { return file_; }
+  int line() const { return line_; }
+  int index() const { return index_; }
+  int write_fd() const { return write_fd_; }
+
+ private:
+  std::string file_;
+  int line_;
+  int index_;
+  int write_fd_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(InternalRunDeathTestFlag);
+};
+
+// Returns a newly created InternalRunDeathTestFlag object with fields
+// initialized from the GTEST_FLAG(internal_run_death_test) flag if
+// the flag is specified; otherwise returns NULL.
+InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag();
+
+#else  // GTEST_HAS_DEATH_TEST
+
+// This macro is used for implementing macros such as
+// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where
+// death tests are not supported. Those macros must compile on such systems
+// iff EXPECT_DEATH and ASSERT_DEATH compile with the same parameters on
+// systems that support death tests. This allows one to write such a macro
+// on a system that does not support death tests and be sure that it will
+// compile on a death-test supporting system.
+//
+// Parameters:
+//   statement -  A statement that a macro such as EXPECT_DEATH would test
+//                for program termination. This macro has to make sure this
+//                statement is compiled but not executed, to ensure that
+//                EXPECT_DEATH_IF_SUPPORTED compiles with a certain
+//                parameter iff EXPECT_DEATH compiles with it.
+//   regex     -  A regex that a macro such as EXPECT_DEATH would use to test
+//                the output of statement.  This parameter has to be
+//                compiled but not evaluated by this macro, to ensure that
+//                this macro only accepts expressions that a macro such as
+//                EXPECT_DEATH would accept.
+//   terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED
+//                and a return statement for ASSERT_DEATH_IF_SUPPORTED.
+//                This ensures that ASSERT_DEATH_IF_SUPPORTED will not
+//                compile inside functions where ASSERT_DEATH doesn't
+//                compile.
+//
+//  The branch that has an always false condition is used to ensure that
+//  statement and regex are compiled (and thus syntactically correct) but
+//  never executed. The unreachable code macro protects the terminator
+//  statement from generating an 'unreachable code' warning in case
+//  statement unconditionally returns or throws. The Message constructor at
+//  the end allows the syntax of streaming additional messages into the
+//  macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH.
+# define GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, terminator) \
+    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+    if (::testing::internal::AlwaysTrue()) { \
+      GTEST_LOG_(WARNING) \
+          << "Death tests are not supported on this platform.\n" \
+          << "Statement '" #statement "' cannot be verified."; \
+    } else if (::testing::internal::AlwaysFalse()) { \
+      ::testing::internal::RE::PartialMatch(".*", (regex)); \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+      terminator; \
+    } else \
+      ::testing::Message()
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-filepath.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-filepath.h
new file mode 100644
index 0000000000..7a13b4b0de
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-filepath.h
@@ -0,0 +1,206 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keith.ray@gmail.com (Keith Ray)
+//
+// Google Test filepath utilities
+//
+// This header file declares classes and functions used internally by
+// Google Test.  They are subject to change without notice.
+//
+// This file is #included in <gtest/internal/gtest-internal.h>.
+// Do not include this header file separately!
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
+
+#include "gtest/internal/gtest-string.h"
+
+namespace testing {
+namespace internal {
+
+// FilePath - a class for file and directory pathname manipulation which
+// handles platform-specific conventions (like the pathname separator).
+// Used for helper functions for naming files in a directory for xml output.
+// Except for Set methods, all methods are const or static, which provides an
+// "immutable value object" -- useful for peace of mind.
+// A FilePath with a value ending in a path separator ("like/this/") represents
+// a directory, otherwise it is assumed to represent a file. In either case,
+// it may or may not represent an actual file or directory in the file system.
+// Names are NOT checked for syntax correctness -- no checking for illegal
+// characters, malformed paths, etc.
+
+class GTEST_API_ FilePath {
+ public:
+  FilePath() : pathname_("") { }
+  FilePath(const FilePath& rhs) : pathname_(rhs.pathname_) { }
+
+  explicit FilePath(const std::string& pathname) : pathname_(pathname) {
+    Normalize();
+  }
+
+  FilePath& operator=(const FilePath& rhs) {
+    Set(rhs);
+    return *this;
+  }
+
+  void Set(const FilePath& rhs) {
+    pathname_ = rhs.pathname_;
+  }
+
+  const std::string& string() const { return pathname_; }
+  const char* c_str() const { return pathname_.c_str(); }
+
+  // Returns the current working directory, or "" if unsuccessful.
+  static FilePath GetCurrentDir();
+
+  // Given directory = "dir", base_name = "test", number = 0,
+  // extension = "xml", returns "dir/test.xml". If number is greater
+  // than zero (e.g., 12), returns "dir/test_12.xml".
+  // On Windows platform, uses \ as the separator rather than /.
+  static FilePath MakeFileName(const FilePath& directory,
+                               const FilePath& base_name,
+                               int number,
+                               const char* extension);
+
+  // Given directory = "dir", relative_path = "test.xml",
+  // returns "dir/test.xml".
+  // On Windows, uses \ as the separator rather than /.
+  static FilePath ConcatPaths(const FilePath& directory,
+                              const FilePath& relative_path);
+
+  // Returns a pathname for a file that does not currently exist. The pathname
+  // will be directory/base_name.extension or
+  // directory/base_name_<number>.extension if directory/base_name.extension
+  // already exists. The number will be incremented until a pathname is found
+  // that does not already exist.
+  // Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
+  // There could be a race condition if two or more processes are calling this
+  // function at the same time -- they could both pick the same filename.
+  static FilePath GenerateUniqueFileName(const FilePath& directory,
+                                         const FilePath& base_name,
+                                         const char* extension);
+
+  // Returns true iff the path is "".
+  bool IsEmpty() const { return pathname_.empty(); }
+
+  // If input name has a trailing separator character, removes it and returns
+  // the name, otherwise return the name string unmodified.
+  // On Windows platform, uses \ as the separator, other platforms use /.
+  FilePath RemoveTrailingPathSeparator() const;
+
+  // Returns a copy of the FilePath with the directory part removed.
+  // Example: FilePath("path/to/file").RemoveDirectoryName() returns
+  // FilePath("file"). If there is no directory part ("just_a_file"), it returns
+  // the FilePath unmodified. If there is no file part ("just_a_dir/") it
+  // returns an empty FilePath ("").
+  // On Windows platform, '\' is the path separator, otherwise it is '/'.
+  FilePath RemoveDirectoryName() const;
+
+  // RemoveFileName returns the directory path with the filename removed.
+  // Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
+  // If the FilePath is "a_file" or "/a_file", RemoveFileName returns
+  // FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
+  // not have a file, like "just/a/dir/", it returns the FilePath unmodified.
+  // On Windows platform, '\' is the path separator, otherwise it is '/'.
+  FilePath RemoveFileName() const;
+
+  // Returns a copy of the FilePath with the case-insensitive extension removed.
+  // Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
+  // FilePath("dir/file"). If a case-insensitive extension is not
+  // found, returns a copy of the original FilePath.
+  FilePath RemoveExtension(const char* extension) const;
+
+  // Creates directories so that path exists. Returns true if successful or if
+  // the directories already exist; returns false if unable to create
+  // directories for any reason. Will also return false if the FilePath does
+  // not represent a directory (that is, it doesn't end with a path separator).
+  bool CreateDirectoriesRecursively() const;
+
+  // Create the directory so that path exists. Returns true if successful or
+  // if the directory already exists; returns false if unable to create the
+  // directory for any reason, including if the parent directory does not
+  // exist. Not named "CreateDirectory" because that's a macro on Windows.
+  bool CreateFolder() const;
+
+  // Returns true if FilePath describes something in the file-system,
+  // either a file, directory, or whatever, and that something exists.
+  bool FileOrDirectoryExists() const;
+
+  // Returns true if pathname describes a directory in the file-system
+  // that exists.
+  bool DirectoryExists() const;
+
+  // Returns true if FilePath ends with a path separator, which indicates that
+  // it is intended to represent a directory. Returns false otherwise.
+  // This does NOT check that a directory (or file) actually exists.
+  bool IsDirectory() const;
+
+  // Returns true if pathname describes a root directory. (Windows has one
+  // root directory per disk drive.)
+  bool IsRootDirectory() const;
+
+  // Returns true if pathname describes an absolute path.
+  bool IsAbsolutePath() const;
+
+ private:
+  // Replaces multiple consecutive separators with a single separator.
+  // For example, "bar///foo" becomes "bar/foo". Does not eliminate other
+  // redundancies that might be in a pathname involving "." or "..".
+  //
+  // A pathname with multiple consecutive separators may occur either through
+  // user error or as a result of some scripts or APIs that generate a pathname
+  // with a trailing separator. On other platforms the same API or script
+  // may NOT generate a pathname with a trailing "/". Then elsewhere that
+  // pathname may have another "/" and pathname components added to it,
+  // without checking for the separator already being there.
+  // The script language and operating system may allow paths like "foo//bar"
+  // but some of the functions in FilePath will not handle that correctly. In
+  // particular, RemoveTrailingPathSeparator() only removes one separator, and
+  // it is called in CreateDirectoriesRecursively() assuming that it will change
+  // a pathname from directory syntax (trailing separator) to filename syntax.
+  //
+  // On Windows this method also replaces the alternate path separator '/' with
+  // the primary path separator '\\', so that for example "bar\\/\\foo" becomes
+  // "bar\\foo".
+
+  void Normalize();
+
+  // Returns a pointer to the last occurence of a valid path separator in
+  // the FilePath. On Windows, for example, both '/' and '\' are valid path
+  // separators. Returns NULL if no path separator was found.
+  const char* FindLastPathSeparator() const;
+
+  std::string pathname_;
+};  // class FilePath
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-internal.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-internal.h
new file mode 100644
index 0000000000..ebd1cf615d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-internal.h
@@ -0,0 +1,1238 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file declares functions and macros used internally by
+// Google Test.  They are subject to change without notice.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
+
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_OS_LINUX
+# include <stdlib.h>
+# include <sys/types.h>
+# include <sys/wait.h>
+# include <unistd.h>
+#endif  // GTEST_OS_LINUX
+
+#if GTEST_HAS_EXCEPTIONS
+# include <stdexcept>
+#endif
+
+#include <ctype.h>
+#include <float.h>
+#include <string.h>
+#include <iomanip>
+#include <limits>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+
+#include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-string.h"
+#include "gtest/internal/gtest-filepath.h"
+#include "gtest/internal/gtest-type-util.h"
+
+// Due to C++ preprocessor weirdness, we need double indirection to
+// concatenate two tokens when one of them is __LINE__.  Writing
+//
+//   foo ## __LINE__
+//
+// will result in the token foo__LINE__, instead of foo followed by
+// the current line number.  For more details, see
+// http://www.parashift.com/c++-faq-lite/misc-technical-issues.html#faq-39.6
+#define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar)
+#define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo ## bar
+
+class ProtocolMessage;
+namespace proto2 { class Message; }
+
+namespace testing {
+
+// Forward declarations.
+
+class AssertionResult;                 // Result of an assertion.
+class Message;                         // Represents a failure message.
+class Test;                            // Represents a test.
+class TestInfo;                        // Information about a test.
+class TestPartResult;                  // Result of a test part.
+class UnitTest;                        // A collection of test cases.
+
+template <typename T>
+::std::string PrintToString(const T& value);
+
+namespace internal {
+
+struct TraceInfo;                      // Information about a trace point.
+class ScopedTrace;                     // Implements scoped trace.
+class TestInfoImpl;                    // Opaque implementation of TestInfo
+class UnitTestImpl;                    // Opaque implementation of UnitTest
+
+// The text used in failure messages to indicate the start of the
+// stack trace.
+GTEST_API_ extern const char kStackTraceMarker[];
+
+// Two overloaded helpers for checking at compile time whether an
+// expression is a null pointer literal (i.e. NULL or any 0-valued
+// compile-time integral constant).  Their return values have
+// different sizes, so we can use sizeof() to test which version is
+// picked by the compiler.  These helpers have no implementations, as
+// we only need their signatures.
+//
+// Given IsNullLiteralHelper(x), the compiler will pick the first
+// version if x can be implicitly converted to Secret*, and pick the
+// second version otherwise.  Since Secret is a secret and incomplete
+// type, the only expression a user can write that has type Secret* is
+// a null pointer literal.  Therefore, we know that x is a null
+// pointer literal if and only if the first version is picked by the
+// compiler.
+char IsNullLiteralHelper(Secret* p);
+char (&IsNullLiteralHelper(...))[2];  // NOLINT
+
+// A compile-time bool constant that is true if and only if x is a
+// null pointer literal (i.e. NULL or any 0-valued compile-time
+// integral constant).
+#ifdef GTEST_ELLIPSIS_NEEDS_POD_
+// We lose support for NULL detection where the compiler doesn't like
+// passing non-POD classes through ellipsis (...).
+# define GTEST_IS_NULL_LITERAL_(x) false
+#else
+# define GTEST_IS_NULL_LITERAL_(x) \
+    (sizeof(::testing::internal::IsNullLiteralHelper(x)) == 1)
+#endif  // GTEST_ELLIPSIS_NEEDS_POD_
+
+// Appends the user-supplied message to the Google-Test-generated message.
+GTEST_API_ std::string AppendUserMessage(
+    const std::string& gtest_msg, const Message& user_msg);
+
+#if GTEST_HAS_EXCEPTIONS
+
+// This exception is thrown by (and only by) a failed Google Test
+// assertion when GTEST_FLAG(throw_on_failure) is true (if exceptions
+// are enabled).  We derive it from std::runtime_error, which is for
+// errors presumably detectable only at run time.  Since
+// std::runtime_error inherits from std::exception, many testing
+// frameworks know how to extract and print the message inside it.
+class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error {
+ public:
+  explicit GoogleTestFailureException(const TestPartResult& failure);
+};
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// A helper class for creating scoped traces in user programs.
+class GTEST_API_ ScopedTrace {
+ public:
+  // The c'tor pushes the given source file location and message onto
+  // a trace stack maintained by Google Test.
+  ScopedTrace(const char* file, int line, const Message& message);
+
+  // The d'tor pops the info pushed by the c'tor.
+  //
+  // Note that the d'tor is not virtual in order to be efficient.
+  // Don't inherit from ScopedTrace!
+  ~ScopedTrace();
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace);
+} GTEST_ATTRIBUTE_UNUSED_;  // A ScopedTrace object does its job in its
+                            // c'tor and d'tor.  Therefore it doesn't
+                            // need to be used otherwise.
+
+namespace edit_distance {
+// Returns the optimal edits to go from 'left' to 'right'.
+// All edits cost the same, with replace having lower priority than
+// add/remove.
+// Simple implementation of the Wagner–Fischer algorithm.
+// See http://en.wikipedia.org/wiki/Wagner-Fischer_algorithm
+enum EditType { kMatch, kAdd, kRemove, kReplace };
+GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
+    const std::vector<size_t>& left, const std::vector<size_t>& right);
+
+// Same as above, but the input is represented as strings.
+GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
+    const std::vector<std::string>& left,
+    const std::vector<std::string>& right);
+
+// Create a diff of the input strings in Unified diff format.
+GTEST_API_ std::string CreateUnifiedDiff(const std::vector<std::string>& left,
+                                         const std::vector<std::string>& right,
+                                         size_t context = 2);
+
+}  // namespace edit_distance
+
+// Calculate the diff between 'left' and 'right' and return it in unified diff
+// format.
+// If not null, stores in 'total_line_count' the total number of lines found
+// in left + right.
+GTEST_API_ std::string DiffStrings(const std::string& left,
+                                   const std::string& right,
+                                   size_t* total_line_count);
+
+// Constructs and returns the message for an equality assertion
+// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
+//
+// The first four parameters are the expressions used in the assertion
+// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
+// where foo is 5 and bar is 6, we have:
+//
+//   expected_expression: "foo"
+//   actual_expression:   "bar"
+//   expected_value:      "5"
+//   actual_value:        "6"
+//
+// The ignoring_case parameter is true iff the assertion is a
+// *_STRCASEEQ*.  When it's true, the string " (ignoring case)" will
+// be inserted into the message.
+GTEST_API_ AssertionResult EqFailure(const char* expected_expression,
+                                     const char* actual_expression,
+                                     const std::string& expected_value,
+                                     const std::string& actual_value,
+                                     bool ignoring_case);
+
+// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
+GTEST_API_ std::string GetBoolAssertionFailureMessage(
+    const AssertionResult& assertion_result,
+    const char* expression_text,
+    const char* actual_predicate_value,
+    const char* expected_predicate_value);
+
+// This template class represents an IEEE floating-point number
+// (either single-precision or double-precision, depending on the
+// template parameters).
+//
+// The purpose of this class is to do more sophisticated number
+// comparison.  (Due to round-off error, etc, it's very unlikely that
+// two floating-points will be equal exactly.  Hence a naive
+// comparison by the == operation often doesn't work.)
+//
+// Format of IEEE floating-point:
+//
+//   The most-significant bit being the leftmost, an IEEE
+//   floating-point looks like
+//
+//     sign_bit exponent_bits fraction_bits
+//
+//   Here, sign_bit is a single bit that designates the sign of the
+//   number.
+//
+//   For float, there are 8 exponent bits and 23 fraction bits.
+//
+//   For double, there are 11 exponent bits and 52 fraction bits.
+//
+//   More details can be found at
+//   http://en.wikipedia.org/wiki/IEEE_floating-point_standard.
+//
+// Template parameter:
+//
+//   RawType: the raw floating-point type (either float or double)
+template <typename RawType>
+class FloatingPoint {
+ public:
+  // Defines the unsigned integer type that has the same size as the
+  // floating point number.
+  typedef typename TypeWithSize<sizeof(RawType)>::UInt Bits;
+
+  // Constants.
+
+  // # of bits in a number.
+  static const size_t kBitCount = 8*sizeof(RawType);
+
+  // # of fraction bits in a number.
+  static const size_t kFractionBitCount =
+    std::numeric_limits<RawType>::digits - 1;
+
+  // # of exponent bits in a number.
+  static const size_t kExponentBitCount = kBitCount - 1 - kFractionBitCount;
+
+  // The mask for the sign bit.
+  static const Bits kSignBitMask = static_cast<Bits>(1) << (kBitCount - 1);
+
+  // The mask for the fraction bits.
+  static const Bits kFractionBitMask =
+    ~static_cast<Bits>(0) >> (kExponentBitCount + 1);
+
+  // The mask for the exponent bits.
+  static const Bits kExponentBitMask = ~(kSignBitMask | kFractionBitMask);
+
+  // How many ULP's (Units in the Last Place) we want to tolerate when
+  // comparing two numbers.  The larger the value, the more error we
+  // allow.  A 0 value means that two numbers must be exactly the same
+  // to be considered equal.
+  //
+  // The maximum error of a single floating-point operation is 0.5
+  // units in the last place.  On Intel CPU's, all floating-point
+  // calculations are done with 80-bit precision, while double has 64
+  // bits.  Therefore, 4 should be enough for ordinary use.
+  //
+  // See the following article for more details on ULP:
+  // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/
+  static const size_t kMaxUlps = 4;
+
+  // Constructs a FloatingPoint from a raw floating-point number.
+  //
+  // On an Intel CPU, passing a non-normalized NAN (Not a Number)
+  // around may change its bits, although the new value is guaranteed
+  // to be also a NAN.  Therefore, don't expect this constructor to
+  // preserve the bits in x when x is a NAN.
+  explicit FloatingPoint(const RawType& x) { u_.value_ = x; }
+
+  // Static methods
+
+  // Reinterprets a bit pattern as a floating-point number.
+  //
+  // This function is needed to test the AlmostEquals() method.
+  static RawType ReinterpretBits(const Bits bits) {
+    FloatingPoint fp(0);
+    fp.u_.bits_ = bits;
+    return fp.u_.value_;
+  }
+
+  // Returns the floating-point number that represent positive infinity.
+  static RawType Infinity() {
+    return ReinterpretBits(kExponentBitMask);
+  }
+
+  // Returns the maximum representable finite floating-point number.
+  static RawType Max();
+
+  // Non-static methods
+
+  // Returns the bits that represents this number.
+  const Bits &bits() const { return u_.bits_; }
+
+  // Returns the exponent bits of this number.
+  Bits exponent_bits() const { return kExponentBitMask & u_.bits_; }
+
+  // Returns the fraction bits of this number.
+  Bits fraction_bits() const { return kFractionBitMask & u_.bits_; }
+
+  // Returns the sign bit of this number.
+  Bits sign_bit() const { return kSignBitMask & u_.bits_; }
+
+  // Returns true iff this is NAN (not a number).
+  bool is_nan() const {
+    // It's a NAN if the exponent bits are all ones and the fraction
+    // bits are not entirely zeros.
+    return (exponent_bits() == kExponentBitMask) && (fraction_bits() != 0);
+  }
+
+  // Returns true iff this number is at most kMaxUlps ULP's away from
+  // rhs.  In particular, this function:
+  //
+  //   - returns false if either number is (or both are) NAN.
+  //   - treats really large numbers as almost equal to infinity.
+  //   - thinks +0.0 and -0.0 are 0 DLP's apart.
+  bool AlmostEquals(const FloatingPoint& rhs) const {
+    // The IEEE standard says that any comparison operation involving
+    // a NAN must return false.
+    if (is_nan() || rhs.is_nan()) return false;
+
+    return DistanceBetweenSignAndMagnitudeNumbers(u_.bits_, rhs.u_.bits_)
+        <= kMaxUlps;
+  }
+
+ private:
+  // The data type used to store the actual floating-point number.
+  union FloatingPointUnion {
+    RawType value_;  // The raw floating-point number.
+    Bits bits_;      // The bits that represent the number.
+  };
+
+  // Converts an integer from the sign-and-magnitude representation to
+  // the biased representation.  More precisely, let N be 2 to the
+  // power of (kBitCount - 1), an integer x is represented by the
+  // unsigned number x + N.
+  //
+  // For instance,
+  //
+  //   -N + 1 (the most negative number representable using
+  //          sign-and-magnitude) is represented by 1;
+  //   0      is represented by N; and
+  //   N - 1  (the biggest number representable using
+  //          sign-and-magnitude) is represented by 2N - 1.
+  //
+  // Read http://en.wikipedia.org/wiki/Signed_number_representations
+  // for more details on signed number representations.
+  static Bits SignAndMagnitudeToBiased(const Bits &sam) {
+    if (kSignBitMask & sam) {
+      // sam represents a negative number.
+      return ~sam + 1;
+    } else {
+      // sam represents a positive number.
+      return kSignBitMask | sam;
+    }
+  }
+
+  // Given two numbers in the sign-and-magnitude representation,
+  // returns the distance between them as an unsigned number.
+  static Bits DistanceBetweenSignAndMagnitudeNumbers(const Bits &sam1,
+                                                     const Bits &sam2) {
+    const Bits biased1 = SignAndMagnitudeToBiased(sam1);
+    const Bits biased2 = SignAndMagnitudeToBiased(sam2);
+    return (biased1 >= biased2) ? (biased1 - biased2) : (biased2 - biased1);
+  }
+
+  FloatingPointUnion u_;
+};
+
+// We cannot use std::numeric_limits<T>::max() as it clashes with the max()
+// macro defined by <windows.h>.
+template <>
+inline float FloatingPoint<float>::Max() { return FLT_MAX; }
+template <>
+inline double FloatingPoint<double>::Max() { return DBL_MAX; }
+
+// Typedefs the instances of the FloatingPoint template class that we
+// care to use.
+typedef FloatingPoint<float> Float;
+typedef FloatingPoint<double> Double;
+
+// In order to catch the mistake of putting tests that use different
+// test fixture classes in the same test case, we need to assign
+// unique IDs to fixture classes and compare them.  The TypeId type is
+// used to hold such IDs.  The user should treat TypeId as an opaque
+// type: the only operation allowed on TypeId values is to compare
+// them for equality using the == operator.
+typedef const void* TypeId;
+
+template <typename T>
+class TypeIdHelper {
+ public:
+  // dummy_ must not have a const type.  Otherwise an overly eager
+  // compiler (e.g. MSVC 7.1 & 8.0) may try to merge
+  // TypeIdHelper<T>::dummy_ for different Ts as an "optimization".
+  static bool dummy_;
+};
+
+template <typename T>
+bool TypeIdHelper<T>::dummy_ = false;
+
+// GetTypeId<T>() returns the ID of type T.  Different values will be
+// returned for different types.  Calling the function twice with the
+// same type argument is guaranteed to return the same ID.
+template <typename T>
+TypeId GetTypeId() {
+  // The compiler is required to allocate a different
+  // TypeIdHelper<T>::dummy_ variable for each T used to instantiate
+  // the template.  Therefore, the address of dummy_ is guaranteed to
+  // be unique.
+  return &(TypeIdHelper<T>::dummy_);
+}
+
+// Returns the type ID of ::testing::Test.  Always call this instead
+// of GetTypeId< ::testing::Test>() to get the type ID of
+// ::testing::Test, as the latter may give the wrong result due to a
+// suspected linker bug when compiling Google Test as a Mac OS X
+// framework.
+GTEST_API_ TypeId GetTestTypeId();
+
+// Defines the abstract factory interface that creates instances
+// of a Test object.
+class TestFactoryBase {
+ public:
+  virtual ~TestFactoryBase() {}
+
+  // Creates a test instance to run. The instance is both created and destroyed
+  // within TestInfoImpl::Run()
+  virtual Test* CreateTest() = 0;
+
+ protected:
+  TestFactoryBase() {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestFactoryBase);
+};
+
+// This class provides implementation of TeastFactoryBase interface.
+// It is used in TEST and TEST_F macros.
+template <class TestClass>
+class TestFactoryImpl : public TestFactoryBase {
+ public:
+  virtual Test* CreateTest() { return new TestClass; }
+};
+
+#if GTEST_OS_WINDOWS
+
+// Predicate-formatters for implementing the HRESULT checking macros
+// {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}
+// We pass a long instead of HRESULT to avoid causing an
+// include dependency for the HRESULT type.
+GTEST_API_ AssertionResult IsHRESULTSuccess(const char* expr,
+                                            long hr);  // NOLINT
+GTEST_API_ AssertionResult IsHRESULTFailure(const char* expr,
+                                            long hr);  // NOLINT
+
+#endif  // GTEST_OS_WINDOWS
+
+// Types of SetUpTestCase() and TearDownTestCase() functions.
+typedef void (*SetUpTestCaseFunc)();
+typedef void (*TearDownTestCaseFunc)();
+
+struct CodeLocation {
+  CodeLocation(const string& a_file, int a_line) : file(a_file), line(a_line) {}
+
+  string file;
+  int line;
+};
+
+// Creates a new TestInfo object and registers it with Google Test;
+// returns the created object.
+//
+// Arguments:
+//
+//   test_case_name:   name of the test case
+//   name:             name of the test
+//   type_param        the name of the test's type parameter, or NULL if
+//                     this is not a typed or a type-parameterized test.
+//   value_param       text representation of the test's value parameter,
+//                     or NULL if this is not a type-parameterized test.
+//   code_location:    code location where the test is defined
+//   fixture_class_id: ID of the test fixture class
+//   set_up_tc:        pointer to the function that sets up the test case
+//   tear_down_tc:     pointer to the function that tears down the test case
+//   factory:          pointer to the factory that creates a test object.
+//                     The newly created TestInfo instance will assume
+//                     ownership of the factory object.
+GTEST_API_ TestInfo* MakeAndRegisterTestInfo(
+    const char* test_case_name,
+    const char* name,
+    const char* type_param,
+    const char* value_param,
+    CodeLocation code_location,
+    TypeId fixture_class_id,
+    SetUpTestCaseFunc set_up_tc,
+    TearDownTestCaseFunc tear_down_tc,
+    TestFactoryBase* factory);
+
+// If *pstr starts with the given prefix, modifies *pstr to be right
+// past the prefix and returns true; otherwise leaves *pstr unchanged
+// and returns false.  None of pstr, *pstr, and prefix can be NULL.
+GTEST_API_ bool SkipPrefix(const char* prefix, const char** pstr);
+
+#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
+
+// State of the definition of a type-parameterized test case.
+class GTEST_API_ TypedTestCasePState {
+ public:
+  TypedTestCasePState() : registered_(false) {}
+
+  // Adds the given test name to defined_test_names_ and return true
+  // if the test case hasn't been registered; otherwise aborts the
+  // program.
+  bool AddTestName(const char* file, int line, const char* case_name,
+                   const char* test_name) {
+    if (registered_) {
+      fprintf(stderr, "%s Test %s must be defined before "
+              "REGISTER_TYPED_TEST_CASE_P(%s, ...).\n",
+              FormatFileLocation(file, line).c_str(), test_name, case_name);
+      fflush(stderr);
+      posix::Abort();
+    }
+    registered_tests_.insert(
+        ::std::make_pair(test_name, CodeLocation(file, line)));
+    return true;
+  }
+
+  bool TestExists(const std::string& test_name) const {
+    return registered_tests_.count(test_name) > 0;
+  }
+
+  const CodeLocation& GetCodeLocation(const std::string& test_name) const {
+    RegisteredTestsMap::const_iterator it = registered_tests_.find(test_name);
+    GTEST_CHECK_(it != registered_tests_.end());
+    return it->second;
+  }
+
+  // Verifies that registered_tests match the test names in
+  // defined_test_names_; returns registered_tests if successful, or
+  // aborts the program otherwise.
+  const char* VerifyRegisteredTestNames(
+      const char* file, int line, const char* registered_tests);
+
+ private:
+  typedef ::std::map<std::string, CodeLocation> RegisteredTestsMap;
+
+  bool registered_;
+  RegisteredTestsMap registered_tests_;
+};
+
+// Skips to the first non-space char after the first comma in 'str';
+// returns NULL if no comma is found in 'str'.
+inline const char* SkipComma(const char* str) {
+  const char* comma = strchr(str, ',');
+  if (comma == NULL) {
+    return NULL;
+  }
+  while (IsSpace(*(++comma))) {}
+  return comma;
+}
+
+// Returns the prefix of 'str' before the first comma in it; returns
+// the entire string if it contains no comma.
+inline std::string GetPrefixUntilComma(const char* str) {
+  const char* comma = strchr(str, ',');
+  return comma == NULL ? str : std::string(str, comma);
+}
+
+// Splits a given string on a given delimiter, populating a given
+// vector with the fields.
+void SplitString(const ::std::string& str, char delimiter,
+                 ::std::vector< ::std::string>* dest);
+
+// TypeParameterizedTest<Fixture, TestSel, Types>::Register()
+// registers a list of type-parameterized tests with Google Test.  The
+// return value is insignificant - we just need to return something
+// such that we can call this function in a namespace scope.
+//
+// Implementation note: The GTEST_TEMPLATE_ macro declares a template
+// template parameter.  It's defined in gtest-type-util.h.
+template <GTEST_TEMPLATE_ Fixture, class TestSel, typename Types>
+class TypeParameterizedTest {
+ public:
+  // 'index' is the index of the test in the type list 'Types'
+  // specified in INSTANTIATE_TYPED_TEST_CASE_P(Prefix, TestCase,
+  // Types).  Valid values for 'index' are [0, N - 1] where N is the
+  // length of Types.
+  static bool Register(const char* prefix,
+                       CodeLocation code_location,
+                       const char* case_name, const char* test_names,
+                       int index) {
+    typedef typename Types::Head Type;
+    typedef Fixture<Type> FixtureClass;
+    typedef typename GTEST_BIND_(TestSel, Type) TestClass;
+
+    // First, registers the first type-parameterized test in the type
+    // list.
+    MakeAndRegisterTestInfo(
+        (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name + "/"
+         + StreamableToString(index)).c_str(),
+        StripTrailingSpaces(GetPrefixUntilComma(test_names)).c_str(),
+        GetTypeName<Type>().c_str(),
+        NULL,  // No value parameter.
+        code_location,
+        GetTypeId<FixtureClass>(),
+        TestClass::SetUpTestCase,
+        TestClass::TearDownTestCase,
+        new TestFactoryImpl<TestClass>);
+
+    // Next, recurses (at compile time) with the tail of the type list.
+    return TypeParameterizedTest<Fixture, TestSel, typename Types::Tail>
+        ::Register(prefix, code_location, case_name, test_names, index + 1);
+  }
+};
+
+// The base case for the compile time recursion.
+template <GTEST_TEMPLATE_ Fixture, class TestSel>
+class TypeParameterizedTest<Fixture, TestSel, Types0> {
+ public:
+  static bool Register(const char* /*prefix*/, CodeLocation,
+                       const char* /*case_name*/, const char* /*test_names*/,
+                       int /*index*/) {
+    return true;
+  }
+};
+
+// TypeParameterizedTestCase<Fixture, Tests, Types>::Register()
+// registers *all combinations* of 'Tests' and 'Types' with Google
+// Test.  The return value is insignificant - we just need to return
+// something such that we can call this function in a namespace scope.
+template <GTEST_TEMPLATE_ Fixture, typename Tests, typename Types>
+class TypeParameterizedTestCase {
+ public:
+  static bool Register(const char* prefix, CodeLocation code_location,
+                       const TypedTestCasePState* state,
+                       const char* case_name, const char* test_names) {
+    std::string test_name = StripTrailingSpaces(
+        GetPrefixUntilComma(test_names));
+    if (!state->TestExists(test_name)) {
+      fprintf(stderr, "Failed to get code location for test %s.%s at %s.",
+              case_name, test_name.c_str(),
+              FormatFileLocation(code_location.file.c_str(),
+                                 code_location.line).c_str());
+      fflush(stderr);
+      posix::Abort();
+    }
+    const CodeLocation& test_location = state->GetCodeLocation(test_name);
+
+    typedef typename Tests::Head Head;
+
+    // First, register the first test in 'Test' for each type in 'Types'.
+    TypeParameterizedTest<Fixture, Head, Types>::Register(
+        prefix, test_location, case_name, test_names, 0);
+
+    // Next, recurses (at compile time) with the tail of the test list.
+    return TypeParameterizedTestCase<Fixture, typename Tests::Tail, Types>
+        ::Register(prefix, code_location, state,
+                   case_name, SkipComma(test_names));
+  }
+};
+
+// The base case for the compile time recursion.
+template <GTEST_TEMPLATE_ Fixture, typename Types>
+class TypeParameterizedTestCase<Fixture, Templates0, Types> {
+ public:
+  static bool Register(const char* /*prefix*/, CodeLocation,
+                       const TypedTestCasePState* /*state*/,
+                       const char* /*case_name*/, const char* /*test_names*/) {
+    return true;
+  }
+};
+
+#endif  // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
+
+// Returns the current OS stack trace as an std::string.
+//
+// The maximum number of stack frames to be included is specified by
+// the gtest_stack_trace_depth flag.  The skip_count parameter
+// specifies the number of top frames to be skipped, which doesn't
+// count against the number of frames to be included.
+//
+// For example, if Foo() calls Bar(), which in turn calls
+// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
+// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
+GTEST_API_ std::string GetCurrentOsStackTraceExceptTop(
+    UnitTest* unit_test, int skip_count);
+
+// Helpers for suppressing warnings on unreachable code or constant
+// condition.
+
+// Always returns true.
+GTEST_API_ bool AlwaysTrue();
+
+// Always returns false.
+inline bool AlwaysFalse() { return !AlwaysTrue(); }
+
+// Helper for suppressing false warning from Clang on a const char*
+// variable declared in a conditional expression always being NULL in
+// the else branch.
+struct GTEST_API_ ConstCharPtr {
+  ConstCharPtr(const char* str) : value(str) {}
+  operator bool() const { return true; }
+  const char* value;
+};
+
+// A simple Linear Congruential Generator for generating random
+// numbers with a uniform distribution.  Unlike rand() and srand(), it
+// doesn't use global state (and therefore can't interfere with user
+// code).  Unlike rand_r(), it's portable.  An LCG isn't very random,
+// but it's good enough for our purposes.
+class GTEST_API_ Random {
+ public:
+  static const UInt32 kMaxRange = 1u << 31;
+
+  explicit Random(UInt32 seed) : state_(seed) {}
+
+  void Reseed(UInt32 seed) { state_ = seed; }
+
+  // Generates a random number from [0, range).  Crashes if 'range' is
+  // 0 or greater than kMaxRange.
+  UInt32 Generate(UInt32 range);
+
+ private:
+  UInt32 state_;
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Random);
+};
+
+// Defining a variable of type CompileAssertTypesEqual<T1, T2> will cause a
+// compiler error iff T1 and T2 are different types.
+template <typename T1, typename T2>
+struct CompileAssertTypesEqual;
+
+template <typename T>
+struct CompileAssertTypesEqual<T, T> {
+};
+
+// Removes the reference from a type if it is a reference type,
+// otherwise leaves it unchanged.  This is the same as
+// tr1::remove_reference, which is not widely available yet.
+template <typename T>
+struct RemoveReference { typedef T type; };  // NOLINT
+template <typename T>
+struct RemoveReference<T&> { typedef T type; };  // NOLINT
+
+// A handy wrapper around RemoveReference that works when the argument
+// T depends on template parameters.
+#define GTEST_REMOVE_REFERENCE_(T) \
+    typename ::testing::internal::RemoveReference<T>::type
+
+// Removes const from a type if it is a const type, otherwise leaves
+// it unchanged.  This is the same as tr1::remove_const, which is not
+// widely available yet.
+template <typename T>
+struct RemoveConst { typedef T type; };  // NOLINT
+template <typename T>
+struct RemoveConst<const T> { typedef T type; };  // NOLINT
+
+// MSVC 8.0, Sun C++, and IBM XL C++ have a bug which causes the above
+// definition to fail to remove the const in 'const int[3]' and 'const
+// char[3][4]'.  The following specialization works around the bug.
+template <typename T, size_t N>
+struct RemoveConst<const T[N]> {
+  typedef typename RemoveConst<T>::type type[N];
+};
+
+#if defined(_MSC_VER) && _MSC_VER < 1400
+// This is the only specialization that allows VC++ 7.1 to remove const in
+// 'const int[3] and 'const int[3][4]'.  However, it causes trouble with GCC
+// and thus needs to be conditionally compiled.
+template <typename T, size_t N>
+struct RemoveConst<T[N]> {
+  typedef typename RemoveConst<T>::type type[N];
+};
+#endif
+
+// A handy wrapper around RemoveConst that works when the argument
+// T depends on template parameters.
+#define GTEST_REMOVE_CONST_(T) \
+    typename ::testing::internal::RemoveConst<T>::type
+
+// Turns const U&, U&, const U, and U all into U.
+#define GTEST_REMOVE_REFERENCE_AND_CONST_(T) \
+    GTEST_REMOVE_CONST_(GTEST_REMOVE_REFERENCE_(T))
+
+// Adds reference to a type if it is not a reference type,
+// otherwise leaves it unchanged.  This is the same as
+// tr1::add_reference, which is not widely available yet.
+template <typename T>
+struct AddReference { typedef T& type; };  // NOLINT
+template <typename T>
+struct AddReference<T&> { typedef T& type; };  // NOLINT
+
+// A handy wrapper around AddReference that works when the argument T
+// depends on template parameters.
+#define GTEST_ADD_REFERENCE_(T) \
+    typename ::testing::internal::AddReference<T>::type
+
+// Adds a reference to const on top of T as necessary.  For example,
+// it transforms
+//
+//   char         ==> const char&
+//   const char   ==> const char&
+//   char&        ==> const char&
+//   const char&  ==> const char&
+//
+// The argument T must depend on some template parameters.
+#define GTEST_REFERENCE_TO_CONST_(T) \
+    GTEST_ADD_REFERENCE_(const GTEST_REMOVE_REFERENCE_(T))
+
+// ImplicitlyConvertible<From, To>::value is a compile-time bool
+// constant that's true iff type From can be implicitly converted to
+// type To.
+template <typename From, typename To>
+class ImplicitlyConvertible {
+ private:
+  // We need the following helper functions only for their types.
+  // They have no implementations.
+
+  // MakeFrom() is an expression whose type is From.  We cannot simply
+  // use From(), as the type From may not have a public default
+  // constructor.
+  static typename AddReference<From>::type MakeFrom();
+
+  // These two functions are overloaded.  Given an expression
+  // Helper(x), the compiler will pick the first version if x can be
+  // implicitly converted to type To; otherwise it will pick the
+  // second version.
+  //
+  // The first version returns a value of size 1, and the second
+  // version returns a value of size 2.  Therefore, by checking the
+  // size of Helper(x), which can be done at compile time, we can tell
+  // which version of Helper() is used, and hence whether x can be
+  // implicitly converted to type To.
+  static char Helper(To);
+  static char (&Helper(...))[2];  // NOLINT
+
+  // We have to put the 'public' section after the 'private' section,
+  // or MSVC refuses to compile the code.
+ public:
+#if defined(__BORLANDC__)
+  // C++Builder cannot use member overload resolution during template
+  // instantiation.  The simplest workaround is to use its C++0x type traits
+  // functions (C++Builder 2009 and above only).
+  static const bool value = __is_convertible(From, To);
+#else
+  // MSVC warns about implicitly converting from double to int for
+  // possible loss of data, so we need to temporarily disable the
+  // warning.
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4244)
+  static const bool value =
+      sizeof(Helper(ImplicitlyConvertible::MakeFrom())) == 1;
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+#endif  // __BORLANDC__
+};
+template <typename From, typename To>
+const bool ImplicitlyConvertible<From, To>::value;
+
+// IsAProtocolMessage<T>::value is a compile-time bool constant that's
+// true iff T is type ProtocolMessage, proto2::Message, or a subclass
+// of those.
+template <typename T>
+struct IsAProtocolMessage
+    : public bool_constant<
+  ImplicitlyConvertible<const T*, const ::ProtocolMessage*>::value ||
+  ImplicitlyConvertible<const T*, const ::proto2::Message*>::value> {
+};
+
+// When the compiler sees expression IsContainerTest<C>(0), if C is an
+// STL-style container class, the first overload of IsContainerTest
+// will be viable (since both C::iterator* and C::const_iterator* are
+// valid types and NULL can be implicitly converted to them).  It will
+// be picked over the second overload as 'int' is a perfect match for
+// the type of argument 0.  If C::iterator or C::const_iterator is not
+// a valid type, the first overload is not viable, and the second
+// overload will be picked.  Therefore, we can determine whether C is
+// a container class by checking the type of IsContainerTest<C>(0).
+// The value of the expression is insignificant.
+//
+// Note that we look for both C::iterator and C::const_iterator.  The
+// reason is that C++ injects the name of a class as a member of the
+// class itself (e.g. you can refer to class iterator as either
+// 'iterator' or 'iterator::iterator').  If we look for C::iterator
+// only, for example, we would mistakenly think that a class named
+// iterator is an STL container.
+//
+// Also note that the simpler approach of overloading
+// IsContainerTest(typename C::const_iterator*) and
+// IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++.
+typedef int IsContainer;
+template <class C>
+IsContainer IsContainerTest(int /* dummy */,
+                            typename C::iterator* /* it */ = NULL,
+                            typename C::const_iterator* /* const_it */ = NULL) {
+  return 0;
+}
+
+typedef char IsNotContainer;
+template <class C>
+IsNotContainer IsContainerTest(long /* dummy */) { return '\0'; }
+
+// EnableIf<condition>::type is void when 'Cond' is true, and
+// undefined when 'Cond' is false.  To use SFINAE to make a function
+// overload only apply when a particular expression is true, add
+// "typename EnableIf<expression>::type* = 0" as the last parameter.
+template<bool> struct EnableIf;
+template<> struct EnableIf<true> { typedef void type; };  // NOLINT
+
+// Utilities for native arrays.
+
+// ArrayEq() compares two k-dimensional native arrays using the
+// elements' operator==, where k can be any integer >= 0.  When k is
+// 0, ArrayEq() degenerates into comparing a single pair of values.
+
+template <typename T, typename U>
+bool ArrayEq(const T* lhs, size_t size, const U* rhs);
+
+// This generic version is used when k is 0.
+template <typename T, typename U>
+inline bool ArrayEq(const T& lhs, const U& rhs) { return lhs == rhs; }
+
+// This overload is used when k >= 1.
+template <typename T, typename U, size_t N>
+inline bool ArrayEq(const T(&lhs)[N], const U(&rhs)[N]) {
+  return internal::ArrayEq(lhs, N, rhs);
+}
+
+// This helper reduces code bloat.  If we instead put its logic inside
+// the previous ArrayEq() function, arrays with different sizes would
+// lead to different copies of the template code.
+template <typename T, typename U>
+bool ArrayEq(const T* lhs, size_t size, const U* rhs) {
+  for (size_t i = 0; i != size; i++) {
+    if (!internal::ArrayEq(lhs[i], rhs[i]))
+      return false;
+  }
+  return true;
+}
+
+// Finds the first element in the iterator range [begin, end) that
+// equals elem.  Element may be a native array type itself.
+template <typename Iter, typename Element>
+Iter ArrayAwareFind(Iter begin, Iter end, const Element& elem) {
+  for (Iter it = begin; it != end; ++it) {
+    if (internal::ArrayEq(*it, elem))
+      return it;
+  }
+  return end;
+}
+
+// CopyArray() copies a k-dimensional native array using the elements'
+// operator=, where k can be any integer >= 0.  When k is 0,
+// CopyArray() degenerates into copying a single value.
+
+template <typename T, typename U>
+void CopyArray(const T* from, size_t size, U* to);
+
+// This generic version is used when k is 0.
+template <typename T, typename U>
+inline void CopyArray(const T& from, U* to) { *to = from; }
+
+// This overload is used when k >= 1.
+template <typename T, typename U, size_t N>
+inline void CopyArray(const T(&from)[N], U(*to)[N]) {
+  internal::CopyArray(from, N, *to);
+}
+
+// This helper reduces code bloat.  If we instead put its logic inside
+// the previous CopyArray() function, arrays with different sizes
+// would lead to different copies of the template code.
+template <typename T, typename U>
+void CopyArray(const T* from, size_t size, U* to) {
+  for (size_t i = 0; i != size; i++) {
+    internal::CopyArray(from[i], to + i);
+  }
+}
+
+// The relation between an NativeArray object (see below) and the
+// native array it represents.
+// We use 2 different structs to allow non-copyable types to be used, as long
+// as RelationToSourceReference() is passed.
+struct RelationToSourceReference {};
+struct RelationToSourceCopy {};
+
+// Adapts a native array to a read-only STL-style container.  Instead
+// of the complete STL container concept, this adaptor only implements
+// members useful for Google Mock's container matchers.  New members
+// should be added as needed.  To simplify the implementation, we only
+// support Element being a raw type (i.e. having no top-level const or
+// reference modifier).  It's the client's responsibility to satisfy
+// this requirement.  Element can be an array type itself (hence
+// multi-dimensional arrays are supported).
+template <typename Element>
+class NativeArray {
+ public:
+  // STL-style container typedefs.
+  typedef Element value_type;
+  typedef Element* iterator;
+  typedef const Element* const_iterator;
+
+  // Constructs from a native array. References the source.
+  NativeArray(const Element* array, size_t count, RelationToSourceReference) {
+    InitRef(array, count);
+  }
+
+  // Constructs from a native array. Copies the source.
+  NativeArray(const Element* array, size_t count, RelationToSourceCopy) {
+    InitCopy(array, count);
+  }
+
+  // Copy constructor.
+  NativeArray(const NativeArray& rhs) {
+    (this->*rhs.clone_)(rhs.array_, rhs.size_);
+  }
+
+  ~NativeArray() {
+    if (clone_ != &NativeArray::InitRef)
+      delete[] array_;
+  }
+
+  // STL-style container methods.
+  size_t size() const { return size_; }
+  const_iterator begin() const { return array_; }
+  const_iterator end() const { return array_ + size_; }
+  bool operator==(const NativeArray& rhs) const {
+    return size() == rhs.size() &&
+        ArrayEq(begin(), size(), rhs.begin());
+  }
+
+ private:
+  enum {
+    kCheckTypeIsNotConstOrAReference = StaticAssertTypeEqHelper<
+        Element, GTEST_REMOVE_REFERENCE_AND_CONST_(Element)>::value,
+  };
+
+  // Initializes this object with a copy of the input.
+  void InitCopy(const Element* array, size_t a_size) {
+    Element* const copy = new Element[a_size];
+    CopyArray(array, a_size, copy);
+    array_ = copy;
+    size_ = a_size;
+    clone_ = &NativeArray::InitCopy;
+  }
+
+  // Initializes this object with a reference of the input.
+  void InitRef(const Element* array, size_t a_size) {
+    array_ = array;
+    size_ = a_size;
+    clone_ = &NativeArray::InitRef;
+  }
+
+  const Element* array_;
+  size_t size_;
+  void (NativeArray::*clone_)(const Element*, size_t);
+
+  GTEST_DISALLOW_ASSIGN_(NativeArray);
+};
+
+}  // namespace internal
+}  // namespace testing
+
+#define GTEST_MESSAGE_AT_(file, line, message, result_type) \
+  ::testing::internal::AssertHelper(result_type, file, line, message) \
+    = ::testing::Message()
+
+#define GTEST_MESSAGE_(message, result_type) \
+  GTEST_MESSAGE_AT_(__FILE__, __LINE__, message, result_type)
+
+#define GTEST_FATAL_FAILURE_(message) \
+  return GTEST_MESSAGE_(message, ::testing::TestPartResult::kFatalFailure)
+
+#define GTEST_NONFATAL_FAILURE_(message) \
+  GTEST_MESSAGE_(message, ::testing::TestPartResult::kNonFatalFailure)
+
+#define GTEST_SUCCESS_(message) \
+  GTEST_MESSAGE_(message, ::testing::TestPartResult::kSuccess)
+
+// Suppresses MSVC warnings 4072 (unreachable code) for the code following
+// statement if it returns or throws (or doesn't return or throw in some
+// situations).
+#define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \
+  if (::testing::internal::AlwaysTrue()) { statement; }
+
+#define GTEST_TEST_THROW_(statement, expected_exception, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::ConstCharPtr gtest_msg = "") { \
+    bool gtest_caught_expected = false; \
+    try { \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    } \
+    catch (expected_exception const&) { \
+      gtest_caught_expected = true; \
+    } \
+    catch (...) { \
+      gtest_msg.value = \
+          "Expected: " #statement " throws an exception of type " \
+          #expected_exception ".\n  Actual: it throws a different type."; \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
+    } \
+    if (!gtest_caught_expected) { \
+      gtest_msg.value = \
+          "Expected: " #statement " throws an exception of type " \
+          #expected_exception ".\n  Actual: it throws nothing."; \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__): \
+      fail(gtest_msg.value)
+
+#define GTEST_TEST_NO_THROW_(statement, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+    try { \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    } \
+    catch (...) { \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \
+      fail("Expected: " #statement " doesn't throw an exception.\n" \
+           "  Actual: it throws.")
+
+#define GTEST_TEST_ANY_THROW_(statement, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+    bool gtest_caught_any = false; \
+    try { \
+      GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    } \
+    catch (...) { \
+      gtest_caught_any = true; \
+    } \
+    if (!gtest_caught_any) { \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__): \
+      fail("Expected: " #statement " throws an exception.\n" \
+           "  Actual: it doesn't.")
+
+
+// Implements Boolean test assertions such as EXPECT_TRUE. expression can be
+// either a boolean expression or an AssertionResult. text is a textual
+// represenation of expression as it was passed into the EXPECT_TRUE.
+#define GTEST_TEST_BOOLEAN_(expression, text, actual, expected, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (const ::testing::AssertionResult gtest_ar_ = \
+      ::testing::AssertionResult(expression)) \
+    ; \
+  else \
+    fail(::testing::internal::GetBoolAssertionFailureMessage(\
+        gtest_ar_, text, #actual, #expected).c_str())
+
+#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail) \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+  if (::testing::internal::AlwaysTrue()) { \
+    ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
+    if (gtest_fatal_failure_checker.has_new_fatal_failure()) { \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__); \
+    } \
+  } else \
+    GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__): \
+      fail("Expected: " #statement " doesn't generate new fatal " \
+           "failures in the current thread.\n" \
+           "  Actual: it does.")
+
+// Expands to the name of the class that implements the given test.
+#define GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \
+  test_case_name##_##test_name##_Test
+
+// Helper macro for defining tests.
+#define GTEST_TEST_(test_case_name, test_name, parent_class, parent_id)\
+class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\
+ public:\
+  GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\
+ private:\
+  virtual void TestBody();\
+  static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(\
+      GTEST_TEST_CLASS_NAME_(test_case_name, test_name));\
+};\
+\
+::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_case_name, test_name)\
+  ::test_info_ =\
+    ::testing::internal::MakeAndRegisterTestInfo(\
+        #test_case_name, #test_name, NULL, NULL, \
+        ::testing::internal::CodeLocation(__FILE__, __LINE__), \
+        (parent_id), \
+        parent_class::SetUpTestCase, \
+        parent_class::TearDownTestCase, \
+        new ::testing::internal::TestFactoryImpl<\
+            GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\
+void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody()
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
+
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-linked_ptr.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-linked_ptr.h
new file mode 100644
index 0000000000..3602942217
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-linked_ptr.h
@@ -0,0 +1,243 @@
+// Copyright 2003 Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: Dan Egnor (egnor@google.com)
+//
+// A "smart" pointer type with reference tracking.  Every pointer to a
+// particular object is kept on a circular linked list.  When the last pointer
+// to an object is destroyed or reassigned, the object is deleted.
+//
+// Used properly, this deletes the object when the last reference goes away.
+// There are several caveats:
+// - Like all reference counting schemes, cycles lead to leaks.
+// - Each smart pointer is actually two pointers (8 bytes instead of 4).
+// - Every time a pointer is assigned, the entire list of pointers to that
+//   object is traversed.  This class is therefore NOT SUITABLE when there
+//   will often be more than two or three pointers to a particular object.
+// - References are only tracked as long as linked_ptr<> objects are copied.
+//   If a linked_ptr<> is converted to a raw pointer and back, BAD THINGS
+//   will happen (double deletion).
+//
+// A good use of this class is storing object references in STL containers.
+// You can safely put linked_ptr<> in a vector<>.
+// Other uses may not be as good.
+//
+// Note: If you use an incomplete type with linked_ptr<>, the class
+// *containing* linked_ptr<> must have a constructor and destructor (even
+// if they do nothing!).
+//
+// Bill Gibbons suggested we use something like this.
+//
+// Thread Safety:
+//   Unlike other linked_ptr implementations, in this implementation
+//   a linked_ptr object is thread-safe in the sense that:
+//     - it's safe to copy linked_ptr objects concurrently,
+//     - it's safe to copy *from* a linked_ptr and read its underlying
+//       raw pointer (e.g. via get()) concurrently, and
+//     - it's safe to write to two linked_ptrs that point to the same
+//       shared object concurrently.
+// TODO(wan@google.com): rename this to safe_linked_ptr to avoid
+// confusion with normal linked_ptr.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_
+
+#include <stdlib.h>
+#include <assert.h>
+
+#include "gtest/internal/gtest-port.h"
+
+namespace testing {
+namespace internal {
+
+// Protects copying of all linked_ptr objects.
+GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_linked_ptr_mutex);
+
+// This is used internally by all instances of linked_ptr<>.  It needs to be
+// a non-template class because different types of linked_ptr<> can refer to
+// the same object (linked_ptr<Superclass>(obj) vs linked_ptr<Subclass>(obj)).
+// So, it needs to be possible for different types of linked_ptr to participate
+// in the same circular linked list, so we need a single class type here.
+//
+// DO NOT USE THIS CLASS DIRECTLY YOURSELF.  Use linked_ptr<T>.
+class linked_ptr_internal {
+ public:
+  // Create a new circle that includes only this instance.
+  void join_new() {
+    next_ = this;
+  }
+
+  // Many linked_ptr operations may change p.link_ for some linked_ptr
+  // variable p in the same circle as this object.  Therefore we need
+  // to prevent two such operations from occurring concurrently.
+  //
+  // Note that different types of linked_ptr objects can coexist in a
+  // circle (e.g. linked_ptr<Base>, linked_ptr<Derived1>, and
+  // linked_ptr<Derived2>).  Therefore we must use a single mutex to
+  // protect all linked_ptr objects.  This can create serious
+  // contention in production code, but is acceptable in a testing
+  // framework.
+
+  // Join an existing circle.
+  void join(linked_ptr_internal const* ptr)
+      GTEST_LOCK_EXCLUDED_(g_linked_ptr_mutex) {
+    MutexLock lock(&g_linked_ptr_mutex);
+
+    linked_ptr_internal const* p = ptr;
+    while (p->next_ != ptr) {
+      assert(p->next_ != this &&
+             "Trying to join() a linked ring we are already in. "
+             "Is GMock thread safety enabled?");
+      p = p->next_;
+    }
+    p->next_ = this;
+    next_ = ptr;
+  }
+
+  // Leave whatever circle we're part of.  Returns true if we were the
+  // last member of the circle.  Once this is done, you can join() another.
+  bool depart()
+      GTEST_LOCK_EXCLUDED_(g_linked_ptr_mutex) {
+    MutexLock lock(&g_linked_ptr_mutex);
+
+    if (next_ == this) return true;
+    linked_ptr_internal const* p = next_;
+    while (p->next_ != this) {
+      assert(p->next_ != next_ &&
+             "Trying to depart() a linked ring we are not in. "
+             "Is GMock thread safety enabled?");
+      p = p->next_;
+    }
+    p->next_ = next_;
+    return false;
+  }
+
+ private:
+  mutable linked_ptr_internal const* next_;
+};
+
+template <typename T>
+class linked_ptr {
+ public:
+  typedef T element_type;
+
+  // Take over ownership of a raw pointer.  This should happen as soon as
+  // possible after the object is created.
+  explicit linked_ptr(T* ptr = NULL) { capture(ptr); }
+  ~linked_ptr() { depart(); }
+
+  // Copy an existing linked_ptr<>, adding ourselves to the list of references.
+  template <typename U> linked_ptr(linked_ptr<U> const& ptr) { copy(&ptr); }
+  linked_ptr(linked_ptr const& ptr) {  // NOLINT
+    assert(&ptr != this);
+    copy(&ptr);
+  }
+
+  // Assignment releases the old value and acquires the new.
+  template <typename U> linked_ptr& operator=(linked_ptr<U> const& ptr) {
+    depart();
+    copy(&ptr);
+    return *this;
+  }
+
+  linked_ptr& operator=(linked_ptr const& ptr) {
+    if (&ptr != this) {
+      depart();
+      copy(&ptr);
+    }
+    return *this;
+  }
+
+  // Smart pointer members.
+  void reset(T* ptr = NULL) {
+    depart();
+    capture(ptr);
+  }
+  T* get() const { return value_; }
+  T* operator->() const { return value_; }
+  T& operator*() const { return *value_; }
+
+  bool operator==(T* p) const { return value_ == p; }
+  bool operator!=(T* p) const { return value_ != p; }
+  template <typename U>
+  bool operator==(linked_ptr<U> const& ptr) const {
+    return value_ == ptr.get();
+  }
+  template <typename U>
+  bool operator!=(linked_ptr<U> const& ptr) const {
+    return value_ != ptr.get();
+  }
+
+ private:
+  template <typename U>
+  friend class linked_ptr;
+
+  T* value_;
+  linked_ptr_internal link_;
+
+  void depart() {
+    if (link_.depart()) delete value_;
+  }
+
+  void capture(T* ptr) {
+    value_ = ptr;
+    link_.join_new();
+  }
+
+  template <typename U> void copy(linked_ptr<U> const* ptr) {
+    value_ = ptr->get();
+    if (value_)
+      link_.join(&ptr->link_);
+    else
+      link_.join_new();
+  }
+};
+
+template<typename T> inline
+bool operator==(T* ptr, const linked_ptr<T>& x) {
+  return ptr == x.get();
+}
+
+template<typename T> inline
+bool operator!=(T* ptr, const linked_ptr<T>& x) {
+  return ptr != x.get();
+}
+
+// A function to convert T* into linked_ptr<T>
+// Doing e.g. make_linked_ptr(new FooBarBaz<type>(arg)) is a shorter notation
+// for linked_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg))
+template <typename T>
+linked_ptr<T> make_linked_ptr(T* ptr) {
+  return linked_ptr<T>(ptr);
+}
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-param-util-generated.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-param-util-generated.h
new file mode 100644
index 0000000000..4d1d81d20f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-param-util-generated.h
@@ -0,0 +1,5146 @@
+// This file was GENERATED by command:
+//     pump.py gtest-param-util-generated.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+
+// Type and function utilities for implementing parameterized tests.
+// This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+// Currently Google Test supports at most 50 arguments in Values,
+// and at most 10 arguments in Combine. Please contact
+// googletestframework@googlegroups.com if you need more.
+// Please note that the number of arguments to Combine is limited
+// by the maximum arity of the implementation of tuple which is
+// currently set at 10.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
+
+// scripts/fuse_gtest.py depends on gtest's own header being #included
+// *unconditionally*.  Therefore these #includes cannot be moved
+// inside #if GTEST_HAS_PARAM_TEST.
+#include "gtest/internal/gtest-param-util.h"
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+namespace testing {
+
+// Forward declarations of ValuesIn(), which is implemented in
+// include/gtest/gtest-param-test.h.
+template <typename ForwardIterator>
+internal::ParamGenerator<
+  typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
+ValuesIn(ForwardIterator begin, ForwardIterator end);
+
+template <typename T, size_t N>
+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]);
+
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container);
+
+namespace internal {
+
+// Used in the Values() function to provide polymorphic capabilities.
+template <typename T1>
+class ValueArray1 {
+ public:
+  explicit ValueArray1(T1 v1) : v1_(v1) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray1& other);
+
+  const T1 v1_;
+};
+
+template <typename T1, typename T2>
+class ValueArray2 {
+ public:
+  ValueArray2(T1 v1, T2 v2) : v1_(v1), v2_(v2) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray2& other);
+
+  const T1 v1_;
+  const T2 v2_;
+};
+
+template <typename T1, typename T2, typename T3>
+class ValueArray3 {
+ public:
+  ValueArray3(T1 v1, T2 v2, T3 v3) : v1_(v1), v2_(v2), v3_(v3) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray3& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4>
+class ValueArray4 {
+ public:
+  ValueArray4(T1 v1, T2 v2, T3 v3, T4 v4) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray4& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+class ValueArray5 {
+ public:
+  ValueArray5(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4), v5_(v5) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray5& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+class ValueArray6 {
+ public:
+  ValueArray6(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6) : v1_(v1), v2_(v2),
+      v3_(v3), v4_(v4), v5_(v5), v6_(v6) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray6& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+class ValueArray7 {
+ public:
+  ValueArray7(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7) : v1_(v1),
+      v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray7& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+class ValueArray8 {
+ public:
+  ValueArray8(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+      T8 v8) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray8& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+class ValueArray9 {
+ public:
+  ValueArray9(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8,
+      T9 v9) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray9& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+class ValueArray10 {
+ public:
+  ValueArray10(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray10& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11>
+class ValueArray11 {
+ public:
+  ValueArray11(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6),
+      v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray11& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12>
+class ValueArray12 {
+ public:
+  ValueArray12(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5),
+      v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray12& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13>
+class ValueArray13 {
+ public:
+  ValueArray13(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13) : v1_(v1), v2_(v2), v3_(v3), v4_(v4),
+      v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11),
+      v12_(v12), v13_(v13) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray13& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14>
+class ValueArray14 {
+ public:
+  ValueArray14(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray14& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15>
+class ValueArray15 {
+ public:
+  ValueArray15(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15) : v1_(v1), v2_(v2),
+      v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray15& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16>
+class ValueArray16 {
+ public:
+  ValueArray16(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16) : v1_(v1),
+      v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9),
+      v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15),
+      v16_(v16) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray16& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17>
+class ValueArray17 {
+ public:
+  ValueArray17(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16,
+      T17 v17) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray17& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18>
+class ValueArray18 {
+ public:
+  ValueArray18(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray18& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19>
+class ValueArray19 {
+ public:
+  ValueArray19(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6),
+      v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13),
+      v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray19& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20>
+class ValueArray20 {
+ public:
+  ValueArray20(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5),
+      v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12),
+      v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18),
+      v19_(v19), v20_(v20) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray20& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21>
+class ValueArray21 {
+ public:
+  ValueArray21(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21) : v1_(v1), v2_(v2), v3_(v3), v4_(v4),
+      v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11),
+      v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17),
+      v18_(v18), v19_(v19), v20_(v20), v21_(v21) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray21& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22>
+class ValueArray22 {
+ public:
+  ValueArray22(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray22& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23>
+class ValueArray23 {
+ public:
+  ValueArray23(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23) : v1_(v1), v2_(v2),
+      v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray23& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24>
+class ValueArray24 {
+ public:
+  ValueArray24(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24) : v1_(v1),
+      v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9),
+      v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15),
+      v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21),
+      v22_(v22), v23_(v23), v24_(v24) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray24& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25>
+class ValueArray25 {
+ public:
+  ValueArray25(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24,
+      T25 v25) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray25& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26>
+class ValueArray26 {
+ public:
+  ValueArray26(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray26& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27>
+class ValueArray27 {
+ public:
+  ValueArray27(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6),
+      v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13),
+      v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19),
+      v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25),
+      v26_(v26), v27_(v27) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray27& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28>
+class ValueArray28 {
+ public:
+  ValueArray28(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5),
+      v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12),
+      v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18),
+      v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24),
+      v25_(v25), v26_(v26), v27_(v27), v28_(v28) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray28& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29>
+class ValueArray29 {
+ public:
+  ValueArray29(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29) : v1_(v1), v2_(v2), v3_(v3), v4_(v4),
+      v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11),
+      v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17),
+      v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23),
+      v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray29& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30>
+class ValueArray30 {
+ public:
+  ValueArray30(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28),
+      v29_(v29), v30_(v30) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray30& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31>
+class ValueArray31 {
+ public:
+  ValueArray31(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31) : v1_(v1), v2_(v2),
+      v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28),
+      v29_(v29), v30_(v30), v31_(v31) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray31& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32>
+class ValueArray32 {
+ public:
+  ValueArray32(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32) : v1_(v1),
+      v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9),
+      v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15),
+      v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21),
+      v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27),
+      v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray32& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33>
+class ValueArray33 {
+ public:
+  ValueArray33(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32,
+      T33 v33) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26),
+      v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32),
+      v33_(v33) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray33& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34>
+class ValueArray34 {
+ public:
+  ValueArray34(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26),
+      v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32),
+      v33_(v33), v34_(v34) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray34& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35>
+class ValueArray35 {
+ public:
+  ValueArray35(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6),
+      v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13),
+      v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19),
+      v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25),
+      v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31),
+      v32_(v32), v33_(v33), v34_(v34), v35_(v35) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray35& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36>
+class ValueArray36 {
+ public:
+  ValueArray36(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5),
+      v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12),
+      v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18),
+      v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24),
+      v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30),
+      v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35), v36_(v36) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray36& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37>
+class ValueArray37 {
+ public:
+  ValueArray37(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37) : v1_(v1), v2_(v2), v3_(v3), v4_(v4),
+      v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11),
+      v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17),
+      v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23),
+      v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29),
+      v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35),
+      v36_(v36), v37_(v37) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray37& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38>
+class ValueArray38 {
+ public:
+  ValueArray38(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28),
+      v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34),
+      v35_(v35), v36_(v36), v37_(v37), v38_(v38) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray38& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39>
+class ValueArray39 {
+ public:
+  ValueArray39(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39) : v1_(v1), v2_(v2),
+      v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28),
+      v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34),
+      v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray39& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40>
+class ValueArray40 {
+ public:
+  ValueArray40(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40) : v1_(v1),
+      v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9),
+      v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15),
+      v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21),
+      v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27),
+      v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33),
+      v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39),
+      v40_(v40) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray40& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41>
+class ValueArray41 {
+ public:
+  ValueArray41(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40,
+      T41 v41) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26),
+      v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32),
+      v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38),
+      v39_(v39), v40_(v40), v41_(v41) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray41& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42>
+class ValueArray42 {
+ public:
+  ValueArray42(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26),
+      v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32),
+      v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38),
+      v39_(v39), v40_(v40), v41_(v41), v42_(v42) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray42& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43>
+class ValueArray43 {
+ public:
+  ValueArray43(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6),
+      v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13),
+      v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19),
+      v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25),
+      v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31),
+      v32_(v32), v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37),
+      v38_(v38), v39_(v39), v40_(v40), v41_(v41), v42_(v42), v43_(v43) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray43& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44>
+class ValueArray44 {
+ public:
+  ValueArray44(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5),
+      v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12),
+      v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18),
+      v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24),
+      v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30),
+      v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35), v36_(v36),
+      v37_(v37), v38_(v38), v39_(v39), v40_(v40), v41_(v41), v42_(v42),
+      v43_(v43), v44_(v44) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray44& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45>
+class ValueArray45 {
+ public:
+  ValueArray45(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44, T45 v45) : v1_(v1), v2_(v2), v3_(v3), v4_(v4),
+      v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11),
+      v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17),
+      v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23),
+      v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29),
+      v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35),
+      v36_(v36), v37_(v37), v38_(v38), v39_(v39), v40_(v40), v41_(v41),
+      v42_(v42), v43_(v43), v44_(v44), v45_(v45) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
+        static_cast<T>(v45_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray45& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+  const T45 v45_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46>
+class ValueArray46 {
+ public:
+  ValueArray46(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44, T45 v45, T46 v46) : v1_(v1), v2_(v2), v3_(v3),
+      v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28),
+      v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34),
+      v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39), v40_(v40),
+      v41_(v41), v42_(v42), v43_(v43), v44_(v44), v45_(v45), v46_(v46) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
+        static_cast<T>(v45_), static_cast<T>(v46_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray46& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+  const T45 v45_;
+  const T46 v46_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47>
+class ValueArray47 {
+ public:
+  ValueArray47(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47) : v1_(v1), v2_(v2),
+      v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10),
+      v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16),
+      v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22),
+      v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28),
+      v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34),
+      v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39), v40_(v40),
+      v41_(v41), v42_(v42), v43_(v43), v44_(v44), v45_(v45), v46_(v46),
+      v47_(v47) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
+        static_cast<T>(v45_), static_cast<T>(v46_), static_cast<T>(v47_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray47& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+  const T45 v45_;
+  const T46 v46_;
+  const T47 v47_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48>
+class ValueArray48 {
+ public:
+  ValueArray48(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, T48 v48) : v1_(v1),
+      v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9),
+      v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15),
+      v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21),
+      v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27),
+      v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33),
+      v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39),
+      v40_(v40), v41_(v41), v42_(v42), v43_(v43), v44_(v44), v45_(v45),
+      v46_(v46), v47_(v47), v48_(v48) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
+        static_cast<T>(v45_), static_cast<T>(v46_), static_cast<T>(v47_),
+        static_cast<T>(v48_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray48& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+  const T45 v45_;
+  const T46 v46_;
+  const T47 v47_;
+  const T48 v48_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49>
+class ValueArray49 {
+ public:
+  ValueArray49(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, T48 v48,
+      T49 v49) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26),
+      v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32),
+      v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38),
+      v39_(v39), v40_(v40), v41_(v41), v42_(v42), v43_(v43), v44_(v44),
+      v45_(v45), v46_(v46), v47_(v47), v48_(v48), v49_(v49) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
+        static_cast<T>(v45_), static_cast<T>(v46_), static_cast<T>(v47_),
+        static_cast<T>(v48_), static_cast<T>(v49_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray49& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+  const T45 v45_;
+  const T46 v46_;
+  const T47 v47_;
+  const T48 v48_;
+  const T49 v49_;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49, typename T50>
+class ValueArray50 {
+ public:
+  ValueArray50(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+      T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+      T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+      T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+      T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+      T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, T48 v48, T49 v49,
+      T50 v50) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7),
+      v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14),
+      v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20),
+      v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26),
+      v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32),
+      v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38),
+      v39_(v39), v40_(v40), v41_(v41), v42_(v42), v43_(v43), v44_(v44),
+      v45_(v45), v46_(v46), v47_(v47), v48_(v48), v49_(v49), v50_(v50) {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {static_cast<T>(v1_), static_cast<T>(v2_),
+        static_cast<T>(v3_), static_cast<T>(v4_), static_cast<T>(v5_),
+        static_cast<T>(v6_), static_cast<T>(v7_), static_cast<T>(v8_),
+        static_cast<T>(v9_), static_cast<T>(v10_), static_cast<T>(v11_),
+        static_cast<T>(v12_), static_cast<T>(v13_), static_cast<T>(v14_),
+        static_cast<T>(v15_), static_cast<T>(v16_), static_cast<T>(v17_),
+        static_cast<T>(v18_), static_cast<T>(v19_), static_cast<T>(v20_),
+        static_cast<T>(v21_), static_cast<T>(v22_), static_cast<T>(v23_),
+        static_cast<T>(v24_), static_cast<T>(v25_), static_cast<T>(v26_),
+        static_cast<T>(v27_), static_cast<T>(v28_), static_cast<T>(v29_),
+        static_cast<T>(v30_), static_cast<T>(v31_), static_cast<T>(v32_),
+        static_cast<T>(v33_), static_cast<T>(v34_), static_cast<T>(v35_),
+        static_cast<T>(v36_), static_cast<T>(v37_), static_cast<T>(v38_),
+        static_cast<T>(v39_), static_cast<T>(v40_), static_cast<T>(v41_),
+        static_cast<T>(v42_), static_cast<T>(v43_), static_cast<T>(v44_),
+        static_cast<T>(v45_), static_cast<T>(v46_), static_cast<T>(v47_),
+        static_cast<T>(v48_), static_cast<T>(v49_), static_cast<T>(v50_)};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray50& other);
+
+  const T1 v1_;
+  const T2 v2_;
+  const T3 v3_;
+  const T4 v4_;
+  const T5 v5_;
+  const T6 v6_;
+  const T7 v7_;
+  const T8 v8_;
+  const T9 v9_;
+  const T10 v10_;
+  const T11 v11_;
+  const T12 v12_;
+  const T13 v13_;
+  const T14 v14_;
+  const T15 v15_;
+  const T16 v16_;
+  const T17 v17_;
+  const T18 v18_;
+  const T19 v19_;
+  const T20 v20_;
+  const T21 v21_;
+  const T22 v22_;
+  const T23 v23_;
+  const T24 v24_;
+  const T25 v25_;
+  const T26 v26_;
+  const T27 v27_;
+  const T28 v28_;
+  const T29 v29_;
+  const T30 v30_;
+  const T31 v31_;
+  const T32 v32_;
+  const T33 v33_;
+  const T34 v34_;
+  const T35 v35_;
+  const T36 v36_;
+  const T37 v37_;
+  const T38 v38_;
+  const T39 v39_;
+  const T40 v40_;
+  const T41 v41_;
+  const T42 v42_;
+  const T43 v43_;
+  const T44 v44_;
+  const T45 v45_;
+  const T46 v46_;
+  const T47 v47_;
+  const T48 v48_;
+  const T49 v49_;
+  const T50 v50_;
+};
+
+# if GTEST_HAS_COMBINE
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Generates values from the Cartesian product of values produced
+// by the argument generators.
+//
+template <typename T1, typename T2>
+class CartesianProductGenerator2
+    : public ParamGeneratorInterface< ::testing::tuple<T1, T2> > {
+ public:
+  typedef ::testing::tuple<T1, T2> ParamType;
+
+  CartesianProductGenerator2(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2)
+      : g1_(g1), g2_(g2) {}
+  virtual ~CartesianProductGenerator2() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current2_;
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator2::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator2& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+};  // class CartesianProductGenerator2
+
+
+template <typename T1, typename T2, typename T3>
+class CartesianProductGenerator3
+    : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3> > {
+ public:
+  typedef ::testing::tuple<T1, T2, T3> ParamType;
+
+  CartesianProductGenerator3(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3)
+      : g1_(g1), g2_(g2), g3_(g3) {}
+  virtual ~CartesianProductGenerator3() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current3_;
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator3::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator3& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+};  // class CartesianProductGenerator3
+
+
+template <typename T1, typename T2, typename T3, typename T4>
+class CartesianProductGenerator4
+    : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4> > {
+ public:
+  typedef ::testing::tuple<T1, T2, T3, T4> ParamType;
+
+  CartesianProductGenerator4(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4) {}
+  virtual ~CartesianProductGenerator4() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current4_;
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator4::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator4& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+};  // class CartesianProductGenerator4
+
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+class CartesianProductGenerator5
+    : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4, T5> > {
+ public:
+  typedef ::testing::tuple<T1, T2, T3, T4, T5> ParamType;
+
+  CartesianProductGenerator5(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4, const ParamGenerator<T5>& g5)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5) {}
+  virtual ~CartesianProductGenerator5() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end(), g5_, g5_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4,
+      const ParamGenerator<T5>& g5,
+      const typename ParamGenerator<T5>::iterator& current5)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4),
+          begin5_(g5.begin()), end5_(g5.end()), current5_(current5)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current5_;
+      if (current5_ == end5_) {
+        current5_ = begin5_;
+        ++current4_;
+      }
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_ &&
+          current5_ == typed_other->current5_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_),
+        begin5_(other.begin5_),
+        end5_(other.end5_),
+        current5_(other.current5_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_, *current5_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_ ||
+          current5_ == end5_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    const typename ParamGenerator<T5>::iterator begin5_;
+    const typename ParamGenerator<T5>::iterator end5_;
+    typename ParamGenerator<T5>::iterator current5_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator5::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator5& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+  const ParamGenerator<T5> g5_;
+};  // class CartesianProductGenerator5
+
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+class CartesianProductGenerator6
+    : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4, T5,
+        T6> > {
+ public:
+  typedef ::testing::tuple<T1, T2, T3, T4, T5, T6> ParamType;
+
+  CartesianProductGenerator6(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4, const ParamGenerator<T5>& g5,
+      const ParamGenerator<T6>& g6)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6) {}
+  virtual ~CartesianProductGenerator6() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4,
+      const ParamGenerator<T5>& g5,
+      const typename ParamGenerator<T5>::iterator& current5,
+      const ParamGenerator<T6>& g6,
+      const typename ParamGenerator<T6>::iterator& current6)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4),
+          begin5_(g5.begin()), end5_(g5.end()), current5_(current5),
+          begin6_(g6.begin()), end6_(g6.end()), current6_(current6)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current6_;
+      if (current6_ == end6_) {
+        current6_ = begin6_;
+        ++current5_;
+      }
+      if (current5_ == end5_) {
+        current5_ = begin5_;
+        ++current4_;
+      }
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_ &&
+          current5_ == typed_other->current5_ &&
+          current6_ == typed_other->current6_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_),
+        begin5_(other.begin5_),
+        end5_(other.end5_),
+        current5_(other.current5_),
+        begin6_(other.begin6_),
+        end6_(other.end6_),
+        current6_(other.current6_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_, *current5_, *current6_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_ ||
+          current5_ == end5_ ||
+          current6_ == end6_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    const typename ParamGenerator<T5>::iterator begin5_;
+    const typename ParamGenerator<T5>::iterator end5_;
+    typename ParamGenerator<T5>::iterator current5_;
+    const typename ParamGenerator<T6>::iterator begin6_;
+    const typename ParamGenerator<T6>::iterator end6_;
+    typename ParamGenerator<T6>::iterator current6_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator6::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator6& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+  const ParamGenerator<T5> g5_;
+  const ParamGenerator<T6> g6_;
+};  // class CartesianProductGenerator6
+
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+class CartesianProductGenerator7
+    : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4, T5, T6,
+        T7> > {
+ public:
+  typedef ::testing::tuple<T1, T2, T3, T4, T5, T6, T7> ParamType;
+
+  CartesianProductGenerator7(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4, const ParamGenerator<T5>& g5,
+      const ParamGenerator<T6>& g6, const ParamGenerator<T7>& g7)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7) {}
+  virtual ~CartesianProductGenerator7() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_,
+        g7_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4,
+      const ParamGenerator<T5>& g5,
+      const typename ParamGenerator<T5>::iterator& current5,
+      const ParamGenerator<T6>& g6,
+      const typename ParamGenerator<T6>::iterator& current6,
+      const ParamGenerator<T7>& g7,
+      const typename ParamGenerator<T7>::iterator& current7)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4),
+          begin5_(g5.begin()), end5_(g5.end()), current5_(current5),
+          begin6_(g6.begin()), end6_(g6.end()), current6_(current6),
+          begin7_(g7.begin()), end7_(g7.end()), current7_(current7)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current7_;
+      if (current7_ == end7_) {
+        current7_ = begin7_;
+        ++current6_;
+      }
+      if (current6_ == end6_) {
+        current6_ = begin6_;
+        ++current5_;
+      }
+      if (current5_ == end5_) {
+        current5_ = begin5_;
+        ++current4_;
+      }
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_ &&
+          current5_ == typed_other->current5_ &&
+          current6_ == typed_other->current6_ &&
+          current7_ == typed_other->current7_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_),
+        begin5_(other.begin5_),
+        end5_(other.end5_),
+        current5_(other.current5_),
+        begin6_(other.begin6_),
+        end6_(other.end6_),
+        current6_(other.current6_),
+        begin7_(other.begin7_),
+        end7_(other.end7_),
+        current7_(other.current7_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_, *current5_, *current6_, *current7_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_ ||
+          current5_ == end5_ ||
+          current6_ == end6_ ||
+          current7_ == end7_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    const typename ParamGenerator<T5>::iterator begin5_;
+    const typename ParamGenerator<T5>::iterator end5_;
+    typename ParamGenerator<T5>::iterator current5_;
+    const typename ParamGenerator<T6>::iterator begin6_;
+    const typename ParamGenerator<T6>::iterator end6_;
+    typename ParamGenerator<T6>::iterator current6_;
+    const typename ParamGenerator<T7>::iterator begin7_;
+    const typename ParamGenerator<T7>::iterator end7_;
+    typename ParamGenerator<T7>::iterator current7_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator7::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator7& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+  const ParamGenerator<T5> g5_;
+  const ParamGenerator<T6> g6_;
+  const ParamGenerator<T7> g7_;
+};  // class CartesianProductGenerator7
+
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+class CartesianProductGenerator8
+    : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4, T5, T6,
+        T7, T8> > {
+ public:
+  typedef ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8> ParamType;
+
+  CartesianProductGenerator8(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4, const ParamGenerator<T5>& g5,
+      const ParamGenerator<T6>& g6, const ParamGenerator<T7>& g7,
+      const ParamGenerator<T8>& g8)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7),
+          g8_(g8) {}
+  virtual ~CartesianProductGenerator8() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_,
+        g7_.begin(), g8_, g8_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end(), g8_,
+        g8_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4,
+      const ParamGenerator<T5>& g5,
+      const typename ParamGenerator<T5>::iterator& current5,
+      const ParamGenerator<T6>& g6,
+      const typename ParamGenerator<T6>::iterator& current6,
+      const ParamGenerator<T7>& g7,
+      const typename ParamGenerator<T7>::iterator& current7,
+      const ParamGenerator<T8>& g8,
+      const typename ParamGenerator<T8>::iterator& current8)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4),
+          begin5_(g5.begin()), end5_(g5.end()), current5_(current5),
+          begin6_(g6.begin()), end6_(g6.end()), current6_(current6),
+          begin7_(g7.begin()), end7_(g7.end()), current7_(current7),
+          begin8_(g8.begin()), end8_(g8.end()), current8_(current8)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current8_;
+      if (current8_ == end8_) {
+        current8_ = begin8_;
+        ++current7_;
+      }
+      if (current7_ == end7_) {
+        current7_ = begin7_;
+        ++current6_;
+      }
+      if (current6_ == end6_) {
+        current6_ = begin6_;
+        ++current5_;
+      }
+      if (current5_ == end5_) {
+        current5_ = begin5_;
+        ++current4_;
+      }
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_ &&
+          current5_ == typed_other->current5_ &&
+          current6_ == typed_other->current6_ &&
+          current7_ == typed_other->current7_ &&
+          current8_ == typed_other->current8_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_),
+        begin5_(other.begin5_),
+        end5_(other.end5_),
+        current5_(other.current5_),
+        begin6_(other.begin6_),
+        end6_(other.end6_),
+        current6_(other.current6_),
+        begin7_(other.begin7_),
+        end7_(other.end7_),
+        current7_(other.current7_),
+        begin8_(other.begin8_),
+        end8_(other.end8_),
+        current8_(other.current8_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_, *current5_, *current6_, *current7_, *current8_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_ ||
+          current5_ == end5_ ||
+          current6_ == end6_ ||
+          current7_ == end7_ ||
+          current8_ == end8_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    const typename ParamGenerator<T5>::iterator begin5_;
+    const typename ParamGenerator<T5>::iterator end5_;
+    typename ParamGenerator<T5>::iterator current5_;
+    const typename ParamGenerator<T6>::iterator begin6_;
+    const typename ParamGenerator<T6>::iterator end6_;
+    typename ParamGenerator<T6>::iterator current6_;
+    const typename ParamGenerator<T7>::iterator begin7_;
+    const typename ParamGenerator<T7>::iterator end7_;
+    typename ParamGenerator<T7>::iterator current7_;
+    const typename ParamGenerator<T8>::iterator begin8_;
+    const typename ParamGenerator<T8>::iterator end8_;
+    typename ParamGenerator<T8>::iterator current8_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator8::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator8& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+  const ParamGenerator<T5> g5_;
+  const ParamGenerator<T6> g6_;
+  const ParamGenerator<T7> g7_;
+  const ParamGenerator<T8> g8_;
+};  // class CartesianProductGenerator8
+
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+class CartesianProductGenerator9
+    : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4, T5, T6,
+        T7, T8, T9> > {
+ public:
+  typedef ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9> ParamType;
+
+  CartesianProductGenerator9(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4, const ParamGenerator<T5>& g5,
+      const ParamGenerator<T6>& g6, const ParamGenerator<T7>& g7,
+      const ParamGenerator<T8>& g8, const ParamGenerator<T9>& g9)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8),
+          g9_(g9) {}
+  virtual ~CartesianProductGenerator9() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_,
+        g7_.begin(), g8_, g8_.begin(), g9_, g9_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end(), g8_,
+        g8_.end(), g9_, g9_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4,
+      const ParamGenerator<T5>& g5,
+      const typename ParamGenerator<T5>::iterator& current5,
+      const ParamGenerator<T6>& g6,
+      const typename ParamGenerator<T6>::iterator& current6,
+      const ParamGenerator<T7>& g7,
+      const typename ParamGenerator<T7>::iterator& current7,
+      const ParamGenerator<T8>& g8,
+      const typename ParamGenerator<T8>::iterator& current8,
+      const ParamGenerator<T9>& g9,
+      const typename ParamGenerator<T9>::iterator& current9)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4),
+          begin5_(g5.begin()), end5_(g5.end()), current5_(current5),
+          begin6_(g6.begin()), end6_(g6.end()), current6_(current6),
+          begin7_(g7.begin()), end7_(g7.end()), current7_(current7),
+          begin8_(g8.begin()), end8_(g8.end()), current8_(current8),
+          begin9_(g9.begin()), end9_(g9.end()), current9_(current9)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current9_;
+      if (current9_ == end9_) {
+        current9_ = begin9_;
+        ++current8_;
+      }
+      if (current8_ == end8_) {
+        current8_ = begin8_;
+        ++current7_;
+      }
+      if (current7_ == end7_) {
+        current7_ = begin7_;
+        ++current6_;
+      }
+      if (current6_ == end6_) {
+        current6_ = begin6_;
+        ++current5_;
+      }
+      if (current5_ == end5_) {
+        current5_ = begin5_;
+        ++current4_;
+      }
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_ &&
+          current5_ == typed_other->current5_ &&
+          current6_ == typed_other->current6_ &&
+          current7_ == typed_other->current7_ &&
+          current8_ == typed_other->current8_ &&
+          current9_ == typed_other->current9_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_),
+        begin5_(other.begin5_),
+        end5_(other.end5_),
+        current5_(other.current5_),
+        begin6_(other.begin6_),
+        end6_(other.end6_),
+        current6_(other.current6_),
+        begin7_(other.begin7_),
+        end7_(other.end7_),
+        current7_(other.current7_),
+        begin8_(other.begin8_),
+        end8_(other.end8_),
+        current8_(other.current8_),
+        begin9_(other.begin9_),
+        end9_(other.end9_),
+        current9_(other.current9_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_, *current5_, *current6_, *current7_, *current8_,
+            *current9_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_ ||
+          current5_ == end5_ ||
+          current6_ == end6_ ||
+          current7_ == end7_ ||
+          current8_ == end8_ ||
+          current9_ == end9_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    const typename ParamGenerator<T5>::iterator begin5_;
+    const typename ParamGenerator<T5>::iterator end5_;
+    typename ParamGenerator<T5>::iterator current5_;
+    const typename ParamGenerator<T6>::iterator begin6_;
+    const typename ParamGenerator<T6>::iterator end6_;
+    typename ParamGenerator<T6>::iterator current6_;
+    const typename ParamGenerator<T7>::iterator begin7_;
+    const typename ParamGenerator<T7>::iterator end7_;
+    typename ParamGenerator<T7>::iterator current7_;
+    const typename ParamGenerator<T8>::iterator begin8_;
+    const typename ParamGenerator<T8>::iterator end8_;
+    typename ParamGenerator<T8>::iterator current8_;
+    const typename ParamGenerator<T9>::iterator begin9_;
+    const typename ParamGenerator<T9>::iterator end9_;
+    typename ParamGenerator<T9>::iterator current9_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator9::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator9& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+  const ParamGenerator<T5> g5_;
+  const ParamGenerator<T6> g6_;
+  const ParamGenerator<T7> g7_;
+  const ParamGenerator<T8> g8_;
+  const ParamGenerator<T9> g9_;
+};  // class CartesianProductGenerator9
+
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+class CartesianProductGenerator10
+    : public ParamGeneratorInterface< ::testing::tuple<T1, T2, T3, T4, T5, T6,
+        T7, T8, T9, T10> > {
+ public:
+  typedef ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> ParamType;
+
+  CartesianProductGenerator10(const ParamGenerator<T1>& g1,
+      const ParamGenerator<T2>& g2, const ParamGenerator<T3>& g3,
+      const ParamGenerator<T4>& g4, const ParamGenerator<T5>& g5,
+      const ParamGenerator<T6>& g6, const ParamGenerator<T7>& g7,
+      const ParamGenerator<T8>& g8, const ParamGenerator<T9>& g9,
+      const ParamGenerator<T10>& g10)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8),
+          g9_(g9), g10_(g10) {}
+  virtual ~CartesianProductGenerator10() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_,
+        g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_,
+        g7_.begin(), g8_, g8_.begin(), g9_, g9_.begin(), g10_, g10_.begin());
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(),
+        g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end(), g8_,
+        g8_.end(), g9_, g9_.end(), g10_, g10_.end());
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base,
+      const ParamGenerator<T1>& g1,
+      const typename ParamGenerator<T1>::iterator& current1,
+      const ParamGenerator<T2>& g2,
+      const typename ParamGenerator<T2>::iterator& current2,
+      const ParamGenerator<T3>& g3,
+      const typename ParamGenerator<T3>::iterator& current3,
+      const ParamGenerator<T4>& g4,
+      const typename ParamGenerator<T4>::iterator& current4,
+      const ParamGenerator<T5>& g5,
+      const typename ParamGenerator<T5>::iterator& current5,
+      const ParamGenerator<T6>& g6,
+      const typename ParamGenerator<T6>::iterator& current6,
+      const ParamGenerator<T7>& g7,
+      const typename ParamGenerator<T7>::iterator& current7,
+      const ParamGenerator<T8>& g8,
+      const typename ParamGenerator<T8>::iterator& current8,
+      const ParamGenerator<T9>& g9,
+      const typename ParamGenerator<T9>::iterator& current9,
+      const ParamGenerator<T10>& g10,
+      const typename ParamGenerator<T10>::iterator& current10)
+        : base_(base),
+          begin1_(g1.begin()), end1_(g1.end()), current1_(current1),
+          begin2_(g2.begin()), end2_(g2.end()), current2_(current2),
+          begin3_(g3.begin()), end3_(g3.end()), current3_(current3),
+          begin4_(g4.begin()), end4_(g4.end()), current4_(current4),
+          begin5_(g5.begin()), end5_(g5.end()), current5_(current5),
+          begin6_(g6.begin()), end6_(g6.end()), current6_(current6),
+          begin7_(g7.begin()), end7_(g7.end()), current7_(current7),
+          begin8_(g8.begin()), end8_(g8.end()), current8_(current8),
+          begin9_(g9.begin()), end9_(g9.end()), current9_(current9),
+          begin10_(g10.begin()), end10_(g10.end()), current10_(current10)    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current10_;
+      if (current10_ == end10_) {
+        current10_ = begin10_;
+        ++current9_;
+      }
+      if (current9_ == end9_) {
+        current9_ = begin9_;
+        ++current8_;
+      }
+      if (current8_ == end8_) {
+        current8_ = begin8_;
+        ++current7_;
+      }
+      if (current7_ == end7_) {
+        current7_ = begin7_;
+        ++current6_;
+      }
+      if (current6_ == end6_) {
+        current6_ = begin6_;
+        ++current5_;
+      }
+      if (current5_ == end5_) {
+        current5_ = begin5_;
+        ++current4_;
+      }
+      if (current4_ == end4_) {
+        current4_ = begin4_;
+        ++current3_;
+      }
+      if (current3_ == end3_) {
+        current3_ = begin3_;
+        ++current2_;
+      }
+      if (current2_ == end2_) {
+        current2_ = begin2_;
+        ++current1_;
+      }
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         (
+          current1_ == typed_other->current1_ &&
+          current2_ == typed_other->current2_ &&
+          current3_ == typed_other->current3_ &&
+          current4_ == typed_other->current4_ &&
+          current5_ == typed_other->current5_ &&
+          current6_ == typed_other->current6_ &&
+          current7_ == typed_other->current7_ &&
+          current8_ == typed_other->current8_ &&
+          current9_ == typed_other->current9_ &&
+          current10_ == typed_other->current10_);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_),
+        begin1_(other.begin1_),
+        end1_(other.end1_),
+        current1_(other.current1_),
+        begin2_(other.begin2_),
+        end2_(other.end2_),
+        current2_(other.current2_),
+        begin3_(other.begin3_),
+        end3_(other.end3_),
+        current3_(other.current3_),
+        begin4_(other.begin4_),
+        end4_(other.end4_),
+        current4_(other.current4_),
+        begin5_(other.begin5_),
+        end5_(other.end5_),
+        current5_(other.current5_),
+        begin6_(other.begin6_),
+        end6_(other.end6_),
+        current6_(other.current6_),
+        begin7_(other.begin7_),
+        end7_(other.end7_),
+        current7_(other.current7_),
+        begin8_(other.begin8_),
+        end8_(other.end8_),
+        current8_(other.current8_),
+        begin9_(other.begin9_),
+        end9_(other.end9_),
+        current9_(other.current9_),
+        begin10_(other.begin10_),
+        end10_(other.end10_),
+        current10_(other.current10_) {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType(*current1_, *current2_, *current3_,
+            *current4_, *current5_, *current6_, *current7_, *current8_,
+            *current9_, *current10_);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+          current1_ == end1_ ||
+          current2_ == end2_ ||
+          current3_ == end3_ ||
+          current4_ == end4_ ||
+          current5_ == end5_ ||
+          current6_ == end6_ ||
+          current7_ == end7_ ||
+          current8_ == end8_ ||
+          current9_ == end9_ ||
+          current10_ == end10_;
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+    const typename ParamGenerator<T1>::iterator begin1_;
+    const typename ParamGenerator<T1>::iterator end1_;
+    typename ParamGenerator<T1>::iterator current1_;
+    const typename ParamGenerator<T2>::iterator begin2_;
+    const typename ParamGenerator<T2>::iterator end2_;
+    typename ParamGenerator<T2>::iterator current2_;
+    const typename ParamGenerator<T3>::iterator begin3_;
+    const typename ParamGenerator<T3>::iterator end3_;
+    typename ParamGenerator<T3>::iterator current3_;
+    const typename ParamGenerator<T4>::iterator begin4_;
+    const typename ParamGenerator<T4>::iterator end4_;
+    typename ParamGenerator<T4>::iterator current4_;
+    const typename ParamGenerator<T5>::iterator begin5_;
+    const typename ParamGenerator<T5>::iterator end5_;
+    typename ParamGenerator<T5>::iterator current5_;
+    const typename ParamGenerator<T6>::iterator begin6_;
+    const typename ParamGenerator<T6>::iterator end6_;
+    typename ParamGenerator<T6>::iterator current6_;
+    const typename ParamGenerator<T7>::iterator begin7_;
+    const typename ParamGenerator<T7>::iterator end7_;
+    typename ParamGenerator<T7>::iterator current7_;
+    const typename ParamGenerator<T8>::iterator begin8_;
+    const typename ParamGenerator<T8>::iterator end8_;
+    typename ParamGenerator<T8>::iterator current8_;
+    const typename ParamGenerator<T9>::iterator begin9_;
+    const typename ParamGenerator<T9>::iterator end9_;
+    typename ParamGenerator<T9>::iterator current9_;
+    const typename ParamGenerator<T10>::iterator begin10_;
+    const typename ParamGenerator<T10>::iterator end10_;
+    typename ParamGenerator<T10>::iterator current10_;
+    ParamType current_value_;
+  };  // class CartesianProductGenerator10::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator10& other);
+
+  const ParamGenerator<T1> g1_;
+  const ParamGenerator<T2> g2_;
+  const ParamGenerator<T3> g3_;
+  const ParamGenerator<T4> g4_;
+  const ParamGenerator<T5> g5_;
+  const ParamGenerator<T6> g6_;
+  const ParamGenerator<T7> g7_;
+  const ParamGenerator<T8> g8_;
+  const ParamGenerator<T9> g9_;
+  const ParamGenerator<T10> g10_;
+};  // class CartesianProductGenerator10
+
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Helper classes providing Combine() with polymorphic features. They allow
+// casting CartesianProductGeneratorN<T> to ParamGenerator<U> if T is
+// convertible to U.
+//
+template <class Generator1, class Generator2>
+class CartesianProductHolder2 {
+ public:
+CartesianProductHolder2(const Generator1& g1, const Generator2& g2)
+      : g1_(g1), g2_(g2) {}
+  template <typename T1, typename T2>
+  operator ParamGenerator< ::testing::tuple<T1, T2> >() const {
+    return ParamGenerator< ::testing::tuple<T1, T2> >(
+        new CartesianProductGenerator2<T1, T2>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder2& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+};  // class CartesianProductHolder2
+
+template <class Generator1, class Generator2, class Generator3>
+class CartesianProductHolder3 {
+ public:
+CartesianProductHolder3(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3)
+      : g1_(g1), g2_(g2), g3_(g3) {}
+  template <typename T1, typename T2, typename T3>
+  operator ParamGenerator< ::testing::tuple<T1, T2, T3> >() const {
+    return ParamGenerator< ::testing::tuple<T1, T2, T3> >(
+        new CartesianProductGenerator3<T1, T2, T3>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder3& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+};  // class CartesianProductHolder3
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4>
+class CartesianProductHolder4 {
+ public:
+CartesianProductHolder4(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4) {}
+  template <typename T1, typename T2, typename T3, typename T4>
+  operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4> >() const {
+    return ParamGenerator< ::testing::tuple<T1, T2, T3, T4> >(
+        new CartesianProductGenerator4<T1, T2, T3, T4>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder4& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+};  // class CartesianProductHolder4
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4, class Generator5>
+class CartesianProductHolder5 {
+ public:
+CartesianProductHolder5(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4, const Generator5& g5)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5) {}
+  template <typename T1, typename T2, typename T3, typename T4, typename T5>
+  operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5> >() const {
+    return ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5> >(
+        new CartesianProductGenerator5<T1, T2, T3, T4, T5>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_),
+        static_cast<ParamGenerator<T5> >(g5_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder5& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+  const Generator5 g5_;
+};  // class CartesianProductHolder5
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4, class Generator5, class Generator6>
+class CartesianProductHolder6 {
+ public:
+CartesianProductHolder6(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4, const Generator5& g5,
+    const Generator6& g6)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6) {}
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+      typename T6>
+  operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6> >() const {
+    return ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6> >(
+        new CartesianProductGenerator6<T1, T2, T3, T4, T5, T6>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_),
+        static_cast<ParamGenerator<T5> >(g5_),
+        static_cast<ParamGenerator<T6> >(g6_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder6& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+  const Generator5 g5_;
+  const Generator6 g6_;
+};  // class CartesianProductHolder6
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4, class Generator5, class Generator6, class Generator7>
+class CartesianProductHolder7 {
+ public:
+CartesianProductHolder7(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4, const Generator5& g5,
+    const Generator6& g6, const Generator7& g7)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7) {}
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+      typename T6, typename T7>
+  operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6,
+      T7> >() const {
+    return ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7> >(
+        new CartesianProductGenerator7<T1, T2, T3, T4, T5, T6, T7>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_),
+        static_cast<ParamGenerator<T5> >(g5_),
+        static_cast<ParamGenerator<T6> >(g6_),
+        static_cast<ParamGenerator<T7> >(g7_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder7& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+  const Generator5 g5_;
+  const Generator6 g6_;
+  const Generator7 g7_;
+};  // class CartesianProductHolder7
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4, class Generator5, class Generator6, class Generator7,
+    class Generator8>
+class CartesianProductHolder8 {
+ public:
+CartesianProductHolder8(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4, const Generator5& g5,
+    const Generator6& g6, const Generator7& g7, const Generator8& g8)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7),
+          g8_(g8) {}
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+      typename T6, typename T7, typename T8>
+  operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7,
+      T8> >() const {
+    return ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8> >(
+        new CartesianProductGenerator8<T1, T2, T3, T4, T5, T6, T7, T8>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_),
+        static_cast<ParamGenerator<T5> >(g5_),
+        static_cast<ParamGenerator<T6> >(g6_),
+        static_cast<ParamGenerator<T7> >(g7_),
+        static_cast<ParamGenerator<T8> >(g8_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder8& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+  const Generator5 g5_;
+  const Generator6 g6_;
+  const Generator7 g7_;
+  const Generator8 g8_;
+};  // class CartesianProductHolder8
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4, class Generator5, class Generator6, class Generator7,
+    class Generator8, class Generator9>
+class CartesianProductHolder9 {
+ public:
+CartesianProductHolder9(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4, const Generator5& g5,
+    const Generator6& g6, const Generator7& g7, const Generator8& g8,
+    const Generator9& g9)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8),
+          g9_(g9) {}
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+      typename T6, typename T7, typename T8, typename T9>
+  operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
+      T9> >() const {
+    return ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8,
+        T9> >(
+        new CartesianProductGenerator9<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_),
+        static_cast<ParamGenerator<T5> >(g5_),
+        static_cast<ParamGenerator<T6> >(g6_),
+        static_cast<ParamGenerator<T7> >(g7_),
+        static_cast<ParamGenerator<T8> >(g8_),
+        static_cast<ParamGenerator<T9> >(g9_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder9& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+  const Generator5 g5_;
+  const Generator6 g6_;
+  const Generator7 g7_;
+  const Generator8 g8_;
+  const Generator9 g9_;
+};  // class CartesianProductHolder9
+
+template <class Generator1, class Generator2, class Generator3,
+    class Generator4, class Generator5, class Generator6, class Generator7,
+    class Generator8, class Generator9, class Generator10>
+class CartesianProductHolder10 {
+ public:
+CartesianProductHolder10(const Generator1& g1, const Generator2& g2,
+    const Generator3& g3, const Generator4& g4, const Generator5& g5,
+    const Generator6& g6, const Generator7& g7, const Generator8& g8,
+    const Generator9& g9, const Generator10& g10)
+      : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8),
+          g9_(g9), g10_(g10) {}
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+      typename T6, typename T7, typename T8, typename T9, typename T10>
+  operator ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9,
+      T10> >() const {
+    return ParamGenerator< ::testing::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9,
+        T10> >(
+        new CartesianProductGenerator10<T1, T2, T3, T4, T5, T6, T7, T8, T9,
+            T10>(
+        static_cast<ParamGenerator<T1> >(g1_),
+        static_cast<ParamGenerator<T2> >(g2_),
+        static_cast<ParamGenerator<T3> >(g3_),
+        static_cast<ParamGenerator<T4> >(g4_),
+        static_cast<ParamGenerator<T5> >(g5_),
+        static_cast<ParamGenerator<T6> >(g6_),
+        static_cast<ParamGenerator<T7> >(g7_),
+        static_cast<ParamGenerator<T8> >(g8_),
+        static_cast<ParamGenerator<T9> >(g9_),
+        static_cast<ParamGenerator<T10> >(g10_)));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder10& other);
+
+  const Generator1 g1_;
+  const Generator2 g2_;
+  const Generator3 g3_;
+  const Generator4 g4_;
+  const Generator5 g5_;
+  const Generator6 g6_;
+  const Generator7 g7_;
+  const Generator8 g8_;
+  const Generator9 g9_;
+  const Generator10 g10_;
+};  // class CartesianProductHolder10
+
+# endif  // GTEST_HAS_COMBINE
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  //  GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-param-util-generated.h.pump b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
new file mode 100644
index 0000000000..5c7c47af0b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
@@ -0,0 +1,286 @@
+$$ -*- mode: c++; -*-
+$var n = 50  $$ Maximum length of Values arguments we want to support.
+$var maxtuple = 10  $$ Maximum number of Combine arguments we want to support.
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+
+// Type and function utilities for implementing parameterized tests.
+// This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+// Currently Google Test supports at most $n arguments in Values,
+// and at most $maxtuple arguments in Combine. Please contact
+// googletestframework@googlegroups.com if you need more.
+// Please note that the number of arguments to Combine is limited
+// by the maximum arity of the implementation of tuple which is
+// currently set at $maxtuple.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
+
+// scripts/fuse_gtest.py depends on gtest's own header being #included
+// *unconditionally*.  Therefore these #includes cannot be moved
+// inside #if GTEST_HAS_PARAM_TEST.
+#include "gtest/internal/gtest-param-util.h"
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+namespace testing {
+
+// Forward declarations of ValuesIn(), which is implemented in
+// include/gtest/gtest-param-test.h.
+template <typename ForwardIterator>
+internal::ParamGenerator<
+  typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
+ValuesIn(ForwardIterator begin, ForwardIterator end);
+
+template <typename T, size_t N>
+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]);
+
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container);
+
+namespace internal {
+
+// Used in the Values() function to provide polymorphic capabilities.
+$range i 1..n
+$for i [[
+$range j 1..i
+
+template <$for j, [[typename T$j]]>
+class ValueArray$i {
+ public:
+  $if i==1 [[explicit ]]ValueArray$i($for j, [[T$j v$j]]) : $for j, [[v$(j)_(v$j)]] {}
+
+  template <typename T>
+  operator ParamGenerator<T>() const {
+    const T array[] = {$for j, [[static_cast<T>(v$(j)_)]]};
+    return ValuesIn(array);
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ValueArray$i& other);
+
+$for j [[
+
+  const T$j v$(j)_;
+]]
+
+};
+
+]]
+
+# if GTEST_HAS_COMBINE
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Generates values from the Cartesian product of values produced
+// by the argument generators.
+//
+$range i 2..maxtuple
+$for i [[
+$range j 1..i
+$range k 2..i
+
+template <$for j, [[typename T$j]]>
+class CartesianProductGenerator$i
+    : public ParamGeneratorInterface< ::testing::tuple<$for j, [[T$j]]> > {
+ public:
+  typedef ::testing::tuple<$for j, [[T$j]]> ParamType;
+
+  CartesianProductGenerator$i($for j, [[const ParamGenerator<T$j>& g$j]])
+      : $for j, [[g$(j)_(g$j)]] {}
+  virtual ~CartesianProductGenerator$i() {}
+
+  virtual ParamIteratorInterface<ParamType>* Begin() const {
+    return new Iterator(this, $for j, [[g$(j)_, g$(j)_.begin()]]);
+  }
+  virtual ParamIteratorInterface<ParamType>* End() const {
+    return new Iterator(this, $for j, [[g$(j)_, g$(j)_.end()]]);
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<ParamType> {
+   public:
+    Iterator(const ParamGeneratorInterface<ParamType>* base, $for j, [[
+
+      const ParamGenerator<T$j>& g$j,
+      const typename ParamGenerator<T$j>::iterator& current$(j)]])
+        : base_(base),
+$for j, [[
+
+          begin$(j)_(g$j.begin()), end$(j)_(g$j.end()), current$(j)_(current$j)
+]]    {
+      ComputeCurrentValue();
+    }
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<ParamType>* BaseGenerator() const {
+      return base_;
+    }
+    // Advance should not be called on beyond-of-range iterators
+    // so no component iterators must be beyond end of range, either.
+    virtual void Advance() {
+      assert(!AtEnd());
+      ++current$(i)_;
+
+$for k [[
+      if (current$(i+2-k)_ == end$(i+2-k)_) {
+        current$(i+2-k)_ = begin$(i+2-k)_;
+        ++current$(i+2-k-1)_;
+      }
+
+]]
+      ComputeCurrentValue();
+    }
+    virtual ParamIteratorInterface<ParamType>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const ParamType* Current() const { return &current_value_; }
+    virtual bool Equals(const ParamIteratorInterface<ParamType>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const Iterator* typed_other =
+          CheckedDowncastToActualType<const Iterator>(&other);
+      // We must report iterators equal if they both point beyond their
+      // respective ranges. That can happen in a variety of fashions,
+      // so we have to consult AtEnd().
+      return (AtEnd() && typed_other->AtEnd()) ||
+         ($for j  && [[
+
+          current$(j)_ == typed_other->current$(j)_
+]]);
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : base_(other.base_), $for j, [[
+
+        begin$(j)_(other.begin$(j)_),
+        end$(j)_(other.end$(j)_),
+        current$(j)_(other.current$(j)_)
+]] {
+      ComputeCurrentValue();
+    }
+
+    void ComputeCurrentValue() {
+      if (!AtEnd())
+        current_value_ = ParamType($for j, [[*current$(j)_]]);
+    }
+    bool AtEnd() const {
+      // We must report iterator past the end of the range when either of the
+      // component iterators has reached the end of its range.
+      return
+$for j  || [[
+
+          current$(j)_ == end$(j)_
+]];
+    }
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<ParamType>* const base_;
+    // begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
+    // current[i]_ is the actual traversing iterator.
+$for j [[
+
+    const typename ParamGenerator<T$j>::iterator begin$(j)_;
+    const typename ParamGenerator<T$j>::iterator end$(j)_;
+    typename ParamGenerator<T$j>::iterator current$(j)_;
+]]
+
+    ParamType current_value_;
+  };  // class CartesianProductGenerator$i::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductGenerator$i& other);
+
+
+$for j [[
+  const ParamGenerator<T$j> g$(j)_;
+
+]]
+};  // class CartesianProductGenerator$i
+
+
+]]
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Helper classes providing Combine() with polymorphic features. They allow
+// casting CartesianProductGeneratorN<T> to ParamGenerator<U> if T is
+// convertible to U.
+//
+$range i 2..maxtuple
+$for i [[
+$range j 1..i
+
+template <$for j, [[class Generator$j]]>
+class CartesianProductHolder$i {
+ public:
+CartesianProductHolder$i($for j, [[const Generator$j& g$j]])
+      : $for j, [[g$(j)_(g$j)]] {}
+  template <$for j, [[typename T$j]]>
+  operator ParamGenerator< ::testing::tuple<$for j, [[T$j]]> >() const {
+    return ParamGenerator< ::testing::tuple<$for j, [[T$j]]> >(
+        new CartesianProductGenerator$i<$for j, [[T$j]]>(
+$for j,[[
+
+        static_cast<ParamGenerator<T$j> >(g$(j)_)
+]]));
+  }
+
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const CartesianProductHolder$i& other);
+
+
+$for j [[
+  const Generator$j g$(j)_;
+
+]]
+};  // class CartesianProductHolder$i
+
+]]
+
+# endif  // GTEST_HAS_COMBINE
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  //  GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-param-util.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-param-util.h
new file mode 100644
index 0000000000..82cab9b020
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-param-util.h
@@ -0,0 +1,731 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+
+// Type and function utilities for implementing parameterized tests.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
+
+#include <ctype.h>
+
+#include <iterator>
+#include <set>
+#include <utility>
+#include <vector>
+
+// scripts/fuse_gtest.py depends on gtest's own header being #included
+// *unconditionally*.  Therefore these #includes cannot be moved
+// inside #if GTEST_HAS_PARAM_TEST.
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-linked_ptr.h"
+#include "gtest/internal/gtest-port.h"
+#include "gtest/gtest-printers.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+namespace testing {
+
+// Input to a parameterized test name generator, describing a test parameter.
+// Consists of the parameter value and the integer parameter index.
+template <class ParamType>
+struct TestParamInfo {
+  TestParamInfo(const ParamType& a_param, size_t an_index) :
+    param(a_param),
+    index(an_index) {}
+  ParamType param;
+  size_t index;
+};
+
+// A builtin parameterized test name generator which returns the result of
+// testing::PrintToString.
+struct PrintToStringParamName {
+  template <class ParamType>
+  std::string operator()(const TestParamInfo<ParamType>& info) const {
+    return PrintToString(info.param);
+  }
+};
+
+namespace internal {
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Outputs a message explaining invalid registration of different
+// fixture class for the same test case. This may happen when
+// TEST_P macro is used to define two tests with the same name
+// but in different namespaces.
+GTEST_API_ void ReportInvalidTestCaseType(const char* test_case_name,
+                                          CodeLocation code_location);
+
+template <typename> class ParamGeneratorInterface;
+template <typename> class ParamGenerator;
+
+// Interface for iterating over elements provided by an implementation
+// of ParamGeneratorInterface<T>.
+template <typename T>
+class ParamIteratorInterface {
+ public:
+  virtual ~ParamIteratorInterface() {}
+  // A pointer to the base generator instance.
+  // Used only for the purposes of iterator comparison
+  // to make sure that two iterators belong to the same generator.
+  virtual const ParamGeneratorInterface<T>* BaseGenerator() const = 0;
+  // Advances iterator to point to the next element
+  // provided by the generator. The caller is responsible
+  // for not calling Advance() on an iterator equal to
+  // BaseGenerator()->End().
+  virtual void Advance() = 0;
+  // Clones the iterator object. Used for implementing copy semantics
+  // of ParamIterator<T>.
+  virtual ParamIteratorInterface* Clone() const = 0;
+  // Dereferences the current iterator and provides (read-only) access
+  // to the pointed value. It is the caller's responsibility not to call
+  // Current() on an iterator equal to BaseGenerator()->End().
+  // Used for implementing ParamGenerator<T>::operator*().
+  virtual const T* Current() const = 0;
+  // Determines whether the given iterator and other point to the same
+  // element in the sequence generated by the generator.
+  // Used for implementing ParamGenerator<T>::operator==().
+  virtual bool Equals(const ParamIteratorInterface& other) const = 0;
+};
+
+// Class iterating over elements provided by an implementation of
+// ParamGeneratorInterface<T>. It wraps ParamIteratorInterface<T>
+// and implements the const forward iterator concept.
+template <typename T>
+class ParamIterator {
+ public:
+  typedef T value_type;
+  typedef const T& reference;
+  typedef ptrdiff_t difference_type;
+
+  // ParamIterator assumes ownership of the impl_ pointer.
+  ParamIterator(const ParamIterator& other) : impl_(other.impl_->Clone()) {}
+  ParamIterator& operator=(const ParamIterator& other) {
+    if (this != &other)
+      impl_.reset(other.impl_->Clone());
+    return *this;
+  }
+
+  const T& operator*() const { return *impl_->Current(); }
+  const T* operator->() const { return impl_->Current(); }
+  // Prefix version of operator++.
+  ParamIterator& operator++() {
+    impl_->Advance();
+    return *this;
+  }
+  // Postfix version of operator++.
+  ParamIterator operator++(int /*unused*/) {
+    ParamIteratorInterface<T>* clone = impl_->Clone();
+    impl_->Advance();
+    return ParamIterator(clone);
+  }
+  bool operator==(const ParamIterator& other) const {
+    return impl_.get() == other.impl_.get() || impl_->Equals(*other.impl_);
+  }
+  bool operator!=(const ParamIterator& other) const {
+    return !(*this == other);
+  }
+
+ private:
+  friend class ParamGenerator<T>;
+  explicit ParamIterator(ParamIteratorInterface<T>* impl) : impl_(impl) {}
+  scoped_ptr<ParamIteratorInterface<T> > impl_;
+};
+
+// ParamGeneratorInterface<T> is the binary interface to access generators
+// defined in other translation units.
+template <typename T>
+class ParamGeneratorInterface {
+ public:
+  typedef T ParamType;
+
+  virtual ~ParamGeneratorInterface() {}
+
+  // Generator interface definition
+  virtual ParamIteratorInterface<T>* Begin() const = 0;
+  virtual ParamIteratorInterface<T>* End() const = 0;
+};
+
+// Wraps ParamGeneratorInterface<T> and provides general generator syntax
+// compatible with the STL Container concept.
+// This class implements copy initialization semantics and the contained
+// ParamGeneratorInterface<T> instance is shared among all copies
+// of the original object. This is possible because that instance is immutable.
+template<typename T>
+class ParamGenerator {
+ public:
+  typedef ParamIterator<T> iterator;
+
+  explicit ParamGenerator(ParamGeneratorInterface<T>* impl) : impl_(impl) {}
+  ParamGenerator(const ParamGenerator& other) : impl_(other.impl_) {}
+
+  ParamGenerator& operator=(const ParamGenerator& other) {
+    impl_ = other.impl_;
+    return *this;
+  }
+
+  iterator begin() const { return iterator(impl_->Begin()); }
+  iterator end() const { return iterator(impl_->End()); }
+
+ private:
+  linked_ptr<const ParamGeneratorInterface<T> > impl_;
+};
+
+// Generates values from a range of two comparable values. Can be used to
+// generate sequences of user-defined types that implement operator+() and
+// operator<().
+// This class is used in the Range() function.
+template <typename T, typename IncrementT>
+class RangeGenerator : public ParamGeneratorInterface<T> {
+ public:
+  RangeGenerator(T begin, T end, IncrementT step)
+      : begin_(begin), end_(end),
+        step_(step), end_index_(CalculateEndIndex(begin, end, step)) {}
+  virtual ~RangeGenerator() {}
+
+  virtual ParamIteratorInterface<T>* Begin() const {
+    return new Iterator(this, begin_, 0, step_);
+  }
+  virtual ParamIteratorInterface<T>* End() const {
+    return new Iterator(this, end_, end_index_, step_);
+  }
+
+ private:
+  class Iterator : public ParamIteratorInterface<T> {
+   public:
+    Iterator(const ParamGeneratorInterface<T>* base, T value, int index,
+             IncrementT step)
+        : base_(base), value_(value), index_(index), step_(step) {}
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<T>* BaseGenerator() const {
+      return base_;
+    }
+    virtual void Advance() {
+      value_ = static_cast<T>(value_ + step_);
+      index_++;
+    }
+    virtual ParamIteratorInterface<T>* Clone() const {
+      return new Iterator(*this);
+    }
+    virtual const T* Current() const { return &value_; }
+    virtual bool Equals(const ParamIteratorInterface<T>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      const int other_index =
+          CheckedDowncastToActualType<const Iterator>(&other)->index_;
+      return index_ == other_index;
+    }
+
+   private:
+    Iterator(const Iterator& other)
+        : ParamIteratorInterface<T>(),
+          base_(other.base_), value_(other.value_), index_(other.index_),
+          step_(other.step_) {}
+
+    // No implementation - assignment is unsupported.
+    void operator=(const Iterator& other);
+
+    const ParamGeneratorInterface<T>* const base_;
+    T value_;
+    int index_;
+    const IncrementT step_;
+  };  // class RangeGenerator::Iterator
+
+  static int CalculateEndIndex(const T& begin,
+                               const T& end,
+                               const IncrementT& step) {
+    int end_index = 0;
+    for (T i = begin; i < end; i = static_cast<T>(i + step))
+      end_index++;
+    return end_index;
+  }
+
+  // No implementation - assignment is unsupported.
+  void operator=(const RangeGenerator& other);
+
+  const T begin_;
+  const T end_;
+  const IncrementT step_;
+  // The index for the end() iterator. All the elements in the generated
+  // sequence are indexed (0-based) to aid iterator comparison.
+  const int end_index_;
+};  // class RangeGenerator
+
+
+// Generates values from a pair of STL-style iterators. Used in the
+// ValuesIn() function. The elements are copied from the source range
+// since the source can be located on the stack, and the generator
+// is likely to persist beyond that stack frame.
+template <typename T>
+class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
+ public:
+  template <typename ForwardIterator>
+  ValuesInIteratorRangeGenerator(ForwardIterator begin, ForwardIterator end)
+      : container_(begin, end) {}
+  virtual ~ValuesInIteratorRangeGenerator() {}
+
+  virtual ParamIteratorInterface<T>* Begin() const {
+    return new Iterator(this, container_.begin());
+  }
+  virtual ParamIteratorInterface<T>* End() const {
+    return new Iterator(this, container_.end());
+  }
+
+ private:
+  typedef typename ::std::vector<T> ContainerType;
+
+  class Iterator : public ParamIteratorInterface<T> {
+   public:
+    Iterator(const ParamGeneratorInterface<T>* base,
+             typename ContainerType::const_iterator iterator)
+        : base_(base), iterator_(iterator) {}
+    virtual ~Iterator() {}
+
+    virtual const ParamGeneratorInterface<T>* BaseGenerator() const {
+      return base_;
+    }
+    virtual void Advance() {
+      ++iterator_;
+      value_.reset();
+    }
+    virtual ParamIteratorInterface<T>* Clone() const {
+      return new Iterator(*this);
+    }
+    // We need to use cached value referenced by iterator_ because *iterator_
+    // can return a temporary object (and of type other then T), so just
+    // having "return &*iterator_;" doesn't work.
+    // value_ is updated here and not in Advance() because Advance()
+    // can advance iterator_ beyond the end of the range, and we cannot
+    // detect that fact. The client code, on the other hand, is
+    // responsible for not calling Current() on an out-of-range iterator.
+    virtual const T* Current() const {
+      if (value_.get() == NULL)
+        value_.reset(new T(*iterator_));
+      return value_.get();
+    }
+    virtual bool Equals(const ParamIteratorInterface<T>& other) const {
+      // Having the same base generator guarantees that the other
+      // iterator is of the same type and we can downcast.
+      GTEST_CHECK_(BaseGenerator() == other.BaseGenerator())
+          << "The program attempted to compare iterators "
+          << "from different generators." << std::endl;
+      return iterator_ ==
+          CheckedDowncastToActualType<const Iterator>(&other)->iterator_;
+    }
+
+   private:
+    Iterator(const Iterator& other)
+          // The explicit constructor call suppresses a false warning
+          // emitted by gcc when supplied with the -Wextra option.
+        : ParamIteratorInterface<T>(),
+          base_(other.base_),
+          iterator_(other.iterator_) {}
+
+    const ParamGeneratorInterface<T>* const base_;
+    typename ContainerType::const_iterator iterator_;
+    // A cached value of *iterator_. We keep it here to allow access by
+    // pointer in the wrapping iterator's operator->().
+    // value_ needs to be mutable to be accessed in Current().
+    // Use of scoped_ptr helps manage cached value's lifetime,
+    // which is bound by the lifespan of the iterator itself.
+    mutable scoped_ptr<const T> value_;
+  };  // class ValuesInIteratorRangeGenerator::Iterator
+
+  // No implementation - assignment is unsupported.
+  void operator=(const ValuesInIteratorRangeGenerator& other);
+
+  const ContainerType container_;
+};  // class ValuesInIteratorRangeGenerator
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Default parameterized test name generator, returns a string containing the
+// integer test parameter index.
+template <class ParamType>
+std::string DefaultParamName(const TestParamInfo<ParamType>& info) {
+  Message name_stream;
+  name_stream << info.index;
+  return name_stream.GetString();
+}
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Parameterized test name overload helpers, which help the
+// INSTANTIATE_TEST_CASE_P macro choose between the default parameterized
+// test name generator and user param name generator.
+template <class ParamType, class ParamNameGenFunctor>
+ParamNameGenFunctor GetParamNameGen(ParamNameGenFunctor func) {
+  return func;
+}
+
+template <class ParamType>
+struct ParamNameGenFunc {
+  typedef std::string Type(const TestParamInfo<ParamType>&);
+};
+
+template <class ParamType>
+typename ParamNameGenFunc<ParamType>::Type *GetParamNameGen() {
+  return DefaultParamName;
+}
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Stores a parameter value and later creates tests parameterized with that
+// value.
+template <class TestClass>
+class ParameterizedTestFactory : public TestFactoryBase {
+ public:
+  typedef typename TestClass::ParamType ParamType;
+  explicit ParameterizedTestFactory(ParamType parameter) :
+      parameter_(parameter) {}
+  virtual Test* CreateTest() {
+    TestClass::SetParam(&parameter_);
+    return new TestClass();
+  }
+
+ private:
+  const ParamType parameter_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestFactory);
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// TestMetaFactoryBase is a base class for meta-factories that create
+// test factories for passing into MakeAndRegisterTestInfo function.
+template <class ParamType>
+class TestMetaFactoryBase {
+ public:
+  virtual ~TestMetaFactoryBase() {}
+
+  virtual TestFactoryBase* CreateTestFactory(ParamType parameter) = 0;
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// TestMetaFactory creates test factories for passing into
+// MakeAndRegisterTestInfo function. Since MakeAndRegisterTestInfo receives
+// ownership of test factory pointer, same factory object cannot be passed
+// into that method twice. But ParameterizedTestCaseInfo is going to call
+// it for each Test/Parameter value combination. Thus it needs meta factory
+// creator class.
+template <class TestCase>
+class TestMetaFactory
+    : public TestMetaFactoryBase<typename TestCase::ParamType> {
+ public:
+  typedef typename TestCase::ParamType ParamType;
+
+  TestMetaFactory() {}
+
+  virtual TestFactoryBase* CreateTestFactory(ParamType parameter) {
+    return new ParameterizedTestFactory<TestCase>(parameter);
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestMetaFactory);
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// ParameterizedTestCaseInfoBase is a generic interface
+// to ParameterizedTestCaseInfo classes. ParameterizedTestCaseInfoBase
+// accumulates test information provided by TEST_P macro invocations
+// and generators provided by INSTANTIATE_TEST_CASE_P macro invocations
+// and uses that information to register all resulting test instances
+// in RegisterTests method. The ParameterizeTestCaseRegistry class holds
+// a collection of pointers to the ParameterizedTestCaseInfo objects
+// and calls RegisterTests() on each of them when asked.
+class ParameterizedTestCaseInfoBase {
+ public:
+  virtual ~ParameterizedTestCaseInfoBase() {}
+
+  // Base part of test case name for display purposes.
+  virtual const string& GetTestCaseName() const = 0;
+  // Test case id to verify identity.
+  virtual TypeId GetTestCaseTypeId() const = 0;
+  // UnitTest class invokes this method to register tests in this
+  // test case right before running them in RUN_ALL_TESTS macro.
+  // This method should not be called more then once on any single
+  // instance of a ParameterizedTestCaseInfoBase derived class.
+  virtual void RegisterTests() = 0;
+
+ protected:
+  ParameterizedTestCaseInfoBase() {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestCaseInfoBase);
+};
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// ParameterizedTestCaseInfo accumulates tests obtained from TEST_P
+// macro invocations for a particular test case and generators
+// obtained from INSTANTIATE_TEST_CASE_P macro invocations for that
+// test case. It registers tests with all values generated by all
+// generators when asked.
+template <class TestCase>
+class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase {
+ public:
+  // ParamType and GeneratorCreationFunc are private types but are required
+  // for declarations of public methods AddTestPattern() and
+  // AddTestCaseInstantiation().
+  typedef typename TestCase::ParamType ParamType;
+  // A function that returns an instance of appropriate generator type.
+  typedef ParamGenerator<ParamType>(GeneratorCreationFunc)();
+  typedef typename ParamNameGenFunc<ParamType>::Type ParamNameGeneratorFunc;
+
+  explicit ParameterizedTestCaseInfo(
+      const char* name, CodeLocation code_location)
+      : test_case_name_(name), code_location_(code_location) {}
+
+  // Test case base name for display purposes.
+  virtual const string& GetTestCaseName() const { return test_case_name_; }
+  // Test case id to verify identity.
+  virtual TypeId GetTestCaseTypeId() const { return GetTypeId<TestCase>(); }
+  // TEST_P macro uses AddTestPattern() to record information
+  // about a single test in a LocalTestInfo structure.
+  // test_case_name is the base name of the test case (without invocation
+  // prefix). test_base_name is the name of an individual test without
+  // parameter index. For the test SequenceA/FooTest.DoBar/1 FooTest is
+  // test case base name and DoBar is test base name.
+  void AddTestPattern(const char* test_case_name,
+                      const char* test_base_name,
+                      TestMetaFactoryBase<ParamType>* meta_factory) {
+    tests_.push_back(linked_ptr<TestInfo>(new TestInfo(test_case_name,
+                                                       test_base_name,
+                                                       meta_factory)));
+  }
+  // INSTANTIATE_TEST_CASE_P macro uses AddGenerator() to record information
+  // about a generator.
+  int AddTestCaseInstantiation(const string& instantiation_name,
+                               GeneratorCreationFunc* func,
+                               ParamNameGeneratorFunc* name_func,
+                               const char* file,
+                               int line) {
+    instantiations_.push_back(
+        InstantiationInfo(instantiation_name, func, name_func, file, line));
+    return 0;  // Return value used only to run this method in namespace scope.
+  }
+  // UnitTest class invokes this method to register tests in this test case
+  // test cases right before running tests in RUN_ALL_TESTS macro.
+  // This method should not be called more then once on any single
+  // instance of a ParameterizedTestCaseInfoBase derived class.
+  // UnitTest has a guard to prevent from calling this method more then once.
+  virtual void RegisterTests() {
+    for (typename TestInfoContainer::iterator test_it = tests_.begin();
+         test_it != tests_.end(); ++test_it) {
+      linked_ptr<TestInfo> test_info = *test_it;
+      for (typename InstantiationContainer::iterator gen_it =
+               instantiations_.begin(); gen_it != instantiations_.end();
+               ++gen_it) {
+        const string& instantiation_name = gen_it->name;
+        ParamGenerator<ParamType> generator((*gen_it->generator)());
+        ParamNameGeneratorFunc* name_func = gen_it->name_func;
+        const char* file = gen_it->file;
+        int line = gen_it->line;
+
+        string test_case_name;
+        if ( !instantiation_name.empty() )
+          test_case_name = instantiation_name + "/";
+        test_case_name += test_info->test_case_base_name;
+
+        size_t i = 0;
+        std::set<std::string> test_param_names;
+        for (typename ParamGenerator<ParamType>::iterator param_it =
+                 generator.begin();
+             param_it != generator.end(); ++param_it, ++i) {
+          Message test_name_stream;
+
+          std::string param_name = name_func(
+              TestParamInfo<ParamType>(*param_it, i));
+
+          GTEST_CHECK_(IsValidParamName(param_name))
+              << "Parameterized test name '" << param_name
+              << "' is invalid, in " << file
+              << " line " << line << std::endl;
+
+          GTEST_CHECK_(test_param_names.count(param_name) == 0)
+              << "Duplicate parameterized test name '" << param_name
+              << "', in " << file << " line " << line << std::endl;
+
+          test_param_names.insert(param_name);
+
+          test_name_stream << test_info->test_base_name << "/" << param_name;
+          MakeAndRegisterTestInfo(
+              test_case_name.c_str(),
+              test_name_stream.GetString().c_str(),
+              NULL,  // No type parameter.
+              PrintToString(*param_it).c_str(),
+              code_location_,
+              GetTestCaseTypeId(),
+              TestCase::SetUpTestCase,
+              TestCase::TearDownTestCase,
+              test_info->test_meta_factory->CreateTestFactory(*param_it));
+        }  // for param_it
+      }  // for gen_it
+    }  // for test_it
+  }  // RegisterTests
+
+ private:
+  // LocalTestInfo structure keeps information about a single test registered
+  // with TEST_P macro.
+  struct TestInfo {
+    TestInfo(const char* a_test_case_base_name,
+             const char* a_test_base_name,
+             TestMetaFactoryBase<ParamType>* a_test_meta_factory) :
+        test_case_base_name(a_test_case_base_name),
+        test_base_name(a_test_base_name),
+        test_meta_factory(a_test_meta_factory) {}
+
+    const string test_case_base_name;
+    const string test_base_name;
+    const scoped_ptr<TestMetaFactoryBase<ParamType> > test_meta_factory;
+  };
+  typedef ::std::vector<linked_ptr<TestInfo> > TestInfoContainer;
+  // Records data received from INSTANTIATE_TEST_CASE_P macros:
+  //  <Instantiation name, Sequence generator creation function,
+  //     Name generator function, Source file, Source line>
+  struct InstantiationInfo {
+      InstantiationInfo(const std::string &name_in,
+                        GeneratorCreationFunc* generator_in,
+                        ParamNameGeneratorFunc* name_func_in,
+                        const char* file_in,
+                        int line_in)
+          : name(name_in),
+            generator(generator_in),
+            name_func(name_func_in),
+            file(file_in),
+            line(line_in) {}
+
+      std::string name;
+      GeneratorCreationFunc* generator;
+      ParamNameGeneratorFunc* name_func;
+      const char* file;
+      int line;
+  };
+  typedef ::std::vector<InstantiationInfo> InstantiationContainer;
+
+  static bool IsValidParamName(const std::string& name) {
+    // Check for empty string
+    if (name.empty())
+      return false;
+
+    // Check for invalid characters
+    for (std::string::size_type index = 0; index < name.size(); ++index) {
+      if (!isalnum(name[index]) && name[index] != '_')
+        return false;
+    }
+
+    return true;
+  }
+
+  const string test_case_name_;
+  CodeLocation code_location_;
+  TestInfoContainer tests_;
+  InstantiationContainer instantiations_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestCaseInfo);
+};  // class ParameterizedTestCaseInfo
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// ParameterizedTestCaseRegistry contains a map of ParameterizedTestCaseInfoBase
+// classes accessed by test case names. TEST_P and INSTANTIATE_TEST_CASE_P
+// macros use it to locate their corresponding ParameterizedTestCaseInfo
+// descriptors.
+class ParameterizedTestCaseRegistry {
+ public:
+  ParameterizedTestCaseRegistry() {}
+  ~ParameterizedTestCaseRegistry() {
+    for (TestCaseInfoContainer::iterator it = test_case_infos_.begin();
+         it != test_case_infos_.end(); ++it) {
+      delete *it;
+    }
+  }
+
+  // Looks up or creates and returns a structure containing information about
+  // tests and instantiations of a particular test case.
+  template <class TestCase>
+  ParameterizedTestCaseInfo<TestCase>* GetTestCasePatternHolder(
+      const char* test_case_name,
+      CodeLocation code_location) {
+    ParameterizedTestCaseInfo<TestCase>* typed_test_info = NULL;
+    for (TestCaseInfoContainer::iterator it = test_case_infos_.begin();
+         it != test_case_infos_.end(); ++it) {
+      if ((*it)->GetTestCaseName() == test_case_name) {
+        if ((*it)->GetTestCaseTypeId() != GetTypeId<TestCase>()) {
+          // Complain about incorrect usage of Google Test facilities
+          // and terminate the program since we cannot guaranty correct
+          // test case setup and tear-down in this case.
+          ReportInvalidTestCaseType(test_case_name, code_location);
+          posix::Abort();
+        } else {
+          // At this point we are sure that the object we found is of the same
+          // type we are looking for, so we downcast it to that type
+          // without further checks.
+          typed_test_info = CheckedDowncastToActualType<
+              ParameterizedTestCaseInfo<TestCase> >(*it);
+        }
+        break;
+      }
+    }
+    if (typed_test_info == NULL) {
+      typed_test_info = new ParameterizedTestCaseInfo<TestCase>(
+          test_case_name, code_location);
+      test_case_infos_.push_back(typed_test_info);
+    }
+    return typed_test_info;
+  }
+  void RegisterTests() {
+    for (TestCaseInfoContainer::iterator it = test_case_infos_.begin();
+         it != test_case_infos_.end(); ++it) {
+      (*it)->RegisterTests();
+    }
+  }
+
+ private:
+  typedef ::std::vector<ParameterizedTestCaseInfoBase*> TestCaseInfoContainer;
+
+  TestCaseInfoContainer test_case_infos_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestCaseRegistry);
+};
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  //  GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-port-arch.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-port-arch.h
new file mode 100644
index 0000000000..74ab949057
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-port-arch.h
@@ -0,0 +1,93 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file defines the GTEST_OS_* macro.
+// It is separate from gtest-port.h so that custom/gtest-port.h can include it.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
+
+// Determines the platform on which Google Test is compiled.
+#ifdef __CYGWIN__
+# define GTEST_OS_CYGWIN 1
+#elif defined __SYMBIAN32__
+# define GTEST_OS_SYMBIAN 1
+#elif defined _WIN32
+# define GTEST_OS_WINDOWS 1
+# ifdef _WIN32_WCE
+#  define GTEST_OS_WINDOWS_MOBILE 1
+# elif defined(__MINGW__) || defined(__MINGW32__)
+#  define GTEST_OS_WINDOWS_MINGW 1
+# elif defined(WINAPI_FAMILY)
+#  include <winapifamily.h>
+#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#   define GTEST_OS_WINDOWS_DESKTOP 1
+#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
+#   define GTEST_OS_WINDOWS_PHONE 1
+#  elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
+#   define GTEST_OS_WINDOWS_RT 1
+#  else
+    // WINAPI_FAMILY defined but no known partition matched.
+    // Default to desktop.
+#   define GTEST_OS_WINDOWS_DESKTOP 1
+#  endif
+# else
+#  define GTEST_OS_WINDOWS_DESKTOP 1
+# endif  // _WIN32_WCE
+#elif defined __APPLE__
+# define GTEST_OS_MAC 1
+# if TARGET_OS_IPHONE
+#  define GTEST_OS_IOS 1
+# endif
+#elif defined __FreeBSD__
+# define GTEST_OS_FREEBSD 1
+#elif defined __linux__
+# define GTEST_OS_LINUX 1
+# if defined __ANDROID__
+#  define GTEST_OS_LINUX_ANDROID 1
+# endif
+#elif defined __MVS__
+# define GTEST_OS_ZOS 1
+#elif defined(__sun) && defined(__SVR4)
+# define GTEST_OS_SOLARIS 1
+#elif defined(_AIX)
+# define GTEST_OS_AIX 1
+#elif defined(__hpux)
+# define GTEST_OS_HPUX 1
+#elif defined __native_client__
+# define GTEST_OS_NACL 1
+#elif defined __OpenBSD__
+# define GTEST_OS_OPENBSD 1
+#elif defined __QNX__
+# define GTEST_OS_QNX 1
+#endif  // __CYGWIN__
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-port.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-port.h
new file mode 100644
index 0000000000..0094ed5077
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-port.h
@@ -0,0 +1,2554 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: wan@google.com (Zhanyong Wan)
+//
+// Low-level types and utilities for porting Google Test to various
+// platforms.  All macros ending with _ and symbols defined in an
+// internal namespace are subject to change without notice.  Code
+// outside Google Test MUST NOT USE THEM DIRECTLY.  Macros that don't
+// end with _ are part of Google Test's public API and can be used by
+// code outside Google Test.
+//
+// This file is fundamental to Google Test.  All other Google Test source
+// files are expected to #include this.  Therefore, it cannot #include
+// any other Google Test header.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
+
+// Environment-describing macros
+// -----------------------------
+//
+// Google Test can be used in many different environments.  Macros in
+// this section tell Google Test what kind of environment it is being
+// used in, such that Google Test can provide environment-specific
+// features and implementations.
+//
+// Google Test tries to automatically detect the properties of its
+// environment, so users usually don't need to worry about these
+// macros.  However, the automatic detection is not perfect.
+// Sometimes it's necessary for a user to define some of the following
+// macros in the build script to override Google Test's decisions.
+//
+// If the user doesn't define a macro in the list, Google Test will
+// provide a default definition.  After this header is #included, all
+// macros in this list will be defined to either 1 or 0.
+//
+// Notes to maintainers:
+//   - Each macro here is a user-tweakable knob; do not grow the list
+//     lightly.
+//   - Use #if to key off these macros.  Don't use #ifdef or "#if
+//     defined(...)", which will not work as these macros are ALWAYS
+//     defined.
+//
+//   GTEST_HAS_CLONE          - Define it to 1/0 to indicate that clone(2)
+//                              is/isn't available.
+//   GTEST_HAS_EXCEPTIONS     - Define it to 1/0 to indicate that exceptions
+//                              are enabled.
+//   GTEST_HAS_GLOBAL_STRING  - Define it to 1/0 to indicate that ::string
+//                              is/isn't available (some systems define
+//                              ::string, which is different to std::string).
+//   GTEST_HAS_GLOBAL_WSTRING - Define it to 1/0 to indicate that ::string
+//                              is/isn't available (some systems define
+//                              ::wstring, which is different to std::wstring).
+//   GTEST_HAS_POSIX_RE       - Define it to 1/0 to indicate that POSIX regular
+//                              expressions are/aren't available.
+//   GTEST_HAS_PTHREAD        - Define it to 1/0 to indicate that <pthread.h>
+//                              is/isn't available.
+//   GTEST_HAS_RTTI           - Define it to 1/0 to indicate that RTTI is/isn't
+//                              enabled.
+//   GTEST_HAS_STD_WSTRING    - Define it to 1/0 to indicate that
+//                              std::wstring does/doesn't work (Google Test can
+//                              be used where std::wstring is unavailable).
+//   GTEST_HAS_TR1_TUPLE      - Define it to 1/0 to indicate tr1::tuple
+//                              is/isn't available.
+//   GTEST_HAS_SEH            - Define it to 1/0 to indicate whether the
+//                              compiler supports Microsoft's "Structured
+//                              Exception Handling".
+//   GTEST_HAS_STREAM_REDIRECTION
+//                            - Define it to 1/0 to indicate whether the
+//                              platform supports I/O stream redirection using
+//                              dup() and dup2().
+//   GTEST_USE_OWN_TR1_TUPLE  - Define it to 1/0 to indicate whether Google
+//                              Test's own tr1 tuple implementation should be
+//                              used.  Unused when the user sets
+//                              GTEST_HAS_TR1_TUPLE to 0.
+//   GTEST_LANG_CXX11         - Define it to 1/0 to indicate that Google Test
+//                              is building in C++11/C++98 mode.
+//   GTEST_LINKED_AS_SHARED_LIBRARY
+//                            - Define to 1 when compiling tests that use
+//                              Google Test as a shared library (known as
+//                              DLL on Windows).
+//   GTEST_CREATE_SHARED_LIBRARY
+//                            - Define to 1 when compiling Google Test itself
+//                              as a shared library.
+
+// Platform-indicating macros
+// --------------------------
+//
+// Macros indicating the platform on which Google Test is being used
+// (a macro is defined to 1 if compiled on the given platform;
+// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
+// defines these macros automatically.  Code outside Google Test MUST
+// NOT define them.
+//
+//   GTEST_OS_AIX      - IBM AIX
+//   GTEST_OS_CYGWIN   - Cygwin
+//   GTEST_OS_FREEBSD  - FreeBSD
+//   GTEST_OS_HPUX     - HP-UX
+//   GTEST_OS_LINUX    - Linux
+//     GTEST_OS_LINUX_ANDROID - Google Android
+//   GTEST_OS_MAC      - Mac OS X
+//     GTEST_OS_IOS    - iOS
+//   GTEST_OS_NACL     - Google Native Client (NaCl)
+//   GTEST_OS_OPENBSD  - OpenBSD
+//   GTEST_OS_QNX      - QNX
+//   GTEST_OS_SOLARIS  - Sun Solaris
+//   GTEST_OS_SYMBIAN  - Symbian
+//   GTEST_OS_WINDOWS  - Windows (Desktop, MinGW, or Mobile)
+//     GTEST_OS_WINDOWS_DESKTOP  - Windows Desktop
+//     GTEST_OS_WINDOWS_MINGW    - MinGW
+//     GTEST_OS_WINDOWS_MOBILE   - Windows Mobile
+//     GTEST_OS_WINDOWS_PHONE    - Windows Phone
+//     GTEST_OS_WINDOWS_RT       - Windows Store App/WinRT
+//   GTEST_OS_ZOS      - z/OS
+//
+// Among the platforms, Cygwin, Linux, Max OS X, and Windows have the
+// most stable support.  Since core members of the Google Test project
+// don't have access to other platforms, support for them may be less
+// stable.  If you notice any problems on your platform, please notify
+// googletestframework@googlegroups.com (patches for fixing them are
+// even more welcome!).
+//
+// It is possible that none of the GTEST_OS_* macros are defined.
+
+// Feature-indicating macros
+// -------------------------
+//
+// Macros indicating which Google Test features are available (a macro
+// is defined to 1 if the corresponding feature is supported;
+// otherwise UNDEFINED -- it's never defined to 0.).  Google Test
+// defines these macros automatically.  Code outside Google Test MUST
+// NOT define them.
+//
+// These macros are public so that portable tests can be written.
+// Such tests typically surround code using a feature with an #if
+// which controls that code.  For example:
+//
+// #if GTEST_HAS_DEATH_TEST
+//   EXPECT_DEATH(DoSomethingDeadly());
+// #endif
+//
+//   GTEST_HAS_COMBINE      - the Combine() function (for value-parameterized
+//                            tests)
+//   GTEST_HAS_DEATH_TEST   - death tests
+//   GTEST_HAS_PARAM_TEST   - value-parameterized tests
+//   GTEST_HAS_TYPED_TEST   - typed tests
+//   GTEST_HAS_TYPED_TEST_P - type-parameterized tests
+//   GTEST_IS_THREADSAFE    - Google Test is thread-safe.
+//   GTEST_USES_POSIX_RE    - enhanced POSIX regex is used. Do not confuse with
+//                            GTEST_HAS_POSIX_RE (see above) which users can
+//                            define themselves.
+//   GTEST_USES_SIMPLE_RE   - our own simple regex is used;
+//                            the above two are mutually exclusive.
+//   GTEST_CAN_COMPARE_NULL - accepts untyped NULL in EXPECT_EQ().
+
+// Misc public macros
+// ------------------
+//
+//   GTEST_FLAG(flag_name)  - references the variable corresponding to
+//                            the given Google Test flag.
+
+// Internal utilities
+// ------------------
+//
+// The following macros and utilities are for Google Test's INTERNAL
+// use only.  Code outside Google Test MUST NOT USE THEM DIRECTLY.
+//
+// Macros for basic C++ coding:
+//   GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning.
+//   GTEST_ATTRIBUTE_UNUSED_  - declares that a class' instances or a
+//                              variable don't have to be used.
+//   GTEST_DISALLOW_ASSIGN_   - disables operator=.
+//   GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=.
+//   GTEST_MUST_USE_RESULT_   - declares that a function's result must be used.
+//   GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is
+//                                        suppressed (constant conditional).
+//   GTEST_INTENTIONAL_CONST_COND_POP_  - finish code section where MSVC C4127
+//                                        is suppressed.
+//
+// C++11 feature wrappers:
+//
+//   testing::internal::move  - portability wrapper for std::move.
+//
+// Synchronization:
+//   Mutex, MutexLock, ThreadLocal, GetThreadCount()
+//                            - synchronization primitives.
+//
+// Template meta programming:
+//   is_pointer     - as in TR1; needed on Symbian and IBM XL C/C++ only.
+//   IteratorTraits - partial implementation of std::iterator_traits, which
+//                    is not available in libCstd when compiled with Sun C++.
+//
+// Smart pointers:
+//   scoped_ptr     - as in TR2.
+//
+// Regular expressions:
+//   RE             - a simple regular expression class using the POSIX
+//                    Extended Regular Expression syntax on UNIX-like
+//                    platforms, or a reduced regular exception syntax on
+//                    other platforms, including Windows.
+//
+// Logging:
+//   GTEST_LOG_()   - logs messages at the specified severity level.
+//   LogToStderr()  - directs all log messages to stderr.
+//   FlushInfoLog() - flushes informational log messages.
+//
+// Stdout and stderr capturing:
+//   CaptureStdout()     - starts capturing stdout.
+//   GetCapturedStdout() - stops capturing stdout and returns the captured
+//                         string.
+//   CaptureStderr()     - starts capturing stderr.
+//   GetCapturedStderr() - stops capturing stderr and returns the captured
+//                         string.
+//
+// Integer types:
+//   TypeWithSize   - maps an integer to a int type.
+//   Int32, UInt32, Int64, UInt64, TimeInMillis
+//                  - integers of known sizes.
+//   BiggestInt     - the biggest signed integer type.
+//
+// Command-line utilities:
+//   GTEST_DECLARE_*()  - declares a flag.
+//   GTEST_DEFINE_*()   - defines a flag.
+//   GetInjectableArgvs() - returns the command line as a vector of strings.
+//
+// Environment variable utilities:
+//   GetEnv()             - gets the value of an environment variable.
+//   BoolFromGTestEnv()   - parses a bool environment variable.
+//   Int32FromGTestEnv()  - parses an Int32 environment variable.
+//   StringFromGTestEnv() - parses a string environment variable.
+
+#include <ctype.h>   // for isspace, etc
+#include <stddef.h>  // for ptrdiff_t
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#ifndef _WIN32_WCE
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif  // !_WIN32_WCE
+
+#if defined __APPLE__
+# include <AvailabilityMacros.h>
+# include <TargetConditionals.h>
+#endif
+
+#include <algorithm>  // NOLINT
+#include <iostream>  // NOLINT
+#include <sstream>  // NOLINT
+#include <string>  // NOLINT
+#include <utility>
+#include <vector>  // NOLINT
+
+#include "gtest/internal/gtest-port-arch.h"
+#include "gtest/internal/custom/gtest-port.h"
+
+#if !defined(GTEST_DEV_EMAIL_)
+# define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
+# define GTEST_FLAG_PREFIX_ "gtest_"
+# define GTEST_FLAG_PREFIX_DASH_ "gtest-"
+# define GTEST_FLAG_PREFIX_UPPER_ "GTEST_"
+# define GTEST_NAME_ "Google Test"
+# define GTEST_PROJECT_URL_ "https://github.com/google/googletest/"
+#endif  // !defined(GTEST_DEV_EMAIL_)
+
+#if !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
+# define GTEST_INIT_GOOGLE_TEST_NAME_ "testing::InitGoogleTest"
+#endif  // !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
+
+// Determines the version of gcc that is used to compile this.
+#ifdef __GNUC__
+// 40302 means version 4.3.2.
+# define GTEST_GCC_VER_ \
+    (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
+#endif  // __GNUC__
+
+// Macros for disabling Microsoft Visual C++ warnings.
+//
+//   GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 4385)
+//   /* code that triggers warnings C4800 and C4385 */
+//   GTEST_DISABLE_MSC_WARNINGS_POP_()
+#if _MSC_VER >= 1500
+# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings) \
+    __pragma(warning(push))                        \
+    __pragma(warning(disable: warnings))
+# define GTEST_DISABLE_MSC_WARNINGS_POP_()          \
+    __pragma(warning(pop))
+#else
+// Older versions of MSVC don't have __pragma.
+# define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings)
+# define GTEST_DISABLE_MSC_WARNINGS_POP_()
+#endif
+
+#ifndef GTEST_LANG_CXX11
+// gcc and clang define __GXX_EXPERIMENTAL_CXX0X__ when
+// -std={c,gnu}++{0x,11} is passed.  The C++11 standard specifies a
+// value for __cplusplus, and recent versions of clang, gcc, and
+// probably other compilers set that too in C++11 mode.
+# if __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L
+// Compiling in at least C++11 mode.
+#  define GTEST_LANG_CXX11 1
+# else
+#  define GTEST_LANG_CXX11 0
+# endif
+#endif
+
+// Distinct from C++11 language support, some environments don't provide
+// proper C++11 library support. Notably, it's possible to build in
+// C++11 mode when targeting Mac OS X 10.6, which has an old libstdc++
+// with no C++11 support.
+//
+// libstdc++ has sufficient C++11 support as of GCC 4.6.0, __GLIBCXX__
+// 20110325, but maintenance releases in the 4.4 and 4.5 series followed
+// this date, so check for those versions by their date stamps.
+// https://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html#abi.versioning
+#if GTEST_LANG_CXX11 && \
+    (!defined(__GLIBCXX__) || ( \
+        __GLIBCXX__ >= 20110325ul &&  /* GCC >= 4.6.0 */ \
+        /* Blacklist of patch releases of older branches: */ \
+        __GLIBCXX__ != 20110416ul &&  /* GCC 4.4.6 */ \
+        __GLIBCXX__ != 20120313ul &&  /* GCC 4.4.7 */ \
+        __GLIBCXX__ != 20110428ul &&  /* GCC 4.5.3 */ \
+        __GLIBCXX__ != 20120702ul))   /* GCC 4.5.4 */
+# define GTEST_STDLIB_CXX11 1
+#endif
+
+// Only use C++11 library features if the library provides them.
+#if GTEST_STDLIB_CXX11
+# define GTEST_HAS_STD_BEGIN_AND_END_ 1
+# define GTEST_HAS_STD_FORWARD_LIST_ 1
+# define GTEST_HAS_STD_FUNCTION_ 1
+# define GTEST_HAS_STD_INITIALIZER_LIST_ 1
+# define GTEST_HAS_STD_MOVE_ 1
+# define GTEST_HAS_STD_SHARED_PTR_ 1
+# define GTEST_HAS_STD_TYPE_TRAITS_ 1
+# define GTEST_HAS_STD_UNIQUE_PTR_ 1
+#endif
+
+// C++11 specifies that <tuple> provides std::tuple.
+// Some platforms still might not have it, however.
+#if GTEST_LANG_CXX11
+# define GTEST_HAS_STD_TUPLE_ 1
+# if defined(__clang__)
+// Inspired by http://clang.llvm.org/docs/LanguageExtensions.html#__has_include
+#  if defined(__has_include) && !__has_include(<tuple>)
+#   undef GTEST_HAS_STD_TUPLE_
+#  endif
+# elif defined(_MSC_VER)
+// Inspired by boost/config/stdlib/dinkumware.hpp
+#  if defined(_CPPLIB_VER) && _CPPLIB_VER < 520
+#   undef GTEST_HAS_STD_TUPLE_
+#  endif
+# elif defined(__GLIBCXX__)
+// Inspired by boost/config/stdlib/libstdcpp3.hpp,
+// http://gcc.gnu.org/gcc-4.2/changes.html and
+// http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt01ch01.html#manual.intro.status.standard.200x
+#  if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)
+#   undef GTEST_HAS_STD_TUPLE_
+#  endif
+# endif
+#endif
+
+// Brings in definitions for functions used in the testing::internal::posix
+// namespace (read, write, close, chdir, isatty, stat). We do not currently
+// use them on Windows Mobile.
+#if GTEST_OS_WINDOWS
+# if !GTEST_OS_WINDOWS_MOBILE
+#  include <direct.h>
+#  include <io.h>
+# endif
+// In order to avoid having to include <windows.h>, use forward declaration
+// assuming CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION.
+// This assumption is verified by
+// WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION.
+struct _RTL_CRITICAL_SECTION;
+#else
+// This assumes that non-Windows OSes provide unistd.h. For OSes where this
+// is not the case, we need to include headers that provide the functions
+// mentioned above.
+# include <unistd.h>
+# include <strings.h>
+#endif  // GTEST_OS_WINDOWS
+
+#if GTEST_OS_LINUX_ANDROID
+// Used to define __ANDROID_API__ matching the target NDK API level.
+#  include <android/api-level.h>  // NOLINT
+#endif
+
+// Defines this to true iff Google Test can use POSIX regular expressions.
+#ifndef GTEST_HAS_POSIX_RE
+# if GTEST_OS_LINUX_ANDROID
+// On Android, <regex.h> is only available starting with Gingerbread.
+#  define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9)
+# else
+#  define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS)
+# endif
+#endif
+
+#if GTEST_USES_PCRE
+// The appropriate headers have already been included.
+
+#elif GTEST_HAS_POSIX_RE
+
+// On some platforms, <regex.h> needs someone to define size_t, and
+// won't compile otherwise.  We can #include it here as we already
+// included <stdlib.h>, which is guaranteed to define size_t through
+// <stddef.h>.
+# include <regex.h>  // NOLINT
+
+# define GTEST_USES_POSIX_RE 1
+
+#elif GTEST_OS_WINDOWS
+
+// <regex.h> is not available on Windows.  Use our own simple regex
+// implementation instead.
+# define GTEST_USES_SIMPLE_RE 1
+
+#else
+
+// <regex.h> may not be available on this platform.  Use our own
+// simple regex implementation instead.
+# define GTEST_USES_SIMPLE_RE 1
+
+#endif  // GTEST_USES_PCRE
+
+#ifndef GTEST_HAS_EXCEPTIONS
+// The user didn't tell us whether exceptions are enabled, so we need
+// to figure it out.
+# if defined(_MSC_VER) || defined(__BORLANDC__)
+// MSVC's and C++Builder's implementations of the STL use the _HAS_EXCEPTIONS
+// macro to enable exceptions, so we'll do the same.
+// Assumes that exceptions are enabled by default.
+#  ifndef _HAS_EXCEPTIONS
+#   define _HAS_EXCEPTIONS 1
+#  endif  // _HAS_EXCEPTIONS
+#  define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS
+# elif defined(__clang__)
+// clang defines __EXCEPTIONS iff exceptions are enabled before clang 220714,
+// but iff cleanups are enabled after that. In Obj-C++ files, there can be
+// cleanups for ObjC exceptions which also need cleanups, even if C++ exceptions
+// are disabled. clang has __has_feature(cxx_exceptions) which checks for C++
+// exceptions starting at clang r206352, but which checked for cleanups prior to
+// that. To reliably check for C++ exception availability with clang, check for
+// __EXCEPTIONS && __has_feature(cxx_exceptions).
+#  define GTEST_HAS_EXCEPTIONS (__EXCEPTIONS && __has_feature(cxx_exceptions))
+# elif defined(__GNUC__) && __EXCEPTIONS
+// gcc defines __EXCEPTIONS to 1 iff exceptions are enabled.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__SUNPRO_CC)
+// Sun Pro CC supports exceptions.  However, there is no compile-time way of
+// detecting whether they are enabled or not.  Therefore, we assume that
+// they are enabled unless the user tells us otherwise.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__IBMCPP__) && __EXCEPTIONS
+// xlC defines __EXCEPTIONS to 1 iff exceptions are enabled.
+#  define GTEST_HAS_EXCEPTIONS 1
+# elif defined(__HP_aCC)
+// Exception handling is in effect by default in HP aCC compiler. It has to
+// be turned of by +noeh compiler option if desired.
+#  define GTEST_HAS_EXCEPTIONS 1
+# else
+// For other compilers, we assume exceptions are disabled to be
+// conservative.
+#  define GTEST_HAS_EXCEPTIONS 0
+# endif  // defined(_MSC_VER) || defined(__BORLANDC__)
+#endif  // GTEST_HAS_EXCEPTIONS
+
+#if !defined(GTEST_HAS_STD_STRING)
+// Even though we don't use this macro any longer, we keep it in case
+// some clients still depend on it.
+# define GTEST_HAS_STD_STRING 1
+#elif !GTEST_HAS_STD_STRING
+// The user told us that ::std::string isn't available.
+# error "Google Test cannot be used where ::std::string isn't available."
+#endif  // !defined(GTEST_HAS_STD_STRING)
+
+#ifndef GTEST_HAS_GLOBAL_STRING
+// The user didn't tell us whether ::string is available, so we need
+// to figure it out.
+
+# define GTEST_HAS_GLOBAL_STRING 0
+
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+#ifndef GTEST_HAS_STD_WSTRING
+// The user didn't tell us whether ::std::wstring is available, so we need
+// to figure it out.
+// TODO(wan@google.com): uses autoconf to detect whether ::std::wstring
+//   is available.
+
+// Cygwin 1.7 and below doesn't support ::std::wstring.
+// Solaris' libc++ doesn't support it either.  Android has
+// no support for it at least as recent as Froyo (2.2).
+# define GTEST_HAS_STD_WSTRING \
+    (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS))
+
+#endif  // GTEST_HAS_STD_WSTRING
+
+#ifndef GTEST_HAS_GLOBAL_WSTRING
+// The user didn't tell us whether ::wstring is available, so we need
+// to figure it out.
+# define GTEST_HAS_GLOBAL_WSTRING \
+    (GTEST_HAS_STD_WSTRING && GTEST_HAS_GLOBAL_STRING)
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+// Determines whether RTTI is available.
+#ifndef GTEST_HAS_RTTI
+// The user didn't tell us whether RTTI is enabled, so we need to
+// figure it out.
+
+# ifdef _MSC_VER
+
+#  ifdef _CPPRTTI  // MSVC defines this macro iff RTTI is enabled.
+#   define GTEST_HAS_RTTI 1
+#  else
+#   define GTEST_HAS_RTTI 0
+#  endif
+
+// Starting with version 4.3.2, gcc defines __GXX_RTTI iff RTTI is enabled.
+# elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40302)
+
+#  ifdef __GXX_RTTI
+// When building against STLport with the Android NDK and with
+// -frtti -fno-exceptions, the build fails at link time with undefined
+// references to __cxa_bad_typeid. Note sure if STL or toolchain bug,
+// so disable RTTI when detected.
+#   if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) && \
+       !defined(__EXCEPTIONS)
+#    define GTEST_HAS_RTTI 0
+#   else
+#    define GTEST_HAS_RTTI 1
+#   endif  // GTEST_OS_LINUX_ANDROID && __STLPORT_MAJOR && !__EXCEPTIONS
+#  else
+#   define GTEST_HAS_RTTI 0
+#  endif  // __GXX_RTTI
+
+// Clang defines __GXX_RTTI starting with version 3.0, but its manual recommends
+// using has_feature instead. has_feature(cxx_rtti) is supported since 2.7, the
+// first version with C++ support.
+# elif defined(__clang__)
+
+#  define GTEST_HAS_RTTI __has_feature(cxx_rtti)
+
+// Starting with version 9.0 IBM Visual Age defines __RTTI_ALL__ to 1 if
+// both the typeid and dynamic_cast features are present.
+# elif defined(__IBMCPP__) && (__IBMCPP__ >= 900)
+
+#  ifdef __RTTI_ALL__
+#   define GTEST_HAS_RTTI 1
+#  else
+#   define GTEST_HAS_RTTI 0
+#  endif
+
+# else
+
+// For all other compilers, we assume RTTI is enabled.
+#  define GTEST_HAS_RTTI 1
+
+# endif  // _MSC_VER
+
+#endif  // GTEST_HAS_RTTI
+
+// It's this header's responsibility to #include <typeinfo> when RTTI
+// is enabled.
+#if GTEST_HAS_RTTI
+# include <typeinfo>
+#endif
+
+// Determines whether Google Test can use the pthreads library.
+#ifndef GTEST_HAS_PTHREAD
+// The user didn't tell us explicitly, so we make reasonable assumptions about
+// which platforms have pthreads support.
+//
+// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
+// to your compiler flags.
+# define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \
+    || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL)
+#endif  // GTEST_HAS_PTHREAD
+
+#if GTEST_HAS_PTHREAD
+// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
+// true.
+# include <pthread.h>  // NOLINT
+
+// For timespec and nanosleep, used below.
+# include <time.h>  // NOLINT
+#endif
+
+// Determines if hash_map/hash_set are available.
+// Only used for testing against those containers.
+#if !defined(GTEST_HAS_HASH_MAP_)
+# if _MSC_VER
+#  define GTEST_HAS_HASH_MAP_ 1  // Indicates that hash_map is available.
+#  define GTEST_HAS_HASH_SET_ 1  // Indicates that hash_set is available.
+# endif  // _MSC_VER
+#endif  // !defined(GTEST_HAS_HASH_MAP_)
+
+// Determines whether Google Test can use tr1/tuple.  You can define
+// this macro to 0 to prevent Google Test from using tuple (any
+// feature depending on tuple with be disabled in this mode).
+#ifndef GTEST_HAS_TR1_TUPLE
+# if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR)
+// STLport, provided with the Android NDK, has neither <tr1/tuple> or <tuple>.
+#  define GTEST_HAS_TR1_TUPLE 0
+# else
+// The user didn't tell us not to do it, so we assume it's OK.
+#  define GTEST_HAS_TR1_TUPLE 1
+# endif
+#endif  // GTEST_HAS_TR1_TUPLE
+
+// Determines whether Google Test's own tr1 tuple implementation
+// should be used.
+#ifndef GTEST_USE_OWN_TR1_TUPLE
+// The user didn't tell us, so we need to figure it out.
+
+// We use our own TR1 tuple if we aren't sure the user has an
+// implementation of it already.  At this time, libstdc++ 4.0.0+ and
+// MSVC 2010 are the only mainstream standard libraries that come
+// with a TR1 tuple implementation.  NVIDIA's CUDA NVCC compiler
+// pretends to be GCC by defining __GNUC__ and friends, but cannot
+// compile GCC's tuple implementation.  MSVC 2008 (9.0) provides TR1
+// tuple in a 323 MB Feature Pack download, which we cannot assume the
+// user has.  QNX's QCC compiler is a modified GCC but it doesn't
+// support TR1 tuple.  libc++ only provides std::tuple, in C++11 mode,
+// and it can be used with some compilers that define __GNUC__.
+# if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000) \
+      && !GTEST_OS_QNX && !defined(_LIBCPP_VERSION)) || _MSC_VER >= 1600
+#  define GTEST_ENV_HAS_TR1_TUPLE_ 1
+# endif
+
+// C++11 specifies that <tuple> provides std::tuple. Use that if gtest is used
+// in C++11 mode and libstdc++ isn't very old (binaries targeting OS X 10.6
+// can build with clang but need to use gcc4.2's libstdc++).
+# if GTEST_LANG_CXX11 && (!defined(__GLIBCXX__) || __GLIBCXX__ > 20110325)
+#  define GTEST_ENV_HAS_STD_TUPLE_ 1
+# endif
+
+# if GTEST_ENV_HAS_TR1_TUPLE_ || GTEST_ENV_HAS_STD_TUPLE_
+#  define GTEST_USE_OWN_TR1_TUPLE 0
+# else
+#  define GTEST_USE_OWN_TR1_TUPLE 1
+# endif
+
+#endif  // GTEST_USE_OWN_TR1_TUPLE
+
+// To avoid conditional compilation everywhere, we make it
+// gtest-port.h's responsibility to #include the header implementing
+// tuple.
+#if GTEST_HAS_STD_TUPLE_
+# include <tuple>  // IWYU pragma: export
+# define GTEST_TUPLE_NAMESPACE_ ::std
+#endif  // GTEST_HAS_STD_TUPLE_
+
+// We include tr1::tuple even if std::tuple is available to define printers for
+// them.
+#if GTEST_HAS_TR1_TUPLE
+# ifndef GTEST_TUPLE_NAMESPACE_
+#  define GTEST_TUPLE_NAMESPACE_ ::std::tr1
+# endif  // GTEST_TUPLE_NAMESPACE_
+
+# if GTEST_USE_OWN_TR1_TUPLE
+#  include "gtest/internal/gtest-tuple.h"  // IWYU pragma: export  // NOLINT
+# elif GTEST_ENV_HAS_STD_TUPLE_
+#  include <tuple>
+// C++11 puts its tuple into the ::std namespace rather than
+// ::std::tr1.  gtest expects tuple to live in ::std::tr1, so put it there.
+// This causes undefined behavior, but supported compilers react in
+// the way we intend.
+namespace std {
+namespace tr1 {
+using ::std::get;
+using ::std::make_tuple;
+using ::std::tuple;
+using ::std::tuple_element;
+using ::std::tuple_size;
+}
+}
+
+# elif GTEST_OS_SYMBIAN
+
+// On Symbian, BOOST_HAS_TR1_TUPLE causes Boost's TR1 tuple library to
+// use STLport's tuple implementation, which unfortunately doesn't
+// work as the copy of STLport distributed with Symbian is incomplete.
+// By making sure BOOST_HAS_TR1_TUPLE is undefined, we force Boost to
+// use its own tuple implementation.
+#  ifdef BOOST_HAS_TR1_TUPLE
+#   undef BOOST_HAS_TR1_TUPLE
+#  endif  // BOOST_HAS_TR1_TUPLE
+
+// This prevents <boost/tr1/detail/config.hpp>, which defines
+// BOOST_HAS_TR1_TUPLE, from being #included by Boost's <tuple>.
+#  define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED
+#  include <tuple>  // IWYU pragma: export  // NOLINT
+
+# elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
+// GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header.  This does
+// not conform to the TR1 spec, which requires the header to be <tuple>.
+
+#  if !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
+// Until version 4.3.2, gcc has a bug that causes <tr1/functional>,
+// which is #included by <tr1/tuple>, to not compile when RTTI is
+// disabled.  _TR1_FUNCTIONAL is the header guard for
+// <tr1/functional>.  Hence the following #define is a hack to prevent
+// <tr1/functional> from being included.
+#   define _TR1_FUNCTIONAL 1
+#   include <tr1/tuple>
+#   undef _TR1_FUNCTIONAL  // Allows the user to #include
+                        // <tr1/functional> if he chooses to.
+#  else
+#   include <tr1/tuple>  // NOLINT
+#  endif  // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
+
+# else
+// If the compiler is not GCC 4.0+, we assume the user is using a
+// spec-conforming TR1 implementation.
+#  include <tuple>  // IWYU pragma: export  // NOLINT
+# endif  // GTEST_USE_OWN_TR1_TUPLE
+
+#endif  // GTEST_HAS_TR1_TUPLE
+
+// Determines whether clone(2) is supported.
+// Usually it will only be available on Linux, excluding
+// Linux on the Itanium architecture.
+// Also see http://linux.die.net/man/2/clone.
+#ifndef GTEST_HAS_CLONE
+// The user didn't tell us, so we need to figure it out.
+
+# if GTEST_OS_LINUX && !defined(__ia64__)
+#  if GTEST_OS_LINUX_ANDROID
+// On Android, clone() is only available on ARM starting with Gingerbread.
+#    if defined(__arm__) && __ANDROID_API__ >= 9
+#     define GTEST_HAS_CLONE 1
+#    else
+#     define GTEST_HAS_CLONE 0
+#    endif
+#  else
+#   define GTEST_HAS_CLONE 1
+#  endif
+# else
+#  define GTEST_HAS_CLONE 0
+# endif  // GTEST_OS_LINUX && !defined(__ia64__)
+
+#endif  // GTEST_HAS_CLONE
+
+// Determines whether to support stream redirection. This is used to test
+// output correctness and to implement death tests.
+#ifndef GTEST_HAS_STREAM_REDIRECTION
+// By default, we assume that stream redirection is supported on all
+// platforms except known mobile ones.
+# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || \
+    GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
+#  define GTEST_HAS_STREAM_REDIRECTION 0
+# else
+#  define GTEST_HAS_STREAM_REDIRECTION 1
+# endif  // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_SYMBIAN
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+// Determines whether to support death tests.
+// Google Test does not support death tests for VC 7.1 and earlier as
+// abort() in a VC 7.1 application compiled as GUI in debug config
+// pops up a dialog window that cannot be suppressed programmatically.
+#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
+     (GTEST_OS_MAC && !GTEST_OS_IOS) || \
+     (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
+     GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
+     GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD)
+# define GTEST_HAS_DEATH_TEST 1
+#endif
+
+// We don't support MSVC 7.1 with exceptions disabled now.  Therefore
+// all the compilers we care about are adequate for supporting
+// value-parameterized tests.
+#define GTEST_HAS_PARAM_TEST 1
+
+// Determines whether to support type-driven tests.
+
+// Typed tests need <typeinfo> and variadic macros, which GCC, VC++ 8.0,
+// Sun Pro CC, IBM Visual Age, and HP aCC support.
+#if defined(__GNUC__) || (_MSC_VER >= 1400) || defined(__SUNPRO_CC) || \
+    defined(__IBMCPP__) || defined(__HP_aCC)
+# define GTEST_HAS_TYPED_TEST 1
+# define GTEST_HAS_TYPED_TEST_P 1
+#endif
+
+// Determines whether to support Combine(). This only makes sense when
+// value-parameterized tests are enabled.  The implementation doesn't
+// work on Sun Studio since it doesn't understand templated conversion
+// operators.
+#if GTEST_HAS_PARAM_TEST && GTEST_HAS_TR1_TUPLE && !defined(__SUNPRO_CC)
+# define GTEST_HAS_COMBINE 1
+#endif
+
+// Determines whether the system compiler uses UTF-16 for encoding wide strings.
+#define GTEST_WIDE_STRING_USES_UTF16_ \
+    (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || GTEST_OS_AIX)
+
+// Determines whether test results can be streamed to a socket.
+#if GTEST_OS_LINUX
+# define GTEST_CAN_STREAM_RESULTS_ 1
+#endif
+
+// Defines some utility macros.
+
+// The GNU compiler emits a warning if nested "if" statements are followed by
+// an "else" statement and braces are not used to explicitly disambiguate the
+// "else" binding.  This leads to problems with code like:
+//
+//   if (gate)
+//     ASSERT_*(condition) << "Some message";
+//
+// The "switch (0) case 0:" idiom is used to suppress this.
+#ifdef __INTEL_COMPILER
+# define GTEST_AMBIGUOUS_ELSE_BLOCKER_
+#else
+# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: default:  // NOLINT
+#endif
+
+// Use this annotation at the end of a struct/class definition to
+// prevent the compiler from optimizing away instances that are never
+// used.  This is useful when all interesting logic happens inside the
+// c'tor and / or d'tor.  Example:
+//
+//   struct Foo {
+//     Foo() { ... }
+//   } GTEST_ATTRIBUTE_UNUSED_;
+//
+// Also use it after a variable or parameter declaration to tell the
+// compiler the variable/parameter does not have to be used.
+#if defined(__GNUC__) && !defined(COMPILER_ICC)
+# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
+#elif defined(__clang__)
+# if __has_attribute(unused)
+#  define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
+# endif
+#endif
+#ifndef GTEST_ATTRIBUTE_UNUSED_
+# define GTEST_ATTRIBUTE_UNUSED_
+#endif
+
+// A macro to disallow operator=
+// This should be used in the private: declarations for a class.
+#define GTEST_DISALLOW_ASSIGN_(type)\
+  void operator=(type const &)
+
+// A macro to disallow copy constructor and operator=
+// This should be used in the private: declarations for a class.
+#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type)\
+  type(type const &);\
+  GTEST_DISALLOW_ASSIGN_(type)
+
+// Tell the compiler to warn about unused return values for functions declared
+// with this macro.  The macro should be used on function declarations
+// following the argument list:
+//
+//   Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_;
+#if defined(__GNUC__) && (GTEST_GCC_VER_ >= 30400) && !defined(COMPILER_ICC)
+# define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result))
+#else
+# define GTEST_MUST_USE_RESULT_
+#endif  // __GNUC__ && (GTEST_GCC_VER_ >= 30400) && !COMPILER_ICC
+
+// MS C++ compiler emits warning when a conditional expression is compile time
+// constant. In some contexts this warning is false positive and needs to be
+// suppressed. Use the following two macros in such cases:
+//
+// GTEST_INTENTIONAL_CONST_COND_PUSH_()
+// while (true) {
+// GTEST_INTENTIONAL_CONST_COND_POP_()
+// }
+# define GTEST_INTENTIONAL_CONST_COND_PUSH_() \
+    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127)
+# define GTEST_INTENTIONAL_CONST_COND_POP_() \
+    GTEST_DISABLE_MSC_WARNINGS_POP_()
+
+// Determine whether the compiler supports Microsoft's Structured Exception
+// Handling.  This is supported by several Windows compilers but generally
+// does not exist on any other system.
+#ifndef GTEST_HAS_SEH
+// The user didn't tell us, so we need to figure it out.
+
+# if defined(_MSC_VER) || defined(__BORLANDC__)
+// These two compilers are known to support SEH.
+#  define GTEST_HAS_SEH 1
+# else
+// Assume no SEH.
+#  define GTEST_HAS_SEH 0
+# endif
+
+#define GTEST_IS_THREADSAFE \
+    (GTEST_HAS_MUTEX_AND_THREAD_LOCAL_ \
+     || (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) \
+     || GTEST_HAS_PTHREAD)
+
+#endif  // GTEST_HAS_SEH
+
+#ifdef _MSC_VER
+# if GTEST_LINKED_AS_SHARED_LIBRARY
+#  define GTEST_API_ __declspec(dllimport)
+# elif GTEST_CREATE_SHARED_LIBRARY
+#  define GTEST_API_ __declspec(dllexport)
+# endif
+#elif __GNUC__ >= 4 || defined(__clang__)
+# define GTEST_API_ __attribute__((visibility ("default")))
+#endif // _MSC_VER
+
+#ifndef GTEST_API_
+# define GTEST_API_
+#endif
+
+#ifdef __GNUC__
+// Ask the compiler to never inline a given function.
+# define GTEST_NO_INLINE_ __attribute__((noinline))
+#else
+# define GTEST_NO_INLINE_
+#endif
+
+// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project.
+#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)
+# define GTEST_HAS_CXXABI_H_ 1
+#else
+# define GTEST_HAS_CXXABI_H_ 0
+#endif
+
+// A function level attribute to disable checking for use of uninitialized
+// memory when built with MemorySanitizer.
+#if defined(__clang__)
+# if __has_feature(memory_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ \
+       __attribute__((no_sanitize_memory))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+# endif  // __has_feature(memory_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+#endif  // __clang__
+
+// A function level attribute to disable AddressSanitizer instrumentation.
+#if defined(__clang__)
+# if __has_feature(address_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ \
+       __attribute__((no_sanitize_address))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+# endif  // __has_feature(address_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+#endif  // __clang__
+
+// A function level attribute to disable ThreadSanitizer instrumentation.
+#if defined(__clang__)
+# if __has_feature(thread_sanitizer)
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ \
+       __attribute__((no_sanitize_thread))
+# else
+#  define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+# endif  // __has_feature(thread_sanitizer)
+#else
+# define GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+#endif  // __clang__
+
+namespace testing {
+
+class Message;
+
+#if defined(GTEST_TUPLE_NAMESPACE_)
+// Import tuple and friends into the ::testing namespace.
+// It is part of our interface, having them in ::testing allows us to change
+// their types as needed.
+using GTEST_TUPLE_NAMESPACE_::get;
+using GTEST_TUPLE_NAMESPACE_::make_tuple;
+using GTEST_TUPLE_NAMESPACE_::tuple;
+using GTEST_TUPLE_NAMESPACE_::tuple_size;
+using GTEST_TUPLE_NAMESPACE_::tuple_element;
+#endif  // defined(GTEST_TUPLE_NAMESPACE_)
+
+namespace internal {
+
+// A secret type that Google Test users don't know about.  It has no
+// definition on purpose.  Therefore it's impossible to create a
+// Secret object, which is what we want.
+class Secret;
+
+// The GTEST_COMPILE_ASSERT_ macro can be used to verify that a compile time
+// expression is true. For example, you could use it to verify the
+// size of a static array:
+//
+//   GTEST_COMPILE_ASSERT_(GTEST_ARRAY_SIZE_(names) == NUM_NAMES,
+//                         names_incorrect_size);
+//
+// or to make sure a struct is smaller than a certain size:
+//
+//   GTEST_COMPILE_ASSERT_(sizeof(foo) < 128, foo_too_large);
+//
+// The second argument to the macro is the name of the variable. If
+// the expression is false, most compilers will issue a warning/error
+// containing the name of the variable.
+
+#if GTEST_LANG_CXX11
+# define GTEST_COMPILE_ASSERT_(expr, msg) static_assert(expr, #msg)
+#else  // !GTEST_LANG_CXX11
+template <bool>
+  struct CompileAssert {
+};
+
+# define GTEST_COMPILE_ASSERT_(expr, msg) \
+  typedef ::testing::internal::CompileAssert<(static_cast<bool>(expr))> \
+      msg[static_cast<bool>(expr) ? 1 : -1] GTEST_ATTRIBUTE_UNUSED_
+#endif  // !GTEST_LANG_CXX11
+
+// Implementation details of GTEST_COMPILE_ASSERT_:
+//
+// (In C++11, we simply use static_assert instead of the following)
+//
+// - GTEST_COMPILE_ASSERT_ works by defining an array type that has -1
+//   elements (and thus is invalid) when the expression is false.
+//
+// - The simpler definition
+//
+//    #define GTEST_COMPILE_ASSERT_(expr, msg) typedef char msg[(expr) ? 1 : -1]
+//
+//   does not work, as gcc supports variable-length arrays whose sizes
+//   are determined at run-time (this is gcc's extension and not part
+//   of the C++ standard).  As a result, gcc fails to reject the
+//   following code with the simple definition:
+//
+//     int foo;
+//     GTEST_COMPILE_ASSERT_(foo, msg); // not supposed to compile as foo is
+//                                      // not a compile-time constant.
+//
+// - By using the type CompileAssert<(bool(expr))>, we ensures that
+//   expr is a compile-time constant.  (Template arguments must be
+//   determined at compile-time.)
+//
+// - The outter parentheses in CompileAssert<(bool(expr))> are necessary
+//   to work around a bug in gcc 3.4.4 and 4.0.1.  If we had written
+//
+//     CompileAssert<bool(expr)>
+//
+//   instead, these compilers will refuse to compile
+//
+//     GTEST_COMPILE_ASSERT_(5 > 0, some_message);
+//
+//   (They seem to think the ">" in "5 > 0" marks the end of the
+//   template argument list.)
+//
+// - The array size is (bool(expr) ? 1 : -1), instead of simply
+//
+//     ((expr) ? 1 : -1).
+//
+//   This is to avoid running into a bug in MS VC 7.1, which
+//   causes ((0.0) ? 1 : -1) to incorrectly evaluate to 1.
+
+// StaticAssertTypeEqHelper is used by StaticAssertTypeEq defined in gtest.h.
+//
+// This template is declared, but intentionally undefined.
+template <typename T1, typename T2>
+struct StaticAssertTypeEqHelper;
+
+template <typename T>
+struct StaticAssertTypeEqHelper<T, T> {
+  enum { value = true };
+};
+
+// Evaluates to the number of elements in 'array'.
+#define GTEST_ARRAY_SIZE_(array) (sizeof(array) / sizeof(array[0]))
+
+#if GTEST_HAS_GLOBAL_STRING
+typedef ::string string;
+#else
+typedef ::std::string string;
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+#if GTEST_HAS_GLOBAL_WSTRING
+typedef ::wstring wstring;
+#elif GTEST_HAS_STD_WSTRING
+typedef ::std::wstring wstring;
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+// A helper for suppressing warnings on constant condition.  It just
+// returns 'condition'.
+GTEST_API_ bool IsTrue(bool condition);
+
+// Defines scoped_ptr.
+
+// This implementation of scoped_ptr is PARTIAL - it only contains
+// enough stuff to satisfy Google Test's need.
+template <typename T>
+class scoped_ptr {
+ public:
+  typedef T element_type;
+
+  explicit scoped_ptr(T* p = NULL) : ptr_(p) {}
+  ~scoped_ptr() { reset(); }
+
+  T& operator*() const { return *ptr_; }
+  T* operator->() const { return ptr_; }
+  T* get() const { return ptr_; }
+
+  T* release() {
+    T* const ptr = ptr_;
+    ptr_ = NULL;
+    return ptr;
+  }
+
+  void reset(T* p = NULL) {
+    if (p != ptr_) {
+      if (IsTrue(sizeof(T) > 0)) {  // Makes sure T is a complete type.
+        delete ptr_;
+      }
+      ptr_ = p;
+    }
+  }
+
+  friend void swap(scoped_ptr& a, scoped_ptr& b) {
+    using std::swap;
+    swap(a.ptr_, b.ptr_);
+  }
+
+ private:
+  T* ptr_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(scoped_ptr);
+};
+
+// Defines RE.
+
+// A simple C++ wrapper for <regex.h>.  It uses the POSIX Extended
+// Regular Expression syntax.
+class GTEST_API_ RE {
+ public:
+  // A copy constructor is required by the Standard to initialize object
+  // references from r-values.
+  RE(const RE& other) { Init(other.pattern()); }
+
+  // Constructs an RE from a string.
+  RE(const ::std::string& regex) { Init(regex.c_str()); }  // NOLINT
+
+#if GTEST_HAS_GLOBAL_STRING
+
+  RE(const ::string& regex) { Init(regex.c_str()); }  // NOLINT
+
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+  RE(const char* regex) { Init(regex); }  // NOLINT
+  ~RE();
+
+  // Returns the string representation of the regex.
+  const char* pattern() const { return pattern_; }
+
+  // FullMatch(str, re) returns true iff regular expression re matches
+  // the entire str.
+  // PartialMatch(str, re) returns true iff regular expression re
+  // matches a substring of str (including str itself).
+  //
+  // TODO(wan@google.com): make FullMatch() and PartialMatch() work
+  // when str contains NUL characters.
+  static bool FullMatch(const ::std::string& str, const RE& re) {
+    return FullMatch(str.c_str(), re);
+  }
+  static bool PartialMatch(const ::std::string& str, const RE& re) {
+    return PartialMatch(str.c_str(), re);
+  }
+
+#if GTEST_HAS_GLOBAL_STRING
+
+  static bool FullMatch(const ::string& str, const RE& re) {
+    return FullMatch(str.c_str(), re);
+  }
+  static bool PartialMatch(const ::string& str, const RE& re) {
+    return PartialMatch(str.c_str(), re);
+  }
+
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+  static bool FullMatch(const char* str, const RE& re);
+  static bool PartialMatch(const char* str, const RE& re);
+
+ private:
+  void Init(const char* regex);
+
+  // We use a const char* instead of an std::string, as Google Test used to be
+  // used where std::string is not available.  TODO(wan@google.com): change to
+  // std::string.
+  const char* pattern_;
+  bool is_valid_;
+
+#if GTEST_USES_POSIX_RE
+
+  regex_t full_regex_;     // For FullMatch().
+  regex_t partial_regex_;  // For PartialMatch().
+
+#else  // GTEST_USES_SIMPLE_RE
+
+  const char* full_pattern_;  // For FullMatch();
+
+#endif
+
+  GTEST_DISALLOW_ASSIGN_(RE);
+};
+
+// Formats a source file path and a line number as they would appear
+// in an error message from the compiler used to compile this code.
+GTEST_API_ ::std::string FormatFileLocation(const char* file, int line);
+
+// Formats a file location for compiler-independent XML output.
+// Although this function is not platform dependent, we put it next to
+// FormatFileLocation in order to contrast the two functions.
+GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(const char* file,
+                                                               int line);
+
+// Defines logging utilities:
+//   GTEST_LOG_(severity) - logs messages at the specified severity level. The
+//                          message itself is streamed into the macro.
+//   LogToStderr()  - directs all log messages to stderr.
+//   FlushInfoLog() - flushes informational log messages.
+
+enum GTestLogSeverity {
+  GTEST_INFO,
+  GTEST_WARNING,
+  GTEST_ERROR,
+  GTEST_FATAL
+};
+
+// Formats log entry severity, provides a stream object for streaming the
+// log message, and terminates the message with a newline when going out of
+// scope.
+class GTEST_API_ GTestLog {
+ public:
+  GTestLog(GTestLogSeverity severity, const char* file, int line);
+
+  // Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
+  ~GTestLog();
+
+  ::std::ostream& GetStream() { return ::std::cerr; }
+
+ private:
+  const GTestLogSeverity severity_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestLog);
+};
+
+#if !defined(GTEST_LOG_)
+
+# define GTEST_LOG_(severity) \
+    ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \
+                                  __FILE__, __LINE__).GetStream()
+
+inline void LogToStderr() {}
+inline void FlushInfoLog() { fflush(NULL); }
+
+#endif  // !defined(GTEST_LOG_)
+
+#if !defined(GTEST_CHECK_)
+// INTERNAL IMPLEMENTATION - DO NOT USE.
+//
+// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
+// is not satisfied.
+//  Synopsys:
+//    GTEST_CHECK_(boolean_condition);
+//     or
+//    GTEST_CHECK_(boolean_condition) << "Additional message";
+//
+//    This checks the condition and if the condition is not satisfied
+//    it prints message about the condition violation, including the
+//    condition itself, plus additional message streamed into it, if any,
+//    and then it aborts the program. It aborts the program irrespective of
+//    whether it is built in the debug mode or not.
+# define GTEST_CHECK_(condition) \
+    GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
+    if (::testing::internal::IsTrue(condition)) \
+      ; \
+    else \
+      GTEST_LOG_(FATAL) << "Condition " #condition " failed. "
+#endif  // !defined(GTEST_CHECK_)
+
+// An all-mode assert to verify that the given POSIX-style function
+// call returns 0 (indicating success).  Known limitation: this
+// doesn't expand to a balanced 'if' statement, so enclose the macro
+// in {} if you need to use it as the only statement in an 'if'
+// branch.
+#define GTEST_CHECK_POSIX_SUCCESS_(posix_call) \
+  if (const int gtest_error = (posix_call)) \
+    GTEST_LOG_(FATAL) << #posix_call << "failed with error " \
+                      << gtest_error
+
+#if GTEST_HAS_STD_MOVE_
+using std::move;
+#else  // GTEST_HAS_STD_MOVE_
+template <typename T>
+const T& move(const T& t) {
+  return t;
+}
+#endif  // GTEST_HAS_STD_MOVE_
+
+// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE.
+//
+// Use ImplicitCast_ as a safe version of static_cast for upcasting in
+// the type hierarchy (e.g. casting a Foo* to a SuperclassOfFoo* or a
+// const Foo*).  When you use ImplicitCast_, the compiler checks that
+// the cast is safe.  Such explicit ImplicitCast_s are necessary in
+// surprisingly many situations where C++ demands an exact type match
+// instead of an argument type convertable to a target type.
+//
+// The syntax for using ImplicitCast_ is the same as for static_cast:
+//
+//   ImplicitCast_<ToType>(expr)
+//
+// ImplicitCast_ would have been part of the C++ standard library,
+// but the proposal was submitted too late.  It will probably make
+// its way into the language in the future.
+//
+// This relatively ugly name is intentional. It prevents clashes with
+// similar functions users may have (e.g., implicit_cast). The internal
+// namespace alone is not enough because the function can be found by ADL.
+template<typename To>
+inline To ImplicitCast_(To x) { return x; }
+
+// When you upcast (that is, cast a pointer from type Foo to type
+// SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts
+// always succeed.  When you downcast (that is, cast a pointer from
+// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because
+// how do you know the pointer is really of type SubclassOfFoo?  It
+// could be a bare Foo, or of type DifferentSubclassOfFoo.  Thus,
+// when you downcast, you should use this macro.  In debug mode, we
+// use dynamic_cast<> to double-check the downcast is legal (we die
+// if it's not).  In normal mode, we do the efficient static_cast<>
+// instead.  Thus, it's important to test in debug mode to make sure
+// the cast is legal!
+//    This is the only place in the code we should use dynamic_cast<>.
+// In particular, you SHOULDN'T be using dynamic_cast<> in order to
+// do RTTI (eg code like this:
+//    if (dynamic_cast<Subclass1>(foo)) HandleASubclass1Object(foo);
+//    if (dynamic_cast<Subclass2>(foo)) HandleASubclass2Object(foo);
+// You should design the code some other way not to need this.
+//
+// This relatively ugly name is intentional. It prevents clashes with
+// similar functions users may have (e.g., down_cast). The internal
+// namespace alone is not enough because the function can be found by ADL.
+template<typename To, typename From>  // use like this: DownCast_<T*>(foo);
+inline To DownCast_(From* f) {  // so we only accept pointers
+  // Ensures that To is a sub-type of From *.  This test is here only
+  // for compile-time type checking, and has no overhead in an
+  // optimized build at run-time, as it will be optimized away
+  // completely.
+  GTEST_INTENTIONAL_CONST_COND_PUSH_()
+  if (false) {
+  GTEST_INTENTIONAL_CONST_COND_POP_()
+    const To to = NULL;
+    ::testing::internal::ImplicitCast_<From*>(to);
+  }
+
+#if GTEST_HAS_RTTI
+  // RTTI: debug mode only!
+  GTEST_CHECK_(f == NULL || dynamic_cast<To>(f) != NULL);
+#endif
+  return static_cast<To>(f);
+}
+
+// Downcasts the pointer of type Base to Derived.
+// Derived must be a subclass of Base. The parameter MUST
+// point to a class of type Derived, not any subclass of it.
+// When RTTI is available, the function performs a runtime
+// check to enforce this.
+template <class Derived, class Base>
+Derived* CheckedDowncastToActualType(Base* base) {
+#if GTEST_HAS_RTTI
+  GTEST_CHECK_(typeid(*base) == typeid(Derived));
+#endif
+
+#if GTEST_HAS_DOWNCAST_
+  return ::down_cast<Derived*>(base);
+#elif GTEST_HAS_RTTI
+  return dynamic_cast<Derived*>(base);  // NOLINT
+#else
+  return static_cast<Derived*>(base);  // Poor man's downcast.
+#endif
+}
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Defines the stderr capturer:
+//   CaptureStdout     - starts capturing stdout.
+//   GetCapturedStdout - stops capturing stdout and returns the captured string.
+//   CaptureStderr     - starts capturing stderr.
+//   GetCapturedStderr - stops capturing stderr and returns the captured string.
+//
+GTEST_API_ void CaptureStdout();
+GTEST_API_ std::string GetCapturedStdout();
+GTEST_API_ void CaptureStderr();
+GTEST_API_ std::string GetCapturedStderr();
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+// Returns a path to temporary directory.
+GTEST_API_ std::string TempDir();
+
+// Returns the size (in bytes) of a file.
+GTEST_API_ size_t GetFileSize(FILE* file);
+
+// Reads the entire content of a file as a string.
+GTEST_API_ std::string ReadEntireFile(FILE* file);
+
+// All command line arguments.
+GTEST_API_ const ::std::vector<testing::internal::string>& GetArgvs();
+
+#if GTEST_HAS_DEATH_TEST
+
+const ::std::vector<testing::internal::string>& GetInjectableArgvs();
+void SetInjectableArgvs(const ::std::vector<testing::internal::string>*
+                             new_argvs);
+
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+// Defines synchronization primitives.
+#if GTEST_IS_THREADSAFE
+# if GTEST_HAS_PTHREAD
+// Sleeps for (roughly) n milliseconds.  This function is only for testing
+// Google Test's own constructs.  Don't use it in user tests, either
+// directly or indirectly.
+inline void SleepMilliseconds(int n) {
+  const timespec time = {
+    0,                  // 0 seconds.
+    n * 1000L * 1000L,  // And n ms.
+  };
+  nanosleep(&time, NULL);
+}
+# endif  // GTEST_HAS_PTHREAD
+
+# if GTEST_HAS_NOTIFICATION_
+// Notification has already been imported into the namespace.
+// Nothing to do here.
+
+# elif GTEST_HAS_PTHREAD
+// Allows a controller thread to pause execution of newly created
+// threads until notified.  Instances of this class must be created
+// and destroyed in the controller thread.
+//
+// This class is only for testing Google Test's own constructs. Do not
+// use it in user tests, either directly or indirectly.
+class Notification {
+ public:
+  Notification() : notified_(false) {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, NULL));
+  }
+  ~Notification() {
+    pthread_mutex_destroy(&mutex_);
+  }
+
+  // Notifies all threads created with this notification to start. Must
+  // be called from the controller thread.
+  void Notify() {
+    pthread_mutex_lock(&mutex_);
+    notified_ = true;
+    pthread_mutex_unlock(&mutex_);
+  }
+
+  // Blocks until the controller thread notifies. Must be called from a test
+  // thread.
+  void WaitForNotification() {
+    for (;;) {
+      pthread_mutex_lock(&mutex_);
+      const bool notified = notified_;
+      pthread_mutex_unlock(&mutex_);
+      if (notified)
+        break;
+      SleepMilliseconds(10);
+    }
+  }
+
+ private:
+  pthread_mutex_t mutex_;
+  bool notified_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
+};
+
+# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+
+GTEST_API_ void SleepMilliseconds(int n);
+
+// Provides leak-safe Windows kernel handle ownership.
+// Used in death tests and in threading support.
+class GTEST_API_ AutoHandle {
+ public:
+  // Assume that Win32 HANDLE type is equivalent to void*. Doing so allows us to
+  // avoid including <windows.h> in this header file. Including <windows.h> is
+  // undesirable because it defines a lot of symbols and macros that tend to
+  // conflict with client code. This assumption is verified by
+  // WindowsTypesTest.HANDLEIsVoidStar.
+  typedef void* Handle;
+  AutoHandle();
+  explicit AutoHandle(Handle handle);
+
+  ~AutoHandle();
+
+  Handle Get() const;
+  void Reset();
+  void Reset(Handle handle);
+
+ private:
+  // Returns true iff the handle is a valid handle object that can be closed.
+  bool IsCloseable() const;
+
+  Handle handle_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle);
+};
+
+// Allows a controller thread to pause execution of newly created
+// threads until notified.  Instances of this class must be created
+// and destroyed in the controller thread.
+//
+// This class is only for testing Google Test's own constructs. Do not
+// use it in user tests, either directly or indirectly.
+class GTEST_API_ Notification {
+ public:
+  Notification();
+  void Notify();
+  void WaitForNotification();
+
+ private:
+  AutoHandle event_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);
+};
+# endif  // GTEST_HAS_NOTIFICATION_
+
+// On MinGW, we can have both GTEST_OS_WINDOWS and GTEST_HAS_PTHREAD
+// defined, but we don't want to use MinGW's pthreads implementation, which
+// has conformance problems with some versions of the POSIX standard.
+# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
+
+// As a C-function, ThreadFuncWithCLinkage cannot be templated itself.
+// Consequently, it cannot select a correct instantiation of ThreadWithParam
+// in order to call its Run(). Introducing ThreadWithParamBase as a
+// non-templated base class for ThreadWithParam allows us to bypass this
+// problem.
+class ThreadWithParamBase {
+ public:
+  virtual ~ThreadWithParamBase() {}
+  virtual void Run() = 0;
+};
+
+// pthread_create() accepts a pointer to a function type with the C linkage.
+// According to the Standard (7.5/1), function types with different linkages
+// are different even if they are otherwise identical.  Some compilers (for
+// example, SunStudio) treat them as different types.  Since class methods
+// cannot be defined with C-linkage we need to define a free C-function to
+// pass into pthread_create().
+extern "C" inline void* ThreadFuncWithCLinkage(void* thread) {
+  static_cast<ThreadWithParamBase*>(thread)->Run();
+  return NULL;
+}
+
+// Helper class for testing Google Test's multi-threading constructs.
+// To use it, write:
+//
+//   void ThreadFunc(int param) { /* Do things with param */ }
+//   Notification thread_can_start;
+//   ...
+//   // The thread_can_start parameter is optional; you can supply NULL.
+//   ThreadWithParam<int> thread(&ThreadFunc, 5, &thread_can_start);
+//   thread_can_start.Notify();
+//
+// These classes are only for testing Google Test's own constructs. Do
+// not use them in user tests, either directly or indirectly.
+template <typename T>
+class ThreadWithParam : public ThreadWithParamBase {
+ public:
+  typedef void UserThreadFunc(T);
+
+  ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
+      : func_(func),
+        param_(param),
+        thread_can_start_(thread_can_start),
+        finished_(false) {
+    ThreadWithParamBase* const base = this;
+    // The thread can be created only after all fields except thread_
+    // have been initialized.
+    GTEST_CHECK_POSIX_SUCCESS_(
+        pthread_create(&thread_, 0, &ThreadFuncWithCLinkage, base));
+  }
+  ~ThreadWithParam() { Join(); }
+
+  void Join() {
+    if (!finished_) {
+      GTEST_CHECK_POSIX_SUCCESS_(pthread_join(thread_, 0));
+      finished_ = true;
+    }
+  }
+
+  virtual void Run() {
+    if (thread_can_start_ != NULL)
+      thread_can_start_->WaitForNotification();
+    func_(param_);
+  }
+
+ private:
+  UserThreadFunc* const func_;  // User-supplied thread function.
+  const T param_;  // User-supplied parameter to the thread function.
+  // When non-NULL, used to block execution until the controller thread
+  // notifies.
+  Notification* const thread_can_start_;
+  bool finished_;  // true iff we know that the thread function has finished.
+  pthread_t thread_;  // The native thread object.
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
+};
+# endif  // !GTEST_OS_WINDOWS && GTEST_HAS_PTHREAD ||
+         // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+
+# if GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+// Mutex and ThreadLocal have already been imported into the namespace.
+// Nothing to do here.
+
+# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+
+// Mutex implements mutex on Windows platforms.  It is used in conjunction
+// with class MutexLock:
+//
+//   Mutex mutex;
+//   ...
+//   MutexLock lock(&mutex);  // Acquires the mutex and releases it at the
+//                            // end of the current scope.
+//
+// A static Mutex *must* be defined or declared using one of the following
+// macros:
+//   GTEST_DEFINE_STATIC_MUTEX_(g_some_mutex);
+//   GTEST_DECLARE_STATIC_MUTEX_(g_some_mutex);
+//
+// (A non-static Mutex is defined/declared in the usual way).
+class GTEST_API_ Mutex {
+ public:
+  enum MutexType { kStatic = 0, kDynamic = 1 };
+  // We rely on kStaticMutex being 0 as it is to what the linker initializes
+  // type_ in static mutexes.  critical_section_ will be initialized lazily
+  // in ThreadSafeLazyInit().
+  enum StaticConstructorSelector { kStaticMutex = 0 };
+
+  // This constructor intentionally does nothing.  It relies on type_ being
+  // statically initialized to 0 (effectively setting it to kStatic) and on
+  // ThreadSafeLazyInit() to lazily initialize the rest of the members.
+  explicit Mutex(StaticConstructorSelector /*dummy*/) {}
+
+  Mutex();
+  ~Mutex();
+
+  void Lock();
+
+  void Unlock();
+
+  // Does nothing if the current thread holds the mutex. Otherwise, crashes
+  // with high probability.
+  void AssertHeld();
+
+ private:
+  // Initializes owner_thread_id_ and critical_section_ in static mutexes.
+  void ThreadSafeLazyInit();
+
+  // Per http://blogs.msdn.com/b/oldnewthing/archive/2004/02/23/78395.aspx,
+  // we assume that 0 is an invalid value for thread IDs.
+  unsigned int owner_thread_id_;
+
+  // For static mutexes, we rely on these members being initialized to zeros
+  // by the linker.
+  MutexType type_;
+  long critical_section_init_phase_;  // NOLINT
+  _RTL_CRITICAL_SECTION* critical_section_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
+};
+
+# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+    extern ::testing::internal::Mutex mutex
+
+# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
+    ::testing::internal::Mutex mutex(::testing::internal::Mutex::kStaticMutex)
+
+// We cannot name this class MutexLock because the ctor declaration would
+// conflict with a macro named MutexLock, which is defined on some
+// platforms. That macro is used as a defensive measure to prevent against
+// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
+// "MutexLock l(&mu)".  Hence the typedef trick below.
+class GTestMutexLock {
+ public:
+  explicit GTestMutexLock(Mutex* mutex)
+      : mutex_(mutex) { mutex_->Lock(); }
+
+  ~GTestMutexLock() { mutex_->Unlock(); }
+
+ private:
+  Mutex* const mutex_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
+};
+
+typedef GTestMutexLock MutexLock;
+
+// Base class for ValueHolder<T>.  Allows a caller to hold and delete a value
+// without knowing its type.
+class ThreadLocalValueHolderBase {
+ public:
+  virtual ~ThreadLocalValueHolderBase() {}
+};
+
+// Provides a way for a thread to send notifications to a ThreadLocal
+// regardless of its parameter type.
+class ThreadLocalBase {
+ public:
+  // Creates a new ValueHolder<T> object holding a default value passed to
+  // this ThreadLocal<T>'s constructor and returns it.  It is the caller's
+  // responsibility not to call this when the ThreadLocal<T> instance already
+  // has a value on the current thread.
+  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const = 0;
+
+ protected:
+  ThreadLocalBase() {}
+  virtual ~ThreadLocalBase() {}
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocalBase);
+};
+
+// Maps a thread to a set of ThreadLocals that have values instantiated on that
+// thread and notifies them when the thread exits.  A ThreadLocal instance is
+// expected to persist until all threads it has values on have terminated.
+class GTEST_API_ ThreadLocalRegistry {
+ public:
+  // Registers thread_local_instance as having value on the current thread.
+  // Returns a value that can be used to identify the thread from other threads.
+  static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
+      const ThreadLocalBase* thread_local_instance);
+
+  // Invoked when a ThreadLocal instance is destroyed.
+  static void OnThreadLocalDestroyed(
+      const ThreadLocalBase* thread_local_instance);
+};
+
+class GTEST_API_ ThreadWithParamBase {
+ public:
+  void Join();
+
+ protected:
+  class Runnable {
+   public:
+    virtual ~Runnable() {}
+    virtual void Run() = 0;
+  };
+
+  ThreadWithParamBase(Runnable *runnable, Notification* thread_can_start);
+  virtual ~ThreadWithParamBase();
+
+ private:
+  AutoHandle thread_;
+};
+
+// Helper class for testing Google Test's multi-threading constructs.
+template <typename T>
+class ThreadWithParam : public ThreadWithParamBase {
+ public:
+  typedef void UserThreadFunc(T);
+
+  ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start)
+      : ThreadWithParamBase(new RunnableImpl(func, param), thread_can_start) {
+  }
+  virtual ~ThreadWithParam() {}
+
+ private:
+  class RunnableImpl : public Runnable {
+   public:
+    RunnableImpl(UserThreadFunc* func, T param)
+        : func_(func),
+          param_(param) {
+    }
+    virtual ~RunnableImpl() {}
+    virtual void Run() {
+      func_(param_);
+    }
+
+   private:
+    UserThreadFunc* const func_;
+    const T param_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(RunnableImpl);
+  };
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
+};
+
+// Implements thread-local storage on Windows systems.
+//
+//   // Thread 1
+//   ThreadLocal<int> tl(100);  // 100 is the default value for each thread.
+//
+//   // Thread 2
+//   tl.set(150);  // Changes the value for thread 2 only.
+//   EXPECT_EQ(150, tl.get());
+//
+//   // Thread 1
+//   EXPECT_EQ(100, tl.get());  // In thread 1, tl has the original value.
+//   tl.set(200);
+//   EXPECT_EQ(200, tl.get());
+//
+// The template type argument T must have a public copy constructor.
+// In addition, the default ThreadLocal constructor requires T to have
+// a public default constructor.
+//
+// The users of a TheadLocal instance have to make sure that all but one
+// threads (including the main one) using that instance have exited before
+// destroying it. Otherwise, the per-thread objects managed for them by the
+// ThreadLocal instance are not guaranteed to be destroyed on all platforms.
+//
+// Google Test only uses global ThreadLocal objects.  That means they
+// will die after main() has returned.  Therefore, no per-thread
+// object managed by Google Test will be leaked as long as all threads
+// using Google Test have exited when main() returns.
+template <typename T>
+class ThreadLocal : public ThreadLocalBase {
+ public:
+  ThreadLocal() : default_factory_(new DefaultValueHolderFactory()) {}
+  explicit ThreadLocal(const T& value)
+      : default_factory_(new InstanceValueHolderFactory(value)) {}
+
+  ~ThreadLocal() { ThreadLocalRegistry::OnThreadLocalDestroyed(this); }
+
+  T* pointer() { return GetOrCreateValue(); }
+  const T* pointer() const { return GetOrCreateValue(); }
+  const T& get() const { return *pointer(); }
+  void set(const T& value) { *pointer() = value; }
+
+ private:
+  // Holds a value of T.  Can be deleted via its base class without the caller
+  // knowing the type of T.
+  class ValueHolder : public ThreadLocalValueHolderBase {
+   public:
+    ValueHolder() : value_() {}
+    explicit ValueHolder(const T& value) : value_(value) {}
+
+    T* pointer() { return &value_; }
+
+   private:
+    T value_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
+  };
+
+
+  T* GetOrCreateValue() const {
+    return static_cast<ValueHolder*>(
+        ThreadLocalRegistry::GetValueOnCurrentThread(this))->pointer();
+  }
+
+  virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const {
+    return default_factory_->MakeNewHolder();
+  }
+
+  class ValueHolderFactory {
+   public:
+    ValueHolderFactory() {}
+    virtual ~ValueHolderFactory() {}
+    virtual ValueHolder* MakeNewHolder() const = 0;
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
+  };
+
+  class DefaultValueHolderFactory : public ValueHolderFactory {
+   public:
+    DefaultValueHolderFactory() {}
+    virtual ValueHolder* MakeNewHolder() const { return new ValueHolder(); }
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
+  };
+
+  class InstanceValueHolderFactory : public ValueHolderFactory {
+   public:
+    explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
+    virtual ValueHolder* MakeNewHolder() const {
+      return new ValueHolder(value_);
+    }
+
+   private:
+    const T value_;  // The value for each thread.
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
+  };
+
+  scoped_ptr<ValueHolderFactory> default_factory_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
+};
+
+# elif GTEST_HAS_PTHREAD
+
+// MutexBase and Mutex implement mutex on pthreads-based platforms.
+class MutexBase {
+ public:
+  // Acquires this mutex.
+  void Lock() {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_));
+    owner_ = pthread_self();
+    has_owner_ = true;
+  }
+
+  // Releases this mutex.
+  void Unlock() {
+    // Since the lock is being released the owner_ field should no longer be
+    // considered valid. We don't protect writing to has_owner_ here, as it's
+    // the caller's responsibility to ensure that the current thread holds the
+    // mutex when this is called.
+    has_owner_ = false;
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_));
+  }
+
+  // Does nothing if the current thread holds the mutex. Otherwise, crashes
+  // with high probability.
+  void AssertHeld() const {
+    GTEST_CHECK_(has_owner_ && pthread_equal(owner_, pthread_self()))
+        << "The current thread is not holding the mutex @" << this;
+  }
+
+  // A static mutex may be used before main() is entered.  It may even
+  // be used before the dynamic initialization stage.  Therefore we
+  // must be able to initialize a static mutex object at link time.
+  // This means MutexBase has to be a POD and its member variables
+  // have to be public.
+ public:
+  pthread_mutex_t mutex_;  // The underlying pthread mutex.
+  // has_owner_ indicates whether the owner_ field below contains a valid thread
+  // ID and is therefore safe to inspect (e.g., to use in pthread_equal()). All
+  // accesses to the owner_ field should be protected by a check of this field.
+  // An alternative might be to memset() owner_ to all zeros, but there's no
+  // guarantee that a zero'd pthread_t is necessarily invalid or even different
+  // from pthread_self().
+  bool has_owner_;
+  pthread_t owner_;  // The thread holding the mutex.
+};
+
+// Forward-declares a static mutex.
+#  define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+     extern ::testing::internal::MutexBase mutex
+
+// Defines and statically (i.e. at link time) initializes a static mutex.
+#  define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
+     ::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false, pthread_t() }
+
+// The Mutex class can only be used for mutexes created at runtime. It
+// shares its API with MutexBase otherwise.
+class Mutex : public MutexBase {
+ public:
+  Mutex() {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, NULL));
+    has_owner_ = false;
+  }
+  ~Mutex() {
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&mutex_));
+  }
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex);
+};
+
+// We cannot name this class MutexLock because the ctor declaration would
+// conflict with a macro named MutexLock, which is defined on some
+// platforms. That macro is used as a defensive measure to prevent against
+// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
+// "MutexLock l(&mu)".  Hence the typedef trick below.
+class GTestMutexLock {
+ public:
+  explicit GTestMutexLock(MutexBase* mutex)
+      : mutex_(mutex) { mutex_->Lock(); }
+
+  ~GTestMutexLock() { mutex_->Unlock(); }
+
+ private:
+  MutexBase* const mutex_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock);
+};
+
+typedef GTestMutexLock MutexLock;
+
+// Helpers for ThreadLocal.
+
+// pthread_key_create() requires DeleteThreadLocalValue() to have
+// C-linkage.  Therefore it cannot be templatized to access
+// ThreadLocal<T>.  Hence the need for class
+// ThreadLocalValueHolderBase.
+class ThreadLocalValueHolderBase {
+ public:
+  virtual ~ThreadLocalValueHolderBase() {}
+};
+
+// Called by pthread to delete thread-local data stored by
+// pthread_setspecific().
+extern "C" inline void DeleteThreadLocalValue(void* value_holder) {
+  delete static_cast<ThreadLocalValueHolderBase*>(value_holder);
+}
+
+// Implements thread-local storage on pthreads-based systems.
+template <typename T>
+class ThreadLocal {
+ public:
+  ThreadLocal()
+      : key_(CreateKey()), default_factory_(new DefaultValueHolderFactory()) {}
+  explicit ThreadLocal(const T& value)
+      : key_(CreateKey()),
+        default_factory_(new InstanceValueHolderFactory(value)) {}
+
+  ~ThreadLocal() {
+    // Destroys the managed object for the current thread, if any.
+    DeleteThreadLocalValue(pthread_getspecific(key_));
+
+    // Releases resources associated with the key.  This will *not*
+    // delete managed objects for other threads.
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_key_delete(key_));
+  }
+
+  T* pointer() { return GetOrCreateValue(); }
+  const T* pointer() const { return GetOrCreateValue(); }
+  const T& get() const { return *pointer(); }
+  void set(const T& value) { *pointer() = value; }
+
+ private:
+  // Holds a value of type T.
+  class ValueHolder : public ThreadLocalValueHolderBase {
+   public:
+    ValueHolder() : value_() {}
+    explicit ValueHolder(const T& value) : value_(value) {}
+
+    T* pointer() { return &value_; }
+
+   private:
+    T value_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder);
+  };
+
+  static pthread_key_t CreateKey() {
+    pthread_key_t key;
+    // When a thread exits, DeleteThreadLocalValue() will be called on
+    // the object managed for that thread.
+    GTEST_CHECK_POSIX_SUCCESS_(
+        pthread_key_create(&key, &DeleteThreadLocalValue));
+    return key;
+  }
+
+  T* GetOrCreateValue() const {
+    ThreadLocalValueHolderBase* const holder =
+        static_cast<ThreadLocalValueHolderBase*>(pthread_getspecific(key_));
+    if (holder != NULL) {
+      return CheckedDowncastToActualType<ValueHolder>(holder)->pointer();
+    }
+
+    ValueHolder* const new_holder = default_factory_->MakeNewHolder();
+    ThreadLocalValueHolderBase* const holder_base = new_holder;
+    GTEST_CHECK_POSIX_SUCCESS_(pthread_setspecific(key_, holder_base));
+    return new_holder->pointer();
+  }
+
+  class ValueHolderFactory {
+   public:
+    ValueHolderFactory() {}
+    virtual ~ValueHolderFactory() {}
+    virtual ValueHolder* MakeNewHolder() const = 0;
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolderFactory);
+  };
+
+  class DefaultValueHolderFactory : public ValueHolderFactory {
+   public:
+    DefaultValueHolderFactory() {}
+    virtual ValueHolder* MakeNewHolder() const { return new ValueHolder(); }
+
+   private:
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultValueHolderFactory);
+  };
+
+  class InstanceValueHolderFactory : public ValueHolderFactory {
+   public:
+    explicit InstanceValueHolderFactory(const T& value) : value_(value) {}
+    virtual ValueHolder* MakeNewHolder() const {
+      return new ValueHolder(value_);
+    }
+
+   private:
+    const T value_;  // The value for each thread.
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(InstanceValueHolderFactory);
+  };
+
+  // A key pthreads uses for looking up per-thread values.
+  const pthread_key_t key_;
+  scoped_ptr<ValueHolderFactory> default_factory_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
+};
+
+# endif  // GTEST_HAS_MUTEX_AND_THREAD_LOCAL_
+
+#else  // GTEST_IS_THREADSAFE
+
+// A dummy implementation of synchronization primitives (mutex, lock,
+// and thread-local variable).  Necessary for compiling Google Test where
+// mutex is not supported - using Google Test in multiple threads is not
+// supported on such platforms.
+
+class Mutex {
+ public:
+  Mutex() {}
+  void Lock() {}
+  void Unlock() {}
+  void AssertHeld() const {}
+};
+
+# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \
+  extern ::testing::internal::Mutex mutex
+
+# define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex
+
+// We cannot name this class MutexLock because the ctor declaration would
+// conflict with a macro named MutexLock, which is defined on some
+// platforms. That macro is used as a defensive measure to prevent against
+// inadvertent misuses of MutexLock like "MutexLock(&mu)" rather than
+// "MutexLock l(&mu)".  Hence the typedef trick below.
+class GTestMutexLock {
+ public:
+  explicit GTestMutexLock(Mutex*) {}  // NOLINT
+};
+
+typedef GTestMutexLock MutexLock;
+
+template <typename T>
+class ThreadLocal {
+ public:
+  ThreadLocal() : value_() {}
+  explicit ThreadLocal(const T& value) : value_(value) {}
+  T* pointer() { return &value_; }
+  const T* pointer() const { return &value_; }
+  const T& get() const { return value_; }
+  void set(const T& value) { value_ = value; }
+ private:
+  T value_;
+};
+
+#endif  // GTEST_IS_THREADSAFE
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+GTEST_API_ size_t GetThreadCount();
+
+// Passing non-POD classes through ellipsis (...) crashes the ARM
+// compiler and generates a warning in Sun Studio.  The Nokia Symbian
+// and the IBM XL C/C++ compiler try to instantiate a copy constructor
+// for objects passed through ellipsis (...), failing for uncopyable
+// objects.  We define this to ensure that only POD is passed through
+// ellipsis on these systems.
+#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || defined(__SUNPRO_CC)
+// We lose support for NULL detection where the compiler doesn't like
+// passing non-POD classes through ellipsis (...).
+# define GTEST_ELLIPSIS_NEEDS_POD_ 1
+#else
+# define GTEST_CAN_COMPARE_NULL 1
+#endif
+
+// The Nokia Symbian and IBM XL C/C++ compilers cannot decide between
+// const T& and const T* in a function template.  These compilers
+// _can_ decide between class template specializations for T and T*,
+// so a tr1::type_traits-like is_pointer works.
+#if defined(__SYMBIAN32__) || defined(__IBMCPP__)
+# define GTEST_NEEDS_IS_POINTER_ 1
+#endif
+
+template <bool bool_value>
+struct bool_constant {
+  typedef bool_constant<bool_value> type;
+  static const bool value = bool_value;
+};
+template <bool bool_value> const bool bool_constant<bool_value>::value;
+
+typedef bool_constant<false> false_type;
+typedef bool_constant<true> true_type;
+
+template <typename T>
+struct is_pointer : public false_type {};
+
+template <typename T>
+struct is_pointer<T*> : public true_type {};
+
+template <typename Iterator>
+struct IteratorTraits {
+  typedef typename Iterator::value_type value_type;
+};
+
+template <typename T>
+struct IteratorTraits<T*> {
+  typedef T value_type;
+};
+
+template <typename T>
+struct IteratorTraits<const T*> {
+  typedef T value_type;
+};
+
+#if GTEST_OS_WINDOWS
+# define GTEST_PATH_SEP_ "\\"
+# define GTEST_HAS_ALT_PATH_SEP_ 1
+// The biggest signed integer type the compiler supports.
+typedef __int64 BiggestInt;
+#else
+# define GTEST_PATH_SEP_ "/"
+# define GTEST_HAS_ALT_PATH_SEP_ 0
+typedef long long BiggestInt;  // NOLINT
+#endif  // GTEST_OS_WINDOWS
+
+// Utilities for char.
+
+// isspace(int ch) and friends accept an unsigned char or EOF.  char
+// may be signed, depending on the compiler (or compiler flags).
+// Therefore we need to cast a char to unsigned char before calling
+// isspace(), etc.
+
+inline bool IsAlpha(char ch) {
+  return isalpha(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsAlNum(char ch) {
+  return isalnum(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsDigit(char ch) {
+  return isdigit(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsLower(char ch) {
+  return islower(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsSpace(char ch) {
+  return isspace(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsUpper(char ch) {
+  return isupper(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsXDigit(char ch) {
+  return isxdigit(static_cast<unsigned char>(ch)) != 0;
+}
+inline bool IsXDigit(wchar_t ch) {
+  const unsigned char low_byte = static_cast<unsigned char>(ch);
+  return ch == low_byte && isxdigit(low_byte) != 0;
+}
+
+inline char ToLower(char ch) {
+  return static_cast<char>(tolower(static_cast<unsigned char>(ch)));
+}
+inline char ToUpper(char ch) {
+  return static_cast<char>(toupper(static_cast<unsigned char>(ch)));
+}
+
+inline std::string StripTrailingSpaces(std::string str) {
+  std::string::iterator it = str.end();
+  while (it != str.begin() && IsSpace(*--it))
+    it = str.erase(it);
+  return str;
+}
+
+// The testing::internal::posix namespace holds wrappers for common
+// POSIX functions.  These wrappers hide the differences between
+// Windows/MSVC and POSIX systems.  Since some compilers define these
+// standard functions as macros, the wrapper cannot have the same name
+// as the wrapped function.
+
+namespace posix {
+
+// Functions with a different name on Windows.
+
+#if GTEST_OS_WINDOWS
+
+typedef struct _stat StatStruct;
+
+# ifdef __BORLANDC__
+inline int IsATTY(int fd) { return isatty(fd); }
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return stricmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return strdup(src); }
+# else  // !__BORLANDC__
+#  if GTEST_OS_WINDOWS_MOBILE
+inline int IsATTY(int /* fd */) { return 0; }
+#  else
+inline int IsATTY(int fd) { return _isatty(fd); }
+#  endif  // GTEST_OS_WINDOWS_MOBILE
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return _stricmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return _strdup(src); }
+# endif  // __BORLANDC__
+
+# if GTEST_OS_WINDOWS_MOBILE
+inline int FileNo(FILE* file) { return reinterpret_cast<int>(_fileno(file)); }
+// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this
+// time and thus not defined there.
+# else
+inline int FileNo(FILE* file) { return _fileno(file); }
+inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); }
+inline int RmDir(const char* dir) { return _rmdir(dir); }
+inline bool IsDir(const StatStruct& st) {
+  return (_S_IFDIR & st.st_mode) != 0;
+}
+# endif  // GTEST_OS_WINDOWS_MOBILE
+
+#else
+
+typedef struct stat StatStruct;
+
+inline int FileNo(FILE* file) { return fileno(file); }
+inline int IsATTY(int fd) { return isatty(fd); }
+inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); }
+inline int StrCaseCmp(const char* s1, const char* s2) {
+  return strcasecmp(s1, s2);
+}
+inline char* StrDup(const char* src) { return strdup(src); }
+inline int RmDir(const char* dir) { return rmdir(dir); }
+inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
+
+#endif  // GTEST_OS_WINDOWS
+
+// Functions deprecated by MSVC 8.0.
+
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996 /* deprecated function */)
+
+inline const char* StrNCpy(char* dest, const char* src, size_t n) {
+  return strncpy(dest, src, n);
+}
+
+// ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and
+// StrError() aren't needed on Windows CE at this time and thus not
+// defined there.
+
+#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+inline int ChDir(const char* dir) { return chdir(dir); }
+#endif
+inline FILE* FOpen(const char* path, const char* mode) {
+  return fopen(path, mode);
+}
+#if !GTEST_OS_WINDOWS_MOBILE
+inline FILE *FReopen(const char* path, const char* mode, FILE* stream) {
+  return freopen(path, mode, stream);
+}
+inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); }
+#endif
+inline int FClose(FILE* fp) { return fclose(fp); }
+#if !GTEST_OS_WINDOWS_MOBILE
+inline int Read(int fd, void* buf, unsigned int count) {
+  return static_cast<int>(read(fd, buf, count));
+}
+inline int Write(int fd, const void* buf, unsigned int count) {
+  return static_cast<int>(write(fd, buf, count));
+}
+inline int Close(int fd) { return close(fd); }
+inline const char* StrError(int errnum) { return strerror(errnum); }
+#endif
+inline const char* GetEnv(const char* name) {
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE | GTEST_OS_WINDOWS_RT
+  // We are on Windows CE, which has no environment variables.
+  static_cast<void>(name);  // To prevent 'unused argument' warning.
+  return NULL;
+#elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9)
+  // Environment variables which we programmatically clear will be set to the
+  // empty string rather than unset (NULL).  Handle that case.
+  const char* const env = getenv(name);
+  return (env != NULL && env[0] != '\0') ? env : NULL;
+#else
+  return getenv(name);
+#endif
+}
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()
+
+#if GTEST_OS_WINDOWS_MOBILE
+// Windows CE has no C library. The abort() function is used in
+// several places in Google Test. This implementation provides a reasonable
+// imitation of standard behaviour.
+void Abort();
+#else
+inline void Abort() { abort(); }
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+}  // namespace posix
+
+// MSVC "deprecates" snprintf and issues warnings wherever it is used.  In
+// order to avoid these warnings, we need to use _snprintf or _snprintf_s on
+// MSVC-based platforms.  We map the GTEST_SNPRINTF_ macro to the appropriate
+// function in order to achieve that.  We use macro definition here because
+// snprintf is a variadic function.
+#if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE
+// MSVC 2005 and above support variadic macros.
+# define GTEST_SNPRINTF_(buffer, size, format, ...) \
+     _snprintf_s(buffer, size, size, format, __VA_ARGS__)
+#elif defined(_MSC_VER)
+// Windows CE does not define _snprintf_s and MSVC prior to 2005 doesn't
+// complain about _snprintf.
+# define GTEST_SNPRINTF_ _snprintf
+#else
+# define GTEST_SNPRINTF_ snprintf
+#endif
+
+// The maximum number a BiggestInt can represent.  This definition
+// works no matter BiggestInt is represented in one's complement or
+// two's complement.
+//
+// We cannot rely on numeric_limits in STL, as __int64 and long long
+// are not part of standard C++ and numeric_limits doesn't need to be
+// defined for them.
+const BiggestInt kMaxBiggestInt =
+    ~(static_cast<BiggestInt>(1) << (8*sizeof(BiggestInt) - 1));
+
+// This template class serves as a compile-time function from size to
+// type.  It maps a size in bytes to a primitive type with that
+// size. e.g.
+//
+//   TypeWithSize<4>::UInt
+//
+// is typedef-ed to be unsigned int (unsigned integer made up of 4
+// bytes).
+//
+// Such functionality should belong to STL, but I cannot find it
+// there.
+//
+// Google Test uses this class in the implementation of floating-point
+// comparison.
+//
+// For now it only handles UInt (unsigned int) as that's all Google Test
+// needs.  Other types can be easily added in the future if need
+// arises.
+template <size_t size>
+class TypeWithSize {
+ public:
+  // This prevents the user from using TypeWithSize<N> with incorrect
+  // values of N.
+  typedef void UInt;
+};
+
+// The specialization for size 4.
+template <>
+class TypeWithSize<4> {
+ public:
+  // unsigned int has size 4 in both gcc and MSVC.
+  //
+  // As base/basictypes.h doesn't compile on Windows, we cannot use
+  // uint32, uint64, and etc here.
+  typedef int Int;
+  typedef unsigned int UInt;
+};
+
+// The specialization for size 8.
+template <>
+class TypeWithSize<8> {
+ public:
+#if GTEST_OS_WINDOWS
+  typedef __int64 Int;
+  typedef unsigned __int64 UInt;
+#else
+  typedef long long Int;  // NOLINT
+  typedef unsigned long long UInt;  // NOLINT
+#endif  // GTEST_OS_WINDOWS
+};
+
+// Integer types of known sizes.
+typedef TypeWithSize<4>::Int Int32;
+typedef TypeWithSize<4>::UInt UInt32;
+typedef TypeWithSize<8>::Int Int64;
+typedef TypeWithSize<8>::UInt UInt64;
+typedef TypeWithSize<8>::Int TimeInMillis;  // Represents time in milliseconds.
+
+// Utilities for command line flags and environment variables.
+
+// Macro for referencing flags.
+#if !defined(GTEST_FLAG)
+# define GTEST_FLAG(name) FLAGS_gtest_##name
+#endif  // !defined(GTEST_FLAG)
+
+#if !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
+# define GTEST_USE_OWN_FLAGFILE_FLAG_ 1
+#endif  // !defined(GTEST_USE_OWN_FLAGFILE_FLAG_)
+
+#if !defined(GTEST_DECLARE_bool_)
+# define GTEST_FLAG_SAVER_ ::testing::internal::GTestFlagSaver
+
+// Macros for declaring flags.
+# define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name)
+# define GTEST_DECLARE_int32_(name) \
+    GTEST_API_ extern ::testing::internal::Int32 GTEST_FLAG(name)
+#define GTEST_DECLARE_string_(name) \
+    GTEST_API_ extern ::std::string GTEST_FLAG(name)
+
+// Macros for defining flags.
+#define GTEST_DEFINE_bool_(name, default_val, doc) \
+    GTEST_API_ bool GTEST_FLAG(name) = (default_val)
+#define GTEST_DEFINE_int32_(name, default_val, doc) \
+    GTEST_API_ ::testing::internal::Int32 GTEST_FLAG(name) = (default_val)
+#define GTEST_DEFINE_string_(name, default_val, doc) \
+    GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val)
+
+#endif  // !defined(GTEST_DECLARE_bool_)
+
+// Thread annotations
+#if !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
+# define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks)
+# define GTEST_LOCK_EXCLUDED_(locks)
+#endif  // !defined(GTEST_EXCLUSIVE_LOCK_REQUIRED_)
+
+// Parses 'str' for a 32-bit signed integer.  If successful, writes the result
+// to *value and returns true; otherwise leaves *value unchanged and returns
+// false.
+// TODO(chandlerc): Find a better way to refactor flag and environment parsing
+// out of both gtest-port.cc and gtest.cc to avoid exporting this utility
+// function.
+bool ParseInt32(const Message& src_text, const char* str, Int32* value);
+
+// Parses a bool/Int32/string from the environment variable
+// corresponding to the given Google Test flag.
+bool BoolFromGTestEnv(const char* flag, bool default_val);
+GTEST_API_ Int32 Int32FromGTestEnv(const char* flag, Int32 default_val);
+std::string StringFromGTestEnv(const char* flag, const char* default_val);
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-string.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-string.h
new file mode 100644
index 0000000000..97f1a7fdd2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-string.h
@@ -0,0 +1,167 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file declares the String class and functions used internally by
+// Google Test.  They are subject to change without notice. They should not used
+// by code external to Google Test.
+//
+// This header file is #included by <gtest/internal/gtest-internal.h>.
+// It should not be #included by other files.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
+
+#ifdef __BORLANDC__
+// string.h is not guaranteed to provide strcpy on C++ Builder.
+# include <mem.h>
+#endif
+
+#include <string.h>
+#include <string>
+
+#include "gtest/internal/gtest-port.h"
+
+namespace testing {
+namespace internal {
+
+// String - an abstract class holding static string utilities.
+class GTEST_API_ String {
+ public:
+  // Static utility methods
+
+  // Clones a 0-terminated C string, allocating memory using new.  The
+  // caller is responsible for deleting the return value using
+  // delete[].  Returns the cloned string, or NULL if the input is
+  // NULL.
+  //
+  // This is different from strdup() in string.h, which allocates
+  // memory using malloc().
+  static const char* CloneCString(const char* c_str);
+
+#if GTEST_OS_WINDOWS_MOBILE
+  // Windows CE does not have the 'ANSI' versions of Win32 APIs. To be
+  // able to pass strings to Win32 APIs on CE we need to convert them
+  // to 'Unicode', UTF-16.
+
+  // Creates a UTF-16 wide string from the given ANSI string, allocating
+  // memory using new. The caller is responsible for deleting the return
+  // value using delete[]. Returns the wide string, or NULL if the
+  // input is NULL.
+  //
+  // The wide string is created using the ANSI codepage (CP_ACP) to
+  // match the behaviour of the ANSI versions of Win32 calls and the
+  // C runtime.
+  static LPCWSTR AnsiToUtf16(const char* c_str);
+
+  // Creates an ANSI string from the given wide string, allocating
+  // memory using new. The caller is responsible for deleting the return
+  // value using delete[]. Returns the ANSI string, or NULL if the
+  // input is NULL.
+  //
+  // The returned string is created using the ANSI codepage (CP_ACP) to
+  // match the behaviour of the ANSI versions of Win32 calls and the
+  // C runtime.
+  static const char* Utf16ToAnsi(LPCWSTR utf16_str);
+#endif
+
+  // Compares two C strings.  Returns true iff they have the same content.
+  //
+  // Unlike strcmp(), this function can handle NULL argument(s).  A
+  // NULL C string is considered different to any non-NULL C string,
+  // including the empty string.
+  static bool CStringEquals(const char* lhs, const char* rhs);
+
+  // Converts a wide C string to a String using the UTF-8 encoding.
+  // NULL will be converted to "(null)".  If an error occurred during
+  // the conversion, "(failed to convert from wide string)" is
+  // returned.
+  static std::string ShowWideCString(const wchar_t* wide_c_str);
+
+  // Compares two wide C strings.  Returns true iff they have the same
+  // content.
+  //
+  // Unlike wcscmp(), this function can handle NULL argument(s).  A
+  // NULL C string is considered different to any non-NULL C string,
+  // including the empty string.
+  static bool WideCStringEquals(const wchar_t* lhs, const wchar_t* rhs);
+
+  // Compares two C strings, ignoring case.  Returns true iff they
+  // have the same content.
+  //
+  // Unlike strcasecmp(), this function can handle NULL argument(s).
+  // A NULL C string is considered different to any non-NULL C string,
+  // including the empty string.
+  static bool CaseInsensitiveCStringEquals(const char* lhs,
+                                           const char* rhs);
+
+  // Compares two wide C strings, ignoring case.  Returns true iff they
+  // have the same content.
+  //
+  // Unlike wcscasecmp(), this function can handle NULL argument(s).
+  // A NULL C string is considered different to any non-NULL wide C string,
+  // including the empty string.
+  // NB: The implementations on different platforms slightly differ.
+  // On windows, this method uses _wcsicmp which compares according to LC_CTYPE
+  // environment variable. On GNU platform this method uses wcscasecmp
+  // which compares according to LC_CTYPE category of the current locale.
+  // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
+  // current locale.
+  static bool CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
+                                               const wchar_t* rhs);
+
+  // Returns true iff the given string ends with the given suffix, ignoring
+  // case. Any string is considered to end with an empty suffix.
+  static bool EndsWithCaseInsensitive(
+      const std::string& str, const std::string& suffix);
+
+  // Formats an int value as "%02d".
+  static std::string FormatIntWidth2(int value);  // "%02d" for width == 2
+
+  // Formats an int value as "%X".
+  static std::string FormatHexInt(int value);
+
+  // Formats a byte as "%02X".
+  static std::string FormatByte(unsigned char value);
+
+ private:
+  String();  // Not meant to be instantiated.
+};  // class String
+
+// Gets the content of the stringstream's buffer as an std::string.  Each '\0'
+// character in the buffer is replaced with "\\0".
+GTEST_API_ std::string StringStreamToString(::std::stringstream* stream);
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-tuple.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-tuple.h
new file mode 100644
index 0000000000..e9b405340a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-tuple.h
@@ -0,0 +1,1020 @@
+// This file was GENERATED by command:
+//     pump.py gtest-tuple.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2009 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Implements a subset of TR1 tuple needed by Google Test and Google Mock.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
+
+#include <utility>  // For ::std::pair.
+
+// The compiler used in Symbian has a bug that prevents us from declaring the
+// tuple template as a friend (it complains that tuple is redefined).  This
+// hack bypasses the bug by declaring the members that should otherwise be
+// private as public.
+// Sun Studio versions < 12 also have the above bug.
+#if defined(__SYMBIAN32__) || (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590)
+# define GTEST_DECLARE_TUPLE_AS_FRIEND_ public:
+#else
+# define GTEST_DECLARE_TUPLE_AS_FRIEND_ \
+    template <GTEST_10_TYPENAMES_(U)> friend class tuple; \
+   private:
+#endif
+
+// Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that conflict
+// with our own definitions. Therefore using our own tuple does not work on
+// those compilers.
+#if defined(_MSC_VER) && _MSC_VER >= 1600  /* 1600 is Visual Studio 2010 */
+# error "gtest's tuple doesn't compile on Visual Studio 2010 or later. \
+GTEST_USE_OWN_TR1_TUPLE must be set to 0 on those compilers."
+#endif
+
+// GTEST_n_TUPLE_(T) is the type of an n-tuple.
+#define GTEST_0_TUPLE_(T) tuple<>
+#define GTEST_1_TUPLE_(T) tuple<T##0, void, void, void, void, void, void, \
+    void, void, void>
+#define GTEST_2_TUPLE_(T) tuple<T##0, T##1, void, void, void, void, void, \
+    void, void, void>
+#define GTEST_3_TUPLE_(T) tuple<T##0, T##1, T##2, void, void, void, void, \
+    void, void, void>
+#define GTEST_4_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, void, void, void, \
+    void, void, void>
+#define GTEST_5_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, T##4, void, void, \
+    void, void, void>
+#define GTEST_6_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, T##4, T##5, void, \
+    void, void, void>
+#define GTEST_7_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, T##4, T##5, T##6, \
+    void, void, void>
+#define GTEST_8_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, T##4, T##5, T##6, \
+    T##7, void, void>
+#define GTEST_9_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, T##4, T##5, T##6, \
+    T##7, T##8, void>
+#define GTEST_10_TUPLE_(T) tuple<T##0, T##1, T##2, T##3, T##4, T##5, T##6, \
+    T##7, T##8, T##9>
+
+// GTEST_n_TYPENAMES_(T) declares a list of n typenames.
+#define GTEST_0_TYPENAMES_(T)
+#define GTEST_1_TYPENAMES_(T) typename T##0
+#define GTEST_2_TYPENAMES_(T) typename T##0, typename T##1
+#define GTEST_3_TYPENAMES_(T) typename T##0, typename T##1, typename T##2
+#define GTEST_4_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3
+#define GTEST_5_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3, typename T##4
+#define GTEST_6_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3, typename T##4, typename T##5
+#define GTEST_7_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3, typename T##4, typename T##5, typename T##6
+#define GTEST_8_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3, typename T##4, typename T##5, typename T##6, typename T##7
+#define GTEST_9_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3, typename T##4, typename T##5, typename T##6, \
+    typename T##7, typename T##8
+#define GTEST_10_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \
+    typename T##3, typename T##4, typename T##5, typename T##6, \
+    typename T##7, typename T##8, typename T##9
+
+// In theory, defining stuff in the ::std namespace is undefined
+// behavior.  We can do this as we are playing the role of a standard
+// library vendor.
+namespace std {
+namespace tr1 {
+
+template <typename T0 = void, typename T1 = void, typename T2 = void,
+    typename T3 = void, typename T4 = void, typename T5 = void,
+    typename T6 = void, typename T7 = void, typename T8 = void,
+    typename T9 = void>
+class tuple;
+
+// Anything in namespace gtest_internal is Google Test's INTERNAL
+// IMPLEMENTATION DETAIL and MUST NOT BE USED DIRECTLY in user code.
+namespace gtest_internal {
+
+// ByRef<T>::type is T if T is a reference; otherwise it's const T&.
+template <typename T>
+struct ByRef { typedef const T& type; };  // NOLINT
+template <typename T>
+struct ByRef<T&> { typedef T& type; };  // NOLINT
+
+// A handy wrapper for ByRef.
+#define GTEST_BY_REF_(T) typename ::std::tr1::gtest_internal::ByRef<T>::type
+
+// AddRef<T>::type is T if T is a reference; otherwise it's T&.  This
+// is the same as tr1::add_reference<T>::type.
+template <typename T>
+struct AddRef { typedef T& type; };  // NOLINT
+template <typename T>
+struct AddRef<T&> { typedef T& type; };  // NOLINT
+
+// A handy wrapper for AddRef.
+#define GTEST_ADD_REF_(T) typename ::std::tr1::gtest_internal::AddRef<T>::type
+
+// A helper for implementing get<k>().
+template <int k> class Get;
+
+// A helper for implementing tuple_element<k, T>.  kIndexValid is true
+// iff k < the number of fields in tuple type T.
+template <bool kIndexValid, int kIndex, class Tuple>
+struct TupleElement;
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 0, GTEST_10_TUPLE_(T) > {
+  typedef T0 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 1, GTEST_10_TUPLE_(T) > {
+  typedef T1 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 2, GTEST_10_TUPLE_(T) > {
+  typedef T2 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 3, GTEST_10_TUPLE_(T) > {
+  typedef T3 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 4, GTEST_10_TUPLE_(T) > {
+  typedef T4 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 5, GTEST_10_TUPLE_(T) > {
+  typedef T5 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 6, GTEST_10_TUPLE_(T) > {
+  typedef T6 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 7, GTEST_10_TUPLE_(T) > {
+  typedef T7 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 8, GTEST_10_TUPLE_(T) > {
+  typedef T8 type;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct TupleElement<true, 9, GTEST_10_TUPLE_(T) > {
+  typedef T9 type;
+};
+
+}  // namespace gtest_internal
+
+template <>
+class tuple<> {
+ public:
+  tuple() {}
+  tuple(const tuple& /* t */)  {}
+  tuple& operator=(const tuple& /* t */) { return *this; }
+};
+
+template <GTEST_1_TYPENAMES_(T)>
+class GTEST_1_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0) : f0_(f0) {}
+
+  tuple(const tuple& t) : f0_(t.f0_) {}
+
+  template <GTEST_1_TYPENAMES_(U)>
+  tuple(const GTEST_1_TUPLE_(U)& t) : f0_(t.f0_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_1_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_1_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_1_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_1_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    return *this;
+  }
+
+  T0 f0_;
+};
+
+template <GTEST_2_TYPENAMES_(T)>
+class GTEST_2_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1) : f0_(f0),
+      f1_(f1) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_) {}
+
+  template <GTEST_2_TYPENAMES_(U)>
+  tuple(const GTEST_2_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_) {}
+  template <typename U0, typename U1>
+  tuple(const ::std::pair<U0, U1>& p) : f0_(p.first), f1_(p.second) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_2_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_2_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+  template <typename U0, typename U1>
+  tuple& operator=(const ::std::pair<U0, U1>& p) {
+    f0_ = p.first;
+    f1_ = p.second;
+    return *this;
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_2_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_2_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+};
+
+template <GTEST_3_TYPENAMES_(T)>
+class GTEST_3_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2) : f0_(f0), f1_(f1), f2_(f2) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_) {}
+
+  template <GTEST_3_TYPENAMES_(U)>
+  tuple(const GTEST_3_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_3_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_3_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_3_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_3_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+};
+
+template <GTEST_4_TYPENAMES_(T)>
+class GTEST_4_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3) : f0_(f0), f1_(f1), f2_(f2),
+      f3_(f3) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_) {}
+
+  template <GTEST_4_TYPENAMES_(U)>
+  tuple(const GTEST_4_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_4_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_4_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_4_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_4_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+};
+
+template <GTEST_5_TYPENAMES_(T)>
+class GTEST_5_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_(), f4_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3,
+      GTEST_BY_REF_(T4) f4) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_),
+      f4_(t.f4_) {}
+
+  template <GTEST_5_TYPENAMES_(U)>
+  tuple(const GTEST_5_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_), f4_(t.f4_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_5_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_5_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_5_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_5_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    f4_ = t.f4_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+  T4 f4_;
+};
+
+template <GTEST_6_TYPENAMES_(T)>
+class GTEST_6_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4,
+      GTEST_BY_REF_(T5) f5) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4),
+      f5_(f5) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_),
+      f4_(t.f4_), f5_(t.f5_) {}
+
+  template <GTEST_6_TYPENAMES_(U)>
+  tuple(const GTEST_6_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_), f4_(t.f4_), f5_(t.f5_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_6_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_6_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_6_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_6_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    f4_ = t.f4_;
+    f5_ = t.f5_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+  T4 f4_;
+  T5 f5_;
+};
+
+template <GTEST_7_TYPENAMES_(T)>
+class GTEST_7_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4,
+      GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6) : f0_(f0), f1_(f1), f2_(f2),
+      f3_(f3), f4_(f4), f5_(f5), f6_(f6) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_),
+      f4_(t.f4_), f5_(t.f5_), f6_(t.f6_) {}
+
+  template <GTEST_7_TYPENAMES_(U)>
+  tuple(const GTEST_7_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_7_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_7_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_7_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_7_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    f4_ = t.f4_;
+    f5_ = t.f5_;
+    f6_ = t.f6_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+  T4 f4_;
+  T5 f5_;
+  T6 f6_;
+};
+
+template <GTEST_8_TYPENAMES_(T)>
+class GTEST_8_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_(), f7_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4,
+      GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6,
+      GTEST_BY_REF_(T7) f7) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4),
+      f5_(f5), f6_(f6), f7_(f7) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_),
+      f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_) {}
+
+  template <GTEST_8_TYPENAMES_(U)>
+  tuple(const GTEST_8_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_8_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_8_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_8_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_8_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    f4_ = t.f4_;
+    f5_ = t.f5_;
+    f6_ = t.f6_;
+    f7_ = t.f7_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+  T4 f4_;
+  T5 f5_;
+  T6 f6_;
+  T7 f7_;
+};
+
+template <GTEST_9_TYPENAMES_(T)>
+class GTEST_9_TUPLE_(T) {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_(), f7_(), f8_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4,
+      GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6, GTEST_BY_REF_(T7) f7,
+      GTEST_BY_REF_(T8) f8) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4),
+      f5_(f5), f6_(f6), f7_(f7), f8_(f8) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_),
+      f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_) {}
+
+  template <GTEST_9_TYPENAMES_(U)>
+  tuple(const GTEST_9_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_9_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_9_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_9_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_9_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    f4_ = t.f4_;
+    f5_ = t.f5_;
+    f6_ = t.f6_;
+    f7_ = t.f7_;
+    f8_ = t.f8_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+  T4 f4_;
+  T5 f5_;
+  T6 f6_;
+  T7 f7_;
+  T8 f8_;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+class tuple {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_(), f7_(), f8_(),
+      f9_() {}
+
+  explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1,
+      GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4,
+      GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6, GTEST_BY_REF_(T7) f7,
+      GTEST_BY_REF_(T8) f8, GTEST_BY_REF_(T9) f9) : f0_(f0), f1_(f1), f2_(f2),
+      f3_(f3), f4_(f4), f5_(f5), f6_(f6), f7_(f7), f8_(f8), f9_(f9) {}
+
+  tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_),
+      f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_), f9_(t.f9_) {}
+
+  template <GTEST_10_TYPENAMES_(U)>
+  tuple(const GTEST_10_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_),
+      f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_),
+      f9_(t.f9_) {}
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_10_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_10_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_10_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_10_TUPLE_(U)& t) {
+    f0_ = t.f0_;
+    f1_ = t.f1_;
+    f2_ = t.f2_;
+    f3_ = t.f3_;
+    f4_ = t.f4_;
+    f5_ = t.f5_;
+    f6_ = t.f6_;
+    f7_ = t.f7_;
+    f8_ = t.f8_;
+    f9_ = t.f9_;
+    return *this;
+  }
+
+  T0 f0_;
+  T1 f1_;
+  T2 f2_;
+  T3 f3_;
+  T4 f4_;
+  T5 f5_;
+  T6 f6_;
+  T7 f7_;
+  T8 f8_;
+  T9 f9_;
+};
+
+// 6.1.3.2 Tuple creation functions.
+
+// Known limitations: we don't support passing an
+// std::tr1::reference_wrapper<T> to make_tuple().  And we don't
+// implement tie().
+
+inline tuple<> make_tuple() { return tuple<>(); }
+
+template <GTEST_1_TYPENAMES_(T)>
+inline GTEST_1_TUPLE_(T) make_tuple(const T0& f0) {
+  return GTEST_1_TUPLE_(T)(f0);
+}
+
+template <GTEST_2_TYPENAMES_(T)>
+inline GTEST_2_TUPLE_(T) make_tuple(const T0& f0, const T1& f1) {
+  return GTEST_2_TUPLE_(T)(f0, f1);
+}
+
+template <GTEST_3_TYPENAMES_(T)>
+inline GTEST_3_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2) {
+  return GTEST_3_TUPLE_(T)(f0, f1, f2);
+}
+
+template <GTEST_4_TYPENAMES_(T)>
+inline GTEST_4_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3) {
+  return GTEST_4_TUPLE_(T)(f0, f1, f2, f3);
+}
+
+template <GTEST_5_TYPENAMES_(T)>
+inline GTEST_5_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3, const T4& f4) {
+  return GTEST_5_TUPLE_(T)(f0, f1, f2, f3, f4);
+}
+
+template <GTEST_6_TYPENAMES_(T)>
+inline GTEST_6_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3, const T4& f4, const T5& f5) {
+  return GTEST_6_TUPLE_(T)(f0, f1, f2, f3, f4, f5);
+}
+
+template <GTEST_7_TYPENAMES_(T)>
+inline GTEST_7_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3, const T4& f4, const T5& f5, const T6& f6) {
+  return GTEST_7_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6);
+}
+
+template <GTEST_8_TYPENAMES_(T)>
+inline GTEST_8_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3, const T4& f4, const T5& f5, const T6& f6, const T7& f7) {
+  return GTEST_8_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6, f7);
+}
+
+template <GTEST_9_TYPENAMES_(T)>
+inline GTEST_9_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3, const T4& f4, const T5& f5, const T6& f6, const T7& f7,
+    const T8& f8) {
+  return GTEST_9_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6, f7, f8);
+}
+
+template <GTEST_10_TYPENAMES_(T)>
+inline GTEST_10_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2,
+    const T3& f3, const T4& f4, const T5& f5, const T6& f6, const T7& f7,
+    const T8& f8, const T9& f9) {
+  return GTEST_10_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6, f7, f8, f9);
+}
+
+// 6.1.3.3 Tuple helper classes.
+
+template <typename Tuple> struct tuple_size;
+
+template <GTEST_0_TYPENAMES_(T)>
+struct tuple_size<GTEST_0_TUPLE_(T) > {
+  static const int value = 0;
+};
+
+template <GTEST_1_TYPENAMES_(T)>
+struct tuple_size<GTEST_1_TUPLE_(T) > {
+  static const int value = 1;
+};
+
+template <GTEST_2_TYPENAMES_(T)>
+struct tuple_size<GTEST_2_TUPLE_(T) > {
+  static const int value = 2;
+};
+
+template <GTEST_3_TYPENAMES_(T)>
+struct tuple_size<GTEST_3_TUPLE_(T) > {
+  static const int value = 3;
+};
+
+template <GTEST_4_TYPENAMES_(T)>
+struct tuple_size<GTEST_4_TUPLE_(T) > {
+  static const int value = 4;
+};
+
+template <GTEST_5_TYPENAMES_(T)>
+struct tuple_size<GTEST_5_TUPLE_(T) > {
+  static const int value = 5;
+};
+
+template <GTEST_6_TYPENAMES_(T)>
+struct tuple_size<GTEST_6_TUPLE_(T) > {
+  static const int value = 6;
+};
+
+template <GTEST_7_TYPENAMES_(T)>
+struct tuple_size<GTEST_7_TUPLE_(T) > {
+  static const int value = 7;
+};
+
+template <GTEST_8_TYPENAMES_(T)>
+struct tuple_size<GTEST_8_TUPLE_(T) > {
+  static const int value = 8;
+};
+
+template <GTEST_9_TYPENAMES_(T)>
+struct tuple_size<GTEST_9_TUPLE_(T) > {
+  static const int value = 9;
+};
+
+template <GTEST_10_TYPENAMES_(T)>
+struct tuple_size<GTEST_10_TUPLE_(T) > {
+  static const int value = 10;
+};
+
+template <int k, class Tuple>
+struct tuple_element {
+  typedef typename gtest_internal::TupleElement<
+      k < (tuple_size<Tuple>::value), k, Tuple>::type type;
+};
+
+#define GTEST_TUPLE_ELEMENT_(k, Tuple) typename tuple_element<k, Tuple >::type
+
+// 6.1.3.4 Element access.
+
+namespace gtest_internal {
+
+template <>
+class Get<0> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(0, Tuple))
+  Field(Tuple& t) { return t.f0_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(0, Tuple))
+  ConstField(const Tuple& t) { return t.f0_; }
+};
+
+template <>
+class Get<1> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(1, Tuple))
+  Field(Tuple& t) { return t.f1_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(1, Tuple))
+  ConstField(const Tuple& t) { return t.f1_; }
+};
+
+template <>
+class Get<2> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(2, Tuple))
+  Field(Tuple& t) { return t.f2_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(2, Tuple))
+  ConstField(const Tuple& t) { return t.f2_; }
+};
+
+template <>
+class Get<3> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(3, Tuple))
+  Field(Tuple& t) { return t.f3_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(3, Tuple))
+  ConstField(const Tuple& t) { return t.f3_; }
+};
+
+template <>
+class Get<4> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(4, Tuple))
+  Field(Tuple& t) { return t.f4_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(4, Tuple))
+  ConstField(const Tuple& t) { return t.f4_; }
+};
+
+template <>
+class Get<5> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(5, Tuple))
+  Field(Tuple& t) { return t.f5_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(5, Tuple))
+  ConstField(const Tuple& t) { return t.f5_; }
+};
+
+template <>
+class Get<6> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(6, Tuple))
+  Field(Tuple& t) { return t.f6_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(6, Tuple))
+  ConstField(const Tuple& t) { return t.f6_; }
+};
+
+template <>
+class Get<7> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(7, Tuple))
+  Field(Tuple& t) { return t.f7_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(7, Tuple))
+  ConstField(const Tuple& t) { return t.f7_; }
+};
+
+template <>
+class Get<8> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(8, Tuple))
+  Field(Tuple& t) { return t.f8_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(8, Tuple))
+  ConstField(const Tuple& t) { return t.f8_; }
+};
+
+template <>
+class Get<9> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(9, Tuple))
+  Field(Tuple& t) { return t.f9_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(9, Tuple))
+  ConstField(const Tuple& t) { return t.f9_; }
+};
+
+}  // namespace gtest_internal
+
+template <int k, GTEST_10_TYPENAMES_(T)>
+GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(k, GTEST_10_TUPLE_(T)))
+get(GTEST_10_TUPLE_(T)& t) {
+  return gtest_internal::Get<k>::Field(t);
+}
+
+template <int k, GTEST_10_TYPENAMES_(T)>
+GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(k,  GTEST_10_TUPLE_(T)))
+get(const GTEST_10_TUPLE_(T)& t) {
+  return gtest_internal::Get<k>::ConstField(t);
+}
+
+// 6.1.3.5 Relational operators
+
+// We only implement == and !=, as we don't have a need for the rest yet.
+
+namespace gtest_internal {
+
+// SameSizeTuplePrefixComparator<k, k>::Eq(t1, t2) returns true if the
+// first k fields of t1 equals the first k fields of t2.
+// SameSizeTuplePrefixComparator(k1, k2) would be a compiler error if
+// k1 != k2.
+template <int kSize1, int kSize2>
+struct SameSizeTuplePrefixComparator;
+
+template <>
+struct SameSizeTuplePrefixComparator<0, 0> {
+  template <class Tuple1, class Tuple2>
+  static bool Eq(const Tuple1& /* t1 */, const Tuple2& /* t2 */) {
+    return true;
+  }
+};
+
+template <int k>
+struct SameSizeTuplePrefixComparator<k, k> {
+  template <class Tuple1, class Tuple2>
+  static bool Eq(const Tuple1& t1, const Tuple2& t2) {
+    return SameSizeTuplePrefixComparator<k - 1, k - 1>::Eq(t1, t2) &&
+        ::std::tr1::get<k - 1>(t1) == ::std::tr1::get<k - 1>(t2);
+  }
+};
+
+}  // namespace gtest_internal
+
+template <GTEST_10_TYPENAMES_(T), GTEST_10_TYPENAMES_(U)>
+inline bool operator==(const GTEST_10_TUPLE_(T)& t,
+                       const GTEST_10_TUPLE_(U)& u) {
+  return gtest_internal::SameSizeTuplePrefixComparator<
+      tuple_size<GTEST_10_TUPLE_(T) >::value,
+      tuple_size<GTEST_10_TUPLE_(U) >::value>::Eq(t, u);
+}
+
+template <GTEST_10_TYPENAMES_(T), GTEST_10_TYPENAMES_(U)>
+inline bool operator!=(const GTEST_10_TUPLE_(T)& t,
+                       const GTEST_10_TUPLE_(U)& u) { return !(t == u); }
+
+// 6.1.4 Pairs.
+// Unimplemented.
+
+}  // namespace tr1
+}  // namespace std
+
+#undef GTEST_0_TUPLE_
+#undef GTEST_1_TUPLE_
+#undef GTEST_2_TUPLE_
+#undef GTEST_3_TUPLE_
+#undef GTEST_4_TUPLE_
+#undef GTEST_5_TUPLE_
+#undef GTEST_6_TUPLE_
+#undef GTEST_7_TUPLE_
+#undef GTEST_8_TUPLE_
+#undef GTEST_9_TUPLE_
+#undef GTEST_10_TUPLE_
+
+#undef GTEST_0_TYPENAMES_
+#undef GTEST_1_TYPENAMES_
+#undef GTEST_2_TYPENAMES_
+#undef GTEST_3_TYPENAMES_
+#undef GTEST_4_TYPENAMES_
+#undef GTEST_5_TYPENAMES_
+#undef GTEST_6_TYPENAMES_
+#undef GTEST_7_TYPENAMES_
+#undef GTEST_8_TYPENAMES_
+#undef GTEST_9_TYPENAMES_
+#undef GTEST_10_TYPENAMES_
+
+#undef GTEST_DECLARE_TUPLE_AS_FRIEND_
+#undef GTEST_BY_REF_
+#undef GTEST_ADD_REF_
+#undef GTEST_TUPLE_ELEMENT_
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-tuple.h.pump b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-tuple.h.pump
new file mode 100644
index 0000000000..429ddfeeca
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-tuple.h.pump
@@ -0,0 +1,347 @@
+$$ -*- mode: c++; -*-
+$var n = 10  $$ Maximum number of tuple fields we want to support.
+$$ This meta comment fixes auto-indentation in Emacs. }}
+// Copyright 2009 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Implements a subset of TR1 tuple needed by Google Test and Google Mock.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
+
+#include <utility>  // For ::std::pair.
+
+// The compiler used in Symbian has a bug that prevents us from declaring the
+// tuple template as a friend (it complains that tuple is redefined).  This
+// hack bypasses the bug by declaring the members that should otherwise be
+// private as public.
+// Sun Studio versions < 12 also have the above bug.
+#if defined(__SYMBIAN32__) || (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590)
+# define GTEST_DECLARE_TUPLE_AS_FRIEND_ public:
+#else
+# define GTEST_DECLARE_TUPLE_AS_FRIEND_ \
+    template <GTEST_$(n)_TYPENAMES_(U)> friend class tuple; \
+   private:
+#endif
+
+// Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that conflict
+// with our own definitions. Therefore using our own tuple does not work on
+// those compilers.
+#if defined(_MSC_VER) && _MSC_VER >= 1600  /* 1600 is Visual Studio 2010 */
+# error "gtest's tuple doesn't compile on Visual Studio 2010 or later. \
+GTEST_USE_OWN_TR1_TUPLE must be set to 0 on those compilers."
+#endif
+
+
+$range i 0..n-1
+$range j 0..n
+$range k 1..n
+// GTEST_n_TUPLE_(T) is the type of an n-tuple.
+#define GTEST_0_TUPLE_(T) tuple<>
+
+$for k [[
+$range m 0..k-1
+$range m2 k..n-1
+#define GTEST_$(k)_TUPLE_(T) tuple<$for m, [[T##$m]]$for m2 [[, void]]>
+
+]]
+
+// GTEST_n_TYPENAMES_(T) declares a list of n typenames.
+
+$for j [[
+$range m 0..j-1
+#define GTEST_$(j)_TYPENAMES_(T) $for m, [[typename T##$m]]
+
+
+]]
+
+// In theory, defining stuff in the ::std namespace is undefined
+// behavior.  We can do this as we are playing the role of a standard
+// library vendor.
+namespace std {
+namespace tr1 {
+
+template <$for i, [[typename T$i = void]]>
+class tuple;
+
+// Anything in namespace gtest_internal is Google Test's INTERNAL
+// IMPLEMENTATION DETAIL and MUST NOT BE USED DIRECTLY in user code.
+namespace gtest_internal {
+
+// ByRef<T>::type is T if T is a reference; otherwise it's const T&.
+template <typename T>
+struct ByRef { typedef const T& type; };  // NOLINT
+template <typename T>
+struct ByRef<T&> { typedef T& type; };  // NOLINT
+
+// A handy wrapper for ByRef.
+#define GTEST_BY_REF_(T) typename ::std::tr1::gtest_internal::ByRef<T>::type
+
+// AddRef<T>::type is T if T is a reference; otherwise it's T&.  This
+// is the same as tr1::add_reference<T>::type.
+template <typename T>
+struct AddRef { typedef T& type; };  // NOLINT
+template <typename T>
+struct AddRef<T&> { typedef T& type; };  // NOLINT
+
+// A handy wrapper for AddRef.
+#define GTEST_ADD_REF_(T) typename ::std::tr1::gtest_internal::AddRef<T>::type
+
+// A helper for implementing get<k>().
+template <int k> class Get;
+
+// A helper for implementing tuple_element<k, T>.  kIndexValid is true
+// iff k < the number of fields in tuple type T.
+template <bool kIndexValid, int kIndex, class Tuple>
+struct TupleElement;
+
+
+$for i [[
+template <GTEST_$(n)_TYPENAMES_(T)>
+struct TupleElement<true, $i, GTEST_$(n)_TUPLE_(T) > {
+  typedef T$i type;
+};
+
+
+]]
+}  // namespace gtest_internal
+
+template <>
+class tuple<> {
+ public:
+  tuple() {}
+  tuple(const tuple& /* t */)  {}
+  tuple& operator=(const tuple& /* t */) { return *this; }
+};
+
+
+$for k [[
+$range m 0..k-1
+template <GTEST_$(k)_TYPENAMES_(T)>
+class $if k < n [[GTEST_$(k)_TUPLE_(T)]] $else [[tuple]] {
+ public:
+  template <int k> friend class gtest_internal::Get;
+
+  tuple() : $for m, [[f$(m)_()]] {}
+
+  explicit tuple($for m, [[GTEST_BY_REF_(T$m) f$m]]) : [[]]
+$for m, [[f$(m)_(f$m)]] {}
+
+  tuple(const tuple& t) : $for m, [[f$(m)_(t.f$(m)_)]] {}
+
+  template <GTEST_$(k)_TYPENAMES_(U)>
+  tuple(const GTEST_$(k)_TUPLE_(U)& t) : $for m, [[f$(m)_(t.f$(m)_)]] {}
+
+$if k == 2 [[
+  template <typename U0, typename U1>
+  tuple(const ::std::pair<U0, U1>& p) : f0_(p.first), f1_(p.second) {}
+
+]]
+
+  tuple& operator=(const tuple& t) { return CopyFrom(t); }
+
+  template <GTEST_$(k)_TYPENAMES_(U)>
+  tuple& operator=(const GTEST_$(k)_TUPLE_(U)& t) {
+    return CopyFrom(t);
+  }
+
+$if k == 2 [[
+  template <typename U0, typename U1>
+  tuple& operator=(const ::std::pair<U0, U1>& p) {
+    f0_ = p.first;
+    f1_ = p.second;
+    return *this;
+  }
+
+]]
+
+  GTEST_DECLARE_TUPLE_AS_FRIEND_
+
+  template <GTEST_$(k)_TYPENAMES_(U)>
+  tuple& CopyFrom(const GTEST_$(k)_TUPLE_(U)& t) {
+
+$for m [[
+    f$(m)_ = t.f$(m)_;
+
+]]
+    return *this;
+  }
+
+
+$for m [[
+  T$m f$(m)_;
+
+]]
+};
+
+
+]]
+// 6.1.3.2 Tuple creation functions.
+
+// Known limitations: we don't support passing an
+// std::tr1::reference_wrapper<T> to make_tuple().  And we don't
+// implement tie().
+
+inline tuple<> make_tuple() { return tuple<>(); }
+
+$for k [[
+$range m 0..k-1
+
+template <GTEST_$(k)_TYPENAMES_(T)>
+inline GTEST_$(k)_TUPLE_(T) make_tuple($for m, [[const T$m& f$m]]) {
+  return GTEST_$(k)_TUPLE_(T)($for m, [[f$m]]);
+}
+
+]]
+
+// 6.1.3.3 Tuple helper classes.
+
+template <typename Tuple> struct tuple_size;
+
+
+$for j [[
+template <GTEST_$(j)_TYPENAMES_(T)>
+struct tuple_size<GTEST_$(j)_TUPLE_(T) > {
+  static const int value = $j;
+};
+
+
+]]
+template <int k, class Tuple>
+struct tuple_element {
+  typedef typename gtest_internal::TupleElement<
+      k < (tuple_size<Tuple>::value), k, Tuple>::type type;
+};
+
+#define GTEST_TUPLE_ELEMENT_(k, Tuple) typename tuple_element<k, Tuple >::type
+
+// 6.1.3.4 Element access.
+
+namespace gtest_internal {
+
+
+$for i [[
+template <>
+class Get<$i> {
+ public:
+  template <class Tuple>
+  static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_($i, Tuple))
+  Field(Tuple& t) { return t.f$(i)_; }  // NOLINT
+
+  template <class Tuple>
+  static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_($i, Tuple))
+  ConstField(const Tuple& t) { return t.f$(i)_; }
+};
+
+
+]]
+}  // namespace gtest_internal
+
+template <int k, GTEST_$(n)_TYPENAMES_(T)>
+GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(k, GTEST_$(n)_TUPLE_(T)))
+get(GTEST_$(n)_TUPLE_(T)& t) {
+  return gtest_internal::Get<k>::Field(t);
+}
+
+template <int k, GTEST_$(n)_TYPENAMES_(T)>
+GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(k,  GTEST_$(n)_TUPLE_(T)))
+get(const GTEST_$(n)_TUPLE_(T)& t) {
+  return gtest_internal::Get<k>::ConstField(t);
+}
+
+// 6.1.3.5 Relational operators
+
+// We only implement == and !=, as we don't have a need for the rest yet.
+
+namespace gtest_internal {
+
+// SameSizeTuplePrefixComparator<k, k>::Eq(t1, t2) returns true if the
+// first k fields of t1 equals the first k fields of t2.
+// SameSizeTuplePrefixComparator(k1, k2) would be a compiler error if
+// k1 != k2.
+template <int kSize1, int kSize2>
+struct SameSizeTuplePrefixComparator;
+
+template <>
+struct SameSizeTuplePrefixComparator<0, 0> {
+  template <class Tuple1, class Tuple2>
+  static bool Eq(const Tuple1& /* t1 */, const Tuple2& /* t2 */) {
+    return true;
+  }
+};
+
+template <int k>
+struct SameSizeTuplePrefixComparator<k, k> {
+  template <class Tuple1, class Tuple2>
+  static bool Eq(const Tuple1& t1, const Tuple2& t2) {
+    return SameSizeTuplePrefixComparator<k - 1, k - 1>::Eq(t1, t2) &&
+        ::std::tr1::get<k - 1>(t1) == ::std::tr1::get<k - 1>(t2);
+  }
+};
+
+}  // namespace gtest_internal
+
+template <GTEST_$(n)_TYPENAMES_(T), GTEST_$(n)_TYPENAMES_(U)>
+inline bool operator==(const GTEST_$(n)_TUPLE_(T)& t,
+                       const GTEST_$(n)_TUPLE_(U)& u) {
+  return gtest_internal::SameSizeTuplePrefixComparator<
+      tuple_size<GTEST_$(n)_TUPLE_(T) >::value,
+      tuple_size<GTEST_$(n)_TUPLE_(U) >::value>::Eq(t, u);
+}
+
+template <GTEST_$(n)_TYPENAMES_(T), GTEST_$(n)_TYPENAMES_(U)>
+inline bool operator!=(const GTEST_$(n)_TUPLE_(T)& t,
+                       const GTEST_$(n)_TUPLE_(U)& u) { return !(t == u); }
+
+// 6.1.4 Pairs.
+// Unimplemented.
+
+}  // namespace tr1
+}  // namespace std
+
+
+$for j [[
+#undef GTEST_$(j)_TUPLE_
+
+]]
+
+
+$for j [[
+#undef GTEST_$(j)_TYPENAMES_
+
+]]
+
+#undef GTEST_DECLARE_TUPLE_AS_FRIEND_
+#undef GTEST_BY_REF_
+#undef GTEST_ADD_REF_
+#undef GTEST_TUPLE_ELEMENT_
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-type-util.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-type-util.h
new file mode 100644
index 0000000000..e46f7cfcb4
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-type-util.h
@@ -0,0 +1,3331 @@
+// This file was GENERATED by command:
+//     pump.py gtest-type-util.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Type utilities needed for implementing typed and type-parameterized
+// tests.  This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+// Currently we support at most 50 types in a list, and at most 50
+// type-parameterized tests in one type-parameterized test case.
+// Please contact googletestframework@googlegroups.com if you need
+// more.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+
+#include "gtest/internal/gtest-port.h"
+
+// #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
+// libstdc++ (which is where cxxabi.h comes from).
+# if GTEST_HAS_CXXABI_H_
+#  include <cxxabi.h>
+# elif defined(__HP_aCC)
+#  include <acxx_demangle.h>
+# endif  // GTEST_HASH_CXXABI_H_
+
+namespace testing {
+namespace internal {
+
+// GetTypeName<T>() returns a human-readable name of type T.
+// NB: This function is also used in Google Mock, so don't move it inside of
+// the typed-test-only section below.
+template <typename T>
+std::string GetTypeName() {
+# if GTEST_HAS_RTTI
+
+  const char* const name = typeid(T).name();
+#  if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC)
+  int status = 0;
+  // gcc's implementation of typeid(T).name() mangles the type name,
+  // so we have to demangle it.
+#   if GTEST_HAS_CXXABI_H_
+  using abi::__cxa_demangle;
+#   endif  // GTEST_HAS_CXXABI_H_
+  char* const readable_name = __cxa_demangle(name, 0, 0, &status);
+  const std::string name_str(status == 0 ? readable_name : name);
+  free(readable_name);
+  return name_str;
+#  else
+  return name;
+#  endif  // GTEST_HAS_CXXABI_H_ || __HP_aCC
+
+# else
+
+  return "<type>";
+
+# endif  // GTEST_HAS_RTTI
+}
+
+#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
+
+// AssertyTypeEq<T1, T2>::type is defined iff T1 and T2 are the same
+// type.  This can be used as a compile-time assertion to ensure that
+// two types are equal.
+
+template <typename T1, typename T2>
+struct AssertTypeEq;
+
+template <typename T>
+struct AssertTypeEq<T, T> {
+  typedef bool type;
+};
+
+// A unique type used as the default value for the arguments of class
+// template Types.  This allows us to simulate variadic templates
+// (e.g. Types<int>, Type<int, double>, and etc), which C++ doesn't
+// support directly.
+struct None {};
+
+// The following family of struct and struct templates are used to
+// represent type lists.  In particular, TypesN<T1, T2, ..., TN>
+// represents a type list with N types (T1, T2, ..., and TN) in it.
+// Except for Types0, every struct in the family has two member types:
+// Head for the first type in the list, and Tail for the rest of the
+// list.
+
+// The empty type list.
+struct Types0 {};
+
+// Type lists of length 1, 2, 3, and so on.
+
+template <typename T1>
+struct Types1 {
+  typedef T1 Head;
+  typedef Types0 Tail;
+};
+template <typename T1, typename T2>
+struct Types2 {
+  typedef T1 Head;
+  typedef Types1<T2> Tail;
+};
+
+template <typename T1, typename T2, typename T3>
+struct Types3 {
+  typedef T1 Head;
+  typedef Types2<T2, T3> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4>
+struct Types4 {
+  typedef T1 Head;
+  typedef Types3<T2, T3, T4> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+struct Types5 {
+  typedef T1 Head;
+  typedef Types4<T2, T3, T4, T5> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+struct Types6 {
+  typedef T1 Head;
+  typedef Types5<T2, T3, T4, T5, T6> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+struct Types7 {
+  typedef T1 Head;
+  typedef Types6<T2, T3, T4, T5, T6, T7> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+struct Types8 {
+  typedef T1 Head;
+  typedef Types7<T2, T3, T4, T5, T6, T7, T8> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+struct Types9 {
+  typedef T1 Head;
+  typedef Types8<T2, T3, T4, T5, T6, T7, T8, T9> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+struct Types10 {
+  typedef T1 Head;
+  typedef Types9<T2, T3, T4, T5, T6, T7, T8, T9, T10> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11>
+struct Types11 {
+  typedef T1 Head;
+  typedef Types10<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12>
+struct Types12 {
+  typedef T1 Head;
+  typedef Types11<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13>
+struct Types13 {
+  typedef T1 Head;
+  typedef Types12<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14>
+struct Types14 {
+  typedef T1 Head;
+  typedef Types13<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15>
+struct Types15 {
+  typedef T1 Head;
+  typedef Types14<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16>
+struct Types16 {
+  typedef T1 Head;
+  typedef Types15<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17>
+struct Types17 {
+  typedef T1 Head;
+  typedef Types16<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18>
+struct Types18 {
+  typedef T1 Head;
+  typedef Types17<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19>
+struct Types19 {
+  typedef T1 Head;
+  typedef Types18<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20>
+struct Types20 {
+  typedef T1 Head;
+  typedef Types19<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21>
+struct Types21 {
+  typedef T1 Head;
+  typedef Types20<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22>
+struct Types22 {
+  typedef T1 Head;
+  typedef Types21<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23>
+struct Types23 {
+  typedef T1 Head;
+  typedef Types22<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24>
+struct Types24 {
+  typedef T1 Head;
+  typedef Types23<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25>
+struct Types25 {
+  typedef T1 Head;
+  typedef Types24<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26>
+struct Types26 {
+  typedef T1 Head;
+  typedef Types25<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27>
+struct Types27 {
+  typedef T1 Head;
+  typedef Types26<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28>
+struct Types28 {
+  typedef T1 Head;
+  typedef Types27<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29>
+struct Types29 {
+  typedef T1 Head;
+  typedef Types28<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30>
+struct Types30 {
+  typedef T1 Head;
+  typedef Types29<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31>
+struct Types31 {
+  typedef T1 Head;
+  typedef Types30<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32>
+struct Types32 {
+  typedef T1 Head;
+  typedef Types31<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33>
+struct Types33 {
+  typedef T1 Head;
+  typedef Types32<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34>
+struct Types34 {
+  typedef T1 Head;
+  typedef Types33<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35>
+struct Types35 {
+  typedef T1 Head;
+  typedef Types34<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36>
+struct Types36 {
+  typedef T1 Head;
+  typedef Types35<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37>
+struct Types37 {
+  typedef T1 Head;
+  typedef Types36<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38>
+struct Types38 {
+  typedef T1 Head;
+  typedef Types37<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39>
+struct Types39 {
+  typedef T1 Head;
+  typedef Types38<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40>
+struct Types40 {
+  typedef T1 Head;
+  typedef Types39<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41>
+struct Types41 {
+  typedef T1 Head;
+  typedef Types40<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42>
+struct Types42 {
+  typedef T1 Head;
+  typedef Types41<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43>
+struct Types43 {
+  typedef T1 Head;
+  typedef Types42<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44>
+struct Types44 {
+  typedef T1 Head;
+  typedef Types43<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45>
+struct Types45 {
+  typedef T1 Head;
+  typedef Types44<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44, T45> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46>
+struct Types46 {
+  typedef T1 Head;
+  typedef Types45<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44, T45, T46> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47>
+struct Types47 {
+  typedef T1 Head;
+  typedef Types46<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44, T45, T46, T47> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48>
+struct Types48 {
+  typedef T1 Head;
+  typedef Types47<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44, T45, T46, T47, T48> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49>
+struct Types49 {
+  typedef T1 Head;
+  typedef Types48<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44, T45, T46, T47, T48, T49> Tail;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49, typename T50>
+struct Types50 {
+  typedef T1 Head;
+  typedef Types49<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+      T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+      T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+      T44, T45, T46, T47, T48, T49, T50> Tail;
+};
+
+
+}  // namespace internal
+
+// We don't want to require the users to write TypesN<...> directly,
+// as that would require them to count the length.  Types<...> is much
+// easier to write, but generates horrible messages when there is a
+// compiler error, as gcc insists on printing out each template
+// argument, even if it has the default value (this means Types<int>
+// will appear as Types<int, None, None, ..., None> in the compiler
+// errors).
+//
+// Our solution is to combine the best part of the two approaches: a
+// user would write Types<T1, ..., TN>, and Google Test will translate
+// that to TypesN<T1, ..., TN> internally to make error messages
+// readable.  The translation is done by the 'type' member of the
+// Types template.
+template <typename T1 = internal::None, typename T2 = internal::None,
+    typename T3 = internal::None, typename T4 = internal::None,
+    typename T5 = internal::None, typename T6 = internal::None,
+    typename T7 = internal::None, typename T8 = internal::None,
+    typename T9 = internal::None, typename T10 = internal::None,
+    typename T11 = internal::None, typename T12 = internal::None,
+    typename T13 = internal::None, typename T14 = internal::None,
+    typename T15 = internal::None, typename T16 = internal::None,
+    typename T17 = internal::None, typename T18 = internal::None,
+    typename T19 = internal::None, typename T20 = internal::None,
+    typename T21 = internal::None, typename T22 = internal::None,
+    typename T23 = internal::None, typename T24 = internal::None,
+    typename T25 = internal::None, typename T26 = internal::None,
+    typename T27 = internal::None, typename T28 = internal::None,
+    typename T29 = internal::None, typename T30 = internal::None,
+    typename T31 = internal::None, typename T32 = internal::None,
+    typename T33 = internal::None, typename T34 = internal::None,
+    typename T35 = internal::None, typename T36 = internal::None,
+    typename T37 = internal::None, typename T38 = internal::None,
+    typename T39 = internal::None, typename T40 = internal::None,
+    typename T41 = internal::None, typename T42 = internal::None,
+    typename T43 = internal::None, typename T44 = internal::None,
+    typename T45 = internal::None, typename T46 = internal::None,
+    typename T47 = internal::None, typename T48 = internal::None,
+    typename T49 = internal::None, typename T50 = internal::None>
+struct Types {
+  typedef internal::Types50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45, T46, T47, T48, T49, T50> type;
+};
+
+template <>
+struct Types<internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types0 type;
+};
+template <typename T1>
+struct Types<T1, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types1<T1> type;
+};
+template <typename T1, typename T2>
+struct Types<T1, T2, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types2<T1, T2> type;
+};
+template <typename T1, typename T2, typename T3>
+struct Types<T1, T2, T3, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types3<T1, T2, T3> type;
+};
+template <typename T1, typename T2, typename T3, typename T4>
+struct Types<T1, T2, T3, T4, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types4<T1, T2, T3, T4> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+struct Types<T1, T2, T3, T4, T5, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types5<T1, T2, T3, T4, T5> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+struct Types<T1, T2, T3, T4, T5, T6, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types6<T1, T2, T3, T4, T5, T6> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+struct Types<T1, T2, T3, T4, T5, T6, T7, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types7<T1, T2, T3, T4, T5, T6, T7> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types8<T1, T2, T3, T4, T5, T6, T7, T8> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types9<T1, T2, T3, T4, T5, T6, T7, T8, T9> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, internal::None,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None, internal::None> {
+  typedef internal::Types43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None, internal::None> {
+  typedef internal::Types44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
+    internal::None, internal::None, internal::None, internal::None,
+    internal::None> {
+  typedef internal::Types45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
+    T46, internal::None, internal::None, internal::None, internal::None> {
+  typedef internal::Types46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45, T46> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
+    T46, T47, internal::None, internal::None, internal::None> {
+  typedef internal::Types47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45, T46, T47> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
+    T46, T47, T48, internal::None, internal::None> {
+  typedef internal::Types48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45, T46, T47, T48> type;
+};
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49>
+struct Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15,
+    T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30,
+    T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44, T45,
+    T46, T47, T48, T49, internal::None> {
+  typedef internal::Types49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45, T46, T47, T48, T49> type;
+};
+
+namespace internal {
+
+# define GTEST_TEMPLATE_ template <typename T> class
+
+// The template "selector" struct TemplateSel<Tmpl> is used to
+// represent Tmpl, which must be a class template with one type
+// parameter, as a type.  TemplateSel<Tmpl>::Bind<T>::type is defined
+// as the type Tmpl<T>.  This allows us to actually instantiate the
+// template "selected" by TemplateSel<Tmpl>.
+//
+// This trick is necessary for simulating typedef for class templates,
+// which C++ doesn't support directly.
+template <GTEST_TEMPLATE_ Tmpl>
+struct TemplateSel {
+  template <typename T>
+  struct Bind {
+    typedef Tmpl<T> type;
+  };
+};
+
+# define GTEST_BIND_(TmplSel, T) \
+  TmplSel::template Bind<T>::type
+
+// A unique struct template used as the default value for the
+// arguments of class template Templates.  This allows us to simulate
+// variadic templates (e.g. Templates<int>, Templates<int, double>,
+// and etc), which C++ doesn't support directly.
+template <typename T>
+struct NoneT {};
+
+// The following family of struct and struct templates are used to
+// represent template lists.  In particular, TemplatesN<T1, T2, ...,
+// TN> represents a list of N templates (T1, T2, ..., and TN).  Except
+// for Templates0, every struct in the family has two member types:
+// Head for the selector of the first template in the list, and Tail
+// for the rest of the list.
+
+// The empty template list.
+struct Templates0 {};
+
+// Template lists of length 1, 2, 3, and so on.
+
+template <GTEST_TEMPLATE_ T1>
+struct Templates1 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates0 Tail;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2>
+struct Templates2 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates1<T2> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3>
+struct Templates3 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates2<T2, T3> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4>
+struct Templates4 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates3<T2, T3, T4> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5>
+struct Templates5 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates4<T2, T3, T4, T5> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6>
+struct Templates6 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates5<T2, T3, T4, T5, T6> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7>
+struct Templates7 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates6<T2, T3, T4, T5, T6, T7> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8>
+struct Templates8 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates7<T2, T3, T4, T5, T6, T7, T8> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9>
+struct Templates9 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates8<T2, T3, T4, T5, T6, T7, T8, T9> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10>
+struct Templates10 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates9<T2, T3, T4, T5, T6, T7, T8, T9, T10> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11>
+struct Templates11 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates10<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12>
+struct Templates12 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates11<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13>
+struct Templates13 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates12<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14>
+struct Templates14 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates13<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15>
+struct Templates15 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates14<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16>
+struct Templates16 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates15<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17>
+struct Templates17 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates16<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18>
+struct Templates18 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates17<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19>
+struct Templates19 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates18<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20>
+struct Templates20 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates19<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21>
+struct Templates21 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates20<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22>
+struct Templates22 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates21<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23>
+struct Templates23 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates22<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24>
+struct Templates24 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates23<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25>
+struct Templates25 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates24<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26>
+struct Templates26 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates25<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27>
+struct Templates27 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates26<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28>
+struct Templates28 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates27<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29>
+struct Templates29 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates28<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30>
+struct Templates30 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates29<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31>
+struct Templates31 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates30<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32>
+struct Templates32 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates31<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33>
+struct Templates33 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates32<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34>
+struct Templates34 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates33<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35>
+struct Templates35 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates34<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36>
+struct Templates36 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates35<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37>
+struct Templates37 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates36<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38>
+struct Templates38 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates37<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39>
+struct Templates39 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates38<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40>
+struct Templates40 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates39<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41>
+struct Templates41 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates40<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42>
+struct Templates42 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates41<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43>
+struct Templates43 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates42<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44>
+struct Templates44 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates43<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45>
+struct Templates45 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates44<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44, T45> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46>
+struct Templates46 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates45<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44, T45, T46> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47>
+struct Templates47 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates46<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44, T45, T46, T47> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48>
+struct Templates48 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates47<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44, T45, T46, T47, T48> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48,
+    GTEST_TEMPLATE_ T49>
+struct Templates49 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates48<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44, T45, T46, T47, T48, T49> Tail;
+};
+
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48,
+    GTEST_TEMPLATE_ T49, GTEST_TEMPLATE_ T50>
+struct Templates50 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates49<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+      T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+      T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+      T43, T44, T45, T46, T47, T48, T49, T50> Tail;
+};
+
+
+// We don't want to require the users to write TemplatesN<...> directly,
+// as that would require them to count the length.  Templates<...> is much
+// easier to write, but generates horrible messages when there is a
+// compiler error, as gcc insists on printing out each template
+// argument, even if it has the default value (this means Templates<list>
+// will appear as Templates<list, NoneT, NoneT, ..., NoneT> in the compiler
+// errors).
+//
+// Our solution is to combine the best part of the two approaches: a
+// user would write Templates<T1, ..., TN>, and Google Test will translate
+// that to TemplatesN<T1, ..., TN> internally to make error messages
+// readable.  The translation is done by the 'type' member of the
+// Templates template.
+template <GTEST_TEMPLATE_ T1 = NoneT, GTEST_TEMPLATE_ T2 = NoneT,
+    GTEST_TEMPLATE_ T3 = NoneT, GTEST_TEMPLATE_ T4 = NoneT,
+    GTEST_TEMPLATE_ T5 = NoneT, GTEST_TEMPLATE_ T6 = NoneT,
+    GTEST_TEMPLATE_ T7 = NoneT, GTEST_TEMPLATE_ T8 = NoneT,
+    GTEST_TEMPLATE_ T9 = NoneT, GTEST_TEMPLATE_ T10 = NoneT,
+    GTEST_TEMPLATE_ T11 = NoneT, GTEST_TEMPLATE_ T12 = NoneT,
+    GTEST_TEMPLATE_ T13 = NoneT, GTEST_TEMPLATE_ T14 = NoneT,
+    GTEST_TEMPLATE_ T15 = NoneT, GTEST_TEMPLATE_ T16 = NoneT,
+    GTEST_TEMPLATE_ T17 = NoneT, GTEST_TEMPLATE_ T18 = NoneT,
+    GTEST_TEMPLATE_ T19 = NoneT, GTEST_TEMPLATE_ T20 = NoneT,
+    GTEST_TEMPLATE_ T21 = NoneT, GTEST_TEMPLATE_ T22 = NoneT,
+    GTEST_TEMPLATE_ T23 = NoneT, GTEST_TEMPLATE_ T24 = NoneT,
+    GTEST_TEMPLATE_ T25 = NoneT, GTEST_TEMPLATE_ T26 = NoneT,
+    GTEST_TEMPLATE_ T27 = NoneT, GTEST_TEMPLATE_ T28 = NoneT,
+    GTEST_TEMPLATE_ T29 = NoneT, GTEST_TEMPLATE_ T30 = NoneT,
+    GTEST_TEMPLATE_ T31 = NoneT, GTEST_TEMPLATE_ T32 = NoneT,
+    GTEST_TEMPLATE_ T33 = NoneT, GTEST_TEMPLATE_ T34 = NoneT,
+    GTEST_TEMPLATE_ T35 = NoneT, GTEST_TEMPLATE_ T36 = NoneT,
+    GTEST_TEMPLATE_ T37 = NoneT, GTEST_TEMPLATE_ T38 = NoneT,
+    GTEST_TEMPLATE_ T39 = NoneT, GTEST_TEMPLATE_ T40 = NoneT,
+    GTEST_TEMPLATE_ T41 = NoneT, GTEST_TEMPLATE_ T42 = NoneT,
+    GTEST_TEMPLATE_ T43 = NoneT, GTEST_TEMPLATE_ T44 = NoneT,
+    GTEST_TEMPLATE_ T45 = NoneT, GTEST_TEMPLATE_ T46 = NoneT,
+    GTEST_TEMPLATE_ T47 = NoneT, GTEST_TEMPLATE_ T48 = NoneT,
+    GTEST_TEMPLATE_ T49 = NoneT, GTEST_TEMPLATE_ T50 = NoneT>
+struct Templates {
+  typedef Templates50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44, T45, T46, T47, T48, T49, T50> type;
+};
+
+template <>
+struct Templates<NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT> {
+  typedef Templates0 type;
+};
+template <GTEST_TEMPLATE_ T1>
+struct Templates<T1, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT> {
+  typedef Templates1<T1> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2>
+struct Templates<T1, T2, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT> {
+  typedef Templates2<T1, T2> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3>
+struct Templates<T1, T2, T3, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates3<T1, T2, T3> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4>
+struct Templates<T1, T2, T3, T4, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates4<T1, T2, T3, T4> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5>
+struct Templates<T1, T2, T3, T4, T5, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates5<T1, T2, T3, T4, T5> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6>
+struct Templates<T1, T2, T3, T4, T5, T6, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates6<T1, T2, T3, T4, T5, T6> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates7<T1, T2, T3, T4, T5, T6, T7> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates8<T1, T2, T3, T4, T5, T6, T7, T8> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates9<T1, T2, T3, T4, T5, T6, T7, T8, T9> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT> {
+  typedef Templates22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT> {
+  typedef Templates23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT> {
+  typedef Templates24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT> {
+  typedef Templates25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT> {
+  typedef Templates26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT> {
+  typedef Templates27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT> {
+  typedef Templates28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT> {
+  typedef Templates29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, NoneT, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, NoneT, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, NoneT, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, NoneT, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, NoneT,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    NoneT, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    T45, NoneT, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44, T45> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    T45, T46, NoneT, NoneT, NoneT, NoneT> {
+  typedef Templates46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44, T45, T46> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    T45, T46, T47, NoneT, NoneT, NoneT> {
+  typedef Templates47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44, T45, T46, T47> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    T45, T46, T47, T48, NoneT, NoneT> {
+  typedef Templates48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44, T45, T46, T47, T48> type;
+};
+template <GTEST_TEMPLATE_ T1, GTEST_TEMPLATE_ T2, GTEST_TEMPLATE_ T3,
+    GTEST_TEMPLATE_ T4, GTEST_TEMPLATE_ T5, GTEST_TEMPLATE_ T6,
+    GTEST_TEMPLATE_ T7, GTEST_TEMPLATE_ T8, GTEST_TEMPLATE_ T9,
+    GTEST_TEMPLATE_ T10, GTEST_TEMPLATE_ T11, GTEST_TEMPLATE_ T12,
+    GTEST_TEMPLATE_ T13, GTEST_TEMPLATE_ T14, GTEST_TEMPLATE_ T15,
+    GTEST_TEMPLATE_ T16, GTEST_TEMPLATE_ T17, GTEST_TEMPLATE_ T18,
+    GTEST_TEMPLATE_ T19, GTEST_TEMPLATE_ T20, GTEST_TEMPLATE_ T21,
+    GTEST_TEMPLATE_ T22, GTEST_TEMPLATE_ T23, GTEST_TEMPLATE_ T24,
+    GTEST_TEMPLATE_ T25, GTEST_TEMPLATE_ T26, GTEST_TEMPLATE_ T27,
+    GTEST_TEMPLATE_ T28, GTEST_TEMPLATE_ T29, GTEST_TEMPLATE_ T30,
+    GTEST_TEMPLATE_ T31, GTEST_TEMPLATE_ T32, GTEST_TEMPLATE_ T33,
+    GTEST_TEMPLATE_ T34, GTEST_TEMPLATE_ T35, GTEST_TEMPLATE_ T36,
+    GTEST_TEMPLATE_ T37, GTEST_TEMPLATE_ T38, GTEST_TEMPLATE_ T39,
+    GTEST_TEMPLATE_ T40, GTEST_TEMPLATE_ T41, GTEST_TEMPLATE_ T42,
+    GTEST_TEMPLATE_ T43, GTEST_TEMPLATE_ T44, GTEST_TEMPLATE_ T45,
+    GTEST_TEMPLATE_ T46, GTEST_TEMPLATE_ T47, GTEST_TEMPLATE_ T48,
+    GTEST_TEMPLATE_ T49>
+struct Templates<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+    T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29,
+    T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43, T44,
+    T45, T46, T47, T48, T49, NoneT> {
+  typedef Templates49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+      T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+      T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+      T42, T43, T44, T45, T46, T47, T48, T49> type;
+};
+
+// The TypeList template makes it possible to use either a single type
+// or a Types<...> list in TYPED_TEST_CASE() and
+// INSTANTIATE_TYPED_TEST_CASE_P().
+
+template <typename T>
+struct TypeList {
+  typedef Types1<T> type;
+};
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49, typename T50>
+struct TypeList<Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47, T48, T49, T50> > {
+  typedef typename Types<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+      T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+      T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+      T41, T42, T43, T44, T45, T46, T47, T48, T49, T50>::type type;
+};
+
+#endif  // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-type-util.h.pump b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-type-util.h.pump
new file mode 100644
index 0000000000..251fdf025b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/include/gtest/internal/gtest-type-util.h.pump
@@ -0,0 +1,297 @@
+$$ -*- mode: c++; -*-
+$var n = 50  $$ Maximum length of type lists we want to support.
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Type utilities needed for implementing typed and type-parameterized
+// tests.  This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+// Currently we support at most $n types in a list, and at most $n
+// type-parameterized tests in one type-parameterized test case.
+// Please contact googletestframework@googlegroups.com if you need
+// more.
+
+#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
+
+#include "gtest/internal/gtest-port.h"
+
+// #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
+// libstdc++ (which is where cxxabi.h comes from).
+# if GTEST_HAS_CXXABI_H_
+#  include <cxxabi.h>
+# elif defined(__HP_aCC)
+#  include <acxx_demangle.h>
+# endif  // GTEST_HASH_CXXABI_H_
+
+namespace testing {
+namespace internal {
+
+// GetTypeName<T>() returns a human-readable name of type T.
+// NB: This function is also used in Google Mock, so don't move it inside of
+// the typed-test-only section below.
+template <typename T>
+std::string GetTypeName() {
+# if GTEST_HAS_RTTI
+
+  const char* const name = typeid(T).name();
+#  if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC)
+  int status = 0;
+  // gcc's implementation of typeid(T).name() mangles the type name,
+  // so we have to demangle it.
+#   if GTEST_HAS_CXXABI_H_
+  using abi::__cxa_demangle;
+#   endif  // GTEST_HAS_CXXABI_H_
+  char* const readable_name = __cxa_demangle(name, 0, 0, &status);
+  const std::string name_str(status == 0 ? readable_name : name);
+  free(readable_name);
+  return name_str;
+#  else
+  return name;
+#  endif  // GTEST_HAS_CXXABI_H_ || __HP_aCC
+
+# else
+
+  return "<type>";
+
+# endif  // GTEST_HAS_RTTI
+}
+
+#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
+
+// AssertyTypeEq<T1, T2>::type is defined iff T1 and T2 are the same
+// type.  This can be used as a compile-time assertion to ensure that
+// two types are equal.
+
+template <typename T1, typename T2>
+struct AssertTypeEq;
+
+template <typename T>
+struct AssertTypeEq<T, T> {
+  typedef bool type;
+};
+
+// A unique type used as the default value for the arguments of class
+// template Types.  This allows us to simulate variadic templates
+// (e.g. Types<int>, Type<int, double>, and etc), which C++ doesn't
+// support directly.
+struct None {};
+
+// The following family of struct and struct templates are used to
+// represent type lists.  In particular, TypesN<T1, T2, ..., TN>
+// represents a type list with N types (T1, T2, ..., and TN) in it.
+// Except for Types0, every struct in the family has two member types:
+// Head for the first type in the list, and Tail for the rest of the
+// list.
+
+// The empty type list.
+struct Types0 {};
+
+// Type lists of length 1, 2, 3, and so on.
+
+template <typename T1>
+struct Types1 {
+  typedef T1 Head;
+  typedef Types0 Tail;
+};
+
+$range i 2..n
+
+$for i [[
+$range j 1..i
+$range k 2..i
+template <$for j, [[typename T$j]]>
+struct Types$i {
+  typedef T1 Head;
+  typedef Types$(i-1)<$for k, [[T$k]]> Tail;
+};
+
+
+]]
+
+}  // namespace internal
+
+// We don't want to require the users to write TypesN<...> directly,
+// as that would require them to count the length.  Types<...> is much
+// easier to write, but generates horrible messages when there is a
+// compiler error, as gcc insists on printing out each template
+// argument, even if it has the default value (this means Types<int>
+// will appear as Types<int, None, None, ..., None> in the compiler
+// errors).
+//
+// Our solution is to combine the best part of the two approaches: a
+// user would write Types<T1, ..., TN>, and Google Test will translate
+// that to TypesN<T1, ..., TN> internally to make error messages
+// readable.  The translation is done by the 'type' member of the
+// Types template.
+
+$range i 1..n
+template <$for i, [[typename T$i = internal::None]]>
+struct Types {
+  typedef internal::Types$n<$for i, [[T$i]]> type;
+};
+
+template <>
+struct Types<$for i, [[internal::None]]> {
+  typedef internal::Types0 type;
+};
+
+$range i 1..n-1
+$for i [[
+$range j 1..i
+$range k i+1..n
+template <$for j, [[typename T$j]]>
+struct Types<$for j, [[T$j]]$for k[[, internal::None]]> {
+  typedef internal::Types$i<$for j, [[T$j]]> type;
+};
+
+]]
+
+namespace internal {
+
+# define GTEST_TEMPLATE_ template <typename T> class
+
+// The template "selector" struct TemplateSel<Tmpl> is used to
+// represent Tmpl, which must be a class template with one type
+// parameter, as a type.  TemplateSel<Tmpl>::Bind<T>::type is defined
+// as the type Tmpl<T>.  This allows us to actually instantiate the
+// template "selected" by TemplateSel<Tmpl>.
+//
+// This trick is necessary for simulating typedef for class templates,
+// which C++ doesn't support directly.
+template <GTEST_TEMPLATE_ Tmpl>
+struct TemplateSel {
+  template <typename T>
+  struct Bind {
+    typedef Tmpl<T> type;
+  };
+};
+
+# define GTEST_BIND_(TmplSel, T) \
+  TmplSel::template Bind<T>::type
+
+// A unique struct template used as the default value for the
+// arguments of class template Templates.  This allows us to simulate
+// variadic templates (e.g. Templates<int>, Templates<int, double>,
+// and etc), which C++ doesn't support directly.
+template <typename T>
+struct NoneT {};
+
+// The following family of struct and struct templates are used to
+// represent template lists.  In particular, TemplatesN<T1, T2, ...,
+// TN> represents a list of N templates (T1, T2, ..., and TN).  Except
+// for Templates0, every struct in the family has two member types:
+// Head for the selector of the first template in the list, and Tail
+// for the rest of the list.
+
+// The empty template list.
+struct Templates0 {};
+
+// Template lists of length 1, 2, 3, and so on.
+
+template <GTEST_TEMPLATE_ T1>
+struct Templates1 {
+  typedef TemplateSel<T1> Head;
+  typedef Templates0 Tail;
+};
+
+$range i 2..n
+
+$for i [[
+$range j 1..i
+$range k 2..i
+template <$for j, [[GTEST_TEMPLATE_ T$j]]>
+struct Templates$i {
+  typedef TemplateSel<T1> Head;
+  typedef Templates$(i-1)<$for k, [[T$k]]> Tail;
+};
+
+
+]]
+
+// We don't want to require the users to write TemplatesN<...> directly,
+// as that would require them to count the length.  Templates<...> is much
+// easier to write, but generates horrible messages when there is a
+// compiler error, as gcc insists on printing out each template
+// argument, even if it has the default value (this means Templates<list>
+// will appear as Templates<list, NoneT, NoneT, ..., NoneT> in the compiler
+// errors).
+//
+// Our solution is to combine the best part of the two approaches: a
+// user would write Templates<T1, ..., TN>, and Google Test will translate
+// that to TemplatesN<T1, ..., TN> internally to make error messages
+// readable.  The translation is done by the 'type' member of the
+// Templates template.
+
+$range i 1..n
+template <$for i, [[GTEST_TEMPLATE_ T$i = NoneT]]>
+struct Templates {
+  typedef Templates$n<$for i, [[T$i]]> type;
+};
+
+template <>
+struct Templates<$for i, [[NoneT]]> {
+  typedef Templates0 type;
+};
+
+$range i 1..n-1
+$for i [[
+$range j 1..i
+$range k i+1..n
+template <$for j, [[GTEST_TEMPLATE_ T$j]]>
+struct Templates<$for j, [[T$j]]$for k[[, NoneT]]> {
+  typedef Templates$i<$for j, [[T$j]]> type;
+};
+
+]]
+
+// The TypeList template makes it possible to use either a single type
+// or a Types<...> list in TYPED_TEST_CASE() and
+// INSTANTIATE_TYPED_TEST_CASE_P().
+
+template <typename T>
+struct TypeList {
+  typedef Types1<T> type;
+};
+
+
+$range i 1..n
+template <$for i, [[typename T$i]]>
+struct TypeList<Types<$for i, [[T$i]]> > {
+  typedef typename Types<$for i, [[T$i]]>::type type;
+};
+
+#endif  // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/m4/acx_pthread.m4 b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/m4/acx_pthread.m4
new file mode 100644
index 0000000000..2cf20de144
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/m4/acx_pthread.m4
@@ -0,0 +1,363 @@
+# This was retrieved from
+#    http://svn.0pointer.de/viewvc/trunk/common/acx_pthread.m4?revision=1277&root=avahi
+# See also (perhaps for new versions?)
+#    http://svn.0pointer.de/viewvc/trunk/common/acx_pthread.m4?root=avahi
+#
+# We've rewritten the inconsistency check code (from avahi), to work
+# more broadly.  In particular, it no longer assumes ld accepts -zdefs.
+# This caused a restructing of the code, but the functionality has only
+# changed a little.
+
+dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+dnl
+dnl @summary figure out how to build C programs using POSIX threads
+dnl
+dnl This macro figures out how to build C programs using POSIX threads.
+dnl It sets the PTHREAD_LIBS output variable to the threads library and
+dnl linker flags, and the PTHREAD_CFLAGS output variable to any special
+dnl C compiler flags that are needed. (The user can also force certain
+dnl compiler flags/libs to be tested by setting these environment
+dnl variables.)
+dnl
+dnl Also sets PTHREAD_CC to any special C compiler that is needed for
+dnl multi-threaded programs (defaults to the value of CC otherwise).
+dnl (This is necessary on AIX to use the special cc_r compiler alias.)
+dnl
+dnl NOTE: You are assumed to not only compile your program with these
+dnl flags, but also link it with them as well. e.g. you should link
+dnl with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
+dnl $LIBS
+dnl
+dnl If you are only building threads programs, you may wish to use
+dnl these variables in your default LIBS, CFLAGS, and CC:
+dnl
+dnl        LIBS="$PTHREAD_LIBS $LIBS"
+dnl        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+dnl        CC="$PTHREAD_CC"
+dnl
+dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
+dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
+dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+dnl
+dnl ACTION-IF-FOUND is a list of shell commands to run if a threads
+dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to
+dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the
+dnl default action will define HAVE_PTHREAD.
+dnl
+dnl Please let the authors know if this macro fails on any platform, or
+dnl if you have any other suggestions or comments. This macro was based
+dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with
+dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros
+dnl posted by Alejandro Forero Cuervo to the autoconf macro repository.
+dnl We are also grateful for the helpful feedback of numerous users.
+dnl
+dnl @category InstalledPackages
+dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
+dnl @version 2006-05-29
+dnl @license GPLWithACException
+dnl 
+dnl Checks for GCC shared/pthread inconsistency based on work by
+dnl Marcin Owsiany <marcin@owsiany.pl>
+
+
+AC_DEFUN([ACX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_SAVE
+AC_LANG_C
+acx_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
+        AC_MSG_RESULT($acx_pthread_ok)
+        if test x"$acx_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+#      ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case "${host_cpu}-${host_os}" in
+        *solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+
+        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
+        ;;
+esac
+
+if test x"$acx_pthread_ok" = xno; then
+for flag in $acx_pthread_flags; do
+
+        case $flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
+                ;;
+
+		pthread-config)
+		AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
+		if test x"$acx_pthread_config" = xno; then continue; fi
+		PTHREAD_CFLAGS="`pthread-config --cflags`"
+		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+		;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        AC_TRY_LINK([#include <pthread.h>],
+                    [pthread_t th; pthread_join(th, 0);
+                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
+                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+                    [acx_pthread_ok=yes])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        AC_MSG_RESULT($acx_pthread_ok)
+        if test "x$acx_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$acx_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+	AC_MSG_CHECKING([for joinable pthread attribute])
+	attr_name=unknown
+	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+	    AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
+                        [attr_name=$attr; break])
+	done
+        AC_MSG_RESULT($attr_name)
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+                               [Define to necessary symbol if this constant
+                                uses a non-standard name on your system.])
+        fi
+
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case "${host_cpu}-${host_os}" in
+            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+        esac
+        AC_MSG_RESULT(${flag})
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+        # More AIX lossage: must compile with xlc_r or cc_r
+	if test x"$GCC" != xyes; then
+          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
+        else
+          PTHREAD_CC=$CC
+	fi
+
+	# The next part tries to detect GCC inconsistency with -shared on some
+	# architectures and systems. The problem is that in certain
+	# configurations, when -shared is specified, GCC "forgets" to
+	# internally use various flags which are still necessary.
+	
+	#
+	# Prepare the flags
+	#
+	save_CFLAGS="$CFLAGS"
+	save_LIBS="$LIBS"
+	save_CC="$CC"
+	
+	# Try with the flags determined by the earlier checks.
+	#
+	# -Wl,-z,defs forces link-time symbol resolution, so that the
+	# linking checks with -shared actually have any value
+	#
+	# FIXME: -fPIC is required for -shared on many architectures,
+	# so we specify it here, but the right way would probably be to
+	# properly detect whether it is actually required.
+	CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS"
+	LIBS="$PTHREAD_LIBS $LIBS"
+	CC="$PTHREAD_CC"
+	
+	# In order not to create several levels of indentation, we test
+	# the value of "$done" until we find the cure or run out of ideas.
+	done="no"
+	
+	# First, make sure the CFLAGS we added are actually accepted by our
+	# compiler.  If not (and OS X's ld, for instance, does not accept -z),
+	# then we can't do this test.
+	if test x"$done" = xno; then
+	   AC_MSG_CHECKING([whether to check for GCC pthread/shared inconsistencies])
+	   AC_TRY_LINK(,, , [done=yes])
+	
+	   if test "x$done" = xyes ; then
+	      AC_MSG_RESULT([no])
+	   else
+	      AC_MSG_RESULT([yes])
+	   fi
+	fi
+	
+	if test x"$done" = xno; then
+	   AC_MSG_CHECKING([whether -pthread is sufficient with -shared])
+	   AC_TRY_LINK([#include <pthread.h>],
+	      [pthread_t th; pthread_join(th, 0);
+	      pthread_attr_init(0); pthread_cleanup_push(0, 0);
+	      pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+	      [done=yes])
+	   
+	   if test "x$done" = xyes; then
+	      AC_MSG_RESULT([yes])
+	   else
+	      AC_MSG_RESULT([no])
+	   fi
+	fi
+	
+	#
+	# Linux gcc on some architectures such as mips/mipsel forgets
+	# about -lpthread
+	#
+	if test x"$done" = xno; then
+	   AC_MSG_CHECKING([whether -lpthread fixes that])
+	   LIBS="-lpthread $PTHREAD_LIBS $save_LIBS"
+	   AC_TRY_LINK([#include <pthread.h>],
+	      [pthread_t th; pthread_join(th, 0);
+	      pthread_attr_init(0); pthread_cleanup_push(0, 0);
+	      pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+	      [done=yes])
+	
+	   if test "x$done" = xyes; then
+	      AC_MSG_RESULT([yes])
+	      PTHREAD_LIBS="-lpthread $PTHREAD_LIBS"
+	   else
+	      AC_MSG_RESULT([no])
+	   fi
+	fi
+	#
+	# FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc
+	#
+	if test x"$done" = xno; then
+	   AC_MSG_CHECKING([whether -lc_r fixes that])
+	   LIBS="-lc_r $PTHREAD_LIBS $save_LIBS"
+	   AC_TRY_LINK([#include <pthread.h>],
+	       [pthread_t th; pthread_join(th, 0);
+	        pthread_attr_init(0); pthread_cleanup_push(0, 0);
+	        pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+	       [done=yes])
+	
+	   if test "x$done" = xyes; then
+	      AC_MSG_RESULT([yes])
+	      PTHREAD_LIBS="-lc_r $PTHREAD_LIBS"
+	   else
+	      AC_MSG_RESULT([no])
+	   fi
+	fi
+	if test x"$done" = xno; then
+	   # OK, we have run out of ideas
+	   AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries])
+	
+	   # so it's not safe to assume that we may use pthreads
+	   acx_pthread_ok=no
+	fi
+	
+	CFLAGS="$save_CFLAGS"
+	LIBS="$save_LIBS"
+	CC="$save_CC"
+else
+        PTHREAD_CC="$CC"
+fi
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$acx_pthread_ok" = xyes; then
+        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+        :
+else
+        acx_pthread_ok=no
+        $2
+fi
+AC_LANG_RESTORE
+])dnl ACX_PTHREAD
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/m4/gtest.m4 b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/m4/gtest.m4
new file mode 100644
index 0000000000..6598ba75a4
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/m4/gtest.m4
@@ -0,0 +1,74 @@
+dnl GTEST_LIB_CHECK([minimum version [,
+dnl                  action if found [,action if not found]]])
+dnl
+dnl Check for the presence of the Google Test library, optionally at a minimum
+dnl version, and indicate a viable version with the HAVE_GTEST flag. It defines
+dnl standard variables for substitution including GTEST_CPPFLAGS,
+dnl GTEST_CXXFLAGS, GTEST_LDFLAGS, and GTEST_LIBS. It also defines
+dnl GTEST_VERSION as the version of Google Test found. Finally, it provides
+dnl optional custom action slots in the event GTEST is found or not.
+AC_DEFUN([GTEST_LIB_CHECK],
+[
+dnl Provide a flag to enable or disable Google Test usage.
+AC_ARG_ENABLE([gtest],
+  [AS_HELP_STRING([--enable-gtest],
+                  [Enable tests using the Google C++ Testing Framework.
+                  (Default is enabled.)])],
+  [],
+  [enable_gtest=])
+AC_ARG_VAR([GTEST_CONFIG],
+           [The exact path of Google Test's 'gtest-config' script.])
+AC_ARG_VAR([GTEST_CPPFLAGS],
+           [C-like preprocessor flags for Google Test.])
+AC_ARG_VAR([GTEST_CXXFLAGS],
+           [C++ compile flags for Google Test.])
+AC_ARG_VAR([GTEST_LDFLAGS],
+           [Linker path and option flags for Google Test.])
+AC_ARG_VAR([GTEST_LIBS],
+           [Library linking flags for Google Test.])
+AC_ARG_VAR([GTEST_VERSION],
+           [The version of Google Test available.])
+HAVE_GTEST="no"
+AS_IF([test "x${enable_gtest}" != "xno"],
+  [AC_MSG_CHECKING([for 'gtest-config'])
+   AS_IF([test "x${enable_gtest}" != "xyes"],
+     [AS_IF([test -x "${enable_gtest}/scripts/gtest-config"],
+        [GTEST_CONFIG="${enable_gtest}/scripts/gtest-config"],
+        [GTEST_CONFIG="${enable_gtest}/bin/gtest-config"])
+      AS_IF([test -x "${GTEST_CONFIG}"], [],
+        [AC_MSG_RESULT([no])
+         AC_MSG_ERROR([dnl
+Unable to locate either a built or installed Google Test.
+The specific location '${enable_gtest}' was provided for a built or installed
+Google Test, but no 'gtest-config' script could be found at this location.])
+         ])],
+     [AC_PATH_PROG([GTEST_CONFIG], [gtest-config])])
+   AS_IF([test -x "${GTEST_CONFIG}"],
+     [AC_MSG_RESULT([${GTEST_CONFIG}])
+      m4_ifval([$1],
+        [_gtest_min_version="--min-version=$1"
+         AC_MSG_CHECKING([for Google Test at least version >= $1])],
+        [_gtest_min_version="--min-version=0"
+         AC_MSG_CHECKING([for Google Test])])
+      AS_IF([${GTEST_CONFIG} ${_gtest_min_version}],
+        [AC_MSG_RESULT([yes])
+         HAVE_GTEST='yes'],
+        [AC_MSG_RESULT([no])])],
+     [AC_MSG_RESULT([no])])
+   AS_IF([test "x${HAVE_GTEST}" = "xyes"],
+     [GTEST_CPPFLAGS=`${GTEST_CONFIG} --cppflags`
+      GTEST_CXXFLAGS=`${GTEST_CONFIG} --cxxflags`
+      GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags`
+      GTEST_LIBS=`${GTEST_CONFIG} --libs`
+      GTEST_VERSION=`${GTEST_CONFIG} --version`
+      AC_DEFINE([HAVE_GTEST],[1],[Defined when Google Test is available.])],
+     [AS_IF([test "x${enable_gtest}" = "xyes"],
+        [AC_MSG_ERROR([dnl
+Google Test was enabled, but no viable version could be found.])
+         ])])])
+AC_SUBST([HAVE_GTEST])
+AM_CONDITIONAL([HAVE_GTEST],[test "x$HAVE_GTEST" = "xyes"])
+AS_IF([test "x$HAVE_GTEST" = "xyes"],
+  [m4_ifval([$2], [$2])],
+  [m4_ifval([$3], [$3])])
+])
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/make/Makefile b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/make/Makefile
new file mode 100644
index 0000000000..9ac74493ba
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/make/Makefile
@@ -0,0 +1,82 @@
+# A sample Makefile for building Google Test and using it in user
+# tests.  Please tweak it to suit your environment and project.  You
+# may want to move it to your project's root directory.
+#
+# SYNOPSIS:
+#
+#   make [all]  - makes everything.
+#   make TARGET - makes the given target.
+#   make clean  - removes all files generated by make.
+
+# Please tweak the following variable definitions as needed by your
+# project, except GTEST_HEADERS, which you can use in your own targets
+# but shouldn't modify.
+
+# Points to the root of Google Test, relative to where this file is.
+# Remember to tweak this if you move this file.
+GTEST_DIR = ..
+
+# Where to find user code.
+USER_DIR = ../samples
+
+# Flags passed to the preprocessor.
+# Set Google Test's header directory as a system directory, such that
+# the compiler doesn't generate warnings in Google Test headers.
+CPPFLAGS += -isystem $(GTEST_DIR)/include
+
+# Flags passed to the C++ compiler.
+CXXFLAGS += -g -Wall -Wextra -pthread
+
+# All tests produced by this Makefile.  Remember to add new tests you
+# created to the list.
+TESTS = sample1_unittest
+
+# All Google Test headers.  Usually you shouldn't change this
+# definition.
+GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
+                $(GTEST_DIR)/include/gtest/internal/*.h
+
+# House-keeping build targets.
+
+all : $(TESTS)
+
+clean :
+	rm -f $(TESTS) gtest.a gtest_main.a *.o
+
+# Builds gtest.a and gtest_main.a.
+
+# Usually you shouldn't tweak such internal variables, indicated by a
+# trailing _.
+GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS)
+
+# For simplicity and to avoid depending on Google Test's
+# implementation details, the dependencies specified below are
+# conservative and not optimized.  This is fine as Google Test
+# compiles fast and for ordinary users its source rarely changes.
+gtest-all.o : $(GTEST_SRCS_)
+	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
+            $(GTEST_DIR)/src/gtest-all.cc
+
+gtest_main.o : $(GTEST_SRCS_)
+	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
+            $(GTEST_DIR)/src/gtest_main.cc
+
+gtest.a : gtest-all.o
+	$(AR) $(ARFLAGS) $@ $^
+
+gtest_main.a : gtest-all.o gtest_main.o
+	$(AR) $(ARFLAGS) $@ $^
+
+# Builds a sample test.  A test should link with either gtest.a or
+# gtest_main.a, depending on whether it defines its own main()
+# function.
+
+sample1.o : $(USER_DIR)/sample1.cc $(USER_DIR)/sample1.h $(GTEST_HEADERS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/sample1.cc
+
+sample1_unittest.o : $(USER_DIR)/sample1_unittest.cc \
+                     $(USER_DIR)/sample1.h $(GTEST_HEADERS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/sample1_unittest.cc
+
+sample1_unittest : sample1.o sample1_unittest.o gtest_main.a
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest-md.sln b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest-md.sln
new file mode 100644
index 0000000000..f7908da11f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest-md.sln
@@ -0,0 +1,45 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "gtest-md.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main-md", "gtest_main-md.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862033}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test-md", "gtest_prod_test-md.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest-md", "gtest_unittest-md.vcproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug.ActiveCfg = Debug|Win32
+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug.Build.0 = Debug|Win32
+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release.ActiveCfg = Release|Win32
+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release.Build.0 = Release|Win32
+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug.ActiveCfg = Debug|Win32
+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug.Build.0 = Debug|Win32
+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Release.ActiveCfg = Release|Win32
+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Release.Build.0 = Release|Win32
+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug.ActiveCfg = Debug|Win32
+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug.Build.0 = Debug|Win32
+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release.ActiveCfg = Release|Win32
+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release.Build.0 = Release|Win32
+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug.ActiveCfg = Debug|Win32
+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug.Build.0 = Debug|Win32
+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release.ActiveCfg = Release|Win32
+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest-md.vcproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest-md.vcproj
new file mode 100644
index 0000000000..1c35c3a5ed
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest-md.vcproj
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="gtest-md"
+	ProjectGUID="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			ReferencesPath="">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/gtestd.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/gtest.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\src\gtest-all.cc">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest.sln b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest.sln
new file mode 100644
index 0000000000..ef4b057fff
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest.sln
@@ -0,0 +1,45 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "gtest_main.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862032}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest", "gtest_unittest.vcproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test", "gtest_prod_test.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug.ActiveCfg = Debug|Win32
+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug.Build.0 = Debug|Win32
+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release.ActiveCfg = Release|Win32
+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release.Build.0 = Release|Win32
+		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug.ActiveCfg = Debug|Win32
+		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug.Build.0 = Debug|Win32
+		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Release.ActiveCfg = Release|Win32
+		{3AF54C8A-10BF-4332-9147-F68ED9862032}.Release.Build.0 = Release|Win32
+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug.ActiveCfg = Debug|Win32
+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug.Build.0 = Debug|Win32
+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.ActiveCfg = Release|Win32
+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.Build.0 = Release|Win32
+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.ActiveCfg = Debug|Win32
+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.Build.0 = Debug|Win32
+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.ActiveCfg = Release|Win32
+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest.vcproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest.vcproj
new file mode 100644
index 0000000000..a8373ce9a4
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest.vcproj
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="gtest"
+	ProjectGUID="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			ReferencesPath="">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/gtestd.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/gtest.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\src\gtest-all.cc">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_main-md.vcproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_main-md.vcproj
new file mode 100644
index 0000000000..b5379fe610
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_main-md.vcproj
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="gtest_main-md"
+	ProjectGUID="{3AF54C8A-10BF-4332-9147-F68ED9862033}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			ReferencesPath="">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/$(ProjectName)d.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/$(ProjectName).lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"
+			Name="gtest-md"/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\src\gtest_main.cc">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_main.vcproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_main.vcproj
new file mode 100644
index 0000000000..e8b763c56d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_main.vcproj
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="gtest_main"
+	ProjectGUID="{3AF54C8A-10BF-4332-9147-F68ED9862032}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			ReferencesPath="">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/$(ProjectName)d.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/$(ProjectName).lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
+			Name="gtest"/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\src\gtest_main.cc">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_prod_test-md.vcproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_prod_test-md.vcproj
new file mode 100644
index 0000000000..05b05d9ed9
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_prod_test-md.vcproj
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="gtest_prod_test-md"
+	ProjectGUID="{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/gtest_prod_test.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/gtest_prod_test.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/gtest_prod_test.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{3AF54C8A-10BF-4332-9147-F68ED9862033}"
+			Name="gtest_main-md"/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\test\gtest_prod_test.cc">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\test\production.cc">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\test\production.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_prod_test.vcproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_prod_test.vcproj
new file mode 100644
index 0000000000..6d7a2f021b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_prod_test.vcproj
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="gtest_prod_test"
+	ProjectGUID="{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/gtest_prod_test.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/gtest_prod_test.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/gtest_prod_test.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{3AF54C8A-10BF-4332-9147-F68ED9862032}"
+			Name="gtest_main"/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\test\gtest_prod_test.cc">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\test\production.cc">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\test\production.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_unittest-md.vcproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_unittest-md.vcproj
new file mode 100644
index 0000000000..38a5e5663c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_unittest-md.vcproj
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="gtest_unittest-md"
+	ProjectGUID="{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/gtest_unittest.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/gtest_unittest.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/gtest_unittest.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{3AF54C8A-10BF-4332-9147-F68ED9862033}"
+			Name="gtest_main-md"/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\test\gtest_unittest.cc">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="1"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
+						BasicRuntimeChecks="0"
+						UsePrecompiledHeader="0"
+						DebugInformationFormat="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_unittest.vcproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_unittest.vcproj
new file mode 100644
index 0000000000..cb1f52b1f5
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/msvc/gtest_unittest.vcproj
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="gtest_unittest"
+	ProjectGUID="{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/gtest_unittest.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/gtest_unittest.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/gtest_unittest.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{3AF54C8A-10BF-4332-9147-F68ED9862032}"
+			Name="gtest_main"/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\test\gtest_unittest.cc">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="1"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
+						BasicRuntimeChecks="0"
+						UsePrecompiledHeader="0"
+						DebugInformationFormat="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/prime_tables.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/prime_tables.h
new file mode 100644
index 0000000000..92ce16a014
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/prime_tables.h
@@ -0,0 +1,123 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+// Author: vladl@google.com (Vlad Losev)
+
+// This provides interface PrimeTable that determines whether a number is a
+// prime and determines a next prime number. This interface is used
+// in Google Test samples demonstrating use of parameterized tests.
+
+#ifndef GTEST_SAMPLES_PRIME_TABLES_H_
+#define GTEST_SAMPLES_PRIME_TABLES_H_
+
+#include <algorithm>
+
+// The prime table interface.
+class PrimeTable {
+ public:
+  virtual ~PrimeTable() {}
+
+  // Returns true iff n is a prime number.
+  virtual bool IsPrime(int n) const = 0;
+
+  // Returns the smallest prime number greater than p; or returns -1
+  // if the next prime is beyond the capacity of the table.
+  virtual int GetNextPrime(int p) const = 0;
+};
+
+// Implementation #1 calculates the primes on-the-fly.
+class OnTheFlyPrimeTable : public PrimeTable {
+ public:
+  virtual bool IsPrime(int n) const {
+    if (n <= 1) return false;
+
+    for (int i = 2; i*i <= n; i++) {
+      // n is divisible by an integer other than 1 and itself.
+      if ((n % i) == 0) return false;
+    }
+
+    return true;
+  }
+
+  virtual int GetNextPrime(int p) const {
+    for (int n = p + 1; n > 0; n++) {
+      if (IsPrime(n)) return n;
+    }
+
+    return -1;
+  }
+};
+
+// Implementation #2 pre-calculates the primes and stores the result
+// in an array.
+class PreCalculatedPrimeTable : public PrimeTable {
+ public:
+  // 'max' specifies the maximum number the prime table holds.
+  explicit PreCalculatedPrimeTable(int max)
+      : is_prime_size_(max + 1), is_prime_(new bool[max + 1]) {
+    CalculatePrimesUpTo(max);
+  }
+  virtual ~PreCalculatedPrimeTable() { delete[] is_prime_; }
+
+  virtual bool IsPrime(int n) const {
+    return 0 <= n && n < is_prime_size_ && is_prime_[n];
+  }
+
+  virtual int GetNextPrime(int p) const {
+    for (int n = p + 1; n < is_prime_size_; n++) {
+      if (is_prime_[n]) return n;
+    }
+
+    return -1;
+  }
+
+ private:
+  void CalculatePrimesUpTo(int max) {
+    ::std::fill(is_prime_, is_prime_ + is_prime_size_, true);
+    is_prime_[0] = is_prime_[1] = false;
+
+    for (int i = 2; i <= max; i++) {
+      if (!is_prime_[i]) continue;
+
+      // Marks all multiples of i (except i itself) as non-prime.
+      for (int j = 2*i; j <= max; j += i) {
+        is_prime_[j] = false;
+      }
+    }
+  }
+
+  const int is_prime_size_;
+  bool* const is_prime_;
+
+  // Disables compiler warning "assignment operator could not be generated."
+  void operator=(const PreCalculatedPrimeTable& rhs);
+};
+
+#endif  // GTEST_SAMPLES_PRIME_TABLES_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample1.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample1.cc
new file mode 100644
index 0000000000..f171e2609d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample1.cc
@@ -0,0 +1,68 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "sample1.h"
+
+// Returns n! (the factorial of n).  For negative n, n! is defined to be 1.
+int Factorial(int n) {
+  int result = 1;
+  for (int i = 1; i <= n; i++) {
+    result *= i;
+  }
+
+  return result;
+}
+
+// Returns true iff n is a prime number.
+bool IsPrime(int n) {
+  // Trivial case 1: small numbers
+  if (n <= 1) return false;
+
+  // Trivial case 2: even numbers
+  if (n % 2 == 0) return n == 2;
+
+  // Now, we have that n is odd and n >= 3.
+
+  // Try to divide n by every odd number i, starting from 3
+  for (int i = 3; ; i += 2) {
+    // We only have to try i up to the squre root of n
+    if (i > n/i) break;
+
+    // Now, we have i <= n/i < n.
+    // If n is divisible by i, n is not prime.
+    if (n % i == 0) return false;
+  }
+
+  // n has no integer factor in the range (1, n), and thus is prime.
+  return true;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample1.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample1.h
new file mode 100644
index 0000000000..3dfeb98c45
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample1.h
@@ -0,0 +1,43 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#ifndef GTEST_SAMPLES_SAMPLE1_H_
+#define GTEST_SAMPLES_SAMPLE1_H_
+
+// Returns n! (the factorial of n).  For negative n, n! is defined to be 1.
+int Factorial(int n);
+
+// Returns true iff n is a prime number.
+bool IsPrime(int n);
+
+#endif  // GTEST_SAMPLES_SAMPLE1_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample10_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample10_unittest.cc
new file mode 100644
index 0000000000..0051cd5dcd
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample10_unittest.cc
@@ -0,0 +1,144 @@
+// Copyright 2009 Google Inc. All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+
+// This sample shows how to use Google Test listener API to implement
+// a primitive leak checker.
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "gtest/gtest.h"
+
+using ::testing::EmptyTestEventListener;
+using ::testing::InitGoogleTest;
+using ::testing::Test;
+using ::testing::TestCase;
+using ::testing::TestEventListeners;
+using ::testing::TestInfo;
+using ::testing::TestPartResult;
+using ::testing::UnitTest;
+
+namespace {
+
+// We will track memory used by this class.
+class Water {
+ public:
+  // Normal Water declarations go here.
+
+  // operator new and operator delete help us control water allocation.
+  void* operator new(size_t allocation_size) {
+    allocated_++;
+    return malloc(allocation_size);
+  }
+
+  void operator delete(void* block, size_t /* allocation_size */) {
+    allocated_--;
+    free(block);
+  }
+
+  static int allocated() { return allocated_; }
+
+ private:
+  static int allocated_;
+};
+
+int Water::allocated_ = 0;
+
+// This event listener monitors how many Water objects are created and
+// destroyed by each test, and reports a failure if a test leaks some Water
+// objects. It does this by comparing the number of live Water objects at
+// the beginning of a test and at the end of a test.
+class LeakChecker : public EmptyTestEventListener {
+ private:
+  // Called before a test starts.
+  virtual void OnTestStart(const TestInfo& /* test_info */) {
+    initially_allocated_ = Water::allocated();
+  }
+
+  // Called after a test ends.
+  virtual void OnTestEnd(const TestInfo& /* test_info */) {
+    int difference = Water::allocated() - initially_allocated_;
+
+    // You can generate a failure in any event handler except
+    // OnTestPartResult. Just use an appropriate Google Test assertion to do
+    // it.
+    EXPECT_LE(difference, 0) << "Leaked " << difference << " unit(s) of Water!";
+  }
+
+  int initially_allocated_;
+};
+
+TEST(ListenersTest, DoesNotLeak) {
+  Water* water = new Water;
+  delete water;
+}
+
+// This should fail when the --check_for_leaks command line flag is
+// specified.
+TEST(ListenersTest, LeaksWater) {
+  Water* water = new Water;
+  EXPECT_TRUE(water != NULL);
+}
+
+}  // namespace
+
+int main(int argc, char **argv) {
+  InitGoogleTest(&argc, argv);
+
+  bool check_for_leaks = false;
+  if (argc > 1 && strcmp(argv[1], "--check_for_leaks") == 0 )
+    check_for_leaks = true;
+  else
+    printf("%s\n", "Run this program with --check_for_leaks to enable "
+           "custom leak checking in the tests.");
+
+  // If we are given the --check_for_leaks command line flag, installs the
+  // leak checker.
+  if (check_for_leaks) {
+    TestEventListeners& listeners = UnitTest::GetInstance()->listeners();
+
+    // Adds the leak checker to the end of the test event listener list,
+    // after the default text output printer and the default XML report
+    // generator.
+    //
+    // The order is important - it ensures that failures generated in the
+    // leak checker's OnTestEnd() method are processed by the text and XML
+    // printers *before* their OnTestEnd() methods are called, such that
+    // they are attributed to the right test. Remember that a listener
+    // receives an OnXyzStart event *after* listeners preceding it in the
+    // list received that event, and receives an OnXyzEnd event *before*
+    // listeners preceding it.
+    //
+    // We don't need to worry about deleting the new listener later, as
+    // Google Test will do it.
+    listeners.Append(new LeakChecker);
+  }
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample1_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample1_unittest.cc
new file mode 100644
index 0000000000..aefc4f1d86
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample1_unittest.cc
@@ -0,0 +1,153 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+
+// This sample shows how to write a simple unit test for a function,
+// using Google C++ testing framework.
+//
+// Writing a unit test using Google C++ testing framework is easy as 1-2-3:
+
+
+// Step 1. Include necessary header files such that the stuff your
+// test logic needs is declared.
+//
+// Don't forget gtest.h, which declares the testing framework.
+
+#include <limits.h>
+#include "sample1.h"
+#include "gtest/gtest.h"
+
+
+// Step 2. Use the TEST macro to define your tests.
+//
+// TEST has two parameters: the test case name and the test name.
+// After using the macro, you should define your test logic between a
+// pair of braces.  You can use a bunch of macros to indicate the
+// success or failure of a test.  EXPECT_TRUE and EXPECT_EQ are
+// examples of such macros.  For a complete list, see gtest.h.
+//
+// <TechnicalDetails>
+//
+// In Google Test, tests are grouped into test cases.  This is how we
+// keep test code organized.  You should put logically related tests
+// into the same test case.
+//
+// The test case name and the test name should both be valid C++
+// identifiers.  And you should not use underscore (_) in the names.
+//
+// Google Test guarantees that each test you define is run exactly
+// once, but it makes no guarantee on the order the tests are
+// executed.  Therefore, you should write your tests in such a way
+// that their results don't depend on their order.
+//
+// </TechnicalDetails>
+
+
+// Tests Factorial().
+
+// Tests factorial of negative numbers.
+TEST(FactorialTest, Negative) {
+  // This test is named "Negative", and belongs to the "FactorialTest"
+  // test case.
+  EXPECT_EQ(1, Factorial(-5));
+  EXPECT_EQ(1, Factorial(-1));
+  EXPECT_GT(Factorial(-10), 0);
+
+  // <TechnicalDetails>
+  //
+  // EXPECT_EQ(expected, actual) is the same as
+  //
+  //   EXPECT_TRUE((expected) == (actual))
+  //
+  // except that it will print both the expected value and the actual
+  // value when the assertion fails.  This is very helpful for
+  // debugging.  Therefore in this case EXPECT_EQ is preferred.
+  //
+  // On the other hand, EXPECT_TRUE accepts any Boolean expression,
+  // and is thus more general.
+  //
+  // </TechnicalDetails>
+}
+
+// Tests factorial of 0.
+TEST(FactorialTest, Zero) {
+  EXPECT_EQ(1, Factorial(0));
+}
+
+// Tests factorial of positive numbers.
+TEST(FactorialTest, Positive) {
+  EXPECT_EQ(1, Factorial(1));
+  EXPECT_EQ(2, Factorial(2));
+  EXPECT_EQ(6, Factorial(3));
+  EXPECT_EQ(40320, Factorial(8));
+}
+
+
+// Tests IsPrime()
+
+// Tests negative input.
+TEST(IsPrimeTest, Negative) {
+  // This test belongs to the IsPrimeTest test case.
+
+  EXPECT_FALSE(IsPrime(-1));
+  EXPECT_FALSE(IsPrime(-2));
+  EXPECT_FALSE(IsPrime(INT_MIN));
+}
+
+// Tests some trivial cases.
+TEST(IsPrimeTest, Trivial) {
+  EXPECT_FALSE(IsPrime(0));
+  EXPECT_FALSE(IsPrime(1));
+  EXPECT_TRUE(IsPrime(2));
+  EXPECT_TRUE(IsPrime(3));
+}
+
+// Tests positive input.
+TEST(IsPrimeTest, Positive) {
+  EXPECT_FALSE(IsPrime(4));
+  EXPECT_TRUE(IsPrime(5));
+  EXPECT_FALSE(IsPrime(6));
+  EXPECT_TRUE(IsPrime(23));
+}
+
+// Step 3. Call RUN_ALL_TESTS() in main().
+//
+// We do this by linking in src/gtest_main.cc file, which consists of
+// a main() function which calls RUN_ALL_TESTS() for us.
+//
+// This runs all the tests you've defined, prints the result, and
+// returns 0 if successful, or 1 otherwise.
+//
+// Did you notice that we didn't register the tests?  The
+// RUN_ALL_TESTS() macro magically knows about all the tests we
+// defined.  Isn't this convenient?
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample2.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample2.cc
new file mode 100644
index 0000000000..5f763b9bdf
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample2.cc
@@ -0,0 +1,56 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "sample2.h"
+
+#include <string.h>
+
+// Clones a 0-terminated C string, allocating memory using new.
+const char* MyString::CloneCString(const char* a_c_string) {
+  if (a_c_string == NULL) return NULL;
+
+  const size_t len = strlen(a_c_string);
+  char* const clone = new char[ len + 1 ];
+  memcpy(clone, a_c_string, len + 1);
+
+  return clone;
+}
+
+// Sets the 0-terminated C string this MyString object
+// represents.
+void MyString::Set(const char* a_c_string) {
+  // Makes sure this works when c_string == c_string_
+  const char* const temp = MyString::CloneCString(a_c_string);
+  delete[] c_string_;
+  c_string_ = temp;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample2.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample2.h
new file mode 100644
index 0000000000..cb485c70fb
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample2.h
@@ -0,0 +1,85 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#ifndef GTEST_SAMPLES_SAMPLE2_H_
+#define GTEST_SAMPLES_SAMPLE2_H_
+
+#include <string.h>
+
+
+// A simple string class.
+class MyString {
+ private:
+  const char* c_string_;
+  const MyString& operator=(const MyString& rhs);
+
+ public:
+  // Clones a 0-terminated C string, allocating memory using new.
+  static const char* CloneCString(const char* a_c_string);
+
+  ////////////////////////////////////////////////////////////
+  //
+  // C'tors
+
+  // The default c'tor constructs a NULL string.
+  MyString() : c_string_(NULL) {}
+
+  // Constructs a MyString by cloning a 0-terminated C string.
+  explicit MyString(const char* a_c_string) : c_string_(NULL) {
+    Set(a_c_string);
+  }
+
+  // Copy c'tor
+  MyString(const MyString& string) : c_string_(NULL) {
+    Set(string.c_string_);
+  }
+
+  ////////////////////////////////////////////////////////////
+  //
+  // D'tor.  MyString is intended to be a final class, so the d'tor
+  // doesn't need to be virtual.
+  ~MyString() { delete[] c_string_; }
+
+  // Gets the 0-terminated C string this MyString object represents.
+  const char* c_string() const { return c_string_; }
+
+  size_t Length() const {
+    return c_string_ == NULL ? 0 : strlen(c_string_);
+  }
+
+  // Sets the 0-terminated C string this MyString object represents.
+  void Set(const char* c_string);
+};
+
+
+#endif  // GTEST_SAMPLES_SAMPLE2_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample2_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample2_unittest.cc
new file mode 100644
index 0000000000..4fa19b71c7
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample2_unittest.cc
@@ -0,0 +1,109 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+
+// This sample shows how to write a more complex unit test for a class
+// that has multiple member functions.
+//
+// Usually, it's a good idea to have one test for each method in your
+// class.  You don't have to do that exactly, but it helps to keep
+// your tests organized.  You may also throw in additional tests as
+// needed.
+
+#include "sample2.h"
+#include "gtest/gtest.h"
+
+// In this example, we test the MyString class (a simple string).
+
+// Tests the default c'tor.
+TEST(MyString, DefaultConstructor) {
+  const MyString s;
+
+  // Asserts that s.c_string() returns NULL.
+  //
+  // <TechnicalDetails>
+  //
+  // If we write NULL instead of
+  //
+  //   static_cast<const char *>(NULL)
+  //
+  // in this assertion, it will generate a warning on gcc 3.4.  The
+  // reason is that EXPECT_EQ needs to know the types of its
+  // arguments in order to print them when it fails.  Since NULL is
+  // #defined as 0, the compiler will use the formatter function for
+  // int to print it.  However, gcc thinks that NULL should be used as
+  // a pointer, not an int, and therefore complains.
+  //
+  // The root of the problem is C++'s lack of distinction between the
+  // integer number 0 and the null pointer constant.  Unfortunately,
+  // we have to live with this fact.
+  //
+  // </TechnicalDetails>
+  EXPECT_STREQ(NULL, s.c_string());
+
+  EXPECT_EQ(0u, s.Length());
+}
+
+const char kHelloString[] = "Hello, world!";
+
+// Tests the c'tor that accepts a C string.
+TEST(MyString, ConstructorFromCString) {
+  const MyString s(kHelloString);
+  EXPECT_EQ(0, strcmp(s.c_string(), kHelloString));
+  EXPECT_EQ(sizeof(kHelloString)/sizeof(kHelloString[0]) - 1,
+            s.Length());
+}
+
+// Tests the copy c'tor.
+TEST(MyString, CopyConstructor) {
+  const MyString s1(kHelloString);
+  const MyString s2 = s1;
+  EXPECT_EQ(0, strcmp(s2.c_string(), kHelloString));
+}
+
+// Tests the Set method.
+TEST(MyString, Set) {
+  MyString s;
+
+  s.Set(kHelloString);
+  EXPECT_EQ(0, strcmp(s.c_string(), kHelloString));
+
+  // Set should work when the input pointer is the same as the one
+  // already in the MyString object.
+  s.Set(s.c_string());
+  EXPECT_EQ(0, strcmp(s.c_string(), kHelloString));
+
+  // Can we set the MyString to NULL?
+  s.Set(NULL);
+  EXPECT_STREQ(NULL, s.c_string());
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample3-inl.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample3-inl.h
new file mode 100644
index 0000000000..7e3084d638
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample3-inl.h
@@ -0,0 +1,172 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#ifndef GTEST_SAMPLES_SAMPLE3_INL_H_
+#define GTEST_SAMPLES_SAMPLE3_INL_H_
+
+#include <stddef.h>
+
+
+// Queue is a simple queue implemented as a singled-linked list.
+//
+// The element type must support copy constructor.
+template <typename E>  // E is the element type
+class Queue;
+
+// QueueNode is a node in a Queue, which consists of an element of
+// type E and a pointer to the next node.
+template <typename E>  // E is the element type
+class QueueNode {
+  friend class Queue<E>;
+
+ public:
+  // Gets the element in this node.
+  const E& element() const { return element_; }
+
+  // Gets the next node in the queue.
+  QueueNode* next() { return next_; }
+  const QueueNode* next() const { return next_; }
+
+ private:
+  // Creates a node with a given element value.  The next pointer is
+  // set to NULL.
+  explicit QueueNode(const E& an_element) : element_(an_element), next_(NULL) {}
+
+  // We disable the default assignment operator and copy c'tor.
+  const QueueNode& operator = (const QueueNode&);
+  QueueNode(const QueueNode&);
+
+  E element_;
+  QueueNode* next_;
+};
+
+template <typename E>  // E is the element type.
+class Queue {
+ public:
+  // Creates an empty queue.
+  Queue() : head_(NULL), last_(NULL), size_(0) {}
+
+  // D'tor.  Clears the queue.
+  ~Queue() { Clear(); }
+
+  // Clears the queue.
+  void Clear() {
+    if (size_ > 0) {
+      // 1. Deletes every node.
+      QueueNode<E>* node = head_;
+      QueueNode<E>* next = node->next();
+      for (; ;) {
+        delete node;
+        node = next;
+        if (node == NULL) break;
+        next = node->next();
+      }
+
+      // 2. Resets the member variables.
+      head_ = last_ = NULL;
+      size_ = 0;
+    }
+  }
+
+  // Gets the number of elements.
+  size_t Size() const { return size_; }
+
+  // Gets the first element of the queue, or NULL if the queue is empty.
+  QueueNode<E>* Head() { return head_; }
+  const QueueNode<E>* Head() const { return head_; }
+
+  // Gets the last element of the queue, or NULL if the queue is empty.
+  QueueNode<E>* Last() { return last_; }
+  const QueueNode<E>* Last() const { return last_; }
+
+  // Adds an element to the end of the queue.  A copy of the element is
+  // created using the copy constructor, and then stored in the queue.
+  // Changes made to the element in the queue doesn't affect the source
+  // object, and vice versa.
+  void Enqueue(const E& element) {
+    QueueNode<E>* new_node = new QueueNode<E>(element);
+
+    if (size_ == 0) {
+      head_ = last_ = new_node;
+      size_ = 1;
+    } else {
+      last_->next_ = new_node;
+      last_ = new_node;
+      size_++;
+    }
+  }
+
+  // Removes the head of the queue and returns it.  Returns NULL if
+  // the queue is empty.
+  E* Dequeue() {
+    if (size_ == 0) {
+      return NULL;
+    }
+
+    const QueueNode<E>* const old_head = head_;
+    head_ = head_->next_;
+    size_--;
+    if (size_ == 0) {
+      last_ = NULL;
+    }
+
+    E* element = new E(old_head->element());
+    delete old_head;
+
+    return element;
+  }
+
+  // Applies a function/functor on each element of the queue, and
+  // returns the result in a new queue.  The original queue is not
+  // affected.
+  template <typename F>
+  Queue* Map(F function) const {
+    Queue* new_queue = new Queue();
+    for (const QueueNode<E>* node = head_; node != NULL; node = node->next_) {
+      new_queue->Enqueue(function(node->element()));
+    }
+
+    return new_queue;
+  }
+
+ private:
+  QueueNode<E>* head_;  // The first node of the queue.
+  QueueNode<E>* last_;  // The last node of the queue.
+  size_t size_;  // The number of elements in the queue.
+
+  // We disallow copying a queue.
+  Queue(const Queue&);
+  const Queue& operator = (const Queue&);
+};
+
+#endif  // GTEST_SAMPLES_SAMPLE3_INL_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample3_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample3_unittest.cc
new file mode 100644
index 0000000000..bf3877d013
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample3_unittest.cc
@@ -0,0 +1,151 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+
+// In this example, we use a more advanced feature of Google Test called
+// test fixture.
+//
+// A test fixture is a place to hold objects and functions shared by
+// all tests in a test case.  Using a test fixture avoids duplicating
+// the test code necessary to initialize and cleanup those common
+// objects for each test.  It is also useful for defining sub-routines
+// that your tests need to invoke a lot.
+//
+// <TechnicalDetails>
+//
+// The tests share the test fixture in the sense of code sharing, not
+// data sharing.  Each test is given its own fresh copy of the
+// fixture.  You cannot expect the data modified by one test to be
+// passed on to another test, which is a bad idea.
+//
+// The reason for this design is that tests should be independent and
+// repeatable.  In particular, a test should not fail as the result of
+// another test's failure.  If one test depends on info produced by
+// another test, then the two tests should really be one big test.
+//
+// The macros for indicating the success/failure of a test
+// (EXPECT_TRUE, FAIL, etc) need to know what the current test is
+// (when Google Test prints the test result, it tells you which test
+// each failure belongs to).  Technically, these macros invoke a
+// member function of the Test class.  Therefore, you cannot use them
+// in a global function.  That's why you should put test sub-routines
+// in a test fixture.
+//
+// </TechnicalDetails>
+
+#include "sample3-inl.h"
+#include "gtest/gtest.h"
+
+// To use a test fixture, derive a class from testing::Test.
+class QueueTest : public testing::Test {
+ protected:  // You should make the members protected s.t. they can be
+             // accessed from sub-classes.
+
+  // virtual void SetUp() will be called before each test is run.  You
+  // should define it if you need to initialize the varaibles.
+  // Otherwise, this can be skipped.
+  virtual void SetUp() {
+    q1_.Enqueue(1);
+    q2_.Enqueue(2);
+    q2_.Enqueue(3);
+  }
+
+  // virtual void TearDown() will be called after each test is run.
+  // You should define it if there is cleanup work to do.  Otherwise,
+  // you don't have to provide it.
+  //
+  // virtual void TearDown() {
+  // }
+
+  // A helper function that some test uses.
+  static int Double(int n) {
+    return 2*n;
+  }
+
+  // A helper function for testing Queue::Map().
+  void MapTester(const Queue<int> * q) {
+    // Creates a new queue, where each element is twice as big as the
+    // corresponding one in q.
+    const Queue<int> * const new_q = q->Map(Double);
+
+    // Verifies that the new queue has the same size as q.
+    ASSERT_EQ(q->Size(), new_q->Size());
+
+    // Verifies the relationship between the elements of the two queues.
+    for ( const QueueNode<int> * n1 = q->Head(), * n2 = new_q->Head();
+          n1 != NULL; n1 = n1->next(), n2 = n2->next() ) {
+      EXPECT_EQ(2 * n1->element(), n2->element());
+    }
+
+    delete new_q;
+  }
+
+  // Declares the variables your tests want to use.
+  Queue<int> q0_;
+  Queue<int> q1_;
+  Queue<int> q2_;
+};
+
+// When you have a test fixture, you define a test using TEST_F
+// instead of TEST.
+
+// Tests the default c'tor.
+TEST_F(QueueTest, DefaultConstructor) {
+  // You can access data in the test fixture here.
+  EXPECT_EQ(0u, q0_.Size());
+}
+
+// Tests Dequeue().
+TEST_F(QueueTest, Dequeue) {
+  int * n = q0_.Dequeue();
+  EXPECT_TRUE(n == NULL);
+
+  n = q1_.Dequeue();
+  ASSERT_TRUE(n != NULL);
+  EXPECT_EQ(1, *n);
+  EXPECT_EQ(0u, q1_.Size());
+  delete n;
+
+  n = q2_.Dequeue();
+  ASSERT_TRUE(n != NULL);
+  EXPECT_EQ(2, *n);
+  EXPECT_EQ(1u, q2_.Size());
+  delete n;
+}
+
+// Tests the Queue::Map() function.
+TEST_F(QueueTest, Map) {
+  MapTester(&q0_);
+  MapTester(&q1_);
+  MapTester(&q2_);
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample4.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample4.cc
new file mode 100644
index 0000000000..ae44bda6f1
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample4.cc
@@ -0,0 +1,46 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include <stdio.h>
+
+#include "sample4.h"
+
+// Returns the current counter value, and increments it.
+int Counter::Increment() {
+  return counter_++;
+}
+
+// Prints the current counter value to STDOUT.
+void Counter::Print() const {
+  printf("%d", counter_);
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample4.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample4.h
new file mode 100644
index 0000000000..cd60f0dd2d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample4.h
@@ -0,0 +1,53 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// A sample program demonstrating using Google C++ testing framework.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#ifndef GTEST_SAMPLES_SAMPLE4_H_
+#define GTEST_SAMPLES_SAMPLE4_H_
+
+// A simple monotonic counter.
+class Counter {
+ private:
+  int counter_;
+
+ public:
+  // Creates a counter that starts at 0.
+  Counter() : counter_(0) {}
+
+  // Returns the current counter value, and increments it.
+  int Increment();
+
+  // Prints the current counter value to STDOUT.
+  void Print() const;
+};
+
+#endif  // GTEST_SAMPLES_SAMPLE4_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample4_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample4_unittest.cc
new file mode 100644
index 0000000000..fa5afc7d5a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample4_unittest.cc
@@ -0,0 +1,45 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "gtest/gtest.h"
+#include "sample4.h"
+
+// Tests the Increment() method.
+TEST(Counter, Increment) {
+  Counter c;
+
+  // EXPECT_EQ() evaluates its arguments exactly once, so they
+  // can have side effects.
+
+  EXPECT_EQ(0, c.Increment());
+  EXPECT_EQ(1, c.Increment());
+  EXPECT_EQ(2, c.Increment());
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample5_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample5_unittest.cc
new file mode 100644
index 0000000000..43d8e57775
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample5_unittest.cc
@@ -0,0 +1,199 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// This sample teaches how to reuse a test fixture in multiple test
+// cases by deriving sub-fixtures from it.
+//
+// When you define a test fixture, you specify the name of the test
+// case that will use this fixture.  Therefore, a test fixture can
+// be used by only one test case.
+//
+// Sometimes, more than one test cases may want to use the same or
+// slightly different test fixtures.  For example, you may want to
+// make sure that all tests for a GUI library don't leak important
+// system resources like fonts and brushes.  In Google Test, you do
+// this by putting the shared logic in a super (as in "super class")
+// test fixture, and then have each test case use a fixture derived
+// from this super fixture.
+
+#include <limits.h>
+#include <time.h>
+#include "sample3-inl.h"
+#include "gtest/gtest.h"
+#include "sample1.h"
+
+// In this sample, we want to ensure that every test finishes within
+// ~5 seconds.  If a test takes longer to run, we consider it a
+// failure.
+//
+// We put the code for timing a test in a test fixture called
+// "QuickTest".  QuickTest is intended to be the super fixture that
+// other fixtures derive from, therefore there is no test case with
+// the name "QuickTest".  This is OK.
+//
+// Later, we will derive multiple test fixtures from QuickTest.
+class QuickTest : public testing::Test {
+ protected:
+  // Remember that SetUp() is run immediately before a test starts.
+  // This is a good place to record the start time.
+  virtual void SetUp() {
+    start_time_ = time(NULL);
+  }
+
+  // TearDown() is invoked immediately after a test finishes.  Here we
+  // check if the test was too slow.
+  virtual void TearDown() {
+    // Gets the time when the test finishes
+    const time_t end_time = time(NULL);
+
+    // Asserts that the test took no more than ~5 seconds.  Did you
+    // know that you can use assertions in SetUp() and TearDown() as
+    // well?
+    EXPECT_TRUE(end_time - start_time_ <= 5) << "The test took too long.";
+  }
+
+  // The UTC time (in seconds) when the test starts
+  time_t start_time_;
+};
+
+
+// We derive a fixture named IntegerFunctionTest from the QuickTest
+// fixture.  All tests using this fixture will be automatically
+// required to be quick.
+class IntegerFunctionTest : public QuickTest {
+  // We don't need any more logic than already in the QuickTest fixture.
+  // Therefore the body is empty.
+};
+
+
+// Now we can write tests in the IntegerFunctionTest test case.
+
+// Tests Factorial()
+TEST_F(IntegerFunctionTest, Factorial) {
+  // Tests factorial of negative numbers.
+  EXPECT_EQ(1, Factorial(-5));
+  EXPECT_EQ(1, Factorial(-1));
+  EXPECT_GT(Factorial(-10), 0);
+
+  // Tests factorial of 0.
+  EXPECT_EQ(1, Factorial(0));
+
+  // Tests factorial of positive numbers.
+  EXPECT_EQ(1, Factorial(1));
+  EXPECT_EQ(2, Factorial(2));
+  EXPECT_EQ(6, Factorial(3));
+  EXPECT_EQ(40320, Factorial(8));
+}
+
+
+// Tests IsPrime()
+TEST_F(IntegerFunctionTest, IsPrime) {
+  // Tests negative input.
+  EXPECT_FALSE(IsPrime(-1));
+  EXPECT_FALSE(IsPrime(-2));
+  EXPECT_FALSE(IsPrime(INT_MIN));
+
+  // Tests some trivial cases.
+  EXPECT_FALSE(IsPrime(0));
+  EXPECT_FALSE(IsPrime(1));
+  EXPECT_TRUE(IsPrime(2));
+  EXPECT_TRUE(IsPrime(3));
+
+  // Tests positive input.
+  EXPECT_FALSE(IsPrime(4));
+  EXPECT_TRUE(IsPrime(5));
+  EXPECT_FALSE(IsPrime(6));
+  EXPECT_TRUE(IsPrime(23));
+}
+
+
+// The next test case (named "QueueTest") also needs to be quick, so
+// we derive another fixture from QuickTest.
+//
+// The QueueTest test fixture has some logic and shared objects in
+// addition to what's in QuickTest already.  We define the additional
+// stuff inside the body of the test fixture, as usual.
+class QueueTest : public QuickTest {
+ protected:
+  virtual void SetUp() {
+    // First, we need to set up the super fixture (QuickTest).
+    QuickTest::SetUp();
+
+    // Second, some additional setup for this fixture.
+    q1_.Enqueue(1);
+    q2_.Enqueue(2);
+    q2_.Enqueue(3);
+  }
+
+  // By default, TearDown() inherits the behavior of
+  // QuickTest::TearDown().  As we have no additional cleaning work
+  // for QueueTest, we omit it here.
+  //
+  // virtual void TearDown() {
+  //   QuickTest::TearDown();
+  // }
+
+  Queue<int> q0_;
+  Queue<int> q1_;
+  Queue<int> q2_;
+};
+
+
+// Now, let's write tests using the QueueTest fixture.
+
+// Tests the default constructor.
+TEST_F(QueueTest, DefaultConstructor) {
+  EXPECT_EQ(0u, q0_.Size());
+}
+
+// Tests Dequeue().
+TEST_F(QueueTest, Dequeue) {
+  int* n = q0_.Dequeue();
+  EXPECT_TRUE(n == NULL);
+
+  n = q1_.Dequeue();
+  EXPECT_TRUE(n != NULL);
+  EXPECT_EQ(1, *n);
+  EXPECT_EQ(0u, q1_.Size());
+  delete n;
+
+  n = q2_.Dequeue();
+  EXPECT_TRUE(n != NULL);
+  EXPECT_EQ(2, *n);
+  EXPECT_EQ(1u, q2_.Size());
+  delete n;
+}
+
+// If necessary, you can derive further test fixtures from a derived
+// fixture itself.  For example, you can derive another fixture from
+// QueueTest.  Google Test imposes no limit on how deep the hierarchy
+// can be.  In practice, however, you probably don't want it to be too
+// deep as to be confusing.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample6_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample6_unittest.cc
new file mode 100644
index 0000000000..8f2036a516
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample6_unittest.cc
@@ -0,0 +1,224 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// This sample shows how to test common properties of multiple
+// implementations of the same interface (aka interface tests).
+
+// The interface and its implementations are in this header.
+#include "prime_tables.h"
+
+#include "gtest/gtest.h"
+
+// First, we define some factory functions for creating instances of
+// the implementations.  You may be able to skip this step if all your
+// implementations can be constructed the same way.
+
+template <class T>
+PrimeTable* CreatePrimeTable();
+
+template <>
+PrimeTable* CreatePrimeTable<OnTheFlyPrimeTable>() {
+  return new OnTheFlyPrimeTable;
+}
+
+template <>
+PrimeTable* CreatePrimeTable<PreCalculatedPrimeTable>() {
+  return new PreCalculatedPrimeTable(10000);
+}
+
+// Then we define a test fixture class template.
+template <class T>
+class PrimeTableTest : public testing::Test {
+ protected:
+  // The ctor calls the factory function to create a prime table
+  // implemented by T.
+  PrimeTableTest() : table_(CreatePrimeTable<T>()) {}
+
+  virtual ~PrimeTableTest() { delete table_; }
+
+  // Note that we test an implementation via the base interface
+  // instead of the actual implementation class.  This is important
+  // for keeping the tests close to the real world scenario, where the
+  // implementation is invoked via the base interface.  It avoids
+  // got-yas where the implementation class has a method that shadows
+  // a method with the same name (but slightly different argument
+  // types) in the base interface, for example.
+  PrimeTable* const table_;
+};
+
+#if GTEST_HAS_TYPED_TEST
+
+using testing::Types;
+
+// Google Test offers two ways for reusing tests for different types.
+// The first is called "typed tests".  You should use it if you
+// already know *all* the types you are gonna exercise when you write
+// the tests.
+
+// To write a typed test case, first use
+//
+//   TYPED_TEST_CASE(TestCaseName, TypeList);
+//
+// to declare it and specify the type parameters.  As with TEST_F,
+// TestCaseName must match the test fixture name.
+
+// The list of types we want to test.
+typedef Types<OnTheFlyPrimeTable, PreCalculatedPrimeTable> Implementations;
+
+TYPED_TEST_CASE(PrimeTableTest, Implementations);
+
+// Then use TYPED_TEST(TestCaseName, TestName) to define a typed test,
+// similar to TEST_F.
+TYPED_TEST(PrimeTableTest, ReturnsFalseForNonPrimes) {
+  // Inside the test body, you can refer to the type parameter by
+  // TypeParam, and refer to the fixture class by TestFixture.  We
+  // don't need them in this example.
+
+  // Since we are in the template world, C++ requires explicitly
+  // writing 'this->' when referring to members of the fixture class.
+  // This is something you have to learn to live with.
+  EXPECT_FALSE(this->table_->IsPrime(-5));
+  EXPECT_FALSE(this->table_->IsPrime(0));
+  EXPECT_FALSE(this->table_->IsPrime(1));
+  EXPECT_FALSE(this->table_->IsPrime(4));
+  EXPECT_FALSE(this->table_->IsPrime(6));
+  EXPECT_FALSE(this->table_->IsPrime(100));
+}
+
+TYPED_TEST(PrimeTableTest, ReturnsTrueForPrimes) {
+  EXPECT_TRUE(this->table_->IsPrime(2));
+  EXPECT_TRUE(this->table_->IsPrime(3));
+  EXPECT_TRUE(this->table_->IsPrime(5));
+  EXPECT_TRUE(this->table_->IsPrime(7));
+  EXPECT_TRUE(this->table_->IsPrime(11));
+  EXPECT_TRUE(this->table_->IsPrime(131));
+}
+
+TYPED_TEST(PrimeTableTest, CanGetNextPrime) {
+  EXPECT_EQ(2, this->table_->GetNextPrime(0));
+  EXPECT_EQ(3, this->table_->GetNextPrime(2));
+  EXPECT_EQ(5, this->table_->GetNextPrime(3));
+  EXPECT_EQ(7, this->table_->GetNextPrime(5));
+  EXPECT_EQ(11, this->table_->GetNextPrime(7));
+  EXPECT_EQ(131, this->table_->GetNextPrime(128));
+}
+
+// That's it!  Google Test will repeat each TYPED_TEST for each type
+// in the type list specified in TYPED_TEST_CASE.  Sit back and be
+// happy that you don't have to define them multiple times.
+
+#endif  // GTEST_HAS_TYPED_TEST
+
+#if GTEST_HAS_TYPED_TEST_P
+
+using testing::Types;
+
+// Sometimes, however, you don't yet know all the types that you want
+// to test when you write the tests.  For example, if you are the
+// author of an interface and expect other people to implement it, you
+// might want to write a set of tests to make sure each implementation
+// conforms to some basic requirements, but you don't know what
+// implementations will be written in the future.
+//
+// How can you write the tests without committing to the type
+// parameters?  That's what "type-parameterized tests" can do for you.
+// It is a bit more involved than typed tests, but in return you get a
+// test pattern that can be reused in many contexts, which is a big
+// win.  Here's how you do it:
+
+// First, define a test fixture class template.  Here we just reuse
+// the PrimeTableTest fixture defined earlier:
+
+template <class T>
+class PrimeTableTest2 : public PrimeTableTest<T> {
+};
+
+// Then, declare the test case.  The argument is the name of the test
+// fixture, and also the name of the test case (as usual).  The _P
+// suffix is for "parameterized" or "pattern".
+TYPED_TEST_CASE_P(PrimeTableTest2);
+
+// Next, use TYPED_TEST_P(TestCaseName, TestName) to define a test,
+// similar to what you do with TEST_F.
+TYPED_TEST_P(PrimeTableTest2, ReturnsFalseForNonPrimes) {
+  EXPECT_FALSE(this->table_->IsPrime(-5));
+  EXPECT_FALSE(this->table_->IsPrime(0));
+  EXPECT_FALSE(this->table_->IsPrime(1));
+  EXPECT_FALSE(this->table_->IsPrime(4));
+  EXPECT_FALSE(this->table_->IsPrime(6));
+  EXPECT_FALSE(this->table_->IsPrime(100));
+}
+
+TYPED_TEST_P(PrimeTableTest2, ReturnsTrueForPrimes) {
+  EXPECT_TRUE(this->table_->IsPrime(2));
+  EXPECT_TRUE(this->table_->IsPrime(3));
+  EXPECT_TRUE(this->table_->IsPrime(5));
+  EXPECT_TRUE(this->table_->IsPrime(7));
+  EXPECT_TRUE(this->table_->IsPrime(11));
+  EXPECT_TRUE(this->table_->IsPrime(131));
+}
+
+TYPED_TEST_P(PrimeTableTest2, CanGetNextPrime) {
+  EXPECT_EQ(2, this->table_->GetNextPrime(0));
+  EXPECT_EQ(3, this->table_->GetNextPrime(2));
+  EXPECT_EQ(5, this->table_->GetNextPrime(3));
+  EXPECT_EQ(7, this->table_->GetNextPrime(5));
+  EXPECT_EQ(11, this->table_->GetNextPrime(7));
+  EXPECT_EQ(131, this->table_->GetNextPrime(128));
+}
+
+// Type-parameterized tests involve one extra step: you have to
+// enumerate the tests you defined:
+REGISTER_TYPED_TEST_CASE_P(
+    PrimeTableTest2,  // The first argument is the test case name.
+    // The rest of the arguments are the test names.
+    ReturnsFalseForNonPrimes, ReturnsTrueForPrimes, CanGetNextPrime);
+
+// At this point the test pattern is done.  However, you don't have
+// any real test yet as you haven't said which types you want to run
+// the tests with.
+
+// To turn the abstract test pattern into real tests, you instantiate
+// it with a list of types.  Usually the test pattern will be defined
+// in a .h file, and anyone can #include and instantiate it.  You can
+// even instantiate it more than once in the same program.  To tell
+// different instances apart, you give each of them a name, which will
+// become part of the test case name and can be used in test filters.
+
+// The list of types we want to test.  Note that it doesn't have to be
+// defined at the time we write the TYPED_TEST_P()s.
+typedef Types<OnTheFlyPrimeTable, PreCalculatedPrimeTable>
+    PrimeTableImplementations;
+INSTANTIATE_TYPED_TEST_CASE_P(OnTheFlyAndPreCalculated,    // Instance name
+                              PrimeTableTest2,             // Test case name
+                              PrimeTableImplementations);  // Type list
+
+#endif  // GTEST_HAS_TYPED_TEST_P
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample7_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample7_unittest.cc
new file mode 100644
index 0000000000..1b651a21d6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample7_unittest.cc
@@ -0,0 +1,130 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+
+// This sample shows how to test common properties of multiple
+// implementations of an interface (aka interface tests) using
+// value-parameterized tests. Each test in the test case has
+// a parameter that is an interface pointer to an implementation
+// tested.
+
+// The interface and its implementations are in this header.
+#include "prime_tables.h"
+
+#include "gtest/gtest.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+using ::testing::TestWithParam;
+using ::testing::Values;
+
+// As a general rule, to prevent a test from affecting the tests that come
+// after it, you should create and destroy the tested objects for each test
+// instead of reusing them.  In this sample we will define a simple factory
+// function for PrimeTable objects.  We will instantiate objects in test's
+// SetUp() method and delete them in TearDown() method.
+typedef PrimeTable* CreatePrimeTableFunc();
+
+PrimeTable* CreateOnTheFlyPrimeTable() {
+  return new OnTheFlyPrimeTable();
+}
+
+template <size_t max_precalculated>
+PrimeTable* CreatePreCalculatedPrimeTable() {
+  return new PreCalculatedPrimeTable(max_precalculated);
+}
+
+// Inside the test body, fixture constructor, SetUp(), and TearDown() you
+// can refer to the test parameter by GetParam().  In this case, the test
+// parameter is a factory function which we call in fixture's SetUp() to
+// create and store an instance of PrimeTable.
+class PrimeTableTest : public TestWithParam<CreatePrimeTableFunc*> {
+ public:
+  virtual ~PrimeTableTest() { delete table_; }
+  virtual void SetUp() { table_ = (*GetParam())(); }
+  virtual void TearDown() {
+    delete table_;
+    table_ = NULL;
+  }
+
+ protected:
+  PrimeTable* table_;
+};
+
+TEST_P(PrimeTableTest, ReturnsFalseForNonPrimes) {
+  EXPECT_FALSE(table_->IsPrime(-5));
+  EXPECT_FALSE(table_->IsPrime(0));
+  EXPECT_FALSE(table_->IsPrime(1));
+  EXPECT_FALSE(table_->IsPrime(4));
+  EXPECT_FALSE(table_->IsPrime(6));
+  EXPECT_FALSE(table_->IsPrime(100));
+}
+
+TEST_P(PrimeTableTest, ReturnsTrueForPrimes) {
+  EXPECT_TRUE(table_->IsPrime(2));
+  EXPECT_TRUE(table_->IsPrime(3));
+  EXPECT_TRUE(table_->IsPrime(5));
+  EXPECT_TRUE(table_->IsPrime(7));
+  EXPECT_TRUE(table_->IsPrime(11));
+  EXPECT_TRUE(table_->IsPrime(131));
+}
+
+TEST_P(PrimeTableTest, CanGetNextPrime) {
+  EXPECT_EQ(2, table_->GetNextPrime(0));
+  EXPECT_EQ(3, table_->GetNextPrime(2));
+  EXPECT_EQ(5, table_->GetNextPrime(3));
+  EXPECT_EQ(7, table_->GetNextPrime(5));
+  EXPECT_EQ(11, table_->GetNextPrime(7));
+  EXPECT_EQ(131, table_->GetNextPrime(128));
+}
+
+// In order to run value-parameterized tests, you need to instantiate them,
+// or bind them to a list of values which will be used as test parameters.
+// You can instantiate them in a different translation module, or even
+// instantiate them several times.
+//
+// Here, we instantiate our tests with a list of two PrimeTable object
+// factory functions:
+INSTANTIATE_TEST_CASE_P(
+    OnTheFlyAndPreCalculated,
+    PrimeTableTest,
+    Values(&CreateOnTheFlyPrimeTable, &CreatePreCalculatedPrimeTable<1000>));
+
+#else
+
+// Google Test may not support value-parameterized tests with some
+// compilers. If we use conditional compilation to compile out all
+// code referring to the gtest_main library, MSVC linker will not link
+// that library at all and consequently complain about missing entry
+// point defined in that library (fatal error LNK1561: entry point
+// must be defined). This dummy test keeps gtest_main linked in.
+TEST(DummyTest, ValueParameterizedTestsAreNotSupportedOnThisPlatform) {}
+
+#endif  // GTEST_HAS_PARAM_TEST
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample8_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample8_unittest.cc
new file mode 100644
index 0000000000..7274334067
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample8_unittest.cc
@@ -0,0 +1,173 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+
+// This sample shows how to test code relying on some global flag variables.
+// Combine() helps with generating all possible combinations of such flags,
+// and each test is given one combination as a parameter.
+
+// Use class definitions to test from this header.
+#include "prime_tables.h"
+
+#include "gtest/gtest.h"
+
+#if GTEST_HAS_COMBINE
+
+// Suppose we want to introduce a new, improved implementation of PrimeTable
+// which combines speed of PrecalcPrimeTable and versatility of
+// OnTheFlyPrimeTable (see prime_tables.h). Inside it instantiates both
+// PrecalcPrimeTable and OnTheFlyPrimeTable and uses the one that is more
+// appropriate under the circumstances. But in low memory conditions, it can be
+// told to instantiate without PrecalcPrimeTable instance at all and use only
+// OnTheFlyPrimeTable.
+class HybridPrimeTable : public PrimeTable {
+ public:
+  HybridPrimeTable(bool force_on_the_fly, int max_precalculated)
+      : on_the_fly_impl_(new OnTheFlyPrimeTable),
+        precalc_impl_(force_on_the_fly ? NULL :
+                          new PreCalculatedPrimeTable(max_precalculated)),
+        max_precalculated_(max_precalculated) {}
+  virtual ~HybridPrimeTable() {
+    delete on_the_fly_impl_;
+    delete precalc_impl_;
+  }
+
+  virtual bool IsPrime(int n) const {
+    if (precalc_impl_ != NULL && n < max_precalculated_)
+      return precalc_impl_->IsPrime(n);
+    else
+      return on_the_fly_impl_->IsPrime(n);
+  }
+
+  virtual int GetNextPrime(int p) const {
+    int next_prime = -1;
+    if (precalc_impl_ != NULL && p < max_precalculated_)
+      next_prime = precalc_impl_->GetNextPrime(p);
+
+    return next_prime != -1 ? next_prime : on_the_fly_impl_->GetNextPrime(p);
+  }
+
+ private:
+  OnTheFlyPrimeTable* on_the_fly_impl_;
+  PreCalculatedPrimeTable* precalc_impl_;
+  int max_precalculated_;
+};
+
+using ::testing::TestWithParam;
+using ::testing::Bool;
+using ::testing::Values;
+using ::testing::Combine;
+
+// To test all code paths for HybridPrimeTable we must test it with numbers
+// both within and outside PreCalculatedPrimeTable's capacity and also with
+// PreCalculatedPrimeTable disabled. We do this by defining fixture which will
+// accept different combinations of parameters for instantiating a
+// HybridPrimeTable instance.
+class PrimeTableTest : public TestWithParam< ::testing::tuple<bool, int> > {
+ protected:
+  virtual void SetUp() {
+    // This can be written as
+    //
+    // bool force_on_the_fly;
+    // int max_precalculated;
+    // tie(force_on_the_fly, max_precalculated) = GetParam();
+    //
+    // once the Google C++ Style Guide allows use of ::std::tr1::tie.
+    //
+    bool force_on_the_fly = ::testing::get<0>(GetParam());
+    int max_precalculated = ::testing::get<1>(GetParam());
+    table_ = new HybridPrimeTable(force_on_the_fly, max_precalculated);
+  }
+  virtual void TearDown() {
+    delete table_;
+    table_ = NULL;
+  }
+  HybridPrimeTable* table_;
+};
+
+TEST_P(PrimeTableTest, ReturnsFalseForNonPrimes) {
+  // Inside the test body, you can refer to the test parameter by GetParam().
+  // In this case, the test parameter is a PrimeTable interface pointer which
+  // we can use directly.
+  // Please note that you can also save it in the fixture's SetUp() method
+  // or constructor and use saved copy in the tests.
+
+  EXPECT_FALSE(table_->IsPrime(-5));
+  EXPECT_FALSE(table_->IsPrime(0));
+  EXPECT_FALSE(table_->IsPrime(1));
+  EXPECT_FALSE(table_->IsPrime(4));
+  EXPECT_FALSE(table_->IsPrime(6));
+  EXPECT_FALSE(table_->IsPrime(100));
+}
+
+TEST_P(PrimeTableTest, ReturnsTrueForPrimes) {
+  EXPECT_TRUE(table_->IsPrime(2));
+  EXPECT_TRUE(table_->IsPrime(3));
+  EXPECT_TRUE(table_->IsPrime(5));
+  EXPECT_TRUE(table_->IsPrime(7));
+  EXPECT_TRUE(table_->IsPrime(11));
+  EXPECT_TRUE(table_->IsPrime(131));
+}
+
+TEST_P(PrimeTableTest, CanGetNextPrime) {
+  EXPECT_EQ(2, table_->GetNextPrime(0));
+  EXPECT_EQ(3, table_->GetNextPrime(2));
+  EXPECT_EQ(5, table_->GetNextPrime(3));
+  EXPECT_EQ(7, table_->GetNextPrime(5));
+  EXPECT_EQ(11, table_->GetNextPrime(7));
+  EXPECT_EQ(131, table_->GetNextPrime(128));
+}
+
+// In order to run value-parameterized tests, you need to instantiate them,
+// or bind them to a list of values which will be used as test parameters.
+// You can instantiate them in a different translation module, or even
+// instantiate them several times.
+//
+// Here, we instantiate our tests with a list of parameters. We must combine
+// all variations of the boolean flag suppressing PrecalcPrimeTable and some
+// meaningful values for tests. We choose a small value (1), and a value that
+// will put some of the tested numbers beyond the capability of the
+// PrecalcPrimeTable instance and some inside it (10). Combine will produce all
+// possible combinations.
+INSTANTIATE_TEST_CASE_P(MeaningfulTestParameters,
+                        PrimeTableTest,
+                        Combine(Bool(), Values(1, 10)));
+
+#else
+
+// Google Test may not support Combine() with some compilers. If we
+// use conditional compilation to compile out all code referring to
+// the gtest_main library, MSVC linker will not link that library at
+// all and consequently complain about missing entry point defined in
+// that library (fatal error LNK1561: entry point must be
+// defined). This dummy test keeps gtest_main linked in.
+TEST(DummyTest, CombineIsNotSupportedOnThisPlatform) {}
+
+#endif  // GTEST_HAS_COMBINE
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample9_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample9_unittest.cc
new file mode 100644
index 0000000000..b2e2079bf3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/samples/sample9_unittest.cc
@@ -0,0 +1,160 @@
+// Copyright 2009 Google Inc. All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+
+// This sample shows how to use Google Test listener API to implement
+// an alternative console output and how to use the UnitTest reflection API
+// to enumerate test cases and tests and to inspect their results.
+
+#include <stdio.h>
+
+#include "gtest/gtest.h"
+
+using ::testing::EmptyTestEventListener;
+using ::testing::InitGoogleTest;
+using ::testing::Test;
+using ::testing::TestCase;
+using ::testing::TestEventListeners;
+using ::testing::TestInfo;
+using ::testing::TestPartResult;
+using ::testing::UnitTest;
+
+namespace {
+
+// Provides alternative output mode which produces minimal amount of
+// information about tests.
+class TersePrinter : public EmptyTestEventListener {
+ private:
+  // Called before any test activity starts.
+  virtual void OnTestProgramStart(const UnitTest& /* unit_test */) {}
+
+  // Called after all test activities have ended.
+  virtual void OnTestProgramEnd(const UnitTest& unit_test) {
+    fprintf(stdout, "TEST %s\n", unit_test.Passed() ? "PASSED" : "FAILED");
+    fflush(stdout);
+  }
+
+  // Called before a test starts.
+  virtual void OnTestStart(const TestInfo& test_info) {
+    fprintf(stdout,
+            "*** Test %s.%s starting.\n",
+            test_info.test_case_name(),
+            test_info.name());
+    fflush(stdout);
+  }
+
+  // Called after a failed assertion or a SUCCEED() invocation.
+  virtual void OnTestPartResult(const TestPartResult& test_part_result) {
+    fprintf(stdout,
+            "%s in %s:%d\n%s\n",
+            test_part_result.failed() ? "*** Failure" : "Success",
+            test_part_result.file_name(),
+            test_part_result.line_number(),
+            test_part_result.summary());
+    fflush(stdout);
+  }
+
+  // Called after a test ends.
+  virtual void OnTestEnd(const TestInfo& test_info) {
+    fprintf(stdout,
+            "*** Test %s.%s ending.\n",
+            test_info.test_case_name(),
+            test_info.name());
+    fflush(stdout);
+  }
+};  // class TersePrinter
+
+TEST(CustomOutputTest, PrintsMessage) {
+  printf("Printing something from the test body...\n");
+}
+
+TEST(CustomOutputTest, Succeeds) {
+  SUCCEED() << "SUCCEED() has been invoked from here";
+}
+
+TEST(CustomOutputTest, Fails) {
+  EXPECT_EQ(1, 2)
+      << "This test fails in order to demonstrate alternative failure messages";
+}
+
+}  // namespace
+
+int main(int argc, char **argv) {
+  InitGoogleTest(&argc, argv);
+
+  bool terse_output = false;
+  if (argc > 1 && strcmp(argv[1], "--terse_output") == 0 )
+    terse_output = true;
+  else
+    printf("%s\n", "Run this program with --terse_output to change the way "
+           "it prints its output.");
+
+  UnitTest& unit_test = *UnitTest::GetInstance();
+
+  // If we are given the --terse_output command line flag, suppresses the
+  // standard output and attaches own result printer.
+  if (terse_output) {
+    TestEventListeners& listeners = unit_test.listeners();
+
+    // Removes the default console output listener from the list so it will
+    // not receive events from Google Test and won't print any output. Since
+    // this operation transfers ownership of the listener to the caller we
+    // have to delete it as well.
+    delete listeners.Release(listeners.default_result_printer());
+
+    // Adds the custom output listener to the list. It will now receive
+    // events from Google Test and print the alternative output. We don't
+    // have to worry about deleting it since Google Test assumes ownership
+    // over it after adding it to the list.
+    listeners.Append(new TersePrinter);
+  }
+  int ret_val = RUN_ALL_TESTS();
+
+  // This is an example of using the UnitTest reflection API to inspect test
+  // results. Here we discount failures from the tests we expected to fail.
+  int unexpectedly_failed_tests = 0;
+  for (int i = 0; i < unit_test.total_test_case_count(); ++i) {
+    const TestCase& test_case = *unit_test.GetTestCase(i);
+    for (int j = 0; j < test_case.total_test_count(); ++j) {
+      const TestInfo& test_info = *test_case.GetTestInfo(j);
+      // Counts failed tests that were not meant to fail (those without
+      // 'Fails' in the name).
+      if (test_info.result()->Failed() &&
+          strcmp(test_info.name(), "Fails") != 0) {
+        unexpectedly_failed_tests++;
+      }
+    }
+  }
+
+  // Test that were meant to fail should not affect the test program outcome.
+  if (unexpectedly_failed_tests == 0)
+    ret_val = 0;
+
+  return ret_val;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/common.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/common.py
new file mode 100644
index 0000000000..3c0347a75b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/common.py
@@ -0,0 +1,83 @@
+# Copyright 2013 Google Inc. All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Shared utilities for writing scripts for Google Test/Mock."""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+
+import os
+import re
+
+
+# Matches the line from 'svn info .' output that describes what SVN
+# path the current local directory corresponds to.  For example, in
+# a googletest SVN workspace's trunk/test directory, the output will be:
+#
+# URL: https://googletest.googlecode.com/svn/trunk/test
+_SVN_INFO_URL_RE = re.compile(r'^URL: https://(\w+)\.googlecode\.com/svn(.*)')
+
+
+def GetCommandOutput(command):
+  """Runs the shell command and returns its stdout as a list of lines."""
+
+  f = os.popen(command, 'r')
+  lines = [line.strip() for line in f.readlines()]
+  f.close()
+  return lines
+
+
+def GetSvnInfo():
+  """Returns the project name and the current SVN workspace's root path."""
+
+  for line in GetCommandOutput('svn info .'):
+    m = _SVN_INFO_URL_RE.match(line)
+    if m:
+      project = m.group(1)  # googletest or googlemock
+      rel_path = m.group(2)
+      root = os.path.realpath(rel_path.count('/') * '../')
+      return project, root
+
+  return None, None
+
+
+def GetSvnTrunk():
+  """Returns the current SVN workspace's trunk root path."""
+
+  _, root = GetSvnInfo()
+  return root + '/trunk' if root else None
+
+
+def IsInGTestSvn():
+  project, _ = GetSvnInfo()
+  return project == 'googletest'
+
+
+def IsInGMockSvn():
+  project, _ = GetSvnInfo()
+  return project == 'googlemock'
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/fuse_gtest_files.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/fuse_gtest_files.py
new file mode 100755
index 0000000000..3f3e9f36d6
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/fuse_gtest_files.py
@@ -0,0 +1,253 @@
+#!/usr/bin/env python
+#
+# Copyright 2009, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""fuse_gtest_files.py v0.2.0
+Fuses Google Test source code into a .h file and a .cc file.
+
+SYNOPSIS
+       fuse_gtest_files.py [GTEST_ROOT_DIR] OUTPUT_DIR
+
+       Scans GTEST_ROOT_DIR for Google Test source code, and generates
+       two files: OUTPUT_DIR/gtest/gtest.h and OUTPUT_DIR/gtest/gtest-all.cc.
+       Then you can build your tests by adding OUTPUT_DIR to the include
+       search path and linking with OUTPUT_DIR/gtest/gtest-all.cc.  These
+       two files contain everything you need to use Google Test.  Hence
+       you can "install" Google Test by copying them to wherever you want.
+
+       GTEST_ROOT_DIR can be omitted and defaults to the parent
+       directory of the directory holding this script.
+
+EXAMPLES
+       ./fuse_gtest_files.py fused_gtest
+       ./fuse_gtest_files.py path/to/unpacked/gtest fused_gtest
+
+This tool is experimental.  In particular, it assumes that there is no
+conditional inclusion of Google Test headers.  Please report any
+problems to googletestframework@googlegroups.com.  You can read
+http://code.google.com/p/googletest/wiki/GoogleTestAdvancedGuide for
+more information.
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import re
+try:
+  from sets import Set as set  # For Python 2.3 compatibility
+except ImportError:
+  pass
+import sys
+
+# We assume that this file is in the scripts/ directory in the Google
+# Test root directory.
+DEFAULT_GTEST_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
+
+# Regex for matching '#include "gtest/..."'.
+INCLUDE_GTEST_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(gtest/.+)"')
+
+# Regex for matching '#include "src/..."'.
+INCLUDE_SRC_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(src/.+)"')
+
+# Where to find the source seed files.
+GTEST_H_SEED = 'include/gtest/gtest.h'
+GTEST_SPI_H_SEED = 'include/gtest/gtest-spi.h'
+GTEST_ALL_CC_SEED = 'src/gtest-all.cc'
+
+# Where to put the generated files.
+GTEST_H_OUTPUT = 'gtest/gtest.h'
+GTEST_ALL_CC_OUTPUT = 'gtest/gtest-all.cc'
+
+
+def VerifyFileExists(directory, relative_path):
+  """Verifies that the given file exists; aborts on failure.
+
+  relative_path is the file path relative to the given directory.
+  """
+
+  if not os.path.isfile(os.path.join(directory, relative_path)):
+    print('ERROR: Cannot find %s in directory %s.' % (relative_path,
+                                                      directory))
+    print('Please either specify a valid project root directory '
+          'or omit it on the command line.')
+    sys.exit(1)
+
+
+def ValidateGTestRootDir(gtest_root):
+  """Makes sure gtest_root points to a valid gtest root directory.
+
+  The function aborts the program on failure.
+  """
+
+  VerifyFileExists(gtest_root, GTEST_H_SEED)
+  VerifyFileExists(gtest_root, GTEST_ALL_CC_SEED)
+
+
+def VerifyOutputFile(output_dir, relative_path):
+  """Verifies that the given output file path is valid.
+
+  relative_path is relative to the output_dir directory.
+  """
+
+  # Makes sure the output file either doesn't exist or can be overwritten.
+  output_file = os.path.join(output_dir, relative_path)
+  if os.path.exists(output_file):
+    # TODO(wan@google.com): The following user-interaction doesn't
+    # work with automated processes.  We should provide a way for the
+    # Makefile to force overwriting the files.
+    print('%s already exists in directory %s - overwrite it? (y/N) ' %
+          (relative_path, output_dir))
+    answer = sys.stdin.readline().strip()
+    if answer not in ['y', 'Y']:
+      print('ABORTED.')
+      sys.exit(1)
+
+  # Makes sure the directory holding the output file exists; creates
+  # it and all its ancestors if necessary.
+  parent_directory = os.path.dirname(output_file)
+  if not os.path.isdir(parent_directory):
+    os.makedirs(parent_directory)
+
+
+def ValidateOutputDir(output_dir):
+  """Makes sure output_dir points to a valid output directory.
+
+  The function aborts the program on failure.
+  """
+
+  VerifyOutputFile(output_dir, GTEST_H_OUTPUT)
+  VerifyOutputFile(output_dir, GTEST_ALL_CC_OUTPUT)
+
+
+def FuseGTestH(gtest_root, output_dir):
+  """Scans folder gtest_root to generate gtest/gtest.h in output_dir."""
+
+  output_file = open(os.path.join(output_dir, GTEST_H_OUTPUT), 'w')
+  processed_files = set()  # Holds all gtest headers we've processed.
+
+  def ProcessFile(gtest_header_path):
+    """Processes the given gtest header file."""
+
+    # We don't process the same header twice.
+    if gtest_header_path in processed_files:
+      return
+
+    processed_files.add(gtest_header_path)
+
+    # Reads each line in the given gtest header.
+    for line in open(os.path.join(gtest_root, gtest_header_path), 'r'):
+      m = INCLUDE_GTEST_FILE_REGEX.match(line)
+      if m:
+        # It's '#include "gtest/..."' - let's process it recursively.
+        ProcessFile('include/' + m.group(1))
+      else:
+        # Otherwise we copy the line unchanged to the output file.
+        output_file.write(line)
+
+  ProcessFile(GTEST_H_SEED)
+  output_file.close()
+
+
+def FuseGTestAllCcToFile(gtest_root, output_file):
+  """Scans folder gtest_root to generate gtest/gtest-all.cc in output_file."""
+
+  processed_files = set()
+
+  def ProcessFile(gtest_source_file):
+    """Processes the given gtest source file."""
+
+    # We don't process the same #included file twice.
+    if gtest_source_file in processed_files:
+      return
+
+    processed_files.add(gtest_source_file)
+
+    # Reads each line in the given gtest source file.
+    for line in open(os.path.join(gtest_root, gtest_source_file), 'r'):
+      m = INCLUDE_GTEST_FILE_REGEX.match(line)
+      if m:
+        if 'include/' + m.group(1) == GTEST_SPI_H_SEED:
+          # It's '#include "gtest/gtest-spi.h"'.  This file is not
+          # #included by "gtest/gtest.h", so we need to process it.
+          ProcessFile(GTEST_SPI_H_SEED)
+        else:
+          # It's '#include "gtest/foo.h"' where foo is not gtest-spi.
+          # We treat it as '#include "gtest/gtest.h"', as all other
+          # gtest headers are being fused into gtest.h and cannot be
+          # #included directly.
+
+          # There is no need to #include "gtest/gtest.h" more than once.
+          if not GTEST_H_SEED in processed_files:
+            processed_files.add(GTEST_H_SEED)
+            output_file.write('#include "%s"\n' % (GTEST_H_OUTPUT,))
+      else:
+        m = INCLUDE_SRC_FILE_REGEX.match(line)
+        if m:
+          # It's '#include "src/foo"' - let's process it recursively.
+          ProcessFile(m.group(1))
+        else:
+          output_file.write(line)
+
+  ProcessFile(GTEST_ALL_CC_SEED)
+
+
+def FuseGTestAllCc(gtest_root, output_dir):
+  """Scans folder gtest_root to generate gtest/gtest-all.cc in output_dir."""
+
+  output_file = open(os.path.join(output_dir, GTEST_ALL_CC_OUTPUT), 'w')
+  FuseGTestAllCcToFile(gtest_root, output_file)
+  output_file.close()
+
+
+def FuseGTest(gtest_root, output_dir):
+  """Fuses gtest.h and gtest-all.cc."""
+
+  ValidateGTestRootDir(gtest_root)
+  ValidateOutputDir(output_dir)
+
+  FuseGTestH(gtest_root, output_dir)
+  FuseGTestAllCc(gtest_root, output_dir)
+
+
+def main():
+  argc = len(sys.argv)
+  if argc == 2:
+    # fuse_gtest_files.py OUTPUT_DIR
+    FuseGTest(DEFAULT_GTEST_ROOT_DIR, sys.argv[1])
+  elif argc == 3:
+    # fuse_gtest_files.py GTEST_ROOT_DIR OUTPUT_DIR
+    FuseGTest(sys.argv[1], sys.argv[2])
+  else:
+    print(__doc__)
+    sys.exit(1)
+
+
+if __name__ == '__main__':
+  main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/gen_gtest_pred_impl.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/gen_gtest_pred_impl.py
new file mode 100755
index 0000000000..3e7ab042ea
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/gen_gtest_pred_impl.py
@@ -0,0 +1,730 @@
+#!/usr/bin/env python
+#
+# Copyright 2006, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""gen_gtest_pred_impl.py v0.1
+
+Generates the implementation of Google Test predicate assertions and
+accompanying tests.
+
+Usage:
+
+  gen_gtest_pred_impl.py MAX_ARITY
+
+where MAX_ARITY is a positive integer.
+
+The command generates the implementation of up-to MAX_ARITY-ary
+predicate assertions, and writes it to file gtest_pred_impl.h in the
+directory where the script is.  It also generates the accompanying
+unit test in file gtest_pred_impl_unittest.cc.
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import sys
+import time
+
+# Where this script is.
+SCRIPT_DIR = os.path.dirname(sys.argv[0])
+
+# Where to store the generated header.
+HEADER = os.path.join(SCRIPT_DIR, '../include/gtest/gtest_pred_impl.h')
+
+# Where to store the generated unit test.
+UNIT_TEST = os.path.join(SCRIPT_DIR, '../test/gtest_pred_impl_unittest.cc')
+
+
+def HeaderPreamble(n):
+  """Returns the preamble for the header file.
+
+  Args:
+    n:  the maximum arity of the predicate macros to be generated.
+  """
+
+  # A map that defines the values used in the preamble template.
+  DEFS = {
+    'today' : time.strftime('%m/%d/%Y'),
+    'year' : time.strftime('%Y'),
+    'command' : '%s %s' % (os.path.basename(sys.argv[0]), n),
+    'n' : n
+    }
+
+  return (
+"""// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// This file is AUTOMATICALLY GENERATED on %(today)s by command
+// '%(command)s'.  DO NOT EDIT BY HAND!
+//
+// Implements a family of generic predicate assertion macros.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
+
+// Makes sure this header is not included before gtest.h.
+#ifndef GTEST_INCLUDE_GTEST_GTEST_H_
+# error Do not include gtest_pred_impl.h directly.  Include gtest.h instead.
+#endif  // GTEST_INCLUDE_GTEST_GTEST_H_
+
+// This header implements a family of generic predicate assertion
+// macros:
+//
+//   ASSERT_PRED_FORMAT1(pred_format, v1)
+//   ASSERT_PRED_FORMAT2(pred_format, v1, v2)
+//   ...
+//
+// where pred_format is a function or functor that takes n (in the
+// case of ASSERT_PRED_FORMATn) values and their source expression
+// text, and returns a testing::AssertionResult.  See the definition
+// of ASSERT_EQ in gtest.h for an example.
+//
+// If you don't care about formatting, you can use the more
+// restrictive version:
+//
+//   ASSERT_PRED1(pred, v1)
+//   ASSERT_PRED2(pred, v1, v2)
+//   ...
+//
+// where pred is an n-ary function or functor that returns bool,
+// and the values v1, v2, ..., must support the << operator for
+// streaming to std::ostream.
+//
+// We also define the EXPECT_* variations.
+//
+// For now we only support predicates whose arity is at most %(n)s.
+// Please email googletestframework@googlegroups.com if you need
+// support for higher arities.
+
+// GTEST_ASSERT_ is the basic statement to which all of the assertions
+// in this file reduce.  Don't use this in your code.
+
+#define GTEST_ASSERT_(expression, on_failure) \\
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_ \\
+  if (const ::testing::AssertionResult gtest_ar = (expression)) \\
+    ; \\
+  else \\
+    on_failure(gtest_ar.failure_message())
+""" % DEFS)
+
+
+def Arity(n):
+  """Returns the English name of the given arity."""
+
+  if n < 0:
+    return None
+  elif n <= 3:
+    return ['nullary', 'unary', 'binary', 'ternary'][n]
+  else:
+    return '%s-ary' % n
+
+
+def Title(word):
+  """Returns the given word in title case.  The difference between
+  this and string's title() method is that Title('4-ary') is '4-ary'
+  while '4-ary'.title() is '4-Ary'."""
+
+  return word[0].upper() + word[1:]
+
+
+def OneTo(n):
+  """Returns the list [1, 2, 3, ..., n]."""
+
+  return range(1, n + 1)
+
+
+def Iter(n, format, sep=''):
+  """Given a positive integer n, a format string that contains 0 or
+  more '%s' format specs, and optionally a separator string, returns
+  the join of n strings, each formatted with the format string on an
+  iterator ranged from 1 to n.
+
+  Example:
+
+  Iter(3, 'v%s', sep=', ') returns 'v1, v2, v3'.
+  """
+
+  # How many '%s' specs are in format?
+  spec_count = len(format.split('%s')) - 1
+  return sep.join([format % (spec_count * (i,)) for i in OneTo(n)])
+
+
+def ImplementationForArity(n):
+  """Returns the implementation of n-ary predicate assertions."""
+
+  # A map the defines the values used in the implementation template.
+  DEFS = {
+    'n' : str(n),
+    'vs' : Iter(n, 'v%s', sep=', '),
+    'vts' : Iter(n, '#v%s', sep=', '),
+    'arity' : Arity(n),
+    'Arity' : Title(Arity(n))
+    }
+
+  impl = """
+
+// Helper function for implementing {EXPECT|ASSERT}_PRED%(n)s.  Don't use
+// this in your code.
+template <typename Pred""" % DEFS
+
+  impl += Iter(n, """,
+          typename T%s""")
+
+  impl += """>
+AssertionResult AssertPred%(n)sHelper(const char* pred_text""" % DEFS
+
+  impl += Iter(n, """,
+                                  const char* e%s""")
+
+  impl += """,
+                                  Pred pred"""
+
+  impl += Iter(n, """,
+                                  const T%s& v%s""")
+
+  impl += """) {
+  if (pred(%(vs)s)) return AssertionSuccess();
+
+""" % DEFS
+
+  impl += '  return AssertionFailure() << pred_text << "("'
+
+  impl += Iter(n, """
+                            << e%s""", sep=' << ", "')
+
+  impl += ' << ") evaluates to false, where"'
+
+  impl += Iter(n, """
+                            << "\\n" << e%s << " evaluates to " << v%s""")
+
+  impl += """;
+}
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT%(n)s.
+// Don't use this in your code.
+#define GTEST_PRED_FORMAT%(n)s_(pred_format, %(vs)s, on_failure)\\
+  GTEST_ASSERT_(pred_format(%(vts)s, %(vs)s), \\
+                on_failure)
+
+// Internal macro for implementing {EXPECT|ASSERT}_PRED%(n)s.  Don't use
+// this in your code.
+#define GTEST_PRED%(n)s_(pred, %(vs)s, on_failure)\\
+  GTEST_ASSERT_(::testing::AssertPred%(n)sHelper(#pred""" % DEFS
+
+  impl += Iter(n, """, \\
+                                             #v%s""")
+
+  impl += """, \\
+                                             pred"""
+
+  impl += Iter(n, """, \\
+                                             v%s""")
+
+  impl += """), on_failure)
+
+// %(Arity)s predicate assertion macros.
+#define EXPECT_PRED_FORMAT%(n)s(pred_format, %(vs)s) \\
+  GTEST_PRED_FORMAT%(n)s_(pred_format, %(vs)s, GTEST_NONFATAL_FAILURE_)
+#define EXPECT_PRED%(n)s(pred, %(vs)s) \\
+  GTEST_PRED%(n)s_(pred, %(vs)s, GTEST_NONFATAL_FAILURE_)
+#define ASSERT_PRED_FORMAT%(n)s(pred_format, %(vs)s) \\
+  GTEST_PRED_FORMAT%(n)s_(pred_format, %(vs)s, GTEST_FATAL_FAILURE_)
+#define ASSERT_PRED%(n)s(pred, %(vs)s) \\
+  GTEST_PRED%(n)s_(pred, %(vs)s, GTEST_FATAL_FAILURE_)
+
+""" % DEFS
+
+  return impl
+
+
+def HeaderPostamble():
+  """Returns the postamble for the header file."""
+
+  return """
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_
+"""
+
+
+def GenerateFile(path, content):
+  """Given a file path and a content string, overwrites it with the
+  given content."""
+
+  print 'Updating file %s . . .' % path
+
+  f = file(path, 'w+')
+  print >>f, content,
+  f.close()
+
+  print 'File %s has been updated.' % path
+
+
+def GenerateHeader(n):
+  """Given the maximum arity n, updates the header file that implements
+  the predicate assertions."""
+
+  GenerateFile(HEADER,
+               HeaderPreamble(n)
+               + ''.join([ImplementationForArity(i) for i in OneTo(n)])
+               + HeaderPostamble())
+
+
+def UnitTestPreamble():
+  """Returns the preamble for the unit test file."""
+
+  # A map that defines the values used in the preamble template.
+  DEFS = {
+    'today' : time.strftime('%m/%d/%Y'),
+    'year' : time.strftime('%Y'),
+    'command' : '%s %s' % (os.path.basename(sys.argv[0]), sys.argv[1]),
+    }
+
+  return (
+"""// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// This file is AUTOMATICALLY GENERATED on %(today)s by command
+// '%(command)s'.  DO NOT EDIT BY HAND!
+
+// Regression test for gtest_pred_impl.h
+//
+// This file is generated by a script and quite long.  If you intend to
+// learn how Google Test works by reading its unit tests, read
+// gtest_unittest.cc instead.
+//
+// This is intended as a regression test for the Google Test predicate
+// assertions.  We compile it as part of the gtest_unittest target
+// only to keep the implementation tidy and compact, as it is quite
+// involved to set up the stage for testing Google Test using Google
+// Test itself.
+//
+// Currently, gtest_unittest takes ~11 seconds to run in the testing
+// daemon.  In the future, if it grows too large and needs much more
+// time to finish, we should consider separating this file into a
+// stand-alone regression test.
+
+#include <iostream>
+
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+
+// A user-defined data type.
+struct Bool {
+  explicit Bool(int val) : value(val != 0) {}
+
+  bool operator>(int n) const { return value > Bool(n).value; }
+
+  Bool operator+(const Bool& rhs) const { return Bool(value + rhs.value); }
+
+  bool operator==(const Bool& rhs) const { return value == rhs.value; }
+
+  bool value;
+};
+
+// Enables Bool to be used in assertions.
+std::ostream& operator<<(std::ostream& os, const Bool& x) {
+  return os << (x.value ? "true" : "false");
+}
+
+""" % DEFS)
+
+
+def TestsForArity(n):
+  """Returns the tests for n-ary predicate assertions."""
+
+  # A map that defines the values used in the template for the tests.
+  DEFS = {
+    'n' : n,
+    'es' : Iter(n, 'e%s', sep=', '),
+    'vs' : Iter(n, 'v%s', sep=', '),
+    'vts' : Iter(n, '#v%s', sep=', '),
+    'tvs' : Iter(n, 'T%s v%s', sep=', '),
+    'int_vs' : Iter(n, 'int v%s', sep=', '),
+    'Bool_vs' : Iter(n, 'Bool v%s', sep=', '),
+    'types' : Iter(n, 'typename T%s', sep=', '),
+    'v_sum' : Iter(n, 'v%s', sep=' + '),
+    'arity' : Arity(n),
+    'Arity' : Title(Arity(n)),
+    }
+
+  tests = (
+"""// Sample functions/functors for testing %(arity)s predicate assertions.
+
+// A %(arity)s predicate function.
+template <%(types)s>
+bool PredFunction%(n)s(%(tvs)s) {
+  return %(v_sum)s > 0;
+}
+
+// The following two functions are needed to circumvent a bug in
+// gcc 2.95.3, which sometimes has problem with the above template
+// function.
+bool PredFunction%(n)sInt(%(int_vs)s) {
+  return %(v_sum)s > 0;
+}
+bool PredFunction%(n)sBool(%(Bool_vs)s) {
+  return %(v_sum)s > 0;
+}
+""" % DEFS)
+
+  tests += """
+// A %(arity)s predicate functor.
+struct PredFunctor%(n)s {
+  template <%(types)s>
+  bool operator()(""" % DEFS
+
+  tests += Iter(n, 'const T%s& v%s', sep=""",
+                  """)
+
+  tests += """) {
+    return %(v_sum)s > 0;
+  }
+};
+""" % DEFS
+
+  tests += """
+// A %(arity)s predicate-formatter function.
+template <%(types)s>
+testing::AssertionResult PredFormatFunction%(n)s(""" % DEFS
+
+  tests += Iter(n, 'const char* e%s', sep=""",
+                                             """)
+
+  tests += Iter(n, """,
+                                             const T%s& v%s""")
+
+  tests += """) {
+  if (PredFunction%(n)s(%(vs)s))
+    return testing::AssertionSuccess();
+
+  return testing::AssertionFailure()
+      << """ % DEFS
+
+  tests += Iter(n, 'e%s', sep=' << " + " << ')
+
+  tests += """
+      << " is expected to be positive, but evaluates to "
+      << %(v_sum)s << ".";
+}
+""" % DEFS
+
+  tests += """
+// A %(arity)s predicate-formatter functor.
+struct PredFormatFunctor%(n)s {
+  template <%(types)s>
+  testing::AssertionResult operator()(""" % DEFS
+
+  tests += Iter(n, 'const char* e%s', sep=""",
+                                      """)
+
+  tests += Iter(n, """,
+                                      const T%s& v%s""")
+
+  tests += """) const {
+    return PredFormatFunction%(n)s(%(es)s, %(vs)s);
+  }
+};
+""" % DEFS
+
+  tests += """
+// Tests for {EXPECT|ASSERT}_PRED_FORMAT%(n)s.
+
+class Predicate%(n)sTest : public testing::Test {
+ protected:
+  virtual void SetUp() {
+    expected_to_finish_ = true;
+    finished_ = false;""" % DEFS
+
+  tests += """
+    """ + Iter(n, 'n%s_ = ') + """0;
+  }
+"""
+
+  tests += """
+  virtual void TearDown() {
+    // Verifies that each of the predicate's arguments was evaluated
+    // exactly once."""
+
+  tests += ''.join(["""
+    EXPECT_EQ(1, n%s_) <<
+        "The predicate assertion didn't evaluate argument %s "
+        "exactly once.";""" % (i, i + 1) for i in OneTo(n)])
+
+  tests += """
+
+    // Verifies that the control flow in the test function is expected.
+    if (expected_to_finish_ && !finished_) {
+      FAIL() << "The predicate assertion unexpactedly aborted the test.";
+    } else if (!expected_to_finish_ && finished_) {
+      FAIL() << "The failed predicate assertion didn't abort the test "
+                "as expected.";
+    }
+  }
+
+  // true iff the test function is expected to run to finish.
+  static bool expected_to_finish_;
+
+  // true iff the test function did run to finish.
+  static bool finished_;
+""" % DEFS
+
+  tests += Iter(n, """
+  static int n%s_;""")
+
+  tests += """
+};
+
+bool Predicate%(n)sTest::expected_to_finish_;
+bool Predicate%(n)sTest::finished_;
+""" % DEFS
+
+  tests += Iter(n, """int Predicate%%(n)sTest::n%s_;
+""") % DEFS
+
+  tests += """
+typedef Predicate%(n)sTest EXPECT_PRED_FORMAT%(n)sTest;
+typedef Predicate%(n)sTest ASSERT_PRED_FORMAT%(n)sTest;
+typedef Predicate%(n)sTest EXPECT_PRED%(n)sTest;
+typedef Predicate%(n)sTest ASSERT_PRED%(n)sTest;
+""" % DEFS
+
+  def GenTest(use_format, use_assert, expect_failure,
+              use_functor, use_user_type):
+    """Returns the test for a predicate assertion macro.
+
+    Args:
+      use_format:     true iff the assertion is a *_PRED_FORMAT*.
+      use_assert:     true iff the assertion is a ASSERT_*.
+      expect_failure: true iff the assertion is expected to fail.
+      use_functor:    true iff the first argument of the assertion is
+                      a functor (as opposed to a function)
+      use_user_type:  true iff the predicate functor/function takes
+                      argument(s) of a user-defined type.
+
+    Example:
+
+      GenTest(1, 0, 0, 1, 0) returns a test that tests the behavior
+      of a successful EXPECT_PRED_FORMATn() that takes a functor
+      whose arguments have built-in types."""
+
+    if use_assert:
+      assrt = 'ASSERT'  # 'assert' is reserved, so we cannot use
+                        # that identifier here.
+    else:
+      assrt = 'EXPECT'
+
+    assertion = assrt + '_PRED'
+
+    if use_format:
+      pred_format = 'PredFormat'
+      assertion += '_FORMAT'
+    else:
+      pred_format = 'Pred'
+
+    assertion += '%(n)s' % DEFS
+
+    if use_functor:
+      pred_format_type = 'functor'
+      pred_format += 'Functor%(n)s()'
+    else:
+      pred_format_type = 'function'
+      pred_format += 'Function%(n)s'
+      if not use_format:
+        if use_user_type:
+          pred_format += 'Bool'
+        else:
+          pred_format += 'Int'
+
+    test_name = pred_format_type.title()
+
+    if use_user_type:
+      arg_type = 'user-defined type (Bool)'
+      test_name += 'OnUserType'
+      if expect_failure:
+        arg = 'Bool(n%s_++)'
+      else:
+        arg = 'Bool(++n%s_)'
+    else:
+      arg_type = 'built-in type (int)'
+      test_name += 'OnBuiltInType'
+      if expect_failure:
+        arg = 'n%s_++'
+      else:
+        arg = '++n%s_'
+
+    if expect_failure:
+      successful_or_failed = 'failed'
+      expected_or_not = 'expected.'
+      test_name +=  'Failure'
+    else:
+      successful_or_failed = 'successful'
+      expected_or_not = 'UNEXPECTED!'
+      test_name +=  'Success'
+
+    # A map that defines the values used in the test template.
+    defs = DEFS.copy()
+    defs.update({
+      'assert' : assrt,
+      'assertion' : assertion,
+      'test_name' : test_name,
+      'pf_type' : pred_format_type,
+      'pf' : pred_format,
+      'arg_type' : arg_type,
+      'arg' : arg,
+      'successful' : successful_or_failed,
+      'expected' : expected_or_not,
+      })
+
+    test = """
+// Tests a %(successful)s %(assertion)s where the
+// predicate-formatter is a %(pf_type)s on a %(arg_type)s.
+TEST_F(%(assertion)sTest, %(test_name)s) {""" % defs
+
+    indent = (len(assertion) + 3)*' '
+    extra_indent = ''
+
+    if expect_failure:
+      extra_indent = '  '
+      if use_assert:
+        test += """
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT"""
+      else:
+        test += """
+  EXPECT_NONFATAL_FAILURE({  // NOLINT"""
+
+    test += '\n' + extra_indent + """  %(assertion)s(%(pf)s""" % defs
+
+    test = test % defs
+    test += Iter(n, ',\n' + indent + extra_indent + '%(arg)s' % defs)
+    test += ');\n' + extra_indent + '  finished_ = true;\n'
+
+    if expect_failure:
+      test += '  }, "");\n'
+
+    test += '}\n'
+    return test
+
+  # Generates tests for all 2**6 = 64 combinations.
+  tests += ''.join([GenTest(use_format, use_assert, expect_failure,
+                            use_functor, use_user_type)
+                    for use_format in [0, 1]
+                    for use_assert in [0, 1]
+                    for expect_failure in [0, 1]
+                    for use_functor in [0, 1]
+                    for use_user_type in [0, 1]
+                    ])
+
+  return tests
+
+
+def UnitTestPostamble():
+  """Returns the postamble for the tests."""
+
+  return ''
+
+
+def GenerateUnitTest(n):
+  """Returns the tests for up-to n-ary predicate assertions."""
+
+  GenerateFile(UNIT_TEST,
+               UnitTestPreamble()
+               + ''.join([TestsForArity(i) for i in OneTo(n)])
+               + UnitTestPostamble())
+
+
+def _Main():
+  """The entry point of the script.  Generates the header file and its
+  unit test."""
+
+  if len(sys.argv) != 2:
+    print __doc__
+    print 'Author: ' + __author__
+    sys.exit(1)
+
+  n = int(sys.argv[1])
+  GenerateHeader(n)
+  GenerateUnitTest(n)
+
+
+if __name__ == '__main__':
+  _Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/gtest-config.in b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/gtest-config.in
new file mode 100755
index 0000000000..780f8432ef
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/gtest-config.in
@@ -0,0 +1,274 @@
+#!/bin/sh
+
+# These variables are automatically filled in by the configure script.
+name="@PACKAGE_TARNAME@"
+version="@PACKAGE_VERSION@"
+
+show_usage()
+{
+  echo "Usage: gtest-config [OPTIONS...]"
+}
+
+show_help()
+{
+  show_usage
+  cat <<\EOF
+
+The `gtest-config' script provides access to the necessary compile and linking
+flags to connect with Google C++ Testing Framework, both in a build prior to
+installation, and on the system proper after installation. The installation
+overrides may be issued in combination with any other queries, but will only
+affect installation queries if called on a built but not installed gtest. The
+installation queries may not be issued with any other types of queries, and
+only one installation query may be made at a time. The version queries and
+compiler flag queries may be combined as desired but not mixed. Different
+version queries are always combined with logical "and" semantics, and only the
+last of any particular query is used while all previous ones ignored. All
+versions must be specified as a sequence of numbers separated by periods.
+Compiler flag queries output the union of the sets of flags when combined.
+
+ Examples:
+  gtest-config --min-version=1.0 || echo "Insufficient Google Test version."
+
+  g++ $(gtest-config --cppflags --cxxflags) -o foo.o -c foo.cpp
+  g++ $(gtest-config --ldflags --libs) -o foo foo.o
+
+  # When using a built but not installed Google Test:
+  g++ $(../../my_gtest_build/scripts/gtest-config ...) ...
+
+  # When using an installed Google Test, but with installation overrides:
+  export GTEST_PREFIX="/opt"
+  g++ $(gtest-config --libdir="/opt/lib64" ...) ...
+
+ Help:
+  --usage                    brief usage information
+  --help                     display this help message
+
+ Installation Overrides:
+  --prefix=<dir>             overrides the installation prefix
+  --exec-prefix=<dir>        overrides the executable installation prefix
+  --libdir=<dir>             overrides the library installation prefix
+  --includedir=<dir>         overrides the header file installation prefix
+
+ Installation Queries:
+  --prefix                   installation prefix
+  --exec-prefix              executable installation prefix
+  --libdir                   library installation directory
+  --includedir               header file installation directory
+  --version                  the version of the Google Test installation
+
+ Version Queries:
+  --min-version=VERSION      return 0 if the version is at least VERSION
+  --exact-version=VERSION    return 0 if the version is exactly VERSION
+  --max-version=VERSION      return 0 if the version is at most VERSION
+
+ Compilation Flag Queries:
+  --cppflags                 compile flags specific to the C-like preprocessors
+  --cxxflags                 compile flags appropriate for C++ programs
+  --ldflags                  linker flags
+  --libs                     libraries for linking
+
+EOF
+}
+
+# This function bounds our version with a min and a max. It uses some clever
+# POSIX-compliant variable expansion to portably do all the work in the shell
+# and avoid any dependency on a particular "sed" or "awk" implementation.
+# Notable is that it will only ever compare the first 3 components of versions.
+# Further components will be cleanly stripped off. All versions must be
+# unadorned, so "v1.0" will *not* work. The minimum version must be in $1, and
+# the max in $2. TODO(chandlerc@google.com): If this ever breaks, we should
+# investigate expanding this via autom4te from AS_VERSION_COMPARE rather than
+# continuing to maintain our own shell version.
+check_versions()
+{
+  major_version=${version%%.*}
+  minor_version="0"
+  point_version="0"
+  if test "${version#*.}" != "${version}"; then
+    minor_version=${version#*.}
+    minor_version=${minor_version%%.*}
+  fi
+  if test "${version#*.*.}" != "${version}"; then
+    point_version=${version#*.*.}
+    point_version=${point_version%%.*}
+  fi
+
+  min_version="$1"
+  min_major_version=${min_version%%.*}
+  min_minor_version="0"
+  min_point_version="0"
+  if test "${min_version#*.}" != "${min_version}"; then
+    min_minor_version=${min_version#*.}
+    min_minor_version=${min_minor_version%%.*}
+  fi
+  if test "${min_version#*.*.}" != "${min_version}"; then
+    min_point_version=${min_version#*.*.}
+    min_point_version=${min_point_version%%.*}
+  fi
+
+  max_version="$2"
+  max_major_version=${max_version%%.*}
+  max_minor_version="0"
+  max_point_version="0"
+  if test "${max_version#*.}" != "${max_version}"; then
+    max_minor_version=${max_version#*.}
+    max_minor_version=${max_minor_version%%.*}
+  fi
+  if test "${max_version#*.*.}" != "${max_version}"; then
+    max_point_version=${max_version#*.*.}
+    max_point_version=${max_point_version%%.*}
+  fi
+
+  test $(($major_version)) -lt $(($min_major_version)) && exit 1
+  if test $(($major_version)) -eq $(($min_major_version)); then
+    test $(($minor_version)) -lt $(($min_minor_version)) && exit 1
+    if test $(($minor_version)) -eq $(($min_minor_version)); then
+      test $(($point_version)) -lt $(($min_point_version)) && exit 1
+    fi
+  fi
+
+  test $(($major_version)) -gt $(($max_major_version)) && exit 1
+  if test $(($major_version)) -eq $(($max_major_version)); then
+    test $(($minor_version)) -gt $(($max_minor_version)) && exit 1
+    if test $(($minor_version)) -eq $(($max_minor_version)); then
+      test $(($point_version)) -gt $(($max_point_version)) && exit 1
+    fi
+  fi
+
+  exit 0
+}
+
+# Show the usage line when no arguments are specified.
+if test $# -eq 0; then
+  show_usage
+  exit 1
+fi
+
+while test $# -gt 0; do
+  case $1 in
+    --usage)          show_usage;         exit 0;;
+    --help)           show_help;          exit 0;;
+
+    # Installation overrides
+    --prefix=*)       GTEST_PREFIX=${1#--prefix=};;
+    --exec-prefix=*)  GTEST_EXEC_PREFIX=${1#--exec-prefix=};;
+    --libdir=*)       GTEST_LIBDIR=${1#--libdir=};;
+    --includedir=*)   GTEST_INCLUDEDIR=${1#--includedir=};;
+
+    # Installation queries
+    --prefix|--exec-prefix|--libdir|--includedir|--version)
+      if test -n "${do_query}"; then
+        show_usage
+        exit 1
+      fi
+      do_query=${1#--}
+      ;;
+
+    # Version checking
+    --min-version=*)
+      do_check_versions=yes
+      min_version=${1#--min-version=}
+      ;;
+    --max-version=*)
+      do_check_versions=yes
+      max_version=${1#--max-version=}
+      ;;
+    --exact-version=*)
+      do_check_versions=yes
+      exact_version=${1#--exact-version=}
+      ;;
+
+    # Compiler flag output
+    --cppflags)       echo_cppflags=yes;;
+    --cxxflags)       echo_cxxflags=yes;;
+    --ldflags)        echo_ldflags=yes;;
+    --libs)           echo_libs=yes;;
+
+    # Everything else is an error
+    *)                show_usage;         exit 1;;
+  esac
+  shift
+done
+
+# These have defaults filled in by the configure script but can also be
+# overridden by environment variables or command line parameters.
+prefix="${GTEST_PREFIX:-@prefix@}"
+exec_prefix="${GTEST_EXEC_PREFIX:-@exec_prefix@}"
+libdir="${GTEST_LIBDIR:-@libdir@}"
+includedir="${GTEST_INCLUDEDIR:-@includedir@}"
+
+# We try and detect if our binary is not located at its installed location. If
+# it's not, we provide variables pointing to the source and build tree rather
+# than to the install tree. This allows building against a just-built gtest
+# rather than an installed gtest.
+bindir="@bindir@"
+this_relative_bindir=`dirname $0`
+this_bindir=`cd ${this_relative_bindir}; pwd -P`
+if test "${this_bindir}" = "${this_bindir%${bindir}}"; then
+  # The path to the script doesn't end in the bindir sequence from Autoconf,
+  # assume that we are in a build tree.
+  build_dir=`dirname ${this_bindir}`
+  src_dir=`cd ${this_bindir}; cd @top_srcdir@; pwd -P`
+
+  # TODO(chandlerc@google.com): This is a dangerous dependency on libtool, we
+  # should work to remove it, and/or remove libtool altogether, replacing it
+  # with direct references to the library and a link path.
+  gtest_libs="${build_dir}/lib/libgtest.la @PTHREAD_CFLAGS@ @PTHREAD_LIBS@"
+  gtest_ldflags=""
+
+  # We provide hooks to include from either the source or build dir, where the
+  # build dir is always preferred. This will potentially allow us to write
+  # build rules for generated headers and have them automatically be preferred
+  # over provided versions.
+  gtest_cppflags="-I${build_dir}/include -I${src_dir}/include"
+  gtest_cxxflags="@PTHREAD_CFLAGS@"
+else
+  # We're using an installed gtest, although it may be staged under some
+  # prefix. Assume (as our own libraries do) that we can resolve the prefix,
+  # and are present in the dynamic link paths.
+  gtest_ldflags="-L${libdir}"
+  gtest_libs="-l${name} @PTHREAD_CFLAGS@ @PTHREAD_LIBS@"
+  gtest_cppflags="-I${includedir}"
+  gtest_cxxflags="@PTHREAD_CFLAGS@"
+fi
+
+# Do an installation query if requested.
+if test -n "$do_query"; then
+  case $do_query in
+    prefix)           echo $prefix;       exit 0;;
+    exec-prefix)      echo $exec_prefix;  exit 0;;
+    libdir)           echo $libdir;       exit 0;;
+    includedir)       echo $includedir;   exit 0;;
+    version)          echo $version;      exit 0;;
+    *)                show_usage;         exit 1;;
+  esac
+fi
+
+# Do a version check if requested.
+if test "$do_check_versions" = "yes"; then
+  # Make sure we didn't receive a bad combination of parameters.
+  test "$echo_cppflags" = "yes" && show_usage && exit 1
+  test "$echo_cxxflags" = "yes" && show_usage && exit 1
+  test "$echo_ldflags" = "yes"  && show_usage && exit 1
+  test "$echo_libs" = "yes"     && show_usage && exit 1
+
+  if test "$exact_version" != ""; then
+    check_versions $exact_version $exact_version
+    # unreachable
+  else
+    check_versions ${min_version:-0.0.0} ${max_version:-9999.9999.9999}
+    # unreachable
+  fi
+fi
+
+# Do the output in the correct order so that these can be used in-line of
+# a compiler invocation.
+output=""
+test "$echo_cppflags" = "yes" && output="$output $gtest_cppflags"
+test "$echo_cxxflags" = "yes" && output="$output $gtest_cxxflags"
+test "$echo_ldflags" = "yes"  && output="$output $gtest_ldflags"
+test "$echo_libs" = "yes"     && output="$output $gtest_libs"
+echo $output
+
+exit 0
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/pump.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/pump.py
new file mode 100755
index 0000000000..5efb653c20
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/pump.py
@@ -0,0 +1,855 @@
+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""pump v0.2.0 - Pretty Useful for Meta Programming.
+
+A tool for preprocessor meta programming.  Useful for generating
+repetitive boilerplate code.  Especially useful for writing C++
+classes, functions, macros, and templates that need to work with
+various number of arguments.
+
+USAGE:
+       pump.py SOURCE_FILE
+
+EXAMPLES:
+       pump.py foo.cc.pump
+         Converts foo.cc.pump to foo.cc.
+
+GRAMMAR:
+       CODE ::= ATOMIC_CODE*
+       ATOMIC_CODE ::= $var ID = EXPRESSION
+           | $var ID = [[ CODE ]]
+           | $range ID EXPRESSION..EXPRESSION
+           | $for ID SEPARATOR [[ CODE ]]
+           | $($)
+           | $ID
+           | $(EXPRESSION)
+           | $if EXPRESSION [[ CODE ]] ELSE_BRANCH
+           | [[ CODE ]]
+           | RAW_CODE
+       SEPARATOR ::= RAW_CODE | EMPTY
+       ELSE_BRANCH ::= $else [[ CODE ]]
+           | $elif EXPRESSION [[ CODE ]] ELSE_BRANCH
+           | EMPTY
+       EXPRESSION has Python syntax.
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import re
+import sys
+
+
+TOKEN_TABLE = [
+    (re.compile(r'\$var\s+'), '$var'),
+    (re.compile(r'\$elif\s+'), '$elif'),
+    (re.compile(r'\$else\s+'), '$else'),
+    (re.compile(r'\$for\s+'), '$for'),
+    (re.compile(r'\$if\s+'), '$if'),
+    (re.compile(r'\$range\s+'), '$range'),
+    (re.compile(r'\$[_A-Za-z]\w*'), '$id'),
+    (re.compile(r'\$\(\$\)'), '$($)'),
+    (re.compile(r'\$'), '$'),
+    (re.compile(r'\[\[\n?'), '[['),
+    (re.compile(r'\]\]\n?'), ']]'),
+    ]
+
+
+class Cursor:
+  """Represents a position (line and column) in a text file."""
+
+  def __init__(self, line=-1, column=-1):
+    self.line = line
+    self.column = column
+
+  def __eq__(self, rhs):
+    return self.line == rhs.line and self.column == rhs.column
+
+  def __ne__(self, rhs):
+    return not self == rhs
+
+  def __lt__(self, rhs):
+    return self.line < rhs.line or (
+        self.line == rhs.line and self.column < rhs.column)
+
+  def __le__(self, rhs):
+    return self < rhs or self == rhs
+
+  def __gt__(self, rhs):
+    return rhs < self
+
+  def __ge__(self, rhs):
+    return rhs <= self
+
+  def __str__(self):
+    if self == Eof():
+      return 'EOF'
+    else:
+      return '%s(%s)' % (self.line + 1, self.column)
+
+  def __add__(self, offset):
+    return Cursor(self.line, self.column + offset)
+
+  def __sub__(self, offset):
+    return Cursor(self.line, self.column - offset)
+
+  def Clone(self):
+    """Returns a copy of self."""
+
+    return Cursor(self.line, self.column)
+
+
+# Special cursor to indicate the end-of-file.
+def Eof():
+  """Returns the special cursor to denote the end-of-file."""
+  return Cursor(-1, -1)
+
+
+class Token:
+  """Represents a token in a Pump source file."""
+
+  def __init__(self, start=None, end=None, value=None, token_type=None):
+    if start is None:
+      self.start = Eof()
+    else:
+      self.start = start
+    if end is None:
+      self.end = Eof()
+    else:
+      self.end = end
+    self.value = value
+    self.token_type = token_type
+
+  def __str__(self):
+    return 'Token @%s: \'%s\' type=%s' % (
+        self.start, self.value, self.token_type)
+
+  def Clone(self):
+    """Returns a copy of self."""
+
+    return Token(self.start.Clone(), self.end.Clone(), self.value,
+                 self.token_type)
+
+
+def StartsWith(lines, pos, string):
+  """Returns True iff the given position in lines starts with 'string'."""
+
+  return lines[pos.line][pos.column:].startswith(string)
+
+
+def FindFirstInLine(line, token_table):
+  best_match_start = -1
+  for (regex, token_type) in token_table:
+    m = regex.search(line)
+    if m:
+      # We found regex in lines
+      if best_match_start < 0 or m.start() < best_match_start:
+        best_match_start = m.start()
+        best_match_length = m.end() - m.start()
+        best_match_token_type = token_type
+
+  if best_match_start < 0:
+    return None
+
+  return (best_match_start, best_match_length, best_match_token_type)
+
+
+def FindFirst(lines, token_table, cursor):
+  """Finds the first occurrence of any string in strings in lines."""
+
+  start = cursor.Clone()
+  cur_line_number = cursor.line
+  for line in lines[start.line:]:
+    if cur_line_number == start.line:
+      line = line[start.column:]
+    m = FindFirstInLine(line, token_table)
+    if m:
+      # We found a regex in line.
+      (start_column, length, token_type) = m
+      if cur_line_number == start.line:
+        start_column += start.column
+      found_start = Cursor(cur_line_number, start_column)
+      found_end = found_start + length
+      return MakeToken(lines, found_start, found_end, token_type)
+    cur_line_number += 1
+  # We failed to find str in lines
+  return None
+
+
+def SubString(lines, start, end):
+  """Returns a substring in lines."""
+
+  if end == Eof():
+    end = Cursor(len(lines) - 1, len(lines[-1]))
+
+  if start >= end:
+    return ''
+
+  if start.line == end.line:
+    return lines[start.line][start.column:end.column]
+
+  result_lines = ([lines[start.line][start.column:]] +
+                  lines[start.line + 1:end.line] +
+                  [lines[end.line][:end.column]])
+  return ''.join(result_lines)
+
+
+def StripMetaComments(str):
+  """Strip meta comments from each line in the given string."""
+
+  # First, completely remove lines containing nothing but a meta
+  # comment, including the trailing \n.
+  str = re.sub(r'^\s*\$\$.*\n', '', str)
+
+  # Then, remove meta comments from contentful lines.
+  return re.sub(r'\s*\$\$.*', '', str)
+
+
+def MakeToken(lines, start, end, token_type):
+  """Creates a new instance of Token."""
+
+  return Token(start, end, SubString(lines, start, end), token_type)
+
+
+def ParseToken(lines, pos, regex, token_type):
+  line = lines[pos.line][pos.column:]
+  m = regex.search(line)
+  if m and not m.start():
+    return MakeToken(lines, pos, pos + m.end(), token_type)
+  else:
+    print 'ERROR: %s expected at %s.' % (token_type, pos)
+    sys.exit(1)
+
+
+ID_REGEX = re.compile(r'[_A-Za-z]\w*')
+EQ_REGEX = re.compile(r'=')
+REST_OF_LINE_REGEX = re.compile(r'.*?(?=$|\$\$)')
+OPTIONAL_WHITE_SPACES_REGEX = re.compile(r'\s*')
+WHITE_SPACE_REGEX = re.compile(r'\s')
+DOT_DOT_REGEX = re.compile(r'\.\.')
+
+
+def Skip(lines, pos, regex):
+  line = lines[pos.line][pos.column:]
+  m = re.search(regex, line)
+  if m and not m.start():
+    return pos + m.end()
+  else:
+    return pos
+
+
+def SkipUntil(lines, pos, regex, token_type):
+  line = lines[pos.line][pos.column:]
+  m = re.search(regex, line)
+  if m:
+    return pos + m.start()
+  else:
+    print ('ERROR: %s expected on line %s after column %s.' %
+           (token_type, pos.line + 1, pos.column))
+    sys.exit(1)
+
+
+def ParseExpTokenInParens(lines, pos):
+  def ParseInParens(pos):
+    pos = Skip(lines, pos, OPTIONAL_WHITE_SPACES_REGEX)
+    pos = Skip(lines, pos, r'\(')
+    pos = Parse(pos)
+    pos = Skip(lines, pos, r'\)')
+    return pos
+
+  def Parse(pos):
+    pos = SkipUntil(lines, pos, r'\(|\)', ')')
+    if SubString(lines, pos, pos + 1) == '(':
+      pos = Parse(pos + 1)
+      pos = Skip(lines, pos, r'\)')
+      return Parse(pos)
+    else:
+      return pos
+
+  start = pos.Clone()
+  pos = ParseInParens(pos)
+  return MakeToken(lines, start, pos, 'exp')
+
+
+def RStripNewLineFromToken(token):
+  if token.value.endswith('\n'):
+    return Token(token.start, token.end, token.value[:-1], token.token_type)
+  else:
+    return token
+
+
+def TokenizeLines(lines, pos):
+  while True:
+    found = FindFirst(lines, TOKEN_TABLE, pos)
+    if not found:
+      yield MakeToken(lines, pos, Eof(), 'code')
+      return
+
+    if found.start == pos:
+      prev_token = None
+      prev_token_rstripped = None
+    else:
+      prev_token = MakeToken(lines, pos, found.start, 'code')
+      prev_token_rstripped = RStripNewLineFromToken(prev_token)
+
+    if found.token_type == '$var':
+      if prev_token_rstripped:
+        yield prev_token_rstripped
+      yield found
+      id_token = ParseToken(lines, found.end, ID_REGEX, 'id')
+      yield id_token
+      pos = Skip(lines, id_token.end, OPTIONAL_WHITE_SPACES_REGEX)
+
+      eq_token = ParseToken(lines, pos, EQ_REGEX, '=')
+      yield eq_token
+      pos = Skip(lines, eq_token.end, r'\s*')
+
+      if SubString(lines, pos, pos + 2) != '[[':
+        exp_token = ParseToken(lines, pos, REST_OF_LINE_REGEX, 'exp')
+        yield exp_token
+        pos = Cursor(exp_token.end.line + 1, 0)
+    elif found.token_type == '$for':
+      if prev_token_rstripped:
+        yield prev_token_rstripped
+      yield found
+      id_token = ParseToken(lines, found.end, ID_REGEX, 'id')
+      yield id_token
+      pos = Skip(lines, id_token.end, WHITE_SPACE_REGEX)
+    elif found.token_type == '$range':
+      if prev_token_rstripped:
+        yield prev_token_rstripped
+      yield found
+      id_token = ParseToken(lines, found.end, ID_REGEX, 'id')
+      yield id_token
+      pos = Skip(lines, id_token.end, OPTIONAL_WHITE_SPACES_REGEX)
+
+      dots_pos = SkipUntil(lines, pos, DOT_DOT_REGEX, '..')
+      yield MakeToken(lines, pos, dots_pos, 'exp')
+      yield MakeToken(lines, dots_pos, dots_pos + 2, '..')
+      pos = dots_pos + 2
+      new_pos = Cursor(pos.line + 1, 0)
+      yield MakeToken(lines, pos, new_pos, 'exp')
+      pos = new_pos
+    elif found.token_type == '$':
+      if prev_token:
+        yield prev_token
+      yield found
+      exp_token = ParseExpTokenInParens(lines, found.end)
+      yield exp_token
+      pos = exp_token.end
+    elif (found.token_type == ']]' or found.token_type == '$if' or
+          found.token_type == '$elif' or found.token_type == '$else'):
+      if prev_token_rstripped:
+        yield prev_token_rstripped
+      yield found
+      pos = found.end
+    else:
+      if prev_token:
+        yield prev_token
+      yield found
+      pos = found.end
+
+
+def Tokenize(s):
+  """A generator that yields the tokens in the given string."""
+  if s != '':
+    lines = s.splitlines(True)
+    for token in TokenizeLines(lines, Cursor(0, 0)):
+      yield token
+
+
+class CodeNode:
+  def __init__(self, atomic_code_list=None):
+    self.atomic_code = atomic_code_list
+
+
+class VarNode:
+  def __init__(self, identifier=None, atomic_code=None):
+    self.identifier = identifier
+    self.atomic_code = atomic_code
+
+
+class RangeNode:
+  def __init__(self, identifier=None, exp1=None, exp2=None):
+    self.identifier = identifier
+    self.exp1 = exp1
+    self.exp2 = exp2
+
+
+class ForNode:
+  def __init__(self, identifier=None, sep=None, code=None):
+    self.identifier = identifier
+    self.sep = sep
+    self.code = code
+
+
+class ElseNode:
+  def __init__(self, else_branch=None):
+    self.else_branch = else_branch
+
+
+class IfNode:
+  def __init__(self, exp=None, then_branch=None, else_branch=None):
+    self.exp = exp
+    self.then_branch = then_branch
+    self.else_branch = else_branch
+
+
+class RawCodeNode:
+  def __init__(self, token=None):
+    self.raw_code = token
+
+
+class LiteralDollarNode:
+  def __init__(self, token):
+    self.token = token
+
+
+class ExpNode:
+  def __init__(self, token, python_exp):
+    self.token = token
+    self.python_exp = python_exp
+
+
+def PopFront(a_list):
+  head = a_list[0]
+  a_list[:1] = []
+  return head
+
+
+def PushFront(a_list, elem):
+  a_list[:0] = [elem]
+
+
+def PopToken(a_list, token_type=None):
+  token = PopFront(a_list)
+  if token_type is not None and token.token_type != token_type:
+    print 'ERROR: %s expected at %s' % (token_type, token.start)
+    print 'ERROR: %s found instead' % (token,)
+    sys.exit(1)
+
+  return token
+
+
+def PeekToken(a_list):
+  if not a_list:
+    return None
+
+  return a_list[0]
+
+
+def ParseExpNode(token):
+  python_exp = re.sub(r'([_A-Za-z]\w*)', r'self.GetValue("\1")', token.value)
+  return ExpNode(token, python_exp)
+
+
+def ParseElseNode(tokens):
+  def Pop(token_type=None):
+    return PopToken(tokens, token_type)
+
+  next = PeekToken(tokens)
+  if not next:
+    return None
+  if next.token_type == '$else':
+    Pop('$else')
+    Pop('[[')
+    code_node = ParseCodeNode(tokens)
+    Pop(']]')
+    return code_node
+  elif next.token_type == '$elif':
+    Pop('$elif')
+    exp = Pop('code')
+    Pop('[[')
+    code_node = ParseCodeNode(tokens)
+    Pop(']]')
+    inner_else_node = ParseElseNode(tokens)
+    return CodeNode([IfNode(ParseExpNode(exp), code_node, inner_else_node)])
+  elif not next.value.strip():
+    Pop('code')
+    return ParseElseNode(tokens)
+  else:
+    return None
+
+
+def ParseAtomicCodeNode(tokens):
+  def Pop(token_type=None):
+    return PopToken(tokens, token_type)
+
+  head = PopFront(tokens)
+  t = head.token_type
+  if t == 'code':
+    return RawCodeNode(head)
+  elif t == '$var':
+    id_token = Pop('id')
+    Pop('=')
+    next = PeekToken(tokens)
+    if next.token_type == 'exp':
+      exp_token = Pop()
+      return VarNode(id_token, ParseExpNode(exp_token))
+    Pop('[[')
+    code_node = ParseCodeNode(tokens)
+    Pop(']]')
+    return VarNode(id_token, code_node)
+  elif t == '$for':
+    id_token = Pop('id')
+    next_token = PeekToken(tokens)
+    if next_token.token_type == 'code':
+      sep_token = next_token
+      Pop('code')
+    else:
+      sep_token = None
+    Pop('[[')
+    code_node = ParseCodeNode(tokens)
+    Pop(']]')
+    return ForNode(id_token, sep_token, code_node)
+  elif t == '$if':
+    exp_token = Pop('code')
+    Pop('[[')
+    code_node = ParseCodeNode(tokens)
+    Pop(']]')
+    else_node = ParseElseNode(tokens)
+    return IfNode(ParseExpNode(exp_token), code_node, else_node)
+  elif t == '$range':
+    id_token = Pop('id')
+    exp1_token = Pop('exp')
+    Pop('..')
+    exp2_token = Pop('exp')
+    return RangeNode(id_token, ParseExpNode(exp1_token),
+                     ParseExpNode(exp2_token))
+  elif t == '$id':
+    return ParseExpNode(Token(head.start + 1, head.end, head.value[1:], 'id'))
+  elif t == '$($)':
+    return LiteralDollarNode(head)
+  elif t == '$':
+    exp_token = Pop('exp')
+    return ParseExpNode(exp_token)
+  elif t == '[[':
+    code_node = ParseCodeNode(tokens)
+    Pop(']]')
+    return code_node
+  else:
+    PushFront(tokens, head)
+    return None
+
+
+def ParseCodeNode(tokens):
+  atomic_code_list = []
+  while True:
+    if not tokens:
+      break
+    atomic_code_node = ParseAtomicCodeNode(tokens)
+    if atomic_code_node:
+      atomic_code_list.append(atomic_code_node)
+    else:
+      break
+  return CodeNode(atomic_code_list)
+
+
+def ParseToAST(pump_src_text):
+  """Convert the given Pump source text into an AST."""
+  tokens = list(Tokenize(pump_src_text))
+  code_node = ParseCodeNode(tokens)
+  return code_node
+
+
+class Env:
+  def __init__(self):
+    self.variables = []
+    self.ranges = []
+
+  def Clone(self):
+    clone = Env()
+    clone.variables = self.variables[:]
+    clone.ranges = self.ranges[:]
+    return clone
+
+  def PushVariable(self, var, value):
+    # If value looks like an int, store it as an int.
+    try:
+      int_value = int(value)
+      if ('%s' % int_value) == value:
+        value = int_value
+    except Exception:
+      pass
+    self.variables[:0] = [(var, value)]
+
+  def PopVariable(self):
+    self.variables[:1] = []
+
+  def PushRange(self, var, lower, upper):
+    self.ranges[:0] = [(var, lower, upper)]
+
+  def PopRange(self):
+    self.ranges[:1] = []
+
+  def GetValue(self, identifier):
+    for (var, value) in self.variables:
+      if identifier == var:
+        return value
+
+    print 'ERROR: meta variable %s is undefined.' % (identifier,)
+    sys.exit(1)
+
+  def EvalExp(self, exp):
+    try:
+      result = eval(exp.python_exp)
+    except Exception, e:
+      print 'ERROR: caught exception %s: %s' % (e.__class__.__name__, e)
+      print ('ERROR: failed to evaluate meta expression %s at %s' %
+             (exp.python_exp, exp.token.start))
+      sys.exit(1)
+    return result
+
+  def GetRange(self, identifier):
+    for (var, lower, upper) in self.ranges:
+      if identifier == var:
+        return (lower, upper)
+
+    print 'ERROR: range %s is undefined.' % (identifier,)
+    sys.exit(1)
+
+
+class Output:
+  def __init__(self):
+    self.string = ''
+
+  def GetLastLine(self):
+    index = self.string.rfind('\n')
+    if index < 0:
+      return ''
+
+    return self.string[index + 1:]
+
+  def Append(self, s):
+    self.string += s
+
+
+def RunAtomicCode(env, node, output):
+  if isinstance(node, VarNode):
+    identifier = node.identifier.value.strip()
+    result = Output()
+    RunAtomicCode(env.Clone(), node.atomic_code, result)
+    value = result.string
+    env.PushVariable(identifier, value)
+  elif isinstance(node, RangeNode):
+    identifier = node.identifier.value.strip()
+    lower = int(env.EvalExp(node.exp1))
+    upper = int(env.EvalExp(node.exp2))
+    env.PushRange(identifier, lower, upper)
+  elif isinstance(node, ForNode):
+    identifier = node.identifier.value.strip()
+    if node.sep is None:
+      sep = ''
+    else:
+      sep = node.sep.value
+    (lower, upper) = env.GetRange(identifier)
+    for i in range(lower, upper + 1):
+      new_env = env.Clone()
+      new_env.PushVariable(identifier, i)
+      RunCode(new_env, node.code, output)
+      if i != upper:
+        output.Append(sep)
+  elif isinstance(node, RawCodeNode):
+    output.Append(node.raw_code.value)
+  elif isinstance(node, IfNode):
+    cond = env.EvalExp(node.exp)
+    if cond:
+      RunCode(env.Clone(), node.then_branch, output)
+    elif node.else_branch is not None:
+      RunCode(env.Clone(), node.else_branch, output)
+  elif isinstance(node, ExpNode):
+    value = env.EvalExp(node)
+    output.Append('%s' % (value,))
+  elif isinstance(node, LiteralDollarNode):
+    output.Append('$')
+  elif isinstance(node, CodeNode):
+    RunCode(env.Clone(), node, output)
+  else:
+    print 'BAD'
+    print node
+    sys.exit(1)
+
+
+def RunCode(env, code_node, output):
+  for atomic_code in code_node.atomic_code:
+    RunAtomicCode(env, atomic_code, output)
+
+
+def IsSingleLineComment(cur_line):
+  return '//' in cur_line
+
+
+def IsInPreprocessorDirective(prev_lines, cur_line):
+  if cur_line.lstrip().startswith('#'):
+    return True
+  return prev_lines and prev_lines[-1].endswith('\\')
+
+
+def WrapComment(line, output):
+  loc = line.find('//')
+  before_comment = line[:loc].rstrip()
+  if before_comment == '':
+    indent = loc
+  else:
+    output.append(before_comment)
+    indent = len(before_comment) - len(before_comment.lstrip())
+  prefix = indent*' ' + '// '
+  max_len = 80 - len(prefix)
+  comment = line[loc + 2:].strip()
+  segs = [seg for seg in re.split(r'(\w+\W*)', comment) if seg != '']
+  cur_line = ''
+  for seg in segs:
+    if len((cur_line + seg).rstrip()) < max_len:
+      cur_line += seg
+    else:
+      if cur_line.strip() != '':
+        output.append(prefix + cur_line.rstrip())
+      cur_line = seg.lstrip()
+  if cur_line.strip() != '':
+    output.append(prefix + cur_line.strip())
+
+
+def WrapCode(line, line_concat, output):
+  indent = len(line) - len(line.lstrip())
+  prefix = indent*' '  # Prefix of the current line
+  max_len = 80 - indent - len(line_concat)  # Maximum length of the current line
+  new_prefix = prefix + 4*' '  # Prefix of a continuation line
+  new_max_len = max_len - 4  # Maximum length of a continuation line
+  # Prefers to wrap a line after a ',' or ';'.
+  segs = [seg for seg in re.split(r'([^,;]+[,;]?)', line.strip()) if seg != '']
+  cur_line = ''  # The current line without leading spaces.
+  for seg in segs:
+    # If the line is still too long, wrap at a space.
+    while cur_line == '' and len(seg.strip()) > max_len:
+      seg = seg.lstrip()
+      split_at = seg.rfind(' ', 0, max_len)
+      output.append(prefix + seg[:split_at].strip() + line_concat)
+      seg = seg[split_at + 1:]
+      prefix = new_prefix
+      max_len = new_max_len
+
+    if len((cur_line + seg).rstrip()) < max_len:
+      cur_line = (cur_line + seg).lstrip()
+    else:
+      output.append(prefix + cur_line.rstrip() + line_concat)
+      prefix = new_prefix
+      max_len = new_max_len
+      cur_line = seg.lstrip()
+  if cur_line.strip() != '':
+    output.append(prefix + cur_line.strip())
+
+
+def WrapPreprocessorDirective(line, output):
+  WrapCode(line, ' \\', output)
+
+
+def WrapPlainCode(line, output):
+  WrapCode(line, '', output)
+
+
+def IsMultiLineIWYUPragma(line):
+  return re.search(r'/\* IWYU pragma: ', line)
+
+
+def IsHeaderGuardIncludeOrOneLineIWYUPragma(line):
+  return (re.match(r'^#(ifndef|define|endif\s*//)\s*[\w_]+\s*$', line) or
+          re.match(r'^#include\s', line) or
+          # Don't break IWYU pragmas, either; that causes iwyu.py problems.
+          re.search(r'// IWYU pragma: ', line))
+
+
+def WrapLongLine(line, output):
+  line = line.rstrip()
+  if len(line) <= 80:
+    output.append(line)
+  elif IsSingleLineComment(line):
+    if IsHeaderGuardIncludeOrOneLineIWYUPragma(line):
+      # The style guide made an exception to allow long header guard lines,
+      # includes and IWYU pragmas.
+      output.append(line)
+    else:
+      WrapComment(line, output)
+  elif IsInPreprocessorDirective(output, line):
+    if IsHeaderGuardIncludeOrOneLineIWYUPragma(line):
+      # The style guide made an exception to allow long header guard lines,
+      # includes and IWYU pragmas.
+      output.append(line)
+    else:
+      WrapPreprocessorDirective(line, output)
+  elif IsMultiLineIWYUPragma(line):
+    output.append(line)
+  else:
+    WrapPlainCode(line, output)
+
+
+def BeautifyCode(string):
+  lines = string.splitlines()
+  output = []
+  for line in lines:
+    WrapLongLine(line, output)
+  output2 = [line.rstrip() for line in output]
+  return '\n'.join(output2) + '\n'
+
+
+def ConvertFromPumpSource(src_text):
+  """Return the text generated from the given Pump source text."""
+  ast = ParseToAST(StripMetaComments(src_text))
+  output = Output()
+  RunCode(Env(), ast, output)
+  return BeautifyCode(output.string)
+
+
+def main(argv):
+  if len(argv) == 1:
+    print __doc__
+    sys.exit(1)
+
+  file_path = argv[-1]
+  output_str = ConvertFromPumpSource(file(file_path, 'r').read())
+  if file_path.endswith('.pump'):
+    output_file_path = file_path[:-5]
+  else:
+    output_file_path = '-'
+  if output_file_path == '-':
+    print output_str,
+  else:
+    output_file = file(output_file_path, 'w')
+    output_file.write('// This file was GENERATED by command:\n')
+    output_file.write('//     %s %s\n' %
+                      (os.path.basename(__file__), os.path.basename(file_path)))
+    output_file.write('// DO NOT EDIT BY HAND!!!\n\n')
+    output_file.write(output_str)
+    output_file.close()
+
+
+if __name__ == '__main__':
+  main(sys.argv)
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/release_docs.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/release_docs.py
new file mode 100755
index 0000000000..1291347f67
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/release_docs.py
@@ -0,0 +1,158 @@
+#!/usr/bin/env python
+#
+# Copyright 2013 Google Inc. All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Script for branching Google Test/Mock wiki pages for a new version.
+
+SYNOPSIS
+       release_docs.py NEW_RELEASE_VERSION
+
+       Google Test and Google Mock's external user documentation is in
+       interlinked wiki files.  When we release a new version of
+       Google Test or Google Mock, we need to branch the wiki files
+       such that users of a specific version of Google Test/Mock can
+       look up documenation relevant for that version.  This script
+       automates that process by:
+
+         - branching the current wiki pages (which document the
+           behavior of the SVN trunk head) to pages for the specified
+           version (e.g. branching FAQ.wiki to V2_6_FAQ.wiki when
+           NEW_RELEASE_VERSION is 2.6);
+         - updating the links in the branched files to point to the branched
+           version (e.g. a link in V2_6_FAQ.wiki that pointed to
+           Primer.wiki#Anchor will now point to V2_6_Primer.wiki#Anchor).
+
+       NOTE: NEW_RELEASE_VERSION must be a NEW version number for
+       which the wiki pages don't yet exist; otherwise you'll get SVN
+       errors like "svn: Path 'V1_7_PumpManual.wiki' is not a
+       directory" when running the script.
+
+EXAMPLE
+       $ cd PATH/TO/GTEST_SVN_WORKSPACE/trunk
+       $ scripts/release_docs.py 2.6  # create wiki pages for v2.6
+       $ svn status                   # verify the file list
+       $ svn diff                     # verify the file contents
+       $ svn commit -m "release wiki pages for v2.6"
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import re
+import sys
+
+import common
+
+
+# Wiki pages that shouldn't be branched for every gtest/gmock release.
+GTEST_UNVERSIONED_WIKIS = ['DevGuide.wiki']
+GMOCK_UNVERSIONED_WIKIS = [
+    'DesignDoc.wiki',
+    'DevGuide.wiki',
+    'KnownIssues.wiki'
+    ]
+
+
+def DropWikiSuffix(wiki_filename):
+  """Removes the .wiki suffix (if any) from the given filename."""
+
+  return (wiki_filename[:-len('.wiki')] if wiki_filename.endswith('.wiki')
+          else wiki_filename)
+
+
+class WikiBrancher(object):
+  """Branches ..."""
+
+  def __init__(self, dot_version):
+    self.project, svn_root_path = common.GetSvnInfo()
+    if self.project not in ('googletest', 'googlemock'):
+      sys.exit('This script must be run in a gtest or gmock SVN workspace.')
+    self.wiki_dir = svn_root_path + '/wiki'
+    # Turn '2.6' to 'V2_6_'.
+    self.version_prefix = 'V' + dot_version.replace('.', '_') + '_'
+    self.files_to_branch = self.GetFilesToBranch()
+    page_names = [DropWikiSuffix(f) for f in self.files_to_branch]
+    # A link to Foo.wiki is in one of the following forms:
+    #   [Foo words]
+    #   [Foo#Anchor words]
+    #   [http://code.google.com/.../wiki/Foo words]
+    #   [http://code.google.com/.../wiki/Foo#Anchor words]
+    # We want to replace 'Foo' with 'V2_6_Foo' in the above cases.
+    self.search_for_re = re.compile(
+        # This regex matches either
+        #   [Foo
+        # or
+        #   /wiki/Foo
+        # followed by a space or a #, where Foo is the name of an
+        # unversioned wiki page.
+        r'(\[|/wiki/)(%s)([ #])' % '|'.join(page_names))
+    self.replace_with = r'\1%s\2\3' % (self.version_prefix,)
+
+  def GetFilesToBranch(self):
+    """Returns a list of .wiki file names that need to be branched."""
+
+    unversioned_wikis = (GTEST_UNVERSIONED_WIKIS if self.project == 'googletest'
+                         else GMOCK_UNVERSIONED_WIKIS)
+    return [f for f in os.listdir(self.wiki_dir)
+            if (f.endswith('.wiki') and
+                not re.match(r'^V\d', f) and  # Excluded versioned .wiki files.
+                f not in unversioned_wikis)]
+
+  def BranchFiles(self):
+    """Branches the .wiki files needed to be branched."""
+
+    print 'Branching %d .wiki files:' % (len(self.files_to_branch),)
+    os.chdir(self.wiki_dir)
+    for f in self.files_to_branch:
+      command = 'svn cp %s %s%s' % (f, self.version_prefix, f)
+      print command
+      os.system(command)
+
+  def UpdateLinksInBranchedFiles(self):
+
+    for f in self.files_to_branch:
+      source_file = os.path.join(self.wiki_dir, f)
+      versioned_file = os.path.join(self.wiki_dir, self.version_prefix + f)
+      print 'Updating links in %s.' % (versioned_file,)
+      text = file(source_file, 'r').read()
+      new_text = self.search_for_re.sub(self.replace_with, text)
+      file(versioned_file, 'w').write(new_text)
+
+
+def main():
+  if len(sys.argv) != 2:
+    sys.exit(__doc__)
+
+  brancher = WikiBrancher(sys.argv[1])
+  brancher.BranchFiles()
+  brancher.UpdateLinksInBranchedFiles()
+
+
+if __name__ == '__main__':
+  main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/test/Makefile b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/test/Makefile
new file mode 100644
index 0000000000..cdff584637
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/test/Makefile
@@ -0,0 +1,59 @@
+# A Makefile for fusing Google Test and building a sample test against it.
+#
+# SYNOPSIS:
+#
+#   make [all]  - makes everything.
+#   make TARGET - makes the given target.
+#   make check  - makes everything and runs the built sample test.
+#   make clean  - removes all files generated by make.
+
+# Points to the root of fused Google Test, relative to where this file is.
+FUSED_GTEST_DIR = output
+
+# Paths to the fused gtest files.
+FUSED_GTEST_H = $(FUSED_GTEST_DIR)/gtest/gtest.h
+FUSED_GTEST_ALL_CC = $(FUSED_GTEST_DIR)/gtest/gtest-all.cc
+
+# Where to find the sample test.
+SAMPLE_DIR = ../../samples
+
+# Where to find gtest_main.cc.
+GTEST_MAIN_CC = ../../src/gtest_main.cc
+
+# Flags passed to the preprocessor.
+# We have no idea here whether pthreads is available in the system, so
+# disable its use.
+CPPFLAGS += -I$(FUSED_GTEST_DIR) -DGTEST_HAS_PTHREAD=0
+
+# Flags passed to the C++ compiler.
+CXXFLAGS += -g
+
+all : sample1_unittest
+
+check : all
+	./sample1_unittest
+
+clean :
+	rm -rf $(FUSED_GTEST_DIR) sample1_unittest *.o
+
+$(FUSED_GTEST_H) :
+	../fuse_gtest_files.py $(FUSED_GTEST_DIR)
+
+$(FUSED_GTEST_ALL_CC) :
+	../fuse_gtest_files.py $(FUSED_GTEST_DIR)
+
+gtest-all.o : $(FUSED_GTEST_H) $(FUSED_GTEST_ALL_CC)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(FUSED_GTEST_DIR)/gtest/gtest-all.cc
+
+gtest_main.o : $(FUSED_GTEST_H) $(GTEST_MAIN_CC)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(GTEST_MAIN_CC)
+
+sample1.o : $(SAMPLE_DIR)/sample1.cc $(SAMPLE_DIR)/sample1.h
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(SAMPLE_DIR)/sample1.cc
+
+sample1_unittest.o : $(SAMPLE_DIR)/sample1_unittest.cc \
+                     $(SAMPLE_DIR)/sample1.h $(FUSED_GTEST_H)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(SAMPLE_DIR)/sample1_unittest.cc
+
+sample1_unittest : sample1.o sample1_unittest.o gtest-all.o gtest_main.o
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/upload.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/upload.py
new file mode 100755
index 0000000000..6e6f9a1471
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/upload.py
@@ -0,0 +1,1387 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Tool for uploading diffs from a version control system to the codereview app.
+
+Usage summary: upload.py [options] [-- diff_options]
+
+Diff options are passed to the diff command of the underlying system.
+
+Supported version control systems:
+  Git
+  Mercurial
+  Subversion
+
+It is important for Git/Mercurial users to specify a tree/node/branch to diff
+against by using the '--rev' option.
+"""
+# This code is derived from appcfg.py in the App Engine SDK (open source),
+# and from ASPN recipe #146306.
+
+import cookielib
+import getpass
+import logging
+import md5
+import mimetypes
+import optparse
+import os
+import re
+import socket
+import subprocess
+import sys
+import urllib
+import urllib2
+import urlparse
+
+try:
+  import readline
+except ImportError:
+  pass
+
+# The logging verbosity:
+#  0: Errors only.
+#  1: Status messages.
+#  2: Info logs.
+#  3: Debug logs.
+verbosity = 1
+
+# Max size of patch or base file.
+MAX_UPLOAD_SIZE = 900 * 1024
+
+
+def GetEmail(prompt):
+  """Prompts the user for their email address and returns it.
+
+  The last used email address is saved to a file and offered up as a suggestion
+  to the user. If the user presses enter without typing in anything the last
+  used email address is used. If the user enters a new address, it is saved
+  for next time we prompt.
+
+  """
+  last_email_file_name = os.path.expanduser("~/.last_codereview_email_address")
+  last_email = ""
+  if os.path.exists(last_email_file_name):
+    try:
+      last_email_file = open(last_email_file_name, "r")
+      last_email = last_email_file.readline().strip("\n")
+      last_email_file.close()
+      prompt += " [%s]" % last_email
+    except IOError, e:
+      pass
+  email = raw_input(prompt + ": ").strip()
+  if email:
+    try:
+      last_email_file = open(last_email_file_name, "w")
+      last_email_file.write(email)
+      last_email_file.close()
+    except IOError, e:
+      pass
+  else:
+    email = last_email
+  return email
+
+
+def StatusUpdate(msg):
+  """Print a status message to stdout.
+
+  If 'verbosity' is greater than 0, print the message.
+
+  Args:
+    msg: The string to print.
+  """
+  if verbosity > 0:
+    print msg
+
+
+def ErrorExit(msg):
+  """Print an error message to stderr and exit."""
+  print >>sys.stderr, msg
+  sys.exit(1)
+
+
+class ClientLoginError(urllib2.HTTPError):
+  """Raised to indicate there was an error authenticating with ClientLogin."""
+
+  def __init__(self, url, code, msg, headers, args):
+    urllib2.HTTPError.__init__(self, url, code, msg, headers, None)
+    self.args = args
+    self.reason = args["Error"]
+
+
+class AbstractRpcServer(object):
+  """Provides a common interface for a simple RPC server."""
+
+  def __init__(self, host, auth_function, host_override=None, extra_headers={},
+               save_cookies=False):
+    """Creates a new HttpRpcServer.
+
+    Args:
+      host: The host to send requests to.
+      auth_function: A function that takes no arguments and returns an
+        (email, password) tuple when called. Will be called if authentication
+        is required.
+      host_override: The host header to send to the server (defaults to host).
+      extra_headers: A dict of extra headers to append to every request.
+      save_cookies: If True, save the authentication cookies to local disk.
+        If False, use an in-memory cookiejar instead.  Subclasses must
+        implement this functionality.  Defaults to False.
+    """
+    self.host = host
+    self.host_override = host_override
+    self.auth_function = auth_function
+    self.authenticated = False
+    self.extra_headers = extra_headers
+    self.save_cookies = save_cookies
+    self.opener = self._GetOpener()
+    if self.host_override:
+      logging.info("Server: %s; Host: %s", self.host, self.host_override)
+    else:
+      logging.info("Server: %s", self.host)
+
+  def _GetOpener(self):
+    """Returns an OpenerDirector for making HTTP requests.
+
+    Returns:
+      A urllib2.OpenerDirector object.
+    """
+    raise NotImplementedError()
+
+  def _CreateRequest(self, url, data=None):
+    """Creates a new urllib request."""
+    logging.debug("Creating request for: '%s' with payload:\n%s", url, data)
+    req = urllib2.Request(url, data=data)
+    if self.host_override:
+      req.add_header("Host", self.host_override)
+    for key, value in self.extra_headers.iteritems():
+      req.add_header(key, value)
+    return req
+
+  def _GetAuthToken(self, email, password):
+    """Uses ClientLogin to authenticate the user, returning an auth token.
+
+    Args:
+      email:    The user's email address
+      password: The user's password
+
+    Raises:
+      ClientLoginError: If there was an error authenticating with ClientLogin.
+      HTTPError: If there was some other form of HTTP error.
+
+    Returns:
+      The authentication token returned by ClientLogin.
+    """
+    account_type = "GOOGLE"
+    if self.host.endswith(".google.com"):
+      # Needed for use inside Google.
+      account_type = "HOSTED"
+    req = self._CreateRequest(
+        url="https://www.google.com/accounts/ClientLogin",
+        data=urllib.urlencode({
+            "Email": email,
+            "Passwd": password,
+            "service": "ah",
+            "source": "rietveld-codereview-upload",
+            "accountType": account_type,
+        }),
+    )
+    try:
+      response = self.opener.open(req)
+      response_body = response.read()
+      response_dict = dict(x.split("=")
+                           for x in response_body.split("\n") if x)
+      return response_dict["Auth"]
+    except urllib2.HTTPError, e:
+      if e.code == 403:
+        body = e.read()
+        response_dict = dict(x.split("=", 1) for x in body.split("\n") if x)
+        raise ClientLoginError(req.get_full_url(), e.code, e.msg,
+                               e.headers, response_dict)
+      else:
+        raise
+
+  def _GetAuthCookie(self, auth_token):
+    """Fetches authentication cookies for an authentication token.
+
+    Args:
+      auth_token: The authentication token returned by ClientLogin.
+
+    Raises:
+      HTTPError: If there was an error fetching the authentication cookies.
+    """
+    # This is a dummy value to allow us to identify when we're successful.
+    continue_location = "http://localhost/"
+    args = {"continue": continue_location, "auth": auth_token}
+    req = self._CreateRequest("http://%s/_ah/login?%s" %
+                              (self.host, urllib.urlencode(args)))
+    try:
+      response = self.opener.open(req)
+    except urllib2.HTTPError, e:
+      response = e
+    if (response.code != 302 or
+        response.info()["location"] != continue_location):
+      raise urllib2.HTTPError(req.get_full_url(), response.code, response.msg,
+                              response.headers, response.fp)
+    self.authenticated = True
+
+  def _Authenticate(self):
+    """Authenticates the user.
+
+    The authentication process works as follows:
+     1) We get a username and password from the user
+     2) We use ClientLogin to obtain an AUTH token for the user
+        (see http://code.google.com/apis/accounts/AuthForInstalledApps.html).
+     3) We pass the auth token to /_ah/login on the server to obtain an
+        authentication cookie. If login was successful, it tries to redirect
+        us to the URL we provided.
+
+    If we attempt to access the upload API without first obtaining an
+    authentication cookie, it returns a 401 response and directs us to
+    authenticate ourselves with ClientLogin.
+    """
+    for i in range(3):
+      credentials = self.auth_function()
+      try:
+        auth_token = self._GetAuthToken(credentials[0], credentials[1])
+      except ClientLoginError, e:
+        if e.reason == "BadAuthentication":
+          print >>sys.stderr, "Invalid username or password."
+          continue
+        if e.reason == "CaptchaRequired":
+          print >>sys.stderr, (
+              "Please go to\n"
+              "https://www.google.com/accounts/DisplayUnlockCaptcha\n"
+              "and verify you are a human.  Then try again.")
+          break
+        if e.reason == "NotVerified":
+          print >>sys.stderr, "Account not verified."
+          break
+        if e.reason == "TermsNotAgreed":
+          print >>sys.stderr, "User has not agreed to TOS."
+          break
+        if e.reason == "AccountDeleted":
+          print >>sys.stderr, "The user account has been deleted."
+          break
+        if e.reason == "AccountDisabled":
+          print >>sys.stderr, "The user account has been disabled."
+          break
+        if e.reason == "ServiceDisabled":
+          print >>sys.stderr, ("The user's access to the service has been "
+                               "disabled.")
+          break
+        if e.reason == "ServiceUnavailable":
+          print >>sys.stderr, "The service is not available; try again later."
+          break
+        raise
+      self._GetAuthCookie(auth_token)
+      return
+
+  def Send(self, request_path, payload=None,
+           content_type="application/octet-stream",
+           timeout=None,
+           **kwargs):
+    """Sends an RPC and returns the response.
+
+    Args:
+      request_path: The path to send the request to, eg /api/appversion/create.
+      payload: The body of the request, or None to send an empty request.
+      content_type: The Content-Type header to use.
+      timeout: timeout in seconds; default None i.e. no timeout.
+        (Note: for large requests on OS X, the timeout doesn't work right.)
+      kwargs: Any keyword arguments are converted into query string parameters.
+
+    Returns:
+      The response body, as a string.
+    """
+    # TODO: Don't require authentication.  Let the server say
+    # whether it is necessary.
+    if not self.authenticated:
+      self._Authenticate()
+
+    old_timeout = socket.getdefaulttimeout()
+    socket.setdefaulttimeout(timeout)
+    try:
+      tries = 0
+      while True:
+        tries += 1
+        args = dict(kwargs)
+        url = "http://%s%s" % (self.host, request_path)
+        if args:
+          url += "?" + urllib.urlencode(args)
+        req = self._CreateRequest(url=url, data=payload)
+        req.add_header("Content-Type", content_type)
+        try:
+          f = self.opener.open(req)
+          response = f.read()
+          f.close()
+          return response
+        except urllib2.HTTPError, e:
+          if tries > 3:
+            raise
+          elif e.code == 401:
+            self._Authenticate()
+##           elif e.code >= 500 and e.code < 600:
+##             # Server Error - try again.
+##             continue
+          else:
+            raise
+    finally:
+      socket.setdefaulttimeout(old_timeout)
+
+
+class HttpRpcServer(AbstractRpcServer):
+  """Provides a simplified RPC-style interface for HTTP requests."""
+
+  def _Authenticate(self):
+    """Save the cookie jar after authentication."""
+    super(HttpRpcServer, self)._Authenticate()
+    if self.save_cookies:
+      StatusUpdate("Saving authentication cookies to %s" % self.cookie_file)
+      self.cookie_jar.save()
+
+  def _GetOpener(self):
+    """Returns an OpenerDirector that supports cookies and ignores redirects.
+
+    Returns:
+      A urllib2.OpenerDirector object.
+    """
+    opener = urllib2.OpenerDirector()
+    opener.add_handler(urllib2.ProxyHandler())
+    opener.add_handler(urllib2.UnknownHandler())
+    opener.add_handler(urllib2.HTTPHandler())
+    opener.add_handler(urllib2.HTTPDefaultErrorHandler())
+    opener.add_handler(urllib2.HTTPSHandler())
+    opener.add_handler(urllib2.HTTPErrorProcessor())
+    if self.save_cookies:
+      self.cookie_file = os.path.expanduser("~/.codereview_upload_cookies")
+      self.cookie_jar = cookielib.MozillaCookieJar(self.cookie_file)
+      if os.path.exists(self.cookie_file):
+        try:
+          self.cookie_jar.load()
+          self.authenticated = True
+          StatusUpdate("Loaded authentication cookies from %s" %
+                       self.cookie_file)
+        except (cookielib.LoadError, IOError):
+          # Failed to load cookies - just ignore them.
+          pass
+      else:
+        # Create an empty cookie file with mode 600
+        fd = os.open(self.cookie_file, os.O_CREAT, 0600)
+        os.close(fd)
+      # Always chmod the cookie file
+      os.chmod(self.cookie_file, 0600)
+    else:
+      # Don't save cookies across runs of update.py.
+      self.cookie_jar = cookielib.CookieJar()
+    opener.add_handler(urllib2.HTTPCookieProcessor(self.cookie_jar))
+    return opener
+
+
+parser = optparse.OptionParser(usage="%prog [options] [-- diff_options]")
+parser.add_option("-y", "--assume_yes", action="store_true",
+                  dest="assume_yes", default=False,
+                  help="Assume that the answer to yes/no questions is 'yes'.")
+# Logging
+group = parser.add_option_group("Logging options")
+group.add_option("-q", "--quiet", action="store_const", const=0,
+                 dest="verbose", help="Print errors only.")
+group.add_option("-v", "--verbose", action="store_const", const=2,
+                 dest="verbose", default=1,
+                 help="Print info level logs (default).")
+group.add_option("--noisy", action="store_const", const=3,
+                 dest="verbose", help="Print all logs.")
+# Review server
+group = parser.add_option_group("Review server options")
+group.add_option("-s", "--server", action="store", dest="server",
+                 default="codereview.appspot.com",
+                 metavar="SERVER",
+                 help=("The server to upload to. The format is host[:port]. "
+                       "Defaults to 'codereview.appspot.com'."))
+group.add_option("-e", "--email", action="store", dest="email",
+                 metavar="EMAIL", default=None,
+                 help="The username to use. Will prompt if omitted.")
+group.add_option("-H", "--host", action="store", dest="host",
+                 metavar="HOST", default=None,
+                 help="Overrides the Host header sent with all RPCs.")
+group.add_option("--no_cookies", action="store_false",
+                 dest="save_cookies", default=True,
+                 help="Do not save authentication cookies to local disk.")
+# Issue
+group = parser.add_option_group("Issue options")
+group.add_option("-d", "--description", action="store", dest="description",
+                 metavar="DESCRIPTION", default=None,
+                 help="Optional description when creating an issue.")
+group.add_option("-f", "--description_file", action="store",
+                 dest="description_file", metavar="DESCRIPTION_FILE",
+                 default=None,
+                 help="Optional path of a file that contains "
+                      "the description when creating an issue.")
+group.add_option("-r", "--reviewers", action="store", dest="reviewers",
+                 metavar="REVIEWERS", default=None,
+                 help="Add reviewers (comma separated email addresses).")
+group.add_option("--cc", action="store", dest="cc",
+                 metavar="CC", default=None,
+                 help="Add CC (comma separated email addresses).")
+# Upload options
+group = parser.add_option_group("Patch options")
+group.add_option("-m", "--message", action="store", dest="message",
+                 metavar="MESSAGE", default=None,
+                 help="A message to identify the patch. "
+                      "Will prompt if omitted.")
+group.add_option("-i", "--issue", type="int", action="store",
+                 metavar="ISSUE", default=None,
+                 help="Issue number to which to add. Defaults to new issue.")
+group.add_option("--download_base", action="store_true",
+                 dest="download_base", default=False,
+                 help="Base files will be downloaded by the server "
+                 "(side-by-side diffs may not work on files with CRs).")
+group.add_option("--rev", action="store", dest="revision",
+                 metavar="REV", default=None,
+                 help="Branch/tree/revision to diff against (used by DVCS).")
+group.add_option("--send_mail", action="store_true",
+                 dest="send_mail", default=False,
+                 help="Send notification email to reviewers.")
+
+
+def GetRpcServer(options):
+  """Returns an instance of an AbstractRpcServer.
+
+  Returns:
+    A new AbstractRpcServer, on which RPC calls can be made.
+  """
+
+  rpc_server_class = HttpRpcServer
+
+  def GetUserCredentials():
+    """Prompts the user for a username and password."""
+    email = options.email
+    if email is None:
+      email = GetEmail("Email (login for uploading to %s)" % options.server)
+    password = getpass.getpass("Password for %s: " % email)
+    return (email, password)
+
+  # If this is the dev_appserver, use fake authentication.
+  host = (options.host or options.server).lower()
+  if host == "localhost" or host.startswith("localhost:"):
+    email = options.email
+    if email is None:
+      email = "test@example.com"
+      logging.info("Using debug user %s.  Override with --email" % email)
+    server = rpc_server_class(
+        options.server,
+        lambda: (email, "password"),
+        host_override=options.host,
+        extra_headers={"Cookie":
+                       'dev_appserver_login="%s:False"' % email},
+        save_cookies=options.save_cookies)
+    # Don't try to talk to ClientLogin.
+    server.authenticated = True
+    return server
+
+  return rpc_server_class(options.server, GetUserCredentials,
+                          host_override=options.host,
+                          save_cookies=options.save_cookies)
+
+
+def EncodeMultipartFormData(fields, files):
+  """Encode form fields for multipart/form-data.
+
+  Args:
+    fields: A sequence of (name, value) elements for regular form fields.
+    files: A sequence of (name, filename, value) elements for data to be
+           uploaded as files.
+  Returns:
+    (content_type, body) ready for httplib.HTTP instance.
+
+  Source:
+    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/146306
+  """
+  BOUNDARY = '-M-A-G-I-C---B-O-U-N-D-A-R-Y-'
+  CRLF = '\r\n'
+  lines = []
+  for (key, value) in fields:
+    lines.append('--' + BOUNDARY)
+    lines.append('Content-Disposition: form-data; name="%s"' % key)
+    lines.append('')
+    lines.append(value)
+  for (key, filename, value) in files:
+    lines.append('--' + BOUNDARY)
+    lines.append('Content-Disposition: form-data; name="%s"; filename="%s"' %
+             (key, filename))
+    lines.append('Content-Type: %s' % GetContentType(filename))
+    lines.append('')
+    lines.append(value)
+  lines.append('--' + BOUNDARY + '--')
+  lines.append('')
+  body = CRLF.join(lines)
+  content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
+  return content_type, body
+
+
+def GetContentType(filename):
+  """Helper to guess the content-type from the filename."""
+  return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
+
+
+# Use a shell for subcommands on Windows to get a PATH search.
+use_shell = sys.platform.startswith("win")
+
+def RunShellWithReturnCode(command, print_output=False,
+                           universal_newlines=True):
+  """Executes a command and returns the output from stdout and the return code.
+
+  Args:
+    command: Command to execute.
+    print_output: If True, the output is printed to stdout.
+                  If False, both stdout and stderr are ignored.
+    universal_newlines: Use universal_newlines flag (default: True).
+
+  Returns:
+    Tuple (output, return code)
+  """
+  logging.info("Running %s", command)
+  p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                       shell=use_shell, universal_newlines=universal_newlines)
+  if print_output:
+    output_array = []
+    while True:
+      line = p.stdout.readline()
+      if not line:
+        break
+      print line.strip("\n")
+      output_array.append(line)
+    output = "".join(output_array)
+  else:
+    output = p.stdout.read()
+  p.wait()
+  errout = p.stderr.read()
+  if print_output and errout:
+    print >>sys.stderr, errout
+  p.stdout.close()
+  p.stderr.close()
+  return output, p.returncode
+
+
+def RunShell(command, silent_ok=False, universal_newlines=True,
+             print_output=False):
+  data, retcode = RunShellWithReturnCode(command, print_output,
+                                         universal_newlines)
+  if retcode:
+    ErrorExit("Got error status from %s:\n%s" % (command, data))
+  if not silent_ok and not data:
+    ErrorExit("No output from %s" % command)
+  return data
+
+
+class VersionControlSystem(object):
+  """Abstract base class providing an interface to the VCS."""
+
+  def __init__(self, options):
+    """Constructor.
+
+    Args:
+      options: Command line options.
+    """
+    self.options = options
+
+  def GenerateDiff(self, args):
+    """Return the current diff as a string.
+
+    Args:
+      args: Extra arguments to pass to the diff command.
+    """
+    raise NotImplementedError(
+        "abstract method -- subclass %s must override" % self.__class__)
+
+  def GetUnknownFiles(self):
+    """Return a list of files unknown to the VCS."""
+    raise NotImplementedError(
+        "abstract method -- subclass %s must override" % self.__class__)
+
+  def CheckForUnknownFiles(self):
+    """Show an "are you sure?" prompt if there are unknown files."""
+    unknown_files = self.GetUnknownFiles()
+    if unknown_files:
+      print "The following files are not added to version control:"
+      for line in unknown_files:
+        print line
+      prompt = "Are you sure to continue?(y/N) "
+      answer = raw_input(prompt).strip()
+      if answer != "y":
+        ErrorExit("User aborted")
+
+  def GetBaseFile(self, filename):
+    """Get the content of the upstream version of a file.
+
+    Returns:
+      A tuple (base_content, new_content, is_binary, status)
+        base_content: The contents of the base file.
+        new_content: For text files, this is empty.  For binary files, this is
+          the contents of the new file, since the diff output won't contain
+          information to reconstruct the current file.
+        is_binary: True iff the file is binary.
+        status: The status of the file.
+    """
+
+    raise NotImplementedError(
+        "abstract method -- subclass %s must override" % self.__class__)
+
+
+  def GetBaseFiles(self, diff):
+    """Helper that calls GetBase file for each file in the patch.
+
+    Returns:
+      A dictionary that maps from filename to GetBaseFile's tuple.  Filenames
+      are retrieved based on lines that start with "Index:" or
+      "Property changes on:".
+    """
+    files = {}
+    for line in diff.splitlines(True):
+      if line.startswith('Index:') or line.startswith('Property changes on:'):
+        unused, filename = line.split(':', 1)
+        # On Windows if a file has property changes its filename uses '\'
+        # instead of '/'.
+        filename = filename.strip().replace('\\', '/')
+        files[filename] = self.GetBaseFile(filename)
+    return files
+
+
+  def UploadBaseFiles(self, issue, rpc_server, patch_list, patchset, options,
+                      files):
+    """Uploads the base files (and if necessary, the current ones as well)."""
+
+    def UploadFile(filename, file_id, content, is_binary, status, is_base):
+      """Uploads a file to the server."""
+      file_too_large = False
+      if is_base:
+        type = "base"
+      else:
+        type = "current"
+      if len(content) > MAX_UPLOAD_SIZE:
+        print ("Not uploading the %s file for %s because it's too large." %
+               (type, filename))
+        file_too_large = True
+        content = ""
+      checksum = md5.new(content).hexdigest()
+      if options.verbose > 0 and not file_too_large:
+        print "Uploading %s file for %s" % (type, filename)
+      url = "/%d/upload_content/%d/%d" % (int(issue), int(patchset), file_id)
+      form_fields = [("filename", filename),
+                     ("status", status),
+                     ("checksum", checksum),
+                     ("is_binary", str(is_binary)),
+                     ("is_current", str(not is_base)),
+                    ]
+      if file_too_large:
+        form_fields.append(("file_too_large", "1"))
+      if options.email:
+        form_fields.append(("user", options.email))
+      ctype, body = EncodeMultipartFormData(form_fields,
+                                            [("data", filename, content)])
+      response_body = rpc_server.Send(url, body,
+                                      content_type=ctype)
+      if not response_body.startswith("OK"):
+        StatusUpdate("  --> %s" % response_body)
+        sys.exit(1)
+
+    patches = dict()
+    [patches.setdefault(v, k) for k, v in patch_list]
+    for filename in patches.keys():
+      base_content, new_content, is_binary, status = files[filename]
+      file_id_str = patches.get(filename)
+      if file_id_str.find("nobase") != -1:
+        base_content = None
+        file_id_str = file_id_str[file_id_str.rfind("_") + 1:]
+      file_id = int(file_id_str)
+      if base_content != None:
+        UploadFile(filename, file_id, base_content, is_binary, status, True)
+      if new_content != None:
+        UploadFile(filename, file_id, new_content, is_binary, status, False)
+
+  def IsImage(self, filename):
+    """Returns true if the filename has an image extension."""
+    mimetype =  mimetypes.guess_type(filename)[0]
+    if not mimetype:
+      return False
+    return mimetype.startswith("image/")
+
+
+class SubversionVCS(VersionControlSystem):
+  """Implementation of the VersionControlSystem interface for Subversion."""
+
+  def __init__(self, options):
+    super(SubversionVCS, self).__init__(options)
+    if self.options.revision:
+      match = re.match(r"(\d+)(:(\d+))?", self.options.revision)
+      if not match:
+        ErrorExit("Invalid Subversion revision %s." % self.options.revision)
+      self.rev_start = match.group(1)
+      self.rev_end = match.group(3)
+    else:
+      self.rev_start = self.rev_end = None
+    # Cache output from "svn list -r REVNO dirname".
+    # Keys: dirname, Values: 2-tuple (ouput for start rev and end rev).
+    self.svnls_cache = {}
+    # SVN base URL is required to fetch files deleted in an older revision.
+    # Result is cached to not guess it over and over again in GetBaseFile().
+    required = self.options.download_base or self.options.revision is not None
+    self.svn_base = self._GuessBase(required)
+
+  def GuessBase(self, required):
+    """Wrapper for _GuessBase."""
+    return self.svn_base
+
+  def _GuessBase(self, required):
+    """Returns the SVN base URL.
+
+    Args:
+      required: If true, exits if the url can't be guessed, otherwise None is
+        returned.
+    """
+    info = RunShell(["svn", "info"])
+    for line in info.splitlines():
+      words = line.split()
+      if len(words) == 2 and words[0] == "URL:":
+        url = words[1]
+        scheme, netloc, path, params, query, fragment = urlparse.urlparse(url)
+        username, netloc = urllib.splituser(netloc)
+        if username:
+          logging.info("Removed username from base URL")
+        if netloc.endswith("svn.python.org"):
+          if netloc == "svn.python.org":
+            if path.startswith("/projects/"):
+              path = path[9:]
+          elif netloc != "pythondev@svn.python.org":
+            ErrorExit("Unrecognized Python URL: %s" % url)
+          base = "http://svn.python.org/view/*checkout*%s/" % path
+          logging.info("Guessed Python base = %s", base)
+        elif netloc.endswith("svn.collab.net"):
+          if path.startswith("/repos/"):
+            path = path[6:]
+          base = "http://svn.collab.net/viewvc/*checkout*%s/" % path
+          logging.info("Guessed CollabNet base = %s", base)
+        elif netloc.endswith(".googlecode.com"):
+          path = path + "/"
+          base = urlparse.urlunparse(("http", netloc, path, params,
+                                      query, fragment))
+          logging.info("Guessed Google Code base = %s", base)
+        else:
+          path = path + "/"
+          base = urlparse.urlunparse((scheme, netloc, path, params,
+                                      query, fragment))
+          logging.info("Guessed base = %s", base)
+        return base
+    if required:
+      ErrorExit("Can't find URL in output from svn info")
+    return None
+
+  def GenerateDiff(self, args):
+    cmd = ["svn", "diff"]
+    if self.options.revision:
+      cmd += ["-r", self.options.revision]
+    cmd.extend(args)
+    data = RunShell(cmd)
+    count = 0
+    for line in data.splitlines():
+      if line.startswith("Index:") or line.startswith("Property changes on:"):
+        count += 1
+        logging.info(line)
+    if not count:
+      ErrorExit("No valid patches found in output from svn diff")
+    return data
+
+  def _CollapseKeywords(self, content, keyword_str):
+    """Collapses SVN keywords."""
+    # svn cat translates keywords but svn diff doesn't. As a result of this
+    # behavior patching.PatchChunks() fails with a chunk mismatch error.
+    # This part was originally written by the Review Board development team
+    # who had the same problem (http://reviews.review-board.org/r/276/).
+    # Mapping of keywords to known aliases
+    svn_keywords = {
+      # Standard keywords
+      'Date':                ['Date', 'LastChangedDate'],
+      'Revision':            ['Revision', 'LastChangedRevision', 'Rev'],
+      'Author':              ['Author', 'LastChangedBy'],
+      'HeadURL':             ['HeadURL', 'URL'],
+      'Id':                  ['Id'],
+
+      # Aliases
+      'LastChangedDate':     ['LastChangedDate', 'Date'],
+      'LastChangedRevision': ['LastChangedRevision', 'Rev', 'Revision'],
+      'LastChangedBy':       ['LastChangedBy', 'Author'],
+      'URL':                 ['URL', 'HeadURL'],
+    }
+
+    def repl(m):
+       if m.group(2):
+         return "$%s::%s$" % (m.group(1), " " * len(m.group(3)))
+       return "$%s$" % m.group(1)
+    keywords = [keyword
+                for name in keyword_str.split(" ")
+                for keyword in svn_keywords.get(name, [])]
+    return re.sub(r"\$(%s):(:?)([^\$]+)\$" % '|'.join(keywords), repl, content)
+
+  def GetUnknownFiles(self):
+    status = RunShell(["svn", "status", "--ignore-externals"], silent_ok=True)
+    unknown_files = []
+    for line in status.split("\n"):
+      if line and line[0] == "?":
+        unknown_files.append(line)
+    return unknown_files
+
+  def ReadFile(self, filename):
+    """Returns the contents of a file."""
+    file = open(filename, 'rb')
+    result = ""
+    try:
+      result = file.read()
+    finally:
+      file.close()
+    return result
+
+  def GetStatus(self, filename):
+    """Returns the status of a file."""
+    if not self.options.revision:
+      status = RunShell(["svn", "status", "--ignore-externals", filename])
+      if not status:
+        ErrorExit("svn status returned no output for %s" % filename)
+      status_lines = status.splitlines()
+      # If file is in a cl, the output will begin with
+      # "\n--- Changelist 'cl_name':\n".  See
+      # http://svn.collab.net/repos/svn/trunk/notes/changelist-design.txt
+      if (len(status_lines) == 3 and
+          not status_lines[0] and
+          status_lines[1].startswith("--- Changelist")):
+        status = status_lines[2]
+      else:
+        status = status_lines[0]
+    # If we have a revision to diff against we need to run "svn list"
+    # for the old and the new revision and compare the results to get
+    # the correct status for a file.
+    else:
+      dirname, relfilename = os.path.split(filename)
+      if dirname not in self.svnls_cache:
+        cmd = ["svn", "list", "-r", self.rev_start, dirname or "."]
+        out, returncode = RunShellWithReturnCode(cmd)
+        if returncode:
+          ErrorExit("Failed to get status for %s." % filename)
+        old_files = out.splitlines()
+        args = ["svn", "list"]
+        if self.rev_end:
+          args += ["-r", self.rev_end]
+        cmd = args + [dirname or "."]
+        out, returncode = RunShellWithReturnCode(cmd)
+        if returncode:
+          ErrorExit("Failed to run command %s" % cmd)
+        self.svnls_cache[dirname] = (old_files, out.splitlines())
+      old_files, new_files = self.svnls_cache[dirname]
+      if relfilename in old_files and relfilename not in new_files:
+        status = "D   "
+      elif relfilename in old_files and relfilename in new_files:
+        status = "M   "
+      else:
+        status = "A   "
+    return status
+
+  def GetBaseFile(self, filename):
+    status = self.GetStatus(filename)
+    base_content = None
+    new_content = None
+
+    # If a file is copied its status will be "A  +", which signifies
+    # "addition-with-history".  See "svn st" for more information.  We need to
+    # upload the original file or else diff parsing will fail if the file was
+    # edited.
+    if status[0] == "A" and status[3] != "+":
+      # We'll need to upload the new content if we're adding a binary file
+      # since diff's output won't contain it.
+      mimetype = RunShell(["svn", "propget", "svn:mime-type", filename],
+                          silent_ok=True)
+      base_content = ""
+      is_binary = mimetype and not mimetype.startswith("text/")
+      if is_binary and self.IsImage(filename):
+        new_content = self.ReadFile(filename)
+    elif (status[0] in ("M", "D", "R") or
+          (status[0] == "A" and status[3] == "+") or  # Copied file.
+          (status[0] == " " and status[1] == "M")):  # Property change.
+      args = []
+      if self.options.revision:
+        url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start)
+      else:
+        # Don't change filename, it's needed later.
+        url = filename
+        args += ["-r", "BASE"]
+      cmd = ["svn"] + args + ["propget", "svn:mime-type", url]
+      mimetype, returncode = RunShellWithReturnCode(cmd)
+      if returncode:
+        # File does not exist in the requested revision.
+        # Reset mimetype, it contains an error message.
+        mimetype = ""
+      get_base = False
+      is_binary = mimetype and not mimetype.startswith("text/")
+      if status[0] == " ":
+        # Empty base content just to force an upload.
+        base_content = ""
+      elif is_binary:
+        if self.IsImage(filename):
+          get_base = True
+          if status[0] == "M":
+            if not self.rev_end:
+              new_content = self.ReadFile(filename)
+            else:
+              url = "%s/%s@%s" % (self.svn_base, filename, self.rev_end)
+              new_content = RunShell(["svn", "cat", url],
+                                     universal_newlines=True, silent_ok=True)
+        else:
+          base_content = ""
+      else:
+        get_base = True
+
+      if get_base:
+        if is_binary:
+          universal_newlines = False
+        else:
+          universal_newlines = True
+        if self.rev_start:
+          # "svn cat -r REV delete_file.txt" doesn't work. cat requires
+          # the full URL with "@REV" appended instead of using "-r" option.
+          url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start)
+          base_content = RunShell(["svn", "cat", url],
+                                  universal_newlines=universal_newlines,
+                                  silent_ok=True)
+        else:
+          base_content = RunShell(["svn", "cat", filename],
+                                  universal_newlines=universal_newlines,
+                                  silent_ok=True)
+        if not is_binary:
+          args = []
+          if self.rev_start:
+            url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start)
+          else:
+            url = filename
+            args += ["-r", "BASE"]
+          cmd = ["svn"] + args + ["propget", "svn:keywords", url]
+          keywords, returncode = RunShellWithReturnCode(cmd)
+          if keywords and not returncode:
+            base_content = self._CollapseKeywords(base_content, keywords)
+    else:
+      StatusUpdate("svn status returned unexpected output: %s" % status)
+      sys.exit(1)
+    return base_content, new_content, is_binary, status[0:5]
+
+
+class GitVCS(VersionControlSystem):
+  """Implementation of the VersionControlSystem interface for Git."""
+
+  def __init__(self, options):
+    super(GitVCS, self).__init__(options)
+    # Map of filename -> hash of base file.
+    self.base_hashes = {}
+
+  def GenerateDiff(self, extra_args):
+    # This is more complicated than svn's GenerateDiff because we must convert
+    # the diff output to include an svn-style "Index:" line as well as record
+    # the hashes of the base files, so we can upload them along with our diff.
+    if self.options.revision:
+      extra_args = [self.options.revision] + extra_args
+    gitdiff = RunShell(["git", "diff", "--full-index"] + extra_args)
+    svndiff = []
+    filecount = 0
+    filename = None
+    for line in gitdiff.splitlines():
+      match = re.match(r"diff --git a/(.*) b/.*$", line)
+      if match:
+        filecount += 1
+        filename = match.group(1)
+        svndiff.append("Index: %s\n" % filename)
+      else:
+        # The "index" line in a git diff looks like this (long hashes elided):
+        #   index 82c0d44..b2cee3f 100755
+        # We want to save the left hash, as that identifies the base file.
+        match = re.match(r"index (\w+)\.\.", line)
+        if match:
+          self.base_hashes[filename] = match.group(1)
+      svndiff.append(line + "\n")
+    if not filecount:
+      ErrorExit("No valid patches found in output from git diff")
+    return "".join(svndiff)
+
+  def GetUnknownFiles(self):
+    status = RunShell(["git", "ls-files", "--exclude-standard", "--others"],
+                      silent_ok=True)
+    return status.splitlines()
+
+  def GetBaseFile(self, filename):
+    hash = self.base_hashes[filename]
+    base_content = None
+    new_content = None
+    is_binary = False
+    if hash == "0" * 40:  # All-zero hash indicates no base file.
+      status = "A"
+      base_content = ""
+    else:
+      status = "M"
+      base_content, returncode = RunShellWithReturnCode(["git", "show", hash])
+      if returncode:
+        ErrorExit("Got error status from 'git show %s'" % hash)
+    return (base_content, new_content, is_binary, status)
+
+
+class MercurialVCS(VersionControlSystem):
+  """Implementation of the VersionControlSystem interface for Mercurial."""
+
+  def __init__(self, options, repo_dir):
+    super(MercurialVCS, self).__init__(options)
+    # Absolute path to repository (we can be in a subdir)
+    self.repo_dir = os.path.normpath(repo_dir)
+    # Compute the subdir
+    cwd = os.path.normpath(os.getcwd())
+    assert cwd.startswith(self.repo_dir)
+    self.subdir = cwd[len(self.repo_dir):].lstrip(r"\/")
+    if self.options.revision:
+      self.base_rev = self.options.revision
+    else:
+      self.base_rev = RunShell(["hg", "parent", "-q"]).split(':')[1].strip()
+
+  def _GetRelPath(self, filename):
+    """Get relative path of a file according to the current directory,
+    given its logical path in the repo."""
+    assert filename.startswith(self.subdir), filename
+    return filename[len(self.subdir):].lstrip(r"\/")
+
+  def GenerateDiff(self, extra_args):
+    # If no file specified, restrict to the current subdir
+    extra_args = extra_args or ["."]
+    cmd = ["hg", "diff", "--git", "-r", self.base_rev] + extra_args
+    data = RunShell(cmd, silent_ok=True)
+    svndiff = []
+    filecount = 0
+    for line in data.splitlines():
+      m = re.match("diff --git a/(\S+) b/(\S+)", line)
+      if m:
+        # Modify line to make it look like as it comes from svn diff.
+        # With this modification no changes on the server side are required
+        # to make upload.py work with Mercurial repos.
+        # NOTE: for proper handling of moved/copied files, we have to use
+        # the second filename.
+        filename = m.group(2)
+        svndiff.append("Index: %s" % filename)
+        svndiff.append("=" * 67)
+        filecount += 1
+        logging.info(line)
+      else:
+        svndiff.append(line)
+    if not filecount:
+      ErrorExit("No valid patches found in output from hg diff")
+    return "\n".join(svndiff) + "\n"
+
+  def GetUnknownFiles(self):
+    """Return a list of files unknown to the VCS."""
+    args = []
+    status = RunShell(["hg", "status", "--rev", self.base_rev, "-u", "."],
+        silent_ok=True)
+    unknown_files = []
+    for line in status.splitlines():
+      st, fn = line.split(" ", 1)
+      if st == "?":
+        unknown_files.append(fn)
+    return unknown_files
+
+  def GetBaseFile(self, filename):
+    # "hg status" and "hg cat" both take a path relative to the current subdir
+    # rather than to the repo root, but "hg diff" has given us the full path
+    # to the repo root.
+    base_content = ""
+    new_content = None
+    is_binary = False
+    oldrelpath = relpath = self._GetRelPath(filename)
+    # "hg status -C" returns two lines for moved/copied files, one otherwise
+    out = RunShell(["hg", "status", "-C", "--rev", self.base_rev, relpath])
+    out = out.splitlines()
+    # HACK: strip error message about missing file/directory if it isn't in
+    # the working copy
+    if out[0].startswith('%s: ' % relpath):
+      out = out[1:]
+    if len(out) > 1:
+      # Moved/copied => considered as modified, use old filename to
+      # retrieve base contents
+      oldrelpath = out[1].strip()
+      status = "M"
+    else:
+      status, _ = out[0].split(' ', 1)
+    if status != "A":
+      base_content = RunShell(["hg", "cat", "-r", self.base_rev, oldrelpath],
+        silent_ok=True)
+      is_binary = "\0" in base_content  # Mercurial's heuristic
+    if status != "R":
+      new_content = open(relpath, "rb").read()
+      is_binary = is_binary or "\0" in new_content
+    if is_binary and base_content:
+      # Fetch again without converting newlines
+      base_content = RunShell(["hg", "cat", "-r", self.base_rev, oldrelpath],
+        silent_ok=True, universal_newlines=False)
+    if not is_binary or not self.IsImage(relpath):
+      new_content = None
+    return base_content, new_content, is_binary, status
+
+
+# NOTE: The SplitPatch function is duplicated in engine.py, keep them in sync.
+def SplitPatch(data):
+  """Splits a patch into separate pieces for each file.
+
+  Args:
+    data: A string containing the output of svn diff.
+
+  Returns:
+    A list of 2-tuple (filename, text) where text is the svn diff output
+      pertaining to filename.
+  """
+  patches = []
+  filename = None
+  diff = []
+  for line in data.splitlines(True):
+    new_filename = None
+    if line.startswith('Index:'):
+      unused, new_filename = line.split(':', 1)
+      new_filename = new_filename.strip()
+    elif line.startswith('Property changes on:'):
+      unused, temp_filename = line.split(':', 1)
+      # When a file is modified, paths use '/' between directories, however
+      # when a property is modified '\' is used on Windows.  Make them the same
+      # otherwise the file shows up twice.
+      temp_filename = temp_filename.strip().replace('\\', '/')
+      if temp_filename != filename:
+        # File has property changes but no modifications, create a new diff.
+        new_filename = temp_filename
+    if new_filename:
+      if filename and diff:
+        patches.append((filename, ''.join(diff)))
+      filename = new_filename
+      diff = [line]
+      continue
+    if diff is not None:
+      diff.append(line)
+  if filename and diff:
+    patches.append((filename, ''.join(diff)))
+  return patches
+
+
+def UploadSeparatePatches(issue, rpc_server, patchset, data, options):
+  """Uploads a separate patch for each file in the diff output.
+
+  Returns a list of [patch_key, filename] for each file.
+  """
+  patches = SplitPatch(data)
+  rv = []
+  for patch in patches:
+    if len(patch[1]) > MAX_UPLOAD_SIZE:
+      print ("Not uploading the patch for " + patch[0] +
+             " because the file is too large.")
+      continue
+    form_fields = [("filename", patch[0])]
+    if not options.download_base:
+      form_fields.append(("content_upload", "1"))
+    files = [("data", "data.diff", patch[1])]
+    ctype, body = EncodeMultipartFormData(form_fields, files)
+    url = "/%d/upload_patch/%d" % (int(issue), int(patchset))
+    print "Uploading patch for " + patch[0]
+    response_body = rpc_server.Send(url, body, content_type=ctype)
+    lines = response_body.splitlines()
+    if not lines or lines[0] != "OK":
+      StatusUpdate("  --> %s" % response_body)
+      sys.exit(1)
+    rv.append([lines[1], patch[0]])
+  return rv
+
+
+def GuessVCS(options):
+  """Helper to guess the version control system.
+
+  This examines the current directory, guesses which VersionControlSystem
+  we're using, and returns an instance of the appropriate class.  Exit with an
+  error if we can't figure it out.
+
+  Returns:
+    A VersionControlSystem instance. Exits if the VCS can't be guessed.
+  """
+  # Mercurial has a command to get the base directory of a repository
+  # Try running it, but don't die if we don't have hg installed.
+  # NOTE: we try Mercurial first as it can sit on top of an SVN working copy.
+  try:
+    out, returncode = RunShellWithReturnCode(["hg", "root"])
+    if returncode == 0:
+      return MercurialVCS(options, out.strip())
+  except OSError, (errno, message):
+    if errno != 2:  # ENOENT -- they don't have hg installed.
+      raise
+
+  # Subversion has a .svn in all working directories.
+  if os.path.isdir('.svn'):
+    logging.info("Guessed VCS = Subversion")
+    return SubversionVCS(options)
+
+  # Git has a command to test if you're in a git tree.
+  # Try running it, but don't die if we don't have git installed.
+  try:
+    out, returncode = RunShellWithReturnCode(["git", "rev-parse",
+                                              "--is-inside-work-tree"])
+    if returncode == 0:
+      return GitVCS(options)
+  except OSError, (errno, message):
+    if errno != 2:  # ENOENT -- they don't have git installed.
+      raise
+
+  ErrorExit(("Could not guess version control system. "
+             "Are you in a working copy directory?"))
+
+
+def RealMain(argv, data=None):
+  """The real main function.
+
+  Args:
+    argv: Command line arguments.
+    data: Diff contents. If None (default) the diff is generated by
+      the VersionControlSystem implementation returned by GuessVCS().
+
+  Returns:
+    A 2-tuple (issue id, patchset id).
+    The patchset id is None if the base files are not uploaded by this
+    script (applies only to SVN checkouts).
+  """
+  logging.basicConfig(format=("%(asctime).19s %(levelname)s %(filename)s:"
+                              "%(lineno)s %(message)s "))
+  os.environ['LC_ALL'] = 'C'
+  options, args = parser.parse_args(argv[1:])
+  global verbosity
+  verbosity = options.verbose
+  if verbosity >= 3:
+    logging.getLogger().setLevel(logging.DEBUG)
+  elif verbosity >= 2:
+    logging.getLogger().setLevel(logging.INFO)
+  vcs = GuessVCS(options)
+  if isinstance(vcs, SubversionVCS):
+    # base field is only allowed for Subversion.
+    # Note: Fetching base files may become deprecated in future releases.
+    base = vcs.GuessBase(options.download_base)
+  else:
+    base = None
+  if not base and options.download_base:
+    options.download_base = True
+    logging.info("Enabled upload of base file")
+  if not options.assume_yes:
+    vcs.CheckForUnknownFiles()
+  if data is None:
+    data = vcs.GenerateDiff(args)
+  files = vcs.GetBaseFiles(data)
+  if verbosity >= 1:
+    print "Upload server:", options.server, "(change with -s/--server)"
+  if options.issue:
+    prompt = "Message describing this patch set: "
+  else:
+    prompt = "New issue subject: "
+  message = options.message or raw_input(prompt).strip()
+  if not message:
+    ErrorExit("A non-empty message is required")
+  rpc_server = GetRpcServer(options)
+  form_fields = [("subject", message)]
+  if base:
+    form_fields.append(("base", base))
+  if options.issue:
+    form_fields.append(("issue", str(options.issue)))
+  if options.email:
+    form_fields.append(("user", options.email))
+  if options.reviewers:
+    for reviewer in options.reviewers.split(','):
+      if "@" in reviewer and not reviewer.split("@")[1].count(".") == 1:
+        ErrorExit("Invalid email address: %s" % reviewer)
+    form_fields.append(("reviewers", options.reviewers))
+  if options.cc:
+    for cc in options.cc.split(','):
+      if "@" in cc and not cc.split("@")[1].count(".") == 1:
+        ErrorExit("Invalid email address: %s" % cc)
+    form_fields.append(("cc", options.cc))
+  description = options.description
+  if options.description_file:
+    if options.description:
+      ErrorExit("Can't specify description and description_file")
+    file = open(options.description_file, 'r')
+    description = file.read()
+    file.close()
+  if description:
+    form_fields.append(("description", description))
+  # Send a hash of all the base file so the server can determine if a copy
+  # already exists in an earlier patchset.
+  base_hashes = ""
+  for file, info in files.iteritems():
+    if not info[0] is None:
+      checksum = md5.new(info[0]).hexdigest()
+      if base_hashes:
+        base_hashes += "|"
+      base_hashes += checksum + ":" + file
+  form_fields.append(("base_hashes", base_hashes))
+  # If we're uploading base files, don't send the email before the uploads, so
+  # that it contains the file status.
+  if options.send_mail and options.download_base:
+    form_fields.append(("send_mail", "1"))
+  if not options.download_base:
+    form_fields.append(("content_upload", "1"))
+  if len(data) > MAX_UPLOAD_SIZE:
+    print "Patch is large, so uploading file patches separately."
+    uploaded_diff_file = []
+    form_fields.append(("separate_patches", "1"))
+  else:
+    uploaded_diff_file = [("data", "data.diff", data)]
+  ctype, body = EncodeMultipartFormData(form_fields, uploaded_diff_file)
+  response_body = rpc_server.Send("/upload", body, content_type=ctype)
+  patchset = None
+  if not options.download_base or not uploaded_diff_file:
+    lines = response_body.splitlines()
+    if len(lines) >= 2:
+      msg = lines[0]
+      patchset = lines[1].strip()
+      patches = [x.split(" ", 1) for x in lines[2:]]
+    else:
+      msg = response_body
+  else:
+    msg = response_body
+  StatusUpdate(msg)
+  if not response_body.startswith("Issue created.") and \
+  not response_body.startswith("Issue updated."):
+    sys.exit(0)
+  issue = msg[msg.rfind("/")+1:]
+
+  if not uploaded_diff_file:
+    result = UploadSeparatePatches(issue, rpc_server, patchset, data, options)
+    if not options.download_base:
+      patches = result
+
+  if not options.download_base:
+    vcs.UploadBaseFiles(issue, rpc_server, patches, patchset, options, files)
+    if options.send_mail:
+      rpc_server.Send("/" + issue + "/mail", payload="")
+  return issue, patchset
+
+
+def main():
+  try:
+    RealMain(sys.argv)
+  except KeyboardInterrupt:
+    print
+    StatusUpdate("Interrupted.")
+    sys.exit(1)
+
+
+if __name__ == "__main__":
+  main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/upload_gtest.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/upload_gtest.py
new file mode 100755
index 0000000000..be19ae8091
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/scripts/upload_gtest.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+#
+# Copyright 2009, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""upload_gtest.py v0.1.0 -- uploads a Google Test patch for review.
+
+This simple wrapper passes all command line flags and
+--cc=googletestframework@googlegroups.com to upload.py.
+
+USAGE: upload_gtest.py [options for upload.py]
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import sys
+
+CC_FLAG = '--cc='
+GTEST_GROUP = 'googletestframework@googlegroups.com'
+
+
+def main():
+  # Finds the path to upload.py, assuming it is in the same directory
+  # as this file.
+  my_dir = os.path.dirname(os.path.abspath(__file__))
+  upload_py_path = os.path.join(my_dir, 'upload.py')
+
+  # Adds Google Test discussion group to the cc line if it's not there
+  # already.
+  upload_py_argv = [upload_py_path]
+  found_cc_flag = False
+  for arg in sys.argv[1:]:
+    if arg.startswith(CC_FLAG):
+      found_cc_flag = True
+      cc_line = arg[len(CC_FLAG):]
+      cc_list = [addr for addr in cc_line.split(',') if addr]
+      if GTEST_GROUP not in cc_list:
+        cc_list.append(GTEST_GROUP)
+      upload_py_argv.append(CC_FLAG + ','.join(cc_list))
+    else:
+      upload_py_argv.append(arg)
+
+  if not found_cc_flag:
+    upload_py_argv.append(CC_FLAG + GTEST_GROUP)
+
+  # Invokes upload.py with the modified command line flags.
+  os.execv(upload_py_path, upload_py_argv)
+
+
+if __name__ == '__main__':
+  main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-all.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-all.cc
new file mode 100644
index 0000000000..0a9cee5223
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-all.cc
@@ -0,0 +1,48 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: mheule@google.com (Markus Heule)
+//
+// Google C++ Testing Framework (Google Test)
+//
+// Sometimes it's desirable to build Google Test by compiling a single file.
+// This file serves this purpose.
+
+// This line ensures that gtest.h can be compiled on its own, even
+// when it's fused.
+#include "gtest/gtest.h"
+
+// The following lines pull in the real gtest *.cc files.
+#include "src/gtest.cc"
+#include "src/gtest-death-test.cc"
+#include "src/gtest-filepath.cc"
+#include "src/gtest-port.cc"
+#include "src/gtest-printers.cc"
+#include "src/gtest-test-part.cc"
+#include "src/gtest-typed-test.cc"
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-death-test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-death-test.cc
new file mode 100644
index 0000000000..a01a369830
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-death-test.cc
@@ -0,0 +1,1342 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan), vladl@google.com (Vlad Losev)
+//
+// This file implements death tests.
+
+#include "gtest/gtest-death-test.h"
+#include "gtest/internal/gtest-port.h"
+#include "gtest/internal/custom/gtest.h"
+
+#if GTEST_HAS_DEATH_TEST
+
+# if GTEST_OS_MAC
+#  include <crt_externs.h>
+# endif  // GTEST_OS_MAC
+
+# include <errno.h>
+# include <fcntl.h>
+# include <limits.h>
+
+# if GTEST_OS_LINUX
+#  include <signal.h>
+# endif  // GTEST_OS_LINUX
+
+# include <stdarg.h>
+
+# if GTEST_OS_WINDOWS
+#  include <windows.h>
+# else
+#  include <sys/mman.h>
+#  include <sys/wait.h>
+# endif  // GTEST_OS_WINDOWS
+
+# if GTEST_OS_QNX
+#  include <spawn.h>
+# endif  // GTEST_OS_QNX
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+#include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-string.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick exists to
+// prevent the accidental inclusion of gtest-internal-inl.h in the
+// user's code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+namespace testing {
+
+// Constants.
+
+// The default death test style.
+static const char kDefaultDeathTestStyle[] = "fast";
+
+GTEST_DEFINE_string_(
+    death_test_style,
+    internal::StringFromGTestEnv("death_test_style", kDefaultDeathTestStyle),
+    "Indicates how to run a death test in a forked child process: "
+    "\"threadsafe\" (child process re-executes the test binary "
+    "from the beginning, running only the specific death test) or "
+    "\"fast\" (child process runs the death test immediately "
+    "after forking).");
+
+GTEST_DEFINE_bool_(
+    death_test_use_fork,
+    internal::BoolFromGTestEnv("death_test_use_fork", false),
+    "Instructs to use fork()/_exit() instead of clone() in death tests. "
+    "Ignored and always uses fork() on POSIX systems where clone() is not "
+    "implemented. Useful when running under valgrind or similar tools if "
+    "those do not support clone(). Valgrind 3.3.1 will just fail if "
+    "it sees an unsupported combination of clone() flags. "
+    "It is not recommended to use this flag w/o valgrind though it will "
+    "work in 99% of the cases. Once valgrind is fixed, this flag will "
+    "most likely be removed.");
+
+namespace internal {
+GTEST_DEFINE_string_(
+    internal_run_death_test, "",
+    "Indicates the file, line number, temporal index of "
+    "the single death test to run, and a file descriptor to "
+    "which a success code may be sent, all separated by "
+    "the '|' characters.  This flag is specified if and only if the current "
+    "process is a sub-process launched for running a thread-safe "
+    "death test.  FOR INTERNAL USE ONLY.");
+}  // namespace internal
+
+#if GTEST_HAS_DEATH_TEST
+
+namespace internal {
+
+// Valid only for fast death tests. Indicates the code is running in the
+// child process of a fast style death test.
+# if !GTEST_OS_WINDOWS
+static bool g_in_fast_death_test_child = false;
+# endif
+
+// Returns a Boolean value indicating whether the caller is currently
+// executing in the context of the death test child process.  Tools such as
+// Valgrind heap checkers may need this to modify their behavior in death
+// tests.  IMPORTANT: This is an internal utility.  Using it may break the
+// implementation of death tests.  User code MUST NOT use it.
+bool InDeathTestChild() {
+# if GTEST_OS_WINDOWS
+
+  // On Windows, death tests are thread-safe regardless of the value of the
+  // death_test_style flag.
+  return !GTEST_FLAG(internal_run_death_test).empty();
+
+# else
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe")
+    return !GTEST_FLAG(internal_run_death_test).empty();
+  else
+    return g_in_fast_death_test_child;
+#endif
+}
+
+}  // namespace internal
+
+// ExitedWithCode constructor.
+ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) {
+}
+
+// ExitedWithCode function-call operator.
+bool ExitedWithCode::operator()(int exit_status) const {
+# if GTEST_OS_WINDOWS
+
+  return exit_status == exit_code_;
+
+# else
+
+  return WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == exit_code_;
+
+# endif  // GTEST_OS_WINDOWS
+}
+
+# if !GTEST_OS_WINDOWS
+// KilledBySignal constructor.
+KilledBySignal::KilledBySignal(int signum) : signum_(signum) {
+}
+
+// KilledBySignal function-call operator.
+bool KilledBySignal::operator()(int exit_status) const {
+#  if defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
+  {
+    bool result;
+    if (GTEST_KILLED_BY_SIGNAL_OVERRIDE_(signum_, exit_status, &result)) {
+      return result;
+    }
+  }
+#  endif  // defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_)
+  return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_;
+}
+# endif  // !GTEST_OS_WINDOWS
+
+namespace internal {
+
+// Utilities needed for death tests.
+
+// Generates a textual description of a given exit code, in the format
+// specified by wait(2).
+static std::string ExitSummary(int exit_code) {
+  Message m;
+
+# if GTEST_OS_WINDOWS
+
+  m << "Exited with exit status " << exit_code;
+
+# else
+
+  if (WIFEXITED(exit_code)) {
+    m << "Exited with exit status " << WEXITSTATUS(exit_code);
+  } else if (WIFSIGNALED(exit_code)) {
+    m << "Terminated by signal " << WTERMSIG(exit_code);
+  }
+#  ifdef WCOREDUMP
+  if (WCOREDUMP(exit_code)) {
+    m << " (core dumped)";
+  }
+#  endif
+# endif  // GTEST_OS_WINDOWS
+
+  return m.GetString();
+}
+
+// Returns true if exit_status describes a process that was terminated
+// by a signal, or exited normally with a nonzero exit code.
+bool ExitedUnsuccessfully(int exit_status) {
+  return !ExitedWithCode(0)(exit_status);
+}
+
+# if !GTEST_OS_WINDOWS
+// Generates a textual failure message when a death test finds more than
+// one thread running, or cannot determine the number of threads, prior
+// to executing the given statement.  It is the responsibility of the
+// caller not to pass a thread_count of 1.
+static std::string DeathTestThreadWarning(size_t thread_count) {
+  Message msg;
+  msg << "Death tests use fork(), which is unsafe particularly"
+      << " in a threaded context. For this test, " << GTEST_NAME_ << " ";
+  if (thread_count == 0)
+    msg << "couldn't detect the number of threads.";
+  else
+    msg << "detected " << thread_count << " threads.";
+  return msg.GetString();
+}
+# endif  // !GTEST_OS_WINDOWS
+
+// Flag characters for reporting a death test that did not die.
+static const char kDeathTestLived = 'L';
+static const char kDeathTestReturned = 'R';
+static const char kDeathTestThrew = 'T';
+static const char kDeathTestInternalError = 'I';
+
+// An enumeration describing all of the possible ways that a death test can
+// conclude.  DIED means that the process died while executing the test
+// code; LIVED means that process lived beyond the end of the test code;
+// RETURNED means that the test statement attempted to execute a return
+// statement, which is not allowed; THREW means that the test statement
+// returned control by throwing an exception.  IN_PROGRESS means the test
+// has not yet concluded.
+// TODO(vladl@google.com): Unify names and possibly values for
+// AbortReason, DeathTestOutcome, and flag characters above.
+enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW };
+
+// Routine for aborting the program which is safe to call from an
+// exec-style death test child process, in which case the error
+// message is propagated back to the parent process.  Otherwise, the
+// message is simply printed to stderr.  In either case, the program
+// then exits with status 1.
+void DeathTestAbort(const std::string& message) {
+  // On a POSIX system, this function may be called from a threadsafe-style
+  // death test child process, which operates on a very small stack.  Use
+  // the heap for any additional non-minuscule memory requirements.
+  const InternalRunDeathTestFlag* const flag =
+      GetUnitTestImpl()->internal_run_death_test_flag();
+  if (flag != NULL) {
+    FILE* parent = posix::FDOpen(flag->write_fd(), "w");
+    fputc(kDeathTestInternalError, parent);
+    fprintf(parent, "%s", message.c_str());
+    fflush(parent);
+    _exit(1);
+  } else {
+    fprintf(stderr, "%s", message.c_str());
+    fflush(stderr);
+    posix::Abort();
+  }
+}
+
+// A replacement for CHECK that calls DeathTestAbort if the assertion
+// fails.
+# define GTEST_DEATH_TEST_CHECK_(expression) \
+  do { \
+    if (!::testing::internal::IsTrue(expression)) { \
+      DeathTestAbort( \
+          ::std::string("CHECK failed: File ") + __FILE__ +  ", line " \
+          + ::testing::internal::StreamableToString(__LINE__) + ": " \
+          + #expression); \
+    } \
+  } while (::testing::internal::AlwaysFalse())
+
+// This macro is similar to GTEST_DEATH_TEST_CHECK_, but it is meant for
+// evaluating any system call that fulfills two conditions: it must return
+// -1 on failure, and set errno to EINTR when it is interrupted and
+// should be tried again.  The macro expands to a loop that repeatedly
+// evaluates the expression as long as it evaluates to -1 and sets
+// errno to EINTR.  If the expression evaluates to -1 but errno is
+// something other than EINTR, DeathTestAbort is called.
+# define GTEST_DEATH_TEST_CHECK_SYSCALL_(expression) \
+  do { \
+    int gtest_retval; \
+    do { \
+      gtest_retval = (expression); \
+    } while (gtest_retval == -1 && errno == EINTR); \
+    if (gtest_retval == -1) { \
+      DeathTestAbort( \
+          ::std::string("CHECK failed: File ") + __FILE__ + ", line " \
+          + ::testing::internal::StreamableToString(__LINE__) + ": " \
+          + #expression + " != -1"); \
+    } \
+  } while (::testing::internal::AlwaysFalse())
+
+// Returns the message describing the last system error in errno.
+std::string GetLastErrnoDescription() {
+    return errno == 0 ? "" : posix::StrError(errno);
+}
+
+// This is called from a death test parent process to read a failure
+// message from the death test child process and log it with the FATAL
+// severity. On Windows, the message is read from a pipe handle. On other
+// platforms, it is read from a file descriptor.
+static void FailFromInternalError(int fd) {
+  Message error;
+  char buffer[256];
+  int num_read;
+
+  do {
+    while ((num_read = posix::Read(fd, buffer, 255)) > 0) {
+      buffer[num_read] = '\0';
+      error << buffer;
+    }
+  } while (num_read == -1 && errno == EINTR);
+
+  if (num_read == 0) {
+    GTEST_LOG_(FATAL) << error.GetString();
+  } else {
+    const int last_error = errno;
+    GTEST_LOG_(FATAL) << "Error while reading death test internal: "
+                      << GetLastErrnoDescription() << " [" << last_error << "]";
+  }
+}
+
+// Death test constructor.  Increments the running death test count
+// for the current test.
+DeathTest::DeathTest() {
+  TestInfo* const info = GetUnitTestImpl()->current_test_info();
+  if (info == NULL) {
+    DeathTestAbort("Cannot run a death test outside of a TEST or "
+                   "TEST_F construct");
+  }
+}
+
+// Creates and returns a death test by dispatching to the current
+// death test factory.
+bool DeathTest::Create(const char* statement, const RE* regex,
+                       const char* file, int line, DeathTest** test) {
+  return GetUnitTestImpl()->death_test_factory()->Create(
+      statement, regex, file, line, test);
+}
+
+const char* DeathTest::LastMessage() {
+  return last_death_test_message_.c_str();
+}
+
+void DeathTest::set_last_death_test_message(const std::string& message) {
+  last_death_test_message_ = message;
+}
+
+std::string DeathTest::last_death_test_message_;
+
+// Provides cross platform implementation for some death functionality.
+class DeathTestImpl : public DeathTest {
+ protected:
+  DeathTestImpl(const char* a_statement, const RE* a_regex)
+      : statement_(a_statement),
+        regex_(a_regex),
+        spawned_(false),
+        status_(-1),
+        outcome_(IN_PROGRESS),
+        read_fd_(-1),
+        write_fd_(-1) {}
+
+  // read_fd_ is expected to be closed and cleared by a derived class.
+  ~DeathTestImpl() { GTEST_DEATH_TEST_CHECK_(read_fd_ == -1); }
+
+  void Abort(AbortReason reason);
+  virtual bool Passed(bool status_ok);
+
+  const char* statement() const { return statement_; }
+  const RE* regex() const { return regex_; }
+  bool spawned() const { return spawned_; }
+  void set_spawned(bool is_spawned) { spawned_ = is_spawned; }
+  int status() const { return status_; }
+  void set_status(int a_status) { status_ = a_status; }
+  DeathTestOutcome outcome() const { return outcome_; }
+  void set_outcome(DeathTestOutcome an_outcome) { outcome_ = an_outcome; }
+  int read_fd() const { return read_fd_; }
+  void set_read_fd(int fd) { read_fd_ = fd; }
+  int write_fd() const { return write_fd_; }
+  void set_write_fd(int fd) { write_fd_ = fd; }
+
+  // Called in the parent process only. Reads the result code of the death
+  // test child process via a pipe, interprets it to set the outcome_
+  // member, and closes read_fd_.  Outputs diagnostics and terminates in
+  // case of unexpected codes.
+  void ReadAndInterpretStatusByte();
+
+ private:
+  // The textual content of the code this object is testing.  This class
+  // doesn't own this string and should not attempt to delete it.
+  const char* const statement_;
+  // The regular expression which test output must match.  DeathTestImpl
+  // doesn't own this object and should not attempt to delete it.
+  const RE* const regex_;
+  // True if the death test child process has been successfully spawned.
+  bool spawned_;
+  // The exit status of the child process.
+  int status_;
+  // How the death test concluded.
+  DeathTestOutcome outcome_;
+  // Descriptor to the read end of the pipe to the child process.  It is
+  // always -1 in the child process.  The child keeps its write end of the
+  // pipe in write_fd_.
+  int read_fd_;
+  // Descriptor to the child's write end of the pipe to the parent process.
+  // It is always -1 in the parent process.  The parent keeps its end of the
+  // pipe in read_fd_.
+  int write_fd_;
+};
+
+// Called in the parent process only. Reads the result code of the death
+// test child process via a pipe, interprets it to set the outcome_
+// member, and closes read_fd_.  Outputs diagnostics and terminates in
+// case of unexpected codes.
+void DeathTestImpl::ReadAndInterpretStatusByte() {
+  char flag;
+  int bytes_read;
+
+  // The read() here blocks until data is available (signifying the
+  // failure of the death test) or until the pipe is closed (signifying
+  // its success), so it's okay to call this in the parent before
+  // the child process has exited.
+  do {
+    bytes_read = posix::Read(read_fd(), &flag, 1);
+  } while (bytes_read == -1 && errno == EINTR);
+
+  if (bytes_read == 0) {
+    set_outcome(DIED);
+  } else if (bytes_read == 1) {
+    switch (flag) {
+      case kDeathTestReturned:
+        set_outcome(RETURNED);
+        break;
+      case kDeathTestThrew:
+        set_outcome(THREW);
+        break;
+      case kDeathTestLived:
+        set_outcome(LIVED);
+        break;
+      case kDeathTestInternalError:
+        FailFromInternalError(read_fd());  // Does not return.
+        break;
+      default:
+        GTEST_LOG_(FATAL) << "Death test child process reported "
+                          << "unexpected status byte ("
+                          << static_cast<unsigned int>(flag) << ")";
+    }
+  } else {
+    GTEST_LOG_(FATAL) << "Read from death test child process failed: "
+                      << GetLastErrnoDescription();
+  }
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(read_fd()));
+  set_read_fd(-1);
+}
+
+// Signals that the death test code which should have exited, didn't.
+// Should be called only in a death test child process.
+// Writes a status byte to the child's status file descriptor, then
+// calls _exit(1).
+void DeathTestImpl::Abort(AbortReason reason) {
+  // The parent process considers the death test to be a failure if
+  // it finds any data in our pipe.  So, here we write a single flag byte
+  // to the pipe, then exit.
+  const char status_ch =
+      reason == TEST_DID_NOT_DIE ? kDeathTestLived :
+      reason == TEST_THREW_EXCEPTION ? kDeathTestThrew : kDeathTestReturned;
+
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Write(write_fd(), &status_ch, 1));
+  // We are leaking the descriptor here because on some platforms (i.e.,
+  // when built as Windows DLL), destructors of global objects will still
+  // run after calling _exit(). On such systems, write_fd_ will be
+  // indirectly closed from the destructor of UnitTestImpl, causing double
+  // close if it is also closed here. On debug configurations, double close
+  // may assert. As there are no in-process buffers to flush here, we are
+  // relying on the OS to close the descriptor after the process terminates
+  // when the destructors are not run.
+  _exit(1);  // Exits w/o any normal exit hooks (we were supposed to crash)
+}
+
+// Returns an indented copy of stderr output for a death test.
+// This makes distinguishing death test output lines from regular log lines
+// much easier.
+static ::std::string FormatDeathTestOutput(const ::std::string& output) {
+  ::std::string ret;
+  for (size_t at = 0; ; ) {
+    const size_t line_end = output.find('\n', at);
+    ret += "[  DEATH   ] ";
+    if (line_end == ::std::string::npos) {
+      ret += output.substr(at);
+      break;
+    }
+    ret += output.substr(at, line_end + 1 - at);
+    at = line_end + 1;
+  }
+  return ret;
+}
+
+// Assesses the success or failure of a death test, using both private
+// members which have previously been set, and one argument:
+//
+// Private data members:
+//   outcome:  An enumeration describing how the death test
+//             concluded: DIED, LIVED, THREW, or RETURNED.  The death test
+//             fails in the latter three cases.
+//   status:   The exit status of the child process. On *nix, it is in the
+//             in the format specified by wait(2). On Windows, this is the
+//             value supplied to the ExitProcess() API or a numeric code
+//             of the exception that terminated the program.
+//   regex:    A regular expression object to be applied to
+//             the test's captured standard error output; the death test
+//             fails if it does not match.
+//
+// Argument:
+//   status_ok: true if exit_status is acceptable in the context of
+//              this particular death test, which fails if it is false
+//
+// Returns true iff all of the above conditions are met.  Otherwise, the
+// first failing condition, in the order given above, is the one that is
+// reported. Also sets the last death test message string.
+bool DeathTestImpl::Passed(bool status_ok) {
+  if (!spawned())
+    return false;
+
+  const std::string error_message = GetCapturedStderr();
+
+  bool success = false;
+  Message buffer;
+
+  buffer << "Death test: " << statement() << "\n";
+  switch (outcome()) {
+    case LIVED:
+      buffer << "    Result: failed to die.\n"
+             << " Error msg:\n" << FormatDeathTestOutput(error_message);
+      break;
+    case THREW:
+      buffer << "    Result: threw an exception.\n"
+             << " Error msg:\n" << FormatDeathTestOutput(error_message);
+      break;
+    case RETURNED:
+      buffer << "    Result: illegal return in test statement.\n"
+             << " Error msg:\n" << FormatDeathTestOutput(error_message);
+      break;
+    case DIED:
+      if (status_ok) {
+        const bool matched = RE::PartialMatch(error_message.c_str(), *regex());
+        if (matched) {
+          success = true;
+        } else {
+          buffer << "    Result: died but not with expected error.\n"
+                 << "  Expected: " << regex()->pattern() << "\n"
+                 << "Actual msg:\n" << FormatDeathTestOutput(error_message);
+        }
+      } else {
+        buffer << "    Result: died but not with expected exit code:\n"
+               << "            " << ExitSummary(status()) << "\n"
+               << "Actual msg:\n" << FormatDeathTestOutput(error_message);
+      }
+      break;
+    case IN_PROGRESS:
+    default:
+      GTEST_LOG_(FATAL)
+          << "DeathTest::Passed somehow called before conclusion of test";
+  }
+
+  DeathTest::set_last_death_test_message(buffer.GetString());
+  return success;
+}
+
+# if GTEST_OS_WINDOWS
+// WindowsDeathTest implements death tests on Windows. Due to the
+// specifics of starting new processes on Windows, death tests there are
+// always threadsafe, and Google Test considers the
+// --gtest_death_test_style=fast setting to be equivalent to
+// --gtest_death_test_style=threadsafe there.
+//
+// A few implementation notes:  Like the Linux version, the Windows
+// implementation uses pipes for child-to-parent communication. But due to
+// the specifics of pipes on Windows, some extra steps are required:
+//
+// 1. The parent creates a communication pipe and stores handles to both
+//    ends of it.
+// 2. The parent starts the child and provides it with the information
+//    necessary to acquire the handle to the write end of the pipe.
+// 3. The child acquires the write end of the pipe and signals the parent
+//    using a Windows event.
+// 4. Now the parent can release the write end of the pipe on its side. If
+//    this is done before step 3, the object's reference count goes down to
+//    0 and it is destroyed, preventing the child from acquiring it. The
+//    parent now has to release it, or read operations on the read end of
+//    the pipe will not return when the child terminates.
+// 5. The parent reads child's output through the pipe (outcome code and
+//    any possible error messages) from the pipe, and its stderr and then
+//    determines whether to fail the test.
+//
+// Note: to distinguish Win32 API calls from the local method and function
+// calls, the former are explicitly resolved in the global namespace.
+//
+class WindowsDeathTest : public DeathTestImpl {
+ public:
+  WindowsDeathTest(const char* a_statement,
+                   const RE* a_regex,
+                   const char* file,
+                   int line)
+      : DeathTestImpl(a_statement, a_regex), file_(file), line_(line) {}
+
+  // All of these virtual functions are inherited from DeathTest.
+  virtual int Wait();
+  virtual TestRole AssumeRole();
+
+ private:
+  // The name of the file in which the death test is located.
+  const char* const file_;
+  // The line number on which the death test is located.
+  const int line_;
+  // Handle to the write end of the pipe to the child process.
+  AutoHandle write_handle_;
+  // Child process handle.
+  AutoHandle child_handle_;
+  // Event the child process uses to signal the parent that it has
+  // acquired the handle to the write end of the pipe. After seeing this
+  // event the parent can release its own handles to make sure its
+  // ReadFile() calls return when the child terminates.
+  AutoHandle event_handle_;
+};
+
+// Waits for the child in a death test to exit, returning its exit
+// status, or 0 if no child process exists.  As a side effect, sets the
+// outcome data member.
+int WindowsDeathTest::Wait() {
+  if (!spawned())
+    return 0;
+
+  // Wait until the child either signals that it has acquired the write end
+  // of the pipe or it dies.
+  const HANDLE wait_handles[2] = { child_handle_.Get(), event_handle_.Get() };
+  switch (::WaitForMultipleObjects(2,
+                                   wait_handles,
+                                   FALSE,  // Waits for any of the handles.
+                                   INFINITE)) {
+    case WAIT_OBJECT_0:
+    case WAIT_OBJECT_0 + 1:
+      break;
+    default:
+      GTEST_DEATH_TEST_CHECK_(false);  // Should not get here.
+  }
+
+  // The child has acquired the write end of the pipe or exited.
+  // We release the handle on our side and continue.
+  write_handle_.Reset();
+  event_handle_.Reset();
+
+  ReadAndInterpretStatusByte();
+
+  // Waits for the child process to exit if it haven't already. This
+  // returns immediately if the child has already exited, regardless of
+  // whether previous calls to WaitForMultipleObjects synchronized on this
+  // handle or not.
+  GTEST_DEATH_TEST_CHECK_(
+      WAIT_OBJECT_0 == ::WaitForSingleObject(child_handle_.Get(),
+                                             INFINITE));
+  DWORD status_code;
+  GTEST_DEATH_TEST_CHECK_(
+      ::GetExitCodeProcess(child_handle_.Get(), &status_code) != FALSE);
+  child_handle_.Reset();
+  set_status(static_cast<int>(status_code));
+  return status();
+}
+
+// The AssumeRole process for a Windows death test.  It creates a child
+// process with the same executable as the current process to run the
+// death test.  The child process is given the --gtest_filter and
+// --gtest_internal_run_death_test flags such that it knows to run the
+// current death test only.
+DeathTest::TestRole WindowsDeathTest::AssumeRole() {
+  const UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const TestInfo* const info = impl->current_test_info();
+  const int death_test_index = info->result()->death_test_count();
+
+  if (flag != NULL) {
+    // ParseInternalRunDeathTestFlag() has performed all the necessary
+    // processing.
+    set_write_fd(flag->write_fd());
+    return EXECUTE_TEST;
+  }
+
+  // WindowsDeathTest uses an anonymous pipe to communicate results of
+  // a death test.
+  SECURITY_ATTRIBUTES handles_are_inheritable = {
+    sizeof(SECURITY_ATTRIBUTES), NULL, TRUE };
+  HANDLE read_handle, write_handle;
+  GTEST_DEATH_TEST_CHECK_(
+      ::CreatePipe(&read_handle, &write_handle, &handles_are_inheritable,
+                   0)  // Default buffer size.
+      != FALSE);
+  set_read_fd(::_open_osfhandle(reinterpret_cast<intptr_t>(read_handle),
+                                O_RDONLY));
+  write_handle_.Reset(write_handle);
+  event_handle_.Reset(::CreateEvent(
+      &handles_are_inheritable,
+      TRUE,    // The event will automatically reset to non-signaled state.
+      FALSE,   // The initial state is non-signalled.
+      NULL));  // The even is unnamed.
+  GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != NULL);
+  const std::string filter_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" +
+      info->test_case_name() + "." + info->name();
+  const std::string internal_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag +
+      "=" + file_ + "|" + StreamableToString(line_) + "|" +
+      StreamableToString(death_test_index) + "|" +
+      StreamableToString(static_cast<unsigned int>(::GetCurrentProcessId())) +
+      // size_t has the same width as pointers on both 32-bit and 64-bit
+      // Windows platforms.
+      // See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx.
+      "|" + StreamableToString(reinterpret_cast<size_t>(write_handle)) +
+      "|" + StreamableToString(reinterpret_cast<size_t>(event_handle_.Get()));
+
+  char executable_path[_MAX_PATH + 1];  // NOLINT
+  GTEST_DEATH_TEST_CHECK_(
+      _MAX_PATH + 1 != ::GetModuleFileNameA(NULL,
+                                            executable_path,
+                                            _MAX_PATH));
+
+  std::string command_line =
+      std::string(::GetCommandLineA()) + " " + filter_flag + " \"" +
+      internal_flag + "\"";
+
+  DeathTest::set_last_death_test_message("");
+
+  CaptureStderr();
+  // Flush the log buffers since the log streams are shared with the child.
+  FlushInfoLog();
+
+  // The child process will share the standard handles with the parent.
+  STARTUPINFOA startup_info;
+  memset(&startup_info, 0, sizeof(STARTUPINFO));
+  startup_info.dwFlags = STARTF_USESTDHANDLES;
+  startup_info.hStdInput = ::GetStdHandle(STD_INPUT_HANDLE);
+  startup_info.hStdOutput = ::GetStdHandle(STD_OUTPUT_HANDLE);
+  startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE);
+
+  PROCESS_INFORMATION process_info;
+  GTEST_DEATH_TEST_CHECK_(::CreateProcessA(
+      executable_path,
+      const_cast<char*>(command_line.c_str()),
+      NULL,   // Retuned process handle is not inheritable.
+      NULL,   // Retuned thread handle is not inheritable.
+      TRUE,   // Child inherits all inheritable handles (for write_handle_).
+      0x0,    // Default creation flags.
+      NULL,   // Inherit the parent's environment.
+      UnitTest::GetInstance()->original_working_dir(),
+      &startup_info,
+      &process_info) != FALSE);
+  child_handle_.Reset(process_info.hProcess);
+  ::CloseHandle(process_info.hThread);
+  set_spawned(true);
+  return OVERSEE_TEST;
+}
+# else  // We are not on Windows.
+
+// ForkingDeathTest provides implementations for most of the abstract
+// methods of the DeathTest interface.  Only the AssumeRole method is
+// left undefined.
+class ForkingDeathTest : public DeathTestImpl {
+ public:
+  ForkingDeathTest(const char* statement, const RE* regex);
+
+  // All of these virtual functions are inherited from DeathTest.
+  virtual int Wait();
+
+ protected:
+  void set_child_pid(pid_t child_pid) { child_pid_ = child_pid; }
+
+ private:
+  // PID of child process during death test; 0 in the child process itself.
+  pid_t child_pid_;
+};
+
+// Constructs a ForkingDeathTest.
+ForkingDeathTest::ForkingDeathTest(const char* a_statement, const RE* a_regex)
+    : DeathTestImpl(a_statement, a_regex),
+      child_pid_(-1) {}
+
+// Waits for the child in a death test to exit, returning its exit
+// status, or 0 if no child process exists.  As a side effect, sets the
+// outcome data member.
+int ForkingDeathTest::Wait() {
+  if (!spawned())
+    return 0;
+
+  ReadAndInterpretStatusByte();
+
+  int status_value;
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(waitpid(child_pid_, &status_value, 0));
+  set_status(status_value);
+  return status_value;
+}
+
+// A concrete death test class that forks, then immediately runs the test
+// in the child process.
+class NoExecDeathTest : public ForkingDeathTest {
+ public:
+  NoExecDeathTest(const char* a_statement, const RE* a_regex) :
+      ForkingDeathTest(a_statement, a_regex) { }
+  virtual TestRole AssumeRole();
+};
+
+// The AssumeRole process for a fork-and-run death test.  It implements a
+// straightforward fork, with a simple pipe to transmit the status byte.
+DeathTest::TestRole NoExecDeathTest::AssumeRole() {
+  const size_t thread_count = GetThreadCount();
+  if (thread_count != 1) {
+    GTEST_LOG_(WARNING) << DeathTestThreadWarning(thread_count);
+  }
+
+  int pipe_fd[2];
+  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
+
+  DeathTest::set_last_death_test_message("");
+  CaptureStderr();
+  // When we fork the process below, the log file buffers are copied, but the
+  // file descriptors are shared.  We flush all log files here so that closing
+  // the file descriptors in the child process doesn't throw off the
+  // synchronization between descriptors and buffers in the parent process.
+  // This is as close to the fork as possible to avoid a race condition in case
+  // there are multiple threads running before the death test, and another
+  // thread writes to the log file.
+  FlushInfoLog();
+
+  const pid_t child_pid = fork();
+  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
+  set_child_pid(child_pid);
+  if (child_pid == 0) {
+    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[0]));
+    set_write_fd(pipe_fd[1]);
+    // Redirects all logging to stderr in the child process to prevent
+    // concurrent writes to the log files.  We capture stderr in the parent
+    // process and append the child process' output to a log.
+    LogToStderr();
+    // Event forwarding to the listeners of event listener API mush be shut
+    // down in death test subprocesses.
+    GetUnitTestImpl()->listeners()->SuppressEventForwarding();
+    g_in_fast_death_test_child = true;
+    return EXECUTE_TEST;
+  } else {
+    GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
+    set_read_fd(pipe_fd[0]);
+    set_spawned(true);
+    return OVERSEE_TEST;
+  }
+}
+
+// A concrete death test class that forks and re-executes the main
+// program from the beginning, with command-line flags set that cause
+// only this specific death test to be run.
+class ExecDeathTest : public ForkingDeathTest {
+ public:
+  ExecDeathTest(const char* a_statement, const RE* a_regex,
+                const char* file, int line) :
+      ForkingDeathTest(a_statement, a_regex), file_(file), line_(line) { }
+  virtual TestRole AssumeRole();
+ private:
+  static ::std::vector<testing::internal::string>
+  GetArgvsForDeathTestChildProcess() {
+    ::std::vector<testing::internal::string> args = GetInjectableArgvs();
+#  if defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
+    ::std::vector<testing::internal::string> extra_args =
+        GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_();
+    args.insert(args.end(), extra_args.begin(), extra_args.end());
+#  endif  // defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_)
+    return args;
+  }
+  // The name of the file in which the death test is located.
+  const char* const file_;
+  // The line number on which the death test is located.
+  const int line_;
+};
+
+// Utility class for accumulating command-line arguments.
+class Arguments {
+ public:
+  Arguments() {
+    args_.push_back(NULL);
+  }
+
+  ~Arguments() {
+    for (std::vector<char*>::iterator i = args_.begin(); i != args_.end();
+         ++i) {
+      free(*i);
+    }
+  }
+  void AddArgument(const char* argument) {
+    args_.insert(args_.end() - 1, posix::StrDup(argument));
+  }
+
+  template <typename Str>
+  void AddArguments(const ::std::vector<Str>& arguments) {
+    for (typename ::std::vector<Str>::const_iterator i = arguments.begin();
+         i != arguments.end();
+         ++i) {
+      args_.insert(args_.end() - 1, posix::StrDup(i->c_str()));
+    }
+  }
+  char* const* Argv() {
+    return &args_[0];
+  }
+
+ private:
+  std::vector<char*> args_;
+};
+
+// A struct that encompasses the arguments to the child process of a
+// threadsafe-style death test process.
+struct ExecDeathTestArgs {
+  char* const* argv;  // Command-line arguments for the child's call to exec
+  int close_fd;       // File descriptor to close; the read end of a pipe
+};
+
+#  if GTEST_OS_MAC
+inline char** GetEnviron() {
+  // When Google Test is built as a framework on MacOS X, the environ variable
+  // is unavailable. Apple's documentation (man environ) recommends using
+  // _NSGetEnviron() instead.
+  return *_NSGetEnviron();
+}
+#  else
+// Some POSIX platforms expect you to declare environ. extern "C" makes
+// it reside in the global namespace.
+extern "C" char** environ;
+inline char** GetEnviron() { return environ; }
+#  endif  // GTEST_OS_MAC
+
+#  if !GTEST_OS_QNX
+// The main function for a threadsafe-style death test child process.
+// This function is called in a clone()-ed process and thus must avoid
+// any potentially unsafe operations like malloc or libc functions.
+static int ExecDeathTestChildMain(void* child_arg) {
+  ExecDeathTestArgs* const args = static_cast<ExecDeathTestArgs*>(child_arg);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(args->close_fd));
+
+  // We need to execute the test program in the same environment where
+  // it was originally invoked.  Therefore we change to the original
+  // working directory first.
+  const char* const original_dir =
+      UnitTest::GetInstance()->original_working_dir();
+  // We can safely call chdir() as it's a direct system call.
+  if (chdir(original_dir) != 0) {
+    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
+                   GetLastErrnoDescription());
+    return EXIT_FAILURE;
+  }
+
+  // We can safely call execve() as it's a direct system call.  We
+  // cannot use execvp() as it's a libc function and thus potentially
+  // unsafe.  Since execve() doesn't search the PATH, the user must
+  // invoke the test program via a valid path that contains at least
+  // one path separator.
+  execve(args->argv[0], args->argv, GetEnviron());
+  DeathTestAbort(std::string("execve(") + args->argv[0] + ", ...) in " +
+                 original_dir + " failed: " +
+                 GetLastErrnoDescription());
+  return EXIT_FAILURE;
+}
+#  endif  // !GTEST_OS_QNX
+
+// Two utility routines that together determine the direction the stack
+// grows.
+// This could be accomplished more elegantly by a single recursive
+// function, but we want to guard against the unlikely possibility of
+// a smart compiler optimizing the recursion away.
+//
+// GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining
+// StackLowerThanAddress into StackGrowsDown, which then doesn't give
+// correct answer.
+void StackLowerThanAddress(const void* ptr, bool* result) GTEST_NO_INLINE_;
+void StackLowerThanAddress(const void* ptr, bool* result) {
+  int dummy;
+  *result = (&dummy < ptr);
+}
+
+// Make sure AddressSanitizer does not tamper with the stack here.
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+bool StackGrowsDown() {
+  int dummy;
+  bool result;
+  StackLowerThanAddress(&dummy, &result);
+  return result;
+}
+
+// Spawns a child process with the same executable as the current process in
+// a thread-safe manner and instructs it to run the death test.  The
+// implementation uses fork(2) + exec.  On systems where clone(2) is
+// available, it is used instead, being slightly more thread-safe.  On QNX,
+// fork supports only single-threaded environments, so this function uses
+// spawn(2) there instead.  The function dies with an error message if
+// anything goes wrong.
+static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
+  ExecDeathTestArgs args = { argv, close_fd };
+  pid_t child_pid = -1;
+
+#  if GTEST_OS_QNX
+  // Obtains the current directory and sets it to be closed in the child
+  // process.
+  const int cwd_fd = open(".", O_RDONLY);
+  GTEST_DEATH_TEST_CHECK_(cwd_fd != -1);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(cwd_fd, F_SETFD, FD_CLOEXEC));
+  // We need to execute the test program in the same environment where
+  // it was originally invoked.  Therefore we change to the original
+  // working directory first.
+  const char* const original_dir =
+      UnitTest::GetInstance()->original_working_dir();
+  // We can safely call chdir() as it's a direct system call.
+  if (chdir(original_dir) != 0) {
+    DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " +
+                   GetLastErrnoDescription());
+    return EXIT_FAILURE;
+  }
+
+  int fd_flags;
+  // Set close_fd to be closed after spawn.
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(fd_flags = fcntl(close_fd, F_GETFD));
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(close_fd, F_SETFD,
+                                        fd_flags | FD_CLOEXEC));
+  struct inheritance inherit = {0};
+  // spawn is a system call.
+  child_pid = spawn(args.argv[0], 0, NULL, &inherit, args.argv, GetEnviron());
+  // Restores the current working directory.
+  GTEST_DEATH_TEST_CHECK_(fchdir(cwd_fd) != -1);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(cwd_fd));
+
+#  else   // GTEST_OS_QNX
+#   if GTEST_OS_LINUX
+  // When a SIGPROF signal is received while fork() or clone() are executing,
+  // the process may hang. To avoid this, we ignore SIGPROF here and re-enable
+  // it after the call to fork()/clone() is complete.
+  struct sigaction saved_sigprof_action;
+  struct sigaction ignore_sigprof_action;
+  memset(&ignore_sigprof_action, 0, sizeof(ignore_sigprof_action));
+  sigemptyset(&ignore_sigprof_action.sa_mask);
+  ignore_sigprof_action.sa_handler = SIG_IGN;
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(sigaction(
+      SIGPROF, &ignore_sigprof_action, &saved_sigprof_action));
+#   endif  // GTEST_OS_LINUX
+
+#   if GTEST_HAS_CLONE
+  const bool use_fork = GTEST_FLAG(death_test_use_fork);
+
+  if (!use_fork) {
+    static const bool stack_grows_down = StackGrowsDown();
+    const size_t stack_size = getpagesize();
+    // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
+    void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
+                             MAP_ANON | MAP_PRIVATE, -1, 0);
+    GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED);
+
+    // Maximum stack alignment in bytes:  For a downward-growing stack, this
+    // amount is subtracted from size of the stack space to get an address
+    // that is within the stack space and is aligned on all systems we care
+    // about.  As far as I know there is no ABI with stack alignment greater
+    // than 64.  We assume stack and stack_size already have alignment of
+    // kMaxStackAlignment.
+    const size_t kMaxStackAlignment = 64;
+    void* const stack_top =
+        static_cast<char*>(stack) +
+            (stack_grows_down ? stack_size - kMaxStackAlignment : 0);
+    GTEST_DEATH_TEST_CHECK_(stack_size > kMaxStackAlignment &&
+        reinterpret_cast<intptr_t>(stack_top) % kMaxStackAlignment == 0);
+
+    child_pid = clone(&ExecDeathTestChildMain, stack_top, SIGCHLD, &args);
+
+    GTEST_DEATH_TEST_CHECK_(munmap(stack, stack_size) != -1);
+  }
+#   else
+  const bool use_fork = true;
+#   endif  // GTEST_HAS_CLONE
+
+  if (use_fork && (child_pid = fork()) == 0) {
+      ExecDeathTestChildMain(&args);
+      _exit(0);
+  }
+#  endif  // GTEST_OS_QNX
+#  if GTEST_OS_LINUX
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(
+      sigaction(SIGPROF, &saved_sigprof_action, NULL));
+#  endif  // GTEST_OS_LINUX
+
+  GTEST_DEATH_TEST_CHECK_(child_pid != -1);
+  return child_pid;
+}
+
+// The AssumeRole process for a fork-and-exec death test.  It re-executes the
+// main program from the beginning, setting the --gtest_filter
+// and --gtest_internal_run_death_test flags to cause only the current
+// death test to be re-run.
+DeathTest::TestRole ExecDeathTest::AssumeRole() {
+  const UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const TestInfo* const info = impl->current_test_info();
+  const int death_test_index = info->result()->death_test_count();
+
+  if (flag != NULL) {
+    set_write_fd(flag->write_fd());
+    return EXECUTE_TEST;
+  }
+
+  int pipe_fd[2];
+  GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1);
+  // Clear the close-on-exec flag on the write end of the pipe, lest
+  // it be closed when the child process does an exec:
+  GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1);
+
+  const std::string filter_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "="
+      + info->test_case_name() + "." + info->name();
+  const std::string internal_flag =
+      std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "="
+      + file_ + "|" + StreamableToString(line_) + "|"
+      + StreamableToString(death_test_index) + "|"
+      + StreamableToString(pipe_fd[1]);
+  Arguments args;
+  args.AddArguments(GetArgvsForDeathTestChildProcess());
+  args.AddArgument(filter_flag.c_str());
+  args.AddArgument(internal_flag.c_str());
+
+  DeathTest::set_last_death_test_message("");
+
+  CaptureStderr();
+  // See the comment in NoExecDeathTest::AssumeRole for why the next line
+  // is necessary.
+  FlushInfoLog();
+
+  const pid_t child_pid = ExecDeathTestSpawnChild(args.Argv(), pipe_fd[0]);
+  GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1]));
+  set_child_pid(child_pid);
+  set_read_fd(pipe_fd[0]);
+  set_spawned(true);
+  return OVERSEE_TEST;
+}
+
+# endif  // !GTEST_OS_WINDOWS
+
+// Creates a concrete DeathTest-derived class that depends on the
+// --gtest_death_test_style flag, and sets the pointer pointed to
+// by the "test" argument to its address.  If the test should be
+// skipped, sets that pointer to NULL.  Returns true, unless the
+// flag is set to an invalid value.
+bool DefaultDeathTestFactory::Create(const char* statement, const RE* regex,
+                                     const char* file, int line,
+                                     DeathTest** test) {
+  UnitTestImpl* const impl = GetUnitTestImpl();
+  const InternalRunDeathTestFlag* const flag =
+      impl->internal_run_death_test_flag();
+  const int death_test_index = impl->current_test_info()
+      ->increment_death_test_count();
+
+  if (flag != NULL) {
+    if (death_test_index > flag->index()) {
+      DeathTest::set_last_death_test_message(
+          "Death test count (" + StreamableToString(death_test_index)
+          + ") somehow exceeded expected maximum ("
+          + StreamableToString(flag->index()) + ")");
+      return false;
+    }
+
+    if (!(flag->file() == file && flag->line() == line &&
+          flag->index() == death_test_index)) {
+      *test = NULL;
+      return true;
+    }
+  }
+
+# if GTEST_OS_WINDOWS
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe" ||
+      GTEST_FLAG(death_test_style) == "fast") {
+    *test = new WindowsDeathTest(statement, regex, file, line);
+  }
+
+# else
+
+  if (GTEST_FLAG(death_test_style) == "threadsafe") {
+    *test = new ExecDeathTest(statement, regex, file, line);
+  } else if (GTEST_FLAG(death_test_style) == "fast") {
+    *test = new NoExecDeathTest(statement, regex);
+  }
+
+# endif  // GTEST_OS_WINDOWS
+
+  else {  // NOLINT - this is more readable than unbalanced brackets inside #if.
+    DeathTest::set_last_death_test_message(
+        "Unknown death test style \"" + GTEST_FLAG(death_test_style)
+        + "\" encountered");
+    return false;
+  }
+
+  return true;
+}
+
+# if GTEST_OS_WINDOWS
+// Recreates the pipe and event handles from the provided parameters,
+// signals the event, and returns a file descriptor wrapped around the pipe
+// handle. This function is called in the child process only.
+int GetStatusFileDescriptor(unsigned int parent_process_id,
+                            size_t write_handle_as_size_t,
+                            size_t event_handle_as_size_t) {
+  AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE,
+                                                   FALSE,  // Non-inheritable.
+                                                   parent_process_id));
+  if (parent_process_handle.Get() == INVALID_HANDLE_VALUE) {
+    DeathTestAbort("Unable to open parent process " +
+                   StreamableToString(parent_process_id));
+  }
+
+  // TODO(vladl@google.com): Replace the following check with a
+  // compile-time assertion when available.
+  GTEST_CHECK_(sizeof(HANDLE) <= sizeof(size_t));
+
+  const HANDLE write_handle =
+      reinterpret_cast<HANDLE>(write_handle_as_size_t);
+  HANDLE dup_write_handle;
+
+  // The newly initialized handle is accessible only in in the parent
+  // process. To obtain one accessible within the child, we need to use
+  // DuplicateHandle.
+  if (!::DuplicateHandle(parent_process_handle.Get(), write_handle,
+                         ::GetCurrentProcess(), &dup_write_handle,
+                         0x0,    // Requested privileges ignored since
+                                 // DUPLICATE_SAME_ACCESS is used.
+                         FALSE,  // Request non-inheritable handler.
+                         DUPLICATE_SAME_ACCESS)) {
+    DeathTestAbort("Unable to duplicate the pipe handle " +
+                   StreamableToString(write_handle_as_size_t) +
+                   " from the parent process " +
+                   StreamableToString(parent_process_id));
+  }
+
+  const HANDLE event_handle = reinterpret_cast<HANDLE>(event_handle_as_size_t);
+  HANDLE dup_event_handle;
+
+  if (!::DuplicateHandle(parent_process_handle.Get(), event_handle,
+                         ::GetCurrentProcess(), &dup_event_handle,
+                         0x0,
+                         FALSE,
+                         DUPLICATE_SAME_ACCESS)) {
+    DeathTestAbort("Unable to duplicate the event handle " +
+                   StreamableToString(event_handle_as_size_t) +
+                   " from the parent process " +
+                   StreamableToString(parent_process_id));
+  }
+
+  const int write_fd =
+      ::_open_osfhandle(reinterpret_cast<intptr_t>(dup_write_handle), O_APPEND);
+  if (write_fd == -1) {
+    DeathTestAbort("Unable to convert pipe handle " +
+                   StreamableToString(write_handle_as_size_t) +
+                   " to a file descriptor");
+  }
+
+  // Signals the parent that the write end of the pipe has been acquired
+  // so the parent can release its own write end.
+  ::SetEvent(dup_event_handle);
+
+  return write_fd;
+}
+# endif  // GTEST_OS_WINDOWS
+
+// Returns a newly created InternalRunDeathTestFlag object with fields
+// initialized from the GTEST_FLAG(internal_run_death_test) flag if
+// the flag is specified; otherwise returns NULL.
+InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() {
+  if (GTEST_FLAG(internal_run_death_test) == "") return NULL;
+
+  // GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we
+  // can use it here.
+  int line = -1;
+  int index = -1;
+  ::std::vector< ::std::string> fields;
+  SplitString(GTEST_FLAG(internal_run_death_test).c_str(), '|', &fields);
+  int write_fd = -1;
+
+# if GTEST_OS_WINDOWS
+
+  unsigned int parent_process_id = 0;
+  size_t write_handle_as_size_t = 0;
+  size_t event_handle_as_size_t = 0;
+
+  if (fields.size() != 6
+      || !ParseNaturalNumber(fields[1], &line)
+      || !ParseNaturalNumber(fields[2], &index)
+      || !ParseNaturalNumber(fields[3], &parent_process_id)
+      || !ParseNaturalNumber(fields[4], &write_handle_as_size_t)
+      || !ParseNaturalNumber(fields[5], &event_handle_as_size_t)) {
+    DeathTestAbort("Bad --gtest_internal_run_death_test flag: " +
+                   GTEST_FLAG(internal_run_death_test));
+  }
+  write_fd = GetStatusFileDescriptor(parent_process_id,
+                                     write_handle_as_size_t,
+                                     event_handle_as_size_t);
+# else
+
+  if (fields.size() != 4
+      || !ParseNaturalNumber(fields[1], &line)
+      || !ParseNaturalNumber(fields[2], &index)
+      || !ParseNaturalNumber(fields[3], &write_fd)) {
+    DeathTestAbort("Bad --gtest_internal_run_death_test flag: "
+        + GTEST_FLAG(internal_run_death_test));
+  }
+
+# endif  // GTEST_OS_WINDOWS
+
+  return new InternalRunDeathTestFlag(fields[0], line, index, write_fd);
+}
+
+}  // namespace internal
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-filepath.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-filepath.cc
new file mode 100644
index 0000000000..0292dc1195
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-filepath.cc
@@ -0,0 +1,387 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: keith.ray@gmail.com (Keith Ray)
+
+#include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-filepath.h"
+#include "gtest/internal/gtest-port.h"
+
+#include <stdlib.h>
+
+#if GTEST_OS_WINDOWS_MOBILE
+# include <windows.h>
+#elif GTEST_OS_WINDOWS
+# include <direct.h>
+# include <io.h>
+#elif GTEST_OS_SYMBIAN
+// Symbian OpenC has PATH_MAX in sys/syslimits.h
+# include <sys/syslimits.h>
+#else
+# include <limits.h>
+# include <climits>  // Some Linux distributions define PATH_MAX here.
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+#if GTEST_OS_WINDOWS
+# define GTEST_PATH_MAX_ _MAX_PATH
+#elif defined(PATH_MAX)
+# define GTEST_PATH_MAX_ PATH_MAX
+#elif defined(_XOPEN_PATH_MAX)
+# define GTEST_PATH_MAX_ _XOPEN_PATH_MAX
+#else
+# define GTEST_PATH_MAX_ _POSIX_PATH_MAX
+#endif  // GTEST_OS_WINDOWS
+
+#include "gtest/internal/gtest-string.h"
+
+namespace testing {
+namespace internal {
+
+#if GTEST_OS_WINDOWS
+// On Windows, '\\' is the standard path separator, but many tools and the
+// Windows API also accept '/' as an alternate path separator. Unless otherwise
+// noted, a file path can contain either kind of path separators, or a mixture
+// of them.
+const char kPathSeparator = '\\';
+const char kAlternatePathSeparator = '/';
+const char kAlternatePathSeparatorString[] = "/";
+# if GTEST_OS_WINDOWS_MOBILE
+// Windows CE doesn't have a current directory. You should not use
+// the current directory in tests on Windows CE, but this at least
+// provides a reasonable fallback.
+const char kCurrentDirectoryString[] = "\\";
+// Windows CE doesn't define INVALID_FILE_ATTRIBUTES
+const DWORD kInvalidFileAttributes = 0xffffffff;
+# else
+const char kCurrentDirectoryString[] = ".\\";
+# endif  // GTEST_OS_WINDOWS_MOBILE
+#else
+const char kPathSeparator = '/';
+const char kCurrentDirectoryString[] = "./";
+#endif  // GTEST_OS_WINDOWS
+
+// Returns whether the given character is a valid path separator.
+static bool IsPathSeparator(char c) {
+#if GTEST_HAS_ALT_PATH_SEP_
+  return (c == kPathSeparator) || (c == kAlternatePathSeparator);
+#else
+  return c == kPathSeparator;
+#endif
+}
+
+// Returns the current working directory, or "" if unsuccessful.
+FilePath FilePath::GetCurrentDir() {
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
+  // Windows CE doesn't have a current directory, so we just return
+  // something reasonable.
+  return FilePath(kCurrentDirectoryString);
+#elif GTEST_OS_WINDOWS
+  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
+  return FilePath(_getcwd(cwd, sizeof(cwd)) == NULL ? "" : cwd);
+#else
+  char cwd[GTEST_PATH_MAX_ + 1] = { '\0' };
+  char* result = getcwd(cwd, sizeof(cwd));
+# if GTEST_OS_NACL
+  // getcwd will likely fail in NaCl due to the sandbox, so return something
+  // reasonable. The user may have provided a shim implementation for getcwd,
+  // however, so fallback only when failure is detected.
+  return FilePath(result == NULL ? kCurrentDirectoryString : cwd);
+# endif  // GTEST_OS_NACL
+  return FilePath(result == NULL ? "" : cwd);
+#endif  // GTEST_OS_WINDOWS_MOBILE
+}
+
+// Returns a copy of the FilePath with the case-insensitive extension removed.
+// Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns
+// FilePath("dir/file"). If a case-insensitive extension is not
+// found, returns a copy of the original FilePath.
+FilePath FilePath::RemoveExtension(const char* extension) const {
+  const std::string dot_extension = std::string(".") + extension;
+  if (String::EndsWithCaseInsensitive(pathname_, dot_extension)) {
+    return FilePath(pathname_.substr(
+        0, pathname_.length() - dot_extension.length()));
+  }
+  return *this;
+}
+
+// Returns a pointer to the last occurence of a valid path separator in
+// the FilePath. On Windows, for example, both '/' and '\' are valid path
+// separators. Returns NULL if no path separator was found.
+const char* FilePath::FindLastPathSeparator() const {
+  const char* const last_sep = strrchr(c_str(), kPathSeparator);
+#if GTEST_HAS_ALT_PATH_SEP_
+  const char* const last_alt_sep = strrchr(c_str(), kAlternatePathSeparator);
+  // Comparing two pointers of which only one is NULL is undefined.
+  if (last_alt_sep != NULL &&
+      (last_sep == NULL || last_alt_sep > last_sep)) {
+    return last_alt_sep;
+  }
+#endif
+  return last_sep;
+}
+
+// Returns a copy of the FilePath with the directory part removed.
+// Example: FilePath("path/to/file").RemoveDirectoryName() returns
+// FilePath("file"). If there is no directory part ("just_a_file"), it returns
+// the FilePath unmodified. If there is no file part ("just_a_dir/") it
+// returns an empty FilePath ("").
+// On Windows platform, '\' is the path separator, otherwise it is '/'.
+FilePath FilePath::RemoveDirectoryName() const {
+  const char* const last_sep = FindLastPathSeparator();
+  return last_sep ? FilePath(last_sep + 1) : *this;
+}
+
+// RemoveFileName returns the directory path with the filename removed.
+// Example: FilePath("path/to/file").RemoveFileName() returns "path/to/".
+// If the FilePath is "a_file" or "/a_file", RemoveFileName returns
+// FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does
+// not have a file, like "just/a/dir/", it returns the FilePath unmodified.
+// On Windows platform, '\' is the path separator, otherwise it is '/'.
+FilePath FilePath::RemoveFileName() const {
+  const char* const last_sep = FindLastPathSeparator();
+  std::string dir;
+  if (last_sep) {
+    dir = std::string(c_str(), last_sep + 1 - c_str());
+  } else {
+    dir = kCurrentDirectoryString;
+  }
+  return FilePath(dir);
+}
+
+// Helper functions for naming files in a directory for xml output.
+
+// Given directory = "dir", base_name = "test", number = 0,
+// extension = "xml", returns "dir/test.xml". If number is greater
+// than zero (e.g., 12), returns "dir/test_12.xml".
+// On Windows platform, uses \ as the separator rather than /.
+FilePath FilePath::MakeFileName(const FilePath& directory,
+                                const FilePath& base_name,
+                                int number,
+                                const char* extension) {
+  std::string file;
+  if (number == 0) {
+    file = base_name.string() + "." + extension;
+  } else {
+    file = base_name.string() + "_" + StreamableToString(number)
+        + "." + extension;
+  }
+  return ConcatPaths(directory, FilePath(file));
+}
+
+// Given directory = "dir", relative_path = "test.xml", returns "dir/test.xml".
+// On Windows, uses \ as the separator rather than /.
+FilePath FilePath::ConcatPaths(const FilePath& directory,
+                               const FilePath& relative_path) {
+  if (directory.IsEmpty())
+    return relative_path;
+  const FilePath dir(directory.RemoveTrailingPathSeparator());
+  return FilePath(dir.string() + kPathSeparator + relative_path.string());
+}
+
+// Returns true if pathname describes something findable in the file-system,
+// either a file, directory, or whatever.
+bool FilePath::FileOrDirectoryExists() const {
+#if GTEST_OS_WINDOWS_MOBILE
+  LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str());
+  const DWORD attributes = GetFileAttributes(unicode);
+  delete [] unicode;
+  return attributes != kInvalidFileAttributes;
+#else
+  posix::StatStruct file_stat;
+  return posix::Stat(pathname_.c_str(), &file_stat) == 0;
+#endif  // GTEST_OS_WINDOWS_MOBILE
+}
+
+// Returns true if pathname describes a directory in the file-system
+// that exists.
+bool FilePath::DirectoryExists() const {
+  bool result = false;
+#if GTEST_OS_WINDOWS
+  // Don't strip off trailing separator if path is a root directory on
+  // Windows (like "C:\\").
+  const FilePath& path(IsRootDirectory() ? *this :
+                                           RemoveTrailingPathSeparator());
+#else
+  const FilePath& path(*this);
+#endif
+
+#if GTEST_OS_WINDOWS_MOBILE
+  LPCWSTR unicode = String::AnsiToUtf16(path.c_str());
+  const DWORD attributes = GetFileAttributes(unicode);
+  delete [] unicode;
+  if ((attributes != kInvalidFileAttributes) &&
+      (attributes & FILE_ATTRIBUTE_DIRECTORY)) {
+    result = true;
+  }
+#else
+  posix::StatStruct file_stat;
+  result = posix::Stat(path.c_str(), &file_stat) == 0 &&
+      posix::IsDir(file_stat);
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+  return result;
+}
+
+// Returns true if pathname describes a root directory. (Windows has one
+// root directory per disk drive.)
+bool FilePath::IsRootDirectory() const {
+#if GTEST_OS_WINDOWS
+  // TODO(wan@google.com): on Windows a network share like
+  // \\server\share can be a root directory, although it cannot be the
+  // current directory.  Handle this properly.
+  return pathname_.length() == 3 && IsAbsolutePath();
+#else
+  return pathname_.length() == 1 && IsPathSeparator(pathname_.c_str()[0]);
+#endif
+}
+
+// Returns true if pathname describes an absolute path.
+bool FilePath::IsAbsolutePath() const {
+  const char* const name = pathname_.c_str();
+#if GTEST_OS_WINDOWS
+  return pathname_.length() >= 3 &&
+     ((name[0] >= 'a' && name[0] <= 'z') ||
+      (name[0] >= 'A' && name[0] <= 'Z')) &&
+     name[1] == ':' &&
+     IsPathSeparator(name[2]);
+#else
+  return IsPathSeparator(name[0]);
+#endif
+}
+
+// Returns a pathname for a file that does not currently exist. The pathname
+// will be directory/base_name.extension or
+// directory/base_name_<number>.extension if directory/base_name.extension
+// already exists. The number will be incremented until a pathname is found
+// that does not already exist.
+// Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'.
+// There could be a race condition if two or more processes are calling this
+// function at the same time -- they could both pick the same filename.
+FilePath FilePath::GenerateUniqueFileName(const FilePath& directory,
+                                          const FilePath& base_name,
+                                          const char* extension) {
+  FilePath full_pathname;
+  int number = 0;
+  do {
+    full_pathname.Set(MakeFileName(directory, base_name, number++, extension));
+  } while (full_pathname.FileOrDirectoryExists());
+  return full_pathname;
+}
+
+// Returns true if FilePath ends with a path separator, which indicates that
+// it is intended to represent a directory. Returns false otherwise.
+// This does NOT check that a directory (or file) actually exists.
+bool FilePath::IsDirectory() const {
+  return !pathname_.empty() &&
+         IsPathSeparator(pathname_.c_str()[pathname_.length() - 1]);
+}
+
+// Create directories so that path exists. Returns true if successful or if
+// the directories already exist; returns false if unable to create directories
+// for any reason.
+bool FilePath::CreateDirectoriesRecursively() const {
+  if (!this->IsDirectory()) {
+    return false;
+  }
+
+  if (pathname_.length() == 0 || this->DirectoryExists()) {
+    return true;
+  }
+
+  const FilePath parent(this->RemoveTrailingPathSeparator().RemoveFileName());
+  return parent.CreateDirectoriesRecursively() && this->CreateFolder();
+}
+
+// Create the directory so that path exists. Returns true if successful or
+// if the directory already exists; returns false if unable to create the
+// directory for any reason, including if the parent directory does not
+// exist. Not named "CreateDirectory" because that's a macro on Windows.
+bool FilePath::CreateFolder() const {
+#if GTEST_OS_WINDOWS_MOBILE
+  FilePath removed_sep(this->RemoveTrailingPathSeparator());
+  LPCWSTR unicode = String::AnsiToUtf16(removed_sep.c_str());
+  int result = CreateDirectory(unicode, NULL) ? 0 : -1;
+  delete [] unicode;
+#elif GTEST_OS_WINDOWS
+  int result = _mkdir(pathname_.c_str());
+#else
+  int result = mkdir(pathname_.c_str(), 0777);
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+  if (result == -1) {
+    return this->DirectoryExists();  // An error is OK if the directory exists.
+  }
+  return true;  // No error.
+}
+
+// If input name has a trailing separator character, remove it and return the
+// name, otherwise return the name string unmodified.
+// On Windows platform, uses \ as the separator, other platforms use /.
+FilePath FilePath::RemoveTrailingPathSeparator() const {
+  return IsDirectory()
+      ? FilePath(pathname_.substr(0, pathname_.length() - 1))
+      : *this;
+}
+
+// Removes any redundant separators that might be in the pathname.
+// For example, "bar///foo" becomes "bar/foo". Does not eliminate other
+// redundancies that might be in a pathname involving "." or "..".
+// TODO(wan@google.com): handle Windows network shares (e.g. \\server\share).
+void FilePath::Normalize() {
+  if (pathname_.c_str() == NULL) {
+    pathname_ = "";
+    return;
+  }
+  const char* src = pathname_.c_str();
+  char* const dest = new char[pathname_.length() + 1];
+  char* dest_ptr = dest;
+  memset(dest_ptr, 0, pathname_.length() + 1);
+
+  while (*src != '\0') {
+    *dest_ptr = *src;
+    if (!IsPathSeparator(*src)) {
+      src++;
+    } else {
+#if GTEST_HAS_ALT_PATH_SEP_
+      if (*dest_ptr == kAlternatePathSeparator) {
+        *dest_ptr = kPathSeparator;
+      }
+#endif
+      while (IsPathSeparator(*src))
+        src++;
+    }
+    dest_ptr++;
+  }
+  *dest_ptr = '\0';
+  pathname_ = dest;
+  delete[] dest;
+}
+
+}  // namespace internal
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-internal-inl.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-internal-inl.h
new file mode 100644
index 0000000000..ed8a682a96
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-internal-inl.h
@@ -0,0 +1,1183 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Utility functions and classes used by the Google C++ testing framework.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// This file contains purely Google Test's internal implementation.  Please
+// DO NOT #INCLUDE IT IN A USER PROGRAM.
+
+#ifndef GTEST_SRC_GTEST_INTERNAL_INL_H_
+#define GTEST_SRC_GTEST_INTERNAL_INL_H_
+
+// GTEST_IMPLEMENTATION_ is defined to 1 iff the current translation unit is
+// part of Google Test's implementation; otherwise it's undefined.
+#if !GTEST_IMPLEMENTATION_
+// If this file is included from the user's code, just say no.
+# error "gtest-internal-inl.h is part of Google Test's internal implementation."
+# error "It must not be included except by Google Test itself."
+#endif  // GTEST_IMPLEMENTATION_
+
+#ifndef _WIN32_WCE
+# include <errno.h>
+#endif  // !_WIN32_WCE
+#include <stddef.h>
+#include <stdlib.h>  // For strtoll/_strtoul64/malloc/free.
+#include <string.h>  // For memmove.
+
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "gtest/internal/gtest-port.h"
+
+#if GTEST_CAN_STREAM_RESULTS_
+# include <arpa/inet.h>  // NOLINT
+# include <netdb.h>  // NOLINT
+#endif
+
+#if GTEST_OS_WINDOWS
+# include <windows.h>  // NOLINT
+#endif  // GTEST_OS_WINDOWS
+
+#include "gtest/gtest.h"  // NOLINT
+#include "gtest/gtest-spi.h"
+
+namespace testing {
+
+// Declares the flags.
+//
+// We don't want the users to modify this flag in the code, but want
+// Google Test's own unit tests to be able to access it. Therefore we
+// declare it here as opposed to in gtest.h.
+GTEST_DECLARE_bool_(death_test_use_fork);
+
+namespace internal {
+
+// The value of GetTestTypeId() as seen from within the Google Test
+// library.  This is solely for testing GetTestTypeId().
+GTEST_API_ extern const TypeId kTestTypeIdInGoogleTest;
+
+// Names of the flags (needed for parsing Google Test flags).
+const char kAlsoRunDisabledTestsFlag[] = "also_run_disabled_tests";
+const char kBreakOnFailureFlag[] = "break_on_failure";
+const char kCatchExceptionsFlag[] = "catch_exceptions";
+const char kColorFlag[] = "color";
+const char kFilterFlag[] = "filter";
+const char kListTestsFlag[] = "list_tests";
+const char kOutputFlag[] = "output";
+const char kPrintTimeFlag[] = "print_time";
+const char kRandomSeedFlag[] = "random_seed";
+const char kRepeatFlag[] = "repeat";
+const char kShuffleFlag[] = "shuffle";
+const char kStackTraceDepthFlag[] = "stack_trace_depth";
+const char kStreamResultToFlag[] = "stream_result_to";
+const char kThrowOnFailureFlag[] = "throw_on_failure";
+const char kFlagfileFlag[] = "flagfile";
+
+// A valid random seed must be in [1, kMaxRandomSeed].
+const int kMaxRandomSeed = 99999;
+
+// g_help_flag is true iff the --help flag or an equivalent form is
+// specified on the command line.
+GTEST_API_ extern bool g_help_flag;
+
+// Returns the current time in milliseconds.
+GTEST_API_ TimeInMillis GetTimeInMillis();
+
+// Returns true iff Google Test should use colors in the output.
+GTEST_API_ bool ShouldUseColor(bool stdout_is_tty);
+
+// Formats the given time in milliseconds as seconds.
+GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms);
+
+// Converts the given time in milliseconds to a date string in the ISO 8601
+// format, without the timezone information.  N.B.: due to the use the
+// non-reentrant localtime() function, this function is not thread safe.  Do
+// not use it in any code that can be called from multiple threads.
+GTEST_API_ std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms);
+
+// Parses a string for an Int32 flag, in the form of "--flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+GTEST_API_ bool ParseInt32Flag(
+    const char* str, const char* flag, Int32* value);
+
+// Returns a random seed in range [1, kMaxRandomSeed] based on the
+// given --gtest_random_seed flag value.
+inline int GetRandomSeedFromFlag(Int32 random_seed_flag) {
+  const unsigned int raw_seed = (random_seed_flag == 0) ?
+      static_cast<unsigned int>(GetTimeInMillis()) :
+      static_cast<unsigned int>(random_seed_flag);
+
+  // Normalizes the actual seed to range [1, kMaxRandomSeed] such that
+  // it's easy to type.
+  const int normalized_seed =
+      static_cast<int>((raw_seed - 1U) %
+                       static_cast<unsigned int>(kMaxRandomSeed)) + 1;
+  return normalized_seed;
+}
+
+// Returns the first valid random seed after 'seed'.  The behavior is
+// undefined if 'seed' is invalid.  The seed after kMaxRandomSeed is
+// considered to be 1.
+inline int GetNextRandomSeed(int seed) {
+  GTEST_CHECK_(1 <= seed && seed <= kMaxRandomSeed)
+      << "Invalid random seed " << seed << " - must be in [1, "
+      << kMaxRandomSeed << "].";
+  const int next_seed = seed + 1;
+  return (next_seed > kMaxRandomSeed) ? 1 : next_seed;
+}
+
+// This class saves the values of all Google Test flags in its c'tor, and
+// restores them in its d'tor.
+class GTestFlagSaver {
+ public:
+  // The c'tor.
+  GTestFlagSaver() {
+    also_run_disabled_tests_ = GTEST_FLAG(also_run_disabled_tests);
+    break_on_failure_ = GTEST_FLAG(break_on_failure);
+    catch_exceptions_ = GTEST_FLAG(catch_exceptions);
+    color_ = GTEST_FLAG(color);
+    death_test_style_ = GTEST_FLAG(death_test_style);
+    death_test_use_fork_ = GTEST_FLAG(death_test_use_fork);
+    filter_ = GTEST_FLAG(filter);
+    internal_run_death_test_ = GTEST_FLAG(internal_run_death_test);
+    list_tests_ = GTEST_FLAG(list_tests);
+    output_ = GTEST_FLAG(output);
+    print_time_ = GTEST_FLAG(print_time);
+    random_seed_ = GTEST_FLAG(random_seed);
+    repeat_ = GTEST_FLAG(repeat);
+    shuffle_ = GTEST_FLAG(shuffle);
+    stack_trace_depth_ = GTEST_FLAG(stack_trace_depth);
+    stream_result_to_ = GTEST_FLAG(stream_result_to);
+    throw_on_failure_ = GTEST_FLAG(throw_on_failure);
+  }
+
+  // The d'tor is not virtual.  DO NOT INHERIT FROM THIS CLASS.
+  ~GTestFlagSaver() {
+    GTEST_FLAG(also_run_disabled_tests) = also_run_disabled_tests_;
+    GTEST_FLAG(break_on_failure) = break_on_failure_;
+    GTEST_FLAG(catch_exceptions) = catch_exceptions_;
+    GTEST_FLAG(color) = color_;
+    GTEST_FLAG(death_test_style) = death_test_style_;
+    GTEST_FLAG(death_test_use_fork) = death_test_use_fork_;
+    GTEST_FLAG(filter) = filter_;
+    GTEST_FLAG(internal_run_death_test) = internal_run_death_test_;
+    GTEST_FLAG(list_tests) = list_tests_;
+    GTEST_FLAG(output) = output_;
+    GTEST_FLAG(print_time) = print_time_;
+    GTEST_FLAG(random_seed) = random_seed_;
+    GTEST_FLAG(repeat) = repeat_;
+    GTEST_FLAG(shuffle) = shuffle_;
+    GTEST_FLAG(stack_trace_depth) = stack_trace_depth_;
+    GTEST_FLAG(stream_result_to) = stream_result_to_;
+    GTEST_FLAG(throw_on_failure) = throw_on_failure_;
+  }
+
+ private:
+  // Fields for saving the original values of flags.
+  bool also_run_disabled_tests_;
+  bool break_on_failure_;
+  bool catch_exceptions_;
+  std::string color_;
+  std::string death_test_style_;
+  bool death_test_use_fork_;
+  std::string filter_;
+  std::string internal_run_death_test_;
+  bool list_tests_;
+  std::string output_;
+  bool print_time_;
+  internal::Int32 random_seed_;
+  internal::Int32 repeat_;
+  bool shuffle_;
+  internal::Int32 stack_trace_depth_;
+  std::string stream_result_to_;
+  bool throw_on_failure_;
+} GTEST_ATTRIBUTE_UNUSED_;
+
+// Converts a Unicode code point to a narrow string in UTF-8 encoding.
+// code_point parameter is of type UInt32 because wchar_t may not be
+// wide enough to contain a code point.
+// If the code_point is not a valid Unicode code point
+// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
+// to "(Invalid Unicode 0xXXXXXXXX)".
+GTEST_API_ std::string CodePointToUtf8(UInt32 code_point);
+
+// Converts a wide string to a narrow string in UTF-8 encoding.
+// The wide string is assumed to have the following encoding:
+//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin, Symbian OS)
+//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
+// Parameter str points to a null-terminated wide string.
+// Parameter num_chars may additionally limit the number
+// of wchar_t characters processed. -1 is used when the entire string
+// should be processed.
+// If the string contains code points that are not valid Unicode code points
+// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
+// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
+// and contains invalid UTF-16 surrogate pairs, values in those pairs
+// will be encoded as individual Unicode characters from Basic Normal Plane.
+GTEST_API_ std::string WideStringToUtf8(const wchar_t* str, int num_chars);
+
+// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
+// if the variable is present. If a file already exists at this location, this
+// function will write over it. If the variable is present, but the file cannot
+// be created, prints an error and exits.
+void WriteToShardStatusFileIfNeeded();
+
+// Checks whether sharding is enabled by examining the relevant
+// environment variable values. If the variables are present,
+// but inconsistent (e.g., shard_index >= total_shards), prints
+// an error and exits. If in_subprocess_for_death_test, sharding is
+// disabled because it must only be applied to the original test
+// process. Otherwise, we could filter out death tests we intended to execute.
+GTEST_API_ bool ShouldShard(const char* total_shards_str,
+                            const char* shard_index_str,
+                            bool in_subprocess_for_death_test);
+
+// Parses the environment variable var as an Int32. If it is unset,
+// returns default_val. If it is not an Int32, prints an error and
+// and aborts.
+GTEST_API_ Int32 Int32FromEnvOrDie(const char* env_var, Int32 default_val);
+
+// Given the total number of shards, the shard index, and the test id,
+// returns true iff the test should be run on this shard. The test id is
+// some arbitrary but unique non-negative integer assigned to each test
+// method. Assumes that 0 <= shard_index < total_shards.
+GTEST_API_ bool ShouldRunTestOnShard(
+    int total_shards, int shard_index, int test_id);
+
+// STL container utilities.
+
+// Returns the number of elements in the given container that satisfy
+// the given predicate.
+template <class Container, typename Predicate>
+inline int CountIf(const Container& c, Predicate predicate) {
+  // Implemented as an explicit loop since std::count_if() in libCstd on
+  // Solaris has a non-standard signature.
+  int count = 0;
+  for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) {
+    if (predicate(*it))
+      ++count;
+  }
+  return count;
+}
+
+// Applies a function/functor to each element in the container.
+template <class Container, typename Functor>
+void ForEach(const Container& c, Functor functor) {
+  std::for_each(c.begin(), c.end(), functor);
+}
+
+// Returns the i-th element of the vector, or default_value if i is not
+// in range [0, v.size()).
+template <typename E>
+inline E GetElementOr(const std::vector<E>& v, int i, E default_value) {
+  return (i < 0 || i >= static_cast<int>(v.size())) ? default_value : v[i];
+}
+
+// Performs an in-place shuffle of a range of the vector's elements.
+// 'begin' and 'end' are element indices as an STL-style range;
+// i.e. [begin, end) are shuffled, where 'end' == size() means to
+// shuffle to the end of the vector.
+template <typename E>
+void ShuffleRange(internal::Random* random, int begin, int end,
+                  std::vector<E>* v) {
+  const int size = static_cast<int>(v->size());
+  GTEST_CHECK_(0 <= begin && begin <= size)
+      << "Invalid shuffle range start " << begin << ": must be in range [0, "
+      << size << "].";
+  GTEST_CHECK_(begin <= end && end <= size)
+      << "Invalid shuffle range finish " << end << ": must be in range ["
+      << begin << ", " << size << "].";
+
+  // Fisher-Yates shuffle, from
+  // http://en.wikipedia.org/wiki/Fisher-Yates_shuffle
+  for (int range_width = end - begin; range_width >= 2; range_width--) {
+    const int last_in_range = begin + range_width - 1;
+    const int selected = begin + random->Generate(range_width);
+    std::swap((*v)[selected], (*v)[last_in_range]);
+  }
+}
+
+// Performs an in-place shuffle of the vector's elements.
+template <typename E>
+inline void Shuffle(internal::Random* random, std::vector<E>* v) {
+  ShuffleRange(random, 0, static_cast<int>(v->size()), v);
+}
+
+// A function for deleting an object.  Handy for being used as a
+// functor.
+template <typename T>
+static void Delete(T* x) {
+  delete x;
+}
+
+// A predicate that checks the key of a TestProperty against a known key.
+//
+// TestPropertyKeyIs is copyable.
+class TestPropertyKeyIs {
+ public:
+  // Constructor.
+  //
+  // TestPropertyKeyIs has NO default constructor.
+  explicit TestPropertyKeyIs(const std::string& key) : key_(key) {}
+
+  // Returns true iff the test name of test property matches on key_.
+  bool operator()(const TestProperty& test_property) const {
+    return test_property.key() == key_;
+  }
+
+ private:
+  std::string key_;
+};
+
+// Class UnitTestOptions.
+//
+// This class contains functions for processing options the user
+// specifies when running the tests.  It has only static members.
+//
+// In most cases, the user can specify an option using either an
+// environment variable or a command line flag.  E.g. you can set the
+// test filter using either GTEST_FILTER or --gtest_filter.  If both
+// the variable and the flag are present, the latter overrides the
+// former.
+class GTEST_API_ UnitTestOptions {
+ public:
+  // Functions for processing the gtest_output flag.
+
+  // Returns the output format, or "" for normal printed output.
+  static std::string GetOutputFormat();
+
+  // Returns the absolute path of the requested output file, or the
+  // default (test_detail.xml in the original working directory) if
+  // none was explicitly specified.
+  static std::string GetAbsolutePathToOutputFile();
+
+  // Functions for processing the gtest_filter flag.
+
+  // Returns true iff the wildcard pattern matches the string.  The
+  // first ':' or '\0' character in pattern marks the end of it.
+  //
+  // This recursive algorithm isn't very efficient, but is clear and
+  // works well enough for matching test names, which are short.
+  static bool PatternMatchesString(const char *pattern, const char *str);
+
+  // Returns true iff the user-specified filter matches the test case
+  // name and the test name.
+  static bool FilterMatchesTest(const std::string &test_case_name,
+                                const std::string &test_name);
+
+#if GTEST_OS_WINDOWS
+  // Function for supporting the gtest_catch_exception flag.
+
+  // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
+  // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
+  // This function is useful as an __except condition.
+  static int GTestShouldProcessSEH(DWORD exception_code);
+#endif  // GTEST_OS_WINDOWS
+
+  // Returns true if "name" matches the ':' separated list of glob-style
+  // filters in "filter".
+  static bool MatchesFilter(const std::string& name, const char* filter);
+};
+
+// Returns the current application's name, removing directory path if that
+// is present.  Used by UnitTestOptions::GetOutputFile.
+GTEST_API_ FilePath GetCurrentExecutableName();
+
+// The role interface for getting the OS stack trace as a string.
+class OsStackTraceGetterInterface {
+ public:
+  OsStackTraceGetterInterface() {}
+  virtual ~OsStackTraceGetterInterface() {}
+
+  // Returns the current OS stack trace as an std::string.  Parameters:
+  //
+  //   max_depth  - the maximum number of stack frames to be included
+  //                in the trace.
+  //   skip_count - the number of top frames to be skipped; doesn't count
+  //                against max_depth.
+  virtual string CurrentStackTrace(int max_depth, int skip_count) = 0;
+
+  // UponLeavingGTest() should be called immediately before Google Test calls
+  // user code. It saves some information about the current stack that
+  // CurrentStackTrace() will use to find and hide Google Test stack frames.
+  virtual void UponLeavingGTest() = 0;
+
+  // This string is inserted in place of stack frames that are part of
+  // Google Test's implementation.
+  static const char* const kElidedFramesMarker;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface);
+};
+
+// A working implementation of the OsStackTraceGetterInterface interface.
+class OsStackTraceGetter : public OsStackTraceGetterInterface {
+ public:
+  OsStackTraceGetter() {}
+
+  virtual string CurrentStackTrace(int max_depth, int skip_count);
+  virtual void UponLeavingGTest();
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter);
+};
+
+// Information about a Google Test trace point.
+struct TraceInfo {
+  const char* file;
+  int line;
+  std::string message;
+};
+
+// This is the default global test part result reporter used in UnitTestImpl.
+// This class should only be used by UnitTestImpl.
+class DefaultGlobalTestPartResultReporter
+  : public TestPartResultReporterInterface {
+ public:
+  explicit DefaultGlobalTestPartResultReporter(UnitTestImpl* unit_test);
+  // Implements the TestPartResultReporterInterface. Reports the test part
+  // result in the current test.
+  virtual void ReportTestPartResult(const TestPartResult& result);
+
+ private:
+  UnitTestImpl* const unit_test_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultGlobalTestPartResultReporter);
+};
+
+// This is the default per thread test part result reporter used in
+// UnitTestImpl. This class should only be used by UnitTestImpl.
+class DefaultPerThreadTestPartResultReporter
+    : public TestPartResultReporterInterface {
+ public:
+  explicit DefaultPerThreadTestPartResultReporter(UnitTestImpl* unit_test);
+  // Implements the TestPartResultReporterInterface. The implementation just
+  // delegates to the current global test part result reporter of *unit_test_.
+  virtual void ReportTestPartResult(const TestPartResult& result);
+
+ private:
+  UnitTestImpl* const unit_test_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultPerThreadTestPartResultReporter);
+};
+
+// The private implementation of the UnitTest class.  We don't protect
+// the methods under a mutex, as this class is not accessible by a
+// user and the UnitTest class that delegates work to this class does
+// proper locking.
+class GTEST_API_ UnitTestImpl {
+ public:
+  explicit UnitTestImpl(UnitTest* parent);
+  virtual ~UnitTestImpl();
+
+  // There are two different ways to register your own TestPartResultReporter.
+  // You can register your own repoter to listen either only for test results
+  // from the current thread or for results from all threads.
+  // By default, each per-thread test result repoter just passes a new
+  // TestPartResult to the global test result reporter, which registers the
+  // test part result for the currently running test.
+
+  // Returns the global test part result reporter.
+  TestPartResultReporterInterface* GetGlobalTestPartResultReporter();
+
+  // Sets the global test part result reporter.
+  void SetGlobalTestPartResultReporter(
+      TestPartResultReporterInterface* reporter);
+
+  // Returns the test part result reporter for the current thread.
+  TestPartResultReporterInterface* GetTestPartResultReporterForCurrentThread();
+
+  // Sets the test part result reporter for the current thread.
+  void SetTestPartResultReporterForCurrentThread(
+      TestPartResultReporterInterface* reporter);
+
+  // Gets the number of successful test cases.
+  int successful_test_case_count() const;
+
+  // Gets the number of failed test cases.
+  int failed_test_case_count() const;
+
+  // Gets the number of all test cases.
+  int total_test_case_count() const;
+
+  // Gets the number of all test cases that contain at least one test
+  // that should run.
+  int test_case_to_run_count() const;
+
+  // Gets the number of successful tests.
+  int successful_test_count() const;
+
+  // Gets the number of failed tests.
+  int failed_test_count() const;
+
+  // Gets the number of disabled tests that will be reported in the XML report.
+  int reportable_disabled_test_count() const;
+
+  // Gets the number of disabled tests.
+  int disabled_test_count() const;
+
+  // Gets the number of tests to be printed in the XML report.
+  int reportable_test_count() const;
+
+  // Gets the number of all tests.
+  int total_test_count() const;
+
+  // Gets the number of tests that should run.
+  int test_to_run_count() const;
+
+  // Gets the time of the test program start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp() const { return start_timestamp_; }
+
+  // Gets the elapsed time, in milliseconds.
+  TimeInMillis elapsed_time() const { return elapsed_time_; }
+
+  // Returns true iff the unit test passed (i.e. all test cases passed).
+  bool Passed() const { return !Failed(); }
+
+  // Returns true iff the unit test failed (i.e. some test case failed
+  // or something outside of all tests failed).
+  bool Failed() const {
+    return failed_test_case_count() > 0 || ad_hoc_test_result()->Failed();
+  }
+
+  // Gets the i-th test case among all the test cases. i can range from 0 to
+  // total_test_case_count() - 1. If i is not in that range, returns NULL.
+  const TestCase* GetTestCase(int i) const {
+    const int index = GetElementOr(test_case_indices_, i, -1);
+    return index < 0 ? NULL : test_cases_[i];
+  }
+
+  // Gets the i-th test case among all the test cases. i can range from 0 to
+  // total_test_case_count() - 1. If i is not in that range, returns NULL.
+  TestCase* GetMutableTestCase(int i) {
+    const int index = GetElementOr(test_case_indices_, i, -1);
+    return index < 0 ? NULL : test_cases_[index];
+  }
+
+  // Provides access to the event listener list.
+  TestEventListeners* listeners() { return &listeners_; }
+
+  // Returns the TestResult for the test that's currently running, or
+  // the TestResult for the ad hoc test if no test is running.
+  TestResult* current_test_result();
+
+  // Returns the TestResult for the ad hoc test.
+  const TestResult* ad_hoc_test_result() const { return &ad_hoc_test_result_; }
+
+  // Sets the OS stack trace getter.
+  //
+  // Does nothing if the input and the current OS stack trace getter
+  // are the same; otherwise, deletes the old getter and makes the
+  // input the current getter.
+  void set_os_stack_trace_getter(OsStackTraceGetterInterface* getter);
+
+  // Returns the current OS stack trace getter if it is not NULL;
+  // otherwise, creates an OsStackTraceGetter, makes it the current
+  // getter, and returns it.
+  OsStackTraceGetterInterface* os_stack_trace_getter();
+
+  // Returns the current OS stack trace as an std::string.
+  //
+  // The maximum number of stack frames to be included is specified by
+  // the gtest_stack_trace_depth flag.  The skip_count parameter
+  // specifies the number of top frames to be skipped, which doesn't
+  // count against the number of frames to be included.
+  //
+  // For example, if Foo() calls Bar(), which in turn calls
+  // CurrentOsStackTraceExceptTop(1), Foo() will be included in the
+  // trace but Bar() and CurrentOsStackTraceExceptTop() won't.
+  std::string CurrentOsStackTraceExceptTop(int skip_count) GTEST_NO_INLINE_;
+
+  // Finds and returns a TestCase with the given name.  If one doesn't
+  // exist, creates one and returns it.
+  //
+  // Arguments:
+  //
+  //   test_case_name: name of the test case
+  //   type_param:     the name of the test's type parameter, or NULL if
+  //                   this is not a typed or a type-parameterized test.
+  //   set_up_tc:      pointer to the function that sets up the test case
+  //   tear_down_tc:   pointer to the function that tears down the test case
+  TestCase* GetTestCase(const char* test_case_name,
+                        const char* type_param,
+                        Test::SetUpTestCaseFunc set_up_tc,
+                        Test::TearDownTestCaseFunc tear_down_tc);
+
+  // Adds a TestInfo to the unit test.
+  //
+  // Arguments:
+  //
+  //   set_up_tc:    pointer to the function that sets up the test case
+  //   tear_down_tc: pointer to the function that tears down the test case
+  //   test_info:    the TestInfo object
+  void AddTestInfo(Test::SetUpTestCaseFunc set_up_tc,
+                   Test::TearDownTestCaseFunc tear_down_tc,
+                   TestInfo* test_info) {
+    // In order to support thread-safe death tests, we need to
+    // remember the original working directory when the test program
+    // was first invoked.  We cannot do this in RUN_ALL_TESTS(), as
+    // the user may have changed the current directory before calling
+    // RUN_ALL_TESTS().  Therefore we capture the current directory in
+    // AddTestInfo(), which is called to register a TEST or TEST_F
+    // before main() is reached.
+    if (original_working_dir_.IsEmpty()) {
+      original_working_dir_.Set(FilePath::GetCurrentDir());
+      GTEST_CHECK_(!original_working_dir_.IsEmpty())
+          << "Failed to get the current working directory.";
+    }
+
+    GetTestCase(test_info->test_case_name(),
+                test_info->type_param(),
+                set_up_tc,
+                tear_down_tc)->AddTestInfo(test_info);
+  }
+
+#if GTEST_HAS_PARAM_TEST
+  // Returns ParameterizedTestCaseRegistry object used to keep track of
+  // value-parameterized tests and instantiate and register them.
+  internal::ParameterizedTestCaseRegistry& parameterized_test_registry() {
+    return parameterized_test_registry_;
+  }
+#endif  // GTEST_HAS_PARAM_TEST
+
+  // Sets the TestCase object for the test that's currently running.
+  void set_current_test_case(TestCase* a_current_test_case) {
+    current_test_case_ = a_current_test_case;
+  }
+
+  // Sets the TestInfo object for the test that's currently running.  If
+  // current_test_info is NULL, the assertion results will be stored in
+  // ad_hoc_test_result_.
+  void set_current_test_info(TestInfo* a_current_test_info) {
+    current_test_info_ = a_current_test_info;
+  }
+
+  // Registers all parameterized tests defined using TEST_P and
+  // INSTANTIATE_TEST_CASE_P, creating regular tests for each test/parameter
+  // combination. This method can be called more then once; it has guards
+  // protecting from registering the tests more then once.  If
+  // value-parameterized tests are disabled, RegisterParameterizedTests is
+  // present but does nothing.
+  void RegisterParameterizedTests();
+
+  // Runs all tests in this UnitTest object, prints the result, and
+  // returns true if all tests are successful.  If any exception is
+  // thrown during a test, this test is considered to be failed, but
+  // the rest of the tests will still be run.
+  bool RunAllTests();
+
+  // Clears the results of all tests, except the ad hoc tests.
+  void ClearNonAdHocTestResult() {
+    ForEach(test_cases_, TestCase::ClearTestCaseResult);
+  }
+
+  // Clears the results of ad-hoc test assertions.
+  void ClearAdHocTestResult() {
+    ad_hoc_test_result_.Clear();
+  }
+
+  // Adds a TestProperty to the current TestResult object when invoked in a
+  // context of a test or a test case, or to the global property set. If the
+  // result already contains a property with the same key, the value will be
+  // updated.
+  void RecordProperty(const TestProperty& test_property);
+
+  enum ReactionToSharding {
+    HONOR_SHARDING_PROTOCOL,
+    IGNORE_SHARDING_PROTOCOL
+  };
+
+  // Matches the full name of each test against the user-specified
+  // filter to decide whether the test should run, then records the
+  // result in each TestCase and TestInfo object.
+  // If shard_tests == HONOR_SHARDING_PROTOCOL, further filters tests
+  // based on sharding variables in the environment.
+  // Returns the number of tests that should run.
+  int FilterTests(ReactionToSharding shard_tests);
+
+  // Prints the names of the tests matching the user-specified filter flag.
+  void ListTestsMatchingFilter();
+
+  const TestCase* current_test_case() const { return current_test_case_; }
+  TestInfo* current_test_info() { return current_test_info_; }
+  const TestInfo* current_test_info() const { return current_test_info_; }
+
+  // Returns the vector of environments that need to be set-up/torn-down
+  // before/after the tests are run.
+  std::vector<Environment*>& environments() { return environments_; }
+
+  // Getters for the per-thread Google Test trace stack.
+  std::vector<TraceInfo>& gtest_trace_stack() {
+    return *(gtest_trace_stack_.pointer());
+  }
+  const std::vector<TraceInfo>& gtest_trace_stack() const {
+    return gtest_trace_stack_.get();
+  }
+
+#if GTEST_HAS_DEATH_TEST
+  void InitDeathTestSubprocessControlInfo() {
+    internal_run_death_test_flag_.reset(ParseInternalRunDeathTestFlag());
+  }
+  // Returns a pointer to the parsed --gtest_internal_run_death_test
+  // flag, or NULL if that flag was not specified.
+  // This information is useful only in a death test child process.
+  // Must not be called before a call to InitGoogleTest.
+  const InternalRunDeathTestFlag* internal_run_death_test_flag() const {
+    return internal_run_death_test_flag_.get();
+  }
+
+  // Returns a pointer to the current death test factory.
+  internal::DeathTestFactory* death_test_factory() {
+    return death_test_factory_.get();
+  }
+
+  void SuppressTestEventsIfInSubprocess();
+
+  friend class ReplaceDeathTestFactory;
+#endif  // GTEST_HAS_DEATH_TEST
+
+  // Initializes the event listener performing XML output as specified by
+  // UnitTestOptions. Must not be called before InitGoogleTest.
+  void ConfigureXmlOutput();
+
+#if GTEST_CAN_STREAM_RESULTS_
+  // Initializes the event listener for streaming test results to a socket.
+  // Must not be called before InitGoogleTest.
+  void ConfigureStreamingOutput();
+#endif
+
+  // Performs initialization dependent upon flag values obtained in
+  // ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
+  // ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
+  // this function is also called from RunAllTests.  Since this function can be
+  // called more than once, it has to be idempotent.
+  void PostFlagParsingInit();
+
+  // Gets the random seed used at the start of the current test iteration.
+  int random_seed() const { return random_seed_; }
+
+  // Gets the random number generator.
+  internal::Random* random() { return &random_; }
+
+  // Shuffles all test cases, and the tests within each test case,
+  // making sure that death tests are still run first.
+  void ShuffleTests();
+
+  // Restores the test cases and tests to their order before the first shuffle.
+  void UnshuffleTests();
+
+  // Returns the value of GTEST_FLAG(catch_exceptions) at the moment
+  // UnitTest::Run() starts.
+  bool catch_exceptions() const { return catch_exceptions_; }
+
+ private:
+  friend class ::testing::UnitTest;
+
+  // Used by UnitTest::Run() to capture the state of
+  // GTEST_FLAG(catch_exceptions) at the moment it starts.
+  void set_catch_exceptions(bool value) { catch_exceptions_ = value; }
+
+  // The UnitTest object that owns this implementation object.
+  UnitTest* const parent_;
+
+  // The working directory when the first TEST() or TEST_F() was
+  // executed.
+  internal::FilePath original_working_dir_;
+
+  // The default test part result reporters.
+  DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_;
+  DefaultPerThreadTestPartResultReporter
+      default_per_thread_test_part_result_reporter_;
+
+  // Points to (but doesn't own) the global test part result reporter.
+  TestPartResultReporterInterface* global_test_part_result_repoter_;
+
+  // Protects read and write access to global_test_part_result_reporter_.
+  internal::Mutex global_test_part_result_reporter_mutex_;
+
+  // Points to (but doesn't own) the per-thread test part result reporter.
+  internal::ThreadLocal<TestPartResultReporterInterface*>
+      per_thread_test_part_result_reporter_;
+
+  // The vector of environments that need to be set-up/torn-down
+  // before/after the tests are run.
+  std::vector<Environment*> environments_;
+
+  // The vector of TestCases in their original order.  It owns the
+  // elements in the vector.
+  std::vector<TestCase*> test_cases_;
+
+  // Provides a level of indirection for the test case list to allow
+  // easy shuffling and restoring the test case order.  The i-th
+  // element of this vector is the index of the i-th test case in the
+  // shuffled order.
+  std::vector<int> test_case_indices_;
+
+#if GTEST_HAS_PARAM_TEST
+  // ParameterizedTestRegistry object used to register value-parameterized
+  // tests.
+  internal::ParameterizedTestCaseRegistry parameterized_test_registry_;
+
+  // Indicates whether RegisterParameterizedTests() has been called already.
+  bool parameterized_tests_registered_;
+#endif  // GTEST_HAS_PARAM_TEST
+
+  // Index of the last death test case registered.  Initially -1.
+  int last_death_test_case_;
+
+  // This points to the TestCase for the currently running test.  It
+  // changes as Google Test goes through one test case after another.
+  // When no test is running, this is set to NULL and Google Test
+  // stores assertion results in ad_hoc_test_result_.  Initially NULL.
+  TestCase* current_test_case_;
+
+  // This points to the TestInfo for the currently running test.  It
+  // changes as Google Test goes through one test after another.  When
+  // no test is running, this is set to NULL and Google Test stores
+  // assertion results in ad_hoc_test_result_.  Initially NULL.
+  TestInfo* current_test_info_;
+
+  // Normally, a user only writes assertions inside a TEST or TEST_F,
+  // or inside a function called by a TEST or TEST_F.  Since Google
+  // Test keeps track of which test is current running, it can
+  // associate such an assertion with the test it belongs to.
+  //
+  // If an assertion is encountered when no TEST or TEST_F is running,
+  // Google Test attributes the assertion result to an imaginary "ad hoc"
+  // test, and records the result in ad_hoc_test_result_.
+  TestResult ad_hoc_test_result_;
+
+  // The list of event listeners that can be used to track events inside
+  // Google Test.
+  TestEventListeners listeners_;
+
+  // The OS stack trace getter.  Will be deleted when the UnitTest
+  // object is destructed.  By default, an OsStackTraceGetter is used,
+  // but the user can set this field to use a custom getter if that is
+  // desired.
+  OsStackTraceGetterInterface* os_stack_trace_getter_;
+
+  // True iff PostFlagParsingInit() has been called.
+  bool post_flag_parse_init_performed_;
+
+  // The random number seed used at the beginning of the test run.
+  int random_seed_;
+
+  // Our random number generator.
+  internal::Random random_;
+
+  // The time of the test program start, in ms from the start of the
+  // UNIX epoch.
+  TimeInMillis start_timestamp_;
+
+  // How long the test took to run, in milliseconds.
+  TimeInMillis elapsed_time_;
+
+#if GTEST_HAS_DEATH_TEST
+  // The decomposed components of the gtest_internal_run_death_test flag,
+  // parsed when RUN_ALL_TESTS is called.
+  internal::scoped_ptr<InternalRunDeathTestFlag> internal_run_death_test_flag_;
+  internal::scoped_ptr<internal::DeathTestFactory> death_test_factory_;
+#endif  // GTEST_HAS_DEATH_TEST
+
+  // A per-thread stack of traces created by the SCOPED_TRACE() macro.
+  internal::ThreadLocal<std::vector<TraceInfo> > gtest_trace_stack_;
+
+  // The value of GTEST_FLAG(catch_exceptions) at the moment RunAllTests()
+  // starts.
+  bool catch_exceptions_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl);
+};  // class UnitTestImpl
+
+// Convenience function for accessing the global UnitTest
+// implementation object.
+inline UnitTestImpl* GetUnitTestImpl() {
+  return UnitTest::GetInstance()->impl();
+}
+
+#if GTEST_USES_SIMPLE_RE
+
+// Internal helper functions for implementing the simple regular
+// expression matcher.
+GTEST_API_ bool IsInSet(char ch, const char* str);
+GTEST_API_ bool IsAsciiDigit(char ch);
+GTEST_API_ bool IsAsciiPunct(char ch);
+GTEST_API_ bool IsRepeat(char ch);
+GTEST_API_ bool IsAsciiWhiteSpace(char ch);
+GTEST_API_ bool IsAsciiWordChar(char ch);
+GTEST_API_ bool IsValidEscape(char ch);
+GTEST_API_ bool AtomMatchesChar(bool escaped, char pattern, char ch);
+GTEST_API_ bool ValidateRegex(const char* regex);
+GTEST_API_ bool MatchRegexAtHead(const char* regex, const char* str);
+GTEST_API_ bool MatchRepetitionAndRegexAtHead(
+    bool escaped, char ch, char repeat, const char* regex, const char* str);
+GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str);
+
+#endif  // GTEST_USES_SIMPLE_RE
+
+// Parses the command line for Google Test flags, without initializing
+// other parts of Google Test.
+GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv);
+GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv);
+
+#if GTEST_HAS_DEATH_TEST
+
+// Returns the message describing the last system error, regardless of the
+// platform.
+GTEST_API_ std::string GetLastErrnoDescription();
+
+// Attempts to parse a string into a positive integer pointed to by the
+// number parameter.  Returns true if that is possible.
+// GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we can use
+// it here.
+template <typename Integer>
+bool ParseNaturalNumber(const ::std::string& str, Integer* number) {
+  // Fail fast if the given string does not begin with a digit;
+  // this bypasses strtoXXX's "optional leading whitespace and plus
+  // or minus sign" semantics, which are undesirable here.
+  if (str.empty() || !IsDigit(str[0])) {
+    return false;
+  }
+  errno = 0;
+
+  char* end;
+  // BiggestConvertible is the largest integer type that system-provided
+  // string-to-number conversion routines can return.
+
+# if GTEST_OS_WINDOWS && !defined(__GNUC__)
+
+  // MSVC and C++ Builder define __int64 instead of the standard long long.
+  typedef unsigned __int64 BiggestConvertible;
+  const BiggestConvertible parsed = _strtoui64(str.c_str(), &end, 10);
+
+# else
+
+  typedef unsigned long long BiggestConvertible;  // NOLINT
+  const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10);
+
+# endif  // GTEST_OS_WINDOWS && !defined(__GNUC__)
+
+  const bool parse_success = *end == '\0' && errno == 0;
+
+  // TODO(vladl@google.com): Convert this to compile time assertion when it is
+  // available.
+  GTEST_CHECK_(sizeof(Integer) <= sizeof(parsed));
+
+  const Integer result = static_cast<Integer>(parsed);
+  if (parse_success && static_cast<BiggestConvertible>(result) == parsed) {
+    *number = result;
+    return true;
+  }
+  return false;
+}
+#endif  // GTEST_HAS_DEATH_TEST
+
+// TestResult contains some private methods that should be hidden from
+// Google Test user but are required for testing. This class allow our tests
+// to access them.
+//
+// This class is supplied only for the purpose of testing Google Test's own
+// constructs. Do not use it in user tests, either directly or indirectly.
+class TestResultAccessor {
+ public:
+  static void RecordProperty(TestResult* test_result,
+                             const std::string& xml_element,
+                             const TestProperty& property) {
+    test_result->RecordProperty(xml_element, property);
+  }
+
+  static void ClearTestPartResults(TestResult* test_result) {
+    test_result->ClearTestPartResults();
+  }
+
+  static const std::vector<testing::TestPartResult>& test_part_results(
+      const TestResult& test_result) {
+    return test_result.test_part_results();
+  }
+};
+
+#if GTEST_CAN_STREAM_RESULTS_
+
+// Streams test results to the given port on the given host machine.
+class GTEST_API_ StreamingListener : public EmptyTestEventListener {
+ public:
+  // Abstract base class for writing strings to a socket.
+  class AbstractSocketWriter {
+   public:
+    virtual ~AbstractSocketWriter() {}
+
+    // Sends a string to the socket.
+    virtual void Send(const string& message) = 0;
+
+    // Closes the socket.
+    virtual void CloseConnection() {}
+
+    // Sends a string and a newline to the socket.
+    void SendLn(const string& message) {
+      Send(message + "\n");
+    }
+  };
+
+  // Concrete class for actually writing strings to a socket.
+  class SocketWriter : public AbstractSocketWriter {
+   public:
+    SocketWriter(const string& host, const string& port)
+        : sockfd_(-1), host_name_(host), port_num_(port) {
+      MakeConnection();
+    }
+
+    virtual ~SocketWriter() {
+      if (sockfd_ != -1)
+        CloseConnection();
+    }
+
+    // Sends a string to the socket.
+    virtual void Send(const string& message) {
+      GTEST_CHECK_(sockfd_ != -1)
+          << "Send() can be called only when there is a connection.";
+
+      const int len = static_cast<int>(message.length());
+      if (write(sockfd_, message.c_str(), len) != len) {
+        GTEST_LOG_(WARNING)
+            << "stream_result_to: failed to stream to "
+            << host_name_ << ":" << port_num_;
+      }
+    }
+
+   private:
+    // Creates a client socket and connects to the server.
+    void MakeConnection();
+
+    // Closes the socket.
+    void CloseConnection() {
+      GTEST_CHECK_(sockfd_ != -1)
+          << "CloseConnection() can be called only when there is a connection.";
+
+      close(sockfd_);
+      sockfd_ = -1;
+    }
+
+    int sockfd_;  // socket file descriptor
+    const string host_name_;
+    const string port_num_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter);
+  };  // class SocketWriter
+
+  // Escapes '=', '&', '%', and '\n' characters in str as "%xx".
+  static string UrlEncode(const char* str);
+
+  StreamingListener(const string& host, const string& port)
+      : socket_writer_(new SocketWriter(host, port)) { Start(); }
+
+  explicit StreamingListener(AbstractSocketWriter* socket_writer)
+      : socket_writer_(socket_writer) { Start(); }
+
+  void OnTestProgramStart(const UnitTest& /* unit_test */) {
+    SendLn("event=TestProgramStart");
+  }
+
+  void OnTestProgramEnd(const UnitTest& unit_test) {
+    // Note that Google Test current only report elapsed time for each
+    // test iteration, not for the entire test program.
+    SendLn("event=TestProgramEnd&passed=" + FormatBool(unit_test.Passed()));
+
+    // Notify the streaming server to stop.
+    socket_writer_->CloseConnection();
+  }
+
+  void OnTestIterationStart(const UnitTest& /* unit_test */, int iteration) {
+    SendLn("event=TestIterationStart&iteration=" +
+           StreamableToString(iteration));
+  }
+
+  void OnTestIterationEnd(const UnitTest& unit_test, int /* iteration */) {
+    SendLn("event=TestIterationEnd&passed=" +
+           FormatBool(unit_test.Passed()) + "&elapsed_time=" +
+           StreamableToString(unit_test.elapsed_time()) + "ms");
+  }
+
+  void OnTestCaseStart(const TestCase& test_case) {
+    SendLn(std::string("event=TestCaseStart&name=") + test_case.name());
+  }
+
+  void OnTestCaseEnd(const TestCase& test_case) {
+    SendLn("event=TestCaseEnd&passed=" + FormatBool(test_case.Passed())
+           + "&elapsed_time=" + StreamableToString(test_case.elapsed_time())
+           + "ms");
+  }
+
+  void OnTestStart(const TestInfo& test_info) {
+    SendLn(std::string("event=TestStart&name=") + test_info.name());
+  }
+
+  void OnTestEnd(const TestInfo& test_info) {
+    SendLn("event=TestEnd&passed=" +
+           FormatBool((test_info.result())->Passed()) +
+           "&elapsed_time=" +
+           StreamableToString((test_info.result())->elapsed_time()) + "ms");
+  }
+
+  void OnTestPartResult(const TestPartResult& test_part_result) {
+    const char* file_name = test_part_result.file_name();
+    if (file_name == NULL)
+      file_name = "";
+    SendLn("event=TestPartResult&file=" + UrlEncode(file_name) +
+           "&line=" + StreamableToString(test_part_result.line_number()) +
+           "&message=" + UrlEncode(test_part_result.message()));
+  }
+
+ private:
+  // Sends the given message and a newline to the socket.
+  void SendLn(const string& message) { socket_writer_->SendLn(message); }
+
+  // Called at the start of streaming to notify the receiver what
+  // protocol we are using.
+  void Start() { SendLn("gtest_streaming_protocol_version=1.0"); }
+
+  string FormatBool(bool value) { return value ? "1" : "0"; }
+
+  const scoped_ptr<AbstractSocketWriter> socket_writer_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener);
+};  // class StreamingListener
+
+#endif  // GTEST_CAN_STREAM_RESULTS_
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_SRC_GTEST_INTERNAL_INL_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-port.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-port.cc
new file mode 100644
index 0000000000..e5bf3dd2be
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-port.cc
@@ -0,0 +1,1259 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "gtest/internal/gtest-port.h"
+
+#include <limits.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <fstream>
+
+#if GTEST_OS_WINDOWS
+# include <windows.h>
+# include <io.h>
+# include <sys/stat.h>
+# include <map>  // Used in ThreadLocal.
+#else
+# include <unistd.h>
+#endif  // GTEST_OS_WINDOWS
+
+#if GTEST_OS_MAC
+# include <mach/mach_init.h>
+# include <mach/task.h>
+# include <mach/vm_map.h>
+#endif  // GTEST_OS_MAC
+
+#if GTEST_OS_QNX
+# include <devctl.h>
+# include <fcntl.h>
+# include <sys/procfs.h>
+#endif  // GTEST_OS_QNX
+
+#if GTEST_OS_AIX
+# include <procinfo.h>
+# include <sys/types.h>
+#endif  // GTEST_OS_AIX
+
+#include "gtest/gtest-spi.h"
+#include "gtest/gtest-message.h"
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-string.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick exists to
+// prevent the accidental inclusion of gtest-internal-inl.h in the
+// user's code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+namespace testing {
+namespace internal {
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+// MSVC and C++Builder do not provide a definition of STDERR_FILENO.
+const int kStdOutFileno = 1;
+const int kStdErrFileno = 2;
+#else
+const int kStdOutFileno = STDOUT_FILENO;
+const int kStdErrFileno = STDERR_FILENO;
+#endif  // _MSC_VER
+
+#if GTEST_OS_LINUX
+
+namespace {
+template <typename T>
+T ReadProcFileField(const string& filename, int field) {
+  std::string dummy;
+  std::ifstream file(filename.c_str());
+  while (field-- > 0) {
+    file >> dummy;
+  }
+  T output = 0;
+  file >> output;
+  return output;
+}
+}  // namespace
+
+// Returns the number of active threads, or 0 when there is an error.
+size_t GetThreadCount() {
+  const string filename =
+      (Message() << "/proc/" << getpid() << "/stat").GetString();
+  return ReadProcFileField<int>(filename, 19);
+}
+
+#elif GTEST_OS_MAC
+
+size_t GetThreadCount() {
+  const task_t task = mach_task_self();
+  mach_msg_type_number_t thread_count;
+  thread_act_array_t thread_list;
+  const kern_return_t status = task_threads(task, &thread_list, &thread_count);
+  if (status == KERN_SUCCESS) {
+    // task_threads allocates resources in thread_list and we need to free them
+    // to avoid leaks.
+    vm_deallocate(task,
+                  reinterpret_cast<vm_address_t>(thread_list),
+                  sizeof(thread_t) * thread_count);
+    return static_cast<size_t>(thread_count);
+  } else {
+    return 0;
+  }
+}
+
+#elif GTEST_OS_QNX
+
+// Returns the number of threads running in the process, or 0 to indicate that
+// we cannot detect it.
+size_t GetThreadCount() {
+  const int fd = open("/proc/self/as", O_RDONLY);
+  if (fd < 0) {
+    return 0;
+  }
+  procfs_info process_info;
+  const int status =
+      devctl(fd, DCMD_PROC_INFO, &process_info, sizeof(process_info), NULL);
+  close(fd);
+  if (status == EOK) {
+    return static_cast<size_t>(process_info.num_threads);
+  } else {
+    return 0;
+  }
+}
+
+#elif GTEST_OS_AIX
+
+size_t GetThreadCount() {
+  struct procentry64 entry;
+  pid_t pid = getpid();
+  int status = getprocs64(&entry, sizeof(entry), NULL, 0, &pid, 1);
+  if (status == 1) {
+    return entry.pi_thcount;
+  } else {
+    return 0;
+  }
+}
+
+#else
+
+size_t GetThreadCount() {
+  // There's no portable way to detect the number of threads, so we just
+  // return 0 to indicate that we cannot detect it.
+  return 0;
+}
+
+#endif  // GTEST_OS_LINUX
+
+#if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
+
+void SleepMilliseconds(int n) {
+  ::Sleep(n);
+}
+
+AutoHandle::AutoHandle()
+    : handle_(INVALID_HANDLE_VALUE) {}
+
+AutoHandle::AutoHandle(Handle handle)
+    : handle_(handle) {}
+
+AutoHandle::~AutoHandle() {
+  Reset();
+}
+
+AutoHandle::Handle AutoHandle::Get() const {
+  return handle_;
+}
+
+void AutoHandle::Reset() {
+  Reset(INVALID_HANDLE_VALUE);
+}
+
+void AutoHandle::Reset(HANDLE handle) {
+  // Resetting with the same handle we already own is invalid.
+  if (handle_ != handle) {
+    if (IsCloseable()) {
+      ::CloseHandle(handle_);
+    }
+    handle_ = handle;
+  } else {
+    GTEST_CHECK_(!IsCloseable())
+        << "Resetting a valid handle to itself is likely a programmer error "
+            "and thus not allowed.";
+  }
+}
+
+bool AutoHandle::IsCloseable() const {
+  // Different Windows APIs may use either of these values to represent an
+  // invalid handle.
+  return handle_ != NULL && handle_ != INVALID_HANDLE_VALUE;
+}
+
+Notification::Notification()
+    : event_(::CreateEvent(NULL,   // Default security attributes.
+                           TRUE,   // Do not reset automatically.
+                           FALSE,  // Initially unset.
+                           NULL)) {  // Anonymous event.
+  GTEST_CHECK_(event_.Get() != NULL);
+}
+
+void Notification::Notify() {
+  GTEST_CHECK_(::SetEvent(event_.Get()) != FALSE);
+}
+
+void Notification::WaitForNotification() {
+  GTEST_CHECK_(
+      ::WaitForSingleObject(event_.Get(), INFINITE) == WAIT_OBJECT_0);
+}
+
+Mutex::Mutex()
+    : owner_thread_id_(0),
+      type_(kDynamic),
+      critical_section_init_phase_(0),
+      critical_section_(new CRITICAL_SECTION) {
+  ::InitializeCriticalSection(critical_section_);
+}
+
+Mutex::~Mutex() {
+  // Static mutexes are leaked intentionally. It is not thread-safe to try
+  // to clean them up.
+  // TODO(yukawa): Switch to Slim Reader/Writer (SRW) Locks, which requires
+  // nothing to clean it up but is available only on Vista and later.
+  // http://msdn.microsoft.com/en-us/library/windows/desktop/aa904937.aspx
+  if (type_ == kDynamic) {
+    ::DeleteCriticalSection(critical_section_);
+    delete critical_section_;
+    critical_section_ = NULL;
+  }
+}
+
+void Mutex::Lock() {
+  ThreadSafeLazyInit();
+  ::EnterCriticalSection(critical_section_);
+  owner_thread_id_ = ::GetCurrentThreadId();
+}
+
+void Mutex::Unlock() {
+  ThreadSafeLazyInit();
+  // We don't protect writing to owner_thread_id_ here, as it's the
+  // caller's responsibility to ensure that the current thread holds the
+  // mutex when this is called.
+  owner_thread_id_ = 0;
+  ::LeaveCriticalSection(critical_section_);
+}
+
+// Does nothing if the current thread holds the mutex. Otherwise, crashes
+// with high probability.
+void Mutex::AssertHeld() {
+  ThreadSafeLazyInit();
+  GTEST_CHECK_(owner_thread_id_ == ::GetCurrentThreadId())
+      << "The current thread is not holding the mutex @" << this;
+}
+
+// Initializes owner_thread_id_ and critical_section_ in static mutexes.
+void Mutex::ThreadSafeLazyInit() {
+  // Dynamic mutexes are initialized in the constructor.
+  if (type_ == kStatic) {
+    switch (
+        ::InterlockedCompareExchange(&critical_section_init_phase_, 1L, 0L)) {
+      case 0:
+        // If critical_section_init_phase_ was 0 before the exchange, we
+        // are the first to test it and need to perform the initialization.
+        owner_thread_id_ = 0;
+        critical_section_ = new CRITICAL_SECTION;
+        ::InitializeCriticalSection(critical_section_);
+        // Updates the critical_section_init_phase_ to 2 to signal
+        // initialization complete.
+        GTEST_CHECK_(::InterlockedCompareExchange(
+                          &critical_section_init_phase_, 2L, 1L) ==
+                      1L);
+        break;
+      case 1:
+        // Somebody else is already initializing the mutex; spin until they
+        // are done.
+        while (::InterlockedCompareExchange(&critical_section_init_phase_,
+                                            2L,
+                                            2L) != 2L) {
+          // Possibly yields the rest of the thread's time slice to other
+          // threads.
+          ::Sleep(0);
+        }
+        break;
+
+      case 2:
+        break;  // The mutex is already initialized and ready for use.
+
+      default:
+        GTEST_CHECK_(false)
+            << "Unexpected value of critical_section_init_phase_ "
+            << "while initializing a static mutex.";
+    }
+  }
+}
+
+namespace {
+
+class ThreadWithParamSupport : public ThreadWithParamBase {
+ public:
+  static HANDLE CreateThread(Runnable* runnable,
+                             Notification* thread_can_start) {
+    ThreadMainParam* param = new ThreadMainParam(runnable, thread_can_start);
+    DWORD thread_id;
+    // TODO(yukawa): Consider to use _beginthreadex instead.
+    HANDLE thread_handle = ::CreateThread(
+        NULL,    // Default security.
+        0,       // Default stack size.
+        &ThreadWithParamSupport::ThreadMain,
+        param,   // Parameter to ThreadMainStatic
+        0x0,     // Default creation flags.
+        &thread_id);  // Need a valid pointer for the call to work under Win98.
+    GTEST_CHECK_(thread_handle != NULL) << "CreateThread failed with error "
+                                        << ::GetLastError() << ".";
+    if (thread_handle == NULL) {
+      delete param;
+    }
+    return thread_handle;
+  }
+
+ private:
+  struct ThreadMainParam {
+    ThreadMainParam(Runnable* runnable, Notification* thread_can_start)
+        : runnable_(runnable),
+          thread_can_start_(thread_can_start) {
+    }
+    scoped_ptr<Runnable> runnable_;
+    // Does not own.
+    Notification* thread_can_start_;
+  };
+
+  static DWORD WINAPI ThreadMain(void* ptr) {
+    // Transfers ownership.
+    scoped_ptr<ThreadMainParam> param(static_cast<ThreadMainParam*>(ptr));
+    if (param->thread_can_start_ != NULL)
+      param->thread_can_start_->WaitForNotification();
+    param->runnable_->Run();
+    return 0;
+  }
+
+  // Prohibit instantiation.
+  ThreadWithParamSupport();
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParamSupport);
+};
+
+}  // namespace
+
+ThreadWithParamBase::ThreadWithParamBase(Runnable *runnable,
+                                         Notification* thread_can_start)
+      : thread_(ThreadWithParamSupport::CreateThread(runnable,
+                                                     thread_can_start)) {
+}
+
+ThreadWithParamBase::~ThreadWithParamBase() {
+  Join();
+}
+
+void ThreadWithParamBase::Join() {
+  GTEST_CHECK_(::WaitForSingleObject(thread_.Get(), INFINITE) == WAIT_OBJECT_0)
+      << "Failed to join the thread with error " << ::GetLastError() << ".";
+}
+
+// Maps a thread to a set of ThreadIdToThreadLocals that have values
+// instantiated on that thread and notifies them when the thread exits.  A
+// ThreadLocal instance is expected to persist until all threads it has
+// values on have terminated.
+class ThreadLocalRegistryImpl {
+ public:
+  // Registers thread_local_instance as having value on the current thread.
+  // Returns a value that can be used to identify the thread from other threads.
+  static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
+      const ThreadLocalBase* thread_local_instance) {
+    DWORD current_thread = ::GetCurrentThreadId();
+    MutexLock lock(&mutex_);
+    ThreadIdToThreadLocals* const thread_to_thread_locals =
+        GetThreadLocalsMapLocked();
+    ThreadIdToThreadLocals::iterator thread_local_pos =
+        thread_to_thread_locals->find(current_thread);
+    if (thread_local_pos == thread_to_thread_locals->end()) {
+      thread_local_pos = thread_to_thread_locals->insert(
+          std::make_pair(current_thread, ThreadLocalValues())).first;
+      StartWatcherThreadFor(current_thread);
+    }
+    ThreadLocalValues& thread_local_values = thread_local_pos->second;
+    ThreadLocalValues::iterator value_pos =
+        thread_local_values.find(thread_local_instance);
+    if (value_pos == thread_local_values.end()) {
+      value_pos =
+          thread_local_values
+              .insert(std::make_pair(
+                  thread_local_instance,
+                  linked_ptr<ThreadLocalValueHolderBase>(
+                      thread_local_instance->NewValueForCurrentThread())))
+              .first;
+    }
+    return value_pos->second.get();
+  }
+
+  static void OnThreadLocalDestroyed(
+      const ThreadLocalBase* thread_local_instance) {
+    std::vector<linked_ptr<ThreadLocalValueHolderBase> > value_holders;
+    // Clean up the ThreadLocalValues data structure while holding the lock, but
+    // defer the destruction of the ThreadLocalValueHolderBases.
+    {
+      MutexLock lock(&mutex_);
+      ThreadIdToThreadLocals* const thread_to_thread_locals =
+          GetThreadLocalsMapLocked();
+      for (ThreadIdToThreadLocals::iterator it =
+          thread_to_thread_locals->begin();
+          it != thread_to_thread_locals->end();
+          ++it) {
+        ThreadLocalValues& thread_local_values = it->second;
+        ThreadLocalValues::iterator value_pos =
+            thread_local_values.find(thread_local_instance);
+        if (value_pos != thread_local_values.end()) {
+          value_holders.push_back(value_pos->second);
+          thread_local_values.erase(value_pos);
+          // This 'if' can only be successful at most once, so theoretically we
+          // could break out of the loop here, but we don't bother doing so.
+        }
+      }
+    }
+    // Outside the lock, let the destructor for 'value_holders' deallocate the
+    // ThreadLocalValueHolderBases.
+  }
+
+  static void OnThreadExit(DWORD thread_id) {
+    GTEST_CHECK_(thread_id != 0) << ::GetLastError();
+    std::vector<linked_ptr<ThreadLocalValueHolderBase> > value_holders;
+    // Clean up the ThreadIdToThreadLocals data structure while holding the
+    // lock, but defer the destruction of the ThreadLocalValueHolderBases.
+    {
+      MutexLock lock(&mutex_);
+      ThreadIdToThreadLocals* const thread_to_thread_locals =
+          GetThreadLocalsMapLocked();
+      ThreadIdToThreadLocals::iterator thread_local_pos =
+          thread_to_thread_locals->find(thread_id);
+      if (thread_local_pos != thread_to_thread_locals->end()) {
+        ThreadLocalValues& thread_local_values = thread_local_pos->second;
+        for (ThreadLocalValues::iterator value_pos =
+            thread_local_values.begin();
+            value_pos != thread_local_values.end();
+            ++value_pos) {
+          value_holders.push_back(value_pos->second);
+        }
+        thread_to_thread_locals->erase(thread_local_pos);
+      }
+    }
+    // Outside the lock, let the destructor for 'value_holders' deallocate the
+    // ThreadLocalValueHolderBases.
+  }
+
+ private:
+  // In a particular thread, maps a ThreadLocal object to its value.
+  typedef std::map<const ThreadLocalBase*,
+                   linked_ptr<ThreadLocalValueHolderBase> > ThreadLocalValues;
+  // Stores all ThreadIdToThreadLocals having values in a thread, indexed by
+  // thread's ID.
+  typedef std::map<DWORD, ThreadLocalValues> ThreadIdToThreadLocals;
+
+  // Holds the thread id and thread handle that we pass from
+  // StartWatcherThreadFor to WatcherThreadFunc.
+  typedef std::pair<DWORD, HANDLE> ThreadIdAndHandle;
+
+  static void StartWatcherThreadFor(DWORD thread_id) {
+    // The returned handle will be kept in thread_map and closed by
+    // watcher_thread in WatcherThreadFunc.
+    HANDLE thread = ::OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION,
+                                 FALSE,
+                                 thread_id);
+    GTEST_CHECK_(thread != NULL);
+    // We need to to pass a valid thread ID pointer into CreateThread for it
+    // to work correctly under Win98.
+    DWORD watcher_thread_id;
+    HANDLE watcher_thread = ::CreateThread(
+        NULL,   // Default security.
+        0,      // Default stack size
+        &ThreadLocalRegistryImpl::WatcherThreadFunc,
+        reinterpret_cast<LPVOID>(new ThreadIdAndHandle(thread_id, thread)),
+        CREATE_SUSPENDED,
+        &watcher_thread_id);
+    GTEST_CHECK_(watcher_thread != NULL);
+    // Give the watcher thread the same priority as ours to avoid being
+    // blocked by it.
+    ::SetThreadPriority(watcher_thread,
+                        ::GetThreadPriority(::GetCurrentThread()));
+    ::ResumeThread(watcher_thread);
+    ::CloseHandle(watcher_thread);
+  }
+
+  // Monitors exit from a given thread and notifies those
+  // ThreadIdToThreadLocals about thread termination.
+  static DWORD WINAPI WatcherThreadFunc(LPVOID param) {
+    const ThreadIdAndHandle* tah =
+        reinterpret_cast<const ThreadIdAndHandle*>(param);
+    GTEST_CHECK_(
+        ::WaitForSingleObject(tah->second, INFINITE) == WAIT_OBJECT_0);
+    OnThreadExit(tah->first);
+    ::CloseHandle(tah->second);
+    delete tah;
+    return 0;
+  }
+
+  // Returns map of thread local instances.
+  static ThreadIdToThreadLocals* GetThreadLocalsMapLocked() {
+    mutex_.AssertHeld();
+    static ThreadIdToThreadLocals* map = new ThreadIdToThreadLocals;
+    return map;
+  }
+
+  // Protects access to GetThreadLocalsMapLocked() and its return value.
+  static Mutex mutex_;
+  // Protects access to GetThreadMapLocked() and its return value.
+  static Mutex thread_map_mutex_;
+};
+
+Mutex ThreadLocalRegistryImpl::mutex_(Mutex::kStaticMutex);
+Mutex ThreadLocalRegistryImpl::thread_map_mutex_(Mutex::kStaticMutex);
+
+ThreadLocalValueHolderBase* ThreadLocalRegistry::GetValueOnCurrentThread(
+      const ThreadLocalBase* thread_local_instance) {
+  return ThreadLocalRegistryImpl::GetValueOnCurrentThread(
+      thread_local_instance);
+}
+
+void ThreadLocalRegistry::OnThreadLocalDestroyed(
+      const ThreadLocalBase* thread_local_instance) {
+  ThreadLocalRegistryImpl::OnThreadLocalDestroyed(thread_local_instance);
+}
+
+#endif  // GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS
+
+#if GTEST_USES_POSIX_RE
+
+// Implements RE.  Currently only needed for death tests.
+
+RE::~RE() {
+  if (is_valid_) {
+    // regfree'ing an invalid regex might crash because the content
+    // of the regex is undefined. Since the regex's are essentially
+    // the same, one cannot be valid (or invalid) without the other
+    // being so too.
+    regfree(&partial_regex_);
+    regfree(&full_regex_);
+  }
+  free(const_cast<char*>(pattern_));
+}
+
+// Returns true iff regular expression re matches the entire str.
+bool RE::FullMatch(const char* str, const RE& re) {
+  if (!re.is_valid_) return false;
+
+  regmatch_t match;
+  return regexec(&re.full_regex_, str, 1, &match, 0) == 0;
+}
+
+// Returns true iff regular expression re matches a substring of str
+// (including str itself).
+bool RE::PartialMatch(const char* str, const RE& re) {
+  if (!re.is_valid_) return false;
+
+  regmatch_t match;
+  return regexec(&re.partial_regex_, str, 1, &match, 0) == 0;
+}
+
+// Initializes an RE from its string representation.
+void RE::Init(const char* regex) {
+  pattern_ = posix::StrDup(regex);
+
+  // Reserves enough bytes to hold the regular expression used for a
+  // full match.
+  const size_t full_regex_len = strlen(regex) + 10;
+  char* const full_pattern = new char[full_regex_len];
+
+  snprintf(full_pattern, full_regex_len, "^(%s)$", regex);
+  is_valid_ = regcomp(&full_regex_, full_pattern, REG_EXTENDED) == 0;
+  // We want to call regcomp(&partial_regex_, ...) even if the
+  // previous expression returns false.  Otherwise partial_regex_ may
+  // not be properly initialized can may cause trouble when it's
+  // freed.
+  //
+  // Some implementation of POSIX regex (e.g. on at least some
+  // versions of Cygwin) doesn't accept the empty string as a valid
+  // regex.  We change it to an equivalent form "()" to be safe.
+  if (is_valid_) {
+    const char* const partial_regex = (*regex == '\0') ? "()" : regex;
+    is_valid_ = regcomp(&partial_regex_, partial_regex, REG_EXTENDED) == 0;
+  }
+  EXPECT_TRUE(is_valid_)
+      << "Regular expression \"" << regex
+      << "\" is not a valid POSIX Extended regular expression.";
+
+  delete[] full_pattern;
+}
+
+#elif GTEST_USES_SIMPLE_RE
+
+// Returns true iff ch appears anywhere in str (excluding the
+// terminating '\0' character).
+bool IsInSet(char ch, const char* str) {
+  return ch != '\0' && strchr(str, ch) != NULL;
+}
+
+// Returns true iff ch belongs to the given classification.  Unlike
+// similar functions in <ctype.h>, these aren't affected by the
+// current locale.
+bool IsAsciiDigit(char ch) { return '0' <= ch && ch <= '9'; }
+bool IsAsciiPunct(char ch) {
+  return IsInSet(ch, "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~");
+}
+bool IsRepeat(char ch) { return IsInSet(ch, "?*+"); }
+bool IsAsciiWhiteSpace(char ch) { return IsInSet(ch, " \f\n\r\t\v"); }
+bool IsAsciiWordChar(char ch) {
+  return ('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') ||
+      ('0' <= ch && ch <= '9') || ch == '_';
+}
+
+// Returns true iff "\\c" is a supported escape sequence.
+bool IsValidEscape(char c) {
+  return (IsAsciiPunct(c) || IsInSet(c, "dDfnrsStvwW"));
+}
+
+// Returns true iff the given atom (specified by escaped and pattern)
+// matches ch.  The result is undefined if the atom is invalid.
+bool AtomMatchesChar(bool escaped, char pattern_char, char ch) {
+  if (escaped) {  // "\\p" where p is pattern_char.
+    switch (pattern_char) {
+      case 'd': return IsAsciiDigit(ch);
+      case 'D': return !IsAsciiDigit(ch);
+      case 'f': return ch == '\f';
+      case 'n': return ch == '\n';
+      case 'r': return ch == '\r';
+      case 's': return IsAsciiWhiteSpace(ch);
+      case 'S': return !IsAsciiWhiteSpace(ch);
+      case 't': return ch == '\t';
+      case 'v': return ch == '\v';
+      case 'w': return IsAsciiWordChar(ch);
+      case 'W': return !IsAsciiWordChar(ch);
+    }
+    return IsAsciiPunct(pattern_char) && pattern_char == ch;
+  }
+
+  return (pattern_char == '.' && ch != '\n') || pattern_char == ch;
+}
+
+// Helper function used by ValidateRegex() to format error messages.
+std::string FormatRegexSyntaxError(const char* regex, int index) {
+  return (Message() << "Syntax error at index " << index
+          << " in simple regular expression \"" << regex << "\": ").GetString();
+}
+
+// Generates non-fatal failures and returns false if regex is invalid;
+// otherwise returns true.
+bool ValidateRegex(const char* regex) {
+  if (regex == NULL) {
+    // TODO(wan@google.com): fix the source file location in the
+    // assertion failures to match where the regex is used in user
+    // code.
+    ADD_FAILURE() << "NULL is not a valid simple regular expression.";
+    return false;
+  }
+
+  bool is_valid = true;
+
+  // True iff ?, *, or + can follow the previous atom.
+  bool prev_repeatable = false;
+  for (int i = 0; regex[i]; i++) {
+    if (regex[i] == '\\') {  // An escape sequence
+      i++;
+      if (regex[i] == '\0') {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
+                      << "'\\' cannot appear at the end.";
+        return false;
+      }
+
+      if (!IsValidEscape(regex[i])) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1)
+                      << "invalid escape sequence \"\\" << regex[i] << "\".";
+        is_valid = false;
+      }
+      prev_repeatable = true;
+    } else {  // Not an escape sequence.
+      const char ch = regex[i];
+
+      if (ch == '^' && i > 0) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'^' can only appear at the beginning.";
+        is_valid = false;
+      } else if (ch == '$' && regex[i + 1] != '\0') {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'$' can only appear at the end.";
+        is_valid = false;
+      } else if (IsInSet(ch, "()[]{}|")) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'" << ch << "' is unsupported.";
+        is_valid = false;
+      } else if (IsRepeat(ch) && !prev_repeatable) {
+        ADD_FAILURE() << FormatRegexSyntaxError(regex, i)
+                      << "'" << ch << "' can only follow a repeatable token.";
+        is_valid = false;
+      }
+
+      prev_repeatable = !IsInSet(ch, "^$?*+");
+    }
+  }
+
+  return is_valid;
+}
+
+// Matches a repeated regex atom followed by a valid simple regular
+// expression.  The regex atom is defined as c if escaped is false,
+// or \c otherwise.  repeat is the repetition meta character (?, *,
+// or +).  The behavior is undefined if str contains too many
+// characters to be indexable by size_t, in which case the test will
+// probably time out anyway.  We are fine with this limitation as
+// std::string has it too.
+bool MatchRepetitionAndRegexAtHead(
+    bool escaped, char c, char repeat, const char* regex,
+    const char* str) {
+  const size_t min_count = (repeat == '+') ? 1 : 0;
+  const size_t max_count = (repeat == '?') ? 1 :
+      static_cast<size_t>(-1) - 1;
+  // We cannot call numeric_limits::max() as it conflicts with the
+  // max() macro on Windows.
+
+  for (size_t i = 0; i <= max_count; ++i) {
+    // We know that the atom matches each of the first i characters in str.
+    if (i >= min_count && MatchRegexAtHead(regex, str + i)) {
+      // We have enough matches at the head, and the tail matches too.
+      // Since we only care about *whether* the pattern matches str
+      // (as opposed to *how* it matches), there is no need to find a
+      // greedy match.
+      return true;
+    }
+    if (str[i] == '\0' || !AtomMatchesChar(escaped, c, str[i]))
+      return false;
+  }
+  return false;
+}
+
+// Returns true iff regex matches a prefix of str.  regex must be a
+// valid simple regular expression and not start with "^", or the
+// result is undefined.
+bool MatchRegexAtHead(const char* regex, const char* str) {
+  if (*regex == '\0')  // An empty regex matches a prefix of anything.
+    return true;
+
+  // "$" only matches the end of a string.  Note that regex being
+  // valid guarantees that there's nothing after "$" in it.
+  if (*regex == '$')
+    return *str == '\0';
+
+  // Is the first thing in regex an escape sequence?
+  const bool escaped = *regex == '\\';
+  if (escaped)
+    ++regex;
+  if (IsRepeat(regex[1])) {
+    // MatchRepetitionAndRegexAtHead() calls MatchRegexAtHead(), so
+    // here's an indirect recursion.  It terminates as the regex gets
+    // shorter in each recursion.
+    return MatchRepetitionAndRegexAtHead(
+        escaped, regex[0], regex[1], regex + 2, str);
+  } else {
+    // regex isn't empty, isn't "$", and doesn't start with a
+    // repetition.  We match the first atom of regex with the first
+    // character of str and recurse.
+    return (*str != '\0') && AtomMatchesChar(escaped, *regex, *str) &&
+        MatchRegexAtHead(regex + 1, str + 1);
+  }
+}
+
+// Returns true iff regex matches any substring of str.  regex must be
+// a valid simple regular expression, or the result is undefined.
+//
+// The algorithm is recursive, but the recursion depth doesn't exceed
+// the regex length, so we won't need to worry about running out of
+// stack space normally.  In rare cases the time complexity can be
+// exponential with respect to the regex length + the string length,
+// but usually it's must faster (often close to linear).
+bool MatchRegexAnywhere(const char* regex, const char* str) {
+  if (regex == NULL || str == NULL)
+    return false;
+
+  if (*regex == '^')
+    return MatchRegexAtHead(regex + 1, str);
+
+  // A successful match can be anywhere in str.
+  do {
+    if (MatchRegexAtHead(regex, str))
+      return true;
+  } while (*str++ != '\0');
+  return false;
+}
+
+// Implements the RE class.
+
+RE::~RE() {
+  free(const_cast<char*>(pattern_));
+  free(const_cast<char*>(full_pattern_));
+}
+
+// Returns true iff regular expression re matches the entire str.
+bool RE::FullMatch(const char* str, const RE& re) {
+  return re.is_valid_ && MatchRegexAnywhere(re.full_pattern_, str);
+}
+
+// Returns true iff regular expression re matches a substring of str
+// (including str itself).
+bool RE::PartialMatch(const char* str, const RE& re) {
+  return re.is_valid_ && MatchRegexAnywhere(re.pattern_, str);
+}
+
+// Initializes an RE from its string representation.
+void RE::Init(const char* regex) {
+  pattern_ = full_pattern_ = NULL;
+  if (regex != NULL) {
+    pattern_ = posix::StrDup(regex);
+  }
+
+  is_valid_ = ValidateRegex(regex);
+  if (!is_valid_) {
+    // No need to calculate the full pattern when the regex is invalid.
+    return;
+  }
+
+  const size_t len = strlen(regex);
+  // Reserves enough bytes to hold the regular expression used for a
+  // full match: we need space to prepend a '^', append a '$', and
+  // terminate the string with '\0'.
+  char* buffer = static_cast<char*>(malloc(len + 3));
+  full_pattern_ = buffer;
+
+  if (*regex != '^')
+    *buffer++ = '^';  // Makes sure full_pattern_ starts with '^'.
+
+  // We don't use snprintf or strncpy, as they trigger a warning when
+  // compiled with VC++ 8.0.
+  memcpy(buffer, regex, len);
+  buffer += len;
+
+  if (len == 0 || regex[len - 1] != '$')
+    *buffer++ = '$';  // Makes sure full_pattern_ ends with '$'.
+
+  *buffer = '\0';
+}
+
+#endif  // GTEST_USES_POSIX_RE
+
+const char kUnknownFile[] = "unknown file";
+
+// Formats a source file path and a line number as they would appear
+// in an error message from the compiler used to compile this code.
+GTEST_API_ ::std::string FormatFileLocation(const char* file, int line) {
+  const std::string file_name(file == NULL ? kUnknownFile : file);
+
+  if (line < 0) {
+    return file_name + ":";
+  }
+#ifdef _MSC_VER
+  return file_name + "(" + StreamableToString(line) + "):";
+#else
+  return file_name + ":" + StreamableToString(line) + ":";
+#endif  // _MSC_VER
+}
+
+// Formats a file location for compiler-independent XML output.
+// Although this function is not platform dependent, we put it next to
+// FormatFileLocation in order to contrast the two functions.
+// Note that FormatCompilerIndependentFileLocation() does NOT append colon
+// to the file location it produces, unlike FormatFileLocation().
+GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(
+    const char* file, int line) {
+  const std::string file_name(file == NULL ? kUnknownFile : file);
+
+  if (line < 0)
+    return file_name;
+  else
+    return file_name + ":" + StreamableToString(line);
+}
+
+GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line)
+    : severity_(severity) {
+  const char* const marker =
+      severity == GTEST_INFO ?    "[  INFO ]" :
+      severity == GTEST_WARNING ? "[WARNING]" :
+      severity == GTEST_ERROR ?   "[ ERROR ]" : "[ FATAL ]";
+  GetStream() << ::std::endl << marker << " "
+              << FormatFileLocation(file, line).c_str() << ": ";
+}
+
+// Flushes the buffers and, if severity is GTEST_FATAL, aborts the program.
+GTestLog::~GTestLog() {
+  GetStream() << ::std::endl;
+  if (severity_ == GTEST_FATAL) {
+    fflush(stderr);
+    posix::Abort();
+  }
+}
+// Disable Microsoft deprecation warnings for POSIX functions called from
+// this class (creat, dup, dup2, and close)
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996)
+
+#if GTEST_HAS_STREAM_REDIRECTION
+
+// Object that captures an output stream (stdout/stderr).
+class CapturedStream {
+ public:
+  // The ctor redirects the stream to a temporary file.
+  explicit CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) {
+# if GTEST_OS_WINDOWS
+    char temp_dir_path[MAX_PATH + 1] = { '\0' };  // NOLINT
+    char temp_file_path[MAX_PATH + 1] = { '\0' };  // NOLINT
+
+    ::GetTempPathA(sizeof(temp_dir_path), temp_dir_path);
+    const UINT success = ::GetTempFileNameA(temp_dir_path,
+                                            "gtest_redir",
+                                            0,  // Generate unique file name.
+                                            temp_file_path);
+    GTEST_CHECK_(success != 0)
+        << "Unable to create a temporary file in " << temp_dir_path;
+    const int captured_fd = creat(temp_file_path, _S_IREAD | _S_IWRITE);
+    GTEST_CHECK_(captured_fd != -1) << "Unable to open temporary file "
+                                    << temp_file_path;
+    filename_ = temp_file_path;
+# else
+    // There's no guarantee that a test has write access to the current
+    // directory, so we create the temporary file in the /tmp directory
+    // instead. We use /tmp on most systems, and /sdcard on Android.
+    // That's because Android doesn't have /tmp.
+#  if GTEST_OS_LINUX_ANDROID
+    // Note: Android applications are expected to call the framework's
+    // Context.getExternalStorageDirectory() method through JNI to get
+    // the location of the world-writable SD Card directory. However,
+    // this requires a Context handle, which cannot be retrieved
+    // globally from native code. Doing so also precludes running the
+    // code as part of a regular standalone executable, which doesn't
+    // run in a Dalvik process (e.g. when running it through 'adb shell').
+    //
+    // The location /sdcard is directly accessible from native code
+    // and is the only location (unofficially) supported by the Android
+    // team. It's generally a symlink to the real SD Card mount point
+    // which can be /mnt/sdcard, /mnt/sdcard0, /system/media/sdcard, or
+    // other OEM-customized locations. Never rely on these, and always
+    // use /sdcard.
+    char name_template[] = "/sdcard/gtest_captured_stream.XXXXXX";
+#  else
+    char name_template[] = "/tmp/captured_stream.XXXXXX";
+#  endif  // GTEST_OS_LINUX_ANDROID
+    const int captured_fd = mkstemp(name_template);
+    filename_ = name_template;
+# endif  // GTEST_OS_WINDOWS
+    fflush(NULL);
+    dup2(captured_fd, fd_);
+    close(captured_fd);
+  }
+
+  ~CapturedStream() {
+    remove(filename_.c_str());
+  }
+
+  std::string GetCapturedString() {
+    if (uncaptured_fd_ != -1) {
+      // Restores the original stream.
+      fflush(NULL);
+      dup2(uncaptured_fd_, fd_);
+      close(uncaptured_fd_);
+      uncaptured_fd_ = -1;
+    }
+
+    FILE* const file = posix::FOpen(filename_.c_str(), "r");
+    const std::string content = ReadEntireFile(file);
+    posix::FClose(file);
+    return content;
+  }
+
+ private:
+  const int fd_;  // A stream to capture.
+  int uncaptured_fd_;
+  // Name of the temporary file holding the stderr output.
+  ::std::string filename_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream);
+};
+
+GTEST_DISABLE_MSC_WARNINGS_POP_()
+
+static CapturedStream* g_captured_stderr = NULL;
+static CapturedStream* g_captured_stdout = NULL;
+
+// Starts capturing an output stream (stdout/stderr).
+void CaptureStream(int fd, const char* stream_name, CapturedStream** stream) {
+  if (*stream != NULL) {
+    GTEST_LOG_(FATAL) << "Only one " << stream_name
+                      << " capturer can exist at a time.";
+  }
+  *stream = new CapturedStream(fd);
+}
+
+// Stops capturing the output stream and returns the captured string.
+std::string GetCapturedStream(CapturedStream** captured_stream) {
+  const std::string content = (*captured_stream)->GetCapturedString();
+
+  delete *captured_stream;
+  *captured_stream = NULL;
+
+  return content;
+}
+
+// Starts capturing stdout.
+void CaptureStdout() {
+  CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout);
+}
+
+// Starts capturing stderr.
+void CaptureStderr() {
+  CaptureStream(kStdErrFileno, "stderr", &g_captured_stderr);
+}
+
+// Stops capturing stdout and returns the captured string.
+std::string GetCapturedStdout() {
+  return GetCapturedStream(&g_captured_stdout);
+}
+
+// Stops capturing stderr and returns the captured string.
+std::string GetCapturedStderr() {
+  return GetCapturedStream(&g_captured_stderr);
+}
+
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+std::string TempDir() {
+#if GTEST_OS_WINDOWS_MOBILE
+  return "\\temp\\";
+#elif GTEST_OS_WINDOWS
+  const char* temp_dir = posix::GetEnv("TEMP");
+  if (temp_dir == NULL || temp_dir[0] == '\0')
+    return "\\temp\\";
+  else if (temp_dir[strlen(temp_dir) - 1] == '\\')
+    return temp_dir;
+  else
+    return std::string(temp_dir) + "\\";
+#elif GTEST_OS_LINUX_ANDROID
+  return "/sdcard/";
+#else
+  return "/tmp/";
+#endif  // GTEST_OS_WINDOWS_MOBILE
+}
+
+size_t GetFileSize(FILE* file) {
+  fseek(file, 0, SEEK_END);
+  return static_cast<size_t>(ftell(file));
+}
+
+std::string ReadEntireFile(FILE* file) {
+  const size_t file_size = GetFileSize(file);
+  char* const buffer = new char[file_size];
+
+  size_t bytes_last_read = 0;  // # of bytes read in the last fread()
+  size_t bytes_read = 0;       // # of bytes read so far
+
+  fseek(file, 0, SEEK_SET);
+
+  // Keeps reading the file until we cannot read further or the
+  // pre-determined file size is reached.
+  do {
+    bytes_last_read = fread(buffer+bytes_read, 1, file_size-bytes_read, file);
+    bytes_read += bytes_last_read;
+  } while (bytes_last_read > 0 && bytes_read < file_size);
+
+  const std::string content(buffer, bytes_read);
+  delete[] buffer;
+
+  return content;
+}
+
+#if GTEST_HAS_DEATH_TEST
+
+static const ::std::vector<testing::internal::string>* g_injected_test_argvs =
+                                        NULL;  // Owned.
+
+void SetInjectableArgvs(const ::std::vector<testing::internal::string>* argvs) {
+  if (g_injected_test_argvs != argvs)
+    delete g_injected_test_argvs;
+  g_injected_test_argvs = argvs;
+}
+
+const ::std::vector<testing::internal::string>& GetInjectableArgvs() {
+  if (g_injected_test_argvs != NULL) {
+    return *g_injected_test_argvs;
+  }
+  return GetArgvs();
+}
+#endif  // GTEST_HAS_DEATH_TEST
+
+#if GTEST_OS_WINDOWS_MOBILE
+namespace posix {
+void Abort() {
+  DebugBreak();
+  TerminateProcess(GetCurrentProcess(), 1);
+}
+}  // namespace posix
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+// Returns the name of the environment variable corresponding to the
+// given flag.  For example, FlagToEnvVar("foo") will return
+// "GTEST_FOO" in the open-source version.
+static std::string FlagToEnvVar(const char* flag) {
+  const std::string full_flag =
+      (Message() << GTEST_FLAG_PREFIX_ << flag).GetString();
+
+  Message env_var;
+  for (size_t i = 0; i != full_flag.length(); i++) {
+    env_var << ToUpper(full_flag.c_str()[i]);
+  }
+
+  return env_var.GetString();
+}
+
+// Parses 'str' for a 32-bit signed integer.  If successful, writes
+// the result to *value and returns true; otherwise leaves *value
+// unchanged and returns false.
+bool ParseInt32(const Message& src_text, const char* str, Int32* value) {
+  // Parses the environment variable as a decimal integer.
+  char* end = NULL;
+  const long long_value = strtol(str, &end, 10);  // NOLINT
+
+  // Has strtol() consumed all characters in the string?
+  if (*end != '\0') {
+    // No - an invalid character was encountered.
+    Message msg;
+    msg << "WARNING: " << src_text
+        << " is expected to be a 32-bit integer, but actually"
+        << " has value \"" << str << "\".\n";
+    printf("%s", msg.GetString().c_str());
+    fflush(stdout);
+    return false;
+  }
+
+  // Is the parsed value in the range of an Int32?
+  const Int32 result = static_cast<Int32>(long_value);
+  if (long_value == LONG_MAX || long_value == LONG_MIN ||
+      // The parsed value overflows as a long.  (strtol() returns
+      // LONG_MAX or LONG_MIN when the input overflows.)
+      result != long_value
+      // The parsed value overflows as an Int32.
+      ) {
+    Message msg;
+    msg << "WARNING: " << src_text
+        << " is expected to be a 32-bit integer, but actually"
+        << " has value " << str << ", which overflows.\n";
+    printf("%s", msg.GetString().c_str());
+    fflush(stdout);
+    return false;
+  }
+
+  *value = result;
+  return true;
+}
+
+// Reads and returns the Boolean environment variable corresponding to
+// the given flag; if it's not set, returns default_value.
+//
+// The value is considered true iff it's not "0".
+bool BoolFromGTestEnv(const char* flag, bool default_value) {
+#if defined(GTEST_GET_BOOL_FROM_ENV_)
+  return GTEST_GET_BOOL_FROM_ENV_(flag, default_value);
+#endif  // defined(GTEST_GET_BOOL_FROM_ENV_)
+  const std::string env_var = FlagToEnvVar(flag);
+  const char* const string_value = posix::GetEnv(env_var.c_str());
+  return string_value == NULL ?
+      default_value : strcmp(string_value, "0") != 0;
+}
+
+// Reads and returns a 32-bit integer stored in the environment
+// variable corresponding to the given flag; if it isn't set or
+// doesn't represent a valid 32-bit integer, returns default_value.
+Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) {
+#if defined(GTEST_GET_INT32_FROM_ENV_)
+  return GTEST_GET_INT32_FROM_ENV_(flag, default_value);
+#endif  // defined(GTEST_GET_INT32_FROM_ENV_)
+  const std::string env_var = FlagToEnvVar(flag);
+  const char* const string_value = posix::GetEnv(env_var.c_str());
+  if (string_value == NULL) {
+    // The environment variable is not set.
+    return default_value;
+  }
+
+  Int32 result = default_value;
+  if (!ParseInt32(Message() << "Environment variable " << env_var,
+                  string_value, &result)) {
+    printf("The default value %s is used.\n",
+           (Message() << default_value).GetString().c_str());
+    fflush(stdout);
+    return default_value;
+  }
+
+  return result;
+}
+
+// Reads and returns the string environment variable corresponding to
+// the given flag; if it's not set, returns default_value.
+std::string StringFromGTestEnv(const char* flag, const char* default_value) {
+#if defined(GTEST_GET_STRING_FROM_ENV_)
+  return GTEST_GET_STRING_FROM_ENV_(flag, default_value);
+#endif  // defined(GTEST_GET_STRING_FROM_ENV_)
+  const std::string env_var = FlagToEnvVar(flag);
+  const char* value = posix::GetEnv(env_var.c_str());
+  if (value != NULL) {
+    return value;
+  }
+
+  // As a special case for the 'output' flag, if GTEST_OUTPUT is not
+  // set, we look for XML_OUTPUT_FILE, which is set by the Bazel build
+  // system.  The value of XML_OUTPUT_FILE is a filename without the
+  // "xml:" prefix of GTEST_OUTPUT.
+  //
+  // The net priority order after flag processing is thus:
+  //   --gtest_output command line flag
+  //   GTEST_OUTPUT environment variable
+  //   XML_OUTPUT_FILE environment variable
+  //   'default_value'
+  if (strcmp(flag, "output") == 0) {
+    value = posix::GetEnv("XML_OUTPUT_FILE");
+    if (value != NULL) {
+      return std::string("xml:") + value;
+    }
+  }
+  return default_value;
+}
+
+}  // namespace internal
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-printers.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-printers.cc
new file mode 100644
index 0000000000..a2df412f8a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-printers.cc
@@ -0,0 +1,373 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Test - The Google C++ Testing Framework
+//
+// This file implements a universal value printer that can print a
+// value of any type T:
+//
+//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
+//
+// It uses the << operator when possible, and prints the bytes in the
+// object otherwise.  A user can override its behavior for a class
+// type Foo by defining either operator<<(::std::ostream&, const Foo&)
+// or void PrintTo(const Foo&, ::std::ostream*) in the namespace that
+// defines Foo.
+
+#include "gtest/gtest-printers.h"
+#include <ctype.h>
+#include <stdio.h>
+#include <cwchar>
+#include <ostream>  // NOLINT
+#include <string>
+#include "gtest/internal/gtest-port.h"
+
+namespace testing {
+
+namespace {
+
+using ::std::ostream;
+
+// Prints a segment of bytes in the given object.
+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start,
+                                size_t count, ostream* os) {
+  char text[5] = "";
+  for (size_t i = 0; i != count; i++) {
+    const size_t j = start + i;
+    if (i != 0) {
+      // Organizes the bytes into groups of 2 for easy parsing by
+      // human.
+      if ((j % 2) == 0)
+        *os << ' ';
+      else
+        *os << '-';
+    }
+    GTEST_SNPRINTF_(text, sizeof(text), "%02X", obj_bytes[j]);
+    *os << text;
+  }
+}
+
+// Prints the bytes in the given value to the given ostream.
+void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count,
+                              ostream* os) {
+  // Tells the user how big the object is.
+  *os << count << "-byte object <";
+
+  const size_t kThreshold = 132;
+  const size_t kChunkSize = 64;
+  // If the object size is bigger than kThreshold, we'll have to omit
+  // some details by printing only the first and the last kChunkSize
+  // bytes.
+  // TODO(wan): let the user control the threshold using a flag.
+  if (count < kThreshold) {
+    PrintByteSegmentInObjectTo(obj_bytes, 0, count, os);
+  } else {
+    PrintByteSegmentInObjectTo(obj_bytes, 0, kChunkSize, os);
+    *os << " ... ";
+    // Rounds up to 2-byte boundary.
+    const size_t resume_pos = (count - kChunkSize + 1)/2*2;
+    PrintByteSegmentInObjectTo(obj_bytes, resume_pos, count - resume_pos, os);
+  }
+  *os << ">";
+}
+
+}  // namespace
+
+namespace internal2 {
+
+// Delegates to PrintBytesInObjectToImpl() to print the bytes in the
+// given object.  The delegation simplifies the implementation, which
+// uses the << operator and thus is easier done outside of the
+// ::testing::internal namespace, which contains a << operator that
+// sometimes conflicts with the one in STL.
+void PrintBytesInObjectTo(const unsigned char* obj_bytes, size_t count,
+                          ostream* os) {
+  PrintBytesInObjectToImpl(obj_bytes, count, os);
+}
+
+}  // namespace internal2
+
+namespace internal {
+
+// Depending on the value of a char (or wchar_t), we print it in one
+// of three formats:
+//   - as is if it's a printable ASCII (e.g. 'a', '2', ' '),
+//   - as a hexidecimal escape sequence (e.g. '\x7F'), or
+//   - as a special escape sequence (e.g. '\r', '\n').
+enum CharFormat {
+  kAsIs,
+  kHexEscape,
+  kSpecialEscape
+};
+
+// Returns true if c is a printable ASCII character.  We test the
+// value of c directly instead of calling isprint(), which is buggy on
+// Windows Mobile.
+inline bool IsPrintableAscii(wchar_t c) {
+  return 0x20 <= c && c <= 0x7E;
+}
+
+// Prints a wide or narrow char c as a character literal without the
+// quotes, escaping it when necessary; returns how c was formatted.
+// The template argument UnsignedChar is the unsigned version of Char,
+// which is the type of c.
+template <typename UnsignedChar, typename Char>
+static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) {
+  switch (static_cast<wchar_t>(c)) {
+    case L'\0':
+      *os << "\\0";
+      break;
+    case L'\'':
+      *os << "\\'";
+      break;
+    case L'\\':
+      *os << "\\\\";
+      break;
+    case L'\a':
+      *os << "\\a";
+      break;
+    case L'\b':
+      *os << "\\b";
+      break;
+    case L'\f':
+      *os << "\\f";
+      break;
+    case L'\n':
+      *os << "\\n";
+      break;
+    case L'\r':
+      *os << "\\r";
+      break;
+    case L'\t':
+      *os << "\\t";
+      break;
+    case L'\v':
+      *os << "\\v";
+      break;
+    default:
+      if (IsPrintableAscii(c)) {
+        *os << static_cast<char>(c);
+        return kAsIs;
+      } else {
+        *os << "\\x" + String::FormatHexInt(static_cast<UnsignedChar>(c));
+        return kHexEscape;
+      }
+  }
+  return kSpecialEscape;
+}
+
+// Prints a wchar_t c as if it's part of a string literal, escaping it when
+// necessary; returns how c was formatted.
+static CharFormat PrintAsStringLiteralTo(wchar_t c, ostream* os) {
+  switch (c) {
+    case L'\'':
+      *os << "'";
+      return kAsIs;
+    case L'"':
+      *os << "\\\"";
+      return kSpecialEscape;
+    default:
+      return PrintAsCharLiteralTo<wchar_t>(c, os);
+  }
+}
+
+// Prints a char c as if it's part of a string literal, escaping it when
+// necessary; returns how c was formatted.
+static CharFormat PrintAsStringLiteralTo(char c, ostream* os) {
+  return PrintAsStringLiteralTo(
+      static_cast<wchar_t>(static_cast<unsigned char>(c)), os);
+}
+
+// Prints a wide or narrow character c and its code.  '\0' is printed
+// as "'\\0'", other unprintable characters are also properly escaped
+// using the standard C++ escape sequence.  The template argument
+// UnsignedChar is the unsigned version of Char, which is the type of c.
+template <typename UnsignedChar, typename Char>
+void PrintCharAndCodeTo(Char c, ostream* os) {
+  // First, print c as a literal in the most readable form we can find.
+  *os << ((sizeof(c) > 1) ? "L'" : "'");
+  const CharFormat format = PrintAsCharLiteralTo<UnsignedChar>(c, os);
+  *os << "'";
+
+  // To aid user debugging, we also print c's code in decimal, unless
+  // it's 0 (in which case c was printed as '\\0', making the code
+  // obvious).
+  if (c == 0)
+    return;
+  *os << " (" << static_cast<int>(c);
+
+  // For more convenience, we print c's code again in hexidecimal,
+  // unless c was already printed in the form '\x##' or the code is in
+  // [1, 9].
+  if (format == kHexEscape || (1 <= c && c <= 9)) {
+    // Do nothing.
+  } else {
+    *os << ", 0x" << String::FormatHexInt(static_cast<UnsignedChar>(c));
+  }
+  *os << ")";
+}
+
+void PrintTo(unsigned char c, ::std::ostream* os) {
+  PrintCharAndCodeTo<unsigned char>(c, os);
+}
+void PrintTo(signed char c, ::std::ostream* os) {
+  PrintCharAndCodeTo<unsigned char>(c, os);
+}
+
+// Prints a wchar_t as a symbol if it is printable or as its internal
+// code otherwise and also as its code.  L'\0' is printed as "L'\\0'".
+void PrintTo(wchar_t wc, ostream* os) {
+  PrintCharAndCodeTo<wchar_t>(wc, os);
+}
+
+// Prints the given array of characters to the ostream.  CharType must be either
+// char or wchar_t.
+// The array starts at begin, the length is len, it may include '\0' characters
+// and may not be NUL-terminated.
+template <typename CharType>
+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+static void PrintCharsAsStringTo(
+    const CharType* begin, size_t len, ostream* os) {
+  const char* const kQuoteBegin = sizeof(CharType) == 1 ? "\"" : "L\"";
+  *os << kQuoteBegin;
+  bool is_previous_hex = false;
+  for (size_t index = 0; index < len; ++index) {
+    const CharType cur = begin[index];
+    if (is_previous_hex && IsXDigit(cur)) {
+      // Previous character is of '\x..' form and this character can be
+      // interpreted as another hexadecimal digit in its number. Break string to
+      // disambiguate.
+      *os << "\" " << kQuoteBegin;
+    }
+    is_previous_hex = PrintAsStringLiteralTo(cur, os) == kHexEscape;
+  }
+  *os << "\"";
+}
+
+// Prints a (const) char/wchar_t array of 'len' elements, starting at address
+// 'begin'.  CharType must be either char or wchar_t.
+template <typename CharType>
+GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_
+GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
+GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_
+static void UniversalPrintCharArray(
+    const CharType* begin, size_t len, ostream* os) {
+  // The code
+  //   const char kFoo[] = "foo";
+  // generates an array of 4, not 3, elements, with the last one being '\0'.
+  //
+  // Therefore when printing a char array, we don't print the last element if
+  // it's '\0', such that the output matches the string literal as it's
+  // written in the source code.
+  if (len > 0 && begin[len - 1] == '\0') {
+    PrintCharsAsStringTo(begin, len - 1, os);
+    return;
+  }
+
+  // If, however, the last element in the array is not '\0', e.g.
+  //    const char kFoo[] = { 'f', 'o', 'o' };
+  // we must print the entire array.  We also print a message to indicate
+  // that the array is not NUL-terminated.
+  PrintCharsAsStringTo(begin, len, os);
+  *os << " (no terminating NUL)";
+}
+
+// Prints a (const) char array of 'len' elements, starting at address 'begin'.
+void UniversalPrintArray(const char* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+
+// Prints a (const) wchar_t array of 'len' elements, starting at address
+// 'begin'.
+void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
+  UniversalPrintCharArray(begin, len, os);
+}
+
+// Prints the given C string to the ostream.
+void PrintTo(const char* s, ostream* os) {
+  if (s == NULL) {
+    *os << "NULL";
+  } else {
+    *os << ImplicitCast_<const void*>(s) << " pointing to ";
+    PrintCharsAsStringTo(s, strlen(s), os);
+  }
+}
+
+// MSVC compiler can be configured to define whar_t as a typedef
+// of unsigned short. Defining an overload for const wchar_t* in that case
+// would cause pointers to unsigned shorts be printed as wide strings,
+// possibly accessing more memory than intended and causing invalid
+// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when
+// wchar_t is implemented as a native type.
+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
+// Prints the given wide C string to the ostream.
+void PrintTo(const wchar_t* s, ostream* os) {
+  if (s == NULL) {
+    *os << "NULL";
+  } else {
+    *os << ImplicitCast_<const void*>(s) << " pointing to ";
+    PrintCharsAsStringTo(s, std::wcslen(s), os);
+  }
+}
+#endif  // wchar_t is native
+
+// Prints a ::string object.
+#if GTEST_HAS_GLOBAL_STRING
+void PrintStringTo(const ::string& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+void PrintStringTo(const ::std::string& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+
+// Prints a ::wstring object.
+#if GTEST_HAS_GLOBAL_WSTRING
+void PrintWideStringTo(const ::wstring& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+#if GTEST_HAS_STD_WSTRING
+void PrintWideStringTo(const ::std::wstring& s, ostream* os) {
+  PrintCharsAsStringTo(s.data(), s.size(), os);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+}  // namespace internal
+
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-test-part.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-test-part.cc
new file mode 100644
index 0000000000..fb0e35425e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-test-part.cc
@@ -0,0 +1,110 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: mheule@google.com (Markus Heule)
+//
+// The Google C++ Testing Framework (Google Test)
+
+#include "gtest/gtest-test-part.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick exists to
+// prevent the accidental inclusion of gtest-internal-inl.h in the
+// user's code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+namespace testing {
+
+using internal::GetUnitTestImpl;
+
+// Gets the summary of the failure message by omitting the stack trace
+// in it.
+std::string TestPartResult::ExtractSummary(const char* message) {
+  const char* const stack_trace = strstr(message, internal::kStackTraceMarker);
+  return stack_trace == NULL ? message :
+      std::string(message, stack_trace);
+}
+
+// Prints a TestPartResult object.
+std::ostream& operator<<(std::ostream& os, const TestPartResult& result) {
+  return os
+      << result.file_name() << ":" << result.line_number() << ": "
+      << (result.type() == TestPartResult::kSuccess ? "Success" :
+          result.type() == TestPartResult::kFatalFailure ? "Fatal failure" :
+          "Non-fatal failure") << ":\n"
+      << result.message() << std::endl;
+}
+
+// Appends a TestPartResult to the array.
+void TestPartResultArray::Append(const TestPartResult& result) {
+  array_.push_back(result);
+}
+
+// Returns the TestPartResult at the given index (0-based).
+const TestPartResult& TestPartResultArray::GetTestPartResult(int index) const {
+  if (index < 0 || index >= size()) {
+    printf("\nInvalid index (%d) into TestPartResultArray.\n", index);
+    internal::posix::Abort();
+  }
+
+  return array_[index];
+}
+
+// Returns the number of TestPartResult objects in the array.
+int TestPartResultArray::size() const {
+  return static_cast<int>(array_.size());
+}
+
+namespace internal {
+
+HasNewFatalFailureHelper::HasNewFatalFailureHelper()
+    : has_new_fatal_failure_(false),
+      original_reporter_(GetUnitTestImpl()->
+                         GetTestPartResultReporterForCurrentThread()) {
+  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(this);
+}
+
+HasNewFatalFailureHelper::~HasNewFatalFailureHelper() {
+  GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(
+      original_reporter_);
+}
+
+void HasNewFatalFailureHelper::ReportTestPartResult(
+    const TestPartResult& result) {
+  if (result.fatally_failed())
+    has_new_fatal_failure_ = true;
+  original_reporter_->ReportTestPartResult(result);
+}
+
+}  // namespace internal
+
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-typed-test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-typed-test.cc
new file mode 100644
index 0000000000..df1eef4754
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest-typed-test.cc
@@ -0,0 +1,118 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "gtest/gtest-typed-test.h"
+#include "gtest/gtest.h"
+
+namespace testing {
+namespace internal {
+
+#if GTEST_HAS_TYPED_TEST_P
+
+// Skips to the first non-space char in str. Returns an empty string if str
+// contains only whitespace characters.
+static const char* SkipSpaces(const char* str) {
+  while (IsSpace(*str))
+    str++;
+  return str;
+}
+
+static std::vector<std::string> SplitIntoTestNames(const char* src) {
+  std::vector<std::string> name_vec;
+  src = SkipSpaces(src);
+  for (; src != NULL; src = SkipComma(src)) {
+    name_vec.push_back(StripTrailingSpaces(GetPrefixUntilComma(src)));
+  }
+  return name_vec;
+}
+
+// Verifies that registered_tests match the test names in
+// registered_tests_; returns registered_tests if successful, or
+// aborts the program otherwise.
+const char* TypedTestCasePState::VerifyRegisteredTestNames(
+    const char* file, int line, const char* registered_tests) {
+  typedef RegisteredTestsMap::const_iterator RegisteredTestIter;
+  registered_ = true;
+
+  std::vector<std::string> name_vec = SplitIntoTestNames(registered_tests);
+
+  Message errors;
+
+  std::set<std::string> tests;
+  for (std::vector<std::string>::const_iterator name_it = name_vec.begin();
+       name_it != name_vec.end(); ++name_it) {
+    const std::string& name = *name_it;
+    if (tests.count(name) != 0) {
+      errors << "Test " << name << " is listed more than once.\n";
+      continue;
+    }
+
+    bool found = false;
+    for (RegisteredTestIter it = registered_tests_.begin();
+         it != registered_tests_.end();
+         ++it) {
+      if (name == it->first) {
+        found = true;
+        break;
+      }
+    }
+
+    if (found) {
+      tests.insert(name);
+    } else {
+      errors << "No test named " << name
+             << " can be found in this test case.\n";
+    }
+  }
+
+  for (RegisteredTestIter it = registered_tests_.begin();
+       it != registered_tests_.end();
+       ++it) {
+    if (tests.count(it->first) == 0) {
+      errors << "You forgot to list test " << it->first << ".\n";
+    }
+  }
+
+  const std::string& errors_str = errors.GetString();
+  if (errors_str != "") {
+    fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(),
+            errors_str.c_str());
+    fflush(stderr);
+    posix::Abort();
+  }
+
+  return registered_tests;
+}
+
+#endif  // GTEST_HAS_TYPED_TEST_P
+
+}  // namespace internal
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest.cc
new file mode 100644
index 0000000000..d882ab2e36
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest.cc
@@ -0,0 +1,5388 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// The Google C++ Testing Framework (Google Test)
+
+#include "gtest/gtest.h"
+#include "gtest/internal/custom/gtest.h"
+#include "gtest/gtest-spi.h"
+
+#include <ctype.h>
+#include <math.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <wchar.h>
+#include <wctype.h>
+
+#include <algorithm>
+#include <iomanip>
+#include <limits>
+#include <list>
+#include <map>
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <vector>
+
+#if GTEST_OS_LINUX
+
+// TODO(kenton@google.com): Use autoconf to detect availability of
+// gettimeofday().
+# define GTEST_HAS_GETTIMEOFDAY_ 1
+
+# include <fcntl.h>  // NOLINT
+# include <limits.h>  // NOLINT
+# include <sched.h>  // NOLINT
+// Declares vsnprintf().  This header is not available on Windows.
+# include <strings.h>  // NOLINT
+# include <sys/mman.h>  // NOLINT
+# include <sys/time.h>  // NOLINT
+# include <unistd.h>  // NOLINT
+# include <string>
+
+#elif GTEST_OS_SYMBIAN
+# define GTEST_HAS_GETTIMEOFDAY_ 1
+# include <sys/time.h>  // NOLINT
+
+#elif GTEST_OS_ZOS
+# define GTEST_HAS_GETTIMEOFDAY_ 1
+# include <sys/time.h>  // NOLINT
+
+// On z/OS we additionally need strings.h for strcasecmp.
+# include <strings.h>  // NOLINT
+
+#elif GTEST_OS_WINDOWS_MOBILE  // We are on Windows CE.
+
+# include <windows.h>  // NOLINT
+# undef min
+
+#elif GTEST_OS_WINDOWS  // We are on Windows proper.
+
+# include <io.h>  // NOLINT
+# include <sys/timeb.h>  // NOLINT
+# include <sys/types.h>  // NOLINT
+# include <sys/stat.h>  // NOLINT
+
+# if GTEST_OS_WINDOWS_MINGW
+// MinGW has gettimeofday() but not _ftime64().
+// TODO(kenton@google.com): Use autoconf to detect availability of
+//   gettimeofday().
+// TODO(kenton@google.com): There are other ways to get the time on
+//   Windows, like GetTickCount() or GetSystemTimeAsFileTime().  MinGW
+//   supports these.  consider using them instead.
+#  define GTEST_HAS_GETTIMEOFDAY_ 1
+#  include <sys/time.h>  // NOLINT
+# endif  // GTEST_OS_WINDOWS_MINGW
+
+// cpplint thinks that the header is already included, so we want to
+// silence it.
+# include <windows.h>  // NOLINT
+# undef min
+
+#else
+
+// Assume other platforms have gettimeofday().
+// TODO(kenton@google.com): Use autoconf to detect availability of
+//   gettimeofday().
+# define GTEST_HAS_GETTIMEOFDAY_ 1
+
+// cpplint thinks that the header is already included, so we want to
+// silence it.
+# include <sys/time.h>  // NOLINT
+# include <unistd.h>  // NOLINT
+
+#endif  // GTEST_OS_LINUX
+
+#if GTEST_HAS_EXCEPTIONS
+# include <stdexcept>
+#endif
+
+#if GTEST_CAN_STREAM_RESULTS_
+# include <arpa/inet.h>  // NOLINT
+# include <netdb.h>  // NOLINT
+# include <sys/socket.h>  // NOLINT
+# include <sys/types.h>  // NOLINT
+#endif
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+#if GTEST_OS_WINDOWS
+# define vsnprintf _vsnprintf
+#endif  // GTEST_OS_WINDOWS
+
+namespace testing {
+
+using internal::CountIf;
+using internal::ForEach;
+using internal::GetElementOr;
+using internal::Shuffle;
+
+// Constants.
+
+// A test whose test case name or test name matches this filter is
+// disabled and not run.
+static const char kDisableTestFilter[] = "DISABLED_*:*/DISABLED_*";
+
+// A test case whose name matches this filter is considered a death
+// test case and will be run before test cases whose name doesn't
+// match this filter.
+static const char kDeathTestCaseFilter[] = "*DeathTest:*DeathTest/*";
+
+// A test filter that matches everything.
+static const char kUniversalFilter[] = "*";
+
+// The default output file for XML output.
+static const char kDefaultOutputFile[] = "test_detail.xml";
+
+// The environment variable name for the test shard index.
+static const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
+// The environment variable name for the total number of test shards.
+static const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS";
+// The environment variable name for the test shard status file.
+static const char kTestShardStatusFile[] = "GTEST_SHARD_STATUS_FILE";
+
+namespace internal {
+
+// The text used in failure messages to indicate the start of the
+// stack trace.
+const char kStackTraceMarker[] = "\nStack trace:\n";
+
+// g_help_flag is true iff the --help flag or an equivalent form is
+// specified on the command line.
+bool g_help_flag = false;
+
+}  // namespace internal
+
+static const char* GetDefaultFilter() {
+#ifdef GTEST_TEST_FILTER_ENV_VAR_
+  const char* const testbridge_test_only = getenv(GTEST_TEST_FILTER_ENV_VAR_);
+  if (testbridge_test_only != NULL) {
+    return testbridge_test_only;
+  }
+#endif  // GTEST_TEST_FILTER_ENV_VAR_
+  return kUniversalFilter;
+}
+
+GTEST_DEFINE_bool_(
+    also_run_disabled_tests,
+    internal::BoolFromGTestEnv("also_run_disabled_tests", false),
+    "Run disabled tests too, in addition to the tests normally being run.");
+
+GTEST_DEFINE_bool_(
+    break_on_failure,
+    internal::BoolFromGTestEnv("break_on_failure", false),
+    "True iff a failed assertion should be a debugger break-point.");
+
+GTEST_DEFINE_bool_(
+    catch_exceptions,
+    internal::BoolFromGTestEnv("catch_exceptions", true),
+    "True iff " GTEST_NAME_
+    " should catch exceptions and treat them as test failures.");
+
+GTEST_DEFINE_string_(
+    color,
+    internal::StringFromGTestEnv("color", "auto"),
+    "Whether to use colors in the output.  Valid values: yes, no, "
+    "and auto.  'auto' means to use colors if the output is "
+    "being sent to a terminal and the TERM environment variable "
+    "is set to a terminal type that supports colors.");
+
+GTEST_DEFINE_string_(
+    filter,
+    internal::StringFromGTestEnv("filter", GetDefaultFilter()),
+    "A colon-separated list of glob (not regex) patterns "
+    "for filtering the tests to run, optionally followed by a "
+    "'-' and a : separated list of negative patterns (tests to "
+    "exclude).  A test is run if it matches one of the positive "
+    "patterns and does not match any of the negative patterns.");
+
+GTEST_DEFINE_bool_(list_tests, false,
+                   "List all tests without running them.");
+
+GTEST_DEFINE_string_(
+    output,
+    internal::StringFromGTestEnv("output", ""),
+    "A format (currently must be \"xml\"), optionally followed "
+    "by a colon and an output file name or directory. A directory "
+    "is indicated by a trailing pathname separator. "
+    "Examples: \"xml:filename.xml\", \"xml::directoryname/\". "
+    "If a directory is specified, output files will be created "
+    "within that directory, with file-names based on the test "
+    "executable's name and, if necessary, made unique by adding "
+    "digits.");
+
+GTEST_DEFINE_bool_(
+    print_time,
+    internal::BoolFromGTestEnv("print_time", true),
+    "True iff " GTEST_NAME_
+    " should display elapsed time in text output.");
+
+GTEST_DEFINE_int32_(
+    random_seed,
+    internal::Int32FromGTestEnv("random_seed", 0),
+    "Random number seed to use when shuffling test orders.  Must be in range "
+    "[1, 99999], or 0 to use a seed based on the current time.");
+
+GTEST_DEFINE_int32_(
+    repeat,
+    internal::Int32FromGTestEnv("repeat", 1),
+    "How many times to repeat each test.  Specify a negative number "
+    "for repeating forever.  Useful for shaking out flaky tests.");
+
+GTEST_DEFINE_bool_(
+    show_internal_stack_frames, false,
+    "True iff " GTEST_NAME_ " should include internal stack frames when "
+    "printing test failure stack traces.");
+
+GTEST_DEFINE_bool_(
+    shuffle,
+    internal::BoolFromGTestEnv("shuffle", false),
+    "True iff " GTEST_NAME_
+    " should randomize tests' order on every run.");
+
+GTEST_DEFINE_int32_(
+    stack_trace_depth,
+    internal::Int32FromGTestEnv("stack_trace_depth", kMaxStackTraceDepth),
+    "The maximum number of stack frames to print when an "
+    "assertion fails.  The valid range is 0 through 100, inclusive.");
+
+GTEST_DEFINE_string_(
+    stream_result_to,
+    internal::StringFromGTestEnv("stream_result_to", ""),
+    "This flag specifies the host name and the port number on which to stream "
+    "test results. Example: \"localhost:555\". The flag is effective only on "
+    "Linux.");
+
+GTEST_DEFINE_bool_(
+    throw_on_failure,
+    internal::BoolFromGTestEnv("throw_on_failure", false),
+    "When this flag is specified, a failed assertion will throw an exception "
+    "if exceptions are enabled or exit the program with a non-zero code "
+    "otherwise.");
+
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
+GTEST_DEFINE_string_(
+    flagfile,
+    internal::StringFromGTestEnv("flagfile", ""),
+    "This flag specifies the flagfile to read command-line flags from.");
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+
+namespace internal {
+
+// Generates a random number from [0, range), using a Linear
+// Congruential Generator (LCG).  Crashes if 'range' is 0 or greater
+// than kMaxRange.
+UInt32 Random::Generate(UInt32 range) {
+  // These constants are the same as are used in glibc's rand(3).
+  state_ = (1103515245U*state_ + 12345U) % kMaxRange;
+
+  GTEST_CHECK_(range > 0)
+      << "Cannot generate a number in the range [0, 0).";
+  GTEST_CHECK_(range <= kMaxRange)
+      << "Generation of a number in [0, " << range << ") was requested, "
+      << "but this can only generate numbers in [0, " << kMaxRange << ").";
+
+  // Converting via modulus introduces a bit of downward bias, but
+  // it's simple, and a linear congruential generator isn't too good
+  // to begin with.
+  return state_ % range;
+}
+
+// GTestIsInitialized() returns true iff the user has initialized
+// Google Test.  Useful for catching the user mistake of not initializing
+// Google Test before calling RUN_ALL_TESTS().
+static bool GTestIsInitialized() { return GetArgvs().size() > 0; }
+
+// Iterates over a vector of TestCases, keeping a running sum of the
+// results of calling a given int-returning method on each.
+// Returns the sum.
+static int SumOverTestCaseList(const std::vector<TestCase*>& case_list,
+                               int (TestCase::*method)() const) {
+  int sum = 0;
+  for (size_t i = 0; i < case_list.size(); i++) {
+    sum += (case_list[i]->*method)();
+  }
+  return sum;
+}
+
+// Returns true iff the test case passed.
+static bool TestCasePassed(const TestCase* test_case) {
+  return test_case->should_run() && test_case->Passed();
+}
+
+// Returns true iff the test case failed.
+static bool TestCaseFailed(const TestCase* test_case) {
+  return test_case->should_run() && test_case->Failed();
+}
+
+// Returns true iff test_case contains at least one test that should
+// run.
+static bool ShouldRunTestCase(const TestCase* test_case) {
+  return test_case->should_run();
+}
+
+// AssertHelper constructor.
+AssertHelper::AssertHelper(TestPartResult::Type type,
+                           const char* file,
+                           int line,
+                           const char* message)
+    : data_(new AssertHelperData(type, file, line, message)) {
+}
+
+AssertHelper::~AssertHelper() {
+  delete data_;
+}
+
+// Message assignment, for assertion streaming support.
+void AssertHelper::operator=(const Message& message) const {
+  UnitTest::GetInstance()->
+    AddTestPartResult(data_->type, data_->file, data_->line,
+                      AppendUserMessage(data_->message, message),
+                      UnitTest::GetInstance()->impl()
+                      ->CurrentOsStackTraceExceptTop(1)
+                      // Skips the stack frame for this function itself.
+                      );  // NOLINT
+}
+
+// Mutex for linked pointers.
+GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex);
+
+// A copy of all command line arguments.  Set by InitGoogleTest().
+::std::vector<testing::internal::string> g_argvs;
+
+const ::std::vector<testing::internal::string>& GetArgvs() {
+#if defined(GTEST_CUSTOM_GET_ARGVS_)
+  return GTEST_CUSTOM_GET_ARGVS_();
+#else  // defined(GTEST_CUSTOM_GET_ARGVS_)
+  return g_argvs;
+#endif  // defined(GTEST_CUSTOM_GET_ARGVS_)
+}
+
+// Returns the current application's name, removing directory path if that
+// is present.
+FilePath GetCurrentExecutableName() {
+  FilePath result;
+
+#if GTEST_OS_WINDOWS
+  result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe"));
+#else
+  result.Set(FilePath(GetArgvs()[0]));
+#endif  // GTEST_OS_WINDOWS
+
+  return result.RemoveDirectoryName();
+}
+
+// Functions for processing the gtest_output flag.
+
+// Returns the output format, or "" for normal printed output.
+std::string UnitTestOptions::GetOutputFormat() {
+  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
+  if (gtest_output_flag == NULL) return std::string("");
+
+  const char* const colon = strchr(gtest_output_flag, ':');
+  return (colon == NULL) ?
+      std::string(gtest_output_flag) :
+      std::string(gtest_output_flag, colon - gtest_output_flag);
+}
+
+// Returns the name of the requested output file, or the default if none
+// was explicitly specified.
+std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
+  const char* const gtest_output_flag = GTEST_FLAG(output).c_str();
+  if (gtest_output_flag == NULL)
+    return "";
+
+  const char* const colon = strchr(gtest_output_flag, ':');
+  if (colon == NULL)
+    return internal::FilePath::ConcatPaths(
+        internal::FilePath(
+            UnitTest::GetInstance()->original_working_dir()),
+        internal::FilePath(kDefaultOutputFile)).string();
+
+  internal::FilePath output_name(colon + 1);
+  if (!output_name.IsAbsolutePath())
+    // TODO(wan@google.com): on Windows \some\path is not an absolute
+    // path (as its meaning depends on the current drive), yet the
+    // following logic for turning it into an absolute path is wrong.
+    // Fix it.
+    output_name = internal::FilePath::ConcatPaths(
+        internal::FilePath(UnitTest::GetInstance()->original_working_dir()),
+        internal::FilePath(colon + 1));
+
+  if (!output_name.IsDirectory())
+    return output_name.string();
+
+  internal::FilePath result(internal::FilePath::GenerateUniqueFileName(
+      output_name, internal::GetCurrentExecutableName(),
+      GetOutputFormat().c_str()));
+  return result.string();
+}
+
+// Returns true iff the wildcard pattern matches the string.  The
+// first ':' or '\0' character in pattern marks the end of it.
+//
+// This recursive algorithm isn't very efficient, but is clear and
+// works well enough for matching test names, which are short.
+bool UnitTestOptions::PatternMatchesString(const char *pattern,
+                                           const char *str) {
+  switch (*pattern) {
+    case '\0':
+    case ':':  // Either ':' or '\0' marks the end of the pattern.
+      return *str == '\0';
+    case '?':  // Matches any single character.
+      return *str != '\0' && PatternMatchesString(pattern + 1, str + 1);
+    case '*':  // Matches any string (possibly empty) of characters.
+      return (*str != '\0' && PatternMatchesString(pattern, str + 1)) ||
+          PatternMatchesString(pattern + 1, str);
+    default:  // Non-special character.  Matches itself.
+      return *pattern == *str &&
+          PatternMatchesString(pattern + 1, str + 1);
+  }
+}
+
+bool UnitTestOptions::MatchesFilter(
+    const std::string& name, const char* filter) {
+  const char *cur_pattern = filter;
+  for (;;) {
+    if (PatternMatchesString(cur_pattern, name.c_str())) {
+      return true;
+    }
+
+    // Finds the next pattern in the filter.
+    cur_pattern = strchr(cur_pattern, ':');
+
+    // Returns if no more pattern can be found.
+    if (cur_pattern == NULL) {
+      return false;
+    }
+
+    // Skips the pattern separater (the ':' character).
+    cur_pattern++;
+  }
+}
+
+// Returns true iff the user-specified filter matches the test case
+// name and the test name.
+bool UnitTestOptions::FilterMatchesTest(const std::string &test_case_name,
+                                        const std::string &test_name) {
+  const std::string& full_name = test_case_name + "." + test_name.c_str();
+
+  // Split --gtest_filter at '-', if there is one, to separate into
+  // positive filter and negative filter portions
+  const char* const p = GTEST_FLAG(filter).c_str();
+  const char* const dash = strchr(p, '-');
+  std::string positive;
+  std::string negative;
+  if (dash == NULL) {
+    positive = GTEST_FLAG(filter).c_str();  // Whole string is a positive filter
+    negative = "";
+  } else {
+    positive = std::string(p, dash);   // Everything up to the dash
+    negative = std::string(dash + 1);  // Everything after the dash
+    if (positive.empty()) {
+      // Treat '-test1' as the same as '*-test1'
+      positive = kUniversalFilter;
+    }
+  }
+
+  // A filter is a colon-separated list of patterns.  It matches a
+  // test if any pattern in it matches the test.
+  return (MatchesFilter(full_name, positive.c_str()) &&
+          !MatchesFilter(full_name, negative.c_str()));
+}
+
+#if GTEST_HAS_SEH
+// Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the
+// given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise.
+// This function is useful as an __except condition.
+int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) {
+  // Google Test should handle a SEH exception if:
+  //   1. the user wants it to, AND
+  //   2. this is not a breakpoint exception, AND
+  //   3. this is not a C++ exception (VC++ implements them via SEH,
+  //      apparently).
+  //
+  // SEH exception code for C++ exceptions.
+  // (see http://support.microsoft.com/kb/185294 for more information).
+  const DWORD kCxxExceptionCode = 0xe06d7363;
+
+  bool should_handle = true;
+
+  if (!GTEST_FLAG(catch_exceptions))
+    should_handle = false;
+  else if (exception_code == EXCEPTION_BREAKPOINT)
+    should_handle = false;
+  else if (exception_code == kCxxExceptionCode)
+    should_handle = false;
+
+  return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
+}
+#endif  // GTEST_HAS_SEH
+
+}  // namespace internal
+
+// The c'tor sets this object as the test part result reporter used by
+// Google Test.  The 'result' parameter specifies where to report the
+// results. Intercepts only failures from the current thread.
+ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
+    TestPartResultArray* result)
+    : intercept_mode_(INTERCEPT_ONLY_CURRENT_THREAD),
+      result_(result) {
+  Init();
+}
+
+// The c'tor sets this object as the test part result reporter used by
+// Google Test.  The 'result' parameter specifies where to report the
+// results.
+ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter(
+    InterceptMode intercept_mode, TestPartResultArray* result)
+    : intercept_mode_(intercept_mode),
+      result_(result) {
+  Init();
+}
+
+void ScopedFakeTestPartResultReporter::Init() {
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
+    old_reporter_ = impl->GetGlobalTestPartResultReporter();
+    impl->SetGlobalTestPartResultReporter(this);
+  } else {
+    old_reporter_ = impl->GetTestPartResultReporterForCurrentThread();
+    impl->SetTestPartResultReporterForCurrentThread(this);
+  }
+}
+
+// The d'tor restores the test part result reporter used by Google Test
+// before.
+ScopedFakeTestPartResultReporter::~ScopedFakeTestPartResultReporter() {
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  if (intercept_mode_ == INTERCEPT_ALL_THREADS) {
+    impl->SetGlobalTestPartResultReporter(old_reporter_);
+  } else {
+    impl->SetTestPartResultReporterForCurrentThread(old_reporter_);
+  }
+}
+
+// Increments the test part result count and remembers the result.
+// This method is from the TestPartResultReporterInterface interface.
+void ScopedFakeTestPartResultReporter::ReportTestPartResult(
+    const TestPartResult& result) {
+  result_->Append(result);
+}
+
+namespace internal {
+
+// Returns the type ID of ::testing::Test.  We should always call this
+// instead of GetTypeId< ::testing::Test>() to get the type ID of
+// testing::Test.  This is to work around a suspected linker bug when
+// using Google Test as a framework on Mac OS X.  The bug causes
+// GetTypeId< ::testing::Test>() to return different values depending
+// on whether the call is from the Google Test framework itself or
+// from user test code.  GetTestTypeId() is guaranteed to always
+// return the same value, as it always calls GetTypeId<>() from the
+// gtest.cc, which is within the Google Test framework.
+TypeId GetTestTypeId() {
+  return GetTypeId<Test>();
+}
+
+// The value of GetTestTypeId() as seen from within the Google Test
+// library.  This is solely for testing GetTestTypeId().
+extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId();
+
+// This predicate-formatter checks that 'results' contains a test part
+// failure of the given type and that the failure message contains the
+// given substring.
+AssertionResult HasOneFailure(const char* /* results_expr */,
+                              const char* /* type_expr */,
+                              const char* /* substr_expr */,
+                              const TestPartResultArray& results,
+                              TestPartResult::Type type,
+                              const string& substr) {
+  const std::string expected(type == TestPartResult::kFatalFailure ?
+                        "1 fatal failure" :
+                        "1 non-fatal failure");
+  Message msg;
+  if (results.size() != 1) {
+    msg << "Expected: " << expected << "\n"
+        << "  Actual: " << results.size() << " failures";
+    for (int i = 0; i < results.size(); i++) {
+      msg << "\n" << results.GetTestPartResult(i);
+    }
+    return AssertionFailure() << msg;
+  }
+
+  const TestPartResult& r = results.GetTestPartResult(0);
+  if (r.type() != type) {
+    return AssertionFailure() << "Expected: " << expected << "\n"
+                              << "  Actual:\n"
+                              << r;
+  }
+
+  if (strstr(r.message(), substr.c_str()) == NULL) {
+    return AssertionFailure() << "Expected: " << expected << " containing \""
+                              << substr << "\"\n"
+                              << "  Actual:\n"
+                              << r;
+  }
+
+  return AssertionSuccess();
+}
+
+// The constructor of SingleFailureChecker remembers where to look up
+// test part results, what type of failure we expect, and what
+// substring the failure message should contain.
+SingleFailureChecker:: SingleFailureChecker(
+    const TestPartResultArray* results,
+    TestPartResult::Type type,
+    const string& substr)
+    : results_(results),
+      type_(type),
+      substr_(substr) {}
+
+// The destructor of SingleFailureChecker verifies that the given
+// TestPartResultArray contains exactly one failure that has the given
+// type and contains the given substring.  If that's not the case, a
+// non-fatal failure will be generated.
+SingleFailureChecker::~SingleFailureChecker() {
+  EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_);
+}
+
+DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter(
+    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
+
+void DefaultGlobalTestPartResultReporter::ReportTestPartResult(
+    const TestPartResult& result) {
+  unit_test_->current_test_result()->AddTestPartResult(result);
+  unit_test_->listeners()->repeater()->OnTestPartResult(result);
+}
+
+DefaultPerThreadTestPartResultReporter::DefaultPerThreadTestPartResultReporter(
+    UnitTestImpl* unit_test) : unit_test_(unit_test) {}
+
+void DefaultPerThreadTestPartResultReporter::ReportTestPartResult(
+    const TestPartResult& result) {
+  unit_test_->GetGlobalTestPartResultReporter()->ReportTestPartResult(result);
+}
+
+// Returns the global test part result reporter.
+TestPartResultReporterInterface*
+UnitTestImpl::GetGlobalTestPartResultReporter() {
+  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
+  return global_test_part_result_repoter_;
+}
+
+// Sets the global test part result reporter.
+void UnitTestImpl::SetGlobalTestPartResultReporter(
+    TestPartResultReporterInterface* reporter) {
+  internal::MutexLock lock(&global_test_part_result_reporter_mutex_);
+  global_test_part_result_repoter_ = reporter;
+}
+
+// Returns the test part result reporter for the current thread.
+TestPartResultReporterInterface*
+UnitTestImpl::GetTestPartResultReporterForCurrentThread() {
+  return per_thread_test_part_result_reporter_.get();
+}
+
+// Sets the test part result reporter for the current thread.
+void UnitTestImpl::SetTestPartResultReporterForCurrentThread(
+    TestPartResultReporterInterface* reporter) {
+  per_thread_test_part_result_reporter_.set(reporter);
+}
+
+// Gets the number of successful test cases.
+int UnitTestImpl::successful_test_case_count() const {
+  return CountIf(test_cases_, TestCasePassed);
+}
+
+// Gets the number of failed test cases.
+int UnitTestImpl::failed_test_case_count() const {
+  return CountIf(test_cases_, TestCaseFailed);
+}
+
+// Gets the number of all test cases.
+int UnitTestImpl::total_test_case_count() const {
+  return static_cast<int>(test_cases_.size());
+}
+
+// Gets the number of all test cases that contain at least one test
+// that should run.
+int UnitTestImpl::test_case_to_run_count() const {
+  return CountIf(test_cases_, ShouldRunTestCase);
+}
+
+// Gets the number of successful tests.
+int UnitTestImpl::successful_test_count() const {
+  return SumOverTestCaseList(test_cases_, &TestCase::successful_test_count);
+}
+
+// Gets the number of failed tests.
+int UnitTestImpl::failed_test_count() const {
+  return SumOverTestCaseList(test_cases_, &TestCase::failed_test_count);
+}
+
+// Gets the number of disabled tests that will be reported in the XML report.
+int UnitTestImpl::reportable_disabled_test_count() const {
+  return SumOverTestCaseList(test_cases_,
+                             &TestCase::reportable_disabled_test_count);
+}
+
+// Gets the number of disabled tests.
+int UnitTestImpl::disabled_test_count() const {
+  return SumOverTestCaseList(test_cases_, &TestCase::disabled_test_count);
+}
+
+// Gets the number of tests to be printed in the XML report.
+int UnitTestImpl::reportable_test_count() const {
+  return SumOverTestCaseList(test_cases_, &TestCase::reportable_test_count);
+}
+
+// Gets the number of all tests.
+int UnitTestImpl::total_test_count() const {
+  return SumOverTestCaseList(test_cases_, &TestCase::total_test_count);
+}
+
+// Gets the number of tests that should run.
+int UnitTestImpl::test_to_run_count() const {
+  return SumOverTestCaseList(test_cases_, &TestCase::test_to_run_count);
+}
+
+// Returns the current OS stack trace as an std::string.
+//
+// The maximum number of stack frames to be included is specified by
+// the gtest_stack_trace_depth flag.  The skip_count parameter
+// specifies the number of top frames to be skipped, which doesn't
+// count against the number of frames to be included.
+//
+// For example, if Foo() calls Bar(), which in turn calls
+// CurrentOsStackTraceExceptTop(1), Foo() will be included in the
+// trace but Bar() and CurrentOsStackTraceExceptTop() won't.
+std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) {
+  return os_stack_trace_getter()->CurrentStackTrace(
+      static_cast<int>(GTEST_FLAG(stack_trace_depth)),
+      skip_count + 1
+      // Skips the user-specified number of frames plus this function
+      // itself.
+      );  // NOLINT
+}
+
+// Returns the current time in milliseconds.
+TimeInMillis GetTimeInMillis() {
+#if GTEST_OS_WINDOWS_MOBILE || defined(__BORLANDC__)
+  // Difference between 1970-01-01 and 1601-01-01 in milliseconds.
+  // http://analogous.blogspot.com/2005/04/epoch.html
+  const TimeInMillis kJavaEpochToWinFileTimeDelta =
+    static_cast<TimeInMillis>(116444736UL) * 100000UL;
+  const DWORD kTenthMicrosInMilliSecond = 10000;
+
+  SYSTEMTIME now_systime;
+  FILETIME now_filetime;
+  ULARGE_INTEGER now_int64;
+  // TODO(kenton@google.com): Shouldn't this just use
+  //   GetSystemTimeAsFileTime()?
+  GetSystemTime(&now_systime);
+  if (SystemTimeToFileTime(&now_systime, &now_filetime)) {
+    now_int64.LowPart = now_filetime.dwLowDateTime;
+    now_int64.HighPart = now_filetime.dwHighDateTime;
+    now_int64.QuadPart = (now_int64.QuadPart / kTenthMicrosInMilliSecond) -
+      kJavaEpochToWinFileTimeDelta;
+    return now_int64.QuadPart;
+  }
+  return 0;
+#elif GTEST_OS_WINDOWS && !GTEST_HAS_GETTIMEOFDAY_
+  __timeb64 now;
+
+  // MSVC 8 deprecates _ftime64(), so we want to suppress warning 4996
+  // (deprecated function) there.
+  // TODO(kenton@google.com): Use GetTickCount()?  Or use
+  //   SystemTimeToFileTime()
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996)
+  _ftime64(&now);
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+
+  return static_cast<TimeInMillis>(now.time) * 1000 + now.millitm;
+#elif GTEST_HAS_GETTIMEOFDAY_
+  struct timeval now;
+  gettimeofday(&now, NULL);
+  return static_cast<TimeInMillis>(now.tv_sec) * 1000 + now.tv_usec / 1000;
+#else
+# error "Don't know how to get the current time on your system."
+#endif
+}
+
+// Utilities
+
+// class String.
+
+#if GTEST_OS_WINDOWS_MOBILE
+// Creates a UTF-16 wide string from the given ANSI string, allocating
+// memory using new. The caller is responsible for deleting the return
+// value using delete[]. Returns the wide string, or NULL if the
+// input is NULL.
+LPCWSTR String::AnsiToUtf16(const char* ansi) {
+  if (!ansi) return NULL;
+  const int length = strlen(ansi);
+  const int unicode_length =
+      MultiByteToWideChar(CP_ACP, 0, ansi, length,
+                          NULL, 0);
+  WCHAR* unicode = new WCHAR[unicode_length + 1];
+  MultiByteToWideChar(CP_ACP, 0, ansi, length,
+                      unicode, unicode_length);
+  unicode[unicode_length] = 0;
+  return unicode;
+}
+
+// Creates an ANSI string from the given wide string, allocating
+// memory using new. The caller is responsible for deleting the return
+// value using delete[]. Returns the ANSI string, or NULL if the
+// input is NULL.
+const char* String::Utf16ToAnsi(LPCWSTR utf16_str)  {
+  if (!utf16_str) return NULL;
+  const int ansi_length =
+      WideCharToMultiByte(CP_ACP, 0, utf16_str, -1,
+                          NULL, 0, NULL, NULL);
+  char* ansi = new char[ansi_length + 1];
+  WideCharToMultiByte(CP_ACP, 0, utf16_str, -1,
+                      ansi, ansi_length, NULL, NULL);
+  ansi[ansi_length] = 0;
+  return ansi;
+}
+
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+// Compares two C strings.  Returns true iff they have the same content.
+//
+// Unlike strcmp(), this function can handle NULL argument(s).  A NULL
+// C string is considered different to any non-NULL C string,
+// including the empty string.
+bool String::CStringEquals(const char * lhs, const char * rhs) {
+  if ( lhs == NULL ) return rhs == NULL;
+
+  if ( rhs == NULL ) return false;
+
+  return strcmp(lhs, rhs) == 0;
+}
+
+#if GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING
+
+// Converts an array of wide chars to a narrow string using the UTF-8
+// encoding, and streams the result to the given Message object.
+static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length,
+                                     Message* msg) {
+  for (size_t i = 0; i != length; ) {  // NOLINT
+    if (wstr[i] != L'\0') {
+      *msg << WideStringToUtf8(wstr + i, static_cast<int>(length - i));
+      while (i != length && wstr[i] != L'\0')
+        i++;
+    } else {
+      *msg << '\0';
+      i++;
+    }
+  }
+}
+
+#endif  // GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING
+
+void SplitString(const ::std::string& str, char delimiter,
+                 ::std::vector< ::std::string>* dest) {
+  ::std::vector< ::std::string> parsed;
+  ::std::string::size_type pos = 0;
+  while (::testing::internal::AlwaysTrue()) {
+    const ::std::string::size_type colon = str.find(delimiter, pos);
+    if (colon == ::std::string::npos) {
+      parsed.push_back(str.substr(pos));
+      break;
+    } else {
+      parsed.push_back(str.substr(pos, colon - pos));
+      pos = colon + 1;
+    }
+  }
+  dest->swap(parsed);
+}
+
+}  // namespace internal
+
+// Constructs an empty Message.
+// We allocate the stringstream separately because otherwise each use of
+// ASSERT/EXPECT in a procedure adds over 200 bytes to the procedure's
+// stack frame leading to huge stack frames in some cases; gcc does not reuse
+// the stack space.
+Message::Message() : ss_(new ::std::stringstream) {
+  // By default, we want there to be enough precision when printing
+  // a double to a Message.
+  *ss_ << std::setprecision(std::numeric_limits<double>::digits10 + 2);
+}
+
+// These two overloads allow streaming a wide C string to a Message
+// using the UTF-8 encoding.
+Message& Message::operator <<(const wchar_t* wide_c_str) {
+  return *this << internal::String::ShowWideCString(wide_c_str);
+}
+Message& Message::operator <<(wchar_t* wide_c_str) {
+  return *this << internal::String::ShowWideCString(wide_c_str);
+}
+
+#if GTEST_HAS_STD_WSTRING
+// Converts the given wide string to a narrow string using the UTF-8
+// encoding, and streams the result to this Message object.
+Message& Message::operator <<(const ::std::wstring& wstr) {
+  internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this);
+  return *this;
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+#if GTEST_HAS_GLOBAL_WSTRING
+// Converts the given wide string to a narrow string using the UTF-8
+// encoding, and streams the result to this Message object.
+Message& Message::operator <<(const ::wstring& wstr) {
+  internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this);
+  return *this;
+}
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+// Gets the text streamed to this object so far as an std::string.
+// Each '\0' character in the buffer is replaced with "\\0".
+std::string Message::GetString() const {
+  return internal::StringStreamToString(ss_.get());
+}
+
+// AssertionResult constructors.
+// Used in EXPECT_TRUE/FALSE(assertion_result).
+AssertionResult::AssertionResult(const AssertionResult& other)
+    : success_(other.success_),
+      message_(other.message_.get() != NULL ?
+               new ::std::string(*other.message_) :
+               static_cast< ::std::string*>(NULL)) {
+}
+
+// Swaps two AssertionResults.
+void AssertionResult::swap(AssertionResult& other) {
+  using std::swap;
+  swap(success_, other.success_);
+  swap(message_, other.message_);
+}
+
+// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
+AssertionResult AssertionResult::operator!() const {
+  AssertionResult negation(!success_);
+  if (message_.get() != NULL)
+    negation << *message_;
+  return negation;
+}
+
+// Makes a successful assertion result.
+AssertionResult AssertionSuccess() {
+  return AssertionResult(true);
+}
+
+// Makes a failed assertion result.
+AssertionResult AssertionFailure() {
+  return AssertionResult(false);
+}
+
+// Makes a failed assertion result with the given failure message.
+// Deprecated; use AssertionFailure() << message.
+AssertionResult AssertionFailure(const Message& message) {
+  return AssertionFailure() << message;
+}
+
+namespace internal {
+
+namespace edit_distance {
+std::vector<EditType> CalculateOptimalEdits(const std::vector<size_t>& left,
+                                            const std::vector<size_t>& right) {
+  std::vector<std::vector<double> > costs(
+      left.size() + 1, std::vector<double>(right.size() + 1));
+  std::vector<std::vector<EditType> > best_move(
+      left.size() + 1, std::vector<EditType>(right.size() + 1));
+
+  // Populate for empty right.
+  for (size_t l_i = 0; l_i < costs.size(); ++l_i) {
+    costs[l_i][0] = static_cast<double>(l_i);
+    best_move[l_i][0] = kRemove;
+  }
+  // Populate for empty left.
+  for (size_t r_i = 1; r_i < costs[0].size(); ++r_i) {
+    costs[0][r_i] = static_cast<double>(r_i);
+    best_move[0][r_i] = kAdd;
+  }
+
+  for (size_t l_i = 0; l_i < left.size(); ++l_i) {
+    for (size_t r_i = 0; r_i < right.size(); ++r_i) {
+      if (left[l_i] == right[r_i]) {
+        // Found a match. Consume it.
+        costs[l_i + 1][r_i + 1] = costs[l_i][r_i];
+        best_move[l_i + 1][r_i + 1] = kMatch;
+        continue;
+      }
+
+      const double add = costs[l_i + 1][r_i];
+      const double remove = costs[l_i][r_i + 1];
+      const double replace = costs[l_i][r_i];
+      if (add < remove && add < replace) {
+        costs[l_i + 1][r_i + 1] = add + 1;
+        best_move[l_i + 1][r_i + 1] = kAdd;
+      } else if (remove < add && remove < replace) {
+        costs[l_i + 1][r_i + 1] = remove + 1;
+        best_move[l_i + 1][r_i + 1] = kRemove;
+      } else {
+        // We make replace a little more expensive than add/remove to lower
+        // their priority.
+        costs[l_i + 1][r_i + 1] = replace + 1.00001;
+        best_move[l_i + 1][r_i + 1] = kReplace;
+      }
+    }
+  }
+
+  // Reconstruct the best path. We do it in reverse order.
+  std::vector<EditType> best_path;
+  for (size_t l_i = left.size(), r_i = right.size(); l_i > 0 || r_i > 0;) {
+    EditType move = best_move[l_i][r_i];
+    best_path.push_back(move);
+    l_i -= move != kAdd;
+    r_i -= move != kRemove;
+  }
+  std::reverse(best_path.begin(), best_path.end());
+  return best_path;
+}
+
+namespace {
+
+// Helper class to convert string into ids with deduplication.
+class InternalStrings {
+ public:
+  size_t GetId(const std::string& str) {
+    IdMap::iterator it = ids_.find(str);
+    if (it != ids_.end()) return it->second;
+    size_t id = ids_.size();
+    return ids_[str] = id;
+  }
+
+ private:
+  typedef std::map<std::string, size_t> IdMap;
+  IdMap ids_;
+};
+
+}  // namespace
+
+std::vector<EditType> CalculateOptimalEdits(
+    const std::vector<std::string>& left,
+    const std::vector<std::string>& right) {
+  std::vector<size_t> left_ids, right_ids;
+  {
+    InternalStrings intern_table;
+    for (size_t i = 0; i < left.size(); ++i) {
+      left_ids.push_back(intern_table.GetId(left[i]));
+    }
+    for (size_t i = 0; i < right.size(); ++i) {
+      right_ids.push_back(intern_table.GetId(right[i]));
+    }
+  }
+  return CalculateOptimalEdits(left_ids, right_ids);
+}
+
+namespace {
+
+// Helper class that holds the state for one hunk and prints it out to the
+// stream.
+// It reorders adds/removes when possible to group all removes before all
+// adds. It also adds the hunk header before printint into the stream.
+class Hunk {
+ public:
+  Hunk(size_t left_start, size_t right_start)
+      : left_start_(left_start),
+        right_start_(right_start),
+        adds_(),
+        removes_(),
+        common_() {}
+
+  void PushLine(char edit, const char* line) {
+    switch (edit) {
+      case ' ':
+        ++common_;
+        FlushEdits();
+        hunk_.push_back(std::make_pair(' ', line));
+        break;
+      case '-':
+        ++removes_;
+        hunk_removes_.push_back(std::make_pair('-', line));
+        break;
+      case '+':
+        ++adds_;
+        hunk_adds_.push_back(std::make_pair('+', line));
+        break;
+    }
+  }
+
+  void PrintTo(std::ostream* os) {
+    PrintHeader(os);
+    FlushEdits();
+    for (std::list<std::pair<char, const char*> >::const_iterator it =
+             hunk_.begin();
+         it != hunk_.end(); ++it) {
+      *os << it->first << it->second << "\n";
+    }
+  }
+
+  bool has_edits() const { return adds_ || removes_; }
+
+ private:
+  void FlushEdits() {
+    hunk_.splice(hunk_.end(), hunk_removes_);
+    hunk_.splice(hunk_.end(), hunk_adds_);
+  }
+
+  // Print a unified diff header for one hunk.
+  // The format is
+  //   "@@ -<left_start>,<left_length> +<right_start>,<right_length> @@"
+  // where the left/right parts are ommitted if unnecessary.
+  void PrintHeader(std::ostream* ss) const {
+    *ss << "@@ ";
+    if (removes_) {
+      *ss << "-" << left_start_ << "," << (removes_ + common_);
+    }
+    if (removes_ && adds_) {
+      *ss << " ";
+    }
+    if (adds_) {
+      *ss << "+" << right_start_ << "," << (adds_ + common_);
+    }
+    *ss << " @@\n";
+  }
+
+  size_t left_start_, right_start_;
+  size_t adds_, removes_, common_;
+  std::list<std::pair<char, const char*> > hunk_, hunk_adds_, hunk_removes_;
+};
+
+}  // namespace
+
+// Create a list of diff hunks in Unified diff format.
+// Each hunk has a header generated by PrintHeader above plus a body with
+// lines prefixed with ' ' for no change, '-' for deletion and '+' for
+// addition.
+// 'context' represents the desired unchanged prefix/suffix around the diff.
+// If two hunks are close enough that their contexts overlap, then they are
+// joined into one hunk.
+std::string CreateUnifiedDiff(const std::vector<std::string>& left,
+                              const std::vector<std::string>& right,
+                              size_t context) {
+  const std::vector<EditType> edits = CalculateOptimalEdits(left, right);
+
+  size_t l_i = 0, r_i = 0, edit_i = 0;
+  std::stringstream ss;
+  while (edit_i < edits.size()) {
+    // Find first edit.
+    while (edit_i < edits.size() && edits[edit_i] == kMatch) {
+      ++l_i;
+      ++r_i;
+      ++edit_i;
+    }
+
+    // Find the first line to include in the hunk.
+    const size_t prefix_context = std::min(l_i, context);
+    Hunk hunk(l_i - prefix_context + 1, r_i - prefix_context + 1);
+    for (size_t i = prefix_context; i > 0; --i) {
+      hunk.PushLine(' ', left[l_i - i].c_str());
+    }
+
+    // Iterate the edits until we found enough suffix for the hunk or the input
+    // is over.
+    size_t n_suffix = 0;
+    for (; edit_i < edits.size(); ++edit_i) {
+      if (n_suffix >= context) {
+        // Continue only if the next hunk is very close.
+        std::vector<EditType>::const_iterator it = edits.begin() + edit_i;
+        while (it != edits.end() && *it == kMatch) ++it;
+        if (it == edits.end() || (it - edits.begin()) - edit_i >= context) {
+          // There is no next edit or it is too far away.
+          break;
+        }
+      }
+
+      EditType edit = edits[edit_i];
+      // Reset count when a non match is found.
+      n_suffix = edit == kMatch ? n_suffix + 1 : 0;
+
+      if (edit == kMatch || edit == kRemove || edit == kReplace) {
+        hunk.PushLine(edit == kMatch ? ' ' : '-', left[l_i].c_str());
+      }
+      if (edit == kAdd || edit == kReplace) {
+        hunk.PushLine('+', right[r_i].c_str());
+      }
+
+      // Advance indices, depending on edit type.
+      l_i += edit != kAdd;
+      r_i += edit != kRemove;
+    }
+
+    if (!hunk.has_edits()) {
+      // We are done. We don't want this hunk.
+      break;
+    }
+
+    hunk.PrintTo(&ss);
+  }
+  return ss.str();
+}
+
+}  // namespace edit_distance
+
+namespace {
+
+// The string representation of the values received in EqFailure() are already
+// escaped. Split them on escaped '\n' boundaries. Leave all other escaped
+// characters the same.
+std::vector<std::string> SplitEscapedString(const std::string& str) {
+  std::vector<std::string> lines;
+  size_t start = 0, end = str.size();
+  if (end > 2 && str[0] == '"' && str[end - 1] == '"') {
+    ++start;
+    --end;
+  }
+  bool escaped = false;
+  for (size_t i = start; i + 1 < end; ++i) {
+    if (escaped) {
+      escaped = false;
+      if (str[i] == 'n') {
+        lines.push_back(str.substr(start, i - start - 1));
+        start = i + 1;
+      }
+    } else {
+      escaped = str[i] == '\\';
+    }
+  }
+  lines.push_back(str.substr(start, end - start));
+  return lines;
+}
+
+}  // namespace
+
+// Constructs and returns the message for an equality assertion
+// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure.
+//
+// The first four parameters are the expressions used in the assertion
+// and their values, as strings.  For example, for ASSERT_EQ(foo, bar)
+// where foo is 5 and bar is 6, we have:
+//
+//   lhs_expression: "foo"
+//   rhs_expression: "bar"
+//   lhs_value:      "5"
+//   rhs_value:      "6"
+//
+// The ignoring_case parameter is true iff the assertion is a
+// *_STRCASEEQ*.  When it's true, the string "Ignoring case" will
+// be inserted into the message.
+AssertionResult EqFailure(const char* lhs_expression,
+                          const char* rhs_expression,
+                          const std::string& lhs_value,
+                          const std::string& rhs_value,
+                          bool ignoring_case) {
+  Message msg;
+  msg << "      Expected: " << lhs_expression;
+  if (lhs_value != lhs_expression) {
+    msg << "\n      Which is: " << lhs_value;
+  }
+  msg << "\nTo be equal to: " << rhs_expression;
+  if (rhs_value != rhs_expression) {
+    msg << "\n      Which is: " << rhs_value;
+  }
+
+  if (ignoring_case) {
+    msg << "\nIgnoring case";
+  }
+
+  if (!lhs_value.empty() && !rhs_value.empty()) {
+    const std::vector<std::string> lhs_lines =
+        SplitEscapedString(lhs_value);
+    const std::vector<std::string> rhs_lines =
+        SplitEscapedString(rhs_value);
+    if (lhs_lines.size() > 1 || rhs_lines.size() > 1) {
+      msg << "\nWith diff:\n"
+          << edit_distance::CreateUnifiedDiff(lhs_lines, rhs_lines);
+    }
+  }
+
+  return AssertionFailure() << msg;
+}
+
+// Constructs a failure message for Boolean assertions such as EXPECT_TRUE.
+std::string GetBoolAssertionFailureMessage(
+    const AssertionResult& assertion_result,
+    const char* expression_text,
+    const char* actual_predicate_value,
+    const char* expected_predicate_value) {
+  const char* actual_message = assertion_result.message();
+  Message msg;
+  msg << "Value of: " << expression_text
+      << "\n  Actual: " << actual_predicate_value;
+  if (actual_message[0] != '\0')
+    msg << " (" << actual_message << ")";
+  msg << "\nExpected: " << expected_predicate_value;
+  return msg.GetString();
+}
+
+// Helper function for implementing ASSERT_NEAR.
+AssertionResult DoubleNearPredFormat(const char* expr1,
+                                     const char* expr2,
+                                     const char* abs_error_expr,
+                                     double val1,
+                                     double val2,
+                                     double abs_error) {
+  const double diff = fabs(val1 - val2);
+  if (diff <= abs_error) return AssertionSuccess();
+
+  // TODO(wan): do not print the value of an expression if it's
+  // already a literal.
+  return AssertionFailure()
+      << "The difference between " << expr1 << " and " << expr2
+      << " is " << diff << ", which exceeds " << abs_error_expr << ", where\n"
+      << expr1 << " evaluates to " << val1 << ",\n"
+      << expr2 << " evaluates to " << val2 << ", and\n"
+      << abs_error_expr << " evaluates to " << abs_error << ".";
+}
+
+
+// Helper template for implementing FloatLE() and DoubleLE().
+template <typename RawType>
+AssertionResult FloatingPointLE(const char* expr1,
+                                const char* expr2,
+                                RawType val1,
+                                RawType val2) {
+  // Returns success if val1 is less than val2,
+  if (val1 < val2) {
+    return AssertionSuccess();
+  }
+
+  // or if val1 is almost equal to val2.
+  const FloatingPoint<RawType> lhs(val1), rhs(val2);
+  if (lhs.AlmostEquals(rhs)) {
+    return AssertionSuccess();
+  }
+
+  // Note that the above two checks will both fail if either val1 or
+  // val2 is NaN, as the IEEE floating-point standard requires that
+  // any predicate involving a NaN must return false.
+
+  ::std::stringstream val1_ss;
+  val1_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+          << val1;
+
+  ::std::stringstream val2_ss;
+  val2_ss << std::setprecision(std::numeric_limits<RawType>::digits10 + 2)
+          << val2;
+
+  return AssertionFailure()
+      << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n"
+      << "  Actual: " << StringStreamToString(&val1_ss) << " vs "
+      << StringStreamToString(&val2_ss);
+}
+
+}  // namespace internal
+
+// Asserts that val1 is less than, or almost equal to, val2.  Fails
+// otherwise.  In particular, it fails if either val1 or val2 is NaN.
+AssertionResult FloatLE(const char* expr1, const char* expr2,
+                        float val1, float val2) {
+  return internal::FloatingPointLE<float>(expr1, expr2, val1, val2);
+}
+
+// Asserts that val1 is less than, or almost equal to, val2.  Fails
+// otherwise.  In particular, it fails if either val1 or val2 is NaN.
+AssertionResult DoubleLE(const char* expr1, const char* expr2,
+                         double val1, double val2) {
+  return internal::FloatingPointLE<double>(expr1, expr2, val1, val2);
+}
+
+namespace internal {
+
+// The helper function for {ASSERT|EXPECT}_EQ with int or enum
+// arguments.
+AssertionResult CmpHelperEQ(const char* lhs_expression,
+                            const char* rhs_expression,
+                            BiggestInt lhs,
+                            BiggestInt rhs) {
+  if (lhs == rhs) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   FormatForComparisonFailureMessage(lhs, rhs),
+                   FormatForComparisonFailureMessage(rhs, lhs),
+                   false);
+}
+
+// A macro for implementing the helper functions needed to implement
+// ASSERT_?? and EXPECT_?? with integer or enum arguments.  It is here
+// just to avoid copy-and-paste of similar code.
+#define GTEST_IMPL_CMP_HELPER_(op_name, op)\
+AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \
+                                   BiggestInt val1, BiggestInt val2) {\
+  if (val1 op val2) {\
+    return AssertionSuccess();\
+  } else {\
+    return AssertionFailure() \
+        << "Expected: (" << expr1 << ") " #op " (" << expr2\
+        << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\
+        << " vs " << FormatForComparisonFailureMessage(val2, val1);\
+  }\
+}
+
+// Implements the helper function for {ASSERT|EXPECT}_NE with int or
+// enum arguments.
+GTEST_IMPL_CMP_HELPER_(NE, !=)
+// Implements the helper function for {ASSERT|EXPECT}_LE with int or
+// enum arguments.
+GTEST_IMPL_CMP_HELPER_(LE, <=)
+// Implements the helper function for {ASSERT|EXPECT}_LT with int or
+// enum arguments.
+GTEST_IMPL_CMP_HELPER_(LT, < )
+// Implements the helper function for {ASSERT|EXPECT}_GE with int or
+// enum arguments.
+GTEST_IMPL_CMP_HELPER_(GE, >=)
+// Implements the helper function for {ASSERT|EXPECT}_GT with int or
+// enum arguments.
+GTEST_IMPL_CMP_HELPER_(GT, > )
+
+#undef GTEST_IMPL_CMP_HELPER_
+
+// The helper function for {ASSERT|EXPECT}_STREQ.
+AssertionResult CmpHelperSTREQ(const char* lhs_expression,
+                               const char* rhs_expression,
+                               const char* lhs,
+                               const char* rhs) {
+  if (String::CStringEquals(lhs, rhs)) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   PrintToString(lhs),
+                   PrintToString(rhs),
+                   false);
+}
+
+// The helper function for {ASSERT|EXPECT}_STRCASEEQ.
+AssertionResult CmpHelperSTRCASEEQ(const char* lhs_expression,
+                                   const char* rhs_expression,
+                                   const char* lhs,
+                                   const char* rhs) {
+  if (String::CaseInsensitiveCStringEquals(lhs, rhs)) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   PrintToString(lhs),
+                   PrintToString(rhs),
+                   true);
+}
+
+// The helper function for {ASSERT|EXPECT}_STRNE.
+AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                               const char* s2_expression,
+                               const char* s1,
+                               const char* s2) {
+  if (!String::CStringEquals(s1, s2)) {
+    return AssertionSuccess();
+  } else {
+    return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
+                              << s2_expression << "), actual: \""
+                              << s1 << "\" vs \"" << s2 << "\"";
+  }
+}
+
+// The helper function for {ASSERT|EXPECT}_STRCASENE.
+AssertionResult CmpHelperSTRCASENE(const char* s1_expression,
+                                   const char* s2_expression,
+                                   const char* s1,
+                                   const char* s2) {
+  if (!String::CaseInsensitiveCStringEquals(s1, s2)) {
+    return AssertionSuccess();
+  } else {
+    return AssertionFailure()
+        << "Expected: (" << s1_expression << ") != ("
+        << s2_expression << ") (ignoring case), actual: \""
+        << s1 << "\" vs \"" << s2 << "\"";
+  }
+}
+
+}  // namespace internal
+
+namespace {
+
+// Helper functions for implementing IsSubString() and IsNotSubstring().
+
+// This group of overloaded functions return true iff needle is a
+// substring of haystack.  NULL is considered a substring of itself
+// only.
+
+bool IsSubstringPred(const char* needle, const char* haystack) {
+  if (needle == NULL || haystack == NULL)
+    return needle == haystack;
+
+  return strstr(haystack, needle) != NULL;
+}
+
+bool IsSubstringPred(const wchar_t* needle, const wchar_t* haystack) {
+  if (needle == NULL || haystack == NULL)
+    return needle == haystack;
+
+  return wcsstr(haystack, needle) != NULL;
+}
+
+// StringType here can be either ::std::string or ::std::wstring.
+template <typename StringType>
+bool IsSubstringPred(const StringType& needle,
+                     const StringType& haystack) {
+  return haystack.find(needle) != StringType::npos;
+}
+
+// This function implements either IsSubstring() or IsNotSubstring(),
+// depending on the value of the expected_to_be_substring parameter.
+// StringType here can be const char*, const wchar_t*, ::std::string,
+// or ::std::wstring.
+template <typename StringType>
+AssertionResult IsSubstringImpl(
+    bool expected_to_be_substring,
+    const char* needle_expr, const char* haystack_expr,
+    const StringType& needle, const StringType& haystack) {
+  if (IsSubstringPred(needle, haystack) == expected_to_be_substring)
+    return AssertionSuccess();
+
+  const bool is_wide_string = sizeof(needle[0]) > 1;
+  const char* const begin_string_quote = is_wide_string ? "L\"" : "\"";
+  return AssertionFailure()
+      << "Value of: " << needle_expr << "\n"
+      << "  Actual: " << begin_string_quote << needle << "\"\n"
+      << "Expected: " << (expected_to_be_substring ? "" : "not ")
+      << "a substring of " << haystack_expr << "\n"
+      << "Which is: " << begin_string_quote << haystack << "\"";
+}
+
+}  // namespace
+
+// IsSubstring() and IsNotSubstring() check whether needle is a
+// substring of haystack (NULL is considered a substring of itself
+// only), and return an appropriate error message when they fail.
+
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const char* needle, const char* haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const wchar_t* needle, const wchar_t* haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::string& needle, const ::std::string& haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+
+#if GTEST_HAS_STD_WSTRING
+AssertionResult IsSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack) {
+  return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack);
+}
+
+AssertionResult IsNotSubstring(
+    const char* needle_expr, const char* haystack_expr,
+    const ::std::wstring& needle, const ::std::wstring& haystack) {
+  return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+namespace internal {
+
+#if GTEST_OS_WINDOWS
+
+namespace {
+
+// Helper function for IsHRESULT{SuccessFailure} predicates
+AssertionResult HRESULTFailureHelper(const char* expr,
+                                     const char* expected,
+                                     long hr) {  // NOLINT
+# if GTEST_OS_WINDOWS_MOBILE
+
+  // Windows CE doesn't support FormatMessage.
+  const char error_text[] = "";
+
+# else
+
+  // Looks up the human-readable system message for the HRESULT code
+  // and since we're not passing any params to FormatMessage, we don't
+  // want inserts expanded.
+  const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM |
+                       FORMAT_MESSAGE_IGNORE_INSERTS;
+  const DWORD kBufSize = 4096;
+  // Gets the system's human readable message string for this HRESULT.
+  char error_text[kBufSize] = { '\0' };
+  DWORD message_length = ::FormatMessageA(kFlags,
+                                          0,  // no source, we're asking system
+                                          hr,  // the error
+                                          0,  // no line width restrictions
+                                          error_text,  // output buffer
+                                          kBufSize,  // buf size
+                                          NULL);  // no arguments for inserts
+  // Trims tailing white space (FormatMessage leaves a trailing CR-LF)
+  for (; message_length && IsSpace(error_text[message_length - 1]);
+          --message_length) {
+    error_text[message_length - 1] = '\0';
+  }
+
+# endif  // GTEST_OS_WINDOWS_MOBILE
+
+  const std::string error_hex("0x" + String::FormatHexInt(hr));
+  return ::testing::AssertionFailure()
+      << "Expected: " << expr << " " << expected << ".\n"
+      << "  Actual: " << error_hex << " " << error_text << "\n";
+}
+
+}  // namespace
+
+AssertionResult IsHRESULTSuccess(const char* expr, long hr) {  // NOLINT
+  if (SUCCEEDED(hr)) {
+    return AssertionSuccess();
+  }
+  return HRESULTFailureHelper(expr, "succeeds", hr);
+}
+
+AssertionResult IsHRESULTFailure(const char* expr, long hr) {  // NOLINT
+  if (FAILED(hr)) {
+    return AssertionSuccess();
+  }
+  return HRESULTFailureHelper(expr, "fails", hr);
+}
+
+#endif  // GTEST_OS_WINDOWS
+
+// Utility functions for encoding Unicode text (wide strings) in
+// UTF-8.
+
+// A Unicode code-point can have upto 21 bits, and is encoded in UTF-8
+// like this:
+//
+// Code-point length   Encoding
+//   0 -  7 bits       0xxxxxxx
+//   8 - 11 bits       110xxxxx 10xxxxxx
+//  12 - 16 bits       1110xxxx 10xxxxxx 10xxxxxx
+//  17 - 21 bits       11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+
+// The maximum code-point a one-byte UTF-8 sequence can represent.
+const UInt32 kMaxCodePoint1 = (static_cast<UInt32>(1) <<  7) - 1;
+
+// The maximum code-point a two-byte UTF-8 sequence can represent.
+const UInt32 kMaxCodePoint2 = (static_cast<UInt32>(1) << (5 + 6)) - 1;
+
+// The maximum code-point a three-byte UTF-8 sequence can represent.
+const UInt32 kMaxCodePoint3 = (static_cast<UInt32>(1) << (4 + 2*6)) - 1;
+
+// The maximum code-point a four-byte UTF-8 sequence can represent.
+const UInt32 kMaxCodePoint4 = (static_cast<UInt32>(1) << (3 + 3*6)) - 1;
+
+// Chops off the n lowest bits from a bit pattern.  Returns the n
+// lowest bits.  As a side effect, the original bit pattern will be
+// shifted to the right by n bits.
+inline UInt32 ChopLowBits(UInt32* bits, int n) {
+  const UInt32 low_bits = *bits & ((static_cast<UInt32>(1) << n) - 1);
+  *bits >>= n;
+  return low_bits;
+}
+
+// Converts a Unicode code point to a narrow string in UTF-8 encoding.
+// code_point parameter is of type UInt32 because wchar_t may not be
+// wide enough to contain a code point.
+// If the code_point is not a valid Unicode code point
+// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted
+// to "(Invalid Unicode 0xXXXXXXXX)".
+std::string CodePointToUtf8(UInt32 code_point) {
+  if (code_point > kMaxCodePoint4) {
+    return "(Invalid Unicode 0x" + String::FormatHexInt(code_point) + ")";
+  }
+
+  char str[5];  // Big enough for the largest valid code point.
+  if (code_point <= kMaxCodePoint1) {
+    str[1] = '\0';
+    str[0] = static_cast<char>(code_point);                          // 0xxxxxxx
+  } else if (code_point <= kMaxCodePoint2) {
+    str[2] = '\0';
+    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[0] = static_cast<char>(0xC0 | code_point);                   // 110xxxxx
+  } else if (code_point <= kMaxCodePoint3) {
+    str[3] = '\0';
+    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[0] = static_cast<char>(0xE0 | code_point);                   // 1110xxxx
+  } else {  // code_point <= kMaxCodePoint4
+    str[4] = '\0';
+    str[3] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[2] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[1] = static_cast<char>(0x80 | ChopLowBits(&code_point, 6));  // 10xxxxxx
+    str[0] = static_cast<char>(0xF0 | code_point);                   // 11110xxx
+  }
+  return str;
+}
+
+// The following two functions only make sense if the the system
+// uses UTF-16 for wide string encoding. All supported systems
+// with 16 bit wchar_t (Windows, Cygwin, Symbian OS) do use UTF-16.
+
+// Determines if the arguments constitute UTF-16 surrogate pair
+// and thus should be combined into a single Unicode code point
+// using CreateCodePointFromUtf16SurrogatePair.
+inline bool IsUtf16SurrogatePair(wchar_t first, wchar_t second) {
+  return sizeof(wchar_t) == 2 &&
+      (first & 0xFC00) == 0xD800 && (second & 0xFC00) == 0xDC00;
+}
+
+// Creates a Unicode code point from UTF16 surrogate pair.
+inline UInt32 CreateCodePointFromUtf16SurrogatePair(wchar_t first,
+                                                    wchar_t second) {
+  const UInt32 mask = (1 << 10) - 1;
+  return (sizeof(wchar_t) == 2) ?
+      (((first & mask) << 10) | (second & mask)) + 0x10000 :
+      // This function should not be called when the condition is
+      // false, but we provide a sensible default in case it is.
+      static_cast<UInt32>(first);
+}
+
+// Converts a wide string to a narrow string in UTF-8 encoding.
+// The wide string is assumed to have the following encoding:
+//   UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin, Symbian OS)
+//   UTF-32 if sizeof(wchar_t) == 4 (on Linux)
+// Parameter str points to a null-terminated wide string.
+// Parameter num_chars may additionally limit the number
+// of wchar_t characters processed. -1 is used when the entire string
+// should be processed.
+// If the string contains code points that are not valid Unicode code points
+// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output
+// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding
+// and contains invalid UTF-16 surrogate pairs, values in those pairs
+// will be encoded as individual Unicode characters from Basic Normal Plane.
+std::string WideStringToUtf8(const wchar_t* str, int num_chars) {
+  if (num_chars == -1)
+    num_chars = static_cast<int>(wcslen(str));
+
+  ::std::stringstream stream;
+  for (int i = 0; i < num_chars; ++i) {
+    UInt32 unicode_code_point;
+
+    if (str[i] == L'\0') {
+      break;
+    } else if (i + 1 < num_chars && IsUtf16SurrogatePair(str[i], str[i + 1])) {
+      unicode_code_point = CreateCodePointFromUtf16SurrogatePair(str[i],
+                                                                 str[i + 1]);
+      i++;
+    } else {
+      unicode_code_point = static_cast<UInt32>(str[i]);
+    }
+
+    stream << CodePointToUtf8(unicode_code_point);
+  }
+  return StringStreamToString(&stream);
+}
+
+// Converts a wide C string to an std::string using the UTF-8 encoding.
+// NULL will be converted to "(null)".
+std::string String::ShowWideCString(const wchar_t * wide_c_str) {
+  if (wide_c_str == NULL)  return "(null)";
+
+  return internal::WideStringToUtf8(wide_c_str, -1);
+}
+
+// Compares two wide C strings.  Returns true iff they have the same
+// content.
+//
+// Unlike wcscmp(), this function can handle NULL argument(s).  A NULL
+// C string is considered different to any non-NULL C string,
+// including the empty string.
+bool String::WideCStringEquals(const wchar_t * lhs, const wchar_t * rhs) {
+  if (lhs == NULL) return rhs == NULL;
+
+  if (rhs == NULL) return false;
+
+  return wcscmp(lhs, rhs) == 0;
+}
+
+// Helper function for *_STREQ on wide strings.
+AssertionResult CmpHelperSTREQ(const char* lhs_expression,
+                               const char* rhs_expression,
+                               const wchar_t* lhs,
+                               const wchar_t* rhs) {
+  if (String::WideCStringEquals(lhs, rhs)) {
+    return AssertionSuccess();
+  }
+
+  return EqFailure(lhs_expression,
+                   rhs_expression,
+                   PrintToString(lhs),
+                   PrintToString(rhs),
+                   false);
+}
+
+// Helper function for *_STRNE on wide strings.
+AssertionResult CmpHelperSTRNE(const char* s1_expression,
+                               const char* s2_expression,
+                               const wchar_t* s1,
+                               const wchar_t* s2) {
+  if (!String::WideCStringEquals(s1, s2)) {
+    return AssertionSuccess();
+  }
+
+  return AssertionFailure() << "Expected: (" << s1_expression << ") != ("
+                            << s2_expression << "), actual: "
+                            << PrintToString(s1)
+                            << " vs " << PrintToString(s2);
+}
+
+// Compares two C strings, ignoring case.  Returns true iff they have
+// the same content.
+//
+// Unlike strcasecmp(), this function can handle NULL argument(s).  A
+// NULL C string is considered different to any non-NULL C string,
+// including the empty string.
+bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) {
+  if (lhs == NULL)
+    return rhs == NULL;
+  if (rhs == NULL)
+    return false;
+  return posix::StrCaseCmp(lhs, rhs) == 0;
+}
+
+  // Compares two wide C strings, ignoring case.  Returns true iff they
+  // have the same content.
+  //
+  // Unlike wcscasecmp(), this function can handle NULL argument(s).
+  // A NULL C string is considered different to any non-NULL wide C string,
+  // including the empty string.
+  // NB: The implementations on different platforms slightly differ.
+  // On windows, this method uses _wcsicmp which compares according to LC_CTYPE
+  // environment variable. On GNU platform this method uses wcscasecmp
+  // which compares according to LC_CTYPE category of the current locale.
+  // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the
+  // current locale.
+bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs,
+                                              const wchar_t* rhs) {
+  if (lhs == NULL) return rhs == NULL;
+
+  if (rhs == NULL) return false;
+
+#if GTEST_OS_WINDOWS
+  return _wcsicmp(lhs, rhs) == 0;
+#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
+  return wcscasecmp(lhs, rhs) == 0;
+#else
+  // Android, Mac OS X and Cygwin don't define wcscasecmp.
+  // Other unknown OSes may not define it either.
+  wint_t left, right;
+  do {
+    left = towlower(*lhs++);
+    right = towlower(*rhs++);
+  } while (left && left == right);
+  return left == right;
+#endif  // OS selector
+}
+
+// Returns true iff str ends with the given suffix, ignoring case.
+// Any string is considered to end with an empty suffix.
+bool String::EndsWithCaseInsensitive(
+    const std::string& str, const std::string& suffix) {
+  const size_t str_len = str.length();
+  const size_t suffix_len = suffix.length();
+  return (str_len >= suffix_len) &&
+         CaseInsensitiveCStringEquals(str.c_str() + str_len - suffix_len,
+                                      suffix.c_str());
+}
+
+// Formats an int value as "%02d".
+std::string String::FormatIntWidth2(int value) {
+  std::stringstream ss;
+  ss << std::setfill('0') << std::setw(2) << value;
+  return ss.str();
+}
+
+// Formats an int value as "%X".
+std::string String::FormatHexInt(int value) {
+  std::stringstream ss;
+  ss << std::hex << std::uppercase << value;
+  return ss.str();
+}
+
+// Formats a byte as "%02X".
+std::string String::FormatByte(unsigned char value) {
+  std::stringstream ss;
+  ss << std::setfill('0') << std::setw(2) << std::hex << std::uppercase
+     << static_cast<unsigned int>(value);
+  return ss.str();
+}
+
+// Converts the buffer in a stringstream to an std::string, converting NUL
+// bytes to "\\0" along the way.
+std::string StringStreamToString(::std::stringstream* ss) {
+  const ::std::string& str = ss->str();
+  const char* const start = str.c_str();
+  const char* const end = start + str.length();
+
+  std::string result;
+  result.reserve(2 * (end - start));
+  for (const char* ch = start; ch != end; ++ch) {
+    if (*ch == '\0') {
+      result += "\\0";  // Replaces NUL with "\\0";
+    } else {
+      result += *ch;
+    }
+  }
+
+  return result;
+}
+
+// Appends the user-supplied message to the Google-Test-generated message.
+std::string AppendUserMessage(const std::string& gtest_msg,
+                              const Message& user_msg) {
+  // Appends the user message if it's non-empty.
+  const std::string user_msg_string = user_msg.GetString();
+  if (user_msg_string.empty()) {
+    return gtest_msg;
+  }
+
+  return gtest_msg + "\n" + user_msg_string;
+}
+
+}  // namespace internal
+
+// class TestResult
+
+// Creates an empty TestResult.
+TestResult::TestResult()
+    : death_test_count_(0),
+      elapsed_time_(0) {
+}
+
+// D'tor.
+TestResult::~TestResult() {
+}
+
+// Returns the i-th test part result among all the results. i can
+// range from 0 to total_part_count() - 1. If i is not in that range,
+// aborts the program.
+const TestPartResult& TestResult::GetTestPartResult(int i) const {
+  if (i < 0 || i >= total_part_count())
+    internal::posix::Abort();
+  return test_part_results_.at(i);
+}
+
+// Returns the i-th test property. i can range from 0 to
+// test_property_count() - 1. If i is not in that range, aborts the
+// program.
+const TestProperty& TestResult::GetTestProperty(int i) const {
+  if (i < 0 || i >= test_property_count())
+    internal::posix::Abort();
+  return test_properties_.at(i);
+}
+
+// Clears the test part results.
+void TestResult::ClearTestPartResults() {
+  test_part_results_.clear();
+}
+
+// Adds a test part result to the list.
+void TestResult::AddTestPartResult(const TestPartResult& test_part_result) {
+  test_part_results_.push_back(test_part_result);
+}
+
+// Adds a test property to the list. If a property with the same key as the
+// supplied property is already represented, the value of this test_property
+// replaces the old value for that key.
+void TestResult::RecordProperty(const std::string& xml_element,
+                                const TestProperty& test_property) {
+  if (!ValidateTestProperty(xml_element, test_property)) {
+    return;
+  }
+  internal::MutexLock lock(&test_properites_mutex_);
+  const std::vector<TestProperty>::iterator property_with_matching_key =
+      std::find_if(test_properties_.begin(), test_properties_.end(),
+                   internal::TestPropertyKeyIs(test_property.key()));
+  if (property_with_matching_key == test_properties_.end()) {
+    test_properties_.push_back(test_property);
+    return;
+  }
+  property_with_matching_key->SetValue(test_property.value());
+}
+
+// The list of reserved attributes used in the <testsuites> element of XML
+// output.
+static const char* const kReservedTestSuitesAttributes[] = {
+  "disabled",
+  "errors",
+  "failures",
+  "name",
+  "random_seed",
+  "tests",
+  "time",
+  "timestamp"
+};
+
+// The list of reserved attributes used in the <testsuite> element of XML
+// output.
+static const char* const kReservedTestSuiteAttributes[] = {
+  "disabled",
+  "errors",
+  "failures",
+  "name",
+  "tests",
+  "time"
+};
+
+// The list of reserved attributes used in the <testcase> element of XML output.
+static const char* const kReservedTestCaseAttributes[] = {
+  "classname",
+  "name",
+  "status",
+  "time",
+  "type_param",
+  "value_param"
+};
+
+template <int kSize>
+std::vector<std::string> ArrayAsVector(const char* const (&array)[kSize]) {
+  return std::vector<std::string>(array, array + kSize);
+}
+
+static std::vector<std::string> GetReservedAttributesForElement(
+    const std::string& xml_element) {
+  if (xml_element == "testsuites") {
+    return ArrayAsVector(kReservedTestSuitesAttributes);
+  } else if (xml_element == "testsuite") {
+    return ArrayAsVector(kReservedTestSuiteAttributes);
+  } else if (xml_element == "testcase") {
+    return ArrayAsVector(kReservedTestCaseAttributes);
+  } else {
+    GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element;
+  }
+  // This code is unreachable but some compilers may not realizes that.
+  return std::vector<std::string>();
+}
+
+static std::string FormatWordList(const std::vector<std::string>& words) {
+  Message word_list;
+  for (size_t i = 0; i < words.size(); ++i) {
+    if (i > 0 && words.size() > 2) {
+      word_list << ", ";
+    }
+    if (i == words.size() - 1) {
+      word_list << "and ";
+    }
+    word_list << "'" << words[i] << "'";
+  }
+  return word_list.GetString();
+}
+
+bool ValidateTestPropertyName(const std::string& property_name,
+                              const std::vector<std::string>& reserved_names) {
+  if (std::find(reserved_names.begin(), reserved_names.end(), property_name) !=
+          reserved_names.end()) {
+    ADD_FAILURE() << "Reserved key used in RecordProperty(): " << property_name
+                  << " (" << FormatWordList(reserved_names)
+                  << " are reserved by " << GTEST_NAME_ << ")";
+    return false;
+  }
+  return true;
+}
+
+// Adds a failure if the key is a reserved attribute of the element named
+// xml_element.  Returns true if the property is valid.
+bool TestResult::ValidateTestProperty(const std::string& xml_element,
+                                      const TestProperty& test_property) {
+  return ValidateTestPropertyName(test_property.key(),
+                                  GetReservedAttributesForElement(xml_element));
+}
+
+// Clears the object.
+void TestResult::Clear() {
+  test_part_results_.clear();
+  test_properties_.clear();
+  death_test_count_ = 0;
+  elapsed_time_ = 0;
+}
+
+// Returns true iff the test failed.
+bool TestResult::Failed() const {
+  for (int i = 0; i < total_part_count(); ++i) {
+    if (GetTestPartResult(i).failed())
+      return true;
+  }
+  return false;
+}
+
+// Returns true iff the test part fatally failed.
+static bool TestPartFatallyFailed(const TestPartResult& result) {
+  return result.fatally_failed();
+}
+
+// Returns true iff the test fatally failed.
+bool TestResult::HasFatalFailure() const {
+  return CountIf(test_part_results_, TestPartFatallyFailed) > 0;
+}
+
+// Returns true iff the test part non-fatally failed.
+static bool TestPartNonfatallyFailed(const TestPartResult& result) {
+  return result.nonfatally_failed();
+}
+
+// Returns true iff the test has a non-fatal failure.
+bool TestResult::HasNonfatalFailure() const {
+  return CountIf(test_part_results_, TestPartNonfatallyFailed) > 0;
+}
+
+// Gets the number of all test parts.  This is the sum of the number
+// of successful test parts and the number of failed test parts.
+int TestResult::total_part_count() const {
+  return static_cast<int>(test_part_results_.size());
+}
+
+// Returns the number of the test properties.
+int TestResult::test_property_count() const {
+  return static_cast<int>(test_properties_.size());
+}
+
+// class Test
+
+// Creates a Test object.
+
+// The c'tor saves the states of all flags.
+Test::Test()
+    : gtest_flag_saver_(new GTEST_FLAG_SAVER_) {
+}
+
+// The d'tor restores the states of all flags.  The actual work is
+// done by the d'tor of the gtest_flag_saver_ field, and thus not
+// visible here.
+Test::~Test() {
+}
+
+// Sets up the test fixture.
+//
+// A sub-class may override this.
+void Test::SetUp() {
+}
+
+// Tears down the test fixture.
+//
+// A sub-class may override this.
+void Test::TearDown() {
+}
+
+// Allows user supplied key value pairs to be recorded for later output.
+void Test::RecordProperty(const std::string& key, const std::string& value) {
+  UnitTest::GetInstance()->RecordProperty(key, value);
+}
+
+// Allows user supplied key value pairs to be recorded for later output.
+void Test::RecordProperty(const std::string& key, int value) {
+  Message value_message;
+  value_message << value;
+  RecordProperty(key, value_message.GetString().c_str());
+}
+
+namespace internal {
+
+void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
+                                    const std::string& message) {
+  // This function is a friend of UnitTest and as such has access to
+  // AddTestPartResult.
+  UnitTest::GetInstance()->AddTestPartResult(
+      result_type,
+      NULL,  // No info about the source file where the exception occurred.
+      -1,    // We have no info on which line caused the exception.
+      message,
+      "");   // No stack trace, either.
+}
+
+}  // namespace internal
+
+// Google Test requires all tests in the same test case to use the same test
+// fixture class.  This function checks if the current test has the
+// same fixture class as the first test in the current test case.  If
+// yes, it returns true; otherwise it generates a Google Test failure and
+// returns false.
+bool Test::HasSameFixtureClass() {
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  const TestCase* const test_case = impl->current_test_case();
+
+  // Info about the first test in the current test case.
+  const TestInfo* const first_test_info = test_case->test_info_list()[0];
+  const internal::TypeId first_fixture_id = first_test_info->fixture_class_id_;
+  const char* const first_test_name = first_test_info->name();
+
+  // Info about the current test.
+  const TestInfo* const this_test_info = impl->current_test_info();
+  const internal::TypeId this_fixture_id = this_test_info->fixture_class_id_;
+  const char* const this_test_name = this_test_info->name();
+
+  if (this_fixture_id != first_fixture_id) {
+    // Is the first test defined using TEST?
+    const bool first_is_TEST = first_fixture_id == internal::GetTestTypeId();
+    // Is this test defined using TEST?
+    const bool this_is_TEST = this_fixture_id == internal::GetTestTypeId();
+
+    if (first_is_TEST || this_is_TEST) {
+      // Both TEST and TEST_F appear in same test case, which is incorrect.
+      // Tell the user how to fix this.
+
+      // Gets the name of the TEST and the name of the TEST_F.  Note
+      // that first_is_TEST and this_is_TEST cannot both be true, as
+      // the fixture IDs are different for the two tests.
+      const char* const TEST_name =
+          first_is_TEST ? first_test_name : this_test_name;
+      const char* const TEST_F_name =
+          first_is_TEST ? this_test_name : first_test_name;
+
+      ADD_FAILURE()
+          << "All tests in the same test case must use the same test fixture\n"
+          << "class, so mixing TEST_F and TEST in the same test case is\n"
+          << "illegal.  In test case " << this_test_info->test_case_name()
+          << ",\n"
+          << "test " << TEST_F_name << " is defined using TEST_F but\n"
+          << "test " << TEST_name << " is defined using TEST.  You probably\n"
+          << "want to change the TEST to TEST_F or move it to another test\n"
+          << "case.";
+    } else {
+      // Two fixture classes with the same name appear in two different
+      // namespaces, which is not allowed. Tell the user how to fix this.
+      ADD_FAILURE()
+          << "All tests in the same test case must use the same test fixture\n"
+          << "class.  However, in test case "
+          << this_test_info->test_case_name() << ",\n"
+          << "you defined test " << first_test_name
+          << " and test " << this_test_name << "\n"
+          << "using two different test fixture classes.  This can happen if\n"
+          << "the two classes are from different namespaces or translation\n"
+          << "units and have the same name.  You should probably rename one\n"
+          << "of the classes to put the tests into different test cases.";
+    }
+    return false;
+  }
+
+  return true;
+}
+
+#if GTEST_HAS_SEH
+
+// Adds an "exception thrown" fatal failure to the current test.  This
+// function returns its result via an output parameter pointer because VC++
+// prohibits creation of objects with destructors on stack in functions
+// using __try (see error C2712).
+static std::string* FormatSehExceptionMessage(DWORD exception_code,
+                                              const char* location) {
+  Message message;
+  message << "SEH exception with code 0x" << std::setbase(16) <<
+    exception_code << std::setbase(10) << " thrown in " << location << ".";
+
+  return new std::string(message.GetString());
+}
+
+#endif  // GTEST_HAS_SEH
+
+namespace internal {
+
+#if GTEST_HAS_EXCEPTIONS
+
+// Adds an "exception thrown" fatal failure to the current test.
+static std::string FormatCxxExceptionMessage(const char* description,
+                                             const char* location) {
+  Message message;
+  if (description != NULL) {
+    message << "C++ exception with description \"" << description << "\"";
+  } else {
+    message << "Unknown C++ exception";
+  }
+  message << " thrown in " << location << ".";
+
+  return message.GetString();
+}
+
+static std::string PrintTestPartResultToString(
+    const TestPartResult& test_part_result);
+
+GoogleTestFailureException::GoogleTestFailureException(
+    const TestPartResult& failure)
+    : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// We put these helper functions in the internal namespace as IBM's xlC
+// compiler rejects the code if they were declared static.
+
+// Runs the given method and handles SEH exceptions it throws, when
+// SEH is supported; returns the 0-value for type Result in case of an
+// SEH exception.  (Microsoft compilers cannot handle SEH and C++
+// exceptions in the same function.  Therefore, we provide a separate
+// wrapper function for handling SEH exceptions.)
+template <class T, typename Result>
+Result HandleSehExceptionsInMethodIfSupported(
+    T* object, Result (T::*method)(), const char* location) {
+#if GTEST_HAS_SEH
+  __try {
+    return (object->*method)();
+  } __except (internal::UnitTestOptions::GTestShouldProcessSEH(  // NOLINT
+      GetExceptionCode())) {
+    // We create the exception message on the heap because VC++ prohibits
+    // creation of objects with destructors on stack in functions using __try
+    // (see error C2712).
+    std::string* exception_message = FormatSehExceptionMessage(
+        GetExceptionCode(), location);
+    internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure,
+                                             *exception_message);
+    delete exception_message;
+    return static_cast<Result>(0);
+  }
+#else
+  (void)location;
+  return (object->*method)();
+#endif  // GTEST_HAS_SEH
+}
+
+// Runs the given method and catches and reports C++ and/or SEH-style
+// exceptions, if they are supported; returns the 0-value for type
+// Result in case of an SEH exception.
+template <class T, typename Result>
+Result HandleExceptionsInMethodIfSupported(
+    T* object, Result (T::*method)(), const char* location) {
+  // NOTE: The user code can affect the way in which Google Test handles
+  // exceptions by setting GTEST_FLAG(catch_exceptions), but only before
+  // RUN_ALL_TESTS() starts. It is technically possible to check the flag
+  // after the exception is caught and either report or re-throw the
+  // exception based on the flag's value:
+  //
+  // try {
+  //   // Perform the test method.
+  // } catch (...) {
+  //   if (GTEST_FLAG(catch_exceptions))
+  //     // Report the exception as failure.
+  //   else
+  //     throw;  // Re-throws the original exception.
+  // }
+  //
+  // However, the purpose of this flag is to allow the program to drop into
+  // the debugger when the exception is thrown. On most platforms, once the
+  // control enters the catch block, the exception origin information is
+  // lost and the debugger will stop the program at the point of the
+  // re-throw in this function -- instead of at the point of the original
+  // throw statement in the code under test.  For this reason, we perform
+  // the check early, sacrificing the ability to affect Google Test's
+  // exception handling in the method where the exception is thrown.
+  if (internal::GetUnitTestImpl()->catch_exceptions()) {
+#if GTEST_HAS_EXCEPTIONS
+    try {
+      return HandleSehExceptionsInMethodIfSupported(object, method, location);
+    } catch (const internal::GoogleTestFailureException&) {  // NOLINT
+      // This exception type can only be thrown by a failed Google
+      // Test assertion with the intention of letting another testing
+      // framework catch it.  Therefore we just re-throw it.
+      throw;
+    } catch (const std::exception& e) {  // NOLINT
+      internal::ReportFailureInUnknownLocation(
+          TestPartResult::kFatalFailure,
+          FormatCxxExceptionMessage(e.what(), location));
+    } catch (...) {  // NOLINT
+      internal::ReportFailureInUnknownLocation(
+          TestPartResult::kFatalFailure,
+          FormatCxxExceptionMessage(NULL, location));
+    }
+    return static_cast<Result>(0);
+#else
+    return HandleSehExceptionsInMethodIfSupported(object, method, location);
+#endif  // GTEST_HAS_EXCEPTIONS
+  } else {
+    return (object->*method)();
+  }
+}
+
+}  // namespace internal
+
+// Runs the test and updates the test result.
+void Test::Run() {
+  if (!HasSameFixtureClass()) return;
+
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(this, &Test::SetUp, "SetUp()");
+  // We will run the test only if SetUp() was successful.
+  if (!HasFatalFailure()) {
+    impl->os_stack_trace_getter()->UponLeavingGTest();
+    internal::HandleExceptionsInMethodIfSupported(
+        this, &Test::TestBody, "the test body");
+  }
+
+  // However, we want to clean up as much as possible.  Hence we will
+  // always call TearDown(), even if SetUp() or the test body has
+  // failed.
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      this, &Test::TearDown, "TearDown()");
+}
+
+// Returns true iff the current test has a fatal failure.
+bool Test::HasFatalFailure() {
+  return internal::GetUnitTestImpl()->current_test_result()->HasFatalFailure();
+}
+
+// Returns true iff the current test has a non-fatal failure.
+bool Test::HasNonfatalFailure() {
+  return internal::GetUnitTestImpl()->current_test_result()->
+      HasNonfatalFailure();
+}
+
+// class TestInfo
+
+// Constructs a TestInfo object. It assumes ownership of the test factory
+// object.
+TestInfo::TestInfo(const std::string& a_test_case_name,
+                   const std::string& a_name,
+                   const char* a_type_param,
+                   const char* a_value_param,
+                   internal::CodeLocation a_code_location,
+                   internal::TypeId fixture_class_id,
+                   internal::TestFactoryBase* factory)
+    : test_case_name_(a_test_case_name),
+      name_(a_name),
+      type_param_(a_type_param ? new std::string(a_type_param) : NULL),
+      value_param_(a_value_param ? new std::string(a_value_param) : NULL),
+      location_(a_code_location),
+      fixture_class_id_(fixture_class_id),
+      should_run_(false),
+      is_disabled_(false),
+      matches_filter_(false),
+      factory_(factory),
+      result_() {}
+
+// Destructs a TestInfo object.
+TestInfo::~TestInfo() { delete factory_; }
+
+namespace internal {
+
+// Creates a new TestInfo object and registers it with Google Test;
+// returns the created object.
+//
+// Arguments:
+//
+//   test_case_name:   name of the test case
+//   name:             name of the test
+//   type_param:       the name of the test's type parameter, or NULL if
+//                     this is not a typed or a type-parameterized test.
+//   value_param:      text representation of the test's value parameter,
+//                     or NULL if this is not a value-parameterized test.
+//   code_location:    code location where the test is defined
+//   fixture_class_id: ID of the test fixture class
+//   set_up_tc:        pointer to the function that sets up the test case
+//   tear_down_tc:     pointer to the function that tears down the test case
+//   factory:          pointer to the factory that creates a test object.
+//                     The newly created TestInfo instance will assume
+//                     ownership of the factory object.
+TestInfo* MakeAndRegisterTestInfo(
+    const char* test_case_name,
+    const char* name,
+    const char* type_param,
+    const char* value_param,
+    CodeLocation code_location,
+    TypeId fixture_class_id,
+    SetUpTestCaseFunc set_up_tc,
+    TearDownTestCaseFunc tear_down_tc,
+    TestFactoryBase* factory) {
+  TestInfo* const test_info =
+      new TestInfo(test_case_name, name, type_param, value_param,
+                   code_location, fixture_class_id, factory);
+  GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info);
+  return test_info;
+}
+
+#if GTEST_HAS_PARAM_TEST
+void ReportInvalidTestCaseType(const char* test_case_name,
+                               CodeLocation code_location) {
+  Message errors;
+  errors
+      << "Attempted redefinition of test case " << test_case_name << ".\n"
+      << "All tests in the same test case must use the same test fixture\n"
+      << "class.  However, in test case " << test_case_name << ", you tried\n"
+      << "to define a test using a fixture class different from the one\n"
+      << "used earlier. This can happen if the two fixture classes are\n"
+      << "from different namespaces and have the same name. You should\n"
+      << "probably rename one of the classes to put the tests into different\n"
+      << "test cases.";
+
+  fprintf(stderr, "%s %s",
+          FormatFileLocation(code_location.file.c_str(),
+                             code_location.line).c_str(),
+          errors.GetString().c_str());
+}
+#endif  // GTEST_HAS_PARAM_TEST
+
+}  // namespace internal
+
+namespace {
+
+// A predicate that checks the test name of a TestInfo against a known
+// value.
+//
+// This is used for implementation of the TestCase class only.  We put
+// it in the anonymous namespace to prevent polluting the outer
+// namespace.
+//
+// TestNameIs is copyable.
+class TestNameIs {
+ public:
+  // Constructor.
+  //
+  // TestNameIs has NO default constructor.
+  explicit TestNameIs(const char* name)
+      : name_(name) {}
+
+  // Returns true iff the test name of test_info matches name_.
+  bool operator()(const TestInfo * test_info) const {
+    return test_info && test_info->name() == name_;
+  }
+
+ private:
+  std::string name_;
+};
+
+}  // namespace
+
+namespace internal {
+
+// This method expands all parameterized tests registered with macros TEST_P
+// and INSTANTIATE_TEST_CASE_P into regular tests and registers those.
+// This will be done just once during the program runtime.
+void UnitTestImpl::RegisterParameterizedTests() {
+#if GTEST_HAS_PARAM_TEST
+  if (!parameterized_tests_registered_) {
+    parameterized_test_registry_.RegisterTests();
+    parameterized_tests_registered_ = true;
+  }
+#endif
+}
+
+}  // namespace internal
+
+// Creates the test object, runs it, records its result, and then
+// deletes it.
+void TestInfo::Run() {
+  if (!should_run_) return;
+
+  // Tells UnitTest where to store test result.
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->set_current_test_info(this);
+
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+
+  // Notifies the unit test event listeners that a test is about to start.
+  repeater->OnTestStart(*this);
+
+  const TimeInMillis start = internal::GetTimeInMillis();
+
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+
+  // Creates the test object.
+  Test* const test = internal::HandleExceptionsInMethodIfSupported(
+      factory_, &internal::TestFactoryBase::CreateTest,
+      "the test fixture's constructor");
+
+  // Runs the test only if the test object was created and its
+  // constructor didn't generate a fatal failure.
+  if ((test != NULL) && !Test::HasFatalFailure()) {
+    // This doesn't throw as all user code that can throw are wrapped into
+    // exception handling code.
+    test->Run();
+  }
+
+  // Deletes the test object.
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      test, &Test::DeleteSelf_, "the test fixture's destructor");
+
+  result_.set_elapsed_time(internal::GetTimeInMillis() - start);
+
+  // Notifies the unit test event listener that a test has just finished.
+  repeater->OnTestEnd(*this);
+
+  // Tells UnitTest to stop associating assertion results to this
+  // test.
+  impl->set_current_test_info(NULL);
+}
+
+// class TestCase
+
+// Gets the number of successful tests in this test case.
+int TestCase::successful_test_count() const {
+  return CountIf(test_info_list_, TestPassed);
+}
+
+// Gets the number of failed tests in this test case.
+int TestCase::failed_test_count() const {
+  return CountIf(test_info_list_, TestFailed);
+}
+
+// Gets the number of disabled tests that will be reported in the XML report.
+int TestCase::reportable_disabled_test_count() const {
+  return CountIf(test_info_list_, TestReportableDisabled);
+}
+
+// Gets the number of disabled tests in this test case.
+int TestCase::disabled_test_count() const {
+  return CountIf(test_info_list_, TestDisabled);
+}
+
+// Gets the number of tests to be printed in the XML report.
+int TestCase::reportable_test_count() const {
+  return CountIf(test_info_list_, TestReportable);
+}
+
+// Get the number of tests in this test case that should run.
+int TestCase::test_to_run_count() const {
+  return CountIf(test_info_list_, ShouldRunTest);
+}
+
+// Gets the number of all tests.
+int TestCase::total_test_count() const {
+  return static_cast<int>(test_info_list_.size());
+}
+
+// Creates a TestCase with the given name.
+//
+// Arguments:
+//
+//   name:         name of the test case
+//   a_type_param: the name of the test case's type parameter, or NULL if
+//                 this is not a typed or a type-parameterized test case.
+//   set_up_tc:    pointer to the function that sets up the test case
+//   tear_down_tc: pointer to the function that tears down the test case
+TestCase::TestCase(const char* a_name, const char* a_type_param,
+                   Test::SetUpTestCaseFunc set_up_tc,
+                   Test::TearDownTestCaseFunc tear_down_tc)
+    : name_(a_name),
+      type_param_(a_type_param ? new std::string(a_type_param) : NULL),
+      set_up_tc_(set_up_tc),
+      tear_down_tc_(tear_down_tc),
+      should_run_(false),
+      elapsed_time_(0) {
+}
+
+// Destructor of TestCase.
+TestCase::~TestCase() {
+  // Deletes every Test in the collection.
+  ForEach(test_info_list_, internal::Delete<TestInfo>);
+}
+
+// Returns the i-th test among all the tests. i can range from 0 to
+// total_test_count() - 1. If i is not in that range, returns NULL.
+const TestInfo* TestCase::GetTestInfo(int i) const {
+  const int index = GetElementOr(test_indices_, i, -1);
+  return index < 0 ? NULL : test_info_list_[index];
+}
+
+// Returns the i-th test among all the tests. i can range from 0 to
+// total_test_count() - 1. If i is not in that range, returns NULL.
+TestInfo* TestCase::GetMutableTestInfo(int i) {
+  const int index = GetElementOr(test_indices_, i, -1);
+  return index < 0 ? NULL : test_info_list_[index];
+}
+
+// Adds a test to this test case.  Will delete the test upon
+// destruction of the TestCase object.
+void TestCase::AddTestInfo(TestInfo * test_info) {
+  test_info_list_.push_back(test_info);
+  test_indices_.push_back(static_cast<int>(test_indices_.size()));
+}
+
+// Runs every test in this TestCase.
+void TestCase::Run() {
+  if (!should_run_) return;
+
+  internal::UnitTestImpl* const impl = internal::GetUnitTestImpl();
+  impl->set_current_test_case(this);
+
+  TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
+
+  repeater->OnTestCaseStart(*this);
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      this, &TestCase::RunSetUpTestCase, "SetUpTestCase()");
+
+  const internal::TimeInMillis start = internal::GetTimeInMillis();
+  for (int i = 0; i < total_test_count(); i++) {
+    GetMutableTestInfo(i)->Run();
+  }
+  elapsed_time_ = internal::GetTimeInMillis() - start;
+
+  impl->os_stack_trace_getter()->UponLeavingGTest();
+  internal::HandleExceptionsInMethodIfSupported(
+      this, &TestCase::RunTearDownTestCase, "TearDownTestCase()");
+
+  repeater->OnTestCaseEnd(*this);
+  impl->set_current_test_case(NULL);
+}
+
+// Clears the results of all tests in this test case.
+void TestCase::ClearResult() {
+  ad_hoc_test_result_.Clear();
+  ForEach(test_info_list_, TestInfo::ClearTestResult);
+}
+
+// Shuffles the tests in this test case.
+void TestCase::ShuffleTests(internal::Random* random) {
+  Shuffle(random, &test_indices_);
+}
+
+// Restores the test order to before the first shuffle.
+void TestCase::UnshuffleTests() {
+  for (size_t i = 0; i < test_indices_.size(); i++) {
+    test_indices_[i] = static_cast<int>(i);
+  }
+}
+
+// Formats a countable noun.  Depending on its quantity, either the
+// singular form or the plural form is used. e.g.
+//
+// FormatCountableNoun(1, "formula", "formuli") returns "1 formula".
+// FormatCountableNoun(5, "book", "books") returns "5 books".
+static std::string FormatCountableNoun(int count,
+                                       const char * singular_form,
+                                       const char * plural_form) {
+  return internal::StreamableToString(count) + " " +
+      (count == 1 ? singular_form : plural_form);
+}
+
+// Formats the count of tests.
+static std::string FormatTestCount(int test_count) {
+  return FormatCountableNoun(test_count, "test", "tests");
+}
+
+// Formats the count of test cases.
+static std::string FormatTestCaseCount(int test_case_count) {
+  return FormatCountableNoun(test_case_count, "test case", "test cases");
+}
+
+// Converts a TestPartResult::Type enum to human-friendly string
+// representation.  Both kNonFatalFailure and kFatalFailure are translated
+// to "Failure", as the user usually doesn't care about the difference
+// between the two when viewing the test result.
+static const char * TestPartResultTypeToString(TestPartResult::Type type) {
+  switch (type) {
+    case TestPartResult::kSuccess:
+      return "Success";
+
+    case TestPartResult::kNonFatalFailure:
+    case TestPartResult::kFatalFailure:
+#ifdef _MSC_VER
+      return "error: ";
+#else
+      return "Failure\n";
+#endif
+    default:
+      return "Unknown result type";
+  }
+}
+
+namespace internal {
+
+// Prints a TestPartResult to an std::string.
+static std::string PrintTestPartResultToString(
+    const TestPartResult& test_part_result) {
+  return (Message()
+          << internal::FormatFileLocation(test_part_result.file_name(),
+                                          test_part_result.line_number())
+          << " " << TestPartResultTypeToString(test_part_result.type())
+          << test_part_result.message()).GetString();
+}
+
+// Prints a TestPartResult.
+static void PrintTestPartResult(const TestPartResult& test_part_result) {
+  const std::string& result =
+      PrintTestPartResultToString(test_part_result);
+  printf("%s\n", result.c_str());
+  fflush(stdout);
+  // If the test program runs in Visual Studio or a debugger, the
+  // following statements add the test part result message to the Output
+  // window such that the user can double-click on it to jump to the
+  // corresponding source code location; otherwise they do nothing.
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+  // We don't call OutputDebugString*() on Windows Mobile, as printing
+  // to stdout is done by OutputDebugString() there already - we don't
+  // want the same message printed twice.
+  ::OutputDebugStringA(result.c_str());
+  ::OutputDebugStringA("\n");
+#endif
+}
+
+// class PrettyUnitTestResultPrinter
+
+enum GTestColor {
+  COLOR_DEFAULT,
+  COLOR_RED,
+  COLOR_GREEN,
+  COLOR_YELLOW
+};
+
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
+    !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+
+// Returns the character attribute for the given color.
+WORD GetColorAttribute(GTestColor color) {
+  switch (color) {
+    case COLOR_RED:    return FOREGROUND_RED;
+    case COLOR_GREEN:  return FOREGROUND_GREEN;
+    case COLOR_YELLOW: return FOREGROUND_RED | FOREGROUND_GREEN;
+    default:           return 0;
+  }
+}
+
+#else
+
+// Returns the ANSI color code for the given color.  COLOR_DEFAULT is
+// an invalid input.
+const char* GetAnsiColorCode(GTestColor color) {
+  switch (color) {
+    case COLOR_RED:     return "1";
+    case COLOR_GREEN:   return "2";
+    case COLOR_YELLOW:  return "3";
+    default:            return NULL;
+  };
+}
+
+#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+
+// Returns true iff Google Test should use colors in the output.
+bool ShouldUseColor(bool stdout_is_tty) {
+  const char* const gtest_color = GTEST_FLAG(color).c_str();
+
+  if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) {
+#if GTEST_OS_WINDOWS
+    // On Windows the TERM variable is usually not set, but the
+    // console there does support colors.
+    return stdout_is_tty;
+#else
+    // On non-Windows platforms, we rely on the TERM variable.
+    const char* const term = posix::GetEnv("TERM");
+    const bool term_supports_color =
+        String::CStringEquals(term, "xterm") ||
+        String::CStringEquals(term, "xterm-color") ||
+        String::CStringEquals(term, "xterm-256color") ||
+        String::CStringEquals(term, "screen") ||
+        String::CStringEquals(term, "screen-256color") ||
+        String::CStringEquals(term, "tmux") ||
+        String::CStringEquals(term, "tmux-256color") ||
+        String::CStringEquals(term, "rxvt-unicode") ||
+        String::CStringEquals(term, "rxvt-unicode-256color") ||
+        String::CStringEquals(term, "linux") ||
+        String::CStringEquals(term, "cygwin");
+    return stdout_is_tty && term_supports_color;
+#endif  // GTEST_OS_WINDOWS
+  }
+
+  return String::CaseInsensitiveCStringEquals(gtest_color, "yes") ||
+      String::CaseInsensitiveCStringEquals(gtest_color, "true") ||
+      String::CaseInsensitiveCStringEquals(gtest_color, "t") ||
+      String::CStringEquals(gtest_color, "1");
+  // We take "yes", "true", "t", and "1" as meaning "yes".  If the
+  // value is neither one of these nor "auto", we treat it as "no" to
+  // be conservative.
+}
+
+// Helpers for printing colored strings to stdout. Note that on Windows, we
+// cannot simply emit special characters and have the terminal change colors.
+// This routine must actually emit the characters rather than return a string
+// that would be colored when printed, as can be done on Linux.
+void ColoredPrintf(GTestColor color, const char* fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS || \
+    GTEST_OS_IOS || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
+  const bool use_color = AlwaysFalse();
+#else
+  static const bool in_color_mode =
+      ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0);
+  const bool use_color = in_color_mode && (color != COLOR_DEFAULT);
+#endif  // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS
+  // The '!= 0' comparison is necessary to satisfy MSVC 7.1.
+
+  if (!use_color) {
+    vprintf(fmt, args);
+    va_end(args);
+    return;
+  }
+
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \
+    !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+  const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE);
+
+  // Gets the current text color.
+  CONSOLE_SCREEN_BUFFER_INFO buffer_info;
+  GetConsoleScreenBufferInfo(stdout_handle, &buffer_info);
+  const WORD old_color_attrs = buffer_info.wAttributes;
+
+  // We need to flush the stream buffers into the console before each
+  // SetConsoleTextAttribute call lest it affect the text that is already
+  // printed but has not yet reached the console.
+  fflush(stdout);
+  SetConsoleTextAttribute(stdout_handle,
+                          GetColorAttribute(color) | FOREGROUND_INTENSITY);
+  vprintf(fmt, args);
+
+  fflush(stdout);
+  // Restores the text color.
+  SetConsoleTextAttribute(stdout_handle, old_color_attrs);
+#else
+  printf("\033[0;3%sm", GetAnsiColorCode(color));
+  vprintf(fmt, args);
+  printf("\033[m");  // Resets the terminal to default.
+#endif  // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE
+  va_end(args);
+}
+
+// Text printed in Google Test's text output and --gunit_list_tests
+// output to label the type parameter and value parameter for a test.
+static const char kTypeParamLabel[] = "TypeParam";
+static const char kValueParamLabel[] = "GetParam()";
+
+void PrintFullTestCommentIfPresent(const TestInfo& test_info) {
+  const char* const type_param = test_info.type_param();
+  const char* const value_param = test_info.value_param();
+
+  if (type_param != NULL || value_param != NULL) {
+    printf(", where ");
+    if (type_param != NULL) {
+      printf("%s = %s", kTypeParamLabel, type_param);
+      if (value_param != NULL)
+        printf(" and ");
+    }
+    if (value_param != NULL) {
+      printf("%s = %s", kValueParamLabel, value_param);
+    }
+  }
+}
+
+// This class implements the TestEventListener interface.
+//
+// Class PrettyUnitTestResultPrinter is copyable.
+class PrettyUnitTestResultPrinter : public TestEventListener {
+ public:
+  PrettyUnitTestResultPrinter() {}
+  static void PrintTestName(const char * test_case, const char * test) {
+    printf("%s.%s", test_case, test);
+  }
+
+  // The following methods override what's in the TestEventListener class.
+  virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {}
+  virtual void OnTestIterationStart(const UnitTest& unit_test, int iteration);
+  virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test);
+  virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {}
+  virtual void OnTestCaseStart(const TestCase& test_case);
+  virtual void OnTestStart(const TestInfo& test_info);
+  virtual void OnTestPartResult(const TestPartResult& result);
+  virtual void OnTestEnd(const TestInfo& test_info);
+  virtual void OnTestCaseEnd(const TestCase& test_case);
+  virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test);
+  virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {}
+  virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration);
+  virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {}
+
+ private:
+  static void PrintFailedTests(const UnitTest& unit_test);
+};
+
+  // Fired before each iteration of tests starts.
+void PrettyUnitTestResultPrinter::OnTestIterationStart(
+    const UnitTest& unit_test, int iteration) {
+  if (GTEST_FLAG(repeat) != 1)
+    printf("\nRepeating all tests (iteration %d) . . .\n\n", iteration + 1);
+
+  const char* const filter = GTEST_FLAG(filter).c_str();
+
+  // Prints the filter if it's not *.  This reminds the user that some
+  // tests may be skipped.
+  if (!String::CStringEquals(filter, kUniversalFilter)) {
+    ColoredPrintf(COLOR_YELLOW,
+                  "Note: %s filter = %s\n", GTEST_NAME_, filter);
+  }
+
+  if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) {
+    const Int32 shard_index = Int32FromEnvOrDie(kTestShardIndex, -1);
+    ColoredPrintf(COLOR_YELLOW,
+                  "Note: This is test shard %d of %s.\n",
+                  static_cast<int>(shard_index) + 1,
+                  internal::posix::GetEnv(kTestTotalShards));
+  }
+
+  if (GTEST_FLAG(shuffle)) {
+    ColoredPrintf(COLOR_YELLOW,
+                  "Note: Randomizing tests' orders with a seed of %d .\n",
+                  unit_test.random_seed());
+  }
+
+  ColoredPrintf(COLOR_GREEN,  "[==========] ");
+  printf("Running %s from %s.\n",
+         FormatTestCount(unit_test.test_to_run_count()).c_str(),
+         FormatTestCaseCount(unit_test.test_case_to_run_count()).c_str());
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnEnvironmentsSetUpStart(
+    const UnitTest& /*unit_test*/) {
+  ColoredPrintf(COLOR_GREEN,  "[----------] ");
+  printf("Global test environment set-up.\n");
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnTestCaseStart(const TestCase& test_case) {
+  const std::string counts =
+      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
+  ColoredPrintf(COLOR_GREEN, "[----------] ");
+  printf("%s from %s", counts.c_str(), test_case.name());
+  if (test_case.type_param() == NULL) {
+    printf("\n");
+  } else {
+    printf(", where %s = %s\n", kTypeParamLabel, test_case.type_param());
+  }
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) {
+  ColoredPrintf(COLOR_GREEN,  "[ RUN      ] ");
+  PrintTestName(test_info.test_case_name(), test_info.name());
+  printf("\n");
+  fflush(stdout);
+}
+
+// Called after an assertion failure.
+void PrettyUnitTestResultPrinter::OnTestPartResult(
+    const TestPartResult& result) {
+  // If the test part succeeded, we don't need to do anything.
+  if (result.type() == TestPartResult::kSuccess)
+    return;
+
+  // Print failure message from the assertion (e.g. expected this and got that).
+  PrintTestPartResult(result);
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) {
+  if (test_info.result()->Passed()) {
+    ColoredPrintf(COLOR_GREEN, "[       OK ] ");
+  } else {
+    ColoredPrintf(COLOR_RED, "[  FAILED  ] ");
+  }
+  PrintTestName(test_info.test_case_name(), test_info.name());
+  if (test_info.result()->Failed())
+    PrintFullTestCommentIfPresent(test_info);
+
+  if (GTEST_FLAG(print_time)) {
+    printf(" (%s ms)\n", internal::StreamableToString(
+           test_info.result()->elapsed_time()).c_str());
+  } else {
+    printf("\n");
+  }
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) {
+  if (!GTEST_FLAG(print_time)) return;
+
+  const std::string counts =
+      FormatCountableNoun(test_case.test_to_run_count(), "test", "tests");
+  ColoredPrintf(COLOR_GREEN, "[----------] ");
+  printf("%s from %s (%s ms total)\n\n",
+         counts.c_str(), test_case.name(),
+         internal::StreamableToString(test_case.elapsed_time()).c_str());
+  fflush(stdout);
+}
+
+void PrettyUnitTestResultPrinter::OnEnvironmentsTearDownStart(
+    const UnitTest& /*unit_test*/) {
+  ColoredPrintf(COLOR_GREEN,  "[----------] ");
+  printf("Global test environment tear-down\n");
+  fflush(stdout);
+}
+
+// Internal helper for printing the list of failed tests.
+void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) {
+  const int failed_test_count = unit_test.failed_test_count();
+  if (failed_test_count == 0) {
+    return;
+  }
+
+  for (int i = 0; i < unit_test.total_test_case_count(); ++i) {
+    const TestCase& test_case = *unit_test.GetTestCase(i);
+    if (!test_case.should_run() || (test_case.failed_test_count() == 0)) {
+      continue;
+    }
+    for (int j = 0; j < test_case.total_test_count(); ++j) {
+      const TestInfo& test_info = *test_case.GetTestInfo(j);
+      if (!test_info.should_run() || test_info.result()->Passed()) {
+        continue;
+      }
+      ColoredPrintf(COLOR_RED, "[  FAILED  ] ");
+      printf("%s.%s", test_case.name(), test_info.name());
+      PrintFullTestCommentIfPresent(test_info);
+      printf("\n");
+    }
+  }
+}
+
+void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
+                                                     int /*iteration*/) {
+  ColoredPrintf(COLOR_GREEN,  "[==========] ");
+  printf("%s from %s ran.",
+         FormatTestCount(unit_test.test_to_run_count()).c_str(),
+         FormatTestCaseCount(unit_test.test_case_to_run_count()).c_str());
+  if (GTEST_FLAG(print_time)) {
+    printf(" (%s ms total)",
+           internal::StreamableToString(unit_test.elapsed_time()).c_str());
+  }
+  printf("\n");
+  ColoredPrintf(COLOR_GREEN,  "[  PASSED  ] ");
+  printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str());
+
+  int num_failures = unit_test.failed_test_count();
+  if (!unit_test.Passed()) {
+    const int failed_test_count = unit_test.failed_test_count();
+    ColoredPrintf(COLOR_RED,  "[  FAILED  ] ");
+    printf("%s, listed below:\n", FormatTestCount(failed_test_count).c_str());
+    PrintFailedTests(unit_test);
+    printf("\n%2d FAILED %s\n", num_failures,
+                        num_failures == 1 ? "TEST" : "TESTS");
+  }
+
+  int num_disabled = unit_test.reportable_disabled_test_count();
+  if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) {
+    if (!num_failures) {
+      printf("\n");  // Add a spacer if no FAILURE banner is displayed.
+    }
+    ColoredPrintf(COLOR_YELLOW,
+                  "  YOU HAVE %d DISABLED %s\n\n",
+                  num_disabled,
+                  num_disabled == 1 ? "TEST" : "TESTS");
+  }
+  // Ensure that Google Test output is printed before, e.g., heapchecker output.
+  fflush(stdout);
+}
+
+// End PrettyUnitTestResultPrinter
+
+// class TestEventRepeater
+//
+// This class forwards events to other event listeners.
+class TestEventRepeater : public TestEventListener {
+ public:
+  TestEventRepeater() : forwarding_enabled_(true) {}
+  virtual ~TestEventRepeater();
+  void Append(TestEventListener *listener);
+  TestEventListener* Release(TestEventListener* listener);
+
+  // Controls whether events will be forwarded to listeners_. Set to false
+  // in death test child processes.
+  bool forwarding_enabled() const { return forwarding_enabled_; }
+  void set_forwarding_enabled(bool enable) { forwarding_enabled_ = enable; }
+
+  virtual void OnTestProgramStart(const UnitTest& unit_test);
+  virtual void OnTestIterationStart(const UnitTest& unit_test, int iteration);
+  virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test);
+  virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test);
+  virtual void OnTestCaseStart(const TestCase& test_case);
+  virtual void OnTestStart(const TestInfo& test_info);
+  virtual void OnTestPartResult(const TestPartResult& result);
+  virtual void OnTestEnd(const TestInfo& test_info);
+  virtual void OnTestCaseEnd(const TestCase& test_case);
+  virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test);
+  virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test);
+  virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration);
+  virtual void OnTestProgramEnd(const UnitTest& unit_test);
+
+ private:
+  // Controls whether events will be forwarded to listeners_. Set to false
+  // in death test child processes.
+  bool forwarding_enabled_;
+  // The list of listeners that receive events.
+  std::vector<TestEventListener*> listeners_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventRepeater);
+};
+
+TestEventRepeater::~TestEventRepeater() {
+  ForEach(listeners_, Delete<TestEventListener>);
+}
+
+void TestEventRepeater::Append(TestEventListener *listener) {
+  listeners_.push_back(listener);
+}
+
+// TODO(vladl@google.com): Factor the search functionality into Vector::Find.
+TestEventListener* TestEventRepeater::Release(TestEventListener *listener) {
+  for (size_t i = 0; i < listeners_.size(); ++i) {
+    if (listeners_[i] == listener) {
+      listeners_.erase(listeners_.begin() + i);
+      return listener;
+    }
+  }
+
+  return NULL;
+}
+
+// Since most methods are very similar, use macros to reduce boilerplate.
+// This defines a member that forwards the call to all listeners.
+#define GTEST_REPEATER_METHOD_(Name, Type) \
+void TestEventRepeater::Name(const Type& parameter) { \
+  if (forwarding_enabled_) { \
+    for (size_t i = 0; i < listeners_.size(); i++) { \
+      listeners_[i]->Name(parameter); \
+    } \
+  } \
+}
+// This defines a member that forwards the call to all listeners in reverse
+// order.
+#define GTEST_REVERSE_REPEATER_METHOD_(Name, Type) \
+void TestEventRepeater::Name(const Type& parameter) { \
+  if (forwarding_enabled_) { \
+    for (int i = static_cast<int>(listeners_.size()) - 1; i >= 0; i--) { \
+      listeners_[i]->Name(parameter); \
+    } \
+  } \
+}
+
+GTEST_REPEATER_METHOD_(OnTestProgramStart, UnitTest)
+GTEST_REPEATER_METHOD_(OnEnvironmentsSetUpStart, UnitTest)
+GTEST_REPEATER_METHOD_(OnTestCaseStart, TestCase)
+GTEST_REPEATER_METHOD_(OnTestStart, TestInfo)
+GTEST_REPEATER_METHOD_(OnTestPartResult, TestPartResult)
+GTEST_REPEATER_METHOD_(OnEnvironmentsTearDownStart, UnitTest)
+GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsSetUpEnd, UnitTest)
+GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsTearDownEnd, UnitTest)
+GTEST_REVERSE_REPEATER_METHOD_(OnTestEnd, TestInfo)
+GTEST_REVERSE_REPEATER_METHOD_(OnTestCaseEnd, TestCase)
+GTEST_REVERSE_REPEATER_METHOD_(OnTestProgramEnd, UnitTest)
+
+#undef GTEST_REPEATER_METHOD_
+#undef GTEST_REVERSE_REPEATER_METHOD_
+
+void TestEventRepeater::OnTestIterationStart(const UnitTest& unit_test,
+                                             int iteration) {
+  if (forwarding_enabled_) {
+    for (size_t i = 0; i < listeners_.size(); i++) {
+      listeners_[i]->OnTestIterationStart(unit_test, iteration);
+    }
+  }
+}
+
+void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test,
+                                           int iteration) {
+  if (forwarding_enabled_) {
+    for (int i = static_cast<int>(listeners_.size()) - 1; i >= 0; i--) {
+      listeners_[i]->OnTestIterationEnd(unit_test, iteration);
+    }
+  }
+}
+
+// End TestEventRepeater
+
+// This class generates an XML output file.
+class XmlUnitTestResultPrinter : public EmptyTestEventListener {
+ public:
+  explicit XmlUnitTestResultPrinter(const char* output_file);
+
+  virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration);
+
+ private:
+  // Is c a whitespace character that is normalized to a space character
+  // when it appears in an XML attribute value?
+  static bool IsNormalizableWhitespace(char c) {
+    return c == 0x9 || c == 0xA || c == 0xD;
+  }
+
+  // May c appear in a well-formed XML document?
+  static bool IsValidXmlCharacter(char c) {
+    return IsNormalizableWhitespace(c) || c >= 0x20;
+  }
+
+  // Returns an XML-escaped copy of the input string str.  If
+  // is_attribute is true, the text is meant to appear as an attribute
+  // value, and normalizable whitespace is preserved by replacing it
+  // with character references.
+  static std::string EscapeXml(const std::string& str, bool is_attribute);
+
+  // Returns the given string with all characters invalid in XML removed.
+  static std::string RemoveInvalidXmlCharacters(const std::string& str);
+
+  // Convenience wrapper around EscapeXml when str is an attribute value.
+  static std::string EscapeXmlAttribute(const std::string& str) {
+    return EscapeXml(str, true);
+  }
+
+  // Convenience wrapper around EscapeXml when str is not an attribute value.
+  static std::string EscapeXmlText(const char* str) {
+    return EscapeXml(str, false);
+  }
+
+  // Verifies that the given attribute belongs to the given element and
+  // streams the attribute as XML.
+  static void OutputXmlAttribute(std::ostream* stream,
+                                 const std::string& element_name,
+                                 const std::string& name,
+                                 const std::string& value);
+
+  // Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
+  static void OutputXmlCDataSection(::std::ostream* stream, const char* data);
+
+  // Streams an XML representation of a TestInfo object.
+  static void OutputXmlTestInfo(::std::ostream* stream,
+                                const char* test_case_name,
+                                const TestInfo& test_info);
+
+  // Prints an XML representation of a TestCase object
+  static void PrintXmlTestCase(::std::ostream* stream,
+                               const TestCase& test_case);
+
+  // Prints an XML summary of unit_test to output stream out.
+  static void PrintXmlUnitTest(::std::ostream* stream,
+                               const UnitTest& unit_test);
+
+  // Produces a string representing the test properties in a result as space
+  // delimited XML attributes based on the property key="value" pairs.
+  // When the std::string is not empty, it includes a space at the beginning,
+  // to delimit this attribute from prior attributes.
+  static std::string TestPropertiesAsXmlAttributes(const TestResult& result);
+
+  // The output file.
+  const std::string output_file_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter);
+};
+
+// Creates a new XmlUnitTestResultPrinter.
+XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file)
+    : output_file_(output_file) {
+  if (output_file_.c_str() == NULL || output_file_.empty()) {
+    fprintf(stderr, "XML output file may not be null\n");
+    fflush(stderr);
+    exit(EXIT_FAILURE);
+  }
+}
+
+// Called after the unit test ends.
+void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test,
+                                                  int /*iteration*/) {
+  FILE* xmlout = NULL;
+  FilePath output_file(output_file_);
+  FilePath output_dir(output_file.RemoveFileName());
+
+  if (output_dir.CreateDirectoriesRecursively()) {
+    xmlout = posix::FOpen(output_file_.c_str(), "w");
+  }
+  if (xmlout == NULL) {
+    // TODO(wan): report the reason of the failure.
+    //
+    // We don't do it for now as:
+    //
+    //   1. There is no urgent need for it.
+    //   2. It's a bit involved to make the errno variable thread-safe on
+    //      all three operating systems (Linux, Windows, and Mac OS).
+    //   3. To interpret the meaning of errno in a thread-safe way,
+    //      we need the strerror_r() function, which is not available on
+    //      Windows.
+    fprintf(stderr,
+            "Unable to open file \"%s\"\n",
+            output_file_.c_str());
+    fflush(stderr);
+    exit(EXIT_FAILURE);
+  }
+  std::stringstream stream;
+  PrintXmlUnitTest(&stream, unit_test);
+  fprintf(xmlout, "%s", StringStreamToString(&stream).c_str());
+  fclose(xmlout);
+}
+
+// Returns an XML-escaped copy of the input string str.  If is_attribute
+// is true, the text is meant to appear as an attribute value, and
+// normalizable whitespace is preserved by replacing it with character
+// references.
+//
+// Invalid XML characters in str, if any, are stripped from the output.
+// It is expected that most, if not all, of the text processed by this
+// module will consist of ordinary English text.
+// If this module is ever modified to produce version 1.1 XML output,
+// most invalid characters can be retained using character references.
+// TODO(wan): It might be nice to have a minimally invasive, human-readable
+// escaping scheme for invalid characters, rather than dropping them.
+std::string XmlUnitTestResultPrinter::EscapeXml(
+    const std::string& str, bool is_attribute) {
+  Message m;
+
+  for (size_t i = 0; i < str.size(); ++i) {
+    const char ch = str[i];
+    switch (ch) {
+      case '<':
+        m << "&lt;";
+        break;
+      case '>':
+        m << "&gt;";
+        break;
+      case '&':
+        m << "&amp;";
+        break;
+      case '\'':
+        if (is_attribute)
+          m << "&apos;";
+        else
+          m << '\'';
+        break;
+      case '"':
+        if (is_attribute)
+          m << "&quot;";
+        else
+          m << '"';
+        break;
+      default:
+        if (IsValidXmlCharacter(ch)) {
+          if (is_attribute && IsNormalizableWhitespace(ch))
+            m << "&#x" << String::FormatByte(static_cast<unsigned char>(ch))
+              << ";";
+          else
+            m << ch;
+        }
+        break;
+    }
+  }
+
+  return m.GetString();
+}
+
+// Returns the given string with all characters invalid in XML removed.
+// Currently invalid characters are dropped from the string. An
+// alternative is to replace them with certain characters such as . or ?.
+std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters(
+    const std::string& str) {
+  std::string output;
+  output.reserve(str.size());
+  for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
+    if (IsValidXmlCharacter(*it))
+      output.push_back(*it);
+
+  return output;
+}
+
+// The following routines generate an XML representation of a UnitTest
+// object.
+//
+// This is how Google Test concepts map to the DTD:
+//
+// <testsuites name="AllTests">        <-- corresponds to a UnitTest object
+//   <testsuite name="testcase-name">  <-- corresponds to a TestCase object
+//     <testcase name="test-name">     <-- corresponds to a TestInfo object
+//       <failure message="...">...</failure>
+//       <failure message="...">...</failure>
+//       <failure message="...">...</failure>
+//                                     <-- individual assertion failures
+//     </testcase>
+//   </testsuite>
+// </testsuites>
+
+// Formats the given time in milliseconds as seconds.
+std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) {
+  ::std::stringstream ss;
+  ss << (static_cast<double>(ms) * 1e-3);
+  return ss.str();
+}
+
+static bool PortableLocaltime(time_t seconds, struct tm* out) {
+#if defined(_MSC_VER)
+  return localtime_s(out, &seconds) == 0;
+#elif defined(__MINGW32__) || defined(__MINGW64__)
+  // MINGW <time.h> provides neither localtime_r nor localtime_s, but uses
+  // Windows' localtime(), which has a thread-local tm buffer.
+  struct tm* tm_ptr = localtime(&seconds);  // NOLINT
+  if (tm_ptr == NULL)
+    return false;
+  *out = *tm_ptr;
+  return true;
+#else
+  return localtime_r(&seconds, out) != NULL;
+#endif
+}
+
+// Converts the given epoch time in milliseconds to a date string in the ISO
+// 8601 format, without the timezone information.
+std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms) {
+  struct tm time_struct;
+  if (!PortableLocaltime(static_cast<time_t>(ms / 1000), &time_struct))
+    return "";
+  // YYYY-MM-DDThh:mm:ss
+  return StreamableToString(time_struct.tm_year + 1900) + "-" +
+      String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" +
+      String::FormatIntWidth2(time_struct.tm_mday) + "T" +
+      String::FormatIntWidth2(time_struct.tm_hour) + ":" +
+      String::FormatIntWidth2(time_struct.tm_min) + ":" +
+      String::FormatIntWidth2(time_struct.tm_sec);
+}
+
+// Streams an XML CDATA section, escaping invalid CDATA sequences as needed.
+void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream,
+                                                     const char* data) {
+  const char* segment = data;
+  *stream << "<![CDATA[";
+  for (;;) {
+    const char* const next_segment = strstr(segment, "]]>");
+    if (next_segment != NULL) {
+      stream->write(
+          segment, static_cast<std::streamsize>(next_segment - segment));
+      *stream << "]]>]]&gt;<![CDATA[";
+      segment = next_segment + strlen("]]>");
+    } else {
+      *stream << segment;
+      break;
+    }
+  }
+  *stream << "]]>";
+}
+
+void XmlUnitTestResultPrinter::OutputXmlAttribute(
+    std::ostream* stream,
+    const std::string& element_name,
+    const std::string& name,
+    const std::string& value) {
+  const std::vector<std::string>& allowed_names =
+      GetReservedAttributesForElement(element_name);
+
+  GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) !=
+                   allowed_names.end())
+      << "Attribute " << name << " is not allowed for element <" << element_name
+      << ">.";
+
+  *stream << " " << name << "=\"" << EscapeXmlAttribute(value) << "\"";
+}
+
+// Prints an XML representation of a TestInfo object.
+// TODO(wan): There is also value in printing properties with the plain printer.
+void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream,
+                                                 const char* test_case_name,
+                                                 const TestInfo& test_info) {
+  const TestResult& result = *test_info.result();
+  const std::string kTestcase = "testcase";
+
+  *stream << "    <testcase";
+  OutputXmlAttribute(stream, kTestcase, "name", test_info.name());
+
+  if (test_info.value_param() != NULL) {
+    OutputXmlAttribute(stream, kTestcase, "value_param",
+                       test_info.value_param());
+  }
+  if (test_info.type_param() != NULL) {
+    OutputXmlAttribute(stream, kTestcase, "type_param", test_info.type_param());
+  }
+
+  OutputXmlAttribute(stream, kTestcase, "status",
+                     test_info.should_run() ? "run" : "notrun");
+  OutputXmlAttribute(stream, kTestcase, "time",
+                     FormatTimeInMillisAsSeconds(result.elapsed_time()));
+  OutputXmlAttribute(stream, kTestcase, "classname", test_case_name);
+  *stream << TestPropertiesAsXmlAttributes(result);
+
+  int failures = 0;
+  for (int i = 0; i < result.total_part_count(); ++i) {
+    const TestPartResult& part = result.GetTestPartResult(i);
+    if (part.failed()) {
+      if (++failures == 1) {
+        *stream << ">\n";
+      }
+      const string location = internal::FormatCompilerIndependentFileLocation(
+          part.file_name(), part.line_number());
+      const string summary = location + "\n" + part.summary();
+      *stream << "      <failure message=\""
+              << EscapeXmlAttribute(summary.c_str())
+              << "\" type=\"\">";
+      const string detail = location + "\n" + part.message();
+      OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str());
+      *stream << "</failure>\n";
+    }
+  }
+
+  if (failures == 0)
+    *stream << " />\n";
+  else
+    *stream << "    </testcase>\n";
+}
+
+// Prints an XML representation of a TestCase object
+void XmlUnitTestResultPrinter::PrintXmlTestCase(std::ostream* stream,
+                                                const TestCase& test_case) {
+  const std::string kTestsuite = "testsuite";
+  *stream << "  <" << kTestsuite;
+  OutputXmlAttribute(stream, kTestsuite, "name", test_case.name());
+  OutputXmlAttribute(stream, kTestsuite, "tests",
+                     StreamableToString(test_case.reportable_test_count()));
+  OutputXmlAttribute(stream, kTestsuite, "failures",
+                     StreamableToString(test_case.failed_test_count()));
+  OutputXmlAttribute(
+      stream, kTestsuite, "disabled",
+      StreamableToString(test_case.reportable_disabled_test_count()));
+  OutputXmlAttribute(stream, kTestsuite, "errors", "0");
+  OutputXmlAttribute(stream, kTestsuite, "time",
+                     FormatTimeInMillisAsSeconds(test_case.elapsed_time()));
+  *stream << TestPropertiesAsXmlAttributes(test_case.ad_hoc_test_result())
+          << ">\n";
+
+  for (int i = 0; i < test_case.total_test_count(); ++i) {
+    if (test_case.GetTestInfo(i)->is_reportable())
+      OutputXmlTestInfo(stream, test_case.name(), *test_case.GetTestInfo(i));
+  }
+  *stream << "  </" << kTestsuite << ">\n";
+}
+
+// Prints an XML summary of unit_test to output stream out.
+void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream,
+                                                const UnitTest& unit_test) {
+  const std::string kTestsuites = "testsuites";
+
+  *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+  *stream << "<" << kTestsuites;
+
+  OutputXmlAttribute(stream, kTestsuites, "tests",
+                     StreamableToString(unit_test.reportable_test_count()));
+  OutputXmlAttribute(stream, kTestsuites, "failures",
+                     StreamableToString(unit_test.failed_test_count()));
+  OutputXmlAttribute(
+      stream, kTestsuites, "disabled",
+      StreamableToString(unit_test.reportable_disabled_test_count()));
+  OutputXmlAttribute(stream, kTestsuites, "errors", "0");
+  OutputXmlAttribute(
+      stream, kTestsuites, "timestamp",
+      FormatEpochTimeInMillisAsIso8601(unit_test.start_timestamp()));
+  OutputXmlAttribute(stream, kTestsuites, "time",
+                     FormatTimeInMillisAsSeconds(unit_test.elapsed_time()));
+
+  if (GTEST_FLAG(shuffle)) {
+    OutputXmlAttribute(stream, kTestsuites, "random_seed",
+                       StreamableToString(unit_test.random_seed()));
+  }
+
+  *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result());
+
+  OutputXmlAttribute(stream, kTestsuites, "name", "AllTests");
+  *stream << ">\n";
+
+  for (int i = 0; i < unit_test.total_test_case_count(); ++i) {
+    if (unit_test.GetTestCase(i)->reportable_test_count() > 0)
+      PrintXmlTestCase(stream, *unit_test.GetTestCase(i));
+  }
+  *stream << "</" << kTestsuites << ">\n";
+}
+
+// Produces a string representing the test properties in a result as space
+// delimited XML attributes based on the property key="value" pairs.
+std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes(
+    const TestResult& result) {
+  Message attributes;
+  for (int i = 0; i < result.test_property_count(); ++i) {
+    const TestProperty& property = result.GetTestProperty(i);
+    attributes << " " << property.key() << "="
+        << "\"" << EscapeXmlAttribute(property.value()) << "\"";
+  }
+  return attributes.GetString();
+}
+
+// End XmlUnitTestResultPrinter
+
+#if GTEST_CAN_STREAM_RESULTS_
+
+// Checks if str contains '=', '&', '%' or '\n' characters. If yes,
+// replaces them by "%xx" where xx is their hexadecimal value. For
+// example, replaces "=" with "%3D".  This algorithm is O(strlen(str))
+// in both time and space -- important as the input str may contain an
+// arbitrarily long test failure message and stack trace.
+string StreamingListener::UrlEncode(const char* str) {
+  string result;
+  result.reserve(strlen(str) + 1);
+  for (char ch = *str; ch != '\0'; ch = *++str) {
+    switch (ch) {
+      case '%':
+      case '=':
+      case '&':
+      case '\n':
+        result.append("%" + String::FormatByte(static_cast<unsigned char>(ch)));
+        break;
+      default:
+        result.push_back(ch);
+        break;
+    }
+  }
+  return result;
+}
+
+void StreamingListener::SocketWriter::MakeConnection() {
+  GTEST_CHECK_(sockfd_ == -1)
+      << "MakeConnection() can't be called when there is already a connection.";
+
+  addrinfo hints;
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNSPEC;    // To allow both IPv4 and IPv6 addresses.
+  hints.ai_socktype = SOCK_STREAM;
+  addrinfo* servinfo = NULL;
+
+  // Use the getaddrinfo() to get a linked list of IP addresses for
+  // the given host name.
+  const int error_num = getaddrinfo(
+      host_name_.c_str(), port_num_.c_str(), &hints, &servinfo);
+  if (error_num != 0) {
+    GTEST_LOG_(WARNING) << "stream_result_to: getaddrinfo() failed: "
+                        << gai_strerror(error_num);
+  }
+
+  // Loop through all the results and connect to the first we can.
+  for (addrinfo* cur_addr = servinfo; sockfd_ == -1 && cur_addr != NULL;
+       cur_addr = cur_addr->ai_next) {
+    sockfd_ = socket(
+        cur_addr->ai_family, cur_addr->ai_socktype, cur_addr->ai_protocol);
+    if (sockfd_ != -1) {
+      // Connect the client socket to the server socket.
+      if (connect(sockfd_, cur_addr->ai_addr, cur_addr->ai_addrlen) == -1) {
+        close(sockfd_);
+        sockfd_ = -1;
+      }
+    }
+  }
+
+  freeaddrinfo(servinfo);  // all done with this structure
+
+  if (sockfd_ == -1) {
+    GTEST_LOG_(WARNING) << "stream_result_to: failed to connect to "
+                        << host_name_ << ":" << port_num_;
+  }
+}
+
+// End of class Streaming Listener
+#endif  // GTEST_CAN_STREAM_RESULTS__
+
+// Class ScopedTrace
+
+// Pushes the given source file location and message onto a per-thread
+// trace stack maintained by Google Test.
+ScopedTrace::ScopedTrace(const char* file, int line, const Message& message)
+    GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) {
+  TraceInfo trace;
+  trace.file = file;
+  trace.line = line;
+  trace.message = message.GetString();
+
+  UnitTest::GetInstance()->PushGTestTrace(trace);
+}
+
+// Pops the info pushed by the c'tor.
+ScopedTrace::~ScopedTrace()
+    GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) {
+  UnitTest::GetInstance()->PopGTestTrace();
+}
+
+
+// class OsStackTraceGetter
+
+const char* const OsStackTraceGetterInterface::kElidedFramesMarker =
+    "... " GTEST_NAME_ " internal frames ...";
+
+string OsStackTraceGetter::CurrentStackTrace(int /*max_depth*/,
+                                             int /*skip_count*/) {
+  return "";
+}
+
+void OsStackTraceGetter::UponLeavingGTest() {}
+
+// A helper class that creates the premature-exit file in its
+// constructor and deletes the file in its destructor.
+class ScopedPrematureExitFile {
+ public:
+  explicit ScopedPrematureExitFile(const char* premature_exit_filepath)
+      : premature_exit_filepath_(premature_exit_filepath) {
+    // If a path to the premature-exit file is specified...
+    if (premature_exit_filepath != NULL && *premature_exit_filepath != '\0') {
+      // create the file with a single "0" character in it.  I/O
+      // errors are ignored as there's nothing better we can do and we
+      // don't want to fail the test because of this.
+      FILE* pfile = posix::FOpen(premature_exit_filepath, "w");
+      fwrite("0", 1, 1, pfile);
+      fclose(pfile);
+    }
+  }
+
+  ~ScopedPrematureExitFile() {
+    if (premature_exit_filepath_ != NULL && *premature_exit_filepath_ != '\0') {
+      remove(premature_exit_filepath_);
+    }
+  }
+
+ private:
+  const char* const premature_exit_filepath_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile);
+};
+
+}  // namespace internal
+
+// class TestEventListeners
+
+TestEventListeners::TestEventListeners()
+    : repeater_(new internal::TestEventRepeater()),
+      default_result_printer_(NULL),
+      default_xml_generator_(NULL) {
+}
+
+TestEventListeners::~TestEventListeners() { delete repeater_; }
+
+// Returns the standard listener responsible for the default console
+// output.  Can be removed from the listeners list to shut down default
+// console output.  Note that removing this object from the listener list
+// with Release transfers its ownership to the user.
+void TestEventListeners::Append(TestEventListener* listener) {
+  repeater_->Append(listener);
+}
+
+// Removes the given event listener from the list and returns it.  It then
+// becomes the caller's responsibility to delete the listener. Returns
+// NULL if the listener is not found in the list.
+TestEventListener* TestEventListeners::Release(TestEventListener* listener) {
+  if (listener == default_result_printer_)
+    default_result_printer_ = NULL;
+  else if (listener == default_xml_generator_)
+    default_xml_generator_ = NULL;
+  return repeater_->Release(listener);
+}
+
+// Returns repeater that broadcasts the TestEventListener events to all
+// subscribers.
+TestEventListener* TestEventListeners::repeater() { return repeater_; }
+
+// Sets the default_result_printer attribute to the provided listener.
+// The listener is also added to the listener list and previous
+// default_result_printer is removed from it and deleted. The listener can
+// also be NULL in which case it will not be added to the list. Does
+// nothing if the previous and the current listener objects are the same.
+void TestEventListeners::SetDefaultResultPrinter(TestEventListener* listener) {
+  if (default_result_printer_ != listener) {
+    // It is an error to pass this method a listener that is already in the
+    // list.
+    delete Release(default_result_printer_);
+    default_result_printer_ = listener;
+    if (listener != NULL)
+      Append(listener);
+  }
+}
+
+// Sets the default_xml_generator attribute to the provided listener.  The
+// listener is also added to the listener list and previous
+// default_xml_generator is removed from it and deleted. The listener can
+// also be NULL in which case it will not be added to the list. Does
+// nothing if the previous and the current listener objects are the same.
+void TestEventListeners::SetDefaultXmlGenerator(TestEventListener* listener) {
+  if (default_xml_generator_ != listener) {
+    // It is an error to pass this method a listener that is already in the
+    // list.
+    delete Release(default_xml_generator_);
+    default_xml_generator_ = listener;
+    if (listener != NULL)
+      Append(listener);
+  }
+}
+
+// Controls whether events will be forwarded by the repeater to the
+// listeners in the list.
+bool TestEventListeners::EventForwardingEnabled() const {
+  return repeater_->forwarding_enabled();
+}
+
+void TestEventListeners::SuppressEventForwarding() {
+  repeater_->set_forwarding_enabled(false);
+}
+
+// class UnitTest
+
+// Gets the singleton UnitTest object.  The first time this method is
+// called, a UnitTest object is constructed and returned.  Consecutive
+// calls will return the same object.
+//
+// We don't protect this under mutex_ as a user is not supposed to
+// call this before main() starts, from which point on the return
+// value will never change.
+UnitTest* UnitTest::GetInstance() {
+  // When compiled with MSVC 7.1 in optimized mode, destroying the
+  // UnitTest object upon exiting the program messes up the exit code,
+  // causing successful tests to appear failed.  We have to use a
+  // different implementation in this case to bypass the compiler bug.
+  // This implementation makes the compiler happy, at the cost of
+  // leaking the UnitTest object.
+
+  // CodeGear C++Builder insists on a public destructor for the
+  // default implementation.  Use this implementation to keep good OO
+  // design with private destructor.
+
+#if (_MSC_VER == 1310 && !defined(_DEBUG)) || defined(__BORLANDC__)
+  static UnitTest* const instance = new UnitTest;
+  return instance;
+#else
+  static UnitTest instance;
+  return &instance;
+#endif  // (_MSC_VER == 1310 && !defined(_DEBUG)) || defined(__BORLANDC__)
+}
+
+// Gets the number of successful test cases.
+int UnitTest::successful_test_case_count() const {
+  return impl()->successful_test_case_count();
+}
+
+// Gets the number of failed test cases.
+int UnitTest::failed_test_case_count() const {
+  return impl()->failed_test_case_count();
+}
+
+// Gets the number of all test cases.
+int UnitTest::total_test_case_count() const {
+  return impl()->total_test_case_count();
+}
+
+// Gets the number of all test cases that contain at least one test
+// that should run.
+int UnitTest::test_case_to_run_count() const {
+  return impl()->test_case_to_run_count();
+}
+
+// Gets the number of successful tests.
+int UnitTest::successful_test_count() const {
+  return impl()->successful_test_count();
+}
+
+// Gets the number of failed tests.
+int UnitTest::failed_test_count() const { return impl()->failed_test_count(); }
+
+// Gets the number of disabled tests that will be reported in the XML report.
+int UnitTest::reportable_disabled_test_count() const {
+  return impl()->reportable_disabled_test_count();
+}
+
+// Gets the number of disabled tests.
+int UnitTest::disabled_test_count() const {
+  return impl()->disabled_test_count();
+}
+
+// Gets the number of tests to be printed in the XML report.
+int UnitTest::reportable_test_count() const {
+  return impl()->reportable_test_count();
+}
+
+// Gets the number of all tests.
+int UnitTest::total_test_count() const { return impl()->total_test_count(); }
+
+// Gets the number of tests that should run.
+int UnitTest::test_to_run_count() const { return impl()->test_to_run_count(); }
+
+// Gets the time of the test program start, in ms from the start of the
+// UNIX epoch.
+internal::TimeInMillis UnitTest::start_timestamp() const {
+    return impl()->start_timestamp();
+}
+
+// Gets the elapsed time, in milliseconds.
+internal::TimeInMillis UnitTest::elapsed_time() const {
+  return impl()->elapsed_time();
+}
+
+// Returns true iff the unit test passed (i.e. all test cases passed).
+bool UnitTest::Passed() const { return impl()->Passed(); }
+
+// Returns true iff the unit test failed (i.e. some test case failed
+// or something outside of all tests failed).
+bool UnitTest::Failed() const { return impl()->Failed(); }
+
+// Gets the i-th test case among all the test cases. i can range from 0 to
+// total_test_case_count() - 1. If i is not in that range, returns NULL.
+const TestCase* UnitTest::GetTestCase(int i) const {
+  return impl()->GetTestCase(i);
+}
+
+// Returns the TestResult containing information on test failures and
+// properties logged outside of individual test cases.
+const TestResult& UnitTest::ad_hoc_test_result() const {
+  return *impl()->ad_hoc_test_result();
+}
+
+// Gets the i-th test case among all the test cases. i can range from 0 to
+// total_test_case_count() - 1. If i is not in that range, returns NULL.
+TestCase* UnitTest::GetMutableTestCase(int i) {
+  return impl()->GetMutableTestCase(i);
+}
+
+// Returns the list of event listeners that can be used to track events
+// inside Google Test.
+TestEventListeners& UnitTest::listeners() {
+  return *impl()->listeners();
+}
+
+// Registers and returns a global test environment.  When a test
+// program is run, all global test environments will be set-up in the
+// order they were registered.  After all tests in the program have
+// finished, all global test environments will be torn-down in the
+// *reverse* order they were registered.
+//
+// The UnitTest object takes ownership of the given environment.
+//
+// We don't protect this under mutex_, as we only support calling it
+// from the main thread.
+Environment* UnitTest::AddEnvironment(Environment* env) {
+  if (env == NULL) {
+    return NULL;
+  }
+
+  impl_->environments().push_back(env);
+  return env;
+}
+
+// Adds a TestPartResult to the current TestResult object.  All Google Test
+// assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call
+// this to report their results.  The user code should use the
+// assertion macros instead of calling this directly.
+void UnitTest::AddTestPartResult(
+    TestPartResult::Type result_type,
+    const char* file_name,
+    int line_number,
+    const std::string& message,
+    const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) {
+  Message msg;
+  msg << message;
+
+  internal::MutexLock lock(&mutex_);
+  if (impl_->gtest_trace_stack().size() > 0) {
+    msg << "\n" << GTEST_NAME_ << " trace:";
+
+    for (int i = static_cast<int>(impl_->gtest_trace_stack().size());
+         i > 0; --i) {
+      const internal::TraceInfo& trace = impl_->gtest_trace_stack()[i - 1];
+      msg << "\n" << internal::FormatFileLocation(trace.file, trace.line)
+          << " " << trace.message;
+    }
+  }
+
+  if (os_stack_trace.c_str() != NULL && !os_stack_trace.empty()) {
+    msg << internal::kStackTraceMarker << os_stack_trace;
+  }
+
+  const TestPartResult result =
+    TestPartResult(result_type, file_name, line_number,
+                   msg.GetString().c_str());
+  impl_->GetTestPartResultReporterForCurrentThread()->
+      ReportTestPartResult(result);
+
+  if (result_type != TestPartResult::kSuccess) {
+    // gtest_break_on_failure takes precedence over
+    // gtest_throw_on_failure.  This allows a user to set the latter
+    // in the code (perhaps in order to use Google Test assertions
+    // with another testing framework) and specify the former on the
+    // command line for debugging.
+    if (GTEST_FLAG(break_on_failure)) {
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+      // Using DebugBreak on Windows allows gtest to still break into a debugger
+      // when a failure happens and both the --gtest_break_on_failure and
+      // the --gtest_catch_exceptions flags are specified.
+      DebugBreak();
+#else
+      // Dereference NULL through a volatile pointer to prevent the compiler
+      // from removing. We use this rather than abort() or __builtin_trap() for
+      // portability: Symbian doesn't implement abort() well, and some debuggers
+      // don't correctly trap abort().
+      *static_cast<volatile int*>(NULL) = 1;
+#endif  // GTEST_OS_WINDOWS
+    } else if (GTEST_FLAG(throw_on_failure)) {
+#if GTEST_HAS_EXCEPTIONS
+      throw internal::GoogleTestFailureException(result);
+#else
+      // We cannot call abort() as it generates a pop-up in debug mode
+      // that cannot be suppressed in VC 7.1 or below.
+      exit(1);
+#endif
+    }
+  }
+}
+
+// Adds a TestProperty to the current TestResult object when invoked from
+// inside a test, to current TestCase's ad_hoc_test_result_ when invoked
+// from SetUpTestCase or TearDownTestCase, or to the global property set
+// when invoked elsewhere.  If the result already contains a property with
+// the same key, the value will be updated.
+void UnitTest::RecordProperty(const std::string& key,
+                              const std::string& value) {
+  impl_->RecordProperty(TestProperty(key, value));
+}
+
+// Runs all tests in this UnitTest object and prints the result.
+// Returns 0 if successful, or 1 otherwise.
+//
+// We don't protect this under mutex_, as we only support calling it
+// from the main thread.
+int UnitTest::Run() {
+  const bool in_death_test_child_process =
+      internal::GTEST_FLAG(internal_run_death_test).length() > 0;
+
+  // Google Test implements this protocol for catching that a test
+  // program exits before returning control to Google Test:
+  //
+  //   1. Upon start, Google Test creates a file whose absolute path
+  //      is specified by the environment variable
+  //      TEST_PREMATURE_EXIT_FILE.
+  //   2. When Google Test has finished its work, it deletes the file.
+  //
+  // This allows a test runner to set TEST_PREMATURE_EXIT_FILE before
+  // running a Google-Test-based test program and check the existence
+  // of the file at the end of the test execution to see if it has
+  // exited prematurely.
+
+  // If we are in the child process of a death test, don't
+  // create/delete the premature exit file, as doing so is unnecessary
+  // and will confuse the parent process.  Otherwise, create/delete
+  // the file upon entering/leaving this function.  If the program
+  // somehow exits before this function has a chance to return, the
+  // premature-exit file will be left undeleted, causing a test runner
+  // that understands the premature-exit-file protocol to report the
+  // test as having failed.
+  const internal::ScopedPrematureExitFile premature_exit_file(
+      in_death_test_child_process ?
+      NULL : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE"));
+
+  // Captures the value of GTEST_FLAG(catch_exceptions).  This value will be
+  // used for the duration of the program.
+  impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions));
+
+#if GTEST_HAS_SEH
+  // Either the user wants Google Test to catch exceptions thrown by the
+  // tests or this is executing in the context of death test child
+  // process. In either case the user does not want to see pop-up dialogs
+  // about crashes - they are expected.
+  if (impl()->catch_exceptions() || in_death_test_child_process) {
+# if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT
+    // SetErrorMode doesn't exist on CE.
+    SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT |
+                 SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
+# endif  // !GTEST_OS_WINDOWS_MOBILE
+
+# if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE
+    // Death test children can be terminated with _abort().  On Windows,
+    // _abort() can show a dialog with a warning message.  This forces the
+    // abort message to go to stderr instead.
+    _set_error_mode(_OUT_TO_STDERR);
+# endif
+
+# if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE
+    // In the debug version, Visual Studio pops up a separate dialog
+    // offering a choice to debug the aborted program. We need to suppress
+    // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement
+    // executed. Google Test will notify the user of any unexpected
+    // failure via stderr.
+    //
+    // VC++ doesn't define _set_abort_behavior() prior to the version 8.0.
+    // Users of prior VC versions shall suffer the agony and pain of
+    // clicking through the countless debug dialogs.
+    // TODO(vladl@google.com): find a way to suppress the abort dialog() in the
+    // debug mode when compiled with VC 7.1 or lower.
+    if (!GTEST_FLAG(break_on_failure))
+      _set_abort_behavior(
+          0x0,                                    // Clear the following flags:
+          _WRITE_ABORT_MSG | _CALL_REPORTFAULT);  // pop-up window, core dump.
+# endif
+  }
+#endif  // GTEST_HAS_SEH
+
+  return internal::HandleExceptionsInMethodIfSupported(
+      impl(),
+      &internal::UnitTestImpl::RunAllTests,
+      "auxiliary test code (environments or event listeners)") ? 0 : 1;
+}
+
+// Returns the working directory when the first TEST() or TEST_F() was
+// executed.
+const char* UnitTest::original_working_dir() const {
+  return impl_->original_working_dir_.c_str();
+}
+
+// Returns the TestCase object for the test that's currently running,
+// or NULL if no test is running.
+const TestCase* UnitTest::current_test_case() const
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  return impl_->current_test_case();
+}
+
+// Returns the TestInfo object for the test that's currently running,
+// or NULL if no test is running.
+const TestInfo* UnitTest::current_test_info() const
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  return impl_->current_test_info();
+}
+
+// Returns the random seed used at the start of the current test run.
+int UnitTest::random_seed() const { return impl_->random_seed(); }
+
+#if GTEST_HAS_PARAM_TEST
+// Returns ParameterizedTestCaseRegistry object used to keep track of
+// value-parameterized tests and instantiate and register them.
+internal::ParameterizedTestCaseRegistry&
+    UnitTest::parameterized_test_registry()
+        GTEST_LOCK_EXCLUDED_(mutex_) {
+  return impl_->parameterized_test_registry();
+}
+#endif  // GTEST_HAS_PARAM_TEST
+
+// Creates an empty UnitTest.
+UnitTest::UnitTest() {
+  impl_ = new internal::UnitTestImpl(this);
+}
+
+// Destructor of UnitTest.
+UnitTest::~UnitTest() {
+  delete impl_;
+}
+
+// Pushes a trace defined by SCOPED_TRACE() on to the per-thread
+// Google Test trace stack.
+void UnitTest::PushGTestTrace(const internal::TraceInfo& trace)
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  impl_->gtest_trace_stack().push_back(trace);
+}
+
+// Pops a trace from the per-thread Google Test trace stack.
+void UnitTest::PopGTestTrace()
+    GTEST_LOCK_EXCLUDED_(mutex_) {
+  internal::MutexLock lock(&mutex_);
+  impl_->gtest_trace_stack().pop_back();
+}
+
+namespace internal {
+
+UnitTestImpl::UnitTestImpl(UnitTest* parent)
+    : parent_(parent),
+      GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355 /* using this in initializer */)
+      default_global_test_part_result_reporter_(this),
+      default_per_thread_test_part_result_reporter_(this),
+      GTEST_DISABLE_MSC_WARNINGS_POP_()
+      global_test_part_result_repoter_(
+          &default_global_test_part_result_reporter_),
+      per_thread_test_part_result_reporter_(
+          &default_per_thread_test_part_result_reporter_),
+#if GTEST_HAS_PARAM_TEST
+      parameterized_test_registry_(),
+      parameterized_tests_registered_(false),
+#endif  // GTEST_HAS_PARAM_TEST
+      last_death_test_case_(-1),
+      current_test_case_(NULL),
+      current_test_info_(NULL),
+      ad_hoc_test_result_(),
+      os_stack_trace_getter_(NULL),
+      post_flag_parse_init_performed_(false),
+      random_seed_(0),  // Will be overridden by the flag before first use.
+      random_(0),  // Will be reseeded before first use.
+      start_timestamp_(0),
+      elapsed_time_(0),
+#if GTEST_HAS_DEATH_TEST
+      death_test_factory_(new DefaultDeathTestFactory),
+#endif
+      // Will be overridden by the flag before first use.
+      catch_exceptions_(false) {
+  listeners()->SetDefaultResultPrinter(new PrettyUnitTestResultPrinter);
+}
+
+UnitTestImpl::~UnitTestImpl() {
+  // Deletes every TestCase.
+  ForEach(test_cases_, internal::Delete<TestCase>);
+
+  // Deletes every Environment.
+  ForEach(environments_, internal::Delete<Environment>);
+
+  delete os_stack_trace_getter_;
+}
+
+// Adds a TestProperty to the current TestResult object when invoked in a
+// context of a test, to current test case's ad_hoc_test_result when invoke
+// from SetUpTestCase/TearDownTestCase, or to the global property set
+// otherwise.  If the result already contains a property with the same key,
+// the value will be updated.
+void UnitTestImpl::RecordProperty(const TestProperty& test_property) {
+  std::string xml_element;
+  TestResult* test_result;  // TestResult appropriate for property recording.
+
+  if (current_test_info_ != NULL) {
+    xml_element = "testcase";
+    test_result = &(current_test_info_->result_);
+  } else if (current_test_case_ != NULL) {
+    xml_element = "testsuite";
+    test_result = &(current_test_case_->ad_hoc_test_result_);
+  } else {
+    xml_element = "testsuites";
+    test_result = &ad_hoc_test_result_;
+  }
+  test_result->RecordProperty(xml_element, test_property);
+}
+
+#if GTEST_HAS_DEATH_TEST
+// Disables event forwarding if the control is currently in a death test
+// subprocess. Must not be called before InitGoogleTest.
+void UnitTestImpl::SuppressTestEventsIfInSubprocess() {
+  if (internal_run_death_test_flag_.get() != NULL)
+    listeners()->SuppressEventForwarding();
+}
+#endif  // GTEST_HAS_DEATH_TEST
+
+// Initializes event listeners performing XML output as specified by
+// UnitTestOptions. Must not be called before InitGoogleTest.
+void UnitTestImpl::ConfigureXmlOutput() {
+  const std::string& output_format = UnitTestOptions::GetOutputFormat();
+  if (output_format == "xml") {
+    listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter(
+        UnitTestOptions::GetAbsolutePathToOutputFile().c_str()));
+  } else if (output_format != "") {
+    printf("WARNING: unrecognized output format \"%s\" ignored.\n",
+           output_format.c_str());
+    fflush(stdout);
+  }
+}
+
+#if GTEST_CAN_STREAM_RESULTS_
+// Initializes event listeners for streaming test results in string form.
+// Must not be called before InitGoogleTest.
+void UnitTestImpl::ConfigureStreamingOutput() {
+  const std::string& target = GTEST_FLAG(stream_result_to);
+  if (!target.empty()) {
+    const size_t pos = target.find(':');
+    if (pos != std::string::npos) {
+      listeners()->Append(new StreamingListener(target.substr(0, pos),
+                                                target.substr(pos+1)));
+    } else {
+      printf("WARNING: unrecognized streaming target \"%s\" ignored.\n",
+             target.c_str());
+      fflush(stdout);
+    }
+  }
+}
+#endif  // GTEST_CAN_STREAM_RESULTS_
+
+// Performs initialization dependent upon flag values obtained in
+// ParseGoogleTestFlagsOnly.  Is called from InitGoogleTest after the call to
+// ParseGoogleTestFlagsOnly.  In case a user neglects to call InitGoogleTest
+// this function is also called from RunAllTests.  Since this function can be
+// called more than once, it has to be idempotent.
+void UnitTestImpl::PostFlagParsingInit() {
+  // Ensures that this function does not execute more than once.
+  if (!post_flag_parse_init_performed_) {
+    post_flag_parse_init_performed_ = true;
+
+#if defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
+    // Register to send notifications about key process state changes.
+    listeners()->Append(new GTEST_CUSTOM_TEST_EVENT_LISTENER_());
+#endif  // defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_)
+
+#if GTEST_HAS_DEATH_TEST
+    InitDeathTestSubprocessControlInfo();
+    SuppressTestEventsIfInSubprocess();
+#endif  // GTEST_HAS_DEATH_TEST
+
+    // Registers parameterized tests. This makes parameterized tests
+    // available to the UnitTest reflection API without running
+    // RUN_ALL_TESTS.
+    RegisterParameterizedTests();
+
+    // Configures listeners for XML output. This makes it possible for users
+    // to shut down the default XML output before invoking RUN_ALL_TESTS.
+    ConfigureXmlOutput();
+
+#if GTEST_CAN_STREAM_RESULTS_
+    // Configures listeners for streaming test results to the specified server.
+    ConfigureStreamingOutput();
+#endif  // GTEST_CAN_STREAM_RESULTS_
+  }
+}
+
+// A predicate that checks the name of a TestCase against a known
+// value.
+//
+// This is used for implementation of the UnitTest class only.  We put
+// it in the anonymous namespace to prevent polluting the outer
+// namespace.
+//
+// TestCaseNameIs is copyable.
+class TestCaseNameIs {
+ public:
+  // Constructor.
+  explicit TestCaseNameIs(const std::string& name)
+      : name_(name) {}
+
+  // Returns true iff the name of test_case matches name_.
+  bool operator()(const TestCase* test_case) const {
+    return test_case != NULL && strcmp(test_case->name(), name_.c_str()) == 0;
+  }
+
+ private:
+  std::string name_;
+};
+
+// Finds and returns a TestCase with the given name.  If one doesn't
+// exist, creates one and returns it.  It's the CALLER'S
+// RESPONSIBILITY to ensure that this function is only called WHEN THE
+// TESTS ARE NOT SHUFFLED.
+//
+// Arguments:
+//
+//   test_case_name: name of the test case
+//   type_param:     the name of the test case's type parameter, or NULL if
+//                   this is not a typed or a type-parameterized test case.
+//   set_up_tc:      pointer to the function that sets up the test case
+//   tear_down_tc:   pointer to the function that tears down the test case
+TestCase* UnitTestImpl::GetTestCase(const char* test_case_name,
+                                    const char* type_param,
+                                    Test::SetUpTestCaseFunc set_up_tc,
+                                    Test::TearDownTestCaseFunc tear_down_tc) {
+  // Can we find a TestCase with the given name?
+  const std::vector<TestCase*>::const_iterator test_case =
+      std::find_if(test_cases_.begin(), test_cases_.end(),
+                   TestCaseNameIs(test_case_name));
+
+  if (test_case != test_cases_.end())
+    return *test_case;
+
+  // No.  Let's create one.
+  TestCase* const new_test_case =
+      new TestCase(test_case_name, type_param, set_up_tc, tear_down_tc);
+
+  // Is this a death test case?
+  if (internal::UnitTestOptions::MatchesFilter(test_case_name,
+                                               kDeathTestCaseFilter)) {
+    // Yes.  Inserts the test case after the last death test case
+    // defined so far.  This only works when the test cases haven't
+    // been shuffled.  Otherwise we may end up running a death test
+    // after a non-death test.
+    ++last_death_test_case_;
+    test_cases_.insert(test_cases_.begin() + last_death_test_case_,
+                       new_test_case);
+  } else {
+    // No.  Appends to the end of the list.
+    test_cases_.push_back(new_test_case);
+  }
+
+  test_case_indices_.push_back(static_cast<int>(test_case_indices_.size()));
+  return new_test_case;
+}
+
+// Helpers for setting up / tearing down the given environment.  They
+// are for use in the ForEach() function.
+static void SetUpEnvironment(Environment* env) { env->SetUp(); }
+static void TearDownEnvironment(Environment* env) { env->TearDown(); }
+
+// Runs all tests in this UnitTest object, prints the result, and
+// returns true if all tests are successful.  If any exception is
+// thrown during a test, the test is considered to be failed, but the
+// rest of the tests will still be run.
+//
+// When parameterized tests are enabled, it expands and registers
+// parameterized tests first in RegisterParameterizedTests().
+// All other functions called from RunAllTests() may safely assume that
+// parameterized tests are ready to be counted and run.
+bool UnitTestImpl::RunAllTests() {
+  // Makes sure InitGoogleTest() was called.
+  if (!GTestIsInitialized()) {
+    printf("%s",
+           "\nThis test program did NOT call ::testing::InitGoogleTest "
+           "before calling RUN_ALL_TESTS().  Please fix it.\n");
+    return false;
+  }
+
+  // Do not run any test if the --help flag was specified.
+  if (g_help_flag)
+    return true;
+
+  // Repeats the call to the post-flag parsing initialization in case the
+  // user didn't call InitGoogleTest.
+  PostFlagParsingInit();
+
+  // Even if sharding is not on, test runners may want to use the
+  // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding
+  // protocol.
+  internal::WriteToShardStatusFileIfNeeded();
+
+  // True iff we are in a subprocess for running a thread-safe-style
+  // death test.
+  bool in_subprocess_for_death_test = false;
+
+#if GTEST_HAS_DEATH_TEST
+  in_subprocess_for_death_test = (internal_run_death_test_flag_.get() != NULL);
+# if defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
+  if (in_subprocess_for_death_test) {
+    GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_();
+  }
+# endif  // defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_)
+#endif  // GTEST_HAS_DEATH_TEST
+
+  const bool should_shard = ShouldShard(kTestTotalShards, kTestShardIndex,
+                                        in_subprocess_for_death_test);
+
+  // Compares the full test names with the filter to decide which
+  // tests to run.
+  const bool has_tests_to_run = FilterTests(should_shard
+                                              ? HONOR_SHARDING_PROTOCOL
+                                              : IGNORE_SHARDING_PROTOCOL) > 0;
+
+  // Lists the tests and exits if the --gtest_list_tests flag was specified.
+  if (GTEST_FLAG(list_tests)) {
+    // This must be called *after* FilterTests() has been called.
+    ListTestsMatchingFilter();
+    return true;
+  }
+
+  random_seed_ = GTEST_FLAG(shuffle) ?
+      GetRandomSeedFromFlag(GTEST_FLAG(random_seed)) : 0;
+
+  // True iff at least one test has failed.
+  bool failed = false;
+
+  TestEventListener* repeater = listeners()->repeater();
+
+  start_timestamp_ = GetTimeInMillis();
+  repeater->OnTestProgramStart(*parent_);
+
+  // How many times to repeat the tests?  We don't want to repeat them
+  // when we are inside the subprocess of a death test.
+  const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat);
+  // Repeats forever if the repeat count is negative.
+  const bool forever = repeat < 0;
+  for (int i = 0; forever || i != repeat; i++) {
+    // We want to preserve failures generated by ad-hoc test
+    // assertions executed before RUN_ALL_TESTS().
+    ClearNonAdHocTestResult();
+
+    const TimeInMillis start = GetTimeInMillis();
+
+    // Shuffles test cases and tests if requested.
+    if (has_tests_to_run && GTEST_FLAG(shuffle)) {
+      random()->Reseed(random_seed_);
+      // This should be done before calling OnTestIterationStart(),
+      // such that a test event listener can see the actual test order
+      // in the event.
+      ShuffleTests();
+    }
+
+    // Tells the unit test event listeners that the tests are about to start.
+    repeater->OnTestIterationStart(*parent_, i);
+
+    // Runs each test case if there is at least one test to run.
+    if (has_tests_to_run) {
+      // Sets up all environments beforehand.
+      repeater->OnEnvironmentsSetUpStart(*parent_);
+      ForEach(environments_, SetUpEnvironment);
+      repeater->OnEnvironmentsSetUpEnd(*parent_);
+
+      // Runs the tests only if there was no fatal failure during global
+      // set-up.
+      if (!Test::HasFatalFailure()) {
+        for (int test_index = 0; test_index < total_test_case_count();
+             test_index++) {
+          GetMutableTestCase(test_index)->Run();
+        }
+      }
+
+      // Tears down all environments in reverse order afterwards.
+      repeater->OnEnvironmentsTearDownStart(*parent_);
+      std::for_each(environments_.rbegin(), environments_.rend(),
+                    TearDownEnvironment);
+      repeater->OnEnvironmentsTearDownEnd(*parent_);
+    }
+
+    elapsed_time_ = GetTimeInMillis() - start;
+
+    // Tells the unit test event listener that the tests have just finished.
+    repeater->OnTestIterationEnd(*parent_, i);
+
+    // Gets the result and clears it.
+    if (!Passed()) {
+      failed = true;
+    }
+
+    // Restores the original test order after the iteration.  This
+    // allows the user to quickly repro a failure that happens in the
+    // N-th iteration without repeating the first (N - 1) iterations.
+    // This is not enclosed in "if (GTEST_FLAG(shuffle)) { ... }", in
+    // case the user somehow changes the value of the flag somewhere
+    // (it's always safe to unshuffle the tests).
+    UnshuffleTests();
+
+    if (GTEST_FLAG(shuffle)) {
+      // Picks a new random seed for each iteration.
+      random_seed_ = GetNextRandomSeed(random_seed_);
+    }
+  }
+
+  repeater->OnTestProgramEnd(*parent_);
+
+  return !failed;
+}
+
+// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file
+// if the variable is present. If a file already exists at this location, this
+// function will write over it. If the variable is present, but the file cannot
+// be created, prints an error and exits.
+void WriteToShardStatusFileIfNeeded() {
+  const char* const test_shard_file = posix::GetEnv(kTestShardStatusFile);
+  if (test_shard_file != NULL) {
+    FILE* const file = posix::FOpen(test_shard_file, "w");
+    if (file == NULL) {
+      ColoredPrintf(COLOR_RED,
+                    "Could not write to the test shard status file \"%s\" "
+                    "specified by the %s environment variable.\n",
+                    test_shard_file, kTestShardStatusFile);
+      fflush(stdout);
+      exit(EXIT_FAILURE);
+    }
+    fclose(file);
+  }
+}
+
+// Checks whether sharding is enabled by examining the relevant
+// environment variable values. If the variables are present,
+// but inconsistent (i.e., shard_index >= total_shards), prints
+// an error and exits. If in_subprocess_for_death_test, sharding is
+// disabled because it must only be applied to the original test
+// process. Otherwise, we could filter out death tests we intended to execute.
+bool ShouldShard(const char* total_shards_env,
+                 const char* shard_index_env,
+                 bool in_subprocess_for_death_test) {
+  if (in_subprocess_for_death_test) {
+    return false;
+  }
+
+  const Int32 total_shards = Int32FromEnvOrDie(total_shards_env, -1);
+  const Int32 shard_index = Int32FromEnvOrDie(shard_index_env, -1);
+
+  if (total_shards == -1 && shard_index == -1) {
+    return false;
+  } else if (total_shards == -1 && shard_index != -1) {
+    const Message msg = Message()
+      << "Invalid environment variables: you have "
+      << kTestShardIndex << " = " << shard_index
+      << ", but have left " << kTestTotalShards << " unset.\n";
+    ColoredPrintf(COLOR_RED, msg.GetString().c_str());
+    fflush(stdout);
+    exit(EXIT_FAILURE);
+  } else if (total_shards != -1 && shard_index == -1) {
+    const Message msg = Message()
+      << "Invalid environment variables: you have "
+      << kTestTotalShards << " = " << total_shards
+      << ", but have left " << kTestShardIndex << " unset.\n";
+    ColoredPrintf(COLOR_RED, msg.GetString().c_str());
+    fflush(stdout);
+    exit(EXIT_FAILURE);
+  } else if (shard_index < 0 || shard_index >= total_shards) {
+    const Message msg = Message()
+      << "Invalid environment variables: we require 0 <= "
+      << kTestShardIndex << " < " << kTestTotalShards
+      << ", but you have " << kTestShardIndex << "=" << shard_index
+      << ", " << kTestTotalShards << "=" << total_shards << ".\n";
+    ColoredPrintf(COLOR_RED, msg.GetString().c_str());
+    fflush(stdout);
+    exit(EXIT_FAILURE);
+  }
+
+  return total_shards > 1;
+}
+
+// Parses the environment variable var as an Int32. If it is unset,
+// returns default_val. If it is not an Int32, prints an error
+// and aborts.
+Int32 Int32FromEnvOrDie(const char* var, Int32 default_val) {
+  const char* str_val = posix::GetEnv(var);
+  if (str_val == NULL) {
+    return default_val;
+  }
+
+  Int32 result;
+  if (!ParseInt32(Message() << "The value of environment variable " << var,
+                  str_val, &result)) {
+    exit(EXIT_FAILURE);
+  }
+  return result;
+}
+
+// Given the total number of shards, the shard index, and the test id,
+// returns true iff the test should be run on this shard. The test id is
+// some arbitrary but unique non-negative integer assigned to each test
+// method. Assumes that 0 <= shard_index < total_shards.
+bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) {
+  return (test_id % total_shards) == shard_index;
+}
+
+// Compares the name of each test with the user-specified filter to
+// decide whether the test should be run, then records the result in
+// each TestCase and TestInfo object.
+// If shard_tests == true, further filters tests based on sharding
+// variables in the environment - see
+// http://code.google.com/p/googletest/wiki/GoogleTestAdvancedGuide.
+// Returns the number of tests that should run.
+int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) {
+  const Int32 total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ?
+      Int32FromEnvOrDie(kTestTotalShards, -1) : -1;
+  const Int32 shard_index = shard_tests == HONOR_SHARDING_PROTOCOL ?
+      Int32FromEnvOrDie(kTestShardIndex, -1) : -1;
+
+  // num_runnable_tests are the number of tests that will
+  // run across all shards (i.e., match filter and are not disabled).
+  // num_selected_tests are the number of tests to be run on
+  // this shard.
+  int num_runnable_tests = 0;
+  int num_selected_tests = 0;
+  for (size_t i = 0; i < test_cases_.size(); i++) {
+    TestCase* const test_case = test_cases_[i];
+    const std::string &test_case_name = test_case->name();
+    test_case->set_should_run(false);
+
+    for (size_t j = 0; j < test_case->test_info_list().size(); j++) {
+      TestInfo* const test_info = test_case->test_info_list()[j];
+      const std::string test_name(test_info->name());
+      // A test is disabled if test case name or test name matches
+      // kDisableTestFilter.
+      const bool is_disabled =
+          internal::UnitTestOptions::MatchesFilter(test_case_name,
+                                                   kDisableTestFilter) ||
+          internal::UnitTestOptions::MatchesFilter(test_name,
+                                                   kDisableTestFilter);
+      test_info->is_disabled_ = is_disabled;
+
+      const bool matches_filter =
+          internal::UnitTestOptions::FilterMatchesTest(test_case_name,
+                                                       test_name);
+      test_info->matches_filter_ = matches_filter;
+
+      const bool is_runnable =
+          (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) &&
+          matches_filter;
+
+      const bool is_selected = is_runnable &&
+          (shard_tests == IGNORE_SHARDING_PROTOCOL ||
+           ShouldRunTestOnShard(total_shards, shard_index,
+                                num_runnable_tests));
+
+      num_runnable_tests += is_runnable;
+      num_selected_tests += is_selected;
+
+      test_info->should_run_ = is_selected;
+      test_case->set_should_run(test_case->should_run() || is_selected);
+    }
+  }
+  return num_selected_tests;
+}
+
+// Prints the given C-string on a single line by replacing all '\n'
+// characters with string "\\n".  If the output takes more than
+// max_length characters, only prints the first max_length characters
+// and "...".
+static void PrintOnOneLine(const char* str, int max_length) {
+  if (str != NULL) {
+    for (int i = 0; *str != '\0'; ++str) {
+      if (i >= max_length) {
+        printf("...");
+        break;
+      }
+      if (*str == '\n') {
+        printf("\\n");
+        i += 2;
+      } else {
+        printf("%c", *str);
+        ++i;
+      }
+    }
+  }
+}
+
+// Prints the names of the tests matching the user-specified filter flag.
+void UnitTestImpl::ListTestsMatchingFilter() {
+  // Print at most this many characters for each type/value parameter.
+  const int kMaxParamLength = 250;
+
+  for (size_t i = 0; i < test_cases_.size(); i++) {
+    const TestCase* const test_case = test_cases_[i];
+    bool printed_test_case_name = false;
+
+    for (size_t j = 0; j < test_case->test_info_list().size(); j++) {
+      const TestInfo* const test_info =
+          test_case->test_info_list()[j];
+      if (test_info->matches_filter_) {
+        if (!printed_test_case_name) {
+          printed_test_case_name = true;
+          printf("%s.", test_case->name());
+          if (test_case->type_param() != NULL) {
+            printf("  # %s = ", kTypeParamLabel);
+            // We print the type parameter on a single line to make
+            // the output easy to parse by a program.
+            PrintOnOneLine(test_case->type_param(), kMaxParamLength);
+          }
+          printf("\n");
+        }
+        printf("  %s", test_info->name());
+        if (test_info->value_param() != NULL) {
+          printf("  # %s = ", kValueParamLabel);
+          // We print the value parameter on a single line to make the
+          // output easy to parse by a program.
+          PrintOnOneLine(test_info->value_param(), kMaxParamLength);
+        }
+        printf("\n");
+      }
+    }
+  }
+  fflush(stdout);
+}
+
+// Sets the OS stack trace getter.
+//
+// Does nothing if the input and the current OS stack trace getter are
+// the same; otherwise, deletes the old getter and makes the input the
+// current getter.
+void UnitTestImpl::set_os_stack_trace_getter(
+    OsStackTraceGetterInterface* getter) {
+  if (os_stack_trace_getter_ != getter) {
+    delete os_stack_trace_getter_;
+    os_stack_trace_getter_ = getter;
+  }
+}
+
+// Returns the current OS stack trace getter if it is not NULL;
+// otherwise, creates an OsStackTraceGetter, makes it the current
+// getter, and returns it.
+OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() {
+  if (os_stack_trace_getter_ == NULL) {
+#ifdef GTEST_OS_STACK_TRACE_GETTER_
+    os_stack_trace_getter_ = new GTEST_OS_STACK_TRACE_GETTER_;
+#else
+    os_stack_trace_getter_ = new OsStackTraceGetter;
+#endif  // GTEST_OS_STACK_TRACE_GETTER_
+  }
+
+  return os_stack_trace_getter_;
+}
+
+// Returns the TestResult for the test that's currently running, or
+// the TestResult for the ad hoc test if no test is running.
+TestResult* UnitTestImpl::current_test_result() {
+  return current_test_info_ ?
+      &(current_test_info_->result_) : &ad_hoc_test_result_;
+}
+
+// Shuffles all test cases, and the tests within each test case,
+// making sure that death tests are still run first.
+void UnitTestImpl::ShuffleTests() {
+  // Shuffles the death test cases.
+  ShuffleRange(random(), 0, last_death_test_case_ + 1, &test_case_indices_);
+
+  // Shuffles the non-death test cases.
+  ShuffleRange(random(), last_death_test_case_ + 1,
+               static_cast<int>(test_cases_.size()), &test_case_indices_);
+
+  // Shuffles the tests inside each test case.
+  for (size_t i = 0; i < test_cases_.size(); i++) {
+    test_cases_[i]->ShuffleTests(random());
+  }
+}
+
+// Restores the test cases and tests to their order before the first shuffle.
+void UnitTestImpl::UnshuffleTests() {
+  for (size_t i = 0; i < test_cases_.size(); i++) {
+    // Unshuffles the tests in each test case.
+    test_cases_[i]->UnshuffleTests();
+    // Resets the index of each test case.
+    test_case_indices_[i] = static_cast<int>(i);
+  }
+}
+
+// Returns the current OS stack trace as an std::string.
+//
+// The maximum number of stack frames to be included is specified by
+// the gtest_stack_trace_depth flag.  The skip_count parameter
+// specifies the number of top frames to be skipped, which doesn't
+// count against the number of frames to be included.
+//
+// For example, if Foo() calls Bar(), which in turn calls
+// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
+// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
+std::string GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/,
+                                            int skip_count) {
+  // We pass skip_count + 1 to skip this wrapper function in addition
+  // to what the user really wants to skip.
+  return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1);
+}
+
+// Used by the GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ macro to
+// suppress unreachable code warnings.
+namespace {
+class ClassUniqueToAlwaysTrue {};
+}
+
+bool IsTrue(bool condition) { return condition; }
+
+bool AlwaysTrue() {
+#if GTEST_HAS_EXCEPTIONS
+  // This condition is always false so AlwaysTrue() never actually throws,
+  // but it makes the compiler think that it may throw.
+  if (IsTrue(false))
+    throw ClassUniqueToAlwaysTrue();
+#endif  // GTEST_HAS_EXCEPTIONS
+  return true;
+}
+
+// If *pstr starts with the given prefix, modifies *pstr to be right
+// past the prefix and returns true; otherwise leaves *pstr unchanged
+// and returns false.  None of pstr, *pstr, and prefix can be NULL.
+bool SkipPrefix(const char* prefix, const char** pstr) {
+  const size_t prefix_len = strlen(prefix);
+  if (strncmp(*pstr, prefix, prefix_len) == 0) {
+    *pstr += prefix_len;
+    return true;
+  }
+  return false;
+}
+
+// Parses a string as a command line flag.  The string should have
+// the format "--flag=value".  When def_optional is true, the "=value"
+// part can be omitted.
+//
+// Returns the value of the flag, or NULL if the parsing failed.
+const char* ParseFlagValue(const char* str,
+                           const char* flag,
+                           bool def_optional) {
+  // str and flag must not be NULL.
+  if (str == NULL || flag == NULL) return NULL;
+
+  // The flag must start with "--" followed by GTEST_FLAG_PREFIX_.
+  const std::string flag_str = std::string("--") + GTEST_FLAG_PREFIX_ + flag;
+  const size_t flag_len = flag_str.length();
+  if (strncmp(str, flag_str.c_str(), flag_len) != 0) return NULL;
+
+  // Skips the flag name.
+  const char* flag_end = str + flag_len;
+
+  // When def_optional is true, it's OK to not have a "=value" part.
+  if (def_optional && (flag_end[0] == '\0')) {
+    return flag_end;
+  }
+
+  // If def_optional is true and there are more characters after the
+  // flag name, or if def_optional is false, there must be a '=' after
+  // the flag name.
+  if (flag_end[0] != '=') return NULL;
+
+  // Returns the string after "=".
+  return flag_end + 1;
+}
+
+// Parses a string for a bool flag, in the form of either
+// "--flag=value" or "--flag".
+//
+// In the former case, the value is taken as true as long as it does
+// not start with '0', 'f', or 'F'.
+//
+// In the latter case, the value is taken as true.
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+bool ParseBoolFlag(const char* str, const char* flag, bool* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseFlagValue(str, flag, true);
+
+  // Aborts if the parsing failed.
+  if (value_str == NULL) return false;
+
+  // Converts the string value to a bool.
+  *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F');
+  return true;
+}
+
+// Parses a string for an Int32 flag, in the form of
+// "--flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+bool ParseInt32Flag(const char* str, const char* flag, Int32* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseFlagValue(str, flag, false);
+
+  // Aborts if the parsing failed.
+  if (value_str == NULL) return false;
+
+  // Sets *value to the value of the flag.
+  return ParseInt32(Message() << "The value of flag --" << flag,
+                    value_str, value);
+}
+
+// Parses a string for a string flag, in the form of
+// "--flag=value".
+//
+// On success, stores the value of the flag in *value, and returns
+// true.  On failure, returns false without changing *value.
+bool ParseStringFlag(const char* str, const char* flag, std::string* value) {
+  // Gets the value of the flag as a string.
+  const char* const value_str = ParseFlagValue(str, flag, false);
+
+  // Aborts if the parsing failed.
+  if (value_str == NULL) return false;
+
+  // Sets *value to the value of the flag.
+  *value = value_str;
+  return true;
+}
+
+// Determines whether a string has a prefix that Google Test uses for its
+// flags, i.e., starts with GTEST_FLAG_PREFIX_ or GTEST_FLAG_PREFIX_DASH_.
+// If Google Test detects that a command line flag has its prefix but is not
+// recognized, it will print its help message. Flags starting with
+// GTEST_INTERNAL_PREFIX_ followed by "internal_" are considered Google Test
+// internal flags and do not trigger the help message.
+static bool HasGoogleTestFlagPrefix(const char* str) {
+  return (SkipPrefix("--", &str) ||
+          SkipPrefix("-", &str) ||
+          SkipPrefix("/", &str)) &&
+         !SkipPrefix(GTEST_FLAG_PREFIX_ "internal_", &str) &&
+         (SkipPrefix(GTEST_FLAG_PREFIX_, &str) ||
+          SkipPrefix(GTEST_FLAG_PREFIX_DASH_, &str));
+}
+
+// Prints a string containing code-encoded text.  The following escape
+// sequences can be used in the string to control the text color:
+//
+//   @@    prints a single '@' character.
+//   @R    changes the color to red.
+//   @G    changes the color to green.
+//   @Y    changes the color to yellow.
+//   @D    changes to the default terminal text color.
+//
+// TODO(wan@google.com): Write tests for this once we add stdout
+// capturing to Google Test.
+static void PrintColorEncoded(const char* str) {
+  GTestColor color = COLOR_DEFAULT;  // The current color.
+
+  // Conceptually, we split the string into segments divided by escape
+  // sequences.  Then we print one segment at a time.  At the end of
+  // each iteration, the str pointer advances to the beginning of the
+  // next segment.
+  for (;;) {
+    const char* p = strchr(str, '@');
+    if (p == NULL) {
+      ColoredPrintf(color, "%s", str);
+      return;
+    }
+
+    ColoredPrintf(color, "%s", std::string(str, p).c_str());
+
+    const char ch = p[1];
+    str = p + 2;
+    if (ch == '@') {
+      ColoredPrintf(color, "@");
+    } else if (ch == 'D') {
+      color = COLOR_DEFAULT;
+    } else if (ch == 'R') {
+      color = COLOR_RED;
+    } else if (ch == 'G') {
+      color = COLOR_GREEN;
+    } else if (ch == 'Y') {
+      color = COLOR_YELLOW;
+    } else {
+      --str;
+    }
+  }
+}
+
+static const char kColorEncodedHelpMessage[] =
+"This program contains tests written using " GTEST_NAME_ ". You can use the\n"
+"following command line flags to control its behavior:\n"
+"\n"
+"Test Selection:\n"
+"  @G--" GTEST_FLAG_PREFIX_ "list_tests@D\n"
+"      List the names of all tests instead of running them. The name of\n"
+"      TEST(Foo, Bar) is \"Foo.Bar\".\n"
+"  @G--" GTEST_FLAG_PREFIX_ "filter=@YPOSTIVE_PATTERNS"
+    "[@G-@YNEGATIVE_PATTERNS]@D\n"
+"      Run only the tests whose name matches one of the positive patterns but\n"
+"      none of the negative patterns. '?' matches any single character; '*'\n"
+"      matches any substring; ':' separates two patterns.\n"
+"  @G--" GTEST_FLAG_PREFIX_ "also_run_disabled_tests@D\n"
+"      Run all disabled tests too.\n"
+"\n"
+"Test Execution:\n"
+"  @G--" GTEST_FLAG_PREFIX_ "repeat=@Y[COUNT]@D\n"
+"      Run the tests repeatedly; use a negative count to repeat forever.\n"
+"  @G--" GTEST_FLAG_PREFIX_ "shuffle@D\n"
+"      Randomize tests' orders on every iteration.\n"
+"  @G--" GTEST_FLAG_PREFIX_ "random_seed=@Y[NUMBER]@D\n"
+"      Random number seed to use for shuffling test orders (between 1 and\n"
+"      99999, or 0 to use a seed based on the current time).\n"
+"\n"
+"Test Output:\n"
+"  @G--" GTEST_FLAG_PREFIX_ "color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n"
+"      Enable/disable colored output. The default is @Gauto@D.\n"
+"  -@G-" GTEST_FLAG_PREFIX_ "print_time=0@D\n"
+"      Don't print the elapsed time of each test.\n"
+"  @G--" GTEST_FLAG_PREFIX_ "output=xml@Y[@G:@YDIRECTORY_PATH@G"
+    GTEST_PATH_SEP_ "@Y|@G:@YFILE_PATH]@D\n"
+"      Generate an XML report in the given directory or with the given file\n"
+"      name. @YFILE_PATH@D defaults to @Gtest_details.xml@D.\n"
+#if GTEST_CAN_STREAM_RESULTS_
+"  @G--" GTEST_FLAG_PREFIX_ "stream_result_to=@YHOST@G:@YPORT@D\n"
+"      Stream test results to the given server.\n"
+#endif  // GTEST_CAN_STREAM_RESULTS_
+"\n"
+"Assertion Behavior:\n"
+#if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
+"  @G--" GTEST_FLAG_PREFIX_ "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n"
+"      Set the default death test style.\n"
+#endif  // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
+"  @G--" GTEST_FLAG_PREFIX_ "break_on_failure@D\n"
+"      Turn assertion failures into debugger break-points.\n"
+"  @G--" GTEST_FLAG_PREFIX_ "throw_on_failure@D\n"
+"      Turn assertion failures into C++ exceptions.\n"
+"  @G--" GTEST_FLAG_PREFIX_ "catch_exceptions=0@D\n"
+"      Do not report exceptions as test failures. Instead, allow them\n"
+"      to crash the program or throw a pop-up (on Windows).\n"
+"\n"
+"Except for @G--" GTEST_FLAG_PREFIX_ "list_tests@D, you can alternatively set "
+    "the corresponding\n"
+"environment variable of a flag (all letters in upper-case). For example, to\n"
+"disable colored text output, you can either specify @G--" GTEST_FLAG_PREFIX_
+    "color=no@D or set\n"
+"the @G" GTEST_FLAG_PREFIX_UPPER_ "COLOR@D environment variable to @Gno@D.\n"
+"\n"
+"For more information, please read the " GTEST_NAME_ " documentation at\n"
+"@G" GTEST_PROJECT_URL_ "@D. If you find a bug in " GTEST_NAME_ "\n"
+"(not one in your own code or tests), please report it to\n"
+"@G<" GTEST_DEV_EMAIL_ ">@D.\n";
+
+bool ParseGoogleTestFlag(const char* const arg) {
+  return ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag,
+                       &GTEST_FLAG(also_run_disabled_tests)) ||
+      ParseBoolFlag(arg, kBreakOnFailureFlag,
+                    &GTEST_FLAG(break_on_failure)) ||
+      ParseBoolFlag(arg, kCatchExceptionsFlag,
+                    &GTEST_FLAG(catch_exceptions)) ||
+      ParseStringFlag(arg, kColorFlag, &GTEST_FLAG(color)) ||
+      ParseStringFlag(arg, kDeathTestStyleFlag,
+                      &GTEST_FLAG(death_test_style)) ||
+      ParseBoolFlag(arg, kDeathTestUseFork,
+                    &GTEST_FLAG(death_test_use_fork)) ||
+      ParseStringFlag(arg, kFilterFlag, &GTEST_FLAG(filter)) ||
+      ParseStringFlag(arg, kInternalRunDeathTestFlag,
+                      &GTEST_FLAG(internal_run_death_test)) ||
+      ParseBoolFlag(arg, kListTestsFlag, &GTEST_FLAG(list_tests)) ||
+      ParseStringFlag(arg, kOutputFlag, &GTEST_FLAG(output)) ||
+      ParseBoolFlag(arg, kPrintTimeFlag, &GTEST_FLAG(print_time)) ||
+      ParseInt32Flag(arg, kRandomSeedFlag, &GTEST_FLAG(random_seed)) ||
+      ParseInt32Flag(arg, kRepeatFlag, &GTEST_FLAG(repeat)) ||
+      ParseBoolFlag(arg, kShuffleFlag, &GTEST_FLAG(shuffle)) ||
+      ParseInt32Flag(arg, kStackTraceDepthFlag,
+                     &GTEST_FLAG(stack_trace_depth)) ||
+      ParseStringFlag(arg, kStreamResultToFlag,
+                      &GTEST_FLAG(stream_result_to)) ||
+      ParseBoolFlag(arg, kThrowOnFailureFlag,
+                    &GTEST_FLAG(throw_on_failure));
+}
+
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
+void LoadFlagsFromFile(const std::string& path) {
+  FILE* flagfile = posix::FOpen(path.c_str(), "r");
+  if (!flagfile) {
+    fprintf(stderr,
+            "Unable to open file \"%s\"\n",
+            GTEST_FLAG(flagfile).c_str());
+    fflush(stderr);
+    exit(EXIT_FAILURE);
+  }
+  std::string contents(ReadEntireFile(flagfile));
+  posix::FClose(flagfile);
+  std::vector<std::string> lines;
+  SplitString(contents, '\n', &lines);
+  for (size_t i = 0; i < lines.size(); ++i) {
+    if (lines[i].empty())
+      continue;
+    if (!ParseGoogleTestFlag(lines[i].c_str()))
+      g_help_flag = true;
+  }
+}
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+
+// Parses the command line for Google Test flags, without initializing
+// other parts of Google Test.  The type parameter CharType can be
+// instantiated to either char or wchar_t.
+template <typename CharType>
+void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
+  for (int i = 1; i < *argc; i++) {
+    const std::string arg_string = StreamableToString(argv[i]);
+    const char* const arg = arg_string.c_str();
+
+    using internal::ParseBoolFlag;
+    using internal::ParseInt32Flag;
+    using internal::ParseStringFlag;
+
+    bool remove_flag = false;
+    if (ParseGoogleTestFlag(arg)) {
+      remove_flag = true;
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
+    } else if (ParseStringFlag(arg, kFlagfileFlag, &GTEST_FLAG(flagfile))) {
+      LoadFlagsFromFile(GTEST_FLAG(flagfile));
+      remove_flag = true;
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+    } else if (arg_string == "--help" || arg_string == "-h" ||
+               arg_string == "-?" || arg_string == "/?" ||
+               HasGoogleTestFlagPrefix(arg)) {
+      // Both help flag and unrecognized Google Test flags (excluding
+      // internal ones) trigger help display.
+      g_help_flag = true;
+    }
+
+    if (remove_flag) {
+      // Shift the remainder of the argv list left by one.  Note
+      // that argv has (*argc + 1) elements, the last one always being
+      // NULL.  The following loop moves the trailing NULL element as
+      // well.
+      for (int j = i; j != *argc; j++) {
+        argv[j] = argv[j + 1];
+      }
+
+      // Decrements the argument count.
+      (*argc)--;
+
+      // We also need to decrement the iterator as we just removed
+      // an element.
+      i--;
+    }
+  }
+
+  if (g_help_flag) {
+    // We print the help here instead of in RUN_ALL_TESTS(), as the
+    // latter may not be called at all if the user is using Google
+    // Test with another testing framework.
+    PrintColorEncoded(kColorEncodedHelpMessage);
+  }
+}
+
+// Parses the command line for Google Test flags, without initializing
+// other parts of Google Test.
+void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
+  ParseGoogleTestFlagsOnlyImpl(argc, argv);
+}
+void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {
+  ParseGoogleTestFlagsOnlyImpl(argc, argv);
+}
+
+// The internal implementation of InitGoogleTest().
+//
+// The type parameter CharType can be instantiated to either char or
+// wchar_t.
+template <typename CharType>
+void InitGoogleTestImpl(int* argc, CharType** argv) {
+  // We don't want to run the initialization code twice.
+  if (GTestIsInitialized()) return;
+
+  if (*argc <= 0) return;
+
+  g_argvs.clear();
+  for (int i = 0; i != *argc; i++) {
+    g_argvs.push_back(StreamableToString(argv[i]));
+  }
+
+  ParseGoogleTestFlagsOnly(argc, argv);
+  GetUnitTestImpl()->PostFlagParsingInit();
+}
+
+}  // namespace internal
+
+// Initializes Google Test.  This must be called before calling
+// RUN_ALL_TESTS().  In particular, it parses a command line for the
+// flags that Google Test recognizes.  Whenever a Google Test flag is
+// seen, it is removed from argv, and *argc is decremented.
+//
+// No value is returned.  Instead, the Google Test flag variables are
+// updated.
+//
+// Calling the function for the second time has no user-visible effect.
+void InitGoogleTest(int* argc, char** argv) {
+#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
+#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  internal::InitGoogleTestImpl(argc, argv);
+#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+}
+
+// This overloaded version can be used in Windows programs compiled in
+// UNICODE mode.
+void InitGoogleTest(int* argc, wchar_t** argv) {
+#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv);
+#else  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+  internal::InitGoogleTestImpl(argc, argv);
+#endif  // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+}
+
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest_main.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest_main.cc
new file mode 100644
index 0000000000..f302822552
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/src/gtest_main.cc
@@ -0,0 +1,38 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <stdio.h>
+
+#include "gtest/gtest.h"
+
+GTEST_API_ int main(int argc, char **argv) {
+  printf("Running main() from gtest_main.cc\n");
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-death-test_ex_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-death-test_ex_test.cc
new file mode 100644
index 0000000000..b50a13d5e2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-death-test_ex_test.cc
@@ -0,0 +1,93 @@
+// Copyright 2010, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+//
+// Tests that verify interaction of exceptions and death tests.
+
+#include "gtest/gtest-death-test.h"
+#include "gtest/gtest.h"
+
+#if GTEST_HAS_DEATH_TEST
+
+# if GTEST_HAS_SEH
+#  include <windows.h>          // For RaiseException().
+# endif
+
+# include "gtest/gtest-spi.h"
+
+# if GTEST_HAS_EXCEPTIONS
+
+#  include <exception>  // For std::exception.
+
+// Tests that death tests report thrown exceptions as failures and that the
+// exceptions do not escape death test macros.
+TEST(CxxExceptionDeathTest, ExceptionIsFailure) {
+  try {
+    EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(throw 1, ""), "threw an exception");
+  } catch (...) {  // NOLINT
+    FAIL() << "An exception escaped a death test macro invocation "
+           << "with catch_exceptions "
+           << (testing::GTEST_FLAG(catch_exceptions) ? "enabled" : "disabled");
+  }
+}
+
+class TestException : public std::exception {
+ public:
+  virtual const char* what() const throw() { return "exceptional message"; }
+};
+
+TEST(CxxExceptionDeathTest, PrintsMessageForStdExceptions) {
+  // Verifies that the exception message is quoted in the failure text.
+  EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(throw TestException(), ""),
+                          "exceptional message");
+  // Verifies that the location is mentioned in the failure text.
+  EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(throw TestException(), ""),
+                          "gtest-death-test_ex_test.cc");
+}
+# endif  // GTEST_HAS_EXCEPTIONS
+
+# if GTEST_HAS_SEH
+// Tests that enabling interception of SEH exceptions with the
+// catch_exceptions flag does not interfere with SEH exceptions being
+// treated as death by death tests.
+TEST(SehExceptionDeasTest, CatchExceptionsDoesNotInterfere) {
+  EXPECT_DEATH(RaiseException(42, 0x0, 0, NULL), "")
+      << "with catch_exceptions "
+      << (testing::GTEST_FLAG(catch_exceptions) ? "enabled" : "disabled");
+}
+# endif
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+  testing::GTEST_FLAG(catch_exceptions) = GTEST_ENABLE_CATCH_EXCEPTIONS_ != 0;
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-death-test_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-death-test_test.cc
new file mode 100644
index 0000000000..bb4a3d1b38
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-death-test_test.cc
@@ -0,0 +1,1427 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Tests for death tests.
+
+#include "gtest/gtest-death-test.h"
+#include "gtest/gtest.h"
+#include "gtest/internal/gtest-filepath.h"
+
+using testing::internal::AlwaysFalse;
+using testing::internal::AlwaysTrue;
+
+#if GTEST_HAS_DEATH_TEST
+
+# if GTEST_OS_WINDOWS
+#  include <direct.h>          // For chdir().
+# else
+#  include <unistd.h>
+#  include <sys/wait.h>        // For waitpid.
+# endif  // GTEST_OS_WINDOWS
+
+# include <limits.h>
+# include <signal.h>
+# include <stdio.h>
+
+# if GTEST_OS_LINUX
+#  include <sys/time.h>
+# endif  // GTEST_OS_LINUX
+
+# include "gtest/gtest-spi.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+# define GTEST_IMPLEMENTATION_ 1
+# include "src/gtest-internal-inl.h"
+# undef GTEST_IMPLEMENTATION_
+
+namespace posix = ::testing::internal::posix;
+
+using testing::Message;
+using testing::internal::DeathTest;
+using testing::internal::DeathTestFactory;
+using testing::internal::FilePath;
+using testing::internal::GetLastErrnoDescription;
+using testing::internal::GetUnitTestImpl;
+using testing::internal::InDeathTestChild;
+using testing::internal::ParseNaturalNumber;
+
+namespace testing {
+namespace internal {
+
+// A helper class whose objects replace the death test factory for a
+// single UnitTest object during their lifetimes.
+class ReplaceDeathTestFactory {
+ public:
+  explicit ReplaceDeathTestFactory(DeathTestFactory* new_factory)
+      : unit_test_impl_(GetUnitTestImpl()) {
+    old_factory_ = unit_test_impl_->death_test_factory_.release();
+    unit_test_impl_->death_test_factory_.reset(new_factory);
+  }
+
+  ~ReplaceDeathTestFactory() {
+    unit_test_impl_->death_test_factory_.release();
+    unit_test_impl_->death_test_factory_.reset(old_factory_);
+  }
+ private:
+  // Prevents copying ReplaceDeathTestFactory objects.
+  ReplaceDeathTestFactory(const ReplaceDeathTestFactory&);
+  void operator=(const ReplaceDeathTestFactory&);
+
+  UnitTestImpl* unit_test_impl_;
+  DeathTestFactory* old_factory_;
+};
+
+}  // namespace internal
+}  // namespace testing
+
+void DieWithMessage(const ::std::string& message) {
+  fprintf(stderr, "%s", message.c_str());
+  fflush(stderr);  // Make sure the text is printed before the process exits.
+
+  // We call _exit() instead of exit(), as the former is a direct
+  // system call and thus safer in the presence of threads.  exit()
+  // will invoke user-defined exit-hooks, which may do dangerous
+  // things that conflict with death tests.
+  //
+  // Some compilers can recognize that _exit() never returns and issue the
+  // 'unreachable code' warning for code following this function, unless
+  // fooled by a fake condition.
+  if (AlwaysTrue())
+    _exit(1);
+}
+
+void DieInside(const ::std::string& function) {
+  DieWithMessage("death inside " + function + "().");
+}
+
+// Tests that death tests work.
+
+class TestForDeathTest : public testing::Test {
+ protected:
+  TestForDeathTest() : original_dir_(FilePath::GetCurrentDir()) {}
+
+  virtual ~TestForDeathTest() {
+    posix::ChDir(original_dir_.c_str());
+  }
+
+  // A static member function that's expected to die.
+  static void StaticMemberFunction() { DieInside("StaticMemberFunction"); }
+
+  // A method of the test fixture that may die.
+  void MemberFunction() {
+    if (should_die_)
+      DieInside("MemberFunction");
+  }
+
+  // True iff MemberFunction() should die.
+  bool should_die_;
+  const FilePath original_dir_;
+};
+
+// A class with a member function that may die.
+class MayDie {
+ public:
+  explicit MayDie(bool should_die) : should_die_(should_die) {}
+
+  // A member function that may die.
+  void MemberFunction() const {
+    if (should_die_)
+      DieInside("MayDie::MemberFunction");
+  }
+
+ private:
+  // True iff MemberFunction() should die.
+  bool should_die_;
+};
+
+// A global function that's expected to die.
+void GlobalFunction() { DieInside("GlobalFunction"); }
+
+// A non-void function that's expected to die.
+int NonVoidFunction() {
+  DieInside("NonVoidFunction");
+  return 1;
+}
+
+// A unary function that may die.
+void DieIf(bool should_die) {
+  if (should_die)
+    DieInside("DieIf");
+}
+
+// A binary function that may die.
+bool DieIfLessThan(int x, int y) {
+  if (x < y) {
+    DieInside("DieIfLessThan");
+  }
+  return true;
+}
+
+// Tests that ASSERT_DEATH can be used outside a TEST, TEST_F, or test fixture.
+void DeathTestSubroutine() {
+  EXPECT_DEATH(GlobalFunction(), "death.*GlobalFunction");
+  ASSERT_DEATH(GlobalFunction(), "death.*GlobalFunction");
+}
+
+// Death in dbg, not opt.
+int DieInDebugElse12(int* sideeffect) {
+  if (sideeffect) *sideeffect = 12;
+
+# ifndef NDEBUG
+
+  DieInside("DieInDebugElse12");
+
+# endif  // NDEBUG
+
+  return 12;
+}
+
+# if GTEST_OS_WINDOWS
+
+// Tests the ExitedWithCode predicate.
+TEST(ExitStatusPredicateTest, ExitedWithCode) {
+  // On Windows, the process's exit code is the same as its exit status,
+  // so the predicate just compares the its input with its parameter.
+  EXPECT_TRUE(testing::ExitedWithCode(0)(0));
+  EXPECT_TRUE(testing::ExitedWithCode(1)(1));
+  EXPECT_TRUE(testing::ExitedWithCode(42)(42));
+  EXPECT_FALSE(testing::ExitedWithCode(0)(1));
+  EXPECT_FALSE(testing::ExitedWithCode(1)(0));
+}
+
+# else
+
+// Returns the exit status of a process that calls _exit(2) with a
+// given exit code.  This is a helper function for the
+// ExitStatusPredicateTest test suite.
+static int NormalExitStatus(int exit_code) {
+  pid_t child_pid = fork();
+  if (child_pid == 0) {
+    _exit(exit_code);
+  }
+  int status;
+  waitpid(child_pid, &status, 0);
+  return status;
+}
+
+// Returns the exit status of a process that raises a given signal.
+// If the signal does not cause the process to die, then it returns
+// instead the exit status of a process that exits normally with exit
+// code 1.  This is a helper function for the ExitStatusPredicateTest
+// test suite.
+static int KilledExitStatus(int signum) {
+  pid_t child_pid = fork();
+  if (child_pid == 0) {
+    raise(signum);
+    _exit(1);
+  }
+  int status;
+  waitpid(child_pid, &status, 0);
+  return status;
+}
+
+// Tests the ExitedWithCode predicate.
+TEST(ExitStatusPredicateTest, ExitedWithCode) {
+  const int status0  = NormalExitStatus(0);
+  const int status1  = NormalExitStatus(1);
+  const int status42 = NormalExitStatus(42);
+  const testing::ExitedWithCode pred0(0);
+  const testing::ExitedWithCode pred1(1);
+  const testing::ExitedWithCode pred42(42);
+  EXPECT_PRED1(pred0,  status0);
+  EXPECT_PRED1(pred1,  status1);
+  EXPECT_PRED1(pred42, status42);
+  EXPECT_FALSE(pred0(status1));
+  EXPECT_FALSE(pred42(status0));
+  EXPECT_FALSE(pred1(status42));
+}
+
+// Tests the KilledBySignal predicate.
+TEST(ExitStatusPredicateTest, KilledBySignal) {
+  const int status_segv = KilledExitStatus(SIGSEGV);
+  const int status_kill = KilledExitStatus(SIGKILL);
+  const testing::KilledBySignal pred_segv(SIGSEGV);
+  const testing::KilledBySignal pred_kill(SIGKILL);
+  EXPECT_PRED1(pred_segv, status_segv);
+  EXPECT_PRED1(pred_kill, status_kill);
+  EXPECT_FALSE(pred_segv(status_kill));
+  EXPECT_FALSE(pred_kill(status_segv));
+}
+
+# endif  // GTEST_OS_WINDOWS
+
+// Tests that the death test macros expand to code which may or may not
+// be followed by operator<<, and that in either case the complete text
+// comprises only a single C++ statement.
+TEST_F(TestForDeathTest, SingleStatement) {
+  if (AlwaysFalse())
+    // This would fail if executed; this is a compilation test only
+    ASSERT_DEATH(return, "");
+
+  if (AlwaysTrue())
+    EXPECT_DEATH(_exit(1), "");
+  else
+    // This empty "else" branch is meant to ensure that EXPECT_DEATH
+    // doesn't expand into an "if" statement without an "else"
+    ;
+
+  if (AlwaysFalse())
+    ASSERT_DEATH(return, "") << "did not die";
+
+  if (AlwaysFalse())
+    ;
+  else
+    EXPECT_DEATH(_exit(1), "") << 1 << 2 << 3;
+}
+
+void DieWithEmbeddedNul() {
+  fprintf(stderr, "Hello%cmy null world.\n", '\0');
+  fflush(stderr);
+  _exit(1);
+}
+
+# if GTEST_USES_PCRE
+// Tests that EXPECT_DEATH and ASSERT_DEATH work when the error
+// message has a NUL character in it.
+TEST_F(TestForDeathTest, EmbeddedNulInMessage) {
+  // TODO(wan@google.com): <regex.h> doesn't support matching strings
+  // with embedded NUL characters - find a way to workaround it.
+  EXPECT_DEATH(DieWithEmbeddedNul(), "my null world");
+  ASSERT_DEATH(DieWithEmbeddedNul(), "my null world");
+}
+# endif  // GTEST_USES_PCRE
+
+// Tests that death test macros expand to code which interacts well with switch
+// statements.
+TEST_F(TestForDeathTest, SwitchStatement) {
+  // Microsoft compiler usually complains about switch statements without
+  // case labels. We suppress that warning for this test.
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4065)
+
+  switch (0)
+    default:
+      ASSERT_DEATH(_exit(1), "") << "exit in default switch handler";
+
+  switch (0)
+    case 0:
+      EXPECT_DEATH(_exit(1), "") << "exit in switch case";
+
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+}
+
+// Tests that a static member function can be used in a "fast" style
+// death test.
+TEST_F(TestForDeathTest, StaticMemberFunctionFastStyle) {
+  testing::GTEST_FLAG(death_test_style) = "fast";
+  ASSERT_DEATH(StaticMemberFunction(), "death.*StaticMember");
+}
+
+// Tests that a method of the test fixture can be used in a "fast"
+// style death test.
+TEST_F(TestForDeathTest, MemberFunctionFastStyle) {
+  testing::GTEST_FLAG(death_test_style) = "fast";
+  should_die_ = true;
+  EXPECT_DEATH(MemberFunction(), "inside.*MemberFunction");
+}
+
+void ChangeToRootDir() { posix::ChDir(GTEST_PATH_SEP_); }
+
+// Tests that death tests work even if the current directory has been
+// changed.
+TEST_F(TestForDeathTest, FastDeathTestInChangedDir) {
+  testing::GTEST_FLAG(death_test_style) = "fast";
+
+  ChangeToRootDir();
+  EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), "");
+
+  ChangeToRootDir();
+  ASSERT_DEATH(_exit(1), "");
+}
+
+# if GTEST_OS_LINUX
+void SigprofAction(int, siginfo_t*, void*) { /* no op */ }
+
+// Sets SIGPROF action and ITIMER_PROF timer (interval: 1ms).
+void SetSigprofActionAndTimer() {
+  struct itimerval timer;
+  timer.it_interval.tv_sec = 0;
+  timer.it_interval.tv_usec = 1;
+  timer.it_value = timer.it_interval;
+  ASSERT_EQ(0, setitimer(ITIMER_PROF, &timer, NULL));
+  struct sigaction signal_action;
+  memset(&signal_action, 0, sizeof(signal_action));
+  sigemptyset(&signal_action.sa_mask);
+  signal_action.sa_sigaction = SigprofAction;
+  signal_action.sa_flags = SA_RESTART | SA_SIGINFO;
+  ASSERT_EQ(0, sigaction(SIGPROF, &signal_action, NULL));
+}
+
+// Disables ITIMER_PROF timer and ignores SIGPROF signal.
+void DisableSigprofActionAndTimer(struct sigaction* old_signal_action) {
+  struct itimerval timer;
+  timer.it_interval.tv_sec = 0;
+  timer.it_interval.tv_usec = 0;
+  timer.it_value = timer.it_interval;
+  ASSERT_EQ(0, setitimer(ITIMER_PROF, &timer, NULL));
+  struct sigaction signal_action;
+  memset(&signal_action, 0, sizeof(signal_action));
+  sigemptyset(&signal_action.sa_mask);
+  signal_action.sa_handler = SIG_IGN;
+  ASSERT_EQ(0, sigaction(SIGPROF, &signal_action, old_signal_action));
+}
+
+// Tests that death tests work when SIGPROF handler and timer are set.
+TEST_F(TestForDeathTest, FastSigprofActionSet) {
+  testing::GTEST_FLAG(death_test_style) = "fast";
+  SetSigprofActionAndTimer();
+  EXPECT_DEATH(_exit(1), "");
+  struct sigaction old_signal_action;
+  DisableSigprofActionAndTimer(&old_signal_action);
+  EXPECT_TRUE(old_signal_action.sa_sigaction == SigprofAction);
+}
+
+TEST_F(TestForDeathTest, ThreadSafeSigprofActionSet) {
+  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  SetSigprofActionAndTimer();
+  EXPECT_DEATH(_exit(1), "");
+  struct sigaction old_signal_action;
+  DisableSigprofActionAndTimer(&old_signal_action);
+  EXPECT_TRUE(old_signal_action.sa_sigaction == SigprofAction);
+}
+# endif  // GTEST_OS_LINUX
+
+// Repeats a representative sample of death tests in the "threadsafe" style:
+
+TEST_F(TestForDeathTest, StaticMemberFunctionThreadsafeStyle) {
+  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  ASSERT_DEATH(StaticMemberFunction(), "death.*StaticMember");
+}
+
+TEST_F(TestForDeathTest, MemberFunctionThreadsafeStyle) {
+  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  should_die_ = true;
+  EXPECT_DEATH(MemberFunction(), "inside.*MemberFunction");
+}
+
+TEST_F(TestForDeathTest, ThreadsafeDeathTestInLoop) {
+  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+
+  for (int i = 0; i < 3; ++i)
+    EXPECT_EXIT(_exit(i), testing::ExitedWithCode(i), "") << ": i = " << i;
+}
+
+TEST_F(TestForDeathTest, ThreadsafeDeathTestInChangedDir) {
+  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+
+  ChangeToRootDir();
+  EXPECT_EXIT(_exit(1), testing::ExitedWithCode(1), "");
+
+  ChangeToRootDir();
+  ASSERT_DEATH(_exit(1), "");
+}
+
+TEST_F(TestForDeathTest, MixedStyles) {
+  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  EXPECT_DEATH(_exit(1), "");
+  testing::GTEST_FLAG(death_test_style) = "fast";
+  EXPECT_DEATH(_exit(1), "");
+}
+
+# if GTEST_HAS_CLONE && GTEST_HAS_PTHREAD
+
+namespace {
+
+bool pthread_flag;
+
+void SetPthreadFlag() {
+  pthread_flag = true;
+}
+
+}  // namespace
+
+TEST_F(TestForDeathTest, DoesNotExecuteAtforkHooks) {
+  if (!testing::GTEST_FLAG(death_test_use_fork)) {
+    testing::GTEST_FLAG(death_test_style) = "threadsafe";
+    pthread_flag = false;
+    ASSERT_EQ(0, pthread_atfork(&SetPthreadFlag, NULL, NULL));
+    ASSERT_DEATH(_exit(1), "");
+    ASSERT_FALSE(pthread_flag);
+  }
+}
+
+# endif  // GTEST_HAS_CLONE && GTEST_HAS_PTHREAD
+
+// Tests that a method of another class can be used in a death test.
+TEST_F(TestForDeathTest, MethodOfAnotherClass) {
+  const MayDie x(true);
+  ASSERT_DEATH(x.MemberFunction(), "MayDie\\:\\:MemberFunction");
+}
+
+// Tests that a global function can be used in a death test.
+TEST_F(TestForDeathTest, GlobalFunction) {
+  EXPECT_DEATH(GlobalFunction(), "GlobalFunction");
+}
+
+// Tests that any value convertible to an RE works as a second
+// argument to EXPECT_DEATH.
+TEST_F(TestForDeathTest, AcceptsAnythingConvertibleToRE) {
+  static const char regex_c_str[] = "GlobalFunction";
+  EXPECT_DEATH(GlobalFunction(), regex_c_str);
+
+  const testing::internal::RE regex(regex_c_str);
+  EXPECT_DEATH(GlobalFunction(), regex);
+
+# if GTEST_HAS_GLOBAL_STRING
+
+  const string regex_str(regex_c_str);
+  EXPECT_DEATH(GlobalFunction(), regex_str);
+
+# endif  // GTEST_HAS_GLOBAL_STRING
+
+# if !GTEST_USES_PCRE
+
+  const ::std::string regex_std_str(regex_c_str);
+  EXPECT_DEATH(GlobalFunction(), regex_std_str);
+
+# endif  // !GTEST_USES_PCRE
+}
+
+// Tests that a non-void function can be used in a death test.
+TEST_F(TestForDeathTest, NonVoidFunction) {
+  ASSERT_DEATH(NonVoidFunction(), "NonVoidFunction");
+}
+
+// Tests that functions that take parameter(s) can be used in a death test.
+TEST_F(TestForDeathTest, FunctionWithParameter) {
+  EXPECT_DEATH(DieIf(true), "DieIf\\(\\)");
+  EXPECT_DEATH(DieIfLessThan(2, 3), "DieIfLessThan");
+}
+
+// Tests that ASSERT_DEATH can be used outside a TEST, TEST_F, or test fixture.
+TEST_F(TestForDeathTest, OutsideFixture) {
+  DeathTestSubroutine();
+}
+
+// Tests that death tests can be done inside a loop.
+TEST_F(TestForDeathTest, InsideLoop) {
+  for (int i = 0; i < 5; i++) {
+    EXPECT_DEATH(DieIfLessThan(-1, i), "DieIfLessThan") << "where i == " << i;
+  }
+}
+
+// Tests that a compound statement can be used in a death test.
+TEST_F(TestForDeathTest, CompoundStatement) {
+  EXPECT_DEATH({  // NOLINT
+    const int x = 2;
+    const int y = x + 1;
+    DieIfLessThan(x, y);
+  },
+  "DieIfLessThan");
+}
+
+// Tests that code that doesn't die causes a death test to fail.
+TEST_F(TestForDeathTest, DoesNotDie) {
+  EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(DieIf(false), "DieIf"),
+                          "failed to die");
+}
+
+// Tests that a death test fails when the error message isn't expected.
+TEST_F(TestForDeathTest, ErrorMessageMismatch) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_DEATH(DieIf(true), "DieIfLessThan") << "End of death test message.";
+  }, "died but not with expected error");
+}
+
+// On exit, *aborted will be true iff the EXPECT_DEATH() statement
+// aborted the function.
+void ExpectDeathTestHelper(bool* aborted) {
+  *aborted = true;
+  EXPECT_DEATH(DieIf(false), "DieIf");  // This assertion should fail.
+  *aborted = false;
+}
+
+// Tests that EXPECT_DEATH doesn't abort the test on failure.
+TEST_F(TestForDeathTest, EXPECT_DEATH) {
+  bool aborted = true;
+  EXPECT_NONFATAL_FAILURE(ExpectDeathTestHelper(&aborted),
+                          "failed to die");
+  EXPECT_FALSE(aborted);
+}
+
+// Tests that ASSERT_DEATH does abort the test on failure.
+TEST_F(TestForDeathTest, ASSERT_DEATH) {
+  static bool aborted;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    aborted = true;
+    ASSERT_DEATH(DieIf(false), "DieIf");  // This assertion should fail.
+    aborted = false;
+  }, "failed to die");
+  EXPECT_TRUE(aborted);
+}
+
+// Tests that EXPECT_DEATH evaluates the arguments exactly once.
+TEST_F(TestForDeathTest, SingleEvaluation) {
+  int x = 3;
+  EXPECT_DEATH(DieIf((++x) == 4), "DieIf");
+
+  const char* regex = "DieIf";
+  const char* regex_save = regex;
+  EXPECT_DEATH(DieIfLessThan(3, 4), regex++);
+  EXPECT_EQ(regex_save + 1, regex);
+}
+
+// Tests that run-away death tests are reported as failures.
+TEST_F(TestForDeathTest, RunawayIsFailure) {
+  EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(static_cast<void>(0), "Foo"),
+                          "failed to die.");
+}
+
+// Tests that death tests report executing 'return' in the statement as
+// failure.
+TEST_F(TestForDeathTest, ReturnIsFailure) {
+  EXPECT_FATAL_FAILURE(ASSERT_DEATH(return, "Bar"),
+                       "illegal return in test statement.");
+}
+
+// Tests that EXPECT_DEBUG_DEATH works as expected, that is, you can stream a
+// message to it, and in debug mode it:
+// 1. Asserts on death.
+// 2. Has no side effect.
+//
+// And in opt mode, it:
+// 1.  Has side effects but does not assert.
+TEST_F(TestForDeathTest, TestExpectDebugDeath) {
+  int sideeffect = 0;
+
+  EXPECT_DEBUG_DEATH(DieInDebugElse12(&sideeffect), "death.*DieInDebugElse12")
+      << "Must accept a streamed message";
+
+# ifdef NDEBUG
+
+  // Checks that the assignment occurs in opt mode (sideeffect).
+  EXPECT_EQ(12, sideeffect);
+
+# else
+
+  // Checks that the assignment does not occur in dbg mode (no sideeffect).
+  EXPECT_EQ(0, sideeffect);
+
+# endif
+}
+
+// Tests that ASSERT_DEBUG_DEATH works as expected, that is, you can stream a
+// message to it, and in debug mode it:
+// 1. Asserts on death.
+// 2. Has no side effect.
+//
+// And in opt mode, it:
+// 1.  Has side effects but does not assert.
+TEST_F(TestForDeathTest, TestAssertDebugDeath) {
+  int sideeffect = 0;
+
+  ASSERT_DEBUG_DEATH(DieInDebugElse12(&sideeffect), "death.*DieInDebugElse12")
+      << "Must accept a streamed message";
+
+# ifdef NDEBUG
+
+  // Checks that the assignment occurs in opt mode (sideeffect).
+  EXPECT_EQ(12, sideeffect);
+
+# else
+
+  // Checks that the assignment does not occur in dbg mode (no sideeffect).
+  EXPECT_EQ(0, sideeffect);
+
+# endif
+}
+
+# ifndef NDEBUG
+
+void ExpectDebugDeathHelper(bool* aborted) {
+  *aborted = true;
+  EXPECT_DEBUG_DEATH(return, "") << "This is expected to fail.";
+  *aborted = false;
+}
+
+#  if GTEST_OS_WINDOWS
+TEST(PopUpDeathTest, DoesNotShowPopUpOnAbort) {
+  printf("This test should be considered failing if it shows "
+         "any pop-up dialogs.\n");
+  fflush(stdout);
+
+  EXPECT_DEATH({
+    testing::GTEST_FLAG(catch_exceptions) = false;
+    abort();
+  }, "");
+}
+#  endif  // GTEST_OS_WINDOWS
+
+// Tests that EXPECT_DEBUG_DEATH in debug mode does not abort
+// the function.
+TEST_F(TestForDeathTest, ExpectDebugDeathDoesNotAbort) {
+  bool aborted = true;
+  EXPECT_NONFATAL_FAILURE(ExpectDebugDeathHelper(&aborted), "");
+  EXPECT_FALSE(aborted);
+}
+
+void AssertDebugDeathHelper(bool* aborted) {
+  *aborted = true;
+  GTEST_LOG_(INFO) << "Before ASSERT_DEBUG_DEATH";
+  ASSERT_DEBUG_DEATH(GTEST_LOG_(INFO) << "In ASSERT_DEBUG_DEATH"; return, "")
+      << "This is expected to fail.";
+  GTEST_LOG_(INFO) << "After ASSERT_DEBUG_DEATH";
+  *aborted = false;
+}
+
+// Tests that ASSERT_DEBUG_DEATH in debug mode aborts the function on
+// failure.
+TEST_F(TestForDeathTest, AssertDebugDeathAborts) {
+  static bool aborted;
+  aborted = false;
+  EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
+  EXPECT_TRUE(aborted);
+}
+
+TEST_F(TestForDeathTest, AssertDebugDeathAborts2) {
+  static bool aborted;
+  aborted = false;
+  EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
+  EXPECT_TRUE(aborted);
+}
+
+TEST_F(TestForDeathTest, AssertDebugDeathAborts3) {
+  static bool aborted;
+  aborted = false;
+  EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
+  EXPECT_TRUE(aborted);
+}
+
+TEST_F(TestForDeathTest, AssertDebugDeathAborts4) {
+  static bool aborted;
+  aborted = false;
+  EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
+  EXPECT_TRUE(aborted);
+}
+
+TEST_F(TestForDeathTest, AssertDebugDeathAborts5) {
+  static bool aborted;
+  aborted = false;
+  EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
+  EXPECT_TRUE(aborted);
+}
+
+TEST_F(TestForDeathTest, AssertDebugDeathAborts6) {
+  static bool aborted;
+  aborted = false;
+  EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
+  EXPECT_TRUE(aborted);
+}
+
+TEST_F(TestForDeathTest, AssertDebugDeathAborts7) {
+  static bool aborted;
+  aborted = false;
+  EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
+  EXPECT_TRUE(aborted);
+}
+
+TEST_F(TestForDeathTest, AssertDebugDeathAborts8) {
+  static bool aborted;
+  aborted = false;
+  EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
+  EXPECT_TRUE(aborted);
+}
+
+TEST_F(TestForDeathTest, AssertDebugDeathAborts9) {
+  static bool aborted;
+  aborted = false;
+  EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
+  EXPECT_TRUE(aborted);
+}
+
+TEST_F(TestForDeathTest, AssertDebugDeathAborts10) {
+  static bool aborted;
+  aborted = false;
+  EXPECT_FATAL_FAILURE(AssertDebugDeathHelper(&aborted), "");
+  EXPECT_TRUE(aborted);
+}
+
+# endif  // _NDEBUG
+
+// Tests the *_EXIT family of macros, using a variety of predicates.
+static void TestExitMacros() {
+  EXPECT_EXIT(_exit(1),  testing::ExitedWithCode(1),  "");
+  ASSERT_EXIT(_exit(42), testing::ExitedWithCode(42), "");
+
+# if GTEST_OS_WINDOWS
+
+  // Of all signals effects on the process exit code, only those of SIGABRT
+  // are documented on Windows.
+  // See http://msdn.microsoft.com/en-us/library/dwwzkt4c(VS.71).aspx.
+  EXPECT_EXIT(raise(SIGABRT), testing::ExitedWithCode(3), "") << "b_ar";
+
+# else
+
+  EXPECT_EXIT(raise(SIGKILL), testing::KilledBySignal(SIGKILL), "") << "foo";
+  ASSERT_EXIT(raise(SIGUSR2), testing::KilledBySignal(SIGUSR2), "") << "bar";
+
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_EXIT(_exit(0), testing::KilledBySignal(SIGSEGV), "")
+      << "This failure is expected, too.";
+  }, "This failure is expected, too.");
+
+# endif  // GTEST_OS_WINDOWS
+
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_EXIT(raise(SIGSEGV), testing::ExitedWithCode(0), "")
+      << "This failure is expected.";
+  }, "This failure is expected.");
+}
+
+TEST_F(TestForDeathTest, ExitMacros) {
+  TestExitMacros();
+}
+
+TEST_F(TestForDeathTest, ExitMacrosUsingFork) {
+  testing::GTEST_FLAG(death_test_use_fork) = true;
+  TestExitMacros();
+}
+
+TEST_F(TestForDeathTest, InvalidStyle) {
+  testing::GTEST_FLAG(death_test_style) = "rococo";
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_DEATH(_exit(0), "") << "This failure is expected.";
+  }, "This failure is expected.");
+}
+
+TEST_F(TestForDeathTest, DeathTestFailedOutput) {
+  testing::GTEST_FLAG(death_test_style) = "fast";
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_DEATH(DieWithMessage("death\n"),
+                   "expected message"),
+      "Actual msg:\n"
+      "[  DEATH   ] death\n");
+}
+
+TEST_F(TestForDeathTest, DeathTestUnexpectedReturnOutput) {
+  testing::GTEST_FLAG(death_test_style) = "fast";
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_DEATH({
+          fprintf(stderr, "returning\n");
+          fflush(stderr);
+          return;
+        }, ""),
+      "    Result: illegal return in test statement.\n"
+      " Error msg:\n"
+      "[  DEATH   ] returning\n");
+}
+
+TEST_F(TestForDeathTest, DeathTestBadExitCodeOutput) {
+  testing::GTEST_FLAG(death_test_style) = "fast";
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_EXIT(DieWithMessage("exiting with rc 1\n"),
+                  testing::ExitedWithCode(3),
+                  "expected message"),
+      "    Result: died but not with expected exit code:\n"
+      "            Exited with exit status 1\n"
+      "Actual msg:\n"
+      "[  DEATH   ] exiting with rc 1\n");
+}
+
+TEST_F(TestForDeathTest, DeathTestMultiLineMatchFail) {
+  testing::GTEST_FLAG(death_test_style) = "fast";
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_DEATH(DieWithMessage("line 1\nline 2\nline 3\n"),
+                   "line 1\nxyz\nline 3\n"),
+      "Actual msg:\n"
+      "[  DEATH   ] line 1\n"
+      "[  DEATH   ] line 2\n"
+      "[  DEATH   ] line 3\n");
+}
+
+TEST_F(TestForDeathTest, DeathTestMultiLineMatchPass) {
+  testing::GTEST_FLAG(death_test_style) = "fast";
+  EXPECT_DEATH(DieWithMessage("line 1\nline 2\nline 3\n"),
+               "line 1\nline 2\nline 3\n");
+}
+
+// A DeathTestFactory that returns MockDeathTests.
+class MockDeathTestFactory : public DeathTestFactory {
+ public:
+  MockDeathTestFactory();
+  virtual bool Create(const char* statement,
+                      const ::testing::internal::RE* regex,
+                      const char* file, int line, DeathTest** test);
+
+  // Sets the parameters for subsequent calls to Create.
+  void SetParameters(bool create, DeathTest::TestRole role,
+                     int status, bool passed);
+
+  // Accessors.
+  int AssumeRoleCalls() const { return assume_role_calls_; }
+  int WaitCalls() const { return wait_calls_; }
+  size_t PassedCalls() const { return passed_args_.size(); }
+  bool PassedArgument(int n) const { return passed_args_[n]; }
+  size_t AbortCalls() const { return abort_args_.size(); }
+  DeathTest::AbortReason AbortArgument(int n) const {
+    return abort_args_[n];
+  }
+  bool TestDeleted() const { return test_deleted_; }
+
+ private:
+  friend class MockDeathTest;
+  // If true, Create will return a MockDeathTest; otherwise it returns
+  // NULL.
+  bool create_;
+  // The value a MockDeathTest will return from its AssumeRole method.
+  DeathTest::TestRole role_;
+  // The value a MockDeathTest will return from its Wait method.
+  int status_;
+  // The value a MockDeathTest will return from its Passed method.
+  bool passed_;
+
+  // Number of times AssumeRole was called.
+  int assume_role_calls_;
+  // Number of times Wait was called.
+  int wait_calls_;
+  // The arguments to the calls to Passed since the last call to
+  // SetParameters.
+  std::vector<bool> passed_args_;
+  // The arguments to the calls to Abort since the last call to
+  // SetParameters.
+  std::vector<DeathTest::AbortReason> abort_args_;
+  // True if the last MockDeathTest returned by Create has been
+  // deleted.
+  bool test_deleted_;
+};
+
+
+// A DeathTest implementation useful in testing.  It returns values set
+// at its creation from its various inherited DeathTest methods, and
+// reports calls to those methods to its parent MockDeathTestFactory
+// object.
+class MockDeathTest : public DeathTest {
+ public:
+  MockDeathTest(MockDeathTestFactory *parent,
+                TestRole role, int status, bool passed) :
+      parent_(parent), role_(role), status_(status), passed_(passed) {
+  }
+  virtual ~MockDeathTest() {
+    parent_->test_deleted_ = true;
+  }
+  virtual TestRole AssumeRole() {
+    ++parent_->assume_role_calls_;
+    return role_;
+  }
+  virtual int Wait() {
+    ++parent_->wait_calls_;
+    return status_;
+  }
+  virtual bool Passed(bool exit_status_ok) {
+    parent_->passed_args_.push_back(exit_status_ok);
+    return passed_;
+  }
+  virtual void Abort(AbortReason reason) {
+    parent_->abort_args_.push_back(reason);
+  }
+
+ private:
+  MockDeathTestFactory* const parent_;
+  const TestRole role_;
+  const int status_;
+  const bool passed_;
+};
+
+
+// MockDeathTestFactory constructor.
+MockDeathTestFactory::MockDeathTestFactory()
+    : create_(true),
+      role_(DeathTest::OVERSEE_TEST),
+      status_(0),
+      passed_(true),
+      assume_role_calls_(0),
+      wait_calls_(0),
+      passed_args_(),
+      abort_args_() {
+}
+
+
+// Sets the parameters for subsequent calls to Create.
+void MockDeathTestFactory::SetParameters(bool create,
+                                         DeathTest::TestRole role,
+                                         int status, bool passed) {
+  create_ = create;
+  role_ = role;
+  status_ = status;
+  passed_ = passed;
+
+  assume_role_calls_ = 0;
+  wait_calls_ = 0;
+  passed_args_.clear();
+  abort_args_.clear();
+}
+
+
+// Sets test to NULL (if create_ is false) or to the address of a new
+// MockDeathTest object with parameters taken from the last call
+// to SetParameters (if create_ is true).  Always returns true.
+bool MockDeathTestFactory::Create(const char* /*statement*/,
+                                  const ::testing::internal::RE* /*regex*/,
+                                  const char* /*file*/,
+                                  int /*line*/,
+                                  DeathTest** test) {
+  test_deleted_ = false;
+  if (create_) {
+    *test = new MockDeathTest(this, role_, status_, passed_);
+  } else {
+    *test = NULL;
+  }
+  return true;
+}
+
+// A test fixture for testing the logic of the GTEST_DEATH_TEST_ macro.
+// It installs a MockDeathTestFactory that is used for the duration
+// of the test case.
+class MacroLogicDeathTest : public testing::Test {
+ protected:
+  static testing::internal::ReplaceDeathTestFactory* replacer_;
+  static MockDeathTestFactory* factory_;
+
+  static void SetUpTestCase() {
+    factory_ = new MockDeathTestFactory;
+    replacer_ = new testing::internal::ReplaceDeathTestFactory(factory_);
+  }
+
+  static void TearDownTestCase() {
+    delete replacer_;
+    replacer_ = NULL;
+    delete factory_;
+    factory_ = NULL;
+  }
+
+  // Runs a death test that breaks the rules by returning.  Such a death
+  // test cannot be run directly from a test routine that uses a
+  // MockDeathTest, or the remainder of the routine will not be executed.
+  static void RunReturningDeathTest(bool* flag) {
+    ASSERT_DEATH({  // NOLINT
+      *flag = true;
+      return;
+    }, "");
+  }
+};
+
+testing::internal::ReplaceDeathTestFactory* MacroLogicDeathTest::replacer_
+    = NULL;
+MockDeathTestFactory* MacroLogicDeathTest::factory_ = NULL;
+
+
+// Test that nothing happens when the factory doesn't return a DeathTest:
+TEST_F(MacroLogicDeathTest, NothingHappens) {
+  bool flag = false;
+  factory_->SetParameters(false, DeathTest::OVERSEE_TEST, 0, true);
+  EXPECT_DEATH(flag = true, "");
+  EXPECT_FALSE(flag);
+  EXPECT_EQ(0, factory_->AssumeRoleCalls());
+  EXPECT_EQ(0, factory_->WaitCalls());
+  EXPECT_EQ(0U, factory_->PassedCalls());
+  EXPECT_EQ(0U, factory_->AbortCalls());
+  EXPECT_FALSE(factory_->TestDeleted());
+}
+
+// Test that the parent process doesn't run the death test code,
+// and that the Passed method returns false when the (simulated)
+// child process exits with status 0:
+TEST_F(MacroLogicDeathTest, ChildExitsSuccessfully) {
+  bool flag = false;
+  factory_->SetParameters(true, DeathTest::OVERSEE_TEST, 0, true);
+  EXPECT_DEATH(flag = true, "");
+  EXPECT_FALSE(flag);
+  EXPECT_EQ(1, factory_->AssumeRoleCalls());
+  EXPECT_EQ(1, factory_->WaitCalls());
+  ASSERT_EQ(1U, factory_->PassedCalls());
+  EXPECT_FALSE(factory_->PassedArgument(0));
+  EXPECT_EQ(0U, factory_->AbortCalls());
+  EXPECT_TRUE(factory_->TestDeleted());
+}
+
+// Tests that the Passed method was given the argument "true" when
+// the (simulated) child process exits with status 1:
+TEST_F(MacroLogicDeathTest, ChildExitsUnsuccessfully) {
+  bool flag = false;
+  factory_->SetParameters(true, DeathTest::OVERSEE_TEST, 1, true);
+  EXPECT_DEATH(flag = true, "");
+  EXPECT_FALSE(flag);
+  EXPECT_EQ(1, factory_->AssumeRoleCalls());
+  EXPECT_EQ(1, factory_->WaitCalls());
+  ASSERT_EQ(1U, factory_->PassedCalls());
+  EXPECT_TRUE(factory_->PassedArgument(0));
+  EXPECT_EQ(0U, factory_->AbortCalls());
+  EXPECT_TRUE(factory_->TestDeleted());
+}
+
+// Tests that the (simulated) child process executes the death test
+// code, and is aborted with the correct AbortReason if it
+// executes a return statement.
+TEST_F(MacroLogicDeathTest, ChildPerformsReturn) {
+  bool flag = false;
+  factory_->SetParameters(true, DeathTest::EXECUTE_TEST, 0, true);
+  RunReturningDeathTest(&flag);
+  EXPECT_TRUE(flag);
+  EXPECT_EQ(1, factory_->AssumeRoleCalls());
+  EXPECT_EQ(0, factory_->WaitCalls());
+  EXPECT_EQ(0U, factory_->PassedCalls());
+  EXPECT_EQ(1U, factory_->AbortCalls());
+  EXPECT_EQ(DeathTest::TEST_ENCOUNTERED_RETURN_STATEMENT,
+            factory_->AbortArgument(0));
+  EXPECT_TRUE(factory_->TestDeleted());
+}
+
+// Tests that the (simulated) child process is aborted with the
+// correct AbortReason if it does not die.
+TEST_F(MacroLogicDeathTest, ChildDoesNotDie) {
+  bool flag = false;
+  factory_->SetParameters(true, DeathTest::EXECUTE_TEST, 0, true);
+  EXPECT_DEATH(flag = true, "");
+  EXPECT_TRUE(flag);
+  EXPECT_EQ(1, factory_->AssumeRoleCalls());
+  EXPECT_EQ(0, factory_->WaitCalls());
+  EXPECT_EQ(0U, factory_->PassedCalls());
+  // This time there are two calls to Abort: one since the test didn't
+  // die, and another from the ReturnSentinel when it's destroyed.  The
+  // sentinel normally isn't destroyed if a test doesn't die, since
+  // _exit(2) is called in that case by ForkingDeathTest, but not by
+  // our MockDeathTest.
+  ASSERT_EQ(2U, factory_->AbortCalls());
+  EXPECT_EQ(DeathTest::TEST_DID_NOT_DIE,
+            factory_->AbortArgument(0));
+  EXPECT_EQ(DeathTest::TEST_ENCOUNTERED_RETURN_STATEMENT,
+            factory_->AbortArgument(1));
+  EXPECT_TRUE(factory_->TestDeleted());
+}
+
+// Tests that a successful death test does not register a successful
+// test part.
+TEST(SuccessRegistrationDeathTest, NoSuccessPart) {
+  EXPECT_DEATH(_exit(1), "");
+  EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count());
+}
+
+TEST(StreamingAssertionsDeathTest, DeathTest) {
+  EXPECT_DEATH(_exit(1), "") << "unexpected failure";
+  ASSERT_DEATH(_exit(1), "") << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_DEATH(_exit(0), "") << "expected failure";
+  }, "expected failure");
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_DEATH(_exit(0), "") << "expected failure";
+  }, "expected failure");
+}
+
+// Tests that GetLastErrnoDescription returns an empty string when the
+// last error is 0 and non-empty string when it is non-zero.
+TEST(GetLastErrnoDescription, GetLastErrnoDescriptionWorks) {
+  errno = ENOENT;
+  EXPECT_STRNE("", GetLastErrnoDescription().c_str());
+  errno = 0;
+  EXPECT_STREQ("", GetLastErrnoDescription().c_str());
+}
+
+# if GTEST_OS_WINDOWS
+TEST(AutoHandleTest, AutoHandleWorks) {
+  HANDLE handle = ::CreateEvent(NULL, FALSE, FALSE, NULL);
+  ASSERT_NE(INVALID_HANDLE_VALUE, handle);
+
+  // Tests that the AutoHandle is correctly initialized with a handle.
+  testing::internal::AutoHandle auto_handle(handle);
+  EXPECT_EQ(handle, auto_handle.Get());
+
+  // Tests that Reset assigns INVALID_HANDLE_VALUE.
+  // Note that this cannot verify whether the original handle is closed.
+  auto_handle.Reset();
+  EXPECT_EQ(INVALID_HANDLE_VALUE, auto_handle.Get());
+
+  // Tests that Reset assigns the new handle.
+  // Note that this cannot verify whether the original handle is closed.
+  handle = ::CreateEvent(NULL, FALSE, FALSE, NULL);
+  ASSERT_NE(INVALID_HANDLE_VALUE, handle);
+  auto_handle.Reset(handle);
+  EXPECT_EQ(handle, auto_handle.Get());
+
+  // Tests that AutoHandle contains INVALID_HANDLE_VALUE by default.
+  testing::internal::AutoHandle auto_handle2;
+  EXPECT_EQ(INVALID_HANDLE_VALUE, auto_handle2.Get());
+}
+# endif  // GTEST_OS_WINDOWS
+
+# if GTEST_OS_WINDOWS
+typedef unsigned __int64 BiggestParsable;
+typedef signed __int64 BiggestSignedParsable;
+# else
+typedef unsigned long long BiggestParsable;
+typedef signed long long BiggestSignedParsable;
+# endif  // GTEST_OS_WINDOWS
+
+// We cannot use std::numeric_limits<T>::max() as it clashes with the
+// max() macro defined by <windows.h>.
+const BiggestParsable kBiggestParsableMax = ULLONG_MAX;
+const BiggestSignedParsable kBiggestSignedParsableMax = LLONG_MAX;
+
+TEST(ParseNaturalNumberTest, RejectsInvalidFormat) {
+  BiggestParsable result = 0;
+
+  // Rejects non-numbers.
+  EXPECT_FALSE(ParseNaturalNumber("non-number string", &result));
+
+  // Rejects numbers with whitespace prefix.
+  EXPECT_FALSE(ParseNaturalNumber(" 123", &result));
+
+  // Rejects negative numbers.
+  EXPECT_FALSE(ParseNaturalNumber("-123", &result));
+
+  // Rejects numbers starting with a plus sign.
+  EXPECT_FALSE(ParseNaturalNumber("+123", &result));
+  errno = 0;
+}
+
+TEST(ParseNaturalNumberTest, RejectsOverflownNumbers) {
+  BiggestParsable result = 0;
+
+  EXPECT_FALSE(ParseNaturalNumber("99999999999999999999999", &result));
+
+  signed char char_result = 0;
+  EXPECT_FALSE(ParseNaturalNumber("200", &char_result));
+  errno = 0;
+}
+
+TEST(ParseNaturalNumberTest, AcceptsValidNumbers) {
+  BiggestParsable result = 0;
+
+  result = 0;
+  ASSERT_TRUE(ParseNaturalNumber("123", &result));
+  EXPECT_EQ(123U, result);
+
+  // Check 0 as an edge case.
+  result = 1;
+  ASSERT_TRUE(ParseNaturalNumber("0", &result));
+  EXPECT_EQ(0U, result);
+
+  result = 1;
+  ASSERT_TRUE(ParseNaturalNumber("00000", &result));
+  EXPECT_EQ(0U, result);
+}
+
+TEST(ParseNaturalNumberTest, AcceptsTypeLimits) {
+  Message msg;
+  msg << kBiggestParsableMax;
+
+  BiggestParsable result = 0;
+  EXPECT_TRUE(ParseNaturalNumber(msg.GetString(), &result));
+  EXPECT_EQ(kBiggestParsableMax, result);
+
+  Message msg2;
+  msg2 << kBiggestSignedParsableMax;
+
+  BiggestSignedParsable signed_result = 0;
+  EXPECT_TRUE(ParseNaturalNumber(msg2.GetString(), &signed_result));
+  EXPECT_EQ(kBiggestSignedParsableMax, signed_result);
+
+  Message msg3;
+  msg3 << INT_MAX;
+
+  int int_result = 0;
+  EXPECT_TRUE(ParseNaturalNumber(msg3.GetString(), &int_result));
+  EXPECT_EQ(INT_MAX, int_result);
+
+  Message msg4;
+  msg4 << UINT_MAX;
+
+  unsigned int uint_result = 0;
+  EXPECT_TRUE(ParseNaturalNumber(msg4.GetString(), &uint_result));
+  EXPECT_EQ(UINT_MAX, uint_result);
+}
+
+TEST(ParseNaturalNumberTest, WorksForShorterIntegers) {
+  short short_result = 0;
+  ASSERT_TRUE(ParseNaturalNumber("123", &short_result));
+  EXPECT_EQ(123, short_result);
+
+  signed char char_result = 0;
+  ASSERT_TRUE(ParseNaturalNumber("123", &char_result));
+  EXPECT_EQ(123, char_result);
+}
+
+# if GTEST_OS_WINDOWS
+TEST(EnvironmentTest, HandleFitsIntoSizeT) {
+  // TODO(vladl@google.com): Remove this test after this condition is verified
+  // in a static assertion in gtest-death-test.cc in the function
+  // GetStatusFileDescriptor.
+  ASSERT_TRUE(sizeof(HANDLE) <= sizeof(size_t));
+}
+# endif  // GTEST_OS_WINDOWS
+
+// Tests that EXPECT_DEATH_IF_SUPPORTED/ASSERT_DEATH_IF_SUPPORTED trigger
+// failures when death tests are available on the system.
+TEST(ConditionalDeathMacrosDeathTest, ExpectsDeathWhenDeathTestsAvailable) {
+  EXPECT_DEATH_IF_SUPPORTED(DieInside("CondDeathTestExpectMacro"),
+                            "death inside CondDeathTestExpectMacro");
+  ASSERT_DEATH_IF_SUPPORTED(DieInside("CondDeathTestAssertMacro"),
+                            "death inside CondDeathTestAssertMacro");
+
+  // Empty statement will not crash, which must trigger a failure.
+  EXPECT_NONFATAL_FAILURE(EXPECT_DEATH_IF_SUPPORTED(;, ""), "");
+  EXPECT_FATAL_FAILURE(ASSERT_DEATH_IF_SUPPORTED(;, ""), "");
+}
+
+TEST(InDeathTestChildDeathTest, ReportsDeathTestCorrectlyInFastStyle) {
+  testing::GTEST_FLAG(death_test_style) = "fast";
+  EXPECT_FALSE(InDeathTestChild());
+  EXPECT_DEATH({
+    fprintf(stderr, InDeathTestChild() ? "Inside" : "Outside");
+    fflush(stderr);
+    _exit(1);
+  }, "Inside");
+}
+
+TEST(InDeathTestChildDeathTest, ReportsDeathTestCorrectlyInThreadSafeStyle) {
+  testing::GTEST_FLAG(death_test_style) = "threadsafe";
+  EXPECT_FALSE(InDeathTestChild());
+  EXPECT_DEATH({
+    fprintf(stderr, InDeathTestChild() ? "Inside" : "Outside");
+    fflush(stderr);
+    _exit(1);
+  }, "Inside");
+}
+
+#else  // !GTEST_HAS_DEATH_TEST follows
+
+using testing::internal::CaptureStderr;
+using testing::internal::GetCapturedStderr;
+
+// Tests that EXPECT_DEATH_IF_SUPPORTED/ASSERT_DEATH_IF_SUPPORTED are still
+// defined but do not trigger failures when death tests are not available on
+// the system.
+TEST(ConditionalDeathMacrosTest, WarnsWhenDeathTestsNotAvailable) {
+  // Empty statement will not crash, but that should not trigger a failure
+  // when death tests are not supported.
+  CaptureStderr();
+  EXPECT_DEATH_IF_SUPPORTED(;, "");
+  std::string output = GetCapturedStderr();
+  ASSERT_TRUE(NULL != strstr(output.c_str(),
+                             "Death tests are not supported on this platform"));
+  ASSERT_TRUE(NULL != strstr(output.c_str(), ";"));
+
+  // The streamed message should not be printed as there is no test failure.
+  CaptureStderr();
+  EXPECT_DEATH_IF_SUPPORTED(;, "") << "streamed message";
+  output = GetCapturedStderr();
+  ASSERT_TRUE(NULL == strstr(output.c_str(), "streamed message"));
+
+  CaptureStderr();
+  ASSERT_DEATH_IF_SUPPORTED(;, "");  // NOLINT
+  output = GetCapturedStderr();
+  ASSERT_TRUE(NULL != strstr(output.c_str(),
+                             "Death tests are not supported on this platform"));
+  ASSERT_TRUE(NULL != strstr(output.c_str(), ";"));
+
+  CaptureStderr();
+  ASSERT_DEATH_IF_SUPPORTED(;, "") << "streamed message";  // NOLINT
+  output = GetCapturedStderr();
+  ASSERT_TRUE(NULL == strstr(output.c_str(), "streamed message"));
+}
+
+void FuncWithAssert(int* n) {
+  ASSERT_DEATH_IF_SUPPORTED(return;, "");
+  (*n)++;
+}
+
+// Tests that ASSERT_DEATH_IF_SUPPORTED does not return from the current
+// function (as ASSERT_DEATH does) if death tests are not supported.
+TEST(ConditionalDeathMacrosTest, AssertDeatDoesNotReturnhIfUnsupported) {
+  int n = 0;
+  FuncWithAssert(&n);
+  EXPECT_EQ(1, n);
+}
+
+#endif  // !GTEST_HAS_DEATH_TEST
+
+// Tests that the death test macros expand to code which may or may not
+// be followed by operator<<, and that in either case the complete text
+// comprises only a single C++ statement.
+//
+// The syntax should work whether death tests are available or not.
+TEST(ConditionalDeathMacrosSyntaxDeathTest, SingleStatement) {
+  if (AlwaysFalse())
+    // This would fail if executed; this is a compilation test only
+    ASSERT_DEATH_IF_SUPPORTED(return, "");
+
+  if (AlwaysTrue())
+    EXPECT_DEATH_IF_SUPPORTED(_exit(1), "");
+  else
+    // This empty "else" branch is meant to ensure that EXPECT_DEATH
+    // doesn't expand into an "if" statement without an "else"
+    ;  // NOLINT
+
+  if (AlwaysFalse())
+    ASSERT_DEATH_IF_SUPPORTED(return, "") << "did not die";
+
+  if (AlwaysFalse())
+    ;  // NOLINT
+  else
+    EXPECT_DEATH_IF_SUPPORTED(_exit(1), "") << 1 << 2 << 3;
+}
+
+// Tests that conditional death test macros expand to code which interacts
+// well with switch statements.
+TEST(ConditionalDeathMacrosSyntaxDeathTest, SwitchStatement) {
+  // Microsoft compiler usually complains about switch statements without
+  // case labels. We suppress that warning for this test.
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4065)
+
+  switch (0)
+    default:
+      ASSERT_DEATH_IF_SUPPORTED(_exit(1), "")
+          << "exit in default switch handler";
+
+  switch (0)
+    case 0:
+      EXPECT_DEATH_IF_SUPPORTED(_exit(1), "") << "exit in switch case";
+
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+}
+
+// Tests that a test case whose name ends with "DeathTest" works fine
+// on Windows.
+TEST(NotADeathTest, Test) {
+  SUCCEED();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-filepath_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-filepath_test.cc
new file mode 100644
index 0000000000..da72986926
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-filepath_test.cc
@@ -0,0 +1,662 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: keith.ray@gmail.com (Keith Ray)
+//
+// Google Test filepath utilities
+//
+// This file tests classes and functions used internally by
+// Google Test.  They are subject to change without notice.
+//
+// This file is #included from gtest_unittest.cc, to avoid changing
+// build or make-files for some existing Google Test clients. Do not
+// #include this file anywhere else!
+
+#include "gtest/internal/gtest-filepath.h"
+#include "gtest/gtest.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+#if GTEST_OS_WINDOWS_MOBILE
+# include <windows.h>  // NOLINT
+#elif GTEST_OS_WINDOWS
+# include <direct.h>  // NOLINT
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+namespace testing {
+namespace internal {
+namespace {
+
+#if GTEST_OS_WINDOWS_MOBILE
+// TODO(wan@google.com): Move these to the POSIX adapter section in
+// gtest-port.h.
+
+// Windows CE doesn't have the remove C function.
+int remove(const char* path) {
+  LPCWSTR wpath = String::AnsiToUtf16(path);
+  int ret = DeleteFile(wpath) ? 0 : -1;
+  delete [] wpath;
+  return ret;
+}
+// Windows CE doesn't have the _rmdir C function.
+int _rmdir(const char* path) {
+  FilePath filepath(path);
+  LPCWSTR wpath = String::AnsiToUtf16(
+      filepath.RemoveTrailingPathSeparator().c_str());
+  int ret = RemoveDirectory(wpath) ? 0 : -1;
+  delete [] wpath;
+  return ret;
+}
+
+#else
+
+TEST(GetCurrentDirTest, ReturnsCurrentDir) {
+  const FilePath original_dir = FilePath::GetCurrentDir();
+  EXPECT_FALSE(original_dir.IsEmpty());
+
+  posix::ChDir(GTEST_PATH_SEP_);
+  const FilePath cwd = FilePath::GetCurrentDir();
+  posix::ChDir(original_dir.c_str());
+
+# if GTEST_OS_WINDOWS
+
+  // Skips the ":".
+  const char* const cwd_without_drive = strchr(cwd.c_str(), ':');
+  ASSERT_TRUE(cwd_without_drive != NULL);
+  EXPECT_STREQ(GTEST_PATH_SEP_, cwd_without_drive + 1);
+
+# else
+
+  EXPECT_EQ(GTEST_PATH_SEP_, cwd.string());
+
+# endif
+}
+
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+TEST(IsEmptyTest, ReturnsTrueForEmptyPath) {
+  EXPECT_TRUE(FilePath("").IsEmpty());
+}
+
+TEST(IsEmptyTest, ReturnsFalseForNonEmptyPath) {
+  EXPECT_FALSE(FilePath("a").IsEmpty());
+  EXPECT_FALSE(FilePath(".").IsEmpty());
+  EXPECT_FALSE(FilePath("a/b").IsEmpty());
+  EXPECT_FALSE(FilePath("a\\b\\").IsEmpty());
+}
+
+// RemoveDirectoryName "" -> ""
+TEST(RemoveDirectoryNameTest, WhenEmptyName) {
+  EXPECT_EQ("", FilePath("").RemoveDirectoryName().string());
+}
+
+// RemoveDirectoryName "afile" -> "afile"
+TEST(RemoveDirectoryNameTest, ButNoDirectory) {
+  EXPECT_EQ("afile",
+      FilePath("afile").RemoveDirectoryName().string());
+}
+
+// RemoveDirectoryName "/afile" -> "afile"
+TEST(RemoveDirectoryNameTest, RootFileShouldGiveFileName) {
+  EXPECT_EQ("afile",
+      FilePath(GTEST_PATH_SEP_ "afile").RemoveDirectoryName().string());
+}
+
+// RemoveDirectoryName "adir/" -> ""
+TEST(RemoveDirectoryNameTest, WhereThereIsNoFileName) {
+  EXPECT_EQ("",
+      FilePath("adir" GTEST_PATH_SEP_).RemoveDirectoryName().string());
+}
+
+// RemoveDirectoryName "adir/afile" -> "afile"
+TEST(RemoveDirectoryNameTest, ShouldGiveFileName) {
+  EXPECT_EQ("afile",
+      FilePath("adir" GTEST_PATH_SEP_ "afile").RemoveDirectoryName().string());
+}
+
+// RemoveDirectoryName "adir/subdir/afile" -> "afile"
+TEST(RemoveDirectoryNameTest, ShouldAlsoGiveFileName) {
+  EXPECT_EQ("afile",
+      FilePath("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_ "afile")
+      .RemoveDirectoryName().string());
+}
+
+#if GTEST_HAS_ALT_PATH_SEP_
+
+// Tests that RemoveDirectoryName() works with the alternate separator
+// on Windows.
+
+// RemoveDirectoryName("/afile") -> "afile"
+TEST(RemoveDirectoryNameTest, RootFileShouldGiveFileNameForAlternateSeparator) {
+  EXPECT_EQ("afile", FilePath("/afile").RemoveDirectoryName().string());
+}
+
+// RemoveDirectoryName("adir/") -> ""
+TEST(RemoveDirectoryNameTest, WhereThereIsNoFileNameForAlternateSeparator) {
+  EXPECT_EQ("", FilePath("adir/").RemoveDirectoryName().string());
+}
+
+// RemoveDirectoryName("adir/afile") -> "afile"
+TEST(RemoveDirectoryNameTest, ShouldGiveFileNameForAlternateSeparator) {
+  EXPECT_EQ("afile", FilePath("adir/afile").RemoveDirectoryName().string());
+}
+
+// RemoveDirectoryName("adir/subdir/afile") -> "afile"
+TEST(RemoveDirectoryNameTest, ShouldAlsoGiveFileNameForAlternateSeparator) {
+  EXPECT_EQ("afile",
+            FilePath("adir/subdir/afile").RemoveDirectoryName().string());
+}
+
+#endif
+
+// RemoveFileName "" -> "./"
+TEST(RemoveFileNameTest, EmptyName) {
+#if GTEST_OS_WINDOWS_MOBILE
+  // On Windows CE, we use the root as the current directory.
+  EXPECT_EQ(GTEST_PATH_SEP_, FilePath("").RemoveFileName().string());
+#else
+  EXPECT_EQ("." GTEST_PATH_SEP_, FilePath("").RemoveFileName().string());
+#endif
+}
+
+// RemoveFileName "adir/" -> "adir/"
+TEST(RemoveFileNameTest, ButNoFile) {
+  EXPECT_EQ("adir" GTEST_PATH_SEP_,
+      FilePath("adir" GTEST_PATH_SEP_).RemoveFileName().string());
+}
+
+// RemoveFileName "adir/afile" -> "adir/"
+TEST(RemoveFileNameTest, GivesDirName) {
+  EXPECT_EQ("adir" GTEST_PATH_SEP_,
+            FilePath("adir" GTEST_PATH_SEP_ "afile").RemoveFileName().string());
+}
+
+// RemoveFileName "adir/subdir/afile" -> "adir/subdir/"
+TEST(RemoveFileNameTest, GivesDirAndSubDirName) {
+  EXPECT_EQ("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_,
+      FilePath("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_ "afile")
+      .RemoveFileName().string());
+}
+
+// RemoveFileName "/afile" -> "/"
+TEST(RemoveFileNameTest, GivesRootDir) {
+  EXPECT_EQ(GTEST_PATH_SEP_,
+      FilePath(GTEST_PATH_SEP_ "afile").RemoveFileName().string());
+}
+
+#if GTEST_HAS_ALT_PATH_SEP_
+
+// Tests that RemoveFileName() works with the alternate separator on
+// Windows.
+
+// RemoveFileName("adir/") -> "adir/"
+TEST(RemoveFileNameTest, ButNoFileForAlternateSeparator) {
+  EXPECT_EQ("adir" GTEST_PATH_SEP_,
+            FilePath("adir/").RemoveFileName().string());
+}
+
+// RemoveFileName("adir/afile") -> "adir/"
+TEST(RemoveFileNameTest, GivesDirNameForAlternateSeparator) {
+  EXPECT_EQ("adir" GTEST_PATH_SEP_,
+            FilePath("adir/afile").RemoveFileName().string());
+}
+
+// RemoveFileName("adir/subdir/afile") -> "adir/subdir/"
+TEST(RemoveFileNameTest, GivesDirAndSubDirNameForAlternateSeparator) {
+  EXPECT_EQ("adir" GTEST_PATH_SEP_ "subdir" GTEST_PATH_SEP_,
+            FilePath("adir/subdir/afile").RemoveFileName().string());
+}
+
+// RemoveFileName("/afile") -> "\"
+TEST(RemoveFileNameTest, GivesRootDirForAlternateSeparator) {
+  EXPECT_EQ(GTEST_PATH_SEP_, FilePath("/afile").RemoveFileName().string());
+}
+
+#endif
+
+TEST(MakeFileNameTest, GenerateWhenNumberIsZero) {
+  FilePath actual = FilePath::MakeFileName(FilePath("foo"), FilePath("bar"),
+      0, "xml");
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.string());
+}
+
+TEST(MakeFileNameTest, GenerateFileNameNumberGtZero) {
+  FilePath actual = FilePath::MakeFileName(FilePath("foo"), FilePath("bar"),
+      12, "xml");
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar_12.xml", actual.string());
+}
+
+TEST(MakeFileNameTest, GenerateFileNameWithSlashNumberIsZero) {
+  FilePath actual = FilePath::MakeFileName(FilePath("foo" GTEST_PATH_SEP_),
+      FilePath("bar"), 0, "xml");
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.string());
+}
+
+TEST(MakeFileNameTest, GenerateFileNameWithSlashNumberGtZero) {
+  FilePath actual = FilePath::MakeFileName(FilePath("foo" GTEST_PATH_SEP_),
+      FilePath("bar"), 12, "xml");
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar_12.xml", actual.string());
+}
+
+TEST(MakeFileNameTest, GenerateWhenNumberIsZeroAndDirIsEmpty) {
+  FilePath actual = FilePath::MakeFileName(FilePath(""), FilePath("bar"),
+      0, "xml");
+  EXPECT_EQ("bar.xml", actual.string());
+}
+
+TEST(MakeFileNameTest, GenerateWhenNumberIsNotZeroAndDirIsEmpty) {
+  FilePath actual = FilePath::MakeFileName(FilePath(""), FilePath("bar"),
+      14, "xml");
+  EXPECT_EQ("bar_14.xml", actual.string());
+}
+
+TEST(ConcatPathsTest, WorksWhenDirDoesNotEndWithPathSep) {
+  FilePath actual = FilePath::ConcatPaths(FilePath("foo"),
+                                          FilePath("bar.xml"));
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.string());
+}
+
+TEST(ConcatPathsTest, WorksWhenPath1EndsWithPathSep) {
+  FilePath actual = FilePath::ConcatPaths(FilePath("foo" GTEST_PATH_SEP_),
+                                          FilePath("bar.xml"));
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar.xml", actual.string());
+}
+
+TEST(ConcatPathsTest, Path1BeingEmpty) {
+  FilePath actual = FilePath::ConcatPaths(FilePath(""),
+                                          FilePath("bar.xml"));
+  EXPECT_EQ("bar.xml", actual.string());
+}
+
+TEST(ConcatPathsTest, Path2BeingEmpty) {
+  FilePath actual = FilePath::ConcatPaths(FilePath("foo"), FilePath(""));
+  EXPECT_EQ("foo" GTEST_PATH_SEP_, actual.string());
+}
+
+TEST(ConcatPathsTest, BothPathBeingEmpty) {
+  FilePath actual = FilePath::ConcatPaths(FilePath(""),
+                                          FilePath(""));
+  EXPECT_EQ("", actual.string());
+}
+
+TEST(ConcatPathsTest, Path1ContainsPathSep) {
+  FilePath actual = FilePath::ConcatPaths(FilePath("foo" GTEST_PATH_SEP_ "bar"),
+                                          FilePath("foobar.xml"));
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_ "foobar.xml",
+            actual.string());
+}
+
+TEST(ConcatPathsTest, Path2ContainsPathSep) {
+  FilePath actual = FilePath::ConcatPaths(
+      FilePath("foo" GTEST_PATH_SEP_),
+      FilePath("bar" GTEST_PATH_SEP_ "bar.xml"));
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_ "bar.xml",
+            actual.string());
+}
+
+TEST(ConcatPathsTest, Path2EndsWithPathSep) {
+  FilePath actual = FilePath::ConcatPaths(FilePath("foo"),
+                                          FilePath("bar" GTEST_PATH_SEP_));
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_, actual.string());
+}
+
+// RemoveTrailingPathSeparator "" -> ""
+TEST(RemoveTrailingPathSeparatorTest, EmptyString) {
+  EXPECT_EQ("", FilePath("").RemoveTrailingPathSeparator().string());
+}
+
+// RemoveTrailingPathSeparator "foo" -> "foo"
+TEST(RemoveTrailingPathSeparatorTest, FileNoSlashString) {
+  EXPECT_EQ("foo", FilePath("foo").RemoveTrailingPathSeparator().string());
+}
+
+// RemoveTrailingPathSeparator "foo/" -> "foo"
+TEST(RemoveTrailingPathSeparatorTest, ShouldRemoveTrailingSeparator) {
+  EXPECT_EQ("foo",
+      FilePath("foo" GTEST_PATH_SEP_).RemoveTrailingPathSeparator().string());
+#if GTEST_HAS_ALT_PATH_SEP_
+  EXPECT_EQ("foo", FilePath("foo/").RemoveTrailingPathSeparator().string());
+#endif
+}
+
+// RemoveTrailingPathSeparator "foo/bar/" -> "foo/bar/"
+TEST(RemoveTrailingPathSeparatorTest, ShouldRemoveLastSeparator) {
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar",
+            FilePath("foo" GTEST_PATH_SEP_ "bar" GTEST_PATH_SEP_)
+                .RemoveTrailingPathSeparator().string());
+}
+
+// RemoveTrailingPathSeparator "foo/bar" -> "foo/bar"
+TEST(RemoveTrailingPathSeparatorTest, ShouldReturnUnmodified) {
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar",
+            FilePath("foo" GTEST_PATH_SEP_ "bar")
+                .RemoveTrailingPathSeparator().string());
+}
+
+TEST(DirectoryTest, RootDirectoryExists) {
+#if GTEST_OS_WINDOWS  // We are on Windows.
+  char current_drive[_MAX_PATH];  // NOLINT
+  current_drive[0] = static_cast<char>(_getdrive() + 'A' - 1);
+  current_drive[1] = ':';
+  current_drive[2] = '\\';
+  current_drive[3] = '\0';
+  EXPECT_TRUE(FilePath(current_drive).DirectoryExists());
+#else
+  EXPECT_TRUE(FilePath("/").DirectoryExists());
+#endif  // GTEST_OS_WINDOWS
+}
+
+#if GTEST_OS_WINDOWS
+TEST(DirectoryTest, RootOfWrongDriveDoesNotExists) {
+  const int saved_drive_ = _getdrive();
+  // Find a drive that doesn't exist. Start with 'Z' to avoid common ones.
+  for (char drive = 'Z'; drive >= 'A'; drive--)
+    if (_chdrive(drive - 'A' + 1) == -1) {
+      char non_drive[_MAX_PATH];  // NOLINT
+      non_drive[0] = drive;
+      non_drive[1] = ':';
+      non_drive[2] = '\\';
+      non_drive[3] = '\0';
+      EXPECT_FALSE(FilePath(non_drive).DirectoryExists());
+      break;
+    }
+  _chdrive(saved_drive_);
+}
+#endif  // GTEST_OS_WINDOWS
+
+#if !GTEST_OS_WINDOWS_MOBILE
+// Windows CE _does_ consider an empty directory to exist.
+TEST(DirectoryTest, EmptyPathDirectoryDoesNotExist) {
+  EXPECT_FALSE(FilePath("").DirectoryExists());
+}
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
+TEST(DirectoryTest, CurrentDirectoryExists) {
+#if GTEST_OS_WINDOWS  // We are on Windows.
+# ifndef _WIN32_CE  // Windows CE doesn't have a current directory.
+
+  EXPECT_TRUE(FilePath(".").DirectoryExists());
+  EXPECT_TRUE(FilePath(".\\").DirectoryExists());
+
+# endif  // _WIN32_CE
+#else
+  EXPECT_TRUE(FilePath(".").DirectoryExists());
+  EXPECT_TRUE(FilePath("./").DirectoryExists());
+#endif  // GTEST_OS_WINDOWS
+}
+
+// "foo/bar" == foo//bar" == "foo///bar"
+TEST(NormalizeTest, MultipleConsecutiveSepaparatorsInMidstring) {
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar",
+            FilePath("foo" GTEST_PATH_SEP_ "bar").string());
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar",
+            FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string());
+  EXPECT_EQ("foo" GTEST_PATH_SEP_ "bar",
+            FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_
+                     GTEST_PATH_SEP_ "bar").string());
+}
+
+// "/bar" == //bar" == "///bar"
+TEST(NormalizeTest, MultipleConsecutiveSepaparatorsAtStringStart) {
+  EXPECT_EQ(GTEST_PATH_SEP_ "bar",
+    FilePath(GTEST_PATH_SEP_ "bar").string());
+  EXPECT_EQ(GTEST_PATH_SEP_ "bar",
+    FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string());
+  EXPECT_EQ(GTEST_PATH_SEP_ "bar",
+    FilePath(GTEST_PATH_SEP_ GTEST_PATH_SEP_ GTEST_PATH_SEP_ "bar").string());
+}
+
+// "foo/" == foo//" == "foo///"
+TEST(NormalizeTest, MultipleConsecutiveSepaparatorsAtStringEnd) {
+  EXPECT_EQ("foo" GTEST_PATH_SEP_,
+    FilePath("foo" GTEST_PATH_SEP_).string());
+  EXPECT_EQ("foo" GTEST_PATH_SEP_,
+    FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_).string());
+  EXPECT_EQ("foo" GTEST_PATH_SEP_,
+    FilePath("foo" GTEST_PATH_SEP_ GTEST_PATH_SEP_ GTEST_PATH_SEP_).string());
+}
+
+#if GTEST_HAS_ALT_PATH_SEP_
+
+// Tests that separators at the end of the string are normalized
+// regardless of their combination (e.g. "foo\" =="foo/\" ==
+// "foo\\/").
+TEST(NormalizeTest, MixAlternateSeparatorAtStringEnd) {
+  EXPECT_EQ("foo" GTEST_PATH_SEP_,
+            FilePath("foo/").string());
+  EXPECT_EQ("foo" GTEST_PATH_SEP_,
+            FilePath("foo" GTEST_PATH_SEP_ "/").string());
+  EXPECT_EQ("foo" GTEST_PATH_SEP_,
+            FilePath("foo//" GTEST_PATH_SEP_).string());
+}
+
+#endif
+
+TEST(AssignmentOperatorTest, DefaultAssignedToNonDefault) {
+  FilePath default_path;
+  FilePath non_default_path("path");
+  non_default_path = default_path;
+  EXPECT_EQ("", non_default_path.string());
+  EXPECT_EQ("", default_path.string());  // RHS var is unchanged.
+}
+
+TEST(AssignmentOperatorTest, NonDefaultAssignedToDefault) {
+  FilePath non_default_path("path");
+  FilePath default_path;
+  default_path = non_default_path;
+  EXPECT_EQ("path", default_path.string());
+  EXPECT_EQ("path", non_default_path.string());  // RHS var is unchanged.
+}
+
+TEST(AssignmentOperatorTest, ConstAssignedToNonConst) {
+  const FilePath const_default_path("const_path");
+  FilePath non_default_path("path");
+  non_default_path = const_default_path;
+  EXPECT_EQ("const_path", non_default_path.string());
+}
+
+class DirectoryCreationTest : public Test {
+ protected:
+  virtual void SetUp() {
+    testdata_path_.Set(FilePath(
+        TempDir() + GetCurrentExecutableName().string() +
+        "_directory_creation" GTEST_PATH_SEP_ "test" GTEST_PATH_SEP_));
+    testdata_file_.Set(testdata_path_.RemoveTrailingPathSeparator());
+
+    unique_file0_.Set(FilePath::MakeFileName(testdata_path_, FilePath("unique"),
+        0, "txt"));
+    unique_file1_.Set(FilePath::MakeFileName(testdata_path_, FilePath("unique"),
+        1, "txt"));
+
+    remove(testdata_file_.c_str());
+    remove(unique_file0_.c_str());
+    remove(unique_file1_.c_str());
+    posix::RmDir(testdata_path_.c_str());
+  }
+
+  virtual void TearDown() {
+    remove(testdata_file_.c_str());
+    remove(unique_file0_.c_str());
+    remove(unique_file1_.c_str());
+    posix::RmDir(testdata_path_.c_str());
+  }
+
+  void CreateTextFile(const char* filename) {
+    FILE* f = posix::FOpen(filename, "w");
+    fprintf(f, "text\n");
+    fclose(f);
+  }
+
+  // Strings representing a directory and a file, with identical paths
+  // except for the trailing separator character that distinquishes
+  // a directory named 'test' from a file named 'test'. Example names:
+  FilePath testdata_path_;  // "/tmp/directory_creation/test/"
+  FilePath testdata_file_;  // "/tmp/directory_creation/test"
+  FilePath unique_file0_;  // "/tmp/directory_creation/test/unique.txt"
+  FilePath unique_file1_;  // "/tmp/directory_creation/test/unique_1.txt"
+};
+
+TEST_F(DirectoryCreationTest, CreateDirectoriesRecursively) {
+  EXPECT_FALSE(testdata_path_.DirectoryExists()) << testdata_path_.string();
+  EXPECT_TRUE(testdata_path_.CreateDirectoriesRecursively());
+  EXPECT_TRUE(testdata_path_.DirectoryExists());
+}
+
+TEST_F(DirectoryCreationTest, CreateDirectoriesForAlreadyExistingPath) {
+  EXPECT_FALSE(testdata_path_.DirectoryExists()) << testdata_path_.string();
+  EXPECT_TRUE(testdata_path_.CreateDirectoriesRecursively());
+  // Call 'create' again... should still succeed.
+  EXPECT_TRUE(testdata_path_.CreateDirectoriesRecursively());
+}
+
+TEST_F(DirectoryCreationTest, CreateDirectoriesAndUniqueFilename) {
+  FilePath file_path(FilePath::GenerateUniqueFileName(testdata_path_,
+      FilePath("unique"), "txt"));
+  EXPECT_EQ(unique_file0_.string(), file_path.string());
+  EXPECT_FALSE(file_path.FileOrDirectoryExists());  // file not there
+
+  testdata_path_.CreateDirectoriesRecursively();
+  EXPECT_FALSE(file_path.FileOrDirectoryExists());  // file still not there
+  CreateTextFile(file_path.c_str());
+  EXPECT_TRUE(file_path.FileOrDirectoryExists());
+
+  FilePath file_path2(FilePath::GenerateUniqueFileName(testdata_path_,
+      FilePath("unique"), "txt"));
+  EXPECT_EQ(unique_file1_.string(), file_path2.string());
+  EXPECT_FALSE(file_path2.FileOrDirectoryExists());  // file not there
+  CreateTextFile(file_path2.c_str());
+  EXPECT_TRUE(file_path2.FileOrDirectoryExists());
+}
+
+TEST_F(DirectoryCreationTest, CreateDirectoriesFail) {
+  // force a failure by putting a file where we will try to create a directory.
+  CreateTextFile(testdata_file_.c_str());
+  EXPECT_TRUE(testdata_file_.FileOrDirectoryExists());
+  EXPECT_FALSE(testdata_file_.DirectoryExists());
+  EXPECT_FALSE(testdata_file_.CreateDirectoriesRecursively());
+}
+
+TEST(NoDirectoryCreationTest, CreateNoDirectoriesForDefaultXmlFile) {
+  const FilePath test_detail_xml("test_detail.xml");
+  EXPECT_FALSE(test_detail_xml.CreateDirectoriesRecursively());
+}
+
+TEST(FilePathTest, DefaultConstructor) {
+  FilePath fp;
+  EXPECT_EQ("", fp.string());
+}
+
+TEST(FilePathTest, CharAndCopyConstructors) {
+  const FilePath fp("spicy");
+  EXPECT_EQ("spicy", fp.string());
+
+  const FilePath fp_copy(fp);
+  EXPECT_EQ("spicy", fp_copy.string());
+}
+
+TEST(FilePathTest, StringConstructor) {
+  const FilePath fp(std::string("cider"));
+  EXPECT_EQ("cider", fp.string());
+}
+
+TEST(FilePathTest, Set) {
+  const FilePath apple("apple");
+  FilePath mac("mac");
+  mac.Set(apple);  // Implement Set() since overloading operator= is forbidden.
+  EXPECT_EQ("apple", mac.string());
+  EXPECT_EQ("apple", apple.string());
+}
+
+TEST(FilePathTest, ToString) {
+  const FilePath file("drink");
+  EXPECT_EQ("drink", file.string());
+}
+
+TEST(FilePathTest, RemoveExtension) {
+  EXPECT_EQ("app", FilePath("app.cc").RemoveExtension("cc").string());
+  EXPECT_EQ("app", FilePath("app.exe").RemoveExtension("exe").string());
+  EXPECT_EQ("APP", FilePath("APP.EXE").RemoveExtension("exe").string());
+}
+
+TEST(FilePathTest, RemoveExtensionWhenThereIsNoExtension) {
+  EXPECT_EQ("app", FilePath("app").RemoveExtension("exe").string());
+}
+
+TEST(FilePathTest, IsDirectory) {
+  EXPECT_FALSE(FilePath("cola").IsDirectory());
+  EXPECT_TRUE(FilePath("koala" GTEST_PATH_SEP_).IsDirectory());
+#if GTEST_HAS_ALT_PATH_SEP_
+  EXPECT_TRUE(FilePath("koala/").IsDirectory());
+#endif
+}
+
+TEST(FilePathTest, IsAbsolutePath) {
+  EXPECT_FALSE(FilePath("is" GTEST_PATH_SEP_ "relative").IsAbsolutePath());
+  EXPECT_FALSE(FilePath("").IsAbsolutePath());
+#if GTEST_OS_WINDOWS
+  EXPECT_TRUE(FilePath("c:\\" GTEST_PATH_SEP_ "is_not"
+                       GTEST_PATH_SEP_ "relative").IsAbsolutePath());
+  EXPECT_FALSE(FilePath("c:foo" GTEST_PATH_SEP_ "bar").IsAbsolutePath());
+  EXPECT_TRUE(FilePath("c:/" GTEST_PATH_SEP_ "is_not"
+                       GTEST_PATH_SEP_ "relative").IsAbsolutePath());
+#else
+  EXPECT_TRUE(FilePath(GTEST_PATH_SEP_ "is_not" GTEST_PATH_SEP_ "relative")
+              .IsAbsolutePath());
+#endif  // GTEST_OS_WINDOWS
+}
+
+TEST(FilePathTest, IsRootDirectory) {
+#if GTEST_OS_WINDOWS
+  EXPECT_TRUE(FilePath("a:\\").IsRootDirectory());
+  EXPECT_TRUE(FilePath("Z:/").IsRootDirectory());
+  EXPECT_TRUE(FilePath("e://").IsRootDirectory());
+  EXPECT_FALSE(FilePath("").IsRootDirectory());
+  EXPECT_FALSE(FilePath("b:").IsRootDirectory());
+  EXPECT_FALSE(FilePath("b:a").IsRootDirectory());
+  EXPECT_FALSE(FilePath("8:/").IsRootDirectory());
+  EXPECT_FALSE(FilePath("c|/").IsRootDirectory());
+#else
+  EXPECT_TRUE(FilePath("/").IsRootDirectory());
+  EXPECT_TRUE(FilePath("//").IsRootDirectory());
+  EXPECT_FALSE(FilePath("").IsRootDirectory());
+  EXPECT_FALSE(FilePath("\\").IsRootDirectory());
+  EXPECT_FALSE(FilePath("/x").IsRootDirectory());
+#endif
+}
+
+}  // namespace
+}  // namespace internal
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-linked_ptr_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-linked_ptr_test.cc
new file mode 100644
index 0000000000..6fcf5124a8
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-linked_ptr_test.cc
@@ -0,0 +1,154 @@
+// Copyright 2003, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: Dan Egnor (egnor@google.com)
+// Ported to Windows: Vadim Berman (vadimb@google.com)
+
+#include "gtest/internal/gtest-linked_ptr.h"
+
+#include <stdlib.h>
+#include "gtest/gtest.h"
+
+namespace {
+
+using testing::Message;
+using testing::internal::linked_ptr;
+
+int num;
+Message* history = NULL;
+
+// Class which tracks allocation/deallocation
+class A {
+ public:
+  A(): mynum(num++) { *history << "A" << mynum << " ctor\n"; }
+  virtual ~A() { *history << "A" << mynum << " dtor\n"; }
+  virtual void Use() { *history << "A" << mynum << " use\n"; }
+ protected:
+  int mynum;
+};
+
+// Subclass
+class B : public A {
+ public:
+  B() { *history << "B" << mynum << " ctor\n"; }
+  ~B() { *history << "B" << mynum << " dtor\n"; }
+  virtual void Use() { *history << "B" << mynum << " use\n"; }
+};
+
+class LinkedPtrTest : public testing::Test {
+ public:
+  LinkedPtrTest() {
+    num = 0;
+    history = new Message;
+  }
+
+  virtual ~LinkedPtrTest() {
+    delete history;
+    history = NULL;
+  }
+};
+
+TEST_F(LinkedPtrTest, GeneralTest) {
+  {
+    linked_ptr<A> a0, a1, a2;
+    // Use explicit function call notation here to suppress self-assign warning.
+    a0.operator=(a0);
+    a1 = a2;
+    ASSERT_EQ(a0.get(), static_cast<A*>(NULL));
+    ASSERT_EQ(a1.get(), static_cast<A*>(NULL));
+    ASSERT_EQ(a2.get(), static_cast<A*>(NULL));
+    ASSERT_TRUE(a0 == NULL);
+    ASSERT_TRUE(a1 == NULL);
+    ASSERT_TRUE(a2 == NULL);
+
+    {
+      linked_ptr<A> a3(new A);
+      a0 = a3;
+      ASSERT_TRUE(a0 == a3);
+      ASSERT_TRUE(a0 != NULL);
+      ASSERT_TRUE(a0.get() == a3);
+      ASSERT_TRUE(a0 == a3.get());
+      linked_ptr<A> a4(a0);
+      a1 = a4;
+      linked_ptr<A> a5(new A);
+      ASSERT_TRUE(a5.get() != a3);
+      ASSERT_TRUE(a5 != a3.get());
+      a2 = a5;
+      linked_ptr<B> b0(new B);
+      linked_ptr<A> a6(b0);
+      ASSERT_TRUE(b0 == a6);
+      ASSERT_TRUE(a6 == b0);
+      ASSERT_TRUE(b0 != NULL);
+      a5 = b0;
+      a5 = b0;
+      a3->Use();
+      a4->Use();
+      a5->Use();
+      a6->Use();
+      b0->Use();
+      (*b0).Use();
+      b0.get()->Use();
+    }
+
+    a0->Use();
+    a1->Use();
+    a2->Use();
+
+    a1 = a2;
+    a2.reset(new A);
+    a0.reset();
+
+    linked_ptr<A> a7;
+  }
+
+  ASSERT_STREQ(
+    "A0 ctor\n"
+    "A1 ctor\n"
+    "A2 ctor\n"
+    "B2 ctor\n"
+    "A0 use\n"
+    "A0 use\n"
+    "B2 use\n"
+    "B2 use\n"
+    "B2 use\n"
+    "B2 use\n"
+    "B2 use\n"
+    "B2 dtor\n"
+    "A2 dtor\n"
+    "A0 use\n"
+    "A0 use\n"
+    "A1 use\n"
+    "A3 ctor\n"
+    "A0 dtor\n"
+    "A3 dtor\n"
+    "A1 dtor\n",
+    history->GetString().c_str());
+}
+
+}  // Unnamed namespace
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-listener_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-listener_test.cc
new file mode 100644
index 0000000000..90747685f0
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-listener_test.cc
@@ -0,0 +1,311 @@
+// Copyright 2009 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This file verifies Google Test event listeners receive events at the
+// right times.
+
+#include "gtest/gtest.h"
+#include <vector>
+
+using ::testing::AddGlobalTestEnvironment;
+using ::testing::Environment;
+using ::testing::InitGoogleTest;
+using ::testing::Test;
+using ::testing::TestCase;
+using ::testing::TestEventListener;
+using ::testing::TestInfo;
+using ::testing::TestPartResult;
+using ::testing::UnitTest;
+
+// Used by tests to register their events.
+std::vector<std::string>* g_events = NULL;
+
+namespace testing {
+namespace internal {
+
+class EventRecordingListener : public TestEventListener {
+ public:
+  explicit EventRecordingListener(const char* name) : name_(name) {}
+
+ protected:
+  virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {
+    g_events->push_back(GetFullMethodName("OnTestProgramStart"));
+  }
+
+  virtual void OnTestIterationStart(const UnitTest& /*unit_test*/,
+                                    int iteration) {
+    Message message;
+    message << GetFullMethodName("OnTestIterationStart")
+            << "(" << iteration << ")";
+    g_events->push_back(message.GetString());
+  }
+
+  virtual void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) {
+    g_events->push_back(GetFullMethodName("OnEnvironmentsSetUpStart"));
+  }
+
+  virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {
+    g_events->push_back(GetFullMethodName("OnEnvironmentsSetUpEnd"));
+  }
+
+  virtual void OnTestCaseStart(const TestCase& /*test_case*/) {
+    g_events->push_back(GetFullMethodName("OnTestCaseStart"));
+  }
+
+  virtual void OnTestStart(const TestInfo& /*test_info*/) {
+    g_events->push_back(GetFullMethodName("OnTestStart"));
+  }
+
+  virtual void OnTestPartResult(const TestPartResult& /*test_part_result*/) {
+    g_events->push_back(GetFullMethodName("OnTestPartResult"));
+  }
+
+  virtual void OnTestEnd(const TestInfo& /*test_info*/) {
+    g_events->push_back(GetFullMethodName("OnTestEnd"));
+  }
+
+  virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {
+    g_events->push_back(GetFullMethodName("OnTestCaseEnd"));
+  }
+
+  virtual void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) {
+    g_events->push_back(GetFullMethodName("OnEnvironmentsTearDownStart"));
+  }
+
+  virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {
+    g_events->push_back(GetFullMethodName("OnEnvironmentsTearDownEnd"));
+  }
+
+  virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/,
+                                  int iteration) {
+    Message message;
+    message << GetFullMethodName("OnTestIterationEnd")
+            << "("  << iteration << ")";
+    g_events->push_back(message.GetString());
+  }
+
+  virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {
+    g_events->push_back(GetFullMethodName("OnTestProgramEnd"));
+  }
+
+ private:
+  std::string GetFullMethodName(const char* name) {
+    return name_ + "." + name;
+  }
+
+  std::string name_;
+};
+
+class EnvironmentInvocationCatcher : public Environment {
+ protected:
+  virtual void SetUp() {
+    g_events->push_back("Environment::SetUp");
+  }
+
+  virtual void TearDown() {
+    g_events->push_back("Environment::TearDown");
+  }
+};
+
+class ListenerTest : public Test {
+ protected:
+  static void SetUpTestCase() {
+    g_events->push_back("ListenerTest::SetUpTestCase");
+  }
+
+  static void TearDownTestCase() {
+    g_events->push_back("ListenerTest::TearDownTestCase");
+  }
+
+  virtual void SetUp() {
+    g_events->push_back("ListenerTest::SetUp");
+  }
+
+  virtual void TearDown() {
+    g_events->push_back("ListenerTest::TearDown");
+  }
+};
+
+TEST_F(ListenerTest, DoesFoo) {
+  // Test execution order within a test case is not guaranteed so we are not
+  // recording the test name.
+  g_events->push_back("ListenerTest::* Test Body");
+  SUCCEED();  // Triggers OnTestPartResult.
+}
+
+TEST_F(ListenerTest, DoesBar) {
+  g_events->push_back("ListenerTest::* Test Body");
+  SUCCEED();  // Triggers OnTestPartResult.
+}
+
+}  // namespace internal
+
+}  // namespace testing
+
+using ::testing::internal::EnvironmentInvocationCatcher;
+using ::testing::internal::EventRecordingListener;
+
+void VerifyResults(const std::vector<std::string>& data,
+                   const char* const* expected_data,
+                   size_t expected_data_size) {
+  const size_t actual_size = data.size();
+  // If the following assertion fails, a new entry will be appended to
+  // data.  Hence we save data.size() first.
+  EXPECT_EQ(expected_data_size, actual_size);
+
+  // Compares the common prefix.
+  const size_t shorter_size = expected_data_size <= actual_size ?
+      expected_data_size : actual_size;
+  size_t i = 0;
+  for (; i < shorter_size; ++i) {
+    ASSERT_STREQ(expected_data[i], data[i].c_str())
+        << "at position " << i;
+  }
+
+  // Prints extra elements in the actual data.
+  for (; i < actual_size; ++i) {
+    printf("  Actual event #%lu: %s\n",
+        static_cast<unsigned long>(i), data[i].c_str());
+  }
+}
+
+int main(int argc, char **argv) {
+  std::vector<std::string> events;
+  g_events = &events;
+  InitGoogleTest(&argc, argv);
+
+  UnitTest::GetInstance()->listeners().Append(
+      new EventRecordingListener("1st"));
+  UnitTest::GetInstance()->listeners().Append(
+      new EventRecordingListener("2nd"));
+
+  AddGlobalTestEnvironment(new EnvironmentInvocationCatcher);
+
+  GTEST_CHECK_(events.size() == 0)
+      << "AddGlobalTestEnvironment should not generate any events itself.";
+
+  ::testing::GTEST_FLAG(repeat) = 2;
+  int ret_val = RUN_ALL_TESTS();
+
+  const char* const expected_events[] = {
+    "1st.OnTestProgramStart",
+    "2nd.OnTestProgramStart",
+    "1st.OnTestIterationStart(0)",
+    "2nd.OnTestIterationStart(0)",
+    "1st.OnEnvironmentsSetUpStart",
+    "2nd.OnEnvironmentsSetUpStart",
+    "Environment::SetUp",
+    "2nd.OnEnvironmentsSetUpEnd",
+    "1st.OnEnvironmentsSetUpEnd",
+    "1st.OnTestCaseStart",
+    "2nd.OnTestCaseStart",
+    "ListenerTest::SetUpTestCase",
+    "1st.OnTestStart",
+    "2nd.OnTestStart",
+    "ListenerTest::SetUp",
+    "ListenerTest::* Test Body",
+    "1st.OnTestPartResult",
+    "2nd.OnTestPartResult",
+    "ListenerTest::TearDown",
+    "2nd.OnTestEnd",
+    "1st.OnTestEnd",
+    "1st.OnTestStart",
+    "2nd.OnTestStart",
+    "ListenerTest::SetUp",
+    "ListenerTest::* Test Body",
+    "1st.OnTestPartResult",
+    "2nd.OnTestPartResult",
+    "ListenerTest::TearDown",
+    "2nd.OnTestEnd",
+    "1st.OnTestEnd",
+    "ListenerTest::TearDownTestCase",
+    "2nd.OnTestCaseEnd",
+    "1st.OnTestCaseEnd",
+    "1st.OnEnvironmentsTearDownStart",
+    "2nd.OnEnvironmentsTearDownStart",
+    "Environment::TearDown",
+    "2nd.OnEnvironmentsTearDownEnd",
+    "1st.OnEnvironmentsTearDownEnd",
+    "2nd.OnTestIterationEnd(0)",
+    "1st.OnTestIterationEnd(0)",
+    "1st.OnTestIterationStart(1)",
+    "2nd.OnTestIterationStart(1)",
+    "1st.OnEnvironmentsSetUpStart",
+    "2nd.OnEnvironmentsSetUpStart",
+    "Environment::SetUp",
+    "2nd.OnEnvironmentsSetUpEnd",
+    "1st.OnEnvironmentsSetUpEnd",
+    "1st.OnTestCaseStart",
+    "2nd.OnTestCaseStart",
+    "ListenerTest::SetUpTestCase",
+    "1st.OnTestStart",
+    "2nd.OnTestStart",
+    "ListenerTest::SetUp",
+    "ListenerTest::* Test Body",
+    "1st.OnTestPartResult",
+    "2nd.OnTestPartResult",
+    "ListenerTest::TearDown",
+    "2nd.OnTestEnd",
+    "1st.OnTestEnd",
+    "1st.OnTestStart",
+    "2nd.OnTestStart",
+    "ListenerTest::SetUp",
+    "ListenerTest::* Test Body",
+    "1st.OnTestPartResult",
+    "2nd.OnTestPartResult",
+    "ListenerTest::TearDown",
+    "2nd.OnTestEnd",
+    "1st.OnTestEnd",
+    "ListenerTest::TearDownTestCase",
+    "2nd.OnTestCaseEnd",
+    "1st.OnTestCaseEnd",
+    "1st.OnEnvironmentsTearDownStart",
+    "2nd.OnEnvironmentsTearDownStart",
+    "Environment::TearDown",
+    "2nd.OnEnvironmentsTearDownEnd",
+    "1st.OnEnvironmentsTearDownEnd",
+    "2nd.OnTestIterationEnd(1)",
+    "1st.OnTestIterationEnd(1)",
+    "2nd.OnTestProgramEnd",
+    "1st.OnTestProgramEnd"
+  };
+  VerifyResults(events,
+                expected_events,
+                sizeof(expected_events)/sizeof(expected_events[0]));
+
+  // We need to check manually for ad hoc test failures that happen after
+  // RUN_ALL_TESTS finishes.
+  if (UnitTest::GetInstance()->Failed())
+    ret_val = 1;
+
+  return ret_val;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-message_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-message_test.cc
new file mode 100644
index 0000000000..175238ef4e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-message_test.cc
@@ -0,0 +1,159 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Tests for the Message class.
+
+#include "gtest/gtest-message.h"
+
+#include "gtest/gtest.h"
+
+namespace {
+
+using ::testing::Message;
+
+// Tests the testing::Message class
+
+// Tests the default constructor.
+TEST(MessageTest, DefaultConstructor) {
+  const Message msg;
+  EXPECT_EQ("", msg.GetString());
+}
+
+// Tests the copy constructor.
+TEST(MessageTest, CopyConstructor) {
+  const Message msg1("Hello");
+  const Message msg2(msg1);
+  EXPECT_EQ("Hello", msg2.GetString());
+}
+
+// Tests constructing a Message from a C-string.
+TEST(MessageTest, ConstructsFromCString) {
+  Message msg("Hello");
+  EXPECT_EQ("Hello", msg.GetString());
+}
+
+// Tests streaming a float.
+TEST(MessageTest, StreamsFloat) {
+  const std::string s = (Message() << 1.23456F << " " << 2.34567F).GetString();
+  // Both numbers should be printed with enough precision.
+  EXPECT_PRED_FORMAT2(testing::IsSubstring, "1.234560", s.c_str());
+  EXPECT_PRED_FORMAT2(testing::IsSubstring, " 2.345669", s.c_str());
+}
+
+// Tests streaming a double.
+TEST(MessageTest, StreamsDouble) {
+  const std::string s = (Message() << 1260570880.4555497 << " "
+                                  << 1260572265.1954534).GetString();
+  // Both numbers should be printed with enough precision.
+  EXPECT_PRED_FORMAT2(testing::IsSubstring, "1260570880.45", s.c_str());
+  EXPECT_PRED_FORMAT2(testing::IsSubstring, " 1260572265.19", s.c_str());
+}
+
+// Tests streaming a non-char pointer.
+TEST(MessageTest, StreamsPointer) {
+  int n = 0;
+  int* p = &n;
+  EXPECT_NE("(null)", (Message() << p).GetString());
+}
+
+// Tests streaming a NULL non-char pointer.
+TEST(MessageTest, StreamsNullPointer) {
+  int* p = NULL;
+  EXPECT_EQ("(null)", (Message() << p).GetString());
+}
+
+// Tests streaming a C string.
+TEST(MessageTest, StreamsCString) {
+  EXPECT_EQ("Foo", (Message() << "Foo").GetString());
+}
+
+// Tests streaming a NULL C string.
+TEST(MessageTest, StreamsNullCString) {
+  char* p = NULL;
+  EXPECT_EQ("(null)", (Message() << p).GetString());
+}
+
+// Tests streaming std::string.
+TEST(MessageTest, StreamsString) {
+  const ::std::string str("Hello");
+  EXPECT_EQ("Hello", (Message() << str).GetString());
+}
+
+// Tests that we can output strings containing embedded NULs.
+TEST(MessageTest, StreamsStringWithEmbeddedNUL) {
+  const char char_array_with_nul[] =
+      "Here's a NUL\0 and some more string";
+  const ::std::string string_with_nul(char_array_with_nul,
+                                      sizeof(char_array_with_nul) - 1);
+  EXPECT_EQ("Here's a NUL\\0 and some more string",
+            (Message() << string_with_nul).GetString());
+}
+
+// Tests streaming a NUL char.
+TEST(MessageTest, StreamsNULChar) {
+  EXPECT_EQ("\\0", (Message() << '\0').GetString());
+}
+
+// Tests streaming int.
+TEST(MessageTest, StreamsInt) {
+  EXPECT_EQ("123", (Message() << 123).GetString());
+}
+
+// Tests that basic IO manipulators (endl, ends, and flush) can be
+// streamed to Message.
+TEST(MessageTest, StreamsBasicIoManip) {
+  EXPECT_EQ("Line 1.\nA NUL char \\0 in line 2.",
+               (Message() << "Line 1." << std::endl
+                         << "A NUL char " << std::ends << std::flush
+                         << " in line 2.").GetString());
+}
+
+// Tests Message::GetString()
+TEST(MessageTest, GetString) {
+  Message msg;
+  msg << 1 << " lamb";
+  EXPECT_EQ("1 lamb", msg.GetString());
+}
+
+// Tests streaming a Message object to an ostream.
+TEST(MessageTest, StreamsToOStream) {
+  Message msg("Hello");
+  ::std::stringstream ss;
+  ss << msg;
+  EXPECT_EQ("Hello", testing::internal::StringStreamToString(&ss));
+}
+
+// Tests that a Message object doesn't take up too much stack space.
+TEST(MessageTest, DoesNotTakeUpMuchStackSpace) {
+  EXPECT_LE(sizeof(Message), 16U);
+}
+
+}  // namespace
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-options_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-options_test.cc
new file mode 100644
index 0000000000..5586dc3b1b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-options_test.cc
@@ -0,0 +1,215 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: keith.ray@gmail.com (Keith Ray)
+//
+// Google Test UnitTestOptions tests
+//
+// This file tests classes and functions used internally by
+// Google Test.  They are subject to change without notice.
+//
+// This file is #included from gtest.cc, to avoid changing build or
+// make-files on Windows and other platforms. Do not #include this file
+// anywhere else!
+
+#include "gtest/gtest.h"
+
+#if GTEST_OS_WINDOWS_MOBILE
+# include <windows.h>
+#elif GTEST_OS_WINDOWS
+# include <direct.h>
+#endif  // GTEST_OS_WINDOWS_MOBILE
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+namespace testing {
+namespace internal {
+namespace {
+
+// Turns the given relative path into an absolute path.
+FilePath GetAbsolutePathOf(const FilePath& relative_path) {
+  return FilePath::ConcatPaths(FilePath::GetCurrentDir(), relative_path);
+}
+
+// Testing UnitTestOptions::GetOutputFormat/GetOutputFile.
+
+TEST(XmlOutputTest, GetOutputFormatDefault) {
+  GTEST_FLAG(output) = "";
+  EXPECT_STREQ("", UnitTestOptions::GetOutputFormat().c_str());
+}
+
+TEST(XmlOutputTest, GetOutputFormat) {
+  GTEST_FLAG(output) = "xml:filename";
+  EXPECT_STREQ("xml", UnitTestOptions::GetOutputFormat().c_str());
+}
+
+TEST(XmlOutputTest, GetOutputFileDefault) {
+  GTEST_FLAG(output) = "";
+  EXPECT_EQ(GetAbsolutePathOf(FilePath("test_detail.xml")).string(),
+            UnitTestOptions::GetAbsolutePathToOutputFile());
+}
+
+TEST(XmlOutputTest, GetOutputFileSingleFile) {
+  GTEST_FLAG(output) = "xml:filename.abc";
+  EXPECT_EQ(GetAbsolutePathOf(FilePath("filename.abc")).string(),
+            UnitTestOptions::GetAbsolutePathToOutputFile());
+}
+
+TEST(XmlOutputTest, GetOutputFileFromDirectoryPath) {
+  GTEST_FLAG(output) = "xml:path" GTEST_PATH_SEP_;
+  const std::string expected_output_file =
+      GetAbsolutePathOf(
+          FilePath(std::string("path") + GTEST_PATH_SEP_ +
+                   GetCurrentExecutableName().string() + ".xml")).string();
+  const std::string& output_file =
+      UnitTestOptions::GetAbsolutePathToOutputFile();
+#if GTEST_OS_WINDOWS
+  EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str());
+#else
+  EXPECT_EQ(expected_output_file, output_file.c_str());
+#endif
+}
+
+TEST(OutputFileHelpersTest, GetCurrentExecutableName) {
+  const std::string exe_str = GetCurrentExecutableName().string();
+#if GTEST_OS_WINDOWS
+  const bool success =
+      _strcmpi("gtest-options_test", exe_str.c_str()) == 0 ||
+      _strcmpi("gtest-options-ex_test", exe_str.c_str()) == 0 ||
+      _strcmpi("gtest_all_test", exe_str.c_str()) == 0 ||
+      _strcmpi("gtest_dll_test", exe_str.c_str()) == 0;
+#else
+  // TODO(wan@google.com): remove the hard-coded "lt-" prefix when
+  //   Chandler Carruth's libtool replacement is ready.
+  const bool success =
+      exe_str == "gtest-options_test" ||
+      exe_str == "gtest_all_test" ||
+      exe_str == "lt-gtest_all_test" ||
+      exe_str == "gtest_dll_test";
+#endif  // GTEST_OS_WINDOWS
+  if (!success)
+    FAIL() << "GetCurrentExecutableName() returns " << exe_str;
+}
+
+class XmlOutputChangeDirTest : public Test {
+ protected:
+  virtual void SetUp() {
+    original_working_dir_ = FilePath::GetCurrentDir();
+    posix::ChDir("..");
+    // This will make the test fail if run from the root directory.
+    EXPECT_NE(original_working_dir_.string(),
+              FilePath::GetCurrentDir().string());
+  }
+
+  virtual void TearDown() {
+    posix::ChDir(original_working_dir_.string().c_str());
+  }
+
+  FilePath original_working_dir_;
+};
+
+TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithDefault) {
+  GTEST_FLAG(output) = "";
+  EXPECT_EQ(FilePath::ConcatPaths(original_working_dir_,
+                                  FilePath("test_detail.xml")).string(),
+            UnitTestOptions::GetAbsolutePathToOutputFile());
+}
+
+TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithDefaultXML) {
+  GTEST_FLAG(output) = "xml";
+  EXPECT_EQ(FilePath::ConcatPaths(original_working_dir_,
+                                  FilePath("test_detail.xml")).string(),
+            UnitTestOptions::GetAbsolutePathToOutputFile());
+}
+
+TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativeFile) {
+  GTEST_FLAG(output) = "xml:filename.abc";
+  EXPECT_EQ(FilePath::ConcatPaths(original_working_dir_,
+                                  FilePath("filename.abc")).string(),
+            UnitTestOptions::GetAbsolutePathToOutputFile());
+}
+
+TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithRelativePath) {
+  GTEST_FLAG(output) = "xml:path" GTEST_PATH_SEP_;
+  const std::string expected_output_file =
+      FilePath::ConcatPaths(
+          original_working_dir_,
+          FilePath(std::string("path") + GTEST_PATH_SEP_ +
+                   GetCurrentExecutableName().string() + ".xml")).string();
+  const std::string& output_file =
+      UnitTestOptions::GetAbsolutePathToOutputFile();
+#if GTEST_OS_WINDOWS
+  EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str());
+#else
+  EXPECT_EQ(expected_output_file, output_file.c_str());
+#endif
+}
+
+TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithAbsoluteFile) {
+#if GTEST_OS_WINDOWS
+  GTEST_FLAG(output) = "xml:c:\\tmp\\filename.abc";
+  EXPECT_EQ(FilePath("c:\\tmp\\filename.abc").string(),
+            UnitTestOptions::GetAbsolutePathToOutputFile());
+#else
+  GTEST_FLAG(output) ="xml:/tmp/filename.abc";
+  EXPECT_EQ(FilePath("/tmp/filename.abc").string(),
+            UnitTestOptions::GetAbsolutePathToOutputFile());
+#endif
+}
+
+TEST_F(XmlOutputChangeDirTest, PreserveOriginalWorkingDirWithAbsolutePath) {
+#if GTEST_OS_WINDOWS
+  const std::string path = "c:\\tmp\\";
+#else
+  const std::string path = "/tmp/";
+#endif
+
+  GTEST_FLAG(output) = "xml:" + path;
+  const std::string expected_output_file =
+      path + GetCurrentExecutableName().string() + ".xml";
+  const std::string& output_file =
+      UnitTestOptions::GetAbsolutePathToOutputFile();
+
+#if GTEST_OS_WINDOWS
+  EXPECT_STRCASEEQ(expected_output_file.c_str(), output_file.c_str());
+#else
+  EXPECT_EQ(expected_output_file, output_file.c_str());
+#endif
+}
+
+}  // namespace
+}  // namespace internal
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-param-test2_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-param-test2_test.cc
new file mode 100644
index 0000000000..4a782fe708
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-param-test2_test.cc
@@ -0,0 +1,65 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+//
+// Tests for Google Test itself.  This verifies that the basic constructs of
+// Google Test work.
+
+#include "gtest/gtest.h"
+
+#include "test/gtest-param-test_test.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+using ::testing::Values;
+using ::testing::internal::ParamGenerator;
+
+// Tests that generators defined in a different translation unit
+// are functional. The test using extern_gen is defined
+// in gtest-param-test_test.cc.
+ParamGenerator<int> extern_gen = Values(33);
+
+// Tests that a parameterized test case can be defined in one translation unit
+// and instantiated in another. The test is defined in gtest-param-test_test.cc
+// and ExternalInstantiationTest fixture class is defined in
+// gtest-param-test_test.h.
+INSTANTIATE_TEST_CASE_P(MultiplesOf33,
+                        ExternalInstantiationTest,
+                        Values(33, 66));
+
+// Tests that a parameterized test case can be instantiated
+// in multiple translation units. Another instantiation is defined
+// in gtest-param-test_test.cc and InstantiationInMultipleTranslaionUnitsTest
+// fixture is defined in gtest-param-test_test.h
+INSTANTIATE_TEST_CASE_P(Sequence2,
+                        InstantiationInMultipleTranslaionUnitsTest,
+                        Values(42*3, 42*4, 42*5));
+
+#endif  // GTEST_HAS_PARAM_TEST
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-param-test_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-param-test_test.cc
new file mode 100644
index 0000000000..8b278bb94b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-param-test_test.cc
@@ -0,0 +1,1055 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+//
+// Tests for Google Test itself. This file verifies that the parameter
+// generators objects produce correct parameter sequences and that
+// Google Test runtime instantiates correct tests from those sequences.
+
+#include "gtest/gtest.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+# include <algorithm>
+# include <iostream>
+# include <list>
+# include <sstream>
+# include <string>
+# include <vector>
+
+// To include gtest-internal-inl.h.
+# define GTEST_IMPLEMENTATION_ 1
+# include "src/gtest-internal-inl.h"  // for UnitTestOptions
+# undef GTEST_IMPLEMENTATION_
+
+# include "test/gtest-param-test_test.h"
+
+using ::std::vector;
+using ::std::sort;
+
+using ::testing::AddGlobalTestEnvironment;
+using ::testing::Bool;
+using ::testing::Message;
+using ::testing::Range;
+using ::testing::TestWithParam;
+using ::testing::Values;
+using ::testing::ValuesIn;
+
+# if GTEST_HAS_COMBINE
+using ::testing::Combine;
+using ::testing::get;
+using ::testing::make_tuple;
+using ::testing::tuple;
+# endif  // GTEST_HAS_COMBINE
+
+using ::testing::internal::ParamGenerator;
+using ::testing::internal::UnitTestOptions;
+
+// Prints a value to a string.
+//
+// TODO(wan@google.com): remove PrintValue() when we move matchers and
+// EXPECT_THAT() from Google Mock to Google Test.  At that time, we
+// can write EXPECT_THAT(x, Eq(y)) to compare two tuples x and y, as
+// EXPECT_THAT() and the matchers know how to print tuples.
+template <typename T>
+::std::string PrintValue(const T& value) {
+  ::std::stringstream stream;
+  stream << value;
+  return stream.str();
+}
+
+# if GTEST_HAS_COMBINE
+
+// These overloads allow printing tuples in our tests.  We cannot
+// define an operator<< for tuples, as that definition needs to be in
+// the std namespace in order to be picked up by Google Test via
+// Argument-Dependent Lookup, yet defining anything in the std
+// namespace in non-STL code is undefined behavior.
+
+template <typename T1, typename T2>
+::std::string PrintValue(const tuple<T1, T2>& value) {
+  ::std::stringstream stream;
+  stream << "(" << get<0>(value) << ", " << get<1>(value) << ")";
+  return stream.str();
+}
+
+template <typename T1, typename T2, typename T3>
+::std::string PrintValue(const tuple<T1, T2, T3>& value) {
+  ::std::stringstream stream;
+  stream << "(" << get<0>(value) << ", " << get<1>(value)
+         << ", "<< get<2>(value) << ")";
+  return stream.str();
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7, typename T8, typename T9, typename T10>
+::std::string PrintValue(
+    const tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>& value) {
+  ::std::stringstream stream;
+  stream << "(" << get<0>(value) << ", " << get<1>(value)
+         << ", "<< get<2>(value) << ", " << get<3>(value)
+         << ", "<< get<4>(value) << ", " << get<5>(value)
+         << ", "<< get<6>(value) << ", " << get<7>(value)
+         << ", "<< get<8>(value) << ", " << get<9>(value) << ")";
+  return stream.str();
+}
+
+# endif  // GTEST_HAS_COMBINE
+
+// Verifies that a sequence generated by the generator and accessed
+// via the iterator object matches the expected one using Google Test
+// assertions.
+template <typename T, size_t N>
+void VerifyGenerator(const ParamGenerator<T>& generator,
+                     const T (&expected_values)[N]) {
+  typename ParamGenerator<T>::iterator it = generator.begin();
+  for (size_t i = 0; i < N; ++i) {
+    ASSERT_FALSE(it == generator.end())
+        << "At element " << i << " when accessing via an iterator "
+        << "created with the copy constructor.\n";
+    // We cannot use EXPECT_EQ() here as the values may be tuples,
+    // which don't support <<.
+    EXPECT_TRUE(expected_values[i] == *it)
+        << "where i is " << i
+        << ", expected_values[i] is " << PrintValue(expected_values[i])
+        << ", *it is " << PrintValue(*it)
+        << ", and 'it' is an iterator created with the copy constructor.\n";
+    it++;
+  }
+  EXPECT_TRUE(it == generator.end())
+        << "At the presumed end of sequence when accessing via an iterator "
+        << "created with the copy constructor.\n";
+
+  // Test the iterator assignment. The following lines verify that
+  // the sequence accessed via an iterator initialized via the
+  // assignment operator (as opposed to a copy constructor) matches
+  // just the same.
+  it = generator.begin();
+  for (size_t i = 0; i < N; ++i) {
+    ASSERT_FALSE(it == generator.end())
+        << "At element " << i << " when accessing via an iterator "
+        << "created with the assignment operator.\n";
+    EXPECT_TRUE(expected_values[i] == *it)
+        << "where i is " << i
+        << ", expected_values[i] is " << PrintValue(expected_values[i])
+        << ", *it is " << PrintValue(*it)
+        << ", and 'it' is an iterator created with the copy constructor.\n";
+    it++;
+  }
+  EXPECT_TRUE(it == generator.end())
+        << "At the presumed end of sequence when accessing via an iterator "
+        << "created with the assignment operator.\n";
+}
+
+template <typename T>
+void VerifyGeneratorIsEmpty(const ParamGenerator<T>& generator) {
+  typename ParamGenerator<T>::iterator it = generator.begin();
+  EXPECT_TRUE(it == generator.end());
+
+  it = generator.begin();
+  EXPECT_TRUE(it == generator.end());
+}
+
+// Generator tests. They test that each of the provided generator functions
+// generates an expected sequence of values. The general test pattern
+// instantiates a generator using one of the generator functions,
+// checks the sequence produced by the generator using its iterator API,
+// and then resets the iterator back to the beginning of the sequence
+// and checks the sequence again.
+
+// Tests that iterators produced by generator functions conform to the
+// ForwardIterator concept.
+TEST(IteratorTest, ParamIteratorConformsToForwardIteratorConcept) {
+  const ParamGenerator<int> gen = Range(0, 10);
+  ParamGenerator<int>::iterator it = gen.begin();
+
+  // Verifies that iterator initialization works as expected.
+  ParamGenerator<int>::iterator it2 = it;
+  EXPECT_TRUE(*it == *it2) << "Initialized iterators must point to the "
+                           << "element same as its source points to";
+
+  // Verifies that iterator assignment works as expected.
+  it++;
+  EXPECT_FALSE(*it == *it2);
+  it2 = it;
+  EXPECT_TRUE(*it == *it2) << "Assigned iterators must point to the "
+                           << "element same as its source points to";
+
+  // Verifies that prefix operator++() returns *this.
+  EXPECT_EQ(&it, &(++it)) << "Result of the prefix operator++ must be "
+                          << "refer to the original object";
+
+  // Verifies that the result of the postfix operator++ points to the value
+  // pointed to by the original iterator.
+  int original_value = *it;  // Have to compute it outside of macro call to be
+                             // unaffected by the parameter evaluation order.
+  EXPECT_EQ(original_value, *(it++));
+
+  // Verifies that prefix and postfix operator++() advance an iterator
+  // all the same.
+  it2 = it;
+  it++;
+  ++it2;
+  EXPECT_TRUE(*it == *it2);
+}
+
+// Tests that Range() generates the expected sequence.
+TEST(RangeTest, IntRangeWithDefaultStep) {
+  const ParamGenerator<int> gen = Range(0, 3);
+  const int expected_values[] = {0, 1, 2};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Edge case. Tests that Range() generates the single element sequence
+// as expected when provided with range limits that are equal.
+TEST(RangeTest, IntRangeSingleValue) {
+  const ParamGenerator<int> gen = Range(0, 1);
+  const int expected_values[] = {0};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Edge case. Tests that Range() with generates empty sequence when
+// supplied with an empty range.
+TEST(RangeTest, IntRangeEmpty) {
+  const ParamGenerator<int> gen = Range(0, 0);
+  VerifyGeneratorIsEmpty(gen);
+}
+
+// Tests that Range() with custom step (greater then one) generates
+// the expected sequence.
+TEST(RangeTest, IntRangeWithCustomStep) {
+  const ParamGenerator<int> gen = Range(0, 9, 3);
+  const int expected_values[] = {0, 3, 6};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Tests that Range() with custom step (greater then one) generates
+// the expected sequence when the last element does not fall on the
+// upper range limit. Sequences generated by Range() must not have
+// elements beyond the range limits.
+TEST(RangeTest, IntRangeWithCustomStepOverUpperBound) {
+  const ParamGenerator<int> gen = Range(0, 4, 3);
+  const int expected_values[] = {0, 3};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Verifies that Range works with user-defined types that define
+// copy constructor, operator=(), operator+(), and operator<().
+class DogAdder {
+ public:
+  explicit DogAdder(const char* a_value) : value_(a_value) {}
+  DogAdder(const DogAdder& other) : value_(other.value_.c_str()) {}
+
+  DogAdder operator=(const DogAdder& other) {
+    if (this != &other)
+      value_ = other.value_;
+    return *this;
+  }
+  DogAdder operator+(const DogAdder& other) const {
+    Message msg;
+    msg << value_.c_str() << other.value_.c_str();
+    return DogAdder(msg.GetString().c_str());
+  }
+  bool operator<(const DogAdder& other) const {
+    return value_ < other.value_;
+  }
+  const std::string& value() const { return value_; }
+
+ private:
+  std::string value_;
+};
+
+TEST(RangeTest, WorksWithACustomType) {
+  const ParamGenerator<DogAdder> gen =
+      Range(DogAdder("cat"), DogAdder("catdogdog"), DogAdder("dog"));
+  ParamGenerator<DogAdder>::iterator it = gen.begin();
+
+  ASSERT_FALSE(it == gen.end());
+  EXPECT_STREQ("cat", it->value().c_str());
+
+  ASSERT_FALSE(++it == gen.end());
+  EXPECT_STREQ("catdog", it->value().c_str());
+
+  EXPECT_TRUE(++it == gen.end());
+}
+
+class IntWrapper {
+ public:
+  explicit IntWrapper(int a_value) : value_(a_value) {}
+  IntWrapper(const IntWrapper& other) : value_(other.value_) {}
+
+  IntWrapper operator=(const IntWrapper& other) {
+    value_ = other.value_;
+    return *this;
+  }
+  // operator+() adds a different type.
+  IntWrapper operator+(int other) const { return IntWrapper(value_ + other); }
+  bool operator<(const IntWrapper& other) const {
+    return value_ < other.value_;
+  }
+  int value() const { return value_; }
+
+ private:
+  int value_;
+};
+
+TEST(RangeTest, WorksWithACustomTypeWithDifferentIncrementType) {
+  const ParamGenerator<IntWrapper> gen = Range(IntWrapper(0), IntWrapper(2));
+  ParamGenerator<IntWrapper>::iterator it = gen.begin();
+
+  ASSERT_FALSE(it == gen.end());
+  EXPECT_EQ(0, it->value());
+
+  ASSERT_FALSE(++it == gen.end());
+  EXPECT_EQ(1, it->value());
+
+  EXPECT_TRUE(++it == gen.end());
+}
+
+// Tests that ValuesIn() with an array parameter generates
+// the expected sequence.
+TEST(ValuesInTest, ValuesInArray) {
+  int array[] = {3, 5, 8};
+  const ParamGenerator<int> gen = ValuesIn(array);
+  VerifyGenerator(gen, array);
+}
+
+// Tests that ValuesIn() with a const array parameter generates
+// the expected sequence.
+TEST(ValuesInTest, ValuesInConstArray) {
+  const int array[] = {3, 5, 8};
+  const ParamGenerator<int> gen = ValuesIn(array);
+  VerifyGenerator(gen, array);
+}
+
+// Edge case. Tests that ValuesIn() with an array parameter containing a
+// single element generates the single element sequence.
+TEST(ValuesInTest, ValuesInSingleElementArray) {
+  int array[] = {42};
+  const ParamGenerator<int> gen = ValuesIn(array);
+  VerifyGenerator(gen, array);
+}
+
+// Tests that ValuesIn() generates the expected sequence for an STL
+// container (vector).
+TEST(ValuesInTest, ValuesInVector) {
+  typedef ::std::vector<int> ContainerType;
+  ContainerType values;
+  values.push_back(3);
+  values.push_back(5);
+  values.push_back(8);
+  const ParamGenerator<int> gen = ValuesIn(values);
+
+  const int expected_values[] = {3, 5, 8};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Tests that ValuesIn() generates the expected sequence.
+TEST(ValuesInTest, ValuesInIteratorRange) {
+  typedef ::std::vector<int> ContainerType;
+  ContainerType values;
+  values.push_back(3);
+  values.push_back(5);
+  values.push_back(8);
+  const ParamGenerator<int> gen = ValuesIn(values.begin(), values.end());
+
+  const int expected_values[] = {3, 5, 8};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Edge case. Tests that ValuesIn() provided with an iterator range specifying a
+// single value generates a single-element sequence.
+TEST(ValuesInTest, ValuesInSingleElementIteratorRange) {
+  typedef ::std::vector<int> ContainerType;
+  ContainerType values;
+  values.push_back(42);
+  const ParamGenerator<int> gen = ValuesIn(values.begin(), values.end());
+
+  const int expected_values[] = {42};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Edge case. Tests that ValuesIn() provided with an empty iterator range
+// generates an empty sequence.
+TEST(ValuesInTest, ValuesInEmptyIteratorRange) {
+  typedef ::std::vector<int> ContainerType;
+  ContainerType values;
+  const ParamGenerator<int> gen = ValuesIn(values.begin(), values.end());
+
+  VerifyGeneratorIsEmpty(gen);
+}
+
+// Tests that the Values() generates the expected sequence.
+TEST(ValuesTest, ValuesWorks) {
+  const ParamGenerator<int> gen = Values(3, 5, 8);
+
+  const int expected_values[] = {3, 5, 8};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Tests that Values() generates the expected sequences from elements of
+// different types convertible to ParamGenerator's parameter type.
+TEST(ValuesTest, ValuesWorksForValuesOfCompatibleTypes) {
+  const ParamGenerator<double> gen = Values(3, 5.0f, 8.0);
+
+  const double expected_values[] = {3.0, 5.0, 8.0};
+  VerifyGenerator(gen, expected_values);
+}
+
+TEST(ValuesTest, ValuesWorksForMaxLengthList) {
+  const ParamGenerator<int> gen = Values(
+      10, 20, 30, 40, 50, 60, 70, 80, 90, 100,
+      110, 120, 130, 140, 150, 160, 170, 180, 190, 200,
+      210, 220, 230, 240, 250, 260, 270, 280, 290, 300,
+      310, 320, 330, 340, 350, 360, 370, 380, 390, 400,
+      410, 420, 430, 440, 450, 460, 470, 480, 490, 500);
+
+  const int expected_values[] = {
+      10, 20, 30, 40, 50, 60, 70, 80, 90, 100,
+      110, 120, 130, 140, 150, 160, 170, 180, 190, 200,
+      210, 220, 230, 240, 250, 260, 270, 280, 290, 300,
+      310, 320, 330, 340, 350, 360, 370, 380, 390, 400,
+      410, 420, 430, 440, 450, 460, 470, 480, 490, 500};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Edge case test. Tests that single-parameter Values() generates the sequence
+// with the single value.
+TEST(ValuesTest, ValuesWithSingleParameter) {
+  const ParamGenerator<int> gen = Values(42);
+
+  const int expected_values[] = {42};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Tests that Bool() generates sequence (false, true).
+TEST(BoolTest, BoolWorks) {
+  const ParamGenerator<bool> gen = Bool();
+
+  const bool expected_values[] = {false, true};
+  VerifyGenerator(gen, expected_values);
+}
+
+# if GTEST_HAS_COMBINE
+
+// Tests that Combine() with two parameters generates the expected sequence.
+TEST(CombineTest, CombineWithTwoParameters) {
+  const char* foo = "foo";
+  const char* bar = "bar";
+  const ParamGenerator<tuple<const char*, int> > gen =
+      Combine(Values(foo, bar), Values(3, 4));
+
+  tuple<const char*, int> expected_values[] = {
+    make_tuple(foo, 3), make_tuple(foo, 4),
+    make_tuple(bar, 3), make_tuple(bar, 4)};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Tests that Combine() with three parameters generates the expected sequence.
+TEST(CombineTest, CombineWithThreeParameters) {
+  const ParamGenerator<tuple<int, int, int> > gen = Combine(Values(0, 1),
+                                                            Values(3, 4),
+                                                            Values(5, 6));
+  tuple<int, int, int> expected_values[] = {
+    make_tuple(0, 3, 5), make_tuple(0, 3, 6),
+    make_tuple(0, 4, 5), make_tuple(0, 4, 6),
+    make_tuple(1, 3, 5), make_tuple(1, 3, 6),
+    make_tuple(1, 4, 5), make_tuple(1, 4, 6)};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Tests that the Combine() with the first parameter generating a single value
+// sequence generates a sequence with the number of elements equal to the
+// number of elements in the sequence generated by the second parameter.
+TEST(CombineTest, CombineWithFirstParameterSingleValue) {
+  const ParamGenerator<tuple<int, int> > gen = Combine(Values(42),
+                                                       Values(0, 1));
+
+  tuple<int, int> expected_values[] = {make_tuple(42, 0), make_tuple(42, 1)};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Tests that the Combine() with the second parameter generating a single value
+// sequence generates a sequence with the number of elements equal to the
+// number of elements in the sequence generated by the first parameter.
+TEST(CombineTest, CombineWithSecondParameterSingleValue) {
+  const ParamGenerator<tuple<int, int> > gen = Combine(Values(0, 1),
+                                                       Values(42));
+
+  tuple<int, int> expected_values[] = {make_tuple(0, 42), make_tuple(1, 42)};
+  VerifyGenerator(gen, expected_values);
+}
+
+// Tests that when the first parameter produces an empty sequence,
+// Combine() produces an empty sequence, too.
+TEST(CombineTest, CombineWithFirstParameterEmptyRange) {
+  const ParamGenerator<tuple<int, int> > gen = Combine(Range(0, 0),
+                                                       Values(0, 1));
+  VerifyGeneratorIsEmpty(gen);
+}
+
+// Tests that when the second parameter produces an empty sequence,
+// Combine() produces an empty sequence, too.
+TEST(CombineTest, CombineWithSecondParameterEmptyRange) {
+  const ParamGenerator<tuple<int, int> > gen = Combine(Values(0, 1),
+                                                       Range(1, 1));
+  VerifyGeneratorIsEmpty(gen);
+}
+
+// Edge case. Tests that combine works with the maximum number
+// of parameters supported by Google Test (currently 10).
+TEST(CombineTest, CombineWithMaxNumberOfParameters) {
+  const char* foo = "foo";
+  const char* bar = "bar";
+  const ParamGenerator<tuple<const char*, int, int, int, int, int, int, int,
+                             int, int> > gen = Combine(Values(foo, bar),
+                                                       Values(1), Values(2),
+                                                       Values(3), Values(4),
+                                                       Values(5), Values(6),
+                                                       Values(7), Values(8),
+                                                       Values(9));
+
+  tuple<const char*, int, int, int, int, int, int, int, int, int>
+      expected_values[] = {make_tuple(foo, 1, 2, 3, 4, 5, 6, 7, 8, 9),
+                           make_tuple(bar, 1, 2, 3, 4, 5, 6, 7, 8, 9)};
+  VerifyGenerator(gen, expected_values);
+}
+
+# endif  // GTEST_HAS_COMBINE
+
+// Tests that an generator produces correct sequence after being
+// assigned from another generator.
+TEST(ParamGeneratorTest, AssignmentWorks) {
+  ParamGenerator<int> gen = Values(1, 2);
+  const ParamGenerator<int> gen2 = Values(3, 4);
+  gen = gen2;
+
+  const int expected_values[] = {3, 4};
+  VerifyGenerator(gen, expected_values);
+}
+
+// This test verifies that the tests are expanded and run as specified:
+// one test per element from the sequence produced by the generator
+// specified in INSTANTIATE_TEST_CASE_P. It also verifies that the test's
+// fixture constructor, SetUp(), and TearDown() have run and have been
+// supplied with the correct parameters.
+
+// The use of environment object allows detection of the case where no test
+// case functionality is run at all. In this case TestCaseTearDown will not
+// be able to detect missing tests, naturally.
+template <int kExpectedCalls>
+class TestGenerationEnvironment : public ::testing::Environment {
+ public:
+  static TestGenerationEnvironment* Instance() {
+    static TestGenerationEnvironment* instance = new TestGenerationEnvironment;
+    return instance;
+  }
+
+  void FixtureConstructorExecuted() { fixture_constructor_count_++; }
+  void SetUpExecuted() { set_up_count_++; }
+  void TearDownExecuted() { tear_down_count_++; }
+  void TestBodyExecuted() { test_body_count_++; }
+
+  virtual void TearDown() {
+    // If all MultipleTestGenerationTest tests have been de-selected
+    // by the filter flag, the following checks make no sense.
+    bool perform_check = false;
+
+    for (int i = 0; i < kExpectedCalls; ++i) {
+      Message msg;
+      msg << "TestsExpandedAndRun/" << i;
+      if (UnitTestOptions::FilterMatchesTest(
+             "TestExpansionModule/MultipleTestGenerationTest",
+              msg.GetString().c_str())) {
+        perform_check = true;
+      }
+    }
+    if (perform_check) {
+      EXPECT_EQ(kExpectedCalls, fixture_constructor_count_)
+          << "Fixture constructor of ParamTestGenerationTest test case "
+          << "has not been run as expected.";
+      EXPECT_EQ(kExpectedCalls, set_up_count_)
+          << "Fixture SetUp method of ParamTestGenerationTest test case "
+          << "has not been run as expected.";
+      EXPECT_EQ(kExpectedCalls, tear_down_count_)
+          << "Fixture TearDown method of ParamTestGenerationTest test case "
+          << "has not been run as expected.";
+      EXPECT_EQ(kExpectedCalls, test_body_count_)
+          << "Test in ParamTestGenerationTest test case "
+          << "has not been run as expected.";
+    }
+  }
+
+ private:
+  TestGenerationEnvironment() : fixture_constructor_count_(0), set_up_count_(0),
+                                tear_down_count_(0), test_body_count_(0) {}
+
+  int fixture_constructor_count_;
+  int set_up_count_;
+  int tear_down_count_;
+  int test_body_count_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestGenerationEnvironment);
+};
+
+const int test_generation_params[] = {36, 42, 72};
+
+class TestGenerationTest : public TestWithParam<int> {
+ public:
+  enum {
+    PARAMETER_COUNT =
+        sizeof(test_generation_params)/sizeof(test_generation_params[0])
+  };
+
+  typedef TestGenerationEnvironment<PARAMETER_COUNT> Environment;
+
+  TestGenerationTest() {
+    Environment::Instance()->FixtureConstructorExecuted();
+    current_parameter_ = GetParam();
+  }
+  virtual void SetUp() {
+    Environment::Instance()->SetUpExecuted();
+    EXPECT_EQ(current_parameter_, GetParam());
+  }
+  virtual void TearDown() {
+    Environment::Instance()->TearDownExecuted();
+    EXPECT_EQ(current_parameter_, GetParam());
+  }
+
+  static void SetUpTestCase() {
+    bool all_tests_in_test_case_selected = true;
+
+    for (int i = 0; i < PARAMETER_COUNT; ++i) {
+      Message test_name;
+      test_name << "TestsExpandedAndRun/" << i;
+      if ( !UnitTestOptions::FilterMatchesTest(
+                "TestExpansionModule/MultipleTestGenerationTest",
+                test_name.GetString())) {
+        all_tests_in_test_case_selected = false;
+      }
+    }
+    EXPECT_TRUE(all_tests_in_test_case_selected)
+        << "When running the TestGenerationTest test case all of its tests\n"
+        << "must be selected by the filter flag for the test case to pass.\n"
+        << "If not all of them are enabled, we can't reliably conclude\n"
+        << "that the correct number of tests have been generated.";
+
+    collected_parameters_.clear();
+  }
+
+  static void TearDownTestCase() {
+    vector<int> expected_values(test_generation_params,
+                                test_generation_params + PARAMETER_COUNT);
+    // Test execution order is not guaranteed by Google Test,
+    // so the order of values in collected_parameters_ can be
+    // different and we have to sort to compare.
+    sort(expected_values.begin(), expected_values.end());
+    sort(collected_parameters_.begin(), collected_parameters_.end());
+
+    EXPECT_TRUE(collected_parameters_ == expected_values);
+  }
+
+ protected:
+  int current_parameter_;
+  static vector<int> collected_parameters_;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TestGenerationTest);
+};
+vector<int> TestGenerationTest::collected_parameters_;
+
+TEST_P(TestGenerationTest, TestsExpandedAndRun) {
+  Environment::Instance()->TestBodyExecuted();
+  EXPECT_EQ(current_parameter_, GetParam());
+  collected_parameters_.push_back(GetParam());
+}
+INSTANTIATE_TEST_CASE_P(TestExpansionModule, TestGenerationTest,
+                        ValuesIn(test_generation_params));
+
+// This test verifies that the element sequence (third parameter of
+// INSTANTIATE_TEST_CASE_P) is evaluated in InitGoogleTest() and neither at
+// the call site of INSTANTIATE_TEST_CASE_P nor in RUN_ALL_TESTS().  For
+// that, we declare param_value_ to be a static member of
+// GeneratorEvaluationTest and initialize it to 0.  We set it to 1 in
+// main(), just before invocation of InitGoogleTest().  After calling
+// InitGoogleTest(), we set the value to 2.  If the sequence is evaluated
+// before or after InitGoogleTest, INSTANTIATE_TEST_CASE_P will create a
+// test with parameter other than 1, and the test body will fail the
+// assertion.
+class GeneratorEvaluationTest : public TestWithParam<int> {
+ public:
+  static int param_value() { return param_value_; }
+  static void set_param_value(int param_value) { param_value_ = param_value; }
+
+ private:
+  static int param_value_;
+};
+int GeneratorEvaluationTest::param_value_ = 0;
+
+TEST_P(GeneratorEvaluationTest, GeneratorsEvaluatedInMain) {
+  EXPECT_EQ(1, GetParam());
+}
+INSTANTIATE_TEST_CASE_P(GenEvalModule,
+                        GeneratorEvaluationTest,
+                        Values(GeneratorEvaluationTest::param_value()));
+
+// Tests that generators defined in a different translation unit are
+// functional. Generator extern_gen is defined in gtest-param-test_test2.cc.
+extern ParamGenerator<int> extern_gen;
+class ExternalGeneratorTest : public TestWithParam<int> {};
+TEST_P(ExternalGeneratorTest, ExternalGenerator) {
+  // Sequence produced by extern_gen contains only a single value
+  // which we verify here.
+  EXPECT_EQ(GetParam(), 33);
+}
+INSTANTIATE_TEST_CASE_P(ExternalGeneratorModule,
+                        ExternalGeneratorTest,
+                        extern_gen);
+
+// Tests that a parameterized test case can be defined in one translation
+// unit and instantiated in another. This test will be instantiated in
+// gtest-param-test_test2.cc. ExternalInstantiationTest fixture class is
+// defined in gtest-param-test_test.h.
+TEST_P(ExternalInstantiationTest, IsMultipleOf33) {
+  EXPECT_EQ(0, GetParam() % 33);
+}
+
+// Tests that a parameterized test case can be instantiated with multiple
+// generators.
+class MultipleInstantiationTest : public TestWithParam<int> {};
+TEST_P(MultipleInstantiationTest, AllowsMultipleInstances) {
+}
+INSTANTIATE_TEST_CASE_P(Sequence1, MultipleInstantiationTest, Values(1, 2));
+INSTANTIATE_TEST_CASE_P(Sequence2, MultipleInstantiationTest, Range(3, 5));
+
+// Tests that a parameterized test case can be instantiated
+// in multiple translation units. This test will be instantiated
+// here and in gtest-param-test_test2.cc.
+// InstantiationInMultipleTranslationUnitsTest fixture class
+// is defined in gtest-param-test_test.h.
+TEST_P(InstantiationInMultipleTranslaionUnitsTest, IsMultipleOf42) {
+  EXPECT_EQ(0, GetParam() % 42);
+}
+INSTANTIATE_TEST_CASE_P(Sequence1,
+                        InstantiationInMultipleTranslaionUnitsTest,
+                        Values(42, 42*2));
+
+// Tests that each iteration of parameterized test runs in a separate test
+// object.
+class SeparateInstanceTest : public TestWithParam<int> {
+ public:
+  SeparateInstanceTest() : count_(0) {}
+
+  static void TearDownTestCase() {
+    EXPECT_GE(global_count_, 2)
+        << "If some (but not all) SeparateInstanceTest tests have been "
+        << "filtered out this test will fail. Make sure that all "
+        << "GeneratorEvaluationTest are selected or de-selected together "
+        << "by the test filter.";
+  }
+
+ protected:
+  int count_;
+  static int global_count_;
+};
+int SeparateInstanceTest::global_count_ = 0;
+
+TEST_P(SeparateInstanceTest, TestsRunInSeparateInstances) {
+  EXPECT_EQ(0, count_++);
+  global_count_++;
+}
+INSTANTIATE_TEST_CASE_P(FourElemSequence, SeparateInstanceTest, Range(1, 4));
+
+// Tests that all instantiations of a test have named appropriately. Test
+// defined with TEST_P(TestCaseName, TestName) and instantiated with
+// INSTANTIATE_TEST_CASE_P(SequenceName, TestCaseName, generator) must be named
+// SequenceName/TestCaseName.TestName/i, where i is the 0-based index of the
+// sequence element used to instantiate the test.
+class NamingTest : public TestWithParam<int> {};
+
+TEST_P(NamingTest, TestsReportCorrectNamesAndParameters) {
+  const ::testing::TestInfo* const test_info =
+     ::testing::UnitTest::GetInstance()->current_test_info();
+
+  EXPECT_STREQ("ZeroToFiveSequence/NamingTest", test_info->test_case_name());
+
+  Message index_stream;
+  index_stream << "TestsReportCorrectNamesAndParameters/" << GetParam();
+  EXPECT_STREQ(index_stream.GetString().c_str(), test_info->name());
+
+  EXPECT_EQ(::testing::PrintToString(GetParam()), test_info->value_param());
+}
+
+INSTANTIATE_TEST_CASE_P(ZeroToFiveSequence, NamingTest, Range(0, 5));
+
+// Tests that user supplied custom parameter names are working correctly.
+// Runs the test with a builtin helper method which uses PrintToString,
+// as well as a custom function and custom functor to ensure all possible
+// uses work correctly.
+class CustomFunctorNamingTest : public TestWithParam<std::string> {};
+TEST_P(CustomFunctorNamingTest, CustomTestNames) {}
+
+struct CustomParamNameFunctor {
+  std::string operator()(const ::testing::TestParamInfo<std::string>& info) {
+    return info.param;
+  }
+};
+
+INSTANTIATE_TEST_CASE_P(CustomParamNameFunctor,
+                        CustomFunctorNamingTest,
+                        Values(std::string("FunctorName")),
+                        CustomParamNameFunctor());
+
+INSTANTIATE_TEST_CASE_P(AllAllowedCharacters,
+                        CustomFunctorNamingTest,
+                        Values("abcdefghijklmnopqrstuvwxyz",
+                               "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+                               "01234567890_"),
+                        CustomParamNameFunctor());
+
+inline std::string CustomParamNameFunction(
+    const ::testing::TestParamInfo<std::string>& info) {
+  return info.param;
+}
+
+class CustomFunctionNamingTest : public TestWithParam<std::string> {};
+TEST_P(CustomFunctionNamingTest, CustomTestNames) {}
+
+INSTANTIATE_TEST_CASE_P(CustomParamNameFunction,
+                        CustomFunctionNamingTest,
+                        Values(std::string("FunctionName")),
+                        CustomParamNameFunction);
+
+#if GTEST_LANG_CXX11
+
+// Test custom naming with a lambda
+
+class CustomLambdaNamingTest : public TestWithParam<std::string> {};
+TEST_P(CustomLambdaNamingTest, CustomTestNames) {}
+
+INSTANTIATE_TEST_CASE_P(CustomParamNameLambda,
+                        CustomLambdaNamingTest,
+                        Values(std::string("LambdaName")),
+                        [](const ::testing::TestParamInfo<std::string>& info) {
+                          return info.param;
+                        });
+
+#endif  // GTEST_LANG_CXX11
+
+TEST(CustomNamingTest, CheckNameRegistry) {
+  ::testing::UnitTest* unit_test = ::testing::UnitTest::GetInstance();
+  std::set<std::string> test_names;
+  for (int case_num = 0;
+       case_num < unit_test->total_test_case_count();
+       ++case_num) {
+    const ::testing::TestCase* test_case = unit_test->GetTestCase(case_num);
+    for (int test_num = 0;
+         test_num < test_case->total_test_count();
+         ++test_num) {
+      const ::testing::TestInfo* test_info = test_case->GetTestInfo(test_num);
+      test_names.insert(std::string(test_info->name()));
+    }
+  }
+  EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctorName"));
+  EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctionName"));
+#if GTEST_LANG_CXX11
+  EXPECT_EQ(1u, test_names.count("CustomTestNames/LambdaName"));
+#endif  // GTEST_LANG_CXX11
+}
+
+// Test a numeric name to ensure PrintToStringParamName works correctly.
+
+class CustomIntegerNamingTest : public TestWithParam<int> {};
+
+TEST_P(CustomIntegerNamingTest, TestsReportCorrectNames) {
+  const ::testing::TestInfo* const test_info =
+     ::testing::UnitTest::GetInstance()->current_test_info();
+  Message test_name_stream;
+  test_name_stream << "TestsReportCorrectNames/" << GetParam();
+  EXPECT_STREQ(test_name_stream.GetString().c_str(), test_info->name());
+}
+
+INSTANTIATE_TEST_CASE_P(PrintToString,
+                        CustomIntegerNamingTest,
+                        Range(0, 5),
+                        ::testing::PrintToStringParamName());
+
+// Test a custom struct with PrintToString.
+
+struct CustomStruct {
+  explicit CustomStruct(int value) : x(value) {}
+  int x;
+};
+
+std::ostream& operator<<(std::ostream& stream, const CustomStruct& val) {
+  stream << val.x;
+  return stream;
+}
+
+class CustomStructNamingTest : public TestWithParam<CustomStruct> {};
+
+TEST_P(CustomStructNamingTest, TestsReportCorrectNames) {
+  const ::testing::TestInfo* const test_info =
+     ::testing::UnitTest::GetInstance()->current_test_info();
+  Message test_name_stream;
+  test_name_stream << "TestsReportCorrectNames/" << GetParam();
+  EXPECT_STREQ(test_name_stream.GetString().c_str(), test_info->name());
+}
+
+INSTANTIATE_TEST_CASE_P(PrintToString,
+                        CustomStructNamingTest,
+                        Values(CustomStruct(0), CustomStruct(1)),
+                        ::testing::PrintToStringParamName());
+
+// Test that using a stateful parameter naming function works as expected.
+
+struct StatefulNamingFunctor {
+  StatefulNamingFunctor() : sum(0) {}
+  std::string operator()(const ::testing::TestParamInfo<int>& info) {
+    int value = info.param + sum;
+    sum += info.param;
+    return ::testing::PrintToString(value);
+  }
+  int sum;
+};
+
+class StatefulNamingTest : public ::testing::TestWithParam<int> {
+ protected:
+  StatefulNamingTest() : sum_(0) {}
+  int sum_;
+};
+
+TEST_P(StatefulNamingTest, TestsReportCorrectNames) {
+  const ::testing::TestInfo* const test_info =
+     ::testing::UnitTest::GetInstance()->current_test_info();
+  sum_ += GetParam();
+  Message test_name_stream;
+  test_name_stream << "TestsReportCorrectNames/" << sum_;
+  EXPECT_STREQ(test_name_stream.GetString().c_str(), test_info->name());
+}
+
+INSTANTIATE_TEST_CASE_P(StatefulNamingFunctor,
+                        StatefulNamingTest,
+                        Range(0, 5),
+                        StatefulNamingFunctor());
+
+// Class that cannot be streamed into an ostream.  It needs to be copyable
+// (and, in case of MSVC, also assignable) in order to be a test parameter
+// type.  Its default copy constructor and assignment operator do exactly
+// what we need.
+class Unstreamable {
+ public:
+  explicit Unstreamable(int value) : value_(value) {}
+
+ private:
+  int value_;
+};
+
+class CommentTest : public TestWithParam<Unstreamable> {};
+
+TEST_P(CommentTest, TestsCorrectlyReportUnstreamableParams) {
+  const ::testing::TestInfo* const test_info =
+     ::testing::UnitTest::GetInstance()->current_test_info();
+
+  EXPECT_EQ(::testing::PrintToString(GetParam()), test_info->value_param());
+}
+
+INSTANTIATE_TEST_CASE_P(InstantiationWithComments,
+                        CommentTest,
+                        Values(Unstreamable(1)));
+
+// Verify that we can create a hierarchy of test fixtures, where the base
+// class fixture is not parameterized and the derived class is. In this case
+// ParameterizedDerivedTest inherits from NonParameterizedBaseTest.  We
+// perform simple tests on both.
+class NonParameterizedBaseTest : public ::testing::Test {
+ public:
+  NonParameterizedBaseTest() : n_(17) { }
+ protected:
+  int n_;
+};
+
+class ParameterizedDerivedTest : public NonParameterizedBaseTest,
+                                 public ::testing::WithParamInterface<int> {
+ protected:
+  ParameterizedDerivedTest() : count_(0) { }
+  int count_;
+  static int global_count_;
+};
+
+int ParameterizedDerivedTest::global_count_ = 0;
+
+TEST_F(NonParameterizedBaseTest, FixtureIsInitialized) {
+  EXPECT_EQ(17, n_);
+}
+
+TEST_P(ParameterizedDerivedTest, SeesSequence) {
+  EXPECT_EQ(17, n_);
+  EXPECT_EQ(0, count_++);
+  EXPECT_EQ(GetParam(), global_count_++);
+}
+
+class ParameterizedDeathTest : public ::testing::TestWithParam<int> { };
+
+TEST_F(ParameterizedDeathTest, GetParamDiesFromTestF) {
+  EXPECT_DEATH_IF_SUPPORTED(GetParam(),
+                            ".* value-parameterized test .*");
+}
+
+INSTANTIATE_TEST_CASE_P(RangeZeroToFive, ParameterizedDerivedTest, Range(0, 5));
+
+#endif  // GTEST_HAS_PARAM_TEST
+
+TEST(CompileTest, CombineIsDefinedOnlyWhenGtestHasParamTestIsDefined) {
+#if GTEST_HAS_COMBINE && !GTEST_HAS_PARAM_TEST
+  FAIL() << "GTEST_HAS_COMBINE is defined while GTEST_HAS_PARAM_TEST is not\n"
+#endif
+}
+
+int main(int argc, char **argv) {
+#if GTEST_HAS_PARAM_TEST
+  // Used in TestGenerationTest test case.
+  AddGlobalTestEnvironment(TestGenerationTest::Environment::Instance());
+  // Used in GeneratorEvaluationTest test case. Tests that the updated value
+  // will be picked up for instantiating tests in GeneratorEvaluationTest.
+  GeneratorEvaluationTest::set_param_value(1);
+#endif  // GTEST_HAS_PARAM_TEST
+
+  ::testing::InitGoogleTest(&argc, argv);
+
+#if GTEST_HAS_PARAM_TEST
+  // Used in GeneratorEvaluationTest test case. Tests that value updated
+  // here will NOT be used for instantiating tests in
+  // GeneratorEvaluationTest.
+  GeneratorEvaluationTest::set_param_value(2);
+#endif  // GTEST_HAS_PARAM_TEST
+
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-param-test_test.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-param-test_test.h
new file mode 100644
index 0000000000..26ea122b10
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-param-test_test.h
@@ -0,0 +1,57 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: vladl@google.com (Vlad Losev)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file provides classes and functions used internally
+// for testing Google Test itself.
+
+#ifndef GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
+#define GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
+
+#include "gtest/gtest.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+// Test fixture for testing definition and instantiation of a test
+// in separate translation units.
+class ExternalInstantiationTest : public ::testing::TestWithParam<int> {
+};
+
+// Test fixture for testing instantiation of a test in multiple
+// translation units.
+class InstantiationInMultipleTranslaionUnitsTest
+    : public ::testing::TestWithParam<int> {
+};
+
+#endif  // GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_TEST_GTEST_PARAM_TEST_TEST_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-port_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-port_test.cc
new file mode 100644
index 0000000000..6ea607bc70
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-port_test.cc
@@ -0,0 +1,1304 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: vladl@google.com (Vlad Losev), wan@google.com (Zhanyong Wan)
+//
+// This file tests the internal cross-platform support utilities.
+
+#include "gtest/internal/gtest-port.h"
+
+#include <stdio.h>
+
+#if GTEST_OS_MAC
+# include <time.h>
+#endif  // GTEST_OS_MAC
+
+#include <list>
+#include <utility>  // For std::pair and std::make_pair.
+#include <vector>
+
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+using std::make_pair;
+using std::pair;
+
+namespace testing {
+namespace internal {
+
+TEST(IsXDigitTest, WorksForNarrowAscii) {
+  EXPECT_TRUE(IsXDigit('0'));
+  EXPECT_TRUE(IsXDigit('9'));
+  EXPECT_TRUE(IsXDigit('A'));
+  EXPECT_TRUE(IsXDigit('F'));
+  EXPECT_TRUE(IsXDigit('a'));
+  EXPECT_TRUE(IsXDigit('f'));
+
+  EXPECT_FALSE(IsXDigit('-'));
+  EXPECT_FALSE(IsXDigit('g'));
+  EXPECT_FALSE(IsXDigit('G'));
+}
+
+TEST(IsXDigitTest, ReturnsFalseForNarrowNonAscii) {
+  EXPECT_FALSE(IsXDigit('\x80'));
+  EXPECT_FALSE(IsXDigit(static_cast<char>('0' | '\x80')));
+}
+
+TEST(IsXDigitTest, WorksForWideAscii) {
+  EXPECT_TRUE(IsXDigit(L'0'));
+  EXPECT_TRUE(IsXDigit(L'9'));
+  EXPECT_TRUE(IsXDigit(L'A'));
+  EXPECT_TRUE(IsXDigit(L'F'));
+  EXPECT_TRUE(IsXDigit(L'a'));
+  EXPECT_TRUE(IsXDigit(L'f'));
+
+  EXPECT_FALSE(IsXDigit(L'-'));
+  EXPECT_FALSE(IsXDigit(L'g'));
+  EXPECT_FALSE(IsXDigit(L'G'));
+}
+
+TEST(IsXDigitTest, ReturnsFalseForWideNonAscii) {
+  EXPECT_FALSE(IsXDigit(static_cast<wchar_t>(0x80)));
+  EXPECT_FALSE(IsXDigit(static_cast<wchar_t>(L'0' | 0x80)));
+  EXPECT_FALSE(IsXDigit(static_cast<wchar_t>(L'0' | 0x100)));
+}
+
+class Base {
+ public:
+  // Copy constructor and assignment operator do exactly what we need, so we
+  // use them.
+  Base() : member_(0) {}
+  explicit Base(int n) : member_(n) {}
+  virtual ~Base() {}
+  int member() { return member_; }
+
+ private:
+  int member_;
+};
+
+class Derived : public Base {
+ public:
+  explicit Derived(int n) : Base(n) {}
+};
+
+TEST(ImplicitCastTest, ConvertsPointers) {
+  Derived derived(0);
+  EXPECT_TRUE(&derived == ::testing::internal::ImplicitCast_<Base*>(&derived));
+}
+
+TEST(ImplicitCastTest, CanUseInheritance) {
+  Derived derived(1);
+  Base base = ::testing::internal::ImplicitCast_<Base>(derived);
+  EXPECT_EQ(derived.member(), base.member());
+}
+
+class Castable {
+ public:
+  explicit Castable(bool* converted) : converted_(converted) {}
+  operator Base() {
+    *converted_ = true;
+    return Base();
+  }
+
+ private:
+  bool* converted_;
+};
+
+TEST(ImplicitCastTest, CanUseNonConstCastOperator) {
+  bool converted = false;
+  Castable castable(&converted);
+  Base base = ::testing::internal::ImplicitCast_<Base>(castable);
+  EXPECT_TRUE(converted);
+}
+
+class ConstCastable {
+ public:
+  explicit ConstCastable(bool* converted) : converted_(converted) {}
+  operator Base() const {
+    *converted_ = true;
+    return Base();
+  }
+
+ private:
+  bool* converted_;
+};
+
+TEST(ImplicitCastTest, CanUseConstCastOperatorOnConstValues) {
+  bool converted = false;
+  const ConstCastable const_castable(&converted);
+  Base base = ::testing::internal::ImplicitCast_<Base>(const_castable);
+  EXPECT_TRUE(converted);
+}
+
+class ConstAndNonConstCastable {
+ public:
+  ConstAndNonConstCastable(bool* converted, bool* const_converted)
+      : converted_(converted), const_converted_(const_converted) {}
+  operator Base() {
+    *converted_ = true;
+    return Base();
+  }
+  operator Base() const {
+    *const_converted_ = true;
+    return Base();
+  }
+
+ private:
+  bool* converted_;
+  bool* const_converted_;
+};
+
+TEST(ImplicitCastTest, CanSelectBetweenConstAndNonConstCasrAppropriately) {
+  bool converted = false;
+  bool const_converted = false;
+  ConstAndNonConstCastable castable(&converted, &const_converted);
+  Base base = ::testing::internal::ImplicitCast_<Base>(castable);
+  EXPECT_TRUE(converted);
+  EXPECT_FALSE(const_converted);
+
+  converted = false;
+  const_converted = false;
+  const ConstAndNonConstCastable const_castable(&converted, &const_converted);
+  base = ::testing::internal::ImplicitCast_<Base>(const_castable);
+  EXPECT_FALSE(converted);
+  EXPECT_TRUE(const_converted);
+}
+
+class To {
+ public:
+  To(bool* converted) { *converted = true; }  // NOLINT
+};
+
+TEST(ImplicitCastTest, CanUseImplicitConstructor) {
+  bool converted = false;
+  To to = ::testing::internal::ImplicitCast_<To>(&converted);
+  (void)to;
+  EXPECT_TRUE(converted);
+}
+
+TEST(IteratorTraitsTest, WorksForSTLContainerIterators) {
+  StaticAssertTypeEq<int,
+      IteratorTraits< ::std::vector<int>::const_iterator>::value_type>();
+  StaticAssertTypeEq<bool,
+      IteratorTraits< ::std::list<bool>::iterator>::value_type>();
+}
+
+TEST(IteratorTraitsTest, WorksForPointerToNonConst) {
+  StaticAssertTypeEq<char, IteratorTraits<char*>::value_type>();
+  StaticAssertTypeEq<const void*, IteratorTraits<const void**>::value_type>();
+}
+
+TEST(IteratorTraitsTest, WorksForPointerToConst) {
+  StaticAssertTypeEq<char, IteratorTraits<const char*>::value_type>();
+  StaticAssertTypeEq<const void*,
+      IteratorTraits<const void* const*>::value_type>();
+}
+
+// Tests that the element_type typedef is available in scoped_ptr and refers
+// to the parameter type.
+TEST(ScopedPtrTest, DefinesElementType) {
+  StaticAssertTypeEq<int, ::testing::internal::scoped_ptr<int>::element_type>();
+}
+
+// TODO(vladl@google.com): Implement THE REST of scoped_ptr tests.
+
+TEST(GtestCheckSyntaxTest, BehavesLikeASingleStatement) {
+  if (AlwaysFalse())
+    GTEST_CHECK_(false) << "This should never be executed; "
+                           "It's a compilation test only.";
+
+  if (AlwaysTrue())
+    GTEST_CHECK_(true);
+  else
+    ;  // NOLINT
+
+  if (AlwaysFalse())
+    ;  // NOLINT
+  else
+    GTEST_CHECK_(true) << "";
+}
+
+TEST(GtestCheckSyntaxTest, WorksWithSwitch) {
+  switch (0) {
+    case 1:
+      break;
+    default:
+      GTEST_CHECK_(true);
+  }
+
+  switch (0)
+    case 0:
+      GTEST_CHECK_(true) << "Check failed in switch case";
+}
+
+// Verifies behavior of FormatFileLocation.
+TEST(FormatFileLocationTest, FormatsFileLocation) {
+  EXPECT_PRED_FORMAT2(IsSubstring, "foo.cc", FormatFileLocation("foo.cc", 42));
+  EXPECT_PRED_FORMAT2(IsSubstring, "42", FormatFileLocation("foo.cc", 42));
+}
+
+TEST(FormatFileLocationTest, FormatsUnknownFile) {
+  EXPECT_PRED_FORMAT2(
+      IsSubstring, "unknown file", FormatFileLocation(NULL, 42));
+  EXPECT_PRED_FORMAT2(IsSubstring, "42", FormatFileLocation(NULL, 42));
+}
+
+TEST(FormatFileLocationTest, FormatsUknownLine) {
+  EXPECT_EQ("foo.cc:", FormatFileLocation("foo.cc", -1));
+}
+
+TEST(FormatFileLocationTest, FormatsUknownFileAndLine) {
+  EXPECT_EQ("unknown file:", FormatFileLocation(NULL, -1));
+}
+
+// Verifies behavior of FormatCompilerIndependentFileLocation.
+TEST(FormatCompilerIndependentFileLocationTest, FormatsFileLocation) {
+  EXPECT_EQ("foo.cc:42", FormatCompilerIndependentFileLocation("foo.cc", 42));
+}
+
+TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownFile) {
+  EXPECT_EQ("unknown file:42",
+            FormatCompilerIndependentFileLocation(NULL, 42));
+}
+
+TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownLine) {
+  EXPECT_EQ("foo.cc", FormatCompilerIndependentFileLocation("foo.cc", -1));
+}
+
+TEST(FormatCompilerIndependentFileLocationTest, FormatsUknownFileAndLine) {
+  EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1));
+}
+
+#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX
+void* ThreadFunc(void* data) {
+  internal::Mutex* mutex = static_cast<internal::Mutex*>(data);
+  mutex->Lock();
+  mutex->Unlock();
+  return NULL;
+}
+
+TEST(GetThreadCountTest, ReturnsCorrectValue) {
+  const size_t starting_count = GetThreadCount();
+  pthread_t       thread_id;
+
+  internal::Mutex mutex;
+  {
+    internal::MutexLock lock(&mutex);
+    pthread_attr_t  attr;
+    ASSERT_EQ(0, pthread_attr_init(&attr));
+    ASSERT_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE));
+
+    const int status = pthread_create(&thread_id, &attr, &ThreadFunc, &mutex);
+    ASSERT_EQ(0, pthread_attr_destroy(&attr));
+    ASSERT_EQ(0, status);
+    EXPECT_EQ(starting_count + 1, GetThreadCount());
+  }
+
+  void* dummy;
+  ASSERT_EQ(0, pthread_join(thread_id, &dummy));
+
+  // The OS may not immediately report the updated thread count after
+  // joining a thread, causing flakiness in this test. To counter that, we
+  // wait for up to .5 seconds for the OS to report the correct value.
+  for (int i = 0; i < 5; ++i) {
+    if (GetThreadCount() == starting_count)
+      break;
+
+    SleepMilliseconds(100);
+  }
+
+  EXPECT_EQ(starting_count, GetThreadCount());
+}
+#else
+TEST(GetThreadCountTest, ReturnsZeroWhenUnableToCountThreads) {
+  EXPECT_EQ(0U, GetThreadCount());
+}
+#endif  // GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX
+
+TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) {
+  const bool a_false_condition = false;
+  const char regex[] =
+#ifdef _MSC_VER
+     "gtest-port_test\\.cc\\(\\d+\\):"
+#elif GTEST_USES_POSIX_RE
+     "gtest-port_test\\.cc:[0-9]+"
+#else
+     "gtest-port_test\\.cc:\\d+"
+#endif  // _MSC_VER
+     ".*a_false_condition.*Extra info.*";
+
+  EXPECT_DEATH_IF_SUPPORTED(GTEST_CHECK_(a_false_condition) << "Extra info",
+                            regex);
+}
+
+#if GTEST_HAS_DEATH_TEST
+
+TEST(GtestCheckDeathTest, LivesSilentlyOnSuccess) {
+  EXPECT_EXIT({
+      GTEST_CHECK_(true) << "Extra info";
+      ::std::cerr << "Success\n";
+      exit(0); },
+      ::testing::ExitedWithCode(0), "Success");
+}
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+// Verifies that Google Test choose regular expression engine appropriate to
+// the platform. The test will produce compiler errors in case of failure.
+// For simplicity, we only cover the most important platforms here.
+TEST(RegexEngineSelectionTest, SelectsCorrectRegexEngine) {
+#if !GTEST_USES_PCRE
+# if GTEST_HAS_POSIX_RE
+
+  EXPECT_TRUE(GTEST_USES_POSIX_RE);
+
+# else
+
+  EXPECT_TRUE(GTEST_USES_SIMPLE_RE);
+
+# endif
+#endif  // !GTEST_USES_PCRE
+}
+
+#if GTEST_USES_POSIX_RE
+
+# if GTEST_HAS_TYPED_TEST
+
+template <typename Str>
+class RETest : public ::testing::Test {};
+
+// Defines StringTypes as the list of all string types that class RE
+// supports.
+typedef testing::Types<
+    ::std::string,
+#  if GTEST_HAS_GLOBAL_STRING
+    ::string,
+#  endif  // GTEST_HAS_GLOBAL_STRING
+    const char*> StringTypes;
+
+TYPED_TEST_CASE(RETest, StringTypes);
+
+// Tests RE's implicit constructors.
+TYPED_TEST(RETest, ImplicitConstructorWorks) {
+  const RE empty(TypeParam(""));
+  EXPECT_STREQ("", empty.pattern());
+
+  const RE simple(TypeParam("hello"));
+  EXPECT_STREQ("hello", simple.pattern());
+
+  const RE normal(TypeParam(".*(\\w+)"));
+  EXPECT_STREQ(".*(\\w+)", normal.pattern());
+}
+
+// Tests that RE's constructors reject invalid regular expressions.
+TYPED_TEST(RETest, RejectsInvalidRegex) {
+  EXPECT_NONFATAL_FAILURE({
+    const RE invalid(TypeParam("?"));
+  }, "\"?\" is not a valid POSIX Extended regular expression.");
+}
+
+// Tests RE::FullMatch().
+TYPED_TEST(RETest, FullMatchWorks) {
+  const RE empty(TypeParam(""));
+  EXPECT_TRUE(RE::FullMatch(TypeParam(""), empty));
+  EXPECT_FALSE(RE::FullMatch(TypeParam("a"), empty));
+
+  const RE re(TypeParam("a.*z"));
+  EXPECT_TRUE(RE::FullMatch(TypeParam("az"), re));
+  EXPECT_TRUE(RE::FullMatch(TypeParam("axyz"), re));
+  EXPECT_FALSE(RE::FullMatch(TypeParam("baz"), re));
+  EXPECT_FALSE(RE::FullMatch(TypeParam("azy"), re));
+}
+
+// Tests RE::PartialMatch().
+TYPED_TEST(RETest, PartialMatchWorks) {
+  const RE empty(TypeParam(""));
+  EXPECT_TRUE(RE::PartialMatch(TypeParam(""), empty));
+  EXPECT_TRUE(RE::PartialMatch(TypeParam("a"), empty));
+
+  const RE re(TypeParam("a.*z"));
+  EXPECT_TRUE(RE::PartialMatch(TypeParam("az"), re));
+  EXPECT_TRUE(RE::PartialMatch(TypeParam("axyz"), re));
+  EXPECT_TRUE(RE::PartialMatch(TypeParam("baz"), re));
+  EXPECT_TRUE(RE::PartialMatch(TypeParam("azy"), re));
+  EXPECT_FALSE(RE::PartialMatch(TypeParam("zza"), re));
+}
+
+# endif  // GTEST_HAS_TYPED_TEST
+
+#elif GTEST_USES_SIMPLE_RE
+
+TEST(IsInSetTest, NulCharIsNotInAnySet) {
+  EXPECT_FALSE(IsInSet('\0', ""));
+  EXPECT_FALSE(IsInSet('\0', "\0"));
+  EXPECT_FALSE(IsInSet('\0', "a"));
+}
+
+TEST(IsInSetTest, WorksForNonNulChars) {
+  EXPECT_FALSE(IsInSet('a', "Ab"));
+  EXPECT_FALSE(IsInSet('c', ""));
+
+  EXPECT_TRUE(IsInSet('b', "bcd"));
+  EXPECT_TRUE(IsInSet('b', "ab"));
+}
+
+TEST(IsAsciiDigitTest, IsFalseForNonDigit) {
+  EXPECT_FALSE(IsAsciiDigit('\0'));
+  EXPECT_FALSE(IsAsciiDigit(' '));
+  EXPECT_FALSE(IsAsciiDigit('+'));
+  EXPECT_FALSE(IsAsciiDigit('-'));
+  EXPECT_FALSE(IsAsciiDigit('.'));
+  EXPECT_FALSE(IsAsciiDigit('a'));
+}
+
+TEST(IsAsciiDigitTest, IsTrueForDigit) {
+  EXPECT_TRUE(IsAsciiDigit('0'));
+  EXPECT_TRUE(IsAsciiDigit('1'));
+  EXPECT_TRUE(IsAsciiDigit('5'));
+  EXPECT_TRUE(IsAsciiDigit('9'));
+}
+
+TEST(IsAsciiPunctTest, IsFalseForNonPunct) {
+  EXPECT_FALSE(IsAsciiPunct('\0'));
+  EXPECT_FALSE(IsAsciiPunct(' '));
+  EXPECT_FALSE(IsAsciiPunct('\n'));
+  EXPECT_FALSE(IsAsciiPunct('a'));
+  EXPECT_FALSE(IsAsciiPunct('0'));
+}
+
+TEST(IsAsciiPunctTest, IsTrueForPunct) {
+  for (const char* p = "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~"; *p; p++) {
+    EXPECT_PRED1(IsAsciiPunct, *p);
+  }
+}
+
+TEST(IsRepeatTest, IsFalseForNonRepeatChar) {
+  EXPECT_FALSE(IsRepeat('\0'));
+  EXPECT_FALSE(IsRepeat(' '));
+  EXPECT_FALSE(IsRepeat('a'));
+  EXPECT_FALSE(IsRepeat('1'));
+  EXPECT_FALSE(IsRepeat('-'));
+}
+
+TEST(IsRepeatTest, IsTrueForRepeatChar) {
+  EXPECT_TRUE(IsRepeat('?'));
+  EXPECT_TRUE(IsRepeat('*'));
+  EXPECT_TRUE(IsRepeat('+'));
+}
+
+TEST(IsAsciiWhiteSpaceTest, IsFalseForNonWhiteSpace) {
+  EXPECT_FALSE(IsAsciiWhiteSpace('\0'));
+  EXPECT_FALSE(IsAsciiWhiteSpace('a'));
+  EXPECT_FALSE(IsAsciiWhiteSpace('1'));
+  EXPECT_FALSE(IsAsciiWhiteSpace('+'));
+  EXPECT_FALSE(IsAsciiWhiteSpace('_'));
+}
+
+TEST(IsAsciiWhiteSpaceTest, IsTrueForWhiteSpace) {
+  EXPECT_TRUE(IsAsciiWhiteSpace(' '));
+  EXPECT_TRUE(IsAsciiWhiteSpace('\n'));
+  EXPECT_TRUE(IsAsciiWhiteSpace('\r'));
+  EXPECT_TRUE(IsAsciiWhiteSpace('\t'));
+  EXPECT_TRUE(IsAsciiWhiteSpace('\v'));
+  EXPECT_TRUE(IsAsciiWhiteSpace('\f'));
+}
+
+TEST(IsAsciiWordCharTest, IsFalseForNonWordChar) {
+  EXPECT_FALSE(IsAsciiWordChar('\0'));
+  EXPECT_FALSE(IsAsciiWordChar('+'));
+  EXPECT_FALSE(IsAsciiWordChar('.'));
+  EXPECT_FALSE(IsAsciiWordChar(' '));
+  EXPECT_FALSE(IsAsciiWordChar('\n'));
+}
+
+TEST(IsAsciiWordCharTest, IsTrueForLetter) {
+  EXPECT_TRUE(IsAsciiWordChar('a'));
+  EXPECT_TRUE(IsAsciiWordChar('b'));
+  EXPECT_TRUE(IsAsciiWordChar('A'));
+  EXPECT_TRUE(IsAsciiWordChar('Z'));
+}
+
+TEST(IsAsciiWordCharTest, IsTrueForDigit) {
+  EXPECT_TRUE(IsAsciiWordChar('0'));
+  EXPECT_TRUE(IsAsciiWordChar('1'));
+  EXPECT_TRUE(IsAsciiWordChar('7'));
+  EXPECT_TRUE(IsAsciiWordChar('9'));
+}
+
+TEST(IsAsciiWordCharTest, IsTrueForUnderscore) {
+  EXPECT_TRUE(IsAsciiWordChar('_'));
+}
+
+TEST(IsValidEscapeTest, IsFalseForNonPrintable) {
+  EXPECT_FALSE(IsValidEscape('\0'));
+  EXPECT_FALSE(IsValidEscape('\007'));
+}
+
+TEST(IsValidEscapeTest, IsFalseForDigit) {
+  EXPECT_FALSE(IsValidEscape('0'));
+  EXPECT_FALSE(IsValidEscape('9'));
+}
+
+TEST(IsValidEscapeTest, IsFalseForWhiteSpace) {
+  EXPECT_FALSE(IsValidEscape(' '));
+  EXPECT_FALSE(IsValidEscape('\n'));
+}
+
+TEST(IsValidEscapeTest, IsFalseForSomeLetter) {
+  EXPECT_FALSE(IsValidEscape('a'));
+  EXPECT_FALSE(IsValidEscape('Z'));
+}
+
+TEST(IsValidEscapeTest, IsTrueForPunct) {
+  EXPECT_TRUE(IsValidEscape('.'));
+  EXPECT_TRUE(IsValidEscape('-'));
+  EXPECT_TRUE(IsValidEscape('^'));
+  EXPECT_TRUE(IsValidEscape('$'));
+  EXPECT_TRUE(IsValidEscape('('));
+  EXPECT_TRUE(IsValidEscape(']'));
+  EXPECT_TRUE(IsValidEscape('{'));
+  EXPECT_TRUE(IsValidEscape('|'));
+}
+
+TEST(IsValidEscapeTest, IsTrueForSomeLetter) {
+  EXPECT_TRUE(IsValidEscape('d'));
+  EXPECT_TRUE(IsValidEscape('D'));
+  EXPECT_TRUE(IsValidEscape('s'));
+  EXPECT_TRUE(IsValidEscape('S'));
+  EXPECT_TRUE(IsValidEscape('w'));
+  EXPECT_TRUE(IsValidEscape('W'));
+}
+
+TEST(AtomMatchesCharTest, EscapedPunct) {
+  EXPECT_FALSE(AtomMatchesChar(true, '\\', '\0'));
+  EXPECT_FALSE(AtomMatchesChar(true, '\\', ' '));
+  EXPECT_FALSE(AtomMatchesChar(true, '_', '.'));
+  EXPECT_FALSE(AtomMatchesChar(true, '.', 'a'));
+
+  EXPECT_TRUE(AtomMatchesChar(true, '\\', '\\'));
+  EXPECT_TRUE(AtomMatchesChar(true, '_', '_'));
+  EXPECT_TRUE(AtomMatchesChar(true, '+', '+'));
+  EXPECT_TRUE(AtomMatchesChar(true, '.', '.'));
+}
+
+TEST(AtomMatchesCharTest, Escaped_d) {
+  EXPECT_FALSE(AtomMatchesChar(true, 'd', '\0'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'd', 'a'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'd', '.'));
+
+  EXPECT_TRUE(AtomMatchesChar(true, 'd', '0'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'd', '9'));
+}
+
+TEST(AtomMatchesCharTest, Escaped_D) {
+  EXPECT_FALSE(AtomMatchesChar(true, 'D', '0'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'D', '9'));
+
+  EXPECT_TRUE(AtomMatchesChar(true, 'D', '\0'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'D', 'a'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'D', '-'));
+}
+
+TEST(AtomMatchesCharTest, Escaped_s) {
+  EXPECT_FALSE(AtomMatchesChar(true, 's', '\0'));
+  EXPECT_FALSE(AtomMatchesChar(true, 's', 'a'));
+  EXPECT_FALSE(AtomMatchesChar(true, 's', '.'));
+  EXPECT_FALSE(AtomMatchesChar(true, 's', '9'));
+
+  EXPECT_TRUE(AtomMatchesChar(true, 's', ' '));
+  EXPECT_TRUE(AtomMatchesChar(true, 's', '\n'));
+  EXPECT_TRUE(AtomMatchesChar(true, 's', '\t'));
+}
+
+TEST(AtomMatchesCharTest, Escaped_S) {
+  EXPECT_FALSE(AtomMatchesChar(true, 'S', ' '));
+  EXPECT_FALSE(AtomMatchesChar(true, 'S', '\r'));
+
+  EXPECT_TRUE(AtomMatchesChar(true, 'S', '\0'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'S', 'a'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'S', '9'));
+}
+
+TEST(AtomMatchesCharTest, Escaped_w) {
+  EXPECT_FALSE(AtomMatchesChar(true, 'w', '\0'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'w', '+'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'w', ' '));
+  EXPECT_FALSE(AtomMatchesChar(true, 'w', '\n'));
+
+  EXPECT_TRUE(AtomMatchesChar(true, 'w', '0'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'w', 'b'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'w', 'C'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'w', '_'));
+}
+
+TEST(AtomMatchesCharTest, Escaped_W) {
+  EXPECT_FALSE(AtomMatchesChar(true, 'W', 'A'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'W', 'b'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'W', '9'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'W', '_'));
+
+  EXPECT_TRUE(AtomMatchesChar(true, 'W', '\0'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'W', '*'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'W', '\n'));
+}
+
+TEST(AtomMatchesCharTest, EscapedWhiteSpace) {
+  EXPECT_FALSE(AtomMatchesChar(true, 'f', '\0'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'f', '\n'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'n', '\0'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'n', '\r'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'r', '\0'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'r', 'a'));
+  EXPECT_FALSE(AtomMatchesChar(true, 't', '\0'));
+  EXPECT_FALSE(AtomMatchesChar(true, 't', 't'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'v', '\0'));
+  EXPECT_FALSE(AtomMatchesChar(true, 'v', '\f'));
+
+  EXPECT_TRUE(AtomMatchesChar(true, 'f', '\f'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'n', '\n'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'r', '\r'));
+  EXPECT_TRUE(AtomMatchesChar(true, 't', '\t'));
+  EXPECT_TRUE(AtomMatchesChar(true, 'v', '\v'));
+}
+
+TEST(AtomMatchesCharTest, UnescapedDot) {
+  EXPECT_FALSE(AtomMatchesChar(false, '.', '\n'));
+
+  EXPECT_TRUE(AtomMatchesChar(false, '.', '\0'));
+  EXPECT_TRUE(AtomMatchesChar(false, '.', '.'));
+  EXPECT_TRUE(AtomMatchesChar(false, '.', 'a'));
+  EXPECT_TRUE(AtomMatchesChar(false, '.', ' '));
+}
+
+TEST(AtomMatchesCharTest, UnescapedChar) {
+  EXPECT_FALSE(AtomMatchesChar(false, 'a', '\0'));
+  EXPECT_FALSE(AtomMatchesChar(false, 'a', 'b'));
+  EXPECT_FALSE(AtomMatchesChar(false, '$', 'a'));
+
+  EXPECT_TRUE(AtomMatchesChar(false, '$', '$'));
+  EXPECT_TRUE(AtomMatchesChar(false, '5', '5'));
+  EXPECT_TRUE(AtomMatchesChar(false, 'Z', 'Z'));
+}
+
+TEST(ValidateRegexTest, GeneratesFailureAndReturnsFalseForInvalid) {
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex(NULL)),
+                          "NULL is not a valid simple regular expression");
+  EXPECT_NONFATAL_FAILURE(
+      ASSERT_FALSE(ValidateRegex("a\\")),
+      "Syntax error at index 1 in simple regular expression \"a\\\": ");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("a\\")),
+                          "'\\' cannot appear at the end");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("\\n\\")),
+                          "'\\' cannot appear at the end");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("\\s\\hb")),
+                          "invalid escape sequence \"\\h\"");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("^^")),
+                          "'^' can only appear at the beginning");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex(".*^b")),
+                          "'^' can only appear at the beginning");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("$$")),
+                          "'$' can only appear at the end");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("^$a")),
+                          "'$' can only appear at the end");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("a(b")),
+                          "'(' is unsupported");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("ab)")),
+                          "')' is unsupported");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("[ab")),
+                          "'[' is unsupported");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("a{2")),
+                          "'{' is unsupported");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("?")),
+                          "'?' can only follow a repeatable token");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("^*")),
+                          "'*' can only follow a repeatable token");
+  EXPECT_NONFATAL_FAILURE(ASSERT_FALSE(ValidateRegex("5*+")),
+                          "'+' can only follow a repeatable token");
+}
+
+TEST(ValidateRegexTest, ReturnsTrueForValid) {
+  EXPECT_TRUE(ValidateRegex(""));
+  EXPECT_TRUE(ValidateRegex("a"));
+  EXPECT_TRUE(ValidateRegex(".*"));
+  EXPECT_TRUE(ValidateRegex("^a_+"));
+  EXPECT_TRUE(ValidateRegex("^a\\t\\&?"));
+  EXPECT_TRUE(ValidateRegex("09*$"));
+  EXPECT_TRUE(ValidateRegex("^Z$"));
+  EXPECT_TRUE(ValidateRegex("a\\^Z\\$\\(\\)\\|\\[\\]\\{\\}"));
+}
+
+TEST(MatchRepetitionAndRegexAtHeadTest, WorksForZeroOrOne) {
+  EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "a", "ba"));
+  // Repeating more than once.
+  EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "b", "aab"));
+
+  // Repeating zero times.
+  EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "b", "ba"));
+  // Repeating once.
+  EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, 'a', '?', "b", "ab"));
+  EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '#', '?', ".", "##"));
+}
+
+TEST(MatchRepetitionAndRegexAtHeadTest, WorksForZeroOrMany) {
+  EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, '.', '*', "a$", "baab"));
+
+  // Repeating zero times.
+  EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '.', '*', "b", "bc"));
+  // Repeating once.
+  EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '.', '*', "b", "abc"));
+  // Repeating more than once.
+  EXPECT_TRUE(MatchRepetitionAndRegexAtHead(true, 'w', '*', "-", "ab_1-g"));
+}
+
+TEST(MatchRepetitionAndRegexAtHeadTest, WorksForOneOrMany) {
+  EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, '.', '+', "a$", "baab"));
+  // Repeating zero times.
+  EXPECT_FALSE(MatchRepetitionAndRegexAtHead(false, '.', '+', "b", "bc"));
+
+  // Repeating once.
+  EXPECT_TRUE(MatchRepetitionAndRegexAtHead(false, '.', '+', "b", "abc"));
+  // Repeating more than once.
+  EXPECT_TRUE(MatchRepetitionAndRegexAtHead(true, 'w', '+', "-", "ab_1-g"));
+}
+
+TEST(MatchRegexAtHeadTest, ReturnsTrueForEmptyRegex) {
+  EXPECT_TRUE(MatchRegexAtHead("", ""));
+  EXPECT_TRUE(MatchRegexAtHead("", "ab"));
+}
+
+TEST(MatchRegexAtHeadTest, WorksWhenDollarIsInRegex) {
+  EXPECT_FALSE(MatchRegexAtHead("$", "a"));
+
+  EXPECT_TRUE(MatchRegexAtHead("$", ""));
+  EXPECT_TRUE(MatchRegexAtHead("a$", "a"));
+}
+
+TEST(MatchRegexAtHeadTest, WorksWhenRegexStartsWithEscapeSequence) {
+  EXPECT_FALSE(MatchRegexAtHead("\\w", "+"));
+  EXPECT_FALSE(MatchRegexAtHead("\\W", "ab"));
+
+  EXPECT_TRUE(MatchRegexAtHead("\\sa", "\nab"));
+  EXPECT_TRUE(MatchRegexAtHead("\\d", "1a"));
+}
+
+TEST(MatchRegexAtHeadTest, WorksWhenRegexStartsWithRepetition) {
+  EXPECT_FALSE(MatchRegexAtHead(".+a", "abc"));
+  EXPECT_FALSE(MatchRegexAtHead("a?b", "aab"));
+
+  EXPECT_TRUE(MatchRegexAtHead(".*a", "bc12-ab"));
+  EXPECT_TRUE(MatchRegexAtHead("a?b", "b"));
+  EXPECT_TRUE(MatchRegexAtHead("a?b", "ab"));
+}
+
+TEST(MatchRegexAtHeadTest,
+     WorksWhenRegexStartsWithRepetionOfEscapeSequence) {
+  EXPECT_FALSE(MatchRegexAtHead("\\.+a", "abc"));
+  EXPECT_FALSE(MatchRegexAtHead("\\s?b", "  b"));
+
+  EXPECT_TRUE(MatchRegexAtHead("\\(*a", "((((ab"));
+  EXPECT_TRUE(MatchRegexAtHead("\\^?b", "^b"));
+  EXPECT_TRUE(MatchRegexAtHead("\\\\?b", "b"));
+  EXPECT_TRUE(MatchRegexAtHead("\\\\?b", "\\b"));
+}
+
+TEST(MatchRegexAtHeadTest, MatchesSequentially) {
+  EXPECT_FALSE(MatchRegexAtHead("ab.*c", "acabc"));
+
+  EXPECT_TRUE(MatchRegexAtHead("ab.*c", "ab-fsc"));
+}
+
+TEST(MatchRegexAnywhereTest, ReturnsFalseWhenStringIsNull) {
+  EXPECT_FALSE(MatchRegexAnywhere("", NULL));
+}
+
+TEST(MatchRegexAnywhereTest, WorksWhenRegexStartsWithCaret) {
+  EXPECT_FALSE(MatchRegexAnywhere("^a", "ba"));
+  EXPECT_FALSE(MatchRegexAnywhere("^$", "a"));
+
+  EXPECT_TRUE(MatchRegexAnywhere("^a", "ab"));
+  EXPECT_TRUE(MatchRegexAnywhere("^", "ab"));
+  EXPECT_TRUE(MatchRegexAnywhere("^$", ""));
+}
+
+TEST(MatchRegexAnywhereTest, ReturnsFalseWhenNoMatch) {
+  EXPECT_FALSE(MatchRegexAnywhere("a", "bcde123"));
+  EXPECT_FALSE(MatchRegexAnywhere("a.+a", "--aa88888888"));
+}
+
+TEST(MatchRegexAnywhereTest, ReturnsTrueWhenMatchingPrefix) {
+  EXPECT_TRUE(MatchRegexAnywhere("\\w+", "ab1_ - 5"));
+  EXPECT_TRUE(MatchRegexAnywhere(".*=", "="));
+  EXPECT_TRUE(MatchRegexAnywhere("x.*ab?.*bc", "xaaabc"));
+}
+
+TEST(MatchRegexAnywhereTest, ReturnsTrueWhenMatchingNonPrefix) {
+  EXPECT_TRUE(MatchRegexAnywhere("\\w+", "$$$ ab1_ - 5"));
+  EXPECT_TRUE(MatchRegexAnywhere("\\.+=", "=  ...="));
+}
+
+// Tests RE's implicit constructors.
+TEST(RETest, ImplicitConstructorWorks) {
+  const RE empty("");
+  EXPECT_STREQ("", empty.pattern());
+
+  const RE simple("hello");
+  EXPECT_STREQ("hello", simple.pattern());
+}
+
+// Tests that RE's constructors reject invalid regular expressions.
+TEST(RETest, RejectsInvalidRegex) {
+  EXPECT_NONFATAL_FAILURE({
+    const RE normal(NULL);
+  }, "NULL is not a valid simple regular expression");
+
+  EXPECT_NONFATAL_FAILURE({
+    const RE normal(".*(\\w+");
+  }, "'(' is unsupported");
+
+  EXPECT_NONFATAL_FAILURE({
+    const RE invalid("^?");
+  }, "'?' can only follow a repeatable token");
+}
+
+// Tests RE::FullMatch().
+TEST(RETest, FullMatchWorks) {
+  const RE empty("");
+  EXPECT_TRUE(RE::FullMatch("", empty));
+  EXPECT_FALSE(RE::FullMatch("a", empty));
+
+  const RE re1("a");
+  EXPECT_TRUE(RE::FullMatch("a", re1));
+
+  const RE re("a.*z");
+  EXPECT_TRUE(RE::FullMatch("az", re));
+  EXPECT_TRUE(RE::FullMatch("axyz", re));
+  EXPECT_FALSE(RE::FullMatch("baz", re));
+  EXPECT_FALSE(RE::FullMatch("azy", re));
+}
+
+// Tests RE::PartialMatch().
+TEST(RETest, PartialMatchWorks) {
+  const RE empty("");
+  EXPECT_TRUE(RE::PartialMatch("", empty));
+  EXPECT_TRUE(RE::PartialMatch("a", empty));
+
+  const RE re("a.*z");
+  EXPECT_TRUE(RE::PartialMatch("az", re));
+  EXPECT_TRUE(RE::PartialMatch("axyz", re));
+  EXPECT_TRUE(RE::PartialMatch("baz", re));
+  EXPECT_TRUE(RE::PartialMatch("azy", re));
+  EXPECT_FALSE(RE::PartialMatch("zza", re));
+}
+
+#endif  // GTEST_USES_POSIX_RE
+
+#if !GTEST_OS_WINDOWS_MOBILE
+
+TEST(CaptureTest, CapturesStdout) {
+  CaptureStdout();
+  fprintf(stdout, "abc");
+  EXPECT_STREQ("abc", GetCapturedStdout().c_str());
+
+  CaptureStdout();
+  fprintf(stdout, "def%cghi", '\0');
+  EXPECT_EQ(::std::string("def\0ghi", 7), ::std::string(GetCapturedStdout()));
+}
+
+TEST(CaptureTest, CapturesStderr) {
+  CaptureStderr();
+  fprintf(stderr, "jkl");
+  EXPECT_STREQ("jkl", GetCapturedStderr().c_str());
+
+  CaptureStderr();
+  fprintf(stderr, "jkl%cmno", '\0');
+  EXPECT_EQ(::std::string("jkl\0mno", 7), ::std::string(GetCapturedStderr()));
+}
+
+// Tests that stdout and stderr capture don't interfere with each other.
+TEST(CaptureTest, CapturesStdoutAndStderr) {
+  CaptureStdout();
+  CaptureStderr();
+  fprintf(stdout, "pqr");
+  fprintf(stderr, "stu");
+  EXPECT_STREQ("pqr", GetCapturedStdout().c_str());
+  EXPECT_STREQ("stu", GetCapturedStderr().c_str());
+}
+
+TEST(CaptureDeathTest, CannotReenterStdoutCapture) {
+  CaptureStdout();
+  EXPECT_DEATH_IF_SUPPORTED(CaptureStdout(),
+                            "Only one stdout capturer can exist at a time");
+  GetCapturedStdout();
+
+  // We cannot test stderr capturing using death tests as they use it
+  // themselves.
+}
+
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
+TEST(ThreadLocalTest, DefaultConstructorInitializesToDefaultValues) {
+  ThreadLocal<int> t1;
+  EXPECT_EQ(0, t1.get());
+
+  ThreadLocal<void*> t2;
+  EXPECT_TRUE(t2.get() == NULL);
+}
+
+TEST(ThreadLocalTest, SingleParamConstructorInitializesToParam) {
+  ThreadLocal<int> t1(123);
+  EXPECT_EQ(123, t1.get());
+
+  int i = 0;
+  ThreadLocal<int*> t2(&i);
+  EXPECT_EQ(&i, t2.get());
+}
+
+class NoDefaultContructor {
+ public:
+  explicit NoDefaultContructor(const char*) {}
+  NoDefaultContructor(const NoDefaultContructor&) {}
+};
+
+TEST(ThreadLocalTest, ValueDefaultContructorIsNotRequiredForParamVersion) {
+  ThreadLocal<NoDefaultContructor> bar(NoDefaultContructor("foo"));
+  bar.pointer();
+}
+
+TEST(ThreadLocalTest, GetAndPointerReturnSameValue) {
+  ThreadLocal<std::string> thread_local_string;
+
+  EXPECT_EQ(thread_local_string.pointer(), &(thread_local_string.get()));
+
+  // Verifies the condition still holds after calling set.
+  thread_local_string.set("foo");
+  EXPECT_EQ(thread_local_string.pointer(), &(thread_local_string.get()));
+}
+
+TEST(ThreadLocalTest, PointerAndConstPointerReturnSameValue) {
+  ThreadLocal<std::string> thread_local_string;
+  const ThreadLocal<std::string>& const_thread_local_string =
+      thread_local_string;
+
+  EXPECT_EQ(thread_local_string.pointer(), const_thread_local_string.pointer());
+
+  thread_local_string.set("foo");
+  EXPECT_EQ(thread_local_string.pointer(), const_thread_local_string.pointer());
+}
+
+#if GTEST_IS_THREADSAFE
+
+void AddTwo(int* param) { *param += 2; }
+
+TEST(ThreadWithParamTest, ConstructorExecutesThreadFunc) {
+  int i = 40;
+  ThreadWithParam<int*> thread(&AddTwo, &i, NULL);
+  thread.Join();
+  EXPECT_EQ(42, i);
+}
+
+TEST(MutexDeathTest, AssertHeldShouldAssertWhenNotLocked) {
+  // AssertHeld() is flaky only in the presence of multiple threads accessing
+  // the lock. In this case, the test is robust.
+  EXPECT_DEATH_IF_SUPPORTED({
+    Mutex m;
+    { MutexLock lock(&m); }
+    m.AssertHeld();
+  },
+  "thread .*hold");
+}
+
+TEST(MutexTest, AssertHeldShouldNotAssertWhenLocked) {
+  Mutex m;
+  MutexLock lock(&m);
+  m.AssertHeld();
+}
+
+class AtomicCounterWithMutex {
+ public:
+  explicit AtomicCounterWithMutex(Mutex* mutex) :
+    value_(0), mutex_(mutex), random_(42) {}
+
+  void Increment() {
+    MutexLock lock(mutex_);
+    int temp = value_;
+    {
+      // We need to put up a memory barrier to prevent reads and writes to
+      // value_ rearranged with the call to SleepMilliseconds when observed
+      // from other threads.
+#if GTEST_HAS_PTHREAD
+      // On POSIX, locking a mutex puts up a memory barrier.  We cannot use
+      // Mutex and MutexLock here or rely on their memory barrier
+      // functionality as we are testing them here.
+      pthread_mutex_t memory_barrier_mutex;
+      GTEST_CHECK_POSIX_SUCCESS_(
+          pthread_mutex_init(&memory_barrier_mutex, NULL));
+      GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&memory_barrier_mutex));
+
+      SleepMilliseconds(random_.Generate(30));
+
+      GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&memory_barrier_mutex));
+      GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&memory_barrier_mutex));
+#elif GTEST_OS_WINDOWS
+      // On Windows, performing an interlocked access puts up a memory barrier.
+      volatile LONG dummy = 0;
+      ::InterlockedIncrement(&dummy);
+      SleepMilliseconds(random_.Generate(30));
+      ::InterlockedIncrement(&dummy);
+#else
+# error "Memory barrier not implemented on this platform."
+#endif  // GTEST_HAS_PTHREAD
+    }
+    value_ = temp + 1;
+  }
+  int value() const { return value_; }
+
+ private:
+  volatile int value_;
+  Mutex* const mutex_;  // Protects value_.
+  Random       random_;
+};
+
+void CountingThreadFunc(pair<AtomicCounterWithMutex*, int> param) {
+  for (int i = 0; i < param.second; ++i)
+      param.first->Increment();
+}
+
+// Tests that the mutex only lets one thread at a time to lock it.
+TEST(MutexTest, OnlyOneThreadCanLockAtATime) {
+  Mutex mutex;
+  AtomicCounterWithMutex locked_counter(&mutex);
+
+  typedef ThreadWithParam<pair<AtomicCounterWithMutex*, int> > ThreadType;
+  const int kCycleCount = 20;
+  const int kThreadCount = 7;
+  scoped_ptr<ThreadType> counting_threads[kThreadCount];
+  Notification threads_can_start;
+  // Creates and runs kThreadCount threads that increment locked_counter
+  // kCycleCount times each.
+  for (int i = 0; i < kThreadCount; ++i) {
+    counting_threads[i].reset(new ThreadType(&CountingThreadFunc,
+                                             make_pair(&locked_counter,
+                                                       kCycleCount),
+                                             &threads_can_start));
+  }
+  threads_can_start.Notify();
+  for (int i = 0; i < kThreadCount; ++i)
+    counting_threads[i]->Join();
+
+  // If the mutex lets more than one thread to increment the counter at a
+  // time, they are likely to encounter a race condition and have some
+  // increments overwritten, resulting in the lower then expected counter
+  // value.
+  EXPECT_EQ(kCycleCount * kThreadCount, locked_counter.value());
+}
+
+template <typename T>
+void RunFromThread(void (func)(T), T param) {
+  ThreadWithParam<T> thread(func, param, NULL);
+  thread.Join();
+}
+
+void RetrieveThreadLocalValue(
+    pair<ThreadLocal<std::string>*, std::string*> param) {
+  *param.second = param.first->get();
+}
+
+TEST(ThreadLocalTest, ParameterizedConstructorSetsDefault) {
+  ThreadLocal<std::string> thread_local_string("foo");
+  EXPECT_STREQ("foo", thread_local_string.get().c_str());
+
+  thread_local_string.set("bar");
+  EXPECT_STREQ("bar", thread_local_string.get().c_str());
+
+  std::string result;
+  RunFromThread(&RetrieveThreadLocalValue,
+                make_pair(&thread_local_string, &result));
+  EXPECT_STREQ("foo", result.c_str());
+}
+
+// Keeps track of whether of destructors being called on instances of
+// DestructorTracker.  On Windows, waits for the destructor call reports.
+class DestructorCall {
+ public:
+  DestructorCall() {
+    invoked_ = false;
+#if GTEST_OS_WINDOWS
+    wait_event_.Reset(::CreateEvent(NULL, TRUE, FALSE, NULL));
+    GTEST_CHECK_(wait_event_.Get() != NULL);
+#endif
+  }
+
+  bool CheckDestroyed() const {
+#if GTEST_OS_WINDOWS
+    if (::WaitForSingleObject(wait_event_.Get(), 1000) != WAIT_OBJECT_0)
+      return false;
+#endif
+    return invoked_;
+  }
+
+  void ReportDestroyed() {
+    invoked_ = true;
+#if GTEST_OS_WINDOWS
+    ::SetEvent(wait_event_.Get());
+#endif
+  }
+
+  static std::vector<DestructorCall*>& List() { return *list_; }
+
+  static void ResetList() {
+    for (size_t i = 0; i < list_->size(); ++i) {
+      delete list_->at(i);
+    }
+    list_->clear();
+  }
+
+ private:
+  bool invoked_;
+#if GTEST_OS_WINDOWS
+  AutoHandle wait_event_;
+#endif
+  static std::vector<DestructorCall*>* const list_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(DestructorCall);
+};
+
+std::vector<DestructorCall*>* const DestructorCall::list_ =
+    new std::vector<DestructorCall*>;
+
+// DestructorTracker keeps track of whether its instances have been
+// destroyed.
+class DestructorTracker {
+ public:
+  DestructorTracker() : index_(GetNewIndex()) {}
+  DestructorTracker(const DestructorTracker& /* rhs */)
+      : index_(GetNewIndex()) {}
+  ~DestructorTracker() {
+    // We never access DestructorCall::List() concurrently, so we don't need
+    // to protect this acccess with a mutex.
+    DestructorCall::List()[index_]->ReportDestroyed();
+  }
+
+ private:
+  static size_t GetNewIndex() {
+    DestructorCall::List().push_back(new DestructorCall);
+    return DestructorCall::List().size() - 1;
+  }
+  const size_t index_;
+
+  GTEST_DISALLOW_ASSIGN_(DestructorTracker);
+};
+
+typedef ThreadLocal<DestructorTracker>* ThreadParam;
+
+void CallThreadLocalGet(ThreadParam thread_local_param) {
+  thread_local_param->get();
+}
+
+// Tests that when a ThreadLocal object dies in a thread, it destroys
+// the managed object for that thread.
+TEST(ThreadLocalTest, DestroysManagedObjectForOwnThreadWhenDying) {
+  DestructorCall::ResetList();
+
+  {
+    ThreadLocal<DestructorTracker> thread_local_tracker;
+    ASSERT_EQ(0U, DestructorCall::List().size());
+
+    // This creates another DestructorTracker object for the main thread.
+    thread_local_tracker.get();
+    ASSERT_EQ(1U, DestructorCall::List().size());
+    ASSERT_FALSE(DestructorCall::List()[0]->CheckDestroyed());
+  }
+
+  // Now thread_local_tracker has died.
+  ASSERT_EQ(1U, DestructorCall::List().size());
+  EXPECT_TRUE(DestructorCall::List()[0]->CheckDestroyed());
+
+  DestructorCall::ResetList();
+}
+
+// Tests that when a thread exits, the thread-local object for that
+// thread is destroyed.
+TEST(ThreadLocalTest, DestroysManagedObjectAtThreadExit) {
+  DestructorCall::ResetList();
+
+  {
+    ThreadLocal<DestructorTracker> thread_local_tracker;
+    ASSERT_EQ(0U, DestructorCall::List().size());
+
+    // This creates another DestructorTracker object in the new thread.
+    ThreadWithParam<ThreadParam> thread(
+        &CallThreadLocalGet, &thread_local_tracker, NULL);
+    thread.Join();
+
+    // The thread has exited, and we should have a DestroyedTracker
+    // instance created for it. But it may not have been destroyed yet.
+    ASSERT_EQ(1U, DestructorCall::List().size());
+  }
+
+  // The thread has exited and thread_local_tracker has died.
+  ASSERT_EQ(1U, DestructorCall::List().size());
+  EXPECT_TRUE(DestructorCall::List()[0]->CheckDestroyed());
+
+  DestructorCall::ResetList();
+}
+
+TEST(ThreadLocalTest, ThreadLocalMutationsAffectOnlyCurrentThread) {
+  ThreadLocal<std::string> thread_local_string;
+  thread_local_string.set("Foo");
+  EXPECT_STREQ("Foo", thread_local_string.get().c_str());
+
+  std::string result;
+  RunFromThread(&RetrieveThreadLocalValue,
+                make_pair(&thread_local_string, &result));
+  EXPECT_TRUE(result.empty());
+}
+
+#endif  // GTEST_IS_THREADSAFE
+
+#if GTEST_OS_WINDOWS
+TEST(WindowsTypesTest, HANDLEIsVoidStar) {
+  StaticAssertTypeEq<HANDLE, void*>();
+}
+
+TEST(WindowsTypesTest, CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION) {
+  StaticAssertTypeEq<CRITICAL_SECTION, _RTL_CRITICAL_SECTION>();
+}
+#endif  // GTEST_OS_WINDOWS
+
+}  // namespace internal
+}  // namespace testing
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-printers_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-printers_test.cc
new file mode 100644
index 0000000000..3e97cc24ab
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-printers_test.cc
@@ -0,0 +1,1635 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Google Test - The Google C++ Testing Framework
+//
+// This file tests the universal value printer.
+
+#include "gtest/gtest-printers.h"
+
+#include <ctype.h>
+#include <limits.h>
+#include <string.h>
+#include <algorithm>
+#include <deque>
+#include <list>
+#include <map>
+#include <set>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "gtest/gtest.h"
+
+// hash_map and hash_set are available under Visual C++, or on Linux.
+#if GTEST_HAS_HASH_MAP_
+# include <hash_map>            // NOLINT
+#endif  // GTEST_HAS_HASH_MAP_
+#if GTEST_HAS_HASH_SET_
+# include <hash_set>            // NOLINT
+#endif  // GTEST_HAS_HASH_SET_
+
+#if GTEST_HAS_STD_FORWARD_LIST_
+# include <forward_list> // NOLINT
+#endif  // GTEST_HAS_STD_FORWARD_LIST_
+
+// Some user-defined types for testing the universal value printer.
+
+// An anonymous enum type.
+enum AnonymousEnum {
+  kAE1 = -1,
+  kAE2 = 1
+};
+
+// An enum without a user-defined printer.
+enum EnumWithoutPrinter {
+  kEWP1 = -2,
+  kEWP2 = 42
+};
+
+// An enum with a << operator.
+enum EnumWithStreaming {
+  kEWS1 = 10
+};
+
+std::ostream& operator<<(std::ostream& os, EnumWithStreaming e) {
+  return os << (e == kEWS1 ? "kEWS1" : "invalid");
+}
+
+// An enum with a PrintTo() function.
+enum EnumWithPrintTo {
+  kEWPT1 = 1
+};
+
+void PrintTo(EnumWithPrintTo e, std::ostream* os) {
+  *os << (e == kEWPT1 ? "kEWPT1" : "invalid");
+}
+
+// A class implicitly convertible to BiggestInt.
+class BiggestIntConvertible {
+ public:
+  operator ::testing::internal::BiggestInt() const { return 42; }
+};
+
+// A user-defined unprintable class template in the global namespace.
+template <typename T>
+class UnprintableTemplateInGlobal {
+ public:
+  UnprintableTemplateInGlobal() : value_() {}
+ private:
+  T value_;
+};
+
+// A user-defined streamable type in the global namespace.
+class StreamableInGlobal {
+ public:
+  virtual ~StreamableInGlobal() {}
+};
+
+inline void operator<<(::std::ostream& os, const StreamableInGlobal& /* x */) {
+  os << "StreamableInGlobal";
+}
+
+void operator<<(::std::ostream& os, const StreamableInGlobal* /* x */) {
+  os << "StreamableInGlobal*";
+}
+
+namespace foo {
+
+// A user-defined unprintable type in a user namespace.
+class UnprintableInFoo {
+ public:
+  UnprintableInFoo() : z_(0) { memcpy(xy_, "\xEF\x12\x0\x0\x34\xAB\x0\x0", 8); }
+  double z() const { return z_; }
+ private:
+  char xy_[8];
+  double z_;
+};
+
+// A user-defined printable type in a user-chosen namespace.
+struct PrintableViaPrintTo {
+  PrintableViaPrintTo() : value() {}
+  int value;
+};
+
+void PrintTo(const PrintableViaPrintTo& x, ::std::ostream* os) {
+  *os << "PrintableViaPrintTo: " << x.value;
+}
+
+// A type with a user-defined << for printing its pointer.
+struct PointerPrintable {
+};
+
+::std::ostream& operator<<(::std::ostream& os,
+                           const PointerPrintable* /* x */) {
+  return os << "PointerPrintable*";
+}
+
+// A user-defined printable class template in a user-chosen namespace.
+template <typename T>
+class PrintableViaPrintToTemplate {
+ public:
+  explicit PrintableViaPrintToTemplate(const T& a_value) : value_(a_value) {}
+
+  const T& value() const { return value_; }
+ private:
+  T value_;
+};
+
+template <typename T>
+void PrintTo(const PrintableViaPrintToTemplate<T>& x, ::std::ostream* os) {
+  *os << "PrintableViaPrintToTemplate: " << x.value();
+}
+
+// A user-defined streamable class template in a user namespace.
+template <typename T>
+class StreamableTemplateInFoo {
+ public:
+  StreamableTemplateInFoo() : value_() {}
+
+  const T& value() const { return value_; }
+ private:
+  T value_;
+};
+
+template <typename T>
+inline ::std::ostream& operator<<(::std::ostream& os,
+                                  const StreamableTemplateInFoo<T>& x) {
+  return os << "StreamableTemplateInFoo: " << x.value();
+}
+
+}  // namespace foo
+
+namespace testing {
+namespace gtest_printers_test {
+
+using ::std::deque;
+using ::std::list;
+using ::std::make_pair;
+using ::std::map;
+using ::std::multimap;
+using ::std::multiset;
+using ::std::pair;
+using ::std::set;
+using ::std::vector;
+using ::testing::PrintToString;
+using ::testing::internal::FormatForComparisonFailureMessage;
+using ::testing::internal::ImplicitCast_;
+using ::testing::internal::NativeArray;
+using ::testing::internal::RE;
+using ::testing::internal::RelationToSourceReference;
+using ::testing::internal::Strings;
+using ::testing::internal::UniversalPrint;
+using ::testing::internal::UniversalPrinter;
+using ::testing::internal::UniversalTersePrint;
+using ::testing::internal::UniversalTersePrintTupleFieldsToStrings;
+using ::testing::internal::string;
+
+// The hash_* classes are not part of the C++ standard.  STLport
+// defines them in namespace std.  MSVC defines them in ::stdext.  GCC
+// defines them in ::.
+#ifdef _STLP_HASH_MAP  // We got <hash_map> from STLport.
+using ::std::hash_map;
+using ::std::hash_set;
+using ::std::hash_multimap;
+using ::std::hash_multiset;
+#elif _MSC_VER
+using ::stdext::hash_map;
+using ::stdext::hash_set;
+using ::stdext::hash_multimap;
+using ::stdext::hash_multiset;
+#endif
+
+// Prints a value to a string using the universal value printer.  This
+// is a helper for testing UniversalPrinter<T>::Print() for various types.
+template <typename T>
+string Print(const T& value) {
+  ::std::stringstream ss;
+  UniversalPrinter<T>::Print(value, &ss);
+  return ss.str();
+}
+
+// Prints a value passed by reference to a string, using the universal
+// value printer.  This is a helper for testing
+// UniversalPrinter<T&>::Print() for various types.
+template <typename T>
+string PrintByRef(const T& value) {
+  ::std::stringstream ss;
+  UniversalPrinter<T&>::Print(value, &ss);
+  return ss.str();
+}
+
+// Tests printing various enum types.
+
+TEST(PrintEnumTest, AnonymousEnum) {
+  EXPECT_EQ("-1", Print(kAE1));
+  EXPECT_EQ("1", Print(kAE2));
+}
+
+TEST(PrintEnumTest, EnumWithoutPrinter) {
+  EXPECT_EQ("-2", Print(kEWP1));
+  EXPECT_EQ("42", Print(kEWP2));
+}
+
+TEST(PrintEnumTest, EnumWithStreaming) {
+  EXPECT_EQ("kEWS1", Print(kEWS1));
+  EXPECT_EQ("invalid", Print(static_cast<EnumWithStreaming>(0)));
+}
+
+TEST(PrintEnumTest, EnumWithPrintTo) {
+  EXPECT_EQ("kEWPT1", Print(kEWPT1));
+  EXPECT_EQ("invalid", Print(static_cast<EnumWithPrintTo>(0)));
+}
+
+// Tests printing a class implicitly convertible to BiggestInt.
+
+TEST(PrintClassTest, BiggestIntConvertible) {
+  EXPECT_EQ("42", Print(BiggestIntConvertible()));
+}
+
+// Tests printing various char types.
+
+// char.
+TEST(PrintCharTest, PlainChar) {
+  EXPECT_EQ("'\\0'", Print('\0'));
+  EXPECT_EQ("'\\'' (39, 0x27)", Print('\''));
+  EXPECT_EQ("'\"' (34, 0x22)", Print('"'));
+  EXPECT_EQ("'?' (63, 0x3F)", Print('?'));
+  EXPECT_EQ("'\\\\' (92, 0x5C)", Print('\\'));
+  EXPECT_EQ("'\\a' (7)", Print('\a'));
+  EXPECT_EQ("'\\b' (8)", Print('\b'));
+  EXPECT_EQ("'\\f' (12, 0xC)", Print('\f'));
+  EXPECT_EQ("'\\n' (10, 0xA)", Print('\n'));
+  EXPECT_EQ("'\\r' (13, 0xD)", Print('\r'));
+  EXPECT_EQ("'\\t' (9)", Print('\t'));
+  EXPECT_EQ("'\\v' (11, 0xB)", Print('\v'));
+  EXPECT_EQ("'\\x7F' (127)", Print('\x7F'));
+  EXPECT_EQ("'\\xFF' (255)", Print('\xFF'));
+  EXPECT_EQ("' ' (32, 0x20)", Print(' '));
+  EXPECT_EQ("'a' (97, 0x61)", Print('a'));
+}
+
+// signed char.
+TEST(PrintCharTest, SignedChar) {
+  EXPECT_EQ("'\\0'", Print(static_cast<signed char>('\0')));
+  EXPECT_EQ("'\\xCE' (-50)",
+            Print(static_cast<signed char>(-50)));
+}
+
+// unsigned char.
+TEST(PrintCharTest, UnsignedChar) {
+  EXPECT_EQ("'\\0'", Print(static_cast<unsigned char>('\0')));
+  EXPECT_EQ("'b' (98, 0x62)",
+            Print(static_cast<unsigned char>('b')));
+}
+
+// Tests printing other simple, built-in types.
+
+// bool.
+TEST(PrintBuiltInTypeTest, Bool) {
+  EXPECT_EQ("false", Print(false));
+  EXPECT_EQ("true", Print(true));
+}
+
+// wchar_t.
+TEST(PrintBuiltInTypeTest, Wchar_t) {
+  EXPECT_EQ("L'\\0'", Print(L'\0'));
+  EXPECT_EQ("L'\\'' (39, 0x27)", Print(L'\''));
+  EXPECT_EQ("L'\"' (34, 0x22)", Print(L'"'));
+  EXPECT_EQ("L'?' (63, 0x3F)", Print(L'?'));
+  EXPECT_EQ("L'\\\\' (92, 0x5C)", Print(L'\\'));
+  EXPECT_EQ("L'\\a' (7)", Print(L'\a'));
+  EXPECT_EQ("L'\\b' (8)", Print(L'\b'));
+  EXPECT_EQ("L'\\f' (12, 0xC)", Print(L'\f'));
+  EXPECT_EQ("L'\\n' (10, 0xA)", Print(L'\n'));
+  EXPECT_EQ("L'\\r' (13, 0xD)", Print(L'\r'));
+  EXPECT_EQ("L'\\t' (9)", Print(L'\t'));
+  EXPECT_EQ("L'\\v' (11, 0xB)", Print(L'\v'));
+  EXPECT_EQ("L'\\x7F' (127)", Print(L'\x7F'));
+  EXPECT_EQ("L'\\xFF' (255)", Print(L'\xFF'));
+  EXPECT_EQ("L' ' (32, 0x20)", Print(L' '));
+  EXPECT_EQ("L'a' (97, 0x61)", Print(L'a'));
+  EXPECT_EQ("L'\\x576' (1398)", Print(static_cast<wchar_t>(0x576)));
+  EXPECT_EQ("L'\\xC74D' (51021)", Print(static_cast<wchar_t>(0xC74D)));
+}
+
+// Test that Int64 provides more storage than wchar_t.
+TEST(PrintTypeSizeTest, Wchar_t) {
+  EXPECT_LT(sizeof(wchar_t), sizeof(testing::internal::Int64));
+}
+
+// Various integer types.
+TEST(PrintBuiltInTypeTest, Integer) {
+  EXPECT_EQ("'\\xFF' (255)", Print(static_cast<unsigned char>(255)));  // uint8
+  EXPECT_EQ("'\\x80' (-128)", Print(static_cast<signed char>(-128)));  // int8
+  EXPECT_EQ("65535", Print(USHRT_MAX));  // uint16
+  EXPECT_EQ("-32768", Print(SHRT_MIN));  // int16
+  EXPECT_EQ("4294967295", Print(UINT_MAX));  // uint32
+  EXPECT_EQ("-2147483648", Print(INT_MIN));  // int32
+  EXPECT_EQ("18446744073709551615",
+            Print(static_cast<testing::internal::UInt64>(-1)));  // uint64
+  EXPECT_EQ("-9223372036854775808",
+            Print(static_cast<testing::internal::Int64>(1) << 63));  // int64
+}
+
+// Size types.
+TEST(PrintBuiltInTypeTest, Size_t) {
+  EXPECT_EQ("1", Print(sizeof('a')));  // size_t.
+#if !GTEST_OS_WINDOWS
+  // Windows has no ssize_t type.
+  EXPECT_EQ("-2", Print(static_cast<ssize_t>(-2)));  // ssize_t.
+#endif  // !GTEST_OS_WINDOWS
+}
+
+// Floating-points.
+TEST(PrintBuiltInTypeTest, FloatingPoints) {
+  EXPECT_EQ("1.5", Print(1.5f));   // float
+  EXPECT_EQ("-2.5", Print(-2.5));  // double
+}
+
+// Since ::std::stringstream::operator<<(const void *) formats the pointer
+// output differently with different compilers, we have to create the expected
+// output first and use it as our expectation.
+static string PrintPointer(const void *p) {
+  ::std::stringstream expected_result_stream;
+  expected_result_stream << p;
+  return expected_result_stream.str();
+}
+
+// Tests printing C strings.
+
+// const char*.
+TEST(PrintCStringTest, Const) {
+  const char* p = "World";
+  EXPECT_EQ(PrintPointer(p) + " pointing to \"World\"", Print(p));
+}
+
+// char*.
+TEST(PrintCStringTest, NonConst) {
+  char p[] = "Hi";
+  EXPECT_EQ(PrintPointer(p) + " pointing to \"Hi\"",
+            Print(static_cast<char*>(p)));
+}
+
+// NULL C string.
+TEST(PrintCStringTest, Null) {
+  const char* p = NULL;
+  EXPECT_EQ("NULL", Print(p));
+}
+
+// Tests that C strings are escaped properly.
+TEST(PrintCStringTest, EscapesProperly) {
+  const char* p = "'\"?\\\a\b\f\n\r\t\v\x7F\xFF a";
+  EXPECT_EQ(PrintPointer(p) + " pointing to \"'\\\"?\\\\\\a\\b\\f"
+            "\\n\\r\\t\\v\\x7F\\xFF a\"",
+            Print(p));
+}
+
+// MSVC compiler can be configured to define whar_t as a typedef
+// of unsigned short. Defining an overload for const wchar_t* in that case
+// would cause pointers to unsigned shorts be printed as wide strings,
+// possibly accessing more memory than intended and causing invalid
+// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when
+// wchar_t is implemented as a native type.
+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
+
+// const wchar_t*.
+TEST(PrintWideCStringTest, Const) {
+  const wchar_t* p = L"World";
+  EXPECT_EQ(PrintPointer(p) + " pointing to L\"World\"", Print(p));
+}
+
+// wchar_t*.
+TEST(PrintWideCStringTest, NonConst) {
+  wchar_t p[] = L"Hi";
+  EXPECT_EQ(PrintPointer(p) + " pointing to L\"Hi\"",
+            Print(static_cast<wchar_t*>(p)));
+}
+
+// NULL wide C string.
+TEST(PrintWideCStringTest, Null) {
+  const wchar_t* p = NULL;
+  EXPECT_EQ("NULL", Print(p));
+}
+
+// Tests that wide C strings are escaped properly.
+TEST(PrintWideCStringTest, EscapesProperly) {
+  const wchar_t s[] = {'\'', '"', '?', '\\', '\a', '\b', '\f', '\n', '\r',
+                       '\t', '\v', 0xD3, 0x576, 0x8D3, 0xC74D, ' ', 'a', '\0'};
+  EXPECT_EQ(PrintPointer(s) + " pointing to L\"'\\\"?\\\\\\a\\b\\f"
+            "\\n\\r\\t\\v\\xD3\\x576\\x8D3\\xC74D a\"",
+            Print(static_cast<const wchar_t*>(s)));
+}
+#endif  // native wchar_t
+
+// Tests printing pointers to other char types.
+
+// signed char*.
+TEST(PrintCharPointerTest, SignedChar) {
+  signed char* p = reinterpret_cast<signed char*>(0x1234);
+  EXPECT_EQ(PrintPointer(p), Print(p));
+  p = NULL;
+  EXPECT_EQ("NULL", Print(p));
+}
+
+// const signed char*.
+TEST(PrintCharPointerTest, ConstSignedChar) {
+  signed char* p = reinterpret_cast<signed char*>(0x1234);
+  EXPECT_EQ(PrintPointer(p), Print(p));
+  p = NULL;
+  EXPECT_EQ("NULL", Print(p));
+}
+
+// unsigned char*.
+TEST(PrintCharPointerTest, UnsignedChar) {
+  unsigned char* p = reinterpret_cast<unsigned char*>(0x1234);
+  EXPECT_EQ(PrintPointer(p), Print(p));
+  p = NULL;
+  EXPECT_EQ("NULL", Print(p));
+}
+
+// const unsigned char*.
+TEST(PrintCharPointerTest, ConstUnsignedChar) {
+  const unsigned char* p = reinterpret_cast<const unsigned char*>(0x1234);
+  EXPECT_EQ(PrintPointer(p), Print(p));
+  p = NULL;
+  EXPECT_EQ("NULL", Print(p));
+}
+
+// Tests printing pointers to simple, built-in types.
+
+// bool*.
+TEST(PrintPointerToBuiltInTypeTest, Bool) {
+  bool* p = reinterpret_cast<bool*>(0xABCD);
+  EXPECT_EQ(PrintPointer(p), Print(p));
+  p = NULL;
+  EXPECT_EQ("NULL", Print(p));
+}
+
+// void*.
+TEST(PrintPointerToBuiltInTypeTest, Void) {
+  void* p = reinterpret_cast<void*>(0xABCD);
+  EXPECT_EQ(PrintPointer(p), Print(p));
+  p = NULL;
+  EXPECT_EQ("NULL", Print(p));
+}
+
+// const void*.
+TEST(PrintPointerToBuiltInTypeTest, ConstVoid) {
+  const void* p = reinterpret_cast<const void*>(0xABCD);
+  EXPECT_EQ(PrintPointer(p), Print(p));
+  p = NULL;
+  EXPECT_EQ("NULL", Print(p));
+}
+
+// Tests printing pointers to pointers.
+TEST(PrintPointerToPointerTest, IntPointerPointer) {
+  int** p = reinterpret_cast<int**>(0xABCD);
+  EXPECT_EQ(PrintPointer(p), Print(p));
+  p = NULL;
+  EXPECT_EQ("NULL", Print(p));
+}
+
+// Tests printing (non-member) function pointers.
+
+void MyFunction(int /* n */) {}
+
+TEST(PrintPointerTest, NonMemberFunctionPointer) {
+  // We cannot directly cast &MyFunction to const void* because the
+  // standard disallows casting between pointers to functions and
+  // pointers to objects, and some compilers (e.g. GCC 3.4) enforce
+  // this limitation.
+  EXPECT_EQ(
+      PrintPointer(reinterpret_cast<const void*>(
+          reinterpret_cast<internal::BiggestInt>(&MyFunction))),
+      Print(&MyFunction));
+  int (*p)(bool) = NULL;  // NOLINT
+  EXPECT_EQ("NULL", Print(p));
+}
+
+// An assertion predicate determining whether a one string is a prefix for
+// another.
+template <typename StringType>
+AssertionResult HasPrefix(const StringType& str, const StringType& prefix) {
+  if (str.find(prefix, 0) == 0)
+    return AssertionSuccess();
+
+  const bool is_wide_string = sizeof(prefix[0]) > 1;
+  const char* const begin_string_quote = is_wide_string ? "L\"" : "\"";
+  return AssertionFailure()
+      << begin_string_quote << prefix << "\" is not a prefix of "
+      << begin_string_quote << str << "\"\n";
+}
+
+// Tests printing member variable pointers.  Although they are called
+// pointers, they don't point to a location in the address space.
+// Their representation is implementation-defined.  Thus they will be
+// printed as raw bytes.
+
+struct Foo {
+ public:
+  virtual ~Foo() {}
+  int MyMethod(char x) { return x + 1; }
+  virtual char MyVirtualMethod(int /* n */) { return 'a'; }
+
+  int value;
+};
+
+TEST(PrintPointerTest, MemberVariablePointer) {
+  EXPECT_TRUE(HasPrefix(Print(&Foo::value),
+                        Print(sizeof(&Foo::value)) + "-byte object "));
+  int (Foo::*p) = NULL;  // NOLINT
+  EXPECT_TRUE(HasPrefix(Print(p),
+                        Print(sizeof(p)) + "-byte object "));
+}
+
+// Tests printing member function pointers.  Although they are called
+// pointers, they don't point to a location in the address space.
+// Their representation is implementation-defined.  Thus they will be
+// printed as raw bytes.
+TEST(PrintPointerTest, MemberFunctionPointer) {
+  EXPECT_TRUE(HasPrefix(Print(&Foo::MyMethod),
+                        Print(sizeof(&Foo::MyMethod)) + "-byte object "));
+  EXPECT_TRUE(
+      HasPrefix(Print(&Foo::MyVirtualMethod),
+                Print(sizeof((&Foo::MyVirtualMethod))) + "-byte object "));
+  int (Foo::*p)(char) = NULL;  // NOLINT
+  EXPECT_TRUE(HasPrefix(Print(p),
+                        Print(sizeof(p)) + "-byte object "));
+}
+
+// Tests printing C arrays.
+
+// The difference between this and Print() is that it ensures that the
+// argument is a reference to an array.
+template <typename T, size_t N>
+string PrintArrayHelper(T (&a)[N]) {
+  return Print(a);
+}
+
+// One-dimensional array.
+TEST(PrintArrayTest, OneDimensionalArray) {
+  int a[5] = { 1, 2, 3, 4, 5 };
+  EXPECT_EQ("{ 1, 2, 3, 4, 5 }", PrintArrayHelper(a));
+}
+
+// Two-dimensional array.
+TEST(PrintArrayTest, TwoDimensionalArray) {
+  int a[2][5] = {
+    { 1, 2, 3, 4, 5 },
+    { 6, 7, 8, 9, 0 }
+  };
+  EXPECT_EQ("{ { 1, 2, 3, 4, 5 }, { 6, 7, 8, 9, 0 } }", PrintArrayHelper(a));
+}
+
+// Array of const elements.
+TEST(PrintArrayTest, ConstArray) {
+  const bool a[1] = { false };
+  EXPECT_EQ("{ false }", PrintArrayHelper(a));
+}
+
+// char array without terminating NUL.
+TEST(PrintArrayTest, CharArrayWithNoTerminatingNul) {
+  // Array a contains '\0' in the middle and doesn't end with '\0'.
+  char a[] = { 'H', '\0', 'i' };
+  EXPECT_EQ("\"H\\0i\" (no terminating NUL)", PrintArrayHelper(a));
+}
+
+// const char array with terminating NUL.
+TEST(PrintArrayTest, ConstCharArrayWithTerminatingNul) {
+  const char a[] = "\0Hi";
+  EXPECT_EQ("\"\\0Hi\"", PrintArrayHelper(a));
+}
+
+// const wchar_t array without terminating NUL.
+TEST(PrintArrayTest, WCharArrayWithNoTerminatingNul) {
+  // Array a contains '\0' in the middle and doesn't end with '\0'.
+  const wchar_t a[] = { L'H', L'\0', L'i' };
+  EXPECT_EQ("L\"H\\0i\" (no terminating NUL)", PrintArrayHelper(a));
+}
+
+// wchar_t array with terminating NUL.
+TEST(PrintArrayTest, WConstCharArrayWithTerminatingNul) {
+  const wchar_t a[] = L"\0Hi";
+  EXPECT_EQ("L\"\\0Hi\"", PrintArrayHelper(a));
+}
+
+// Array of objects.
+TEST(PrintArrayTest, ObjectArray) {
+  string a[3] = { "Hi", "Hello", "Ni hao" };
+  EXPECT_EQ("{ \"Hi\", \"Hello\", \"Ni hao\" }", PrintArrayHelper(a));
+}
+
+// Array with many elements.
+TEST(PrintArrayTest, BigArray) {
+  int a[100] = { 1, 2, 3 };
+  EXPECT_EQ("{ 1, 2, 3, 0, 0, 0, 0, 0, ..., 0, 0, 0, 0, 0, 0, 0, 0 }",
+            PrintArrayHelper(a));
+}
+
+// Tests printing ::string and ::std::string.
+
+#if GTEST_HAS_GLOBAL_STRING
+// ::string.
+TEST(PrintStringTest, StringInGlobalNamespace) {
+  const char s[] = "'\"?\\\a\b\f\n\0\r\t\v\x7F\xFF a";
+  const ::string str(s, sizeof(s));
+  EXPECT_EQ("\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v\\x7F\\xFF a\\0\"",
+            Print(str));
+}
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+// ::std::string.
+TEST(PrintStringTest, StringInStdNamespace) {
+  const char s[] = "'\"?\\\a\b\f\n\0\r\t\v\x7F\xFF a";
+  const ::std::string str(s, sizeof(s));
+  EXPECT_EQ("\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v\\x7F\\xFF a\\0\"",
+            Print(str));
+}
+
+TEST(PrintStringTest, StringAmbiguousHex) {
+  // "\x6BANANA" is ambiguous, it can be interpreted as starting with either of:
+  // '\x6', '\x6B', or '\x6BA'.
+
+  // a hex escaping sequence following by a decimal digit
+  EXPECT_EQ("\"0\\x12\" \"3\"", Print(::std::string("0\x12" "3")));
+  // a hex escaping sequence following by a hex digit (lower-case)
+  EXPECT_EQ("\"mm\\x6\" \"bananas\"", Print(::std::string("mm\x6" "bananas")));
+  // a hex escaping sequence following by a hex digit (upper-case)
+  EXPECT_EQ("\"NOM\\x6\" \"BANANA\"", Print(::std::string("NOM\x6" "BANANA")));
+  // a hex escaping sequence following by a non-xdigit
+  EXPECT_EQ("\"!\\x5-!\"", Print(::std::string("!\x5-!")));
+}
+
+// Tests printing ::wstring and ::std::wstring.
+
+#if GTEST_HAS_GLOBAL_WSTRING
+// ::wstring.
+TEST(PrintWideStringTest, StringInGlobalNamespace) {
+  const wchar_t s[] = L"'\"?\\\a\b\f\n\0\r\t\v\xD3\x576\x8D3\xC74D a";
+  const ::wstring str(s, sizeof(s)/sizeof(wchar_t));
+  EXPECT_EQ("L\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v"
+            "\\xD3\\x576\\x8D3\\xC74D a\\0\"",
+            Print(str));
+}
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+#if GTEST_HAS_STD_WSTRING
+// ::std::wstring.
+TEST(PrintWideStringTest, StringInStdNamespace) {
+  const wchar_t s[] = L"'\"?\\\a\b\f\n\0\r\t\v\xD3\x576\x8D3\xC74D a";
+  const ::std::wstring str(s, sizeof(s)/sizeof(wchar_t));
+  EXPECT_EQ("L\"'\\\"?\\\\\\a\\b\\f\\n\\0\\r\\t\\v"
+            "\\xD3\\x576\\x8D3\\xC74D a\\0\"",
+            Print(str));
+}
+
+TEST(PrintWideStringTest, StringAmbiguousHex) {
+  // same for wide strings.
+  EXPECT_EQ("L\"0\\x12\" L\"3\"", Print(::std::wstring(L"0\x12" L"3")));
+  EXPECT_EQ("L\"mm\\x6\" L\"bananas\"",
+            Print(::std::wstring(L"mm\x6" L"bananas")));
+  EXPECT_EQ("L\"NOM\\x6\" L\"BANANA\"",
+            Print(::std::wstring(L"NOM\x6" L"BANANA")));
+  EXPECT_EQ("L\"!\\x5-!\"", Print(::std::wstring(L"!\x5-!")));
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+// Tests printing types that support generic streaming (i.e. streaming
+// to std::basic_ostream<Char, CharTraits> for any valid Char and
+// CharTraits types).
+
+// Tests printing a non-template type that supports generic streaming.
+
+class AllowsGenericStreaming {};
+
+template <typename Char, typename CharTraits>
+std::basic_ostream<Char, CharTraits>& operator<<(
+    std::basic_ostream<Char, CharTraits>& os,
+    const AllowsGenericStreaming& /* a */) {
+  return os << "AllowsGenericStreaming";
+}
+
+TEST(PrintTypeWithGenericStreamingTest, NonTemplateType) {
+  AllowsGenericStreaming a;
+  EXPECT_EQ("AllowsGenericStreaming", Print(a));
+}
+
+// Tests printing a template type that supports generic streaming.
+
+template <typename T>
+class AllowsGenericStreamingTemplate {};
+
+template <typename Char, typename CharTraits, typename T>
+std::basic_ostream<Char, CharTraits>& operator<<(
+    std::basic_ostream<Char, CharTraits>& os,
+    const AllowsGenericStreamingTemplate<T>& /* a */) {
+  return os << "AllowsGenericStreamingTemplate";
+}
+
+TEST(PrintTypeWithGenericStreamingTest, TemplateType) {
+  AllowsGenericStreamingTemplate<int> a;
+  EXPECT_EQ("AllowsGenericStreamingTemplate", Print(a));
+}
+
+// Tests printing a type that supports generic streaming and can be
+// implicitly converted to another printable type.
+
+template <typename T>
+class AllowsGenericStreamingAndImplicitConversionTemplate {
+ public:
+  operator bool() const { return false; }
+};
+
+template <typename Char, typename CharTraits, typename T>
+std::basic_ostream<Char, CharTraits>& operator<<(
+    std::basic_ostream<Char, CharTraits>& os,
+    const AllowsGenericStreamingAndImplicitConversionTemplate<T>& /* a */) {
+  return os << "AllowsGenericStreamingAndImplicitConversionTemplate";
+}
+
+TEST(PrintTypeWithGenericStreamingTest, TypeImplicitlyConvertible) {
+  AllowsGenericStreamingAndImplicitConversionTemplate<int> a;
+  EXPECT_EQ("AllowsGenericStreamingAndImplicitConversionTemplate", Print(a));
+}
+
+#if GTEST_HAS_STRING_PIECE_
+
+// Tests printing StringPiece.
+
+TEST(PrintStringPieceTest, SimpleStringPiece) {
+  const StringPiece sp = "Hello";
+  EXPECT_EQ("\"Hello\"", Print(sp));
+}
+
+TEST(PrintStringPieceTest, UnprintableCharacters) {
+  const char str[] = "NUL (\0) and \r\t";
+  const StringPiece sp(str, sizeof(str) - 1);
+  EXPECT_EQ("\"NUL (\\0) and \\r\\t\"", Print(sp));
+}
+
+#endif  // GTEST_HAS_STRING_PIECE_
+
+// Tests printing STL containers.
+
+TEST(PrintStlContainerTest, EmptyDeque) {
+  deque<char> empty;
+  EXPECT_EQ("{}", Print(empty));
+}
+
+TEST(PrintStlContainerTest, NonEmptyDeque) {
+  deque<int> non_empty;
+  non_empty.push_back(1);
+  non_empty.push_back(3);
+  EXPECT_EQ("{ 1, 3 }", Print(non_empty));
+}
+
+#if GTEST_HAS_HASH_MAP_
+
+TEST(PrintStlContainerTest, OneElementHashMap) {
+  hash_map<int, char> map1;
+  map1[1] = 'a';
+  EXPECT_EQ("{ (1, 'a' (97, 0x61)) }", Print(map1));
+}
+
+TEST(PrintStlContainerTest, HashMultiMap) {
+  hash_multimap<int, bool> map1;
+  map1.insert(make_pair(5, true));
+  map1.insert(make_pair(5, false));
+
+  // Elements of hash_multimap can be printed in any order.
+  const string result = Print(map1);
+  EXPECT_TRUE(result == "{ (5, true), (5, false) }" ||
+              result == "{ (5, false), (5, true) }")
+                  << " where Print(map1) returns \"" << result << "\".";
+}
+
+#endif  // GTEST_HAS_HASH_MAP_
+
+#if GTEST_HAS_HASH_SET_
+
+TEST(PrintStlContainerTest, HashSet) {
+  hash_set<string> set1;
+  set1.insert("hello");
+  EXPECT_EQ("{ \"hello\" }", Print(set1));
+}
+
+TEST(PrintStlContainerTest, HashMultiSet) {
+  const int kSize = 5;
+  int a[kSize] = { 1, 1, 2, 5, 1 };
+  hash_multiset<int> set1(a, a + kSize);
+
+  // Elements of hash_multiset can be printed in any order.
+  const string result = Print(set1);
+  const string expected_pattern = "{ d, d, d, d, d }";  // d means a digit.
+
+  // Verifies the result matches the expected pattern; also extracts
+  // the numbers in the result.
+  ASSERT_EQ(expected_pattern.length(), result.length());
+  std::vector<int> numbers;
+  for (size_t i = 0; i != result.length(); i++) {
+    if (expected_pattern[i] == 'd') {
+      ASSERT_NE(isdigit(static_cast<unsigned char>(result[i])), 0);
+      numbers.push_back(result[i] - '0');
+    } else {
+      EXPECT_EQ(expected_pattern[i], result[i]) << " where result is "
+                                                << result;
+    }
+  }
+
+  // Makes sure the result contains the right numbers.
+  std::sort(numbers.begin(), numbers.end());
+  std::sort(a, a + kSize);
+  EXPECT_TRUE(std::equal(a, a + kSize, numbers.begin()));
+}
+
+#endif  // GTEST_HAS_HASH_SET_
+
+TEST(PrintStlContainerTest, List) {
+  const string a[] = {
+    "hello",
+    "world"
+  };
+  const list<string> strings(a, a + 2);
+  EXPECT_EQ("{ \"hello\", \"world\" }", Print(strings));
+}
+
+TEST(PrintStlContainerTest, Map) {
+  map<int, bool> map1;
+  map1[1] = true;
+  map1[5] = false;
+  map1[3] = true;
+  EXPECT_EQ("{ (1, true), (3, true), (5, false) }", Print(map1));
+}
+
+TEST(PrintStlContainerTest, MultiMap) {
+  multimap<bool, int> map1;
+  // The make_pair template function would deduce the type as
+  // pair<bool, int> here, and since the key part in a multimap has to
+  // be constant, without a templated ctor in the pair class (as in
+  // libCstd on Solaris), make_pair call would fail to compile as no
+  // implicit conversion is found.  Thus explicit typename is used
+  // here instead.
+  map1.insert(pair<const bool, int>(true, 0));
+  map1.insert(pair<const bool, int>(true, 1));
+  map1.insert(pair<const bool, int>(false, 2));
+  EXPECT_EQ("{ (false, 2), (true, 0), (true, 1) }", Print(map1));
+}
+
+TEST(PrintStlContainerTest, Set) {
+  const unsigned int a[] = { 3, 0, 5 };
+  set<unsigned int> set1(a, a + 3);
+  EXPECT_EQ("{ 0, 3, 5 }", Print(set1));
+}
+
+TEST(PrintStlContainerTest, MultiSet) {
+  const int a[] = { 1, 1, 2, 5, 1 };
+  multiset<int> set1(a, a + 5);
+  EXPECT_EQ("{ 1, 1, 1, 2, 5 }", Print(set1));
+}
+
+#if GTEST_HAS_STD_FORWARD_LIST_
+// <slist> is available on Linux in the google3 mode, but not on
+// Windows or Mac OS X.
+
+TEST(PrintStlContainerTest, SinglyLinkedList) {
+  int a[] = { 9, 2, 8 };
+  const std::forward_list<int> ints(a, a + 3);
+  EXPECT_EQ("{ 9, 2, 8 }", Print(ints));
+}
+#endif  // GTEST_HAS_STD_FORWARD_LIST_
+
+TEST(PrintStlContainerTest, Pair) {
+  pair<const bool, int> p(true, 5);
+  EXPECT_EQ("(true, 5)", Print(p));
+}
+
+TEST(PrintStlContainerTest, Vector) {
+  vector<int> v;
+  v.push_back(1);
+  v.push_back(2);
+  EXPECT_EQ("{ 1, 2 }", Print(v));
+}
+
+TEST(PrintStlContainerTest, LongSequence) {
+  const int a[100] = { 1, 2, 3 };
+  const vector<int> v(a, a + 100);
+  EXPECT_EQ("{ 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "
+            "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ... }", Print(v));
+}
+
+TEST(PrintStlContainerTest, NestedContainer) {
+  const int a1[] = { 1, 2 };
+  const int a2[] = { 3, 4, 5 };
+  const list<int> l1(a1, a1 + 2);
+  const list<int> l2(a2, a2 + 3);
+
+  vector<list<int> > v;
+  v.push_back(l1);
+  v.push_back(l2);
+  EXPECT_EQ("{ { 1, 2 }, { 3, 4, 5 } }", Print(v));
+}
+
+TEST(PrintStlContainerTest, OneDimensionalNativeArray) {
+  const int a[3] = { 1, 2, 3 };
+  NativeArray<int> b(a, 3, RelationToSourceReference());
+  EXPECT_EQ("{ 1, 2, 3 }", Print(b));
+}
+
+TEST(PrintStlContainerTest, TwoDimensionalNativeArray) {
+  const int a[2][3] = { { 1, 2, 3 }, { 4, 5, 6 } };
+  NativeArray<int[3]> b(a, 2, RelationToSourceReference());
+  EXPECT_EQ("{ { 1, 2, 3 }, { 4, 5, 6 } }", Print(b));
+}
+
+// Tests that a class named iterator isn't treated as a container.
+
+struct iterator {
+  char x;
+};
+
+TEST(PrintStlContainerTest, Iterator) {
+  iterator it = {};
+  EXPECT_EQ("1-byte object <00>", Print(it));
+}
+
+// Tests that a class named const_iterator isn't treated as a container.
+
+struct const_iterator {
+  char x;
+};
+
+TEST(PrintStlContainerTest, ConstIterator) {
+  const_iterator it = {};
+  EXPECT_EQ("1-byte object <00>", Print(it));
+}
+
+#if GTEST_HAS_TR1_TUPLE
+// Tests printing ::std::tr1::tuples.
+
+// Tuples of various arities.
+TEST(PrintTr1TupleTest, VariousSizes) {
+  ::std::tr1::tuple<> t0;
+  EXPECT_EQ("()", Print(t0));
+
+  ::std::tr1::tuple<int> t1(5);
+  EXPECT_EQ("(5)", Print(t1));
+
+  ::std::tr1::tuple<char, bool> t2('a', true);
+  EXPECT_EQ("('a' (97, 0x61), true)", Print(t2));
+
+  ::std::tr1::tuple<bool, int, int> t3(false, 2, 3);
+  EXPECT_EQ("(false, 2, 3)", Print(t3));
+
+  ::std::tr1::tuple<bool, int, int, int> t4(false, 2, 3, 4);
+  EXPECT_EQ("(false, 2, 3, 4)", Print(t4));
+
+  ::std::tr1::tuple<bool, int, int, int, bool> t5(false, 2, 3, 4, true);
+  EXPECT_EQ("(false, 2, 3, 4, true)", Print(t5));
+
+  ::std::tr1::tuple<bool, int, int, int, bool, int> t6(false, 2, 3, 4, true, 6);
+  EXPECT_EQ("(false, 2, 3, 4, true, 6)", Print(t6));
+
+  ::std::tr1::tuple<bool, int, int, int, bool, int, int> t7(
+      false, 2, 3, 4, true, 6, 7);
+  EXPECT_EQ("(false, 2, 3, 4, true, 6, 7)", Print(t7));
+
+  ::std::tr1::tuple<bool, int, int, int, bool, int, int, bool> t8(
+      false, 2, 3, 4, true, 6, 7, true);
+  EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true)", Print(t8));
+
+  ::std::tr1::tuple<bool, int, int, int, bool, int, int, bool, int> t9(
+      false, 2, 3, 4, true, 6, 7, true, 9);
+  EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true, 9)", Print(t9));
+
+  const char* const str = "8";
+  // VC++ 2010's implementation of tuple of C++0x is deficient, requiring
+  // an explicit type cast of NULL to be used.
+  ::std::tr1::tuple<bool, char, short, testing::internal::Int32,  // NOLINT
+      testing::internal::Int64, float, double, const char*, void*, string>
+      t10(false, 'a', 3, 4, 5, 1.5F, -2.5, str,
+          ImplicitCast_<void*>(NULL), "10");
+  EXPECT_EQ("(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer(str) +
+            " pointing to \"8\", NULL, \"10\")",
+            Print(t10));
+}
+
+// Nested tuples.
+TEST(PrintTr1TupleTest, NestedTuple) {
+  ::std::tr1::tuple< ::std::tr1::tuple<int, bool>, char> nested(
+      ::std::tr1::make_tuple(5, true), 'a');
+  EXPECT_EQ("((5, true), 'a' (97, 0x61))", Print(nested));
+}
+
+#endif  // GTEST_HAS_TR1_TUPLE
+
+#if GTEST_HAS_STD_TUPLE_
+// Tests printing ::std::tuples.
+
+// Tuples of various arities.
+TEST(PrintStdTupleTest, VariousSizes) {
+  ::std::tuple<> t0;
+  EXPECT_EQ("()", Print(t0));
+
+  ::std::tuple<int> t1(5);
+  EXPECT_EQ("(5)", Print(t1));
+
+  ::std::tuple<char, bool> t2('a', true);
+  EXPECT_EQ("('a' (97, 0x61), true)", Print(t2));
+
+  ::std::tuple<bool, int, int> t3(false, 2, 3);
+  EXPECT_EQ("(false, 2, 3)", Print(t3));
+
+  ::std::tuple<bool, int, int, int> t4(false, 2, 3, 4);
+  EXPECT_EQ("(false, 2, 3, 4)", Print(t4));
+
+  ::std::tuple<bool, int, int, int, bool> t5(false, 2, 3, 4, true);
+  EXPECT_EQ("(false, 2, 3, 4, true)", Print(t5));
+
+  ::std::tuple<bool, int, int, int, bool, int> t6(false, 2, 3, 4, true, 6);
+  EXPECT_EQ("(false, 2, 3, 4, true, 6)", Print(t6));
+
+  ::std::tuple<bool, int, int, int, bool, int, int> t7(
+      false, 2, 3, 4, true, 6, 7);
+  EXPECT_EQ("(false, 2, 3, 4, true, 6, 7)", Print(t7));
+
+  ::std::tuple<bool, int, int, int, bool, int, int, bool> t8(
+      false, 2, 3, 4, true, 6, 7, true);
+  EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true)", Print(t8));
+
+  ::std::tuple<bool, int, int, int, bool, int, int, bool, int> t9(
+      false, 2, 3, 4, true, 6, 7, true, 9);
+  EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true, 9)", Print(t9));
+
+  const char* const str = "8";
+  // VC++ 2010's implementation of tuple of C++0x is deficient, requiring
+  // an explicit type cast of NULL to be used.
+  ::std::tuple<bool, char, short, testing::internal::Int32,  // NOLINT
+      testing::internal::Int64, float, double, const char*, void*, string>
+      t10(false, 'a', 3, 4, 5, 1.5F, -2.5, str,
+          ImplicitCast_<void*>(NULL), "10");
+  EXPECT_EQ("(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer(str) +
+            " pointing to \"8\", NULL, \"10\")",
+            Print(t10));
+}
+
+// Nested tuples.
+TEST(PrintStdTupleTest, NestedTuple) {
+  ::std::tuple< ::std::tuple<int, bool>, char> nested(
+      ::std::make_tuple(5, true), 'a');
+  EXPECT_EQ("((5, true), 'a' (97, 0x61))", Print(nested));
+}
+
+#endif  // GTEST_LANG_CXX11
+
+// Tests printing user-defined unprintable types.
+
+// Unprintable types in the global namespace.
+TEST(PrintUnprintableTypeTest, InGlobalNamespace) {
+  EXPECT_EQ("1-byte object <00>",
+            Print(UnprintableTemplateInGlobal<char>()));
+}
+
+// Unprintable types in a user namespace.
+TEST(PrintUnprintableTypeTest, InUserNamespace) {
+  EXPECT_EQ("16-byte object <EF-12 00-00 34-AB 00-00 00-00 00-00 00-00 00-00>",
+            Print(::foo::UnprintableInFoo()));
+}
+
+// Unprintable types are that too big to be printed completely.
+
+struct Big {
+  Big() { memset(array, 0, sizeof(array)); }
+  char array[257];
+};
+
+TEST(PrintUnpritableTypeTest, BigObject) {
+  EXPECT_EQ("257-byte object <00-00 00-00 00-00 00-00 00-00 00-00 "
+            "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
+            "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
+            "00-00 00-00 00-00 00-00 00-00 00-00 ... 00-00 00-00 00-00 "
+            "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
+            "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 "
+            "00-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00 00>",
+            Print(Big()));
+}
+
+// Tests printing user-defined streamable types.
+
+// Streamable types in the global namespace.
+TEST(PrintStreamableTypeTest, InGlobalNamespace) {
+  StreamableInGlobal x;
+  EXPECT_EQ("StreamableInGlobal", Print(x));
+  EXPECT_EQ("StreamableInGlobal*", Print(&x));
+}
+
+// Printable template types in a user namespace.
+TEST(PrintStreamableTypeTest, TemplateTypeInUserNamespace) {
+  EXPECT_EQ("StreamableTemplateInFoo: 0",
+            Print(::foo::StreamableTemplateInFoo<int>()));
+}
+
+// Tests printing user-defined types that have a PrintTo() function.
+TEST(PrintPrintableTypeTest, InUserNamespace) {
+  EXPECT_EQ("PrintableViaPrintTo: 0",
+            Print(::foo::PrintableViaPrintTo()));
+}
+
+// Tests printing a pointer to a user-defined type that has a <<
+// operator for its pointer.
+TEST(PrintPrintableTypeTest, PointerInUserNamespace) {
+  ::foo::PointerPrintable x;
+  EXPECT_EQ("PointerPrintable*", Print(&x));
+}
+
+// Tests printing user-defined class template that have a PrintTo() function.
+TEST(PrintPrintableTypeTest, TemplateInUserNamespace) {
+  EXPECT_EQ("PrintableViaPrintToTemplate: 5",
+            Print(::foo::PrintableViaPrintToTemplate<int>(5)));
+}
+
+// Tests that the universal printer prints both the address and the
+// value of a reference.
+TEST(PrintReferenceTest, PrintsAddressAndValue) {
+  int n = 5;
+  EXPECT_EQ("@" + PrintPointer(&n) + " 5", PrintByRef(n));
+
+  int a[2][3] = {
+    { 0, 1, 2 },
+    { 3, 4, 5 }
+  };
+  EXPECT_EQ("@" + PrintPointer(a) + " { { 0, 1, 2 }, { 3, 4, 5 } }",
+            PrintByRef(a));
+
+  const ::foo::UnprintableInFoo x;
+  EXPECT_EQ("@" + PrintPointer(&x) + " 16-byte object "
+            "<EF-12 00-00 34-AB 00-00 00-00 00-00 00-00 00-00>",
+            PrintByRef(x));
+}
+
+// Tests that the universal printer prints a function pointer passed by
+// reference.
+TEST(PrintReferenceTest, HandlesFunctionPointer) {
+  void (*fp)(int n) = &MyFunction;
+  const string fp_pointer_string =
+      PrintPointer(reinterpret_cast<const void*>(&fp));
+  // We cannot directly cast &MyFunction to const void* because the
+  // standard disallows casting between pointers to functions and
+  // pointers to objects, and some compilers (e.g. GCC 3.4) enforce
+  // this limitation.
+  const string fp_string = PrintPointer(reinterpret_cast<const void*>(
+      reinterpret_cast<internal::BiggestInt>(fp)));
+  EXPECT_EQ("@" + fp_pointer_string + " " + fp_string,
+            PrintByRef(fp));
+}
+
+// Tests that the universal printer prints a member function pointer
+// passed by reference.
+TEST(PrintReferenceTest, HandlesMemberFunctionPointer) {
+  int (Foo::*p)(char ch) = &Foo::MyMethod;
+  EXPECT_TRUE(HasPrefix(
+      PrintByRef(p),
+      "@" + PrintPointer(reinterpret_cast<const void*>(&p)) + " " +
+          Print(sizeof(p)) + "-byte object "));
+
+  char (Foo::*p2)(int n) = &Foo::MyVirtualMethod;
+  EXPECT_TRUE(HasPrefix(
+      PrintByRef(p2),
+      "@" + PrintPointer(reinterpret_cast<const void*>(&p2)) + " " +
+          Print(sizeof(p2)) + "-byte object "));
+}
+
+// Tests that the universal printer prints a member variable pointer
+// passed by reference.
+TEST(PrintReferenceTest, HandlesMemberVariablePointer) {
+  int (Foo::*p) = &Foo::value;  // NOLINT
+  EXPECT_TRUE(HasPrefix(
+      PrintByRef(p),
+      "@" + PrintPointer(&p) + " " + Print(sizeof(p)) + "-byte object "));
+}
+
+// Tests that FormatForComparisonFailureMessage(), which is used to print
+// an operand in a comparison assertion (e.g. ASSERT_EQ) when the assertion
+// fails, formats the operand in the desired way.
+
+// scalar
+TEST(FormatForComparisonFailureMessageTest, WorksForScalar) {
+  EXPECT_STREQ("123",
+               FormatForComparisonFailureMessage(123, 124).c_str());
+}
+
+// non-char pointer
+TEST(FormatForComparisonFailureMessageTest, WorksForNonCharPointer) {
+  int n = 0;
+  EXPECT_EQ(PrintPointer(&n),
+            FormatForComparisonFailureMessage(&n, &n).c_str());
+}
+
+// non-char array
+TEST(FormatForComparisonFailureMessageTest, FormatsNonCharArrayAsPointer) {
+  // In expression 'array == x', 'array' is compared by pointer.
+  // Therefore we want to print an array operand as a pointer.
+  int n[] = { 1, 2, 3 };
+  EXPECT_EQ(PrintPointer(n),
+            FormatForComparisonFailureMessage(n, n).c_str());
+}
+
+// Tests formatting a char pointer when it's compared with another pointer.
+// In this case we want to print it as a raw pointer, as the comparision is by
+// pointer.
+
+// char pointer vs pointer
+TEST(FormatForComparisonFailureMessageTest, WorksForCharPointerVsPointer) {
+  // In expression 'p == x', where 'p' and 'x' are (const or not) char
+  // pointers, the operands are compared by pointer.  Therefore we
+  // want to print 'p' as a pointer instead of a C string (we don't
+  // even know if it's supposed to point to a valid C string).
+
+  // const char*
+  const char* s = "hello";
+  EXPECT_EQ(PrintPointer(s),
+            FormatForComparisonFailureMessage(s, s).c_str());
+
+  // char*
+  char ch = 'a';
+  EXPECT_EQ(PrintPointer(&ch),
+            FormatForComparisonFailureMessage(&ch, &ch).c_str());
+}
+
+// wchar_t pointer vs pointer
+TEST(FormatForComparisonFailureMessageTest, WorksForWCharPointerVsPointer) {
+  // In expression 'p == x', where 'p' and 'x' are (const or not) char
+  // pointers, the operands are compared by pointer.  Therefore we
+  // want to print 'p' as a pointer instead of a wide C string (we don't
+  // even know if it's supposed to point to a valid wide C string).
+
+  // const wchar_t*
+  const wchar_t* s = L"hello";
+  EXPECT_EQ(PrintPointer(s),
+            FormatForComparisonFailureMessage(s, s).c_str());
+
+  // wchar_t*
+  wchar_t ch = L'a';
+  EXPECT_EQ(PrintPointer(&ch),
+            FormatForComparisonFailureMessage(&ch, &ch).c_str());
+}
+
+// Tests formatting a char pointer when it's compared to a string object.
+// In this case we want to print the char pointer as a C string.
+
+#if GTEST_HAS_GLOBAL_STRING
+// char pointer vs ::string
+TEST(FormatForComparisonFailureMessageTest, WorksForCharPointerVsString) {
+  const char* s = "hello \"world";
+  EXPECT_STREQ("\"hello \\\"world\"",  // The string content should be escaped.
+               FormatForComparisonFailureMessage(s, ::string()).c_str());
+
+  // char*
+  char str[] = "hi\1";
+  char* p = str;
+  EXPECT_STREQ("\"hi\\x1\"",  // The string content should be escaped.
+               FormatForComparisonFailureMessage(p, ::string()).c_str());
+}
+#endif
+
+// char pointer vs std::string
+TEST(FormatForComparisonFailureMessageTest, WorksForCharPointerVsStdString) {
+  const char* s = "hello \"world";
+  EXPECT_STREQ("\"hello \\\"world\"",  // The string content should be escaped.
+               FormatForComparisonFailureMessage(s, ::std::string()).c_str());
+
+  // char*
+  char str[] = "hi\1";
+  char* p = str;
+  EXPECT_STREQ("\"hi\\x1\"",  // The string content should be escaped.
+               FormatForComparisonFailureMessage(p, ::std::string()).c_str());
+}
+
+#if GTEST_HAS_GLOBAL_WSTRING
+// wchar_t pointer vs ::wstring
+TEST(FormatForComparisonFailureMessageTest, WorksForWCharPointerVsWString) {
+  const wchar_t* s = L"hi \"world";
+  EXPECT_STREQ("L\"hi \\\"world\"",  // The string content should be escaped.
+               FormatForComparisonFailureMessage(s, ::wstring()).c_str());
+
+  // wchar_t*
+  wchar_t str[] = L"hi\1";
+  wchar_t* p = str;
+  EXPECT_STREQ("L\"hi\\x1\"",  // The string content should be escaped.
+               FormatForComparisonFailureMessage(p, ::wstring()).c_str());
+}
+#endif
+
+#if GTEST_HAS_STD_WSTRING
+// wchar_t pointer vs std::wstring
+TEST(FormatForComparisonFailureMessageTest, WorksForWCharPointerVsStdWString) {
+  const wchar_t* s = L"hi \"world";
+  EXPECT_STREQ("L\"hi \\\"world\"",  // The string content should be escaped.
+               FormatForComparisonFailureMessage(s, ::std::wstring()).c_str());
+
+  // wchar_t*
+  wchar_t str[] = L"hi\1";
+  wchar_t* p = str;
+  EXPECT_STREQ("L\"hi\\x1\"",  // The string content should be escaped.
+               FormatForComparisonFailureMessage(p, ::std::wstring()).c_str());
+}
+#endif
+
+// Tests formatting a char array when it's compared with a pointer or array.
+// In this case we want to print the array as a row pointer, as the comparison
+// is by pointer.
+
+// char array vs pointer
+TEST(FormatForComparisonFailureMessageTest, WorksForCharArrayVsPointer) {
+  char str[] = "hi \"world\"";
+  char* p = NULL;
+  EXPECT_EQ(PrintPointer(str),
+            FormatForComparisonFailureMessage(str, p).c_str());
+}
+
+// char array vs char array
+TEST(FormatForComparisonFailureMessageTest, WorksForCharArrayVsCharArray) {
+  const char str[] = "hi \"world\"";
+  EXPECT_EQ(PrintPointer(str),
+            FormatForComparisonFailureMessage(str, str).c_str());
+}
+
+// wchar_t array vs pointer
+TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsPointer) {
+  wchar_t str[] = L"hi \"world\"";
+  wchar_t* p = NULL;
+  EXPECT_EQ(PrintPointer(str),
+            FormatForComparisonFailureMessage(str, p).c_str());
+}
+
+// wchar_t array vs wchar_t array
+TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsWCharArray) {
+  const wchar_t str[] = L"hi \"world\"";
+  EXPECT_EQ(PrintPointer(str),
+            FormatForComparisonFailureMessage(str, str).c_str());
+}
+
+// Tests formatting a char array when it's compared with a string object.
+// In this case we want to print the array as a C string.
+
+#if GTEST_HAS_GLOBAL_STRING
+// char array vs string
+TEST(FormatForComparisonFailureMessageTest, WorksForCharArrayVsString) {
+  const char str[] = "hi \"w\0rld\"";
+  EXPECT_STREQ("\"hi \\\"w\"",  // The content should be escaped.
+                                // Embedded NUL terminates the string.
+               FormatForComparisonFailureMessage(str, ::string()).c_str());
+}
+#endif
+
+// char array vs std::string
+TEST(FormatForComparisonFailureMessageTest, WorksForCharArrayVsStdString) {
+  const char str[] = "hi \"world\"";
+  EXPECT_STREQ("\"hi \\\"world\\\"\"",  // The content should be escaped.
+               FormatForComparisonFailureMessage(str, ::std::string()).c_str());
+}
+
+#if GTEST_HAS_GLOBAL_WSTRING
+// wchar_t array vs wstring
+TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsWString) {
+  const wchar_t str[] = L"hi \"world\"";
+  EXPECT_STREQ("L\"hi \\\"world\\\"\"",  // The content should be escaped.
+               FormatForComparisonFailureMessage(str, ::wstring()).c_str());
+}
+#endif
+
+#if GTEST_HAS_STD_WSTRING
+// wchar_t array vs std::wstring
+TEST(FormatForComparisonFailureMessageTest, WorksForWCharArrayVsStdWString) {
+  const wchar_t str[] = L"hi \"w\0rld\"";
+  EXPECT_STREQ(
+      "L\"hi \\\"w\"",  // The content should be escaped.
+                        // Embedded NUL terminates the string.
+      FormatForComparisonFailureMessage(str, ::std::wstring()).c_str());
+}
+#endif
+
+// Useful for testing PrintToString().  We cannot use EXPECT_EQ()
+// there as its implementation uses PrintToString().  The caller must
+// ensure that 'value' has no side effect.
+#define EXPECT_PRINT_TO_STRING_(value, expected_string)         \
+  EXPECT_TRUE(PrintToString(value) == (expected_string))        \
+      << " where " #value " prints as " << (PrintToString(value))
+
+TEST(PrintToStringTest, WorksForScalar) {
+  EXPECT_PRINT_TO_STRING_(123, "123");
+}
+
+TEST(PrintToStringTest, WorksForPointerToConstChar) {
+  const char* p = "hello";
+  EXPECT_PRINT_TO_STRING_(p, "\"hello\"");
+}
+
+TEST(PrintToStringTest, WorksForPointerToNonConstChar) {
+  char s[] = "hello";
+  char* p = s;
+  EXPECT_PRINT_TO_STRING_(p, "\"hello\"");
+}
+
+TEST(PrintToStringTest, EscapesForPointerToConstChar) {
+  const char* p = "hello\n";
+  EXPECT_PRINT_TO_STRING_(p, "\"hello\\n\"");
+}
+
+TEST(PrintToStringTest, EscapesForPointerToNonConstChar) {
+  char s[] = "hello\1";
+  char* p = s;
+  EXPECT_PRINT_TO_STRING_(p, "\"hello\\x1\"");
+}
+
+TEST(PrintToStringTest, WorksForArray) {
+  int n[3] = { 1, 2, 3 };
+  EXPECT_PRINT_TO_STRING_(n, "{ 1, 2, 3 }");
+}
+
+TEST(PrintToStringTest, WorksForCharArray) {
+  char s[] = "hello";
+  EXPECT_PRINT_TO_STRING_(s, "\"hello\"");
+}
+
+TEST(PrintToStringTest, WorksForCharArrayWithEmbeddedNul) {
+  const char str_with_nul[] = "hello\0 world";
+  EXPECT_PRINT_TO_STRING_(str_with_nul, "\"hello\\0 world\"");
+
+  char mutable_str_with_nul[] = "hello\0 world";
+  EXPECT_PRINT_TO_STRING_(mutable_str_with_nul, "\"hello\\0 world\"");
+}
+
+#undef EXPECT_PRINT_TO_STRING_
+
+TEST(UniversalTersePrintTest, WorksForNonReference) {
+  ::std::stringstream ss;
+  UniversalTersePrint(123, &ss);
+  EXPECT_EQ("123", ss.str());
+}
+
+TEST(UniversalTersePrintTest, WorksForReference) {
+  const int& n = 123;
+  ::std::stringstream ss;
+  UniversalTersePrint(n, &ss);
+  EXPECT_EQ("123", ss.str());
+}
+
+TEST(UniversalTersePrintTest, WorksForCString) {
+  const char* s1 = "abc";
+  ::std::stringstream ss1;
+  UniversalTersePrint(s1, &ss1);
+  EXPECT_EQ("\"abc\"", ss1.str());
+
+  char* s2 = const_cast<char*>(s1);
+  ::std::stringstream ss2;
+  UniversalTersePrint(s2, &ss2);
+  EXPECT_EQ("\"abc\"", ss2.str());
+
+  const char* s3 = NULL;
+  ::std::stringstream ss3;
+  UniversalTersePrint(s3, &ss3);
+  EXPECT_EQ("NULL", ss3.str());
+}
+
+TEST(UniversalPrintTest, WorksForNonReference) {
+  ::std::stringstream ss;
+  UniversalPrint(123, &ss);
+  EXPECT_EQ("123", ss.str());
+}
+
+TEST(UniversalPrintTest, WorksForReference) {
+  const int& n = 123;
+  ::std::stringstream ss;
+  UniversalPrint(n, &ss);
+  EXPECT_EQ("123", ss.str());
+}
+
+TEST(UniversalPrintTest, WorksForCString) {
+  const char* s1 = "abc";
+  ::std::stringstream ss1;
+  UniversalPrint(s1, &ss1);
+  EXPECT_EQ(PrintPointer(s1) + " pointing to \"abc\"", string(ss1.str()));
+
+  char* s2 = const_cast<char*>(s1);
+  ::std::stringstream ss2;
+  UniversalPrint(s2, &ss2);
+  EXPECT_EQ(PrintPointer(s2) + " pointing to \"abc\"", string(ss2.str()));
+
+  const char* s3 = NULL;
+  ::std::stringstream ss3;
+  UniversalPrint(s3, &ss3);
+  EXPECT_EQ("NULL", ss3.str());
+}
+
+TEST(UniversalPrintTest, WorksForCharArray) {
+  const char str[] = "\"Line\0 1\"\nLine 2";
+  ::std::stringstream ss1;
+  UniversalPrint(str, &ss1);
+  EXPECT_EQ("\"\\\"Line\\0 1\\\"\\nLine 2\"", ss1.str());
+
+  const char mutable_str[] = "\"Line\0 1\"\nLine 2";
+  ::std::stringstream ss2;
+  UniversalPrint(mutable_str, &ss2);
+  EXPECT_EQ("\"\\\"Line\\0 1\\\"\\nLine 2\"", ss2.str());
+}
+
+#if GTEST_HAS_TR1_TUPLE
+
+TEST(UniversalTersePrintTupleFieldsToStringsTestWithTr1, PrintsEmptyTuple) {
+  Strings result = UniversalTersePrintTupleFieldsToStrings(
+      ::std::tr1::make_tuple());
+  EXPECT_EQ(0u, result.size());
+}
+
+TEST(UniversalTersePrintTupleFieldsToStringsTestWithTr1, PrintsOneTuple) {
+  Strings result = UniversalTersePrintTupleFieldsToStrings(
+      ::std::tr1::make_tuple(1));
+  ASSERT_EQ(1u, result.size());
+  EXPECT_EQ("1", result[0]);
+}
+
+TEST(UniversalTersePrintTupleFieldsToStringsTestWithTr1, PrintsTwoTuple) {
+  Strings result = UniversalTersePrintTupleFieldsToStrings(
+      ::std::tr1::make_tuple(1, 'a'));
+  ASSERT_EQ(2u, result.size());
+  EXPECT_EQ("1", result[0]);
+  EXPECT_EQ("'a' (97, 0x61)", result[1]);
+}
+
+TEST(UniversalTersePrintTupleFieldsToStringsTestWithTr1, PrintsTersely) {
+  const int n = 1;
+  Strings result = UniversalTersePrintTupleFieldsToStrings(
+      ::std::tr1::tuple<const int&, const char*>(n, "a"));
+  ASSERT_EQ(2u, result.size());
+  EXPECT_EQ("1", result[0]);
+  EXPECT_EQ("\"a\"", result[1]);
+}
+
+#endif  // GTEST_HAS_TR1_TUPLE
+
+#if GTEST_HAS_STD_TUPLE_
+
+TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsEmptyTuple) {
+  Strings result = UniversalTersePrintTupleFieldsToStrings(::std::make_tuple());
+  EXPECT_EQ(0u, result.size());
+}
+
+TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsOneTuple) {
+  Strings result = UniversalTersePrintTupleFieldsToStrings(
+      ::std::make_tuple(1));
+  ASSERT_EQ(1u, result.size());
+  EXPECT_EQ("1", result[0]);
+}
+
+TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsTwoTuple) {
+  Strings result = UniversalTersePrintTupleFieldsToStrings(
+      ::std::make_tuple(1, 'a'));
+  ASSERT_EQ(2u, result.size());
+  EXPECT_EQ("1", result[0]);
+  EXPECT_EQ("'a' (97, 0x61)", result[1]);
+}
+
+TEST(UniversalTersePrintTupleFieldsToStringsTestWithStd, PrintsTersely) {
+  const int n = 1;
+  Strings result = UniversalTersePrintTupleFieldsToStrings(
+      ::std::tuple<const int&, const char*>(n, "a"));
+  ASSERT_EQ(2u, result.size());
+  EXPECT_EQ("1", result[0]);
+  EXPECT_EQ("\"a\"", result[1]);
+}
+
+#endif  // GTEST_HAS_STD_TUPLE_
+
+}  // namespace gtest_printers_test
+}  // namespace testing
+
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-test-part_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-test-part_test.cc
new file mode 100644
index 0000000000..ca8ba933ae
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-test-part_test.cc
@@ -0,0 +1,208 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: mheule@google.com (Markus Heule)
+//
+
+#include "gtest/gtest-test-part.h"
+
+#include "gtest/gtest.h"
+
+using testing::Message;
+using testing::Test;
+using testing::TestPartResult;
+using testing::TestPartResultArray;
+
+namespace {
+
+// Tests the TestPartResult class.
+
+// The test fixture for testing TestPartResult.
+class TestPartResultTest : public Test {
+ protected:
+  TestPartResultTest()
+      : r1_(TestPartResult::kSuccess, "foo/bar.cc", 10, "Success!"),
+        r2_(TestPartResult::kNonFatalFailure, "foo/bar.cc", -1, "Failure!"),
+        r3_(TestPartResult::kFatalFailure, NULL, -1, "Failure!") {}
+
+  TestPartResult r1_, r2_, r3_;
+};
+
+
+TEST_F(TestPartResultTest, ConstructorWorks) {
+  Message message;
+  message << "something is terribly wrong";
+  message << static_cast<const char*>(testing::internal::kStackTraceMarker);
+  message << "some unimportant stack trace";
+
+  const TestPartResult result(TestPartResult::kNonFatalFailure,
+                              "some_file.cc",
+                              42,
+                              message.GetString().c_str());
+
+  EXPECT_EQ(TestPartResult::kNonFatalFailure, result.type());
+  EXPECT_STREQ("some_file.cc", result.file_name());
+  EXPECT_EQ(42, result.line_number());
+  EXPECT_STREQ(message.GetString().c_str(), result.message());
+  EXPECT_STREQ("something is terribly wrong", result.summary());
+}
+
+TEST_F(TestPartResultTest, ResultAccessorsWork) {
+  const TestPartResult success(TestPartResult::kSuccess,
+                               "file.cc",
+                               42,
+                               "message");
+  EXPECT_TRUE(success.passed());
+  EXPECT_FALSE(success.failed());
+  EXPECT_FALSE(success.nonfatally_failed());
+  EXPECT_FALSE(success.fatally_failed());
+
+  const TestPartResult nonfatal_failure(TestPartResult::kNonFatalFailure,
+                                        "file.cc",
+                                        42,
+                                        "message");
+  EXPECT_FALSE(nonfatal_failure.passed());
+  EXPECT_TRUE(nonfatal_failure.failed());
+  EXPECT_TRUE(nonfatal_failure.nonfatally_failed());
+  EXPECT_FALSE(nonfatal_failure.fatally_failed());
+
+  const TestPartResult fatal_failure(TestPartResult::kFatalFailure,
+                                     "file.cc",
+                                     42,
+                                     "message");
+  EXPECT_FALSE(fatal_failure.passed());
+  EXPECT_TRUE(fatal_failure.failed());
+  EXPECT_FALSE(fatal_failure.nonfatally_failed());
+  EXPECT_TRUE(fatal_failure.fatally_failed());
+}
+
+// Tests TestPartResult::type().
+TEST_F(TestPartResultTest, type) {
+  EXPECT_EQ(TestPartResult::kSuccess, r1_.type());
+  EXPECT_EQ(TestPartResult::kNonFatalFailure, r2_.type());
+  EXPECT_EQ(TestPartResult::kFatalFailure, r3_.type());
+}
+
+// Tests TestPartResult::file_name().
+TEST_F(TestPartResultTest, file_name) {
+  EXPECT_STREQ("foo/bar.cc", r1_.file_name());
+  EXPECT_STREQ(NULL, r3_.file_name());
+}
+
+// Tests TestPartResult::line_number().
+TEST_F(TestPartResultTest, line_number) {
+  EXPECT_EQ(10, r1_.line_number());
+  EXPECT_EQ(-1, r2_.line_number());
+}
+
+// Tests TestPartResult::message().
+TEST_F(TestPartResultTest, message) {
+  EXPECT_STREQ("Success!", r1_.message());
+}
+
+// Tests TestPartResult::passed().
+TEST_F(TestPartResultTest, Passed) {
+  EXPECT_TRUE(r1_.passed());
+  EXPECT_FALSE(r2_.passed());
+  EXPECT_FALSE(r3_.passed());
+}
+
+// Tests TestPartResult::failed().
+TEST_F(TestPartResultTest, Failed) {
+  EXPECT_FALSE(r1_.failed());
+  EXPECT_TRUE(r2_.failed());
+  EXPECT_TRUE(r3_.failed());
+}
+
+// Tests TestPartResult::fatally_failed().
+TEST_F(TestPartResultTest, FatallyFailed) {
+  EXPECT_FALSE(r1_.fatally_failed());
+  EXPECT_FALSE(r2_.fatally_failed());
+  EXPECT_TRUE(r3_.fatally_failed());
+}
+
+// Tests TestPartResult::nonfatally_failed().
+TEST_F(TestPartResultTest, NonfatallyFailed) {
+  EXPECT_FALSE(r1_.nonfatally_failed());
+  EXPECT_TRUE(r2_.nonfatally_failed());
+  EXPECT_FALSE(r3_.nonfatally_failed());
+}
+
+// Tests the TestPartResultArray class.
+
+class TestPartResultArrayTest : public Test {
+ protected:
+  TestPartResultArrayTest()
+      : r1_(TestPartResult::kNonFatalFailure, "foo/bar.cc", -1, "Failure 1"),
+        r2_(TestPartResult::kFatalFailure, "foo/bar.cc", -1, "Failure 2") {}
+
+  const TestPartResult r1_, r2_;
+};
+
+// Tests that TestPartResultArray initially has size 0.
+TEST_F(TestPartResultArrayTest, InitialSizeIsZero) {
+  TestPartResultArray results;
+  EXPECT_EQ(0, results.size());
+}
+
+// Tests that TestPartResultArray contains the given TestPartResult
+// after one Append() operation.
+TEST_F(TestPartResultArrayTest, ContainsGivenResultAfterAppend) {
+  TestPartResultArray results;
+  results.Append(r1_);
+  EXPECT_EQ(1, results.size());
+  EXPECT_STREQ("Failure 1", results.GetTestPartResult(0).message());
+}
+
+// Tests that TestPartResultArray contains the given TestPartResults
+// after two Append() operations.
+TEST_F(TestPartResultArrayTest, ContainsGivenResultsAfterTwoAppends) {
+  TestPartResultArray results;
+  results.Append(r1_);
+  results.Append(r2_);
+  EXPECT_EQ(2, results.size());
+  EXPECT_STREQ("Failure 1", results.GetTestPartResult(0).message());
+  EXPECT_STREQ("Failure 2", results.GetTestPartResult(1).message());
+}
+
+typedef TestPartResultArrayTest TestPartResultArrayDeathTest;
+
+// Tests that the program dies when GetTestPartResult() is called with
+// an invalid index.
+TEST_F(TestPartResultArrayDeathTest, DiesWhenIndexIsOutOfBound) {
+  TestPartResultArray results;
+  results.Append(r1_);
+
+  EXPECT_DEATH_IF_SUPPORTED(results.GetTestPartResult(-1), "");
+  EXPECT_DEATH_IF_SUPPORTED(results.GetTestPartResult(1), "");
+}
+
+// TODO(mheule@google.com): Add a test for the class HasNewFatalFailureHelper.
+
+}  // namespace
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-tuple_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-tuple_test.cc
new file mode 100644
index 0000000000..bfaa3e0ac4
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-tuple_test.cc
@@ -0,0 +1,320 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "gtest/internal/gtest-tuple.h"
+#include <utility>
+#include "gtest/gtest.h"
+
+namespace {
+
+using ::std::tr1::get;
+using ::std::tr1::make_tuple;
+using ::std::tr1::tuple;
+using ::std::tr1::tuple_element;
+using ::std::tr1::tuple_size;
+using ::testing::StaticAssertTypeEq;
+
+// Tests that tuple_element<K, tuple<T0, T1, ..., TN> >::type returns TK.
+TEST(tuple_element_Test, ReturnsElementType) {
+  StaticAssertTypeEq<int, tuple_element<0, tuple<int, char> >::type>();
+  StaticAssertTypeEq<int&, tuple_element<1, tuple<double, int&> >::type>();
+  StaticAssertTypeEq<bool, tuple_element<2, tuple<double, int, bool> >::type>();
+}
+
+// Tests that tuple_size<T>::value gives the number of fields in tuple
+// type T.
+TEST(tuple_size_Test, ReturnsNumberOfFields) {
+  EXPECT_EQ(0, +tuple_size<tuple<> >::value);
+  EXPECT_EQ(1, +tuple_size<tuple<void*> >::value);
+  EXPECT_EQ(1, +tuple_size<tuple<char> >::value);
+  EXPECT_EQ(1, +(tuple_size<tuple<tuple<int, double> > >::value));
+  EXPECT_EQ(2, +(tuple_size<tuple<int&, const char> >::value));
+  EXPECT_EQ(3, +(tuple_size<tuple<char*, void, const bool&> >::value));
+}
+
+// Tests comparing a tuple with itself.
+TEST(ComparisonTest, ComparesWithSelf) {
+  const tuple<int, char, bool> a(5, 'a', false);
+
+  EXPECT_TRUE(a == a);
+  EXPECT_FALSE(a != a);
+}
+
+// Tests comparing two tuples with the same value.
+TEST(ComparisonTest, ComparesEqualTuples) {
+  const tuple<int, bool> a(5, true), b(5, true);
+
+  EXPECT_TRUE(a == b);
+  EXPECT_FALSE(a != b);
+}
+
+// Tests comparing two different tuples that have no reference fields.
+TEST(ComparisonTest, ComparesUnequalTuplesWithoutReferenceFields) {
+  typedef tuple<const int, char> FooTuple;
+
+  const FooTuple a(0, 'x');
+  const FooTuple b(1, 'a');
+
+  EXPECT_TRUE(a != b);
+  EXPECT_FALSE(a == b);
+
+  const FooTuple c(1, 'b');
+
+  EXPECT_TRUE(b != c);
+  EXPECT_FALSE(b == c);
+}
+
+// Tests comparing two different tuples that have reference fields.
+TEST(ComparisonTest, ComparesUnequalTuplesWithReferenceFields) {
+  typedef tuple<int&, const char&> FooTuple;
+
+  int i = 5;
+  const char ch = 'a';
+  const FooTuple a(i, ch);
+
+  int j = 6;
+  const FooTuple b(j, ch);
+
+  EXPECT_TRUE(a != b);
+  EXPECT_FALSE(a == b);
+
+  j = 5;
+  const char ch2 = 'b';
+  const FooTuple c(j, ch2);
+
+  EXPECT_TRUE(b != c);
+  EXPECT_FALSE(b == c);
+}
+
+// Tests that a tuple field with a reference type is an alias of the
+// variable it's supposed to reference.
+TEST(ReferenceFieldTest, IsAliasOfReferencedVariable) {
+  int n = 0;
+  tuple<bool, int&> t(true, n);
+
+  n = 1;
+  EXPECT_EQ(n, get<1>(t))
+      << "Changing a underlying variable should update the reference field.";
+
+  // Makes sure that the implementation doesn't do anything funny with
+  // the & operator for the return type of get<>().
+  EXPECT_EQ(&n, &(get<1>(t)))
+      << "The address of a reference field should equal the address of "
+      << "the underlying variable.";
+
+  get<1>(t) = 2;
+  EXPECT_EQ(2, n)
+      << "Changing a reference field should update the underlying variable.";
+}
+
+// Tests that tuple's default constructor default initializes each field.
+// This test needs to compile without generating warnings.
+TEST(TupleConstructorTest, DefaultConstructorDefaultInitializesEachField) {
+  // The TR1 report requires that tuple's default constructor default
+  // initializes each field, even if it's a primitive type.  If the
+  // implementation forgets to do this, this test will catch it by
+  // generating warnings about using uninitialized variables (assuming
+  // a decent compiler).
+
+  tuple<> empty;
+
+  tuple<int> a1, b1;
+  b1 = a1;
+  EXPECT_EQ(0, get<0>(b1));
+
+  tuple<int, double> a2, b2;
+  b2 = a2;
+  EXPECT_EQ(0, get<0>(b2));
+  EXPECT_EQ(0.0, get<1>(b2));
+
+  tuple<double, char, bool*> a3, b3;
+  b3 = a3;
+  EXPECT_EQ(0.0, get<0>(b3));
+  EXPECT_EQ('\0', get<1>(b3));
+  EXPECT_TRUE(get<2>(b3) == NULL);
+
+  tuple<int, int, int, int, int, int, int, int, int, int> a10, b10;
+  b10 = a10;
+  EXPECT_EQ(0, get<0>(b10));
+  EXPECT_EQ(0, get<1>(b10));
+  EXPECT_EQ(0, get<2>(b10));
+  EXPECT_EQ(0, get<3>(b10));
+  EXPECT_EQ(0, get<4>(b10));
+  EXPECT_EQ(0, get<5>(b10));
+  EXPECT_EQ(0, get<6>(b10));
+  EXPECT_EQ(0, get<7>(b10));
+  EXPECT_EQ(0, get<8>(b10));
+  EXPECT_EQ(0, get<9>(b10));
+}
+
+// Tests constructing a tuple from its fields.
+TEST(TupleConstructorTest, ConstructsFromFields) {
+  int n = 1;
+  // Reference field.
+  tuple<int&> a(n);
+  EXPECT_EQ(&n, &(get<0>(a)));
+
+  // Non-reference fields.
+  tuple<int, char> b(5, 'a');
+  EXPECT_EQ(5, get<0>(b));
+  EXPECT_EQ('a', get<1>(b));
+
+  // Const reference field.
+  const int m = 2;
+  tuple<bool, const int&> c(true, m);
+  EXPECT_TRUE(get<0>(c));
+  EXPECT_EQ(&m, &(get<1>(c)));
+}
+
+// Tests tuple's copy constructor.
+TEST(TupleConstructorTest, CopyConstructor) {
+  tuple<double, bool> a(0.0, true);
+  tuple<double, bool> b(a);
+
+  EXPECT_DOUBLE_EQ(0.0, get<0>(b));
+  EXPECT_TRUE(get<1>(b));
+}
+
+// Tests constructing a tuple from another tuple that has a compatible
+// but different type.
+TEST(TupleConstructorTest, ConstructsFromDifferentTupleType) {
+  tuple<int, int, char> a(0, 1, 'a');
+  tuple<double, long, int> b(a);
+
+  EXPECT_DOUBLE_EQ(0.0, get<0>(b));
+  EXPECT_EQ(1, get<1>(b));
+  EXPECT_EQ('a', get<2>(b));
+}
+
+// Tests constructing a 2-tuple from an std::pair.
+TEST(TupleConstructorTest, ConstructsFromPair) {
+  ::std::pair<int, char> a(1, 'a');
+  tuple<int, char> b(a);
+  tuple<int, const char&> c(a);
+}
+
+// Tests assigning a tuple to another tuple with the same type.
+TEST(TupleAssignmentTest, AssignsToSameTupleType) {
+  const tuple<int, long> a(5, 7L);
+  tuple<int, long> b;
+  b = a;
+  EXPECT_EQ(5, get<0>(b));
+  EXPECT_EQ(7L, get<1>(b));
+}
+
+// Tests assigning a tuple to another tuple with a different but
+// compatible type.
+TEST(TupleAssignmentTest, AssignsToDifferentTupleType) {
+  const tuple<int, long, bool> a(1, 7L, true);
+  tuple<long, int, bool> b;
+  b = a;
+  EXPECT_EQ(1L, get<0>(b));
+  EXPECT_EQ(7, get<1>(b));
+  EXPECT_TRUE(get<2>(b));
+}
+
+// Tests assigning an std::pair to a 2-tuple.
+TEST(TupleAssignmentTest, AssignsFromPair) {
+  const ::std::pair<int, bool> a(5, true);
+  tuple<int, bool> b;
+  b = a;
+  EXPECT_EQ(5, get<0>(b));
+  EXPECT_TRUE(get<1>(b));
+
+  tuple<long, bool> c;
+  c = a;
+  EXPECT_EQ(5L, get<0>(c));
+  EXPECT_TRUE(get<1>(c));
+}
+
+// A fixture for testing big tuples.
+class BigTupleTest : public testing::Test {
+ protected:
+  typedef tuple<int, int, int, int, int, int, int, int, int, int> BigTuple;
+
+  BigTupleTest() :
+      a_(1, 0, 0, 0, 0, 0, 0, 0, 0, 2),
+      b_(1, 0, 0, 0, 0, 0, 0, 0, 0, 3) {}
+
+  BigTuple a_, b_;
+};
+
+// Tests constructing big tuples.
+TEST_F(BigTupleTest, Construction) {
+  BigTuple a;
+  BigTuple b(b_);
+}
+
+// Tests that get<N>(t) returns the N-th (0-based) field of tuple t.
+TEST_F(BigTupleTest, get) {
+  EXPECT_EQ(1, get<0>(a_));
+  EXPECT_EQ(2, get<9>(a_));
+
+  // Tests that get() works on a const tuple too.
+  const BigTuple a(a_);
+  EXPECT_EQ(1, get<0>(a));
+  EXPECT_EQ(2, get<9>(a));
+}
+
+// Tests comparing big tuples.
+TEST_F(BigTupleTest, Comparisons) {
+  EXPECT_TRUE(a_ == a_);
+  EXPECT_FALSE(a_ != a_);
+
+  EXPECT_TRUE(a_ != b_);
+  EXPECT_FALSE(a_ == b_);
+}
+
+TEST(MakeTupleTest, WorksForScalarTypes) {
+  tuple<bool, int> a;
+  a = make_tuple(true, 5);
+  EXPECT_TRUE(get<0>(a));
+  EXPECT_EQ(5, get<1>(a));
+
+  tuple<char, int, long> b;
+  b = make_tuple('a', 'b', 5);
+  EXPECT_EQ('a', get<0>(b));
+  EXPECT_EQ('b', get<1>(b));
+  EXPECT_EQ(5, get<2>(b));
+}
+
+TEST(MakeTupleTest, WorksForPointers) {
+  int a[] = { 1, 2, 3, 4 };
+  const char* const str = "hi";
+  int* const p = a;
+
+  tuple<const char*, int*> t;
+  t = make_tuple(str, p);
+  EXPECT_EQ(str, get<0>(t));
+  EXPECT_EQ(p, get<1>(t));
+}
+
+}  // namespace
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-typed-test2_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-typed-test2_test.cc
new file mode 100644
index 0000000000..c284700b02
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-typed-test2_test.cc
@@ -0,0 +1,45 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include <vector>
+
+#include "test/gtest-typed-test_test.h"
+#include "gtest/gtest.h"
+
+#if GTEST_HAS_TYPED_TEST_P
+
+// Tests that the same type-parameterized test case can be
+// instantiated in different translation units linked together.
+// (ContainerTest is also instantiated in gtest-typed-test_test.cc.)
+INSTANTIATE_TYPED_TEST_CASE_P(Vector, ContainerTest,
+                              testing::Types<std::vector<int> >);
+
+#endif  // GTEST_HAS_TYPED_TEST_P
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-typed-test_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-typed-test_test.cc
new file mode 100644
index 0000000000..93628ba080
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-typed-test_test.cc
@@ -0,0 +1,380 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "test/gtest-typed-test_test.h"
+
+#include <set>
+#include <vector>
+
+#include "gtest/gtest.h"
+
+using testing::Test;
+
+// Used for testing that SetUpTestCase()/TearDownTestCase(), fixture
+// ctor/dtor, and SetUp()/TearDown() work correctly in typed tests and
+// type-parameterized test.
+template <typename T>
+class CommonTest : public Test {
+  // For some technical reason, SetUpTestCase() and TearDownTestCase()
+  // must be public.
+ public:
+  static void SetUpTestCase() {
+    shared_ = new T(5);
+  }
+
+  static void TearDownTestCase() {
+    delete shared_;
+    shared_ = NULL;
+  }
+
+  // This 'protected:' is optional.  There's no harm in making all
+  // members of this fixture class template public.
+ protected:
+  // We used to use std::list here, but switched to std::vector since
+  // MSVC's <list> doesn't compile cleanly with /W4.
+  typedef std::vector<T> Vector;
+  typedef std::set<int> IntSet;
+
+  CommonTest() : value_(1) {}
+
+  virtual ~CommonTest() { EXPECT_EQ(3, value_); }
+
+  virtual void SetUp() {
+    EXPECT_EQ(1, value_);
+    value_++;
+  }
+
+  virtual void TearDown() {
+    EXPECT_EQ(2, value_);
+    value_++;
+  }
+
+  T value_;
+  static T* shared_;
+};
+
+template <typename T>
+T* CommonTest<T>::shared_ = NULL;
+
+// This #ifdef block tests typed tests.
+#if GTEST_HAS_TYPED_TEST
+
+using testing::Types;
+
+// Tests that SetUpTestCase()/TearDownTestCase(), fixture ctor/dtor,
+// and SetUp()/TearDown() work correctly in typed tests
+
+typedef Types<char, int> TwoTypes;
+TYPED_TEST_CASE(CommonTest, TwoTypes);
+
+TYPED_TEST(CommonTest, ValuesAreCorrect) {
+  // Static members of the fixture class template can be visited via
+  // the TestFixture:: prefix.
+  EXPECT_EQ(5, *TestFixture::shared_);
+
+  // Typedefs in the fixture class template can be visited via the
+  // "typename TestFixture::" prefix.
+  typename TestFixture::Vector empty;
+  EXPECT_EQ(0U, empty.size());
+
+  typename TestFixture::IntSet empty2;
+  EXPECT_EQ(0U, empty2.size());
+
+  // Non-static members of the fixture class must be visited via
+  // 'this', as required by C++ for class templates.
+  EXPECT_EQ(2, this->value_);
+}
+
+// The second test makes sure shared_ is not deleted after the first
+// test.
+TYPED_TEST(CommonTest, ValuesAreStillCorrect) {
+  // Static members of the fixture class template can also be visited
+  // via 'this'.
+  ASSERT_TRUE(this->shared_ != NULL);
+  EXPECT_EQ(5, *this->shared_);
+
+  // TypeParam can be used to refer to the type parameter.
+  EXPECT_EQ(static_cast<TypeParam>(2), this->value_);
+}
+
+// Tests that multiple TYPED_TEST_CASE's can be defined in the same
+// translation unit.
+
+template <typename T>
+class TypedTest1 : public Test {
+};
+
+// Verifies that the second argument of TYPED_TEST_CASE can be a
+// single type.
+TYPED_TEST_CASE(TypedTest1, int);
+TYPED_TEST(TypedTest1, A) {}
+
+template <typename T>
+class TypedTest2 : public Test {
+};
+
+// Verifies that the second argument of TYPED_TEST_CASE can be a
+// Types<...> type list.
+TYPED_TEST_CASE(TypedTest2, Types<int>);
+
+// This also verifies that tests from different typed test cases can
+// share the same name.
+TYPED_TEST(TypedTest2, A) {}
+
+// Tests that a typed test case can be defined in a namespace.
+
+namespace library1 {
+
+template <typename T>
+class NumericTest : public Test {
+};
+
+typedef Types<int, long> NumericTypes;
+TYPED_TEST_CASE(NumericTest, NumericTypes);
+
+TYPED_TEST(NumericTest, DefaultIsZero) {
+  EXPECT_EQ(0, TypeParam());
+}
+
+}  // namespace library1
+
+#endif  // GTEST_HAS_TYPED_TEST
+
+// This #ifdef block tests type-parameterized tests.
+#if GTEST_HAS_TYPED_TEST_P
+
+using testing::Types;
+using testing::internal::TypedTestCasePState;
+
+// Tests TypedTestCasePState.
+
+class TypedTestCasePStateTest : public Test {
+ protected:
+  virtual void SetUp() {
+    state_.AddTestName("foo.cc", 0, "FooTest", "A");
+    state_.AddTestName("foo.cc", 0, "FooTest", "B");
+    state_.AddTestName("foo.cc", 0, "FooTest", "C");
+  }
+
+  TypedTestCasePState state_;
+};
+
+TEST_F(TypedTestCasePStateTest, SucceedsForMatchingList) {
+  const char* tests = "A, B, C";
+  EXPECT_EQ(tests,
+            state_.VerifyRegisteredTestNames("foo.cc", 1, tests));
+}
+
+// Makes sure that the order of the tests and spaces around the names
+// don't matter.
+TEST_F(TypedTestCasePStateTest, IgnoresOrderAndSpaces) {
+  const char* tests = "A,C,   B";
+  EXPECT_EQ(tests,
+            state_.VerifyRegisteredTestNames("foo.cc", 1, tests));
+}
+
+typedef TypedTestCasePStateTest TypedTestCasePStateDeathTest;
+
+TEST_F(TypedTestCasePStateDeathTest, DetectsDuplicates) {
+  EXPECT_DEATH_IF_SUPPORTED(
+      state_.VerifyRegisteredTestNames("foo.cc", 1, "A, B, A, C"),
+      "foo\\.cc.1.?: Test A is listed more than once\\.");
+}
+
+TEST_F(TypedTestCasePStateDeathTest, DetectsExtraTest) {
+  EXPECT_DEATH_IF_SUPPORTED(
+      state_.VerifyRegisteredTestNames("foo.cc", 1, "A, B, C, D"),
+      "foo\\.cc.1.?: No test named D can be found in this test case\\.");
+}
+
+TEST_F(TypedTestCasePStateDeathTest, DetectsMissedTest) {
+  EXPECT_DEATH_IF_SUPPORTED(
+      state_.VerifyRegisteredTestNames("foo.cc", 1, "A, C"),
+      "foo\\.cc.1.?: You forgot to list test B\\.");
+}
+
+// Tests that defining a test for a parameterized test case generates
+// a run-time error if the test case has been registered.
+TEST_F(TypedTestCasePStateDeathTest, DetectsTestAfterRegistration) {
+  state_.VerifyRegisteredTestNames("foo.cc", 1, "A, B, C");
+  EXPECT_DEATH_IF_SUPPORTED(
+      state_.AddTestName("foo.cc", 2, "FooTest", "D"),
+      "foo\\.cc.2.?: Test D must be defined before REGISTER_TYPED_TEST_CASE_P"
+      "\\(FooTest, \\.\\.\\.\\)\\.");
+}
+
+// Tests that SetUpTestCase()/TearDownTestCase(), fixture ctor/dtor,
+// and SetUp()/TearDown() work correctly in type-parameterized tests.
+
+template <typename T>
+class DerivedTest : public CommonTest<T> {
+};
+
+TYPED_TEST_CASE_P(DerivedTest);
+
+TYPED_TEST_P(DerivedTest, ValuesAreCorrect) {
+  // Static members of the fixture class template can be visited via
+  // the TestFixture:: prefix.
+  EXPECT_EQ(5, *TestFixture::shared_);
+
+  // Non-static members of the fixture class must be visited via
+  // 'this', as required by C++ for class templates.
+  EXPECT_EQ(2, this->value_);
+}
+
+// The second test makes sure shared_ is not deleted after the first
+// test.
+TYPED_TEST_P(DerivedTest, ValuesAreStillCorrect) {
+  // Static members of the fixture class template can also be visited
+  // via 'this'.
+  ASSERT_TRUE(this->shared_ != NULL);
+  EXPECT_EQ(5, *this->shared_);
+  EXPECT_EQ(2, this->value_);
+}
+
+REGISTER_TYPED_TEST_CASE_P(DerivedTest,
+                           ValuesAreCorrect, ValuesAreStillCorrect);
+
+typedef Types<short, long> MyTwoTypes;
+INSTANTIATE_TYPED_TEST_CASE_P(My, DerivedTest, MyTwoTypes);
+
+// Tests that multiple TYPED_TEST_CASE_P's can be defined in the same
+// translation unit.
+
+template <typename T>
+class TypedTestP1 : public Test {
+};
+
+TYPED_TEST_CASE_P(TypedTestP1);
+
+// For testing that the code between TYPED_TEST_CASE_P() and
+// TYPED_TEST_P() is not enclosed in a namespace.
+typedef int IntAfterTypedTestCaseP;
+
+TYPED_TEST_P(TypedTestP1, A) {}
+TYPED_TEST_P(TypedTestP1, B) {}
+
+// For testing that the code between TYPED_TEST_P() and
+// REGISTER_TYPED_TEST_CASE_P() is not enclosed in a namespace.
+typedef int IntBeforeRegisterTypedTestCaseP;
+
+REGISTER_TYPED_TEST_CASE_P(TypedTestP1, A, B);
+
+template <typename T>
+class TypedTestP2 : public Test {
+};
+
+TYPED_TEST_CASE_P(TypedTestP2);
+
+// This also verifies that tests from different type-parameterized
+// test cases can share the same name.
+TYPED_TEST_P(TypedTestP2, A) {}
+
+REGISTER_TYPED_TEST_CASE_P(TypedTestP2, A);
+
+// Verifies that the code between TYPED_TEST_CASE_P() and
+// REGISTER_TYPED_TEST_CASE_P() is not enclosed in a namespace.
+IntAfterTypedTestCaseP after = 0;
+IntBeforeRegisterTypedTestCaseP before = 0;
+
+// Verifies that the last argument of INSTANTIATE_TYPED_TEST_CASE_P()
+// can be either a single type or a Types<...> type list.
+INSTANTIATE_TYPED_TEST_CASE_P(Int, TypedTestP1, int);
+INSTANTIATE_TYPED_TEST_CASE_P(Int, TypedTestP2, Types<int>);
+
+// Tests that the same type-parameterized test case can be
+// instantiated more than once in the same translation unit.
+INSTANTIATE_TYPED_TEST_CASE_P(Double, TypedTestP2, Types<double>);
+
+// Tests that the same type-parameterized test case can be
+// instantiated in different translation units linked together.
+// (ContainerTest is also instantiated in gtest-typed-test_test.cc.)
+typedef Types<std::vector<double>, std::set<char> > MyContainers;
+INSTANTIATE_TYPED_TEST_CASE_P(My, ContainerTest, MyContainers);
+
+// Tests that a type-parameterized test case can be defined and
+// instantiated in a namespace.
+
+namespace library2 {
+
+template <typename T>
+class NumericTest : public Test {
+};
+
+TYPED_TEST_CASE_P(NumericTest);
+
+TYPED_TEST_P(NumericTest, DefaultIsZero) {
+  EXPECT_EQ(0, TypeParam());
+}
+
+TYPED_TEST_P(NumericTest, ZeroIsLessThanOne) {
+  EXPECT_LT(TypeParam(0), TypeParam(1));
+}
+
+REGISTER_TYPED_TEST_CASE_P(NumericTest,
+                           DefaultIsZero, ZeroIsLessThanOne);
+typedef Types<int, double> NumericTypes;
+INSTANTIATE_TYPED_TEST_CASE_P(My, NumericTest, NumericTypes);
+
+static const char* GetTestName() {
+  return testing::UnitTest::GetInstance()->current_test_info()->name();
+}
+// Test the stripping of space from test names
+template <typename T> class TrimmedTest : public Test { };
+TYPED_TEST_CASE_P(TrimmedTest);
+TYPED_TEST_P(TrimmedTest, Test1) { EXPECT_STREQ("Test1", GetTestName()); }
+TYPED_TEST_P(TrimmedTest, Test2) { EXPECT_STREQ("Test2", GetTestName()); }
+TYPED_TEST_P(TrimmedTest, Test3) { EXPECT_STREQ("Test3", GetTestName()); }
+TYPED_TEST_P(TrimmedTest, Test4) { EXPECT_STREQ("Test4", GetTestName()); }
+TYPED_TEST_P(TrimmedTest, Test5) { EXPECT_STREQ("Test5", GetTestName()); }
+REGISTER_TYPED_TEST_CASE_P(
+    TrimmedTest,
+    Test1, Test2,Test3 , Test4 ,Test5 );  // NOLINT
+template <typename T1, typename T2> struct MyPair {};
+// Be sure to try a type with a comma in its name just in case it matters.
+typedef Types<int, double, MyPair<int, int> > TrimTypes;
+INSTANTIATE_TYPED_TEST_CASE_P(My, TrimmedTest, TrimTypes);
+
+}  // namespace library2
+
+#endif  // GTEST_HAS_TYPED_TEST_P
+
+#if !defined(GTEST_HAS_TYPED_TEST) && !defined(GTEST_HAS_TYPED_TEST_P)
+
+// Google Test may not support type-parameterized tests with some
+// compilers. If we use conditional compilation to compile out all
+// code referring to the gtest_main library, MSVC linker will not link
+// that library at all and consequently complain about missing entry
+// point defined in that library (fatal error LNK1561: entry point
+// must be defined). This dummy test keeps gtest_main linked in.
+TEST(DummyTest, TypedTestsAreNotSupportedOnThisPlatform) {}
+
+#endif  // #if !defined(GTEST_HAS_TYPED_TEST) && !defined(GTEST_HAS_TYPED_TEST_P)
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-typed-test_test.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-typed-test_test.h
new file mode 100644
index 0000000000..41d75704cf
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-typed-test_test.h
@@ -0,0 +1,66 @@
+// Copyright 2008 Google Inc.
+// All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#ifndef GTEST_TEST_GTEST_TYPED_TEST_TEST_H_
+#define GTEST_TEST_GTEST_TYPED_TEST_TEST_H_
+
+#include "gtest/gtest.h"
+
+#if GTEST_HAS_TYPED_TEST_P
+
+using testing::Test;
+
+// For testing that the same type-parameterized test case can be
+// instantiated in different translation units linked together.
+// ContainerTest will be instantiated in both gtest-typed-test_test.cc
+// and gtest-typed-test2_test.cc.
+
+template <typename T>
+class ContainerTest : public Test {
+};
+
+TYPED_TEST_CASE_P(ContainerTest);
+
+TYPED_TEST_P(ContainerTest, CanBeDefaultConstructed) {
+  TypeParam container;
+}
+
+TYPED_TEST_P(ContainerTest, InitialSizeIsZero) {
+  TypeParam container;
+  EXPECT_EQ(0U, container.size());
+}
+
+REGISTER_TYPED_TEST_CASE_P(ContainerTest,
+                           CanBeDefaultConstructed, InitialSizeIsZero);
+
+#endif  // GTEST_HAS_TYPED_TEST_P
+
+#endif  // GTEST_TEST_GTEST_TYPED_TEST_TEST_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-unittest-api_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-unittest-api_test.cc
new file mode 100644
index 0000000000..b1f51688af
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest-unittest-api_test.cc
@@ -0,0 +1,341 @@
+// Copyright 2009 Google Inc.  All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This file contains tests verifying correctness of data provided via
+// UnitTest's public methods.
+
+#include "gtest/gtest.h"
+
+#include <string.h>  // For strcmp.
+#include <algorithm>
+
+using ::testing::InitGoogleTest;
+
+namespace testing {
+namespace internal {
+
+template <typename T>
+struct LessByName {
+  bool operator()(const T* a, const T* b) {
+    return strcmp(a->name(), b->name()) < 0;
+  }
+};
+
+class UnitTestHelper {
+ public:
+  // Returns the array of pointers to all test cases sorted by the test case
+  // name.  The caller is responsible for deleting the array.
+  static TestCase const** GetSortedTestCases() {
+    UnitTest& unit_test = *UnitTest::GetInstance();
+    TestCase const** const test_cases =
+        new const TestCase*[unit_test.total_test_case_count()];
+
+    for (int i = 0; i < unit_test.total_test_case_count(); ++i)
+      test_cases[i] = unit_test.GetTestCase(i);
+
+    std::sort(test_cases,
+              test_cases + unit_test.total_test_case_count(),
+              LessByName<TestCase>());
+    return test_cases;
+  }
+
+  // Returns the test case by its name.  The caller doesn't own the returned
+  // pointer.
+  static const TestCase* FindTestCase(const char* name) {
+    UnitTest& unit_test = *UnitTest::GetInstance();
+    for (int i = 0; i < unit_test.total_test_case_count(); ++i) {
+      const TestCase* test_case = unit_test.GetTestCase(i);
+      if (0 == strcmp(test_case->name(), name))
+        return test_case;
+    }
+    return NULL;
+  }
+
+  // Returns the array of pointers to all tests in a particular test case
+  // sorted by the test name.  The caller is responsible for deleting the
+  // array.
+  static TestInfo const** GetSortedTests(const TestCase* test_case) {
+    TestInfo const** const tests =
+        new const TestInfo*[test_case->total_test_count()];
+
+    for (int i = 0; i < test_case->total_test_count(); ++i)
+      tests[i] = test_case->GetTestInfo(i);
+
+    std::sort(tests, tests + test_case->total_test_count(),
+              LessByName<TestInfo>());
+    return tests;
+  }
+};
+
+#if GTEST_HAS_TYPED_TEST
+template <typename T> class TestCaseWithCommentTest : public Test {};
+TYPED_TEST_CASE(TestCaseWithCommentTest, Types<int>);
+TYPED_TEST(TestCaseWithCommentTest, Dummy) {}
+
+const int kTypedTestCases = 1;
+const int kTypedTests = 1;
+#else
+const int kTypedTestCases = 0;
+const int kTypedTests = 0;
+#endif  // GTEST_HAS_TYPED_TEST
+
+// We can only test the accessors that do not change value while tests run.
+// Since tests can be run in any order, the values the accessors that track
+// test execution (such as failed_test_count) can not be predicted.
+TEST(ApiTest, UnitTestImmutableAccessorsWork) {
+  UnitTest* unit_test = UnitTest::GetInstance();
+
+  ASSERT_EQ(2 + kTypedTestCases, unit_test->total_test_case_count());
+  EXPECT_EQ(1 + kTypedTestCases, unit_test->test_case_to_run_count());
+  EXPECT_EQ(2, unit_test->disabled_test_count());
+  EXPECT_EQ(5 + kTypedTests, unit_test->total_test_count());
+  EXPECT_EQ(3 + kTypedTests, unit_test->test_to_run_count());
+
+  const TestCase** const test_cases = UnitTestHelper::GetSortedTestCases();
+
+  EXPECT_STREQ("ApiTest", test_cases[0]->name());
+  EXPECT_STREQ("DISABLED_Test", test_cases[1]->name());
+#if GTEST_HAS_TYPED_TEST
+  EXPECT_STREQ("TestCaseWithCommentTest/0", test_cases[2]->name());
+#endif  // GTEST_HAS_TYPED_TEST
+
+  delete[] test_cases;
+
+  // The following lines initiate actions to verify certain methods in
+  // FinalSuccessChecker::TearDown.
+
+  // Records a test property to verify TestResult::GetTestProperty().
+  RecordProperty("key", "value");
+}
+
+AssertionResult IsNull(const char* str) {
+  if (str != NULL) {
+    return testing::AssertionFailure() << "argument is " << str;
+  }
+  return AssertionSuccess();
+}
+
+TEST(ApiTest, TestCaseImmutableAccessorsWork) {
+  const TestCase* test_case = UnitTestHelper::FindTestCase("ApiTest");
+  ASSERT_TRUE(test_case != NULL);
+
+  EXPECT_STREQ("ApiTest", test_case->name());
+  EXPECT_TRUE(IsNull(test_case->type_param()));
+  EXPECT_TRUE(test_case->should_run());
+  EXPECT_EQ(1, test_case->disabled_test_count());
+  EXPECT_EQ(3, test_case->test_to_run_count());
+  ASSERT_EQ(4, test_case->total_test_count());
+
+  const TestInfo** tests = UnitTestHelper::GetSortedTests(test_case);
+
+  EXPECT_STREQ("DISABLED_Dummy1", tests[0]->name());
+  EXPECT_STREQ("ApiTest", tests[0]->test_case_name());
+  EXPECT_TRUE(IsNull(tests[0]->value_param()));
+  EXPECT_TRUE(IsNull(tests[0]->type_param()));
+  EXPECT_FALSE(tests[0]->should_run());
+
+  EXPECT_STREQ("TestCaseDisabledAccessorsWork", tests[1]->name());
+  EXPECT_STREQ("ApiTest", tests[1]->test_case_name());
+  EXPECT_TRUE(IsNull(tests[1]->value_param()));
+  EXPECT_TRUE(IsNull(tests[1]->type_param()));
+  EXPECT_TRUE(tests[1]->should_run());
+
+  EXPECT_STREQ("TestCaseImmutableAccessorsWork", tests[2]->name());
+  EXPECT_STREQ("ApiTest", tests[2]->test_case_name());
+  EXPECT_TRUE(IsNull(tests[2]->value_param()));
+  EXPECT_TRUE(IsNull(tests[2]->type_param()));
+  EXPECT_TRUE(tests[2]->should_run());
+
+  EXPECT_STREQ("UnitTestImmutableAccessorsWork", tests[3]->name());
+  EXPECT_STREQ("ApiTest", tests[3]->test_case_name());
+  EXPECT_TRUE(IsNull(tests[3]->value_param()));
+  EXPECT_TRUE(IsNull(tests[3]->type_param()));
+  EXPECT_TRUE(tests[3]->should_run());
+
+  delete[] tests;
+  tests = NULL;
+
+#if GTEST_HAS_TYPED_TEST
+  test_case = UnitTestHelper::FindTestCase("TestCaseWithCommentTest/0");
+  ASSERT_TRUE(test_case != NULL);
+
+  EXPECT_STREQ("TestCaseWithCommentTest/0", test_case->name());
+  EXPECT_STREQ(GetTypeName<int>().c_str(), test_case->type_param());
+  EXPECT_TRUE(test_case->should_run());
+  EXPECT_EQ(0, test_case->disabled_test_count());
+  EXPECT_EQ(1, test_case->test_to_run_count());
+  ASSERT_EQ(1, test_case->total_test_count());
+
+  tests = UnitTestHelper::GetSortedTests(test_case);
+
+  EXPECT_STREQ("Dummy", tests[0]->name());
+  EXPECT_STREQ("TestCaseWithCommentTest/0", tests[0]->test_case_name());
+  EXPECT_TRUE(IsNull(tests[0]->value_param()));
+  EXPECT_STREQ(GetTypeName<int>().c_str(), tests[0]->type_param());
+  EXPECT_TRUE(tests[0]->should_run());
+
+  delete[] tests;
+#endif  // GTEST_HAS_TYPED_TEST
+}
+
+TEST(ApiTest, TestCaseDisabledAccessorsWork) {
+  const TestCase* test_case = UnitTestHelper::FindTestCase("DISABLED_Test");
+  ASSERT_TRUE(test_case != NULL);
+
+  EXPECT_STREQ("DISABLED_Test", test_case->name());
+  EXPECT_TRUE(IsNull(test_case->type_param()));
+  EXPECT_FALSE(test_case->should_run());
+  EXPECT_EQ(1, test_case->disabled_test_count());
+  EXPECT_EQ(0, test_case->test_to_run_count());
+  ASSERT_EQ(1, test_case->total_test_count());
+
+  const TestInfo* const test_info = test_case->GetTestInfo(0);
+  EXPECT_STREQ("Dummy2", test_info->name());
+  EXPECT_STREQ("DISABLED_Test", test_info->test_case_name());
+  EXPECT_TRUE(IsNull(test_info->value_param()));
+  EXPECT_TRUE(IsNull(test_info->type_param()));
+  EXPECT_FALSE(test_info->should_run());
+}
+
+// These two tests are here to provide support for testing
+// test_case_to_run_count, disabled_test_count, and test_to_run_count.
+TEST(ApiTest, DISABLED_Dummy1) {}
+TEST(DISABLED_Test, Dummy2) {}
+
+class FinalSuccessChecker : public Environment {
+ protected:
+  virtual void TearDown() {
+    UnitTest* unit_test = UnitTest::GetInstance();
+
+    EXPECT_EQ(1 + kTypedTestCases, unit_test->successful_test_case_count());
+    EXPECT_EQ(3 + kTypedTests, unit_test->successful_test_count());
+    EXPECT_EQ(0, unit_test->failed_test_case_count());
+    EXPECT_EQ(0, unit_test->failed_test_count());
+    EXPECT_TRUE(unit_test->Passed());
+    EXPECT_FALSE(unit_test->Failed());
+    ASSERT_EQ(2 + kTypedTestCases, unit_test->total_test_case_count());
+
+    const TestCase** const test_cases = UnitTestHelper::GetSortedTestCases();
+
+    EXPECT_STREQ("ApiTest", test_cases[0]->name());
+    EXPECT_TRUE(IsNull(test_cases[0]->type_param()));
+    EXPECT_TRUE(test_cases[0]->should_run());
+    EXPECT_EQ(1, test_cases[0]->disabled_test_count());
+    ASSERT_EQ(4, test_cases[0]->total_test_count());
+    EXPECT_EQ(3, test_cases[0]->successful_test_count());
+    EXPECT_EQ(0, test_cases[0]->failed_test_count());
+    EXPECT_TRUE(test_cases[0]->Passed());
+    EXPECT_FALSE(test_cases[0]->Failed());
+
+    EXPECT_STREQ("DISABLED_Test", test_cases[1]->name());
+    EXPECT_TRUE(IsNull(test_cases[1]->type_param()));
+    EXPECT_FALSE(test_cases[1]->should_run());
+    EXPECT_EQ(1, test_cases[1]->disabled_test_count());
+    ASSERT_EQ(1, test_cases[1]->total_test_count());
+    EXPECT_EQ(0, test_cases[1]->successful_test_count());
+    EXPECT_EQ(0, test_cases[1]->failed_test_count());
+
+#if GTEST_HAS_TYPED_TEST
+    EXPECT_STREQ("TestCaseWithCommentTest/0", test_cases[2]->name());
+    EXPECT_STREQ(GetTypeName<int>().c_str(), test_cases[2]->type_param());
+    EXPECT_TRUE(test_cases[2]->should_run());
+    EXPECT_EQ(0, test_cases[2]->disabled_test_count());
+    ASSERT_EQ(1, test_cases[2]->total_test_count());
+    EXPECT_EQ(1, test_cases[2]->successful_test_count());
+    EXPECT_EQ(0, test_cases[2]->failed_test_count());
+    EXPECT_TRUE(test_cases[2]->Passed());
+    EXPECT_FALSE(test_cases[2]->Failed());
+#endif  // GTEST_HAS_TYPED_TEST
+
+    const TestCase* test_case = UnitTestHelper::FindTestCase("ApiTest");
+    const TestInfo** tests = UnitTestHelper::GetSortedTests(test_case);
+    EXPECT_STREQ("DISABLED_Dummy1", tests[0]->name());
+    EXPECT_STREQ("ApiTest", tests[0]->test_case_name());
+    EXPECT_FALSE(tests[0]->should_run());
+
+    EXPECT_STREQ("TestCaseDisabledAccessorsWork", tests[1]->name());
+    EXPECT_STREQ("ApiTest", tests[1]->test_case_name());
+    EXPECT_TRUE(IsNull(tests[1]->value_param()));
+    EXPECT_TRUE(IsNull(tests[1]->type_param()));
+    EXPECT_TRUE(tests[1]->should_run());
+    EXPECT_TRUE(tests[1]->result()->Passed());
+    EXPECT_EQ(0, tests[1]->result()->test_property_count());
+
+    EXPECT_STREQ("TestCaseImmutableAccessorsWork", tests[2]->name());
+    EXPECT_STREQ("ApiTest", tests[2]->test_case_name());
+    EXPECT_TRUE(IsNull(tests[2]->value_param()));
+    EXPECT_TRUE(IsNull(tests[2]->type_param()));
+    EXPECT_TRUE(tests[2]->should_run());
+    EXPECT_TRUE(tests[2]->result()->Passed());
+    EXPECT_EQ(0, tests[2]->result()->test_property_count());
+
+    EXPECT_STREQ("UnitTestImmutableAccessorsWork", tests[3]->name());
+    EXPECT_STREQ("ApiTest", tests[3]->test_case_name());
+    EXPECT_TRUE(IsNull(tests[3]->value_param()));
+    EXPECT_TRUE(IsNull(tests[3]->type_param()));
+    EXPECT_TRUE(tests[3]->should_run());
+    EXPECT_TRUE(tests[3]->result()->Passed());
+    EXPECT_EQ(1, tests[3]->result()->test_property_count());
+    const TestProperty& property = tests[3]->result()->GetTestProperty(0);
+    EXPECT_STREQ("key", property.key());
+    EXPECT_STREQ("value", property.value());
+
+    delete[] tests;
+
+#if GTEST_HAS_TYPED_TEST
+    test_case = UnitTestHelper::FindTestCase("TestCaseWithCommentTest/0");
+    tests = UnitTestHelper::GetSortedTests(test_case);
+
+    EXPECT_STREQ("Dummy", tests[0]->name());
+    EXPECT_STREQ("TestCaseWithCommentTest/0", tests[0]->test_case_name());
+    EXPECT_TRUE(IsNull(tests[0]->value_param()));
+    EXPECT_STREQ(GetTypeName<int>().c_str(), tests[0]->type_param());
+    EXPECT_TRUE(tests[0]->should_run());
+    EXPECT_TRUE(tests[0]->result()->Passed());
+    EXPECT_EQ(0, tests[0]->result()->test_property_count());
+
+    delete[] tests;
+#endif  // GTEST_HAS_TYPED_TEST
+    delete[] test_cases;
+  }
+};
+
+}  // namespace internal
+}  // namespace testing
+
+int main(int argc, char **argv) {
+  InitGoogleTest(&argc, argv);
+
+  AddGlobalTestEnvironment(new testing::internal::FinalSuccessChecker());
+
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_all_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_all_test.cc
new file mode 100644
index 0000000000..955aa62828
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_all_test.cc
@@ -0,0 +1,47 @@
+// Copyright 2009, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Tests for Google C++ Testing Framework (Google Test)
+//
+// Sometimes it's desirable to build most of Google Test's own tests
+// by compiling a single file.  This file serves this purpose.
+#include "test/gtest-filepath_test.cc"
+#include "test/gtest-linked_ptr_test.cc"
+#include "test/gtest-message_test.cc"
+#include "test/gtest-options_test.cc"
+#include "test/gtest-port_test.cc"
+#include "test/gtest_pred_impl_unittest.cc"
+#include "test/gtest_prod_test.cc"
+#include "test/gtest-test-part_test.cc"
+#include "test/gtest-typed-test_test.cc"
+#include "test/gtest-typed-test2_test.cc"
+#include "test/gtest_unittest.cc"
+#include "test/production.cc"
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_break_on_failure_unittest.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_break_on_failure_unittest.py
new file mode 100755
index 0000000000..78f3e0f53b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_break_on_failure_unittest.py
@@ -0,0 +1,212 @@
+#!/usr/bin/env python
+#
+# Copyright 2006, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test for Google Test's break-on-failure mode.
+
+A user can ask Google Test to seg-fault when an assertion fails, using
+either the GTEST_BREAK_ON_FAILURE environment variable or the
+--gtest_break_on_failure flag.  This script tests such functionality
+by invoking gtest_break_on_failure_unittest_ (a program written with
+Google Test) with different environments and command line flags.
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import gtest_test_utils
+import os
+import sys
+
+
+# Constants.
+
+IS_WINDOWS = os.name == 'nt'
+
+# The environment variable for enabling/disabling the break-on-failure mode.
+BREAK_ON_FAILURE_ENV_VAR = 'GTEST_BREAK_ON_FAILURE'
+
+# The command line flag for enabling/disabling the break-on-failure mode.
+BREAK_ON_FAILURE_FLAG = 'gtest_break_on_failure'
+
+# The environment variable for enabling/disabling the throw-on-failure mode.
+THROW_ON_FAILURE_ENV_VAR = 'GTEST_THROW_ON_FAILURE'
+
+# The environment variable for enabling/disabling the catch-exceptions mode.
+CATCH_EXCEPTIONS_ENV_VAR = 'GTEST_CATCH_EXCEPTIONS'
+
+# Path to the gtest_break_on_failure_unittest_ program.
+EXE_PATH = gtest_test_utils.GetTestExecutablePath(
+    'gtest_break_on_failure_unittest_')
+
+
+environ = gtest_test_utils.environ
+SetEnvVar = gtest_test_utils.SetEnvVar
+
+# Tests in this file run a Google-Test-based test program and expect it
+# to terminate prematurely.  Therefore they are incompatible with
+# the premature-exit-file protocol by design.  Unset the
+# premature-exit filepath to prevent Google Test from creating
+# the file.
+SetEnvVar(gtest_test_utils.PREMATURE_EXIT_FILE_ENV_VAR, None)
+
+
+def Run(command):
+  """Runs a command; returns 1 if it was killed by a signal, or 0 otherwise."""
+
+  p = gtest_test_utils.Subprocess(command, env=environ)
+  if p.terminated_by_signal:
+    return 1
+  else:
+    return 0
+
+
+# The tests.
+
+
+class GTestBreakOnFailureUnitTest(gtest_test_utils.TestCase):
+  """Tests using the GTEST_BREAK_ON_FAILURE environment variable or
+  the --gtest_break_on_failure flag to turn assertion failures into
+  segmentation faults.
+  """
+
+  def RunAndVerify(self, env_var_value, flag_value, expect_seg_fault):
+    """Runs gtest_break_on_failure_unittest_ and verifies that it does
+    (or does not) have a seg-fault.
+
+    Args:
+      env_var_value:    value of the GTEST_BREAK_ON_FAILURE environment
+                        variable; None if the variable should be unset.
+      flag_value:       value of the --gtest_break_on_failure flag;
+                        None if the flag should not be present.
+      expect_seg_fault: 1 if the program is expected to generate a seg-fault;
+                        0 otherwise.
+    """
+
+    SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, env_var_value)
+
+    if env_var_value is None:
+      env_var_value_msg = ' is not set'
+    else:
+      env_var_value_msg = '=' + env_var_value
+
+    if flag_value is None:
+      flag = ''
+    elif flag_value == '0':
+      flag = '--%s=0' % BREAK_ON_FAILURE_FLAG
+    else:
+      flag = '--%s' % BREAK_ON_FAILURE_FLAG
+
+    command = [EXE_PATH]
+    if flag:
+      command.append(flag)
+
+    if expect_seg_fault:
+      should_or_not = 'should'
+    else:
+      should_or_not = 'should not'
+
+    has_seg_fault = Run(command)
+
+    SetEnvVar(BREAK_ON_FAILURE_ENV_VAR, None)
+
+    msg = ('when %s%s, an assertion failure in "%s" %s cause a seg-fault.' %
+           (BREAK_ON_FAILURE_ENV_VAR, env_var_value_msg, ' '.join(command),
+            should_or_not))
+    self.assert_(has_seg_fault == expect_seg_fault, msg)
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of the default mode."""
+
+    self.RunAndVerify(env_var_value=None,
+                      flag_value=None,
+                      expect_seg_fault=0)
+
+  def testEnvVar(self):
+    """Tests using the GTEST_BREAK_ON_FAILURE environment variable."""
+
+    self.RunAndVerify(env_var_value='0',
+                      flag_value=None,
+                      expect_seg_fault=0)
+    self.RunAndVerify(env_var_value='1',
+                      flag_value=None,
+                      expect_seg_fault=1)
+
+  def testFlag(self):
+    """Tests using the --gtest_break_on_failure flag."""
+
+    self.RunAndVerify(env_var_value=None,
+                      flag_value='0',
+                      expect_seg_fault=0)
+    self.RunAndVerify(env_var_value=None,
+                      flag_value='1',
+                      expect_seg_fault=1)
+
+  def testFlagOverridesEnvVar(self):
+    """Tests that the flag overrides the environment variable."""
+
+    self.RunAndVerify(env_var_value='0',
+                      flag_value='0',
+                      expect_seg_fault=0)
+    self.RunAndVerify(env_var_value='0',
+                      flag_value='1',
+                      expect_seg_fault=1)
+    self.RunAndVerify(env_var_value='1',
+                      flag_value='0',
+                      expect_seg_fault=0)
+    self.RunAndVerify(env_var_value='1',
+                      flag_value='1',
+                      expect_seg_fault=1)
+
+  def testBreakOnFailureOverridesThrowOnFailure(self):
+    """Tests that gtest_break_on_failure overrides gtest_throw_on_failure."""
+
+    SetEnvVar(THROW_ON_FAILURE_ENV_VAR, '1')
+    try:
+      self.RunAndVerify(env_var_value=None,
+                        flag_value='1',
+                        expect_seg_fault=1)
+    finally:
+      SetEnvVar(THROW_ON_FAILURE_ENV_VAR, None)
+
+  if IS_WINDOWS:
+    def testCatchExceptionsDoesNotInterfere(self):
+      """Tests that gtest_catch_exceptions doesn't interfere."""
+
+      SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, '1')
+      try:
+        self.RunAndVerify(env_var_value='1',
+                          flag_value='1',
+                          expect_seg_fault=1)
+      finally:
+        SetEnvVar(CATCH_EXCEPTIONS_ENV_VAR, None)
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_break_on_failure_unittest_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_break_on_failure_unittest_.cc
new file mode 100644
index 0000000000..dd07478c07
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_break_on_failure_unittest_.cc
@@ -0,0 +1,88 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Unit test for Google Test's break-on-failure mode.
+//
+// A user can ask Google Test to seg-fault when an assertion fails, using
+// either the GTEST_BREAK_ON_FAILURE environment variable or the
+// --gtest_break_on_failure flag.  This file is used for testing such
+// functionality.
+//
+// This program will be invoked from a Python unit test.  It is
+// expected to fail.  Don't run it directly.
+
+#include "gtest/gtest.h"
+
+#if GTEST_OS_WINDOWS
+# include <windows.h>
+# include <stdlib.h>
+#endif
+
+namespace {
+
+// A test that's expected to fail.
+TEST(Foo, Bar) {
+  EXPECT_EQ(2, 3);
+}
+
+#if GTEST_HAS_SEH && !GTEST_OS_WINDOWS_MOBILE
+// On Windows Mobile global exception handlers are not supported.
+LONG WINAPI ExitWithExceptionCode(
+    struct _EXCEPTION_POINTERS* exception_pointers) {
+  exit(exception_pointers->ExceptionRecord->ExceptionCode);
+}
+#endif
+
+}  // namespace
+
+int main(int argc, char **argv) {
+#if GTEST_OS_WINDOWS
+  // Suppresses display of the Windows error dialog upon encountering
+  // a general protection fault (segment violation).
+  SetErrorMode(SEM_NOGPFAULTERRORBOX | SEM_FAILCRITICALERRORS);
+
+# if GTEST_HAS_SEH && !GTEST_OS_WINDOWS_MOBILE
+
+  // The default unhandled exception filter does not always exit
+  // with the exception code as exit code - for example it exits with
+  // 0 for EXCEPTION_ACCESS_VIOLATION and 1 for EXCEPTION_BREAKPOINT
+  // if the application is compiled in debug mode. Thus we use our own
+  // filter which always exits with the exception code for unhandled
+  // exceptions.
+  SetUnhandledExceptionFilter(ExitWithExceptionCode);
+
+# endif
+#endif
+
+  testing::InitGoogleTest(&argc, argv);
+
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_catch_exceptions_test.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_catch_exceptions_test.py
new file mode 100755
index 0000000000..e6fc22fd1f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_catch_exceptions_test.py
@@ -0,0 +1,237 @@
+#!/usr/bin/env python
+#
+# Copyright 2010 Google Inc.  All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Tests Google Test's exception catching behavior.
+
+This script invokes gtest_catch_exceptions_test_ and
+gtest_catch_exceptions_ex_test_ (programs written with
+Google Test) and verifies their output.
+"""
+
+__author__ = 'vladl@google.com (Vlad Losev)'
+
+import os
+
+import gtest_test_utils
+
+# Constants.
+FLAG_PREFIX = '--gtest_'
+LIST_TESTS_FLAG = FLAG_PREFIX + 'list_tests'
+NO_CATCH_EXCEPTIONS_FLAG = FLAG_PREFIX + 'catch_exceptions=0'
+FILTER_FLAG = FLAG_PREFIX + 'filter'
+
+# Path to the gtest_catch_exceptions_ex_test_ binary, compiled with
+# exceptions enabled.
+EX_EXE_PATH = gtest_test_utils.GetTestExecutablePath(
+    'gtest_catch_exceptions_ex_test_')
+
+# Path to the gtest_catch_exceptions_test_ binary, compiled with
+# exceptions disabled.
+EXE_PATH = gtest_test_utils.GetTestExecutablePath(
+    'gtest_catch_exceptions_no_ex_test_')
+
+environ = gtest_test_utils.environ
+SetEnvVar = gtest_test_utils.SetEnvVar
+
+# Tests in this file run a Google-Test-based test program and expect it
+# to terminate prematurely.  Therefore they are incompatible with
+# the premature-exit-file protocol by design.  Unset the
+# premature-exit filepath to prevent Google Test from creating
+# the file.
+SetEnvVar(gtest_test_utils.PREMATURE_EXIT_FILE_ENV_VAR, None)
+
+TEST_LIST = gtest_test_utils.Subprocess(
+    [EXE_PATH, LIST_TESTS_FLAG], env=environ).output
+
+SUPPORTS_SEH_EXCEPTIONS = 'ThrowsSehException' in TEST_LIST
+
+if SUPPORTS_SEH_EXCEPTIONS:
+  BINARY_OUTPUT = gtest_test_utils.Subprocess([EXE_PATH], env=environ).output
+
+EX_BINARY_OUTPUT = gtest_test_utils.Subprocess(
+    [EX_EXE_PATH], env=environ).output
+
+
+# The tests.
+if SUPPORTS_SEH_EXCEPTIONS:
+  # pylint:disable-msg=C6302
+  class CatchSehExceptionsTest(gtest_test_utils.TestCase):
+    """Tests exception-catching behavior."""
+
+
+    def TestSehExceptions(self, test_output):
+      self.assert_('SEH exception with code 0x2a thrown '
+                   'in the test fixture\'s constructor'
+                   in test_output)
+      self.assert_('SEH exception with code 0x2a thrown '
+                   'in the test fixture\'s destructor'
+                   in test_output)
+      self.assert_('SEH exception with code 0x2a thrown in SetUpTestCase()'
+                   in test_output)
+      self.assert_('SEH exception with code 0x2a thrown in TearDownTestCase()'
+                   in test_output)
+      self.assert_('SEH exception with code 0x2a thrown in SetUp()'
+                   in test_output)
+      self.assert_('SEH exception with code 0x2a thrown in TearDown()'
+                   in test_output)
+      self.assert_('SEH exception with code 0x2a thrown in the test body'
+                   in test_output)
+
+    def testCatchesSehExceptionsWithCxxExceptionsEnabled(self):
+      self.TestSehExceptions(EX_BINARY_OUTPUT)
+
+    def testCatchesSehExceptionsWithCxxExceptionsDisabled(self):
+      self.TestSehExceptions(BINARY_OUTPUT)
+
+
+class CatchCxxExceptionsTest(gtest_test_utils.TestCase):
+  """Tests C++ exception-catching behavior.
+
+     Tests in this test case verify that:
+     * C++ exceptions are caught and logged as C++ (not SEH) exceptions
+     * Exception thrown affect the remainder of the test work flow in the
+       expected manner.
+  """
+
+  def testCatchesCxxExceptionsInFixtureConstructor(self):
+    self.assert_('C++ exception with description '
+                 '"Standard C++ exception" thrown '
+                 'in the test fixture\'s constructor'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('unexpected' not in EX_BINARY_OUTPUT,
+                 'This failure belongs in this test only if '
+                 '"CxxExceptionInConstructorTest" (no quotes) '
+                 'appears on the same line as words "called unexpectedly"')
+
+  if ('CxxExceptionInDestructorTest.ThrowsExceptionInDestructor' in
+      EX_BINARY_OUTPUT):
+
+    def testCatchesCxxExceptionsInFixtureDestructor(self):
+      self.assert_('C++ exception with description '
+                   '"Standard C++ exception" thrown '
+                   'in the test fixture\'s destructor'
+                   in EX_BINARY_OUTPUT)
+      self.assert_('CxxExceptionInDestructorTest::TearDownTestCase() '
+                   'called as expected.'
+                   in EX_BINARY_OUTPUT)
+
+  def testCatchesCxxExceptionsInSetUpTestCase(self):
+    self.assert_('C++ exception with description "Standard C++ exception"'
+                 ' thrown in SetUpTestCase()'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInConstructorTest::TearDownTestCase() '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInSetUpTestCaseTest constructor '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInSetUpTestCaseTest destructor '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInSetUpTestCaseTest::SetUp() '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInSetUpTestCaseTest::TearDown() '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInSetUpTestCaseTest test body '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+
+  def testCatchesCxxExceptionsInTearDownTestCase(self):
+    self.assert_('C++ exception with description "Standard C++ exception"'
+                 ' thrown in TearDownTestCase()'
+                 in EX_BINARY_OUTPUT)
+
+  def testCatchesCxxExceptionsInSetUp(self):
+    self.assert_('C++ exception with description "Standard C++ exception"'
+                 ' thrown in SetUp()'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInSetUpTest::TearDownTestCase() '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInSetUpTest destructor '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInSetUpTest::TearDown() '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('unexpected' not in EX_BINARY_OUTPUT,
+                 'This failure belongs in this test only if '
+                 '"CxxExceptionInSetUpTest" (no quotes) '
+                 'appears on the same line as words "called unexpectedly"')
+
+  def testCatchesCxxExceptionsInTearDown(self):
+    self.assert_('C++ exception with description "Standard C++ exception"'
+                 ' thrown in TearDown()'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInTearDownTest::TearDownTestCase() '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInTearDownTest destructor '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+
+  def testCatchesCxxExceptionsInTestBody(self):
+    self.assert_('C++ exception with description "Standard C++ exception"'
+                 ' thrown in the test body'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInTestBodyTest::TearDownTestCase() '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInTestBodyTest destructor '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+    self.assert_('CxxExceptionInTestBodyTest::TearDown() '
+                 'called as expected.'
+                 in EX_BINARY_OUTPUT)
+
+  def testCatchesNonStdCxxExceptions(self):
+    self.assert_('Unknown C++ exception thrown in the test body'
+                 in EX_BINARY_OUTPUT)
+
+  def testUnhandledCxxExceptionsAbortTheProgram(self):
+    # Filters out SEH exception tests on Windows. Unhandled SEH exceptions
+    # cause tests to show pop-up windows there.
+    FITLER_OUT_SEH_TESTS_FLAG = FILTER_FLAG + '=-*Seh*'
+    # By default, Google Test doesn't catch the exceptions.
+    uncaught_exceptions_ex_binary_output = gtest_test_utils.Subprocess(
+        [EX_EXE_PATH,
+         NO_CATCH_EXCEPTIONS_FLAG,
+         FITLER_OUT_SEH_TESTS_FLAG],
+        env=environ).output
+
+    self.assert_('Unhandled C++ exception terminating the program'
+                 in uncaught_exceptions_ex_binary_output)
+    self.assert_('unexpected' not in uncaught_exceptions_ex_binary_output)
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_catch_exceptions_test_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_catch_exceptions_test_.cc
new file mode 100644
index 0000000000..d0fc82c998
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_catch_exceptions_test_.cc
@@ -0,0 +1,311 @@
+// Copyright 2010, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: vladl@google.com (Vlad Losev)
+//
+// Tests for Google Test itself. Tests in this file throw C++ or SEH
+// exceptions, and the output is verified by gtest_catch_exceptions_test.py.
+
+#include "gtest/gtest.h"
+
+#include <stdio.h>  // NOLINT
+#include <stdlib.h>  // For exit().
+
+#if GTEST_HAS_SEH
+# include <windows.h>
+#endif
+
+#if GTEST_HAS_EXCEPTIONS
+# include <exception>  // For set_terminate().
+# include <stdexcept>
+#endif
+
+using testing::Test;
+
+#if GTEST_HAS_SEH
+
+class SehExceptionInConstructorTest : public Test {
+ public:
+  SehExceptionInConstructorTest() { RaiseException(42, 0, 0, NULL); }
+};
+
+TEST_F(SehExceptionInConstructorTest, ThrowsExceptionInConstructor) {}
+
+class SehExceptionInDestructorTest : public Test {
+ public:
+  ~SehExceptionInDestructorTest() { RaiseException(42, 0, 0, NULL); }
+};
+
+TEST_F(SehExceptionInDestructorTest, ThrowsExceptionInDestructor) {}
+
+class SehExceptionInSetUpTestCaseTest : public Test {
+ public:
+  static void SetUpTestCase() { RaiseException(42, 0, 0, NULL); }
+};
+
+TEST_F(SehExceptionInSetUpTestCaseTest, ThrowsExceptionInSetUpTestCase) {}
+
+class SehExceptionInTearDownTestCaseTest : public Test {
+ public:
+  static void TearDownTestCase() { RaiseException(42, 0, 0, NULL); }
+};
+
+TEST_F(SehExceptionInTearDownTestCaseTest, ThrowsExceptionInTearDownTestCase) {}
+
+class SehExceptionInSetUpTest : public Test {
+ protected:
+  virtual void SetUp() { RaiseException(42, 0, 0, NULL); }
+};
+
+TEST_F(SehExceptionInSetUpTest, ThrowsExceptionInSetUp) {}
+
+class SehExceptionInTearDownTest : public Test {
+ protected:
+  virtual void TearDown() { RaiseException(42, 0, 0, NULL); }
+};
+
+TEST_F(SehExceptionInTearDownTest, ThrowsExceptionInTearDown) {}
+
+TEST(SehExceptionTest, ThrowsSehException) {
+  RaiseException(42, 0, 0, NULL);
+}
+
+#endif  // GTEST_HAS_SEH
+
+#if GTEST_HAS_EXCEPTIONS
+
+class CxxExceptionInConstructorTest : public Test {
+ public:
+  CxxExceptionInConstructorTest() {
+    // Without this macro VC++ complains about unreachable code at the end of
+    // the constructor.
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
+        throw std::runtime_error("Standard C++ exception"));
+  }
+
+  static void TearDownTestCase() {
+    printf("%s",
+           "CxxExceptionInConstructorTest::TearDownTestCase() "
+           "called as expected.\n");
+  }
+
+ protected:
+  ~CxxExceptionInConstructorTest() {
+    ADD_FAILURE() << "CxxExceptionInConstructorTest destructor "
+                  << "called unexpectedly.";
+  }
+
+  virtual void SetUp() {
+    ADD_FAILURE() << "CxxExceptionInConstructorTest::SetUp() "
+                  << "called unexpectedly.";
+  }
+
+  virtual void TearDown() {
+    ADD_FAILURE() << "CxxExceptionInConstructorTest::TearDown() "
+                  << "called unexpectedly.";
+  }
+};
+
+TEST_F(CxxExceptionInConstructorTest, ThrowsExceptionInConstructor) {
+  ADD_FAILURE() << "CxxExceptionInConstructorTest test body "
+                << "called unexpectedly.";
+}
+
+// Exceptions in destructors are not supported in C++11.
+#if !defined(__GXX_EXPERIMENTAL_CXX0X__) &&  __cplusplus < 201103L
+class CxxExceptionInDestructorTest : public Test {
+ public:
+  static void TearDownTestCase() {
+    printf("%s",
+           "CxxExceptionInDestructorTest::TearDownTestCase() "
+           "called as expected.\n");
+  }
+
+ protected:
+  ~CxxExceptionInDestructorTest() {
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
+        throw std::runtime_error("Standard C++ exception"));
+  }
+};
+
+TEST_F(CxxExceptionInDestructorTest, ThrowsExceptionInDestructor) {}
+#endif  // C++11 mode
+
+class CxxExceptionInSetUpTestCaseTest : public Test {
+ public:
+  CxxExceptionInSetUpTestCaseTest() {
+    printf("%s",
+           "CxxExceptionInSetUpTestCaseTest constructor "
+           "called as expected.\n");
+  }
+
+  static void SetUpTestCase() {
+    throw std::runtime_error("Standard C++ exception");
+  }
+
+  static void TearDownTestCase() {
+    printf("%s",
+           "CxxExceptionInSetUpTestCaseTest::TearDownTestCase() "
+           "called as expected.\n");
+  }
+
+ protected:
+  ~CxxExceptionInSetUpTestCaseTest() {
+    printf("%s",
+           "CxxExceptionInSetUpTestCaseTest destructor "
+           "called as expected.\n");
+  }
+
+  virtual void SetUp() {
+    printf("%s",
+           "CxxExceptionInSetUpTestCaseTest::SetUp() "
+           "called as expected.\n");
+  }
+
+  virtual void TearDown() {
+    printf("%s",
+           "CxxExceptionInSetUpTestCaseTest::TearDown() "
+           "called as expected.\n");
+  }
+};
+
+TEST_F(CxxExceptionInSetUpTestCaseTest, ThrowsExceptionInSetUpTestCase) {
+  printf("%s",
+         "CxxExceptionInSetUpTestCaseTest test body "
+         "called as expected.\n");
+}
+
+class CxxExceptionInTearDownTestCaseTest : public Test {
+ public:
+  static void TearDownTestCase() {
+    throw std::runtime_error("Standard C++ exception");
+  }
+};
+
+TEST_F(CxxExceptionInTearDownTestCaseTest, ThrowsExceptionInTearDownTestCase) {}
+
+class CxxExceptionInSetUpTest : public Test {
+ public:
+  static void TearDownTestCase() {
+    printf("%s",
+           "CxxExceptionInSetUpTest::TearDownTestCase() "
+           "called as expected.\n");
+  }
+
+ protected:
+  ~CxxExceptionInSetUpTest() {
+    printf("%s",
+           "CxxExceptionInSetUpTest destructor "
+           "called as expected.\n");
+  }
+
+  virtual void SetUp() { throw std::runtime_error("Standard C++ exception"); }
+
+  virtual void TearDown() {
+    printf("%s",
+           "CxxExceptionInSetUpTest::TearDown() "
+           "called as expected.\n");
+  }
+};
+
+TEST_F(CxxExceptionInSetUpTest, ThrowsExceptionInSetUp) {
+  ADD_FAILURE() << "CxxExceptionInSetUpTest test body "
+                << "called unexpectedly.";
+}
+
+class CxxExceptionInTearDownTest : public Test {
+ public:
+  static void TearDownTestCase() {
+    printf("%s",
+           "CxxExceptionInTearDownTest::TearDownTestCase() "
+           "called as expected.\n");
+  }
+
+ protected:
+  ~CxxExceptionInTearDownTest() {
+    printf("%s",
+           "CxxExceptionInTearDownTest destructor "
+           "called as expected.\n");
+  }
+
+  virtual void TearDown() {
+    throw std::runtime_error("Standard C++ exception");
+  }
+};
+
+TEST_F(CxxExceptionInTearDownTest, ThrowsExceptionInTearDown) {}
+
+class CxxExceptionInTestBodyTest : public Test {
+ public:
+  static void TearDownTestCase() {
+    printf("%s",
+           "CxxExceptionInTestBodyTest::TearDownTestCase() "
+           "called as expected.\n");
+  }
+
+ protected:
+  ~CxxExceptionInTestBodyTest() {
+    printf("%s",
+           "CxxExceptionInTestBodyTest destructor "
+           "called as expected.\n");
+  }
+
+  virtual void TearDown() {
+    printf("%s",
+           "CxxExceptionInTestBodyTest::TearDown() "
+           "called as expected.\n");
+  }
+};
+
+TEST_F(CxxExceptionInTestBodyTest, ThrowsStdCxxException) {
+  throw std::runtime_error("Standard C++ exception");
+}
+
+TEST(CxxExceptionTest, ThrowsNonStdCxxException) {
+  throw "C-string";
+}
+
+// This terminate handler aborts the program using exit() rather than abort().
+// This avoids showing pop-ups on Windows systems and core dumps on Unix-like
+// ones.
+void TerminateHandler() {
+  fprintf(stderr, "%s\n", "Unhandled C++ exception terminating the program.");
+  fflush(NULL);
+  exit(3);
+}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+int main(int argc, char** argv) {
+#if GTEST_HAS_EXCEPTIONS
+  std::set_terminate(&TerminateHandler);
+#endif
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_color_test.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_color_test.py
new file mode 100755
index 0000000000..d02a53ed85
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_color_test.py
@@ -0,0 +1,130 @@
+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Verifies that Google Test correctly determines whether to use colors."""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import gtest_test_utils
+
+
+IS_WINDOWS = os.name = 'nt'
+
+COLOR_ENV_VAR = 'GTEST_COLOR'
+COLOR_FLAG = 'gtest_color'
+COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_color_test_')
+
+
+def SetEnvVar(env_var, value):
+  """Sets the env variable to 'value'; unsets it when 'value' is None."""
+
+  if value is not None:
+    os.environ[env_var] = value
+  elif env_var in os.environ:
+    del os.environ[env_var]
+
+
+def UsesColor(term, color_env_var, color_flag):
+  """Runs gtest_color_test_ and returns its exit code."""
+
+  SetEnvVar('TERM', term)
+  SetEnvVar(COLOR_ENV_VAR, color_env_var)
+
+  if color_flag is None:
+    args = []
+  else:
+    args = ['--%s=%s' % (COLOR_FLAG, color_flag)]
+  p = gtest_test_utils.Subprocess([COMMAND] + args)
+  return not p.exited or p.exit_code
+
+
+class GTestColorTest(gtest_test_utils.TestCase):
+  def testNoEnvVarNoFlag(self):
+    """Tests the case when there's neither GTEST_COLOR nor --gtest_color."""
+
+    if not IS_WINDOWS:
+      self.assert_(not UsesColor('dumb', None, None))
+      self.assert_(not UsesColor('emacs', None, None))
+      self.assert_(not UsesColor('xterm-mono', None, None))
+      self.assert_(not UsesColor('unknown', None, None))
+      self.assert_(not UsesColor(None, None, None))
+    self.assert_(UsesColor('linux', None, None))
+    self.assert_(UsesColor('cygwin', None, None))
+    self.assert_(UsesColor('xterm', None, None))
+    self.assert_(UsesColor('xterm-color', None, None))
+    self.assert_(UsesColor('xterm-256color', None, None))
+
+  def testFlagOnly(self):
+    """Tests the case when there's --gtest_color but not GTEST_COLOR."""
+
+    self.assert_(not UsesColor('dumb', None, 'no'))
+    self.assert_(not UsesColor('xterm-color', None, 'no'))
+    if not IS_WINDOWS:
+      self.assert_(not UsesColor('emacs', None, 'auto'))
+    self.assert_(UsesColor('xterm', None, 'auto'))
+    self.assert_(UsesColor('dumb', None, 'yes'))
+    self.assert_(UsesColor('xterm', None, 'yes'))
+
+  def testEnvVarOnly(self):
+    """Tests the case when there's GTEST_COLOR but not --gtest_color."""
+
+    self.assert_(not UsesColor('dumb', 'no', None))
+    self.assert_(not UsesColor('xterm-color', 'no', None))
+    if not IS_WINDOWS:
+      self.assert_(not UsesColor('dumb', 'auto', None))
+    self.assert_(UsesColor('xterm-color', 'auto', None))
+    self.assert_(UsesColor('dumb', 'yes', None))
+    self.assert_(UsesColor('xterm-color', 'yes', None))
+
+  def testEnvVarAndFlag(self):
+    """Tests the case when there are both GTEST_COLOR and --gtest_color."""
+
+    self.assert_(not UsesColor('xterm-color', 'no', 'no'))
+    self.assert_(UsesColor('dumb', 'no', 'yes'))
+    self.assert_(UsesColor('xterm-color', 'no', 'auto'))
+
+  def testAliasesOfYesAndNo(self):
+    """Tests using aliases in specifying --gtest_color."""
+
+    self.assert_(UsesColor('dumb', None, 'true'))
+    self.assert_(UsesColor('dumb', None, 'YES'))
+    self.assert_(UsesColor('dumb', None, 'T'))
+    self.assert_(UsesColor('dumb', None, '1'))
+
+    self.assert_(not UsesColor('xterm', None, 'f'))
+    self.assert_(not UsesColor('xterm', None, 'false'))
+    self.assert_(not UsesColor('xterm', None, '0'))
+    self.assert_(not UsesColor('xterm', None, 'unknown'))
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_color_test_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_color_test_.cc
new file mode 100644
index 0000000000..f61ebb89b8
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_color_test_.cc
@@ -0,0 +1,71 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// A helper program for testing how Google Test determines whether to use
+// colors in the output.  It prints "YES" and returns 1 if Google Test
+// decides to use colors, and prints "NO" and returns 0 otherwise.
+
+#include <stdio.h>
+
+#include "gtest/gtest.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+using testing::internal::ShouldUseColor;
+
+// The purpose of this is to ensure that the UnitTest singleton is
+// created before main() is entered, and thus that ShouldUseColor()
+// works the same way as in a real Google-Test-based test.  We don't actual
+// run the TEST itself.
+TEST(GTestColorTest, Dummy) {
+}
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+
+  if (ShouldUseColor(true)) {
+    // Google Test decides to use colors in the output (assuming it
+    // goes to a TTY).
+    printf("YES\n");
+    return 1;
+  } else {
+    // Google Test decides not to use colors in the output.
+    printf("NO\n");
+    return 0;
+  }
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_env_var_test.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_env_var_test.py
new file mode 100755
index 0000000000..424075cfa3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_env_var_test.py
@@ -0,0 +1,117 @@
+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Verifies that Google Test correctly parses environment variables."""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import gtest_test_utils
+
+
+IS_WINDOWS = os.name == 'nt'
+IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
+
+COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_env_var_test_')
+
+environ = os.environ.copy()
+
+
+def AssertEq(expected, actual):
+  if expected != actual:
+    print('Expected: %s' % (expected,))
+    print('  Actual: %s' % (actual,))
+    raise AssertionError
+
+
+def SetEnvVar(env_var, value):
+  """Sets the env variable to 'value'; unsets it when 'value' is None."""
+
+  if value is not None:
+    environ[env_var] = value
+  elif env_var in environ:
+    del environ[env_var]
+
+
+def GetFlag(flag):
+  """Runs gtest_env_var_test_ and returns its output."""
+
+  args = [COMMAND]
+  if flag is not None:
+    args += [flag]
+  return gtest_test_utils.Subprocess(args, env=environ).output
+
+
+def TestFlag(flag, test_val, default_val):
+  """Verifies that the given flag is affected by the corresponding env var."""
+
+  env_var = 'GTEST_' + flag.upper()
+  SetEnvVar(env_var, test_val)
+  AssertEq(test_val, GetFlag(flag))
+  SetEnvVar(env_var, None)
+  AssertEq(default_val, GetFlag(flag))
+
+
+class GTestEnvVarTest(gtest_test_utils.TestCase):
+  def testEnvVarAffectsFlag(self):
+    """Tests that environment variable should affect the corresponding flag."""
+
+    TestFlag('break_on_failure', '1', '0')
+    TestFlag('color', 'yes', 'auto')
+    TestFlag('filter', 'FooTest.Bar', '*')
+    SetEnvVar('XML_OUTPUT_FILE', None) # For 'output' test
+    TestFlag('output', 'xml:tmp/foo.xml', '')
+    TestFlag('print_time', '0', '1')
+    TestFlag('repeat', '999', '1')
+    TestFlag('throw_on_failure', '1', '0')
+    TestFlag('death_test_style', 'threadsafe', 'fast')
+    TestFlag('catch_exceptions', '0', '1')
+
+    if IS_LINUX:
+      TestFlag('death_test_use_fork', '1', '0')
+      TestFlag('stack_trace_depth', '0', '100')
+
+  def testXmlOutputFile(self):
+    """Tests that $XML_OUTPUT_FILE affects the output flag."""
+
+    SetEnvVar('GTEST_OUTPUT', None)
+    SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml')
+    AssertEq('xml:tmp/bar.xml', GetFlag('output'))
+
+  def testXmlOutputFileOverride(self):
+    """Tests that $XML_OUTPUT_FILE is overridden by $GTEST_OUTPUT"""
+
+    SetEnvVar('GTEST_OUTPUT', 'xml:tmp/foo.xml')
+    SetEnvVar('XML_OUTPUT_FILE', 'tmp/bar.xml')
+    AssertEq('xml:tmp/foo.xml', GetFlag('output'))
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_env_var_test_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_env_var_test_.cc
new file mode 100644
index 0000000000..539afc9683
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_env_var_test_.cc
@@ -0,0 +1,126 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// A helper program for testing that Google Test parses the environment
+// variables correctly.
+
+#include "gtest/gtest.h"
+
+#include <iostream>
+
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+using ::std::cout;
+
+namespace testing {
+
+// The purpose of this is to make the test more realistic by ensuring
+// that the UnitTest singleton is created before main() is entered.
+// We don't actual run the TEST itself.
+TEST(GTestEnvVarTest, Dummy) {
+}
+
+void PrintFlag(const char* flag) {
+  if (strcmp(flag, "break_on_failure") == 0) {
+    cout << GTEST_FLAG(break_on_failure);
+    return;
+  }
+
+  if (strcmp(flag, "catch_exceptions") == 0) {
+    cout << GTEST_FLAG(catch_exceptions);
+    return;
+  }
+
+  if (strcmp(flag, "color") == 0) {
+    cout << GTEST_FLAG(color);
+    return;
+  }
+
+  if (strcmp(flag, "death_test_style") == 0) {
+    cout << GTEST_FLAG(death_test_style);
+    return;
+  }
+
+  if (strcmp(flag, "death_test_use_fork") == 0) {
+    cout << GTEST_FLAG(death_test_use_fork);
+    return;
+  }
+
+  if (strcmp(flag, "filter") == 0) {
+    cout << GTEST_FLAG(filter);
+    return;
+  }
+
+  if (strcmp(flag, "output") == 0) {
+    cout << GTEST_FLAG(output);
+    return;
+  }
+
+  if (strcmp(flag, "print_time") == 0) {
+    cout << GTEST_FLAG(print_time);
+    return;
+  }
+
+  if (strcmp(flag, "repeat") == 0) {
+    cout << GTEST_FLAG(repeat);
+    return;
+  }
+
+  if (strcmp(flag, "stack_trace_depth") == 0) {
+    cout << GTEST_FLAG(stack_trace_depth);
+    return;
+  }
+
+  if (strcmp(flag, "throw_on_failure") == 0) {
+    cout << GTEST_FLAG(throw_on_failure);
+    return;
+  }
+
+  cout << "Invalid flag name " << flag
+       << ".  Valid names are break_on_failure, color, filter, etc.\n";
+  exit(1);
+}
+
+}  // namespace testing
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+
+  if (argc != 2) {
+    cout << "Usage: gtest_env_var_test_ NAME_OF_FLAG\n";
+    return 1;
+  }
+
+  testing::PrintFlag(argv[1]);
+  return 0;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_environment_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_environment_test.cc
new file mode 100644
index 0000000000..3cff19e70e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_environment_test.cc
@@ -0,0 +1,192 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Tests using global test environments.
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "gtest/gtest.h"
+
+#define GTEST_IMPLEMENTATION_ 1  // Required for the next #include.
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+namespace testing {
+GTEST_DECLARE_string_(filter);
+}
+
+namespace {
+
+enum FailureType {
+  NO_FAILURE, NON_FATAL_FAILURE, FATAL_FAILURE
+};
+
+// For testing using global test environments.
+class MyEnvironment : public testing::Environment {
+ public:
+  MyEnvironment() { Reset(); }
+
+  // Depending on the value of failure_in_set_up_, SetUp() will
+  // generate a non-fatal failure, generate a fatal failure, or
+  // succeed.
+  virtual void SetUp() {
+    set_up_was_run_ = true;
+
+    switch (failure_in_set_up_) {
+      case NON_FATAL_FAILURE:
+        ADD_FAILURE() << "Expected non-fatal failure in global set-up.";
+        break;
+      case FATAL_FAILURE:
+        FAIL() << "Expected fatal failure in global set-up.";
+        break;
+      default:
+        break;
+    }
+  }
+
+  // Generates a non-fatal failure.
+  virtual void TearDown() {
+    tear_down_was_run_ = true;
+    ADD_FAILURE() << "Expected non-fatal failure in global tear-down.";
+  }
+
+  // Resets the state of the environment s.t. it can be reused.
+  void Reset() {
+    failure_in_set_up_ = NO_FAILURE;
+    set_up_was_run_ = false;
+    tear_down_was_run_ = false;
+  }
+
+  // We call this function to set the type of failure SetUp() should
+  // generate.
+  void set_failure_in_set_up(FailureType type) {
+    failure_in_set_up_ = type;
+  }
+
+  // Was SetUp() run?
+  bool set_up_was_run() const { return set_up_was_run_; }
+
+  // Was TearDown() run?
+  bool tear_down_was_run() const { return tear_down_was_run_; }
+
+ private:
+  FailureType failure_in_set_up_;
+  bool set_up_was_run_;
+  bool tear_down_was_run_;
+};
+
+// Was the TEST run?
+bool test_was_run;
+
+// The sole purpose of this TEST is to enable us to check whether it
+// was run.
+TEST(FooTest, Bar) {
+  test_was_run = true;
+}
+
+// Prints the message and aborts the program if condition is false.
+void Check(bool condition, const char* msg) {
+  if (!condition) {
+    printf("FAILED: %s\n", msg);
+    testing::internal::posix::Abort();
+  }
+}
+
+// Runs the tests.  Return true iff successful.
+//
+// The 'failure' parameter specifies the type of failure that should
+// be generated by the global set-up.
+int RunAllTests(MyEnvironment* env, FailureType failure) {
+  env->Reset();
+  env->set_failure_in_set_up(failure);
+  test_was_run = false;
+  testing::internal::GetUnitTestImpl()->ClearAdHocTestResult();
+  return RUN_ALL_TESTS();
+}
+
+}  // namespace
+
+int main(int argc, char **argv) {
+  testing::InitGoogleTest(&argc, argv);
+
+  // Registers a global test environment, and verifies that the
+  // registration function returns its argument.
+  MyEnvironment* const env = new MyEnvironment;
+  Check(testing::AddGlobalTestEnvironment(env) == env,
+        "AddGlobalTestEnvironment() should return its argument.");
+
+  // Verifies that RUN_ALL_TESTS() runs the tests when the global
+  // set-up is successful.
+  Check(RunAllTests(env, NO_FAILURE) != 0,
+        "RUN_ALL_TESTS() should return non-zero, as the global tear-down "
+        "should generate a failure.");
+  Check(test_was_run,
+        "The tests should run, as the global set-up should generate no "
+        "failure");
+  Check(env->tear_down_was_run(),
+        "The global tear-down should run, as the global set-up was run.");
+
+  // Verifies that RUN_ALL_TESTS() runs the tests when the global
+  // set-up generates no fatal failure.
+  Check(RunAllTests(env, NON_FATAL_FAILURE) != 0,
+        "RUN_ALL_TESTS() should return non-zero, as both the global set-up "
+        "and the global tear-down should generate a non-fatal failure.");
+  Check(test_was_run,
+        "The tests should run, as the global set-up should generate no "
+        "fatal failure.");
+  Check(env->tear_down_was_run(),
+        "The global tear-down should run, as the global set-up was run.");
+
+  // Verifies that RUN_ALL_TESTS() runs no test when the global set-up
+  // generates a fatal failure.
+  Check(RunAllTests(env, FATAL_FAILURE) != 0,
+        "RUN_ALL_TESTS() should return non-zero, as the global set-up "
+        "should generate a fatal failure.");
+  Check(!test_was_run,
+        "The tests should not run, as the global set-up should generate "
+        "a fatal failure.");
+  Check(env->tear_down_was_run(),
+        "The global tear-down should run, as the global set-up was run.");
+
+  // Verifies that RUN_ALL_TESTS() doesn't do global set-up or
+  // tear-down when there is no test to run.
+  testing::GTEST_FLAG(filter) = "-*";
+  Check(RunAllTests(env, NO_FAILURE) == 0,
+        "RUN_ALL_TESTS() should return zero, as there is no test to run.");
+  Check(!env->set_up_was_run(),
+        "The global set-up should not run, as there is no test to run.");
+  Check(!env->tear_down_was_run(),
+        "The global tear-down should not run, "
+        "as the global set-up was not run.");
+
+  printf("PASS\n");
+  return 0;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_filter_unittest.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_filter_unittest.py
new file mode 100755
index 0000000000..ec0b151b11
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_filter_unittest.py
@@ -0,0 +1,636 @@
+#!/usr/bin/env python
+#
+# Copyright 2005 Google Inc. All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test for Google Test test filters.
+
+A user can specify which test(s) in a Google Test program to run via either
+the GTEST_FILTER environment variable or the --gtest_filter flag.
+This script tests such functionality by invoking
+gtest_filter_unittest_ (a program written with Google Test) with different
+environments and command line flags.
+
+Note that test sharding may also influence which tests are filtered. Therefore,
+we test that here also.
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import re
+try:
+  from sets import Set as set  # For Python 2.3 compatibility
+except ImportError:
+  pass
+import sys
+
+import gtest_test_utils
+
+# Constants.
+
+# Checks if this platform can pass empty environment variables to child
+# processes.  We set an env variable to an empty string and invoke a python
+# script in a subprocess to print whether the variable is STILL in
+# os.environ.  We then use 'eval' to parse the child's output so that an
+# exception is thrown if the input is anything other than 'True' nor 'False'.
+os.environ['EMPTY_VAR'] = ''
+child = gtest_test_utils.Subprocess(
+    [sys.executable, '-c', 'import os; print(\'EMPTY_VAR\' in os.environ)'])
+CAN_PASS_EMPTY_ENV = eval(child.output)
+
+
+# Check if this platform can unset environment variables in child processes.
+# We set an env variable to a non-empty string, unset it, and invoke
+# a python script in a subprocess to print whether the variable
+# is NO LONGER in os.environ.
+# We use 'eval' to parse the child's output so that an exception
+# is thrown if the input is neither 'True' nor 'False'.
+os.environ['UNSET_VAR'] = 'X'
+del os.environ['UNSET_VAR']
+child = gtest_test_utils.Subprocess(
+    [sys.executable, '-c', 'import os; print(\'UNSET_VAR\' not in os.environ)'])
+CAN_UNSET_ENV = eval(child.output)
+
+
+# Checks if we should test with an empty filter. This doesn't
+# make sense on platforms that cannot pass empty env variables (Win32)
+# and on platforms that cannot unset variables (since we cannot tell
+# the difference between "" and NULL -- Borland and Solaris < 5.10)
+CAN_TEST_EMPTY_FILTER = (CAN_PASS_EMPTY_ENV and CAN_UNSET_ENV)
+
+
+# The environment variable for specifying the test filters.
+FILTER_ENV_VAR = 'GTEST_FILTER'
+
+# The environment variables for test sharding.
+TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS'
+SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX'
+SHARD_STATUS_FILE_ENV_VAR = 'GTEST_SHARD_STATUS_FILE'
+
+# The command line flag for specifying the test filters.
+FILTER_FLAG = 'gtest_filter'
+
+# The command line flag for including disabled tests.
+ALSO_RUN_DISABED_TESTS_FLAG = 'gtest_also_run_disabled_tests'
+
+# Command to run the gtest_filter_unittest_ program.
+COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_filter_unittest_')
+
+# Regex for determining whether parameterized tests are enabled in the binary.
+PARAM_TEST_REGEX = re.compile(r'/ParamTest')
+
+# Regex for parsing test case names from Google Test's output.
+TEST_CASE_REGEX = re.compile(r'^\[\-+\] \d+ tests? from (\w+(/\w+)?)')
+
+# Regex for parsing test names from Google Test's output.
+TEST_REGEX = re.compile(r'^\[\s*RUN\s*\].*\.(\w+(/\w+)?)')
+
+# The command line flag to tell Google Test to output the list of tests it
+# will run.
+LIST_TESTS_FLAG = '--gtest_list_tests'
+
+# Indicates whether Google Test supports death tests.
+SUPPORTS_DEATH_TESTS = 'HasDeathTest' in gtest_test_utils.Subprocess(
+    [COMMAND, LIST_TESTS_FLAG]).output
+
+# Full names of all tests in gtest_filter_unittests_.
+PARAM_TESTS = [
+    'SeqP/ParamTest.TestX/0',
+    'SeqP/ParamTest.TestX/1',
+    'SeqP/ParamTest.TestY/0',
+    'SeqP/ParamTest.TestY/1',
+    'SeqQ/ParamTest.TestX/0',
+    'SeqQ/ParamTest.TestX/1',
+    'SeqQ/ParamTest.TestY/0',
+    'SeqQ/ParamTest.TestY/1',
+    ]
+
+DISABLED_TESTS = [
+    'BarTest.DISABLED_TestFour',
+    'BarTest.DISABLED_TestFive',
+    'BazTest.DISABLED_TestC',
+    'DISABLED_FoobarTest.Test1',
+    'DISABLED_FoobarTest.DISABLED_Test2',
+    'DISABLED_FoobarbazTest.TestA',
+    ]
+
+if SUPPORTS_DEATH_TESTS:
+  DEATH_TESTS = [
+    'HasDeathTest.Test1',
+    'HasDeathTest.Test2',
+    ]
+else:
+  DEATH_TESTS = []
+
+# All the non-disabled tests.
+ACTIVE_TESTS = [
+    'FooTest.Abc',
+    'FooTest.Xyz',
+
+    'BarTest.TestOne',
+    'BarTest.TestTwo',
+    'BarTest.TestThree',
+
+    'BazTest.TestOne',
+    'BazTest.TestA',
+    'BazTest.TestB',
+    ] + DEATH_TESTS + PARAM_TESTS
+
+param_tests_present = None
+
+# Utilities.
+
+environ = os.environ.copy()
+
+
+def SetEnvVar(env_var, value):
+  """Sets the env variable to 'value'; unsets it when 'value' is None."""
+
+  if value is not None:
+    environ[env_var] = value
+  elif env_var in environ:
+    del environ[env_var]
+
+
+def RunAndReturnOutput(args = None):
+  """Runs the test program and returns its output."""
+
+  return gtest_test_utils.Subprocess([COMMAND] + (args or []),
+                                     env=environ).output
+
+
+def RunAndExtractTestList(args = None):
+  """Runs the test program and returns its exit code and a list of tests run."""
+
+  p = gtest_test_utils.Subprocess([COMMAND] + (args or []), env=environ)
+  tests_run = []
+  test_case = ''
+  test = ''
+  for line in p.output.split('\n'):
+    match = TEST_CASE_REGEX.match(line)
+    if match is not None:
+      test_case = match.group(1)
+    else:
+      match = TEST_REGEX.match(line)
+      if match is not None:
+        test = match.group(1)
+        tests_run.append(test_case + '.' + test)
+  return (tests_run, p.exit_code)
+
+
+def InvokeWithModifiedEnv(extra_env, function, *args, **kwargs):
+  """Runs the given function and arguments in a modified environment."""
+  try:
+    original_env = environ.copy()
+    environ.update(extra_env)
+    return function(*args, **kwargs)
+  finally:
+    environ.clear()
+    environ.update(original_env)
+
+
+def RunWithSharding(total_shards, shard_index, command):
+  """Runs a test program shard and returns exit code and a list of tests run."""
+
+  extra_env = {SHARD_INDEX_ENV_VAR: str(shard_index),
+               TOTAL_SHARDS_ENV_VAR: str(total_shards)}
+  return InvokeWithModifiedEnv(extra_env, RunAndExtractTestList, command)
+
+# The unit test.
+
+
+class GTestFilterUnitTest(gtest_test_utils.TestCase):
+  """Tests the env variable or the command line flag to filter tests."""
+
+  # Utilities.
+
+  def AssertSetEqual(self, lhs, rhs):
+    """Asserts that two sets are equal."""
+
+    for elem in lhs:
+      self.assert_(elem in rhs, '%s in %s' % (elem, rhs))
+
+    for elem in rhs:
+      self.assert_(elem in lhs, '%s in %s' % (elem, lhs))
+
+  def AssertPartitionIsValid(self, set_var, list_of_sets):
+    """Asserts that list_of_sets is a valid partition of set_var."""
+
+    full_partition = []
+    for slice_var in list_of_sets:
+      full_partition.extend(slice_var)
+    self.assertEqual(len(set_var), len(full_partition))
+    self.assertEqual(set(set_var), set(full_partition))
+
+  def AdjustForParameterizedTests(self, tests_to_run):
+    """Adjust tests_to_run in case value parameterized tests are disabled."""
+
+    global param_tests_present
+    if not param_tests_present:
+      return list(set(tests_to_run) - set(PARAM_TESTS))
+    else:
+      return tests_to_run
+
+  def RunAndVerify(self, gtest_filter, tests_to_run):
+    """Checks that the binary runs correct set of tests for a given filter."""
+
+    tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
+
+    # First, tests using the environment variable.
+
+    # Windows removes empty variables from the environment when passing it
+    # to a new process.  This means it is impossible to pass an empty filter
+    # into a process using the environment variable.  However, we can still
+    # test the case when the variable is not supplied (i.e., gtest_filter is
+    # None).
+    # pylint: disable-msg=C6403
+    if CAN_TEST_EMPTY_FILTER or gtest_filter != '':
+      SetEnvVar(FILTER_ENV_VAR, gtest_filter)
+      tests_run = RunAndExtractTestList()[0]
+      SetEnvVar(FILTER_ENV_VAR, None)
+      self.AssertSetEqual(tests_run, tests_to_run)
+    # pylint: enable-msg=C6403
+
+    # Next, tests using the command line flag.
+
+    if gtest_filter is None:
+      args = []
+    else:
+      args = ['--%s=%s' % (FILTER_FLAG, gtest_filter)]
+
+    tests_run = RunAndExtractTestList(args)[0]
+    self.AssertSetEqual(tests_run, tests_to_run)
+
+  def RunAndVerifyWithSharding(self, gtest_filter, total_shards, tests_to_run,
+                               args=None, check_exit_0=False):
+    """Checks that binary runs correct tests for the given filter and shard.
+
+    Runs all shards of gtest_filter_unittest_ with the given filter, and
+    verifies that the right set of tests were run. The union of tests run
+    on each shard should be identical to tests_to_run, without duplicates.
+
+    Args:
+      gtest_filter: A filter to apply to the tests.
+      total_shards: A total number of shards to split test run into.
+      tests_to_run: A set of tests expected to run.
+      args   :      Arguments to pass to the to the test binary.
+      check_exit_0: When set to a true value, make sure that all shards
+                    return 0.
+    """
+
+    tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
+
+    # Windows removes empty variables from the environment when passing it
+    # to a new process.  This means it is impossible to pass an empty filter
+    # into a process using the environment variable.  However, we can still
+    # test the case when the variable is not supplied (i.e., gtest_filter is
+    # None).
+    # pylint: disable-msg=C6403
+    if CAN_TEST_EMPTY_FILTER or gtest_filter != '':
+      SetEnvVar(FILTER_ENV_VAR, gtest_filter)
+      partition = []
+      for i in range(0, total_shards):
+        (tests_run, exit_code) = RunWithSharding(total_shards, i, args)
+        if check_exit_0:
+          self.assertEqual(0, exit_code)
+        partition.append(tests_run)
+
+      self.AssertPartitionIsValid(tests_to_run, partition)
+      SetEnvVar(FILTER_ENV_VAR, None)
+    # pylint: enable-msg=C6403
+
+  def RunAndVerifyAllowingDisabled(self, gtest_filter, tests_to_run):
+    """Checks that the binary runs correct set of tests for the given filter.
+
+    Runs gtest_filter_unittest_ with the given filter, and enables
+    disabled tests. Verifies that the right set of tests were run.
+
+    Args:
+      gtest_filter: A filter to apply to the tests.
+      tests_to_run: A set of tests expected to run.
+    """
+
+    tests_to_run = self.AdjustForParameterizedTests(tests_to_run)
+
+    # Construct the command line.
+    args = ['--%s' % ALSO_RUN_DISABED_TESTS_FLAG]
+    if gtest_filter is not None:
+      args.append('--%s=%s' % (FILTER_FLAG, gtest_filter))
+
+    tests_run = RunAndExtractTestList(args)[0]
+    self.AssertSetEqual(tests_run, tests_to_run)
+
+  def setUp(self):
+    """Sets up test case.
+
+    Determines whether value-parameterized tests are enabled in the binary and
+    sets the flags accordingly.
+    """
+
+    global param_tests_present
+    if param_tests_present is None:
+      param_tests_present = PARAM_TEST_REGEX.search(
+          RunAndReturnOutput()) is not None
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of not specifying the filter."""
+
+    self.RunAndVerify(None, ACTIVE_TESTS)
+
+  def testDefaultBehaviorWithShards(self):
+    """Tests the behavior without the filter, with sharding enabled."""
+
+    self.RunAndVerifyWithSharding(None, 1, ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding(None, 2, ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) - 1, ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS), ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding(None, len(ACTIVE_TESTS) + 1, ACTIVE_TESTS)
+
+  def testEmptyFilter(self):
+    """Tests an empty filter."""
+
+    self.RunAndVerify('', [])
+    self.RunAndVerifyWithSharding('', 1, [])
+    self.RunAndVerifyWithSharding('', 2, [])
+
+  def testBadFilter(self):
+    """Tests a filter that matches nothing."""
+
+    self.RunAndVerify('BadFilter', [])
+    self.RunAndVerifyAllowingDisabled('BadFilter', [])
+
+  def testFullName(self):
+    """Tests filtering by full name."""
+
+    self.RunAndVerify('FooTest.Xyz', ['FooTest.Xyz'])
+    self.RunAndVerifyAllowingDisabled('FooTest.Xyz', ['FooTest.Xyz'])
+    self.RunAndVerifyWithSharding('FooTest.Xyz', 5, ['FooTest.Xyz'])
+
+  def testUniversalFilters(self):
+    """Tests filters that match everything."""
+
+    self.RunAndVerify('*', ACTIVE_TESTS)
+    self.RunAndVerify('*.*', ACTIVE_TESTS)
+    self.RunAndVerifyWithSharding('*.*', len(ACTIVE_TESTS) - 3, ACTIVE_TESTS)
+    self.RunAndVerifyAllowingDisabled('*', ACTIVE_TESTS + DISABLED_TESTS)
+    self.RunAndVerifyAllowingDisabled('*.*', ACTIVE_TESTS + DISABLED_TESTS)
+
+  def testFilterByTestCase(self):
+    """Tests filtering by test case name."""
+
+    self.RunAndVerify('FooTest.*', ['FooTest.Abc', 'FooTest.Xyz'])
+
+    BAZ_TESTS = ['BazTest.TestOne', 'BazTest.TestA', 'BazTest.TestB']
+    self.RunAndVerify('BazTest.*', BAZ_TESTS)
+    self.RunAndVerifyAllowingDisabled('BazTest.*',
+                                      BAZ_TESTS + ['BazTest.DISABLED_TestC'])
+
+  def testFilterByTest(self):
+    """Tests filtering by test name."""
+
+    self.RunAndVerify('*.TestOne', ['BarTest.TestOne', 'BazTest.TestOne'])
+
+  def testFilterDisabledTests(self):
+    """Select only the disabled tests to run."""
+
+    self.RunAndVerify('DISABLED_FoobarTest.Test1', [])
+    self.RunAndVerifyAllowingDisabled('DISABLED_FoobarTest.Test1',
+                                      ['DISABLED_FoobarTest.Test1'])
+
+    self.RunAndVerify('*DISABLED_*', [])
+    self.RunAndVerifyAllowingDisabled('*DISABLED_*', DISABLED_TESTS)
+
+    self.RunAndVerify('*.DISABLED_*', [])
+    self.RunAndVerifyAllowingDisabled('*.DISABLED_*', [
+        'BarTest.DISABLED_TestFour',
+        'BarTest.DISABLED_TestFive',
+        'BazTest.DISABLED_TestC',
+        'DISABLED_FoobarTest.DISABLED_Test2',
+        ])
+
+    self.RunAndVerify('DISABLED_*', [])
+    self.RunAndVerifyAllowingDisabled('DISABLED_*', [
+        'DISABLED_FoobarTest.Test1',
+        'DISABLED_FoobarTest.DISABLED_Test2',
+        'DISABLED_FoobarbazTest.TestA',
+        ])
+
+  def testWildcardInTestCaseName(self):
+    """Tests using wildcard in the test case name."""
+
+    self.RunAndVerify('*a*.*', [
+        'BarTest.TestOne',
+        'BarTest.TestTwo',
+        'BarTest.TestThree',
+
+        'BazTest.TestOne',
+        'BazTest.TestA',
+        'BazTest.TestB', ] + DEATH_TESTS + PARAM_TESTS)
+
+  def testWildcardInTestName(self):
+    """Tests using wildcard in the test name."""
+
+    self.RunAndVerify('*.*A*', ['FooTest.Abc', 'BazTest.TestA'])
+
+  def testFilterWithoutDot(self):
+    """Tests a filter that has no '.' in it."""
+
+    self.RunAndVerify('*z*', [
+        'FooTest.Xyz',
+
+        'BazTest.TestOne',
+        'BazTest.TestA',
+        'BazTest.TestB',
+        ])
+
+  def testTwoPatterns(self):
+    """Tests filters that consist of two patterns."""
+
+    self.RunAndVerify('Foo*.*:*A*', [
+        'FooTest.Abc',
+        'FooTest.Xyz',
+
+        'BazTest.TestA',
+        ])
+
+    # An empty pattern + a non-empty one
+    self.RunAndVerify(':*A*', ['FooTest.Abc', 'BazTest.TestA'])
+
+  def testThreePatterns(self):
+    """Tests filters that consist of three patterns."""
+
+    self.RunAndVerify('*oo*:*A*:*One', [
+        'FooTest.Abc',
+        'FooTest.Xyz',
+
+        'BarTest.TestOne',
+
+        'BazTest.TestOne',
+        'BazTest.TestA',
+        ])
+
+    # The 2nd pattern is empty.
+    self.RunAndVerify('*oo*::*One', [
+        'FooTest.Abc',
+        'FooTest.Xyz',
+
+        'BarTest.TestOne',
+
+        'BazTest.TestOne',
+        ])
+
+    # The last 2 patterns are empty.
+    self.RunAndVerify('*oo*::', [
+        'FooTest.Abc',
+        'FooTest.Xyz',
+        ])
+
+  def testNegativeFilters(self):
+    self.RunAndVerify('*-BazTest.TestOne', [
+        'FooTest.Abc',
+        'FooTest.Xyz',
+
+        'BarTest.TestOne',
+        'BarTest.TestTwo',
+        'BarTest.TestThree',
+
+        'BazTest.TestA',
+        'BazTest.TestB',
+        ] + DEATH_TESTS + PARAM_TESTS)
+
+    self.RunAndVerify('*-FooTest.Abc:BazTest.*', [
+        'FooTest.Xyz',
+
+        'BarTest.TestOne',
+        'BarTest.TestTwo',
+        'BarTest.TestThree',
+        ] + DEATH_TESTS + PARAM_TESTS)
+
+    self.RunAndVerify('BarTest.*-BarTest.TestOne', [
+        'BarTest.TestTwo',
+        'BarTest.TestThree',
+        ])
+
+    # Tests without leading '*'.
+    self.RunAndVerify('-FooTest.Abc:FooTest.Xyz:BazTest.*', [
+        'BarTest.TestOne',
+        'BarTest.TestTwo',
+        'BarTest.TestThree',
+        ] + DEATH_TESTS + PARAM_TESTS)
+
+    # Value parameterized tests.
+    self.RunAndVerify('*/*', PARAM_TESTS)
+
+    # Value parameterized tests filtering by the sequence name.
+    self.RunAndVerify('SeqP/*', [
+        'SeqP/ParamTest.TestX/0',
+        'SeqP/ParamTest.TestX/1',
+        'SeqP/ParamTest.TestY/0',
+        'SeqP/ParamTest.TestY/1',
+        ])
+
+    # Value parameterized tests filtering by the test name.
+    self.RunAndVerify('*/0', [
+        'SeqP/ParamTest.TestX/0',
+        'SeqP/ParamTest.TestY/0',
+        'SeqQ/ParamTest.TestX/0',
+        'SeqQ/ParamTest.TestY/0',
+        ])
+
+  def testFlagOverridesEnvVar(self):
+    """Tests that the filter flag overrides the filtering env. variable."""
+
+    SetEnvVar(FILTER_ENV_VAR, 'Foo*')
+    args = ['--%s=%s' % (FILTER_FLAG, '*One')]
+    tests_run = RunAndExtractTestList(args)[0]
+    SetEnvVar(FILTER_ENV_VAR, None)
+
+    self.AssertSetEqual(tests_run, ['BarTest.TestOne', 'BazTest.TestOne'])
+
+  def testShardStatusFileIsCreated(self):
+    """Tests that the shard file is created if specified in the environment."""
+
+    shard_status_file = os.path.join(gtest_test_utils.GetTempDir(),
+                                     'shard_status_file')
+    self.assert_(not os.path.exists(shard_status_file))
+
+    extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}
+    try:
+      InvokeWithModifiedEnv(extra_env, RunAndReturnOutput)
+    finally:
+      self.assert_(os.path.exists(shard_status_file))
+      os.remove(shard_status_file)
+
+  def testShardStatusFileIsCreatedWithListTests(self):
+    """Tests that the shard file is created with the "list_tests" flag."""
+
+    shard_status_file = os.path.join(gtest_test_utils.GetTempDir(),
+                                     'shard_status_file2')
+    self.assert_(not os.path.exists(shard_status_file))
+
+    extra_env = {SHARD_STATUS_FILE_ENV_VAR: shard_status_file}
+    try:
+      output = InvokeWithModifiedEnv(extra_env,
+                                     RunAndReturnOutput,
+                                     [LIST_TESTS_FLAG])
+    finally:
+      # This assertion ensures that Google Test enumerated the tests as
+      # opposed to running them.
+      self.assert_('[==========]' not in output,
+                   'Unexpected output during test enumeration.\n'
+                   'Please ensure that LIST_TESTS_FLAG is assigned the\n'
+                   'correct flag value for listing Google Test tests.')
+
+      self.assert_(os.path.exists(shard_status_file))
+      os.remove(shard_status_file)
+
+  if SUPPORTS_DEATH_TESTS:
+    def testShardingWorksWithDeathTests(self):
+      """Tests integration with death tests and sharding."""
+
+      gtest_filter = 'HasDeathTest.*:SeqP/*'
+      expected_tests = [
+          'HasDeathTest.Test1',
+          'HasDeathTest.Test2',
+
+          'SeqP/ParamTest.TestX/0',
+          'SeqP/ParamTest.TestX/1',
+          'SeqP/ParamTest.TestY/0',
+          'SeqP/ParamTest.TestY/1',
+          ]
+
+      for flag in ['--gtest_death_test_style=threadsafe',
+                   '--gtest_death_test_style=fast']:
+        self.RunAndVerifyWithSharding(gtest_filter, 3, expected_tests,
+                                      check_exit_0=True, args=[flag])
+        self.RunAndVerifyWithSharding(gtest_filter, 5, expected_tests,
+                                      check_exit_0=True, args=[flag])
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_filter_unittest_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_filter_unittest_.cc
new file mode 100644
index 0000000000..77deffc38f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_filter_unittest_.cc
@@ -0,0 +1,140 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Unit test for Google Test test filters.
+//
+// A user can specify which test(s) in a Google Test program to run via
+// either the GTEST_FILTER environment variable or the --gtest_filter
+// flag.  This is used for testing such functionality.
+//
+// The program will be invoked from a Python unit test.  Don't run it
+// directly.
+
+#include "gtest/gtest.h"
+
+namespace {
+
+// Test case FooTest.
+
+class FooTest : public testing::Test {
+};
+
+TEST_F(FooTest, Abc) {
+}
+
+TEST_F(FooTest, Xyz) {
+  FAIL() << "Expected failure.";
+}
+
+// Test case BarTest.
+
+TEST(BarTest, TestOne) {
+}
+
+TEST(BarTest, TestTwo) {
+}
+
+TEST(BarTest, TestThree) {
+}
+
+TEST(BarTest, DISABLED_TestFour) {
+  FAIL() << "Expected failure.";
+}
+
+TEST(BarTest, DISABLED_TestFive) {
+  FAIL() << "Expected failure.";
+}
+
+// Test case BazTest.
+
+TEST(BazTest, TestOne) {
+  FAIL() << "Expected failure.";
+}
+
+TEST(BazTest, TestA) {
+}
+
+TEST(BazTest, TestB) {
+}
+
+TEST(BazTest, DISABLED_TestC) {
+  FAIL() << "Expected failure.";
+}
+
+// Test case HasDeathTest
+
+TEST(HasDeathTest, Test1) {
+  EXPECT_DEATH_IF_SUPPORTED(exit(1), ".*");
+}
+
+// We need at least two death tests to make sure that the all death tests
+// aren't on the first shard.
+TEST(HasDeathTest, Test2) {
+  EXPECT_DEATH_IF_SUPPORTED(exit(1), ".*");
+}
+
+// Test case FoobarTest
+
+TEST(DISABLED_FoobarTest, Test1) {
+  FAIL() << "Expected failure.";
+}
+
+TEST(DISABLED_FoobarTest, DISABLED_Test2) {
+  FAIL() << "Expected failure.";
+}
+
+// Test case FoobarbazTest
+
+TEST(DISABLED_FoobarbazTest, TestA) {
+  FAIL() << "Expected failure.";
+}
+
+#if GTEST_HAS_PARAM_TEST
+class ParamTest : public testing::TestWithParam<int> {
+};
+
+TEST_P(ParamTest, TestX) {
+}
+
+TEST_P(ParamTest, TestY) {
+}
+
+INSTANTIATE_TEST_CASE_P(SeqP, ParamTest, testing::Values(1, 2));
+INSTANTIATE_TEST_CASE_P(SeqQ, ParamTest, testing::Values(5, 6));
+#endif  // GTEST_HAS_PARAM_TEST
+
+}  // namespace
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_help_test.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_help_test.py
new file mode 100755
index 0000000000..093c838d9e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_help_test.py
@@ -0,0 +1,172 @@
+#!/usr/bin/env python
+#
+# Copyright 2009, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Tests the --help flag of Google C++ Testing Framework.
+
+SYNOPSIS
+       gtest_help_test.py --build_dir=BUILD/DIR
+         # where BUILD/DIR contains the built gtest_help_test_ file.
+       gtest_help_test.py
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import re
+import gtest_test_utils
+
+
+IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux'
+IS_WINDOWS = os.name == 'nt'
+
+PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_help_test_')
+FLAG_PREFIX = '--gtest_'
+DEATH_TEST_STYLE_FLAG = FLAG_PREFIX + 'death_test_style'
+STREAM_RESULT_TO_FLAG = FLAG_PREFIX + 'stream_result_to'
+UNKNOWN_FLAG = FLAG_PREFIX + 'unknown_flag_for_testing'
+LIST_TESTS_FLAG = FLAG_PREFIX + 'list_tests'
+INCORRECT_FLAG_VARIANTS = [re.sub('^--', '-', LIST_TESTS_FLAG),
+                           re.sub('^--', '/', LIST_TESTS_FLAG),
+                           re.sub('_', '-', LIST_TESTS_FLAG)]
+INTERNAL_FLAG_FOR_TESTING = FLAG_PREFIX + 'internal_flag_for_testing'
+
+SUPPORTS_DEATH_TESTS = "DeathTest" in gtest_test_utils.Subprocess(
+    [PROGRAM_PATH, LIST_TESTS_FLAG]).output
+
+# The help message must match this regex.
+HELP_REGEX = re.compile(
+    FLAG_PREFIX + r'list_tests.*' +
+    FLAG_PREFIX + r'filter=.*' +
+    FLAG_PREFIX + r'also_run_disabled_tests.*' +
+    FLAG_PREFIX + r'repeat=.*' +
+    FLAG_PREFIX + r'shuffle.*' +
+    FLAG_PREFIX + r'random_seed=.*' +
+    FLAG_PREFIX + r'color=.*' +
+    FLAG_PREFIX + r'print_time.*' +
+    FLAG_PREFIX + r'output=.*' +
+    FLAG_PREFIX + r'break_on_failure.*' +
+    FLAG_PREFIX + r'throw_on_failure.*' +
+    FLAG_PREFIX + r'catch_exceptions=0.*',
+    re.DOTALL)
+
+
+def RunWithFlag(flag):
+  """Runs gtest_help_test_ with the given flag.
+
+  Returns:
+    the exit code and the text output as a tuple.
+  Args:
+    flag: the command-line flag to pass to gtest_help_test_, or None.
+  """
+
+  if flag is None:
+    command = [PROGRAM_PATH]
+  else:
+    command = [PROGRAM_PATH, flag]
+  child = gtest_test_utils.Subprocess(command)
+  return child.exit_code, child.output
+
+
+class GTestHelpTest(gtest_test_utils.TestCase):
+  """Tests the --help flag and its equivalent forms."""
+
+  def TestHelpFlag(self, flag):
+    """Verifies correct behavior when help flag is specified.
+
+    The right message must be printed and the tests must
+    skipped when the given flag is specified.
+
+    Args:
+      flag:  A flag to pass to the binary or None.
+    """
+
+    exit_code, output = RunWithFlag(flag)
+    self.assertEquals(0, exit_code)
+    self.assert_(HELP_REGEX.search(output), output)
+
+    if IS_LINUX:
+      self.assert_(STREAM_RESULT_TO_FLAG in output, output)
+    else:
+      self.assert_(STREAM_RESULT_TO_FLAG not in output, output)
+
+    if SUPPORTS_DEATH_TESTS and not IS_WINDOWS:
+      self.assert_(DEATH_TEST_STYLE_FLAG in output, output)
+    else:
+      self.assert_(DEATH_TEST_STYLE_FLAG not in output, output)
+
+  def TestNonHelpFlag(self, flag):
+    """Verifies correct behavior when no help flag is specified.
+
+    Verifies that when no help flag is specified, the tests are run
+    and the help message is not printed.
+
+    Args:
+      flag:  A flag to pass to the binary or None.
+    """
+
+    exit_code, output = RunWithFlag(flag)
+    self.assert_(exit_code != 0)
+    self.assert_(not HELP_REGEX.search(output), output)
+
+  def testPrintsHelpWithFullFlag(self):
+    self.TestHelpFlag('--help')
+
+  def testPrintsHelpWithShortFlag(self):
+    self.TestHelpFlag('-h')
+
+  def testPrintsHelpWithQuestionFlag(self):
+    self.TestHelpFlag('-?')
+
+  def testPrintsHelpWithWindowsStyleQuestionFlag(self):
+    self.TestHelpFlag('/?')
+
+  def testPrintsHelpWithUnrecognizedGoogleTestFlag(self):
+    self.TestHelpFlag(UNKNOWN_FLAG)
+
+  def testPrintsHelpWithIncorrectFlagStyle(self):
+    for incorrect_flag in INCORRECT_FLAG_VARIANTS:
+      self.TestHelpFlag(incorrect_flag)
+
+  def testRunsTestsWithoutHelpFlag(self):
+    """Verifies that when no help flag is specified, the tests are run
+    and the help message is not printed."""
+
+    self.TestNonHelpFlag(None)
+
+  def testRunsTestsWithGtestInternalFlag(self):
+    """Verifies that the tests are run and no help message is printed when
+    a flag starting with Google Test prefix and 'internal_' is supplied."""
+
+    self.TestNonHelpFlag(INTERNAL_FLAG_FOR_TESTING)
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_help_test_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_help_test_.cc
new file mode 100644
index 0000000000..31f78c2441
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_help_test_.cc
@@ -0,0 +1,46 @@
+// Copyright 2009, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// This program is meant to be run by gtest_help_test.py.  Do not run
+// it directly.
+
+#include "gtest/gtest.h"
+
+// When a help flag is specified, this program should skip the tests
+// and exit with 0; otherwise the following test will be executed,
+// causing this program to exit with a non-zero code.
+TEST(HelpFlagTest, ShouldNotBeRun) {
+  ASSERT_TRUE(false) << "Tests shouldn't be run when --help is specified.";
+}
+
+#if GTEST_HAS_DEATH_TEST
+TEST(DeathTest, UsedByPythonScriptToDetectSupportForDeathTestsInThisBinary) {}
+#endif
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_list_tests_unittest.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_list_tests_unittest.py
new file mode 100755
index 0000000000..f2d2fd1b1c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_list_tests_unittest.py
@@ -0,0 +1,207 @@
+#!/usr/bin/env python
+#
+# Copyright 2006, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test for Google Test's --gtest_list_tests flag.
+
+A user can ask Google Test to list all tests by specifying the
+--gtest_list_tests flag.  This script tests such functionality
+by invoking gtest_list_tests_unittest_ (a program written with
+Google Test) the command line flags.
+"""
+
+__author__ = 'phanna@google.com (Patrick Hanna)'
+
+import gtest_test_utils
+import re
+
+
+# Constants.
+
+# The command line flag for enabling/disabling listing all tests.
+LIST_TESTS_FLAG = 'gtest_list_tests'
+
+# Path to the gtest_list_tests_unittest_ program.
+EXE_PATH = gtest_test_utils.GetTestExecutablePath('gtest_list_tests_unittest_')
+
+# The expected output when running gtest_list_tests_unittest_ with
+# --gtest_list_tests
+EXPECTED_OUTPUT_NO_FILTER_RE = re.compile(r"""FooDeathTest\.
+  Test1
+Foo\.
+  Bar1
+  Bar2
+  DISABLED_Bar3
+Abc\.
+  Xyz
+  Def
+FooBar\.
+  Baz
+FooTest\.
+  Test1
+  DISABLED_Test2
+  Test3
+TypedTest/0\.  # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\.
+  TestA
+  TestB
+TypedTest/1\.  # TypeParam = int\s*\*( __ptr64)?
+  TestA
+  TestB
+TypedTest/2\.  # TypeParam = .*MyArray<bool,\s*42>
+  TestA
+  TestB
+My/TypeParamTest/0\.  # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\.
+  TestA
+  TestB
+My/TypeParamTest/1\.  # TypeParam = int\s*\*( __ptr64)?
+  TestA
+  TestB
+My/TypeParamTest/2\.  # TypeParam = .*MyArray<bool,\s*42>
+  TestA
+  TestB
+MyInstantiation/ValueParamTest\.
+  TestA/0  # GetParam\(\) = one line
+  TestA/1  # GetParam\(\) = two\\nlines
+  TestA/2  # GetParam\(\) = a very\\nlo{241}\.\.\.
+  TestB/0  # GetParam\(\) = one line
+  TestB/1  # GetParam\(\) = two\\nlines
+  TestB/2  # GetParam\(\) = a very\\nlo{241}\.\.\.
+""")
+
+# The expected output when running gtest_list_tests_unittest_ with
+# --gtest_list_tests and --gtest_filter=Foo*.
+EXPECTED_OUTPUT_FILTER_FOO_RE = re.compile(r"""FooDeathTest\.
+  Test1
+Foo\.
+  Bar1
+  Bar2
+  DISABLED_Bar3
+FooBar\.
+  Baz
+FooTest\.
+  Test1
+  DISABLED_Test2
+  Test3
+""")
+
+# Utilities.
+
+
+def Run(args):
+  """Runs gtest_list_tests_unittest_ and returns the list of tests printed."""
+
+  return gtest_test_utils.Subprocess([EXE_PATH] + args,
+                                     capture_stderr=False).output
+
+
+# The unit test.
+
+class GTestListTestsUnitTest(gtest_test_utils.TestCase):
+  """Tests using the --gtest_list_tests flag to list all tests."""
+
+  def RunAndVerify(self, flag_value, expected_output_re, other_flag):
+    """Runs gtest_list_tests_unittest_ and verifies that it prints
+    the correct tests.
+
+    Args:
+      flag_value:         value of the --gtest_list_tests flag;
+                          None if the flag should not be present.
+      expected_output_re: regular expression that matches the expected
+                          output after running command;
+      other_flag:         a different flag to be passed to command
+                          along with gtest_list_tests;
+                          None if the flag should not be present.
+    """
+
+    if flag_value is None:
+      flag = ''
+      flag_expression = 'not set'
+    elif flag_value == '0':
+      flag = '--%s=0' % LIST_TESTS_FLAG
+      flag_expression = '0'
+    else:
+      flag = '--%s' % LIST_TESTS_FLAG
+      flag_expression = '1'
+
+    args = [flag]
+
+    if other_flag is not None:
+      args += [other_flag]
+
+    output = Run(args)
+
+    if expected_output_re:
+      self.assert_(
+          expected_output_re.match(output),
+          ('when %s is %s, the output of "%s" is "%s",\n'
+           'which does not match regex "%s"' %
+           (LIST_TESTS_FLAG, flag_expression, ' '.join(args), output,
+            expected_output_re.pattern)))
+    else:
+      self.assert_(
+          not EXPECTED_OUTPUT_NO_FILTER_RE.match(output),
+          ('when %s is %s, the output of "%s" is "%s"'%
+           (LIST_TESTS_FLAG, flag_expression, ' '.join(args), output)))
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of the default mode."""
+
+    self.RunAndVerify(flag_value=None,
+                      expected_output_re=None,
+                      other_flag=None)
+
+  def testFlag(self):
+    """Tests using the --gtest_list_tests flag."""
+
+    self.RunAndVerify(flag_value='0',
+                      expected_output_re=None,
+                      other_flag=None)
+    self.RunAndVerify(flag_value='1',
+                      expected_output_re=EXPECTED_OUTPUT_NO_FILTER_RE,
+                      other_flag=None)
+
+  def testOverrideNonFilterFlags(self):
+    """Tests that --gtest_list_tests overrides the non-filter flags."""
+
+    self.RunAndVerify(flag_value='1',
+                      expected_output_re=EXPECTED_OUTPUT_NO_FILTER_RE,
+                      other_flag='--gtest_break_on_failure')
+
+  def testWithFilterFlags(self):
+    """Tests that --gtest_list_tests takes into account the
+    --gtest_filter flag."""
+
+    self.RunAndVerify(flag_value='1',
+                      expected_output_re=EXPECTED_OUTPUT_FILTER_FOO_RE,
+                      other_flag='--gtest_filter=Foo*')
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_list_tests_unittest_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_list_tests_unittest_.cc
new file mode 100644
index 0000000000..907c176ba9
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_list_tests_unittest_.cc
@@ -0,0 +1,157 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: phanna@google.com (Patrick Hanna)
+
+// Unit test for Google Test's --gtest_list_tests flag.
+//
+// A user can ask Google Test to list all tests that will run
+// so that when using a filter, a user will know what
+// tests to look for. The tests will not be run after listing.
+//
+// This program will be invoked from a Python unit test.
+// Don't run it directly.
+
+#include "gtest/gtest.h"
+
+// Several different test cases and tests that will be listed.
+TEST(Foo, Bar1) {
+}
+
+TEST(Foo, Bar2) {
+}
+
+TEST(Foo, DISABLED_Bar3) {
+}
+
+TEST(Abc, Xyz) {
+}
+
+TEST(Abc, Def) {
+}
+
+TEST(FooBar, Baz) {
+}
+
+class FooTest : public testing::Test {
+};
+
+TEST_F(FooTest, Test1) {
+}
+
+TEST_F(FooTest, DISABLED_Test2) {
+}
+
+TEST_F(FooTest, Test3) {
+}
+
+TEST(FooDeathTest, Test1) {
+}
+
+// A group of value-parameterized tests.
+
+class MyType {
+ public:
+  explicit MyType(const std::string& a_value) : value_(a_value) {}
+
+  const std::string& value() const { return value_; }
+
+ private:
+  std::string value_;
+};
+
+// Teaches Google Test how to print a MyType.
+void PrintTo(const MyType& x, std::ostream* os) {
+  *os << x.value();
+}
+
+class ValueParamTest : public testing::TestWithParam<MyType> {
+};
+
+TEST_P(ValueParamTest, TestA) {
+}
+
+TEST_P(ValueParamTest, TestB) {
+}
+
+INSTANTIATE_TEST_CASE_P(
+    MyInstantiation, ValueParamTest,
+    testing::Values(MyType("one line"),
+                    MyType("two\nlines"),
+                    MyType("a very\nloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong line")));  // NOLINT
+
+// A group of typed tests.
+
+// A deliberately long type name for testing the line-truncating
+// behavior when printing a type parameter.
+class VeryLoooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooogName {  // NOLINT
+};
+
+template <typename T>
+class TypedTest : public testing::Test {
+};
+
+template <typename T, int kSize>
+class MyArray {
+};
+
+typedef testing::Types<VeryLoooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooogName,  // NOLINT
+                       int*, MyArray<bool, 42> > MyTypes;
+
+TYPED_TEST_CASE(TypedTest, MyTypes);
+
+TYPED_TEST(TypedTest, TestA) {
+}
+
+TYPED_TEST(TypedTest, TestB) {
+}
+
+// A group of type-parameterized tests.
+
+template <typename T>
+class TypeParamTest : public testing::Test {
+};
+
+TYPED_TEST_CASE_P(TypeParamTest);
+
+TYPED_TEST_P(TypeParamTest, TestA) {
+}
+
+TYPED_TEST_P(TypeParamTest, TestB) {
+}
+
+REGISTER_TYPED_TEST_CASE_P(TypeParamTest, TestA, TestB);
+
+INSTANTIATE_TYPED_TEST_CASE_P(My, TypeParamTest, MyTypes);
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_main_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_main_unittest.cc
new file mode 100644
index 0000000000..ecd9bb876f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_main_unittest.cc
@@ -0,0 +1,45 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "gtest/gtest.h"
+
+// Tests that we don't have to define main() when we link to
+// gtest_main instead of gtest.
+
+namespace {
+
+TEST(GTestMainTest, ShouldSucceed) {
+}
+
+}  // namespace
+
+// We are using the main() function defined in src/gtest_main.cc, so
+// we don't define it here.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_no_test_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_no_test_unittest.cc
new file mode 100644
index 0000000000..292599af8d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_no_test_unittest.cc
@@ -0,0 +1,56 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Tests that a Google Test program that has no test defined can run
+// successfully.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv) {
+  testing::InitGoogleTest(&argc, argv);
+
+  // An ad-hoc assertion outside of all tests.
+  //
+  // This serves three purposes:
+  //
+  // 1. It verifies that an ad-hoc assertion can be executed even if
+  //    no test is defined.
+  // 2. It verifies that a failed ad-hoc assertion causes the test
+  //    program to fail.
+  // 3. We had a bug where the XML output won't be generated if an
+  //    assertion is executed before RUN_ALL_TESTS() is called, even
+  //    though --gtest_output=xml is specified.  This makes sure the
+  //    bug is fixed and doesn't regress.
+  EXPECT_EQ(1, 2);
+
+  // The above EXPECT_EQ() should cause RUN_ALL_TESTS() to return non-zero.
+  return RUN_ALL_TESTS() ? 0 : 1;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_output_test.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_output_test.py
new file mode 100755
index 0000000000..06dbee0980
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_output_test.py
@@ -0,0 +1,340 @@
+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Tests the text output of Google C++ Testing Framework.
+
+SYNOPSIS
+       gtest_output_test.py --build_dir=BUILD/DIR --gengolden
+         # where BUILD/DIR contains the built gtest_output_test_ file.
+       gtest_output_test.py --gengolden
+       gtest_output_test.py
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import difflib
+import os
+import re
+import sys
+import gtest_test_utils
+
+
+# The flag for generating the golden file
+GENGOLDEN_FLAG = '--gengolden'
+CATCH_EXCEPTIONS_ENV_VAR_NAME = 'GTEST_CATCH_EXCEPTIONS'
+
+IS_WINDOWS = os.name == 'nt'
+
+# TODO(vladl@google.com): remove the _lin suffix.
+GOLDEN_NAME = 'gtest_output_test_golden_lin.txt'
+
+PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_output_test_')
+
+# At least one command we exercise must not have the
+# 'internal_skip_environment_and_ad_hoc_tests' argument.
+COMMAND_LIST_TESTS = ({}, [PROGRAM_PATH, '--gtest_list_tests'])
+COMMAND_WITH_COLOR = ({}, [PROGRAM_PATH, '--gtest_color=yes'])
+COMMAND_WITH_TIME = ({}, [PROGRAM_PATH,
+                          '--gtest_print_time',
+                          'internal_skip_environment_and_ad_hoc_tests',
+                          '--gtest_filter=FatalFailureTest.*:LoggingTest.*'])
+COMMAND_WITH_DISABLED = (
+    {}, [PROGRAM_PATH,
+         '--gtest_also_run_disabled_tests',
+         'internal_skip_environment_and_ad_hoc_tests',
+         '--gtest_filter=*DISABLED_*'])
+COMMAND_WITH_SHARDING = (
+    {'GTEST_SHARD_INDEX': '1', 'GTEST_TOTAL_SHARDS': '2'},
+    [PROGRAM_PATH,
+     'internal_skip_environment_and_ad_hoc_tests',
+     '--gtest_filter=PassingTest.*'])
+
+GOLDEN_PATH = os.path.join(gtest_test_utils.GetSourceDir(), GOLDEN_NAME)
+
+
+def ToUnixLineEnding(s):
+  """Changes all Windows/Mac line endings in s to UNIX line endings."""
+
+  return s.replace('\r\n', '\n').replace('\r', '\n')
+
+
+def RemoveLocations(test_output):
+  """Removes all file location info from a Google Test program's output.
+
+  Args:
+       test_output:  the output of a Google Test program.
+
+  Returns:
+       output with all file location info (in the form of
+       'DIRECTORY/FILE_NAME:LINE_NUMBER: 'or
+       'DIRECTORY\\FILE_NAME(LINE_NUMBER): ') replaced by
+       'FILE_NAME:#: '.
+  """
+
+  return re.sub(r'.*[/\\](.+)(\:\d+|\(\d+\))\: ', r'\1:#: ', test_output)
+
+
+def RemoveStackTraceDetails(output):
+  """Removes all stack traces from a Google Test program's output."""
+
+  # *? means "find the shortest string that matches".
+  return re.sub(r'Stack trace:(.|\n)*?\n\n',
+                'Stack trace: (omitted)\n\n', output)
+
+
+def RemoveStackTraces(output):
+  """Removes all traces of stack traces from a Google Test program's output."""
+
+  # *? means "find the shortest string that matches".
+  return re.sub(r'Stack trace:(.|\n)*?\n\n', '', output)
+
+
+def RemoveTime(output):
+  """Removes all time information from a Google Test program's output."""
+
+  return re.sub(r'\(\d+ ms', '(? ms', output)
+
+
+def RemoveTypeInfoDetails(test_output):
+  """Removes compiler-specific type info from Google Test program's output.
+
+  Args:
+       test_output:  the output of a Google Test program.
+
+  Returns:
+       output with type information normalized to canonical form.
+  """
+
+  # some compilers output the name of type 'unsigned int' as 'unsigned'
+  return re.sub(r'unsigned int', 'unsigned', test_output)
+
+
+def NormalizeToCurrentPlatform(test_output):
+  """Normalizes platform specific output details for easier comparison."""
+
+  if IS_WINDOWS:
+    # Removes the color information that is not present on Windows.
+    test_output = re.sub('\x1b\\[(0;3\d)?m', '', test_output)
+    # Changes failure message headers into the Windows format.
+    test_output = re.sub(r': Failure\n', r': error: ', test_output)
+    # Changes file(line_number) to file:line_number.
+    test_output = re.sub(r'((\w|\.)+)\((\d+)\):', r'\1:\3:', test_output)
+
+  return test_output
+
+
+def RemoveTestCounts(output):
+  """Removes test counts from a Google Test program's output."""
+
+  output = re.sub(r'\d+ tests?, listed below',
+                  '? tests, listed below', output)
+  output = re.sub(r'\d+ FAILED TESTS',
+                  '? FAILED TESTS', output)
+  output = re.sub(r'\d+ tests? from \d+ test cases?',
+                  '? tests from ? test cases', output)
+  output = re.sub(r'\d+ tests? from ([a-zA-Z_])',
+                  r'? tests from \1', output)
+  return re.sub(r'\d+ tests?\.', '? tests.', output)
+
+
+def RemoveMatchingTests(test_output, pattern):
+  """Removes output of specified tests from a Google Test program's output.
+
+  This function strips not only the beginning and the end of a test but also
+  all output in between.
+
+  Args:
+    test_output:       A string containing the test output.
+    pattern:           A regex string that matches names of test cases or
+                       tests to remove.
+
+  Returns:
+    Contents of test_output with tests whose names match pattern removed.
+  """
+
+  test_output = re.sub(
+      r'.*\[ RUN      \] .*%s(.|\n)*?\[(  FAILED  |       OK )\] .*%s.*\n' % (
+          pattern, pattern),
+      '',
+      test_output)
+  return re.sub(r'.*%s.*\n' % pattern, '', test_output)
+
+
+def NormalizeOutput(output):
+  """Normalizes output (the output of gtest_output_test_.exe)."""
+
+  output = ToUnixLineEnding(output)
+  output = RemoveLocations(output)
+  output = RemoveStackTraceDetails(output)
+  output = RemoveTime(output)
+  return output
+
+
+def GetShellCommandOutput(env_cmd):
+  """Runs a command in a sub-process, and returns its output in a string.
+
+  Args:
+    env_cmd: The shell command. A 2-tuple where element 0 is a dict of extra
+             environment variables to set, and element 1 is a string with
+             the command and any flags.
+
+  Returns:
+    A string with the command's combined standard and diagnostic output.
+  """
+
+  # Spawns cmd in a sub-process, and gets its standard I/O file objects.
+  # Set and save the environment properly.
+  environ = os.environ.copy()
+  environ.update(env_cmd[0])
+  p = gtest_test_utils.Subprocess(env_cmd[1], env=environ)
+
+  return p.output
+
+
+def GetCommandOutput(env_cmd):
+  """Runs a command and returns its output with all file location
+  info stripped off.
+
+  Args:
+    env_cmd:  The shell command. A 2-tuple where element 0 is a dict of extra
+              environment variables to set, and element 1 is a string with
+              the command and any flags.
+  """
+
+  # Disables exception pop-ups on Windows.
+  environ, cmdline = env_cmd
+  environ = dict(environ)  # Ensures we are modifying a copy.
+  environ[CATCH_EXCEPTIONS_ENV_VAR_NAME] = '1'
+  return NormalizeOutput(GetShellCommandOutput((environ, cmdline)))
+
+
+def GetOutputOfAllCommands():
+  """Returns concatenated output from several representative commands."""
+
+  return (GetCommandOutput(COMMAND_WITH_COLOR) +
+          GetCommandOutput(COMMAND_WITH_TIME) +
+          GetCommandOutput(COMMAND_WITH_DISABLED) +
+          GetCommandOutput(COMMAND_WITH_SHARDING))
+
+
+test_list = GetShellCommandOutput(COMMAND_LIST_TESTS)
+SUPPORTS_DEATH_TESTS = 'DeathTest' in test_list
+SUPPORTS_TYPED_TESTS = 'TypedTest' in test_list
+SUPPORTS_THREADS = 'ExpectFailureWithThreadsTest' in test_list
+SUPPORTS_STACK_TRACES = False
+
+CAN_GENERATE_GOLDEN_FILE = (SUPPORTS_DEATH_TESTS and
+                            SUPPORTS_TYPED_TESTS and
+                            SUPPORTS_THREADS and
+                            not IS_WINDOWS)
+
+class GTestOutputTest(gtest_test_utils.TestCase):
+  def RemoveUnsupportedTests(self, test_output):
+    if not SUPPORTS_DEATH_TESTS:
+      test_output = RemoveMatchingTests(test_output, 'DeathTest')
+    if not SUPPORTS_TYPED_TESTS:
+      test_output = RemoveMatchingTests(test_output, 'TypedTest')
+      test_output = RemoveMatchingTests(test_output, 'TypedDeathTest')
+      test_output = RemoveMatchingTests(test_output, 'TypeParamDeathTest')
+    if not SUPPORTS_THREADS:
+      test_output = RemoveMatchingTests(test_output,
+                                        'ExpectFailureWithThreadsTest')
+      test_output = RemoveMatchingTests(test_output,
+                                        'ScopedFakeTestPartResultReporterTest')
+      test_output = RemoveMatchingTests(test_output,
+                                        'WorksConcurrently')
+    if not SUPPORTS_STACK_TRACES:
+      test_output = RemoveStackTraces(test_output)
+
+    return test_output
+
+  def testOutput(self):
+    output = GetOutputOfAllCommands()
+
+    golden_file = open(GOLDEN_PATH, 'r')
+    # A mis-configured source control system can cause \r appear in EOL
+    # sequences when we read the golden file irrespective of an operating
+    # system used. Therefore, we need to strip those \r's from newlines
+    # unconditionally.
+    golden = ToUnixLineEnding(golden_file.read())
+    golden_file.close()
+
+    # We want the test to pass regardless of certain features being
+    # supported or not.
+
+    # We still have to remove type name specifics in all cases.
+    normalized_actual = RemoveTypeInfoDetails(output)
+    normalized_golden = RemoveTypeInfoDetails(golden)
+
+    if CAN_GENERATE_GOLDEN_FILE:
+      self.assertEqual(normalized_golden, normalized_actual,
+                       '\n'.join(difflib.unified_diff(
+                           normalized_golden.split('\n'),
+                           normalized_actual.split('\n'),
+                           'golden', 'actual')))
+    else:
+      normalized_actual = NormalizeToCurrentPlatform(
+          RemoveTestCounts(normalized_actual))
+      normalized_golden = NormalizeToCurrentPlatform(
+          RemoveTestCounts(self.RemoveUnsupportedTests(normalized_golden)))
+
+      # This code is very handy when debugging golden file differences:
+      if os.getenv('DEBUG_GTEST_OUTPUT_TEST'):
+        open(os.path.join(
+            gtest_test_utils.GetSourceDir(),
+            '_gtest_output_test_normalized_actual.txt'), 'wb').write(
+                normalized_actual)
+        open(os.path.join(
+            gtest_test_utils.GetSourceDir(),
+            '_gtest_output_test_normalized_golden.txt'), 'wb').write(
+                normalized_golden)
+
+      self.assertEqual(normalized_golden, normalized_actual)
+
+
+if __name__ == '__main__':
+  if sys.argv[1:] == [GENGOLDEN_FLAG]:
+    if CAN_GENERATE_GOLDEN_FILE:
+      output = GetOutputOfAllCommands()
+      golden_file = open(GOLDEN_PATH, 'wb')
+      golden_file.write(output)
+      golden_file.close()
+    else:
+      message = (
+          """Unable to write a golden file when compiled in an environment
+that does not support all the required features (death tests, typed tests,
+and multiple threads).  Please generate the golden file using a binary built
+with those features enabled.""")
+
+      sys.stderr.write(message)
+      sys.exit(1)
+  else:
+    gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_output_test_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_output_test_.cc
new file mode 100644
index 0000000000..1070a9f26f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_output_test_.cc
@@ -0,0 +1,1062 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// The purpose of this file is to generate Google Test output under
+// various conditions.  The output will then be verified by
+// gtest_output_test.py to ensure that Google Test generates the
+// desired messages.  Therefore, most tests in this file are MEANT TO
+// FAIL.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "gtest/gtest-spi.h"
+#include "gtest/gtest.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+#include <stdlib.h>
+
+#if GTEST_IS_THREADSAFE
+using testing::ScopedFakeTestPartResultReporter;
+using testing::TestPartResultArray;
+
+using testing::internal::Notification;
+using testing::internal::ThreadWithParam;
+#endif
+
+namespace posix = ::testing::internal::posix;
+
+// Tests catching fatal failures.
+
+// A subroutine used by the following test.
+void TestEq1(int x) {
+  ASSERT_EQ(1, x);
+}
+
+// This function calls a test subroutine, catches the fatal failure it
+// generates, and then returns early.
+void TryTestSubroutine() {
+  // Calls a subrountine that yields a fatal failure.
+  TestEq1(2);
+
+  // Catches the fatal failure and aborts the test.
+  //
+  // The testing::Test:: prefix is necessary when calling
+  // HasFatalFailure() outside of a TEST, TEST_F, or test fixture.
+  if (testing::Test::HasFatalFailure()) return;
+
+  // If we get here, something is wrong.
+  FAIL() << "This should never be reached.";
+}
+
+TEST(PassingTest, PassingTest1) {
+}
+
+TEST(PassingTest, PassingTest2) {
+}
+
+// Tests that parameters of failing parameterized tests are printed in the
+// failing test summary.
+class FailingParamTest : public testing::TestWithParam<int> {};
+
+TEST_P(FailingParamTest, Fails) {
+  EXPECT_EQ(1, GetParam());
+}
+
+// This generates a test which will fail. Google Test is expected to print
+// its parameter when it outputs the list of all failed tests.
+INSTANTIATE_TEST_CASE_P(PrintingFailingParams,
+                        FailingParamTest,
+                        testing::Values(2));
+
+static const char kGoldenString[] = "\"Line\0 1\"\nLine 2";
+
+TEST(NonfatalFailureTest, EscapesStringOperands) {
+  std::string actual = "actual \"string\"";
+  EXPECT_EQ(kGoldenString, actual);
+
+  const char* golden = kGoldenString;
+  EXPECT_EQ(golden, actual);
+}
+
+TEST(NonfatalFailureTest, DiffForLongStrings) {
+  std::string golden_str(kGoldenString, sizeof(kGoldenString) - 1);
+  EXPECT_EQ(golden_str, "Line 2");
+}
+
+// Tests catching a fatal failure in a subroutine.
+TEST(FatalFailureTest, FatalFailureInSubroutine) {
+  printf("(expecting a failure that x should be 1)\n");
+
+  TryTestSubroutine();
+}
+
+// Tests catching a fatal failure in a nested subroutine.
+TEST(FatalFailureTest, FatalFailureInNestedSubroutine) {
+  printf("(expecting a failure that x should be 1)\n");
+
+  // Calls a subrountine that yields a fatal failure.
+  TryTestSubroutine();
+
+  // Catches the fatal failure and aborts the test.
+  //
+  // When calling HasFatalFailure() inside a TEST, TEST_F, or test
+  // fixture, the testing::Test:: prefix is not needed.
+  if (HasFatalFailure()) return;
+
+  // If we get here, something is wrong.
+  FAIL() << "This should never be reached.";
+}
+
+// Tests HasFatalFailure() after a failed EXPECT check.
+TEST(FatalFailureTest, NonfatalFailureInSubroutine) {
+  printf("(expecting a failure on false)\n");
+  EXPECT_TRUE(false);  // Generates a nonfatal failure
+  ASSERT_FALSE(HasFatalFailure());  // This should succeed.
+}
+
+// Tests interleaving user logging and Google Test assertions.
+TEST(LoggingTest, InterleavingLoggingAndAssertions) {
+  static const int a[4] = {
+    3, 9, 2, 6
+  };
+
+  printf("(expecting 2 failures on (3) >= (a[i]))\n");
+  for (int i = 0; i < static_cast<int>(sizeof(a)/sizeof(*a)); i++) {
+    printf("i == %d\n", i);
+    EXPECT_GE(3, a[i]);
+  }
+}
+
+// Tests the SCOPED_TRACE macro.
+
+// A helper function for testing SCOPED_TRACE.
+void SubWithoutTrace(int n) {
+  EXPECT_EQ(1, n);
+  ASSERT_EQ(2, n);
+}
+
+// Another helper function for testing SCOPED_TRACE.
+void SubWithTrace(int n) {
+  SCOPED_TRACE(testing::Message() << "n = " << n);
+
+  SubWithoutTrace(n);
+}
+
+// Tests that SCOPED_TRACE() obeys lexical scopes.
+TEST(SCOPED_TRACETest, ObeysScopes) {
+  printf("(expected to fail)\n");
+
+  // There should be no trace before SCOPED_TRACE() is invoked.
+  ADD_FAILURE() << "This failure is expected, and shouldn't have a trace.";
+
+  {
+    SCOPED_TRACE("Expected trace");
+    // After SCOPED_TRACE(), a failure in the current scope should contain
+    // the trace.
+    ADD_FAILURE() << "This failure is expected, and should have a trace.";
+  }
+
+  // Once the control leaves the scope of the SCOPED_TRACE(), there
+  // should be no trace again.
+  ADD_FAILURE() << "This failure is expected, and shouldn't have a trace.";
+}
+
+// Tests that SCOPED_TRACE works inside a loop.
+TEST(SCOPED_TRACETest, WorksInLoop) {
+  printf("(expected to fail)\n");
+
+  for (int i = 1; i <= 2; i++) {
+    SCOPED_TRACE(testing::Message() << "i = " << i);
+
+    SubWithoutTrace(i);
+  }
+}
+
+// Tests that SCOPED_TRACE works in a subroutine.
+TEST(SCOPED_TRACETest, WorksInSubroutine) {
+  printf("(expected to fail)\n");
+
+  SubWithTrace(1);
+  SubWithTrace(2);
+}
+
+// Tests that SCOPED_TRACE can be nested.
+TEST(SCOPED_TRACETest, CanBeNested) {
+  printf("(expected to fail)\n");
+
+  SCOPED_TRACE("");  // A trace without a message.
+
+  SubWithTrace(2);
+}
+
+// Tests that multiple SCOPED_TRACEs can be used in the same scope.
+TEST(SCOPED_TRACETest, CanBeRepeated) {
+  printf("(expected to fail)\n");
+
+  SCOPED_TRACE("A");
+  ADD_FAILURE()
+      << "This failure is expected, and should contain trace point A.";
+
+  SCOPED_TRACE("B");
+  ADD_FAILURE()
+      << "This failure is expected, and should contain trace point A and B.";
+
+  {
+    SCOPED_TRACE("C");
+    ADD_FAILURE() << "This failure is expected, and should "
+                  << "contain trace point A, B, and C.";
+  }
+
+  SCOPED_TRACE("D");
+  ADD_FAILURE() << "This failure is expected, and should "
+                << "contain trace point A, B, and D.";
+}
+
+#if GTEST_IS_THREADSAFE
+// Tests that SCOPED_TRACE()s can be used concurrently from multiple
+// threads.  Namely, an assertion should be affected by
+// SCOPED_TRACE()s in its own thread only.
+
+// Here's the sequence of actions that happen in the test:
+//
+//   Thread A (main)                | Thread B (spawned)
+//   ===============================|================================
+//   spawns thread B                |
+//   -------------------------------+--------------------------------
+//   waits for n1                   | SCOPED_TRACE("Trace B");
+//                                  | generates failure #1
+//                                  | notifies n1
+//   -------------------------------+--------------------------------
+//   SCOPED_TRACE("Trace A");       | waits for n2
+//   generates failure #2           |
+//   notifies n2                    |
+//   -------------------------------|--------------------------------
+//   waits for n3                   | generates failure #3
+//                                  | trace B dies
+//                                  | generates failure #4
+//                                  | notifies n3
+//   -------------------------------|--------------------------------
+//   generates failure #5           | finishes
+//   trace A dies                   |
+//   generates failure #6           |
+//   -------------------------------|--------------------------------
+//   waits for thread B to finish   |
+
+struct CheckPoints {
+  Notification n1;
+  Notification n2;
+  Notification n3;
+};
+
+static void ThreadWithScopedTrace(CheckPoints* check_points) {
+  {
+    SCOPED_TRACE("Trace B");
+    ADD_FAILURE()
+        << "Expected failure #1 (in thread B, only trace B alive).";
+    check_points->n1.Notify();
+    check_points->n2.WaitForNotification();
+
+    ADD_FAILURE()
+        << "Expected failure #3 (in thread B, trace A & B both alive).";
+  }  // Trace B dies here.
+  ADD_FAILURE()
+      << "Expected failure #4 (in thread B, only trace A alive).";
+  check_points->n3.Notify();
+}
+
+TEST(SCOPED_TRACETest, WorksConcurrently) {
+  printf("(expecting 6 failures)\n");
+
+  CheckPoints check_points;
+  ThreadWithParam<CheckPoints*> thread(&ThreadWithScopedTrace,
+                                       &check_points,
+                                       NULL);
+  check_points.n1.WaitForNotification();
+
+  {
+    SCOPED_TRACE("Trace A");
+    ADD_FAILURE()
+        << "Expected failure #2 (in thread A, trace A & B both alive).";
+    check_points.n2.Notify();
+    check_points.n3.WaitForNotification();
+
+    ADD_FAILURE()
+        << "Expected failure #5 (in thread A, only trace A alive).";
+  }  // Trace A dies here.
+  ADD_FAILURE()
+      << "Expected failure #6 (in thread A, no trace alive).";
+  thread.Join();
+}
+#endif  // GTEST_IS_THREADSAFE
+
+TEST(DisabledTestsWarningTest,
+     DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning) {
+  // This test body is intentionally empty.  Its sole purpose is for
+  // verifying that the --gtest_also_run_disabled_tests flag
+  // suppresses the "YOU HAVE 12 DISABLED TESTS" warning at the end of
+  // the test output.
+}
+
+// Tests using assertions outside of TEST and TEST_F.
+//
+// This function creates two failures intentionally.
+void AdHocTest() {
+  printf("The non-test part of the code is expected to have 2 failures.\n\n");
+  EXPECT_TRUE(false);
+  EXPECT_EQ(2, 3);
+}
+
+// Runs all TESTs, all TEST_Fs, and the ad hoc test.
+int RunAllTests() {
+  AdHocTest();
+  return RUN_ALL_TESTS();
+}
+
+// Tests non-fatal failures in the fixture constructor.
+class NonFatalFailureInFixtureConstructorTest : public testing::Test {
+ protected:
+  NonFatalFailureInFixtureConstructorTest() {
+    printf("(expecting 5 failures)\n");
+    ADD_FAILURE() << "Expected failure #1, in the test fixture c'tor.";
+  }
+
+  ~NonFatalFailureInFixtureConstructorTest() {
+    ADD_FAILURE() << "Expected failure #5, in the test fixture d'tor.";
+  }
+
+  virtual void SetUp() {
+    ADD_FAILURE() << "Expected failure #2, in SetUp().";
+  }
+
+  virtual void TearDown() {
+    ADD_FAILURE() << "Expected failure #4, in TearDown.";
+  }
+};
+
+TEST_F(NonFatalFailureInFixtureConstructorTest, FailureInConstructor) {
+  ADD_FAILURE() << "Expected failure #3, in the test body.";
+}
+
+// Tests fatal failures in the fixture constructor.
+class FatalFailureInFixtureConstructorTest : public testing::Test {
+ protected:
+  FatalFailureInFixtureConstructorTest() {
+    printf("(expecting 2 failures)\n");
+    Init();
+  }
+
+  ~FatalFailureInFixtureConstructorTest() {
+    ADD_FAILURE() << "Expected failure #2, in the test fixture d'tor.";
+  }
+
+  virtual void SetUp() {
+    ADD_FAILURE() << "UNEXPECTED failure in SetUp().  "
+                  << "We should never get here, as the test fixture c'tor "
+                  << "had a fatal failure.";
+  }
+
+  virtual void TearDown() {
+    ADD_FAILURE() << "UNEXPECTED failure in TearDown().  "
+                  << "We should never get here, as the test fixture c'tor "
+                  << "had a fatal failure.";
+  }
+
+ private:
+  void Init() {
+    FAIL() << "Expected failure #1, in the test fixture c'tor.";
+  }
+};
+
+TEST_F(FatalFailureInFixtureConstructorTest, FailureInConstructor) {
+  ADD_FAILURE() << "UNEXPECTED failure in the test body.  "
+                << "We should never get here, as the test fixture c'tor "
+                << "had a fatal failure.";
+}
+
+// Tests non-fatal failures in SetUp().
+class NonFatalFailureInSetUpTest : public testing::Test {
+ protected:
+  virtual ~NonFatalFailureInSetUpTest() {
+    Deinit();
+  }
+
+  virtual void SetUp() {
+    printf("(expecting 4 failures)\n");
+    ADD_FAILURE() << "Expected failure #1, in SetUp().";
+  }
+
+  virtual void TearDown() {
+    FAIL() << "Expected failure #3, in TearDown().";
+  }
+ private:
+  void Deinit() {
+    FAIL() << "Expected failure #4, in the test fixture d'tor.";
+  }
+};
+
+TEST_F(NonFatalFailureInSetUpTest, FailureInSetUp) {
+  FAIL() << "Expected failure #2, in the test function.";
+}
+
+// Tests fatal failures in SetUp().
+class FatalFailureInSetUpTest : public testing::Test {
+ protected:
+  virtual ~FatalFailureInSetUpTest() {
+    Deinit();
+  }
+
+  virtual void SetUp() {
+    printf("(expecting 3 failures)\n");
+    FAIL() << "Expected failure #1, in SetUp().";
+  }
+
+  virtual void TearDown() {
+    FAIL() << "Expected failure #2, in TearDown().";
+  }
+ private:
+  void Deinit() {
+    FAIL() << "Expected failure #3, in the test fixture d'tor.";
+  }
+};
+
+TEST_F(FatalFailureInSetUpTest, FailureInSetUp) {
+  FAIL() << "UNEXPECTED failure in the test function.  "
+         << "We should never get here, as SetUp() failed.";
+}
+
+TEST(AddFailureAtTest, MessageContainsSpecifiedFileAndLineNumber) {
+  ADD_FAILURE_AT("foo.cc", 42) << "Expected failure in foo.cc";
+}
+
+#if GTEST_IS_THREADSAFE
+
+// A unary function that may die.
+void DieIf(bool should_die) {
+  GTEST_CHECK_(!should_die) << " - death inside DieIf().";
+}
+
+// Tests running death tests in a multi-threaded context.
+
+// Used for coordination between the main and the spawn thread.
+struct SpawnThreadNotifications {
+  SpawnThreadNotifications() {}
+
+  Notification spawn_thread_started;
+  Notification spawn_thread_ok_to_terminate;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(SpawnThreadNotifications);
+};
+
+// The function to be executed in the thread spawn by the
+// MultipleThreads test (below).
+static void ThreadRoutine(SpawnThreadNotifications* notifications) {
+  // Signals the main thread that this thread has started.
+  notifications->spawn_thread_started.Notify();
+
+  // Waits for permission to finish from the main thread.
+  notifications->spawn_thread_ok_to_terminate.WaitForNotification();
+}
+
+// This is a death-test test, but it's not named with a DeathTest
+// suffix.  It starts threads which might interfere with later
+// death tests, so it must run after all other death tests.
+class DeathTestAndMultiThreadsTest : public testing::Test {
+ protected:
+  // Starts a thread and waits for it to begin.
+  virtual void SetUp() {
+    thread_.reset(new ThreadWithParam<SpawnThreadNotifications*>(
+        &ThreadRoutine, &notifications_, NULL));
+    notifications_.spawn_thread_started.WaitForNotification();
+  }
+  // Tells the thread to finish, and reaps it.
+  // Depending on the version of the thread library in use,
+  // a manager thread might still be left running that will interfere
+  // with later death tests.  This is unfortunate, but this class
+  // cleans up after itself as best it can.
+  virtual void TearDown() {
+    notifications_.spawn_thread_ok_to_terminate.Notify();
+  }
+
+ private:
+  SpawnThreadNotifications notifications_;
+  testing::internal::scoped_ptr<ThreadWithParam<SpawnThreadNotifications*> >
+      thread_;
+};
+
+#endif  // GTEST_IS_THREADSAFE
+
+// The MixedUpTestCaseTest test case verifies that Google Test will fail a
+// test if it uses a different fixture class than what other tests in
+// the same test case use.  It deliberately contains two fixture
+// classes with the same name but defined in different namespaces.
+
+// The MixedUpTestCaseWithSameTestNameTest test case verifies that
+// when the user defines two tests with the same test case name AND
+// same test name (but in different namespaces), the second test will
+// fail.
+
+namespace foo {
+
+class MixedUpTestCaseTest : public testing::Test {
+};
+
+TEST_F(MixedUpTestCaseTest, FirstTestFromNamespaceFoo) {}
+TEST_F(MixedUpTestCaseTest, SecondTestFromNamespaceFoo) {}
+
+class MixedUpTestCaseWithSameTestNameTest : public testing::Test {
+};
+
+TEST_F(MixedUpTestCaseWithSameTestNameTest,
+       TheSecondTestWithThisNameShouldFail) {}
+
+}  // namespace foo
+
+namespace bar {
+
+class MixedUpTestCaseTest : public testing::Test {
+};
+
+// The following two tests are expected to fail.  We rely on the
+// golden file to check that Google Test generates the right error message.
+TEST_F(MixedUpTestCaseTest, ThisShouldFail) {}
+TEST_F(MixedUpTestCaseTest, ThisShouldFailToo) {}
+
+class MixedUpTestCaseWithSameTestNameTest : public testing::Test {
+};
+
+// Expected to fail.  We rely on the golden file to check that Google Test
+// generates the right error message.
+TEST_F(MixedUpTestCaseWithSameTestNameTest,
+       TheSecondTestWithThisNameShouldFail) {}
+
+}  // namespace bar
+
+// The following two test cases verify that Google Test catches the user
+// error of mixing TEST and TEST_F in the same test case.  The first
+// test case checks the scenario where TEST_F appears before TEST, and
+// the second one checks where TEST appears before TEST_F.
+
+class TEST_F_before_TEST_in_same_test_case : public testing::Test {
+};
+
+TEST_F(TEST_F_before_TEST_in_same_test_case, DefinedUsingTEST_F) {}
+
+// Expected to fail.  We rely on the golden file to check that Google Test
+// generates the right error message.
+TEST(TEST_F_before_TEST_in_same_test_case, DefinedUsingTESTAndShouldFail) {}
+
+class TEST_before_TEST_F_in_same_test_case : public testing::Test {
+};
+
+TEST(TEST_before_TEST_F_in_same_test_case, DefinedUsingTEST) {}
+
+// Expected to fail.  We rely on the golden file to check that Google Test
+// generates the right error message.
+TEST_F(TEST_before_TEST_F_in_same_test_case, DefinedUsingTEST_FAndShouldFail) {
+}
+
+// Used for testing EXPECT_NONFATAL_FAILURE() and EXPECT_FATAL_FAILURE().
+int global_integer = 0;
+
+// Tests that EXPECT_NONFATAL_FAILURE() can reference global variables.
+TEST(ExpectNonfatalFailureTest, CanReferenceGlobalVariables) {
+  global_integer = 0;
+  EXPECT_NONFATAL_FAILURE({
+    EXPECT_EQ(1, global_integer) << "Expected non-fatal failure.";
+  }, "Expected non-fatal failure.");
+}
+
+// Tests that EXPECT_NONFATAL_FAILURE() can reference local variables
+// (static or not).
+TEST(ExpectNonfatalFailureTest, CanReferenceLocalVariables) {
+  int m = 0;
+  static int n;
+  n = 1;
+  EXPECT_NONFATAL_FAILURE({
+    EXPECT_EQ(m, n) << "Expected non-fatal failure.";
+  }, "Expected non-fatal failure.");
+}
+
+// Tests that EXPECT_NONFATAL_FAILURE() succeeds when there is exactly
+// one non-fatal failure and no fatal failure.
+TEST(ExpectNonfatalFailureTest, SucceedsWhenThereIsOneNonfatalFailure) {
+  EXPECT_NONFATAL_FAILURE({
+    ADD_FAILURE() << "Expected non-fatal failure.";
+  }, "Expected non-fatal failure.");
+}
+
+// Tests that EXPECT_NONFATAL_FAILURE() fails when there is no
+// non-fatal failure.
+TEST(ExpectNonfatalFailureTest, FailsWhenThereIsNoNonfatalFailure) {
+  printf("(expecting a failure)\n");
+  EXPECT_NONFATAL_FAILURE({
+  }, "");
+}
+
+// Tests that EXPECT_NONFATAL_FAILURE() fails when there are two
+// non-fatal failures.
+TEST(ExpectNonfatalFailureTest, FailsWhenThereAreTwoNonfatalFailures) {
+  printf("(expecting a failure)\n");
+  EXPECT_NONFATAL_FAILURE({
+    ADD_FAILURE() << "Expected non-fatal failure 1.";
+    ADD_FAILURE() << "Expected non-fatal failure 2.";
+  }, "");
+}
+
+// Tests that EXPECT_NONFATAL_FAILURE() fails when there is one fatal
+// failure.
+TEST(ExpectNonfatalFailureTest, FailsWhenThereIsOneFatalFailure) {
+  printf("(expecting a failure)\n");
+  EXPECT_NONFATAL_FAILURE({
+    FAIL() << "Expected fatal failure.";
+  }, "");
+}
+
+// Tests that EXPECT_NONFATAL_FAILURE() fails when the statement being
+// tested returns.
+TEST(ExpectNonfatalFailureTest, FailsWhenStatementReturns) {
+  printf("(expecting a failure)\n");
+  EXPECT_NONFATAL_FAILURE({
+    return;
+  }, "");
+}
+
+#if GTEST_HAS_EXCEPTIONS
+
+// Tests that EXPECT_NONFATAL_FAILURE() fails when the statement being
+// tested throws.
+TEST(ExpectNonfatalFailureTest, FailsWhenStatementThrows) {
+  printf("(expecting a failure)\n");
+  try {
+    EXPECT_NONFATAL_FAILURE({
+      throw 0;
+    }, "");
+  } catch(int) {  // NOLINT
+  }
+}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// Tests that EXPECT_FATAL_FAILURE() can reference global variables.
+TEST(ExpectFatalFailureTest, CanReferenceGlobalVariables) {
+  global_integer = 0;
+  EXPECT_FATAL_FAILURE({
+    ASSERT_EQ(1, global_integer) << "Expected fatal failure.";
+  }, "Expected fatal failure.");
+}
+
+// Tests that EXPECT_FATAL_FAILURE() can reference local static
+// variables.
+TEST(ExpectFatalFailureTest, CanReferenceLocalStaticVariables) {
+  static int n;
+  n = 1;
+  EXPECT_FATAL_FAILURE({
+    ASSERT_EQ(0, n) << "Expected fatal failure.";
+  }, "Expected fatal failure.");
+}
+
+// Tests that EXPECT_FATAL_FAILURE() succeeds when there is exactly
+// one fatal failure and no non-fatal failure.
+TEST(ExpectFatalFailureTest, SucceedsWhenThereIsOneFatalFailure) {
+  EXPECT_FATAL_FAILURE({
+    FAIL() << "Expected fatal failure.";
+  }, "Expected fatal failure.");
+}
+
+// Tests that EXPECT_FATAL_FAILURE() fails when there is no fatal
+// failure.
+TEST(ExpectFatalFailureTest, FailsWhenThereIsNoFatalFailure) {
+  printf("(expecting a failure)\n");
+  EXPECT_FATAL_FAILURE({
+  }, "");
+}
+
+// A helper for generating a fatal failure.
+void FatalFailure() {
+  FAIL() << "Expected fatal failure.";
+}
+
+// Tests that EXPECT_FATAL_FAILURE() fails when there are two
+// fatal failures.
+TEST(ExpectFatalFailureTest, FailsWhenThereAreTwoFatalFailures) {
+  printf("(expecting a failure)\n");
+  EXPECT_FATAL_FAILURE({
+    FatalFailure();
+    FatalFailure();
+  }, "");
+}
+
+// Tests that EXPECT_FATAL_FAILURE() fails when there is one non-fatal
+// failure.
+TEST(ExpectFatalFailureTest, FailsWhenThereIsOneNonfatalFailure) {
+  printf("(expecting a failure)\n");
+  EXPECT_FATAL_FAILURE({
+    ADD_FAILURE() << "Expected non-fatal failure.";
+  }, "");
+}
+
+// Tests that EXPECT_FATAL_FAILURE() fails when the statement being
+// tested returns.
+TEST(ExpectFatalFailureTest, FailsWhenStatementReturns) {
+  printf("(expecting a failure)\n");
+  EXPECT_FATAL_FAILURE({
+    return;
+  }, "");
+}
+
+#if GTEST_HAS_EXCEPTIONS
+
+// Tests that EXPECT_FATAL_FAILURE() fails when the statement being
+// tested throws.
+TEST(ExpectFatalFailureTest, FailsWhenStatementThrows) {
+  printf("(expecting a failure)\n");
+  try {
+    EXPECT_FATAL_FAILURE({
+      throw 0;
+    }, "");
+  } catch(int) {  // NOLINT
+  }
+}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// This #ifdef block tests the output of value-parameterized tests.
+
+#if GTEST_HAS_PARAM_TEST
+
+std::string ParamNameFunc(const testing::TestParamInfo<std::string>& info) {
+  return info.param;
+}
+
+class ParamTest : public testing::TestWithParam<std::string> {
+};
+
+TEST_P(ParamTest, Success) {
+  EXPECT_EQ("a", GetParam());
+}
+
+TEST_P(ParamTest, Failure) {
+  EXPECT_EQ("b", GetParam()) << "Expected failure";
+}
+
+INSTANTIATE_TEST_CASE_P(PrintingStrings,
+                        ParamTest,
+                        testing::Values(std::string("a")),
+                        ParamNameFunc);
+
+#endif  // GTEST_HAS_PARAM_TEST
+
+// This #ifdef block tests the output of typed tests.
+#if GTEST_HAS_TYPED_TEST
+
+template <typename T>
+class TypedTest : public testing::Test {
+};
+
+TYPED_TEST_CASE(TypedTest, testing::Types<int>);
+
+TYPED_TEST(TypedTest, Success) {
+  EXPECT_EQ(0, TypeParam());
+}
+
+TYPED_TEST(TypedTest, Failure) {
+  EXPECT_EQ(1, TypeParam()) << "Expected failure";
+}
+
+#endif  // GTEST_HAS_TYPED_TEST
+
+// This #ifdef block tests the output of type-parameterized tests.
+#if GTEST_HAS_TYPED_TEST_P
+
+template <typename T>
+class TypedTestP : public testing::Test {
+};
+
+TYPED_TEST_CASE_P(TypedTestP);
+
+TYPED_TEST_P(TypedTestP, Success) {
+  EXPECT_EQ(0U, TypeParam());
+}
+
+TYPED_TEST_P(TypedTestP, Failure) {
+  EXPECT_EQ(1U, TypeParam()) << "Expected failure";
+}
+
+REGISTER_TYPED_TEST_CASE_P(TypedTestP, Success, Failure);
+
+typedef testing::Types<unsigned char, unsigned int> UnsignedTypes;
+INSTANTIATE_TYPED_TEST_CASE_P(Unsigned, TypedTestP, UnsignedTypes);
+
+#endif  // GTEST_HAS_TYPED_TEST_P
+
+#if GTEST_HAS_DEATH_TEST
+
+// We rely on the golden file to verify that tests whose test case
+// name ends with DeathTest are run first.
+
+TEST(ADeathTest, ShouldRunFirst) {
+}
+
+# if GTEST_HAS_TYPED_TEST
+
+// We rely on the golden file to verify that typed tests whose test
+// case name ends with DeathTest are run first.
+
+template <typename T>
+class ATypedDeathTest : public testing::Test {
+};
+
+typedef testing::Types<int, double> NumericTypes;
+TYPED_TEST_CASE(ATypedDeathTest, NumericTypes);
+
+TYPED_TEST(ATypedDeathTest, ShouldRunFirst) {
+}
+
+# endif  // GTEST_HAS_TYPED_TEST
+
+# if GTEST_HAS_TYPED_TEST_P
+
+
+// We rely on the golden file to verify that type-parameterized tests
+// whose test case name ends with DeathTest are run first.
+
+template <typename T>
+class ATypeParamDeathTest : public testing::Test {
+};
+
+TYPED_TEST_CASE_P(ATypeParamDeathTest);
+
+TYPED_TEST_P(ATypeParamDeathTest, ShouldRunFirst) {
+}
+
+REGISTER_TYPED_TEST_CASE_P(ATypeParamDeathTest, ShouldRunFirst);
+
+INSTANTIATE_TYPED_TEST_CASE_P(My, ATypeParamDeathTest, NumericTypes);
+
+# endif  // GTEST_HAS_TYPED_TEST_P
+
+#endif  // GTEST_HAS_DEATH_TEST
+
+// Tests various failure conditions of
+// EXPECT_{,NON}FATAL_FAILURE{,_ON_ALL_THREADS}.
+class ExpectFailureTest : public testing::Test {
+ public:  // Must be public and not protected due to a bug in g++ 3.4.2.
+  enum FailureMode {
+    FATAL_FAILURE,
+    NONFATAL_FAILURE
+  };
+  static void AddFailure(FailureMode failure) {
+    if (failure == FATAL_FAILURE) {
+      FAIL() << "Expected fatal failure.";
+    } else {
+      ADD_FAILURE() << "Expected non-fatal failure.";
+    }
+  }
+};
+
+TEST_F(ExpectFailureTest, ExpectFatalFailure) {
+  // Expected fatal failure, but succeeds.
+  printf("(expecting 1 failure)\n");
+  EXPECT_FATAL_FAILURE(SUCCEED(), "Expected fatal failure.");
+  // Expected fatal failure, but got a non-fatal failure.
+  printf("(expecting 1 failure)\n");
+  EXPECT_FATAL_FAILURE(AddFailure(NONFATAL_FAILURE), "Expected non-fatal "
+                       "failure.");
+  // Wrong message.
+  printf("(expecting 1 failure)\n");
+  EXPECT_FATAL_FAILURE(AddFailure(FATAL_FAILURE), "Some other fatal failure "
+                       "expected.");
+}
+
+TEST_F(ExpectFailureTest, ExpectNonFatalFailure) {
+  // Expected non-fatal failure, but succeeds.
+  printf("(expecting 1 failure)\n");
+  EXPECT_NONFATAL_FAILURE(SUCCEED(), "Expected non-fatal failure.");
+  // Expected non-fatal failure, but got a fatal failure.
+  printf("(expecting 1 failure)\n");
+  EXPECT_NONFATAL_FAILURE(AddFailure(FATAL_FAILURE), "Expected fatal failure.");
+  // Wrong message.
+  printf("(expecting 1 failure)\n");
+  EXPECT_NONFATAL_FAILURE(AddFailure(NONFATAL_FAILURE), "Some other non-fatal "
+                          "failure.");
+}
+
+#if GTEST_IS_THREADSAFE
+
+class ExpectFailureWithThreadsTest : public ExpectFailureTest {
+ protected:
+  static void AddFailureInOtherThread(FailureMode failure) {
+    ThreadWithParam<FailureMode> thread(&AddFailure, failure, NULL);
+    thread.Join();
+  }
+};
+
+TEST_F(ExpectFailureWithThreadsTest, ExpectFatalFailure) {
+  // We only intercept the current thread.
+  printf("(expecting 2 failures)\n");
+  EXPECT_FATAL_FAILURE(AddFailureInOtherThread(FATAL_FAILURE),
+                       "Expected fatal failure.");
+}
+
+TEST_F(ExpectFailureWithThreadsTest, ExpectNonFatalFailure) {
+  // We only intercept the current thread.
+  printf("(expecting 2 failures)\n");
+  EXPECT_NONFATAL_FAILURE(AddFailureInOtherThread(NONFATAL_FAILURE),
+                          "Expected non-fatal failure.");
+}
+
+typedef ExpectFailureWithThreadsTest ScopedFakeTestPartResultReporterTest;
+
+// Tests that the ScopedFakeTestPartResultReporter only catches failures from
+// the current thread if it is instantiated with INTERCEPT_ONLY_CURRENT_THREAD.
+TEST_F(ScopedFakeTestPartResultReporterTest, InterceptOnlyCurrentThread) {
+  printf("(expecting 2 failures)\n");
+  TestPartResultArray results;
+  {
+    ScopedFakeTestPartResultReporter reporter(
+        ScopedFakeTestPartResultReporter::INTERCEPT_ONLY_CURRENT_THREAD,
+        &results);
+    AddFailureInOtherThread(FATAL_FAILURE);
+    AddFailureInOtherThread(NONFATAL_FAILURE);
+  }
+  // The two failures should not have been intercepted.
+  EXPECT_EQ(0, results.size()) << "This shouldn't fail.";
+}
+
+#endif  // GTEST_IS_THREADSAFE
+
+TEST_F(ExpectFailureTest, ExpectFatalFailureOnAllThreads) {
+  // Expected fatal failure, but succeeds.
+  printf("(expecting 1 failure)\n");
+  EXPECT_FATAL_FAILURE_ON_ALL_THREADS(SUCCEED(), "Expected fatal failure.");
+  // Expected fatal failure, but got a non-fatal failure.
+  printf("(expecting 1 failure)\n");
+  EXPECT_FATAL_FAILURE_ON_ALL_THREADS(AddFailure(NONFATAL_FAILURE),
+                                      "Expected non-fatal failure.");
+  // Wrong message.
+  printf("(expecting 1 failure)\n");
+  EXPECT_FATAL_FAILURE_ON_ALL_THREADS(AddFailure(FATAL_FAILURE),
+                                      "Some other fatal failure expected.");
+}
+
+TEST_F(ExpectFailureTest, ExpectNonFatalFailureOnAllThreads) {
+  // Expected non-fatal failure, but succeeds.
+  printf("(expecting 1 failure)\n");
+  EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(SUCCEED(), "Expected non-fatal "
+                                         "failure.");
+  // Expected non-fatal failure, but got a fatal failure.
+  printf("(expecting 1 failure)\n");
+  EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(AddFailure(FATAL_FAILURE),
+                                         "Expected fatal failure.");
+  // Wrong message.
+  printf("(expecting 1 failure)\n");
+  EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(AddFailure(NONFATAL_FAILURE),
+                                         "Some other non-fatal failure.");
+}
+
+
+// Two test environments for testing testing::AddGlobalTestEnvironment().
+
+class FooEnvironment : public testing::Environment {
+ public:
+  virtual void SetUp() {
+    printf("%s", "FooEnvironment::SetUp() called.\n");
+  }
+
+  virtual void TearDown() {
+    printf("%s", "FooEnvironment::TearDown() called.\n");
+    FAIL() << "Expected fatal failure.";
+  }
+};
+
+class BarEnvironment : public testing::Environment {
+ public:
+  virtual void SetUp() {
+    printf("%s", "BarEnvironment::SetUp() called.\n");
+  }
+
+  virtual void TearDown() {
+    printf("%s", "BarEnvironment::TearDown() called.\n");
+    ADD_FAILURE() << "Expected non-fatal failure.";
+  }
+};
+
+// The main function.
+//
+// The idea is to use Google Test to run all the tests we have defined (some
+// of them are intended to fail), and then compare the test results
+// with the "golden" file.
+int main(int argc, char **argv) {
+  testing::GTEST_FLAG(print_time) = false;
+
+  // We just run the tests, knowing some of them are intended to fail.
+  // We will use a separate Python script to compare the output of
+  // this program with the golden file.
+
+  // It's hard to test InitGoogleTest() directly, as it has many
+  // global side effects.  The following line serves as a sanity test
+  // for it.
+  testing::InitGoogleTest(&argc, argv);
+  bool internal_skip_environment_and_ad_hoc_tests =
+      std::count(argv, argv + argc,
+                 std::string("internal_skip_environment_and_ad_hoc_tests")) > 0;
+
+#if GTEST_HAS_DEATH_TEST
+  if (testing::internal::GTEST_FLAG(internal_run_death_test) != "") {
+    // Skip the usual output capturing if we're running as the child
+    // process of an threadsafe-style death test.
+# if GTEST_OS_WINDOWS
+    posix::FReopen("nul:", "w", stdout);
+# else
+    posix::FReopen("/dev/null", "w", stdout);
+# endif  // GTEST_OS_WINDOWS
+    return RUN_ALL_TESTS();
+  }
+#endif  // GTEST_HAS_DEATH_TEST
+
+  if (internal_skip_environment_and_ad_hoc_tests)
+    return RUN_ALL_TESTS();
+
+  // Registers two global test environments.
+  // The golden file verifies that they are set up in the order they
+  // are registered, and torn down in the reverse order.
+  testing::AddGlobalTestEnvironment(new FooEnvironment);
+  testing::AddGlobalTestEnvironment(new BarEnvironment);
+
+  return RunAllTests();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_output_test_golden_lin.txt b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_output_test_golden_lin.txt
new file mode 100644
index 0000000000..2223d560e2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_output_test_golden_lin.txt
@@ -0,0 +1,743 @@
+The non-test part of the code is expected to have 2 failures.
+
+gtest_output_test_.cc:#: Failure
+Value of: false
+  Actual: false
+Expected: true
+gtest_output_test_.cc:#: Failure
+      Expected: 2
+To be equal to: 3
+[==========] Running 66 tests from 29 test cases.
+[----------] Global test environment set-up.
+FooEnvironment::SetUp() called.
+BarEnvironment::SetUp() called.
+[----------] 1 test from ADeathTest
+[ RUN      ] ADeathTest.ShouldRunFirst
+[       OK ] ADeathTest.ShouldRunFirst
+[----------] 1 test from ATypedDeathTest/0, where TypeParam = int
+[ RUN      ] ATypedDeathTest/0.ShouldRunFirst
+[       OK ] ATypedDeathTest/0.ShouldRunFirst
+[----------] 1 test from ATypedDeathTest/1, where TypeParam = double
+[ RUN      ] ATypedDeathTest/1.ShouldRunFirst
+[       OK ] ATypedDeathTest/1.ShouldRunFirst
+[----------] 1 test from My/ATypeParamDeathTest/0, where TypeParam = int
+[ RUN      ] My/ATypeParamDeathTest/0.ShouldRunFirst
+[       OK ] My/ATypeParamDeathTest/0.ShouldRunFirst
+[----------] 1 test from My/ATypeParamDeathTest/1, where TypeParam = double
+[ RUN      ] My/ATypeParamDeathTest/1.ShouldRunFirst
+[       OK ] My/ATypeParamDeathTest/1.ShouldRunFirst
+[----------] 2 tests from PassingTest
+[ RUN      ] PassingTest.PassingTest1
+[       OK ] PassingTest.PassingTest1
+[ RUN      ] PassingTest.PassingTest2
+[       OK ] PassingTest.PassingTest2
+[----------] 2 tests from NonfatalFailureTest
+[ RUN      ] NonfatalFailureTest.EscapesStringOperands
+gtest_output_test_.cc:#: Failure
+      Expected: kGoldenString
+      Which is: "\"Line"
+To be equal to: actual
+      Which is: "actual \"string\""
+gtest_output_test_.cc:#: Failure
+      Expected: golden
+      Which is: "\"Line"
+To be equal to: actual
+      Which is: "actual \"string\""
+[  FAILED  ] NonfatalFailureTest.EscapesStringOperands
+[ RUN      ] NonfatalFailureTest.DiffForLongStrings
+gtest_output_test_.cc:#: Failure
+      Expected: golden_str
+      Which is: "\"Line\0 1\"\nLine 2"
+To be equal to: "Line 2"
+With diff:
+@@ -1,2 @@
+-\"Line\0 1\"
+ Line 2
+
+[  FAILED  ] NonfatalFailureTest.DiffForLongStrings
+[----------] 3 tests from FatalFailureTest
+[ RUN      ] FatalFailureTest.FatalFailureInSubroutine
+(expecting a failure that x should be 1)
+gtest_output_test_.cc:#: Failure
+      Expected: 1
+To be equal to: x
+      Which is: 2
+[  FAILED  ] FatalFailureTest.FatalFailureInSubroutine
+[ RUN      ] FatalFailureTest.FatalFailureInNestedSubroutine
+(expecting a failure that x should be 1)
+gtest_output_test_.cc:#: Failure
+      Expected: 1
+To be equal to: x
+      Which is: 2
+[  FAILED  ] FatalFailureTest.FatalFailureInNestedSubroutine
+[ RUN      ] FatalFailureTest.NonfatalFailureInSubroutine
+(expecting a failure on false)
+gtest_output_test_.cc:#: Failure
+Value of: false
+  Actual: false
+Expected: true
+[  FAILED  ] FatalFailureTest.NonfatalFailureInSubroutine
+[----------] 1 test from LoggingTest
+[ RUN      ] LoggingTest.InterleavingLoggingAndAssertions
+(expecting 2 failures on (3) >= (a[i]))
+i == 0
+i == 1
+gtest_output_test_.cc:#: Failure
+Expected: (3) >= (a[i]), actual: 3 vs 9
+i == 2
+i == 3
+gtest_output_test_.cc:#: Failure
+Expected: (3) >= (a[i]), actual: 3 vs 6
+[  FAILED  ] LoggingTest.InterleavingLoggingAndAssertions
+[----------] 6 tests from SCOPED_TRACETest
+[ RUN      ] SCOPED_TRACETest.ObeysScopes
+(expected to fail)
+gtest_output_test_.cc:#: Failure
+Failed
+This failure is expected, and shouldn't have a trace.
+gtest_output_test_.cc:#: Failure
+Failed
+This failure is expected, and should have a trace.
+Google Test trace:
+gtest_output_test_.cc:#: Expected trace
+gtest_output_test_.cc:#: Failure
+Failed
+This failure is expected, and shouldn't have a trace.
+[  FAILED  ] SCOPED_TRACETest.ObeysScopes
+[ RUN      ] SCOPED_TRACETest.WorksInLoop
+(expected to fail)
+gtest_output_test_.cc:#: Failure
+      Expected: 2
+To be equal to: n
+      Which is: 1
+Google Test trace:
+gtest_output_test_.cc:#: i = 1
+gtest_output_test_.cc:#: Failure
+      Expected: 1
+To be equal to: n
+      Which is: 2
+Google Test trace:
+gtest_output_test_.cc:#: i = 2
+[  FAILED  ] SCOPED_TRACETest.WorksInLoop
+[ RUN      ] SCOPED_TRACETest.WorksInSubroutine
+(expected to fail)
+gtest_output_test_.cc:#: Failure
+      Expected: 2
+To be equal to: n
+      Which is: 1
+Google Test trace:
+gtest_output_test_.cc:#: n = 1
+gtest_output_test_.cc:#: Failure
+      Expected: 1
+To be equal to: n
+      Which is: 2
+Google Test trace:
+gtest_output_test_.cc:#: n = 2
+[  FAILED  ] SCOPED_TRACETest.WorksInSubroutine
+[ RUN      ] SCOPED_TRACETest.CanBeNested
+(expected to fail)
+gtest_output_test_.cc:#: Failure
+      Expected: 1
+To be equal to: n
+      Which is: 2
+Google Test trace:
+gtest_output_test_.cc:#: n = 2
+gtest_output_test_.cc:#: 
+[  FAILED  ] SCOPED_TRACETest.CanBeNested
+[ RUN      ] SCOPED_TRACETest.CanBeRepeated
+(expected to fail)
+gtest_output_test_.cc:#: Failure
+Failed
+This failure is expected, and should contain trace point A.
+Google Test trace:
+gtest_output_test_.cc:#: A
+gtest_output_test_.cc:#: Failure
+Failed
+This failure is expected, and should contain trace point A and B.
+Google Test trace:
+gtest_output_test_.cc:#: B
+gtest_output_test_.cc:#: A
+gtest_output_test_.cc:#: Failure
+Failed
+This failure is expected, and should contain trace point A, B, and C.
+Google Test trace:
+gtest_output_test_.cc:#: C
+gtest_output_test_.cc:#: B
+gtest_output_test_.cc:#: A
+gtest_output_test_.cc:#: Failure
+Failed
+This failure is expected, and should contain trace point A, B, and D.
+Google Test trace:
+gtest_output_test_.cc:#: D
+gtest_output_test_.cc:#: B
+gtest_output_test_.cc:#: A
+[  FAILED  ] SCOPED_TRACETest.CanBeRepeated
+[ RUN      ] SCOPED_TRACETest.WorksConcurrently
+(expecting 6 failures)
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #1 (in thread B, only trace B alive).
+Google Test trace:
+gtest_output_test_.cc:#: Trace B
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #2 (in thread A, trace A & B both alive).
+Google Test trace:
+gtest_output_test_.cc:#: Trace A
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #3 (in thread B, trace A & B both alive).
+Google Test trace:
+gtest_output_test_.cc:#: Trace B
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #4 (in thread B, only trace A alive).
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #5 (in thread A, only trace A alive).
+Google Test trace:
+gtest_output_test_.cc:#: Trace A
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #6 (in thread A, no trace alive).
+[  FAILED  ] SCOPED_TRACETest.WorksConcurrently
+[----------] 1 test from NonFatalFailureInFixtureConstructorTest
+[ RUN      ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor
+(expecting 5 failures)
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #1, in the test fixture c'tor.
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #2, in SetUp().
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #3, in the test body.
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #4, in TearDown.
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #5, in the test fixture d'tor.
+[  FAILED  ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor
+[----------] 1 test from FatalFailureInFixtureConstructorTest
+[ RUN      ] FatalFailureInFixtureConstructorTest.FailureInConstructor
+(expecting 2 failures)
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #1, in the test fixture c'tor.
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #2, in the test fixture d'tor.
+[  FAILED  ] FatalFailureInFixtureConstructorTest.FailureInConstructor
+[----------] 1 test from NonFatalFailureInSetUpTest
+[ RUN      ] NonFatalFailureInSetUpTest.FailureInSetUp
+(expecting 4 failures)
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #1, in SetUp().
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #2, in the test function.
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #3, in TearDown().
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #4, in the test fixture d'tor.
+[  FAILED  ] NonFatalFailureInSetUpTest.FailureInSetUp
+[----------] 1 test from FatalFailureInSetUpTest
+[ RUN      ] FatalFailureInSetUpTest.FailureInSetUp
+(expecting 3 failures)
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #1, in SetUp().
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #2, in TearDown().
+gtest_output_test_.cc:#: Failure
+Failed
+Expected failure #3, in the test fixture d'tor.
+[  FAILED  ] FatalFailureInSetUpTest.FailureInSetUp
+[----------] 1 test from AddFailureAtTest
+[ RUN      ] AddFailureAtTest.MessageContainsSpecifiedFileAndLineNumber
+foo.cc:42: Failure
+Failed
+Expected failure in foo.cc
+[  FAILED  ] AddFailureAtTest.MessageContainsSpecifiedFileAndLineNumber
+[----------] 4 tests from MixedUpTestCaseTest
+[ RUN      ] MixedUpTestCaseTest.FirstTestFromNamespaceFoo
+[       OK ] MixedUpTestCaseTest.FirstTestFromNamespaceFoo
+[ RUN      ] MixedUpTestCaseTest.SecondTestFromNamespaceFoo
+[       OK ] MixedUpTestCaseTest.SecondTestFromNamespaceFoo
+[ RUN      ] MixedUpTestCaseTest.ThisShouldFail
+gtest.cc:#: Failure
+Failed
+All tests in the same test case must use the same test fixture
+class.  However, in test case MixedUpTestCaseTest,
+you defined test FirstTestFromNamespaceFoo and test ThisShouldFail
+using two different test fixture classes.  This can happen if
+the two classes are from different namespaces or translation
+units and have the same name.  You should probably rename one
+of the classes to put the tests into different test cases.
+[  FAILED  ] MixedUpTestCaseTest.ThisShouldFail
+[ RUN      ] MixedUpTestCaseTest.ThisShouldFailToo
+gtest.cc:#: Failure
+Failed
+All tests in the same test case must use the same test fixture
+class.  However, in test case MixedUpTestCaseTest,
+you defined test FirstTestFromNamespaceFoo and test ThisShouldFailToo
+using two different test fixture classes.  This can happen if
+the two classes are from different namespaces or translation
+units and have the same name.  You should probably rename one
+of the classes to put the tests into different test cases.
+[  FAILED  ] MixedUpTestCaseTest.ThisShouldFailToo
+[----------] 2 tests from MixedUpTestCaseWithSameTestNameTest
+[ RUN      ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
+[       OK ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
+[ RUN      ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
+gtest.cc:#: Failure
+Failed
+All tests in the same test case must use the same test fixture
+class.  However, in test case MixedUpTestCaseWithSameTestNameTest,
+you defined test TheSecondTestWithThisNameShouldFail and test TheSecondTestWithThisNameShouldFail
+using two different test fixture classes.  This can happen if
+the two classes are from different namespaces or translation
+units and have the same name.  You should probably rename one
+of the classes to put the tests into different test cases.
+[  FAILED  ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
+[----------] 2 tests from TEST_F_before_TEST_in_same_test_case
+[ RUN      ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTEST_F
+[       OK ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTEST_F
+[ RUN      ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
+gtest.cc:#: Failure
+Failed
+All tests in the same test case must use the same test fixture
+class, so mixing TEST_F and TEST in the same test case is
+illegal.  In test case TEST_F_before_TEST_in_same_test_case,
+test DefinedUsingTEST_F is defined using TEST_F but
+test DefinedUsingTESTAndShouldFail is defined using TEST.  You probably
+want to change the TEST to TEST_F or move it to another test
+case.
+[  FAILED  ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
+[----------] 2 tests from TEST_before_TEST_F_in_same_test_case
+[ RUN      ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST
+[       OK ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST
+[ RUN      ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
+gtest.cc:#: Failure
+Failed
+All tests in the same test case must use the same test fixture
+class, so mixing TEST_F and TEST in the same test case is
+illegal.  In test case TEST_before_TEST_F_in_same_test_case,
+test DefinedUsingTEST_FAndShouldFail is defined using TEST_F but
+test DefinedUsingTEST is defined using TEST.  You probably
+want to change the TEST to TEST_F or move it to another test
+case.
+[  FAILED  ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
+[----------] 8 tests from ExpectNonfatalFailureTest
+[ RUN      ] ExpectNonfatalFailureTest.CanReferenceGlobalVariables
+[       OK ] ExpectNonfatalFailureTest.CanReferenceGlobalVariables
+[ RUN      ] ExpectNonfatalFailureTest.CanReferenceLocalVariables
+[       OK ] ExpectNonfatalFailureTest.CanReferenceLocalVariables
+[ RUN      ] ExpectNonfatalFailureTest.SucceedsWhenThereIsOneNonfatalFailure
+[       OK ] ExpectNonfatalFailureTest.SucceedsWhenThereIsOneNonfatalFailure
+[ RUN      ] ExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
+(expecting a failure)
+gtest.cc:#: Failure
+Expected: 1 non-fatal failure
+  Actual: 0 failures
+[  FAILED  ] ExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
+[ RUN      ] ExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
+(expecting a failure)
+gtest.cc:#: Failure
+Expected: 1 non-fatal failure
+  Actual: 2 failures
+gtest_output_test_.cc:#: Non-fatal failure:
+Failed
+Expected non-fatal failure 1.
+
+gtest_output_test_.cc:#: Non-fatal failure:
+Failed
+Expected non-fatal failure 2.
+
+[  FAILED  ] ExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
+[ RUN      ] ExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
+(expecting a failure)
+gtest.cc:#: Failure
+Expected: 1 non-fatal failure
+  Actual:
+gtest_output_test_.cc:#: Fatal failure:
+Failed
+Expected fatal failure.
+
+[  FAILED  ] ExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
+[ RUN      ] ExpectNonfatalFailureTest.FailsWhenStatementReturns
+(expecting a failure)
+gtest.cc:#: Failure
+Expected: 1 non-fatal failure
+  Actual: 0 failures
+[  FAILED  ] ExpectNonfatalFailureTest.FailsWhenStatementReturns
+[ RUN      ] ExpectNonfatalFailureTest.FailsWhenStatementThrows
+(expecting a failure)
+gtest.cc:#: Failure
+Expected: 1 non-fatal failure
+  Actual: 0 failures
+[  FAILED  ] ExpectNonfatalFailureTest.FailsWhenStatementThrows
+[----------] 8 tests from ExpectFatalFailureTest
+[ RUN      ] ExpectFatalFailureTest.CanReferenceGlobalVariables
+[       OK ] ExpectFatalFailureTest.CanReferenceGlobalVariables
+[ RUN      ] ExpectFatalFailureTest.CanReferenceLocalStaticVariables
+[       OK ] ExpectFatalFailureTest.CanReferenceLocalStaticVariables
+[ RUN      ] ExpectFatalFailureTest.SucceedsWhenThereIsOneFatalFailure
+[       OK ] ExpectFatalFailureTest.SucceedsWhenThereIsOneFatalFailure
+[ RUN      ] ExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
+(expecting a failure)
+gtest.cc:#: Failure
+Expected: 1 fatal failure
+  Actual: 0 failures
+[  FAILED  ] ExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
+[ RUN      ] ExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
+(expecting a failure)
+gtest.cc:#: Failure
+Expected: 1 fatal failure
+  Actual: 2 failures
+gtest_output_test_.cc:#: Fatal failure:
+Failed
+Expected fatal failure.
+
+gtest_output_test_.cc:#: Fatal failure:
+Failed
+Expected fatal failure.
+
+[  FAILED  ] ExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
+[ RUN      ] ExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
+(expecting a failure)
+gtest.cc:#: Failure
+Expected: 1 fatal failure
+  Actual:
+gtest_output_test_.cc:#: Non-fatal failure:
+Failed
+Expected non-fatal failure.
+
+[  FAILED  ] ExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
+[ RUN      ] ExpectFatalFailureTest.FailsWhenStatementReturns
+(expecting a failure)
+gtest.cc:#: Failure
+Expected: 1 fatal failure
+  Actual: 0 failures
+[  FAILED  ] ExpectFatalFailureTest.FailsWhenStatementReturns
+[ RUN      ] ExpectFatalFailureTest.FailsWhenStatementThrows
+(expecting a failure)
+gtest.cc:#: Failure
+Expected: 1 fatal failure
+  Actual: 0 failures
+[  FAILED  ] ExpectFatalFailureTest.FailsWhenStatementThrows
+[----------] 2 tests from TypedTest/0, where TypeParam = int
+[ RUN      ] TypedTest/0.Success
+[       OK ] TypedTest/0.Success
+[ RUN      ] TypedTest/0.Failure
+gtest_output_test_.cc:#: Failure
+      Expected: 1
+To be equal to: TypeParam()
+      Which is: 0
+Expected failure
+[  FAILED  ] TypedTest/0.Failure, where TypeParam = int
+[----------] 2 tests from Unsigned/TypedTestP/0, where TypeParam = unsigned char
+[ RUN      ] Unsigned/TypedTestP/0.Success
+[       OK ] Unsigned/TypedTestP/0.Success
+[ RUN      ] Unsigned/TypedTestP/0.Failure
+gtest_output_test_.cc:#: Failure
+      Expected: 1U
+      Which is: 1
+To be equal to: TypeParam()
+      Which is: '\0'
+Expected failure
+[  FAILED  ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char
+[----------] 2 tests from Unsigned/TypedTestP/1, where TypeParam = unsigned int
+[ RUN      ] Unsigned/TypedTestP/1.Success
+[       OK ] Unsigned/TypedTestP/1.Success
+[ RUN      ] Unsigned/TypedTestP/1.Failure
+gtest_output_test_.cc:#: Failure
+      Expected: 1U
+      Which is: 1
+To be equal to: TypeParam()
+      Which is: 0
+Expected failure
+[  FAILED  ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int
+[----------] 4 tests from ExpectFailureTest
+[ RUN      ] ExpectFailureTest.ExpectFatalFailure
+(expecting 1 failure)
+gtest.cc:#: Failure
+Expected: 1 fatal failure
+  Actual:
+gtest_output_test_.cc:#: Success:
+Succeeded
+
+(expecting 1 failure)
+gtest.cc:#: Failure
+Expected: 1 fatal failure
+  Actual:
+gtest_output_test_.cc:#: Non-fatal failure:
+Failed
+Expected non-fatal failure.
+
+(expecting 1 failure)
+gtest.cc:#: Failure
+Expected: 1 fatal failure containing "Some other fatal failure expected."
+  Actual:
+gtest_output_test_.cc:#: Fatal failure:
+Failed
+Expected fatal failure.
+
+[  FAILED  ] ExpectFailureTest.ExpectFatalFailure
+[ RUN      ] ExpectFailureTest.ExpectNonFatalFailure
+(expecting 1 failure)
+gtest.cc:#: Failure
+Expected: 1 non-fatal failure
+  Actual:
+gtest_output_test_.cc:#: Success:
+Succeeded
+
+(expecting 1 failure)
+gtest.cc:#: Failure
+Expected: 1 non-fatal failure
+  Actual:
+gtest_output_test_.cc:#: Fatal failure:
+Failed
+Expected fatal failure.
+
+(expecting 1 failure)
+gtest.cc:#: Failure
+Expected: 1 non-fatal failure containing "Some other non-fatal failure."
+  Actual:
+gtest_output_test_.cc:#: Non-fatal failure:
+Failed
+Expected non-fatal failure.
+
+[  FAILED  ] ExpectFailureTest.ExpectNonFatalFailure
+[ RUN      ] ExpectFailureTest.ExpectFatalFailureOnAllThreads
+(expecting 1 failure)
+gtest.cc:#: Failure
+Expected: 1 fatal failure
+  Actual:
+gtest_output_test_.cc:#: Success:
+Succeeded
+
+(expecting 1 failure)
+gtest.cc:#: Failure
+Expected: 1 fatal failure
+  Actual:
+gtest_output_test_.cc:#: Non-fatal failure:
+Failed
+Expected non-fatal failure.
+
+(expecting 1 failure)
+gtest.cc:#: Failure
+Expected: 1 fatal failure containing "Some other fatal failure expected."
+  Actual:
+gtest_output_test_.cc:#: Fatal failure:
+Failed
+Expected fatal failure.
+
+[  FAILED  ] ExpectFailureTest.ExpectFatalFailureOnAllThreads
+[ RUN      ] ExpectFailureTest.ExpectNonFatalFailureOnAllThreads
+(expecting 1 failure)
+gtest.cc:#: Failure
+Expected: 1 non-fatal failure
+  Actual:
+gtest_output_test_.cc:#: Success:
+Succeeded
+
+(expecting 1 failure)
+gtest.cc:#: Failure
+Expected: 1 non-fatal failure
+  Actual:
+gtest_output_test_.cc:#: Fatal failure:
+Failed
+Expected fatal failure.
+
+(expecting 1 failure)
+gtest.cc:#: Failure
+Expected: 1 non-fatal failure containing "Some other non-fatal failure."
+  Actual:
+gtest_output_test_.cc:#: Non-fatal failure:
+Failed
+Expected non-fatal failure.
+
+[  FAILED  ] ExpectFailureTest.ExpectNonFatalFailureOnAllThreads
+[----------] 2 tests from ExpectFailureWithThreadsTest
+[ RUN      ] ExpectFailureWithThreadsTest.ExpectFatalFailure
+(expecting 2 failures)
+gtest_output_test_.cc:#: Failure
+Failed
+Expected fatal failure.
+gtest.cc:#: Failure
+Expected: 1 fatal failure
+  Actual: 0 failures
+[  FAILED  ] ExpectFailureWithThreadsTest.ExpectFatalFailure
+[ RUN      ] ExpectFailureWithThreadsTest.ExpectNonFatalFailure
+(expecting 2 failures)
+gtest_output_test_.cc:#: Failure
+Failed
+Expected non-fatal failure.
+gtest.cc:#: Failure
+Expected: 1 non-fatal failure
+  Actual: 0 failures
+[  FAILED  ] ExpectFailureWithThreadsTest.ExpectNonFatalFailure
+[----------] 1 test from ScopedFakeTestPartResultReporterTest
+[ RUN      ] ScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
+(expecting 2 failures)
+gtest_output_test_.cc:#: Failure
+Failed
+Expected fatal failure.
+gtest_output_test_.cc:#: Failure
+Failed
+Expected non-fatal failure.
+[  FAILED  ] ScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
+[----------] 1 test from PrintingFailingParams/FailingParamTest
+[ RUN      ] PrintingFailingParams/FailingParamTest.Fails/0
+gtest_output_test_.cc:#: Failure
+      Expected: 1
+To be equal to: GetParam()
+      Which is: 2
+[  FAILED  ] PrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2
+[----------] 2 tests from PrintingStrings/ParamTest
+[ RUN      ] PrintingStrings/ParamTest.Success/a
+[       OK ] PrintingStrings/ParamTest.Success/a
+[ RUN      ] PrintingStrings/ParamTest.Failure/a
+gtest_output_test_.cc:#: Failure
+      Expected: "b"
+To be equal to: GetParam()
+      Which is: "a"
+Expected failure
+[  FAILED  ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a"
+[----------] Global test environment tear-down
+BarEnvironment::TearDown() called.
+gtest_output_test_.cc:#: Failure
+Failed
+Expected non-fatal failure.
+FooEnvironment::TearDown() called.
+gtest_output_test_.cc:#: Failure
+Failed
+Expected fatal failure.
+[==========] 66 tests from 29 test cases ran.
+[  PASSED  ] 22 tests.
+[  FAILED  ] 44 tests, listed below:
+[  FAILED  ] NonfatalFailureTest.EscapesStringOperands
+[  FAILED  ] NonfatalFailureTest.DiffForLongStrings
+[  FAILED  ] FatalFailureTest.FatalFailureInSubroutine
+[  FAILED  ] FatalFailureTest.FatalFailureInNestedSubroutine
+[  FAILED  ] FatalFailureTest.NonfatalFailureInSubroutine
+[  FAILED  ] LoggingTest.InterleavingLoggingAndAssertions
+[  FAILED  ] SCOPED_TRACETest.ObeysScopes
+[  FAILED  ] SCOPED_TRACETest.WorksInLoop
+[  FAILED  ] SCOPED_TRACETest.WorksInSubroutine
+[  FAILED  ] SCOPED_TRACETest.CanBeNested
+[  FAILED  ] SCOPED_TRACETest.CanBeRepeated
+[  FAILED  ] SCOPED_TRACETest.WorksConcurrently
+[  FAILED  ] NonFatalFailureInFixtureConstructorTest.FailureInConstructor
+[  FAILED  ] FatalFailureInFixtureConstructorTest.FailureInConstructor
+[  FAILED  ] NonFatalFailureInSetUpTest.FailureInSetUp
+[  FAILED  ] FatalFailureInSetUpTest.FailureInSetUp
+[  FAILED  ] AddFailureAtTest.MessageContainsSpecifiedFileAndLineNumber
+[  FAILED  ] MixedUpTestCaseTest.ThisShouldFail
+[  FAILED  ] MixedUpTestCaseTest.ThisShouldFailToo
+[  FAILED  ] MixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
+[  FAILED  ] TEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
+[  FAILED  ] TEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
+[  FAILED  ] ExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
+[  FAILED  ] ExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
+[  FAILED  ] ExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
+[  FAILED  ] ExpectNonfatalFailureTest.FailsWhenStatementReturns
+[  FAILED  ] ExpectNonfatalFailureTest.FailsWhenStatementThrows
+[  FAILED  ] ExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
+[  FAILED  ] ExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
+[  FAILED  ] ExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
+[  FAILED  ] ExpectFatalFailureTest.FailsWhenStatementReturns
+[  FAILED  ] ExpectFatalFailureTest.FailsWhenStatementThrows
+[  FAILED  ] TypedTest/0.Failure, where TypeParam = int
+[  FAILED  ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char
+[  FAILED  ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int
+[  FAILED  ] ExpectFailureTest.ExpectFatalFailure
+[  FAILED  ] ExpectFailureTest.ExpectNonFatalFailure
+[  FAILED  ] ExpectFailureTest.ExpectFatalFailureOnAllThreads
+[  FAILED  ] ExpectFailureTest.ExpectNonFatalFailureOnAllThreads
+[  FAILED  ] ExpectFailureWithThreadsTest.ExpectFatalFailure
+[  FAILED  ] ExpectFailureWithThreadsTest.ExpectNonFatalFailure
+[  FAILED  ] ScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
+[  FAILED  ] PrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2
+[  FAILED  ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a"
+
+44 FAILED TESTS
+  YOU HAVE 1 DISABLED TEST
+
+Note: Google Test filter = FatalFailureTest.*:LoggingTest.*
+[==========] Running 4 tests from 2 test cases.
+[----------] Global test environment set-up.
+[----------] 3 tests from FatalFailureTest
+[ RUN      ] FatalFailureTest.FatalFailureInSubroutine
+(expecting a failure that x should be 1)
+gtest_output_test_.cc:#: Failure
+      Expected: 1
+To be equal to: x
+      Which is: 2
+[  FAILED  ] FatalFailureTest.FatalFailureInSubroutine (? ms)
+[ RUN      ] FatalFailureTest.FatalFailureInNestedSubroutine
+(expecting a failure that x should be 1)
+gtest_output_test_.cc:#: Failure
+      Expected: 1
+To be equal to: x
+      Which is: 2
+[  FAILED  ] FatalFailureTest.FatalFailureInNestedSubroutine (? ms)
+[ RUN      ] FatalFailureTest.NonfatalFailureInSubroutine
+(expecting a failure on false)
+gtest_output_test_.cc:#: Failure
+Value of: false
+  Actual: false
+Expected: true
+[  FAILED  ] FatalFailureTest.NonfatalFailureInSubroutine (? ms)
+[----------] 3 tests from FatalFailureTest (? ms total)
+
+[----------] 1 test from LoggingTest
+[ RUN      ] LoggingTest.InterleavingLoggingAndAssertions
+(expecting 2 failures on (3) >= (a[i]))
+i == 0
+i == 1
+gtest_output_test_.cc:#: Failure
+Expected: (3) >= (a[i]), actual: 3 vs 9
+i == 2
+i == 3
+gtest_output_test_.cc:#: Failure
+Expected: (3) >= (a[i]), actual: 3 vs 6
+[  FAILED  ] LoggingTest.InterleavingLoggingAndAssertions (? ms)
+[----------] 1 test from LoggingTest (? ms total)
+
+[----------] Global test environment tear-down
+[==========] 4 tests from 2 test cases ran. (? ms total)
+[  PASSED  ] 0 tests.
+[  FAILED  ] 4 tests, listed below:
+[  FAILED  ] FatalFailureTest.FatalFailureInSubroutine
+[  FAILED  ] FatalFailureTest.FatalFailureInNestedSubroutine
+[  FAILED  ] FatalFailureTest.NonfatalFailureInSubroutine
+[  FAILED  ] LoggingTest.InterleavingLoggingAndAssertions
+
+ 4 FAILED TESTS
+Note: Google Test filter = *DISABLED_*
+[==========] Running 1 test from 1 test case.
+[----------] Global test environment set-up.
+[----------] 1 test from DisabledTestsWarningTest
+[ RUN      ] DisabledTestsWarningTest.DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning
+[       OK ] DisabledTestsWarningTest.DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning
+[----------] Global test environment tear-down
+[==========] 1 test from 1 test case ran.
+[  PASSED  ] 1 test.
+Note: Google Test filter = PassingTest.*
+Note: This is test shard 2 of 2.
+[==========] Running 1 test from 1 test case.
+[----------] Global test environment set-up.
+[----------] 1 test from PassingTest
+[ RUN      ] PassingTest.PassingTest2
+[       OK ] PassingTest.PassingTest2
+[----------] Global test environment tear-down
+[==========] 1 test from 1 test case ran.
+[  PASSED  ] 1 test.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_pred_impl_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_pred_impl_unittest.cc
new file mode 100644
index 0000000000..a84eff860a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_pred_impl_unittest.cc
@@ -0,0 +1,2427 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// This file is AUTOMATICALLY GENERATED on 10/31/2011 by command
+// 'gen_gtest_pred_impl.py 5'.  DO NOT EDIT BY HAND!
+
+// Regression test for gtest_pred_impl.h
+//
+// This file is generated by a script and quite long.  If you intend to
+// learn how Google Test works by reading its unit tests, read
+// gtest_unittest.cc instead.
+//
+// This is intended as a regression test for the Google Test predicate
+// assertions.  We compile it as part of the gtest_unittest target
+// only to keep the implementation tidy and compact, as it is quite
+// involved to set up the stage for testing Google Test using Google
+// Test itself.
+//
+// Currently, gtest_unittest takes ~11 seconds to run in the testing
+// daemon.  In the future, if it grows too large and needs much more
+// time to finish, we should consider separating this file into a
+// stand-alone regression test.
+
+#include <iostream>
+
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+
+// A user-defined data type.
+struct Bool {
+  explicit Bool(int val) : value(val != 0) {}
+
+  bool operator>(int n) const { return value > Bool(n).value; }
+
+  Bool operator+(const Bool& rhs) const { return Bool(value + rhs.value); }
+
+  bool operator==(const Bool& rhs) const { return value == rhs.value; }
+
+  bool value;
+};
+
+// Enables Bool to be used in assertions.
+std::ostream& operator<<(std::ostream& os, const Bool& x) {
+  return os << (x.value ? "true" : "false");
+}
+
+// Sample functions/functors for testing unary predicate assertions.
+
+// A unary predicate function.
+template <typename T1>
+bool PredFunction1(T1 v1) {
+  return v1 > 0;
+}
+
+// The following two functions are needed to circumvent a bug in
+// gcc 2.95.3, which sometimes has problem with the above template
+// function.
+bool PredFunction1Int(int v1) {
+  return v1 > 0;
+}
+bool PredFunction1Bool(Bool v1) {
+  return v1 > 0;
+}
+
+// A unary predicate functor.
+struct PredFunctor1 {
+  template <typename T1>
+  bool operator()(const T1& v1) {
+    return v1 > 0;
+  }
+};
+
+// A unary predicate-formatter function.
+template <typename T1>
+testing::AssertionResult PredFormatFunction1(const char* e1,
+                                             const T1& v1) {
+  if (PredFunction1(v1))
+    return testing::AssertionSuccess();
+
+  return testing::AssertionFailure()
+      << e1
+      << " is expected to be positive, but evaluates to "
+      << v1 << ".";
+}
+
+// A unary predicate-formatter functor.
+struct PredFormatFunctor1 {
+  template <typename T1>
+  testing::AssertionResult operator()(const char* e1,
+                                      const T1& v1) const {
+    return PredFormatFunction1(e1, v1);
+  }
+};
+
+// Tests for {EXPECT|ASSERT}_PRED_FORMAT1.
+
+class Predicate1Test : public testing::Test {
+ protected:
+  virtual void SetUp() {
+    expected_to_finish_ = true;
+    finished_ = false;
+    n1_ = 0;
+  }
+
+  virtual void TearDown() {
+    // Verifies that each of the predicate's arguments was evaluated
+    // exactly once.
+    EXPECT_EQ(1, n1_) <<
+        "The predicate assertion didn't evaluate argument 2 "
+        "exactly once.";
+
+    // Verifies that the control flow in the test function is expected.
+    if (expected_to_finish_ && !finished_) {
+      FAIL() << "The predicate assertion unexpactedly aborted the test.";
+    } else if (!expected_to_finish_ && finished_) {
+      FAIL() << "The failed predicate assertion didn't abort the test "
+                "as expected.";
+    }
+  }
+
+  // true iff the test function is expected to run to finish.
+  static bool expected_to_finish_;
+
+  // true iff the test function did run to finish.
+  static bool finished_;
+
+  static int n1_;
+};
+
+bool Predicate1Test::expected_to_finish_;
+bool Predicate1Test::finished_;
+int Predicate1Test::n1_;
+
+typedef Predicate1Test EXPECT_PRED_FORMAT1Test;
+typedef Predicate1Test ASSERT_PRED_FORMAT1Test;
+typedef Predicate1Test EXPECT_PRED1Test;
+typedef Predicate1Test ASSERT_PRED1Test;
+
+// Tests a successful EXPECT_PRED1 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED1Test, FunctionOnBuiltInTypeSuccess) {
+  EXPECT_PRED1(PredFunction1Int,
+               ++n1_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED1 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED1Test, FunctionOnUserTypeSuccess) {
+  EXPECT_PRED1(PredFunction1Bool,
+               Bool(++n1_));
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED1 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED1Test, FunctorOnBuiltInTypeSuccess) {
+  EXPECT_PRED1(PredFunctor1(),
+               ++n1_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED1 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED1Test, FunctorOnUserTypeSuccess) {
+  EXPECT_PRED1(PredFunctor1(),
+               Bool(++n1_));
+  finished_ = true;
+}
+
+// Tests a failed EXPECT_PRED1 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED1Test, FunctionOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED1(PredFunction1Int,
+                 n1_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED1 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED1Test, FunctionOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED1(PredFunction1Bool,
+                 Bool(n1_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED1 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED1Test, FunctorOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED1(PredFunctor1(),
+                 n1_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED1 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED1Test, FunctorOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED1(PredFunctor1(),
+                 Bool(n1_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful ASSERT_PRED1 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED1Test, FunctionOnBuiltInTypeSuccess) {
+  ASSERT_PRED1(PredFunction1Int,
+               ++n1_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED1 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED1Test, FunctionOnUserTypeSuccess) {
+  ASSERT_PRED1(PredFunction1Bool,
+               Bool(++n1_));
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED1 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED1Test, FunctorOnBuiltInTypeSuccess) {
+  ASSERT_PRED1(PredFunctor1(),
+               ++n1_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED1 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED1Test, FunctorOnUserTypeSuccess) {
+  ASSERT_PRED1(PredFunctor1(),
+               Bool(++n1_));
+  finished_ = true;
+}
+
+// Tests a failed ASSERT_PRED1 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED1Test, FunctionOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED1(PredFunction1Int,
+                 n1_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED1 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED1Test, FunctionOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED1(PredFunction1Bool,
+                 Bool(n1_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED1 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED1Test, FunctorOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED1(PredFunctor1(),
+                 n1_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED1 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED1Test, FunctorOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED1(PredFunctor1(),
+                 Bool(n1_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful EXPECT_PRED_FORMAT1 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT1Test, FunctionOnBuiltInTypeSuccess) {
+  EXPECT_PRED_FORMAT1(PredFormatFunction1,
+                      ++n1_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT1 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT1Test, FunctionOnUserTypeSuccess) {
+  EXPECT_PRED_FORMAT1(PredFormatFunction1,
+                      Bool(++n1_));
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT1 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT1Test, FunctorOnBuiltInTypeSuccess) {
+  EXPECT_PRED_FORMAT1(PredFormatFunctor1(),
+                      ++n1_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT1 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT1Test, FunctorOnUserTypeSuccess) {
+  EXPECT_PRED_FORMAT1(PredFormatFunctor1(),
+                      Bool(++n1_));
+  finished_ = true;
+}
+
+// Tests a failed EXPECT_PRED_FORMAT1 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT1Test, FunctionOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT1(PredFormatFunction1,
+                        n1_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT1 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT1Test, FunctionOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT1(PredFormatFunction1,
+                        Bool(n1_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT1 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT1Test, FunctorOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT1(PredFormatFunctor1(),
+                        n1_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT1 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT1Test, FunctorOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT1(PredFormatFunctor1(),
+                        Bool(n1_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful ASSERT_PRED_FORMAT1 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT1Test, FunctionOnBuiltInTypeSuccess) {
+  ASSERT_PRED_FORMAT1(PredFormatFunction1,
+                      ++n1_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT1 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT1Test, FunctionOnUserTypeSuccess) {
+  ASSERT_PRED_FORMAT1(PredFormatFunction1,
+                      Bool(++n1_));
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT1 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT1Test, FunctorOnBuiltInTypeSuccess) {
+  ASSERT_PRED_FORMAT1(PredFormatFunctor1(),
+                      ++n1_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT1 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT1Test, FunctorOnUserTypeSuccess) {
+  ASSERT_PRED_FORMAT1(PredFormatFunctor1(),
+                      Bool(++n1_));
+  finished_ = true;
+}
+
+// Tests a failed ASSERT_PRED_FORMAT1 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT1Test, FunctionOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT1(PredFormatFunction1,
+                        n1_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT1 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT1Test, FunctionOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT1(PredFormatFunction1,
+                        Bool(n1_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT1 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT1Test, FunctorOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT1(PredFormatFunctor1(),
+                        n1_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT1 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT1Test, FunctorOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT1(PredFormatFunctor1(),
+                        Bool(n1_++));
+    finished_ = true;
+  }, "");
+}
+// Sample functions/functors for testing binary predicate assertions.
+
+// A binary predicate function.
+template <typename T1, typename T2>
+bool PredFunction2(T1 v1, T2 v2) {
+  return v1 + v2 > 0;
+}
+
+// The following two functions are needed to circumvent a bug in
+// gcc 2.95.3, which sometimes has problem with the above template
+// function.
+bool PredFunction2Int(int v1, int v2) {
+  return v1 + v2 > 0;
+}
+bool PredFunction2Bool(Bool v1, Bool v2) {
+  return v1 + v2 > 0;
+}
+
+// A binary predicate functor.
+struct PredFunctor2 {
+  template <typename T1, typename T2>
+  bool operator()(const T1& v1,
+                  const T2& v2) {
+    return v1 + v2 > 0;
+  }
+};
+
+// A binary predicate-formatter function.
+template <typename T1, typename T2>
+testing::AssertionResult PredFormatFunction2(const char* e1,
+                                             const char* e2,
+                                             const T1& v1,
+                                             const T2& v2) {
+  if (PredFunction2(v1, v2))
+    return testing::AssertionSuccess();
+
+  return testing::AssertionFailure()
+      << e1 << " + " << e2
+      << " is expected to be positive, but evaluates to "
+      << v1 + v2 << ".";
+}
+
+// A binary predicate-formatter functor.
+struct PredFormatFunctor2 {
+  template <typename T1, typename T2>
+  testing::AssertionResult operator()(const char* e1,
+                                      const char* e2,
+                                      const T1& v1,
+                                      const T2& v2) const {
+    return PredFormatFunction2(e1, e2, v1, v2);
+  }
+};
+
+// Tests for {EXPECT|ASSERT}_PRED_FORMAT2.
+
+class Predicate2Test : public testing::Test {
+ protected:
+  virtual void SetUp() {
+    expected_to_finish_ = true;
+    finished_ = false;
+    n1_ = n2_ = 0;
+  }
+
+  virtual void TearDown() {
+    // Verifies that each of the predicate's arguments was evaluated
+    // exactly once.
+    EXPECT_EQ(1, n1_) <<
+        "The predicate assertion didn't evaluate argument 2 "
+        "exactly once.";
+    EXPECT_EQ(1, n2_) <<
+        "The predicate assertion didn't evaluate argument 3 "
+        "exactly once.";
+
+    // Verifies that the control flow in the test function is expected.
+    if (expected_to_finish_ && !finished_) {
+      FAIL() << "The predicate assertion unexpactedly aborted the test.";
+    } else if (!expected_to_finish_ && finished_) {
+      FAIL() << "The failed predicate assertion didn't abort the test "
+                "as expected.";
+    }
+  }
+
+  // true iff the test function is expected to run to finish.
+  static bool expected_to_finish_;
+
+  // true iff the test function did run to finish.
+  static bool finished_;
+
+  static int n1_;
+  static int n2_;
+};
+
+bool Predicate2Test::expected_to_finish_;
+bool Predicate2Test::finished_;
+int Predicate2Test::n1_;
+int Predicate2Test::n2_;
+
+typedef Predicate2Test EXPECT_PRED_FORMAT2Test;
+typedef Predicate2Test ASSERT_PRED_FORMAT2Test;
+typedef Predicate2Test EXPECT_PRED2Test;
+typedef Predicate2Test ASSERT_PRED2Test;
+
+// Tests a successful EXPECT_PRED2 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED2Test, FunctionOnBuiltInTypeSuccess) {
+  EXPECT_PRED2(PredFunction2Int,
+               ++n1_,
+               ++n2_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED2 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED2Test, FunctionOnUserTypeSuccess) {
+  EXPECT_PRED2(PredFunction2Bool,
+               Bool(++n1_),
+               Bool(++n2_));
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED2 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED2Test, FunctorOnBuiltInTypeSuccess) {
+  EXPECT_PRED2(PredFunctor2(),
+               ++n1_,
+               ++n2_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED2 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED2Test, FunctorOnUserTypeSuccess) {
+  EXPECT_PRED2(PredFunctor2(),
+               Bool(++n1_),
+               Bool(++n2_));
+  finished_ = true;
+}
+
+// Tests a failed EXPECT_PRED2 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED2Test, FunctionOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED2(PredFunction2Int,
+                 n1_++,
+                 n2_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED2 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED2Test, FunctionOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED2(PredFunction2Bool,
+                 Bool(n1_++),
+                 Bool(n2_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED2 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED2Test, FunctorOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED2(PredFunctor2(),
+                 n1_++,
+                 n2_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED2 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED2Test, FunctorOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED2(PredFunctor2(),
+                 Bool(n1_++),
+                 Bool(n2_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful ASSERT_PRED2 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED2Test, FunctionOnBuiltInTypeSuccess) {
+  ASSERT_PRED2(PredFunction2Int,
+               ++n1_,
+               ++n2_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED2 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED2Test, FunctionOnUserTypeSuccess) {
+  ASSERT_PRED2(PredFunction2Bool,
+               Bool(++n1_),
+               Bool(++n2_));
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED2 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED2Test, FunctorOnBuiltInTypeSuccess) {
+  ASSERT_PRED2(PredFunctor2(),
+               ++n1_,
+               ++n2_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED2 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED2Test, FunctorOnUserTypeSuccess) {
+  ASSERT_PRED2(PredFunctor2(),
+               Bool(++n1_),
+               Bool(++n2_));
+  finished_ = true;
+}
+
+// Tests a failed ASSERT_PRED2 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED2Test, FunctionOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED2(PredFunction2Int,
+                 n1_++,
+                 n2_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED2 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED2Test, FunctionOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED2(PredFunction2Bool,
+                 Bool(n1_++),
+                 Bool(n2_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED2 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED2Test, FunctorOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED2(PredFunctor2(),
+                 n1_++,
+                 n2_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED2 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED2Test, FunctorOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED2(PredFunctor2(),
+                 Bool(n1_++),
+                 Bool(n2_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful EXPECT_PRED_FORMAT2 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT2Test, FunctionOnBuiltInTypeSuccess) {
+  EXPECT_PRED_FORMAT2(PredFormatFunction2,
+                      ++n1_,
+                      ++n2_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT2 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT2Test, FunctionOnUserTypeSuccess) {
+  EXPECT_PRED_FORMAT2(PredFormatFunction2,
+                      Bool(++n1_),
+                      Bool(++n2_));
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT2 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT2Test, FunctorOnBuiltInTypeSuccess) {
+  EXPECT_PRED_FORMAT2(PredFormatFunctor2(),
+                      ++n1_,
+                      ++n2_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT2 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT2Test, FunctorOnUserTypeSuccess) {
+  EXPECT_PRED_FORMAT2(PredFormatFunctor2(),
+                      Bool(++n1_),
+                      Bool(++n2_));
+  finished_ = true;
+}
+
+// Tests a failed EXPECT_PRED_FORMAT2 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT2Test, FunctionOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT2(PredFormatFunction2,
+                        n1_++,
+                        n2_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT2 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT2Test, FunctionOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT2(PredFormatFunction2,
+                        Bool(n1_++),
+                        Bool(n2_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT2 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT2Test, FunctorOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT2(PredFormatFunctor2(),
+                        n1_++,
+                        n2_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT2 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT2Test, FunctorOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT2(PredFormatFunctor2(),
+                        Bool(n1_++),
+                        Bool(n2_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful ASSERT_PRED_FORMAT2 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT2Test, FunctionOnBuiltInTypeSuccess) {
+  ASSERT_PRED_FORMAT2(PredFormatFunction2,
+                      ++n1_,
+                      ++n2_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT2 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT2Test, FunctionOnUserTypeSuccess) {
+  ASSERT_PRED_FORMAT2(PredFormatFunction2,
+                      Bool(++n1_),
+                      Bool(++n2_));
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT2 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT2Test, FunctorOnBuiltInTypeSuccess) {
+  ASSERT_PRED_FORMAT2(PredFormatFunctor2(),
+                      ++n1_,
+                      ++n2_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT2 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT2Test, FunctorOnUserTypeSuccess) {
+  ASSERT_PRED_FORMAT2(PredFormatFunctor2(),
+                      Bool(++n1_),
+                      Bool(++n2_));
+  finished_ = true;
+}
+
+// Tests a failed ASSERT_PRED_FORMAT2 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT2Test, FunctionOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT2(PredFormatFunction2,
+                        n1_++,
+                        n2_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT2 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT2Test, FunctionOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT2(PredFormatFunction2,
+                        Bool(n1_++),
+                        Bool(n2_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT2 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT2Test, FunctorOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT2(PredFormatFunctor2(),
+                        n1_++,
+                        n2_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT2 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT2Test, FunctorOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT2(PredFormatFunctor2(),
+                        Bool(n1_++),
+                        Bool(n2_++));
+    finished_ = true;
+  }, "");
+}
+// Sample functions/functors for testing ternary predicate assertions.
+
+// A ternary predicate function.
+template <typename T1, typename T2, typename T3>
+bool PredFunction3(T1 v1, T2 v2, T3 v3) {
+  return v1 + v2 + v3 > 0;
+}
+
+// The following two functions are needed to circumvent a bug in
+// gcc 2.95.3, which sometimes has problem with the above template
+// function.
+bool PredFunction3Int(int v1, int v2, int v3) {
+  return v1 + v2 + v3 > 0;
+}
+bool PredFunction3Bool(Bool v1, Bool v2, Bool v3) {
+  return v1 + v2 + v3 > 0;
+}
+
+// A ternary predicate functor.
+struct PredFunctor3 {
+  template <typename T1, typename T2, typename T3>
+  bool operator()(const T1& v1,
+                  const T2& v2,
+                  const T3& v3) {
+    return v1 + v2 + v3 > 0;
+  }
+};
+
+// A ternary predicate-formatter function.
+template <typename T1, typename T2, typename T3>
+testing::AssertionResult PredFormatFunction3(const char* e1,
+                                             const char* e2,
+                                             const char* e3,
+                                             const T1& v1,
+                                             const T2& v2,
+                                             const T3& v3) {
+  if (PredFunction3(v1, v2, v3))
+    return testing::AssertionSuccess();
+
+  return testing::AssertionFailure()
+      << e1 << " + " << e2 << " + " << e3
+      << " is expected to be positive, but evaluates to "
+      << v1 + v2 + v3 << ".";
+}
+
+// A ternary predicate-formatter functor.
+struct PredFormatFunctor3 {
+  template <typename T1, typename T2, typename T3>
+  testing::AssertionResult operator()(const char* e1,
+                                      const char* e2,
+                                      const char* e3,
+                                      const T1& v1,
+                                      const T2& v2,
+                                      const T3& v3) const {
+    return PredFormatFunction3(e1, e2, e3, v1, v2, v3);
+  }
+};
+
+// Tests for {EXPECT|ASSERT}_PRED_FORMAT3.
+
+class Predicate3Test : public testing::Test {
+ protected:
+  virtual void SetUp() {
+    expected_to_finish_ = true;
+    finished_ = false;
+    n1_ = n2_ = n3_ = 0;
+  }
+
+  virtual void TearDown() {
+    // Verifies that each of the predicate's arguments was evaluated
+    // exactly once.
+    EXPECT_EQ(1, n1_) <<
+        "The predicate assertion didn't evaluate argument 2 "
+        "exactly once.";
+    EXPECT_EQ(1, n2_) <<
+        "The predicate assertion didn't evaluate argument 3 "
+        "exactly once.";
+    EXPECT_EQ(1, n3_) <<
+        "The predicate assertion didn't evaluate argument 4 "
+        "exactly once.";
+
+    // Verifies that the control flow in the test function is expected.
+    if (expected_to_finish_ && !finished_) {
+      FAIL() << "The predicate assertion unexpactedly aborted the test.";
+    } else if (!expected_to_finish_ && finished_) {
+      FAIL() << "The failed predicate assertion didn't abort the test "
+                "as expected.";
+    }
+  }
+
+  // true iff the test function is expected to run to finish.
+  static bool expected_to_finish_;
+
+  // true iff the test function did run to finish.
+  static bool finished_;
+
+  static int n1_;
+  static int n2_;
+  static int n3_;
+};
+
+bool Predicate3Test::expected_to_finish_;
+bool Predicate3Test::finished_;
+int Predicate3Test::n1_;
+int Predicate3Test::n2_;
+int Predicate3Test::n3_;
+
+typedef Predicate3Test EXPECT_PRED_FORMAT3Test;
+typedef Predicate3Test ASSERT_PRED_FORMAT3Test;
+typedef Predicate3Test EXPECT_PRED3Test;
+typedef Predicate3Test ASSERT_PRED3Test;
+
+// Tests a successful EXPECT_PRED3 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED3Test, FunctionOnBuiltInTypeSuccess) {
+  EXPECT_PRED3(PredFunction3Int,
+               ++n1_,
+               ++n2_,
+               ++n3_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED3 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED3Test, FunctionOnUserTypeSuccess) {
+  EXPECT_PRED3(PredFunction3Bool,
+               Bool(++n1_),
+               Bool(++n2_),
+               Bool(++n3_));
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED3 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED3Test, FunctorOnBuiltInTypeSuccess) {
+  EXPECT_PRED3(PredFunctor3(),
+               ++n1_,
+               ++n2_,
+               ++n3_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED3 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED3Test, FunctorOnUserTypeSuccess) {
+  EXPECT_PRED3(PredFunctor3(),
+               Bool(++n1_),
+               Bool(++n2_),
+               Bool(++n3_));
+  finished_ = true;
+}
+
+// Tests a failed EXPECT_PRED3 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED3Test, FunctionOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED3(PredFunction3Int,
+                 n1_++,
+                 n2_++,
+                 n3_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED3 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED3Test, FunctionOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED3(PredFunction3Bool,
+                 Bool(n1_++),
+                 Bool(n2_++),
+                 Bool(n3_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED3 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED3Test, FunctorOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED3(PredFunctor3(),
+                 n1_++,
+                 n2_++,
+                 n3_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED3 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED3Test, FunctorOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED3(PredFunctor3(),
+                 Bool(n1_++),
+                 Bool(n2_++),
+                 Bool(n3_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful ASSERT_PRED3 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED3Test, FunctionOnBuiltInTypeSuccess) {
+  ASSERT_PRED3(PredFunction3Int,
+               ++n1_,
+               ++n2_,
+               ++n3_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED3 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED3Test, FunctionOnUserTypeSuccess) {
+  ASSERT_PRED3(PredFunction3Bool,
+               Bool(++n1_),
+               Bool(++n2_),
+               Bool(++n3_));
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED3 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED3Test, FunctorOnBuiltInTypeSuccess) {
+  ASSERT_PRED3(PredFunctor3(),
+               ++n1_,
+               ++n2_,
+               ++n3_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED3 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED3Test, FunctorOnUserTypeSuccess) {
+  ASSERT_PRED3(PredFunctor3(),
+               Bool(++n1_),
+               Bool(++n2_),
+               Bool(++n3_));
+  finished_ = true;
+}
+
+// Tests a failed ASSERT_PRED3 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED3Test, FunctionOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED3(PredFunction3Int,
+                 n1_++,
+                 n2_++,
+                 n3_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED3 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED3Test, FunctionOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED3(PredFunction3Bool,
+                 Bool(n1_++),
+                 Bool(n2_++),
+                 Bool(n3_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED3 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED3Test, FunctorOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED3(PredFunctor3(),
+                 n1_++,
+                 n2_++,
+                 n3_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED3 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED3Test, FunctorOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED3(PredFunctor3(),
+                 Bool(n1_++),
+                 Bool(n2_++),
+                 Bool(n3_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful EXPECT_PRED_FORMAT3 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT3Test, FunctionOnBuiltInTypeSuccess) {
+  EXPECT_PRED_FORMAT3(PredFormatFunction3,
+                      ++n1_,
+                      ++n2_,
+                      ++n3_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT3 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT3Test, FunctionOnUserTypeSuccess) {
+  EXPECT_PRED_FORMAT3(PredFormatFunction3,
+                      Bool(++n1_),
+                      Bool(++n2_),
+                      Bool(++n3_));
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT3 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT3Test, FunctorOnBuiltInTypeSuccess) {
+  EXPECT_PRED_FORMAT3(PredFormatFunctor3(),
+                      ++n1_,
+                      ++n2_,
+                      ++n3_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT3 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT3Test, FunctorOnUserTypeSuccess) {
+  EXPECT_PRED_FORMAT3(PredFormatFunctor3(),
+                      Bool(++n1_),
+                      Bool(++n2_),
+                      Bool(++n3_));
+  finished_ = true;
+}
+
+// Tests a failed EXPECT_PRED_FORMAT3 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT3Test, FunctionOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT3(PredFormatFunction3,
+                        n1_++,
+                        n2_++,
+                        n3_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT3 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT3Test, FunctionOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT3(PredFormatFunction3,
+                        Bool(n1_++),
+                        Bool(n2_++),
+                        Bool(n3_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT3 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT3Test, FunctorOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT3(PredFormatFunctor3(),
+                        n1_++,
+                        n2_++,
+                        n3_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT3 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT3Test, FunctorOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT3(PredFormatFunctor3(),
+                        Bool(n1_++),
+                        Bool(n2_++),
+                        Bool(n3_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful ASSERT_PRED_FORMAT3 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT3Test, FunctionOnBuiltInTypeSuccess) {
+  ASSERT_PRED_FORMAT3(PredFormatFunction3,
+                      ++n1_,
+                      ++n2_,
+                      ++n3_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT3 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT3Test, FunctionOnUserTypeSuccess) {
+  ASSERT_PRED_FORMAT3(PredFormatFunction3,
+                      Bool(++n1_),
+                      Bool(++n2_),
+                      Bool(++n3_));
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT3 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT3Test, FunctorOnBuiltInTypeSuccess) {
+  ASSERT_PRED_FORMAT3(PredFormatFunctor3(),
+                      ++n1_,
+                      ++n2_,
+                      ++n3_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT3 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT3Test, FunctorOnUserTypeSuccess) {
+  ASSERT_PRED_FORMAT3(PredFormatFunctor3(),
+                      Bool(++n1_),
+                      Bool(++n2_),
+                      Bool(++n3_));
+  finished_ = true;
+}
+
+// Tests a failed ASSERT_PRED_FORMAT3 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT3Test, FunctionOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT3(PredFormatFunction3,
+                        n1_++,
+                        n2_++,
+                        n3_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT3 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT3Test, FunctionOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT3(PredFormatFunction3,
+                        Bool(n1_++),
+                        Bool(n2_++),
+                        Bool(n3_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT3 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT3Test, FunctorOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT3(PredFormatFunctor3(),
+                        n1_++,
+                        n2_++,
+                        n3_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT3 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT3Test, FunctorOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT3(PredFormatFunctor3(),
+                        Bool(n1_++),
+                        Bool(n2_++),
+                        Bool(n3_++));
+    finished_ = true;
+  }, "");
+}
+// Sample functions/functors for testing 4-ary predicate assertions.
+
+// A 4-ary predicate function.
+template <typename T1, typename T2, typename T3, typename T4>
+bool PredFunction4(T1 v1, T2 v2, T3 v3, T4 v4) {
+  return v1 + v2 + v3 + v4 > 0;
+}
+
+// The following two functions are needed to circumvent a bug in
+// gcc 2.95.3, which sometimes has problem with the above template
+// function.
+bool PredFunction4Int(int v1, int v2, int v3, int v4) {
+  return v1 + v2 + v3 + v4 > 0;
+}
+bool PredFunction4Bool(Bool v1, Bool v2, Bool v3, Bool v4) {
+  return v1 + v2 + v3 + v4 > 0;
+}
+
+// A 4-ary predicate functor.
+struct PredFunctor4 {
+  template <typename T1, typename T2, typename T3, typename T4>
+  bool operator()(const T1& v1,
+                  const T2& v2,
+                  const T3& v3,
+                  const T4& v4) {
+    return v1 + v2 + v3 + v4 > 0;
+  }
+};
+
+// A 4-ary predicate-formatter function.
+template <typename T1, typename T2, typename T3, typename T4>
+testing::AssertionResult PredFormatFunction4(const char* e1,
+                                             const char* e2,
+                                             const char* e3,
+                                             const char* e4,
+                                             const T1& v1,
+                                             const T2& v2,
+                                             const T3& v3,
+                                             const T4& v4) {
+  if (PredFunction4(v1, v2, v3, v4))
+    return testing::AssertionSuccess();
+
+  return testing::AssertionFailure()
+      << e1 << " + " << e2 << " + " << e3 << " + " << e4
+      << " is expected to be positive, but evaluates to "
+      << v1 + v2 + v3 + v4 << ".";
+}
+
+// A 4-ary predicate-formatter functor.
+struct PredFormatFunctor4 {
+  template <typename T1, typename T2, typename T3, typename T4>
+  testing::AssertionResult operator()(const char* e1,
+                                      const char* e2,
+                                      const char* e3,
+                                      const char* e4,
+                                      const T1& v1,
+                                      const T2& v2,
+                                      const T3& v3,
+                                      const T4& v4) const {
+    return PredFormatFunction4(e1, e2, e3, e4, v1, v2, v3, v4);
+  }
+};
+
+// Tests for {EXPECT|ASSERT}_PRED_FORMAT4.
+
+class Predicate4Test : public testing::Test {
+ protected:
+  virtual void SetUp() {
+    expected_to_finish_ = true;
+    finished_ = false;
+    n1_ = n2_ = n3_ = n4_ = 0;
+  }
+
+  virtual void TearDown() {
+    // Verifies that each of the predicate's arguments was evaluated
+    // exactly once.
+    EXPECT_EQ(1, n1_) <<
+        "The predicate assertion didn't evaluate argument 2 "
+        "exactly once.";
+    EXPECT_EQ(1, n2_) <<
+        "The predicate assertion didn't evaluate argument 3 "
+        "exactly once.";
+    EXPECT_EQ(1, n3_) <<
+        "The predicate assertion didn't evaluate argument 4 "
+        "exactly once.";
+    EXPECT_EQ(1, n4_) <<
+        "The predicate assertion didn't evaluate argument 5 "
+        "exactly once.";
+
+    // Verifies that the control flow in the test function is expected.
+    if (expected_to_finish_ && !finished_) {
+      FAIL() << "The predicate assertion unexpactedly aborted the test.";
+    } else if (!expected_to_finish_ && finished_) {
+      FAIL() << "The failed predicate assertion didn't abort the test "
+                "as expected.";
+    }
+  }
+
+  // true iff the test function is expected to run to finish.
+  static bool expected_to_finish_;
+
+  // true iff the test function did run to finish.
+  static bool finished_;
+
+  static int n1_;
+  static int n2_;
+  static int n3_;
+  static int n4_;
+};
+
+bool Predicate4Test::expected_to_finish_;
+bool Predicate4Test::finished_;
+int Predicate4Test::n1_;
+int Predicate4Test::n2_;
+int Predicate4Test::n3_;
+int Predicate4Test::n4_;
+
+typedef Predicate4Test EXPECT_PRED_FORMAT4Test;
+typedef Predicate4Test ASSERT_PRED_FORMAT4Test;
+typedef Predicate4Test EXPECT_PRED4Test;
+typedef Predicate4Test ASSERT_PRED4Test;
+
+// Tests a successful EXPECT_PRED4 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED4Test, FunctionOnBuiltInTypeSuccess) {
+  EXPECT_PRED4(PredFunction4Int,
+               ++n1_,
+               ++n2_,
+               ++n3_,
+               ++n4_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED4 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED4Test, FunctionOnUserTypeSuccess) {
+  EXPECT_PRED4(PredFunction4Bool,
+               Bool(++n1_),
+               Bool(++n2_),
+               Bool(++n3_),
+               Bool(++n4_));
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED4 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED4Test, FunctorOnBuiltInTypeSuccess) {
+  EXPECT_PRED4(PredFunctor4(),
+               ++n1_,
+               ++n2_,
+               ++n3_,
+               ++n4_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED4 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED4Test, FunctorOnUserTypeSuccess) {
+  EXPECT_PRED4(PredFunctor4(),
+               Bool(++n1_),
+               Bool(++n2_),
+               Bool(++n3_),
+               Bool(++n4_));
+  finished_ = true;
+}
+
+// Tests a failed EXPECT_PRED4 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED4Test, FunctionOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED4(PredFunction4Int,
+                 n1_++,
+                 n2_++,
+                 n3_++,
+                 n4_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED4 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED4Test, FunctionOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED4(PredFunction4Bool,
+                 Bool(n1_++),
+                 Bool(n2_++),
+                 Bool(n3_++),
+                 Bool(n4_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED4 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED4Test, FunctorOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED4(PredFunctor4(),
+                 n1_++,
+                 n2_++,
+                 n3_++,
+                 n4_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED4 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED4Test, FunctorOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED4(PredFunctor4(),
+                 Bool(n1_++),
+                 Bool(n2_++),
+                 Bool(n3_++),
+                 Bool(n4_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful ASSERT_PRED4 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED4Test, FunctionOnBuiltInTypeSuccess) {
+  ASSERT_PRED4(PredFunction4Int,
+               ++n1_,
+               ++n2_,
+               ++n3_,
+               ++n4_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED4 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED4Test, FunctionOnUserTypeSuccess) {
+  ASSERT_PRED4(PredFunction4Bool,
+               Bool(++n1_),
+               Bool(++n2_),
+               Bool(++n3_),
+               Bool(++n4_));
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED4 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED4Test, FunctorOnBuiltInTypeSuccess) {
+  ASSERT_PRED4(PredFunctor4(),
+               ++n1_,
+               ++n2_,
+               ++n3_,
+               ++n4_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED4 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED4Test, FunctorOnUserTypeSuccess) {
+  ASSERT_PRED4(PredFunctor4(),
+               Bool(++n1_),
+               Bool(++n2_),
+               Bool(++n3_),
+               Bool(++n4_));
+  finished_ = true;
+}
+
+// Tests a failed ASSERT_PRED4 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED4Test, FunctionOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED4(PredFunction4Int,
+                 n1_++,
+                 n2_++,
+                 n3_++,
+                 n4_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED4 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED4Test, FunctionOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED4(PredFunction4Bool,
+                 Bool(n1_++),
+                 Bool(n2_++),
+                 Bool(n3_++),
+                 Bool(n4_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED4 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED4Test, FunctorOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED4(PredFunctor4(),
+                 n1_++,
+                 n2_++,
+                 n3_++,
+                 n4_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED4 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED4Test, FunctorOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED4(PredFunctor4(),
+                 Bool(n1_++),
+                 Bool(n2_++),
+                 Bool(n3_++),
+                 Bool(n4_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful EXPECT_PRED_FORMAT4 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT4Test, FunctionOnBuiltInTypeSuccess) {
+  EXPECT_PRED_FORMAT4(PredFormatFunction4,
+                      ++n1_,
+                      ++n2_,
+                      ++n3_,
+                      ++n4_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT4 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT4Test, FunctionOnUserTypeSuccess) {
+  EXPECT_PRED_FORMAT4(PredFormatFunction4,
+                      Bool(++n1_),
+                      Bool(++n2_),
+                      Bool(++n3_),
+                      Bool(++n4_));
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT4 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT4Test, FunctorOnBuiltInTypeSuccess) {
+  EXPECT_PRED_FORMAT4(PredFormatFunctor4(),
+                      ++n1_,
+                      ++n2_,
+                      ++n3_,
+                      ++n4_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT4 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT4Test, FunctorOnUserTypeSuccess) {
+  EXPECT_PRED_FORMAT4(PredFormatFunctor4(),
+                      Bool(++n1_),
+                      Bool(++n2_),
+                      Bool(++n3_),
+                      Bool(++n4_));
+  finished_ = true;
+}
+
+// Tests a failed EXPECT_PRED_FORMAT4 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT4Test, FunctionOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT4(PredFormatFunction4,
+                        n1_++,
+                        n2_++,
+                        n3_++,
+                        n4_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT4 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT4Test, FunctionOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT4(PredFormatFunction4,
+                        Bool(n1_++),
+                        Bool(n2_++),
+                        Bool(n3_++),
+                        Bool(n4_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT4 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT4Test, FunctorOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT4(PredFormatFunctor4(),
+                        n1_++,
+                        n2_++,
+                        n3_++,
+                        n4_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT4 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT4Test, FunctorOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT4(PredFormatFunctor4(),
+                        Bool(n1_++),
+                        Bool(n2_++),
+                        Bool(n3_++),
+                        Bool(n4_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful ASSERT_PRED_FORMAT4 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT4Test, FunctionOnBuiltInTypeSuccess) {
+  ASSERT_PRED_FORMAT4(PredFormatFunction4,
+                      ++n1_,
+                      ++n2_,
+                      ++n3_,
+                      ++n4_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT4 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT4Test, FunctionOnUserTypeSuccess) {
+  ASSERT_PRED_FORMAT4(PredFormatFunction4,
+                      Bool(++n1_),
+                      Bool(++n2_),
+                      Bool(++n3_),
+                      Bool(++n4_));
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT4 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT4Test, FunctorOnBuiltInTypeSuccess) {
+  ASSERT_PRED_FORMAT4(PredFormatFunctor4(),
+                      ++n1_,
+                      ++n2_,
+                      ++n3_,
+                      ++n4_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT4 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT4Test, FunctorOnUserTypeSuccess) {
+  ASSERT_PRED_FORMAT4(PredFormatFunctor4(),
+                      Bool(++n1_),
+                      Bool(++n2_),
+                      Bool(++n3_),
+                      Bool(++n4_));
+  finished_ = true;
+}
+
+// Tests a failed ASSERT_PRED_FORMAT4 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT4Test, FunctionOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT4(PredFormatFunction4,
+                        n1_++,
+                        n2_++,
+                        n3_++,
+                        n4_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT4 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT4Test, FunctionOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT4(PredFormatFunction4,
+                        Bool(n1_++),
+                        Bool(n2_++),
+                        Bool(n3_++),
+                        Bool(n4_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT4 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT4Test, FunctorOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT4(PredFormatFunctor4(),
+                        n1_++,
+                        n2_++,
+                        n3_++,
+                        n4_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT4 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT4Test, FunctorOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT4(PredFormatFunctor4(),
+                        Bool(n1_++),
+                        Bool(n2_++),
+                        Bool(n3_++),
+                        Bool(n4_++));
+    finished_ = true;
+  }, "");
+}
+// Sample functions/functors for testing 5-ary predicate assertions.
+
+// A 5-ary predicate function.
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+bool PredFunction5(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5) {
+  return v1 + v2 + v3 + v4 + v5 > 0;
+}
+
+// The following two functions are needed to circumvent a bug in
+// gcc 2.95.3, which sometimes has problem with the above template
+// function.
+bool PredFunction5Int(int v1, int v2, int v3, int v4, int v5) {
+  return v1 + v2 + v3 + v4 + v5 > 0;
+}
+bool PredFunction5Bool(Bool v1, Bool v2, Bool v3, Bool v4, Bool v5) {
+  return v1 + v2 + v3 + v4 + v5 > 0;
+}
+
+// A 5-ary predicate functor.
+struct PredFunctor5 {
+  template <typename T1, typename T2, typename T3, typename T4, typename T5>
+  bool operator()(const T1& v1,
+                  const T2& v2,
+                  const T3& v3,
+                  const T4& v4,
+                  const T5& v5) {
+    return v1 + v2 + v3 + v4 + v5 > 0;
+  }
+};
+
+// A 5-ary predicate-formatter function.
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+testing::AssertionResult PredFormatFunction5(const char* e1,
+                                             const char* e2,
+                                             const char* e3,
+                                             const char* e4,
+                                             const char* e5,
+                                             const T1& v1,
+                                             const T2& v2,
+                                             const T3& v3,
+                                             const T4& v4,
+                                             const T5& v5) {
+  if (PredFunction5(v1, v2, v3, v4, v5))
+    return testing::AssertionSuccess();
+
+  return testing::AssertionFailure()
+      << e1 << " + " << e2 << " + " << e3 << " + " << e4 << " + " << e5
+      << " is expected to be positive, but evaluates to "
+      << v1 + v2 + v3 + v4 + v5 << ".";
+}
+
+// A 5-ary predicate-formatter functor.
+struct PredFormatFunctor5 {
+  template <typename T1, typename T2, typename T3, typename T4, typename T5>
+  testing::AssertionResult operator()(const char* e1,
+                                      const char* e2,
+                                      const char* e3,
+                                      const char* e4,
+                                      const char* e5,
+                                      const T1& v1,
+                                      const T2& v2,
+                                      const T3& v3,
+                                      const T4& v4,
+                                      const T5& v5) const {
+    return PredFormatFunction5(e1, e2, e3, e4, e5, v1, v2, v3, v4, v5);
+  }
+};
+
+// Tests for {EXPECT|ASSERT}_PRED_FORMAT5.
+
+class Predicate5Test : public testing::Test {
+ protected:
+  virtual void SetUp() {
+    expected_to_finish_ = true;
+    finished_ = false;
+    n1_ = n2_ = n3_ = n4_ = n5_ = 0;
+  }
+
+  virtual void TearDown() {
+    // Verifies that each of the predicate's arguments was evaluated
+    // exactly once.
+    EXPECT_EQ(1, n1_) <<
+        "The predicate assertion didn't evaluate argument 2 "
+        "exactly once.";
+    EXPECT_EQ(1, n2_) <<
+        "The predicate assertion didn't evaluate argument 3 "
+        "exactly once.";
+    EXPECT_EQ(1, n3_) <<
+        "The predicate assertion didn't evaluate argument 4 "
+        "exactly once.";
+    EXPECT_EQ(1, n4_) <<
+        "The predicate assertion didn't evaluate argument 5 "
+        "exactly once.";
+    EXPECT_EQ(1, n5_) <<
+        "The predicate assertion didn't evaluate argument 6 "
+        "exactly once.";
+
+    // Verifies that the control flow in the test function is expected.
+    if (expected_to_finish_ && !finished_) {
+      FAIL() << "The predicate assertion unexpactedly aborted the test.";
+    } else if (!expected_to_finish_ && finished_) {
+      FAIL() << "The failed predicate assertion didn't abort the test "
+                "as expected.";
+    }
+  }
+
+  // true iff the test function is expected to run to finish.
+  static bool expected_to_finish_;
+
+  // true iff the test function did run to finish.
+  static bool finished_;
+
+  static int n1_;
+  static int n2_;
+  static int n3_;
+  static int n4_;
+  static int n5_;
+};
+
+bool Predicate5Test::expected_to_finish_;
+bool Predicate5Test::finished_;
+int Predicate5Test::n1_;
+int Predicate5Test::n2_;
+int Predicate5Test::n3_;
+int Predicate5Test::n4_;
+int Predicate5Test::n5_;
+
+typedef Predicate5Test EXPECT_PRED_FORMAT5Test;
+typedef Predicate5Test ASSERT_PRED_FORMAT5Test;
+typedef Predicate5Test EXPECT_PRED5Test;
+typedef Predicate5Test ASSERT_PRED5Test;
+
+// Tests a successful EXPECT_PRED5 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED5Test, FunctionOnBuiltInTypeSuccess) {
+  EXPECT_PRED5(PredFunction5Int,
+               ++n1_,
+               ++n2_,
+               ++n3_,
+               ++n4_,
+               ++n5_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED5 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED5Test, FunctionOnUserTypeSuccess) {
+  EXPECT_PRED5(PredFunction5Bool,
+               Bool(++n1_),
+               Bool(++n2_),
+               Bool(++n3_),
+               Bool(++n4_),
+               Bool(++n5_));
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED5 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED5Test, FunctorOnBuiltInTypeSuccess) {
+  EXPECT_PRED5(PredFunctor5(),
+               ++n1_,
+               ++n2_,
+               ++n3_,
+               ++n4_,
+               ++n5_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED5 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED5Test, FunctorOnUserTypeSuccess) {
+  EXPECT_PRED5(PredFunctor5(),
+               Bool(++n1_),
+               Bool(++n2_),
+               Bool(++n3_),
+               Bool(++n4_),
+               Bool(++n5_));
+  finished_ = true;
+}
+
+// Tests a failed EXPECT_PRED5 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED5Test, FunctionOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED5(PredFunction5Int,
+                 n1_++,
+                 n2_++,
+                 n3_++,
+                 n4_++,
+                 n5_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED5 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED5Test, FunctionOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED5(PredFunction5Bool,
+                 Bool(n1_++),
+                 Bool(n2_++),
+                 Bool(n3_++),
+                 Bool(n4_++),
+                 Bool(n5_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED5 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED5Test, FunctorOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED5(PredFunctor5(),
+                 n1_++,
+                 n2_++,
+                 n3_++,
+                 n4_++,
+                 n5_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED5 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED5Test, FunctorOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED5(PredFunctor5(),
+                 Bool(n1_++),
+                 Bool(n2_++),
+                 Bool(n3_++),
+                 Bool(n4_++),
+                 Bool(n5_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful ASSERT_PRED5 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED5Test, FunctionOnBuiltInTypeSuccess) {
+  ASSERT_PRED5(PredFunction5Int,
+               ++n1_,
+               ++n2_,
+               ++n3_,
+               ++n4_,
+               ++n5_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED5 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED5Test, FunctionOnUserTypeSuccess) {
+  ASSERT_PRED5(PredFunction5Bool,
+               Bool(++n1_),
+               Bool(++n2_),
+               Bool(++n3_),
+               Bool(++n4_),
+               Bool(++n5_));
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED5 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED5Test, FunctorOnBuiltInTypeSuccess) {
+  ASSERT_PRED5(PredFunctor5(),
+               ++n1_,
+               ++n2_,
+               ++n3_,
+               ++n4_,
+               ++n5_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED5 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED5Test, FunctorOnUserTypeSuccess) {
+  ASSERT_PRED5(PredFunctor5(),
+               Bool(++n1_),
+               Bool(++n2_),
+               Bool(++n3_),
+               Bool(++n4_),
+               Bool(++n5_));
+  finished_ = true;
+}
+
+// Tests a failed ASSERT_PRED5 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED5Test, FunctionOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED5(PredFunction5Int,
+                 n1_++,
+                 n2_++,
+                 n3_++,
+                 n4_++,
+                 n5_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED5 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED5Test, FunctionOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED5(PredFunction5Bool,
+                 Bool(n1_++),
+                 Bool(n2_++),
+                 Bool(n3_++),
+                 Bool(n4_++),
+                 Bool(n5_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED5 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED5Test, FunctorOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED5(PredFunctor5(),
+                 n1_++,
+                 n2_++,
+                 n3_++,
+                 n4_++,
+                 n5_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED5 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED5Test, FunctorOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED5(PredFunctor5(),
+                 Bool(n1_++),
+                 Bool(n2_++),
+                 Bool(n3_++),
+                 Bool(n4_++),
+                 Bool(n5_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful EXPECT_PRED_FORMAT5 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT5Test, FunctionOnBuiltInTypeSuccess) {
+  EXPECT_PRED_FORMAT5(PredFormatFunction5,
+                      ++n1_,
+                      ++n2_,
+                      ++n3_,
+                      ++n4_,
+                      ++n5_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT5 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT5Test, FunctionOnUserTypeSuccess) {
+  EXPECT_PRED_FORMAT5(PredFormatFunction5,
+                      Bool(++n1_),
+                      Bool(++n2_),
+                      Bool(++n3_),
+                      Bool(++n4_),
+                      Bool(++n5_));
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT5 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT5Test, FunctorOnBuiltInTypeSuccess) {
+  EXPECT_PRED_FORMAT5(PredFormatFunctor5(),
+                      ++n1_,
+                      ++n2_,
+                      ++n3_,
+                      ++n4_,
+                      ++n5_);
+  finished_ = true;
+}
+
+// Tests a successful EXPECT_PRED_FORMAT5 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT5Test, FunctorOnUserTypeSuccess) {
+  EXPECT_PRED_FORMAT5(PredFormatFunctor5(),
+                      Bool(++n1_),
+                      Bool(++n2_),
+                      Bool(++n3_),
+                      Bool(++n4_),
+                      Bool(++n5_));
+  finished_ = true;
+}
+
+// Tests a failed EXPECT_PRED_FORMAT5 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT5Test, FunctionOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT5(PredFormatFunction5,
+                        n1_++,
+                        n2_++,
+                        n3_++,
+                        n4_++,
+                        n5_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT5 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT5Test, FunctionOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT5(PredFormatFunction5,
+                        Bool(n1_++),
+                        Bool(n2_++),
+                        Bool(n3_++),
+                        Bool(n4_++),
+                        Bool(n5_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT5 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(EXPECT_PRED_FORMAT5Test, FunctorOnBuiltInTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT5(PredFormatFunctor5(),
+                        n1_++,
+                        n2_++,
+                        n3_++,
+                        n4_++,
+                        n5_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed EXPECT_PRED_FORMAT5 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(EXPECT_PRED_FORMAT5Test, FunctorOnUserTypeFailure) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT5(PredFormatFunctor5(),
+                        Bool(n1_++),
+                        Bool(n2_++),
+                        Bool(n3_++),
+                        Bool(n4_++),
+                        Bool(n5_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a successful ASSERT_PRED_FORMAT5 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT5Test, FunctionOnBuiltInTypeSuccess) {
+  ASSERT_PRED_FORMAT5(PredFormatFunction5,
+                      ++n1_,
+                      ++n2_,
+                      ++n3_,
+                      ++n4_,
+                      ++n5_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT5 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT5Test, FunctionOnUserTypeSuccess) {
+  ASSERT_PRED_FORMAT5(PredFormatFunction5,
+                      Bool(++n1_),
+                      Bool(++n2_),
+                      Bool(++n3_),
+                      Bool(++n4_),
+                      Bool(++n5_));
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT5 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT5Test, FunctorOnBuiltInTypeSuccess) {
+  ASSERT_PRED_FORMAT5(PredFormatFunctor5(),
+                      ++n1_,
+                      ++n2_,
+                      ++n3_,
+                      ++n4_,
+                      ++n5_);
+  finished_ = true;
+}
+
+// Tests a successful ASSERT_PRED_FORMAT5 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT5Test, FunctorOnUserTypeSuccess) {
+  ASSERT_PRED_FORMAT5(PredFormatFunctor5(),
+                      Bool(++n1_),
+                      Bool(++n2_),
+                      Bool(++n3_),
+                      Bool(++n4_),
+                      Bool(++n5_));
+  finished_ = true;
+}
+
+// Tests a failed ASSERT_PRED_FORMAT5 where the
+// predicate-formatter is a function on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT5Test, FunctionOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT5(PredFormatFunction5,
+                        n1_++,
+                        n2_++,
+                        n3_++,
+                        n4_++,
+                        n5_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT5 where the
+// predicate-formatter is a function on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT5Test, FunctionOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT5(PredFormatFunction5,
+                        Bool(n1_++),
+                        Bool(n2_++),
+                        Bool(n3_++),
+                        Bool(n4_++),
+                        Bool(n5_++));
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT5 where the
+// predicate-formatter is a functor on a built-in type (int).
+TEST_F(ASSERT_PRED_FORMAT5Test, FunctorOnBuiltInTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT5(PredFormatFunctor5(),
+                        n1_++,
+                        n2_++,
+                        n3_++,
+                        n4_++,
+                        n5_++);
+    finished_ = true;
+  }, "");
+}
+
+// Tests a failed ASSERT_PRED_FORMAT5 where the
+// predicate-formatter is a functor on a user-defined type (Bool).
+TEST_F(ASSERT_PRED_FORMAT5Test, FunctorOnUserTypeFailure) {
+  expected_to_finish_ = false;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT5(PredFormatFunctor5(),
+                        Bool(n1_++),
+                        Bool(n2_++),
+                        Bool(n3_++),
+                        Bool(n4_++),
+                        Bool(n5_++));
+    finished_ = true;
+  }, "");
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_premature_exit_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_premature_exit_test.cc
new file mode 100644
index 0000000000..3b4dc7d43f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_premature_exit_test.cc
@@ -0,0 +1,127 @@
+// Copyright 2013, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Tests that Google Test manipulates the premature-exit-detection
+// file correctly.
+
+#include <stdio.h>
+
+#include "gtest/gtest.h"
+
+using ::testing::InitGoogleTest;
+using ::testing::Test;
+using ::testing::internal::posix::GetEnv;
+using ::testing::internal::posix::Stat;
+using ::testing::internal::posix::StatStruct;
+
+namespace {
+
+class PrematureExitTest : public Test {
+ public:
+  // Returns true iff the given file exists.
+  static bool FileExists(const char* filepath) {
+    StatStruct stat;
+    return Stat(filepath, &stat) == 0;
+  }
+
+ protected:
+  PrematureExitTest() {
+    premature_exit_file_path_ = GetEnv("TEST_PREMATURE_EXIT_FILE");
+
+    // Normalize NULL to "" for ease of handling.
+    if (premature_exit_file_path_ == NULL) {
+      premature_exit_file_path_ = "";
+    }
+  }
+
+  // Returns true iff the premature-exit file exists.
+  bool PrematureExitFileExists() const {
+    return FileExists(premature_exit_file_path_);
+  }
+
+  const char* premature_exit_file_path_;
+};
+
+typedef PrematureExitTest PrematureExitDeathTest;
+
+// Tests that:
+//   - the premature-exit file exists during the execution of a
+//     death test (EXPECT_DEATH*), and
+//   - a death test doesn't interfere with the main test process's
+//     handling of the premature-exit file.
+TEST_F(PrematureExitDeathTest, FileExistsDuringExecutionOfDeathTest) {
+  if (*premature_exit_file_path_ == '\0') {
+    return;
+  }
+
+  EXPECT_DEATH_IF_SUPPORTED({
+      // If the file exists, crash the process such that the main test
+      // process will catch the (expected) crash and report a success;
+      // otherwise don't crash, which will cause the main test process
+      // to report that the death test has failed.
+      if (PrematureExitFileExists()) {
+        exit(1);
+      }
+    }, "");
+}
+
+// Tests that the premature-exit file exists during the execution of a
+// normal (non-death) test.
+TEST_F(PrematureExitTest, PrematureExitFileExistsDuringTestExecution) {
+  if (*premature_exit_file_path_ == '\0') {
+    return;
+  }
+
+  EXPECT_TRUE(PrematureExitFileExists())
+      << " file " << premature_exit_file_path_
+      << " should exist during test execution, but doesn't.";
+}
+
+}  // namespace
+
+int main(int argc, char **argv) {
+  InitGoogleTest(&argc, argv);
+  const int exit_code = RUN_ALL_TESTS();
+
+  // Test that the premature-exit file is deleted upon return from
+  // RUN_ALL_TESTS().
+  const char* const filepath = GetEnv("TEST_PREMATURE_EXIT_FILE");
+  if (filepath != NULL && *filepath != '\0') {
+    if (PrematureExitTest::FileExists(filepath)) {
+      printf(
+          "File %s shouldn't exist after the test program finishes, but does.",
+          filepath);
+      return 1;
+    }
+  }
+
+  return exit_code;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_prod_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_prod_test.cc
new file mode 100644
index 0000000000..060abce187
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_prod_test.cc
@@ -0,0 +1,57 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Unit test for include/gtest/gtest_prod.h.
+
+#include "gtest/gtest.h"
+#include "test/production.h"
+
+// Tests that private members can be accessed from a TEST declared as
+// a friend of the class.
+TEST(PrivateCodeTest, CanAccessPrivateMembers) {
+  PrivateCode a;
+  EXPECT_EQ(0, a.x_);
+
+  a.set_x(1);
+  EXPECT_EQ(1, a.x_);
+}
+
+typedef testing::Test PrivateCodeFixtureTest;
+
+// Tests that private members can be accessed from a TEST_F declared
+// as a friend of the class.
+TEST_F(PrivateCodeFixtureTest, CanAccessPrivateMembers) {
+  PrivateCode a;
+  EXPECT_EQ(0, a.x_);
+
+  a.set_x(2);
+  EXPECT_EQ(2, a.x_);
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_repeat_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_repeat_test.cc
new file mode 100644
index 0000000000..481012adc2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_repeat_test.cc
@@ -0,0 +1,253 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Tests the --gtest_repeat=number flag.
+
+#include <stdlib.h>
+#include <iostream>
+#include "gtest/gtest.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+namespace testing {
+
+GTEST_DECLARE_string_(death_test_style);
+GTEST_DECLARE_string_(filter);
+GTEST_DECLARE_int32_(repeat);
+
+}  // namespace testing
+
+using testing::GTEST_FLAG(death_test_style);
+using testing::GTEST_FLAG(filter);
+using testing::GTEST_FLAG(repeat);
+
+namespace {
+
+// We need this when we are testing Google Test itself and therefore
+// cannot use Google Test assertions.
+#define GTEST_CHECK_INT_EQ_(expected, actual) \
+  do {\
+    const int expected_val = (expected);\
+    const int actual_val = (actual);\
+    if (::testing::internal::IsTrue(expected_val != actual_val)) {\
+      ::std::cout << "Value of: " #actual "\n"\
+                  << "  Actual: " << actual_val << "\n"\
+                  << "Expected: " #expected "\n"\
+                  << "Which is: " << expected_val << "\n";\
+      ::testing::internal::posix::Abort();\
+    }\
+  } while (::testing::internal::AlwaysFalse())
+
+
+// Used for verifying that global environment set-up and tear-down are
+// inside the gtest_repeat loop.
+
+int g_environment_set_up_count = 0;
+int g_environment_tear_down_count = 0;
+
+class MyEnvironment : public testing::Environment {
+ public:
+  MyEnvironment() {}
+  virtual void SetUp() { g_environment_set_up_count++; }
+  virtual void TearDown() { g_environment_tear_down_count++; }
+};
+
+// A test that should fail.
+
+int g_should_fail_count = 0;
+
+TEST(FooTest, ShouldFail) {
+  g_should_fail_count++;
+  EXPECT_EQ(0, 1) << "Expected failure.";
+}
+
+// A test that should pass.
+
+int g_should_pass_count = 0;
+
+TEST(FooTest, ShouldPass) {
+  g_should_pass_count++;
+}
+
+// A test that contains a thread-safe death test and a fast death
+// test.  It should pass.
+
+int g_death_test_count = 0;
+
+TEST(BarDeathTest, ThreadSafeAndFast) {
+  g_death_test_count++;
+
+  GTEST_FLAG(death_test_style) = "threadsafe";
+  EXPECT_DEATH_IF_SUPPORTED(::testing::internal::posix::Abort(), "");
+
+  GTEST_FLAG(death_test_style) = "fast";
+  EXPECT_DEATH_IF_SUPPORTED(::testing::internal::posix::Abort(), "");
+}
+
+#if GTEST_HAS_PARAM_TEST
+int g_param_test_count = 0;
+
+const int kNumberOfParamTests = 10;
+
+class MyParamTest : public testing::TestWithParam<int> {};
+
+TEST_P(MyParamTest, ShouldPass) {
+  // TODO(vladl@google.com): Make parameter value checking robust
+  //                         WRT order of tests.
+  GTEST_CHECK_INT_EQ_(g_param_test_count % kNumberOfParamTests, GetParam());
+  g_param_test_count++;
+}
+INSTANTIATE_TEST_CASE_P(MyParamSequence,
+                        MyParamTest,
+                        testing::Range(0, kNumberOfParamTests));
+#endif  // GTEST_HAS_PARAM_TEST
+
+// Resets the count for each test.
+void ResetCounts() {
+  g_environment_set_up_count = 0;
+  g_environment_tear_down_count = 0;
+  g_should_fail_count = 0;
+  g_should_pass_count = 0;
+  g_death_test_count = 0;
+#if GTEST_HAS_PARAM_TEST
+  g_param_test_count = 0;
+#endif  // GTEST_HAS_PARAM_TEST
+}
+
+// Checks that the count for each test is expected.
+void CheckCounts(int expected) {
+  GTEST_CHECK_INT_EQ_(expected, g_environment_set_up_count);
+  GTEST_CHECK_INT_EQ_(expected, g_environment_tear_down_count);
+  GTEST_CHECK_INT_EQ_(expected, g_should_fail_count);
+  GTEST_CHECK_INT_EQ_(expected, g_should_pass_count);
+  GTEST_CHECK_INT_EQ_(expected, g_death_test_count);
+#if GTEST_HAS_PARAM_TEST
+  GTEST_CHECK_INT_EQ_(expected * kNumberOfParamTests, g_param_test_count);
+#endif  // GTEST_HAS_PARAM_TEST
+}
+
+// Tests the behavior of Google Test when --gtest_repeat is not specified.
+void TestRepeatUnspecified() {
+  ResetCounts();
+  GTEST_CHECK_INT_EQ_(1, RUN_ALL_TESTS());
+  CheckCounts(1);
+}
+
+// Tests the behavior of Google Test when --gtest_repeat has the given value.
+void TestRepeat(int repeat) {
+  GTEST_FLAG(repeat) = repeat;
+
+  ResetCounts();
+  GTEST_CHECK_INT_EQ_(repeat > 0 ? 1 : 0, RUN_ALL_TESTS());
+  CheckCounts(repeat);
+}
+
+// Tests using --gtest_repeat when --gtest_filter specifies an empty
+// set of tests.
+void TestRepeatWithEmptyFilter(int repeat) {
+  GTEST_FLAG(repeat) = repeat;
+  GTEST_FLAG(filter) = "None";
+
+  ResetCounts();
+  GTEST_CHECK_INT_EQ_(0, RUN_ALL_TESTS());
+  CheckCounts(0);
+}
+
+// Tests using --gtest_repeat when --gtest_filter specifies a set of
+// successful tests.
+void TestRepeatWithFilterForSuccessfulTests(int repeat) {
+  GTEST_FLAG(repeat) = repeat;
+  GTEST_FLAG(filter) = "*-*ShouldFail";
+
+  ResetCounts();
+  GTEST_CHECK_INT_EQ_(0, RUN_ALL_TESTS());
+  GTEST_CHECK_INT_EQ_(repeat, g_environment_set_up_count);
+  GTEST_CHECK_INT_EQ_(repeat, g_environment_tear_down_count);
+  GTEST_CHECK_INT_EQ_(0, g_should_fail_count);
+  GTEST_CHECK_INT_EQ_(repeat, g_should_pass_count);
+  GTEST_CHECK_INT_EQ_(repeat, g_death_test_count);
+#if GTEST_HAS_PARAM_TEST
+  GTEST_CHECK_INT_EQ_(repeat * kNumberOfParamTests, g_param_test_count);
+#endif  // GTEST_HAS_PARAM_TEST
+}
+
+// Tests using --gtest_repeat when --gtest_filter specifies a set of
+// failed tests.
+void TestRepeatWithFilterForFailedTests(int repeat) {
+  GTEST_FLAG(repeat) = repeat;
+  GTEST_FLAG(filter) = "*ShouldFail";
+
+  ResetCounts();
+  GTEST_CHECK_INT_EQ_(1, RUN_ALL_TESTS());
+  GTEST_CHECK_INT_EQ_(repeat, g_environment_set_up_count);
+  GTEST_CHECK_INT_EQ_(repeat, g_environment_tear_down_count);
+  GTEST_CHECK_INT_EQ_(repeat, g_should_fail_count);
+  GTEST_CHECK_INT_EQ_(0, g_should_pass_count);
+  GTEST_CHECK_INT_EQ_(0, g_death_test_count);
+#if GTEST_HAS_PARAM_TEST
+  GTEST_CHECK_INT_EQ_(0, g_param_test_count);
+#endif  // GTEST_HAS_PARAM_TEST
+}
+
+}  // namespace
+
+int main(int argc, char **argv) {
+  testing::InitGoogleTest(&argc, argv);
+  testing::AddGlobalTestEnvironment(new MyEnvironment);
+
+  TestRepeatUnspecified();
+  TestRepeat(0);
+  TestRepeat(1);
+  TestRepeat(5);
+
+  TestRepeatWithEmptyFilter(2);
+  TestRepeatWithEmptyFilter(3);
+
+  TestRepeatWithFilterForSuccessfulTests(3);
+
+  TestRepeatWithFilterForFailedTests(4);
+
+  // It would be nice to verify that the tests indeed loop forever
+  // when GTEST_FLAG(repeat) is negative, but this test will be quite
+  // complicated to write.  Since this flag is for interactive
+  // debugging only and doesn't affect the normal test result, such a
+  // test would be an overkill.
+
+  printf("PASS\n");
+  return 0;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_shuffle_test.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_shuffle_test.py
new file mode 100755
index 0000000000..30d0303d19
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_shuffle_test.py
@@ -0,0 +1,325 @@
+#!/usr/bin/env python
+#
+# Copyright 2009 Google Inc. All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Verifies that test shuffling works."""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import gtest_test_utils
+
+# Command to run the gtest_shuffle_test_ program.
+COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_shuffle_test_')
+
+# The environment variables for test sharding.
+TOTAL_SHARDS_ENV_VAR = 'GTEST_TOTAL_SHARDS'
+SHARD_INDEX_ENV_VAR = 'GTEST_SHARD_INDEX'
+
+TEST_FILTER = 'A*.A:A*.B:C*'
+
+ALL_TESTS = []
+ACTIVE_TESTS = []
+FILTERED_TESTS = []
+SHARDED_TESTS = []
+
+SHUFFLED_ALL_TESTS = []
+SHUFFLED_ACTIVE_TESTS = []
+SHUFFLED_FILTERED_TESTS = []
+SHUFFLED_SHARDED_TESTS = []
+
+
+def AlsoRunDisabledTestsFlag():
+  return '--gtest_also_run_disabled_tests'
+
+
+def FilterFlag(test_filter):
+  return '--gtest_filter=%s' % (test_filter,)
+
+
+def RepeatFlag(n):
+  return '--gtest_repeat=%s' % (n,)
+
+
+def ShuffleFlag():
+  return '--gtest_shuffle'
+
+
+def RandomSeedFlag(n):
+  return '--gtest_random_seed=%s' % (n,)
+
+
+def RunAndReturnOutput(extra_env, args):
+  """Runs the test program and returns its output."""
+
+  environ_copy = os.environ.copy()
+  environ_copy.update(extra_env)
+
+  return gtest_test_utils.Subprocess([COMMAND] + args, env=environ_copy).output
+
+
+def GetTestsForAllIterations(extra_env, args):
+  """Runs the test program and returns a list of test lists.
+
+  Args:
+    extra_env: a map from environment variables to their values
+    args: command line flags to pass to gtest_shuffle_test_
+
+  Returns:
+    A list where the i-th element is the list of tests run in the i-th
+    test iteration.
+  """
+
+  test_iterations = []
+  for line in RunAndReturnOutput(extra_env, args).split('\n'):
+    if line.startswith('----'):
+      tests = []
+      test_iterations.append(tests)
+    elif line.strip():
+      tests.append(line.strip())  # 'TestCaseName.TestName'
+
+  return test_iterations
+
+
+def GetTestCases(tests):
+  """Returns a list of test cases in the given full test names.
+
+  Args:
+    tests: a list of full test names
+
+  Returns:
+    A list of test cases from 'tests', in their original order.
+    Consecutive duplicates are removed.
+  """
+
+  test_cases = []
+  for test in tests:
+    test_case = test.split('.')[0]
+    if not test_case in test_cases:
+      test_cases.append(test_case)
+
+  return test_cases
+
+
+def CalculateTestLists():
+  """Calculates the list of tests run under different flags."""
+
+  if not ALL_TESTS:
+    ALL_TESTS.extend(
+        GetTestsForAllIterations({}, [AlsoRunDisabledTestsFlag()])[0])
+
+  if not ACTIVE_TESTS:
+    ACTIVE_TESTS.extend(GetTestsForAllIterations({}, [])[0])
+
+  if not FILTERED_TESTS:
+    FILTERED_TESTS.extend(
+        GetTestsForAllIterations({}, [FilterFlag(TEST_FILTER)])[0])
+
+  if not SHARDED_TESTS:
+    SHARDED_TESTS.extend(
+        GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
+                                  SHARD_INDEX_ENV_VAR: '1'},
+                                 [])[0])
+
+  if not SHUFFLED_ALL_TESTS:
+    SHUFFLED_ALL_TESTS.extend(GetTestsForAllIterations(
+        {}, [AlsoRunDisabledTestsFlag(), ShuffleFlag(), RandomSeedFlag(1)])[0])
+
+  if not SHUFFLED_ACTIVE_TESTS:
+    SHUFFLED_ACTIVE_TESTS.extend(GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(1)])[0])
+
+  if not SHUFFLED_FILTERED_TESTS:
+    SHUFFLED_FILTERED_TESTS.extend(GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(1), FilterFlag(TEST_FILTER)])[0])
+
+  if not SHUFFLED_SHARDED_TESTS:
+    SHUFFLED_SHARDED_TESTS.extend(
+        GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
+                                  SHARD_INDEX_ENV_VAR: '1'},
+                                 [ShuffleFlag(), RandomSeedFlag(1)])[0])
+
+
+class GTestShuffleUnitTest(gtest_test_utils.TestCase):
+  """Tests test shuffling."""
+
+  def setUp(self):
+    CalculateTestLists()
+
+  def testShufflePreservesNumberOfTests(self):
+    self.assertEqual(len(ALL_TESTS), len(SHUFFLED_ALL_TESTS))
+    self.assertEqual(len(ACTIVE_TESTS), len(SHUFFLED_ACTIVE_TESTS))
+    self.assertEqual(len(FILTERED_TESTS), len(SHUFFLED_FILTERED_TESTS))
+    self.assertEqual(len(SHARDED_TESTS), len(SHUFFLED_SHARDED_TESTS))
+
+  def testShuffleChangesTestOrder(self):
+    self.assert_(SHUFFLED_ALL_TESTS != ALL_TESTS, SHUFFLED_ALL_TESTS)
+    self.assert_(SHUFFLED_ACTIVE_TESTS != ACTIVE_TESTS, SHUFFLED_ACTIVE_TESTS)
+    self.assert_(SHUFFLED_FILTERED_TESTS != FILTERED_TESTS,
+                 SHUFFLED_FILTERED_TESTS)
+    self.assert_(SHUFFLED_SHARDED_TESTS != SHARDED_TESTS,
+                 SHUFFLED_SHARDED_TESTS)
+
+  def testShuffleChangesTestCaseOrder(self):
+    self.assert_(GetTestCases(SHUFFLED_ALL_TESTS) != GetTestCases(ALL_TESTS),
+                 GetTestCases(SHUFFLED_ALL_TESTS))
+    self.assert_(
+        GetTestCases(SHUFFLED_ACTIVE_TESTS) != GetTestCases(ACTIVE_TESTS),
+        GetTestCases(SHUFFLED_ACTIVE_TESTS))
+    self.assert_(
+        GetTestCases(SHUFFLED_FILTERED_TESTS) != GetTestCases(FILTERED_TESTS),
+        GetTestCases(SHUFFLED_FILTERED_TESTS))
+    self.assert_(
+        GetTestCases(SHUFFLED_SHARDED_TESTS) != GetTestCases(SHARDED_TESTS),
+        GetTestCases(SHUFFLED_SHARDED_TESTS))
+
+  def testShuffleDoesNotRepeatTest(self):
+    for test in SHUFFLED_ALL_TESTS:
+      self.assertEqual(1, SHUFFLED_ALL_TESTS.count(test),
+                       '%s appears more than once' % (test,))
+    for test in SHUFFLED_ACTIVE_TESTS:
+      self.assertEqual(1, SHUFFLED_ACTIVE_TESTS.count(test),
+                       '%s appears more than once' % (test,))
+    for test in SHUFFLED_FILTERED_TESTS:
+      self.assertEqual(1, SHUFFLED_FILTERED_TESTS.count(test),
+                       '%s appears more than once' % (test,))
+    for test in SHUFFLED_SHARDED_TESTS:
+      self.assertEqual(1, SHUFFLED_SHARDED_TESTS.count(test),
+                       '%s appears more than once' % (test,))
+
+  def testShuffleDoesNotCreateNewTest(self):
+    for test in SHUFFLED_ALL_TESTS:
+      self.assert_(test in ALL_TESTS, '%s is an invalid test' % (test,))
+    for test in SHUFFLED_ACTIVE_TESTS:
+      self.assert_(test in ACTIVE_TESTS, '%s is an invalid test' % (test,))
+    for test in SHUFFLED_FILTERED_TESTS:
+      self.assert_(test in FILTERED_TESTS, '%s is an invalid test' % (test,))
+    for test in SHUFFLED_SHARDED_TESTS:
+      self.assert_(test in SHARDED_TESTS, '%s is an invalid test' % (test,))
+
+  def testShuffleIncludesAllTests(self):
+    for test in ALL_TESTS:
+      self.assert_(test in SHUFFLED_ALL_TESTS, '%s is missing' % (test,))
+    for test in ACTIVE_TESTS:
+      self.assert_(test in SHUFFLED_ACTIVE_TESTS, '%s is missing' % (test,))
+    for test in FILTERED_TESTS:
+      self.assert_(test in SHUFFLED_FILTERED_TESTS, '%s is missing' % (test,))
+    for test in SHARDED_TESTS:
+      self.assert_(test in SHUFFLED_SHARDED_TESTS, '%s is missing' % (test,))
+
+  def testShuffleLeavesDeathTestsAtFront(self):
+    non_death_test_found = False
+    for test in SHUFFLED_ACTIVE_TESTS:
+      if 'DeathTest.' in test:
+        self.assert_(not non_death_test_found,
+                     '%s appears after a non-death test' % (test,))
+      else:
+        non_death_test_found = True
+
+  def _VerifyTestCasesDoNotInterleave(self, tests):
+    test_cases = []
+    for test in tests:
+      [test_case, _] = test.split('.')
+      if test_cases and test_cases[-1] != test_case:
+        test_cases.append(test_case)
+        self.assertEqual(1, test_cases.count(test_case),
+                         'Test case %s is not grouped together in %s' %
+                         (test_case, tests))
+
+  def testShuffleDoesNotInterleaveTestCases(self):
+    self._VerifyTestCasesDoNotInterleave(SHUFFLED_ALL_TESTS)
+    self._VerifyTestCasesDoNotInterleave(SHUFFLED_ACTIVE_TESTS)
+    self._VerifyTestCasesDoNotInterleave(SHUFFLED_FILTERED_TESTS)
+    self._VerifyTestCasesDoNotInterleave(SHUFFLED_SHARDED_TESTS)
+
+  def testShuffleRestoresOrderAfterEachIteration(self):
+    # Get the test lists in all 3 iterations, using random seed 1, 2,
+    # and 3 respectively.  Google Test picks a different seed in each
+    # iteration, and this test depends on the current implementation
+    # picking successive numbers.  This dependency is not ideal, but
+    # makes the test much easier to write.
+    [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (
+        GetTestsForAllIterations(
+            {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]))
+
+    # Make sure running the tests with random seed 1 gets the same
+    # order as in iteration 1 above.
+    [tests_with_seed1] = GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(1)])
+    self.assertEqual(tests_in_iteration1, tests_with_seed1)
+
+    # Make sure running the tests with random seed 2 gets the same
+    # order as in iteration 2 above.  Success means that Google Test
+    # correctly restores the test order before re-shuffling at the
+    # beginning of iteration 2.
+    [tests_with_seed2] = GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(2)])
+    self.assertEqual(tests_in_iteration2, tests_with_seed2)
+
+    # Make sure running the tests with random seed 3 gets the same
+    # order as in iteration 3 above.  Success means that Google Test
+    # correctly restores the test order before re-shuffling at the
+    # beginning of iteration 3.
+    [tests_with_seed3] = GetTestsForAllIterations(
+        {}, [ShuffleFlag(), RandomSeedFlag(3)])
+    self.assertEqual(tests_in_iteration3, tests_with_seed3)
+
+  def testShuffleGeneratesNewOrderInEachIteration(self):
+    [tests_in_iteration1, tests_in_iteration2, tests_in_iteration3] = (
+        GetTestsForAllIterations(
+            {}, [ShuffleFlag(), RandomSeedFlag(1), RepeatFlag(3)]))
+
+    self.assert_(tests_in_iteration1 != tests_in_iteration2,
+                 tests_in_iteration1)
+    self.assert_(tests_in_iteration1 != tests_in_iteration3,
+                 tests_in_iteration1)
+    self.assert_(tests_in_iteration2 != tests_in_iteration3,
+                 tests_in_iteration2)
+
+  def testShuffleShardedTestsPreservesPartition(self):
+    # If we run M tests on N shards, the same M tests should be run in
+    # total, regardless of the random seeds used by the shards.
+    [tests1] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
+                                         SHARD_INDEX_ENV_VAR: '0'},
+                                        [ShuffleFlag(), RandomSeedFlag(1)])
+    [tests2] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
+                                         SHARD_INDEX_ENV_VAR: '1'},
+                                        [ShuffleFlag(), RandomSeedFlag(20)])
+    [tests3] = GetTestsForAllIterations({TOTAL_SHARDS_ENV_VAR: '3',
+                                         SHARD_INDEX_ENV_VAR: '2'},
+                                        [ShuffleFlag(), RandomSeedFlag(25)])
+    sorted_sharded_tests = tests1 + tests2 + tests3
+    sorted_sharded_tests.sort()
+    sorted_active_tests = []
+    sorted_active_tests.extend(ACTIVE_TESTS)
+    sorted_active_tests.sort()
+    self.assertEqual(sorted_active_tests, sorted_sharded_tests)
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_shuffle_test_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_shuffle_test_.cc
new file mode 100644
index 0000000000..6fb441bd4d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_shuffle_test_.cc
@@ -0,0 +1,103 @@
+// Copyright 2009, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Verifies that test shuffling works.
+
+#include "gtest/gtest.h"
+
+namespace {
+
+using ::testing::EmptyTestEventListener;
+using ::testing::InitGoogleTest;
+using ::testing::Message;
+using ::testing::Test;
+using ::testing::TestEventListeners;
+using ::testing::TestInfo;
+using ::testing::UnitTest;
+using ::testing::internal::scoped_ptr;
+
+// The test methods are empty, as the sole purpose of this program is
+// to print the test names before/after shuffling.
+
+class A : public Test {};
+TEST_F(A, A) {}
+TEST_F(A, B) {}
+
+TEST(ADeathTest, A) {}
+TEST(ADeathTest, B) {}
+TEST(ADeathTest, C) {}
+
+TEST(B, A) {}
+TEST(B, B) {}
+TEST(B, C) {}
+TEST(B, DISABLED_D) {}
+TEST(B, DISABLED_E) {}
+
+TEST(BDeathTest, A) {}
+TEST(BDeathTest, B) {}
+
+TEST(C, A) {}
+TEST(C, B) {}
+TEST(C, C) {}
+TEST(C, DISABLED_D) {}
+
+TEST(CDeathTest, A) {}
+
+TEST(DISABLED_D, A) {}
+TEST(DISABLED_D, DISABLED_B) {}
+
+// This printer prints the full test names only, starting each test
+// iteration with a "----" marker.
+class TestNamePrinter : public EmptyTestEventListener {
+ public:
+  virtual void OnTestIterationStart(const UnitTest& /* unit_test */,
+                                    int /* iteration */) {
+    printf("----\n");
+  }
+
+  virtual void OnTestStart(const TestInfo& test_info) {
+    printf("%s.%s\n", test_info.test_case_name(), test_info.name());
+  }
+};
+
+}  // namespace
+
+int main(int argc, char **argv) {
+  InitGoogleTest(&argc, argv);
+
+  // Replaces the default printer with TestNamePrinter, which prints
+  // the test name only.
+  TestEventListeners& listeners = UnitTest::GetInstance()->listeners();
+  delete listeners.Release(listeners.default_result_printer());
+  listeners.Append(new TestNamePrinter);
+
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_sole_header_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_sole_header_test.cc
new file mode 100644
index 0000000000..ccd091a281
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_sole_header_test.cc
@@ -0,0 +1,57 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: mheule@google.com (Markus Heule)
+//
+// This test verifies that it's possible to use Google Test by including
+// the gtest.h header file alone.
+
+#include "gtest/gtest.h"
+
+namespace {
+
+void Subroutine() {
+  EXPECT_EQ(42, 42);
+}
+
+TEST(NoFatalFailureTest, ExpectNoFatalFailure) {
+  EXPECT_NO_FATAL_FAILURE(;);
+  EXPECT_NO_FATAL_FAILURE(SUCCEED());
+  EXPECT_NO_FATAL_FAILURE(Subroutine());
+  EXPECT_NO_FATAL_FAILURE({ SUCCEED(); });
+}
+
+TEST(NoFatalFailureTest, AssertNoFatalFailure) {
+  ASSERT_NO_FATAL_FAILURE(;);
+  ASSERT_NO_FATAL_FAILURE(SUCCEED());
+  ASSERT_NO_FATAL_FAILURE(Subroutine());
+  ASSERT_NO_FATAL_FAILURE({ SUCCEED(); });
+}
+
+}  // namespace
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_stress_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_stress_test.cc
new file mode 100644
index 0000000000..e7daa430df
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_stress_test.cc
@@ -0,0 +1,256 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Tests that SCOPED_TRACE() and various Google Test assertions can be
+// used in a large number of threads concurrently.
+
+#include "gtest/gtest.h"
+
+#include <iostream>
+#include <vector>
+
+// We must define this macro in order to #include
+// gtest-internal-inl.h.  This is how Google Test prevents a user from
+// accidentally depending on its internal implementation.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+#if GTEST_IS_THREADSAFE
+
+namespace testing {
+namespace {
+
+using internal::Notification;
+using internal::TestPropertyKeyIs;
+using internal::ThreadWithParam;
+using internal::scoped_ptr;
+
+// In order to run tests in this file, for platforms where Google Test is
+// thread safe, implement ThreadWithParam. See the description of its API
+// in gtest-port.h, where it is defined for already supported platforms.
+
+// How many threads to create?
+const int kThreadCount = 50;
+
+std::string IdToKey(int id, const char* suffix) {
+  Message key;
+  key << "key_" << id << "_" << suffix;
+  return key.GetString();
+}
+
+std::string IdToString(int id) {
+  Message id_message;
+  id_message << id;
+  return id_message.GetString();
+}
+
+void ExpectKeyAndValueWereRecordedForId(
+    const std::vector<TestProperty>& properties,
+    int id, const char* suffix) {
+  TestPropertyKeyIs matches_key(IdToKey(id, suffix).c_str());
+  const std::vector<TestProperty>::const_iterator property =
+      std::find_if(properties.begin(), properties.end(), matches_key);
+  ASSERT_TRUE(property != properties.end())
+      << "expecting " << suffix << " value for id " << id;
+  EXPECT_STREQ(IdToString(id).c_str(), property->value());
+}
+
+// Calls a large number of Google Test assertions, where exactly one of them
+// will fail.
+void ManyAsserts(int id) {
+  GTEST_LOG_(INFO) << "Thread #" << id << " running...";
+
+  SCOPED_TRACE(Message() << "Thread #" << id);
+
+  for (int i = 0; i < kThreadCount; i++) {
+    SCOPED_TRACE(Message() << "Iteration #" << i);
+
+    // A bunch of assertions that should succeed.
+    EXPECT_TRUE(true);
+    ASSERT_FALSE(false) << "This shouldn't fail.";
+    EXPECT_STREQ("a", "a");
+    ASSERT_LE(5, 6);
+    EXPECT_EQ(i, i) << "This shouldn't fail.";
+
+    // RecordProperty() should interact safely with other threads as well.
+    // The shared_key forces property updates.
+    Test::RecordProperty(IdToKey(id, "string").c_str(), IdToString(id).c_str());
+    Test::RecordProperty(IdToKey(id, "int").c_str(), id);
+    Test::RecordProperty("shared_key", IdToString(id).c_str());
+
+    // This assertion should fail kThreadCount times per thread.  It
+    // is for testing whether Google Test can handle failed assertions in a
+    // multi-threaded context.
+    EXPECT_LT(i, 0) << "This should always fail.";
+  }
+}
+
+void CheckTestFailureCount(int expected_failures) {
+  const TestInfo* const info = UnitTest::GetInstance()->current_test_info();
+  const TestResult* const result = info->result();
+  GTEST_CHECK_(expected_failures == result->total_part_count())
+      << "Logged " << result->total_part_count() << " failures "
+      << " vs. " << expected_failures << " expected";
+}
+
+// Tests using SCOPED_TRACE() and Google Test assertions in many threads
+// concurrently.
+TEST(StressTest, CanUseScopedTraceAndAssertionsInManyThreads) {
+  {
+    scoped_ptr<ThreadWithParam<int> > threads[kThreadCount];
+    Notification threads_can_start;
+    for (int i = 0; i != kThreadCount; i++)
+      threads[i].reset(new ThreadWithParam<int>(&ManyAsserts,
+                                                i,
+                                                &threads_can_start));
+
+    threads_can_start.Notify();
+
+    // Blocks until all the threads are done.
+    for (int i = 0; i != kThreadCount; i++)
+      threads[i]->Join();
+  }
+
+  // Ensures that kThreadCount*kThreadCount failures have been reported.
+  const TestInfo* const info = UnitTest::GetInstance()->current_test_info();
+  const TestResult* const result = info->result();
+
+  std::vector<TestProperty> properties;
+  // We have no access to the TestResult's list of properties but we can
+  // copy them one by one.
+  for (int i = 0; i < result->test_property_count(); ++i)
+    properties.push_back(result->GetTestProperty(i));
+
+  EXPECT_EQ(kThreadCount * 2 + 1, result->test_property_count())
+      << "String and int values recorded on each thread, "
+      << "as well as one shared_key";
+  for (int i = 0; i < kThreadCount; ++i) {
+    ExpectKeyAndValueWereRecordedForId(properties, i, "string");
+    ExpectKeyAndValueWereRecordedForId(properties, i, "int");
+  }
+  CheckTestFailureCount(kThreadCount*kThreadCount);
+}
+
+void FailingThread(bool is_fatal) {
+  if (is_fatal)
+    FAIL() << "Fatal failure in some other thread. "
+           << "(This failure is expected.)";
+  else
+    ADD_FAILURE() << "Non-fatal failure in some other thread. "
+                  << "(This failure is expected.)";
+}
+
+void GenerateFatalFailureInAnotherThread(bool is_fatal) {
+  ThreadWithParam<bool> thread(&FailingThread, is_fatal, NULL);
+  thread.Join();
+}
+
+TEST(NoFatalFailureTest, ExpectNoFatalFailureIgnoresFailuresInOtherThreads) {
+  EXPECT_NO_FATAL_FAILURE(GenerateFatalFailureInAnotherThread(true));
+  // We should only have one failure (the one from
+  // GenerateFatalFailureInAnotherThread()), since the EXPECT_NO_FATAL_FAILURE
+  // should succeed.
+  CheckTestFailureCount(1);
+}
+
+void AssertNoFatalFailureIgnoresFailuresInOtherThreads() {
+  ASSERT_NO_FATAL_FAILURE(GenerateFatalFailureInAnotherThread(true));
+}
+TEST(NoFatalFailureTest, AssertNoFatalFailureIgnoresFailuresInOtherThreads) {
+  // Using a subroutine, to make sure, that the test continues.
+  AssertNoFatalFailureIgnoresFailuresInOtherThreads();
+  // We should only have one failure (the one from
+  // GenerateFatalFailureInAnotherThread()), since the EXPECT_NO_FATAL_FAILURE
+  // should succeed.
+  CheckTestFailureCount(1);
+}
+
+TEST(FatalFailureTest, ExpectFatalFailureIgnoresFailuresInOtherThreads) {
+  // This statement should fail, since the current thread doesn't generate a
+  // fatal failure, only another one does.
+  EXPECT_FATAL_FAILURE(GenerateFatalFailureInAnotherThread(true), "expected");
+  CheckTestFailureCount(2);
+}
+
+TEST(FatalFailureOnAllThreadsTest, ExpectFatalFailureOnAllThreads) {
+  // This statement should succeed, because failures in all threads are
+  // considered.
+  EXPECT_FATAL_FAILURE_ON_ALL_THREADS(
+      GenerateFatalFailureInAnotherThread(true), "expected");
+  CheckTestFailureCount(0);
+  // We need to add a failure, because main() checks that there are failures.
+  // But when only this test is run, we shouldn't have any failures.
+  ADD_FAILURE() << "This is an expected non-fatal failure.";
+}
+
+TEST(NonFatalFailureTest, ExpectNonFatalFailureIgnoresFailuresInOtherThreads) {
+  // This statement should fail, since the current thread doesn't generate a
+  // fatal failure, only another one does.
+  EXPECT_NONFATAL_FAILURE(GenerateFatalFailureInAnotherThread(false),
+                          "expected");
+  CheckTestFailureCount(2);
+}
+
+TEST(NonFatalFailureOnAllThreadsTest, ExpectNonFatalFailureOnAllThreads) {
+  // This statement should succeed, because failures in all threads are
+  // considered.
+  EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(
+      GenerateFatalFailureInAnotherThread(false), "expected");
+  CheckTestFailureCount(0);
+  // We need to add a failure, because main() checks that there are failures,
+  // But when only this test is run, we shouldn't have any failures.
+  ADD_FAILURE() << "This is an expected non-fatal failure.";
+}
+
+}  // namespace
+}  // namespace testing
+
+int main(int argc, char **argv) {
+  testing::InitGoogleTest(&argc, argv);
+
+  const int result = RUN_ALL_TESTS();  // Expected to fail.
+  GTEST_CHECK_(result == 1) << "RUN_ALL_TESTS() did not fail as expected";
+
+  printf("\nPASS\n");
+  return 0;
+}
+
+#else
+TEST(StressTest,
+     DISABLED_ThreadSafetyTestsAreSkippedWhenGoogleTestIsNotThreadSafe) {
+}
+
+int main(int argc, char **argv) {
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+#endif  // GTEST_IS_THREADSAFE
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_test_utils.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_test_utils.py
new file mode 100755
index 0000000000..4acd36c975
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_test_utils.py
@@ -0,0 +1,320 @@
+#!/usr/bin/env python
+#
+# Copyright 2006, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test utilities for Google C++ Testing Framework."""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import atexit
+import os
+import shutil
+import sys
+import tempfile
+import unittest
+_test_module = unittest
+
+# Suppresses the 'Import not at the top of the file' lint complaint.
+# pylint: disable-msg=C6204
+try:
+  import subprocess
+  _SUBPROCESS_MODULE_AVAILABLE = True
+except:
+  import popen2
+  _SUBPROCESS_MODULE_AVAILABLE = False
+# pylint: enable-msg=C6204
+
+GTEST_OUTPUT_VAR_NAME = 'GTEST_OUTPUT'
+
+IS_WINDOWS = os.name == 'nt'
+IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0]
+
+# The environment variable for specifying the path to the premature-exit file.
+PREMATURE_EXIT_FILE_ENV_VAR = 'TEST_PREMATURE_EXIT_FILE'
+
+environ = os.environ.copy()
+
+
+def SetEnvVar(env_var, value):
+  """Sets/unsets an environment variable to a given value."""
+
+  if value is not None:
+    environ[env_var] = value
+  elif env_var in environ:
+    del environ[env_var]
+
+
+# Here we expose a class from a particular module, depending on the
+# environment. The comment suppresses the 'Invalid variable name' lint
+# complaint.
+TestCase = _test_module.TestCase  # pylint: disable-msg=C6409
+
+# Initially maps a flag to its default value. After
+# _ParseAndStripGTestFlags() is called, maps a flag to its actual value.
+_flag_map = {'source_dir': os.path.dirname(sys.argv[0]),
+             'build_dir': os.path.dirname(sys.argv[0])}
+_gtest_flags_are_parsed = False
+
+
+def _ParseAndStripGTestFlags(argv):
+  """Parses and strips Google Test flags from argv.  This is idempotent."""
+
+  # Suppresses the lint complaint about a global variable since we need it
+  # here to maintain module-wide state.
+  global _gtest_flags_are_parsed  # pylint: disable-msg=W0603
+  if _gtest_flags_are_parsed:
+    return
+
+  _gtest_flags_are_parsed = True
+  for flag in _flag_map:
+    # The environment variable overrides the default value.
+    if flag.upper() in os.environ:
+      _flag_map[flag] = os.environ[flag.upper()]
+
+    # The command line flag overrides the environment variable.
+    i = 1  # Skips the program name.
+    while i < len(argv):
+      prefix = '--' + flag + '='
+      if argv[i].startswith(prefix):
+        _flag_map[flag] = argv[i][len(prefix):]
+        del argv[i]
+        break
+      else:
+        # We don't increment i in case we just found a --gtest_* flag
+        # and removed it from argv.
+        i += 1
+
+
+def GetFlag(flag):
+  """Returns the value of the given flag."""
+
+  # In case GetFlag() is called before Main(), we always call
+  # _ParseAndStripGTestFlags() here to make sure the --gtest_* flags
+  # are parsed.
+  _ParseAndStripGTestFlags(sys.argv)
+
+  return _flag_map[flag]
+
+
+def GetSourceDir():
+  """Returns the absolute path of the directory where the .py files are."""
+
+  return os.path.abspath(GetFlag('source_dir'))
+
+
+def GetBuildDir():
+  """Returns the absolute path of the directory where the test binaries are."""
+
+  return os.path.abspath(GetFlag('build_dir'))
+
+
+_temp_dir = None
+
+def _RemoveTempDir():
+  if _temp_dir:
+    shutil.rmtree(_temp_dir, ignore_errors=True)
+
+atexit.register(_RemoveTempDir)
+
+
+def GetTempDir():
+  """Returns a directory for temporary files."""
+
+  global _temp_dir
+  if not _temp_dir:
+    _temp_dir = tempfile.mkdtemp()
+  return _temp_dir
+
+
+def GetTestExecutablePath(executable_name, build_dir=None):
+  """Returns the absolute path of the test binary given its name.
+
+  The function will print a message and abort the program if the resulting file
+  doesn't exist.
+
+  Args:
+    executable_name: name of the test binary that the test script runs.
+    build_dir:       directory where to look for executables, by default
+                     the result of GetBuildDir().
+
+  Returns:
+    The absolute path of the test binary.
+  """
+
+  path = os.path.abspath(os.path.join(build_dir or GetBuildDir(),
+                                      executable_name))
+  if (IS_WINDOWS or IS_CYGWIN) and not path.endswith('.exe'):
+    path += '.exe'
+
+  if not os.path.exists(path):
+    message = (
+        'Unable to find the test binary "%s". Please make sure to provide\n'
+        'a path to the binary via the --build_dir flag or the BUILD_DIR\n'
+        'environment variable.' % path)
+    sys.stdout.write(message)
+    sys.exit(1)
+
+  return path
+
+
+def GetExitStatus(exit_code):
+  """Returns the argument to exit(), or -1 if exit() wasn't called.
+
+  Args:
+    exit_code: the result value of os.system(command).
+  """
+
+  if os.name == 'nt':
+    # On Windows, os.WEXITSTATUS() doesn't work and os.system() returns
+    # the argument to exit() directly.
+    return exit_code
+  else:
+    # On Unix, os.WEXITSTATUS() must be used to extract the exit status
+    # from the result of os.system().
+    if os.WIFEXITED(exit_code):
+      return os.WEXITSTATUS(exit_code)
+    else:
+      return -1
+
+
+class Subprocess:
+  def __init__(self, command, working_dir=None, capture_stderr=True, env=None):
+    """Changes into a specified directory, if provided, and executes a command.
+
+    Restores the old directory afterwards.
+
+    Args:
+      command:        The command to run, in the form of sys.argv.
+      working_dir:    The directory to change into.
+      capture_stderr: Determines whether to capture stderr in the output member
+                      or to discard it.
+      env:            Dictionary with environment to pass to the subprocess.
+
+    Returns:
+      An object that represents outcome of the executed process. It has the
+      following attributes:
+        terminated_by_signal   True iff the child process has been terminated
+                               by a signal.
+        signal                 Sygnal that terminated the child process.
+        exited                 True iff the child process exited normally.
+        exit_code              The code with which the child process exited.
+        output                 Child process's stdout and stderr output
+                               combined in a string.
+    """
+
+    # The subprocess module is the preferrable way of running programs
+    # since it is available and behaves consistently on all platforms,
+    # including Windows. But it is only available starting in python 2.4.
+    # In earlier python versions, we revert to the popen2 module, which is
+    # available in python 2.0 and later but doesn't provide required
+    # functionality (Popen4) under Windows. This allows us to support Mac
+    # OS X 10.4 Tiger, which has python 2.3 installed.
+    if _SUBPROCESS_MODULE_AVAILABLE:
+      if capture_stderr:
+        stderr = subprocess.STDOUT
+      else:
+        stderr = subprocess.PIPE
+
+      p = subprocess.Popen(command,
+                           stdout=subprocess.PIPE, stderr=stderr,
+                           cwd=working_dir, universal_newlines=True, env=env)
+      # communicate returns a tuple with the file obect for the child's
+      # output.
+      self.output = p.communicate()[0]
+      self._return_code = p.returncode
+    else:
+      old_dir = os.getcwd()
+
+      def _ReplaceEnvDict(dest, src):
+        # Changes made by os.environ.clear are not inheritable by child
+        # processes until Python 2.6. To produce inheritable changes we have
+        # to delete environment items with the del statement.
+        for key in dest.keys():
+          del dest[key]
+        dest.update(src)
+
+      # When 'env' is not None, backup the environment variables and replace
+      # them with the passed 'env'. When 'env' is None, we simply use the
+      # current 'os.environ' for compatibility with the subprocess.Popen
+      # semantics used above.
+      if env is not None:
+        old_environ = os.environ.copy()
+        _ReplaceEnvDict(os.environ, env)
+
+      try:
+        if working_dir is not None:
+          os.chdir(working_dir)
+        if capture_stderr:
+          p = popen2.Popen4(command)
+        else:
+          p = popen2.Popen3(command)
+        p.tochild.close()
+        self.output = p.fromchild.read()
+        ret_code = p.wait()
+      finally:
+        os.chdir(old_dir)
+
+        # Restore the old environment variables
+        # if they were replaced.
+        if env is not None:
+          _ReplaceEnvDict(os.environ, old_environ)
+
+      # Converts ret_code to match the semantics of
+      # subprocess.Popen.returncode.
+      if os.WIFSIGNALED(ret_code):
+        self._return_code = -os.WTERMSIG(ret_code)
+      else:  # os.WIFEXITED(ret_code) should return True here.
+        self._return_code = os.WEXITSTATUS(ret_code)
+
+    if self._return_code < 0:
+      self.terminated_by_signal = True
+      self.exited = False
+      self.signal = -self._return_code
+    else:
+      self.terminated_by_signal = False
+      self.exited = True
+      self.exit_code = self._return_code
+
+
+def Main():
+  """Runs the unit test."""
+
+  # We must call _ParseAndStripGTestFlags() before calling
+  # unittest.main().  Otherwise the latter will be confused by the
+  # --gtest_* flags.
+  _ParseAndStripGTestFlags(sys.argv)
+  # The tested binaries should not be writing XML output files unless the
+  # script explicitly instructs them to.
+  # TODO(vladl@google.com): Move this into Subprocess when we implement
+  # passing environment into it as a parameter.
+  if GTEST_OUTPUT_VAR_NAME in os.environ:
+    del os.environ[GTEST_OUTPUT_VAR_NAME]
+
+  _test_module.main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_throw_on_failure_ex_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_throw_on_failure_ex_test.cc
new file mode 100644
index 0000000000..8d46c76f16
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_throw_on_failure_ex_test.cc
@@ -0,0 +1,92 @@
+// Copyright 2009, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Tests Google Test's throw-on-failure mode with exceptions enabled.
+
+#include "gtest/gtest.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdexcept>
+
+// Prints the given failure message and exits the program with
+// non-zero.  We use this instead of a Google Test assertion to
+// indicate a failure, as the latter is been tested and cannot be
+// relied on.
+void Fail(const char* msg) {
+  printf("FAILURE: %s\n", msg);
+  fflush(stdout);
+  exit(1);
+}
+
+// Tests that an assertion failure throws a subclass of
+// std::runtime_error.
+void TestFailureThrowsRuntimeError() {
+  testing::GTEST_FLAG(throw_on_failure) = true;
+
+  // A successful assertion shouldn't throw.
+  try {
+    EXPECT_EQ(3, 3);
+  } catch(...) {
+    Fail("A successful assertion wrongfully threw.");
+  }
+
+  // A failed assertion should throw a subclass of std::runtime_error.
+  try {
+    EXPECT_EQ(2, 3) << "Expected failure";
+  } catch(const std::runtime_error& e) {
+    if (strstr(e.what(), "Expected failure") != NULL)
+      return;
+
+    printf("%s",
+           "A failed assertion did throw an exception of the right type, "
+           "but the message is incorrect.  Instead of containing \"Expected "
+           "failure\", it is:\n");
+    Fail(e.what());
+  } catch(...) {
+    Fail("A failed assertion threw the wrong type of exception.");
+  }
+  Fail("A failed assertion should've thrown but didn't.");
+}
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+
+  // We want to ensure that people can use Google Test assertions in
+  // other testing frameworks, as long as they initialize Google Test
+  // properly and set the thrown-on-failure mode.  Therefore, we don't
+  // use Google Test's constructs for defining and running tests
+  // (e.g. TEST and RUN_ALL_TESTS) here.
+
+  TestFailureThrowsRuntimeError();
+  return 0;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_throw_on_failure_test.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_throw_on_failure_test.py
new file mode 100755
index 0000000000..3e7740cabb
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_throw_on_failure_test.py
@@ -0,0 +1,171 @@
+#!/usr/bin/env python
+#
+# Copyright 2009, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Tests Google Test's throw-on-failure mode with exceptions disabled.
+
+This script invokes gtest_throw_on_failure_test_ (a program written with
+Google Test) with different environments and command line flags.
+"""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import os
+import gtest_test_utils
+
+
+# Constants.
+
+# The command line flag for enabling/disabling the throw-on-failure mode.
+THROW_ON_FAILURE = 'gtest_throw_on_failure'
+
+# Path to the gtest_throw_on_failure_test_ program, compiled with
+# exceptions disabled.
+EXE_PATH = gtest_test_utils.GetTestExecutablePath(
+    'gtest_throw_on_failure_test_')
+
+
+# Utilities.
+
+
+def SetEnvVar(env_var, value):
+  """Sets an environment variable to a given value; unsets it when the
+  given value is None.
+  """
+
+  env_var = env_var.upper()
+  if value is not None:
+    os.environ[env_var] = value
+  elif env_var in os.environ:
+    del os.environ[env_var]
+
+
+def Run(command):
+  """Runs a command; returns True/False if its exit code is/isn't 0."""
+
+  print('Running "%s". . .' % ' '.join(command))
+  p = gtest_test_utils.Subprocess(command)
+  return p.exited and p.exit_code == 0
+
+
+# The tests.  TODO(wan@google.com): refactor the class to share common
+# logic with code in gtest_break_on_failure_unittest.py.
+class ThrowOnFailureTest(gtest_test_utils.TestCase):
+  """Tests the throw-on-failure mode."""
+
+  def RunAndVerify(self, env_var_value, flag_value, should_fail):
+    """Runs gtest_throw_on_failure_test_ and verifies that it does
+    (or does not) exit with a non-zero code.
+
+    Args:
+      env_var_value:    value of the GTEST_BREAK_ON_FAILURE environment
+                        variable; None if the variable should be unset.
+      flag_value:       value of the --gtest_break_on_failure flag;
+                        None if the flag should not be present.
+      should_fail:      True iff the program is expected to fail.
+    """
+
+    SetEnvVar(THROW_ON_FAILURE, env_var_value)
+
+    if env_var_value is None:
+      env_var_value_msg = ' is not set'
+    else:
+      env_var_value_msg = '=' + env_var_value
+
+    if flag_value is None:
+      flag = ''
+    elif flag_value == '0':
+      flag = '--%s=0' % THROW_ON_FAILURE
+    else:
+      flag = '--%s' % THROW_ON_FAILURE
+
+    command = [EXE_PATH]
+    if flag:
+      command.append(flag)
+
+    if should_fail:
+      should_or_not = 'should'
+    else:
+      should_or_not = 'should not'
+
+    failed = not Run(command)
+
+    SetEnvVar(THROW_ON_FAILURE, None)
+
+    msg = ('when %s%s, an assertion failure in "%s" %s cause a non-zero '
+           'exit code.' %
+           (THROW_ON_FAILURE, env_var_value_msg, ' '.join(command),
+            should_or_not))
+    self.assert_(failed == should_fail, msg)
+
+  def testDefaultBehavior(self):
+    """Tests the behavior of the default mode."""
+
+    self.RunAndVerify(env_var_value=None, flag_value=None, should_fail=False)
+
+  def testThrowOnFailureEnvVar(self):
+    """Tests using the GTEST_THROW_ON_FAILURE environment variable."""
+
+    self.RunAndVerify(env_var_value='0',
+                      flag_value=None,
+                      should_fail=False)
+    self.RunAndVerify(env_var_value='1',
+                      flag_value=None,
+                      should_fail=True)
+
+  def testThrowOnFailureFlag(self):
+    """Tests using the --gtest_throw_on_failure flag."""
+
+    self.RunAndVerify(env_var_value=None,
+                      flag_value='0',
+                      should_fail=False)
+    self.RunAndVerify(env_var_value=None,
+                      flag_value='1',
+                      should_fail=True)
+
+  def testThrowOnFailureFlagOverridesEnvVar(self):
+    """Tests that --gtest_throw_on_failure overrides GTEST_THROW_ON_FAILURE."""
+
+    self.RunAndVerify(env_var_value='0',
+                      flag_value='0',
+                      should_fail=False)
+    self.RunAndVerify(env_var_value='0',
+                      flag_value='1',
+                      should_fail=True)
+    self.RunAndVerify(env_var_value='1',
+                      flag_value='0',
+                      should_fail=False)
+    self.RunAndVerify(env_var_value='1',
+                      flag_value='1',
+                      should_fail=True)
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_throw_on_failure_test_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_throw_on_failure_test_.cc
new file mode 100644
index 0000000000..2b88fe3d9b
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_throw_on_failure_test_.cc
@@ -0,0 +1,72 @@
+// Copyright 2009, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+// Tests Google Test's throw-on-failure mode with exceptions disabled.
+//
+// This program must be compiled with exceptions disabled.  It will be
+// invoked by gtest_throw_on_failure_test.py, and is expected to exit
+// with non-zero in the throw-on-failure mode or 0 otherwise.
+
+#include "gtest/gtest.h"
+
+#include <stdio.h>                      // for fflush, fprintf, NULL, etc.
+#include <stdlib.h>                     // for exit
+#include <exception>                    // for set_terminate
+
+// This terminate handler aborts the program using exit() rather than abort().
+// This avoids showing pop-ups on Windows systems and core dumps on Unix-like
+// ones.
+void TerminateHandler() {
+  fprintf(stderr, "%s\n", "Unhandled C++ exception terminating the program.");
+  fflush(NULL);
+  exit(1);
+}
+
+int main(int argc, char** argv) {
+#if GTEST_HAS_EXCEPTIONS
+  std::set_terminate(&TerminateHandler);
+#endif
+  testing::InitGoogleTest(&argc, argv);
+
+  // We want to ensure that people can use Google Test assertions in
+  // other testing frameworks, as long as they initialize Google Test
+  // properly and set the throw-on-failure mode.  Therefore, we don't
+  // use Google Test's constructs for defining and running tests
+  // (e.g. TEST and RUN_ALL_TESTS) here.
+
+  // In the throw-on-failure mode with exceptions disabled, this
+  // assertion will cause the program to exit with a non-zero code.
+  EXPECT_EQ(2, 3);
+
+  // When not in the throw-on-failure mode, the control will reach
+  // here.
+  return 0;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_uninitialized_test.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_uninitialized_test.py
new file mode 100755
index 0000000000..4358370097
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_uninitialized_test.py
@@ -0,0 +1,70 @@
+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Verifies that Google Test warns the user when not initialized properly."""
+
+__author__ = 'wan@google.com (Zhanyong Wan)'
+
+import gtest_test_utils
+
+
+COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_')
+
+
+def Assert(condition):
+  if not condition:
+    raise AssertionError
+
+
+def AssertEq(expected, actual):
+  if expected != actual:
+    print('Expected: %s' % (expected,))
+    print('  Actual: %s' % (actual,))
+    raise AssertionError
+
+
+def TestExitCodeAndOutput(command):
+  """Runs the given command and verifies its exit code and output."""
+
+  # Verifies that 'command' exits with code 1.
+  p = gtest_test_utils.Subprocess(command)
+  Assert(p.exited)
+  AssertEq(1, p.exit_code)
+  Assert('InitGoogleTest' in p.output)
+
+
+class GTestUninitializedTest(gtest_test_utils.TestCase):
+  def testExitCodeAndOutput(self):
+    TestExitCodeAndOutput(COMMAND)
+
+
+if __name__ == '__main__':
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_uninitialized_test_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_uninitialized_test_.cc
new file mode 100644
index 0000000000..44316987fb
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_uninitialized_test_.cc
@@ -0,0 +1,43 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+
+#include "gtest/gtest.h"
+
+TEST(DummyTest, Dummy) {
+  // This test doesn't verify anything.  We just need it to create a
+  // realistic stage for testing the behavior of Google Test when
+  // RUN_ALL_TESTS() is called without testing::InitGoogleTest() being
+  // called first.
+}
+
+int main() {
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_unittest.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_unittest.cc
new file mode 100644
index 0000000000..88e94134b9
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_unittest.cc
@@ -0,0 +1,7706 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// Tests for Google Test itself.  This verifies that the basic constructs of
+// Google Test work.
+
+#include "gtest/gtest.h"
+
+// Verifies that the command line flag variables can be accessed
+// in code once <gtest/gtest.h> has been #included.
+// Do not move it after other #includes.
+TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) {
+  bool dummy = testing::GTEST_FLAG(also_run_disabled_tests)
+      || testing::GTEST_FLAG(break_on_failure)
+      || testing::GTEST_FLAG(catch_exceptions)
+      || testing::GTEST_FLAG(color) != "unknown"
+      || testing::GTEST_FLAG(filter) != "unknown"
+      || testing::GTEST_FLAG(list_tests)
+      || testing::GTEST_FLAG(output) != "unknown"
+      || testing::GTEST_FLAG(print_time)
+      || testing::GTEST_FLAG(random_seed)
+      || testing::GTEST_FLAG(repeat) > 0
+      || testing::GTEST_FLAG(show_internal_stack_frames)
+      || testing::GTEST_FLAG(shuffle)
+      || testing::GTEST_FLAG(stack_trace_depth) > 0
+      || testing::GTEST_FLAG(stream_result_to) != "unknown"
+      || testing::GTEST_FLAG(throw_on_failure);
+  EXPECT_TRUE(dummy || !dummy);  // Suppresses warning that dummy is unused.
+}
+
+#include <limits.h>  // For INT_MAX.
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include <map>
+#include <vector>
+#include <ostream>
+
+#include "gtest/gtest-spi.h"
+
+// Indicates that this translation unit is part of Google Test's
+// implementation.  It must come before gtest-internal-inl.h is
+// included, or there will be a compiler error.  This trick is to
+// prevent a user from accidentally including gtest-internal-inl.h in
+// his code.
+#define GTEST_IMPLEMENTATION_ 1
+#include "src/gtest-internal-inl.h"
+#undef GTEST_IMPLEMENTATION_
+
+namespace testing {
+namespace internal {
+
+#if GTEST_CAN_STREAM_RESULTS_
+
+class StreamingListenerTest : public Test {
+ public:
+  class FakeSocketWriter : public StreamingListener::AbstractSocketWriter {
+   public:
+    // Sends a string to the socket.
+    virtual void Send(const string& message) { output_ += message; }
+
+    string output_;
+  };
+
+  StreamingListenerTest()
+      : fake_sock_writer_(new FakeSocketWriter),
+        streamer_(fake_sock_writer_),
+        test_info_obj_("FooTest", "Bar", NULL, NULL,
+                       CodeLocation(__FILE__, __LINE__), 0, NULL) {}
+
+ protected:
+  string* output() { return &(fake_sock_writer_->output_); }
+
+  FakeSocketWriter* const fake_sock_writer_;
+  StreamingListener streamer_;
+  UnitTest unit_test_;
+  TestInfo test_info_obj_;  // The name test_info_ was taken by testing::Test.
+};
+
+TEST_F(StreamingListenerTest, OnTestProgramEnd) {
+  *output() = "";
+  streamer_.OnTestProgramEnd(unit_test_);
+  EXPECT_EQ("event=TestProgramEnd&passed=1\n", *output());
+}
+
+TEST_F(StreamingListenerTest, OnTestIterationEnd) {
+  *output() = "";
+  streamer_.OnTestIterationEnd(unit_test_, 42);
+  EXPECT_EQ("event=TestIterationEnd&passed=1&elapsed_time=0ms\n", *output());
+}
+
+TEST_F(StreamingListenerTest, OnTestCaseStart) {
+  *output() = "";
+  streamer_.OnTestCaseStart(TestCase("FooTest", "Bar", NULL, NULL));
+  EXPECT_EQ("event=TestCaseStart&name=FooTest\n", *output());
+}
+
+TEST_F(StreamingListenerTest, OnTestCaseEnd) {
+  *output() = "";
+  streamer_.OnTestCaseEnd(TestCase("FooTest", "Bar", NULL, NULL));
+  EXPECT_EQ("event=TestCaseEnd&passed=1&elapsed_time=0ms\n", *output());
+}
+
+TEST_F(StreamingListenerTest, OnTestStart) {
+  *output() = "";
+  streamer_.OnTestStart(test_info_obj_);
+  EXPECT_EQ("event=TestStart&name=Bar\n", *output());
+}
+
+TEST_F(StreamingListenerTest, OnTestEnd) {
+  *output() = "";
+  streamer_.OnTestEnd(test_info_obj_);
+  EXPECT_EQ("event=TestEnd&passed=1&elapsed_time=0ms\n", *output());
+}
+
+TEST_F(StreamingListenerTest, OnTestPartResult) {
+  *output() = "";
+  streamer_.OnTestPartResult(TestPartResult(
+      TestPartResult::kFatalFailure, "foo.cc", 42, "failed=\n&%"));
+
+  // Meta characters in the failure message should be properly escaped.
+  EXPECT_EQ(
+      "event=TestPartResult&file=foo.cc&line=42&message=failed%3D%0A%26%25\n",
+      *output());
+}
+
+#endif  // GTEST_CAN_STREAM_RESULTS_
+
+// Provides access to otherwise private parts of the TestEventListeners class
+// that are needed to test it.
+class TestEventListenersAccessor {
+ public:
+  static TestEventListener* GetRepeater(TestEventListeners* listeners) {
+    return listeners->repeater();
+  }
+
+  static void SetDefaultResultPrinter(TestEventListeners* listeners,
+                                      TestEventListener* listener) {
+    listeners->SetDefaultResultPrinter(listener);
+  }
+  static void SetDefaultXmlGenerator(TestEventListeners* listeners,
+                                     TestEventListener* listener) {
+    listeners->SetDefaultXmlGenerator(listener);
+  }
+
+  static bool EventForwardingEnabled(const TestEventListeners& listeners) {
+    return listeners.EventForwardingEnabled();
+  }
+
+  static void SuppressEventForwarding(TestEventListeners* listeners) {
+    listeners->SuppressEventForwarding();
+  }
+};
+
+class UnitTestRecordPropertyTestHelper : public Test {
+ protected:
+  UnitTestRecordPropertyTestHelper() {}
+
+  // Forwards to UnitTest::RecordProperty() to bypass access controls.
+  void UnitTestRecordProperty(const char* key, const std::string& value) {
+    unit_test_.RecordProperty(key, value);
+  }
+
+  UnitTest unit_test_;
+};
+
+}  // namespace internal
+}  // namespace testing
+
+using testing::AssertionFailure;
+using testing::AssertionResult;
+using testing::AssertionSuccess;
+using testing::DoubleLE;
+using testing::EmptyTestEventListener;
+using testing::Environment;
+using testing::FloatLE;
+using testing::GTEST_FLAG(also_run_disabled_tests);
+using testing::GTEST_FLAG(break_on_failure);
+using testing::GTEST_FLAG(catch_exceptions);
+using testing::GTEST_FLAG(color);
+using testing::GTEST_FLAG(death_test_use_fork);
+using testing::GTEST_FLAG(filter);
+using testing::GTEST_FLAG(list_tests);
+using testing::GTEST_FLAG(output);
+using testing::GTEST_FLAG(print_time);
+using testing::GTEST_FLAG(random_seed);
+using testing::GTEST_FLAG(repeat);
+using testing::GTEST_FLAG(show_internal_stack_frames);
+using testing::GTEST_FLAG(shuffle);
+using testing::GTEST_FLAG(stack_trace_depth);
+using testing::GTEST_FLAG(stream_result_to);
+using testing::GTEST_FLAG(throw_on_failure);
+using testing::IsNotSubstring;
+using testing::IsSubstring;
+using testing::Message;
+using testing::ScopedFakeTestPartResultReporter;
+using testing::StaticAssertTypeEq;
+using testing::Test;
+using testing::TestCase;
+using testing::TestEventListeners;
+using testing::TestInfo;
+using testing::TestPartResult;
+using testing::TestPartResultArray;
+using testing::TestProperty;
+using testing::TestResult;
+using testing::TimeInMillis;
+using testing::UnitTest;
+using testing::internal::AddReference;
+using testing::internal::AlwaysFalse;
+using testing::internal::AlwaysTrue;
+using testing::internal::AppendUserMessage;
+using testing::internal::ArrayAwareFind;
+using testing::internal::ArrayEq;
+using testing::internal::CodePointToUtf8;
+using testing::internal::CompileAssertTypesEqual;
+using testing::internal::CopyArray;
+using testing::internal::CountIf;
+using testing::internal::EqFailure;
+using testing::internal::FloatingPoint;
+using testing::internal::ForEach;
+using testing::internal::FormatEpochTimeInMillisAsIso8601;
+using testing::internal::FormatTimeInMillisAsSeconds;
+using testing::internal::GTestFlagSaver;
+using testing::internal::GetCurrentOsStackTraceExceptTop;
+using testing::internal::GetElementOr;
+using testing::internal::GetNextRandomSeed;
+using testing::internal::GetRandomSeedFromFlag;
+using testing::internal::GetTestTypeId;
+using testing::internal::GetTimeInMillis;
+using testing::internal::GetTypeId;
+using testing::internal::GetUnitTestImpl;
+using testing::internal::ImplicitlyConvertible;
+using testing::internal::Int32;
+using testing::internal::Int32FromEnvOrDie;
+using testing::internal::IsAProtocolMessage;
+using testing::internal::IsContainer;
+using testing::internal::IsContainerTest;
+using testing::internal::IsNotContainer;
+using testing::internal::NativeArray;
+using testing::internal::ParseInt32Flag;
+using testing::internal::RelationToSourceCopy;
+using testing::internal::RelationToSourceReference;
+using testing::internal::RemoveConst;
+using testing::internal::RemoveReference;
+using testing::internal::ShouldRunTestOnShard;
+using testing::internal::ShouldShard;
+using testing::internal::ShouldUseColor;
+using testing::internal::Shuffle;
+using testing::internal::ShuffleRange;
+using testing::internal::SkipPrefix;
+using testing::internal::StreamableToString;
+using testing::internal::String;
+using testing::internal::TestEventListenersAccessor;
+using testing::internal::TestResultAccessor;
+using testing::internal::UInt32;
+using testing::internal::WideStringToUtf8;
+using testing::internal::edit_distance::CalculateOptimalEdits;
+using testing::internal::edit_distance::CreateUnifiedDiff;
+using testing::internal::edit_distance::EditType;
+using testing::internal::kMaxRandomSeed;
+using testing::internal::kTestTypeIdInGoogleTest;
+using testing::kMaxStackTraceDepth;
+
+#if GTEST_HAS_STREAM_REDIRECTION
+using testing::internal::CaptureStdout;
+using testing::internal::GetCapturedStdout;
+#endif
+
+#if GTEST_IS_THREADSAFE
+using testing::internal::ThreadWithParam;
+#endif
+
+class TestingVector : public std::vector<int> {
+};
+
+::std::ostream& operator<<(::std::ostream& os,
+                           const TestingVector& vector) {
+  os << "{ ";
+  for (size_t i = 0; i < vector.size(); i++) {
+    os << vector[i] << " ";
+  }
+  os << "}";
+  return os;
+}
+
+// This line tests that we can define tests in an unnamed namespace.
+namespace {
+
+TEST(GetRandomSeedFromFlagTest, HandlesZero) {
+  const int seed = GetRandomSeedFromFlag(0);
+  EXPECT_LE(1, seed);
+  EXPECT_LE(seed, static_cast<int>(kMaxRandomSeed));
+}
+
+TEST(GetRandomSeedFromFlagTest, PreservesValidSeed) {
+  EXPECT_EQ(1, GetRandomSeedFromFlag(1));
+  EXPECT_EQ(2, GetRandomSeedFromFlag(2));
+  EXPECT_EQ(kMaxRandomSeed - 1, GetRandomSeedFromFlag(kMaxRandomSeed - 1));
+  EXPECT_EQ(static_cast<int>(kMaxRandomSeed),
+            GetRandomSeedFromFlag(kMaxRandomSeed));
+}
+
+TEST(GetRandomSeedFromFlagTest, NormalizesInvalidSeed) {
+  const int seed1 = GetRandomSeedFromFlag(-1);
+  EXPECT_LE(1, seed1);
+  EXPECT_LE(seed1, static_cast<int>(kMaxRandomSeed));
+
+  const int seed2 = GetRandomSeedFromFlag(kMaxRandomSeed + 1);
+  EXPECT_LE(1, seed2);
+  EXPECT_LE(seed2, static_cast<int>(kMaxRandomSeed));
+}
+
+TEST(GetNextRandomSeedTest, WorksForValidInput) {
+  EXPECT_EQ(2, GetNextRandomSeed(1));
+  EXPECT_EQ(3, GetNextRandomSeed(2));
+  EXPECT_EQ(static_cast<int>(kMaxRandomSeed),
+            GetNextRandomSeed(kMaxRandomSeed - 1));
+  EXPECT_EQ(1, GetNextRandomSeed(kMaxRandomSeed));
+
+  // We deliberately don't test GetNextRandomSeed() with invalid
+  // inputs, as that requires death tests, which are expensive.  This
+  // is fine as GetNextRandomSeed() is internal and has a
+  // straightforward definition.
+}
+
+static void ClearCurrentTestPartResults() {
+  TestResultAccessor::ClearTestPartResults(
+      GetUnitTestImpl()->current_test_result());
+}
+
+// Tests GetTypeId.
+
+TEST(GetTypeIdTest, ReturnsSameValueForSameType) {
+  EXPECT_EQ(GetTypeId<int>(), GetTypeId<int>());
+  EXPECT_EQ(GetTypeId<Test>(), GetTypeId<Test>());
+}
+
+class SubClassOfTest : public Test {};
+class AnotherSubClassOfTest : public Test {};
+
+TEST(GetTypeIdTest, ReturnsDifferentValuesForDifferentTypes) {
+  EXPECT_NE(GetTypeId<int>(), GetTypeId<const int>());
+  EXPECT_NE(GetTypeId<int>(), GetTypeId<char>());
+  EXPECT_NE(GetTypeId<int>(), GetTestTypeId());
+  EXPECT_NE(GetTypeId<SubClassOfTest>(), GetTestTypeId());
+  EXPECT_NE(GetTypeId<AnotherSubClassOfTest>(), GetTestTypeId());
+  EXPECT_NE(GetTypeId<AnotherSubClassOfTest>(), GetTypeId<SubClassOfTest>());
+}
+
+// Verifies that GetTestTypeId() returns the same value, no matter it
+// is called from inside Google Test or outside of it.
+TEST(GetTestTypeIdTest, ReturnsTheSameValueInsideOrOutsideOfGoogleTest) {
+  EXPECT_EQ(kTestTypeIdInGoogleTest, GetTestTypeId());
+}
+
+// Tests FormatTimeInMillisAsSeconds().
+
+TEST(FormatTimeInMillisAsSecondsTest, FormatsZero) {
+  EXPECT_EQ("0", FormatTimeInMillisAsSeconds(0));
+}
+
+TEST(FormatTimeInMillisAsSecondsTest, FormatsPositiveNumber) {
+  EXPECT_EQ("0.003", FormatTimeInMillisAsSeconds(3));
+  EXPECT_EQ("0.01", FormatTimeInMillisAsSeconds(10));
+  EXPECT_EQ("0.2", FormatTimeInMillisAsSeconds(200));
+  EXPECT_EQ("1.2", FormatTimeInMillisAsSeconds(1200));
+  EXPECT_EQ("3", FormatTimeInMillisAsSeconds(3000));
+}
+
+TEST(FormatTimeInMillisAsSecondsTest, FormatsNegativeNumber) {
+  EXPECT_EQ("-0.003", FormatTimeInMillisAsSeconds(-3));
+  EXPECT_EQ("-0.01", FormatTimeInMillisAsSeconds(-10));
+  EXPECT_EQ("-0.2", FormatTimeInMillisAsSeconds(-200));
+  EXPECT_EQ("-1.2", FormatTimeInMillisAsSeconds(-1200));
+  EXPECT_EQ("-3", FormatTimeInMillisAsSeconds(-3000));
+}
+
+// Tests FormatEpochTimeInMillisAsIso8601().  The correctness of conversion
+// for particular dates below was verified in Python using
+// datetime.datetime.fromutctimestamp(<timetamp>/1000).
+
+// FormatEpochTimeInMillisAsIso8601 depends on the current timezone, so we
+// have to set up a particular timezone to obtain predictable results.
+class FormatEpochTimeInMillisAsIso8601Test : public Test {
+ public:
+  // On Cygwin, GCC doesn't allow unqualified integer literals to exceed
+  // 32 bits, even when 64-bit integer types are available.  We have to
+  // force the constants to have a 64-bit type here.
+  static const TimeInMillis kMillisPerSec = 1000;
+
+ private:
+  virtual void SetUp() {
+    saved_tz_ = NULL;
+
+    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996 /* getenv, strdup: deprecated */)
+    if (getenv("TZ"))
+      saved_tz_ = strdup(getenv("TZ"));
+    GTEST_DISABLE_MSC_WARNINGS_POP_()
+
+    // Set up the time zone for FormatEpochTimeInMillisAsIso8601 to use.  We
+    // cannot use the local time zone because the function's output depends
+    // on the time zone.
+    SetTimeZone("UTC+00");
+  }
+
+  virtual void TearDown() {
+    SetTimeZone(saved_tz_);
+    free(const_cast<char*>(saved_tz_));
+    saved_tz_ = NULL;
+  }
+
+  static void SetTimeZone(const char* time_zone) {
+    // tzset() distinguishes between the TZ variable being present and empty
+    // and not being present, so we have to consider the case of time_zone
+    // being NULL.
+#if _MSC_VER
+    // ...Unless it's MSVC, whose standard library's _putenv doesn't
+    // distinguish between an empty and a missing variable.
+    const std::string env_var =
+        std::string("TZ=") + (time_zone ? time_zone : "");
+    _putenv(env_var.c_str());
+    GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996 /* deprecated function */)
+    tzset();
+    GTEST_DISABLE_MSC_WARNINGS_POP_()
+#else
+    if (time_zone) {
+      setenv(("TZ"), time_zone, 1);
+    } else {
+      unsetenv("TZ");
+    }
+    tzset();
+#endif
+  }
+
+  const char* saved_tz_;
+};
+
+const TimeInMillis FormatEpochTimeInMillisAsIso8601Test::kMillisPerSec;
+
+TEST_F(FormatEpochTimeInMillisAsIso8601Test, PrintsTwoDigitSegments) {
+  EXPECT_EQ("2011-10-31T18:52:42",
+            FormatEpochTimeInMillisAsIso8601(1320087162 * kMillisPerSec));
+}
+
+TEST_F(FormatEpochTimeInMillisAsIso8601Test, MillisecondsDoNotAffectResult) {
+  EXPECT_EQ(
+      "2011-10-31T18:52:42",
+      FormatEpochTimeInMillisAsIso8601(1320087162 * kMillisPerSec + 234));
+}
+
+TEST_F(FormatEpochTimeInMillisAsIso8601Test, PrintsLeadingZeroes) {
+  EXPECT_EQ("2011-09-03T05:07:02",
+            FormatEpochTimeInMillisAsIso8601(1315026422 * kMillisPerSec));
+}
+
+TEST_F(FormatEpochTimeInMillisAsIso8601Test, Prints24HourTime) {
+  EXPECT_EQ("2011-09-28T17:08:22",
+            FormatEpochTimeInMillisAsIso8601(1317229702 * kMillisPerSec));
+}
+
+TEST_F(FormatEpochTimeInMillisAsIso8601Test, PrintsEpochStart) {
+  EXPECT_EQ("1970-01-01T00:00:00", FormatEpochTimeInMillisAsIso8601(0));
+}
+
+#if GTEST_CAN_COMPARE_NULL
+
+# ifdef __BORLANDC__
+// Silences warnings: "Condition is always true", "Unreachable code"
+#  pragma option push -w-ccc -w-rch
+# endif
+
+// Tests that GTEST_IS_NULL_LITERAL_(x) is true when x is a null
+// pointer literal.
+TEST(NullLiteralTest, IsTrueForNullLiterals) {
+  EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(NULL));
+  EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0));
+  EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0U));
+  EXPECT_TRUE(GTEST_IS_NULL_LITERAL_(0L));
+}
+
+// Tests that GTEST_IS_NULL_LITERAL_(x) is false when x is not a null
+// pointer literal.
+TEST(NullLiteralTest, IsFalseForNonNullLiterals) {
+  EXPECT_FALSE(GTEST_IS_NULL_LITERAL_(1));
+  EXPECT_FALSE(GTEST_IS_NULL_LITERAL_(0.0));
+  EXPECT_FALSE(GTEST_IS_NULL_LITERAL_('a'));
+  EXPECT_FALSE(GTEST_IS_NULL_LITERAL_(static_cast<void*>(NULL)));
+}
+
+# ifdef __BORLANDC__
+// Restores warnings after previous "#pragma option push" suppressed them.
+#  pragma option pop
+# endif
+
+#endif  // GTEST_CAN_COMPARE_NULL
+//
+// Tests CodePointToUtf8().
+
+// Tests that the NUL character L'\0' is encoded correctly.
+TEST(CodePointToUtf8Test, CanEncodeNul) {
+  EXPECT_EQ("", CodePointToUtf8(L'\0'));
+}
+
+// Tests that ASCII characters are encoded correctly.
+TEST(CodePointToUtf8Test, CanEncodeAscii) {
+  EXPECT_EQ("a", CodePointToUtf8(L'a'));
+  EXPECT_EQ("Z", CodePointToUtf8(L'Z'));
+  EXPECT_EQ("&", CodePointToUtf8(L'&'));
+  EXPECT_EQ("\x7F", CodePointToUtf8(L'\x7F'));
+}
+
+// Tests that Unicode code-points that have 8 to 11 bits are encoded
+// as 110xxxxx 10xxxxxx.
+TEST(CodePointToUtf8Test, CanEncode8To11Bits) {
+  // 000 1101 0011 => 110-00011 10-010011
+  EXPECT_EQ("\xC3\x93", CodePointToUtf8(L'\xD3'));
+
+  // 101 0111 0110 => 110-10101 10-110110
+  // Some compilers (e.g., GCC on MinGW) cannot handle non-ASCII codepoints
+  // in wide strings and wide chars. In order to accomodate them, we have to
+  // introduce such character constants as integers.
+  EXPECT_EQ("\xD5\xB6",
+            CodePointToUtf8(static_cast<wchar_t>(0x576)));
+}
+
+// Tests that Unicode code-points that have 12 to 16 bits are encoded
+// as 1110xxxx 10xxxxxx 10xxxxxx.
+TEST(CodePointToUtf8Test, CanEncode12To16Bits) {
+  // 0000 1000 1101 0011 => 1110-0000 10-100011 10-010011
+  EXPECT_EQ("\xE0\xA3\x93",
+            CodePointToUtf8(static_cast<wchar_t>(0x8D3)));
+
+  // 1100 0111 0100 1101 => 1110-1100 10-011101 10-001101
+  EXPECT_EQ("\xEC\x9D\x8D",
+            CodePointToUtf8(static_cast<wchar_t>(0xC74D)));
+}
+
+#if !GTEST_WIDE_STRING_USES_UTF16_
+// Tests in this group require a wchar_t to hold > 16 bits, and thus
+// are skipped on Windows, Cygwin, and Symbian, where a wchar_t is
+// 16-bit wide. This code may not compile on those systems.
+
+// Tests that Unicode code-points that have 17 to 21 bits are encoded
+// as 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx.
+TEST(CodePointToUtf8Test, CanEncode17To21Bits) {
+  // 0 0001 0000 1000 1101 0011 => 11110-000 10-010000 10-100011 10-010011
+  EXPECT_EQ("\xF0\x90\xA3\x93", CodePointToUtf8(L'\x108D3'));
+
+  // 0 0001 0000 0100 0000 0000 => 11110-000 10-010000 10-010000 10-000000
+  EXPECT_EQ("\xF0\x90\x90\x80", CodePointToUtf8(L'\x10400'));
+
+  // 1 0000 1000 0110 0011 0100 => 11110-100 10-001000 10-011000 10-110100
+  EXPECT_EQ("\xF4\x88\x98\xB4", CodePointToUtf8(L'\x108634'));
+}
+
+// Tests that encoding an invalid code-point generates the expected result.
+TEST(CodePointToUtf8Test, CanEncodeInvalidCodePoint) {
+  EXPECT_EQ("(Invalid Unicode 0x1234ABCD)", CodePointToUtf8(L'\x1234ABCD'));
+}
+
+#endif  // !GTEST_WIDE_STRING_USES_UTF16_
+
+// Tests WideStringToUtf8().
+
+// Tests that the NUL character L'\0' is encoded correctly.
+TEST(WideStringToUtf8Test, CanEncodeNul) {
+  EXPECT_STREQ("", WideStringToUtf8(L"", 0).c_str());
+  EXPECT_STREQ("", WideStringToUtf8(L"", -1).c_str());
+}
+
+// Tests that ASCII strings are encoded correctly.
+TEST(WideStringToUtf8Test, CanEncodeAscii) {
+  EXPECT_STREQ("a", WideStringToUtf8(L"a", 1).c_str());
+  EXPECT_STREQ("ab", WideStringToUtf8(L"ab", 2).c_str());
+  EXPECT_STREQ("a", WideStringToUtf8(L"a", -1).c_str());
+  EXPECT_STREQ("ab", WideStringToUtf8(L"ab", -1).c_str());
+}
+
+// Tests that Unicode code-points that have 8 to 11 bits are encoded
+// as 110xxxxx 10xxxxxx.
+TEST(WideStringToUtf8Test, CanEncode8To11Bits) {
+  // 000 1101 0011 => 110-00011 10-010011
+  EXPECT_STREQ("\xC3\x93", WideStringToUtf8(L"\xD3", 1).c_str());
+  EXPECT_STREQ("\xC3\x93", WideStringToUtf8(L"\xD3", -1).c_str());
+
+  // 101 0111 0110 => 110-10101 10-110110
+  const wchar_t s[] = { 0x576, '\0' };
+  EXPECT_STREQ("\xD5\xB6", WideStringToUtf8(s, 1).c_str());
+  EXPECT_STREQ("\xD5\xB6", WideStringToUtf8(s, -1).c_str());
+}
+
+// Tests that Unicode code-points that have 12 to 16 bits are encoded
+// as 1110xxxx 10xxxxxx 10xxxxxx.
+TEST(WideStringToUtf8Test, CanEncode12To16Bits) {
+  // 0000 1000 1101 0011 => 1110-0000 10-100011 10-010011
+  const wchar_t s1[] = { 0x8D3, '\0' };
+  EXPECT_STREQ("\xE0\xA3\x93", WideStringToUtf8(s1, 1).c_str());
+  EXPECT_STREQ("\xE0\xA3\x93", WideStringToUtf8(s1, -1).c_str());
+
+  // 1100 0111 0100 1101 => 1110-1100 10-011101 10-001101
+  const wchar_t s2[] = { 0xC74D, '\0' };
+  EXPECT_STREQ("\xEC\x9D\x8D", WideStringToUtf8(s2, 1).c_str());
+  EXPECT_STREQ("\xEC\x9D\x8D", WideStringToUtf8(s2, -1).c_str());
+}
+
+// Tests that the conversion stops when the function encounters \0 character.
+TEST(WideStringToUtf8Test, StopsOnNulCharacter) {
+  EXPECT_STREQ("ABC", WideStringToUtf8(L"ABC\0XYZ", 100).c_str());
+}
+
+// Tests that the conversion stops when the function reaches the limit
+// specified by the 'length' parameter.
+TEST(WideStringToUtf8Test, StopsWhenLengthLimitReached) {
+  EXPECT_STREQ("ABC", WideStringToUtf8(L"ABCDEF", 3).c_str());
+}
+
+#if !GTEST_WIDE_STRING_USES_UTF16_
+// Tests that Unicode code-points that have 17 to 21 bits are encoded
+// as 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx. This code may not compile
+// on the systems using UTF-16 encoding.
+TEST(WideStringToUtf8Test, CanEncode17To21Bits) {
+  // 0 0001 0000 1000 1101 0011 => 11110-000 10-010000 10-100011 10-010011
+  EXPECT_STREQ("\xF0\x90\xA3\x93", WideStringToUtf8(L"\x108D3", 1).c_str());
+  EXPECT_STREQ("\xF0\x90\xA3\x93", WideStringToUtf8(L"\x108D3", -1).c_str());
+
+  // 1 0000 1000 0110 0011 0100 => 11110-100 10-001000 10-011000 10-110100
+  EXPECT_STREQ("\xF4\x88\x98\xB4", WideStringToUtf8(L"\x108634", 1).c_str());
+  EXPECT_STREQ("\xF4\x88\x98\xB4", WideStringToUtf8(L"\x108634", -1).c_str());
+}
+
+// Tests that encoding an invalid code-point generates the expected result.
+TEST(WideStringToUtf8Test, CanEncodeInvalidCodePoint) {
+  EXPECT_STREQ("(Invalid Unicode 0xABCDFF)",
+               WideStringToUtf8(L"\xABCDFF", -1).c_str());
+}
+#else  // !GTEST_WIDE_STRING_USES_UTF16_
+// Tests that surrogate pairs are encoded correctly on the systems using
+// UTF-16 encoding in the wide strings.
+TEST(WideStringToUtf8Test, CanEncodeValidUtf16SUrrogatePairs) {
+  const wchar_t s[] = { 0xD801, 0xDC00, '\0' };
+  EXPECT_STREQ("\xF0\x90\x90\x80", WideStringToUtf8(s, -1).c_str());
+}
+
+// Tests that encoding an invalid UTF-16 surrogate pair
+// generates the expected result.
+TEST(WideStringToUtf8Test, CanEncodeInvalidUtf16SurrogatePair) {
+  // Leading surrogate is at the end of the string.
+  const wchar_t s1[] = { 0xD800, '\0' };
+  EXPECT_STREQ("\xED\xA0\x80", WideStringToUtf8(s1, -1).c_str());
+  // Leading surrogate is not followed by the trailing surrogate.
+  const wchar_t s2[] = { 0xD800, 'M', '\0' };
+  EXPECT_STREQ("\xED\xA0\x80M", WideStringToUtf8(s2, -1).c_str());
+  // Trailing surrogate appearas without a leading surrogate.
+  const wchar_t s3[] = { 0xDC00, 'P', 'Q', 'R', '\0' };
+  EXPECT_STREQ("\xED\xB0\x80PQR", WideStringToUtf8(s3, -1).c_str());
+}
+#endif  // !GTEST_WIDE_STRING_USES_UTF16_
+
+// Tests that codepoint concatenation works correctly.
+#if !GTEST_WIDE_STRING_USES_UTF16_
+TEST(WideStringToUtf8Test, ConcatenatesCodepointsCorrectly) {
+  const wchar_t s[] = { 0x108634, 0xC74D, '\n', 0x576, 0x8D3, 0x108634, '\0'};
+  EXPECT_STREQ(
+      "\xF4\x88\x98\xB4"
+          "\xEC\x9D\x8D"
+          "\n"
+          "\xD5\xB6"
+          "\xE0\xA3\x93"
+          "\xF4\x88\x98\xB4",
+      WideStringToUtf8(s, -1).c_str());
+}
+#else
+TEST(WideStringToUtf8Test, ConcatenatesCodepointsCorrectly) {
+  const wchar_t s[] = { 0xC74D, '\n', 0x576, 0x8D3, '\0'};
+  EXPECT_STREQ(
+      "\xEC\x9D\x8D" "\n" "\xD5\xB6" "\xE0\xA3\x93",
+      WideStringToUtf8(s, -1).c_str());
+}
+#endif  // !GTEST_WIDE_STRING_USES_UTF16_
+
+// Tests the Random class.
+
+TEST(RandomDeathTest, GeneratesCrashesOnInvalidRange) {
+  testing::internal::Random random(42);
+  EXPECT_DEATH_IF_SUPPORTED(
+      random.Generate(0),
+      "Cannot generate a number in the range \\[0, 0\\)");
+  EXPECT_DEATH_IF_SUPPORTED(
+      random.Generate(testing::internal::Random::kMaxRange + 1),
+      "Generation of a number in \\[0, 2147483649\\) was requested, "
+      "but this can only generate numbers in \\[0, 2147483648\\)");
+}
+
+TEST(RandomTest, GeneratesNumbersWithinRange) {
+  const UInt32 kRange = 10000;
+  testing::internal::Random random(12345);
+  for (int i = 0; i < 10; i++) {
+    EXPECT_LT(random.Generate(kRange), kRange) << " for iteration " << i;
+  }
+
+  testing::internal::Random random2(testing::internal::Random::kMaxRange);
+  for (int i = 0; i < 10; i++) {
+    EXPECT_LT(random2.Generate(kRange), kRange) << " for iteration " << i;
+  }
+}
+
+TEST(RandomTest, RepeatsWhenReseeded) {
+  const int kSeed = 123;
+  const int kArraySize = 10;
+  const UInt32 kRange = 10000;
+  UInt32 values[kArraySize];
+
+  testing::internal::Random random(kSeed);
+  for (int i = 0; i < kArraySize; i++) {
+    values[i] = random.Generate(kRange);
+  }
+
+  random.Reseed(kSeed);
+  for (int i = 0; i < kArraySize; i++) {
+    EXPECT_EQ(values[i], random.Generate(kRange)) << " for iteration " << i;
+  }
+}
+
+// Tests STL container utilities.
+
+// Tests CountIf().
+
+static bool IsPositive(int n) { return n > 0; }
+
+TEST(ContainerUtilityTest, CountIf) {
+  std::vector<int> v;
+  EXPECT_EQ(0, CountIf(v, IsPositive));  // Works for an empty container.
+
+  v.push_back(-1);
+  v.push_back(0);
+  EXPECT_EQ(0, CountIf(v, IsPositive));  // Works when no value satisfies.
+
+  v.push_back(2);
+  v.push_back(-10);
+  v.push_back(10);
+  EXPECT_EQ(2, CountIf(v, IsPositive));
+}
+
+// Tests ForEach().
+
+static int g_sum = 0;
+static void Accumulate(int n) { g_sum += n; }
+
+TEST(ContainerUtilityTest, ForEach) {
+  std::vector<int> v;
+  g_sum = 0;
+  ForEach(v, Accumulate);
+  EXPECT_EQ(0, g_sum);  // Works for an empty container;
+
+  g_sum = 0;
+  v.push_back(1);
+  ForEach(v, Accumulate);
+  EXPECT_EQ(1, g_sum);  // Works for a container with one element.
+
+  g_sum = 0;
+  v.push_back(20);
+  v.push_back(300);
+  ForEach(v, Accumulate);
+  EXPECT_EQ(321, g_sum);
+}
+
+// Tests GetElementOr().
+TEST(ContainerUtilityTest, GetElementOr) {
+  std::vector<char> a;
+  EXPECT_EQ('x', GetElementOr(a, 0, 'x'));
+
+  a.push_back('a');
+  a.push_back('b');
+  EXPECT_EQ('a', GetElementOr(a, 0, 'x'));
+  EXPECT_EQ('b', GetElementOr(a, 1, 'x'));
+  EXPECT_EQ('x', GetElementOr(a, -2, 'x'));
+  EXPECT_EQ('x', GetElementOr(a, 2, 'x'));
+}
+
+TEST(ContainerUtilityDeathTest, ShuffleRange) {
+  std::vector<int> a;
+  a.push_back(0);
+  a.push_back(1);
+  a.push_back(2);
+  testing::internal::Random random(1);
+
+  EXPECT_DEATH_IF_SUPPORTED(
+      ShuffleRange(&random, -1, 1, &a),
+      "Invalid shuffle range start -1: must be in range \\[0, 3\\]");
+  EXPECT_DEATH_IF_SUPPORTED(
+      ShuffleRange(&random, 4, 4, &a),
+      "Invalid shuffle range start 4: must be in range \\[0, 3\\]");
+  EXPECT_DEATH_IF_SUPPORTED(
+      ShuffleRange(&random, 3, 2, &a),
+      "Invalid shuffle range finish 2: must be in range \\[3, 3\\]");
+  EXPECT_DEATH_IF_SUPPORTED(
+      ShuffleRange(&random, 3, 4, &a),
+      "Invalid shuffle range finish 4: must be in range \\[3, 3\\]");
+}
+
+class VectorShuffleTest : public Test {
+ protected:
+  static const int kVectorSize = 20;
+
+  VectorShuffleTest() : random_(1) {
+    for (int i = 0; i < kVectorSize; i++) {
+      vector_.push_back(i);
+    }
+  }
+
+  static bool VectorIsCorrupt(const TestingVector& vector) {
+    if (kVectorSize != static_cast<int>(vector.size())) {
+      return true;
+    }
+
+    bool found_in_vector[kVectorSize] = { false };
+    for (size_t i = 0; i < vector.size(); i++) {
+      const int e = vector[i];
+      if (e < 0 || e >= kVectorSize || found_in_vector[e]) {
+        return true;
+      }
+      found_in_vector[e] = true;
+    }
+
+    // Vector size is correct, elements' range is correct, no
+    // duplicate elements.  Therefore no corruption has occurred.
+    return false;
+  }
+
+  static bool VectorIsNotCorrupt(const TestingVector& vector) {
+    return !VectorIsCorrupt(vector);
+  }
+
+  static bool RangeIsShuffled(const TestingVector& vector, int begin, int end) {
+    for (int i = begin; i < end; i++) {
+      if (i != vector[i]) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  static bool RangeIsUnshuffled(
+      const TestingVector& vector, int begin, int end) {
+    return !RangeIsShuffled(vector, begin, end);
+  }
+
+  static bool VectorIsShuffled(const TestingVector& vector) {
+    return RangeIsShuffled(vector, 0, static_cast<int>(vector.size()));
+  }
+
+  static bool VectorIsUnshuffled(const TestingVector& vector) {
+    return !VectorIsShuffled(vector);
+  }
+
+  testing::internal::Random random_;
+  TestingVector vector_;
+};  // class VectorShuffleTest
+
+const int VectorShuffleTest::kVectorSize;
+
+TEST_F(VectorShuffleTest, HandlesEmptyRange) {
+  // Tests an empty range at the beginning...
+  ShuffleRange(&random_, 0, 0, &vector_);
+  ASSERT_PRED1(VectorIsNotCorrupt, vector_);
+  ASSERT_PRED1(VectorIsUnshuffled, vector_);
+
+  // ...in the middle...
+  ShuffleRange(&random_, kVectorSize/2, kVectorSize/2, &vector_);
+  ASSERT_PRED1(VectorIsNotCorrupt, vector_);
+  ASSERT_PRED1(VectorIsUnshuffled, vector_);
+
+  // ...at the end...
+  ShuffleRange(&random_, kVectorSize - 1, kVectorSize - 1, &vector_);
+  ASSERT_PRED1(VectorIsNotCorrupt, vector_);
+  ASSERT_PRED1(VectorIsUnshuffled, vector_);
+
+  // ...and past the end.
+  ShuffleRange(&random_, kVectorSize, kVectorSize, &vector_);
+  ASSERT_PRED1(VectorIsNotCorrupt, vector_);
+  ASSERT_PRED1(VectorIsUnshuffled, vector_);
+}
+
+TEST_F(VectorShuffleTest, HandlesRangeOfSizeOne) {
+  // Tests a size one range at the beginning...
+  ShuffleRange(&random_, 0, 1, &vector_);
+  ASSERT_PRED1(VectorIsNotCorrupt, vector_);
+  ASSERT_PRED1(VectorIsUnshuffled, vector_);
+
+  // ...in the middle...
+  ShuffleRange(&random_, kVectorSize/2, kVectorSize/2 + 1, &vector_);
+  ASSERT_PRED1(VectorIsNotCorrupt, vector_);
+  ASSERT_PRED1(VectorIsUnshuffled, vector_);
+
+  // ...and at the end.
+  ShuffleRange(&random_, kVectorSize - 1, kVectorSize, &vector_);
+  ASSERT_PRED1(VectorIsNotCorrupt, vector_);
+  ASSERT_PRED1(VectorIsUnshuffled, vector_);
+}
+
+// Because we use our own random number generator and a fixed seed,
+// we can guarantee that the following "random" tests will succeed.
+
+TEST_F(VectorShuffleTest, ShufflesEntireVector) {
+  Shuffle(&random_, &vector_);
+  ASSERT_PRED1(VectorIsNotCorrupt, vector_);
+  EXPECT_FALSE(VectorIsUnshuffled(vector_)) << vector_;
+
+  // Tests the first and last elements in particular to ensure that
+  // there are no off-by-one problems in our shuffle algorithm.
+  EXPECT_NE(0, vector_[0]);
+  EXPECT_NE(kVectorSize - 1, vector_[kVectorSize - 1]);
+}
+
+TEST_F(VectorShuffleTest, ShufflesStartOfVector) {
+  const int kRangeSize = kVectorSize/2;
+
+  ShuffleRange(&random_, 0, kRangeSize, &vector_);
+
+  ASSERT_PRED1(VectorIsNotCorrupt, vector_);
+  EXPECT_PRED3(RangeIsShuffled, vector_, 0, kRangeSize);
+  EXPECT_PRED3(RangeIsUnshuffled, vector_, kRangeSize, kVectorSize);
+}
+
+TEST_F(VectorShuffleTest, ShufflesEndOfVector) {
+  const int kRangeSize = kVectorSize / 2;
+  ShuffleRange(&random_, kRangeSize, kVectorSize, &vector_);
+
+  ASSERT_PRED1(VectorIsNotCorrupt, vector_);
+  EXPECT_PRED3(RangeIsUnshuffled, vector_, 0, kRangeSize);
+  EXPECT_PRED3(RangeIsShuffled, vector_, kRangeSize, kVectorSize);
+}
+
+TEST_F(VectorShuffleTest, ShufflesMiddleOfVector) {
+  int kRangeSize = kVectorSize/3;
+  ShuffleRange(&random_, kRangeSize, 2*kRangeSize, &vector_);
+
+  ASSERT_PRED1(VectorIsNotCorrupt, vector_);
+  EXPECT_PRED3(RangeIsUnshuffled, vector_, 0, kRangeSize);
+  EXPECT_PRED3(RangeIsShuffled, vector_, kRangeSize, 2*kRangeSize);
+  EXPECT_PRED3(RangeIsUnshuffled, vector_, 2*kRangeSize, kVectorSize);
+}
+
+TEST_F(VectorShuffleTest, ShufflesRepeatably) {
+  TestingVector vector2;
+  for (int i = 0; i < kVectorSize; i++) {
+    vector2.push_back(i);
+  }
+
+  random_.Reseed(1234);
+  Shuffle(&random_, &vector_);
+  random_.Reseed(1234);
+  Shuffle(&random_, &vector2);
+
+  ASSERT_PRED1(VectorIsNotCorrupt, vector_);
+  ASSERT_PRED1(VectorIsNotCorrupt, vector2);
+
+  for (int i = 0; i < kVectorSize; i++) {
+    EXPECT_EQ(vector_[i], vector2[i]) << " where i is " << i;
+  }
+}
+
+// Tests the size of the AssertHelper class.
+
+TEST(AssertHelperTest, AssertHelperIsSmall) {
+  // To avoid breaking clients that use lots of assertions in one
+  // function, we cannot grow the size of AssertHelper.
+  EXPECT_LE(sizeof(testing::internal::AssertHelper), sizeof(void*));
+}
+
+// Tests String::EndsWithCaseInsensitive().
+TEST(StringTest, EndsWithCaseInsensitive) {
+  EXPECT_TRUE(String::EndsWithCaseInsensitive("foobar", "BAR"));
+  EXPECT_TRUE(String::EndsWithCaseInsensitive("foobaR", "bar"));
+  EXPECT_TRUE(String::EndsWithCaseInsensitive("foobar", ""));
+  EXPECT_TRUE(String::EndsWithCaseInsensitive("", ""));
+
+  EXPECT_FALSE(String::EndsWithCaseInsensitive("Foobar", "foo"));
+  EXPECT_FALSE(String::EndsWithCaseInsensitive("foobar", "Foo"));
+  EXPECT_FALSE(String::EndsWithCaseInsensitive("", "foo"));
+}
+
+// C++Builder's preprocessor is buggy; it fails to expand macros that
+// appear in macro parameters after wide char literals.  Provide an alias
+// for NULL as a workaround.
+static const wchar_t* const kNull = NULL;
+
+// Tests String::CaseInsensitiveWideCStringEquals
+TEST(StringTest, CaseInsensitiveWideCStringEquals) {
+  EXPECT_TRUE(String::CaseInsensitiveWideCStringEquals(NULL, NULL));
+  EXPECT_FALSE(String::CaseInsensitiveWideCStringEquals(kNull, L""));
+  EXPECT_FALSE(String::CaseInsensitiveWideCStringEquals(L"", kNull));
+  EXPECT_FALSE(String::CaseInsensitiveWideCStringEquals(kNull, L"foobar"));
+  EXPECT_FALSE(String::CaseInsensitiveWideCStringEquals(L"foobar", kNull));
+  EXPECT_TRUE(String::CaseInsensitiveWideCStringEquals(L"foobar", L"foobar"));
+  EXPECT_TRUE(String::CaseInsensitiveWideCStringEquals(L"foobar", L"FOOBAR"));
+  EXPECT_TRUE(String::CaseInsensitiveWideCStringEquals(L"FOOBAR", L"foobar"));
+}
+
+#if GTEST_OS_WINDOWS
+
+// Tests String::ShowWideCString().
+TEST(StringTest, ShowWideCString) {
+  EXPECT_STREQ("(null)",
+               String::ShowWideCString(NULL).c_str());
+  EXPECT_STREQ("", String::ShowWideCString(L"").c_str());
+  EXPECT_STREQ("foo", String::ShowWideCString(L"foo").c_str());
+}
+
+# if GTEST_OS_WINDOWS_MOBILE
+TEST(StringTest, AnsiAndUtf16Null) {
+  EXPECT_EQ(NULL, String::AnsiToUtf16(NULL));
+  EXPECT_EQ(NULL, String::Utf16ToAnsi(NULL));
+}
+
+TEST(StringTest, AnsiAndUtf16ConvertBasic) {
+  const char* ansi = String::Utf16ToAnsi(L"str");
+  EXPECT_STREQ("str", ansi);
+  delete [] ansi;
+  const WCHAR* utf16 = String::AnsiToUtf16("str");
+  EXPECT_EQ(0, wcsncmp(L"str", utf16, 3));
+  delete [] utf16;
+}
+
+TEST(StringTest, AnsiAndUtf16ConvertPathChars) {
+  const char* ansi = String::Utf16ToAnsi(L".:\\ \"*?");
+  EXPECT_STREQ(".:\\ \"*?", ansi);
+  delete [] ansi;
+  const WCHAR* utf16 = String::AnsiToUtf16(".:\\ \"*?");
+  EXPECT_EQ(0, wcsncmp(L".:\\ \"*?", utf16, 3));
+  delete [] utf16;
+}
+# endif  // GTEST_OS_WINDOWS_MOBILE
+
+#endif  // GTEST_OS_WINDOWS
+
+// Tests TestProperty construction.
+TEST(TestPropertyTest, StringValue) {
+  TestProperty property("key", "1");
+  EXPECT_STREQ("key", property.key());
+  EXPECT_STREQ("1", property.value());
+}
+
+// Tests TestProperty replacing a value.
+TEST(TestPropertyTest, ReplaceStringValue) {
+  TestProperty property("key", "1");
+  EXPECT_STREQ("1", property.value());
+  property.SetValue("2");
+  EXPECT_STREQ("2", property.value());
+}
+
+// AddFatalFailure() and AddNonfatalFailure() must be stand-alone
+// functions (i.e. their definitions cannot be inlined at the call
+// sites), or C++Builder won't compile the code.
+static void AddFatalFailure() {
+  FAIL() << "Expected fatal failure.";
+}
+
+static void AddNonfatalFailure() {
+  ADD_FAILURE() << "Expected non-fatal failure.";
+}
+
+class ScopedFakeTestPartResultReporterTest : public Test {
+ public:  // Must be public and not protected due to a bug in g++ 3.4.2.
+  enum FailureMode {
+    FATAL_FAILURE,
+    NONFATAL_FAILURE
+  };
+  static void AddFailure(FailureMode failure) {
+    if (failure == FATAL_FAILURE) {
+      AddFatalFailure();
+    } else {
+      AddNonfatalFailure();
+    }
+  }
+};
+
+// Tests that ScopedFakeTestPartResultReporter intercepts test
+// failures.
+TEST_F(ScopedFakeTestPartResultReporterTest, InterceptsTestFailures) {
+  TestPartResultArray results;
+  {
+    ScopedFakeTestPartResultReporter reporter(
+        ScopedFakeTestPartResultReporter::INTERCEPT_ONLY_CURRENT_THREAD,
+        &results);
+    AddFailure(NONFATAL_FAILURE);
+    AddFailure(FATAL_FAILURE);
+  }
+
+  EXPECT_EQ(2, results.size());
+  EXPECT_TRUE(results.GetTestPartResult(0).nonfatally_failed());
+  EXPECT_TRUE(results.GetTestPartResult(1).fatally_failed());
+}
+
+TEST_F(ScopedFakeTestPartResultReporterTest, DeprecatedConstructor) {
+  TestPartResultArray results;
+  {
+    // Tests, that the deprecated constructor still works.
+    ScopedFakeTestPartResultReporter reporter(&results);
+    AddFailure(NONFATAL_FAILURE);
+  }
+  EXPECT_EQ(1, results.size());
+}
+
+#if GTEST_IS_THREADSAFE
+
+class ScopedFakeTestPartResultReporterWithThreadsTest
+  : public ScopedFakeTestPartResultReporterTest {
+ protected:
+  static void AddFailureInOtherThread(FailureMode failure) {
+    ThreadWithParam<FailureMode> thread(&AddFailure, failure, NULL);
+    thread.Join();
+  }
+};
+
+TEST_F(ScopedFakeTestPartResultReporterWithThreadsTest,
+       InterceptsTestFailuresInAllThreads) {
+  TestPartResultArray results;
+  {
+    ScopedFakeTestPartResultReporter reporter(
+        ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, &results);
+    AddFailure(NONFATAL_FAILURE);
+    AddFailure(FATAL_FAILURE);
+    AddFailureInOtherThread(NONFATAL_FAILURE);
+    AddFailureInOtherThread(FATAL_FAILURE);
+  }
+
+  EXPECT_EQ(4, results.size());
+  EXPECT_TRUE(results.GetTestPartResult(0).nonfatally_failed());
+  EXPECT_TRUE(results.GetTestPartResult(1).fatally_failed());
+  EXPECT_TRUE(results.GetTestPartResult(2).nonfatally_failed());
+  EXPECT_TRUE(results.GetTestPartResult(3).fatally_failed());
+}
+
+#endif  // GTEST_IS_THREADSAFE
+
+// Tests EXPECT_FATAL_FAILURE{,ON_ALL_THREADS}.  Makes sure that they
+// work even if the failure is generated in a called function rather than
+// the current context.
+
+typedef ScopedFakeTestPartResultReporterTest ExpectFatalFailureTest;
+
+TEST_F(ExpectFatalFailureTest, CatchesFatalFaliure) {
+  EXPECT_FATAL_FAILURE(AddFatalFailure(), "Expected fatal failure.");
+}
+
+#if GTEST_HAS_GLOBAL_STRING
+TEST_F(ExpectFatalFailureTest, AcceptsStringObject) {
+  EXPECT_FATAL_FAILURE(AddFatalFailure(), ::string("Expected fatal failure."));
+}
+#endif
+
+TEST_F(ExpectFatalFailureTest, AcceptsStdStringObject) {
+  EXPECT_FATAL_FAILURE(AddFatalFailure(),
+                       ::std::string("Expected fatal failure."));
+}
+
+TEST_F(ExpectFatalFailureTest, CatchesFatalFailureOnAllThreads) {
+  // We have another test below to verify that the macro catches fatal
+  // failures generated on another thread.
+  EXPECT_FATAL_FAILURE_ON_ALL_THREADS(AddFatalFailure(),
+                                      "Expected fatal failure.");
+}
+
+#ifdef __BORLANDC__
+// Silences warnings: "Condition is always true"
+# pragma option push -w-ccc
+#endif
+
+// Tests that EXPECT_FATAL_FAILURE() can be used in a non-void
+// function even when the statement in it contains ASSERT_*.
+
+int NonVoidFunction() {
+  EXPECT_FATAL_FAILURE(ASSERT_TRUE(false), "");
+  EXPECT_FATAL_FAILURE_ON_ALL_THREADS(FAIL(), "");
+  return 0;
+}
+
+TEST_F(ExpectFatalFailureTest, CanBeUsedInNonVoidFunction) {
+  NonVoidFunction();
+}
+
+// Tests that EXPECT_FATAL_FAILURE(statement, ...) doesn't abort the
+// current function even though 'statement' generates a fatal failure.
+
+void DoesNotAbortHelper(bool* aborted) {
+  EXPECT_FATAL_FAILURE(ASSERT_TRUE(false), "");
+  EXPECT_FATAL_FAILURE_ON_ALL_THREADS(FAIL(), "");
+
+  *aborted = false;
+}
+
+#ifdef __BORLANDC__
+// Restores warnings after previous "#pragma option push" suppressed them.
+# pragma option pop
+#endif
+
+TEST_F(ExpectFatalFailureTest, DoesNotAbort) {
+  bool aborted = true;
+  DoesNotAbortHelper(&aborted);
+  EXPECT_FALSE(aborted);
+}
+
+// Tests that the EXPECT_FATAL_FAILURE{,_ON_ALL_THREADS} accepts a
+// statement that contains a macro which expands to code containing an
+// unprotected comma.
+
+static int global_var = 0;
+#define GTEST_USE_UNPROTECTED_COMMA_ global_var++, global_var++
+
+TEST_F(ExpectFatalFailureTest, AcceptsMacroThatExpandsToUnprotectedComma) {
+#ifndef __BORLANDC__
+  // ICE's in C++Builder.
+  EXPECT_FATAL_FAILURE({
+    GTEST_USE_UNPROTECTED_COMMA_;
+    AddFatalFailure();
+  }, "");
+#endif
+
+  EXPECT_FATAL_FAILURE_ON_ALL_THREADS({
+    GTEST_USE_UNPROTECTED_COMMA_;
+    AddFatalFailure();
+  }, "");
+}
+
+// Tests EXPECT_NONFATAL_FAILURE{,ON_ALL_THREADS}.
+
+typedef ScopedFakeTestPartResultReporterTest ExpectNonfatalFailureTest;
+
+TEST_F(ExpectNonfatalFailureTest, CatchesNonfatalFailure) {
+  EXPECT_NONFATAL_FAILURE(AddNonfatalFailure(),
+                          "Expected non-fatal failure.");
+}
+
+#if GTEST_HAS_GLOBAL_STRING
+TEST_F(ExpectNonfatalFailureTest, AcceptsStringObject) {
+  EXPECT_NONFATAL_FAILURE(AddNonfatalFailure(),
+                          ::string("Expected non-fatal failure."));
+}
+#endif
+
+TEST_F(ExpectNonfatalFailureTest, AcceptsStdStringObject) {
+  EXPECT_NONFATAL_FAILURE(AddNonfatalFailure(),
+                          ::std::string("Expected non-fatal failure."));
+}
+
+TEST_F(ExpectNonfatalFailureTest, CatchesNonfatalFailureOnAllThreads) {
+  // We have another test below to verify that the macro catches
+  // non-fatal failures generated on another thread.
+  EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(AddNonfatalFailure(),
+                                         "Expected non-fatal failure.");
+}
+
+// Tests that the EXPECT_NONFATAL_FAILURE{,_ON_ALL_THREADS} accepts a
+// statement that contains a macro which expands to code containing an
+// unprotected comma.
+TEST_F(ExpectNonfatalFailureTest, AcceptsMacroThatExpandsToUnprotectedComma) {
+  EXPECT_NONFATAL_FAILURE({
+    GTEST_USE_UNPROTECTED_COMMA_;
+    AddNonfatalFailure();
+  }, "");
+
+  EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS({
+    GTEST_USE_UNPROTECTED_COMMA_;
+    AddNonfatalFailure();
+  }, "");
+}
+
+#if GTEST_IS_THREADSAFE
+
+typedef ScopedFakeTestPartResultReporterWithThreadsTest
+    ExpectFailureWithThreadsTest;
+
+TEST_F(ExpectFailureWithThreadsTest, ExpectFatalFailureOnAllThreads) {
+  EXPECT_FATAL_FAILURE_ON_ALL_THREADS(AddFailureInOtherThread(FATAL_FAILURE),
+                                      "Expected fatal failure.");
+}
+
+TEST_F(ExpectFailureWithThreadsTest, ExpectNonFatalFailureOnAllThreads) {
+  EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(
+      AddFailureInOtherThread(NONFATAL_FAILURE), "Expected non-fatal failure.");
+}
+
+#endif  // GTEST_IS_THREADSAFE
+
+// Tests the TestProperty class.
+
+TEST(TestPropertyTest, ConstructorWorks) {
+  const TestProperty property("key", "value");
+  EXPECT_STREQ("key", property.key());
+  EXPECT_STREQ("value", property.value());
+}
+
+TEST(TestPropertyTest, SetValue) {
+  TestProperty property("key", "value_1");
+  EXPECT_STREQ("key", property.key());
+  property.SetValue("value_2");
+  EXPECT_STREQ("key", property.key());
+  EXPECT_STREQ("value_2", property.value());
+}
+
+// Tests the TestResult class
+
+// The test fixture for testing TestResult.
+class TestResultTest : public Test {
+ protected:
+  typedef std::vector<TestPartResult> TPRVector;
+
+  // We make use of 2 TestPartResult objects,
+  TestPartResult * pr1, * pr2;
+
+  // ... and 3 TestResult objects.
+  TestResult * r0, * r1, * r2;
+
+  virtual void SetUp() {
+    // pr1 is for success.
+    pr1 = new TestPartResult(TestPartResult::kSuccess,
+                             "foo/bar.cc",
+                             10,
+                             "Success!");
+
+    // pr2 is for fatal failure.
+    pr2 = new TestPartResult(TestPartResult::kFatalFailure,
+                             "foo/bar.cc",
+                             -1,  // This line number means "unknown"
+                             "Failure!");
+
+    // Creates the TestResult objects.
+    r0 = new TestResult();
+    r1 = new TestResult();
+    r2 = new TestResult();
+
+    // In order to test TestResult, we need to modify its internal
+    // state, in particular the TestPartResult vector it holds.
+    // test_part_results() returns a const reference to this vector.
+    // We cast it to a non-const object s.t. it can be modified (yes,
+    // this is a hack).
+    TPRVector* results1 = const_cast<TPRVector*>(
+        &TestResultAccessor::test_part_results(*r1));
+    TPRVector* results2 = const_cast<TPRVector*>(
+        &TestResultAccessor::test_part_results(*r2));
+
+    // r0 is an empty TestResult.
+
+    // r1 contains a single SUCCESS TestPartResult.
+    results1->push_back(*pr1);
+
+    // r2 contains a SUCCESS, and a FAILURE.
+    results2->push_back(*pr1);
+    results2->push_back(*pr2);
+  }
+
+  virtual void TearDown() {
+    delete pr1;
+    delete pr2;
+
+    delete r0;
+    delete r1;
+    delete r2;
+  }
+
+  // Helper that compares two two TestPartResults.
+  static void CompareTestPartResult(const TestPartResult& expected,
+                                    const TestPartResult& actual) {
+    EXPECT_EQ(expected.type(), actual.type());
+    EXPECT_STREQ(expected.file_name(), actual.file_name());
+    EXPECT_EQ(expected.line_number(), actual.line_number());
+    EXPECT_STREQ(expected.summary(), actual.summary());
+    EXPECT_STREQ(expected.message(), actual.message());
+    EXPECT_EQ(expected.passed(), actual.passed());
+    EXPECT_EQ(expected.failed(), actual.failed());
+    EXPECT_EQ(expected.nonfatally_failed(), actual.nonfatally_failed());
+    EXPECT_EQ(expected.fatally_failed(), actual.fatally_failed());
+  }
+};
+
+// Tests TestResult::total_part_count().
+TEST_F(TestResultTest, total_part_count) {
+  ASSERT_EQ(0, r0->total_part_count());
+  ASSERT_EQ(1, r1->total_part_count());
+  ASSERT_EQ(2, r2->total_part_count());
+}
+
+// Tests TestResult::Passed().
+TEST_F(TestResultTest, Passed) {
+  ASSERT_TRUE(r0->Passed());
+  ASSERT_TRUE(r1->Passed());
+  ASSERT_FALSE(r2->Passed());
+}
+
+// Tests TestResult::Failed().
+TEST_F(TestResultTest, Failed) {
+  ASSERT_FALSE(r0->Failed());
+  ASSERT_FALSE(r1->Failed());
+  ASSERT_TRUE(r2->Failed());
+}
+
+// Tests TestResult::GetTestPartResult().
+
+typedef TestResultTest TestResultDeathTest;
+
+TEST_F(TestResultDeathTest, GetTestPartResult) {
+  CompareTestPartResult(*pr1, r2->GetTestPartResult(0));
+  CompareTestPartResult(*pr2, r2->GetTestPartResult(1));
+  EXPECT_DEATH_IF_SUPPORTED(r2->GetTestPartResult(2), "");
+  EXPECT_DEATH_IF_SUPPORTED(r2->GetTestPartResult(-1), "");
+}
+
+// Tests TestResult has no properties when none are added.
+TEST(TestResultPropertyTest, NoPropertiesFoundWhenNoneAreAdded) {
+  TestResult test_result;
+  ASSERT_EQ(0, test_result.test_property_count());
+}
+
+// Tests TestResult has the expected property when added.
+TEST(TestResultPropertyTest, OnePropertyFoundWhenAdded) {
+  TestResult test_result;
+  TestProperty property("key_1", "1");
+  TestResultAccessor::RecordProperty(&test_result, "testcase", property);
+  ASSERT_EQ(1, test_result.test_property_count());
+  const TestProperty& actual_property = test_result.GetTestProperty(0);
+  EXPECT_STREQ("key_1", actual_property.key());
+  EXPECT_STREQ("1", actual_property.value());
+}
+
+// Tests TestResult has multiple properties when added.
+TEST(TestResultPropertyTest, MultiplePropertiesFoundWhenAdded) {
+  TestResult test_result;
+  TestProperty property_1("key_1", "1");
+  TestProperty property_2("key_2", "2");
+  TestResultAccessor::RecordProperty(&test_result, "testcase", property_1);
+  TestResultAccessor::RecordProperty(&test_result, "testcase", property_2);
+  ASSERT_EQ(2, test_result.test_property_count());
+  const TestProperty& actual_property_1 = test_result.GetTestProperty(0);
+  EXPECT_STREQ("key_1", actual_property_1.key());
+  EXPECT_STREQ("1", actual_property_1.value());
+
+  const TestProperty& actual_property_2 = test_result.GetTestProperty(1);
+  EXPECT_STREQ("key_2", actual_property_2.key());
+  EXPECT_STREQ("2", actual_property_2.value());
+}
+
+// Tests TestResult::RecordProperty() overrides values for duplicate keys.
+TEST(TestResultPropertyTest, OverridesValuesForDuplicateKeys) {
+  TestResult test_result;
+  TestProperty property_1_1("key_1", "1");
+  TestProperty property_2_1("key_2", "2");
+  TestProperty property_1_2("key_1", "12");
+  TestProperty property_2_2("key_2", "22");
+  TestResultAccessor::RecordProperty(&test_result, "testcase", property_1_1);
+  TestResultAccessor::RecordProperty(&test_result, "testcase", property_2_1);
+  TestResultAccessor::RecordProperty(&test_result, "testcase", property_1_2);
+  TestResultAccessor::RecordProperty(&test_result, "testcase", property_2_2);
+
+  ASSERT_EQ(2, test_result.test_property_count());
+  const TestProperty& actual_property_1 = test_result.GetTestProperty(0);
+  EXPECT_STREQ("key_1", actual_property_1.key());
+  EXPECT_STREQ("12", actual_property_1.value());
+
+  const TestProperty& actual_property_2 = test_result.GetTestProperty(1);
+  EXPECT_STREQ("key_2", actual_property_2.key());
+  EXPECT_STREQ("22", actual_property_2.value());
+}
+
+// Tests TestResult::GetTestProperty().
+TEST(TestResultPropertyTest, GetTestProperty) {
+  TestResult test_result;
+  TestProperty property_1("key_1", "1");
+  TestProperty property_2("key_2", "2");
+  TestProperty property_3("key_3", "3");
+  TestResultAccessor::RecordProperty(&test_result, "testcase", property_1);
+  TestResultAccessor::RecordProperty(&test_result, "testcase", property_2);
+  TestResultAccessor::RecordProperty(&test_result, "testcase", property_3);
+
+  const TestProperty& fetched_property_1 = test_result.GetTestProperty(0);
+  const TestProperty& fetched_property_2 = test_result.GetTestProperty(1);
+  const TestProperty& fetched_property_3 = test_result.GetTestProperty(2);
+
+  EXPECT_STREQ("key_1", fetched_property_1.key());
+  EXPECT_STREQ("1", fetched_property_1.value());
+
+  EXPECT_STREQ("key_2", fetched_property_2.key());
+  EXPECT_STREQ("2", fetched_property_2.value());
+
+  EXPECT_STREQ("key_3", fetched_property_3.key());
+  EXPECT_STREQ("3", fetched_property_3.value());
+
+  EXPECT_DEATH_IF_SUPPORTED(test_result.GetTestProperty(3), "");
+  EXPECT_DEATH_IF_SUPPORTED(test_result.GetTestProperty(-1), "");
+}
+
+// Tests the Test class.
+//
+// It's difficult to test every public method of this class (we are
+// already stretching the limit of Google Test by using it to test itself!).
+// Fortunately, we don't have to do that, as we are already testing
+// the functionalities of the Test class extensively by using Google Test
+// alone.
+//
+// Therefore, this section only contains one test.
+
+// Tests that GTestFlagSaver works on Windows and Mac.
+
+class GTestFlagSaverTest : public Test {
+ protected:
+  // Saves the Google Test flags such that we can restore them later, and
+  // then sets them to their default values.  This will be called
+  // before the first test in this test case is run.
+  static void SetUpTestCase() {
+    saver_ = new GTestFlagSaver;
+
+    GTEST_FLAG(also_run_disabled_tests) = false;
+    GTEST_FLAG(break_on_failure) = false;
+    GTEST_FLAG(catch_exceptions) = false;
+    GTEST_FLAG(death_test_use_fork) = false;
+    GTEST_FLAG(color) = "auto";
+    GTEST_FLAG(filter) = "";
+    GTEST_FLAG(list_tests) = false;
+    GTEST_FLAG(output) = "";
+    GTEST_FLAG(print_time) = true;
+    GTEST_FLAG(random_seed) = 0;
+    GTEST_FLAG(repeat) = 1;
+    GTEST_FLAG(shuffle) = false;
+    GTEST_FLAG(stack_trace_depth) = kMaxStackTraceDepth;
+    GTEST_FLAG(stream_result_to) = "";
+    GTEST_FLAG(throw_on_failure) = false;
+  }
+
+  // Restores the Google Test flags that the tests have modified.  This will
+  // be called after the last test in this test case is run.
+  static void TearDownTestCase() {
+    delete saver_;
+    saver_ = NULL;
+  }
+
+  // Verifies that the Google Test flags have their default values, and then
+  // modifies each of them.
+  void VerifyAndModifyFlags() {
+    EXPECT_FALSE(GTEST_FLAG(also_run_disabled_tests));
+    EXPECT_FALSE(GTEST_FLAG(break_on_failure));
+    EXPECT_FALSE(GTEST_FLAG(catch_exceptions));
+    EXPECT_STREQ("auto", GTEST_FLAG(color).c_str());
+    EXPECT_FALSE(GTEST_FLAG(death_test_use_fork));
+    EXPECT_STREQ("", GTEST_FLAG(filter).c_str());
+    EXPECT_FALSE(GTEST_FLAG(list_tests));
+    EXPECT_STREQ("", GTEST_FLAG(output).c_str());
+    EXPECT_TRUE(GTEST_FLAG(print_time));
+    EXPECT_EQ(0, GTEST_FLAG(random_seed));
+    EXPECT_EQ(1, GTEST_FLAG(repeat));
+    EXPECT_FALSE(GTEST_FLAG(shuffle));
+    EXPECT_EQ(kMaxStackTraceDepth, GTEST_FLAG(stack_trace_depth));
+    EXPECT_STREQ("", GTEST_FLAG(stream_result_to).c_str());
+    EXPECT_FALSE(GTEST_FLAG(throw_on_failure));
+
+    GTEST_FLAG(also_run_disabled_tests) = true;
+    GTEST_FLAG(break_on_failure) = true;
+    GTEST_FLAG(catch_exceptions) = true;
+    GTEST_FLAG(color) = "no";
+    GTEST_FLAG(death_test_use_fork) = true;
+    GTEST_FLAG(filter) = "abc";
+    GTEST_FLAG(list_tests) = true;
+    GTEST_FLAG(output) = "xml:foo.xml";
+    GTEST_FLAG(print_time) = false;
+    GTEST_FLAG(random_seed) = 1;
+    GTEST_FLAG(repeat) = 100;
+    GTEST_FLAG(shuffle) = true;
+    GTEST_FLAG(stack_trace_depth) = 1;
+    GTEST_FLAG(stream_result_to) = "localhost:1234";
+    GTEST_FLAG(throw_on_failure) = true;
+  }
+
+ private:
+  // For saving Google Test flags during this test case.
+  static GTestFlagSaver* saver_;
+};
+
+GTestFlagSaver* GTestFlagSaverTest::saver_ = NULL;
+
+// Google Test doesn't guarantee the order of tests.  The following two
+// tests are designed to work regardless of their order.
+
+// Modifies the Google Test flags in the test body.
+TEST_F(GTestFlagSaverTest, ModifyGTestFlags) {
+  VerifyAndModifyFlags();
+}
+
+// Verifies that the Google Test flags in the body of the previous test were
+// restored to their original values.
+TEST_F(GTestFlagSaverTest, VerifyGTestFlags) {
+  VerifyAndModifyFlags();
+}
+
+// Sets an environment variable with the given name to the given
+// value.  If the value argument is "", unsets the environment
+// variable.  The caller must ensure that both arguments are not NULL.
+static void SetEnv(const char* name, const char* value) {
+#if GTEST_OS_WINDOWS_MOBILE
+  // Environment variables are not supported on Windows CE.
+  return;
+#elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9)
+  // C++Builder's putenv only stores a pointer to its parameter; we have to
+  // ensure that the string remains valid as long as it might be needed.
+  // We use an std::map to do so.
+  static std::map<std::string, std::string*> added_env;
+
+  // Because putenv stores a pointer to the string buffer, we can't delete the
+  // previous string (if present) until after it's replaced.
+  std::string *prev_env = NULL;
+  if (added_env.find(name) != added_env.end()) {
+    prev_env = added_env[name];
+  }
+  added_env[name] = new std::string(
+      (Message() << name << "=" << value).GetString());
+
+  // The standard signature of putenv accepts a 'char*' argument. Other
+  // implementations, like C++Builder's, accept a 'const char*'.
+  // We cast away the 'const' since that would work for both variants.
+  putenv(const_cast<char*>(added_env[name]->c_str()));
+  delete prev_env;
+#elif GTEST_OS_WINDOWS  // If we are on Windows proper.
+  _putenv((Message() << name << "=" << value).GetString().c_str());
+#else
+  if (*value == '\0') {
+    unsetenv(name);
+  } else {
+    setenv(name, value, 1);
+  }
+#endif  // GTEST_OS_WINDOWS_MOBILE
+}
+
+#if !GTEST_OS_WINDOWS_MOBILE
+// Environment variables are not supported on Windows CE.
+
+using testing::internal::Int32FromGTestEnv;
+
+// Tests Int32FromGTestEnv().
+
+// Tests that Int32FromGTestEnv() returns the default value when the
+// environment variable is not set.
+TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenVariableIsNotSet) {
+  SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "");
+  EXPECT_EQ(10, Int32FromGTestEnv("temp", 10));
+}
+
+# if !defined(GTEST_GET_INT32_FROM_ENV_)
+
+// Tests that Int32FromGTestEnv() returns the default value when the
+// environment variable overflows as an Int32.
+TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenValueOverflows) {
+  printf("(expecting 2 warnings)\n");
+
+  SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "12345678987654321");
+  EXPECT_EQ(20, Int32FromGTestEnv("temp", 20));
+
+  SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "-12345678987654321");
+  EXPECT_EQ(30, Int32FromGTestEnv("temp", 30));
+}
+
+// Tests that Int32FromGTestEnv() returns the default value when the
+// environment variable does not represent a valid decimal integer.
+TEST(Int32FromGTestEnvTest, ReturnsDefaultWhenValueIsInvalid) {
+  printf("(expecting 2 warnings)\n");
+
+  SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "A1");
+  EXPECT_EQ(40, Int32FromGTestEnv("temp", 40));
+
+  SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "12X");
+  EXPECT_EQ(50, Int32FromGTestEnv("temp", 50));
+}
+
+# endif  // !defined(GTEST_GET_INT32_FROM_ENV_)
+
+// Tests that Int32FromGTestEnv() parses and returns the value of the
+// environment variable when it represents a valid decimal integer in
+// the range of an Int32.
+TEST(Int32FromGTestEnvTest, ParsesAndReturnsValidValue) {
+  SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "123");
+  EXPECT_EQ(123, Int32FromGTestEnv("temp", 0));
+
+  SetEnv(GTEST_FLAG_PREFIX_UPPER_ "TEMP", "-321");
+  EXPECT_EQ(-321, Int32FromGTestEnv("temp", 0));
+}
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
+// Tests ParseInt32Flag().
+
+// Tests that ParseInt32Flag() returns false and doesn't change the
+// output value when the flag has wrong format
+TEST(ParseInt32FlagTest, ReturnsFalseForInvalidFlag) {
+  Int32 value = 123;
+  EXPECT_FALSE(ParseInt32Flag("--a=100", "b", &value));
+  EXPECT_EQ(123, value);
+
+  EXPECT_FALSE(ParseInt32Flag("a=100", "a", &value));
+  EXPECT_EQ(123, value);
+}
+
+// Tests that ParseInt32Flag() returns false and doesn't change the
+// output value when the flag overflows as an Int32.
+TEST(ParseInt32FlagTest, ReturnsDefaultWhenValueOverflows) {
+  printf("(expecting 2 warnings)\n");
+
+  Int32 value = 123;
+  EXPECT_FALSE(ParseInt32Flag("--abc=12345678987654321", "abc", &value));
+  EXPECT_EQ(123, value);
+
+  EXPECT_FALSE(ParseInt32Flag("--abc=-12345678987654321", "abc", &value));
+  EXPECT_EQ(123, value);
+}
+
+// Tests that ParseInt32Flag() returns false and doesn't change the
+// output value when the flag does not represent a valid decimal
+// integer.
+TEST(ParseInt32FlagTest, ReturnsDefaultWhenValueIsInvalid) {
+  printf("(expecting 2 warnings)\n");
+
+  Int32 value = 123;
+  EXPECT_FALSE(ParseInt32Flag("--abc=A1", "abc", &value));
+  EXPECT_EQ(123, value);
+
+  EXPECT_FALSE(ParseInt32Flag("--abc=12X", "abc", &value));
+  EXPECT_EQ(123, value);
+}
+
+// Tests that ParseInt32Flag() parses the value of the flag and
+// returns true when the flag represents a valid decimal integer in
+// the range of an Int32.
+TEST(ParseInt32FlagTest, ParsesAndReturnsValidValue) {
+  Int32 value = 123;
+  EXPECT_TRUE(ParseInt32Flag("--" GTEST_FLAG_PREFIX_ "abc=456", "abc", &value));
+  EXPECT_EQ(456, value);
+
+  EXPECT_TRUE(ParseInt32Flag("--" GTEST_FLAG_PREFIX_ "abc=-789",
+                             "abc", &value));
+  EXPECT_EQ(-789, value);
+}
+
+// Tests that Int32FromEnvOrDie() parses the value of the var or
+// returns the correct default.
+// Environment variables are not supported on Windows CE.
+#if !GTEST_OS_WINDOWS_MOBILE
+TEST(Int32FromEnvOrDieTest, ParsesAndReturnsValidValue) {
+  EXPECT_EQ(333, Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "UnsetVar", 333));
+  SetEnv(GTEST_FLAG_PREFIX_UPPER_ "UnsetVar", "123");
+  EXPECT_EQ(123, Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "UnsetVar", 333));
+  SetEnv(GTEST_FLAG_PREFIX_UPPER_ "UnsetVar", "-123");
+  EXPECT_EQ(-123, Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "UnsetVar", 333));
+}
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
+// Tests that Int32FromEnvOrDie() aborts with an error message
+// if the variable is not an Int32.
+TEST(Int32FromEnvOrDieDeathTest, AbortsOnFailure) {
+  SetEnv(GTEST_FLAG_PREFIX_UPPER_ "VAR", "xxx");
+  EXPECT_DEATH_IF_SUPPORTED(
+      Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "VAR", 123),
+      ".*");
+}
+
+// Tests that Int32FromEnvOrDie() aborts with an error message
+// if the variable cannot be represnted by an Int32.
+TEST(Int32FromEnvOrDieDeathTest, AbortsOnInt32Overflow) {
+  SetEnv(GTEST_FLAG_PREFIX_UPPER_ "VAR", "1234567891234567891234");
+  EXPECT_DEATH_IF_SUPPORTED(
+      Int32FromEnvOrDie(GTEST_FLAG_PREFIX_UPPER_ "VAR", 123),
+      ".*");
+}
+
+// Tests that ShouldRunTestOnShard() selects all tests
+// where there is 1 shard.
+TEST(ShouldRunTestOnShardTest, IsPartitionWhenThereIsOneShard) {
+  EXPECT_TRUE(ShouldRunTestOnShard(1, 0, 0));
+  EXPECT_TRUE(ShouldRunTestOnShard(1, 0, 1));
+  EXPECT_TRUE(ShouldRunTestOnShard(1, 0, 2));
+  EXPECT_TRUE(ShouldRunTestOnShard(1, 0, 3));
+  EXPECT_TRUE(ShouldRunTestOnShard(1, 0, 4));
+}
+
+class ShouldShardTest : public testing::Test {
+ protected:
+  virtual void SetUp() {
+    index_var_ = GTEST_FLAG_PREFIX_UPPER_ "INDEX";
+    total_var_ = GTEST_FLAG_PREFIX_UPPER_ "TOTAL";
+  }
+
+  virtual void TearDown() {
+    SetEnv(index_var_, "");
+    SetEnv(total_var_, "");
+  }
+
+  const char* index_var_;
+  const char* total_var_;
+};
+
+// Tests that sharding is disabled if neither of the environment variables
+// are set.
+TEST_F(ShouldShardTest, ReturnsFalseWhenNeitherEnvVarIsSet) {
+  SetEnv(index_var_, "");
+  SetEnv(total_var_, "");
+
+  EXPECT_FALSE(ShouldShard(total_var_, index_var_, false));
+  EXPECT_FALSE(ShouldShard(total_var_, index_var_, true));
+}
+
+// Tests that sharding is not enabled if total_shards  == 1.
+TEST_F(ShouldShardTest, ReturnsFalseWhenTotalShardIsOne) {
+  SetEnv(index_var_, "0");
+  SetEnv(total_var_, "1");
+  EXPECT_FALSE(ShouldShard(total_var_, index_var_, false));
+  EXPECT_FALSE(ShouldShard(total_var_, index_var_, true));
+}
+
+// Tests that sharding is enabled if total_shards > 1 and
+// we are not in a death test subprocess.
+// Environment variables are not supported on Windows CE.
+#if !GTEST_OS_WINDOWS_MOBILE
+TEST_F(ShouldShardTest, WorksWhenShardEnvVarsAreValid) {
+  SetEnv(index_var_, "4");
+  SetEnv(total_var_, "22");
+  EXPECT_TRUE(ShouldShard(total_var_, index_var_, false));
+  EXPECT_FALSE(ShouldShard(total_var_, index_var_, true));
+
+  SetEnv(index_var_, "8");
+  SetEnv(total_var_, "9");
+  EXPECT_TRUE(ShouldShard(total_var_, index_var_, false));
+  EXPECT_FALSE(ShouldShard(total_var_, index_var_, true));
+
+  SetEnv(index_var_, "0");
+  SetEnv(total_var_, "9");
+  EXPECT_TRUE(ShouldShard(total_var_, index_var_, false));
+  EXPECT_FALSE(ShouldShard(total_var_, index_var_, true));
+}
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
+// Tests that we exit in error if the sharding values are not valid.
+
+typedef ShouldShardTest ShouldShardDeathTest;
+
+TEST_F(ShouldShardDeathTest, AbortsWhenShardingEnvVarsAreInvalid) {
+  SetEnv(index_var_, "4");
+  SetEnv(total_var_, "4");
+  EXPECT_DEATH_IF_SUPPORTED(ShouldShard(total_var_, index_var_, false), ".*");
+
+  SetEnv(index_var_, "4");
+  SetEnv(total_var_, "-2");
+  EXPECT_DEATH_IF_SUPPORTED(ShouldShard(total_var_, index_var_, false), ".*");
+
+  SetEnv(index_var_, "5");
+  SetEnv(total_var_, "");
+  EXPECT_DEATH_IF_SUPPORTED(ShouldShard(total_var_, index_var_, false), ".*");
+
+  SetEnv(index_var_, "");
+  SetEnv(total_var_, "5");
+  EXPECT_DEATH_IF_SUPPORTED(ShouldShard(total_var_, index_var_, false), ".*");
+}
+
+// Tests that ShouldRunTestOnShard is a partition when 5
+// shards are used.
+TEST(ShouldRunTestOnShardTest, IsPartitionWhenThereAreFiveShards) {
+  // Choose an arbitrary number of tests and shards.
+  const int num_tests = 17;
+  const int num_shards = 5;
+
+  // Check partitioning: each test should be on exactly 1 shard.
+  for (int test_id = 0; test_id < num_tests; test_id++) {
+    int prev_selected_shard_index = -1;
+    for (int shard_index = 0; shard_index < num_shards; shard_index++) {
+      if (ShouldRunTestOnShard(num_shards, shard_index, test_id)) {
+        if (prev_selected_shard_index < 0) {
+          prev_selected_shard_index = shard_index;
+        } else {
+          ADD_FAILURE() << "Shard " << prev_selected_shard_index << " and "
+            << shard_index << " are both selected to run test " << test_id;
+        }
+      }
+    }
+  }
+
+  // Check balance: This is not required by the sharding protocol, but is a
+  // desirable property for performance.
+  for (int shard_index = 0; shard_index < num_shards; shard_index++) {
+    int num_tests_on_shard = 0;
+    for (int test_id = 0; test_id < num_tests; test_id++) {
+      num_tests_on_shard +=
+        ShouldRunTestOnShard(num_shards, shard_index, test_id);
+    }
+    EXPECT_GE(num_tests_on_shard, num_tests / num_shards);
+  }
+}
+
+// For the same reason we are not explicitly testing everything in the
+// Test class, there are no separate tests for the following classes
+// (except for some trivial cases):
+//
+//   TestCase, UnitTest, UnitTestResultPrinter.
+//
+// Similarly, there are no separate tests for the following macros:
+//
+//   TEST, TEST_F, RUN_ALL_TESTS
+
+TEST(UnitTestTest, CanGetOriginalWorkingDir) {
+  ASSERT_TRUE(UnitTest::GetInstance()->original_working_dir() != NULL);
+  EXPECT_STRNE(UnitTest::GetInstance()->original_working_dir(), "");
+}
+
+TEST(UnitTestTest, ReturnsPlausibleTimestamp) {
+  EXPECT_LT(0, UnitTest::GetInstance()->start_timestamp());
+  EXPECT_LE(UnitTest::GetInstance()->start_timestamp(), GetTimeInMillis());
+}
+
+// When a property using a reserved key is supplied to this function, it
+// tests that a non-fatal failure is added, a fatal failure is not added,
+// and that the property is not recorded.
+void ExpectNonFatalFailureRecordingPropertyWithReservedKey(
+    const TestResult& test_result, const char* key) {
+  EXPECT_NONFATAL_FAILURE(Test::RecordProperty(key, "1"), "Reserved key");
+  ASSERT_EQ(0, test_result.test_property_count()) << "Property for key '" << key
+                                                  << "' recorded unexpectedly.";
+}
+
+void ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
+    const char* key) {
+  const TestInfo* test_info = UnitTest::GetInstance()->current_test_info();
+  ASSERT_TRUE(test_info != NULL);
+  ExpectNonFatalFailureRecordingPropertyWithReservedKey(*test_info->result(),
+                                                        key);
+}
+
+void ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
+    const char* key) {
+  const TestCase* test_case = UnitTest::GetInstance()->current_test_case();
+  ASSERT_TRUE(test_case != NULL);
+  ExpectNonFatalFailureRecordingPropertyWithReservedKey(
+      test_case->ad_hoc_test_result(), key);
+}
+
+void ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
+    const char* key) {
+  ExpectNonFatalFailureRecordingPropertyWithReservedKey(
+      UnitTest::GetInstance()->ad_hoc_test_result(), key);
+}
+
+// Tests that property recording functions in UnitTest outside of tests
+// functions correcly.  Creating a separate instance of UnitTest ensures it
+// is in a state similar to the UnitTest's singleton's between tests.
+class UnitTestRecordPropertyTest :
+    public testing::internal::UnitTestRecordPropertyTestHelper {
+ public:
+  static void SetUpTestCase() {
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
+        "disabled");
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
+        "errors");
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
+        "failures");
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
+        "name");
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
+        "tests");
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTestCase(
+        "time");
+
+    Test::RecordProperty("test_case_key_1", "1");
+    const TestCase* test_case = UnitTest::GetInstance()->current_test_case();
+    ASSERT_TRUE(test_case != NULL);
+
+    ASSERT_EQ(1, test_case->ad_hoc_test_result().test_property_count());
+    EXPECT_STREQ("test_case_key_1",
+                 test_case->ad_hoc_test_result().GetTestProperty(0).key());
+    EXPECT_STREQ("1",
+                 test_case->ad_hoc_test_result().GetTestProperty(0).value());
+  }
+};
+
+// Tests TestResult has the expected property when added.
+TEST_F(UnitTestRecordPropertyTest, OnePropertyFoundWhenAdded) {
+  UnitTestRecordProperty("key_1", "1");
+
+  ASSERT_EQ(1, unit_test_.ad_hoc_test_result().test_property_count());
+
+  EXPECT_STREQ("key_1",
+               unit_test_.ad_hoc_test_result().GetTestProperty(0).key());
+  EXPECT_STREQ("1",
+               unit_test_.ad_hoc_test_result().GetTestProperty(0).value());
+}
+
+// Tests TestResult has multiple properties when added.
+TEST_F(UnitTestRecordPropertyTest, MultiplePropertiesFoundWhenAdded) {
+  UnitTestRecordProperty("key_1", "1");
+  UnitTestRecordProperty("key_2", "2");
+
+  ASSERT_EQ(2, unit_test_.ad_hoc_test_result().test_property_count());
+
+  EXPECT_STREQ("key_1",
+               unit_test_.ad_hoc_test_result().GetTestProperty(0).key());
+  EXPECT_STREQ("1", unit_test_.ad_hoc_test_result().GetTestProperty(0).value());
+
+  EXPECT_STREQ("key_2",
+               unit_test_.ad_hoc_test_result().GetTestProperty(1).key());
+  EXPECT_STREQ("2", unit_test_.ad_hoc_test_result().GetTestProperty(1).value());
+}
+
+// Tests TestResult::RecordProperty() overrides values for duplicate keys.
+TEST_F(UnitTestRecordPropertyTest, OverridesValuesForDuplicateKeys) {
+  UnitTestRecordProperty("key_1", "1");
+  UnitTestRecordProperty("key_2", "2");
+  UnitTestRecordProperty("key_1", "12");
+  UnitTestRecordProperty("key_2", "22");
+
+  ASSERT_EQ(2, unit_test_.ad_hoc_test_result().test_property_count());
+
+  EXPECT_STREQ("key_1",
+               unit_test_.ad_hoc_test_result().GetTestProperty(0).key());
+  EXPECT_STREQ("12",
+               unit_test_.ad_hoc_test_result().GetTestProperty(0).value());
+
+  EXPECT_STREQ("key_2",
+               unit_test_.ad_hoc_test_result().GetTestProperty(1).key());
+  EXPECT_STREQ("22",
+               unit_test_.ad_hoc_test_result().GetTestProperty(1).value());
+}
+
+TEST_F(UnitTestRecordPropertyTest,
+       AddFailureInsideTestsWhenUsingTestCaseReservedKeys) {
+  ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
+      "name");
+  ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
+      "value_param");
+  ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
+      "type_param");
+  ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
+      "status");
+  ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
+      "time");
+  ExpectNonFatalFailureRecordingPropertyWithReservedKeyForCurrentTest(
+      "classname");
+}
+
+TEST_F(UnitTestRecordPropertyTest,
+       AddRecordWithReservedKeysGeneratesCorrectPropertyList) {
+  EXPECT_NONFATAL_FAILURE(
+      Test::RecordProperty("name", "1"),
+      "'classname', 'name', 'status', 'time', 'type_param', and 'value_param'"
+      " are reserved");
+}
+
+class UnitTestRecordPropertyTestEnvironment : public Environment {
+ public:
+  virtual void TearDown() {
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
+        "tests");
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
+        "failures");
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
+        "disabled");
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
+        "errors");
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
+        "name");
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
+        "timestamp");
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
+        "time");
+    ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestCase(
+        "random_seed");
+  }
+};
+
+// This will test property recording outside of any test or test case.
+static Environment* record_property_env =
+    AddGlobalTestEnvironment(new UnitTestRecordPropertyTestEnvironment);
+
+// This group of tests is for predicate assertions (ASSERT_PRED*, etc)
+// of various arities.  They do not attempt to be exhaustive.  Rather,
+// view them as smoke tests that can be easily reviewed and verified.
+// A more complete set of tests for predicate assertions can be found
+// in gtest_pred_impl_unittest.cc.
+
+// First, some predicates and predicate-formatters needed by the tests.
+
+// Returns true iff the argument is an even number.
+bool IsEven(int n) {
+  return (n % 2) == 0;
+}
+
+// A functor that returns true iff the argument is an even number.
+struct IsEvenFunctor {
+  bool operator()(int n) { return IsEven(n); }
+};
+
+// A predicate-formatter function that asserts the argument is an even
+// number.
+AssertionResult AssertIsEven(const char* expr, int n) {
+  if (IsEven(n)) {
+    return AssertionSuccess();
+  }
+
+  Message msg;
+  msg << expr << " evaluates to " << n << ", which is not even.";
+  return AssertionFailure(msg);
+}
+
+// A predicate function that returns AssertionResult for use in
+// EXPECT/ASSERT_TRUE/FALSE.
+AssertionResult ResultIsEven(int n) {
+  if (IsEven(n))
+    return AssertionSuccess() << n << " is even";
+  else
+    return AssertionFailure() << n << " is odd";
+}
+
+// A predicate function that returns AssertionResult but gives no
+// explanation why it succeeds. Needed for testing that
+// EXPECT/ASSERT_FALSE handles such functions correctly.
+AssertionResult ResultIsEvenNoExplanation(int n) {
+  if (IsEven(n))
+    return AssertionSuccess();
+  else
+    return AssertionFailure() << n << " is odd";
+}
+
+// A predicate-formatter functor that asserts the argument is an even
+// number.
+struct AssertIsEvenFunctor {
+  AssertionResult operator()(const char* expr, int n) {
+    return AssertIsEven(expr, n);
+  }
+};
+
+// Returns true iff the sum of the arguments is an even number.
+bool SumIsEven2(int n1, int n2) {
+  return IsEven(n1 + n2);
+}
+
+// A functor that returns true iff the sum of the arguments is an even
+// number.
+struct SumIsEven3Functor {
+  bool operator()(int n1, int n2, int n3) {
+    return IsEven(n1 + n2 + n3);
+  }
+};
+
+// A predicate-formatter function that asserts the sum of the
+// arguments is an even number.
+AssertionResult AssertSumIsEven4(
+    const char* e1, const char* e2, const char* e3, const char* e4,
+    int n1, int n2, int n3, int n4) {
+  const int sum = n1 + n2 + n3 + n4;
+  if (IsEven(sum)) {
+    return AssertionSuccess();
+  }
+
+  Message msg;
+  msg << e1 << " + " << e2 << " + " << e3 << " + " << e4
+      << " (" << n1 << " + " << n2 << " + " << n3 << " + " << n4
+      << ") evaluates to " << sum << ", which is not even.";
+  return AssertionFailure(msg);
+}
+
+// A predicate-formatter functor that asserts the sum of the arguments
+// is an even number.
+struct AssertSumIsEven5Functor {
+  AssertionResult operator()(
+      const char* e1, const char* e2, const char* e3, const char* e4,
+      const char* e5, int n1, int n2, int n3, int n4, int n5) {
+    const int sum = n1 + n2 + n3 + n4 + n5;
+    if (IsEven(sum)) {
+      return AssertionSuccess();
+    }
+
+    Message msg;
+    msg << e1 << " + " << e2 << " + " << e3 << " + " << e4 << " + " << e5
+        << " ("
+        << n1 << " + " << n2 << " + " << n3 << " + " << n4 << " + " << n5
+        << ") evaluates to " << sum << ", which is not even.";
+    return AssertionFailure(msg);
+  }
+};
+
+
+// Tests unary predicate assertions.
+
+// Tests unary predicate assertions that don't use a custom formatter.
+TEST(Pred1Test, WithoutFormat) {
+  // Success cases.
+  EXPECT_PRED1(IsEvenFunctor(), 2) << "This failure is UNEXPECTED!";
+  ASSERT_PRED1(IsEven, 4);
+
+  // Failure cases.
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED1(IsEven, 5) << "This failure is expected.";
+  }, "This failure is expected.");
+  EXPECT_FATAL_FAILURE(ASSERT_PRED1(IsEvenFunctor(), 5),
+                       "evaluates to false");
+}
+
+// Tests unary predicate assertions that use a custom formatter.
+TEST(Pred1Test, WithFormat) {
+  // Success cases.
+  EXPECT_PRED_FORMAT1(AssertIsEven, 2);
+  ASSERT_PRED_FORMAT1(AssertIsEvenFunctor(), 4)
+    << "This failure is UNEXPECTED!";
+
+  // Failure cases.
+  const int n = 5;
+  EXPECT_NONFATAL_FAILURE(EXPECT_PRED_FORMAT1(AssertIsEvenFunctor(), n),
+                          "n evaluates to 5, which is not even.");
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT1(AssertIsEven, 5) << "This failure is expected.";
+  }, "This failure is expected.");
+}
+
+// Tests that unary predicate assertions evaluates their arguments
+// exactly once.
+TEST(Pred1Test, SingleEvaluationOnFailure) {
+  // A success case.
+  static int n = 0;
+  EXPECT_PRED1(IsEven, n++);
+  EXPECT_EQ(1, n) << "The argument is not evaluated exactly once.";
+
+  // A failure case.
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT1(AssertIsEvenFunctor(), n++)
+        << "This failure is expected.";
+  }, "This failure is expected.");
+  EXPECT_EQ(2, n) << "The argument is not evaluated exactly once.";
+}
+
+
+// Tests predicate assertions whose arity is >= 2.
+
+// Tests predicate assertions that don't use a custom formatter.
+TEST(PredTest, WithoutFormat) {
+  // Success cases.
+  ASSERT_PRED2(SumIsEven2, 2, 4) << "This failure is UNEXPECTED!";
+  EXPECT_PRED3(SumIsEven3Functor(), 4, 6, 8);
+
+  // Failure cases.
+  const int n1 = 1;
+  const int n2 = 2;
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED2(SumIsEven2, n1, n2) << "This failure is expected.";
+  }, "This failure is expected.");
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED3(SumIsEven3Functor(), 1, 2, 4);
+  }, "evaluates to false");
+}
+
+// Tests predicate assertions that use a custom formatter.
+TEST(PredTest, WithFormat) {
+  // Success cases.
+  ASSERT_PRED_FORMAT4(AssertSumIsEven4, 4, 6, 8, 10) <<
+    "This failure is UNEXPECTED!";
+  EXPECT_PRED_FORMAT5(AssertSumIsEven5Functor(), 2, 4, 6, 8, 10);
+
+  // Failure cases.
+  const int n1 = 1;
+  const int n2 = 2;
+  const int n3 = 4;
+  const int n4 = 6;
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT4(AssertSumIsEven4, n1, n2, n3, n4);
+  }, "evaluates to 13, which is not even.");
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT5(AssertSumIsEven5Functor(), 1, 2, 4, 6, 8)
+        << "This failure is expected.";
+  }, "This failure is expected.");
+}
+
+// Tests that predicate assertions evaluates their arguments
+// exactly once.
+TEST(PredTest, SingleEvaluationOnFailure) {
+  // A success case.
+  int n1 = 0;
+  int n2 = 0;
+  EXPECT_PRED2(SumIsEven2, n1++, n2++);
+  EXPECT_EQ(1, n1) << "Argument 1 is not evaluated exactly once.";
+  EXPECT_EQ(1, n2) << "Argument 2 is not evaluated exactly once.";
+
+  // Another success case.
+  n1 = n2 = 0;
+  int n3 = 0;
+  int n4 = 0;
+  int n5 = 0;
+  ASSERT_PRED_FORMAT5(AssertSumIsEven5Functor(),
+                      n1++, n2++, n3++, n4++, n5++)
+                        << "This failure is UNEXPECTED!";
+  EXPECT_EQ(1, n1) << "Argument 1 is not evaluated exactly once.";
+  EXPECT_EQ(1, n2) << "Argument 2 is not evaluated exactly once.";
+  EXPECT_EQ(1, n3) << "Argument 3 is not evaluated exactly once.";
+  EXPECT_EQ(1, n4) << "Argument 4 is not evaluated exactly once.";
+  EXPECT_EQ(1, n5) << "Argument 5 is not evaluated exactly once.";
+
+  // A failure case.
+  n1 = n2 = n3 = 0;
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED3(SumIsEven3Functor(), ++n1, n2++, n3++)
+        << "This failure is expected.";
+  }, "This failure is expected.");
+  EXPECT_EQ(1, n1) << "Argument 1 is not evaluated exactly once.";
+  EXPECT_EQ(1, n2) << "Argument 2 is not evaluated exactly once.";
+  EXPECT_EQ(1, n3) << "Argument 3 is not evaluated exactly once.";
+
+  // Another failure case.
+  n1 = n2 = n3 = n4 = 0;
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT4(AssertSumIsEven4, ++n1, n2++, n3++, n4++);
+  }, "evaluates to 1, which is not even.");
+  EXPECT_EQ(1, n1) << "Argument 1 is not evaluated exactly once.";
+  EXPECT_EQ(1, n2) << "Argument 2 is not evaluated exactly once.";
+  EXPECT_EQ(1, n3) << "Argument 3 is not evaluated exactly once.";
+  EXPECT_EQ(1, n4) << "Argument 4 is not evaluated exactly once.";
+}
+
+
+// Some helper functions for testing using overloaded/template
+// functions with ASSERT_PREDn and EXPECT_PREDn.
+
+bool IsPositive(double x) {
+  return x > 0;
+}
+
+template <typename T>
+bool IsNegative(T x) {
+  return x < 0;
+}
+
+template <typename T1, typename T2>
+bool GreaterThan(T1 x1, T2 x2) {
+  return x1 > x2;
+}
+
+// Tests that overloaded functions can be used in *_PRED* as long as
+// their types are explicitly specified.
+TEST(PredicateAssertionTest, AcceptsOverloadedFunction) {
+  // C++Builder requires C-style casts rather than static_cast.
+  EXPECT_PRED1((bool (*)(int))(IsPositive), 5);  // NOLINT
+  ASSERT_PRED1((bool (*)(double))(IsPositive), 6.0);  // NOLINT
+}
+
+// Tests that template functions can be used in *_PRED* as long as
+// their types are explicitly specified.
+TEST(PredicateAssertionTest, AcceptsTemplateFunction) {
+  EXPECT_PRED1(IsNegative<int>, -5);
+  // Makes sure that we can handle templates with more than one
+  // parameter.
+  ASSERT_PRED2((GreaterThan<int, int>), 5, 0);
+}
+
+
+// Some helper functions for testing using overloaded/template
+// functions with ASSERT_PRED_FORMATn and EXPECT_PRED_FORMATn.
+
+AssertionResult IsPositiveFormat(const char* /* expr */, int n) {
+  return n > 0 ? AssertionSuccess() :
+      AssertionFailure(Message() << "Failure");
+}
+
+AssertionResult IsPositiveFormat(const char* /* expr */, double x) {
+  return x > 0 ? AssertionSuccess() :
+      AssertionFailure(Message() << "Failure");
+}
+
+template <typename T>
+AssertionResult IsNegativeFormat(const char* /* expr */, T x) {
+  return x < 0 ? AssertionSuccess() :
+      AssertionFailure(Message() << "Failure");
+}
+
+template <typename T1, typename T2>
+AssertionResult EqualsFormat(const char* /* expr1 */, const char* /* expr2 */,
+                             const T1& x1, const T2& x2) {
+  return x1 == x2 ? AssertionSuccess() :
+      AssertionFailure(Message() << "Failure");
+}
+
+// Tests that overloaded functions can be used in *_PRED_FORMAT*
+// without explicitly specifying their types.
+TEST(PredicateFormatAssertionTest, AcceptsOverloadedFunction) {
+  EXPECT_PRED_FORMAT1(IsPositiveFormat, 5);
+  ASSERT_PRED_FORMAT1(IsPositiveFormat, 6.0);
+}
+
+// Tests that template functions can be used in *_PRED_FORMAT* without
+// explicitly specifying their types.
+TEST(PredicateFormatAssertionTest, AcceptsTemplateFunction) {
+  EXPECT_PRED_FORMAT1(IsNegativeFormat, -5);
+  ASSERT_PRED_FORMAT2(EqualsFormat, 3, 3);
+}
+
+
+// Tests string assertions.
+
+// Tests ASSERT_STREQ with non-NULL arguments.
+TEST(StringAssertionTest, ASSERT_STREQ) {
+  const char * const p1 = "good";
+  ASSERT_STREQ(p1, p1);
+
+  // Let p2 have the same content as p1, but be at a different address.
+  const char p2[] = "good";
+  ASSERT_STREQ(p1, p2);
+
+  EXPECT_FATAL_FAILURE(ASSERT_STREQ("bad", "good"),
+                       "Expected: \"bad\"");
+}
+
+// Tests ASSERT_STREQ with NULL arguments.
+TEST(StringAssertionTest, ASSERT_STREQ_Null) {
+  ASSERT_STREQ(static_cast<const char *>(NULL), NULL);
+  EXPECT_FATAL_FAILURE(ASSERT_STREQ(NULL, "non-null"),
+                       "non-null");
+}
+
+// Tests ASSERT_STREQ with NULL arguments.
+TEST(StringAssertionTest, ASSERT_STREQ_Null2) {
+  EXPECT_FATAL_FAILURE(ASSERT_STREQ("non-null", NULL),
+                       "non-null");
+}
+
+// Tests ASSERT_STRNE.
+TEST(StringAssertionTest, ASSERT_STRNE) {
+  ASSERT_STRNE("hi", "Hi");
+  ASSERT_STRNE("Hi", NULL);
+  ASSERT_STRNE(NULL, "Hi");
+  ASSERT_STRNE("", NULL);
+  ASSERT_STRNE(NULL, "");
+  ASSERT_STRNE("", "Hi");
+  ASSERT_STRNE("Hi", "");
+  EXPECT_FATAL_FAILURE(ASSERT_STRNE("Hi", "Hi"),
+                       "\"Hi\" vs \"Hi\"");
+}
+
+// Tests ASSERT_STRCASEEQ.
+TEST(StringAssertionTest, ASSERT_STRCASEEQ) {
+  ASSERT_STRCASEEQ("hi", "Hi");
+  ASSERT_STRCASEEQ(static_cast<const char *>(NULL), NULL);
+
+  ASSERT_STRCASEEQ("", "");
+  EXPECT_FATAL_FAILURE(ASSERT_STRCASEEQ("Hi", "hi2"),
+                       "Ignoring case");
+}
+
+// Tests ASSERT_STRCASENE.
+TEST(StringAssertionTest, ASSERT_STRCASENE) {
+  ASSERT_STRCASENE("hi1", "Hi2");
+  ASSERT_STRCASENE("Hi", NULL);
+  ASSERT_STRCASENE(NULL, "Hi");
+  ASSERT_STRCASENE("", NULL);
+  ASSERT_STRCASENE(NULL, "");
+  ASSERT_STRCASENE("", "Hi");
+  ASSERT_STRCASENE("Hi", "");
+  EXPECT_FATAL_FAILURE(ASSERT_STRCASENE("Hi", "hi"),
+                       "(ignoring case)");
+}
+
+// Tests *_STREQ on wide strings.
+TEST(StringAssertionTest, STREQ_Wide) {
+  // NULL strings.
+  ASSERT_STREQ(static_cast<const wchar_t *>(NULL), NULL);
+
+  // Empty strings.
+  ASSERT_STREQ(L"", L"");
+
+  // Non-null vs NULL.
+  EXPECT_NONFATAL_FAILURE(EXPECT_STREQ(L"non-null", NULL),
+                          "non-null");
+
+  // Equal strings.
+  EXPECT_STREQ(L"Hi", L"Hi");
+
+  // Unequal strings.
+  EXPECT_NONFATAL_FAILURE(EXPECT_STREQ(L"abc", L"Abc"),
+                          "Abc");
+
+  // Strings containing wide characters.
+  EXPECT_NONFATAL_FAILURE(EXPECT_STREQ(L"abc\x8119", L"abc\x8120"),
+                          "abc");
+
+  // The streaming variation.
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_STREQ(L"abc\x8119", L"abc\x8121") << "Expected failure";
+  }, "Expected failure");
+}
+
+// Tests *_STRNE on wide strings.
+TEST(StringAssertionTest, STRNE_Wide) {
+  // NULL strings.
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_STRNE(static_cast<const wchar_t *>(NULL), NULL);
+  }, "");
+
+  // Empty strings.
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"", L""),
+                          "L\"\"");
+
+  // Non-null vs NULL.
+  ASSERT_STRNE(L"non-null", NULL);
+
+  // Equal strings.
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"Hi", L"Hi"),
+                          "L\"Hi\"");
+
+  // Unequal strings.
+  EXPECT_STRNE(L"abc", L"Abc");
+
+  // Strings containing wide characters.
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRNE(L"abc\x8119", L"abc\x8119"),
+                          "abc");
+
+  // The streaming variation.
+  ASSERT_STRNE(L"abc\x8119", L"abc\x8120") << "This shouldn't happen";
+}
+
+// Tests for ::testing::IsSubstring().
+
+// Tests that IsSubstring() returns the correct result when the input
+// argument type is const char*.
+TEST(IsSubstringTest, ReturnsCorrectResultForCString) {
+  EXPECT_FALSE(IsSubstring("", "", NULL, "a"));
+  EXPECT_FALSE(IsSubstring("", "", "b", NULL));
+  EXPECT_FALSE(IsSubstring("", "", "needle", "haystack"));
+
+  EXPECT_TRUE(IsSubstring("", "", static_cast<const char*>(NULL), NULL));
+  EXPECT_TRUE(IsSubstring("", "", "needle", "two needles"));
+}
+
+// Tests that IsSubstring() returns the correct result when the input
+// argument type is const wchar_t*.
+TEST(IsSubstringTest, ReturnsCorrectResultForWideCString) {
+  EXPECT_FALSE(IsSubstring("", "", kNull, L"a"));
+  EXPECT_FALSE(IsSubstring("", "", L"b", kNull));
+  EXPECT_FALSE(IsSubstring("", "", L"needle", L"haystack"));
+
+  EXPECT_TRUE(IsSubstring("", "", static_cast<const wchar_t*>(NULL), NULL));
+  EXPECT_TRUE(IsSubstring("", "", L"needle", L"two needles"));
+}
+
+// Tests that IsSubstring() generates the correct message when the input
+// argument type is const char*.
+TEST(IsSubstringTest, GeneratesCorrectMessageForCString) {
+  EXPECT_STREQ("Value of: needle_expr\n"
+               "  Actual: \"needle\"\n"
+               "Expected: a substring of haystack_expr\n"
+               "Which is: \"haystack\"",
+               IsSubstring("needle_expr", "haystack_expr",
+                           "needle", "haystack").failure_message());
+}
+
+// Tests that IsSubstring returns the correct result when the input
+// argument type is ::std::string.
+TEST(IsSubstringTest, ReturnsCorrectResultsForStdString) {
+  EXPECT_TRUE(IsSubstring("", "", std::string("hello"), "ahellob"));
+  EXPECT_FALSE(IsSubstring("", "", "hello", std::string("world")));
+}
+
+#if GTEST_HAS_STD_WSTRING
+// Tests that IsSubstring returns the correct result when the input
+// argument type is ::std::wstring.
+TEST(IsSubstringTest, ReturnsCorrectResultForStdWstring) {
+  EXPECT_TRUE(IsSubstring("", "", ::std::wstring(L"needle"), L"two needles"));
+  EXPECT_FALSE(IsSubstring("", "", L"needle", ::std::wstring(L"haystack")));
+}
+
+// Tests that IsSubstring() generates the correct message when the input
+// argument type is ::std::wstring.
+TEST(IsSubstringTest, GeneratesCorrectMessageForWstring) {
+  EXPECT_STREQ("Value of: needle_expr\n"
+               "  Actual: L\"needle\"\n"
+               "Expected: a substring of haystack_expr\n"
+               "Which is: L\"haystack\"",
+               IsSubstring(
+                   "needle_expr", "haystack_expr",
+                   ::std::wstring(L"needle"), L"haystack").failure_message());
+}
+
+#endif  // GTEST_HAS_STD_WSTRING
+
+// Tests for ::testing::IsNotSubstring().
+
+// Tests that IsNotSubstring() returns the correct result when the input
+// argument type is const char*.
+TEST(IsNotSubstringTest, ReturnsCorrectResultForCString) {
+  EXPECT_TRUE(IsNotSubstring("", "", "needle", "haystack"));
+  EXPECT_FALSE(IsNotSubstring("", "", "needle", "two needles"));
+}
+
+// Tests that IsNotSubstring() returns the correct result when the input
+// argument type is const wchar_t*.
+TEST(IsNotSubstringTest, ReturnsCorrectResultForWideCString) {
+  EXPECT_TRUE(IsNotSubstring("", "", L"needle", L"haystack"));
+  EXPECT_FALSE(IsNotSubstring("", "", L"needle", L"two needles"));
+}
+
+// Tests that IsNotSubstring() generates the correct message when the input
+// argument type is const wchar_t*.
+TEST(IsNotSubstringTest, GeneratesCorrectMessageForWideCString) {
+  EXPECT_STREQ("Value of: needle_expr\n"
+               "  Actual: L\"needle\"\n"
+               "Expected: not a substring of haystack_expr\n"
+               "Which is: L\"two needles\"",
+               IsNotSubstring(
+                   "needle_expr", "haystack_expr",
+                   L"needle", L"two needles").failure_message());
+}
+
+// Tests that IsNotSubstring returns the correct result when the input
+// argument type is ::std::string.
+TEST(IsNotSubstringTest, ReturnsCorrectResultsForStdString) {
+  EXPECT_FALSE(IsNotSubstring("", "", std::string("hello"), "ahellob"));
+  EXPECT_TRUE(IsNotSubstring("", "", "hello", std::string("world")));
+}
+
+// Tests that IsNotSubstring() generates the correct message when the input
+// argument type is ::std::string.
+TEST(IsNotSubstringTest, GeneratesCorrectMessageForStdString) {
+  EXPECT_STREQ("Value of: needle_expr\n"
+               "  Actual: \"needle\"\n"
+               "Expected: not a substring of haystack_expr\n"
+               "Which is: \"two needles\"",
+               IsNotSubstring(
+                   "needle_expr", "haystack_expr",
+                   ::std::string("needle"), "two needles").failure_message());
+}
+
+#if GTEST_HAS_STD_WSTRING
+
+// Tests that IsNotSubstring returns the correct result when the input
+// argument type is ::std::wstring.
+TEST(IsNotSubstringTest, ReturnsCorrectResultForStdWstring) {
+  EXPECT_FALSE(
+      IsNotSubstring("", "", ::std::wstring(L"needle"), L"two needles"));
+  EXPECT_TRUE(IsNotSubstring("", "", L"needle", ::std::wstring(L"haystack")));
+}
+
+#endif  // GTEST_HAS_STD_WSTRING
+
+// Tests floating-point assertions.
+
+template <typename RawType>
+class FloatingPointTest : public Test {
+ protected:
+  // Pre-calculated numbers to be used by the tests.
+  struct TestValues {
+    RawType close_to_positive_zero;
+    RawType close_to_negative_zero;
+    RawType further_from_negative_zero;
+
+    RawType close_to_one;
+    RawType further_from_one;
+
+    RawType infinity;
+    RawType close_to_infinity;
+    RawType further_from_infinity;
+
+    RawType nan1;
+    RawType nan2;
+  };
+
+  typedef typename testing::internal::FloatingPoint<RawType> Floating;
+  typedef typename Floating::Bits Bits;
+
+  virtual void SetUp() {
+    const size_t max_ulps = Floating::kMaxUlps;
+
+    // The bits that represent 0.0.
+    const Bits zero_bits = Floating(0).bits();
+
+    // Makes some numbers close to 0.0.
+    values_.close_to_positive_zero = Floating::ReinterpretBits(
+        zero_bits + max_ulps/2);
+    values_.close_to_negative_zero = -Floating::ReinterpretBits(
+        zero_bits + max_ulps - max_ulps/2);
+    values_.further_from_negative_zero = -Floating::ReinterpretBits(
+        zero_bits + max_ulps + 1 - max_ulps/2);
+
+    // The bits that represent 1.0.
+    const Bits one_bits = Floating(1).bits();
+
+    // Makes some numbers close to 1.0.
+    values_.close_to_one = Floating::ReinterpretBits(one_bits + max_ulps);
+    values_.further_from_one = Floating::ReinterpretBits(
+        one_bits + max_ulps + 1);
+
+    // +infinity.
+    values_.infinity = Floating::Infinity();
+
+    // The bits that represent +infinity.
+    const Bits infinity_bits = Floating(values_.infinity).bits();
+
+    // Makes some numbers close to infinity.
+    values_.close_to_infinity = Floating::ReinterpretBits(
+        infinity_bits - max_ulps);
+    values_.further_from_infinity = Floating::ReinterpretBits(
+        infinity_bits - max_ulps - 1);
+
+    // Makes some NAN's.  Sets the most significant bit of the fraction so that
+    // our NaN's are quiet; trying to process a signaling NaN would raise an
+    // exception if our environment enables floating point exceptions.
+    values_.nan1 = Floating::ReinterpretBits(Floating::kExponentBitMask
+        | (static_cast<Bits>(1) << (Floating::kFractionBitCount - 1)) | 1);
+    values_.nan2 = Floating::ReinterpretBits(Floating::kExponentBitMask
+        | (static_cast<Bits>(1) << (Floating::kFractionBitCount - 1)) | 200);
+  }
+
+  void TestSize() {
+    EXPECT_EQ(sizeof(RawType), sizeof(Bits));
+  }
+
+  static TestValues values_;
+};
+
+template <typename RawType>
+typename FloatingPointTest<RawType>::TestValues
+    FloatingPointTest<RawType>::values_;
+
+// Instantiates FloatingPointTest for testing *_FLOAT_EQ.
+typedef FloatingPointTest<float> FloatTest;
+
+// Tests that the size of Float::Bits matches the size of float.
+TEST_F(FloatTest, Size) {
+  TestSize();
+}
+
+// Tests comparing with +0 and -0.
+TEST_F(FloatTest, Zeros) {
+  EXPECT_FLOAT_EQ(0.0, -0.0);
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(-0.0, 1.0),
+                          "1.0");
+  EXPECT_FATAL_FAILURE(ASSERT_FLOAT_EQ(0.0, 1.5),
+                       "1.5");
+}
+
+// Tests comparing numbers close to 0.
+//
+// This ensures that *_FLOAT_EQ handles the sign correctly and no
+// overflow occurs when comparing numbers whose absolute value is very
+// small.
+TEST_F(FloatTest, AlmostZeros) {
+  // In C++Builder, names within local classes (such as used by
+  // EXPECT_FATAL_FAILURE) cannot be resolved against static members of the
+  // scoping class.  Use a static local alias as a workaround.
+  // We use the assignment syntax since some compilers, like Sun Studio,
+  // don't allow initializing references using construction syntax
+  // (parentheses).
+  static const FloatTest::TestValues& v = this->values_;
+
+  EXPECT_FLOAT_EQ(0.0, v.close_to_positive_zero);
+  EXPECT_FLOAT_EQ(-0.0, v.close_to_negative_zero);
+  EXPECT_FLOAT_EQ(v.close_to_positive_zero, v.close_to_negative_zero);
+
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_FLOAT_EQ(v.close_to_positive_zero,
+                    v.further_from_negative_zero);
+  }, "v.further_from_negative_zero");
+}
+
+// Tests comparing numbers close to each other.
+TEST_F(FloatTest, SmallDiff) {
+  EXPECT_FLOAT_EQ(1.0, values_.close_to_one);
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(1.0, values_.further_from_one),
+                          "values_.further_from_one");
+}
+
+// Tests comparing numbers far apart.
+TEST_F(FloatTest, LargeDiff) {
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(2.5, 3.0),
+                          "3.0");
+}
+
+// Tests comparing with infinity.
+//
+// This ensures that no overflow occurs when comparing numbers whose
+// absolute value is very large.
+TEST_F(FloatTest, Infinity) {
+  EXPECT_FLOAT_EQ(values_.infinity, values_.close_to_infinity);
+  EXPECT_FLOAT_EQ(-values_.infinity, -values_.close_to_infinity);
+#if !GTEST_OS_SYMBIAN
+  // Nokia's STLport crashes if we try to output infinity or NaN.
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(values_.infinity, -values_.infinity),
+                          "-values_.infinity");
+
+  // This is interesting as the representations of infinity and nan1
+  // are only 1 DLP apart.
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(values_.infinity, values_.nan1),
+                          "values_.nan1");
+#endif  // !GTEST_OS_SYMBIAN
+}
+
+// Tests that comparing with NAN always returns false.
+TEST_F(FloatTest, NaN) {
+#if !GTEST_OS_SYMBIAN
+// Nokia's STLport crashes if we try to output infinity or NaN.
+
+  // In C++Builder, names within local classes (such as used by
+  // EXPECT_FATAL_FAILURE) cannot be resolved against static members of the
+  // scoping class.  Use a static local alias as a workaround.
+  // We use the assignment syntax since some compilers, like Sun Studio,
+  // don't allow initializing references using construction syntax
+  // (parentheses).
+  static const FloatTest::TestValues& v = this->values_;
+
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(v.nan1, v.nan1),
+                          "v.nan1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(v.nan1, v.nan2),
+                          "v.nan2");
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(1.0, v.nan1),
+                          "v.nan1");
+
+  EXPECT_FATAL_FAILURE(ASSERT_FLOAT_EQ(v.nan1, v.infinity),
+                       "v.infinity");
+#endif  // !GTEST_OS_SYMBIAN
+}
+
+// Tests that *_FLOAT_EQ are reflexive.
+TEST_F(FloatTest, Reflexive) {
+  EXPECT_FLOAT_EQ(0.0, 0.0);
+  EXPECT_FLOAT_EQ(1.0, 1.0);
+  ASSERT_FLOAT_EQ(values_.infinity, values_.infinity);
+}
+
+// Tests that *_FLOAT_EQ are commutative.
+TEST_F(FloatTest, Commutative) {
+  // We already tested EXPECT_FLOAT_EQ(1.0, values_.close_to_one).
+  EXPECT_FLOAT_EQ(values_.close_to_one, 1.0);
+
+  // We already tested EXPECT_FLOAT_EQ(1.0, values_.further_from_one).
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(values_.further_from_one, 1.0),
+                          "1.0");
+}
+
+// Tests EXPECT_NEAR.
+TEST_F(FloatTest, EXPECT_NEAR) {
+  EXPECT_NEAR(-1.0f, -1.1f, 0.2f);
+  EXPECT_NEAR(2.0f, 3.0f, 1.0f);
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(1.0f,1.5f, 0.25f),  // NOLINT
+                          "The difference between 1.0f and 1.5f is 0.5, "
+                          "which exceeds 0.25f");
+  // To work around a bug in gcc 2.95.0, there is intentionally no
+  // space after the first comma in the previous line.
+}
+
+// Tests ASSERT_NEAR.
+TEST_F(FloatTest, ASSERT_NEAR) {
+  ASSERT_NEAR(-1.0f, -1.1f, 0.2f);
+  ASSERT_NEAR(2.0f, 3.0f, 1.0f);
+  EXPECT_FATAL_FAILURE(ASSERT_NEAR(1.0f,1.5f, 0.25f),  // NOLINT
+                       "The difference between 1.0f and 1.5f is 0.5, "
+                       "which exceeds 0.25f");
+  // To work around a bug in gcc 2.95.0, there is intentionally no
+  // space after the first comma in the previous line.
+}
+
+// Tests the cases where FloatLE() should succeed.
+TEST_F(FloatTest, FloatLESucceeds) {
+  EXPECT_PRED_FORMAT2(FloatLE, 1.0f, 2.0f);  // When val1 < val2,
+  ASSERT_PRED_FORMAT2(FloatLE, 1.0f, 1.0f);  // val1 == val2,
+
+  // or when val1 is greater than, but almost equals to, val2.
+  EXPECT_PRED_FORMAT2(FloatLE, values_.close_to_positive_zero, 0.0f);
+}
+
+// Tests the cases where FloatLE() should fail.
+TEST_F(FloatTest, FloatLEFails) {
+  // When val1 is greater than val2 by a large margin,
+  EXPECT_NONFATAL_FAILURE(EXPECT_PRED_FORMAT2(FloatLE, 2.0f, 1.0f),
+                          "(2.0f) <= (1.0f)");
+
+  // or by a small yet non-negligible margin,
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT2(FloatLE, values_.further_from_one, 1.0f);
+  }, "(values_.further_from_one) <= (1.0f)");
+
+#if !GTEST_OS_SYMBIAN && !defined(__BORLANDC__)
+  // Nokia's STLport crashes if we try to output infinity or NaN.
+  // C++Builder gives bad results for ordered comparisons involving NaNs
+  // due to compiler bugs.
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT2(FloatLE, values_.nan1, values_.infinity);
+  }, "(values_.nan1) <= (values_.infinity)");
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT2(FloatLE, -values_.infinity, values_.nan1);
+  }, "(-values_.infinity) <= (values_.nan1)");
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT2(FloatLE, values_.nan1, values_.nan1);
+  }, "(values_.nan1) <= (values_.nan1)");
+#endif  // !GTEST_OS_SYMBIAN && !defined(__BORLANDC__)
+}
+
+// Instantiates FloatingPointTest for testing *_DOUBLE_EQ.
+typedef FloatingPointTest<double> DoubleTest;
+
+// Tests that the size of Double::Bits matches the size of double.
+TEST_F(DoubleTest, Size) {
+  TestSize();
+}
+
+// Tests comparing with +0 and -0.
+TEST_F(DoubleTest, Zeros) {
+  EXPECT_DOUBLE_EQ(0.0, -0.0);
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(-0.0, 1.0),
+                          "1.0");
+  EXPECT_FATAL_FAILURE(ASSERT_DOUBLE_EQ(0.0, 1.0),
+                       "1.0");
+}
+
+// Tests comparing numbers close to 0.
+//
+// This ensures that *_DOUBLE_EQ handles the sign correctly and no
+// overflow occurs when comparing numbers whose absolute value is very
+// small.
+TEST_F(DoubleTest, AlmostZeros) {
+  // In C++Builder, names within local classes (such as used by
+  // EXPECT_FATAL_FAILURE) cannot be resolved against static members of the
+  // scoping class.  Use a static local alias as a workaround.
+  // We use the assignment syntax since some compilers, like Sun Studio,
+  // don't allow initializing references using construction syntax
+  // (parentheses).
+  static const DoubleTest::TestValues& v = this->values_;
+
+  EXPECT_DOUBLE_EQ(0.0, v.close_to_positive_zero);
+  EXPECT_DOUBLE_EQ(-0.0, v.close_to_negative_zero);
+  EXPECT_DOUBLE_EQ(v.close_to_positive_zero, v.close_to_negative_zero);
+
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_DOUBLE_EQ(v.close_to_positive_zero,
+                     v.further_from_negative_zero);
+  }, "v.further_from_negative_zero");
+}
+
+// Tests comparing numbers close to each other.
+TEST_F(DoubleTest, SmallDiff) {
+  EXPECT_DOUBLE_EQ(1.0, values_.close_to_one);
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(1.0, values_.further_from_one),
+                          "values_.further_from_one");
+}
+
+// Tests comparing numbers far apart.
+TEST_F(DoubleTest, LargeDiff) {
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(2.0, 3.0),
+                          "3.0");
+}
+
+// Tests comparing with infinity.
+//
+// This ensures that no overflow occurs when comparing numbers whose
+// absolute value is very large.
+TEST_F(DoubleTest, Infinity) {
+  EXPECT_DOUBLE_EQ(values_.infinity, values_.close_to_infinity);
+  EXPECT_DOUBLE_EQ(-values_.infinity, -values_.close_to_infinity);
+#if !GTEST_OS_SYMBIAN
+  // Nokia's STLport crashes if we try to output infinity or NaN.
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(values_.infinity, -values_.infinity),
+                          "-values_.infinity");
+
+  // This is interesting as the representations of infinity_ and nan1_
+  // are only 1 DLP apart.
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(values_.infinity, values_.nan1),
+                          "values_.nan1");
+#endif  // !GTEST_OS_SYMBIAN
+}
+
+// Tests that comparing with NAN always returns false.
+TEST_F(DoubleTest, NaN) {
+#if !GTEST_OS_SYMBIAN
+  // In C++Builder, names within local classes (such as used by
+  // EXPECT_FATAL_FAILURE) cannot be resolved against static members of the
+  // scoping class.  Use a static local alias as a workaround.
+  // We use the assignment syntax since some compilers, like Sun Studio,
+  // don't allow initializing references using construction syntax
+  // (parentheses).
+  static const DoubleTest::TestValues& v = this->values_;
+
+  // Nokia's STLport crashes if we try to output infinity or NaN.
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(v.nan1, v.nan1),
+                          "v.nan1");
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(v.nan1, v.nan2), "v.nan2");
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(1.0, v.nan1), "v.nan1");
+  EXPECT_FATAL_FAILURE(ASSERT_DOUBLE_EQ(v.nan1, v.infinity),
+                       "v.infinity");
+#endif  // !GTEST_OS_SYMBIAN
+}
+
+// Tests that *_DOUBLE_EQ are reflexive.
+TEST_F(DoubleTest, Reflexive) {
+  EXPECT_DOUBLE_EQ(0.0, 0.0);
+  EXPECT_DOUBLE_EQ(1.0, 1.0);
+#if !GTEST_OS_SYMBIAN
+  // Nokia's STLport crashes if we try to output infinity or NaN.
+  ASSERT_DOUBLE_EQ(values_.infinity, values_.infinity);
+#endif  // !GTEST_OS_SYMBIAN
+}
+
+// Tests that *_DOUBLE_EQ are commutative.
+TEST_F(DoubleTest, Commutative) {
+  // We already tested EXPECT_DOUBLE_EQ(1.0, values_.close_to_one).
+  EXPECT_DOUBLE_EQ(values_.close_to_one, 1.0);
+
+  // We already tested EXPECT_DOUBLE_EQ(1.0, values_.further_from_one).
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(values_.further_from_one, 1.0),
+                          "1.0");
+}
+
+// Tests EXPECT_NEAR.
+TEST_F(DoubleTest, EXPECT_NEAR) {
+  EXPECT_NEAR(-1.0, -1.1, 0.2);
+  EXPECT_NEAR(2.0, 3.0, 1.0);
+  EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(1.0, 1.5, 0.25),  // NOLINT
+                          "The difference between 1.0 and 1.5 is 0.5, "
+                          "which exceeds 0.25");
+  // To work around a bug in gcc 2.95.0, there is intentionally no
+  // space after the first comma in the previous statement.
+}
+
+// Tests ASSERT_NEAR.
+TEST_F(DoubleTest, ASSERT_NEAR) {
+  ASSERT_NEAR(-1.0, -1.1, 0.2);
+  ASSERT_NEAR(2.0, 3.0, 1.0);
+  EXPECT_FATAL_FAILURE(ASSERT_NEAR(1.0, 1.5, 0.25),  // NOLINT
+                       "The difference between 1.0 and 1.5 is 0.5, "
+                       "which exceeds 0.25");
+  // To work around a bug in gcc 2.95.0, there is intentionally no
+  // space after the first comma in the previous statement.
+}
+
+// Tests the cases where DoubleLE() should succeed.
+TEST_F(DoubleTest, DoubleLESucceeds) {
+  EXPECT_PRED_FORMAT2(DoubleLE, 1.0, 2.0);  // When val1 < val2,
+  ASSERT_PRED_FORMAT2(DoubleLE, 1.0, 1.0);  // val1 == val2,
+
+  // or when val1 is greater than, but almost equals to, val2.
+  EXPECT_PRED_FORMAT2(DoubleLE, values_.close_to_positive_zero, 0.0);
+}
+
+// Tests the cases where DoubleLE() should fail.
+TEST_F(DoubleTest, DoubleLEFails) {
+  // When val1 is greater than val2 by a large margin,
+  EXPECT_NONFATAL_FAILURE(EXPECT_PRED_FORMAT2(DoubleLE, 2.0, 1.0),
+                          "(2.0) <= (1.0)");
+
+  // or by a small yet non-negligible margin,
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT2(DoubleLE, values_.further_from_one, 1.0);
+  }, "(values_.further_from_one) <= (1.0)");
+
+#if !GTEST_OS_SYMBIAN && !defined(__BORLANDC__)
+  // Nokia's STLport crashes if we try to output infinity or NaN.
+  // C++Builder gives bad results for ordered comparisons involving NaNs
+  // due to compiler bugs.
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT2(DoubleLE, values_.nan1, values_.infinity);
+  }, "(values_.nan1) <= (values_.infinity)");
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_PRED_FORMAT2(DoubleLE, -values_.infinity, values_.nan1);
+  }, " (-values_.infinity) <= (values_.nan1)");
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_PRED_FORMAT2(DoubleLE, values_.nan1, values_.nan1);
+  }, "(values_.nan1) <= (values_.nan1)");
+#endif  // !GTEST_OS_SYMBIAN && !defined(__BORLANDC__)
+}
+
+
+// Verifies that a test or test case whose name starts with DISABLED_ is
+// not run.
+
+// A test whose name starts with DISABLED_.
+// Should not run.
+TEST(DisabledTest, DISABLED_TestShouldNotRun) {
+  FAIL() << "Unexpected failure: Disabled test should not be run.";
+}
+
+// A test whose name does not start with DISABLED_.
+// Should run.
+TEST(DisabledTest, NotDISABLED_TestShouldRun) {
+  EXPECT_EQ(1, 1);
+}
+
+// A test case whose name starts with DISABLED_.
+// Should not run.
+TEST(DISABLED_TestCase, TestShouldNotRun) {
+  FAIL() << "Unexpected failure: Test in disabled test case should not be run.";
+}
+
+// A test case and test whose names start with DISABLED_.
+// Should not run.
+TEST(DISABLED_TestCase, DISABLED_TestShouldNotRun) {
+  FAIL() << "Unexpected failure: Test in disabled test case should not be run.";
+}
+
+// Check that when all tests in a test case are disabled, SetupTestCase() and
+// TearDownTestCase() are not called.
+class DisabledTestsTest : public Test {
+ protected:
+  static void SetUpTestCase() {
+    FAIL() << "Unexpected failure: All tests disabled in test case. "
+              "SetupTestCase() should not be called.";
+  }
+
+  static void TearDownTestCase() {
+    FAIL() << "Unexpected failure: All tests disabled in test case. "
+              "TearDownTestCase() should not be called.";
+  }
+};
+
+TEST_F(DisabledTestsTest, DISABLED_TestShouldNotRun_1) {
+  FAIL() << "Unexpected failure: Disabled test should not be run.";
+}
+
+TEST_F(DisabledTestsTest, DISABLED_TestShouldNotRun_2) {
+  FAIL() << "Unexpected failure: Disabled test should not be run.";
+}
+
+// Tests that disabled typed tests aren't run.
+
+#if GTEST_HAS_TYPED_TEST
+
+template <typename T>
+class TypedTest : public Test {
+};
+
+typedef testing::Types<int, double> NumericTypes;
+TYPED_TEST_CASE(TypedTest, NumericTypes);
+
+TYPED_TEST(TypedTest, DISABLED_ShouldNotRun) {
+  FAIL() << "Unexpected failure: Disabled typed test should not run.";
+}
+
+template <typename T>
+class DISABLED_TypedTest : public Test {
+};
+
+TYPED_TEST_CASE(DISABLED_TypedTest, NumericTypes);
+
+TYPED_TEST(DISABLED_TypedTest, ShouldNotRun) {
+  FAIL() << "Unexpected failure: Disabled typed test should not run.";
+}
+
+#endif  // GTEST_HAS_TYPED_TEST
+
+// Tests that disabled type-parameterized tests aren't run.
+
+#if GTEST_HAS_TYPED_TEST_P
+
+template <typename T>
+class TypedTestP : public Test {
+};
+
+TYPED_TEST_CASE_P(TypedTestP);
+
+TYPED_TEST_P(TypedTestP, DISABLED_ShouldNotRun) {
+  FAIL() << "Unexpected failure: "
+         << "Disabled type-parameterized test should not run.";
+}
+
+REGISTER_TYPED_TEST_CASE_P(TypedTestP, DISABLED_ShouldNotRun);
+
+INSTANTIATE_TYPED_TEST_CASE_P(My, TypedTestP, NumericTypes);
+
+template <typename T>
+class DISABLED_TypedTestP : public Test {
+};
+
+TYPED_TEST_CASE_P(DISABLED_TypedTestP);
+
+TYPED_TEST_P(DISABLED_TypedTestP, ShouldNotRun) {
+  FAIL() << "Unexpected failure: "
+         << "Disabled type-parameterized test should not run.";
+}
+
+REGISTER_TYPED_TEST_CASE_P(DISABLED_TypedTestP, ShouldNotRun);
+
+INSTANTIATE_TYPED_TEST_CASE_P(My, DISABLED_TypedTestP, NumericTypes);
+
+#endif  // GTEST_HAS_TYPED_TEST_P
+
+// Tests that assertion macros evaluate their arguments exactly once.
+
+class SingleEvaluationTest : public Test {
+ public:  // Must be public and not protected due to a bug in g++ 3.4.2.
+  // This helper function is needed by the FailedASSERT_STREQ test
+  // below.  It's public to work around C++Builder's bug with scoping local
+  // classes.
+  static void CompareAndIncrementCharPtrs() {
+    ASSERT_STREQ(p1_++, p2_++);
+  }
+
+  // This helper function is needed by the FailedASSERT_NE test below.  It's
+  // public to work around C++Builder's bug with scoping local classes.
+  static void CompareAndIncrementInts() {
+    ASSERT_NE(a_++, b_++);
+  }
+
+ protected:
+  SingleEvaluationTest() {
+    p1_ = s1_;
+    p2_ = s2_;
+    a_ = 0;
+    b_ = 0;
+  }
+
+  static const char* const s1_;
+  static const char* const s2_;
+  static const char* p1_;
+  static const char* p2_;
+
+  static int a_;
+  static int b_;
+};
+
+const char* const SingleEvaluationTest::s1_ = "01234";
+const char* const SingleEvaluationTest::s2_ = "abcde";
+const char* SingleEvaluationTest::p1_;
+const char* SingleEvaluationTest::p2_;
+int SingleEvaluationTest::a_;
+int SingleEvaluationTest::b_;
+
+// Tests that when ASSERT_STREQ fails, it evaluates its arguments
+// exactly once.
+TEST_F(SingleEvaluationTest, FailedASSERT_STREQ) {
+  EXPECT_FATAL_FAILURE(SingleEvaluationTest::CompareAndIncrementCharPtrs(),
+                       "p2_++");
+  EXPECT_EQ(s1_ + 1, p1_);
+  EXPECT_EQ(s2_ + 1, p2_);
+}
+
+// Tests that string assertion arguments are evaluated exactly once.
+TEST_F(SingleEvaluationTest, ASSERT_STR) {
+  // successful EXPECT_STRNE
+  EXPECT_STRNE(p1_++, p2_++);
+  EXPECT_EQ(s1_ + 1, p1_);
+  EXPECT_EQ(s2_ + 1, p2_);
+
+  // failed EXPECT_STRCASEEQ
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRCASEEQ(p1_++, p2_++),
+                          "Ignoring case");
+  EXPECT_EQ(s1_ + 2, p1_);
+  EXPECT_EQ(s2_ + 2, p2_);
+}
+
+// Tests that when ASSERT_NE fails, it evaluates its arguments exactly
+// once.
+TEST_F(SingleEvaluationTest, FailedASSERT_NE) {
+  EXPECT_FATAL_FAILURE(SingleEvaluationTest::CompareAndIncrementInts(),
+                       "(a_++) != (b_++)");
+  EXPECT_EQ(1, a_);
+  EXPECT_EQ(1, b_);
+}
+
+// Tests that assertion arguments are evaluated exactly once.
+TEST_F(SingleEvaluationTest, OtherCases) {
+  // successful EXPECT_TRUE
+  EXPECT_TRUE(0 == a_++);  // NOLINT
+  EXPECT_EQ(1, a_);
+
+  // failed EXPECT_TRUE
+  EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(-1 == a_++), "-1 == a_++");
+  EXPECT_EQ(2, a_);
+
+  // successful EXPECT_GT
+  EXPECT_GT(a_++, b_++);
+  EXPECT_EQ(3, a_);
+  EXPECT_EQ(1, b_);
+
+  // failed EXPECT_LT
+  EXPECT_NONFATAL_FAILURE(EXPECT_LT(a_++, b_++), "(a_++) < (b_++)");
+  EXPECT_EQ(4, a_);
+  EXPECT_EQ(2, b_);
+
+  // successful ASSERT_TRUE
+  ASSERT_TRUE(0 < a_++);  // NOLINT
+  EXPECT_EQ(5, a_);
+
+  // successful ASSERT_GT
+  ASSERT_GT(a_++, b_++);
+  EXPECT_EQ(6, a_);
+  EXPECT_EQ(3, b_);
+}
+
+#if GTEST_HAS_EXCEPTIONS
+
+void ThrowAnInteger() {
+  throw 1;
+}
+
+// Tests that assertion arguments are evaluated exactly once.
+TEST_F(SingleEvaluationTest, ExceptionTests) {
+  // successful EXPECT_THROW
+  EXPECT_THROW({  // NOLINT
+    a_++;
+    ThrowAnInteger();
+  }, int);
+  EXPECT_EQ(1, a_);
+
+  // failed EXPECT_THROW, throws different
+  EXPECT_NONFATAL_FAILURE(EXPECT_THROW({  // NOLINT
+    a_++;
+    ThrowAnInteger();
+  }, bool), "throws a different type");
+  EXPECT_EQ(2, a_);
+
+  // failed EXPECT_THROW, throws nothing
+  EXPECT_NONFATAL_FAILURE(EXPECT_THROW(a_++, bool), "throws nothing");
+  EXPECT_EQ(3, a_);
+
+  // successful EXPECT_NO_THROW
+  EXPECT_NO_THROW(a_++);
+  EXPECT_EQ(4, a_);
+
+  // failed EXPECT_NO_THROW
+  EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW({  // NOLINT
+    a_++;
+    ThrowAnInteger();
+  }), "it throws");
+  EXPECT_EQ(5, a_);
+
+  // successful EXPECT_ANY_THROW
+  EXPECT_ANY_THROW({  // NOLINT
+    a_++;
+    ThrowAnInteger();
+  });
+  EXPECT_EQ(6, a_);
+
+  // failed EXPECT_ANY_THROW
+  EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(a_++), "it doesn't");
+  EXPECT_EQ(7, a_);
+}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// Tests {ASSERT|EXPECT}_NO_FATAL_FAILURE.
+class NoFatalFailureTest : public Test {
+ protected:
+  void Succeeds() {}
+  void FailsNonFatal() {
+    ADD_FAILURE() << "some non-fatal failure";
+  }
+  void Fails() {
+    FAIL() << "some fatal failure";
+  }
+
+  void DoAssertNoFatalFailureOnFails() {
+    ASSERT_NO_FATAL_FAILURE(Fails());
+    ADD_FAILURE() << "shold not reach here.";
+  }
+
+  void DoExpectNoFatalFailureOnFails() {
+    EXPECT_NO_FATAL_FAILURE(Fails());
+    ADD_FAILURE() << "other failure";
+  }
+};
+
+TEST_F(NoFatalFailureTest, NoFailure) {
+  EXPECT_NO_FATAL_FAILURE(Succeeds());
+  ASSERT_NO_FATAL_FAILURE(Succeeds());
+}
+
+TEST_F(NoFatalFailureTest, NonFatalIsNoFailure) {
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_NO_FATAL_FAILURE(FailsNonFatal()),
+      "some non-fatal failure");
+  EXPECT_NONFATAL_FAILURE(
+      ASSERT_NO_FATAL_FAILURE(FailsNonFatal()),
+      "some non-fatal failure");
+}
+
+TEST_F(NoFatalFailureTest, AssertNoFatalFailureOnFatalFailure) {
+  TestPartResultArray gtest_failures;
+  {
+    ScopedFakeTestPartResultReporter gtest_reporter(&gtest_failures);
+    DoAssertNoFatalFailureOnFails();
+  }
+  ASSERT_EQ(2, gtest_failures.size());
+  EXPECT_EQ(TestPartResult::kFatalFailure,
+            gtest_failures.GetTestPartResult(0).type());
+  EXPECT_EQ(TestPartResult::kFatalFailure,
+            gtest_failures.GetTestPartResult(1).type());
+  EXPECT_PRED_FORMAT2(testing::IsSubstring, "some fatal failure",
+                      gtest_failures.GetTestPartResult(0).message());
+  EXPECT_PRED_FORMAT2(testing::IsSubstring, "it does",
+                      gtest_failures.GetTestPartResult(1).message());
+}
+
+TEST_F(NoFatalFailureTest, ExpectNoFatalFailureOnFatalFailure) {
+  TestPartResultArray gtest_failures;
+  {
+    ScopedFakeTestPartResultReporter gtest_reporter(&gtest_failures);
+    DoExpectNoFatalFailureOnFails();
+  }
+  ASSERT_EQ(3, gtest_failures.size());
+  EXPECT_EQ(TestPartResult::kFatalFailure,
+            gtest_failures.GetTestPartResult(0).type());
+  EXPECT_EQ(TestPartResult::kNonFatalFailure,
+            gtest_failures.GetTestPartResult(1).type());
+  EXPECT_EQ(TestPartResult::kNonFatalFailure,
+            gtest_failures.GetTestPartResult(2).type());
+  EXPECT_PRED_FORMAT2(testing::IsSubstring, "some fatal failure",
+                      gtest_failures.GetTestPartResult(0).message());
+  EXPECT_PRED_FORMAT2(testing::IsSubstring, "it does",
+                      gtest_failures.GetTestPartResult(1).message());
+  EXPECT_PRED_FORMAT2(testing::IsSubstring, "other failure",
+                      gtest_failures.GetTestPartResult(2).message());
+}
+
+TEST_F(NoFatalFailureTest, MessageIsStreamable) {
+  TestPartResultArray gtest_failures;
+  {
+    ScopedFakeTestPartResultReporter gtest_reporter(&gtest_failures);
+    EXPECT_NO_FATAL_FAILURE(FAIL() << "foo") << "my message";
+  }
+  ASSERT_EQ(2, gtest_failures.size());
+  EXPECT_EQ(TestPartResult::kNonFatalFailure,
+            gtest_failures.GetTestPartResult(0).type());
+  EXPECT_EQ(TestPartResult::kNonFatalFailure,
+            gtest_failures.GetTestPartResult(1).type());
+  EXPECT_PRED_FORMAT2(testing::IsSubstring, "foo",
+                      gtest_failures.GetTestPartResult(0).message());
+  EXPECT_PRED_FORMAT2(testing::IsSubstring, "my message",
+                      gtest_failures.GetTestPartResult(1).message());
+}
+
+// Tests non-string assertions.
+
+std::string EditsToString(const std::vector<EditType>& edits) {
+  std::string out;
+  for (size_t i = 0; i < edits.size(); ++i) {
+    static const char kEdits[] = " +-/";
+    out.append(1, kEdits[edits[i]]);
+  }
+  return out;
+}
+
+std::vector<size_t> CharsToIndices(const std::string& str) {
+  std::vector<size_t> out;
+  for (size_t i = 0; i < str.size(); ++i) {
+    out.push_back(str[i]);
+  }
+  return out;
+}
+
+std::vector<std::string> CharsToLines(const std::string& str) {
+  std::vector<std::string> out;
+  for (size_t i = 0; i < str.size(); ++i) {
+    out.push_back(str.substr(i, 1));
+  }
+  return out;
+}
+
+TEST(EditDistance, TestCases) {
+  struct Case {
+    int line;
+    const char* left;
+    const char* right;
+    const char* expected_edits;
+    const char* expected_diff;
+  };
+  static const Case kCases[] = {
+      // No change.
+      {__LINE__, "A", "A", " ", ""},
+      {__LINE__, "ABCDE", "ABCDE", "     ", ""},
+      // Simple adds.
+      {__LINE__, "X", "XA", " +", "@@ +1,2 @@\n X\n+A\n"},
+      {__LINE__, "X", "XABCD", " ++++", "@@ +1,5 @@\n X\n+A\n+B\n+C\n+D\n"},
+      // Simple removes.
+      {__LINE__, "XA", "X", " -", "@@ -1,2 @@\n X\n-A\n"},
+      {__LINE__, "XABCD", "X", " ----", "@@ -1,5 @@\n X\n-A\n-B\n-C\n-D\n"},
+      // Simple replaces.
+      {__LINE__, "A", "a", "/", "@@ -1,1 +1,1 @@\n-A\n+a\n"},
+      {__LINE__, "ABCD", "abcd", "////",
+       "@@ -1,4 +1,4 @@\n-A\n-B\n-C\n-D\n+a\n+b\n+c\n+d\n"},
+      // Path finding.
+      {__LINE__, "ABCDEFGH", "ABXEGH1", "  -/ -  +",
+       "@@ -1,8 +1,7 @@\n A\n B\n-C\n-D\n+X\n E\n-F\n G\n H\n+1\n"},
+      {__LINE__, "AAAABCCCC", "ABABCDCDC", "- /   + / ",
+       "@@ -1,9 +1,9 @@\n-A\n A\n-A\n+B\n A\n B\n C\n+D\n C\n-C\n+D\n C\n"},
+      {__LINE__, "ABCDE", "BCDCD", "-   +/",
+       "@@ -1,5 +1,5 @@\n-A\n B\n C\n D\n-E\n+C\n+D\n"},
+      {__LINE__, "ABCDEFGHIJKL", "BCDCDEFGJKLJK", "- ++     --   ++",
+       "@@ -1,4 +1,5 @@\n-A\n B\n+C\n+D\n C\n D\n"
+       "@@ -6,7 +7,7 @@\n F\n G\n-H\n-I\n J\n K\n L\n+J\n+K\n"},
+      {}};
+  for (const Case* c = kCases; c->left; ++c) {
+    EXPECT_TRUE(c->expected_edits ==
+                EditsToString(CalculateOptimalEdits(CharsToIndices(c->left),
+                                                    CharsToIndices(c->right))))
+        << "Left <" << c->left << "> Right <" << c->right << "> Edits <"
+        << EditsToString(CalculateOptimalEdits(
+               CharsToIndices(c->left), CharsToIndices(c->right))) << ">";
+    EXPECT_TRUE(c->expected_diff == CreateUnifiedDiff(CharsToLines(c->left),
+                                                      CharsToLines(c->right)))
+        << "Left <" << c->left << "> Right <" << c->right << "> Diff <"
+        << CreateUnifiedDiff(CharsToLines(c->left), CharsToLines(c->right))
+        << ">";
+  }
+}
+
+// Tests EqFailure(), used for implementing *EQ* assertions.
+TEST(AssertionTest, EqFailure) {
+  const std::string foo_val("5"), bar_val("6");
+  const std::string msg1(
+      EqFailure("foo", "bar", foo_val, bar_val, false)
+      .failure_message());
+  EXPECT_STREQ(
+      "      Expected: foo\n"
+      "      Which is: 5\n"
+      "To be equal to: bar\n"
+      "      Which is: 6",
+      msg1.c_str());
+
+  const std::string msg2(
+      EqFailure("foo", "6", foo_val, bar_val, false)
+      .failure_message());
+  EXPECT_STREQ(
+      "      Expected: foo\n"
+      "      Which is: 5\n"
+      "To be equal to: 6",
+      msg2.c_str());
+
+  const std::string msg3(
+      EqFailure("5", "bar", foo_val, bar_val, false)
+      .failure_message());
+  EXPECT_STREQ(
+      "      Expected: 5\n"
+      "To be equal to: bar\n"
+      "      Which is: 6",
+      msg3.c_str());
+
+  const std::string msg4(
+      EqFailure("5", "6", foo_val, bar_val, false).failure_message());
+  EXPECT_STREQ(
+      "      Expected: 5\n"
+      "To be equal to: 6",
+      msg4.c_str());
+
+  const std::string msg5(
+      EqFailure("foo", "bar",
+                std::string("\"x\""), std::string("\"y\""),
+                true).failure_message());
+  EXPECT_STREQ(
+      "      Expected: foo\n"
+      "      Which is: \"x\"\n"
+      "To be equal to: bar\n"
+      "      Which is: \"y\"\n"
+      "Ignoring case",
+      msg5.c_str());
+}
+
+TEST(AssertionTest, EqFailureWithDiff) {
+  const std::string left(
+      "1\\n2XXX\\n3\\n5\\n6\\n7\\n8\\n9\\n10\\n11\\n12XXX\\n13\\n14\\n15");
+  const std::string right(
+      "1\\n2\\n3\\n4\\n5\\n6\\n7\\n8\\n9\\n11\\n12\\n13\\n14");
+  const std::string msg1(
+      EqFailure("left", "right", left, right, false).failure_message());
+  EXPECT_STREQ(
+      "      Expected: left\n"
+      "      Which is: "
+      "1\\n2XXX\\n3\\n5\\n6\\n7\\n8\\n9\\n10\\n11\\n12XXX\\n13\\n14\\n15\n"
+      "To be equal to: right\n"
+      "      Which is: 1\\n2\\n3\\n4\\n5\\n6\\n7\\n8\\n9\\n11\\n12\\n13\\n14\n"
+      "With diff:\n@@ -1,5 +1,6 @@\n 1\n-2XXX\n+2\n 3\n+4\n 5\n 6\n"
+      "@@ -7,8 +8,6 @@\n 8\n 9\n-10\n 11\n-12XXX\n+12\n 13\n 14\n-15\n",
+      msg1.c_str());
+}
+
+// Tests AppendUserMessage(), used for implementing the *EQ* macros.
+TEST(AssertionTest, AppendUserMessage) {
+  const std::string foo("foo");
+
+  Message msg;
+  EXPECT_STREQ("foo",
+               AppendUserMessage(foo, msg).c_str());
+
+  msg << "bar";
+  EXPECT_STREQ("foo\nbar",
+               AppendUserMessage(foo, msg).c_str());
+}
+
+#ifdef __BORLANDC__
+// Silences warnings: "Condition is always true", "Unreachable code"
+# pragma option push -w-ccc -w-rch
+#endif
+
+// Tests ASSERT_TRUE.
+TEST(AssertionTest, ASSERT_TRUE) {
+  ASSERT_TRUE(2 > 1);  // NOLINT
+  EXPECT_FATAL_FAILURE(ASSERT_TRUE(2 < 1),
+                       "2 < 1");
+}
+
+// Tests ASSERT_TRUE(predicate) for predicates returning AssertionResult.
+TEST(AssertionTest, AssertTrueWithAssertionResult) {
+  ASSERT_TRUE(ResultIsEven(2));
+#ifndef __BORLANDC__
+  // ICE's in C++Builder.
+  EXPECT_FATAL_FAILURE(ASSERT_TRUE(ResultIsEven(3)),
+                       "Value of: ResultIsEven(3)\n"
+                       "  Actual: false (3 is odd)\n"
+                       "Expected: true");
+#endif
+  ASSERT_TRUE(ResultIsEvenNoExplanation(2));
+  EXPECT_FATAL_FAILURE(ASSERT_TRUE(ResultIsEvenNoExplanation(3)),
+                       "Value of: ResultIsEvenNoExplanation(3)\n"
+                       "  Actual: false (3 is odd)\n"
+                       "Expected: true");
+}
+
+// Tests ASSERT_FALSE.
+TEST(AssertionTest, ASSERT_FALSE) {
+  ASSERT_FALSE(2 < 1);  // NOLINT
+  EXPECT_FATAL_FAILURE(ASSERT_FALSE(2 > 1),
+                       "Value of: 2 > 1\n"
+                       "  Actual: true\n"
+                       "Expected: false");
+}
+
+// Tests ASSERT_FALSE(predicate) for predicates returning AssertionResult.
+TEST(AssertionTest, AssertFalseWithAssertionResult) {
+  ASSERT_FALSE(ResultIsEven(3));
+#ifndef __BORLANDC__
+  // ICE's in C++Builder.
+  EXPECT_FATAL_FAILURE(ASSERT_FALSE(ResultIsEven(2)),
+                       "Value of: ResultIsEven(2)\n"
+                       "  Actual: true (2 is even)\n"
+                       "Expected: false");
+#endif
+  ASSERT_FALSE(ResultIsEvenNoExplanation(3));
+  EXPECT_FATAL_FAILURE(ASSERT_FALSE(ResultIsEvenNoExplanation(2)),
+                       "Value of: ResultIsEvenNoExplanation(2)\n"
+                       "  Actual: true\n"
+                       "Expected: false");
+}
+
+#ifdef __BORLANDC__
+// Restores warnings after previous "#pragma option push" supressed them
+# pragma option pop
+#endif
+
+// Tests using ASSERT_EQ on double values.  The purpose is to make
+// sure that the specialization we did for integer and anonymous enums
+// isn't used for double arguments.
+TEST(ExpectTest, ASSERT_EQ_Double) {
+  // A success.
+  ASSERT_EQ(5.6, 5.6);
+
+  // A failure.
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(5.1, 5.2),
+                       "5.1");
+}
+
+// Tests ASSERT_EQ.
+TEST(AssertionTest, ASSERT_EQ) {
+  ASSERT_EQ(5, 2 + 3);
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(5, 2*3),
+                       "      Expected: 5\n"
+                       "To be equal to: 2*3\n"
+                       "      Which is: 6");
+}
+
+// Tests ASSERT_EQ(NULL, pointer).
+#if GTEST_CAN_COMPARE_NULL
+TEST(AssertionTest, ASSERT_EQ_NULL) {
+  // A success.
+  const char* p = NULL;
+  // Some older GCC versions may issue a spurious waring in this or the next
+  // assertion statement. This warning should not be suppressed with
+  // static_cast since the test verifies the ability to use bare NULL as the
+  // expected parameter to the macro.
+  ASSERT_EQ(NULL, p);
+
+  // A failure.
+  static int n = 0;
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(NULL, &n),
+                       "To be equal to: &n\n");
+}
+#endif  // GTEST_CAN_COMPARE_NULL
+
+// Tests ASSERT_EQ(0, non_pointer).  Since the literal 0 can be
+// treated as a null pointer by the compiler, we need to make sure
+// that ASSERT_EQ(0, non_pointer) isn't interpreted by Google Test as
+// ASSERT_EQ(static_cast<void*>(NULL), non_pointer).
+TEST(ExpectTest, ASSERT_EQ_0) {
+  int n = 0;
+
+  // A success.
+  ASSERT_EQ(0, n);
+
+  // A failure.
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(0, 5.6),
+                       "Expected: 0");
+}
+
+// Tests ASSERT_NE.
+TEST(AssertionTest, ASSERT_NE) {
+  ASSERT_NE(6, 7);
+  EXPECT_FATAL_FAILURE(ASSERT_NE('a', 'a'),
+                       "Expected: ('a') != ('a'), "
+                       "actual: 'a' (97, 0x61) vs 'a' (97, 0x61)");
+}
+
+// Tests ASSERT_LE.
+TEST(AssertionTest, ASSERT_LE) {
+  ASSERT_LE(2, 3);
+  ASSERT_LE(2, 2);
+  EXPECT_FATAL_FAILURE(ASSERT_LE(2, 0),
+                       "Expected: (2) <= (0), actual: 2 vs 0");
+}
+
+// Tests ASSERT_LT.
+TEST(AssertionTest, ASSERT_LT) {
+  ASSERT_LT(2, 3);
+  EXPECT_FATAL_FAILURE(ASSERT_LT(2, 2),
+                       "Expected: (2) < (2), actual: 2 vs 2");
+}
+
+// Tests ASSERT_GE.
+TEST(AssertionTest, ASSERT_GE) {
+  ASSERT_GE(2, 1);
+  ASSERT_GE(2, 2);
+  EXPECT_FATAL_FAILURE(ASSERT_GE(2, 3),
+                       "Expected: (2) >= (3), actual: 2 vs 3");
+}
+
+// Tests ASSERT_GT.
+TEST(AssertionTest, ASSERT_GT) {
+  ASSERT_GT(2, 1);
+  EXPECT_FATAL_FAILURE(ASSERT_GT(2, 2),
+                       "Expected: (2) > (2), actual: 2 vs 2");
+}
+
+#if GTEST_HAS_EXCEPTIONS
+
+void ThrowNothing() {}
+
+// Tests ASSERT_THROW.
+TEST(AssertionTest, ASSERT_THROW) {
+  ASSERT_THROW(ThrowAnInteger(), int);
+
+# ifndef __BORLANDC__
+
+  // ICE's in C++Builder 2007 and 2009.
+  EXPECT_FATAL_FAILURE(
+      ASSERT_THROW(ThrowAnInteger(), bool),
+      "Expected: ThrowAnInteger() throws an exception of type bool.\n"
+      "  Actual: it throws a different type.");
+# endif
+
+  EXPECT_FATAL_FAILURE(
+      ASSERT_THROW(ThrowNothing(), bool),
+      "Expected: ThrowNothing() throws an exception of type bool.\n"
+      "  Actual: it throws nothing.");
+}
+
+// Tests ASSERT_NO_THROW.
+TEST(AssertionTest, ASSERT_NO_THROW) {
+  ASSERT_NO_THROW(ThrowNothing());
+  EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()),
+                       "Expected: ThrowAnInteger() doesn't throw an exception."
+                       "\n  Actual: it throws.");
+}
+
+// Tests ASSERT_ANY_THROW.
+TEST(AssertionTest, ASSERT_ANY_THROW) {
+  ASSERT_ANY_THROW(ThrowAnInteger());
+  EXPECT_FATAL_FAILURE(
+      ASSERT_ANY_THROW(ThrowNothing()),
+      "Expected: ThrowNothing() throws an exception.\n"
+      "  Actual: it doesn't.");
+}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// Makes sure we deal with the precedence of <<.  This test should
+// compile.
+TEST(AssertionTest, AssertPrecedence) {
+  ASSERT_EQ(1 < 2, true);
+  bool false_value = false;
+  ASSERT_EQ(true && false_value, false);
+}
+
+// A subroutine used by the following test.
+void TestEq1(int x) {
+  ASSERT_EQ(1, x);
+}
+
+// Tests calling a test subroutine that's not part of a fixture.
+TEST(AssertionTest, NonFixtureSubroutine) {
+  EXPECT_FATAL_FAILURE(TestEq1(2),
+                       "To be equal to: x");
+}
+
+// An uncopyable class.
+class Uncopyable {
+ public:
+  explicit Uncopyable(int a_value) : value_(a_value) {}
+
+  int value() const { return value_; }
+  bool operator==(const Uncopyable& rhs) const {
+    return value() == rhs.value();
+  }
+ private:
+  // This constructor deliberately has no implementation, as we don't
+  // want this class to be copyable.
+  Uncopyable(const Uncopyable&);  // NOLINT
+
+  int value_;
+};
+
+::std::ostream& operator<<(::std::ostream& os, const Uncopyable& value) {
+  return os << value.value();
+}
+
+
+bool IsPositiveUncopyable(const Uncopyable& x) {
+  return x.value() > 0;
+}
+
+// A subroutine used by the following test.
+void TestAssertNonPositive() {
+  Uncopyable y(-1);
+  ASSERT_PRED1(IsPositiveUncopyable, y);
+}
+// A subroutine used by the following test.
+void TestAssertEqualsUncopyable() {
+  Uncopyable x(5);
+  Uncopyable y(-1);
+  ASSERT_EQ(x, y);
+}
+
+// Tests that uncopyable objects can be used in assertions.
+TEST(AssertionTest, AssertWorksWithUncopyableObject) {
+  Uncopyable x(5);
+  ASSERT_PRED1(IsPositiveUncopyable, x);
+  ASSERT_EQ(x, x);
+  EXPECT_FATAL_FAILURE(TestAssertNonPositive(),
+    "IsPositiveUncopyable(y) evaluates to false, where\ny evaluates to -1");
+  EXPECT_FATAL_FAILURE(TestAssertEqualsUncopyable(),
+    "Expected: x\n      Which is: 5\nTo be equal to: y\n      Which is: -1");
+}
+
+// Tests that uncopyable objects can be used in expects.
+TEST(AssertionTest, ExpectWorksWithUncopyableObject) {
+  Uncopyable x(5);
+  EXPECT_PRED1(IsPositiveUncopyable, x);
+  Uncopyable y(-1);
+  EXPECT_NONFATAL_FAILURE(EXPECT_PRED1(IsPositiveUncopyable, y),
+    "IsPositiveUncopyable(y) evaluates to false, where\ny evaluates to -1");
+  EXPECT_EQ(x, x);
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(x, y),
+    "Expected: x\n      Which is: 5\nTo be equal to: y\n      Which is: -1");
+}
+
+enum NamedEnum {
+  kE1 = 0,
+  kE2 = 1
+};
+
+TEST(AssertionTest, NamedEnum) {
+  EXPECT_EQ(kE1, kE1);
+  EXPECT_LT(kE1, kE2);
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(kE1, kE2), "Which is: 0");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(kE1, kE2), "Which is: 1");
+}
+
+// The version of gcc used in XCode 2.2 has a bug and doesn't allow
+// anonymous enums in assertions.  Therefore the following test is not
+// done on Mac.
+// Sun Studio and HP aCC also reject this code.
+#if !GTEST_OS_MAC && !defined(__SUNPRO_CC) && !defined(__HP_aCC)
+
+// Tests using assertions with anonymous enums.
+enum {
+  kCaseA = -1,
+
+# if GTEST_OS_LINUX
+
+  // We want to test the case where the size of the anonymous enum is
+  // larger than sizeof(int), to make sure our implementation of the
+  // assertions doesn't truncate the enums.  However, MSVC
+  // (incorrectly) doesn't allow an enum value to exceed the range of
+  // an int, so this has to be conditionally compiled.
+  //
+  // On Linux, kCaseB and kCaseA have the same value when truncated to
+  // int size.  We want to test whether this will confuse the
+  // assertions.
+  kCaseB = testing::internal::kMaxBiggestInt,
+
+# else
+
+  kCaseB = INT_MAX,
+
+# endif  // GTEST_OS_LINUX
+
+  kCaseC = 42
+};
+
+TEST(AssertionTest, AnonymousEnum) {
+# if GTEST_OS_LINUX
+
+  EXPECT_EQ(static_cast<int>(kCaseA), static_cast<int>(kCaseB));
+
+# endif  // GTEST_OS_LINUX
+
+  EXPECT_EQ(kCaseA, kCaseA);
+  EXPECT_NE(kCaseA, kCaseB);
+  EXPECT_LT(kCaseA, kCaseB);
+  EXPECT_LE(kCaseA, kCaseB);
+  EXPECT_GT(kCaseB, kCaseA);
+  EXPECT_GE(kCaseA, kCaseA);
+  EXPECT_NONFATAL_FAILURE(EXPECT_GE(kCaseA, kCaseB),
+                          "(kCaseA) >= (kCaseB)");
+  EXPECT_NONFATAL_FAILURE(EXPECT_GE(kCaseA, kCaseC),
+                          "-1 vs 42");
+
+  ASSERT_EQ(kCaseA, kCaseA);
+  ASSERT_NE(kCaseA, kCaseB);
+  ASSERT_LT(kCaseA, kCaseB);
+  ASSERT_LE(kCaseA, kCaseB);
+  ASSERT_GT(kCaseB, kCaseA);
+  ASSERT_GE(kCaseA, kCaseA);
+
+# ifndef __BORLANDC__
+
+  // ICE's in C++Builder.
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseB),
+                       "To be equal to: kCaseB");
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC),
+                       "Which is: 42");
+# endif
+
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(kCaseA, kCaseC),
+                       "Which is: -1");
+}
+
+#endif  // !GTEST_OS_MAC && !defined(__SUNPRO_CC)
+
+#if GTEST_OS_WINDOWS
+
+static HRESULT UnexpectedHRESULTFailure() {
+  return E_UNEXPECTED;
+}
+
+static HRESULT OkHRESULTSuccess() {
+  return S_OK;
+}
+
+static HRESULT FalseHRESULTSuccess() {
+  return S_FALSE;
+}
+
+// HRESULT assertion tests test both zero and non-zero
+// success codes as well as failure message for each.
+//
+// Windows CE doesn't support message texts.
+TEST(HRESULTAssertionTest, EXPECT_HRESULT_SUCCEEDED) {
+  EXPECT_HRESULT_SUCCEEDED(S_OK);
+  EXPECT_HRESULT_SUCCEEDED(S_FALSE);
+
+  EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_SUCCEEDED(UnexpectedHRESULTFailure()),
+    "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
+    "  Actual: 0x8000FFFF");
+}
+
+TEST(HRESULTAssertionTest, ASSERT_HRESULT_SUCCEEDED) {
+  ASSERT_HRESULT_SUCCEEDED(S_OK);
+  ASSERT_HRESULT_SUCCEEDED(S_FALSE);
+
+  EXPECT_FATAL_FAILURE(ASSERT_HRESULT_SUCCEEDED(UnexpectedHRESULTFailure()),
+    "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
+    "  Actual: 0x8000FFFF");
+}
+
+TEST(HRESULTAssertionTest, EXPECT_HRESULT_FAILED) {
+  EXPECT_HRESULT_FAILED(E_UNEXPECTED);
+
+  EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(OkHRESULTSuccess()),
+    "Expected: (OkHRESULTSuccess()) fails.\n"
+    "  Actual: 0x0");
+  EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(FalseHRESULTSuccess()),
+    "Expected: (FalseHRESULTSuccess()) fails.\n"
+    "  Actual: 0x1");
+}
+
+TEST(HRESULTAssertionTest, ASSERT_HRESULT_FAILED) {
+  ASSERT_HRESULT_FAILED(E_UNEXPECTED);
+
+# ifndef __BORLANDC__
+
+  // ICE's in C++Builder 2007 and 2009.
+  EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(OkHRESULTSuccess()),
+    "Expected: (OkHRESULTSuccess()) fails.\n"
+    "  Actual: 0x0");
+# endif
+
+  EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(FalseHRESULTSuccess()),
+    "Expected: (FalseHRESULTSuccess()) fails.\n"
+    "  Actual: 0x1");
+}
+
+// Tests that streaming to the HRESULT macros works.
+TEST(HRESULTAssertionTest, Streaming) {
+  EXPECT_HRESULT_SUCCEEDED(S_OK) << "unexpected failure";
+  ASSERT_HRESULT_SUCCEEDED(S_OK) << "unexpected failure";
+  EXPECT_HRESULT_FAILED(E_UNEXPECTED) << "unexpected failure";
+  ASSERT_HRESULT_FAILED(E_UNEXPECTED) << "unexpected failure";
+
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_HRESULT_SUCCEEDED(E_UNEXPECTED) << "expected failure",
+      "expected failure");
+
+# ifndef __BORLANDC__
+
+  // ICE's in C++Builder 2007 and 2009.
+  EXPECT_FATAL_FAILURE(
+      ASSERT_HRESULT_SUCCEEDED(E_UNEXPECTED) << "expected failure",
+      "expected failure");
+# endif
+
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_HRESULT_FAILED(S_OK) << "expected failure",
+      "expected failure");
+
+  EXPECT_FATAL_FAILURE(
+      ASSERT_HRESULT_FAILED(S_OK) << "expected failure",
+      "expected failure");
+}
+
+#endif  // GTEST_OS_WINDOWS
+
+#ifdef __BORLANDC__
+// Silences warnings: "Condition is always true", "Unreachable code"
+# pragma option push -w-ccc -w-rch
+#endif
+
+// Tests that the assertion macros behave like single statements.
+TEST(AssertionSyntaxTest, BasicAssertionsBehavesLikeSingleStatement) {
+  if (AlwaysFalse())
+    ASSERT_TRUE(false) << "This should never be executed; "
+                          "It's a compilation test only.";
+
+  if (AlwaysTrue())
+    EXPECT_FALSE(false);
+  else
+    ;  // NOLINT
+
+  if (AlwaysFalse())
+    ASSERT_LT(1, 3);
+
+  if (AlwaysFalse())
+    ;  // NOLINT
+  else
+    EXPECT_GT(3, 2) << "";
+}
+
+#if GTEST_HAS_EXCEPTIONS
+// Tests that the compiler will not complain about unreachable code in the
+// EXPECT_THROW/EXPECT_ANY_THROW/EXPECT_NO_THROW macros.
+TEST(ExpectThrowTest, DoesNotGenerateUnreachableCodeWarning) {
+  int n = 0;
+
+  EXPECT_THROW(throw 1, int);
+  EXPECT_NONFATAL_FAILURE(EXPECT_THROW(n++, int), "");
+  EXPECT_NONFATAL_FAILURE(EXPECT_THROW(throw 1, const char*), "");
+  EXPECT_NO_THROW(n++);
+  EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(throw 1), "");
+  EXPECT_ANY_THROW(throw 1);
+  EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(n++), "");
+}
+
+TEST(AssertionSyntaxTest, ExceptionAssertionsBehavesLikeSingleStatement) {
+  if (AlwaysFalse())
+    EXPECT_THROW(ThrowNothing(), bool);
+
+  if (AlwaysTrue())
+    EXPECT_THROW(ThrowAnInteger(), int);
+  else
+    ;  // NOLINT
+
+  if (AlwaysFalse())
+    EXPECT_NO_THROW(ThrowAnInteger());
+
+  if (AlwaysTrue())
+    EXPECT_NO_THROW(ThrowNothing());
+  else
+    ;  // NOLINT
+
+  if (AlwaysFalse())
+    EXPECT_ANY_THROW(ThrowNothing());
+
+  if (AlwaysTrue())
+    EXPECT_ANY_THROW(ThrowAnInteger());
+  else
+    ;  // NOLINT
+}
+#endif  // GTEST_HAS_EXCEPTIONS
+
+TEST(AssertionSyntaxTest, NoFatalFailureAssertionsBehavesLikeSingleStatement) {
+  if (AlwaysFalse())
+    EXPECT_NO_FATAL_FAILURE(FAIL()) << "This should never be executed. "
+                                    << "It's a compilation test only.";
+  else
+    ;  // NOLINT
+
+  if (AlwaysFalse())
+    ASSERT_NO_FATAL_FAILURE(FAIL()) << "";
+  else
+    ;  // NOLINT
+
+  if (AlwaysTrue())
+    EXPECT_NO_FATAL_FAILURE(SUCCEED());
+  else
+    ;  // NOLINT
+
+  if (AlwaysFalse())
+    ;  // NOLINT
+  else
+    ASSERT_NO_FATAL_FAILURE(SUCCEED());
+}
+
+// Tests that the assertion macros work well with switch statements.
+TEST(AssertionSyntaxTest, WorksWithSwitch) {
+  switch (0) {
+    case 1:
+      break;
+    default:
+      ASSERT_TRUE(true);
+  }
+
+  switch (0)
+    case 0:
+      EXPECT_FALSE(false) << "EXPECT_FALSE failed in switch case";
+
+  // Binary assertions are implemented using a different code path
+  // than the Boolean assertions.  Hence we test them separately.
+  switch (0) {
+    case 1:
+    default:
+      ASSERT_EQ(1, 1) << "ASSERT_EQ failed in default switch handler";
+  }
+
+  switch (0)
+    case 0:
+      EXPECT_NE(1, 2);
+}
+
+#if GTEST_HAS_EXCEPTIONS
+
+void ThrowAString() {
+    throw "std::string";
+}
+
+// Test that the exception assertion macros compile and work with const
+// type qualifier.
+TEST(AssertionSyntaxTest, WorksWithConst) {
+    ASSERT_THROW(ThrowAString(), const char*);
+
+    EXPECT_THROW(ThrowAString(), const char*);
+}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+}  // namespace
+
+namespace testing {
+
+// Tests that Google Test tracks SUCCEED*.
+TEST(SuccessfulAssertionTest, SUCCEED) {
+  SUCCEED();
+  SUCCEED() << "OK";
+  EXPECT_EQ(2, GetUnitTestImpl()->current_test_result()->total_part_count());
+}
+
+// Tests that Google Test doesn't track successful EXPECT_*.
+TEST(SuccessfulAssertionTest, EXPECT) {
+  EXPECT_TRUE(true);
+  EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count());
+}
+
+// Tests that Google Test doesn't track successful EXPECT_STR*.
+TEST(SuccessfulAssertionTest, EXPECT_STR) {
+  EXPECT_STREQ("", "");
+  EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count());
+}
+
+// Tests that Google Test doesn't track successful ASSERT_*.
+TEST(SuccessfulAssertionTest, ASSERT) {
+  ASSERT_TRUE(true);
+  EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count());
+}
+
+// Tests that Google Test doesn't track successful ASSERT_STR*.
+TEST(SuccessfulAssertionTest, ASSERT_STR) {
+  ASSERT_STREQ("", "");
+  EXPECT_EQ(0, GetUnitTestImpl()->current_test_result()->total_part_count());
+}
+
+}  // namespace testing
+
+namespace {
+
+// Tests the message streaming variation of assertions.
+
+TEST(AssertionWithMessageTest, EXPECT) {
+  EXPECT_EQ(1, 1) << "This should succeed.";
+  EXPECT_NONFATAL_FAILURE(EXPECT_NE(1, 1) << "Expected failure #1.",
+                          "Expected failure #1");
+  EXPECT_LE(1, 2) << "This should succeed.";
+  EXPECT_NONFATAL_FAILURE(EXPECT_LT(1, 0) << "Expected failure #2.",
+                          "Expected failure #2.");
+  EXPECT_GE(1, 0) << "This should succeed.";
+  EXPECT_NONFATAL_FAILURE(EXPECT_GT(1, 2) << "Expected failure #3.",
+                          "Expected failure #3.");
+
+  EXPECT_STREQ("1", "1") << "This should succeed.";
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRNE("1", "1") << "Expected failure #4.",
+                          "Expected failure #4.");
+  EXPECT_STRCASEEQ("a", "A") << "This should succeed.";
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRCASENE("a", "A") << "Expected failure #5.",
+                          "Expected failure #5.");
+
+  EXPECT_FLOAT_EQ(1, 1) << "This should succeed.";
+  EXPECT_NONFATAL_FAILURE(EXPECT_DOUBLE_EQ(1, 1.2) << "Expected failure #6.",
+                          "Expected failure #6.");
+  EXPECT_NEAR(1, 1.1, 0.2) << "This should succeed.";
+}
+
+TEST(AssertionWithMessageTest, ASSERT) {
+  ASSERT_EQ(1, 1) << "This should succeed.";
+  ASSERT_NE(1, 2) << "This should succeed.";
+  ASSERT_LE(1, 2) << "This should succeed.";
+  ASSERT_LT(1, 2) << "This should succeed.";
+  ASSERT_GE(1, 0) << "This should succeed.";
+  EXPECT_FATAL_FAILURE(ASSERT_GT(1, 2) << "Expected failure.",
+                       "Expected failure.");
+}
+
+TEST(AssertionWithMessageTest, ASSERT_STR) {
+  ASSERT_STREQ("1", "1") << "This should succeed.";
+  ASSERT_STRNE("1", "2") << "This should succeed.";
+  ASSERT_STRCASEEQ("a", "A") << "This should succeed.";
+  EXPECT_FATAL_FAILURE(ASSERT_STRCASENE("a", "A") << "Expected failure.",
+                       "Expected failure.");
+}
+
+TEST(AssertionWithMessageTest, ASSERT_FLOATING) {
+  ASSERT_FLOAT_EQ(1, 1) << "This should succeed.";
+  ASSERT_DOUBLE_EQ(1, 1) << "This should succeed.";
+  EXPECT_FATAL_FAILURE(ASSERT_NEAR(1,1.2, 0.1) << "Expect failure.",  // NOLINT
+                       "Expect failure.");
+  // To work around a bug in gcc 2.95.0, there is intentionally no
+  // space after the first comma in the previous statement.
+}
+
+// Tests using ASSERT_FALSE with a streamed message.
+TEST(AssertionWithMessageTest, ASSERT_FALSE) {
+  ASSERT_FALSE(false) << "This shouldn't fail.";
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_FALSE(true) << "Expected failure: " << 2 << " > " << 1
+                       << " evaluates to " << true;
+  }, "Expected failure");
+}
+
+// Tests using FAIL with a streamed message.
+TEST(AssertionWithMessageTest, FAIL) {
+  EXPECT_FATAL_FAILURE(FAIL() << 0,
+                       "0");
+}
+
+// Tests using SUCCEED with a streamed message.
+TEST(AssertionWithMessageTest, SUCCEED) {
+  SUCCEED() << "Success == " << 1;
+}
+
+// Tests using ASSERT_TRUE with a streamed message.
+TEST(AssertionWithMessageTest, ASSERT_TRUE) {
+  ASSERT_TRUE(true) << "This should succeed.";
+  ASSERT_TRUE(true) << true;
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_TRUE(false) << static_cast<const char *>(NULL)
+                       << static_cast<char *>(NULL);
+  }, "(null)(null)");
+}
+
+#if GTEST_OS_WINDOWS
+// Tests using wide strings in assertion messages.
+TEST(AssertionWithMessageTest, WideStringMessage) {
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_TRUE(false) << L"This failure is expected.\x8119";
+  }, "This failure is expected.");
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_EQ(1, 2) << "This failure is "
+                    << L"expected too.\x8120";
+  }, "This failure is expected too.");
+}
+#endif  // GTEST_OS_WINDOWS
+
+// Tests EXPECT_TRUE.
+TEST(ExpectTest, EXPECT_TRUE) {
+  EXPECT_TRUE(true) << "Intentional success";
+  EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(false) << "Intentional failure #1.",
+                          "Intentional failure #1.");
+  EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(false) << "Intentional failure #2.",
+                          "Intentional failure #2.");
+  EXPECT_TRUE(2 > 1);  // NOLINT
+  EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(2 < 1),
+                          "Value of: 2 < 1\n"
+                          "  Actual: false\n"
+                          "Expected: true");
+  EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(2 > 3),
+                          "2 > 3");
+}
+
+// Tests EXPECT_TRUE(predicate) for predicates returning AssertionResult.
+TEST(ExpectTest, ExpectTrueWithAssertionResult) {
+  EXPECT_TRUE(ResultIsEven(2));
+  EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(ResultIsEven(3)),
+                          "Value of: ResultIsEven(3)\n"
+                          "  Actual: false (3 is odd)\n"
+                          "Expected: true");
+  EXPECT_TRUE(ResultIsEvenNoExplanation(2));
+  EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(ResultIsEvenNoExplanation(3)),
+                          "Value of: ResultIsEvenNoExplanation(3)\n"
+                          "  Actual: false (3 is odd)\n"
+                          "Expected: true");
+}
+
+// Tests EXPECT_FALSE with a streamed message.
+TEST(ExpectTest, EXPECT_FALSE) {
+  EXPECT_FALSE(2 < 1);  // NOLINT
+  EXPECT_FALSE(false) << "Intentional success";
+  EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(true) << "Intentional failure #1.",
+                          "Intentional failure #1.");
+  EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(true) << "Intentional failure #2.",
+                          "Intentional failure #2.");
+  EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(2 > 1),
+                          "Value of: 2 > 1\n"
+                          "  Actual: true\n"
+                          "Expected: false");
+  EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(2 < 3),
+                          "2 < 3");
+}
+
+// Tests EXPECT_FALSE(predicate) for predicates returning AssertionResult.
+TEST(ExpectTest, ExpectFalseWithAssertionResult) {
+  EXPECT_FALSE(ResultIsEven(3));
+  EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(ResultIsEven(2)),
+                          "Value of: ResultIsEven(2)\n"
+                          "  Actual: true (2 is even)\n"
+                          "Expected: false");
+  EXPECT_FALSE(ResultIsEvenNoExplanation(3));
+  EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(ResultIsEvenNoExplanation(2)),
+                          "Value of: ResultIsEvenNoExplanation(2)\n"
+                          "  Actual: true\n"
+                          "Expected: false");
+}
+
+#ifdef __BORLANDC__
+// Restores warnings after previous "#pragma option push" supressed them
+# pragma option pop
+#endif
+
+// Tests EXPECT_EQ.
+TEST(ExpectTest, EXPECT_EQ) {
+  EXPECT_EQ(5, 2 + 3);
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5, 2*3),
+                          "      Expected: 5\n"
+                          "To be equal to: 2*3\n"
+                          "      Which is: 6");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5, 2 - 3),
+                          "2 - 3");
+}
+
+// Tests using EXPECT_EQ on double values.  The purpose is to make
+// sure that the specialization we did for integer and anonymous enums
+// isn't used for double arguments.
+TEST(ExpectTest, EXPECT_EQ_Double) {
+  // A success.
+  EXPECT_EQ(5.6, 5.6);
+
+  // A failure.
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(5.1, 5.2),
+                          "5.1");
+}
+
+#if GTEST_CAN_COMPARE_NULL
+// Tests EXPECT_EQ(NULL, pointer).
+TEST(ExpectTest, EXPECT_EQ_NULL) {
+  // A success.
+  const char* p = NULL;
+  // Some older GCC versions may issue a spurious warning in this or the next
+  // assertion statement. This warning should not be suppressed with
+  // static_cast since the test verifies the ability to use bare NULL as the
+  // expected parameter to the macro.
+  EXPECT_EQ(NULL, p);
+
+  // A failure.
+  int n = 0;
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(NULL, &n),
+                          "To be equal to: &n\n");
+}
+#endif  // GTEST_CAN_COMPARE_NULL
+
+// Tests EXPECT_EQ(0, non_pointer).  Since the literal 0 can be
+// treated as a null pointer by the compiler, we need to make sure
+// that EXPECT_EQ(0, non_pointer) isn't interpreted by Google Test as
+// EXPECT_EQ(static_cast<void*>(NULL), non_pointer).
+TEST(ExpectTest, EXPECT_EQ_0) {
+  int n = 0;
+
+  // A success.
+  EXPECT_EQ(0, n);
+
+  // A failure.
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(0, 5.6),
+                          "Expected: 0");
+}
+
+// Tests EXPECT_NE.
+TEST(ExpectTest, EXPECT_NE) {
+  EXPECT_NE(6, 7);
+
+  EXPECT_NONFATAL_FAILURE(EXPECT_NE('a', 'a'),
+                          "Expected: ('a') != ('a'), "
+                          "actual: 'a' (97, 0x61) vs 'a' (97, 0x61)");
+  EXPECT_NONFATAL_FAILURE(EXPECT_NE(2, 2),
+                          "2");
+  char* const p0 = NULL;
+  EXPECT_NONFATAL_FAILURE(EXPECT_NE(p0, p0),
+                          "p0");
+  // Only way to get the Nokia compiler to compile the cast
+  // is to have a separate void* variable first. Putting
+  // the two casts on the same line doesn't work, neither does
+  // a direct C-style to char*.
+  void* pv1 = (void*)0x1234;  // NOLINT
+  char* const p1 = reinterpret_cast<char*>(pv1);
+  EXPECT_NONFATAL_FAILURE(EXPECT_NE(p1, p1),
+                          "p1");
+}
+
+// Tests EXPECT_LE.
+TEST(ExpectTest, EXPECT_LE) {
+  EXPECT_LE(2, 3);
+  EXPECT_LE(2, 2);
+  EXPECT_NONFATAL_FAILURE(EXPECT_LE(2, 0),
+                          "Expected: (2) <= (0), actual: 2 vs 0");
+  EXPECT_NONFATAL_FAILURE(EXPECT_LE(1.1, 0.9),
+                          "(1.1) <= (0.9)");
+}
+
+// Tests EXPECT_LT.
+TEST(ExpectTest, EXPECT_LT) {
+  EXPECT_LT(2, 3);
+  EXPECT_NONFATAL_FAILURE(EXPECT_LT(2, 2),
+                          "Expected: (2) < (2), actual: 2 vs 2");
+  EXPECT_NONFATAL_FAILURE(EXPECT_LT(2, 1),
+                          "(2) < (1)");
+}
+
+// Tests EXPECT_GE.
+TEST(ExpectTest, EXPECT_GE) {
+  EXPECT_GE(2, 1);
+  EXPECT_GE(2, 2);
+  EXPECT_NONFATAL_FAILURE(EXPECT_GE(2, 3),
+                          "Expected: (2) >= (3), actual: 2 vs 3");
+  EXPECT_NONFATAL_FAILURE(EXPECT_GE(0.9, 1.1),
+                          "(0.9) >= (1.1)");
+}
+
+// Tests EXPECT_GT.
+TEST(ExpectTest, EXPECT_GT) {
+  EXPECT_GT(2, 1);
+  EXPECT_NONFATAL_FAILURE(EXPECT_GT(2, 2),
+                          "Expected: (2) > (2), actual: 2 vs 2");
+  EXPECT_NONFATAL_FAILURE(EXPECT_GT(2, 3),
+                          "(2) > (3)");
+}
+
+#if GTEST_HAS_EXCEPTIONS
+
+// Tests EXPECT_THROW.
+TEST(ExpectTest, EXPECT_THROW) {
+  EXPECT_THROW(ThrowAnInteger(), int);
+  EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool),
+                          "Expected: ThrowAnInteger() throws an exception of "
+                          "type bool.\n  Actual: it throws a different type.");
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_THROW(ThrowNothing(), bool),
+      "Expected: ThrowNothing() throws an exception of type bool.\n"
+      "  Actual: it throws nothing.");
+}
+
+// Tests EXPECT_NO_THROW.
+TEST(ExpectTest, EXPECT_NO_THROW) {
+  EXPECT_NO_THROW(ThrowNothing());
+  EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()),
+                          "Expected: ThrowAnInteger() doesn't throw an "
+                          "exception.\n  Actual: it throws.");
+}
+
+// Tests EXPECT_ANY_THROW.
+TEST(ExpectTest, EXPECT_ANY_THROW) {
+  EXPECT_ANY_THROW(ThrowAnInteger());
+  EXPECT_NONFATAL_FAILURE(
+      EXPECT_ANY_THROW(ThrowNothing()),
+      "Expected: ThrowNothing() throws an exception.\n"
+      "  Actual: it doesn't.");
+}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// Make sure we deal with the precedence of <<.
+TEST(ExpectTest, ExpectPrecedence) {
+  EXPECT_EQ(1 < 2, true);
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(true, true && false),
+                          "To be equal to: true && false");
+}
+
+
+// Tests the StreamableToString() function.
+
+// Tests using StreamableToString() on a scalar.
+TEST(StreamableToStringTest, Scalar) {
+  EXPECT_STREQ("5", StreamableToString(5).c_str());
+}
+
+// Tests using StreamableToString() on a non-char pointer.
+TEST(StreamableToStringTest, Pointer) {
+  int n = 0;
+  int* p = &n;
+  EXPECT_STRNE("(null)", StreamableToString(p).c_str());
+}
+
+// Tests using StreamableToString() on a NULL non-char pointer.
+TEST(StreamableToStringTest, NullPointer) {
+  int* p = NULL;
+  EXPECT_STREQ("(null)", StreamableToString(p).c_str());
+}
+
+// Tests using StreamableToString() on a C string.
+TEST(StreamableToStringTest, CString) {
+  EXPECT_STREQ("Foo", StreamableToString("Foo").c_str());
+}
+
+// Tests using StreamableToString() on a NULL C string.
+TEST(StreamableToStringTest, NullCString) {
+  char* p = NULL;
+  EXPECT_STREQ("(null)", StreamableToString(p).c_str());
+}
+
+// Tests using streamable values as assertion messages.
+
+// Tests using std::string as an assertion message.
+TEST(StreamableTest, string) {
+  static const std::string str(
+      "This failure message is a std::string, and is expected.");
+  EXPECT_FATAL_FAILURE(FAIL() << str,
+                       str.c_str());
+}
+
+// Tests that we can output strings containing embedded NULs.
+// Limited to Linux because we can only do this with std::string's.
+TEST(StreamableTest, stringWithEmbeddedNUL) {
+  static const char char_array_with_nul[] =
+      "Here's a NUL\0 and some more string";
+  static const std::string string_with_nul(char_array_with_nul,
+                                           sizeof(char_array_with_nul)
+                                           - 1);  // drops the trailing NUL
+  EXPECT_FATAL_FAILURE(FAIL() << string_with_nul,
+                       "Here's a NUL\\0 and some more string");
+}
+
+// Tests that we can output a NUL char.
+TEST(StreamableTest, NULChar) {
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    FAIL() << "A NUL" << '\0' << " and some more string";
+  }, "A NUL\\0 and some more string");
+}
+
+// Tests using int as an assertion message.
+TEST(StreamableTest, int) {
+  EXPECT_FATAL_FAILURE(FAIL() << 900913,
+                       "900913");
+}
+
+// Tests using NULL char pointer as an assertion message.
+//
+// In MSVC, streaming a NULL char * causes access violation.  Google Test
+// implemented a workaround (substituting "(null)" for NULL).  This
+// tests whether the workaround works.
+TEST(StreamableTest, NullCharPtr) {
+  EXPECT_FATAL_FAILURE(FAIL() << static_cast<const char*>(NULL),
+                       "(null)");
+}
+
+// Tests that basic IO manipulators (endl, ends, and flush) can be
+// streamed to testing::Message.
+TEST(StreamableTest, BasicIoManip) {
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    FAIL() << "Line 1." << std::endl
+           << "A NUL char " << std::ends << std::flush << " in line 2.";
+  }, "Line 1.\nA NUL char \\0 in line 2.");
+}
+
+// Tests the macros that haven't been covered so far.
+
+void AddFailureHelper(bool* aborted) {
+  *aborted = true;
+  ADD_FAILURE() << "Intentional failure.";
+  *aborted = false;
+}
+
+// Tests ADD_FAILURE.
+TEST(MacroTest, ADD_FAILURE) {
+  bool aborted = true;
+  EXPECT_NONFATAL_FAILURE(AddFailureHelper(&aborted),
+                          "Intentional failure.");
+  EXPECT_FALSE(aborted);
+}
+
+// Tests ADD_FAILURE_AT.
+TEST(MacroTest, ADD_FAILURE_AT) {
+  // Verifies that ADD_FAILURE_AT does generate a nonfatal failure and
+  // the failure message contains the user-streamed part.
+  EXPECT_NONFATAL_FAILURE(ADD_FAILURE_AT("foo.cc", 42) << "Wrong!", "Wrong!");
+
+  // Verifies that the user-streamed part is optional.
+  EXPECT_NONFATAL_FAILURE(ADD_FAILURE_AT("foo.cc", 42), "Failed");
+
+  // Unfortunately, we cannot verify that the failure message contains
+  // the right file path and line number the same way, as
+  // EXPECT_NONFATAL_FAILURE() doesn't get to see the file path and
+  // line number.  Instead, we do that in gtest_output_test_.cc.
+}
+
+// Tests FAIL.
+TEST(MacroTest, FAIL) {
+  EXPECT_FATAL_FAILURE(FAIL(),
+                       "Failed");
+  EXPECT_FATAL_FAILURE(FAIL() << "Intentional failure.",
+                       "Intentional failure.");
+}
+
+// Tests SUCCEED
+TEST(MacroTest, SUCCEED) {
+  SUCCEED();
+  SUCCEED() << "Explicit success.";
+}
+
+// Tests for EXPECT_EQ() and ASSERT_EQ().
+//
+// These tests fail *intentionally*, s.t. the failure messages can be
+// generated and tested.
+//
+// We have different tests for different argument types.
+
+// Tests using bool values in {EXPECT|ASSERT}_EQ.
+TEST(EqAssertionTest, Bool) {
+  EXPECT_EQ(true,  true);
+  EXPECT_FATAL_FAILURE({
+      bool false_value = false;
+      ASSERT_EQ(false_value, true);
+    }, "To be equal to: true");
+}
+
+// Tests using int values in {EXPECT|ASSERT}_EQ.
+TEST(EqAssertionTest, Int) {
+  ASSERT_EQ(32, 32);
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(32, 33),
+                          "33");
+}
+
+// Tests using time_t values in {EXPECT|ASSERT}_EQ.
+TEST(EqAssertionTest, Time_T) {
+  EXPECT_EQ(static_cast<time_t>(0),
+            static_cast<time_t>(0));
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(static_cast<time_t>(0),
+                                 static_cast<time_t>(1234)),
+                       "1234");
+}
+
+// Tests using char values in {EXPECT|ASSERT}_EQ.
+TEST(EqAssertionTest, Char) {
+  ASSERT_EQ('z', 'z');
+  const char ch = 'b';
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ('\0', ch),
+                          "ch");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ('a', ch),
+                          "ch");
+}
+
+// Tests using wchar_t values in {EXPECT|ASSERT}_EQ.
+TEST(EqAssertionTest, WideChar) {
+  EXPECT_EQ(L'b', L'b');
+
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(L'\0', L'x'),
+                          "      Expected: L'\0'\n"
+                          "      Which is: L'\0' (0, 0x0)\n"
+                          "To be equal to: L'x'\n"
+                          "      Which is: L'x' (120, 0x78)");
+
+  static wchar_t wchar;
+  wchar = L'b';
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(L'a', wchar),
+                          "wchar");
+  wchar = 0x8119;
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(static_cast<wchar_t>(0x8120), wchar),
+                       "To be equal to: wchar");
+}
+
+// Tests using ::std::string values in {EXPECT|ASSERT}_EQ.
+TEST(EqAssertionTest, StdString) {
+  // Compares a const char* to an std::string that has identical
+  // content.
+  ASSERT_EQ("Test", ::std::string("Test"));
+
+  // Compares two identical std::strings.
+  static const ::std::string str1("A * in the middle");
+  static const ::std::string str2(str1);
+  EXPECT_EQ(str1, str2);
+
+  // Compares a const char* to an std::string that has different
+  // content
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ("Test", ::std::string("test")),
+                          "\"test\"");
+
+  // Compares an std::string to a char* that has different content.
+  char* const p1 = const_cast<char*>("foo");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(::std::string("bar"), p1),
+                          "p1");
+
+  // Compares two std::strings that have different contents, one of
+  // which having a NUL character in the middle.  This should fail.
+  static ::std::string str3(str1);
+  str3.at(2) = '\0';
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(str1, str3),
+                       "To be equal to: str3\n"
+                       "      Which is: \"A \\0 in the middle\"");
+}
+
+#if GTEST_HAS_STD_WSTRING
+
+// Tests using ::std::wstring values in {EXPECT|ASSERT}_EQ.
+TEST(EqAssertionTest, StdWideString) {
+  // Compares two identical std::wstrings.
+  const ::std::wstring wstr1(L"A * in the middle");
+  const ::std::wstring wstr2(wstr1);
+  ASSERT_EQ(wstr1, wstr2);
+
+  // Compares an std::wstring to a const wchar_t* that has identical
+  // content.
+  const wchar_t kTestX8119[] = { 'T', 'e', 's', 't', 0x8119, '\0' };
+  EXPECT_EQ(::std::wstring(kTestX8119), kTestX8119);
+
+  // Compares an std::wstring to a const wchar_t* that has different
+  // content.
+  const wchar_t kTestX8120[] = { 'T', 'e', 's', 't', 0x8120, '\0' };
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_EQ(::std::wstring(kTestX8119), kTestX8120);
+  }, "kTestX8120");
+
+  // Compares two std::wstrings that have different contents, one of
+  // which having a NUL character in the middle.
+  ::std::wstring wstr3(wstr1);
+  wstr3.at(2) = L'\0';
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(wstr1, wstr3),
+                          "wstr3");
+
+  // Compares a wchar_t* to an std::wstring that has different
+  // content.
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_EQ(const_cast<wchar_t*>(L"foo"), ::std::wstring(L"bar"));
+  }, "");
+}
+
+#endif  // GTEST_HAS_STD_WSTRING
+
+#if GTEST_HAS_GLOBAL_STRING
+// Tests using ::string values in {EXPECT|ASSERT}_EQ.
+TEST(EqAssertionTest, GlobalString) {
+  // Compares a const char* to a ::string that has identical content.
+  EXPECT_EQ("Test", ::string("Test"));
+
+  // Compares two identical ::strings.
+  const ::string str1("A * in the middle");
+  const ::string str2(str1);
+  ASSERT_EQ(str1, str2);
+
+  // Compares a ::string to a const char* that has different content.
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(::string("Test"), "test"),
+                          "test");
+
+  // Compares two ::strings that have different contents, one of which
+  // having a NUL character in the middle.
+  ::string str3(str1);
+  str3.at(2) = '\0';
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(str1, str3),
+                          "str3");
+
+  // Compares a ::string to a char* that has different content.
+  EXPECT_FATAL_FAILURE({  // NOLINT
+    ASSERT_EQ(::string("bar"), const_cast<char*>("foo"));
+  }, "");
+}
+
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+#if GTEST_HAS_GLOBAL_WSTRING
+
+// Tests using ::wstring values in {EXPECT|ASSERT}_EQ.
+TEST(EqAssertionTest, GlobalWideString) {
+  // Compares two identical ::wstrings.
+  static const ::wstring wstr1(L"A * in the middle");
+  static const ::wstring wstr2(wstr1);
+  EXPECT_EQ(wstr1, wstr2);
+
+  // Compares a const wchar_t* to a ::wstring that has identical content.
+  const wchar_t kTestX8119[] = { 'T', 'e', 's', 't', 0x8119, '\0' };
+  ASSERT_EQ(kTestX8119, ::wstring(kTestX8119));
+
+  // Compares a const wchar_t* to a ::wstring that has different
+  // content.
+  const wchar_t kTestX8120[] = { 'T', 'e', 's', 't', 0x8120, '\0' };
+  EXPECT_NONFATAL_FAILURE({  // NOLINT
+    EXPECT_EQ(kTestX8120, ::wstring(kTestX8119));
+  }, "Test\\x8119");
+
+  // Compares a wchar_t* to a ::wstring that has different content.
+  wchar_t* const p1 = const_cast<wchar_t*>(L"foo");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, ::wstring(L"bar")),
+                          "bar");
+
+  // Compares two ::wstrings that have different contents, one of which
+  // having a NUL character in the middle.
+  static ::wstring wstr3;
+  wstr3 = wstr1;
+  wstr3.at(2) = L'\0';
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(wstr1, wstr3),
+                       "wstr3");
+}
+
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+// Tests using char pointers in {EXPECT|ASSERT}_EQ.
+TEST(EqAssertionTest, CharPointer) {
+  char* const p0 = NULL;
+  // Only way to get the Nokia compiler to compile the cast
+  // is to have a separate void* variable first. Putting
+  // the two casts on the same line doesn't work, neither does
+  // a direct C-style to char*.
+  void* pv1 = (void*)0x1234;  // NOLINT
+  void* pv2 = (void*)0xABC0;  // NOLINT
+  char* const p1 = reinterpret_cast<char*>(pv1);
+  char* const p2 = reinterpret_cast<char*>(pv2);
+  ASSERT_EQ(p1, p1);
+
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2),
+                          "To be equal to: p2");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2),
+                          "p2");
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(reinterpret_cast<char*>(0x1234),
+                                 reinterpret_cast<char*>(0xABC0)),
+                       "ABC0");
+}
+
+// Tests using wchar_t pointers in {EXPECT|ASSERT}_EQ.
+TEST(EqAssertionTest, WideCharPointer) {
+  wchar_t* const p0 = NULL;
+  // Only way to get the Nokia compiler to compile the cast
+  // is to have a separate void* variable first. Putting
+  // the two casts on the same line doesn't work, neither does
+  // a direct C-style to char*.
+  void* pv1 = (void*)0x1234;  // NOLINT
+  void* pv2 = (void*)0xABC0;  // NOLINT
+  wchar_t* const p1 = reinterpret_cast<wchar_t*>(pv1);
+  wchar_t* const p2 = reinterpret_cast<wchar_t*>(pv2);
+  EXPECT_EQ(p0, p0);
+
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2),
+                          "To be equal to: p2");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2),
+                          "p2");
+  void* pv3 = (void*)0x1234;  // NOLINT
+  void* pv4 = (void*)0xABC0;  // NOLINT
+  const wchar_t* p3 = reinterpret_cast<const wchar_t*>(pv3);
+  const wchar_t* p4 = reinterpret_cast<const wchar_t*>(pv4);
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p3, p4),
+                          "p4");
+}
+
+// Tests using other types of pointers in {EXPECT|ASSERT}_EQ.
+TEST(EqAssertionTest, OtherPointer) {
+  ASSERT_EQ(static_cast<const int*>(NULL),
+            static_cast<const int*>(NULL));
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(static_cast<const int*>(NULL),
+                                 reinterpret_cast<const int*>(0x1234)),
+                       "0x1234");
+}
+
+// A class that supports binary comparison operators but not streaming.
+class UnprintableChar {
+ public:
+  explicit UnprintableChar(char ch) : char_(ch) {}
+
+  bool operator==(const UnprintableChar& rhs) const {
+    return char_ == rhs.char_;
+  }
+  bool operator!=(const UnprintableChar& rhs) const {
+    return char_ != rhs.char_;
+  }
+  bool operator<(const UnprintableChar& rhs) const {
+    return char_ < rhs.char_;
+  }
+  bool operator<=(const UnprintableChar& rhs) const {
+    return char_ <= rhs.char_;
+  }
+  bool operator>(const UnprintableChar& rhs) const {
+    return char_ > rhs.char_;
+  }
+  bool operator>=(const UnprintableChar& rhs) const {
+    return char_ >= rhs.char_;
+  }
+
+ private:
+  char char_;
+};
+
+// Tests that ASSERT_EQ() and friends don't require the arguments to
+// be printable.
+TEST(ComparisonAssertionTest, AcceptsUnprintableArgs) {
+  const UnprintableChar x('x'), y('y');
+  ASSERT_EQ(x, x);
+  EXPECT_NE(x, y);
+  ASSERT_LT(x, y);
+  EXPECT_LE(x, y);
+  ASSERT_GT(y, x);
+  EXPECT_GE(x, x);
+
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(x, y), "1-byte object <78>");
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(x, y), "1-byte object <79>");
+  EXPECT_NONFATAL_FAILURE(EXPECT_LT(y, y), "1-byte object <79>");
+  EXPECT_NONFATAL_FAILURE(EXPECT_GT(x, y), "1-byte object <78>");
+  EXPECT_NONFATAL_FAILURE(EXPECT_GT(x, y), "1-byte object <79>");
+
+  // Code tested by EXPECT_FATAL_FAILURE cannot reference local
+  // variables, so we have to write UnprintableChar('x') instead of x.
+#ifndef __BORLANDC__
+  // ICE's in C++Builder.
+  EXPECT_FATAL_FAILURE(ASSERT_NE(UnprintableChar('x'), UnprintableChar('x')),
+                       "1-byte object <78>");
+  EXPECT_FATAL_FAILURE(ASSERT_LE(UnprintableChar('y'), UnprintableChar('x')),
+                       "1-byte object <78>");
+#endif
+  EXPECT_FATAL_FAILURE(ASSERT_LE(UnprintableChar('y'), UnprintableChar('x')),
+                       "1-byte object <79>");
+  EXPECT_FATAL_FAILURE(ASSERT_GE(UnprintableChar('x'), UnprintableChar('y')),
+                       "1-byte object <78>");
+  EXPECT_FATAL_FAILURE(ASSERT_GE(UnprintableChar('x'), UnprintableChar('y')),
+                       "1-byte object <79>");
+}
+
+// Tests the FRIEND_TEST macro.
+
+// This class has a private member we want to test.  We will test it
+// both in a TEST and in a TEST_F.
+class Foo {
+ public:
+  Foo() {}
+
+ private:
+  int Bar() const { return 1; }
+
+  // Declares the friend tests that can access the private member
+  // Bar().
+  FRIEND_TEST(FRIEND_TEST_Test, TEST);
+  FRIEND_TEST(FRIEND_TEST_Test2, TEST_F);
+};
+
+// Tests that the FRIEND_TEST declaration allows a TEST to access a
+// class's private members.  This should compile.
+TEST(FRIEND_TEST_Test, TEST) {
+  ASSERT_EQ(1, Foo().Bar());
+}
+
+// The fixture needed to test using FRIEND_TEST with TEST_F.
+class FRIEND_TEST_Test2 : public Test {
+ protected:
+  Foo foo;
+};
+
+// Tests that the FRIEND_TEST declaration allows a TEST_F to access a
+// class's private members.  This should compile.
+TEST_F(FRIEND_TEST_Test2, TEST_F) {
+  ASSERT_EQ(1, foo.Bar());
+}
+
+// Tests the life cycle of Test objects.
+
+// The test fixture for testing the life cycle of Test objects.
+//
+// This class counts the number of live test objects that uses this
+// fixture.
+class TestLifeCycleTest : public Test {
+ protected:
+  // Constructor.  Increments the number of test objects that uses
+  // this fixture.
+  TestLifeCycleTest() { count_++; }
+
+  // Destructor.  Decrements the number of test objects that uses this
+  // fixture.
+  ~TestLifeCycleTest() { count_--; }
+
+  // Returns the number of live test objects that uses this fixture.
+  int count() const { return count_; }
+
+ private:
+  static int count_;
+};
+
+int TestLifeCycleTest::count_ = 0;
+
+// Tests the life cycle of test objects.
+TEST_F(TestLifeCycleTest, Test1) {
+  // There should be only one test object in this test case that's
+  // currently alive.
+  ASSERT_EQ(1, count());
+}
+
+// Tests the life cycle of test objects.
+TEST_F(TestLifeCycleTest, Test2) {
+  // After Test1 is done and Test2 is started, there should still be
+  // only one live test object, as the object for Test1 should've been
+  // deleted.
+  ASSERT_EQ(1, count());
+}
+
+}  // namespace
+
+// Tests that the copy constructor works when it is NOT optimized away by
+// the compiler.
+TEST(AssertionResultTest, CopyConstructorWorksWhenNotOptimied) {
+  // Checks that the copy constructor doesn't try to dereference NULL pointers
+  // in the source object.
+  AssertionResult r1 = AssertionSuccess();
+  AssertionResult r2 = r1;
+  // The following line is added to prevent the compiler from optimizing
+  // away the constructor call.
+  r1 << "abc";
+
+  AssertionResult r3 = r1;
+  EXPECT_EQ(static_cast<bool>(r3), static_cast<bool>(r1));
+  EXPECT_STREQ("abc", r1.message());
+}
+
+// Tests that AssertionSuccess and AssertionFailure construct
+// AssertionResult objects as expected.
+TEST(AssertionResultTest, ConstructionWorks) {
+  AssertionResult r1 = AssertionSuccess();
+  EXPECT_TRUE(r1);
+  EXPECT_STREQ("", r1.message());
+
+  AssertionResult r2 = AssertionSuccess() << "abc";
+  EXPECT_TRUE(r2);
+  EXPECT_STREQ("abc", r2.message());
+
+  AssertionResult r3 = AssertionFailure();
+  EXPECT_FALSE(r3);
+  EXPECT_STREQ("", r3.message());
+
+  AssertionResult r4 = AssertionFailure() << "def";
+  EXPECT_FALSE(r4);
+  EXPECT_STREQ("def", r4.message());
+
+  AssertionResult r5 = AssertionFailure(Message() << "ghi");
+  EXPECT_FALSE(r5);
+  EXPECT_STREQ("ghi", r5.message());
+}
+
+// Tests that the negation flips the predicate result but keeps the message.
+TEST(AssertionResultTest, NegationWorks) {
+  AssertionResult r1 = AssertionSuccess() << "abc";
+  EXPECT_FALSE(!r1);
+  EXPECT_STREQ("abc", (!r1).message());
+
+  AssertionResult r2 = AssertionFailure() << "def";
+  EXPECT_TRUE(!r2);
+  EXPECT_STREQ("def", (!r2).message());
+}
+
+TEST(AssertionResultTest, StreamingWorks) {
+  AssertionResult r = AssertionSuccess();
+  r << "abc" << 'd' << 0 << true;
+  EXPECT_STREQ("abcd0true", r.message());
+}
+
+TEST(AssertionResultTest, CanStreamOstreamManipulators) {
+  AssertionResult r = AssertionSuccess();
+  r << "Data" << std::endl << std::flush << std::ends << "Will be visible";
+  EXPECT_STREQ("Data\n\\0Will be visible", r.message());
+}
+
+// The next test uses explicit conversion operators -- a C++11 feature.
+#if GTEST_LANG_CXX11
+
+TEST(AssertionResultTest, ConstructibleFromContextuallyConvertibleToBool) {
+  struct ExplicitlyConvertibleToBool {
+    explicit operator bool() const { return value; }
+    bool value;
+  };
+  ExplicitlyConvertibleToBool v1 = {false};
+  ExplicitlyConvertibleToBool v2 = {true};
+  EXPECT_FALSE(v1);
+  EXPECT_TRUE(v2);
+}
+
+#endif  // GTEST_LANG_CXX11
+
+struct ConvertibleToAssertionResult {
+  operator AssertionResult() const { return AssertionResult(true); }
+};
+
+TEST(AssertionResultTest, ConstructibleFromImplicitlyConvertible) {
+  ConvertibleToAssertionResult obj;
+  EXPECT_TRUE(obj);
+}
+
+// Tests streaming a user type whose definition and operator << are
+// both in the global namespace.
+class Base {
+ public:
+  explicit Base(int an_x) : x_(an_x) {}
+  int x() const { return x_; }
+ private:
+  int x_;
+};
+std::ostream& operator<<(std::ostream& os,
+                         const Base& val) {
+  return os << val.x();
+}
+std::ostream& operator<<(std::ostream& os,
+                         const Base* pointer) {
+  return os << "(" << pointer->x() << ")";
+}
+
+TEST(MessageTest, CanStreamUserTypeInGlobalNameSpace) {
+  Message msg;
+  Base a(1);
+
+  msg << a << &a;  // Uses ::operator<<.
+  EXPECT_STREQ("1(1)", msg.GetString().c_str());
+}
+
+// Tests streaming a user type whose definition and operator<< are
+// both in an unnamed namespace.
+namespace {
+class MyTypeInUnnamedNameSpace : public Base {
+ public:
+  explicit MyTypeInUnnamedNameSpace(int an_x): Base(an_x) {}
+};
+std::ostream& operator<<(std::ostream& os,
+                         const MyTypeInUnnamedNameSpace& val) {
+  return os << val.x();
+}
+std::ostream& operator<<(std::ostream& os,
+                         const MyTypeInUnnamedNameSpace* pointer) {
+  return os << "(" << pointer->x() << ")";
+}
+}  // namespace
+
+TEST(MessageTest, CanStreamUserTypeInUnnamedNameSpace) {
+  Message msg;
+  MyTypeInUnnamedNameSpace a(1);
+
+  msg << a << &a;  // Uses <unnamed_namespace>::operator<<.
+  EXPECT_STREQ("1(1)", msg.GetString().c_str());
+}
+
+// Tests streaming a user type whose definition and operator<< are
+// both in a user namespace.
+namespace namespace1 {
+class MyTypeInNameSpace1 : public Base {
+ public:
+  explicit MyTypeInNameSpace1(int an_x): Base(an_x) {}
+};
+std::ostream& operator<<(std::ostream& os,
+                         const MyTypeInNameSpace1& val) {
+  return os << val.x();
+}
+std::ostream& operator<<(std::ostream& os,
+                         const MyTypeInNameSpace1* pointer) {
+  return os << "(" << pointer->x() << ")";
+}
+}  // namespace namespace1
+
+TEST(MessageTest, CanStreamUserTypeInUserNameSpace) {
+  Message msg;
+  namespace1::MyTypeInNameSpace1 a(1);
+
+  msg << a << &a;  // Uses namespace1::operator<<.
+  EXPECT_STREQ("1(1)", msg.GetString().c_str());
+}
+
+// Tests streaming a user type whose definition is in a user namespace
+// but whose operator<< is in the global namespace.
+namespace namespace2 {
+class MyTypeInNameSpace2 : public ::Base {
+ public:
+  explicit MyTypeInNameSpace2(int an_x): Base(an_x) {}
+};
+}  // namespace namespace2
+std::ostream& operator<<(std::ostream& os,
+                         const namespace2::MyTypeInNameSpace2& val) {
+  return os << val.x();
+}
+std::ostream& operator<<(std::ostream& os,
+                         const namespace2::MyTypeInNameSpace2* pointer) {
+  return os << "(" << pointer->x() << ")";
+}
+
+TEST(MessageTest, CanStreamUserTypeInUserNameSpaceWithStreamOperatorInGlobal) {
+  Message msg;
+  namespace2::MyTypeInNameSpace2 a(1);
+
+  msg << a << &a;  // Uses ::operator<<.
+  EXPECT_STREQ("1(1)", msg.GetString().c_str());
+}
+
+// Tests streaming NULL pointers to testing::Message.
+TEST(MessageTest, NullPointers) {
+  Message msg;
+  char* const p1 = NULL;
+  unsigned char* const p2 = NULL;
+  int* p3 = NULL;
+  double* p4 = NULL;
+  bool* p5 = NULL;
+  Message* p6 = NULL;
+
+  msg << p1 << p2 << p3 << p4 << p5 << p6;
+  ASSERT_STREQ("(null)(null)(null)(null)(null)(null)",
+               msg.GetString().c_str());
+}
+
+// Tests streaming wide strings to testing::Message.
+TEST(MessageTest, WideStrings) {
+  // Streams a NULL of type const wchar_t*.
+  const wchar_t* const_wstr = NULL;
+  EXPECT_STREQ("(null)",
+               (Message() << const_wstr).GetString().c_str());
+
+  // Streams a NULL of type wchar_t*.
+  wchar_t* wstr = NULL;
+  EXPECT_STREQ("(null)",
+               (Message() << wstr).GetString().c_str());
+
+  // Streams a non-NULL of type const wchar_t*.
+  const_wstr = L"abc\x8119";
+  EXPECT_STREQ("abc\xe8\x84\x99",
+               (Message() << const_wstr).GetString().c_str());
+
+  // Streams a non-NULL of type wchar_t*.
+  wstr = const_cast<wchar_t*>(const_wstr);
+  EXPECT_STREQ("abc\xe8\x84\x99",
+               (Message() << wstr).GetString().c_str());
+}
+
+
+// This line tests that we can define tests in the testing namespace.
+namespace testing {
+
+// Tests the TestInfo class.
+
+class TestInfoTest : public Test {
+ protected:
+  static const TestInfo* GetTestInfo(const char* test_name) {
+    const TestCase* const test_case = GetUnitTestImpl()->
+        GetTestCase("TestInfoTest", "", NULL, NULL);
+
+    for (int i = 0; i < test_case->total_test_count(); ++i) {
+      const TestInfo* const test_info = test_case->GetTestInfo(i);
+      if (strcmp(test_name, test_info->name()) == 0)
+        return test_info;
+    }
+    return NULL;
+  }
+
+  static const TestResult* GetTestResult(
+      const TestInfo* test_info) {
+    return test_info->result();
+  }
+};
+
+// Tests TestInfo::test_case_name() and TestInfo::name().
+TEST_F(TestInfoTest, Names) {
+  const TestInfo* const test_info = GetTestInfo("Names");
+
+  ASSERT_STREQ("TestInfoTest", test_info->test_case_name());
+  ASSERT_STREQ("Names", test_info->name());
+}
+
+// Tests TestInfo::result().
+TEST_F(TestInfoTest, result) {
+  const TestInfo* const test_info = GetTestInfo("result");
+
+  // Initially, there is no TestPartResult for this test.
+  ASSERT_EQ(0, GetTestResult(test_info)->total_part_count());
+
+  // After the previous assertion, there is still none.
+  ASSERT_EQ(0, GetTestResult(test_info)->total_part_count());
+}
+
+#define VERIFY_CODE_LOCATION \
+  const int expected_line = __LINE__ - 1; \
+  const TestInfo* const test_info = GetUnitTestImpl()->current_test_info(); \
+  ASSERT_TRUE(test_info); \
+  EXPECT_STREQ(__FILE__, test_info->file()); \
+  EXPECT_EQ(expected_line, test_info->line())
+
+TEST(CodeLocationForTEST, Verify) {
+  VERIFY_CODE_LOCATION;
+}
+
+class CodeLocationForTESTF : public Test {
+};
+
+TEST_F(CodeLocationForTESTF, Verify) {
+  VERIFY_CODE_LOCATION;
+}
+
+class CodeLocationForTESTP : public TestWithParam<int> {
+};
+
+TEST_P(CodeLocationForTESTP, Verify) {
+  VERIFY_CODE_LOCATION;
+}
+
+INSTANTIATE_TEST_CASE_P(, CodeLocationForTESTP, Values(0));
+
+template <typename T>
+class CodeLocationForTYPEDTEST : public Test {
+};
+
+TYPED_TEST_CASE(CodeLocationForTYPEDTEST, int);
+
+TYPED_TEST(CodeLocationForTYPEDTEST, Verify) {
+  VERIFY_CODE_LOCATION;
+}
+
+template <typename T>
+class CodeLocationForTYPEDTESTP : public Test {
+};
+
+TYPED_TEST_CASE_P(CodeLocationForTYPEDTESTP);
+
+TYPED_TEST_P(CodeLocationForTYPEDTESTP, Verify) {
+  VERIFY_CODE_LOCATION;
+}
+
+REGISTER_TYPED_TEST_CASE_P(CodeLocationForTYPEDTESTP, Verify);
+
+INSTANTIATE_TYPED_TEST_CASE_P(My, CodeLocationForTYPEDTESTP, int);
+
+#undef VERIFY_CODE_LOCATION
+
+// Tests setting up and tearing down a test case.
+
+class SetUpTestCaseTest : public Test {
+ protected:
+  // This will be called once before the first test in this test case
+  // is run.
+  static void SetUpTestCase() {
+    printf("Setting up the test case . . .\n");
+
+    // Initializes some shared resource.  In this simple example, we
+    // just create a C string.  More complex stuff can be done if
+    // desired.
+    shared_resource_ = "123";
+
+    // Increments the number of test cases that have been set up.
+    counter_++;
+
+    // SetUpTestCase() should be called only once.
+    EXPECT_EQ(1, counter_);
+  }
+
+  // This will be called once after the last test in this test case is
+  // run.
+  static void TearDownTestCase() {
+    printf("Tearing down the test case . . .\n");
+
+    // Decrements the number of test cases that have been set up.
+    counter_--;
+
+    // TearDownTestCase() should be called only once.
+    EXPECT_EQ(0, counter_);
+
+    // Cleans up the shared resource.
+    shared_resource_ = NULL;
+  }
+
+  // This will be called before each test in this test case.
+  virtual void SetUp() {
+    // SetUpTestCase() should be called only once, so counter_ should
+    // always be 1.
+    EXPECT_EQ(1, counter_);
+  }
+
+  // Number of test cases that have been set up.
+  static int counter_;
+
+  // Some resource to be shared by all tests in this test case.
+  static const char* shared_resource_;
+};
+
+int SetUpTestCaseTest::counter_ = 0;
+const char* SetUpTestCaseTest::shared_resource_ = NULL;
+
+// A test that uses the shared resource.
+TEST_F(SetUpTestCaseTest, Test1) {
+  EXPECT_STRNE(NULL, shared_resource_);
+}
+
+// Another test that uses the shared resource.
+TEST_F(SetUpTestCaseTest, Test2) {
+  EXPECT_STREQ("123", shared_resource_);
+}
+
+// The InitGoogleTestTest test case tests testing::InitGoogleTest().
+
+// The Flags struct stores a copy of all Google Test flags.
+struct Flags {
+  // Constructs a Flags struct where each flag has its default value.
+  Flags() : also_run_disabled_tests(false),
+            break_on_failure(false),
+            catch_exceptions(false),
+            death_test_use_fork(false),
+            filter(""),
+            list_tests(false),
+            output(""),
+            print_time(true),
+            random_seed(0),
+            repeat(1),
+            shuffle(false),
+            stack_trace_depth(kMaxStackTraceDepth),
+            stream_result_to(""),
+            throw_on_failure(false) {}
+
+  // Factory methods.
+
+  // Creates a Flags struct where the gtest_also_run_disabled_tests flag has
+  // the given value.
+  static Flags AlsoRunDisabledTests(bool also_run_disabled_tests) {
+    Flags flags;
+    flags.also_run_disabled_tests = also_run_disabled_tests;
+    return flags;
+  }
+
+  // Creates a Flags struct where the gtest_break_on_failure flag has
+  // the given value.
+  static Flags BreakOnFailure(bool break_on_failure) {
+    Flags flags;
+    flags.break_on_failure = break_on_failure;
+    return flags;
+  }
+
+  // Creates a Flags struct where the gtest_catch_exceptions flag has
+  // the given value.
+  static Flags CatchExceptions(bool catch_exceptions) {
+    Flags flags;
+    flags.catch_exceptions = catch_exceptions;
+    return flags;
+  }
+
+  // Creates a Flags struct where the gtest_death_test_use_fork flag has
+  // the given value.
+  static Flags DeathTestUseFork(bool death_test_use_fork) {
+    Flags flags;
+    flags.death_test_use_fork = death_test_use_fork;
+    return flags;
+  }
+
+  // Creates a Flags struct where the gtest_filter flag has the given
+  // value.
+  static Flags Filter(const char* filter) {
+    Flags flags;
+    flags.filter = filter;
+    return flags;
+  }
+
+  // Creates a Flags struct where the gtest_list_tests flag has the
+  // given value.
+  static Flags ListTests(bool list_tests) {
+    Flags flags;
+    flags.list_tests = list_tests;
+    return flags;
+  }
+
+  // Creates a Flags struct where the gtest_output flag has the given
+  // value.
+  static Flags Output(const char* output) {
+    Flags flags;
+    flags.output = output;
+    return flags;
+  }
+
+  // Creates a Flags struct where the gtest_print_time flag has the given
+  // value.
+  static Flags PrintTime(bool print_time) {
+    Flags flags;
+    flags.print_time = print_time;
+    return flags;
+  }
+
+  // Creates a Flags struct where the gtest_random_seed flag has
+  // the given value.
+  static Flags RandomSeed(Int32 random_seed) {
+    Flags flags;
+    flags.random_seed = random_seed;
+    return flags;
+  }
+
+  // Creates a Flags struct where the gtest_repeat flag has the given
+  // value.
+  static Flags Repeat(Int32 repeat) {
+    Flags flags;
+    flags.repeat = repeat;
+    return flags;
+  }
+
+  // Creates a Flags struct where the gtest_shuffle flag has
+  // the given value.
+  static Flags Shuffle(bool shuffle) {
+    Flags flags;
+    flags.shuffle = shuffle;
+    return flags;
+  }
+
+  // Creates a Flags struct where the GTEST_FLAG(stack_trace_depth) flag has
+  // the given value.
+  static Flags StackTraceDepth(Int32 stack_trace_depth) {
+    Flags flags;
+    flags.stack_trace_depth = stack_trace_depth;
+    return flags;
+  }
+
+  // Creates a Flags struct where the GTEST_FLAG(stream_result_to) flag has
+  // the given value.
+  static Flags StreamResultTo(const char* stream_result_to) {
+    Flags flags;
+    flags.stream_result_to = stream_result_to;
+    return flags;
+  }
+
+  // Creates a Flags struct where the gtest_throw_on_failure flag has
+  // the given value.
+  static Flags ThrowOnFailure(bool throw_on_failure) {
+    Flags flags;
+    flags.throw_on_failure = throw_on_failure;
+    return flags;
+  }
+
+  // These fields store the flag values.
+  bool also_run_disabled_tests;
+  bool break_on_failure;
+  bool catch_exceptions;
+  bool death_test_use_fork;
+  const char* filter;
+  bool list_tests;
+  const char* output;
+  bool print_time;
+  Int32 random_seed;
+  Int32 repeat;
+  bool shuffle;
+  Int32 stack_trace_depth;
+  const char* stream_result_to;
+  bool throw_on_failure;
+};
+
+// Fixture for testing InitGoogleTest().
+class InitGoogleTestTest : public Test {
+ protected:
+  // Clears the flags before each test.
+  virtual void SetUp() {
+    GTEST_FLAG(also_run_disabled_tests) = false;
+    GTEST_FLAG(break_on_failure) = false;
+    GTEST_FLAG(catch_exceptions) = false;
+    GTEST_FLAG(death_test_use_fork) = false;
+    GTEST_FLAG(filter) = "";
+    GTEST_FLAG(list_tests) = false;
+    GTEST_FLAG(output) = "";
+    GTEST_FLAG(print_time) = true;
+    GTEST_FLAG(random_seed) = 0;
+    GTEST_FLAG(repeat) = 1;
+    GTEST_FLAG(shuffle) = false;
+    GTEST_FLAG(stack_trace_depth) = kMaxStackTraceDepth;
+    GTEST_FLAG(stream_result_to) = "";
+    GTEST_FLAG(throw_on_failure) = false;
+  }
+
+  // Asserts that two narrow or wide string arrays are equal.
+  template <typename CharType>
+  static void AssertStringArrayEq(size_t size1, CharType** array1,
+                                  size_t size2, CharType** array2) {
+    ASSERT_EQ(size1, size2) << " Array sizes different.";
+
+    for (size_t i = 0; i != size1; i++) {
+      ASSERT_STREQ(array1[i], array2[i]) << " where i == " << i;
+    }
+  }
+
+  // Verifies that the flag values match the expected values.
+  static void CheckFlags(const Flags& expected) {
+    EXPECT_EQ(expected.also_run_disabled_tests,
+              GTEST_FLAG(also_run_disabled_tests));
+    EXPECT_EQ(expected.break_on_failure, GTEST_FLAG(break_on_failure));
+    EXPECT_EQ(expected.catch_exceptions, GTEST_FLAG(catch_exceptions));
+    EXPECT_EQ(expected.death_test_use_fork, GTEST_FLAG(death_test_use_fork));
+    EXPECT_STREQ(expected.filter, GTEST_FLAG(filter).c_str());
+    EXPECT_EQ(expected.list_tests, GTEST_FLAG(list_tests));
+    EXPECT_STREQ(expected.output, GTEST_FLAG(output).c_str());
+    EXPECT_EQ(expected.print_time, GTEST_FLAG(print_time));
+    EXPECT_EQ(expected.random_seed, GTEST_FLAG(random_seed));
+    EXPECT_EQ(expected.repeat, GTEST_FLAG(repeat));
+    EXPECT_EQ(expected.shuffle, GTEST_FLAG(shuffle));
+    EXPECT_EQ(expected.stack_trace_depth, GTEST_FLAG(stack_trace_depth));
+    EXPECT_STREQ(expected.stream_result_to,
+                 GTEST_FLAG(stream_result_to).c_str());
+    EXPECT_EQ(expected.throw_on_failure, GTEST_FLAG(throw_on_failure));
+  }
+
+  // Parses a command line (specified by argc1 and argv1), then
+  // verifies that the flag values are expected and that the
+  // recognized flags are removed from the command line.
+  template <typename CharType>
+  static void TestParsingFlags(int argc1, const CharType** argv1,
+                               int argc2, const CharType** argv2,
+                               const Flags& expected, bool should_print_help) {
+    const bool saved_help_flag = ::testing::internal::g_help_flag;
+    ::testing::internal::g_help_flag = false;
+
+#if GTEST_HAS_STREAM_REDIRECTION
+    CaptureStdout();
+#endif
+
+    // Parses the command line.
+    internal::ParseGoogleTestFlagsOnly(&argc1, const_cast<CharType**>(argv1));
+
+#if GTEST_HAS_STREAM_REDIRECTION
+    const std::string captured_stdout = GetCapturedStdout();
+#endif
+
+    // Verifies the flag values.
+    CheckFlags(expected);
+
+    // Verifies that the recognized flags are removed from the command
+    // line.
+    AssertStringArrayEq(argc1 + 1, argv1, argc2 + 1, argv2);
+
+    // ParseGoogleTestFlagsOnly should neither set g_help_flag nor print the
+    // help message for the flags it recognizes.
+    EXPECT_EQ(should_print_help, ::testing::internal::g_help_flag);
+
+#if GTEST_HAS_STREAM_REDIRECTION
+    const char* const expected_help_fragment =
+        "This program contains tests written using";
+    if (should_print_help) {
+      EXPECT_PRED_FORMAT2(IsSubstring, expected_help_fragment, captured_stdout);
+    } else {
+      EXPECT_PRED_FORMAT2(IsNotSubstring,
+                          expected_help_fragment, captured_stdout);
+    }
+#endif  // GTEST_HAS_STREAM_REDIRECTION
+
+    ::testing::internal::g_help_flag = saved_help_flag;
+  }
+
+  // This macro wraps TestParsingFlags s.t. the user doesn't need
+  // to specify the array sizes.
+
+#define GTEST_TEST_PARSING_FLAGS_(argv1, argv2, expected, should_print_help) \
+  TestParsingFlags(sizeof(argv1)/sizeof(*argv1) - 1, argv1, \
+                   sizeof(argv2)/sizeof(*argv2) - 1, argv2, \
+                   expected, should_print_help)
+};
+
+// Tests parsing an empty command line.
+TEST_F(InitGoogleTestTest, Empty) {
+  const char* argv[] = {
+    NULL
+  };
+
+  const char* argv2[] = {
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), false);
+}
+
+// Tests parsing a command line that has no flag.
+TEST_F(InitGoogleTestTest, NoFlag) {
+  const char* argv[] = {
+    "foo.exe",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), false);
+}
+
+// Tests parsing a bad --gtest_filter flag.
+TEST_F(InitGoogleTestTest, FilterBad) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_filter",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    "--gtest_filter",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter(""), true);
+}
+
+// Tests parsing an empty --gtest_filter flag.
+TEST_F(InitGoogleTestTest, FilterEmpty) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_filter=",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter(""), false);
+}
+
+// Tests parsing a non-empty --gtest_filter flag.
+TEST_F(InitGoogleTestTest, FilterNonEmpty) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_filter=abc",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter("abc"), false);
+}
+
+// Tests parsing --gtest_break_on_failure.
+TEST_F(InitGoogleTestTest, BreakOnFailureWithoutValue) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_break_on_failure",
+    NULL
+};
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::BreakOnFailure(true), false);
+}
+
+// Tests parsing --gtest_break_on_failure=0.
+TEST_F(InitGoogleTestTest, BreakOnFailureFalse_0) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_break_on_failure=0",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::BreakOnFailure(false), false);
+}
+
+// Tests parsing --gtest_break_on_failure=f.
+TEST_F(InitGoogleTestTest, BreakOnFailureFalse_f) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_break_on_failure=f",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::BreakOnFailure(false), false);
+}
+
+// Tests parsing --gtest_break_on_failure=F.
+TEST_F(InitGoogleTestTest, BreakOnFailureFalse_F) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_break_on_failure=F",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::BreakOnFailure(false), false);
+}
+
+// Tests parsing a --gtest_break_on_failure flag that has a "true"
+// definition.
+TEST_F(InitGoogleTestTest, BreakOnFailureTrue) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_break_on_failure=1",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::BreakOnFailure(true), false);
+}
+
+// Tests parsing --gtest_catch_exceptions.
+TEST_F(InitGoogleTestTest, CatchExceptions) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_catch_exceptions",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::CatchExceptions(true), false);
+}
+
+// Tests parsing --gtest_death_test_use_fork.
+TEST_F(InitGoogleTestTest, DeathTestUseFork) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_death_test_use_fork",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::DeathTestUseFork(true), false);
+}
+
+// Tests having the same flag twice with different values.  The
+// expected behavior is that the one coming last takes precedence.
+TEST_F(InitGoogleTestTest, DuplicatedFlags) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_filter=a",
+    "--gtest_filter=b",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter("b"), false);
+}
+
+// Tests having an unrecognized flag on the command line.
+TEST_F(InitGoogleTestTest, UnrecognizedFlag) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_break_on_failure",
+    "bar",  // Unrecognized by Google Test.
+    "--gtest_filter=b",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    "bar",
+    NULL
+  };
+
+  Flags flags;
+  flags.break_on_failure = true;
+  flags.filter = "b";
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, flags, false);
+}
+
+// Tests having a --gtest_list_tests flag
+TEST_F(InitGoogleTestTest, ListTestsFlag) {
+    const char* argv[] = {
+      "foo.exe",
+      "--gtest_list_tests",
+      NULL
+    };
+
+    const char* argv2[] = {
+      "foo.exe",
+      NULL
+    };
+
+    GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ListTests(true), false);
+}
+
+// Tests having a --gtest_list_tests flag with a "true" value
+TEST_F(InitGoogleTestTest, ListTestsTrue) {
+    const char* argv[] = {
+      "foo.exe",
+      "--gtest_list_tests=1",
+      NULL
+    };
+
+    const char* argv2[] = {
+      "foo.exe",
+      NULL
+    };
+
+    GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ListTests(true), false);
+}
+
+// Tests having a --gtest_list_tests flag with a "false" value
+TEST_F(InitGoogleTestTest, ListTestsFalse) {
+    const char* argv[] = {
+      "foo.exe",
+      "--gtest_list_tests=0",
+      NULL
+    };
+
+    const char* argv2[] = {
+      "foo.exe",
+      NULL
+    };
+
+    GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ListTests(false), false);
+}
+
+// Tests parsing --gtest_list_tests=f.
+TEST_F(InitGoogleTestTest, ListTestsFalse_f) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_list_tests=f",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ListTests(false), false);
+}
+
+// Tests parsing --gtest_list_tests=F.
+TEST_F(InitGoogleTestTest, ListTestsFalse_F) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_list_tests=F",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ListTests(false), false);
+}
+
+// Tests parsing --gtest_output (invalid).
+TEST_F(InitGoogleTestTest, OutputEmpty) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_output",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    "--gtest_output",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), true);
+}
+
+// Tests parsing --gtest_output=xml
+TEST_F(InitGoogleTestTest, OutputXml) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_output=xml",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Output("xml"), false);
+}
+
+// Tests parsing --gtest_output=xml:file
+TEST_F(InitGoogleTestTest, OutputXmlFile) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_output=xml:file",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Output("xml:file"), false);
+}
+
+// Tests parsing --gtest_output=xml:directory/path/
+TEST_F(InitGoogleTestTest, OutputXmlDirectory) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_output=xml:directory/path/",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2,
+                            Flags::Output("xml:directory/path/"), false);
+}
+
+// Tests having a --gtest_print_time flag
+TEST_F(InitGoogleTestTest, PrintTimeFlag) {
+    const char* argv[] = {
+      "foo.exe",
+      "--gtest_print_time",
+      NULL
+    };
+
+    const char* argv2[] = {
+      "foo.exe",
+      NULL
+    };
+
+    GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::PrintTime(true), false);
+}
+
+// Tests having a --gtest_print_time flag with a "true" value
+TEST_F(InitGoogleTestTest, PrintTimeTrue) {
+    const char* argv[] = {
+      "foo.exe",
+      "--gtest_print_time=1",
+      NULL
+    };
+
+    const char* argv2[] = {
+      "foo.exe",
+      NULL
+    };
+
+    GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::PrintTime(true), false);
+}
+
+// Tests having a --gtest_print_time flag with a "false" value
+TEST_F(InitGoogleTestTest, PrintTimeFalse) {
+    const char* argv[] = {
+      "foo.exe",
+      "--gtest_print_time=0",
+      NULL
+    };
+
+    const char* argv2[] = {
+      "foo.exe",
+      NULL
+    };
+
+    GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::PrintTime(false), false);
+}
+
+// Tests parsing --gtest_print_time=f.
+TEST_F(InitGoogleTestTest, PrintTimeFalse_f) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_print_time=f",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::PrintTime(false), false);
+}
+
+// Tests parsing --gtest_print_time=F.
+TEST_F(InitGoogleTestTest, PrintTimeFalse_F) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_print_time=F",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::PrintTime(false), false);
+}
+
+// Tests parsing --gtest_random_seed=number
+TEST_F(InitGoogleTestTest, RandomSeed) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_random_seed=1000",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::RandomSeed(1000), false);
+}
+
+// Tests parsing --gtest_repeat=number
+TEST_F(InitGoogleTestTest, Repeat) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_repeat=1000",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Repeat(1000), false);
+}
+
+// Tests having a --gtest_also_run_disabled_tests flag
+TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsFlag) {
+    const char* argv[] = {
+      "foo.exe",
+      "--gtest_also_run_disabled_tests",
+      NULL
+    };
+
+    const char* argv2[] = {
+      "foo.exe",
+      NULL
+    };
+
+    GTEST_TEST_PARSING_FLAGS_(argv, argv2,
+                              Flags::AlsoRunDisabledTests(true), false);
+}
+
+// Tests having a --gtest_also_run_disabled_tests flag with a "true" value
+TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsTrue) {
+    const char* argv[] = {
+      "foo.exe",
+      "--gtest_also_run_disabled_tests=1",
+      NULL
+    };
+
+    const char* argv2[] = {
+      "foo.exe",
+      NULL
+    };
+
+    GTEST_TEST_PARSING_FLAGS_(argv, argv2,
+                              Flags::AlsoRunDisabledTests(true), false);
+}
+
+// Tests having a --gtest_also_run_disabled_tests flag with a "false" value
+TEST_F(InitGoogleTestTest, AlsoRunDisabledTestsFalse) {
+    const char* argv[] = {
+      "foo.exe",
+      "--gtest_also_run_disabled_tests=0",
+      NULL
+    };
+
+    const char* argv2[] = {
+      "foo.exe",
+      NULL
+    };
+
+    GTEST_TEST_PARSING_FLAGS_(argv, argv2,
+                              Flags::AlsoRunDisabledTests(false), false);
+}
+
+// Tests parsing --gtest_shuffle.
+TEST_F(InitGoogleTestTest, ShuffleWithoutValue) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_shuffle",
+    NULL
+};
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Shuffle(true), false);
+}
+
+// Tests parsing --gtest_shuffle=0.
+TEST_F(InitGoogleTestTest, ShuffleFalse_0) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_shuffle=0",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Shuffle(false), false);
+}
+
+// Tests parsing a --gtest_shuffle flag that has a "true"
+// definition.
+TEST_F(InitGoogleTestTest, ShuffleTrue) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_shuffle=1",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Shuffle(true), false);
+}
+
+// Tests parsing --gtest_stack_trace_depth=number.
+TEST_F(InitGoogleTestTest, StackTraceDepth) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_stack_trace_depth=5",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::StackTraceDepth(5), false);
+}
+
+TEST_F(InitGoogleTestTest, StreamResultTo) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_stream_result_to=localhost:1234",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(
+      argv, argv2, Flags::StreamResultTo("localhost:1234"), false);
+}
+
+// Tests parsing --gtest_throw_on_failure.
+TEST_F(InitGoogleTestTest, ThrowOnFailureWithoutValue) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_throw_on_failure",
+    NULL
+};
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ThrowOnFailure(true), false);
+}
+
+// Tests parsing --gtest_throw_on_failure=0.
+TEST_F(InitGoogleTestTest, ThrowOnFailureFalse_0) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_throw_on_failure=0",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ThrowOnFailure(false), false);
+}
+
+// Tests parsing a --gtest_throw_on_failure flag that has a "true"
+// definition.
+TEST_F(InitGoogleTestTest, ThrowOnFailureTrue) {
+  const char* argv[] = {
+    "foo.exe",
+    "--gtest_throw_on_failure=1",
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::ThrowOnFailure(true), false);
+}
+
+#if GTEST_OS_WINDOWS
+// Tests parsing wide strings.
+TEST_F(InitGoogleTestTest, WideStrings) {
+  const wchar_t* argv[] = {
+    L"foo.exe",
+    L"--gtest_filter=Foo*",
+    L"--gtest_list_tests=1",
+    L"--gtest_break_on_failure",
+    L"--non_gtest_flag",
+    NULL
+  };
+
+  const wchar_t* argv2[] = {
+    L"foo.exe",
+    L"--non_gtest_flag",
+    NULL
+  };
+
+  Flags expected_flags;
+  expected_flags.break_on_failure = true;
+  expected_flags.filter = "Foo*";
+  expected_flags.list_tests = true;
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, expected_flags, false);
+}
+# endif  // GTEST_OS_WINDOWS
+
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
+class FlagfileTest : public InitGoogleTestTest {
+ public:
+  virtual void SetUp() {
+    InitGoogleTestTest::SetUp();
+
+    testdata_path_.Set(internal::FilePath(
+        internal::TempDir() + internal::GetCurrentExecutableName().string() +
+        "_flagfile_test"));
+    testing::internal::posix::RmDir(testdata_path_.c_str());
+    EXPECT_TRUE(testdata_path_.CreateFolder());
+  }
+
+  virtual void TearDown() {
+    testing::internal::posix::RmDir(testdata_path_.c_str());
+    InitGoogleTestTest::TearDown();
+  }
+
+  internal::FilePath CreateFlagfile(const char* contents) {
+    internal::FilePath file_path(internal::FilePath::GenerateUniqueFileName(
+        testdata_path_, internal::FilePath("unique"), "txt"));
+    FILE* f = testing::internal::posix::FOpen(file_path.c_str(), "w");
+    fprintf(f, "%s", contents);
+    fclose(f);
+    return file_path;
+  }
+
+ private:
+  internal::FilePath testdata_path_;
+};
+
+// Tests an empty flagfile.
+TEST_F(FlagfileTest, Empty) {
+  internal::FilePath flagfile_path(CreateFlagfile(""));
+  std::string flagfile_flag =
+      std::string("--" GTEST_FLAG_PREFIX_ "flagfile=") + flagfile_path.c_str();
+
+  const char* argv[] = {
+    "foo.exe",
+    flagfile_flag.c_str(),
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags(), false);
+}
+
+// Tests passing a non-empty --gtest_filter flag via --gtest_flagfile.
+TEST_F(FlagfileTest, FilterNonEmpty) {
+  internal::FilePath flagfile_path(CreateFlagfile(
+      "--"  GTEST_FLAG_PREFIX_  "filter=abc"));
+  std::string flagfile_flag =
+      std::string("--" GTEST_FLAG_PREFIX_ "flagfile=") + flagfile_path.c_str();
+
+  const char* argv[] = {
+    "foo.exe",
+    flagfile_flag.c_str(),
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, Flags::Filter("abc"), false);
+}
+
+// Tests passing several flags via --gtest_flagfile.
+TEST_F(FlagfileTest, SeveralFlags) {
+  internal::FilePath flagfile_path(CreateFlagfile(
+      "--"  GTEST_FLAG_PREFIX_  "filter=abc\n"
+      "--"  GTEST_FLAG_PREFIX_  "break_on_failure\n"
+      "--"  GTEST_FLAG_PREFIX_  "list_tests"));
+  std::string flagfile_flag =
+      std::string("--" GTEST_FLAG_PREFIX_ "flagfile=") + flagfile_path.c_str();
+
+  const char* argv[] = {
+    "foo.exe",
+    flagfile_flag.c_str(),
+    NULL
+  };
+
+  const char* argv2[] = {
+    "foo.exe",
+    NULL
+  };
+
+  Flags expected_flags;
+  expected_flags.break_on_failure = true;
+  expected_flags.filter = "abc";
+  expected_flags.list_tests = true;
+
+  GTEST_TEST_PARSING_FLAGS_(argv, argv2, expected_flags, false);
+}
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
+
+// Tests current_test_info() in UnitTest.
+class CurrentTestInfoTest : public Test {
+ protected:
+  // Tests that current_test_info() returns NULL before the first test in
+  // the test case is run.
+  static void SetUpTestCase() {
+    // There should be no tests running at this point.
+    const TestInfo* test_info =
+      UnitTest::GetInstance()->current_test_info();
+    EXPECT_TRUE(test_info == NULL)
+        << "There should be no tests running at this point.";
+  }
+
+  // Tests that current_test_info() returns NULL after the last test in
+  // the test case has run.
+  static void TearDownTestCase() {
+    const TestInfo* test_info =
+      UnitTest::GetInstance()->current_test_info();
+    EXPECT_TRUE(test_info == NULL)
+        << "There should be no tests running at this point.";
+  }
+};
+
+// Tests that current_test_info() returns TestInfo for currently running
+// test by checking the expected test name against the actual one.
+TEST_F(CurrentTestInfoTest, WorksForFirstTestInATestCase) {
+  const TestInfo* test_info =
+    UnitTest::GetInstance()->current_test_info();
+  ASSERT_TRUE(NULL != test_info)
+      << "There is a test running so we should have a valid TestInfo.";
+  EXPECT_STREQ("CurrentTestInfoTest", test_info->test_case_name())
+      << "Expected the name of the currently running test case.";
+  EXPECT_STREQ("WorksForFirstTestInATestCase", test_info->name())
+      << "Expected the name of the currently running test.";
+}
+
+// Tests that current_test_info() returns TestInfo for currently running
+// test by checking the expected test name against the actual one.  We
+// use this test to see that the TestInfo object actually changed from
+// the previous invocation.
+TEST_F(CurrentTestInfoTest, WorksForSecondTestInATestCase) {
+  const TestInfo* test_info =
+    UnitTest::GetInstance()->current_test_info();
+  ASSERT_TRUE(NULL != test_info)
+      << "There is a test running so we should have a valid TestInfo.";
+  EXPECT_STREQ("CurrentTestInfoTest", test_info->test_case_name())
+      << "Expected the name of the currently running test case.";
+  EXPECT_STREQ("WorksForSecondTestInATestCase", test_info->name())
+      << "Expected the name of the currently running test.";
+}
+
+}  // namespace testing
+
+// These two lines test that we can define tests in a namespace that
+// has the name "testing" and is nested in another namespace.
+namespace my_namespace {
+namespace testing {
+
+// Makes sure that TEST knows to use ::testing::Test instead of
+// ::my_namespace::testing::Test.
+class Test {};
+
+// Makes sure that an assertion knows to use ::testing::Message instead of
+// ::my_namespace::testing::Message.
+class Message {};
+
+// Makes sure that an assertion knows to use
+// ::testing::AssertionResult instead of
+// ::my_namespace::testing::AssertionResult.
+class AssertionResult {};
+
+// Tests that an assertion that should succeed works as expected.
+TEST(NestedTestingNamespaceTest, Success) {
+  EXPECT_EQ(1, 1) << "This shouldn't fail.";
+}
+
+// Tests that an assertion that should fail works as expected.
+TEST(NestedTestingNamespaceTest, Failure) {
+  EXPECT_FATAL_FAILURE(FAIL() << "This failure is expected.",
+                       "This failure is expected.");
+}
+
+}  // namespace testing
+}  // namespace my_namespace
+
+// Tests that one can call superclass SetUp and TearDown methods--
+// that is, that they are not private.
+// No tests are based on this fixture; the test "passes" if it compiles
+// successfully.
+class ProtectedFixtureMethodsTest : public Test {
+ protected:
+  virtual void SetUp() {
+    Test::SetUp();
+  }
+  virtual void TearDown() {
+    Test::TearDown();
+  }
+};
+
+// StreamingAssertionsTest tests the streaming versions of a representative
+// sample of assertions.
+TEST(StreamingAssertionsTest, Unconditional) {
+  SUCCEED() << "expected success";
+  EXPECT_NONFATAL_FAILURE(ADD_FAILURE() << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(FAIL() << "expected failure",
+                       "expected failure");
+}
+
+#ifdef __BORLANDC__
+// Silences warnings: "Condition is always true", "Unreachable code"
+# pragma option push -w-ccc -w-rch
+#endif
+
+TEST(StreamingAssertionsTest, Truth) {
+  EXPECT_TRUE(true) << "unexpected failure";
+  ASSERT_TRUE(true) << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(EXPECT_TRUE(false) << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_TRUE(false) << "expected failure",
+                       "expected failure");
+}
+
+TEST(StreamingAssertionsTest, Truth2) {
+  EXPECT_FALSE(false) << "unexpected failure";
+  ASSERT_FALSE(false) << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(true) << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_FALSE(true) << "expected failure",
+                       "expected failure");
+}
+
+#ifdef __BORLANDC__
+// Restores warnings after previous "#pragma option push" supressed them
+# pragma option pop
+#endif
+
+TEST(StreamingAssertionsTest, IntegerEquals) {
+  EXPECT_EQ(1, 1) << "unexpected failure";
+  ASSERT_EQ(1, 1) << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(EXPECT_EQ(1, 2) << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_EQ(1, 2) << "expected failure",
+                       "expected failure");
+}
+
+TEST(StreamingAssertionsTest, IntegerLessThan) {
+  EXPECT_LT(1, 2) << "unexpected failure";
+  ASSERT_LT(1, 2) << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(EXPECT_LT(2, 1) << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_LT(2, 1) << "expected failure",
+                       "expected failure");
+}
+
+TEST(StreamingAssertionsTest, StringsEqual) {
+  EXPECT_STREQ("foo", "foo") << "unexpected failure";
+  ASSERT_STREQ("foo", "foo") << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(EXPECT_STREQ("foo", "bar") << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_STREQ("foo", "bar") << "expected failure",
+                       "expected failure");
+}
+
+TEST(StreamingAssertionsTest, StringsNotEqual) {
+  EXPECT_STRNE("foo", "bar") << "unexpected failure";
+  ASSERT_STRNE("foo", "bar") << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRNE("foo", "foo") << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_STRNE("foo", "foo") << "expected failure",
+                       "expected failure");
+}
+
+TEST(StreamingAssertionsTest, StringsEqualIgnoringCase) {
+  EXPECT_STRCASEEQ("foo", "FOO") << "unexpected failure";
+  ASSERT_STRCASEEQ("foo", "FOO") << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRCASEEQ("foo", "bar") << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_STRCASEEQ("foo", "bar") << "expected failure",
+                       "expected failure");
+}
+
+TEST(StreamingAssertionsTest, StringNotEqualIgnoringCase) {
+  EXPECT_STRCASENE("foo", "bar") << "unexpected failure";
+  ASSERT_STRCASENE("foo", "bar") << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(EXPECT_STRCASENE("foo", "FOO") << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_STRCASENE("bar", "BAR") << "expected failure",
+                       "expected failure");
+}
+
+TEST(StreamingAssertionsTest, FloatingPointEquals) {
+  EXPECT_FLOAT_EQ(1.0, 1.0) << "unexpected failure";
+  ASSERT_FLOAT_EQ(1.0, 1.0) << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(EXPECT_FLOAT_EQ(0.0, 1.0) << "expected failure",
+                          "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_FLOAT_EQ(0.0, 1.0) << "expected failure",
+                       "expected failure");
+}
+
+#if GTEST_HAS_EXCEPTIONS
+
+TEST(StreamingAssertionsTest, Throw) {
+  EXPECT_THROW(ThrowAnInteger(), int) << "unexpected failure";
+  ASSERT_THROW(ThrowAnInteger(), int) << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool) <<
+                          "expected failure", "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_THROW(ThrowAnInteger(), bool) <<
+                       "expected failure", "expected failure");
+}
+
+TEST(StreamingAssertionsTest, NoThrow) {
+  EXPECT_NO_THROW(ThrowNothing()) << "unexpected failure";
+  ASSERT_NO_THROW(ThrowNothing()) << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()) <<
+                          "expected failure", "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()) <<
+                       "expected failure", "expected failure");
+}
+
+TEST(StreamingAssertionsTest, AnyThrow) {
+  EXPECT_ANY_THROW(ThrowAnInteger()) << "unexpected failure";
+  ASSERT_ANY_THROW(ThrowAnInteger()) << "unexpected failure";
+  EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(ThrowNothing()) <<
+                          "expected failure", "expected failure");
+  EXPECT_FATAL_FAILURE(ASSERT_ANY_THROW(ThrowNothing()) <<
+                       "expected failure", "expected failure");
+}
+
+#endif  // GTEST_HAS_EXCEPTIONS
+
+// Tests that Google Test correctly decides whether to use colors in the output.
+
+TEST(ColoredOutputTest, UsesColorsWhenGTestColorFlagIsYes) {
+  GTEST_FLAG(color) = "yes";
+
+  SetEnv("TERM", "xterm");  // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+  EXPECT_TRUE(ShouldUseColor(false));  // Stdout is not a TTY.
+
+  SetEnv("TERM", "dumb");  // TERM doesn't support colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+  EXPECT_TRUE(ShouldUseColor(false));  // Stdout is not a TTY.
+}
+
+TEST(ColoredOutputTest, UsesColorsWhenGTestColorFlagIsAliasOfYes) {
+  SetEnv("TERM", "dumb");  // TERM doesn't support colors.
+
+  GTEST_FLAG(color) = "True";
+  EXPECT_TRUE(ShouldUseColor(false));  // Stdout is not a TTY.
+
+  GTEST_FLAG(color) = "t";
+  EXPECT_TRUE(ShouldUseColor(false));  // Stdout is not a TTY.
+
+  GTEST_FLAG(color) = "1";
+  EXPECT_TRUE(ShouldUseColor(false));  // Stdout is not a TTY.
+}
+
+TEST(ColoredOutputTest, UsesNoColorWhenGTestColorFlagIsNo) {
+  GTEST_FLAG(color) = "no";
+
+  SetEnv("TERM", "xterm");  // TERM supports colors.
+  EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
+  EXPECT_FALSE(ShouldUseColor(false));  // Stdout is not a TTY.
+
+  SetEnv("TERM", "dumb");  // TERM doesn't support colors.
+  EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
+  EXPECT_FALSE(ShouldUseColor(false));  // Stdout is not a TTY.
+}
+
+TEST(ColoredOutputTest, UsesNoColorWhenGTestColorFlagIsInvalid) {
+  SetEnv("TERM", "xterm");  // TERM supports colors.
+
+  GTEST_FLAG(color) = "F";
+  EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  GTEST_FLAG(color) = "0";
+  EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  GTEST_FLAG(color) = "unknown";
+  EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
+}
+
+TEST(ColoredOutputTest, UsesColorsWhenStdoutIsTty) {
+  GTEST_FLAG(color) = "auto";
+
+  SetEnv("TERM", "xterm");  // TERM supports colors.
+  EXPECT_FALSE(ShouldUseColor(false));  // Stdout is not a TTY.
+  EXPECT_TRUE(ShouldUseColor(true));    // Stdout is a TTY.
+}
+
+TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) {
+  GTEST_FLAG(color) = "auto";
+
+#if GTEST_OS_WINDOWS
+  // On Windows, we ignore the TERM variable as it's usually not set.
+
+  SetEnv("TERM", "dumb");
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "");
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "xterm");
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+#else
+  // On non-Windows platforms, we rely on TERM to determine if the
+  // terminal supports colors.
+
+  SetEnv("TERM", "dumb");  // TERM doesn't support colors.
+  EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "emacs");  // TERM doesn't support colors.
+  EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "vt100");  // TERM doesn't support colors.
+  EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "xterm-mono");  // TERM doesn't support colors.
+  EXPECT_FALSE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "xterm");  // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "xterm-color");  // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "xterm-256color");  // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "screen");  // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "screen-256color");  // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "tmux");  // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "tmux-256color");  // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "rxvt-unicode");  // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "rxvt-unicode-256color");  // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "linux");  // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+
+  SetEnv("TERM", "cygwin");  // TERM supports colors.
+  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
+#endif  // GTEST_OS_WINDOWS
+}
+
+// Verifies that StaticAssertTypeEq works in a namespace scope.
+
+static bool dummy1 GTEST_ATTRIBUTE_UNUSED_ = StaticAssertTypeEq<bool, bool>();
+static bool dummy2 GTEST_ATTRIBUTE_UNUSED_ =
+    StaticAssertTypeEq<const int, const int>();
+
+// Verifies that StaticAssertTypeEq works in a class.
+
+template <typename T>
+class StaticAssertTypeEqTestHelper {
+ public:
+  StaticAssertTypeEqTestHelper() { StaticAssertTypeEq<bool, T>(); }
+};
+
+TEST(StaticAssertTypeEqTest, WorksInClass) {
+  StaticAssertTypeEqTestHelper<bool>();
+}
+
+// Verifies that StaticAssertTypeEq works inside a function.
+
+typedef int IntAlias;
+
+TEST(StaticAssertTypeEqTest, CompilesForEqualTypes) {
+  StaticAssertTypeEq<int, IntAlias>();
+  StaticAssertTypeEq<int*, IntAlias*>();
+}
+
+TEST(GetCurrentOsStackTraceExceptTopTest, ReturnsTheStackTrace) {
+  testing::UnitTest* const unit_test = testing::UnitTest::GetInstance();
+
+  // We don't have a stack walker in Google Test yet.
+  EXPECT_STREQ("", GetCurrentOsStackTraceExceptTop(unit_test, 0).c_str());
+  EXPECT_STREQ("", GetCurrentOsStackTraceExceptTop(unit_test, 1).c_str());
+}
+
+TEST(HasNonfatalFailureTest, ReturnsFalseWhenThereIsNoFailure) {
+  EXPECT_FALSE(HasNonfatalFailure());
+}
+
+static void FailFatally() { FAIL(); }
+
+TEST(HasNonfatalFailureTest, ReturnsFalseWhenThereIsOnlyFatalFailure) {
+  FailFatally();
+  const bool has_nonfatal_failure = HasNonfatalFailure();
+  ClearCurrentTestPartResults();
+  EXPECT_FALSE(has_nonfatal_failure);
+}
+
+TEST(HasNonfatalFailureTest, ReturnsTrueWhenThereIsNonfatalFailure) {
+  ADD_FAILURE();
+  const bool has_nonfatal_failure = HasNonfatalFailure();
+  ClearCurrentTestPartResults();
+  EXPECT_TRUE(has_nonfatal_failure);
+}
+
+TEST(HasNonfatalFailureTest, ReturnsTrueWhenThereAreFatalAndNonfatalFailures) {
+  FailFatally();
+  ADD_FAILURE();
+  const bool has_nonfatal_failure = HasNonfatalFailure();
+  ClearCurrentTestPartResults();
+  EXPECT_TRUE(has_nonfatal_failure);
+}
+
+// A wrapper for calling HasNonfatalFailure outside of a test body.
+static bool HasNonfatalFailureHelper() {
+  return testing::Test::HasNonfatalFailure();
+}
+
+TEST(HasNonfatalFailureTest, WorksOutsideOfTestBody) {
+  EXPECT_FALSE(HasNonfatalFailureHelper());
+}
+
+TEST(HasNonfatalFailureTest, WorksOutsideOfTestBody2) {
+  ADD_FAILURE();
+  const bool has_nonfatal_failure = HasNonfatalFailureHelper();
+  ClearCurrentTestPartResults();
+  EXPECT_TRUE(has_nonfatal_failure);
+}
+
+TEST(HasFailureTest, ReturnsFalseWhenThereIsNoFailure) {
+  EXPECT_FALSE(HasFailure());
+}
+
+TEST(HasFailureTest, ReturnsTrueWhenThereIsFatalFailure) {
+  FailFatally();
+  const bool has_failure = HasFailure();
+  ClearCurrentTestPartResults();
+  EXPECT_TRUE(has_failure);
+}
+
+TEST(HasFailureTest, ReturnsTrueWhenThereIsNonfatalFailure) {
+  ADD_FAILURE();
+  const bool has_failure = HasFailure();
+  ClearCurrentTestPartResults();
+  EXPECT_TRUE(has_failure);
+}
+
+TEST(HasFailureTest, ReturnsTrueWhenThereAreFatalAndNonfatalFailures) {
+  FailFatally();
+  ADD_FAILURE();
+  const bool has_failure = HasFailure();
+  ClearCurrentTestPartResults();
+  EXPECT_TRUE(has_failure);
+}
+
+// A wrapper for calling HasFailure outside of a test body.
+static bool HasFailureHelper() { return testing::Test::HasFailure(); }
+
+TEST(HasFailureTest, WorksOutsideOfTestBody) {
+  EXPECT_FALSE(HasFailureHelper());
+}
+
+TEST(HasFailureTest, WorksOutsideOfTestBody2) {
+  ADD_FAILURE();
+  const bool has_failure = HasFailureHelper();
+  ClearCurrentTestPartResults();
+  EXPECT_TRUE(has_failure);
+}
+
+class TestListener : public EmptyTestEventListener {
+ public:
+  TestListener() : on_start_counter_(NULL), is_destroyed_(NULL) {}
+  TestListener(int* on_start_counter, bool* is_destroyed)
+      : on_start_counter_(on_start_counter),
+        is_destroyed_(is_destroyed) {}
+
+  virtual ~TestListener() {
+    if (is_destroyed_)
+      *is_destroyed_ = true;
+  }
+
+ protected:
+  virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {
+    if (on_start_counter_ != NULL)
+      (*on_start_counter_)++;
+  }
+
+ private:
+  int* on_start_counter_;
+  bool* is_destroyed_;
+};
+
+// Tests the constructor.
+TEST(TestEventListenersTest, ConstructionWorks) {
+  TestEventListeners listeners;
+
+  EXPECT_TRUE(TestEventListenersAccessor::GetRepeater(&listeners) != NULL);
+  EXPECT_TRUE(listeners.default_result_printer() == NULL);
+  EXPECT_TRUE(listeners.default_xml_generator() == NULL);
+}
+
+// Tests that the TestEventListeners destructor deletes all the listeners it
+// owns.
+TEST(TestEventListenersTest, DestructionWorks) {
+  bool default_result_printer_is_destroyed = false;
+  bool default_xml_printer_is_destroyed = false;
+  bool extra_listener_is_destroyed = false;
+  TestListener* default_result_printer = new TestListener(
+      NULL, &default_result_printer_is_destroyed);
+  TestListener* default_xml_printer = new TestListener(
+      NULL, &default_xml_printer_is_destroyed);
+  TestListener* extra_listener = new TestListener(
+      NULL, &extra_listener_is_destroyed);
+
+  {
+    TestEventListeners listeners;
+    TestEventListenersAccessor::SetDefaultResultPrinter(&listeners,
+                                                        default_result_printer);
+    TestEventListenersAccessor::SetDefaultXmlGenerator(&listeners,
+                                                       default_xml_printer);
+    listeners.Append(extra_listener);
+  }
+  EXPECT_TRUE(default_result_printer_is_destroyed);
+  EXPECT_TRUE(default_xml_printer_is_destroyed);
+  EXPECT_TRUE(extra_listener_is_destroyed);
+}
+
+// Tests that a listener Append'ed to a TestEventListeners list starts
+// receiving events.
+TEST(TestEventListenersTest, Append) {
+  int on_start_counter = 0;
+  bool is_destroyed = false;
+  TestListener* listener = new TestListener(&on_start_counter, &is_destroyed);
+  {
+    TestEventListeners listeners;
+    listeners.Append(listener);
+    TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
+        *UnitTest::GetInstance());
+    EXPECT_EQ(1, on_start_counter);
+  }
+  EXPECT_TRUE(is_destroyed);
+}
+
+// Tests that listeners receive events in the order they were appended to
+// the list, except for *End requests, which must be received in the reverse
+// order.
+class SequenceTestingListener : public EmptyTestEventListener {
+ public:
+  SequenceTestingListener(std::vector<std::string>* vector, const char* id)
+      : vector_(vector), id_(id) {}
+
+ protected:
+  virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {
+    vector_->push_back(GetEventDescription("OnTestProgramStart"));
+  }
+
+  virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {
+    vector_->push_back(GetEventDescription("OnTestProgramEnd"));
+  }
+
+  virtual void OnTestIterationStart(const UnitTest& /*unit_test*/,
+                                    int /*iteration*/) {
+    vector_->push_back(GetEventDescription("OnTestIterationStart"));
+  }
+
+  virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/,
+                                  int /*iteration*/) {
+    vector_->push_back(GetEventDescription("OnTestIterationEnd"));
+  }
+
+ private:
+  std::string GetEventDescription(const char* method) {
+    Message message;
+    message << id_ << "." << method;
+    return message.GetString();
+  }
+
+  std::vector<std::string>* vector_;
+  const char* const id_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(SequenceTestingListener);
+};
+
+TEST(EventListenerTest, AppendKeepsOrder) {
+  std::vector<std::string> vec;
+  TestEventListeners listeners;
+  listeners.Append(new SequenceTestingListener(&vec, "1st"));
+  listeners.Append(new SequenceTestingListener(&vec, "2nd"));
+  listeners.Append(new SequenceTestingListener(&vec, "3rd"));
+
+  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
+      *UnitTest::GetInstance());
+  ASSERT_EQ(3U, vec.size());
+  EXPECT_STREQ("1st.OnTestProgramStart", vec[0].c_str());
+  EXPECT_STREQ("2nd.OnTestProgramStart", vec[1].c_str());
+  EXPECT_STREQ("3rd.OnTestProgramStart", vec[2].c_str());
+
+  vec.clear();
+  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramEnd(
+      *UnitTest::GetInstance());
+  ASSERT_EQ(3U, vec.size());
+  EXPECT_STREQ("3rd.OnTestProgramEnd", vec[0].c_str());
+  EXPECT_STREQ("2nd.OnTestProgramEnd", vec[1].c_str());
+  EXPECT_STREQ("1st.OnTestProgramEnd", vec[2].c_str());
+
+  vec.clear();
+  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestIterationStart(
+      *UnitTest::GetInstance(), 0);
+  ASSERT_EQ(3U, vec.size());
+  EXPECT_STREQ("1st.OnTestIterationStart", vec[0].c_str());
+  EXPECT_STREQ("2nd.OnTestIterationStart", vec[1].c_str());
+  EXPECT_STREQ("3rd.OnTestIterationStart", vec[2].c_str());
+
+  vec.clear();
+  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestIterationEnd(
+      *UnitTest::GetInstance(), 0);
+  ASSERT_EQ(3U, vec.size());
+  EXPECT_STREQ("3rd.OnTestIterationEnd", vec[0].c_str());
+  EXPECT_STREQ("2nd.OnTestIterationEnd", vec[1].c_str());
+  EXPECT_STREQ("1st.OnTestIterationEnd", vec[2].c_str());
+}
+
+// Tests that a listener removed from a TestEventListeners list stops receiving
+// events and is not deleted when the list is destroyed.
+TEST(TestEventListenersTest, Release) {
+  int on_start_counter = 0;
+  bool is_destroyed = false;
+  // Although Append passes the ownership of this object to the list,
+  // the following calls release it, and we need to delete it before the
+  // test ends.
+  TestListener* listener = new TestListener(&on_start_counter, &is_destroyed);
+  {
+    TestEventListeners listeners;
+    listeners.Append(listener);
+    EXPECT_EQ(listener, listeners.Release(listener));
+    TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
+        *UnitTest::GetInstance());
+    EXPECT_TRUE(listeners.Release(listener) == NULL);
+  }
+  EXPECT_EQ(0, on_start_counter);
+  EXPECT_FALSE(is_destroyed);
+  delete listener;
+}
+
+// Tests that no events are forwarded when event forwarding is disabled.
+TEST(EventListenerTest, SuppressEventForwarding) {
+  int on_start_counter = 0;
+  TestListener* listener = new TestListener(&on_start_counter, NULL);
+
+  TestEventListeners listeners;
+  listeners.Append(listener);
+  ASSERT_TRUE(TestEventListenersAccessor::EventForwardingEnabled(listeners));
+  TestEventListenersAccessor::SuppressEventForwarding(&listeners);
+  ASSERT_FALSE(TestEventListenersAccessor::EventForwardingEnabled(listeners));
+  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
+      *UnitTest::GetInstance());
+  EXPECT_EQ(0, on_start_counter);
+}
+
+// Tests that events generated by Google Test are not forwarded in
+// death test subprocesses.
+TEST(EventListenerDeathTest, EventsNotForwardedInDeathTestSubprecesses) {
+  EXPECT_DEATH_IF_SUPPORTED({
+      GTEST_CHECK_(TestEventListenersAccessor::EventForwardingEnabled(
+          *GetUnitTestImpl()->listeners())) << "expected failure";},
+      "expected failure");
+}
+
+// Tests that a listener installed via SetDefaultResultPrinter() starts
+// receiving events and is returned via default_result_printer() and that
+// the previous default_result_printer is removed from the list and deleted.
+TEST(EventListenerTest, default_result_printer) {
+  int on_start_counter = 0;
+  bool is_destroyed = false;
+  TestListener* listener = new TestListener(&on_start_counter, &is_destroyed);
+
+  TestEventListeners listeners;
+  TestEventListenersAccessor::SetDefaultResultPrinter(&listeners, listener);
+
+  EXPECT_EQ(listener, listeners.default_result_printer());
+
+  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
+      *UnitTest::GetInstance());
+
+  EXPECT_EQ(1, on_start_counter);
+
+  // Replacing default_result_printer with something else should remove it
+  // from the list and destroy it.
+  TestEventListenersAccessor::SetDefaultResultPrinter(&listeners, NULL);
+
+  EXPECT_TRUE(listeners.default_result_printer() == NULL);
+  EXPECT_TRUE(is_destroyed);
+
+  // After broadcasting an event the counter is still the same, indicating
+  // the listener is not in the list anymore.
+  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
+      *UnitTest::GetInstance());
+  EXPECT_EQ(1, on_start_counter);
+}
+
+// Tests that the default_result_printer listener stops receiving events
+// when removed via Release and that is not owned by the list anymore.
+TEST(EventListenerTest, RemovingDefaultResultPrinterWorks) {
+  int on_start_counter = 0;
+  bool is_destroyed = false;
+  // Although Append passes the ownership of this object to the list,
+  // the following calls release it, and we need to delete it before the
+  // test ends.
+  TestListener* listener = new TestListener(&on_start_counter, &is_destroyed);
+  {
+    TestEventListeners listeners;
+    TestEventListenersAccessor::SetDefaultResultPrinter(&listeners, listener);
+
+    EXPECT_EQ(listener, listeners.Release(listener));
+    EXPECT_TRUE(listeners.default_result_printer() == NULL);
+    EXPECT_FALSE(is_destroyed);
+
+    // Broadcasting events now should not affect default_result_printer.
+    TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
+        *UnitTest::GetInstance());
+    EXPECT_EQ(0, on_start_counter);
+  }
+  // Destroying the list should not affect the listener now, too.
+  EXPECT_FALSE(is_destroyed);
+  delete listener;
+}
+
+// Tests that a listener installed via SetDefaultXmlGenerator() starts
+// receiving events and is returned via default_xml_generator() and that
+// the previous default_xml_generator is removed from the list and deleted.
+TEST(EventListenerTest, default_xml_generator) {
+  int on_start_counter = 0;
+  bool is_destroyed = false;
+  TestListener* listener = new TestListener(&on_start_counter, &is_destroyed);
+
+  TestEventListeners listeners;
+  TestEventListenersAccessor::SetDefaultXmlGenerator(&listeners, listener);
+
+  EXPECT_EQ(listener, listeners.default_xml_generator());
+
+  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
+      *UnitTest::GetInstance());
+
+  EXPECT_EQ(1, on_start_counter);
+
+  // Replacing default_xml_generator with something else should remove it
+  // from the list and destroy it.
+  TestEventListenersAccessor::SetDefaultXmlGenerator(&listeners, NULL);
+
+  EXPECT_TRUE(listeners.default_xml_generator() == NULL);
+  EXPECT_TRUE(is_destroyed);
+
+  // After broadcasting an event the counter is still the same, indicating
+  // the listener is not in the list anymore.
+  TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
+      *UnitTest::GetInstance());
+  EXPECT_EQ(1, on_start_counter);
+}
+
+// Tests that the default_xml_generator listener stops receiving events
+// when removed via Release and that is not owned by the list anymore.
+TEST(EventListenerTest, RemovingDefaultXmlGeneratorWorks) {
+  int on_start_counter = 0;
+  bool is_destroyed = false;
+  // Although Append passes the ownership of this object to the list,
+  // the following calls release it, and we need to delete it before the
+  // test ends.
+  TestListener* listener = new TestListener(&on_start_counter, &is_destroyed);
+  {
+    TestEventListeners listeners;
+    TestEventListenersAccessor::SetDefaultXmlGenerator(&listeners, listener);
+
+    EXPECT_EQ(listener, listeners.Release(listener));
+    EXPECT_TRUE(listeners.default_xml_generator() == NULL);
+    EXPECT_FALSE(is_destroyed);
+
+    // Broadcasting events now should not affect default_xml_generator.
+    TestEventListenersAccessor::GetRepeater(&listeners)->OnTestProgramStart(
+        *UnitTest::GetInstance());
+    EXPECT_EQ(0, on_start_counter);
+  }
+  // Destroying the list should not affect the listener now, too.
+  EXPECT_FALSE(is_destroyed);
+  delete listener;
+}
+
+// Sanity tests to ensure that the alternative, verbose spellings of
+// some of the macros work.  We don't test them thoroughly as that
+// would be quite involved.  Since their implementations are
+// straightforward, and they are rarely used, we'll just rely on the
+// users to tell us when they are broken.
+GTEST_TEST(AlternativeNameTest, Works) {  // GTEST_TEST is the same as TEST.
+  GTEST_SUCCEED() << "OK";  // GTEST_SUCCEED is the same as SUCCEED.
+
+  // GTEST_FAIL is the same as FAIL.
+  EXPECT_FATAL_FAILURE(GTEST_FAIL() << "An expected failure",
+                       "An expected failure");
+
+  // GTEST_ASSERT_XY is the same as ASSERT_XY.
+
+  GTEST_ASSERT_EQ(0, 0);
+  EXPECT_FATAL_FAILURE(GTEST_ASSERT_EQ(0, 1) << "An expected failure",
+                       "An expected failure");
+  EXPECT_FATAL_FAILURE(GTEST_ASSERT_EQ(1, 0) << "An expected failure",
+                       "An expected failure");
+
+  GTEST_ASSERT_NE(0, 1);
+  GTEST_ASSERT_NE(1, 0);
+  EXPECT_FATAL_FAILURE(GTEST_ASSERT_NE(0, 0) << "An expected failure",
+                       "An expected failure");
+
+  GTEST_ASSERT_LE(0, 0);
+  GTEST_ASSERT_LE(0, 1);
+  EXPECT_FATAL_FAILURE(GTEST_ASSERT_LE(1, 0) << "An expected failure",
+                       "An expected failure");
+
+  GTEST_ASSERT_LT(0, 1);
+  EXPECT_FATAL_FAILURE(GTEST_ASSERT_LT(0, 0) << "An expected failure",
+                       "An expected failure");
+  EXPECT_FATAL_FAILURE(GTEST_ASSERT_LT(1, 0) << "An expected failure",
+                       "An expected failure");
+
+  GTEST_ASSERT_GE(0, 0);
+  GTEST_ASSERT_GE(1, 0);
+  EXPECT_FATAL_FAILURE(GTEST_ASSERT_GE(0, 1) << "An expected failure",
+                       "An expected failure");
+
+  GTEST_ASSERT_GT(1, 0);
+  EXPECT_FATAL_FAILURE(GTEST_ASSERT_GT(0, 1) << "An expected failure",
+                       "An expected failure");
+  EXPECT_FATAL_FAILURE(GTEST_ASSERT_GT(1, 1) << "An expected failure",
+                       "An expected failure");
+}
+
+// Tests for internal utilities necessary for implementation of the universal
+// printing.
+// TODO(vladl@google.com): Find a better home for them.
+
+class ConversionHelperBase {};
+class ConversionHelperDerived : public ConversionHelperBase {};
+
+// Tests that IsAProtocolMessage<T>::value is a compile-time constant.
+TEST(IsAProtocolMessageTest, ValueIsCompileTimeConstant) {
+  GTEST_COMPILE_ASSERT_(IsAProtocolMessage<ProtocolMessage>::value,
+                        const_true);
+  GTEST_COMPILE_ASSERT_(!IsAProtocolMessage<int>::value, const_false);
+}
+
+// Tests that IsAProtocolMessage<T>::value is true when T is
+// proto2::Message or a sub-class of it.
+TEST(IsAProtocolMessageTest, ValueIsTrueWhenTypeIsAProtocolMessage) {
+  EXPECT_TRUE(IsAProtocolMessage< ::proto2::Message>::value);
+  EXPECT_TRUE(IsAProtocolMessage<ProtocolMessage>::value);
+}
+
+// Tests that IsAProtocolMessage<T>::value is false when T is neither
+// ProtocolMessage nor a sub-class of it.
+TEST(IsAProtocolMessageTest, ValueIsFalseWhenTypeIsNotAProtocolMessage) {
+  EXPECT_FALSE(IsAProtocolMessage<int>::value);
+  EXPECT_FALSE(IsAProtocolMessage<const ConversionHelperBase>::value);
+}
+
+// Tests that CompileAssertTypesEqual compiles when the type arguments are
+// equal.
+TEST(CompileAssertTypesEqual, CompilesWhenTypesAreEqual) {
+  CompileAssertTypesEqual<void, void>();
+  CompileAssertTypesEqual<int*, int*>();
+}
+
+// Tests that RemoveReference does not affect non-reference types.
+TEST(RemoveReferenceTest, DoesNotAffectNonReferenceType) {
+  CompileAssertTypesEqual<int, RemoveReference<int>::type>();
+  CompileAssertTypesEqual<const char, RemoveReference<const char>::type>();
+}
+
+// Tests that RemoveReference removes reference from reference types.
+TEST(RemoveReferenceTest, RemovesReference) {
+  CompileAssertTypesEqual<int, RemoveReference<int&>::type>();
+  CompileAssertTypesEqual<const char, RemoveReference<const char&>::type>();
+}
+
+// Tests GTEST_REMOVE_REFERENCE_.
+
+template <typename T1, typename T2>
+void TestGTestRemoveReference() {
+  CompileAssertTypesEqual<T1, GTEST_REMOVE_REFERENCE_(T2)>();
+}
+
+TEST(RemoveReferenceTest, MacroVersion) {
+  TestGTestRemoveReference<int, int>();
+  TestGTestRemoveReference<const char, const char&>();
+}
+
+
+// Tests that RemoveConst does not affect non-const types.
+TEST(RemoveConstTest, DoesNotAffectNonConstType) {
+  CompileAssertTypesEqual<int, RemoveConst<int>::type>();
+  CompileAssertTypesEqual<char&, RemoveConst<char&>::type>();
+}
+
+// Tests that RemoveConst removes const from const types.
+TEST(RemoveConstTest, RemovesConst) {
+  CompileAssertTypesEqual<int, RemoveConst<const int>::type>();
+  CompileAssertTypesEqual<char[2], RemoveConst<const char[2]>::type>();
+  CompileAssertTypesEqual<char[2][3], RemoveConst<const char[2][3]>::type>();
+}
+
+// Tests GTEST_REMOVE_CONST_.
+
+template <typename T1, typename T2>
+void TestGTestRemoveConst() {
+  CompileAssertTypesEqual<T1, GTEST_REMOVE_CONST_(T2)>();
+}
+
+TEST(RemoveConstTest, MacroVersion) {
+  TestGTestRemoveConst<int, int>();
+  TestGTestRemoveConst<double&, double&>();
+  TestGTestRemoveConst<char, const char>();
+}
+
+// Tests GTEST_REMOVE_REFERENCE_AND_CONST_.
+
+template <typename T1, typename T2>
+void TestGTestRemoveReferenceAndConst() {
+  CompileAssertTypesEqual<T1, GTEST_REMOVE_REFERENCE_AND_CONST_(T2)>();
+}
+
+TEST(RemoveReferenceToConstTest, Works) {
+  TestGTestRemoveReferenceAndConst<int, int>();
+  TestGTestRemoveReferenceAndConst<double, double&>();
+  TestGTestRemoveReferenceAndConst<char, const char>();
+  TestGTestRemoveReferenceAndConst<char, const char&>();
+  TestGTestRemoveReferenceAndConst<const char*, const char*>();
+}
+
+// Tests that AddReference does not affect reference types.
+TEST(AddReferenceTest, DoesNotAffectReferenceType) {
+  CompileAssertTypesEqual<int&, AddReference<int&>::type>();
+  CompileAssertTypesEqual<const char&, AddReference<const char&>::type>();
+}
+
+// Tests that AddReference adds reference to non-reference types.
+TEST(AddReferenceTest, AddsReference) {
+  CompileAssertTypesEqual<int&, AddReference<int>::type>();
+  CompileAssertTypesEqual<const char&, AddReference<const char>::type>();
+}
+
+// Tests GTEST_ADD_REFERENCE_.
+
+template <typename T1, typename T2>
+void TestGTestAddReference() {
+  CompileAssertTypesEqual<T1, GTEST_ADD_REFERENCE_(T2)>();
+}
+
+TEST(AddReferenceTest, MacroVersion) {
+  TestGTestAddReference<int&, int>();
+  TestGTestAddReference<const char&, const char&>();
+}
+
+// Tests GTEST_REFERENCE_TO_CONST_.
+
+template <typename T1, typename T2>
+void TestGTestReferenceToConst() {
+  CompileAssertTypesEqual<T1, GTEST_REFERENCE_TO_CONST_(T2)>();
+}
+
+TEST(GTestReferenceToConstTest, Works) {
+  TestGTestReferenceToConst<const char&, char>();
+  TestGTestReferenceToConst<const int&, const int>();
+  TestGTestReferenceToConst<const double&, double>();
+  TestGTestReferenceToConst<const std::string&, const std::string&>();
+}
+
+// Tests that ImplicitlyConvertible<T1, T2>::value is a compile-time constant.
+TEST(ImplicitlyConvertibleTest, ValueIsCompileTimeConstant) {
+  GTEST_COMPILE_ASSERT_((ImplicitlyConvertible<int, int>::value), const_true);
+  GTEST_COMPILE_ASSERT_((!ImplicitlyConvertible<void*, int*>::value),
+                        const_false);
+}
+
+// Tests that ImplicitlyConvertible<T1, T2>::value is true when T1 can
+// be implicitly converted to T2.
+TEST(ImplicitlyConvertibleTest, ValueIsTrueWhenConvertible) {
+  EXPECT_TRUE((ImplicitlyConvertible<int, double>::value));
+  EXPECT_TRUE((ImplicitlyConvertible<double, int>::value));
+  EXPECT_TRUE((ImplicitlyConvertible<int*, void*>::value));
+  EXPECT_TRUE((ImplicitlyConvertible<int*, const int*>::value));
+  EXPECT_TRUE((ImplicitlyConvertible<ConversionHelperDerived&,
+                                     const ConversionHelperBase&>::value));
+  EXPECT_TRUE((ImplicitlyConvertible<const ConversionHelperBase,
+                                     ConversionHelperBase>::value));
+}
+
+// Tests that ImplicitlyConvertible<T1, T2>::value is false when T1
+// cannot be implicitly converted to T2.
+TEST(ImplicitlyConvertibleTest, ValueIsFalseWhenNotConvertible) {
+  EXPECT_FALSE((ImplicitlyConvertible<double, int*>::value));
+  EXPECT_FALSE((ImplicitlyConvertible<void*, int*>::value));
+  EXPECT_FALSE((ImplicitlyConvertible<const int*, int*>::value));
+  EXPECT_FALSE((ImplicitlyConvertible<ConversionHelperBase&,
+                                      ConversionHelperDerived&>::value));
+}
+
+// Tests IsContainerTest.
+
+class NonContainer {};
+
+TEST(IsContainerTestTest, WorksForNonContainer) {
+  EXPECT_EQ(sizeof(IsNotContainer), sizeof(IsContainerTest<int>(0)));
+  EXPECT_EQ(sizeof(IsNotContainer), sizeof(IsContainerTest<char[5]>(0)));
+  EXPECT_EQ(sizeof(IsNotContainer), sizeof(IsContainerTest<NonContainer>(0)));
+}
+
+TEST(IsContainerTestTest, WorksForContainer) {
+  EXPECT_EQ(sizeof(IsContainer),
+            sizeof(IsContainerTest<std::vector<bool> >(0)));
+  EXPECT_EQ(sizeof(IsContainer),
+            sizeof(IsContainerTest<std::map<int, double> >(0)));
+}
+
+// Tests ArrayEq().
+
+TEST(ArrayEqTest, WorksForDegeneratedArrays) {
+  EXPECT_TRUE(ArrayEq(5, 5L));
+  EXPECT_FALSE(ArrayEq('a', 0));
+}
+
+TEST(ArrayEqTest, WorksForOneDimensionalArrays) {
+  // Note that a and b are distinct but compatible types.
+  const int a[] = { 0, 1 };
+  long b[] = { 0, 1 };
+  EXPECT_TRUE(ArrayEq(a, b));
+  EXPECT_TRUE(ArrayEq(a, 2, b));
+
+  b[0] = 2;
+  EXPECT_FALSE(ArrayEq(a, b));
+  EXPECT_FALSE(ArrayEq(a, 1, b));
+}
+
+TEST(ArrayEqTest, WorksForTwoDimensionalArrays) {
+  const char a[][3] = { "hi", "lo" };
+  const char b[][3] = { "hi", "lo" };
+  const char c[][3] = { "hi", "li" };
+
+  EXPECT_TRUE(ArrayEq(a, b));
+  EXPECT_TRUE(ArrayEq(a, 2, b));
+
+  EXPECT_FALSE(ArrayEq(a, c));
+  EXPECT_FALSE(ArrayEq(a, 2, c));
+}
+
+// Tests ArrayAwareFind().
+
+TEST(ArrayAwareFindTest, WorksForOneDimensionalArray) {
+  const char a[] = "hello";
+  EXPECT_EQ(a + 4, ArrayAwareFind(a, a + 5, 'o'));
+  EXPECT_EQ(a + 5, ArrayAwareFind(a, a + 5, 'x'));
+}
+
+TEST(ArrayAwareFindTest, WorksForTwoDimensionalArray) {
+  int a[][2] = { { 0, 1 }, { 2, 3 }, { 4, 5 } };
+  const int b[2] = { 2, 3 };
+  EXPECT_EQ(a + 1, ArrayAwareFind(a, a + 3, b));
+
+  const int c[2] = { 6, 7 };
+  EXPECT_EQ(a + 3, ArrayAwareFind(a, a + 3, c));
+}
+
+// Tests CopyArray().
+
+TEST(CopyArrayTest, WorksForDegeneratedArrays) {
+  int n = 0;
+  CopyArray('a', &n);
+  EXPECT_EQ('a', n);
+}
+
+TEST(CopyArrayTest, WorksForOneDimensionalArrays) {
+  const char a[3] = "hi";
+  int b[3];
+#ifndef __BORLANDC__  // C++Builder cannot compile some array size deductions.
+  CopyArray(a, &b);
+  EXPECT_TRUE(ArrayEq(a, b));
+#endif
+
+  int c[3];
+  CopyArray(a, 3, c);
+  EXPECT_TRUE(ArrayEq(a, c));
+}
+
+TEST(CopyArrayTest, WorksForTwoDimensionalArrays) {
+  const int a[2][3] = { { 0, 1, 2 }, { 3, 4, 5 } };
+  int b[2][3];
+#ifndef __BORLANDC__  // C++Builder cannot compile some array size deductions.
+  CopyArray(a, &b);
+  EXPECT_TRUE(ArrayEq(a, b));
+#endif
+
+  int c[2][3];
+  CopyArray(a, 2, c);
+  EXPECT_TRUE(ArrayEq(a, c));
+}
+
+// Tests NativeArray.
+
+TEST(NativeArrayTest, ConstructorFromArrayWorks) {
+  const int a[3] = { 0, 1, 2 };
+  NativeArray<int> na(a, 3, RelationToSourceReference());
+  EXPECT_EQ(3U, na.size());
+  EXPECT_EQ(a, na.begin());
+}
+
+TEST(NativeArrayTest, CreatesAndDeletesCopyOfArrayWhenAskedTo) {
+  typedef int Array[2];
+  Array* a = new Array[1];
+  (*a)[0] = 0;
+  (*a)[1] = 1;
+  NativeArray<int> na(*a, 2, RelationToSourceCopy());
+  EXPECT_NE(*a, na.begin());
+  delete[] a;
+  EXPECT_EQ(0, na.begin()[0]);
+  EXPECT_EQ(1, na.begin()[1]);
+
+  // We rely on the heap checker to verify that na deletes the copy of
+  // array.
+}
+
+TEST(NativeArrayTest, TypeMembersAreCorrect) {
+  StaticAssertTypeEq<char, NativeArray<char>::value_type>();
+  StaticAssertTypeEq<int[2], NativeArray<int[2]>::value_type>();
+
+  StaticAssertTypeEq<const char*, NativeArray<char>::const_iterator>();
+  StaticAssertTypeEq<const bool(*)[2], NativeArray<bool[2]>::const_iterator>();
+}
+
+TEST(NativeArrayTest, MethodsWork) {
+  const int a[3] = { 0, 1, 2 };
+  NativeArray<int> na(a, 3, RelationToSourceCopy());
+  ASSERT_EQ(3U, na.size());
+  EXPECT_EQ(3, na.end() - na.begin());
+
+  NativeArray<int>::const_iterator it = na.begin();
+  EXPECT_EQ(0, *it);
+  ++it;
+  EXPECT_EQ(1, *it);
+  it++;
+  EXPECT_EQ(2, *it);
+  ++it;
+  EXPECT_EQ(na.end(), it);
+
+  EXPECT_TRUE(na == na);
+
+  NativeArray<int> na2(a, 3, RelationToSourceReference());
+  EXPECT_TRUE(na == na2);
+
+  const int b1[3] = { 0, 1, 1 };
+  const int b2[4] = { 0, 1, 2, 3 };
+  EXPECT_FALSE(na == NativeArray<int>(b1, 3, RelationToSourceReference()));
+  EXPECT_FALSE(na == NativeArray<int>(b2, 4, RelationToSourceCopy()));
+}
+
+TEST(NativeArrayTest, WorksForTwoDimensionalArray) {
+  const char a[2][3] = { "hi", "lo" };
+  NativeArray<char[3]> na(a, 2, RelationToSourceReference());
+  ASSERT_EQ(2U, na.size());
+  EXPECT_EQ(a, na.begin());
+}
+
+// Tests SkipPrefix().
+
+TEST(SkipPrefixTest, SkipsWhenPrefixMatches) {
+  const char* const str = "hello";
+
+  const char* p = str;
+  EXPECT_TRUE(SkipPrefix("", &p));
+  EXPECT_EQ(str, p);
+
+  p = str;
+  EXPECT_TRUE(SkipPrefix("hell", &p));
+  EXPECT_EQ(str + 4, p);
+}
+
+TEST(SkipPrefixTest, DoesNotSkipWhenPrefixDoesNotMatch) {
+  const char* const str = "world";
+
+  const char* p = str;
+  EXPECT_FALSE(SkipPrefix("W", &p));
+  EXPECT_EQ(str, p);
+
+  p = str;
+  EXPECT_FALSE(SkipPrefix("world!", &p));
+  EXPECT_EQ(str, p);
+}
+
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_outfile1_test_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_outfile1_test_.cc
new file mode 100644
index 0000000000..531ced49d4
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_outfile1_test_.cc
@@ -0,0 +1,49 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keith.ray@gmail.com (Keith Ray)
+//
+// gtest_xml_outfile1_test_ writes some xml via TestProperty used by
+// gtest_xml_outfiles_test.py
+
+#include "gtest/gtest.h"
+
+class PropertyOne : public testing::Test {
+ protected:
+  virtual void SetUp() {
+    RecordProperty("SetUpProp", 1);
+  }
+  virtual void TearDown() {
+    RecordProperty("TearDownProp", 1);
+  }
+};
+
+TEST_F(PropertyOne, TestSomeProperties) {
+  RecordProperty("TestSomeProperty", 1);
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_outfile2_test_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_outfile2_test_.cc
new file mode 100644
index 0000000000..7b400b2760
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_outfile2_test_.cc
@@ -0,0 +1,49 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keith.ray@gmail.com (Keith Ray)
+//
+// gtest_xml_outfile2_test_ writes some xml via TestProperty used by
+// gtest_xml_outfiles_test.py
+
+#include "gtest/gtest.h"
+
+class PropertyTwo : public testing::Test {
+ protected:
+  virtual void SetUp() {
+    RecordProperty("SetUpProp", 2);
+  }
+  virtual void TearDown() {
+    RecordProperty("TearDownProp", 2);
+  }
+};
+
+TEST_F(PropertyTwo, TestSomeProperties) {
+  RecordProperty("TestSomeProperty", 2);
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_outfiles_test.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_outfiles_test.py
new file mode 100755
index 0000000000..524e437e6c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_outfiles_test.py
@@ -0,0 +1,132 @@
+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test for the gtest_xml_output module."""
+
+__author__ = "keith.ray@gmail.com (Keith Ray)"
+
+import os
+from xml.dom import minidom, Node
+
+import gtest_test_utils
+import gtest_xml_test_utils
+
+
+GTEST_OUTPUT_SUBDIR = "xml_outfiles"
+GTEST_OUTPUT_1_TEST = "gtest_xml_outfile1_test_"
+GTEST_OUTPUT_2_TEST = "gtest_xml_outfile2_test_"
+
+EXPECTED_XML_1 = """<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="1" failures="0" disabled="0" errors="0" time="*" timestamp="*" name="AllTests">
+  <testsuite name="PropertyOne" tests="1" failures="0" disabled="0" errors="0" time="*">
+    <testcase name="TestSomeProperties" status="run" time="*" classname="PropertyOne" SetUpProp="1" TestSomeProperty="1" TearDownProp="1" />
+  </testsuite>
+</testsuites>
+"""
+
+EXPECTED_XML_2 = """<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="1" failures="0" disabled="0" errors="0" time="*" timestamp="*" name="AllTests">
+  <testsuite name="PropertyTwo" tests="1" failures="0" disabled="0" errors="0" time="*">
+    <testcase name="TestSomeProperties" status="run" time="*" classname="PropertyTwo" SetUpProp="2" TestSomeProperty="2" TearDownProp="2" />
+  </testsuite>
+</testsuites>
+"""
+
+
+class GTestXMLOutFilesTest(gtest_xml_test_utils.GTestXMLTestCase):
+  """Unit test for Google Test's XML output functionality."""
+
+  def setUp(self):
+    # We want the trailing '/' that the last "" provides in os.path.join, for
+    # telling Google Test to create an output directory instead of a single file
+    # for xml output.
+    self.output_dir_ = os.path.join(gtest_test_utils.GetTempDir(),
+                                    GTEST_OUTPUT_SUBDIR, "")
+    self.DeleteFilesAndDir()
+
+  def tearDown(self):
+    self.DeleteFilesAndDir()
+
+  def DeleteFilesAndDir(self):
+    try:
+      os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_1_TEST + ".xml"))
+    except os.error:
+      pass
+    try:
+      os.remove(os.path.join(self.output_dir_, GTEST_OUTPUT_2_TEST + ".xml"))
+    except os.error:
+      pass
+    try:
+      os.rmdir(self.output_dir_)
+    except os.error:
+      pass
+
+  def testOutfile1(self):
+    self._TestOutFile(GTEST_OUTPUT_1_TEST, EXPECTED_XML_1)
+
+  def testOutfile2(self):
+    self._TestOutFile(GTEST_OUTPUT_2_TEST, EXPECTED_XML_2)
+
+  def _TestOutFile(self, test_name, expected_xml):
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(test_name)
+    command = [gtest_prog_path, "--gtest_output=xml:%s" % self.output_dir_]
+    p = gtest_test_utils.Subprocess(command,
+                                    working_dir=gtest_test_utils.GetTempDir())
+    self.assert_(p.exited)
+    self.assertEquals(0, p.exit_code)
+
+    # TODO(wan@google.com): libtool causes the built test binary to be
+    #   named lt-gtest_xml_outfiles_test_ instead of
+    #   gtest_xml_outfiles_test_.  To account for this possibillity, we
+    #   allow both names in the following code.  We should remove this
+    #   hack when Chandler Carruth's libtool replacement tool is ready.
+    output_file_name1 = test_name + ".xml"
+    output_file1 = os.path.join(self.output_dir_, output_file_name1)
+    output_file_name2 = 'lt-' + output_file_name1
+    output_file2 = os.path.join(self.output_dir_, output_file_name2)
+    self.assert_(os.path.isfile(output_file1) or os.path.isfile(output_file2),
+                 output_file1)
+
+    expected = minidom.parseString(expected_xml)
+    if os.path.isfile(output_file1):
+      actual = minidom.parse(output_file1)
+    else:
+      actual = minidom.parse(output_file2)
+    self.NormalizeXml(actual.documentElement)
+    self.AssertEquivalentNodes(expected.documentElement,
+                               actual.documentElement)
+    expected.unlink()
+    actual.unlink()
+
+
+if __name__ == "__main__":
+  os.environ["GTEST_STACK_TRACE_DEPTH"] = "0"
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_output_unittest.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_output_unittest.py
new file mode 100755
index 0000000000..bcd5975991
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_output_unittest.py
@@ -0,0 +1,308 @@
+#!/usr/bin/env python
+#
+# Copyright 2006, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test for the gtest_xml_output module"""
+
+__author__ = 'eefacm@gmail.com (Sean Mcafee)'
+
+import datetime
+import errno
+import os
+import re
+import sys
+from xml.dom import minidom, Node
+
+import gtest_test_utils
+import gtest_xml_test_utils
+
+
+GTEST_FILTER_FLAG = '--gtest_filter'
+GTEST_LIST_TESTS_FLAG = '--gtest_list_tests'
+GTEST_OUTPUT_FLAG         = "--gtest_output"
+GTEST_DEFAULT_OUTPUT_FILE = "test_detail.xml"
+GTEST_PROGRAM_NAME = "gtest_xml_output_unittest_"
+
+SUPPORTS_STACK_TRACES = False
+
+if SUPPORTS_STACK_TRACES:
+  STACK_TRACE_TEMPLATE = '\nStack trace:\n*'
+else:
+  STACK_TRACE_TEMPLATE = ''
+
+EXPECTED_NON_EMPTY_XML = """<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="23" failures="4" disabled="2" errors="0" time="*" timestamp="*" name="AllTests" ad_hoc_property="42">
+  <testsuite name="SuccessfulTest" tests="1" failures="0" disabled="0" errors="0" time="*">
+    <testcase name="Succeeds" status="run" time="*" classname="SuccessfulTest"/>
+  </testsuite>
+  <testsuite name="FailedTest" tests="1" failures="1" disabled="0" errors="0" time="*">
+    <testcase name="Fails" status="run" time="*" classname="FailedTest">
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;      Expected: 1&#x0A;To be equal to: 2" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+      Expected: 1
+To be equal to: 2%(stack)s]]></failure>
+    </testcase>
+  </testsuite>
+  <testsuite name="MixedResultTest" tests="3" failures="1" disabled="1" errors="0" time="*">
+    <testcase name="Succeeds" status="run" time="*" classname="MixedResultTest"/>
+    <testcase name="Fails" status="run" time="*" classname="MixedResultTest">
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;      Expected: 1&#x0A;To be equal to: 2" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+      Expected: 1
+To be equal to: 2%(stack)s]]></failure>
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;      Expected: 2&#x0A;To be equal to: 3" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+      Expected: 2
+To be equal to: 3%(stack)s]]></failure>
+    </testcase>
+    <testcase name="DISABLED_test" status="notrun" time="*" classname="MixedResultTest"/>
+  </testsuite>
+  <testsuite name="XmlQuotingTest" tests="1" failures="1" disabled="0" errors="0" time="*">
+    <testcase name="OutputsCData" status="run" time="*" classname="XmlQuotingTest">
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Failed&#x0A;XML output: &lt;?xml encoding=&quot;utf-8&quot;&gt;&lt;top&gt;&lt;![CDATA[cdata text]]&gt;&lt;/top&gt;" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+Failed
+XML output: <?xml encoding="utf-8"><top><![CDATA[cdata text]]>]]&gt;<![CDATA[</top>%(stack)s]]></failure>
+    </testcase>
+  </testsuite>
+  <testsuite name="InvalidCharactersTest" tests="1" failures="1" disabled="0" errors="0" time="*">
+    <testcase name="InvalidCharactersInMessage" status="run" time="*" classname="InvalidCharactersTest">
+      <failure message="gtest_xml_output_unittest_.cc:*&#x0A;Failed&#x0A;Invalid characters in brackets []" type=""><![CDATA[gtest_xml_output_unittest_.cc:*
+Failed
+Invalid characters in brackets []%(stack)s]]></failure>
+    </testcase>
+  </testsuite>
+  <testsuite name="DisabledTest" tests="1" failures="0" disabled="1" errors="0" time="*">
+    <testcase name="DISABLED_test_not_run" status="notrun" time="*" classname="DisabledTest"/>
+  </testsuite>
+  <testsuite name="PropertyRecordingTest" tests="4" failures="0" disabled="0" errors="0" time="*" SetUpTestCase="yes" TearDownTestCase="aye">
+    <testcase name="OneProperty" status="run" time="*" classname="PropertyRecordingTest" key_1="1"/>
+    <testcase name="IntValuedProperty" status="run" time="*" classname="PropertyRecordingTest" key_int="1"/>
+    <testcase name="ThreeProperties" status="run" time="*" classname="PropertyRecordingTest" key_1="1" key_2="2" key_3="3"/>
+    <testcase name="TwoValuesForOneKeyUsesLastValue" status="run" time="*" classname="PropertyRecordingTest" key_1="2"/>
+  </testsuite>
+  <testsuite name="NoFixtureTest" tests="3" failures="0" disabled="0" errors="0" time="*">
+     <testcase name="RecordProperty" status="run" time="*" classname="NoFixtureTest" key="1"/>
+     <testcase name="ExternalUtilityThatCallsRecordIntValuedProperty" status="run" time="*" classname="NoFixtureTest" key_for_utility_int="1"/>
+     <testcase name="ExternalUtilityThatCallsRecordStringValuedProperty" status="run" time="*" classname="NoFixtureTest" key_for_utility_string="1"/>
+  </testsuite>
+  <testsuite name="Single/ValueParamTest" tests="4" failures="0" disabled="0" errors="0" time="*">
+    <testcase name="HasValueParamAttribute/0" value_param="33" status="run" time="*" classname="Single/ValueParamTest" />
+    <testcase name="HasValueParamAttribute/1" value_param="42" status="run" time="*" classname="Single/ValueParamTest" />
+    <testcase name="AnotherTestThatHasValueParamAttribute/0" value_param="33" status="run" time="*" classname="Single/ValueParamTest" />
+    <testcase name="AnotherTestThatHasValueParamAttribute/1" value_param="42" status="run" time="*" classname="Single/ValueParamTest" />
+  </testsuite>
+  <testsuite name="TypedTest/0" tests="1" failures="0" disabled="0" errors="0" time="*">
+    <testcase name="HasTypeParamAttribute" type_param="*" status="run" time="*" classname="TypedTest/0" />
+  </testsuite>
+  <testsuite name="TypedTest/1" tests="1" failures="0" disabled="0" errors="0" time="*">
+    <testcase name="HasTypeParamAttribute" type_param="*" status="run" time="*" classname="TypedTest/1" />
+  </testsuite>
+  <testsuite name="Single/TypeParameterizedTestCase/0" tests="1" failures="0" disabled="0" errors="0" time="*">
+    <testcase name="HasTypeParamAttribute" type_param="*" status="run" time="*" classname="Single/TypeParameterizedTestCase/0" />
+  </testsuite>
+  <testsuite name="Single/TypeParameterizedTestCase/1" tests="1" failures="0" disabled="0" errors="0" time="*">
+    <testcase name="HasTypeParamAttribute" type_param="*" status="run" time="*" classname="Single/TypeParameterizedTestCase/1" />
+  </testsuite>
+</testsuites>""" % {'stack': STACK_TRACE_TEMPLATE}
+
+EXPECTED_FILTERED_TEST_XML = """<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="1" failures="0" disabled="0" errors="0" time="*"
+            timestamp="*" name="AllTests" ad_hoc_property="42">
+  <testsuite name="SuccessfulTest" tests="1" failures="0" disabled="0"
+             errors="0" time="*">
+    <testcase name="Succeeds" status="run" time="*" classname="SuccessfulTest"/>
+  </testsuite>
+</testsuites>"""
+
+EXPECTED_EMPTY_XML = """<?xml version="1.0" encoding="UTF-8"?>
+<testsuites tests="0" failures="0" disabled="0" errors="0" time="*"
+            timestamp="*" name="AllTests">
+</testsuites>"""
+
+GTEST_PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath(GTEST_PROGRAM_NAME)
+
+SUPPORTS_TYPED_TESTS = 'TypedTest' in gtest_test_utils.Subprocess(
+    [GTEST_PROGRAM_PATH, GTEST_LIST_TESTS_FLAG], capture_stderr=False).output
+
+
+class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
+  """
+  Unit test for Google Test's XML output functionality.
+  """
+
+  # This test currently breaks on platforms that do not support typed and
+  # type-parameterized tests, so we don't run it under them.
+  if SUPPORTS_TYPED_TESTS:
+    def testNonEmptyXmlOutput(self):
+      """
+      Runs a test program that generates a non-empty XML output, and
+      tests that the XML output is expected.
+      """
+      self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_NON_EMPTY_XML, 1)
+
+  def testEmptyXmlOutput(self):
+    """Verifies XML output for a Google Test binary without actual tests.
+
+    Runs a test program that generates an empty XML output, and
+    tests that the XML output is expected.
+    """
+
+    self._TestXmlOutput('gtest_no_test_unittest', EXPECTED_EMPTY_XML, 0)
+
+  def testTimestampValue(self):
+    """Checks whether the timestamp attribute in the XML output is valid.
+
+    Runs a test program that generates an empty XML output, and checks if
+    the timestamp attribute in the testsuites tag is valid.
+    """
+    actual = self._GetXmlOutput('gtest_no_test_unittest', [], 0)
+    date_time_str = actual.documentElement.getAttributeNode('timestamp').value
+    # datetime.strptime() is only available in Python 2.5+ so we have to
+    # parse the expected datetime manually.
+    match = re.match(r'(\d+)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)', date_time_str)
+    self.assertTrue(
+        re.match,
+        'XML datettime string %s has incorrect format' % date_time_str)
+    date_time_from_xml = datetime.datetime(
+        year=int(match.group(1)), month=int(match.group(2)),
+        day=int(match.group(3)), hour=int(match.group(4)),
+        minute=int(match.group(5)), second=int(match.group(6)))
+
+    time_delta = abs(datetime.datetime.now() - date_time_from_xml)
+    # timestamp value should be near the current local time
+    self.assertTrue(time_delta < datetime.timedelta(seconds=600),
+                    'time_delta is %s' % time_delta)
+    actual.unlink()
+
+  def testDefaultOutputFile(self):
+    """
+    Confirms that Google Test produces an XML output file with the expected
+    default name if no name is explicitly specified.
+    """
+    output_file = os.path.join(gtest_test_utils.GetTempDir(),
+                               GTEST_DEFAULT_OUTPUT_FILE)
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(
+        'gtest_no_test_unittest')
+    try:
+      os.remove(output_file)
+    except OSError:
+      e = sys.exc_info()[1]
+      if e.errno != errno.ENOENT:
+        raise
+
+    p = gtest_test_utils.Subprocess(
+        [gtest_prog_path, '%s=xml' % GTEST_OUTPUT_FLAG],
+        working_dir=gtest_test_utils.GetTempDir())
+    self.assert_(p.exited)
+    self.assertEquals(0, p.exit_code)
+    self.assert_(os.path.isfile(output_file))
+
+  def testSuppressedXmlOutput(self):
+    """
+    Tests that no XML file is generated if the default XML listener is
+    shut down before RUN_ALL_TESTS is invoked.
+    """
+
+    xml_path = os.path.join(gtest_test_utils.GetTempDir(),
+                            GTEST_PROGRAM_NAME + 'out.xml')
+    if os.path.isfile(xml_path):
+      os.remove(xml_path)
+
+    command = [GTEST_PROGRAM_PATH,
+               '%s=xml:%s' % (GTEST_OUTPUT_FLAG, xml_path),
+               '--shut_down_xml']
+    p = gtest_test_utils.Subprocess(command)
+    if p.terminated_by_signal:
+      # p.signal is avalable only if p.terminated_by_signal is True.
+      self.assertFalse(
+          p.terminated_by_signal,
+          '%s was killed by signal %d' % (GTEST_PROGRAM_NAME, p.signal))
+    else:
+      self.assert_(p.exited)
+      self.assertEquals(1, p.exit_code,
+                        "'%s' exited with code %s, which doesn't match "
+                        'the expected exit code %s.'
+                        % (command, p.exit_code, 1))
+
+    self.assert_(not os.path.isfile(xml_path))
+
+  def testFilteredTestXmlOutput(self):
+    """Verifies XML output when a filter is applied.
+
+    Runs a test program that executes only some tests and verifies that
+    non-selected tests do not show up in the XML output.
+    """
+
+    self._TestXmlOutput(GTEST_PROGRAM_NAME, EXPECTED_FILTERED_TEST_XML, 0,
+                        extra_args=['%s=SuccessfulTest.*' % GTEST_FILTER_FLAG])
+
+  def _GetXmlOutput(self, gtest_prog_name, extra_args, expected_exit_code):
+    """
+    Returns the xml output generated by running the program gtest_prog_name.
+    Furthermore, the program's exit code must be expected_exit_code.
+    """
+    xml_path = os.path.join(gtest_test_utils.GetTempDir(),
+                            gtest_prog_name + 'out.xml')
+    gtest_prog_path = gtest_test_utils.GetTestExecutablePath(gtest_prog_name)
+
+    command = ([gtest_prog_path, '%s=xml:%s' % (GTEST_OUTPUT_FLAG, xml_path)] +
+               extra_args)
+    p = gtest_test_utils.Subprocess(command)
+    if p.terminated_by_signal:
+      self.assert_(False,
+                   '%s was killed by signal %d' % (gtest_prog_name, p.signal))
+    else:
+      self.assert_(p.exited)
+      self.assertEquals(expected_exit_code, p.exit_code,
+                        "'%s' exited with code %s, which doesn't match "
+                        'the expected exit code %s.'
+                        % (command, p.exit_code, expected_exit_code))
+    actual = minidom.parse(xml_path)
+    return actual
+
+  def _TestXmlOutput(self, gtest_prog_name, expected_xml,
+                     expected_exit_code, extra_args=None):
+    """
+    Asserts that the XML document generated by running the program
+    gtest_prog_name matches expected_xml, a string containing another
+    XML document.  Furthermore, the program's exit code must be
+    expected_exit_code.
+    """
+
+    actual = self._GetXmlOutput(gtest_prog_name, extra_args or [],
+                                expected_exit_code)
+    expected = minidom.parseString(expected_xml)
+    self.NormalizeXml(actual.documentElement)
+    self.AssertEquivalentNodes(expected.documentElement,
+                               actual.documentElement)
+    expected.unlink()
+    actual.unlink()
+
+
+if __name__ == '__main__':
+  os.environ['GTEST_STACK_TRACE_DEPTH'] = '1'
+  gtest_test_utils.Main()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_output_unittest_.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_output_unittest_.cc
new file mode 100644
index 0000000000..48b8771b52
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_output_unittest_.cc
@@ -0,0 +1,181 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: eefacm@gmail.com (Sean Mcafee)
+
+// Unit test for Google Test XML output.
+//
+// A user can specify XML output in a Google Test program to run via
+// either the GTEST_OUTPUT environment variable or the --gtest_output
+// flag.  This is used for testing such functionality.
+//
+// This program will be invoked from a Python unit test.  Don't run it
+// directly.
+
+#include "gtest/gtest.h"
+
+using ::testing::InitGoogleTest;
+using ::testing::TestEventListeners;
+using ::testing::TestWithParam;
+using ::testing::UnitTest;
+using ::testing::Test;
+using ::testing::Values;
+
+class SuccessfulTest : public Test {
+};
+
+TEST_F(SuccessfulTest, Succeeds) {
+  SUCCEED() << "This is a success.";
+  ASSERT_EQ(1, 1);
+}
+
+class FailedTest : public Test {
+};
+
+TEST_F(FailedTest, Fails) {
+  ASSERT_EQ(1, 2);
+}
+
+class DisabledTest : public Test {
+};
+
+TEST_F(DisabledTest, DISABLED_test_not_run) {
+  FAIL() << "Unexpected failure: Disabled test should not be run";
+}
+
+TEST(MixedResultTest, Succeeds) {
+  EXPECT_EQ(1, 1);
+  ASSERT_EQ(1, 1);
+}
+
+TEST(MixedResultTest, Fails) {
+  EXPECT_EQ(1, 2);
+  ASSERT_EQ(2, 3);
+}
+
+TEST(MixedResultTest, DISABLED_test) {
+  FAIL() << "Unexpected failure: Disabled test should not be run";
+}
+
+TEST(XmlQuotingTest, OutputsCData) {
+  FAIL() << "XML output: "
+            "<?xml encoding=\"utf-8\"><top><![CDATA[cdata text]]></top>";
+}
+
+// Helps to test that invalid characters produced by test code do not make
+// it into the XML file.
+TEST(InvalidCharactersTest, InvalidCharactersInMessage) {
+  FAIL() << "Invalid characters in brackets [\x1\x2]";
+}
+
+class PropertyRecordingTest : public Test {
+ public:
+  static void SetUpTestCase() { RecordProperty("SetUpTestCase", "yes"); }
+  static void TearDownTestCase() { RecordProperty("TearDownTestCase", "aye"); }
+};
+
+TEST_F(PropertyRecordingTest, OneProperty) {
+  RecordProperty("key_1", "1");
+}
+
+TEST_F(PropertyRecordingTest, IntValuedProperty) {
+  RecordProperty("key_int", 1);
+}
+
+TEST_F(PropertyRecordingTest, ThreeProperties) {
+  RecordProperty("key_1", "1");
+  RecordProperty("key_2", "2");
+  RecordProperty("key_3", "3");
+}
+
+TEST_F(PropertyRecordingTest, TwoValuesForOneKeyUsesLastValue) {
+  RecordProperty("key_1", "1");
+  RecordProperty("key_1", "2");
+}
+
+TEST(NoFixtureTest, RecordProperty) {
+  RecordProperty("key", "1");
+}
+
+void ExternalUtilityThatCallsRecordProperty(const std::string& key, int value) {
+  testing::Test::RecordProperty(key, value);
+}
+
+void ExternalUtilityThatCallsRecordProperty(const std::string& key,
+                                            const std::string& value) {
+  testing::Test::RecordProperty(key, value);
+}
+
+TEST(NoFixtureTest, ExternalUtilityThatCallsRecordIntValuedProperty) {
+  ExternalUtilityThatCallsRecordProperty("key_for_utility_int", 1);
+}
+
+TEST(NoFixtureTest, ExternalUtilityThatCallsRecordStringValuedProperty) {
+  ExternalUtilityThatCallsRecordProperty("key_for_utility_string", "1");
+}
+
+// Verifies that the test parameter value is output in the 'value_param'
+// XML attribute for value-parameterized tests.
+class ValueParamTest : public TestWithParam<int> {};
+TEST_P(ValueParamTest, HasValueParamAttribute) {}
+TEST_P(ValueParamTest, AnotherTestThatHasValueParamAttribute) {}
+INSTANTIATE_TEST_CASE_P(Single, ValueParamTest, Values(33, 42));
+
+#if GTEST_HAS_TYPED_TEST
+// Verifies that the type parameter name is output in the 'type_param'
+// XML attribute for typed tests.
+template <typename T> class TypedTest : public Test {};
+typedef testing::Types<int, long> TypedTestTypes;
+TYPED_TEST_CASE(TypedTest, TypedTestTypes);
+TYPED_TEST(TypedTest, HasTypeParamAttribute) {}
+#endif
+
+#if GTEST_HAS_TYPED_TEST_P
+// Verifies that the type parameter name is output in the 'type_param'
+// XML attribute for type-parameterized tests.
+template <typename T> class TypeParameterizedTestCase : public Test {};
+TYPED_TEST_CASE_P(TypeParameterizedTestCase);
+TYPED_TEST_P(TypeParameterizedTestCase, HasTypeParamAttribute) {}
+REGISTER_TYPED_TEST_CASE_P(TypeParameterizedTestCase, HasTypeParamAttribute);
+typedef testing::Types<int, long> TypeParameterizedTestCaseTypes;
+INSTANTIATE_TYPED_TEST_CASE_P(Single,
+                              TypeParameterizedTestCase,
+                              TypeParameterizedTestCaseTypes);
+#endif
+
+int main(int argc, char** argv) {
+  InitGoogleTest(&argc, argv);
+
+  if (argc > 1 && strcmp(argv[1], "--shut_down_xml") == 0) {
+    TestEventListeners& listeners = UnitTest::GetInstance()->listeners();
+    delete listeners.Release(listeners.default_xml_generator());
+  }
+  testing::Test::RecordProperty("ad_hoc_property", "42");
+  return RUN_ALL_TESTS();
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_test_utils.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_test_utils.py
new file mode 100755
index 0000000000..341956b54d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/gtest_xml_test_utils.py
@@ -0,0 +1,194 @@
+#!/usr/bin/env python
+#
+# Copyright 2006, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Unit test utilities for gtest_xml_output"""
+
+__author__ = 'eefacm@gmail.com (Sean Mcafee)'
+
+import re
+from xml.dom import minidom, Node
+
+import gtest_test_utils
+
+
+GTEST_OUTPUT_FLAG         = '--gtest_output'
+GTEST_DEFAULT_OUTPUT_FILE = 'test_detail.xml'
+
+class GTestXMLTestCase(gtest_test_utils.TestCase):
+  """
+  Base class for tests of Google Test's XML output functionality.
+  """
+
+
+  def AssertEquivalentNodes(self, expected_node, actual_node):
+    """
+    Asserts that actual_node (a DOM node object) is equivalent to
+    expected_node (another DOM node object), in that either both of
+    them are CDATA nodes and have the same value, or both are DOM
+    elements and actual_node meets all of the following conditions:
+
+    *  It has the same tag name as expected_node.
+    *  It has the same set of attributes as expected_node, each with
+       the same value as the corresponding attribute of expected_node.
+       Exceptions are any attribute named "time", which needs only be
+       convertible to a floating-point number and any attribute named
+       "type_param" which only has to be non-empty.
+    *  It has an equivalent set of child nodes (including elements and
+       CDATA sections) as expected_node.  Note that we ignore the
+       order of the children as they are not guaranteed to be in any
+       particular order.
+    """
+
+    if expected_node.nodeType == Node.CDATA_SECTION_NODE:
+      self.assertEquals(Node.CDATA_SECTION_NODE, actual_node.nodeType)
+      self.assertEquals(expected_node.nodeValue, actual_node.nodeValue)
+      return
+
+    self.assertEquals(Node.ELEMENT_NODE, actual_node.nodeType)
+    self.assertEquals(Node.ELEMENT_NODE, expected_node.nodeType)
+    self.assertEquals(expected_node.tagName, actual_node.tagName)
+
+    expected_attributes = expected_node.attributes
+    actual_attributes   = actual_node  .attributes
+    self.assertEquals(
+        expected_attributes.length, actual_attributes.length,
+        'attribute numbers differ in element %s:\nExpected: %r\nActual: %r' % (
+            actual_node.tagName, expected_attributes.keys(),
+            actual_attributes.keys()))
+    for i in range(expected_attributes.length):
+      expected_attr = expected_attributes.item(i)
+      actual_attr   = actual_attributes.get(expected_attr.name)
+      self.assert_(
+          actual_attr is not None,
+          'expected attribute %s not found in element %s' %
+          (expected_attr.name, actual_node.tagName))
+      self.assertEquals(
+          expected_attr.value, actual_attr.value,
+          ' values of attribute %s in element %s differ: %s vs %s' %
+          (expected_attr.name, actual_node.tagName,
+           expected_attr.value, actual_attr.value))
+
+    expected_children = self._GetChildren(expected_node)
+    actual_children = self._GetChildren(actual_node)
+    self.assertEquals(
+        len(expected_children), len(actual_children),
+        'number of child elements differ in element ' + actual_node.tagName)
+    for child_id, child in expected_children.items():
+      self.assert_(child_id in actual_children,
+                   '<%s> is not in <%s> (in element %s)' %
+                   (child_id, actual_children, actual_node.tagName))
+      self.AssertEquivalentNodes(child, actual_children[child_id])
+
+  identifying_attribute = {
+    'testsuites': 'name',
+    'testsuite': 'name',
+    'testcase':  'name',
+    'failure':   'message',
+    }
+
+  def _GetChildren(self, element):
+    """
+    Fetches all of the child nodes of element, a DOM Element object.
+    Returns them as the values of a dictionary keyed by the IDs of the
+    children.  For <testsuites>, <testsuite> and <testcase> elements, the ID
+    is the value of their "name" attribute; for <failure> elements, it is
+    the value of the "message" attribute; CDATA sections and non-whitespace
+    text nodes are concatenated into a single CDATA section with ID
+    "detail".  An exception is raised if any element other than the above
+    four is encountered, if two child elements with the same identifying
+    attributes are encountered, or if any other type of node is encountered.
+    """
+
+    children = {}
+    for child in element.childNodes:
+      if child.nodeType == Node.ELEMENT_NODE:
+        self.assert_(child.tagName in self.identifying_attribute,
+                     'Encountered unknown element <%s>' % child.tagName)
+        childID = child.getAttribute(self.identifying_attribute[child.tagName])
+        self.assert_(childID not in children)
+        children[childID] = child
+      elif child.nodeType in [Node.TEXT_NODE, Node.CDATA_SECTION_NODE]:
+        if 'detail' not in children:
+          if (child.nodeType == Node.CDATA_SECTION_NODE or
+              not child.nodeValue.isspace()):
+            children['detail'] = child.ownerDocument.createCDATASection(
+                child.nodeValue)
+        else:
+          children['detail'].nodeValue += child.nodeValue
+      else:
+        self.fail('Encountered unexpected node type %d' % child.nodeType)
+    return children
+
+  def NormalizeXml(self, element):
+    """
+    Normalizes Google Test's XML output to eliminate references to transient
+    information that may change from run to run.
+
+    *  The "time" attribute of <testsuites>, <testsuite> and <testcase>
+       elements is replaced with a single asterisk, if it contains
+       only digit characters.
+    *  The "timestamp" attribute of <testsuites> elements is replaced with a
+       single asterisk, if it contains a valid ISO8601 datetime value.
+    *  The "type_param" attribute of <testcase> elements is replaced with a
+       single asterisk (if it sn non-empty) as it is the type name returned
+       by the compiler and is platform dependent.
+    *  The line info reported in the first line of the "message"
+       attribute and CDATA section of <failure> elements is replaced with the
+       file's basename and a single asterisk for the line number.
+    *  The directory names in file paths are removed.
+    *  The stack traces are removed.
+    """
+
+    if element.tagName == 'testsuites':
+      timestamp = element.getAttributeNode('timestamp')
+      timestamp.value = re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d$',
+                               '*', timestamp.value)
+    if element.tagName in ('testsuites', 'testsuite', 'testcase'):
+      time = element.getAttributeNode('time')
+      time.value = re.sub(r'^\d+(\.\d+)?$', '*', time.value)
+      type_param = element.getAttributeNode('type_param')
+      if type_param and type_param.value:
+        type_param.value = '*'
+    elif element.tagName == 'failure':
+      source_line_pat = r'^.*[/\\](.*:)\d+\n'
+      # Replaces the source line information with a normalized form.
+      message = element.getAttributeNode('message')
+      message.value = re.sub(source_line_pat, '\\1*\n', message.value)
+      for child in element.childNodes:
+        if child.nodeType == Node.CDATA_SECTION_NODE:
+          # Replaces the source line information with a normalized form.
+          cdata = re.sub(source_line_pat, '\\1*\n', child.nodeValue)
+          # Removes the actual stack trace.
+          child.nodeValue = re.sub(r'\nStack trace:\n(.|\n)*',
+                                   '', cdata)
+    for child in element.childNodes:
+      if child.nodeType == Node.ELEMENT_NODE:
+        self.NormalizeXml(child)
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/production.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/production.cc
new file mode 100644
index 0000000000..8b8a40b44e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/production.cc
@@ -0,0 +1,36 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// This is part of the unit test for include/gtest/gtest_prod.h.
+
+#include "production.h"
+
+PrivateCode::PrivateCode() : x_(0) {}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/production.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/production.h
new file mode 100644
index 0000000000..98fd5e476c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/test/production.h
@@ -0,0 +1,55 @@
+// Copyright 2006, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan@google.com (Zhanyong Wan)
+//
+// This is part of the unit test for include/gtest/gtest_prod.h.
+
+#ifndef GTEST_TEST_PRODUCTION_H_
+#define GTEST_TEST_PRODUCTION_H_
+
+#include "gtest/gtest_prod.h"
+
+class PrivateCode {
+ public:
+  // Declares a friend test that does not use a fixture.
+  FRIEND_TEST(PrivateCodeTest, CanAccessPrivateMembers);
+
+  // Declares a friend test that uses a fixture.
+  FRIEND_TEST(PrivateCodeFixtureTest, CanAccessPrivateMembers);
+
+  PrivateCode();
+
+  int x() const { return x_; }
+ private:
+  void set_x(int an_x) { x_ = an_x; }
+  int x_;
+};
+
+#endif  // GTEST_TEST_PRODUCTION_H_
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/DebugProject.xcconfig b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/DebugProject.xcconfig
new file mode 100644
index 0000000000..3d68157d5d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/DebugProject.xcconfig
@@ -0,0 +1,30 @@
+//
+//  DebugProject.xcconfig
+//
+//  These are Debug Configuration project settings for the gtest framework and
+//  examples. It is set in the "Based On:" dropdown in the "Project" info
+//  dialog.
+//  This file is based on the Xcode Configuration files in:
+//  http://code.google.com/p/google-toolbox-for-mac/
+// 
+
+#include "General.xcconfig"
+
+// No optimization
+GCC_OPTIMIZATION_LEVEL = 0
+
+// Deployment postprocessing is what triggers Xcode to strip, turn it off
+DEPLOYMENT_POSTPROCESSING = NO
+
+// Dead code stripping off
+DEAD_CODE_STRIPPING = NO
+
+// Debug symbols should be on obviously
+GCC_GENERATE_DEBUGGING_SYMBOLS = YES
+
+// Define the DEBUG macro in all debug builds
+OTHER_CFLAGS = $(OTHER_CFLAGS) -DDEBUG=1
+
+// These are turned off to avoid STL incompatibilities with client code
+// // Turns on special C++ STL checks to "encourage" good STL use
+// GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) _GLIBCXX_DEBUG_PEDANTIC _GLIBCXX_DEBUG _GLIBCPP_CONCEPT_CHECKS
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/FrameworkTarget.xcconfig b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/FrameworkTarget.xcconfig
new file mode 100644
index 0000000000..357b1c8fbf
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/FrameworkTarget.xcconfig
@@ -0,0 +1,17 @@
+//
+//  FrameworkTarget.xcconfig
+//
+//  These are Framework target settings for the gtest framework and examples. It
+//  is set in the "Based On:" dropdown in the "Target" info dialog.
+//  This file is based on the Xcode Configuration files in:
+//  http://code.google.com/p/google-toolbox-for-mac/
+// 
+
+// Dynamic libs need to be position independent
+GCC_DYNAMIC_NO_PIC = NO
+
+// Dynamic libs should not have their external symbols stripped.
+STRIP_STYLE = non-global
+
+// Let the user install by specifying the $DSTROOT with xcodebuild
+SKIP_INSTALL = NO
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/General.xcconfig b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/General.xcconfig
new file mode 100644
index 0000000000..f23e322272
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/General.xcconfig
@@ -0,0 +1,41 @@
+//
+//  General.xcconfig
+//
+//  These are General configuration settings for the gtest framework and
+//  examples.
+//  This file is based on the Xcode Configuration files in:
+//  http://code.google.com/p/google-toolbox-for-mac/
+// 
+
+// Build for PPC and Intel, 32- and 64-bit
+ARCHS = i386 x86_64 ppc ppc64
+
+// Zerolink prevents link warnings so turn it off
+ZERO_LINK = NO
+
+// Prebinding considered unhelpful in 10.3 and later
+PREBINDING = NO
+
+// Strictest warning policy
+WARNING_CFLAGS = -Wall -Werror -Wendif-labels -Wnewline-eof -Wno-sign-compare -Wshadow
+
+// Work around Xcode bugs by using external strip. See:
+// http://lists.apple.com/archives/Xcode-users/2006/Feb/msg00050.html
+SEPARATE_STRIP = YES
+
+// Force C99 dialect
+GCC_C_LANGUAGE_STANDARD = c99
+
+// not sure why apple defaults this on, but it's pretty risky
+ALWAYS_SEARCH_USER_PATHS = NO
+
+// Turn on position dependent code for most cases (overridden where appropriate)
+GCC_DYNAMIC_NO_PIC = YES
+
+// Default SDK and minimum OS version is 10.4
+SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk
+MACOSX_DEPLOYMENT_TARGET = 10.4
+GCC_VERSION = 4.0
+
+// VERSIONING BUILD SETTINGS (used in Info.plist)
+GTEST_VERSIONINFO_ABOUT =  © 2008 Google Inc.
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/ReleaseProject.xcconfig b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/ReleaseProject.xcconfig
new file mode 100644
index 0000000000..5349f0a04a
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/ReleaseProject.xcconfig
@@ -0,0 +1,32 @@
+//
+//  ReleaseProject.xcconfig
+//
+//  These are Release Configuration project settings for the gtest framework
+//  and examples. It is set in the "Based On:" dropdown in the "Project" info
+//  dialog.
+//  This file is based on the Xcode Configuration files in:
+//  http://code.google.com/p/google-toolbox-for-mac/
+// 
+
+#include "General.xcconfig"
+
+// subconfig/Release.xcconfig
+
+// Optimize for space and size (Apple recommendation)
+GCC_OPTIMIZATION_LEVEL = s
+
+// Deploment postprocessing is what triggers Xcode to strip
+DEPLOYMENT_POSTPROCESSING = YES
+
+// No symbols
+GCC_GENERATE_DEBUGGING_SYMBOLS = NO
+
+// Dead code strip does not affect ObjC code but can help for C
+DEAD_CODE_STRIPPING = YES
+
+// NDEBUG is used by things like assert.h, so define it for general compat.
+// ASSERT going away in release tends to create unused vars.
+OTHER_CFLAGS = $(OTHER_CFLAGS) -DNDEBUG=1 -Wno-unused-variable
+
+// When we strip we want to strip all symbols in release, but save externals.
+STRIP_STYLE = all
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/StaticLibraryTarget.xcconfig b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/StaticLibraryTarget.xcconfig
new file mode 100644
index 0000000000..3922fa51d5
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/StaticLibraryTarget.xcconfig
@@ -0,0 +1,18 @@
+//
+//  StaticLibraryTarget.xcconfig
+//
+//  These are static library target settings for libgtest.a. It
+//  is set in the "Based On:" dropdown in the "Target" info dialog.
+//  This file is based on the Xcode Configuration files in:
+//  http://code.google.com/p/google-toolbox-for-mac/
+// 
+
+// Static libs can be included in bundles so make them position independent
+GCC_DYNAMIC_NO_PIC = NO
+
+// Static libs should not have their internal globals or external symbols
+// stripped.
+STRIP_STYLE = debugging
+
+// Let the user install by specifying the $DSTROOT with xcodebuild
+SKIP_INSTALL = NO
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/TestTarget.xcconfig b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/TestTarget.xcconfig
new file mode 100644
index 0000000000..e6652ba859
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Config/TestTarget.xcconfig
@@ -0,0 +1,8 @@
+//
+//  TestTarget.xcconfig
+//
+//  These are Test target settings for the gtest framework and examples. It
+//  is set in the "Based On:" dropdown in the "Target" info dialog.
+
+PRODUCT_NAME = $(TARGET_NAME)
+HEADER_SEARCH_PATHS = ../include
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Resources/Info.plist b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Resources/Info.plist
new file mode 100644
index 0000000000..9dd28ea148
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Resources/Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.google.${PRODUCT_NAME}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>GTEST_VERSIONINFO_LONG</string>
+	<key>CFBundleShortVersionString</key>
+	<string>GTEST_VERSIONINFO_SHORT</string>
+	<key>CFBundleGetInfoString</key>
+	<string>${PRODUCT_NAME} GTEST_VERSIONINFO_LONG, ${GTEST_VERSIONINFO_ABOUT}</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>${GTEST_VERSIONINFO_ABOUT}</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+</dict>
+</plist>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/Info.plist b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/Info.plist
new file mode 100644
index 0000000000..f3852edea2
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/Info.plist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.google.gtest.${PRODUCT_NAME:identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+</dict>
+</plist>
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..497617eb68
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
@@ -0,0 +1,457 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 42;
+	objects = {
+
+/* Begin PBXAggregateTarget section */
+		4024D162113D7D2400C7059E /* Test */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 4024D169113D7D4600C7059E /* Build configuration list for PBXAggregateTarget "Test" */;
+			buildPhases = (
+				4024D161113D7D2400C7059E /* ShellScript */,
+			);
+			dependencies = (
+				4024D166113D7D3100C7059E /* PBXTargetDependency */,
+			);
+			name = Test;
+			productName = TestAndBuild;
+		};
+		4024D1E9113D83FF00C7059E /* TestAndBuild */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 4024D1F0113D842B00C7059E /* Build configuration list for PBXAggregateTarget "TestAndBuild" */;
+			buildPhases = (
+			);
+			dependencies = (
+				4024D1ED113D840900C7059E /* PBXTargetDependency */,
+				4024D1EF113D840D00C7059E /* PBXTargetDependency */,
+			);
+			name = TestAndBuild;
+			productName = TestAndBuild;
+		};
+/* End PBXAggregateTarget section */
+
+/* Begin PBXBuildFile section */
+		3B7EB1250E5AEE3500C7F239 /* widget.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B7EB1230E5AEE3500C7F239 /* widget.cc */; };
+		3B7EB1260E5AEE3500C7F239 /* widget.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B7EB1240E5AEE3500C7F239 /* widget.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3B7EB1280E5AEE4600C7F239 /* widget_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B7EB1270E5AEE4600C7F239 /* widget_test.cc */; };
+		3B7EB1480E5AF3B400C7F239 /* Widget.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D07F2C80486CC7A007CD1D0 /* Widget.framework */; };
+		4024D188113D7D7800C7059E /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4024D185113D7D5500C7059E /* libgtest.a */; };
+		4024D189113D7D7A00C7059E /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4024D183113D7D5500C7059E /* libgtest_main.a */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		3B07BDF00E3F3FAE00647869 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0;
+			remoteInfo = gTestExample;
+		};
+		4024D165113D7D3100C7059E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 3B07BDE90E3F3F9E00647869;
+			remoteInfo = WidgetFrameworkTest;
+		};
+		4024D1EC113D840900C7059E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0;
+			remoteInfo = WidgetFramework;
+		};
+		4024D1EE113D840D00C7059E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 4024D162113D7D2400C7059E;
+			remoteInfo = Test;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		3B07BDEA0E3F3F9E00647869 /* WidgetFrameworkTest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = WidgetFrameworkTest; sourceTree = BUILT_PRODUCTS_DIR; };
+		3B7EB1230E5AEE3500C7F239 /* widget.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = widget.cc; sourceTree = "<group>"; };
+		3B7EB1240E5AEE3500C7F239 /* widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = widget.h; sourceTree = "<group>"; };
+		3B7EB1270E5AEE4600C7F239 /* widget_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = widget_test.cc; sourceTree = "<group>"; };
+		4024D183113D7D5500C7059E /* libgtest_main.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgtest_main.a; path = /usr/local/lib/libgtest_main.a; sourceTree = "<absolute>"; };
+		4024D185113D7D5500C7059E /* libgtest.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgtest.a; path = /usr/local/lib/libgtest.a; sourceTree = "<absolute>"; };
+		4024D1E2113D838200C7059E /* runtests.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = runtests.sh; sourceTree = "<group>"; };
+		8D07F2C70486CC7A007CD1D0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+		8D07F2C80486CC7A007CD1D0 /* Widget.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Widget.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		3B07BDE80E3F3F9E00647869 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4024D189113D7D7A00C7059E /* libgtest_main.a in Frameworks */,
+				4024D188113D7D7800C7059E /* libgtest.a in Frameworks */,
+				3B7EB1480E5AF3B400C7F239 /* Widget.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8D07F2C30486CC7A007CD1D0 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		034768DDFF38A45A11DB9C8B /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D07F2C80486CC7A007CD1D0 /* Widget.framework */,
+				3B07BDEA0E3F3F9E00647869 /* WidgetFrameworkTest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		0867D691FE84028FC02AAC07 /* gTestExample */ = {
+			isa = PBXGroup;
+			children = (
+				4024D1E1113D836C00C7059E /* Scripts */,
+				08FB77ACFE841707C02AAC07 /* Source */,
+				089C1665FE841158C02AAC07 /* Resources */,
+				3B07BE350E4094E400647869 /* Test */,
+				0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
+				034768DDFF38A45A11DB9C8B /* Products */,
+			);
+			name = gTestExample;
+			sourceTree = "<group>";
+		};
+		0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				4024D183113D7D5500C7059E /* libgtest_main.a */,
+				4024D185113D7D5500C7059E /* libgtest.a */,
+			);
+			name = "External Frameworks and Libraries";
+			sourceTree = "<group>";
+		};
+		089C1665FE841158C02AAC07 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				8D07F2C70486CC7A007CD1D0 /* Info.plist */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		08FB77ACFE841707C02AAC07 /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				3B7EB1230E5AEE3500C7F239 /* widget.cc */,
+				3B7EB1240E5AEE3500C7F239 /* widget.h */,
+			);
+			name = Source;
+			sourceTree = "<group>";
+		};
+		3B07BE350E4094E400647869 /* Test */ = {
+			isa = PBXGroup;
+			children = (
+				3B7EB1270E5AEE4600C7F239 /* widget_test.cc */,
+			);
+			name = Test;
+			sourceTree = "<group>";
+		};
+		4024D1E1113D836C00C7059E /* Scripts */ = {
+			isa = PBXGroup;
+			children = (
+				4024D1E2113D838200C7059E /* runtests.sh */,
+			);
+			name = Scripts;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		8D07F2BD0486CC7A007CD1D0 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3B7EB1260E5AEE3500C7F239 /* widget.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		3B07BDE90E3F3F9E00647869 /* WidgetFrameworkTest */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 3B07BDF40E3F3FB600647869 /* Build configuration list for PBXNativeTarget "WidgetFrameworkTest" */;
+			buildPhases = (
+				3B07BDE70E3F3F9E00647869 /* Sources */,
+				3B07BDE80E3F3F9E00647869 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				3B07BDF10E3F3FAE00647869 /* PBXTargetDependency */,
+			);
+			name = WidgetFrameworkTest;
+			productName = gTestExampleTest;
+			productReference = 3B07BDEA0E3F3F9E00647869 /* WidgetFrameworkTest */;
+			productType = "com.apple.product-type.tool";
+		};
+		8D07F2BC0486CC7A007CD1D0 /* WidgetFramework */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "WidgetFramework" */;
+			buildPhases = (
+				8D07F2C10486CC7A007CD1D0 /* Sources */,
+				8D07F2C30486CC7A007CD1D0 /* Frameworks */,
+				8D07F2BD0486CC7A007CD1D0 /* Headers */,
+				8D07F2BF0486CC7A007CD1D0 /* Resources */,
+				8D07F2C50486CC7A007CD1D0 /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = WidgetFramework;
+			productInstallPath = "$(HOME)/Library/Frameworks";
+			productName = gTestExample;
+			productReference = 8D07F2C80486CC7A007CD1D0 /* Widget.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		0867D690FE84028FC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "WidgetFramework" */;
+			compatibilityVersion = "Xcode 2.4";
+			hasScannedForEncodings = 1;
+			mainGroup = 0867D691FE84028FC02AAC07 /* gTestExample */;
+			productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				8D07F2BC0486CC7A007CD1D0 /* WidgetFramework */,
+				3B07BDE90E3F3F9E00647869 /* WidgetFrameworkTest */,
+				4024D162113D7D2400C7059E /* Test */,
+				4024D1E9113D83FF00C7059E /* TestAndBuild */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D07F2BF0486CC7A007CD1D0 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXRezBuildPhase section */
+		8D07F2C50486CC7A007CD1D0 /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXRezBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		4024D161113D7D2400C7059E /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/bash $SRCROOT/runtests.sh $BUILT_PRODUCTS_DIR/WidgetFrameworkTest\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		3B07BDE70E3F3F9E00647869 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3B7EB1280E5AEE4600C7F239 /* widget_test.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8D07F2C10486CC7A007CD1D0 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3B7EB1250E5AEE3500C7F239 /* widget.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		3B07BDF10E3F3FAE00647869 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8D07F2BC0486CC7A007CD1D0 /* WidgetFramework */;
+			targetProxy = 3B07BDF00E3F3FAE00647869 /* PBXContainerItemProxy */;
+		};
+		4024D166113D7D3100C7059E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 3B07BDE90E3F3F9E00647869 /* WidgetFrameworkTest */;
+			targetProxy = 4024D165113D7D3100C7059E /* PBXContainerItemProxy */;
+		};
+		4024D1ED113D840900C7059E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8D07F2BC0486CC7A007CD1D0 /* WidgetFramework */;
+			targetProxy = 4024D1EC113D840900C7059E /* PBXContainerItemProxy */;
+		};
+		4024D1EF113D840D00C7059E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 4024D162113D7D2400C7059E /* Test */;
+			targetProxy = 4024D1EE113D840D00C7059E /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		3B07BDEC0E3F3F9F00647869 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = WidgetFrameworkTest;
+			};
+			name = Debug;
+		};
+		3B07BDED0E3F3F9F00647869 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = WidgetFrameworkTest;
+			};
+			name = Release;
+		};
+		4024D163113D7D2400C7059E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = TestAndBuild;
+			};
+			name = Debug;
+		};
+		4024D164113D7D2400C7059E /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = TestAndBuild;
+			};
+			name = Release;
+		};
+		4024D1EA113D83FF00C7059E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = TestAndBuild;
+			};
+			name = Debug;
+		};
+		4024D1EB113D83FF00C7059E /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = TestAndBuild;
+			};
+			name = Release;
+		};
+		4FADC24308B4156D00ABE55E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_VERSION = A;
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "@loader_path/../Frameworks";
+				PRODUCT_NAME = Widget;
+			};
+			name = Debug;
+		};
+		4FADC24408B4156D00ABE55E /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_VERSION = A;
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "@loader_path/../Frameworks";
+				PRODUCT_NAME = Widget;
+			};
+			name = Release;
+		};
+		4FADC24708B4156D00ABE55E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_VERSION = 4.0;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Debug;
+		};
+		4FADC24808B4156D00ABE55E /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_VERSION = 4.0;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		3B07BDF40E3F3FB600647869 /* Build configuration list for PBXNativeTarget "WidgetFrameworkTest" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				3B07BDEC0E3F3F9F00647869 /* Debug */,
+				3B07BDED0E3F3F9F00647869 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		4024D169113D7D4600C7059E /* Build configuration list for PBXAggregateTarget "Test" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4024D163113D7D2400C7059E /* Debug */,
+				4024D164113D7D2400C7059E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		4024D1F0113D842B00C7059E /* Build configuration list for PBXAggregateTarget "TestAndBuild" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4024D1EA113D83FF00C7059E /* Debug */,
+				4024D1EB113D83FF00C7059E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "WidgetFramework" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4FADC24308B4156D00ABE55E /* Debug */,
+				4FADC24408B4156D00ABE55E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "WidgetFramework" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4FADC24708B4156D00ABE55E /* Debug */,
+				4FADC24808B4156D00ABE55E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/runtests.sh b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/runtests.sh
new file mode 100644
index 0000000000..4a0d413e52
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/runtests.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Executes the samples and tests for the Google Test Framework.
+
+# Help the dynamic linker find the path to the libraries.
+export DYLD_FRAMEWORK_PATH=$BUILT_PRODUCTS_DIR
+export DYLD_LIBRARY_PATH=$BUILT_PRODUCTS_DIR
+
+# Create some executables.
+test_executables=$@
+
+# Now execute each one in turn keeping track of how many succeeded and failed.
+succeeded=0
+failed=0
+failed_list=()
+for test in ${test_executables[*]}; do
+  "$test"
+  result=$?
+  if [ $result -eq 0 ]; then
+    succeeded=$(( $succeeded + 1 ))
+  else
+    failed=$(( failed + 1 ))
+    failed_list="$failed_list $test"
+  fi
+done
+
+# Report the successes and failures to the console.
+echo "Tests complete with $succeeded successes and $failed failures."
+if [ $failed -ne 0 ]; then
+  echo "The following tests failed:"
+  echo $failed_list
+fi
+exit $failed
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/widget.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/widget.cc
new file mode 100644
index 0000000000..bfc4e7fcfd
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/widget.cc
@@ -0,0 +1,63 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: preston.a.jackson@gmail.com (Preston Jackson)
+//
+// Google Test - FrameworkSample
+// widget.cc
+//
+
+// Widget is a very simple class used for demonstrating the use of gtest
+
+#include "widget.h"
+
+Widget::Widget(int number, const std::string& name)
+    : number_(number),
+      name_(name) {}
+
+Widget::~Widget() {}
+
+float Widget::GetFloatValue() const {
+  return number_;
+}
+
+int Widget::GetIntValue() const {
+  return static_cast<int>(number_);
+}
+
+std::string Widget::GetStringValue() const {
+  return name_;
+}
+
+void Widget::GetCharPtrValue(char* buffer, size_t max_size) const {
+  // Copy the char* representation of name_ into buffer, up to max_size.
+  strncpy(buffer, name_.c_str(), max_size-1);
+  buffer[max_size-1] = '\0';
+  return;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/widget.h b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/widget.h
new file mode 100644
index 0000000000..0c55cdc8cf
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/widget.h
@@ -0,0 +1,59 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: preston.a.jackson@gmail.com (Preston Jackson)
+//
+// Google Test - FrameworkSample
+// widget.h
+//
+
+// Widget is a very simple class used for demonstrating the use of gtest. It
+// simply stores two values a string and an integer, which are returned via
+// public accessors in multiple forms.
+
+#import <string>
+
+class Widget {
+ public:
+  Widget(int number, const std::string& name);
+  ~Widget();
+
+  // Public accessors to number data
+  float GetFloatValue() const;
+  int GetIntValue() const;
+
+  // Public accessors to the string data
+  std::string GetStringValue() const;
+  void GetCharPtrValue(char* buffer, size_t max_size) const;
+
+ private:
+  // Data members
+  float number_;
+  std::string name_;
+};
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/widget_test.cc b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/widget_test.cc
new file mode 100644
index 0000000000..8725994218
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Samples/FrameworkSample/widget_test.cc
@@ -0,0 +1,68 @@
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: preston.a.jackson@gmail.com (Preston Jackson)
+//
+// Google Test - FrameworkSample
+// widget_test.cc
+//
+
+// This is a simple test file for the Widget class in the Widget.framework
+
+#include <string>
+#include "gtest/gtest.h"
+
+#include <Widget/widget.h>
+
+// This test verifies that the constructor sets the internal state of the
+// Widget class correctly.
+TEST(WidgetInitializerTest, TestConstructor) {
+  Widget widget(1.0f, "name");
+  EXPECT_FLOAT_EQ(1.0f, widget.GetFloatValue());
+  EXPECT_EQ(std::string("name"), widget.GetStringValue());
+}
+
+// This test verifies the conversion of the float and string values to int and
+// char*, respectively.
+TEST(WidgetInitializerTest, TestConversion) {
+  Widget widget(1.0f, "name");
+  EXPECT_EQ(1, widget.GetIntValue());
+
+  size_t max_size = 128;
+  char buffer[max_size];
+  widget.GetCharPtrValue(buffer, max_size);
+  EXPECT_STREQ("name", buffer);
+}
+
+// Use the Google Test main that is linked into the framework. It does something
+// like this:
+// int main(int argc, char** argv) {
+//   testing::InitGoogleTest(&argc, argv);
+//   return RUN_ALL_TESTS();
+// }
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Scripts/runtests.sh b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Scripts/runtests.sh
new file mode 100644
index 0000000000..3fc229f1d4
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Scripts/runtests.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Executes the samples and tests for the Google Test Framework.
+
+# Help the dynamic linker find the path to the libraries.
+export DYLD_FRAMEWORK_PATH=$BUILT_PRODUCTS_DIR
+export DYLD_LIBRARY_PATH=$BUILT_PRODUCTS_DIR
+
+# Create some executables.
+test_executables=("$BUILT_PRODUCTS_DIR/gtest_unittest-framework"
+                  "$BUILT_PRODUCTS_DIR/gtest_unittest"
+                  "$BUILT_PRODUCTS_DIR/sample1_unittest-framework"
+                  "$BUILT_PRODUCTS_DIR/sample1_unittest-static")
+
+# Now execute each one in turn keeping track of how many succeeded and failed. 
+succeeded=0
+failed=0
+failed_list=()
+for test in ${test_executables[*]}; do
+  "$test"
+  result=$?
+  if [ $result -eq 0 ]; then
+    succeeded=$(( $succeeded + 1 ))
+  else
+    failed=$(( failed + 1 ))
+    failed_list="$failed_list $test"
+  fi
+done
+
+# Report the successes and failures to the console.
+echo "Tests complete with $succeeded successes and $failed failures."
+if [ $failed -ne 0 ]; then
+  echo "The following tests failed:"
+  echo $failed_list
+fi
+exit $failed
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Scripts/versiongenerate.py b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Scripts/versiongenerate.py
new file mode 100755
index 0000000000..81de8c96ac
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/Scripts/versiongenerate.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+#
+# Copyright 2008, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""A script to prepare version informtion for use the gtest Info.plist file.
+
+  This script extracts the version information from the configure.ac file and
+  uses it to generate a header file containing the same information. The
+  #defines in this header file will be included in during the generation of
+  the Info.plist of the framework, giving the correct value to the version
+  shown in the Finder.
+
+  This script makes the following assumptions (these are faults of the script,
+  not problems with the Autoconf):
+    1. The AC_INIT macro will be contained within the first 1024 characters
+       of configure.ac
+    2. The version string will be 3 integers separated by periods and will be
+       surrounded by squre brackets, "[" and "]" (e.g. [1.0.1]). The first
+       segment represents the major version, the second represents the minor
+       version and the third represents the fix version.
+    3. No ")" character exists between the opening "(" and closing ")" of
+       AC_INIT, including in comments and character strings.
+"""
+
+import sys
+import re
+
+# Read the command line argument (the output directory for Version.h)
+if (len(sys.argv) < 3):
+  print "Usage: versiongenerate.py input_dir output_dir"
+  sys.exit(1)
+else:
+  input_dir = sys.argv[1]
+  output_dir = sys.argv[2]
+
+# Read the first 1024 characters of the configure.ac file
+config_file = open("%s/configure.ac" % input_dir, 'r')
+buffer_size = 1024
+opening_string = config_file.read(buffer_size)
+config_file.close()
+
+# Extract the version string from the AC_INIT macro
+#   The following init_expression means:
+#     Extract three integers separated by periods and surrounded by squre
+#     brackets(e.g. "[1.0.1]") between "AC_INIT(" and ")". Do not be greedy
+#     (*? is the non-greedy flag) since that would pull in everything between
+#     the first "(" and the last ")" in the file.
+version_expression = re.compile(r"AC_INIT\(.*?\[(\d+)\.(\d+)\.(\d+)\].*?\)",
+                                re.DOTALL)
+version_values = version_expression.search(opening_string)
+major_version = version_values.group(1)
+minor_version = version_values.group(2)
+fix_version = version_values.group(3)
+
+# Write the version information to a header file to be included in the
+# Info.plist file.
+file_data = """//
+// DO NOT MODIFY THIS FILE (but you can delete it)
+//
+// This file is autogenerated by the versiongenerate.py script. This script
+// is executed in a "Run Script" build phase when creating gtest.framework. This
+// header file is not used during compilation of C-source. Rather, it simply
+// defines some version strings for substitution in the Info.plist. Because of
+// this, we are not not restricted to C-syntax nor are we using include guards.
+//
+
+#define GTEST_VERSIONINFO_SHORT %s.%s
+#define GTEST_VERSIONINFO_LONG %s.%s.%s
+
+""" % (major_version, minor_version, major_version, minor_version, fix_version)
+version_file = open("%s/Version.h" % output_dir, 'w')
+version_file.write(file_data)
+version_file.close()
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/gtest.xcodeproj/project.pbxproj b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/gtest.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..aefaa88b05
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/googletest/xcode/gtest.xcodeproj/project.pbxproj
@@ -0,0 +1,1135 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXAggregateTarget section */
+		3B238F5F0E828B5400846E11 /* Check */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 3B238FA30E828BB600846E11 /* Build configuration list for PBXAggregateTarget "Check" */;
+			buildPhases = (
+				3B238F5E0E828B5400846E11 /* ShellScript */,
+			);
+			dependencies = (
+				40899F9D0FFA740F000B29AE /* PBXTargetDependency */,
+				40C849F7101A43440083642A /* PBXTargetDependency */,
+				4089A0980FFAD34A000B29AE /* PBXTargetDependency */,
+				40C849F9101A43490083642A /* PBXTargetDependency */,
+			);
+			name = Check;
+			productName = Check;
+		};
+		40C44ADC0E3798F4008FCC51 /* Version Info */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 40C44AE40E379905008FCC51 /* Build configuration list for PBXAggregateTarget "Version Info" */;
+			buildPhases = (
+				40C44ADB0E3798F4008FCC51 /* Generate Version.h */,
+			);
+			comments = "The generation of Version.h must be performed in its own target. Since the Info.plist is preprocessed before any of the other build phases in gtest, the Version.h file would not be ready if included as a build phase of that target.";
+			dependencies = (
+			);
+			name = "Version Info";
+			productName = Version.h;
+		};
+/* End PBXAggregateTarget section */
+
+/* Begin PBXBuildFile section */
+		224A12A30E9EADCC00BD17FD /* gtest-test-part.h in Headers */ = {isa = PBXBuildFile; fileRef = 224A12A20E9EADCC00BD17FD /* gtest-test-part.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3BF6F2A00E79B5AD000F2EEE /* gtest-type-util.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */; };
+		3BF6F2A50E79B616000F2EEE /* gtest-typed-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BF6F2A40E79B616000F2EEE /* gtest-typed-test.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		404884380E2F799B00CF7658 /* gtest-death-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DB0E2F799B00CF7658 /* gtest-death-test.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		404884390E2F799B00CF7658 /* gtest-message.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DC0E2F799B00CF7658 /* gtest-message.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4048843A0E2F799B00CF7658 /* gtest-spi.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DD0E2F799B00CF7658 /* gtest-spi.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4048843B0E2F799B00CF7658 /* gtest.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DE0E2F799B00CF7658 /* gtest.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4048843C0E2F799B00CF7658 /* gtest_pred_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DF0E2F799B00CF7658 /* gtest_pred_impl.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4048843D0E2F799B00CF7658 /* gtest_prod.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883E00E2F799B00CF7658 /* gtest_prod.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		404884500E2F799B00CF7658 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 404883F60E2F799B00CF7658 /* README.md */; };
+		404884A00E2F7BE600CF7658 /* gtest-death-test-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */; };
+		404884A10E2F7BE600CF7658 /* gtest-filepath.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E30E2F799B00CF7658 /* gtest-filepath.h */; };
+		404884A20E2F7BE600CF7658 /* gtest-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E40E2F799B00CF7658 /* gtest-internal.h */; };
+		404884A30E2F7BE600CF7658 /* gtest-port.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E50E2F799B00CF7658 /* gtest-port.h */; };
+		404884A40E2F7BE600CF7658 /* gtest-string.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E60E2F799B00CF7658 /* gtest-string.h */; };
+		404884AC0E2F7CD900CF7658 /* CHANGES in Resources */ = {isa = PBXBuildFile; fileRef = 404884A90E2F7CD900CF7658 /* CHANGES */; };
+		404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */ = {isa = PBXBuildFile; fileRef = 404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */; };
+		404884AE0E2F7CD900CF7658 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 404884AB0E2F7CD900CF7658 /* LICENSE */; };
+		40899F3A0FFA70D4000B29AE /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = 224A12A10E9EADA700BD17FD /* gtest-all.cc */; };
+		40899F500FFA7281000B29AE /* gtest-tuple.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 40899F4D0FFA7271000B29AE /* gtest-tuple.h */; };
+		40899F530FFA72A0000B29AE /* gtest_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */; };
+		4089A0440FFAD1BE000B29AE /* sample1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02C0FFACF7F000B29AE /* sample1.cc */; };
+		4089A0460FFAD1BE000B29AE /* sample1_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */; };
+		40C848FF101A21150083642A /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = 224A12A10E9EADA700BD17FD /* gtest-all.cc */; };
+		40C84915101A21DF0083642A /* gtest_main.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4048840D0E2F799B00CF7658 /* gtest_main.cc */; };
+		40C84916101A235B0083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; };
+		40C84921101A23AD0083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; };
+		40C84978101A36540083642A /* libgtest_main.a in Resources */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; };
+		40C84980101A36850083642A /* gtest_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */; };
+		40C84982101A36850083642A /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C848FA101A209C0083642A /* libgtest.a */; };
+		40C84983101A36850083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; };
+		40C8498F101A36A60083642A /* sample1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02C0FFACF7F000B29AE /* sample1.cc */; };
+		40C84990101A36A60083642A /* sample1_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */; };
+		40C84992101A36A60083642A /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C848FA101A209C0083642A /* libgtest.a */; };
+		40C84993101A36A60083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; };
+		40C849A2101A37050083642A /* gtest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4539C8FF0EC27F6400A70F4C /* gtest.framework */; };
+		40C849A4101A37150083642A /* gtest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4539C8FF0EC27F6400A70F4C /* gtest.framework */; };
+		4539C9340EC280AE00A70F4C /* gtest-param-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 4539C9330EC280AE00A70F4C /* gtest-param-test.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4539C9380EC280E200A70F4C /* gtest-linked_ptr.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */; };
+		4539C9390EC280E200A70F4C /* gtest-param-util-generated.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */; };
+		4539C93A0EC280E200A70F4C /* gtest-param-util.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9370EC280E200A70F4C /* gtest-param-util.h */; };
+		4567C8181264FF71007740BE /* gtest-printers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4567C8171264FF71007740BE /* gtest-printers.h */; settings = {ATTRIBUTES = (Public, ); }; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		40899F9C0FFA740F000B29AE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 40899F420FFA7184000B29AE;
+			remoteInfo = gtest_unittest;
+		};
+		4089A0970FFAD34A000B29AE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 4089A0120FFACEFC000B29AE;
+			remoteInfo = sample1_unittest;
+		};
+		408BEC0F1046CFE900DEF522 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 40C848F9101A209C0083642A;
+			remoteInfo = "gtest-static";
+		};
+		40C44AE50E379922008FCC51 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 40C44ADC0E3798F4008FCC51;
+			remoteInfo = Version.h;
+		};
+		40C8497C101A36850083642A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 40C848F9101A209C0083642A;
+			remoteInfo = "gtest-static";
+		};
+		40C8497E101A36850083642A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 40C8490A101A217E0083642A;
+			remoteInfo = "gtest_main-static";
+		};
+		40C8498B101A36A60083642A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 40C848F9101A209C0083642A;
+			remoteInfo = "gtest-static";
+		};
+		40C8498D101A36A60083642A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 40C8490A101A217E0083642A;
+			remoteInfo = "gtest_main-static";
+		};
+		40C8499B101A36DC0083642A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 40C8490A101A217E0083642A;
+			remoteInfo = "gtest_main-static";
+		};
+		40C8499D101A36E50083642A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0;
+			remoteInfo = "gtest-framework";
+		};
+		40C8499F101A36F10083642A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0;
+			remoteInfo = "gtest-framework";
+		};
+		40C849F6101A43440083642A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 40C8497A101A36850083642A;
+			remoteInfo = "gtest_unittest-static";
+		};
+		40C849F8101A43490083642A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 40C84989101A36A60083642A;
+			remoteInfo = "sample1_unittest-static";
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		404884A50E2F7C0400CF7658 /* Copy Headers Internal */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = Headers/internal;
+			dstSubfolderSpec = 6;
+			files = (
+				404884A00E2F7BE600CF7658 /* gtest-death-test-internal.h in Copy Headers Internal */,
+				404884A10E2F7BE600CF7658 /* gtest-filepath.h in Copy Headers Internal */,
+				404884A20E2F7BE600CF7658 /* gtest-internal.h in Copy Headers Internal */,
+				4539C9380EC280E200A70F4C /* gtest-linked_ptr.h in Copy Headers Internal */,
+				4539C9390EC280E200A70F4C /* gtest-param-util-generated.h in Copy Headers Internal */,
+				4539C93A0EC280E200A70F4C /* gtest-param-util.h in Copy Headers Internal */,
+				404884A30E2F7BE600CF7658 /* gtest-port.h in Copy Headers Internal */,
+				404884A40E2F7BE600CF7658 /* gtest-string.h in Copy Headers Internal */,
+				40899F500FFA7281000B29AE /* gtest-tuple.h in Copy Headers Internal */,
+				3BF6F2A00E79B5AD000F2EEE /* gtest-type-util.h in Copy Headers Internal */,
+			);
+			name = "Copy Headers Internal";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		224A12A10E9EADA700BD17FD /* gtest-all.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "gtest-all.cc"; sourceTree = "<group>"; };
+		224A12A20E9EADCC00BD17FD /* gtest-test-part.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "gtest-test-part.h"; sourceTree = "<group>"; };
+		3B238C120E7FE13C00846E11 /* gtest_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_unittest.cc; sourceTree = "<group>"; };
+		3B87D2100E96B92E000D1852 /* runtests.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = runtests.sh; sourceTree = "<group>"; };
+		3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-type-util.h"; sourceTree = "<group>"; };
+		3BF6F2A40E79B616000F2EEE /* gtest-typed-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-typed-test.h"; sourceTree = "<group>"; };
+		403EE37C0E377822004BD1E2 /* versiongenerate.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = versiongenerate.py; sourceTree = "<group>"; };
+		404883DB0E2F799B00CF7658 /* gtest-death-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-death-test.h"; sourceTree = "<group>"; };
+		404883DC0E2F799B00CF7658 /* gtest-message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-message.h"; sourceTree = "<group>"; };
+		404883DD0E2F799B00CF7658 /* gtest-spi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-spi.h"; sourceTree = "<group>"; };
+		404883DE0E2F799B00CF7658 /* gtest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gtest.h; sourceTree = "<group>"; };
+		404883DF0E2F799B00CF7658 /* gtest_pred_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gtest_pred_impl.h; sourceTree = "<group>"; };
+		404883E00E2F799B00CF7658 /* gtest_prod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gtest_prod.h; sourceTree = "<group>"; };
+		404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-death-test-internal.h"; sourceTree = "<group>"; };
+		404883E30E2F799B00CF7658 /* gtest-filepath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-filepath.h"; sourceTree = "<group>"; };
+		404883E40E2F799B00CF7658 /* gtest-internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-internal.h"; sourceTree = "<group>"; };
+		404883E50E2F799B00CF7658 /* gtest-port.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-port.h"; sourceTree = "<group>"; };
+		404883E60E2F799B00CF7658 /* gtest-string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-string.h"; sourceTree = "<group>"; };
+		404883F60E2F799B00CF7658 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = SOURCE_ROOT; };
+		4048840D0E2F799B00CF7658 /* gtest_main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_main.cc; sourceTree = "<group>"; };
+		404884A90E2F7CD900CF7658 /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CHANGES; path = ../CHANGES; sourceTree = SOURCE_ROOT; };
+		404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CONTRIBUTORS; path = ../CONTRIBUTORS; sourceTree = SOURCE_ROOT; };
+		404884AB0E2F7CD900CF7658 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = SOURCE_ROOT; };
+		40899F430FFA7184000B29AE /* gtest_unittest-framework */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "gtest_unittest-framework"; sourceTree = BUILT_PRODUCTS_DIR; };
+		40899F4D0FFA7271000B29AE /* gtest-tuple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-tuple.h"; sourceTree = "<group>"; };
+		40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = StaticLibraryTarget.xcconfig; sourceTree = "<group>"; };
+		4089A0130FFACEFC000B29AE /* sample1_unittest-framework */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "sample1_unittest-framework"; sourceTree = BUILT_PRODUCTS_DIR; };
+		4089A02C0FFACF7F000B29AE /* sample1.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sample1.cc; sourceTree = "<group>"; };
+		4089A02D0FFACF7F000B29AE /* sample1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sample1.h; sourceTree = "<group>"; };
+		4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sample1_unittest.cc; sourceTree = "<group>"; };
+		40C848FA101A209C0083642A /* libgtest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgtest.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		40C8490B101A217E0083642A /* libgtest_main.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgtest_main.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		40C84987101A36850083642A /* gtest_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gtest_unittest; sourceTree = BUILT_PRODUCTS_DIR; };
+		40C84997101A36A60083642A /* sample1_unittest-static */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "sample1_unittest-static"; sourceTree = BUILT_PRODUCTS_DIR; };
+		40D4CDF10E30E07400294801 /* DebugProject.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugProject.xcconfig; sourceTree = "<group>"; };
+		40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FrameworkTarget.xcconfig; sourceTree = "<group>"; };
+		40D4CDF30E30E07400294801 /* General.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = General.xcconfig; sourceTree = "<group>"; };
+		40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ReleaseProject.xcconfig; sourceTree = "<group>"; };
+		40D4CF510E30F5E200294801 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		4539C8FF0EC27F6400A70F4C /* gtest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = gtest.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		4539C9330EC280AE00A70F4C /* gtest-param-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-test.h"; sourceTree = "<group>"; };
+		4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-linked_ptr.h"; sourceTree = "<group>"; };
+		4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-util-generated.h"; sourceTree = "<group>"; };
+		4539C9370EC280E200A70F4C /* gtest-param-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-param-util.h"; sourceTree = "<group>"; };
+		4567C8171264FF71007740BE /* gtest-printers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-printers.h"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		40899F410FFA7184000B29AE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40C849A4101A37150083642A /* gtest.framework in Frameworks */,
+				40C84916101A235B0083642A /* libgtest_main.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		4089A0110FFACEFC000B29AE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40C849A2101A37050083642A /* gtest.framework in Frameworks */,
+				40C84921101A23AD0083642A /* libgtest_main.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		40C84981101A36850083642A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40C84982101A36850083642A /* libgtest.a in Frameworks */,
+				40C84983101A36850083642A /* libgtest_main.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		40C84991101A36A60083642A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40C84992101A36A60083642A /* libgtest.a in Frameworks */,
+				40C84993101A36A60083642A /* libgtest_main.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		034768DDFF38A45A11DB9C8B /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				4539C8FF0EC27F6400A70F4C /* gtest.framework */,
+				40C848FA101A209C0083642A /* libgtest.a */,
+				40C8490B101A217E0083642A /* libgtest_main.a */,
+				40899F430FFA7184000B29AE /* gtest_unittest-framework */,
+				40C84987101A36850083642A /* gtest_unittest */,
+				4089A0130FFACEFC000B29AE /* sample1_unittest-framework */,
+				40C84997101A36A60083642A /* sample1_unittest-static */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		0867D691FE84028FC02AAC07 /* gtest */ = {
+			isa = PBXGroup;
+			children = (
+				40D4CDF00E30E07400294801 /* Config */,
+				08FB77ACFE841707C02AAC07 /* Source */,
+				40D4CF4E0E30F5E200294801 /* Resources */,
+				403EE37B0E377822004BD1E2 /* Scripts */,
+				034768DDFF38A45A11DB9C8B /* Products */,
+			);
+			name = gtest;
+			sourceTree = "<group>";
+		};
+		08FB77ACFE841707C02AAC07 /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				404884A90E2F7CD900CF7658 /* CHANGES */,
+				404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */,
+				404884AB0E2F7CD900CF7658 /* LICENSE */,
+				404883F60E2F799B00CF7658 /* README.md */,
+				404883D90E2F799B00CF7658 /* include */,
+				4089A02F0FFACF84000B29AE /* samples */,
+				404884070E2F799B00CF7658 /* src */,
+				3B238BF00E7FE13B00846E11 /* test */,
+			);
+			name = Source;
+			sourceTree = "<group>";
+		};
+		3B238BF00E7FE13B00846E11 /* test */ = {
+			isa = PBXGroup;
+			children = (
+				3B238C120E7FE13C00846E11 /* gtest_unittest.cc */,
+			);
+			name = test;
+			path = ../test;
+			sourceTree = SOURCE_ROOT;
+		};
+		403EE37B0E377822004BD1E2 /* Scripts */ = {
+			isa = PBXGroup;
+			children = (
+				403EE37C0E377822004BD1E2 /* versiongenerate.py */,
+				3B87D2100E96B92E000D1852 /* runtests.sh */,
+			);
+			path = Scripts;
+			sourceTree = "<group>";
+		};
+		404883D90E2F799B00CF7658 /* include */ = {
+			isa = PBXGroup;
+			children = (
+				404883DA0E2F799B00CF7658 /* gtest */,
+			);
+			name = include;
+			path = ../include;
+			sourceTree = SOURCE_ROOT;
+		};
+		404883DA0E2F799B00CF7658 /* gtest */ = {
+			isa = PBXGroup;
+			children = (
+				404883E10E2F799B00CF7658 /* internal */,
+				224A12A20E9EADCC00BD17FD /* gtest-test-part.h */,
+				404883DB0E2F799B00CF7658 /* gtest-death-test.h */,
+				404883DC0E2F799B00CF7658 /* gtest-message.h */,
+				4539C9330EC280AE00A70F4C /* gtest-param-test.h */,
+				4567C8171264FF71007740BE /* gtest-printers.h */,
+				404883DD0E2F799B00CF7658 /* gtest-spi.h */,
+				404883DE0E2F799B00CF7658 /* gtest.h */,
+				404883DF0E2F799B00CF7658 /* gtest_pred_impl.h */,
+				404883E00E2F799B00CF7658 /* gtest_prod.h */,
+				3BF6F2A40E79B616000F2EEE /* gtest-typed-test.h */,
+			);
+			path = gtest;
+			sourceTree = "<group>";
+		};
+		404883E10E2F799B00CF7658 /* internal */ = {
+			isa = PBXGroup;
+			children = (
+				404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */,
+				404883E30E2F799B00CF7658 /* gtest-filepath.h */,
+				404883E40E2F799B00CF7658 /* gtest-internal.h */,
+				4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */,
+				4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */,
+				4539C9370EC280E200A70F4C /* gtest-param-util.h */,
+				404883E50E2F799B00CF7658 /* gtest-port.h */,
+				404883E60E2F799B00CF7658 /* gtest-string.h */,
+				40899F4D0FFA7271000B29AE /* gtest-tuple.h */,
+				3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */,
+			);
+			path = internal;
+			sourceTree = "<group>";
+		};
+		404884070E2F799B00CF7658 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				224A12A10E9EADA700BD17FD /* gtest-all.cc */,
+				4048840D0E2F799B00CF7658 /* gtest_main.cc */,
+			);
+			name = src;
+			path = ../src;
+			sourceTree = SOURCE_ROOT;
+		};
+		4089A02F0FFACF84000B29AE /* samples */ = {
+			isa = PBXGroup;
+			children = (
+				4089A02C0FFACF7F000B29AE /* sample1.cc */,
+				4089A02D0FFACF7F000B29AE /* sample1.h */,
+				4089A02E0FFACF7F000B29AE /* sample1_unittest.cc */,
+			);
+			name = samples;
+			path = ../samples;
+			sourceTree = SOURCE_ROOT;
+		};
+		40D4CDF00E30E07400294801 /* Config */ = {
+			isa = PBXGroup;
+			children = (
+				40D4CDF10E30E07400294801 /* DebugProject.xcconfig */,
+				40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */,
+				40D4CDF30E30E07400294801 /* General.xcconfig */,
+				40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */,
+				40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */,
+			);
+			path = Config;
+			sourceTree = "<group>";
+		};
+		40D4CF4E0E30F5E200294801 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				40D4CF510E30F5E200294801 /* Info.plist */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		8D07F2BD0486CC7A007CD1D0 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				404884380E2F799B00CF7658 /* gtest-death-test.h in Headers */,
+				404884390E2F799B00CF7658 /* gtest-message.h in Headers */,
+				4539C9340EC280AE00A70F4C /* gtest-param-test.h in Headers */,
+				4567C8181264FF71007740BE /* gtest-printers.h in Headers */,
+				3BF6F2A50E79B616000F2EEE /* gtest-typed-test.h in Headers */,
+				4048843A0E2F799B00CF7658 /* gtest-spi.h in Headers */,
+				4048843B0E2F799B00CF7658 /* gtest.h in Headers */,
+				4048843C0E2F799B00CF7658 /* gtest_pred_impl.h in Headers */,
+				4048843D0E2F799B00CF7658 /* gtest_prod.h in Headers */,
+				224A12A30E9EADCC00BD17FD /* gtest-test-part.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		40899F420FFA7184000B29AE /* gtest_unittest-framework */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 40899F4A0FFA71BC000B29AE /* Build configuration list for PBXNativeTarget "gtest_unittest-framework" */;
+			buildPhases = (
+				40899F400FFA7184000B29AE /* Sources */,
+				40899F410FFA7184000B29AE /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				40C849A0101A36F10083642A /* PBXTargetDependency */,
+			);
+			name = "gtest_unittest-framework";
+			productName = gtest_unittest;
+			productReference = 40899F430FFA7184000B29AE /* gtest_unittest-framework */;
+			productType = "com.apple.product-type.tool";
+		};
+		4089A0120FFACEFC000B29AE /* sample1_unittest-framework */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4089A0240FFACF01000B29AE /* Build configuration list for PBXNativeTarget "sample1_unittest-framework" */;
+			buildPhases = (
+				4089A0100FFACEFC000B29AE /* Sources */,
+				4089A0110FFACEFC000B29AE /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				40C8499E101A36E50083642A /* PBXTargetDependency */,
+			);
+			name = "sample1_unittest-framework";
+			productName = sample1_unittest;
+			productReference = 4089A0130FFACEFC000B29AE /* sample1_unittest-framework */;
+			productType = "com.apple.product-type.tool";
+		};
+		40C848F9101A209C0083642A /* gtest-static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 40C84902101A212E0083642A /* Build configuration list for PBXNativeTarget "gtest-static" */;
+			buildPhases = (
+				40C848F7101A209C0083642A /* Sources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "gtest-static";
+			productName = "gtest-static";
+			productReference = 40C848FA101A209C0083642A /* libgtest.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		40C8490A101A217E0083642A /* gtest_main-static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 40C84912101A21D20083642A /* Build configuration list for PBXNativeTarget "gtest_main-static" */;
+			buildPhases = (
+				40C84908101A217E0083642A /* Sources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "gtest_main-static";
+			productName = "gtest_main-static";
+			productReference = 40C8490B101A217E0083642A /* libgtest_main.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		40C8497A101A36850083642A /* gtest_unittest-static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 40C84984101A36850083642A /* Build configuration list for PBXNativeTarget "gtest_unittest-static" */;
+			buildPhases = (
+				40C8497F101A36850083642A /* Sources */,
+				40C84981101A36850083642A /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				40C8497B101A36850083642A /* PBXTargetDependency */,
+				40C8497D101A36850083642A /* PBXTargetDependency */,
+			);
+			name = "gtest_unittest-static";
+			productName = gtest_unittest;
+			productReference = 40C84987101A36850083642A /* gtest_unittest */;
+			productType = "com.apple.product-type.tool";
+		};
+		40C84989101A36A60083642A /* sample1_unittest-static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 40C84994101A36A60083642A /* Build configuration list for PBXNativeTarget "sample1_unittest-static" */;
+			buildPhases = (
+				40C8498E101A36A60083642A /* Sources */,
+				40C84991101A36A60083642A /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				40C8498A101A36A60083642A /* PBXTargetDependency */,
+				40C8498C101A36A60083642A /* PBXTargetDependency */,
+			);
+			name = "sample1_unittest-static";
+			productName = sample1_unittest;
+			productReference = 40C84997101A36A60083642A /* sample1_unittest-static */;
+			productType = "com.apple.product-type.tool";
+		};
+		8D07F2BC0486CC7A007CD1D0 /* gtest-framework */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "gtest-framework" */;
+			buildPhases = (
+				8D07F2C10486CC7A007CD1D0 /* Sources */,
+				8D07F2BD0486CC7A007CD1D0 /* Headers */,
+				404884A50E2F7C0400CF7658 /* Copy Headers Internal */,
+				8D07F2BF0486CC7A007CD1D0 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				40C44AE60E379922008FCC51 /* PBXTargetDependency */,
+				408BEC101046CFE900DEF522 /* PBXTargetDependency */,
+				40C8499C101A36DC0083642A /* PBXTargetDependency */,
+			);
+			name = "gtest-framework";
+			productInstallPath = "$(HOME)/Library/Frameworks";
+			productName = gtest;
+			productReference = 4539C8FF0EC27F6400A70F4C /* gtest.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		0867D690FE84028FC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0460;
+			};
+			buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "gtest" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+				en,
+			);
+			mainGroup = 0867D691FE84028FC02AAC07 /* gtest */;
+			productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				8D07F2BC0486CC7A007CD1D0 /* gtest-framework */,
+				40C848F9101A209C0083642A /* gtest-static */,
+				40C8490A101A217E0083642A /* gtest_main-static */,
+				40899F420FFA7184000B29AE /* gtest_unittest-framework */,
+				40C8497A101A36850083642A /* gtest_unittest-static */,
+				4089A0120FFACEFC000B29AE /* sample1_unittest-framework */,
+				40C84989101A36A60083642A /* sample1_unittest-static */,
+				3B238F5F0E828B5400846E11 /* Check */,
+				40C44ADC0E3798F4008FCC51 /* Version Info */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D07F2BF0486CC7A007CD1D0 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				404884500E2F799B00CF7658 /* README.md in Resources */,
+				404884AC0E2F7CD900CF7658 /* CHANGES in Resources */,
+				404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */,
+				404884AE0E2F7CD900CF7658 /* LICENSE in Resources */,
+				40C84978101A36540083642A /* libgtest_main.a in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		3B238F5E0E828B5400846E11 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Remember, this \"Run Script\" build phase will be executed from $SRCROOT\n/bin/bash Scripts/runtests.sh";
+		};
+		40C44ADB0E3798F4008FCC51 /* Generate Version.h */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"$(SRCROOT)/Scripts/versiongenerate.py",
+				"$(SRCROOT)/../configure.ac",
+			);
+			name = "Generate Version.h";
+			outputPaths = (
+				"$(PROJECT_TEMP_DIR)/Version.h",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Remember, this \"Run Script\" build phase will be executed from $SRCROOT\n/usr/bin/python Scripts/versiongenerate.py ../ $PROJECT_TEMP_DIR";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		40899F400FFA7184000B29AE /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40899F530FFA72A0000B29AE /* gtest_unittest.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		4089A0100FFACEFC000B29AE /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4089A0440FFAD1BE000B29AE /* sample1.cc in Sources */,
+				4089A0460FFAD1BE000B29AE /* sample1_unittest.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		40C848F7101A209C0083642A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40C848FF101A21150083642A /* gtest-all.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		40C84908101A217E0083642A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40C84915101A21DF0083642A /* gtest_main.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		40C8497F101A36850083642A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40C84980101A36850083642A /* gtest_unittest.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		40C8498E101A36A60083642A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40C8498F101A36A60083642A /* sample1.cc in Sources */,
+				40C84990101A36A60083642A /* sample1_unittest.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8D07F2C10486CC7A007CD1D0 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				40899F3A0FFA70D4000B29AE /* gtest-all.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		40899F9D0FFA740F000B29AE /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 40899F420FFA7184000B29AE /* gtest_unittest-framework */;
+			targetProxy = 40899F9C0FFA740F000B29AE /* PBXContainerItemProxy */;
+		};
+		4089A0980FFAD34A000B29AE /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 4089A0120FFACEFC000B29AE /* sample1_unittest-framework */;
+			targetProxy = 4089A0970FFAD34A000B29AE /* PBXContainerItemProxy */;
+		};
+		408BEC101046CFE900DEF522 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 40C848F9101A209C0083642A /* gtest-static */;
+			targetProxy = 408BEC0F1046CFE900DEF522 /* PBXContainerItemProxy */;
+		};
+		40C44AE60E379922008FCC51 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 40C44ADC0E3798F4008FCC51 /* Version Info */;
+			targetProxy = 40C44AE50E379922008FCC51 /* PBXContainerItemProxy */;
+		};
+		40C8497B101A36850083642A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 40C848F9101A209C0083642A /* gtest-static */;
+			targetProxy = 40C8497C101A36850083642A /* PBXContainerItemProxy */;
+		};
+		40C8497D101A36850083642A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 40C8490A101A217E0083642A /* gtest_main-static */;
+			targetProxy = 40C8497E101A36850083642A /* PBXContainerItemProxy */;
+		};
+		40C8498A101A36A60083642A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 40C848F9101A209C0083642A /* gtest-static */;
+			targetProxy = 40C8498B101A36A60083642A /* PBXContainerItemProxy */;
+		};
+		40C8498C101A36A60083642A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 40C8490A101A217E0083642A /* gtest_main-static */;
+			targetProxy = 40C8498D101A36A60083642A /* PBXContainerItemProxy */;
+		};
+		40C8499C101A36DC0083642A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 40C8490A101A217E0083642A /* gtest_main-static */;
+			targetProxy = 40C8499B101A36DC0083642A /* PBXContainerItemProxy */;
+		};
+		40C8499E101A36E50083642A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8D07F2BC0486CC7A007CD1D0 /* gtest-framework */;
+			targetProxy = 40C8499D101A36E50083642A /* PBXContainerItemProxy */;
+		};
+		40C849A0101A36F10083642A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8D07F2BC0486CC7A007CD1D0 /* gtest-framework */;
+			targetProxy = 40C8499F101A36F10083642A /* PBXContainerItemProxy */;
+		};
+		40C849F7101A43440083642A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 40C8497A101A36850083642A /* gtest_unittest-static */;
+			targetProxy = 40C849F6101A43440083642A /* PBXContainerItemProxy */;
+		};
+		40C849F9101A43490083642A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 40C84989101A36A60083642A /* sample1_unittest-static */;
+			targetProxy = 40C849F8101A43490083642A /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		3B238F600E828B5400846E11 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				PRODUCT_NAME = Check;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		3B238F610E828B5400846E11 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				PRODUCT_NAME = Check;
+				SDKROOT = macosx;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		40899F450FFA7185000B29AE /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				HEADER_SEARCH_PATHS = ../;
+				PRODUCT_NAME = "gtest_unittest-framework";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		40899F460FFA7185000B29AE /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				HEADER_SEARCH_PATHS = ../;
+				PRODUCT_NAME = "gtest_unittest-framework";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		4089A0150FFACEFD000B29AE /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				PRODUCT_NAME = "sample1_unittest-framework";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		4089A0160FFACEFD000B29AE /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				PRODUCT_NAME = "sample1_unittest-framework";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		40C44ADF0E3798F4008FCC51 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_NAME = gtest;
+				SDKROOT = macosx;
+				TARGET_NAME = gtest;
+			};
+			name = Debug;
+		};
+		40C44AE00E3798F4008FCC51 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_NAME = gtest;
+				SDKROOT = macosx;
+				TARGET_NAME = gtest;
+			};
+			name = Release;
+		};
+		40C848FB101A209D0083642A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				HEADER_SEARCH_PATHS = (
+					../,
+					../include/,
+				);
+				PRODUCT_NAME = gtest;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		40C848FC101A209D0083642A /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				HEADER_SEARCH_PATHS = (
+					../,
+					../include/,
+				);
+				PRODUCT_NAME = gtest;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		40C8490E101A217F0083642A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				HEADER_SEARCH_PATHS = (
+					../,
+					../include/,
+				);
+				PRODUCT_NAME = gtest_main;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		40C8490F101A217F0083642A /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				HEADER_SEARCH_PATHS = (
+					../,
+					../include/,
+				);
+				PRODUCT_NAME = gtest_main;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		40C84985101A36850083642A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				HEADER_SEARCH_PATHS = ../;
+				PRODUCT_NAME = gtest_unittest;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		40C84986101A36850083642A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				HEADER_SEARCH_PATHS = ../;
+				PRODUCT_NAME = gtest_unittest;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		40C84995101A36A60083642A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				PRODUCT_NAME = "sample1_unittest-static";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		40C84996101A36A60083642A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				PRODUCT_NAME = "sample1_unittest-static";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		4FADC24308B4156D00ABE55E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				HEADER_SEARCH_PATHS = (
+					../,
+					../include/,
+				);
+				INFOPLIST_FILE = Resources/Info.plist;
+				INFOPLIST_PREFIX_HEADER = "$(PROJECT_TEMP_DIR)/Version.h";
+				INFOPLIST_PREPROCESS = YES;
+				PRODUCT_NAME = gtest;
+				SDKROOT = macosx;
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		4FADC24408B4156D00ABE55E /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				HEADER_SEARCH_PATHS = (
+					../,
+					../include/,
+				);
+				INFOPLIST_FILE = Resources/Info.plist;
+				INFOPLIST_PREFIX_HEADER = "$(PROJECT_TEMP_DIR)/Version.h";
+				INFOPLIST_PREPROCESS = YES;
+				PRODUCT_NAME = gtest;
+				SDKROOT = macosx;
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Release;
+		};
+		4FADC24708B4156D00ABE55E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40D4CDF10E30E07400294801 /* DebugProject.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		4FADC24808B4156D00ABE55E /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		3B238FA30E828BB600846E11 /* Build configuration list for PBXAggregateTarget "Check" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				3B238F600E828B5400846E11 /* Debug */,
+				3B238F610E828B5400846E11 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		40899F4A0FFA71BC000B29AE /* Build configuration list for PBXNativeTarget "gtest_unittest-framework" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				40899F450FFA7185000B29AE /* Debug */,
+				40899F460FFA7185000B29AE /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		4089A0240FFACF01000B29AE /* Build configuration list for PBXNativeTarget "sample1_unittest-framework" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4089A0150FFACEFD000B29AE /* Debug */,
+				4089A0160FFACEFD000B29AE /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		40C44AE40E379905008FCC51 /* Build configuration list for PBXAggregateTarget "Version Info" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				40C44ADF0E3798F4008FCC51 /* Debug */,
+				40C44AE00E3798F4008FCC51 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		40C84902101A212E0083642A /* Build configuration list for PBXNativeTarget "gtest-static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				40C848FB101A209D0083642A /* Debug */,
+				40C848FC101A209D0083642A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		40C84912101A21D20083642A /* Build configuration list for PBXNativeTarget "gtest_main-static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				40C8490E101A217F0083642A /* Debug */,
+				40C8490F101A217F0083642A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		40C84984101A36850083642A /* Build configuration list for PBXNativeTarget "gtest_unittest-static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				40C84985101A36850083642A /* Debug */,
+				40C84986101A36850083642A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		40C84994101A36A60083642A /* Build configuration list for PBXNativeTarget "sample1_unittest-static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				40C84995101A36A60083642A /* Debug */,
+				40C84996101A36A60083642A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "gtest-framework" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4FADC24308B4156D00ABE55E /* Debug */,
+				4FADC24408B4156D00ABE55E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "gtest" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4FADC24708B4156D00ABE55E /* Debug */,
+				4FADC24808B4156D00ABE55E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/travis.sh b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/travis.sh
new file mode 100755
index 0000000000..bdecbd964d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest-release-1.8.0/travis.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+set -evx
+env | sort
+
+mkdir build || true
+mkdir build/$GTEST_TARGET || true
+cd build/$GTEST_TARGET
+cmake -Dgtest_build_samples=ON \
+      -Dgmock_build_samples=ON \
+      -Dgtest_build_tests=ON \
+      -Dgmock_build_tests=ON \
+      -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
+      ../../$GTEST_TARGET
+make
+CTEST_OUTPUT_ON_FAILURE=1 make test
diff --git a/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest.cmake b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest.cmake
new file mode 100644
index 0000000000..ff3b54318e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/ThirdParty/googletest.cmake
@@ -0,0 +1,9 @@
+if ((DEFINED GTEST_ROOT) AND (EXISTS ${GTEST_ROOT}/googletest))
+    add_subdirectory(${GTEST_ROOT} EXCLUDE_FROM_ALL ${CMAKE_BINARY_DIR}/googletest)
+else()
+    set(GTEST_ROOT ThirdParty/googletest-release-1.8.0)
+    add_subdirectory(${GTEST_ROOT} EXCLUDE_FROM_ALL)
+endif()
+
+include_directories(${GTEST_ROOT}/googlemock/include
+    ${GTEST_ROOT}/googletest/include)
diff --git a/SampleApplications/IPCServerSampleApplication/config/IPCServerSampleAppConfig.json b/SampleApplications/IPCServerSampleApplication/config/IPCServerSampleAppConfig.json
new file mode 100644
index 0000000000..0788d719c3
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/config/IPCServerSampleAppConfig.json
@@ -0,0 +1,264 @@
+{
+  "version": "3.0",
+  "sampleApp": {
+    "websocket": {
+      // The interface which the websocket server will bind to.
+      // Note: For security reasons, it is strongly recommended that the loopback interface is used.
+      // When using interfaces, other than loopback, additional security measures should be taken to ensure
+      // the security and integrity of data between the client and server.
+      //"websocketInterface":"127.0.0.1"
+      // The port which the websocket server will listen to.
+      // Note: The port should be a positive integer in the range [1-65535], It is strongly recommended that
+      // a port number > 1023 is used
+      //"websocketPort":8933
+      // The Certificate Authority file to verify client certificate
+      // "websocketCertificateAuthority":"ca.cert"
+      // The certificate file the websocket server should use when SSL is enabled
+      // "websocketCertificate":"server.chain"
+      // The private key file the websocket server should use when SSL is enabled
+      // "websocketPrivateKey":"server.key"
+    },
+    "aplContentCache": {
+      // The cache reuse period when downloading content packages
+      // "contentCacheReusePeriodInSeconds": "600",
+      // The maximum cache size when caching content packages
+      // "contentCacheMaxSize": "50"
+      // The maximum number of concurrent package downloads to allow
+      // "maxNumberOfConcurrentDownloads": "5
+    }
+  },
+  "alexaPresentationCapabilityAgent": {
+    // The minimum state reporting interval in milliseconds for the AlexaPresentation CA
+    // "minStateReportIntervalMs": 600
+    // The interval between checks for context changes
+    // "stateReportCheckIntervalMs": 2000
+    // The video settings to be reported in Alexa.Presentation.APL.Video configuration.
+    "video": {
+      // Note: Use empty array to not report video codecs. If key is missing, below video codecs are used by default.
+      "codecs": [
+        "H_264_41",
+        "H_264_42"
+      ]
+    }
+  },
+  "visualCharacteristics": [
+    {
+      "type": "AlexaInterface",
+      "interface": "Alexa.InteractionMode",
+      "version": "1.1",
+      "configurations": {
+        "interactionModes": [
+          {
+            "id": "tv",
+            "uiMode": "TV",
+            "interactionDistance": {
+              "unit": "INCHES",
+              "value": 130
+            },
+            "touch": "UNSUPPORTED",
+            "keyboard": "SUPPORTED",
+            "video": "SUPPORTED",
+            "dialog": "SUPPORTED"
+          },
+          {
+            "id": "tv_overlay",
+            "uiMode": "TV",
+            "interactionDistance": {
+              "unit": "INCHES",
+              "value": 130
+            },
+            "touch": "UNSUPPORTED",
+            "keyboard": "SUPPORTED",
+            "video": "UNSUPPORTED",
+            "dialog": "SUPPORTED"
+          }
+        ]
+      }
+    },
+    {
+      "type": "AlexaInterface",
+      "interface": "Alexa.Display.Window",
+      "version": "1.0",
+      "configurations": {
+        "templates": [
+          {
+            "id": "tvFullscreen",
+            "type": "STANDARD",
+            "configuration": {
+              "sizes": [
+                {
+                  "type": "DISCRETE",
+                  "id": "fullscreen",
+                  "value": {
+                    "unit": "PIXEL",
+                    "value": {
+                      "width": 1920,
+                      "height": 1080
+                    }
+                  }
+                }
+              ],
+              "interactionModes": [
+                "tv"
+              ]
+            }
+          },
+          {
+            "id": "tvOverlayLandscape",
+            "type": "OVERLAY",
+            "configuration": {
+              "sizes": [
+                {
+                  "type": "DISCRETE",
+                  "id": "landscapePanel",
+                  "value": {
+                    "unit": "PIXEL",
+                    "value": {
+                      "width": 1920,
+                      "height": 400
+                    }
+                  }
+                }
+              ],
+              "interactionModes": [
+                "tv_overlay"
+              ]
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "AlexaInterface",
+      "interface": "Alexa.Display",
+      "version": "1.0",
+      "configurations": {
+        "display": {
+          "type": "PIXEL",
+          "touch": [
+            "UNSUPPORTED"
+          ],
+          "shape": "RECTANGLE",
+          "dimensions": {
+            "resolution": {
+              "unit": "PIXEL",
+              "value": {
+                "width": 1920,
+                "height": 1080
+              }
+            },
+            "physicalSize": {
+              "unit": "INCHES",
+              "value": {
+                "width": 56.7,
+                "height": 31.9
+              }
+            },
+            "pixelDensity": {
+              "unit": "DPI",
+              "value": 320
+            },
+            "densityIndependentResolution": {
+              "unit": "DP",
+              "value": {
+                "width": 960,
+                "height": 540
+              }
+            }
+          }
+        }
+      }
+    }
+  ],
+  "presentationOptions": {
+    // Timeouts corresponding to presentation lifespan. Use -1 to disable timeout
+    "shortPresentationTimeoutMs" : 30000,
+    "transientPresentationTimeoutMs" : 10000,
+    "longPresentationTimeoutMs" : -1
+  },
+  "sampleClientConfig": {
+    "version": "1.0.0",
+    "description": "TV PTT Device - Fullscreen + Lower Third Panel",
+    "mode": "TV",
+    "emulateDisplayDimensions": true,
+    "scaleToFill": true,
+    "audioInputInitiator": "PRESS_AND_HOLD",
+    "displayMode": "FIXED",
+    "deviceKeys": {
+      "talkKey": {
+        "code": "KeyA",
+        "keyCode": 65,
+        "key": "a"
+      },
+      "backKey": {
+        "code": "KeyB",
+        "keyCode": 66,
+        "key": "b"
+      },
+      "exitKey": {
+        "code": "Escape",
+        "keyCode": 27,
+        "key": "Escape"
+      },
+      "toggleCaptionsKey": {
+        "code": "KeyC",
+        "keyCode": 67,
+        "key": "c"
+      },
+      "toggleDoNotDisturbKey": {
+        "code": "KeyD",
+        "keyCode": 68,
+        "key": "d"
+      }
+    },
+    "windows": [
+      {
+        "id": "tvFullscreen",
+        "displayWindowConfig": {
+          "templateId": "tvFullscreen",
+          "configurations": {
+            "landscape" : {
+              "sizeConfigurationId": "fullscreen",
+              "interactionMode": "tv"
+            }
+          }
+        },
+        "aplRendererParameters": {
+          "supportedExtensions": [
+            "aplext:backstack:10"
+          ]
+        },
+        "supportedInterfaces": [
+          "Alexa.Presentation.APL",
+          "TemplateRuntime"
+        ],
+        "zOrderIndex": 0
+      },
+      {
+        "id": "tvOverlayLandscape",
+        "displayWindowConfig": {
+          "templateId": "tvOverlayLandscape",
+          "configurations": {
+            "landscape" : {
+              "sizeConfigurationId": "landscapePanel",
+              "interactionMode": "tv_overlay"
+            }
+          }
+        },
+        "supportedInterfaces": [
+          "Alexa.Presentation.APL",
+          "TemplateRuntime"
+        ],
+        "windowPosition": "bottom",
+        "zOrderIndex": 1
+      }
+    ],
+    "defaultWindowId": "tvFullscreen",
+    "liveViewCameraOptions": {
+      "physicalMicButtonHint": {
+        "micButtonHintType": "Text",
+        "micButtonHintSource": "A"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/config/certificates/ca_settings.cnf b/SampleApplications/IPCServerSampleApplication/config/certificates/ca_settings.cnf
new file mode 100644
index 0000000000..2f2f2834a0
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/config/certificates/ca_settings.cnf
@@ -0,0 +1,39 @@
+[ ca ]
+default_ca = CA_default
+
+[ CA_default ]
+dir = .
+default_days = 365
+default_crl_days = 30
+default_md = sha256
+preserve = no
+policy = policy_match
+database = $dir/index.txt
+serial = $dir/certs.seq
+
+[ policy_match ]
+countryName = match
+stateOrProvinceName = match
+organizationName = match
+location = match
+commonName = supplied
+
+[ req ]
+distinguished_name = req_distinguished_name
+prompt = no
+x509_extensions = v3_ca
+default_bits = 2048
+default_md = sha256
+
+[ req_distinguished_name ]
+C = US
+ST = WA
+L = Seattle
+O = Amazon
+CN = MMSDK CA
+
+[ v3_ca ]
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer:always
+basicConstraints = CA:TRUE
+keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment, keyAgreement, keyCertSign
diff --git a/SampleApplications/IPCServerSampleApplication/config/certificates/cert_settings.cnf b/SampleApplications/IPCServerSampleApplication/config/certificates/cert_settings.cnf
new file mode 100644
index 0000000000..f644da9204
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/config/certificates/cert_settings.cnf
@@ -0,0 +1,7 @@
+[ v3_req ]
+basicConstraints = CA:FALSE
+keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment, keyAgreement
+extendedKeyUsage = serverAuth,clientAuth
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer
+subjectAltName = DNS:localhost
diff --git a/SampleApplications/IPCServerSampleApplication/config/certificates/generate.sh b/SampleApplications/IPCServerSampleApplication/config/certificates/generate.sh
new file mode 100755
index 0000000000..0867be7a0c
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/config/certificates/generate.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#  http://aws.amazon.com/apache2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+# Small and simple script to create Certificate Authority (root CA), create client and server certificate requests, sign them and transform into OS consumable form.
+# Please ensure  to change certificate subjects and ca_settings.conf/cert_settings.conf as per your policy. Existing values is for reference only.
+
+openssl req -x509 -config ./ca_settings.cnf -new -newkey rsa:2048 -nodes -out ca.cert -keyout ca.key -days 7
+openssl req -new -newkey rsa:2048 -nodes -out client.csr -keyout client.key -subj "/CN=MMSDK_Client_Cert/C=US/ST=WA/L=Seattle/O=Amazon"
+openssl req -new -newkey rsa:2048 -nodes -out server.csr -keyout server.key -subj "/CN=localhost/C=US/ST=WA/L=Seattle/O=Amazon"
+openssl x509 -req -in client.csr -CA ca.cert -CAkey ca.key -CAcreateserial -out client.cert -extfile ./cert_settings.cnf -extensions v3_req -sha256 -days 7
+openssl x509 -req -in server.csr -CA ca.cert -CAkey ca.key -CAcreateserial -out server.cert -extfile ./cert_settings.cnf -extensions v3_req -sha256 -days 7
+cat server.cert ca.cert > server.chain
+cat client.cert ca.cert > client.chain
+openssl pkcs12 -export -clcerts -inkey client.key -in client.chain -out client.p12 -name "client_cert_key"
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_HubLargeLandscape.json b/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_HubLargeLandscape.json
new file mode 100644
index 0000000000..eee892b039
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_HubLargeLandscape.json
@@ -0,0 +1,159 @@
+{
+    "version": "3.0",
+    "visualCharacteristics": [
+        {
+            "type": "AlexaInterface",
+            "interface": "Alexa.InteractionMode",
+            "version": "1.1",
+            "configurations": {
+                "interactionModes": [
+                    {
+                        "id": "hub_fullscreen_mode",
+                        "uiMode": "HUB",
+                        "interactionDistance": {
+                            "unit": "INCHES",
+                            "value": 84
+                        },
+                        "touch": "SUPPORTED",
+                        "keyboard": "UNSUPPORTED",
+                        "video": "SUPPORTED",
+                        "dialog": "SUPPORTED"
+                    }
+                ]
+            }
+        },
+        {
+            "type": "AlexaInterface",
+            "interface": "Alexa.Display.Window",
+            "version": "1.0",
+            "configurations": {
+                "templates": [
+                    {
+                        "id": "hubLandscape",
+                        "type": "STANDARD",
+                        "configuration": {
+                            "sizes": [
+                                {
+                                    "type": "DISCRETE",
+                                    "id": "fullscreen",
+                                    "value": {
+                                        "unit": "PIXEL",
+                                        "value": {
+                                            "width": 1280,
+                                            "height": 800
+                                        }
+                                    }
+                                }
+                            ],
+                            "interactionModes": [
+                                "hub_fullscreen_mode"
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "type": "AlexaInterface",
+            "interface": "Alexa.Display",
+            "version": "1.0",
+            "configurations": {
+                "display": {
+                    "type": "PIXEL",
+                    "touch": [
+                        "SINGLE"
+                    ],
+                    "shape": "RECTANGLE",
+                    "dimensions": {
+                        "resolution": {
+                            "unit": "PIXEL",
+                            "value": {
+                                "width": 1280,
+                                "height": 800
+                            }
+                        },
+                        "physicalSize": {
+                            "unit": "INCHES",
+                            "value": {
+                                "width": 8.6,
+                                "height": 5.4
+                            }
+                        },
+                        "pixelDensity": {
+                            "unit": "DPI",
+                            "value": 160
+                        },
+                        "densityIndependentResolution": {
+                            "unit": "DP",
+                            "value": {
+                                "width": 1280,
+                                "height": 800
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    ],
+    "sampleClientConfig": {
+        "version": "1.0.0",
+        "description": "Hub Landscape Large Device",
+        "mode": "HUB",
+        "emulateDisplayDimensions": true,
+        "scaleToFill": true,
+        "audioInputInitiator": "TAP",
+        "displayMode": "FIXED",
+        "deviceKeys": {
+            "talkKey": {
+                "code": "KeyA",
+                "keyCode": 65,
+                "key": "a"
+            },
+            "backKey": {
+                "code": "KeyB",
+                "keyCode": 66,
+                "key": "b"
+            },
+            "exitKey": {
+                "code": "Escape",
+                "keyCode": 27,
+                "key": "Escape"
+            },
+            "toggleCaptionsKey": {
+                "code": "KeyC",
+                "keyCode": 67,
+                "key": "c"
+            },
+            "toggleDoNotDisturbKey": {
+                "code": "KeyD",
+                "keyCode": 68,
+                "key": "d"
+            }
+        },
+        "windows": [
+            {
+                "id": "hubLandscape",
+                "displayWindowConfig": {
+                    "templateId": "hubLandscape",
+                    "configurations": {
+                        "landscape" : {
+                            "sizeConfigurationId": "fullscreen",
+                            "interactionMode": "hub_fullscreen_mode"
+                        }
+                    }
+                },
+                "aplRendererParameters": {
+                    "supportedExtensions": [
+                        "aplext:backstack:10"
+                    ]
+                },
+                "supportedInterfaces": [
+                    "Alexa.Presentation.APL",
+                    "TemplateRuntime"
+                ],
+                "zOrderIndex": 0
+            }
+        ],
+        "defaultWindowId": "hubLandscape"
+    }
+}
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_HubOrientable.json b/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_HubOrientable.json
new file mode 100644
index 0000000000..2b89a9201f
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_HubOrientable.json
@@ -0,0 +1,174 @@
+{
+  "version": "3.0",
+  "visualCharacteristics": [
+    {
+      "type": "AlexaInterface",
+      "interface": "Alexa.InteractionMode",
+      "version": "1.1",
+      "configurations": {
+        "interactionModes": [
+          {
+            "id": "hub_fullscreen",
+            "uiMode": "HUB",
+            "interactionDistance": {
+              "unit": "INCHES",
+              "value": 84
+            },
+            "touch": "SUPPORTED",
+            "keyboard": "UNSUPPORTED",
+            "video": "SUPPORTED",
+            "dialog": "SUPPORTED"
+          }
+        ]
+      }
+    },
+    {
+      "type": "AlexaInterface",
+      "interface": "Alexa.Display.Window",
+      "version": "1.0",
+      "configurations": {
+        "templates": [
+          {
+            "id": "hubFullscreen",
+            "type": "STANDARD",
+            "configuration": {
+              "sizes": [
+                {
+                  "type": "DISCRETE",
+                  "id": "fullscreenLandscape",
+                  "value": {
+                    "unit": "PIXEL",
+                    "value": {
+                      "width": 1920,
+                      "height": 1080
+                    }
+                  }
+                },
+                {
+                  "type": "DISCRETE",
+                  "id": "fullscreenPortrait",
+                  "value": {
+                    "unit": "PIXEL",
+                    "value": {
+                      "width": 1080,
+                      "height": 1920
+                    }
+                  }
+                }
+              ],
+              "interactionModes": [
+                "hub_fullscreen"
+              ]
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "AlexaInterface",
+      "interface": "Alexa.Display",
+      "version": "1.0",
+      "configurations": {
+        "display": {
+          "type": "PIXEL",
+          "touch": [
+            "SINGLE"
+          ],
+          "shape": "RECTANGLE",
+          "dimensions": {
+            "resolution": {
+              "unit": "PIXEL",
+              "value": {
+                "width": 1080,
+                "height": 1920
+              }
+            },
+            "physicalSize": {
+              "unit": "INCHES",
+              "value": {
+                "width": 7.6,
+                "height": 13.5
+              }
+            },
+            "pixelDensity": {
+              "unit": "DPI",
+              "value": 160
+            },
+            "densityIndependentResolution": {
+              "unit": "DP",
+              "value": {
+                "width": 1080,
+                "height": 1920
+              }
+            }
+          }
+        }
+      }
+    }
+  ],
+  "sampleClientConfig": {
+    "version": "1.0.0",
+    "description": "Hub Orientable Device",
+    "mode": "HUB",
+    "emulateDisplayDimensions": true,
+    "scaleToFill": true,
+    "audioInputInitiator": "TAP",
+    "displayMode": "ORIENTABLE",
+    "deviceKeys": {
+      "talkKey": {
+        "code": "KeyA",
+        "keyCode": 65,
+        "key": "a"
+      },
+      "backKey": {
+        "code": "KeyB",
+        "keyCode": 66,
+        "key": "b"
+      },
+      "exitKey": {
+        "code": "Escape",
+        "keyCode": 27,
+        "key": "Escape"
+      },
+      "toggleCaptionsKey": {
+        "code": "KeyC",
+        "keyCode": 67,
+        "key": "c"
+      },
+      "toggleDoNotDisturbKey": {
+        "code": "KeyD",
+        "keyCode": 68,
+        "key": "d"
+      }
+    },
+    "windows": [
+      {
+        "id": "hubOrientableFullscreen",
+        "displayWindowConfig": {
+          "templateId": "hubFullscreen",
+          "configurations": {
+            "landscape" : {
+              "sizeConfigurationId": "fullscreenLandscape",
+              "interactionMode": "hub_fullscreen"
+            },
+            "portrait" : {
+              "sizeConfigurationId": "fullscreenPortrait",
+              "interactionMode": "hub_fullscreen"
+            }
+          }
+        },
+        "aplRendererParameters": {
+          "supportedExtensions": [
+            "aplext:backstack:10"
+          ]
+        },
+        "supportedInterfaces": [
+          "Alexa.Presentation.APL",
+          "TemplateRuntime"
+        ],
+        "zOrderIndex": 0
+      }
+    ],
+    "defaultWindowId": "hubOrientableFullscreen"
+  }
+}
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_HubRound.json b/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_HubRound.json
new file mode 100644
index 0000000000..aaadb179df
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_HubRound.json
@@ -0,0 +1,159 @@
+{
+    "version": "3.0",
+    "visualCharacteristics": [
+        {
+            "type": "AlexaInterface",
+            "interface": "Alexa.InteractionMode",
+            "version": "1.1",
+            "configurations": {
+                "interactionModes": [
+                    {
+                        "id": "hub_fullscreen_mode",
+                        "uiMode": "HUB",
+                        "interactionDistance": {
+                            "unit": "INCHES",
+                            "value": 84
+                        },
+                        "touch": "SUPPORTED",
+                        "keyboard": "UNSUPPORTED",
+                        "video": "SUPPORTED",
+                        "dialog": "SUPPORTED"
+                    }
+                ]
+            }
+        },
+        {
+            "type": "AlexaInterface",
+            "interface": "Alexa.Display.Window",
+            "version": "1.0",
+            "configurations": {
+                "templates": [
+                    {
+                        "id": "hubRound",
+                        "type": "STANDARD",
+                        "configuration": {
+                            "sizes": [
+                                {
+                                    "type": "DISCRETE",
+                                    "id": "fullscreen",
+                                    "value": {
+                                        "unit": "PIXEL",
+                                        "value": {
+                                            "width": 480,
+                                            "height": 480
+                                        }
+                                    }
+                                }
+                            ],
+                            "interactionModes": [
+                                "hub_fullscreen_mode"
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "type": "AlexaInterface",
+            "interface": "Alexa.Display",
+            "version": "1.0",
+            "configurations": {
+                "display": {
+                    "type": "PIXEL",
+                    "touch": [
+                        "SINGLE"
+                    ],
+                    "shape": "ROUND",
+                    "dimensions": {
+                        "resolution": {
+                            "unit": "PIXEL",
+                            "value": {
+                                "width": 480,
+                                "height": 480
+                            }
+                        },
+                        "physicalSize": {
+                            "unit": "INCHES",
+                            "value": {
+                                "width": 8.6,
+                                "height": 8.6
+                            }
+                        },
+                        "pixelDensity": {
+                            "unit": "DPI",
+                            "value": 160
+                        },
+                        "densityIndependentResolution": {
+                            "unit": "DP",
+                            "value": {
+                                "width": 480,
+                                "height": 480
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    ],
+    "sampleClientConfig": {
+        "version": "1.0.0",
+        "description": "Hub Round Device",
+        "mode": "HUB",
+        "emulateDisplayDimensions": true,
+        "scaleToFill": false,
+        "audioInputInitiator": "TAP",
+        "displayMode": "FIXED",
+        "deviceKeys": {
+            "talkKey": {
+                "code": "KeyA",
+                "keyCode": 65,
+                "key": "a"
+            },
+            "backKey": {
+                "code": "KeyB",
+                "keyCode": 66,
+                "key": "b"
+            },
+            "exitKey": {
+                "code": "Escape",
+                "keyCode": 27,
+                "key": "Escape"
+            },
+            "toggleCaptionsKey": {
+                "code": "KeyC",
+                "keyCode": 67,
+                "key": "c"
+            },
+            "toggleDoNotDisturbKey": {
+                "code": "KeyD",
+                "keyCode": 68,
+                "key": "d"
+            }
+        },
+        "windows": [
+            {
+                "id": "hubRound",
+                "displayWindowConfig": {
+                    "templateId": "hubRound",
+                    "configurations": {
+                        "landscape" : {
+                            "sizeConfigurationId": "fullscreen",
+                            "interactionMode": "hub_fullscreen_mode"
+                        }
+                    }
+                },
+                "aplRendererParameters": {
+                    "supportedExtensions": [
+                        "aplext:backstack:10"
+                    ]
+                },
+                "supportedInterfaces": [
+                    "Alexa.Presentation.APL",
+                    "TemplateRuntime"
+                ],
+                "zOrderIndex": 0
+            }
+        ],
+        "defaultWindowId": "hubRound"
+    }
+}
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_ResizableDesktopApp.json b/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_ResizableDesktopApp.json
new file mode 100644
index 0000000000..7c435b7cbd
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_ResizableDesktopApp.json
@@ -0,0 +1,166 @@
+{
+  "version": "3.0",
+  "visualCharacteristics": [
+    {
+      "type": "AlexaInterface",
+      "interface": "Alexa.InteractionMode",
+      "version": "1.1",
+      "configurations": {
+        "interactionModes": [
+          {
+            "id": "pc_fullscreen",
+            "uiMode": "HUB",
+            "interactionDistance": {
+              "unit": "INCHES",
+              "value": 84
+            },
+            "touch": "SUPPORTED",
+            "keyboard": "UNSUPPORTED",
+            "video": "SUPPORTED",
+            "dialog": "SUPPORTED"
+          }
+        ]
+      }
+    },
+    {
+      "type": "AlexaInterface",
+      "interface": "Alexa.Display.Window",
+      "version": "1.0",
+      "configurations": {
+        "templates": [
+          {
+            "id": "pcFullscreen",
+            "type": "STANDARD",
+            "configuration": {
+              "sizes": [
+                {
+                  "type": "CONTINUOUS",
+                  "id": "pcFullscreenContinuous",
+                  "minimum": {
+                    "unit": "PIXEL",
+                    "value": {
+                      "width": 960,
+                      "height": 480
+                    }
+                  },
+                  "maximum": {
+                    "unit": "PIXEL",
+                    "value": {
+                      "width": 1920,
+                      "height": 1280
+                    }
+                  }
+                }
+              ],
+              "interactionModes": [
+                "pc_fullscreen"
+              ]
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "AlexaInterface",
+      "interface": "Alexa.Display",
+      "version": "1.0",
+      "configurations": {
+        "display": {
+          "type": "PIXEL",
+          "touch": [
+            "SINGLE"
+          ],
+          "shape": "RECTANGLE",
+          "dimensions": {
+            "resolution": {
+              "unit": "PIXEL",
+              "value": {
+                "width": 1280,
+                "height": 800
+              }
+            },
+            "physicalSize": {
+              "unit": "INCHES",
+              "value": {
+                "width": 8.6,
+                "height": 5.4
+              }
+            },
+            "pixelDensity": {
+              "unit": "DPI",
+              "value": 160
+            },
+            "densityIndependentResolution": {
+              "unit": "DP",
+              "value": {
+                "width": 1280,
+                "height": 800
+              }
+            }
+          }
+        }
+      }
+    }
+  ],
+  "sampleClientConfig": {
+    "version": "1.0.0",
+    "description": "Resizable Desktop App",
+    "mode": "HUB",
+    "emulateDisplayDimensions": true,
+    "scaleToFill": true,
+    "audioInputInitiator": "TAP",
+    "displayMode": "RESIZABLE",
+    "deviceKeys": {
+      "talkKey": {
+        "code": "KeyA",
+        "keyCode": 65,
+        "key": "a"
+      },
+      "backKey": {
+        "code": "KeyB",
+        "keyCode": 66,
+        "key": "b"
+      },
+      "exitKey": {
+        "code": "Escape",
+        "keyCode": 27,
+        "key": "Escape"
+      },
+      "toggleCaptionsKey": {
+        "code": "KeyC",
+        "keyCode": 67,
+        "key": "c"
+      },
+      "toggleDoNotDisturbKey": {
+        "code": "KeyD",
+        "keyCode": 68,
+        "key": "d"
+      }
+    },
+    "windows": [
+      {
+        "id": "pcFullscreen",
+        "displayWindowConfig": {
+          "templateId": "pcFullscreen",
+          "configurations": {
+            "landscape" : {
+              "sizeConfigurationId": "pcFullscreenContinuous",
+              "interactionMode": "pc_fullscreen"
+            }
+          }
+        },
+        "aplRendererParameters": {
+          "supportedExtensions": [
+            "aplext:backstack:10"
+          ]
+        },
+        "supportedInterfaces": [
+          "Alexa.Presentation.APL",
+          "TemplateRuntime"
+        ],
+        "zOrderIndex": 0
+      }
+    ],
+    "defaultWindowId": "pcFullscreen"
+  }
+}
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_TvFullscreen.json b/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_TvFullscreen.json
new file mode 100644
index 0000000000..dc165f9e25
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_TvFullscreen.json
@@ -0,0 +1,165 @@
+{
+    "version": "3.0",
+    "visualCharacteristics": [
+        {
+            "type": "AlexaInterface",
+            "interface": "Alexa.InteractionMode",
+            "version": "1.1",
+            "configurations": {
+                "interactionModes": [
+                    {
+                        "id": "tv",
+                        "uiMode": "TV",
+                        "interactionDistance": {
+                            "unit": "INCHES",
+                            "value": 130
+                        },
+                        "touch": "UNSUPPORTED",
+                        "keyboard": "SUPPORTED",
+                        "video": "SUPPORTED",
+                        "dialog": "SUPPORTED"
+                    }
+                ]
+            }
+        },
+        {
+            "type": "AlexaInterface",
+            "interface": "Alexa.Display.Window",
+            "version": "1.0",
+            "configurations": {
+                "templates": [
+                    {
+                        "id": "tvFullscreen",
+                        "type": "STANDARD",
+                        "configuration": {
+                            "sizes": [
+                                {
+                                    "type": "DISCRETE",
+                                    "id": "fullscreen",
+                                    "value": {
+                                        "unit": "PIXEL",
+                                        "value": {
+                                            "width": 1920,
+                                            "height": 1080
+                                        }
+                                    }
+                                }
+                            ],
+                            "interactionModes": [
+                                "tv"
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "type": "AlexaInterface",
+            "interface": "Alexa.Display",
+            "version": "1.0",
+            "configurations": {
+                "display": {
+                    "type": "PIXEL",
+                    "touch": [
+                        "UNSUPPORTED"
+                    ],
+                    "shape": "RECTANGLE",
+                    "dimensions": {
+                        "resolution": {
+                            "unit": "PIXEL",
+                            "value": {
+                                "width": 1920,
+                                "height": 1080
+                            }
+                        },
+                        "physicalSize": {
+                            "unit": "INCHES",
+                            "value": {
+                                "width": 56.7,
+                                "height": 31.9
+                            }
+                        },
+                        "pixelDensity": {
+                            "unit": "DPI",
+                            "value": 320
+                        },
+                        "densityIndependentResolution": {
+                            "unit": "DP",
+                            "value": {
+                                "width": 960,
+                                "height": 540
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    ],
+    "sampleClientConfig": {
+        "version": "1.0.0",
+        "description": "TV PTT Device - Fullscreen Only",
+        "mode": "TV",
+        "emulateDisplayDimensions": true,
+        "scaleToFill": true,
+        "audioInputInitiator": "PRESS_AND_HOLD",
+        "displayMode": "FIXED",
+        "deviceKeys": {
+            "talkKey": {
+                "code": "KeyA",
+                "keyCode": 65,
+                "key": "a"
+            },
+            "backKey": {
+                "code": "KeyB",
+                "keyCode": 66,
+                "key": "b"
+            },
+            "exitKey": {
+                "code": "Escape",
+                "keyCode": 27,
+                "key": "Escape"
+            },
+            "toggleCaptionsKey": {
+                "code": "KeyC",
+                "keyCode": 67,
+                "key": "c"
+            },
+            "toggleDoNotDisturbKey": {
+                "code": "KeyD",
+                "keyCode": 68,
+                "key": "d"
+            }
+        },
+        "windows": [
+            {
+                "id": "tvFullscreen",
+                "displayWindowConfig": {
+                    "templateId": "tvFullscreen",
+                    "configurations": {
+                        "landscape" : {
+                            "sizeConfigurationId": "fullscreen",
+                            "interactionMode": "tv"
+                        }
+                    }
+                },
+                "aplRendererParameters": {
+                    "supportedExtensions": [
+                        "aplext:backstack:10"
+                    ]
+                },
+                "supportedInterfaces": [
+                    "Alexa.Presentation.APL",
+                    "TemplateRuntime"
+                ],
+                "zOrderIndex": 0
+            }
+        ],
+        "defaultWindowId": "tvFullscreen",
+        "liveViewCameraOptions": {
+            "physicalMicButtonHint": {
+                "micButtonHintType": "Text",
+                "micButtonHintSource": "A"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_TvFullscreenAndOverlay.json b/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_TvFullscreenAndOverlay.json
new file mode 100644
index 0000000000..375c0119d5
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/config/samples/SampleConfig_TvFullscreenAndOverlay.json
@@ -0,0 +1,217 @@
+{
+    "version": "3.0",
+    "visualCharacteristics": [
+        {
+            "type": "AlexaInterface",
+            "interface": "Alexa.InteractionMode",
+            "version": "1.1",
+            "configurations": {
+                "interactionModes": [
+                    {
+                        "id": "tv",
+                        "uiMode": "TV",
+                        "interactionDistance": {
+                            "unit": "INCHES",
+                            "value": 130
+                        },
+                        "touch": "UNSUPPORTED",
+                        "keyboard": "SUPPORTED",
+                        "video": "SUPPORTED",
+                        "dialog": "SUPPORTED"
+                    },
+                    {
+                        "id": "tv_overlay",
+                        "uiMode": "TV",
+                        "interactionDistance": {
+                            "unit": "INCHES",
+                            "value": 130
+                        },
+                        "touch": "UNSUPPORTED",
+                        "keyboard": "SUPPORTED",
+                        "video": "UNSUPPORTED",
+                        "dialog": "SUPPORTED"
+                    }
+                ]
+            }
+        },
+        {
+            "type": "AlexaInterface",
+            "interface": "Alexa.Display.Window",
+            "version": "1.0",
+            "configurations": {
+                "templates": [
+                    {
+                        "id": "tvFullscreen",
+                        "type": "STANDARD",
+                        "configuration": {
+                            "sizes": [
+                                {
+                                    "type": "DISCRETE",
+                                    "id": "fullscreen",
+                                    "value": {
+                                        "unit": "PIXEL",
+                                        "value": {
+                                            "width": 1920,
+                                            "height": 1080
+                                        }
+                                    }
+                                }
+                            ],
+                            "interactionModes": [
+                                "tv"
+                            ]
+                        }
+                    },
+                    {
+                        "id": "tvOverlayLandscape",
+                        "type": "OVERLAY",
+                        "configuration": {
+                            "sizes": [
+                                {
+                                    "type": "DISCRETE",
+                                    "id": "landscapePanel",
+                                    "value": {
+                                        "unit": "PIXEL",
+                                        "value": {
+                                            "width": 1920,
+                                            "height": 400
+                                        }
+                                    }
+                                }
+                            ],
+                            "interactionModes": [
+                                "tv_overlay"
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "type": "AlexaInterface",
+            "interface": "Alexa.Display",
+            "version": "1.0",
+            "configurations": {
+                "display": {
+                    "type": "PIXEL",
+                    "touch": [
+                        "UNSUPPORTED"
+                    ],
+                    "shape": "RECTANGLE",
+                    "dimensions": {
+                        "resolution": {
+                            "unit": "PIXEL",
+                            "value": {
+                                "width": 1920,
+                                "height": 1080
+                            }
+                        },
+                        "physicalSize": {
+                            "unit": "INCHES",
+                            "value": {
+                                "width": 56.7,
+                                "height": 31.9
+                            }
+                        },
+                        "pixelDensity": {
+                            "unit": "DPI",
+                            "value": 320
+                        },
+                        "densityIndependentResolution": {
+                            "unit": "DP",
+                            "value": {
+                                "width": 960,
+                                "height": 540
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    ],
+    "sampleClientConfig" : {
+        "version": "1.0.0",
+        "description": "TV PTT Device - Fullscreen + Lower Third Panel",
+        "mode": "TV",
+        "emulateDisplayDimensions": true,
+        "scaleToFill": true,
+        "audioInputInitiator": "PRESS_AND_HOLD",
+        "displayMode": "FIXED",
+        "deviceKeys": {
+            "talkKey": {
+                "code": "KeyA",
+                "keyCode": 65,
+                "key": "a"
+            },
+            "backKey": {
+                "code": "KeyB",
+                "keyCode": 66,
+                "key": "b"
+            },
+            "exitKey": {
+                "code": "Escape",
+                "keyCode": 27,
+                "key": "Escape"
+            },
+            "toggleCaptionsKey": {
+                "code": "KeyC",
+                "keyCode": 67,
+                "key": "c"
+            },
+            "toggleDoNotDisturbKey": {
+                "code": "KeyD",
+                "keyCode": 68,
+                "key": "d"
+            }
+        },
+        "windows": [
+            {
+                "id": "tvFullscreen",
+                "displayWindowConfig": {
+                    "templateId": "tvFullscreen",
+                    "configurations": {
+                        "landscape" : {
+                            "sizeConfigurationId": "fullscreen",
+                            "interactionMode": "tv"
+                        }
+                    }
+                },
+                "aplRendererParameters": {
+                    "supportedExtensions": [
+                        "aplext:backstack:10"
+                    ]
+                },
+                "supportedInterfaces": [
+                    "Alexa.Presentation.APL",
+                    "TemplateRuntime"
+                ],
+                "zOrderIndex": 0
+            },
+            {
+                "id": "tvOverlayLandscape",
+                "displayWindowConfig": {
+                    "templateId": "tvOverlayLandscape",
+                    "configurations": {
+                        "landscape" : {
+                            "sizeConfigurationId": "landscapePanel",
+                            "interactionMode": "tv_overlay"
+                        }
+                    }
+                },
+                "supportedInterfaces": [
+                    "Alexa.Presentation.APL",
+                    "TemplateRuntime"
+                ],
+                "windowPosition": "bottom",
+                "zOrderIndex": 1
+            }
+        ],
+        "defaultWindowId": "tvFullscreen",
+        "liveViewCameraOptions": {
+            "physicalMicButtonHint": {
+                "micButtonHintType": "Text",
+                "micButtonHintSource": "A"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/config/schema/IPCServerSampleAppConfigSchema.json b/SampleApplications/IPCServerSampleApplication/config/schema/IPCServerSampleAppConfigSchema.json
new file mode 100644
index 0000000000..3c7fde137e
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/config/schema/IPCServerSampleAppConfigSchema.json
@@ -0,0 +1,545 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "definitions": {
+    "sampleApp": {
+      "type": "object",
+      "properties": {
+        "websocket": {
+          "type": "object",
+          "properties": {
+            "websocketInterface": {
+              "type": "string"
+            },
+            "websocketPort": {
+              "type": "number"
+            },
+            "websocketCertificateAuthority": {
+              "type": "string"
+            },
+            "websocketCertificate": {
+              "type": "string"
+            }
+          }
+        },
+        "aplContentCache": {
+          "type": "object",
+          "properties": {
+            "contentCacheReusePeriodInSeconds": {
+              "type": "string"
+            },
+            "contentCacheMaxSize": {
+              "type": "string"
+            },
+            "maxNumberOfConcurrentDownloads": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "required": []
+    },
+    "alexaPresentationCapabilityAgent": {
+      "definitions": {
+        "codecs_item": {
+          "type": "string",
+          "enum": [
+            "H_264_41",
+            "H_264_42"
+          ]
+        }
+      },
+      "type": "object",
+      "properties": {
+        "minStateReportIntervalMs": {
+          "type": "number"
+        },
+        "stateReportCheckIntervalMs": {
+          "type": "number"
+        },
+        "video": {
+          "type": "object",
+          "properties": {
+            "codecs": {
+              "type":"array",
+              "items": {
+                "$ref": "#/definitions/alexaPresentationCapabilityAgent/definitions/codecs_item"
+              }
+            }
+          }
+        }
+      }
+    },
+    "visualCharacteristics": {
+      "type": "array",
+      "definitions": {
+        "value_int": {
+          "type": "object",
+          "properties": {
+            "width": {
+              "type": "integer"
+            },
+            "height": {
+              "type": "integer"
+            }
+          },
+          "required": [
+            "width",
+            "height"
+          ]
+        },
+        "value_dec": {
+          "type": "object",
+          "properties": {
+            "width": {
+              "type": "number"
+            },
+            "height": {
+              "type": "number"
+            }
+          },
+          "required": [
+            "width",
+            "height"
+          ]
+        },
+        "resolution": {
+          "type": "object",
+          "properties": {
+            "unit": {
+              "type": "string",
+              "enum": [
+                "PIXEL"
+              ]
+            },
+            "value": {
+              "$ref": "#/definitions/visualCharacteristics/definitions/value_int"
+            }
+          },
+          "required": [
+            "unit",
+            "value"
+          ]
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "AlexaInterface"
+          ]
+        },
+        "version": {
+          "type": "string"
+        },
+        "alexa.interactionmode.configurations": {
+          "type": "object",
+          "definitions": {
+            "uiMode": {
+              "type": "string",
+              "enum": [
+                "HUB",
+                "TV",
+                "MOBILE",
+                "PC",
+                "AUTO",
+                "HEADLESS"
+              ]
+            },
+            "interactionDistance": {
+              "type": "object",
+              "properties": {
+                "unit": {
+                  "type": "string",
+                  "enum": [
+                    "CENTIMETERS",
+                    "INCHES"
+                  ]
+                },
+                "value": {
+                  "type": "number"
+                }
+              },
+              "required": [
+                "unit",
+                "value"
+              ]
+            }
+          },
+          "properties": {
+            "interactionModes": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "uiMode": {
+                    "$ref": "#/definitions/visualCharacteristics/definitions/alexa.interactionmode.configurations/definitions/uiMode"
+                  },
+                  "id": {
+                    "type": "string"
+                  },
+                  "interactionDistance": {
+                    "$ref": "#/definitions/visualCharacteristics/definitions/alexa.interactionmode.configurations/definitions/interactionDistance"
+                  },
+                  "touch": {
+                    "type": "string",
+                    "enum": [
+                      "SUPPORTED",
+                      "UNSUPPORTED"
+                    ]
+                  },
+                  "keyboard": {
+                    "type": "string",
+                    "enum": [
+                      "SUPPORTED",
+                      "UNSUPPORTED"
+                    ]
+                  },
+                  "video": {
+                    "type": "string",
+                    "enum": [
+                      "SUPPORTED",
+                      "UNSUPPORTED"
+                    ]
+                  },
+                  "dialog": {
+                    "type": "string",
+                    "enum": [
+                      "SUPPORTED",
+                      "UNSUPPORTED"
+                    ]
+                  }
+                },
+                "required": [
+                  "uiMode",
+                  "id",
+                  "interactionDistance",
+                  "touch",
+                  "keyboard",
+                  "video",
+                  "dialog"
+                ]
+              }
+            }
+          },
+          "required": [
+            "interactionModes"
+          ]
+        },
+        "alexa.display.configurations": {
+          "type": "object",
+          "definitions": {
+            "pixelDensity": {
+              "type": "object",
+              "properties": {
+                "unit": {
+                  "type": "string",
+                  "enum": [
+                    "DPI"
+                  ]
+                },
+                "value": {
+                  "type": "integer"
+                }
+              }
+            },
+            "densityIndependentResolution": {
+              "type": "object",
+              "properties": {
+                "unit": {
+                  "type": "string",
+                  "enum": [
+                    "DP"
+                  ]
+                },
+                "value": {
+                  "$ref": "#/definitions/visualCharacteristics/definitions/value_int"
+                }
+              }
+            },
+            "physicalSize": {
+              "type": "object",
+              "properties": {
+                "unit": {
+                  "type": "string",
+                  "enum": [
+                    "CENTIMETERS",
+                    "INCHES"
+                  ]
+                },
+                "value": {
+                  "$ref": "#/definitions/visualCharacteristics/definitions/value_dec"
+                }
+              },
+              "required": [
+                "unit",
+                "value"
+              ]
+            }
+          },
+          "properties": {
+            "display": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "PIXEL"
+                  ]
+                },
+                "touch": {
+                  "type": "array",
+                  "items": {
+                    "type": "string",
+                    "enum": [
+                      "SINGLE",
+                      "UNSUPPORTED"
+                    ]
+                  }
+                },
+                "shape": {
+                  "type": "string",
+                  "enum": [
+                    "RECTANGLE",
+                    "ROUND"
+                  ]
+                },
+                "dimensions": {
+                  "type": "object",
+                  "properties": {
+                    "resolution": {
+                      "$ref": "#/definitions/visualCharacteristics/definitions/resolution"
+                    },
+                    "pixelDensity": {
+                      "$ref": "#/definitions/visualCharacteristics/definitions/alexa.display.configurations/definitions/pixelDensity"
+                    },
+                    "densityIndependentResolution": {
+                      "$ref": "#/definitions/visualCharacteristics/definitions/alexa.display.configurations/definitions/densityIndependentResolution"
+                    },
+                    "physicalSize": {
+                      "$ref": "#/definitions/visualCharacteristics/definitions/alexa.display.configurations/definitions/physicalSize"
+                    }
+                  },
+                  "required": [
+                    "physicalSize"
+                  ]
+                }
+              },
+              "required": [
+                "type",
+                "touch",
+                "shape",
+                "dimensions"
+              ]
+            }
+          },
+          "required": [
+            "display"
+          ]
+        },
+        "alexa.display.window.configurations": {
+          "type": "object",
+          "definitions": {
+            "discrete": {
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "DISCRETE"
+                  ]
+                },
+                "value": {
+                  "$ref": "#/definitions/visualCharacteristics/definitions/resolution"
+                }
+              },
+              "required": [
+                "value"
+              ]
+            },
+            "continuous": {
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "CONTINUOUS"
+                  ]
+                },
+                "maximum": {
+                  "$ref": "#/definitions/visualCharacteristics/definitions/resolution"
+                },
+                "minimum": {
+                  "$ref": "#/definitions/visualCharacteristics/definitions/resolution"
+                }
+              },
+              "required": [
+                "minimum",
+                "maximum"
+              ]
+            }
+          },
+          "properties": {
+            "templates": {
+              "type": "array",
+              "items": {
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "type": {
+                    "type": "string"
+                  },
+                  "configuration": {
+                    "type": "object",
+                    "properties": {
+                      "sizes": {
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "id": {
+                              "type": "string"
+                            }
+                          },
+                          "anyOf": [
+                            {
+                              "$ref": "#/definitions/visualCharacteristics/definitions/alexa.display.window.configurations/definitions/discrete"
+                            },
+                            {
+                              "$ref": "#/definitions/visualCharacteristics/definitions/alexa.display.window.configurations/definitions/continuous"
+                            }
+                          ],
+                          "required": [
+                            "type",
+                            "id"
+                          ]
+                        }
+                      },
+                      "interactionModes": {
+                        "type": "array",
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    },
+                    "required": [
+                      "sizes",
+                      "interactionModes"
+                    ]
+                  }
+                },
+                "required": [
+                  "id",
+                  "type",
+                  "configuration"
+                ]
+              }
+            }
+          },
+          "required": [
+            "templates"
+          ]
+        }
+      },
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "$ref": "#/definitions/visualCharacteristics/definitions/type"
+          },
+          "version": {
+            "$ref": "#/definitions/visualCharacteristics/definitions/version"
+          }
+        },
+        "oneOf": [
+          {
+            "properties": {
+              "interface": {
+                "type": "string",
+                "enum": [
+                  "Alexa.InteractionMode"
+                ]
+              },
+              "configurations": {
+                "$ref": "#/definitions/visualCharacteristics/definitions/alexa.interactionmode.configurations"
+              }
+            }
+          },
+          {
+            "properties": {
+              "interface": {
+                "type": "string",
+                "enum": [
+                  "Alexa.Display"
+                ]
+              },
+              "configurations": {
+                "$ref": "#/definitions/visualCharacteristics/definitions/alexa.display.configurations"
+              }
+            }
+          },
+          {
+            "properties": {
+              "interface": {
+                "type": "string",
+                "enum": [
+                  "Alexa.Display.Window"
+                ]
+              },
+              "configurations": {
+                "$ref": "#/definitions/visualCharacteristics/definitions/alexa.display.window.configurations"
+              }
+            }
+          }
+        ],
+        "required": [
+          "type",
+          "interface",
+          "version",
+          "configurations"
+        ]
+      }
+    },
+    "presentationOptions": {
+      "type": "object",
+      "properties": {
+        "shortPresentationTimeoutMs": {
+          "type": "number"
+        },
+        "transientPresentationTimeoutMs": {
+          "type": "number"
+        },
+        "longPresentationTimeoutMs": {
+          "type": "number"
+        }
+      }
+    },
+    "sampleClientConfig": {
+      "type": "object",
+      "properties": {},
+      "required": []
+    }
+  },
+  "properties": {
+    "version": {
+      "const": "3.0"
+    },
+    "sampleApp": {
+      "$ref": "#/definitions/sampleApp"
+    },
+    "alexaPresentationCapabilityAgent": {
+      "$ref": "#/definitions/alexaPresentationCapabilityAgent"
+    },
+    "visualCharacteristics": {
+      "$ref": "#/definitions/visualCharacteristics"
+    },
+    "presentationOptions": {
+      "$ref": "#/definitions/presentationOptions"
+    },
+    "sampleClientConfig": {
+      "$ref": "#/definitions/sampleClientConfig"
+    }
+  },
+  "required": [
+    "version",
+    "visualCharacteristics",
+    "sampleClientConfig"
+  ]
+}
\ No newline at end of file
diff --git a/SampleApplications/IPCServerSampleApplication/src/CMakeLists.txt b/SampleApplications/IPCServerSampleApplication/src/CMakeLists.txt
new file mode 100644
index 0000000000..d43d775c0d
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/src/CMakeLists.txt
@@ -0,0 +1,4 @@
+
+add_executable(IPCServerSampleApp main.cpp)
+
+target_link_libraries(IPCServerSampleApp LibIPCServerSampleApp)
diff --git a/SampleApplications/IPCServerSampleApplication/src/main.cpp b/SampleApplications/IPCServerSampleApplication/src/main.cpp
new file mode 100644
index 0000000000..409ca33989
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/src/main.cpp
@@ -0,0 +1,107 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#include <cstdlib>
+#include <string>
+#include <vector>
+
+#include <AVSCommon/Utils/SDKVersion.h>
+
+#include "IPCServerSampleApp/SampleApplication.h"
+#include "IPCServerSampleApp/SampleApplicationReturnCodes.h"
+
+using namespace alexaClientSDK;
+using namespace alexaClientSDK::sampleApplications::ipcServerSampleApp;
+
+/**
+ * Function that evaluates if the SampleApp invocation uses old-style or new-style opt-arg style invocation.
+ *
+ * @param argc The number of elements in the @c argv array.
+ * @param argv An array of @a argc elements, containing the program name and all command-line arguments.
+ * @return @c true of the invocation uses optarg style argument @c false otherwise.
+ */
+bool usesOptStyleArgs(int argc, char* argv[]) {
+    for (int i = 1; i < argc; i++) {
+        if (!strcmp(argv[i], "-C") || !strcmp(argv[i], "-K") || !strcmp(argv[i], "-L")) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * This serves as the starting point for the application. This code instantiates the @c UserInputManager and processes
+ * user input until the @c run() function returns.
+ *
+ * @param argc The number of elements in the @c argv array.
+ * @param argv An array of @a argc elements, containing the program name and all command-line arguments.
+ * @return @c EXIT_FAILURE if the program failed to initialize correctly, else @c EXIT_SUCCESS.
+ */
+int main(int argc, char* argv[]) {
+    std::vector<std::string> configFiles;
+    std::string logLevel;
+
+    ConsolePrinter::simplePrint("SDK Version " + avsCommon::utils::sdkVersion::getCurrentVersion());
+    if (usesOptStyleArgs(argc, argv)) {
+        for (int i = 1; i < argc; i++) {
+            if (strcmp(argv[i], "-C") == 0) {
+                if (i + 1 == argc) {
+                    ConsolePrinter::simplePrint("No config specified for -C option");
+                    return SampleAppReturnCode::ERROR;
+                }
+                configFiles.push_back(std::string(argv[++i]));
+                ConsolePrinter::simplePrint("configFile " + std::string(argv[i]));
+            } else if (strcmp(argv[i], "-L") == 0) {
+                if (i + 1 == argc) {
+                    ConsolePrinter::simplePrint("No debugLevel specified for -L option");
+                    return SampleAppReturnCode::ERROR;
+                }
+                logLevel = std::string(argv[++i]);
+            } else {
+                ConsolePrinter::simplePrint(
+                    "USAGE: " + std::string(argv[0]) + " -C <config1.json> -C <config2.json> ... -C <configN.json> " +
+                    " -L <log_level>");
+                return SampleAppReturnCode::ERROR;
+            }
+        }
+    } else {
+        if (argc < 2) {
+            ConsolePrinter::simplePrint(
+                "USAGE: " + std::string(argv[0]) + " <path_to_AlexaClientSDKConfig.json> [log_level]");
+            return SampleAppReturnCode::ERROR;
+        }
+        if (3 == argc) {
+            logLevel = std::string(argv[2]);
+        }
+
+        configFiles.push_back(std::string(argv[1]));
+        ConsolePrinter::simplePrint("configFile " + std::string(argv[1]));
+    }
+
+    std::unique_ptr<SampleApplication> sampleApplication;
+    SampleAppReturnCode returnCode = SampleAppReturnCode::OK;
+
+    do {
+        sampleApplication = SampleApplication::create(configFiles, logLevel);
+        if (!sampleApplication) {
+            ConsolePrinter::simplePrint("Failed to create to SampleApplication!");
+            return SampleAppReturnCode::ERROR;
+        }
+        returnCode = sampleApplication->run();
+        sampleApplication.reset();
+    } while (SampleAppReturnCode::RESTART == returnCode);
+
+    return returnCode;
+}
diff --git a/SampleApplications/IPCServerSampleApplication/tools/Testing.cmake b/SampleApplications/IPCServerSampleApplication/tools/Testing.cmake
new file mode 100644
index 0000000000..e51d14aad8
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/tools/Testing.cmake
@@ -0,0 +1,77 @@
+include(CheckCXXCompilerFlag)
+
+if(POLICY CMP0057)
+    cmake_policy(SET CMP0057 NEW)
+endif()
+
+include(CTest)
+include(ThirdParty/googletest.cmake)
+
+add_custom_target(unit COMMAND ${CMAKE_CTEST_COMMAND})
+
+if (ANDROID_TEST_AVAILABLE)
+    set(TESTING_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR})
+endif()
+
+macro(discover_unit_tests includes libraries)
+    # This will result in some errors not finding GTest when running cmake, but allows us to better integrate with CTest
+    if(BUILD_TESTING)
+        find_package(GTest ${GTEST_PACKAGE_CONFIG})
+        set (extra_macro_args ${ARGN})
+        LIST(LENGTH extra_macro_args num_extra_args)
+        if (${num_extra_args} GREATER 0)
+            list(GET extra_macro_args 0 inputs)
+        endif()
+        file(GLOB_RECURSE tests RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*Test.cpp")
+        foreach(testsourcefile IN LISTS tests)
+            get_filename_component(testname ${testsourcefile} NAME_WE)
+            add_executable(${testname} ${testsourcefile})
+
+            add_dependencies(unit ${testname})
+            CHECK_CXX_COMPILER_FLAG("-Wno-deprecated-declarations" HAS_NO_DEPRECATED_DECLARATIONS)
+            if (HAS_NO_DEPRECATED_DECLARATIONS)
+                target_compile_options(${testname} PRIVATE -Wno-deprecated-declarations)
+            endif()
+
+            target_include_directories(${testname} PRIVATE ${includes})
+            # Do not include gtest_main due to double free issue
+            # - https://github.com/google/googletest/issues/930
+            target_link_libraries(${testname} ${libraries} gmock_main)
+            add_rpath_to_target("${testname}")
+            configure_test_command(${testname} "${inputs}" ${testsourcefile})
+        endforeach()
+    endif()
+endmacro()
+
+macro(configure_test_command testname inputs testsourcefile)
+    if(NOT ANDROID)
+        GTEST_ADD_TESTS(${testname} "${inputs}" ${testsourcefile})
+    elseif(ANDROID_TEST_AVAILABLE)
+        # Use generator expression to get the test path when available.
+        set(target_path $<TARGET_FILE:${testname}>)
+        add_test(NAME "${testname}_fast"
+            COMMAND python ${TESTING_CMAKE_DIR}/Testing/android_test.py
+                -n ${testname}
+                -s ${target_path}
+                -d ${ANDROID_DEVICE_INSTALL_PREFIX}
+                -i "${inputs}" " --gtest_filter=*test_*")
+        add_test(NAME "${testname}_slow"
+            COMMAND python ${TESTING_CMAKE_DIR}/Testing/android_test.py
+                -n ${testname}
+                -s ${target_path}
+                -d ${ANDROID_DEVICE_INSTALL_PREFIX}
+                -i "${inputs}" " --gtest_filter=*testSlow_*")
+        add_test(NAME "${testname}_timer"
+            COMMAND python ${TESTING_CMAKE_DIR}/Testing/android_test.py
+                -n ${testname}
+                -s ${target_path}
+                -d ${ANDROID_DEVICE_INSTALL_PREFIX}
+                -i "${inputs}" " --gtest_filter=*testTimer_*")
+    endif()
+endmacro()
+
+# Add Custom Targets
+add_custom_target(fast-test COMMAND ${CMAKE_CTEST_COMMAND} -E "testSlow|testTimer" --output-on-failure VERBATIM)
+add_custom_target(find-slow-test COMMAND ${CMAKE_CTEST_COMMAND} -E "testSlow|testTimer" --output-on-failure --timeout 1 VERBATIM)
+add_custom_target(slow-test COMMAND ${CMAKE_CTEST_COMMAND} -R "testSlow" --output-on-failure)
+add_custom_target(timer-test COMMAND ${CMAKE_CTEST_COMMAND} -R "testTimer" --output-on-failure)
diff --git a/SampleApplications/IPCServerSampleApplication/tools/Testing/android_test.py b/SampleApplications/IPCServerSampleApplication/tools/Testing/android_test.py
new file mode 100644
index 0000000000..2fe3aa7325
--- /dev/null
+++ b/SampleApplications/IPCServerSampleApplication/tools/Testing/android_test.py
@@ -0,0 +1,114 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#  http://aws.amazon.com/apache2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+from argparse import ArgumentParser
+from subprocess import check_call, check_output
+from os import devnull, path
+import string
+
+# Used devnull to redirect output.
+FNULL = open(devnull, 'w')
+
+# Android uses forward slash to separate folders.
+SEPARATOR = '/'
+
+
+def run_test(args):
+    """Upload and run the test on the device."""
+    lib_folder = string.join([args.device_path, 'lib'], SEPARATOR)
+    test_folder = string.join([args.device_path, 'test'], SEPARATOR)
+    input_folder = string.join([args.device_path, 'input'], SEPARATOR)
+    test_path = string.join([test_folder, args.name], SEPARATOR)
+
+    # Setup the device folders.
+    check_call('adb shell mkdir -p {}'.format(test_folder).split(),
+               stdout=FNULL)
+    check_call('adb shell mkdir -p {}'.format(input_folder).split(),
+               stdout=FNULL)
+    check_call('adb push {} {}'.format(args.source, test_folder).split(),
+               stdout=FNULL)
+
+    # Upload necessary input files and setup arguments.
+    inputs = process_inputs(input_folder, args.inputs)
+
+    # Run test command on test folder and with installed libraries.
+    cd_command = 'cd {};'.format(test_folder)
+    export_command = 'export LD_LIBRARY_PATH={};'.format(lib_folder)
+    test_command = '{} {};'.format(test_path, inputs)
+
+    return check_output(['adb',
+                         'shell',
+                         cd_command,
+                         export_command,
+                         test_command,
+                         'echo $?'])
+
+
+def parse():
+    """Parse arguments."""
+    parser = ArgumentParser()
+    parser.add_argument('-n',
+                        '--name',
+                        type=str,
+                        help='The test name.')
+
+    parser.add_argument('-s',
+                        '--source',
+                        type=str,
+                        help='The test path on the host device.')
+
+    parser.add_argument('-d',
+                        '--device_path',
+                        type=str,
+                        help='The install folder path on the android device.')
+
+    parser.add_argument('-i',
+                        '--inputs',
+                        nargs='*',
+                        help='The inputs to be given to the test.')
+
+    return parser.parse_args()
+
+
+def process_inputs(inputs_folder, inputs):
+    """Process the inputs passed to the test.
+
+    If the input is an existing file or directory, upload it to the device and
+    use the new location as argument.
+    """
+    ret = []
+    for toProcess in inputs:
+        if path.exists(toProcess) or (path.dirname(toProcess) and
+                                      path.exists(path.dirname(toProcess))):
+            # Input is a file / directory. Upload it to the device.
+            push_command = 'adb push {} {}'.format(toProcess, inputs_folder)
+            check_call(push_command.split(), stdout=FNULL)
+            basename = path.basename(toProcess)
+            ret.append(string.join([inputs_folder, basename], SEPARATOR))
+        else:
+            ret.append(toProcess)
+    return string.join(ret)
+
+
+def parse_output(output):
+    """Extract test return value and print the test output."""
+    lines = output.splitlines()
+    print(string.join(lines[0:-1], '\n'))
+    return int(lines[-1])
+
+
+if __name__ == '__main__':
+    args = parse()
+    output = run_test(args)
+    ret_value = parse_output(output)
+    exit(ret_value)
diff --git a/Settings/src/CloudControlledSettingProtocol.cpp b/Settings/src/CloudControlledSettingProtocol.cpp
index 0205b1fa9d..66e032a59a 100644
--- a/Settings/src/CloudControlledSettingProtocol.cpp
+++ b/Settings/src/CloudControlledSettingProtocol.cpp
@@ -21,7 +21,7 @@ namespace alexaClientSDK {
 namespace settings {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CloudControlledSettingProtocol");
+#define TAG "CloudControlledSettingProtocol"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Settings/src/DeviceControlledSettingProtocol.cpp b/Settings/src/DeviceControlledSettingProtocol.cpp
index e0406c7be1..3e367d1471 100644
--- a/Settings/src/DeviceControlledSettingProtocol.cpp
+++ b/Settings/src/DeviceControlledSettingProtocol.cpp
@@ -21,7 +21,7 @@ namespace alexaClientSDK {
 namespace settings {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DeviceControlledSettingProtocol");
+#define TAG "DeviceControlledSettingProtocol"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Settings/src/SettingEventRequestObserver.cpp b/Settings/src/SettingEventRequestObserver.cpp
index 4c08c74ec5..aa07064811 100644
--- a/Settings/src/SettingEventRequestObserver.cpp
+++ b/Settings/src/SettingEventRequestObserver.cpp
@@ -19,7 +19,7 @@
 #include <AVSCommon/Utils/Logger/Logger.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SettingEventRequestObserver");
+#define TAG "SettingEventRequestObserver"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Settings/src/SettingEventSender.cpp b/Settings/src/SettingEventSender.cpp
index 5fbd68b0a7..e72d891d56 100644
--- a/Settings/src/SettingEventSender.cpp
+++ b/Settings/src/SettingEventSender.cpp
@@ -29,7 +29,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::utils::json;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SettingEventSender");
+#define TAG "SettingEventSender"
 
 /**
  * A timeout for an HTTP response, for cases
diff --git a/Settings/src/SharedAVSSettingProtocol.cpp b/Settings/src/SharedAVSSettingProtocol.cpp
index 3ff0f55c08..20d640252e 100644
--- a/Settings/src/SharedAVSSettingProtocol.cpp
+++ b/Settings/src/SharedAVSSettingProtocol.cpp
@@ -21,7 +21,7 @@
 #include "Settings/SharedAVSSettingProtocol.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SharedAVSSettingProtocol");
+#define TAG "SharedAVSSettingProtocol"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -150,7 +150,7 @@ SetSettingResult SharedAVSSettingProtocol::localChange(
     m_pendingRequest = std::unique_ptr<Request>(new Request(applyChange, revertChange, notifyObservers));
 
     if (executorReady) {
-        m_executor.submit([this]() {
+        m_executor.execute([this]() {
             std::unique_lock<std::mutex> lock(m_requestLock);
             auto request = std::move(m_pendingRequest);
             lock.unlock();
@@ -219,7 +219,7 @@ bool SharedAVSSettingProtocol::avsChange(
     m_pendingRequest = std::unique_ptr<Request>(new Request(applyChange, revertChange, notifyObservers));
 
     if (executorReady) {
-        m_executor.submit([this]() {
+        m_executor.execute([this]() {
             std::unique_lock<std::mutex> lock(m_requestLock);
             auto request = std::move(m_pendingRequest);
             lock.unlock();
@@ -368,7 +368,7 @@ void SharedAVSSettingProtocol::executeSynchronizeOnConnected() {
 
 void SharedAVSSettingProtocol::connectionStatusChangeCallback(bool isConnected) {
     if (isConnected) {
-        m_executor.submit(std::bind(&SharedAVSSettingProtocol::executeSynchronizeOnConnected, this));
+        m_executor.execute(std::bind(&SharedAVSSettingProtocol::executeSynchronizeOnConnected, this));
     }
 }
 
diff --git a/Settings/src/Storage/SQLiteDeviceSettingStorage.cpp b/Settings/src/Storage/SQLiteDeviceSettingStorage.cpp
index 4a7b0c1dec..df255f5685 100644
--- a/Settings/src/Storage/SQLiteDeviceSettingStorage.cpp
+++ b/Settings/src/Storage/SQLiteDeviceSettingStorage.cpp
@@ -24,7 +24,7 @@ namespace storage {
 using namespace avsCommon::utils::configuration;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SQLiteDeviceSettingStorage");
+#define TAG "SQLiteDeviceSettingStorage"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Settings/src/Types/LocaleWakeWordsSetting.cpp b/Settings/src/Types/LocaleWakeWordsSetting.cpp
index f51d835f9c..4ee873789d 100644
--- a/Settings/src/Types/LocaleWakeWordsSetting.cpp
+++ b/Settings/src/Types/LocaleWakeWordsSetting.cpp
@@ -24,7 +24,7 @@
 #include "Settings/Types/LocaleWakeWordsSetting.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("LocaleWakeWordsSetting");
+#define TAG "LocaleWakeWordsSetting"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -253,7 +253,7 @@ SetSettingResult LocaleWakeWordsSetting::setLocales(const DeviceLocales& locales
 
     RequestParameters request{requestType, locales, wakeWordsRequestType, wakeWords};
     m_pendingRequest.reset(new RequestParameters(request));
-    m_executor.submit([this, request] { executeChangeValue(request); });
+    m_executor.execute([this, request] { executeChangeValue(request); });
     return SetSettingResult::ENQUEUED;
 }
 
@@ -309,7 +309,7 @@ SetSettingResult LocaleWakeWordsSetting::setWakeWords(const WakeWords& wakeWords
 
     RequestParameters request{localeRequestType, locales, requestType, wakeWords};
     m_pendingRequest.reset(new RequestParameters(request));
-    m_executor.submit([this, request] { executeChangeValue(request); });
+    m_executor.execute([this, request] { executeChangeValue(request); });
     return SetSettingResult::ENQUEUED;
 }
 
@@ -415,9 +415,9 @@ void LocaleWakeWordsSetting::restoreInitialValue() {
         RequestType wakeWordsRequestType = toRequestType(m_wakeWordsStatus);
         auto pendingRequest = RequestParameters(localeRequestType, locales, wakeWordsRequestType, wakeWords);
         m_pendingRequest.reset(new RequestParameters(pendingRequest));
-        m_executor.submit([this, pendingRequest] { executeChangeValue(pendingRequest); });
+        m_executor.execute([this, pendingRequest] { executeChangeValue(pendingRequest); });
     } else {
-        m_executor.submit([this, locales, wakeWords] {
+        m_executor.execute([this, locales, wakeWords] {
             // Make sure assets manager is correctly initialized.
             if (!m_assetsManager->changeAssets(locales, wakeWords)) {
                 ACSDK_ERROR(LX("restoreInitialValueFailed")
@@ -667,7 +667,7 @@ void LocaleWakeWordsSetting::onConnectionStatusChanged(const Status status, cons
     if (Status::CONNECTED == status) {
         // Create a dummy request that doesn't interrupt any ongoing operation but that respect newer requests.
         RequestParameters request(RequestType::NONE, DeviceLocales(), RequestType::NONE, WakeWords());
-        m_executor.submit([this, request] { synchronize(request); });
+        m_executor.execute([this, request] { synchronize(request); });
     }
 }
 
diff --git a/Settings/src/Types/NetworkInfo.cpp b/Settings/src/Types/NetworkInfo.cpp
index 847dc0f55d..4892934b7e 100644
--- a/Settings/src/Types/NetworkInfo.cpp
+++ b/Settings/src/Types/NetworkInfo.cpp
@@ -34,7 +34,7 @@ namespace settings {
 namespace types {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("NetworkInfo");
+#define TAG "NetworkInfo"
 
 /**
  * Create an error LogEntry using this file's TAG and use "functionNameFailed" as the event string.
diff --git a/Settings/test/SettingEventSenderTest.cpp b/Settings/test/SettingEventSenderTest.cpp
index 63e13ae3b7..33d18165e9 100644
--- a/Settings/test/SettingEventSenderTest.cpp
+++ b/Settings/test/SettingEventSenderTest.cpp
@@ -190,8 +190,8 @@ TEST_F(SettingEventSenderTest, testSlow_blockingSend) {
  * Test retries will give up after N attempts
  */
 TEST_F(SettingEventSenderTest, testSlow_maxRetries) {
-    std::atomic<unsigned long> attempts;
-    unsigned long maxAttempts = RETRY_TABLE.size();
+    std::atomic<std::size_t> attempts;
+    auto maxAttempts = RETRY_TABLE.size();
     PromiseFuturePair<void> retryDone;
 
     attempts = 0;
@@ -213,8 +213,8 @@ TEST_F(SettingEventSenderTest, testSlow_maxRetries) {
  * Test retry on server internal error HTTP response
  */
 TEST_F(SettingEventSenderTest, testSlow_retryOnInternalError) {
-    std::atomic<unsigned long> attempts;
-    unsigned long maxAttempts = RETRY_TABLE.size();
+    std::atomic<std::size_t> attempts;
+    auto maxAttempts = RETRY_TABLE.size();
     PromiseFuturePair<void> retryDone;
 
     attempts = 0;
@@ -236,8 +236,8 @@ TEST_F(SettingEventSenderTest, testSlow_retryOnInternalError) {
  * Test retry on server internal error HTTP response and will stop after success
  */
 TEST_F(SettingEventSenderTest, testSlow_retryStopAfterSuccess) {
-    std::atomic<unsigned long> attempts;
-    unsigned long maxAttempts = RETRY_TABLE.size();
+    std::atomic<std::size_t> attempts;
+    auto maxAttempts = RETRY_TABLE.size();
     PromiseFuturePair<void> retryDone;
 
     attempts = 0;
@@ -271,8 +271,8 @@ TEST_F(SettingEventSenderTest, testSlow_retryStopAfterSuccess) {
  * Test no retry on non-connected HTTP response
  */
 TEST_F(SettingEventSenderTest, testSlow_noRetryOnNonConnected) {
-    std::atomic<unsigned long> attempts;
-    unsigned long maxAttempts = RETRY_TABLE.size();
+    std::atomic<std::size_t> attempts;
+    auto maxAttempts = RETRY_TABLE.size();
     PromiseFuturePair<void> retryDone;
 
     attempts = 0;
@@ -294,8 +294,8 @@ TEST_F(SettingEventSenderTest, testSlow_noRetryOnNonConnected) {
  * Test cancellation of retries
  */
 TEST_F(SettingEventSenderTest, testSlow_cancelRetry) {
-    std::atomic<unsigned long> attempts;
-    unsigned long maxAttempts = RETRY_TABLE.size();
+    std::atomic<std::size_t> attempts;
+    auto maxAttempts = RETRY_TABLE.size();
     PromiseFuturePair<void> retryDone;
 
     attempts = 0;
@@ -324,4 +324,4 @@ TEST_F(SettingEventSenderTest, testSlow_cancelRetry) {
 
 }  // namespace test
 }  // namespace settings
-}  // namespace alexaClientSDK
\ No newline at end of file
+}  // namespace alexaClientSDK
diff --git a/SpeechEncoder/CMakeLists.txt b/SpeechEncoder/CMakeLists.txt
deleted file mode 100644
index c8f91941e8..0000000000
--- a/SpeechEncoder/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-project(SpeechEncoder LANGUAGES CXX)
-
-add_subdirectory("src")
-add_subdirectory("test")
-
-if(OPUS)
-	message(STATUS "OPUS ENCODER ENABLED")
-	add_subdirectory("OpusEncoderContext")
-endif()
diff --git a/SpeechEncoder/OpusEncoderContext/CMakeLists.txt b/SpeechEncoder/OpusEncoderContext/CMakeLists.txt
deleted file mode 100644
index 9e8d67c49c..0000000000
--- a/SpeechEncoder/OpusEncoderContext/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-project(OpusEncoderContext LANGUAGES CXX)
-
-include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
-
-add_subdirectory("src")
diff --git a/SpeechEncoder/OpusEncoderContext/include/SpeechEncoder/OpusEncoderContext.h b/SpeechEncoder/OpusEncoderContext/include/SpeechEncoder/OpusEncoderContext.h
deleted file mode 100644
index 0f4121d886..0000000000
--- a/SpeechEncoder/OpusEncoderContext/include/SpeechEncoder/OpusEncoderContext.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SPEECHENCODER_OPUSENCODERCONTEXT_INCLUDE_SPEECHENCODER_OPUSENCODERCONTEXT_H_
-#define ALEXA_CLIENT_SDK_SPEECHENCODER_OPUSENCODERCONTEXT_INCLUDE_SPEECHENCODER_OPUSENCODERCONTEXT_H_
-
-#include <memory>
-
-#include "SpeechEncoder/EncoderContext.h"
-
-// We don't want to expose OPUS related structure type for user who utilize this class.
-// (And those types are only used in private fields anyway.)
-#ifdef OPUS_H
-// Only an implementation file should know about the actual type.
-#define OPUS_ENCODER OpusEncoder
-#else
-// Otherwise keep it general void pointer, to avoid opus.h dependency.
-#define OPUS_ENCODER void
-#endif
-
-namespace alexaClientSDK {
-namespace speechencoder {
-
-/**
- * @c EncoderContext implemenation using libopus as a backend library
- */
-class OpusEncoderContext : public EncoderContext {
-public:
-    /**
-     * Factory method.
-     *
-     * @return A @c std::shared_ptr to a new @c EncoderContext.
-     */
-    static std::shared_ptr<EncoderContext> createEncoderContext();
-
-    /**
-     * Constructor.
-     */
-    OpusEncoderContext();
-
-    /**
-     * Destructor.
-     */
-    ~OpusEncoderContext();
-
-    /**
-     * Pre-initialization. Will verify given @c AudioFormat if the format is
-     * acceptable. The correct getAudioFormat will available only after this
-     * call is completed successfully.
-     *
-     * @param inputFormat The @c AudioFormat describes the audio format of the
-     * future incoming PCM frames.
-     * @return true when initialization success.
-     */
-    bool init(alexaClientSDK::avsCommon::utils::AudioFormat inputFormat) override;
-
-    /**
-     * The maximum number of sample can be processed at the same time.
-     *
-     * @return The number of sample (in words).
-     */
-    size_t getInputFrameSize() override;
-
-    /**
-     * The maximum length of the single encoded frame.
-     *
-     * @return The maximum output length (in bytes).
-     */
-    size_t getOutputFrameSize() override;
-
-    /**
-     * Returns true when CBR.
-     *
-     * @return true if processSamples should be called with fixed length of
-     * input samples during the session.
-     */
-    bool requiresFullyRead() override;
-
-    /**
-     * The @c AudioFormat describes the encoded audio stream.
-     *
-     * @return The @c AudioFormat describes the encoded audio stream.
-     */
-    alexaClientSDK::avsCommon::utils::AudioFormat getAudioFormat() override;
-
-    /**
-     * The string interpretation of the OPUS format, that AVS cloud service
-     * can recognize.
-     *
-     * @return Output format string.
-     */
-    std::string getAVSFormatName() override;
-
-    /**
-     * This will allocate new libopus encoder state and perform CTL functions.
-     *
-     * @return true when success.
-     */
-    bool start() override;
-
-    /**
-     * Encode next PCM samples.
-     *
-     * @param samples PCM samples to be encoded. The word size should be known
-     * via @c AudioFormat that has provided at pre-init function.
-     * @param numberOfWords The number of samples (in words).
-     * @param buffer The buffer where the encoded frames should be written.
-     * @return The total bytes of encoded frames has been written into buffer.
-     * Negative value when error is occurred.
-     */
-    ssize_t processSamples(void* samples, size_t numberOfWords, uint8_t* buffer) override;
-
-    /**
-     * Destroy current libopus encoder state.
-     */
-    void close() override;
-
-private:
-    /**
-     * Perform @c opus_encoder_ctl() calls.
-     *
-     * @return true when success.
-     */
-    bool configureEncoder();
-
-    /// OPUS encoder handle
-    OPUS_ENCODER* m_encoder = NULL;
-
-    /// @c AudioFormat to describe output format
-    alexaClientSDK::avsCommon::utils::AudioFormat m_outputFormat;
-
-    /// @c AudioFormat to describe input format
-    alexaClientSDK::avsCommon::utils::AudioFormat m_inputFormat;
-};
-
-}  // namespace speechencoder
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SPEECHENCODER_OPUSENCODERCONTEXT_INCLUDE_SPEECHENCODER_OPUSENCODERCONTEXT_H_
\ No newline at end of file
diff --git a/SpeechEncoder/OpusEncoderContext/src/CMakeLists.txt b/SpeechEncoder/OpusEncoderContext/src/CMakeLists.txt
deleted file mode 100644
index 4e470c723c..0000000000
--- a/SpeechEncoder/OpusEncoderContext/src/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-add_definitions("-DACSDK_LOG_MODULE=opusEncoderContext")
-
-add_library(OpusEncoderContext
-OpusEncoderContext.cpp)
-
-find_path(OPUS_INCLUDE_DIR opus)
-find_library(OPUS_LIBRARY opus)
-
-if(NOT OPUS_LIBRARY)
-	message(FATAL_ERROR "Cannot find libopus")
-endif()
-
-target_include_directories(OpusEncoderContext
-	PUBLIC
-		"${SpeechEncoder_SOURCE_DIR}/include"
-		"${OpusEncoderContext_SOURCE_DIR}/include"
-	PRIVATE
-		${OPUS_INCLUDE_DIR}
-)
-
-target_link_libraries(OpusEncoderContext
-	PUBLIC
-		SpeechEncoder
-		AVSCommon
-	PRIVATE
-		${OPUS_LIBRARY}
-)
-
-# install target
-asdk_install()
\ No newline at end of file
diff --git a/SpeechEncoder/OpusEncoderContext/src/OpusEncoderContext.cpp b/SpeechEncoder/OpusEncoderContext/src/OpusEncoderContext.cpp
deleted file mode 100644
index e56ecfe8d0..0000000000
--- a/SpeechEncoder/OpusEncoderContext/src/OpusEncoderContext.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <iostream>
-#include <climits>
-
-#include <opus/opus.h>
-
-#include <AVSCommon/Utils/Endian.h>
-#include <AVSCommon/Utils/Logger/Logger.h>
-
-#include "SpeechEncoder/OpusEncoderContext.h"
-
-namespace alexaClientSDK {
-namespace speechencoder {
-
-using namespace avsCommon;
-using namespace avsCommon::utils;
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("OpusEncoderContext");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// AVS OPUS format name
-static constexpr char AVS_FORMAT[] = "OPUS";
-
-/// Audio sample rate: 16kHz
-static constexpr unsigned int SAMPLE_RATE = 16000;
-
-/// OPUS bitrate: 32kbps CBR
-static constexpr unsigned int BIT_RATE = 32000;
-
-/// OPUS frame length: 20ms
-static constexpr unsigned int FRAME_LENGTH = 20;
-
-/// PCM frame size
-static constexpr unsigned int FRAME_SIZE = (SAMPLE_RATE / 1000) * FRAME_LENGTH;
-
-/// OPUS packet size (CBR)
-static constexpr unsigned int PACKET_SIZE = ((BIT_RATE / CHAR_BIT) / 1000) * FRAME_LENGTH;
-
-/// Maximum packet size
-static constexpr unsigned int MAX_PACKET_SIZE = PACKET_SIZE * 2;
-
-inline uint16_t Reverse16(uint16_t value) {
-    return (((value & 0x00FF) << 8) | ((value & 0xFF00) >> 8));
-}
-
-std::shared_ptr<EncoderContext> OpusEncoderContext::createEncoderContext() {
-    return std::make_shared<OpusEncoderContext>();
-}
-
-OpusEncoderContext::~OpusEncoderContext() {
-    close();
-}
-
-bool OpusEncoderContext::init(AudioFormat inputFormat) {
-    m_inputFormat = inputFormat;
-
-    if (inputFormat.sampleRateHz != SAMPLE_RATE) {
-        ACSDK_ERROR(LX("initFailed").d("reason", "Input sampling rate is invalid"));
-        return false;
-    }
-    if (inputFormat.encoding != AudioFormat::Encoding::LPCM) {
-        ACSDK_ERROR(LX("initFailed").d("reason", "Input audio format must be LPCM"));
-        return false;
-    }
-    if (inputFormat.numChannels == 2 && inputFormat.layout != AudioFormat::Layout::INTERLEAVED) {
-        // Error, only interleaved frames are supported for 2 channel
-        ACSDK_ERROR(LX("initFailed").d("reason", "Input audio format must be interleaved"));
-        return false;
-    }
-
-    m_outputFormat.numChannels = inputFormat.numChannels;
-    return true;
-}
-
-size_t OpusEncoderContext::getInputFrameSize() {
-    return FRAME_SIZE;
-}
-
-size_t OpusEncoderContext::getOutputFrameSize() {
-    return PACKET_SIZE;
-}
-
-bool OpusEncoderContext::requiresFullyRead() {
-    return true;
-}
-
-AudioFormat OpusEncoderContext::getAudioFormat() {
-    return m_outputFormat;
-}
-
-std::string OpusEncoderContext::getAVSFormatName() {
-    return AVS_FORMAT;
-}
-
-bool OpusEncoderContext::configureEncoder() {
-    int err;
-
-    // Use 32k bit rate
-    err = opus_encoder_ctl(m_encoder, OPUS_SET_BITRATE(BIT_RATE));
-    if (err != OPUS_OK) {
-        ACSDK_ERROR(LX("startFailed").d("reason", "Failed to set bitrate to 32kbps").d("err", err));
-        return false;
-    }
-
-    // CBR Only
-    err = opus_encoder_ctl(m_encoder, OPUS_SET_VBR(0));
-    if (err != OPUS_OK) {
-        ACSDK_ERROR(LX("startFailed").d("reason", "Failed to set hard-CBR").d("err", err));
-        return false;
-    }
-
-    // 20ms framesize
-    err = opus_encoder_ctl(m_encoder, OPUS_SET_EXPERT_FRAME_DURATION(OPUS_FRAMESIZE_20_MS));
-    if (err != OPUS_OK) {
-        ACSDK_ERROR(LX("startFailed").d("reason", "Failed to set frame size to 20ms").d("err", err));
-        return false;
-    }
-
-    return true;
-}
-
-bool OpusEncoderContext::start() {
-    int err;
-
-    if (m_encoder) {
-        ACSDK_ERROR(LX("startFailed").d("reason", "OpusEncoder is not null"));
-        return false;
-    }
-
-    m_encoder = opus_encoder_create(m_inputFormat.sampleRateHz, m_inputFormat.numChannels, OPUS_APPLICATION_VOIP, &err);
-
-    if (err != OPUS_OK) {
-        ACSDK_ERROR(LX("startFailed").d("reason", "Failed to create OpusEncoder").d("err", err));
-        return false;
-    }
-
-    if (!m_encoder) {
-        ACSDK_ERROR(LX("startFailed").d("reason", "OpusEncoder is null"));
-        return false;
-    }
-
-    if (!configureEncoder()) {
-        // Destroy previously created encoder
-        opus_encoder_destroy(m_encoder);
-        return false;
-    }
-
-    return true;
-}
-
-ssize_t OpusEncoderContext::processSamples(void* samples, size_t numberOfWords, uint8_t* buffer) {
-    uint16_t* in = static_cast<uint16_t*>(samples);
-    opus_int16 pcm[FRAME_SIZE];
-
-    for (unsigned int i = 0; i < numberOfWords; i++) {
-        if (m_inputFormat.endianness == AudioFormat::Endianness::LITTLE) {
-            pcm[i] = littleEndianMachine() ? in[i] : Reverse16(in[i]);
-        } else {
-            pcm[i] = littleEndianMachine() ? Reverse16(in[i]) : in[i];
-        }
-    }
-
-    return opus_encode(m_encoder, pcm, numberOfWords, buffer, MAX_PACKET_SIZE);
-}
-
-void OpusEncoderContext::close() {
-    if (m_encoder) {
-        opus_encoder_destroy(m_encoder);
-        m_encoder = NULL;
-    }
-}
-
-OpusEncoderContext::OpusEncoderContext() :
-        m_outputFormat{
-            AudioFormat::Encoding::OPUS,
-            AudioFormat::Endianness::LITTLE,
-            SAMPLE_RATE,
-            16,
-            0,
-            false,
-            AudioFormat::Layout::INTERLEAVED,
-        } {
-}
-
-}  // namespace speechencoder
-}  // namespace alexaClientSDK
diff --git a/SpeechEncoder/include/SpeechEncoder/EncoderContext.h b/SpeechEncoder/include/SpeechEncoder/EncoderContext.h
deleted file mode 100644
index 87ccac2779..0000000000
--- a/SpeechEncoder/include/SpeechEncoder/EncoderContext.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SPEECHENCODER_INCLUDE_SPEECHENCODER_ENCODERCONTEXT_H_
-#define ALEXA_CLIENT_SDK_SPEECHENCODER_INCLUDE_SPEECHENCODER_ENCODERCONTEXT_H_
-
-#include <memory>
-
-#include <AVSCommon/Utils/AudioFormat.h>
-
-namespace alexaClientSDK {
-namespace speechencoder {
-
-/**
- * Interface class between @c SpeechEncoder and the backend codec library. This
- * class must be implemented by customer for each encoder codecs.
- */
-class EncoderContext {
-public:
-    /**
-     * Pre-initialization before actual encoding session has began. Note that
-     * this function will be called everytime before new encoding session is
-     * starting.
-     *
-     * @param inputFormat The @c AudioFormat describes the audio format of the
-     * future incoming PCM frames.
-     * @return true when initialization success.
-     */
-    virtual bool init(alexaClientSDK::avsCommon::utils::AudioFormat inputFormat) = 0;
-
-    /**
-     * The maximum number of sample can be processed at the same time. In
-     * other words, this will limits input PCM stream buffering. Thus
-     * nWords of processSamples call will never exceeds this limit.
-     *
-     * @return The number of sample (in words).
-     */
-    virtual size_t getInputFrameSize() = 0;
-
-    /**
-     * The maximum length of the single encoded frame.
-     *
-     * @return The maximum output length (in bytes).
-     */
-    virtual size_t getOutputFrameSize() = 0;
-
-    /**
-     * Determine whether PCM stream should be fully buffered with the maximum
-     * number of samples provided at getInputFrameSize function. This value
-     * will change the behavior of how processSamples is called during the
-     * encoding session. This is useful when backend encoder requires fixed
-     * length of input samples.
-     *
-     * In case the encoding session has been shutdown before the buffere is
-     * filled fully, this will cause any partial data to be discarded. (e.g.
-     * stopEncoding has been called, or reaches the end of the data stream.)
-     *
-     * @return true if processSamples should be called with fixed length of
-     * input samples during the session.
-     */
-    virtual bool requiresFullyRead() = 0;
-
-    /**
-     * The @c AudioFormat describes the encoded audio stream.
-     *
-     * @return The @c AudioFormat describes the encoded audio stream.
-     */
-    virtual alexaClientSDK::avsCommon::utils::AudioFormat getAudioFormat() = 0;
-
-    /**
-     * The string interpretation of the output format, that AVS cloud service
-     * can recognize.
-     *
-     * @return Output format string.
-     */
-    virtual std::string getAVSFormatName() = 0;
-
-    /**
-     * When an encoding session has began, this function start will be called.
-     * The backend library then may be initialized for begin encoding.
-     *
-     * @return true when success.
-     */
-    virtual bool start() = 0;
-
-    /**
-     * Encode next PCM samples. This function will be called continuously
-     * throughout the session.
-     *
-     * @param samples PCM samples to be encoded. The word size should be known
-     * via @c AudioFormat that has provided at pre-init function.
-     * @param numberOfWords The number of samples (in words).
-     * @param buffer The buffer where the encoded frames should be written.
-     * @return The total bytes of encoded frames has been written into buffer.
-     * Negative value when error is occurred.
-     */
-    virtual ssize_t processSamples(void* samples, size_t numberOfWords, uint8_t* buffer) = 0;
-
-    /**
-     * Notify end of the session. Any backend library then may be
-     * deinitialized so it cleans memory and threads.
-     */
-    virtual void close() = 0;
-
-    /**
-     * Destructor.
-     */
-    virtual ~EncoderContext() = default;
-};
-
-}  // namespace speechencoder
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SPEECHENCODER_INCLUDE_SPEECHENCODER_ENCODERCONTEXT_H_
\ No newline at end of file
diff --git a/SpeechEncoder/include/SpeechEncoder/SpeechEncoder.h b/SpeechEncoder/include/SpeechEncoder/SpeechEncoder.h
deleted file mode 100644
index af0d68c395..0000000000
--- a/SpeechEncoder/include/SpeechEncoder/SpeechEncoder.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ALEXA_CLIENT_SDK_SPEECHENCODER_INCLUDE_SPEECHENCODER_SPEECHENCODER_H_
-#define ALEXA_CLIENT_SDK_SPEECHENCODER_INCLUDE_SPEECHENCODER_SPEECHENCODER_H_
-
-#include <atomic>
-#include <memory>
-#include <thread>
-
-#include <AVSCommon/AVS/AudioInputStream.h>
-#include <AVSCommon/Utils/AudioFormat.h>
-#include <AVSCommon/Utils/Threading/Executor.h>
-
-#include "EncoderContext.h"
-
-namespace alexaClientSDK {
-namespace speechencoder {
-
-/**
- * This class provides generic interface between backend encoder implementation
- * and the application who wants to encode audio stream within
- * @c AudioInputStream
- */
-class SpeechEncoder {
-public:
-    /**
-     * Factory method.
-     *
-     * @param encoder The backend encoder implmentation.
-     */
-    static std::shared_ptr<SpeechEncoder> createSpeechEncoder(const std::shared_ptr<EncoderContext>& encoder);
-
-    /**
-     * Constructor.
-     *
-     * @param encoder The backend encoder implmentation.
-     */
-    SpeechEncoder(const std::shared_ptr<EncoderContext>& encoder);
-
-    /**
-     * Destructor.
-     */
-    ~SpeechEncoder();
-
-    /**
-     * Start the new encoding session. @c SpeechEncoder can manage only single
-     * session at the same time, thus this call will be failed when ongoing
-     * encoding session exists, or pre-initialization on @c EncoderContext is
-     * failed.
-     *
-     * @param inputStream The @c AudioInputStream to stream audio from. (i.e.
-     * input stream that has raw PCM frames.)
-     * @param inputFormat The @c AudioFormat to describe the audio format of
-     * the input stream.
-     * @param begin The index where encoding should begin.
-     * @param reference The reference for the index.
-     * @return true if encoding session has been started successfully,
-     * otherwise false.
-     */
-    bool startEncoding(
-        const std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream>& inputStream,
-        alexaClientSDK::avsCommon::utils::AudioFormat inputFormat,
-        avsCommon::avs::AudioInputStream::Index begin,
-        avsCommon::avs::AudioInputStream::Reader::Reference reference);
-
-    /**
-     * Stop current encoding session.
-     *
-     * @param stopImmediately Flag indicating that encoding should stop immediatly.
-     * If this flag is set to @c false (the default), encoding will continue until
-     * any existing data in the buffer has been encoded. If this flag is set to
-     * @c true, existing data in the buffer which has not already been encoded will
-     * be discarded, and encoding will stop immediately.
-     */
-    void stopEncoding(bool stopImmediately = false);
-
-    /**
-     * Retrieve @c AudioInputStream for encoding results.
-     *
-     * @return @c AudioInputStream for streaming encoding results for further
-     * processing.
-     */
-    std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream> getEncodedStream();
-
-    /**
-     * Retrieve a @c EncoderContext that was given with initialization.
-     *
-     * @return @c EncoderContext
-     */
-    std::shared_ptr<EncoderContext> getContext();
-
-private:
-    /**
-     * Thread loop
-     */
-    void encodeLoop(
-        avsCommon::avs::AudioInputStream::Index begin,
-        avsCommon::avs::AudioInputStream::Reader::Reference reference);
-
-    /// Backend implementation
-    std::shared_ptr<EncoderContext> m_encoder;
-
-    /// Input AudioFormat (PCM)
-    alexaClientSDK::avsCommon::utils::AudioFormat m_inputAudioFormat;
-
-    /// Input AudioInputStream (i.e. PCM frames)
-    std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream> m_inputStream;
-
-    /// AudioFormat initialized from EncoderContext
-    alexaClientSDK::avsCommon::utils::AudioFormat m_outputAudioFormat;
-
-    /// Maximum single encoded frame size (byte) initialized from EncoderContext
-    size_t m_maxFrameSize;
-
-    /// AudioInputStream for streaming results
-    std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream> m_encodedStream;
-
-    /// true when the current session is active
-    std::atomic<bool> m_isEncoding;
-
-    /// true when stopEncoding has been called with stopImmediately=false
-    std::atomic<bool> m_stopRequested;
-
-    /// Internal Executor for managing encoding thread
-    avsCommon::utils::threading::Executor m_executor;
-
-    /// Mutex for thread safety
-    std::mutex m_mutex;
-};
-
-}  // namespace speechencoder
-}  // namespace alexaClientSDK
-
-#endif  // ALEXA_CLIENT_SDK_SPEECHENCODER_INCLUDE_SPEECHENCODER_SPEECHENCODER_H_
diff --git a/SpeechEncoder/src/CMakeLists.txt b/SpeechEncoder/src/CMakeLists.txt
deleted file mode 100644
index e1131104d7..0000000000
--- a/SpeechEncoder/src/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-add_definitions("-DACSDK_LOG_MODULE=speechEncoder")
-
-add_library(SpeechEncoder
-	SpeechEncoder.cpp
-)
-
-target_include_directories(SpeechEncoder
-	PUBLIC
-		"${SpeechEncoder_SOURCE_DIR}/include"
-)
-
-target_link_libraries(SpeechEncoder
-	PUBLIC
-		AVSCommon
-)
-
-# install target
-asdk_install()
\ No newline at end of file
diff --git a/SpeechEncoder/src/SpeechEncoder.cpp b/SpeechEncoder/src/SpeechEncoder.cpp
deleted file mode 100644
index 734dea5769..0000000000
--- a/SpeechEncoder/src/SpeechEncoder.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <iostream>
-#include <climits>
-#include <fstream>
-
-#include <AVSCommon/Utils/Logger/Logger.h>
-
-#include "SpeechEncoder/SpeechEncoder.h"
-
-namespace alexaClientSDK {
-namespace speechencoder {
-
-using namespace avsCommon;
-using namespace avsCommon::avs;
-using namespace avsCommon::utils;
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("SpeechEncoder");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// The maximum number of readers of the output stream.
-static constexpr unsigned int MAX_READERS = 10;
-
-/// Reading timeout from input audio stream.
-static constexpr unsigned int READ_TIMEOUT_MS = 10;
-
-/// Timeout between write retrying.
-static const auto WRITE_TIMEOUT_MS = std::chrono::milliseconds(100);
-
-/// The maximum number of packets to be buffered to the output stream.
-static constexpr unsigned int MAX_OUTPUT_PACKETS = 20;
-
-std::shared_ptr<SpeechEncoder> SpeechEncoder::createSpeechEncoder(const std::shared_ptr<EncoderContext>& encoder) {
-    return std::make_shared<speechencoder::SpeechEncoder>(encoder);
-}
-
-SpeechEncoder::SpeechEncoder(const std::shared_ptr<EncoderContext>& encoder) :
-        m_encoder{encoder},
-        m_isEncoding{false},
-        m_stopRequested{false} {
-}
-
-SpeechEncoder::~SpeechEncoder() {
-    stopEncoding(true);
-    m_executor.shutdown();
-}
-
-bool SpeechEncoder::startEncoding(
-    const std::shared_ptr<AudioInputStream>& inputStream,
-    AudioFormat inputFormat,
-    AudioInputStream::Index begin,
-    AudioInputStream::Reader::Reference reference) {
-    std::lock_guard<std::mutex> lock(m_mutex);
-
-    if (m_isEncoding) {
-        ACSDK_ERROR(LX("startEncodingFailed").d("reason", "Encoding in progress"));
-        return false;
-    }
-
-    if (!m_encoder->init(inputFormat)) {
-        ACSDK_ERROR(LX("startEncodingFailed").d("reason", "Encoder init failed"));
-        return false;
-    }
-
-    m_inputStream = inputStream;
-    m_inputAudioFormat = inputFormat;
-    m_maxFrameSize = m_encoder->getInputFrameSize();
-    m_outputAudioFormat = m_encoder->getAudioFormat();
-
-    unsigned int wordSize = m_outputAudioFormat.sampleSizeInBits / CHAR_BIT;
-
-    // Setup Writer for the destination stream
-    size_t size = AudioInputStream::calculateBufferSize(
-        m_encoder->getOutputFrameSize() * MAX_OUTPUT_PACKETS, wordSize, MAX_READERS);
-    auto buffer = std::make_shared<AudioInputStream::Buffer>(size);
-    m_encodedStream = AudioInputStream::create(buffer, wordSize, MAX_READERS);
-    if (!m_encodedStream) {
-        ACSDK_ERROR(LX("startEncodingFailed").d("reason", "AudioInputStream creation failed"));
-        return false;
-    }
-
-    ACSDK_DEBUG0(LX("startEncoding").d("begin", begin));
-    m_isEncoding = true;
-    m_stopRequested = false;
-    m_executor.submit([this, begin, reference]() { encodeLoop(begin, reference); });
-
-    return true;
-}
-
-void SpeechEncoder::stopEncoding(bool stopImmediately) {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    ACSDK_DEBUG0(LX("stopEncoding").d("stopImmediately", stopImmediately));
-    if (stopImmediately) {
-        m_isEncoding = false;
-    } else {
-        // Stop after all frames are encoded
-        m_stopRequested = true;
-    }
-    m_executor.waitForSubmittedTasks();
-}
-
-std::shared_ptr<AudioInputStream> SpeechEncoder::getEncodedStream() {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    return m_encodedStream;
-}
-
-std::shared_ptr<EncoderContext> SpeechEncoder::getContext() {
-    return m_encoder;
-}
-
-void SpeechEncoder::encodeLoop(AudioInputStream::Index begin, AudioInputStream::Reader::Reference reference) {
-    bool done = false;
-    bool readsFull = m_encoder->requiresFullyRead();
-
-    std::shared_ptr<AudioInputStream::Reader> reader =
-        m_inputStream->createReader(AudioInputStream::Reader::Policy::BLOCKING);
-    size_t wordSize = reader->getWordSize();
-
-    reader->seek(begin, reference);
-
-    size_t currentRead = 0;
-    std::vector<uint8_t> readBuf(m_maxFrameSize * wordSize);
-    std::vector<uint8_t> writeBuf(m_encoder->getOutputFrameSize());
-
-    m_encoder->start();
-    std::shared_ptr<AudioInputStream::Writer> writer =
-        m_encodedStream->createWriter(AudioInputStream::Writer::Policy::BLOCKING);
-    do {
-        // May block here
-        auto readResult = reader->read(
-            readBuf.data() + (currentRead * wordSize),
-            m_maxFrameSize - currentRead,
-            std::chrono::milliseconds(READ_TIMEOUT_MS));
-        if (readResult > 0) {
-            currentRead += readResult;
-            if (readsFull && (currentRead < m_maxFrameSize)) {
-                continue;
-            }
-            auto processResult = m_encoder->processSamples(readBuf.data(), currentRead, writeBuf.data());
-            if (processResult < 0) {
-                ACSDK_ERROR(LX("encodeLoopFailed").d("reason", "processSamplesFailed").d("error", processResult));
-                done = true;
-            } else {
-                ssize_t writeResult = AudioInputStream::Writer::Error::INVALID;
-                ssize_t totalWordsToSend = processResult / wordSize;
-                ssize_t wordsSent = 0;
-                unsigned int writeBufIndex = 0;
-
-                // This loop will push the encoded samples to the output stream.
-                while (!m_stopRequested && m_isEncoding) {
-                    writeResult =
-                        writer->write(writeBuf.data() + writeBufIndex, totalWordsToSend - wordsSent, WRITE_TIMEOUT_MS);
-
-                    if (writeResult > 0) {
-                        // Some words were sent, update the counters.
-                        wordsSent += writeResult;
-                        writeBufIndex += writeResult * wordSize;
-
-                        if (wordsSent == totalWordsToSend) {
-                            // We are done sending everything.
-                            break;
-                        }
-
-                        // Sanity check.
-                        if (writeBufIndex > writeBuf.size()) {
-                            ACSDK_ERROR(LX("encodeLoopFailed").d("reason", "bufferOverRun"));
-                            done = true;
-                            break;
-                        }
-
-                        // There's still something to send
-
-                    } else {
-                        switch (writeResult) {
-                            case AudioInputStream::Writer::Error::WOULDBLOCK:
-                                // Should never happen.
-                                ACSDK_ERROR(
-                                    LX("encodeLoopFailed").d("reason", "WOULDBLOCK error while writing to stream"));
-                                break;
-                            case AudioInputStream::Writer::Error::INVALID:
-                                ACSDK_ERROR(
-                                    LX("encodeLoopFailed").d("reason", "INVALID error while writing to stream"));
-                                break;
-                            case AudioInputStream::Writer::Error::TIMEDOUT:
-                                ACSDK_DEBUG9(LX("Timeout occurred while writing to stream"));
-                                continue;
-                            case AudioInputStream::Writer::Error::CLOSED:
-                                ACSDK_DEBUG7(LX("streamClosed"));
-                                break;
-                            default:
-                                ACSDK_DEBUG9(LX("unknownError").d("unknownError", writeResult));
-                                break;
-                        }
-                        done = true;
-                        break;
-                    }
-                }
-            }
-            currentRead = 0;
-        } else {
-            switch (readResult) {
-                case AudioInputStream::Reader::Error::OVERRUN:
-                case AudioInputStream::Reader::Error::INVALID:
-                    ACSDK_ERROR(LX("encodeLoopFailed").d("reason", "readerError").d("error", readResult));
-                case AudioInputStream::Reader::Error::CLOSED:
-                    done = true;
-                    break;
-                case AudioInputStream::Reader::Error::WOULDBLOCK:
-                case AudioInputStream::Reader::Error::TIMEDOUT:
-                    // Ignore
-                    break;
-            }
-        }
-        if (m_stopRequested) {
-            // Reader will close after reads all data within buffer
-            reader->close(0, AudioInputStream::Reader::Reference::BEFORE_WRITER);
-            m_stopRequested = false;
-        }
-    } while (!done && m_isEncoding);
-    writer->close();
-    m_encoder->close();
-    reader->close();
-
-    m_isEncoding = false;
-}
-
-}  // namespace speechencoder
-}  // namespace alexaClientSDK
diff --git a/SpeechEncoder/test/CMakeLists.txt b/SpeechEncoder/test/CMakeLists.txt
deleted file mode 100644
index 07fa617657..0000000000
--- a/SpeechEncoder/test/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-discover_unit_tests("${SpeechEncoder_SOURCE_DIR}/include" SpeechEncoder)
\ No newline at end of file
diff --git a/SpeechEncoder/test/SpeechEncoderTest.cpp b/SpeechEncoder/test/SpeechEncoderTest.cpp
deleted file mode 100644
index 360ac864ca..0000000000
--- a/SpeechEncoder/test/SpeechEncoderTest.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <chrono>
-#include <thread>
-
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
-#include <AVSCommon/AVS/Attachment/InProcessAttachment.h>
-#include <AVSCommon/AVS/AudioInputStream.h>
-#include <AVSCommon/Utils/AudioFormat.h>
-#include <AVSCommon/Utils/PromiseFuturePair.h>
-
-#include "SpeechEncoder/SpeechEncoder.h"
-
-namespace alexaClientSDK {
-namespace speechencoder {
-namespace test {
-
-using namespace avsCommon;
-using namespace avsCommon::avs;
-using namespace avsCommon::utils;
-
-/// Word size per PCM frame = 2byte (16bit)
-static constexpr size_t FRAME_WORDSIZE = 2;
-
-/// Number of dummy frames that will be sent to encoder.
-static constexpr int NUM_AUDIO_WRITE = 100;
-
-/// Input frame size for mock encoder. Will accept 2 frames. (2 * 2byte = 4)
-static constexpr size_t MOCK_ENCODER_INPUT_FRAME_SIZE = 4;
-
-/// Output frame size for mock encoder. Will output 2 frames per encode. (2 * 2byte = 4)
-static constexpr size_t MOCK_ENCODER_OUTPUT_FRAME_SIZE = 4;
-
-/// Number of words in input stream SDS buffer (must be large enough to fill encoder's output stream)
-static constexpr size_t INPUT_WORD_COUNT = 4096;
-
-/// Short timeout (needs to be greater than @c SpeechEncoder's BLOCKING writer timeout).
-static auto PROCESSING_TIMEOUT = std::chrono::milliseconds(200);
-
-/// The maximum factor of compression we expect to encounter.
-static constexpr unsigned int MAX_COMPRESSION_FACTOR = 10;
-
-/// Output format for mock encoder.
-static const AudioFormat MOCK_ENCODER_FORMAT = {
-    AudioFormat::Encoding::LPCM,
-    AudioFormat::Endianness::LITTLE,
-    16000,
-    FRAME_WORDSIZE* CHAR_BIT,
-    1,
-    false,
-    AudioFormat::Layout::INTERLEAVED,
-};
-
-using ::testing::Return;
-using namespace ::testing;
-
-/**
- * A mock encoder backend implementation that inherits from @c EncoderContext.
- */
-class MockEncoderContext : public EncoderContext {
-public:
-    MOCK_METHOD1(init, bool(alexaClientSDK::avsCommon::utils::AudioFormat inputFormat));
-    MOCK_METHOD0(getInputFrameSize, size_t());
-    MOCK_METHOD0(getOutputFrameSize, size_t());
-    MOCK_METHOD0(requiresFullyRead, bool());
-    MOCK_METHOD0(getAudioFormat, AudioFormat());
-    MOCK_METHOD0(getAVSFormatName, std::string());
-
-    MOCK_METHOD0(start, bool());
-    MOCK_METHOD3(processSamples, ssize_t(void* samples, size_t nWords, uint8_t* buffer));
-    MOCK_METHOD0(close, void());
-};
-
-class SpeechEncoderTest : public ::testing::Test {
-protected:
-    /// The SpeechEncoder to test.
-    std::shared_ptr<SpeechEncoder> m_encoder;
-
-    /// The mock @c EncoderContext.
-    std::shared_ptr<MockEncoderContext> m_encoderCtx;
-
-    /**
-     * Set up the test harness for running a test.
-     */
-    virtual void SetUp() {
-        m_encoderCtx = std::make_shared<MockEncoderContext>();
-        m_encoder = std::make_shared<SpeechEncoder>(m_encoderCtx);
-
-        EXPECT_CALL(*m_encoderCtx, getInputFrameSize()).WillRepeatedly(Return(MOCK_ENCODER_INPUT_FRAME_SIZE));
-        EXPECT_CALL(*m_encoderCtx, getAudioFormat()).WillRepeatedly(Return(MOCK_ENCODER_FORMAT));
-        EXPECT_CALL(*m_encoderCtx, getOutputFrameSize()).WillRepeatedly(Return(MOCK_ENCODER_OUTPUT_FRAME_SIZE));
-    }
-};
-
-/*
- * Test to verify if SpeechEncoder::startEncoding properly call backend implementation.
- * This test will feed a dummy PCM stream into SpeechEncoder, then test the behavior with
- * the mock @c EncoderContext.
- */
-TEST_F(SpeechEncoderTest, testTimer_startEncoding) {
-    AudioFormat audioFormat = {AudioFormat::Encoding::LPCM,
-                               AudioFormat::Endianness::LITTLE,
-                               16000,
-                               FRAME_WORDSIZE * CHAR_BIT,
-                               1,
-                               false,
-                               AudioFormat::Layout::INTERLEAVED};
-    auto buffer = std::make_shared<AudioInputStream::Buffer>(4000);
-    std::shared_ptr<AudioInputStream> inputStream = AudioInputStream::create(buffer, FRAME_WORDSIZE, 1);
-    ASSERT_TRUE(inputStream);
-
-    // EncoderContext::init should be called once.
-    EXPECT_CALL(*m_encoderCtx, init(_)).Times(1).WillOnce(Return(true));
-
-    // Mock encoder requires fully read.
-    EXPECT_CALL(*m_encoderCtx, requiresFullyRead()).WillRepeatedly(Return(true));
-
-    // EncoderContext::start should be called once.
-    EXPECT_CALL(*m_encoderCtx, start()).Times(1).WillOnce(Return(true));
-
-    // EncoderContext::close should be called once.
-    EXPECT_CALL(*m_encoderCtx, close()).Times(1);
-
-    // Start the encoder.
-    m_encoder->startEncoding(inputStream, audioFormat, 0, AudioInputStream::Reader::Reference::ABSOLUTE);
-
-    // EncoderContext::processSamples should be called with MOCK_ENCODER_INPUT_FRAME_SIZE size.
-    EXPECT_CALL(*m_encoderCtx, processSamples(_, MOCK_ENCODER_INPUT_FRAME_SIZE, _))
-        .Times(NUM_AUDIO_WRITE / MOCK_ENCODER_INPUT_FRAME_SIZE)
-        .WillRepeatedly(Return(MOCK_ENCODER_OUTPUT_FRAME_SIZE));
-
-    // Begin feeding dummy(empty) PCM frames into SDS.
-    std::shared_ptr<AudioInputStream::Writer> writer =
-        inputStream->createWriter(AudioInputStream::Writer::Policy::BLOCKING);
-    uint8_t dummy[FRAME_WORDSIZE] = {0, 0};
-    for (int i = 0; i < NUM_AUDIO_WRITE; i++) {
-        writer->write(&dummy, 1);
-    }
-
-    // Let encoder thread to process...
-    std::this_thread::sleep_for(std::chrono::milliseconds(10));
-}
-
-/**
- * Test if encoding thread will exit if encoder output is not being consumed on exit.
- */
-TEST_F(SpeechEncoderTest, test_shutdownOnBlockingWrite) {
-    AudioFormat audioFormat = {
-        AudioFormat::Encoding::LPCM,
-        AudioFormat::Endianness::LITTLE,
-        16000,
-        FRAME_WORDSIZE * CHAR_BIT,
-        1,
-        false,
-        AudioFormat::Layout::INTERLEAVED,
-    };
-
-    auto inputBufferSize = AudioInputStream::calculateBufferSize(INPUT_WORD_COUNT, FRAME_WORDSIZE, 1);
-    auto buffer = std::make_shared<AudioInputStream::Buffer>(inputBufferSize);
-    std::shared_ptr<AudioInputStream> inputStream = AudioInputStream::create(buffer, FRAME_WORDSIZE, 1);
-    ASSERT_TRUE(inputStream);
-
-    // EncoderContext::init should be called once.
-    EXPECT_CALL(*m_encoderCtx, init(_)).Times(1).WillOnce(Return(true));
-
-    // Mock encoder requires fully read.
-    EXPECT_CALL(*m_encoderCtx, requiresFullyRead()).WillRepeatedly(Return(true));
-
-    // EncoderContext::start should be called once.
-    EXPECT_CALL(*m_encoderCtx, start()).Times(1).WillOnce(Return(true));
-
-    // EncoderContext::close should be called once.
-    EXPECT_CALL(*m_encoderCtx, close()).Times(1);
-
-    // EncoderContext::processSamples should be called with MOCK_ENCODER_INPUT_FRAME_SIZE size.
-    EXPECT_CALL(*m_encoderCtx, processSamples(_, MOCK_ENCODER_INPUT_FRAME_SIZE, _))
-        .WillRepeatedly(Return(MOCK_ENCODER_OUTPUT_FRAME_SIZE));
-
-    // Start the encoder.
-    m_encoder->startEncoding(inputStream, audioFormat, 0, AudioInputStream::Reader::Reference::ABSOLUTE);
-
-    // Get the encoded stream to find the size of the buffer that the speech encoder writes to.
-    auto encodedStream = m_encoder->getEncodedStream();
-    ASSERT_TRUE(encodedStream);
-    // If this test fails, INPUT_WORD_COUNT should be increased.
-    ASSERT_GE(INPUT_WORD_COUNT, encodedStream->getDataSize() * MAX_COMPRESSION_FACTOR);
-
-    // Fill input buffer with dummy PCM data
-    std::shared_ptr<AudioInputStream::Writer> writer =
-        inputStream->createWriter(AudioInputStream::Writer::Policy::BLOCKING);
-    uint8_t dummy[FRAME_WORDSIZE];
-
-    for (size_t i = 0; i < FRAME_WORDSIZE; i++) {
-        dummy[i] = 0;
-    }
-
-    for (size_t wordsWritten = 0; wordsWritten < INPUT_WORD_COUNT; wordsWritten++) {
-        writer->write(dummy, 1);
-    }
-
-    // Let encoder thread process as much input data as it can.
-    std::this_thread::sleep_for(PROCESSING_TIMEOUT);
-
-    // At this point, speech encoder loop should be experiencing timeout and will keep on retrying.
-
-    // Simulate a shutdown.
-    m_encoder.reset();
-}
-
-/**
- * Test if encoding thread will exit and create again when stopEncoding() and startEncoding() is called in quick
- * succession.
- */
-TEST_F(SpeechEncoderTest, test_stopAndStartEncoder) {
-    const AudioFormat audioFormat = {
-        AudioFormat::Encoding::LPCM,
-        AudioFormat::Endianness::LITTLE,
-        16000,
-        FRAME_WORDSIZE * CHAR_BIT,
-        1,
-        false,
-        AudioFormat::Layout::INTERLEAVED,
-    };
-
-    // number of start and stop encoding to run
-    const int numRunOfTest = 10;
-
-    auto inputBufferSize = AudioInputStream::calculateBufferSize(INPUT_WORD_COUNT, FRAME_WORDSIZE, 1);
-    auto buffer = std::make_shared<AudioInputStream::Buffer>(inputBufferSize);
-    std::shared_ptr<AudioInputStream> inputStream = AudioInputStream::create(buffer, FRAME_WORDSIZE, 1);
-    ASSERT_TRUE(inputStream);
-
-    // EncoderContext::init should be called numRunOfTest times
-    EXPECT_CALL(*m_encoderCtx, init(_)).Times(numRunOfTest).WillRepeatedly(Return(true));
-
-    // Mock encoder requires fully read.
-    EXPECT_CALL(*m_encoderCtx, requiresFullyRead()).WillRepeatedly(Return(true));
-
-    // EncoderContext::start should be called numRunOfTest times.
-    EXPECT_CALL(*m_encoderCtx, start()).Times(numRunOfTest).WillRepeatedly(Return(true));
-
-    // EncoderContext::close should be called numRunOfTest times.
-    EXPECT_CALL(*m_encoderCtx, close()).Times(numRunOfTest);
-
-    // EncoderContext::processSamples should be called with MOCK_ENCODER_INPUT_FRAME_SIZE size.
-    EXPECT_CALL(*m_encoderCtx, processSamples(_, MOCK_ENCODER_INPUT_FRAME_SIZE, _))
-        .WillRepeatedly(Return(MOCK_ENCODER_OUTPUT_FRAME_SIZE));
-
-    for (auto i = 0; i < numRunOfTest; ++i) {
-        // Start the encoder.
-        m_encoder->startEncoding(inputStream, audioFormat, 0, AudioInputStream::Reader::Reference::ABSOLUTE);
-
-        // Stop the encoder
-        m_encoder->stopEncoding(true);
-    }
-}
-
-}  // namespace test
-}  // namespace speechencoder
-}  // namespace alexaClientSDK
diff --git a/Storage/SQLiteStorage/src/SQLiteDatabase.cpp b/Storage/SQLiteStorage/src/SQLiteDatabase.cpp
index db9335ad78..dccb3e589c 100644
--- a/Storage/SQLiteStorage/src/SQLiteDatabase.cpp
+++ b/Storage/SQLiteStorage/src/SQLiteDatabase.cpp
@@ -25,7 +25,7 @@ namespace storage {
 namespace sqliteStorage {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SQLiteDatabase");
+#define TAG "SQLiteDatabase"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Storage/SQLiteStorage/src/SQLiteMiscStorage.cpp b/Storage/SQLiteStorage/src/SQLiteMiscStorage.cpp
index fba615103a..f6c4fc4ec6 100644
--- a/Storage/SQLiteStorage/src/SQLiteMiscStorage.cpp
+++ b/Storage/SQLiteStorage/src/SQLiteMiscStorage.cpp
@@ -30,7 +30,7 @@ using namespace avsCommon::utils::configuration;
 using namespace avsCommon::utils::logger;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SQLiteMiscStorage");
+#define TAG "SQLiteMiscStorage"
 
 /// Names of the columns in the database
 static const std::string KEY_COLUMN_NAME = "key";
diff --git a/Storage/SQLiteStorage/src/SQLiteStatement.cpp b/Storage/SQLiteStorage/src/SQLiteStatement.cpp
index 39e2b41d66..b759a6f967 100644
--- a/Storage/SQLiteStorage/src/SQLiteStatement.cpp
+++ b/Storage/SQLiteStorage/src/SQLiteStatement.cpp
@@ -24,7 +24,7 @@ namespace sqliteStorage {
 using namespace avsCommon::utils::logger;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SQLiteStatement");
+#define TAG "SQLiteStatement"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/Storage/SQLiteStorage/src/SQLiteUtils.cpp b/Storage/SQLiteStorage/src/SQLiteUtils.cpp
index 23916423c6..9fb7c362fd 100644
--- a/Storage/SQLiteStorage/src/SQLiteUtils.cpp
+++ b/Storage/SQLiteStorage/src/SQLiteUtils.cpp
@@ -31,7 +31,7 @@ using namespace avsCommon::utils::logger;
 using namespace avsCommon::utils::string;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SQLiteUtils");
+#define TAG "SQLiteUtils"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/SynchronizeStateSender/include/SynchronizeStateSender/PostConnectSynchronizeStateSender.h b/SynchronizeStateSender/include/SynchronizeStateSender/PostConnectSynchronizeStateSender.h
index 845c2190a7..a1b7d0769d 100644
--- a/SynchronizeStateSender/include/SynchronizeStateSender/PostConnectSynchronizeStateSender.h
+++ b/SynchronizeStateSender/include/SynchronizeStateSender/PostConnectSynchronizeStateSender.h
@@ -49,6 +49,11 @@ class PostConnectSynchronizeStateSender
         std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
         std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder = nullptr);
 
+    /**
+     * Destructor.
+     */
+    ~PostConnectSynchronizeStateSender();
+
     /// ContextRequesterInterface Methods.
     /// @{
     void onContextAvailable(const std::string& jsonContext) override;
diff --git a/SynchronizeStateSender/src/PostConnectSynchronizeStateSender.cpp b/SynchronizeStateSender/src/PostConnectSynchronizeStateSender.cpp
index 3f6aeeab74..7eeb885482 100644
--- a/SynchronizeStateSender/src/PostConnectSynchronizeStateSender.cpp
+++ b/SynchronizeStateSender/src/PostConnectSynchronizeStateSender.cpp
@@ -33,7 +33,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::utils::metrics;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PostConnectSynchronizeStateSender");
+#define TAG "PostConnectSynchronizeStateSender"
 
 /**
  * Create a LogEntry using the file's TAG and the specified event string.
@@ -42,15 +42,21 @@ static const std::string TAG("PostConnectSynchronizeStateSender");
  */
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
+/// Metric Activity Name Prefix for PostConnectSynchronizeStateSender metric source
+#define METRIC_ACTIVITY_NAME_PREFIX "POSTCONNECT_SYNCHRONIZE_STATE_SENDER-"
+
+/// Metric activity name for PostConnectSynchronizeStateSender#retrySynchronizeStateEvent().
+#define RETRY_SYNCHRONIZE_ACTIVITY_NAME METRIC_ACTIVITY_NAME_PREFIX "retrySynchronizeStateEvent"
+
+/// Prefix for post-connect data point with status value.
+#define POST_CONNECT_STATUS_PREFIX "STATUS-"
+
 /// The namespace for the SynchronizeState event.
 static const std::string SYNCHRONIZE_STATE_NAMESPACE = "System";
 
 /// The name of the SynchronizeState event.
 static const std::string SYNCHRONIZE_STATE_NAME = "SynchronizeState";
 
-/// Metric Activity Name Prefix for PostConnectSynchronizeStateSender metric source
-static const std::string METRIC_ACTIVITY_NAME_PREFIX = "POSTCONNECT_SYNCHRONIZE_STATE_SENDER-";
-
 /// Table with the retry times on subsequent retries.
 static const std::vector<int> RETRY_TABLE = {
     500,     // Retry 1:  0.5s
@@ -65,31 +71,46 @@ static const std::vector<int> RETRY_TABLE = {
     256000   // Retry 9: 256s
 };
 
+#ifdef ACSDK_ENABLE_METRICS_RECORDING
+/**
+ * Submits metric event if not null. If metric event is null, produces an error message.
+ *
+ * @param metricRecorder Metric recorder interface. If nullptr, metric is not submitted.
+ * @param metricEvent  Metric event to submit. If nullptr, an error is added to the log.
+ */
+static void submitEvent(
+    const std::shared_ptr<MetricRecorderInterface>& metricRecorder,
+    std::shared_ptr<MetricEvent>&& metricEvent) {
+    if (metricEvent == nullptr) {
+        ACSDK_ERROR(LX("Error creating metric."));
+        return;
+    }
+    recordMetric(metricRecorder, std::move(metricEvent));
+}
+
 /**
  * Handles a Metric event by creating and recording it. Failure to create or record the event results
  * in an early return.
  *
  * @param metricRecorder The @c MetricRecorderInterface which records Metric events.
- * @param eventName The activity name of the Metric event.
+ * @param activityName The activity name of the Metric event.
+ * @param eventName The data point name of the Metric event.
  * @param reason Additional information on cause of Metric event.
  */
 static void submitMetric(
     const std::shared_ptr<MetricRecorderInterface>& metricRecorder,
-    const std::string& eventName,
-    const std::string& reason) {
-    auto metricEventBuilder = MetricEventBuilder{}
-                                  .setActivityName(METRIC_ACTIVITY_NAME_PREFIX + eventName)
-                                  .addDataPoint(DataPointCounterBuilder{}.setName(eventName).increment(1).build())
-                                  .addDataPoint(DataPointStringBuilder{}.setName("REASON").setValue(reason).build());
-
-    auto metricEvent = metricEventBuilder.build();
-
-    if (metricEvent == nullptr) {
-        ACSDK_ERROR(LX("Error creating metric."));
-        return;
-    }
-    recordMetric(metricRecorder, metricEvent);
+    const char* activityName,
+    const char* eventName,
+    const char* reason) {
+    auto metricEvent = MetricEventBuilder{}
+                           .setActivityName(activityName)
+                           .addDataPoint(DataPointCounterBuilder{}.setName(eventName).increment(1).build())
+                           .addDataPoint(DataPointStringBuilder{}.setName("REASON").setValue(reason).build())
+                           .build();
+
+    submitEvent(metricRecorder, std::move(metricEvent));
 }
+#endif
 
 /// The instance of the @c RetryTimer used to calculate retry backoff times.
 static avsCommon::utils::RetryTimer RETRY_TIMER{RETRY_TABLE};
@@ -117,6 +138,11 @@ PostConnectSynchronizeStateSender::PostConnectSynchronizeStateSender(
         m_contextManager{contextManager},
         m_metricRecorder{metricRecorder},
         m_isStopping{false} {
+    ACSDK_INFO(LX("init").p("this", this));
+}
+
+PostConnectSynchronizeStateSender::~PostConnectSynchronizeStateSender() {
+    ACSDK_INFO(LX("destroyed").p("this", this));
 }
 
 unsigned int PostConnectSynchronizeStateSender::getOperationPriority() {
@@ -164,7 +190,7 @@ bool PostConnectSynchronizeStateSender::fetchContext() {
 }
 
 bool PostConnectSynchronizeStateSender::performOperation(const std::shared_ptr<MessageSenderInterface>& messageSender) {
-    ACSDK_DEBUG5(LX(__func__));
+    ACSDK_INFO(LX(__func__));
     if (!messageSender) {
         ACSDK_ERROR(LX("performOperationFailed").d("reason", "nullPostConnectSender"));
         return false;
@@ -189,6 +215,19 @@ bool PostConnectSynchronizeStateSender::performOperation(const std::shared_ptr<M
             auto status = m_postConnectRequest->waitForCompletion();
             ACSDK_DEBUG5(LX(__func__).d("SynchronizeState event status", status));
 
+#ifdef ACSDK_ENABLE_METRICS_RECORDING
+            if (m_metricRecorder) {
+                std::stringstream eventNameBuilder;
+                eventNameBuilder << POST_CONNECT_STATUS_PREFIX << status;
+                auto metricEvent =
+                    MetricEventBuilder{}
+                        .setActivityName(RETRY_SYNCHRONIZE_ACTIVITY_NAME)
+                        .addDataPoint(DataPointCounterBuilder{}.setName(eventNameBuilder.str()).increment(1).build())
+                        .build();
+                submitEvent(m_metricRecorder, std::move(metricEvent));
+            }
+#endif
+
             if (status == MessageRequestObserverInterface::Status::SUCCESS ||
                 status == MessageRequestObserverInterface::Status::SUCCESS_NO_CONTENT) {
                 return true;
@@ -196,9 +235,21 @@ bool PostConnectSynchronizeStateSender::performOperation(const std::shared_ptr<M
                 return false;
             }
 
-            submitMetric(m_metricRecorder, "retrySynchronizeStateEvent", "NON_SUCCESS_RESPONSE");
+#ifdef ACSDK_ENABLE_METRICS_RECORDING
+            submitMetric(
+                m_metricRecorder,
+                RETRY_SYNCHRONIZE_ACTIVITY_NAME,
+                "retrySynchronizeStateEvent",
+                "NON_SUCCESS_RESPONSE");
+#endif
         } else {
-            submitMetric(m_metricRecorder, "retrySynchronizeStateEvent", "CONTEXT_FETCH_TIMEDOUT");
+#ifdef ACSDK_ENABLE_METRICS_RECORDING
+            submitMetric(
+                m_metricRecorder,
+                RETRY_SYNCHRONIZE_ACTIVITY_NAME,
+                "retrySynchronizeStateEvent",
+                "CONTEXT_FETCH_TIMEDOUT");
+#endif
         }
 
         /// Retry with backoff.
diff --git a/SynchronizeStateSender/src/SynchronizeStateSenderFactory.cpp b/SynchronizeStateSender/src/SynchronizeStateSenderFactory.cpp
index 16d6f9a651..2e9798a2e4 100644
--- a/SynchronizeStateSender/src/SynchronizeStateSenderFactory.cpp
+++ b/SynchronizeStateSender/src/SynchronizeStateSenderFactory.cpp
@@ -24,7 +24,7 @@ namespace synchronizeStateSender {
 using namespace avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SynchronizeStateSenderFactory");
+#define TAG "SynchronizeStateSenderFactory"
 
 /**
  * Create a LogEntry using the file's TAG and the specified event string.
diff --git a/ThirdParty/googletest.cmake b/ThirdParty/googletest.cmake
index fb61424861..ff3b54318e 100644
--- a/ThirdParty/googletest.cmake
+++ b/ThirdParty/googletest.cmake
@@ -1,5 +1,9 @@
-set(GTEST_ROOT ThirdParty/googletest-release-1.8.0)
+if ((DEFINED GTEST_ROOT) AND (EXISTS ${GTEST_ROOT}/googletest))
+    add_subdirectory(${GTEST_ROOT} EXCLUDE_FROM_ALL ${CMAKE_BINARY_DIR}/googletest)
+else()
+    set(GTEST_ROOT ThirdParty/googletest-release-1.8.0)
+    add_subdirectory(${GTEST_ROOT} EXCLUDE_FROM_ALL)
+endif()
 
-add_subdirectory(${GTEST_ROOT} EXCLUDE_FROM_ALL)
 include_directories(${GTEST_ROOT}/googlemock/include
     ${GTEST_ROOT}/googletest/include)
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
index 0b31cb52d8..e12ca299de 100644
--- a/applications/CMakeLists.txt
+++ b/applications/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 add_subdirectory("acsdkApplicationAudioPipelineFactoryInterfaces")
-add_subdirectory("acsdkCBLAuthorizationDelegate")
 add_subdirectory("acsdkAudioInputStream")
 add_subdirectory("acsdkDefaultDeviceSettingsManager")
 add_subdirectory("acsdkDefaultInternetConnectionMonitor")
@@ -10,9 +9,9 @@ add_subdirectory("acsdkLibcurlAlexaCommunications")
 add_subdirectory("acsdkLibcurlHTTPContentFetcher")
 add_subdirectory("acsdkNullMetricRecorder")
 add_subdirectory("acsdkNullSystemTimeZone")
-add_subdirectory("acsdkPreviewAlexaClient")
 add_subdirectory("acsdkSampleApplicationCBLAuthRequester")
 add_subdirectory("acsdkSampleApplicationInterfaces")
+add_subdirectory("FeatureClients")
 
 if (BLUETOOTH_ENABLED)
     if (BLUETOOTH_BLUEZ)
@@ -30,8 +29,12 @@ elseif(CUSTOM_MEDIA_PLAYER)
     add_subdirectory("acsdkCustomApplicationAudioPipelineFactory")
 endif()
 
-if (OPUS)
+if(ACSDKSPEECHENCODER_LIB STREQUAL acsdkOpusSpeechEncoder)
+    # Build component only if OPUS-based audio encoder is used.
     add_subdirectory("acsdkOpusSpeechEncoder")
-else()
+endif()
+if(ACSDKSPEECHENCODER_LIB STREQUAL acsdkNullSpeechEncoder)
+    # Build component only if audio encoder is not used.
     add_subdirectory("acsdkNullSpeechEncoder")
 endif()
+
diff --git a/applications/FeatureClients/AlexaPresentationFeatureClient/CMakeLists.txt b/applications/FeatureClients/AlexaPresentationFeatureClient/CMakeLists.txt
new file mode 100644
index 0000000000..1cd480a844
--- /dev/null
+++ b/applications/FeatureClients/AlexaPresentationFeatureClient/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaPresentationFeatureClient LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/applications/FeatureClients/AlexaPresentationFeatureClient/include/acsdk/AlexaPresentationFeatureClient/AlexaPresentationFeatureClient.h b/applications/FeatureClients/AlexaPresentationFeatureClient/include/acsdk/AlexaPresentationFeatureClient/AlexaPresentationFeatureClient.h
new file mode 100644
index 0000000000..b0bddd9054
--- /dev/null
+++ b/applications/FeatureClients/AlexaPresentationFeatureClient/include/acsdk/AlexaPresentationFeatureClient/AlexaPresentationFeatureClient.h
@@ -0,0 +1,140 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAPRESENTATIONFEATURECLIENT_ALEXAPRESENTATIONFEATURECLIENT_H_
+#define ACSDK_ALEXAPRESENTATIONFEATURECLIENT_ALEXAPRESENTATIONFEATURECLIENT_H_
+
+#include <memory>
+
+#include <acsdk/AlexaPresentationInterfaces/AlexaPresentationCapabilityAgentInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentNotifierInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentObserverInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/VisualStateProviderInterface.h>
+#include <acsdk/SDKClient/FeatureClientInterface.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+#include <acsdkShutdownManagerInterfaces/ShutdownManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/AVSConnectionManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+
+namespace alexaClientSDK {
+namespace featureClient {
+/**
+ * The @c AlexaPresentationFeatureClient is a Feature Client that adds support for APL directives through the use of @c
+ * Alexa.Presentation, @c Alexa.Presentation.APL components. It is recommended that the @c
+ * AlexaPresentationFeatureClientBuilder is used in combination with the
+ * @c SDKClientBuilder to construct this Feature Client.
+ */
+class AlexaPresentationFeatureClient : public sdkClient::FeatureClientInterface {
+public:
+    /**
+     * Create the AlexaPresentationFeatureClient, this client must be provided to the @c ClientBuilder or added to an
+     * existing @c SDKClientRegistry
+     * @param aplVersion The max supported APL Version
+     * @param stateProviderInterface The visual state provider interface
+     * @param exceptionSender Pointer to the @c ExceptionEncounteredSenderInterface
+     * @param connectionManager Pointer to the @c AVSConnectionManagerInterface
+     * @param contextManager Pointer to the @c ContextManagerInterface
+     * @param endpointBuilder Pointer to the @c EndpointBuilderInterface
+     * @param metricRecorder @c The MetricRecorderInterface - may be null if metrics are not required
+     * @param sdkClientRegistry @c Pointer to the @c SDKClientRegistry - may be null if not using the SDKClientRegistry
+     * @return pointer to the AlexaPresentationFeatureClient, or nullptr if creation failed
+     */
+    static std::unique_ptr<AlexaPresentationFeatureClient> create(
+        std::string aplVersion,
+        std::shared_ptr<aplCapabilityCommonInterfaces::VisualStateProviderInterface> stateProviderInterface,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+            exceptionSender,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSConnectionManagerInterface>&
+            connectionManager,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>&
+            endpointBuilder,
+        const std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder,
+        const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry);
+
+    /// @c FeatureClientInterface functions
+    /// @{
+    bool configure(const std::shared_ptr<alexaClientSDK::sdkClient::SDKClientRegistry>& sdkClientRegistry) override;
+    void doShutdown() override;
+    /// @}
+
+    /**
+     * Get a reference to the @c APLCapabilityAgentInterface which is used to communicate with the APL capability agent.
+     *
+     * @return shared_ptr to the @c APLCapabilityAgentInterface
+     */
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> getAPLCapabilityAgent() const;
+
+    /**
+     * Get a reference to the @c AlexaPresentationCapabilityAgentInterface which is used to communicate with the
+     * Alexa.Presentation capability agent.
+     *
+     * @return shared_ptr to the @c AlexaPresentationCapabilityAgentInterface
+     */
+    std::shared_ptr<alexaPresentationInterfaces::AlexaPresentationCapabilityAgentInterface>
+    getAlexaPresentationCapabilityAgent() const;
+
+    /**
+     * Adds an observer to be notified of APL capability agent changes.
+     *
+     * @param observer The @c APLCapabilityAgentObserverInterface to add; duplicate or null pointers will be ignored.
+     */
+    void addAPLCapabilityAgentObserver(
+        std::weak_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentObserverInterface> observer);
+
+    /**
+     * Removes an observer to be notified of APL capability agent changes.
+     *
+     * @param observer The @c APLCapabilityAgentObserverInterface to remove, no action will be taken if observer does
+     * not exist.
+     */
+    void removeAPLCapabilityAgentObserver(
+        std::weak_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentObserverInterface> observer);
+
+    /// Destructor
+    ~AlexaPresentationFeatureClient();
+
+private:
+    /**
+     * Constructor
+     * @param alexaPresentationCA Pointer to the @c AlexaPresentationCapabilityAgentInterface
+     * @param aplCapabilityAgent Pointer to the @c APLCapabilityAgentInterface
+     * @param aplCapabilityAgentNotifier Pointer to the @c APLCapabilityAgentNotifierInterface
+     * @param shutdownManager Pointer to the @c ShutdownManagerInterface
+     */
+    AlexaPresentationFeatureClient(
+        std::shared_ptr<alexaPresentationInterfaces::AlexaPresentationCapabilityAgentInterface> alexaPresentationCA,
+        std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> aplCapabilityAgent,
+        std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentNotifierInterface> aplCapabilityAgentNotifier,
+        std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> shutdownManager);
+
+    /// The Alexa Presentation CA interface
+    std::shared_ptr<alexaPresentationInterfaces::AlexaPresentationCapabilityAgentInterface> m_alexaPresentationCA;
+
+    /// The Alexa Presentation APL CA interface
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> m_aplCapabilityAgent;
+
+    /// An Interface used to register observers for the AlexaPresentationAPL capability agent.
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentNotifierInterface> m_aplCapabilityAgentNotifier;
+
+    /// The shutdown manager
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> m_shutdownManager;
+};
+}  // namespace featureClient
+}  // namespace alexaClientSDK
+#endif  // ACSDK_ALEXAPRESENTATIONFEATURECLIENT_ALEXAPRESENTATIONFEATURECLIENT_H_
diff --git a/applications/FeatureClients/AlexaPresentationFeatureClient/include/acsdk/AlexaPresentationFeatureClient/AlexaPresentationFeatureClientBuilder.h b/applications/FeatureClients/AlexaPresentationFeatureClient/include/acsdk/AlexaPresentationFeatureClient/AlexaPresentationFeatureClientBuilder.h
new file mode 100644
index 0000000000..95dbdafcc8
--- /dev/null
+++ b/applications/FeatureClients/AlexaPresentationFeatureClient/include/acsdk/AlexaPresentationFeatureClient/AlexaPresentationFeatureClientBuilder.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAPRESENTATIONFEATURECLIENT_ALEXAPRESENTATIONFEATURECLIENTBUILDER_H_
+#define ACSDK_ALEXAPRESENTATIONFEATURECLIENT_ALEXAPRESENTATIONFEATURECLIENTBUILDER_H_
+
+#include <acsdk/APLCapabilityCommonInterfaces/VisualStateProviderInterface.h>
+#include <acsdk/SDKClient/FeatureClientBuilderInterface.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+
+#include "AlexaPresentationFeatureClient.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+/**
+ * The @c AlexaPresentationFeatureClientBuilder builder class is responsible for creating an instance of the @c
+ * AlexaPresentationFeatureClient and is intended to be used with the @c SDKClientBuilder and @c SDKClientRegistry. It
+ * constructs the @c AlexaPresentation and @c AlexaPresentationAPL capabilities.
+ *
+ * It requires the @c ExceptionEncounteredSenderInterface, @c AVSConnectionManagerInterface, @c
+ * EndpointBuilderInterface, @c MetricRecorderInterface and @c ContextManagerInterface components from the @c
+ * SDKClientRegistry which can be provided by @c DefaultClient
+ */
+class AlexaPresentationFeatureClientBuilder : public sdkClient::FeatureClientBuilderInterface {
+public:
+    /**
+     * Create an instance of the @c AlexaPresentationFeatureClientBuilder
+     * @param aplVersion The APL Version supported by the device
+     * @param stateProviderInterface Pointer to the visual state provider
+     * @return Pointer to the feature client builder, or nullptr if creation failed
+     */
+    static std::unique_ptr<AlexaPresentationFeatureClientBuilder> create(
+        std::string aplVersion,
+        std::shared_ptr<aplCapabilityCommonInterfaces::VisualStateProviderInterface> stateProviderInterface);
+
+    /**
+     * Construct an instance of the @c AlexaPresentationFeatureClient
+     * @param sdkClientRegistry The @c SDKClientRegistry object
+     * @return An instance of the @c AlexaPresentationFeatureClient, or nullptr if construction failed
+     */
+    std::shared_ptr<AlexaPresentationFeatureClient> construct(
+        const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry);
+
+    /// @c FeatureClientBuilderInterface functions
+    /// @{
+    std::string name() override;
+    /// @}
+
+private:
+    /**
+     * Constructor
+     * @param aplVersion The APL Version supported by the device
+     * @param stateProviderInterface Pointer to the visual state provider
+     */
+    AlexaPresentationFeatureClientBuilder(
+        std::string aplVersion,
+        std::shared_ptr<aplCapabilityCommonInterfaces::VisualStateProviderInterface> stateProviderInterface);
+
+    /// The APL Version supported by the device
+    std::string m_aplVersion;
+
+    /// Reference to the visual state provider interface
+    std::shared_ptr<aplCapabilityCommonInterfaces::VisualStateProviderInterface> m_stateProviderInterface;
+};
+}  // namespace featureClient
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAPRESENTATIONFEATURECLIENT_ALEXAPRESENTATIONFEATURECLIENTBUILDER_H_
diff --git a/applications/FeatureClients/AlexaPresentationFeatureClient/src/AlexaPresentationFeatureClient.cpp b/applications/FeatureClients/AlexaPresentationFeatureClient/src/AlexaPresentationFeatureClient.cpp
new file mode 100644
index 0000000000..9a312e16cd
--- /dev/null
+++ b/applications/FeatureClients/AlexaPresentationFeatureClient/src/AlexaPresentationFeatureClient.cpp
@@ -0,0 +1,194 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/AlexaPresentation/AlexaPresentationFactory.h>
+#include <acsdk/AlexaPresentationAPL/AlexaPresentationAPLFactory.h>
+#include <acsdkShutdownManager/ShutdownNotifier.h>
+#include <acsdkShutdownManager/ShutdownManager.h>
+#include <AVSCommon/SDKInterfaces/AVSConnectionManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+
+#include "acsdk/AlexaPresentationFeatureClient/AlexaPresentationFeatureClient.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+/// String to identify log entries originating from this file.
+#define TAG "AlexaPresentationFeatureClient"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Name to identify this feature client
+static const char ALEXA_PRESENTATION_FEATURE_CLIENT[] = "AlexaPresentationFeatureClient";
+
+AlexaPresentationFeatureClient::AlexaPresentationFeatureClient(
+    std::shared_ptr<alexaPresentationInterfaces::AlexaPresentationCapabilityAgentInterface> alexaPresentationCA,
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> aplCapabilityAgent,
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentNotifierInterface> aplCapabilityAgentNotifier,
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> shutdownManager) :
+        FeatureClientInterface(ALEXA_PRESENTATION_FEATURE_CLIENT),
+        m_alexaPresentationCA(std::move(alexaPresentationCA)),
+        m_aplCapabilityAgent(std::move(aplCapabilityAgent)),
+        m_aplCapabilityAgentNotifier(std::move(aplCapabilityAgentNotifier)),
+        m_shutdownManager(std::move(shutdownManager)) {
+}
+
+std::unique_ptr<AlexaPresentationFeatureClient> AlexaPresentationFeatureClient::create(
+    std::string aplVersion,
+    std::shared_ptr<aplCapabilityCommonInterfaces::VisualStateProviderInterface> stateProviderInterface,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+        exceptionSender,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSConnectionManagerInterface>& connectionManager,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>&
+        endpointBuilder,
+    const std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder,
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "exceptionSender null"));
+        return nullptr;
+    }
+
+    if (!connectionManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "connectionManager null"));
+        return nullptr;
+    }
+
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "contextManager null"));
+        return nullptr;
+    }
+
+    if (!endpointBuilder) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "defaultEndpointBuilder null"));
+        return nullptr;
+    }
+
+    if (!stateProviderInterface) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "stateProviderInterface null"));
+        return nullptr;
+    }
+
+    if (!metricRecorder) {
+        ACSDK_DEBUG0(LX(__func__).m("metricRecorder null"));
+    }
+
+    auto shutdownNotifier = acsdkShutdownManager::ShutdownNotifier::createShutdownNotifierInterface();
+    auto shutdownManager = acsdkShutdownManager::ShutdownManager::createShutdownManagerInterface(shutdownNotifier);
+    if (!shutdownNotifier || !shutdownManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "null shutdownManager"));
+        return nullptr;
+    }
+
+    /*
+     * Creating the AlexaPresentation Capability Agent - This component is the Capability Agent that
+     * implements the Alexa.Presentation AVS interface.
+     */
+    auto alexaPresentationCAExports =
+        alexaPresentation::AlexaPresentationFactory::create(exceptionSender, connectionManager, contextManager);
+    if (!alexaPresentationCAExports.hasValue()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "unableToCreateAlexaPresentationCapabilityAgent"));
+        return nullptr;
+    }
+
+    auto alexaPresentationCA = alexaPresentationCAExports.value();
+
+    endpointBuilder->withCapabilityConfiguration(alexaPresentationCA.capabilityConfiguration);
+    shutdownNotifier->addObserver(alexaPresentationCA.requiresShutdown);
+
+    /*
+     * Creating the AlexaPresentationAPL Capability Agent - This component is the Capability Agent that
+     * implements the Alexa.Presentation.APL AVS interface.
+     */
+    auto alexaPresentationAPLCAExports = aplCapabilityAgent::AlexaPresentationAPLFactory::create(
+        exceptionSender, metricRecorder, connectionManager, contextManager, aplVersion, stateProviderInterface);
+    if (!alexaPresentationAPLCAExports.hasValue()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "unableToCreateAlexaPresentationAPLCapabilityAgent"));
+        return nullptr;
+    }
+
+    auto alexaPresentationAPLCA = alexaPresentationAPLCAExports.value();
+
+    endpointBuilder->withCapability(
+        alexaPresentationAPLCA.capabilityConfiguration, alexaPresentationAPLCA.capabilityAgent);
+    shutdownNotifier->addObserver(alexaPresentationAPLCA.requiresShutdown);
+
+    if (sdkClientRegistry) {
+        sdkClientRegistry->registerComponent(alexaPresentationCA.alexaPresentation);
+        sdkClientRegistry->registerComponent(alexaPresentationAPLCA.aplCapabilityAgent);
+    } else {
+        ACSDK_DEBUG0(LX(__func__).m("Null SDKClientRegistry, skipping component registration"));
+    }
+
+    auto client = std::unique_ptr<AlexaPresentationFeatureClient>(new AlexaPresentationFeatureClient(
+        std::move(alexaPresentationCA.alexaPresentation),
+        std::move(alexaPresentationAPLCA.aplCapabilityAgent),
+        std::move(alexaPresentationAPLCA.capabilityAgentNotifier),
+        std::move(shutdownManager)));
+
+    return client;
+}
+
+std::shared_ptr<alexaPresentationInterfaces::AlexaPresentationCapabilityAgentInterface> AlexaPresentationFeatureClient::
+    getAlexaPresentationCapabilityAgent() const {
+    return m_alexaPresentationCA;
+}
+
+std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> AlexaPresentationFeatureClient::
+    getAPLCapabilityAgent() const {
+    return m_aplCapabilityAgent;
+}
+
+void AlexaPresentationFeatureClient::addAPLCapabilityAgentObserver(
+    std::weak_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentObserverInterface> observer) {
+    if (!m_aplCapabilityAgentNotifier) {
+        ACSDK_ERROR(LX("addAlexaPresentationObserverFailed").d("reason", "null alexaPresentationAPLNotifier"));
+        return;
+    }
+    m_aplCapabilityAgentNotifier->addWeakPtrObserver(observer);
+}
+
+void AlexaPresentationFeatureClient::removeAPLCapabilityAgentObserver(
+    std::weak_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentObserverInterface> observer) {
+    if (!m_aplCapabilityAgentNotifier) {
+        ACSDK_ERROR(LX("removeAlexaPresentationObserverFailed").d("reason", "null alexaPresentationAPLNotifier"));
+        return;
+    }
+    m_aplCapabilityAgentNotifier->removeWeakPtrObserver(observer);
+}
+
+AlexaPresentationFeatureClient::~AlexaPresentationFeatureClient() {
+    shutdown();
+}
+
+bool AlexaPresentationFeatureClient::configure(
+    const std::shared_ptr<alexaClientSDK::sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    // No-op
+    return true;
+}
+
+void AlexaPresentationFeatureClient::doShutdown() {
+    if (m_shutdownManager) {
+        m_shutdownManager->shutdown();
+        m_shutdownManager.reset();
+    }
+}
+
+}  // namespace featureClient
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/applications/FeatureClients/AlexaPresentationFeatureClient/src/AlexaPresentationFeatureClientBuilder.cpp b/applications/FeatureClients/AlexaPresentationFeatureClient/src/AlexaPresentationFeatureClientBuilder.cpp
new file mode 100644
index 0000000000..3a97bf0b12
--- /dev/null
+++ b/applications/FeatureClients/AlexaPresentationFeatureClient/src/AlexaPresentationFeatureClientBuilder.cpp
@@ -0,0 +1,92 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+#include <AVSCommon/SDKInterfaces/AVSConnectionManagerInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+
+#include "acsdk/AlexaPresentationFeatureClient/AlexaPresentationFeatureClient.h"
+#include "acsdk/AlexaPresentationFeatureClient/AlexaPresentationFeatureClientBuilder.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+/// String to identify log entries originating from this file.
+#define TAG "AlexaPresentationFeatureClientBuilder"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Name to identify this feature client builder
+static const char ALEXA_PRESENTATION_FEATURE_CLIENT_BUILDER[] = "AlexaPresentationFeatureClientBuilder";
+
+AlexaPresentationFeatureClientBuilder::AlexaPresentationFeatureClientBuilder(
+    std::string aplVersion,
+    std::shared_ptr<aplCapabilityCommonInterfaces::VisualStateProviderInterface> stateProviderInterface) :
+        m_aplVersion(std::move(aplVersion)),
+        m_stateProviderInterface(std::move(stateProviderInterface)) {
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>();
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::AVSConnectionManagerInterface>();
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>();
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>();
+    addRequiredType<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface>();
+}
+
+std::shared_ptr<AlexaPresentationFeatureClient> AlexaPresentationFeatureClientBuilder::construct(
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    if (!sdkClientRegistry) {
+        ACSDK_CRITICAL(LX("constructFailed").d("reason", "null SDKClientRegistry"));
+        return nullptr;
+    }
+
+    auto exceptionSender =
+        sdkClientRegistry
+            ->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>();
+    auto connectionManager =
+        sdkClientRegistry->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::AVSConnectionManagerInterface>();
+    auto contextManager =
+        sdkClientRegistry->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>();
+    auto endpointBuilder =
+        sdkClientRegistry
+            ->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>();
+    auto metricRecorder =
+        sdkClientRegistry->getComponent<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface>();
+
+    return AlexaPresentationFeatureClient::create(
+        m_aplVersion,
+        m_stateProviderInterface,
+        exceptionSender,
+        connectionManager,
+        contextManager,
+        endpointBuilder,
+        metricRecorder,
+        sdkClientRegistry);
+}
+
+std::unique_ptr<AlexaPresentationFeatureClientBuilder> AlexaPresentationFeatureClientBuilder::create(
+    std::string aplVersion,
+    std::shared_ptr<aplCapabilityCommonInterfaces::VisualStateProviderInterface> stateProviderInterface) {
+    return std::unique_ptr<AlexaPresentationFeatureClientBuilder>(
+        new AlexaPresentationFeatureClientBuilder(std::move(aplVersion), std::move(stateProviderInterface)));
+}
+
+std::string AlexaPresentationFeatureClientBuilder::name() {
+    return ALEXA_PRESENTATION_FEATURE_CLIENT_BUILDER;
+}
+}  // namespace featureClient
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/applications/FeatureClients/AlexaPresentationFeatureClient/src/CMakeLists.txt b/applications/FeatureClients/AlexaPresentationFeatureClient/src/CMakeLists.txt
new file mode 100644
index 0000000000..7197b99c2d
--- /dev/null
+++ b/applications/FeatureClients/AlexaPresentationFeatureClient/src/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+add_definitions("-DACSDK_LOG_MODULE=AlexaPresentationFeatureClient")
+add_library(acsdkAlexaPresentationFeatureClient
+        AlexaPresentationFeatureClient.cpp
+        AlexaPresentationFeatureClientBuilder.cpp)
+
+target_include_directories(acsdkAlexaPresentationFeatureClient PUBLIC
+        "${acsdkAlexaPresentationFeatureClient_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaPresentationFeatureClient
+        acsdkAlexaPresentation
+        acsdkAlexaPresentationAPL
+        acsdkAlexaPresentationInterfaces
+        acsdkAPLCapabilityCommonInterfaces
+        acsdkSDKClient
+        acsdkShutdownManager)
+
+# install target
+asdk_install()
diff --git a/applications/FeatureClients/CMakeLists.txt b/applications/FeatureClients/CMakeLists.txt
new file mode 100644
index 0000000000..f15838961f
--- /dev/null
+++ b/applications/FeatureClients/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(FeatureClients LANGUAGES CXX)
+
+add_subdirectory(AlexaPresentationFeatureClient)
+add_subdirectory(PresentationOrchestratorFeatureClient)
+add_subdirectory(VisualCharacteristicsFeatureClient)
+add_subdirectory(VisualStateTrackerFeatureClient)
+
+if (RTCSC)
+    add_subdirectory(LiveViewControllerFeatureClient)
+endif()
diff --git a/applications/FeatureClients/LiveViewControllerFeatureClient/CMakeLists.txt b/applications/FeatureClients/LiveViewControllerFeatureClient/CMakeLists.txt
new file mode 100644
index 0000000000..fe1d7e8767
--- /dev/null
+++ b/applications/FeatureClients/LiveViewControllerFeatureClient/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkLiveViewControllerFeatureClient LANGUAGES CXX)
+
+add_subdirectory("src")
\ No newline at end of file
diff --git a/applications/FeatureClients/LiveViewControllerFeatureClient/include/acsdk/LiveViewControllerFeatureClient/LiveViewControllerFeatureClient.h b/applications/FeatureClients/LiveViewControllerFeatureClient/include/acsdk/LiveViewControllerFeatureClient/LiveViewControllerFeatureClient.h
new file mode 100644
index 0000000000..c0473d14e6
--- /dev/null
+++ b/applications/FeatureClients/LiveViewControllerFeatureClient/include/acsdk/LiveViewControllerFeatureClient/LiveViewControllerFeatureClient.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_LIVEVIEWCONTROLLERFEATURECLIENT_LIVEVIEWCONTROLLERFEATURECLIENT_H_
+#define ACSDK_LIVEVIEWCONTROLLERFEATURECLIENT_LIVEVIEWCONTROLLERFEATURECLIENT_H_
+
+#include <memory>
+
+#include <acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerInterface.h>
+#include <acsdk/SDKClient/FeatureClientInterface.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+#include <acsdkShutdownManagerInterfaces/ShutdownManagerInterface.h>
+#include <Alexa/AlexaInterfaceMessageSender.h>
+#include <AVSCommon/SDKInterfaces/AVSConnectionManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+
+namespace alexaClientSDK {
+namespace featureClient {
+/**
+ * The @c LiveViewControllerFeatureClient is a Feature Client that adds support for LiveViewController directives
+ * through the use of @c Alexa.Camera.LiveViewController components. It is recommended that the @c
+ * LiveViewControllerFeatureClientBuilder is used in combination with the
+ * @c SDKClientBuilder to construct this Feature Client.
+ */
+class LiveViewControllerFeatureClient : public sdkClient::FeatureClientInterface {
+public:
+    /**
+     * Create the LiveViewControllerFeatureClient, this client must be provided to the @c ClientBuilder or added to an
+     * existing @c SDKClientRegistry.
+     * @param endpointId An endpoint to which this capability is associated.
+     * @param liveViewController Pointer to the @c LiveViewControllerInterface.
+     * @param connectionManager Pointer to the @c AVSConnectionManagerInterface.
+     * @param contextManager Pointer to the @c ContextManagerInterface.
+     * @param responseSender Pointer to the @c AlexaInterfaceMessageSender.
+     * @param exceptionSender Pointer to the @c ExceptionEncounteredSenderInterface.
+     * @param endpointBuilder Pointer to the @c EndpointBuilderInterface
+     * @return pointer to the LiveViewControllerFeatureClient, or nullptr if creation failed.
+     */
+    static std::unique_ptr<LiveViewControllerFeatureClient> create(
+        avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+        const std::shared_ptr<alexaClientSDK::alexaLiveViewControllerInterfaces::LiveViewControllerInterface>&
+            liveViewController,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSConnectionManagerInterface>&
+            connectionManager,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<alexaClientSDK::capabilityAgents::alexa::AlexaInterfaceMessageSender>& responseSender,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+            exceptionSender,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>&
+            endpointBuilder);
+
+    /// @c FeatureClientInterface functions
+    /// @{
+    bool configure(const std::shared_ptr<alexaClientSDK::sdkClient::SDKClientRegistry>& sdkClientRegistry) override;
+    void doShutdown() override;
+    /// @}
+
+    /// Destructor
+    ~LiveViewControllerFeatureClient();
+
+private:
+    /**
+     * Constructor
+     * @param shutdownManager Pointer to the @c ShutdownManagerInterface.
+     */
+    LiveViewControllerFeatureClient(
+        std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> shutdownManager);
+
+    /// The shutdown manager
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> m_shutdownManager;
+};
+}  // namespace featureClient
+}  // namespace alexaClientSDK
+#endif  // ACSDK_LIVEVIEWCONTROLLERFEATURECLIENT_LIVEVIEWCONTROLLERFEATURECLIENT_H_
diff --git a/applications/FeatureClients/LiveViewControllerFeatureClient/include/acsdk/LiveViewControllerFeatureClient/LiveViewControllerFeatureClientBuilder.h b/applications/FeatureClients/LiveViewControllerFeatureClient/include/acsdk/LiveViewControllerFeatureClient/LiveViewControllerFeatureClientBuilder.h
new file mode 100644
index 0000000000..01be60da20
--- /dev/null
+++ b/applications/FeatureClients/LiveViewControllerFeatureClient/include/acsdk/LiveViewControllerFeatureClient/LiveViewControllerFeatureClientBuilder.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_LIVEVIEWCONTROLLERFEATURECLIENT_LIVEVIEWCONTROLLERFEATURECLIENTBUILDER_H_
+#define ACSDK_LIVEVIEWCONTROLLERFEATURECLIENT_LIVEVIEWCONTROLLERFEATURECLIENTBUILDER_H_
+
+#include "LiveViewControllerFeatureClient.h"
+
+#include <acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerInterface.h>
+#include <acsdk/SDKClient/FeatureClientBuilderInterface.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+
+namespace alexaClientSDK {
+namespace featureClient {
+/**
+ * The @c LiveViewControllerFeatureClientBuilder builder class is responsible for creating an instance of the @c
+ * LiveViewControllerFeatureClient and is intended to be used with the @c SDKClientBuilder and @c SDKClientRegistry. It
+ * constructs the @c LiveViewController capability.
+ *
+ * It requires the @c ExceptionEncounteredSenderInterface, @c AVSConnectionManagerInterface, @c
+ * EndpointBuilderInterface,
+ * @c AlexaInterfaceMessageSender and @c ContextManagerInterface components from the @c
+ * SDKClientRegistry which can be provided by @c DefaultClient.
+ */
+class LiveViewControllerFeatureClientBuilder : public sdkClient::FeatureClientBuilderInterface {
+public:
+    /**
+     * Create an instance of the @c LiveViewControllerFeatureClientBuilder
+     *
+     * @param endpointId An endpoint to which this capability is associated.
+     * @param liveViewController An instance of @c LiveViewControllerInterface implementing the LVC CA Interface to
+     * communicate with it.
+     *
+     * @return Pointer to the feature client builder, or nullptr if creation failed.
+     */
+    static std::unique_ptr<LiveViewControllerFeatureClientBuilder> create(
+        avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+        const std::shared_ptr<alexaClientSDK::alexaLiveViewControllerInterfaces::LiveViewControllerInterface>&
+            liveViewController);
+
+    /**
+     * Construct an instance of the @c LiveViewControllerFeatureClient.
+     * @param sdkClientRegistry The @c SDKClientRegistry object.
+     * @return An instance of the @c LiveViewControllerFeatureClient, or nullptr if construction failed.
+     */
+    std::shared_ptr<LiveViewControllerFeatureClient> construct(
+        const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry);
+
+    /// @c FeatureClientBuilderInterface functions
+    /// @{
+    std::string name() override;
+    /// @}
+
+private:
+    /**
+     * Constructor
+     *
+     * @param endpointId An endpoint to which this capability is associated.
+     * @param liveViewController An instance of @c LiveViewControllerInterface implementing the LVC CA Interface to
+     * communicate with it.
+     */
+    LiveViewControllerFeatureClientBuilder(
+        avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+        const std::shared_ptr<alexaClientSDK::alexaLiveViewControllerInterfaces::LiveViewControllerInterface>&
+            liveViewController);
+
+    /// The endpoint id.
+    avsCommon::sdkInterfaces::endpoints::EndpointIdentifier m_endpointId;
+
+    /// Reference to the @c LiveViewControllerInterface.
+    std::shared_ptr<alexaClientSDK::alexaLiveViewControllerInterfaces::LiveViewControllerInterface>
+        m_liveViewController;
+};
+}  // namespace featureClient
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_LIVEVIEWCONTROLLERFEATURECLIENT_LIVEVIEWCONTROLLERFEATURECLIENTBUILDER_H_
diff --git a/applications/FeatureClients/LiveViewControllerFeatureClient/src/CMakeLists.txt b/applications/FeatureClients/LiveViewControllerFeatureClient/src/CMakeLists.txt
new file mode 100644
index 0000000000..cb20ef7b23
--- /dev/null
+++ b/applications/FeatureClients/LiveViewControllerFeatureClient/src/CMakeLists.txt
@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+add_definitions("-DACSDK_LOG_MODULE=LiveViewControllerFeatureClient")
+add_library(acsdkLiveViewControllerFeatureClient
+        LiveViewControllerFeatureClient.cpp
+        LiveViewControllerFeatureClientBuilder.cpp)
+
+target_include_directories(acsdkLiveViewControllerFeatureClient PUBLIC
+        "${acsdkLiveViewControllerFeatureClient_SOURCE_DIR}/include"
+        ${RTCSC_INCLUDE_DIR})
+
+target_link_libraries(acsdkLiveViewControllerFeatureClient
+        acsdkAlexaLiveViewController
+        acsdkAlexaLiveViewControllerInterfaces
+        acsdkSDKClient
+        acsdkShutdownManager
+        Alexa
+        RtcscCapabilityAgent
+        ${RTCSC_LIB_PATH})
+
+# install target
+asdk_install()
diff --git a/applications/FeatureClients/LiveViewControllerFeatureClient/src/LiveViewControllerFeatureClient.cpp b/applications/FeatureClients/LiveViewControllerFeatureClient/src/LiveViewControllerFeatureClient.cpp
new file mode 100644
index 0000000000..b9bd5b1e84
--- /dev/null
+++ b/applications/FeatureClients/LiveViewControllerFeatureClient/src/LiveViewControllerFeatureClient.cpp
@@ -0,0 +1,150 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/AlexaLiveViewController/AlexaLiveViewControllerFactory.h>
+#include <acsdkShutdownManager/ShutdownNotifier.h>
+#include <acsdkShutdownManager/ShutdownManager.h>
+#include <AVSCommon/SDKInterfaces/AVSConnectionManagerInterface.h>
+#include <RTCSessionController/RtcscCapabilityAgent.h>
+
+#include "acsdk/LiveViewControllerFeatureClient/LiveViewControllerFeatureClient.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+
+/// String to identify log entries originating from this file.
+#define TAG "LiveViewControllerFeatureClient"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Name to identify this feature client
+static const char LIVE_VIEW_CONTROLLER_FEATURE_CLIENT[] = "LiveViewControllerFeatureClient";
+
+LiveViewControllerFeatureClient::LiveViewControllerFeatureClient(
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> shutdownManager) :
+        FeatureClientInterface(LIVE_VIEW_CONTROLLER_FEATURE_CLIENT),
+        m_shutdownManager(std::move(shutdownManager)) {
+}
+
+std::unique_ptr<LiveViewControllerFeatureClient> LiveViewControllerFeatureClient::create(
+    avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+    const std::shared_ptr<alexaClientSDK::alexaLiveViewControllerInterfaces::LiveViewControllerInterface>&
+        liveViewController,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AVSConnectionManagerInterface>& connectionManager,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<alexaClientSDK::capabilityAgents::alexa::AlexaInterfaceMessageSender>& responseSender,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+        exceptionSender,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>&
+        endpointBuilder) {
+    if (!liveViewController) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "liveViewController null"));
+        return nullptr;
+    }
+
+    if (!connectionManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "connectionManager null"));
+        return nullptr;
+    }
+
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "contextManager null"));
+        return nullptr;
+    }
+
+    if (!responseSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "responseSender null"));
+        return nullptr;
+    }
+
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "exceptionSender null"));
+        return nullptr;
+    }
+
+    if (!endpointBuilder) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "endpointBuilder null"));
+        return nullptr;
+    }
+
+    auto shutdownNotifier = acsdkShutdownManager::ShutdownNotifier::createShutdownNotifierInterface();
+    auto shutdownManager = acsdkShutdownManager::ShutdownManager::createShutdownManagerInterface(shutdownNotifier);
+    if (!shutdownNotifier || !shutdownManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "null shutdownManager"));
+        return nullptr;
+    }
+
+    /*
+     * Creating the RTCSC Capability Agent - This component is the Capability Agent that implements the
+     * media plane of the live view camera experience.
+     */
+    auto rtcscCapabilityAgent = capabilityAgents::rtcscCapabilityAgent::RtcscCapabilityAgent::create(
+        connectionManager, contextManager, exceptionSender);
+    if (!rtcscCapabilityAgent) {
+        ACSDK_ERROR(LX("createFailed").m("Unable to create RTCSCCapabilityAgent"));
+        return nullptr;
+    }
+
+    endpointBuilder->withCapability(rtcscCapabilityAgent, rtcscCapabilityAgent);
+    shutdownNotifier->addObserver(rtcscCapabilityAgent);
+
+    /*
+     * Creating the LiveViewController Capability Agent - This component is the Capability Agent that
+     * implements the Alexa.Camera.LiveViewController AVS interface.
+     */
+    auto liveViewControllerCAExports = alexaLiveViewController::AlexaLiveViewControllerFactory::create(
+        endpointId, liveViewController, connectionManager, contextManager, responseSender, exceptionSender);
+    if (!liveViewControllerCAExports.hasValue()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "unableToCreateLiveViewControllerCapabilityAgent"));
+        return nullptr;
+    }
+
+    auto liveViewControllerCA = liveViewControllerCAExports.value();
+
+    endpointBuilder->withCapability(
+        liveViewControllerCA.capabilityConfiguration, liveViewControllerCA.directiveHandler);
+    shutdownNotifier->addObserver(liveViewControllerCA.requiresShutdown);
+    liveViewController->addObserver(liveViewControllerCA.liveViewControllerObserver);
+
+    auto client = std::unique_ptr<LiveViewControllerFeatureClient>(
+        new LiveViewControllerFeatureClient(std::move(shutdownManager)));
+
+    return client;
+}
+
+LiveViewControllerFeatureClient::~LiveViewControllerFeatureClient() {
+    shutdown();
+}
+
+bool LiveViewControllerFeatureClient::configure(
+    const std::shared_ptr<alexaClientSDK::sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    // No-op
+    return true;
+}
+
+void LiveViewControllerFeatureClient::doShutdown() {
+    if (m_shutdownManager) {
+        m_shutdownManager->shutdown();
+        m_shutdownManager.reset();
+    }
+}
+
+}  // namespace featureClient
+}  // namespace alexaClientSDK
diff --git a/applications/FeatureClients/LiveViewControllerFeatureClient/src/LiveViewControllerFeatureClientBuilder.cpp b/applications/FeatureClients/LiveViewControllerFeatureClient/src/LiveViewControllerFeatureClientBuilder.cpp
new file mode 100644
index 0000000000..89b4741948
--- /dev/null
+++ b/applications/FeatureClients/LiveViewControllerFeatureClient/src/LiveViewControllerFeatureClientBuilder.cpp
@@ -0,0 +1,95 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/LiveViewControllerFeatureClient/LiveViewControllerFeatureClientBuilder.h"
+
+#include <Alexa/AlexaInterfaceMessageSender.h>
+#include <AVSCommon/SDKInterfaces/AVSConnectionManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+
+namespace alexaClientSDK {
+namespace featureClient {
+
+/// String to identify log entries originating from this file.
+#define TAG "LiveViewControllerFeatureClientBuilder"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Name to identify this feature client builder.
+static const char LIVE_VIEW_CONTROLLER_FEATURE_CLIENT_BUILDER[] = "LiveViewControllerFeatureClientBuilder";
+
+LiveViewControllerFeatureClientBuilder::LiveViewControllerFeatureClientBuilder(
+    avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+    const std::shared_ptr<alexaClientSDK::alexaLiveViewControllerInterfaces::LiveViewControllerInterface>&
+        liveViewController) :
+        m_endpointId(std::move(endpointId)),
+        m_liveViewController(liveViewController) {
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::AVSConnectionManagerInterface>();
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>();
+    addRequiredType<alexaClientSDK::capabilityAgents::alexa::AlexaInterfaceMessageSender>();
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>();
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>();
+}
+
+std::shared_ptr<LiveViewControllerFeatureClient> LiveViewControllerFeatureClientBuilder::construct(
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    if (!sdkClientRegistry) {
+        ACSDK_CRITICAL(LX("constructFailed").d("reason", "null SDKClientRegistry"));
+        return nullptr;
+    }
+
+    auto connectionManager =
+        sdkClientRegistry->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::AVSConnectionManagerInterface>();
+    auto contextManager =
+        sdkClientRegistry->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>();
+    auto responseSender =
+        sdkClientRegistry->getComponent<alexaClientSDK::capabilityAgents::alexa::AlexaInterfaceMessageSender>();
+    auto exceptionSender =
+        sdkClientRegistry
+            ->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>();
+    auto endpointBuilder =
+        sdkClientRegistry
+            ->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>();
+
+    return LiveViewControllerFeatureClient::create(
+        m_endpointId,
+        m_liveViewController,
+        connectionManager,
+        contextManager,
+        responseSender,
+        exceptionSender,
+        endpointBuilder);
+}
+
+std::unique_ptr<LiveViewControllerFeatureClientBuilder> LiveViewControllerFeatureClientBuilder::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+    const std::shared_ptr<alexaClientSDK::alexaLiveViewControllerInterfaces::LiveViewControllerInterface>&
+        liveViewController) {
+    return std::unique_ptr<LiveViewControllerFeatureClientBuilder>(
+        new LiveViewControllerFeatureClientBuilder(endpointId, liveViewController));
+}
+
+std::string LiveViewControllerFeatureClientBuilder::name() {
+    return LIVE_VIEW_CONTROLLER_FEATURE_CLIENT_BUILDER;
+}
+}  // namespace featureClient
+}  // namespace alexaClientSDK
diff --git a/applications/FeatureClients/PresentationOrchestratorFeatureClient/CMakeLists.txt b/applications/FeatureClients/PresentationOrchestratorFeatureClient/CMakeLists.txt
new file mode 100644
index 0000000000..a55a52da9e
--- /dev/null
+++ b/applications/FeatureClients/PresentationOrchestratorFeatureClient/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkPresentationOrchestratorFeatureClient LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/applications/FeatureClients/PresentationOrchestratorFeatureClient/include/acsdk/PresentationOrchestratorFeatureClient/PresentationOrchestratorFeatureClient.h b/applications/FeatureClients/PresentationOrchestratorFeatureClient/include/acsdk/PresentationOrchestratorFeatureClient/PresentationOrchestratorFeatureClient.h
new file mode 100644
index 0000000000..504a33149e
--- /dev/null
+++ b/applications/FeatureClients/PresentationOrchestratorFeatureClient/include/acsdk/PresentationOrchestratorFeatureClient/PresentationOrchestratorFeatureClient.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_PRESENTATIONORCHESTRATORFEATURECLIENT_PRESENTATIONORCHESTRATORFEATURECLIENT_H_
+#define ACSDK_PRESENTATIONORCHESTRATORFEATURECLIENT_PRESENTATIONORCHESTRATORFEATURECLIENT_H_
+
+#include <acsdk/PresentationOrchestratorInterfaces/VisualTimeoutManagerInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorClientInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <acsdk/SDKClient/FeatureClientInterface.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsSerializerInterface.h>
+#include <acsdkShutdownManagerInterfaces/ShutdownManagerInterface.h>
+
+namespace alexaClientSDK {
+namespace featureClient {
+/**
+ * The @c PresentationOrchestratorFeatureClient is a Feature Client that provides functionality to manage and track the
+ * lifecycle of presentations across multiple windows through the use of the @c PresentationOrchestrator, @c
+ * PresentationOrchestratorClient and @c VisualTimeoutManager components. It is recommended that the @c
+ * PresentationOrchestratorFeatureClientBuilder is used in combination with the
+ * @c SDKClientBuilder to construct this Feature Client.
+ */
+class PresentationOrchestratorFeatureClient : public sdkClient::FeatureClientInterface {
+public:
+    /**
+     * Create an instance of the @c PresentationOrchestratorFeatureClient, it is recommended that the @c
+     * PresentationOrchestratorFeatureClientBuilder is used to create and register an instance of this client with the
+     * SDKClientRegistry
+     * @param presentationOrchestratorStateTracker Reference to the @c PresentationOrchestratorStateTrackerInterface
+     * @param sdkClientRegistry  Reference to the @c SDKClientRegistry, used to register components
+     * @return Pointer to the newly created @c PresentationOrchestratorFeatureClient, or nullptr on failure
+     */
+    static std::unique_ptr<PresentationOrchestratorFeatureClient> create(
+        const std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>&
+            presentationOrchestratorStateTracker,
+        const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry);
+
+    /// @c FeatureClientInterface functions
+    /// @{
+    bool configure(const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) override;
+    void doShutdown() override;
+    /// @}
+
+    /**
+     * Get a reference to @c PresentationOrchestratorClientInterface
+     *
+     * @return shared_ptr to @c PresentationOrchestratorClientInterface
+     */
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface>
+    getPresentationOrchestratorClient() const;
+
+    /**
+     * Get a reference to @c PresentationOrchestratorInterface
+     * @return shared_ptr to @c PresentationOrchestratorInterface
+     */
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorInterface> getPresentationOrchestrator()
+        const;
+
+    /**
+     * Get a reference to @c VisualTimeoutManagerInterface
+     * @return shared_ptr to @c VisualTimeoutManagerInterface
+     */
+    std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> getVisualTimeoutManager() const;
+
+    /// Destructor
+    ~PresentationOrchestratorFeatureClient();
+
+private:
+    /**
+     * Constructor
+     */
+    PresentationOrchestratorFeatureClient(
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorInterface> presentationOrchestrator,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface>
+            presentationOrchestratorClient,
+        std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> visualTimeoutManager,
+        std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> shutdownManager);
+
+    /// The Presentation Orchestrator interface
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorInterface> m_presentationOrchestrator;
+
+    /// The Presentation Orchestrator client interface
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface>
+        m_presentationOrchestratorClient;
+
+    /// The Visual Timeout Manager interface
+    std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> m_visualTimeoutManager;
+
+    /// The shutdown manager
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> m_shutdownManager;
+};
+}  // namespace featureClient
+}  // namespace alexaClientSDK
+#endif  // ACSDK_PRESENTATIONORCHESTRATORFEATURECLIENT_PRESENTATIONORCHESTRATORFEATURECLIENT_H_
diff --git a/applications/FeatureClients/PresentationOrchestratorFeatureClient/include/acsdk/PresentationOrchestratorFeatureClient/PresentationOrchestratorFeatureClientBuilder.h b/applications/FeatureClients/PresentationOrchestratorFeatureClient/include/acsdk/PresentationOrchestratorFeatureClient/PresentationOrchestratorFeatureClientBuilder.h
new file mode 100644
index 0000000000..99f090a6ef
--- /dev/null
+++ b/applications/FeatureClients/PresentationOrchestratorFeatureClient/include/acsdk/PresentationOrchestratorFeatureClient/PresentationOrchestratorFeatureClientBuilder.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_PRESENTATIONORCHESTRATORFEATURECLIENT_PRESENTATIONORCHESTRATORFEATURECLIENTBUILDER_H_
+#define ACSDK_PRESENTATIONORCHESTRATORFEATURECLIENT_PRESENTATIONORCHESTRATORFEATURECLIENTBUILDER_H_
+
+#include <acsdk/SDKClient/FeatureClientBuilderInterface.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+
+#include "PresentationOrchestratorFeatureClient.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+/**
+ * The @c PresentationOrchestratorFeatureClientBuilder builder class is responsible for creating an instance of the @c
+ * PresentationOrchestratorFeatureClient and is intended to be used with the @c SDKClientBuilder and @c
+ * SDKClientRegistry. It constructs the @c PresentationOrchestrator, @c PresentationOrchestratorClient and @c
+ * VisualTimeoutManager components which are intended for use in managing the lifecycle of presentations across windows
+ * and tracking their state.
+ *
+ * It requires the @c PresentationOrchestratorStateTrackerInterface component from the @c SDKClientRegistry which can be
+ * provided by @c VisualStateTrackerFeatureClient
+ */
+class PresentationOrchestratorFeatureClientBuilder : public sdkClient::FeatureClientBuilderInterface {
+public:
+    /**
+     * Create an instance of the @c VisualCharacteristicsFeatureClientBuilder, this can be passed to the
+     * @c SDKClientBuilder
+     * @return The newly instantiated @c VisualCharacteristicsFeatureClientBuilder object, or nullptr if creation failed
+     */
+    static std::unique_ptr<PresentationOrchestratorFeatureClientBuilder> create();
+
+    /**
+     * Construct an instance of the @c PresentationOrchestratorFeatureClient
+     * @param sdkClientRegistry The @c SDKClientClientRegistry object
+     * @return An instance of the @c PresentationOrchestratorFeatureClient, or nullptr if construction failed
+     */
+    std::shared_ptr<PresentationOrchestratorFeatureClient> construct(
+        const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry);
+
+    /// @c FeatureClientBuilderInterface functions
+    /// @{
+    std::string name() override;
+    /// @}
+
+private:
+    /// Constructor
+    PresentationOrchestratorFeatureClientBuilder();
+};
+}  // namespace featureClient
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_PRESENTATIONORCHESTRATORFEATURECLIENT_PRESENTATIONORCHESTRATORFEATURECLIENTBUILDER_H_
diff --git a/applications/FeatureClients/PresentationOrchestratorFeatureClient/src/CMakeLists.txt b/applications/FeatureClients/PresentationOrchestratorFeatureClient/src/CMakeLists.txt
new file mode 100644
index 0000000000..28d2f3e389
--- /dev/null
+++ b/applications/FeatureClients/PresentationOrchestratorFeatureClient/src/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+add_definitions("-DACSDK_LOG_MODULE=presentationOrchestratorFeatureClient")
+add_library(acsdkPresentationOrchestratorFeatureClient
+        PresentationOrchestratorFeatureClient.cpp
+        PresentationOrchestratorFeatureClientBuilder.cpp)
+
+target_include_directories(acsdkPresentationOrchestratorFeatureClient PUBLIC
+        "${acsdkPresentationOrchestratorFeatureClient_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkPresentationOrchestratorFeatureClient
+        acsdkPresentationOrchestratorClient
+        acsdkPresentationOrchestratorInterfaces
+        acsdkShutdownManager
+        acsdkVisualTimeoutManager
+        acsdkSDKClient)
+
+# install target
+asdk_install()
diff --git a/applications/FeatureClients/PresentationOrchestratorFeatureClient/src/PresentationOrchestratorFeatureClient.cpp b/applications/FeatureClients/PresentationOrchestratorFeatureClient/src/PresentationOrchestratorFeatureClient.cpp
new file mode 100644
index 0000000000..316898f9ee
--- /dev/null
+++ b/applications/FeatureClients/PresentationOrchestratorFeatureClient/src/PresentationOrchestratorFeatureClient.cpp
@@ -0,0 +1,141 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/PresentationOrchestratorClient/PresentationOrchestratorClientFactory.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <acsdk/VisualTimeoutManager/VisualTimeoutManagerFactory.h>
+#include <acsdkShutdownManager/ShutdownNotifier.h>
+#include <acsdkShutdownManager/ShutdownManager.h>
+
+#include "acsdk/PresentationOrchestratorFeatureClient/PresentationOrchestratorFeatureClient.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+/// String to identify log entries originating from this file.
+#define TAG "PresentationOrchestratorFeatureClient"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// String used to identify this feature client
+static const char PRESENTATION_ORCHESTRATOR_FEATURE_CLIENT[] = "PresentationOrchestratorFeatureClient";
+
+/// String used as a client ID for the Presentation Orchestrator
+static const char DEFAULT_CLIENT_ID[] = "default";
+
+PresentationOrchestratorFeatureClient::PresentationOrchestratorFeatureClient(
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorInterface> presentationOrchestrator,
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface>
+        presentationOrchestratorClient,
+    std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> visualTimeoutManager,
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> shutdownManager) :
+        FeatureClientInterface(PRESENTATION_ORCHESTRATOR_FEATURE_CLIENT),
+        m_presentationOrchestrator{std::move(presentationOrchestrator)},
+        m_presentationOrchestratorClient{std::move(presentationOrchestratorClient)},
+        m_visualTimeoutManager{std::move(visualTimeoutManager)},
+        m_shutdownManager{std::move(shutdownManager)} {
+}
+
+std::unique_ptr<PresentationOrchestratorFeatureClient> PresentationOrchestratorFeatureClient::create(
+    const std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>&
+        presentationOrchestratorStateTracker,
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    if (!presentationOrchestratorStateTracker) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "null presentationOrchestratorStateTracker"));
+        return nullptr;
+    }
+
+    auto shutdownNotifier = acsdkShutdownManager::ShutdownNotifier::createShutdownNotifierInterface();
+    auto shutdownManager = acsdkShutdownManager::ShutdownManager::createShutdownManagerInterface(shutdownNotifier);
+    if (!shutdownNotifier || !shutdownManager) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "null shutdownManager"));
+        return nullptr;
+    }
+
+    auto visualTimeoutManagerExports = visualTimeoutManager::VisualTimeoutManagerFactory::create();
+    if (!visualTimeoutManagerExports.hasValue()) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "unableToCreateVisualTimeoutManager"));
+        return nullptr;
+    }
+
+    auto visualTimeoutManagerInterfaces = visualTimeoutManagerExports.value();
+    shutdownNotifier->addObserver(visualTimeoutManagerInterfaces.requiresShutdown);
+
+    auto presentationOrchestratorClientExports =
+        presentationOrchestratorClient::PresentationOrchestratorClientFactory::create(
+            presentationOrchestratorStateTracker,
+            visualTimeoutManagerInterfaces.visualTimeoutManagerInterface,
+            DEFAULT_CLIENT_ID);
+    if (!presentationOrchestratorClientExports.hasValue()) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "unableToCreatePresentationOrchestratorClient"));
+        return nullptr;
+    }
+    auto presentationOrchestratorClientInterfaces = presentationOrchestratorClientExports.value();
+
+    if (sdkClientRegistry) {
+        sdkClientRegistry->registerComponent(visualTimeoutManagerInterfaces.visualTimeoutManagerInterface);
+        sdkClientRegistry->registerComponent(
+            presentationOrchestratorClientInterfaces.presentationOrchestratorInterface);
+        sdkClientRegistry->registerComponent(
+            presentationOrchestratorClientInterfaces.presentationOrchestratorClientInterface);
+    }
+
+    auto client = std::unique_ptr<PresentationOrchestratorFeatureClient>(new PresentationOrchestratorFeatureClient(
+        std::move(presentationOrchestratorClientInterfaces.presentationOrchestratorInterface),
+        std::move(presentationOrchestratorClientInterfaces.presentationOrchestratorClientInterface),
+        std::move(visualTimeoutManagerInterfaces.visualTimeoutManagerInterface),
+        std::move(shutdownManager)));
+
+    return client;
+}
+
+PresentationOrchestratorFeatureClient::~PresentationOrchestratorFeatureClient() {
+    shutdown();
+}
+
+std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface>
+PresentationOrchestratorFeatureClient::getPresentationOrchestratorClient() const {
+    return m_presentationOrchestratorClient;
+}
+
+std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorInterface>
+PresentationOrchestratorFeatureClient::getPresentationOrchestrator() const {
+    return m_presentationOrchestrator;
+}
+
+std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface>
+PresentationOrchestratorFeatureClient::getVisualTimeoutManager() const {
+    return m_visualTimeoutManager;
+}
+
+bool PresentationOrchestratorFeatureClient::configure(
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    // no-op
+    return true;
+}
+
+void PresentationOrchestratorFeatureClient::doShutdown() {
+    if (m_shutdownManager) {
+        m_shutdownManager->shutdown();
+        m_shutdownManager.reset();
+    }
+}
+
+}  // namespace featureClient
+}  // namespace alexaClientSDK
diff --git a/applications/FeatureClients/PresentationOrchestratorFeatureClient/src/PresentationOrchestratorFeatureClientBuilder.cpp b/applications/FeatureClients/PresentationOrchestratorFeatureClient/src/PresentationOrchestratorFeatureClientBuilder.cpp
new file mode 100644
index 0000000000..c189db694b
--- /dev/null
+++ b/applications/FeatureClients/PresentationOrchestratorFeatureClient/src/PresentationOrchestratorFeatureClientBuilder.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+
+#include "acsdk/PresentationOrchestratorFeatureClient/PresentationOrchestratorFeatureClient.h"
+#include "acsdk/PresentationOrchestratorFeatureClient/PresentationOrchestratorFeatureClientBuilder.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+/// String to identify log entries originating from this file.
+#define TAG "PresentationOrchestratorFeatureClientBuilder"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// String used to identify this feature client builder
+static const char PRESENTATION_ORCHESTRATOR_FEATURE_CLIENT_BUILDER[] = "PresentationOrchestratorFeatureClientBuilder";
+
+PresentationOrchestratorFeatureClientBuilder::PresentationOrchestratorFeatureClientBuilder() {
+    addRequiredType<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>();
+}
+
+std::shared_ptr<PresentationOrchestratorFeatureClient> PresentationOrchestratorFeatureClientBuilder::construct(
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    if (!sdkClientRegistry) {
+        ACSDK_CRITICAL(LX("constructFailed").d("reason", "null SDKClientRegistry"));
+        return nullptr;
+    }
+
+    auto poStateTracker =
+        sdkClientRegistry
+            ->getComponent<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>();
+
+    return PresentationOrchestratorFeatureClient::create(poStateTracker, sdkClientRegistry);
+}
+
+std::unique_ptr<PresentationOrchestratorFeatureClientBuilder> PresentationOrchestratorFeatureClientBuilder::create() {
+    return std::unique_ptr<PresentationOrchestratorFeatureClientBuilder>(
+        new PresentationOrchestratorFeatureClientBuilder());
+}
+
+std::string PresentationOrchestratorFeatureClientBuilder::name() {
+    return PRESENTATION_ORCHESTRATOR_FEATURE_CLIENT_BUILDER;
+}
+}  // namespace featureClient
+}  // namespace alexaClientSDK
diff --git a/applications/FeatureClients/VisualCharacteristicsFeatureClient/CMakeLists.txt b/applications/FeatureClients/VisualCharacteristicsFeatureClient/CMakeLists.txt
new file mode 100644
index 0000000000..137836c55f
--- /dev/null
+++ b/applications/FeatureClients/VisualCharacteristicsFeatureClient/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkVisualCharacteristicsFeatureClient LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/applications/FeatureClients/VisualCharacteristicsFeatureClient/include/acsdk/VisualCharacteristicsFeatureClient/VisualCharacteristicsFeatureClient.h b/applications/FeatureClients/VisualCharacteristicsFeatureClient/include/acsdk/VisualCharacteristicsFeatureClient/VisualCharacteristicsFeatureClient.h
new file mode 100644
index 0000000000..5b1bd55342
--- /dev/null
+++ b/applications/FeatureClients/VisualCharacteristicsFeatureClient/include/acsdk/VisualCharacteristicsFeatureClient/VisualCharacteristicsFeatureClient.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_VISUALCHARACTERISTICSFEATURECLIENT_VISUALCHARACTERISTICSFEATURECLIENT_H_
+#define ACSDK_VISUALCHARACTERISTICSFEATURECLIENT_VISUALCHARACTERISTICSFEATURECLIENT_H_
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateObserverInterface.h>
+#include <acsdk/SDKClient/FeatureClientInterface.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h>
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsSerializerInterface.h>
+#include <acsdkShutdownManagerInterfaces/ShutdownManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+
+namespace alexaClientSDK {
+namespace featureClient {
+/**
+ * The @c VisualCharacteristicsFeatureClient is a Feature Client that provides functionality to report the visual
+ * characteristics of a device through the use of the @c VisualCharacteristics and @c VisualCharacteristicsSerializer
+ * components. It is recommended that the @c VisualCharacteristicsFeatureClientBuilder is used in combination with the
+ * @c SDKClientBuilder to construct this Feature Client.
+ */
+class VisualCharacteristicsFeatureClient : public sdkClient::FeatureClientInterface {
+public:
+    /**
+     * Create an instance of the VisualCharacteristicsFeatureClient, users should prefer to use the
+     * VisualCharacteristicsFeatureClientBuilder to create and register an instance of this client with the SDKClient
+     * @param exceptionSender Reference to the @c ExceptionEncounteredSenderInterface
+     * @param contextManager Reference to the @c ContextManagerInterface
+     * @param endpointBuilder Reference to the @c EndpointBuilderInterface
+     * @return unique pointer to the created VisualCharacteristicsFeatureClient, or nullptr if creation failed
+     */
+    static std::unique_ptr<VisualCharacteristicsFeatureClient> create(
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+            exceptionSender,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>&
+            endpointBuilder,
+        const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry);
+
+    /**
+     * Get a reference to @c VisualCharacteristicsInterface
+     *
+     * @return shared_ptr to  @c VisualCharacteristicsInterface
+     */
+    std::shared_ptr<alexaClientSDK::visualCharacteristicsInterfaces::VisualCharacteristicsInterface>
+    getVisualCharacteristics() const;
+
+    /**
+     * Get a reference to @c VisualCharacteristicsSerializerInterface
+     *
+     * @return shared_ptr to  @c VisualCharacteristicsSerializerInterface
+     */
+    std::shared_ptr<alexaClientSDK::visualCharacteristicsInterfaces::VisualCharacteristicsSerializerInterface>
+    getVisualCharacteristicsSerializer() const;
+
+    /// @c FeatureClientInterface functions
+    /// @{
+    bool configure(const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) override;
+    void doShutdown() override;
+    /// @}
+
+    /// Destructor
+    ~VisualCharacteristicsFeatureClient();
+
+private:
+    /**
+     * Constructor
+     */
+    VisualCharacteristicsFeatureClient(
+        std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsInterface> visualCharacteristics,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateObserverInterface>
+            visualCharacteristicsPOStateObserver,
+        std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsSerializerInterface>
+            visualCharacteristicsSerializer,
+        std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> shutdownManager);
+
+    /// The VisualCharacteristics capability agent.
+    std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsInterface> m_visualCharacteristics;
+
+    /// The state observer interface exposed by visual characteristics
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateObserverInterface>
+        m_visualCharacteristicsPOStateObserver;
+
+    /// The VisualCharacteristics serializer.
+    std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsSerializerInterface>
+        m_visualCharacteristicsSerializer;
+
+    /// The shutdown manager
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> m_shutdownManager;
+};
+}  // namespace featureClient
+}  // namespace alexaClientSDK
+#endif  // ACSDK_VISUALCHARACTERISTICSFEATURECLIENT_VISUALCHARACTERISTICSFEATURECLIENT_H_
diff --git a/applications/FeatureClients/VisualCharacteristicsFeatureClient/include/acsdk/VisualCharacteristicsFeatureClient/VisualCharacteristicsFeatureClientBuilder.h b/applications/FeatureClients/VisualCharacteristicsFeatureClient/include/acsdk/VisualCharacteristicsFeatureClient/VisualCharacteristicsFeatureClientBuilder.h
new file mode 100644
index 0000000000..77c818b924
--- /dev/null
+++ b/applications/FeatureClients/VisualCharacteristicsFeatureClient/include/acsdk/VisualCharacteristicsFeatureClient/VisualCharacteristicsFeatureClientBuilder.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_VISUALCHARACTERISTICSFEATURECLIENT_VISUALCHARACTERISTICSFEATURECLIENTBUILDER_H_
+#define ACSDK_VISUALCHARACTERISTICSFEATURECLIENT_VISUALCHARACTERISTICSFEATURECLIENTBUILDER_H_
+
+#include <acsdk/SDKClient/FeatureClientBuilderInterface.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+
+#include "VisualCharacteristicsFeatureClient.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+/**
+ * The @c VisualCharacteristicsFeatureClientBuilder builder class is responsible for creating an instance of the @c
+ * VisualCharacteristicsFeatureClient and is intended to be used with the @c SDKClientBuilder and @c SDKClientRegistry.
+ * It constructs the @c VisualCharacteristics and @c VisualCharacteristicsSerializer components which are intended
+ * for use in reporting the visual characteristics for a device.
+ *
+ * It requires the @c ExceptionEncounteredSenderInterface, @c EndpointBuilderInterface and @c ContextManagerInterface
+ * components from the @c SDKClientRegistry which can be provided by @c DefaultClient. If the @c
+ * PresentationOrchestratorStateTrackerInterface provided by the @c VisualStateTrackerFeatureClient is available then
+ * the @c VisualCharacteristics component will be registered as an observer.
+ */
+class VisualCharacteristicsFeatureClientBuilder : public sdkClient::FeatureClientBuilderInterface {
+public:
+    /**
+     * Create an instance of the @c VisualCharacteristicsFeatureClientBuilder, this can be passed to the
+     * @c SDKClientBuilder
+     * @return The newly instantiated @c VisualCharacteristicsFeatureClientBuilder object, or nullptr if creation failed
+     */
+    static std::unique_ptr<VisualCharacteristicsFeatureClientBuilder> create();
+
+    /**
+     * Construct an instance of the @c VisualCharacteristicsFeatureClient
+     * @param sdkClientRegistry The @c SDKClientClientRegistry object used for registering components
+     * @return An instance of the @c VisualCharacteristicsFeatureClient, or nullptr if construction failed
+     */
+    std::shared_ptr<VisualCharacteristicsFeatureClient> construct(
+        const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry);
+
+    /// @c FeatureClientBuilderInterface functions
+    /// @{
+    std::string name() override;
+    /// @}
+
+private:
+    /// Constructor
+    VisualCharacteristicsFeatureClientBuilder();
+};
+}  // namespace featureClient
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_VISUALCHARACTERISTICSFEATURECLIENT_VISUALCHARACTERISTICSFEATURECLIENTBUILDER_H_
diff --git a/applications/FeatureClients/VisualCharacteristicsFeatureClient/src/CMakeLists.txt b/applications/FeatureClients/VisualCharacteristicsFeatureClient/src/CMakeLists.txt
new file mode 100644
index 0000000000..a36dca91c0
--- /dev/null
+++ b/applications/FeatureClients/VisualCharacteristicsFeatureClient/src/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+add_definitions("-DACSDK_LOG_MODULE=visualCharacteristicsFeatureClient")
+add_library(acsdkVisualCharacteristicsFeatureClient
+        VisualCharacteristicsFeatureClient.cpp
+        VisualCharacteristicsFeatureClientBuilder.cpp)
+
+target_include_directories(acsdkVisualCharacteristicsFeatureClient PUBLIC
+        "${acsdkVisualCharacteristicsFeatureClient_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkVisualCharacteristicsFeatureClient
+        acsdkPresentationOrchestratorInterfaces
+        acsdkShutdownManager
+        acsdkVisualCharacteristics
+        acsdkVisualCharacteristicsInterfaces
+        acsdkSDKClient)
+
+# install target
+asdk_install()
diff --git a/applications/FeatureClients/VisualCharacteristicsFeatureClient/src/VisualCharacteristicsFeatureClient.cpp b/applications/FeatureClients/VisualCharacteristicsFeatureClient/src/VisualCharacteristicsFeatureClient.cpp
new file mode 100644
index 0000000000..6b966a16d5
--- /dev/null
+++ b/applications/FeatureClients/VisualCharacteristicsFeatureClient/src/VisualCharacteristicsFeatureClient.cpp
@@ -0,0 +1,164 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <acsdk/VisualCharacteristics/VisualCharacteristicsFactory.h>
+#include <acsdk/VisualCharacteristics/VisualCharacteristicsSerializerFactory.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+#include <acsdkShutdownManager/ShutdownManager.h>
+#include <acsdkShutdownManager/ShutdownNotifier.h>
+
+#include "acsdk/VisualCharacteristicsFeatureClient/VisualCharacteristicsFeatureClient.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+/// String to identify log entries originating from this file.
+#define TAG "VisualCharacteristicsFeatureClient"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// String used to identify this feature client
+static const char VISUAL_CHARACTERISTICS_FEATURE_CLIENT[] = "VisualCharacteristicsFeatureClient";
+
+VisualCharacteristicsFeatureClient::VisualCharacteristicsFeatureClient(
+    std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsInterface> visualCharacteristics,
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateObserverInterface>
+        visualCharacteristicsPOStateObserver,
+    std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsSerializerInterface>
+        visualCharacteristicsSerializer,
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> shutdownManager) :
+        FeatureClientInterface(VISUAL_CHARACTERISTICS_FEATURE_CLIENT),
+        m_visualCharacteristics(std::move(visualCharacteristics)),
+        m_visualCharacteristicsPOStateObserver(std::move(visualCharacteristicsPOStateObserver)),
+        m_visualCharacteristicsSerializer(std::move(visualCharacteristicsSerializer)),
+        m_shutdownManager(std::move(shutdownManager)) {
+}
+
+std::unique_ptr<VisualCharacteristicsFeatureClient> VisualCharacteristicsFeatureClient::create(
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+        exceptionSender,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>&
+        endpointBuilder,
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "exceptionSender null"));
+        return nullptr;
+    }
+
+    if (!contextManager) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "contextManager null"));
+        return nullptr;
+    }
+
+    if (!endpointBuilder) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "defaultEndpointBuilder null"));
+        return nullptr;
+    }
+
+    auto shutdownNotifier = acsdkShutdownManager::ShutdownNotifier::createShutdownNotifierInterface();
+    auto shutdownManager = acsdkShutdownManager::ShutdownManager::createShutdownManagerInterface(shutdownNotifier);
+    if (!shutdownNotifier || !shutdownManager) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "null shutdownManager"));
+        return nullptr;
+    }
+
+    /*
+     * Creating the VisualCharacteristics Capability Agent - This component is the Capability Agent that
+     * publish Alexa.Display, Alexa.Display.Window, Alexa.InteractionMode interfaces.
+     */
+    auto visualCharacteristicsExports =
+        visualCharacteristics::VisualCharacteristicsFactory::create(contextManager, exceptionSender);
+    if (!visualCharacteristicsExports.hasValue()) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "null VisualCharacteristics"));
+        return nullptr;
+    }
+    auto visualCharacteristicsInterfaces = visualCharacteristicsExports.value();
+
+    endpointBuilder->withCapabilityConfiguration(visualCharacteristicsInterfaces.capabilityConfigurationInterface);
+
+    shutdownNotifier->addObserver(visualCharacteristicsInterfaces.requiresShutdown);
+
+    /**
+     * Creating the VisualCharacteristics serializer
+     */
+    auto visualCharacteristicsSerializer = visualCharacteristics::VisualCharacteristicsSerializerFactory::create();
+    if (!visualCharacteristicsSerializer) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "unableToFetchVisualCharacteristicsSerializer"));
+        return nullptr;
+    }
+
+    if (sdkClientRegistry) {
+        sdkClientRegistry->registerComponent(visualCharacteristicsInterfaces.visualCharacteristicsInterface);
+        sdkClientRegistry->registerComponent(visualCharacteristicsSerializer);
+    }
+
+    auto client = std::unique_ptr<VisualCharacteristicsFeatureClient>(new VisualCharacteristicsFeatureClient(
+        std::move(visualCharacteristicsInterfaces.visualCharacteristicsInterface),
+        std::move(visualCharacteristicsInterfaces.presentationOrchestratorStateObserverInterface),
+        std::move(visualCharacteristicsSerializer),
+        std::move(shutdownManager)));
+
+    return client;
+}
+
+VisualCharacteristicsFeatureClient::~VisualCharacteristicsFeatureClient() {
+    shutdown();
+}
+
+std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsInterface> VisualCharacteristicsFeatureClient::
+    getVisualCharacteristics() const {
+    return m_visualCharacteristics;
+}
+
+std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsSerializerInterface>
+VisualCharacteristicsFeatureClient::getVisualCharacteristicsSerializer() const {
+    return m_visualCharacteristicsSerializer;
+}
+
+bool VisualCharacteristicsFeatureClient::configure(
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    if (!sdkClientRegistry) {
+        ACSDK_ERROR(LX("configureFailed").d("reason", "null client registry"));
+        return false;
+    }
+
+    auto presentationOrchestratorStateTracker =
+        sdkClientRegistry
+            ->getComponent<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>();
+    if (!presentationOrchestratorStateTracker) {
+        ACSDK_DEBUG0(LX("initialize").m("Building without Presentation Orchestrator support"));
+    }
+
+    if (presentationOrchestratorStateTracker) {
+        presentationOrchestratorStateTracker->addStateObserver(m_visualCharacteristicsPOStateObserver);
+    }
+    return true;
+}
+
+void VisualCharacteristicsFeatureClient::doShutdown() {
+    if (m_shutdownManager) {
+        m_shutdownManager->shutdown();
+        m_shutdownManager.reset();
+    }
+}
+
+}  // namespace featureClient
+}  // namespace alexaClientSDK
diff --git a/applications/FeatureClients/VisualCharacteristicsFeatureClient/src/VisualCharacteristicsFeatureClientBuilder.cpp b/applications/FeatureClients/VisualCharacteristicsFeatureClient/src/VisualCharacteristicsFeatureClientBuilder.cpp
new file mode 100644
index 0000000000..17d4916fe4
--- /dev/null
+++ b/applications/FeatureClients/VisualCharacteristicsFeatureClient/src/VisualCharacteristicsFeatureClientBuilder.cpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+
+#include "acsdk/VisualCharacteristicsFeatureClient/VisualCharacteristicsFeatureClient.h"
+#include "acsdk/VisualCharacteristicsFeatureClient/VisualCharacteristicsFeatureClientBuilder.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+/// String to identify log entries originating from this file.
+#define TAG "VisualCharacteristicsFeatureClientBuilder"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// String used to identify this feature client builder
+static const char VISUAL_CHARACTERISTICS_FEATURE_CLIENT_BUILDER[] = "VisualCharacteristicsFeatureClientBuilder";
+
+VisualCharacteristicsFeatureClientBuilder::VisualCharacteristicsFeatureClientBuilder() {
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>();
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>();
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>();
+}
+
+std::shared_ptr<VisualCharacteristicsFeatureClient> VisualCharacteristicsFeatureClientBuilder::construct(
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    if (!sdkClientRegistry) {
+        ACSDK_CRITICAL(LX("constructFailed").d("reason", "null SDKClientRegistry"));
+        return nullptr;
+    }
+
+    auto exceptionSender =
+        sdkClientRegistry
+            ->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>();
+    auto contextManager =
+        sdkClientRegistry->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>();
+    auto endpointBuilder =
+        sdkClientRegistry
+            ->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>();
+
+    return VisualCharacteristicsFeatureClient::create(
+        exceptionSender, contextManager, endpointBuilder, sdkClientRegistry);
+}
+
+std::unique_ptr<VisualCharacteristicsFeatureClientBuilder> VisualCharacteristicsFeatureClientBuilder::create() {
+    return std::unique_ptr<VisualCharacteristicsFeatureClientBuilder>(new VisualCharacteristicsFeatureClientBuilder());
+}
+
+std::string VisualCharacteristicsFeatureClientBuilder::name() {
+    return VISUAL_CHARACTERISTICS_FEATURE_CLIENT_BUILDER;
+}
+}  // namespace featureClient
+}  // namespace alexaClientSDK
diff --git a/applications/FeatureClients/VisualStateTrackerFeatureClient/CMakeLists.txt b/applications/FeatureClients/VisualStateTrackerFeatureClient/CMakeLists.txt
new file mode 100644
index 0000000000..ad369e75d6
--- /dev/null
+++ b/applications/FeatureClients/VisualStateTrackerFeatureClient/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkVisualStateTrackerFeatureClient LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/applications/FeatureClients/VisualStateTrackerFeatureClient/include/acsdk/VisualStateTrackerFeatureClient/VisualStateTrackerFeatureClient.h b/applications/FeatureClients/VisualStateTrackerFeatureClient/include/acsdk/VisualStateTrackerFeatureClient/VisualStateTrackerFeatureClient.h
new file mode 100644
index 0000000000..e35d0f6264
--- /dev/null
+++ b/applications/FeatureClients/VisualStateTrackerFeatureClient/include/acsdk/VisualStateTrackerFeatureClient/VisualStateTrackerFeatureClient.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_VISUALSTATETRACKERFEATURECLIENT_VISUALSTATETRACKERFEATURECLIENT_H_
+#define ACSDK_VISUALSTATETRACKERFEATURECLIENT_VISUALSTATETRACKERFEATURECLIENT_H_
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <acsdk/SDKClient/FeatureClientInterface.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsSerializerInterface.h>
+#include <acsdkShutdownManagerInterfaces/ShutdownManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+
+namespace alexaClientSDK {
+namespace featureClient {
+/**
+ * The @c VisualStateTrackerFeatureClient is a Feature Client that provides visual state tracking functionality through
+ * the use of the @c VisualActivityTracker and @c PresentationOrchestratorStateTracker components. It is recommended
+ * that the @c VisualStateTrackerFeatureClientBuilder is used in combination with the @c SDKClientBuilder to construct
+ * this Feature Client.
+ */
+class VisualStateTrackerFeatureClient : public sdkClient::FeatureClientInterface {
+public:
+    /**
+     * Create an instance of the VisualStateTrackerFeatureClient, it is recommended that the @c
+     * VisualStateTrackerFeatureClientBuilder is used to create and register an instance of this client with the
+     * @c SDKClientBuilder or @c SDKClientRegistry
+     * @param contextManager Pointer to the @c ContextManagerInterface to allow capabilities to receive context
+     * @param endpointBuilder Pointer to the @c EndpointBuilderInterface for registering capabilities
+     * @param sdkClientRegistry Reference to the @c SDKClientRegistry used to register
+     * @return unique pointer to the created VisualStateTrackerFeatureClient, or nullptr if creation failed
+     */
+    static std::unique_ptr<VisualStateTrackerFeatureClient> create(
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>&
+            endpointBuilder,
+        const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry);
+
+    /// @c FeatureClientInterface functions
+    /// @{
+    bool configure(const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) override;
+    void doShutdown() override;
+    /// @}
+
+    /**
+     * Get a reference to @c PresentationOrchestratorStateTrackerInterface
+     *
+     * @return shared_ptr to @c PresentationOrchestratorStateTrackerInterface
+     */
+    std::shared_ptr<alexaClientSDK::presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>
+    getPresentationOrchestratorStateTracker() const;
+
+    /// Destructor
+    ~VisualStateTrackerFeatureClient();
+
+private:
+    /**
+     * Constructor
+     * @param presentationOrchestratorStateTracker Pointer to the @c PresentationOrchestratorStateTrackerInterface
+     * @param shutdownManager Pointer the the @c ShutdownManagerInterface, used to shutdown all components
+     */
+    VisualStateTrackerFeatureClient(
+        std::shared_ptr<
+            alexaClientSDK::presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>
+            presentationOrchestratorStateTracker,
+        std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> shutdownManager);
+
+    /// The Presentation Orchestrator state tracker
+    std::shared_ptr<alexaClientSDK::presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>
+        m_presentationOrchestratorStateTracker;
+
+    /// The shutdown manager
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> m_shutdownManager;
+};
+}  // namespace featureClient
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_VISUALSTATETRACKERFEATURECLIENT_VISUALSTATETRACKERFEATURECLIENT_H_
diff --git a/applications/FeatureClients/VisualStateTrackerFeatureClient/include/acsdk/VisualStateTrackerFeatureClient/VisualStateTrackerFeatureClientBuilder.h b/applications/FeatureClients/VisualStateTrackerFeatureClient/include/acsdk/VisualStateTrackerFeatureClient/VisualStateTrackerFeatureClientBuilder.h
new file mode 100644
index 0000000000..f039258dda
--- /dev/null
+++ b/applications/FeatureClients/VisualStateTrackerFeatureClient/include/acsdk/VisualStateTrackerFeatureClient/VisualStateTrackerFeatureClientBuilder.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_VISUALSTATETRACKERFEATURECLIENT_VISUALSTATETRACKERFEATURECLIENTBUILDER_H_
+#define ACSDK_VISUALSTATETRACKERFEATURECLIENT_VISUALSTATETRACKERFEATURECLIENTBUILDER_H_
+
+#include <acsdk/SDKClient/FeatureClientBuilderInterface.h>
+#include <acsdk/SDKClient/SDKClientRegistry.h>
+
+#include "VisualStateTrackerFeatureClient.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+/**
+ * The @c VisualStateTrackerFeatureClient builder class is responsible for creating an instance of the @c
+ * VisualStateTrackerFeatureClient and is intended to be used with the @c SDKClientBuilder and @c SDKClientRegistry.
+ * It constructs the @c VisualActivityTracker and @c PresentationOrchestratorStateTracker components which are intended
+ * for use in tracking the state of visual presentations.
+ *
+ * It requires the @c EndpointBuilderInterface and @c ContextManagerInterface components from the @c SDKClientRegistry
+ * which can be provided by @c DefaultClient
+ */
+class VisualStateTrackerFeatureClientBuilder : public sdkClient::FeatureClientBuilderInterface {
+public:
+    /**
+     * Create an instance of the VisualStateTrackerFeatureClientBuilder which can be passed to the @c SDKClientBuilder
+     * @return The @c VisualStateTrackerFeatureClientBuilder object, or nullptr if creation failed
+     */
+    static std::unique_ptr<VisualStateTrackerFeatureClientBuilder> create();
+
+    /**
+     * Construct an instance of the @c VisualStateTrackerFeatureClient
+     * @param sdkClientRegistry The @c SDKClientClientRegistry object
+     * @return An instance of the @c VisualStateTrackerFeatureClient, or nullptr if construction failed
+     */
+    std::shared_ptr<VisualStateTrackerFeatureClient> construct(
+        const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry);
+
+    /// @c FeatureClientBuilderInterface functions
+    /// @{
+    std::string name() override;
+    /// @}
+
+private:
+    /// Constructor
+    VisualStateTrackerFeatureClientBuilder();
+};
+}  // namespace featureClient
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_VISUALSTATETRACKERFEATURECLIENT_VISUALSTATETRACKERFEATURECLIENTBUILDER_H_
diff --git a/applications/FeatureClients/VisualStateTrackerFeatureClient/src/CMakeLists.txt b/applications/FeatureClients/VisualStateTrackerFeatureClient/src/CMakeLists.txt
new file mode 100644
index 0000000000..8b05fde34a
--- /dev/null
+++ b/applications/FeatureClients/VisualStateTrackerFeatureClient/src/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+add_definitions("-DACSDK_LOG_MODULE=visualStateTrackerFeatureClient")
+add_library(acsdkVisualStateTrackerFeatureClient
+        VisualStateTrackerFeatureClient.cpp
+        VisualStateTrackerFeatureClientBuilder.cpp)
+
+target_include_directories(acsdkVisualStateTrackerFeatureClient PUBLIC
+        "${acsdkVisualStateTrackerFeatureClient_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkVisualStateTrackerFeatureClient
+        acsdkPresentationOrchestratorInterfaces
+        acsdkPresentationOrchestratorStateTracker
+        acsdkShutdownManager
+        acsdkVisualCharacteristics
+        AFML
+        acsdkSDKClient)
+
+# install target
+asdk_install()
diff --git a/applications/FeatureClients/VisualStateTrackerFeatureClient/src/VisualStateTrackerFeatureClient.cpp b/applications/FeatureClients/VisualStateTrackerFeatureClient/src/VisualStateTrackerFeatureClient.cpp
new file mode 100644
index 0000000000..e365528d0e
--- /dev/null
+++ b/applications/FeatureClients/VisualStateTrackerFeatureClient/src/VisualStateTrackerFeatureClient.cpp
@@ -0,0 +1,127 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/PresentationOrchestratorStateTracker/PresentationOrchestratorStateTrackerFactory.h>
+#include <acsdk/VisualCharacteristics/VisualCharacteristicsFactory.h>
+#include <acsdk/VisualCharacteristics/VisualCharacteristicsSerializerFactory.h>
+#include <acsdkShutdownManager/ShutdownManager.h>
+#include <acsdkShutdownManager/ShutdownNotifier.h>
+#include <AFML/VisualActivityTracker.h>
+
+#include "acsdk/VisualStateTrackerFeatureClient/VisualStateTrackerFeatureClient.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+/// String to identify log entries originating from this file.
+#define TAG "VisualStateTrackerFeatureClient"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// String used to identify this feature client builder
+static const char VISUAL_STATE_TRACKER_FEATURE_CLIENT[] = "VisualStateTrackerFeatureClient";
+
+VisualStateTrackerFeatureClient::VisualStateTrackerFeatureClient(
+    std::shared_ptr<alexaClientSDK::presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>
+        presentationOrchestratorStateTracker,
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> shutdownManager) :
+        FeatureClientInterface(VISUAL_STATE_TRACKER_FEATURE_CLIENT),
+        m_presentationOrchestratorStateTracker(std::move(presentationOrchestratorStateTracker)),
+        m_shutdownManager(std::move(shutdownManager)) {
+}
+
+std::unique_ptr<VisualStateTrackerFeatureClient> VisualStateTrackerFeatureClient::create(
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>&
+        endpointBuilder,
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "contextManager null"));
+        return nullptr;
+    }
+
+    if (!endpointBuilder) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "endpointBuilder null"));
+        return nullptr;
+    }
+
+    auto shutdownNotifier = acsdkShutdownManager::ShutdownNotifier::createShutdownNotifierInterface();
+    auto shutdownManager = acsdkShutdownManager::ShutdownManager::createShutdownManagerInterface(shutdownNotifier);
+    if (!shutdownNotifier || !shutdownManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "null shutdownManager"));
+        return nullptr;
+    }
+
+    auto visualActivityTracker = afml::VisualActivityTracker::create(contextManager);
+    if (!visualActivityTracker) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "null visualActivityTracker"));
+        return nullptr;
+    }
+
+    endpointBuilder->withCapabilityConfiguration(visualActivityTracker);
+    shutdownNotifier->addObserver(visualActivityTracker);
+
+    auto poStateTrackerExports =
+        presentationOrchestratorStateTracker::PresentationOrchestratorStateTrackerFactory::create(
+            visualActivityTracker);
+    if (!poStateTrackerExports.hasValue()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "unableToCreatePresentationOrchestratorStateTracker"));
+        return nullptr;
+    }
+    auto poStateTrackerInterfaces = poStateTrackerExports.value();
+
+    shutdownNotifier->addObserver(poStateTrackerInterfaces.requiresShutdown);
+
+    if (sdkClientRegistry) {
+        sdkClientRegistry->registerComponent(poStateTrackerInterfaces.presentationOrchestratorStateTrackerInterface);
+        sdkClientRegistry->registerComponent(visualActivityTracker);
+    }
+
+    auto client = std::unique_ptr<VisualStateTrackerFeatureClient>(new VisualStateTrackerFeatureClient(
+        std::move(poStateTrackerInterfaces.presentationOrchestratorStateTrackerInterface), std::move(shutdownManager)));
+
+    return client;
+}
+
+VisualStateTrackerFeatureClient::~VisualStateTrackerFeatureClient() {
+    shutdown();
+}
+
+std::shared_ptr<alexaClientSDK::presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>
+VisualStateTrackerFeatureClient::getPresentationOrchestratorStateTracker() const {
+    return m_presentationOrchestratorStateTracker;
+}
+
+bool VisualStateTrackerFeatureClient::configure(
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    /// No-op
+    return true;
+}
+
+void VisualStateTrackerFeatureClient::doShutdown() {
+    if (m_shutdownManager) {
+        m_shutdownManager->shutdown();
+    }
+
+    m_shutdownManager.reset();
+    m_presentationOrchestratorStateTracker.reset();
+}
+
+}  // namespace featureClient
+}  // namespace alexaClientSDK
diff --git a/applications/FeatureClients/VisualStateTrackerFeatureClient/src/VisualStateTrackerFeatureClientBuilder.cpp b/applications/FeatureClients/VisualStateTrackerFeatureClient/src/VisualStateTrackerFeatureClientBuilder.cpp
new file mode 100644
index 0000000000..74e25679ec
--- /dev/null
+++ b/applications/FeatureClients/VisualStateTrackerFeatureClient/src/VisualStateTrackerFeatureClientBuilder.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/VisualStateTrackerFeatureClient/VisualStateTrackerFeatureClientBuilder.h"
+
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
+
+#include "acsdk/VisualStateTrackerFeatureClient/VisualStateTrackerFeatureClient.h"
+
+namespace alexaClientSDK {
+namespace featureClient {
+/// String to identify log entries originating from this file.
+#define TAG "VisualStateTrackerFeatureClientBuilder"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// String used to identify this feature client builder
+static const char VISUAL_STATE_TRACKER_FEATURE_CLIENT_BUILDER[] = "VisualStateTrackerFeatureClientBuilder";
+
+VisualStateTrackerFeatureClientBuilder::VisualStateTrackerFeatureClientBuilder() {
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>();
+    addRequiredType<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>();
+}
+
+std::shared_ptr<VisualStateTrackerFeatureClient> VisualStateTrackerFeatureClientBuilder::construct(
+    const std::shared_ptr<sdkClient::SDKClientRegistry>& sdkClientRegistry) {
+    if (!sdkClientRegistry) {
+        ACSDK_CRITICAL(LX("constructFailed").d("reason", "null SDKClientRegistry"));
+        return nullptr;
+    }
+
+    auto contextManager =
+        sdkClientRegistry->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>();
+    auto defaultEndpointBuilder =
+        sdkClientRegistry
+            ->getComponent<alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>();
+
+    return VisualStateTrackerFeatureClient::create(contextManager, defaultEndpointBuilder, sdkClientRegistry);
+}
+
+std::unique_ptr<VisualStateTrackerFeatureClientBuilder> VisualStateTrackerFeatureClientBuilder::create() {
+    return std::unique_ptr<VisualStateTrackerFeatureClientBuilder>(new VisualStateTrackerFeatureClientBuilder());
+}
+
+std::string VisualStateTrackerFeatureClientBuilder::name() {
+    return VISUAL_STATE_TRACKER_FEATURE_CLIENT_BUILDER;
+}
+}  // namespace featureClient
+}  // namespace alexaClientSDK
diff --git a/applications/acsdkAndroidApplicationAudioPipelineFactory/include/acsdkApplicationAudioPipelineFactory/AndroidApplicationAudioPipelineFactory.h b/applications/acsdkAndroidApplicationAudioPipelineFactory/include/acsdkApplicationAudioPipelineFactory/AndroidApplicationAudioPipelineFactory.h
index c498374a80..56bcc942f2 100644
--- a/applications/acsdkAndroidApplicationAudioPipelineFactory/include/acsdkApplicationAudioPipelineFactory/AndroidApplicationAudioPipelineFactory.h
+++ b/applications/acsdkAndroidApplicationAudioPipelineFactory/include/acsdkApplicationAudioPipelineFactory/AndroidApplicationAudioPipelineFactory.h
@@ -22,7 +22,6 @@
 #include <acsdkEqualizerInterfaces/EqualizerRuntimeSetupInterface.h>
 #include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
 #include <AndroidUtilities/AndroidSLESEngine.h>
-#include <AndroidUtilities/PlatformSpecificValues.h>
 #include <AVSCommon/SDKInterfaces/ApplicationMediaInterfaces.h>
 #include <AVSCommon/SDKInterfaces/ChannelVolumeFactoryInterface.h>
 #include <AVSCommon/SDKInterfaces/HTTPContentFetcherInterfaceFactoryInterface.h>
@@ -48,8 +47,7 @@ class AndroidApplicationAudioPipelineFactory
      * @param equalizerRuntimeSetup The @c EqualizerRuntimeSetupInterface with which to register equalizers.
      * @param httpContentFetcherFactory The @c HTTPContentFetcherInterfaceFactoryInterface to fetch remote http content.
      * @param shutdownNotifier The @c ShutdownNotifierInterface to notify created media players of shutdown.
-     * @param platformSpecificValues This object contains the Android-specific openSLES engine to use to create
-     * media players.
+     * @param openSlEngine The @c AndroidSLESEngine with which to create media players and related interfaces.
      * @param captionManager The @c CaptionManagerInterface to add captionable media sources.
      * @return A new @c ApplicationAudioPipelineFactoryInterface for Android media players.
      */
@@ -61,7 +59,7 @@ class AndroidApplicationAudioPipelineFactory
         const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
             httpContentFetcherFactory,
         const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
-        const std::shared_ptr<applicationUtilities::androidUtilities::PlatformSpecificValues>& platformSpecificValues,
+        const std::shared_ptr<applicationUtilities::androidUtilities::AndroidSLESEngine>& openSLEngine,
         const std::shared_ptr<captions::CaptionManagerInterface>& captionManager);
 
     /// @name ApplicationAudioPipelineFactoryInterface
@@ -93,7 +91,7 @@ class AndroidApplicationAudioPipelineFactory
      * @param equalizerRuntimeSetup The @c EqualizerRuntimeSetupInterface with which to register equalizers.
      * @param httpContentFetcherFactory The @c HTTPContentFetcherInterfaceFactoryInterface to fetch remote http content.
      * @param shutdownNotifier The @c ShutdownNotifierInterface to notify created media players of shutdown.
-     * @param openSlengine The @c AndroidSLESEngine with which to create media players and related interfaces.
+     * @param openSlEngine The @c AndroidSLESEngine with which to create media players and related interfaces.
      * @param captionManager The @c CaptionManagerInterface to add captionable media sources.
      */
     AndroidApplicationAudioPipelineFactory(
@@ -103,7 +101,7 @@ class AndroidApplicationAudioPipelineFactory
         const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
             httpContentFetcherFactory,
         const std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>& shutdownNotifier,
-        const std::shared_ptr<applicationUtilities::androidUtilities::AndroidSLESEngine>& openSlengine,
+        const std::shared_ptr<applicationUtilities::androidUtilities::AndroidSLESEngine>& openSlEngine,
         const std::shared_ptr<captions::CaptionManagerInterface>& captionManager);
 
     /// The @c SpeakerManagerInterface with which to register speakers.
diff --git a/applications/acsdkAndroidApplicationAudioPipelineFactory/include/acsdkApplicationAudioPipelineFactory/ApplicationAudioPipelineFactoryComponent.h b/applications/acsdkAndroidApplicationAudioPipelineFactory/include/acsdkApplicationAudioPipelineFactory/ApplicationAudioPipelineFactoryComponent.h
index 31352f0539..e19d4e61c6 100644
--- a/applications/acsdkAndroidApplicationAudioPipelineFactory/include/acsdkApplicationAudioPipelineFactory/ApplicationAudioPipelineFactoryComponent.h
+++ b/applications/acsdkAndroidApplicationAudioPipelineFactory/include/acsdkApplicationAudioPipelineFactory/ApplicationAudioPipelineFactoryComponent.h
@@ -23,7 +23,7 @@
 #include <acsdkManufactory/Component.h>
 #include <acsdkManufactory/Import.h>
 #include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
-#include <AndroidUtilities/PlatformSpecificValues.h>
+#include <AndroidUtilities/AndroidSLESEngine.h>
 #include <AVSCommon/SDKInterfaces/ChannelVolumeFactoryInterface.h>
 #include <AVSCommon/SDKInterfaces/HTTPContentFetcherInterfaceFactoryInterface.h>
 #include <AVSCommon/SDKInterfaces/SpeakerManagerInterface.h>
@@ -39,7 +39,7 @@ using AndroidApplicationAudioPipelineFactoryComponent = acsdkManufactory::Compon
     std::shared_ptr<acsdkApplicationAudioPipelineFactoryInterfaces::ApplicationAudioPipelineFactoryInterface>,
     acsdkManufactory::Import<std::shared_ptr<acsdkEqualizerInterfaces::EqualizerRuntimeSetupInterface>>,
     acsdkManufactory::Import<std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<applicationUtilities::androidUtilities::PlatformSpecificValues>>,
+    acsdkManufactory::Import<std::shared_ptr<applicationUtilities::androidUtilities::AndroidSLESEngine>>,
     acsdkManufactory::Import<std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface>>,
     acsdkManufactory::Import<std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface>>,
     acsdkManufactory::Import<std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>>,
diff --git a/applications/acsdkAndroidApplicationAudioPipelineFactory/src/AndroidApplicationAudioPipelineFactory.cpp b/applications/acsdkAndroidApplicationAudioPipelineFactory/src/AndroidApplicationAudioPipelineFactory.cpp
index c5099ede1a..cef3ddaad8 100644
--- a/applications/acsdkAndroidApplicationAudioPipelineFactory/src/AndroidApplicationAudioPipelineFactory.cpp
+++ b/applications/acsdkAndroidApplicationAudioPipelineFactory/src/AndroidApplicationAudioPipelineFactory.cpp
@@ -29,7 +29,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace captions;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AndroidApplicationAudioPipelineFactory");
+#define TAG "AndroidApplicationAudioPipelineFactory"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -45,24 +45,18 @@ AndroidApplicationAudioPipelineFactory::createApplicationAudioPipelineFactoryInt
     const std::shared_ptr<acsdkEqualizerInterfaces::EqualizerRuntimeSetupInterface>& equalizerRuntimeSetup,
     const std::shared_ptr<HTTPContentFetcherInterfaceFactoryInterface>& httpContentFetcherFactory,
     const std::shared_ptr<ShutdownNotifierInterface>& shutdownNotifier,
-    const std::shared_ptr<applicationUtilities::androidUtilities::PlatformSpecificValues>& platformSpecificValues,
+    const std::shared_ptr<applicationUtilities::androidUtilities::AndroidSLESEngine>& openSlEngine,
     const std::shared_ptr<CaptionManagerInterface>& captionManager) {
     ACSDK_DEBUG5(LX(__func__));
     if (!channelVolumeFactory || !speakerManager || !equalizerRuntimeSetup || !httpContentFetcherFactory ||
-        !shutdownNotifier || !platformSpecificValues) {
+        !shutdownNotifier || !openSlEngine) {
         ACSDK_ERROR(LX("createFailed")
                         .d("isChannelVolumeFactoryNull", !channelVolumeFactory)
                         .d("isSpeakerManagerNull", !speakerManager)
                         .d("isEqualizerRuntimeSetupNull", !equalizerRuntimeSetup)
                         .d("isHttpContentFetcherFactoryNull", !httpContentFetcherFactory)
                         .d("isShutdownNotifierNull", !shutdownNotifier)
-                        .d("isPlatformSpecificValuesNull", !platformSpecificValues));
-        return nullptr;
-    }
-
-    auto openSlEngine = platformSpecificValues->openSlEngine;
-    if (!openSlEngine) {
-        ACSDK_ERROR(LX("createApplicationAudioPipelineFactoryInterfaceFailed").m("openSlEngine is null"));
+                        .d("isOpenSlEngineNull", !openSlEngine));
         return nullptr;
     }
 
diff --git a/applications/acsdkAudioInputStream/src/AudioInputStreamFactory.cpp b/applications/acsdkAudioInputStream/src/AudioInputStreamFactory.cpp
index 5a4a7c7b71..fb02188ea0 100644
--- a/applications/acsdkAudioInputStream/src/AudioInputStreamFactory.cpp
+++ b/applications/acsdkAudioInputStream/src/AudioInputStreamFactory.cpp
@@ -21,7 +21,7 @@ namespace alexaClientSDK {
 namespace acsdkAudioInputStream {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AudioInputStreamFactory");
+#define TAG "AudioInputStreamFactory"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/applications/acsdkCBLAuthorizationDelegate/CMakeLists.txt b/applications/acsdkCBLAuthorizationDelegate/CMakeLists.txt
deleted file mode 100644
index b357a152c6..0000000000
--- a/applications/acsdkCBLAuthorizationDelegate/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-project(acsdkCBLAuthorizationDelegate LANGUAGES CXX)
-
-add_subdirectory("src")
diff --git a/applications/acsdkCBLAuthorizationDelegate/include/acsdkAuthorizationDelegate/AuthorizationDelegateComponent.h b/applications/acsdkCBLAuthorizationDelegate/include/acsdkAuthorizationDelegate/AuthorizationDelegateComponent.h
deleted file mode 100644
index 3b3e264a1d..0000000000
--- a/applications/acsdkCBLAuthorizationDelegate/include/acsdkAuthorizationDelegate/AuthorizationDelegateComponent.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKAUTHORIZATIONDELEGATE_AUTHORIZATIONDELEGATECOMPONENT_H_
-#define ACSDKAUTHORIZATIONDELEGATE_AUTHORIZATIONDELEGATECOMPONENT_H_
-
-#include <memory>
-
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
-#include <acsdkManufactory/Component.h>
-#include <acsdkManufactory/Import.h>
-#include <AVSCommon/SDKInterfaces/AuthDelegateInterface.h>
-#include <AVSCommon/Utils/DeviceInfo.h>
-#include <AVSCommon/Utils/LibcurlUtils/HttpPostInterface.h>
-#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
-#include <CBLAuthDelegate/CBLAuthRequesterInterface.h>
-#include <RegistrationManager/CustomerDataManagerInterface.h>
-
-namespace alexaClientSDK {
-namespace acsdkAuthorizationDelegate {
-
-/**
- * Manufactory Component definition for the CBL implementation of AuthDelegateInterface.
- */
-using AuthorizationDelegateComponent = acsdkManufactory::Component<
-    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>,
-    acsdkManufactory::Import<std::shared_ptr<authorization::cblAuthDelegate::CBLAuthRequesterInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<alexaClientSDK::avsCommon::utils::configuration::ConfigurationNode>>,
-    acsdkManufactory::Import<std::unique_ptr<avsCommon::utils::libcurlUtils::HttpPostInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<avsCommon::utils::DeviceInfo>>,
-    acsdkManufactory::Import<std::shared_ptr<registrationManager::CustomerDataManagerInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>>>;
-
-/**
- * Get the @c Manufactory component for creating an instance of AVSConnectionMangerInterface.
- *
- * @return The @c Manufactory component for creating an instance of AuthDelegateInterface.
- */
-AuthorizationDelegateComponent getComponent();
-
-}  // namespace acsdkAuthorizationDelegate
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKAUTHORIZATIONDELEGATE_AUTHORIZATIONDELEGATECOMPONENT_H_
diff --git a/applications/acsdkCBLAuthorizationDelegate/src/AuthorizationDelegateComponent.cpp b/applications/acsdkCBLAuthorizationDelegate/src/AuthorizationDelegateComponent.cpp
deleted file mode 100644
index 1fb5e1b9ed..0000000000
--- a/applications/acsdkCBLAuthorizationDelegate/src/AuthorizationDelegateComponent.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <acsdkManufactory/ComponentAccumulator.h>
-#include <CBLAuthDelegate/CBLAuthDelegate.h>
-#include <CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h>
-
-#include "acsdkAuthorizationDelegate/AuthorizationDelegateComponent.h"
-
-namespace alexaClientSDK {
-namespace acsdkAuthorizationDelegate {
-
-using namespace acsdkManufactory;
-using namespace authorization::cblAuthDelegate;
-
-AuthorizationDelegateComponent getComponent() {
-    return ComponentAccumulator<>()
-        .addRetainedFactory(CBLAuthDelegate::createAuthDelegateInterface)
-        .addRetainedFactory(SQLiteCBLAuthDelegateStorage::createCBLAuthDelegateStorageInterface);
-}
-
-}  // namespace acsdkAuthorizationDelegate
-}  // namespace alexaClientSDK
diff --git a/applications/acsdkCBLAuthorizationDelegate/src/CMakeLists.txt b/applications/acsdkCBLAuthorizationDelegate/src/CMakeLists.txt
deleted file mode 100644
index 3e3c4a19bf..0000000000
--- a/applications/acsdkCBLAuthorizationDelegate/src/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-add_definitions("-DACSDK_LOG_MODULE=acsdkCBLAuthorizationDelegate")
-add_library(acsdkCBLAuthorizationDelegate
-    AuthorizationDelegateComponent.cpp)
-
-target_include_directories(acsdkCBLAuthorizationDelegate PUBLIC
-    "${acsdkCBLAuthorizationDelegate_SOURCE_DIR}/include")
-
-target_link_libraries(acsdkCBLAuthorizationDelegate
-    acsdkManufactory
-    AVSCommon
-    CBLAuthDelegate)
-
-# install target
-asdk_install()
diff --git a/applications/acsdkCustomApplicationAudioPipelineFactory/src/CustomApplicationAudioPipelineFactory.cpp b/applications/acsdkCustomApplicationAudioPipelineFactory/src/CustomApplicationAudioPipelineFactory.cpp
index 5dd7ae0db3..17e9605c3f 100644
--- a/applications/acsdkCustomApplicationAudioPipelineFactory/src/CustomApplicationAudioPipelineFactory.cpp
+++ b/applications/acsdkCustomApplicationAudioPipelineFactory/src/CustomApplicationAudioPipelineFactory.cpp
@@ -25,7 +25,7 @@ using namespace avsCommon::sdkInterfaces;
 using namespace captions;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CustomApplicationAudioPipelineFactory");
+#define TAG "CustomApplicationAudioPipelineFactory"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/applications/acsdkDefaultDeviceSettingsManager/src/DeviceSettingsManagerBuilder.cpp b/applications/acsdkDefaultDeviceSettingsManager/src/DeviceSettingsManagerBuilder.cpp
index 58ee0fd864..4d192da987 100644
--- a/applications/acsdkDefaultDeviceSettingsManager/src/DeviceSettingsManagerBuilder.cpp
+++ b/applications/acsdkDefaultDeviceSettingsManager/src/DeviceSettingsManagerBuilder.cpp
@@ -26,7 +26,7 @@
 #include "acsdkDeviceSettingsManager/DeviceSettingsManagerBuilder.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("DeviceSettingsManagerBuilder");
+#define TAG "DeviceSettingsManagerBuilder"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/applications/acsdkDefaultSampleApplicationOptions/include/acsdkDefaultSampleApplicationOptions/DefaultSampleApplicationOptionsComponent.h b/applications/acsdkDefaultSampleApplicationOptions/include/acsdkDefaultSampleApplicationOptions/DefaultSampleApplicationOptionsComponent.h
index 1ba1f09d18..e06593e657 100644
--- a/applications/acsdkDefaultSampleApplicationOptions/include/acsdkDefaultSampleApplicationOptions/DefaultSampleApplicationOptionsComponent.h
+++ b/applications/acsdkDefaultSampleApplicationOptions/include/acsdkDefaultSampleApplicationOptions/DefaultSampleApplicationOptionsComponent.h
@@ -17,17 +17,15 @@
 #define ACSDKDEFAULTSAMPLEAPPLICATIONOPTIONS_DEFAULTSAMPLEAPPLICATIONOPTIONSCOMPONENT_H_
 
 #include <acsdkManufactory/Component.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
 #include <acsdkSampleApplicationInterfaces/UIManagerInterface.h>
 #include <AVSCommon/SDKInterfaces/AuthDelegateInterface.h>
 #include <AVSCommon/SDKInterfaces/AVSConnectionManagerInterface.h>
 #include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
 #include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
+#include <AVSCommon/Utils/DeviceInfo.h>
 #include <AVSCommon/Utils/LibcurlUtils/HttpPostInterface.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 #include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
-#include <CBLAuthDelegate/CBLAuthRequesterInterface.h>
 #include <RegistrationManager/CustomerDataManagerInterface.h>
 
 namespace alexaClientSDK {
@@ -37,15 +35,8 @@ namespace acsdkSampleApplication {
  * Definition of a Manufactory Component with default SampleApplication options.
  */
 using SampleApplicationOptionsComponent = acsdkManufactory::Component<
-    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>,
     std::shared_ptr<avsCommon::utils::logger::Logger>,
-    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>,
-    acsdkManufactory::Import<std::shared_ptr<authorization::cblAuthDelegate::CBLAuthRequesterInterface>>,
-    acsdkManufactory::Import<std::unique_ptr<avsCommon::utils::libcurlUtils::HttpPostInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<avsCommon::utils::DeviceInfo>>,
-    acsdkManufactory::Import<std::shared_ptr<registrationManager::CustomerDataManagerInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>>>;
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>;
 
 /**
  * Get the @c Manufactory @c Component for the default @c SampleApplication options.
@@ -53,15 +44,12 @@ using SampleApplicationOptionsComponent = acsdkManufactory::Component<
  * For applications that have not transitioned to using the manufactory to instantiate SDK components, they can
  * provide pre-built custom implementations of the @c AuthDelegateInterface and @c MetricRecorderInterface.
  *
- * @param authDelegate Optional pre-built implementation of @c AuthDelegateInterface to add to the manufactory. Default
- * is nullptr.
  * @param metricRecorder Optional pre-built implementation of @c MetricRecorderInterface to add to the
  * manufactory. Default is nullptr.
  * @param logger Optional pre-built implementation of @c Logger to add to the manufactory. Default is nullptr.
  * @return The @c Manufactory @c Component for the default @c SampleApplication options
  */
 SampleApplicationOptionsComponent getSampleApplicationOptionsComponent(
-    const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate = nullptr,
     const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder = nullptr,
     const std::shared_ptr<avsCommon::utils::logger::Logger>& logger = nullptr);
 
diff --git a/applications/acsdkDefaultSampleApplicationOptions/src/CMakeLists.txt b/applications/acsdkDefaultSampleApplicationOptions/src/CMakeLists.txt
index 7a4ccef3eb..9d54ba4344 100644
--- a/applications/acsdkDefaultSampleApplicationOptions/src/CMakeLists.txt
+++ b/applications/acsdkDefaultSampleApplicationOptions/src/CMakeLists.txt
@@ -10,9 +10,8 @@ target_link_libraries(acsdkDefaultSampleApplicationOptions
     acsdkManufactory
     acsdkNullMetricRecorder
     acsdkSampleApplicationInterfaces
-    acsdkSampleApplicationCBLAuthRequester
     acsdkShared
-    CBLAuthDelegate)
+    AVSCommon)
 
 # install target
 asdk_install()
diff --git a/applications/acsdkDefaultSampleApplicationOptions/src/DefaultSampleApplicationOptionsComponent.cpp b/applications/acsdkDefaultSampleApplicationOptions/src/DefaultSampleApplicationOptionsComponent.cpp
index 5721808140..2005ce021b 100644
--- a/applications/acsdkDefaultSampleApplicationOptions/src/DefaultSampleApplicationOptionsComponent.cpp
+++ b/applications/acsdkDefaultSampleApplicationOptions/src/DefaultSampleApplicationOptionsComponent.cpp
@@ -16,8 +16,6 @@
 #include <acsdkManufactory/ComponentAccumulator.h>
 #include <acsdkMetricRecorder/MetricRecorderComponent.h>
 #include <acsdkShared/SharedComponent.h>
-#include <CBLAuthDelegate/CBLAuthDelegate.h>
-#include <CBLAuthDelegate/SQLiteCBLAuthDelegateStorage.h>
 
 #include "acsdkDefaultSampleApplicationOptions/DefaultSampleApplicationOptionsComponent.h"
 
@@ -25,7 +23,6 @@ namespace alexaClientSDK {
 namespace acsdkSampleApplication {
 
 using namespace acsdkManufactory;
-using namespace authorization::cblAuthDelegate;
 
 /**
  * Returns a component for @c MetricRecorderInterface, using a pre-built implementation if available but otherwise
@@ -44,33 +41,6 @@ getMetricRecorderComponent(const std::shared_ptr<avsCommon::utils::metrics::Metr
     return ComponentAccumulator<>().addComponent(acsdkMetricRecorder::getComponent());
 }
 
-/**
- * Returns a component for @c AuthDelegateInterface, using a pre-built implementation if available but otherwise
- * using the Sample App's default.
- *
- * @param authDelegate Optional @c AuthDelegateInterface implementation to inject to the manufactory.
- * @return A component that exports the @c AuthDelegateInterface.
- */
-static acsdkManufactory::Component<
-    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>,
-    acsdkManufactory::Import<std::shared_ptr<authorization::cblAuthDelegate::CBLAuthRequesterInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<avsCommon::utils::DeviceInfo>>,
-    acsdkManufactory::Import<std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>>,
-    acsdkManufactory::Import<std::unique_ptr<avsCommon::utils::libcurlUtils::HttpPostInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<registrationManager::CustomerDataManagerInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>>>
-getAuthDelegateComponent(const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate) {
-    /// If a custom authDelegate is provided, add that implementation. Otherwise, use defaults.
-    if (authDelegate) {
-        return ComponentAccumulator<>().addInstance(authDelegate);
-    }
-
-    return ComponentAccumulator<>()
-        .addRetainedFactory(CBLAuthDelegate::createAuthDelegateInterface)
-        .addRetainedFactory(SQLiteCBLAuthDelegateStorage::createCBLAuthDelegateStorageInterface);
-}
-
 /**
  * Returns a component for @c Logger, using a pre-built implementation if available but otherwise
  * using the Sample App's default.
@@ -94,11 +64,9 @@ static acsdkManufactory::Component<std::shared_ptr<avsCommon::utils::logger::Log
 }
 
 SampleApplicationOptionsComponent getSampleApplicationOptionsComponent(
-    const std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>& authDelegate,
     const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder,
     const std::shared_ptr<avsCommon::utils::logger::Logger>& logger) {
     return ComponentAccumulator<>()
-        .addComponent(getAuthDelegateComponent(authDelegate))
         .addComponent(getLoggerComponent(logger))
         .addComponent(getMetricRecorderComponent(metricRecorder))
         .addComponent(acsdkShared::getComponent());
diff --git a/applications/acsdkGstreamerApplicationAudioPipelineFactory/src/GstreamerApplicationAudioPipelineFactory.cpp b/applications/acsdkGstreamerApplicationAudioPipelineFactory/src/GstreamerApplicationAudioPipelineFactory.cpp
index f65a977f83..d4d47a92a9 100644
--- a/applications/acsdkGstreamerApplicationAudioPipelineFactory/src/GstreamerApplicationAudioPipelineFactory.cpp
+++ b/applications/acsdkGstreamerApplicationAudioPipelineFactory/src/GstreamerApplicationAudioPipelineFactory.cpp
@@ -28,7 +28,7 @@ using namespace avsCommon::utils::mediaPlayer;
 using namespace captions;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("GstreamerApplicationAudioPipelineFactory");
+#define TAG "GstreamerApplicationAudioPipelineFactory"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/applications/acsdkNullSpeechEncoder/include/acsdkSpeechEncoder/SpeechEncoderComponent.h b/applications/acsdkNullSpeechEncoder/include/acsdkSpeechEncoder/SpeechEncoderComponent.h
deleted file mode 100644
index 8723d42cc4..0000000000
--- a/applications/acsdkNullSpeechEncoder/include/acsdkSpeechEncoder/SpeechEncoderComponent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKSPEECHENCODER_SPEECHENCODERCOMPONENT_H_
-#define ACSDKSPEECHENCODER_SPEECHENCODERCOMPONENT_H_
-
-#include <memory>
-
-#include <acsdkManufactory/Component.h>
-#include <SpeechEncoder/SpeechEncoder.h>
-
-namespace alexaClientSDK {
-namespace acsdkSpeechEncoder {
-
-/**
- * Manufactory Component definition for null implementation of SpeechEncoder.
- */
-using SpeechEncoderComponent = acsdkManufactory::Component<std::shared_ptr<speechencoder::SpeechEncoder>>;
-
-/**
- * Get the Manufactory component for creating null instances of SpeechEncoder.
- *
- * @return The default @c Manufactory component for creating null instances of SpeechEncoder.
- */
-SpeechEncoderComponent getComponent();
-
-}  // namespace acsdkSpeechEncoder
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKSPEECHENCODER_SPEECHENCODERCOMPONENT_H_
diff --git a/applications/acsdkNullSpeechEncoder/src/CMakeLists.txt b/applications/acsdkNullSpeechEncoder/src/CMakeLists.txt
index 8350bdbbe5..712aa28178 100644
--- a/applications/acsdkNullSpeechEncoder/src/CMakeLists.txt
+++ b/applications/acsdkNullSpeechEncoder/src/CMakeLists.txt
@@ -1,13 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=acsdkNullSpeechEncoder")
-add_library(acsdkNullSpeechEncoder
-        SpeechEncoderComponent.cpp)
-
-target_include_directories(acsdkNullSpeechEncoder PUBLIC
-        "${acsdkNullSpeechEncoder_SOURCE_DIR}/include")
-
-target_link_libraries(acsdkNullSpeechEncoder
-        acsdkManufactory
-        SpeechEncoder)
+add_library(acsdkNullSpeechEncoder SpeechEncoderComponent.cpp)
+target_link_libraries(acsdkNullSpeechEncoder PUBLIC acsdkAudioEncoderComponent acsdkAudioEncoderInterfaces)
 
 # install target
-asdk_install()
+asdk_install_targets(acsdkNullSpeechEncoder FALSE)
diff --git a/applications/acsdkNullSpeechEncoder/src/SpeechEncoderComponent.cpp b/applications/acsdkNullSpeechEncoder/src/SpeechEncoderComponent.cpp
index 3f06968d0f..9c78a25ee5 100644
--- a/applications/acsdkNullSpeechEncoder/src/SpeechEncoderComponent.cpp
+++ b/applications/acsdkNullSpeechEncoder/src/SpeechEncoderComponent.cpp
@@ -13,18 +13,18 @@
  * permissions and limitations under the License.
  */
 
+#include <acsdk/AudioEncoderComponent/ComponentFactory.h>
 #include <acsdkManufactory/ComponentAccumulator.h>
 
-#include "acsdkSpeechEncoder/SpeechEncoderComponent.h"
-
 namespace alexaClientSDK {
-namespace acsdkSpeechEncoder {
+namespace audioEncoderComponent {
 
+using namespace audioEncoderInterfaces;
 using namespace acsdkManufactory;
 
-SpeechEncoderComponent getComponent() {
-    return ComponentAccumulator<>().addInstance<std::shared_ptr<speechencoder::SpeechEncoder>>(nullptr);
+AudioEncoderComponent getComponent() {
+    return ComponentAccumulator<>().addInstance<std::shared_ptr<AudioEncoderInterface>>(nullptr);
 }
 
-}  // namespace acsdkSpeechEncoder
+}  // namespace audioEncoderComponent
 }  // namespace alexaClientSDK
diff --git a/applications/acsdkOpusSpeechEncoder/include/acsdkSpeechEncoder/SpeechEncoderComponent.h b/applications/acsdkOpusSpeechEncoder/include/acsdkSpeechEncoder/SpeechEncoderComponent.h
deleted file mode 100644
index cb3ecd7455..0000000000
--- a/applications/acsdkOpusSpeechEncoder/include/acsdkSpeechEncoder/SpeechEncoderComponent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKSPEECHENCODER_SPEECHENCODERCOMPONENT_H_
-#define ACSDKSPEECHENCODER_SPEECHENCODERCOMPONENT_H_
-
-#include <memory>
-
-#include <acsdkManufactory/Component.h>
-#include <SpeechEncoder/SpeechEncoder.h>
-
-namespace alexaClientSDK {
-namespace acsdkSpeechEncoder {
-
-/**
- * Manufactory Component definition for an Opus @c SpeechEncoder.
- */
-using SpeechEncoderComponent = acsdkManufactory::Component<std::shared_ptr<speechencoder::SpeechEncoder>>;
-
-/**
- * Get the Manufactory component for creating an Opus @c SpeechEncoder.
- *
- * @return The default @c Manufactory component for creating an Opus @c SpeechEncoder.
- */
-SpeechEncoderComponent getComponent();
-
-}  // namespace acsdkSpeechEncoder
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKSPEECHENCODER_SPEECHENCODERCOMPONENT_H_
diff --git a/applications/acsdkOpusSpeechEncoder/src/CMakeLists.txt b/applications/acsdkOpusSpeechEncoder/src/CMakeLists.txt
index fabc17969d..79382cef1a 100644
--- a/applications/acsdkOpusSpeechEncoder/src/CMakeLists.txt
+++ b/applications/acsdkOpusSpeechEncoder/src/CMakeLists.txt
@@ -1,14 +1,9 @@
 add_definitions("-DACSDK_LOG_MODULE=acsdkOpusSpeechEncoder")
-add_library(acsdkOpusSpeechEncoder
-        SpeechEncoderComponent.cpp)
-
-target_include_directories(acsdkOpusSpeechEncoder PUBLIC
-        "${acsdkOpusSpeechEncoder_SOURCE_DIR}/include")
-
-target_link_libraries(acsdkOpusSpeechEncoder
-        acsdkManufactory
-        OpusEncoderContext
-        SpeechEncoder)
+add_library(acsdkOpusSpeechEncoder SpeechEncoderComponent.cpp)
+target_link_libraries(acsdkOpusSpeechEncoder PUBLIC
+        acsdkAudioEncoderComponent
+        acsdkAudioEncoder
+        acsdkOpusAudioEncoder)
 
 # install target
-asdk_install()
+asdk_install_targets(acsdkOpusSpeechEncoder FALSE)
diff --git a/applications/acsdkOpusSpeechEncoder/src/SpeechEncoderComponent.cpp b/applications/acsdkOpusSpeechEncoder/src/SpeechEncoderComponent.cpp
index 3d8ba81297..f8a6d6e948 100644
--- a/applications/acsdkOpusSpeechEncoder/src/SpeechEncoderComponent.cpp
+++ b/applications/acsdkOpusSpeechEncoder/src/SpeechEncoderComponent.cpp
@@ -14,21 +14,33 @@
  */
 
 #include <acsdkManufactory/ComponentAccumulator.h>
-#include <SpeechEncoder/OpusEncoderContext.h>
-
-#include "acsdkSpeechEncoder/SpeechEncoderComponent.h"
+#include <acsdk/AudioEncoder/AudioEncoderFactory.h>
+#include <acsdk/AudioEncoderComponent/ComponentFactory.h>
+#include <acsdk/OpusAudioEncoder/AudioEncoderFactory.h>
 
 namespace alexaClientSDK {
-namespace acsdkSpeechEncoder {
+namespace audioEncoderComponent {
 
 using namespace acsdkManufactory;
-using namespace speechencoder;
+using namespace audioEncoder;
+using namespace audioEncoderInterfaces;
+using namespace opusAudioEncoder;
+
+/**
+ * Helper to create OPUS-based audio encoder with default parameters.
+ *
+ * @return Audio encoder instance or nullptr on error.
+ * @private
+ */
+static std::shared_ptr<AudioEncoderInterface> createAudioEncoderWithDefaultParams() {
+    auto blockEncoder = createOpusAudioEncoder();
+    auto encoder = createAudioEncoder(std::move(blockEncoder));
+    return std::move(encoder);
+}
 
-SpeechEncoderComponent getComponent() {
-    return ComponentAccumulator<>()
-        .addRetainedFactory(SpeechEncoder::createSpeechEncoder)
-        .addRetainedFactory(OpusEncoderContext::createEncoderContext);
+AudioEncoderComponent getComponent() {
+    return ComponentAccumulator<>().addRetainedFactory(createAudioEncoderWithDefaultParams);
 }
 
-}  // namespace acsdkSpeechEncoder
+}  // namespace audioEncoderComponent
 }  // namespace alexaClientSDK
diff --git a/applications/acsdkPreviewAlexaClient/CMakeLists.txt b/applications/acsdkPreviewAlexaClient/CMakeLists.txt
deleted file mode 100644
index 5f783f688f..0000000000
--- a/applications/acsdkPreviewAlexaClient/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-
-set(VALID FALSE)
-
-if (PORTAUDIO AND (GSTREAMER_MEDIA_PLAYER OR CUSTOM_MEDIA_PLAYER))
-    set(VALID TRUE)
-elseif (ANDROID_MEDIA_PLAYER AND ANDROID_MICROPHONE)
-    set(VALID TRUE)
-elseif (AUDIO_INJECTION AND (GSTREAMER_MEDIA_PLAYER OR ANDROID_MEDIA_PLAYER OR CUSTOM_MEDIA_PLAYER))
-    set(VALID TRUE)
-endif()
-
-if (VALID)
-    project(acsdkPreviewAlexaClient LANGUAGES CXX)
-    include("${AVS_CMAKE_BUILD}/BuildDefaults.cmake")
-
-    add_subdirectory("src")
-else()
-    message("To build the Preview Alexa Client, please enable microphone and media player modules.")
-endif()
\ No newline at end of file
diff --git a/applications/acsdkPreviewAlexaClient/README.md b/applications/acsdkPreviewAlexaClient/README.md
deleted file mode 100644
index 4dcc0d9973..0000000000
--- a/applications/acsdkPreviewAlexaClient/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# What is Preview Alexa Client?
-
-Now the SDK ships with two application executables: Sample App and Preview Alexa Client.
-
-This is intended to ease the transition to using the manufactory, which requires significant work performed incrementally over the next few releases.
-
-**Preview Alexa Client** is a sneak peek into the ongoing work to integrating the manufactory into the SDK, and you should expect its `PreviewAlexaClientComponent` and related manufactory objects to change substantially over the next several releases while the work is completed. We will not maintain backwards-compatibility for the Preview Alexa Client during this time. We encourage you to take a look to familiarize yourself with these new concepts.
-
-Preview Alexa Client is functionally the same as the Sample App, but its source code is quite different.
-
-## Learn more
-
-See the latest release notes as well as instructions for building and running this application in our [online documentation](https://developer.amazon.com/en-US/docs/alexa/avs-device-sdk/release-notes.html).
\ No newline at end of file
diff --git a/applications/acsdkPreviewAlexaClient/include/acsdkPreviewAlexaClient/PreviewAlexaClient.h b/applications/acsdkPreviewAlexaClient/include/acsdkPreviewAlexaClient/PreviewAlexaClient.h
deleted file mode 100644
index eac3137d0e..0000000000
--- a/applications/acsdkPreviewAlexaClient/include/acsdkPreviewAlexaClient/PreviewAlexaClient.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKPREVIEWALEXACLIENT_PREVIEWALEXACLIENT_H_
-#define ACSDKPREVIEWALEXACLIENT_PREVIEWALEXACLIENT_H_
-
-#include <fstream>
-#include <map>
-#include <memory>
-#include <tuple>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include <acsdkExternalMediaPlayer/ExternalMediaPlayer.h>
-#include <acsdkShutdownManagerInterfaces/ShutdownManagerInterface.h>
-#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
-#include <AVSCommon/SDKInterfaces/ApplicationMediaInterfaces.h>
-#include <AVSCommon/SDKInterfaces/CapabilitiesDelegateInterface.h>
-#include <AVSCommon/SDKInterfaces/ChannelVolumeInterface.h>
-#include <AVSCommon/SDKInterfaces/Diagnostics/DiagnosticsInterface.h>
-#include <SampleApp/ConsolePrinter.h>
-#include <SampleApp/ConsoleReader.h>
-#include <SampleApp/GuiRenderer.h>
-#include <SampleApp/SampleApplicationReturnCodes.h>
-#include <SampleApp/UserInputManager.h>
-
-#ifdef AUTH_MANAGER
-#include <acsdkAuthorization/AuthorizationManager.h>
-#include <acsdkAuthorization/LWA/LWAAuthorizationAdapter.h>
-#endif
-
-#ifdef KWD
-#include <acsdkKWDImplementations/AbstractKeywordDetector.h>
-#endif
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-#include <MediaPlayer/MediaPlayer.h>
-#elif defined(ANDROID_MEDIA_PLAYER)
-#include <AndroidSLESMediaPlayer/AndroidSLESMediaPlayer.h>
-#endif
-
-namespace alexaClientSDK {
-namespace acsdkPreviewAlexaClient {
-
-/// Key for the root node value containing configuration values for SampleApp.
-static constexpr const char* SAMPLE_APP_CONFIG_KEY("sampleApp");
-
-/**
- * Class to manage the top-level components of the AVS Client Application.
- *
- * This PreviewAlexaClient is provided as a preview of the ongoing manufactory work being integrated into the SDK.
- * It provides identical functionality to the SampleApplication, but the source code is different.
- *
- * This class and the components it uses are expected to change over the next several releases as the SDK team
- * incrementally integrates the manufactory to the SDK.
- *
- */
-class PreviewAlexaClient {
-public:
-    /**
-     * Create a PreviewAlexaClient.
-     *
-     * @param consoleReader The @c ConsoleReader to read inputs from console.
-     * @param configFiles The vector of configuration files.
-     * @param logLevel The level of logging to enable.  If this parameter is an empty string, the SDK's default
-     *     logging level will be used.
-     * @param diagnostics An optional @c DiagnosticsInterface object to provide diagnostics on the SDK.
-     * @return A new @c PreviewAlexaClient, or @c nullptr if the operation failed.
-     */
-    static std::unique_ptr<PreviewAlexaClient> create(
-        std::shared_ptr<alexaClientSDK::sampleApp::ConsoleReader> consoleReader,
-        const std::vector<std::string>& configFiles,
-        const std::string& logLevel = "",
-        std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics = nullptr);
-
-    /**
-     * Runs the application, blocking until the user asks the application to quit or a device reset is triggered.
-     *
-     * @return Returns a @c SampleAppReturnCode.
-     */
-    sampleApp::SampleAppReturnCode run();
-
-#ifdef DIAGNOSTICS
-    /**
-     * Initiates application stop for restart sequence. This method notifies event loop that the application
-     * should be terminated with subsequent restart, in other words, if the application is running, it should
-     * return SampleAppReturnCode::RESTART code.
-     *
-     * @return True if restart has been successfully initiated, false on error or if operation is not supported.
-     */
-    bool initiateRestart();
-#endif
-
-    /// Destructor which manages the @c SampleApplication shutdown sequence.
-    ~PreviewAlexaClient();
-
-private:
-    /**
-     * Initialize a PreviewAlexaClient.
-     *
-     * @param consoleReader The @c ConsoleReader to read inputs from console.
-     * @param configFiles The vector of configuration files.
-     * @param logLevel The level of logging to enable.  If this parameter is an empty string, the SDK's default
-     *     logging level will be used.
-     * @param diagnostics An optional @c DiagnosticsInterface object to provide diagnostics on the SDK.
-     * @return @c true if initialization succeeded, else @c false.
-     */
-    bool initialize(
-        std::shared_ptr<alexaClientSDK::sampleApp::ConsoleReader> consoleReader,
-        const std::vector<std::string>& configFiles,
-        const std::string& logLevel,
-        std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics);
-
-    /**
-     * Create an application media player.
-     *
-     * @param contentFetcherFactory Used to create objects that can fetch remote HTTP content.
-     * @param enableEqualizer Flag indicating if equalizer should be enabled for this media player.
-     * @param name The media player instance name used for logging purpose.
-     * @param enableLiveMode Flag, indicating if the player is in live mode.
-     * @return Application Media interface if it succeeds; otherwise, return @c nullptr.
-     */
-    std::shared_ptr<avsCommon::sdkInterfaces::ApplicationMediaInterfaces> createApplicationMediaPlayer(
-        const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
-            httpContentFetcherFactory,
-        bool enableEqualizer,
-        const std::string& name,
-        bool enableLiveMode = false);
-
-#ifdef ENABLE_ENDPOINT_CONTROLLERS
-    /**
-     * Function to add Toggle, Range and Mode handlers to the Default endpoint.
-     *
-     * @param defaultEndpointBuilder The reference to default endpoint's @c EndpointBuilderInterface used for adding
-     * controllers.
-     * @return Returns @c true if successful in adding all the three controllers otherwise @c false.
-     */
-
-    bool addControllersToDefaultEndpoint(
-        std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> defaultEndpointBuilder);
-
-    /**
-     * Function to add Power, Toggle, Range and Mode handlers to the Peripheral endpoint.
-     *
-     * @param peripheralEndpointBuilder The reference to peripheral endpoint's @c EndpointBuilder used for adding
-     * controllers.
-     * @return Returns @c true if successful in adding all the four controllers otherwise @c false.
-     */
-    bool addControllersToPeripheralEndpoint(
-        std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> peripheralEndpointBuilder);
-#endif
-    /// Object with which to trigger shutdown operations.
-    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> m_shutdownManager;
-
-    /// Object to manage lifecycle of Alexa Client SDK initialization.
-    std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit> m_sdkInit;
-
-    /// The @c InteractionManager which perform user requests.
-    std::shared_ptr<sampleApp::InteractionManager> m_interactionManager;
-
-    /// The @c UserInputManager which controls the client.
-    std::shared_ptr<sampleApp::UserInputManager> m_userInputManager;
-
-    /// The @c GuiRender which provides an abstraction to visual rendering
-    std::shared_ptr<sampleApp::GuiRenderer> m_guiRenderer;
-
-    /// The vector of components requiring shutdown
-    std::vector<std::shared_ptr<avsCommon::utils::RequiresShutdown>> m_shutdownRequiredList;
-
-#ifdef ENABLE_COMMS_AUDIO_PROXY
-    /// The @c MediaPlayer used by @c Comms.
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_commsMediaPlayer;
-#endif
-
-#ifdef ENABLE_PCC
-    /// The @c MediaPlayer used by PhoneCallController.
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_phoneMediaPlayer;
-#endif
-
-    /// The @c CapabilitiesDelegate used by the client.
-    std::shared_ptr<avsCommon::sdkInterfaces::CapabilitiesDelegateInterface> m_capabilitiesDelegate;
-
-    /// The @c MediaPlayer used by @c NotificationsCapabilityAgent.
-    std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> m_ringtoneMediaPlayer;
-
-    /// The Wakeword Detector which can wake up the client using audio input.
-    std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> m_keywordDetector;
-
-#if defined(ANDROID_MEDIA_PLAYER) || defined(ANDROID_MICROPHONE)
-    /// The android OpenSL ES engine used to create media players and microphone.
-    std::shared_ptr<applicationUtilities::androidUtilities::AndroidSLESEngine> m_openSlEngine;
-#endif
-
-#ifdef POWER_CONTROLLER
-    /// The @c PeripheralEndpointPowerControllerHandler used by @c InteractionManager
-    std::shared_ptr<sampleApp::PeripheralEndpointPowerControllerHandler> m_peripheralEndpointPowerHandler;
-#endif
-
-#ifdef TOGGLE_CONTROLLER
-    /// The @c PeripheralEndpointToggleControllerHandler used by @c InteractionManager
-    std::shared_ptr<sampleApp::PeripheralEndpointToggleControllerHandler> m_peripheralEndpointToggleHandler;
-#endif
-
-#ifdef RANGE_CONTROLLER
-    /// The @c PeripheralEndpointRangeControllerHandler used by @c InteractionManager
-    std::shared_ptr<sampleApp::PeripheralEndpointRangeControllerHandler> m_peripheralEndpointRangeHandler;
-#endif
-
-#ifdef MODE_CONTROLLER
-    /// The @c PeripheralEndpointModeControllerHandler used by @c InteractionManager
-    std::shared_ptr<sampleApp::PeripheralEndpointModeControllerHandler> m_peripheralEndpointModeHandler;
-#endif
-
-#ifdef AUTH_MANAGER
-    /// The @c AuthorizationManager instance that can be used to dynamically authorize with different methods.
-    std::shared_ptr<acsdkAuthorization::AuthorizationManager> m_authManager;
-
-    /// The adapter that supports authorizing with LWA based methods.
-    std::shared_ptr<acsdkAuthorization::lwa::LWAAuthorizationAdapter> m_lwaAdapter;
-#endif
-};
-
-}  // namespace acsdkPreviewAlexaClient
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKPREVIEWALEXACLIENT_PREVIEWALEXACLIENT_H_
diff --git a/applications/acsdkPreviewAlexaClient/include/acsdkPreviewAlexaClient/PreviewAlexaClientComponent.h b/applications/acsdkPreviewAlexaClient/include/acsdkPreviewAlexaClient/PreviewAlexaClientComponent.h
deleted file mode 100644
index bcde94822b..0000000000
--- a/applications/acsdkPreviewAlexaClient/include/acsdkPreviewAlexaClient/PreviewAlexaClientComponent.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKPREVIEWALEXACLIENT_PREVIEWALEXACLIENTCOMPONENT_H_
-#define ACSDKPREVIEWALEXACLIENT_PREVIEWALEXACLIENTCOMPONENT_H_
-
-#include <istream>
-#include <memory>
-#include <vector>
-
-#include <acsdkAlertsInterfaces/AlertsCapabilityAgentInterface.h>
-#include <acsdkApplicationAudioPipelineFactoryInterfaces/ApplicationAudioPipelineFactoryInterface.h>
-#include <acsdkBluetoothInterfaces/BluetoothLocalInterface.h>
-#include <acsdkBluetoothInterfaces/BluetoothNotifierInterface.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
-#include <acsdkDeviceSetupInterfaces/DeviceSetupInterface.h>
-#include <acsdkEqualizerInterfaces/EqualizerModeControllerInterface.h>
-#include <acsdkEqualizerInterfaces/EqualizerRuntimeSetupInterface.h>
-#include <acsdkInteractionModelInterfaces/InteractionModelNotifierInterface.h>
-#include <acsdkKWDImplementations/AbstractKeywordDetector.h>
-#include <acsdkManufactory/Component.h>
-#include <acsdkShutdownManagerInterfaces/ShutdownManagerInterface.h>
-#include <acsdkStartupManagerInterfaces/StartupManagerInterface.h>
-#include <acsdkSystemClockMonitorInterfaces/SystemClockMonitorInterface.h>
-#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
-#include <AVSCommon/AVS/Initialization/InitializationParameters.h>
-#include <AVSCommon/SDKInterfaces/AudioFocusAnnotation.h>
-#include <AVSCommon/SDKInterfaces/AuthDelegateInterface.h>
-#include <AVSCommon/SDKInterfaces/AVSConnectionManagerInterface.h>
-#include <AVSCommon/SDKInterfaces/CapabilitiesDelegateInterface.h>
-#include <AVSCommon/SDKInterfaces/ChannelVolumeFactoryInterface.h>
-#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
-#include <AVSCommon/SDKInterfaces/Diagnostics/DiagnosticsInterface.h>
-#include <AVSCommon/SDKInterfaces/ExpectSpeechTimeoutHandlerInterface.h>
-#include <AVSCommon/SDKInterfaces/FocusManagerInterface.h>
-#include <AVSCommon/SDKInterfaces/LocaleAssetsManagerInterface.h>
-#include <AVSCommon/SDKInterfaces/VisualFocusAnnotation.h>
-#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <AVSCommon/Utils/DeviceInfo.h>
-#include <AVSCommon/Utils/MediaPlayer/MediaPlayerFactoryInterface.h>
-#include <CBLAuthDelegate/CBLAuthDelegateStorageInterface.h>
-#include <CBLAuthDelegate/CBLAuthRequesterInterface.h>
-#include <CertifiedSender/CertifiedSender.h>
-#include <InterruptModel/InterruptModel.h>
-#include <RegistrationManager/CustomerDataManagerInterface.h>
-#include <SampleApp/PlatformSpecificValues.h>
-#include <SampleApp/UIManager.h>
-#include <SpeechEncoder/SpeechEncoder.h>
-
-#ifdef ANDROID_MEDIA_PLAYER
-#include <AndroidUtilities/AndroidSLESEngine.h>
-#endif
-
-namespace alexaClientSDK {
-namespace acsdkPreviewAlexaClient {
-
-/**
- * Definition of a Manufactory Component for PreviewAlexaClient.
- *
- * This Manufactory will change significantly over the next several releases while manufactory integration
- * is incrementally completed in the SDK. In the meantime, applications should not expect this definition to
- * remain stable.
- */
-using PreviewAlexaClientComponent = acsdkManufactory::Component<
-    acsdkManufactory::
-        Annotated<avsCommon::sdkInterfaces::AudioFocusAnnotation, avsCommon::sdkInterfaces::FocusManagerInterface>,
-    acsdkManufactory::
-        Annotated<avsCommon::sdkInterfaces::VisualFocusAnnotation, avsCommon::sdkInterfaces::FocusManagerInterface>,
-    acsdkManufactory::Annotated<
-        avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation,
-        avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>,
-    std::shared_ptr<acsdkAlertsInterfaces::AlertsCapabilityAgentInterface>,
-    std::shared_ptr<acsdkApplicationAudioPipelineFactoryInterfaces::ApplicationAudioPipelineFactoryInterface>,
-    std::shared_ptr<acsdkAudioPlayerInterfaces::AudioPlayerInterface>,
-    std::shared_ptr<acsdkBluetoothInterfaces::BluetoothLocalInterface>,
-    std::shared_ptr<acsdkBluetoothInterfaces::BluetoothNotifierInterface>,
-    std::shared_ptr<acsdkDeviceSetupInterfaces::DeviceSetupInterface>,
-    std::shared_ptr<acsdkEqualizerInterfaces::EqualizerRuntimeSetupInterface>,
-    std::shared_ptr<acsdkExternalMediaPlayer::ExternalMediaPlayer>,
-    std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerInterface>,
-    std::shared_ptr<acsdkInteractionModelInterfaces::InteractionModelNotifierInterface>,
-    std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>,
-    std::shared_ptr<acsdkNotificationsInterfaces::NotificationsNotifierInterface>,
-    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface>,
-    std::shared_ptr<acsdkStartupManagerInterfaces::StartupManagerInterface>,
-    std::shared_ptr<acsdkSystemClockMonitorInterfaces::SystemClockMonitorInterface>,
-    std::shared_ptr<afml::interruptModel::InterruptModel>,
-    std::shared_ptr<avsCommon::avs::attachment::AttachmentManagerInterface>,
-    std::shared_ptr<avsCommon::avs::AudioInputStream>,
-    std::shared_ptr<avsCommon::avs::DialogUXStateAggregator>,
-    std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit>,
-    std::shared_ptr<avsCommon::sdkInterfaces::audio::AudioFactoryInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::AVSConnectionManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::AVSGatewayManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::CapabilitiesDelegateInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::DirectiveSequencerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::ExpectSpeechTimeoutHandlerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::PlaybackRouterInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::SystemSoundPlayerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::SystemTimeZoneInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::UserInactivityMonitorInterface>,
-    std::shared_ptr<avsCommon::utils::AudioFormat>,
-    std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>,
-    std::shared_ptr<avsCommon::utils::DeviceInfo>,
-    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>,
-    std::shared_ptr<capabilityAgents::alexa::AlexaInterfaceMessageSender>,
-    std::shared_ptr<capabilityAgents::doNotDisturb::DoNotDisturbCapabilityAgent>,
-    std::shared_ptr<captions::CaptionManagerInterface>,
-    std::shared_ptr<certifiedSender::CertifiedSender>,
-    std::shared_ptr<registrationManager::CustomerDataManagerInterface>,
-    std::shared_ptr<registrationManager::RegistrationManagerInterface>,
-    std::shared_ptr<registrationManager::RegistrationNotifierInterface>,
-    std::shared_ptr<sampleApp::UIManager>,
-    std::shared_ptr<settings::DeviceSettingsManager>,
-    std::shared_ptr<settings::storage::DeviceSettingStorageInterface>,
-    std::shared_ptr<speechencoder::SpeechEncoder>,
-    std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>,
-    std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>>;
-
-/**
- * Get the manufactory @c Component for PreviewAlexaClient.
- *
- * @return The manufactory @c Component for PreviewAlexaClient.
- */
-PreviewAlexaClientComponent getComponent(
-    std::unique_ptr<avsCommon::avs::initialization::InitializationParameters> initParams,
-    const std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface>& diagnostics,
-    const std::shared_ptr<sampleApp::PlatformSpecificValues>& platformSpecificValues,
-    const std::shared_ptr<avsCommon::sdkInterfaces::ExpectSpeechTimeoutHandlerInterface>& expectSpeechTimeoutHandler,
-    const std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface>& powerResourceManager);
-
-}  // namespace acsdkPreviewAlexaClient
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKPREVIEWALEXACLIENT_PREVIEWALEXACLIENTCOMPONENT_H_
diff --git a/applications/acsdkPreviewAlexaClient/src/CMakeLists.txt b/applications/acsdkPreviewAlexaClient/src/CMakeLists.txt
deleted file mode 100644
index f0ea97a360..0000000000
--- a/applications/acsdkPreviewAlexaClient/src/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-set(LibPreviewAlexaClient_SOURCES)
-list(APPEND LibPreviewAlexaClient_SOURCES
-        PreviewAlexaClient.cpp
-        PreviewAlexaClientComponent.cpp)
-
-add_library(LibPreviewAlexaClient ${LibPreviewAlexaClient_SOURCES})
-
-target_include_directories(LibPreviewAlexaClient PUBLIC
-        "${acsdkPreviewAlexaClient_SOURCE_DIR}/include")
-
-target_link_libraries(LibPreviewAlexaClient
-        ${ACSDKALEXACOMMUNICATIONS_LIB}
-        ${ACSDKAPPLICATIONAUDIOPIPELINEFACTORY_LIB}
-        ${ACSDKAUDIOINPUTSTREAM_LIB}
-        ${ACSDKAUTHORIZATIONDELEGATE_LIB}
-        ${ACSDKBLUETOOTHIMPLEMENTATIONS_LIB}
-        ${ACSDKDEVICESETTINGSMANAGER_LIB}
-        ${ACSDKHTTPCONTENTFETCHER_LIB}
-        ${ACSDKINTERNETCONNECTIONMONITOR_LIB}
-        ${ACSDKMETRICRECORDER_LIB}
-        ${ACSDKSPEECHENCODER_LIB}
-        ${ACSDKSYSTEMTIMEZONE_LIB}
-        acsdkAlerts
-        acsdkApplicationAudioPipelineFactoryInterfaces
-        acsdkCore
-        acsdkCrypto
-        acsdkDeviceSetup
-        acsdkDeviceSetupInterfaces
-        acsdkInteractionModel
-        acsdkKWD
-        acsdkLibcurlHTTPContentFetcher
-        acsdkManufactory
-        acsdkPkcs11
-        acsdkSampleApplicationInterfaces
-        LibSampleApp)
-
-if (EXTERNAL_MEDIA_ADAPTERS)
-    target_link_libraries(LibPreviewAlexaClient acsdkExternalMediaPlayerAdapters)
-endif()
-
-if (AUTH_MANAGER)
-    target_link_libraries(LibPreviewAlexaClient acsdkAuthorization)
-endif()
-
-if (PKCS11)
-    target_compile_definitions(LibPreviewAlexaClient PRIVATE ENABLE_PKCS11)
-endif()
-
-add_rpath_to_target("LibPreviewAlexaClient")
-
-add_executable(PreviewAlexaClient
-        previewMain.cpp)
-
-target_link_libraries(PreviewAlexaClient LibPreviewAlexaClient)
-
-# install target
-asdk_install_targets(LibPreviewAlexaClient TRUE)
diff --git a/applications/acsdkPreviewAlexaClient/src/PreviewAlexaClient.cpp b/applications/acsdkPreviewAlexaClient/src/PreviewAlexaClient.cpp
deleted file mode 100644
index 50cf2cb0e9..0000000000
--- a/applications/acsdkPreviewAlexaClient/src/PreviewAlexaClient.cpp
+++ /dev/null
@@ -1,1605 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <algorithm>
-#include <cctype>
-#include <csignal>
-
-#include <acsdkManufactory/Manufactory.h>
-#include <AVSCommon/AVS/CapabilitySemantics/CapabilitySemantics.h>
-#include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
-#include <AVSCommon/AVS/Initialization/InitializationParametersBuilder.h>
-#include <AVSCommon/SDKInterfaces/Bluetooth/BluetoothDeviceConnectionRuleInterface.h>
-#include <AVSCommon/SDKInterfaces/Diagnostics/ProtocolTracerInterface.h>
-#include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
-#include <AVSCommon/SDKInterfaces/PowerResourceManagerInterface.h>
-#include <AVSCommon/SDKInterfaces/Timing/TimerDelegateFactoryInterface.h>
-#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <AVSCommon/Utils/DeviceInfo.h>
-#include <AVSCommon/Utils/LibcurlUtils/HTTPContentFetcherFactory.h>
-#include <AVSCommon/Utils/LibcurlUtils/HttpPost.h>
-#include <AVSCommon/Utils/Logger/Logger.h>
-#include <AVSCommon/Utils/Logger/LoggerSinkManager.h>
-#include <AVSCommon/Utils/Network/InternetConnectionMonitor.h>
-#include <AVSCommon/Utils/Power/NoOpPowerResourceManager.h>
-#include <AVSCommon/Utils/UUIDGeneration/UUIDGeneration.h>
-#include <AVSGatewayManager/AVSGatewayManager.h>
-#include <CapabilitiesDelegate/CapabilitiesDelegate.h>
-#include <InterruptModel/config/InterruptModelConfiguration.h>
-#include <SampleApp/CaptionPresenter.h>
-#include <SampleApp/ExternalCapabilitiesBuilder.h>
-#include <SampleApp/KeywordObserver.h>
-#include <SampleApp/LocaleAssetsManager.h>
-#include <SampleApp/PlatformSpecificValues.h>
-#include <SpeechEncoder/SpeechEncoder.h>
-#include <SynchronizeStateSender/SynchronizeStateSenderFactory.h>
-
-#ifdef AUTH_MANAGER
-#include <acsdkAuthorization/AuthorizationManager.h>
-#include <acsdkAuthorization/LWA/LWAAuthorizationAdapter.h>
-#include <acsdkAuthorization/LWA/LWAAuthorizationStorage.h>
-#include <acsdkAuthorizationInterfaces/AuthorizationManagerInterface.h>
-#include <acsdkSampleApplicationCBLAuthRequester/SampleApplicationCBLAuthRequester.h>
-#endif
-
-#ifdef ENABLE_REVOKE_AUTH
-#include <SampleApp/RevokeAuthorizationObserver.h>
-#endif
-
-#ifdef ENABLE_PCC
-#include <SampleApp/PhoneCaller.h>
-#endif
-
-#ifdef ENABLE_MCC
-#include <SampleApp/CalendarClient.h>
-#include <SampleApp/MeetingClient.h>
-#endif
-
-#ifdef PORTAUDIO
-#include <SampleApp/PortAudioMicrophoneWrapper.h>
-#endif
-
-#ifdef GSTREAMER_MEDIA_PLAYER
-#include <MediaPlayer/MediaPlayer.h>
-#endif
-
-#ifdef CUSTOM_MEDIA_PLAYER
-#include <acsdkApplicationAudioPipelineFactory/CustomApplicationAudioPipelineFactory.h>
-#endif
-
-#ifdef ANDROID
-#if defined(ANDROID_MEDIA_PLAYER) || defined(ANDROID_MICROPHONE)
-#include <AndroidUtilities/AndroidSLESEngine.h>
-#endif
-
-#ifdef ANDROID_MEDIA_PLAYER
-#include <AndroidSLESMediaPlayer/AndroidSLESMediaPlayer.h>
-#include <AndroidSLESMediaPlayer/AndroidSLESSpeaker.h>
-#endif
-
-#ifdef ANDROID_MICROPHONE
-#include <AndroidUtilities/AndroidSLESMicrophone.h>
-#endif
-
-#ifdef ANDROID_LOGGER
-#include <AndroidUtilities/AndroidLogger.h>
-#endif
-#endif
-
-#ifdef POWER_CONTROLLER
-#include <SampleApp/PeripheralEndpoint/PeripheralEndpointPowerControllerHandler.h>
-#endif
-
-#ifdef TOGGLE_CONTROLLER
-#include <ToggleController/ToggleControllerAttributeBuilder.h>
-#include <SampleApp/PeripheralEndpoint/PeripheralEndpointToggleControllerHandler.h>
-#include <SampleApp/DefaultEndpoint/DefaultEndpointToggleControllerHandler.h>
-#endif
-
-#ifdef RANGE_CONTROLLER
-#include <RangeController/RangeControllerAttributeBuilder.h>
-#include <SampleApp/PeripheralEndpoint/PeripheralEndpointRangeControllerHandler.h>
-#include <SampleApp/DefaultEndpoint/DefaultEndpointRangeControllerHandler.h>
-#endif
-
-#ifdef MODE_CONTROLLER
-#include <ModeController/ModeControllerAttributeBuilder.h>
-#include <SampleApp/PeripheralEndpoint/PeripheralEndpointModeControllerHandler.h>
-#include <SampleApp/DefaultEndpoint/DefaultEndpointModeControllerHandler.h>
-#endif
-
-#ifdef ENABLE_LPM
-#include <AVSCommon/Utils/Power/NoOpPowerResourceManager.h>
-#endif
-
-#include "acsdkPreviewAlexaClient/PreviewAlexaClient.h"
-#include "acsdkPreviewAlexaClient/PreviewAlexaClientComponent.h"
-
-namespace alexaClientSDK {
-namespace acsdkPreviewAlexaClient {
-
-/// Key for the @c firmwareVersion value under the @c SAMPLE_APP_CONFIG_KEY configuration node.
-static const std::string FIRMWARE_VERSION_KEY("firmwareVersion");
-
-/// Key for the @c endpoint value under the @c SAMPLE_APP_CONFIG_KEY configuration node.
-static const std::string ENDPOINT_KEY("endpoint");
-
-/// Key for setting if display cards are supported or not under the @c SAMPLE_APP_CONFIG_KEY configuration node.
-static const std::string DISPLAY_CARD_KEY("displayCardsSupported");
-
-using namespace acsdkExternalMediaPlayer;
-using namespace acsdkManufactory;
-using namespace avsCommon;
-using namespace avsCommon::avs;
-using namespace avsCommon::sdkInterfaces;
-using namespace sampleApp;
-using MediaPlayerInterface = alexaClientSDK::avsCommon::utils::mediaPlayer::MediaPlayerInterface;
-using ApplicationMediaInterfaces = alexaClientSDK::avsCommon::sdkInterfaces::ApplicationMediaInterfaces;
-
-/** The PreviewAlexaClientManufactory will change significantly while manufactory integration is completed
- * over the next several releases. Applications should not expect this template to be stable until
- * manufactory integration is finished.
- */
-using PreviewAlexaClientManufactory = Manufactory<
-    acsdkManufactory::
-        Annotated<avsCommon::sdkInterfaces::AudioFocusAnnotation, avsCommon::sdkInterfaces::FocusManagerInterface>,
-    acsdkManufactory::
-        Annotated<avsCommon::sdkInterfaces::VisualFocusAnnotation, avsCommon::sdkInterfaces::FocusManagerInterface>,
-    acsdkManufactory::Annotated<
-        avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation,
-        avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface>,
-    std::shared_ptr<acsdkAlertsInterfaces::AlertsCapabilityAgentInterface>,
-    std::shared_ptr<acsdkApplicationAudioPipelineFactoryInterfaces::ApplicationAudioPipelineFactoryInterface>,
-    std::shared_ptr<acsdkAudioPlayerInterfaces::AudioPlayerInterface>,
-    std::shared_ptr<acsdkBluetoothInterfaces::BluetoothLocalInterface>,
-    std::shared_ptr<acsdkBluetoothInterfaces::BluetoothNotifierInterface>,
-    std::shared_ptr<acsdkDeviceSetupInterfaces::DeviceSetupInterface>,
-    std::shared_ptr<acsdkEqualizerInterfaces::EqualizerRuntimeSetupInterface>,
-    std::shared_ptr<acsdkExternalMediaPlayer::ExternalMediaPlayer>,
-    std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerInterface>,
-    std::shared_ptr<acsdkInteractionModelInterfaces::InteractionModelNotifierInterface>,
-    std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector>,
-    std::shared_ptr<acsdkNotificationsInterfaces::NotificationsNotifierInterface>,
-    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface>,
-    std::shared_ptr<acsdkStartupManagerInterfaces::StartupManagerInterface>,
-    std::shared_ptr<acsdkSystemClockMonitorInterfaces::SystemClockMonitorInterface>,
-    std::shared_ptr<afml::interruptModel::InterruptModel>,
-    std::shared_ptr<avsCommon::avs::attachment::AttachmentManagerInterface>,
-    std::shared_ptr<avsCommon::avs::AudioInputStream>,
-    std::shared_ptr<avsCommon::avs::DialogUXStateAggregator>,
-    std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit>,
-    std::shared_ptr<avsCommon::sdkInterfaces::audio::AudioFactoryInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::AVSConnectionManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::AVSGatewayManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::CapabilitiesDelegateInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeFactoryInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::DirectiveSequencerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::ExpectSpeechTimeoutHandlerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::LocaleAssetsManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::PlaybackRouterInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::SystemSoundPlayerInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::SystemTimeZoneInterface>,
-    std::shared_ptr<avsCommon::sdkInterfaces::UserInactivityMonitorInterface>,
-    std::shared_ptr<avsCommon::utils::AudioFormat>,
-    std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>,
-    std::shared_ptr<avsCommon::utils::DeviceInfo>,
-    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>,
-    std::shared_ptr<capabilityAgents::alexa::AlexaInterfaceMessageSender>,
-    std::shared_ptr<capabilityAgents::doNotDisturb::DoNotDisturbCapabilityAgent>,
-    std::shared_ptr<captions::CaptionManagerInterface>,
-    std::shared_ptr<certifiedSender::CertifiedSender>,
-    std::shared_ptr<registrationManager::CustomerDataManagerInterface>,
-    std::shared_ptr<registrationManager::RegistrationManagerInterface>,
-    std::shared_ptr<registrationManager::RegistrationNotifierInterface>,
-    std::shared_ptr<sampleApp::UIManager>,
-    std::shared_ptr<settings::DeviceSettingsManager>,
-    std::shared_ptr<settings::storage::DeviceSettingStorageInterface>,
-    std::shared_ptr<speechencoder::SpeechEncoder>,
-    std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>,
-    std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>>;
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("PreviewAlexaClient");
-
-#ifdef ENABLE_ENDPOINT_CONTROLLERS
-/// The instance name for the toggle controller in default endpoint
-static const std::string DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME("DefaultEndpoint.Light");
-
-/// The friendly name of the toggle controller in default endpoint.
-static const std::string DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_FRIENDLY_NAME("Light");
-
-/// The instance name for the range controller in the default endpoint.
-static const std::string DEFAULT_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME("DefaultEndpoint.FanSpeed");
-
-/// The instance name for the mode controller in the default endpoint.
-static const std::string DEFAULT_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME("DefaultEndpoint.Mode");
-
-#ifdef RANGE_CONTROLLER
-/// The range value for the prest 'high' for range controller in the default endpoint.
-static const double DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH = 5;
-
-/// The range value for the prest 'medium' for range controller in the default endpoint.
-static const double DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_MEDIUM = 3;
-
-/// The range value for the prest 'low' for range controller in the default endpoint.
-static const double DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW = 1;
-#endif  // RANGE_CONTROLLER
-
-// Note: Discoball is an imaginary peripheral endpoint that is connected to the device with the following
-// capabilities : power, light (toggle), height (range), and the color of light (mode).
-// Discoball uses semantic annotations to enable additional natural utterances.
-
-/// The derived endpoint Id used in endpoint creation.
-static const std::string PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID("Discoball");
-
-/// The description of the endpoint.
-static const std::string PERIPHERAL_ENDPOINT_DESCRIPTION("Sample Discoball Description");
-
-/// The friendly name of the peripheral endpoint. This is used in utterance.
-static const std::string PERIPHERAL_ENDPOINT_FRIENDLYNAME("Discoball");
-
-/// The manufacturer of peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_MANUFACTURER_NAME("Sample Manufacturer");
-
-/// The display category of the peripheral endpoint.
-static const std::vector<std::string> PERIPHERAL_ENDPOINT_DISPLAYCATEGORY({"OTHER"});
-
-/// The instance name for the toggle controller in peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME("Discoball.Light");
-
-/// The friendly name of the toggle controller on peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_FRIENDLY_NAME("Light");
-
-/// The instance name for the range controller peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME("Discoball.Height");
-
-/// The friendly name of the range controller on peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_FRIENDLY_NAME("Height");
-
-/// The instance name for the mode controller peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME("Discoball.Mode");
-
-/// The friendly name of the mode controller on peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_MODE_CONTROLLER_FRIENDLY_NAME("Light");
-
-/// The model of the peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_MODEL("Model1");
-
-/// Serial number of the peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_SERIAL_NUMBER("123456789");
-
-/// Firmware version number peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_FIRMWARE_VERSION("1.0");
-
-/// Software Version number peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_SOFTWARE_VERSION("1.0");
-
-/// The custom identifier peripheral endpoint.
-static const std::string PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_CUSTOM_IDENTIFIER("SampleApp");
-
-#ifdef RANGE_CONTROLLER
-/// The range controller preset 'high' in peripheral endpoint.
-static const double PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH = 10;
-
-/// The range controller preset 'medium' in peripheral endpoint.
-static const double PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_MEDIUM = 5;
-
-/// The range controller preset 'low' in peripheral endpoint.
-static const double PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW = 1;
-
-/// The action ID for "raise" semantic annotations.
-static const std::string SEMANTICS_ACTION_ID_RAISE("Alexa.Actions.Raise");
-
-/// The action ID for "lower" semantic annotations.
-static const std::string SEMANTICS_ACTION_ID_LOWER("Alexa.Actions.Lower");
-
-/// The range controller SetRangeValue directive name.
-static const std::string SETRANGE_DIRECTIVE_NAME("SetRangeValue");
-
-/// The range controller SetRangeValue payload mapped to the raise action.
-static const std::string PERIPHERAL_ENDPOINT_RAISE_PAYLOAD =
-    R"({"rangeValue":)" + std::to_string(PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH) + R"(})";
-
-/// The range controller SetRangeValue payload mapped to the lower action.
-static const std::string PERIPHERAL_ENDPOINT_LOWER_PAYLOAD =
-    R"({"rangeValue":)" + std::to_string(PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW) + R"(})";
-#endif  // RANGE_CONTROLLER
-
-/// US English locale string.
-static const std::string EN_US("en-US");
-#endif  // ENABLE_ENDPOINT_CONTROLLERS
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// A set of all log levels.
-static const std::set<alexaClientSDK::avsCommon::utils::logger::Level> allLevels = {
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG9,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG8,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG7,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG6,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG5,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG4,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG3,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG2,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG1,
-    alexaClientSDK::avsCommon::utils::logger::Level::DEBUG0,
-    alexaClientSDK::avsCommon::utils::logger::Level::INFO,
-    alexaClientSDK::avsCommon::utils::logger::Level::WARN,
-    alexaClientSDK::avsCommon::utils::logger::Level::ERROR,
-    alexaClientSDK::avsCommon::utils::logger::Level::CRITICAL,
-    alexaClientSDK::avsCommon::utils::logger::Level::NONE};
-
-#ifdef ENABLE_ENDPOINT_CONTROLLERS
-
-/// Struct representing the friendly name.
-struct FriendlyName {
-    /// Type of the friendly name.
-    enum class Type {
-        /// Friendly name as asset type.
-        ASSET,
-        /// Friendly name as text type.
-        TEXT
-    };
-
-    /// Holds the type of the friendly name.
-    Type type;
-
-    /// Value contains the assetId when Type::ASSET or it contains the text when Type::TEXT.
-    std::string value;
-};
-
-/// The capability resources of primitive controllers.
-struct CapabilityResources {
-    /// Represents the friendly name of capability.
-    std::vector<FriendlyName> friendlyNames;
-};
-
-#ifdef RANGE_CONTROLLER
-/// This struct represents the Range Controller preset and its friendly names.
-struct RangeControllerPresetResources {
-    /// The value of a preset.
-    double presetValue;
-
-    /// The friendly names of the presets.
-    std::vector<FriendlyName> friendlyNames;
-};
-#endif
-
-#ifdef MODE_CONTROLLER
-/// This struct represents the Mode Controller modes and its friendly names.
-struct ModeControllerModeResources {
-    /// The mode in the Mode Controller.
-    std::string mode;
-
-    /// The friendly names of the @c mode.
-    std::vector<FriendlyName> friendlyNames;
-};
-#endif
-#endif
-
-/**
- * Gets a log level consumable by the SDK based on the user input string for log level.
- *
- * @param userInputLogLevel The string to be parsed into a log level.
- * @return The log level. This will default to NONE if the input string is not properly parsable.
- */
-static alexaClientSDK::avsCommon::utils::logger::Level getLogLevelFromUserInput(std::string userInputLogLevel) {
-    std::transform(userInputLogLevel.begin(), userInputLogLevel.end(), userInputLogLevel.begin(), ::toupper);
-    return alexaClientSDK::avsCommon::utils::logger::convertNameToLevel(userInputLogLevel);
-}
-
-/**
- * Allows the process to ignore the SIGPIPE signal.
- * The SIGPIPE signal may be received when the application performs a write to a closed socket.
- * This is a case that arises in the use of certain networking libraries.
- *
- * @return true if the action for handling SIGPIPEs was correctly set to ignore, else false.
- */
-static bool ignoreSigpipeSignals() {
-#ifndef NO_SIGPIPE
-    if (std::signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
-        return false;
-    }
-#endif
-    return true;
-}
-
-#ifdef ENABLE_ENDPOINT_CONTROLLERS
-#ifdef TOGGLE_CONTROLLER
-/**
- * Helper function to build the @c ToggleControllerAttributes
- *
- * @param capabilityResources The @c CapabilityResources containing friendly names of controller.
- * @return A non optional @c ToggleControllerAttributes if the build succeeds; otherwise, an empty
- * @c ToggleControllerAttributes object.
- */
-static avsCommon::utils::Optional<avsCommon::sdkInterfaces::toggleController::ToggleControllerAttributes>
-buildToggleControllerAttributes(const CapabilityResources& capabilityResources) {
-    auto controllerAttribute =
-        avsCommon::utils::Optional<avsCommon::sdkInterfaces::toggleController::ToggleControllerAttributes>();
-    auto toggleControllerAttributeBuilder =
-        capabilityAgents::toggleController::ToggleControllerAttributeBuilder::create();
-    if (!toggleControllerAttributeBuilder) {
-        ACSDK_ERROR(LX("Failed to create default endpoint toggle controller attribute builder!"));
-        return controllerAttribute;
-    }
-
-    if (capabilityResources.friendlyNames.size() == 0) {
-        ACSDK_ERROR(LX("buildToggleControllerAttributesFailed").m("noFriendlyNames"));
-        return controllerAttribute;
-    }
-
-    auto toggleControllerCapabilityResources = avsCommon::avs::CapabilityResources();
-    for (auto& friendlyName : capabilityResources.friendlyNames) {
-        if (FriendlyName::Type::ASSET == friendlyName.type) {
-            if (!toggleControllerCapabilityResources.addFriendlyNameWithAssetId(friendlyName.value)) {
-                ACSDK_ERROR(LX("buildToggleControllerAttributes")
-                                .m("addFriendlyNameWithAssetIdFailed")
-                                .d("value", friendlyName.value));
-                return controllerAttribute;
-            }
-        }
-        if (FriendlyName::Type::TEXT == friendlyName.type) {
-            if (!toggleControllerCapabilityResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
-                ACSDK_ERROR(LX("buildToggleControllerAttributes")
-                                .m("addFriendlyNameWithAssetIdFailed")
-                                .d("value", friendlyName.value));
-                return controllerAttribute;
-            }
-        }
-    }
-
-    toggleControllerAttributeBuilder->withCapabilityResources(toggleControllerCapabilityResources);
-
-    return toggleControllerAttributeBuilder->build();
-}
-#endif  // TOGGLE_CONTROLLER
-
-#ifdef RANGE_CONTROLLER
-/**
- * Helper function to build the @c RangeControllerAttributes
- *
- * @param capabilityResources The @c CapabilityResources containing friendly names of controller.
- * @param rangeControllerPresetResources A vector representing the preset resources used for building the configuration.
- * @param semantics An optional @c CapabilitySemantics for the range controller.
- * @return A non optional @c RangeControllerAttributes if the build succeeds; otherwise, an empty
- * @c RangeControllerAttributes object.
- */
-static avsCommon::utils::Optional<avsCommon::sdkInterfaces::rangeController::RangeControllerAttributes>
-buildRangeControllerAttributes(
-    const CapabilityResources& capabilityResources,
-    const std::vector<RangeControllerPresetResources>& rangeControllerPresetResources,
-    const avsCommon::utils::Optional<avsCommon::avs::capabilitySemantics::CapabilitySemantics> semantics =
-        avsCommon::utils::Optional<avsCommon::avs::capabilitySemantics::CapabilitySemantics>()) {
-    auto controllerAttribute =
-        avsCommon::utils::Optional<avsCommon::sdkInterfaces::rangeController::RangeControllerAttributes>();
-
-    auto rangeControllerAttributeBuilder = capabilityAgents::rangeController::RangeControllerAttributeBuilder::create();
-    if (!rangeControllerAttributeBuilder) {
-        ACSDK_ERROR(LX("Failed to create range controller attribute builder!"));
-        return controllerAttribute;
-    }
-
-    if (capabilityResources.friendlyNames.size() == 0) {
-        ACSDK_ERROR(LX("buildRangeControllerAttributesFailed").m("emptyCapabilityFriendlyNames"));
-        return controllerAttribute;
-    }
-
-    auto rangeControllerCapabilityResources = avsCommon::avs::CapabilityResources();
-    for (auto& friendlyName : capabilityResources.friendlyNames) {
-        if (FriendlyName::Type::ASSET == friendlyName.type) {
-            if (!rangeControllerCapabilityResources.addFriendlyNameWithAssetId(friendlyName.value)) {
-                ACSDK_ERROR(LX("buildRangeControllerAttributes")
-                                .m("addFriendlyNameWithAssetIdFailed")
-                                .d("value", friendlyName.value));
-                return controllerAttribute;
-            }
-        }
-        if (FriendlyName::Type::TEXT == friendlyName.type) {
-            if (!rangeControllerCapabilityResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
-                ACSDK_ERROR(LX("buildRangeControllerAttributes")
-                                .m("addFriendlyNameWithAssetIdFailed")
-                                .d("value", friendlyName.value));
-                return controllerAttribute;
-            }
-        }
-    }
-
-    rangeControllerAttributeBuilder->withCapabilityResources(rangeControllerCapabilityResources);
-
-    if (rangeControllerPresetResources.size() > 0) {
-        for (auto& presetResource : rangeControllerPresetResources) {
-            if (presetResource.friendlyNames.size() == 0) {
-                ACSDK_ERROR(LX("buildRangeControllerAttributes")
-                                .m("buildRangeControllerAttributesFailed")
-                                .m("noPresetFriendlyNames")
-                                .d("presetValue", presetResource.presetValue));
-                return controllerAttribute;
-            }
-            auto presetResources = avsCommon::avs::CapabilityResources();
-            for (auto& friendlyName : presetResource.friendlyNames) {
-                if (FriendlyName::Type::ASSET == friendlyName.type) {
-                    if (!presetResources.addFriendlyNameWithAssetId(friendlyName.value)) {
-                        ACSDK_ERROR(LX("buildRangeControllerAttributes")
-                                        .m("addFriendlyNameWithAssetIdFailed")
-                                        .d("value", friendlyName.value)
-                                        .d("presetValue", presetResource.presetValue));
-                        return controllerAttribute;
-                    }
-                }
-                if (FriendlyName::Type::TEXT == friendlyName.type) {
-                    if (!presetResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
-                        ACSDK_ERROR(LX("buildRangeControllerAttributes")
-                                        .m("addFriendlyNameWithAssetIdFailed")
-                                        .d("value", friendlyName.value)
-                                        .d("presetValue", presetResource.presetValue));
-                        return controllerAttribute;
-                    }
-                }
-            }
-            rangeControllerAttributeBuilder->addPreset(std::make_pair(presetResource.presetValue, presetResources));
-        }
-    }
-
-    if (semantics.hasValue()) {
-        if (!semantics.value().isValid()) {
-            ACSDK_ERROR(LX("buildRangeControllerAttributes").m("invalidSemantics"));
-            return controllerAttribute;
-        }
-        rangeControllerAttributeBuilder->withSemantics(semantics.value());
-    }
-
-    return rangeControllerAttributeBuilder->build();
-}
-#endif  // RANGE_CONTROLLER
-
-#ifdef MODE_CONTROLLER
-/**
- * Helper function to build the @c ModeControllerAttributes
- *
- * @param capabilityResources The @c CapabilityResources containing friendly names of controller.
- * @param presetResources A vector representing the mode resources used for building the configuration.
- * @return A non optional @c ModeControllerAttributes if the build succeeds; otherwise, an empty
- * @c ModeControllerAttributes object.
- */
-static avsCommon::utils::Optional<avsCommon::sdkInterfaces::modeController::ModeControllerAttributes>
-buildModeControllerAttributes(
-    const CapabilityResources& capabilityResources,
-    const std::vector<ModeControllerModeResources>& modeControllerModeResources) {
-    auto controllerAttribute =
-        avsCommon::utils::Optional<avsCommon::sdkInterfaces::modeController::ModeControllerAttributes>();
-
-    auto modeControllerAttributeBuilder = capabilityAgents::modeController::ModeControllerAttributeBuilder::create();
-    if (!modeControllerAttributeBuilder) {
-        ACSDK_ERROR(LX("Failed to create mode controller attribute builder!"));
-        return controllerAttribute;
-    }
-
-    if (capabilityResources.friendlyNames.size() == 0) {
-        ACSDK_ERROR(LX("buildModeControllerAttributesFailed").m("emptyCapabilityFriendlyNames"));
-        return controllerAttribute;
-    }
-
-    auto modeControllerCapabilityResources = avsCommon::avs::CapabilityResources();
-    for (auto& friendlyName : capabilityResources.friendlyNames) {
-        if (FriendlyName::Type::ASSET == friendlyName.type) {
-            if (!modeControllerCapabilityResources.addFriendlyNameWithAssetId(friendlyName.value)) {
-                ACSDK_ERROR(LX("buildModeControllerAttributes")
-                                .m("addFriendlyNameWithAssetIdFailed")
-                                .d("value", friendlyName.value));
-                return controllerAttribute;
-            }
-        }
-        if (FriendlyName::Type::TEXT == friendlyName.type) {
-            if (!modeControllerCapabilityResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
-                ACSDK_ERROR(LX("buildModeControllerAttributes")
-                                .m("addFriendlyNameWithAssetIdFailed")
-                                .d("value", friendlyName.value));
-                return controllerAttribute;
-            }
-        }
-    }
-
-    modeControllerAttributeBuilder->withCapabilityResources(modeControllerCapabilityResources);
-
-    if (modeControllerModeResources.size() > 0) {
-        for (auto& modeResource : modeControllerModeResources) {
-            if (modeResource.friendlyNames.size() == 0) {
-                ACSDK_ERROR(LX("buildModeControllerAttributes")
-                                .m("buildModeControllerAttributesFailed")
-                                .m("noPresetFriendlyNames")
-                                .d("mode", modeResource.mode));
-                return controllerAttribute;
-            }
-            auto modeResources = avsCommon::avs::CapabilityResources();
-            for (auto& friendlyName : modeResource.friendlyNames) {
-                if (FriendlyName::Type::ASSET == friendlyName.type) {
-                    if (!modeResources.addFriendlyNameWithAssetId(friendlyName.value)) {
-                        ACSDK_ERROR(LX("buildModeControllerAttributes")
-                                        .m("addFriendlyNameWithAssetIdFailed")
-                                        .d("value", friendlyName.value)
-                                        .d("mode", modeResource.mode));
-                        return controllerAttribute;
-                    }
-                }
-                if (FriendlyName::Type::TEXT == friendlyName.type) {
-                    if (!modeResources.addFriendlyNameWithText(friendlyName.value, EN_US)) {
-                        ACSDK_ERROR(LX("buildModeControllerAttributes")
-                                        .m("addFriendlyNameWithAssetIdFailed")
-                                        .d("value", friendlyName.value)
-                                        .d("mode", modeResource.mode));
-                        return controllerAttribute;
-                    }
-                }
-            }
-            modeControllerAttributeBuilder->addMode(modeResource.mode, modeResources);
-        }
-        modeControllerAttributeBuilder->setOrdered(true);
-    }
-
-    return modeControllerAttributeBuilder->build();
-}
-#endif  // MODE_CONTROLLER
-#endif  // ENABLE_ENDPOINT_CONTROLLERS
-
-std::unique_ptr<PreviewAlexaClient> PreviewAlexaClient::create(
-    std::shared_ptr<alexaClientSDK::sampleApp::ConsoleReader> consoleReader,
-    const std::vector<std::string>& configFiles,
-    const std::string& logLevel,
-    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics) {
-    auto clientApplication = std::unique_ptr<PreviewAlexaClient>(new PreviewAlexaClient);
-    if (!clientApplication->initialize(consoleReader, configFiles, logLevel, diagnostics)) {
-        ACSDK_CRITICAL(LX("Failed to initialize SampleApplication"));
-        return nullptr;
-    }
-    if (!ignoreSigpipeSignals()) {
-        ACSDK_CRITICAL(LX("Failed to set a signal handler for SIGPIPE"));
-        return nullptr;
-    }
-
-    return clientApplication;
-}
-
-SampleAppReturnCode PreviewAlexaClient::run() {
-    return m_userInputManager->run();
-}
-
-PreviewAlexaClient::~PreviewAlexaClient() {
-    if (m_shutdownManager) {
-        m_shutdownManager->shutdown();
-    }
-    // Clean up anything that depends on the the MediaPlayers.
-    m_userInputManager.reset();
-
-    for (auto& shutdownable : m_shutdownRequiredList) {
-        if (!shutdownable) {
-            ACSDK_ERROR(LX("shutdownFailed").m("Component requiring shutdown was null"));
-        }
-        shutdownable->shutdown();
-    }
-
-    m_sdkInit.reset();
-}
-
-bool PreviewAlexaClient::initialize(
-    std::shared_ptr<alexaClientSDK::sampleApp::ConsoleReader> consoleReader,
-    const std::vector<std::string>& configFiles,
-    const std::string& logLevel,
-    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface> diagnostics) {
-    avsCommon::utils::logger::Level logLevelValue = avsCommon::utils::logger::Level::UNKNOWN;
-
-    if (!logLevel.empty()) {
-        logLevelValue = getLogLevelFromUserInput(logLevel);
-        if (alexaClientSDK::avsCommon::utils::logger::Level::UNKNOWN == logLevelValue) {
-            alexaClientSDK::sampleApp::ConsolePrinter::simplePrint("Unknown log level input!");
-            alexaClientSDK::sampleApp::ConsolePrinter::simplePrint("Possible log level options are: ");
-            for (auto it = allLevels.begin(); it != allLevels.end(); ++it) {
-                alexaClientSDK::sampleApp::ConsolePrinter::simplePrint(
-                    alexaClientSDK::avsCommon::utils::logger::convertLevelToName(*it));
-            }
-            return false;
-        }
-
-        alexaClientSDK::sampleApp::ConsolePrinter::simplePrint(
-            "Running app with log level: " +
-            alexaClientSDK::avsCommon::utils::logger::convertLevelToName(logLevelValue));
-    }
-
-    alexaClientSDK::avsCommon::utils::logger::LoggerSinkManager::instance().setLevel(logLevelValue);
-
-    auto configJsonStreams = std::make_shared<std::vector<std::shared_ptr<std::istream>>>();
-
-    for (auto configFile : configFiles) {
-        if (configFile.empty()) {
-            alexaClientSDK::sampleApp::ConsolePrinter::simplePrint("Config filename is empty!");
-            return false;
-        }
-
-        auto configInFile = std::shared_ptr<std::ifstream>(new std::ifstream(configFile));
-        if (!configInFile->good()) {
-            ACSDK_CRITICAL(LX("Failed to read config file").d("filename", configFile));
-            alexaClientSDK::sampleApp::ConsolePrinter::simplePrint("Failed to read config file " + configFile);
-            return false;
-        }
-
-        configJsonStreams->push_back(configInFile);
-    }
-
-    auto platformSpecificValues = std::shared_ptr<sampleApp::PlatformSpecificValues>(new PlatformSpecificValues());
-#if defined(ANDROID_MEDIA_PLAYER) || defined(ANDROID_MICROPHONE)
-    m_openSlEngine = applicationUtilities::androidUtilities::AndroidSLESEngine::create();
-    if (!m_openSlEngine) {
-        ACSDK_ERROR(LX("createAndroidMicFailed").d("reason", "failed to create engine"));
-        return false;
-    }
-
-    platformSpecificValues->openSlEngine = m_openSlEngine;
-#endif
-
-#ifdef DISABLE_DUCKING
-    bool enableDucking = false;
-#else
-    bool enableDucking = true;
-#endif
-
-    // Add the InterruptModel Configuration.
-    configJsonStreams->push_back(
-        alexaClientSDK::afml::interruptModel::InterruptModelConfiguration::getConfig(enableDucking));
-
-    auto builder = initialization::InitializationParametersBuilder::create();
-    if (!builder) {
-        ACSDK_ERROR(LX("createInitializeParamsFailed").d("reason", "nullBuilder"));
-        return false;
-    }
-
-    builder->withJsonStreams(configJsonStreams);
-
-    auto powerResourceManager = std::make_shared<avsCommon::utils::power::NoOpPowerResourceManager>();
-
-#ifdef ENABLE_LPM
-    builder->withPowerResourceManager(powerResourceManager);
-#endif
-
-    auto initParams = builder->build();
-
-    auto previewAlexaClientComponent = acsdkPreviewAlexaClient::getComponent(
-        std::move(initParams), diagnostics, platformSpecificValues, nullptr, powerResourceManager);
-
-    std::shared_ptr<PreviewAlexaClientManufactory> manufactory =
-        PreviewAlexaClientManufactory::create(previewAlexaClientComponent);
-
-    m_sdkInit = manufactory->get<std::shared_ptr<avsCommon::avs::initialization::AlexaClientSDKInit>>();
-
-    if (!m_sdkInit) {
-        ACSDK_CRITICAL(LX("Failed to get SDKInit!"));
-        return false;
-    }
-
-    auto startupManager = manufactory->get<std::shared_ptr<acsdkStartupManagerInterfaces::StartupManagerInterface>>();
-    if (!startupManager) {
-        ACSDK_CRITICAL(LX("Failed to get StartupManager!"));
-        return false;
-    }
-
-    if (!startupManager->startup()) {
-        ACSDK_CRITICAL(LX("Startup Failed!"));
-        return false;
-    }
-
-    auto configPtr = manufactory->get<std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>>();
-    if (!configPtr) {
-        ACSDK_CRITICAL(LX("Failed to get the configuration"));
-        return false;
-    }
-    auto& config = *configPtr;
-    std::string sampleAppConfigKey = SAMPLE_APP_CONFIG_KEY;
-    auto sampleAppConfig = config[sampleAppConfigKey];
-
-    auto httpContentFetcherFactory =
-        manufactory->get<std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>>();
-    if (!httpContentFetcherFactory) {
-        ACSDK_CRITICAL(LX("Failed to get HTTPContentFetcherFactory!"));
-        return false;
-    }
-
-    auto miscStorage = manufactory->get<std::shared_ptr<avsCommon::sdkInterfaces::storage::MiscStorageInterface>>();
-    if (!miscStorage) {
-        ACSDK_CRITICAL(LX("Failed to get MiscStorage!"));
-        return false;
-    }
-
-    /*
-     * Creating customerDataManager which will be used by the registrationManager and all classes that extend
-     * CustomerDataHandler
-     */
-    auto customerDataManager = manufactory->get<std::shared_ptr<registrationManager::CustomerDataManagerInterface>>();
-    if (!customerDataManager) {
-        ACSDK_CRITICAL(LX("Failed to get CustomerDataManager!"));
-        return false;
-    }
-
-    std::shared_ptr<avsCommon::sdkInterfaces::AuthDelegateInterface> authDelegate;
-
-#ifdef AUTH_MANAGER
-    m_authManager = acsdkAuthorization::AuthorizationManager::create(miscStorage, customerDataManager);
-    if (!m_authManager) {
-        ACSDK_CRITICAL(LX("Failed to create AuthorizationManager!"));
-        return false;
-    }
-    authDelegate = m_authManager;
-#else
-    /*
-     * Creating the AuthDelegate - this component takes care of LWA and authorization of the client.
-     */
-    authDelegate = manufactory->get<std::shared_ptr<AuthDelegateInterface>>();
-#endif
-
-    if (!authDelegate) {
-        ACSDK_CRITICAL(LX("Creation of AuthDelegate failed!"));
-        return false;
-    }
-
-    auto equalizerRuntimeSetup =
-        manufactory->get<std::shared_ptr<acsdkEqualizerInterfaces::EqualizerRuntimeSetupInterface>>();
-    if (!equalizerRuntimeSetup) {
-        ACSDK_CRITICAL(LX("Failed to get EqualizerRuntimeSetup!"));
-        return false;
-    }
-
-    auto ringtoneMediaInterfaces =
-        createApplicationMediaPlayer(httpContentFetcherFactory, false, "RingtoneMediaPlayer");
-    if (!ringtoneMediaInterfaces) {
-        alexaClientSDK::sampleApp::ConsolePrinter::simplePrint(
-            "Failed to create application media interfaces for ringtones!");
-        return false;
-    }
-    m_ringtoneMediaPlayer = ringtoneMediaInterfaces->mediaPlayer;
-
-#ifdef ENABLE_COMMS_AUDIO_PROXY
-    auto commsMediaInterfaces =
-        createApplicationMediaPlayer(httpContentFetcherFactory, false, "CommsMediaPlayer", true);
-    if (!commsMediaInterfaces) {
-        ACSDK_CRITICAL(LX("Failed to create application media interfaces for comms!"));
-        return false;
-    }
-    m_commsMediaPlayer = commsMediaInterfaces->mediaPlayer;
-    auto commsSpeaker = commsMediaInterfaces->speaker;
-#endif
-
-#ifdef ENABLE_PCC
-    auto phoneMediaInterfaces = createApplicationMediaPlayer(httpContentFetcherFactory, false, "PhoneMediaPlayer");
-    if (!phoneMediaInterfaces) {
-        ACSDK_CRITICAL(LX("Failed to create application media interfaces for phone!"));
-        return false;
-    }
-    auto phoneSpeaker = phoneMediaInterfaces->speaker;
-#endif
-
-#ifdef ENABLE_MCC
-    auto meetingMediaInterfaces = createApplicationMediaPlayer(httpContentFetcherFactory, false, "MeetingMediaPlayer");
-    if (!meetingMediaInterfaces) {
-        ACSDK_CRITICAL(LX("Failed to create application media interfaces for meeting client!"));
-        return false;
-    }
-    auto meetingSpeaker = meetingMediaInterfaces->speaker;
-#endif
-
-    // Creating the message storage object to be used for storing message to be sent later.
-    auto messageStorage = alexaClientSDK::certifiedSender::SQLiteMessageStorage::create(config);
-
-    /*
-     * Create sample locale asset manager.
-     */
-    auto localeAssetsManager = manufactory->get<std::shared_ptr<LocaleAssetsManagerInterface>>();
-    if (!localeAssetsManager) {
-        ACSDK_CRITICAL(LX("Failed to get LocaleAssetsManager!"));
-        return false;
-    }
-
-    /*
-     * Creating the UI component that observes various components and prints to the console accordingly.
-     */
-    auto userInterfaceManager = manufactory->get<std::shared_ptr<alexaClientSDK::sampleApp::UIManager>>();
-    if (!userInterfaceManager) {
-        ACSDK_CRITICAL(LX("Failed to get UIManager!"));
-        return false;
-    }
-
-#ifdef ENABLE_PCC
-    auto phoneCaller = std::make_shared<alexaClientSDK::sampleApp::PhoneCaller>();
-#endif
-
-#ifdef ENABLE_MCC
-    auto meetingClient = std::make_shared<alexaClientSDK::sampleApp::MeetingClient>();
-    auto calendarClient = std::make_shared<alexaClientSDK::sampleApp::CalendarClient>();
-#endif
-
-    /*
-     * Creating the deviceInfo object
-     */
-    auto deviceInfo = manufactory->get<std::shared_ptr<avsCommon::utils::DeviceInfo>>();
-    if (!deviceInfo) {
-        ACSDK_CRITICAL(LX("Creation of DeviceInfo failed!"));
-        return false;
-    }
-
-    /*
-     * Supply a SALT for UUID generation, this should be as unique to each individual device as possible
-     */
-    alexaClientSDK::avsCommon::utils::uuidGeneration::setSalt(
-        deviceInfo->getClientId() + deviceInfo->getDeviceSerialNumber());
-
-    /*
-     * Creating the CapabilitiesDelegate - This component provides the client with the ability to send messages to the
-     * Capabilities API.
-     */
-    m_capabilitiesDelegate =
-        manufactory->get<std::shared_ptr<avsCommon::sdkInterfaces::CapabilitiesDelegateInterface>>();
-    if (!m_capabilitiesDelegate) {
-        ACSDK_CRITICAL(LX("Creation of CapabilitiesDelegate failed!"));
-        return false;
-    }
-
-    authDelegate->addAuthObserver(userInterfaceManager);
-    m_capabilitiesDelegate->addCapabilitiesObserver(userInterfaceManager);
-
-    // INVALID_FIRMWARE_VERSION is passed to @c getInt() as a default in case FIRMWARE_VERSION_KEY is not found.
-    int firmwareVersion = static_cast<int>(avsCommon::sdkInterfaces::softwareInfo::INVALID_FIRMWARE_VERSION);
-    sampleAppConfig.getInt(FIRMWARE_VERSION_KEY, &firmwareVersion, firmwareVersion);
-
-    /*
-     * Check to see if displayCards is supported on the device. The default is supported unless specified otherwise in
-     * the configuration.
-     */
-    bool displayCardsSupported;
-    sampleAppConfig.getBool(DISPLAY_CARD_KEY, &displayCardsSupported, true);
-
-    /*
-     * Creating the InternetConnectionMonitor that will notify observers of internet connection status changes.
-     */
-    auto internetConnectionMonitor =
-        manufactory->get<std::shared_ptr<avsCommon::sdkInterfaces::InternetConnectionMonitorInterface>>();
-    if (!internetConnectionMonitor) {
-        ACSDK_CRITICAL(LX("Failed to get InternetConnectionMonitor"));
-        return false;
-    }
-
-    /*
-     * Creating the buffer (Shared Data Stream) that will hold user audio data. This is the main input into the SDK.
-     */
-    auto sharedDataStream = manufactory->get<std::shared_ptr<alexaClientSDK::avsCommon::avs::AudioInputStream>>();
-    if (!sharedDataStream) {
-        ACSDK_CRITICAL(LX("Failed to get shared data stream!"));
-        return false;
-    }
-
-    auto compatibleAudioFormat = manufactory->get<std::shared_ptr<avsCommon::utils::AudioFormat>>();
-    if (!compatibleAudioFormat) {
-        ACSDK_CRITICAL(LX("Failed to get compatible audio format!"));
-        return false;
-    }
-
-    /*
-     * Creating the Context Manager - This component manages the context of each of the components to update to AVS.
-     * It is required for each of the capability agents so that they may provide their state just before any event is
-     * fired off.
-     */
-    auto contextManager = manufactory->get<std::shared_ptr<ContextManagerInterface>>();
-    if (!contextManager) {
-        ACSDK_CRITICAL(LX("Creation of ContextManager failed."));
-        return false;
-    }
-
-    std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::ProtocolTracerInterface> deviceProtocolTracer;
-    if (diagnostics) {
-        /*
-         * Create the deviceProtocolTracer to trace events and directives.
-         */
-        deviceProtocolTracer = diagnostics->getProtocolTracer();
-
-        if (deviceProtocolTracer) {
-            const std::string DIAGNOSTICS_KEY = "diagnostics";
-            const std::string MAX_TRACED_MESSAGES_KEY = "maxTracedMessages";
-            const std::string TRACE_FROM_STARTUP = "protocolTraceFromStartup";
-
-            int configMaxValue = -1;
-            bool configProtocolTraceEnabled = false;
-
-            if (alexaClientSDK::avsCommon::utils::configuration::ConfigurationNode::getRoot()[DIAGNOSTICS_KEY].getInt(
-                    MAX_TRACED_MESSAGES_KEY, &configMaxValue)) {
-                if (configMaxValue < 0) {
-                    ACSDK_WARN(LX("ignoringMaxTracedMessages")
-                                   .d("reason", "negativeValue")
-                                   .d("maxTracedMessages", configMaxValue));
-                } else {
-                    deviceProtocolTracer->setMaxMessages(static_cast<unsigned int>(configMaxValue));
-                }
-            }
-
-            if (alexaClientSDK::avsCommon::utils::configuration::ConfigurationNode::getRoot()[DIAGNOSTICS_KEY].getBool(
-                    TRACE_FROM_STARTUP, &configProtocolTraceEnabled)) {
-                if (configProtocolTraceEnabled) {
-                    deviceProtocolTracer->setProtocolTraceFlag(configProtocolTraceEnabled);
-                    ACSDK_DEBUG9(LX("Protocol Trace has been enabled at startup"));
-                }
-            }
-        }
-    }
-
-    /*
-     * Create a 'subset' of the SampleApp Manufactory that provides the types directly consumed by DefaultClient.
-     */
-    std::shared_ptr<defaultClient::DefaultClient::DefaultClientSubsetManufactory> subsetManufactory =
-        defaultClient::DefaultClient::DefaultClientSubsetManufactory::createSubsetManufactory(manufactory);
-
-    /*
-     * Creating each of the audio providers. An audio provider is a simple package of data consisting of the stream
-     * of audio data, as well as metadata about the stream. For each of the three audio providers created here, the same
-     * stream is used since this sample application will only have one microphone.
-     */
-
-    // Creating tap to talk audio provider.
-    auto tapToTalkAudioProvider = alexaClientSDK::capabilityAgents::aip::AudioProvider::TapAudioProvider(
-        sharedDataStream, *compatibleAudioFormat);
-
-    // Creating hold to talk audio provider.
-    auto holdToTalkAudioProvider = alexaClientSDK::capabilityAgents::aip::AudioProvider::HoldAudioProvider(
-        sharedDataStream, *compatibleAudioFormat);
-
-    /*
-     * Creating the DefaultClient - this component serves as an out-of-box default object that instantiates and "glues"
-     * together all the modules.
-     */
-    std::shared_ptr<defaultClient::DefaultClient> client = alexaClientSDK::defaultClient::DefaultClient::create(
-        subsetManufactory,
-        m_ringtoneMediaPlayer,
-        ringtoneMediaInterfaces->speaker,
-        {},
-#ifdef ENABLE_PCC
-        phoneSpeaker,
-        phoneCaller,
-#endif
-#ifdef ENABLE_MCC
-        meetingSpeaker,
-        meetingClient,
-        calendarClient,
-#endif
-#ifdef ENABLE_COMMS_AUDIO_PROXY
-        m_commsMediaPlayer,
-        commsSpeaker,
-        sharedDataStream,
-#endif
-        {userInterfaceManager},
-        {userInterfaceManager},
-        displayCardsSupported,
-        firmwareVersion,
-        true,
-        nullptr,
-        diagnostics,
-        std::make_shared<alexaClientSDK::sampleApp::ExternalCapabilitiesBuilder>(deviceInfo),
-        tapToTalkAudioProvider);
-    if (!client) {
-        ACSDK_CRITICAL(LX("Failed to create default SDK client!"));
-        return false;
-    }
-
-    client->addSpeakerManagerObserver(userInterfaceManager);
-
-    client->addNotificationsObserver(userInterfaceManager);
-
-    client->addBluetoothDeviceObserver(userInterfaceManager);
-
-    userInterfaceManager->configureSettingsNotifications(client->getSettingsManager());
-
-    m_shutdownManager = client->getShutdownManager();
-    if (!m_shutdownManager) {
-        ACSDK_CRITICAL(LX("Failed to get ShutdownManager!"));
-        return false;
-    }
-
-    /*
-     * Add GUI Renderer as an observer if display cards are supported.
-     */
-    if (displayCardsSupported) {
-        m_guiRenderer = std::make_shared<GuiRenderer>();
-        client->addTemplateRuntimeObserver(m_guiRenderer);
-    }
-
-#ifdef PORTAUDIO
-    std::shared_ptr<PortAudioMicrophoneWrapper> micWrapper = PortAudioMicrophoneWrapper::create(sharedDataStream);
-#elif defined(ANDROID_MICROPHONE)
-    std::shared_ptr<applicationUtilities::androidUtilities::AndroidSLESMicrophone> micWrapper =
-        m_openSlEngine->createAndroidMicrophone(sharedDataStream);
-#elif AUDIO_INJECTION
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::diagnostics::AudioInjectorInterface> audioInjector;
-    if (diagnostics) {
-        audioInjector = diagnostics->getAudioInjector();
-    }
-
-    if (!audioInjector) {
-        ACSDK_CRITICAL(LX("No audio injector provided!"));
-        return false;
-    }
-    std::shared_ptr<applicationUtilities::resources::audio::MicrophoneInterface> micWrapper =
-        audioInjector->getMicrophone(sharedDataStream, *compatibleAudioFormat);
-#else
-    ACSDK_CRITICAL(LX("No microphone module provided!"));
-    return false;
-#endif
-    if (!micWrapper) {
-        ACSDK_CRITICAL(LX("Failed to create microphone wrapper!"));
-        return false;
-    }
-
-#ifdef ENABLE_ENDPOINT_CONTROLLERS
-    // Default Endpoint
-    if (!addControllersToDefaultEndpoint(client->getDefaultEndpointBuilder())) {
-        ACSDK_CRITICAL(LX("Failed to add controllers to default endpoint!"));
-        return false;
-    }
-
-    // Peripheral Endpoint
-    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> peripheralEndpointBuilder =
-        client->createEndpointBuilder();
-    if (!peripheralEndpointBuilder) {
-        ACSDK_CRITICAL(LX("Failed to create peripheral endpoint Builder!"));
-        return false;
-    }
-
-    peripheralEndpointBuilder->withDerivedEndpointId(PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID)
-        .withDescription(PERIPHERAL_ENDPOINT_DESCRIPTION)
-        .withFriendlyName(PERIPHERAL_ENDPOINT_FRIENDLYNAME)
-        .withManufacturerName(PERIPHERAL_ENDPOINT_MANUFACTURER_NAME)
-        .withAdditionalAttributes(
-            PERIPHERAL_ENDPOINT_MANUFACTURER_NAME,
-            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_MODEL,
-            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_SERIAL_NUMBER,
-            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_FIRMWARE_VERSION,
-            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_SOFTWARE_VERSION,
-            PERIPHERAL_ENDPOINT_ADDITIONAL_ATTRIBUTE_CUSTOM_IDENTIFIER)
-        .withDisplayCategory(PERIPHERAL_ENDPOINT_DISPLAYCATEGORY);
-
-    if (!addControllersToPeripheralEndpoint(peripheralEndpointBuilder)) {
-        ACSDK_CRITICAL(LX("Failed to add controllers to peripheral endpoint!"));
-        return false;
-    }
-
-    auto peripheralEndpoint = peripheralEndpointBuilder->build();
-    if (!peripheralEndpoint) {
-        ACSDK_CRITICAL(LX("Failed to create Peripheral Endpoint!"));
-        return false;
-    }
-
-    client->registerEndpoint(std::move(peripheralEndpoint));
-#endif
-
-    // Create null wake word audio provider and replace with wake word audio provider if KWD is on.
-    auto wakeWordAudioProvider = alexaClientSDK::capabilityAgents::aip::AudioProvider::null();
-#ifdef KWD
-    // Check if keywordDetector was provided to manufactory and create wakeWordAudioProvider and keywordObserver if that
-    // is the case.
-    m_keywordDetector =
-        manufactory->get<std::shared_ptr<alexaClientSDK::acsdkKWDImplementations::AbstractKeywordDetector>>();
-    if (m_keywordDetector) {
-        wakeWordAudioProvider = alexaClientSDK::capabilityAgents::aip::AudioProvider::WakeAudioProvider(
-            sharedDataStream, *compatibleAudioFormat);
-        auto keywordObserver =
-            alexaClientSDK::sampleApp::KeywordObserver::create(client, wakeWordAudioProvider, m_keywordDetector);
-    } else {
-        ACSDK_CRITICAL(LX("Failed to create KWD"));
-        return false;
-    }
-#endif
-
-    // clang-format off
-    // Create InteractionManager
-    m_interactionManager = std::make_shared<alexaClientSDK::sampleApp::InteractionManager>(
-        client,
-        micWrapper,
-        userInterfaceManager,
-#ifdef ENABLE_PCC
-        phoneCaller,
-#endif
-#ifdef ENABLE_MCC
-        meetingClient,
-        calendarClient,
-#endif
-        holdToTalkAudioProvider,
-        tapToTalkAudioProvider,
-        m_guiRenderer,
-        wakeWordAudioProvider
-#ifdef POWER_CONTROLLER
-        ,
-        m_peripheralEndpointPowerHandler
-#endif
-#ifdef TOGGLE_CONTROLLER
-        ,
-        m_peripheralEndpointToggleHandler
-#endif
-#ifdef RANGE_CONTROLLER
-        ,
-        m_peripheralEndpointRangeHandler
-#endif
-#ifdef MODE_CONTROLLER
-        ,
-        m_peripheralEndpointModeHandler
-#endif
-        ,
-        nullptr,
-        diagnostics);
-    // clang-format on
-
-    m_shutdownRequiredList.push_back(m_interactionManager);
-    client->addAlexaDialogStateObserver(m_interactionManager);
-    client->addCallStateObserver(m_interactionManager);
-
-#ifdef ENABLE_REVOKE_AUTH
-    // Creating the revoke authorization observer.
-    auto revokeObserver =
-        std::make_shared<alexaClientSDK::sampleApp::RevokeAuthorizationObserver>(client->getRegistrationManager());
-    client->addRevokeAuthorizationObserver(revokeObserver);
-#endif
-
-    // Creating the input observer.
-    m_userInputManager = alexaClientSDK::sampleApp::UserInputManager::create(
-        m_interactionManager, consoleReader, localeAssetsManager, deviceInfo->getDefaultEndpointId());
-    if (!m_userInputManager) {
-        ACSDK_CRITICAL(LX("Failed to create UserInputManager!"));
-        return false;
-    }
-
-    authDelegate->addAuthObserver(m_userInputManager);
-    client->addRegistrationObserver(m_userInputManager);
-    m_capabilitiesDelegate->addCapabilitiesObserver(m_userInputManager);
-
-#ifdef AUTH_MANAGER
-    m_authManager->setRegistrationManager(client->getRegistrationManager());
-
-    auto cryptoFactory = manufactory->get<std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>>();
-    auto keyStore = manufactory->get<std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>>();
-    auto httpPost = avsCommon::utils::libcurlUtils::HttpPost::createHttpPostInterface();
-    m_lwaAdapter = acsdkAuthorization::lwa::LWAAuthorizationAdapter::create(
-        configPtr,
-        std::move(httpPost),
-        deviceInfo,
-        acsdkAuthorization::lwa::LWAAuthorizationStorage::createLWAAuthorizationStorageInterface(
-            configPtr, "", cryptoFactory, keyStore));
-
-    if (!m_lwaAdapter) {
-        ACSDK_CRITICAL(LX("Failed to create LWA Adapter!"));
-        return false;
-    }
-
-    m_authManager->add(m_lwaAdapter);
-
-    auto cblRequest = acsdkSampleApplicationCBLAuthRequester::SampleApplicationCBLAuthRequester::
-        createCBLAuthorizationObserverInterface(userInterfaceManager);
-
-    m_lwaAdapter->authorizeUsingCBL(cblRequest);
-#endif
-
-    client->connect();
-
-    return true;
-}
-
-std::shared_ptr<ApplicationMediaInterfaces> PreviewAlexaClient::createApplicationMediaPlayer(
-    const std::shared_ptr<avsCommon::sdkInterfaces::HTTPContentFetcherInterfaceFactoryInterface>&
-        httpContentFetcherFactory,
-    bool enableEqualizer,
-    const std::string& name,
-    bool enableLiveMode) {
-#ifdef GSTREAMER_MEDIA_PLAYER
-    /*
-     * For the SDK, the MediaPlayer happens to also provide volume control functionality.
-     * Note the externalMusicProviderMediaPlayer is not added to the set of SpeakerInterfaces as there would be
-     * more actions needed for these beyond setting the volume control on the MediaPlayer.
-     */
-    auto mediaPlayer = alexaClientSDK::mediaPlayer::MediaPlayer::create(
-        httpContentFetcherFactory, enableEqualizer, name, enableLiveMode);
-    if (!mediaPlayer) {
-        return nullptr;
-    }
-    auto speaker = std::static_pointer_cast<alexaClientSDK::avsCommon::sdkInterfaces::SpeakerInterface>(mediaPlayer);
-    auto equalizer =
-        std::static_pointer_cast<alexaClientSDK::acsdkEqualizerInterfaces::EqualizerInterface>(mediaPlayer);
-    auto requiresShutdown = std::static_pointer_cast<alexaClientSDK::avsCommon::utils::RequiresShutdown>(mediaPlayer);
-    auto applicationMediaInterfaces =
-        std::make_shared<ApplicationMediaInterfaces>(mediaPlayer, speaker, equalizer, requiresShutdown);
-#elif defined(ANDROID_MEDIA_PLAYER)
-    // TODO - Add support of live mode to AndroidSLESMediaPlayer (ACSDK-2530).
-    std::shared_ptr<mediaPlayer::android::AndroidSLESMediaPlayer> mediaPlayer =
-        mediaPlayer::android::AndroidSLESMediaPlayer::create(
-            httpContentFetcherFactory,
-            m_openSlEngine,
-            enableEqualizer,
-            mediaPlayer::android::PlaybackConfiguration(),
-            name);
-    if (!mediaPlayer) {
-        return nullptr;
-    }
-    auto speaker = mediaPlayer->getSpeaker();
-    auto equalizer =
-        std::static_pointer_cast<alexaClientSDK::acsdkEqualizerInterfaces::EqualizerInterface>(mediaPlayer);
-    auto requiresShutdown = std::static_pointer_cast<alexaClientSDK::avsCommon::utils::RequiresShutdown>(mediaPlayer);
-    auto applicationMediaInterfaces =
-        std::make_shared<ApplicationMediaInterfaces>(mediaPlayer, speaker, equalizer, requiresShutdown);
-#elif defined(CUSTOM_MEDIA_PLAYER)
-    // Custom media players must implement the createCustomMediaPlayer function
-    auto applicationMediaInterfaces =
-        createCustomMediaPlayer(httpContentFetcherFactory, enableEqualizer, name, enableLiveMode);
-    if (!applicationMediaInterfaces) {
-        return nullptr;
-    }
-#endif
-
-    if (applicationMediaInterfaces->requiresShutdown) {
-        m_shutdownRequiredList.push_back(applicationMediaInterfaces->requiresShutdown);
-    }
-    return applicationMediaInterfaces;
-}
-
-#ifdef ENABLE_ENDPOINT_CONTROLLERS
-bool PreviewAlexaClient::addControllersToDefaultEndpoint(
-    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> defaultEndpointBuilder) {
-    if (!defaultEndpointBuilder) {
-        ACSDK_CRITICAL(LX("addControllersToDefaultEndpointFailed").m("invalidDefaultEndpointBuilder"));
-        return false;
-    }
-
-#ifdef TOGGLE_CONTROLLER
-    auto toggleHandler =
-        DefaultEndpointToggleControllerHandler::create(DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME);
-    if (!toggleHandler) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint toggle controller handler!"));
-        return false;
-    }
-
-    auto toggleControllerAttributes = buildToggleControllerAttributes(
-        {{{FriendlyName::Type::TEXT, DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_FRIENDLY_NAME}}});
-    if (!toggleControllerAttributes.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint toggle controller attributes!"));
-        return false;
-    }
-
-    defaultEndpointBuilder->withToggleController(
-        toggleHandler,
-        DEFAULT_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME,
-        toggleControllerAttributes.value(),
-        true,
-        true,
-        false);
-#endif
-
-#ifdef RANGE_CONTROLLER
-    auto rangeHandler = DefaultEndpointRangeControllerHandler::create(DEFAULT_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME);
-    if (!rangeHandler) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint range controller handler!"));
-        return false;
-    }
-
-    auto rangeControllerAttributes = buildRangeControllerAttributes(
-        {{{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_SETTING_FANSPEED}}},
-        {{DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH,
-          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MAXIMUM},
-           {FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_HIGH}}},
-         {DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_MEDIUM,
-          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MEDIUM}}},
-         {DEFAULT_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW,
-          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MINIMUM},
-           {FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_LOW}}}});
-
-    if (!rangeControllerAttributes.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint range controller attributes!"));
-        return false;
-    }
-
-    defaultEndpointBuilder->withRangeController(
-        rangeHandler,
-        DEFAULT_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME,
-        rangeControllerAttributes.value(),
-        true,
-        true,
-        false);
-#endif
-
-#ifdef MODE_CONTROLLER
-    auto modeHandler = DefaultEndpointModeControllerHandler::create(DEFAULT_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME);
-    if (!modeHandler) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint mode controller handler!"));
-        return false;
-    }
-
-    auto modeControllerAttributes = buildModeControllerAttributes(
-        {{{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_SETTING_MODE}}},
-        {{DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_FAN_ONLY,
-          {{FriendlyName::Type::TEXT,
-            DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_FAN_ONLY_FRIENDLY_NAME}}},
-         {DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_HEAT,
-          {{FriendlyName::Type::TEXT, DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_HEAT_FRIENDLY_NAME}}},
-         {DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_COOL,
-          {{FriendlyName::Type::TEXT,
-            DefaultEndpointModeControllerHandler::MODE_CONTROLLER_MODE_COOL_FRIENDLY_NAME}}}});
-
-    if (!modeControllerAttributes.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint mode controller attributes!"));
-        return false;
-    }
-
-    defaultEndpointBuilder->withModeController(
-        modeHandler,
-        DEFAULT_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME,
-        modeControllerAttributes.value(),
-        true,
-        true,
-        false);
-#endif
-
-    return true;
-}
-
-bool PreviewAlexaClient::addControllersToPeripheralEndpoint(
-    std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointBuilderInterface> peripheralEndpointBuilder) {
-    if (!peripheralEndpointBuilder) {
-        ACSDK_CRITICAL(LX("addControllersToPeripheralEndpointFailed").m("invalidPeripheralEndpointBuilder"));
-        return false;
-    }
-
-#ifdef POWER_CONTROLLER
-    m_peripheralEndpointPowerHandler =
-        PeripheralEndpointPowerControllerHandler::create(PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID);
-    if (!m_peripheralEndpointPowerHandler) {
-        ACSDK_CRITICAL(LX("Failed to create power controller handler!"));
-        return false;
-    }
-    peripheralEndpointBuilder->withPowerController(m_peripheralEndpointPowerHandler, true, true);
-#endif
-
-#ifdef TOGGLE_CONTROLLER
-    m_peripheralEndpointToggleHandler = PeripheralEndpointToggleControllerHandler::create(
-        PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID, PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME);
-    if (!m_peripheralEndpointToggleHandler) {
-        ACSDK_CRITICAL(LX("Failed to create toggle controller handler!"));
-        return false;
-    }
-
-    auto peripheralEndpointToggleControllerAttributes = buildToggleControllerAttributes(
-        {{{FriendlyName::Type::TEXT, PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_FRIENDLY_NAME}}});
-    if (!peripheralEndpointToggleControllerAttributes.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create peripheral endpoint toggle controller attributes!"));
-        return false;
-    }
-
-    peripheralEndpointBuilder->withToggleController(
-        m_peripheralEndpointToggleHandler,
-        PERIPHERAL_ENDPOINT_TOGGLE_CONTROLLER_INSTANCE_NAME,
-        peripheralEndpointToggleControllerAttributes.value(),
-        true,
-        true,
-        false);
-#endif
-
-#ifdef RANGE_CONTROLLER
-    m_peripheralEndpointRangeHandler = PeripheralEndpointRangeControllerHandler::create(
-        PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID, PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME);
-    if (!m_peripheralEndpointRangeHandler) {
-        ACSDK_CRITICAL(LX("Failed to create range controller handler!"));
-        return false;
-    }
-
-    // Enables "raise" and "lower" utterances for the peripheral endpoint by mapping actions to directives.
-    auto raiseActionMapping = capabilitySemantics::ActionsToDirectiveMapping();
-    raiseActionMapping.addAction(SEMANTICS_ACTION_ID_RAISE);
-    raiseActionMapping.setDirective(SETRANGE_DIRECTIVE_NAME, PERIPHERAL_ENDPOINT_RAISE_PAYLOAD);
-
-    auto lowerActionMapping = capabilitySemantics::ActionsToDirectiveMapping();
-    lowerActionMapping.addAction(SEMANTICS_ACTION_ID_LOWER);
-    lowerActionMapping.setDirective(SETRANGE_DIRECTIVE_NAME, PERIPHERAL_ENDPOINT_LOWER_PAYLOAD);
-
-    auto peripheralEndpointRangeSemantics = capabilitySemantics::CapabilitySemantics();
-    peripheralEndpointRangeSemantics.addActionsToDirectiveMapping(raiseActionMapping);
-    peripheralEndpointRangeSemantics.addActionsToDirectiveMapping(lowerActionMapping);
-    if (!peripheralEndpointRangeSemantics.isValid()) {
-        ACSDK_CRITICAL(LX("Failed to create peripheral endpoint semantic annotations!"));
-        return false;
-    }
-
-    auto peripheralEndpointRangeControllerAttributes = buildRangeControllerAttributes(
-        {{{FriendlyName::Type::TEXT, PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_FRIENDLY_NAME}}},
-        {{PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_HIGH,
-          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MAXIMUM},
-           {FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_HIGH}}},
-         {PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_MEDIUM,
-          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MEDIUM}}},
-         {PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_PRESET_LOW,
-          {{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_MINIMUM},
-           {FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_VALUE_LOW}}}},
-        utils::Optional<capabilitySemantics::CapabilitySemantics>(peripheralEndpointRangeSemantics));
-
-    if (!peripheralEndpointRangeControllerAttributes.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create peripheral endpoint range controller attributes!"));
-        return false;
-    }
-
-    peripheralEndpointBuilder->withRangeController(
-        m_peripheralEndpointRangeHandler,
-        PERIPHERAL_ENDPOINT_RANGE_CONTROLLER_INSTANCE_NAME,
-        peripheralEndpointRangeControllerAttributes.value(),
-        true,
-        true,
-        false);
-#endif
-
-#ifdef MODE_CONTROLLER
-    m_peripheralEndpointModeHandler = PeripheralEndpointModeControllerHandler::create(
-        PERIPHERAL_ENDPOINT_DERIVED_ENDPOINT_ID, PERIPHERAL_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME);
-    if (!m_peripheralEndpointModeHandler) {
-        ACSDK_CRITICAL(LX("Failed to create mode controller handler!"));
-        return false;
-    }
-
-    auto peripheralEndpointModeControllerAttributes = buildModeControllerAttributes(
-        {{{FriendlyName::Type::ASSET, avsCommon::avs::resources::ASSET_ALEXA_SETTING_MODE},
-          {FriendlyName::Type::TEXT, PERIPHERAL_ENDPOINT_MODE_CONTROLLER_FRIENDLY_NAME}}},
-        {{PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_RED,
-          {{FriendlyName::Type::TEXT, PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_RED}}},
-         {PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_GREEN,
-          {{FriendlyName::Type::TEXT, PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_GREEN}}},
-         {PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_BLUE,
-          {{FriendlyName::Type::TEXT, PeripheralEndpointModeControllerHandler::MODE_CONTROLLER_MODE_BLUE}}}});
-
-    if (!peripheralEndpointModeControllerAttributes.hasValue()) {
-        ACSDK_CRITICAL(LX("Failed to create default endpoint mode controller attributes!"));
-        return false;
-    }
-
-    peripheralEndpointBuilder->withModeController(
-        m_peripheralEndpointModeHandler,
-        PERIPHERAL_ENDPOINT_MODE_CONTROLLER_INSTANCE_NAME,
-        peripheralEndpointModeControllerAttributes.value(),
-        true,
-        true,
-        false);
-#endif
-
-    return true;
-}
-#endif
-
-#ifdef DIAGNOSTICS
-bool PreviewAlexaClient::initiateRestart() {
-    m_userInputManager->onLogout();
-    return true;
-}
-#endif
-
-}  // namespace acsdkPreviewAlexaClient
-}  // namespace alexaClientSDK
diff --git a/applications/acsdkPreviewAlexaClient/src/PreviewAlexaClientComponent.cpp b/applications/acsdkPreviewAlexaClient/src/PreviewAlexaClientComponent.cpp
deleted file mode 100644
index 35729349f0..0000000000
--- a/applications/acsdkPreviewAlexaClient/src/PreviewAlexaClientComponent.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <acsdkAlerts/AlertsComponent.h>
-#include <acsdkAlerts/Storage/SQLiteAlertStorage.h>
-#include <acsdkAlexaCommunications/AlexaCommunicationsComponent.h>
-#include <acsdkApplicationAudioPipelineFactory/ApplicationAudioPipelineFactoryComponent.h>
-#include <acsdkAudioInputStream/AudioInputStreamComponent.h>
-#include <acsdkAudioPlayer/AudioPlayerComponent.h>
-#include <acsdkAuthorizationDelegate/AuthorizationDelegateComponent.h>
-#include <acsdkBluetooth/BasicDeviceConnectionRulesProvider.h>
-#include <acsdkBluetooth/BluetoothComponent.h>
-#include <acsdkBluetooth/SQLiteBluetoothStorage.h>
-#include <acsdkBluetoothImplementation/BluetoothImplementationComponent.h>
-#include <acsdkCore/CoreComponent.h>
-#include <acsdkCrypto/CryptoFactory.h>
-#include <acsdkPkcs11/KeyStoreFactory.h>
-#include <acsdkDeviceSettingsManager/DeviceSettingsManagerComponent.h>
-#include <acsdkDeviceSetup/DeviceSetupComponent.h>
-#include <acsdkDoNotDisturb/DoNotDisturbComponent.h>
-#include <acsdkEqualizerImplementations/EqualizerComponent.h>
-#include <acsdkExternalMediaPlayer/ExternalMediaPlayerComponent.h>
-#include <acsdkHTTPContentFetcher/HTTPContentFetcherComponent.h>
-#include <acsdkInteractionModel/InteractionModelComponent.h>
-#include <acsdkInternetConnectionMonitor/InternetConnectionMonitorComponent.h>
-#include <acsdkKWD/KWDComponent.h>
-#include <acsdkManufactory/ComponentAccumulator.h>
-#ifdef ENABLE_MC
-#include <acsdkMessagingController/MessagingControllerComponent.h>
-#include <acsdkMessenger/MessengerComponent.h>
-#endif
-#include <acsdkMetricRecorder/MetricRecorderComponent.h>
-#include <acsdkNotifications/NotificationsComponent.h>
-#include <acsdkNotifications/SQLiteNotificationsStorage.h>
-#include <acsdkSampleApplicationCBLAuthRequester/SampleApplicationCBLAuthRequester.h>
-#include <acsdkShared/SharedComponent.h>
-#include <acsdkSpeechEncoder/SpeechEncoderComponent.h>
-#include <acsdkSystemTimeZone/SystemTimeZoneComponent.h>
-#include <Audio/AudioFactory.h>
-#include <AVSCommon/AVS/DialogUXStateAggregator.h>
-#include <AVSCommon/AVS/ExceptionEncounteredSender.h>
-#include <AVSCommon/Utils/LibcurlUtils/DefaultSetCurlOptionsCallbackFactory.h>
-#include <Captions/CaptionsComponent.h>
-#include <DefaultClient/EqualizerRuntimeSetup.h>
-#include <PlaybackController/PlaybackControllerComponent.h>
-#include <SampleApp/CaptionPresenter.h>
-#include <SampleApp/LocaleAssetsManager.h>
-#include <SampleApp/SampleEqualizerModeController.h>
-#include <SampleApp/UIManager.h>
-#include <Settings/Storage/SQLiteDeviceSettingStorage.h>
-#include <SpeakerManager/DefaultChannelVolumeFactory.h>
-#include <SpeakerManager/SpeakerManagerComponent.h>
-#include <System/SystemComponent.h>
-#include <SystemSoundPlayer/SystemSoundPlayer.h>
-#include <TemplateRuntime/RenderPlayerInfoCardsProviderRegistrar.h>
-
-#ifdef EXTERNAL_MEDIA_ADAPTERS
-#include <acsdkExternalMediaPlayerAdapters/ExternalMediaPlayerAdaptersComponent.h>
-#endif
-
-#include "acsdkPreviewAlexaClient/PreviewAlexaClient.h"
-#include "acsdkPreviewAlexaClient/PreviewAlexaClientComponent.h"
-
-namespace alexaClientSDK {
-namespace acsdkPreviewAlexaClient {
-
-using namespace acl;
-using namespace acsdkApplicationAudioPipelineFactoryInterfaces;
-using namespace acsdkManufactory;
-using namespace acsdkSampleApplicationCBLAuthRequester;
-using namespace acsdkSampleApplicationInterfaces;
-using namespace applicationUtilities::systemSoundPlayer;
-using namespace avsCommon::avs;
-using namespace avsCommon::avs::attachment;
-using namespace avsCommon::avs::initialization;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils::libcurlUtils;
-
-using DefaultEndpointAnnotation = avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation;
-
-/**
- * @c UIManagerInterface factory that just forwards the instance of UIManager.
- *
- * @param uiManager The @c UIManager instance that will provide the implementation.
- * @return The implementation of @c CBLAuthRequesterInterface to use.
- */
-static std::shared_ptr<UIManagerInterface> createUIManagerInterface(
-    const std::shared_ptr<sampleApp::UIManager>& uiManager) {
-    return uiManager;
-}
-
-/**
- * Function to create a std::function that creates instances of @c EventTrackerInterface.
- * @param diagnostics An instance of DiagnosticsInterface.  If non-null, it is used to get an instance
- * of EventTracerInterface.
- * @return A new instance of @c EventTrackerInterface.
- */
-static std::function<std::shared_ptr<EventTracerInterface>()> getCreateEventTracker(
-    const std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface>& diagnostics) {
-    return [diagnostics]() {
-        if (diagnostics) {
-            auto tracer = diagnostics->getProtocolTracer();
-            if (tracer) {
-                return std::shared_ptr<EventTracerInterface>(tracer);
-            }
-        }
-        return std::shared_ptr<EventTracerInterface>(nullptr);
-    };
-}
-
-/**
- * Function to create a LibcurlSetCurlOptionsCallbackFactoryInterface that is Annotated<> to target the
- * instance for consumption by AVSConnectionManager.
- *
- * @return Pointer to LibcurlSetCurlOptionsCallbackFactoryInterface Annotated<> for consumption by
- * AVSCnnectonManager.
- */
-static Annotated<AVSConnectionManagerInterface, LibcurlSetCurlOptionsCallbackFactoryInterface>
-createSetCurlOptionsCallbackForAVSConnectionManager() {
-    return DefaultSetCurlOptionsCallbackFactory::createSetCurlOptionsCallbackFactoryInterface();
-}
-
-/**
- * Function to create a LibcurlSetCurlOptionsCallbackFactoryInterface that is Annotated<> to target the
- * instance for consumption by HTTPContentFetcherInterfaceFactory.
- *
- * @return Pointer to LibcurlSetCurlOptionsCallbackFactoryInterface Annotated<> for consumption by
- * HTTPContentFetcherInterfaceFactory.
- */
-static Annotated<HTTPContentFetcherInterfaceFactoryInterface, LibcurlSetCurlOptionsCallbackFactoryInterface>
-createSetCurlOptionsCallbackForHTTPContentFetcherInterfaceFactory() {
-    return DefaultSetCurlOptionsCallbackFactory::createSetCurlOptionsCallbackFactoryInterface();
-}
-
-PreviewAlexaClientComponent getComponent(
-    std::unique_ptr<avsCommon::avs::initialization::InitializationParameters> initParams,
-    const std::shared_ptr<avsCommon::sdkInterfaces::diagnostics::DiagnosticsInterface>& diagnostics,
-    const std::shared_ptr<sampleApp::PlatformSpecificValues>& platformSpecificValues,
-    const std::shared_ptr<avsCommon::sdkInterfaces::ExpectSpeechTimeoutHandlerInterface>& expectSpeechTimeoutHandler,
-    const std::shared_ptr<avsCommon::sdkInterfaces::PowerResourceManagerInterface>& powerResourceManager) {
-    /// This component is provided as a preview of changes to come. The imports, exports, and factory methods
-    /// will change while manufactory integration is incrementally released over the next several releases.
-
-    return ComponentAccumulator<>()
-        /// Initialize the SDK with @c InitalizationParameters. For example, low-power mode is initialized
-        /// using @c InitializationParamters.
-        .addPrimaryFactory(AlexaClientSDKInit::getCreateAlexaClientSDKInit(std::move(initParams)))
-
-        /// This allows applications to provide platform-specific objects to factory methods. For example,
-        /// AndroidApplicationAudioPipelineFactory requires the AndroidSLESEngine.
-        .addInstance(platformSpecificValues)
-
-        /// Implementations created at the application level, added to the manufactory to satisfy dependencies.
-        .addInstance(expectSpeechTimeoutHandler)
-        .addInstance(powerResourceManager)
-
-        /// Baseline SDK components. Applications are not expected to modify these.
-        .addComponent(acsdkCore::getComponent())
-        .addComponent(acsdkDeviceSettingsManager::getComponent())
-        .addComponent(acsdkInternetConnectionMonitor::getComponent())
-        .addComponent(acsdkHTTPContentFetcher::getComponent())
-        .addComponent(acsdkShared::getComponent())
-        .addRetainedFactory(certifiedSender::CertifiedSender::create)
-        .addRetainedFactory(createSetCurlOptionsCallbackForAVSConnectionManager)
-        .addRetainedFactory(createSetCurlOptionsCallbackForHTTPContentFetcherInterfaceFactory)
-        .addRetainedFactory(DialogUXStateAggregator::createDialogUXStateAggregator)
-        .addRetainedFactory(SystemSoundPlayer::createSystemSoundPlayerInterface)
-
-        /**
-         * Although these are the default options for PreviewAlexaClient, applications may modify or replace
-         * these with custom implementations. These include components like ACL, the logger, and
-         * AuthDelegateInterface, among others.
-         *
-         * For example, to replace the default null MetricRecorder with your own implementation, you could remove
-         * the default applications/acsdkNullMetricRecorder library and instead define your own metric recorder
-         * component in the same acsdkMetricRecorder namespace.
-         */
-        .addComponent(acsdkAlexaCommunications::getComponent())
-        .addComponent(acsdkApplicationAudioPipelineFactory::getComponent())
-        .addComponent(acsdkAudioInputStream::getComponent())
-        .addComponent(acsdkAuthorizationDelegate::getComponent())
-        .addComponent(acsdkBluetoothImplementation::getComponent())
-        .addComponent(acsdkMetricRecorder::getComponent())
-        .addComponent(acsdkSpeechEncoder::getComponent())
-        .addComponent(acsdkSystemTimeZone::getComponent())
-#ifdef ANDROID_LOGGER
-        .addPrimaryFactory(applicationUtilities::androidUtilities::AndroidLogger::getAndroidLogger)
-#else
-        .addPrimaryFactory(avsCommon::utils::logger::getConsoleLogger)
-#endif
-
-        /**
-         * Sample implementations used to satisfy dependencies for Capability Agents and other components.
-         * Applications may choose to provide their own custom implementations.
-         *
-         * For example, to use a custom CaptionPresenterInterface, you can replace this line:
-         *
-         *     .addRequiredFactory(sampleApp::CaptionPresenter::createCaptionPresenterInterface)
-         *
-         * with your own factory method:
-         *
-         *     .addRequiredFactory(myCustomApp::CustomCaptionPresenter::createCaptionPresenterInterface)
-         */
-        .addRetainedFactory(applicationUtilities::resources::audio::AudioFactory::createAudioFactoryInterface)
-        .addRetainedFactory(
-            acsdkBluetooth::BasicDeviceConnectionRulesProvider::createBluetoothDeviceConnectionRulesProviderInterface)
-        .addRetainedFactory(
-            capabilityAgents::speakerManager::DefaultChannelVolumeFactory::createChannelVolumeFactoryInterface)
-        .addRetainedFactory(createUIManagerInterface)
-        .addRetainedFactory(defaultClient::EqualizerRuntimeSetup::createEqualizerRuntimeSetupInterface)
-        .addRequiredFactory(sampleApp::CaptionPresenter::createCaptionPresenterInterface)
-        .addRetainedFactory(sampleApp::LocaleAssetsManager::createLocaleAssetsManagerInterface)
-        .addRetainedFactory(sampleApp::SampleEqualizerModeController::createEqualizerModeControllerInterface)
-        .addRetainedFactory(sampleApp::UIManager::create)
-        .addUnloadableFactory(SampleApplicationCBLAuthRequester::createCBLAuthRequesterInterface)
-
-        /// SQLite implementations of databases used by Capability Agents and other components.
-        /// Applications may choose to replace these with their own database implementations.
-        .addRetainedFactory(acsdkAlerts::storage::SQLiteAlertStorage::createAlertStorageInterface)
-        .addRetainedFactory(acsdkBluetooth::SQLiteBluetoothStorage::createBluetoothStorageInterface)
-        .addRetainedFactory(acsdkNotifications::SQLiteNotificationsStorage::createNotificationsStorageInterface)
-        .addRetainedFactory(certifiedSender::SQLiteMessageStorage::createMessageStorageInterface)
-        .addRetainedFactory(settings::storage::SQLiteDeviceSettingStorage::createDeviceSettingStorageInterface)
-
-        /// Optional, horizontal components. These may be enabled via cmake or AlexaClientSDKConfig.json.
-        /// Applications are not expected to modify these.
-        .addComponent(captions::getComponent())
-        .addRetainedFactory(getCreateEventTracker(diagnostics))
-#ifdef EXTERNAL_MEDIA_ADAPTERS
-        .addComponent(acsdkExternalMediaPlayerAdapters::getComponent())
-#endif
-
-        /// KWD Component. Default component is the null component.
-        .addComponent(acsdkKWD::getComponent())
-
-        /// Capability Agents. Some CAs are still created in Default Client.
-        .addComponent(acsdkAlerts::getComponent())
-        .addComponent(acsdkAudioPlayer::getComponent())
-        .addComponent(acsdkBluetooth::getComponent())
-        .addComponent(acsdkDoNotDisturb::getComponent())
-        .addComponent(acsdkEqualizer::getComponent())
-        .addComponent(acsdkExternalMediaPlayer::getComponent())
-        .addComponent(acsdkInteractionModel::getComponent())
-#ifdef ENABLE_MC
-        .addComponent(acsdkMessenger::getComponent())
-        .addComponent(acsdkMessagingController::getComponent())
-#endif
-        .addComponent(acsdkNotifications::getComponent())
-        .addComponent(capabilityAgents::playbackController::getComponent())
-        .addComponent(capabilityAgents::speakerManager::getComponent())
-        .addComponent(capabilityAgents::system::getComponent())
-        .addRetainedFactory(capabilityAgents::templateRuntime::RenderPlayerInfoCardsProviderRegistrar::
-                                createRenderPlayerInfoCardsProviderRegistrarInterface)
-        .addComponent(acsdkDeviceSetup::getComponent())
-#ifdef ENABLE_PKCS11
-        .addRetainedFactory(acsdkPkcs11::createKeyStore)
-#else
-        .addInstance(std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>())
-#endif
-        .addRetainedFactory(acsdkCrypto::createCryptoFactory);
-}
-
-}  // namespace acsdkPreviewAlexaClient
-}  // namespace alexaClientSDK
diff --git a/applications/acsdkPreviewAlexaClient/src/previewMain.cpp b/applications/acsdkPreviewAlexaClient/src/previewMain.cpp
deleted file mode 100644
index 2b09b573bb..0000000000
--- a/applications/acsdkPreviewAlexaClient/src/previewMain.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <cstdlib>
-#include <string>
-
-#include <SampleApp/ConsoleReader.h>
-#include <SampleApp/SampleApplicationReturnCodes.h>
-
-#ifdef DIAGNOSTICS
-#include <SampleApp/SDKDiagnostics.h>
-#endif
-
-#include "acsdkPreviewAlexaClient/PreviewAlexaClient.h"
-
-using namespace alexaClientSDK::sampleApp;
-using namespace alexaClientSDK::acsdkPreviewAlexaClient;
-
-/**
- * Function that evaluates if the PreviewAlexaClient invocation uses old-style or new-style opt-arg style invocation.
- *
- * @param argc The number of elements in the @c argv array.
- * @param argv An array of @a argc elements, containing the program name and all command-line arguments.
- * @return @c true of the invocation uses optarg style argument @c false otherwise.
- */
-bool usesOptStyleArgs(int argc, char* argv[]) {
-    for (int i = 1; i < argc; i++) {
-        if (!strcmp(argv[i], "-C") || !strcmp(argv[i], "-L")) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-/**
- * This serves as the starting point for the application. This code instantiates the @c UserInputManager and processes
- * user input until the @c run() function returns.
- *
- * @param argc The number of elements in the @c argv array.
- * @param argv An array of @a argc elements, containing the program name and all command-line arguments.
- * @return @c EXIT_FAILURE if the program failed to initialize correctly, else @c EXIT_SUCCESS.
- */
-int main(int argc, char* argv[]) {
-    std::vector<std::string> configFiles;
-    std::string logLevel;
-
-    if (usesOptStyleArgs(argc, argv)) {
-        for (int i = 1; i < argc; i++) {
-            if (strcmp(argv[i], "-C") == 0) {
-                if (i + 1 == argc) {
-                    ConsolePrinter::simplePrint("No config specified for -C option");
-                    return SampleAppReturnCode::ERROR;
-                }
-                configFiles.push_back(std::string(argv[++i]));
-                ConsolePrinter::simplePrint("configFile " + std::string(argv[i]));
-            } else if (strcmp(argv[i], "-L") == 0) {
-                if (i + 1 == argc) {
-                    ConsolePrinter::simplePrint("No debugLevel specified for -L option");
-                    return SampleAppReturnCode::ERROR;
-                }
-                logLevel = std::string(argv[++i]);
-            } else {
-                ConsolePrinter::simplePrint(
-                    "USAGE: " + std::string(argv[0]) + " -C <config1.json> -C <config2.json> ... -C <configN.json> " +
-                    " -L <log_level>");
-                return SampleAppReturnCode::ERROR;
-            }
-        }
-    } else {
-        if (argc < 2) {
-            ConsolePrinter::simplePrint(
-                "USAGE: " + std::string(argv[0]) + " <path_to_AlexaClientSDKConfig.json> [log_level]");
-            return SampleAppReturnCode::ERROR;
-        }
-        if (3 == argc) {
-            logLevel = std::string(argv[2]);
-        }
-
-        configFiles.push_back(std::string(argv[1]));
-        ConsolePrinter::simplePrint("configFile " + std::string(argv[1]));
-    }
-
-    auto consoleReader = std::make_shared<ConsoleReader>();
-
-    std::unique_ptr<PreviewAlexaClient> application;
-    SampleAppReturnCode returnCode = SampleAppReturnCode::OK;
-
-#ifdef DIAGNOSTICS
-    std::shared_ptr<SDKDiagnostics> diagnostics = SDKDiagnostics::create();
-    if (!diagnostics) {
-        return SampleAppReturnCode::ERROR;
-    }
-#endif
-
-    do {
-        application = PreviewAlexaClient::create(
-            consoleReader,
-            configFiles,
-            logLevel
-#ifdef DIAGNOSTICS
-            ,
-            diagnostics
-#endif
-        );
-
-        if (!application) {
-            ConsolePrinter::simplePrint("Failed to create PreviewAlexaClient!");
-            return SampleAppReturnCode::ERROR;
-        }
-        returnCode = application->run();
-        application.reset();
-    } while (SampleAppReturnCode::RESTART == returnCode);
-
-    return returnCode;
-}
diff --git a/applications/acsdkSampleApplicationCBLAuthRequester/include/acsdkSampleApplicationCBLAuthRequester/SampleApplicationCBLAuthRequester.h b/applications/acsdkSampleApplicationCBLAuthRequester/include/acsdkSampleApplicationCBLAuthRequester/SampleApplicationCBLAuthRequester.h
index cf022ea571..93ffa780ea 100644
--- a/applications/acsdkSampleApplicationCBLAuthRequester/include/acsdkSampleApplicationCBLAuthRequester/SampleApplicationCBLAuthRequester.h
+++ b/applications/acsdkSampleApplicationCBLAuthRequester/include/acsdkSampleApplicationCBLAuthRequester/SampleApplicationCBLAuthRequester.h
@@ -17,10 +17,12 @@
 #define ACSDKSAMPLEAPPLICATIONCBLAUTHREQUESTER_SAMPLEAPPLICATIONCBLAUTHREQUESTER_H_
 
 #include <memory>
+#include <mutex>
+#include <string>
 
-#include <acsdkSampleApplicationInterfaces/UIManagerInterface.h>
-#include <CBLAuthDelegate/CBLAuthRequesterInterface.h>
 #include <acsdkAuthorizationInterfaces/LWA/CBLAuthorizationObserverInterface.h>
+#include <acsdkSampleApplicationInterfaces/UIAuthNotifierInterface.h>
+#include <acsdkSampleApplicationInterfaces/UIManagerInterface.h>
 
 namespace alexaClientSDK {
 namespace acsdkSampleApplicationCBLAuthRequester {
@@ -28,19 +30,8 @@ namespace acsdkSampleApplicationCBLAuthRequester {
 /**
  * Implementation of CBLAuthRequesterInterface.
  */
-class SampleApplicationCBLAuthRequester
-        : public authorization::cblAuthDelegate::CBLAuthRequesterInterface
-        , public acsdkAuthorizationInterfaces::lwa::CBLAuthorizationObserverInterface {
+class SampleApplicationCBLAuthRequester : public acsdkAuthorizationInterfaces::lwa::CBLAuthorizationObserverInterface {
 public:
-    /**
-     * Create a new instance of @c CBLAuthRequesterInterface.
-     *
-     * @param uiManager The instance of @c UIManagerInterface to use to message the user.
-     * @return A new instance of @c CBLAuthRequesterInterface.
-     */
-    static std::shared_ptr<CBLAuthRequesterInterface> createCBLAuthRequesterInterface(
-        const std::shared_ptr<acsdkSampleApplicationInterfaces::UIManagerInterface>& uiManager);
-
     /**
      * Create a new instance of @c CBLAuthorizationObserverInterface.
      *
@@ -51,19 +42,21 @@ class SampleApplicationCBLAuthRequester
     createCBLAuthorizationObserverInterface(
         const std::shared_ptr<acsdkSampleApplicationInterfaces::UIManagerInterface>& uiManager);
 
-    /// @name CBLAuthDelegateRequester methods
+    /// @name CBLAuthorizationObserverInterface methods
     /// @{
     void onRequestAuthorization(const std::string& url, const std::string& code) override;
     void onCheckingForAuthorization() override;
-    /// @}
-
-    /// @name CBLAuthorizationObserverInterface methods
-    /// @{
     void onCustomerProfileAvailable(
         const acsdkAuthorizationInterfaces::lwa::CBLAuthorizationObserverInterface::CustomerProfile& customerProfile)
         override;
     /// @}
 
+    /**
+     * Set a notifier that bridges Authorization state from authorization requester to the user interface.
+     * @param uiAuthNotifier An instance of @c UIAuthNotifierInterface.
+     */
+    void setUIAuthNotifier(std::shared_ptr<acsdkSampleApplicationInterfaces::UIAuthNotifierInterface> uiAuthNotifier);
+
 private:
     /**
      * Constructor.
@@ -73,11 +66,23 @@ class SampleApplicationCBLAuthRequester
     SampleApplicationCBLAuthRequester(
         const std::shared_ptr<acsdkSampleApplicationInterfaces::UIManagerInterface>& uiManager);
 
-    /// The instance of @c UIManagerInterface to use to message the user.
+    /// The instance of @c UIManagerInterface used to message the user.
     std::shared_ptr<acsdkSampleApplicationInterfaces::UIManagerInterface> m_uiManager;
 
+    /// The instance of @c UIAuthNotifierInterface used to notify UI about the authorization events.
+    std::shared_ptr<acsdkSampleApplicationInterfaces::UIAuthNotifierInterface> m_uiAuthNotifier;
+
     /// Counter used to make repeated messages about checking for authorization distinguishable from each other.
     int m_authCheckCounter;
+
+    /// URL returned by CBLAuthRequesterInterface for authorization
+    std::string m_authUrl;
+
+    /// CBL Code returned by CBLAuthRequesterInterface for authorization
+    std::string m_authCode;
+
+    /// Mutex to synchronize rd/wr to the class.
+    std::mutex m_mutex;
 };
 
 }  // namespace acsdkSampleApplicationCBLAuthRequester
diff --git a/applications/acsdkSampleApplicationCBLAuthRequester/src/CMakeLists.txt b/applications/acsdkSampleApplicationCBLAuthRequester/src/CMakeLists.txt
index 2e9a4582a4..d66f8bfe86 100644
--- a/applications/acsdkSampleApplicationCBLAuthRequester/src/CMakeLists.txt
+++ b/applications/acsdkSampleApplicationCBLAuthRequester/src/CMakeLists.txt
@@ -7,8 +7,7 @@ target_include_directories(acsdkSampleApplicationCBLAuthRequester PUBLIC
 
 target_link_libraries(acsdkSampleApplicationCBLAuthRequester PUBLIC
     acsdkSampleApplicationInterfaces
-    acsdkAuthorizationInterfaces
-    CBLAuthDelegate)
+    acsdkAuthorizationInterfaces)
 
 # install target
 asdk_install()
diff --git a/applications/acsdkSampleApplicationCBLAuthRequester/src/SampleApplicationCBLAuthRequester.cpp b/applications/acsdkSampleApplicationCBLAuthRequester/src/SampleApplicationCBLAuthRequester.cpp
index 32ff690824..1393f0fd4b 100644
--- a/applications/acsdkSampleApplicationCBLAuthRequester/src/SampleApplicationCBLAuthRequester.cpp
+++ b/applications/acsdkSampleApplicationCBLAuthRequester/src/SampleApplicationCBLAuthRequester.cpp
@@ -17,54 +17,69 @@
 #include <sstream>
 
 #include "acsdkSampleApplicationCBLAuthRequester/SampleApplicationCBLAuthRequester.h"
+#include <acsdkAuthorizationInterfaces/AuthorizationManagerInterface.h>
 
 namespace alexaClientSDK {
 namespace acsdkSampleApplicationCBLAuthRequester {
 
-std::shared_ptr<authorization::cblAuthDelegate::CBLAuthRequesterInterface> SampleApplicationCBLAuthRequester::
-    createCBLAuthRequesterInterface(
-        const std::shared_ptr<acsdkSampleApplicationInterfaces::UIManagerInterface>& uiManager) {
-    if (!uiManager) {
-        return nullptr;
-    }
+using namespace acsdkSampleApplicationInterfaces;
+using namespace acsdkAuthorizationInterfaces::lwa;
 
-    return std::shared_ptr<authorization::cblAuthDelegate::CBLAuthRequesterInterface>(
-        new SampleApplicationCBLAuthRequester(uiManager));
-}
-
-std::shared_ptr<acsdkAuthorizationInterfaces::lwa::CBLAuthorizationObserverInterface>
-SampleApplicationCBLAuthRequester::createCBLAuthorizationObserverInterface(
-    const std::shared_ptr<acsdkSampleApplicationInterfaces::UIManagerInterface>& uiManager) {
+std::shared_ptr<CBLAuthorizationObserverInterface> SampleApplicationCBLAuthRequester::
+    createCBLAuthorizationObserverInterface(
+        const std::shared_ptr<acsdkSampleApplicationInterfaces::UIManagerInterface>& uiManager) {
     if (!uiManager) {
         return nullptr;
     }
 
-    return std::shared_ptr<acsdkAuthorizationInterfaces::lwa::CBLAuthorizationObserverInterface>(
-        new SampleApplicationCBLAuthRequester(uiManager));
+    return std::shared_ptr<CBLAuthorizationObserverInterface>(new SampleApplicationCBLAuthRequester(uiManager));
 }
 
 void SampleApplicationCBLAuthRequester::onRequestAuthorization(const std::string& url, const std::string& code) {
-    m_authCheckCounter = 0;
     m_uiManager->printMessage("NOT YET AUTHORIZED");
     std::ostringstream oss;
     oss << "To authorize, browse to: '" << url << "' and enter the code: " << code;
     m_uiManager->printMessage(oss.str());
+
+    std::unique_lock<std::mutex> lock(m_mutex);
+    m_authCheckCounter = 0;
+    m_authCode = code;
+    m_authUrl = url;
+    lock.unlock();
+
+    if (m_uiAuthNotifier) {
+        m_uiAuthNotifier->notifyAuthorizationRequest(url, code);
+    }
 }
 
 void SampleApplicationCBLAuthRequester::onCheckingForAuthorization() {
     std::ostringstream oss;
+
+    std::unique_lock<std::mutex> lock(m_mutex);
     oss << "Checking for authorization (" << ++m_authCheckCounter << ")...";
+    auto code = m_authCode;
+    auto url = m_authUrl;
+    lock.unlock();
+
     m_uiManager->printMessage(oss.str());
+    if (m_uiAuthNotifier) {
+        m_uiAuthNotifier->notifyAuthorizationRequest(url, code);
+    }
 }
 
 void SampleApplicationCBLAuthRequester::onCustomerProfileAvailable(
-    const acsdkAuthorizationInterfaces::lwa::CBLAuthorizationObserverInterface::CustomerProfile& customerProfile) {
+    const CBLAuthorizationObserverInterface::CustomerProfile& customerProfile) {
     std::ostringstream oss;
     oss << "Name: " << customerProfile.name << " "
         << " Email: " << customerProfile.email;
     m_uiManager->printMessage(oss.str());
 }
 
+void SampleApplicationCBLAuthRequester::setUIAuthNotifier(
+    std::shared_ptr<acsdkSampleApplicationInterfaces::UIAuthNotifierInterface> uiAuthNotifier) {
+    m_uiAuthNotifier = std::move(uiAuthNotifier);
+}
+
 SampleApplicationCBLAuthRequester::SampleApplicationCBLAuthRequester(
     const std::shared_ptr<acsdkSampleApplicationInterfaces::UIManagerInterface>& uiManager) :
         m_uiManager{uiManager},
diff --git a/applications/acsdkSampleApplicationInterfaces/CMakeLists.txt b/applications/acsdkSampleApplicationInterfaces/CMakeLists.txt
index 4598ea0143..c984a24063 100644
--- a/applications/acsdkSampleApplicationInterfaces/CMakeLists.txt
+++ b/applications/acsdkSampleApplicationInterfaces/CMakeLists.txt
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.1)
 project(acsdkSampleApplicationInterfaces LANGUAGES CXX)
 
 add_library(acsdkSampleApplicationInterfaces INTERFACE)
+target_link_libraries(acsdkSampleApplicationInterfaces INTERFACE AVSCommon)
 
 target_include_directories(acsdkSampleApplicationInterfaces INTERFACE
     "${acsdkSampleApplicationInterfaces_SOURCE_DIR}/include"
diff --git a/applications/acsdkSampleApplicationInterfaces/include/acsdkSampleApplicationInterfaces/UIAuthNotifierInterface.h b/applications/acsdkSampleApplicationInterfaces/include/acsdkSampleApplicationInterfaces/UIAuthNotifierInterface.h
new file mode 100644
index 0000000000..eaa57a0d4c
--- /dev/null
+++ b/applications/acsdkSampleApplicationInterfaces/include/acsdkSampleApplicationInterfaces/UIAuthNotifierInterface.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKSAMPLEAPPLICATIONINTERFACES_UIAUTHNOTIFIERINTERFACE_H_
+#define ACSDKSAMPLEAPPLICATIONINTERFACES_UIAUTHNOTIFIERINTERFACE_H_
+
+#include <string>
+#include <AVSCommon/SDKInterfaces/AuthObserverInterface.h>
+
+namespace alexaClientSDK {
+namespace acsdkSampleApplicationInterfaces {
+
+/*
+ * Contract to notify user interface about relevant authorization state changes.
+ */
+class UIAuthNotifierInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~UIAuthNotifierInterface() = default;
+
+    /**
+     * Notify user interface about the authorization request. The request url and code will be used by the user to
+     * authorize.
+     *
+     * @param url The URL that the user needs to navigate to.
+     * @param code The code that the user needs to enter once authorized.
+     */
+    virtual void notifyAuthorizationRequest(const std::string& url, const std::string& code) = 0;
+
+    /**
+     * Notify authorization state changes to GUI.
+     *
+     * @param state Changed authorization state.
+     */
+    virtual void notifyAuthorizationStateChange(avsCommon::sdkInterfaces::AuthObserverInterface::State state) = 0;
+};
+
+}  // namespace acsdkSampleApplicationInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKSAMPLEAPPLICATIONINTERFACES_UIAUTHNOTIFIERINTERFACE_H_
diff --git a/applications/acsdkSampleApplicationInterfaces/include/acsdkSampleApplicationInterfaces/UIStateAggregatorInterface.h b/applications/acsdkSampleApplicationInterfaces/include/acsdkSampleApplicationInterfaces/UIStateAggregatorInterface.h
new file mode 100644
index 0000000000..25db5544a0
--- /dev/null
+++ b/applications/acsdkSampleApplicationInterfaces/include/acsdkSampleApplicationInterfaces/UIStateAggregatorInterface.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKSAMPLEAPPLICATIONINTERFACES_UISTATEAGGREGATORINTERFACE_H_
+#define ACSDKSAMPLEAPPLICATIONINTERFACES_UISTATEAGGREGATORINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace acsdkSampleApplicationInterfaces {
+
+/*
+ * Contract to notify user interface about relevant application state changes.
+ */
+class UIStateAggregatorInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~UIStateAggregatorInterface() = default;
+
+    /**
+     * Notify User interface about the interaction state
+     *
+     * @param state UI state mainly to display the connection and Alexa states to user.
+     */
+    virtual void notifyAlexaState(const std::string& state) = 0;
+};
+
+}  // namespace acsdkSampleApplicationInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKSAMPLEAPPLICATIONINTERFACES_UISTATEAGGREGATORINTERFACE_H_
diff --git a/applications/acsdkSensoryAdapter/CMakeLists.txt b/applications/acsdkSensoryAdapter/CMakeLists.txt
deleted file mode 100644
index fcc139d009..0000000000
--- a/applications/acsdkSensoryAdapter/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-project(SENSORY LANGUAGES CXX)
-
-include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
-
-set(TARGET_KWD_LIB "SENSORY" PARENT_SCOPE)
-set(KWD_ADAPTER_REGISTRATION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/acsdkKWDProvider/src/SensoryRegistration.cpp" PARENT_SCOPE)
-set(KWD_COMPONENT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/acsdkKWD/src/KWDComponent.cpp" PARENT_SCOPE)
-
-add_subdirectory("src")
-add_subdirectory("test")
diff --git a/applications/acsdkSensoryAdapter/acsdkKWD/src/KWDComponent.cpp b/applications/acsdkSensoryAdapter/acsdkKWD/src/KWDComponent.cpp
deleted file mode 100644
index 3e46d4705f..0000000000
--- a/applications/acsdkSensoryAdapter/acsdkKWD/src/KWDComponent.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <acsdkKWDImplementations/KWDNotifierFactories.h>
-#include <acsdkManufactory/ComponentAccumulator.h>
-#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <Sensory/SensoryKeywordDetector.h>
-
-#include "acsdkKWD/KWDComponent.h"
-
-namespace alexaClientSDK {
-namespace acsdkKWD {
-
-/// String to identify log entries originating from this file.
-static const std::string TAG{"SensoryKWDComponent"};
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param event The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// The Sensory Config values from AlexaClientSDKConfig.json
-static const std::string SAMPLE_APP_CONFIG_ROOT_KEY("sampleApp");
-static const std::string SENSORY_CONFIG_ROOT_KEY("sensory");
-static const std::string SENSORY_MODEL_FILE_PATH("modelFilePath");
-
-static std::shared_ptr<acsdkKWDImplementations::AbstractKeywordDetector> createAbstractKeywordDetector(
-    const std::shared_ptr<avsCommon::avs::AudioInputStream>& stream,
-    const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
-    std::shared_ptr<acsdkKWDInterfaces::KeywordNotifierInterface> keywordNotifier,
-    std::shared_ptr<acsdkKWDInterfaces::KeywordDetectorStateNotifierInterface> keywordDetectorStateNotifier) {
-    std::string modelFilePath;
-    auto config = avsCommon::utils::configuration::ConfigurationNode::getRoot()[SAMPLE_APP_CONFIG_ROOT_KEY]
-                                                                               [SENSORY_CONFIG_ROOT_KEY];
-    if (config) {
-        config.getString(SENSORY_MODEL_FILE_PATH, &modelFilePath);
-    }
-    if (modelFilePath.empty()) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "emptyModelFilePath"));
-        return nullptr;
-    }
-    return kwd::SensoryKeywordDetector::create(
-        stream, audioFormat, keywordNotifier, keywordDetectorStateNotifier, modelFilePath);
-};
-
-KWDComponent getComponent() {
-    return acsdkManufactory::ComponentAccumulator<>()
-        .addRetainedFactory(createAbstractKeywordDetector)
-        .addRetainedFactory(acsdkKWDImplementations::KWDNotifierFactories::createKeywordDetectorStateNotifier)
-        .addRetainedFactory(acsdkKWDImplementations::KWDNotifierFactories::createKeywordNotifier);
-}
-
-}  // namespace acsdkKWD
-}  // namespace alexaClientSDK
diff --git a/applications/acsdkSensoryAdapter/acsdkKWDProvider/src/SensoryRegistration.cpp b/applications/acsdkSensoryAdapter/acsdkKWDProvider/src/SensoryRegistration.cpp
deleted file mode 100644
index d6850a647f..0000000000
--- a/applications/acsdkSensoryAdapter/acsdkKWDProvider/src/SensoryRegistration.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * You may not use this file except in compliance with the terms and conditions
- * set forth in the accompanying LICENSE.TXT file.
- *
- * THESE MATERIALS ARE PROVIDED ON AN "AS IS" BASIS. AMAZON SPECIFICALLY
- * DISCLAIMS, WITH RESPECT TO THESE MATERIALS, ALL WARRANTIES, EXPRESS, IMPLIED,
- * OR STATUTORY, INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR
- * A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
- */
-
-#include <acsdkKWDImplementations/AbstractKeywordDetector.h>
-#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <Sensory/SensoryKeywordDetector.h>
-
-#include "KWDProvider/KeywordDetectorProvider.h"
-
-/**
- * @deprecated
- * This registration file is not needed if an application uses the manufactory to build its components. For example,
- * the SDK Preview App does not use this registration file any longer.
- *
- * However, for applications that have yet to transition to using the manufactory, this file is provided so those
- * applications can continue to use Keyword Detection (for example, the backwards-compatible SDK Sample App does use
- * this file).
- */
-namespace alexaClientSDK {
-namespace kwd {
-
-/// The Sensory Config values from AlexaClientSDKConfig.json.
-static const std::string SAMPLE_APP_CONFIG_ROOT_KEY("sampleApp");
-static const std::string SENSORY_CONFIG_ROOT_KEY("sensory");
-static const std::string SENSORY_MODEL_FILE_PATH("modelFilePath");
-
-std::unique_ptr<acsdkKWDImplementations::AbstractKeywordDetector> createSensoryKWDAdapter(
-    std::shared_ptr<avsCommon::avs::AudioInputStream> stream,
-    avsCommon::utils::AudioFormat audioFormat,
-    std::unordered_set<std::shared_ptr<KeyWordObserverInterface>> keyWordObservers,
-    std::unordered_set<std::shared_ptr<KeyWordDetectorStateObserverInterface>> keyWordDetectorStateObservers) {
-    std::string modelFilePath;
-    auto config = avsCommon::utils::configuration::ConfigurationNode::getRoot()[SAMPLE_APP_CONFIG_ROOT_KEY]
-                                                                               [SENSORY_CONFIG_ROOT_KEY];
-    if (config) {
-        config.getString(SENSORY_MODEL_FILE_PATH, &modelFilePath);
-    }
-    return kwd::SensoryKeywordDetector::create(
-        stream, audioFormat, keyWordObservers, keyWordDetectorStateObservers, modelFilePath);
-}
-
-/// The registration object to register the Sensory adapter's creation method.
-static const KeywordDetectorProvider::KWDRegistration g_sensoryAdapterRegistration(createSensoryKWDAdapter);
-
-}  // namespace kwd
-}  // namespace alexaClientSDK
diff --git a/applications/acsdkSensoryAdapter/include/acsdkSensoryAdapter/Sensory/SensoryKeywordDetector.h b/applications/acsdkSensoryAdapter/include/acsdkSensoryAdapter/Sensory/SensoryKeywordDetector.h
deleted file mode 100644
index 7a812dd4af..0000000000
--- a/applications/acsdkSensoryAdapter/include/acsdkSensoryAdapter/Sensory/SensoryKeywordDetector.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKSENSORYADAPTER_SENSORY_SENSORYKEYWORDDETECTOR_H_
-#define ACSDKSENSORYADAPTER_SENSORY_SENSORYKEYWORDDETECTOR_H_
-
-#include <atomic>
-#include <string>
-#include <thread>
-#include <unordered_set>
-
-#include <acsdkKWDImplementations/AbstractKeywordDetector.h>
-#include <acsdkKWDInterfaces/KeywordDetectorStateNotifierInterface.h>
-#include <acsdkKWDInterfaces/KeywordNotifierInterface.h>
-#include <AVSCommon/AVS/AudioInputStream.h>
-#include <AVSCommon/SDKInterfaces/KeyWordDetectorStateObserverInterface.h>
-#include <AVSCommon/SDKInterfaces/KeyWordObserverInterface.h>
-#include <AVSCommon/Utils/AudioFormat.h>
-
-#include "snsr.h"
-
-namespace alexaClientSDK {
-namespace kwd {
-
-using namespace avsCommon;
-using namespace avsCommon::avs;
-using namespace avsCommon::sdkInterfaces;
-
-class SensoryKeywordDetector : public acsdkKWDImplementations::AbstractKeywordDetector {
-public:
-    /**
-     * Creates a @c SensoryKeywordDetector. Requires that the AlexaClientSDKConfig.json has a modelFilePath value under
-     * sampleApp
-     *
-     * @param stream The stream of audio data. This should be formatted in LPCM encoded with 16 bits per sample and
-     * have a sample rate of 16 kHz. Additionally, the data should be in little endian format.
-     * @param audioFormat The format of the audio data located within the stream.
-     * @param keyWordNotifier The object with which to notifiy observers of keyword detections.
-     * @param KeyWordDetectorStateNotifier The object with which to notify observers of state changes in the engine.
-     * @param modelFilePath The path to the model file.
-     * @param msToPushPerIteration The amount of data in milliseconds to push to Sensory at a time. Smaller sizes will
-     * lead to less delay but more CPU usage. Additionally, larger amounts of data fed into the engine per iteration
-     * might lead longer delays before receiving keyword detection events. This has been defaulted to 10 milliseconds
-     * as it is a good trade off between CPU usage and recognition delay. Additionally, this was the amount used by
-     * Sensory in example code.
-     * @return A new @c SensoryKeywordDetector, or @c nullptr if the operation failed.
-     */
-    static std::unique_ptr<SensoryKeywordDetector> create(
-        const std::shared_ptr<AudioInputStream> stream,
-        const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
-        std::shared_ptr<acsdkKWDInterfaces::KeywordNotifierInterface> keyWordNotifier,
-        std::shared_ptr<acsdkKWDInterfaces::KeywordDetectorStateNotifierInterface> KeyWordDetectorStateNotifier,
-        const std::string& modelFilePath,
-        std::chrono::milliseconds msToPushPerIteration = std::chrono::milliseconds(10));
-
-    /**
-     * @deprecated
-     * Creates a @c SensoryKeywordDetector. Requires that the AlexaClientSDKConfig.json has a modelFilePath value under
-     * sampleApp
-     *
-     * @param stream The stream of audio data. This should be formatted in LPCM encoded with 16 bits per sample and
-     * have a sample rate of 16 kHz. Additionally, the data should be in little endian format.
-     * @param audioFormat The format of the audio data located within the stream.
-     * @param keyWordObservers The observers to notify of keyword detections.
-     * @param keyWordDetectorStateObservers The observers to notify of state changes in the engine.
-     * @param modelFilePath The path to the model file.
-     * @param msToPushPerIteration The amount of data in milliseconds to push to Sensory at a time. Smaller sizes will
-     * lead to less delay but more CPU usage. Additionally, larger amounts of data fed into the engine per iteration
-     * might lead longer delays before receiving keyword detection events. This has been defaulted to 10 milliseconds
-     * as it is a good trade off between CPU usage and recognition delay. Additionally, this was the amount used by
-     * Sensory in example code.
-     * @return A new @c SensoryKeywordDetector, or @c nullptr if the operation failed.
-     */
-    static std::unique_ptr<SensoryKeywordDetector> create(
-        const std::shared_ptr<AudioInputStream> stream,
-        avsCommon::utils::AudioFormat audioFormat,
-        std::unordered_set<std::shared_ptr<KeyWordObserverInterface>> keyWordObservers,
-        std::unordered_set<std::shared_ptr<KeyWordDetectorStateObserverInterface>> keyWordDetectorStateObservers,
-        const std::string& modelFilePath,
-        std::chrono::milliseconds msToPushPerIteration = std::chrono::milliseconds(10));
-
-    /**
-     * Destructor.
-     */
-    ~SensoryKeywordDetector() override;
-
-private:
-    /**
-     * Constructor.
-     *
-     * @param stream The stream of audio data. This should be formatted in LPCM encoded with 16 bits per sample and
-     * have a sample rate of 16 kHz. Additionally, the data should be in little endian format.
-     * @param audioFormat The format of the audio data located within the stream.
-     * @param keywordNotifier The object with which to notifiy observers of keyword detections.
-     * @param KeywordDetectorStateNotifier The object with which to notify observers of state changes in the engine.
-     * @param msToPushPerIteration The amount of data in milliseconds to push to Sensory at a time. Smaller sizes will
-     * lead to less delay but more CPU usage. Additionally, larger amounts of data fed into the engine per iteration
-     * might lead longer delays before receiving keyword detection events. This has been defaulted to 10 milliseconds
-     * as it is a good trade off between CPU usage and recognition delay. Additionally, this was the amount used by
-     * Sensory in example code.
-     */
-    SensoryKeywordDetector(
-        std::shared_ptr<AudioInputStream> stream,
-        const std::shared_ptr<acsdkKWDInterfaces::KeywordNotifierInterface> keywordNotifier,
-        const std::shared_ptr<acsdkKWDInterfaces::KeywordDetectorStateNotifierInterface> KeywordDetectorStateNotifier,
-        avsCommon::utils::AudioFormat audioFormat,
-        std::chrono::milliseconds msToPushPerIteration = std::chrono::milliseconds(10));
-
-    /**
-     * Initializes the stream reader, sets up the Sensory engine, and kicks off a thread to begin processing data from
-     * the stream. This function should only be called once with each new @c SensoryKeywordDetector.
-     *
-     * @param modelFilePath The path to the model file.
-     * @return @c true if the engine was initialized properly and @c false otherwise.
-     */
-    bool init(const std::string& modelFilePath);
-
-    /**
-     * Sets up the runtime settings for a @c SnsrSession. This includes setting the callback handler and setting the
-     * @c SNSR_AUTO_FLUSH setting.
-     *
-     * @param session The SnsrSession to set up runtime settings for.
-     * @return @c true if everything succeeded and @c false otherwise.
-     */
-    bool setUpRuntimeSettings(SnsrSession* session);
-
-    /// The main function that reads data and feeds it into the engine.
-    void detectionLoop();
-
-    /**
-     * The callback that Sensory will issue to notify of keyword detections.
-     *
-     * @param s The @c Sensory session handle.
-     * @param key The name of the callback setting.
-     * @param userData A pointer to the user data to pass along to the callback.
-     * @return @c SNSR_RC_OK if everything was processed properly, and a different error code otherwise.
-     */
-    static SnsrRC keyWordDetectedCallback(SnsrSession s, const char* key, void* userData);
-
-    /// Indicates whether the internal main loop should keep running.
-    std::atomic<bool> m_isShuttingDown;
-
-    /// The stream of audio data.
-    const std::shared_ptr<avsCommon::avs::AudioInputStream> m_stream;
-
-    /// The reader that will be used to read audio data from the stream.
-    std::shared_ptr<avsCommon::avs::AudioInputStream::Reader> m_streamReader;
-
-    /**
-     * This serves as a reference point used when notifying observers of keyword detection indices since Sensory has no
-     * way of specifying a start index.
-     */
-    avsCommon::avs::AudioInputStream::Index m_beginIndexOfStreamReader;
-
-    /// Internal thread that reads audio from the buffer and feeds it to the Sensory engine.
-    std::thread m_detectionThread;
-
-    /// The Sensory handle.
-    SnsrSession m_session;
-
-    /**
-     * The max number of samples to push into the underlying engine per iteration. This will be determined based on the
-     * sampling rate of the audio data passed in.
-     */
-    const size_t m_maxSamplesPerPush;
-};
-
-}  // namespace kwd
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKSENSORYADAPTER_SENSORY_SENSORYKEYWORDDETECTOR_H_
diff --git a/applications/acsdkSensoryAdapter/src/CMakeLists.txt b/applications/acsdkSensoryAdapter/src/CMakeLists.txt
deleted file mode 100644
index 4acb6d91f7..0000000000
--- a/applications/acsdkSensoryAdapter/src/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-add_definitions("-DACSDK_LOG_MODULE=sensoryKeywordDetector")
-add_library(SENSORY
-    SensoryKeywordDetector.cpp)
-
-target_include_directories(SENSORY PUBLIC
-    "${SENSORY_KEY_WORD_DETECTOR_INCLUDE_DIR}"
-    "${SENSORY_SOURCE_DIR}/include/acsdkSensoryAdapter")
-
-target_link_libraries(SENSORY
-    acsdkKWDImplementations
-    acsdkKWDInterfaces
-    AVSCommon
-    "${SENSORY_KEY_WORD_DETECTOR_LIB_PATH}")
-
-# install target
-asdk_install()
diff --git a/applications/acsdkSensoryAdapter/src/SensoryKeywordDetector.cpp b/applications/acsdkSensoryAdapter/src/SensoryKeywordDetector.cpp
deleted file mode 100644
index 58bbca6003..0000000000
--- a/applications/acsdkSensoryAdapter/src/SensoryKeywordDetector.cpp
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <memory>
-
-#include <acsdkKWDImplementations/KWDNotifierFactories.h>
-#include <AVSCommon/Utils/Logger/Logger.h>
-
-#include "Sensory/SensoryKeywordDetector.h"
-
-namespace alexaClientSDK {
-namespace kwd {
-
-using namespace avsCommon::utils::logger;
-
-/// String to identify log entries originating from this file.
-static const std::string TAG("SensoryKeywordDetector");
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/// The number of hertz per kilohertz.
-static const size_t HERTZ_PER_KILOHERTZ = 1000;
-
-/// The timeout to use for read calls to the SharedDataStream.
-const std::chrono::milliseconds TIMEOUT_FOR_READ_CALLS = std::chrono::milliseconds(1000);
-
-/// The Sensory compatible AVS sample rate of 16 kHz.
-static const unsigned int SENSORY_COMPATIBLE_SAMPLE_RATE = 16000;
-
-/// The Sensory compatible bits per sample of 16.
-static const unsigned int SENSORY_COMPATIBLE_SAMPLE_SIZE_IN_BITS = 16;
-
-/// The Sensory compatible number of channels, which is 1.
-static const unsigned int SENSORY_COMPATIBLE_NUM_CHANNELS = 1;
-
-/// The Sensory compatible audio encoding of LPCM.
-static const avsCommon::utils::AudioFormat::Encoding SENSORY_COMPATIBLE_ENCODING =
-    avsCommon::utils::AudioFormat::Encoding::LPCM;
-
-/// The Sensory compatible endianness which is little endian.
-static const avsCommon::utils::AudioFormat::Endianness SENSORY_COMPATIBLE_ENDIANNESS =
-    avsCommon::utils::AudioFormat::Endianness::LITTLE;
-
-/**
- * Checks to see if an @c avsCommon::utils::AudioFormat is compatible with Sensory.
- *
- * @param audioFormat The audio format to check.
- * @return @c true if the audio format is compatible with Sensory and @c false otherwise.
- */
-static bool isAudioFormatCompatibleWithSensory(avsCommon::utils::AudioFormat audioFormat) {
-    if (SENSORY_COMPATIBLE_ENCODING != audioFormat.encoding) {
-        ACSDK_ERROR(LX("isAudioFormatCompatibleWithSensoryFailed")
-                        .d("reason", "incompatibleEncoding")
-                        .d("sensoryEncoding", SENSORY_COMPATIBLE_ENCODING)
-                        .d("encoding", audioFormat.encoding));
-        return false;
-    }
-    if (SENSORY_COMPATIBLE_ENDIANNESS != audioFormat.endianness) {
-        ACSDK_ERROR(LX("isAudioFormatCompatibleWithSensoryFailed")
-                        .d("reason", "incompatibleEndianess")
-                        .d("sensoryEndianness", SENSORY_COMPATIBLE_ENDIANNESS)
-                        .d("endianness", audioFormat.endianness));
-        return false;
-    }
-    if (SENSORY_COMPATIBLE_SAMPLE_RATE != audioFormat.sampleRateHz) {
-        ACSDK_ERROR(LX("isAudioFormatCompatibleWithSensoryFailed")
-                        .d("reason", "incompatibleSampleRate")
-                        .d("sensorySampleRate", SENSORY_COMPATIBLE_SAMPLE_RATE)
-                        .d("sampleRate", audioFormat.sampleRateHz));
-        return false;
-    }
-    if (SENSORY_COMPATIBLE_SAMPLE_SIZE_IN_BITS != audioFormat.sampleSizeInBits) {
-        ACSDK_ERROR(LX("isAudioFormatCompatibleWithSensoryFailed")
-                        .d("reason", "incompatibleSampleSizeInBits")
-                        .d("sensorySampleSizeInBits", SENSORY_COMPATIBLE_SAMPLE_SIZE_IN_BITS)
-                        .d("sampleSizeInBits", audioFormat.sampleSizeInBits));
-        return false;
-    }
-    if (SENSORY_COMPATIBLE_NUM_CHANNELS != audioFormat.numChannels) {
-        ACSDK_ERROR(LX("isAudioFormatCompatibleWithSensoryFailed")
-                        .d("reason", "incompatibleNumChannels")
-                        .d("sensoryNumChannels", SENSORY_COMPATIBLE_NUM_CHANNELS)
-                        .d("numChannels", audioFormat.numChannels));
-        return false;
-    }
-    return true;
-}
-
-/**
- * Returns information about the ongoing sensory session. Primarily used to populate error messages.
- *
- * @param session The Sensory session handle.
- * @param result The Sensory return code.
- *
- * @return The pertinent message about the sensory session in string format.
- */
-static std::string getSensoryDetails(SnsrSession session, SnsrRC result) {
-    std::string message;
-    // It is recommended by Sensory to prefer snsrErrorDetail() over snsrRCMessage() as it provides more details.
-    if (session) {
-        message = snsrErrorDetail(session);
-    } else {
-        message = snsrRCMessage(result);
-    }
-    if (message.empty()) {
-        message = "Unrecognized error";
-    }
-    return message;
-}
-
-SnsrRC SensoryKeywordDetector::keyWordDetectedCallback(SnsrSession s, const char* key, void* userData) {
-    SensoryKeywordDetector* engine = static_cast<SensoryKeywordDetector*>(userData);
-    SnsrRC result;
-    const char* keyword;
-    double begin;
-    double end;
-    result = snsrGetDouble(s, SNSR_RES_BEGIN_SAMPLE, &begin);
-    if (result != SNSR_RC_OK) {
-        ACSDK_ERROR(LX("keyWordDetectedCallbackFailed")
-                        .d("reason", "invalidBeginIndex")
-                        .d("error", getSensoryDetails(s, result)));
-        return result;
-    }
-
-    result = snsrGetDouble(s, SNSR_RES_END_SAMPLE, &end);
-    if (result != SNSR_RC_OK) {
-        ACSDK_ERROR(LX("keyWordDetectedCallbackFailed")
-                        .d("reason", "invalidEndIndex")
-                        .d("error", getSensoryDetails(s, result)));
-        return result;
-    }
-
-    result = snsrGetString(s, SNSR_RES_TEXT, &keyword);
-    if (result != SNSR_RC_OK) {
-        ACSDK_ERROR(LX("keyWordDetectedCallbackFailed")
-                        .d("reason", "keywordRetrievalFailure")
-                        .d("error", getSensoryDetails(s, result)));
-        return result;
-    }
-
-    engine->notifyKeyWordObservers(
-        engine->m_stream,
-        keyword,
-        engine->m_beginIndexOfStreamReader + begin,
-        engine->m_beginIndexOfStreamReader + end);
-    return SNSR_RC_OK;
-}
-
-// Deprecated create method.
-std::unique_ptr<SensoryKeywordDetector> SensoryKeywordDetector::create(
-    std::shared_ptr<avsCommon::avs::AudioInputStream> stream,
-    avsCommon::utils::AudioFormat audioFormat,
-    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::KeyWordObserverInterface>> keyWordObservers,
-    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::KeyWordDetectorStateObserverInterface>>
-        keyWordDetectorStateObservers,
-    const std::string& modelFilePath,
-    std::chrono::milliseconds msToPushPerIteration) {
-    // Create Notifiers to be used instead of the observers.
-    auto keywordNotifier = acsdkKWDImplementations::KWDNotifierFactories::createKeywordNotifier();
-    for (auto kwObserver : keyWordObservers) {
-        keywordNotifier->addObserver(kwObserver);
-    }
-
-    auto keywordDetectorStateNotifier =
-        acsdkKWDImplementations::KWDNotifierFactories::createKeywordDetectorStateNotifier();
-    for (auto kwdStateObserver : keyWordDetectorStateObservers) {
-        keywordDetectorStateNotifier->addObserver(kwdStateObserver);
-    }
-
-    return create(
-        stream,
-        std::make_shared<avsCommon::utils::AudioFormat>(audioFormat),
-        keywordNotifier,
-        keywordDetectorStateNotifier,
-        modelFilePath,
-        msToPushPerIteration);
-}
-
-std::unique_ptr<SensoryKeywordDetector> SensoryKeywordDetector::create(
-    std::shared_ptr<avsCommon::avs::AudioInputStream> stream,
-    const std::shared_ptr<avsCommon::utils::AudioFormat>& audioFormat,
-    const std::shared_ptr<acsdkKWDInterfaces::KeywordNotifierInterface> keywordNotifier,
-    const std::shared_ptr<acsdkKWDInterfaces::KeywordDetectorStateNotifierInterface> keywordDetectorStateNotifier,
-    const std::string& modelFilePath,
-    std::chrono::milliseconds msToPushPerIteration) {
-    if (!stream) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "nullStream"));
-        return nullptr;
-    }
-
-    // TODO: ACSDK-249 - Investigate cpu usage of converting bytes between endianness and if it's not too much, do it.
-    if (isByteswappingRequired(*audioFormat)) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "endianMismatch"));
-        return nullptr;
-    }
-
-    if (!isAudioFormatCompatibleWithSensory(*audioFormat)) {
-        return nullptr;
-    }
-
-    std::unique_ptr<SensoryKeywordDetector> detector(new SensoryKeywordDetector(
-        stream, keywordNotifier, keywordDetectorStateNotifier, *audioFormat, msToPushPerIteration));
-    if (!detector->init(modelFilePath)) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "initDetectorFailed"));
-        return nullptr;
-    }
-
-    return detector;
-}
-
-SensoryKeywordDetector::~SensoryKeywordDetector() {
-    m_isShuttingDown = true;
-    if (m_detectionThread.joinable()) {
-        m_detectionThread.join();
-    }
-    snsrRelease(m_session);
-}
-
-SensoryKeywordDetector::SensoryKeywordDetector(
-    std::shared_ptr<AudioInputStream> stream,
-    std::shared_ptr<acsdkKWDInterfaces::KeywordNotifierInterface> keywordNotifier,
-    std::shared_ptr<acsdkKWDInterfaces::KeywordDetectorStateNotifierInterface> keywordDetectorStateNotifier,
-    avsCommon::utils::AudioFormat audioFormat,
-    std::chrono::milliseconds msToPushPerIteration) :
-        acsdkKWDImplementations::AbstractKeywordDetector(keywordNotifier, keywordDetectorStateNotifier),
-        m_stream{stream},
-        m_session{nullptr},
-        m_maxSamplesPerPush((audioFormat.sampleRateHz / HERTZ_PER_KILOHERTZ) * msToPushPerIteration.count()) {
-}
-
-bool SensoryKeywordDetector::init(const std::string& modelFilePath) {
-    m_streamReader = m_stream->createReader(AudioInputStream::Reader::Policy::BLOCKING);
-    if (!m_streamReader) {
-        ACSDK_ERROR(LX("initFailed").d("reason", "createStreamReaderFailed"));
-        return false;
-    }
-
-    // Allocate the Sensory library handle
-    SnsrRC result = snsrNew(&m_session);
-    if (result != SNSR_RC_OK) {
-        ACSDK_ERROR(LX("initFailed")
-                        .d("reason", "allocatingNewSessionFailed")
-                        .d("error", getSensoryDetails(m_session, result)));
-        return false;
-    }
-
-    // Get the expiration date of the library
-    const char* info = nullptr;
-    result = snsrGetString(m_session, SNSR_LICENSE_EXPIRES, &info);
-    if (result == SNSR_RC_OK && info) {
-        // Will print "License expires on <date>"
-        ACSDK_INFO(LX(info));
-    } else {
-        ACSDK_INFO(LX("Sensory library license does not expire."));
-    }
-
-    // Check if the expiration date is near, then we should display a warning
-    result = snsrGetString(m_session, SNSR_LICENSE_WARNING, &info);
-    if (result == SNSR_RC_OK && info) {
-        // Will print "License will expire in <days-until-expiration> days."
-        ACSDK_WARN(LX(info));
-    } else {
-        ACSDK_INFO(LX("Sensory library license does not expire for at least 60 more days."));
-    }
-
-    result = snsrLoad(m_session, snsrStreamFromFileName(modelFilePath.c_str(), "r"));
-    if (result != SNSR_RC_OK) {
-        ACSDK_ERROR(
-            LX("initFailed").d("reason", "loadingSensoryModelFailed").d("error", getSensoryDetails(m_session, result)));
-        return false;
-    }
-
-    result = snsrRequire(m_session, SNSR_TASK_TYPE, SNSR_PHRASESPOT);
-    if (result != SNSR_RC_OK) {
-        ACSDK_ERROR(LX("initFailed")
-                        .d("reason", "invalidTaskType")
-                        .d("expected", "SNSR_PHRASESPOT")
-                        .d("error", getSensoryDetails(m_session, result)));
-        return false;
-    }
-
-    if (!setUpRuntimeSettings(&m_session)) {
-        return false;
-    }
-
-    m_isShuttingDown = false;
-    m_detectionThread = std::thread(&SensoryKeywordDetector::detectionLoop, this);
-    return true;
-}
-
-bool SensoryKeywordDetector::setUpRuntimeSettings(SnsrSession* session) {
-    if (!session) {
-        ACSDK_ERROR(LX("setUpRuntimeSettingsFailed").d("reason", "nullSession"));
-        return false;
-    }
-
-    // Setting the callback handler
-    SnsrRC result = snsrSetHandler(
-        *session, SNSR_RESULT_EVENT, snsrCallback(keyWordDetectedCallback, nullptr, reinterpret_cast<void*>(this)));
-
-    if (result != SNSR_RC_OK) {
-        ACSDK_ERROR(LX("setUpRuntimeSettingsFailed")
-                        .d("reason", "setKeywordDetectionHandlerFailure")
-                        .d("error", getSensoryDetails(*session, result)));
-        return false;
-    }
-
-    /*
-     * Turns off automatic pipeline flushing that happens when the end of the input stream is reached. This is an
-     * internal setting recommended by Sensory when audio is presented to Sensory in small chunks.
-     */
-    result = snsrSetInt(*session, SNSR_AUTO_FLUSH, 0);
-    if (result != SNSR_RC_OK) {
-        ACSDK_ERROR(LX("setUpRuntimeSettingsFailed")
-                        .d("reason", "disableAutoPipelineFlushingFailed")
-                        .d("error", getSensoryDetails(*session, result)));
-        return false;
-    }
-
-    return true;
-}
-
-void SensoryKeywordDetector::detectionLoop() {
-    m_beginIndexOfStreamReader = m_streamReader->tell();
-    notifyKeyWordDetectorStateObservers(KeyWordDetectorStateObserverInterface::KeyWordDetectorState::ACTIVE);
-    std::vector<int16_t> audioDataToPush(m_maxSamplesPerPush);
-    SnsrRC result;
-    while (!m_isShuttingDown) {
-        bool didErrorOccur = false;
-        auto wordsRead = readFromStream(
-            m_streamReader,
-            m_stream,
-            audioDataToPush.data(),
-            audioDataToPush.size(),
-            TIMEOUT_FOR_READ_CALLS,
-            &didErrorOccur);
-        if (didErrorOccur) {
-            /*
-             * Note that this does not include the overrun condition, which the base class handles by instructing the
-             * reader to seek to BEFORE_WRITER.
-             */
-            break;
-        } else if (wordsRead == AudioInputStream::Reader::Error::OVERRUN) {
-            /*
-             * Updating reference point of Reader so that new indices that get emitted to keyWordObservers can be
-             * relative to it.
-             */
-            m_beginIndexOfStreamReader = m_streamReader->tell();
-            SnsrSession newSession{nullptr};
-            /*
-             * This duplicated SnsrSession will have all the same configurations as m_session but none of the runtime
-             * settings. Thus, we will need to setup some of the runtime settings again. The reason for creating a new
-             * session is so that on overrun conditions, Sensory can start counting from 0 again.
-             */
-            result = snsrDup(m_session, &newSession);
-            if (result != SNSR_RC_OK) {
-                ACSDK_ERROR(LX("detectionLoopFailed")
-                                .d("reason", "sessionDuplicationFailed")
-                                .d("error", getSensoryDetails(newSession, result)));
-                break;
-            }
-
-            if (!setUpRuntimeSettings(&newSession)) {
-                break;
-            }
-
-            m_session = newSession;
-        } else if (wordsRead > 0) {
-            // Words were successfully read.
-            snsrSetStream(
-                m_session,
-                SNSR_SOURCE_AUDIO_PCM,
-                snsrStreamFromMemory(
-                    audioDataToPush.data(), wordsRead * sizeof(*audioDataToPush.data()), SNSR_ST_MODE_READ));
-            result = snsrRun(m_session);
-            switch (result) {
-                case SNSR_RC_STREAM_END:
-                    // Reached end of buffer without any keyword detections
-                    break;
-                case SNSR_RC_OK:
-                    break;
-                default:
-                    // A different return from the callback function that indicates some sort of error
-                    ACSDK_ERROR(LX("detectionLoopFailed")
-                                    .d("reason", "unexpectedReturn")
-                                    .d("error", getSensoryDetails(m_session, result)));
-
-                    notifyKeyWordDetectorStateObservers(
-                        KeyWordDetectorStateObserverInterface::KeyWordDetectorState::ERROR);
-                    didErrorOccur = true;
-                    break;
-            }
-            if (didErrorOccur) {
-                break;
-            }
-        }
-        // Reset return code for next round
-        snsrClearRC(m_session);
-    }
-    m_streamReader->close();
-}
-
-}  // namespace kwd
-}  // namespace alexaClientSDK
diff --git a/applications/acsdkSensoryAdapter/test/CMakeLists.txt b/applications/acsdkSensoryAdapter/test/CMakeLists.txt
deleted file mode 100644
index 73f8bceb97..0000000000
--- a/applications/acsdkSensoryAdapter/test/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-set(INCLUDES "${SENSORY_SOURCE_DIR}/include" "${KWD_SOURCE_DIR}/include" "${SENSORY_KEY_WORD_DETECTOR_INCLUDE_DIR}")
-
-set(INPUTFOLDER "${acsdkKWDImplementations_SOURCE_DIR}/inputs")
-
-discover_unit_tests("${INCLUDES}" SENSORY "${INPUTFOLDER}")
diff --git a/applications/acsdkSensoryAdapter/test/SensoryKeywordDetectorTest.cpp b/applications/acsdkSensoryAdapter/test/SensoryKeywordDetectorTest.cpp
deleted file mode 100644
index 97e9c9ab79..0000000000
--- a/applications/acsdkSensoryAdapter/test/SensoryKeywordDetectorTest.cpp
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/// @file SensoryKeyWordDetectorTest.cpp
-
-#include <chrono>
-#include <fstream>
-#include <iostream>
-#include <memory>
-#include <string>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include <acsdkKWDImplementations/KWDNotifierFactories.h>
-#include <AVSCommon/SDKInterfaces/KeyWordObserverInterface.h>
-#include <AVSCommon/SDKInterfaces/KeyWordDetectorStateObserverInterface.h>
-#include <AVSCommon/AVS/AudioInputStream.h>
-#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <AVSCommon/Utils/SDS/SharedDataStream.h>
-
-#include "Sensory/SensoryKeywordDetector.h"
-
-namespace alexaClientSDK {
-namespace kwd {
-namespace test {
-
-using namespace avsCommon;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils;
-using namespace avsCommon::utils::configuration;
-
-/// The path to the inputs folder that should be passed in via command line argument.
-std::string inputsDirPath;
-
-/// The name of the Alexa model file for Sensory.
-static const std::string MODEL_FILE = "/SensoryModels/spot-alexa-rpi-31000.snsr";
-
-/// The keyword that Sensory emits for the above model file
-static const std::string KEYWORD = "alexa";
-
-/// The name of a test audio file.
-static const std::string FOUR_ALEXAS_AUDIO_FILE = "/four_alexa.wav";
-
-/// The name of a test audio file.
-static const std::string ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE = "/alexa_stop_alexa_joke.wav";
-
-/// The number of samples per millisecond, assuming a sample rate of 16 kHz.
-static const int SAMPLES_PER_MS = 16;
-
-/// The margin in milliseconds for testing indices of keyword detections.
-static const std::chrono::milliseconds MARGIN = std::chrono::milliseconds(250);
-
-/// The margin in samples for testing indices of keyword detections.
-static const AudioInputStream::Index MARGIN_IN_SAMPLES = MARGIN.count() * SAMPLES_PER_MS;
-
-/// The number of "Alexa" keywords in the four_alexa.wav file.
-static const size_t NUM_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE = 4;
-
-/// The approximate begin indices of the four "Alexa" keywords in the four_alexa.wav file.
-std::vector<AudioInputStream::Index> BEGIN_INDICES_OF_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE = {7520, 39680, 58880, 77120};
-
-/// The approximate end indices of the four "Alexa" hotwords in the four_alexa.wav file.
-std::vector<AudioInputStream::Index> END_INDICES_OF_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE = {21440, 52800, 72480, 91552};
-
-/// The number of "Alexa" keywords in the alexa_stop_alexa_joke.wav file.
-static const size_t NUM_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE = 2;
-
-/// The approximate begin indices of the two "Alexa" keywords in the alexa_stop_alexa_joke.wav file.
-std::vector<AudioInputStream::Index> BEGIN_INDICES_OF_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE = {8000, 38240};
-
-/// The approximate end indices of the two "Alexa" keywords in the alexa_stop_alexa_joke.wav file.
-std::vector<AudioInputStream::Index> END_INDICES_OF_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE = {20960, 51312};
-
-/// The compatible encoding for Sensory.
-static const avsCommon::utils::AudioFormat::Encoding COMPATIBLE_ENCODING =
-    avsCommon::utils::AudioFormat::Encoding::LPCM;
-
-/// The compatible endianness for Sensory.
-static const avsCommon::utils::AudioFormat::Endianness COMPATIBLE_ENDIANNESS =
-    avsCommon::utils::AudioFormat::Endianness::LITTLE;
-
-/// The compatible sample rate for Sensory.
-static const unsigned int COMPATIBLE_SAMPLE_RATE = 16000;
-
-/// The compatible bits per sample for Sensory.
-static const unsigned int COMPATIBLE_SAMPLE_SIZE_IN_BITS = 16;
-
-/// The compatible number of channels for Sensory.
-static const unsigned int COMPATIBLE_NUM_CHANNELS = 1;
-
-/// Timeout for expected callbacks.
-static const auto DEFAULT_TIMEOUT = std::chrono::milliseconds(4000);
-
-/// A test observer that mocks out the KeyWordObserverInterface##onKeyWordDetected() call.
-class testKeyWordObserver : public KeyWordObserverInterface {
-public:
-    /// A struct used for bookkeeping of keyword detections.
-    struct detectionResult {
-        AudioInputStream::Index beginIndex;
-        AudioInputStream::Index endIndex;
-        std::string keyword;
-    };
-
-    /// Implementation of the KeyWordObserverInterface##onKeyWordDetected() call.
-    void onKeyWordDetected(
-        std::shared_ptr<AudioInputStream> stream,
-        std::string keyword,
-        AudioInputStream::Index beginIndex,
-        AudioInputStream::Index endIndex,
-        std::shared_ptr<const std::vector<char>> KWDMetadata) {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        m_detectionResults.push_back({beginIndex, endIndex, keyword});
-        m_detectionOccurred.notify_one();
-    };
-
-    /**
-     * Waits for the KeyWordObserverInterface##onKeyWordDetected() call N times.
-     *
-     * @param numDetectionsExpected The number of detections expected.
-     * @param timeout The amount of time to wait for the calls.
-     * @return The detection results that actually occurred.
-     */
-    std::vector<detectionResult> waitForNDetections(
-        unsigned int numDetectionsExpected,
-        std::chrono::milliseconds timeout) {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        m_detectionOccurred.wait_for(lock, timeout, [this, numDetectionsExpected]() {
-            return m_detectionResults.size() == numDetectionsExpected;
-        });
-        return m_detectionResults;
-    }
-
-private:
-    /// The detection results that have occurred.
-    std::vector<detectionResult> m_detectionResults;
-
-    /// A lock to guard against new detections.
-    std::mutex m_mutex;
-
-    /// A condition variable to wait for detection calls.
-    std::condition_variable m_detectionOccurred;
-};
-
-/// A test observer that mocks out the KeyWordDetectorStateObserverInterface##onStateChanged() call.
-class testStateObserver : public KeyWordDetectorStateObserverInterface {
-public:
-    /**
-     * Constructor.
-     */
-    testStateObserver() :
-            m_state(KeyWordDetectorStateObserverInterface::KeyWordDetectorState::STREAM_CLOSED),
-            m_stateChangeOccurred{false} {
-    }
-
-    /// Implementation of the KeyWordDetectorStateObserverInterface##onStateChanged() call.
-    void onStateChanged(KeyWordDetectorStateObserverInterface::KeyWordDetectorState keyWordDetectorState) {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        m_state = keyWordDetectorState;
-        m_stateChangeOccurred = true;
-        m_stateChanged.notify_one();
-    }
-
-    /**
-     * Waits for the KeyWordDetectorStateObserverInterface##onStateChanged() call.
-     *
-     * @param timeout The amount of time to wait for the call.
-     * @param stateChanged An output parameter that notifies the caller whether a call occurred.
-     * @return Returns the state of the observer.
-     */
-    KeyWordDetectorStateObserverInterface::KeyWordDetectorState waitForStateChange(
-        std::chrono::milliseconds timeout,
-        bool* stateChanged) {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        bool success = m_stateChanged.wait_for(lock, timeout, [this]() { return m_stateChangeOccurred; });
-
-        if (!success) {
-            *stateChanged = false;
-        } else {
-            m_stateChangeOccurred = false;
-            *stateChanged = true;
-        }
-        return m_state;
-    }
-
-private:
-    /// The state of the observer.
-    KeyWordDetectorStateObserverInterface::KeyWordDetectorState m_state;
-
-    /// A boolean flag so that we can re-use the observer even after a callback has occurred.
-    bool m_stateChangeOccurred;
-
-    /// A lock to guard against state changes.
-    std::mutex m_mutex;
-
-    /// A condition variable to wait for state changes.
-    std::condition_variable m_stateChanged;
-};
-
-class SensoryKeywordTest : public ::testing::Test {
-protected:
-    /**
-     * Reads audio from a WAV file and write into audio input stream.
-     *
-     * @param fileName The path of the file to read from.
-     * @return True if successfully read and written into stream.
-     */
-    bool readAudioFromFileIntoStream(const std::string& fileName) {
-        const int RIFF_HEADER_SIZE = 44;
-
-        std::ifstream inputFile(fileName.c_str(), std::ifstream::binary);
-        if (!inputFile.good()) {
-            std::cout << "Couldn't open audio file!" << std::endl;
-            return false;
-        }
-        inputFile.seekg(0, std::ios::end);
-        int fileLengthInBytes = inputFile.tellg();
-        if (fileLengthInBytes <= RIFF_HEADER_SIZE) {
-            std::cout << "File should be larger than 44 bytes, which is the size of the RIFF header" << std::endl;
-            return false;
-        }
-
-        inputFile.seekg(RIFF_HEADER_SIZE, std::ios::beg);
-
-        int numSamples = (fileLengthInBytes - RIFF_HEADER_SIZE) / 2;
-
-        std::vector<int16_t> audioData(numSamples, 0);
-
-        inputFile.read((char*)&audioData[0], numSamples * 2);
-
-        if (inputFile.gcount() != numSamples * 2) {
-            std::cout << "Error reading audio file" << std::endl;
-            return false;
-        }
-
-        inputFile.close();
-
-        auto bytesWritten = m_writer->write(audioData.data(), audioData.size());
-        if (bytesWritten <= 0) {
-            std::cout << "Unable to write audio data" << std::endl;
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Checks to see that the expected keyword detection results are present.
-     *
-     * @param results A vector of @c detectionResult.
-     * @param expectedBeginIndex The expected begin index of the keyword.
-     * @param expectedEndIndex The expected end index of the keyword.
-     * @param expectedKeyword The expected keyword.
-     * @return @c true if the result is present within the margin and @c false otherwise.
-     */
-    bool isResultPresent(
-        std::vector<testKeyWordObserver::detectionResult>& results,
-        AudioInputStream::Index expectedBeginIndex,
-        AudioInputStream::Index expectedEndIndex,
-        const std::string& expectedKeyword) {
-        AudioInputStream::Index highBoundOfBeginIndex = expectedBeginIndex + MARGIN_IN_SAMPLES;
-        AudioInputStream::Index lowBoundOfBeginIndex = expectedBeginIndex - MARGIN_IN_SAMPLES;
-        AudioInputStream::Index highBoundOfEndIndex = expectedEndIndex + MARGIN_IN_SAMPLES;
-        AudioInputStream::Index lowBoundOfEndIndex = expectedEndIndex - MARGIN_IN_SAMPLES;
-        for (auto result : results) {
-            if (result.endIndex <= highBoundOfEndIndex && result.endIndex >= lowBoundOfEndIndex &&
-                result.beginIndex <= highBoundOfBeginIndex && result.beginIndex >= lowBoundOfBeginIndex &&
-                expectedKeyword == result.keyword) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    std::shared_ptr<acsdkKWDInterfaces::KeywordNotifierInterface> m_keywordNotifier;
-
-    std::shared_ptr<acsdkKWDInterfaces::KeywordDetectorStateNotifierInterface> m_keywordDetectorStateNotifier;
-
-    std::shared_ptr<testKeyWordObserver> m_keyWordObserver1;
-
-    std::shared_ptr<testKeyWordObserver> m_keyWordObserver2;
-
-    std::shared_ptr<testStateObserver> m_stateObserver;
-
-    std::shared_ptr<AudioFormat> m_compatibleAudioFormat;
-
-    std::shared_ptr<avsCommon::avs::AudioInputStream::Buffer> m_buffer;
-
-    std::shared_ptr<avsCommon::avs::AudioInputStream> m_sds;
-
-    std::unique_ptr<AudioInputStream::Writer> m_writer;
-
-    std::unique_ptr<SensoryKeywordDetector> m_detector;
-
-    // Create initial detector and writers and assert that they are created successfully.
-    virtual void SetUp() {
-        m_keywordNotifier = acsdkKWDImplementations::KWDNotifierFactories::createKeywordNotifier();
-        m_keywordDetectorStateNotifier =
-            acsdkKWDImplementations::KWDNotifierFactories::createKeywordDetectorStateNotifier();
-
-        m_keyWordObserver1 = std::make_shared<testKeyWordObserver>();
-        m_keyWordObserver2 = std::make_shared<testKeyWordObserver>();
-        m_stateObserver = std::make_shared<testStateObserver>();
-
-        m_compatibleAudioFormat = std::make_shared<AudioFormat>();
-        m_compatibleAudioFormat->sampleRateHz = COMPATIBLE_SAMPLE_RATE;
-        m_compatibleAudioFormat->sampleSizeInBits = COMPATIBLE_SAMPLE_SIZE_IN_BITS;
-        m_compatibleAudioFormat->numChannels = COMPATIBLE_NUM_CHANNELS;
-        m_compatibleAudioFormat->endianness = COMPATIBLE_ENDIANNESS;
-        m_compatibleAudioFormat->encoding = COMPATIBLE_ENCODING;
-
-        m_buffer = std::make_shared<avsCommon::avs::AudioInputStream::Buffer>(500000);
-        m_sds = avsCommon::avs::AudioInputStream::create(m_buffer, 2, 1);
-        ASSERT_TRUE(m_sds);
-        m_writer = m_sds->createWriter(avsCommon::avs::AudioInputStream::Writer::Policy::NONBLOCKABLE);
-        ASSERT_TRUE(m_writer);
-
-        std::ifstream filePresent((inputsDirPath + MODEL_FILE).c_str());
-        ASSERT_TRUE(filePresent.good()) << "Unable to find " + inputsDirPath + MODEL_FILE
-                                        << ". Please place model file within this location.";
-
-        m_detector = SensoryKeywordDetector::create(
-            m_sds,
-            m_compatibleAudioFormat,
-            m_keywordNotifier,
-            m_keywordDetectorStateNotifier,
-            inputsDirPath + MODEL_FILE);
-        ASSERT_TRUE(m_detector);
-        m_detector->addKeyWordObserver(m_keyWordObserver1);
-        m_detector->addKeyWordDetectorStateObserver(m_stateObserver);
-    }
-};
-
-/// Test that we create a valid detector using deprecated Create method
-TEST_F(SensoryKeywordTest, test_createDetectorDeprecated) {
-    auto buffer = std::make_shared<avsCommon::avs::AudioInputStream::Buffer>(500000);
-    auto sds = avsCommon::avs::AudioInputStream::create(buffer, 2, 1);
-    auto detector = SensoryKeywordDetector::create(
-        std::move(sds), *m_compatibleAudioFormat, {m_keyWordObserver1}, {m_stateObserver}, inputsDirPath + MODEL_FILE);
-    ASSERT_NE(detector, nullptr);
-}
-
-/// Tests that we don't get back a valid detector if an invalid stream is passed in.
-TEST_F(SensoryKeywordTest, test_invalidStream) {
-    auto detector = SensoryKeywordDetector::create(
-        nullptr,
-        m_compatibleAudioFormat,
-        m_keywordNotifier,
-        m_keywordDetectorStateNotifier,
-        inputsDirPath + MODEL_FILE);
-    ASSERT_EQ(detector, nullptr);
-}
-
-/// Tests that we don't get back a valid detector if an invalid endianness is passed in.
-TEST_F(SensoryKeywordTest, test_incompatibleEndianness) {
-    m_compatibleAudioFormat->endianness = AudioFormat::Endianness::BIG;
-
-    auto detector = SensoryKeywordDetector::create(
-        m_sds, m_compatibleAudioFormat, m_keywordNotifier, m_keywordDetectorStateNotifier, inputsDirPath + MODEL_FILE);
-    ASSERT_EQ(detector, nullptr);
-}
-
-/// Tests that we get back the expected number of keywords for the four_alexa.wav file for one keyword observer.
-TEST_F(SensoryKeywordTest, test_getExpectedNumberOfDetectionsInFourAlexasAudioFileForOneObserver) {
-    std::string audioFilePath = inputsDirPath + FOUR_ALEXAS_AUDIO_FILE;
-    ASSERT_TRUE(readAudioFromFileIntoStream(audioFilePath));
-
-    std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-    auto detections =
-        m_keyWordObserver1->waitForNDetections(END_INDICES_OF_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE.size(), DEFAULT_TIMEOUT);
-    ASSERT_EQ(detections.size(), NUM_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE);
-
-    for (unsigned int i = 0; i < END_INDICES_OF_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE.size(); ++i) {
-        ASSERT_TRUE(isResultPresent(
-            detections,
-            BEGIN_INDICES_OF_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE.at(i),
-            END_INDICES_OF_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE.at(i),
-            KEYWORD));
-    }
-}
-
-/// Tests that we get back the expected number of keywords for the four_alexa.wav file for two keyword observers.
-TEST_F(SensoryKeywordTest, test_getExpectedNumberOfDetectionsInFourAlexasAudioFileForTwoObservers) {
-    std::string audioFilePath = inputsDirPath + FOUR_ALEXAS_AUDIO_FILE;
-    ASSERT_TRUE(readAudioFromFileIntoStream(audioFilePath));
-
-    m_detector->addKeyWordObserver(m_keyWordObserver2);
-
-    auto detections = m_keyWordObserver1->waitForNDetections(NUM_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE, DEFAULT_TIMEOUT);
-    ASSERT_EQ(detections.size(), NUM_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE);
-
-    for (unsigned int i = 0; i < END_INDICES_OF_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE.size(); ++i) {
-        ASSERT_TRUE(isResultPresent(
-            detections,
-            BEGIN_INDICES_OF_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE.at(i),
-            END_INDICES_OF_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE.at(i),
-            KEYWORD));
-    }
-
-    detections = m_keyWordObserver2->waitForNDetections(NUM_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE, DEFAULT_TIMEOUT);
-    ASSERT_EQ(detections.size(), NUM_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE);
-
-    for (unsigned int i = 0; i < END_INDICES_OF_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE.size(); ++i) {
-        ASSERT_TRUE(isResultPresent(
-            detections,
-            BEGIN_INDICES_OF_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE.at(i),
-            END_INDICES_OF_ALEXAS_IN_FOUR_ALEXAS_AUDIO_FILE.at(i),
-            KEYWORD));
-    }
-}
-
-/**
- * Tests that we get back the expected number of keywords for the alexa_stop_alexa_joke.wav file for one keyword
- * observer.
- */
-TEST_F(SensoryKeywordTest, test_getExpectedNumberOfDetectionsInAlexaStopAlexaJokeAudioFileForOneObserver) {
-    std::string audioFilePath = inputsDirPath + ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE;
-    ASSERT_TRUE(readAudioFromFileIntoStream(audioFilePath));
-
-    auto detections =
-        m_keyWordObserver1->waitForNDetections(NUM_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE, DEFAULT_TIMEOUT);
-
-    ASSERT_EQ(detections.size(), NUM_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE);
-
-    for (unsigned int i = 0; i < END_INDICES_OF_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE.size(); ++i) {
-        ASSERT_TRUE(isResultPresent(
-            detections,
-            BEGIN_INDICES_OF_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE.at(i),
-            END_INDICES_OF_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE.at(i),
-            KEYWORD));
-    }
-}
-
-/// Tests that the detector state changes to ACTIVE when the detector is initialized properly.
-TEST_F(SensoryKeywordTest, test_getActiveState) {
-    std::string audioFilePath = inputsDirPath + ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE;
-    ASSERT_TRUE(readAudioFromFileIntoStream(audioFilePath));
-
-    bool stateChanged = false;
-    KeyWordDetectorStateObserverInterface::KeyWordDetectorState stateReceived =
-        m_stateObserver->waitForStateChange(DEFAULT_TIMEOUT, &stateChanged);
-    ASSERT_TRUE(stateChanged);
-    ASSERT_EQ(stateReceived, KeyWordDetectorStateObserverInterface::KeyWordDetectorState::ACTIVE);
-}
-
-/**
- * Tests that the stream is closed and that the detector state changes to STREAM_CLOSED when we close the only writer
- * of the SDS passed in and all keyword detections have occurred.
- */
-TEST_F(SensoryKeywordTest, test_getStreamClosedState) {
-    std::string audioFilePath = inputsDirPath + ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE;
-    ASSERT_TRUE(readAudioFromFileIntoStream(audioFilePath));
-
-    // so that when we close the writer, we know for sure that the reader will be closed.
-    auto detections =
-        m_keyWordObserver1->waitForNDetections(NUM_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE, DEFAULT_TIMEOUT);
-    ASSERT_EQ(detections.size(), NUM_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE);
-
-    bool stateChanged = false;
-    KeyWordDetectorStateObserverInterface::KeyWordDetectorState stateReceived =
-        m_stateObserver->waitForStateChange(DEFAULT_TIMEOUT, &stateChanged);
-    ASSERT_TRUE(stateChanged);
-    ASSERT_EQ(stateReceived, KeyWordDetectorStateObserverInterface::KeyWordDetectorState::ACTIVE);
-
-    m_writer->close();
-    stateChanged = false;
-    stateReceived = m_stateObserver->waitForStateChange(DEFAULT_TIMEOUT, &stateChanged);
-    ASSERT_TRUE(stateChanged);
-    ASSERT_EQ(stateReceived, KeyWordDetectorStateObserverInterface::KeyWordDetectorState::STREAM_CLOSED);
-}
-
-/**
- * Tests that we get back the expected number of keywords for the alexa_stop_alexa_joke.wav file for one keyword
- * observer even when SDS has other data prior to the audio file in it. This tests that the reference point that the
- * Sensory wrapper uses is working as expected.
- */
-TEST_F(SensoryKeywordTest, test_getExpectedNumberOfDetectionsInAlexaStopAlexaJokeAudioFileWithRandomDataAtBeginning) {
-    std::vector<int16_t> randomData(5000, 0);
-    m_writer->write(randomData.data(), randomData.size());
-
-    std::string audioFilePath = inputsDirPath + ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE;
-    ASSERT_TRUE(readAudioFromFileIntoStream(audioFilePath));
-
-    auto detections =
-        m_keyWordObserver1->waitForNDetections(NUM_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE, DEFAULT_TIMEOUT);
-
-    ASSERT_EQ(detections.size(), NUM_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE);
-
-    for (unsigned int i = 0; i < END_INDICES_OF_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE.size(); ++i) {
-        ASSERT_TRUE(isResultPresent(
-            detections,
-            BEGIN_INDICES_OF_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE.at(i) + randomData.size(),
-            END_INDICES_OF_ALEXAS_IN_ALEXA_STOP_ALEXA_JOKE_AUDIO_FILE.at(i) + randomData.size(),
-            KEYWORD));
-    }
-}
-
-}  // namespace test
-}  // namespace kwd
-}  // namespace alexaClientSDK
-
-int main(int argc, char** argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-    if (argc < 2) {
-        std::cerr << "USAGE: " << std::string(argv[0]) << " <path_to_inputs_folder>" << std::endl;
-        return 1;
-    } else {
-        alexaClientSDK::kwd::test::inputsDirPath = std::string(argv[1]);
-        return RUN_ALL_TESTS();
-    }
-}
diff --git a/capabilities/APLCapabilityCommon/.clang-format b/capabilities/APLCapabilityCommon/.clang-format
new file mode 100644
index 0000000000..3d1ec24482
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/.clang-format
@@ -0,0 +1,102 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
+
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommon/CMakeLists.txt b/capabilities/APLCapabilityCommon/APLCapabilityCommon/CMakeLists.txt
new file mode 100644
index 0000000000..c7663c10f5
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommon/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAPLCapabilityCommon LANGUAGES CXX)
+
+add_subdirectory("src")
+add_subdirectory("test")
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommon/include/acsdk/APLCapabilityCommon/APLPayloadParser.h b/capabilities/APLCapabilityCommon/APLCapabilityCommon/include/acsdk/APLCapabilityCommon/APLPayloadParser.h
new file mode 100644
index 0000000000..624f2fc3e3
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommon/include/acsdk/APLCapabilityCommon/APLPayloadParser.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_APLCAPABILITYCOMMON_APLPAYLOADPARSER_H_
+#define ACSDK_APLCAPABILITYCOMMON_APLPAYLOADPARSER_H_
+
+#include <string>
+
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/document.h>
+
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationOptions.h>
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationSession.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLTimeoutType.h>
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommon {
+
+class APLPayloadParser {
+public:
+    /**
+     * Extract the document from APL payload.
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @return string containing the json value of document, empty string will be set if parsing fails
+     */
+    static std::string extractDocument(const rapidjson::Document& jsonPayload);
+
+    /**
+     * Extract the datasourse from APL payload.
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @return string containing the json value of datasource
+     */
+    static std::string extractDatasources(const rapidjson::Document& jsonPayload);
+
+    /**
+     * Extract the supported viewports from APL payload.
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @return string containing the json value of supported viewports.
+     */
+    static std::string extractSupportedViewports(const rapidjson::Document& jsonPayload);
+
+    /**
+     * Extract the timeout type from APL payload.
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @return string containing the lifespan of the APL payload.
+     */
+    static std::string extractAPLTimeoutType(const rapidjson::Document& jsonPayload);
+
+    /**
+     * Extract the presentation session instance from APL payload.
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @return Instance of @c PresentationSession object.
+     */
+    static const alexaClientSDK::aplCapabilityCommonInterfaces::PresentationSession extractPresentationSession(
+        const std::string& skillIdFieldName,
+        const std::string& presentationSkilId,
+        const rapidjson::Document& jsonPayload);
+    /**
+     * This function deserializes a @c Directive's payload into a @c rapidjson::Document.
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @param[out] document The @c rapidjson::Document to parse the payload into.
+     * @return @c true if parsing was successful, else @c false.
+     */
+    static bool parseDirectivePayload(const std::string& jsonPayload, rapidjson::Document* document);
+    /**
+     * Extract the presentation session instance from APL payload.
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @param[out] token string containing the token
+     *
+     */
+    static bool extractPresentationToken(const rapidjson::Document& jsonPayload, std::string& token);
+    /**
+     * Get the target windowId from payload of renderDocument message with APL document
+     *
+     * @param jsonPayload rapidjson DOM instance of payload.
+     * @return The windowId for APL payload, empty string otherwise.
+     */
+    static const std::string extractWindowId(const rapidjson::Document& jsonPayload);
+};
+}  // namespace aplCapabilityCommon
+}  // namespace alexaClientSDK
+#endif  // ACSDK_APLCAPABILITYCOMMON_APLPAYLOADPARSER_H_
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommon/include/acsdk/APLCapabilityCommon/BaseAPLCapabilityAgent.h b/capabilities/APLCapabilityCommon/APLCapabilityCommon/include/acsdk/APLCapabilityCommon/BaseAPLCapabilityAgent.h
new file mode 100644
index 0000000000..9c7ded7a44
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommon/include/acsdk/APLCapabilityCommon/BaseAPLCapabilityAgent.h
@@ -0,0 +1,503 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_APLCAPABILITYCOMMON_BASEAPLCAPABILITYAGENT_H_
+#define ACSDK_APLCAPABILITYCOMMON_BASEAPLCAPABILITYAGENT_H_
+
+#include <chrono>
+#include <map>
+#include <memory>
+#include <queue>
+#include <string>
+#include <unordered_set>
+
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include <AVSCommon/Utils/Timing/Timer.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+#include <AVSCommon/Utils/Metrics/DataPointDurationBuilder.h>
+#include <AVSCommon/Utils/Metrics/DataPointCounterBuilder.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <acsdk/Notifier/Notifier.h>
+
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentNotifierInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentObserverInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationSession.h>
+#include <acsdk/APLCapabilityCommonInterfaces/VisualStateProviderInterface.h>
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommon {
+/**
+ * This base class for an Alexa Presentation Language @c CapabilityAgent that handles rendering APL documents.
+ *
+ * Clients interested in APL events can subscribe themselves as an observer, and the
+ * clients will be notified via the Capability Agent Observer interface.
+ */
+class BaseAPLCapabilityAgent
+        : public alexaClientSDK::avsCommon::avs::CapabilityAgent
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public alexaClientSDK::avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public alexaClientSDK::aplCapabilityCommonInterfaces::APLCapabilityAgentInterface
+        , public alexaClientSDK::notifier::Notifier<aplCapabilityCommonInterfaces::APLCapabilityAgentObserverInterface>
+        , public std::enable_shared_from_this<BaseAPLCapabilityAgent> {
+public:
+    /**
+     * Constructor.
+     *
+     * @param avsNamepace The AVS namespace interface this CA operations within.
+     * @param exceptionSender The object to use for sending AVS Exception messages.
+     * @param metricRecorder The object to use for recording metrics.
+     * @param messageSender The @c MessageSenderInterface that sends events to AVS.
+     * @param contextManager The @c ContextManagerInterface used to generate system context for events.
+     * @param APLMaxVersion The APL version supported.
+     * @param visualStateProvider The @c VisualStateProviderInterface used to request visual context.
+     */
+    BaseAPLCapabilityAgent(
+        const std::string& avsNamespace,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        const std::string& APLMaxVersion,
+        std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::VisualStateProviderInterface>
+            visualStateProvider = nullptr);
+
+    /**
+     * Destructor.
+     */
+    virtual ~BaseAPLCapabilityAgent() = default;
+
+    /// Device SDK Facing Interfaces
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<alexaClientSDK::avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
+    alexaClientSDK::avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>>
+    getCapabilityConfigurations() override;
+    /// @}
+
+    /// @name ContextRequesterInterface Functions
+    /// @{
+    void onContextAvailable(const std::string& jsonContext) override;
+    void onContextFailure(const alexaClientSDK::avsCommon::sdkInterfaces::ContextRequestError error) override;
+    /// @}
+
+    /// @name StateProviderInterface Functions
+    /// @{
+    void provideState(
+        const alexaClientSDK::avsCommon::avs::NamespaceAndName& stateProviderName,
+        unsigned int stateRequestToken) override;
+    /// @}
+
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// @name APLCapabilityAgentInterface functions
+    /// @{
+    void onActiveDocumentChanged(
+        const aplCapabilityCommonInterfaces::PresentationToken& token,
+        const alexaClientSDK::aplCapabilityCommonInterfaces::PresentationSession& session) override;
+    void clearExecuteCommands(
+        const aplCapabilityCommonInterfaces::PresentationToken& token = std::string(),
+        const bool markAsFailed = true) override;
+    void sendUserEvent(const aplCapabilityCommonInterfaces::aplEventPayload::UserEvent& eventPayload) override;
+    void sendDataSourceFetchRequestEvent(
+        const aplCapabilityCommonInterfaces::aplEventPayload::DataSourceFetch& fetchPayload) override;
+    void sendRuntimeErrorEvent(const aplCapabilityCommonInterfaces::aplEventPayload::RuntimeError& errors) override;
+    void onVisualContextAvailable(
+        avsCommon::sdkInterfaces::ContextRequestToken requestToken,
+        const aplCapabilityCommonInterfaces::aplEventPayload::VisualContext& context) override;
+    void processRenderDocumentResult(
+        const aplCapabilityCommonInterfaces::PresentationToken& token,
+        const bool result,
+        const std::string& error) override;
+    void processExecuteCommandsResult(
+        const aplCapabilityCommonInterfaces::PresentationToken& token,
+        aplCapabilityCommonInterfaces::APLCommandExecutionEvent event,
+        const std::string& error) override;
+    void recordRenderComplete(const std::chrono::steady_clock::time_point& timestamp) override;
+    void proactiveStateReport() override;
+    /// @}
+
+    /**
+     * Intialize APL CA based on the configurations
+     */
+    virtual bool initialize();
+
+    /// Tests Facing interfaces
+    /**
+     * Set the executor used as the worker thread
+     * @param executor The @c Executor to set
+     * @note This function should only be used for testing purposes. No call to any other method should
+     * be done prior to this call.
+     */
+    void setExecutor(const std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor>& executor);
+
+    /// Concrete Implementation Facing Interfaces
+protected:
+    /// Directive Types that could be received from AVS
+    enum class DirectiveType {
+        /// Directive contains an APL document to be rendered
+        RENDER_DOCUMENT,
+
+        /// Directive indicates that a previously received document should be now displayed
+        SHOW_DOCUMENT,
+
+        /// Directive contains one or multiple APL commands to be executed
+        EXECUTE_COMMAND,
+
+        /// Directive indicates that token should be updated
+        DYNAMIC_TOKEN_DATA_SOURCE_UPDATE,
+
+        /// Directive indicates that index should be updated
+        DYNAMIC_INDEX_DATA_SOURCE_UPDATE,
+
+        /// Unknown directive received
+        UNKNOWN
+    };
+
+    /// Enumeration of timer metrics events that could be emitted
+    enum class MetricEvent {
+        /// Metric to record time-taken to render document
+        RENDER_DOCUMENT
+    };
+
+    /// Enumeration of timer metric activity names that could be emitted
+    enum class MetricActivity {
+        /// When render document has completed successfully
+        ACTIVITY_RENDER_DOCUMENT,
+
+        /// When render document fails
+        ACTIVITY_RENDER_DOCUMENT_FAIL,
+    };
+
+    /**
+     * PresentationSession field names in RenderDocumentDirective
+     */
+    struct PresentationSessionFieldNames {
+        /// SkillId field name
+        std::string skillId;
+        /// Presentation session id field name
+        std::string presentationSessionId;
+    };
+
+    /// Template Methods to be implemented in Concrete Implementations
+    /**
+     * Get specific directive handler configuration for this APL Capability Agent
+     */
+    virtual alexaClientSDK::avsCommon::avs::DirectiveHandlerConfiguration getAPLDirectiveConfiguration() const = 0;
+
+    /**
+     * Get specific capability configuration for this APL Capability Agent
+     */
+    virtual std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>>
+    getAPLCapabilityConfigurations(const std::string& APLMaxVersion) = 0;
+
+    /**
+     * Get @c DirectiveType from Directive header information
+     */
+    virtual DirectiveType getDirectiveType(std::shared_ptr<DirectiveInfo> info) = 0;
+
+    /**
+     * Get root key for the configuration values in the AVS json configuration
+     */
+    virtual const std::string& getConfigurationRootKey() = 0;
+
+    /**
+     * Given a Metric Event, provide the metric data point name to publish.
+     */
+    virtual const std::string& getMetricDataPointName(MetricEvent event) = 0;
+
+    /**
+     * Given a Metric Activity, provide the metric data point name to publish.
+     */
+    virtual const std::string& getMetricActivityName(MetricActivity activity) = 0;
+
+    /**
+     * In presentation session part of RenderDocument directives, there are some field names that
+     * differ slightly between CAs, the derived class may override this function to provide the field names that
+     * represent these fields in the directive.
+     */
+    virtual PresentationSessionFieldNames getPresentationSessionFieldNames() = 0;
+
+    /**
+     * Whether AVS events should include presentationSession in their payload.
+     */
+    virtual const bool shouldPackPresentationSessionToAvsEvents() = 0;
+
+    /**
+     * This function handles any unknown directives received.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void handleUnknownDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Send the handling completed notification and clean up the resources.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void setHandlingCompleted(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Get the executor used as the worker thread
+     * @return The @c Executor shared_ptr
+     */
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> getExecutor();
+
+private:
+    /**
+     * Remove a directive from the map of message IDs to DirectiveInfo instances.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
+     */
+    void removeDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * This function handles a @c RenderDocument directive.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void handleRenderDocumentDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * This function handles a @c ShowDocument directive.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void handleShowDocumentDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * This function handles a @c ExecuteCommand directive.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void handleExecuteCommandDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * This function handles a @c Dynamic source data related directives.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param sourceType Dynamic source type.
+     */
+    void handleDynamicListDataDirective(std::shared_ptr<DirectiveInfo> info, const std::string& sourceType);
+
+    /**
+     * This function handles the notification of the ExecuteCommands callbacks to all the observers.  This function
+     * is intended to be used in the context of @c m_executor worker thread.
+     *
+     * @param info The directive to be handled.
+     */
+    void executeExecuteCommand(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * This function handles the notification of the DataSourceUpdate callbacks to all the observers.  This
+     * function is intended to be used in the context of @c m_executor worker thread.
+     *
+     * @param info The directive to be handled.
+     * @param sourceType Data source type.
+     */
+    void executeDataSourceUpdate(std::shared_ptr<DirectiveInfo> info, const std::string& sourceType);
+
+    /**
+     * * This function handles the notification of the RenderDocument callbacks to all the observers.  This function
+     * is intended to be used in the context of @c m_executor worker thread.
+     *
+     * @param info The directive to be handled.
+     */
+    void executeRenderDocument(
+        const std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> info);
+
+    /**
+     *
+     * Stops the execution of all pending @c ExecuteCommand directive
+     * @param reason reason for clearing commands
+     * @param token The token. This should be passed in if we are clearing execute commands due to APL-specific trigger
+     * (eg. Finish command). This should be left empty if we are clearing due to global triggers (eg. back navigation)
+     * @param markAsFailed Whether to mark the cleared commands as failed.
+     */
+    void executeClearExecuteCommands(
+        const std::string& reason,
+        const aplCapabilityCommonInterfaces::PresentationToken& token = std::string(),
+        const bool markAsFailed = true);
+
+    /**
+     * Queue an AVS event to be sent when context is available
+     * @param avsNamespace namespace of the event
+     * @param name name of the event
+     * @param payload payload of the event
+     */
+    void executeSendEvent(const std::string& avsNamespace, const std::string& name, const std::string& payload);
+
+    /**
+     * Internal function for handling @c ContextManager request for context
+     * @param stateRequestToken The request token.
+     */
+    void executeProvideState(unsigned int stateRequestToken);
+
+    /**
+     * Checks if a proactive state report is required and requests state if necessary
+     */
+    void executeProactiveStateReport();
+
+    /**
+     * Extracts and process visual context received from clients. The funciton
+     * constructs the RenderDocumentState payload and is intended to be used
+     * in the context of @c m_executor worker thread.
+     *
+     * @param token presentationToken of document
+     * @param requestToken token correlating context to provideState request
+     * @param context The visual state to be passed to AVS.
+     */
+    void executeOnVisualContextAvailable(
+        const avsCommon::sdkInterfaces::ContextRequestToken requestToken,
+        const aplCapabilityCommonInterfaces::aplEventPayload::VisualContext& context);
+
+    /**
+     * Adds presentationSession payload to provided document.
+     * @param document the document to add the payload to.
+     */
+    void addPresentationSessionPayload(rapidjson::Document* document);
+
+    /**
+     * Returns string payload of presentationSession object.
+     * @return the presentationSession object payload.
+     */
+    std::string getPresentationSessionPayload();
+
+    /**
+     * @name Executor Thread Variables
+     *
+     * These member variables are only accessed by functions in the @c m_executor worker thread, and do not require any
+     * synchronization.
+     */
+    /// @{
+    /// The directive corresponding to the RenderDocument directive.
+    std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> m_lastDisplayedDirective;
+
+    /// The last executeCommand directive.
+    std::pair<std::string, std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo>>
+        m_lastExecuteCommandTokenAndDirective;
+    /// @}
+
+    /// The object to use for sending events.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> m_messageSender;
+
+    /// Token of the last template if it was an APL one. Otherwise, empty
+    aplCapabilityCommonInterfaces::PresentationToken m_lastRenderedAPLToken;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The @c VisualStateProvider for requesting visual state.
+    std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::VisualStateProviderInterface> m_visualStateProvider;
+
+    /// The queue of events to be sent to AVS.
+    std::queue<std::tuple<std::string, std::string, std::string>> m_events;
+
+    /// The APL version of the runtime.
+    const std::string m_APLVersion;
+
+    /**
+     * Start recording or update @c metricsEvent
+     *
+     * @param Metrics event in context
+     */
+    void startMetricsEvent(MetricEvent metricEvent);
+
+    /**
+     * Stops recording and submit @c metricsEvent
+     *
+     * @param metricsEvent Metrics event in context
+     * @param activity Metrics activity to be concluded
+     * @param timestamp Timestamp when metric event ends
+     */
+    void endMetricsEvent(
+        MetricEvent metricEvent,
+        MetricActivity activity,
+        const std::chrono::steady_clock::time_point& timestamp);
+
+    /**
+     * Reset @c metricsEvent
+     *
+     * @param metricsEvent Metrics event in context
+     */
+    void resetMetricsEvent(MetricEvent metricEvent);
+
+    /// The @c MetricRecorder used to record useful metrics from the presentation layer.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> m_metricRecorder;
+
+    /// The mutex to ensure exclusivity over @c MetricRecorder
+    std::mutex m_MetricsRecorderMutex;
+
+    /// Stores the currently active time data points
+    std::map<MetricEvent, std::chrono::steady_clock::time_point> m_currentActiveTimePoints;
+
+    /// The last state which was reported to AVS
+    std::string m_lastReportedState;
+
+    /// The time of the last state report
+    std::chrono::time_point<std::chrono::steady_clock> m_lastReportTime;
+
+    /// The minimum state reporting interval
+    std::chrono::milliseconds m_minStateReportInterval{};
+
+    /// The state reporting check interval
+    std::chrono::milliseconds m_stateReportCheckInterval{};
+
+    /// Whether the state has been requested from the state provider and we are awaiting the response
+    bool m_stateReportPending;
+
+    /// An internal timer used to check for context changes
+    alexaClientSDK::avsCommon::utils::timing::Timer m_proactiveStateTimer;
+
+    /// Whether the current document is fully rendered
+    bool m_documentRendered;
+
+    /// The current @c PresentationSession as set by the latest @c RenderDocument directive.
+    alexaClientSDK::aplCapabilityCommonInterfaces::PresentationSession m_presentationSession;
+
+    /// Time at which the current document was received
+    std::chrono::steady_clock::time_point m_renderReceivedTime;
+
+    /// The AVS Namespace that directives/events/context will be published on
+    const std::string m_avsNamespace;
+
+    /// The Namespace/Name combo for RenderedDocumentState device context.  Stored for convenience.
+    const alexaClientSDK::avsCommon::avs::NamespaceAndName m_visualContextHeader;
+
+    /// This is the worker thread for the APL CA
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> m_executor;
+};
+
+}  // namespace aplCapabilityCommon
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMON_BASEAPLCAPABILITYAGENT_H_
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommon/src/APLPayloadParser.cpp b/capabilities/APLCapabilityCommon/APLCapabilityCommon/src/APLPayloadParser.cpp
new file mode 100644
index 0000000000..faea49bd57
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommon/src/APLPayloadParser.cpp
@@ -0,0 +1,216 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <rapidjson/writer.h>
+#include <rapidjson/error/en.h>
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include "AVSCommon/Utils/Optional.h"
+
+#include "acsdk/APLCapabilityCommon/APLPayloadParser.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommon {
+using namespace alexaClientSDK::avsCommon::utils::json;
+/// String to identify log entries originating from this file.
+#define TAG "APLPayloadParser"
+
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Identifier for the document sent in an APL directive
+static const std::string DOCUMENT_FIELD = "document";
+
+/// Identifier for the datasources sent in an APL directive
+static const std::string DATASOURCES_FIELD = "datasources";
+
+/// Identifier for the supportedViewports array sent in an APL directive
+static const std::string SUPPORTED_VIEWPORTS_FIELD = "supportedViewports";
+
+/// Empty JSON for unparsed values
+static const std::string EMPTY_JSON = "{}";
+
+/// Identifier for the presentationSession sent in a RenderDocument directive
+static const std::string PRESENTATION_SESSION_FIELD{"presentationSession"};
+
+/// Identifier for the skilld in presentationSession
+static const std::string SKILL_ID{"skillId"};
+
+/// Identifier for the id in presentationSession
+static const std::string PRESENTATION_SESSION_ID{"id"};
+
+/// Identifier for the grantedExtensions in presentationSession
+static const std::string PRESENTATION_SESSION_GRANTEDEXTENSIONS{"grantedExtensions"};
+
+/// Identifier for the autoInitializedExtensions in presentationSession
+static const std::string PRESENTATION_SESSION_AUTOINITIALIZEDEXTENSIONS{"autoInitializedExtensions"};
+
+//// Identifier for the uri in grantedExtensions or autoInitializedExtensions
+static const std::string PRESENTATION_SESSION_URI{"uri"};
+
+/// Identifier for the settings in autoInitializedExtensions
+static const std::string PRESENTATION_SESSION_SETTINGS{"settings"};
+
+/// Identifier for the timeoutType sent in a RenderDocument directive
+static const std::string TIMEOUTTYPE_FIELD = "timeoutType";
+
+/// Identifier for the presentationToken's sent in a RenderDocument directive
+static const std::string PRESENTATION_TOKEN = "presentationToken";
+
+/// Identifier for the windowId's sent in a RenderDocument directive
+static const std::string WINDOW_ID = "windowId";
+
+std::string APLPayloadParser::extractDocument(const rapidjson::Document& document) {
+    std::string aplDocument;
+    if (!jsonUtils::retrieveValue(document, DOCUMENT_FIELD, &aplDocument)) {
+        aplDocument = "";
+    }
+
+    return aplDocument;
+}
+
+std::string APLPayloadParser::extractDatasources(const rapidjson::Document& document) {
+    std::string aplData;
+    if (!jsonUtils::retrieveValue(document, DATASOURCES_FIELD, &aplData)) {
+        aplData = EMPTY_JSON;
+    }
+
+    return aplData;
+}
+
+std::string APLPayloadParser::extractSupportedViewports(const rapidjson::Document& document) {
+    std::string supportedViewports;
+    rapidjson::Value::ConstMemberIterator jsonIt;
+    if (!jsonUtils::findNode(document, SUPPORTED_VIEWPORTS_FIELD, &jsonIt)) {
+        supportedViewports = EMPTY_JSON;
+    } else {
+        rapidjson::StringBuffer sb;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(sb);
+        jsonIt->value.Accept(writer);
+        supportedViewports = sb.GetString();
+    }
+
+    return supportedViewports;
+}
+
+std::string APLPayloadParser::extractAPLTimeoutType(const rapidjson::Document& document) {
+    std::string timeoutTypeStr;
+    if (!jsonUtils::retrieveValue(document, TIMEOUTTYPE_FIELD, &timeoutTypeStr)) {
+        ACSDK_WARN(LX("extractTimeoutTypeFailed").d("reason", "Missing timeoutType field"));
+        return "";
+    }
+    return timeoutTypeStr;
+}
+
+const alexaClientSDK::aplCapabilityCommonInterfaces::PresentationSession APLPayloadParser::extractPresentationSession(
+    const std::string& skillIdFieldName,
+    const std::string& presentationSkilId,
+    const rapidjson::Document& document) {
+    rapidjson::Value::ConstMemberIterator iterator;
+    std::string presentationSessionPayload;
+    if (!jsonUtils::findNode(document, PRESENTATION_SESSION_FIELD, &iterator) ||
+        !jsonUtils::convertToValue(iterator->value, &presentationSessionPayload)) {
+        ACSDK_WARN(
+            LX("extractPresentationSessionFailed").d("reason", "Unable to retrieve presentationSession payload"));
+        return {};
+    }
+
+    std::string skillId;
+    if (!jsonUtils::retrieveValue(presentationSessionPayload, skillIdFieldName, &skillId)) {
+        ACSDK_WARN(LX(__func__).m("Failed to find presentationSession skillId"));
+    }
+
+    std::string id;
+    if (!jsonUtils::retrieveValue(presentationSessionPayload, presentationSkilId, &id)) {
+        ACSDK_WARN(LX(__func__).m("Failed to find presentationSession id"));
+    }
+
+    rapidjson::Document doc;
+    doc.Parse(presentationSessionPayload);
+    std::vector<alexaClientSDK::aplCapabilityCommonInterfaces::GrantedExtension> grantedExtensions;
+    if (doc.HasMember(PRESENTATION_SESSION_GRANTEDEXTENSIONS) &&
+        doc[PRESENTATION_SESSION_GRANTEDEXTENSIONS].IsArray()) {
+        auto grantExtensionArray = doc[PRESENTATION_SESSION_GRANTEDEXTENSIONS].GetArray();
+        for (auto& itr : grantExtensionArray) {
+            alexaClientSDK::aplCapabilityCommonInterfaces::GrantedExtension grantedExtension;
+            if (itr.HasMember(PRESENTATION_SESSION_URI) && itr[PRESENTATION_SESSION_URI].IsString()) {
+                grantedExtension.uri = itr[PRESENTATION_SESSION_URI].GetString();
+                grantedExtensions.push_back(grantedExtension);
+            } else {
+                ACSDK_WARN(LX(__func__).m("Error parsing grantedExtensions"));
+            }
+        }
+    } else {
+        ACSDK_WARN(LX(__func__).m("Failed to find presentationSession grantedExtensions"));
+    }
+
+    std::vector<alexaClientSDK::aplCapabilityCommonInterfaces::AutoInitializedExtension> autoInitializedExtensions;
+    if (doc.HasMember(PRESENTATION_SESSION_AUTOINITIALIZEDEXTENSIONS) &&
+        doc[PRESENTATION_SESSION_AUTOINITIALIZEDEXTENSIONS].IsArray()) {
+        auto autoInitializedExtensionArray = doc[PRESENTATION_SESSION_AUTOINITIALIZEDEXTENSIONS].GetArray();
+        for (auto& itr : autoInitializedExtensionArray) {
+            alexaClientSDK::aplCapabilityCommonInterfaces::AutoInitializedExtension autoInitializedExtension;
+            if (itr.HasMember(PRESENTATION_SESSION_URI) && itr[PRESENTATION_SESSION_URI].IsString() &&
+                itr.HasMember(PRESENTATION_SESSION_SETTINGS) && itr[PRESENTATION_SESSION_SETTINGS].IsString()) {
+                autoInitializedExtension.uri = itr[PRESENTATION_SESSION_URI].GetString();
+                autoInitializedExtension.settings = itr[PRESENTATION_SESSION_SETTINGS].GetString();
+                autoInitializedExtensions.push_back(autoInitializedExtension);
+            } else {
+                ACSDK_WARN(LX(__func__).m("Error parsing autoInitializedExtensions"));
+            }
+        }
+    } else {
+        ACSDK_WARN(LX(__func__).m("Failed to find presentationSession autoInitializedExtensions"));
+    }
+
+    alexaClientSDK::aplCapabilityCommonInterfaces::PresentationSession presentationSession = {
+        skillId, id, grantedExtensions, autoInitializedExtensions};
+
+    return presentationSession;
+}
+
+bool APLPayloadParser::parseDirectivePayload(const std::string& jsonPayload, rapidjson::Document* document) {
+    rapidjson::ParseResult result = document->Parse(jsonPayload);
+    if (result) {
+        return true;
+    }
+    ACSDK_ERROR(LX("parseDirectivePayloadFailed")
+                    .d("reason", rapidjson::GetParseError_En(result.Code()))
+                    .d("offset", result.Offset()));
+    return false;
+}
+
+bool APLPayloadParser::extractPresentationToken(const rapidjson::Document& jsonPayload, std::string& token) {
+    if (!jsonUtils::retrieveValue(jsonPayload, PRESENTATION_TOKEN, &token)) {
+        ACSDK_WARN(LX(__func__).m("Failed to find presentation token"));
+        token = "";
+        return false;
+    }
+    return true;
+}
+
+const std::string APLPayloadParser::extractWindowId(const rapidjson::Document& jsonPayload) {
+    std::string targetWindowId;
+    if (!jsonUtils::retrieveValue(jsonPayload, WINDOW_ID, &targetWindowId)) {
+        ACSDK_ERROR(LX("getTargetWindowIdFailed").d("reason", "Couldn't find windowId in the document"));
+        return "";
+    }
+    ACSDK_DEBUG5(LX(__func__).d("Target Window Id", targetWindowId));
+
+    return targetWindowId;
+}
+
+}  // namespace aplCapabilityCommon
+}  // namespace alexaClientSDK
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommon/src/BaseAPLCapabilityAgent.cpp b/capabilities/APLCapabilityCommon/APLCapabilityCommon/src/BaseAPLCapabilityAgent.cpp
new file mode 100644
index 0000000000..56d8781e82
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommon/src/BaseAPLCapabilityAgent.cpp
@@ -0,0 +1,1104 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <chrono>
+#include <ostream>
+#include <tuple>
+
+#include <rapidjson/document.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
+
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/AVS/EventBuilder.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Metrics/MetricEventBuilder.h>
+#include <AVSCommon/Utils/Metrics/DataPointStringBuilder.h>
+#include <AVSCommon/Utils/Metrics/DataPointDurationBuilder.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLTimeoutType.h>
+
+#include "acsdk/APLCapabilityCommon/APLPayloadParser.h"
+#include "acsdk/APLCapabilityCommon/BaseAPLCapabilityAgent.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommon {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::configuration;
+using namespace avsCommon::utils::json;
+using namespace avsCommon::utils::timing;
+
+/// String to identify log entries originating from this file.
+#define TAG "BaseAPLCapabilityAgent"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Identifier for the grantedExtensions in presentationSession
+static const char PRESENTATION_SESSION_GRANTEDEXTENSIONS[] = "grantedExtensions";
+
+/// Identifier for the autoInitializedExtensions in presentationSession
+static const char PRESENTATION_SESSION_AUTOINITIALIZEDEXTENSIONS[] = "autoInitializedExtensions";
+
+//// Identifier for the uri in grantedExtensions or autoInitializedExtensions
+static const char PRESENTATION_SESSION_URI[] = "uri";
+
+/// Identifier for the settings in autoInitializedExtensions
+static const char PRESENTATION_SESSION_SETTINGS[] = "settings";
+
+/// The key in our config file to set the minimum time in ms between reporting proactive state report events
+static const char MIN_STATE_REPORT_INTERVAL_KEY[] = "minStateReportIntervalMs";
+
+/// The key in our config file to set the time in ms between proactive state report checks - 0 disables the feature
+static const char STATE_REPORT_CHECK_INTERVAL_KEY[] = "stateReportCheckIntervalMs";
+
+/// StaticRequestToken value for providing Change Report state
+static const auto PROACTIVE_STATE_REQUEST_TOKEN = 0;
+
+/// The name for UserEvent event.
+static const char USER_EVENT[] = "UserEvent";
+
+/// The name for LoadIndexListData event.
+static const char LOAD_INDEX_LIST_DATA[] = "LoadIndexListData";
+
+/// The name for LoadTokenListData event.
+static const char LOAD_TOKEN_LIST_DATA[] = "LoadTokenListData";
+
+/// The name for RuntimeError event.
+static const char RUNTIME_ERROR[] = "RuntimeError";
+
+/// Identifier for the presentationToken's sent in a RenderDocument directive
+static const char PRESENTATION_TOKEN[] = "presentationToken";
+
+/// Identifier for the presentationSession sent in a RenderDocument directive
+static const char PRESENTATION_SESSION_FIELD[] = "presentationSession";
+
+/// Identifier for the commands sent in a RenderDocument directive
+static const char COMMANDS_FIELD[] = "commands";
+
+/// Tag for finding the visual context information sent from the runtime as part of event context.
+static const char VISUAL_CONTEXT_NAME[] = "RenderedDocumentState";
+
+/// Dynamic index list data source type
+static const char DYNAMIC_INDEX_LIST[] = "dynamicIndexList";
+
+/// Dynamic token list data source type
+static const char DYNAMIC_TOKEN_LIST[] = "dynamicTokenList";
+
+/// Default minimum interval between state reports
+static std::chrono::milliseconds DEFAULT_MIN_STATE_REPORT_INTERVAL_MS = std::chrono::milliseconds(600);
+
+/// Default interval between proactive state report checks - disabled by default
+static std::chrono::milliseconds DEFAULT_STATE_REPORT_CHECK_INTERVAL_MS = std::chrono::milliseconds(0);
+
+/// The keys used in @c RenderedDocumentState payload
+static const char TOKEN_KEY[] = "token";
+static const char VERSION_KEY[] = "version";
+static const char VISUAL_CONTEXT_KEY[] = "componentsVisibleOnScreen";
+static const char DATASOURCE_CONTEXT_KEY[] = "dataSources";
+
+/// The keys used in @c UserEvent payload
+static const char ARGUMENTS_KEY[] = "arguments";
+static const char SOURCE_KEY[] = "source";
+static const char COMPONENTS_KEY[] = "components";
+
+/// Initializes the object by reading the values from configuration.
+bool BaseAPLCapabilityAgent::initialize() {
+    auto configurationRoot = ConfigurationNode::getRoot()[getConfigurationRootKey()];
+
+    configurationRoot.getDuration<std::chrono::milliseconds>(
+        MIN_STATE_REPORT_INTERVAL_KEY, &m_minStateReportInterval, DEFAULT_MIN_STATE_REPORT_INTERVAL_MS);
+
+    configurationRoot.getDuration<std::chrono::milliseconds>(
+        STATE_REPORT_CHECK_INTERVAL_KEY, &m_stateReportCheckInterval, DEFAULT_STATE_REPORT_CHECK_INTERVAL_MS);
+
+    if (m_visualStateProvider) {
+        ACSDK_DEBUG3(LX(__func__).d("visualStateProvider", "On"));
+        m_contextManager->setStateProvider(m_visualContextHeader, shared_from_this());
+    }
+
+    if (m_stateReportCheckInterval.count() == 0) {
+        ACSDK_DEBUG0(LX(__func__).m("Proactive state report timer disabled"));
+    } else {
+        if (m_stateReportCheckInterval < m_minStateReportInterval) {
+            ACSDK_WARN(
+                LX(__func__).m("State check interval cannot be less than minimum reporting interval, setting check "
+                               "interval to minimum report interval"));
+            m_stateReportCheckInterval = m_minStateReportInterval;
+        }
+
+        ACSDK_DEBUG0(LX(__func__)
+                         .d("minStateReportIntervalMs", m_minStateReportInterval.count())
+                         .d("stateReportCheckIntervalMs", m_stateReportCheckInterval.count()));
+
+        m_proactiveStateTimer.start(
+            m_stateReportCheckInterval,
+            Timer::PeriodType::ABSOLUTE,
+            Timer::FOREVER,
+            std::bind(&BaseAPLCapabilityAgent::proactiveStateReport, this));
+    }
+
+    return true;
+}
+
+void BaseAPLCapabilityAgent::setExecutor(
+    const std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor>& executor) {
+    ACSDK_WARN(LX(__func__).d("reason", "should be called in test only"));
+    m_executor = executor;
+}
+
+std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> BaseAPLCapabilityAgent::getExecutor() {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_executor;
+}
+
+void BaseAPLCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG5(LX(__func__));
+    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+}
+
+void BaseAPLCapabilityAgent::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("preHandleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+}
+
+void BaseAPLCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInfo> info) {
+    // Must remain on the very fist line for accurate telemetry
+    m_renderReceivedTime = std::chrono::steady_clock::now();
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        handleUnknownDirective(info);
+        return;
+    }
+
+    switch (getDirectiveType(info)) {
+        case DirectiveType::RENDER_DOCUMENT:
+            handleRenderDocumentDirective(info);
+            break;
+        case DirectiveType::SHOW_DOCUMENT:
+            handleShowDocumentDirective(info);
+            setHandlingCompleted(info);
+            break;
+        case DirectiveType::EXECUTE_COMMAND:
+            handleExecuteCommandDirective(info);
+            break;
+        case DirectiveType::DYNAMIC_INDEX_DATA_SOURCE_UPDATE:
+            handleDynamicListDataDirective(info, DYNAMIC_INDEX_LIST);
+            break;
+        case DirectiveType::DYNAMIC_TOKEN_DATA_SOURCE_UPDATE:
+            handleDynamicListDataDirective(info, DYNAMIC_TOKEN_LIST);
+            break;
+        default:
+            handleUnknownDirective(info);
+            break;
+    }
+}
+
+void BaseAPLCapabilityAgent::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
+    removeDirective(info);
+}
+
+DirectiveHandlerConfiguration BaseAPLCapabilityAgent::getConfiguration() const {
+    return getAPLDirectiveConfiguration();
+}
+
+void BaseAPLCapabilityAgent::clearExecuteCommands(
+    const aplCapabilityCommonInterfaces::PresentationToken& token,
+    const bool markAsFailed) {
+    m_executor->submit(
+        [this, token, markAsFailed]() { executeClearExecuteCommands("User exited", token, markAsFailed); });
+}
+
+void BaseAPLCapabilityAgent::executeClearExecuteCommands(
+    const std::string& reason,
+    const aplCapabilityCommonInterfaces::PresentationToken& token,
+    const bool markAsFailed) {
+    ACSDK_DEBUG5(LX(__func__).d("reason", reason));
+    if (!(m_lastExecuteCommandTokenAndDirective.first.empty()) && m_lastExecuteCommandTokenAndDirective.second &&
+        m_lastExecuteCommandTokenAndDirective.second->result) {
+        if (!token.empty() && m_lastExecuteCommandTokenAndDirective.first != token) {
+            ACSDK_ERROR(LX(__func__).d(
+                "reason", "presentationToken in the last ExecuteCommand does not match with the provided token."));
+            return;
+        }
+        if (markAsFailed) {
+            m_lastExecuteCommandTokenAndDirective.second->result->setFailed(reason);
+        } else {
+            m_lastExecuteCommandTokenAndDirective.second->result->setCompleted();
+        }
+    }
+
+    m_lastExecuteCommandTokenAndDirective.first.clear();
+}
+
+BaseAPLCapabilityAgent::BaseAPLCapabilityAgent(
+    const std::string& avsNamespace,
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    const std::string& APLVersion,
+    std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::VisualStateProviderInterface> visualStateProvider) :
+        CapabilityAgent{avsNamespace, exceptionSender},
+        RequiresShutdown{"BaseAPLCapabilityAgent:" + avsNamespace},
+        m_messageSender{messageSender},
+        m_contextManager{contextManager},
+        m_visualStateProvider{visualStateProvider},
+        m_APLVersion{APLVersion},
+        m_metricRecorder{metricRecorder},
+        m_lastReportTime{std::chrono::steady_clock::now()},
+        m_minStateReportInterval{DEFAULT_MIN_STATE_REPORT_INTERVAL_MS},
+        m_stateReportPending{false},
+        m_documentRendered{false},
+        m_presentationSession{},
+        m_avsNamespace{avsNamespace},
+        m_visualContextHeader{avsNamespace, VISUAL_CONTEXT_NAME} {
+    m_executor = std::make_shared<alexaClientSDK::avsCommon::utils::threading::Executor>();
+}
+
+void BaseAPLCapabilityAgent::sendUserEvent(
+    const aplCapabilityCommonInterfaces::aplEventPayload::UserEvent& eventPayload) {
+    m_executor->submit([this, eventPayload]() {
+        auto token = eventPayload.token;
+        ACSDK_DEBUG5(LX("executeOnSendEvent").d("token", token));
+        rapidjson::Document payload(rapidjson::kObjectType);
+        auto& alloc = payload.GetAllocator();
+
+        payload.AddMember(rapidjson::StringRef(PRESENTATION_TOKEN), rapidjson::Value(token.c_str(), alloc), alloc);
+
+        rapidjson::Document argsDoc(rapidjson::kArrayType, &alloc);
+        if (argsDoc.Parse(eventPayload.arguments).HasParseError()) {
+            ACSDK_ERROR(LX("executeOnSendEventFailed").d("reason", "Failed to parse arguments document"));
+            return;
+        }
+
+        payload.AddMember(ARGUMENTS_KEY, argsDoc.Move(), alloc);
+
+        rapidjson::Document sourceDoc(rapidjson::kObjectType, &alloc);
+        if (sourceDoc.Parse(eventPayload.source).HasParseError()) {
+            ACSDK_ERROR(LX("executeOnSendEventFailed").d("reason", "Failed to parse source document"));
+            return;
+        }
+
+        payload.AddMember(SOURCE_KEY, sourceDoc.Move(), alloc);
+
+        rapidjson::Document componentsDoc(rapidjson::kObjectType, &alloc);
+        if (componentsDoc.Parse(eventPayload.components).HasParseError()) {
+            ACSDK_ERROR(LX("executeOnSendEventFailed")
+                            .d("reason", "Failed to parse components document, ignoring components field"));
+        } else {
+            payload.AddMember(COMPONENTS_KEY, componentsDoc.Move(), alloc);
+        }
+
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        if (!payload.Accept(writer)) {
+            ACSDK_ERROR(LX("executeOnSendEventFailed").d("reason", "Error serializing payload"));
+            return;
+        }
+        executeSendEvent(m_avsNamespace, USER_EVENT, buffer.GetString());
+    });
+}
+
+void BaseAPLCapabilityAgent::sendDataSourceFetchRequestEvent(
+    const aplCapabilityCommonInterfaces::aplEventPayload::DataSourceFetch& payload) {
+    m_executor->submit([this, payload]() {
+        auto token = payload.token;
+        ACSDK_DEBUG5(LX("executeOnsendDataSourceFetchRequestEvent").d("token", token));
+        rapidjson::Document document;
+        if (document.Parse(payload.fetchPayload).HasParseError()) {
+            ACSDK_ERROR(LX("executeOnsendDataSourceFetchRequestEventFailed").m("Failed to parse document"));
+            return;
+        }
+        document.AddMember(
+            rapidjson::StringRef(PRESENTATION_TOKEN),
+            rapidjson::Value(token.c_str(), document.GetAllocator()),
+            document.GetAllocator());
+
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        if (!document.Accept(writer)) {
+            ACSDK_ERROR(LX("executeOnsendDataSourceFetchRequestEventFailed").m("Error serializing payload"));
+            return;
+        }
+        auto str = buffer.GetString();
+
+        if (payload.dataSourceType == DYNAMIC_INDEX_LIST) {
+            executeSendEvent(m_avsNamespace, LOAD_INDEX_LIST_DATA, str);
+        } else if (payload.dataSourceType == DYNAMIC_TOKEN_LIST) {
+            executeSendEvent(m_avsNamespace, LOAD_TOKEN_LIST_DATA, str);
+        } else {
+            ACSDK_WARN(
+                LX("sendDataSourceFetchRequestEventIgnored").d("reason", "Trying to process unknown data source."));
+            return;
+        }
+    });
+}
+
+void BaseAPLCapabilityAgent::sendRuntimeErrorEvent(
+    const aplCapabilityCommonInterfaces::aplEventPayload::RuntimeError& payload) {
+    m_executor->submit([this, payload]() {
+        auto token = payload.token;
+        ACSDK_DEBUG5(LX("executeOnsendRuntimeErrorEvent").d("token", token));
+
+        rapidjson::Document document;
+        if (document.Parse(payload.errors).HasParseError()) {
+            ACSDK_ERROR(LX("executeOnsendRuntimeErrorEventFailed").m("Failed to parse document"));
+            return;
+        }
+        document.AddMember(
+            rapidjson::StringRef(PRESENTATION_TOKEN),
+            rapidjson::Value(token.c_str(), document.GetAllocator()),
+            document.GetAllocator());
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        if (!document.Accept(writer)) {
+            ACSDK_ERROR(LX("executeOnsendRuntimeErrorEventFailed").m("Error serializing payload"));
+            return;
+        }
+        auto str = buffer.GetString();
+        executeSendEvent(m_avsNamespace, RUNTIME_ERROR, str);
+    });
+}
+
+void BaseAPLCapabilityAgent::doShutdown() {
+    m_proactiveStateTimer.stop();
+    m_executor->shutdown();
+
+    executeClearExecuteCommands("BaseAPLCapabilityAgentShuttingDown");
+    if (m_visualStateProvider) {
+        m_contextManager->removeStateProvider(m_visualContextHeader);
+    }
+    m_visualStateProvider.reset();
+    m_messageSender.reset();
+    m_contextManager.reset();
+}
+
+void BaseAPLCapabilityAgent::removeDirective(std::shared_ptr<DirectiveInfo> info) {
+    /*
+     * Check result too, to catch cases where DirectiveInfo was created locally, without a nullptr result.
+     * In those cases there is no messageId to remove because no result was expected.
+     */
+    if (info->directive && info->result) {
+        CapabilityAgent::removeDirective(info->directive->getMessageId());
+    }
+}
+
+void BaseAPLCapabilityAgent::setHandlingCompleted(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (info) {
+        if (info->result) {
+            info->result->setCompleted();
+        } else {
+            sendExceptionEncounteredAndReportFailed(
+                info, "Unable to complete directive", ExceptionErrorType::INTERNAL_ERROR);
+        }
+        removeDirective(info);
+    }
+}
+
+void BaseAPLCapabilityAgent::handleRenderDocumentDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+
+    m_executor->submit([this, info]() {
+        ACSDK_DEBUG9(LX("handleRenderDocumentDirectiveInExecutor").sensitive("payload", info->directive->getPayload()));
+        rapidjson::Document payload;
+        if (!APLPayloadParser::parseDirectivePayload(info->directive->getPayload(), &payload)) {
+            sendExceptionEncounteredAndReportFailed(
+                info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        std::string presentationToken;
+        if (!APLPayloadParser::extractPresentationToken(payload, presentationToken)) {
+            ACSDK_ERROR(LX("handleRenderDocumentDirectiveFailedInExecutor").d("reason", "NoPresentationToken"));
+            sendExceptionEncounteredAndReportFailed(info, "missing presentationToken");
+            return;
+        }
+
+        auto timeoutTypeStr = APLPayloadParser::extractAPLTimeoutType(payload);
+        if (timeoutTypeStr.empty()) {
+            ACSDK_ERROR(LX("handleRenderDocumentDirectiveFailedInExecutor").d("reason", "NoTimeoutTypeField"));
+        } else {
+            // Validate timeoutType
+            auto maybeValidTimeout = aplCapabilityCommonInterfaces::convertToTimeoutType(timeoutTypeStr);
+            if (!maybeValidTimeout.hasValue()) {
+                ACSDK_ERROR(LX("handleRenderDocumentDirectiveFailedInExecutor")
+                                .d("reason", "InvalidTimeoutType")
+                                .d("receivedTimeoutType", timeoutTypeStr));
+                sendExceptionEncounteredAndReportFailed(info, "invalid timeoutType");
+                return;
+            }
+        }
+
+        auto aplDoc = APLPayloadParser::extractDocument(payload);
+        if (aplDoc.empty()) {
+            ACSDK_ERROR(LX("handleRenderDocumentDirectiveFailedInExecutor").d("reason", "NoDocument"));
+            sendExceptionEncounteredAndReportFailed(info, "missing APLdocument");
+            return;
+        }
+
+        executeRenderDocument(info);
+    });
+}
+
+void BaseAPLCapabilityAgent::handleShowDocumentDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, info]() {
+        rapidjson::Document payload;
+        if (!APLPayloadParser::parseDirectivePayload(info->directive->getPayload(), &payload)) {
+            sendExceptionEncounteredAndReportFailed(
+                info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+        auto presentationFieldNames = getPresentationSessionFieldNames();
+        auto presentationSession = APLPayloadParser::extractPresentationSession(
+            presentationFieldNames.skillId, presentationFieldNames.presentationSessionId, payload);
+        if (m_presentationSession.skillId != presentationSession.skillId ||
+            m_presentationSession.id != presentationSession.id) {
+            ACSDK_ERROR(LX("handleShowDocumentDirectiveFailedInExecutor").d("reason", "NoMatchingPresentationSession"));
+            sendExceptionEncounteredAndReportFailed(info, "no matching presentation session");
+        }
+        notifyObservers(
+            [this](std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentObserverInterface> observer) {
+                observer->onShowDocument(m_lastRenderedAPLToken);
+            });
+    });
+}
+
+void BaseAPLCapabilityAgent::handleExecuteCommandDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, info]() {
+        ACSDK_DEBUG5(LX("handleExecuteCommandDirectiveInExecutor"));
+        rapidjson::Document payload;
+        if (!APLPayloadParser::parseDirectivePayload(info->directive->getPayload(), &payload)) {
+            sendExceptionEncounteredAndReportFailed(
+                info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        std::string presentationToken;
+        if (!APLPayloadParser::extractPresentationToken(payload, presentationToken)) {
+            ACSDK_ERROR(LX("handleExecuteCommandDirectiveFailedInExecutor").d("reason", "NoPresentationToken"));
+            sendExceptionEncounteredAndReportFailed(info, "missing presentationToken");
+            return;
+        }
+
+        if (!jsonUtils::jsonArrayExists(payload, COMMANDS_FIELD)) {
+            ACSDK_ERROR(LX("handleExecuteCommandDirectiveFailedInExecutor")
+                            .d("reason", "No command array in the ExecuteCommand directive."));
+            sendExceptionEncounteredAndReportFailed(info, "missing commands");
+            return;
+        }
+
+        if (presentationToken != m_lastRenderedAPLToken) {
+            sendExceptionEncounteredAndReportFailed(
+                info, "token mismatch between ExecuteCommand and last rendering directive.");
+            ACSDK_ERROR(
+                LX("handleExecuteCommandDirectiveFailedInExecutor")
+                    .d("reason",
+                       "presentationToken in executeCommand does not match the one from last displayed directive."));
+            return;
+        }
+
+        m_lastExecuteCommandTokenAndDirective = std::make_pair(presentationToken, info);
+        executeExecuteCommand(info);
+    });
+}
+
+void BaseAPLCapabilityAgent::handleDynamicListDataDirective(
+    std::shared_ptr<DirectiveInfo> info,
+    const std::string& sourceType) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, info, sourceType]() {
+        ACSDK_DEBUG9(
+            LX("handleDynamicListDataDirectiveInExecutor").sensitive("payload", info->directive->getPayload()));
+        rapidjson::Document payload;
+        if (!APLPayloadParser::parseDirectivePayload(info->directive->getPayload(), &payload)) {
+            sendExceptionEncounteredAndReportFailed(
+                info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+        std::string presentationToken;
+        if (!APLPayloadParser::extractPresentationToken(payload, presentationToken)) {
+            ACSDK_ERROR(LX("handleDynamicListDataDirectiveFailedInExecutor").d("reason", "NoPresentationToken"));
+            sendExceptionEncounteredAndReportFailed(info, "missing presentationToken");
+            return;
+        }
+
+        if (presentationToken != m_lastRenderedAPLToken) {
+            sendExceptionEncounteredAndReportFailed(
+                info, "token mismatch between DynamicListData and last rendering directive.");
+            ACSDK_ERROR(
+                LX("handleDynamicListDataDirectiveFailedInExecutor")
+                    .d("reason",
+                       "presentationToken in DynamicListData does not match the one from last displayed directive."));
+            return;
+        }
+
+        // Core will do checks for us for content of it, so just pass through.
+        executeDataSourceUpdate(info, sourceType);
+    });
+}
+
+void BaseAPLCapabilityAgent::handleUnknownDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info) {
+        ACSDK_ERROR(LX("handleUnknownDirective").m("nullDirectiveInfo"));
+        sendExceptionEncounteredAndReportFailed(
+            info, "nullDirectiveInfo", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+        return;
+    }
+    ACSDK_ERROR(LX("requestedToHandleUnknownDirective")
+                    .d("reason", "unknownDirective")
+                    .d("namespace", info->directive->getNamespace())
+                    .d("name", info->directive->getName()));
+    m_executor->submit([this, info] {
+        const std::string exceptionMessage =
+            "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
+
+        sendExceptionEncounteredAndReportFailed(
+            info, exceptionMessage, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+    });
+}
+
+void BaseAPLCapabilityAgent::executeDataSourceUpdate(
+    std::shared_ptr<DirectiveInfo> info,
+    const std::string& sourceType) {
+    ACSDK_DEBUG5(LX(__func__));
+    rapidjson::Document payload;
+    if (!APLPayloadParser::parseDirectivePayload(info->directive->getPayload(), &payload)) {
+        sendExceptionEncounteredAndReportFailed(
+            info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+        return;
+    }
+    std::string presentationToken;
+    if (!APLPayloadParser::extractPresentationToken(payload, presentationToken)) {
+        ACSDK_ERROR(LX("executeDataSourceUpdateFailed").d("reason", "NoPresentationToken"));
+        sendExceptionEncounteredAndReportFailed(info, "missing presentationToken");
+        return;
+    }
+    notifyObservers([sourceType, info, presentationToken](
+                        std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentObserverInterface> observer) {
+        observer->onDataSourceUpdate(sourceType, info->directive->getPayload(), presentationToken);
+    });
+
+    setHandlingCompleted(info);
+}
+
+void BaseAPLCapabilityAgent::executeRenderDocument(
+    const std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> info) {
+    m_lastDisplayedDirective = info;
+
+    if (getDirectiveType(m_lastDisplayedDirective) == DirectiveType::RENDER_DOCUMENT) {
+        m_documentRendered = false;
+        startMetricsEvent(MetricEvent::RENDER_DOCUMENT);
+        rapidjson::Document doc;
+        if (!APLPayloadParser::parseDirectivePayload(info->directive->getPayload(), &doc)) {
+            ACSDK_WARN(LX("executeRenderDocument").m("Error parsing document"));
+            sendExceptionEncounteredAndReportFailed(
+                info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            recordRenderComplete(std::chrono::steady_clock::now());
+            return;
+        }
+        std::string newToken;
+        APLPayloadParser::extractPresentationToken(doc, newToken);
+        auto windowId = APLPayloadParser::extractWindowId(doc);
+        ACSDK_DEBUG3(
+            LX(__func__).d("previousToken", m_lastRenderedAPLToken).d("newToken", newToken).d("windowId", windowId));
+        auto document = APLPayloadParser::extractDocument(doc);
+        auto datasources = APLPayloadParser::extractDatasources(doc);
+        auto supportedViewports = APLPayloadParser::extractSupportedViewports(doc);
+        auto timeoutType =
+            aplCapabilityCommonInterfaces::convertToTimeoutType(APLPayloadParser::extractAPLTimeoutType(doc));
+        if (!timeoutType.hasValue()) {
+            ACSDK_WARN(LX("extractTimeoutTypeFailed").d("reason", "Invalid timeoutType field, using SHORT lifespan"));
+        }
+        auto presentationFieldNames = getPresentationSessionFieldNames();
+        auto presentationSession = APLPayloadParser::extractPresentationSession(
+            presentationFieldNames.skillId, presentationFieldNames.presentationSessionId, doc);
+        notifyObservers(
+            [this, document, datasources, newToken, windowId, timeoutType, supportedViewports, presentationSession](
+                std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentObserverInterface> observer) {
+                observer->onRenderDocument(
+                    document,
+                    datasources,
+                    newToken,
+                    windowId,
+                    timeoutType.valueOr(alexaClientSDK::aplCapabilityCommonInterfaces::APLTimeoutType::SHORT),
+                    m_avsNamespace,
+                    supportedViewports,
+                    presentationSession,
+                    m_renderReceivedTime,
+                    shared_from_this());
+            });
+        m_renderReceivedTime = {};
+        m_lastRenderedAPLToken = newToken;
+    } else {
+        sendExceptionEncounteredAndReportFailed(m_lastDisplayedDirective, "unknown directive type");
+    }
+}
+
+void BaseAPLCapabilityAgent::executeExecuteCommand(
+    const std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+
+    rapidjson::Document payload;
+    if (!APLPayloadParser::parseDirectivePayload(info->directive->getPayload(), &payload)) {
+        sendExceptionEncounteredAndReportFailed(
+            info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+        return;
+    }
+    std::string presentationToken;
+    if (!APLPayloadParser::extractPresentationToken(payload, presentationToken)) {
+        ACSDK_ERROR(LX("executeExecuteCommandFailed").d("reason", "NoPresentationToken"));
+        sendExceptionEncounteredAndReportFailed(info, "missing presentationToken");
+        return;
+    }
+    notifyObservers([presentationToken, info](
+                        std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentObserverInterface> observer) {
+        observer->onExecuteCommands(info->directive->getPayload(), presentationToken);
+    });
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> BaseAPLCapabilityAgent::
+    getCapabilityConfigurations() {
+    return getAPLCapabilityConfigurations(m_APLVersion);
+}
+
+void BaseAPLCapabilityAgent::executeSendEvent(
+    const std::string& avsNamespace,
+    const std::string& name,
+    const std::string& payload) {
+    std::string payload_copy;
+    if (shouldPackPresentationSessionToAvsEvents()) {
+        rapidjson::Document doc;
+        doc.Parse(payload);
+
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        addPresentationSessionPayload(&doc);
+        doc.Accept(writer);
+        payload_copy = buffer.GetString();
+    } else {
+        payload_copy = payload;
+    }
+    m_events.push(std::make_tuple(avsNamespace, name, payload_copy));
+    m_contextManager->getContext(shared_from_this());
+}
+
+void BaseAPLCapabilityAgent::onContextAvailable(const std::string& jsonContext) {
+    auto task = [this, jsonContext]() {
+        ACSDK_DEBUG9(LX("onContextAvailableExecutor"));
+
+        if (!m_events.empty()) {
+            auto event = m_events.front();
+
+            auto msgIdAndJsonEvent = avsCommon::avs::buildJsonEventString(
+                std::get<0>(event), std::get<1>(event), "", std::get<2>(event), jsonContext);
+            auto userEventMessage = std::make_shared<avsCommon::avs::MessageRequest>(msgIdAndJsonEvent.second);
+            ACSDK_DEBUG9(LX("Sending event to AVS").d("namespace", std::get<0>(event)).d("name", std::get<1>(event)));
+            m_messageSender->sendMessage(userEventMessage);
+
+            m_events.pop();
+        }
+    };
+
+    m_executor->submit(task);
+}
+
+void BaseAPLCapabilityAgent::onContextFailure(const ContextRequestError error) {
+    ACSDK_ERROR(LX(__func__).d("reason", "contextRequestErrorOccurred").d("error", error));
+}
+
+void BaseAPLCapabilityAgent::provideState(
+    const avsCommon::avs::NamespaceAndName& stateProviderName,
+    unsigned int stateRequestToken) {
+    ACSDK_DEBUG3(LX(__func__)
+                     .d("namespace", stateProviderName.nameSpace)
+                     .d("name", stateProviderName.name)
+                     .d("token", stateRequestToken));
+    m_executor->submit([this, stateRequestToken]() { executeProvideState(stateRequestToken); });
+}
+
+void BaseAPLCapabilityAgent::executeProvideState(unsigned int stateRequestToken) {
+    ACSDK_DEBUG3(LX(__func__).d("token", stateRequestToken));
+
+    if (!m_visualStateProvider) {
+        ACSDK_ERROR(LX("executeProvideStateFailed").d("reason", "no visualStateProvider"));
+        return;
+    }
+
+    if (m_lastDisplayedDirective && !m_lastRenderedAPLToken.empty() &&
+        getDirectiveType(m_lastDisplayedDirective) == DirectiveType::RENDER_DOCUMENT) {
+        m_visualStateProvider->provideState(m_lastRenderedAPLToken, stateRequestToken);
+    } else {
+        m_contextManager->setState(m_visualContextHeader, "", StateRefreshPolicy::SOMETIMES, stateRequestToken);
+        m_lastReportedState.clear();
+    }
+}
+
+void BaseAPLCapabilityAgent::onVisualContextAvailable(
+    avsCommon::sdkInterfaces::ContextRequestToken requestToken,
+    const aplCapabilityCommonInterfaces::aplEventPayload::VisualContext& context) {
+    ACSDK_DEBUG3(LX(__func__).d("requestToken", requestToken));
+    m_executor->submit([this, requestToken, context]() { executeOnVisualContextAvailable(requestToken, context); });
+}
+
+void BaseAPLCapabilityAgent::executeOnVisualContextAvailable(
+    const avsCommon::sdkInterfaces::ContextRequestToken requestToken,
+    const aplCapabilityCommonInterfaces::aplEventPayload::VisualContext& context) {
+    auto token = context.token;
+    ACSDK_DEBUG3(LX("onVisualContextAvailableExecutor"));
+
+    rapidjson::Document doc(rapidjson::kObjectType);
+    doc.SetObject();
+    auto& allocator = doc.GetAllocator();
+    std::string payload;
+
+    doc.AddMember(TOKEN_KEY, rapidjson::Value(token.c_str(), allocator), allocator);
+
+    if (!context.version.empty()) {
+        doc.AddMember(VERSION_KEY, rapidjson::Value(context.version.c_str(), allocator), allocator);
+    } else {
+        doc.AddMember(VERSION_KEY, rapidjson::Value(m_APLVersion.c_str(), allocator), allocator);
+    }
+
+    if (!context.visualContext.empty()) {
+        rapidjson::Document components(rapidjson::kArrayType, &allocator);
+        rapidjson::Document component(rapidjson::kObjectType, &allocator);
+
+        if (component.Parse(context.visualContext).HasParseError()) {
+            ACSDK_ERROR(LX("onVisualContextAvailableExecutor").d("reason", "Failed to parse visualContext document"));
+        } else {
+            /// Add visual context info
+            components.PushBack(component, allocator);
+            doc.AddMember(VISUAL_CONTEXT_KEY, components.Move(), allocator);
+        }
+    }
+
+    if (!context.datasourceContext.empty()) {
+        rapidjson::Document datasource(rapidjson::kObjectType, &allocator);
+        if (datasource.Parse(context.datasourceContext).HasParseError()) {
+            ACSDK_ERROR(
+                LX("onVisualContextAvailableExecutor").d("reason", "Failed to parse datasourceContext document"));
+        } else {
+            /// Add datasource context info
+            doc.AddMember(DATASOURCE_CONTEXT_KEY, datasource.Move(), allocator);
+        }
+    }
+    //  add presentationSession to payload
+    addPresentationSessionPayload(&doc);
+    rapidjson::StringBuffer buffer;
+    buffer.Clear();
+    rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+    doc.Accept(writer);
+    payload = buffer.GetString();
+
+    CapabilityState state(payload);
+    m_lastReportTime = std::chrono::steady_clock::now();
+    m_stateReportPending = false;
+    if (PROACTIVE_STATE_REQUEST_TOKEN == requestToken) {
+        // Proactive visualContext report
+        if (m_lastReportedState != context.visualContext) {
+            m_contextManager->reportStateChange(
+                m_visualContextHeader, state, AlexaStateChangeCauseType::ALEXA_INTERACTION);
+            m_lastReportedState = context.visualContext;
+        }
+    } else {
+        if (!m_lastRenderedAPLToken.empty()) {
+            m_contextManager->provideStateResponse(m_visualContextHeader, state, requestToken);
+        } else {
+            // Since requesting the visualContext, APL is no longer being displayed
+            // Set presentationSession as the state.
+            m_contextManager->setState(
+                m_visualContextHeader, getPresentationSessionPayload(), StateRefreshPolicy::SOMETIMES, requestToken);
+            m_lastReportedState.clear();
+        }
+    }
+}
+
+void BaseAPLCapabilityAgent::processRenderDocumentResult(
+    const aplCapabilityCommonInterfaces::PresentationToken& token,
+    const bool result,
+    const std::string& error) {
+    m_executor->submit([this, token, result, error]() {
+        if (token.empty()) {
+            ACSDK_WARN(LX("processRenderDocumentResultFailedInExecutor").d("reason", "token is empty"));
+            return;
+        }
+
+        if (!m_lastDisplayedDirective) {
+            ACSDK_WARN(LX("processRenderDocumentResultFailedInExecutor").d("reason", "no outstanding directive"));
+            return;
+        }
+
+        ACSDK_DEBUG3(LX("processRenderDocumentResultExecutor").d("token", token).d("result", result));
+
+        // Clear state if rendering has failed and this is the active APL token Note: in most cases
+        // m_lastRenderedAPLToken will be the same as directiveToken but this is not guaranteed
+        if (!result && token == m_lastRenderedAPLToken) {
+            m_presentationSession = {};
+            m_lastRenderedAPLToken.clear();
+        }
+        rapidjson::Document doc;
+        if (!APLPayloadParser::parseDirectivePayload(m_lastDisplayedDirective->directive->getPayload(), &doc)) {
+            ACSDK_ERROR(LX("processRenderDocumentResultFailedInExecutor").m("Error parsing last displayed directive"));
+            return;
+        }
+        std::string directiveToken;
+        if (!APLPayloadParser::extractPresentationToken(doc, directiveToken)) {
+            ACSDK_ERROR(LX("processRenderDocumentResultFailedInExecutor").d("reason", "NoValidToken"));
+            return;
+        }
+
+        if (directiveToken != token) {
+            ACSDK_ERROR(LX("processRenderDocumentResultFailedInExecutor")
+                            .d("reason", "tokenMismatch")
+                            .d("expected", directiveToken)
+                            .d("actual", token));
+            return;
+        }
+
+        if (result) {
+            setHandlingCompleted(m_lastDisplayedDirective);
+            executeProactiveStateReport();
+        } else {
+            sendExceptionEncounteredAndReportFailed(m_lastDisplayedDirective, "Renderer failed: " + error);
+            resetMetricsEvent(MetricEvent::RENDER_DOCUMENT);
+            endMetricsEvent(
+                MetricEvent::RENDER_DOCUMENT,
+                MetricActivity::ACTIVITY_RENDER_DOCUMENT_FAIL,
+                std::chrono::steady_clock::now());
+        }
+    });
+}
+
+void BaseAPLCapabilityAgent::processExecuteCommandsResult(
+    const aplCapabilityCommonInterfaces::PresentationToken& token,
+    aplCapabilityCommonInterfaces::APLCommandExecutionEvent event,
+    const std::string& error) {
+    m_executor->submit([this, token, event, error]() {
+        ACSDK_DEBUG3(LX("processExecuteCommandsResultExecutor")
+                         .d("token", token)
+                         .d("event", commandExecutionEventToString(event)));
+
+        auto isFailed = aplCapabilityCommonInterfaces::APLCommandExecutionEvent::FAILED == event;
+        std::string failureMessage;
+        if (isFailed) {
+            failureMessage = error;
+        } else {
+            // If clients had no failures, ensure that this was still a valid directive
+            if (token.empty()) {
+                isFailed = true;
+                failureMessage = "token is empty";
+            } else if (token != m_lastExecuteCommandTokenAndDirective.first) {
+                isFailed = true;
+                failureMessage = "asked to process missing directive";
+            } else if (!m_lastExecuteCommandTokenAndDirective.second) {
+                isFailed = true;
+                failureMessage = "directive to handle is null";
+            }
+        }
+        if (isFailed) {
+            ACSDK_ERROR(LX("processExecuteCommandsResultExecutorFailed").d("token", token).d("reason", failureMessage));
+            sendExceptionEncounteredAndReportFailed(
+                m_lastExecuteCommandTokenAndDirective.second, "Commands execution failed: " + failureMessage);
+        } else {
+            setHandlingCompleted(m_lastExecuteCommandTokenAndDirective.second);
+        }
+
+        m_lastExecuteCommandTokenAndDirective.first.clear();
+        executeProactiveStateReport();
+    });
+}
+
+void BaseAPLCapabilityAgent::startMetricsEvent(MetricEvent metricEvent) {
+    switch (metricEvent) {
+        case MetricEvent::RENDER_DOCUMENT:
+            m_currentActiveTimePoints[metricEvent] = std::chrono::steady_clock::now();
+            break;  // Timer Metric events
+    }
+}
+
+void BaseAPLCapabilityAgent::resetMetricsEvent(MetricEvent metricEvent) {
+    switch (metricEvent) {
+        case MetricEvent::RENDER_DOCUMENT: {
+            m_currentActiveTimePoints.erase(metricEvent);
+            break;  // Timer Metric events
+        }
+    }
+}
+
+void BaseAPLCapabilityAgent::endMetricsEvent(
+    MetricEvent metricEvent,
+    MetricActivity activity,
+    const std::chrono::steady_clock::time_point& timestamp) {
+    switch (metricEvent) {
+        case MetricEvent::RENDER_DOCUMENT: {
+            auto eventBuilder =
+                alexaClientSDK::avsCommon::utils::metrics::MetricEventBuilder{}
+                    .setPriority(alexaClientSDK::avsCommon::utils::metrics::Priority::HIGH)
+                    .addDataPoint(alexaClientSDK::avsCommon::utils::metrics::DataPointStringBuilder{}
+                                      .setName("APL_TOKEN")
+                                      .setValue(m_lastRenderedAPLToken.c_str())
+                                      .build())
+                    .addDataPoint(alexaClientSDK::avsCommon::utils::metrics::DataPointStringBuilder{}
+                                      .setName("SKILL_ID")
+                                      .setValue(m_presentationSession.skillId.c_str())
+                                      .build())
+                    .addDataPoint(alexaClientSDK::avsCommon::utils::metrics::DataPointStringBuilder{}
+                                      .setName("DIRECTIVE_MESSAGE_ID")
+                                      .setValue(m_lastDisplayedDirective->directive->getMessageId())
+                                      .build())
+                    .addDataPoint(alexaClientSDK::avsCommon::utils::metrics::DataPointStringBuilder{}
+                                      .setName("DIALOG_REQUEST_ID")
+                                      .setValue(m_lastDisplayedDirective->directive->getDialogRequestId())
+                                      .build());
+
+            auto startName = getMetricDataPointName(metricEvent) + ".Start";
+            auto startTP = std::chrono::duration_cast<std::chrono::milliseconds>(
+                m_currentActiveTimePoints.find(metricEvent) != m_currentActiveTimePoints.end()
+                    ? m_currentActiveTimePoints[metricEvent].time_since_epoch()
+                    : std::chrono::milliseconds(0));
+            auto startEvent =
+                eventBuilder.setActivityName(getMetricActivityName(activity) + "-" + startName)
+                    .addDataPoint(alexaClientSDK::avsCommon::utils::metrics::DataPointDurationBuilder(startTP)
+                                      .setName(startName)
+                                      .build())
+                    .build();
+
+            auto durationName = getMetricDataPointName(metricEvent) + ".TimeTaken";
+            auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(
+                m_currentActiveTimePoints.find(metricEvent) != m_currentActiveTimePoints.end()
+                    ? timestamp - m_currentActiveTimePoints[metricEvent]
+                    : std::chrono::milliseconds(0));
+            auto durationEvent =
+                eventBuilder.setActivityName(getMetricActivityName(activity) + "-" + durationName)
+                    .addDataPoint(alexaClientSDK::avsCommon::utils::metrics::DataPointDurationBuilder(duration)
+                                      .setName(durationName)
+                                      .build())
+                    .build();
+
+            m_currentActiveTimePoints.erase(metricEvent);
+            if (m_metricRecorder != nullptr) {
+                ACSDK_DEBUG1(LX(__func__).d("recording metric", getMetricDataPointName(metricEvent)));
+                std::lock_guard<std::mutex> lock{m_MetricsRecorderMutex};
+                m_metricRecorder->recordMetric(startEvent);
+                m_metricRecorder->recordMetric(durationEvent);
+            }
+            break;
+        }
+    }
+}
+
+void BaseAPLCapabilityAgent::recordRenderComplete(const std::chrono::steady_clock::time_point& timestamp) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_documentRendered = true;
+    /* Document was rendered */
+    endMetricsEvent(MetricEvent::RENDER_DOCUMENT, MetricActivity::ACTIVITY_RENDER_DOCUMENT, timestamp);
+}
+
+void BaseAPLCapabilityAgent::executeProactiveStateReport() {
+    if (m_stateReportCheckInterval.count() == 0 || !m_lastDisplayedDirective || m_lastRenderedAPLToken.empty() ||
+        getDirectiveType(m_lastDisplayedDirective) != DirectiveType::RENDER_DOCUMENT || !m_documentRendered) {
+        // Not rendering APL or reporting disabled, do not request a state report
+        return;
+    }
+
+    auto now = std::chrono::steady_clock::now();
+    auto duration = now - m_lastReportTime;
+
+    if (!m_stateReportPending && duration.count() > m_minStateReportInterval.count()) {
+        m_stateReportPending = true;
+        m_visualStateProvider->provideState(m_lastRenderedAPLToken, PROACTIVE_STATE_REQUEST_TOKEN);
+    }
+}
+
+void BaseAPLCapabilityAgent::proactiveStateReport() {
+    m_executor->submit([this] { executeProactiveStateReport(); });
+}
+
+void BaseAPLCapabilityAgent::onActiveDocumentChanged(
+    const aplCapabilityCommonInterfaces::PresentationToken& token,
+    const alexaClientSDK::aplCapabilityCommonInterfaces::PresentationSession& session) {
+    m_executor->submit([this, token, session] {
+        ACSDK_DEBUG5(LX("onActiveDocumentChanged").d("token", token));
+
+        m_lastRenderedAPLToken = token;
+        m_presentationSession = session;
+
+        executeProactiveStateReport();
+    });
+}
+
+void BaseAPLCapabilityAgent::addPresentationSessionPayload(rapidjson::Document* document) {
+    const auto presentationSessionKeys = getPresentationSessionFieldNames();
+    rapidjson::Document::AllocatorType& allocator = document->GetAllocator();
+    rapidjson::Document presentationSession(rapidjson::kObjectType, &allocator);
+    auto skillIdFieldValue = rapidjson::Value(presentationSessionKeys.skillId.c_str(), allocator);
+    auto presentationSessionIdFieldValue =
+        rapidjson::Value(presentationSessionKeys.presentationSessionId.c_str(), allocator);
+    presentationSession.AddMember(skillIdFieldValue, m_presentationSession.skillId, allocator);
+    presentationSession.AddMember(presentationSessionIdFieldValue, m_presentationSession.id, allocator);
+
+    rapidjson::Document grantedExtensionsDoc(rapidjson::kArrayType, &allocator);
+    grantedExtensionsDoc.SetArray();
+    for (auto grantedExtension : m_presentationSession.grantedExtensions) {
+        rapidjson::Document doc(rapidjson::kObjectType, &allocator);
+        doc.AddMember(PRESENTATION_SESSION_URI, grantedExtension.uri, allocator);
+        grantedExtensionsDoc.PushBack(doc, allocator);
+    }
+    presentationSession.AddMember(PRESENTATION_SESSION_GRANTEDEXTENSIONS, grantedExtensionsDoc, allocator);
+
+    rapidjson::Document autoInitializedExtensionsDoc(rapidjson::kArrayType, &allocator);
+    autoInitializedExtensionsDoc.SetArray();
+    for (auto autoInitializedExtension : m_presentationSession.autoInitializedExtensions) {
+        rapidjson::Document doc(rapidjson::kObjectType, &allocator);
+        doc.AddMember(PRESENTATION_SESSION_URI, autoInitializedExtension.uri, allocator);
+        doc.AddMember(PRESENTATION_SESSION_SETTINGS, autoInitializedExtension.settings, allocator);
+        autoInitializedExtensionsDoc.PushBack(doc, allocator);
+    }
+    presentationSession.AddMember(
+        PRESENTATION_SESSION_AUTOINITIALIZEDEXTENSIONS, autoInitializedExtensionsDoc, allocator);
+
+    document->AddMember(rapidjson::StringRef(PRESENTATION_SESSION_FIELD), presentationSession, allocator);
+}
+
+std::string BaseAPLCapabilityAgent::getPresentationSessionPayload() {
+    rapidjson::Document doc(rapidjson::kObjectType);
+    addPresentationSessionPayload(&doc);
+    rapidjson::StringBuffer buffer;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+    if (!doc.Accept(writer)) {
+        ACSDK_ERROR(LX("getPresentationSessionPayloadFailed").d("reason", "error in serializing payload"));
+        return "{}";
+    }
+    return buffer.GetString();
+}
+
+}  // namespace aplCapabilityCommon
+}  // namespace alexaClientSDK
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommon/src/CMakeLists.txt b/capabilities/APLCapabilityCommon/APLCapabilityCommon/src/CMakeLists.txt
new file mode 100644
index 0000000000..a06f3c484c
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommon/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_definitions("-DACSDK_LOG_MODULE=${PROJECT_NAME} ")
+
+file(GLOB SOURCES "*.cpp")
+add_library(${PROJECT_NAME} ${SOURCES})
+
+target_include_directories(${PROJECT_NAME}
+        PUBLIC "${acsdkAPLCapabilityCommon_SOURCE_DIR}/include"
+        PRIVATE "${acsdkAPLCapabilityCommon_SOURCE_DIR}/privateInclude"
+        "${ASDK_INCLUDE_DIRS}")
+
+target_compile_definitions(${PROJECT_NAME} PRIVATE RAPIDJSON_HAS_STDSTRING=1)
+
+target_link_libraries(${PROJECT_NAME} "${ASDK_LDFLAGS}" AVSCommon acsdkAPLCapabilityCommonInterfaces acsdkNotifier acsdkPresentationOrchestratorInterfaces)
+
+# install target
+asdk_install()
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommon/test/BaseAPLCapabilityAgentTest.cpp b/capabilities/APLCapabilityCommon/APLCapabilityCommon/test/BaseAPLCapabilityAgentTest.cpp
new file mode 100644
index 0000000000..d1dfd12df5
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommon/test/BaseAPLCapabilityAgentTest.cpp
@@ -0,0 +1,1118 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <condition_variable>
+#include <future>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include "acsdk/APLCapabilityCommonInterfaces/PresentationToken.h"
+#include "gmock/gmock-spec-builders.h"
+#include <rapidjson/document.h>
+
+#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
+#include <AVSCommon/SDKInterfaces/MockContextManager.h>
+#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/SDKInterfaces/MockMessageSender.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <acsdk/APLCapabilityCommonInterfaces/MockAPLCapabilityAgent.h>
+#include <acsdk/APLCapabilityCommonInterfaces/MockVisualStateProvider.h>
+#include <acsdk/APLCapabilityCommonInterfaces/MockAPLCapabilityAgentObserver.h>
+
+#include <acsdk/APLCapabilityCommon/BaseAPLCapabilityAgent.h>
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommon {
+namespace test {
+
+using namespace alexaClientSDK;
+using namespace alexaClientSDK::avsCommon::avs;
+using namespace alexaClientSDK::avsCommon::sdkInterfaces;
+using namespace alexaClientSDK::avsCommon::utils::configuration;
+using namespace alexaClientSDK::avsCommon::sdkInterfaces::test;
+using namespace avsCommon::avs::attachment::test;
+using namespace alexaClientSDK::avsCommon::utils::memory;
+using namespace rapidjson;
+using namespace ::testing;
+using namespace aplCapabilityCommonInterfaces::test;
+
+/// String to identify log entries originating from this file.
+#define TAG "BaseAPLCapabilityAgentTest"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Alias for JSON stream type used in @c ConfigurationNode initialization
+using JSONStream = std::vector<std::shared_ptr<std::istream>>;
+
+/// The key in our config file to find the root of APL CA configuration.
+static std::string TESTPRESENTATIONAPL_CONFIGURATION_ROOT_KEY = "TestPresentationAPLCapabilityAgent";
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// The namespace registered for this capability agent.
+static const std::string NAMESPACE = "Test.Presentation.APL";
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE = "Unknown";
+
+/// The name for UserEvent event.
+static const std::string USER_EVENT_EVENT = "UserEvent";
+
+/// The name for LoadIndexListData event.
+static const std::string LOAD_INDEX_LIST_DATA = "LoadIndexListData";
+
+/// The name for LoadTokenListData event.
+static const std::string LOAD_TOKEN_LIST_DATA = "LoadTokenListData";
+
+/// The @c MessageId identifer.
+static const std::string MESSAGE_ID = "messageId";
+
+/// The @c MessageId identifer.
+static const std::string MESSAGE_ID_2 = "messageId2";
+
+/// Payload to be sent for UserEvent
+static const std::string SAMPLE_USER_EVENT_PAYLOAD =
+    R"({"presentationToken":"APL_TOKEN","arguments":{},"source":{},"components":{}})";
+
+/// DynamicIndexList DataSource type
+static const std::string DYNAMIC_INDEX_LIST = "dynamicIndexList";
+
+/// Payload to be sent for ListDataSourceFetchRequest
+static const std::string SAMPLE_INDEX_DATA_SOURCE_FETCH_REQUEST =
+    R"({"correlationToken":"101","count":10.0,"listId":"vQdpOESlok","startIndex":1.0,"presentationToken":"APL_TOKEN"})";
+
+/// Payload to be sent for ListDataSourceFetchRequest from APLCore
+static const std::string SAMPLE_INDEX_DATA_SOURCE_FETCH_APL_REQUEST =
+    R"({"correlationToken":"101","count":10.0,"listId":"vQdpOESlok","startIndex":1.0})";
+
+/// DynamicTokenList DataSource type
+static const std::string DYNAMIC_TOKEN_LIST = "dynamicTokenList";
+
+/// Payload to be sent for TokenDataSourceFetchRequest
+static const std::string SAMPLE_TOKEN_DATA_SOURCE_FETCH_REQUEST =
+    R"({"correlationToken":"101","listId":"vQdpOESlok","pageToken":"nextPage","presentationToken":"APL_TOKEN"})";
+
+/// Payload to be sent for TokenDataSourceFetchRequest from APLCore
+static const std::string SAMPLE_TOKEN_DATA_SOURCE_FETCH_APL_REQUEST =
+    R"({"correlationToken":"101","listId":"vQdpOESlok","pageToken":"nextPage"})";
+
+/// JSON key for the event section of a message.
+static const std::string MESSAGE_EVENT_KEY = "event";
+
+/// JSON key for the namespace field of a message header.
+static const std::string MESSAGE_NAMESPACE_KEY = "namespace";
+
+/// JSON key for the name field of a message header.
+static const std::string MESSAGE_NAME_KEY = "name";
+
+/// JSON key for the header section of a message.
+static const std::string MESSAGE_HEADER_KEY = "header";
+
+/// JSON key for the payload section of an message.
+static const std::string MESSAGE_PAYLOAD_KEY = "payload";
+
+/// The name for SendIndexListData directive.
+static const char* SEND_INDEX_LIST_DATA = "SendIndexListData";
+
+/// The name for UpdateIndexListData directive.
+static const char* UPDATE_INDEX_LIST_DATA = "UpdateIndexListData";
+
+/// The name for SendTokenListData directive.
+static const char* SEND_TOKEN_LIST_DATA = "SendTokenListData";
+
+/// The RenderDocument directive signature.
+static const NamespaceAndName DOCUMENT{NAMESPACE, "RenderDocument"};
+
+/// The ExecuteCommands directive signature.
+static const NamespaceAndName COMMAND{NAMESPACE, "ExecuteCommands"};
+
+/// The SendIndexListData directive signature.
+static const NamespaceAndName INDEX_LIST_DATA{NAMESPACE, SEND_INDEX_LIST_DATA};
+
+/// The UpdateIndexListData directive signature.
+static const NamespaceAndName INDEX_LIST_UPDATE{NAMESPACE, UPDATE_INDEX_LIST_DATA};
+
+/// The SendTokenListData directive signature.
+static const NamespaceAndName TOKEN_LIST_DATA{NAMESPACE, SEND_TOKEN_LIST_DATA};
+
+/// Identifier for the skilld in presentationSession
+static const char SKILL_ID[] = "skillId";
+
+/// Identifier for the id in presentationSession
+static const char PRESENTATION_SESSION_ID[] = "id";
+
+// clang-format off
+
+const std::string makeDocumentAplPayload(const std::string& token, const std::string& timeoutType) {
+    return "{"
+             "\"presentationToken\":\"" + token + "\","
+             "\"windowId\":\"WINDOW_ID\","
+             "\"timeoutType\":\"" + timeoutType + "\","
+             "\"document\":\"{}\""
+             "}";
+}
+
+/// A RenderDocument directive with APL payload.
+static const std::string DOCUMENT_APL_PAYLOAD = "{"
+                                                "\"presentationToken\":\"APL_TOKEN\","
+                                                "\"windowId\":\"WINDOW_ID\","
+                                                "\"timeoutType\":\"TRANSIENT\","
+                                                "\"document\":\"{}\""
+                                                "}";
+
+/// A 2nd RenderDocument directive with APL payload.
+static const std::string DOCUMENT_APL_PAYLOAD_2 = "{"
+                                                  "\"presentationToken\":\"APL_TOKEN_2\","
+                                                  "\"windowId\":\"WINDOW_ID\","
+                                                  "\"timeoutType\":\"TRANSIENT\","
+                                                  "\"document\":\"{}\""
+                                                  "}";
+
+static const std::string DOCUMENT_APL_PAYLOAD_MISSING_TIMEOUTTYPE =
+                                                "{"
+                                                "\"presentationToken\":\"APL_TOKEN\","
+                                                "\"windowId\":\"WINDOW_ID\","
+                                                "\"document\":\"{}\""
+                                                "}";
+
+static const std::string DOCUMENT_APL_PAYLOAD_INVALID_TIMEOUTTYPE =
+                                                "{"
+                                                "\"presentationToken\":\"APL_TOKEN\","
+                                                "\"windowId\":\"WINDOW_ID\","
+                                                "\"timeoutType\":\"SNAKES\","
+                                                "\"document\":\"{}\""
+                                                "}";
+
+/// A malformed RenderDocument directive with APL payload without presentationToken.
+static const std::string DOCUMENT_APL_PAYLOAD_MALFORMED = "{"
+                                                          "\"token\":\"APL_TOKEN\""
+                                                          "}";
+
+/// A malformed RenderDocument directive with APL payload without document.
+static const std::string DOCUMENT_APL_PAYLOAD_MALFORMED_2 = "{"
+                                                            "\"presentationToken\":\"APL_TOKEN\""
+                                                            "}";
+
+/// A malformed ExecuteCommand directive with APL payload without commands.
+static const std::string EXECUTE_COMMAND_PAYLOAD_MALFORMED = "{"
+                                                             "\"presentationToken\":\"APL_TOKEN\""
+                                                             "}";
+
+/// A malformed ExecuteCommand directive with APL payload without presentationToken.
+static const std::string EXECUTE_COMMAND_PAYLOAD_MALFORMED_2 = "{"
+                                                               "\"token\":\"APL_TOKEN\""
+                                                               "}";
+
+// Properly formed execute command
+static const std::string EXECUTE_COMMAND_PAYLOAD = "{"
+                                                   "\"presentationToken\":\"APL_TOKEN\","
+                                                   "\"commands\": ["
+                                                   " {\"type\": \"idleCommand\"} "
+                                                   "]"
+                                                   "}";
+
+static const std::string SETTINGS_CONFIG = R"({"TestPresentationAPLCapabilityAgent":{
+                                                    "minStateReportIntervalMs": 250,
+                                                    "stateReportCheckIntervalMs": 300
+                                                }})";
+
+// clang-format on
+
+/// Test window ID
+static const std::string WINDOW_ID = "WINDOW_ID";
+
+/// A visual state request token.
+static const unsigned int STATE_REQUEST_TOKEN = 1;
+
+/// A state request token for a proactive state request
+static const unsigned int PROACTIVE_STATE_REQUEST_TOKEN = 0;
+
+/// APL_TOKEN used in documents
+static const std::string APL_TOKEN = "APL_TOKEN";
+
+/// APL_TOKEN_2 used in documents
+static const char* const APL_TOKEN_2 = "APL_TOKEN_2";
+
+/// Metric name for the test CA
+static const std::string TEST_METRIC_NAME = "APLCATest";
+
+/// Metric recorder shared ptr
+static std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder;
+
+class APLCATest : public BaseAPLCapabilityAgent {
+public:
+    ~APLCATest() = default;
+    /// @name BaseAPLCapabilityAgent template functions
+    /// @{
+    alexaClientSDK::avsCommon::avs::DirectiveHandlerConfiguration getAPLDirectiveConfiguration() const override {
+        DirectiveHandlerConfiguration configuration;
+        return configuration;
+    }
+    std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>>
+    getAPLCapabilityConfigurations(const std::string& APLMaxVersion) override {
+        std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> config;
+        return config;
+    }
+    aplCapabilityCommon::BaseAPLCapabilityAgent::DirectiveType getDirectiveType(
+        std::shared_ptr<DirectiveInfo> info) override {
+        if (!info) {
+            return aplCapabilityCommon::BaseAPLCapabilityAgent::DirectiveType::UNKNOWN;
+        }
+
+        if (info->directive->getNamespace() == DOCUMENT.nameSpace && info->directive->getName() == DOCUMENT.name) {
+            return BaseAPLCapabilityAgent::DirectiveType::RENDER_DOCUMENT;
+        } else if (info->directive->getNamespace() == COMMAND.nameSpace && info->directive->getName() == COMMAND.name) {
+            return BaseAPLCapabilityAgent::DirectiveType::EXECUTE_COMMAND;
+        } else if (
+            (info->directive->getNamespace() == INDEX_LIST_DATA.nameSpace &&
+             info->directive->getName() == INDEX_LIST_DATA.name) ||
+            (info->directive->getNamespace() == INDEX_LIST_UPDATE.nameSpace &&
+             info->directive->getName() == INDEX_LIST_UPDATE.name)) {
+            return BaseAPLCapabilityAgent::DirectiveType::DYNAMIC_INDEX_DATA_SOURCE_UPDATE;
+        } else if (
+            info->directive->getNamespace() == TOKEN_LIST_DATA.nameSpace &&
+            info->directive->getName() == TOKEN_LIST_DATA.name) {
+            return BaseAPLCapabilityAgent::DirectiveType::DYNAMIC_TOKEN_DATA_SOURCE_UPDATE;
+        } else {
+            return BaseAPLCapabilityAgent::DirectiveType::UNKNOWN;
+        }
+    }
+    const std::string& getConfigurationRootKey() override {
+        return TESTPRESENTATIONAPL_CONFIGURATION_ROOT_KEY;
+    }
+    const std::string& getMetricDataPointName(aplCapabilityCommon::BaseAPLCapabilityAgent::MetricEvent event) override {
+        return TEST_METRIC_NAME;
+    }
+    const std::string& getMetricActivityName(
+        aplCapabilityCommon::BaseAPLCapabilityAgent::MetricActivity activity) override {
+        return TEST_METRIC_NAME;
+    }
+    aplCapabilityCommon::BaseAPLCapabilityAgent::PresentationSessionFieldNames getPresentationSessionFieldNames()
+        override {
+        aplCapabilityCommon::BaseAPLCapabilityAgent::PresentationSessionFieldNames fieldNames;
+        fieldNames.skillId = SKILL_ID;
+        fieldNames.presentationSessionId = PRESENTATION_SESSION_ID;
+        return fieldNames;
+    }
+    const bool shouldPackPresentationSessionToAvsEvents() override {
+        return false;
+    }
+    /// @}
+    /**
+     * Constructor.
+     *
+     * @param exceptionSender The object to send AVS Exception messages.
+     * @param messageSender The object to send message to AVS.
+     * @param contextManager The object to fetch the context of the system.
+     * @param visualStateProvider The VisualStateProviderInterface object used to request visual context.
+     */
+    APLCATest(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::string aplVersion,
+        std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::VisualStateProviderInterface>
+            visualStateProvider = nullptr) :
+            BaseAPLCapabilityAgent(
+                NAMESPACE,
+                exceptionSender,
+                metricRecorder,
+                messageSender,
+                contextManager,
+                aplVersion,
+                visualStateProvider) {
+    }
+};
+
+std::mutex m;
+std::condition_variable conditionVariable;
+
+/// Test harness for @c BaseAPLCapabilityAgent class.
+class BaseAPLCapabilityAgentTest : public ::testing::Test {
+public:
+    /// Set up the test harness for running a test.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// A constructor which initializes the promises and futures needed for the test class.
+    BaseAPLCapabilityAgentTest() {
+    }
+
+protected:
+    /// This is the condition variable to be used to control getting of a context in test cases.
+    std::condition_variable m_contextTrigger;
+
+    /// mutex for the conditional variables.
+    std::mutex m_mutex;
+
+    /// A strict mock that allows the test to fetch context.
+    std::shared_ptr<StrictMock<test::MockContextManager>> m_mockContextManager;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<test::MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<test::MockDirectiveHandlerResult>> m_mockDirectiveHandlerResult;
+
+    /// A strict mock to allow testing of the observer callback.
+    std::shared_ptr<NiceMock<MockAPLCapabilityAgentObserver>> m_mockAPLObserver;
+
+    /// A pointer to an instance of the @c APLCATest that will be instantiated per test.
+    std::shared_ptr<APLCATest> m_APLCATest;
+
+    /// A pointer to an instance of the @c APLCapabilityAgentInterface that will be instantiated per test.
+    std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> m_aplCA;
+
+    /// The mock @c MessageSenderInterface.
+    std::shared_ptr<StrictMock<test::MockMessageSender>> m_mockMessageSender;
+
+    /// A strict mock to allow testing for visual state provider.
+    std::shared_ptr<StrictMock<MockVisualStateProvider>> m_mockVisualStateProvider;
+
+    // The pointer into the @c Executor used by the tested object.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> m_executor;
+};
+
+/*
+ * Utility function to generate @c ConfigurationNode from JSON string.
+ */
+static void setConfig() {
+    auto stream = std::shared_ptr<std::stringstream>(new std::stringstream(SETTINGS_CONFIG));
+    JSONStream jsonStream({stream});
+    ConfigurationNode::initialize(jsonStream);
+}
+
+static aplCapabilityCommonInterfaces::aplEventPayload::UserEvent createUserEventPayload(
+    aplCapabilityCommonInterfaces::PresentationToken token,
+    std::string arguments,
+    std::string source,
+    std::string components) {
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 6)
+    aplCapabilityCommonInterfaces::aplEventPayload::UserEvent payload(token, arguments, source, components);
+#else
+    aplCapabilityCommonInterfaces::aplEventPayload::UserEvent payload{
+        .token = token, .arguments = arguments, .source = source, .components = components};
+#endif
+    return payload;
+}
+
+static aplCapabilityCommonInterfaces::aplEventPayload::DataSourceFetch createDataSourceFetchPayload(
+    aplCapabilityCommonInterfaces::PresentationToken token,
+    std::string dataSourceType,
+    std::string fetchPayload) {
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 6)
+    aplCapabilityCommonInterfaces::aplEventPayload::DataSourceFetch payload(token, dataSourceType, fetchPayload);
+#else
+    aplCapabilityCommonInterfaces::aplEventPayload::DataSourceFetch payload{
+        .token = token, .dataSourceType = dataSourceType, .fetchPayload = fetchPayload};
+#endif
+    return payload;
+}
+
+static aplCapabilityCommonInterfaces::aplEventPayload::VisualContext createVisualContextPayload(
+    aplCapabilityCommonInterfaces::PresentationToken token,
+    std::string version,
+    std::string visualContext,
+    std::string datasourceContext) {
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 6)
+    aplCapabilityCommonInterfaces::aplEventPayload::VisualContext payload(
+        token, version, visualContext, datasourceContext);
+#else
+    aplCapabilityCommonInterfaces::aplEventPayload::VisualContext payload{
+        .token = token, .version = version, .visualContext = visualContext, .datasourceContext = datasourceContext};
+#endif
+    return payload;
+}
+
+void BaseAPLCapabilityAgentTest::SetUp() {
+    setConfig();
+    m_mockContextManager = std::make_shared<StrictMock<test::MockContextManager>>();
+    m_mockExceptionSender = std::make_shared<StrictMock<test::MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult = make_unique<StrictMock<test::MockDirectiveHandlerResult>>();
+    m_mockAPLObserver = std::make_shared<NiceMock<test::MockAPLCapabilityAgentObserver>>();
+    m_mockMessageSender = std::make_shared<StrictMock<test::MockMessageSender>>();
+    m_mockVisualStateProvider = std::make_shared<StrictMock<test::MockVisualStateProvider>>();
+
+    EXPECT_CALL(*m_mockContextManager, setStateProvider(_, _)).Times(Exactly(1));
+
+    auto aplVersion = "";
+
+    m_APLCATest = std::make_shared<APLCATest>(
+        m_mockExceptionSender,
+        metricRecorder,
+        m_mockMessageSender,
+        m_mockContextManager,
+        aplVersion,
+        m_mockVisualStateProvider);
+
+    m_APLCATest->BaseAPLCapabilityAgent::initialize();
+
+    m_aplCA = std::dynamic_pointer_cast<alexaClientSDK::aplCapabilityCommonInterfaces::APLCapabilityAgentInterface>(
+        m_APLCATest);
+
+    m_executor = std::make_shared<alexaClientSDK::avsCommon::utils::threading::Executor>();
+    m_APLCATest->setExecutor(m_executor);
+    m_APLCATest->addObserver(m_mockAPLObserver);
+}
+
+void BaseAPLCapabilityAgentTest::TearDown() {
+    EXPECT_CALL(*m_mockContextManager, removeStateProvider(_)).Times(Exactly(1));
+    if (m_APLCATest) {
+        m_APLCATest->removeObserver(m_mockAPLObserver);
+        m_APLCATest->shutdown();
+        m_APLCATest.reset();
+    }
+    if (m_mockAPLObserver) {
+        m_mockAPLObserver.reset();
+    }
+}
+
+/**
+ * Verify the request sent to AVS is as expected.
+ */
+static void verifySendMessage(
+    std::shared_ptr<avsCommon::avs::MessageRequest> request,
+    const std::string expectedEventName,
+    const std::string expectedPayload,
+    const std::string expectedNameSpace) {
+    rapidjson::Document document;
+    document.Parse(request->getJsonContent());
+    auto event = document.FindMember(MESSAGE_EVENT_KEY);
+    EXPECT_NE(event, document.MemberEnd());
+
+    auto header = event->value.FindMember(MESSAGE_HEADER_KEY);
+    EXPECT_NE(header, event->value.MemberEnd());
+    auto payload = event->value.FindMember(MESSAGE_PAYLOAD_KEY);
+    EXPECT_NE(payload, event->value.MemberEnd());
+    EXPECT_EQ(header->value.FindMember(MESSAGE_NAMESPACE_KEY)->value.GetString(), expectedNameSpace);
+    EXPECT_EQ(header->value.FindMember(MESSAGE_NAME_KEY)->value.GetString(), expectedEventName);
+    EXPECT_NE(header->value.FindMember(MESSAGE_ID)->value.GetString(), "");
+
+    std::string messagePayload;
+    avsCommon::utils::json::jsonUtils::convertToValue(payload->value, &messagePayload);
+    EXPECT_EQ(messagePayload, expectedPayload);
+    EXPECT_EQ(request->attachmentReadersCount(), 0);
+
+    conditionVariable.notify_all();
+}
+
+/**
+ * Tests timeout calculation
+ */
+TEST_F(BaseAPLCapabilityAgentTest, testTimeoutShort) {
+    std::unique_lock<std::mutex> exitLock(m_mutex);
+    avsCommon::utils::logger::getConsoleLogger()->setLevel(avsCommon::utils::logger::Level::DEBUG9);
+
+    auto aplDocument = makeDocumentAplPayload(APL_TOKEN, "SHORT");
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, aplDocument, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+    EXPECT_CALL(
+        *m_mockAPLObserver,
+        onRenderDocument(
+            _,
+            _,
+            APL_TOKEN,
+            WINDOW_ID,
+            aplCapabilityCommonInterfaces::APLTimeoutType::SHORT,
+            NAMESPACE,
+            _,
+            _,
+            _,
+            m_aplCA))
+        .Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_executor->waitForSubmittedTasks();
+
+    m_APLCATest->processRenderDocumentResult(APL_TOKEN, true, "");
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(BaseAPLCapabilityAgentTest, testTimeoutTransient) {
+    std::unique_lock<std::mutex> exitLock(m_mutex);
+    avsCommon::utils::logger::getConsoleLogger()->setLevel(avsCommon::utils::logger::Level::DEBUG9);
+
+    auto aplDocument = makeDocumentAplPayload(APL_TOKEN, "TRANSIENT");
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, aplDocument, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+    EXPECT_CALL(
+        *m_mockAPLObserver,
+        onRenderDocument(
+            _,
+            _,
+            APL_TOKEN,
+            WINDOW_ID,
+            aplCapabilityCommonInterfaces::APLTimeoutType::TRANSIENT,
+            NAMESPACE,
+            _,
+            _,
+            _,
+            m_aplCA))
+        .Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_executor->waitForSubmittedTasks();
+
+    m_APLCATest->processRenderDocumentResult(APL_TOKEN, true, "");
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(BaseAPLCapabilityAgentTest, testTimeoutLong) {
+    std::unique_lock<std::mutex> exitLock(m_mutex);
+    avsCommon::utils::logger::getConsoleLogger()->setLevel(avsCommon::utils::logger::Level::DEBUG9);
+
+    auto aplDocument = makeDocumentAplPayload(APL_TOKEN, "LONG");
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, aplDocument, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+
+    EXPECT_CALL(
+        *m_mockAPLObserver,
+        onRenderDocument(
+            _,
+            _,
+            APL_TOKEN,
+            WINDOW_ID,
+            aplCapabilityCommonInterfaces::APLTimeoutType::LONG,
+            NAMESPACE,
+            _,
+            _,
+            _,
+            m_aplCA))
+        .Times(Exactly(1));
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_executor->waitForSubmittedTasks();
+
+    m_APLCATest->processRenderDocumentResult(APL_TOKEN, true, "");
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Tests unknown Directive. Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(BaseAPLCapabilityAgentTest, testUnknownDirective) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(NAMESPACE, UNKNOWN_DIRECTIVE, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive = AVSDirective::create("", avsMessageHeader, "", attachmentManager, "");
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Tests when a RenderDocument Directive doesn't contain timeoutType.
+ *  Verify that sendExceptionEncountered and setFailed are not called.
+ *
+ *  Some domains do not include timeout type.
+ */
+TEST_F(BaseAPLCapabilityAgentTest, testMissingTimeoutTypeRenderDocumentDirective) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, DOCUMENT_APL_PAYLOAD_MISSING_TIMEOUTTYPE, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).Times(Exactly(0));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Tests when a RenderDocument Directive contains an invalid timeoutType.
+ *  Expect that sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(BaseAPLCapabilityAgentTest, testInvalidTimeoutTypeRenderDocumentDirective) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, DOCUMENT_APL_PAYLOAD_INVALID_TIMEOUTTYPE, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Tests when a malformed RenderDocument Directive (without presentationToken) is received.  Expect that the
+ * sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(BaseAPLCapabilityAgentTest, testMalformedRenderDocumentDirective) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, DOCUMENT_APL_PAYLOAD_MALFORMED, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Tests when a malformed RenderDocument Directive (without document) is received.  Expect that the
+ * sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(BaseAPLCapabilityAgentTest, testMalformedRenderDocumentDirective2) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, DOCUMENT_APL_PAYLOAD_MALFORMED_2, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Tests when a malformed ExecuteCommands Directive is received (without presentationToken).  Expect that the
+ * sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(BaseAPLCapabilityAgentTest, testMalformedExecuteCommandDirective) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(COMMAND.nameSpace, COMMAND.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, EXECUTE_COMMAND_PAYLOAD_MALFORMED, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Tests when a malformed ExecuteCommands Directive (without commands) is received.  Expect that the
+ * sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(BaseAPLCapabilityAgentTest, testMalformedExecuteCommandDirective2) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(COMMAND.nameSpace, COMMAND.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, EXECUTE_COMMAND_PAYLOAD_MALFORMED_2, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Tests when a ExecuteCommands Directive is received after an APL card is displayed. In this case the
+ * ExecuteCommand should fail as presentationToken(APL rendered) != presentationToken(ExecuteCommand).
+ */
+TEST_F(BaseAPLCapabilityAgentTest, testExecuteCommandAfterMismatchedAPLCard) {
+    avsCommon::utils::logger::getConsoleLogger()->setLevel(avsCommon::utils::logger::Level::DEBUG9);
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, DOCUMENT_APL_PAYLOAD_2, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockAPLObserver, onRenderDocument(_, _, APL_TOKEN_2, WINDOW_ID, _, NAMESPACE, _, _, _, m_aplCA))
+        .Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+
+    m_executor->waitForSubmittedTasks();
+
+    m_APLCATest->processRenderDocumentResult(APL_TOKEN_2, true, "");
+    m_executor->waitForSubmittedTasks();
+
+    m_mockDirectiveHandlerResult = make_unique<StrictMock<test::MockDirectiveHandlerResult>>();
+
+    // Create Directive.
+    auto attachmentManager1 = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader1 = std::make_shared<AVSMessageHeader>(COMMAND.nameSpace, COMMAND.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive1 =
+        AVSDirective::create("", avsMessageHeader1, EXECUTE_COMMAND_PAYLOAD, attachmentManager1, "");
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive1, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_APLCATest->processExecuteCommandsResult(
+        MESSAGE_ID, aplCapabilityCommonInterfaces::APLCommandExecutionEvent::RESOLVED, "");
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Tests when a ExecuteCommands Directive is received after displaying an APL card with matching presentationToken.
+ * The command should be successful.
+ */
+TEST_F(BaseAPLCapabilityAgentTest, testExecuteCommandAfterRightAPL) {
+    avsCommon::utils::logger::getConsoleLogger()->setLevel(avsCommon::utils::logger::Level::DEBUG9);
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, DOCUMENT_APL_PAYLOAD, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockAPLObserver, onRenderDocument(_, _, APL_TOKEN, WINDOW_ID, _, NAMESPACE, _, _, _, m_aplCA))
+        .Times(Exactly(1));
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_executor->waitForSubmittedTasks();
+    m_APLCATest->processRenderDocumentResult(APL_TOKEN, true, "");
+    m_executor->waitForSubmittedTasks();
+
+    // Create Directive.
+    auto attachmentManager1 = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader1 = std::make_shared<AVSMessageHeader>(COMMAND.nameSpace, COMMAND.name, MESSAGE_ID_2);
+    std::shared_ptr<AVSDirective> directive1 =
+        AVSDirective::create("", avsMessageHeader1, EXECUTE_COMMAND_PAYLOAD, attachmentManager1, "");
+    m_mockDirectiveHandlerResult = make_unique<StrictMock<test::MockDirectiveHandlerResult>>();
+
+    EXPECT_CALL(*m_mockAPLObserver, onExecuteCommands(EXECUTE_COMMAND_PAYLOAD, APL_TOKEN)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive1, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID_2);
+    m_APLCATest->processExecuteCommandsResult(
+        APL_TOKEN, aplCapabilityCommonInterfaces::APLCommandExecutionEvent::RESOLVED, "");
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(BaseAPLCapabilityAgentTest, testSendUserEvent) {
+    std::unique_lock<std::mutex> exitLock(m_mutex);
+    auto verifyEvent = [](std::shared_ptr<avsCommon::avs::MessageRequest> request) {
+        verifySendMessage(request, USER_EVENT_EVENT, SAMPLE_USER_EVENT_PAYLOAD, NAMESPACE);
+    };
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1)).WillOnce(Invoke(verifyEvent));
+    // Expect a call to getContext.
+    EXPECT_CALL(*m_mockContextManager, getContext(_, _, _))
+        .WillOnce(Invoke([this](
+                             std::shared_ptr<ContextRequesterInterface> contextRequester,
+                             const std::string&,
+                             const std::chrono::milliseconds&) {
+            m_contextTrigger.notify_one();
+            return 0;
+        }));
+
+    auto payload = createUserEventPayload(APL_TOKEN, "{}", "{}", "{}");
+
+    m_APLCATest->sendUserEvent(payload);
+    // wait for getContext
+    m_contextTrigger.wait_for(exitLock, TIMEOUT);
+    m_APLCATest->onContextAvailable("");
+
+    std::unique_lock<std::mutex> lk(m);
+    conditionVariable.wait(lk);
+}
+
+TEST_F(BaseAPLCapabilityAgentTest, testIndexListDataSourceFetchRequestEvent) {
+    std::unique_lock<std::mutex> exitLock(m_mutex);
+    auto verifyEvent = [](std::shared_ptr<avsCommon::avs::MessageRequest> request) {
+        verifySendMessage(request, LOAD_INDEX_LIST_DATA, SAMPLE_INDEX_DATA_SOURCE_FETCH_REQUEST, NAMESPACE);
+    };
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1)).WillOnce(Invoke(verifyEvent));
+    // Expect a call to getContext.
+    EXPECT_CALL(*m_mockContextManager, getContext(_, _, _))
+        .WillOnce(Invoke([this](
+                             std::shared_ptr<ContextRequesterInterface> contextRequester,
+                             const std::string&,
+                             const std::chrono::milliseconds&) {
+            m_contextTrigger.notify_one();
+            return 0;
+        }));
+
+    auto fetchPayload =
+        createDataSourceFetchPayload(APL_TOKEN, DYNAMIC_INDEX_LIST, SAMPLE_INDEX_DATA_SOURCE_FETCH_APL_REQUEST);
+
+    m_APLCATest->sendDataSourceFetchRequestEvent(fetchPayload);
+    // wait for getContext
+    m_contextTrigger.wait_for(exitLock, TIMEOUT);
+    m_APLCATest->onContextAvailable("");
+
+    std::unique_lock<std::mutex> lk(m);
+    conditionVariable.wait(lk);
+}
+
+TEST_F(BaseAPLCapabilityAgentTest, testTokenListDataSourceFetchRequestEvent) {
+    std::unique_lock<std::mutex> exitLock(m_mutex);
+    auto verifyEvent = [](std::shared_ptr<avsCommon::avs::MessageRequest> request) {
+        verifySendMessage(request, LOAD_TOKEN_LIST_DATA, SAMPLE_TOKEN_DATA_SOURCE_FETCH_REQUEST, NAMESPACE);
+    };
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1)).WillOnce(Invoke(verifyEvent));
+    // Expect a call to getContext.
+    EXPECT_CALL(*m_mockContextManager, getContext(_, _, _))
+        .WillOnce(Invoke([this](
+                             std::shared_ptr<ContextRequesterInterface> contextRequester,
+                             const std::string&,
+                             const std::chrono::milliseconds&) {
+            m_contextTrigger.notify_one();
+            return 0;
+        }));
+
+    auto fetchPayload =
+        createDataSourceFetchPayload(APL_TOKEN, DYNAMIC_TOKEN_LIST, SAMPLE_TOKEN_DATA_SOURCE_FETCH_APL_REQUEST);
+
+    m_APLCATest->sendDataSourceFetchRequestEvent(fetchPayload);
+    // wait for getContext
+    m_contextTrigger.wait_for(exitLock, TIMEOUT);
+    m_APLCATest->onContextAvailable("");
+
+    std::unique_lock<std::mutex> lk(m);
+    conditionVariable.wait(lk);
+}  // namespace test
+
+TEST_F(BaseAPLCapabilityAgentTest, testAPLProactiveStateReportNotSentIfNotRendering) {
+    std::unique_lock<std::mutex> exitLock(m_mutex);
+    avsCommon::utils::logger::getConsoleLogger()->setLevel(avsCommon::utils::logger::Level::DEBUG9);
+
+    // Make sure that this is not called, because no APL is being presented
+    EXPECT_CALL(*m_mockVisualStateProvider, provideState(_, _)).Times(Exactly(0));
+
+    m_contextTrigger.wait_for(exitLock, TIMEOUT);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(BaseAPLCapabilityAgentTest, testAPLProactiveStateReportSentIfRendering) {
+    std::unique_lock<std::mutex> exitLock(m_mutex);
+    avsCommon::utils::logger::getConsoleLogger()->setLevel(avsCommon::utils::logger::Level::DEBUG9);
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, DOCUMENT_APL_PAYLOAD, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockAPLObserver, onRenderDocument(_, _, APL_TOKEN, WINDOW_ID, _, NAMESPACE, _, _, _, m_aplCA))
+        .Times(Exactly(1))
+        .WillRepeatedly(
+            InvokeWithoutArgs([this] { m_APLCATest->recordRenderComplete(std::chrono::steady_clock::now()); }));
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_executor->waitForSubmittedTasks();
+
+    m_aplCA->recordRenderComplete(std::chrono::steady_clock::now());
+    EXPECT_CALL(*m_mockVisualStateProvider, provideState(_, _)).Times(Exactly(1));
+    m_APLCATest->processRenderDocumentResult(APL_TOKEN, true, "");
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_mockVisualStateProvider, provideState(_, _)).Times(Exactly(1));
+    m_APLCATest->provideState(DOCUMENT, STATE_REQUEST_TOKEN);
+    m_executor->waitForSubmittedTasks();
+
+    // Expect a state reponse for the original provideState request
+    EXPECT_CALL(*m_mockContextManager, provideStateResponse(_, _, _)).Times(Exactly(1));
+
+    auto payload = createVisualContextPayload(APL_TOKEN, "test", "{ 1 }", "{}");
+
+    m_APLCATest->onVisualContextAvailable(STATE_REQUEST_TOKEN, payload);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_mockVisualStateProvider, provideState(_, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockContextManager, provideStateResponse(_, _, _)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockContextManager, reportStateChange(_, _, _)).Times(Exactly(1));
+    // Now wait, and we should get a proactive state change following a different request
+    m_contextTrigger.wait_for(exitLock, std::chrono::milliseconds(400));
+    auto payload2 = createVisualContextPayload(APL_TOKEN, "test", "{ 2 }", "{}");
+
+    m_APLCATest->onVisualContextAvailable(PROACTIVE_STATE_REQUEST_TOKEN, payload2);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(BaseAPLCapabilityAgentTest, testAPLProactiveStateReportSentIndependentOfProvideStateResponse) {
+    std::unique_lock<std::mutex> exitLock(m_mutex);
+    avsCommon::utils::logger::getConsoleLogger()->setLevel(avsCommon::utils::logger::Level::DEBUG9);
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, DOCUMENT_APL_PAYLOAD, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockAPLObserver, onRenderDocument(_, _, APL_TOKEN, WINDOW_ID, _, NAMESPACE, _, _, _, m_aplCA))
+        .Times(Exactly(1))
+        .WillRepeatedly(
+            InvokeWithoutArgs([this] { m_APLCATest->recordRenderComplete(std::chrono::steady_clock::now()); }));
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_executor->waitForSubmittedTasks();
+    EXPECT_CALL(*m_mockVisualStateProvider, provideState(_, _)).Times(Exactly(1));
+    m_APLCATest->processRenderDocumentResult(APL_TOKEN, true, "");
+    m_executor->waitForSubmittedTasks();
+
+    // At least one state request will come as a result of rendering, depending on timing a second one may be made
+    // by the state reporter
+    EXPECT_CALL(*m_mockVisualStateProvider, provideState(_, _)).Times(Between(1, 2));
+    m_APLCATest->provideState(DOCUMENT, STATE_REQUEST_TOKEN);
+    m_executor->waitForSubmittedTasks();
+
+    // Expect a state reponse for the original provideState request
+    EXPECT_CALL(*m_mockContextManager, provideStateResponse(_, _, _)).Times(Exactly(1));
+    auto payload = createVisualContextPayload(APL_TOKEN, "test", "{ 1 }", "{}");
+    m_APLCATest->onVisualContextAvailable(STATE_REQUEST_TOKEN, payload);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_mockVisualStateProvider, provideState(_, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockContextManager, provideStateResponse(_, _, _)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockContextManager, reportStateChange(_, _, _)).Times(Exactly(1));
+    // Now wait, and we should get a proactive state change following a different request
+    m_contextTrigger.wait_for(exitLock, std::chrono::milliseconds(400));
+
+    auto payload2 = createVisualContextPayload(APL_TOKEN, "test", "{ 2 }", "{}");
+    m_APLCATest->onVisualContextAvailable(PROACTIVE_STATE_REQUEST_TOKEN, payload2);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(BaseAPLCapabilityAgentTest, testAPLProactiveStateReportNotSentIfRenderingNotComplete) {
+    avsCommon::utils::logger::getConsoleLogger()->setLevel(avsCommon::utils::logger::Level::DEBUG9);
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, DOCUMENT_APL_PAYLOAD, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockAPLObserver, onRenderDocument(_, _, APL_TOKEN, WINDOW_ID, _, NAMESPACE, _, _, _, m_aplCA))
+        .Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_executor->waitForSubmittedTasks();
+
+    m_APLCATest->processRenderDocumentResult(APL_TOKEN, true, "");
+    m_executor->waitForSubmittedTasks();
+
+    // At least one state request will come as a result of rendering, depending on timing a second one may be made
+    // by the state reporter
+    EXPECT_CALL(*m_mockVisualStateProvider, provideState(_, STATE_REQUEST_TOKEN)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockVisualStateProvider, provideState(_, PROACTIVE_STATE_REQUEST_TOKEN)).Times(Exactly(0));
+    m_APLCATest->provideState(DOCUMENT, STATE_REQUEST_TOKEN);
+    m_executor->waitForSubmittedTasks();
+
+    // Expect a state reponse for the original provideState request
+    EXPECT_CALL(*m_mockContextManager, provideStateResponse(_, _, STATE_REQUEST_TOKEN)).Times(Exactly(1));
+    auto payload = createVisualContextPayload(APL_TOKEN, "test", "{ 1 }", "{}");
+    m_APLCATest->onVisualContextAvailable(STATE_REQUEST_TOKEN, payload);
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Checks that the timestamp for the directive is recorded and passed on correctly
+ */
+TEST_F(BaseAPLCapabilityAgentTest, testRenderDocumentReceivedTimestamp) {
+    avsCommon::utils::logger::getConsoleLogger()->setLevel(avsCommon::utils::logger::Level::DEBUG9);
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(DOCUMENT.nameSpace, DOCUMENT.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, DOCUMENT_APL_PAYLOAD, attachmentManager, "");
+
+    auto startTime = std::chrono::steady_clock::now();
+
+    EXPECT_CALL(*m_mockAPLObserver, onRenderDocument(_, _, APL_TOKEN, WINDOW_ID, _, NAMESPACE, _, _, _, m_aplCA))
+        .Times(1)
+        .WillRepeatedly(Invoke(
+            [startTime](
+                const std::string& document,
+                const std::string& datasource,
+                const aplCapabilityCommonInterfaces::PresentationToken& token,
+                const std::string& windowId,
+                const aplCapabilityCommonInterfaces::APLTimeoutType timeoutType,
+                const std::string& interfaceName,
+                const std::string& supportedViewports,
+                const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+                const std::chrono::steady_clock::time_point& receiveTime,
+                std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> agent) {
+                auto endTime = std::chrono::steady_clock::now();
+                ASSERT_GE(receiveTime, startTime);
+                ASSERT_LE(receiveTime, endTime);
+            }));
+
+    m_APLCATest->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_APLCATest->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_executor->waitForSubmittedTasks();
+}
+
+}  // namespace test
+}  // namespace aplCapabilityCommon
+}  // namespace alexaClientSDK
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommon/test/CMakeLists.txt b/capabilities/APLCapabilityCommon/APLCapabilityCommon/test/CMakeLists.txt
new file mode 100644
index 0000000000..7a1a0d2689
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommon/test/CMakeLists.txt
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+  
+set(INCLUDE_PATH
+    "${AVSCommon_INCLUDE_DIRS}"
+    "${AVSCommon_SOURCE_DIR}/AVS/test"
+    "${AVSCommon_SOURCE_DIR}/Utils/test"
+    "${AVSCommon_SOURCE_DIR}/SDKInterfaces/test"
+    "${acsdkAPLCapabilityCommon_SOURCE_DIR}/include"
+    "${ASDK_INCLUDE_DIRS}")
+
+set(LIBS
+        "AVSCommon"
+        "AVSCommonTestLib"
+        "SDKInterfacesTests"
+        "AttachmentCommonTestLib"
+        "acsdkAPLCapabilityCommon"
+        "acsdkPresentationOrchestratorInterfaces"
+        "acsdkAPLCapabilityCommonInterfaces"
+        "acsdkAPLCapabilityCommonInterfacesTestUtils"
+)
+discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/CMakeLists.txt b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..61654b782e
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAPLCapabilityCommonInterfaces LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_library(acsdkAPLCapabilityCommonInterfaces INTERFACE)
+
+target_include_directories(acsdkAPLCapabilityCommonInterfaces INTERFACE include)
+target_link_libraries(acsdkAPLCapabilityCommonInterfaces INTERFACE acsdkPresentationOrchestratorInterfaces)
+
+add_subdirectory("test")
+
+# install interface
+asdk_install_interface()
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentInterface.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentInterface.h
new file mode 100644
index 0000000000..3102a75855
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentInterface.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_APLCAPABILITYAGENTINTERFACE_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_APLCAPABILITYAGENTINTERFACE_H_
+
+#include <chrono>
+#include <memory>
+#include <string>
+
+#include <AVSCommon/SDKInterfaces/ContextRequestToken.h>
+#include <AVSCommon/SDKInterfaces/GUIActivityEvent.h>
+
+#include "PresentationSession.h"
+#include "APLEventPayload.h"
+#include "PresentationToken.h"
+#include "APLCommandExecutionEvent.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+/**
+ * Defines a Contract for clients to communicate with the APL Capability agent.
+ */
+class APLCapabilityAgentInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~APLCapabilityAgentInterface() = default;
+
+    /**
+     * This function notifies the APL CA that the active document has been replaced.
+     * @note A change to the active document does not indicate that the previous document was dismissed.
+     * @param token The new active document token
+     * @param session The new presentation session
+     */
+    virtual void onActiveDocumentChanged(const PresentationToken& token, const PresentationSession& session) = 0;
+
+    /**
+     * This function clears last received @c ExecuteCommands directive (if it's still active) and mark them as failed.
+     * @param token The token. This should be passed in if we are clearing execute commands due to APL-specific trigger
+     * (eg. Finish command). This should be left empty if we are clearing due to global triggers (eg. back navigation)
+     * @param markAsFailed Whether to mark the cleared commands as failed.
+     */
+    virtual void clearExecuteCommands(
+        const PresentationToken& token = std::string(),
+        const bool markAsFailed = true) = 0;
+
+    /**
+     * Send @c UserEvent to AVS
+     *
+     * @param payload The @c UserEvent event payload. The caller of this
+     * function is responsible to pass the payload as it defined in @c aplEventPayload::UserEvent.
+     */
+    virtual void sendUserEvent(const aplEventPayload::UserEvent& payload) = 0;
+
+    /**
+     * Send @c DataSourceFetchRequest to AVS
+     *
+     * @param payload The @c DataSourceFetchRequest event payload. The caller of this
+     * function is responsible to pass the payload as it defined in @c aplEventPayload::DataSourceFetch.
+     */
+    virtual void sendDataSourceFetchRequestEvent(const aplEventPayload::DataSourceFetch& payload) = 0;
+
+    /**
+     * Send @c RuntimeError to AVS
+     *
+     * @param payload The @c RuntimeError event payload. The caller of this
+     * function is responsible to pass the payload as it defined in @c aplEventPayload::RuntimeError.
+     */
+    virtual void sendRuntimeErrorEvent(const aplEventPayload::RuntimeError& payload) = 0;
+
+    /**
+     * This function is called by the clients to provide the visual context to be passed to AVS.
+     * @param requestToken The token of the request for which this function is called. This should match the request
+     * token provided in @c VisualStateProviderInterface
+     * @param context The visual state to be passed to AVS. The caller of this
+     * function is responsible to pass the payload as it defined in @c aplEventPayload::VisualContext
+     */
+    virtual void onVisualContextAvailable(
+        avsCommon::sdkInterfaces::ContextRequestToken requestToken,
+        const aplEventPayload::VisualContext& visualContext) = 0;
+
+    /**
+     * Process result of RenderDocument directive.
+     *
+     * @param token document presentationToken.
+     * @param result rendering result (true on rendered, false on exception).
+     * @param error error message provided in case if result is false
+     */
+    virtual void processRenderDocumentResult(
+        const PresentationToken& token,
+        const bool result,
+        const std::string& error) = 0;
+
+    /**
+     * Process result of ExecuteCommands directive.
+     *
+     * @param token request token
+     * @param event the command result as defined in @c APLCommandExecutionEvent
+     * @param error error message provided in case if result is false
+     */
+    virtual void processExecuteCommandsResult(
+        const PresentationToken& token,
+        APLCommandExecutionEvent event,
+        const std::string& error) = 0;
+
+    /**
+     * Record the finish event for currently rendering document
+     * @param timestamp The timestamp at which the document was rendered
+     */
+    virtual void recordRenderComplete(const std::chrono::steady_clock::time_point& timestamp) = 0;
+
+    /**
+     * The function notifies the CA to initiate a proactive state report
+     */
+    virtual void proactiveStateReport() = 0;
+};
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_APLCAPABILITYAGENTINTERFACE_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentNotifierInterface.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentNotifierInterface.h
new file mode 100644
index 0000000000..99ef45e77d
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentNotifierInterface.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_APLCAPABILITYAGENTNOTIFIERINTERFACE_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_APLCAPABILITYAGENTNOTIFIERINTERFACE_H_
+
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
+
+#include "APLCapabilityAgentObserverInterface.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+/**
+ * Interface for registering to observe APL directives.
+ */
+using APLCapabilityAgentNotifierInterface = notifierInterfaces::NotifierInterface<APLCapabilityAgentObserverInterface>;
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_APLCAPABILITYAGENTNOTIFIERINTERFACE_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentObserverInterface.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentObserverInterface.h
new file mode 100644
index 0000000000..19d65c0820
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentObserverInterface.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_APLCAPABILITYAGENTOBSERVERINTERFACE_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_APLCAPABILITYAGENTOBSERVERINTERFACE_H_
+
+#include <chrono>
+#include <string>
+
+#include "PresentationSession.h"
+#include "APLCapabilityAgentInterface.h"
+#include "APLTimeoutType.h"
+#include "PresentationToken.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+/**
+ * This @c APLCapabilityAgentObserverInterface class is used to notify observers when APL directive is received.
+ */
+class APLCapabilityAgentObserverInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~APLCapabilityAgentObserverInterface() = default;
+
+    /**
+     * Used to notify the observer when an APL document is ready to be rendered, typically in response
+     * to a Alexa.Presentation.APL.RenderDocument directive being received. Once called, the
+     * client should render the document based on the APL specification in the payload in structured JSON format.
+     *
+     * @note The payload may contain customer sensitive information and should be used with utmost care.
+     * Failure to do so may result in exposing or mishandling of customer data.
+     *
+     * @param document  JSON string containing APL document
+     * @param datasource  JSON string containing data payload associated with APL
+     * document
+     * @param token The APL presentation token associated with this payload.
+     * @param windowId The target windowId.
+     * @param timeoutType The @c APLTimeoutType associated with this payload.
+     * @param interfaceName The interface (namespace) which is associated with this directive.
+     * @param supportedViewports string containing the json value of supported viewports.
+     * @param presentationSession Configuration for presentation session
+     * displaying document
+     * @param receiveTime The time at which the directive was received, for more accurate telemetry.
+     * @param agent Pointer to the @c APLCapabilityAgentInterface notifying the observer.
+     */
+    virtual void onRenderDocument(
+        const std::string& document,
+        const std::string& datasource,
+        const PresentationToken& token,
+        const std::string& windowId,
+        const APLTimeoutType timeoutType,
+        const std::string& interfaceName,
+        const std::string& supportedViewports,
+        const PresentationSession& presentationSession,
+        const std::chrono::steady_clock::time_point& receiveTime,
+        std::shared_ptr<APLCapabilityAgentInterface> agent) = 0;
+
+    /**
+     * Used to notify observer when @c Alexa.Presentation.APL.ExecuteCommands directive has been received.
+     *
+     * @param jsonPayload The payload of the Alexa.Presentation.APL.ExecuteCommands directive in structured JSON format.
+     * @param token presentation token used in renderdocument
+     */
+    virtual void onExecuteCommands(const std::string& jsonPayload, const PresentationToken& token) = 0;
+
+    /**
+     * Used to notify observer when @c Alexa.Presentation.APL directives related to DataSource updates received.
+     *
+     * @param sourceType DataSource type.
+     * @param jsonPayload The payload of the directive in structured JSON format.
+     * @param token presentation token used in renderdocument
+     */
+    virtual void onDataSourceUpdate(
+        const std::string& sourceType,
+        const std::string& jsonPayload,
+        const PresentationToken& token) = 0;
+
+    /**
+     * Used to notify observer when a show document directive has been received for an existing presentation.
+     *
+     * @param token presentation token used in renderdocument
+     */
+    virtual void onShowDocument(const PresentationToken& token) = 0;
+};
+
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_APLCAPABILITYAGENTOBSERVERINTERFACE_H_
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLCommandExecutionEvent.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLCommandExecutionEvent.h
new file mode 100644
index 0000000000..67b278b009
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLCommandExecutionEvent.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_APLCOMMANDEXECUTIONEVENT_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_APLCOMMANDEXECUTIONEVENT_H_
+
+#include <chrono>
+
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+
+/// Enumeration of APL Command Execution Events that can be reported to the APL capability agent.
+enum class APLCommandExecutionEvent {
+    /// command sequence was resolved.
+    RESOLVED,
+
+    /// command sequence was terminated.
+    TERMINATED,
+
+    /// failed to parse/handle the command sequence.
+    FAILED
+};
+
+/**
+ * This is a function to convert the @c AplCommandExecutionEvent to a string.
+ */
+inline std::string commandExecutionEventToString(const APLCommandExecutionEvent event) {
+    switch (event) {
+        case APLCommandExecutionEvent::RESOLVED:
+            return "RESOLVED";
+        case APLCommandExecutionEvent::TERMINATED:
+            return "TERMINATED";
+        case APLCommandExecutionEvent::FAILED:
+            return "FAILED";
+    }
+    return "UNKNOWN";
+}
+
+/**
+ * This is a function to convert a string to a @c AplCommandExecutionEvent.
+ */
+inline APLCommandExecutionEvent stringToCommandExecutionEvent(const std::string& eventStr) {
+    if ("RESOLVED" == eventStr) {
+        return APLCommandExecutionEvent::RESOLVED;
+    } else if ("TERMINATED" == eventStr) {
+        return APLCommandExecutionEvent::TERMINATED;
+    } else if ("FAILED" == eventStr) {
+        return APLCommandExecutionEvent::FAILED;
+    }
+
+    return APLCommandExecutionEvent::FAILED;
+}
+
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_APLCOMMANDEXECUTIONEVENT_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLDocumentObserverInterface.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLDocumentObserverInterface.h
new file mode 100644
index 0000000000..16f339ac52
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLDocumentObserverInterface.h
@@ -0,0 +1,156 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_APLDOCUMENTOBSERVERINTERFACE_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_APLDOCUMENTOBSERVERINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include <AVSCommon/SDKInterfaces/ContextRequestToken.h>
+#include <AVSCommon/SDKInterfaces/GUIActivityEvent.h>
+
+#include "APLDocumentSessionInterface.h"
+#include "APLCommandExecutionEvent.h"
+#include "APLEventPayload.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+
+/**
+ * A @c APLDocumentObserverInterface allows for observing the lifecycle of
+ * rendered APL documents.
+ */
+class APLDocumentObserverInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~APLDocumentObserverInterface() = default;
+
+    /**
+     * Callback when document session is available.  Session may be stored to
+     * further influence the document being rendered.
+     * @param presentationSession The presentation session associated with this document session
+     * @param token presentationToken of document session available
+     * @param session DocumentSession object
+     */
+    virtual void onAPLDocumentSessionAvailable(
+        const PresentationSession& presentationSession,
+        const PresentationToken& token,
+        std::unique_ptr<APLDocumentSessionInterface>&& session) = 0;
+
+    /**
+     * Callback when document has finished displaying
+     * @param token presentationToken of document
+     */
+    virtual void onDocumentFinished(const PresentationToken& token) = 0;
+
+    /**
+     * Callback when the active document has changed
+     * @param token APL Token for the new active document
+     * @param session The @c PresentationSession for the new active document
+     */
+    virtual void onActiveDocumentChanged(const PresentationToken& token, const PresentationSession& session) = 0;
+
+    /**
+     * Callback when document rendering is complete
+     * @param token presentationToken of document
+     * @param result true if rendering was successful, false otherwise
+     * @param error error string if available
+     * @param timestamp The timestamp at which the document was rendered
+     */
+    virtual void onRenderDocumentComplete(
+        const PresentationToken& token,
+        bool result,
+        const std::string& error,
+        const std::chrono::steady_clock::time_point& timestamp) = 0;
+
+    /**
+     * Callback when execute command is complete
+     * @param token presentationToken of document
+     * @param result the command result as defined in @c APLCommandExecutionEvent
+     * @param error error string if available
+     */
+    virtual void onCommandExecutionComplete(
+        const PresentationToken& token,
+        APLCommandExecutionEvent result,
+        const std::string& error) = 0;
+
+    /**
+     * Callback when data source update is complete
+     * @param token presentationToken of document
+     * @param result true if successful, false otherwise
+     * @param error error string if availabled
+     */
+    virtual void onDataSourceUpdateComplete(const PresentationToken& token, bool result, const std::string& error) = 0;
+
+    /**
+     * Callback for send event request
+     *
+     * @param payload The @c UserEvent event payload. The caller of this
+     * function is responsible to pass the payload as it defined in @c aplEventPayload::UserEvent.
+     */
+    virtual void onSendEvent(const aplEventPayload::UserEvent& payload) = 0;
+
+    /**
+     * Callback to provide information about what is currently displayed on
+     * screen.  Should be provided to @c ContextManagerInterface in response to
+     * provideState calls.
+     *
+     * @param requestToken token correlating context to provideState request
+     * @param context The visual state to be passed to AVS. The caller of this
+     * function is responsible to pass the payload as it defined in @c aplEventPayload::VisualContext
+     */
+    virtual void onVisualContextAvailable(
+        const avsCommon::sdkInterfaces::ContextRequestToken requestToken,
+        const aplEventPayload::VisualContext& context) = 0;
+
+    /**
+     * Callback for data source fetch request
+     *
+     * @param payload The @c DataSourceFetchRequest event payload. The caller of this
+     * function is responsible to pass the payload as it defined in @c aplEventPayload::DataSourceFetch.
+     */
+    virtual void onDataSourceFetch(const aplEventPayload::DataSourceFetch& payload) = 0;
+
+    /**
+     * Callback when runtime error occurs in document
+     *
+     * @param payload The @c RuntimeError event payload. The caller of this
+     * function is responsible to pass the payload as it defined in @c aplEventPayload::RuntimeError.
+     */
+    virtual void onRuntimeError(const aplEventPayload::RuntimeError& payload) = 0;
+
+    /**
+     * Callback when a document session has ended
+     * @param presentationSession The session that was associated with this document session
+     */
+    virtual void onSessionEnded(const PresentationSession& presentationSession) = 0;
+
+    /**
+     * Callback when a document receives a GUI activity
+     * @param token presentationToken of document
+     * @param event The @c GUIActivityEvent event
+     */
+    virtual void onActivityEvent(
+        const PresentationToken& token,
+        const avsCommon::sdkInterfaces::GUIActivityEvent& event) = 0;
+};
+
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_APLDOCUMENTOBSERVERINTERFACE_H_
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLDocumentSessionInterface.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLDocumentSessionInterface.h
new file mode 100644
index 0000000000..40fe8ae255
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLDocumentSessionInterface.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_APLDOCUMENTSESSIONINTERFACE_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_APLDOCUMENTSESSIONINTERFACE_H_
+
+#include <chrono>
+#include <string>
+
+#include <AVSCommon/SDKInterfaces/ContextRequestToken.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationTypes.h>
+
+#include "PresentationSession.h"
+#include "PresentationOptions.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+
+/**
+ * A @c APLDocumentSessionInterface allows for controlling a previously rendered
+ * APL document. All methods except @c getToken() result in asynchronous
+ * operations so @c APLDocumentObserverInterface implementations should be used
+ * for monitoring the success of method calls.
+ */
+class APLDocumentSessionInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~APLDocumentSessionInterface() = default;
+
+    /**
+     * Dismiss APL document.  No other functions can be called after this
+     */
+    virtual void clearDocument() = 0;
+
+    /**
+     * Execute commands referenced in APL document
+     * @param commands JSON string containing APL command to execute
+     */
+    virtual void executeCommands(const std::string& commands) = 0;
+
+    /**
+     * Update the data source payload for a given APL document
+     * @param sourceType APL spec source type for data update
+     * @param payload JSON string containing update payload
+     */
+    virtual void dataSourceUpdate(const std::string& sourceType, const std::string& payload) = 0;
+
+    /**
+     * Interrupt any active command sequence currently executing on the document
+     */
+    virtual void interruptCommandSequence() = 0;
+
+    /**
+     * Provide visual context to onVisualContextAvailable observer callback
+     * @param stateRequestToken provided by StateProviderInterface call
+     */
+    virtual void provideDocumentContext(const avsCommon::sdkInterfaces::ContextRequestToken stateRequestToken) = 0;
+
+    /**
+     * Request active document session to move to the foreground if not already
+     * there.
+     */
+    virtual void requestForeground() = 0;
+
+    /**
+     * Update the timeout policy for document session.  Will reset any active
+     * timeout timer.
+     * @param timeout updated timeout duration, use a value of -1 to disable the timeout
+     */
+    virtual void updateTimeout(std::chrono::milliseconds timeout) = 0;
+
+    /**
+     * Stop any active timeout timer.
+     */
+    virtual void stopTimeout() = 0;
+
+    /**
+     * Reset a timeout timer based on configured timeout policy.
+     */
+    virtual void resetTimeout() = 0;
+
+    /**
+     * Update the @c PresentationLifespan for document session.
+     * @param lifespan @c PresentationLifespan
+     */
+    virtual void updateLifespan(presentationOrchestratorInterfaces::PresentationLifespan lifespan) = 0;
+
+    /**
+     * Get presentation token of this document session.  Can be used for sharing
+     * @c APLDocumentObserverInterface instances across multiple documents.
+     */
+    virtual PresentationToken getToken() const = 0;
+
+    /**
+     * Check if document session is foreground focused
+     * @return true if session is foreground focused, false otherwise
+     */
+    virtual bool isForegroundFocused() = 0;
+};
+
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_APLDOCUMENTSESSIONINTERFACE_H_
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLEventPayload.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLEventPayload.h
new file mode 100644
index 0000000000..8f14d9c71e
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLEventPayload.h
@@ -0,0 +1,236 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_APLEVENTPAYLOAD_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_APLEVENTPAYLOAD_H_
+
+#include <string>
+
+#include "PresentationToken.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+namespace aplEventPayload {
+
+/**
+ * Represents a request for the clients to publish a user event to AVS. See
+ * https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/presentation-apl.html#userevent
+ * for description of the properties
+ */
+struct UserEvent {
+    /// The presentation token for the document requesting the event
+    PresentationToken token;
+    /// Array of argument data to pass to Alexa
+    std::string arguments;
+    /// meta-information about the event trigger
+    std::string source;
+    /// The values of the components for all component IDs.
+    std::string components;
+
+/// GCC 4.x and 5.x reached end of support before some of c++11 amendments were made. In particular, these compilers
+/// do not have default constructors for list initialization from aggregates. This issue has been addressed in GCC 6.x.
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 6)
+    /**
+     * Explicit constructor with parameters.
+     *
+     * This constructor is required only for GCC before version 6.x.
+     *
+     * @param[in] token      The presentation token for the document requesting the event
+     * @param[in] arguments  Array of argument data to be passed to Alexa
+     * @param[in] source     Meta-information about the event trigger
+     * @param[in] components The values of the components for all component IDs.
+     *
+     * @see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+     */
+    UserEvent(PresentationToken token, std::string arguments, std::string source, std::string components) :
+            token{token},
+            arguments{arguments},
+            source{source},
+            components{components} {
+    }
+    /**
+     * Explicit copy constructor
+     *
+     * This constructor is required only for GCC before version 6.x.
+     *
+     * @param[in] params Source parameters.
+     *
+     * @see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+     */
+    UserEvent(const UserEvent& params) :
+            token{params.token},
+            arguments{params.arguments},
+            source{params.source},
+            components{params.components} {
+    }
+#endif
+};
+
+/**
+ * Represents a request for the clients to publish DataSource fetch request to AVS. Refer to
+ * https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/presentation-apl.html for more
+ * information on the payload
+ */
+struct DataSourceFetch {
+    /// The presentation token for the document requesting the event
+    PresentationToken token;
+    /// Type of datasource that requests a fetch
+    std::string dataSourceType;
+    /// implementation specific (SendIndexListData, UpdateIndexListData, SendTokenListData) fetch request from APL Core
+    std::string fetchPayload;
+
+/// GCC 4.x and 5.x reached end of support before some of c++11 amendments were made. In particular, these compilers
+/// do not have default constructors for list initialization from aggregates. This issue has been addressed in GCC 6.x.
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 6)
+    /**
+     * Explicit constructor with parameters.
+     *
+     * This constructor is required only for GCC before version 6.x.
+     *
+     * @param[in] token           The presentation token for the document requesting the event
+     * @param[in] dataSourceType  Type of datasource that requests a fetch
+     * @param[in] fetchPayload    Implementation specific (SendIndexListData, UpdateIndexListData, SendTokenListData)
+     * fetch request from APL Core
+     *
+     * @see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+     */
+    DataSourceFetch(PresentationToken token, std::string dataSourceType, std::string fetchPayload) :
+            token{token},
+            dataSourceType{dataSourceType},
+            fetchPayload{fetchPayload} {
+    }
+    /**
+     * Explicit copy constructor
+     *
+     * This constructor is required only for GCC before version 6.x.
+     *
+     * @param[in] params Source parameters.
+     *
+     * @see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+     */
+    DataSourceFetch(const DataSourceFetch& params) :
+            token{params.token},
+            dataSourceType{params.dataSourceType},
+            fetchPayload{params.fetchPayload} {
+    }
+#endif
+};
+
+/**
+ * Represents a request for the clients to publish RuntimeError event to AVS.
+ * See https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/presentation-apl.html#runtimeerror
+ * for the description the payload
+ */
+struct RuntimeError {
+    /// The presentation token for the document requesting the event
+    PresentationToken token;
+    /// error payload when APL processing encounters an error
+    std::string errors;
+
+/// GCC 4.x and 5.x reached end of support before some of c++11 amendments were made. In particular, these compilers
+/// do not have default constructors for list initialization from aggregates. This issue has been addressed in GCC 6.x.
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 6)
+    /**
+     * Explicit constructor with parameters.
+     *
+     * This constructor is required only for GCC before version 6.x.
+     *
+     * @param[in] token   The presentation token for the document requesting the event
+     * @param[in] errors  Error payload when APL processing encounters an error
+     *
+     * @see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+     */
+    RuntimeError(PresentationToken token, std::string errors) : token{token}, errors{errors} {
+    }
+    /**
+     * Explicit copy constructor
+     *
+     * This constructor is required only for GCC before version 6.x.
+     *
+     * @param[in] params Source parameters.
+     *
+     * @see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+     */
+    RuntimeError(const RuntimeError& params) : token{params.token}, errors{params.errors} {
+    }
+#endif
+};
+
+/**
+ * Represents a request for the clients to publish RenderDocumentState event to AVS.
+ * See https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/presentation-apl.html#rendereddocumentstate
+ * for the description the payload
+ */
+struct VisualContext {
+    /// The presentation token for the document requesting visual context
+    PresentationToken token;
+    // the version of the UI component on the device
+    std::string version;
+    /// serialized visual context obtained from APL Core
+    std::string visualContext;
+    /// serialized datasource context obtained from APL Core
+    std::string datasourceContext;
+
+/// GCC 4.x and 5.x reached end of support before some of c++11 amendments were made. In particular, these compilers
+/// do not have default constructors for list initialization from aggregates. This issue has been addressed in GCC 6.x.
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 6)
+    /**
+     * Explicit constructor with parameters.
+     *
+     * This constructor is required only for GCC before version 6.x.
+     *
+     * @param[in] token             The presentation token for the document requesting the event
+     * @param[in] version           The version of the UI component on the device
+     * @param[in] visualContext     Serialized visual context obtained from APL Core
+     * @param[in] datasourceContext Serialized datasource context obtained from APL Core
+     *
+     * @see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+     */
+    VisualContext(
+        PresentationToken token,
+        std::string version,
+        std::string visualContext,
+        std::string datasourceContext) :
+            token{token},
+            version{version},
+            visualContext{visualContext},
+            datasourceContext{datasourceContext} {
+    }
+    /**
+     * Explicit copy constructor
+     *
+     * This constructor is required only for GCC before version 6.x.
+     *
+     * @param[in] params Source parameters.
+     *
+     * @see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+     */
+    VisualContext(const VisualContext& params) :
+            token{params.token},
+            version{params.version},
+            visualContext{params.visualContext},
+            datasourceContext{params.datasourceContext} {
+    }
+#endif
+};
+
+}  // namespace aplEventPayload
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_APLEVENTPAYLOAD_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLRuntimeInterface.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLRuntimeInterface.h
new file mode 100644
index 0000000000..a89fcfa6a2
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLRuntimeInterface.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_APLRUNTIMEINTERFACE_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_APLRUNTIMEINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include "APLDocumentObserverInterface.h"
+#include "PresentationOptions.h"
+#include "PresentationSession.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+
+/**
+ * A @c APLRuntimeInterface allows for rendering and controlling APL content.
+ * A @c APLRuntimeInterface implementation may handle rendering multiple
+ * documents concurrently or sequentially with each document being uniquely
+ * identified by a presentation token in the @c presentationOptions struct.
+ *
+ * Document lifecycle events can be tracked by a @c APLDocumentObserverInterface
+ * observer provided in the @c renderDocument API call.  Only events for the
+ * document the caller provided will be driven to the observer.  To see
+ * descriptions of these document events, please refer to the documentation of
+ * each method on the observer.
+ *
+ * The @c onAPLDocumentSessionAvailable() method in the observer can be used to
+ * capture a @c APLDocumentSessionInterface.  This session object can be used to
+ * control the document (i.e. @c executeCommands(), @c clearDocument() ). Status
+ * responses for session control calls are provided in @c
+ * APLDocumentObserverInterface methods.
+ *
+ * @note An @c APLRuntimeInterface implementation must be able to support the
+ * various capabilities listed at:
+ * https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/presentation-apl.html.
+ */
+class APLRuntimeInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~APLRuntimeInterface() = default;
+
+    /**
+     * Render an APL document with associated metdata.  Payloads must comply with
+     * the latest APL spec supported on the platform the caller is using.  See @c
+     * getMaxAPLVersion() method for querying support on the platform.
+     * @param document  JSON string containing APL document
+     * @param data  JSON string containing data payload associated with APL
+     * document
+     * @param presentationSession Configuration for presentation session
+     * displaying document
+     * @param presentationOptions Configuration for presentation displaying
+     * document
+     * @param observer @c APLDocumentObserverInterface observer for monitoring
+     * document lifecycle events
+     */
+    virtual void renderDocument(
+        const std::string& document,
+        const std::string& data,
+        const PresentationSession& presentationSession,
+        const PresentationOptions& presentationOptions,
+        std::shared_ptr<APLDocumentObserverInterface> observer) = 0;
+
+    /**
+     * Get the maximum APL Version currently supported on this device. See the
+     * following for descriptions of the various APL Version Specifications:
+     * https://developer.amazon.com/en-US/docs/alexa/alexa-presentation-language/apl-latest-version.html
+     * @return string representation of APL Specification Version
+     */
+    virtual std::string getMaxAPLVersion() const = 0;
+};
+
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_APLRUNTIMEINTERFACE_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLTimeoutType.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLTimeoutType.h
new file mode 100644
index 0000000000..29881cc961
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLTimeoutType.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_APLTIMEOUTTYPE_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_APLTIMEOUTTYPE_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+
+/**
+ * Strongly-typed timeoutType as defined in the API specification
+ * https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/presentation-apl.html#renderdocument
+ */
+enum class APLTimeoutType { SHORT, TRANSIENT, LONG };
+
+static inline alexaClientSDK::avsCommon::utils::Optional<APLTimeoutType> convertToTimeoutType(
+    const std::string& timeoutTypeStr) {
+    alexaClientSDK::avsCommon::utils::Optional<APLTimeoutType> timeoutType;
+
+    if (timeoutTypeStr == "SHORT") {
+        timeoutType.set(APLTimeoutType::SHORT);
+    } else if (timeoutTypeStr == "LONG") {
+        timeoutType.set(APLTimeoutType::LONG);
+    } else if (timeoutTypeStr == "TRANSIENT") {
+        timeoutType.set(APLTimeoutType::TRANSIENT);
+    }
+
+    return timeoutType;
+};
+
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_APLTIMEOUTTYPE_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLVideoConfiguration.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLVideoConfiguration.h
new file mode 100644
index 0000000000..22a16691d6
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/APLVideoConfiguration.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_APLVIDEOCONFIGURATION_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_APLVIDEOCONFIGURATION_H_
+
+#include <set>
+#include <string>
+
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+/**
+ * Video-related settings in Alexa.Presentation.APL.Video interface
+ * https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/presentation-apl-video.html
+ */
+struct VideoSettings {
+    /// Enum class defining the supported video codecs
+    enum class Codec {
+        /// H.264 at a maximum resolution of 1080p @ 30fps (codec level 4.1)
+        H_264_41,
+
+        /// H.264 at a maximum resolution of 1080p @ 60fps (codec level 4.2)
+        H_264_42
+    };
+
+    /// A collection of one or more supported codecs by the device.
+    std::set<Codec> codecs;
+
+    /**
+     * Converts Codec enum to string
+     * @param codec Codec enum value
+     * @return String representing enum value
+     */
+    static const std::string codecToString(const Codec codec) {
+        switch (codec) {
+            case Codec::H_264_41:
+                return "H_264_41";
+            case Codec::H_264_42:
+                return "H_264_42";
+        }
+        return "";
+    }
+
+    /**
+     * Converts Codec string to enum value
+     * @param codec string
+     * @return Optional object with enum value corresponding to the string if found
+     */
+    static const alexaClientSDK::avsCommon::utils::Optional<Codec> stringToCodec(const std::string codec) {
+        alexaClientSDK::avsCommon::utils::Optional<Codec> codecOpt;
+        if (codec == "H_264_41") {
+            codecOpt.set(VideoSettings::Codec::H_264_41);
+        } else if (codec == "H_264_42") {
+            codecOpt.set(VideoSettings::Codec::H_264_42);
+        }
+        return codecOpt;
+    }
+};
+
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_APLVIDEOCONFIGURATION_H_
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/PresentationOptions.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/PresentationOptions.h
new file mode 100644
index 0000000000..0839c43716
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/PresentationOptions.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_PRESENTATIONOPTIONS_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_PRESENTATIONOPTIONS_H_
+
+#include <chrono>
+#include <string>
+#include <vector>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationTypes.h>
+
+#include "PresentationToken.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+
+struct PresentationOptions {
+    /// Window ID corresponding to a window reported in Alexa.Display
+    std::string windowId;
+
+    /// The timeout for the document
+    std::chrono::milliseconds timeout;
+
+    /// The presentation token that will be reported in Alexa.Display.WindowState
+    PresentationToken token;
+
+    /// Specifies the lifespan type for this presentation
+    presentationOrchestratorInterfaces::PresentationLifespan lifespan;
+
+    /// Supported viewports
+    std::string supportedViewports;
+
+    /// Specifies the timestamp when the request to render was received
+    std::chrono::steady_clock::time_point documentReceivedTimestamp;
+
+    /// The AVS namespace associated with this presentation
+    std::string interfaceName;
+};
+
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_PRESENTATIONOPTIONS_H_
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/PresentationSession.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/PresentationSession.h
new file mode 100644
index 0000000000..a4aa18787e
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/PresentationSession.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_PRESENTATIONSESSION_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_PRESENTATIONSESSION_H_
+
+#include <string>
+#include <vector>
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+
+struct GrantedExtension {
+    /// URI of extension to allow in document.  If the APL document requests an
+    /// extension that is not part of grantedExtensions list, extension will be
+    /// denied.
+    std::string uri;
+};
+
+struct AutoInitializedExtension {
+    /// URI of extension to auto initialize
+    std::string uri;
+
+    /// Extension settings for initializing the extension on the device.
+    std::string settings;
+};
+
+struct PresentationSession {
+    /// ID of skill that owns the presentation session.
+    std::string skillId;
+
+    /// Unique string identifying the instance of a skill.
+    std::string id;
+
+    /// List of extensions that are granted for use by this APL document
+    std::vector<GrantedExtension> grantedExtensions;
+
+    /// List of extensions that are initialized in the APL runtime for this
+    /// document.
+    std::vector<AutoInitializedExtension> autoInitializedExtensions;
+};
+
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_PRESENTATIONSESSION_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/PresentationToken.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/PresentationToken.h
new file mode 100644
index 0000000000..e89cb32e60
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/PresentationToken.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_PRESENTATIONTOKEN_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_PRESENTATIONTOKEN_H_
+#include <string>
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+
+/// Alias for the token used by APL directives
+using PresentationToken = std::string;
+
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_PRESENTATIONTOKEN_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/VisualStateProviderInterface.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/VisualStateProviderInterface.h
new file mode 100644
index 0000000000..80ce78c2d2
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/include/acsdk/APLCapabilityCommonInterfaces/VisualStateProviderInterface.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_VISUALSTATEPROVIDERINTERFACE_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_VISUALSTATEPROVIDERINTERFACE_H_
+
+#include <AVSCommon/SDKInterfaces/ContextRequestToken.h>
+
+#include "PresentationToken.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+
+/**
+ * A @c VisualStateProviderInterface may be any client component that provides
+ * updates on the visual context of the device.
+ */
+class VisualStateProviderInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~VisualStateProviderInterface() = default;
+
+    /**
+     * A request to a @c VisualStateProvider to provide the state.
+     * The requester specifies a token which the @c VisualStateProvider must use when it updates
+     * the state via the @c onVisualContextAvailable call to @c APL Capability Agent.
+     *
+     * @param token The token of the last displaying document to get the correct context in the @c
+     * onVisualContextAvailable call.
+     * @param stateRequestToken The token to use in the @c onVisualContextAvailable call.
+     */
+    virtual void provideState(
+        const PresentationToken& token,
+        const avsCommon::sdkInterfaces::ContextRequestToken stateRequestToken) = 0;
+};
+
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_VISUALSTATEPROVIDERINTERFACE_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/CMakeLists.txt b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/CMakeLists.txt
new file mode 100644
index 0000000000..188179e717
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.1)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_library(acsdkAPLCapabilityCommonInterfacesTestUtils INTERFACE)
+target_include_directories(acsdkAPLCapabilityCommonInterfacesTestUtils INTERFACE include)
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLCapabilityAgent.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLCapabilityAgent.h
new file mode 100644
index 0000000000..c9dd5fac41
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLCapabilityAgent.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLCAPABILITYAGENT_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLCAPABILITYAGENT_H_
+
+#include <gmock/gmock.h>
+
+#include "acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentInterface.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+namespace test {
+
+/**
+ * Mock class that implements APLCapabilityAgentInterface
+ */
+class MockAPLCapabilityAgent : public APLCapabilityAgentInterface {
+public:
+    MOCK_METHOD2(
+        onActiveDocumentChanged,
+        void(
+            const aplCapabilityCommonInterfaces::PresentationToken& token,
+            const alexaClientSDK::aplCapabilityCommonInterfaces::PresentationSession& session));
+    MOCK_METHOD2(
+        clearExecuteCommands,
+        void(const aplCapabilityCommonInterfaces::PresentationToken& token, const bool markAsFailed));
+    MOCK_METHOD1(sendUserEvent, void(const aplEventPayload::UserEvent& payload));
+    MOCK_METHOD1(sendDataSourceFetchRequestEvent, void(const aplEventPayload::DataSourceFetch& payload));
+    MOCK_METHOD1(sendRuntimeErrorEvent, void(const aplEventPayload::RuntimeError& payload));
+    MOCK_METHOD2(
+        onVisualContextAvailable,
+        void(
+            const avsCommon::sdkInterfaces::ContextRequestToken requestToken,
+            const aplEventPayload::VisualContext& visualContext));
+    MOCK_METHOD3(
+        processRenderDocumentResult,
+        void(const PresentationToken& token, const bool result, const std::string& error));
+    MOCK_METHOD3(
+        processExecuteCommandsResult,
+        void(const PresentationToken& token, APLCommandExecutionEvent event, const std::string& error));
+    MOCK_METHOD1(recordRenderComplete, void(const std::chrono::steady_clock::time_point& timestamp));
+    MOCK_METHOD0(proactiveStateReport, void());
+};
+
+}  // namespace test
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLCAPABILITYAGENT_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLCapabilityAgentObserver.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLCapabilityAgentObserver.h
new file mode 100644
index 0000000000..b03e598e13
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLCapabilityAgentObserver.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLCAPABILITYAGENTOBSERVER_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLCAPABILITYAGENTOBSERVER_H_
+
+#include <gmock/gmock.h>
+
+#include "acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentObserverInterface.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+namespace test {
+
+/// Mock of APLCapabilityAgentObserverInterface for testing.
+class MockAPLCapabilityAgentObserver : public APLCapabilityAgentObserverInterface {
+public:
+    MOCK_METHOD2(
+        onExecuteCommands,
+        void(const std::string& jsonPayload, const aplCapabilityCommonInterfaces::PresentationToken& token));
+    MOCK_METHOD10(
+        onRenderDocument,
+        void(
+            const std::string& document,
+            const std::string& datasource,
+            const aplCapabilityCommonInterfaces::PresentationToken& token,
+            const std::string& windowId,
+            const aplCapabilityCommonInterfaces::APLTimeoutType timeoutType,
+            const std::string& interfaceName,
+            const std::string& supportedViewports,
+            const aplCapabilityCommonInterfaces::PresentationSession& presentationSession,
+            const std::chrono::steady_clock::time_point& receiveTime,
+            std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> agent));
+    MOCK_METHOD3(
+        onDataSourceUpdate,
+        void(
+            const std::string& sourceType,
+            const std::string& jsonPayload,
+            const aplCapabilityCommonInterfaces::PresentationToken& token));
+    MOCK_METHOD1(onShowDocument, void(const aplCapabilityCommonInterfaces::PresentationToken& token));
+};
+
+}  // namespace test
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLCAPABILITYAGENTOBSERVER_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLDocumentObserver.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLDocumentObserver.h
new file mode 100644
index 0000000000..a7f94b3a2b
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLDocumentObserver.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLDOCUMENTOBSERVER_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLDOCUMENTOBSERVER_H_
+
+#include <gmock/gmock.h>
+
+#include "acsdk/APLCapabilityCommonInterfaces/APLCommandExecutionEvent.h"
+#include "acsdk/APLCapabilityCommonInterfaces/APLDocumentObserverInterface.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+namespace test {
+
+/**
+ * Mock class that implements APLDocumentObserverInterface
+ */
+class MockAPLDocumentObserver : public APLDocumentObserverInterface {
+public:
+    MOCK_METHOD3(
+        onAPLDocumentSessionAvailableTest,
+        void(
+            const PresentationSession& presentationSession,
+            const PresentationToken& token,
+            APLDocumentSessionInterface* session));
+    void onAPLDocumentSessionAvailable(
+        const PresentationSession& presentationSession,
+        const PresentationToken& token,
+        std::unique_ptr<APLDocumentSessionInterface>&& session) {
+        onAPLDocumentSessionAvailableTest(presentationSession, token, session.get());
+    }
+    MOCK_METHOD1(onDocumentFinished, void(const PresentationToken& token));
+    MOCK_METHOD2(
+        onActiveDocumentChanged,
+        void(
+            const PresentationToken& token,
+            const alexaClientSDK::aplCapabilityCommonInterfaces::PresentationSession& session));
+    MOCK_METHOD4(
+        onRenderDocumentComplete,
+        void(
+            const PresentationToken& token,
+            bool result,
+            const std::string& error,
+            const std::chrono::steady_clock::time_point& timestamp));
+    MOCK_METHOD3(
+        onCommandExecutionComplete,
+        void(const PresentationToken& token, APLCommandExecutionEvent result, const std::string& error));
+    MOCK_METHOD3(
+        onDataSourceUpdateComplete,
+        void(const PresentationToken& token, bool result, const std::string& error));
+    MOCK_METHOD2(
+        onVisualContextAvailable,
+        void(
+            const avsCommon::sdkInterfaces::ContextRequestToken requestToken,
+            const aplEventPayload::VisualContext& context));
+    MOCK_METHOD1(onDataSourceFetch, void(const aplEventPayload::DataSourceFetch& payload));
+    MOCK_METHOD1(onRuntimeError, void(const aplEventPayload::RuntimeError& payload));
+    MOCK_METHOD1(
+        onSessionEnded,
+        void(const alexaClientSDK::aplCapabilityCommonInterfaces::PresentationSession& presentationSession));
+    MOCK_METHOD2(
+        onActivityEvent,
+        void(const PresentationToken& token, const avsCommon::sdkInterfaces::GUIActivityEvent& event));
+};
+
+}  // namespace test
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLDOCUMENTOBSERVER_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLDocumentSession.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLDocumentSession.h
new file mode 100644
index 0000000000..370b927e89
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLDocumentSession.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLDOCUMENTSESSION_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLDOCUMENTSESSION_H_
+
+#include <gmock/gmock.h>
+
+#include "acsdk/APLCapabilityCommonInterfaces/APLDocumentSessionInterface.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+namespace test {
+
+/**
+ * Mock class that implements APLDocumentSessionInterface
+ */
+class MockAPLDocumentSession : public APLDocumentSessionInterface {
+public:
+    MOCK_METHOD0(clearDocument, void());
+    MOCK_METHOD1(executeCommands, void(const std::string& commands));
+    MOCK_METHOD2(dataSourceUpdate, void(const std::string& sourceType, const std::string& payload));
+    MOCK_METHOD0(interruptCommandSequence, void());
+    MOCK_METHOD1(provideDocumentContext, void(const avsCommon::sdkInterfaces::ContextRequestToken));
+    MOCK_METHOD0(requestForeground, void());
+    MOCK_METHOD1(updateTimeout, void(std::chrono::milliseconds timeout));
+    MOCK_METHOD0(stopTimeout, void());
+    MOCK_METHOD0(resetTimeout, void());
+    MOCK_METHOD1(updateLifespan, void(presentationOrchestratorInterfaces::PresentationLifespan lifespan));
+    MOCK_CONST_METHOD0(getToken, PresentationToken());
+    MOCK_METHOD0(isForegroundFocused, bool());
+};
+
+}  // namespace test
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLDOCUMENTSESSION_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLRuntime.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLRuntime.h
new file mode 100644
index 0000000000..9c66591cf2
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockAPLRuntime.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLRUNTIME_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLRUNTIME_H_
+
+#include <gmock/gmock.h>
+
+#include "acsdk/APLCapabilityCommonInterfaces/APLRuntimeInterface.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+namespace test {
+
+/**
+ * Mock class that implements APLRuntimeInterface
+ */
+class MockAPLRuntime : public APLRuntimeInterface {
+public:
+    MOCK_METHOD5(
+        renderDocument,
+        void(
+            const std::string& document,
+            const std::string& data,
+            const PresentationSession& presentationSession,
+            const PresentationOptions& presentationOptions,
+            std::shared_ptr<APLDocumentObserverInterface> observer));
+    MOCK_CONST_METHOD0(getMaxAPLVersion, std::string());
+};
+
+}  // namespace test
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKAPLRUNTIME_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockVisualStateProvider.h b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockVisualStateProvider.h
new file mode 100644
index 0000000000..3268af66f9
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/APLCapabilityCommonInterfaces/test/include/acsdk/APLCapabilityCommonInterfaces/MockVisualStateProvider.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKVISUALSTATEPROVIDER_H_
+#define ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKVISUALSTATEPROVIDER_H_
+
+#include <gmock/gmock.h>
+
+#include "acsdk/APLCapabilityCommonInterfaces/VisualStateProviderInterface.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityCommonInterfaces {
+namespace test {
+
+/**
+ * Mock of VisualStateProviderInterface for testing.
+ */
+class MockVisualStateProvider : public VisualStateProviderInterface {
+public:
+    MOCK_METHOD2(
+        provideState,
+        void(const PresentationToken& token, const avsCommon::sdkInterfaces::ContextRequestToken stateRequestToken));
+};
+
+}  // namespace test
+}  // namespace aplCapabilityCommonInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_APLCAPABILITYCOMMONINTERFACES_MOCKVISUALSTATEPROVIDER_H_
\ No newline at end of file
diff --git a/capabilities/APLCapabilityCommon/CMakeLists.txt b/capabilities/APLCapabilityCommon/CMakeLists.txt
new file mode 100644
index 0000000000..683d9d61b7
--- /dev/null
+++ b/capabilities/APLCapabilityCommon/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+
+add_subdirectory("APLCapabilityCommon")
+add_subdirectory("APLCapabilityCommonInterfaces")
diff --git a/capabilities/Alerts/acsdkAlerts/include/acsdkAlerts/Alert.h b/capabilities/Alerts/acsdkAlerts/include/acsdkAlerts/Alert.h
index 5363476384..dd97bd8bc4 100644
--- a/capabilities/Alerts/acsdkAlerts/include/acsdkAlerts/Alert.h
+++ b/capabilities/Alerts/acsdkAlerts/include/acsdkAlerts/Alert.h
@@ -308,6 +308,17 @@ class Alert
      */
     Alert::ContextInfo getContextInfo() const;
 
+    /**
+     * Create AlertInfo object for this alert with the specified state and reason.
+     * @param state state of the alertInfo, which is of different type from Alert.state
+     * @param reason reason for alert state change
+     *
+     * @return AlertInfo object for the alert with the specified state
+     */
+    acsdkAlertsInterfaces::AlertObserverInterface::AlertInfo createAlertInfo(
+        acsdkAlertsInterfaces::AlertObserverInterface::State state,
+        const std::string& reason = "") const;
+
     void onRendererStateChange(renderer::RendererObserverInterface::State state, const std::string& reason) override;
 
     /**
@@ -528,6 +539,13 @@ class Alert
      */
     std::string getTokenLocked() const;
 
+    /**
+     * Returns the state of the alert.
+     *
+     * @return The state of the alert.
+     */
+    Alert::State getStateLocked() const;
+
     /**
      * Returns the alert's scheduled time in Unix.
      *
@@ -564,6 +582,17 @@ class Alert
      */
     avsCommon::utils::Optional<std::string> getLabelLocked() const;
 
+    /**
+     * Returns the information of an alert with specified state
+     * @param state state of the alertInfo
+     * @param reason reason for alert state change
+     *
+     * @return AlertInfo object for the alert with the specified state
+     */
+    acsdkAlertsInterfaces::AlertObserverInterface::AlertInfo createAlertInfoLocked(
+        acsdkAlertsInterfaces::AlertObserverInterface::State state,
+        const std::string& reason = "") const;
+
     /**
      * Utility function to begin the alert's renderer in an unlocked context
      */
@@ -584,7 +613,13 @@ class Alert
      *
      * @return Whether alert is paused
      */
-    bool isAlertPaused() const;
+    bool isAlertPausedLocked() const;
+
+    /**
+     * Function to notify observer on AlertInfo change
+     */
+    void notifyObserver(acsdkAlertsInterfaces::AlertObserverInterface::State state, const std::string& reason = "")
+        const;
 
     /// The mutex that enforces thread safety for all member variables.
     mutable std::mutex m_mutex;
diff --git a/capabilities/Alerts/acsdkAlerts/include/acsdkAlerts/Storage/SQLiteAlertStorage.h b/capabilities/Alerts/acsdkAlerts/include/acsdkAlerts/Storage/SQLiteAlertStorage.h
index a67f08e269..341d771b2b 100644
--- a/capabilities/Alerts/acsdkAlerts/include/acsdkAlerts/Storage/SQLiteAlertStorage.h
+++ b/capabilities/Alerts/acsdkAlerts/include/acsdkAlerts/Storage/SQLiteAlertStorage.h
@@ -224,15 +224,6 @@ class SQLiteAlertStorage : public AlertStorageInterface {
      */
     bool migrateAlertsDbFromV2ToV3();
 
-    /**
-     * Store an alert to alerts v2 table.
-     *
-     * @param id The alert id of the alert to be stored.
-     * @param alert The alert to be stored.
-     * @return Whether storing the alert to v2 table succeeds.
-     */
-    bool storeAlertToV2(const int id, std::shared_ptr<Alert> alert);
-
     /**
      * Modify an alert in the databse.
      *
diff --git a/capabilities/Alerts/acsdkAlerts/src/Alert.cpp b/capabilities/Alerts/acsdkAlerts/src/Alert.cpp
index c617534062..ca8deef6d5 100644
--- a/capabilities/Alerts/acsdkAlerts/src/Alert.cpp
+++ b/capabilities/Alerts/acsdkAlerts/src/Alert.cpp
@@ -349,7 +349,9 @@ void Alert::setFocusState(FocusState focusState, MixingBehavior behavior) {
             startRendererLocked();
         } else {
             m_startRendererAgainAfterFullStop = true;
-            m_renderer->stop();
+            if (m_renderer) {
+                m_renderer->stop();
+            }
         }
     }
 }
@@ -410,24 +412,22 @@ void Alert::activate() {
 
 void Alert::deactivate(StopReason reason) {
     ACSDK_DEBUG9(LX("deactivate").d("reason", reason));
-    std::lock_guard<std::mutex> lock(m_mutex);
+    std::unique_lock<std::mutex> lock(m_mutex);
 
     m_dynamicData.state = Alert::State::STOPPING;
     m_stopReason = reason;
     m_maxLengthTimer.stop();
 
-    if (isAlertPaused()) {
+    if (isAlertPausedLocked()) {
         m_dynamicData.state = Alert::State::STOPPED;
-        m_observer->onAlertStateChange(AlertObserverInterface::AlertInfo(
-            getTokenLocked(),
-            getType(),
-            AlertObserverInterface::State::STOPPED,
-            getScheduledTime_Utc_TimePointLocked(),
-            getOriginalTimeLocked(),
-            getLabelLocked()));
+        lock.unlock();
+        notifyObserver(AlertObserverInterface::State::STOPPED);
+        lock.lock();
     }
 
-    m_renderer->stop();
+    if (m_renderer) {
+        m_renderer->stop();
+    }
 }
 
 void Alert::getAlertData(StaticData* staticData, DynamicData* dynamicData) const {
@@ -513,19 +513,20 @@ bool Alert::setAlertData(StaticData* staticData, DynamicData* dynamicData) {
 }
 
 void Alert::onRendererStateChange(RendererObserverInterface::State state, const std::string& reason) {
+    std::unique_lock<std::mutex> lock(m_mutex);
+
     ACSDK_INFO(LX("onRendererStateChange")
                    .d("state", state)
                    .d("reason", reason)
                    .d("m_hasTimerExpired", m_hasTimerExpired)
-                   .d("m_dynamicData.state", m_dynamicData.state));
-    ACSDK_DEBUG1(LX("onRendererStateChange").d("token", getToken()));
+                   .d("m_dynamicData.state", getStateLocked()));
+    ACSDK_DEBUG1(LX("onRendererStateChange").d("token", getTokenLocked()));
 
     bool shouldNotifyObserver = false;
     bool shouldRetryRendering = false;
     AlertObserverInterface::State notifyState = AlertObserverInterface::State::ERROR;
     std::string notifyReason;
 
-    std::unique_lock<std::mutex> lock(m_mutex);
     auto observerCopy = m_observer;
 
     switch (state) {
@@ -538,14 +539,18 @@ void Alert::onRendererStateChange(RendererObserverInterface::State state, const
                 // Having a Renderer start when our state is stopped means a runaway alarm.
                 // This shouldn't ever happen, but this will save us in the case it does.
                 ACSDK_ERROR(LX("onRendererStateChange").m("Renderer started but alert is STOPPED. Stop the Renderer"));
-                m_renderer->stop();
+                if (m_renderer) {
+                    m_renderer->stop();
+                }
             } else if (State::ACTIVATING == m_dynamicData.state) {
                 // a focus change can happen in the middle of alert activation. We don't want to stop a
                 // renderer during activation to avoid mediaplayer errors.
                 if (m_focusChangedDuringAlertActivation) {
                     m_focusChangedDuringAlertActivation = false;
                     shouldRetryRendering = true;
-                    m_renderer->stop();
+                    if (m_renderer) {
+                        m_renderer->stop();
+                    }
                 } else {
                     shouldNotifyObserver = true;
                     notifyState = AlertObserverInterface::State::STARTED;
@@ -624,14 +629,7 @@ void Alert::onRendererStateChange(RendererObserverInterface::State state, const
     lock.unlock();
 
     if (shouldNotifyObserver && observerCopy) {
-        auto alertInfo = AlertObserverInterface::AlertInfo(
-            getToken(),
-            getType(),
-            notifyState,
-            getScheduledTime_Utc_TimePoint(),
-            getOriginalTime(),
-            getLabel(),
-            notifyReason);
+        auto alertInfo = createAlertInfo(notifyState, notifyReason);
         observerCopy->onAlertStateChange(alertInfo);
     }
 
@@ -701,6 +699,10 @@ avsCommon::utils::Optional<std::string> Alert::getLabelLocked() const {
 
 Alert::State Alert::getState() const {
     std::lock_guard<std::mutex> lock(m_mutex);
+    return getStateLocked();
+}
+
+Alert::State Alert::getStateLocked() const {
     return m_dynamicData.state;
 }
 
@@ -729,7 +731,7 @@ bool Alert::updateScheduledTime(const std::string& newScheduledTime) {
 }
 
 bool Alert::snooze(const std::string& updatedScheduledTime) {
-    std::lock_guard<std::mutex> lock(m_mutex);
+    std::unique_lock<std::mutex> lock(m_mutex);
 
     if (!m_dynamicData.timePoint.setTime_ISO_8601(updatedScheduledTime)) {
         ACSDK_ERROR(LX("snoozeFailed").d("reason", "setTimeFailed").d("updatedScheduledTime", updatedScheduledTime));
@@ -739,19 +741,16 @@ bool Alert::snooze(const std::string& updatedScheduledTime) {
     m_dynamicData.state = State::SNOOZING;
     m_maxLengthTimer.stop();
 
-    if (isAlertPaused()) {
+    if (isAlertPausedLocked()) {
         m_dynamicData.state = Alert::State::SNOOZED;
-        m_observer->onAlertStateChange(AlertObserverInterface::AlertInfo(
-            getTokenLocked(),
-            getType(),
-            AlertObserverInterface::State::SNOOZED,
-            getScheduledTime_Utc_TimePointLocked(),
-            getOriginalTimeLocked(),
-            getLabelLocked()));
+        lock.unlock();
+        notifyObserver(AlertObserverInterface::State::SNOOZED);
+        lock.lock();
     }
 
-    m_renderer->stop();
-
+    if (m_renderer) {
+        m_renderer->stop();
+    }
     return true;
 }
 
@@ -799,7 +798,7 @@ void Alert::startRendererLocked() {
     ACSDK_DEBUG5(LX("startRenderer"));
     std::vector<std::string> urls;
 
-    if (isAlertPaused()) {
+    if (isAlertPausedLocked()) {
         ACSDK_INFO(
             LX("startRenderer early exit due to focus being in background, and mixing behavior being MUST_PAUSE"));
         return;
@@ -843,29 +842,29 @@ void Alert::startRendererLocked() {
             settings::types::isEnabled(alarmVolumeRampSetting) && (getTypeName() == Alarm::getTypeNameStatic());
     }
 
-    m_renderer->start(
-        shared_from_this(), audioFactory, alarmVolumeRampEnabled, urls, loopCount, loopPause, startWithPause);
+    if (m_renderer) {
+        m_renderer->start(
+            shared_from_this(), audioFactory, alarmVolumeRampEnabled, urls, loopCount, loopPause, startWithPause);
+    }
 }
 
 void Alert::onMaxTimerExpiration() {
     ACSDK_INFO(LX("onMaxTimerExpiration"));
-    ACSDK_DEBUG1(LX("expired token").d("token", getToken()));
-    std::lock_guard<std::mutex> lock(m_mutex);
+    std::unique_lock<std::mutex> lock(m_mutex);
+    ACSDK_DEBUG1(LX("expired token").d("token", getTokenLocked()));
     m_dynamicData.state = Alert::State::STOPPING;
     m_hasTimerExpired = true;
 
-    if (isAlertPaused()) {
+    if (isAlertPausedLocked()) {
         m_dynamicData.state = Alert::State::STOPPED;
-        m_observer->onAlertStateChange(AlertObserverInterface::AlertInfo(
-            getTokenLocked(),
-            getType(),
-            AlertObserverInterface::State::STOPPED,
-            getScheduledTime_Utc_TimePointLocked(),
-            getOriginalTimeLocked(),
-            getLabelLocked()));
+        lock.unlock();
+        notifyObserver(AlertObserverInterface::State::STOPPED);
+        lock.lock();
     }
 
-    m_renderer->stop();
+    if (m_renderer) {
+        m_renderer->stop();
+    }
 }
 
 bool Alert::isPastDue(int64_t currentUnixTime, std::chrono::seconds timeLimit) {
@@ -888,7 +887,27 @@ std::function<std::pair<std::unique_ptr<std::istream>, const avsCommon::utils::M
 Alert::ContextInfo Alert::getContextInfo() const {
     std::lock_guard<std::mutex> lock(m_mutex);
 
-    return ContextInfo(m_staticData.token, getTypeName(), getScheduledTime_ISO_8601Locked());
+    return ContextInfo(getTokenLocked(), getTypeName(), getScheduledTime_ISO_8601Locked());
+}
+
+acsdkAlertsInterfaces::AlertObserverInterface::AlertInfo Alert::createAlertInfo(
+    acsdkAlertsInterfaces::AlertObserverInterface::State state,
+    const std::string& reason) const {
+    std::lock_guard<std::mutex> lock(m_mutex);
+    return createAlertInfoLocked(state, reason);
+}
+
+acsdkAlertsInterfaces::AlertObserverInterface::AlertInfo Alert::createAlertInfoLocked(
+    acsdkAlertsInterfaces::AlertObserverInterface::State state,
+    const std::string& reason) const {
+    return AlertObserverInterface::AlertInfo(
+        getTokenLocked(),
+        getType(),  // type name is static value
+        state,
+        getScheduledTime_Utc_TimePointLocked(),
+        getOriginalTimeLocked(),
+        getLabelLocked(),
+        reason);
 }
 
 AlertObserverInterface::Type Alert::getType() const {
@@ -904,11 +923,22 @@ AlertObserverInterface::Type Alert::getType() const {
     return AlertObserverInterface::Type::ALARM;
 }
 
-bool Alert::isAlertPaused() const {
+bool Alert::isAlertPausedLocked() const {
     return avsCommon::avs::FocusState::BACKGROUND == m_focusState &&
            avsCommon::avs::MixingBehavior::MUST_PAUSE == m_mixingBehavior;
 }
 
+void Alert::notifyObserver(acsdkAlertsInterfaces::AlertObserverInterface::State state, const std::string& reason)
+    const {
+    std::unique_lock<std::mutex> lock(m_mutex);
+    if (m_observer != nullptr) {
+        auto observerCopy = m_observer;
+        auto alertInfo = createAlertInfoLocked(state, reason);
+        lock.unlock();
+        observerCopy->onAlertStateChange(alertInfo);
+    }
+}
+
 avsCommon::utils::Optional<AlertObserverInterface::OriginalTime> Alert::validateOriginalTimeString(
     const std::string& originalTimeStr) {
     auto optionalOriginalTime = avsCommon::utils::Optional<AlertObserverInterface::OriginalTime>();
diff --git a/capabilities/Alerts/acsdkAlerts/src/AlertScheduler.cpp b/capabilities/Alerts/acsdkAlerts/src/AlertScheduler.cpp
index 375144a46b..ea9509dae5 100644
--- a/capabilities/Alerts/acsdkAlerts/src/AlertScheduler.cpp
+++ b/capabilities/Alerts/acsdkAlerts/src/AlertScheduler.cpp
@@ -95,7 +95,7 @@ void AlertScheduler::onAlertStateChange(const AlertObserverInterface::AlertInfo&
                      .d("alertType", alertInfo.type)
                      .d("state", alertInfo.state)
                      .d("reason", alertInfo.reason));
-    m_executor.submit([this, alertInfo]() { executeOnAlertStateChange(alertInfo); });
+    m_executor.execute([this, alertInfo]() { executeOnAlertStateChange(alertInfo); });
 }
 
 bool AlertScheduler::initialize(
@@ -227,13 +227,7 @@ bool AlertScheduler::reloadAlertsFromDatabase(
             bool alertIsCurrentlyActive = m_activeAlert && (m_activeAlert->getToken() == alert->getToken());
             if (!alertIsCurrentlyActive) {
                 if (alert->isPastDue(unixEpochNow, m_alertPastDueTimeLimit)) {
-                    notifyObserver(AlertInfo(
-                        alert->getToken(),
-                        alert->getType(),
-                        AlertObserverInterface::State::PAST_DUE,
-                        alert->getScheduledTime_Utc_TimePoint(),
-                        alert->getOriginalTime(),
-                        alert->getLabel()));
+                    notifyObserver(alert->createAlertInfo(AlertObserverInterface::State::PAST_DUE));
                     ACSDK_DEBUG5(LX(ALERT_PAST_DUE_DURING_SCHEDULING).d("alertId", alert->getToken()));
                     ++alertPastDueDuringSchedulingCount;
                     eraseAlert(alert);
@@ -250,13 +244,7 @@ bool AlertScheduler::reloadAlertsFromDatabase(
                     alert->setObserver(this);
 
                     m_scheduledAlerts.insert(alert);
-                    notifyObserver(AlertInfo(
-                        alert->getToken(),
-                        alert->getType(),
-                        AlertObserverInterface::State::SCHEDULED_FOR_LATER,
-                        alert->getScheduledTime_Utc_TimePoint(),
-                        alert->getOriginalTime(),
-                        alert->getLabel()));
+                    notifyObserver(alert->createAlertInfo(AlertObserverInterface::State::SCHEDULED_FOR_LATER));
                 }
             }
         }
@@ -403,13 +391,7 @@ bool AlertScheduler::deleteAlerts(const std::list<std::string>& tokenList) {
 
     for (auto& alert : alertsToBeRemoved) {
         m_scheduledAlerts.erase(alert);
-        notifyObserver(AlertInfo(
-            alert->getToken(),
-            alert->getType(),
-            AlertObserverInterface::State::DELETED,
-            alert->getScheduledTime_Utc_TimePoint(),
-            alert->getOriginalTime(),
-            alert->getLabel()));
+        notifyObserver(alert->createAlertInfo(AlertObserverInterface::State::DELETED));
     }
 
     setTimerForNextAlertLocked();
@@ -442,13 +424,7 @@ void AlertScheduler::updateFocus(avsCommon::avs::FocusState focusState, avsCommo
         case FocusState::FOREGROUND:
             if (m_activeAlert) {
                 m_activeAlert->setFocusState(m_focusState, m_mixingBehavior);
-                notifyObserver(AlertInfo(
-                    m_activeAlert->getToken(),
-                    m_activeAlert->getType(),
-                    AlertObserverInterface::State::FOCUS_ENTERED_FOREGROUND,
-                    m_activeAlert->getScheduledTime_Utc_TimePoint(),
-                    m_activeAlert->getOriginalTime(),
-                    m_activeAlert->getLabel()));
+                notifyObserver(m_activeAlert->createAlertInfo(AlertObserverInterface::State::FOCUS_ENTERED_FOREGROUND));
             } else {
                 activateNextAlertLocked();
             }
@@ -457,13 +433,7 @@ void AlertScheduler::updateFocus(avsCommon::avs::FocusState focusState, avsCommo
         case FocusState::BACKGROUND:
             if (m_activeAlert) {
                 m_activeAlert->setFocusState(m_focusState, m_mixingBehavior);
-                notifyObserver(AlertInfo(
-                    m_activeAlert->getToken(),
-                    m_activeAlert->getType(),
-                    AlertObserverInterface::State::FOCUS_ENTERED_BACKGROUND,
-                    m_activeAlert->getScheduledTime_Utc_TimePoint(),
-                    m_activeAlert->getOriginalTime(),
-                    m_activeAlert->getLabel()));
+                notifyObserver(m_activeAlert->createAlertInfo(AlertObserverInterface::State::FOCUS_ENTERED_BACKGROUND));
             } else {
                 activateNextAlertLocked();
             }
@@ -515,13 +485,7 @@ void AlertScheduler::clearData(Alert::StopReason reason) {
     }
 
     for (const auto& alert : m_scheduledAlerts) {
-        notifyObserver(AlertInfo(
-            alert->getToken(),
-            alert->getType(),
-            AlertObserverInterface::State::DELETED,
-            alert->getScheduledTime_Utc_TimePoint(),
-            alert->getOriginalTime(),
-            alert->getLabel()));
+        notifyObserver(alert->createAlertInfo(AlertObserverInterface::State::DELETED));
     }
 
     m_scheduledAlerts.clear();
@@ -670,7 +634,7 @@ void AlertScheduler::notifyObserver(const AlertObserverInterface::AlertInfo& ale
                      .d("alertType", alertInfo.type)
                      .d("state", alertInfo.state)
                      .d("reason", alertInfo.reason));
-    m_executor.submit([this, alertInfo]() { executeNotifyObserver(alertInfo); });
+    m_executor.execute([this, alertInfo]() { executeNotifyObserver(alertInfo); });
 }
 
 void AlertScheduler::executeNotifyObserver(const AlertObserverInterface::AlertInfo& alertInfo) {
@@ -714,19 +678,16 @@ void AlertScheduler::setTimerForNextAlertLocked() {
             return;
         }
 
+        ACSDK_INFO((LX("executeScheduleNextAlertForRendering").d("scheduledTime", alert->getScheduledTime_Unix())));
+        ACSDK_INFO((LX("executeScheduleNextAlertForRendering").d("time now", timeNow)));
+
         std::chrono::seconds secondsToWait{alert->getScheduledTime_Unix() - timeNow};
 
         if (secondsToWait < std::chrono::seconds::zero()) {
             secondsToWait = std::chrono::seconds::zero();
         }
         if (secondsToWait == std::chrono::seconds::zero()) {
-            notifyObserver(AlertInfo(
-                alert->getToken(),
-                alert->getType(),
-                AlertObserverInterface::State::READY,
-                alert->getScheduledTime_Utc_TimePoint(),
-                alert->getOriginalTime(),
-                alert->getLabel()));
+            notifyObserver(alert->createAlertInfo(AlertObserverInterface::State::READY));
         } else {
             // start the timer for the next alert.
             if (!m_scheduledAlertTimer
@@ -735,13 +696,7 @@ void AlertScheduler::setTimerForNextAlertLocked() {
                          std::bind(
                              &AlertScheduler::onAlertReady,
                              this,
-                             AlertObserverInterface::AlertInfo(
-                                 alert->getToken(),
-                                 alert->getType(),
-                                 AlertObserverInterface::State::READY,
-                                 alert->getScheduledTime_Utc_TimePoint(),
-                                 alert->getOriginalTime(),
-                                 alert->getLabel())))
+                             alert->createAlertInfo(AlertObserverInterface::State::READY)))
                      .valid()) {
                 ACSDK_ERROR(LX("executeScheduleNextAlertForRenderingFailed").d("reason", "startTimerFailed"));
             }
@@ -825,13 +780,7 @@ void AlertScheduler::eraseAlert(std::shared_ptr<Alert> alert) {
         ACSDK_ERROR(LX(__func__).m("Could not erase alert from database").d("token", alertToken));
         return;
     }
-    notifyObserver(AlertInfo(
-        alert->getToken(),
-        alert->getType(),
-        AlertObserverInterface::State::DELETED,
-        alert->getScheduledTime_Utc_TimePoint(),
-        alert->getOriginalTime(),
-        alert->getLabel()));
+    notifyObserver(alert->createAlertInfo(AlertObserverInterface::State::DELETED));
 }
 
 }  // namespace acsdkAlerts
diff --git a/capabilities/Alerts/acsdkAlerts/src/AlertsCapabilityAgent.cpp b/capabilities/Alerts/acsdkAlerts/src/AlertsCapabilityAgent.cpp
index c1f0ff5ef8..91c2b5cb09 100644
--- a/capabilities/Alerts/acsdkAlerts/src/AlertsCapabilityAgent.cpp
+++ b/capabilities/Alerts/acsdkAlerts/src/AlertsCapabilityAgent.cpp
@@ -484,7 +484,7 @@ void AlertsCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<avsCommon
         ACSDK_ERROR(LX("handleDirectiveImmediatelyFailed").d("reason", "directive is nullptr."));
     }
     auto info = createDirectiveInfo(directive, nullptr);
-    m_executor.submit([this, info]() { executeHandleDirectiveImmediately(info); });
+    m_executor.execute([this, info]() { executeHandleDirectiveImmediately(info); });
 }
 
 void AlertsCapabilityAgent::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
@@ -495,7 +495,7 @@ void AlertsCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInfo> info)
     if (!info) {
         ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "info is nullptr."));
     }
-    m_executor.submit([this, info]() { executeHandleDirectiveImmediately(info); });
+    m_executor.execute([this, info]() { executeHandleDirectiveImmediately(info); });
 }
 
 void AlertsCapabilityAgent::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
@@ -507,7 +507,7 @@ void AlertsCapabilityAgent::onDeregistered() {
 }
 
 void AlertsCapabilityAgent::onConnectionStatusChanged(const Status status, const ChangedReason reason) {
-    m_executor.submit([this, status, reason]() { executeOnConnectionStatusChanged(status, reason); });
+    m_executor.execute([this, status, reason]() { executeOnConnectionStatusChanged(status, reason); });
 }
 
 void AlertsCapabilityAgent::onFocusChanged(
@@ -559,7 +559,7 @@ void AlertsCapabilityAgent::onAlertStateChange(const AlertObserverInterface::Ale
                      .d("alertType", alertInfo.type)
                      .d("state", alertInfo.state)
                      .d("reason", alertInfo.reason));
-    m_executor.submit([this, alertInfo]() { executeOnAlertStateChange(alertInfo); });
+    m_executor.execute([this, alertInfo]() { executeOnAlertStateChange(alertInfo); });
 }
 
 void AlertsCapabilityAgent::addObserver(std::shared_ptr<AlertObserverInterface> observer) {
@@ -568,7 +568,7 @@ void AlertsCapabilityAgent::addObserver(std::shared_ptr<AlertObserverInterface>
         return;
     }
 
-    m_executor.submit([this, observer]() { executeAddObserver(observer); });
+    m_executor.execute([this, observer]() { executeAddObserver(observer); });
 }
 
 void AlertsCapabilityAgent::removeObserver(std::shared_ptr<AlertObserverInterface> observer) {
@@ -577,11 +577,11 @@ void AlertsCapabilityAgent::removeObserver(std::shared_ptr<AlertObserverInterfac
         return;
     }
 
-    m_executor.submit([this, observer]() { executeRemoveObserver(observer); });
+    m_executor.execute([this, observer]() { executeRemoveObserver(observer); });
 }
 
 void AlertsCapabilityAgent::removeAllAlerts() {
-    m_executor.submit([this]() { executeRemoveAllAlerts(); });
+    m_executor.execute([this]() { executeRemoveAllAlerts(); });
 }
 
 void AlertsCapabilityAgent::onLocalStop() {
@@ -1164,6 +1164,12 @@ void AlertsCapabilityAgent::executeOnAlertStateChange(const AlertObserverInterfa
 
     bool alertIsActive = false;
     int alertVolume;
+    std::string scheduledTime;
+    if (!alexaClientSDK::avsCommon::utils::timing::TimeUtils().convertTimeToUtcIso8601Rfc3339(
+            alertInfo.scheduledTime, &scheduledTime)) {
+        ACSDK_ERROR(LX("executeOnAlertStateChange").m("couldn't convert time point to string"));
+        scheduledTime = "";
+    }
 
     switch (alertInfo.state) {
         case AlertObserverInterface::State::READY:
@@ -1171,7 +1177,7 @@ void AlertsCapabilityAgent::executeOnAlertStateChange(const AlertObserverInterfa
             break;
 
         case AlertObserverInterface::State::STARTED:
-            sendEvent(ALERT_STARTED_EVENT_NAME, alertInfo.token, true, alertInfo.reason, currentISO8601TimeUTC());
+            sendEvent(ALERT_STARTED_EVENT_NAME, alertInfo.token, true, scheduledTime, currentISO8601TimeUTC());
             alertVolume = getAlertVolume();
             if ((alertVolume != -1) && (alertVolume < ALERT_VOLUME_METRIC_LIMIT)) {
                 submitMetric(m_metricRecorder, ALERT_RINGING_LESS_THAN_30_PERCENT_MAX_VOLUME, 1);
@@ -1190,13 +1196,13 @@ void AlertsCapabilityAgent::executeOnAlertStateChange(const AlertObserverInterfa
             break;
 
         case AlertObserverInterface::State::STOPPED:
-            sendEvent(ALERT_STOPPED_EVENT_NAME, alertInfo.token, true, alertInfo.reason, currentISO8601TimeUTC());
+            sendEvent(ALERT_STOPPED_EVENT_NAME, alertInfo.token, true, scheduledTime, currentISO8601TimeUTC());
             releaseChannel();
             updateContextManager();
             break;
 
         case AlertObserverInterface::State::COMPLETED:
-            sendEvent(ALERT_STOPPED_EVENT_NAME, alertInfo.token, true, alertInfo.reason, currentISO8601TimeUTC());
+            sendEvent(ALERT_STOPPED_EVENT_NAME, alertInfo.token, true, scheduledTime, currentISO8601TimeUTC());
             releaseChannel();
             updateContextManager();
             break;
@@ -1207,9 +1213,9 @@ void AlertsCapabilityAgent::executeOnAlertStateChange(const AlertObserverInterfa
             break;
 
         case AlertObserverInterface::State::PAST_DUE:
-            sendEvent(ALERT_STOPPED_EVENT_NAME, alertInfo.token, true, alertInfo.reason, currentISO8601TimeUTC());
+            sendEvent(ALERT_STOPPED_EVENT_NAME, alertInfo.token, true, scheduledTime, currentISO8601TimeUTC());
             submitAlertCanceledMetricWithMetadata(
-                alertInfo.token, AlertObserverInterface::typeToString(alertInfo.type), alertInfo.reason);
+                alertInfo.token, AlertObserverInterface::typeToString(alertInfo.type), scheduledTime);
             break;
 
         case AlertObserverInterface::State::FOCUS_ENTERED_FOREGROUND:
@@ -1259,7 +1265,7 @@ void AlertsCapabilityAgent::executeOnAlertStateChange(const AlertObserverInterfa
         }
     }
 
-    m_executor.submit([this, alertInfo]() { executeNotifyObservers(alertInfo); });
+    m_executor.execute([this, alertInfo]() { executeNotifyObservers(alertInfo); });
 }
 
 void AlertsCapabilityAgent::executeAddObserver(std::shared_ptr<AlertObserverInterface> observer) {
@@ -1342,7 +1348,7 @@ void AlertsCapabilityAgent::onSpeakerSettingsChanged(
     const SpeakerManagerObserverInterface::Source& source,
     const ChannelVolumeInterface::Type& type,
     const SpeakerInterface::SpeakerSettings& settings) {
-    m_executor.submit([this, settings, type]() { executeOnSpeakerSettingsChanged(type, settings); });
+    m_executor.execute([this, settings, type]() { executeOnSpeakerSettingsChanged(type, settings); });
 }
 
 void AlertsCapabilityAgent::onSystemClockSynchronized() {
diff --git a/capabilities/Alerts/acsdkAlerts/src/CMakeLists.txt b/capabilities/Alerts/acsdkAlerts/src/CMakeLists.txt
index 1a85f0e61d..f4f661ca8a 100644
--- a/capabilities/Alerts/acsdkAlerts/src/CMakeLists.txt
+++ b/capabilities/Alerts/acsdkAlerts/src/CMakeLists.txt
@@ -27,7 +27,7 @@ target_link_libraries(acsdkAlerts PRIVATE
         CertifiedSender
         SQLiteStorage
         RegistrationManager
-        SpeakerManager)
+        acsdkShutdownManagerInterfaces)
 
 # install target
 asdk_install()
diff --git a/capabilities/Alerts/acsdkAlerts/src/Renderer/Renderer.cpp b/capabilities/Alerts/acsdkAlerts/src/Renderer/Renderer.cpp
index 753fab71aa..f4c036fe25 100644
--- a/capabilities/Alerts/acsdkAlerts/src/Renderer/Renderer.cpp
+++ b/capabilities/Alerts/acsdkAlerts/src/Renderer/Renderer.cpp
@@ -179,7 +179,7 @@ void Renderer::start(
         loopPause = std::chrono::milliseconds{0};
     }
 
-    m_executor.submit([this, observer, audioFactory, volumeRampEnabled, urls, loopCount, loopPause, startWithPause]() {
+    m_executor.execute([this, observer, audioFactory, volumeRampEnabled, urls, loopCount, loopPause, startWithPause]() {
         executeStart(observer, audioFactory, volumeRampEnabled, urls, loopCount, loopPause, startWithPause);
     });
 }
@@ -190,7 +190,7 @@ void Renderer::stop() {
     m_isStopping = true;
     m_waitCondition.notify_all();
 
-    m_executor.submit([this]() { executeStop(); });
+    m_executor.execute([this]() { executeStop(); });
 }
 
 void Renderer::onFirstByteRead(SourceId id, const MediaPlayerState&) {
@@ -198,15 +198,15 @@ void Renderer::onFirstByteRead(SourceId id, const MediaPlayerState&) {
 }
 
 void Renderer::onPlaybackStarted(SourceId sourceId, const MediaPlayerState&) {
-    m_executor.submit([this, sourceId]() { executeOnPlaybackStarted(sourceId); });
+    m_executor.execute([this, sourceId]() { executeOnPlaybackStarted(sourceId); });
 }
 
 void Renderer::onPlaybackStopped(SourceId sourceId, const MediaPlayerState&) {
-    m_executor.submit([this, sourceId]() { executeOnPlaybackStopped(sourceId); });
+    m_executor.execute([this, sourceId]() { executeOnPlaybackStopped(sourceId); });
 }
 
 void Renderer::onPlaybackFinished(SourceId sourceId, const MediaPlayerState&) {
-    m_executor.submit([this, sourceId]() { executeOnPlaybackFinished(sourceId); });
+    m_executor.execute([this, sourceId]() { executeOnPlaybackFinished(sourceId); });
 }
 
 void Renderer::onPlaybackError(
@@ -214,7 +214,7 @@ void Renderer::onPlaybackError(
     const avsCommon::utils::mediaPlayer::ErrorType& type,
     std::string error,
     const MediaPlayerState&) {
-    m_executor.submit([this, sourceId, type, error]() { executeOnPlaybackError(sourceId, type, error); });
+    m_executor.execute([this, sourceId, type, error]() { executeOnPlaybackError(sourceId, type, error); });
 }
 
 Renderer::Renderer(
diff --git a/capabilities/Alerts/acsdkAlerts/src/Storage/SQLiteAlertStorage.cpp b/capabilities/Alerts/acsdkAlerts/src/Storage/SQLiteAlertStorage.cpp
index 8e2e427e15..8936fc8bcf 100644
--- a/capabilities/Alerts/acsdkAlerts/src/Storage/SQLiteAlertStorage.cpp
+++ b/capabilities/Alerts/acsdkAlerts/src/Storage/SQLiteAlertStorage.cpp
@@ -125,9 +125,6 @@ static const std::string DATABASE_COLUMN_LABEL_NAME = "label";
 /// The name of the 'created_time_iso_8601' field used in alerts table.
 static const std::string DATABASE_COLUMN_CREATED_TIME_NAME = "created_time_iso_8601";
 
-/// A symbolic name for version two of our database.
-static const int ALERTS_DATABASE_VERSION_TWO = 2;
-
 /// A symbolic name for version three of our database.
 static const int ALERTS_DATABASE_VERSION_THREE = 3;
 
@@ -235,7 +232,7 @@ struct AssetOrderItemCompare {
  * @param count The number of data point to be added.
  */
 static void submitMetric(
-    const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+    const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder,
     const std::string& eventName,
     const int count) {
     if (nullptr == metricRecorder) {
@@ -566,6 +563,13 @@ bool SQLiteAlertStorage::open() {
         submitMetric(m_metricRecorder, ALERT_DATABASE_OPEN_FAILED, 1);
         return false;
     }
+    /// Drop the legacy alerts_v2 table.
+    if (m_db.tableExists(ALERTS_V2_TABLE_NAME) && !m_db.dropTable(ALERTS_V2_TABLE_NAME)) {
+        ACSDK_ERROR(LX("dropTableFailed").d("tableName", ALERTS_V2_TABLE_NAME));
+        close();
+        submitMetric(m_metricRecorder, ALERT_DATABASE_OPEN_FAILED, 1);
+        return false;
+    }
 
     if (!m_db.tableExists(ALERT_ASSETS_TABLE_NAME)) {
         if (!createAlertAssetsTable(&m_db)) {
@@ -591,6 +595,13 @@ bool SQLiteAlertStorage::open() {
         submitMetric(m_metricRecorder, ALERT_DATABASE_OPEN_FAILED, 1);
         return false;
     }
+    /// Drop the legacy offlineAlerts table.
+    if (m_db.tableExists(OFFLINE_ALERTS_TABLE_NAME) && !m_db.dropTable(OFFLINE_ALERTS_TABLE_NAME)) {
+        ACSDK_ERROR(LX("dropTableFailed").d("tableName", OFFLINE_ALERTS_TABLE_NAME));
+        close();
+        submitMetric(m_metricRecorder, ALERT_DATABASE_OPEN_FAILED, 1);
+        return false;
+    }
 
     submitMetric(m_metricRecorder, ALERT_DATABASE_OPEN_FAILED, 0);
     return true;
@@ -817,15 +828,12 @@ void SQLiteAlertStorage::close() {
 }
 
 bool SQLiteAlertStorage::alertExists(const int dbVersion, const std::string& token) {
-    if (dbVersion != ALERTS_DATABASE_VERSION_TWO && dbVersion != ALERTS_DATABASE_VERSION_THREE) {
+    if (dbVersion != ALERTS_DATABASE_VERSION_THREE) {
         ACSDK_ERROR(LX("alertExistsFailed").d("UnsupportedDbVersion", dbVersion));
         return false;
     }
 
     std::string tableName = ALERTS_V3_TABLE_NAME;
-    if (ALERTS_DATABASE_VERSION_TWO == dbVersion) {
-        tableName = ALERTS_V2_TABLE_NAME;
-    }
     const std::string sqlString = "SELECT COUNT(*) FROM " + tableName + " WHERE token=?;";
     auto statement = m_db.createStatement(sqlString);
 
@@ -858,14 +866,11 @@ bool SQLiteAlertStorage::alertExists(const int dbVersion, const std::string& tok
 }
 
 bool SQLiteAlertStorage::offlineAlertExists(const int dbVersion, const std::string& token) {
-    if (dbVersion != OFFLINE_ALERTS_DATABASE_VERSION_ONE && dbVersion != OFFLINE_ALERTS_DATABASE_VERSION_TWO) {
+    if (dbVersion != OFFLINE_ALERTS_DATABASE_VERSION_TWO) {
         ACSDK_ERROR(LX("offlineAlertExistsFailed").d("Invalid db version", dbVersion));
         return false;
     }
-    std::string offlineAlertsTableName = OFFLINE_ALERTS_TABLE_NAME;
-    if (OFFLINE_ALERTS_DATABASE_VERSION_TWO == dbVersion) {
-        offlineAlertsTableName = OFFLINE_ALERTS_V2_TABLE_NAME;
-    }
+    std::string offlineAlertsTableName = OFFLINE_ALERTS_V2_TABLE_NAME;
 
     const std::string sqlString = "SELECT COUNT(*) FROM " + offlineAlertsTableName + " WHERE token=?;";
     auto statement = m_db.createStatement(sqlString);
@@ -1115,10 +1120,6 @@ bool SQLiteAlertStorage::store(std::shared_ptr<Alert> alert) {
         return false;
     }
 
-    if (m_db.tableExists(ALERTS_V2_TABLE_NAME) && !storeAlertToV2(id, alert)) {
-        ACSDK_WARN(LX("store").m("Could not store alert data to table " + ALERTS_V2_TABLE_NAME));
-    }
-
     if (!storeAlertAssets(&m_db, id, alert->getAssetConfiguration().assets)) {
         ACSDK_ERROR(LX("storeFailed").m("Could not store alertAssets."));
         return false;
@@ -1132,77 +1133,11 @@ bool SQLiteAlertStorage::store(std::shared_ptr<Alert> alert) {
     return true;
 }
 
-bool SQLiteAlertStorage::storeAlertToV2(const int id, std::shared_ptr<Alert> alert) {
-    int alertType = ALERT_EVENT_TYPE_ALARM;
-    if (!alertTypeToDbField(alert->getTypeName(), &alertType)) {
-        ACSDK_ERROR(LX("storeAlertToV2Failed").m("Could not convert type name to db field."));
-        return false;
-    }
-
-    int alertState = ALERT_STATE_SET;
-    if (!alertStateToDbField(alert->getState(), &alertState)) {
-        ACSDK_ERROR(LX("storeAlertToV2Failed").m("Could not convert alert state to db field."));
-        return false;
-    }
-
-    // clang-format off
-    const std::string sqlString = "INSERT INTO " + ALERTS_V2_TABLE_NAME + " (" +
-                            DATABASE_COLUMN_ID_NAME + ", " + DATABASE_COLUMN_TOKEN_NAME + ", " +
-                            DATABASE_COLUMN_TYPE_NAME + ", " + DATABASE_COLUMN_STATE_NAME + ", " +
-                            DATABASE_COLUMN_SCHEDULED_TIME_UNIX_NAME + ", " +
-                            DATABASE_COLUMN_SCHEDULED_TIME_ISO_8601_NAME + ", " +
-                            DATABASE_COLUMN_ASSET_LOOP_COUNT_NAME + ", " +
-                            DATABASE_COLUMN_ASSET_LOOP_PAUSE_MILLISECONDS_NAME + ", " +
-                            DATABASE_COLUMN_BACKGROUND_ASSET_NAME +
-                            ") VALUES (" +
-                            "?, ?, " + /// DATABASE_COLUMN_ID_NAME, DATABASE_COLUMN_TOKEN_NAME
-                            "?, ?, " + /// DATABASE_COLUMN_TYPE_NAME, DATABASE_COLUMN_STATE_NAME
-                            "?, " + /// DATABASE_COLUMN_SCHEDULED_TIME_UNIX_NAME
-                            "?, " + /// DATABASE_COLUMN_SCHEDULED_TIME_ISO_8601_NAME
-                            "?, " + /// DATABASE_COLUMN_ASSET_LOOP_COUNT_NAME
-                            "?, " + /// DATABASE_COLUMN_ASSET_LOOP_PAUSE_MILLISECONDS_NAME
-                            "?" + /// DATABASE_COLUMN_BACKGROUND_ASSET_NAME
-                            ");";
-    // clang-format on
-    auto statement = m_db.createStatement(sqlString);
-
-    if (!statement) {
-        ACSDK_ERROR(LX("storeAlertToV2Failed").m("Could not create statement."));
-        return false;
-    }
-
-    int boundParam = 1;
-    if (!statement->bindIntParameter(boundParam++, id) ||
-        !statement->bindStringParameter(boundParam++, alert->getToken()) ||
-        !statement->bindIntParameter(boundParam++, alertType) ||
-        !statement->bindIntParameter(boundParam++, alertState) ||
-        !statement->bindInt64Parameter(boundParam++, alert->getScheduledTime_Unix()) ||
-        !statement->bindStringParameter(boundParam++, alert->getScheduledTime_ISO_8601()) ||
-        !statement->bindIntParameter(boundParam++, alert->getLoopCount()) ||
-        !statement->bindIntParameter(boundParam++, alert->getLoopPause().count()) ||
-        !statement->bindStringParameter(boundParam, alert->getBackgroundAssetId())) {
-        ACSDK_ERROR(LX("storeAlertToV2Failed").m("Could not bind parameter."));
-        return false;
-    }
-
-    if (!statement->step()) {
-        ACSDK_ERROR(LX("storeAlertToV2Failed").m("Could not perform step."));
-        return false;
-    }
-
-    ACSDK_DEBUG9(LX("Successfully stored alert to " + ALERTS_V2_TABLE_NAME));
-    return true;
-}
-
 bool SQLiteAlertStorage::storeOfflineAlert(
     const std::string& token,
     const std::string& scheduledTime,
     const std::string& eventTime) {
-    bool success = storeOfflineAlertHelper(OFFLINE_ALERTS_DATABASE_VERSION_TWO, token, scheduledTime, eventTime);
-    if (m_db.tableExists(OFFLINE_ALERTS_TABLE_NAME)) {
-        success &= storeOfflineAlertHelper(OFFLINE_ALERTS_DATABASE_VERSION_ONE, token, scheduledTime, eventTime);
-    }
-    return success;
+    return storeOfflineAlertHelper(OFFLINE_ALERTS_DATABASE_VERSION_TWO, token, scheduledTime, eventTime);
 }
 
 bool SQLiteAlertStorage::storeOfflineAlertHelper(
@@ -1210,7 +1145,7 @@ bool SQLiteAlertStorage::storeOfflineAlertHelper(
     const std::string& token,
     const std::string& scheduledTime,
     const std::string& eventTime) {
-    if (dbVersion != OFFLINE_ALERTS_DATABASE_VERSION_ONE && dbVersion != OFFLINE_ALERTS_DATABASE_VERSION_TWO) {
+    if (dbVersion != OFFLINE_ALERTS_DATABASE_VERSION_TWO) {
         ACSDK_ERROR(LX("storeOfflineAlertHelperFailed").d("Invalid db version", dbVersion));
         return false;
     }
@@ -1220,14 +1155,8 @@ bool SQLiteAlertStorage::storeOfflineAlertHelper(
         return true;
     }
 
-    std::string offlineAlertsTableName = OFFLINE_ALERTS_TABLE_NAME;
-    if (OFFLINE_ALERTS_DATABASE_VERSION_TWO == dbVersion) {
-        offlineAlertsTableName = OFFLINE_ALERTS_V2_TABLE_NAME;
-    }
-    bool isLegacyV1 = false;
-    if (OFFLINE_ALERTS_DATABASE_VERSION_ONE == dbVersion) {
-        isLegacyV1 = isOfflineTableV1Legacy();
-    }
+    std::string offlineAlertsTableName = OFFLINE_ALERTS_V2_TABLE_NAME;
+
     // clang-format off
     std::string sqlString = "INSERT INTO " +  offlineAlertsTableName + " (" +
                                     "id, token, scheduled_time_iso_8601, event_time_iso_8601" +
@@ -1236,16 +1165,6 @@ bool SQLiteAlertStorage::storeOfflineAlertHelper(
                                     ");";
     // clang-format on
 
-    if (isLegacyV1) {
-        // clang-format off
-        sqlString = "INSERT INTO " + offlineAlertsTableName + " (" +
-                            "id, token, scheduled_time_iso_8601" +
-                            ") VALUES (" +
-                            "?, ?, ?" +
-                            ");";
-        // clang-format on
-    }
-
     int id = 0;
     if (!getTableMaxIntValue(&m_db, offlineAlertsTableName, DATABASE_COLUMN_ID_NAME, &id)) {
         ACSDK_ERROR(LX("storeOfflineAlertHelperFailed").m("Cannot generate alert id."));
@@ -1267,15 +1186,9 @@ bool SQLiteAlertStorage::storeOfflineAlertHelper(
 
     /// If we are offine then we only want to bind a few parameters
     if (!statement->bindIntParameter(boundParam++, id) || !statement->bindStringParameter(boundParam++, alertToken) ||
-        !statement->bindStringParameter(boundParam++, scheduledTime_ISO)) {
-        ACSDK_ERROR(LX("storeOfflineAlertHelperFailed").m("Could not bind parameter."));
-        return false;
-    }
-
-    if ((OFFLINE_ALERTS_DATABASE_VERSION_TWO == dbVersion ||
-         (OFFLINE_ALERTS_DATABASE_VERSION_ONE == dbVersion && !isLegacyV1)) &&
+        !statement->bindStringParameter(boundParam++, scheduledTime_ISO) ||
         !statement->bindStringParameter(boundParam, eventTime_ISO)) {
-        ACSDK_ERROR(LX("storeOfflineAlertHelperFailed").m("Could not bind parameter " + eventTime_ISO));
+        ACSDK_ERROR(LX("storeOfflineAlertHelperFailed").m("Could not bind parameter."));
         return false;
     }
 
@@ -1427,7 +1340,7 @@ bool SQLiteAlertStorage::loadHelper(
         return false;
     }
 
-    if (dbVersion != ALERTS_DATABASE_VERSION_TWO && dbVersion != ALERTS_DATABASE_VERSION_THREE) {
+    if (dbVersion != ALERTS_DATABASE_VERSION_THREE) {
         ACSDK_ERROR(LX("loadHelperFailed").d("Invalid version", dbVersion));
         return false;
     }
@@ -1447,10 +1360,6 @@ bool SQLiteAlertStorage::loadHelper(
     }
 
     std::string alertsTableName = ALERTS_V3_TABLE_NAME;
-    if (ALERTS_DATABASE_VERSION_TWO == dbVersion) {
-        alertsTableName = ALERTS_V2_TABLE_NAME;
-    }
-
     const std::string sqlString = "SELECT * FROM " + alertsTableName + ";";
 
     auto statement = m_db.createStatement(sqlString);
@@ -1664,23 +1573,16 @@ bool SQLiteAlertStorage::modify(std::shared_ptr<Alert> alert) {
         return false;
     }
 
-    if (m_db.tableExists(ALERTS_V2_TABLE_NAME) && !modifyAlert(ALERTS_DATABASE_VERSION_TWO, alert)) {
-        ACSDK_WARN(
-            LX("modify").m("Cannot modify alert in table " + ALERTS_V2_TABLE_NAME).d("token", alert->getToken()));
-    }
     return modifyAlert(ALERTS_DATABASE_VERSION_THREE, alert);
 }
 
 bool SQLiteAlertStorage::modifyAlert(const int dbVersion, std::shared_ptr<Alert> alert) {
-    if (dbVersion != ALERTS_DATABASE_VERSION_TWO && dbVersion != ALERTS_DATABASE_VERSION_THREE) {
+    if (dbVersion != ALERTS_DATABASE_VERSION_THREE) {
         ACSDK_ERROR(LX("modifyAlertFailed").d("UnsupportedDbVersion", dbVersion));
         return false;
     }
 
     std::string tableName = ALERTS_V3_TABLE_NAME;
-    if (ALERTS_DATABASE_VERSION_TWO == dbVersion) {
-        tableName = ALERTS_V2_TABLE_NAME;
-    }
 
     const std::string sqlString =
         "UPDATE " + tableName + " SET " + "state=?, scheduled_time_unix=?, scheduled_time_iso_8601=? " + "WHERE id=?;";
@@ -1743,15 +1645,12 @@ bool SQLiteAlertStorage::retryDataMigration(Task task, Args&&... args) {
  * @return Whether the delete operation was successful.
  */
 static bool eraseAlert(int dbVersion, SQLiteDatabase* db, int alertId) {
-    if (dbVersion != ALERTS_DATABASE_VERSION_TWO && dbVersion != ALERTS_DATABASE_VERSION_THREE) {
+    if (dbVersion != ALERTS_DATABASE_VERSION_THREE) {
         ACSDK_ERROR(LX("eraseAlertFailed").d("UnsupportedDbVersion", dbVersion));
         return false;
     }
 
     std::string tableName = ALERTS_V3_TABLE_NAME;
-    if (ALERTS_DATABASE_VERSION_TWO == dbVersion) {
-        tableName = ALERTS_V2_TABLE_NAME;
-    }
     const std::string sqlString = "DELETE FROM " + tableName + " WHERE id=?;";
 
     auto statement = db->createStatement(sqlString);
@@ -1784,15 +1683,12 @@ static bool eraseAlert(int dbVersion, SQLiteDatabase* db, int alertId) {
  * @return Whether the delete operation was successful.
  */
 static bool eraseOfflineAlert(const int dbVersion, SQLiteDatabase* db, const std::string& token) {
-    if (dbVersion != OFFLINE_ALERTS_DATABASE_VERSION_ONE && dbVersion != OFFLINE_ALERTS_DATABASE_VERSION_TWO) {
+    if (dbVersion != OFFLINE_ALERTS_DATABASE_VERSION_TWO) {
         ACSDK_ERROR(LX("eraseOfflineAlertFailed").d("Invalid db version", dbVersion));
         return false;
     }
 
-    std::string offlineAlertsTableName = OFFLINE_ALERTS_TABLE_NAME;
-    if (OFFLINE_ALERTS_DATABASE_VERSION_TWO == dbVersion) {
-        offlineAlertsTableName = OFFLINE_ALERTS_V2_TABLE_NAME;
-    }
+    std::string offlineAlertsTableName = OFFLINE_ALERTS_V2_TABLE_NAME;
 
     const std::string sqlString = "DELETE FROM " + offlineAlertsTableName + " WHERE token=?;";
 
@@ -1900,10 +1796,6 @@ static bool eraseAlertByAlertId(SQLiteDatabase* db, int alertId) {
         return false;
     }
 
-    if (db->tableExists(ALERTS_V2_TABLE_NAME) && !eraseAlert(ALERTS_DATABASE_VERSION_TWO, db, alertId)) {
-        ACSDK_WARN(LX("eraseAlertByAlertIdFailed").m("Could not erase alert from table " + ALERTS_V2_TABLE_NAME));
-    }
-
     if (!eraseAlertAssets(db, alertId)) {
         ACSDK_ERROR(LX("eraseAlertByAlertIdFailed").m("Could not erase alertAsset table items."));
         return false;
@@ -1932,15 +1824,11 @@ bool SQLiteAlertStorage::erase(std::shared_ptr<Alert> alert) {
 }
 
 bool SQLiteAlertStorage::eraseOffline(const std::string& token, int id) {
-    bool success = eraseOfflineHelper(OFFLINE_ALERTS_DATABASE_VERSION_TWO, token);
-    if (m_db.tableExists(OFFLINE_ALERTS_TABLE_NAME)) {
-        success &= eraseOfflineHelper(OFFLINE_ALERTS_DATABASE_VERSION_ONE, token);
-    }
-    return success;
+    return eraseOfflineHelper(OFFLINE_ALERTS_DATABASE_VERSION_TWO, token);
 }
 
 bool SQLiteAlertStorage::eraseOfflineHelper(const int dbVersion, const std::string& token) {
-    if (dbVersion != OFFLINE_ALERTS_DATABASE_VERSION_ONE && dbVersion != OFFLINE_ALERTS_DATABASE_VERSION_TWO) {
+    if (dbVersion != OFFLINE_ALERTS_DATABASE_VERSION_TWO) {
         ACSDK_ERROR(LX("eraseOfflineHelperFailed").d("Invalid db version", dbVersion));
         return false;
     }
@@ -1992,12 +1880,6 @@ bool SQLiteAlertStorage::clearDatabase() {
                                               ALERT_ASSETS_TABLE_NAME,
                                               ALERT_ASSET_PLAY_ORDER_ITEMS_TABLE_NAME,
                                               OFFLINE_ALERTS_V2_TABLE_NAME};
-    if (m_db.tableExists(ALERTS_V2_TABLE_NAME)) {
-        tablesToClear.push_back(ALERTS_V2_TABLE_NAME);
-    }
-    if (m_db.tableExists(OFFLINE_ALERTS_TABLE_NAME)) {
-        tablesToClear.push_back(OFFLINE_ALERTS_TABLE_NAME);
-    }
 
     for (auto& tableName : tablesToClear) {
         if (!m_db.clearTable(tableName)) {
diff --git a/capabilities/Alerts/acsdkAlerts/test/AlertTest.cpp b/capabilities/Alerts/acsdkAlerts/test/AlertTest.cpp
index 6dcc6fc9c0..cc6218c108 100644
--- a/capabilities/Alerts/acsdkAlerts/test/AlertTest.cpp
+++ b/capabilities/Alerts/acsdkAlerts/test/AlertTest.cpp
@@ -16,6 +16,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 #include <acsdkAlertsInterfaces/AlertObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/Audio/AlertsAudioFactoryInterface.h>
 
 #include "acsdkAlerts/Alert.h"
 #include "AVSCommon/Utils/Timing/TimeUtils.h"
@@ -66,6 +67,9 @@ static const std::string LABEL_TEST("Test label");
 static const std::string ORIGINAL_TIME_TEST("17:00:00.000");
 static const std::string INVALID_ORIGINAL_TIME_TEST{"-1:00:00.000"};
 
+/// reason for alert state change
+static const std::string INTERRUPTED("interrupted");
+
 class MockAlert : public Alert {
 public:
     MockAlert() : Alert(defaultAudioFactory, shortAudioFactory, nullptr) {
@@ -219,6 +223,19 @@ TEST_F(AlertTest, test_parseFromJsonHappyCase) {
     ASSERT_EQ(m_alert->getOriginalTime(), m_alert->validateOriginalTimeString(ORIGINAL_TIME_TEST));
     ASSERT_EQ(m_alert->getLabel(), m_alert->validateLabelString(LABEL_TEST));
 
+    auto alertInfo =
+        m_alert->createAlertInfo(acsdkAlertsInterfaces::AlertObserverInterface::State::STARTED, INTERRUPTED);
+    ASSERT_EQ(alertInfo.token, TOKEN_TEST);
+
+    // ALERT_TYPE("MOCK_ALERT_TYPE") will be mapped to default value ALARM
+    ASSERT_EQ(alertInfo.type, acsdkAlertsInterfaces::AlertObserverInterface::Type::ALARM);
+
+    ASSERT_EQ(alertInfo.state, acsdkAlertsInterfaces::AlertObserverInterface::State::STARTED);
+    ASSERT_EQ(alertInfo.scheduledTime, m_alert->getScheduledTime_Utc_TimePoint());
+    ASSERT_EQ(alertInfo.originalTime, m_alert->validateOriginalTimeString(ORIGINAL_TIME_TEST));
+    ASSERT_EQ(alertInfo.label, m_alert->validateLabelString(LABEL_TEST));
+    ASSERT_EQ(alertInfo.reason, INTERRUPTED);
+
     std::vector<std::string> assetPlayOrderItems;
     assetPlayOrderItems.push_back(ASSET_ID1);
     assetPlayOrderItems.push_back(ASSET_ID2);
diff --git a/capabilities/Alerts/acsdkAlerts/test/SQLiteAlertStorageTest.cpp b/capabilities/Alerts/acsdkAlerts/test/SQLiteAlertStorageTest.cpp
index 5af7ef0c56..5c291ca4ea 100644
--- a/capabilities/Alerts/acsdkAlerts/test/SQLiteAlertStorageTest.cpp
+++ b/capabilities/Alerts/acsdkAlerts/test/SQLiteAlertStorageTest.cpp
@@ -830,9 +830,6 @@ TEST_F(SQLiteAlertStorageTest, test_clearDatabase) {
     setUpDatabase();
     alexaClientSDK::storage::sqliteStorage::SQLiteDatabase db(TEST_DATABASE_FILE_NAME);
     ASSERT_TRUE(db.open());
-    /// include legacy tables.
-    ASSERT_TRUE(db.performQuery(CREATE_ALERTS_V2_TABLE_SQL_STRING));
-    ASSERT_TRUE(db.performQuery(CREATE_OFFLINE_ALERTS_V1_TABLE_SQL_STRING));
 
     /// store alerts.
     const std::string offlineAlertToken = "token-offline";
@@ -842,15 +839,11 @@ TEST_F(SQLiteAlertStorageTest, test_clearDatabase) {
     ASSERT_TRUE(m_alertStorage->store(alarm));
 
     /// check alerts exist.
-    ASSERT_TRUE(alertExists(&db, OFFLINE_ALERTS_TABLE_NAME, offlineAlertToken));
     ASSERT_TRUE(alertExists(&db, OFFLINE_ALERTS_V2_TABLE_NAME, offlineAlertToken));
-    ASSERT_TRUE(alertExists(&db, ALERTS_V2_TABLE_NAME, TOKEN_ALARM));
     ASSERT_TRUE(alertExists(&db, ALERTS_V3_TABLE_NAME, TOKEN_ALARM));
     /// clear database.
     ASSERT_TRUE(m_alertStorage->clearDatabase());
-    ASSERT_TRUE(isTableEmpty(&db, ALERTS_V2_TABLE_NAME));
     ASSERT_TRUE(isTableEmpty(&db, ALERTS_V3_TABLE_NAME));
-    ASSERT_TRUE(isTableEmpty(&db, OFFLINE_ALERTS_TABLE_NAME));
     ASSERT_TRUE(isTableEmpty(&db, OFFLINE_ALERTS_V2_TABLE_NAME));
     db.close();
 }
diff --git a/capabilities/AlexaChannelController/.clang-format b/capabilities/AlexaChannelController/.clang-format
new file mode 100644
index 0000000000..382ffea861
--- /dev/null
+++ b/capabilities/AlexaChannelController/.clang-format
@@ -0,0 +1,101 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
diff --git a/capabilities/AlexaChannelController/AlexaChannelController/CMakeLists.txt b/capabilities/AlexaChannelController/AlexaChannelController/CMakeLists.txt
new file mode 100644
index 0000000000..e3cd0fdba3
--- /dev/null
+++ b/capabilities/AlexaChannelController/AlexaChannelController/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+project(acsdkAlexaChannelController LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/capabilities/AlexaChannelController/AlexaChannelController/include/acsdk/AlexaChannelController/AlexaChannelControllerFactory.h b/capabilities/AlexaChannelController/AlexaChannelController/include/acsdk/AlexaChannelController/AlexaChannelControllerFactory.h
new file mode 100644
index 0000000000..ae8a2a1688
--- /dev/null
+++ b/capabilities/AlexaChannelController/AlexaChannelController/include/acsdk/AlexaChannelController/AlexaChannelControllerFactory.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXACHANNELCONTROLLER_ALEXACHANNELCONTROLLERFACTORY_H_
+#define ACSDK_ALEXACHANNELCONTROLLER_ALEXACHANNELCONTROLLERFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/AlexaChannelControllerInterfaces/ChannelControllerInterface.h>
+
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/DirectiveSequencerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace alexaChannelController {
+
+/**
+ * This factory can be used to create a AlexaChannelControllerFactory object which could be a parameter for Capability
+ * Agent construction.
+ */
+class AlexaChannelControllerFactory {
+private:
+    /**
+     * This object contains the interfaces to interact with the AlexaChannelController Capability Agent.
+     */
+    struct ChannelControllerCapabilityAgentData {
+        /// An interface used to handle Alexa.ChannelController directives.
+        std::shared_ptr<avsCommon::sdkInterfaces::DirectiveHandlerInterface> directiveHandler;
+        /// An interface used to provide configurations of the capabilities being implemented by this capability agent.
+        std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface> capabilityConfigurationInterface;
+        /// Instance of @c RequiresShutdown used for cleaning up the capability agent during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+public:
+    /**
+     * Creates a new ChannelController capability agent configuration.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param channelController An interface that this object will use to perform the channel controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isProactivelyReported Whether the channel properties change is proactively reported to AVS in a
+     * change report.
+     * @param isRetrievable Whether the channel properties can be retrieved when AVS sends a state report
+     * request to the endpoint.
+     * @return An @c Optional object containing an instance of @c ChannelControllerCapabilityAgentData object if
+     * successful, otherwise an @c Optional object with no valid value.
+     */
+    static avsCommon::utils::Optional<ChannelControllerCapabilityAgentData> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<alexaChannelControllerInterfaces::ChannelControllerInterface>& channelController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        bool isProactivelyReported,
+        bool isRetrievable);
+};
+
+}  // namespace alexaChannelController
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXACHANNELCONTROLLER_ALEXACHANNELCONTROLLERFACTORY_H_
diff --git a/capabilities/AlexaChannelController/AlexaChannelController/privateInclude/acsdk/AlexaChannelController/private/AlexaChannelControllerCapabilityAgent.h b/capabilities/AlexaChannelController/AlexaChannelController/privateInclude/acsdk/AlexaChannelController/private/AlexaChannelControllerCapabilityAgent.h
new file mode 100644
index 0000000000..cfd8c62c3e
--- /dev/null
+++ b/capabilities/AlexaChannelController/AlexaChannelController/privateInclude/acsdk/AlexaChannelController/private/AlexaChannelControllerCapabilityAgent.h
@@ -0,0 +1,271 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXACHANNELCONTROLLER_PRIVATE_ALEXACHANNELCONTROLLERCAPABILITYAGENT_H_
+#define ACSDK_ALEXACHANNELCONTROLLER_PRIVATE_ALEXACHANNELCONTROLLERCAPABILITYAGENT_H_
+
+#include <memory>
+#include <string>
+#include <unordered_set>
+
+#include <rapidjson/document.h>
+
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/AVS/CapabilityState.h>
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+#include <acsdk/AlexaChannelControllerInterfaces/ChannelControllerInterface.h>
+#include <acsdk/AlexaChannelControllerInterfaces/ChannelType.h>
+
+namespace alexaClientSDK {
+namespace alexaChannelController {
+
+/**
+ * The @c AlexaChannelControllerCapabilityAgent is responsible for handling Alexa.ChannelController directives and
+ * calls the @c AlexaChannelControllerInterface APIs.
+ *
+ * This class implements a @c CapabilityAgent that handles the @c Alexa.ChannelController Interface.
+ */
+class AlexaChannelControllerCapabilityAgent
+        : public avsCommon::avs::CapabilityAgent
+        , public alexaChannelControllerInterfaces::ChannelControllerObserverInterface
+        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<AlexaChannelControllerCapabilityAgent> {
+public:
+    /**
+     * Create an instance of @c AlexaChannelControllerCapabilityAgent.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param channelController An interface that this object will use to perform the channel controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isProactivelyReported Whether the channel state properties change is proactively reported to AVS in a
+     * change report.
+     * @param isRetrievable Whether the channel state properties can be retrieved when AVS sends a state report
+     * request to the endpoint.
+     * @return @c nullptr if the inputs are invalid, else a new instance of @c AlexaChannelControllerCapabilityAgent.
+     */
+    static std::shared_ptr<AlexaChannelControllerCapabilityAgent> create(
+        avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+        std::shared_ptr<alexaChannelControllerInterfaces::ChannelControllerInterface> channelController,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        bool isProactivelyReported,
+        bool isRetrievable);
+
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
+    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name StateProviderInterface Functions
+    /// @{
+    void provideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken) override;
+    bool canStateBeRetrieved() override;
+    bool hasReportableStateProperties() override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
+    /// @}
+
+    /// @name ChannelControllerObserverInterface Function
+    /// @{
+    void onChannelChanged(std::unique_ptr<alexaChannelControllerTypes::Channel> channel) override;
+    /// @}
+
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param channelController An interface that this object will use to perform the channel controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isProactivelyReported Whether the channel state properties change is proactively reported to AVS in a
+     * change report.
+     * @param isRetrievable Whether the channel state properties can be retrieved when AVS sends a state report
+     * request to the endpoint.
+     */
+    AlexaChannelControllerCapabilityAgent(
+        avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+        std::shared_ptr<alexaChannelControllerInterfaces::ChannelControllerInterface> channelController,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        bool isProactivelyReported,
+        bool isRetrievable);
+
+    /**
+     * Initializes the object.
+     */
+    bool initialize();
+
+    /**
+     * Remove a directive from the map of message IDs to DirectiveInfo instances.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
+     */
+    void removeDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Send the handling completed notification and clean up the resources.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Called on executor to handle any unknown directives received.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param type The @c ExceptionErrorType.
+     */
+    void executeUnknownDirective(std::shared_ptr<DirectiveInfo> info, avsCommon::avs::ExceptionErrorType type);
+
+    /**
+     * Gets the current channel state from endpoint and notifies @c ContextManager
+     *
+     * @param stateProviderName Provides the property name and used in the @c ContextManager methods.
+     * @param contextRequestToken The token to be used when providing the response to @c ContextManager
+     */
+    void executeProvideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken);
+
+    /**
+     * Call methods of @c AlexaInterfaceMessageSenderInterface based the endpoint's response for a controller method
+     * call.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param result This contains the endpoint's response to a controller call.
+     * @param currentChannel The current channel at the endpoint.
+     */
+    void sendResponseEvent(
+        const std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info,
+        const alexaChannelControllerInterfaces::ChannelControllerInterface::Response& result,
+        std::unique_ptr<alexaChannelControllerTypes::Channel> currentChannel);
+
+    /**
+     * Send Alexa interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaErrorResponseType Alexa interface error response type.
+     * @param responseMessage Alexa interface error response message.
+     */
+    void sendAlexaErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+        const std::string& responseMessage);
+
+    /**
+     * Send Alexa.Video interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaVideoErrorResponseType Alexa.Video interface error response type.
+     * @param responseMessage Alexa.Video interface error response message.
+     */
+    void sendAlexaVideoErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType
+            alexaVideoErrorResponseType,
+        const std::string& responseMessage);
+
+    /**
+     * Helper method to build the @c JSON string for CapabilityState
+     *
+     * @param channelState The channel state defined using @c ChannelState
+     */
+    std::string buildCapabilityStateString(const alexaChannelControllerTypes::Channel& channelState);
+
+    /**
+     * parse ChangeChannel payload and return channel information
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective for changing channel.
+     * @param payloadDocument JSON document, contains ChangeChannel directive payload.
+     * @return nullptr if the payload is invalid, a std::unique_ptr to a channel object containing the information
+     * otherwise.
+     */
+    std::unique_ptr<alexaChannelControllerTypes::Channel> parseChannel(
+        const std::shared_ptr<DirectiveInfo> info,
+        const rapidjson::Document& payloadDocument);
+
+    /**
+     * parse ChangeChannel payload and return channel count information
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective for changing channel.
+     * @param payloadDocument JSON document, contains ChangeChannel directive payload.
+     * @param channelCount This stores the channel count value extracted from the payload, if the payload is valid.
+     * @return false if the payload is invalid, true otherwise.
+     */
+    bool parseChannelCount(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const rapidjson::Document& payloadDocument,
+        int64_t& channelCount);
+
+    /**
+     * Builds the lineup configuration json, that is optionally passed during discovery.
+     *
+     * @return The Json string.
+     */
+    std::string buildLineupConfigurationJson();
+
+    /// Endpoint the capability agent associated to.
+    avsCommon::sdkInterfaces::endpoints::EndpointIdentifier m_endpointId;
+
+    /// Whether the channel state properties change is proactively reported to Alexa in a change report.
+    bool m_isProactivelyReported;
+
+    /// Whether the channel state properties can be retrieved when Alexa sends a state report request to the endpoint.
+    bool m_isRetrievable;
+
+    /// Reference to @c ChannelControllerInterface
+    std::shared_ptr<alexaChannelControllerInterfaces::ChannelControllerInterface> m_channelController;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The @c AlexaInterfaceMessageSenderInterface used to send event messages.
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> m_responseSender;
+
+    /// This is the worker thread for the @c AlexaChannelControllerCapabilityAgent.
+    avsCommon::utils::threading::Executor m_executor;
+};
+
+}  // namespace alexaChannelController
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXACHANNELCONTROLLER_PRIVATE_ALEXACHANNELCONTROLLERCAPABILITYAGENT_H_
diff --git a/capabilities/AlexaChannelController/AlexaChannelController/src/AlexaChannelControllerCapabilityAgent.cpp b/capabilities/AlexaChannelController/AlexaChannelController/src/AlexaChannelControllerCapabilityAgent.cpp
new file mode 100644
index 0000000000..81930ecf3f
--- /dev/null
+++ b/capabilities/AlexaChannelController/AlexaChannelController/src/AlexaChannelControllerCapabilityAgent.cpp
@@ -0,0 +1,668 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/AlexaChannelController/private/AlexaChannelControllerCapabilityAgent.h>
+
+#include <rapidjson/document.h>
+#include <rapidjson/error/en.h>
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/JSON/JSONGenerator.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace alexaChannelController {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::configuration;
+using namespace avsCommon::utils::json;
+using namespace rapidjson;
+
+using namespace alexaChannelControllerInterfaces;
+using namespace alexaChannelControllerTypes;
+
+/// String to identify log entries originating from this file.
+#define TAG "AlexaChannelControllerCapabilityAgent"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+/// The namespace for this capability agent.
+static const std::string NAMESPACE{"Alexa.ChannelController"};
+
+/// The namespace for Alexa.Video.ErrorResponse.
+static const std::string NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE{"Alexa.Video"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for ChangeChannel directive
+static const std::string NAME_CHANGECHANNEL{"ChangeChannel"};
+
+/// The name for SkipChannels directive
+static const std::string NAME_SKIPCHANNELS{"SkipChannels"};
+
+/// The name for SkipChannels channel count property
+static const std::string NAME_SKIPCHANNELS_CHANNELCOUNT{"channelCount"};
+
+/// The name of channel property
+static const std::string CHANNELSTATE_PROPERTY_NAME{"channel"};
+
+/// The name of channel property
+static const std::string CHANNELSTATE_PROPERTY_METADATA_NAME{"channelMetadata"};
+
+/// Name of the @c ConfigurationNode for ChannelController.
+static const std::string CHANNEL_CONTROLLER_ROOT_KEY{"channelController"};
+
+/// The name of the key for channel lineups in configuration
+static const std::string CAPABILITY_CONFIGURATION_LINEUP_KEY{"lineup"};
+
+/// (Required) The name of the key for operator name.
+static const std::string CAPABILITY_CONFIGURATION_LINEUP_OPERATOR_NAME_KEY{"operatorName"};
+
+/// (Optional) The name of the key for lineup name.
+static const std::string CAPABILITY_CONFIGURATION_LINEUP_NAME_KEY{"lineupName"};
+
+/// (Optional) The name of the key for postal code.
+static const std::string CAPABILITY_CONFIGURATION_LINEUP_POSTAL_CODE_KEY{"postalCode"};
+
+/// (Required) The name of the key for type.
+static const std::string CAPABILITY_CONFIGURATION_LINEUP_TYPE_KEY{"type"};
+
+/// Json key for parsing channelNumber.
+static const std::string NUMBER{"number"};
+
+/// Json key for parsing channelCallSign.
+static const std::string CALL_SIGN{"callSign"};
+
+/// Json key for parsing uri.
+static const std::string URI{"uri"};
+
+/// Json key for parsing Affiliate CallSign.
+static const std::string AFFILIATE_CALL_SIGN{"affiliateCallSign"};
+
+/// Json key for parsing name.
+static const std::string NAME{"name"};
+
+/// Json key for parsing image.
+static const std::string IMAGE{"image"};
+
+std::shared_ptr<AlexaChannelControllerCapabilityAgent> AlexaChannelControllerCapabilityAgent::create(
+    avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+    std::shared_ptr<ChannelControllerInterface> channelController,
+    std::shared_ptr<ContextManagerInterface> contextManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+    std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionSender,
+    bool isProactivelyReported,
+    bool isRetrievable) {
+    if (endpointId.empty()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "emptyEndpointId"));
+        return nullptr;
+    }
+    if (!channelController) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullChannelController"));
+        return nullptr;
+    }
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManager"));
+        return nullptr;
+    }
+    if (!responseSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullResponseSender"));
+        return nullptr;
+    }
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    auto channelControllerCapabilityAgent =
+        std::shared_ptr<AlexaChannelControllerCapabilityAgent>(new AlexaChannelControllerCapabilityAgent(
+            std::move(endpointId),
+            std::move(channelController),
+            std::move(contextManager),
+            std::move(responseSender),
+            std::move(exceptionSender),
+            isProactivelyReported,
+            isRetrievable));
+
+    if (!channelControllerCapabilityAgent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "instantiationFailed"));
+        return nullptr;
+    }
+
+    if (!channelControllerCapabilityAgent->initialize()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "initializationFailed"));
+        return nullptr;
+    }
+
+    return channelControllerCapabilityAgent;
+}
+
+AlexaChannelControllerCapabilityAgent::AlexaChannelControllerCapabilityAgent(
+    avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+    std::shared_ptr<ChannelControllerInterface> channelController,
+    std::shared_ptr<ContextManagerInterface> contextManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+    std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionSender,
+    bool isProactivelyReported,
+    bool isRetrievable) :
+        CapabilityAgent{NAMESPACE, exceptionSender},
+        RequiresShutdown{"AlexaChannelControllerCapabilityAgent"},
+        m_endpointId{std::move(endpointId)},
+        m_isProactivelyReported{isProactivelyReported},
+        m_isRetrievable{isRetrievable},
+        m_channelController{std::move(channelController)},
+        m_contextManager{std::move(contextManager)},
+        m_responseSender{std::move(responseSender)} {
+}
+
+bool AlexaChannelControllerCapabilityAgent::initialize() {
+    ACSDK_DEBUG9(LX(__func__));
+    if (m_isRetrievable) {
+        m_contextManager->addStateProvider({NAMESPACE, CHANNELSTATE_PROPERTY_NAME, m_endpointId}, shared_from_this());
+    }
+    if (m_isProactivelyReported) {
+        if (!m_channelController->addObserver(shared_from_this())) {
+            ACSDK_ERROR(LX("initializeFailed").d("reason", "addObserverFailed"));
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void AlexaChannelControllerCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!directive) {
+        ACSDK_ERROR(LX("handleDirectiveImmediatelyFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    handleDirective(std::make_shared<CapabilityAgent::DirectiveInfo>(directive, nullptr));
+}
+
+void AlexaChannelControllerCapabilityAgent::preHandleDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX("preHandleDirective"));
+    // do nothing.
+}
+
+/**
+ * Parses a directive payload JSON and returns a parsed document object.
+ *
+ * @param payload JSON string to parse.
+ * @param[out] document Pointer to a parsed document.
+ * @return @c true if parsing was successful, @c false otherwise.
+ */
+static bool parseDirectivePayload(const std::string& payload, Document* document) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!document) {
+        ACSDK_ERROR(LX("parseDirectivePayloadFailed").d("reason", "nullDocument"));
+        return false;
+    }
+
+    ParseResult result = document->Parse(payload);
+    if (!result) {
+        ACSDK_ERROR(LX("parseDirectivePayloadFailed")
+                        .d("reason", "parseFailed")
+                        .d("error", GetParseError_En(result.Code()))
+                        .d("offset", result.Offset()));
+        return false;
+    }
+
+    return true;
+}
+
+std::unique_ptr<Channel> AlexaChannelControllerCapabilityAgent::parseChannel(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    const Document& payloadDocument) {
+    if (payloadDocument.HasMember(CHANNELSTATE_PROPERTY_NAME) &&
+        payloadDocument[CHANNELSTATE_PROPERTY_NAME].IsObject()) {
+        const auto& channelJson = payloadDocument[CHANNELSTATE_PROPERTY_NAME];
+        std::string number;
+        if (channelJson.HasMember(NUMBER) && channelJson[NUMBER].IsString()) {
+            number = channelJson[NUMBER].GetString();
+        }
+        std::string callSign;
+        if (channelJson.HasMember(CALL_SIGN) && channelJson[CALL_SIGN].IsString()) {
+            callSign = channelJson[CALL_SIGN].GetString();
+        }
+        std::string affiliateCallSign;
+        if (channelJson.HasMember(AFFILIATE_CALL_SIGN) && channelJson[AFFILIATE_CALL_SIGN].IsString()) {
+            affiliateCallSign = channelJson[AFFILIATE_CALL_SIGN].GetString();
+        }
+        std::string uri;
+        if (channelJson.HasMember(URI) && channelJson[URI].IsString()) {
+            uri = channelJson[URI].GetString();
+        }
+        std::string name;
+        std::string image;
+        if (payloadDocument.HasMember(CHANNELSTATE_PROPERTY_METADATA_NAME) &&
+            payloadDocument[CHANNELSTATE_PROPERTY_METADATA_NAME].IsObject()) {
+            const auto& channelMetadataJson = payloadDocument[CHANNELSTATE_PROPERTY_METADATA_NAME];
+            if (channelMetadataJson.HasMember(NAME) && channelMetadataJson[NAME].IsString()) {
+                name = channelMetadataJson[NAME].GetString();
+            }
+            if (channelMetadataJson.HasMember(IMAGE) && channelMetadataJson[IMAGE].IsString()) {
+                image = channelMetadataJson[IMAGE].GetString();
+            }
+        } else {
+            std::string errorMessage = CHANNELSTATE_PROPERTY_METADATA_NAME + " not found";
+            ACSDK_ERROR(LX("readPayloadFailed").m(errorMessage));
+            sendExceptionEncounteredAndReportFailed(info, errorMessage);
+            return nullptr;
+        }
+        return Channel::Create(number, callSign, affiliateCallSign, uri, name, image);
+    }
+
+    std::string errorMessage = CHANNELSTATE_PROPERTY_NAME + " not found";
+    ACSDK_ERROR(LX("readPayloadFailed").m(errorMessage));
+    sendExceptionEncounteredAndReportFailed(info, errorMessage);
+    return nullptr;
+}
+
+bool AlexaChannelControllerCapabilityAgent::parseChannelCount(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    const Document& payloadDocument,
+    int64_t& channelCount) {
+    if (payloadDocument.HasMember(NAME_SKIPCHANNELS_CHANNELCOUNT) &&
+        payloadDocument[NAME_SKIPCHANNELS_CHANNELCOUNT].IsInt()) {
+        channelCount = payloadDocument[NAME_SKIPCHANNELS_CHANNELCOUNT].GetInt();
+        return true;
+    }
+    ACSDK_ERROR(LX("readPayloadFailed").m(NAME_SKIPCHANNELS_CHANNELCOUNT + " not found"));
+    return false;
+}
+
+void AlexaChannelControllerCapabilityAgent::handleDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+
+    m_executor.execute([this, info] {
+        ACSDK_DEBUG9(LX("handleDirectiveInExecutor"));
+        const std::string directiveName = info->directive->getName();
+        if (!info->directive->getEndpoint().hasValue() ||
+            (info->directive->getEndpoint().value().endpointId != m_endpointId)) {
+            executeUnknownDirective(info, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        Document payloadDocument(kObjectType);
+        if (!parseDirectivePayload(info->directive->getPayload(), &payloadDocument)) {
+            sendExceptionEncounteredAndReportFailed(
+                info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        ChannelControllerInterface::Response response;
+        if (directiveName == NAME_CHANGECHANNEL) {
+            std::unique_ptr<Channel> channel = parseChannel(info, payloadDocument);
+            if (channel == nullptr) {
+                ACSDK_ERROR(LX("readChangeChannelPayloadFailed"));
+                return;
+            }
+            response = m_channelController->change(std::move(channel));
+        } else if (directiveName == NAME_SKIPCHANNELS) {
+            int64_t channelCount;
+            auto successfullyParsed = parseChannelCount(info, payloadDocument, channelCount);
+            if (!successfullyParsed) {
+                std::string errorMessage = NAME_SKIPCHANNELS_CHANNELCOUNT + " not found";
+                ACSDK_ERROR(LX("readPayloadFailed").m(errorMessage));
+                sendExceptionEncounteredAndReportFailed(info, errorMessage);
+                return;
+            }
+            if (channelCount == 1) {
+                response = m_channelController->incrementChannel();
+            } else if (channelCount == -1) {
+                response = m_channelController->decrementChannel();
+            } else {
+                std::string errorMessage = "Payload value: " + std::to_string(channelCount);
+                ACSDK_ERROR(LX("Unexpected Value of payload").m(errorMessage));
+                sendExceptionEncounteredAndReportFailed(info, errorMessage);
+                return;
+            }
+
+        } else {
+            ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "unexpectedDirective").d("name", directiveName));
+            executeUnknownDirective(info, ExceptionErrorType::UNSUPPORTED_OPERATION);
+            return;
+        }
+        executeSetHandlingCompleted(info);
+        std::unique_ptr<Channel> channel = m_channelController->getCurrentChannel();
+        if (channel == nullptr) {
+            ACSDK_ERROR(LX("Empty Channel State"));
+            return;
+        }
+        sendResponseEvent(info, response, std::move(channel));
+    });
+}
+
+void AlexaChannelControllerCapabilityAgent::provideState(
+    const CapabilityTag& stateProviderName,
+    const ContextRequestToken contextRequestToken) {
+    ACSDK_DEBUG9(
+        LX(__func__).d("contextRequestToken", contextRequestToken).sensitive("stateProviderName", stateProviderName));
+
+    m_executor.execute([this, stateProviderName, contextRequestToken] {
+        ACSDK_DEBUG9(LX("provideStateInExecutor"));
+        executeProvideState(stateProviderName, contextRequestToken);
+    });
+    return;
+}
+
+bool AlexaChannelControllerCapabilityAgent::canStateBeRetrieved() {
+    ACSDK_DEBUG9(LX(__func__));
+    return m_isRetrievable;
+}
+
+bool AlexaChannelControllerCapabilityAgent::hasReportableStateProperties() {
+    ACSDK_DEBUG9(LX(__func__));
+    return m_isRetrievable || m_isProactivelyReported;
+}
+
+void AlexaChannelControllerCapabilityAgent::cancelDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("cancelDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    if (!info->directive->getEndpoint().hasValue() ||
+        info->directive->getEndpoint().value().endpointId != m_endpointId) {
+        ACSDK_WARN(LX("cancelDirective").d("reason", "notExpectedEndpointId"));
+    }
+    removeDirective(info);
+}
+
+DirectiveHandlerConfiguration AlexaChannelControllerCapabilityAgent::getConfiguration() const {
+    ACSDK_DEBUG9(LX(__func__));
+    DirectiveHandlerConfiguration configuration;
+    auto neitherNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUMS_NONE, false);
+    configuration[{NAMESPACE, NAME_CHANGECHANNEL, m_endpointId}] = neitherNonBlockingPolicy;
+    configuration[{NAMESPACE, NAME_SKIPCHANNELS, m_endpointId}] = neitherNonBlockingPolicy;
+
+    return configuration;
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> AlexaChannelControllerCapabilityAgent::
+    getCapabilityConfigurations() {
+    auto additionalConfigurations = CapabilityConfiguration::AdditionalConfigurations();
+    auto lineupConfigurationJson = buildLineupConfigurationJson();
+    if (!lineupConfigurationJson.empty())
+        additionalConfigurations[CAPABILITY_CONFIGURATION_LINEUP_KEY] = lineupConfigurationJson;
+
+    CapabilityConfiguration configuration{CapabilityConfiguration::ALEXA_INTERFACE_TYPE,
+                                          NAMESPACE,
+                                          INTERFACE_VERSION,
+                                          Optional<std::string>(),  // instance
+                                          Optional<CapabilityConfiguration::Properties>(
+                                              {m_isRetrievable, m_isProactivelyReported, {CHANNELSTATE_PROPERTY_NAME}}),
+                                          additionalConfigurations};
+    return {std::make_shared<avsCommon::avs::CapabilityConfiguration>(configuration)};
+}
+
+std::string AlexaChannelControllerCapabilityAgent::buildLineupConfigurationJson() {
+    auto configRoot =
+        avsCommon::utils::configuration::ConfigurationNode::getRoot()[CHANNEL_CONTROLLER_ROOT_KEY]
+                                                                     [CAPABILITY_CONFIGURATION_LINEUP_KEY];
+    if (!configRoot) {
+        ACSDK_DEBUG9(LX(__func__).m("noLineupConfigurationRoot"));
+        return "";
+    }
+
+    const std::string errorEvent = "buildingLineupFailed";
+    const std::string errorReasonKey = "reason";
+    const std::string errorValueKey = "key";
+
+    std::string operatorName;
+    if (!configRoot.getString(CAPABILITY_CONFIGURATION_LINEUP_OPERATOR_NAME_KEY, &operatorName)) {
+        ACSDK_ERROR(LX(errorEvent)
+                        .d(errorReasonKey, "missingLineupOperatorName")
+                        .d(errorValueKey, CAPABILITY_CONFIGURATION_LINEUP_OPERATOR_NAME_KEY));
+        return "";
+    }
+
+    std::string lineupName;
+    if (!configRoot.getString(CAPABILITY_CONFIGURATION_LINEUP_NAME_KEY, &lineupName)) {
+        ACSDK_DEBUG9(LX(__func__).m("missingLineupName"));
+    }
+
+    std::string postalCode;
+    if (!configRoot.getString(CAPABILITY_CONFIGURATION_LINEUP_POSTAL_CODE_KEY, &postalCode)) {
+        ACSDK_DEBUG9(LX(__func__).m("missingLineupPostalCode"));
+    }
+
+    std::string type;
+    if (!configRoot.getString(CAPABILITY_CONFIGURATION_LINEUP_TYPE_KEY, &type)) {
+        ACSDK_ERROR(LX(errorEvent)
+                        .d(errorReasonKey, "missingLineupType")
+                        .d(errorValueKey, CAPABILITY_CONFIGURATION_LINEUP_TYPE_KEY));
+        return "";
+    }
+
+    JsonGenerator jsonGenerator;
+
+    if (!operatorName.empty()) {
+        jsonGenerator.addMember(CAPABILITY_CONFIGURATION_LINEUP_OPERATOR_NAME_KEY, operatorName);
+    }
+
+    if (!lineupName.empty()) {
+        jsonGenerator.addMember(CAPABILITY_CONFIGURATION_LINEUP_NAME_KEY, lineupName);
+    }
+
+    if (!postalCode.empty()) {
+        jsonGenerator.addMember(CAPABILITY_CONFIGURATION_LINEUP_POSTAL_CODE_KEY, postalCode);
+    }
+
+    if (!type.empty()) {
+        jsonGenerator.addMember(CAPABILITY_CONFIGURATION_LINEUP_TYPE_KEY, type);
+    }
+
+    ACSDK_DEBUG9(LX(__func__).sensitive("configuration", jsonGenerator.toString()));
+    return jsonGenerator.toString();
+}
+
+void AlexaChannelControllerCapabilityAgent::doShutdown() {
+    if (m_isProactivelyReported) {
+        m_channelController->removeObserver(shared_from_this());
+    }
+    m_executor.shutdown();
+    m_channelController.reset();
+    m_responseSender.reset();
+    if (m_isRetrievable) {
+        m_contextManager->removeStateProvider({NAMESPACE, CHANNELSTATE_PROPERTY_NAME, m_endpointId});
+    }
+    m_contextManager.reset();
+}
+
+void AlexaChannelControllerCapabilityAgent::removeDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
+    if (info->directive && info->result) {
+        CapabilityAgent::removeDirective(info->directive->getMessageId());
+    }
+}
+
+void AlexaChannelControllerCapabilityAgent::executeSetHandlingCompleted(
+    std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
+    if (info && info->result) {
+        info->result->setCompleted();
+    }
+    removeDirective(info);
+}
+
+void AlexaChannelControllerCapabilityAgent::executeUnknownDirective(
+    std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    ExceptionErrorType type) {
+    ACSDK_ERROR(LX("executeUnknownDirectiveFailed")
+                    .d("reason", "unknownDirective")
+                    .d("namespace", info->directive->getNamespace())
+                    .d("name", info->directive->getName()));
+
+    const std::string exceptionMessage =
+        "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
+
+    sendExceptionEncounteredAndReportFailed(info, exceptionMessage, type);
+}
+
+void AlexaChannelControllerCapabilityAgent::executeProvideState(
+    const CapabilityTag& stateProviderName,
+    const ContextRequestToken contextRequestToken) {
+    ACSDK_DEBUG3(LX("executeProvideState"));
+    auto isError = false;
+    if (stateProviderName.endpointId != m_endpointId) {
+        ACSDK_ERROR(LX("provideStateFailed")
+                        .d("reason", "notExpectedEndpointId")
+                        .sensitive("endpointId", stateProviderName.endpointId));
+        isError = true;
+    }
+    if (stateProviderName.name != CHANNELSTATE_PROPERTY_NAME) {
+        ACSDK_ERROR(LX("provideStateFailed").d("reason", "notExpectedName").d("name", stateProviderName.name));
+        isError = true;
+    }
+    if (!m_isRetrievable) {
+        ACSDK_ERROR(LX("provideStateFailed").d("reason", "provideStateOnNotRetrievableProperty"));
+        isError = true;
+    }
+
+    if (isError) {
+        m_contextManager->provideStateUnavailableResponse(stateProviderName, contextRequestToken, false);
+        return;
+    }
+
+    std::unique_ptr<Channel> channel = m_channelController->getCurrentChannel();
+    if (channel == nullptr) {
+        ACSDK_ERROR(LX("provideStateFailed").d("reason", "EmptyChannelState"));
+        m_contextManager->provideStateUnavailableResponse(stateProviderName, contextRequestToken, false);
+        return;
+    }
+    m_contextManager->provideStateResponse(
+        stateProviderName, CapabilityState(buildCapabilityStateString(*channel)), contextRequestToken);
+}
+
+void AlexaChannelControllerCapabilityAgent::sendResponseEvent(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    const ChannelControllerInterface::Response& result,
+    std::unique_ptr<Channel> currentChannel) {
+    switch (result.type) {
+        case ChannelControllerInterface::Response::Type::SUCCESS: {
+            m_responseSender->sendResponseEvent(
+                info->directive->getInstance(),
+                info->directive->getCorrelationToken(),
+                AVSMessageEndpoint(m_endpointId),
+                buildCapabilityStateString(*currentChannel));
+            break;
+        }
+        case ChannelControllerInterface::Response::Type::FAILED_TOO_MANY_FAILED_ATTEMPTS:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+        case ChannelControllerInterface::Response::Type::FAILED_ENDPOINT_UNREACHABLE:
+            sendAlexaErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::ErrorResponseType::ENDPOINT_UNREACHABLE,
+                result.errorMessage);
+            break;
+        case ChannelControllerInterface::Response::Type::FAILED_INVALID_VALUE:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INVALID_VALUE, result.errorMessage);
+            break;
+        case ChannelControllerInterface::Response::Type::FAILED_ACTION_NOT_PERMITTED_FOR_CONTENT:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::ACTION_NOT_PERMITTED_FOR_CONTENT,
+                result.errorMessage);
+            break;
+        case ChannelControllerInterface::Response::Type::FAILED_NOT_SUBSCRIBED:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::NOT_SUBSCRIBED,
+                result.errorMessage);
+            break;
+        case ChannelControllerInterface::Response::Type::FAILED_INTERNAL_ERROR:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+    }
+}
+
+void AlexaChannelControllerCapabilityAgent::sendAlexaErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+    const std::string& responseMessage) {
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        alexaErrorResponseType,
+        responseMessage);
+}
+
+void AlexaChannelControllerCapabilityAgent::sendAlexaVideoErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType alexaVideoErrorResponseType,
+    const std::string& responseMessage) {
+    std::string payload =
+        R"({"type":")" +
+        AlexaInterfaceMessageSenderInterface::alexaVideoErrorResponseToString(alexaVideoErrorResponseType) +
+        R"(", "message":")" + responseMessage + R"("})";
+
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE,
+        payload);
+}
+
+void AlexaChannelControllerCapabilityAgent::onChannelChanged(std::unique_ptr<Channel> channel) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!m_isProactivelyReported) {
+        ACSDK_ERROR(LX("onChannelChangeFailed").d("reason", "invalidOnChannelChangedCall"));
+        return;
+    }
+    std::string capabilityStateString = buildCapabilityStateString(*channel);
+    m_executor.execute([this, capabilityStateString] {
+        ACSDK_DEBUG9(LX("onChannelChangedInExecutor"));
+        m_contextManager->reportStateChange(
+            CapabilityTag(NAMESPACE, CHANNELSTATE_PROPERTY_NAME, m_endpointId),
+            CapabilityState(capabilityStateString),
+            AlexaStateChangeCauseType::VOICE_INTERACTION);
+    });
+}
+
+std::string AlexaChannelControllerCapabilityAgent::buildCapabilityStateString(const Channel& channel) {
+    rapidjson::Document payloadJson(rapidjson::kObjectType);
+    auto& alloc = payloadJson.GetAllocator();
+
+    payloadJson.AddMember("number", channel.getNumber(), alloc);
+    payloadJson.AddMember("callSign", channel.getCallSign(), alloc);
+    payloadJson.AddMember("affiliateCallsign", channel.getAffiliateCallSign(), alloc);
+    payloadJson.AddMember("uri", channel.getURI(), alloc);
+
+    rapidjson::StringBuffer sb;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(sb);
+    payloadJson.Accept(writer);
+
+    return sb.GetString();
+}
+
+}  // namespace alexaChannelController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaChannelController/AlexaChannelController/src/AlexaChannelControllerFactory.cpp b/capabilities/AlexaChannelController/AlexaChannelController/src/AlexaChannelControllerFactory.cpp
new file mode 100644
index 0000000000..fd835f7f66
--- /dev/null
+++ b/capabilities/AlexaChannelController/AlexaChannelController/src/AlexaChannelControllerFactory.cpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/AlexaChannelController/AlexaChannelControllerFactory.h>
+
+#include <acsdk/AlexaChannelController/private/AlexaChannelControllerCapabilityAgent.h>
+
+namespace alexaClientSDK {
+namespace alexaChannelController {
+
+avsCommon::utils::Optional<AlexaChannelControllerFactory::ChannelControllerCapabilityAgentData>
+AlexaChannelControllerFactory::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<alexaChannelControllerInterfaces::ChannelControllerInterface>& channelController,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+    bool isProactivelyReported,
+    bool isRetrievable) {
+    AlexaChannelControllerFactory::ChannelControllerCapabilityAgentData channelControllerCapabilityAgentData;
+    auto channelControllerCA = AlexaChannelControllerCapabilityAgent::create(
+        endpointId,
+        channelController,
+        contextManager,
+        responseSender,
+        exceptionSender,
+        isProactivelyReported,
+        isRetrievable);
+    if (channelControllerCA) {
+        channelControllerCapabilityAgentData.capabilityConfigurationInterface = channelControllerCA;
+        channelControllerCapabilityAgentData.directiveHandler = channelControllerCA;
+        channelControllerCapabilityAgentData.requiresShutdown = channelControllerCA;
+        return avsCommon::utils::Optional<AlexaChannelControllerFactory::ChannelControllerCapabilityAgentData>(
+            channelControllerCapabilityAgentData);
+    }
+
+    return avsCommon::utils::Optional<AlexaChannelControllerFactory::ChannelControllerCapabilityAgentData>();
+}
+
+}  // namespace alexaChannelController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaChannelController/AlexaChannelController/src/CMakeLists.txt b/capabilities/AlexaChannelController/AlexaChannelController/src/CMakeLists.txt
new file mode 100644
index 0000000000..178d95e97f
--- /dev/null
+++ b/capabilities/AlexaChannelController/AlexaChannelController/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkAlexaChannelController")
+
+add_library(acsdkAlexaChannelController SHARED
+        AlexaChannelControllerCapabilityAgent.cpp
+        AlexaChannelControllerFactory.cpp)
+
+target_include_directories(acsdkAlexaChannelController PRIVATE
+        "${acsdkAlexaChannelController_SOURCE_DIR}/privateInclude")
+
+target_include_directories(acsdkAlexaChannelController PUBLIC
+        "${acsdkAlexaChannelController_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaChannelController AVSCommon Alexa acsdkAlexaChannelControllerInterfaces)
+
+# install target
+asdk_install()
diff --git a/capabilities/AlexaChannelController/AlexaChannelController/test/AlexaChannelControllerCapabilityAgentTest.cpp b/capabilities/AlexaChannelController/AlexaChannelController/test/AlexaChannelControllerCapabilityAgentTest.cpp
new file mode 100644
index 0000000000..735c9be675
--- /dev/null
+++ b/capabilities/AlexaChannelController/AlexaChannelController/test/AlexaChannelControllerCapabilityAgentTest.cpp
@@ -0,0 +1,676 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <acsdk/AlexaChannelController/private/AlexaChannelControllerCapabilityAgent.h>
+#include <acsdk/AlexaChannelControllerInterfaces/ChannelControllerInterface.h>
+#include <acsdk/AlexaChannelControllerInterfaces/ChannelControllerObserverInterface.h>
+
+#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
+#include <AVSCommon/SDKInterfaces/MockAlexaInterfaceMessageSender.h>
+#include <AVSCommon/SDKInterfaces/MockContextManager.h>
+#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/Timing/TimePoint.h>
+#include <AVSCommon/Utils/WaitEvent.h>
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace alexaChannelController {
+namespace test {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::memory;
+using namespace ::testing;
+
+using namespace alexaChannelController;
+using namespace alexaChannelControllerInterfaces;
+using namespace alexaChannelControllerTypes;
+
+// For readability.
+using EndpointIdentifier = endpoints::EndpointIdentifier;
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// Time of sample used for testing
+static const std::string TIME_OF_SAMPLE_TEST("2017-02-03T16:20:50.523Z");
+
+/// The namespace for capability agent.
+static const std::string NAMESPACE{"Alexa.ChannelController"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for ChangeChannel directive
+static const std::string NAME_CHANGECHANNEL{"ChangeChannel"};
+
+/// The name for SkipChannels directive
+static const std::string NAME_SKIPCHANNELS{"SkipChannels"};
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
+
+/// The test EndpointId
+static const EndpointIdentifier TEST_ENDPOINT_ID("testEndpointId");
+
+/// Event key.
+static const std::string EVENT("event");
+
+/// MessageId for testing.
+static const std::string MESSAGE_ID_TEST("MessageId_Test");
+
+/// DialogRequestId for testing.
+static const std::string DIALOG_REQUEST_ID_TEST("DialogRequestId_Test");
+
+/// Correlation token for testing.
+static const std::string CORRELATION_TOKEN_TEST("CorrelationToken_Test");
+
+/// Channel number for testing
+static const std::string TEST_CHANNEL_NUMBER{"256"};
+
+/// Channel call sign for testing
+static const std::string TEST_CHANNEL_CALLSIGN{"PBS"};
+
+/// Channel affiliate callsign for testing
+static const std::string TEST_CHANNEL_AFFILIATE_CALLSIGN{"affiliateCallSign"};
+
+/// Channel metadata name for testing
+static const std::string TEST_CHANNEL_METADATA_NAME{"Sample Channel"};
+
+/// Channel image URL for testing
+static const std::string TEST_CHANNEL_METADATA_IMAGE{"<URI>"};
+
+// Sample ChangeChannel payload
+static const std::string CHANGECHANNEL_PAYLOAD = R"({
+                                                  "channel": {
+                                                    "number": "9",
+                                                    "callSign": "PBS",
+                                                    "affiliateCallSign": "KCTS",
+                                                    "uri": "<channel uri>"
+                                                  },
+                                                  "channelMetadata": {
+                                                    "name": "Alternate channel name",
+                                                    "image": "<url for image>"
+                                                  }
+                                                })";
+
+// Sample SkipChannels increment payload
+static const std::string SKIPCHANNELS_INCREMENT_PAYLOAD = R"({
+                                              "channelCount" : 1
+                                            })";
+
+// Sample SkipChannels decrement payload
+static const std::string SKIPCHANNELS_DECREMENT_PAYLOAD = R"({
+                                              "channelCount" : -1
+                                            })";
+
+/// The name of channel property
+static const std::string CHANNELSTATE_PROPERTY_NAME{"channel"};
+
+class MockAlexaChannelControllerInterface : public ChannelControllerInterface {
+public:
+    MOCK_METHOD1(changeMock, Response(Channel* channel));
+    MOCK_METHOD0(incrementChannelMock, Response());
+    MOCK_METHOD0(decrementChannelMock, Response());
+    MOCK_METHOD0(getCurrentChannelMock, std::unique_ptr<Channel>());
+    MOCK_METHOD1(addObserverMock, bool(std::weak_ptr<ChannelControllerObserverInterface> observer));
+    MOCK_METHOD1(removeObserverMock, void(std::weak_ptr<ChannelControllerObserverInterface> observer));
+
+    Response change(std::unique_ptr<Channel> channel) {
+        return changeMock(channel.get());
+    }
+
+    Response incrementChannel() {
+        return incrementChannelMock();
+    }
+
+    Response decrementChannel() {
+        return decrementChannelMock();
+    }
+
+    std::unique_ptr<Channel> getCurrentChannel() {
+        return getCurrentChannelMock();
+    }
+
+    bool addObserver(std::weak_ptr<ChannelControllerObserverInterface> observer) {
+        return addObserverMock(observer);
+    }
+
+    void removeObserver(std::weak_ptr<ChannelControllerObserverInterface> observer) {
+        removeObserverMock(observer);
+    }
+};
+
+class AlexaChannelControllerCapabilityAgentTest : public ::testing::Test {
+public:
+    /// SetUp before each test case.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Constructor.
+    AlexaChannelControllerCapabilityAgentTest() :
+            m_channel{Channel::Create(
+                TEST_CHANNEL_NUMBER,
+                TEST_CHANNEL_CALLSIGN,
+                TEST_CHANNEL_AFFILIATE_CALLSIGN,
+                "",
+                TEST_CHANNEL_METADATA_NAME,
+                TEST_CHANNEL_METADATA_IMAGE)},
+            m_channelState{Channel::Create(
+                TEST_CHANNEL_NUMBER,
+                TEST_CHANNEL_CALLSIGN,
+                TEST_CHANNEL_AFFILIATE_CALLSIGN,
+                "",
+                TEST_CHANNEL_METADATA_NAME,
+                TEST_CHANNEL_METADATA_IMAGE)} {
+    }
+
+protected:
+    /**
+     * Function to create AlexaChannelControllerCapabilityAgent based on the reportable flags
+     * and sets required ContextManager and ChannelController mocks.
+     */
+    std::shared_ptr<AlexaChannelControllerCapabilityAgent> createCapabilityAgentAndSetExpects(
+        bool proactivelyReported,
+        bool retrievable);
+
+    /// A mock @c AlexaChannelControllerHandlerInterface object.
+    std::shared_ptr<StrictMock<MockAlexaChannelControllerInterface>> m_mockChannelController;
+
+    /// A mock @c AlexaChannelControllerObserverInterface object.
+    std::weak_ptr<ChannelControllerObserverInterface> m_observer;
+
+    // a context manager
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>> m_mockContextManager;
+
+    /// The mock @c MessageSenderInterface.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>> m_mockResponseSender;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>
+        m_mockDirectiveHandlerResult;
+
+    // Channel object used for ChangeChannel directive
+    std::unique_ptr<Channel> m_channel;
+
+    /// The test @c ChannelState
+    std::unique_ptr<Channel> m_channelState;
+};
+
+void AlexaChannelControllerCapabilityAgentTest::SetUp() {
+    m_mockExceptionSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult =
+        make_unique<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>();
+    m_mockChannelController = std::make_shared<StrictMock<MockAlexaChannelControllerInterface>>();
+    m_mockContextManager = std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>>();
+    m_mockResponseSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>>();
+
+    auto timePoint = avsCommon::utils::timing::TimePoint();
+    timePoint.setTime_ISO_8601(TIME_OF_SAMPLE_TEST);
+}
+
+void AlexaChannelControllerCapabilityAgentTest::TearDown() {
+}
+
+std::shared_ptr<AlexaChannelControllerCapabilityAgent> AlexaChannelControllerCapabilityAgentTest::
+    createCapabilityAgentAndSetExpects(bool proactivelyReported, bool retrievable) {
+    // ContextManager Mocks
+    if (retrievable) {
+        // Expects a non-null CA reference during create.
+        EXPECT_CALL(*m_mockContextManager, addStateProvider(_, ::testing::NotNull()));
+
+        // Expects a null when CA is shutdown.
+        EXPECT_CALL(*m_mockContextManager, removeStateProvider(_));
+    }
+
+    if (proactivelyReported) {
+        // addObserver Called during the initialization.
+        EXPECT_CALL(*m_mockChannelController, addObserverMock(_))
+            .WillOnce(WithArg<0>(Invoke([this](std::weak_ptr<ChannelControllerObserverInterface> observer) {
+                m_observer = observer;
+                return true;
+            })));
+
+        // removeObserver is called during the shutdown
+        EXPECT_CALL(*m_mockChannelController, removeObserverMock(_))
+            .WillOnce(WithArg<0>(
+                Invoke([this](std::weak_ptr<ChannelControllerObserverInterface> observer) { m_observer.reset(); })));
+    }
+
+    auto channelControllerCapabilityAgent = AlexaChannelControllerCapabilityAgent::create(
+        TEST_ENDPOINT_ID,
+        m_mockChannelController,
+        m_mockContextManager,
+        m_mockResponseSender,
+        m_mockExceptionSender,
+        proactivelyReported,
+        retrievable);
+    return channelControllerCapabilityAgent;
+}
+
+std::shared_ptr<AVSDirective> buildAVSDirective(std::string directiveName, std::string payload) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<avsCommon::avs::attachment::test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(
+        NAMESPACE, directiveName, MESSAGE_ID_TEST, DIALOG_REQUEST_ID_TEST, CORRELATION_TOKEN_TEST, INTERFACE_VERSION);
+    auto avsMessageEndpoint = AVSMessageEndpoint(TEST_ENDPOINT_ID);
+
+    return AVSDirective::create("", avsMessageHeader, payload, attachmentManager, "", avsMessageEndpoint);
+}
+
+/// Test that create() returns a nullptr if called with invalid arguments.
+TEST_F(AlexaChannelControllerCapabilityAgentTest, test_givenInvalidParameters_create_shouldFail) {
+    ASSERT_THAT(
+        AlexaChannelControllerCapabilityAgent::create(
+            "", m_mockChannelController, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender, true, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaChannelControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, nullptr, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender, true, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaChannelControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID,
+            m_mockChannelController,
+            nullptr,
+            m_mockResponseSender,
+            m_mockExceptionSender,
+            true,
+            true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaChannelControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID,
+            m_mockChannelController,
+            m_mockContextManager,
+            nullptr,
+            m_mockExceptionSender,
+            true,
+            true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaChannelControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockChannelController, m_mockContextManager, m_mockResponseSender, nullptr, true, true),
+        IsNull());
+}
+
+/**
+ * Test successful handling of ChangeChannel directive.
+ */
+TEST_F(AlexaChannelControllerCapabilityAgentTest, test_changeChannelDirective_successCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockChannelController, changeMock(_)).WillOnce(Invoke([](Channel* channel) {
+        return ChannelControllerInterface::Response{};
+    }));
+
+    EXPECT_CALL(*m_mockChannelController, getCurrentChannelMock()).WillOnce(InvokeWithoutArgs([this]() {
+        return Channel::Create(
+            m_channelState->getNumber(),
+            m_channelState->getCallSign(),
+            m_channelState->getAffiliateCallSign(),
+            m_channelState->getURI(),
+            m_channelState->getName(),
+            m_channelState->getImageURL());
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto channelControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(channelControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_CHANGECHANNEL, CHANGECHANNEL_PAYLOAD);
+    channelControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    channelControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    channelControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of ChangeChannel directive.
+ */
+TEST_F(AlexaChannelControllerCapabilityAgentTest, test_changeChannelDirective_errorCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockChannelController, changeMock(_)).WillOnce(Invoke([](Channel* channel) {
+        return ChannelControllerInterface::Response{
+            ChannelControllerInterface::Response::Type::FAILED_ENDPOINT_UNREACHABLE, "Unreachable Endpoint"};
+    }));
+
+    EXPECT_CALL(*m_mockChannelController, getCurrentChannelMock()).WillOnce(InvokeWithoutArgs([this]() {
+        return Channel::Create(
+            m_channelState->getNumber(),
+            m_channelState->getCallSign(),
+            m_channelState->getAffiliateCallSign(),
+            m_channelState->getURI(),
+            m_channelState->getName(),
+            m_channelState->getImageURL());
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+
+    auto channelControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(channelControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_CHANGECHANNEL, CHANGECHANNEL_PAYLOAD);
+    channelControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    channelControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    channelControllerCapabilityAgent->shutdown();
+}
+/**
+ * Test successful handling of SkipChannels directive with Increment Channel payload.
+ */
+TEST_F(AlexaChannelControllerCapabilityAgentTest, test_incrementChannelsDirective_successCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockChannelController, incrementChannelMock()).WillOnce(InvokeWithoutArgs([] {
+        return ChannelControllerInterface::Response{};
+    }));
+
+    EXPECT_CALL(*m_mockChannelController, getCurrentChannelMock()).WillOnce(InvokeWithoutArgs([this]() {
+        return Channel::Create(
+            m_channelState->getNumber(),
+            m_channelState->getCallSign(),
+            m_channelState->getAffiliateCallSign(),
+            m_channelState->getURI(),
+            m_channelState->getName(),
+            m_channelState->getImageURL());
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto channelControllerCapabilityAgent = createCapabilityAgentAndSetExpects(false, true);
+    ASSERT_THAT(channelControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_SKIPCHANNELS, SKIPCHANNELS_INCREMENT_PAYLOAD);
+    channelControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    channelControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    channelControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test successful handling of SkipChannels directive with Decrement payload.
+ */
+TEST_F(AlexaChannelControllerCapabilityAgentTest, test_decrementChannelsDirective_successCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockChannelController, decrementChannelMock()).WillOnce(InvokeWithoutArgs([] {
+        return ChannelControllerInterface::Response{};
+    }));
+
+    EXPECT_CALL(*m_mockChannelController, getCurrentChannelMock()).WillOnce(InvokeWithoutArgs([this]() {
+        return Channel::Create(
+            m_channelState->getNumber(),
+            m_channelState->getCallSign(),
+            m_channelState->getAffiliateCallSign(),
+            m_channelState->getURI(),
+            m_channelState->getName(),
+            m_channelState->getImageURL());
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto channelControllerCapabilityAgent = createCapabilityAgentAndSetExpects(false, true);
+    ASSERT_THAT(channelControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_SKIPCHANNELS, SKIPCHANNELS_DECREMENT_PAYLOAD);
+    channelControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    channelControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    channelControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of SkipChannels directive.
+ */
+TEST_F(AlexaChannelControllerCapabilityAgentTest, test_skipChannelsDirective_errorCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockChannelController, incrementChannelMock()).WillOnce(InvokeWithoutArgs([] {
+        return ChannelControllerInterface::Response{
+            ChannelControllerInterface::Response::Type::FAILED_ENDPOINT_UNREACHABLE, "Unreachable Endpoint"};
+    }));
+
+    EXPECT_CALL(*m_mockChannelController, getCurrentChannelMock()).WillOnce(InvokeWithoutArgs([this]() {
+        return Channel::Create(
+            m_channelState->getNumber(),
+            m_channelState->getCallSign(),
+            m_channelState->getAffiliateCallSign(),
+            m_channelState->getURI(),
+            m_channelState->getName(),
+            m_channelState->getImageURL());
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+    auto channelControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(channelControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_SKIPCHANNELS, SKIPCHANNELS_INCREMENT_PAYLOAD);
+    channelControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    channelControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    channelControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaChannelControllerCapabilityAgentTest, test_unknownDirective) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    auto channelControllerCapabilityAgent = createCapabilityAgentAndSetExpects(false, true);
+    ASSERT_THAT(channelControllerCapabilityAgent, NotNull());
+
+    channelControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE, ""), std::move(m_mockDirectiveHandlerResult));
+    channelControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    channelControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test triggering of reportStateChange and subsequent call to the
+ * ContextManager to build the context.
+ */
+TEST_F(AlexaChannelControllerCapabilityAgentTest, test_reportStateChange_successCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+    auto channelControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(channelControllerCapabilityAgent, NotNull());
+
+    EXPECT_CALL(*m_mockChannelController, changeMock(_)).WillOnce(Invoke([this](Channel* channel) {
+        auto m_observer_shared = m_observer.lock();
+        std::unique_ptr<Channel> channelState = Channel::Create(
+            m_channelState->getNumber(),
+            m_channelState->getCallSign(),
+            m_channelState->getAffiliateCallSign(),
+            m_channelState->getURI(),
+            m_channelState->getName(),
+            m_channelState->getImageURL());
+        m_observer_shared->onChannelChanged(std::move(channelState));
+        return ChannelControllerInterface::Response{};
+    }));
+
+    EXPECT_CALL(*m_mockContextManager, reportStateChange(_, _, _))
+        .WillOnce(InvokeWithoutArgs([channelControllerCapabilityAgent] {
+            const unsigned int stateRequestToken = 1;
+            channelControllerCapabilityAgent->provideState(
+                CapabilityTag(NAMESPACE, CHANNELSTATE_PROPERTY_NAME, TEST_ENDPOINT_ID), stateRequestToken);
+        }));
+
+    EXPECT_CALL(*m_mockChannelController, getCurrentChannelMock()).WillOnce(InvokeWithoutArgs([this]() {
+        return Channel::Create(
+            m_channelState->getNumber(),
+            m_channelState->getCallSign(),
+            m_channelState->getAffiliateCallSign(),
+            m_channelState->getURI(),
+            m_channelState->getName(),
+            m_channelState->getImageURL());
+    }));
+
+    EXPECT_CALL(*m_mockContextManager, provideStateResponse(_, _, _)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    m_mockChannelController->changeMock(m_channel.get());
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    channelControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test triggering of reportStateChange and subsequent failure to get the getChannelState and
+ * call to the ContextManager to report the failure.
+ */
+TEST_F(AlexaChannelControllerCapabilityAgentTest, test_reportStateChange_errorCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+    auto channelControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(channelControllerCapabilityAgent, NotNull());
+
+    EXPECT_CALL(*m_mockChannelController, changeMock(_)).WillOnce(Invoke([this](Channel* channel) {
+        auto m_observer_shared = m_observer.lock();
+        std::unique_ptr<Channel> channelState = Channel::Create(
+            m_channelState->getNumber(),
+            m_channelState->getCallSign(),
+            m_channelState->getAffiliateCallSign(),
+            m_channelState->getURI(),
+            m_channelState->getName(),
+            m_channelState->getImageURL());
+        m_observer_shared->onChannelChanged(std::move(channelState));
+        return ChannelControllerInterface::Response{};
+    }));
+    EXPECT_CALL(*m_mockContextManager, reportStateChange(_, _, _))
+        .WillOnce(InvokeWithoutArgs([channelControllerCapabilityAgent] {
+            const unsigned int stateRequestToken = 1;
+            channelControllerCapabilityAgent->provideState(
+                CapabilityTag(NAMESPACE, CHANNELSTATE_PROPERTY_NAME, TEST_ENDPOINT_ID), stateRequestToken);
+        }));
+    EXPECT_CALL(*m_mockChannelController, getCurrentChannelMock()).WillOnce(InvokeWithoutArgs([]() {
+        return Channel::Create("", "", "", "", "", "");
+    }));
+    EXPECT_CALL(*m_mockContextManager, provideStateUnavailableResponse(_, _, _))
+        .WillOnce(InvokeWithoutArgs([&waitEvent]() { waitEvent.wakeUp(); }));
+    m_mockChannelController->changeMock(m_channel.get());
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    channelControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive with both proactively reported and retrievable set.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaChannelControllerCapabilityAgentTest, test_unknownDirectiveWithProactivelyReportedAndRetrievableTrue) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    auto channelControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(channelControllerCapabilityAgent, NotNull());
+
+    channelControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE, ""), std::move(m_mockDirectiveHandlerResult));
+    channelControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    channelControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive with both proactively reported and retrievable as false.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaChannelControllerCapabilityAgentTest, test_unknownDirectiveWithProactivelyReportedAndRetrievableFalse) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    auto channelControllerCapabilityAgent = createCapabilityAgentAndSetExpects(false, false);
+    ASSERT_THAT(channelControllerCapabilityAgent, NotNull());
+
+    channelControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE, ""), std::move(m_mockDirectiveHandlerResult));
+    channelControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    channelControllerCapabilityAgent->shutdown();
+}
+
+}  // namespace test
+}  // namespace alexaChannelController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaChannelController/AlexaChannelController/test/CMakeLists.txt b/capabilities/AlexaChannelController/AlexaChannelController/test/CMakeLists.txt
new file mode 100644
index 0000000000..be27d13e9c
--- /dev/null
+++ b/capabilities/AlexaChannelController/AlexaChannelController/test/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+
+set(INCLUDE_PATH
+    "${acsdkAlexaChannelController_SOURCE_DIR}/include"
+    "${acsdkAlexaChannelController_SOURCE_DIR}/privateInclude"
+    "${acsdkAlexaChannelControllerInterfaces_SOURCE_DIR}/include"
+    "${ASDK_INCLUDE_DIRS}")
+
+    set(LIBS
+            "AttachmentCommonTestLib"
+            "acsdkAlexaChannelController"
+            "SDKInterfacesTests")
+
+    discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
diff --git a/capabilities/AlexaChannelController/AlexaChannelControllerInterfaces/CMakeLists.txt b/capabilities/AlexaChannelController/AlexaChannelControllerInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..254c8435e2
--- /dev/null
+++ b/capabilities/AlexaChannelController/AlexaChannelControllerInterfaces/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.1)
+project(acsdkAlexaChannelControllerInterfaces LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_library(acsdkAlexaChannelControllerInterfaces INTERFACE)
+
+target_include_directories(acsdkAlexaChannelControllerInterfaces INTERFACE
+        "${acsdkAlexaChannelControllerInterfaces_SOURCE_DIR}/include")
+
+# install interface
+asdk_install_interface()
diff --git a/capabilities/AlexaChannelController/AlexaChannelControllerInterfaces/include/acsdk/AlexaChannelControllerInterfaces/ChannelControllerInterface.h b/capabilities/AlexaChannelController/AlexaChannelControllerInterfaces/include/acsdk/AlexaChannelControllerInterfaces/ChannelControllerInterface.h
new file mode 100644
index 0000000000..3322058e3b
--- /dev/null
+++ b/capabilities/AlexaChannelController/AlexaChannelControllerInterfaces/include/acsdk/AlexaChannelControllerInterfaces/ChannelControllerInterface.h
@@ -0,0 +1,155 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXACHANNELCONTROLLERINTERFACES_CHANNELCONTROLLERINTERFACE_H_
+#define ACSDK_ALEXACHANNELCONTROLLERINTERFACES_CHANNELCONTROLLERINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include "ChannelControllerObserverInterface.h"
+#include "ChannelType.h"
+
+namespace alexaClientSDK {
+namespace alexaChannelControllerInterfaces {
+
+/**
+ * The @c ChannelControllerInterface carries out channel controller actions such as changing the channel, and
+ * skipping (going to the next or previous) channels.
+ *
+ * @note Implementations of this interface must be thread-safe.
+ */
+class ChannelControllerInterface {
+public:
+    /**
+     * Utility object used for reporting ChannelController handler response.
+     */
+    struct Response {
+        /**
+         * Enum for the different response types understood by the ChannelController capability agent.
+         */
+        enum class Type {
+            /// ChannelController Request was handled successfully.
+            SUCCESS,
+            /// The number of allowed failed attempts to perform a ChannelController action has been exceeded.
+            FAILED_TOO_MANY_FAILED_ATTEMPTS,
+            /// Indicates the endpoint is unreachable or offline.
+            FAILED_ENDPOINT_UNREACHABLE,
+            /// The directive contains a value that is not valid for the target endpoint, such as an invalid channel
+            /// value.
+            FAILED_INVALID_VALUE,
+            /// Indicates the content does not allow the ChannelController action requested.
+            FAILED_ACTION_NOT_PERMITTED_FOR_CONTENT,
+            /// Indicates the user is not subscribed to the content for a channel.
+            FAILED_NOT_SUBSCRIBED,
+            /// Indicates that an error occurred that can't be described by one of the other error types.
+            FAILED_INTERNAL_ERROR
+        };
+
+        /**
+         * Default Constructor, set the response type to success.
+         */
+        Response() : type{Type::SUCCESS} {};
+
+        /**
+         * Constructor.
+         * @param type The response type @c Type
+         * @param errorMessage The error message if @c responseType is other than SUCCESS.
+         *
+         */
+        Response(Type type, std::string errorMessage) : type{type}, errorMessage{std::move(errorMessage)} {};
+
+        /// Response type for ChannelController handler responses.
+        Type type;
+
+        /// The error message for logging if the @c responseType is anything other than SUCCESS, for the purposes of
+        /// aiding debugging.
+        std::string errorMessage;
+    };
+
+    /**
+     * Virtual destructor to assure proper cleanup of derived types.
+     */
+    virtual ~ChannelControllerInterface() = default;
+
+    /**
+     * Changes the channel on the endpoint.
+     *
+     * @param channel The channel related values such as number, callSign and affiliateCallSign, uri, as well as
+     * metadata for the channel like name and image.
+     * @return Whether the channel was successfully changed, or if an error was encountered in the process.
+     * @c ChannelControllerInterface::Response.type should return SUCCESS if no errors were encountered.
+     * Otherwise, @c ChannelControllerInterface::Response.type should contain the corresponding error code along with a
+     * log message in @c ChannelControllerInterface::Response.errorMessage.
+     */
+    virtual Response change(std::unique_ptr<alexaChannelControllerTypes::Channel> channel) = 0;
+
+    /**
+     * Jump to the previous channel on the the endpoint. Decrementing the first channel must wrap to the end of the
+     * list.
+     *
+     * @return Whether the channel was successfully decremented, or if an error was encountered in the process.
+     * @c ChannelControllerInterface::Response.type should return SUCCESS if no errors were encountered.
+     * Otherwise, @c ChannelControllerInterface::Response.type should contain the corresponding error code along with a
+     * log message in @c ChannelControllerInterface::Response.errorMessage.
+     *
+     */
+    virtual Response decrementChannel() = 0;
+
+    /**
+     * Jump to the next channel on the the endpoint. Incrementing the last channel must wrap to the beginning of the
+     * list.
+     *
+     * @return Whether the channel was successfully incremented, or if an error was encountered in the process.
+     * @c ChannelControllerInterface::Response.type should return SUCCESS if no errors were encountered.
+     * Otherwise, @c ChannelControllerInterface::Response.type should contain the corresponding error code along with a
+     * log message in @c ChannelControllerInterface::Response.errorMessage.
+     *
+     */
+    virtual Response incrementChannel() = 0;
+
+    /**
+     * Get the current channel information of the endpoint.
+     *
+     * @return the current @c Channel of the endpoint
+     */
+    virtual std::unique_ptr<alexaChannelControllerTypes::Channel> getCurrentChannel() = 0;
+
+    /**
+     * Adds a @c ChannelControllerObserverInterface observer.
+     *
+     * @note If ChannelControllerInterface implementation has configured its instance's property as proactively
+     * reported, then it is required to notify observers of @c ChannelControllerObserverInterface for any change in
+     * its property state. This includes notifying the value when the device starts, if it is different from the last
+     * reported value.
+     *
+     * @param observer The pointer to the @c ChannelControllerObserverInterface.
+     * @return @c true if the object supports observer notification and observer was successfully added; otherwise,
+     * return @c false
+     */
+    virtual bool addObserver(std::weak_ptr<ChannelControllerObserverInterface> observer) = 0;
+
+    /**
+     * Removes a observer of @c ChannelControllerObserverInterface.
+     *
+     * @param observer The pointer to the @c ChannelControllerObserverInterface.
+     */
+    virtual void removeObserver(std::weak_ptr<ChannelControllerObserverInterface> observer) = 0;
+};
+
+}  // namespace alexaChannelControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXACHANNELCONTROLLERINTERFACES_CHANNELCONTROLLERINTERFACE_H_
diff --git a/capabilities/AlexaChannelController/AlexaChannelControllerInterfaces/include/acsdk/AlexaChannelControllerInterfaces/ChannelControllerObserverInterface.h b/capabilities/AlexaChannelController/AlexaChannelControllerInterfaces/include/acsdk/AlexaChannelControllerInterfaces/ChannelControllerObserverInterface.h
new file mode 100644
index 0000000000..c5680170df
--- /dev/null
+++ b/capabilities/AlexaChannelController/AlexaChannelControllerInterfaces/include/acsdk/AlexaChannelControllerInterfaces/ChannelControllerObserverInterface.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXACHANNELCONTROLLERINTERFACES_CHANNELCONTROLLEROBSERVERINTERFACE_H_
+#define ACSDK_ALEXACHANNELCONTROLLERINTERFACES_CHANNELCONTROLLEROBSERVERINTERFACE_H_
+
+#include "ChannelType.h"
+
+namespace alexaClientSDK {
+namespace alexaChannelControllerInterfaces {
+/**
+ * This interface is used to observe changes to the channel value properties of an endpoint
+ * that are caused by the @c ChannelControllerInterface.
+ */
+class ChannelControllerObserverInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~ChannelControllerObserverInterface() = default;
+
+    /**
+     * Notifies the change in the channel value properties of the endpoint.
+     *
+     * @param channel The channel related values such as number, callSign and affiliateCallSign, uri, as well as
+     * metadata for the channel like name and image.
+     */
+    virtual void onChannelChanged(std::unique_ptr<alexaChannelControllerTypes::Channel> channel) = 0;
+};
+
+}  // namespace alexaChannelControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXACHANNELCONTROLLERINTERFACES_CHANNELCONTROLLEROBSERVERINTERFACE_H_
diff --git a/capabilities/AlexaChannelController/AlexaChannelControllerInterfaces/include/acsdk/AlexaChannelControllerInterfaces/ChannelType.h b/capabilities/AlexaChannelController/AlexaChannelControllerInterfaces/include/acsdk/AlexaChannelControllerInterfaces/ChannelType.h
new file mode 100644
index 0000000000..83c4007d2a
--- /dev/null
+++ b/capabilities/AlexaChannelController/AlexaChannelControllerInterfaces/include/acsdk/AlexaChannelControllerInterfaces/ChannelType.h
@@ -0,0 +1,164 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_ALEXACHANNELCONTROLLERINTERFACES_CHANNELTYPE_H_
+#define ACSDK_ALEXACHANNELCONTROLLERINTERFACES_CHANNELTYPE_H_
+
+#include <memory>
+#include <string>
+
+#include <AVSCommon/Utils/Logger/LoggerUtils.h>
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace alexaChannelControllerTypes {
+
+/**
+ * A channel type that represents the identifying data for a channel.
+ *
+ */
+class Channel {
+public:
+    /**
+     * Creates a new Channel object.
+     *
+     * @param number The number for the channel.
+     * @param callSign The call sign for the channel.
+     * @param affiliateCallSign The affiliate call sign for the channel.
+     * @param uri The URI of the channel
+     * @param name The name of the channel
+     * @param imageURL The URL for image or logo for the channel
+     * @note For a channel object to be valid, it must contain at least one of number, callSign,
+     * affiliateCallSign, uri, or name fields.
+     * @return @c nullptr if the object is invalid, else a new instance of @c Channel
+     */
+    static std::unique_ptr<Channel> Create(
+        std::string number,
+        std::string callSign,
+        std::string affiliateCallSign,
+        std::string uri,
+        std::string name,
+        std::string imageURL) {
+        if (number.empty() && callSign.empty() && affiliateCallSign.empty() && uri.empty() && name.empty()) {
+            avsCommon::utils::logger::acsdkError(
+                avsCommon::utils::logger::LogEntry("Channel", "CreateFailed").d("reason", "InvalidParams"));
+            return nullptr;
+        }
+        return std::unique_ptr<Channel>(new Channel(
+            std::move(number),
+            std::move(callSign),
+            std::move(affiliateCallSign),
+            std::move(uri),
+            std::move(name),
+            std::move(imageURL)));
+    }
+
+    /*
+     * Get the number for the channel.
+     *
+     * @return empty string if the number is empty, otherwise the channel number.
+     */
+    std::string getNumber() const {
+        return number.value();
+    }
+
+    /*
+     * Get the call sign for the channel.
+     *
+     * @return empty string if the call sign is empty, otherwise the channel call sign.
+     */
+    std::string getCallSign() const {
+        return callSign.value();
+    }
+
+    /*
+     * Get the affiliate call sign for the channel.
+     *
+     * @return empty string if the affiliate call sign is empty, otherwise the channel affiliate call sign.
+     */
+    std::string getAffiliateCallSign() const {
+        return affiliateCallSign.value();
+    }
+
+    /*
+     * Get the URI for the channel.
+     *
+     * @return empty string if the URI is empty, otherwise the channel URI.
+     */
+    std::string getURI() const {
+        return uri.value();
+    }
+
+    /*
+     * Get the name for the channel.
+     *
+     * @return empty string if the name is empty, otherwise the channel name.
+     */
+    std::string getName() const {
+        return name.value();
+    }
+
+    /*
+     * Get the image or logo URL for the channel.
+     *
+     * @return empty string if the image or logo URL is empty, otherwise the image URL.
+     */
+    std::string getImageURL() const {
+        return imageURL.value();
+    }
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param number The number for the channel.
+     * @param callSign The call sign for the channel.
+     * @param affiliateCallSign The affiliate call sign for the channel.
+     * @param uri The URI of the channel
+     * @param name The name of the channel
+     * @param imageURL The URL for image or logo for the channel
+     */
+    Channel(
+        std::string number,
+        std::string callSign,
+        std::string affiliateCallSign,
+        std::string uri,
+        std::string name,
+        std::string imageURL) :
+            number{std::move(number)},
+            callSign{std::move(callSign)},
+            affiliateCallSign{std::move(affiliateCallSign)},
+            uri{std::move(uri)},
+            name{std::move(name)},
+            imageURL{std::move(imageURL)} {
+    }
+
+    /// The number for the channel, such as "256" or "13.1"
+    avsCommon::utils::Optional<std::string> number;
+    /// The call sign for the channel.
+    avsCommon::utils::Optional<std::string> callSign;
+    /// The affiliate call sign for the channel, typically associated with a local broadcaster for that channel.
+    avsCommon::utils::Optional<std::string> affiliateCallSign;
+    /// The URI of the channel, which identifies content, such as
+    /// entity://provider/channel/<number>.
+    avsCommon::utils::Optional<std::string> uri;
+    /// The name for the channel.
+    avsCommon::utils::Optional<std::string> name;
+    /// The URL of an image or logo for the channel.
+    avsCommon::utils::Optional<std::string> imageURL;
+};
+
+}  // namespace alexaChannelControllerTypes
+}  // namespace alexaClientSDK
+#endif  // ACSDK_ALEXACHANNELCONTROLLERINTERFACES_CHANNELTYPE_H_
diff --git a/capabilities/AlexaChannelController/CMakeLists.txt b/capabilities/AlexaChannelController/CMakeLists.txt
new file mode 100644
index 0000000000..0b8b303c58
--- /dev/null
+++ b/capabilities/AlexaChannelController/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(AlexaChannelController LANGUAGES CXX)
+
+add_subdirectory("AlexaChannelController")
+add_subdirectory("AlexaChannelControllerInterfaces")
diff --git a/capabilities/AlexaKeypadController/.clang-format b/capabilities/AlexaKeypadController/.clang-format
new file mode 100644
index 0000000000..3d1ec24482
--- /dev/null
+++ b/capabilities/AlexaKeypadController/.clang-format
@@ -0,0 +1,102 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
+
diff --git a/capabilities/AlexaKeypadController/CMakeLists.txt b/capabilities/AlexaKeypadController/CMakeLists.txt
new file mode 100644
index 0000000000..4f259f3f2a
--- /dev/null
+++ b/capabilities/AlexaKeypadController/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(AlexaKeypadController LANGUAGES CXX)
+
+add_subdirectory("acsdkAlexaKeypadController")
+add_subdirectory("acsdkAlexaKeypadControllerInterfaces")
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/CMakeLists.txt b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/CMakeLists.txt
new file mode 100644
index 0000000000..8096e4531f
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+project(acsdkAlexaKeypadController LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/include/acsdkAlexaKeypadController/AlexaKeypadControllerFactory.h b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/include/acsdkAlexaKeypadController/AlexaKeypadControllerFactory.h
new file mode 100644
index 0000000000..4bbb011feb
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/include/acsdkAlexaKeypadController/AlexaKeypadControllerFactory.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAKEYPADCONTROLLER_ALEXAKEYPADCONTROLLERFACTORY_H_
+#define ACSDKALEXAKEYPADCONTROLLER_ALEXAKEYPADCONTROLLERFACTORY_H_
+
+#include "acsdkAlexaKeypadControllerInterfaces/AlexaKeypadControllerInterface.h"
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/DirectiveHandlerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaKeypadController {
+
+/**
+ * This factory can be used to create a new @c AlexaKeypadControllerCapabilityAgent and return a generic object that
+ * contains certain interfaces which can be used for registering this capability agent to an endpoint.
+ */
+class AlexaKeypadControllerFactory {
+public:
+    /// This object used to register the capability agent to an endpoint.
+    struct AlexaKeypadControllerCapabilityAgentData {
+        /// The interface that this object will use to perform the keypad controller operations.
+        std::shared_ptr<avsCommon::sdkInterfaces::DirectiveHandlerInterface> directiveHandler;
+        /// The interface that provides the configurations of the capabilities being implemented by this capability
+        /// agent.
+        std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface> capabilityConfigurationInterface;
+        /// The method for cleaning up this capability agent objects during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+    /**
+     * Creates a new AlexaKeypadController capability agent configuration
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param keypadController An interface that this object will use to perform the keypad controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the reponse to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @return An @c Optional object with no valid value if the inputs are invalid, else a new
+     * @c AlexaKeypadControllerCapabilityAgentData object.
+     */
+    static avsCommon::utils::Optional<AlexaKeypadControllerCapabilityAgentData> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        std::shared_ptr<acsdkAlexaKeypadControllerInterfaces::AlexaKeypadControllerInterface> keypadController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender);
+};
+
+}  // namespace acsdkAlexaKeypadController
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAKEYPADCONTROLLER_ALEXAKEYPADCONTROLLERFACTORY_H_
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/privateInclude/acsdkAlexaKeypadController/AlexaKeypadControllerCapabilityAgent.h b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/privateInclude/acsdkAlexaKeypadController/AlexaKeypadControllerCapabilityAgent.h
new file mode 100644
index 0000000000..134af326cb
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/privateInclude/acsdkAlexaKeypadController/AlexaKeypadControllerCapabilityAgent.h
@@ -0,0 +1,175 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAKEYPADCONTROLLER_PRIVATEINCLUDE_ACSDKALEXAKEYPADCONTROLLER_ALEXAKEYPADCONTROLLERCAPABILITYAGENT_H_
+#define ACSDKALEXAKEYPADCONTROLLER_PRIVATEINCLUDE_ACSDKALEXAKEYPADCONTROLLER_ALEXAKEYPADCONTROLLERCAPABILITYAGENT_H_
+
+#include <string>
+
+#include <acsdkAlexaKeypadControllerInterfaces/AlexaKeypadControllerInterface.h>
+#include <acsdkAlexaKeypadControllerInterfaces/Keystroke.h>
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaKeypadController {
+
+/**
+ * The @c AlexaKeypadControllerCapabilityAgent is responsible for handling Alexa.KeypadController directives and calls
+ * the @c AlexaKeypadControllerInterface APIs.
+ *
+ * This class implements a @c CapabilityAgent that handles the @c Alexa.KeypadController Interface.
+ */
+class AlexaKeypadControllerCapabilityAgent
+        : public avsCommon::avs::CapabilityAgent
+        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<AlexaKeypadControllerCapabilityAgent> {
+public:
+    /**
+     * Create an instance of @c AlexaKeypadControllerCapabilityAgent.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param keypadController An interface that this object will use to perform the keypad controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the reponse to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @return @c nullptr if the inputs are invalid, else a new instance of @c AlexaKeypadControllerCapabilityAgent.
+     */
+    static std::shared_ptr<AlexaKeypadControllerCapabilityAgent> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<acsdkAlexaKeypadControllerInterfaces::AlexaKeypadControllerInterface>& keypadController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender);
+
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
+    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
+    /// @}
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param keypadController An interface that this object will use to perform the keypad controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the reponse to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     */
+    AlexaKeypadControllerCapabilityAgent(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<acsdkAlexaKeypadControllerInterfaces::AlexaKeypadControllerInterface>& keypadController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender);
+
+    /**
+     * Remove a directive from the map of message IDs to DirectiveInfo instances.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
+     */
+    void removeDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Send the handling completed notification and clean up the resources.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Called on executor to handle any unknown directives received.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param type The @c ExceptionErrorType.
+     */
+    void executeUnknownDirective(std::shared_ptr<DirectiveInfo> info, avsCommon::avs::ExceptionErrorType type);
+
+    /**
+     * Call methods of @c AlexaInterfaceMessageSenderInterface based the endpoint's response for a controller method
+     * call.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param result This contains the endpoint's response of a controller call.
+     */
+    void executeSendResponseEvent(
+        const std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info,
+        const acsdkAlexaKeypadControllerInterfaces::AlexaKeypadControllerInterface::Response& result);
+
+    /**
+     * Send Alexa interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaErrorResponseType Alexa interface error response type.
+     * @param responseMessage Alexa interface error response message.
+     */
+    void sendAlexaErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+        const std::string& responseMessage);
+
+    /**
+     * Send Alexa.Video interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaVideoErrorResponseType Alexa.Video interface error response type.
+     * @param responseMessage Alexa.Video interface error response message.
+     */
+    void sendAlexaVideoErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType
+            alexaVideoErrorResponseType,
+        const std::string& responseMessage);
+
+    /// Endpoint the capability agent associated to.
+    avsCommon::sdkInterfaces::endpoints::EndpointIdentifier m_endpointId;
+
+    /// Reference to @c AlexaKeypadControllerInterface
+    std::shared_ptr<acsdkAlexaKeypadControllerInterfaces::AlexaKeypadControllerInterface> m_keypadController;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The @c AlexaInterfaceMessageSenderInterface used to send event messages.
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> m_responseSender;
+
+    /// This is the worker thread for the @c AlexaKeypadControllerCapabilityAgent.
+    avsCommon::utils::threading::Executor m_executor;
+};
+
+}  // namespace acsdkAlexaKeypadController
+}  // namespace alexaClientSDK
+#endif  // ACSDKALEXAKEYPADCONTROLLER_PRIVATEINCLUDE_ACSDKALEXAKEYPADCONTROLLER_ALEXAKEYPADCONTROLLERCAPABILITYAGENT_H_
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/src/AlexaKeypadControllerCapabilityAgent.cpp b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/src/AlexaKeypadControllerCapabilityAgent.cpp
new file mode 100644
index 0000000000..06a91f19c4
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/src/AlexaKeypadControllerCapabilityAgent.cpp
@@ -0,0 +1,332 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/JSON/JSONGenerator.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "acsdkAlexaKeypadController/AlexaKeypadControllerCapabilityAgent.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaKeypadController {
+
+using namespace avsCommon::utils::json;
+using namespace avsCommon::avs;
+using namespace avsCommon;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::configuration;
+
+using namespace acsdkAlexaKeypadControllerInterfaces;
+
+/// String to identify log entries originating from this file.
+static const std::string TAG{"AlexaKeypadControllerCapabilityAgent"};
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+/// The namespace for this capability agent.
+static const std::string NAMESPACE{"Alexa.KeypadController"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for SendKeystroke directive
+static const std::string NAME_SENDKEYSTROKE{"SendKeystroke"};
+
+/// The key in the directive payload
+static const char KEYPAD_KEY[] = "keystroke";
+
+/// The key for Keys
+static const std::string KEYS{"keys"};
+
+/// The namespace for Alexa.Video.ErrorResponse.
+static const std::string NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE{"Alexa.Video"};
+
+/**
+ * Generates a json object of type array from a set of @c Keystroke values.
+ *
+ * @param keysSet A set of keystroke values to be generated into json format.
+ * @return Returns the json object of an array of keystroke properties.
+ */
+static std::string generateKeystrokeJson(std::set<acsdkAlexaKeypadControllerInterfaces::Keystroke> keysSet) {
+    if (keysSet.empty()) {
+        return "";
+    }
+
+    std::string keyStrokeJson = "[";
+    for (auto& key : keysSet) {
+        auto keystrokeString = acsdkAlexaKeypadControllerInterfaces::keystrokeToString(key);
+        keyStrokeJson += "\"" + keystrokeString + "\",";
+    }
+    keyStrokeJson.pop_back();  // remove extra comma
+    keyStrokeJson += "]";
+
+    ACSDK_DEBUG5(LX(__func__).sensitive("configuration", keyStrokeJson));
+    return keyStrokeJson;
+}
+
+std::shared_ptr<AlexaKeypadControllerCapabilityAgent> AlexaKeypadControllerCapabilityAgent::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<AlexaKeypadControllerInterface>& keypadController,
+    const std::shared_ptr<ContextManagerInterface>& contextManager,
+    const std::shared_ptr<AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<ExceptionEncounteredSenderInterface>& exceptionSender) {
+    if (endpointId.empty()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "emptyEndpointId"));
+        return nullptr;
+    }
+    if (!keypadController) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullKeypadController"));
+        return nullptr;
+    }
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManager"));
+        return nullptr;
+    }
+    if (!responseSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullResponseSender"));
+        return nullptr;
+    }
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    auto alexaKeypadControllerCapabilityAgent =
+        std::shared_ptr<AlexaKeypadControllerCapabilityAgent>(new AlexaKeypadControllerCapabilityAgent(
+            endpointId, keypadController, contextManager, responseSender, exceptionSender));
+
+    if (!alexaKeypadControllerCapabilityAgent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "instantiationFailed"));
+        return nullptr;
+    }
+
+    return alexaKeypadControllerCapabilityAgent;
+}
+
+AlexaKeypadControllerCapabilityAgent::AlexaKeypadControllerCapabilityAgent(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<AlexaKeypadControllerInterface>& keypadController,
+    const std::shared_ptr<ContextManagerInterface>& contextManager,
+    const std::shared_ptr<AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<ExceptionEncounteredSenderInterface>& exceptionSender) :
+        CapabilityAgent{NAMESPACE, exceptionSender},
+        RequiresShutdown{"AlexaKeypadControllerCapabilityAgent"},
+        m_endpointId{endpointId},
+        m_keypadController{keypadController},
+        m_contextManager{contextManager},
+        m_responseSender{responseSender} {
+}
+
+void AlexaKeypadControllerCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!directive) {
+        ACSDK_ERROR(LX("handleDirectiveImmediatelyFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+}
+
+void AlexaKeypadControllerCapabilityAgent::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX("preHandleDirective"));
+    // do nothing.
+}
+
+void AlexaKeypadControllerCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+
+    m_executor.submit([this, info] {
+        ACSDK_DEBUG5(LX("handleDirectiveInExecutor"));
+        const std::string directiveName = info->directive->getName();
+        if (!info->directive->getEndpoint().hasValue() ||
+            (info->directive->getEndpoint().value().endpointId != m_endpointId)) {
+            executeUnknownDirective(info, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        AlexaKeypadControllerInterface::Response result;
+        if (directiveName == NAME_SENDKEYSTROKE) {
+            auto payload = info->directive->getPayload();
+            std::string keystrokeString;
+            if (!jsonUtils::retrieveValue(payload, KEYPAD_KEY, &keystrokeString)) {
+                std::string errorMessage = "keypadKeyNotFound";
+                ACSDK_ERROR(LX("sendKeystrokeDirectiveFailed").m(errorMessage));
+                sendExceptionEncounteredAndReportFailed(info, errorMessage);
+                return;
+            }
+
+            auto keystroke = acsdkAlexaKeypadControllerInterfaces::stringToKeystroke(keystrokeString);
+            if (!keystroke.hasValue()) {
+                std::string errorMessage = "invalidKeypadKey";
+                ACSDK_ERROR(LX("sendKeystrokeDirectiveFailed").m(errorMessage));
+                sendExceptionEncounteredAndReportFailed(info, errorMessage);
+                return;
+            }
+
+            result = m_keypadController->handleKeystroke(keystroke.value());
+        } else {
+            ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "unexpectedDirective").d("name", directiveName));
+            executeUnknownDirective(info, ExceptionErrorType::UNSUPPORTED_OPERATION);
+            return;
+        }
+
+        executeSetHandlingCompleted(info);
+        executeSendResponseEvent(info, result);
+    });
+}
+
+void AlexaKeypadControllerCapabilityAgent::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("cancelDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    if (!info->directive->getEndpoint().hasValue() ||
+        info->directive->getEndpoint().value().endpointId != m_endpointId) {
+        ACSDK_WARN(LX("cancelDirective").d("reason", "notExpectedEndpointId"));
+    }
+    removeDirective(info);
+}
+
+DirectiveHandlerConfiguration AlexaKeypadControllerCapabilityAgent::getConfiguration() const {
+    ACSDK_DEBUG5(LX(__func__));
+    DirectiveHandlerConfiguration configuration;
+    auto neitherNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUMS_NONE, false);
+    configuration[{NAMESPACE, NAME_SENDKEYSTROKE, m_endpointId}] = neitherNonBlockingPolicy;
+
+    return configuration;
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> AlexaKeypadControllerCapabilityAgent::
+    getCapabilityConfigurations() {
+    auto additionalConfigurations = CapabilityConfiguration::AdditionalConfigurations();
+    auto supportedKeys = m_keypadController->getSupportedKeys();
+    auto supportedKeysJson = generateKeystrokeJson(supportedKeys);
+    additionalConfigurations[KEYS] = supportedKeysJson;
+
+    CapabilityConfiguration configuration{CapabilityConfiguration::ALEXA_INTERFACE_TYPE,
+                                          NAMESPACE,
+                                          INTERFACE_VERSION,
+                                          Optional<std::string>(),  // instance
+                                          Optional<CapabilityConfiguration::Properties>(),
+                                          additionalConfigurations};
+    return {std::make_shared<avsCommon::avs::CapabilityConfiguration>(configuration)};
+}
+
+void AlexaKeypadControllerCapabilityAgent::doShutdown() {
+    m_executor.shutdown();
+    m_keypadController.reset();
+    m_responseSender.reset();
+    m_contextManager.reset();
+}
+
+void AlexaKeypadControllerCapabilityAgent::removeDirective(std::shared_ptr<DirectiveInfo> info) {
+    if (info->directive && info->result) {
+        CapabilityAgent::removeDirective(info->directive->getMessageId());
+    }
+}
+
+void AlexaKeypadControllerCapabilityAgent::executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info) {
+    if (info && info->result) {
+        info->result->setCompleted();
+    }
+    removeDirective(info);
+}
+
+void AlexaKeypadControllerCapabilityAgent::executeUnknownDirective(
+    std::shared_ptr<DirectiveInfo> info,
+    ExceptionErrorType type) {
+    ACSDK_ERROR(LX("executeUnknownDirectiveFailed")
+                    .d("reason", "unknownDirective")
+                    .d("namespace", info->directive->getNamespace())
+                    .d("name", info->directive->getName()));
+
+    const std::string exceptionMessage =
+        "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
+
+    sendExceptionEncounteredAndReportFailed(info, exceptionMessage, type);
+}
+
+void AlexaKeypadControllerCapabilityAgent::executeSendResponseEvent(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    const AlexaKeypadControllerInterface::Response& result) {
+    switch (result.type) {
+        case AlexaKeypadControllerInterface::Response::Type::SUCCESS:
+            m_responseSender->sendResponseEvent(
+                info->directive->getInstance(),
+                info->directive->getCorrelationToken(),
+                AVSMessageEndpoint(m_endpointId));
+            break;
+        case AlexaKeypadControllerInterface::Response::Type::NO_INFORMATION_AVAILABLE:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+        case AlexaKeypadControllerInterface::Response::Type::INVALID_SELECTION:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INVALID_VALUE, result.errorMessage);
+            break;
+        case AlexaKeypadControllerInterface::Response::Type::KEYSTROKE_NOT_SUPPORTED:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::ACTION_NOT_PERMITTED_FOR_CONTENT,
+                result.errorMessage);
+            break;
+        case AlexaKeypadControllerInterface::Response::Type::INTERNAL_ERROR:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+    }
+}
+
+void AlexaKeypadControllerCapabilityAgent::sendAlexaErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+    const std::string& responseMessage) {
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        alexaErrorResponseType,
+        responseMessage);
+}
+
+void AlexaKeypadControllerCapabilityAgent::sendAlexaVideoErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType alexaVideoErrorResponseType,
+    const std::string& responseMessage) {
+    std::string payload =
+        R"({"type":")" +
+        AlexaInterfaceMessageSenderInterface::alexaVideoErrorResponseToString(alexaVideoErrorResponseType) +
+        R"(", "message":")" + responseMessage + R"("})";
+
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE,
+        payload);
+}
+
+}  // namespace acsdkAlexaKeypadController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/src/AlexaKeypadControllerFactory.cpp b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/src/AlexaKeypadControllerFactory.cpp
new file mode 100644
index 0000000000..a5850da134
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/src/AlexaKeypadControllerFactory.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkAlexaKeypadController/AlexaKeypadControllerFactory.h"
+#include "acsdkAlexaKeypadController/AlexaKeypadControllerCapabilityAgent.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaKeypadController {
+
+avsCommon::utils::Optional<AlexaKeypadControllerFactory::AlexaKeypadControllerCapabilityAgentData>
+AlexaKeypadControllerFactory::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    std::shared_ptr<acsdkAlexaKeypadControllerInterfaces::AlexaKeypadControllerInterface> keypadController,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender) {
+    AlexaKeypadControllerFactory::AlexaKeypadControllerCapabilityAgentData alexaKeypadControllerCapabilityAgentData;
+    auto keypadControllerCA = acsdkAlexaKeypadController::AlexaKeypadControllerCapabilityAgent::create(
+        endpointId, keypadController, contextManager, responseSender, exceptionSender);
+    if (keypadControllerCA) {
+        alexaKeypadControllerCapabilityAgentData.capabilityConfigurationInterface = keypadControllerCA;
+        alexaKeypadControllerCapabilityAgentData.directiveHandler = keypadControllerCA;
+        alexaKeypadControllerCapabilityAgentData.requiresShutdown = keypadControllerCA;
+        return avsCommon::utils::Optional<AlexaKeypadControllerFactory::AlexaKeypadControllerCapabilityAgentData>(
+            alexaKeypadControllerCapabilityAgentData);
+    }
+
+    return avsCommon::utils::Optional<AlexaKeypadControllerFactory::AlexaKeypadControllerCapabilityAgentData>();
+}
+
+}  // namespace acsdkAlexaKeypadController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/src/CMakeLists.txt b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/src/CMakeLists.txt
new file mode 100644
index 0000000000..d58191180b
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkAlexaKeypadController")
+
+add_library(acsdkAlexaKeypadController
+        AlexaKeypadControllerCapabilityAgent.cpp
+        AlexaKeypadControllerFactory.cpp)
+
+target_include_directories(acsdkAlexaKeypadController PRIVATE
+        "${acsdkAlexaKeypadController_SOURCE_DIR}/privateInclude")
+
+target_include_directories(acsdkAlexaKeypadController PUBLIC
+        "${acsdkAlexaKeypadController_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaKeypadController AVSCommon Alexa acsdkAlexaKeypadControllerInterfaces acsdkManufactory)
+
+# install target
+asdk_install()
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/test/AlexaKeypadControllerCapabilityAgentTest.cpp b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/test/AlexaKeypadControllerCapabilityAgentTest.cpp
new file mode 100644
index 0000000000..b084c792e5
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/test/AlexaKeypadControllerCapabilityAgentTest.cpp
@@ -0,0 +1,280 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <acsdkAlexaKeypadControllerInterfaces/AlexaKeypadControllerInterface.h>
+#include <acsdkAlexaKeypadControllerInterfaces/Keystroke.h>
+#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
+#include <AVSCommon/SDKInterfaces/MockContextManager.h>
+#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/SDKInterfaces/MockAlexaInterfaceMessageSender.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/Timing/TimePoint.h>
+#include <AVSCommon/Utils/WaitEvent.h>
+
+#include "acsdkAlexaKeypadController/AlexaKeypadControllerCapabilityAgent.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaKeypadController {
+namespace test {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::memory;
+using namespace ::testing;
+
+using namespace acsdkAlexaKeypadController;
+using namespace acsdkAlexaKeypadControllerInterfaces;
+
+// For readability.
+using EndpointIdentifier = endpoints::EndpointIdentifier;
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// The namespace for capability agent.
+static const std::string NAMESPACE{"Alexa.KeypadController"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for SendKeystroke directive
+static const std::string NAME_SENDKEYSTROKE{"SendKeystroke"};
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
+
+/// The test EndpointId
+static const EndpointIdentifier TEST_ENDPOINT_ID("testEndpointId");
+
+/// Event key.
+static const std::string EVENT("event");
+
+/// Header key.
+static const std::string HEADER("header");
+
+/// MessageId key.
+static const std::string MESSAGE_ID("messageId");
+
+/// MessageId for testing.
+static const std::string MESSAGE_ID_TEST("MessageId_Test");
+
+/// Dialog request Id key.
+static const std::string DIALOG_REQUEST_ID("dialogRequestId");
+
+/// DialogRequestId for testing.
+static const std::string DIALOG_REQUEST_ID_TEST("DialogRequestId_Test");
+
+/// Correlation token key.
+static const std::string CORRELATION_TOKEN("correlationToken");
+
+/// Correlation token for testing.
+static const std::string CORRELATION_TOKEN_TEST("CorrelationToken_Test");
+
+/// Event correlation token key.
+static const std::string EVENT_CORRELATION_TOKEN("eventCorrelationToken");
+
+/// Event correlation for testing.
+static const std::string EVENT_CORRELATION_TOKEN_TEST("EventCorrelationToken_Test");
+
+// Sample KeypadController payload
+static const std::string PAYLOAD = R"delim( { "keystroke": "SELECT" } )delim";
+
+class MockAlexaKeypadControllerInterface : public AlexaKeypadControllerInterface {
+public:
+    using HandleKeystroke = acsdkAlexaKeypadControllerInterfaces::AlexaKeypadControllerInterface::Response;
+    using GetSupportedKeys = std::set<Keystroke>;
+
+    MOCK_METHOD1(handleKeystroke, HandleKeystroke(Keystroke keystroke));
+    MOCK_METHOD0(getSupportedKeys, GetSupportedKeys());
+};
+
+class AlexaKeypadControllerCapabilityAgentTest : public ::testing::Test {
+public:
+    /// SetUp before each test case.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Constructor.
+    AlexaKeypadControllerCapabilityAgentTest() {
+    }
+
+protected:
+    /**
+     * Function to create AlexaKeypadControllerCapabilityAgent based on the reportable flags and sets required
+     * ContextManager and KeypadController mocks.
+     */
+    std::shared_ptr<AlexaKeypadControllerCapabilityAgent> createCapabilityAgentAndSetExpects();
+
+    /// A mock @c AlexaKeypadControllerInterface object.
+    std::shared_ptr<StrictMock<MockAlexaKeypadControllerInterface>> m_mockKeypadController;
+
+    /// The mock @c MockContextManager
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>> m_mockContextManager;
+
+    /// The mock @c MessageSenderInterface.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>> m_mockResponseSender;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>
+        m_mockDirectiveHandlerResult;
+
+    /// A pointer to an instance of the KeypadController that will be instantiated per test.
+    std::shared_ptr<AlexaKeypadControllerCapabilityAgent> m_KeypadControllerCapablityAgent;
+};
+
+void AlexaKeypadControllerCapabilityAgentTest::SetUp() {
+    m_mockExceptionSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult =
+        make_unique<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>();
+    m_mockKeypadController = std::make_shared<StrictMock<MockAlexaKeypadControllerInterface>>();
+    m_mockContextManager = std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>>();
+    m_mockResponseSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>>();
+    m_KeypadControllerCapablityAgent = AlexaKeypadControllerCapabilityAgent::create(
+        TEST_ENDPOINT_ID, m_mockKeypadController, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender);
+}
+
+void AlexaKeypadControllerCapabilityAgentTest::TearDown() {
+}
+
+std::shared_ptr<AVSDirective> buildAVSDirective(std::string directiveName) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<avsCommon::avs::attachment::test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(
+        NAMESPACE, directiveName, MESSAGE_ID_TEST, DIALOG_REQUEST_ID_TEST, CORRELATION_TOKEN_TEST, INTERFACE_VERSION);
+    auto avsMessageEndpoint = AVSMessageEndpoint(TEST_ENDPOINT_ID);
+
+    return AVSDirective::create("", avsMessageHeader, PAYLOAD, attachmentManager, "", avsMessageEndpoint);
+}
+
+/// Test that create() returns a nullptr if called with invalid arguments.
+TEST_F(AlexaKeypadControllerCapabilityAgentTest, test_givenInvalidParameters_create_shouldFail) {
+    ASSERT_THAT(
+        AlexaKeypadControllerCapabilityAgent::create(
+            "", m_mockKeypadController, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaKeypadControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, nullptr, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaKeypadControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockKeypadController, nullptr, m_mockResponseSender, m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaKeypadControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockKeypadController, m_mockContextManager, nullptr, m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaKeypadControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockKeypadController, m_mockContextManager, m_mockResponseSender, nullptr),
+        IsNull());
+}
+
+/**
+ * Test successful handling of SendKeystroke directive.
+ */
+TEST_F(AlexaKeypadControllerCapabilityAgentTest, test_sendKeystrokeDirective_successCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockKeypadController, handleKeystroke(_)).WillOnce(WithArg<0>(Invoke([](Keystroke keystroke) {
+        return AlexaKeypadControllerInterface::Response();
+    })));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    ASSERT_THAT(m_KeypadControllerCapablityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_SENDKEYSTROKE);
+    m_KeypadControllerCapablityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_KeypadControllerCapablityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    m_KeypadControllerCapablityAgent->shutdown();
+}
+
+/**
+ * Test error path of SendKeystroke directive.
+ */
+TEST_F(AlexaKeypadControllerCapabilityAgentTest, test_sendKeystrokeDirective_errorCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockKeypadController, handleKeystroke(_)).WillOnce(WithArg<0>(Invoke([](Keystroke keystroke) {
+        AlexaKeypadControllerInterface::Response keypadControllerResponse;
+        keypadControllerResponse.type = AlexaKeypadControllerInterface::Response::Type::INTERNAL_ERROR;
+        return keypadControllerResponse;
+    })));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+    ASSERT_THAT(m_KeypadControllerCapablityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_SENDKEYSTROKE);
+    m_KeypadControllerCapablityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_KeypadControllerCapablityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    m_KeypadControllerCapablityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaKeypadControllerCapabilityAgentTest, test_unknownDirective) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    ASSERT_THAT(m_KeypadControllerCapablityAgent, NotNull());
+
+    m_KeypadControllerCapablityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE), std::move(m_mockDirectiveHandlerResult));
+    m_KeypadControllerCapablityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    m_KeypadControllerCapablityAgent->shutdown();
+}
+
+}  // namespace test
+}  // namespace acsdkAlexaKeypadController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/test/CMakeLists.txt b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/test/CMakeLists.txt
new file mode 100644
index 0000000000..111dc68520
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadController/test/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+
+set(INCLUDE_PATH
+    "${acsdkAlexaKeypadController_SOURCE_DIR}/include"
+    "${acsdkAlexaKeypadController_SOURCE_DIR}/privateInclude"
+    "${acsdkAlexaKeypadControllerInterfaces_SOURCE_DIR}/include"
+    "${AVSCommon_SOURCE_DIR}/AVS/test")
+
+set(LIBS
+    "acsdkAlexaKeypadController"
+    "SDKInterfacesTests"
+    "AttachmentCommonTestLib")
+
+discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/CMakeLists.txt b/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..63027d0ffd
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(acsdkAlexaKeypadControllerInterfaces LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/include/acsdkAlexaKeypadControllerInterfaces/AlexaKeypadControllerInterface.h b/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/include/acsdkAlexaKeypadControllerInterfaces/AlexaKeypadControllerInterface.h
new file mode 100644
index 0000000000..3cc8ca8af2
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/include/acsdkAlexaKeypadControllerInterfaces/AlexaKeypadControllerInterface.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAKEYPADCONTROLLERINTERFACES_ALEXAKEYPADCONTROLLERINTERFACE_H_
+#define ACSDKALEXAKEYPADCONTROLLERINTERFACES_ALEXAKEYPADCONTROLLERINTERFACE_H_
+
+#include <set>
+#include <string>
+
+#include <AVSCommon/Utils/Optional.h>
+
+#include "acsdkAlexaKeypadControllerInterfaces/Keystroke.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaKeypadControllerInterfaces {
+
+/**
+ * The AlexaKeypadControllerInterface carries out keypad controller actions such as moving up, down, left, right or
+ * scrolling through voice-control.
+ *
+ * An implementation of the AlexaKeypadControllerInterface. Sends information to device for sendKeystroke results.
+ *
+ * @note Implementations of this interface must be thread-safe.
+ */
+class AlexaKeypadControllerInterface {
+public:
+    /**
+     * Utility object used for reporting KeypadController response.
+     *
+     * @c type should be `SUCCESS` if there are no errors while executing keypad controller operation.
+     * Otherwise, it should return the corresponding error response along with a log message @c errorMessage that would
+     * be logged in the cloud, for the purposes of aiding debugging.
+     */
+    struct Response {
+        /**
+         * Enum for the different error types understood by the AlexaKeypadController capability agent.
+         */
+        enum class Type {
+            /// Device processed command successfully without any errors
+            SUCCESS,
+
+            /// Indicates there is no additional information available when 'INFO' OR 'MORE' operation is invoked
+            NO_INFORMATION_AVAILABLE,
+
+            /// Indicates the element cannot be selected when 'SELECT' operation is invoked
+            INVALID_SELECTION,
+
+            /// Indicates the keystroke operation is not supported on the device.
+            KEYSTROKE_NOT_SUPPORTED,
+
+            /// An error occurred that can't be described by one of the other error types. For example, a runtime
+            /// exception occurred. We recommend that you always send a more specific error type, if possible.
+            INTERNAL_ERROR
+        };
+
+        /**
+         * Default Constructor. Set the type to SUCCESS.
+         */
+        Response() : type{Type::SUCCESS} {};
+
+        /// Response type for KeypadController handler responses.
+        Type type;
+
+        /// The error message for logging if the @c type is any other than SUCCESS, for the purposes of aiding
+        /// debugging.
+        std::string errorMessage;
+    };
+
+    /**
+     * Virtual destructor to assure proper cleanup of derived types.
+     */
+    virtual ~AlexaKeypadControllerInterface() = default;
+
+    /**
+     * Execute keystroke operation on the device
+     *
+     * @param keystroke The @c Keystroke value user asked for
+     * @return A @c Response to indicate whether keystroke event was successfully executed or
+     * encountered an error while executing.
+     */
+    virtual Response handleKeystroke(Keystroke keystroke) = 0;
+
+    /**
+     * Returns all supported keystrokes the device is expected to understand.
+     *
+     * @return A @c Keystroke set object that contains supported key stroke properties. e.g. UP, DOWN, LEFT, RIGHT,
+     * SELECT
+     */
+    virtual std::set<Keystroke> getSupportedKeys() = 0;
+};
+
+}  // namespace acsdkAlexaKeypadControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAKEYPADCONTROLLERINTERFACES_ALEXAKEYPADCONTROLLERINTERFACE_H_
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/include/acsdkAlexaKeypadControllerInterfaces/Keystroke.h b/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/include/acsdkAlexaKeypadControllerInterfaces/Keystroke.h
new file mode 100644
index 0000000000..129eb150d1
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/include/acsdkAlexaKeypadControllerInterfaces/Keystroke.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAKEYPADCONTROLLERINTERFACES_KEYSTROKE_H_
+#define ACSDKALEXAKEYPADCONTROLLERINTERFACES_KEYSTROKE_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaKeypadControllerInterfaces {
+
+/**
+ * The Keystroke enumeration carries out keypad controller actions such as moving up, down, left, right or scrolling
+ * through voice-control.
+ */
+enum class Keystroke {
+    /// Move up one unit
+    UP,
+
+    /// Move down one unit
+    DOWN,
+
+    /// Move left one unit
+    LEFT,
+
+    /// Move right one unit
+    RIGHT,
+
+    /// Select the element or item that has focus
+    SELECT,
+
+    /// Scroll in the up direction
+    PAGE_UP,
+
+    /// Scroll in the down direction
+    PAGE_DOWN,
+
+    /// Scroll in the left direction
+    PAGE_LEFT,
+
+    /// Scroll in the right direction
+    PAGE_RIGHT,
+
+    /// Jump to an additional detail page
+    INFO,
+
+    /// Display more information about the onscreen elment that has focus. For example, show content that's
+    /// offscreen
+    MORE,
+
+    /// Simulate the behavior of the back button on the remote control. For example, navigate back to the previous
+    /// screen.
+    BACK
+
+};
+
+/**
+ * Convert a @c Keystroke enum to its corresponding string value. Note that any @c keystroke that does not map
+ * to @c Keystroke enum value will return an empty string.
+ *
+ * @param keystroke The keystroke value to convert.
+ * @return The corresponding string value for @c keystroke. Returns an empty string if @c keystroke does not map
+ * to a @c Keystroke enum.
+ */
+std::string keystrokeToString(Keystroke keystroke);
+
+/**
+ * Convert a string to a corresponding @c Keystroke enum value. Note that any @c keystrokeString that does not
+ * map to @c Keystroke enum value will return an @c Optional object with no value.
+ *
+ * @param keystrokeString The keystroke string to convert.
+ * @return An @c Optional object, with the value as the corresponding @c Keystroke enum value for @c keystrokeString
+ * if there is a match. Otherwise, return an @c Optional object with no value.
+ */
+avsCommon::utils::Optional<Keystroke> stringToKeystroke(const std::string& keystrokeString);
+
+}  // namespace acsdkAlexaKeypadControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAKEYPADCONTROLLERINTERFACES_KEYSTROKE_H_
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/src/CMakeLists.txt b/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/src/CMakeLists.txt
new file mode 100644
index 0000000000..9775ffc6ea
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/src/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkAlexaKeypadControllerInterfaces")
+
+add_library(acsdkAlexaKeypadControllerInterfaces
+        Keystroke.cpp)
+
+target_include_directories(acsdkAlexaKeypadControllerInterfaces PUBLIC
+        "${acsdkAlexaKeypadControllerInterfaces_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaKeypadControllerInterfaces AVSCommon Alexa)
+
+# install target
+asdk_install()
diff --git a/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/src/Keystroke.cpp b/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/src/Keystroke.cpp
new file mode 100644
index 0000000000..039b8bd577
--- /dev/null
+++ b/capabilities/AlexaKeypadController/acsdkAlexaKeypadControllerInterfaces/src/Keystroke.cpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkAlexaKeypadControllerInterfaces/Keystroke.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaKeypadControllerInterfaces {
+
+std::string keystrokeToString(Keystroke keystroke) {
+    switch (keystroke) {
+        case Keystroke::UP:
+            return "UP";
+        case Keystroke::DOWN:
+            return "DOWN";
+        case Keystroke::LEFT:
+            return "LEFT";
+        case Keystroke::RIGHT:
+            return "RIGHT";
+        case Keystroke::SELECT:
+            return "SELECT";
+        case Keystroke::PAGE_UP:
+            return "PAGE_UP";
+        case Keystroke::PAGE_DOWN:
+            return "PAGE_DOWN";
+        case Keystroke::PAGE_LEFT:
+            return "PAGE_LEFT";
+        case Keystroke::PAGE_RIGHT:
+            return "PAGE_RIGHT";
+        case Keystroke::INFO:
+            return "INFO";
+        case Keystroke::MORE:
+            return "MORE";
+        case Keystroke::BACK:
+            return "BACK";
+    }
+
+    return "";
+}
+
+avsCommon::utils::Optional<Keystroke> stringToKeystroke(const std::string& keystrokeString) {
+    avsCommon::utils::Optional<Keystroke> keystroke;
+    if ("UP" == keystrokeString) {
+        keystroke = avsCommon::utils::Optional<Keystroke>(Keystroke::UP);
+    } else if ("DOWN" == keystrokeString) {
+        keystroke = avsCommon::utils::Optional<Keystroke>(Keystroke::DOWN);
+    } else if ("LEFT" == keystrokeString) {
+        keystroke = avsCommon::utils::Optional<Keystroke>(Keystroke::LEFT);
+    } else if ("RIGHT" == keystrokeString) {
+        keystroke = avsCommon::utils::Optional<Keystroke>(Keystroke::RIGHT);
+    } else if ("SELECT" == keystrokeString) {
+        keystroke = avsCommon::utils::Optional<Keystroke>(Keystroke::SELECT);
+    } else if ("PAGE_UP" == keystrokeString) {
+        keystroke = avsCommon::utils::Optional<Keystroke>(Keystroke::PAGE_UP);
+    } else if ("PAGE_DOWN" == keystrokeString) {
+        keystroke = avsCommon::utils::Optional<Keystroke>(Keystroke::PAGE_DOWN);
+    } else if ("PAGE_LEFT" == keystrokeString) {
+        keystroke = avsCommon::utils::Optional<Keystroke>(Keystroke::PAGE_LEFT);
+    } else if ("PAGE_RIGHT" == keystrokeString) {
+        keystroke = avsCommon::utils::Optional<Keystroke>(Keystroke::PAGE_RIGHT);
+    } else if ("INFO" == keystrokeString) {
+        keystroke = avsCommon::utils::Optional<Keystroke>(Keystroke::INFO);
+    } else if ("MORE" == keystrokeString) {
+        keystroke = avsCommon::utils::Optional<Keystroke>(Keystroke::MORE);
+    } else if ("BACK" == keystrokeString) {
+        keystroke = avsCommon::utils::Optional<Keystroke>(Keystroke::BACK);
+    }
+
+    return keystroke;
+}
+
+}  // namespace acsdkAlexaKeypadControllerInterfaces
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaLauncher/.clang-format b/capabilities/AlexaLauncher/.clang-format
new file mode 100644
index 0000000000..3d1ec24482
--- /dev/null
+++ b/capabilities/AlexaLauncher/.clang-format
@@ -0,0 +1,102 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
+
diff --git a/capabilities/AlexaLauncher/CMakeLists.txt b/capabilities/AlexaLauncher/CMakeLists.txt
new file mode 100644
index 0000000000..8b5ae784d5
--- /dev/null
+++ b/capabilities/AlexaLauncher/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(AlexaLauncher LANGUAGES CXX)
+
+add_subdirectory("acsdkAlexaLauncher")
+add_subdirectory("acsdkAlexaLauncherInterfaces")
diff --git a/capabilities/AlexaLauncher/acsdkAlexaLauncher/CMakeLists.txt b/capabilities/AlexaLauncher/acsdkAlexaLauncher/CMakeLists.txt
new file mode 100644
index 0000000000..e4c84a335c
--- /dev/null
+++ b/capabilities/AlexaLauncher/acsdkAlexaLauncher/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+project(acsdkAlexaLauncher LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
\ No newline at end of file
diff --git a/capabilities/AlexaLauncher/acsdkAlexaLauncher/include/acsdkAlexaLauncher/AlexaLauncherFactory.h b/capabilities/AlexaLauncher/acsdkAlexaLauncher/include/acsdkAlexaLauncher/AlexaLauncherFactory.h
new file mode 100644
index 0000000000..a362c7d833
--- /dev/null
+++ b/capabilities/AlexaLauncher/acsdkAlexaLauncher/include/acsdkAlexaLauncher/AlexaLauncherFactory.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXALAUNCHER_ALEXALAUNCHERFACTORY_H_
+#define ACSDKALEXALAUNCHER_ALEXALAUNCHERFACTORY_H_
+
+#include <acsdkAlexaLauncherInterfaces/AlexaLauncherInterface.h>
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/DirectiveHandlerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaLauncher {
+
+/**
+ * This factory can be used to create a new @c AlexaLauncherCapabilityAgent
+ * and return a generic object that contains certain interfaces which can be used
+ * for registering this capability agent to an endpoint.
+ */
+class AlexaLauncherFactory {
+public:
+    /**
+     * This structure contains the interfaces to interact with the AlexaLauncher Capability Agent.
+     */
+    struct AlexaLauncherCapabilityAgentData {
+        /// Interface for handling @c AVSDirectives
+        std::shared_ptr<avsCommon::sdkInterfaces::DirectiveHandlerInterface> directiveHandler;
+        /// Interface providing CapabilitiesDelegate access to the version and configurations of the capabilities.
+        std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface> capabilityConfigurationInterface;
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+    /**
+     * Creates a new AlexaLauncher capability agent configuration.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param launcher An interface that this object will use to perform the launcher operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isProactivelyReported Whether property changes are proactively reported to Alexa in a change
+     * report.
+     * @param isRetrievable Whether properties can be retrieved when Alexa sends a state report request to the
+     * endpoint.
+     * @return An @c Optional object with no valid value if the inputs are invalid, else a new
+     *  @c AlexaLauncherCapabilityAgentData object.
+     */
+    static avsCommon::utils::Optional<AlexaLauncherCapabilityAgentData> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        std::shared_ptr<acsdkAlexaLauncherInterfaces::AlexaLauncherInterface> launcher,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        bool isProactivelyReported,
+        bool isRetrievable);
+};
+
+}  // namespace acsdkAlexaLauncher
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXALAUNCHER_ALEXALAUNCHERFACTORY_H_
diff --git a/capabilities/AlexaLauncher/acsdkAlexaLauncher/privateInclude/acsdkAlexaLauncher/AlexaLauncherCapabilityAgent.h b/capabilities/AlexaLauncher/acsdkAlexaLauncher/privateInclude/acsdkAlexaLauncher/AlexaLauncherCapabilityAgent.h
new file mode 100644
index 0000000000..a0b26ce4c0
--- /dev/null
+++ b/capabilities/AlexaLauncher/acsdkAlexaLauncher/privateInclude/acsdkAlexaLauncher/AlexaLauncherCapabilityAgent.h
@@ -0,0 +1,253 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXALAUNCHER_PRIVATEINCLUDE_ACSDKALEXALAUNCHER_ALEXALAUNCHERCAPABILITYAGENT_H_
+#define ACSDKALEXALAUNCHER_PRIVATEINCLUDE_ACSDKALEXALAUNCHER_ALEXALAUNCHERCAPABILITYAGENT_H_
+
+#include <string>
+
+#include <Alexa/AlexaInterfaceMessageSender.h>
+#include <Alexa/AlexaInterfaceMessageSenderInternalInterface.h>
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/AVS/CapabilityState.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include <acsdkAlexaLauncherInterfaces/AlexaLauncherTargetState.h>
+#include <acsdkAlexaLauncherInterfaces/AlexaLauncherInterface.h>
+#include <acsdkAlexaLauncherInterfaces/AlexaLauncherObserverInterface.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaLauncher {
+
+/**
+ * The @c AlexaLauncherCapabilityAgent is responsible for handling Alexa.Launcher directives.
+ *
+ * This class implements a @c CapabilityAgent that handles the @c Alexa.Launcher Interface.
+ */
+class AlexaLauncherCapabilityAgent
+        : public avsCommon::avs::CapabilityAgent
+        , public alexaClientSDK::acsdkAlexaLauncherInterfaces::AlexaLauncherObserverInterface
+        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<AlexaLauncherCapabilityAgent> {
+public:
+    /**
+     * Create an instance of @c AlexaLauncherCapabilityAgent.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param launcher An interface that this object will use to perform the launcher operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isProactivelyReported Whether property changes are proactively reported to Alexa in a change
+     * report.
+     * @param isRetrievable Whether properties can be retrieved when Alexa sends a state report request to the
+     * endpoint.
+     * @return @c nullptr if the inputs are invalid, else a new instance of @c AlexaLauncherCapabilityAgent.
+     */
+    static std::shared_ptr<AlexaLauncherCapabilityAgent> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<acsdkAlexaLauncherInterfaces::AlexaLauncherInterface>& launcher,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        bool isProactivelyReported,
+        bool isRetrievable);
+
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
+    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name StateProviderInterface Functions
+    /// @{
+    void provideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken) override;
+    bool canStateBeRetrieved() override;
+    bool hasReportableStateProperties() override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
+    /// @}
+
+    /// @name AlexaLauncherObserverInterface Functions
+    /// @{
+    void onLauncherTargetChanged(const acsdkAlexaLauncherInterfaces::TargetState& targetState) override;
+    /// @}
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param launcher An interface that this object will use to perform the launcher operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the reponse to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isProactivelyReported Whether property changes are proactively reported to Alexa in a change
+     * report.
+     * @param isRetrievable Whether properties can be retrieved when Alexa sends a state report request to the
+     * endpoint.
+     */
+    AlexaLauncherCapabilityAgent(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<acsdkAlexaLauncherInterfaces::AlexaLauncherInterface>& launcher,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        bool isProactivelyReported,
+        bool isRetrievable);
+
+    /**
+     * Initialize this object.
+     *
+     * @return @c true if successful, @c false otherwise.
+     */
+    bool initialize();
+
+    /**
+     * Remove a directive from the map of message IDs to DirectiveInfo instances.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
+     */
+    void removeDirective(const std::shared_ptr<DirectiveInfo>& info);
+
+    /**
+     * Send the handling completed notification and clean up the resources.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void executeSetHandlingCompleted(const std::shared_ptr<DirectiveInfo>& info);
+
+    /**
+     * Called on executor to handle any unknown directives received.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param type The @c ExceptionErrorType.
+     */
+    void executeUnknownDirective(const std::shared_ptr<DirectiveInfo>& info, avsCommon::avs::ExceptionErrorType type);
+
+    /**
+     * Gets the current launcher target state from endpoint and notifies @c ContextManager
+     *
+     * @param stateProviderName Provides the property name and used in the @c ContextManager methods.
+     * @param contextRequestToken The token to be used when providing the response to @c ContextManager
+     */
+    void executeProvideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken);
+
+    /**
+     * Call methods of @c AlexaInterfaceMessageSenderInterface based the endpoint's response for a controller method
+     * call.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param result This contains the endpoint's response of a controller call.
+     */
+    void executeSendResponseEvent(
+        const std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info,
+        const acsdkAlexaLauncherInterfaces::AlexaLauncherInterface::Response result);
+
+    /**
+     * Helper method to build the @c CapabilityState
+     *
+     * @param target The launcher target state defined using @c Target
+     */
+    avsCommon::avs::CapabilityState buildCapabilityState(const acsdkAlexaLauncherInterfaces::TargetState& targetState);
+
+    /**
+     * Helper method to read launcher payload and fill the Target object.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective for changing launch target.
+     * @param payloadDocument JSON document, contains LaunchTarget directive payload.
+     * @param[out] target Pointer to a Target object.
+     */
+    void readLaunchTargetPayload(
+        const std::shared_ptr<DirectiveInfo> info,
+        const rapidjson::Document& payloadDocument,
+        acsdkAlexaLauncherInterfaces::TargetState& targetState);
+
+    /**
+     *  Evaulates whether the @c AlexaLauncherResponseType responseType is a video-specific error type.
+     *
+     * @param responseType the response type to evaluate
+     * @return true if responseType maps to an @c AlexaVideoErrorResponseType, false otherwise
+     */
+    bool isVideoErrorResponseType(
+        const acsdkAlexaLauncherInterfaces::AlexaLauncherInterface::Response::Type responseType);
+
+    /**
+     * Convert an @c AlexaLauncherResponseType to its corresponding @c ErrorResponseType. Note that any @c
+     * AlexaLauncherResponseType that does not map to @c ErrorResponseType will return INTERNAL_ERROR.
+     *
+     * @param responseType The response type to convert.
+     * @return The corresponding @c avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType.
+     */
+    static avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType
+    alexaLauncherResponseTypeToErrorType(
+        const acsdkAlexaLauncherInterfaces::AlexaLauncherInterface::Response::Type responseType);
+
+    /**
+     * Convert an @c AlexaLauncherResponseType to its corresponding @c AlexaVideoErrorResponseType. Note that any @c
+     * AlexaLauncherResponseType that does not map to @c AlexaVideoErrorResponseType will return NONE.
+     *
+     * @param responseType The response type to convert.
+     * @return The corresponding @c ErrorResponseType if it's valid, otherwise NONE.
+     */
+    static avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType
+    alexaLauncherResponseTypeToVideoErrorType(
+        const acsdkAlexaLauncherInterfaces::AlexaLauncherInterface::Response::Type responseType);
+
+    /// Endpoint the capability agent associated to.
+    avsCommon::sdkInterfaces::endpoints::EndpointIdentifier m_endpointId;
+
+    /// Whether the mode property change is proactively reported to Alexa in a change report.
+    bool m_isProactivelyReported;
+
+    /// Whether the mode property can be retrieved when Alexa sends a state report request to the endpoint.
+    bool m_isRetrievable;
+
+    /// Reference to @c LauncherInterface
+    std::shared_ptr<acsdkAlexaLauncherInterfaces::AlexaLauncherInterface> m_launcher;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The @c AlexaInterfaceMessageSenderInterface used to send event messages.
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> m_responseSender;
+
+    /// This is the worker thread for the @c AlexaLauncherCapabilityAgent.
+    avsCommon::utils::threading::Executor m_executor;
+};
+
+}  // namespace acsdkAlexaLauncher
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXALAUNCHER_PRIVATEINCLUDE_ACSDKALEXALAUNCHER_ALEXALAUNCHERCAPABILITYAGENT_H_
diff --git a/capabilities/AlexaLauncher/acsdkAlexaLauncher/src/AlexaLauncherCapabilityAgent.cpp b/capabilities/AlexaLauncher/acsdkAlexaLauncher/src/AlexaLauncherCapabilityAgent.cpp
new file mode 100644
index 0000000000..7e123d87fe
--- /dev/null
+++ b/capabilities/AlexaLauncher/acsdkAlexaLauncher/src/AlexaLauncherCapabilityAgent.cpp
@@ -0,0 +1,481 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <rapidjson/document.h>
+#include <rapidjson/error/en.h>
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/JSON/JSONGenerator.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "acsdkAlexaLauncher/AlexaLauncherCapabilityAgent.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaLauncher {
+
+using namespace avsCommon::utils::json;
+using namespace avsCommon::avs;
+using namespace avsCommon;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::configuration;
+using namespace rapidjson;
+
+using namespace acsdkAlexaLauncherInterfaces;
+
+/// String to identify log entries originating from this file.
+static const std::string TAG{"AlexaLauncherCapabilityAgent"};
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+/// The namespace for this capability agent.
+static const std::string NAMESPACE{"Alexa.Launcher"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for LaunchTarget directive
+static const std::string NAME_LAUNCHTARGET{"LaunchTarget"};
+
+/// The property name for the Launcher
+static const std::string LAUNCHER_PROPERTY_NAME{"Target"};
+
+/// The namespace for Alexa.Video.ErrorResponse.
+static const std::string NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE{"Alexa.Video"};
+
+std::shared_ptr<AlexaLauncherCapabilityAgent> AlexaLauncherCapabilityAgent::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<AlexaLauncherInterface>& launcher,
+    const std::shared_ptr<ContextManagerInterface>& contextManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<ExceptionEncounteredSenderInterface>& exceptionSender,
+    bool isProactivelyReported,
+    bool isRetrievable) {
+    if (endpointId.empty()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "emptyEndpointId"));
+        return nullptr;
+    }
+    if (!launcher) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullLauncher"));
+        return nullptr;
+    }
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManager"));
+        return nullptr;
+    }
+    if (!responseSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullResponseSender"));
+        return nullptr;
+    }
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    auto alexaLauncherCapabilityAgent = std::shared_ptr<AlexaLauncherCapabilityAgent>(new AlexaLauncherCapabilityAgent(
+        endpointId, launcher, contextManager, responseSender, exceptionSender, isProactivelyReported, isRetrievable));
+
+    if (!alexaLauncherCapabilityAgent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "instantiationFailed"));
+        return nullptr;
+    }
+
+    if (!alexaLauncherCapabilityAgent->initialize()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "initializationFailed"));
+        return nullptr;
+    }
+
+    return alexaLauncherCapabilityAgent;
+}
+
+bool AlexaLauncherCapabilityAgent::initialize() {
+    ACSDK_DEBUG5(LX(__func__));
+    if (m_isProactivelyReported) {
+        if (!m_launcher->addObserver(shared_from_this())) {
+            ACSDK_ERROR(LX("initializeFailed").d("reason", "addObserverFailed"));
+            return false;
+        }
+    }
+
+    m_contextManager->addStateProvider({NAMESPACE, LAUNCHER_PROPERTY_NAME, m_endpointId}, shared_from_this());
+
+    return true;
+}
+
+AlexaLauncherCapabilityAgent::AlexaLauncherCapabilityAgent(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<AlexaLauncherInterface>& launcher,
+    const std::shared_ptr<ContextManagerInterface>& contextManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<ExceptionEncounteredSenderInterface>& exceptionSender,
+    bool isProactivelyReported,
+    bool isRetrievable) :
+        CapabilityAgent{NAMESPACE, exceptionSender},
+        RequiresShutdown{"alexaLauncherCapabilityAgent"},
+        m_endpointId{endpointId},
+        m_isProactivelyReported{isProactivelyReported},
+        m_isRetrievable{isRetrievable},
+        m_launcher{launcher},
+        m_contextManager{contextManager},
+        m_responseSender{responseSender} {
+}
+
+void AlexaLauncherCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!directive) {
+        ACSDK_ERROR(LX("handleDirectiveImmediatelyFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+}
+
+void AlexaLauncherCapabilityAgent::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX("preHandleDirective"));
+    // do nothing.
+}
+
+/**
+ * Parses a directive payload JSON and returns a parsed document object.
+ *
+ * @param payload JSON string to parse.
+ * @param[out] document Pointer to a parsed document.
+ * @return @c true if parsing was successful, @c false otherwise.
+ */
+static bool parseDirectivePayload(const std::string& payload, Document* document) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!document) {
+        ACSDK_ERROR(LX("parseDirectivePayloadFailed").d("reason", "nullDocument"));
+        return false;
+    }
+
+    ParseResult result = document->Parse(payload);
+    if (!result) {
+        ACSDK_ERROR(LX("parseDirectivePayloadFailed")
+                        .d("reason", "parseFailed")
+                        .d("error", GetParseError_En(result.Code()))
+                        .d("offset", result.Offset()));
+        return false;
+    }
+
+    return true;
+}
+
+void AlexaLauncherCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+
+    m_executor.submit([this, info] {
+        ACSDK_DEBUG5(LX("handleDirectiveInExecutor"));
+        const std::string directiveName = info->directive->getName();
+        if (!info->directive->getEndpoint().hasValue() ||
+            (info->directive->getEndpoint().value().endpointId != m_endpointId)) {
+            executeUnknownDirective(info, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        Document payloadDocument(kObjectType);
+        if (!parseDirectivePayload(info->directive->getPayload(), &payloadDocument)) {
+            sendExceptionEncounteredAndReportFailed(
+                info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        AlexaLauncherInterface::Response result;
+        if (directiveName == NAME_LAUNCHTARGET) {
+            acsdkAlexaLauncherInterfaces::TargetState target;
+            readLaunchTargetPayload(info, payloadDocument, target);
+
+            result = m_launcher->launchTarget(target);
+        } else {
+            ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "unexpectedDirective").d("name", directiveName));
+            executeUnknownDirective(info, ExceptionErrorType::UNSUPPORTED_OPERATION);
+            return;
+        }
+
+        executeSetHandlingCompleted(info);
+        executeSendResponseEvent(info, result);
+    });
+}
+
+void AlexaLauncherCapabilityAgent::readLaunchTargetPayload(
+    const std::shared_ptr<DirectiveInfo> info,
+    const rapidjson::Document& payloadDocument,
+    acsdkAlexaLauncher::TargetState& targetState) {
+    ACSDK_DEBUG5(LX(__func__));
+
+    if (!jsonUtils::retrieveValue(payloadDocument, "identifier", &targetState.identifier)) {
+        std::string errorMessage = "readLaunchTargetIdentifierNotFound";
+        ACSDK_ERROR(LX("readLaunchTargetPayloadFailed").m(errorMessage));
+        sendExceptionEncounteredAndReportFailed(info, errorMessage);
+        return;
+    }
+
+    if (!jsonUtils::retrieveValue(payloadDocument, "name", &targetState.name)) {
+        std::string errorMessage = "readLaunchTargetNameNotFound";
+        ACSDK_ERROR(LX("readLaunchTargetPayloadFailed").m(errorMessage));
+        sendExceptionEncounteredAndReportFailed(info, errorMessage);
+        return;
+    }
+}
+
+void AlexaLauncherCapabilityAgent::provideState(
+    const CapabilityTag& stateProviderName,
+    const ContextRequestToken contextRequestToken) {
+    ACSDK_DEBUG5(
+        LX(__func__).d("contextRequestToken", contextRequestToken).sensitive("stateProviderName", stateProviderName));
+
+    m_executor.submit([this, stateProviderName, contextRequestToken] {
+        ACSDK_DEBUG5(LX("provideStateInExecutor"));
+        executeProvideState(stateProviderName, contextRequestToken);
+    });
+    return;
+}
+
+bool AlexaLauncherCapabilityAgent::canStateBeRetrieved() {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_isRetrievable;
+}
+
+bool AlexaLauncherCapabilityAgent::hasReportableStateProperties() {
+    ACSDK_DEBUG5(LX(__func__));
+    return (m_isRetrievable || m_isProactivelyReported);
+}
+
+void AlexaLauncherCapabilityAgent::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("cancelDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    if (!info->directive->getEndpoint().hasValue() ||
+        info->directive->getEndpoint().value().endpointId != m_endpointId) {
+        ACSDK_WARN(LX("cancelDirective").d("reason", "notExpectedEndpointId"));
+    }
+    removeDirective(info);
+}
+
+DirectiveHandlerConfiguration AlexaLauncherCapabilityAgent::getConfiguration() const {
+    ACSDK_DEBUG5(LX(__func__));
+    DirectiveHandlerConfiguration configuration;
+    auto neitherNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUMS_NONE, false);
+    configuration[{NAMESPACE, NAME_LAUNCHTARGET, m_endpointId}] = neitherNonBlockingPolicy;
+
+    return configuration;
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> AlexaLauncherCapabilityAgent::
+    getCapabilityConfigurations() {
+    CapabilityConfiguration configuration{CapabilityConfiguration::ALEXA_INTERFACE_TYPE,
+                                          NAMESPACE,
+                                          INTERFACE_VERSION,
+                                          Optional<std::string>(),  // instance
+                                          Optional<CapabilityConfiguration::Properties>()};
+    return {std::make_shared<avsCommon::avs::CapabilityConfiguration>(configuration)};
+}
+
+void AlexaLauncherCapabilityAgent::doShutdown() {
+    m_executor.shutdown();
+    m_launcher.reset();
+    m_responseSender.reset();
+    m_contextManager->removeStateProvider({NAMESPACE, LAUNCHER_PROPERTY_NAME, m_endpointId});
+
+    m_contextManager.reset();
+}
+
+void AlexaLauncherCapabilityAgent::removeDirective(const std::shared_ptr<DirectiveInfo>& info) {
+    if (info->directive && info->result) {
+        CapabilityAgent::removeDirective(info->directive->getMessageId());
+    }
+}
+
+void AlexaLauncherCapabilityAgent::executeSetHandlingCompleted(const std::shared_ptr<DirectiveInfo>& info) {
+    if (info && info->result) {
+        info->result->setCompleted();
+    }
+    removeDirective(info);
+}
+
+void AlexaLauncherCapabilityAgent::executeUnknownDirective(
+    const std::shared_ptr<DirectiveInfo>& info,
+    ExceptionErrorType type) {
+    ACSDK_ERROR(LX("executeUnknownDirectiveFailed")
+                    .d("reason", "unknownDirective")
+                    .d("namespace", info->directive->getNamespace())
+                    .d("name", info->directive->getName()));
+
+    const std::string exceptionMessage =
+        "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
+
+    sendExceptionEncounteredAndReportFailed(info, exceptionMessage, type);
+}
+
+void AlexaLauncherCapabilityAgent::executeSendResponseEvent(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    const AlexaLauncherInterface::Response result) {
+    auto responseType = result.type;
+
+    if (AlexaLauncherInterface::Response::Type::SUCCESS == responseType) {
+        m_responseSender->sendResponseEvent(
+            info->directive->getInstance(), info->directive->getCorrelationToken(), AVSMessageEndpoint(m_endpointId));
+    } else if (isVideoErrorResponseType(result.type)) {
+        auto videoErrorResponseType = alexaLauncherResponseTypeToVideoErrorType(responseType);
+        std::string payload = R"({"message:")" + result.errorMessage + R"(",
+                                    "type:")" +
+                              m_responseSender->alexaVideoErrorResponseToString(videoErrorResponseType) + R"("})";
+        m_responseSender->sendErrorResponseEvent(
+            info->directive->getInstance(),
+            info->directive->getCorrelationToken(),
+            AVSMessageEndpoint(m_endpointId),
+            NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE,
+            payload);
+    } else {
+        m_responseSender->sendErrorResponseEvent(
+            info->directive->getInstance(),
+            info->directive->getCorrelationToken(),
+            AVSMessageEndpoint(m_endpointId),
+            alexaLauncherResponseTypeToErrorType(result.type),
+            result.errorMessage);
+    }
+}
+
+avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType
+AlexaLauncherCapabilityAgent::alexaLauncherResponseTypeToVideoErrorType(
+    const AlexaLauncherInterface::Response::Type responseType) {
+    ACSDK_DEBUG5(LX(__func__));
+    switch (responseType) {
+        case AlexaLauncherInterface::Response::Type::CONFIRMATION_REQUIRED:
+            return avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::
+                CONFIRMATION_REQUIRED;
+        default:
+            return avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::NONE;
+    }
+    return avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::NONE;
+}
+
+avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType AlexaLauncherCapabilityAgent::
+    alexaLauncherResponseTypeToErrorType(const AlexaLauncherInterface::Response::Type responseType) {
+    ACSDK_DEBUG5(LX(__func__));
+    switch (responseType) {
+        case AlexaLauncherInterface::Response::Type::ALREADY_IN_OPERATION:
+            return avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType::
+                ALREADY_IN_OPERATION;
+        case AlexaLauncherInterface::Response::Type::INSUFFICIENT_PERMISSIONS:
+            return avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType::
+                INSUFFICIENT_PERMISSIONS;
+        case AlexaLauncherInterface::Response::Type::INTERNAL_ERROR:
+            return avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR;
+        case AlexaLauncherInterface::Response::Type::INVALID_VALUE:
+            return avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType::INVALID_VALUE;
+        case AlexaLauncherInterface::Response::Type::NOT_SUPPORTED_IN_CURRENT_MODE:
+            return avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType::
+                NOT_SUPPORTED_IN_CURRENT_MODE;
+        default:
+            return avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR;
+    }
+    return avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR;
+}
+
+bool AlexaLauncherCapabilityAgent::isVideoErrorResponseType(const AlexaLauncherInterface::Response::Type responseType) {
+    ACSDK_DEBUG5(LX(__func__));
+    switch (responseType) {
+        case AlexaLauncherInterface::Response::Type::CONFIRMATION_REQUIRED:
+            return true;
+        case AlexaLauncherInterface::Response::Type::SUCCESS:
+        case AlexaLauncherInterface::Response::Type::ALREADY_IN_OPERATION:
+        case AlexaLauncherInterface::Response::Type::INSUFFICIENT_PERMISSIONS:
+        case AlexaLauncherInterface::Response::Type::INTERNAL_ERROR:
+        case AlexaLauncherInterface::Response::Type::INVALID_VALUE:
+        case AlexaLauncherInterface::Response::Type::NOT_SUPPORTED_IN_CURRENT_MODE:
+            return false;
+    }
+    return false;
+}
+
+void AlexaLauncherCapabilityAgent::executeProvideState(
+    const CapabilityTag& stateProviderName,
+    const ContextRequestToken contextRequestToken) {
+    ACSDK_DEBUG3(LX("executeProvideState"));
+    bool isError = false;
+    if (stateProviderName.endpointId != m_endpointId) {
+        ACSDK_ERROR(LX("provideStateFailed")
+                        .d("reason", "notExpectedEndpointId")
+                        .sensitive("endpointId", stateProviderName.endpointId));
+        isError = true;
+    }
+    if (stateProviderName.name != LAUNCHER_PROPERTY_NAME) {
+        ACSDK_ERROR(LX("provideStateFailed").d("reason", "notExpectedName").d("name", stateProviderName.name));
+        isError = true;
+    }
+
+    if (isError) {
+        m_contextManager->provideStateUnavailableResponse(stateProviderName, contextRequestToken, false);
+        return;
+    }
+
+    auto targetState = m_launcher->getLauncherTargetState();
+    m_contextManager->provideStateResponse(stateProviderName, buildCapabilityState(targetState), contextRequestToken);
+}
+
+void AlexaLauncherCapabilityAgent::onLauncherTargetChanged(
+    const acsdkAlexaLauncherInterfaces::TargetState& targetState) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!m_isProactivelyReported) {
+        ACSDK_ERROR(LX("onLauncherTargetChangedFailed").d("reason", "invalidOnLauncherTargetChangedCall"));
+        return;
+    }
+
+    m_executor.submit([this, targetState] {
+        m_contextManager->reportStateChange(
+            CapabilityTag(NAMESPACE, LAUNCHER_PROPERTY_NAME, m_endpointId),
+            buildCapabilityState(targetState),
+            AlexaStateChangeCauseType::VOICE_INTERACTION);
+    });
+}
+
+/**
+ * Helper function to add Comma Separated Values.
+ *
+ * @param value Launcher target value.
+ * @param[out] out Output string with value added.
+ */
+static void AddCsv(const std::string& value, std::string& out) {
+    if (!out.empty()) out += ",";
+    out += value;
+}
+
+CapabilityState AlexaLauncherCapabilityAgent::buildCapabilityState(const acsdkAlexaLauncher::TargetState& targetState) {
+    std::string targetJson = "";
+    if (!targetState.identifier.empty()) {
+        AddCsv("\"identifier\":\"" + targetState.identifier + "\"", targetJson);
+    }
+    if (!targetState.name.empty()) {
+        AddCsv("\"name\":\"" + targetState.name + "\"", targetJson);
+    }
+
+    targetJson = "{" + targetJson + "}";
+
+    return CapabilityState(targetJson);
+}
+
+}  // namespace acsdkAlexaLauncher
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaLauncher/acsdkAlexaLauncher/src/AlexaLauncherFactory.cpp b/capabilities/AlexaLauncher/acsdkAlexaLauncher/src/AlexaLauncherFactory.cpp
new file mode 100644
index 0000000000..754df1c362
--- /dev/null
+++ b/capabilities/AlexaLauncher/acsdkAlexaLauncher/src/AlexaLauncherFactory.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkAlexaLauncher/AlexaLauncherCapabilityAgent.h"
+#include "acsdkAlexaLauncher/AlexaLauncherFactory.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaLauncher {
+
+avsCommon::utils::Optional<AlexaLauncherFactory::AlexaLauncherCapabilityAgentData> AlexaLauncherFactory::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    std::shared_ptr<acsdkAlexaLauncherInterfaces::AlexaLauncherInterface> launcher,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+    bool isProactivelyReported,
+    bool isRetrievable) {
+    AlexaLauncherFactory::AlexaLauncherCapabilityAgentData AlexaLauncherCapabilityAgentData;
+    auto launcherCA = acsdkAlexaLauncher::AlexaLauncherCapabilityAgent::create(
+        endpointId, launcher, contextManager, responseSender, exceptionSender, isProactivelyReported, isRetrievable);
+    if (launcherCA) {
+        AlexaLauncherCapabilityAgentData.capabilityConfigurationInterface = launcherCA;
+        AlexaLauncherCapabilityAgentData.directiveHandler = launcherCA;
+        AlexaLauncherCapabilityAgentData.requiresShutdown = launcherCA;
+        return avsCommon::utils::Optional<AlexaLauncherFactory::AlexaLauncherCapabilityAgentData>(
+            AlexaLauncherCapabilityAgentData);
+    }
+
+    return avsCommon::utils::Optional<AlexaLauncherFactory::AlexaLauncherCapabilityAgentData>();
+}
+
+}  // namespace acsdkAlexaLauncher
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaLauncher/acsdkAlexaLauncher/src/CMakeLists.txt b/capabilities/AlexaLauncher/acsdkAlexaLauncher/src/CMakeLists.txt
new file mode 100644
index 0000000000..c32c7f9c09
--- /dev/null
+++ b/capabilities/AlexaLauncher/acsdkAlexaLauncher/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkAlexaLauncher")
+
+add_library(acsdkAlexaLauncher
+        AlexaLauncherCapabilityAgent.cpp
+        AlexaLauncherFactory.cpp)
+
+target_include_directories(acsdkAlexaLauncher PRIVATE
+        "${acsdkAlexaLauncher_SOURCE_DIR}/privateInclude")
+
+target_include_directories(acsdkAlexaLauncher PUBLIC
+        "${acsdkAlexaLauncher_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaLauncher acsdkAlexaLauncherInterfaces AVSCommon Alexa acsdkManufactory)
+
+# install target
+asdk_install()
\ No newline at end of file
diff --git a/capabilities/AlexaLauncher/acsdkAlexaLauncher/test/AlexaLauncherCapabilityAgentTest.cpp b/capabilities/AlexaLauncher/acsdkAlexaLauncher/test/AlexaLauncherCapabilityAgentTest.cpp
new file mode 100644
index 0000000000..a3c9eaf877
--- /dev/null
+++ b/capabilities/AlexaLauncher/acsdkAlexaLauncher/test/AlexaLauncherCapabilityAgentTest.cpp
@@ -0,0 +1,302 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include "acsdkAlexaLauncher/AlexaLauncherCapabilityAgent.h"
+#include "acsdkAlexaLauncherInterfaces/AlexaLauncherInterface.h"
+#include "acsdkAlexaLauncherInterfaces/AlexaLauncherObserverInterface.h"
+
+#include "AVSCommon/AVS/Attachment/MockAttachmentManager.h"
+#include "AVSCommon/SDKInterfaces/MockContextManager.h"
+#include "AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h"
+#include "AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h"
+#include "AVSCommon/SDKInterfaces/MockAlexaInterfaceMessageSender.h"
+
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/Timing/TimePoint.h>
+#include <AVSCommon/Utils/WaitEvent.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaLauncher {
+namespace test {
+
+using namespace alexaClientSDK::avsCommon::avs;
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::sdkInterfaces;
+using namespace alexaClientSDK::avsCommon::utils::memory;
+using namespace ::testing;
+
+using namespace acsdkAlexaLauncher;
+using namespace acsdkAlexaLauncherInterfaces;
+
+// For readability.
+using EndpointIdentifier = endpoints::EndpointIdentifier;
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// Time of sample used for testing
+static const std::string TIME_OF_SAMPLE_TEST("2017-02-03T16:20:50.523Z");
+
+/// The namespace for capability agent.
+static const std::string NAMESPACE{"Alexa.Launcher"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for LaunchTarget directive
+static const std::string NAME_LAUNCHTARGET{"LaunchTarget"};
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
+
+/// The test EndpointId
+static const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier TEST_ENDPOINT_ID("testEndpointId");
+
+/// Event key.
+static const std::string EVENT("event");
+
+/// MessageId for testing.
+static const std::string MESSAGE_ID_TEST("MessageId_Test");
+
+/// DialogRequestId for testing.
+static const std::string DIALOG_REQUEST_ID_TEST("DialogRequestId_Test");
+
+/// Correlation token for testing.
+static const std::string CORRELATION_TOKEN_TEST("CorrelationToken_Test");
+
+// Sample LaunchTarget payload
+static const std::string LAUNCH_TARGET_PAYLOD = R"delim( {
+            "identifier": "amzn1.alexa-ask-target.app.72095",
+            "name": "Amazon Video" } )delim";
+
+class MockAlexaLauncherInterface : public AlexaLauncherInterface {
+public:
+    using LaunchTarget = acsdkAlexaLauncherInterfaces::AlexaLauncherInterface::Response;
+    using GetLauncherTargetState = acsdkAlexaLauncherInterfaces::TargetState;
+
+    MOCK_METHOD1(launchTarget, LaunchTarget(const acsdkAlexaLauncherInterfaces::TargetState& targetState));
+    MOCK_METHOD0(getLauncherTargetState, GetLauncherTargetState());
+    MOCK_METHOD1(addObserver, bool(const std::weak_ptr<AlexaLauncherObserverInterface>&));
+    MOCK_METHOD1(removeObserver, void(const std::weak_ptr<AlexaLauncherObserverInterface>&));
+};
+
+class AlexaLauncherCapabilityAgentTest : public ::testing::Test {
+public:
+    /// SetUp before each test case.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Constructor.
+    AlexaLauncherCapabilityAgentTest() {
+    }
+
+protected:
+    /**
+     * Function to create AlexaLauncherCapabilityAgent based on the reportable flags
+     * and sets required ContextManager and Launcher mocks.
+     */
+    std::shared_ptr<AlexaLauncherCapabilityAgent> createCapabilityAgentAndSetExpects(bool provideState);
+
+    /// A mock @c AlexaLauncherInterface object.
+    std::shared_ptr<StrictMock<MockAlexaLauncherInterface>> m_mockLauncher;
+
+    // a context manager
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>> m_mockContextManager;
+
+    /// The mock @c MessageSenderInterface.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>> m_mockResponseSender;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>
+        m_mockDirectiveHandlerResult;
+
+    /// The test @c acsdkAlexaLauncherInterfaces::TargetState
+    acsdkAlexaLauncherInterfaces::TargetState m_targetState;
+};
+
+void AlexaLauncherCapabilityAgentTest::SetUp() {
+    m_mockExceptionSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult =
+        make_unique<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>();
+    m_mockLauncher = std::make_shared<StrictMock<MockAlexaLauncherInterface>>();
+    m_mockContextManager = std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>>();
+    m_mockResponseSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>>();
+
+    auto timePoint = alexaClientSDK::avsCommon::utils::timing::TimePoint();
+    timePoint.setTime_ISO_8601(TIME_OF_SAMPLE_TEST);
+
+    // setup sample target object for generating acsdkAlexaLauncherInterfaces::TargetState
+    m_targetState = acsdkAlexaLauncherInterfaces::TargetState{"Amazon Video", "amzn1.alexa-ask-target.app.72095"};
+}
+
+void AlexaLauncherCapabilityAgentTest::TearDown() {
+}
+
+std::shared_ptr<AlexaLauncherCapabilityAgent> AlexaLauncherCapabilityAgentTest::createCapabilityAgentAndSetExpects(
+    bool provideState) {
+    // ContextManager Mocks
+    if (provideState) {
+        // Expects a non-null CA reference during create.
+        EXPECT_CALL(*m_mockContextManager, addStateProvider(_, ::testing::NotNull()));
+
+        // Expects a null when CA is shutdown.
+        EXPECT_CALL(*m_mockContextManager, removeStateProvider(_));
+    }
+
+    EXPECT_CALL(*m_mockLauncher, addObserver(_)).WillOnce(InvokeWithoutArgs([]() { return true; }));
+
+    auto launcherCapabilityAgent = AlexaLauncherCapabilityAgent::create(
+        TEST_ENDPOINT_ID,
+        m_mockLauncher,
+        m_mockContextManager,
+        m_mockResponseSender,
+        m_mockExceptionSender,
+        true,
+        true);
+    return launcherCapabilityAgent;
+}
+
+std::shared_ptr<AVSDirective> buildAVSDirective(std::string directiveName, std::string payload) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<avsCommon::avs::attachment::test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(
+        NAMESPACE, directiveName, MESSAGE_ID_TEST, DIALOG_REQUEST_ID_TEST, CORRELATION_TOKEN_TEST, INTERFACE_VERSION);
+    auto avsMessageEndpoint = AVSMessageEndpoint(TEST_ENDPOINT_ID);
+
+    return AVSDirective::create("", avsMessageHeader, payload, attachmentManager, "", avsMessageEndpoint);
+}
+
+/// Test that create() returns a nullptr if called with invalid arguments.
+TEST_F(AlexaLauncherCapabilityAgentTest, test_givenInvalidParameters_create_shouldFail) {
+    ASSERT_THAT(
+        AlexaLauncherCapabilityAgent::create(
+            "", m_mockLauncher, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender, true, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaLauncherCapabilityAgent::create(
+            TEST_ENDPOINT_ID, nullptr, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender, true, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaLauncherCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockLauncher, nullptr, m_mockResponseSender, m_mockExceptionSender, true, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaLauncherCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockLauncher, m_mockContextManager, nullptr, m_mockExceptionSender, true, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaLauncherCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockLauncher, m_mockContextManager, m_mockResponseSender, nullptr, true, true),
+        IsNull());
+}
+
+/**
+ * Test successful handling of LaunchTarget directive.
+ */
+TEST_F(AlexaLauncherCapabilityAgentTest, test_launchTargetDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    auto launcherCapabilityAgent = createCapabilityAgentAndSetExpects(true);
+    ASSERT_THAT(launcherCapabilityAgent, NotNull());
+
+    EXPECT_CALL(*m_mockLauncher, launchTarget(_)).WillOnce(WithArg<0>(Invoke([](const TargetState& targetState) {
+        acsdkAlexaLauncherInterfaces::AlexaLauncherInterface::Response launcherResponse(
+            AlexaLauncherInterface::Response::Type::SUCCESS, "");
+        return launcherResponse;
+    })));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_LAUNCHTARGET, LAUNCH_TARGET_PAYLOD);
+    launcherCapabilityAgent->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    launcherCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    launcherCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of LaunchTarget directive.
+ */
+TEST_F(AlexaLauncherCapabilityAgentTest, test_launchTargetDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockLauncher, launchTarget(_)).WillOnce(WithArg<0>(Invoke([](const TargetState& targetState) {
+        acsdkAlexaLauncherInterfaces::AlexaLauncherInterface::Response launcherResponse(
+            AlexaLauncherInterface::Response::Type::INTERNAL_ERROR, "TestEndpointNotReachable");
+        return launcherResponse;
+    })));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+    auto launcherCapabilityAgent = createCapabilityAgentAndSetExpects(true);
+    ASSERT_THAT(launcherCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_LAUNCHTARGET, LAUNCH_TARGET_PAYLOD);
+    launcherCapabilityAgent->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    launcherCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    launcherCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaLauncherCapabilityAgentTest, test_unknownDirective) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    auto launcherCapabilityAgent = createCapabilityAgentAndSetExpects(true);
+    ASSERT_THAT(launcherCapabilityAgent, NotNull());
+
+    launcherCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE, ""), std::move(m_mockDirectiveHandlerResult));
+    launcherCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    launcherCapabilityAgent->shutdown();
+}
+}  // namespace test
+}  // namespace acsdkAlexaLauncher
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaLauncher/acsdkAlexaLauncher/test/CMakeLists.txt b/capabilities/AlexaLauncher/acsdkAlexaLauncher/test/CMakeLists.txt
new file mode 100644
index 0000000000..f7fe500155
--- /dev/null
+++ b/capabilities/AlexaLauncher/acsdkAlexaLauncher/test/CMakeLists.txt
@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+        "${AVSCommon_INCLUDE_DIRS}"
+        "${AVSCommon_SOURCE_DIR}/AVS/test"
+        "${AVSCommon_SOURCE_DIR}/Utils/test"
+        "${AVSCommon_SOURCE_DIR}/SDKInterfaces/test"
+        "${acsdkAlexaLauncher_INCLUDE_DIR}"
+        "${acsdkAlexaLauncher_SOURCE_DIR}/include"
+        "${acsdkAlexaLauncherInterfaces_SOURCE_DIR}/include"
+        "${acsdkAlexaLauncher_SOURCE_DIR}/privateInclude"
+        "${ASDK_INCLUDE_DIRS}")
+
+set(LIBS
+        "AVSCommon"
+        "AVSCommonTestLib"
+        "SDKInterfacesTests"
+        "AttachmentCommonTestLib"
+        "acsdkAlexaLauncher"
+        "acsdkAlexaLauncherInterfaces"
+)
+
+discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
\ No newline at end of file
diff --git a/capabilities/AlexaLauncher/acsdkAlexaLauncherInterfaces/CMakeLists.txt b/capabilities/AlexaLauncher/acsdkAlexaLauncherInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..91bfb482c6
--- /dev/null
+++ b/capabilities/AlexaLauncher/acsdkAlexaLauncherInterfaces/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.1)
+project(acsdkAlexaLauncherInterfaces LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_library(acsdkAlexaLauncherInterfaces INTERFACE)
+
+target_include_directories(acsdkAlexaLauncherInterfaces INTERFACE
+        "${acsdkAlexaLauncherInterfaces_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaLauncherInterfaces INTERFACE
+        AVSCommon)
+
+# install interface
+asdk_install_interface()
\ No newline at end of file
diff --git a/capabilities/AlexaLauncher/acsdkAlexaLauncherInterfaces/include/acsdkAlexaLauncherInterfaces/AlexaLauncherInterface.h b/capabilities/AlexaLauncher/acsdkAlexaLauncherInterfaces/include/acsdkAlexaLauncherInterfaces/AlexaLauncherInterface.h
new file mode 100644
index 0000000000..10bcee4e1d
--- /dev/null
+++ b/capabilities/AlexaLauncher/acsdkAlexaLauncherInterfaces/include/acsdkAlexaLauncherInterfaces/AlexaLauncherInterface.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXALAUNCHERINTERFACES_ALEXALAUNCHERINTERFACE_H_
+#define ACSDKALEXALAUNCHERINTERFACES_ALEXALAUNCHERINTERFACE_H_
+
+#include <string>
+#include <memory>
+
+#include "acsdkAlexaLauncherInterfaces/AlexaLauncherTargetState.h"
+#include "acsdkAlexaLauncherInterfaces/AlexaLauncherObserverInterface.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaLauncherInterfaces {
+
+/**
+ * The AlexaLauncherInterface carries out launcher actions such as 'LaunchTarget'
+ *
+ * An implementation of the AlexaLauncherInterface lets the user control the launcher related interactions.
+ * This can be called by multiple callers; for example the AlexaLauncher Capability Agent or the application’s
+ * GUI.
+ *
+ * This interface can report to subscribers implementing the @c AlexaLauncherObserverInterface when there is a
+ * target state change.
+ *
+ * @note Implementations of this interface must be thread-safe.
+ */
+class AlexaLauncherInterface {
+public:
+    /**
+     * Class for holding AlexaLauncher response for AlexaLauncher interface
+     */
+    struct Response {
+        /**
+         * Enum for the different error types understood by the AlexaLauncher capability agent.
+         */
+        enum class Type {
+            /// Device processed command successfully without any errors
+            SUCCESS,
+
+            /// Indicates an additional confirmation must occur before the requested action can be completed.
+            CONFIRMATION_REQUIRED,
+
+            /// The operation can't be performed because the endpoint is already in operation.
+            ALREADY_IN_OPERATION,
+
+            /// The device does not have permissions to perform the specified action.
+            INSUFFICIENT_PERMISSIONS,
+
+            /// An error occurred that can't be described by one of the other error types. For example, a runtime
+            /// exception occurred. We recommend that you always send a more specific error type.
+            INTERNAL_ERROR,
+
+            /// Indicates the target state value is not supported.
+            INVALID_VALUE,
+
+            /// The device can't be set to the specified target state because of its current mode of operation. For
+            /// example, if the device is in airplane mode,
+            NOT_SUPPORTED_IN_CURRENT_MODE
+        };
+
+        /// Default Constructor
+        Response() : type(Type::INTERNAL_ERROR), errorMessage("") {
+        }
+
+        /**
+         * Constructor.
+         *
+         * @param responseType The response type @c Type.
+         * @param errorMessage The error message if @c type is other than `SUCCESS`.
+         */
+        Response(Type responseType, std::string message) : type(responseType), errorMessage(std::move(message)) {
+        }
+
+        /// The AlexaLauncher response type
+        Type type;
+
+        /// The error message for logging if the AlexaLauncher response type is any other than SUCCESS
+        std::string errorMessage;
+    };
+
+    /**
+     * Virtual destructor to assure proper cleanup of derived types.
+     */
+    virtual ~AlexaLauncherInterface() = default;
+
+    /**
+     * Launch target on the device.
+     *
+     * @param targetState The target to launch, this can be an app or a GUI shortcut.
+     * @return A @c AlexaLauncherResponse to indicate whether target was successfully launched or encountered
+     * an error while launching. @c AlexaLauncherResponse.responseType should return SUCCESS if there are no errors
+     * while launching the target. Otherwise, it should return the corresponding error code along with a log
+     * message @c AlexaLauncherResponse.errorMessage that would be logged in cloud for debugging purposes.
+     */
+    virtual Response launchTarget(const acsdkAlexaLauncherInterfaces::TargetState& targetState) = 0;
+
+    /**
+     * Get the current launcher target on the device.
+     *
+     * @note If @c AlexaLauncherInterface implementation has configured its instance's property as retrievable,
+     * this method should return the current launch target state. Unlike @c AlexaLauncherObserverInterface
+     * observer methods, this returns the current target state at any given point when requested, without a change
+     * in target state.
+     *
+     * @return Return the current @c TargetState
+     */
+    virtual acsdkAlexaLauncherInterfaces::TargetState getLauncherTargetState() = 0;
+
+    /**
+     * Adds a @c AlexaLauncherObserverInterface observer.
+     *
+     * @note If @c AlexaLauncherInterface implementation has configured its instance's property as proactively
+     * reported, then it is required to notify observers of @c AlexaLauncherObserverInterface for any change in its
+     * property state. This includes notifying the value when the device starts, if it is different from the last
+     * reported value.
+     *
+     * @param observer The reference to the @c AlexaLauncherObserverInterface.
+     */
+    virtual bool addObserver(const std::weak_ptr<AlexaLauncherObserverInterface>& observer) = 0;
+
+    /**
+     * Removes an observer of @c AlexaLauncherObserverInterface.
+     *
+     * @param observer The reference to the @c AlexaLauncherObserverInterface.
+     */
+    virtual void removeObserver(const std::weak_ptr<AlexaLauncherObserverInterface>& observer) = 0;
+};
+
+}  // namespace acsdkAlexaLauncherInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXALAUNCHERINTERFACES_ALEXALAUNCHERINTERFACE_H_
diff --git a/capabilities/AlexaLauncher/acsdkAlexaLauncherInterfaces/include/acsdkAlexaLauncherInterfaces/AlexaLauncherObserverInterface.h b/capabilities/AlexaLauncher/acsdkAlexaLauncherInterfaces/include/acsdkAlexaLauncherInterfaces/AlexaLauncherObserverInterface.h
new file mode 100644
index 0000000000..27436b07c9
--- /dev/null
+++ b/capabilities/AlexaLauncher/acsdkAlexaLauncherInterfaces/include/acsdkAlexaLauncherInterfaces/AlexaLauncherObserverInterface.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXALAUNCHERINTERFACES_ALEXALAUNCHEROBSERVERINTERFACE_H_
+#define ACSDKALEXALAUNCHERINTERFACES_ALEXALAUNCHEROBSERVERINTERFACE_H_
+
+#include <string>
+
+#include "acsdkAlexaLauncherInterfaces/AlexaLauncherTargetState.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaLauncherInterfaces {
+
+/**
+ * This interface is used to observe changes to the launcher target properties that are caused by
+ * the @c AlexaLauncherHandlerInterface.
+ */
+class AlexaLauncherObserverInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~AlexaLauncherObserverInterface() = default;
+
+    /**
+     * Notifies the change in the target value properties.
+     *
+     * @param target The launcher target value specified using @c target.
+     */
+    virtual void onLauncherTargetChanged(const acsdkAlexaLauncherInterfaces::TargetState& targetState) = 0;
+};
+
+}  // namespace acsdkAlexaLauncherInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXALAUNCHERINTERFACES_ALEXALAUNCHEROBSERVERINTERFACE_H_
diff --git a/capabilities/AlexaLauncher/acsdkAlexaLauncherInterfaces/include/acsdkAlexaLauncherInterfaces/AlexaLauncherTargetState.h b/capabilities/AlexaLauncher/acsdkAlexaLauncherInterfaces/include/acsdkAlexaLauncherInterfaces/AlexaLauncherTargetState.h
new file mode 100644
index 0000000000..6208ac4145
--- /dev/null
+++ b/capabilities/AlexaLauncher/acsdkAlexaLauncherInterfaces/include/acsdkAlexaLauncherInterfaces/AlexaLauncherTargetState.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXALAUNCHERINTERFACES_ALEXALAUNCHERTARGETSTATE_H_
+#define ACSDKALEXALAUNCHERINTERFACES_ALEXALAUNCHERTARGETSTATE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaLauncherInterfaces {
+
+/**
+ * Struct that represents the AlexaLauncher target properties.
+ */
+struct TargetState {
+    /// The identifier for the item to launch. Application identifiers contain app,
+    /// and shortcut identifiers contain shortcut.
+    /// For a complete list of identifiers see https://developer.amazon.com/docs/video/launch-target-reference.html
+    std::string identifier;
+
+    /// The name associated with the identifier.
+    std::string name;
+};
+
+}  // namespace acsdkAlexaLauncherInterfaces
+}  // namespace alexaClientSDK
+#endif  // ACSDKALEXALAUNCHERINTERFACES_ALEXALAUNCHERTARGETSTATE_H_
diff --git a/capabilities/AlexaPlaybackController/.clang-format b/capabilities/AlexaPlaybackController/.clang-format
new file mode 100644
index 0000000000..3d1ec24482
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/.clang-format
@@ -0,0 +1,102 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
+
diff --git a/capabilities/AlexaPlaybackController/CMakeLists.txt b/capabilities/AlexaPlaybackController/CMakeLists.txt
new file mode 100644
index 0000000000..2b89651415
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(AlexaPlaybackController LANGUAGES CXX)
+
+# Define explicit short names for binary directories to shorten full path
+# on Windows platform. When building for UWP some of generated artifacts
+# get full path over 260 characters and this breaks the build.
+add_subdirectory("acsdkAlexaPlaybackController" "APC")
+add_subdirectory("acsdkAlexaPlaybackControllerInterfaces" "APCI")
+
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/CMakeLists.txt b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/CMakeLists.txt
new file mode 100644
index 0000000000..a4cb03444b
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+project(acsdkAlexaPlaybackController LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
+
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/include/acsdkAlexaPlaybackController/AlexaPlaybackControllerFactory.h b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/include/acsdkAlexaPlaybackController/AlexaPlaybackControllerFactory.h
new file mode 100644
index 0000000000..e9433c3cd9
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/include/acsdkAlexaPlaybackController/AlexaPlaybackControllerFactory.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAPLAYBACKCONTROLLER_ALEXAPLAYBACKCONTROLLERFACTORY_H_
+#define ACSDKALEXAPLAYBACKCONTROLLER_ALEXAPLAYBACKCONTROLLERFACTORY_H_
+
+#include <acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerInterface.h>
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/DirectiveHandlerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPlaybackController {
+
+/**
+ * This factory can be used to create a new @c AlexaPlaybackControllerCapabilityAgent and return a generic object that
+ * contains certain interfaces which can be used for registering this capability agent to an endpoint.
+ */
+class AlexaPlaybackControllerFactory {
+public:
+    /**
+     * This structure contains the interfaces to interact with the AlexaPlaybackController Capability Agent.
+     */
+    struct AlexaPlaybackControllerCapabilityAgentData {
+        /// The interface that this object will use to perform the playback controller operations.
+        std::shared_ptr<avsCommon::sdkInterfaces::DirectiveHandlerInterface> directiveHandler;
+        /// The interface that provides the configurations of the capabilities being implemented by this capability
+        /// agent.
+        std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface> capabilityConfigurationInterface;
+        /// The object responsible for cleaning up this capability agent objects during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+    /**
+     * Creates a new AlexaPlaybackController capability agent instance and exposes the @c AlexaPlaybackController
+     * related interfaces to the caller, including the handler for performing playback operations @c directiveHandler,
+     * the capability configurations associated to the capability agent instance @c capbilityConfigurationInterface, and
+     * the object for cleaning up the capability agent instance during shutdown @c requiresShutdown.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param playbackController An interface that this object will use to perform the playback controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the reponse to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isProactivelyReported Whether the playback state properties change is proactively reported to Alexa in a
+     * change report.
+     * @param isRetrievable Whether the playback state properties can be retrieved when Alexa sends a state report
+     * request to the endpoint.
+     * @return An @c Optional object with no valid value if the inputs are invalid, else a new
+     *  @c AlexaPlaybackControllerCapabilityAgentData object.
+     */
+    static avsCommon::utils::Optional<AlexaPlaybackControllerCapabilityAgentData> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        std::shared_ptr<acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface> playbackController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        bool isProactivelyReported,
+        bool isRetrievable);
+};
+
+}  // namespace acsdkAlexaPlaybackController
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAPLAYBACKCONTROLLER_ALEXAPLAYBACKCONTROLLERFACTORY_H_
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/privateInclude/acsdkAlexaPlaybackController/AlexaPlaybackControllerCapabilityAgent.h b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/privateInclude/acsdkAlexaPlaybackController/AlexaPlaybackControllerCapabilityAgent.h
new file mode 100644
index 0000000000..256b00cbef
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/privateInclude/acsdkAlexaPlaybackController/AlexaPlaybackControllerCapabilityAgent.h
@@ -0,0 +1,216 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAPLAYBACKCONTROLLER_PRIVATEINCLUDE_ACSDKALEXAPLAYBACKCONTROLLER_ALEXAPLAYBACKCONTROLLERCAPABILITYAGENT_H_
+#define ACSDKALEXAPLAYBACKCONTROLLER_PRIVATEINCLUDE_ACSDKALEXAPLAYBACKCONTROLLER_ALEXAPLAYBACKCONTROLLERCAPABILITYAGENT_H_
+
+#include <string>
+
+#include <acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerInterface.h>
+#include <acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerObserverInterface.h>
+#include <acsdkAlexaPlaybackControllerInterfaces/PlaybackState.h>
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/AVS/CapabilityState.h>
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPlaybackController {
+
+/**
+ * The @c AlexaPlaybackControllerCapabilityAgent is responsible for handling Alexa.PlaybackController directives and
+ * calls the @c AlexaPlaybackControllerInterface APIs.
+ *
+ * Note: This is a different API than
+ * https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/playbackcontroller.html
+ *
+ * This class implements a @c CapabilityAgent that handles the @c Alexa.PlaybackController Interface.
+ */
+class AlexaPlaybackControllerCapabilityAgent
+        : public avsCommon::avs::CapabilityAgent
+        , public acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerObserverInterface
+        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<AlexaPlaybackControllerCapabilityAgent> {
+public:
+    /**
+     * Create an instance of @c AlexaPlaybackControllerCapabilityAgent.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param playbackController An interface that this object will use to perform the playback controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the reponse to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isProactivelyReported Whether the playback state reporter properties change is proactively reported to
+     * Alexa in a change report.
+     * @param isRetrievable Whether the playback state reporter properties can be retrieved when Alexa sends a state
+     * report request to the endpoint.
+     * @return @c nullptr if the inputs are invalid, else a new instance of @c AlexaPlaybackControllerCapabilityAgent.
+     */
+    static std::shared_ptr<AlexaPlaybackControllerCapabilityAgent> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        std::shared_ptr<acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface> playbackController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        bool isProactivelyReported,
+        bool isRetrievable);
+
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
+    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name StateProviderInterface Functions
+    /// @{
+    void provideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken) override;
+    bool canStateBeRetrieved() override;
+    bool hasReportableStateProperties() override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
+    /// @}
+
+    /// @name AlexaPlaybackControllerObserverInterface Function
+    /// @{
+    void onPlaybackStateChanged(const acsdkAlexaPlaybackControllerInterfaces::PlaybackState& playbackState) override;
+    /// @}
+
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param playbackController An interface that this object will use to perform the playback controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the reponse to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isProactivelyReported Whether the playback state reporter properties change is proactively reported to
+     *Alexa in a change report.
+     * @param isRetrievable Whether the playback state reporter properties can be retrieved when Alexa sends a state
+     *report request to the endpoint.
+     **/
+    AlexaPlaybackControllerCapabilityAgent(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface>&
+            playbackController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        bool isProactivelyReported,
+        bool isRetrievable);
+
+    /**
+     * Initializes the object.
+     */
+    bool initialize();
+
+    /**
+     * Remove a directive from the map of message IDs to DirectiveInfo instances.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
+     */
+    void removeDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Send the handling completed notification and clean up the resources.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Called on executor to handle any unknown directives received.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param type The @c ExceptionErrorType.
+     */
+    void executeUnknownDirective(std::shared_ptr<DirectiveInfo> info, avsCommon::avs::ExceptionErrorType type);
+
+    /**
+     * Call methods of @c AlexaInterfaceMessageSenderInterface based the endpoint's response for a controller method
+     * call.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param result This contains the endpoint's response of a controller call.
+     */
+    void executeSendResponseEvent(
+        const std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info,
+        const acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response& result);
+
+    /**
+     * Gets the current playback state from endpoint and notifies @c ContextManager
+     *
+     * @param stateProviderName Provides the property name and used in the @c ContextManager methods.
+     * @param contextRequestToken The token to be used when providing the response to @c ContextManager
+     */
+    void executeProvideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken);
+
+    /**
+     * Helper method to build the @c CapabilityState
+     *
+     * @param playbackState The playback state
+     */
+    avsCommon::avs::CapabilityState buildCapabilityState(const std::string& playbackState);
+
+    /// Endpoint the capability agent associated to.
+    avsCommon::sdkInterfaces::endpoints::EndpointIdentifier m_endpointId;
+
+    /// Whether the playback state controller properties change is proactively reported to Alexa in a change report.
+    bool m_isProactivelyReported;
+
+    /// Whether the playback state reporter properties can be retrieved when Alexa sends a state report request to the
+    /// endpoint.
+    bool m_isRetrievable;
+
+    /// Reference to @c AlexaPlaybackControllerInterface
+    std::shared_ptr<acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface> m_playbackController;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The @c AlexaInterfaceMessageSenderInterface used to send event messages.
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> m_responseSender;
+
+    /// Set of capability configurations that will get published during discovery
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> m_capabilityConfigurations;
+
+    /// This is the worker thread for the @c AlexaPlaybackControllerCapabilityAgent.
+    avsCommon::utils::threading::Executor m_executor;
+};
+
+}  // namespace acsdkAlexaPlaybackController
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAPLAYBACKCONTROLLER_PRIVATEINCLUDE_ACSDKALEXAPLAYBACKCONTROLLER_ALEXAPLAYBACKCONTROLLERCAPABILITYAGENT_H_
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/src/AlexaPlaybackControllerCapabilityAgent.cpp b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/src/AlexaPlaybackControllerCapabilityAgent.cpp
new file mode 100644
index 0000000000..b3cc06fe81
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/src/AlexaPlaybackControllerCapabilityAgent.cpp
@@ -0,0 +1,486 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkAlexaPlaybackController/AlexaPlaybackControllerCapabilityAgent.h"
+
+#include <acsdkAlexaPlaybackControllerInterfaces/PlaybackOperation.h>
+#include <AVSCommon/Utils/JSON/JSONGenerator.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPlaybackController {
+
+using namespace avsCommon::utils::json;
+using namespace avsCommon::avs;
+using namespace avsCommon;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::configuration;
+
+using namespace acsdkAlexaPlaybackControllerInterfaces;
+
+/// String to identify log entries originating from this file.
+static const std::string TAG{"AlexaPlaybackControllerCapabilityAgent"};
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+/// The namespace for this capability agent.
+static const std::string NAMESPACE{"Alexa.PlaybackController"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for PLAY directive
+static const std::string NAME_PLAY{"Play"};
+
+/// The name for PAUSE directive
+static const std::string NAME_PAUSE{"Pause"};
+
+/// The name for STOP directive
+static const std::string NAME_STOP{"Stop"};
+
+/// The name for STARTOVER directive
+static const std::string NAME_STARTOVER{"StartOver"};
+
+/// The name for PREVIOUS directive
+static const std::string NAME_PREVIOUS{"Previous"};
+
+/// The name for NEXT directive
+static const std::string NAME_NEXT{"Next"};
+
+/// The name for REWIND directive
+static const std::string NAME_REWIND{"Rewind"};
+
+/// The name for FASTFORWARD directive
+static const std::string NAME_FASTFORWARD{"FastForward"};
+
+/// The playbackOperation for SupportedOperations
+static const std::string SUPPORTED_OPERATIONS_KEY{"supportedOperations"};
+
+/// The namespace for this capability agent.
+static const std::string NAMESPACE_PLAYBACK_STATE_REPORTER{"Alexa.PlaybackStateReporter"};
+
+/// Property name for Alexa.PlaybackStateReporter
+static const std::string PLAYBACK_STATE_REPORTER_PROPERTY{"playbackState"};
+
+/**
+ * Convert an @c AlexaPlaybackControllerInterface.Response.Type to its corresponding @c
+ * AlexaInterfaceMessageSenderInterface.ErrorResponseType. Note that any @c
+ * AlexaPlaybackControllerInterface.Response.Type that does not map to @c ErrorResponseType will return INTERNAL_ERROR.
+ *
+ * @param responseType The response type to convert.
+ * @return The corresponding @c AlexaInterfaceMessageSenderInterface.ErrorResponseType.
+ */
+static avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType
+alexaPlaybackControllerResponseTypeToErrorType(const AlexaPlaybackControllerInterface::Response::Type responseType) {
+    ACSDK_DEBUG9(LX(__func__));
+    switch (responseType) {
+        case AlexaPlaybackControllerInterface::Response::Type::SUCCESS:
+            return AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR;
+        case AlexaPlaybackControllerInterface::Response::Type::PLAYBACK_OPERATION_NOT_SUPPORTED:
+            return AlexaInterfaceMessageSenderInterface::ErrorResponseType::INVALID_VALUE;
+        case AlexaPlaybackControllerInterface::Response::Type::NO_CONTENT_AVAILABLE:
+            return AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR;
+        case AlexaPlaybackControllerInterface::Response::Type::NOT_SUPPORTED_IN_CURRENT_MODE:
+            return AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR;
+        case AlexaPlaybackControllerInterface::Response::Type::INTERNAL_ERROR:
+            return AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR;
+    }
+
+    return AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR;
+}
+
+/**
+ * Generates a json object of type array from a set of @c PlaybackOperation values.
+ *
+ * @param playbackOperations A set of playbackOperationstroke values to be generated into json format.
+ * @return Returns the json object of an array of playback operation properties.
+ */
+static std::string generatePlaybackOperationsJson(std::set<PlaybackOperation> playbackOperations) {
+    if (playbackOperations.empty()) {
+        return "";
+    }
+
+    std::string playbackOperationsJson = "[";
+    for (const auto& playbackOperation : playbackOperations) {
+        auto playbackOperationString =
+            acsdkAlexaPlaybackControllerInterfaces::playbackOperationToString(playbackOperation);
+        playbackOperationsJson += "\"" + playbackOperationString + "\",";
+    }
+    playbackOperationsJson.pop_back();  // remove extra comma
+    playbackOperationsJson += "]";
+
+    ACSDK_DEBUG9(LX(__func__).sensitive("configuration", playbackOperationsJson));
+    return playbackOperationsJson;
+}
+
+std::shared_ptr<AlexaPlaybackControllerCapabilityAgent> AlexaPlaybackControllerCapabilityAgent::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    std::shared_ptr<AlexaPlaybackControllerInterface> playbackController,
+    const std::shared_ptr<ContextManagerInterface>& contextManager,
+    const std::shared_ptr<AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<ExceptionEncounteredSenderInterface>& exceptionSender,
+    bool isProactivelyReported,
+    bool isRetrievable) {
+    if (endpointId.empty()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "emptyEndpointId"));
+        return nullptr;
+    }
+    if (!playbackController) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullPlaybackController"));
+        return nullptr;
+    }
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManager"));
+        return nullptr;
+    }
+    if (!responseSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullResponseSender"));
+        return nullptr;
+    }
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    auto playbackControllerCapabilityAgent =
+        std::shared_ptr<AlexaPlaybackControllerCapabilityAgent>(new AlexaPlaybackControllerCapabilityAgent(
+            endpointId,
+            playbackController,
+            contextManager,
+            responseSender,
+            exceptionSender,
+            isProactivelyReported,
+            isRetrievable));
+
+    if (!playbackControllerCapabilityAgent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "instantiationFailed"));
+        return nullptr;
+    }
+
+    if (!playbackControllerCapabilityAgent->initialize()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "initializationFailed"));
+        return nullptr;
+    }
+
+    return playbackControllerCapabilityAgent;
+}
+
+AlexaPlaybackControllerCapabilityAgent::AlexaPlaybackControllerCapabilityAgent(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<AlexaPlaybackControllerInterface>& playbackController,
+    const std::shared_ptr<ContextManagerInterface>& contextManager,
+    const std::shared_ptr<AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<ExceptionEncounteredSenderInterface>& exceptionSender,
+    bool isProactivelyReported,
+    bool isRetrievable) :
+        CapabilityAgent{NAMESPACE, exceptionSender},
+        RequiresShutdown{"AlexaPlaybackControllerCapabilityAgent"},
+        m_endpointId{endpointId},
+        m_isProactivelyReported{isProactivelyReported},
+        m_isRetrievable{isRetrievable},
+        m_playbackController{playbackController},
+        m_contextManager{contextManager},
+        m_responseSender{responseSender} {
+}
+
+bool AlexaPlaybackControllerCapabilityAgent::initialize() {
+    ACSDK_DEBUG5(LX(__func__));
+    if (m_isRetrievable) {
+        m_contextManager->addStateProvider(
+            {NAMESPACE_PLAYBACK_STATE_REPORTER, PLAYBACK_STATE_REPORTER_PROPERTY, m_endpointId}, shared_from_this());
+    }
+    if (m_isProactivelyReported) {
+        if (!m_playbackController->addObserver(shared_from_this())) {
+            ACSDK_ERROR(LX("initializeFailed").d("reason", "addObserverFailed"));
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void AlexaPlaybackControllerCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!directive) {
+        ACSDK_ERROR(LX("handleDirectiveImmediatelyFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+}
+
+void AlexaPlaybackControllerCapabilityAgent::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX("preHandleDirective"));
+    // do nothing.
+}
+
+void AlexaPlaybackControllerCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+
+    m_executor.submit([this, info] {
+        ACSDK_DEBUG5(LX("handleDirectiveInExecutor"));
+        const std::string directiveName = info->directive->getName();
+        if (!info->directive->getEndpoint().hasValue() ||
+            (info->directive->getEndpoint().value().endpointId != m_endpointId)) {
+            executeUnknownDirective(info, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        AlexaPlaybackControllerInterface::Response result;
+        if (directiveName == NAME_PLAY) {
+            result = m_playbackController->play();
+        } else if (directiveName == NAME_PAUSE) {
+            result = m_playbackController->pause();
+        } else if (directiveName == NAME_STOP) {
+            result = m_playbackController->stop();
+        } else if (directiveName == NAME_STARTOVER) {
+            result = m_playbackController->startOver();
+        } else if (directiveName == NAME_PREVIOUS) {
+            result = m_playbackController->previous();
+        } else if (directiveName == NAME_NEXT) {
+            result = m_playbackController->next();
+        } else if (directiveName == NAME_REWIND) {
+            result = m_playbackController->rewind();
+        } else if (directiveName == NAME_FASTFORWARD) {
+            result = m_playbackController->fastForward();
+        } else {
+            ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "unexpectedDirective").d("name", directiveName));
+            executeUnknownDirective(info, ExceptionErrorType::UNSUPPORTED_OPERATION);
+            return;
+        }
+
+        executeSetHandlingCompleted(info);
+        executeSendResponseEvent(info, result);
+    });
+}
+
+void AlexaPlaybackControllerCapabilityAgent::provideState(
+    const CapabilityTag& stateProviderName,
+    const ContextRequestToken contextRequestToken) {
+    ACSDK_DEBUG5(
+        LX(__func__).d("contextRequestToken", contextRequestToken).sensitive("stateProviderName", stateProviderName));
+
+    m_executor.submit([this, stateProviderName, contextRequestToken] {
+        ACSDK_DEBUG9(LX("provideStateInExecutor"));
+        executeProvideState(stateProviderName, contextRequestToken);
+    });
+    return;
+}
+
+void AlexaPlaybackControllerCapabilityAgent::executeProvideState(
+    const CapabilityTag& stateProviderName,
+    const ContextRequestToken contextRequestToken) {
+    ACSDK_DEBUG5(LX("executeProvideState"));
+    bool isError = false;
+    if (stateProviderName.endpointId != m_endpointId) {
+        ACSDK_ERROR(LX("provideStateFailed")
+                        .d("reason", "notExpectedEndpointId")
+                        .sensitive("endpointId", stateProviderName.endpointId));
+        isError = true;
+    }
+    if (stateProviderName.name != PLAYBACK_STATE_REPORTER_PROPERTY) {
+        ACSDK_ERROR(LX("provideStateFailed").d("reason", "notExpectedName").d("name", stateProviderName.name));
+        isError = true;
+    }
+    if (!m_isRetrievable) {
+        ACSDK_ERROR(LX("provideStateFailed").d("reason", "provideStateOnNotRetrievableProperty"));
+        isError = true;
+    }
+
+    if (isError) {
+        m_contextManager->provideStateUnavailableResponse(stateProviderName, contextRequestToken, false);
+        return;
+    }
+
+    auto playbackState = m_playbackController->getPlaybackState();
+    auto playbackStateString = acsdkAlexaPlaybackControllerInterfaces::playbackStateToString(playbackState);
+
+    if (playbackStateString.empty()) {
+        ACSDK_ERROR(LX("executeProvideStateFailed").m("emptyPlaybackState"));
+        m_contextManager->provideStateUnavailableResponse(stateProviderName, contextRequestToken, false);
+        return;
+    }
+
+    m_contextManager->provideStateResponse(
+        stateProviderName, buildCapabilityState(playbackStateString), contextRequestToken);
+}
+
+CapabilityState AlexaPlaybackControllerCapabilityAgent::buildCapabilityState(const std::string& playbackStateString) {
+    std::string state;
+    state = "{ \"state\" : \"" + playbackStateString + "\"}";
+    return CapabilityState(state);
+}
+
+bool AlexaPlaybackControllerCapabilityAgent::canStateBeRetrieved() {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_isRetrievable;
+}
+
+bool AlexaPlaybackControllerCapabilityAgent::hasReportableStateProperties() {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_isRetrievable || m_isProactivelyReported;
+}
+
+void AlexaPlaybackControllerCapabilityAgent::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("cancelDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    if (!info->directive->getEndpoint().hasValue() ||
+        info->directive->getEndpoint().value().endpointId != m_endpointId) {
+        ACSDK_WARN(LX("cancelDirective").d("reason", "notExpectedEndpointId"));
+    }
+    removeDirective(info);
+}
+
+DirectiveHandlerConfiguration AlexaPlaybackControllerCapabilityAgent::getConfiguration() const {
+    ACSDK_DEBUG5(LX(__func__));
+    DirectiveHandlerConfiguration configuration;
+    auto neitherNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUMS_NONE, false);
+    configuration[{NAMESPACE, NAME_PLAY, m_endpointId}] = neitherNonBlockingPolicy;
+    configuration[{NAMESPACE, NAME_PAUSE, m_endpointId}] = neitherNonBlockingPolicy;
+    configuration[{NAMESPACE, NAME_STOP, m_endpointId}] = neitherNonBlockingPolicy;
+    configuration[{NAMESPACE, NAME_STARTOVER, m_endpointId}] = neitherNonBlockingPolicy;
+    configuration[{NAMESPACE, NAME_PREVIOUS, m_endpointId}] = neitherNonBlockingPolicy;
+    configuration[{NAMESPACE, NAME_NEXT, m_endpointId}] = neitherNonBlockingPolicy;
+    configuration[{NAMESPACE, NAME_REWIND, m_endpointId}] = neitherNonBlockingPolicy;
+    configuration[{NAMESPACE, NAME_FASTFORWARD, m_endpointId}] = neitherNonBlockingPolicy;
+
+    return configuration;
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> AlexaPlaybackControllerCapabilityAgent::
+    getCapabilityConfigurations() {
+    auto additionalConfigurations = CapabilityConfiguration::AdditionalConfigurations();
+    auto supportedOperations = m_playbackController->getSupportedOperations();
+    auto supportedOperationsJson = generatePlaybackOperationsJson(supportedOperations);
+    if (!supportedOperationsJson.empty()) additionalConfigurations[SUPPORTED_OPERATIONS_KEY] = supportedOperationsJson;
+
+    CapabilityConfiguration configuration{CapabilityConfiguration::ALEXA_INTERFACE_TYPE,
+                                          NAMESPACE,
+                                          INTERFACE_VERSION,
+                                          Optional<std::string>(),  // instance
+                                          Optional<CapabilityConfiguration::Properties>(),
+                                          additionalConfigurations};
+    m_capabilityConfigurations = {std::make_shared<avsCommon::avs::CapabilityConfiguration>(configuration)};
+
+    // enabling PlaybackStateReporter if any state report is required
+    if (m_isProactivelyReported || m_isRetrievable) {
+        CapabilityConfiguration configuration{
+            CapabilityConfiguration::ALEXA_INTERFACE_TYPE,
+            NAMESPACE_PLAYBACK_STATE_REPORTER,
+            INTERFACE_VERSION,
+            Optional<std::string>(),  // instance
+            Optional<CapabilityConfiguration::Properties>(
+                {m_isRetrievable, m_isProactivelyReported, {PLAYBACK_STATE_REPORTER_PROPERTY}}),
+            {}};
+        m_capabilityConfigurations.insert(std::make_shared<CapabilityConfiguration>(configuration));
+    }
+
+    return m_capabilityConfigurations;
+}
+
+void AlexaPlaybackControllerCapabilityAgent::doShutdown() {
+    m_executor.shutdown();
+    if (m_isProactivelyReported) {
+        m_playbackController->removeObserver(shared_from_this());
+    }
+    if (m_isRetrievable) {
+        m_contextManager->removeStateProvider(
+            {NAMESPACE_PLAYBACK_STATE_REPORTER, PLAYBACK_STATE_REPORTER_PROPERTY, m_endpointId});
+    }
+    m_playbackController.reset();
+    m_responseSender.reset();
+    m_contextManager.reset();
+}
+
+void AlexaPlaybackControllerCapabilityAgent::removeDirective(std::shared_ptr<DirectiveInfo> info) {
+    if (info->directive && info->result) {
+        CapabilityAgent::removeDirective(info->directive->getMessageId());
+    }
+}
+
+void AlexaPlaybackControllerCapabilityAgent::executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info) {
+    if (info && info->result) {
+        info->result->setCompleted();
+    }
+    removeDirective(info);
+}
+
+void AlexaPlaybackControllerCapabilityAgent::executeUnknownDirective(
+    std::shared_ptr<DirectiveInfo> info,
+    ExceptionErrorType type) {
+    ACSDK_ERROR(LX("executeUnknownDirectiveFailed")
+                    .d("reason", "unknownDirective")
+                    .d("namespace", info->directive->getNamespace())
+                    .d("name", info->directive->getName()));
+
+    const std::string exceptionMessage =
+        "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
+
+    sendExceptionEncounteredAndReportFailed(info, exceptionMessage, type);
+}
+
+void AlexaPlaybackControllerCapabilityAgent::executeSendResponseEvent(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    const AlexaPlaybackControllerInterface::Response& result) {
+    if (AlexaPlaybackControllerInterface::Response::Type::SUCCESS == result.responseType) {
+        m_responseSender->sendResponseEvent(
+            info->directive->getInstance(), info->directive->getCorrelationToken(), AVSMessageEndpoint(m_endpointId));
+    } else {
+        m_responseSender->sendErrorResponseEvent(
+            info->directive->getInstance(),
+            info->directive->getCorrelationToken(),
+            AVSMessageEndpoint(m_endpointId),
+            alexaPlaybackControllerResponseTypeToErrorType(result.responseType),
+            result.errorMessage);
+    }
+}
+
+void AlexaPlaybackControllerCapabilityAgent::onPlaybackStateChanged(const PlaybackState& playbackState) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!m_isProactivelyReported) {
+        ACSDK_ERROR(LX("onPlaybackStateChangeFailed").d("reason", "invalidOnPlaybackStateChangedCall"));
+        return;
+    }
+
+    auto playbackStateString = acsdkAlexaPlaybackControllerInterfaces::playbackStateToString(playbackState);
+
+    if (playbackStateString.empty()) {
+        ACSDK_ERROR(LX("onPlaybackStateChangedFailed").m("emptyPlaybackState"));
+        return;
+    }
+
+    m_executor.submit([this, playbackStateString] {
+        ACSDK_DEBUG9(LX("onPlaybackStateChangedInExecutor"));
+        m_contextManager->reportStateChange(
+            CapabilityTag(NAMESPACE_PLAYBACK_STATE_REPORTER, PLAYBACK_STATE_REPORTER_PROPERTY, m_endpointId),
+            buildCapabilityState(playbackStateString),
+            AlexaStateChangeCauseType::VOICE_INTERACTION);
+    });
+}
+}  // namespace acsdkAlexaPlaybackController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/src/AlexaPlaybackControllerFactory.cpp b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/src/AlexaPlaybackControllerFactory.cpp
new file mode 100644
index 0000000000..4a17fa766c
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/src/AlexaPlaybackControllerFactory.cpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkAlexaPlaybackController/AlexaPlaybackControllerFactory.h"
+
+#include "acsdkAlexaPlaybackController/AlexaPlaybackControllerCapabilityAgent.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPlaybackController {
+
+avsCommon::utils::Optional<AlexaPlaybackControllerFactory::AlexaPlaybackControllerCapabilityAgentData>
+AlexaPlaybackControllerFactory::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    std::shared_ptr<acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface> playbackController,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+    bool isProactivelyReported,
+    bool isRetrievable) {
+    AlexaPlaybackControllerFactory::AlexaPlaybackControllerCapabilityAgentData playbackControllerCapabilityAgentData;
+    auto playbackControllerCA = acsdkAlexaPlaybackController::AlexaPlaybackControllerCapabilityAgent::create(
+        endpointId,
+        playbackController,
+        contextManager,
+        responseSender,
+        exceptionSender,
+        isProactivelyReported,
+        isRetrievable);
+    if (playbackControllerCA) {
+        playbackControllerCapabilityAgentData.capabilityConfigurationInterface = playbackControllerCA;
+        playbackControllerCapabilityAgentData.directiveHandler = playbackControllerCA;
+        playbackControllerCapabilityAgentData.requiresShutdown = playbackControllerCA;
+        return avsCommon::utils::Optional<AlexaPlaybackControllerFactory::AlexaPlaybackControllerCapabilityAgentData>(
+            playbackControllerCapabilityAgentData);
+    }
+
+    return avsCommon::utils::Optional<AlexaPlaybackControllerFactory::AlexaPlaybackControllerCapabilityAgentData>();
+}
+
+}  // namespace acsdkAlexaPlaybackController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/src/CMakeLists.txt b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/src/CMakeLists.txt
new file mode 100644
index 0000000000..27744db79a
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkAlexaPlaybackController")
+
+add_library(acsdkAlexaPlaybackController
+        AlexaPlaybackControllerCapabilityAgent.cpp
+        AlexaPlaybackControllerFactory.cpp)
+
+target_include_directories(acsdkAlexaPlaybackController PRIVATE
+        "${acsdkAlexaPlaybackController_SOURCE_DIR}/privateInclude")
+
+target_include_directories(acsdkAlexaPlaybackController PUBLIC
+        "${acsdkAlexaPlaybackController_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaPlaybackController AVSCommon Alexa acsdkAlexaPlaybackControllerInterfaces acsdkManufactory)
+
+# install target
+asdk_install()
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/test/AlexaPlaybackControllerCapabilityAgentTest.cpp b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/test/AlexaPlaybackControllerCapabilityAgentTest.cpp
new file mode 100644
index 0000000000..9a0d4ca434
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/test/AlexaPlaybackControllerCapabilityAgentTest.cpp
@@ -0,0 +1,951 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerInterface.h>
+#include <acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerObserverInterface.h>
+#include <acsdkAlexaPlaybackControllerInterfaces/PlaybackOperation.h>
+#include <acsdkAlexaPlaybackControllerInterfaces/PlaybackState.h>
+#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
+#include <AVSCommon/SDKInterfaces/MockContextManager.h>
+#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/SDKInterfaces/MockAlexaInterfaceMessageSender.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/WaitEvent.h>
+
+#include "acsdkAlexaPlaybackController/AlexaPlaybackControllerCapabilityAgent.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPlaybackController {
+namespace test {
+
+using namespace alexaClientSDK::avsCommon::avs;
+using namespace alexaClientSDK::avsCommon::sdkInterfaces;
+using namespace alexaClientSDK::avsCommon::utils::memory;
+using namespace ::testing;
+
+using namespace acsdkAlexaPlaybackController;
+using namespace acsdkAlexaPlaybackControllerInterfaces;
+
+// For readability.
+using EndpointIdentifier = endpoints::EndpointIdentifier;
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// The namespace for capability agent.
+static const std::string NAMESPACE{"Alexa.PlaybackController"};
+
+/// The namespace for capability agent.
+static const std::string NAMESPACE_STATE_REPORT{"Alexa.PlaybackStateReporter"};
+
+/// Property name for Alexa.PlaybackStateReporter
+static const std::string STATE_REPORTER_PROPERTY{"playbackState"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for Play directive
+static const std::string NAME_PLAY{"Play"};
+
+/// The name for Pause directive
+static const std::string NAME_PAUSE{"Pause"};
+
+/// The name for Stop directive
+static const std::string NAME_STOP{"Stop"};
+
+/// The name for StartOver directive
+static const std::string NAME_START_OVER{"StartOver"};
+
+/// The name for Previous directive
+static const std::string NAME_PREVIOUS{"Previous"};
+
+/// The name for Next directive
+static const std::string NAME_NEXT{"Next"};
+
+/// The name for Rewind directive
+static const std::string NAME_REWIND{"Rewind"};
+
+/// The name for FastForward directive
+static const std::string NAME_FAST_FORWARD{"FastForward"};
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
+
+/// The test EndpointId
+static const EndpointIdentifier TEST_ENDPOINT_ID("testEndpointId");
+
+/// Event key.
+static const std::string EVENT("event");
+
+/// MessageId for testing.
+static const std::string MESSAGE_ID_TEST("MessageId_Test");
+
+/// DialogRequestId for testing.
+static const std::string DIALOG_REQUEST_ID_TEST("DialogRequestId_Test");
+
+/// Correlation token for testing.
+static const std::string CORRELATION_TOKEN_TEST("CorrelationToken_Test");
+
+/// The name of playback state property
+static const std::string PLAYBACKSTATE_PROPERTY_NAME{"playbackState"};
+
+class MockAlexaPlaybackControllerInterface : public AlexaPlaybackControllerInterface {
+public:
+    using Response = acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response;
+    using GetPlaybackState = acsdkAlexaPlaybackControllerInterfaces::PlaybackState;
+
+    MOCK_METHOD0(play, Response());
+    MOCK_METHOD0(pause, Response());
+    MOCK_METHOD0(stop, Response());
+    MOCK_METHOD0(startOver, Response());
+    MOCK_METHOD0(previous, Response());
+    MOCK_METHOD0(next, Response());
+    MOCK_METHOD0(rewind, Response());
+    MOCK_METHOD0(fastForward, Response());
+    MOCK_METHOD0(getPlaybackState, GetPlaybackState());
+    MOCK_METHOD1(addObserver, bool(const std::weak_ptr<AlexaPlaybackControllerObserverInterface>&));
+    MOCK_METHOD1(removeObserver, void(const std::weak_ptr<AlexaPlaybackControllerObserverInterface>&));
+    MOCK_METHOD0(getSupportedOperations, std::set<PlaybackOperation>());
+};
+
+class AlexaPlaybackControllerCapabilityAgentTest : public ::testing::Test {
+public:
+    /// SetUp before each test case.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Constructor.
+    AlexaPlaybackControllerCapabilityAgentTest() {
+    }
+
+protected:
+    /**
+     * Function to create AlexaPlaybackControllerCapabilityAgent based on the reportable flags
+     * and sets required ContextManager and PlaybackController mocks.
+     */
+    std::shared_ptr<AlexaPlaybackControllerCapabilityAgent> createCapabilityAgentAndSetExpects(
+        bool proactivelyReported,
+        bool retrievable);
+
+    /// A mock @c AlexaPlaybackControllerInterface object.
+    std::shared_ptr<StrictMock<MockAlexaPlaybackControllerInterface>> m_mockPlaybackController;
+
+    /// A mock @c AlexaPlaybackControllerObserverInterface object.
+    std::weak_ptr<AlexaPlaybackControllerObserverInterface> m_observer;
+
+    // a context manager
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>> m_mockContextManager;
+
+    /// The mock @c MessageSenderInterface.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>> m_mockResponseSender;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>
+        m_mockDirectiveHandlerResult;
+};
+
+void AlexaPlaybackControllerCapabilityAgentTest::SetUp() {
+    m_mockExceptionSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult =
+        make_unique<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>();
+    m_mockPlaybackController = std::make_shared<StrictMock<MockAlexaPlaybackControllerInterface>>();
+    m_mockContextManager = std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>>();
+    m_mockResponseSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>>();
+}
+
+void AlexaPlaybackControllerCapabilityAgentTest::TearDown() {
+}
+
+std::shared_ptr<AlexaPlaybackControllerCapabilityAgent> AlexaPlaybackControllerCapabilityAgentTest::
+    createCapabilityAgentAndSetExpects(bool proactivelyReported, bool retrievable) {
+    // ContextManager Mocks
+    if (retrievable) {
+        // Expects a non-null CA reference during create.
+        EXPECT_CALL(*m_mockContextManager, addStateProvider(_, ::testing::NotNull()));
+
+        // Expects a null when CA is shutdown.
+        EXPECT_CALL(*m_mockContextManager, removeStateProvider(_));
+    }
+
+    if (proactivelyReported) {
+        // addObserver Called during the initialization.
+        EXPECT_CALL(*m_mockPlaybackController, addObserver(_))
+            .WillOnce(WithArg<0>(Invoke([this](std::weak_ptr<AlexaPlaybackControllerObserverInterface> observer) {
+                m_observer = observer;
+                return true;
+            })));
+
+        // removeObserver is called during the shutdown
+        EXPECT_CALL(*m_mockPlaybackController, removeObserver(_))
+            .WillOnce(WithArg<0>(Invoke(
+                [this](std::weak_ptr<AlexaPlaybackControllerObserverInterface> observer) { m_observer.reset(); })));
+    }
+
+    auto playbackControllerCapabilityAgent = AlexaPlaybackControllerCapabilityAgent::create(
+        TEST_ENDPOINT_ID,
+        m_mockPlaybackController,
+        m_mockContextManager,
+        m_mockResponseSender,
+        m_mockExceptionSender,
+        proactivelyReported,
+        retrievable);
+    return playbackControllerCapabilityAgent;
+}
+
+std::shared_ptr<AVSDirective> buildAVSDirective(std::string directiveName) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<avsCommon::avs::attachment::test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(
+        NAMESPACE, directiveName, MESSAGE_ID_TEST, DIALOG_REQUEST_ID_TEST, CORRELATION_TOKEN_TEST, INTERFACE_VERSION);
+    auto avsMessageEndpoint = AVSMessageEndpoint(TEST_ENDPOINT_ID);
+
+    return AVSDirective::create("", avsMessageHeader, "", attachmentManager, "", avsMessageEndpoint);
+}
+
+/// Test that calls create() returns a nullptr if called with invalid arguments.
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_givenInvalidParameters_create_shouldFail) {
+    ASSERT_THAT(
+        AlexaPlaybackControllerCapabilityAgent::create(
+            "",
+            m_mockPlaybackController,
+            m_mockContextManager,
+            m_mockResponseSender,
+            m_mockExceptionSender,
+            true,
+            true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaPlaybackControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, nullptr, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender, true, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaPlaybackControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID,
+            m_mockPlaybackController,
+            nullptr,
+            m_mockResponseSender,
+            m_mockExceptionSender,
+            true,
+            true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaPlaybackControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID,
+            m_mockPlaybackController,
+            m_mockContextManager,
+            nullptr,
+            m_mockExceptionSender,
+            true,
+            true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaPlaybackControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID,
+            m_mockPlaybackController,
+            m_mockContextManager,
+            m_mockResponseSender,
+            nullptr,
+            true,
+            true),
+        IsNull());
+}
+
+/**
+ * Test successful handling of Play directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_playDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, play()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::SUCCESS, "");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_PLAY);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of Play directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_playDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, play()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::NO_CONTENT_AVAILABLE, "No content available for playing");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_PLAY);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test successful handling of Pause directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_pauseDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, pause()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::SUCCESS, "");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_PAUSE);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of Pause directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_pauseDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, pause()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::NO_CONTENT_AVAILABLE, "No content available for playing");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_PAUSE);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test successful handling of Stop directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_stopDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, stop()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::SUCCESS, "");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_STOP);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of Stop directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_stopDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, stop()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::NO_CONTENT_AVAILABLE, "No content available for playing");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_STOP);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test successful handling of StartOver directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_startOverDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, startOver()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::SUCCESS, "");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_START_OVER);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of StartOver directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_startOverDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, startOver()).WillOnce(InvokeWithoutArgs([]() {
+        AlexaPlaybackControllerInterface::Response playbackControllerResponse{
+            AlexaPlaybackControllerInterface::Response::Type::NO_CONTENT_AVAILABLE, "No content available for playing"};
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_START_OVER);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test successful handling of Previous directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_previousDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, previous()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::SUCCESS, "");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_PREVIOUS);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of Previous directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_previousDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, previous()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::NO_CONTENT_AVAILABLE, "No content available for playing");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_PREVIOUS);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test successful handling of Next directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_nextDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, next()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::SUCCESS, "");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_NEXT);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of Next directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_nextDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, next()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::NO_CONTENT_AVAILABLE, "No content available for playing");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_NEXT);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test successful handling of Rewind directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_rewindDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, rewind()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::SUCCESS, "");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_REWIND);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of Rewind directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_rewindDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, rewind()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::NO_CONTENT_AVAILABLE, "No content available for playing");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_REWIND);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test successful handling of FastForward directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_fastForwardDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, fastForward()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::SUCCESS, "");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_FAST_FORWARD);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of FastForward directive.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_fastForwardDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockPlaybackController, fastForward()).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::NO_CONTENT_AVAILABLE, "No content available for playing");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_FAST_FORWARD);
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_unknownDirective) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE), std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test triggering of reportStateChange and subsequent call to the
+ * ContextManager to build the context.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_reportStateChange_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Play case
+    EXPECT_CALL(*m_mockPlaybackController, play()).WillOnce(InvokeWithoutArgs([this]() {
+        m_observer.lock()->onPlaybackStateChanged(PlaybackState::PLAYING);
+        acsdkAlexaPlaybackControllerInterfaces::AlexaPlaybackControllerInterface::Response playbackControllerResponse(
+            AlexaPlaybackControllerInterface::Response::Type::SUCCESS, "");
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(*m_mockContextManager, reportStateChange(_, _, _))
+        .WillOnce(InvokeWithoutArgs([playbackControllerCapabilityAgent] {
+            const unsigned int stateRequestToken = 1;
+            playbackControllerCapabilityAgent->provideState(
+                CapabilityTag(NAMESPACE_STATE_REPORT, STATE_REPORTER_PROPERTY, TEST_ENDPOINT_ID), stateRequestToken);
+        }));
+
+    EXPECT_CALL(*m_mockPlaybackController, getPlaybackState())
+        .WillOnce(InvokeWithoutArgs(
+            []() -> MockAlexaPlaybackControllerInterface::GetPlaybackState { return PlaybackState::PLAYING; }));
+
+    EXPECT_CALL(*m_mockContextManager, provideStateResponse(_, _, _)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    m_mockPlaybackController->play();
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test triggering of reportStateChange and subsequent call to get the getPlaybackState and
+ * call to the ContextManager to report the new playback state.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_reportStateChange_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    // Play case
+    EXPECT_CALL(*m_mockPlaybackController, play()).WillOnce(InvokeWithoutArgs([this]() {
+        m_observer.lock()->onPlaybackStateChanged(PlaybackState::PLAYING);
+        AlexaPlaybackControllerInterface::Response playbackControllerResponse{
+            AlexaPlaybackControllerInterface::Response::Type::PLAYBACK_OPERATION_NOT_SUPPORTED, ""};
+        return playbackControllerResponse;
+    }));
+
+    EXPECT_CALL(*m_mockContextManager, reportStateChange(_, _, _))
+        .WillOnce(InvokeWithoutArgs([playbackControllerCapabilityAgent] {
+            const unsigned int stateRequestToken = 1;
+            playbackControllerCapabilityAgent->provideState(
+                CapabilityTag(NAMESPACE_STATE_REPORT, STATE_REPORTER_PROPERTY, TEST_ENDPOINT_ID), stateRequestToken);
+        }));
+
+    EXPECT_CALL(*m_mockPlaybackController, getPlaybackState())
+        .WillOnce(InvokeWithoutArgs(
+            []() -> MockAlexaPlaybackControllerInterface::GetPlaybackState { return PlaybackState::STOPPED; }));
+
+    EXPECT_CALL(*m_mockContextManager, provideStateResponse(_, _, _)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    m_mockPlaybackController->play();
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive with both proactively reported and retrievable set.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_unknownDirectiveWithProactivelyReportedAndRetrievableTrue) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true, true);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE), std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive with both proactively reported and retrievable as false.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaPlaybackControllerCapabilityAgentTest, test_unknownDirectiveWithProactivelyReportedAndRetrievableFalse) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    auto playbackControllerCapabilityAgent = createCapabilityAgentAndSetExpects(false, false);
+    ASSERT_THAT(playbackControllerCapabilityAgent, NotNull());
+
+    playbackControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE), std::move(m_mockDirectiveHandlerResult));
+    playbackControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    playbackControllerCapabilityAgent->shutdown();
+}
+
+}  // namespace test
+}  // namespace acsdkAlexaPlaybackController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/test/CMakeLists.txt b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/test/CMakeLists.txt
new file mode 100644
index 0000000000..c9f573e525
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackController/test/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+    "${acsdkAlexaPlaybackController_INCLUDE_DIR}"
+    "${acsdkAlexaPlaybackController_SOURCE_DIR}/privateInclude"
+    "${acsdkAlexaPlaybackControllerInterfaces_SOURCE_DIR}/include"
+    "${ASDK_INCLUDE_DIRS}")
+
+discover_unit_tests("${INCLUDE_PATH}" "SDKInterfacesTests;AttachmentCommonTestLib;acsdkAlexaPlaybackController")
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/CMakeLists.txt b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..e63637573e
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(acsdkAlexaPlaybackControllerInterfaces LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/include/acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerInterface.h b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/include/acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerInterface.h
new file mode 100644
index 0000000000..846622b946
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/include/acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerInterface.h
@@ -0,0 +1,214 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAPLAYBACKCONTROLLERINTERFACES_ALEXAPLAYBACKCONTROLLERINTERFACE_H_
+#define ACSDKALEXAPLAYBACKCONTROLLERINTERFACES_ALEXAPLAYBACKCONTROLLERINTERFACE_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/Optional.h>
+
+#include "acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerObserverInterface.h"
+#include "acsdkAlexaPlaybackControllerInterfaces/PlaybackOperation.h"
+#include "acsdkAlexaPlaybackControllerInterfaces/PlaybackState.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPlaybackControllerInterfaces {
+
+/**
+ * The @c AlexaPlaybackControllerInterface carries out playback controller actions such as play, pause, stop, start
+ * over, previous, next, rewind, fast forward.
+ *
+ * An implementation of the AlexaPlaybackControllerInterface lets the user control media content interactions. Sends
+ * operations to the device for controlling playback of audio or video content. This includes play, pause, fastforward,
+ * etc. This can be called by multiple callers; for example, the AlexaPlaybackController Capability Agent or the
+ * application's GUI.
+ *
+ * This interface can report to subscribers implemented the @c AlexaPlaybackControllerObserverInterface when there is a
+ * playback state change.
+ *
+ * @note Implementations of this interface must be thread-safe.
+ */
+class AlexaPlaybackControllerInterface {
+public:
+    /**
+     * Struct for holding AlexaPlaybackController response for AlexaPlaybackController interface
+     *
+     * @c responseType should be `SUCCESS` if there are no errors while executing playback controller operation.
+     * Otherwise, it should return the corresponding error response along with a log message @c errorMessage that would
+     * be logged in the cloud, for the purposes of aiding debugging.
+     */
+    struct Response {
+        /**
+         * Enum for the different error types understood by the AlexaPlaybackController capability agent.
+         */
+        enum class Type {
+            /// Device processed command successfully without any errors
+            SUCCESS,
+
+            /// Indicates the playback operation is not supported on the device.
+            PLAYBACK_OPERATION_NOT_SUPPORTED,
+
+            /// Indicates there is no audio or video content that is available when 'play', 'previous', 'next' or other
+            /// playback operation is invoked.
+            NO_CONTENT_AVAILABLE,
+
+            /// Indicates that the operation cannot be operated in the current mode. For example, if the device should
+            /// disable 'play' operation for a video in driving mode
+            NOT_SUPPORTED_IN_CURRENT_MODE,
+
+            /// An error occurred that can't be described by one of the other error types. For example, a runtime
+            /// exception occurred. We recommend that you always send a more specific error type, if possible.
+            INTERNAL_ERROR
+        };
+
+        /**
+         * Default Constructor. Initializes the response value to 'SUCCESS' by default.
+         */
+        Response() : responseType{Type::SUCCESS} {};
+
+        /**
+         * Constructor
+         *
+         * @param responseType The response type @c Type
+         * @param errorMessage The error message if @c responseType is other than SUCCESS.
+         */
+        Response(Type responseType, const std::string& errorMessage) :
+                responseType{responseType},
+                errorMessage{errorMessage} {};
+
+        /// The AlexaPlaybackController response type
+        Type responseType;
+
+        /// The error message for logging if the @c responseType is any other than SUCCESS, for the purposes of aiding
+        /// debugging.
+        std::string errorMessage;
+    };
+
+    /**
+     * Virtual destructor to assure proper cleanup of derived types.
+     */
+    virtual ~AlexaPlaybackControllerInterface() = default;
+
+    /**
+     * Execute play operation for audio or video content on the device
+     *
+     * @return A @c AlexaPlaybackControllerResponse to indicate whether playback operation was successfully executed or
+     * encountered an error while executing.
+     */
+    virtual Response play() = 0;
+
+    /**
+     * Execute pause operation for audio or video content on the device
+     *
+     * @return A @c AlexaPlaybackControllerResponse to indicate whether playback operation was successfully executed or
+     * encountered an error while executing.
+     */
+    virtual Response pause() = 0;
+
+    /**
+     * Execute stop operation for audio or video content on the device
+     *
+     * @return A @c AlexaPlaybackControllerResponse to indicate whether playback operation was successfully executed or
+     * encountered an error while executing.
+     */
+    virtual Response stop() = 0;
+
+    /**
+     * Execute start over operation for audio or video content on the device
+     *
+     * @return A @c AlexaPlaybackControllerResponse to indicate whether playback operation was successfully executed or
+     * encountered an error while executing.
+     */
+    virtual Response startOver() = 0;
+
+    /**
+     * Execute previous operation for audio or video content on the device
+     *
+     * @return A @c AlexaPlaybackControllerResponse to indicate whether playback operation was successfully executed or
+     * encountered an error while executing.
+     */
+    virtual Response previous() = 0;
+
+    /**
+     * Execute next operation for audio or video content on the device
+     *
+     * @return A @c AlexaPlaybackControllerResponse to indicate whether playback operation was successfully executed or
+     * encountered an error while executing.
+     */
+    virtual Response next() = 0;
+
+    /**
+     * Execute rewind operation for audio or video content on the device
+     *
+     * @return A @c AlexaPlaybackControllerResponse to indicate whether playback operation was successfully executed or
+     * encountered an error while executing.
+     */
+    virtual Response rewind() = 0;
+
+    /**
+     * Execute fast forward operation for audtio or video content on the device
+     *
+     * @return A @c AlexaPlaybackControllerResponse to indicate whether playback operation was successfully executed or
+     * encountered an error while executing.
+     */
+    virtual Response fastForward() = 0;
+
+    /**
+     * Get the current playback state of the device.
+     *
+     * @return Return the current playback state for the audio or video content @c PlaybackState
+     *
+     * @note If @c AlexaPlaybackControllerInterface implementation has configured its instance's property as
+     * retrievable, this method should return the current launch target state. Unlike @c
+     * AlexaPlaybackControllerObserverInterface observer methods, this returns the current playback state at any given
+     * point when requested, with or without a change in playback state.
+     */
+    virtual acsdkAlexaPlaybackControllerInterfaces::PlaybackState getPlaybackState() = 0;
+
+    /**
+     * Returns all supported playback operations the device is expected to understand.
+     *
+     * @return A @c PlaybackOperation set object that contains the supported playback operations. e.g. Play, Pause,
+     * Stop, StartOver, Previous, Next, Rewind, FastForward
+     */
+    virtual std::set<acsdkAlexaPlaybackControllerInterfaces::PlaybackOperation> getSupportedOperations() = 0;
+
+    /**
+     * Adds a @c AlexaPlaybackControllerObserverInterface observer.
+     *
+     * @note If AlexaPlaybackControllerInterface implementation has configured its instance's property as proactively
+     * reported, then it is required to notify observers of @c AlexaPlaybackControllerObserverInterface for any change
+     * in its property state. This includes notifying the value when the device starts, if it is different from the last
+     * reported value.
+     *
+     * @param observer The pointer to the @c AlexaPlaybackControllerObserverInterface.
+     * @return @c true if the object supports observer notification and observer was successfully added; otherwise,
+     * return @c false
+     */
+    virtual bool addObserver(const std::weak_ptr<AlexaPlaybackControllerObserverInterface>& observer) = 0;
+
+    /**
+     * Removes an observer of @c AlexaPlaybackControllerObserverInterface.
+     *
+     * @param observer The pointer to the @c AlexaPlaybackControllerObserverInterface.
+     */
+    virtual void removeObserver(const std::weak_ptr<AlexaPlaybackControllerObserverInterface>& observer) = 0;
+};
+
+}  // namespace acsdkAlexaPlaybackControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAPLAYBACKCONTROLLERINTERFACES_ALEXAPLAYBACKCONTROLLERINTERFACE_H_
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/include/acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerObserverInterface.h b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/include/acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerObserverInterface.h
new file mode 100644
index 0000000000..57922a80a8
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/include/acsdkAlexaPlaybackControllerInterfaces/AlexaPlaybackControllerObserverInterface.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAPLAYBACKCONTROLLERINTERFACES_ALEXAPLAYBACKCONTROLLEROBSERVERINTERFACE_H_
+#define ACSDKALEXAPLAYBACKCONTROLLERINTERFACES_ALEXAPLAYBACKCONTROLLEROBSERVERINTERFACE_H_
+
+#include "acsdkAlexaPlaybackControllerInterfaces/PlaybackState.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPlaybackControllerInterfaces {
+/**
+ * This interface is used to observe changes to the playback state of a device that is caused by the
+ * @c AlexaPlaybackControllerInterface.
+ */
+class AlexaPlaybackControllerObserverInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~AlexaPlaybackControllerObserverInterface() = default;
+
+    /**
+     * Notifies the change in the playback state properties of the endpoint.
+     *
+     * @param playbackState The playback value specified using @c PlaybackState.
+     */
+    virtual void onPlaybackStateChanged(const acsdkAlexaPlaybackControllerInterfaces::PlaybackState& playbackState) = 0;
+};
+
+}  // namespace acsdkAlexaPlaybackControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAPLAYBACKCONTROLLERINTERFACES_ALEXAPLAYBACKCONTROLLEROBSERVERINTERFACE_H_
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/include/acsdkAlexaPlaybackControllerInterfaces/PlaybackOperation.h b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/include/acsdkAlexaPlaybackControllerInterfaces/PlaybackOperation.h
new file mode 100644
index 0000000000..f327817fd4
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/include/acsdkAlexaPlaybackControllerInterfaces/PlaybackOperation.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAPLAYBACKCONTROLLERINTERFACES_PLAYBACKOPERATION_H_
+#define ACSDKALEXAPLAYBACKCONTROLLERINTERFACES_PLAYBACKOPERATION_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPlaybackControllerInterfaces {
+
+/**
+ * The PlaybackOperation enumeration carries out playback controller actions such as play, pause and stop audio or video
+ * content.
+ */
+enum class PlaybackOperation {
+    /// Play audio or video content
+    PLAY,
+
+    /// Pause audio or video content
+    PAUSE,
+
+    /// Stop audio or video content
+    STOP,
+
+    /// Restart audio or video content
+    START_OVER,
+
+    /// Go to the previous audio or video content
+    PREVIOUS,
+
+    /// Go to the next audio or video content
+    NEXT,
+
+    /// Rewind the audio or video content
+    REWIND,
+
+    /// Fast forward the audio or video content
+    FAST_FORWARD
+};
+
+/**
+ * Convert a @c PlaybackOperation enum to its corresponding string value. Note that any @c PlaybackOperation that does
+ * not map to @c PlaybackOperation enum value will return an empty string.
+ *
+ * @param playbackOperation The playback operation value to convert.
+ * @return The corresponding string value for @c PlaybackOperation. Returns an empty string if @c PlaybackOperation does
+ * not map to a @c PlaybackOperation enum.
+ */
+std::string playbackOperationToString(PlaybackOperation playbackOperation);
+
+}  // namespace acsdkAlexaPlaybackControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAPLAYBACKCONTROLLERINTERFACES_PLAYBACKOPERATION_H_
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/include/acsdkAlexaPlaybackControllerInterfaces/PlaybackState.h b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/include/acsdkAlexaPlaybackControllerInterfaces/PlaybackState.h
new file mode 100644
index 0000000000..15d41361e3
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/include/acsdkAlexaPlaybackControllerInterfaces/PlaybackState.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAPLAYBACKCONTROLLERINTERFACES_PLAYBACKSTATE_H_
+#define ACSDKALEXAPLAYBACKCONTROLLERINTERFACES_PLAYBACKSTATE_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPlaybackControllerInterfaces {
+
+/**
+ * The enumeration representing the playback status of the media played on a device reported understood by Alexa
+ * interfaces. https://developer.amazon.com/en-US/docs/alexa/device-apis/alexa-property-schemas.html#playbackstate
+ */
+enum class PlaybackState {
+    /// Media content is playing
+    PLAYING,
+
+    /// Media content is paused
+    PAUSED,
+
+    /// Media content is not playing
+    STOPPED
+};
+
+/**
+ * Convert a @c PlaybackState enum to its corresponding string value. Note that any @c PlaybackState that does not map
+ * to @c PlaybackState enum value will return an empty string.
+ *
+ * @param playbackState The playback state value to convert.
+ * @return The corresponding string value for @c PlaybackState. Returns an empty string if @c PlaybackState does not map
+ * to a @c PlaybackState enum.
+ */
+std::string playbackStateToString(PlaybackState playbackState);
+
+}  // namespace acsdkAlexaPlaybackControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAPLAYBACKCONTROLLERINTERFACES_PLAYBACKSTATE_H_
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/src/CMakeLists.txt b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/src/CMakeLists.txt
new file mode 100644
index 0000000000..522edd1eea
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/src/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkAlexaPlaybackControllerInterfaces")
+
+add_library(acsdkAlexaPlaybackControllerInterfaces
+        PlaybackOperation.cpp
+        PlaybackState.cpp)
+
+target_include_directories(acsdkAlexaPlaybackControllerInterfaces PUBLIC
+        "${acsdkAlexaPlaybackControllerInterfaces_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaPlaybackControllerInterfaces AVSCommon Alexa)
+
+# install target
+asdk_install()
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/src/PlaybackOperation.cpp b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/src/PlaybackOperation.cpp
new file mode 100644
index 0000000000..a6401dde3a
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/src/PlaybackOperation.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkAlexaPlaybackControllerInterfaces/PlaybackOperation.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPlaybackControllerInterfaces {
+
+std::string playbackOperationToString(PlaybackOperation playbackOperation) {
+    switch (playbackOperation) {
+        case PlaybackOperation::PLAY:
+            return "Play";
+        case PlaybackOperation::PAUSE:
+            return "Pause";
+        case PlaybackOperation::STOP:
+            return "Stop";
+        case PlaybackOperation::START_OVER:
+            return "StartOver";
+        case PlaybackOperation::PREVIOUS:
+            return "Previous";
+        case PlaybackOperation::NEXT:
+            return "Next";
+        case PlaybackOperation::REWIND:
+            return "Rewind";
+        case PlaybackOperation::FAST_FORWARD:
+            return "FastForward";
+    }
+
+    return "";
+}
+
+}  // namespace acsdkAlexaPlaybackControllerInterfaces
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/src/PlaybackState.cpp b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/src/PlaybackState.cpp
new file mode 100644
index 0000000000..510318acbb
--- /dev/null
+++ b/capabilities/AlexaPlaybackController/acsdkAlexaPlaybackControllerInterfaces/src/PlaybackState.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkAlexaPlaybackControllerInterfaces/PlaybackState.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPlaybackControllerInterfaces {
+
+std::string playbackStateToString(PlaybackState playbackState) {
+    if (PlaybackState::PLAYING == playbackState) {
+        return "PLAYING";
+    } else if (PlaybackState::PAUSED == playbackState) {
+        return "PAUSED";
+    } else if (PlaybackState::STOPPED == playbackState) {
+        return "STOPPED";
+    }
+
+    return "";
+}
+
+}  // namespace acsdkAlexaPlaybackControllerInterfaces
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaPresentation/.clang-format b/capabilities/AlexaPresentation/.clang-format
new file mode 100644
index 0000000000..3d1ec24482
--- /dev/null
+++ b/capabilities/AlexaPresentation/.clang-format
@@ -0,0 +1,102 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
+
diff --git a/capabilities/AlexaPresentation/AlexaPresentation/CMakeLists.txt b/capabilities/AlexaPresentation/AlexaPresentation/CMakeLists.txt
new file mode 100644
index 0000000000..e4046e4404
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentation/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaPresentation LANGUAGES CXX)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/capabilities/AlexaPresentation/AlexaPresentation/include/acsdk/AlexaPresentation/AlexaPresentationFactory.h b/capabilities/AlexaPresentation/AlexaPresentation/include/acsdk/AlexaPresentation/AlexaPresentationFactory.h
new file mode 100644
index 0000000000..60d0ceee5d
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentation/include/acsdk/AlexaPresentation/AlexaPresentationFactory.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAPRESENTATION_ALEXAPRESENTATIONFACTORY_H_
+#define ACSDK_ALEXAPRESENTATION_ALEXAPRESENTATIONFACTORY_H_
+
+#include <memory>
+#include <string>
+
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include <acsdk/AlexaPresentationInterfaces/AlexaPresentationCapabilityAgentInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationToken.h>
+
+namespace alexaClientSDK {
+namespace alexaPresentation {
+/**
+ * The AlexaPresentationFactory is responsible to create the objects that interacts with @c AlexaPresentation CA
+ */
+class AlexaPresentationFactory {
+private:
+    /**
+     * This object contains the interfaces to interact with the AlexaPresentation Capability Agent.
+     */
+    struct AlexaPresentationAgentData {
+        /// An interface used to handle AlexaPresentation capability agent.
+        std::shared_ptr<alexaPresentationInterfaces::AlexaPresentationCapabilityAgentInterface> alexaPresentation;
+        /// An interface used to provide accesss to the version and configurations of capability agent.
+        std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface> capabilityConfiguration;
+        /// Instance of @c RequiresShutdown used for cleaning up the capability agent during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+public:
+    /**
+     * Destructor.
+     */
+    ~AlexaPresentationFactory() = default;
+
+    /**
+     * Create an instance of @c AlexaPresentation.
+     *
+     * @param exceptionSender The @c ExceptionEncounteredSenderInterface that sends Exception
+     * messages to AVS.
+     * @param messageSender The @c MessageSenderInterface that sends events to AVS.
+     * @param contextManager The @c ContextManagerInterface used to generate system context for events.
+     */
+    static avsCommon::utils::Optional<AlexaPresentationAgentData> create(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager);
+};
+
+}  // namespace alexaPresentation
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAPRESENTATION_ALEXAPRESENTATIONFACTORY_H_
diff --git a/capabilities/AlexaPresentation/AlexaPresentation/privateInclude/acsdk/AlexaPresentation/private/AlexaPresentation.h b/capabilities/AlexaPresentation/AlexaPresentation/privateInclude/acsdk/AlexaPresentation/private/AlexaPresentation.h
new file mode 100644
index 0000000000..fb1fbf8f98
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentation/privateInclude/acsdk/AlexaPresentation/private/AlexaPresentation.h
@@ -0,0 +1,164 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAPRESENTATION_PRIVATE_ALEXAPRESENTATION_H_
+#define ACSDK_ALEXAPRESENTATION_PRIVATE_ALEXAPRESENTATION_H_
+
+#include <memory>
+#include <queue>
+#include <string>
+#include <tuple>
+
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+#include <acsdk/AlexaPresentationInterfaces/AlexaPresentationCapabilityAgentInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationToken.h>
+
+namespace alexaClientSDK {
+namespace alexaPresentation {
+/**
+ * The AlexaPresentation CA is responsible to report presentation states to AVS.
+ */
+class AlexaPresentation
+        : public alexaClientSDK::avsCommon::avs::CapabilityAgent
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public alexaClientSDK::avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public alexaClientSDK::alexaPresentationInterfaces::AlexaPresentationCapabilityAgentInterface
+        , public std::enable_shared_from_this<AlexaPresentation> {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~AlexaPresentation() = default;
+
+    /**
+     * Create an instance of @c AlexaPresentation.
+     *
+     * @param exceptionSender The @c ExceptionEncounteredSenderInterface that sends Exception
+     * messages to AVS.
+     * @param messageSender The @c MessageSenderInterface that sends events to AVS.
+     * @param contextManager The @c ContextManagerInterface used to generate system context for events.
+     */
+    static std::shared_ptr<AlexaPresentation> create(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager);
+
+    /// Device SDK Facing Interfaces
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<alexaClientSDK::avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
+    alexaClientSDK::avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>>
+    getCapabilityConfigurations() override;
+    /// @}
+
+    /// @name ContextRequesterInterface Functions
+    /// @{
+    void onContextAvailable(const std::string& jsonContext) override;
+    void onContextFailure(const alexaClientSDK::avsCommon::sdkInterfaces::ContextRequestError error) override;
+    /// @}
+
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /// @name AlexaPresentationCapabilityAgentInterface functions
+    /// @{
+    virtual void onPresentationDismissed(const aplCapabilityCommonInterfaces::PresentationToken& token) override;
+    /// @}
+
+    /// Tests Facing interfaces
+    /**
+     * Set the executor used as the worker thread
+     * @param executor The @c Executor to set
+     * @note This function should only be used for testing purposes. No call to any other method should
+     * be done prior to this call.
+     */
+    void setExecutor(const std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor>& executor);
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param exceptionSender The object to use for sending AVS Exception messages.
+     * @param messageSender The @c MessageSenderInterface that sends events to AVS.
+     * @param contextManager The @c ContextManagerInterface used to generate system context for events.
+     */
+    AlexaPresentation(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager);
+
+    /**
+     * Remove a directive from the map of message IDs to DirectiveInfo instances.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
+     */
+    void removeDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Send the handling completed notification and clean up the resources.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void setHandlingCompleted(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Queue an AVS event to be sent when context is available
+     * @param avsNamespace namespace of the event
+     * @param name name of the event
+     * @param payload payload of the event
+     */
+    void executeSendEvent(const std::string& avsNamespace, const std::string& name, const std::string& payload);
+
+    /**
+     * This function handles any unknown directives received.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void handleUnknownDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /// The object to use for sending events.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> m_messageSender;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The queue of events to be sent to AVS.
+    std::queue<std::tuple<std::string, std::string, std::string>> m_events;
+
+    /// This is the worker thread for the @c AlexaPresentation CA.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> m_executor;
+};
+
+}  // namespace alexaPresentation
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAPRESENTATION_PRIVATE_ALEXAPRESENTATION_H_
diff --git a/capabilities/AlexaPresentation/AlexaPresentation/src/AlexaPresentation.cpp b/capabilities/AlexaPresentation/AlexaPresentation/src/AlexaPresentation.cpp
new file mode 100644
index 0000000000..5452f33dfd
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentation/src/AlexaPresentation.cpp
@@ -0,0 +1,235 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <ostream>
+
+#include <AVSCommon/AVS/EventBuilder.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "acsdk/AlexaPresentation/private/AlexaPresentation.h"
+
+namespace alexaClientSDK {
+namespace alexaPresentation {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::configuration;
+using namespace avsCommon::utils::json;
+
+/// String to identify log entries originating from this file.
+#define TAG "AlexaPresentation"
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// The name for Presentation Dismissed event.
+static const char* PRESENTATION_DISMISSED = "Dismissed";
+
+/// AlexaPresentation interface type
+static const char* ALEXAPRESENTATION_CAPABILITY_INTERFACE_TYPE = "AlexaInterface";
+
+/// AlexaPresentation interface name
+static const char* ALEXAPRESENTATION_CAPABILITY_INTERFACE_NAME = "Alexa.Presentation";
+
+/// AlexaPresentation interface version
+static const char* ALEXAPRESENTATION_CAPABILITY_INTERFACE_VERSION = "1.0";
+
+/// Namespace supported by Alexa presentation capability agent.
+static const char* ALEXA_PRESENTATION_NAMESPACE = "Alexa.Presentation";
+
+std::shared_ptr<AlexaPresentation> AlexaPresentation::create(
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager) {
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    if (!messageSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullMessageSender"));
+        return nullptr;
+    }
+
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManagerInterface"));
+        return nullptr;
+    }
+
+    std::shared_ptr<AlexaPresentation> alexaPresentation(
+        new AlexaPresentation(exceptionSender, messageSender, contextManager));
+
+    return alexaPresentation;
+}
+
+void AlexaPresentation::setExecutor(
+    const std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor>& executor) {
+    ACSDK_WARN(LX(__func__).d("reason", "should be called in test only"));
+    m_executor = executor;
+}
+
+void AlexaPresentation::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG5(LX(__func__));
+    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+}
+
+void AlexaPresentation::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("preHandleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+}
+
+void AlexaPresentation::handleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    handleUnknownDirective(info);
+}
+
+void AlexaPresentation::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
+    removeDirective(info);
+}
+
+DirectiveHandlerConfiguration AlexaPresentation::getConfiguration() const {
+    DirectiveHandlerConfiguration configuration;
+    return configuration;
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> AlexaPresentation::
+    getCapabilityConfigurations() {
+    std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>>
+        capabilityConfigurations;
+    std::unordered_map<std::string, std::string> configMap;
+
+    configMap.insert({CAPABILITY_INTERFACE_TYPE_KEY, ALEXAPRESENTATION_CAPABILITY_INTERFACE_TYPE});
+    configMap.insert({CAPABILITY_INTERFACE_NAME_KEY, ALEXAPRESENTATION_CAPABILITY_INTERFACE_NAME});
+    configMap.insert({CAPABILITY_INTERFACE_VERSION_KEY, ALEXAPRESENTATION_CAPABILITY_INTERFACE_VERSION});
+
+    capabilityConfigurations.insert(std::make_shared<CapabilityConfiguration>(configMap));
+    return capabilityConfigurations;
+}
+
+void AlexaPresentation::onPresentationDismissed(const aplCapabilityCommonInterfaces::PresentationToken& token) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, token]() {
+        ACSDK_DEBUG5(LX("onPresentationDismissedExecutor"));
+        // Assemble the event payload.
+        std::ostringstream payload;
+        payload << R"({"presentationToken":")" << token << R"("})";
+        executeSendEvent(ALEXA_PRESENTATION_NAMESPACE, PRESENTATION_DISMISSED, payload.str());
+    });
+}
+
+AlexaPresentation::AlexaPresentation(
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager) :
+        CapabilityAgent{ALEXA_PRESENTATION_NAMESPACE, exceptionSender},
+        RequiresShutdown{ALEXA_PRESENTATION_NAMESPACE},
+        m_messageSender{messageSender},
+        m_contextManager{contextManager} {
+    m_executor = std::make_shared<alexaClientSDK::avsCommon::utils::threading::Executor>();
+}
+
+void AlexaPresentation::doShutdown() {
+    m_executor->shutdown();
+    m_messageSender.reset();
+    m_contextManager.reset();
+}
+
+void AlexaPresentation::removeDirective(std::shared_ptr<DirectiveInfo> info) {
+    /*
+     * Check result too, to catch cases where DirectiveInfo was created locally, without a nullptr result.
+     * In those cases there is no messageId to remove because no result was expected.
+     */
+    if (info->directive && info->result) {
+        CapabilityAgent::removeDirective(info->directive->getMessageId());
+    }
+}
+
+void AlexaPresentation::setHandlingCompleted(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (info) {
+        if (info->result) {
+            info->result->setCompleted();
+        } else {
+            sendExceptionEncounteredAndReportFailed(
+                info, "Unable to complete directive", ExceptionErrorType::INTERNAL_ERROR);
+        }
+        removeDirective(info);
+    }
+}
+
+void AlexaPresentation::handleUnknownDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info) {
+        ACSDK_ERROR(LX("handleUnknownDirective").m("nullDirectiveInfo"));
+        sendExceptionEncounteredAndReportFailed(
+            info, "nullDirectiveInfo", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+        return;
+    }
+    ACSDK_ERROR(LX("requestedToHandleUnknownDirective")
+                    .d("reason", "unknownDirective")
+                    .d("namespace", info->directive->getNamespace())
+                    .d("name", info->directive->getName()));
+    m_executor->submit([this, info] {
+        const std::string exceptionMessage =
+            "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
+
+        sendExceptionEncounteredAndReportFailed(
+            info, exceptionMessage, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+    });
+}
+
+void AlexaPresentation::executeSendEvent(
+    const std::string& avsNamespace,
+    const std::string& name,
+    const std::string& payload) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_events.push(std::make_tuple(avsNamespace, name, payload));
+    m_contextManager->getContext(shared_from_this());
+}
+
+void AlexaPresentation::onContextAvailable(const std::string& jsonContext) {
+    auto task = [this, jsonContext]() {
+        ACSDK_DEBUG9(LX("onContextAvailableExecutor"));
+
+        if (!m_events.empty()) {
+            auto event = m_events.front();
+
+            auto msgIdAndJsonEvent = avsCommon::avs::buildJsonEventString(
+                std::get<0>(event), std::get<1>(event), "", std::get<2>(event), jsonContext);
+            auto userEventMessage = std::make_shared<avsCommon::avs::MessageRequest>(msgIdAndJsonEvent.second);
+            ACSDK_DEBUG9(LX("Sending event to AVS").d("namespace", std::get<0>(event)).d("name", std::get<1>(event)));
+            m_messageSender->sendMessage(userEventMessage);
+
+            m_events.pop();
+        }
+    };
+
+    m_executor->submit(task);
+}
+
+void AlexaPresentation::onContextFailure(const ContextRequestError error) {
+    ACSDK_ERROR(LX(__func__).d("reason", "contextRequestErrorOccurred").d("error", error));
+}
+
+}  // namespace alexaPresentation
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaPresentation/AlexaPresentation/src/AlexaPresentationFactory.cpp b/capabilities/AlexaPresentation/AlexaPresentation/src/AlexaPresentationFactory.cpp
new file mode 100644
index 0000000000..16943bbd1f
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentation/src/AlexaPresentationFactory.cpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <ostream>
+
+#include <AVSCommon/AVS/EventBuilder.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "acsdk/AlexaPresentation/private/AlexaPresentation.h"
+#include "acsdk/AlexaPresentation/AlexaPresentationFactory.h"
+
+namespace alexaClientSDK {
+namespace alexaPresentation {
+/// String to identify log entries originating from this file.
+#define TAG "AlexaPresentationFactory"
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+avsCommon::utils::Optional<AlexaPresentationFactory::AlexaPresentationAgentData> AlexaPresentationFactory::create(
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager) {
+    auto alexaPresentation = AlexaPresentation::create(exceptionSender, messageSender, contextManager);
+
+    if (alexaPresentation) {
+        AlexaPresentationFactory::AlexaPresentationAgentData alexaPresentationData;
+        alexaPresentationData.alexaPresentation = alexaPresentation;
+        alexaPresentationData.requiresShutdown = alexaPresentation;
+        alexaPresentationData.capabilityConfiguration = alexaPresentation;
+        return avsCommon::utils::Optional<AlexaPresentationFactory::AlexaPresentationAgentData>(alexaPresentationData);
+    }
+    return avsCommon::utils::Optional<AlexaPresentationFactory::AlexaPresentationAgentData>();
+}
+}  // namespace alexaPresentation
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/capabilities/AlexaPresentation/AlexaPresentation/src/CMakeLists.txt b/capabilities/AlexaPresentation/AlexaPresentation/src/CMakeLists.txt
new file mode 100644
index 0000000000..96f4c8b724
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentation/src/CMakeLists.txt
@@ -0,0 +1,14 @@
+add_definitions("-DACSDK_LOG_MODULE=${PROJECT_NAME}")
+
+file(GLOB SOURCES "*.cpp")
+add_library(${PROJECT_NAME} ${SOURCES})
+
+target_include_directories(${PROJECT_NAME}
+        PUBLIC "${acsdkAlexaPresentation_SOURCE_DIR}/include"
+        PRIVATE "${acsdkAlexaPresentation_SOURCE_DIR}/privateInclude"
+        "${ASDK_INCLUDE_DIRS}")
+
+target_link_libraries(${PROJECT_NAME} "${ASDK_LDFLAGS}" AVSCommon acsdkAlexaPresentationInterfaces)
+
+# install target
+asdk_install()
\ No newline at end of file
diff --git a/capabilities/AlexaPresentation/AlexaPresentation/test/AlexaPresentationTest.cpp b/capabilities/AlexaPresentation/AlexaPresentation/test/AlexaPresentationTest.cpp
new file mode 100644
index 0000000000..da4fb96880
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentation/test/AlexaPresentationTest.cpp
@@ -0,0 +1,236 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <condition_variable>
+#include <future>
+#include <memory>
+#include <mutex>
+#include <string>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <rapidjson/document.h>
+
+#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
+#include <AVSCommon/SDKInterfaces/MockContextManager.h>
+#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/SDKInterfaces/MockMessageSender.h>
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+
+#include <acsdk/AlexaPresentation/private/AlexaPresentation.h>
+
+namespace alexaClientSDK {
+namespace alexaPresentation {
+namespace test {
+
+using namespace alexaClientSDK;
+using namespace alexaClientSDK::avsCommon::avs;
+using namespace alexaClientSDK::avsCommon::sdkInterfaces;
+using namespace alexaClientSDK::avsCommon::utils::configuration;
+using namespace alexaClientSDK::avsCommon::utils::memory;
+using namespace alexaClientSDK::avsCommon::sdkInterfaces::test;
+using namespace avsCommon::avs::attachment::test;
+using namespace rapidjson;
+using namespace ::testing;
+
+/// Alias for JSON stream type used in @c ConfigurationNode initialization
+using JSONStream = std::vector<std::shared_ptr<std::istream>>;
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// The second namespace registered for this capability agent.
+static const std::string NAMESPACE{"Alexa.Presentation"};
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
+
+/// The name for Dismissed event.
+static const std::string PRESENTATION_DISMISSED_EVENT{"Dismissed"};
+
+/// The @c MessageId identifer.
+static const std::string MESSAGE_ID("messageId");
+
+/// Expected payload to be sent with Dismissed event
+static const std::string EXPECTED_PRESENTATION_DISMISSED_PAYLOAD = R"({"presentationToken":"TOKEN"})";
+
+/// JSON key for the event section of a message.
+static const std::string MESSAGE_EVENT_KEY = "event";
+
+/// JSON key for the namespace field of a message header.
+static const std::string MESSAGE_NAMESPACE_KEY = "namespace";
+
+/// JSON key for the name field of a message header.
+static const std::string MESSAGE_NAME_KEY = "name";
+
+/// JSON key for the header section of a message.
+static const std::string MESSAGE_HEADER_KEY = "header";
+
+/// JSON key for the payload section of an message.
+static const std::string MESSAGE_PAYLOAD_KEY = "payload";
+
+/// Presentation Token used by presentations
+static const aplCapabilityCommonInterfaces::PresentationToken PRESENTATION_TOKEN = "TOKEN";
+
+std::mutex m;
+std::condition_variable conditionVariable;
+
+/// Test harness for @c AlexaPresentationTest class.
+class AlexaPresentationTest : public ::testing::Test {
+public:
+    /// Set up the test harness for running a test.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Constructor.
+    AlexaPresentationTest() {
+    }
+
+protected:
+    /// A strict mock that allows the test to fetch context.
+    std::shared_ptr<StrictMock<test::MockContextManager>> m_mockContextManager;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<test::MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<test::MockDirectiveHandlerResult>> m_mockDirectiveHandlerResult;
+
+    /// The mock @c MessageSenderInterface.
+    std::shared_ptr<StrictMock<test::MockMessageSender>> m_mockMessageSender;
+
+    /// mutex for the conditional variables.
+    std::mutex m_mutex;
+
+    /// This is the condition variable to be used to control getting of a context in test cases.
+    std::condition_variable m_contextTrigger;
+
+    /// A pointer to an instance of the @c AlexaPresentationCapabilityAgentInterface
+    std::shared_ptr<alexaPresentationInterfaces::AlexaPresentationCapabilityAgentInterface> m_AlexaCA;
+
+    /// A pointer to an instance of the @c AlexaPresentation that will be instantiated per test.
+    std::shared_ptr<AlexaPresentation> m_AlexaPresentation;
+
+    /// The pointer into the @c Executor used by the tested object.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> m_executor;
+};
+
+void AlexaPresentationTest::SetUp() {
+    m_mockContextManager = std::make_shared<StrictMock<test::MockContextManager>>();
+    m_mockExceptionSender = std::make_shared<StrictMock<test::MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult = make_unique<StrictMock<test::MockDirectiveHandlerResult>>();
+
+    m_mockMessageSender = std::make_shared<StrictMock<test::MockMessageSender>>();
+
+    m_AlexaPresentation = AlexaPresentation::create(m_mockExceptionSender, m_mockMessageSender, m_mockContextManager);
+
+    m_AlexaCA = std::dynamic_pointer_cast<
+        alexaClientSDK::alexaPresentationInterfaces::AlexaPresentationCapabilityAgentInterface>(m_AlexaPresentation);
+
+    m_executor = std::make_shared<alexaClientSDK::avsCommon::utils::threading::Executor>();
+    m_AlexaPresentation->setExecutor(m_executor);
+}
+
+void AlexaPresentationTest::TearDown() {
+    if (m_AlexaPresentation) {
+        m_AlexaPresentation->shutdown();
+        m_AlexaPresentation.reset();
+    }
+}
+
+/**
+ * Verify the request sent to AVS is as expected.
+ */
+static void verifySendMessage(
+    std::shared_ptr<avsCommon::avs::MessageRequest> request,
+    const std::string expectedEventName,
+    const std::string expectedPayload,
+    const std::string expectedNameSpace) {
+    rapidjson::Document document;
+    document.Parse(request->getJsonContent());
+    auto event = document.FindMember(MESSAGE_EVENT_KEY);
+    EXPECT_NE(event, document.MemberEnd());
+
+    auto header = event->value.FindMember(MESSAGE_HEADER_KEY);
+    EXPECT_NE(header, event->value.MemberEnd());
+    auto payload = event->value.FindMember(MESSAGE_PAYLOAD_KEY);
+    EXPECT_NE(payload, event->value.MemberEnd());
+    EXPECT_EQ(header->value.FindMember(MESSAGE_NAMESPACE_KEY)->value.GetString(), expectedNameSpace);
+    EXPECT_EQ(header->value.FindMember(MESSAGE_NAME_KEY)->value.GetString(), expectedEventName);
+    EXPECT_NE(header->value.FindMember(MESSAGE_ID)->value.GetString(), "");
+
+    std::string messagePayload;
+    avsCommon::utils::json::jsonUtils::convertToValue(payload->value, &messagePayload);
+    EXPECT_EQ(messagePayload, expectedPayload);
+    EXPECT_EQ(request->attachmentReadersCount(), 0);
+
+    conditionVariable.notify_all();
+}
+
+/**
+ * Tests unknown Directive. Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaPresentationTest, testUnknownDirective) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(NAMESPACE, UNKNOWN_DIRECTIVE, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive = AVSDirective::create("", avsMessageHeader, "", attachmentManager, "");
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).Times(Exactly(1));
+
+    m_AlexaPresentation->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_AlexaPresentation->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Verify the Presentation Dismissed Event
+ */
+TEST_F(AlexaPresentationTest, testPresentationDismissed) {
+    std::unique_lock<std::mutex> exitLock(m_mutex);
+    auto verifyEvent = [](std::shared_ptr<avsCommon::avs::MessageRequest> request) {
+        verifySendMessage(request, PRESENTATION_DISMISSED_EVENT, EXPECTED_PRESENTATION_DISMISSED_PAYLOAD, NAMESPACE);
+    };
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1)).WillOnce(Invoke(verifyEvent));
+    /// Expect a call to getContext as part of sending DISMISSED event.
+    EXPECT_CALL(*m_mockContextManager, getContext(_, _, _))
+        .WillOnce(Invoke([this](
+                             std::shared_ptr<ContextRequesterInterface> contextRequester,
+                             const std::string&,
+                             const std::chrono::milliseconds&) {
+            m_contextTrigger.notify_one();
+            return 0;
+        }));
+    m_contextTrigger.wait_for(exitLock, TIMEOUT);
+    /// wait for getContext
+    m_contextTrigger.wait_for(exitLock, TIMEOUT);
+    m_AlexaCA->onPresentationDismissed(PRESENTATION_TOKEN);
+    m_executor->waitForSubmittedTasks();
+    m_AlexaPresentation->onContextAvailable("");
+
+    std::unique_lock<std::mutex> lk(m);
+    conditionVariable.wait_for(lk, TIMEOUT);
+}
+
+}  // namespace test
+}  // namespace alexaPresentation
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaPresentation/AlexaPresentation/test/CMakeLists.txt b/capabilities/AlexaPresentation/AlexaPresentation/test/CMakeLists.txt
new file mode 100644
index 0000000000..2ca043ea3c
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentation/test/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+  
+set(INCLUDE_PATH
+    "${AVSCommon_INCLUDE_DIRS}"
+    "${AVSCommon_SOURCE_DIR}/AVS/test"
+    "${AVSCommon_SOURCE_DIR}/Utils/test"
+    "${AVSCommon_SOURCE_DIR}/SDKInterfaces/test"
+    "${acsdkAlexaPresentation_INCLUDE_DIRS}"
+    "${acsdkAlexaPresentation_SOURCE_DIR}/privateInclude"
+    "${ASDK_INCLUDE_DIRS}")
+
+set(LIBS
+        "AVSCommon"
+        "AVSCommonTestLib"
+        "SDKInterfacesTests"
+        "AttachmentCommonTestLib"
+        "acsdkAlexaPresentation"
+        "acsdkAlexaPresentationInterfaces"
+)
+discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
diff --git a/capabilities/AlexaPresentation/AlexaPresentationInterfaces/CMakeLists.txt b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..0608a873c6
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaPresentationInterfaces LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_library(acsdkAlexaPresentationInterfaces INTERFACE)
+
+target_include_directories(acsdkAlexaPresentationInterfaces INTERFACE include)
+
+target_link_libraries(acsdkAlexaPresentationInterfaces INTERFACE acsdkAPLCapabilityCommonInterfaces)
+
+add_subdirectory("test")
+
+# install interface
+asdk_install_interface()
\ No newline at end of file
diff --git a/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdk/AlexaPresentationInterfaces/AlexaPresentationCapabilityAgentInterface.h b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdk/AlexaPresentationInterfaces/AlexaPresentationCapabilityAgentInterface.h
new file mode 100644
index 0000000000..be3cbbdb3e
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdk/AlexaPresentationInterfaces/AlexaPresentationCapabilityAgentInterface.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_ALEXAPRESENTATIONINTERFACES_ALEXAPRESENTATIONCAPABILITYAGENTINTERFACE_H_
+#define ACSDK_ALEXAPRESENTATIONINTERFACES_ALEXAPRESENTATIONCAPABILITYAGENTINTERFACE_H_
+
+#include <chrono>
+#include <memory>
+#include <string>
+
+#include <acsdk/APLCapabilityCommonInterfaces/PresentationToken.h>
+
+namespace alexaClientSDK {
+namespace alexaPresentationInterfaces {
+/**
+ * Defines a Contract for clients to communicate with the AlexaPresentation Capability agent.
+ * Clients will use this interface to send events to AVS as defined in
+ * https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/presentation.html#events
+ */
+class AlexaPresentationCapabilityAgentInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~AlexaPresentationCapabilityAgentInterface() = default;
+
+    /**
+     * This function notifies the Capability Agent that the Presentation with the given token has been dismissed
+     *
+     * @param token The token for the presentation which was dismissed
+     */
+    virtual void onPresentationDismissed(const aplCapabilityCommonInterfaces::PresentationToken& token) = 0;
+};
+}  // namespace alexaPresentationInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAPRESENTATIONINTERFACES_ALEXAPRESENTATIONCAPABILITYAGENTINTERFACE_H_
\ No newline at end of file
diff --git a/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/APLDocumentObserverInterface.h b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/APLDocumentObserverInterface.h
new file mode 100644
index 0000000000..d2bf5004e4
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/APLDocumentObserverInterface.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAPRESENTATIONINTERFACES_APLDOCUMENTOBSERVERINTERFACE_H_
+#define ACSDKALEXAPRESENTATIONINTERFACES_APLDOCUMENTOBSERVERINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include "acsdkAlexaPresentationInterfaces/APLDocumentSessionInterface.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPresentationInterfaces {
+
+/**
+ * A @c APLDocumentObserverInterface allows for observing the lifecycle of
+ * rendered APL documents.
+ */
+class APLDocumentObserverInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~APLDocumentObserverInterface() = default;
+
+    /**
+     * Callback when document session is available.  Session may be stored to
+     * further influence the document being rendered.
+     * @param token presentationToken of document session available
+     * @param session DocumentSession object
+     */
+    virtual void onAPLDocumentSessionAvailable(
+        const std::string& token,
+        std::unique_ptr<APLDocumentSessionInterface>&& session) = 0;
+
+    /**
+     * Callback when document has finished displaying
+     * @param token presentationToken of document
+     */
+    virtual void onDocumentFinished(const std::string& token) = 0;
+
+    /**
+     * Callback when document rendering is complete
+     * @param token presentationToken of document
+     * @param result true if rendering was successful, false otherwise
+     * @param error error string if available
+     */
+    virtual void onRenderDocumentComplete(const std::string& token, bool result, const std::string& error) {
+        // no-op for forward compatibility
+    }
+
+    virtual void onRenderDocumentComplete(
+        const std::string& token,
+        bool result,
+        const std::string& error,
+        const std::chrono::steady_clock::time_point& timestamp) {
+        onRenderDocumentComplete(token, result, error);
+    }
+    /**
+     * Callback when execute command is complete
+     * @param token presentationToken of document
+     * @param result true if successful, false otherwise
+     * @param error error string if available
+     */
+    virtual void onCommandExecutionComplete(const std::string& token, bool result, const std::string& error) = 0;
+
+    /**
+     * Callback when data source update is complete
+     * @param token presentationToken of document
+     * @param result true if successful, false otherwise
+     * @param error error string if available
+     */
+    virtual void onDataSourceUpdateComplete(const std::string& token, bool result, const std::string& error) = 0;
+
+    /**
+     * Callback for send event request
+     * @param token presentationToken of document
+     * @param arguments Arguments array of SendEvent command
+     * @param components Object containing the component of the SendEvent command
+     * @param source Object detailing component which generated the command
+     */
+    virtual void onSendEvent(
+        const std::string& token,
+        const std::string& arguments,
+        const std::string& components,
+        const std::string& source) = 0;
+
+    /**
+     * Callback to provide information about what is currently displayed on
+     * screen.  Should be provided to @c ContextManagerInterface in response to
+     * provideState calls.
+     * @param token presentationToken of document
+     * @param requestToken token correlating context to provideState request
+     * @param visualContext json payload of document visual context
+     */
+    virtual void onVisualContextAvailable(
+        const std::string& token,
+        const unsigned int requestToken,
+        const std::string& visualContext) = 0;
+
+    /**
+     * Callback for data source fetch request
+     * @param token presentationToken of document
+     * @param dataSourceType apl defined list data source type
+     * @param payload json payload of data source fetch request
+     */
+    virtual void onDataSourceFetch(
+        const std::string& token,
+        const std::string& dataSourceType,
+        const std::string& payload) = 0;
+
+    /**
+     * Callback when runtime error occurs in document
+     * @param token presentationToken of document
+     * @param payload json payload of runtime error
+     */
+    virtual void onRuntimeError(const std::string& token, const std::string& payload) = 0;
+};
+
+}  // namespace acsdkAlexaPresentationInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAPRESENTATIONINTERFACES_APLDOCUMENTOBSERVERINTERFACE_H_
\ No newline at end of file
diff --git a/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/APLDocumentSessionInterface.h b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/APLDocumentSessionInterface.h
new file mode 100644
index 0000000000..2733d086ba
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/APLDocumentSessionInterface.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAPRESENTATIONINTERFACES_APLDOCUMENTSESSIONINTERFACE_H_
+#define ACSDKALEXAPRESENTATIONINTERFACES_APLDOCUMENTSESSIONINTERFACE_H_
+
+#include <acsdkAlexaPresentationInterfaces/PresentationOptions.h>
+
+#include <chrono>
+#include <string>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPresentationInterfaces {
+
+/**
+ * A @c APLDocumentSessionInterface allows for controlling a previously rendered
+ * APL document. All methods except @c getToken() result in asynchronous
+ * operations so @c APLDocumentObserverInterface implementations should be used
+ * for monitoring the success of method calls.
+ */
+class APLDocumentSessionInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~APLDocumentSessionInterface() = default;
+
+    /**
+     * Dismiss APL document.  No other functions can be called after this
+     */
+    virtual void clearDocument() = 0;
+
+    /**
+     * Execute commands referenced in APL document
+     * @param commands JSON string containing APL command to execute
+     */
+    virtual void executeCommands(const std::string& commands) = 0;
+
+    /**
+     * Update the data source payload for a given APL document
+     * @param sourceType APL spec source type for data update
+     * @param payload JSON string containing update payload
+     */
+    virtual void dataSourceUpdate(const std::string& sourceType, const std::string& payload) = 0;
+
+    /**
+     * Interrupt any active command sequence currently executing on the document
+     */
+    virtual void interruptCommandSequence() = 0;
+
+    /**
+     * Provide visual context to onVisualContextAvailable observer callback
+     * @param stateRequestToken provided by StateProviderInterface call
+     */
+    virtual void provideDocumentContext(const unsigned int stateRequestToken) = 0;
+
+    /**
+     * Request active document session to move to the foreground if not already
+     * there.
+     */
+    virtual void requestForeground() = 0;
+
+    /**
+     * Update the timeout policy for document session.  Will reset any active
+     * timeout timer.
+     * @param timeout updated timeout duration
+     */
+    virtual void updateTimeout(std::chrono::milliseconds timeout) = 0;
+
+    /**
+     * Get presentation token of this document session.  Can be used for sharing
+     * @c APLDocumentObserverInterface instances across multiple documents.
+     */
+    virtual std::string getToken() const = 0;
+
+    /**
+     * Update the lifespan for document session.
+     * @param lifespan updated lifespan
+     */
+    virtual void updateLifespan(PresentationLifespan lifespan){
+        // no-op for backwards compatibility
+    };
+};
+
+}  // namespace acsdkAlexaPresentationInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAPRESENTATIONINTERFACES_APLDOCUMENTSESSIONINTERFACE_H_
diff --git a/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/APLRuntimeInterface.h b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/APLRuntimeInterface.h
new file mode 100644
index 0000000000..ad233d4aba
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/APLRuntimeInterface.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAPRESENTATIONINTERFACES_APLRUNTIMEINTERFACE_H_
+#define ACSDKALEXAPRESENTATIONINTERFACES_APLRUNTIMEINTERFACE_H_
+
+#include <chrono>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "acsdkAlexaPresentationInterfaces/APLDocumentObserverInterface.h"
+#include "acsdkAlexaPresentationInterfaces/PresentationOptions.h"
+#include "acsdkAlexaPresentationInterfaces/PresentationSession.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPresentationInterfaces {
+
+/**
+ * A @c APLRuntimeInterface allows for rendering and controlling APL content.
+ * A @c APLRuntimeInterface implementation may handle rendering multiple
+ * documents concurrently or sequentially with each document being uniquely
+ * identified by a presentation token in the @c presentationOptions struct.
+ *
+ * Document lifecycle events can be tracked by a @c APLDocumentObserverInterface
+ * observer provided in the @c renderDocument API call.  Only events for the
+ * document the caller provided will be driven to the observer.  To see
+ * descriptions of these document events, please refer to the documentation of
+ * each method on the observer.
+ *
+ * The @c onAPLDocumentSessionAvailable() method in the observer can be used to
+ * capture a @c APLDocumentSessionInterface.  This session object can be used to
+ * control the document (i.e. @c executeCommands(), @c clearDocument() ). Status
+ * responses for session control calls are provided in @c
+ * APLDocumentObserverInterface methods.
+ *
+ * @c note An @c APLRuntimeInterface implementation must be able to support the
+ * various capabilities listed at:
+ * https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/presentation-apl.html.
+ */
+class APLRuntimeInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~APLRuntimeInterface() = default;
+
+    /**
+     * Render an APL document with associated metdata.  Payloads must comply with
+     * the latest APL spec supported on the platform the caller is using.  See @c
+     * getMaxAPLVersion() method for querying support on the platform.
+     * @param document  JSON string containing APL document
+     * @param data  JSON string containing data payload associated with APL
+     * document
+     * @param presentationSession Configuration for presentation session
+     * displaying document
+     * @param presentationOptions Configuration for presentation displaying
+     * document
+     * @param observer @c APLDocumentObserverInterface observer for monitoring
+     * document lifecycle events
+     */
+    virtual void renderDocument(
+        const std::string& document,
+        const std::string& data,
+        const PresentationSession& presentationSession,
+        const PresentationOptions& presentationOptions,
+        std::shared_ptr<APLDocumentObserverInterface> observer) = 0;
+
+    /**
+     * Get the maximum APL Version currently supported on this device. See the
+     * following for descriptions of the various APL Version Specifications:
+     * https://developer.amazon.com/en-US/docs/alexa/alexa-presentation-language/apl-latest-version.html
+     * @return string representation of APL Specification Version
+     */
+    virtual std::string getMaxAPLVersion() const = 0;
+};
+
+}  // namespace acsdkAlexaPresentationInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAPRESENTATIONINTERFACES_APLRUNTIMEINTERFACE_H_
\ No newline at end of file
diff --git a/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/PresentationOptions.h b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/PresentationOptions.h
new file mode 100644
index 0000000000..393600dd36
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/PresentationOptions.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAPRESENTATIONINTERFACES_PRESENTATIONOPTIONS_H_
+#define ACSDKALEXAPRESENTATIONINTERFACES_PRESENTATIONOPTIONS_H_
+
+#include <chrono>
+#include <string>
+#include <vector>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPresentationInterfaces {
+
+enum class VisualFocusBehavior {
+    /// The content can be backgrounded, if another presentation takes the window
+    MAY_BACKGROUND,
+
+    /// The content cannot be backgrounded, if another presentation takes focus
+    /// this presentation must be dismissed
+    MUST_DISMISS,
+
+    /// The content is on top at all times, other presentations cannot take focus
+    ALWAYS_FOREGROUND
+};
+
+enum class PresentationLifespan {
+    /// A short lived presentation which cannot be backgrounded, upon timeout will be
+    /// dismissed and the next SHORT, LONG or PERMANENT presentation will be resumed
+    TRANSIENT,
+
+    /// A short lived presentation, not generally backgrounded but can be if a transient
+    /// presentation is displayed. Upon timeout the next LONG or PERMANENT presentation
+    /// will be resumed
+    SHORT,
+
+    /// A long lived presentation, may not have a timeout attached to it - will be
+    /// backgrounded if another presentation is displayed
+    LONG,
+
+    /// Special use case for applications that are always running and are not expected
+    /// to terminate, for example home screens. Permanent presentations can be
+    /// backgrounded but cannot be dismissed as a result of back navigation.
+    PERMANENT
+};
+
+struct PresentationOptions {
+    /// Window ID corresponding to a window reported in Alexa.Display
+    std::string windowId;
+
+    /// The timeout for the document
+    std::chrono::milliseconds timeout;
+
+    /// @deprecated
+    /// Specifies how this presentation should behave if another presentation
+    /// attempts to take foreground focus
+    VisualFocusBehavior visualFocusBehavior;
+
+    /// The AVS namespace associated with this presentation
+    std::string interface;
+
+    /// The presentation token that will be reported in Alexa.Display.WindowState
+    std::string token;
+
+    /// Specifies the lifespan type for this presentation
+    PresentationLifespan lifespan;
+
+    /// Specifies the timestamp when the document was received
+    std::chrono::steady_clock::time_point documentReceivedTimestamp;
+};
+
+}  // namespace acsdkAlexaPresentationInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAPRESENTATIONINTERFACES_PRESENTATIONOPTIONS_H_
diff --git a/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/PresentationSession.h b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/PresentationSession.h
new file mode 100644
index 0000000000..ccb7f3e202
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/include/acsdkAlexaPresentationInterfaces/PresentationSession.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXAPRESENTATIONINTERFACES_PRESENTATIONSESSION_H_
+#define ACSDKALEXAPRESENTATIONINTERFACES_PRESENTATIONSESSION_H_
+
+#include <string>
+#include <vector>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaPresentationInterfaces {
+
+struct GrantedExtension {
+    // URI of extension to allow in document.  If the APL document requests an
+    // extension that is not part of grantedExtensions list, extension will be
+    // denied.
+    std::string uri;
+};
+
+struct AutoInitializedExtension {
+    // URI of extension to auto initialize
+    std::string uri;
+
+    // Extension settings for initializing the extension on the device.
+    std::string settings;
+};
+
+struct PresentationSession {
+    /// ID of skill that owns the presentation session.
+    std::string skillId;
+
+    /// Unique string identifying the instance of a skill.
+    std::string id;
+
+    /// List of extensions that are granted for use by this APL document
+    std::vector<GrantedExtension> grantedExtensions;
+
+    /// List of extensions that are initialized in the APL runtime for this
+    /// document.
+    std::vector<AutoInitializedExtension> autoInitializedExtensions;
+};
+
+}  // namespace acsdkAlexaPresentationInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXAPRESENTATIONINTERFACES_PRESENTATIONSESSION_H_
\ No newline at end of file
diff --git a/capabilities/AlexaPresentation/AlexaPresentationInterfaces/test/CMakeLists.txt b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/test/CMakeLists.txt
new file mode 100644
index 0000000000..0dd22e321c
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/test/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_library(acsdkAlexaPresentationInterfacesTestUtils INTERFACE)
+
+target_include_directories(acsdkAlexaPresentationInterfacesTestUtils INTERFACE include)
+
+target_link_libraries(acsdkAlexaPresentationInterfacesTestUtils INTERFACE acsdkAlexaPresentationInterfaces acsdkAPLCapabilityCommonInterfaces)
\ No newline at end of file
diff --git a/capabilities/AlexaPresentation/AlexaPresentationInterfaces/test/include/acsdk/AlexaPresentationInterfaces/MockAlexaPresentationCapabilityAgent.h b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/test/include/acsdk/AlexaPresentationInterfaces/MockAlexaPresentationCapabilityAgent.h
new file mode 100644
index 0000000000..2f9c017e2b
--- /dev/null
+++ b/capabilities/AlexaPresentation/AlexaPresentationInterfaces/test/include/acsdk/AlexaPresentationInterfaces/MockAlexaPresentationCapabilityAgent.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_ALEXAPRESENTATIONINTERFACES_MOCKALEXAPRESENTATIONCAPABILITYAGENT_H_
+#define ACSDK_ALEXAPRESENTATIONINTERFACES_MOCKALEXAPRESENTATIONCAPABILITYAGENT_H_
+
+#include <gmock/gmock.h>
+
+#include "acsdk/AlexaPresentationInterfaces/AlexaPresentationCapabilityAgentInterface.h"
+
+namespace alexaClientSDK {
+namespace alexaPresentationInterfaces {
+namespace test {
+
+/**
+ * Mock class that implements AlexaPresentationCAInterface
+ */
+class MockAlexaPresentationCapabilityAgent
+        : public alexaPresentationInterfaces::AlexaPresentationCapabilityAgentInterface {
+public:
+    MOCK_METHOD1(onPresentationDismissed, void(const aplCapabilityCommon::PresentationToken& token));
+};
+
+}  // namespace test
+}  // namespace alexaPresentationInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAPRESENTATIONINTERFACES_MOCKALEXAPRESENTATIONCAPABILITYAGENT_H_
\ No newline at end of file
diff --git a/capabilities/AlexaPresentation/CMakeLists.txt b/capabilities/AlexaPresentation/CMakeLists.txt
new file mode 100644
index 0000000000..d5d7d803a0
--- /dev/null
+++ b/capabilities/AlexaPresentation/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+add_subdirectory("AlexaPresentationInterfaces")
+add_subdirectory("AlexaPresentation")
\ No newline at end of file
diff --git a/capabilities/AlexaPresentationAPL/.clang-format b/capabilities/AlexaPresentationAPL/.clang-format
new file mode 100644
index 0000000000..3d1ec24482
--- /dev/null
+++ b/capabilities/AlexaPresentationAPL/.clang-format
@@ -0,0 +1,102 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
+
diff --git a/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/CMakeLists.txt b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/CMakeLists.txt
new file mode 100644
index 0000000000..bc170d19b0
--- /dev/null
+++ b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaPresentationAPL LANGUAGES CXX)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/include/acsdk/AlexaPresentationAPL/AlexaPresentationAPLFactory.h b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/include/acsdk/AlexaPresentationAPL/AlexaPresentationAPLFactory.h
new file mode 100644
index 0000000000..e9d408c2eb
--- /dev/null
+++ b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/include/acsdk/AlexaPresentationAPL/AlexaPresentationAPLFactory.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAPRESENTATIONAPL_ALEXAPRESENTATIONAPLFACTORY_H_
+#define ACSDK_ALEXAPRESENTATIONAPL_ALEXAPRESENTATIONAPLFACTORY_H_
+
+#include <memory>
+#include <string>
+
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+#include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/APLCapabilityAgentNotifierInterface.h>
+#include <acsdk/APLCapabilityCommonInterfaces/VisualStateProviderInterface.h>
+
+namespace alexaClientSDK {
+namespace aplCapabilityAgent {
+/**
+ * The AlexaPresentationAPLFactory is responsible to create the objects that interacts with @c AlexaPresentationAPL CA
+ */
+class AlexaPresentationAPLFactory {
+private:
+    /**
+     * This object contains the interfaces to interact with the AlexaPresentationAPL Capability Agent.
+     */
+    struct AlexaPresentationAPLAgentData {
+        /// An interface used to communicate with AlexaPresentationAPL capability agent.
+        std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentInterface> aplCapabilityAgent;
+        /// An Interface used to register observers for the AlexaPresentationAPL capability agent.
+        std::shared_ptr<aplCapabilityCommonInterfaces::APLCapabilityAgentNotifierInterface> capabilityAgentNotifier;
+        /// An Interface used to receive AlexaPresentationAPL directives.
+        std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent> capabilityAgent;
+        /// An interface used to provide accesss to the version and configurations of capability agent.
+        std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface> capabilityConfiguration;
+        /// Instance of @c RequiresShutdown used for cleaning up the capability agent during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+public:
+    /**
+     * Destructor.
+     */
+    ~AlexaPresentationAPLFactory() = default;
+
+    /**
+     * Create an instance of @c AlexaPresentationAPL.
+     *
+     * @param exceptionSender The @c ExceptionEncounteredSenderInterface that sends Exception
+     * messages to AVS.
+     * @param metricRecorder The object @c MetricRecorderInterface that records metrics.
+     * @param messageSender The @c MessageSenderInterface that sends events to AVS.
+     * @param contextManager The @c ContextManagerInterface used to generate system context for events.
+     * @param APLVersion The APLVersion supported by the runtime component.
+     * @param visualStateProvider The @c VisualStateProviderInterface used to request visual context.
+     */
+    static avsCommon::utils::Optional<AlexaPresentationAPLAgentData> create(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::string APLVersion,
+        std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::VisualStateProviderInterface>
+            visualStateProvider = nullptr);
+};
+
+}  // namespace aplCapabilityAgent
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAPRESENTATIONAPL_ALEXAPRESENTATIONAPLFACTORY_H_
diff --git a/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/privateInclude/acsdk/AlexaPresentationAPL/private/AlexaPresentationAPL.h b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/privateInclude/acsdk/AlexaPresentationAPL/private/AlexaPresentationAPL.h
new file mode 100644
index 0000000000..2446bdebc3
--- /dev/null
+++ b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/privateInclude/acsdk/AlexaPresentationAPL/private/AlexaPresentationAPL.h
@@ -0,0 +1,128 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAPRESENTATIONAPL_PRIVATE_ALEXAPRESENTATIONAPL_H_
+#define ACSDK_ALEXAPRESENTATIONAPL_PRIVATE_ALEXAPRESENTATIONAPL_H_
+
+#include <memory>
+#include <string>
+
+#include <acsdk/APLCapabilityCommonInterfaces/APLVideoConfiguration.h>
+#include <acsdk/APLCapabilityCommon/BaseAPLCapabilityAgent.h>
+
+#include "acsdk/AlexaPresentationAPL/private/AlexaPresentationAPLVideoConfigParser.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityAgent {
+/**
+ * This class implements a @c CapabilityAgent that handles the @c AlexaPresentationAPL API.  The
+ * @c AlexaPresentationAPL is responsible for handling the directives with Alexa.Presentation.APL namespace.
+ */
+class AlexaPresentationAPL : public aplCapabilityCommon::BaseAPLCapabilityAgent {
+public:
+    /**
+     * Create an instance of @c AlexaPresentationAPL.
+     *
+     * @param exceptionSender The @c ExceptionEncounteredSenderInterface that sends exception messages to AVS.
+     * @param metricRecorder The object @c MetricRecorderInterface that records metrics.
+     * @param messageSender The @c MessageSenderInterface that sends events to AVS.
+     * @param contextManager The @c ContextManagerInterface used to generate system context for events.
+     * @param APLVersion The APLVersion supported by the runtime component.
+     * @param visualStateProvider The @c VisualStateProviderInterface used to request visual context.
+     * @return @c nullptr if the inputs are not defined, else a new instance of @c AlexaPresentationAPL.
+     */
+    static std::shared_ptr<AlexaPresentationAPL> create(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::string APLVersion,
+        std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::VisualStateProviderInterface>
+            visualStateProvider = nullptr);
+
+    /**
+     * Destructor.
+     */
+    virtual ~AlexaPresentationAPL() = default;
+
+    /// @name BaseAPLCapabilityAgent template functions
+    /// @{
+    alexaClientSDK::avsCommon::avs::DirectiveHandlerConfiguration getAPLDirectiveConfiguration() const override;
+    std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>>
+    getAPLCapabilityConfigurations(const std::string& APLMaxVersion) override;
+    aplCapabilityCommon::BaseAPLCapabilityAgent::DirectiveType getDirectiveType(
+        std::shared_ptr<DirectiveInfo> info) override;
+    const std::string& getConfigurationRootKey() override;
+    const std::string& getMetricDataPointName(aplCapabilityCommon::BaseAPLCapabilityAgent::MetricEvent event) override;
+    const std::string& getMetricActivityName(
+        aplCapabilityCommon::BaseAPLCapabilityAgent::MetricActivity activity) override;
+    aplCapabilityCommon::BaseAPLCapabilityAgent::PresentationSessionFieldNames getPresentationSessionFieldNames()
+        override;
+    bool initialize() override;
+    const bool shouldPackPresentationSessionToAvsEvents() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param exceptionSender The object to send AVS Exception messages.
+     * @param metricRecorder The object to use for recording metrics.
+     * @param messageSender The object to send message to AVS.
+     * @param contextManager The object to fetch the context of the system.
+     * @param visualStateProvider The VisualStateProviderInterface object used to request visual context.
+     */
+    AlexaPresentationAPL(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::string APLVersion,
+        std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::VisualStateProviderInterface>
+            visualStateProvider = nullptr);
+
+    /// Map for Metric event names
+    static std::map<MetricEvent, std::string> METRICS_DATA_POINT_NAMES;
+    /// Map for Metric Activity names
+    static std::map<MetricActivity, std::string> METRICS_ACTIVITY_NAMES;
+
+    /**
+     * Creates the Alexa.Presentation.APL interface configuration.
+     *
+     * @return The Alexa.Presentation.APL interface configuration.
+     */
+    std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>
+    getAlexaPresentationAPLCapabilityConfiguration(const std::string& APLMaxVersion);
+
+    /**
+     * Creates the Alexa.Presentation.Video interface configuration.
+     *
+     * @return The Alexa.Presentation.Video interface configuration.
+     */
+    std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>
+    getAlexaPresentationVideoCapabilityConfiguration();
+
+    /// Set of capability configurations that will get published using the Capabilities API
+    std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>>
+        m_capabilityConfigurations;
+
+    /// Video settings to be reported for Alexa.Presentation.APL.Video interface
+    alexaClientSDK::aplCapabilityCommonInterfaces::VideoSettings m_videoSettings;
+};
+
+}  // namespace aplCapabilityAgent
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAPRESENTATIONAPL_PRIVATE_ALEXAPRESENTATIONAPL_H_
diff --git a/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/privateInclude/acsdk/AlexaPresentationAPL/private/AlexaPresentationAPLVideoConfigParser.h b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/privateInclude/acsdk/AlexaPresentationAPL/private/AlexaPresentationAPLVideoConfigParser.h
new file mode 100644
index 0000000000..7e4641718a
--- /dev/null
+++ b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/privateInclude/acsdk/AlexaPresentationAPL/private/AlexaPresentationAPLVideoConfigParser.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAPRESENTATIONAPL_PRIVATE_ALEXAPRESENTATIONAPLVIDEOCONFIGPARSER_H_
+#define ACSDK_ALEXAPRESENTATIONAPL_PRIVATE_ALEXAPRESENTATIONAPLVIDEOCONFIGPARSER_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+
+#include <acsdk/APLCapabilityCommonInterfaces/APLVideoConfiguration.h>
+
+namespace alexaClientSDK {
+namespace aplCapabilityAgent {
+
+/**
+ * Class to serialize and parse @c VideoSettings corresponding to Alexa.Presentation.APL.Video interface
+ * https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/presentation-apl-video.html
+ */
+class AlexaPresentationAPLVideoConfigParser {
+public:
+    /**
+     * Serialize APL video settings into reportable json format.
+     * @param videoSettings  @c VideoSettings to be serialized
+     * @param serializedJson [ out ] Serialized json payload
+     *
+     * @return True if serialization successful, false otherwise.
+     */
+    static bool serializeVideoSettings(
+        const aplCapabilityCommonInterfaces::VideoSettings& videoSettings,
+        std::string& serializedJson);
+
+    /**
+     * Parse video settings from configuration.
+     * @param config  @c ConfigurationNode for APL video settings
+     * @param videoSettings [ out ] Parsed object for @c VideoSettings.
+     *
+     * @return True if parsing successful, false otherwise.
+     */
+    static bool parseVideoSettings(
+        const avsCommon::utils::configuration::ConfigurationNode& config,
+        aplCapabilityCommonInterfaces::VideoSettings& videoSettings);
+};
+
+}  // namespace aplCapabilityAgent
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAPRESENTATIONAPL_PRIVATE_ALEXAPRESENTATIONAPLVIDEOCONFIGPARSER_H_
\ No newline at end of file
diff --git a/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/src/AlexaPresentationAPL.cpp b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/src/AlexaPresentationAPL.cpp
new file mode 100644
index 0000000000..1ed2ad07bc
--- /dev/null
+++ b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/src/AlexaPresentationAPL.cpp
@@ -0,0 +1,311 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <rapidjson/document.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "acsdk/AlexaPresentationAPL/private/AlexaPresentationAPL.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityAgent {
+
+using namespace alexaClientSDK;
+using namespace alexaClientSDK::aplCapabilityCommonInterfaces;
+using namespace alexaClientSDK::avsCommon::utils::timing;
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::configuration;
+
+/// String to identify log entries originating from this file.
+#define TAG "AlexaPresentationAPL"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// AlexaPresentationAPL interface type
+static const char* ALEXAPRESENTATIONAPL_CAPABILITY_INTERFACE_TYPE = "AlexaInterface";
+
+/// AlexaPresentationAPL interface name
+static const char* ALEXAPRESENTATIONAPL_CAPABILITY_INTERFACE_NAME = "Alexa.Presentation.APL";
+
+/// AlexaPresentationAPL interface version for Alexa.Presentation.APL
+static const char* ALEXAPRESENTATIONAPL_CAPABILITY_INTERFACE_VERSION = "1.4";
+
+/// Alexa.Presentation.APL.Video interface name
+static const char* ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_INTERFACE_NAME = "Alexa.Presentation.APL.Video";
+
+/// Alexa.Presentation.APL.Video interface version
+static const char* ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_INTERFACE_VERSION = "1.0";
+
+/// Namespace three supported by Alexa presentation APL capability agent.
+static const char* ALEXA_PRESENTATION_APL_NAMESPACE = "Alexa.Presentation.APL";
+
+/// The name for RenderDocument directive.
+static const char* RENDER_DOCUMENT = "RenderDocument";
+
+/// The name for ExecuteCommand directive.
+static const char* EXECUTE_COMMAND = "ExecuteCommands";
+
+/// The name for SendIndexListData directive.
+static const char* SEND_INDEX_LIST_DATA = "SendIndexListData";
+
+/// The name for UpdateIndexListData directive.
+static const char* UPDATE_INDEX_LIST_DATA = "UpdateIndexListData";
+
+/// The name for SendTokenListData directive.
+static const char* SEND_TOKEN_LIST_DATA = "SendTokenListData";
+
+/// The RenderDocument directive signature.
+static const NamespaceAndName DOCUMENT{ALEXA_PRESENTATION_APL_NAMESPACE, RENDER_DOCUMENT};
+
+/// The ExecuteCommand directive signature.
+static const NamespaceAndName COMMAND{ALEXA_PRESENTATION_APL_NAMESPACE, EXECUTE_COMMAND};
+
+/// The SendIndexListData directive signature.
+static const NamespaceAndName INDEX_LIST_DATA{ALEXA_PRESENTATION_APL_NAMESPACE, SEND_INDEX_LIST_DATA};
+
+/// The UpdateIndexListData directive signature.
+static const NamespaceAndName INDEX_LIST_UPDATE{ALEXA_PRESENTATION_APL_NAMESPACE, UPDATE_INDEX_LIST_DATA};
+
+/// The SendTokenListData directive signature.
+static const NamespaceAndName TOKEN_LIST_DATA{ALEXA_PRESENTATION_APL_NAMESPACE, SEND_TOKEN_LIST_DATA};
+
+/// Name of the runtime configuration.
+static const char* RUNTIME_CONFIG = "runtime";
+
+/// Identifier for the runtime (APL) version of the configuration.
+static const char* APL_MAX_VERSION = "maxVersion";
+
+/// Identifier for the skilld in presentationSession
+static const char* SKILL_ID = "skillId";
+
+/// Identifier for the id in presentationSession
+static const char* PRESENTATION_SESSION_ID = "id";
+
+/// The key in our config file to find the root of APL Presentation configuration.
+static std::string ALEXAPRESENTATIONAPL_CONFIGURATION_ROOT_KEY = "AlexaPresentationAPLCapabilityAgent";
+
+std::map<aplCapabilityCommon::BaseAPLCapabilityAgent::MetricEvent, std::string>
+    AlexaPresentationAPL::METRICS_DATA_POINT_NAMES = {
+        {aplCapabilityCommon::BaseAPLCapabilityAgent::MetricEvent::RENDER_DOCUMENT,
+         "AlexaPresentationAPL.RenderDocument"}};
+
+std::map<aplCapabilityCommon::BaseAPLCapabilityAgent::MetricActivity, std::string>
+    AlexaPresentationAPL::METRICS_ACTIVITY_NAMES = {
+        {aplCapabilityCommon::BaseAPLCapabilityAgent::MetricActivity::ACTIVITY_RENDER_DOCUMENT,
+         "AlexaPresentationAPL.renderDocument"},
+        {aplCapabilityCommon::BaseAPLCapabilityAgent::MetricActivity::ACTIVITY_RENDER_DOCUMENT_FAIL,
+         "AlexaPresentationAPL.renderDocument.fail"}};
+
+std::shared_ptr<AlexaPresentationAPL> AlexaPresentationAPL::create(
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    std::string APLVersion,
+    std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::VisualStateProviderInterface> visualStateProvider) {
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    if (!messageSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullMessageSender"));
+        return nullptr;
+    }
+
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManagerInterface"));
+        return nullptr;
+    }
+
+    std::shared_ptr<AlexaPresentationAPL> alexaPresentationAPL(new AlexaPresentationAPL(
+        exceptionSender, metricRecorder, messageSender, contextManager, APLVersion, visualStateProvider));
+
+    if (!alexaPresentationAPL->initialize()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "Initialization error."));
+        return nullptr;
+    }
+
+    return alexaPresentationAPL;
+}
+
+AlexaPresentationAPL::AlexaPresentationAPL(
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+    std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    std::string APLVersion,
+    std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::VisualStateProviderInterface> visualStateProvider) :
+        aplCapabilityCommon::BaseAPLCapabilityAgent(
+            ALEXA_PRESENTATION_APL_NAMESPACE,
+            exceptionSender,
+            metricRecorder,
+            messageSender,
+            contextManager,
+            APLVersion,
+            visualStateProvider) {
+    m_videoSettings.codecs = {VideoSettings::Codec::H_264_41, VideoSettings::Codec::H_264_42};
+}
+
+std::shared_ptr<CapabilityConfiguration> AlexaPresentationAPL::getAlexaPresentationAPLCapabilityConfiguration(
+    const std::string& APLMaxVersion) {
+    if (APLMaxVersion.empty()) {
+        ACSDK_ERROR(LX("getAlexaPresentationAPLCapabilityConfigurationFailed").d("reason", "empty APL Version"));
+        return nullptr;
+    }
+
+    std::unordered_map<std::string, std::string> configMap;
+
+    configMap.insert({CAPABILITY_INTERFACE_TYPE_KEY, ALEXAPRESENTATIONAPL_CAPABILITY_INTERFACE_TYPE});
+    configMap.insert({CAPABILITY_INTERFACE_NAME_KEY, ALEXAPRESENTATIONAPL_CAPABILITY_INTERFACE_NAME});
+    configMap.insert({CAPABILITY_INTERFACE_VERSION_KEY, ALEXAPRESENTATIONAPL_CAPABILITY_INTERFACE_VERSION});
+
+    rapidjson::Document runtime(rapidjson::kObjectType);
+    rapidjson::Document::AllocatorType& alloc = runtime.GetAllocator();
+
+    rapidjson::Value configJson;
+    configJson.SetObject();
+
+    configJson.AddMember(rapidjson::StringRef(APL_MAX_VERSION), APLMaxVersion, alloc);
+    runtime.AddMember(rapidjson::StringRef(RUNTIME_CONFIG), configJson, alloc);
+
+    rapidjson::StringBuffer buffer;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+    if (!runtime.Accept(writer)) {
+        ACSDK_CRITICAL(
+            LX("getAlexaPresentationAPLCapabilityConfigurationFailed").d("reason", "configWriterRefusedJsonObject"));
+        return nullptr;
+    }
+
+    configMap.insert({CAPABILITY_INTERFACE_CONFIGURATIONS_KEY, buffer.GetString()});
+
+    return std::make_shared<CapabilityConfiguration>(configMap);
+}
+
+std::shared_ptr<CapabilityConfiguration> AlexaPresentationAPL::getAlexaPresentationVideoCapabilityConfiguration() {
+    std::string serializedVideoConfiguration;
+    if (!AlexaPresentationAPLVideoConfigParser::serializeVideoSettings(m_videoSettings, serializedVideoConfiguration)) {
+        ACSDK_CRITICAL(LX("getAlexaPresentationVideoCapabilityConfigurationFailed")
+                           .d("reason", "video config serialization failed"));
+        return nullptr;
+    }
+    ACSDK_DEBUG5(LX(__func__).d("videoSettingsConfiguration", serializedVideoConfiguration));
+
+    std::unordered_map<std::string, std::string> configMap;
+    configMap.insert({CAPABILITY_INTERFACE_TYPE_KEY, ALEXAPRESENTATIONAPL_CAPABILITY_INTERFACE_TYPE});
+    configMap.insert({CAPABILITY_INTERFACE_NAME_KEY, ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_INTERFACE_NAME});
+    configMap.insert({CAPABILITY_INTERFACE_VERSION_KEY, ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_INTERFACE_VERSION});
+    configMap.insert({CAPABILITY_INTERFACE_CONFIGURATIONS_KEY, serializedVideoConfiguration});
+
+    return std::make_shared<CapabilityConfiguration>(configMap);
+}
+
+DirectiveHandlerConfiguration AlexaPresentationAPL::getAPLDirectiveConfiguration() const {
+    ACSDK_DEBUG5(LX(__func__));
+    DirectiveHandlerConfiguration configuration;
+
+    configuration[DOCUMENT] = BlockingPolicy(BlockingPolicy::MEDIUM_VISUAL, true);
+    configuration[COMMAND] = BlockingPolicy(BlockingPolicy::MEDIUMS_AUDIO_AND_VISUAL, true);
+    configuration[INDEX_LIST_DATA] = BlockingPolicy(BlockingPolicy::MEDIUM_VISUAL, false);
+    configuration[INDEX_LIST_UPDATE] = BlockingPolicy(BlockingPolicy::MEDIUM_VISUAL, false);
+    configuration[TOKEN_LIST_DATA] = BlockingPolicy(BlockingPolicy::MEDIUM_VISUAL, false);
+    return configuration;
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> AlexaPresentationAPL::
+    getAPLCapabilityConfigurations(const std::string& APLMaxVersion) {
+    m_capabilityConfigurations.insert(getAlexaPresentationAPLCapabilityConfiguration(APLMaxVersion));
+    m_capabilityConfigurations.insert(getAlexaPresentationVideoCapabilityConfiguration());
+    return m_capabilityConfigurations;
+}
+
+aplCapabilityCommon::BaseAPLCapabilityAgent::DirectiveType AlexaPresentationAPL::getDirectiveType(
+    std::shared_ptr<DirectiveInfo> info) {
+    if (!info) {
+        return aplCapabilityCommon::BaseAPLCapabilityAgent::DirectiveType::UNKNOWN;
+    }
+
+    if (info->directive->getNamespace() == DOCUMENT.nameSpace && info->directive->getName() == DOCUMENT.name) {
+        return aplCapabilityCommon::BaseAPLCapabilityAgent::DirectiveType::RENDER_DOCUMENT;
+    } else if (info->directive->getNamespace() == COMMAND.nameSpace && info->directive->getName() == COMMAND.name) {
+        return aplCapabilityCommon::BaseAPLCapabilityAgent::DirectiveType::EXECUTE_COMMAND;
+    } else if (
+        (info->directive->getNamespace() == INDEX_LIST_DATA.nameSpace &&
+         info->directive->getName() == INDEX_LIST_DATA.name) ||
+        (info->directive->getNamespace() == INDEX_LIST_UPDATE.nameSpace &&
+         info->directive->getName() == INDEX_LIST_UPDATE.name)) {
+        return aplCapabilityCommon::BaseAPLCapabilityAgent::DirectiveType::DYNAMIC_INDEX_DATA_SOURCE_UPDATE;
+    } else if (
+        info->directive->getNamespace() == TOKEN_LIST_DATA.nameSpace &&
+        info->directive->getName() == TOKEN_LIST_DATA.name) {
+        return aplCapabilityCommon::BaseAPLCapabilityAgent::DirectiveType::DYNAMIC_TOKEN_DATA_SOURCE_UPDATE;
+    } else {
+        return aplCapabilityCommon::BaseAPLCapabilityAgent::DirectiveType::UNKNOWN;
+    }
+}
+
+const std::string& AlexaPresentationAPL::getConfigurationRootKey() {
+    return ALEXAPRESENTATIONAPL_CONFIGURATION_ROOT_KEY;
+}
+
+const std::string& AlexaPresentationAPL::getMetricDataPointName(
+    aplCapabilityCommon::BaseAPLCapabilityAgent::MetricEvent event) {
+    return METRICS_DATA_POINT_NAMES[event];
+}
+
+const std::string& AlexaPresentationAPL::getMetricActivityName(
+    aplCapabilityCommon::BaseAPLCapabilityAgent::MetricActivity activity) {
+    return METRICS_ACTIVITY_NAMES[activity];
+}
+
+aplCapabilityCommon::BaseAPLCapabilityAgent::PresentationSessionFieldNames AlexaPresentationAPL::
+    getPresentationSessionFieldNames() {
+    aplCapabilityCommon::BaseAPLCapabilityAgent::PresentationSessionFieldNames fieldNames;
+    fieldNames.skillId = SKILL_ID;
+    fieldNames.presentationSessionId = PRESENTATION_SESSION_ID;
+    return fieldNames;
+}
+
+const bool AlexaPresentationAPL::shouldPackPresentationSessionToAvsEvents() {
+    return false;
+}
+
+bool AlexaPresentationAPL::initialize() {
+    if (!aplCapabilityCommon::BaseAPLCapabilityAgent::initialize()) {
+        ACSDK_ERROR(LX(__func__).m("BaseAPLCapabilityAgent initialization failed"));
+        return false;
+    }
+
+    auto configurationRoot = ConfigurationNode::getRoot()[getConfigurationRootKey()];
+    VideoSettings videoSettings;
+    if (AlexaPresentationAPLVideoConfigParser::parseVideoSettings(configurationRoot, videoSettings)) {
+        ACSDK_DEBUG5(LX(__func__).m("Using video settings from config"));
+        m_videoSettings = videoSettings;
+    }
+
+    return true;
+}
+
+}  // namespace aplCapabilityAgent
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/src/AlexaPresentationAPLFactory.cpp b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/src/AlexaPresentationAPLFactory.cpp
new file mode 100644
index 0000000000..e176d94ff3
--- /dev/null
+++ b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/src/AlexaPresentationAPLFactory.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "acsdk/AlexaPresentationAPL/private/AlexaPresentationAPL.h"
+#include "acsdk/AlexaPresentationAPL/AlexaPresentationAPLFactory.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityAgent {
+/// String to identify log entries originating from this file.
+#define TAG "AlexaPresentationAPLFactory"
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+avsCommon::utils::Optional<AlexaPresentationAPLFactory::AlexaPresentationAPLAgentData> AlexaPresentationAPLFactory::
+    create(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::string APLVersion,
+        std::shared_ptr<alexaClientSDK::aplCapabilityCommonInterfaces::VisualStateProviderInterface>
+            visualStateProvider) {
+    auto alexaPresentationAPL = AlexaPresentationAPL::create(
+        exceptionSender, metricRecorder, messageSender, contextManager, APLVersion, visualStateProvider);
+
+    if (alexaPresentationAPL) {
+        AlexaPresentationAPLFactory::AlexaPresentationAPLAgentData alexaPresentationAPLData;
+        alexaPresentationAPLData.aplCapabilityAgent = alexaPresentationAPL;
+        alexaPresentationAPLData.capabilityAgent = alexaPresentationAPL;
+        alexaPresentationAPLData.capabilityAgentNotifier = alexaPresentationAPL;
+        alexaPresentationAPLData.capabilityConfiguration = alexaPresentationAPL;
+        alexaPresentationAPLData.requiresShutdown = alexaPresentationAPL;
+        return avsCommon::utils::Optional<AlexaPresentationAPLFactory::AlexaPresentationAPLAgentData>(
+            alexaPresentationAPLData);
+    }
+    return avsCommon::utils::Optional<AlexaPresentationAPLFactory::AlexaPresentationAPLAgentData>();
+}
+}  // namespace aplCapabilityAgent
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/src/AlexaPresentationAPLVideoConfigParser.cpp b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/src/AlexaPresentationAPLVideoConfigParser.cpp
new file mode 100644
index 0000000000..cae7504e6d
--- /dev/null
+++ b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/src/AlexaPresentationAPLVideoConfigParser.cpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Amazon Software License (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     https://aws.amazon.com/asl/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
+
+#include "acsdk/AlexaPresentationAPL/private/AlexaPresentationAPLVideoConfigParser.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityAgent {
+
+using namespace alexaClientSDK;
+using namespace alexaClientSDK::aplCapabilityCommonInterfaces;
+
+/// String to identify log entries originating from this file.
+#define TAG "AlexaPresentationAPLVideoConfigParser"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// Alexa.Presentation.APL.Video key for video related settings
+static const std::string ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_VIDEO_KEY = "video";
+
+/// Alexa.Presentation.APL.Video key for supported codecs
+static const std::string ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_CODECS_KEY = "codecs";
+
+bool AlexaPresentationAPLVideoConfigParser::serializeVideoSettings(
+    const alexaClientSDK::aplCapabilityCommonInterfaces::VideoSettings& videoSettings,
+    std::string& serializedJson) {
+    rapidjson::Document configurationJson(rapidjson::kObjectType);
+    auto& alloc = configurationJson.GetAllocator();
+
+    rapidjson::Value codecsJson(rapidjson::kArrayType);
+    for (const auto& videoCodec : videoSettings.codecs) {
+        auto codecStr = VideoSettings::codecToString(videoCodec);
+        rapidjson::Value value;
+        value.SetString(codecStr.c_str(), codecStr.length(), alloc);
+        codecsJson.PushBack(value, alloc);
+    }
+
+    rapidjson::Value videoJson(rapidjson::kObjectType);
+    videoJson.AddMember(rapidjson::StringRef(ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_CODECS_KEY), codecsJson, alloc);
+    configurationJson.AddMember(rapidjson::StringRef(ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_VIDEO_KEY), videoJson, alloc);
+
+    rapidjson::StringBuffer sb;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(sb);
+    if (!configurationJson.Accept(writer)) {
+        ACSDK_CRITICAL(LX("serializeVideoSettingsFailed").d("reason", "configWriterRefusedJsonObject"));
+        return false;
+    }
+    serializedJson = sb.GetString();
+
+    return true;
+}
+
+bool AlexaPresentationAPLVideoConfigParser::parseVideoSettings(
+    const alexaClientSDK::avsCommon::utils::configuration::ConfigurationNode& config,
+    alexaClientSDK::aplCapabilityCommonInterfaces::VideoSettings& videoSettings) {
+    auto videoSettingsJson = config[ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_VIDEO_KEY];
+    if (!videoSettingsJson) {
+        ACSDK_DEBUG5(LX(__func__).m("Video settings not found in config file"));
+        return false;
+    }
+
+    std::set<std::string> videoCodecs;
+    if (!videoSettingsJson.getStringValues(ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_CODECS_KEY, &videoCodecs)) {
+        ACSDK_DEBUG5(LX(__func__).m("Video codecs not found in config file"));
+        return false;
+    }
+
+    for (const auto& codecStr : videoCodecs) {
+        auto codec = VideoSettings::stringToCodec(codecStr);
+        if (codec.hasValue()) {
+            videoSettings.codecs.insert(codec.value());
+        } else {
+            ACSDK_WARN(LX(__func__).d("videoCodec", codecStr).m("Unsupported codec"));
+        }
+    }
+
+    return true;
+}
+
+}  // namespace aplCapabilityAgent
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/src/CMakeLists.txt b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/src/CMakeLists.txt
new file mode 100644
index 0000000000..5bd14cd5b8
--- /dev/null
+++ b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/src/CMakeLists.txt
@@ -0,0 +1,14 @@
+add_definitions("-DACSDK_LOG_MODULE=${PROJECT_NAME}")
+
+file(GLOB SOURCES "*.cpp")
+add_library(${PROJECT_NAME} ${SOURCES})
+
+target_include_directories(${PROJECT_NAME}
+        PUBLIC "${acsdkAlexaPresentationAPL_SOURCE_DIR}/include"
+        PRIVATE "${acsdkAlexaPresentationAPL_SOURCE_DIR}/privateInclude"
+        "${ASDK_INCLUDE_DIRS}")
+
+target_link_libraries(${PROJECT_NAME} "${ASDK_LDFLAGS}" AVSCommon acsdkAPLCapabilityCommon acsdkAPLCapabilityCommonInterfaces)
+
+# install target
+asdk_install()
\ No newline at end of file
diff --git a/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/test/AlexaPresentationAPLVideoConfigParserTest.cpp b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/test/AlexaPresentationAPLVideoConfigParserTest.cpp
new file mode 100644
index 0000000000..156d156d5f
--- /dev/null
+++ b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/test/AlexaPresentationAPLVideoConfigParserTest.cpp
@@ -0,0 +1,130 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include "acsdk/AlexaPresentationAPL/private/AlexaPresentationAPLVideoConfigParser.h"
+
+namespace alexaClientSDK {
+namespace aplCapabilityAgent {
+namespace test {
+
+using namespace ::testing;
+using namespace alexaClientSDK::aplCapabilityCommonInterfaces;
+using namespace alexaClientSDK::avsCommon::utils::configuration;
+/// Alias for JSON stream type used in @c ConfigurationNode initialization
+using JSONStream = std::vector<std::shared_ptr<std::istream>>;
+
+/// Alexa.Presentation.APL.Video key for video related settings
+const std::string ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_VIDEO_KEY = "video";
+/// Alexa.Presentation.APL.Video key for supported codecs
+const std::string ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_CODECS_KEY = "codecs";
+/// String representing the H_264_41 codec
+const std::string H_264_41 = "H_264_41";
+/// String representing the H_264_42 codec
+const std::string H_264_42 = "H_264_42";
+
+const std::string APL_VIDEO_CONFIG = R"({")" + ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_VIDEO_KEY + R"(":{")" +
+                                     ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_CODECS_KEY + R"(":[")" + H_264_41 + R"(",")" +
+                                     H_264_42 + R"("]}})";
+const std::string INVALID_KEY = "invalidKey";
+const std::string APL_VIDEO_CONFIG_INVALID_VIDEO_KEY = R"({")" + INVALID_KEY + R"(":{")" +
+                                                       ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_CODECS_KEY + R"(":[")" +
+                                                       H_264_41 + R"(",")" + H_264_42 + R"("]}})";
+const std::string APL_VIDEO_CONFIG_INVALID_CODECS_KEY = R"({")" + ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_VIDEO_KEY +
+                                                        R"(":{")" + INVALID_KEY + R"(":[")" + H_264_41 + R"(",")" +
+                                                        H_264_42 + R"("]}})";
+const std::string UNSUPPORTED_CODEC = "unsupportedCodec";
+const std::string APL_VIDEO_CONFIG_UNSUPPORTED_CODEC = R"({")" + ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_VIDEO_KEY +
+                                                       R"(":{")" + ALEXAPRESENTATIONAPLVIDEO_CAPABILITY_CODECS_KEY +
+                                                       R"(":[")" + H_264_41 + R"(",")" + UNSUPPORTED_CODEC + R"("]}})";
+
+/// Test harness for @c AlexaPresentationAPLVideoConfigParser class.
+class AlexaPresentationAPLVideoConfigParserTest : public ::testing::Test {
+public:
+    static bool areVideoSettingsEqual(const VideoSettings& videoSettings1, const VideoSettings& videoSettings2);
+    static ConfigurationNode getConfigurationNode(std::string jsonConfig);
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+    /// Constructor.
+    AlexaPresentationAPLVideoConfigParserTest() {
+    }
+};
+
+void AlexaPresentationAPLVideoConfigParserTest::TearDown() {
+    ConfigurationNode::uninitialize();
+}
+
+ConfigurationNode AlexaPresentationAPLVideoConfigParserTest::getConfigurationNode(std::string jsonConfig) {
+    auto stream = std::shared_ptr<std::stringstream>(new std::stringstream(jsonConfig));
+    JSONStream jsonStream({stream});
+    ConfigurationNode::initialize(jsonStream);
+    return ConfigurationNode::getRoot();
+}
+
+bool AlexaPresentationAPLVideoConfigParserTest::areVideoSettingsEqual(
+    const VideoSettings& videoSettings1,
+    const VideoSettings& videoSettings2) {
+    return videoSettings1.codecs == videoSettings2.codecs;
+}
+
+/**
+ * Tests video settings serialization.
+ */
+TEST_F(AlexaPresentationAPLVideoConfigParserTest, testSerializeVideoSettings) {
+    std::string serializedVideoConfig;
+    VideoSettings video_settings_2;
+    video_settings_2.codecs.insert(VideoSettings::Codec::H_264_41);
+    video_settings_2.codecs.insert(VideoSettings::Codec::H_264_42);
+    ASSERT_TRUE(AlexaPresentationAPLVideoConfigParser::serializeVideoSettings(video_settings_2, serializedVideoConfig));
+    ASSERT_EQ(serializedVideoConfig, APL_VIDEO_CONFIG);
+}
+
+/**
+ * Tests parsing video settings with invalid video key.
+ */
+TEST_F(AlexaPresentationAPLVideoConfigParserTest, testParseVideoSettingsInvalidVideoKey) {
+    auto node = getConfigurationNode(APL_VIDEO_CONFIG_INVALID_VIDEO_KEY);
+    VideoSettings videoSettings;
+    ASSERT_FALSE(AlexaPresentationAPLVideoConfigParser::parseVideoSettings(node, videoSettings));
+}
+
+/**
+ * Tests parsing video settings with invalid codecs key.
+ */
+TEST_F(AlexaPresentationAPLVideoConfigParserTest, testParseVideoSettingsInvalidCodecsKey) {
+    auto node = getConfigurationNode(APL_VIDEO_CONFIG_INVALID_CODECS_KEY);
+    VideoSettings videoSettings;
+    ASSERT_FALSE(AlexaPresentationAPLVideoConfigParser::parseVideoSettings(node, videoSettings));
+}
+
+/**
+ * Tests parsing video settings with unsupported codec.
+ */
+TEST_F(AlexaPresentationAPLVideoConfigParserTest, testParseVideoSettingsUnsupportedCodec) {
+    auto node = getConfigurationNode(APL_VIDEO_CONFIG_UNSUPPORTED_CODEC);
+    VideoSettings videoSettings;
+    VideoSettings video_settings_1;
+    video_settings_1.codecs.insert(VideoSettings::Codec::H_264_41);
+    ASSERT_TRUE(AlexaPresentationAPLVideoConfigParser::parseVideoSettings(node, videoSettings));
+    ASSERT_TRUE(areVideoSettingsEqual(videoSettings, video_settings_1));
+}
+}  // namespace test
+}  // namespace aplCapabilityAgent
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/test/CMakeLists.txt b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/test/CMakeLists.txt
new file mode 100644
index 0000000000..6583590a8e
--- /dev/null
+++ b/capabilities/AlexaPresentationAPL/AlexaPresentationAPL/test/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+  
+set(INCLUDE_PATH
+    "${AVSCommon_INCLUDE_DIRS}"
+    "${AVSCommon_SOURCE_DIR}/AVS/test"
+    "${AVSCommon_SOURCE_DIR}/Utils/test"
+    "${AVSCommon_SOURCE_DIR}/SDKInterfaces/test"
+    "${acsdkAlexaPresentationAPL_SOURCE_DIR}/privateInclude"
+    "${ASDK_INCLUDE_DIRS}")
+
+set(LIBS
+        "AVSCommon"
+        "AVSCommonTestLib"
+        "SDKInterfacesTests"
+        "AttachmentCommonTestLib"
+        "acsdkAlexaPresentationAPL"
+)
+discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
diff --git a/capabilities/AlexaPresentationAPL/CMakeLists.txt b/capabilities/AlexaPresentationAPL/CMakeLists.txt
new file mode 100644
index 0000000000..439163747d
--- /dev/null
+++ b/capabilities/AlexaPresentationAPL/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+
+add_subdirectory("AlexaPresentationAPL")
\ No newline at end of file
diff --git a/capabilities/AlexaRecordController/.clang-format b/capabilities/AlexaRecordController/.clang-format
new file mode 100644
index 0000000000..382ffea861
--- /dev/null
+++ b/capabilities/AlexaRecordController/.clang-format
@@ -0,0 +1,101 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
diff --git a/capabilities/AlexaRecordController/AlexaRecordController/CMakeLists.txt b/capabilities/AlexaRecordController/AlexaRecordController/CMakeLists.txt
new file mode 100644
index 0000000000..ec68e30872
--- /dev/null
+++ b/capabilities/AlexaRecordController/AlexaRecordController/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaRecordController LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
\ No newline at end of file
diff --git a/capabilities/AlexaRecordController/AlexaRecordController/include/acsdk/AlexaRecordController/AlexaRecordControllerFactory.h b/capabilities/AlexaRecordController/AlexaRecordController/include/acsdk/AlexaRecordController/AlexaRecordControllerFactory.h
new file mode 100644
index 0000000000..cf0165b2e0
--- /dev/null
+++ b/capabilities/AlexaRecordController/AlexaRecordController/include/acsdk/AlexaRecordController/AlexaRecordControllerFactory.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXARECORDCONTROLLER_ALEXARECORDCONTROLLERFACTORY_H_
+#define ACSDK_ALEXARECORDCONTROLLER_ALEXARECORDCONTROLLERFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/AlexaRecordControllerInterfaces/RecordControllerInterface.h>
+
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/DirectiveHandlerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace alexaRecordController {
+
+/**
+ * This factory can be used to create an AlexaRecordControllerFactory object which could be a parameter for Capability
+ * agent construction.
+ */
+class AlexaRecordControllerFactory {
+private:
+    /**
+     * This object contains the interfaces to interact with the AlexaRecordController Capability Agent.
+     */
+    struct RecordControllerCapabilityAgentData {
+        /// An interface used to handle Alexa.RecordController directives.
+        std::shared_ptr<avsCommon::sdkInterfaces::DirectiveHandlerInterface> directiveHandler;
+        /// An interface used to provide the configurations of the capabilities being implemented by this capability
+        /// agent.
+        std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface> capabilityConfigurationInterface;
+        /// Instance of @c RequiresShutdown used for cleaning up the capability agent during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+public:
+    /**
+     * Creates a new AlexaRecordController capability agent configuration.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param recordController An interface that this object will use to perform the record controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isRetrievable Whether properties can be retrieved when AVS sends a state report request or the endpoint
+     * responds with an Alexa response to a directive.
+     * @return An @c Optional object containing an instance of @c RecordControllerCapabilityAgentData object if
+     * successful, otherwise an @c Optional object with no valid value.
+     */
+    static avsCommon::utils::Optional<RecordControllerCapabilityAgentData> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<alexaRecordControllerInterfaces::RecordControllerInterface>& recordController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        bool isRetrievable);
+};
+
+}  // namespace alexaRecordController
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXARECORDCONTROLLER_ALEXARECORDCONTROLLERFACTORY_H_
diff --git a/capabilities/AlexaRecordController/AlexaRecordController/privateInclude/acsdk/AlexaRecordController/private/AlexaRecordControllerCapabilityAgent.h b/capabilities/AlexaRecordController/AlexaRecordController/privateInclude/acsdk/AlexaRecordController/private/AlexaRecordControllerCapabilityAgent.h
new file mode 100644
index 0000000000..f63049c7c2
--- /dev/null
+++ b/capabilities/AlexaRecordController/AlexaRecordController/privateInclude/acsdk/AlexaRecordController/private/AlexaRecordControllerCapabilityAgent.h
@@ -0,0 +1,218 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXARECORDCONTROLLER_PRIVATE_ALEXARECORDCONTROLLERCAPABILITYAGENT_H_
+#define ACSDK_ALEXARECORDCONTROLLER_PRIVATE_ALEXARECORDCONTROLLERCAPABILITYAGENT_H_
+
+#include <memory>
+#include <string>
+#include <unordered_set>
+
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/AVS/CapabilityState.h>
+#include <AVSCommon/AVS/CapabilityTag.h>
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextRequestToken.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+#include <acsdk/AlexaRecordControllerInterfaces/RecordControllerInterface.h>
+
+namespace alexaClientSDK {
+namespace alexaRecordController {
+
+/**
+ * The @c AlexaRecordControllerCapabilityAgent is responsible for handling Alexa.RecordController directives and
+ * calls the @c RecordControllerInterface APIs.
+ *
+ * This class implements a @c CapabilityAgent that handles the @c Alexa.RecordController Interface.
+ */
+class AlexaRecordControllerCapabilityAgent
+        : public avsCommon::avs::CapabilityAgent
+        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<AlexaRecordControllerCapabilityAgent> {
+public:
+    /**
+     * Create an instance of @c AlexaRecordControllerCapabilityAgent.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param recordController An interface that this object will use to perform the record controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isRetrievable Whether properties can be retrieved when AVS sends a state report request or the endpoint
+     * responds with an Alexa response to a directive.
+     * @return @c nullptr if the inputs are invalid, else a new instance of @c AlexaRecordControllerCapabilityAgent.
+     */
+    static std::shared_ptr<AlexaRecordControllerCapabilityAgent> create(
+        avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+        std::shared_ptr<alexaRecordControllerInterfaces::RecordControllerInterface> recordController,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        bool isRetrievable);
+
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
+    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name StateProviderInterface Functions
+    /// @{
+    void provideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken) override;
+    bool canStateBeRetrieved() override;
+    bool hasReportableStateProperties() override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
+    /// @}
+
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param recordController An interface that this object will use to perform the record controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isRetrievable Whether properties can be retrieved when AVS sends a state report request or the endpoint
+     * responds with an Alexa response to a directive.
+     */
+
+    AlexaRecordControllerCapabilityAgent(
+        avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+        std::shared_ptr<alexaRecordControllerInterfaces::RecordControllerInterface> recordController,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        bool isRetrievable);
+
+    /**
+     * Initializes the object.
+     */
+    bool initialize();
+
+    /**
+     * Remove a directive from the map of message IDs to DirectiveInfo instances.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
+     */
+    void removeDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Send the handling completed notification and clean up the resources.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Called on executor to handle any unknown directives received.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param type The @c ExceptionErrorType.
+     */
+    void executeUnknownDirective(std::shared_ptr<DirectiveInfo> info, avsCommon::avs::ExceptionErrorType type);
+
+    /**
+     * Gets the current recording state from endpoint and notifies @c ContextManager
+     *
+     * @param stateProviderName Provides the property name and used in the @c ContextManager methods.
+     * @param contextRequestToken The token to be used when providing the response to @c ContextManager
+     */
+    void executeProvideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken);
+
+    /**
+     * Send event based the endpoint's response for a controller method call.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param result This contains the endpoint's response of a controller call.
+     * @param recordingStateString This contains the stringified recording state (RECORDING or NOT_RECORDING) if the
+     * result type is SUCCESS.
+     */
+    void executeSendResponseEvent(
+        const std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info,
+        const alexaRecordControllerInterfaces::RecordControllerInterface::Response& result,
+        const std::string& recordingStateString);
+
+    /**
+     * Send Alexa interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaErrorResponseType Alexa interface error response type.
+     * @param responseMessage Alexa interface error response message.
+     */
+    void sendAlexaErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+        const std::string& responseMessage);
+
+    /**
+     * Send Alexa.Video interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaVideoErrorResponseType Alexa.Video interface error response type.
+     * @param responseMessage Alexa.Video interface error response message.
+     */
+    void sendAlexaVideoErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType
+            alexaVideoErrorResponseType,
+        const std::string& responseMessage);
+
+    /// Endpoint the capability agent is associated to.
+    avsCommon::sdkInterfaces::endpoints::EndpointIdentifier m_endpointId;
+
+    /// Reference to @c AlexaRecordControllerInterface
+    std::shared_ptr<alexaRecordControllerInterfaces::RecordControllerInterface> m_recordController;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The @c AlexaInterfaceMessageSenderInterface used to send event messages.
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> m_responseSender;
+
+    /// Whether the recording state properties can be retrieved when Alexa sends a state report request to the endpoint.
+    bool m_isRetrievable;
+
+    /// This is the worker thread for the @c AlexaRecordControllerCapabilityAgent.
+    avsCommon::utils::threading::Executor m_executor;
+};
+
+}  // namespace alexaRecordController
+}  // namespace alexaClientSDK
+#endif  // ACSDK_ALEXARECORDCONTROLLER_PRIVATE_ALEXARECORDCONTROLLERCAPABILITYAGENT_H_
diff --git a/capabilities/AlexaRecordController/AlexaRecordController/src/AlexaRecordControllerCapabilityAgent.cpp b/capabilities/AlexaRecordController/AlexaRecordController/src/AlexaRecordControllerCapabilityAgent.cpp
new file mode 100644
index 0000000000..03f8a6144b
--- /dev/null
+++ b/capabilities/AlexaRecordController/AlexaRecordController/src/AlexaRecordControllerCapabilityAgent.cpp
@@ -0,0 +1,404 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/AlexaRecordController/private/AlexaRecordControllerCapabilityAgent.h>
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace alexaRecordController {
+
+using namespace avsCommon::avs;
+using namespace avsCommon;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::sdkInterfaces::endpoints;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::configuration;
+
+using namespace alexaRecordControllerInterfaces;
+
+/// String to identify log entries originating from this file.
+#define TAG "AlexaRecordControllerCapabilityAgent"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+/// The namespace for this capability agent.
+static const std::string NAMESPACE{"Alexa.RecordController"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for StartRecording directive
+static const std::string NAME_START_RECORDING{"StartRecording"};
+
+/// The name for StopRecording directive
+static const std::string NAME_STOP_RECORDING{"StopRecording"};
+
+/// The name for the context of the response event
+static const std::string NAME_RECORDING_STATE{"recordingState"};
+
+/// The namespace for Alexa.Video.ErrorResponse.
+static const std::string NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE{"Alexa.Video"};
+
+/// Proactive state reporting is currently disabled for the Record Controller
+static const bool IS_PROACTIVELY_REPORTED{false};
+
+/// State where the endpoint is currently recording
+static const std::string RECORDING{"RECORDING"};
+
+/// State where the endpoint is not currently recording
+static const std::string NOT_RECORDING{"NOT_RECORDING"};
+
+std::shared_ptr<AlexaRecordControllerCapabilityAgent> AlexaRecordControllerCapabilityAgent::create(
+    EndpointIdentifier endpointId,
+    std::shared_ptr<RecordControllerInterface> recordController,
+    std::shared_ptr<ContextManagerInterface> contextManager,
+    std::shared_ptr<AlexaInterfaceMessageSenderInterface> responseSender,
+    std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionSender,
+    bool isRetrievable) {
+    if (endpointId.empty()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "emptyEndpointId"));
+        return nullptr;
+    }
+    if (!recordController) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullRecordController"));
+        return nullptr;
+    }
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManager"));
+        return nullptr;
+    }
+    if (!responseSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullResponseSender"));
+        return nullptr;
+    }
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    auto recordControllerCapabilityAgent =
+        std::shared_ptr<AlexaRecordControllerCapabilityAgent>(new AlexaRecordControllerCapabilityAgent(
+            std::move(endpointId),
+            std::move(recordController),
+            std::move(contextManager),
+            std::move(responseSender),
+            std::move(exceptionSender),
+            isRetrievable));
+
+    if (!recordControllerCapabilityAgent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "instantiationFailed"));
+        return nullptr;
+    }
+
+    if (!recordControllerCapabilityAgent->initialize()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "initializationFailed"));
+        return nullptr;
+    }
+
+    return recordControllerCapabilityAgent;
+}
+
+AlexaRecordControllerCapabilityAgent::AlexaRecordControllerCapabilityAgent(
+    EndpointIdentifier endpointId,
+    std::shared_ptr<RecordControllerInterface> recordController,
+    std::shared_ptr<ContextManagerInterface> contextManager,
+    std::shared_ptr<AlexaInterfaceMessageSenderInterface> responseSender,
+    std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionSender,
+    bool isRetrievable) :
+        CapabilityAgent{NAMESPACE, exceptionSender},
+        RequiresShutdown{"AlexaRecordControllerCapabilityAgent"},
+        m_endpointId{std::move(endpointId)},
+        m_recordController{std::move(recordController)},
+        m_contextManager{std::move(contextManager)},
+        m_responseSender{std::move(responseSender)},
+        m_isRetrievable{isRetrievable} {
+}
+
+bool AlexaRecordControllerCapabilityAgent::initialize() {
+    ACSDK_DEBUG9(LX(__func__));
+
+    if (m_isRetrievable) {
+        m_contextManager->addStateProvider({NAMESPACE, NAME_RECORDING_STATE, m_endpointId}, shared_from_this());
+    }
+    return true;
+}
+
+void AlexaRecordControllerCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!directive) {
+        ACSDK_ERROR(LX("handleDirectiveImmediatelyFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+}
+
+void AlexaRecordControllerCapabilityAgent::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX("preHandleDirective"));
+    // do nothing.
+}
+
+void AlexaRecordControllerCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+
+    m_executor.execute([this, info] {
+        ACSDK_DEBUG9(LX("handleDirectiveInExecutor"));
+        const std::string directiveName = info->directive->getName();
+        if (!info->directive->getEndpoint().hasValue() ||
+            (info->directive->getEndpoint().value().endpointId != m_endpointId)) {
+            executeUnknownDirective(info, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+        RecordControllerInterface::Response response;
+        if (directiveName == NAME_START_RECORDING) {
+            response = m_recordController->startRecording();
+        } else if (directiveName == NAME_STOP_RECORDING) {
+            response = m_recordController->stopRecording();
+        } else {
+            ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "unexpectedDirective").d("name", directiveName));
+            executeUnknownDirective(info, ExceptionErrorType::UNSUPPORTED_OPERATION);
+            return;
+        }
+
+        std::string recordingStateString{NOT_RECORDING};
+        if (response.type == RecordControllerInterface::Response::Type::SUCCESS) {
+            auto recording = m_recordController->isRecording();
+            if (recording) {
+                recordingStateString = RECORDING;
+            }
+        }
+        executeSetHandlingCompleted(info);
+        executeSendResponseEvent(info, response, recordingStateString);
+    });
+}
+
+void AlexaRecordControllerCapabilityAgent::provideState(
+    const CapabilityTag& stateProviderName,
+    const ContextRequestToken contextRequestToken) {
+    ACSDK_DEBUG9(
+        LX(__func__).d("contextRequestToken", contextRequestToken).sensitive("stateProviderName", stateProviderName));
+
+    m_executor.execute([this, stateProviderName, contextRequestToken] {
+        ACSDK_DEBUG9(LX("provideStateInExecutor"));
+        executeProvideState(stateProviderName, contextRequestToken);
+    });
+    return;
+}
+
+bool AlexaRecordControllerCapabilityAgent::canStateBeRetrieved() {
+    ACSDK_DEBUG9(LX(__func__));
+    return m_isRetrievable;
+}
+
+bool AlexaRecordControllerCapabilityAgent::hasReportableStateProperties() {
+    ACSDK_DEBUG9(LX(__func__));
+    return m_isRetrievable;
+}
+
+void AlexaRecordControllerCapabilityAgent::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("cancelDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    if (!info->directive->getEndpoint().hasValue() ||
+        info->directive->getEndpoint().value().endpointId != m_endpointId) {
+        ACSDK_WARN(LX("cancelDirective").d("reason", "notExpectedEndpointId"));
+    }
+    removeDirective(info);
+}
+
+DirectiveHandlerConfiguration AlexaRecordControllerCapabilityAgent::getConfiguration() const {
+    ACSDK_DEBUG9(LX(__func__));
+    DirectiveHandlerConfiguration configuration;
+    auto neitherNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUMS_NONE, false);
+    configuration[{NAMESPACE, NAME_START_RECORDING, m_endpointId}] = neitherNonBlockingPolicy;
+    configuration[{NAMESPACE, NAME_STOP_RECORDING, m_endpointId}] = neitherNonBlockingPolicy;
+
+    return configuration;
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> AlexaRecordControllerCapabilityAgent::
+    getCapabilityConfigurations() {
+    CapabilityConfiguration configuration{CapabilityConfiguration::ALEXA_INTERFACE_TYPE,
+                                          NAMESPACE,
+                                          INTERFACE_VERSION,
+                                          Optional<std::string>(),  // instance
+                                          Optional<CapabilityConfiguration::Properties>(
+                                              {m_isRetrievable, IS_PROACTIVELY_REPORTED, {NAME_RECORDING_STATE}})};
+    return {std::make_shared<avsCommon::avs::CapabilityConfiguration>(configuration)};
+}
+
+void AlexaRecordControllerCapabilityAgent::doShutdown() {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!m_executor.isShutdown()) {
+        m_executor.shutdown();
+    }
+
+    m_recordController.reset();
+    m_responseSender.reset();
+    if (m_isRetrievable) {
+        m_contextManager->removeStateProvider({NAMESPACE, NAME_RECORDING_STATE, m_endpointId});
+    }
+    m_contextManager.reset();
+}
+
+void AlexaRecordControllerCapabilityAgent::removeDirective(std::shared_ptr<DirectiveInfo> info) {
+    if (info->directive && info->result) {
+        CapabilityAgent::removeDirective(info->directive->getMessageId());
+    }
+}
+
+void AlexaRecordControllerCapabilityAgent::executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info) {
+    if (info && info->result) {
+        info->result->setCompleted();
+    }
+    removeDirective(info);
+}
+
+void AlexaRecordControllerCapabilityAgent::executeUnknownDirective(
+    std::shared_ptr<DirectiveInfo> info,
+    ExceptionErrorType type) {
+    ACSDK_ERROR(LX("executeUnknownDirectiveFailed")
+                    .d("reason", "unknownDirective")
+                    .d("namespace", info->directive->getNamespace())
+                    .d("name", info->directive->getName()));
+
+    const std::string exceptionMessage =
+        "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
+
+    sendExceptionEncounteredAndReportFailed(info, exceptionMessage, type);
+}
+
+void AlexaRecordControllerCapabilityAgent::executeProvideState(
+    const CapabilityTag& stateProviderName,
+    const ContextRequestToken contextRequestToken) {
+    ACSDK_DEBUG9(LX("executeProvideState"));
+    auto isError = false;
+    if (stateProviderName.endpointId != m_endpointId) {
+        ACSDK_ERROR(LX("provideStateFailed")
+                        .d("reason", "notExpectedEndpointId")
+                        .sensitive("endpointId", stateProviderName.endpointId));
+        isError = true;
+    }
+    if (stateProviderName.name != NAME_RECORDING_STATE) {
+        ACSDK_ERROR(LX("provideStateFailed").d("reason", "notExpectedName").d("name", stateProviderName.name));
+        isError = true;
+    }
+
+    if (!m_isRetrievable) {
+        ACSDK_ERROR(LX("provideStateFailed").d("reason", "provideStateOnNotRetrievableProperty"));
+        isError = true;
+    }
+
+    if (isError) {
+        m_contextManager->provideStateUnavailableResponse(stateProviderName, contextRequestToken, false);
+        return;
+    }
+
+    auto recording = m_recordController->isRecording() ? RECORDING : NOT_RECORDING;
+    m_contextManager->provideStateResponse(
+        stateProviderName, CapabilityState(R"(")" + recording + R"(")"), contextRequestToken);
+}
+
+void AlexaRecordControllerCapabilityAgent::sendAlexaErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+    const std::string& responseMessage) {
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        alexaErrorResponseType,
+        responseMessage);
+}
+
+void AlexaRecordControllerCapabilityAgent::sendAlexaVideoErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType alexaVideoErrorResponseType,
+    const std::string& responseMessage) {
+    std::string payload =
+        R"({"type":")" +
+        AlexaInterfaceMessageSenderInterface::alexaVideoErrorResponseToString(alexaVideoErrorResponseType) +
+        R"(", "message":")" + responseMessage + R"("})";
+
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE,
+        payload);
+}
+
+void AlexaRecordControllerCapabilityAgent::executeSendResponseEvent(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    const RecordControllerInterface::Response& result,
+    const std::string& recordingStateString) {
+    switch (result.type) {
+        case RecordControllerInterface::Response::Type::SUCCESS: {
+            std::string responsePayload = R"({"recording state":")" + recordingStateString + R"("})";
+            m_responseSender->sendResponseEvent(
+                info->directive->getInstance(),
+                info->directive->getCorrelationToken(),
+                AVSMessageEndpoint(m_endpointId),
+                responsePayload);
+            break;
+        }
+        case RecordControllerInterface::Response::Type::FAILED_TOO_MANY_FAILED_ATTEMPTS:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+        case RecordControllerInterface::Response::Type::FAILED_CONFIRMATION_REQUIRED:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::CONFIRMATION_REQUIRED,
+                result.errorMessage);
+            break;
+        case RecordControllerInterface::Response::Type::FAILED_CONTENT_NOT_RECORDABLE:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::CONTENT_NOT_RECORDABLE,
+                result.errorMessage);
+            break;
+        case RecordControllerInterface::Response::Type::FAILED_STORAGE_FULL:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::STORAGE_FULL,
+                result.errorMessage);
+            break;
+        case RecordControllerInterface::Response::Type::FAILED_ENDPOINT_UNREACHABLE:
+            sendAlexaErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::ErrorResponseType::ENDPOINT_UNREACHABLE,
+                result.errorMessage);
+            break;
+        case RecordControllerInterface::Response::Type::FAILED_INTERNAL_ERROR:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+    }
+}
+
+}  // namespace alexaRecordController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaRecordController/AlexaRecordController/src/AlexaRecordControllerFactory.cpp b/capabilities/AlexaRecordController/AlexaRecordController/src/AlexaRecordControllerFactory.cpp
new file mode 100644
index 0000000000..7370d06e9c
--- /dev/null
+++ b/capabilities/AlexaRecordController/AlexaRecordController/src/AlexaRecordControllerFactory.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/AlexaRecordController/AlexaRecordControllerFactory.h>
+#include <acsdk/AlexaRecordController/private/AlexaRecordControllerCapabilityAgent.h>
+
+namespace alexaClientSDK {
+namespace alexaRecordController {
+
+avsCommon::utils::Optional<AlexaRecordControllerFactory::RecordControllerCapabilityAgentData>
+AlexaRecordControllerFactory::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<alexaRecordControllerInterfaces::RecordControllerInterface>& recordController,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+    bool isRetrievable) {
+    AlexaRecordControllerFactory::RecordControllerCapabilityAgentData recordControllerCapabilityAgentData;
+    auto recordControllerCA = alexaRecordController::AlexaRecordControllerCapabilityAgent::create(
+        endpointId, recordController, contextManager, responseSender, exceptionSender, isRetrievable);
+    if (recordControllerCA) {
+        recordControllerCapabilityAgentData.capabilityConfigurationInterface = recordControllerCA;
+        recordControllerCapabilityAgentData.directiveHandler = recordControllerCA;
+        recordControllerCapabilityAgentData.requiresShutdown = recordControllerCA;
+        return avsCommon::utils::Optional<AlexaRecordControllerFactory::RecordControllerCapabilityAgentData>(
+            recordControllerCapabilityAgentData);
+    }
+
+    return avsCommon::utils::Optional<AlexaRecordControllerFactory::RecordControllerCapabilityAgentData>();
+}
+}  // namespace alexaRecordController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaRecordController/AlexaRecordController/src/CMakeLists.txt b/capabilities/AlexaRecordController/AlexaRecordController/src/CMakeLists.txt
new file mode 100644
index 0000000000..dba84f562b
--- /dev/null
+++ b/capabilities/AlexaRecordController/AlexaRecordController/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkAlexaRecordController")
+
+add_library(acsdkAlexaRecordController SHARED
+        AlexaRecordControllerCapabilityAgent.cpp
+        AlexaRecordControllerFactory.cpp)
+
+target_include_directories(acsdkAlexaRecordController PRIVATE
+        "${acsdkAlexaRecordController_SOURCE_DIR}/privateInclude")
+
+target_include_directories(acsdkAlexaRecordController PUBLIC
+        "${acsdkAlexaRecordController_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaRecordController AVSCommon acsdkAlexaRecordControllerInterfaces)
+
+# install target
+asdk_install()
diff --git a/capabilities/AlexaRecordController/AlexaRecordController/test/AlexaRecordControllerCapabilityAgentTest.cpp b/capabilities/AlexaRecordController/AlexaRecordController/test/AlexaRecordControllerCapabilityAgentTest.cpp
new file mode 100644
index 0000000000..2deb8ab067
--- /dev/null
+++ b/capabilities/AlexaRecordController/AlexaRecordController/test/AlexaRecordControllerCapabilityAgentTest.cpp
@@ -0,0 +1,425 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <acsdk/AlexaRecordController/private/AlexaRecordControllerCapabilityAgent.h>
+#include <acsdk/AlexaRecordControllerInterfaces/RecordControllerInterface.h>
+
+#include "AVSCommon/SDKInterfaces/MockAlexaInterfaceMessageSender.h"
+#include "AVSCommon/AVS/Attachment/MockAttachmentManager.h"
+#include "AVSCommon/SDKInterfaces/MockContextManager.h"
+#include "AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h"
+#include "AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h"
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/Timing/TimePoint.h>
+#include <AVSCommon/Utils/WaitEvent.h>
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace alexaRecordController {
+namespace test {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::utils;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::memory;
+using namespace ::testing;
+
+using namespace alexaRecordController;
+using namespace alexaRecordControllerInterfaces;
+
+// For readability.
+using EndpointIdentifier = endpoints::EndpointIdentifier;
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// Time of sample used for testing
+static const std::string TIME_OF_SAMPLE_TEST{"2017-02-03T16:20:50.523Z"};
+
+/// The namespace for capability agent.
+static const std::string NAMESPACE{"Alexa.RecordController"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for StartRecording directive
+static const std::string NAME_STARTRECORDING{"StartRecording"};
+
+/// The name for StopRecording directive
+static const std::string NAME_STOPRECORDING{"StopRecording"};
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
+
+/// The test EndpointId
+static const EndpointIdentifier TEST_ENDPOINT_ID{"testEndpointId"};
+
+/// Event key.
+static const std::string EVENT{"event"};
+
+/// MessageId for testing.
+static const std::string MESSAGE_ID_TEST{"MessageId_Test"};
+
+/// DialogRequestId for testing.
+static const std::string DIALOG_REQUEST_ID_TEST{"DialogRequestId_Test"};
+
+/// Correlation token for testing.
+static const std::string CORRELATION_TOKEN_TEST{"CorrelationToken_Test"};
+
+/// NOT_RECORDING state string for testing.
+static const std::string TEST_STATE_NOT_RECORDING{"NOT_RECORDING"};
+
+/// RECORDING state string for testing.
+static const std::string TEST_STATE_RECORDING{"RECORDING"};
+
+/// The name of recording state property
+static const std::string RECORDINGSTATE_PROPERTY_NAME{"recordingState"};
+
+class MockRecordControllerHandlerInterface : public RecordControllerInterface {
+public:
+    MOCK_METHOD0(startRecordingMock, Response());
+    MOCK_METHOD0(stopRecordingMock, Response());
+    MOCK_METHOD0(isRecordingMock, bool());
+
+    Response startRecording() {
+        return startRecordingMock();
+    }
+
+    Response stopRecording() {
+        return stopRecordingMock();
+    }
+
+    bool isRecording() {
+        return isRecordingMock();
+    }
+};
+
+class AlexaRecordControllerCapabilityAgentTest : public ::testing::Test {
+public:
+    /// SetUp before each test case.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Constructor.
+    AlexaRecordControllerCapabilityAgentTest() {
+    }
+
+protected:
+    /**
+     * Function to create AlexaRecordControllerCapabilityAgent based on the reportable flags
+     * and sets required ContextManager and AlexaRecordController mocks.
+     */
+    std::shared_ptr<AlexaRecordControllerCapabilityAgent> createCapabilityAgentAndSetExpects(bool retrievable);
+
+    /// A mock @c RecordControllerInterface object.
+    std::shared_ptr<StrictMock<MockRecordControllerHandlerInterface>> m_mockRecordController;
+
+    // a context manager
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>> m_mockContextManager;
+
+    /// The mock @c MessageSenderInterface.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>> m_mockResponseSender;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>
+        m_mockDirectiveHandlerResult;
+
+    /// The current recording state
+    bool m_isRecording;
+};
+
+void AlexaRecordControllerCapabilityAgentTest::SetUp() {
+    m_mockExceptionSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult =
+        make_unique<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>();
+    m_mockRecordController = std::make_shared<StrictMock<MockRecordControllerHandlerInterface>>();
+    m_mockContextManager = std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>>();
+    m_mockResponseSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>>();
+
+    auto timePoint = avsCommon::utils::timing::TimePoint();
+    timePoint.setTime_ISO_8601(TIME_OF_SAMPLE_TEST);
+
+    m_isRecording = false;
+}
+
+void AlexaRecordControllerCapabilityAgentTest::TearDown() {
+}
+
+std::shared_ptr<AlexaRecordControllerCapabilityAgent> AlexaRecordControllerCapabilityAgentTest::
+    createCapabilityAgentAndSetExpects(bool retrievable) {
+    // ContextManager Mocks
+    if (retrievable) {
+        // Expects a non-null CA reference during create.
+        EXPECT_CALL(*m_mockContextManager, addStateProvider(_, ::testing::NotNull()));
+
+        // Expects a null when CA is shutdown.
+        EXPECT_CALL(*m_mockContextManager, removeStateProvider(_));
+    }
+
+    auto recordControllerCapabilityAgent = AlexaRecordControllerCapabilityAgent::create(
+        TEST_ENDPOINT_ID,
+        m_mockRecordController,
+        m_mockContextManager,
+        m_mockResponseSender,
+        m_mockExceptionSender,
+        retrievable);
+    return recordControllerCapabilityAgent;
+}
+
+std::shared_ptr<AVSDirective> buildAVSDirective(std::string directiveName) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<avsCommon::avs::attachment::test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(
+        NAMESPACE, directiveName, MESSAGE_ID_TEST, DIALOG_REQUEST_ID_TEST, CORRELATION_TOKEN_TEST, INTERFACE_VERSION);
+    auto avsMessageEndpoint = AVSMessageEndpoint(TEST_ENDPOINT_ID);
+
+    return AVSDirective::create("", avsMessageHeader, "", attachmentManager, "", avsMessageEndpoint);
+}
+
+/// Test that create() returns a nullptr if called with invalid arguments.
+TEST_F(AlexaRecordControllerCapabilityAgentTest, test_givenInvalidParameters_create_shouldFail) {
+    ASSERT_THAT(
+        AlexaRecordControllerCapabilityAgent::create(
+            "", m_mockRecordController, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaRecordControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, nullptr, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaRecordControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockRecordController, nullptr, m_mockResponseSender, m_mockExceptionSender, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaRecordControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockRecordController, m_mockContextManager, nullptr, m_mockExceptionSender, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaRecordControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockRecordController, m_mockContextManager, m_mockResponseSender, nullptr, true),
+        IsNull());
+}
+
+/**
+ * Test successful handling of StartRecording directive.
+ */
+TEST_F(AlexaRecordControllerCapabilityAgentTest, test_startRecordingDirective_successCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockRecordController, startRecordingMock()).WillOnce(Invoke([]() {
+        return RecordControllerInterface::Response();
+    }));
+
+    EXPECT_CALL(*m_mockRecordController, isRecordingMock()).WillOnce(Invoke([]() { return true; }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto recordControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true);
+    ASSERT_THAT(recordControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_STARTRECORDING);
+    recordControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    recordControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    recordControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of StartRecording directive.
+ */
+TEST_F(AlexaRecordControllerCapabilityAgentTest, test_startRecordingDirective_errorCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockRecordController, startRecordingMock()).WillOnce(Invoke([]() {
+        return RecordControllerInterface::Response{
+            RecordControllerInterface::Response::Type::FAILED_ENDPOINT_UNREACHABLE, "TestEndpointNotReachable"};
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+
+    auto recordControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true);
+    ASSERT_THAT(recordControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_STARTRECORDING);
+    recordControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    recordControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    recordControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test successful handling of StopRecording directive.
+ */
+TEST_F(AlexaRecordControllerCapabilityAgentTest, test_stopRecordingDirective_successCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockRecordController, stopRecordingMock()).WillOnce(Invoke([]() {
+        return RecordControllerInterface::Response();
+    }));
+
+    EXPECT_CALL(*m_mockRecordController, isRecordingMock()).WillOnce(Invoke([]() { return false; }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto recordControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true);
+    ASSERT_THAT(recordControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_STOPRECORDING);
+    recordControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    recordControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    recordControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of StopRecording directive.
+ */
+TEST_F(AlexaRecordControllerCapabilityAgentTest, test_stopRecordingDirective_errorCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockRecordController, stopRecordingMock()).WillOnce(Invoke([]() {
+        return RecordControllerInterface::Response{
+            RecordControllerInterface::Response::Type::FAILED_ENDPOINT_UNREACHABLE, "TestEndpointNotReachable"};
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+
+    auto recordControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true);
+    ASSERT_THAT(recordControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_STOPRECORDING);
+    recordControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    recordControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    recordControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaRecordControllerCapabilityAgentTest, test_unknownDirective) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    auto recordControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true);
+    ASSERT_THAT(recordControllerCapabilityAgent, NotNull());
+
+    recordControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE), std::move(m_mockDirectiveHandlerResult));
+    recordControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    recordControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive with retrievable set.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaRecordControllerCapabilityAgentTest, test_unknownDirectiveWithProactivelyReportedAndRetrievableTrue) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    auto recordControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true);
+    ASSERT_THAT(recordControllerCapabilityAgent, NotNull());
+
+    recordControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE), std::move(m_mockDirectiveHandlerResult));
+    recordControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    recordControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive with retrievable set to false.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaRecordControllerCapabilityAgentTest, test_unknownDirectiveWithProactivelyReportedAndRetrievableFalse) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    auto recordControllerCapabilityAgent = createCapabilityAgentAndSetExpects(false);
+    ASSERT_THAT(recordControllerCapabilityAgent, NotNull());
+
+    recordControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE), std::move(m_mockDirectiveHandlerResult));
+    recordControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    recordControllerCapabilityAgent->shutdown();
+}
+
+}  // namespace test
+}  // namespace alexaRecordController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaRecordController/AlexaRecordController/test/CMakeLists.txt b/capabilities/AlexaRecordController/AlexaRecordController/test/CMakeLists.txt
new file mode 100644
index 0000000000..b32718687d
--- /dev/null
+++ b/capabilities/AlexaRecordController/AlexaRecordController/test/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+    "${acsdkAlexaRecordController_INCLUDE_DIR}"
+    "${acsdkAlexaRecordController_SOURCE_DIR}/privateInclude"
+    "${acsdkAlexaRecordControllerInterfaces_SOURCE_DIR}/include"
+    "${ASDK_INCLUDE_DIRS}")
+
+set(LIBS
+    "AttachmentCommonTestLib"
+    "acsdkAlexaRecordController"
+    "SDKInterfacesTests")
+
+discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
diff --git a/capabilities/AlexaRecordController/AlexaRecordControllerInterfaces/CMakeLists.txt b/capabilities/AlexaRecordController/AlexaRecordControllerInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..d3e83e8319
--- /dev/null
+++ b/capabilities/AlexaRecordController/AlexaRecordControllerInterfaces/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.1)
+project(acsdkAlexaRecordControllerInterfaces LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_library(acsdkAlexaRecordControllerInterfaces INTERFACE)
+
+target_include_directories(acsdkAlexaRecordControllerInterfaces INTERFACE
+        "${acsdkAlexaRecordControllerInterfaces_SOURCE_DIR}/include")
+
+# install interface
+asdk_install_interface()
diff --git a/capabilities/AlexaRecordController/AlexaRecordControllerInterfaces/include/acsdk/AlexaRecordControllerInterfaces/RecordControllerInterface.h b/capabilities/AlexaRecordController/AlexaRecordControllerInterfaces/include/acsdk/AlexaRecordControllerInterfaces/RecordControllerInterface.h
new file mode 100644
index 0000000000..1d2a581047
--- /dev/null
+++ b/capabilities/AlexaRecordController/AlexaRecordControllerInterfaces/include/acsdk/AlexaRecordControllerInterfaces/RecordControllerInterface.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXARECORDCONTROLLERINTERFACES_RECORDCONTROLLERINTERFACE_H_
+#define ACSDK_ALEXARECORDCONTROLLERINTERFACES_RECORDCONTROLLERINTERFACE_H_
+
+#include <string>
+
+namespace alexaClientSDK {
+namespace alexaRecordControllerInterfaces {
+
+/**
+ * The RecordControllerInterface carries out record controller actions such as start recording and stop recording.
+ *
+ * @note Implementations of this interface must be thread-safe.
+ */
+class RecordControllerInterface {
+public:
+    /**
+     * Utility object used for reporting RecordController handler response.
+     */
+    struct Response {
+        /**
+         * Enum for the different response types understood by the RecordController capability agent.
+         */
+        enum class Type {
+            /// RecordController Request was handled successfully.
+            SUCCESS,
+            /// The number of allowed failed attempts to perform a RecordController action has been exceeded.
+            FAILED_TOO_MANY_FAILED_ATTEMPTS,
+            /// Indicates an additional confirmation must occur before the requested RecordController action can be
+            /// completed.
+            FAILED_CONFIRMATION_REQUIRED,
+            /// Indicates the record operation failed due to restrictions on the content.
+            FAILED_CONTENT_NOT_RECORDABLE,
+            /// Indicates that a recording request failed because the DVR storage is full.
+            FAILED_STORAGE_FULL,
+            /// Indicates that the endpoint is unreachable or offline.
+            FAILED_ENDPOINT_UNREACHABLE,
+            /// Indicates that an error occurred that can't be described by one of the other error types.
+            FAILED_INTERNAL_ERROR
+        };
+
+        /**
+         * Default Constructor, set the response type to success.
+         */
+        Response() : type{Type::SUCCESS} {};
+
+        /**
+         * Constructor.
+         * @param type The response type @c Type
+         * @param errorMessage The error message if @c Type is other than SUCCESS.
+         *
+         */
+        Response(Type type, std::string errorMessage) : type{type}, errorMessage{std::move(errorMessage)} {};
+
+        /// Response type for RecordController handler responses.
+        Type type;
+
+        /// The error message for logging if the @c Type is anything other than SUCCESS, for the
+        /// purposes of aiding debugging.
+        std::string errorMessage;
+    };
+
+    /**
+     * Virtual destructor to assure proper cleanup of derived types.
+     */
+    virtual ~RecordControllerInterface() = default;
+
+    /**
+     * Start the recording of the content that is currently playing.
+     *
+     * @return Whether the Recording was successfully started, or if an error was encountered in the process. @c
+     * RecordControllerInterface::Response.type should be set to SUCCESS if no errors were encountered. Otherwise, @c
+     * RecordControllerInterface::Response.type should contain the corresponding error code along with a log message in
+     * @c RecordControllerInterface::Response.message.
+     */
+    virtual Response startRecording() = 0;
+
+    /**
+     * Stop the current recording.
+     *
+     * @return Whether the Recording was successfully stopped, or if an error was encountered in the process. @c
+     * RecordControllerInterface::Response.type should be set to SUCCESS if no errors were encountered. Otherwise, @c
+     * RecordControllerInterface::Response.type should contain the corresponding error code along with a log message in
+     * @c RecordControllerInterface::Response.message.
+     */
+    virtual Response stopRecording() = 0;
+
+    /**
+     * Get the current recording state information of the endpoint.
+     *
+     * @return whether the endpoint is currently recording.
+     */
+    virtual bool isRecording() = 0;
+};
+
+}  // namespace alexaRecordControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  //  ACSDK_ALEXARECORDCONTROLLERINTERFACES_RECORDCONTROLLERINTERFACE_H_
diff --git a/capabilities/AlexaRecordController/CMakeLists.txt b/capabilities/AlexaRecordController/CMakeLists.txt
new file mode 100644
index 0000000000..d10aac5751
--- /dev/null
+++ b/capabilities/AlexaRecordController/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaRecordController LANGUAGES CXX)
+
+add_subdirectory("AlexaRecordController")
+add_subdirectory("AlexaRecordControllerInterfaces")
\ No newline at end of file
diff --git a/capabilities/AlexaRemoteVideoPlayer/.clang-format b/capabilities/AlexaRemoteVideoPlayer/.clang-format
new file mode 100644
index 0000000000..382ffea861
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/.clang-format
@@ -0,0 +1,101 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
diff --git a/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/CMakeLists.txt b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/CMakeLists.txt
new file mode 100644
index 0000000000..dfa5e0d85c
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaRemoteVideoPlayer LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
\ No newline at end of file
diff --git a/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/include/acsdk/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerFactory.h b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/include/acsdk/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerFactory.h
new file mode 100644
index 0000000000..a2aa622d6b
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/include/acsdk/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerFactory.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_ALEXAREMOTEVIDEOPLAYER_ALEXAREMOTEVIDEOPLAYERFACTORY_H_
+#define ACSDK_ALEXAREMOTEVIDEOPLAYER_ALEXAREMOTEVIDEOPLAYERFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/AlexaRemoteVideoPlayerInterfaces/RemoteVideoPlayerInterface.h>
+
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/DirectiveSequencerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace alexaRemoteVideoPlayer {
+
+/**
+ * This factory can be used to create a AlexaRemoteVideoPlayerFactory object which could be a parameter for Capability
+ * Agent construction.
+ */
+class AlexaRemoteVideoPlayerFactory {
+    /**
+     * This object contains the interfaces to interact with the AlexaRemoteVideoPlayer Capability Agent.
+     */
+    struct RemoteVideoPlayerCapabilityAgentData {
+        /// An interface used to handle Alexa.RemoteVideoPlayer directives.
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::DirectiveHandlerInterface> directiveHandler;
+        /// An interface that provides the configurations of the capabilities being implemented by this capability
+        /// agent.
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::CapabilityConfigurationInterface>
+            capabilityConfigurationInterface;
+        /// The object responsible for cleaning up this capability agent's objects during shutdown.
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+public:
+    /**
+     * Creates a new RemoteVideoPlayer capability agent configuration.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param remoteVideoPlayer An interface that this object will use to perform the remote video player operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @return A @c RemoteVideoPlayerCapabilityAgentData object if successful,  otherwise an @c Optional object with no
+     * valid value.
+     */
+    static avsCommon::utils::Optional<RemoteVideoPlayerCapabilityAgentData> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerInterface>& remoteVideoPlayer,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender);
+};
+
+}  // namespace alexaRemoteVideoPlayer
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAREMOTEVIDEOPLAYER_ALEXAREMOTEVIDEOPLAYERFACTORY_H_
\ No newline at end of file
diff --git a/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/privateInclude/acsdk/AlexaRemoteVideoPlayer/private/AlexaRemoteVideoPlayerCapabilityAgent.h b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/privateInclude/acsdk/AlexaRemoteVideoPlayer/private/AlexaRemoteVideoPlayerCapabilityAgent.h
new file mode 100644
index 0000000000..482cc0c894
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/privateInclude/acsdk/AlexaRemoteVideoPlayer/private/AlexaRemoteVideoPlayerCapabilityAgent.h
@@ -0,0 +1,218 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAREMOTEVIDEOPLAYER_PRIVATE_ALEXAREMOTEVIDEOPLAYERCAPABILITYAGENT_H_
+#define ACSDK_ALEXAREMOTEVIDEOPLAYER_PRIVATE_ALEXAREMOTEVIDEOPLAYERCAPABILITYAGENT_H_
+
+#include <memory>
+#include <string>
+#include <unordered_set>
+
+#include <rapidjson/document.h>
+
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/AVS/CapabilityState.h>
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+#include <acsdk/AlexaRemoteVideoPlayerInterfaces/RemoteVideoPlayerInterface.h>
+
+namespace alexaClientSDK {
+namespace alexaRemoteVideoPlayer {
+
+/**
+ * The @c AlexaRemoteVideoPlayerCapabilityAgent is responsible for handling Alexa.RemoteVideoPlayer directives and
+ * calls the @c RemoteVideoPlayerInterface APIs.
+ *
+ * This class implements a @c CapabilityAgent that handles the @c Alexa.RemoteVideoPlayer Interface.
+ */
+class AlexaRemoteVideoPlayerCapabilityAgent
+        : public avsCommon::avs::CapabilityAgent
+        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<AlexaRemoteVideoPlayerCapabilityAgent> {
+public:
+    /// Alias to improve readability.
+    using EndpointIdentifier = alexaClientSDK::avsCommon::sdkInterfaces::endpoints::EndpointIdentifier;
+
+    /**
+     * Create an instance of @c AlexaRemoteVideoPlayerCapabilityAgent.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param remoteVideoPlayer An interface that this object will use to perform the remote video player operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the reponse to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @return @c nullptr if the inputs are invalid, else a new instance of @c AlexaRemoteVideoPlayerCapabilityAgent.
+     */
+    static std::shared_ptr<AlexaRemoteVideoPlayerCapabilityAgent> create(
+        EndpointIdentifier endpointId,
+        std::shared_ptr<alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerInterface> remoteVideoPlayer,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender);
+
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<alexaClientSDK::avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
+    alexaClientSDK::avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>>
+    getCapabilityConfigurations() override;
+    /// @}
+
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param remoteVideoPlayer An interface that this object will use to perform the remote video player operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the reponse to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     */
+    AlexaRemoteVideoPlayerCapabilityAgent(
+        EndpointIdentifier endpointId,
+        std::shared_ptr<alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerInterface> remoteVideoPlayer,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender);
+
+    /**
+     * Remove a directive from the map of message IDs to DirectiveInfo instances.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
+     */
+    void removeDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Send the handling completed notification and clean up the resources.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Called on executor to handle any unknown directives received.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param type The @c ExceptionErrorType.
+     */
+    void executeUnknownDirective(
+        std::shared_ptr<DirectiveInfo> info,
+        alexaClientSDK::avsCommon::avs::ExceptionErrorType type);
+
+    /**
+     * Call methods of @c AlexaInterfaceMessageSenderInterface based the endpoint's response for a remote video player
+     * method call.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param result This contains the endpoint's response for a remote video player call.
+     * @param playbackState The current playback state to be reported in the Playback State Reporter response.
+     */
+    void executeSendResponseEvent(
+        const std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> info,
+        const alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerInterface::Response& result,
+        const std::string& playbackState);
+
+    /**
+     * Send Alexa interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaErrorResponseType Alexa interface error response type.
+     * @param responseMessage Alexa interface error response message.
+     */
+    void sendAlexaErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+        const std::string& responseMessage);
+
+    /**
+     * Send Alexa.Video interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaVideoErrorResponseType Alexa.Video interface error response type.
+     * @param responseMessage Alexa.Video interface error response message.
+     */
+    void sendAlexaVideoErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType
+            alexaVideoErrorResponseType,
+        const std::string& responseMessage);
+
+    /**
+     * Builds the configuration json required for the discovery.
+     *
+     * @param configuration The remote video player configuration object containing the supported directive types,
+     * entity types and catalog information.
+     * @return The json string corresponding to the configuration.
+     */
+    std::string buildRemoteVideoPlayerConfigurationJson(
+        const alexaRemoteVideoPlayerInterfaces::Configuration& configuration);
+
+    /*
+     * Parse the payload received with Alexa.RemoteVideoPlayer directives.
+     *
+     * @param payload String json payload to be parsed.
+     * @return unique pointer to @c RemoteVideoPlayerRequest if the payload is parseable, else nullptr
+     */
+    std::unique_ptr<alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerRequest> parseDirectivePayload(
+        const std::string& payload);
+
+    /*
+     * Parse a video entity object.
+     * @param entityJson String json entity to be parsed
+     * @param [out] remoteVideoPlayerRequest Context to be loaded with the video entity object.
+     * @return true if successful.
+     */
+    bool parseEntityJson(
+        const rapidjson::Value& entityJson,
+        alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerRequest& remoteVideoPlayerRequest);
+
+    /// Endpoint the capability agent associated to.
+    EndpointIdentifier m_endpointId;
+
+    /// Reference to @c RemoteVideoPlayerInterface
+    std::shared_ptr<alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerInterface> m_remoteVideoPlayer;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The @c AlexaInterfaceMessageSenderInterface used to send event messages.
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> m_responseSender;
+
+    /// This is the worker thread for the @c AlexaRemoteVideoPlayerCapabilityAgent.
+    alexaClientSDK::avsCommon::utils::threading::Executor m_executor;
+};
+
+}  // namespace alexaRemoteVideoPlayer
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAREMOTEVIDEOPLAYER_PRIVATE_ALEXAREMOTEVIDEOPLAYERCAPABILITYAGENT_H_
\ No newline at end of file
diff --git a/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/src/AlexaRemoteVideoPlayerCapabilityAgent.cpp b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/src/AlexaRemoteVideoPlayerCapabilityAgent.cpp
new file mode 100644
index 0000000000..f28073cd41
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/src/AlexaRemoteVideoPlayerCapabilityAgent.cpp
@@ -0,0 +1,758 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/AlexaRemoteVideoPlayer/private/AlexaRemoteVideoPlayerCapabilityAgent.h"
+
+#include <AVSCommon/Utils/JSON/JSONGenerator.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Timing/TimeUtils.h>
+
+namespace alexaClientSDK {
+namespace alexaRemoteVideoPlayer {
+
+using namespace acsdkAlexaVideoCommon;
+using namespace alexaClientSDK::avsCommon::avs;
+using namespace alexaClientSDK::avsCommon;
+using namespace alexaClientSDK::avsCommon::sdkInterfaces;
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::configuration;
+using namespace avsCommon::utils::timing;
+
+using namespace alexaRemoteVideoPlayerInterfaces;
+
+/// String to identify log entries originating from this file.
+#define TAG "AlexaRemoteVideoPlayerCapabilityAgent"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+/// The namespace for this capability agent.
+static const std::string NAMESPACE{"Alexa.RemoteVideoPlayer"};
+
+/// The namespace for Alexa.Video.ErrorResponse.
+static const std::string NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE{"Alexa.Video"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3.1"};
+
+/// The name for SearchAndPlay directive
+static const std::string NAME_SEARCHANDPLAY{"SearchAndPlay"};
+
+/// The name for SearchAndDisplayResults directive
+static const std::string NAME_SEARCHANDDISPLAYRESULTS{"SearchAndDisplayResults"};
+
+/// Name of the @c ConfigurationNode for RemoteVideoController.
+static const std::string REMOTE_VIDEO_PLAYER_ROOT_KEY{"remoteVideoPlayer"};
+
+/// The namespace for this capability agent's response event.
+static const std::string NAMESPACE_PLAYBACK_STATE_REPORTER{"Alexa.PlaybackStateReporter"};
+
+/// Property name for Alexa.PlaybackStateReporter
+static const std::string PLAYBACK_STATE_REPORTER_PROPERTY{"playbackState"};
+
+/// PLAYING State for Alexa.PlaybackStateReporter
+static const std::string PLAYBACK_STATE_REPORTER_PLAYING_STATE{"PLAYING"};
+
+/// STOPPED State for Alexa.PlaybackStateReporter
+static const std::string PLAYBACK_STATE_REPORTER_STOPPED_STATE{"STOPPED"};
+
+/// The configuration key
+static const std::string CAPABILITY_CONFIGURATION_KEY{"configurations"};
+
+/// Operations key
+static const std::string CONFIGURATION_OPERATIONS_KEY{"operations"};
+
+/// EntityTypes key
+static const std::string CONFIGURATION_ENTITY_TYPES_KEY{"entityTypes"};
+
+/// Catalogs key
+static const std::string CONFIGURATION_CATALOGS_KEY{"catalogs"};
+
+/// Catalogs Type key
+static const std::string CONFIGURATION_CATALOGS_TYPE_KEY{"type"};
+
+/// Catalogs SourceId key
+static const std::string CONFIGURATION_CATALOGS_SOURCE_ID_KEY{"sourceId"};
+
+/// Json key for parsing entities.
+static const std::string ENTITIES("entities");
+
+/// Json key for parsing search text.
+static const std::string SEARCHTEXT("searchText");
+
+/// Json key for parsing transcribed searchText.
+static const std::string SEARCHTEXT_TRANSCRIBED("transcribed");
+
+/// Json key for parsing timeWindow.
+static const std::string TIME_WINDOW("timeWindow");
+
+/// Json key for parsing start.
+static const std::string START("start");
+
+/// Json key for parsing end.
+static const std::string END("end");
+
+/// Helper function to convert a directive type to its corresponding string
+static std::string convertOperationToString(const Configuration::SupportedOperations& directive) {
+    switch (directive) {
+        case Configuration::SupportedOperations::PLAY_VIDEO:
+            return "SearchAndPlay";
+        case Configuration::SupportedOperations::DISPLAY_SEARCH_RESULTS:
+            return "SearchAndDisplayResults";
+    }
+    return "";
+}
+
+/// Helper function to convert a catalog type to its corresponding string
+static std::string convertCatalogTypeToString(const Configuration::Catalog::Type& type) {
+    switch (type) {
+        case Configuration::Catalog::Type::PRIVATE_CATALOG:
+            return "VIDEO_INGESTION_IDENTIFIER";
+        case Configuration::Catalog::Type::PUBLIC_CATALOG:
+            return "VIDEO_PUBLIC_CATALOG_IDENTIFIER";
+    }
+    return "";
+}
+
+std::shared_ptr<AlexaRemoteVideoPlayerCapabilityAgent> AlexaRemoteVideoPlayerCapabilityAgent::create(
+    EndpointIdentifier endpointId,
+    std::shared_ptr<RemoteVideoPlayerInterface> remoteVideoPlayer,
+    std::shared_ptr<ContextManagerInterface> contextManager,
+    std::shared_ptr<AlexaInterfaceMessageSenderInterface> responseSender,
+    std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionSender) {
+    if (endpointId.empty()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "emptyEndpointId"));
+        return nullptr;
+    }
+    if (!remoteVideoPlayer) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullRemoteVideoPlayer"));
+        return nullptr;
+    }
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManager"));
+        return nullptr;
+    }
+    if (!responseSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullResponseSender"));
+        return nullptr;
+    }
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    auto remoteVideoPlayerCapabilityAgent =
+        std::shared_ptr<AlexaRemoteVideoPlayerCapabilityAgent>(new AlexaRemoteVideoPlayerCapabilityAgent(
+            endpointId,
+            std::move(remoteVideoPlayer),
+            std::move(contextManager),
+            std::move(responseSender),
+            std::move(exceptionSender)));
+
+    if (!remoteVideoPlayerCapabilityAgent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "instantiationFailed"));
+        return nullptr;
+    }
+
+    return remoteVideoPlayerCapabilityAgent;
+}
+
+AlexaRemoteVideoPlayerCapabilityAgent::AlexaRemoteVideoPlayerCapabilityAgent(
+    EndpointIdentifier endpointId,
+    std::shared_ptr<RemoteVideoPlayerInterface> remoteVideoPlayer,
+    std::shared_ptr<ContextManagerInterface> contextManager,
+    std::shared_ptr<AlexaInterfaceMessageSenderInterface> responseSender,
+    std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionSender) :
+        CapabilityAgent{NAMESPACE, exceptionSender},
+        RequiresShutdown{"AlexaRemoteVideoPlayerCapabilityAgent"},
+        m_endpointId{std::move(endpointId)},
+        m_remoteVideoPlayer{std::move(remoteVideoPlayer)},
+        m_contextManager{std::move(contextManager)},
+        m_responseSender{std::move(responseSender)} {
+}
+
+void AlexaRemoteVideoPlayerCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!directive) {
+        ACSDK_ERROR(LX("handleDirectiveImmediatelyFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+}
+
+void AlexaRemoteVideoPlayerCapabilityAgent::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX("preHandleDirective"));
+    // do nothing.
+}
+
+void AlexaRemoteVideoPlayerCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+
+    m_executor.submit([this, info] {
+        ACSDK_DEBUG9(LX("handleDirectiveInExecutor"));
+        const std::string directiveName = info->directive->getName();
+        if (!info->directive->getEndpoint().hasValue() ||
+            (info->directive->getEndpoint().value().endpointId != m_endpointId)) {
+            executeUnknownDirective(info, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        auto payload = info->directive->getPayload();
+        std::unique_ptr<RemoteVideoPlayerRequest> remoteVideoPlayerRequestContext = parseDirectivePayload(payload);
+        if (!remoteVideoPlayerRequestContext) {
+            ACSDK_ERROR(
+                LX("handleDirectiveFailed").d("reason", "unableToParseDirectivePayload").sensitive("payload", payload));
+            executeUnknownDirective(info, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        RemoteVideoPlayerInterface::Response result;
+        if (directiveName == NAME_SEARCHANDPLAY) {
+            result = m_remoteVideoPlayer->playVideo(std::move(remoteVideoPlayerRequestContext));
+            executeSetHandlingCompleted(info);
+            executeSendResponseEvent(info, result, PLAYBACK_STATE_REPORTER_PLAYING_STATE);
+        } else if (directiveName == NAME_SEARCHANDDISPLAYRESULTS) {
+            result = m_remoteVideoPlayer->displaySearchResults(std::move(remoteVideoPlayerRequestContext));
+            executeSetHandlingCompleted(info);
+            executeSendResponseEvent(info, result, PLAYBACK_STATE_REPORTER_STOPPED_STATE);
+        } else {
+            ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "unexpectedDirective").d("name", directiveName));
+            executeUnknownDirective(info, ExceptionErrorType::UNSUPPORTED_OPERATION);
+            return;
+        }
+    });
+}
+
+void AlexaRemoteVideoPlayerCapabilityAgent::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("cancelDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    if (!info->directive->getEndpoint().hasValue() ||
+        info->directive->getEndpoint().value().endpointId != m_endpointId) {
+        ACSDK_WARN(LX("cancelDirective").d("reason", "notExpectedEndpointId"));
+    }
+    removeDirective(info);
+}
+
+DirectiveHandlerConfiguration AlexaRemoteVideoPlayerCapabilityAgent::getConfiguration() const {
+    ACSDK_DEBUG9(LX(__func__));
+    DirectiveHandlerConfiguration configuration;
+    auto neitherNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUMS_NONE, false);
+    configuration[{NAMESPACE, NAME_SEARCHANDPLAY, m_endpointId}] = neitherNonBlockingPolicy;
+    configuration[{NAMESPACE, NAME_SEARCHANDDISPLAYRESULTS, m_endpointId}] = neitherNonBlockingPolicy;
+
+    return configuration;
+}
+
+std::unordered_set<std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>>
+AlexaRemoteVideoPlayerCapabilityAgent::getCapabilityConfigurations() {
+    auto additionalConfigurations = CapabilityConfiguration::AdditionalConfigurations();
+    auto config = m_remoteVideoPlayer->getConfiguration();
+    auto configurationJson = buildRemoteVideoPlayerConfigurationJson(config);
+    if (!configurationJson.empty()) {
+        additionalConfigurations[CAPABILITY_CONFIGURATION_KEY] = configurationJson;
+    }
+    CapabilityConfiguration configuration{CapabilityConfiguration::ALEXA_INTERFACE_TYPE,
+                                          NAMESPACE,
+                                          INTERFACE_VERSION,
+                                          Optional<std::string>(),  // instance
+                                          Optional<CapabilityConfiguration::Properties>(),
+                                          additionalConfigurations};
+    return {std::make_shared<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>(configuration)};
+}
+
+void AlexaRemoteVideoPlayerCapabilityAgent::doShutdown() {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!m_executor.isShutdown()) {
+        m_executor.shutdown();
+    }
+
+    m_remoteVideoPlayer.reset();
+    m_responseSender.reset();
+    m_contextManager.reset();
+}
+
+void AlexaRemoteVideoPlayerCapabilityAgent::removeDirective(std::shared_ptr<DirectiveInfo> info) {
+    if (info->directive && info->result) {
+        CapabilityAgent::removeDirective(info->directive->getMessageId());
+    }
+}
+
+void AlexaRemoteVideoPlayerCapabilityAgent::executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info) {
+    if (info && info->result) {
+        info->result->setCompleted();
+    }
+    removeDirective(info);
+}
+
+void AlexaRemoteVideoPlayerCapabilityAgent::executeUnknownDirective(
+    std::shared_ptr<DirectiveInfo> info,
+    ExceptionErrorType type) {
+    ACSDK_ERROR(LX("executeUnknownDirectiveFailed")
+                    .d("reason", "unknownDirective")
+                    .d("namespace", info->directive->getNamespace())
+                    .d("name", info->directive->getName()));
+
+    const std::string exceptionMessage =
+        "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
+
+    sendExceptionEncounteredAndReportFailed(info, exceptionMessage, type);
+}
+
+void AlexaRemoteVideoPlayerCapabilityAgent::executeSendResponseEvent(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    const RemoteVideoPlayerInterface::Response& result,
+    const std::string& playbackState) {
+    switch (result.type) {
+        case RemoteVideoPlayerInterface::Response::Type::SUCCESS: {
+            std::string responsePayload = R"({"state":")" + playbackState + R"("})";
+            m_responseSender->sendResponseEvent(
+                info->directive->getInstance(),
+                info->directive->getCorrelationToken(),
+                AVSMessageEndpoint(m_endpointId),
+                NAMESPACE_PLAYBACK_STATE_REPORTER,
+                PLAYBACK_STATE_REPORTER_PROPERTY,
+                responsePayload);
+            break;
+        }
+        case RemoteVideoPlayerInterface::Response::Type::FAILED_TOO_MANY_FAILED_ATTEMPTS:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+        case RemoteVideoPlayerInterface::Response::Type::FAILED_ENDPOINT_UNREACHABLE:
+            sendAlexaErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::ErrorResponseType::ENDPOINT_UNREACHABLE,
+                result.errorMessage);
+            break;
+        case RemoteVideoPlayerInterface::Response::Type::FAILED_NOT_SUBSCRIBED:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::NOT_SUBSCRIBED,
+                result.errorMessage);
+            break;
+        case RemoteVideoPlayerInterface::Response::Type::FAILED_INTERNAL_ERROR:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+    }
+}
+
+void AlexaRemoteVideoPlayerCapabilityAgent::sendAlexaErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+    const std::string& responseMessage) {
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        alexaErrorResponseType,
+        responseMessage);
+}
+
+void AlexaRemoteVideoPlayerCapabilityAgent::sendAlexaVideoErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType alexaVideoErrorResponseType,
+    const std::string& responseMessage) {
+    std::string payload =
+        R"({"type":")" +
+        AlexaInterfaceMessageSenderInterface::alexaVideoErrorResponseToString(alexaVideoErrorResponseType) +
+        R"(", "message":")" + responseMessage + R"("})";
+
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE,
+        payload);
+}
+
+/**
+ * Helper function to convert the supported directives to strings and add it to the Configuration json.
+ *
+ * @param @c operations The set of supported directives.
+ * @param @c jsonGenerator JsonGenerator object used to build the json string
+ */
+static void addOperationsArrayToConfiguration(
+    const std::set<Configuration::SupportedOperations>& operations,
+    alexaClientSDK::avsCommon::utils::json::JsonGenerator* jsonGenerator) {
+    std::set<std::string> operationsArray;
+    for (const auto& operation : operations) {
+        operationsArray.insert(convertOperationToString(operation));
+    }
+    jsonGenerator->addStringArray(CONFIGURATION_OPERATIONS_KEY, operationsArray);
+}
+
+/**
+ * Helper function to convert the supported entity types to strings and add it to the Configuration json.
+ *
+ * @param @c entityTypes The set of supported entity types.
+ * @param @c jsonGenerator JsonGenerator object used to build the json string
+ */
+static void addEntityTypesArrayToConfiguration(
+    const std::set<acsdkAlexaVideoCommon::VideoEntity::EntityType>& entityTypes,
+    alexaClientSDK::avsCommon::utils::json::JsonGenerator* jsonGenerator) {
+    std::set<std::string> entityTypesArray;
+    for (const auto& entityType : entityTypes) {
+        entityTypesArray.insert(VideoEntity::convertEntityTypeToString(entityType));
+    }
+    jsonGenerator->addStringArray(CONFIGURATION_ENTITY_TYPES_KEY, entityTypesArray);
+}
+
+/**
+ * Helper function to convert the supported catalog types to strings and add it to the Configuration json.
+ *
+ * @param @c catalogs The set of supported catalogs.
+ * @param @c jsonGenerator JsonGenerator object used to build the json string
+ */
+static void addCatalogsArraytoConfiguration(
+    const std::list<Configuration::Catalog>& catalogs,
+    alexaClientSDK::avsCommon::utils::json::JsonGenerator* jsonGenerator) {
+    jsonGenerator->startArray(CONFIGURATION_CATALOGS_KEY);
+    for (const auto& catalog : catalogs) {
+        jsonGenerator->startArrayElement();
+        jsonGenerator->addMember(CONFIGURATION_CATALOGS_TYPE_KEY, convertCatalogTypeToString(catalog.type));
+        jsonGenerator->addMember(CONFIGURATION_CATALOGS_SOURCE_ID_KEY, catalog.sourceId);
+        jsonGenerator->finishArrayElement();
+    }
+    jsonGenerator->finishArray();
+}
+
+std::string AlexaRemoteVideoPlayerCapabilityAgent::buildRemoteVideoPlayerConfigurationJson(
+    const Configuration& configuration) {
+    alexaClientSDK::avsCommon::utils::json::JsonGenerator jsonGenerator;
+
+    if (configuration.catalogs.empty()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "EmptyCatalog"));
+        return "";
+    }
+    addCatalogsArraytoConfiguration(configuration.catalogs, &jsonGenerator);
+
+    if (!configuration.operations.hasValue()) {
+        ACSDK_DEBUG9(LX(__func__).m("EmptyOperationsArray"));
+    } else {
+        addOperationsArrayToConfiguration(configuration.operations.value(), &jsonGenerator);
+    }
+
+    if (!configuration.entityTypes.hasValue()) {
+        ACSDK_DEBUG9(LX(__func__).m("EmptyEntityTypesArray"));
+    } else {
+        addEntityTypesArrayToConfiguration(configuration.entityTypes.value(), &jsonGenerator);
+    }
+
+    ACSDK_DEBUG9(LX(__func__).sensitive("configuration", jsonGenerator.toString()));
+    return jsonGenerator.toString();
+}
+
+std::unique_ptr<RemoteVideoPlayerRequest> AlexaRemoteVideoPlayerCapabilityAgent::parseDirectivePayload(
+    const std::string& payload) {
+    ACSDK_DEBUG9(LX(__func__));
+    rapidjson::Document jsonPayload;
+    if (jsonPayload.Parse(payload.c_str()).HasParseError()) {
+        ACSDK_ERROR(LX("parseDirectivePayload").d("reason", "unableToParseJson"));
+        return nullptr;
+    }
+
+    auto remoteVideoPlayerRequest = std::unique_ptr<RemoteVideoPlayerRequest>(new RemoteVideoPlayerRequest());
+    const auto& entities = jsonPayload[ENTITIES];
+    if (!entities.IsArray()) {
+        ACSDK_ERROR(LX("parseDirectivePayload").d("reason", "unableToParseEntities"));
+        return nullptr;
+    }
+
+    for (auto& entityJson : entities.GetArray()) {
+        if (!entityJson.IsObject()) {
+            continue;
+        }
+
+        if (!parseEntityJson(entityJson, *remoteVideoPlayerRequest)) {
+            ACSDK_ERROR(LX("parseDirectivePayload").d("reason", "unableToParseEntity"));
+        }
+    }
+
+    if (jsonPayload.HasMember(SEARCHTEXT) && jsonPayload[SEARCHTEXT].IsObject()) {
+        const auto& searchTextJson = jsonPayload[SEARCHTEXT];
+        if (searchTextJson.HasMember(SEARCHTEXT_TRANSCRIBED) && searchTextJson[SEARCHTEXT_TRANSCRIBED].IsString()) {
+            remoteVideoPlayerRequest->searchTextTranscribed.set(searchTextJson[SEARCHTEXT_TRANSCRIBED].GetString());
+        }
+    }
+
+    if (jsonPayload.HasMember(TIME_WINDOW) && jsonPayload[TIME_WINDOW].IsObject()) {
+        TimeUtils timeUtils;
+        const auto& timeWindowJson = jsonPayload[TIME_WINDOW];
+
+        std::chrono::time_point<std::chrono::system_clock> startTime, endTime;
+        if (!timeUtils.convert8601TimeStringToUtcTimePoint(timeWindowJson[START].GetString(), &startTime)) {
+            ACSDK_ERROR(LX("parseDirectivePayload").d("reason", "unableToParseTimeWindow"));
+            return nullptr;
+        }
+        if (!timeUtils.convert8601TimeStringToUtcTimePoint(timeWindowJson[END].GetString(), &endTime)) {
+            ACSDK_ERROR(LX("parseDirectivePayload").d("reason", "unableToParseTimeWindow"));
+            return nullptr;
+        }
+
+        RemoteVideoPlayerRequest::TimeWindow timeWindow;
+        timeWindow.startTime = startTime;
+        timeWindow.endTime = endTime;
+        remoteVideoPlayerRequest->timeWindow.set(timeWindow);
+    }
+
+    return remoteVideoPlayerRequest;
+}
+
+bool AlexaRemoteVideoPlayerCapabilityAgent::parseEntityJson(
+    const rapidjson::Value& entityJson,
+    RemoteVideoPlayerRequest& remoteVideoPlayerRequest) {
+    ACSDK_DEBUG9(LX(__func__));
+    auto retVal = false;
+
+    do {
+        VideoEntity videoEntity;
+        VideoEntity::EntityType entityType;
+        if (!videoEntity.parseVideoEntityType(entityJson, entityType)) {
+            ACSDK_ERROR(LX(__func__).d("reason", "unableToParseEntityType"));
+            break;
+        }
+
+        switch (entityType) {
+            case VideoEntity::EntityType::MEDIA_TYPE: {
+                VideoEntity::Media media(VideoEntity::Media::Type::MOVIE);
+                if (!videoEntity.parseMediaEntity(entityJson, media)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseMedia"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.mediaList.emplace_back(media);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::ACTOR: {
+                VideoEntity::Actor actor;
+                if (!videoEntity.parseActorEntity(entityJson, actor)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseActor"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.actorList.emplace_back(actor);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::APP: {
+                VideoEntity::App app;
+                if (!videoEntity.parseAppEntity(entityJson, app)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseApp"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.appList.emplace_back(app);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::CHANNEL: {
+                VideoEntity::Channel channel(0);
+                if (!videoEntity.parseChannelEntity(entityJson, channel)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseChannel"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.channelList.emplace_back(channel);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::CHARACTER: {
+                VideoEntity::Character character;
+                if (!videoEntity.parseCharacterEntity(entityJson, character)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseCharacter"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.characterList.emplace_back(character);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::DIRECTOR: {
+                retVal = true;
+                VideoEntity::Director director;
+                if (!videoEntity.parseDirectorEntity(entityJson, director)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseDirector"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.directorList.emplace_back(director);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::EPISODE: {
+                VideoEntity::Episode episode;
+                if (!videoEntity.parseEpisodeEntity(entityJson, episode)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseEpisode"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.episodeList.emplace_back(episode);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::EVENT: {
+                VideoEntity::Event event;
+                if (!videoEntity.parseEventEntity(entityJson, event)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseEvent"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.eventList.emplace_back(event);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::FRANCHISE: {
+                VideoEntity::Franchise franchise;
+                if (!videoEntity.parseFranchiseEntity(entityJson, franchise)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseFranchise"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.franchiseList.emplace_back(franchise);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::GENRE: {
+                VideoEntity::Genre genre;
+                if (!videoEntity.parseGenreEntity(entityJson, genre)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseGenre"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.genreList.emplace_back(genre);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::LEAGUE: {
+                VideoEntity::League league;
+                if (!videoEntity.parseLeagueEntity(entityJson, league)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseLeague"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.leagueList.emplace_back(league);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::POPULARITY: {
+                VideoEntity::Popularity popularity;
+                if (!videoEntity.parsePopularityEntity(entityJson, popularity)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParsePopularity"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.popularityList.emplace_back(popularity);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::PRODUCTION_COMPANY: {
+                VideoEntity::ProductionCompany productionCompany;
+                if (!videoEntity.parseProductionCompanyEntity(entityJson, productionCompany)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseProductionCompany"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.productionCompanyList.emplace_back(productionCompany);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::RECENCY: {
+                VideoEntity::Recency recency(VideoEntity::Recency::Type::NEW);
+                if (!videoEntity.parseRecencyEntity(entityJson, recency)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseRecency"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.recencyList.emplace_back(recency);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::SEASON: {
+                VideoEntity::Season season;
+                if (!videoEntity.parseSeasonEntity(entityJson, season)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseSeason"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.seasonList.emplace_back(season);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::SPORT: {
+                VideoEntity::Sport sport;
+                if (!videoEntity.parseSportEntity(entityJson, sport)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseSport"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.sportList.emplace_back(sport);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::SPORTS_TEAM: {
+                VideoEntity::SportsTeam sportsTeam;
+                if (!videoEntity.parseSportsTeamEntity(entityJson, sportsTeam)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseSportsTeam"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.sportsTeamList.emplace_back(sportsTeam);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::VIDEO: {
+                VideoEntity::Video video;
+                if (!videoEntity.parseVideoEntity(entityJson, video)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseVideo"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.videoList.emplace_back(video);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::VIDEO_RESOLUTION: {
+                VideoEntity::VideoResolution videoResolution(VideoEntity::VideoResolution::Type::HD);
+                if (!videoEntity.parseVideoResolutionEntity(entityJson, videoResolution)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseVideoResolution"));
+                    break;
+                }
+
+                remoteVideoPlayerRequest.videoResolutionList.emplace_back(videoResolution);
+                retVal = true;
+                break;
+            }
+        }
+    } while (0);
+
+    return retVal;
+}
+
+}  // namespace alexaRemoteVideoPlayer
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/src/AlexaRemoteVideoPlayerFactory.cpp b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/src/AlexaRemoteVideoPlayerFactory.cpp
new file mode 100644
index 0000000000..d008a0f284
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/src/AlexaRemoteVideoPlayerFactory.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerFactory.h"
+#include "acsdk/AlexaRemoteVideoPlayer/private/AlexaRemoteVideoPlayerCapabilityAgent.h"
+
+namespace alexaClientSDK {
+namespace alexaRemoteVideoPlayer {
+
+alexaClientSDK::avsCommon::utils::Optional<AlexaRemoteVideoPlayerFactory::RemoteVideoPlayerCapabilityAgentData>
+AlexaRemoteVideoPlayerFactory::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<alexaRemoteVideoPlayerInterfaces::RemoteVideoPlayerInterface>& remoteVideoPlayer,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender) {
+    AlexaRemoteVideoPlayerFactory::RemoteVideoPlayerCapabilityAgentData remoteVideoPlayerCapabilityAgentData;
+    auto remoteVideoPlayerCA = alexaRemoteVideoPlayer::AlexaRemoteVideoPlayerCapabilityAgent::create(
+        endpointId, remoteVideoPlayer, contextManager, responseSender, exceptionSender);
+    if (remoteVideoPlayerCA) {
+        remoteVideoPlayerCapabilityAgentData.capabilityConfigurationInterface = remoteVideoPlayerCA;
+        remoteVideoPlayerCapabilityAgentData.directiveHandler = remoteVideoPlayerCA;
+        remoteVideoPlayerCapabilityAgentData.requiresShutdown = remoteVideoPlayerCA;
+        return alexaClientSDK::avsCommon::utils::Optional<
+            AlexaRemoteVideoPlayerFactory::RemoteVideoPlayerCapabilityAgentData>(remoteVideoPlayerCapabilityAgentData);
+    }
+
+    return alexaClientSDK::avsCommon::utils::Optional<
+        AlexaRemoteVideoPlayerFactory::RemoteVideoPlayerCapabilityAgentData>();
+}
+
+}  // namespace alexaRemoteVideoPlayer
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/src/CMakeLists.txt b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/src/CMakeLists.txt
new file mode 100644
index 0000000000..452c501eec
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkAlexaRemoteVideoPlayer")
+
+add_library(acsdkAlexaRemoteVideoPlayer
+        "AlexaRemoteVideoPlayerCapabilityAgent.cpp"
+        "AlexaRemoteVideoPlayerFactory.cpp")
+
+target_include_directories(acsdkAlexaRemoteVideoPlayer PRIVATE
+        "${acsdkAlexaRemoteVideoPlayer_SOURCE_DIR}/privateInclude")
+
+target_include_directories(acsdkAlexaRemoteVideoPlayer PUBLIC
+        "${acsdkAlexaRemoteVideoPlayer_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaRemoteVideoPlayer acsdkAlexaRemoteVideoPlayerInterfaces AVSCommon AlexaVideoCommon)
+
+# install target
+asdk_install()
\ No newline at end of file
diff --git a/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/test/AlexaRemoteVideoPlayerCapabilityAgentTest.cpp b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/test/AlexaRemoteVideoPlayerCapabilityAgentTest.cpp
new file mode 100644
index 0000000000..5024e5ca5f
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/test/AlexaRemoteVideoPlayerCapabilityAgentTest.cpp
@@ -0,0 +1,464 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/MockContextManager.h>
+#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/SDKInterfaces/MockAlexaInterfaceMessageSender.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/WaitEvent.h>
+
+#include "acsdk/AlexaRemoteVideoPlayer/private/AlexaRemoteVideoPlayerCapabilityAgent.h"
+
+namespace alexaClientSDK {
+namespace alexaRemoteVideoPlayer {
+namespace test {
+
+using namespace alexaClientSDK::avsCommon::avs;
+using namespace alexaClientSDK::avsCommon::sdkInterfaces;
+using namespace alexaClientSDK::avsCommon::utils::memory;
+using namespace ::testing;
+
+using namespace alexaRemoteVideoPlayer;
+using namespace alexaRemoteVideoPlayerInterfaces;
+
+// For readability.
+using EndpointIdentifier = endpoints::EndpointIdentifier;
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// The namespace for capability agent.
+static const std::string NAMESPACE{"Alexa.RemoteVideoPlayer"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3.1"};
+
+/// The name for SearchAndPlay directive
+static const std::string NAME_SEARCHANDPLAY{"SearchAndPlay"};
+
+/// The name for SearchAndDisplayResults directive
+static const std::string NAME_SEARCHANDDISPLAYRESULTS{"SearchAndDisplayResults"};
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
+
+/// The test EndpointId
+static const EndpointIdentifier TEST_ENDPOINT_ID("testEndpointId");
+
+/// Event key.
+static const std::string EVENT("event");
+
+/// Header key.
+static const std::string HEADER("header");
+
+/// MessageId key.
+static const std::string MESSAGE_ID("messageId");
+
+/// MessageId for testing.
+static const std::string MESSAGE_ID_TEST("MessageId_Test");
+
+/// Dialog request Id key.
+static const std::string DIALOG_REQUEST_ID("dialogRequestId");
+
+/// DialogRequestId for testing.
+static const std::string DIALOG_REQUEST_ID_TEST("DialogRequestId_Test");
+
+/// Correlation token key.
+static const std::string CORRELATION_TOKEN("correlationToken");
+
+/// Correlation token for testing.
+static const std::string CORRELATION_TOKEN_TEST("CorrelationToken_Test");
+
+/// Event correlation token key.
+static const std::string EVENT_CORRELATION_TOKEN("eventCorrelationToken");
+
+/// Event correlation for testing.
+static const std::string EVENT_CORRELATION_TOKEN_TEST("EventCorrelationToken_Test");
+
+// Sample RemoteVideoPlayer payload
+static const std::string PAYLOAD = R"(
+ {
+    "entities": [
+        {
+            "value": "TV_SHOW",
+            "type": "MediaType"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666681"
+            },
+            "value": "Prime Video",
+            "type": "App"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666681"
+            },
+            "value": "Gaby Hoffman",
+            "type": "Actor"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666681"
+            },
+            "entityMetadata": {
+                "channelNumber": 1234,
+                "channelCallSign": "KBTC"
+            },
+            "uri": "entity://provider/channel/1234",
+            "value": "PBS",
+            "type": "Channel"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "Snow White",
+            "type": "Character"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "Games",
+            "type": "Event"
+        },
+        {
+            "value": "Intergalactic Wars",
+            "type": "Franchise"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "Games",
+            "type": "Genre"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "NCAA",
+            "type": "League"
+        },
+        {
+            "value": "TRUE",
+            "type": "Popularity"
+        },
+        {
+            "value": "Marvel",
+            "type": "ProductionCompany"
+        },
+        {
+            "value": "NEW",
+            "type": "Recency"
+        },
+        {
+            "value": "8",
+            "type": "Episode"
+        },
+        {
+            "value": "2",
+            "type": "Season"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "Football",
+            "type": "Sport"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "University of Washington Huskies",
+            "type": "SportsTeam"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "Manchester by the Sea",
+            "type": "Video"
+        },
+        {
+            "value": "HD",
+            "type": "VideoResolution"
+        }
+    ],
+    "searchText": {
+        "transcribed": "Jack Ryan"
+    },
+    "timeWindow": {
+        "end": "2016-09-07T23:59:00Z",
+        "start": "2016-09-01T00:00:00Z"
+    }
+})";
+
+class MockAlexaRemoteVideoPlayerInterface : public RemoteVideoPlayerInterface {
+public:
+    MOCK_METHOD1(playVideoMock, Response(RemoteVideoPlayerRequest*));
+    MOCK_METHOD1(displaySearchResultsMock, Response(RemoteVideoPlayerRequest*));
+    MOCK_METHOD0(getConfigurationMock, Configuration());
+
+    Response playVideo(std::unique_ptr<RemoteVideoPlayerRequest> request) {
+        return playVideoMock(request.get());
+    }
+
+    Response displaySearchResults(std::unique_ptr<RemoteVideoPlayerRequest> request) {
+        return displaySearchResultsMock(request.get());
+    }
+
+    Configuration getConfiguration() {
+        return getConfigurationMock();
+    }
+};
+
+class AlexaRemoteVideoPlayerCapabilityAgentTest : public ::testing::Test {
+public:
+    /// SetUp before each test case.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Constructor.
+    AlexaRemoteVideoPlayerCapabilityAgentTest() {
+    }
+
+protected:
+    /// A mock @c RemoteVideoPlayerInterface object.
+    std::shared_ptr<StrictMock<MockAlexaRemoteVideoPlayerInterface>> m_mockRemoteVideoPlayer;
+
+    // a context manager
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>> m_mockContextManager;
+
+    /// The mock @c MessageSenderInterface.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>> m_mockResponseSender;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>
+        m_mockDirectiveHandlerResult;
+
+    /// A pointer to an instance of the RemoteVideoPlayer that will be instantiated per test.
+    std::shared_ptr<AlexaRemoteVideoPlayerCapabilityAgent> m_RemoteVideoPlayerCapablityAgent;
+};
+
+void AlexaRemoteVideoPlayerCapabilityAgentTest::SetUp() {
+    m_mockExceptionSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult =
+        make_unique<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>();
+    m_mockRemoteVideoPlayer = std::make_shared<StrictMock<MockAlexaRemoteVideoPlayerInterface>>();
+    m_mockContextManager = std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>>();
+    m_mockResponseSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>>();
+    m_RemoteVideoPlayerCapablityAgent = AlexaRemoteVideoPlayerCapabilityAgent::create(
+        TEST_ENDPOINT_ID, m_mockRemoteVideoPlayer, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender);
+}
+
+void AlexaRemoteVideoPlayerCapabilityAgentTest::TearDown() {
+}
+
+std::shared_ptr<AVSDirective> buildAVSDirective(std::string directiveName) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<avsCommon::avs::attachment::test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(
+        NAMESPACE, directiveName, MESSAGE_ID_TEST, DIALOG_REQUEST_ID_TEST, CORRELATION_TOKEN_TEST, INTERFACE_VERSION);
+    auto avsMessageEndpoint = AVSMessageEndpoint(TEST_ENDPOINT_ID);
+
+    return AVSDirective::create("", avsMessageHeader, PAYLOAD, attachmentManager, "", avsMessageEndpoint);
+}
+
+/// Test that create() returns a nullptr if called with invalid arguments.
+TEST_F(AlexaRemoteVideoPlayerCapabilityAgentTest, test_givenInvalidParameters_create_shouldFail) {
+    ASSERT_THAT(
+        AlexaRemoteVideoPlayerCapabilityAgent::create(
+            "", m_mockRemoteVideoPlayer, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaRemoteVideoPlayerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, nullptr, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaRemoteVideoPlayerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockRemoteVideoPlayer, nullptr, m_mockResponseSender, m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaRemoteVideoPlayerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockRemoteVideoPlayer, m_mockContextManager, nullptr, m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaRemoteVideoPlayerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockRemoteVideoPlayer, m_mockContextManager, m_mockResponseSender, nullptr),
+        IsNull());
+}
+
+/**
+ * Test successful handling of SearchAndPlay directive.
+ */
+TEST_F(AlexaRemoteVideoPlayerCapabilityAgentTest, test_searchAndPlayDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockRemoteVideoPlayer, playVideoMock(_)).WillOnce(InvokeWithoutArgs([] {
+        return RemoteVideoPlayerInterface::Response();
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _, _, _));
+
+    ASSERT_THAT(m_RemoteVideoPlayerCapablityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_SEARCHANDPLAY);
+    m_RemoteVideoPlayerCapablityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_RemoteVideoPlayerCapablityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    m_RemoteVideoPlayerCapablityAgent->shutdown();
+}
+
+/**
+ * Test error path of SearchAndPlay directive.
+ */
+TEST_F(AlexaRemoteVideoPlayerCapabilityAgentTest, test_searchAndPlayDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockRemoteVideoPlayer, playVideoMock(_)).WillOnce(InvokeWithoutArgs([] {
+        return RemoteVideoPlayerInterface::Response(
+            RemoteVideoPlayerInterface::Response::Type::FAILED_ENDPOINT_UNREACHABLE, "TestEndpointNotReachable");
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+
+    ASSERT_THAT(m_RemoteVideoPlayerCapablityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_SEARCHANDPLAY);
+    m_RemoteVideoPlayerCapablityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_RemoteVideoPlayerCapablityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    m_RemoteVideoPlayerCapablityAgent->shutdown();
+}
+
+/**
+ * Test successful handling of SearchAndDisplayResults directive.
+ */
+TEST_F(AlexaRemoteVideoPlayerCapabilityAgentTest, test_searchAndDisplayResultsDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockRemoteVideoPlayer, displaySearchResultsMock(_)).WillOnce(InvokeWithoutArgs([] {
+        return RemoteVideoPlayerInterface::Response();
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _, _, _));
+
+    ASSERT_THAT(m_RemoteVideoPlayerCapablityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_SEARCHANDDISPLAYRESULTS);
+    m_RemoteVideoPlayerCapablityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_RemoteVideoPlayerCapablityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    m_RemoteVideoPlayerCapablityAgent->shutdown();
+}
+
+/**
+ * Test error path of SearchAndDisplayResults directive.
+ */
+TEST_F(AlexaRemoteVideoPlayerCapabilityAgentTest, test_searchAndDisplayResultsDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockRemoteVideoPlayer, displaySearchResultsMock(_)).WillOnce(InvokeWithoutArgs([] {
+        return RemoteVideoPlayerInterface::Response(
+            RemoteVideoPlayerInterface::Response::Type::FAILED_ENDPOINT_UNREACHABLE, "TestEndpointNotReachable");
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+
+    ASSERT_THAT(m_RemoteVideoPlayerCapablityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_SEARCHANDDISPLAYRESULTS);
+    m_RemoteVideoPlayerCapablityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_RemoteVideoPlayerCapablityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    m_RemoteVideoPlayerCapablityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaRemoteVideoPlayerCapabilityAgentTest, test_unknownDirective) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    ASSERT_THAT(m_RemoteVideoPlayerCapablityAgent, NotNull());
+
+    m_RemoteVideoPlayerCapablityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE), std::move(m_mockDirectiveHandlerResult));
+    m_RemoteVideoPlayerCapablityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    m_RemoteVideoPlayerCapablityAgent->shutdown();
+}
+
+}  // namespace test
+}  // namespace alexaRemoteVideoPlayer
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/test/CMakeLists.txt b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/test/CMakeLists.txt
new file mode 100644
index 0000000000..29c0d0f434
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayer/test/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+    "${acsdkAlexaRemoteVideoPlayer_INCLUDE_DIR}"
+    "${acsdkAlexaRemoteVideoPlayer_SOURCE_DIR}/include"
+    "${acsdkAlexaRemoteVideoPlayer_SOURCE_DIR}/privateInclude"
+    "${ASDK_INCLUDE_DIRS}")
+
+set(LIBS
+        "AttachmentCommonTestLib"
+        "acsdkAlexaRemoteVideoPlayer"
+        "SDKInterfacesTests")
+
+discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
\ No newline at end of file
diff --git a/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerInterfaces/CMakeLists.txt b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..8188139ec2
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerInterfaces/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaRemoteVideoPlayerInterfaces LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_library(acsdkAlexaRemoteVideoPlayerInterfaces INTERFACE)
+
+target_include_directories(acsdkAlexaRemoteVideoPlayerInterfaces INTERFACE
+        "${acsdkAlexaRemoteVideoPlayerInterfaces_SOURCE_DIR}/include"
+        "${AlexaVideoCommon}/include")
+
+# install interface
+asdk_install_interface()
diff --git a/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerInterfaces/include/acsdk/AlexaRemoteVideoPlayerInterfaces/RemoteVideoPlayerConfiguration.h b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerInterfaces/include/acsdk/AlexaRemoteVideoPlayerInterfaces/RemoteVideoPlayerConfiguration.h
new file mode 100644
index 0000000000..b53fdd7b0c
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerInterfaces/include/acsdk/AlexaRemoteVideoPlayerInterfaces/RemoteVideoPlayerConfiguration.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAREMOTEVIDEOPLAYERINTERFACES_REMOTEVIDEOPLAYERCONFIGURATION_H_
+#define ACSDK_ALEXAREMOTEVIDEOPLAYERINTERFACES_REMOTEVIDEOPLAYERCONFIGURATION_H_
+
+#include <list>
+#include <set>
+#include <string>
+
+#include <AVSCommon/Utils/Optional.h>
+
+#include <acsdk/VideoContent/VideoEntityTypes.h>
+
+namespace alexaClientSDK {
+namespace alexaRemoteVideoPlayerInterfaces {
+
+/**
+ * Configuration object used in the Discovery Response
+ */
+struct Configuration {
+    /**
+     * Enumeration of supported operations.
+     */
+    enum class SupportedOperations {
+        /// Play video content.
+        PLAY_VIDEO,
+        /// Display results for a user query.
+        DISPLAY_SEARCH_RESULTS
+    };
+
+    /**
+     * A Catalog object instance.
+     */
+    struct Catalog {
+        /**
+         * Enumeration of different supported Catalog types.
+         */
+        enum class Type {
+            /// Private catalog type.
+            PRIVATE_CATALOG,
+            /// Publicly accessible catalog type.
+            PUBLIC_CATALOG
+        };
+
+        /**
+         * Constructor.
+         *
+         * @param sourceId The identifier for the catalog, defaults to "imdb'.
+         * @param type The type of catalog, defaults to PUBLIC_CATALOG.
+         */
+        Catalog(std::string sourceId = "imdb", Type type = Type::PUBLIC_CATALOG) :
+                sourceId{std::move(sourceId)},
+                type(type) {
+        }
+
+        /// Unique identifier for the catalog. For private catalogs, this is set to the partner id used for catalog
+        /// ingestion.
+        std::string sourceId;
+        /// Type of Catalog
+        Type type;
+    };
+
+    /// All directives supported by the skill. If it is not set, all directives will be assumed supported.
+    avsCommon::utils::Optional<std::set<SupportedOperations>> operations;
+    /// All entity types supported by the skill
+    avsCommon::utils::Optional<std::set<acsdkAlexaVideoCommon::VideoEntity::EntityType>> entityTypes;
+    /// Public and private catalogs supported by the skill.
+    std::list<Catalog> catalogs;
+
+    /**
+     * Default constructor. Add a catalog entry with sourceId set to 'imdb' and type set to PUBLIC_CATALOG.
+     */
+    Configuration() : catalogs{Catalog()} {
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param operations The set of supported operations.
+     * @param entityTypes The set of supported entity types.
+     * @param catalogs The list of supported private and public catalogs.
+     */
+    Configuration(
+        std::set<SupportedOperations> operations,
+        std::set<acsdkAlexaVideoCommon::VideoEntity::EntityType> entityTypes,
+        std::list<Catalog> catalogs) :
+            operations{std::move(operations)},
+            entityTypes{std::move(entityTypes)},
+            catalogs{std::move(catalogs)} {
+    }
+};
+
+}  // namespace alexaRemoteVideoPlayerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAREMOTEVIDEOPLAYERINTERFACES_REMOTEVIDEOPLAYERCONFIGURATION_H_
\ No newline at end of file
diff --git a/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerInterfaces/include/acsdk/AlexaRemoteVideoPlayerInterfaces/RemoteVideoPlayerInterface.h b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerInterfaces/include/acsdk/AlexaRemoteVideoPlayerInterfaces/RemoteVideoPlayerInterface.h
new file mode 100644
index 0000000000..53daa0974a
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerInterfaces/include/acsdk/AlexaRemoteVideoPlayerInterfaces/RemoteVideoPlayerInterface.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAREMOTEVIDEOPLAYERINTERFACES_REMOTEVIDEOPLAYERINTERFACE_H_
+#define ACSDK_ALEXAREMOTEVIDEOPLAYERINTERFACES_REMOTEVIDEOPLAYERINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include "RemoteVideoPlayerConfiguration.h"
+#include "RemoteVideoPlayerTypes.h"
+
+namespace alexaClientSDK {
+namespace alexaRemoteVideoPlayerInterfaces {
+
+/**
+ * The RemoteVideoPlayerInterface carries out remote video player actions such playing video content requested by the
+ * user, or displaying results for a user query.
+ *
+ * @note Implementations of this interface must be thread-safe.
+ */
+class RemoteVideoPlayerInterface {
+public:
+    /**
+     * Utility object used for reporting RemoteVideoPlayer handler response.
+     */
+    struct Response {
+        /**
+         * Enum for the different response types understood by the RemoteVideoPlayer capability agent.
+         */
+        enum class Type {
+            /// RemoteVideoPlayer Request was handled successfully.
+            SUCCESS,
+            /// The number of allowed failed attempts to perform a RemoteVideoPlayer action has been exceeded.
+            FAILED_TOO_MANY_FAILED_ATTEMPTS,
+            /// Indicates the endpoint is unreachable or offline.
+            FAILED_ENDPOINT_UNREACHABLE,
+            /// The user is not subscribed to the content for a channel or other subscription-based content.
+            FAILED_NOT_SUBSCRIBED,
+            /// Indicates that an error occurred that can't be described by one of the other error types.
+            FAILED_INTERNAL_ERROR
+        };
+
+        /**
+         * Default Constructor, set the response type to success.
+         */
+        Response() : type{Type::SUCCESS} {
+        }
+
+        /**
+         * Constructor.
+         * @param type The response type @c Type
+         * @param errorMessage The error message if @c responseType is other than SUCCESS.
+         *
+         */
+        Response(Type type, std::string errorMessage) : type{type}, errorMessage{std::move(errorMessage)} {
+        }
+
+        /// Response type for RemoteVideoPlayer handler responses.
+        Type type;
+
+        /// The error message for logging if the @c responseType is anything other than SUCCESS, for the purposes of
+        /// aiding debugging.
+        std::string errorMessage;
+    };
+
+    /**
+     * Virtual destructor to assure proper cleanup of derived types.
+     */
+    virtual ~RemoteVideoPlayerInterface() = default;
+
+    /**
+     * Play video content based on a user request.
+     *
+     * @param request The request for the search and play directive.
+     * @return whether the video playback was successful, or if an error was encountered in the process.
+     * @c RemoteVideoPlayerInterface::Response.type should return SUCCESS if no errors were encountered. Otherwise,
+     * @c RemoteVideoPlayerInterface::Response.type should contain the corresponding error code along with a log message
+     * in @c RemoteVideoPlayerInterface::Response.errorMessage.
+     */
+    virtual Response playVideo(std::unique_ptr<RemoteVideoPlayerRequest> request) = 0;
+
+    /**
+     * Display results in response to a user query.
+     *
+     * @param request The request for the search and display results directive.
+     * @return whether the results for a user search request were successfully displayed, or if an error was encountered
+     * in the process. @c RemoteVideoPlayerInterface::Response.type should return SUCCESS if no errors were encountered.
+     * Otherwise, @c RemoteVideoPlayerInterface::Response.type should contain the corresponding error code along with a
+     * log message in @c RemoteVideoPlayerInterface::Response.errorMessage.
+     */
+    virtual Response displaySearchResults(std::unique_ptr<RemoteVideoPlayerRequest> request) = 0;
+
+    /**
+     * Returns the Remote Video Player configuration.
+     *
+     * @return A @c Configuration object that contains the supported directive types, entity types and catalog
+     * information.
+     */
+    virtual Configuration getConfiguration() = 0;
+};
+}  // namespace alexaRemoteVideoPlayerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAREMOTEVIDEOPLAYERINTERFACES_REMOTEVIDEOPLAYERINTERFACE_H_
\ No newline at end of file
diff --git a/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerInterfaces/include/acsdk/AlexaRemoteVideoPlayerInterfaces/RemoteVideoPlayerTypes.h b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerInterfaces/include/acsdk/AlexaRemoteVideoPlayerInterfaces/RemoteVideoPlayerTypes.h
new file mode 100644
index 0000000000..81258caa81
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/AlexaRemoteVideoPlayerInterfaces/include/acsdk/AlexaRemoteVideoPlayerInterfaces/RemoteVideoPlayerTypes.h
@@ -0,0 +1,121 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAREMOTEVIDEOPLAYERINTERFACES_REMOTEVIDEOPLAYERTYPES_H_
+#define ACSDK_ALEXAREMOTEVIDEOPLAYERINTERFACES_REMOTEVIDEOPLAYERTYPES_H_
+
+#include <chrono>
+#include <string>
+#include <vector>
+
+#include <AVSCommon/Utils/Optional.h>
+
+#include <acsdk/VideoContent/VideoEntityTypes.h>
+
+namespace alexaClientSDK {
+namespace alexaRemoteVideoPlayerInterfaces {
+
+/**
+ * Context of the request provided with Alexa.RemoteVideoPlayer directives. To fetch all the entity objects from the
+ * context, application can query the the getters to fetch the list of entities based on the types provided with
+ * requestedEntityType.
+ */
+struct RemoteVideoPlayerRequest {
+    /**
+     * A time window type.
+     */
+    struct TimeWindow {
+        /**
+         * Default constructor.
+         */
+        TimeWindow() {
+        }
+        /// The start time for the time window.
+        avsCommon::utils::Optional<std::chrono::time_point<std::chrono::system_clock>> startTime;
+        /// The end time for the time window.
+        avsCommon::utils::Optional<std::chrono::time_point<std::chrono::system_clock>> endTime;
+    };
+    /// Collection of all the media objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Media> mediaList;
+
+    /// Collection of all the actor objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Actor> actorList;
+
+    /// Collection of all the app objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::App> appList;
+
+    /// Collection of all the channel objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Channel> channelList;
+
+    /// Collection of all the character objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Character> characterList;
+
+    /// Collection of all the director objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Director> directorList;
+
+    /// Collection of all the episode objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Episode> episodeList;
+
+    /// Collection of all the event objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Event> eventList;
+
+    /// Collection of all the franchise objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Franchise> franchiseList;
+
+    /// Collection of all the genre objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Genre> genreList;
+
+    /// Collection of all the league objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::League> leagueList;
+
+    /// Collection of all the popularity objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Popularity> popularityList;
+
+    /// Collection of all the production company objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::ProductionCompany> productionCompanyList;
+
+    /// Collection of all the recency objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Recency> recencyList;
+
+    /// Collection of all the seasons objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Season> seasonList;
+
+    /// Collection of all the sport objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Sport> sportList;
+
+    /// Collection of all the sports team objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::SportsTeam> sportsTeamList;
+
+    /// Collection of all the video objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Video> videoList;
+
+    /// Collection of all the video resolution objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::VideoResolution> videoResolutionList;
+
+    /// The transcribed version of the user search query.
+    /// @Note: This is to be used as a fallback for other values in the search payload. This field is
+    /// optional, and might not appear in the received directive.
+    /// Additionally (1). there is no word order guarantee in the transcribed text,
+    /// and, (2). the content of the transcribed text may change over time - e.g. "top ten comedies" or "top 10
+    /// comedies".
+    avsCommon::utils::Optional<std::string> searchTextTranscribed;
+
+    /// A time window object representing a time associated with this request.
+    avsCommon::utils::Optional<TimeWindow> timeWindow;
+};
+}  // namespace alexaRemoteVideoPlayerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAREMOTEVIDEOPLAYERINTERFACES_REMOTEVIDEOPLAYERTYPES_H_
\ No newline at end of file
diff --git a/capabilities/AlexaRemoteVideoPlayer/CMakeLists.txt b/capabilities/AlexaRemoteVideoPlayer/CMakeLists.txt
new file mode 100644
index 0000000000..f2c7aa5847
--- /dev/null
+++ b/capabilities/AlexaRemoteVideoPlayer/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaRemoteVideoPlayer LANGUAGES CXX)
+
+add_subdirectory("AlexaRemoteVideoPlayer")
+add_subdirectory("AlexaRemoteVideoPlayerInterfaces")
\ No newline at end of file
diff --git a/capabilities/AlexaSeekController/.clang-format b/capabilities/AlexaSeekController/.clang-format
new file mode 100644
index 0000000000..db5960a4be
--- /dev/null
+++ b/capabilities/AlexaSeekController/.clang-format
@@ -0,0 +1,102 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit: 120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth: 4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes: false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
+
diff --git a/capabilities/AlexaSeekController/CMakeLists.txt b/capabilities/AlexaSeekController/CMakeLists.txt
new file mode 100644
index 0000000000..a1df8782e6
--- /dev/null
+++ b/capabilities/AlexaSeekController/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaSeekController LANGUAGES CXX)
+
+add_subdirectory("acsdkAlexaSeekController")
+add_subdirectory("acsdkAlexaSeekControllerInterfaces")
diff --git a/capabilities/AlexaSeekController/acsdkAlexaSeekController/CMakeLists.txt b/capabilities/AlexaSeekController/acsdkAlexaSeekController/CMakeLists.txt
new file mode 100644
index 0000000000..59ab646ec8
--- /dev/null
+++ b/capabilities/AlexaSeekController/acsdkAlexaSeekController/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+project(acsdkAlexaSeekController LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
\ No newline at end of file
diff --git a/capabilities/AlexaSeekController/acsdkAlexaSeekController/include/acsdkAlexaSeekController/AlexaSeekControllerFactory.h b/capabilities/AlexaSeekController/acsdkAlexaSeekController/include/acsdkAlexaSeekController/AlexaSeekControllerFactory.h
new file mode 100644
index 0000000000..ec554889e9
--- /dev/null
+++ b/capabilities/AlexaSeekController/acsdkAlexaSeekController/include/acsdkAlexaSeekController/AlexaSeekControllerFactory.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXASEEKCONTROLLER_ALEXASEEKCONTROLLERFACTORY_H_
+#define ACSDKALEXASEEKCONTROLLER_ALEXASEEKCONTROLLERFACTORY_H_
+
+#include <memory>
+
+#include <acsdkAlexaSeekControllerInterfaces/AlexaSeekControllerInterface.h>
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/DirectiveHandlerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaSeekController {
+
+/**
+ * This factory can be used to create a new @c AlexaSeekControllerCapabilityAgent and return a generic object that
+ * contains certain interfaces which can be used for registering this capability agent to an endpoint.
+ */
+class AlexaSeekControllerFactory {
+public:
+    /// This structure contains the interfaces used to interact with the AlexaSeekController Capability Agent.
+    struct AlexaSeekControllerCapabilityAgentData {
+        /// The interface that this object will use to perform the seek controller operations.
+        std::shared_ptr<avsCommon::sdkInterfaces::DirectiveHandlerInterface> directiveHandler;
+        /// The interface that provides the configurations of the capabilities being implemented by this capability.
+        std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface> capabilityConfigurationInterface;
+        /// The object responsible for cleaning up this capability agent's objects during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+    /**
+     * Creates a new AlexaSeekController capability agent instance and exposes the @c AlexaSeekController
+     * related interfaces to the caller, including the handler for performing seek operations @c directiveHandler,
+     * the capability configurations associated to the capability agent instance @c capabilityConfigurationInterface,
+     * and the object for cleaning up the capability agent instance during shutdown @c requiresShutdown.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param seekController An interface that this object will use to perform the seek controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the reponse to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isRetrievable Whether properties can be retrieved when Alexa sends a state report request or the endpoint
+     *  responds with an Alexa response to a directive.
+     * @return An @c Optional object with no valid value if the inputs are invalid, else a new
+     *  @c AlexaSeekControllerCapabilityAgentData object.
+     */
+    static avsCommon::utils::Optional<AlexaSeekControllerCapabilityAgentData> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        std::shared_ptr<acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface> seekController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        bool isRetrievable);
+};
+
+}  // namespace acsdkAlexaSeekController
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXASEEKCONTROLLER_ALEXASEEKCONTROLLERFACTORY_H_
diff --git a/capabilities/AlexaSeekController/acsdkAlexaSeekController/privateInclude/acsdkAlexaSeekController/AlexaSeekControllerCapabilityAgent.h b/capabilities/AlexaSeekController/acsdkAlexaSeekController/privateInclude/acsdkAlexaSeekController/AlexaSeekControllerCapabilityAgent.h
new file mode 100644
index 0000000000..f3973387e5
--- /dev/null
+++ b/capabilities/AlexaSeekController/acsdkAlexaSeekController/privateInclude/acsdkAlexaSeekController/AlexaSeekControllerCapabilityAgent.h
@@ -0,0 +1,217 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXASEEKCONTROLLER_PRIVATEINCLUDE_ACSDKALEXASEEKCONTROLLER_ALEXASEEKCONTROLLERCAPABILITYAGENT_H_
+#define ACSDKALEXASEEKCONTROLLER_PRIVATEINCLUDE_ACSDKALEXASEEKCONTROLLER_ALEXASEEKCONTROLLERCAPABILITYAGENT_H_
+
+#include <chrono>
+#include <memory>
+#include <string>
+
+#include <acsdkAlexaSeekControllerInterfaces/AlexaSeekControllerInterface.h>
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityTag.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/AVS/DirectiveHandlerConfiguration.h>
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextRequestToken.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaSeekController {
+
+/**
+ * The @c AlexaSeekControllerCapabilityAgent is responsible for handling Alexa.SeekController directives and
+ * calls the @c AlexaSeekControllerInterface APIs.
+ *
+ * This class implements a @c CapabilityAgent that handles the @c Alexa.SeekController Interface.
+ */
+class AlexaSeekControllerCapabilityAgent
+        : public avsCommon::avs::CapabilityAgent
+        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<AlexaSeekControllerCapabilityAgent> {
+public:
+    /**
+     * Create an instance of @c AlexaSeekControllerCapabilityAgent.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param seekController An interface that this object will use to perform the seek controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isRetrievable Whether properties can be retrieved when Alexa sends a state report request or
+     *  the endpoint responds with an Alexa response to a directive.
+     * @return @c nullptr if the inputs are invalid, else a new instance of @c AlexaSeekControllerCapabilityAgent.
+     */
+    static std::shared_ptr<AlexaSeekControllerCapabilityAgent> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface>& seekController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        bool isRetrievable);
+
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
+    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name StateProviderInterface Functions
+    /// @{
+    void provideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken) override;
+    bool canStateBeRetrieved() override;
+    bool hasReportableStateProperties() override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
+    /// @}
+
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param seekController An interface that this object will use to perform the seek controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the reponse to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isRetrievable Whether properties can be retrieved when Alexa sends a state report request or
+     *  the endpoint responds with an Alexa response to a directive.
+     */
+    AlexaSeekControllerCapabilityAgent(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface>& seekController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        bool isRetrievable);
+
+    /**
+     * Remove a directive from the map of message IDs to DirectiveInfo instances.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
+     */
+    void removeDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Send the handling completed notification and clean up the resources.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Called on executor to handle any unknown directives received.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param type The @c ExceptionErrorType.
+     */
+    void executeUnknownDirective(std::shared_ptr<DirectiveInfo> info, avsCommon::avs::ExceptionErrorType type);
+
+    /**
+     * Call methods of @c AlexaInterfaceMessageSenderInterface based the endpoint's response for a controller method
+     * call.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param result This contains the endpoint's response of a controller call.
+     */
+    void executeSendResponseEvent(
+        const std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo>& info,
+        const acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface::Response& result);
+
+    /**
+     * Gets the current seek state from endpoint and notifies @c ContextManager
+     *
+     * @param stateProviderName Provides the property name and used in the @c ContextManager methods.
+     * @param contextRequestToken The token to be used when providing the response to @c ContextManager
+     */
+    void executeProvideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken);
+
+    /**
+     * Send Alexa interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaErrorResponseType Alexa interface error response type.
+     * @param responseMessage Alexa interface error response message.
+     */
+    void sendAlexaErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+        const std::string& responseMessage);
+
+    /**
+     * Send Alexa.Video interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaVideoErrorResponseType Alexa.Video interface error response type.
+     * @param responseMessage Alexa.Video interface error response message.
+     */
+    void sendAlexaVideoErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType
+            alexaVideoErrorResponseType,
+        const std::string& responseMessage);
+
+    /// Endpoint the capability agent associated to.
+    avsCommon::sdkInterfaces::endpoints::EndpointIdentifier m_endpointId;
+
+    /// Reference to @c AlexaSeekControllerInterface
+    std::shared_ptr<acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface> m_seekController;
+
+    /// The timestamp position of the last media content playing on the device after being updated by this interface.
+    std::chrono::milliseconds m_lastSeekedPosition;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The @c AlexaInterfaceMessageSenderInterface used to send event messages.
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> m_responseSender;
+
+    /// Whether the seek properties can be retrieved when Alexa sends a state report request to
+    /// the endpoint or the endpoint responds with an Alexa response to a directive.
+    bool m_isRetrievable;
+
+    /// Whether the playback state controller properties change is proactively reported to Alexa in a change report.
+    bool m_isProactivelyReported;
+
+    /// This is the worker thread for the @c AlexaSeekControllerCapabilityAgent.
+    avsCommon::utils::threading::Executor m_executor;
+};
+
+}  // namespace acsdkAlexaSeekController
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXASEEKCONTROLLER_PRIVATEINCLUDE_ACSDKALEXASEEKCONTROLLER_ALEXASEEKCONTROLLERCAPABILITYAGENT_H_
diff --git a/capabilities/AlexaSeekController/acsdkAlexaSeekController/src/AlexaSeekControllerCapabilityAgent.cpp b/capabilities/AlexaSeekController/acsdkAlexaSeekController/src/AlexaSeekControllerCapabilityAgent.cpp
new file mode 100644
index 0000000000..127733a2d7
--- /dev/null
+++ b/capabilities/AlexaSeekController/acsdkAlexaSeekController/src/AlexaSeekControllerCapabilityAgent.cpp
@@ -0,0 +1,369 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkAlexaSeekController/AlexaSeekControllerCapabilityAgent.h"
+
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaSeekController {
+
+using namespace avsCommon;
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::configuration;
+using namespace avsCommon::utils::json;
+
+using namespace acsdkAlexaSeekControllerInterfaces;
+
+/// String to identify log entries originating from this file.
+static const std::string TAG{"AlexaSeekControllerCapabilityAgent"};
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+/// The namespace for this capability agent.
+static const std::string NAMESPACE{"Alexa.SeekController"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for AdjustSeekPosition directive
+static const std::string NAME_ADJUST_SEEK_POSITION{"AdjustSeekPosition"};
+
+/// The key for deltaPositionMilliseconds in the directive
+static const std::string KEY_POSITION_MILLISECONDS{"deltaPositionMilliseconds"};
+
+/// Property name for Alexa.SeekController positionMilleseconds property
+static const std::string POSITION_MILLESECONDS_PROPERTY{"positionMilliseconds"};
+
+/// The namespace for Alexa.Video.ErrorResponse.
+static const std::string NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE{"Alexa.Video"};
+
+std::shared_ptr<AlexaSeekControllerCapabilityAgent> AlexaSeekControllerCapabilityAgent::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<AlexaSeekControllerInterface>& seekController,
+    const std::shared_ptr<ContextManagerInterface>& contextManager,
+    const std::shared_ptr<AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<ExceptionEncounteredSenderInterface>& exceptionSender,
+    bool isRetrievable) {
+    if (endpointId.empty()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "emptyEndpointId"));
+        return nullptr;
+    }
+    if (!seekController) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullSeekController"));
+        return nullptr;
+    }
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManager"));
+        return nullptr;
+    }
+    if (!responseSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullResponseSender"));
+        return nullptr;
+    }
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    auto alexaSeekControllerCapabilityAgent =
+        std::shared_ptr<AlexaSeekControllerCapabilityAgent>(new AlexaSeekControllerCapabilityAgent(
+            endpointId, seekController, contextManager, responseSender, exceptionSender, isRetrievable));
+
+    if (!alexaSeekControllerCapabilityAgent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "instantiationFailed"));
+        return nullptr;
+    }
+
+    if (isRetrievable) {
+        contextManager->addStateProvider(
+            {NAMESPACE, POSITION_MILLESECONDS_PROPERTY, endpointId}, alexaSeekControllerCapabilityAgent);
+    }
+
+    return alexaSeekControllerCapabilityAgent;
+}
+
+AlexaSeekControllerCapabilityAgent::AlexaSeekControllerCapabilityAgent(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<AlexaSeekControllerInterface>& seekController,
+    const std::shared_ptr<ContextManagerInterface>& contextManager,
+    const std::shared_ptr<AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<ExceptionEncounteredSenderInterface>& exceptionSender,
+    bool isRetrievable) :
+        CapabilityAgent{NAMESPACE, exceptionSender},
+        RequiresShutdown{"AlexaSeekControllerCapabilityAgent"},
+        m_endpointId{endpointId},
+        m_seekController{seekController},
+        m_lastSeekedPosition{std::chrono::milliseconds(0)},
+        m_contextManager{contextManager},
+        m_responseSender{responseSender},
+        m_isRetrievable{isRetrievable},
+        m_isProactivelyReported{false} {
+}
+
+void AlexaSeekControllerCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!directive) {
+        ACSDK_ERROR(LX("handleDirectiveImmediatelyFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+}
+
+void AlexaSeekControllerCapabilityAgent::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX("preHandleDirective"));
+    // do nothing.
+}
+
+void AlexaSeekControllerCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+
+    m_executor.submit([this, info] {
+        ACSDK_DEBUG9(LX("handleDirectiveInExecutor"));
+        const std::string directiveName = info->directive->getName();
+        if (!info->directive->getEndpoint().hasValue() ||
+            (info->directive->getEndpoint().value().endpointId != m_endpointId)) {
+            executeUnknownDirective(info, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        if (directiveName == NAME_ADJUST_SEEK_POSITION) {
+            auto payload = info->directive->getPayload();
+            int64_t deltaPosition;
+            if (!jsonUtils::retrieveValue(payload, KEY_POSITION_MILLISECONDS, &deltaPosition)) {
+                std::string errorMessage = "deltaPositionMillisecondsNotFound";
+                ACSDK_ERROR(LX("executeAdjustSeekPositionDirectiveFailed").m(errorMessage));
+                sendExceptionEncounteredAndReportFailed(info, errorMessage);
+                return;
+            }
+
+            auto result = m_seekController->adjustSeekPosition(std::chrono::milliseconds(deltaPosition));
+            m_lastSeekedPosition = result.currentMediaPosition;
+
+            executeSetHandlingCompleted(info);
+            executeSendResponseEvent(info, result);
+        } else {
+            ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "unexpectedDirective").d("name", directiveName));
+            executeUnknownDirective(info, ExceptionErrorType::UNSUPPORTED_OPERATION);
+            return;
+        }
+    });
+}
+
+void AlexaSeekControllerCapabilityAgent::provideState(
+    const CapabilityTag& stateProviderName,
+    const ContextRequestToken contextRequestToken) {
+    ACSDK_DEBUG5(
+        LX(__func__).d("contextRequestToken", contextRequestToken).sensitive("stateProviderName", stateProviderName));
+
+    m_executor.submit([this, stateProviderName, contextRequestToken] {
+        ACSDK_DEBUG9(LX("provideStateInExecutor"));
+        executeProvideState(stateProviderName, contextRequestToken);
+    });
+    return;
+}
+
+void AlexaSeekControllerCapabilityAgent::executeProvideState(
+    const CapabilityTag& stateProviderName,
+    const ContextRequestToken contextRequestToken) {
+    ACSDK_DEBUG5(LX("executeProvideState"));
+    bool isError = false;
+
+    if (stateProviderName.endpointId != m_endpointId) {
+        ACSDK_ERROR(LX("provideStateFailed")
+                        .d("reason", "notExpectedEndpointId")
+                        .sensitive("endpointId", stateProviderName.endpointId));
+        isError = true;
+    }
+
+    if (stateProviderName.name != POSITION_MILLESECONDS_PROPERTY) {
+        ACSDK_ERROR(LX("provideStateFailed").d("reason", "notExpectedName").d("name", stateProviderName.name));
+        isError = true;
+    }
+
+    if (isError) {
+        m_contextManager->provideStateUnavailableResponse(stateProviderName, contextRequestToken, false);
+        return;
+    }
+
+    auto lastSeekedPositionString = std::to_string(m_lastSeekedPosition.count());
+
+    m_contextManager->provideStateResponse(
+        stateProviderName, CapabilityState(lastSeekedPositionString), contextRequestToken);
+}
+
+bool AlexaSeekControllerCapabilityAgent::canStateBeRetrieved() {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_isRetrievable;
+}
+
+bool AlexaSeekControllerCapabilityAgent::hasReportableStateProperties() {
+    ACSDK_DEBUG5(LX(__func__));
+    return false;
+}
+
+void AlexaSeekControllerCapabilityAgent::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("cancelDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    if (!info->directive->getEndpoint().hasValue() ||
+        info->directive->getEndpoint().value().endpointId != m_endpointId) {
+        ACSDK_WARN(LX("cancelDirective").d("reason", "notExpectedEndpointId"));
+    }
+    removeDirective(info);
+}
+
+DirectiveHandlerConfiguration AlexaSeekControllerCapabilityAgent::getConfiguration() const {
+    ACSDK_DEBUG5(LX(__func__));
+    DirectiveHandlerConfiguration configuration;
+    auto neitherNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUMS_NONE, false);
+    configuration[{NAMESPACE, NAME_ADJUST_SEEK_POSITION, m_endpointId}] = neitherNonBlockingPolicy;
+
+    return configuration;
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> AlexaSeekControllerCapabilityAgent::
+    getCapabilityConfigurations() {
+    auto additionalConfigurations = CapabilityConfiguration::AdditionalConfigurations();
+    CapabilityConfiguration configuration{
+        CapabilityConfiguration::ALEXA_INTERFACE_TYPE,
+        NAMESPACE,
+        INTERFACE_VERSION,
+        Optional<std::string>(),  // instance
+        Optional<CapabilityConfiguration::Properties>(
+            {m_isRetrievable, m_isProactivelyReported, {POSITION_MILLESECONDS_PROPERTY}}),
+        additionalConfigurations};
+    return {std::make_shared<avsCommon::avs::CapabilityConfiguration>(configuration)};
+}
+
+void AlexaSeekControllerCapabilityAgent::doShutdown() {
+    m_executor.shutdown();
+    if (m_isRetrievable) {
+        m_contextManager->removeStateProvider({NAMESPACE, POSITION_MILLESECONDS_PROPERTY, m_endpointId});
+    }
+    m_seekController.reset();
+    m_responseSender.reset();
+    m_contextManager.reset();
+}
+
+void AlexaSeekControllerCapabilityAgent::removeDirective(std::shared_ptr<DirectiveInfo> info) {
+    if (info->directive && info->result) {
+        CapabilityAgent::removeDirective(info->directive->getMessageId());
+    }
+}
+
+void AlexaSeekControllerCapabilityAgent::executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info) {
+    if (info && info->result) {
+        info->result->setCompleted();
+    }
+    removeDirective(info);
+}
+
+void AlexaSeekControllerCapabilityAgent::executeUnknownDirective(
+    std::shared_ptr<DirectiveInfo> info,
+    ExceptionErrorType type) {
+    ACSDK_ERROR(LX("executeUnknownDirectiveFailed")
+                    .d("reason", "unknownDirective")
+                    .d("namespace", info->directive->getNamespace())
+                    .d("name", info->directive->getName()));
+
+    const std::string exceptionMessage =
+        "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
+
+    sendExceptionEncounteredAndReportFailed(info, exceptionMessage, type);
+}
+
+void AlexaSeekControllerCapabilityAgent::executeSendResponseEvent(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo>& info,
+    const acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface::Response& result) {
+    switch (result.type) {
+        case AlexaSeekControllerInterface::Response::Type::SUCCESS:
+            m_responseSender->sendResponseEvent(
+                info->directive->getInstance(),
+                info->directive->getCorrelationToken(),
+                AVSMessageEndpoint(m_endpointId));
+            break;
+        case AlexaSeekControllerInterface::Response::Type::ALREADY_IN_OPERATION:
+            sendAlexaErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::ErrorResponseType::ALREADY_IN_OPERATION,
+                result.errorMessage);
+            break;
+        case AlexaSeekControllerInterface::Response::Type::CANCELED_BY_NEW_REQUEST:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::ENDPOINT_BUSY, result.errorMessage);
+            break;
+        case AlexaSeekControllerInterface::Response::Type::NO_CONTENT_AVAILABLE:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+        case AlexaSeekControllerInterface::Response::Type::CONTENT_CANNOT_BE_SEEKED:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::ACTION_NOT_PERMITTED_FOR_CONTENT,
+                result.errorMessage);
+            break;
+        case AlexaSeekControllerInterface::Response::Type::INTERNAL_ERROR:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+    }
+}
+
+void AlexaSeekControllerCapabilityAgent::sendAlexaErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+    const std::string& responseMessage) {
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        alexaErrorResponseType,
+        responseMessage);
+}
+
+void AlexaSeekControllerCapabilityAgent::sendAlexaVideoErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType alexaVideoErrorResponseType,
+    const std::string& responseMessage) {
+    std::string payload =
+        R"({"type":")" +
+        AlexaInterfaceMessageSenderInterface::alexaVideoErrorResponseToString(alexaVideoErrorResponseType) +
+        R"(", "message":")" + responseMessage + R"("})";
+
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE,
+        payload);
+}
+
+}  // namespace acsdkAlexaSeekController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaSeekController/acsdkAlexaSeekController/src/AlexaSeekControllerFactory.cpp b/capabilities/AlexaSeekController/acsdkAlexaSeekController/src/AlexaSeekControllerFactory.cpp
new file mode 100644
index 0000000000..fca19419fb
--- /dev/null
+++ b/capabilities/AlexaSeekController/acsdkAlexaSeekController/src/AlexaSeekControllerFactory.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkAlexaSeekController/AlexaSeekControllerFactory.h"
+
+#include "acsdkAlexaSeekController/AlexaSeekControllerCapabilityAgent.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaSeekController {
+
+avsCommon::utils::Optional<AlexaSeekControllerFactory::AlexaSeekControllerCapabilityAgentData>
+AlexaSeekControllerFactory::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    std::shared_ptr<acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface> seekController,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+    bool isRetrievable) {
+    AlexaSeekControllerFactory::AlexaSeekControllerCapabilityAgentData alexaSeekControllerCapabilityAgentData;
+    auto seekControllerCA = acsdkAlexaSeekController::AlexaSeekControllerCapabilityAgent::create(
+        endpointId, seekController, contextManager, responseSender, exceptionSender, isRetrievable);
+    if (seekControllerCA) {
+        alexaSeekControllerCapabilityAgentData.capabilityConfigurationInterface = seekControllerCA;
+        alexaSeekControllerCapabilityAgentData.directiveHandler = seekControllerCA;
+        alexaSeekControllerCapabilityAgentData.requiresShutdown = seekControllerCA;
+        return avsCommon::utils::Optional<AlexaSeekControllerFactory::AlexaSeekControllerCapabilityAgentData>(
+            alexaSeekControllerCapabilityAgentData);
+    }
+
+    return avsCommon::utils::Optional<AlexaSeekControllerFactory::AlexaSeekControllerCapabilityAgentData>();
+}
+
+}  // namespace  acsdkAlexaSeekController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaSeekController/acsdkAlexaSeekController/src/CMakeLists.txt b/capabilities/AlexaSeekController/acsdkAlexaSeekController/src/CMakeLists.txt
new file mode 100644
index 0000000000..f58e57364f
--- /dev/null
+++ b/capabilities/AlexaSeekController/acsdkAlexaSeekController/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_definitions("-DACSDK_LOG_MODULE=AlexaSeekController")
+
+add_library(acsdkAlexaSeekController
+        AlexaSeekControllerCapabilityAgent.cpp
+        AlexaSeekControllerFactory.cpp)
+
+target_include_directories(acsdkAlexaSeekController PRIVATE
+        "${acsdkAlexaSeekController_SOURCE_DIR}/privateInclude")
+
+target_include_directories(acsdkAlexaSeekController PUBLIC
+        "${acsdkAlexaSeekController_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaSeekController AVSCommon Alexa acsdkAlexaSeekControllerInterfaces)
+
+# install target
+asdk_install()
\ No newline at end of file
diff --git a/capabilities/AlexaSeekController/acsdkAlexaSeekController/test/AlexaSeekControllerCapabilityAgentTest.cpp b/capabilities/AlexaSeekController/acsdkAlexaSeekController/test/AlexaSeekControllerCapabilityAgentTest.cpp
new file mode 100644
index 0000000000..b70557b436
--- /dev/null
+++ b/capabilities/AlexaSeekController/acsdkAlexaSeekController/test/AlexaSeekControllerCapabilityAgentTest.cpp
@@ -0,0 +1,284 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkAlexaSeekController/AlexaSeekControllerCapabilityAgent.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <acsdkAlexaSeekControllerInterfaces/AlexaSeekControllerInterface.h>
+#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
+#include <AVSCommon/SDKInterfaces/MockAlexaInterfaceMessageSender.h>
+#include <AVSCommon/SDKInterfaces/MockContextManager.h>
+#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/WaitEvent.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaSeekController {
+namespace test {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::memory;
+using namespace ::testing;
+
+using namespace acsdkAlexaSeekController;
+using namespace acsdkAlexaSeekControllerInterfaces;
+
+// For readability.
+using EndpointIdentifier = endpoints::EndpointIdentifier;
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// The namespace for capability agent.
+static const std::string NAMESPACE{"Alexa.SeekController"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for AdjustSeekPosition directive
+static const std::string NAME_ADJUST_SEEK_POSITION{"AdjustSeekPosition"};
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
+
+/// The test EndpointId
+static const EndpointIdentifier TEST_ENDPOINT_ID("testEndpointId");
+
+/// Event key.
+static const std::string EVENT("event");
+
+/// MessageId for testing.
+static const std::string MESSAGE_ID_TEST("MessageId_Test");
+
+/// DialogRequestId for testing.
+static const std::string DIALOG_REQUEST_ID_TEST("DialogRequestId_Test");
+
+/// Correlation token for testing.
+static const std::string CORRELATION_TOKEN_TEST("CorrelationToken_Test");
+
+// Sample AdjustSeekPosition payload
+static const std::string ADJUST_SEEK_POSITION_PAYLOAD = R"delim( {
+            "deltaPositionMilliseconds": -45000 } )delim";
+
+class MockAlexaSeekControllerInterface : public AlexaSeekControllerInterface {
+public:
+    using Response = acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface::Response;
+
+    MOCK_METHOD1(adjustSeekPosition, Response(const std::chrono::milliseconds& deltaPosition));
+};
+
+class AlexaSeekControllerCapabilityAgentTest : public ::testing::Test {
+public:
+    /// SetUp before each test case.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Constructor.
+    AlexaSeekControllerCapabilityAgentTest() {
+    }
+
+protected:
+    /**
+     * Function to create AlexaSeekControllerCapabilityAgent based on the reportable flags
+     * and sets required ContextManager and SeekController mocks.
+     */
+    std::shared_ptr<AlexaSeekControllerCapabilityAgent> createCapabilityAgentAndSetExpects(bool isRetrievable);
+
+    /// A mock @c AlexaSeekControllerInterface object.
+    std::shared_ptr<StrictMock<MockAlexaSeekControllerInterface>> m_mockSeekController;
+
+    // a context manager
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>> m_mockContextManager;
+
+    /// The mock @c MessageSenderInterface.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>> m_mockResponseSender;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>
+        m_mockDirectiveHandlerResult;
+};
+
+void AlexaSeekControllerCapabilityAgentTest::SetUp() {
+    m_mockExceptionSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult =
+        make_unique<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>();
+    m_mockSeekController = std::make_shared<StrictMock<MockAlexaSeekControllerInterface>>();
+    m_mockContextManager = std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>>();
+    m_mockResponseSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>>();
+}
+
+void AlexaSeekControllerCapabilityAgentTest::TearDown() {
+}
+
+std::shared_ptr<AlexaSeekControllerCapabilityAgent> AlexaSeekControllerCapabilityAgentTest::
+    createCapabilityAgentAndSetExpects(bool retrievable) {
+    // ContextManager Mocks
+    if (retrievable) {
+        // Expects a non-null CA reference during create.
+        EXPECT_CALL(*m_mockContextManager, addStateProvider(_, ::testing::NotNull()));
+
+        // Expects a null when CA is shutdown.
+        EXPECT_CALL(*m_mockContextManager, removeStateProvider(_));
+    }
+
+    auto AlexaSeekControllerCapabilityAgent = AlexaSeekControllerCapabilityAgent::create(
+        TEST_ENDPOINT_ID,
+        m_mockSeekController,
+        m_mockContextManager,
+        m_mockResponseSender,
+        m_mockExceptionSender,
+        retrievable);
+    return AlexaSeekControllerCapabilityAgent;
+}
+
+std::shared_ptr<AVSDirective> buildAVSDirective(std::string directiveName, std::string payload) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<avsCommon::avs::attachment::test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(
+        NAMESPACE, directiveName, MESSAGE_ID_TEST, DIALOG_REQUEST_ID_TEST, CORRELATION_TOKEN_TEST, INTERFACE_VERSION);
+    auto avsMessageEndpoint = AVSMessageEndpoint(TEST_ENDPOINT_ID);
+
+    return AVSDirective::create("", avsMessageHeader, payload, attachmentManager, "", avsMessageEndpoint);
+}
+
+/// Test that create() returns a nullptr if called with invalid arguments.
+TEST_F(AlexaSeekControllerCapabilityAgentTest, test_givenInvalidParameters_create_shouldFail) {
+    ASSERT_THAT(
+        AlexaSeekControllerCapabilityAgent::create(
+            "", m_mockSeekController, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaSeekControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, nullptr, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaSeekControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockSeekController, nullptr, m_mockResponseSender, m_mockExceptionSender, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaSeekControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockSeekController, m_mockContextManager, nullptr, m_mockExceptionSender, true),
+        IsNull());
+    ASSERT_THAT(
+        AlexaSeekControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockSeekController, m_mockContextManager, m_mockResponseSender, nullptr, true),
+        IsNull());
+}
+
+/**
+ * Test successful handling of AdjustSeekPosition directive.
+ */
+TEST_F(AlexaSeekControllerCapabilityAgentTest, test_adjustSeekPositionDirective_successCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockSeekController, adjustSeekPosition(_)).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface::Response seekControllerResponse(
+            AlexaSeekControllerInterface::Response::Type::SUCCESS, "");
+        return seekControllerResponse;
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto seekControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true);
+    ASSERT_THAT(seekControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive =
+        buildAVSDirective(NAME_ADJUST_SEEK_POSITION, ADJUST_SEEK_POSITION_PAYLOAD);
+    seekControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    seekControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    seekControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of AdjustSeekPosition directive.
+ */
+TEST_F(AlexaSeekControllerCapabilityAgentTest, test_adjustSeekPositionDirective_errorCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockSeekController, adjustSeekPosition(_)).WillOnce(InvokeWithoutArgs([]() {
+        acsdkAlexaSeekControllerInterfaces::AlexaSeekControllerInterface::Response seekControllerResponse(
+            AlexaSeekControllerInterface::Response::Type::NO_CONTENT_AVAILABLE, "No content available for playing");
+        return seekControllerResponse;
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+
+    auto AlexaSeekControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true);
+    ASSERT_THAT(AlexaSeekControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive =
+        buildAVSDirective(NAME_ADJUST_SEEK_POSITION, ADJUST_SEEK_POSITION_PAYLOAD);
+    AlexaSeekControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    AlexaSeekControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    AlexaSeekControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaSeekControllerCapabilityAgentTest, test_unknownDirective) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    auto AlexaSeekControllerCapabilityAgent = createCapabilityAgentAndSetExpects(true);
+    ASSERT_THAT(AlexaSeekControllerCapabilityAgent, NotNull());
+
+    AlexaSeekControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE, ""), std::move(m_mockDirectiveHandlerResult));
+    AlexaSeekControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    AlexaSeekControllerCapabilityAgent->shutdown();
+}
+}  // namespace test
+}  // namespace acsdkAlexaSeekController
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaSeekController/acsdkAlexaSeekController/test/CMakeLists.txt b/capabilities/AlexaSeekController/acsdkAlexaSeekController/test/CMakeLists.txt
new file mode 100644
index 0000000000..134398646c
--- /dev/null
+++ b/capabilities/AlexaSeekController/acsdkAlexaSeekController/test/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+
+set(INCLUDE_PATH
+    "${acsdkAlexaSeekController_INCLUDE_DIR}"
+    "${acsdkAlexaSeekController_SOURCE_DIR}/privateInclude"
+    "${acsdkAlexaSeekControllerInterfaces_SOURCE_DIR}/include"
+    "${ASDK_INCLUDE_DIRS}")
+
+set(LIBS
+    "AttachmentCommonTestLib"
+    "acsdkAlexaSeekController"
+    "SDKInterfacesTests")
+
+discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
+
diff --git a/capabilities/AlexaSeekController/acsdkAlexaSeekControllerInterfaces/CMakeLists.txt b/capabilities/AlexaSeekController/acsdkAlexaSeekControllerInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..56bb348835
--- /dev/null
+++ b/capabilities/AlexaSeekController/acsdkAlexaSeekControllerInterfaces/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.1)
+project(acsdkAlexaSeekControllerInterfaces LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_library(acsdkAlexaSeekControllerInterfaces INTERFACE)
+
+target_include_directories(acsdkAlexaSeekControllerInterfaces INTERFACE
+        "${acsdkAlexaSeekControllerInterfaces_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaSeekControllerInterfaces INTERFACE
+        AVSCommon)
+
+# install interface
+asdk_install_interface()
\ No newline at end of file
diff --git a/capabilities/AlexaSeekController/acsdkAlexaSeekControllerInterfaces/include/acsdkAlexaSeekControllerInterfaces/AlexaSeekControllerInterface.h b/capabilities/AlexaSeekController/acsdkAlexaSeekControllerInterfaces/include/acsdkAlexaSeekControllerInterfaces/AlexaSeekControllerInterface.h
new file mode 100644
index 0000000000..6028cf0deb
--- /dev/null
+++ b/capabilities/AlexaSeekController/acsdkAlexaSeekControllerInterfaces/include/acsdkAlexaSeekControllerInterfaces/AlexaSeekControllerInterface.h
@@ -0,0 +1,139 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDKALEXASEEKCONTROLLERINTERFACES_ALEXASEEKCONTROLLERINTERFACE_H_
+#define ACSDKALEXASEEKCONTROLLERINTERFACES_ALEXASEEKCONTROLLERINTERFACE_H_
+
+#include <chrono>
+#include <string>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaSeekControllerInterfaces {
+
+/**
+ * The @c AlexaSeekControllerInterface carries out actions such as navigating to a specific position in a media item.
+ * You should implement this interface for your devices and services that can seek to a specific position. If a device
+ * or service can only fast forward or rewind a media item, implement the @c Alexa.PlaybackController interface instead.
+ *
+ * An implementation of the AlexaSeekControllerInterface lets the user control media content interactions for seek
+ * navigation such as AdjustSeekPosition.
+ *
+ * @note Implementations of this interface must be thread-safe. As a new adjustSeekPosition operation can be invoked
+ * before the current operation completes on the device, the seek controller must handle concurrent operations, either
+ * by canceling the currently processing operation with an appropriate error @c Response or wait for completion of the
+ * first operation before handling the second operation.
+ */
+class AlexaSeekControllerInterface {
+public:
+    /**
+     * Struct for holding AlexaSeekController response for AlexaSeekController interface
+     *
+     * @c type should be `SUCCESS` and @c currentMediaPosition should be set to the current media's timestamp
+     * position after seeking if there are no errors while executing seek controller operation. Otherwise, it should
+     * return the corresponding error response type @c type along with a log message @c errorMessage that would
+     * be logged in the cloud, for the purposes of aiding debugging.
+     */
+    struct Response {
+        /**
+         * Enum for the different error types understood by the AlexaSeekController capability agent.
+         */
+        enum class Type {
+            /// Device processed command successfully without any errors
+            SUCCESS,
+
+            /// Indicates the operation will be canceled due to an existing seek operation still processing on the
+            /// device. This error should be returned as the response to the new operation if the device chooses
+            /// to have the previous request take precedence.
+            ALREADY_IN_OPERATION,
+
+            /// Indicates the operation will be canceled as a new seek operation is initiated before the previous
+            /// operation is completed. This error should be returned as the response to the previous operation if
+            /// the device chooses to have the new request take precedence.
+            CANCELED_BY_NEW_REQUEST,
+
+            /// Indicates there is no audio or video content that is available when a seek operation is invoked
+            NO_CONTENT_AVAILABLE,
+
+            /// Indicates the current audio or video content cannot be seeked. For example, a YouTube video ad.
+            CONTENT_CANNOT_BE_SEEKED,
+
+            /// An error occurred that can't be described by one of the other error types. For example, a runtime
+            /// exception occurred. We recommend that you always send a more specific error type, if possible.
+            INTERNAL_ERROR
+        };
+
+        /**
+         * Constructor for @c Response. This response should be used when the seek
+         * operation is executed successfully on the device and should send back the new timestamp of the current
+         * media @c currentMediaPosition after seeking. Initializes the type to `SUCCESS` by default.
+         *
+         * @param currentMediaPosition The media's new timestamp position in milliseconds after executing the seek
+         * operation.
+         */
+        Response(std::chrono::milliseconds currentMediaPosition) :
+                type{Type::SUCCESS},
+                currentMediaPosition{currentMediaPosition} {};
+
+        /**
+         * Constructor for @c Response. This response should be used when the seek operation is not executed
+         * successfully on the device. Initializes the @c currentMediaPosition to `-1` to indicate an error and
+         * should not be used when @c type is `SUCCESS`.
+         *
+         * @param type The response type @c Type. Should indicate a corresponding error type and must not be `SUCCESS`.
+         * @param errorMessage The error message if @c type is other than `SUCCESS`.
+         */
+        Response(Type type, const std::string& errorMessage) :
+                type{type},
+                currentMediaPosition{-1},
+                errorMessage{errorMessage} {};
+
+        /// The AlexaSeekControllerInterface response type
+        Type type;
+
+        /// The current position of the video or audio content in milliseconds after seeking. This value must always be
+        /// greater than or equal to zero if the operation is successful and should be negative if errors are
+        /// encountered during the execution of the seek operation.
+        std::chrono::milliseconds currentMediaPosition;
+
+        /// The error message for logging if the @c type is any other than SUCCESS, for the purposes of aiding
+        /// debugging.
+        std::string errorMessage;
+    };
+
+    /**
+     * Virtual destructor to assure proper cleanup of derived types.
+     */
+    virtual ~AlexaSeekControllerInterface() = default;
+
+    /**
+     * Execute seek operation for audio or video content on the device. If the seek delta @c deltaPosition would result
+     * in the adjusted timestamp position exceeding the timestamp boundaries of the media content, the operation should
+     * set the new media's position to the maximum allotted timestamp of the media. For example, the content's new
+     * timestamp position should be set to zero if the last position plus the seek delta is less than zero. This method
+     * must respond with the new timestamp position @c Response.currentMediaPosition.
+     *
+     * @param deltaPosition The value to seek a media content. Negative to seek the content backward and positive to
+     * seek the content forward.
+     *
+     * @return A @c AlexaSeekControllerInterface.Response to indicate whether seek operation was successfully executed
+     * or encountered an error while executing.
+     */
+    virtual Response adjustSeekPosition(const std::chrono::milliseconds& deltaPosition) = 0;
+};
+
+}  // namespace acsdkAlexaSeekControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDKALEXASEEKCONTROLLERINTERFACES_ALEXASEEKCONTROLLERINTERFACE_H_
diff --git a/capabilities/AlexaVideoCommon/.clang-format b/capabilities/AlexaVideoCommon/.clang-format
new file mode 100644
index 0000000000..382ffea861
--- /dev/null
+++ b/capabilities/AlexaVideoCommon/.clang-format
@@ -0,0 +1,101 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
diff --git a/capabilities/AlexaVideoCommon/CMakeLists.txt b/capabilities/AlexaVideoCommon/CMakeLists.txt
new file mode 100644
index 0000000000..d4592e7779
--- /dev/null
+++ b/capabilities/AlexaVideoCommon/CMakeLists.txt
@@ -0,0 +1,2 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+add_subdirectory("VideoContent")
diff --git a/capabilities/AlexaVideoCommon/VideoContent/CMakeLists.txt b/capabilities/AlexaVideoCommon/VideoContent/CMakeLists.txt
new file mode 100644
index 0000000000..e4bf94fe45
--- /dev/null
+++ b/capabilities/AlexaVideoCommon/VideoContent/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(AlexaVideoCommon LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/capabilities/AlexaVideoCommon/VideoContent/include/acsdk/VideoContent/VideoEntityTypes.h b/capabilities/AlexaVideoCommon/VideoContent/include/acsdk/VideoContent/VideoEntityTypes.h
new file mode 100644
index 0000000000..73b81cd663
--- /dev/null
+++ b/capabilities/AlexaVideoCommon/VideoContent/include/acsdk/VideoContent/VideoEntityTypes.h
@@ -0,0 +1,513 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_VIDEOCONTENT_INCLUDE_ACSDK_VIDEOCONTENT_VIDEOENTITYTYPES_H_
+#define ALEXA_CLIENT_SDK_VIDEOCONTENT_INCLUDE_ACSDK_VIDEOCONTENT_VIDEOENTITYTYPES_H_
+
+#include <string>
+#include <unordered_map>
+
+#include <rapidjson/document.h>
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaVideoCommon {
+
+/**
+ * @brief A helper class that provides an aggregation of all video entity types. Users can ask Alexa to search for video
+ * content by specifying characteristics of the content, such as a season and episode of a TV show, or a genre of movie.
+ * Alexa sends these characteristics, called entity types for searching the requested content. This class also provides
+ * methods to parse the entity payload into respective types.
+ *
+ * @see https://developer.amazon.com/en-US/docs/alexa/video/entity-types-for-video-content.html
+ */
+class VideoEntity {
+public:
+    /**
+     * Enum definitions for all video entity types.
+     */
+    enum class EntityType {
+        /// An actor credited in video media content.
+        ACTOR,
+        /// An application that the user might launch, such as Prime Video.
+        APP,
+        /// Represents the identifying data for a television channel.
+        CHANNEL,
+        /// A character in a movie or TV show.
+        CHARACTER,
+        /// A director credited in video media content.
+        DIRECTOR,
+        /// Episode number for serial content.
+        EPISODE,
+        /// A type of event, such as a music concert or sporting event.
+        EVENT,
+        /// Related video entities, such as a trilogy or five part series.
+        FRANCHISE,
+        /// Category of video content, such as action, drama, or comedy.
+        GENRE,
+        /// Represents the name of a sporting league.
+        LEAGUE,
+        /// Type category of the video content, such as movie or TV show.
+        MEDIA_TYPE,
+        /// Indicates whether the user asks for popular content.
+        POPULARITY,
+        /// Production company name for the video media content.
+        PRODUCTION_COMPANY,
+        /// Indicates whether the user content is new or old.
+        RECENCY,
+        /// Season number for serial content.
+        SEASON,
+        /// Category of a sport, such as football.
+        SPORT,
+        /// Name of a professional sports team.
+        SPORTS_TEAM,
+        /// Identifying data for the piece of video content, such as the movie title.
+        VIDEO,
+        /// Represents the requested video resolution, such as HD.
+        VIDEO_RESOLUTION
+    };
+
+    /**
+     * An actor type entity object that represents an actor credited in video media content.
+     */
+    struct Actor {
+        /// External Id map where key is the provider, value is the Id; for example, a key-value pair could be asin_us
+        /// and B089PWRYQL.
+        std::unordered_map<std::string, std::string> externalIds;
+        /// Name of the actor. There is no restriction on the format of actor name.
+        std::string name;
+    };
+
+    /**
+     * An app type entity object that represents an application; for example, Prime Video.
+     */
+    struct App {
+        /// External Id map where key is the provider, value is the Id; for example, a key-value pair could be asin_us
+        /// and B089PWRYQL.
+        std::unordered_map<std::string, std::string> externalIds;
+        /// Name of the application.
+        std::string name;
+    };
+
+    /**
+     * A channel type entity object that represents the identifying data for a television channel.
+     */
+    struct Channel {
+        /**
+         * Instantiate a @c Channel entity type.
+         *
+         * @param channelNum Channel number for this instance.
+         */
+        Channel(int channelNum) : channelNumber{channelNum} {};
+
+        /// External Id map where key is the provider, value is the Id; for example, a key-value pair could be asin_us
+        /// and B089PWRYQL.
+        std::unordered_map<std::string, std::string> externalIds;
+        /// The channel number.
+        int channelNumber;
+        /// The call sign for the channel.
+        std::string channelCallSign;
+        /// The URI of the channel.
+        std::string uri;
+        /// The name of the channel.
+        std::string name;
+    };
+
+    /**
+     * An character type entity object represented in video media content; for example, Snow White.
+     */
+    struct Character {
+        /// External Id map where key is the provider, value is the Id; for example, a key-value pair could be asin_us
+        /// and B089PWRYQL.
+        std::unordered_map<std::string, std::string> externalIds;
+        /// The name of the character
+        std::string name;
+    };
+
+    /**
+     * A director is an entity object that represents a director credited for a video media content.
+     */
+    struct Director {
+        /// External Id map where key is the provider, value is the Id; for example, a key-value pair could be asin_us
+        /// and B089PWRYQL.
+        std::unordered_map<std::string, std::string> externalIds;
+        /// The name of the director.
+        std::string name;
+    };
+
+    /**
+     * A episode type entity object that represents the episode numbers for serial content like TV. For example, the
+     * eighth episode in season two of "Transparent" would have episode number 8.
+     */
+    struct Episode {
+        /// The episode number.
+        std::string number;
+    };
+
+    /**
+     * An event is an entity object to a type of event; examples would include sports, music, or other types of events.
+     * For example, searching for "Football games" would search for a 'game' event entity and a 'football' sport entity.
+     */
+    struct Event {
+        /// External Id map where key is the provider, value is the Id; for example, a key-value pair could be asin_us
+        /// and B089PWRYQL.
+        std::unordered_map<std::string, std::string> externalIds;
+        /// The name of the event type.
+        std::string name;
+    };
+
+    /**
+     * A franchise type entity object that represents a video entity which can represent a number of video entities,
+     * like movies or TV shows. For example, Intergalactic Wars
+     */
+    struct Franchise {
+        /// The name of the franchise.
+        std::string name;
+    };
+
+    /**
+     * A genre type entity object that represents the genre of video media content such as action, drama or comedy. For
+     * example, Action.
+     */
+    struct Genre {
+        /// External Id map where key is the provider, value is the Id; for example, a key-value pair could be asin_us
+        /// and B089PWRYQL.
+        std::unordered_map<std::string, std::string> externalIds;
+        /// The name of the genre.
+        std::string name;
+    };
+
+    /**
+     * A league type entity object that represents the categorical information for a sporting league.
+     */
+    struct League {
+        /// External Id map where key is the provider, value is the Id; for example, a key-value pair could be asin_us
+        /// and B089PWRYQL.
+        std::unordered_map<std::string, std::string> externalIds;
+        /// The name of the league.
+        std::string name;
+    };
+
+    /**
+     * A media type entity object that represents the media type category of a particular piece of content.
+     */
+    struct Media {
+        /**
+         * Enum definitions for all types of Media.
+         */
+        enum class Type {
+            /// Movie type.
+            MOVIE,
+            /// Video type.
+            VIDEO,
+            /// TV Show type.
+            TV_SHOW
+        };
+
+        /**
+         * Instantiate a @c Media entity.
+         *
+         * @param typeValue Enum value for the media type.
+         */
+        Media(Type typeValue) : type{typeValue} {};
+
+        /// The media type.
+        Type type;
+    };
+
+    /**
+     * A popularity type entity object that indicates whether the user asks for popular content.
+     */
+    struct Popularity {
+        /// Indicates to provider that the user searches for popular content
+        bool value;
+    };
+
+    /**
+     * A production company type entity object that represents the production company name for the video media content.
+     */
+    struct ProductionCompany {
+        /// Production company name
+        std::string name;
+    };
+
+    /**
+     * A recency type entity object that resolved values for Recency indicate whether the user asks for new or old
+     * content.
+     */
+    struct Recency {
+        /**
+         * Enum definitions for whether the content is recent or not.
+         */
+        enum class Type {
+            /// New content.
+            NEW,
+            /// Old content.
+            OLD
+        };
+
+        /**
+         * Instantiate a @c Recency entity.
+         *
+         * @param recencyType indicates how recent was this content.
+         */
+        Recency(Type recencyType) : type{recencyType} {};
+
+        /// Indicates whether the user searches for new or old content.
+        Type type;
+    };
+
+    /**
+     * A season type entity object that represents the season numbers for serial content like TV Shows. For example, the
+     * eighth episode in season two of a serial content would have season number 2.
+     */
+    struct Season {
+        /// The season number.
+        std::string number;
+    };
+
+    /**
+     * A sport type entity object that represents the categorical information of a sport; for example, football.
+     */
+    struct Sport {
+        /// External Id map where key is the provider, value is the Id; for example, a key-value pair could be asin_us
+        /// and B089PWRYQL.
+        std::unordered_map<std::string, std::string> externalIds;
+        /// The name of the sport.
+        std::string name;
+    };
+
+    /**
+     * A sports team type entity object that represents the categorical information of a professional sports team.
+     */
+    struct SportsTeam {
+        /// External Id map where key is the provider, value is the Id; for example, a key-value pair could be asin_us
+        /// and B089PWRYQL.
+        std::unordered_map<std::string, std::string> externalIds;
+        /// The name of the sports team.
+        std::string name;
+    };
+
+    /**
+     * A video type entity object that represents the identifying data for the piece of video content.
+     */
+    struct Video {
+        /// External Id map where key is the provider, value is the Id; for example, a key-value pair could be asin_us
+        /// and B089PWRYQL.
+        std::unordered_map<std::string, std::string> externalIds;
+        /// The name of the video.
+        std::string name;
+    };
+
+    /**
+     * A video resolution type entity object that represents the requested video resolution.
+     */
+    struct VideoResolution {
+        /**
+         * Enum definitions for all video resolution types.
+         */
+        enum class Type {
+            /// SD type (480p).
+            SD,
+            /// HD type (720p-1080p).
+            HD,
+            /// 4K type (2160p).
+            FOUR_K,
+            /// 8K type (4320p).
+            EIGHT_K
+        };
+
+        /**
+         * Instantiate a @c VideoResolution entity.
+         *
+         * @param resolutionType The resolution type of the content.
+         */
+        VideoResolution(Type resolutionType) : type{resolutionType} {};
+
+        /// Video resolution.
+        Type type;
+    };
+
+    /**
+     * Parse input json to determine if it contains a video entity type.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] entityType Parsed @c entity type object.
+     * @return true if json contains a video entity type, false otherwise.
+     */
+    bool parseVideoEntityType(const rapidjson::Value& entityJson, VideoEntity::EntityType& entityType);
+
+    /**
+     * Parse video entity of type @c Actor.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] actor Parsed @c Media object.
+     * @return true if parsing is successful.
+     */
+    bool parseActorEntity(const rapidjson::Value& entityJson, Actor& actor);
+
+    /**
+     * Parse video entity of type @c App.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] actor Parsed @c Media object.
+     * @return true if parsing is successful.
+     */
+    bool parseAppEntity(const rapidjson::Value& entityJson, App& app);
+
+    /**
+     * Parse video entity of type @c Channel.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] channel Parsed @c Channel object.
+     * @return true if parsing is successful.
+     */
+    bool parseChannelEntity(const rapidjson::Value& entityJson, Channel& channel);
+
+    /**
+     * Parse video entity of type @c Character.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] character Parsed @c Character object.
+     * @return true if parsing is successful.
+     */
+    bool parseCharacterEntity(const rapidjson::Value& entityJson, Character& character);
+
+    /**
+     * Parse video entity of type @c Director.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] director Parsed @c Director object.
+     * @return true if parsing is successful.
+     */
+    bool parseDirectorEntity(const rapidjson::Value& entityJson, Director& director);
+
+    /**
+     * Parse video entity of type @c Episode.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] episode Parsed @c Episode object.
+     * @return true if parsing is successful.
+     */
+    bool parseEpisodeEntity(const rapidjson::Value& entityJson, Episode& episode);
+
+    /**
+     * Parse video entity of type @c Event.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] event Parsed @c Event object.
+     * @return true if parsing is successful.
+     */
+    bool parseEventEntity(const rapidjson::Value& entityJson, Event& event);
+
+    /**
+     * Parse video entity of type @c Franchise.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] franchise Parsed @c Franchise object.
+     * @return true if parsing is successful.
+     */
+    bool parseFranchiseEntity(const rapidjson::Value& entityJson, Franchise& franchise);
+
+    /**
+     * Parse video entity of type @c Genre.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] genre Parsed @c Genre object.
+     * @return true if parsing is successful.
+     */
+    bool parseGenreEntity(const rapidjson::Value& entityJson, Genre& genre);
+
+    /**
+     * Parse video entity of type @c League.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] league Parsed @c Media object.
+     * @return true if parsing is successful.
+     */
+    bool parseLeagueEntity(const rapidjson::Value& entityJson, League& league);
+
+    /**
+     * Parse video entity of type @c Media.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] media Parsed @c Media object.
+     * @return true if parsing is successful.
+     */
+    bool parseMediaEntity(const rapidjson::Value& entityJson, Media& media);
+
+    /**
+     * Parse video entity of type @c Popularity.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] popularity Parsed @c Popularity object.
+     * @return true if parsing is successful.
+     */
+    bool parsePopularityEntity(const rapidjson::Value& entityJson, Popularity& popularity);
+
+    /**
+     * Parse video entity of type @c ProductionCompany.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] actor Parsed @c ProductionCompany object.
+     * @return true if parsing is successful.
+     */
+    bool parseProductionCompanyEntity(const rapidjson::Value& entityJson, ProductionCompany& productionCompany);
+
+    /**
+     * Parse video entity of type @c Recency.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] recency Parsed @c Recency object.
+     * @return true if parsing is successful.
+     */
+    bool parseRecencyEntity(const rapidjson::Value& entityJson, Recency& recency);
+
+    /**
+     * Parse video entity of type @c Season.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] season Parsed @c Season object.
+     * @return true if parsing is successful.
+     */
+    bool parseSeasonEntity(const rapidjson::Value& entityJson, Season& season);
+
+    /**
+     * Parse video entity of type @c Sport.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] sport Parsed @c Sport object.
+     * @return true if parsing is successful.
+     */
+    bool parseSportEntity(const rapidjson::Value& entityJson, Sport& sport);
+
+    /**
+     * Parse video entity of type @c SportsTeam.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] sportsTeam Parsed @c SportsTeam object.
+     * @return true if parsing is successful.
+     */
+    bool parseSportsTeamEntity(const rapidjson::Value& entityJson, SportsTeam& sportsTeam);
+
+    /**
+     * Parse video entity of type @c Video.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] video Parsed @c Video object.
+     * @return true if parsing is successful.
+     */
+    bool parseVideoEntity(const rapidjson::Value& entityJson, Video& video);
+
+    /**
+     * Parse video entity of type @c VideoResolution.
+     * @param[in] entityJson RapidJson object with the entity json to be parsed.
+     * @param[out] videoResolution Parsed @c VideoResolution object.
+     * @return true if parsing is successful.
+     */
+    bool parseVideoResolutionEntity(const rapidjson::Value& entityJson, VideoResolution& videoResolution);
+
+    /**
+     * Convert Video Entity type to its corresponding string.
+     * @param entityType the video entity type.
+     * @return the string corresponding to the entity type.
+     */
+    static std::string convertEntityTypeToString(const VideoEntity::EntityType& entityType);
+};
+
+}  // namespace acsdkAlexaVideoCommon
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_VIDEOCONTENT_INCLUDE_ACSDK_VIDEOCONTENT_VIDEOENTITYTYPES_H_
diff --git a/capabilities/AlexaVideoCommon/VideoContent/src/CMakeLists.txt b/capabilities/AlexaVideoCommon/VideoContent/src/CMakeLists.txt
new file mode 100644
index 0000000000..d31ec001c7
--- /dev/null
+++ b/capabilities/AlexaVideoCommon/VideoContent/src/CMakeLists.txt
@@ -0,0 +1,11 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkAlexaVideoCommon")
+
+add_library(AlexaVideoCommon VideoEntityTypes.cpp)
+
+target_include_directories(AlexaVideoCommon PUBLIC
+        "${AlexaVideoCommon_SOURCE_DIR}/include")
+
+target_link_libraries(AlexaVideoCommon AVSCommon)
+
+# install target
+asdk_install()
diff --git a/capabilities/AlexaVideoCommon/VideoContent/src/VideoEntityTypes.cpp b/capabilities/AlexaVideoCommon/VideoContent/src/VideoEntityTypes.cpp
new file mode 100644
index 0000000000..fb4bd7ce0b
--- /dev/null
+++ b/capabilities/AlexaVideoCommon/VideoContent/src/VideoEntityTypes.cpp
@@ -0,0 +1,641 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/VideoContent/VideoEntityTypes.h"
+
+#include <AVSCommon/Utils/JSON/JSONGenerator.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaVideoCommon {
+
+using namespace avsCommon;
+using namespace avsCommon::utils;
+
+/// String to identify log entries originating from this file.
+#define TAG "VideoEntity"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+/// Json key for parsing type.
+static const auto TYPE = "type";
+
+/// Json key for parsing value.
+static const auto VALUE = "value";
+
+/// Json key for parsing externalIds.
+static const auto EXTERNAL_IDS = "externalIds";
+
+/// Json key for parsing entityMetadata.
+static const auto ENTITY_METADATA = "entityMetadata";
+
+/// Json key for parsing channelNumber.
+static const auto CHANNEL_NUMBER = "channelNumber";
+
+/// Json key for parsing channelCallSign.
+static const auto CHANNEL_CALL_SIGN = "channelCallSign";
+
+/// Json key for parsing uri.
+static const auto URI = "uri";
+
+/// A map to convert string from json to MediaType enum
+static const std::unordered_map<std::string, VideoEntity::Media::Type> stringToMediaTypeMap = {
+    {"MOVIE", VideoEntity::Media::Type::MOVIE},
+    {"VIDEO", VideoEntity::Media::Type::VIDEO},
+    {"TV_SHOW", VideoEntity::Media::Type::TV_SHOW}};
+
+/// A map to convert string from json to RecencyType enum
+static const std::unordered_map<std::string, VideoEntity::Recency::Type> stringToRecencyTypeMap = {
+    {"NEW", VideoEntity::Recency::Type::NEW},
+    {"OLD", VideoEntity::Recency::Type::OLD}};
+
+/// A map to convert string from json to Resolution enum
+static const std::unordered_map<std::string, VideoEntity::VideoResolution::Type> stringToResolutionMap = {
+    {"SD", VideoEntity::VideoResolution::Type::SD},
+    {"HD", VideoEntity::VideoResolution::Type::HD},
+    {"4k", VideoEntity::VideoResolution::Type::FOUR_K},
+    {"8k", VideoEntity::VideoResolution::Type::EIGHT_K}};
+
+/// A map to convert string from json to EntityType enum
+static const std::unordered_map<std::string, VideoEntity::EntityType> stringToEntityTypeMap = {
+    {"Actor", VideoEntity::EntityType::ACTOR},
+    {"App", VideoEntity::EntityType::APP},
+    {"Channel", VideoEntity::EntityType::CHANNEL},
+    {"Character", VideoEntity::EntityType::CHARACTER},
+    {"Director", VideoEntity::EntityType::DIRECTOR},
+    {"Episode", VideoEntity::EntityType::EPISODE},
+    {"Event", VideoEntity::EntityType::EVENT},
+    {"Franchise", VideoEntity::EntityType::FRANCHISE},
+    {"Genre", VideoEntity::EntityType::GENRE},
+    {"League", VideoEntity::EntityType::LEAGUE},
+    {"MediaType", VideoEntity::EntityType::MEDIA_TYPE},
+    {"Popularity", VideoEntity::EntityType::POPULARITY},
+    {"ProductionCompany", VideoEntity::EntityType::PRODUCTION_COMPANY},
+    {"Recency", VideoEntity::EntityType::RECENCY},
+    {"Season", VideoEntity::EntityType::SEASON},
+    {"Sport", VideoEntity::EntityType::SPORT},
+    {"SportsTeam", VideoEntity::EntityType::SPORTS_TEAM},
+    {"Video", VideoEntity::EntityType::VIDEO},
+    {"VideoResolution", VideoEntity::EntityType::VIDEO_RESOLUTION}};
+
+/**
+ * Templatized method to convert string to given template type.
+ * @tparam T type of Enum that needs a conversion.
+ * @param mapping string to enum type mapping.
+ * @param in String to be converted.
+ * @param out [out] Reference to enum resolved.
+ *
+ * @return true if string is resolvable.
+ */
+template <typename T>
+static bool stringToEnum(const std::unordered_map<std::string, T>& mapping, const std::string& in, T& out) {
+    auto it = mapping.find(in);
+    if (it != mapping.end()) {
+        out = it->second;
+        return true;
+    }
+
+    return false;
+}
+
+bool VideoEntity::parseVideoEntityType(const rapidjson::Value& entityJson, VideoEntity::EntityType& entityType) {
+    auto retVal = false;
+    do {
+        if (!stringToEnum(stringToEntityTypeMap, entityJson[TYPE].GetString(), entityType)) {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseVideoEntityType"));
+            break;
+        }
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseActorEntity(const rapidjson::Value& entityJson, VideoEntity::Actor& actor) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(EXTERNAL_IDS) && entityJson[EXTERNAL_IDS].IsObject()) {
+            const auto& externalIds = entityJson[EXTERNAL_IDS];
+            for (rapidjson::Value::ConstMemberIterator it = externalIds.MemberBegin(); it != externalIds.MemberEnd();
+                 ++it) {
+                if (it->name.IsString() && it->value.IsString()) {
+                    actor.externalIds.emplace(it->name.GetString(), it->value.GetString());
+                }
+            }
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseExternalId"));
+            break;
+        }
+
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            actor.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseAppEntity(const rapidjson::Value& entityJson, VideoEntity::App& app) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(EXTERNAL_IDS) && entityJson[EXTERNAL_IDS].IsObject()) {
+            const auto& externalIds = entityJson[EXTERNAL_IDS];
+            for (rapidjson::Value::ConstMemberIterator it = externalIds.MemberBegin(); it != externalIds.MemberEnd();
+                 ++it) {
+                if (it->name.IsString() && it->value.IsString()) {
+                    app.externalIds.emplace(it->name.GetString(), it->value.GetString());
+                }
+            }
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseExternalId"));
+            break;
+        }
+
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            app.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseChannelEntity(const rapidjson::Value& entityJson, VideoEntity::Channel& channel) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(EXTERNAL_IDS) && entityJson[EXTERNAL_IDS].IsObject()) {
+            const auto& externalIds = entityJson[EXTERNAL_IDS];
+            for (auto it = externalIds.MemberBegin(); it != externalIds.MemberEnd(); ++it) {
+                if (it->name.IsString() && it->value.IsString()) {
+                    channel.externalIds.emplace(it->name.GetString(), it->value.GetString());
+                }
+            }
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseExternalId"));
+            break;
+        }
+
+        if (entityJson.HasMember(ENTITY_METADATA) && entityJson[ENTITY_METADATA].IsObject()) {
+            const auto& entityMetaData = entityJson[ENTITY_METADATA];
+
+            if (entityMetaData.HasMember(CHANNEL_NUMBER) && entityMetaData[CHANNEL_NUMBER].IsNumber()) {
+                channel.channelNumber = entityMetaData[CHANNEL_NUMBER].GetInt();
+            }
+
+            if (entityMetaData.HasMember(CHANNEL_CALL_SIGN) && entityMetaData[CHANNEL_CALL_SIGN].IsString()) {
+                channel.channelCallSign = entityMetaData[CHANNEL_CALL_SIGN].GetString();
+            }
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseMetadata"));
+            break;
+        }
+
+        if (entityJson.HasMember(URI) && entityJson[URI].IsString()) {
+            channel.uri = entityJson[URI].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseURI"));
+            break;
+        }
+
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            channel.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseCharacterEntity(const rapidjson::Value& entityJson, VideoEntity::Character& character) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(EXTERNAL_IDS) && entityJson[EXTERNAL_IDS].IsObject()) {
+            const auto& externalIds = entityJson[EXTERNAL_IDS];
+            for (auto it = externalIds.MemberBegin(); it != externalIds.MemberEnd(); ++it) {
+                if (it->name.IsString() && it->value.IsString()) {
+                    character.externalIds.emplace(it->name.GetString(), it->value.GetString());
+                }
+            }
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseExternalIds"));
+            break;
+        }
+
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            character.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseDirectorEntity(const rapidjson::Value& entityJson, VideoEntity::Director& director) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(EXTERNAL_IDS) && entityJson[EXTERNAL_IDS].IsObject()) {
+            const auto& externalIds = entityJson[EXTERNAL_IDS];
+            for (auto it = externalIds.MemberBegin(); it != externalIds.MemberEnd(); ++it) {
+                if (it->name.IsString() && it->value.IsString()) {
+                    director.externalIds.emplace(it->name.GetString(), it->value.GetString());
+                }
+            }
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseExternalIds"));
+            break;
+        }
+
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            director.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseEpisodeEntity(const rapidjson::Value& entityJson, VideoEntity::Episode& episode) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            episode.number = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseEventEntity(const rapidjson::Value& entityJson, VideoEntity::Event& event) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(EXTERNAL_IDS) && entityJson[EXTERNAL_IDS].IsObject()) {
+            const auto& externalIds = entityJson[EXTERNAL_IDS];
+            for (rapidjson::Value::ConstMemberIterator it = externalIds.MemberBegin(); it != externalIds.MemberEnd();
+                 ++it) {
+                if (it->name.IsString() && it->value.IsString()) {
+                    event.externalIds.emplace(it->name.GetString(), it->value.GetString());
+                }
+            }
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseExternalIds"));
+            break;
+        }
+
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            event.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseFranchiseEntity(const rapidjson::Value& entityJson, VideoEntity::Franchise& franchise) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            franchise.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseGenreEntity(const rapidjson::Value& entityJson, VideoEntity::Genre& genre) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(EXTERNAL_IDS) && entityJson[EXTERNAL_IDS].IsObject()) {
+            const auto& externalIds = entityJson[EXTERNAL_IDS];
+            for (rapidjson::Value::ConstMemberIterator it = externalIds.MemberBegin(); it != externalIds.MemberEnd();
+                 ++it) {
+                if (it->name.IsString() && it->value.IsString()) {
+                    genre.externalIds.emplace(it->name.GetString(), it->value.GetString());
+                }
+            }
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseExternalIds"));
+            break;
+        }
+
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            genre.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseLeagueEntity(const rapidjson::Value& entityJson, VideoEntity::League& league) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(EXTERNAL_IDS) && entityJson[EXTERNAL_IDS].IsObject()) {
+            const auto& externalIds = entityJson[EXTERNAL_IDS];
+            for (rapidjson::Value::ConstMemberIterator it = externalIds.MemberBegin(); it != externalIds.MemberEnd();
+                 ++it) {
+                if (it->name.IsString() && it->value.IsString()) {
+                    league.externalIds.emplace(it->name.GetString(), it->value.GetString());
+                }
+            }
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseExternalIds"));
+            break;
+        }
+
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            league.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseMediaEntity(const rapidjson::Value& entityJson, VideoEntity::Media& media) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            if (!stringToEnum(stringToMediaTypeMap, entityJson[VALUE].GetString(), media.type)) {
+                ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseMediaType"));
+                break;
+            }
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parsePopularityEntity(const rapidjson::Value& entityJson, VideoEntity::Popularity& popularity) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            popularity.value = std::string(entityJson[VALUE].GetString()) == "TRUE" ? true : false;
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParsePopularityValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseProductionCompanyEntity(
+    const rapidjson::Value& entityJson,
+    VideoEntity::ProductionCompany& productionCompany) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            productionCompany.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseRecencyEntity(const rapidjson::Value& entityJson, VideoEntity::Recency& recency) {
+    bool retVal = false;
+    do {
+        if (!stringToEnum(stringToRecencyTypeMap, entityJson[VALUE].GetString(), recency.type)) {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseRecencyType"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseSeasonEntity(const rapidjson::Value& entityJson, VideoEntity::Season& season) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            season.number = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseSportEntity(const rapidjson::Value& entityJson, VideoEntity::Sport& sport) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(EXTERNAL_IDS) && entityJson[EXTERNAL_IDS].IsObject()) {
+            const auto& externalIds = entityJson[EXTERNAL_IDS];
+            for (rapidjson::Value::ConstMemberIterator it = externalIds.MemberBegin(); it != externalIds.MemberEnd();
+                 ++it) {
+                if (it->name.IsString() && it->value.IsString()) {
+                    sport.externalIds.emplace(it->name.GetString(), it->value.GetString());
+                }
+            }
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseExternalIds"));
+            break;
+        }
+
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            sport.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseSportsTeamEntity(const rapidjson::Value& entityJson, VideoEntity::SportsTeam& sportsTeam) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(EXTERNAL_IDS) && entityJson[EXTERNAL_IDS].IsObject()) {
+            const auto& externalIds = entityJson[EXTERNAL_IDS];
+            for (rapidjson::Value::ConstMemberIterator it = externalIds.MemberBegin(); it != externalIds.MemberEnd();
+                 ++it) {
+                if (it->name.IsString() && it->value.IsString()) {
+                    sportsTeam.externalIds.emplace(it->name.GetString(), it->value.GetString());
+                }
+            }
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseExternalIds"));
+            break;
+        }
+
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            sportsTeam.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseVideoEntity(const rapidjson::Value& entityJson, VideoEntity::Video& video) {
+    bool retVal = false;
+    do {
+        if (entityJson.HasMember(EXTERNAL_IDS) && entityJson[EXTERNAL_IDS].IsObject()) {
+            const auto& externalIds = entityJson[EXTERNAL_IDS];
+            for (rapidjson::Value::ConstMemberIterator it = externalIds.MemberBegin(); it != externalIds.MemberEnd();
+                 ++it) {
+                if (it->name.IsString() && it->value.IsString()) {
+                    video.externalIds.emplace(it->name.GetString(), it->value.GetString());
+                }
+            }
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseExternalIds"));
+            break;
+        }
+
+        if (entityJson.HasMember(VALUE) && entityJson[VALUE].IsString()) {
+            video.name = entityJson[VALUE].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseValue"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+bool VideoEntity::parseVideoResolutionEntity(
+    const rapidjson::Value& entityJson,
+    VideoEntity::VideoResolution& videoResolution) {
+    bool retVal = false;
+    do {
+        if (!stringToEnum(stringToResolutionMap, entityJson[VALUE].GetString(), videoResolution.type)) {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseVideoResolutionType"));
+            break;
+        }
+
+        retVal = true;
+    } while (0);
+
+    return retVal;
+}
+
+std::string VideoEntity::convertEntityTypeToString(const VideoEntity::EntityType& entityType) {
+    switch (entityType) {
+        case VideoEntity::EntityType::ACTOR:
+            return "Actor";
+        case VideoEntity::EntityType::APP:
+            return "App";
+        case VideoEntity::EntityType::CHANNEL:
+            return "Channel";
+        case VideoEntity::EntityType::CHARACTER:
+            return "Character";
+        case VideoEntity::EntityType::DIRECTOR:
+            return "Director";
+        case VideoEntity::EntityType::EPISODE:
+            return "Episode";
+        case VideoEntity::EntityType::EVENT:
+            return "Event";
+        case VideoEntity::EntityType::FRANCHISE:
+            return "Franchise";
+        case VideoEntity::EntityType::GENRE:
+            return "Genre";
+        case VideoEntity::EntityType::LEAGUE:
+            return "League";
+        case VideoEntity::EntityType::MEDIA_TYPE:
+            return "MediaType";
+        case VideoEntity::EntityType::POPULARITY:
+            return "Popularity";
+        case VideoEntity::EntityType::PRODUCTION_COMPANY:
+            return "ProductionCompany";
+        case VideoEntity::EntityType::RECENCY:
+            return "Recency";
+        case VideoEntity::EntityType::SEASON:
+            return "Season";
+        case VideoEntity::EntityType::SPORT:
+            return "Sport";
+        case VideoEntity::EntityType::SPORTS_TEAM:
+            return "SportsTeam";
+        case VideoEntity::EntityType::VIDEO:
+            return "Video";
+        case VideoEntity::EntityType::VIDEO_RESOLUTION:
+            return "VideoResolution";
+    }
+    return "";
+}
+
+}  // namespace acsdkAlexaVideoCommon
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaVideoCommon/VideoContent/test/CMakeLists.txt b/capabilities/AlexaVideoCommon/VideoContent/test/CMakeLists.txt
new file mode 100644
index 0000000000..c80da05536
--- /dev/null
+++ b/capabilities/AlexaVideoCommon/VideoContent/test/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+    "${AVSCommon_INCLUDE_DIRS}"
+    "${AVSCommon_SOURCE_DIR}/AVS/test")
+
+
+discover_unit_tests("${INCLUDE_PATH}" AlexaVideoCommon)
diff --git a/capabilities/AlexaVideoCommon/VideoContent/test/VideoEntityTypesTest.cpp b/capabilities/AlexaVideoCommon/VideoContent/test/VideoEntityTypesTest.cpp
new file mode 100644
index 0000000000..c0ec3afd64
--- /dev/null
+++ b/capabilities/AlexaVideoCommon/VideoContent/test/VideoEntityTypesTest.cpp
@@ -0,0 +1,382 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/// @file VideoEntityTest.cpp
+
+#include "acsdk/VideoContent/VideoEntityTypes.h"
+
+#include <gtest/gtest.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaVideoCommon {
+namespace test {
+using namespace alexaClientSDK;
+using namespace ::testing;
+
+// Sample Entity payloads
+static const std::string ACTOR_ENTITY = R"({
+        "externalIds": {
+            "gracenote": "P000000099001"
+        },
+        "type": "Actor",
+        "value": "Actor Name"
+})";
+static const std::string APP_ENTITY = R"({
+        "externalIds": {
+            "ENTITY_ID": "amzn1.alexa-ask-target.app.72095"
+        },
+        "type": "App",
+        "value": "Prime Video"
+})";
+static const std::string CHANNEL_ENTITY = R"({
+        "externalIds": {
+            "gracenote": "TV000000000001"
+        },
+        "entityMetadata": {
+            "channelNumber": 15,
+            "channelCallSign": "KBTC"
+        },
+        "type": "Channel",
+        "value": "PBS",
+        "uri": "entity://provider/channel/15"
+})";
+static const std::string CHARACTER_ENTITY = R"({
+        "externalIds": {
+            "gracenote": "ST0000000123456",
+            "ASIN": "B00DT55P3K"
+        },
+        "type": "Character",
+        "value": "Snow White"
+})";
+static const std::string DIRECTOR_ENTITY = R"({
+        "externalIds": {
+            "gracenote": "gracenote ID"
+        },
+        "type": "Director",
+        "value": "Kenneth Lonergan"
+})";
+static const std::string EPISODE_ENTITY = R"({
+    "value": "8",
+    "type": "Episode"
+})";
+static const std::string EVENT_ENTITY = R"({
+    "externalIds": {
+        "gracenote": "SP0000000666661"
+    },
+    "type": "Event",
+    "value": "Games"
+})";
+static const std::string FRANCHISE_ENTITY = R"({
+    "type": "Franchise",
+    "value": "Intergalactic Wars"
+})";
+static const std::string GENRE_ENTITY = R"({
+    "externalIds": {
+        "gracenote": "gracenote ID"
+    },
+    "type": "Genre",
+    "value": "Action"
+})";
+static const std::string LEAGUE_ENTITY = R"({
+    "externalIds": {
+        "gracenote": "gracenote ID"
+    },
+    "type": "League",
+    "value": "NCAA"
+})";
+static const std::string MEDIA_ENTITY = R"({
+    "type": "MediaType",
+    "value": "MOVIE"
+})";
+static const std::string POPULARITY_ENTITY = R"({
+    "type": "Popularity",
+    "value": "TRUE"
+})";
+static const std::string PRODUCTION_COMPANY_ENTITY = R"({
+    "type": "ProductionCompany",
+    "value": "Marvel"
+})";
+static const std::string RECENCY_ENTITY = R"({
+    "type": "Recency",
+    "value": "NEW"
+})";
+static const std::string SEASON_ENTITY = R"({
+    "type": "Season",
+    "value": "2"
+})";
+static const std::string SPORT_ENTITY = R"({
+    "externalIds": {
+        "gracenote": "gracenote ID"
+    },
+    "type": "Sport",
+    "value": "Football"
+})";
+static const std::string SPORTS_TEAM_ENTITY = R"({
+    "externalIds": {
+        "gracenote": "gracenote ID"
+    },
+    "type": "SportsTeam",
+    "value": "University of Washington Huskies"
+})";
+static const std::string VIDEO_ENTITY = R"({
+    "externalIds": {
+        "gracenote": "MV0000000666661",
+        "asin": "B01M3X9T06"
+    },
+    "type": "Video",
+    "value": "Manchester by the Sea"
+})";
+static const std::string VIDEO_RESOLUTION_ENTITY = R"({
+    "type": "VideoResolution",
+    "value": "HD"
+})";
+
+class VideoEntityTest : public ::testing::Test {
+protected:
+    /// An instance of the @c VideoEntity that will be used to test units.
+    VideoEntity m_videoEntity;
+};
+
+/**
+ * Test successful parsing of Actor entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseActorEntity) {
+    VideoEntity::Actor actor;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(ACTOR_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseActorEntity(jsonPayload, actor));
+
+    ASSERT_FALSE(ACTOR_ENTITY.find(actor.name) == ACTOR_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of App entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseAppEntity) {
+    VideoEntity::App app;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(APP_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseAppEntity(jsonPayload, app));
+
+    ASSERT_FALSE(APP_ENTITY.find(app.name) == APP_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of Channel entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseChannelEntity) {
+    VideoEntity::Channel channel(0);
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(CHANNEL_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseChannelEntity(jsonPayload, channel));
+
+    ASSERT_FALSE(CHANNEL_ENTITY.find(channel.name) == CHANNEL_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of Character entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseCharacterEntity) {
+    VideoEntity::Character character;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(CHARACTER_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseCharacterEntity(jsonPayload, character));
+
+    ASSERT_FALSE(CHARACTER_ENTITY.find(character.name) == CHARACTER_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of Director entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseDirectorEntity) {
+    VideoEntity::Director director;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(DIRECTOR_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseDirectorEntity(jsonPayload, director));
+
+    ASSERT_FALSE(DIRECTOR_ENTITY.find(director.name) == DIRECTOR_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of Event entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseEventEntity) {
+    VideoEntity::Event event;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(EVENT_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseEventEntity(jsonPayload, event));
+
+    ASSERT_FALSE(EVENT_ENTITY.find(event.name) == EVENT_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of Episode entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseEpisodeEntity) {
+    VideoEntity::Episode episode;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(EPISODE_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseEpisodeEntity(jsonPayload, episode));
+
+    ASSERT_TRUE(episode.number == "8");
+}
+
+/**
+ * Test successful parsing of Franchise entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseFranchiseEntity) {
+    VideoEntity::Franchise franchise;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(FRANCHISE_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseFranchiseEntity(jsonPayload, franchise));
+
+    ASSERT_FALSE(FRANCHISE_ENTITY.find(franchise.name) == FRANCHISE_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of Genre entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseGenreEntity) {
+    VideoEntity::Genre genre;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(GENRE_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseGenreEntity(jsonPayload, genre));
+
+    ASSERT_FALSE(GENRE_ENTITY.find(genre.name) == GENRE_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of League entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseLeagueEntity) {
+    VideoEntity::League league;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(LEAGUE_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseLeagueEntity(jsonPayload, league));
+
+    ASSERT_FALSE(LEAGUE_ENTITY.find(league.name) == LEAGUE_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of Media entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseMediaEntity) {
+    VideoEntity::Media media(VideoEntity::Media::Type::VIDEO);
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(MEDIA_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseMediaEntity(jsonPayload, media));
+
+    ASSERT_TRUE(media.type == VideoEntity::Media::Type::MOVIE);
+}
+
+/**
+ * Test successful parsing of Popularity entity payload.
+ */
+TEST_F(VideoEntityTest, test_parsePopularityEntity) {
+    VideoEntity::Popularity popularity;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(POPULARITY_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parsePopularityEntity(jsonPayload, popularity));
+
+    ASSERT_TRUE(popularity.value);
+}
+
+/**
+ * Test successful parsing of ProductionCompany entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseProductionCompanyEntity) {
+    VideoEntity::ProductionCompany productionCompany;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(PRODUCTION_COMPANY_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseProductionCompanyEntity(jsonPayload, productionCompany));
+
+    ASSERT_FALSE(PRODUCTION_COMPANY_ENTITY.find(productionCompany.name) == PRODUCTION_COMPANY_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of Recency entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseRecencyEntity) {
+    VideoEntity::Recency recency(VideoEntity::Recency::Type::OLD);
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(RECENCY_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseRecencyEntity(jsonPayload, recency));
+
+    ASSERT_TRUE(recency.type == VideoEntity::Recency::Type::NEW);
+}
+
+/**
+ * Test successful parsing of Season entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseSeasonEntity) {
+    VideoEntity::Season season;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(SEASON_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseSeasonEntity(jsonPayload, season));
+
+    ASSERT_TRUE(season.number == "2");
+}
+
+/**
+ * Test successful parsing of Sport entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseSportEntity) {
+    VideoEntity::Sport sport;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(SPORT_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseSportEntity(jsonPayload, sport));
+
+    ASSERT_FALSE(SPORT_ENTITY.find(sport.name) == SPORT_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of SportsTeam entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseSportsTeamEntity) {
+    VideoEntity::SportsTeam sportsTeam;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(SPORTS_TEAM_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseSportsTeamEntity(jsonPayload, sportsTeam));
+
+    ASSERT_FALSE(SPORTS_TEAM_ENTITY.find(sportsTeam.name) == SPORTS_TEAM_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of Video entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseVideoEntity) {
+    VideoEntity::Video video;
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(VIDEO_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseVideoEntity(jsonPayload, video));
+
+    ASSERT_FALSE(VIDEO_ENTITY.find(video.name) == VIDEO_ENTITY.npos);
+}
+
+/**
+ * Test successful parsing of VideoResolution entity payload.
+ */
+TEST_F(VideoEntityTest, test_parseVideoResolutionEntity) {
+    VideoEntity::VideoResolution videoResolution(VideoEntity::VideoResolution::Type::SD);
+    rapidjson::Document jsonPayload;
+    ASSERT_FALSE(jsonPayload.Parse(VIDEO_RESOLUTION_ENTITY).HasParseError());
+    ASSERT_TRUE(m_videoEntity.parseVideoResolutionEntity(jsonPayload, videoResolution));
+
+    ASSERT_TRUE(videoResolution.type == VideoEntity::VideoResolution::Type::HD);
+}
+
+}  // namespace test
+}  // namespace acsdkAlexaVideoCommon
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaVideoRecorder/.clang-format b/capabilities/AlexaVideoRecorder/.clang-format
new file mode 100644
index 0000000000..382ffea861
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/.clang-format
@@ -0,0 +1,101 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
diff --git a/capabilities/AlexaVideoRecorder/CMakeLists.txt b/capabilities/AlexaVideoRecorder/CMakeLists.txt
new file mode 100644
index 0000000000..4713fc868e
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(AlexaVideoRecorder LANGUAGES CXX)
+
+add_subdirectory("acsdkAlexaVideoRecorder")
+add_subdirectory("acsdkAlexaVideoRecorderInterfaces")
diff --git a/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/CMakeLists.txt b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/CMakeLists.txt
new file mode 100644
index 0000000000..8c3ed6ffe0
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+project(acsdkAlexaVideoRecorder LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/include/acsdkAlexaVideoRecorder/AlexaVideoRecorderFactory.h b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/include/acsdkAlexaVideoRecorder/AlexaVideoRecorderFactory.h
new file mode 100644
index 0000000000..7d81cd3eef
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/include/acsdkAlexaVideoRecorder/AlexaVideoRecorderFactory.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_ACSDKALEXAVIDEORECORDER_INCLUDE_ACSDKALEXAVIDEORECORDER_ALEXAVIDEORECORDERFACTORY_H_
+#define ALEXA_CLIENT_SDK_ACSDKALEXAVIDEORECORDER_INCLUDE_ACSDKALEXAVIDEORECORDER_ALEXAVIDEORECORDERFACTORY_H_
+
+#include <memory>
+
+#include "acsdkAlexaVideoRecorderInterfaces/VideoRecorderInterface.h"
+
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/DirectiveHandlerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaVideoRecorder {
+
+/**
+ * This factory can be used to create a AlexaVideoRecorderFactory object which could be a parameter for Capability Agent
+ * construction.
+ */
+class AlexaVideoRecorderFactory {
+private:
+    /**
+     * This object contains the interfaces to interact with the AlexaVideoRecorder Capability Agent.
+     */
+    struct VideoRecorderCapabilityAgentData {
+        /// An interface used to handle Alexa.VideoRecorder directives.
+        std::shared_ptr<avsCommon::sdkInterfaces::DirectiveHandlerInterface> directiveHandler;
+        /// An interface used to configurations of the capabilities being implemented by this capability agent.
+        std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface> capabilityConfigurationInterface;
+        /// Instance of @c RequiresShutdown used for cleaning up the capability agent during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+public:
+    /**
+     * Creates a new VideoRecorder capability agent configuration.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param videoRecorder An interface that this object will use to perform the video recorder operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @return An @c Optional object containing an instance of @c VideoRecorderCapabilityAgentData object if successful.
+     */
+    static avsCommon::utils::Optional<VideoRecorderCapabilityAgentData> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<acsdkAlexaVideoRecorderInterfaces::VideoRecorderInterface>& videoRecorder,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender);
+};
+
+}  // namespace acsdkAlexaVideoRecorder
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_ACSDKALEXAVIDEORECORDER_INCLUDE_ACSDKALEXAVIDEORECORDER_ALEXAVIDEORECORDERFACTORY_H_
diff --git a/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/privateInclude/acsdkAlexaVideoRecorder/AlexaVideoRecorderCapabilityAgent.h b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/privateInclude/acsdkAlexaVideoRecorder/AlexaVideoRecorderCapabilityAgent.h
new file mode 100644
index 0000000000..33e7af2731
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/privateInclude/acsdkAlexaVideoRecorder/AlexaVideoRecorderCapabilityAgent.h
@@ -0,0 +1,206 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_ACSDKALEXAVIDEORECORDER_PRIVATEINCLUDE_ACSDKALEXAVIDEORECORDER_ALEXAVIDEORECORDERCAPABILITYAGENT_H_
+#define ALEXA_CLIENT_SDK_ACSDKALEXAVIDEORECORDER_PRIVATEINCLUDE_ACSDKALEXAVIDEORECORDER_ALEXAVIDEORECORDERCAPABILITYAGENT_H_
+
+#include <memory>
+#include <string>
+#include <unordered_set>
+
+#include <rapidjson/document.h>
+
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/AVS/CapabilityState.h>
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+#include <acsdkAlexaVideoRecorderInterfaces/VideoRecorderInterface.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaVideoRecorder {
+
+/**
+ * The @c AlexaVideoRecorderCapabilityAgent is responsible for handling Alexa.VideoRecorder directives and
+ * calls the @c VideoRecorderHandlerInterface APIs.
+ *
+ * This class implements a @c CapabilityAgent that handles the @c Alexa.VideoRecorder Interface.
+ */
+class AlexaVideoRecorderCapabilityAgent
+        : public avsCommon::avs::CapabilityAgent
+        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<AlexaVideoRecorderCapabilityAgent> {
+public:
+    /**
+     * Create an instance of @c AlexaVideoRecorderCapabilityAgent.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param videoRecorder An interface that this object will use to perform the video recorder operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @return @c nullptr if the inputs are invalid, else a new instance of @c AlexaVideoRecorderCapabilityAgent.
+     */
+    static std::shared_ptr<AlexaVideoRecorderCapabilityAgent> create(
+        avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+        std::shared_ptr<acsdkAlexaVideoRecorderInterfaces::VideoRecorderInterface> videoRecorder,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender);
+
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
+    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
+    /// @}
+
+    /// @name StateProviderInterface Functions
+    /// @{
+    void provideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken stateRequestToken) override;
+    /// @}
+
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param videoRecorder An interface that this object will use to perform the video recorder operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     */
+    AlexaVideoRecorderCapabilityAgent(
+        avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+        std::shared_ptr<acsdkAlexaVideoRecorderInterfaces::VideoRecorderInterface> videoRecorder,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender);
+
+    /**
+     * Remove a directive from the map of message IDs to DirectiveInfo instances.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
+     */
+    void removeDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Send the handling completed notification and clean up the resources.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Called on executor to handle any unknown directives received.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param type The @c ExceptionErrorType.
+     */
+    void executeUnknownDirective(std::shared_ptr<DirectiveInfo> info, avsCommon::avs::ExceptionErrorType type);
+
+    /**
+     * Call methods of @c AlexaInterfaceMessageSenderInterface based the endpoint's response for a controller method
+     * call.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param result This contains the endpoint's response of a controller call.
+     */
+    void sendResponseEvent(
+        const std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info,
+        const acsdkAlexaVideoRecorderInterfaces::VideoRecorderInterface::Response& result);
+
+    /**
+     * Parse the payload received with Alexa.ViewRecorder directives.
+     *
+     * @param jsonPayload String json payload to be parsed.
+     * @return shared pointer to @c VideoRecorderRequest, else nullptr
+     */
+    std::unique_ptr<acsdkAlexaVideoRecorderInterfaces::VideoRecorderRequest> parseDirectivePayload(
+        const std::string& jsonPayload);
+
+    /**
+     * Parse a video entity object.
+     * @param entityJson String json entity to be parsed
+     * @param [out] videoRecorderRequest Context to be loaded with the video entity object.
+     * @return true if successful.
+     */
+    bool parseEntityJson(
+        const rapidjson::Value& entityJson,
+        acsdkAlexaVideoRecorderInterfaces::VideoRecorderRequest& videoRecorderRequest);
+
+    /**
+     * Send Alexa interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaErrorResponseType Alexa interface error response type.
+     * @param responseMessage Alexa interface error response message.
+     */
+    void sendAlexaErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+        const std::string& responseMessage);
+
+    /**
+     * Send Alexa.Video interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaVideoErrorResponseType Alexa.Video interface error response type.
+     * @param responseMessage Alexa.Video interface error response message.
+     */
+    void sendAlexaVideoErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType
+            alexaVideoErrorResponseType,
+        const std::string& responseMessage);
+
+    /// Endpoint the capability agent associated to.
+    avsCommon::sdkInterfaces::endpoints::EndpointIdentifier m_endpointId;
+
+    /// Reference to @c VideoRecorderHandlerInterface.
+    std::shared_ptr<acsdkAlexaVideoRecorderInterfaces::VideoRecorderInterface> m_videoRecorder;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The @c AlexaInterfaceMessageSenderInterface used to send event messages.
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> m_responseSender;
+
+    /// This is the worker thread for the @c AlexaVideoRecorderCapabilityAgent.
+    avsCommon::utils::threading::Executor m_executor;
+};
+
+}  // namespace acsdkAlexaVideoRecorder
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_ACSDKALEXAVIDEORECORDER_PRIVATEINCLUDE_ACSDKALEXAVIDEORECORDER_ALEXAVIDEORECORDERCAPABILITYAGENT_H_
diff --git a/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/src/AlexaVideoRecorderCapabilityAgent.cpp b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/src/AlexaVideoRecorderCapabilityAgent.cpp
new file mode 100644
index 0000000000..980ae36dfa
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/src/AlexaVideoRecorderCapabilityAgent.cpp
@@ -0,0 +1,742 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkAlexaVideoRecorder/AlexaVideoRecorderCapabilityAgent.h"
+
+#include <AVSCommon/AVS/EventBuilder.h>
+#include <AVSCommon/AVS/MessageRequest.h>
+#include <AVSCommon/Utils/JSON/JSONGenerator.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Timing/TimeUtils.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaVideoRecorder {
+
+using namespace acsdkAlexaVideoCommon;
+using namespace avsCommon::avs;
+using namespace avsCommon;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::sdkInterfaces::endpoints;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::configuration;
+using namespace avsCommon::utils::timing;
+
+using namespace acsdkAlexaVideoRecorderInterfaces;
+
+/// String to identify log entries originating from this file.
+#define TAG "AlexaVideoRecorderCapabilityAgent"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+/// The namespace for this capability agent.
+static const std::string NAMESPACE{"Alexa.VideoRecorder"};
+
+/// The namespace for Alexa.Video.ErrorResponse.
+static const std::string NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE{"Alexa.Video"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for SearchAndRecord directive
+static const std::string NAME_SEARCH_AND_RECORD{"SearchAndRecord"};
+
+/// The name for SearchAndRecord response event
+static const std::string NAME_SEARCH_AND_RECORD_RESPONSE{"SearchAndRecord.Response"};
+
+/// The name for CancelRecording directive
+static const std::string NAME_CANCEL_RECORDING{"CancelRecording"};
+
+/// The name for CancelRecording directive
+static const std::string NAME_DELETE_RECORDING{"DeleteRecording"};
+
+/// The name for state property for extended GUI
+static const std::string EXTENDED_GUI_STATE_NAME{"isExtendedRecordingGUIShown"};
+
+/// The name for state property for storage level
+static const std::string STORAGE_LEVEL_STATE_NAME{"storageLevel"};
+
+/// Json key for parsing entities.
+static const std::string ENTITIES("entities");
+
+/// Json key for parsing type.
+static const std::string TYPE("type");
+
+/// Json key for parsing quantifier.
+static const std::string QUANTIFIER("quantifier");
+
+/// Json key for parsing name.
+static const std::string NAME("name");
+
+/// Json key for parsing timeWindow.
+static const std::string TIME_WINDOW("timeWindow");
+
+/// Json key for parsing start.
+static const std::string START("start");
+
+/// Json key for parsing end.
+static const std::string END("end");
+
+/// A map to convert string from json to Quantifier enum
+const std::unordered_map<std::string, VideoRecorderRequest::Quantifier> stringToQuantifierMap = {
+    {"ALL", VideoRecorderRequest::Quantifier::ALL},
+    {"NEXT", VideoRecorderRequest::Quantifier::NEXT},
+    {"NEW", VideoRecorderRequest::Quantifier::NEW},
+    {"WATCHED", VideoRecorderRequest::Quantifier::WATCHED}};
+
+std::shared_ptr<AlexaVideoRecorderCapabilityAgent> AlexaVideoRecorderCapabilityAgent::create(
+    EndpointIdentifier endpointId,
+    std::shared_ptr<VideoRecorderInterface> videoRecorder,
+    std::shared_ptr<ContextManagerInterface> contextManager,
+    std::shared_ptr<AlexaInterfaceMessageSenderInterface> responseSender,
+    std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionSender) {
+    if (endpointId.empty()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "emptyEndpointId"));
+        return nullptr;
+    }
+    if (!videoRecorder) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullVideoRecorder"));
+        return nullptr;
+    }
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManager"));
+        return nullptr;
+    }
+    if (!responseSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullResponseSender"));
+        return nullptr;
+    }
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    auto videoRecorderCapabilityAgent =
+        std::shared_ptr<AlexaVideoRecorderCapabilityAgent>(new AlexaVideoRecorderCapabilityAgent(
+            endpointId,
+            std::move(videoRecorder),
+            contextManager,
+            std::move(responseSender),
+            std::move(exceptionSender)));
+
+    if (!videoRecorderCapabilityAgent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "instantiationFailed"));
+        return nullptr;
+    }
+
+    const avs::CapabilityTag extendedGUICapabilityTag{NAMESPACE, EXTENDED_GUI_STATE_NAME, endpointId};
+    contextManager->addStateProvider(extendedGUICapabilityTag, videoRecorderCapabilityAgent);
+
+    const avs::CapabilityTag storageLevelCapabilityTag{NAMESPACE, STORAGE_LEVEL_STATE_NAME, endpointId};
+    contextManager->addStateProvider(storageLevelCapabilityTag, videoRecorderCapabilityAgent);
+    return videoRecorderCapabilityAgent;
+}
+
+AlexaVideoRecorderCapabilityAgent::AlexaVideoRecorderCapabilityAgent(
+    EndpointIdentifier endpointId,
+    std::shared_ptr<VideoRecorderInterface> videoRecorder,
+    std::shared_ptr<ContextManagerInterface> contextManager,
+    std::shared_ptr<AlexaInterfaceMessageSenderInterface> responseSender,
+    std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionSender) :
+        CapabilityAgent{NAMESPACE, exceptionSender},
+        RequiresShutdown{"AlexaVideoRecorderCapabilityAgent"},
+        m_endpointId{std::move(endpointId)},
+        m_videoRecorder{std::move(videoRecorder)},
+        m_contextManager{std::move(contextManager)},
+        m_responseSender{std::move(responseSender)} {
+}
+
+void AlexaVideoRecorderCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!directive) {
+        ACSDK_ERROR(LX("handleDirectiveImmediatelyFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+}
+
+void AlexaVideoRecorderCapabilityAgent::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX("preHandleDirective"));
+    // do nothing.
+}
+
+void AlexaVideoRecorderCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+
+    m_executor.submit([this, info] {
+        ACSDK_DEBUG5(LX("handleDirectiveInExecutor").d("Payload", info->directive->getPayload()));
+        const std::string directiveName = info->directive->getName();
+        if (!info->directive->getEndpoint().hasValue() ||
+            (info->directive->getEndpoint().value().endpointId != m_endpointId)) {
+            executeUnknownDirective(info, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        auto payload = info->directive->getPayload();
+        std::unique_ptr<VideoRecorderRequest> videoRecorderRequestContext = parseDirectivePayload(payload);
+        if (!videoRecorderRequestContext) {
+            ACSDK_ERROR(
+                LX("handleDirectiveFailed").d("reason", "unableToParseDirectivePayload").sensitive("payload", payload));
+            executeUnknownDirective(info, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        VideoRecorderInterface::Response result;
+        if (directiveName == NAME_SEARCH_AND_RECORD) {
+            result = m_videoRecorder->searchAndRecord(std::move(videoRecorderRequestContext));
+        } else if (directiveName == NAME_CANCEL_RECORDING) {
+            result = m_videoRecorder->cancelRecording(std::move(videoRecorderRequestContext));
+        } else if (directiveName == NAME_DELETE_RECORDING) {
+            result = m_videoRecorder->deleteRecording(std::move(videoRecorderRequestContext));
+        } else {
+            ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "unexpectedDirective").d("name", directiveName));
+            executeUnknownDirective(info, ExceptionErrorType::UNSUPPORTED_OPERATION);
+            return;
+        }
+
+        executeSetHandlingCompleted(info);
+        sendResponseEvent(info, result);
+    });
+}
+
+void AlexaVideoRecorderCapabilityAgent::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("cancelDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    if (!info->directive->getEndpoint().hasValue() ||
+        info->directive->getEndpoint().value().endpointId != m_endpointId) {
+        ACSDK_WARN(LX("cancelDirective").d("reason", "notExpectedEndpointId"));
+    }
+    removeDirective(info);
+}
+
+DirectiveHandlerConfiguration AlexaVideoRecorderCapabilityAgent::getConfiguration() const {
+    ACSDK_DEBUG5(LX(__func__));
+    DirectiveHandlerConfiguration configuration;
+    auto neitherNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUMS_NONE, false);
+    configuration[{NAMESPACE, NAME_SEARCH_AND_RECORD, m_endpointId}] = neitherNonBlockingPolicy;
+    configuration[{NAMESPACE, NAME_CANCEL_RECORDING, m_endpointId}] = neitherNonBlockingPolicy;
+    configuration[{NAMESPACE, NAME_DELETE_RECORDING, m_endpointId}] = neitherNonBlockingPolicy;
+
+    return configuration;
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> AlexaVideoRecorderCapabilityAgent::
+    getCapabilityConfigurations() {
+    auto additionalConfigurations = CapabilityConfiguration::AdditionalConfigurations();
+    CapabilityConfiguration configuration{CapabilityConfiguration::ALEXA_INTERFACE_TYPE,
+                                          NAMESPACE,
+                                          INTERFACE_VERSION,
+                                          Optional<std::string>(),  // instance
+                                          Optional<CapabilityConfiguration::Properties>(),
+                                          additionalConfigurations};
+    return {std::make_shared<avsCommon::avs::CapabilityConfiguration>(configuration)};
+}
+
+void AlexaVideoRecorderCapabilityAgent::doShutdown() {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!m_executor.isShutdown()) {
+        m_executor.shutdown();
+    }
+
+    const avs::CapabilityTag extendedGUICapabilityTag{NAMESPACE, EXTENDED_GUI_STATE_NAME, m_endpointId};
+    m_contextManager->removeStateProvider(extendedGUICapabilityTag);
+
+    const avs::CapabilityTag storageLevelCapabilityTag{NAMESPACE, STORAGE_LEVEL_STATE_NAME, m_endpointId};
+    m_contextManager->removeStateProvider(storageLevelCapabilityTag);
+
+    m_videoRecorder.reset();
+    m_responseSender.reset();
+    m_contextManager.reset();
+}
+
+void AlexaVideoRecorderCapabilityAgent::removeDirective(std::shared_ptr<DirectiveInfo> info) {
+    if (info->directive && info->result) {
+        CapabilityAgent::removeDirective(info->directive->getMessageId());
+    }
+}
+
+void AlexaVideoRecorderCapabilityAgent::executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info) {
+    if (info && info->result) {
+        info->result->setCompleted();
+    }
+    removeDirective(info);
+}
+
+void AlexaVideoRecorderCapabilityAgent::executeUnknownDirective(
+    std::shared_ptr<DirectiveInfo> info,
+    ExceptionErrorType type) {
+    ACSDK_ERROR(LX("executeUnknownDirectiveFailed")
+                    .d("reason", "unknownDirective")
+                    .d("namespace", info->directive->getNamespace())
+                    .d("name", info->directive->getName()));
+
+    const std::string exceptionMessage =
+        "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
+
+    sendExceptionEncounteredAndReportFailed(info, exceptionMessage, type);
+}
+
+void AlexaVideoRecorderCapabilityAgent::sendResponseEvent(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    const VideoRecorderInterface::Response& result) {
+    switch (result.type) {
+        case VideoRecorderInterface::Response::Type::SUCCESS: {
+            std::string responsePayload = R"({"recordingStatus":")" + result.message + R"("})";
+            m_responseSender->sendResponseEvent(
+                info->directive->getInstance(),
+                info->directive->getCorrelationToken(),
+                AVSMessageEndpoint(m_endpointId),
+                NAMESPACE,
+                NAME_SEARCH_AND_RECORD_RESPONSE,
+                responsePayload);
+            break;
+        }
+        case VideoRecorderInterface::Response::Type::FAILED_TOO_MANY_FAILED_ATTEMPTS:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.message);
+            break;
+        case VideoRecorderInterface::Response::Type::FAILED_ACTION_NOT_PERMITTED_FOR_CONTENT:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::ACTION_NOT_PERMITTED_FOR_CONTENT,
+                result.message);
+            break;
+        case VideoRecorderInterface::Response::Type::FAILED_CONFIRMATION_REQUIRED:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::CONFIRMATION_REQUIRED,
+                result.message);
+            break;
+        case VideoRecorderInterface::Response::Type::FAILED_CONTENT_NOT_RECORDABLE:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::CONTENT_NOT_RECORDABLE,
+                result.message);
+            break;
+        case VideoRecorderInterface::Response::Type::FAILED_NOT_SUBSCRIBED:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::NOT_SUBSCRIBED,
+                result.message);
+            break;
+        case VideoRecorderInterface::Response::Type::FAILED_RECORDING_EXISTS:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::RECORDING_EXISTS,
+                result.message);
+            break;
+        case VideoRecorderInterface::Response::Type::FAILED_STORAGE_FULL:
+            sendAlexaVideoErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::STORAGE_FULL, result.message);
+            break;
+        case VideoRecorderInterface::Response::Type::FAILED_VIDEO_TITLE_DISAMBIGUATION_REQUIRED:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::TITLE_DISAMBIGUATION_REQUIRED,
+                result.message);
+            break;
+        case VideoRecorderInterface::Response::Type::FAILED_RECORDING_SCHEDULE_CONFLICT:
+            sendAlexaVideoErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType::TUNER_OCCUPIED,
+                result.message);
+            break;
+    }
+}
+
+void AlexaVideoRecorderCapabilityAgent::sendAlexaErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+    const std::string& responseMessage) {
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        alexaErrorResponseType,
+        responseMessage);
+}
+
+void AlexaVideoRecorderCapabilityAgent::sendAlexaVideoErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::AlexaVideoErrorResponseType alexaVideoErrorResponseType,
+    const std::string& responseMessage) {
+    std::string payload =
+        R"({"type":")" +
+        AlexaInterfaceMessageSenderInterface::alexaVideoErrorResponseToString(alexaVideoErrorResponseType) +
+        R"(", "message":")" + responseMessage + R"("})";
+
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        NAMESPACE_ALEXA_VIDEO_ERRORRESPONSE,
+        payload);
+}
+
+void AlexaVideoRecorderCapabilityAgent::provideState(
+    const avsCommon::avs::CapabilityTag& stateProviderName,
+    const avsCommon::sdkInterfaces::ContextRequestToken stateRequestToken) {
+    m_executor.submit([this, stateProviderName, stateRequestToken] {
+        do {
+            if (stateProviderName.endpointId != m_endpointId) {
+                ACSDK_ERROR(LX("provideStateFailed")
+                                .d("reason", "notExpectedEndpointId")
+                                .sensitive("endpointId", stateProviderName.endpointId));
+                break;
+            }
+
+            std::string value;
+            if (stateProviderName.name == EXTENDED_GUI_STATE_NAME) {
+                value = m_videoRecorder->isExtendedRecordingGUIShown() ? "true" : "false";
+            } else if (stateProviderName.name == STORAGE_LEVEL_STATE_NAME) {
+                value = std::to_string(m_videoRecorder->getStorageUsedPercentage());
+            } else {
+                ACSDK_ERROR(
+                    LX("ProvideStateExecutor").d("reason", "unknownState").sensitive("state", stateProviderName.name));
+                break;
+            }
+
+            m_contextManager->provideStateResponse(stateProviderName, value, stateRequestToken);
+        } while (0);
+    });
+}
+
+/**
+ * Templatized method to convert string to given template type.
+ *
+ * @param mapping string to enum type mapping.
+ * @param in String to be converted.
+ * @param out [out] Reference to enum resolved.
+ *
+ * @return true if string is resolvable.
+ */
+template <typename T>
+static bool stringToEnum(const std::unordered_map<std::string, T>& mapping, const std::string& in, T& out) {
+    auto it = mapping.find(in);
+    if (it != mapping.end()) {
+        out = it->second;
+        return true;
+    }
+
+    return false;
+}
+
+std::unique_ptr<VideoRecorderRequest> AlexaVideoRecorderCapabilityAgent::parseDirectivePayload(
+    const std::string& payload) {
+    ACSDK_DEBUG9(LX(__func__));
+    rapidjson::Document jsonPayload;
+    if (jsonPayload.Parse(payload.c_str()).HasParseError()) {
+        ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseJson"));
+        return nullptr;
+    }
+
+    auto videoRecorderRequest = std::unique_ptr<VideoRecorderRequest>(new VideoRecorderRequest());
+    const auto& entities = jsonPayload[ENTITIES];
+    if (!entities.IsArray()) {
+        ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseEntities"));
+        return nullptr;
+    }
+
+    for (auto& entityJson : entities.GetArray()) {
+        if (!entityJson.IsObject()) {
+            continue;
+        }
+
+        if (!parseEntityJson(entityJson, *videoRecorderRequest)) {
+            ACSDK_WARN(LX("parseEntityJson").d("reason", "unableToParseEntity"));
+        }
+    }
+
+    if (jsonPayload.HasMember(QUANTIFIER) && jsonPayload[QUANTIFIER].IsObject()) {
+        const auto& quantifierJson = jsonPayload[QUANTIFIER];
+
+        if (quantifierJson.HasMember(NAME) && quantifierJson[NAME].IsString()) {
+            VideoRecorderRequest::Quantifier quantifier;
+            if (!stringToEnum(stringToQuantifierMap, quantifierJson[NAME].GetString(), quantifier)) {
+                ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseMediaType"));
+                return nullptr;
+            }
+
+            videoRecorderRequest->quantifier.set(quantifier);
+        }
+    }
+
+    if (jsonPayload.HasMember(TIME_WINDOW) && jsonPayload[TIME_WINDOW].IsObject()) {
+        TimeUtils timeUtils;
+        const auto& timeWindowJson = jsonPayload[TIME_WINDOW];
+
+        std::chrono::time_point<std::chrono::system_clock> startTime, endTime;
+        if (!timeUtils.convert8601TimeStringToUtcTimePoint(timeWindowJson[START].GetString(), &startTime)) {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseTimeWindow"));
+            return nullptr;
+        }
+        if (!timeUtils.convert8601TimeStringToUtcTimePoint(timeWindowJson[END].GetString(), &endTime)) {
+            ACSDK_ERROR(LX("parseEntityJson").d("reason", "unableToParseTimeWindow"));
+            return nullptr;
+        }
+
+        VideoRecorderRequest::TimeWindow timeWindow;
+        timeWindow.startTime = startTime;
+        timeWindow.endTime = endTime;
+        videoRecorderRequest->timeWindow.set(timeWindow);
+    }
+
+    return videoRecorderRequest;
+}
+
+bool AlexaVideoRecorderCapabilityAgent::parseEntityJson(
+    const rapidjson::Value& entityJson,
+    VideoRecorderRequest& videoRecorderRequest) {
+    ACSDK_DEBUG9(LX(__func__));
+    bool retVal = false;
+
+    do {
+        VideoEntity videoEntity;
+        VideoEntity::EntityType entityType;
+        if (!videoEntity.parseVideoEntityType(entityJson, entityType)) {
+            ACSDK_ERROR(LX(__func__).d("reason", "unableToParseEntityType"));
+            break;
+        }
+
+        switch (entityType) {
+            case VideoEntity::EntityType::MEDIA_TYPE: {
+                VideoEntity::Media media(VideoEntity::Media::Type::MOVIE);
+                if (!videoEntity.parseMediaEntity(entityJson, media)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseMedia"));
+                    break;
+                }
+
+                videoRecorderRequest.mediaList.emplace_back(media);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::ACTOR: {
+                VideoEntity::Actor actor;
+                if (!videoEntity.parseActorEntity(entityJson, actor)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseActor"));
+                    break;
+                }
+
+                videoRecorderRequest.actorList.emplace_back(actor);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::APP: {
+                VideoEntity::App app;
+                if (!videoEntity.parseAppEntity(entityJson, app)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseApp"));
+                    break;
+                }
+
+                videoRecorderRequest.appList.emplace_back(app);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::CHANNEL: {
+                VideoEntity::Channel channel(0);
+                if (!videoEntity.parseChannelEntity(entityJson, channel)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseChannel"));
+                    break;
+                }
+
+                videoRecorderRequest.channelList.emplace_back(channel);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::CHARACTER: {
+                VideoEntity::Character character;
+                if (!videoEntity.parseCharacterEntity(entityJson, character)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseCharacter"));
+                    break;
+                }
+
+                videoRecorderRequest.characterList.emplace_back(character);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::DIRECTOR: {
+                retVal = true;
+                VideoEntity::Director director;
+                if (!videoEntity.parseDirectorEntity(entityJson, director)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseDirector"));
+                    break;
+                }
+
+                videoRecorderRequest.directorList.emplace_back(director);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::EPISODE: {
+                VideoEntity::Episode episode;
+                if (!videoEntity.parseEpisodeEntity(entityJson, episode)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseEpisode"));
+                    break;
+                }
+
+                videoRecorderRequest.episodeList.emplace_back(episode);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::EVENT: {
+                VideoEntity::Event event;
+                if (!videoEntity.parseEventEntity(entityJson, event)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseEvent"));
+                    break;
+                }
+
+                videoRecorderRequest.eventList.emplace_back(event);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::FRANCHISE: {
+                VideoEntity::Franchise franchise;
+                if (!videoEntity.parseFranchiseEntity(entityJson, franchise)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseFranchise"));
+                    break;
+                }
+
+                videoRecorderRequest.franchiseList.emplace_back(franchise);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::GENRE: {
+                VideoEntity::Genre genre;
+                if (!videoEntity.parseGenreEntity(entityJson, genre)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseGenre"));
+                    break;
+                }
+
+                videoRecorderRequest.genreList.emplace_back(genre);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::LEAGUE: {
+                VideoEntity::League league;
+                if (!videoEntity.parseLeagueEntity(entityJson, league)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseLeague"));
+                    break;
+                }
+
+                videoRecorderRequest.leagueList.emplace_back(league);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::POPULARITY: {
+                VideoEntity::Popularity popularity;
+                if (!videoEntity.parsePopularityEntity(entityJson, popularity)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParsePopularity"));
+                    break;
+                }
+
+                videoRecorderRequest.popularityList.emplace_back(popularity);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::PRODUCTION_COMPANY: {
+                VideoEntity::ProductionCompany productionCompany;
+                if (!videoEntity.parseProductionCompanyEntity(entityJson, productionCompany)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseProductionCompany"));
+                    break;
+                }
+
+                videoRecorderRequest.productionCompanyList.emplace_back(productionCompany);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::RECENCY: {
+                VideoEntity::Recency recency(VideoEntity::Recency::Type::NEW);
+                if (!videoEntity.parseRecencyEntity(entityJson, recency)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseRecency"));
+                    break;
+                }
+
+                videoRecorderRequest.recencyList.emplace_back(recency);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::SEASON: {
+                VideoEntity::Season season;
+                if (!videoEntity.parseSeasonEntity(entityJson, season)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseSeason"));
+                    break;
+                }
+
+                videoRecorderRequest.seasonList.emplace_back(season);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::SPORT: {
+                VideoEntity::Sport sport;
+                if (!videoEntity.parseSportEntity(entityJson, sport)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseSport"));
+                    break;
+                }
+
+                videoRecorderRequest.sportList.emplace_back(sport);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::SPORTS_TEAM: {
+                VideoEntity::SportsTeam sportsTeam;
+                if (!videoEntity.parseSportsTeamEntity(entityJson, sportsTeam)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseSportsTeam"));
+                    break;
+                }
+
+                videoRecorderRequest.sportsTeamList.emplace_back(sportsTeam);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::VIDEO: {
+                VideoEntity::Video video;
+                if (!videoEntity.parseVideoEntity(entityJson, video)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseVideo"));
+                    break;
+                }
+
+                videoRecorderRequest.videoList.emplace_back(video);
+                retVal = true;
+                break;
+            }
+            case VideoEntity::EntityType::VIDEO_RESOLUTION: {
+                VideoEntity::VideoResolution videoResolution(VideoEntity::VideoResolution::Type::HD);
+                if (!videoEntity.parseVideoResolutionEntity(entityJson, videoResolution)) {
+                    ACSDK_ERROR(LX(__func__).d("reason", "unableToParseVideoResolution"));
+                    break;
+                }
+
+                videoRecorderRequest.videoResolutionList.emplace_back(videoResolution);
+                retVal = true;
+                break;
+            }
+        }
+    } while (0);
+
+    return retVal;
+}
+
+}  // namespace acsdkAlexaVideoRecorder
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/src/AlexaVideoRecorderFactory.cpp b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/src/AlexaVideoRecorderFactory.cpp
new file mode 100644
index 0000000000..9829f92d9b
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/src/AlexaVideoRecorderFactory.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkAlexaVideoRecorder/AlexaVideoRecorderCapabilityAgent.h"
+#include "acsdkAlexaVideoRecorder/AlexaVideoRecorderFactory.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaVideoRecorder {
+using namespace avsCommon::utils;
+
+Optional<AlexaVideoRecorderFactory::VideoRecorderCapabilityAgentData> AlexaVideoRecorderFactory::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<acsdkAlexaVideoRecorderInterfaces::VideoRecorderInterface>& videoRecorder,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender) {
+    AlexaVideoRecorderFactory::VideoRecorderCapabilityAgentData videoRecorderCapabilityAgentData;
+    auto videoRecorderCA = acsdkAlexaVideoRecorder::AlexaVideoRecorderCapabilityAgent::create(
+        endpointId, videoRecorder, contextManager, responseSender, exceptionSender);
+    if (videoRecorderCA) {
+        videoRecorderCapabilityAgentData.capabilityConfigurationInterface = videoRecorderCA;
+        videoRecorderCapabilityAgentData.directiveHandler = videoRecorderCA;
+        videoRecorderCapabilityAgentData.requiresShutdown = videoRecorderCA;
+        return avsCommon::utils::Optional<AlexaVideoRecorderFactory::VideoRecorderCapabilityAgentData>(
+            videoRecorderCapabilityAgentData);
+    }
+
+    return avsCommon::utils::Optional<AlexaVideoRecorderFactory::VideoRecorderCapabilityAgentData>();
+}
+
+}  // namespace acsdkAlexaVideoRecorder
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/src/CMakeLists.txt b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/src/CMakeLists.txt
new file mode 100644
index 0000000000..f1b205ae1d
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkAlexaVideoRecorder")
+
+add_library(acsdkAlexaVideoRecorder
+        "AlexaVideoRecorderCapabilityAgent.cpp"
+        "AlexaVideoRecorderFactory.cpp")
+
+target_include_directories(acsdkAlexaVideoRecorder PRIVATE
+        "${acsdkAlexaVideoRecorder_SOURCE_DIR}/privateInclude")
+
+target_include_directories(acsdkAlexaVideoRecorder PUBLIC
+        "${acsdkAlexaVideoRecorder_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaVideoRecorder acsdkAlexaVideoRecorderInterfaces AVSCommon Alexa AlexaVideoCommon)
+
+# install target
+asdk_install()
diff --git a/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/test/AlexaVideoRecorderCapabilityAgentTest.cpp b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/test/AlexaVideoRecorderCapabilityAgentTest.cpp
new file mode 100644
index 0000000000..5ac8479ecd
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/test/AlexaVideoRecorderCapabilityAgentTest.cpp
@@ -0,0 +1,553 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include "acsdkAlexaVideoRecorder/AlexaVideoRecorderCapabilityAgent.h"
+#include "acsdkAlexaVideoRecorderInterfaces/VideoRecorderInterface.h"
+
+#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
+#include <AVSCommon/SDKInterfaces/MockAlexaInterfaceMessageSender.h>
+#include <AVSCommon/SDKInterfaces/MockContextManager.h>
+#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/Timing/TimePoint.h>
+#include <AVSCommon/Utils/WaitEvent.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaVideoRecorder {
+namespace test {
+using namespace alexaClientSDK;
+using namespace alexaClientSDK::avsCommon::avs;
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::sdkInterfaces;
+using namespace alexaClientSDK::avsCommon::utils::memory;
+using namespace ::testing;
+
+using namespace acsdkAlexaVideoRecorder;
+using namespace acsdkAlexaVideoRecorderInterfaces;
+
+// For readability.
+using EndpointIdentifier = endpoints::EndpointIdentifier;
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// The namespace for capability agent.
+static const std::string NAMESPACE{"Alexa.VideoRecorder"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for SearchAndRecord directive
+static const std::string NAME_SEARCHANDRECORD{"SearchAndRecord"};
+
+/// The name for CancelRecording directive
+static const std::string NAME_CANCELRECORDING{"CancelRecording"};
+
+/// The name for DeleteRecording directive
+static const std::string NAME_DELETERECORDING{"DeleteRecording"};
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
+
+/// The test EndpointId
+static const EndpointIdentifier TEST_ENDPOINT_ID("testEndpointId");
+
+/// Event key.
+static const std::string EVENT("event");
+
+/// Header key.
+static const std::string HEADER("header");
+
+/// MessageId key.
+static const std::string MESSAGE_ID("messageId");
+
+/// MessageId for testing.
+static const std::string MESSAGE_ID_TEST("MessageId_Test");
+
+/// Dialog request Id key.
+static const std::string DIALOG_REQUEST_ID("dialogRequestId");
+
+/// DialogRequestId for testing.
+static const std::string DIALOG_REQUEST_ID_TEST("DialogRequestId_Test");
+
+/// Correlation token key.
+static const std::string CORRELATION_TOKEN("correlationToken");
+
+/// Correlation token for testing.
+static const std::string CORRELATION_TOKEN_TEST("CorrelationToken_Test");
+
+/// Event correlation token key.
+static const std::string EVENT_CORRELATION_TOKEN("eventCorrelationToken");
+
+/// Event correlation for testing.
+static const std::string EVENT_CORRELATION_TOKEN_TEST("EventCorrelationToken_Test");
+
+// Sample VideoRecorder payload
+static const std::string PAYLOAD = R"(
+ {
+    "entities": [
+        {
+            "value": "TV_SHOW",
+            "type": "MediaType"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666681"
+            },
+            "value": "Prime Video",
+            "type": "App"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666681"
+            },
+            "value": "Gaby Hoffman",
+            "type": "Actor"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666681"
+            },
+            "entityMetadata": {
+                "channelNumber": 1234,
+                "channelCallSign": "KBTC"
+            },
+            "uri": "entity://provider/channel/1234",
+            "value": "PBS",
+            "type": "Channel"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "Snow White",
+            "type": "Character"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "Games",
+            "type": "Event"
+        },
+        {
+            "value": "Intergalactic Wars",
+            "type": "Franchise"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "Games",
+            "type": "Genre"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "NCAA",
+            "type": "League"
+        },
+        {
+            "value": "TRUE",
+            "type": "Popularity"
+        },
+        {
+            "value": "Marvel",
+            "type": "ProductionCompany"
+        },
+        {
+            "value": "NEW",
+            "type": "Recency"
+        },
+        {
+            "value": "8",
+            "type": "Episode"
+        },
+        {
+            "value": "2",
+            "type": "Season"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "Football",
+            "type": "Sport"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "University of Washington Huskies",
+            "type": "SportsTeam"
+        },
+        {
+            "externalIds": {
+                "gracenote": "ST0000000666661"
+            },
+            "value": "Manchester by the Sea",
+            "type": "Video"
+        },
+        {
+            "value": "HD",
+            "type": "VideoResolution"
+        }
+    ],
+    "quantifier": {
+        "name": "NEW"
+    },
+    "timeWindow": {
+        "end": "2016-09-07T23:59:00Z",
+        "start": "2016-09-01T00:00:00Z"
+    }
+})";
+
+class MockVideoRecorderHandlerInterface : public VideoRecorderInterface {
+public:
+    MOCK_METHOD1(searchAndRecordMock, Response(VideoRecorderRequest* payload));
+
+    MOCK_METHOD1(cancelRecordingMock, Response(VideoRecorderRequest* payload));
+
+    MOCK_METHOD1(deleteRecordingMock, Response(VideoRecorderRequest* payload));
+
+    MOCK_METHOD0(isExtendedRecordingGUIShown, bool(void));
+
+    MOCK_METHOD0(getStorageUsedPercentage, int(void));
+
+    Response searchAndRecord(std::unique_ptr<VideoRecorderRequest> request) {
+        return searchAndRecordMock(request.get());
+    }
+
+    Response cancelRecording(std::unique_ptr<VideoRecorderRequest> request) {
+        return cancelRecordingMock(request.get());
+    }
+
+    Response deleteRecording(std::unique_ptr<VideoRecorderRequest> request) {
+        return deleteRecordingMock(request.get());
+    }
+};
+
+class AlexaVideoRecorderCapabilityAgentTest : public ::testing::Test {
+public:
+    /// SetUp before each test case.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Constructor.
+    AlexaVideoRecorderCapabilityAgentTest() {
+    }
+
+protected:
+    /**
+     * Function to create AlexaVideoRecorderCapabilityAgent based on the reportable flags
+     * and sets required ContextManager and VideoRecorder mocks.
+     */
+    std::shared_ptr<AlexaVideoRecorderCapabilityAgent> createCapabilityAgentAndSetExpects();
+
+    /// A mock @c AlexaVideoRecorderInterface object.
+    std::shared_ptr<StrictMock<MockVideoRecorderHandlerInterface>> m_mockVideoRecorder;
+
+    // a context manager
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>> m_mockContextManager;
+
+    /// The mock @c MessageSenderInterface.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>> m_mockResponseSender;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>
+        m_mockDirectiveHandlerResult;
+
+    /// A pointer to an instance of the VideoRecorder that will be instantiated per test.
+    std::shared_ptr<AlexaVideoRecorderCapabilityAgent> m_videoRecorderCapabilityAgent;
+};
+
+void AlexaVideoRecorderCapabilityAgentTest::SetUp() {
+    m_mockExceptionSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult =
+        make_unique<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>();
+    m_mockVideoRecorder = std::make_shared<StrictMock<MockVideoRecorderHandlerInterface>>();
+    m_mockContextManager = std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>>();
+    EXPECT_CALL(*m_mockContextManager, addStateProvider(_, _)).Times(Exactly(2));
+
+    m_mockResponseSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>>();
+    m_videoRecorderCapabilityAgent = AlexaVideoRecorderCapabilityAgent::create(
+        TEST_ENDPOINT_ID, m_mockVideoRecorder, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender);
+}
+
+void AlexaVideoRecorderCapabilityAgentTest::TearDown() {
+    if (m_videoRecorderCapabilityAgent && !m_videoRecorderCapabilityAgent->isShutdown()) {
+        EXPECT_CALL(*m_mockContextManager, removeStateProvider(_)).Times(2);
+        m_videoRecorderCapabilityAgent->shutdown();
+    }
+
+    m_videoRecorderCapabilityAgent.reset();
+}
+
+std::shared_ptr<AVSDirective> buildAVSDirective(std::string directiveName) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<avsCommon::avs::attachment::test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(
+        NAMESPACE, directiveName, MESSAGE_ID_TEST, DIALOG_REQUEST_ID_TEST, CORRELATION_TOKEN_TEST, INTERFACE_VERSION);
+    auto avsMessageEndpoint = AVSMessageEndpoint(TEST_ENDPOINT_ID);
+
+    return AVSDirective::create("", avsMessageHeader, PAYLOAD, attachmentManager, "", avsMessageEndpoint);
+}
+
+/// Test that create() returns a nullptr if called with invalid arguments.
+TEST_F(AlexaVideoRecorderCapabilityAgentTest, test_givenInvalidParameters_create_shouldFail) {
+    ASSERT_THAT(
+        AlexaVideoRecorderCapabilityAgent::create(
+            "", m_mockVideoRecorder, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaVideoRecorderCapabilityAgent::create(
+            TEST_ENDPOINT_ID, nullptr, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaVideoRecorderCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockVideoRecorder, nullptr, m_mockResponseSender, m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaVideoRecorderCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockVideoRecorder, m_mockContextManager, nullptr, m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaVideoRecorderCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockVideoRecorder, m_mockContextManager, m_mockResponseSender, nullptr),
+        IsNull());
+}
+
+/**
+ * Test successful handling of SearchAndRecord directive.
+ */
+TEST_F(AlexaVideoRecorderCapabilityAgentTest, test_searchAndRecordDirective_successCase) {
+    VideoRecorderInterface::Response videoRecorderResponse;
+    videoRecorderResponse.type = VideoRecorderInterface::Response::Type::SUCCESS;
+    videoRecorderResponse.message = "SCHEDULED";
+
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockVideoRecorder, searchAndRecordMock(_)).WillOnce(WithArg<0>(Return(videoRecorderResponse)));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _, _, _)).Times(1);
+
+    ASSERT_THAT(m_videoRecorderCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_SEARCHANDRECORD);
+    m_videoRecorderCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_videoRecorderCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    EXPECT_CALL(*m_mockContextManager, removeStateProvider(_)).Times(2);
+
+    m_videoRecorderCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of SearchAndRecord directive.
+ */
+TEST_F(AlexaVideoRecorderCapabilityAgentTest, test_searchAndRecordDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+    VideoRecorderInterface::Response videoRecorderResponse;
+    videoRecorderResponse.type = VideoRecorderInterface::Response::Type::FAILED_TOO_MANY_FAILED_ATTEMPTS;
+    videoRecorderResponse.message = "The operation can't be performed because there were too many failed attempts.";
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockVideoRecorder, searchAndRecordMock(_)).WillOnce(Return(videoRecorderResponse));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+
+    ASSERT_THAT(m_videoRecorderCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_SEARCHANDRECORD);
+    m_videoRecorderCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_videoRecorderCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    EXPECT_CALL(*m_mockContextManager, removeStateProvider(_)).Times(2);
+
+    m_videoRecorderCapabilityAgent->shutdown();
+}
+
+/**
+ * Test successful handling of CancelRecording directive.
+ */
+TEST_F(AlexaVideoRecorderCapabilityAgentTest, test_cancelRecordingDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+    VideoRecorderInterface::Response videoRecorderResponse;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+    EXPECT_CALL(*m_mockVideoRecorder, cancelRecordingMock(_)).WillOnce(Return(videoRecorderResponse));
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _, _, _)).Times(1);
+
+    ASSERT_THAT(m_videoRecorderCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_CANCELRECORDING);
+    m_videoRecorderCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_videoRecorderCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    EXPECT_CALL(*m_mockContextManager, removeStateProvider(_)).Times(2);
+    m_videoRecorderCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error handling of CancelRecording directive.
+ */
+TEST_F(AlexaVideoRecorderCapabilityAgentTest, test_cancelRecordingDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+    VideoRecorderInterface::Response videoRecorderResponse;
+    videoRecorderResponse.type = VideoRecorderInterface::Response::Type::FAILED_TOO_MANY_FAILED_ATTEMPTS;
+    videoRecorderResponse.message = "The operation can't be performed because there were too many failed attempts.";
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockVideoRecorder, cancelRecordingMock(_)).WillOnce(Return(videoRecorderResponse));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+
+    ASSERT_THAT(m_videoRecorderCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_CANCELRECORDING);
+    m_videoRecorderCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_videoRecorderCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    EXPECT_CALL(*m_mockContextManager, removeStateProvider(_)).Times(2);
+    m_videoRecorderCapabilityAgent->shutdown();
+}
+
+/**
+ * Test successful handling of DeleteRecording directive.
+ */
+TEST_F(AlexaVideoRecorderCapabilityAgentTest, test_deleteRecordingDirective_successCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+    VideoRecorderInterface::Response videoRecorderResponse;
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+    EXPECT_CALL(*m_mockVideoRecorder, deleteRecordingMock(_)).WillOnce(Return(videoRecorderResponse));
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _, _, _)).Times(1);
+
+    ASSERT_THAT(m_videoRecorderCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_DELETERECORDING);
+    m_videoRecorderCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_videoRecorderCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    EXPECT_CALL(*m_mockContextManager, removeStateProvider(_)).Times(2);
+
+    m_videoRecorderCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error handling of DeleteRecording directive.
+ */
+TEST_F(AlexaVideoRecorderCapabilityAgentTest, test_deleteRecordingDirective_errorCase) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+    VideoRecorderInterface::Response videoRecorderResponse;
+    videoRecorderResponse.type = VideoRecorderInterface::Response::Type::FAILED_TOO_MANY_FAILED_ATTEMPTS;
+    videoRecorderResponse.message = "The operation can't be performed because there were too many failed attempts.";
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockVideoRecorder, deleteRecordingMock(_)).WillOnce(Return(videoRecorderResponse));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+
+    ASSERT_THAT(m_videoRecorderCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_DELETERECORDING);
+    m_videoRecorderCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_videoRecorderCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    EXPECT_CALL(*m_mockContextManager, removeStateProvider(_)).Times(2);
+
+    m_videoRecorderCapabilityAgent->shutdown();
+}
+/**
+ * Tests unknown Directive.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaVideoRecorderCapabilityAgentTest, test_unknownDirective) {
+    alexaClientSDK::avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    ASSERT_THAT(m_videoRecorderCapabilityAgent, NotNull());
+
+    m_videoRecorderCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(UNKNOWN_DIRECTIVE), std::move(m_mockDirectiveHandlerResult));
+    m_videoRecorderCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    EXPECT_CALL(*m_mockContextManager, removeStateProvider(_)).Times(2);
+
+    m_videoRecorderCapabilityAgent->shutdown();
+}
+
+}  // namespace test
+}  // namespace acsdkAlexaVideoRecorder
+}  // namespace alexaClientSDK
diff --git a/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/test/CMakeLists.txt b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/test/CMakeLists.txt
new file mode 100644
index 0000000000..0c36a6ca2e
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorder/test/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+    "${AVSCommon_INCLUDE_DIRS}"
+    "${AVSCommon_SOURCE_DIR}/AVS/test"
+    "${AVSCommon_SOURCE_DIR}/Utils/test"
+    "${AVSCommon_SOURCE_DIR}/SDKInterfaces/test"
+    "${acsdkAlexaVideoRecorder_INCLUDE_DIR}"
+    "${acsdkAlexaVideoRecorder_SOURCE_DIR}/include"
+    "${acsdkAlexaVideoRecorderInterfaces_SOURCE_DIR}/include"
+    "${acsdkAlexaVideoRecorder_SOURCE_DIR}/privateInclude"
+    "${ASDK_INCLUDE_DIRS}")
+
+set(LIBS
+        "AttachmentCommonTestLib"
+        "acsdkAlexaVideoRecorder"
+        "SDKInterfacesTests")
+
+discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
diff --git a/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorderInterfaces/CMakeLists.txt b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorderInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..837646259e
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorderInterfaces/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.1)
+project(acsdkAlexaVideoRecorderInterfaces LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_library(acsdkAlexaVideoRecorderInterfaces INTERFACE)
+
+target_include_directories(acsdkAlexaVideoRecorderInterfaces INTERFACE
+        "${acsdkAlexaVideoRecorderInterfaces_SOURCE_DIR}/include"
+        "${AlexaVideoCommon}/include")
+
+# install interface
+asdk_install_interface()
diff --git a/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorderInterfaces/include/acsdkAlexaVideoRecorderInterfaces/VideoRecorderInterface.h b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorderInterfaces/include/acsdkAlexaVideoRecorderInterfaces/VideoRecorderInterface.h
new file mode 100644
index 0000000000..0d2a4826df
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorderInterfaces/include/acsdkAlexaVideoRecorderInterfaces/VideoRecorderInterface.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_ACSDKALEXAVIDEORECORDERINTERFACES_INCLUDE_ACSDKALEXAVIDEORECORDERINTERFACES_VIDEORECORDERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_ACSDKALEXAVIDEORECORDERINTERFACES_INCLUDE_ACSDKALEXAVIDEORECORDERINTERFACES_VIDEORECORDERINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include "VideoRecorderTypes.h"
+
+namespace alexaClientSDK {
+namespace acsdkAlexaVideoRecorderInterfaces {
+
+/**
+ * The VideoRecorderInterface carries out video recorder actions such as search and record, cancel recording
+ * and delete recording.
+ *
+ * A realization of the VideoRecorderInterface sends response events back to endpoint for search and record
+ * and is responsible for providing information regarding storage level and extended GUI.
+ *
+ * @note Implementations of this interface must be thread-safe.
+ */
+class VideoRecorderInterface {
+public:
+    /**
+     * Utility object used for reporting VideoRecorder handler response.
+     */
+    struct Response {
+        /**
+         * Enum for the different response types understood by the VideoRecorder capability agent.
+         */
+        enum class Type {
+            /// VideoRecorder Request was handled successfully.
+            SUCCESS,
+            /// The number of allowed failed attempts to perform a VideoRecorder action has been exceeded.
+            FAILED_TOO_MANY_FAILED_ATTEMPTS,
+            /// Indicates the content does not allow the VideoRecorder action requested. For example, if the user tries
+            /// to delete
+            /// a recording that is marked as not deletable.
+            FAILED_ACTION_NOT_PERMITTED_FOR_CONTENT,
+            /// Indicates an additional confirmation must occur before the requested VideoRecorder action can be
+            /// completed.
+            FAILED_CONFIRMATION_REQUIRED,
+            /// Indicates the record operation failed due to restrictions on the content.
+            FAILED_CONTENT_NOT_RECORDABLE,
+            /// The user is not subscribed to the content for a channel or other subscription-based content.
+            FAILED_NOT_SUBSCRIBED,
+            /// Indicates that a recording request failed because the recording already exists.
+            FAILED_RECORDING_EXISTS,
+            /// Indicates that a recording request failed because the DVR storage is full.
+            FAILED_STORAGE_FULL,
+            /// Indicates the title specified yielded multiple results, and disambiguation is required to determine
+            /// the program to record. This value should be used to indicate that the target device will provide a
+            /// mechanism for disambiguation. For example, this error could indicate that there are multiple airings
+            /// of a program or that the entity requested for recording has multiple programs associated with it.
+            FAILED_VIDEO_TITLE_DISAMBIGUATION_REQUIRED,
+            /// Indicates that a recording request failed because of a scheduling conflict with another recording.
+            FAILED_RECORDING_SCHEDULE_CONFLICT
+        };
+
+        /// Response type for VideoRecorder handler responses.
+        Type type;
+
+        /// Response message.
+        std::string message;
+
+        /*
+         * Default Constructor, sets response type to success.
+         */
+        Response() : type(Type::SUCCESS) {
+        }
+    };
+
+    /**
+     * Virtual destructor to assure proper cleanup of derived types.
+     */
+    virtual ~VideoRecorderInterface() = default;
+
+    /**
+     * Request to find and record a specified video item, given a set of search criteria.
+     *
+     * @param request The request for search and record directive.
+     * @return An instance of @c VideoRecorderInterface::Response with response. In case of success, the response
+     * message will be a string value indicating the status of the recording aka recordingStatus.
+     */
+    virtual Response searchAndRecord(std::unique_ptr<VideoRecorderRequest> request) = 0;
+
+    /**
+     * Request to cancel a scheduled recording for a specified title. This request should result in the cancellation of
+     * the specified scheduled recording, or a title that best matches the requested entity.
+     *
+     * @param request The request for cancel recording directive.
+     * @return An instance of @c VideoRecorderInterface::Response with response.
+     */
+    virtual Response cancelRecording(std::unique_ptr<VideoRecorderRequest> request) = 0;
+
+    /**
+     * Request to delete a recorded item. This request should result in the deletion of the specified title, or a title
+     * that best matches the requested entity.
+     *
+     * @param request The request for delete recording directive.
+     * @return An instance of @c VideoRecorderInterface::Response with response.
+     */
+    virtual Response deleteRecording(std::unique_ptr<VideoRecorderRequest> request) = 0;
+
+    /**
+     * Gets the property for extended GUI which indicates the type of graphical user interface shown to the
+     * user. true to indicate an extended recording GUI is shown, false if the extended recording GUI isn't shown.
+     *
+     * @return true if extended GUI is shown.
+     */
+    virtual bool isExtendedRecordingGUIShown() = 0;
+
+    /**
+     * Gets the property for storage level which indicates the storage used on the recording device as a
+     * percentage.
+     *
+     * @return Integer indicating storage used on the recording device as a percentage.
+     */
+    virtual int getStorageUsedPercentage() = 0;
+};
+}  // namespace acsdkAlexaVideoRecorderInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_ACSDKALEXAVIDEORECORDERINTERFACES_INCLUDE_ACSDKALEXAVIDEORECORDERINTERFACES_VIDEORECORDERINTERFACE_H_
diff --git a/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorderInterfaces/include/acsdkAlexaVideoRecorderInterfaces/VideoRecorderTypes.h b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorderInterfaces/include/acsdkAlexaVideoRecorderInterfaces/VideoRecorderTypes.h
new file mode 100644
index 0000000000..d63518f73b
--- /dev/null
+++ b/capabilities/AlexaVideoRecorder/acsdkAlexaVideoRecorderInterfaces/include/acsdkAlexaVideoRecorderInterfaces/VideoRecorderTypes.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_ACSDKALEXAVIDEORECORDERINTERFACES_INCLUDE_ACSDKALEXAVIDEORECORDERINTERFACES_VIDEORECORDERTYPES_H_
+#define ALEXA_CLIENT_SDK_ACSDKALEXAVIDEORECORDERINTERFACES_INCLUDE_ACSDKALEXAVIDEORECORDERINTERFACES_VIDEORECORDERTYPES_H_
+
+#include <chrono>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include <AVSCommon/Utils/Optional.h>
+
+#include <acsdk/VideoContent/VideoEntityTypes.h>
+
+namespace alexaClientSDK {
+namespace acsdkAlexaVideoRecorderInterfaces {
+
+/**
+ * Context of the request provided with Alexa.VideoRecorder directives. To fetch all the entity objects from the
+ * context, application can query the the getters to fetch the list of entities based on the types provided with
+ * requestedEntityType.
+ */
+struct VideoRecorderRequest {
+    /**
+     * Enum definitions for all types of quantifier.
+     */
+    enum class Quantifier {
+        /// All content matching the specified entity.
+        ALL,
+        /// The content that matches the entity that airs closest to time specified, or the closest after the time
+        /// specified.
+        NEXT,
+        /// Any content airing for the first time that matched the specified entity.
+        NEW,
+        /// All content matching the entity that has already been watched.
+        WATCHED
+    };
+
+    /**
+     * A time window type.
+     */
+    struct TimeWindow {
+        /**
+         * Default constructor.
+         */
+        TimeWindow() {
+        }
+
+        /// The start time for the time window.
+        avsCommon::utils::Optional<std::chrono::time_point<std::chrono::system_clock>> startTime;
+        /// The end time for the time window.
+        avsCommon::utils::Optional<std::chrono::time_point<std::chrono::system_clock>> endTime;
+    };
+
+    /// Collection of all the media objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Media> mediaList;
+
+    /// Collection of all the actor objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Actor> actorList;
+
+    /// Collection of all the app objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::App> appList;
+
+    /// Collection of all the channel objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Channel> channelList;
+
+    /// Collection of all the character objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Character> characterList;
+
+    /// Collection of all the director objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Director> directorList;
+
+    /// Collection of all the episode objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Episode> episodeList;
+
+    /// Collection of all the event objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Event> eventList;
+
+    /// Collection of all the franchise objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Franchise> franchiseList;
+
+    /// Collection of all the genre objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Genre> genreList;
+
+    /// Collection of all the league objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::League> leagueList;
+
+    /// Collection of all the popularity objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Popularity> popularityList;
+
+    /// Collection of all the production company objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::ProductionCompany> productionCompanyList;
+
+    /// Collection of all the recency objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Recency> recencyList;
+
+    /// Collection of all the seasons objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Season> seasonList;
+
+    /// Collection of all the sport objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Sport> sportList;
+
+    /// Collection of all the sports team objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::SportsTeam> sportsTeamList;
+
+    /// Collection of all the video objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::Video> videoList;
+
+    /// Collection of all the video resolution objects.
+    std::vector<acsdkAlexaVideoCommon::VideoEntity::VideoResolution> videoResolutionList;
+
+    /// A quantifier for the deletion request.
+    avsCommon::utils::Optional<Quantifier> quantifier;
+
+    /// A time window object representing a time associated with this request.
+    avsCommon::utils::Optional<TimeWindow> timeWindow;
+};
+
+}  // namespace acsdkAlexaVideoRecorderInterfaces
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_ACSDKALEXAVIDEORECORDERINTERFACES_INCLUDE_ACSDKALEXAVIDEORECORDERINTERFACES_VIDEORECORDERTYPES_H_
diff --git a/capabilities/AssetManager/acsdkAssetManager/include/acsdkAssetManager/AssetManager.h b/capabilities/AssetManager/acsdkAssetManager/include/acsdkAssetManager/AssetManager.h
index 2f39c1f765..096be2b572 100644
--- a/capabilities/AssetManager/acsdkAssetManager/include/acsdkAssetManager/AssetManager.h
+++ b/capabilities/AssetManager/acsdkAssetManager/include/acsdkAssetManager/AssetManager.h
@@ -71,7 +71,7 @@ class AssetManager
 
     /** Queues up a call to downloadArtifact in an executor. Returns immediately. */
     inline void queueDownloadArtifact(const std::shared_ptr<commonInterfaces::ArtifactRequest>& request) {
-        m_executor.submit([this, request] { downloadArtifact(request); });
+        m_executor.execute([this, request] { downloadArtifact(request); });
     }
 
     /** Takes string and tries to make it a ArtifactRequest
@@ -91,7 +91,7 @@ class AssetManager
 
     /** Queues up a call to deleteArtifact in an executor. Returns immediately. */
     inline void queueDeleteArtifact(const std::string& summaryString) {
-        m_executor.submit([this, summaryString] { deleteArtifact(summaryString); });
+        m_executor.execute([this, summaryString] { deleteArtifact(summaryString); });
     }
 
     /**
@@ -104,7 +104,7 @@ class AssetManager
 
     /** Queues up a call to handleUpdate in an executor. Returns immediately. */
     inline void queueHandleUpdate(const std::string& summaryString, bool acceptUpdate) {
-        m_executor.submit([this, summaryString, acceptUpdate] { handleUpdate(summaryString, acceptUpdate); });
+        m_executor.execute([this, summaryString, acceptUpdate] { handleUpdate(summaryString, acceptUpdate); });
     }
 
     /**
@@ -120,7 +120,7 @@ class AssetManager
 
     /** Queues up a call to freeUpSpace in an executor. Returns immediately. */
     inline void queueFreeUpSpace(size_t requestedAmount) {
-        m_executor.submit([this, requestedAmount] { freeUpSpace(requestedAmount); });
+        m_executor.execute([this, requestedAmount] { freeUpSpace(requestedAmount); });
     }
 
     /**
diff --git a/capabilities/AssetManager/acsdkAssetManager/src/StorageManager.cpp b/capabilities/AssetManager/acsdkAssetManager/src/StorageManager.cpp
index ad5bf989c1..2c5c22b79d 100644
--- a/capabilities/AssetManager/acsdkAssetManager/src/StorageManager.cpp
+++ b/capabilities/AssetManager/acsdkAssetManager/src/StorageManager.cpp
@@ -28,6 +28,7 @@ namespace manager {
 
 using namespace std;
 using namespace alexaClientSDK::avsCommon::utils;
+using namespace common;
 
 #if UNIT_TEST == 1
 // For tests, because we don't want to create megabytes worth of files...
@@ -40,6 +41,8 @@ static const string BUDGET_FILE_SUFFIX = "/budget.config";
 // when looking at how much space is available on the system, be sure to leave out a few MBs
 static constexpr size_t SYSTEM_STORAGE_BUFFER = 5 * BYTES_IN_MB;
 
+static const auto s_metrics = AmdMetricsWrapper::creator("StorageManager");
+
 /// String to identify log entries originating from this file.
 static const std::string TAG{"StorageManager"};
 
@@ -69,7 +72,10 @@ shared_ptr<StorageManager> StorageManager::create(
     if (configFile.good()) {
         configFile >> budget;
     }
-
+    if (budget <= 0) {
+        budget = MAX_BUDGET_MB;
+        s_metrics().addCounter(METRIC_PREFIX_ERROR("budgetSetToZero"));
+    }
     auto sm = shared_ptr<StorageManager>(new StorageManager(workingDirectory, assetManager, budget));
 
     if (!sm->init()) {
diff --git a/capabilities/AssetManager/acsdkAssetManager/src/UrlAllowListWrapper.cpp b/capabilities/AssetManager/acsdkAssetManager/src/UrlAllowListWrapper.cpp
index 2630bf6c7f..3a724cc05b 100644
--- a/capabilities/AssetManager/acsdkAssetManager/src/UrlAllowListWrapper.cpp
+++ b/capabilities/AssetManager/acsdkAssetManager/src/UrlAllowListWrapper.cpp
@@ -68,12 +68,9 @@ void UrlAllowListWrapper::addUrlToAllowList(std::string url) {
 }
 
 bool UrlAllowListWrapper::allowAllUrls(bool allow) {
-#ifdef DEBUG
     lock_guard<mutex> lock(m_allowListMutex);
     m_allowAllUrls = allow;
     return true;
-#endif
-    return false;
 }
 
 }  // namespace manager
diff --git a/capabilities/AssetManager/acsdkAssetManager/test/AssetManagerUpdateTest.cpp b/capabilities/AssetManager/acsdkAssetManager/test/AssetManagerUpdateTest.cpp
index d67175125a..d8ea009226 100644
--- a/capabilities/AssetManager/acsdkAssetManager/test/AssetManagerUpdateTest.cpp
+++ b/capabilities/AssetManager/acsdkAssetManager/test/AssetManagerUpdateTest.cpp
@@ -197,7 +197,7 @@ TEST_P(UpdateTest, CheckingForUpdateAtStartupAfterArtifactBecomesActive) {  // N
     ASSERT_EQ(artifact->updateEventCount, updateCount);
     artifact->resetCounts();
 }
-TEST_P(UpdateTest, UpdatingOneActiveArtifactViaPuffinDeviceArtifactNotification) {
+TEST_P(UpdateTest, UpdatingOneActiveArtifactViaDeviceArtifactNotification) {
     uploadArtifactAndSubscribeToChange(artifact, Priority::ACTIVE, updatedId);
 
     // Trigger update from JSON
@@ -205,7 +205,7 @@ TEST_P(UpdateTest, UpdatingOneActiveArtifactViaPuffinDeviceArtifactNotification)
 
     checkArtifactUpdatedOnce(artifact, updateAccepted, updateRejected, oldPath, newPath);
 }
-TEST_P(UpdateTest, UpdatingOneInactiveArtifactViaPuffinDeviceArtifactNotification) {
+TEST_P(UpdateTest, UpdatingOneInactiveArtifactViaDeviceArtifactNotification) {
     uploadArtifactAndSubscribeToChange(artifact, Priority::UNUSED, updatedId);
 
     // Trigger update from JSON
@@ -213,7 +213,7 @@ TEST_P(UpdateTest, UpdatingOneInactiveArtifactViaPuffinDeviceArtifactNotificatio
 
     ASSERT_FALSE(waitUntil([&] { return filesystem::exists(newPath); }, milliseconds(300)));
 }
-TEST_P(UpdateTest, UpdatingUnregisteredArtifactViaPuffinDeviceArtifactNotification) {
+TEST_P(UpdateTest, UpdatingUnregisteredArtifactViaDeviceArtifactNotification) {
     uploadArtifactAndSubscribeToChange(artifact, Priority::UNUSED, updatedId);
 
     // Trigger update from JSON
diff --git a/capabilities/AssetManager/acsdkAssetManagerClient/include/acsdkAssetManagerClient/ArtifactWrapper.h b/capabilities/AssetManager/acsdkAssetManagerClient/include/acsdkAssetManagerClient/ArtifactWrapper.h
index ba3c3cc2ca..fe7bff7e4c 100644
--- a/capabilities/AssetManager/acsdkAssetManagerClient/include/acsdkAssetManagerClient/ArtifactWrapper.h
+++ b/capabilities/AssetManager/acsdkAssetManagerClient/include/acsdkAssetManagerClient/ArtifactWrapper.h
@@ -16,7 +16,7 @@
 #ifndef ACSDKASSETMANAGERCLIENT_ARTIFACTWRAPPER_H_
 #define ACSDKASSETMANAGERCLIENT_ARTIFACTWRAPPER_H_
 
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 
 #include <condition_variable>
 #include <memory>
@@ -39,7 +39,7 @@ namespace client {
  */
 class ArtifactWrapper
         : public clientInterfaces::ArtifactWrapperInterface
-        , public acsdkNotifier::Notifier<clientInterfaces::ArtifactChangeObserver>
+        , public notifier::Notifier<clientInterfaces::ArtifactChangeObserver>
         , public acsdkCommunicationInterfaces::CommunicationPropertyChangeSubscriber<int>
         , public acsdkCommunicationInterfaces::CommunicationPropertyChangeSubscriber<std::string> {
 public:
@@ -124,11 +124,11 @@ class ArtifactWrapper
     void erase() override;
 
     void addWeakPtrObserver(const std::weak_ptr<clientInterfaces::ArtifactChangeObserver>& observer) override {
-        return acsdkNotifier::Notifier<clientInterfaces::ArtifactChangeObserver>::addWeakPtrObserver(observer);
+        return notifier::Notifier<clientInterfaces::ArtifactChangeObserver>::addWeakPtrObserver(observer);
     }
 
     void removeWeakPtrObserver(const std::weak_ptr<clientInterfaces::ArtifactChangeObserver>& observer) override {
-        return acsdkNotifier::Notifier<clientInterfaces::ArtifactChangeObserver>::removeWeakPtrObserver(observer);
+        return notifier::Notifier<clientInterfaces::ArtifactChangeObserver>::removeWeakPtrObserver(observer);
     }
 
 private:
diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/AudioItem.h b/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/AudioItem.h
index d9989a2fa7..246491d772 100644
--- a/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/AudioItem.h
+++ b/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/AudioItem.h
@@ -98,6 +98,7 @@ struct AudioItem {
 
         /// An opaque token that represents the expected previous stream.
         std::string expectedPreviousToken;
+
     } stream;
 
     /// The caption content that goes with the audio.
diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/AudioPlayer.h b/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/AudioPlayer.h
index 4b91948543..44b081449e 100644
--- a/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/AudioPlayer.h
+++ b/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/AudioPlayer.h
@@ -21,6 +21,7 @@
 #include <memory>
 
 #include <acsdkAudioPlayerInterfaces/AudioPlayerInterface.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
 #include <acsdkManufactory/Annotated.h>
 #include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
 #include <AVSCommon/AVS/CapabilityAgent.h>
@@ -134,7 +135,7 @@ class AudioPlayer
     /**
      * Destructor.
      */
-    virtual ~AudioPlayer() = default;
+    virtual ~AudioPlayer();
 
     /**
      * Factory method to create a new @c AudioPlayerInterface.
@@ -153,6 +154,7 @@ class AudioPlayer
      * default endpoint.
      * @param renderPlayerInfoCardsProviderRegistrar The object with which to register this AudioPlayer as a
      * @c RenderPlayerInfoCardsProviderInterface.
+     * @param cryptoFactory Encryption facilities factory.
      * @return A shared_ptr to a new @c AudioPlayerInterface.
      */
     static std::shared_ptr<acsdkAudioPlayerInterfaces::AudioPlayerInterface> createAudioPlayerInterface(
@@ -172,7 +174,8 @@ class AudioPlayer
             avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation,
             avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>& endpointCapabilitiesRegistrar,
         const std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface>&
-            renderPlayerInfoCardsProviderRegistrar);
+            renderPlayerInfoCardsProviderRegistrar,
+        const std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory);
 
     /**
      * Creates a new @c AudioPlayer instance.
@@ -186,6 +189,7 @@ class AudioPlayer
      * @param playbackRouter The @c PlaybackRouterInterface instance to use when @c AudioPlayer becomes active.
      * @param captionManager The optional @c CaptionManagerInterface instance to use for handling captions.
      * @param metricRecorder The metric recorder.
+     * @param cryptoFactory Encryption facilities factory.
      * @return A @c std::shared_ptr to the new @c AudioPlayer instance.
      */
     static std::shared_ptr<AudioPlayer> create(
@@ -195,6 +199,7 @@ class AudioPlayer
         std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
         std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
         std::shared_ptr<avsCommon::sdkInterfaces::PlaybackRouterInterface> playbackRouter,
+        std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface> cryptoFactory,
         std::shared_ptr<captions::CaptionManagerInterface> captionManager = nullptr,
         std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder = nullptr);
 
@@ -288,6 +293,11 @@ class AudioPlayer
     std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
     /// @}
 
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
 private:
     /**
      * A utility class to manage interaction with the MessageSender.
@@ -381,7 +391,6 @@ class AudioPlayer
          *
          * @param messageId The message Id of the @c PLAY directive.
          * @param dialogRequestId The dialog request Id of the @c PLAY directive.
-         * @param correlationToken The message Id of the @c PLAY directive.
          */
         PlayDirectiveInfo(const std::string& messageId, const std::string& dialogRequestId);
     };
@@ -401,6 +410,7 @@ class AudioPlayer
      * provided by @param mediaResourceProvider.
      * @param captionManager The optional @c CaptionManagerInterface instance to use for handling captions.
      * @param metricRecorder The metric recorder.
+     * @param cryptoFactory The optional @c Encryption facilities factory.
      * @return A @c std::shared_ptr to the new @c AudioPlayer instance.
      */
     AudioPlayer(
@@ -411,14 +421,10 @@ class AudioPlayer
         std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
         std::shared_ptr<avsCommon::sdkInterfaces::PlaybackRouterInterface> playbackRouter,
         std::vector<std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface>> audioChannelVolumeInterfaces,
+        std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface> cryptoFactory,
         std::shared_ptr<captions::CaptionManagerInterface> captionManager = nullptr,
         std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder = nullptr);
 
-    /// @name RequiresShutdown Functions
-    /// @{
-    void doShutdown() override;
-    /// @}
-
     /**
      * This function deserializes a @c Directive's payload into a @c rapidjson::Document.
      *
@@ -812,7 +818,6 @@ class AudioPlayer
      *
      * @param eventName The name of the event to be include in the header.
      * @param dialogRequestIdString The value associated with the "dialogRequestId" key.
-     * @param correlationToken The correlation toekn of the event to be included in the header.
      * @param payload The payload value associated with the "payload" key.
      * @param context Optional @c context to be sent with the event message.
      */
@@ -828,7 +833,6 @@ class AudioPlayer
      * @param audioItem item associated with the metadata
      * @param vectorOfTags Pointer to vector of tags that should be sent to AVS.
      * @param state Metadata about the media player state
-     * @param correlationToken correlation token of the event
      */
     void sendStreamMetadataExtractedEvent(
         AudioItem& audioItem,
@@ -1011,6 +1015,14 @@ class AudioPlayer
      */
     std::string getDomainNameHash(const std::string& url) const;
 
+    /**
+     * @brief Check if active media playback is happening currently.
+     *
+     * @return true  When we have active playback item and current state is
+     *                'PLAYING', 'BUFFERING', 'BUFFER_UNDERRUN' or 'PAUSED'.
+     */
+    bool isPlaybackActive() const;
+
     /// This is used to safely access the time utilities.
     avsCommon::utils::timing::TimeUtils m_timeUtils;
 
@@ -1030,6 +1042,9 @@ class AudioPlayer
     /// The @c PlaybackRouterInterface instance to use when @c AudioPlayer becomes active.
     std::shared_ptr<avsCommon::sdkInterfaces::PlaybackRouterInterface> m_playbackRouter;
 
+    /// The @c CryptoFactoryInterface instance to be used for crypto facilities.
+    std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface> m_cryptoFactory;
+
     /// The @c CaptionManagerInterface used for handling captions.
     std::shared_ptr<captions::CaptionManagerInterface> m_captionManager;
 
@@ -1053,7 +1068,7 @@ class AudioPlayer
     AudioPlayerState m_currentState;
 
     /// Protects writes to @c m_currentState and waiting on @c m_currentStateConditionVariable.
-    std::mutex m_currentStateMutex;
+    mutable std::mutex m_currentStateMutex;
 
     /// Provides notifications of changes to @c m_currentState.
     std::condition_variable m_currentStateConditionVariable;
diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/AudioPlayerComponent.h b/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/AudioPlayerComponent.h
index 4c162ff344..e8e505e48b 100644
--- a/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/AudioPlayerComponent.h
+++ b/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/AudioPlayerComponent.h
@@ -20,6 +20,7 @@
 
 #include <acsdkApplicationAudioPipelineFactoryInterfaces/ApplicationAudioPipelineFactoryInterface.h>
 #include <acsdkAudioPlayerInterfaces/AudioPlayerInterface.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
 #include <acsdkManufactory/Annotated.h>
 #include <acsdkManufactory/Component.h>
 #include <acsdkManufactory/Import.h>
@@ -70,7 +71,8 @@ acsdkManufactory::Component<
     acsdkManufactory::Import<acsdkManufactory::Annotated<
         avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation,
         avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>>
+    acsdkManufactory::Import<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>,
+    acsdkManufactory::Import<std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>>>
 getComponent(const std::string& configParentKey = "");
 
 /**
@@ -97,7 +99,8 @@ acsdkManufactory::Component<
     acsdkManufactory::Import<acsdkManufactory::Annotated<
         avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation,
         avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>>,
-    acsdkManufactory::Import<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>>
+    acsdkManufactory::Import<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>,
+    acsdkManufactory::Import<std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>>>
 getBackwardsCompatibleComponent();
 
 }  // namespace acsdkAudioPlayer
diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/Util.h b/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/Util.h
index 75c4ed2aac..5f6c39242b 100644
--- a/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/Util.h
+++ b/capabilities/AudioPlayer/acsdkAudioPlayer/include/acsdkAudioPlayer/Util.h
@@ -17,6 +17,7 @@
 #define ALEXA_CLIENT_SDK_ACSDKAUDIOPLAYER_INCLUDE_ACSDKAUDIOPLAYER_UTIL_H_
 
 #include <string>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
 
 namespace alexaClientSDK {
 namespace acsdkAudioPlayer {
@@ -27,9 +28,12 @@ class Util {
      * Generate MD5 Hash.
      *
      * @param input to hash.
-     * @return string MD5 Hash of input.
+     * @param cryptoFactory Encryption facilities factory.
+     * @return string MD5 Hash of input or an empty string if hashing fails.
      */
-    static std::string generateMD5Hash(const std::string& input);
+    static std::string generateMD5Hash(
+        const std::string& input,
+        const std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory);
 
     /**
      * Get domain name from an Url "https://www.xyz.com/sfsf" will return
diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/src/AudioPlayer.cpp b/capabilities/AudioPlayer/acsdkAudioPlayer/src/AudioPlayer.cpp
index ca48d1106a..d298587cb2 100644
--- a/capabilities/AudioPlayer/acsdkAudioPlayer/src/AudioPlayer.cpp
+++ b/capabilities/AudioPlayer/acsdkAudioPlayer/src/AudioPlayer.cpp
@@ -26,11 +26,9 @@
 #include <rapidjson/error/en.h>
 
 #include <AVSCommon/AVS/CapabilityConfiguration.h>
-#include <AVSCommon/AVS/EventBuilder.h>
 #include <AVSCommon/SDKInterfaces/Audio/MixingBehavior.h>
 #include <AVSCommon/Utils/JSON/JSONGenerator.h>
 #include <AVSCommon/Utils/JSON/JSONUtils.h>
-
 #include <AVSCommon/Utils/Metrics/MetricEventBuilder.h>
 #include <AVSCommon/Utils/Metrics/DataPointStringBuilder.h>
 #include <AVSCommon/Utils/Metrics/DataPointCounterBuilder.h>
@@ -176,6 +174,15 @@ static const char KEY_ANALYZERS_ENABLED[] = "enabled";
 /// The stutter key used in @c AudioPlayer events.
 static const char STUTTER_DURATION_KEY[] = "stutterDurationInMilliseconds";
 
+/// The content protection key used in @c AudioPlayer events.
+static const char CONTENT_PROTECTION_KEY[] = "contentProtection";
+
+/// The playlist type key used in @c AudioPlayer events.
+static const char PLAYLIST_TYPE_KEY[] = "playlistType";
+
+/// The domain name key used in @c AudioPlayer events.
+static const char DOMAIN_NAME_KEY[] = "domainNameHash";
+
 /// The duration to wait for a state change in @c onFocusChanged before failing.
 static const std::chrono::seconds TIMEOUT{2};
 
@@ -260,6 +267,9 @@ static const std::string TRACK_PLAYLIST_TYPE = "TrackType";
 /// Hash of the domain name of the track url, meta data sent with metric
 static const std::string TRACK_DOMAIN_NAME_HASH = "TrackDomainNameHash";
 
+/// Time difference allowed to consider two offsets to be 'the same'
+static const std::chrono::milliseconds SAME_OFFSET_DELTA_ALOWED(10);
+
 /// Keys for entry metric specific fields
 static const std::string METRIC_KEY_SEGMENT_ID = "segment_id";
 static const std::string METRIC_KEY_ACTOR = "actor";
@@ -274,9 +284,11 @@ static const std::string METRIC_KEY_ASSOCIATE_TO = "association_to_id";
 static const std::string METRIC_INSTANCE_RECEIVE_DIRECTIVE = "ReceiveDirective";
 static const std::string METRIC_INSTANCE_STATE_CHANGED = "PlaybackStateChanged";
 static const std::string METRIC_INSTANCE_FIRST_BYTE_READ = "FirstAudioByteRead";
+static const std::string METRIC_INSTANCE_PLAYBACK_STARTED = "PlaybackStarted";
 static const std::string METRIC_META_KEY_NAMESPACE = "namespace";
 static const std::string METRIC_META_KEY_NAME = "name";
 static const std::string METRIC_META_KEY_ISPREPARE_BOOL = "isPreparePhase";
+static const std::string METRIC_INSTANCE_FOCUS_CHANGE = "FocusChange";
 
 static const std::string METRIC_INSTANCE_ACQUIRE_MEDIA_PLAYER_START = "AcquireMediaPlayerStart";
 static const std::string METRIC_INSTANCE_ACQUIRE_MEDIA_PLAYER_FINISH = "AcquireMediaPlayerFinish";
@@ -458,7 +470,7 @@ AudioPlayer::MessageRequestObserver::MessageRequestObserver(
     const std::string& jsonContent,
     const std::string& uriPathExtension) :
         MessageRequest{jsonContent, uriPathExtension},
-        mMetricRecorder(metricRecorder) {
+        mMetricRecorder{metricRecorder} {
 }
 
 void AudioPlayer::MessageRequestObserver::sendCompleted(MessageRequestObserverInterface::Status sendMessageStatus) {
@@ -488,7 +500,7 @@ AudioPlayer::PlayDirectiveInfo::PlayDirectiveInfo(const std::string& messageId,
         sourceId{ERROR_SOURCE_ID},
         isBuffered{false},
         isPNFSent(false),
-        normalizationEnabled(false) {
+        normalizationEnabled{false} {
 }
 
 std::shared_ptr<acsdkAudioPlayerInterfaces::AudioPlayerInterface> AudioPlayer::createAudioPlayerInterface(
@@ -507,15 +519,17 @@ std::shared_ptr<acsdkAudioPlayerInterfaces::AudioPlayerInterface> AudioPlayer::c
         avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation,
         avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>& endpointCapabilitiesRegistrar,
     const std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface>&
-        renderPlayerInfoCardsProviderRegistrar) {
+        renderPlayerInfoCardsProviderRegistrar,
+    const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory) {
     std::shared_ptr<FocusManagerInterface> focusManager = annotatedFocusManager;
     if (!mediaResourceProvider || !shutdownNotifier || !endpointCapabilitiesRegistrar ||
-        !renderPlayerInfoCardsProviderRegistrar) {
+        !renderPlayerInfoCardsProviderRegistrar || !cryptoFactory) {
         ACSDK_ERROR(LX("createAudioPlayerInterfaceFailed")
                         .d("isPooledMediaResourceProviderNull", !mediaResourceProvider)
                         .d("isShutdownNotifierNull", !shutdownNotifier)
                         .d("isEndpointCapabilitiesRegistrarNull", !endpointCapabilitiesRegistrar)
-                        .d("isRenderPlayerInfoCardsProviderRegistrarNull", !renderPlayerInfoCardsProviderRegistrar));
+                        .d("isRenderPlayerInfoCardsProviderRegistrarNull", !renderPlayerInfoCardsProviderRegistrar)
+                        .d("isCryptoFactoryNull", !cryptoFactory));
         return nullptr;
     }
 
@@ -526,6 +540,7 @@ std::shared_ptr<acsdkAudioPlayerInterfaces::AudioPlayerInterface> AudioPlayer::c
         contextManager,
         exceptionSender,
         playbackRouter,
+        cryptoFactory,
         captionManager,
         metricRecorder);
 
@@ -548,6 +563,7 @@ std::shared_ptr<AudioPlayer> AudioPlayer::create(
     std::shared_ptr<ContextManagerInterface> contextManager,
     std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionSender,
     std::shared_ptr<PlaybackRouterInterface> playbackRouter,
+    std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface> cryptoFactory,
     std::shared_ptr<captions::CaptionManagerInterface> captionManager,
     std::shared_ptr<MetricRecorderInterface> metricRecorder) {
     if (nullptr == mediaResourceProvider) {
@@ -568,6 +584,9 @@ std::shared_ptr<AudioPlayer> AudioPlayer::create(
     } else if (nullptr == playbackRouter) {
         ACSDK_ERROR(LX("createFailed").d("reason", "nullPlaybackRouter"));
         return nullptr;
+    } else if (nullptr == cryptoFactory) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullcryptoFactory"));
+        return nullptr;
     }
 
     auto audioChannelVolumeInterfaces = mediaResourceProvider->getSpeakers();
@@ -584,19 +603,23 @@ std::shared_ptr<AudioPlayer> AudioPlayer::create(
         exceptionSender,
         playbackRouter,
         audioChannelVolumeInterfaces,
+        cryptoFactory,
         captionManager,
         metricRecorder));
     contextManager->setStateProvider(STATE, audioPlayer);
     audioPlayer->m_mediaResourceProvider->addObserver(audioPlayer);
-
     return audioPlayer;
 }
 
+AudioPlayer::~AudioPlayer() {
+    ACSDK_DEBUG5(LX(__func__));
+}
+
 void AudioPlayer::provideState(
     const avsCommon::avs::NamespaceAndName& stateProviderName,
     unsigned int stateRequestToken) {
     ACSDK_DEBUG(LX("provideState").d("stateRequestToken", stateRequestToken));
-    m_executor.submit([this, stateRequestToken] { executeProvideState(true, stateRequestToken); });
+    m_executor.execute([this, stateRequestToken] { executeProvideState(true, stateRequestToken); });
 }
 
 void AudioPlayer::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
@@ -615,9 +638,10 @@ void AudioPlayer::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
 
     ACSDK_DEBUG5(LX(__func__).d("name", info->directive->getName()).d("messageId", info->directive->getMessageId()));
 
-    if (!info->directive->getDialogRequestId().empty()) {
-        m_lastDialogRequestId = info->directive->getDialogRequestId();
-    }
+    std::string newDialogRequestId =
+        info->directive->getDialogRequestId().empty() ? m_lastDialogRequestId : info->directive->getDialogRequestId();
+    m_executor.execute([this, newDialogRequestId] { m_lastDialogRequestId = newDialogRequestId; });
+
     submitInstanceMetric(
         m_metricRecorder,
         info->directive->getDialogRequestId().empty() ? m_lastDialogRequestId : info->directive->getDialogRequestId(),
@@ -686,7 +710,7 @@ void AudioPlayer::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
     if (info && info->directive) {
         ACSDK_DEBUG(LX("cancelDirective").d("name", info->directive->getName()));
         auto messageId = info->directive->getMessageId();
-        m_executor.submit([this, messageId] {
+        m_executor.execute([this, messageId] {
             auto okToRequest = m_okToRequestNextTrack;
             m_okToRequestNextTrack = false;
             for (auto it = m_audioPlayQueue.begin(); it != m_audioPlayQueue.end(); it++) {
@@ -710,7 +734,7 @@ void AudioPlayer::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
 
 void AudioPlayer::onDeregistered() {
     ACSDK_DEBUG(LX("onDeregistered"));
-    m_executor.submit([this] {
+    m_executor.execute([this] {
         executeStop();
         clearPlayQueue(false);
     });
@@ -729,7 +753,7 @@ DirectiveHandlerConfiguration AudioPlayer::getConfiguration() const {
 
 void AudioPlayer::onFocusChanged(FocusState newFocus, MixingBehavior behavior) {
     ACSDK_DEBUG(LX("onFocusChanged").d("newFocus", newFocus).d("MixingBehavior", behavior));
-    m_executor.submit([this, newFocus, behavior] { executeOnFocusChanged(newFocus, behavior); });
+    m_executor.execute([this, newFocus, behavior] { executeOnFocusChanged(newFocus, behavior); });
 
     switch (newFocus) {
         case FocusState::FOREGROUND:
@@ -829,8 +853,16 @@ void AudioPlayer::onPlaybackStarted(SourceId id, const MediaPlayerState& state)
         protectionName,
         playlistType,
         domainNameHash);
+    submitInstanceMetric(
+        m_metricRecorder,
+        m_currentlyPlaying->dialogRequestId,
+        METRIC_INSTANCE_PLAYBACK_STARTED,
+        std::map<std::string, std::string>{{TOKEN_KEY, m_currentlyPlaying->audioItem.id},
+                                           {CONTENT_PROTECTION_KEY, protectionName},
+                                           {PLAYLIST_TYPE_KEY, playlistType},
+                                           {DOMAIN_NAME_KEY, domainNameHash}});
 
-    m_executor.submit([this, id, state] { executeOnPlaybackStarted(id, state); });
+    m_executor.execute([this, id, state] { executeOnPlaybackStarted(id, state); });
 }
 
 void AudioPlayer::onPlaybackStopped(SourceId id, const MediaPlayerState& state) {
@@ -843,12 +875,12 @@ void AudioPlayer::onPlaybackStopped(SourceId id, const MediaPlayerState& state)
         m_currentlyPlaying->stopMessageId,
         m_currentlyPlaying->audioItem.id);
 
-    m_executor.submit([this, id, state] { executeOnPlaybackStopped(id, state); });
+    m_executor.execute([this, id, state] { executeOnPlaybackStopped(id, state); });
 }
 
 void AudioPlayer::onPlaybackFinished(SourceId id, const MediaPlayerState& state) {
     ACSDK_DEBUG(LX("onPlaybackFinished").d("id", id).d("state", state));
-    m_executor.submit([this, id, state] { executeOnPlaybackFinished(id, state); });
+    m_executor.execute([this, id, state] { executeOnPlaybackFinished(id, state); });
 }
 
 void AudioPlayer::onPlaybackError(
@@ -857,32 +889,32 @@ void AudioPlayer::onPlaybackError(
     std::string error,
     const MediaPlayerState& state) {
     ACSDK_DEBUG(LX("onPlaybackError").d("type", type).d("error", error).d("id", id).d("state", state));
-    m_executor.submit([this, id, type, error, state] { executeOnPlaybackError(id, type, error, state); });
+    m_executor.execute([this, id, type, error, state] { executeOnPlaybackError(id, type, error, state); });
 }
 
 void AudioPlayer::onPlaybackPaused(SourceId id, const MediaPlayerState& state) {
     ACSDK_DEBUG(LX("onPlaybackPaused").d("id", id).d("state", state));
-    m_executor.submit([this, id, state] { executeOnPlaybackPaused(id, state); });
+    m_executor.execute([this, id, state] { executeOnPlaybackPaused(id, state); });
 }
 
 void AudioPlayer::onPlaybackResumed(SourceId id, const MediaPlayerState& state) {
     ACSDK_DEBUG(LX("onPlaybackResumed").d("id", id).d("state", state));
-    m_executor.submit([this, id, state] { executeOnPlaybackResumed(id, state); });
+    m_executor.execute([this, id, state] { executeOnPlaybackResumed(id, state); });
 }
 
 void AudioPlayer::onBufferUnderrun(SourceId id, const MediaPlayerState& state) {
     ACSDK_DEBUG(LX("onBufferUnderrun").d("id", id).d("state", state));
-    m_executor.submit([this, id, state] { executeOnBufferUnderrun(id, state); });
+    m_executor.execute([this, id, state] { executeOnBufferUnderrun(id, state); });
 }
 
 void AudioPlayer::onBufferRefilled(SourceId id, const MediaPlayerState& state) {
     ACSDK_DEBUG(LX("onBufferRefilled").d("id", id).d("state", state));
-    m_executor.submit([this, id, state] { executeOnBufferRefilled(id, state); });
+    m_executor.execute([this, id, state] { executeOnBufferRefilled(id, state); });
 }
 
 void AudioPlayer::onSeeked(SourceId id, const MediaPlayerState& startState, const MediaPlayerState& endState) {
     ACSDK_DEBUG(LX("onSeeked").d("id", id).d("startState", startState).d("endState", endState));
-    m_executor.submit([this, id, startState, endState] { executeOnSeeked(id, startState, endState); });
+    m_executor.execute([this, id, startState, endState] { executeOnSeeked(id, startState, endState); });
 }
 
 void AudioPlayer::onTags(SourceId id, std::unique_ptr<const VectorOfTags> vectorOfTags, const MediaPlayerState& state) {
@@ -892,37 +924,37 @@ void AudioPlayer::onTags(SourceId id, std::unique_ptr<const VectorOfTags> vector
         return;
     }
     std::shared_ptr<const VectorOfTags> sharedVectorOfTags(std::move(vectorOfTags));
-    m_executor.submit([this, id, sharedVectorOfTags, state] { executeOnTags(id, sharedVectorOfTags, state); });
+    m_executor.execute([this, id, sharedVectorOfTags, state] { executeOnTags(id, sharedVectorOfTags, state); });
 }
 
 void AudioPlayer::onBufferingComplete(SourceId id, const MediaPlayerState& state) {
     ACSDK_DEBUG(LX("onBufferingComplete").d("id", id).d("state", state));
-    m_executor.submit([this, id, state] { executeOnBufferingComplete(id, state); });
+    m_executor.execute([this, id, state] { executeOnBufferingComplete(id, state); });
 }
 
 void AudioPlayer::onReadyToProvideNextPlayer() {
     ACSDK_DEBUG(LX(__func__));
-    m_executor.submit([this] { executeOnReadyToProvideNextPlayer(); });
+    m_executor.execute([this] { executeOnReadyToProvideNextPlayer(); });
 }
 
 void AudioPlayer::onProgressReportDelayElapsed() {
     ACSDK_DEBUG5(LX(__func__));
-    m_executor.submit([this] { sendEventWithTokenAndOffset("ProgressReportDelayElapsed"); });
+    m_executor.execute([this] { sendEventWithTokenAndOffset("ProgressReportDelayElapsed"); });
 }
 
 void AudioPlayer::onProgressReportIntervalElapsed() {
     ACSDK_DEBUG9(LX(__func__));
-    m_executor.submit([this] { sendEventWithTokenAndOffset("ProgressReportIntervalElapsed", true); });
+    m_executor.execute([this] { sendEventWithTokenAndOffset("ProgressReportIntervalElapsed", true); });
 }
 
 void AudioPlayer::onProgressReportIntervalUpdated() {
     ACSDK_DEBUG9(LX(__func__));
-    m_executor.submit([this] { sendEventWithTokenAndOffset("ProgressReportIntervalUpdated"); });
+    m_executor.execute([this] { sendEventWithTokenAndOffset("ProgressReportIntervalUpdated"); });
 }
 
 void AudioPlayer::requestProgress() {
     ACSDK_DEBUG9(LX(__func__));
-    m_executor.submit([this] {
+    m_executor.execute([this] {
         auto progress = getOffset();
         m_progressTimer.onProgress(progress);
     });
@@ -934,7 +966,7 @@ void AudioPlayer::addObserver(std::shared_ptr<AudioPlayerObserverInterface> obse
         ACSDK_ERROR(LX("addObserver").m("Observer is null."));
         return;
     }
-    m_executor.submit([this, observer] {
+    m_executor.execute([this, observer] {
         if (!m_observers.insert(observer).second) {
             ACSDK_ERROR(LX("addObserver").m("Duplicate observer."));
         }
@@ -947,7 +979,7 @@ void AudioPlayer::removeObserver(std::shared_ptr<AudioPlayerObserverInterface> o
         ACSDK_ERROR(LX("removeObserver").m("Observer is null."));
         return;
     }
-    m_executor.submit([this, observer] {
+    m_executor.execute([this, observer] {
         if (m_observers.erase(observer) == 0) {
             ACSDK_WARN(LX("removeObserver").m("Nonexistent observer."));
         }
@@ -956,7 +988,7 @@ void AudioPlayer::removeObserver(std::shared_ptr<AudioPlayerObserverInterface> o
 
 void AudioPlayer::setObserver(std::shared_ptr<RenderPlayerInfoCardsObserverInterface> observer) {
     ACSDK_DEBUG1(LX(__func__));
-    m_executor.submit([this, observer] { m_renderPlayerObserver = observer; });
+    m_executor.execute([this, observer] { m_renderPlayerObserver = observer; });
 }
 
 std::chrono::milliseconds AudioPlayer::getAudioItemOffset() {
@@ -980,11 +1012,11 @@ bool AudioPlayer::localOperation(PlaybackOperation op) {
     std::promise<bool> opSuccess;
     auto successFuture = opSuccess.get_future();
 
-    m_executor.submit([this, op, &opSuccess] { executeLocalOperation(op, std::move(opSuccess)); });
+    m_executor.execute([this, op, &opSuccess] { executeLocalOperation(op, std::move(opSuccess)); });
 
     if (successFuture.wait_for(std::chrono::milliseconds(2000)) == std::future_status::timeout) {
         // if the operation has timed out, set the success to false
-        m_executor.submit([this] { executeLocalOperationTimedout(); });
+        m_executor.execute([this] { executeLocalOperationTimedout(); });
     }
 
     return successFuture.get();
@@ -1004,6 +1036,7 @@ AudioPlayer::AudioPlayer(
     std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionSender,
     std::shared_ptr<PlaybackRouterInterface> playbackRouter,
     std::vector<std::shared_ptr<ChannelVolumeInterface>> audioChannelVolumeInterfaces,
+    std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface> cryptoFactory,
     std::shared_ptr<captions::CaptionManagerInterface> captionManager,
     std::shared_ptr<MetricRecorderInterface> metricRecorder) :
         CapabilityAgent{NAMESPACE, exceptionSender},
@@ -1013,6 +1046,7 @@ AudioPlayer::AudioPlayer(
         m_focusManager{focusManager},
         m_contextManager{contextManager},
         m_playbackRouter{playbackRouter},
+        m_cryptoFactory(cryptoFactory),
         m_captionManager{captionManager},
         m_metricRecorder{metricRecorder},
         m_currentState{AudioPlayerState::IDLE},
@@ -1033,6 +1067,8 @@ AudioPlayer::AudioPlayer(
     Fingerprint fingerprint = m_mediaResourceProvider->getFingerprint();
     m_capabilityConfigurations.insert(getAudioPlayerCapabilityConfiguration(fingerprint));
     m_currentlyPlaying->sourceId = ERROR_SOURCE_ID;
+
+    ACSDK_DEBUG5(LX(__func__));
 }
 
 std::shared_ptr<CapabilityConfiguration> getAudioPlayerCapabilityConfiguration(Fingerprint fingerprint) {
@@ -1370,7 +1406,7 @@ void AudioPlayer::preHandlePlayDirective(std::shared_ptr<DirectiveInfo> info) {
     }
 
     playItem->audioItem = audioItem;
-    m_executor.submit([this, info, playItem] {
+    m_executor.execute([this, info, playItem] {
         if (isMessageInQueue(playItem->messageId)) {
             // There's is already a playInfo with the same messageId in the queue.
             ACSDK_ERROR(LX("preHandlePlayDirectiveFailed").d("reason", "messageIdAlreadyInPreHandleQueue"));
@@ -1463,7 +1499,7 @@ void AudioPlayer::handlePlayDirective(std::shared_ptr<DirectiveInfo> info) {
     }
 
     // Pass messageId so we can use it when the track is popped from the play queue
-    m_executor.submit([this, messageId] { executePlay(messageId); });
+    m_executor.execute([this, messageId] { executePlay(messageId); });
 }
 
 void AudioPlayer::handleStopDirective(std::shared_ptr<DirectiveInfo> info) {
@@ -1482,7 +1518,7 @@ void AudioPlayer::handleStopDirective(std::shared_ptr<DirectiveInfo> info) {
     auto messageId = info->directive->getMessageId();
 
     setHandlingCompleted(info);
-    m_executor.submit([this, messageId] { executeStop(messageId); });
+    m_executor.execute([this, messageId] { executeStop(messageId); });
 }
 
 void AudioPlayer::handleClearQueueDirective(std::shared_ptr<DirectiveInfo> info) {
@@ -1498,7 +1534,7 @@ void AudioPlayer::handleClearQueueDirective(std::shared_ptr<DirectiveInfo> info)
     }
 
     setHandlingCompleted(info);
-    m_executor.submit([this, clearBehavior] { executeClearQueue(clearBehavior); });
+    m_executor.execute([this, clearBehavior] { executeClearQueue(clearBehavior); });
 }
 
 void AudioPlayer::handleUpdateProgressReportIntervalDirective(std::shared_ptr<DirectiveInfo> info) {
@@ -1515,7 +1551,7 @@ void AudioPlayer::handleUpdateProgressReportIntervalDirective(std::shared_ptr<Di
     }
 
     setHandlingCompleted(info);
-    m_executor.submit(
+    m_executor.execute(
         [this, milliseconds] { executeUpdateProgressReportInterval(std::chrono::milliseconds(milliseconds)); });
 }
 
@@ -1620,10 +1656,17 @@ void AudioPlayer::executeOnFocusChanged(FocusState newFocus, MixingBehavior beha
     m_focus = newFocus;
     m_mixingBehavior = behavior;
 
+    submitInstanceMetric(
+        m_metricRecorder,
+        m_currentlyPlaying->dialogRequestId,
+        METRIC_INSTANCE_FOCUS_CHANGE,
+        std::map<std::string, std::string>{{TOKEN_KEY, m_currentlyPlaying->audioItem.id},
+                                           {ACTIVITY_KEY, focusStateToString(m_focus)}});
+
     switch (newFocus) {
         case FocusState::FOREGROUND: {
             // mark any pending request as false
-            if (m_isAcquireChannelRequestPending) {
+            if (!m_isStopCalled && m_isAcquireChannelRequestPending) {
                 m_isAcquireChannelRequestPending = false;
             }
 
@@ -1711,7 +1754,7 @@ void AudioPlayer::executeOnFocusChanged(FocusState newFocus, MixingBehavior beha
         } break;
         case FocusState::BACKGROUND:
             // mark any pending request as false
-            if (m_isAcquireChannelRequestPending) {
+            if (!m_isStopCalled && m_isAcquireChannelRequestPending) {
                 m_isAcquireChannelRequestPending = false;
             }
 
@@ -1783,7 +1826,7 @@ void AudioPlayer::executeOnFocusChanged(FocusState newFocus, MixingBehavior beha
                     //     to be reporting errors in those cases.
 
                     // Pause By Default Upon Receiving Background Focus
-                    if (m_currentlyPlaying->mediaPlayer) {
+                    if (m_currentlyPlaying->mediaPlayer && !m_isPausingPlayback) {
                         m_currentlyPlaying->mediaPlayer->pause(m_currentlyPlaying->sourceId);
                         m_isPausingPlayback = true;
                     }
@@ -2074,7 +2117,7 @@ void AudioPlayer::executeOnPlaybackFinished(SourceId id, const MediaPlayerState&
                     releaseMediaPlayer(m_currentlyPlaying);
                 }
 
-                m_executor.submit([this, state] {
+                m_executor.execute([this, state] {
                     // In some corner cases, usually in testing only, the 'NearlyFinished' event may not have been sent
                     // yet, check here, and send before 'Finished'
                     if (m_okToRequestNextTrack) {
@@ -2093,7 +2136,7 @@ void AudioPlayer::executeOnPlaybackFinished(SourceId id, const MediaPlayerState&
                         m_isAutoProgressing = true;
                         // This defers 'playNextItem' call one more time, so the executor queue can catch up
                         // allowing the context to have correct info
-                        m_executor.submit([this] { playNextItem(); });
+                        m_executor.execute([this] { playNextItem(); });
                     }
                 });
             }
@@ -2394,7 +2437,10 @@ void AudioPlayer::releaseMediaPlayer(std::shared_ptr<PlayDirectiveInfo> playback
             // This should never happen, but even if it does, the pointer should eb reset, so continue.
         }
         playbackItem->mediaPlayer.reset();
-        playbackItem->sourceId = ERROR_SOURCE_ID;
+        if (playbackItem != m_currentlyPlaying) {
+            // Don't do this for currently playing, so events arriving after this get handled
+            playbackItem->sourceId = ERROR_SOURCE_ID;
+        }
     }
 }
 
@@ -2442,7 +2488,6 @@ bool AudioPlayer::configureMediaPlayer(std::shared_ptr<PlayDirectiveInfo>& playb
             cfg.audioNormalizationConfig.enabled = playbackItem->normalizationEnabled;
 
             auto& mediaDescription = cfg.mediaDescription;
-
             mediaDescription.mixingBehavior = playbackItem->mixingBehavior;
             mediaDescription.focusChannel = "Content";
             mediaDescription.trackId = playbackItem->audioItem.id;
@@ -2538,16 +2583,26 @@ void AudioPlayer::executePrePlay(std::shared_ptr<PlayDirectiveInfo> info) {
 
         // When using song id, the server will send a tts-as-track & music directive pair, both with
         // the same audioItemId / token.  So to make this work, we need to compare urls as well as id's
-        // This is temperary until the Cloud issue DEEAPP-919865 is fixed, at which point AudioItemIds
+        // This is temporary until the Cloud issue DEEAPP-919865 is fixed, at which point AudioItemIds
         // are all that need comparing
+        auto deltaOffset = (info->audioItem.stream.offset > existingItem->audioItem.stream.offset)
+                               ? info->audioItem.stream.offset - existingItem->audioItem.stream.offset
+                               : existingItem->audioItem.stream.offset - info->audioItem.stream.offset;
+
         isNextItem =
             (m_audioPlayQueue.size() == 1 && existingItem->audioItem.id == info->audioItem.id &&
-             compareUrlNotQuery(existingItem->audioItem.stream.url, info->audioItem.stream.url));
+             compareUrlNotQuery(existingItem->audioItem.stream.url, info->audioItem.stream.url) &&
+             deltaOffset < SAME_OFFSET_DELTA_ALOWED);
 
         if (!isNextItem && m_audioPlayQueue.size() > 1) {
             for (auto& it : m_audioPlayQueue) {
+                deltaOffset = (info->audioItem.stream.offset > it->audioItem.stream.offset)
+                                  ? info->audioItem.stream.offset - it->audioItem.stream.offset
+                                  : it->audioItem.stream.offset - info->audioItem.stream.offset;
+
                 if (it->audioItem.id == info->audioItem.id &&
-                    compareUrlNotQuery(it->audioItem.stream.url, info->audioItem.stream.url)) {
+                    compareUrlNotQuery(it->audioItem.stream.url, info->audioItem.stream.url) &&
+                    deltaOffset < SAME_OFFSET_DELTA_ALOWED) {
                     isNextItem = true;
                     existingItem = it;
                     break;
@@ -2710,7 +2765,11 @@ void AudioPlayer::playNextItem() {
         playItem->messageId,
         playItem->audioItem.id);
 
-    releaseMediaPlayer(m_currentlyPlaying);
+    if (isPlaybackActive()) {
+        stopAndReleaseMediaPlayer(m_currentlyPlaying);
+    } else {
+        releaseMediaPlayer(m_currentlyPlaying);
+    }
     m_currentlyPlaying = playItem;
     m_currentlyPlaying->initialOffset = m_currentlyPlaying->audioItem.stream.offset;
     m_offset = m_currentlyPlaying->initialOffset;
@@ -2985,7 +3044,9 @@ void AudioPlayer::executeLocalOperation(PlaybackOperation op, std::promise<bool>
                     }
                     success.set_value(m_isStopCalled);
                 } else if (op == PlaybackOperation::TRANSIENT_PAUSE) {
-                    m_isPausingPlayback = m_currentlyPlaying->mediaPlayer->pause(m_currentlyPlaying->sourceId);
+                    if (!m_isPausingPlayback) {
+                        m_isPausingPlayback = m_currentlyPlaying->mediaPlayer->pause(m_currentlyPlaying->sourceId);
+                    }
                     success.set_value(m_isPausingPlayback);
                 } else {  // Cannot reach here if in PAUSED state, and op is RESUME
                     success.set_value(true);
@@ -3069,7 +3130,7 @@ void AudioPlayer::changeState(AudioPlayerState state) {
     auto& playItem = (m_itemPendingPlaybackStart ? m_itemPendingPlaybackStart : m_currentlyPlaying);
     submitInstanceMetric(
         m_metricRecorder,
-        playItem->dialogRequestId,
+        m_lastDialogRequestId,
         METRIC_INSTANCE_STATE_CHANGED,
         std::map<std::string, std::string>{{ACTIVITY_KEY, playerStateToString(state)},
                                            {TOKEN_KEY, playItem->audioItem.id}});
@@ -3080,13 +3141,13 @@ void AudioPlayer::sendEventWithTokenAndOffset(
     const std::string& eventName,
     bool includePlaybackReports,
     std::chrono::milliseconds offset) {
-    auto token = &m_currentlyPlaying->audioItem.stream.token;
-    if (token->empty() && m_currentState == AudioPlayerState::BUFFERING && !m_audioPlayQueue.empty()) {
-        token = &m_audioPlayQueue.front()->audioItem.stream.token;
+    auto token = m_currentlyPlaying->audioItem.stream.token;
+    if (token.empty() && m_currentState == AudioPlayerState::BUFFERING && !m_audioPlayQueue.empty()) {
+        token = m_audioPlayQueue.front()->audioItem.stream.token;
     }
 
     rapidjson::Document payload(rapidjson::kObjectType);
-    payload.AddMember(TOKEN_KEY, *token, payload.GetAllocator());
+    payload.AddMember(TOKEN_KEY, token, payload.GetAllocator());
     // Note: offset is an optional parameter, which defaults to MEDIA_PLAYER_INVALID_OFFSET.  Per documentation,
     // this function will use the current MediaPlayer offset is a valid offset was not provided.
     if (MEDIA_PLAYER_INVALID_OFFSET == offset) {
@@ -3104,6 +3165,7 @@ void AudioPlayer::sendEventWithTokenAndOffset(
     if (includePlaybackReports) {
         attachPlaybackReportsIfAvailable(payload, payload.GetAllocator());
     }
+
     rapidjson::StringBuffer buffer;
     rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
     if (!payload.Accept(writer)) {
@@ -3250,6 +3312,7 @@ void AudioPlayer::sendStreamMetadataExtractedEvent(
 
     rapidjson::Value metadata(rapidjson::kObjectType);
     bool passFilter = false;
+
     // Make a copy of the duplicate cache
     VectorOfTags newCache(audioItem.cachedMetadata.begin(), audioItem.cachedMetadata.end());
     for (auto& tag : *vectorOfTags) {
@@ -3321,7 +3384,6 @@ void AudioPlayer::sendStreamMetadataExtractedEvent(
         ACSDK_DEBUG(LX("sendStreamMetadataExtractedEvent").d("eventNotSent", "tooFrequent"));
         return;
     }
-
     payload.AddMember("metadata", metadata, payload.GetAllocator());
 
     rapidjson::StringBuffer buffer;
@@ -3404,18 +3466,8 @@ void AudioPlayer::sendEvent(
     const std::string& dialogRequestIdString,
     const std::string& payload,
     const std::string& context) {
-    AVSMessageHeader header = AVSMessageHeader::createAVSEventHeader(m_namespace, eventName, dialogRequestIdString, "");
-
-    json::JsonGenerator jsonGenerator;
-    if (!context.empty()) {
-        jsonGenerator.addRawJsonMember("context", context);
-    }
-    jsonGenerator.startObject("event");
-    jsonGenerator.addRawJsonMember(avsCommon::avs::constants::HEADER_KEY_STRING, header.toJson());
-    jsonGenerator.addRawJsonMember(avsCommon::avs::constants::PAYLOAD_KEY_STRING, payload);
-    jsonGenerator.finishObject();
-
-    auto request = std::make_shared<MessageRequestObserver>(m_metricRecorder, jsonGenerator.toString(), "");
+    auto event = buildJsonEventString(eventName, dialogRequestIdString, payload, context);
+    auto request = std::make_shared<MessageRequestObserver>(m_metricRecorder, event.second, "");
     m_messageSender->sendMessage(request);
 }
 
@@ -3630,10 +3682,17 @@ std::string AudioPlayer::getDomainNameHash(const std::string& url) const {
     std::string domainName = Util::getDomainNameFromUrl(url);
     std::string md5;
     if (!domainName.empty()) {
-        md5 = Util::generateMD5Hash(domainName);
+        md5 = Util::generateMD5Hash(domainName, m_cryptoFactory);
     }
     return md5;
 }
 
+bool AudioPlayer::isPlaybackActive() const {
+    if (!m_currentlyPlaying || !m_currentlyPlaying->mediaPlayer) return false;
+
+    return m_currentState == AudioPlayerState::PLAYING || m_currentState == AudioPlayerState::PAUSED ||
+           m_currentState == AudioPlayerState::BUFFERING || m_currentState == AudioPlayerState::BUFFER_UNDERRUN;
+}
+
 }  // namespace acsdkAudioPlayer
 }  // namespace alexaClientSDK
diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/src/AudioPlayerComponent.cpp b/capabilities/AudioPlayer/acsdkAudioPlayer/src/AudioPlayerComponent.cpp
index 1e7312e58f..106003b571 100644
--- a/capabilities/AudioPlayer/acsdkAudioPlayer/src/AudioPlayerComponent.cpp
+++ b/capabilities/AudioPlayer/acsdkAudioPlayer/src/AudioPlayerComponent.cpp
@@ -130,7 +130,8 @@ Component<
     Import<Annotated<
         avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation,
         avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>>,
-    Import<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>>
+    Import<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>,
+    Import<std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>>>
 getComponent(const std::string& configParentKey) {
     return ComponentAccumulator<>()
         .addRetainedFactory(getCreatePooledMediaResourceProviderInterface(configParentKey))
@@ -151,7 +152,8 @@ Component<
     Import<Annotated<
         avsCommon::sdkInterfaces::endpoints::DefaultEndpointAnnotation,
         avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>>,
-    Import<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>>
+    Import<std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>>,
+    Import<std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>>>
 getBackwardsCompatibleComponent() {
     return ComponentAccumulator<>().addRequiredFactory(AudioPlayer::createAudioPlayerInterface);
 }
diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/src/CMakeLists.txt b/capabilities/AudioPlayer/acsdkAudioPlayer/src/CMakeLists.txt
index d9a871dc6a..1bcd4d63d6 100644
--- a/capabilities/AudioPlayer/acsdkAudioPlayer/src/CMakeLists.txt
+++ b/capabilities/AudioPlayer/acsdkAudioPlayer/src/CMakeLists.txt
@@ -3,12 +3,14 @@ if (ENABLE_DEVICE_CONTEXT_IN_EVENT)
 endif()
 add_definitions("-DACSDK_LOG_MODULE=audioplayer")
 
-add_library(acsdkAudioPlayer
+set (AUDIOPLAYER_SOURCES
     AudioPlayer.cpp
     AudioPlayerComponent.cpp
     ProgressTimer.cpp
     Util.cpp)
 
+add_library(acsdkAudioPlayer ${AUDIOPLAYER_SOURCES})
+
 target_include_directories(acsdkAudioPlayer PUBLIC
     "${acsdkAudioPlayer_SOURCE_DIR}/include"
     "${CRYPTO_INCLUDE_DIRS}")
@@ -19,7 +21,8 @@ target_link_libraries(acsdkAudioPlayer
     acsdkShutdownManagerInterfaces
     Captions
     AVSCommon
-    "${CRYPTO_LDFLAGS}")
+    acsdkCodecUtils
+    acsdkCryptoInterfaces)
 
 
 # install target
diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/src/ProgressTimer.cpp b/capabilities/AudioPlayer/acsdkAudioPlayer/src/ProgressTimer.cpp
index 10d4e66385..3d8a344612 100644
--- a/capabilities/AudioPlayer/acsdkAudioPlayer/src/ProgressTimer.cpp
+++ b/capabilities/AudioPlayer/acsdkAudioPlayer/src/ProgressTimer.cpp
@@ -273,7 +273,7 @@ bool ProgressTimer::setState(State newState) {
     if (allowed) {
         ACSDK_DEBUG9(LX(__func__).d("state", m_state).d("newState", newState));
         m_state = newState;
-        m_wake.notify_one();
+        m_wake.notify_all();
     } else {
         ACSDK_ERROR(LX("setStateFailed").d("reason", "notAllowed").d("state", m_state).d("newState", newState));
     }
diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/src/Util.cpp b/capabilities/AudioPlayer/acsdkAudioPlayer/src/Util.cpp
index c4b0a0f44c..9ee498a682 100644
--- a/capabilities/AudioPlayer/acsdkAudioPlayer/src/Util.cpp
+++ b/capabilities/AudioPlayer/acsdkAudioPlayer/src/Util.cpp
@@ -16,7 +16,7 @@
 #include "acsdkAudioPlayer/Util.h"
 #include <AVSCommon/Utils/Logger/Logger.h>
 
-#include <openssl/md5.h>
+#include <acsdk/CodecUtils/Hex.h>
 
 namespace alexaClientSDK {
 namespace acsdkAudioPlayer {
@@ -29,40 +29,59 @@ static const std::string TAG("AudioPlayerUtil");
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
  *
- * @param The event string for this @c LogEntry.
+ * @param event The event string for this @c LogEntry.
  */
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
-// Number of Bits In Byte.
-static const int kBitsInByte(8);
-// Number of Bits In Hex.
-static const int kBitsInHex(4);
-// Number of Hex characters in Byte.
-static const int kHexInByte(kBitsInByte / kBitsInHex);
+std::string Util::generateMD5Hash(
+    const std::string& key,
+    const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory) {
+    using namespace alexaClientSDK::cryptoInterfaces;
+    using namespace alexaClientSDK::codecUtils;
 
-std::string Util::generateMD5Hash(const std::string& key) {
+    static std::mutex keyMutex;
     // mini cache
     static std::string lastKey;
     static std::string lastHash;
+    {
+        std::lock_guard<std::mutex> lock{keyMutex};
+        if (lastKey == key) {
+            return lastHash;
+        }
+    }
 
-    if (lastKey == key) {
-        return lastHash;
+    if (!cryptoFactory) {
+        ACSDK_ERROR(LX("generateMD5Hashfailed").d("reason", "nullcryptoFactory"));
+        return "";
     }
 
-    uint8_t hashOutput[MD5_DIGEST_LENGTH];
-    if (!MD5((uint8_t*)key.data(), key.size(), hashOutput)) {
-        ACSDK_ERROR(LX(__FUNCTION__).d("reason", "failedToGenerateHash"));
-        return std::string();
+    auto digest = cryptoFactory->createDigest(DigestType::MD5);
+    if (!digest) {
+        ACSDK_ERROR(LX("generateMD5Hashfailed").d("reason", "createDigestFailed"));
+        return "";
+    }
+
+    if (!digest->processString(key)) {
+        ACSDK_ERROR(LX("generateMD5Hashfailed").d("reason", "digestProcessFailed"));
+        return "";
     }
 
-    char hashString[MD5_DIGEST_LENGTH * kHexInByte + 1];
-    // Generate Hexadecimal string from given hash output.
-    for (int i = 0; i < MD5_DIGEST_LENGTH; i++) {
-        snprintf(hashString + (i * kHexInByte), kHexInByte + 1, "%02x", hashOutput[i]);
+    DigestInterface::DataBlock digestData;
+    if (!digest->finalize(digestData)) {
+        ACSDK_ERROR(LX("generateMD5Hashfailed").d("reason", "digestFinalizeFailed"));
+        return "";
+    }
+    std::string hashString;
+    if (!encodeHex(digestData, hashString)) {
+        ACSDK_ERROR(LX("generateMD5Hashfailed").d("reason", "encodeHexFailed"));
+        return "";
+    }
+    {
+        std::lock_guard<std::mutex> lock{keyMutex};
+        lastKey = key;
+        lastHash = std::move(hashString);
+        return lastHash;
     }
-    lastKey = key;
-    lastHash = std::string(hashString);
-    return lastHash;
 }
 
 std::string Util::getDomainNameFromUrl(const std::string& url) {
@@ -82,4 +101,4 @@ std::string Util::getDomainNameFromUrl(const std::string& url) {
 }
 
 }  // namespace acsdkAudioPlayer
-}  // namespace alexaClientSDK
\ No newline at end of file
+}  // namespace alexaClientSDK
diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/test/AudioPlayerTest.cpp b/capabilities/AudioPlayer/acsdkAudioPlayer/test/AudioPlayerTest.cpp
index 6b42bfadca..c59d5898ed 100644
--- a/capabilities/AudioPlayer/acsdkAudioPlayer/test/AudioPlayerTest.cpp
+++ b/capabilities/AudioPlayer/acsdkAudioPlayer/test/AudioPlayerTest.cpp
@@ -27,6 +27,7 @@
 #include <rapidjson/error/en.h>
 #include <rapidjson/stringbuffer.h>
 
+#include <acsdk/CryptoInterfaces/test/MockCryptoFactory.h>
 #include <AVSCommon/AVS/Attachment/AttachmentManager.h>
 #include <AVSCommon/SDKInterfaces/MockChannelVolumeInterface.h>
 #include <AVSCommon/SDKInterfaces/MockContextManager.h>
@@ -63,6 +64,7 @@ using namespace avsCommon::utils::memory;
 using namespace avsCommon::utils::metrics::test;
 using namespace captions::test;
 using namespace avsCommon::utils::mediaPlayer::test;
+using namespace cryptoInterfaces::test;
 using namespace rapidjson;
 using MediaPlayerState = avsCommon::utils::mediaPlayer::MediaPlayerState;
 
@@ -111,9 +113,6 @@ static const std::string MESSAGE_ID_TEST_3("MessageId_Test3");
 /// PlayRequestId for testing.
 static const std::string PLAY_REQUEST_ID_TEST("PlayRequestId_Test");
 
-/// CorrelationToken for testing.
-static const std::string CORRELATION_TOKEN_TEST("CorrelationToken_Test");
-
 /// Context ID for testing
 static const std::string CONTEXT_ID_TEST("ContextId_Test");
 
@@ -163,6 +162,9 @@ static const std::string IDLE_STATE{"IDLE"};
 /// The offset in milliseconds returned by the mock media player.
 static const long OFFSET_IN_MILLISECONDS_TEST{100};
 
+/// The offset in milliseconds returned by the mock media player.
+static const long OFFSET_IN_MILLISECONDS_TEST2{0};
+
 /// ExpiryTime for testing. Needs to be in ISO 8601 format.
 static const std::string EXPIRY_TEST("481516234248151623421088");
 
@@ -237,6 +239,56 @@ static std::string createEnqueuePayloadTest(long offsetInMilliseconds, const std
     return ENQUEUE_PAYLOAD_TEST;
 }
 
+static std::string createReplaceAllPayloadTest(
+    long offsetInMilliseconds,
+    const std::string& audioId = AUDIO_ITEM_ID_1) {
+    const std::string REPLACEALL_PAYLOAD_TEST =
+        "{"
+        "\"playBehavior\":\"" +
+        NAME_REPLACE_ALL +
+        "\","
+        "\"audioItem\": {"
+        "\"audioItemId\":\"" +
+        audioId +
+        "\","
+        "\"stream\": {"
+        "\"url\":\"" +
+        URL_TEST +
+        "\","
+        "\"streamFormat\":\"" +
+        FORMAT_TEST +
+        "\","
+        "\"offsetInMilliseconds\":" +
+        std::to_string(offsetInMilliseconds) +
+        ","
+        "\"expiryTime\":\"" +
+        EXPIRY_TEST +
+        "\","
+        "\"progressReport\": {"
+        "\"progressReportDelayInMilliseconds\":" +
+        std::to_string(PROGRESS_REPORT_DELAY) +
+        ","
+        "\"progressReportIntervalInMilliseconds\":" +
+        std::to_string(PROGRESS_REPORT_INTERVAL) +
+        "},"
+        "\"caption\": {"
+        "\"content\":\"" +
+        CAPTION_CONTENT_SAMPLE +
+        "\","
+        "\"type\":\"WEBVTT\""
+        "},"
+        "\"token\":\"" +
+        TOKEN_TEST +
+        "\","
+        "\"expectedPreviousToken\":\"\""
+        "}"
+        "}"
+        "}";
+    // clang-format on
+
+    return REPLACEALL_PAYLOAD_TEST;
+}
+
 // clang-format off
 static const std::string REPLACE_ALL_PAYLOAD_TEST =
 "{"
@@ -674,6 +726,9 @@ class AudioPlayerTest : public ::testing::Test {
     /// The mock @c MetricRecorderInterface
     std::shared_ptr<MockMetricRecorder> m_mockMetricRecorder;
 
+    /// The mock @c MockCryptoFactory
+    std::shared_ptr<MockCryptoFactory> m_cryptoFactory;
+
     /**
      * This is invoked in response to a @c setState call.
      *
@@ -897,6 +952,8 @@ void AudioPlayerTest::SetUp() {
     ASSERT_TRUE(m_mockMediaPlayerTrack2);
     m_mockMediaPlayerTrack3 = MockMediaPlayer::create();
     ASSERT_TRUE(m_mockMediaPlayerTrack3);
+    m_cryptoFactory = std::make_shared<MockCryptoFactory>();
+    ASSERT_TRUE(m_cryptoFactory);
     std::vector<std::shared_ptr<MediaPlayerInterface>> pool = {
         m_mockMediaPlayer, m_mockMediaPlayerTrack2, m_mockMediaPlayerTrack3};
     m_mockMediaResourceProvider = PooledMediaResourceProvider::createPooledMediaResourceProviderInterface(
@@ -911,6 +968,7 @@ void AudioPlayerTest::SetUp() {
         m_mockContextManager,
         m_mockExceptionSender,
         m_mockPlaybackRouter,
+        m_cryptoFactory,
         m_mockCaptionManager,
         m_mockMetricRecorder);
 
@@ -955,6 +1013,7 @@ void AudioPlayerTest::reSetUp(int numberOfPlayers) {
         m_mockContextManager,
         m_mockExceptionSender,
         m_mockPlaybackRouter,
+        m_cryptoFactory,
         m_mockCaptionManager,
         m_mockMetricRecorder);
 
@@ -987,8 +1046,8 @@ void AudioPlayerTest::wakeOnSendMessage() {
 }
 
 void AudioPlayerTest::sendPlayDirective(long offsetInMilliseconds, long endOffsetInMilliseconds) {
-    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(
-        NAMESPACE_AUDIO_PLAYER, NAME_PLAY, MESSAGE_ID_TEST, PLAY_REQUEST_ID_TEST, CORRELATION_TOKEN_TEST);
+    auto avsMessageHeader =
+        std::make_shared<AVSMessageHeader>(NAMESPACE_AUDIO_PLAYER, NAME_PLAY, MESSAGE_ID_TEST, PLAY_REQUEST_ID_TEST);
     std::string payload;
     if (endOffsetInMilliseconds == 0) {
         payload = createEnqueuePayloadTest(offsetInMilliseconds);
@@ -1373,6 +1432,7 @@ TEST_F(AudioPlayerTest, test_createWithNullPointers) {
         m_mockContextManager,
         m_mockExceptionSender,
         m_mockPlaybackRouter,
+        m_cryptoFactory,
         m_mockCaptionManager,
         m_mockMetricRecorder);
     EXPECT_EQ(testAudioPlayer, nullptr);
@@ -1386,6 +1446,7 @@ TEST_F(AudioPlayerTest, test_createWithNullPointers) {
         m_mockContextManager,
         m_mockExceptionSender,
         m_mockPlaybackRouter,
+        m_cryptoFactory,
         m_mockCaptionManager,
         m_mockMetricRecorder);
     EXPECT_EQ(testAudioPlayer, nullptr);
@@ -1399,6 +1460,7 @@ TEST_F(AudioPlayerTest, test_createWithNullPointers) {
         m_mockContextManager,
         m_mockExceptionSender,
         m_mockPlaybackRouter,
+        m_cryptoFactory,
         m_mockCaptionManager,
         m_mockMetricRecorder);
     EXPECT_EQ(testAudioPlayer, nullptr);
@@ -1412,6 +1474,7 @@ TEST_F(AudioPlayerTest, test_createWithNullPointers) {
         nullptr,
         m_mockExceptionSender,
         m_mockPlaybackRouter,
+        m_cryptoFactory,
         m_mockCaptionManager,
         m_mockMetricRecorder);
     EXPECT_EQ(testAudioPlayer, nullptr);
@@ -1425,6 +1488,7 @@ TEST_F(AudioPlayerTest, test_createWithNullPointers) {
         m_mockContextManager,
         nullptr,
         m_mockPlaybackRouter,
+        m_cryptoFactory,
         m_mockCaptionManager,
         m_mockMetricRecorder);
     EXPECT_EQ(testAudioPlayer, nullptr);
@@ -1438,6 +1502,7 @@ TEST_F(AudioPlayerTest, test_createWithNullPointers) {
         m_mockContextManager,
         m_mockExceptionSender,
         nullptr,
+        m_cryptoFactory,
         m_mockCaptionManager,
         m_mockMetricRecorder);
     EXPECT_EQ(testAudioPlayer, nullptr);
@@ -1603,6 +1668,47 @@ TEST_F(AudioPlayerTest, testTransitionFromPlayingToPlayingNextEnqueuedTrack) {
     ASSERT_TRUE(m_testAudioPlayerObserver->waitFor(PlayerActivity::PLAYING, MY_WAIT_TIMEOUT));
 }
 
+TEST_F(AudioPlayerTest, testTransitionDontPlayEnqueuedTrackIfOffsetDifferent) {
+    // send a play directive
+    sendPlayDirective();
+    ASSERT_TRUE(m_testAudioPlayerObserver->waitFor(PlayerActivity::PLAYING, MY_WAIT_TIMEOUT));
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(EVENT_PROCESS_DELAY));
+
+    // Verify that the media player for the enqueued track is used
+    EXPECT_CALL(*(m_mockMediaPlayer.get()), play(_)).Times(0);
+    EXPECT_CALL(*(m_mockMediaPlayerTrack2.get()), play(_)).Times(0);
+    EXPECT_CALL(*(m_mockMediaPlayerTrack3.get()), play(_)).Times(AtLeast(1));
+
+    // Enqueue next track
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(NAMESPACE_AUDIO_PLAYER, NAME_PLAY, MESSAGE_ID_TEST_2);
+    std::shared_ptr<AVSDirective> playDirective = AVSDirective::create(
+        "",
+        avsMessageHeader,
+        createEnqueuePayloadTest(OFFSET_IN_MILLISECONDS_TEST, AUDIO_ITEM_ID_2),
+        m_attachmentManager,
+        CONTEXT_ID_TEST_2);
+
+    m_audioPlayer->CapabilityAgent::preHandleDirective(playDirective, std::move(m_mockDirectiveHandlerResult));
+    m_audioPlayer->CapabilityAgent::handleDirective(MESSAGE_ID_TEST_2);
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(EVENT_PROCESS_DELAY));
+
+    // Now, send a REPLACE_ALL directive that has the same ID as the enqueued track
+    avsMessageHeader = std::make_shared<AVSMessageHeader>(NAMESPACE_AUDIO_PLAYER, NAME_PLAY, MESSAGE_ID_TEST_3);
+    playDirective = AVSDirective::create(
+        "",
+        avsMessageHeader,
+        createReplaceAllPayloadTest(OFFSET_IN_MILLISECONDS_TEST2, AUDIO_ITEM_ID_2),
+        m_attachmentManager,
+        CONTEXT_ID_TEST_3);
+    m_audioPlayer->CapabilityAgent::preHandleDirective(playDirective, std::move(m_mockDirectiveHandlerResult));
+    m_audioPlayer->CapabilityAgent::handleDirective(MESSAGE_ID_TEST_3);
+
+    ASSERT_TRUE(m_testAudioPlayerObserver->waitFor(PlayerActivity::STOPPED, MY_WAIT_TIMEOUT));
+    ASSERT_TRUE(m_testAudioPlayerObserver->waitFor(PlayerActivity::PLAYING, MY_WAIT_TIMEOUT));
+}
+
 /**
  * Test transition from Playing to Paused when focus changes to Dialog channel
  */
diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/test/CMakeLists.txt b/capabilities/AudioPlayer/acsdkAudioPlayer/test/CMakeLists.txt
index 9e8044c383..efe6bb4dc0 100644
--- a/capabilities/AudioPlayer/acsdkAudioPlayer/test/CMakeLists.txt
+++ b/capabilities/AudioPlayer/acsdkAudioPlayer/test/CMakeLists.txt
@@ -5,4 +5,4 @@ set(INCLUDE_PATH
 	"${AVSCommon_SOURCE_DIR}/Utils/test"
 	"${CaptionsTestLib_INCLUDE_DIRS}")
 
-discover_unit_tests("${INCLUDE_PATH}" "acsdkAudioPlayer;CaptionsTestLib;UtilsCommonTestLib;AVSCommon;SDKInterfacesTests")
+discover_unit_tests("${INCLUDE_PATH}" "acsdkAudioPlayer;CaptionsTestLib;UtilsCommonTestLib;AVSCommon;SDKInterfacesTests;acsdkCryptoInterfacesTestLib;acsdkCrypto")
diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/test/UtilsTest.cpp b/capabilities/AudioPlayer/acsdkAudioPlayer/test/UtilsTest.cpp
new file mode 100644
index 0000000000..83f7cac357
--- /dev/null
+++ b/capabilities/AudioPlayer/acsdkAudioPlayer/test/UtilsTest.cpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+
+#include <acsdkAudioPlayer/Util.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/Crypto/CryptoFactory.h>
+
+namespace alexaClientSDK {
+namespace acsdkAudioPlayer {
+namespace test {
+
+using namespace ::testing;
+using namespace avsCommon::utils::memory;
+using namespace cryptoInterfaces;
+
+/// @brief Test string for MD5 hashing.
+/// @private
+static std::string TEST_STR = "The quick brown fox jumps over the lazy dog";
+
+/// @brief Test string for MD5 hashing.
+/// @private
+static std::string TEST_STR_2 = "Foo";
+
+/// @brief Test string for MD5 hashing.
+/// @private
+static std::string TEST_STR_3 = "xyz";
+/// @brief Expected MD5 value of test string.
+/// @private
+static const std::string MD5_TEST_DATA_HEX{"9e107d9d372bb6826bd81d3542a419d6"};
+/// @brief Expected MD5 value of test string.
+/// @private
+static const std::string MD5_TEST_DATA_2_HEX{"1356c67d7ad1638d816bfb822dd2c25d"};
+/// @brief Expected MD5 value of test string.
+/// @private
+static const std::string MD5_TEST_DATA_3_HEX{"d16fb36f0911f878998c136191af705e"};
+
+/**
+ * A test struct to encapsulate @c input and expected @c output values.
+ *
+ * @private
+ */
+struct UtilsTestData {
+public:
+    UtilsTestData(const std::string& input, const std::string& output) : m_inputString(input), m_outputString(output) {
+    }
+
+    std::string m_inputString;
+    std::string m_outputString;
+};
+
+class UtilTestRealCryptoFactoryFixture : public testing::TestWithParam<UtilsTestData> {
+public:
+    void SetUp() override;
+
+    /// Crypto Factory
+    std::shared_ptr<CryptoFactoryInterface> m_cryptoFactory;
+};
+
+/**
+ * Test fixture to test actual crypto implemenations
+ *
+ * @private
+ */
+void UtilTestRealCryptoFactoryFixture::SetUp() {
+    m_cryptoFactory = alexaClientSDK::crypto::createCryptoFactory();
+}
+
+TEST_P(UtilTestRealCryptoFactoryFixture, test_generateMD5Hash) {
+    UtilsTestData testData = GetParam();
+    std::string output = Util::generateMD5Hash(testData.m_inputString, m_cryptoFactory);
+    ASSERT_EQ(testData.m_outputString, output);
+}
+
+INSTANTIATE_TEST_CASE_P(
+    Parameterized,
+    UtilTestRealCryptoFactoryFixture,
+    ::testing::Values(
+        UtilsTestData(TEST_STR, MD5_TEST_DATA_HEX),
+        UtilsTestData(TEST_STR_2, MD5_TEST_DATA_2_HEX),
+        UtilsTestData(TEST_STR_3, MD5_TEST_DATA_3_HEX)));
+
+}  // namespace test
+}  // namespace acsdkAudioPlayer
+}  // namespace alexaClientSDK
diff --git a/capabilities/Bluetooth/acsdkBluetooth/include/acsdkBluetooth/Bluetooth.h b/capabilities/Bluetooth/acsdkBluetooth/include/acsdkBluetooth/Bluetooth.h
index 578bc8d36a..52122ba5d3 100644
--- a/capabilities/Bluetooth/acsdkBluetooth/include/acsdkBluetooth/Bluetooth.h
+++ b/capabilities/Bluetooth/acsdkBluetooth/include/acsdkBluetooth/Bluetooth.h
@@ -266,6 +266,7 @@ class Bluetooth
     void unpair(const std::string& addr) override;
     void connect(const std::string& addr) override;
     void disconnect(const std::string& addr) override;
+    void setPairingPin(const std::string& addr, const std::string& pin) override;
     /// @}
 
     /// @name CapabilityConfigurationInterface Functions
@@ -535,6 +536,14 @@ class Bluetooth
      */
     void executeDisconnectDevices(const std::unordered_set<std::string>& uuids);
 
+    /**
+     * Sets the pairing pin for the current pairing attempt
+     *
+     * @param addr The MAC address associated with the device
+     * @param pin BT pairing pin
+     */
+    void executeSetPairingPin(const std::string& addr, const std::string& pin);
+
     /**
      * Helper function that encapsulates disconnect logic.
      *
diff --git a/capabilities/Bluetooth/acsdkBluetooth/include/acsdkBluetooth/BluetoothNotifier.h b/capabilities/Bluetooth/acsdkBluetooth/include/acsdkBluetooth/BluetoothNotifier.h
index 14fb00593c..2d725ff4de 100644
--- a/capabilities/Bluetooth/acsdkBluetooth/include/acsdkBluetooth/BluetoothNotifier.h
+++ b/capabilities/Bluetooth/acsdkBluetooth/include/acsdkBluetooth/BluetoothNotifier.h
@@ -20,7 +20,7 @@
 
 #include <acsdkBluetoothInterfaces/BluetoothDeviceObserverInterface.h>
 #include <acsdkBluetoothInterfaces/BluetoothNotifierInterface.h>
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 
 namespace alexaClientSDK {
 namespace acsdkBluetooth {
@@ -28,7 +28,7 @@ namespace acsdkBluetooth {
 /**
  * Relays notifications related to Bluetooth.
  */
-class BluetoothNotifier : public acsdkNotifier::Notifier<acsdkBluetoothInterfaces::BluetoothDeviceObserverInterface> {
+class BluetoothNotifier : public notifier::Notifier<acsdkBluetoothInterfaces::BluetoothDeviceObserverInterface> {
 public:
     /*
      * Factory method.
diff --git a/capabilities/Bluetooth/acsdkBluetooth/src/Bluetooth.cpp b/capabilities/Bluetooth/acsdkBluetooth/src/Bluetooth.cpp
index e8bcf671ff..0d921a2f1d 100644
--- a/capabilities/Bluetooth/acsdkBluetooth/src/Bluetooth.cpp
+++ b/capabilities/Bluetooth/acsdkBluetooth/src/Bluetooth.cpp
@@ -694,7 +694,7 @@ void Bluetooth::syncWithDeviceManager() {
                 break;
             case MediaStreamingState::ACTIVE:
                 m_streamingState = StreamingState::ACTIVE;
-                m_executor.submit([this] { executeAcquireFocus(__func__); });
+                m_executor.execute([this] { executeAcquireFocus(__func__); });
                 break;
         }
     }
@@ -823,7 +823,7 @@ std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> Blu
 }
 
 void Bluetooth::clearData() {
-    m_executor.submit([this] {
+    m_executor.execute([this] {
         ACSDK_DEBUG5(LX("clearData"));
 
         // Stop scanning and discoverability.
@@ -1321,7 +1321,7 @@ void Bluetooth::executeEnterNone() {
 }
 
 void Bluetooth::onFocusChanged(FocusState newFocus, MixingBehavior behavior) {
-    m_executor.submit([this, newFocus, behavior] {
+    m_executor.execute([this, newFocus, behavior] {
         if (FocusState::NONE == newFocus && FocusTransitionState::PENDING_INTERNAL == m_focusTransitionState) {
             m_focusTransitionState = FocusTransitionState::INTERNAL;
         } else if (FocusState::NONE != newFocus && FocusTransitionState::PENDING_INTERNAL != m_focusTransitionState) {
@@ -1364,7 +1364,7 @@ void Bluetooth::onFocusChanged(FocusState newFocus, MixingBehavior behavior) {
 }
 
 void Bluetooth::setDiscoverableMode(bool discoverable) {
-    m_executor.submit([this, discoverable] {
+    m_executor.execute([this, discoverable] {
         ACSDK_DEBUG5(LX(__func__).d("discoverable", discoverable));
         if (discoverable) {
             executeHandleEnterDiscoverableMode();
@@ -1375,7 +1375,7 @@ void Bluetooth::setDiscoverableMode(bool discoverable) {
 }
 
 void Bluetooth::setScanMode(bool scanning) {
-    m_executor.submit([this, scanning] {
+    m_executor.execute([this, scanning] {
         ACSDK_DEBUG5(LX(__func__).d("scanning", scanning));
         if (scanning) {
             executeHandleScanDevices();
@@ -1386,7 +1386,7 @@ void Bluetooth::setScanMode(bool scanning) {
 }
 
 void Bluetooth::pair(const std::string& addr) {
-    m_executor.submit([this, addr] {
+    m_executor.execute([this, addr] {
         ACSDK_DEBUG5(LX(__func__));
         std::string uuid;
         retrieveUuid(addr, &uuid);
@@ -1397,7 +1397,7 @@ void Bluetooth::pair(const std::string& addr) {
 }
 
 void Bluetooth::unpair(const std::string& addr) {
-    m_executor.submit([this, addr] {
+    m_executor.execute([this, addr] {
         ACSDK_DEBUG5(LX(__func__));
         std::string uuid;
         retrieveUuid(addr, &uuid);
@@ -1408,7 +1408,7 @@ void Bluetooth::unpair(const std::string& addr) {
 }
 
 void Bluetooth::connect(const std::string& addr) {
-    m_executor.submit([this, addr] {
+    m_executor.execute([this, addr] {
         ACSDK_DEBUG5(LX(__func__));
         std::string uuid;
         retrieveUuid(addr, &uuid);
@@ -1419,7 +1419,7 @@ void Bluetooth::connect(const std::string& addr) {
 }
 
 void Bluetooth::disconnect(const std::string& addr) {
-    m_executor.submit([this, addr] {
+    m_executor.execute([this, addr] {
         ACSDK_DEBUG5(LX(__func__));
         std::string uuid;
         retrieveUuid(addr, &uuid);
@@ -1429,8 +1429,15 @@ void Bluetooth::disconnect(const std::string& addr) {
     });
 }
 
+void Bluetooth::setPairingPin(const std::string& addr, const std::string& pin) {
+    m_executor.execute([this, addr, pin] {
+        ACSDK_DEBUG5(LX(__func__));
+        executeSetPairingPin(addr, pin);
+    });
+}
+
 void Bluetooth::onContextAvailable(const std::string& jsonContext) {
-    m_executor.submit([this, jsonContext] {
+    m_executor.execute([this, jsonContext] {
         ACSDK_DEBUG9(LX("onContextAvailableLambda"));
 
         if (m_eventQueue.empty()) {
@@ -1512,7 +1519,7 @@ void Bluetooth::handleDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo>
         return;
     }
 
-    m_executor.submit([this, info] {
+    m_executor.execute([this, info] {
         const std::string directiveName = info->directive->getName();
 
         Document payload(kObjectType);
@@ -2148,6 +2155,18 @@ void Bluetooth::executeDisconnectDevices(const std::unordered_set<std::string>&
     }
 }
 
+void Bluetooth::executeSetPairingPin(const std::string& addr, const std::string& pin) {
+    std::string truncatedMac = truncateWithDefault(addr);
+    ACSDK_DEBUG5(LX(__func__).d("mac", truncatedMac));
+
+    auto device = retrieveDeviceByMac(addr);
+    if (!device) {
+        ACSDK_ERROR(LX(__func__).d("reason", "deviceNotFound").d("mac", truncatedMac));
+        return;
+    }
+    device->setPairingPin(pin);
+}
+
 void Bluetooth::cancelDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
     removeDirective(info);
 }
@@ -2334,7 +2353,7 @@ void Bluetooth::onFirstByteRead(MediaPlayerObserverInterface::SourceId id, const
 
 void Bluetooth::onPlaybackStarted(MediaPlayerObserverInterface::SourceId id, const MediaPlayerState&) {
     ACSDK_DEBUG5(LX(__func__).d("sourceId", id));
-    m_executor.submit([this] {
+    m_executor.execute([this] {
         // It means we were pending a pause before the onPlaybackStarted was received.
         if (m_streamingState == StreamingState::PENDING_PAUSED) {
             executeSendStreamingStarted(m_activeA2DPDevice);
@@ -2355,7 +2374,7 @@ void Bluetooth::onPlaybackStarted(MediaPlayerObserverInterface::SourceId id, con
 
 void Bluetooth::onPlaybackStopped(MediaPlayerObserverInterface::SourceId id, const MediaPlayerState&) {
     ACSDK_DEBUG5(LX(__func__).d("sourceId", id));
-    m_executor.submit([this] {
+    m_executor.execute([this] {
         // Playback has been stopped, cleanup the source.
         cleanupMediaSource();
         if (m_activeA2DPDevice) {
@@ -2369,7 +2388,7 @@ void Bluetooth::onPlaybackStopped(MediaPlayerObserverInterface::SourceId id, con
 
 void Bluetooth::onPlaybackFinished(MediaPlayerObserverInterface::SourceId id, const MediaPlayerState&) {
     ACSDK_DEBUG5(LX(__func__).d("sourceId", id));
-    m_executor.submit([this] {
+    m_executor.execute([this] {
         m_streamingState = StreamingState::INACTIVE;
 
         cleanupMediaSource();
@@ -2386,7 +2405,7 @@ void Bluetooth::onPlaybackError(
     const MediaPlayerState&) {
     ACSDK_DEBUG5(LX(__func__).d("id", id).d("type", type).d("error", error));
 
-    m_executor.submit([this, id] {
+    m_executor.execute([this, id] {
         // Do not attempt to stop the media player here. This could result in a infinite loop if the stop fails.
         if (id == m_sourceId) {
             cleanupMediaSource();
@@ -3191,7 +3210,7 @@ void Bluetooth::onEventFired(const avsCommon::utils::bluetooth::BluetoothEvent&
 
             ACSDK_INFO(LX(__func__).d("reason", "DEVICE_DISCOVERED").d("mac", truncateWithDefault(device->getMac())));
             ACSDK_DEBUG5(LX(__func__).d("friendlyName", device->getFriendlyName()));
-            m_executor.submit([this] {
+            m_executor.execute([this] {
                 if (ScanningTransitionState::ACTIVE == m_scanningTransitionState) {
                     executeSendScanDevicesReport(m_deviceManager->getDiscoveredDevices(), true);
                 }
@@ -3200,7 +3219,7 @@ void Bluetooth::onEventFired(const avsCommon::utils::bluetooth::BluetoothEvent&
         }
         case avsCommon::utils::bluetooth::BluetoothEventType::SCANNING_STATE_CHANGED: {
             ACSDK_INFO(LX(__func__).d("reason", "SCANNING_STATE_CHANGED").d("isScanning", event.isScanning()));
-            m_executor.submit([this, event] {
+            m_executor.execute([this, event] {
                 bool isScanning = event.isScanning();
                 if (!isScanning) {
                     if (ScanningTransitionState::PENDING_INACTIVE == m_scanningTransitionState) {
@@ -3235,7 +3254,7 @@ void Bluetooth::onEventFired(const avsCommon::utils::bluetooth::BluetoothEvent&
                 case avsCommon::sdkInterfaces::bluetooth::DeviceState::IDLE:
                     break;
                 case avsCommon::sdkInterfaces::bluetooth::DeviceState::PAIRED: {
-                    m_executor.submit([this, device] {
+                    m_executor.execute([this, device] {
                         /*
                          * Send one of these so we remove the freshly paired device
                          * from the "Available Devices" page.
@@ -3250,7 +3269,7 @@ void Bluetooth::onEventFired(const avsCommon::utils::bluetooth::BluetoothEvent&
                     break;
                 }
                 case avsCommon::sdkInterfaces::bluetooth::DeviceState::DISCONNECTED: {
-                    m_executor.submit([this, device] {
+                    m_executor.execute([this, device] {
                         std::shared_ptr<BluetoothEventState> disconnectEvent =
                             executeRemoveBluetoothEventState(device, DeviceState::DISCONNECTED);
                         if (disconnectEvent) {
@@ -3309,7 +3328,7 @@ void Bluetooth::onEventFired(const avsCommon::utils::bluetooth::BluetoothEvent&
                     break;
                 }
                 case avsCommon::sdkInterfaces::bluetooth::DeviceState::UNPAIRED: {
-                    m_executor.submit([this, device] {
+                    m_executor.execute([this, device] {
                         executeRemoveBluetoothEventState(device, DeviceState::UNPAIRED);
 
                         std::unordered_set<
@@ -3320,7 +3339,7 @@ void Bluetooth::onEventFired(const avsCommon::utils::bluetooth::BluetoothEvent&
                     break;
                 }
                 case avsCommon::sdkInterfaces::bluetooth::DeviceState::CONNECTED: {
-                    m_executor.submit([this, device] {
+                    m_executor.execute([this, device] {
                         std::shared_ptr<BluetoothEventState> connectEvent =
                             executeRemoveBluetoothEventState(device, DeviceState::CONNECTED);
                         if (connectEvent) {
@@ -3407,7 +3426,7 @@ void Bluetooth::onEventFired(const avsCommon::utils::bluetooth::BluetoothEvent&
                 if (MediaStreamingState::ACTIVE == event.getMediaStreamingState()) {
                     ACSDK_DEBUG5(LX(__func__).m("Streaming is active"));
 
-                    m_executor.submit([this] {
+                    m_executor.execute([this] {
                         if (m_streamingState == StreamingState::INACTIVE ||
                             m_streamingState == StreamingState::PAUSED ||
                             m_streamingState == StreamingState::PENDING_PAUSED) {
@@ -3420,7 +3439,7 @@ void Bluetooth::onEventFired(const avsCommon::utils::bluetooth::BluetoothEvent&
                      * We should be observing a separate playback based signal instead for these decisions.
                      */
                 } else if (MediaStreamingState::IDLE == event.getMediaStreamingState()) {
-                    m_executor.submit([this] {
+                    m_executor.execute([this] {
                         if (StreamingState::ACTIVE == m_streamingState) {
                             if (FocusState::FOREGROUND == m_focusState || FocusState::BACKGROUND == m_focusState) {
                                 executeReleaseFocus(__func__);
@@ -3431,14 +3450,14 @@ void Bluetooth::onEventFired(const avsCommon::utils::bluetooth::BluetoothEvent&
             } else if (A2DPRole::SOURCE == *event.getA2DPRole()) {
                 // Ignore the PENDING state and only act on ACTIVE.
                 if (MediaStreamingState::ACTIVE == event.getMediaStreamingState()) {
-                    m_executor.submit([this] {
+                    m_executor.execute([this] {
                         if (StreamingState::ACTIVE != m_streamingState) {
                             m_streamingState = StreamingState::ACTIVE;
                             executeSendStreamingStarted(m_activeA2DPDevice);
                         }
                     });
                 } else if (MediaStreamingState::IDLE == event.getMediaStreamingState()) {
-                    m_executor.submit([this] {
+                    m_executor.execute([this] {
                         if (StreamingState::ACTIVE == m_streamingState) {
                             m_streamingState = StreamingState::PAUSED;
                             executeSendStreamingEnded(m_activeA2DPDevice);
@@ -3452,9 +3471,9 @@ void Bluetooth::onEventFired(const avsCommon::utils::bluetooth::BluetoothEvent&
             ACSDK_DEBUG5(
                 LX(__func__).d("event", "TOGGLE_A2DP_PROFILE_STATE_CHANGED").d("a2dpEnable", event.isA2DPEnabled()));
             if (event.isA2DPEnabled()) {
-                m_executor.submit([this] { executeUnrestrictA2DPDevices(); });
+                m_executor.execute([this] { executeUnrestrictA2DPDevices(); });
             } else {
-                m_executor.submit([this] { executeRestrictA2DPDevices(); });
+                m_executor.execute([this] { executeRestrictA2DPDevices(); });
             }
             break;
         }
diff --git a/capabilities/Bluetooth/acsdkBluetoothInterfaces/include/acsdkBluetoothInterfaces/BluetoothLocalInterface.h b/capabilities/Bluetooth/acsdkBluetoothInterfaces/include/acsdkBluetoothInterfaces/BluetoothLocalInterface.h
index 3fb86ea85f..cdb21b62be 100644
--- a/capabilities/Bluetooth/acsdkBluetoothInterfaces/include/acsdkBluetoothInterfaces/BluetoothLocalInterface.h
+++ b/capabilities/Bluetooth/acsdkBluetoothInterfaces/include/acsdkBluetoothInterfaces/BluetoothLocalInterface.h
@@ -20,7 +20,17 @@ namespace alexaClientSDK {
 namespace acsdkBluetoothInterfaces {
 
 /**
- * Interface to be implemented by class containing business logic for Bluetooth operations.
+ * Contains functions corresponding to high-level Bluetooth operations on a device.
+ * Relative to their connectivity-level counterparts the functions defined by this interface
+ * abstract out various details, instead defaulting to certain values (determined by business logic)
+ * or providing these values through internal states maintained by the implementing class.
+ * Services invoking Bluetooth functionality through this interface should expect relevant
+ * business logic (e.g. connection rules) around the call to be applied.
+ *
+ * For all API calls, the resulting BT state should be received directly from BT connectivity.
+ *
+ * Clients that wish to deviate from the "norm" for a device or expect singular changes in BT state
+ * (e.g. connecting to a device without connection rules) should call BT connectivity APIs directly.
  */
 class BluetoothLocalInterface {
 public:
@@ -46,6 +56,10 @@ class BluetoothLocalInterface {
     /**
      * Pair with the device matching the given MAC address.
      *
+     * Default behavior will remove the device from discoverable and scanning modes on a successful
+     * pairing attempt.  Refer to an endpoint's corresponding connection rule to determine if an
+     * explicit connection attempt should be made afterwards.
+     *
      * @param mac The MAC address associated with the device.
      */
     virtual void pair(const std::string& addr) = 0;
@@ -53,6 +67,9 @@ class BluetoothLocalInterface {
     /**
      * Unpair with the device matching the given MAC address.
      *
+     * Refer to an endpoint's corresponding connection rule to determine if an explicit disconnect
+     * should be made prior.
+     *
      * @param mac The MAC address associated with the device.
      */
     virtual void unpair(const std::string& addr) = 0;
@@ -60,6 +77,9 @@ class BluetoothLocalInterface {
     /**
      * Connect with the device matching the given MAC address.
      *
+     * Refer to an endpoint's corresponding connection rule to determine which device(s) to
+     * disconnect.
+     *
      * @param mac The MAC address associated with the device.
      */
     virtual void connect(const std::string& addr) = 0;
@@ -70,6 +90,17 @@ class BluetoothLocalInterface {
      * @param mac The MAC address associated with the device.
      */
     virtual void disconnect(const std::string& addr) = 0;
+
+    /**
+     * Sets the pairing pin for the current pairing attempt.  PIN length can range from 4 to 16
+     * alphanumeric characters, though most devices will only accept numeric characters in the PIN.
+     * Expected call flow is:
+     * pair() -> PIN request callback -> setPairingPin()
+     *
+     * @param addr The MAC address associated with the device
+     * @param pin BT pairing pin
+     */
+    virtual void setPairingPin(const std::string& addr, const std::string& pin) = 0;
 };
 
 }  // namespace acsdkBluetoothInterfaces
diff --git a/capabilities/Bluetooth/acsdkBluetoothInterfaces/include/acsdkBluetoothInterfaces/BluetoothNotifierInterface.h b/capabilities/Bluetooth/acsdkBluetoothInterfaces/include/acsdkBluetoothInterfaces/BluetoothNotifierInterface.h
index b5bbf87c51..296ca6a4a1 100644
--- a/capabilities/Bluetooth/acsdkBluetoothInterfaces/include/acsdkBluetoothInterfaces/BluetoothNotifierInterface.h
+++ b/capabilities/Bluetooth/acsdkBluetoothInterfaces/include/acsdkBluetoothInterfaces/BluetoothNotifierInterface.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
 
 #include "acsdkBluetoothInterfaces/BluetoothDeviceObserverInterface.h"
 
@@ -28,7 +28,7 @@ namespace acsdkBluetoothInterfaces {
 /**
  * Interface for registering to observe Bluetooth notifications.
  */
-using BluetoothNotifierInterface = acsdkNotifierInterfaces::NotifierInterface<BluetoothDeviceObserverInterface>;
+using BluetoothNotifierInterface = notifierInterfaces::NotifierInterface<BluetoothDeviceObserverInterface>;
 
 }  // namespace acsdkBluetoothInterfaces
 }  // namespace alexaClientSDK
diff --git a/capabilities/DavsClient/acsdkAssetsCommon/src/CurlWrapper.cpp b/capabilities/DavsClient/acsdkAssetsCommon/src/CurlWrapper.cpp
index d21de0e77a..8d50c9fcf5 100644
--- a/capabilities/DavsClient/acsdkAssetsCommon/src/CurlWrapper.cpp
+++ b/capabilities/DavsClient/acsdkAssetsCommon/src/CurlWrapper.cpp
@@ -639,7 +639,7 @@ ResultCode CurlWrapper::download(
     if (CurlWrapper::unpack(downloadChunkQueue, path)) {
         resultCode = ResultCode::SUCCESS;
     } else {
-        resultCode = ResultCode::CATASTROPHIC_FAILURE;
+        resultCode = ResultCode::UNPACK_FAILURE;
     }
 
     downloadThread.join();
diff --git a/capabilities/DavsClient/acsdkAssetsInterfaces/include/acsdkAssetsInterfaces/ResultCode.h b/capabilities/DavsClient/acsdkAssetsInterfaces/include/acsdkAssetsInterfaces/ResultCode.h
index a1fc2501c9..a048860e44 100644
--- a/capabilities/DavsClient/acsdkAssetsInterfaces/include/acsdkAssetsInterfaces/ResultCode.h
+++ b/capabilities/DavsClient/acsdkAssetsInterfaces/include/acsdkAssetsInterfaces/ResultCode.h
@@ -32,6 +32,7 @@ enum class ResultCode {
     UNAUTHORIZED = 401,
     FORBIDDEN = 403,
     NO_ARTIFACT_FOUND = 404,
+    UNPACK_FAILURE = -997,
     UNHANDLED_MIME_TYPE = -998,
     CATASTROPHIC_FAILURE = -999
 };
@@ -62,6 +63,8 @@ inline std::ostream& operator<<(std::ostream& os, ResultCode result) {
             return os << "UNHANDLED_MIME_TYPE";
         case ResultCode::CATASTROPHIC_FAILURE:
             return os << "CATASTROPHIC_FAILURE";
+        case ResultCode::UNPACK_FAILURE:
+            return os << "UNPACK_FAILURE";
     }
     return os;
 }
diff --git a/capabilities/DeviceSetup/acsdkDeviceSetup/include/acsdkDeviceSetup/DeviceSetupFactory.h b/capabilities/DeviceSetup/acsdkDeviceSetup/include/acsdkDeviceSetup/DeviceSetupFactory.h
new file mode 100644
index 0000000000..afe38dbcef
--- /dev/null
+++ b/capabilities/DeviceSetup/acsdkDeviceSetup/include/acsdkDeviceSetup/DeviceSetupFactory.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_ACSDKDEVICESETUP_INCLUDE_ACSDKDEVICESETUP_DEVICESETUPFACTORY_H_
+#define ALEXA_CLIENT_SDK_ACSDKDEVICESETUP_INCLUDE_ACSDKDEVICESETUP_DEVICESETUPFACTORY_H_
+
+#include <memory>
+
+#include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
+#include <acsdkDeviceSetupInterfaces/DeviceSetupInterface.h>
+
+namespace alexaClientSDK {
+namespace acsdkDeviceSetup {
+
+/**
+ * Creates a new DeviceSetup instance.
+ *
+ * @param messageSender Used for sending events.
+ * @return A new @c DeviceSetup instance.
+ */
+std::shared_ptr<acsdkDeviceSetupInterfaces::DeviceSetupInterface> createDeviceSetup(
+    const std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface>& messageSender);
+
+}  // namespace acsdkDeviceSetup
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_ACSDKDEVICESETUP_INCLUDE_ACSDKDEVICESETUP_DEVICESETUPFACTORY_H_
diff --git a/capabilities/DeviceSetup/acsdkDeviceSetup/src/CMakeLists.txt b/capabilities/DeviceSetup/acsdkDeviceSetup/src/CMakeLists.txt
index 5039ccce26..28e475cecd 100644
--- a/capabilities/DeviceSetup/acsdkDeviceSetup/src/CMakeLists.txt
+++ b/capabilities/DeviceSetup/acsdkDeviceSetup/src/CMakeLists.txt
@@ -3,6 +3,7 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkDeviceSetup")
 add_library(
     acsdkDeviceSetup
     DeviceSetup.cpp
+    DeviceSetupFactory.cpp
     DeviceSetupMessageRequest.cpp
     DeviceSetupComponent.cpp
 )
diff --git a/capabilities/DeviceSetup/acsdkDeviceSetup/src/DeviceSetupFactory.cpp b/capabilities/DeviceSetup/acsdkDeviceSetup/src/DeviceSetupFactory.cpp
new file mode 100644
index 0000000000..d96dd7a28d
--- /dev/null
+++ b/capabilities/DeviceSetup/acsdkDeviceSetup/src/DeviceSetupFactory.cpp
@@ -0,0 +1,28 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdkDeviceSetup/DeviceSetupFactory.h"
+#include "acsdkDeviceSetup/DeviceSetup.h"
+
+namespace alexaClientSDK {
+namespace acsdkDeviceSetup {
+
+std::shared_ptr<acsdkDeviceSetupInterfaces::DeviceSetupInterface> createDeviceSetup(
+    const std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface>& messageSender) {
+    return DeviceSetup::createDeviceSetupInterface(messageSender);
+}
+
+}  // namespace acsdkDeviceSetup
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/capabilities/ExternalMediaPlayer/CMakeLists.txt b/capabilities/ExternalMediaPlayer/CMakeLists.txt
index 41f2bf1ba7..0f15d5823c 100644
--- a/capabilities/ExternalMediaPlayer/CMakeLists.txt
+++ b/capabilities/ExternalMediaPlayer/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
+project(ExternalMediaPlayer LANGUAGES CXX)
 
 add_subdirectory("acsdkExternalMediaPlayer")
 add_subdirectory("acsdkExternalMediaPlayerInterfaces")
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/include/acsdkExternalMediaPlayer/ExternalMediaAdapterHandler.h b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/include/acsdkExternalMediaPlayer/ExternalMediaAdapterHandler.h
index e0ea0bfcfd..47acbfd45a 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/include/acsdkExternalMediaPlayer/ExternalMediaAdapterHandler.h
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/include/acsdkExternalMediaPlayer/ExternalMediaAdapterHandler.h
@@ -163,12 +163,6 @@ class ExternalMediaAdapterHandler
     virtual bool handlePlayControl(
         const std::string& localPlayerId,
         acsdkExternalMediaPlayerInterfaces::RequestType requestType,
-#ifdef MEDIA_PORTABILITY_ENABLED
-        /// @param mediaSessionId The optional @c mediaSessionId used to track media playback
-        /// @param correlationToken The optional @c correlationToken used to opaquely plumb routing info
-        const std::string& mediaSessionId,
-        const std::string& correlationToken,
-#endif
         const std::string& playbackTarget) = 0;
 
     /**
@@ -241,12 +235,6 @@ class ExternalMediaAdapterHandler
     bool playControl(
         const std::string& localPlayerId,
         acsdkExternalMediaPlayerInterfaces::RequestType requestType,
-#ifdef MEDIA_PORTABILITY_ENABLED
-        /// @param mediaSessionId The optional @c mediaSessionId used to track media playback
-        /// @param correlationToken The optional @c correlationToken used to opaquely plumb routing info
-        const std::string& mediaSessionId,
-        const std::string& correlationToken,
-#endif
         const std::string& playbackTarget) override;
     bool seek(const std::string& localPlayerId, std::chrono::milliseconds offset) override;
     bool adjustSeek(const std::string& localPlayerId, std::chrono::milliseconds deltaOffset) override;
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/include/acsdkExternalMediaPlayer/StaticExternalMediaPlayerAdapterHandler.h b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/include/acsdkExternalMediaPlayer/StaticExternalMediaPlayerAdapterHandler.h
index 37c15ea207..7280f0aa7c 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/include/acsdkExternalMediaPlayer/StaticExternalMediaPlayerAdapterHandler.h
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/include/acsdkExternalMediaPlayer/StaticExternalMediaPlayerAdapterHandler.h
@@ -60,10 +60,6 @@ class StaticExternalMediaPlayerAdapterHandler
     bool playControl(
         const std::string& localPlayerId,
         acsdkExternalMediaPlayerInterfaces::RequestType requestType,
-#ifdef MEDIA_PORTABILITY_ENABLED
-        const std::string& mediaSessionId,
-        const std::string& correlationToken,
-#endif
         const std::string& playbackTarget) override;
     bool seek(const std::string& localPlayerId, std::chrono::milliseconds offset) override;
     bool adjustSeek(const std::string& localPlayerId, std::chrono::milliseconds deltaOffset) override;
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/ExternalMediaAdapterHandler.cpp b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/ExternalMediaAdapterHandler.cpp
index b0ad119641..5a72478d49 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/ExternalMediaAdapterHandler.cpp
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/ExternalMediaAdapterHandler.cpp
@@ -118,10 +118,6 @@ bool ExternalMediaAdapterHandler::play(const PlayParams& params) {
 bool ExternalMediaAdapterHandler::playControl(
     const std::string& localPlayerId,
     acsdkExternalMediaPlayerInterfaces::RequestType requestType,
-#ifdef MEDIA_PORTABILITY_ENABLED
-    const std::string& mediaSessionId,
-    const std::string& correlationToken,
-#endif
     const std::string& playbackTarget) {
     if (!validatePlayer(localPlayerId)) {
         ACSDK_WARN(LX("playControlFailed")
@@ -130,11 +126,7 @@ bool ExternalMediaAdapterHandler::playControl(
         return false;
     }
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    return handlePlayControl(localPlayerId, requestType, mediaSessionId, correlationToken, playbackTarget);
-#else
     return handlePlayControl(localPlayerId, requestType, playbackTarget);
-#endif
 }
 
 bool ExternalMediaAdapterHandler::seek(const std::string& localPlayerId, std::chrono::milliseconds offset) {
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/ExternalMediaPlayer.cpp b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/ExternalMediaPlayer.cpp
index dc7680c573..b1c6313ac1 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/ExternalMediaPlayer.cpp
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/ExternalMediaPlayer.cpp
@@ -85,11 +85,6 @@ static const std::string EXTERNALMEDIAPLAYER_CAPABILITY_INTERFACE_TYPE = ALEXA_I
 /// ExternalMediaPlayer interface name
 static const std::string EXTERNALMEDIAPLAYER_CAPABILITY_INTERFACE_NAME = "ExternalMediaPlayer";
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-/// ExternalMediaPlayer interface version for media portability
-static const std::string EXTERNALMEDIAPLAYER_CAPABILITY_INTERFACE_VERSION_FOR_MEDIA_PORTABILITY = "1.5";
-#endif
-
 /// ExternalMediaPlayer interface version
 static const std::string EXTERNALMEDIAPLAYER_CAPABILITY_INTERFACE_VERSION = "1.2";
 
@@ -101,11 +96,6 @@ static const std::string PLAYBACKSTATEREPORTER_CAPABILITY_INTERFACE_VERSION = "1
 /// Alexa.PlaybackController name.
 static const std::string PLAYBACKCONTROLLER_CAPABILITY_INTERFACE_NAME = PLAYBACKCONTROLLER_NAMESPACE;
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-/// Alexa.PlaybackController version for media portability
-static const std::string PLAYBACKCONTROLLER_CAPABILITY_INTERFACE_VERSION_FOR_MEDIA_PORTABILITY = "1.1";
-#endif
-
 /// Alexa.PlaybackController version.
 static const std::string PLAYBACKCONTROLLER_CAPABILITY_INTERFACE_VERSION = "1.0";
 
@@ -510,18 +500,10 @@ ExternalMediaPlayer::ExternalMediaPlayer(
         PLAYBACKSTATEREPORTER_CAPABILITY_INTERFACE_NAME,
         PLAYBACKSTATEREPORTER_CAPABILITY_INTERFACE_VERSION));
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    m_capabilityConfigurations.insert(generateCapabilityConfiguration(
-        ALEXA_INTERFACE_TYPE,
-        PLAYBACKCONTROLLER_CAPABILITY_INTERFACE_NAME,
-        mediaPortabilityEnabled() ? PLAYBACKCONTROLLER_CAPABILITY_INTERFACE_VERSION_FOR_MEDIA_PORTABILITY
-                                  : PLAYBACKCONTROLLER_CAPABILITY_INTERFACE_VERSION));
-#else
     m_capabilityConfigurations.insert(generateCapabilityConfiguration(
         ALEXA_INTERFACE_TYPE,
         PLAYBACKCONTROLLER_CAPABILITY_INTERFACE_NAME,
         PLAYBACKCONTROLLER_CAPABILITY_INTERFACE_VERSION));
-#endif
 
     m_capabilityConfigurations.insert(generateCapabilityConfiguration(
         ALEXA_INTERFACE_TYPE,
@@ -621,7 +603,7 @@ void ExternalMediaPlayer::createAdapters(
     }
 
     if (hasAddedAdapters) {
-        m_executor.submit([this, handler, discoveredPlayers]() {
+        m_executor.execute([this, handler, discoveredPlayers]() {
             m_adapterHandlers.insert(handler);
             updateDiscoveredPlayers(discoveredPlayers, {});
         });
@@ -631,23 +613,15 @@ void ExternalMediaPlayer::createAdapters(
 }
 
 std::shared_ptr<CapabilityConfiguration> getExternalMediaPlayerCapabilityConfiguration() {
-#ifdef MEDIA_PORTABILITY_ENABLED
-    return generateCapabilityConfiguration(
-        EXTERNALMEDIAPLAYER_CAPABILITY_INTERFACE_TYPE,
-        EXTERNALMEDIAPLAYER_CAPABILITY_INTERFACE_NAME,
-        mediaPortabilityEnabled() ? EXTERNALMEDIAPLAYER_CAPABILITY_INTERFACE_VERSION_FOR_MEDIA_PORTABILITY
-                                  : EXTERNALMEDIAPLAYER_CAPABILITY_INTERFACE_VERSION);
-#else
     return generateCapabilityConfiguration(
         EXTERNALMEDIAPLAYER_CAPABILITY_INTERFACE_TYPE,
         EXTERNALMEDIAPLAYER_CAPABILITY_INTERFACE_NAME,
         EXTERNALMEDIAPLAYER_CAPABILITY_INTERFACE_VERSION);
-#endif
 }
 
 void ExternalMediaPlayer::onContextAvailable(const std::string& jsonContext) {
     // Do not block the ContextManager thread.
-    m_executor.submit([this, jsonContext] {
+    m_executor.execute([this, jsonContext] {
         ACSDK_DEBUG5(LX("onContextAvailableLambda"));
 
         while (!m_eventQueue.empty()) {
@@ -674,7 +648,7 @@ void ExternalMediaPlayer::onContextFailure(const avsCommon::sdkInterfaces::Conte
 void ExternalMediaPlayer::provideState(
     const avsCommon::avs::NamespaceAndName& stateProviderName,
     unsigned int stateRequestToken) {
-    m_executor.submit([this, stateProviderName, stateRequestToken] {
+    m_executor.execute([this, stateProviderName, stateRequestToken] {
         executeProvideState(stateProviderName, true, stateRequestToken);
     });
 }
@@ -851,7 +825,7 @@ void ExternalMediaPlayer::handleAuthorizeDiscoveredPlayers(std::shared_ptr<Direc
         }
     }
 
-    m_executor.submit([this, info, playerInfoList, parseAllSucceeded]() {
+    m_executor.execute([this, info, playerInfoList, parseAllSucceeded]() {
         // A map of playerId to skillToken
         std::unordered_map<std::string, std::string> authorizedForJson;
         // The new map of m_authorizedAdapters.
@@ -997,7 +971,7 @@ void ExternalMediaPlayer::handleLogin(std::shared_ptr<DirectiveInfo> info, Reque
         return;
     }
 
-    m_executor.submit([this, info, playerId, accessToken, userName, refreshInterval, forceLogin]() {
+    m_executor.execute([this, info, playerId, accessToken, userName, refreshInterval, forceLogin]() {
         auto maybeHandler = getHandlerFromPlayerId(playerId);
         if (maybeHandler.hasValue()) {
             auto handler = maybeHandler.value();
@@ -1025,7 +999,7 @@ void ExternalMediaPlayer::handleLogout(std::shared_ptr<DirectiveInfo> info, Requ
         return;
     }
 
-    m_executor.submit([this, info, playerId]() {
+    m_executor.execute([this, info, playerId]() {
         auto maybeHandler = getHandlerFromPlayerId(playerId);
         if (maybeHandler.hasValue()) {
             auto handler = maybeHandler.value();
@@ -1122,37 +1096,21 @@ void ExternalMediaPlayer::handlePlay(std::shared_ptr<DirectiveInfo> info, Reques
         ACSDK_INFO(LX("handleDirective").m("No playback target"));
     }
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    std::string mediaSessionId;
-    std::string correlationToken;
-    if (mediaPortabilityEnabled()) {
-        if (!jsonUtils::retrieveValue(payload, "mediaSessionId", &mediaSessionId)) {
-            ACSDK_ERROR(LX("handleDirective").m("NoMediaSessionId"));
-        }
-
-        correlationToken = info->directive->getCorrelationToken();
-    }
-#endif
-
     auto messageId = info->directive->getMessageId();
 
-    m_executor.submit([this,
-                       info,
-                       playerId,
-                       playbackContextToken,
-                       index,
-                       offset,
-                       skillToken,
-                       playbackSessionId,
-                       navigation,
-                       preload,
-                       playRequestor,
-                       messageId,
-#ifdef MEDIA_PORTABILITY_ENABLED
-                       mediaSessionId,
-                       correlationToken,
-#endif
-                       alias]() {
+    m_executor.execute([this,
+                        info,
+                        playerId,
+                        playbackContextToken,
+                        index,
+                        offset,
+                        skillToken,
+                        playbackSessionId,
+                        navigation,
+                        preload,
+                        playRequestor,
+                        messageId,
+                        alias]() {
         auto maybeHandler = getHandlerFromPlayerId(playerId);
         if (maybeHandler.hasValue()) {
             auto handler = maybeHandler.value();
@@ -1166,10 +1124,6 @@ void ExternalMediaPlayer::handlePlay(std::shared_ptr<DirectiveInfo> info, Reques
                 navigation,
                 preload,
                 playRequestor,
-#ifdef MEDIA_PORTABILITY_ENABLED
-                mediaSessionId,
-                correlationToken,
-#endif
                 alias);
 
             if (handler.adapterHandler->play(params)) {
@@ -1210,7 +1164,7 @@ void ExternalMediaPlayer::handleSeek(std::shared_ptr<DirectiveInfo> info, Reques
         return;
     }
 
-    m_executor.submit([this, info, playerId, position]() {
+    m_executor.execute([this, info, playerId, position]() {
         auto maybeHandler = getHandlerFromPlayerId(playerId);
         if (maybeHandler.hasValue()) {
             auto handler = maybeHandler.value();
@@ -1252,7 +1206,7 @@ void ExternalMediaPlayer::handleAdjustSeek(std::shared_ptr<DirectiveInfo> info,
         return;
     }
 
-    m_executor.submit([this, info, playerId, deltaPosition]() {
+    m_executor.execute([this, info, playerId, deltaPosition]() {
         auto maybeHandler = getHandlerFromPlayerId(playerId);
         if (maybeHandler.hasValue()) {
             auto handler = maybeHandler.value();
@@ -1290,35 +1244,12 @@ void ExternalMediaPlayer::handlePlayControl(std::shared_ptr<DirectiveInfo> info,
         // fall through, alias name is not required
     }
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    std::string mediaSessionId;
-    std::string correlationToken;
-    if (mediaPortabilityEnabled()) {
-        if (requestTypeIncludesMediaSessionId(request)) {
-            if (!jsonUtils::retrieveValue(payload, "mediaSessionId", &mediaSessionId)) {
-                ACSDK_ERROR(LX("handleDirective").m("NoMediaSessionId"));
-            }
-        }
-
-        if (request == RequestType::RESUME) {
-            correlationToken = info->directive->getCorrelationToken();
-        }
-    }
-
-    m_executor.submit([this, info, playerId, request, playbackSessionId, alias, mediaSessionId, correlationToken]() {
-#else
-    m_executor.submit([this, info, playerId, request, playbackSessionId, alias]() {
-#endif
+    m_executor.execute([this, info, playerId, request, playbackSessionId, alias]() {
         std::string playbackSessId = playbackSessionId;
         auto maybeHandler = getHandlerFromPlayerId(playerId);
         if (maybeHandler.hasValue()) {
             auto handler = maybeHandler.value();
-#ifdef MEDIA_PORTABILITY_ENABLED
-            if (handler.adapterHandler->playControl(
-                    handler.localPlayerId, request, mediaSessionId, correlationToken, alias)) {
-#else
             if (handler.adapterHandler->playControl(handler.localPlayerId, request, alias)) {
-#endif
                 if (request == RequestType::STOP || request == RequestType::PAUSE) {
                     if (playbackSessId.empty()) {
                         auto state = handler.adapterHandler->getAdapterState(handler.localPlayerId);
@@ -1393,11 +1324,7 @@ bool ExternalMediaPlayer::localOperation(PlaybackOperation op) {
                 requestType = RequestType::RESUME;
                 break;
         }
-#ifdef MEDIA_PORTABILITY_ENABLED
-        adapterHandler->playControl(localPlayerId, requestType, "", "", "");
-#else
         adapterHandler->playControl(localPlayerId, requestType, "");
-#endif
         return true;
     }
     return false;
@@ -1516,7 +1443,7 @@ void ExternalMediaPlayer::updateDiscoveredPlayers(
         }
     }
 
-    m_executor.submit([this, addedPlayers, removedLocalPlayerIds] {
+    m_executor.execute([this, addedPlayers, removedLocalPlayerIds] {
         for (const auto& playerId : removedLocalPlayerIds) {
             m_reportedDiscoveredPlayers.erase(playerId);
         }
@@ -1556,7 +1483,7 @@ void ExternalMediaPlayer::onButtonPressed(PlaybackButton button) {
         return;
     }
 
-    m_executor.submit([this, buttonIt]() {
+    m_executor.execute([this, buttonIt]() {
         std::string playerInFocus;
         {
             std::lock_guard<std::mutex> lock{m_inFocusAdapterMutex};
@@ -1567,11 +1494,7 @@ void ExternalMediaPlayer::onButtonPressed(PlaybackButton button) {
             auto maybeHandler = getHandlerFromPlayerId(playerInFocus);
             if (maybeHandler.hasValue()) {
                 const auto& handler = maybeHandler.value();
-#ifdef MEDIA_PORTABILITY_ENABLED
-                handler.adapterHandler->playControl(handler.localPlayerId, buttonIt->second, "", "", "");
-#else
                 handler.adapterHandler->playControl(handler.localPlayerId, buttonIt->second, "");
-#endif
             }
         }
     });
@@ -1587,7 +1510,7 @@ void ExternalMediaPlayer::onTogglePressed(PlaybackToggle toggle, bool action) {
     // toggleStates map is <SELECTED,DESELECTED>
     auto toggleStates = toggleIt->second;
 
-    m_executor.submit([this, action, toggleStates]() {
+    m_executor.execute([this, action, toggleStates]() {
         std::string playerInFocus;
         {
             std::lock_guard<std::mutex> lock{m_inFocusAdapterMutex};
@@ -1598,17 +1521,9 @@ void ExternalMediaPlayer::onTogglePressed(PlaybackToggle toggle, bool action) {
             if (maybeHandler.hasValue()) {
                 const auto& handler = maybeHandler.value();
                 if (action) {
-#ifdef MEDIA_PORTABILITY_ENABLED
-                    handler.adapterHandler->playControl(handler.localPlayerId, toggleStates.first, "", "", "");
-#else
                     handler.adapterHandler->playControl(handler.localPlayerId, toggleStates.first, "");
-#endif
                 } else {
-#ifdef MEDIA_PORTABILITY_ENABLED
-                    handler.adapterHandler->playControl(handler.localPlayerId, toggleStates.second, "", "", "");
-#else
                     handler.adapterHandler->playControl(handler.localPlayerId, toggleStates.second, "");
-#endif
                 }
             }
         }
@@ -1948,7 +1863,7 @@ void ExternalMediaPlayer::addAdapterHandler(std::shared_ptr<ExternalMediaAdapter
         ACSDK_ERROR(LX("addAdapterHandler").d("reason", "nullAdapterHandler"));
         return;
     }
-    m_executor.submit([this, adapterHandler]() {
+    m_executor.execute([this, adapterHandler]() {
         if (!m_adapterHandlers.insert(adapterHandler).second) {
             ACSDK_ERROR(LX("addAdapterHandler").d("reason", "duplicateAdapterHandler"));
         } else {
@@ -1963,7 +1878,7 @@ void ExternalMediaPlayer::removeAdapterHandler(std::shared_ptr<ExternalMediaAdap
         ACSDK_ERROR(LX("removeAdapterHandler").d("reason", "nullAdapterHandler"));
         return;
     }
-    m_executor.submit([this, adapterHandler]() {
+    m_executor.execute([this, adapterHandler]() {
         if (m_adapterHandlers.erase(adapterHandler) == 0) {
             ACSDK_WARN(LX("removeAdapterHandler").d("reason", "adapterHandlerNotFound"));
         }
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/StaticExternalMediaPlayerAdapterHandler.cpp b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/StaticExternalMediaPlayerAdapterHandler.cpp
index 69c45d770f..b6f3e02b2b 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/StaticExternalMediaPlayerAdapterHandler.cpp
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/StaticExternalMediaPlayerAdapterHandler.cpp
@@ -131,10 +131,6 @@ bool StaticExternalMediaPlayerAdapterHandler::play(const PlayParams& params) {
         params.navigation,
         params.preload,
         params.playRequestor,
-#ifdef MEDIA_PORTABILITY_ENABLED
-        params.mediaSessionId,
-        params.correlationToken,
-#endif
         params.playbackTarget);
     player->handlePlay(handlePlayParams);
     return true;
@@ -143,10 +139,6 @@ bool StaticExternalMediaPlayerAdapterHandler::play(const PlayParams& params) {
 bool StaticExternalMediaPlayerAdapterHandler::playControl(
     const std::string& localPlayerId,
     acsdkExternalMediaPlayerInterfaces::RequestType requestType,
-#ifdef MEDIA_PORTABILITY_ENABLED
-    const std::string& mediaSessionId,
-    const std::string& correlationToken,
-#endif
     const std::string& playbackTarget) {
     auto player = getAdapterByLocalPlayerId(localPlayerId);
     if (!player) {
@@ -154,11 +146,7 @@ bool StaticExternalMediaPlayerAdapterHandler::playControl(
     }
 
     ACSDK_DEBUG5(LX(__func__).d("localPlayerId", localPlayerId).sensitive("playbackTarget", playbackTarget));
-#ifdef MEDIA_PORTABILITY_ENABLED
-    player->handlePlayControl(requestType, mediaSessionId, correlationToken, playbackTarget);
-#else
     player->handlePlayControl(requestType, playbackTarget);
-#endif
     return true;
 }
 
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/CMakeLists.txt b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/CMakeLists.txt
index c3e958fae0..713162f5ec 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/CMakeLists.txt
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 set(INCLUDE_PATH
-	"${ExternalMediaPlayer_INCLUDE_DIRS}"
-	"${AVSCommon_SOURCE_DIR}/Utils/test"
-    "${CertifiedSender_SOURCE_DIR}/test")
+  "${ExternalMediaPlayer_SOURCE_DIR}/acsdkExternalMediaPlayerInterfaces/test")
 
-discover_unit_tests("${INCLUDE_PATH}" "acsdkExternalMediaPlayer;UtilsCommonTestLib;SDKInterfacesTests;CertifiedSenderCommonTestLib;ApplicationAudioPipelineFactoryTestLib;ShutdownManagerTestLib")
+discover_unit_tests("${INCLUDE_PATH}" "acsdkExternalMediaPlayer;UtilsCommonTestLib;SDKInterfacesTests;CertifiedSenderCommonTestLib;ApplicationAudioPipelineFactoryTestLib;ShutdownManagerTestLib;StartupNotifierTestLib")
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/ExternalMediaAdapterHandlerTest.cpp b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/ExternalMediaAdapterHandlerTest.cpp
index da1ff12361..db222c63b2 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/ExternalMediaAdapterHandlerTest.cpp
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/ExternalMediaAdapterHandlerTest.cpp
@@ -18,104 +18,31 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "acsdkExternalMediaPlayer/ExternalMediaPlayer.h"
 #include "acsdkExternalMediaPlayer/ExternalMediaAdapterHandler.h"
-#include "acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterHandlerInterface.h"
-#include "acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterInterface.h"
+#include "acsdkExternalMediaPlayer/MockExternalMediaAdapterHandler.h"
+
+#include <acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterHandlerInterface.h>
+#include <acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterInterface.h>
+#include <acsdkExternalMediaPlayerInterfaces/MockExternalMediaPlayer.h>
 
 namespace alexaClientSDK {
 namespace acsdkExternalMediaPlayer {
 namespace test {
 
-using PlayParams = acsdkExternalMediaPlayerInterfaces::ExternalMediaAdapterHandlerInterface::PlayParams;
+using namespace acsdkExternalMediaPlayerInterfaces;
+using namespace acsdkExternalMediaPlayerInterfaces::test;
 using namespace avsCommon::avs;
+using PlayParams = ExternalMediaAdapterHandlerInterface::PlayParams;
 
 using namespace ::testing;
 
-static const std::string PLAYER_ID = "testPlayerId";
 static const std::string PLAY_CONTEXT_TOKEN = "testContextToken";
 static const std::string SKILL_TOKEN = "testSkillToken";
 static const std::string SESSION_ID = "testSessionId";
-static const std::string NAVIGATION_NONE = "NONE";
 static const std::string PLAYBACK_TARGET = "testPlaybackTarget";
 static const PlayRequestor PLAY_REQUESTOR{.type = "ALERT", .id = "123"};
 static const std::chrono::milliseconds PLAY_OFFSET{100};
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-static const std::string MEDIA_SESSION_ID = "testMediaSessionId";
-static const std::string CORRELATION_TOKEN = "testCorrelationToken";
-#endif
-
-class MockExternalMediaPlayer : public ExternalMediaPlayer::ExternalMediaPlayerInterface {
-public:
-    MOCK_METHOD1(setPlayerInFocus, void(const std::string& playerInFocus));
-    MOCK_METHOD2(
-        updateDiscoveredPlayers,
-        void(
-            const std::vector<acsdkExternalMediaPlayerInterfaces::DiscoveredPlayerInfo>& addedPlayers,
-            const std::unordered_set<std::string>& removedPlayers));
-    MOCK_METHOD1(
-        addAdapterHandler,
-        void(std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaAdapterHandlerInterface> adapterHandler));
-    MOCK_METHOD1(
-        removeAdapterHandler,
-        void(std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaAdapterHandlerInterface> adapterHandler));
-    MOCK_METHOD1(
-        addObserver,
-        void(const std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerObserverInterface> observer));
-    MOCK_METHOD1(
-        removeObserver,
-        void(const std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerObserverInterface> observer));
-};
-
-/// Mock class for ExternalMediaPlayerAdapterHandler
-class MockExternalMediaAdapterHandler : public ExternalMediaAdapterHandler {
-public:
-    MOCK_METHOD1(handleAuthorization, bool(const AuthorizedPlayerInfo& authorizedPlayer));
-    MOCK_METHOD5(
-        handleLogin,
-        bool(
-            const std::string& localPlayerId,
-            const std::string& accessToken,
-            const std::string& userName,
-            bool forceLogin,
-            std::chrono::milliseconds tokenRefreshInterval));
-    MOCK_METHOD1(handleLogout, bool(const std::string& localPlayerId));
-    MOCK_METHOD1(handlePlay, bool(const PlayParams& params));
-#ifdef MEDIA_PORTABILITY_ENABLED
-    MOCK_METHOD5(
-#else
-    MOCK_METHOD3(
-#endif
-        handlePlayControl,
-        bool(
-            const std::string& localPlayerId,
-            acsdkExternalMediaPlayerInterfaces::RequestType requestType,
-#ifdef MEDIA_PORTABILITY_ENABLED
-            const std::string& mediaSessionId,
-            const std::string& correlationToken,
-#endif
-            const std::string& playbackTarget));
-    MOCK_METHOD2(handleSeek, bool(const std::string& localPlayerId, std::chrono::milliseconds offset));
-    MOCK_METHOD2(handleAdjustSeek, bool(const std::string& localPlayerId, std::chrono::milliseconds deltaOffset));
-    MOCK_METHOD2(
-        handleGetAdapterState,
-        bool(const std::string& localPlayerId, acsdkExternalMediaPlayerInterfaces::AdapterState& state));
-    MOCK_METHOD1(handleSetVolume, void(int8_t volume));
-    MOCK_METHOD1(handleSetMute, void(bool mute));
-    void reportMockPlayers();
-    MockExternalMediaAdapterHandler();
-};
-
-void MockExternalMediaAdapterHandler::reportMockPlayers() {
-    acsdkExternalMediaPlayerInterfaces::DiscoveredPlayerInfo playerInfo;
-    playerInfo.localPlayerId = PLAYER_ID;
-    reportDiscoveredPlayers({playerInfo});
-};
-
-MockExternalMediaAdapterHandler::MockExternalMediaAdapterHandler() : ExternalMediaAdapterHandler{"mock"} {
-}
-
 class ExternalMediaPlayerTest : public ::testing::Test {
 public:
     void SetUp() override;
@@ -134,7 +61,7 @@ void ExternalMediaPlayerTest::SetUp() {
     m_externalMediaPlayer = std::make_shared<NiceMock<MockExternalMediaPlayer>>();
     m_externalMediaPlayerAdapterHandler = std::make_shared<MockExternalMediaAdapterHandler>();
     m_externalMediaPlayerAdapterHandler->setExternalMediaPlayer(m_externalMediaPlayer);
-    m_externalMediaPlayerAdapterHandler->reportMockPlayers();
+    m_externalMediaPlayerAdapterHandler->reportMockPlayers(PLAYER_ID);
 };
 
 void ExternalMediaPlayerTest::TearDown() {
@@ -201,10 +128,6 @@ TEST_F(ExternalMediaPlayerTest, testHandlePlay) {
         acsdkExternalMediaPlayerInterfaces::Navigation::NONE,
         false,
         PLAY_REQUESTOR,
-#ifdef MEDIA_PORTABILITY_ENABLED
-        MEDIA_SESSION_ID,
-        CORRELATION_TOKEN,
-#endif
         "");
     EXPECT_CALL(*m_externalMediaPlayerAdapterHandler, handlePlay(_));
     m_externalMediaPlayerAdapterHandler->play(params);
@@ -217,22 +140,9 @@ TEST_F(ExternalMediaPlayerTest, testHandlePlayControl) {
     authorizePlayer();
     EXPECT_CALL(
         *m_externalMediaPlayerAdapterHandler,
-        handlePlayControl(
-            PLAYER_ID,
-            acsdkExternalMediaPlayerInterfaces::RequestType::NONE,
-#ifdef MEDIA_PORTABILITY_ENABLED
-            MEDIA_SESSION_ID,
-            CORRELATION_TOKEN,
-#endif
-            PLAYBACK_TARGET));
+        handlePlayControl(PLAYER_ID, acsdkExternalMediaPlayerInterfaces::RequestType::NONE, PLAYBACK_TARGET));
     m_externalMediaPlayerAdapterHandler->playControl(
-        PLAYER_ID,
-        acsdkExternalMediaPlayerInterfaces::RequestType::NONE,
-#ifdef MEDIA_PORTABILITY_ENABLED
-        MEDIA_SESSION_ID,
-        CORRELATION_TOKEN,
-#endif
-        PLAYBACK_TARGET);
+        PLAYER_ID, acsdkExternalMediaPlayerInterfaces::RequestType::NONE, PLAYBACK_TARGET);
 }
 
 /**
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/ExternalMediaPlayerTest.cpp b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/ExternalMediaPlayerTest.cpp
index 3c6efbef3f..bea74bdeb9 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/ExternalMediaPlayerTest.cpp
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/ExternalMediaPlayerTest.cpp
@@ -25,8 +25,6 @@
 
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/writer.h>
 
 #include <AVSCommon/AVS/Attachment/AttachmentManager.h>
 #include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
@@ -34,7 +32,6 @@
 #include <AVSCommon/SDKInterfaces/MockContextManager.h>
 #include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
 #include <AVSCommon/SDKInterfaces/MockDirectiveSequencer.h>
-#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
 #include <AVSCommon/SDKInterfaces/MockFocusManager.h>
 #include <AVSCommon/SDKInterfaces/MockMessageSender.h>
 #include <AVSCommon/SDKInterfaces/MockPlaybackRouter.h>
@@ -42,22 +39,28 @@
 #include <AVSCommon/SDKInterfaces/MockSpeakerManager.h>
 #include <AVSCommon/SDKInterfaces/Endpoints/MockEndpointCapabilitiesRegistrar.h>
 #include <AVSCommon/Utils/JSON/JSONUtils.h>
-#include <AVSCommon/Utils/Logger/ConsoleLogger.h>
 #include <AVSCommon/Utils/MediaPlayer/MockMediaPlayer.h>
-#include <AVSCommon/Utils/Memory/Memory.h>
 #include <AVSCommon/Utils/Metrics/MockMetricRecorder.h>
 #include <MockCertifiedSender.h>
 #include <acsdkApplicationAudioPipelineFactoryInterfaces/MockApplicationAudioPipelineFactory.h>
 #include <acsdkShutdownManagerInterfaces/MockShutdownNotifier.h>
+#include <acsdkStartupManagerInterfaces/MockStartupNotifier.h>
+#include <acsdkStartupManagerInterfaces/StartupNotifierInterface.h>
 
 #include "acsdkExternalMediaPlayer/ExternalMediaPlayer.h"
 #include "acsdkExternalMediaPlayer/ExternalMediaAdapterHandler.h"
+#include "acsdkExternalMediaPlayer/MockExternalMediaAdapterHandler.h"
+#include <acsdkExternalMediaPlayerInterfaces/MockExternalMediaPlayerAdapter.h>
+#include <acsdkExternalMediaPlayerInterfaces/MockExternalMediaPlayerObserver.h>
 
 namespace alexaClientSDK {
 namespace acsdkExternalMediaPlayer {
 namespace test {
 
 using namespace acsdkExternalMediaPlayerInterfaces;
+using namespace acsdkExternalMediaPlayerInterfaces::test;
+using namespace acsdkStartupManagerInterfaces;
+using namespace acsdkStartupManagerInterfaces::test;
 using namespace avsCommon::utils;
 using namespace avsCommon::utils::json::jsonUtils;
 using namespace avsCommon;
@@ -66,7 +69,6 @@ using namespace avsCommon::avs::attachment;
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::sdkInterfaces::test;
 using namespace avsCommon::utils::mediaPlayer;
-using namespace avsCommon::utils::memory;
 using namespace avsCommon::utils::mediaPlayer::test;
 using namespace avsCommon::utils::metrics::test;
 
@@ -95,7 +97,6 @@ static const std::string FAVORITESCONTROLLER_NAMESPACE = "Alexa.FavoritesControl
 
 // field values used in Adapter State response
 static const std::string PLAYER_USER_NAME = "userName";
-static const std::string PLAYER_ID = "testPlayerId";
 static const std::string PLAYER_TRACK = "testTrack";
 static const std::string PLAYER_STATE = "IDLE";
 
@@ -278,199 +279,6 @@ static AdapterState createAdapterState() {
     return adapterState;
 }
 
-/// Mock class of ExternalMediaAdapterInterface.
-class MockExternalMediaPlayerAdapter : public ExternalMediaAdapterInterface {
-public:
-    /*
-     * Method that adheres to the AdapterCreateFunc interface to create an
-     * adapter. This method create a mock instances and assigns it to a class
-     * static to keep the mock class simple.
-     *
-     * @param metricRecorder The metricRecorder instance to be used to record
-     * metrics
-     * @param mediaPlayer The mediaPlayer instance to be used to play Spotify
-     * content.
-     * @param speakerManager A @c SpeakerManagerInterface to perform volume
-     * changes requested by ESDK.
-     * @param messageSender The object to use for sending events.
-     * @param focusManager The focusManager used to acquire/release channel.
-     * @param contextManager The AVS Context manager used to generate system
-     * context for events.
-     * @param externalMediaPlayer The instance of the @c ExternalMediaPlayer
-     * managing the adapter.
-     * @return A @c std::shared_ptr to the new @c ExternalMediaAdapter instance.
-     */
-    static std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaAdapterInterface> getInstance(
-        std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
-        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> mediaPlayer,
-        std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> speaker,
-        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface> speakerManager,
-        std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
-        std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
-        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
-        std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerInterface> externalMediaPlayer);
-
-    static std::shared_ptr<MockExternalMediaPlayerAdapter> m_currentActiveMediaPlayerAdapter;
-
-    MOCK_METHOD0(doShutdown, void());
-    MOCK_METHOD0(init, void());
-    MOCK_METHOD0(deInit, void());
-    MOCK_METHOD4(
-        handleLogin,
-        void(
-            const std::string& accessToken,
-            const std::string& userName,
-            bool forceLogin,
-            std::chrono::milliseconds tokenRefreshInterval));
-    MOCK_METHOD0(handleLogout, void());
-    MOCK_METHOD1(handlePlay, void(const HandlePlayParams& params));
-#ifdef MEDIA_PORTABILITY_ENABLED
-    MOCK_METHOD4(
-        handlePlayControl,
-        void(
-            RequestType requestType,
-            const std::string& mediaSessionId,
-            const std::string& correlationToken,
-            const std::string& playbackTarget));
-#else
-    MOCK_METHOD2(handlePlayControl, void(RequestType requestType, const std::string& playbackTarget));
-#endif
-    MOCK_METHOD1(handleSeek, void(std::chrono::milliseconds offset));
-    MOCK_METHOD1(handleAdjustSeek, void(std::chrono::milliseconds deltaOffset));
-    MOCK_METHOD3(
-        handleAuthorized,
-        void(bool authorized, const std::string& playerId, const std::string& defaultSkillToken));
-    MOCK_METHOD1(handleSetVolume, void(int8_t volume));
-    MOCK_METHOD1(handleSetMute, void(bool));
-    MOCK_METHOD0(getState, AdapterState());
-    MOCK_METHOD0(getOffset, std::chrono::milliseconds());
-
-private:
-    /// MockExternalMediaPlayerAdapter private constructor.
-    MockExternalMediaPlayerAdapter();
-};
-
-/// Static instance of MockMediaPlayerAdapter.
-std::shared_ptr<MockExternalMediaPlayerAdapter> MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter;
-
-MockExternalMediaPlayerAdapter::MockExternalMediaPlayerAdapter() :
-        RequiresShutdown("MockExternalMediaPlayerAdapter"),
-        ExternalMediaAdapterInterface("MockExternalMediaPlayerAdapter") {
-}
-
-std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaAdapterInterface> MockExternalMediaPlayerAdapter::
-    getInstance(
-        std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
-        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> mediaPlayer,
-        std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> speaker,
-        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface> speakerManager,
-        std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
-        std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
-        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
-        std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerInterface> externalMediaPlayer) {
-    MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter =
-        std::shared_ptr<MockExternalMediaPlayerAdapter>(new MockExternalMediaPlayerAdapter());
-    return MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter;
-}
-
-class MockExternalMediaPlayerObserver : public ExternalMediaPlayerObserverInterface {
-public:
-    static std::shared_ptr<MockExternalMediaPlayerObserver> getInstance();
-    MOCK_METHOD2(
-        onLoginStateProvided,
-        void(const std::string&, const acsdkExternalMediaPlayerInterfaces::ObservableSessionProperties));
-    MOCK_METHOD2(
-        onPlaybackStateProvided,
-        void(const std::string&, const acsdkExternalMediaPlayerInterfaces::ObservablePlaybackStateProperties));
-
-private:
-    /**
-     * Constructor
-     */
-    MockExternalMediaPlayerObserver();
-};
-
-std::shared_ptr<MockExternalMediaPlayerObserver> MockExternalMediaPlayerObserver::getInstance() {
-    return std::shared_ptr<MockExternalMediaPlayerObserver>(new MockExternalMediaPlayerObserver());
-}
-
-MockExternalMediaPlayerObserver::MockExternalMediaPlayerObserver() {
-}
-
-/// Mock class for ExternalMediaPlayerAdapterHandler
-class MockExternalMediaAdapterHandler : public ExternalMediaAdapterHandler {
-public:
-    MOCK_METHOD1(handleAuthorization, bool(const AuthorizedPlayerInfo& authorizedPlayer));
-    MOCK_METHOD5(
-        handleLogin,
-        bool(
-            const std::string& localPlayerId,
-            const std::string& accessToken,
-            const std::string& userName,
-            bool forceLogin,
-            std::chrono::milliseconds tokenRefreshInterval));
-    MOCK_METHOD1(handleLogout, bool(const std::string& localPlayerId));
-    MOCK_METHOD1(handlePlay, bool(const PlayParams& params));
-#ifdef MEDIA_PORTABILITY_ENABLED
-    MOCK_METHOD5(
-#else
-    MOCK_METHOD3(
-#endif
-        handlePlayControl,
-        bool(
-            const std::string& localPlayerId,
-            acsdkExternalMediaPlayerInterfaces::RequestType requestType,
-#ifdef MEDIA_PORTABILITY_ENABLED
-            const std::string& mediaSessionId,
-            const std::string& correlationToken,
-#endif
-            const std::string& playbackTarget));
-    MOCK_METHOD2(handleSeek, bool(const std::string& localPlayerId, std::chrono::milliseconds offset));
-    MOCK_METHOD2(handleAdjustSeek, bool(const std::string& localPlayerId, std::chrono::milliseconds deltaOffset));
-    MOCK_METHOD2(
-        handleGetAdapterState,
-        bool(const std::string& localPlayerId, acsdkExternalMediaPlayerInterfaces::AdapterState& state));
-    MOCK_METHOD1(handleSetVolume, void(int8_t volume));
-    MOCK_METHOD1(handleSetMute, void(bool mute));
-    void reportMockPlayers(const std::string& localPlayerId = MSP2_PLAYER_ID);
-    MockExternalMediaAdapterHandler();
-};
-
-void MockExternalMediaAdapterHandler::reportMockPlayers(const std::string& localPlayerId) {
-    DiscoveredPlayerInfo playerInfo;
-    playerInfo.localPlayerId = localPlayerId;
-    playerInfo.validationMethod = ValidationMethod::NONE;
-    reportDiscoveredPlayers({playerInfo});
-};
-
-MockExternalMediaAdapterHandler::MockExternalMediaAdapterHandler() : ExternalMediaAdapterHandler{"mock"} {
-}
-
-class MockStartupNotifier : public acsdkStartupManagerInterfaces::StartupNotifierInterface {
-public:
-    MOCK_METHOD1(
-        addObserver,
-        void(const std::shared_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>& observer));
-    MOCK_METHOD1(
-        removeObserver,
-        void(const std::shared_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>& observer));
-    MOCK_METHOD1(
-        addWeakPtrObserver,
-        void(const std::weak_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>& observer));
-    MOCK_METHOD1(
-        removeWeakPtrObserver,
-        void(const std::weak_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>& observer));
-    MOCK_METHOD1(
-        notifyObservers,
-        void(std::function<void(const std::shared_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>&)>));
-    MOCK_METHOD1(
-        notifyObserversInReverse,
-        bool(std::function<void(const std::shared_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>&)>));
-    MOCK_METHOD1(
-        setAddObserverFunction,
-        void(std::function<void(const std::shared_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>&)>));
-};
-
 class MockRenderPlayerInfoCardsProviderRegistrar : public RenderPlayerInfoCardsProviderRegistrarInterface {
 public:
     MOCK_METHOD1(
@@ -1881,11 +1689,7 @@ TEST_F(ExternalMediaPlayerTest, test_play) {
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
 
     m_externalMediaPlayer->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
     m_externalMediaPlayer->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
@@ -1903,11 +1707,7 @@ TEST_F(ExternalMediaPlayerTest, test_pause) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -1928,11 +1728,7 @@ TEST_F(ExternalMediaPlayerTest, testStop) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -1953,11 +1749,7 @@ TEST_F(ExternalMediaPlayerTest, test_stop) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -1978,11 +1770,7 @@ TEST_F(ExternalMediaPlayerTest, test_next) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -2003,11 +1791,7 @@ TEST_F(ExternalMediaPlayerTest, test_previous) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -2028,11 +1812,7 @@ TEST_F(ExternalMediaPlayerTest, test_startOver) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -2053,11 +1833,7 @@ TEST_F(ExternalMediaPlayerTest, test_rewind) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -2078,11 +1854,7 @@ TEST_F(ExternalMediaPlayerTest, test_fastForward) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -2103,11 +1875,7 @@ TEST_F(ExternalMediaPlayerTest, test_enableRepeatOne) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -2128,11 +1896,7 @@ TEST_F(ExternalMediaPlayerTest, test_enableRepeat) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -2153,11 +1917,7 @@ TEST_F(ExternalMediaPlayerTest, test_disableRepeat) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -2178,11 +1938,7 @@ TEST_F(ExternalMediaPlayerTest, test_enableShuffle) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -2203,11 +1959,7 @@ TEST_F(ExternalMediaPlayerTest, test_disableShuffle) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -2228,11 +1980,7 @@ TEST_F(ExternalMediaPlayerTest, test_favorite) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -2253,11 +2001,7 @@ TEST_F(ExternalMediaPlayerTest, test_unfavorite) {
     std::shared_ptr<AVSDirective> directive =
         AVSDirective::create("", avsMessageHeader, createPayloadWithPlayerId(MSP1_PLAYER_ID), m_attachmentManager, "");
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-    EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _, _, _));
-#else
     EXPECT_CALL(*(MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter), handlePlayControl(_, _));
-#endif
     EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
         .Times(1)
         .WillOnce(InvokeWithoutArgs(this, &ExternalMediaPlayerTest::wakeOnSetComplete));
@@ -2860,7 +2604,7 @@ TEST_F(ExternalMediaPlayerTest, testAddAdapterHandlerDiscovery) {
         .Times(1)
         .WillOnce(InvokeWithoutArgs([&eventPromise]() { eventPromise.set_value(); }));
 
-    mockAdapterHandler->reportMockPlayers();
+    mockAdapterHandler->reportMockPlayers(MSP2_LOCAL_PLAYER_ID);
 
     ASSERT_TRUE(std::future_status::ready == eventFuture.wait_for(MY_WAIT_TIMEOUT));
 }
@@ -2914,7 +2658,7 @@ TEST_F(ExternalMediaPlayerTest, testAddAdapterHandlerDiscoveryAggregatedUntilSta
         ConnectionStatusObserverInterface::ChangedReason::SUCCESS);
 
     // No message sent here because startup hasn't been called yet ...
-    mockAdapterHandler->reportMockPlayers();
+    mockAdapterHandler->reportMockPlayers(MSP2_LOCAL_PLAYER_ID);
 
     // Add a second adapter.
     auto secondMockAdapterHandler = std::make_shared<MockExternalMediaAdapterHandler>();
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/acsdkExternalMediaPlayer/MockExternalMediaAdapterHandler.h b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/acsdkExternalMediaPlayer/MockExternalMediaAdapterHandler.h
new file mode 100644
index 0000000000..abfd19009c
--- /dev/null
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/test/acsdkExternalMediaPlayer/MockExternalMediaAdapterHandler.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYER_TEST_ACSDKEXTERNALMEDIAPLAYER_MOCKEXTERNALMEDIAADAPTERHANDLER_H_
+#define AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYER_TEST_ACSDKEXTERNALMEDIAPLAYER_MOCKEXTERNALMEDIAADAPTERHANDLER_H_
+
+#include <gtest/gtest.h>
+
+namespace alexaClientSDK {
+namespace acsdkExternalMediaPlayer {
+namespace test {
+
+static const std::string PLAYER_ID = "testPlayerId";
+
+/// Mock class for ExternalMediaPlayerAdapterHandler
+class MockExternalMediaAdapterHandler : public ExternalMediaAdapterHandler {
+public:
+    MOCK_METHOD1(handleAuthorization, bool(const AuthorizedPlayerInfo& authorizedPlayer));
+    MOCK_METHOD5(
+        handleLogin,
+        bool(
+            const std::string& localPlayerId,
+            const std::string& accessToken,
+            const std::string& userName,
+            bool forceLogin,
+            std::chrono::milliseconds tokenRefreshInterval));
+    MOCK_METHOD1(handleLogout, bool(const std::string& localPlayerId));
+    MOCK_METHOD1(handlePlay, bool(const PlayParams& params));
+    MOCK_METHOD3(
+        handlePlayControl,
+        bool(
+            const std::string& localPlayerId,
+            acsdkExternalMediaPlayerInterfaces::RequestType requestType,
+            const std::string& playbackTarget));
+    MOCK_METHOD2(handleSeek, bool(const std::string& localPlayerId, std::chrono::milliseconds offset));
+    MOCK_METHOD2(handleAdjustSeek, bool(const std::string& localPlayerId, std::chrono::milliseconds deltaOffset));
+    MOCK_METHOD2(
+        handleGetAdapterState,
+        bool(const std::string& localPlayerId, acsdkExternalMediaPlayerInterfaces::AdapterState& state));
+    MOCK_METHOD1(handleSetVolume, void(int8_t volume));
+    MOCK_METHOD1(handleSetMute, void(bool mute));
+    void reportMockPlayers(const std::string& localPlayerId);
+    MockExternalMediaAdapterHandler();
+};
+
+void MockExternalMediaAdapterHandler::reportMockPlayers(const std::string& localPlayerId) {
+    acsdkExternalMediaPlayerInterfaces::DiscoveredPlayerInfo playerInfo;
+
+    playerInfo.localPlayerId = localPlayerId;
+    reportDiscoveredPlayers({playerInfo});
+};
+
+MockExternalMediaAdapterHandler::MockExternalMediaAdapterHandler() : ExternalMediaAdapterHandler{"mock"} {
+}
+
+}  // namespace test
+}  // namespace acsdkExternalMediaPlayer
+}  // namespace alexaClientSDK
+
+#endif  // AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYER_TEST_ACSDKEXTERNALMEDIAPLAYER_MOCKEXTERNALMEDIAADAPTERHANDLER_H_
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/CMakeLists.txt b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/CMakeLists.txt
index f1a42eafc4..e8b316b351 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/CMakeLists.txt
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/CMakeLists.txt
@@ -2,3 +2,4 @@ cmake_minimum_required(VERSION 3.1)
 project(acsdkExternalMediaPlayerInterfaces LANGUAGES CXX)
 
 add_subdirectory("src")
+add_subdirectory("test")
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/AdapterUtils.h b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/AdapterUtils.h
index a25844a606..8794420dd8 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/AdapterUtils.h
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/AdapterUtils.h
@@ -176,43 +176,6 @@ bool buildDefaultPlayerState(rapidjson::Value* document, rapidjson::Document::Al
  */
 std::string getEmpContextString(acsdkExternalMediaPlayerInterfaces::AdapterState adapterState);
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-/**
- * Media portability mode
- */
-enum class MpMode {
-    /// Legacy mode indicates that no media portability or media convergence is being used.
-    LEGACY,
-    /// Media convergence mode means all media playback is through one type of media player,
-    /// and media portability is not turned on
-    MEDIA_CONVERGENCE,
-    /// Media portability mode means both media convergence and media portability are turned on.
-    MEDIA_PORTABILITY
-};
-
-/**
- * Method to check if the given request type includes a mediaSessionId.
- *
- * @param type RequestType to check
- * @return Whether request type includes a mediaSessionId
- */
-bool requestTypeIncludesMediaSessionId(RequestType type);
-
-/**
- * Get the media portability mode.
- * @return Media portability mode
- */
-MpMode getMediaPortabilityMode();
-
-/**
- * Whether media portability is enabled
- *
- * @return True if media portability is enabled, false otherwise.
- */
-bool mediaPortabilityEnabled();
-
-#endif
-
 }  // namespace acsdkExternalMediaPlayerInterfaces
 }  // namespace alexaClientSDK
 
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterConstants.h b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterConstants.h
index 2f24817bf9..3d9119f56c 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterConstants.h
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterConstants.h
@@ -45,10 +45,6 @@ const char SPI_VERSION[] = "spiVersion";
 const char PLAYER_COOKIE[] = "playerCookie";
 const char SKILL_TOKEN[] = "skillToken";
 const char PLAYBACK_SESSION_ID[] = "playbackSessionId";
-#ifdef MEDIA_PORTABILITY_ENABLED
-const char MEDIA_SESSION_ID[] = "mediaSessionId";
-static const std::string CORRELATION_TOKEN = "correlationToken";
-#endif
 
 // The key values used in the context payload from External Media Player to AVS.
 const char STATE[] = "state";
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterHandlerInterface.h b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterHandlerInterface.h
index 4ed275803b..27a6110b9c 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterHandlerInterface.h
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterHandlerInterface.h
@@ -77,12 +77,6 @@ class ExternalMediaAdapterHandlerInterface : public alexaClientSDK::avsCommon::u
         bool preload;
         /// PlayRequestor for indicating who requested playback
         alexaClientSDK::avsCommon::avs::PlayRequestor playRequestor;
-#ifdef MEDIA_PORTABILITY_ENABLED
-        /// mediaSessionId used to track media playback
-        std::string mediaSessionId;
-        /// correlationToken used to opaquely plumb routing info
-        std::string correlationToken;
-#endif
         /// Playback target to play on
         std::string playbackTarget;
 
@@ -111,10 +105,6 @@ class ExternalMediaAdapterHandlerInterface : public alexaClientSDK::avsCommon::u
             Navigation navigation,
             bool preload,
             const alexaClientSDK::avsCommon::avs::PlayRequestor& playRequestor,
-#ifdef MEDIA_PORTABILITY_ENABLED
-            const std::string& mediaSessionId,
-            const std::string& correlationToken,
-#endif
             const std::string& playbackTarget) :
                 localPlayerId{localPlayerId},
                 playContextToken{playContextToken},
@@ -125,10 +115,6 @@ class ExternalMediaAdapterHandlerInterface : public alexaClientSDK::avsCommon::u
                 navigation{navigation},
                 preload{preload},
                 playRequestor(playRequestor),
-#ifdef MEDIA_PORTABILITY_ENABLED
-                mediaSessionId{mediaSessionId},
-                correlationToken{correlationToken},
-#endif
                 playbackTarget{playbackTarget} {
         }
     };
@@ -187,12 +173,6 @@ class ExternalMediaAdapterHandlerInterface : public alexaClientSDK::avsCommon::u
     virtual bool playControl(
         const std::string& localPlayerId,
         acsdkExternalMediaPlayerInterfaces::RequestType requestType,
-#ifdef MEDIA_PORTABILITY_ENABLED
-        /// @param mediaSessionId The optional @c mediaSessionId used to track media playback
-        /// @param correlationToken The optional @c correlationToken used to opaquely plumb routing info
-        const std::string& mediaSessionId,
-        const std::string& correlationToken,
-#endif
         const std::string& playbackTarget) = 0;
 
     /**
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterInterface.h b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterInterface.h
index 35655aee71..c7c7715593 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterInterface.h
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/include/acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterInterface.h
@@ -167,11 +167,14 @@ enum class SupportedPlaybackOperation {
     /// Enable Loop on.
     ENABLE_REPEAT,
 
+    /// Disable loop on.
+    DISABLE_REPEAT,
+
     /// Enable repeat of a track .
     ENABLE_REPEAT_ONE,
 
-    /// Disable loop on.
-    DISABLE_REPEAT,
+    /// Disable repeat of a track.
+    DISABLE_REPEAT_ONE,
 
     /// Enable shuffle.
     ENABLE_SHUFFLE,
@@ -378,15 +381,6 @@ struct AdapterSessionState {
 
     /// The validity period of the token in milliseconds.
     std::chrono::milliseconds tokenRefreshInterval;
-
-#ifdef MEDIA_PORTABILITY_ENABLED
-    /// A universally unique identifier (UUID) generated to the RFC 4122
-    /// specification used to track media playback
-    std::string mediaSessionId;
-
-    /// A identifier token used to opaquely plumb routing info from directives to events
-    std::string correlationToken;
-#endif
 };
 
 /**
@@ -551,12 +545,6 @@ class ExternalMediaAdapterInterface : public virtual avsCommon::utils::RequiresS
         bool preload;
         /// PlayRequestor for indicating who requested playback
         avsCommon::avs::PlayRequestor playRequestor;
-#ifdef MEDIA_PORTABILITY_ENABLED
-        /// mediaSessionId used to track media playback
-        std::string mediaSessionId;
-        /// correlationToken used to opaquely plumb routing info
-        std::string correlationToken;
-#endif
         /// Playback target to play on
         std::string playbackTarget;
 
@@ -590,10 +578,6 @@ class ExternalMediaAdapterInterface : public virtual avsCommon::utils::RequiresS
             Navigation navigation,
             bool preload,
             const avsCommon::avs::PlayRequestor& playRequestor,
-#ifdef MEDIA_PORTABILITY_ENABLED
-            const std::string& mediaSessionId,
-            const std::string& correlationToken,
-#endif
             const std::string& playbackTarget) :
                 playContextToken{playContextToken},
                 index{index},
@@ -603,10 +587,6 @@ class ExternalMediaAdapterInterface : public virtual avsCommon::utils::RequiresS
                 navigation{navigation},
                 preload{preload},
                 playRequestor(playRequestor),
-#ifdef MEDIA_PORTABILITY_ENABLED
-                mediaSessionId{mediaSessionId},
-                correlationToken{correlationToken},
-#endif
                 playbackTarget{playbackTarget} {
         }
     };
@@ -655,15 +635,7 @@ class ExternalMediaAdapterInterface : public virtual avsCommon::utils::RequiresS
      * that will handle the play control.
      * @param isLocal Whether play control is locally triggered on device
      */
-    virtual void handlePlayControl(
-        RequestType requestType,
-#ifdef MEDIA_PORTABILITY_ENABLED
-        /// @param mediaSessionId The optional @c mediaSessionId used to track media playback
-        /// @param correlationToken The optional @c correlationToken used to opaquely plumb routing info
-        const std::string& mediaSessionId,
-        const std::string& correlationToken,
-#endif
-        const std::string& playbackTarget) = 0;
+    virtual void handlePlayControl(RequestType requestType, const std::string& playbackTarget) = 0;
 
     /**
      * Method to seek to the given offset.
@@ -838,6 +810,8 @@ inline std::string SupportedPlaybackOperationToString(SupportedPlaybackOperation
             return "EnableRepeatOne";
         case SupportedPlaybackOperation::DISABLE_REPEAT:
             return "DisableRepeat";
+        case SupportedPlaybackOperation::DISABLE_REPEAT_ONE:
+            return "DisableRepeatOne";
         case SupportedPlaybackOperation::ENABLE_SHUFFLE:
             return "EnableShuffle";
         case SupportedPlaybackOperation::DISABLE_SHUFFLE:
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/src/AdapterUtils.cpp b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/src/AdapterUtils.cpp
index ff545697a2..dbc1f22a40 100644
--- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/src/AdapterUtils.cpp
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/src/AdapterUtils.cpp
@@ -258,31 +258,5 @@ std::string getEmpContextString(AdapterState adapterState) {
     return buffer.GetString();
 }
 
-#ifdef MEDIA_PORTABILITY_ENABLED
-
-bool requestTypeIncludesMediaSessionId(RequestType type) {
-    static const std::set<RequestType> requestTypesWithMediaSessionId{RequestType::RESUME,
-                                                                      RequestType::START_OVER,
-                                                                      RequestType::PREVIOUS,
-                                                                      RequestType::NEXT,
-                                                                      RequestType::REWIND,
-                                                                      RequestType::FAST_FORWARD,
-                                                                      RequestType::STOP,
-                                                                      RequestType::PAUSE};
-
-    return requestTypesWithMediaSessionId.count(type) > 0;
-}
-
-MpMode getMediaPortabilityMode() {
-    // TODO: Update MP mode based on system property
-    return MpMode::LEGACY;
-}
-
-bool mediaPortabilityEnabled() {
-    return getMediaPortabilityMode() == MpMode::MEDIA_PORTABILITY;
-}
-
-#endif
-
 }  // namespace acsdkExternalMediaPlayerInterfaces
 }  // namespace alexaClientSDK
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/CMakeLists.txt b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/CMakeLists.txt
new file mode 100644
index 0000000000..c3ef48f5ac
--- /dev/null
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/CMakeLists.txt
@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+if (BUILD_TESTING)
+  add_library(acsdkExternalMediaPlayerInterfacesTestLib INTERFACE)
+
+  target_include_directories(acsdkExternalMediaPlayerInterfacesTestLib INTERFACE
+    "${AVSCommon_INCLUDE_DIRS}"
+    "${AVSCommon_SOURCE_DIR}/Utils/test"
+    "${acsdkExternalMediaPlayerInterfaces_SOURCE_DIR}/test")
+
+  target_link_libraries(acsdkExternalMediaPlayerInterfacesTestLib INTERFACE
+    AVSCommon
+    SDKInterfacesTests
+    acsdkExternalMediaPlayerInterfaces
+    gmock_main)
+endif()
+
+set(INCLUDE_PATH
+  "${acsdkExternalMediaPlayer_INCLUDE_DIRS}"
+  "${AVSCommon_SOURCE_DIR}/Utils/test"
+  "${CertifiedSender_SOURCE_DIR}/test")
+
+discover_unit_tests("${INCLUDE_PATH}" "acsdkExternalMediaPlayer;UtilsCommonTestLib;SDKInterfacesTests;CertifiedSenderCommonTestLib;ApplicationAudioPipelineFactoryTestLib;ShutdownManagerTestLib")
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/acsdkExternalMediaPlayerInterfaces/MockExternalMediaPlayer.h b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/acsdkExternalMediaPlayerInterfaces/MockExternalMediaPlayer.h
new file mode 100644
index 0000000000..25b61387ca
--- /dev/null
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/acsdkExternalMediaPlayerInterfaces/MockExternalMediaPlayer.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYERINTERFACES_TEST_ACSDKEXTERNALMEDIAPLAYERINTERFACES_MOCKEXTERNALMEDIAPLAYER_H_
+#define AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYERINTERFACES_TEST_ACSDKEXTERNALMEDIAPLAYERINTERFACES_MOCKEXTERNALMEDIAPLAYER_H_
+
+#include <gmock/gmock.h>
+
+#include "acsdkExternalMediaPlayerInterfaces/ExternalMediaPlayerInterface.h"
+
+namespace alexaClientSDK {
+namespace acsdkExternalMediaPlayerInterfaces {
+namespace test {
+
+using namespace avsCommon::avs;
+
+using namespace ::testing;
+
+/// Mock class or ExternalMediaPlayer
+class MockExternalMediaPlayer : public ExternalMediaPlayerInterface {
+public:
+    MOCK_METHOD1(setPlayerInFocus, void(const std::string& playerInFocus));
+    MOCK_METHOD2(
+        updateDiscoveredPlayers,
+        void(
+            const std::vector<acsdkExternalMediaPlayerInterfaces::DiscoveredPlayerInfo>& addedPlayers,
+            const std::unordered_set<std::string>& removedPlayers));
+    MOCK_METHOD1(
+        addAdapterHandler,
+        void(std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaAdapterHandlerInterface> adapterHandler));
+    MOCK_METHOD1(
+        removeAdapterHandler,
+        void(std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaAdapterHandlerInterface> adapterHandler));
+    MOCK_METHOD1(
+        addObserver,
+        void(const std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerObserverInterface> observer));
+    MOCK_METHOD1(
+        removeObserver,
+        void(const std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerObserverInterface> observer));
+};
+
+}  // namespace test
+}  // namespace acsdkExternalMediaPlayerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYERINTERFACES_TEST_ACSDKEXTERNALMEDIAPLAYERINTERFACES_MOCKEXTERNALMEDIAPLAYER_H_
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/acsdkExternalMediaPlayerInterfaces/MockExternalMediaPlayerAdapter.h b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/acsdkExternalMediaPlayerInterfaces/MockExternalMediaPlayerAdapter.h
new file mode 100644
index 0000000000..81020ccb71
--- /dev/null
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/acsdkExternalMediaPlayerInterfaces/MockExternalMediaPlayerAdapter.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYERINTERFACES_TEST_ACSDKEXTERNALMEDIAPLAYERINTERFACES_MOCKEXTERNALMEDIAPLAYERADAPTER_H_
+#define AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYERINTERFACES_TEST_ACSDKEXTERNALMEDIAPLAYERINTERFACES_MOCKEXTERNALMEDIAPLAYERADAPTER_H_
+
+#include <acsdkExternalMediaPlayerInterfaces/ExternalMediaAdapterInterface.h>
+#include <acsdkExternalMediaPlayerInterfaces/ExternalMediaPlayerInterface.h>
+
+#include <AVSCommon/Utils/MediaPlayer/MediaPlayerInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+#include <AVSCommon/SDKInterfaces/ChannelVolumeInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/FocusManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/SpeakerManagerInterface.h>
+
+#include <gmock/gmock.h>
+
+namespace alexaClientSDK {
+namespace acsdkExternalMediaPlayerInterfaces {
+namespace test {
+
+/// Mock class of ExternalMediaAdapterInterface.
+class MockExternalMediaPlayerAdapter : public ExternalMediaAdapterInterface {
+public:
+    /*
+     * Method that adheres to the AdapterCreateFunc interface to create an
+     * adapter. This method create a mock instances and assigns it to a class
+     * static to keep the mock class simple.
+     *
+     * @param metricRecorder The metricRecorder instance to be used to record
+     * metrics
+     * @param mediaPlayer The mediaPlayer instance to be used to play Spotify
+     * content.
+     * @param speakerManager A @c SpeakerManagerInterface to perform volume
+     * changes requested by ESDK.
+     * @param messageSender The object to use for sending events.
+     * @param focusManager The focusManager used to acquire/release channel.
+     * @param contextManager The AVS Context manager used to generate system
+     * context for events.
+     * @param externalMediaPlayer The instance of the @c ExternalMediaPlayer
+     * managing the adapter.
+     * @return A @c std::shared_ptr to the new @c ExternalMediaAdapter instance.
+     */
+    static std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaAdapterInterface> getInstance(
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> mediaPlayer,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> speaker,
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface> speakerManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerInterface> externalMediaPlayer);
+
+    /// MockExternalMediaPlayerAdapter private constructor.
+    MockExternalMediaPlayerAdapter();
+
+    static std::shared_ptr<MockExternalMediaPlayerAdapter> m_currentActiveMediaPlayerAdapter;
+
+    MOCK_METHOD0(doShutdown, void());
+    MOCK_METHOD0(init, void());
+    MOCK_METHOD0(deInit, void());
+    MOCK_METHOD4(
+        handleLogin,
+        void(
+            const std::string& accessToken,
+            const std::string& userName,
+            bool forceLogin,
+            std::chrono::milliseconds tokenRefreshInterval));
+    MOCK_METHOD0(handleLogout, void());
+    MOCK_METHOD1(handlePlay, void(const HandlePlayParams& params));
+    MOCK_METHOD2(handlePlayControl, void(RequestType requestType, const std::string& playbackTarget));
+    MOCK_METHOD1(handleSeek, void(std::chrono::milliseconds offset));
+    MOCK_METHOD1(handleAdjustSeek, void(std::chrono::milliseconds deltaOffset));
+    MOCK_METHOD3(
+        handleAuthorized,
+        void(bool authorized, const std::string& playerId, const std::string& defaultSkillToken));
+    MOCK_METHOD1(handleSetVolume, void(int8_t volume));
+    MOCK_METHOD1(handleSetMute, void(bool));
+    MOCK_METHOD0(getState, AdapterState());
+    MOCK_METHOD0(getOffset, std::chrono::milliseconds());
+};
+
+/// Static instance of MockMediaPlayerAdapter.
+std::shared_ptr<MockExternalMediaPlayerAdapter> MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter;
+
+MockExternalMediaPlayerAdapter::MockExternalMediaPlayerAdapter() :
+        RequiresShutdown("MockExternalMediaPlayerAdapter"),
+        ExternalMediaAdapterInterface("MockExternalMediaPlayerAdapter") {
+}
+
+std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaAdapterInterface> MockExternalMediaPlayerAdapter::
+    getInstance(
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder,
+        std::shared_ptr<avsCommon::utils::mediaPlayer::MediaPlayerInterface> mediaPlayer,
+        std::shared_ptr<avsCommon::sdkInterfaces::ChannelVolumeInterface> speaker,
+        std::shared_ptr<avsCommon::sdkInterfaces::SpeakerManagerInterface> speakerManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::FocusManagerInterface> focusManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerInterface> externalMediaPlayer) {
+    MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter =
+        std::shared_ptr<MockExternalMediaPlayerAdapter>(new MockExternalMediaPlayerAdapter());
+    return MockExternalMediaPlayerAdapter::m_currentActiveMediaPlayerAdapter;
+}
+}  // namespace test
+}  // namespace acsdkExternalMediaPlayerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYERINTERFACES_TEST_ACSDKEXTERNALMEDIAPLAYERINTERFACES_MOCKEXTERNALMEDIAPLAYERADAPTER_H_
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/acsdkExternalMediaPlayerInterfaces/MockExternalMediaPlayerObserver.h b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/acsdkExternalMediaPlayerInterfaces/MockExternalMediaPlayerObserver.h
new file mode 100644
index 0000000000..4a3b863add
--- /dev/null
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/acsdkExternalMediaPlayerInterfaces/MockExternalMediaPlayerObserver.h
@@ -0,0 +1,56 @@
+/*;
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYERINTERFACES_TEST_ACSDKEXTERNALMEDIAPLAYERINTERFACES_MOCKEXTERNALMEDIAPLAYEROBSERVER_H_
+#define AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYERINTERFACES_TEST_ACSDKEXTERNALMEDIAPLAYERINTERFACES_MOCKEXTERNALMEDIAPLAYEROBSERVER_H_
+
+#include <acsdkExternalMediaPlayerInterfaces/ExternalMediaPlayerObserverInterface.h>
+
+#include <gtest/gtest.h>
+
+namespace alexaClientSDK {
+namespace acsdkExternalMediaPlayerInterfaces {
+namespace test {
+
+/// Mock class for the ExternalMediaPlayerObserverInterface
+class MockExternalMediaPlayerObserver : public ExternalMediaPlayerObserverInterface {
+public:
+    static std::shared_ptr<MockExternalMediaPlayerObserver> getInstance();
+    MOCK_METHOD2(
+        onLoginStateProvided,
+        void(const std::string&, const acsdkExternalMediaPlayerInterfaces::ObservableSessionProperties));
+    MOCK_METHOD2(
+        onPlaybackStateProvided,
+        void(const std::string&, const acsdkExternalMediaPlayerInterfaces::ObservablePlaybackStateProperties));
+
+private:
+    /**
+     * Constructor
+     */
+    MockExternalMediaPlayerObserver();
+};
+
+std::shared_ptr<MockExternalMediaPlayerObserver> MockExternalMediaPlayerObserver::getInstance() {
+    return std::shared_ptr<MockExternalMediaPlayerObserver>(new MockExternalMediaPlayerObserver());
+}
+
+MockExternalMediaPlayerObserver::MockExternalMediaPlayerObserver() {
+}
+
+}  // namespace test
+}  // namespace acsdkExternalMediaPlayerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYERINTERFACES_TEST_ACSDKEXTERNALMEDIAPLAYERINTERFACES_MOCKEXTERNALMEDIAPLAYEROBSERVER_H_
diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/acsdkExternalMediaPlayerInterfaces/MockRenderPlayerInfoCardsProviderRegistrar.h b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/acsdkExternalMediaPlayerInterfaces/MockRenderPlayerInfoCardsProviderRegistrar.h
new file mode 100644
index 0000000000..ddc1861e7c
--- /dev/null
+++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/test/acsdkExternalMediaPlayerInterfaces/MockRenderPlayerInfoCardsProviderRegistrar.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYERINTERFACES_TEST_ACSDKEXTERNALMEDIAPLAYERINTERFACES_MOCKRENDERPLAYERINFOCARDSPROVIDERREGISTRAR_H_
+#define AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYERINTERFACES_TEST_ACSDKEXTERNALMEDIAPLAYERINTERFACES_MOCKRENDERPLAYERINFOCARDSPROVIDERREGISTRAR_H_
+
+#include <gtest/gtest.h>
+
+#include "acsdkExternalMediaPlayerInterfaces/ExternalMediaPlayerInterface.h"
+
+namespace alexaClientSDK {
+namespace acsdkExternalMediaPlayerInterfaces {
+namespace test {
+
+using namespace avsCommon::avs;
+
+using namespace ::testing;
+
+/// Mock class or ExternalMediaPlayer
+class MockExternalMediaPlayer : public ExternalMediaPlayerInterface {
+public:
+    MOCK_METHOD1(setPlayerInFocus, void(const std::string& playerInFocus));
+    MOCK_METHOD2(
+        updateDiscoveredPlayers,
+        void(
+            const std::vector<acsdkExternalMediaPlayerInterfaces::DiscoveredPlayerInfo>& addedPlayers,
+            const std::unordered_set<std::string>& removedPlayers));
+    MOCK_METHOD1(
+        addAdapterHandler,
+        void(std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaAdapterHandlerInterface> adapterHandler));
+    MOCK_METHOD1(
+        removeAdapterHandler,
+        void(std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaAdapterHandlerInterface> adapterHandler));
+    MOCK_METHOD1(
+        addObserver,
+        void(const std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerObserverInterface> observer));
+    MOCK_METHOD1(
+        removeObserver,
+        void(const std::shared_ptr<acsdkExternalMediaPlayerInterfaces::ExternalMediaPlayerObserverInterface> observer));
+};
+
+}  // namespace test
+}  // namespace acsdkExternalMediaPlayerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // AVS_CAPABILITIES_EXTERNALMEDIAPLAYER_ACSDKEXTERNALMEDIAPLAYERINTERFACES_TEST_ACSDKEXTERNALMEDIAPLAYERINTERFACES_MOCKRENDERPLAYERINFOCARDSPROVIDERREGISTRAR_H_
diff --git a/capabilities/InputController/AlexaInputController/CMakeLists.txt b/capabilities/InputController/AlexaInputController/CMakeLists.txt
new file mode 100644
index 0000000000..cc083469f2
--- /dev/null
+++ b/capabilities/InputController/AlexaInputController/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.1)
+project(acsdkAlexaInputController LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
\ No newline at end of file
diff --git a/capabilities/InputController/AlexaInputController/include/acsdk/AlexaInputController/InputControllerFactory.h b/capabilities/InputController/AlexaInputController/include/acsdk/AlexaInputController/InputControllerFactory.h
new file mode 100644
index 0000000000..a1dbf1c5cf
--- /dev/null
+++ b/capabilities/InputController/AlexaInputController/include/acsdk/AlexaInputController/InputControllerFactory.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAINPUTCONTROLLER_INPUTCONTROLLERFACTORY_H_
+#define ACSDK_ALEXAINPUTCONTROLLER_INPUTCONTROLLERFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/AlexaInputControllerInterfaces/InputControllerInterface.h>
+
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/DirectiveSequencerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace alexaInputController {
+
+/**
+ * This factory can be used to create an AlexaInputControllerFactory object which could be a parameter for Capability
+ * Agent construction.
+ */
+class AlexaInputControllerFactory {
+private:
+    /**
+     * This object contains the interfaces to interact with the AlexaInputController Capability Agent.
+     */
+    struct InputControllerCapabilityAgentData {
+        /// An interface used to handle Alexa.InputController directives.
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::DirectiveHandlerInterface> directiveHandler;
+        /// An interface used to provide configurations of the capabilities being implemented by this capability agent.
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::CapabilityConfigurationInterface>
+            capabilityConfigurationInterface;
+        /// The object responsible for cleaning up this capability agent's objects during shutdown.
+        std::shared_ptr<alexaClientSDK::avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+public:
+    /**
+     * Creates a new InputController capability agent configuration.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param inputController An interface that this object will use to perform the input controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isProactivelyReported Whether the input properties change is proactively reported to AVS in a
+     * change report.
+     * @param isRetrievable Whether the input properties can be retrieved when AVS sends a state report
+     * request to the endpoint.
+     * @return An @c Optional object containing an instance of @c InputControllerCapabilityAgentData object if
+     * successful.
+     */
+    static avsCommon::utils::Optional<InputControllerCapabilityAgentData> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<alexaInputControllerInterfaces::InputControllerInterface>& inputController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        bool isProactivelyReported,
+        bool isRetrievable);
+};
+
+}  // namespace alexaInputController
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAINPUTCONTROLLER_INPUTCONTROLLERFACTORY_H_
diff --git a/capabilities/InputController/AlexaInputController/privateInclude/acsdk/AlexaInputController/private/InputControllerCapabilityAgent.h b/capabilities/InputController/AlexaInputController/privateInclude/acsdk/AlexaInputController/private/InputControllerCapabilityAgent.h
new file mode 100644
index 0000000000..fefadef8a5
--- /dev/null
+++ b/capabilities/InputController/AlexaInputController/privateInclude/acsdk/AlexaInputController/private/InputControllerCapabilityAgent.h
@@ -0,0 +1,236 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAINPUTCONTROLLER_PRIVATE_INPUTCONTROLLERCAPABILITYAGENT_H_
+#define ACSDK_ALEXAINPUTCONTROLLER_PRIVATE_INPUTCONTROLLERCAPABILITYAGENT_H_
+
+#include <memory>
+#include <set>
+#include <string>
+#include <unordered_set>
+
+#include <Alexa/AlexaInterfaceMessageSender.h>
+#include <Alexa/AlexaInterfaceMessageSenderInternalInterface.h>
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+#include <acsdk/AlexaInputControllerInterfaces/InputControllerInterface.h>
+
+namespace alexaClientSDK {
+namespace alexaInputController {
+
+/**
+ * The Input Controller Capability Agent provides an implementation for a client to interface with the
+ * Alexa.InputController API.
+ *
+ * @see https://developer.amazon.com/en-US/docs/alexa/device-apis/alexa-inputcontroller.html
+ *
+ * AVS sends SelectInput directives to the device to switch the input.
+ *
+ */
+class AlexaInputControllerCapabilityAgent
+        : public avsCommon::avs::CapabilityAgent
+        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public alexaInputControllerInterfaces::InputControllerObserverInterface
+        , public std::enable_shared_from_this<AlexaInputControllerCapabilityAgent> {
+public:
+    /// Alias to improve readability.
+    using EndpointIdentifier = avsCommon::sdkInterfaces::endpoints::EndpointIdentifier;
+
+    /**
+     * Creates an instance of the @c InputControllerCapabilityAgent.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param inputController An interface that this object will use to perform the input controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isProactivelyReported Whether the input state properties change is proactively reported to AVS in a
+     * change report.
+     * @param isRetrievable Whether the input state properties can be retrieved when AVS sends a state report
+     * request to the endpoint.
+     * @return @c nullptr if the inputs are invalid, else a new instance of @c AlexaInputControllerCapabilityAgent.
+     */
+    static std::shared_ptr<AlexaInputControllerCapabilityAgent> create(
+        avsCommon::sdkInterfaces::endpoints::EndpointIdentifier endpointId,
+        std::shared_ptr<alexaInputControllerInterfaces::InputControllerInterface> inputController,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        bool isProactivelyReported,
+        bool isRetrievable);
+
+    /**
+     * Destructor.
+     */
+    ~AlexaInputControllerCapabilityAgent();
+
+    /// @name CapabilityAgent Functions
+    /// @{
+    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info) override;
+    /// @}
+
+    /// @name StateProviderInterface Functions
+    /// @{
+    void provideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken) override;
+    bool canStateBeRetrieved() override;
+    bool hasReportableStateProperties() override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
+    /// @}
+
+    /// @name InputControllerObserverInterface Functions
+    /// @{
+    void onInputChanged(alexaInputControllerInterfaces::Input input) override;
+    /// @}
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param endpointId A endpoint to which this capability is associated.
+     * @param inputController An interface that this object will use to perform the input controller operations.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @param isProactivelyReported Whether the channel state properties change is proactively reported to AVS in a
+     * change report.
+     * @param isRetrievable Whether the channel state properties can be retrieved when AVS sends a state report
+     * request to the endpoint.
+     */
+    AlexaInputControllerCapabilityAgent(
+        EndpointIdentifier endpointId,
+        std::shared_ptr<alexaInputControllerInterfaces::InputControllerInterface> inputController,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        bool isProactivelyReported,
+        bool isRetrievable);
+
+    /**
+     * Initializes the object.
+     */
+    bool initialize();
+
+    /**
+     * Helper function to process the incoming directive
+     *
+     * @param info Directive to be processed.
+     * @param[out] errMessage Error message associated to failure to process the directive
+     * @param[out] type Error type associated to failure to process the directive
+     * @return A bool indicating the success of processing the directive
+     */
+    bool executeHandleDirectiveHelper(
+        std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info,
+        std::string* errMessage,
+        avsCommon::avs::ExceptionErrorType* type);
+
+    /**
+     * Gets the current power state from endpoint and notifies @c ContextManager
+     *
+     * @param stateProviderName Provides the property name and used in the @c ContextManager methods.
+     * @param contextRequestToken The token to be used when providing the response to @c ContextManager
+     */
+    void executeProvideState(
+        const avsCommon::avs::CapabilityTag& stateProviderName,
+        const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken);
+
+    /**
+     * Send event based the endpoint's response for a controller method call.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param result This contains the endpoint's response of a controller call.
+     */
+    void sendResponseEvent(
+        const std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo>& info,
+        const alexaInputControllerInterfaces::InputControllerInterface::Response& result);
+
+    /**
+     * Send Alexa interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaErrorResponseType Alexa interface error response type.
+     * @param responseMessage Alexa interface error response message.
+     */
+    void sendAlexaErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+        const std::string& responseMessage);
+
+    /**
+     * Helper method to build the @c CapabilityState
+     *
+     * @param input The input name
+     */
+    avsCommon::avs::CapabilityState buildCapabilityState(alexaInputControllerInterfaces::Input input);
+
+    /// Endpoint the capability agent associated to.
+    EndpointIdentifier m_endpointId;
+
+    /// Whether the power state property change is proactively reported to Alexa in a change report.
+    bool m_isProactivelyReported;
+
+    /// Whether the power state property can be retrieved when Alexa sends a state report request to the endpoint.
+    bool m_isRetrievable;
+
+    /// Set of capability configurations that will get published using Capabilities API
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> m_capabilityConfigurations;
+
+    /// The object to handle input change events.
+    std::shared_ptr<alexaInputControllerInterfaces::InputControllerInterface> m_inputController;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The @c AlexaInterfaceMessageSenderInterface used to send event messages.
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> m_responseSender;
+
+    /// The configuration of the inputs.
+    alexaInputControllerInterfaces::InputControllerInterface::SupportedInputs m_supportedInputs;
+
+    /**
+     * @c Executor which queues up operations from asynchronous API calls.
+     *
+     * @note This declaration needs to come *after* the Executor Thread Variables above so that the thread shuts down
+     * before the Executor Thread Variables are destroyed.
+     */
+    avsCommon::utils::threading::Executor m_executor;
+};
+
+}  // namespace alexaInputController
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAINPUTCONTROLLER_PRIVATE_INPUTCONTROLLERCAPABILITYAGENT_H_
diff --git a/capabilities/InputController/AlexaInputController/src/CMakeLists.txt b/capabilities/InputController/AlexaInputController/src/CMakeLists.txt
new file mode 100644
index 0000000000..a5d5018a66
--- /dev/null
+++ b/capabilities/InputController/AlexaInputController/src/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkAlexaInputController")
+
+add_library(acsdkAlexaInputController SHARED
+        InputControllerCapabilityAgent.cpp
+        InputControllerFactory.cpp)
+
+target_include_directories(acsdkAlexaInputController PUBLIC
+        "${acsdkAlexaInputController_SOURCE_DIR}/include")
+
+target_include_directories(acsdkAlexaInputController PRIVATE
+        "${acsdkAlexaInputController_SOURCE_DIR}/privateInclude")
+
+target_link_libraries(acsdkAlexaInputController
+        acsdkAlexaInputControllerInterfaces
+        acsdkShutdownManagerInterfaces
+        Alexa
+        AVSCommon)
+
+# install target
+asdk_install()
diff --git a/capabilities/InputController/AlexaInputController/src/InputControllerCapabilityAgent.cpp b/capabilities/InputController/AlexaInputController/src/InputControllerCapabilityAgent.cpp
new file mode 100644
index 0000000000..f9e721157b
--- /dev/null
+++ b/capabilities/InputController/AlexaInputController/src/InputControllerCapabilityAgent.cpp
@@ -0,0 +1,502 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/AlexaInputController/private/InputControllerCapabilityAgent.h"
+
+#include <AVSCommon/AVS/NamespaceAndName.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
+
+namespace alexaClientSDK {
+namespace alexaInputController {
+
+using namespace rapidjson;
+using namespace alexaInputControllerInterfaces;
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::json;
+using namespace json::jsonUtils;
+
+/// String to identify log entries originating from this file.
+#define TAG "AlexaInputControllerCapabilityAgent"
+
+/*
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+/// The namespace for this capability agent.
+static const std::string NAMESPACE = "Alexa.InputController";
+
+/// The name for the SelectInput directive.
+static const std::string NAME_SELECT_INPUT{"SelectInput"};
+
+/// InputController capability constants
+/// The AlexaInterface constant type.
+static const std::string ALEXA_INTERFACE_TYPE = "AlexaInterface";
+
+/// Interface version.
+static const std::string INTERFACE_VERSION = "3";
+
+/// The configuration key
+static const std::string CAPABILITY_INPUTS_KEY{"inputs"};
+
+/// Payload input key
+static const std::string INPUT_CONTROLLER_INPUT_KEY{"input"};
+
+/// Payload name key
+static const std::string INPUT_CONTROLLER_CONFIGURATION_NAME_KEY{"name"};
+
+/// The name of inputState property
+static const std::string INPUT_PROPERTY_NAME{"input"};
+
+/// The name of friendlyName property
+static const std::string FRIENDLY_NAME_PROPERTY_NAME{"friendlyNames"};
+
+std::shared_ptr<AlexaInputControllerCapabilityAgent> AlexaInputControllerCapabilityAgent::create(
+    endpoints::EndpointIdentifier endpointId,
+    std::shared_ptr<alexaInputControllerInterfaces::InputControllerInterface> inputController,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+    bool isProactivelyReported,
+    bool isRetrievable) {
+    if (endpointId.empty()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "emptyEndpointId"));
+        return nullptr;
+    }
+    if (!inputController) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullInputController"));
+        return nullptr;
+    }
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManager"));
+        return nullptr;
+    }
+    if (!responseSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullResponseSender"));
+        return nullptr;
+    }
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    auto inputControllerCapabilityAgent =
+        std::shared_ptr<AlexaInputControllerCapabilityAgent>(new AlexaInputControllerCapabilityAgent(
+            std::move(endpointId),
+            std::move(inputController),
+            std::move(contextManager),
+            std::move(responseSender),
+            std::move(exceptionSender),
+            isProactivelyReported,
+            isRetrievable));
+
+    if (!inputControllerCapabilityAgent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "instantiationFailed"));
+        return nullptr;
+    }
+
+    if (!inputControllerCapabilityAgent->initialize()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "initializationFailed"));
+        return nullptr;
+    }
+
+    return inputControllerCapabilityAgent;
+}
+
+AlexaInputControllerCapabilityAgent::AlexaInputControllerCapabilityAgent(
+    endpoints::EndpointIdentifier endpointId,
+    std::shared_ptr<alexaInputControllerInterfaces::InputControllerInterface> inputController,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+    bool isProactivelyReported,
+    bool isRetrievable) :
+        CapabilityAgent{NAMESPACE, exceptionSender},
+        RequiresShutdown{"AlexaInputControllerCapabilityAgent"},
+        m_endpointId{std::move(endpointId)},
+        m_isProactivelyReported{isProactivelyReported},
+        m_isRetrievable{isRetrievable},
+        m_inputController{std::move(inputController)},
+        m_contextManager{std::move(contextManager)},
+        m_responseSender{std::move(responseSender)} {
+}
+
+void AlexaInputControllerCapabilityAgent::doShutdown() {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!m_executor.isShutdown()) {
+        m_executor.shutdown();
+    }
+
+    if (m_isProactivelyReported) {
+        m_inputController->removeObserver(shared_from_this());
+    }
+    m_inputController.reset();
+    m_responseSender.reset();
+    if (m_isRetrievable) {
+        m_contextManager->removeStateProvider({NAMESPACE, INPUT_PROPERTY_NAME, m_endpointId});
+    }
+    m_contextManager.reset();
+}
+
+bool AlexaInputControllerCapabilityAgent::initialize() {
+    ACSDK_DEBUG9(LX(__func__));
+    m_supportedInputs = m_inputController->getSupportedInputs();
+    if (m_supportedInputs.empty()) {
+        ACSDK_ERROR(LX("initializeFailed").d("reason", "emptySupportedInputsSet"));
+        return false;
+    }
+
+    if (m_isProactivelyReported) {
+        if (!m_inputController->addObserver(shared_from_this())) {
+            ACSDK_ERROR(LX("initializeFailed").d("reason", "addObserverFailed"));
+            return false;
+        }
+    }
+    if (m_isRetrievable) {
+        m_contextManager->addStateProvider({NAMESPACE, INPUT_PROPERTY_NAME, m_endpointId}, shared_from_this());
+    }
+    return true;
+}
+
+AlexaInputControllerCapabilityAgent::~AlexaInputControllerCapabilityAgent() {
+    ACSDK_DEBUG9(LX(__func__));
+}
+
+DirectiveHandlerConfiguration AlexaInputControllerCapabilityAgent::getConfiguration() const {
+    DirectiveHandlerConfiguration configuration;
+    configuration[{NAMESPACE, NAME_SELECT_INPUT, m_endpointId}] = BlockingPolicy(BlockingPolicy::MEDIUMS_NONE, false);
+    return configuration;
+}
+
+void AlexaInputControllerCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!directive) {
+        ACSDK_ERROR(LX("handleDirectiveImmediatelyFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+}
+
+void AlexaInputControllerCapabilityAgent::preHandleDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
+    // No-op
+}
+
+bool AlexaInputControllerCapabilityAgent::executeHandleDirectiveHelper(
+    std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    std::string* errMessage,
+    ExceptionErrorType* type) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!errMessage) {
+        ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "nullErrMessage"));
+        return false;
+    }
+
+    if (!type) {
+        ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "nullType"));
+        return false;
+    }
+
+    if (!info) {
+        ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "nullInfo"));
+        return false;
+    }
+
+    if (!info->directive) {
+        ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "nullDirective"));
+        return false;
+    }
+
+    if (!info->directive->getEndpoint().hasValue() ||
+        (info->directive->getEndpoint().value().endpointId != m_endpointId)) {
+        ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "endpointIdMismatch"));
+        *errMessage = "EndpointId Mismatch";
+        *type = ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED;
+        return false;
+    }
+
+    const std::string directiveName = info->directive->getName();
+
+    Document payload(kObjectType);
+    ParseResult result = payload.Parse(info->directive->getPayload());
+    if (!result) {
+        ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "directiveParseFailed"));
+        *errMessage = "Parse failure";
+        *type = ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED;
+        return false;
+    }
+
+    if (NAME_SELECT_INPUT == directiveName) {
+        rapidjson::Value::ConstMemberIterator it;
+        std::string inputString;
+        if (!retrieveValue(payload, INPUT_CONTROLLER_INPUT_KEY, &inputString)) {
+            ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "missingInputField"));
+            *errMessage = "Input field is not accessible";
+            *type = ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED;
+            return false;
+        }
+        if (inputString.empty()) {
+            ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "inputIsEmptyString"));
+            *errMessage = "Input is an Empty String";
+            *type = ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED;
+            return false;
+        }
+        auto input = alexaInputControllerInterfaces::stringToInput(inputString);
+        if (!input.hasValue()) {
+            ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "InvalidInputReceived"));
+            *errMessage = "Input is invalid";
+            *type = ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED;
+            return false;
+        }
+
+        auto inputResult = m_inputController->setInput(input.value());
+        sendResponseEvent(info, inputResult);
+    } else {
+        *errMessage = directiveName + " not supported";
+        *type = ExceptionErrorType::UNSUPPORTED_OPERATION;
+        return false;
+    }
+
+    return true;
+}
+
+void AlexaInputControllerCapabilityAgent::handleDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+
+    m_executor.execute([this, info] {
+        std::string errMessage;
+        ExceptionErrorType errType;
+
+        if (executeHandleDirectiveHelper(info, &errMessage, &errType)) {
+            if (info->result) {
+                info->result->setCompleted();
+            }
+        } else {
+            ACSDK_ERROR(LX("processDirectiveFailed").d("reason", errMessage));
+            m_exceptionEncounteredSender->sendExceptionEncountered(
+                info->directive->getUnparsedDirective(), errType, errMessage);
+            if (info->result) {
+                info->result->setFailed(errMessage);
+            }
+        }
+        removeDirective(info->directive->getMessageId());
+    });
+}
+
+void AlexaInputControllerCapabilityAgent::cancelDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("cancelDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    if (!info->directive->getEndpoint().hasValue() ||
+        info->directive->getEndpoint().value().endpointId != m_endpointId) {
+        ACSDK_WARN(LX("cancelDirective").d("reason", "notExpectedEndpointId"));
+    }
+    CapabilityAgent::removeDirective(info->directive->getMessageId());
+}
+
+/*
+ * Helper function to create a json array based on @c SupportedInputsSet.
+ *
+ * The format of the json is this:
+ *
+ *
+ * @code{.json}
+ * [
+ *     {
+ *         "name": "{{STRING}}",
+ *         "friendlyNames": ["{{STRING}}", ...]
+ *     },
+ *     {
+ *         "name": "{{STRING}}",
+ *         "friendlyNames": ["{{STRING}}", ...]
+ *     }
+ * ]
+ * @endcode
+ *
+ * @param inputSet The inputsSet.
+ * @return A json string.
+ */
+static std::string getInputArrayJson(const InputControllerInterface::SupportedInputs& inputSet) {
+    std::string json;
+    rapidjson::Document inputsJson(rapidjson::kArrayType);
+    auto& alloc = inputsJson.GetAllocator();
+    for (const auto& input : inputSet) {
+        rapidjson::Document payloadJson(rapidjson::kObjectType);
+        payloadJson.AddMember(
+            rapidjson::StringRef(INPUT_CONTROLLER_CONFIGURATION_NAME_KEY),
+            alexaInputControllerInterfaces::inputToString(input.first),
+            alloc);
+
+        rapidjson::Value friendlyNamesArrayJson(rapidjson::kArrayType);
+        for (const auto& friendlyName : input.second) {
+            rapidjson::Value value;
+            value.SetString(friendlyName.c_str(), friendlyName.length(), alloc);
+            friendlyNamesArrayJson.PushBack(value, alloc);
+        }
+        payloadJson.AddMember(rapidjson::StringRef(FRIENDLY_NAME_PROPERTY_NAME), friendlyNamesArrayJson, alloc);
+        inputsJson.PushBack(payloadJson, alloc);
+    }
+
+    rapidjson::StringBuffer sb;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(sb);
+    inputsJson.Accept(writer);
+
+    json = sb.GetString();
+    return json;
+}
+
+std::unordered_set<std::shared_ptr<CapabilityConfiguration>> AlexaInputControllerCapabilityAgent::
+    getCapabilityConfigurations() {
+    auto additionalConfigurations = CapabilityConfiguration::AdditionalConfigurations();
+    additionalConfigurations[CAPABILITY_INPUTS_KEY] = getInputArrayJson(m_supportedInputs);
+
+    CapabilityConfiguration configuration{CapabilityConfiguration::ALEXA_INTERFACE_TYPE,
+                                          NAMESPACE,
+                                          INTERFACE_VERSION,
+                                          avsCommon::utils::Optional<std::string>(),
+                                          Optional<CapabilityConfiguration::Properties>(
+                                              {m_isRetrievable, m_isProactivelyReported, {INPUT_PROPERTY_NAME}}),
+                                          additionalConfigurations};
+
+    return {std::make_shared<avsCommon::avs::CapabilityConfiguration>(configuration)};
+}
+
+void AlexaInputControllerCapabilityAgent::provideState(
+    const CapabilityTag& stateProviderName,
+    const avsCommon::sdkInterfaces::ContextRequestToken contextRequestToken) {
+    ACSDK_DEBUG9(
+        LX(__func__).d("contextRequestToken", contextRequestToken).sensitive("stateProviderName", stateProviderName));
+
+    m_executor.execute([this, stateProviderName, contextRequestToken] {
+        ACSDK_DEBUG9(LX("provideStateInExecutor"));
+        executeProvideState(stateProviderName, contextRequestToken);
+    });
+}
+
+bool AlexaInputControllerCapabilityAgent::canStateBeRetrieved() {
+    ACSDK_DEBUG9(LX(__func__));
+    return m_isRetrievable;
+}
+
+bool AlexaInputControllerCapabilityAgent::hasReportableStateProperties() {
+    ACSDK_DEBUG9(LX(__func__));
+    return m_isRetrievable || m_isProactivelyReported;
+}
+
+void AlexaInputControllerCapabilityAgent::onInputChanged(Input input) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!m_isProactivelyReported) {
+        ACSDK_ERROR(LX("onInputChangedFailed").d("reason", "invalidOnInputChangedCall"));
+        return;
+    }
+
+    m_executor.execute([this, input] {
+        m_contextManager->reportStateChange(
+            CapabilityTag(NAMESPACE, INPUT_PROPERTY_NAME, m_endpointId),
+            buildCapabilityState(input),
+            AlexaStateChangeCauseType::VOICE_INTERACTION);
+    });
+}
+
+void AlexaInputControllerCapabilityAgent::executeProvideState(
+    const CapabilityTag& stateProviderName,
+    const ContextRequestToken contextRequestToken) {
+    ACSDK_DEBUG9(LX("executeProvideState"));
+
+    if (stateProviderName.endpointId != m_endpointId) {
+        ACSDK_ERROR(LX("provideStateFailed")
+                        .d("reason", "notExpectedEndpointId")
+                        .sensitive("endpointId", stateProviderName.endpointId));
+        m_contextManager->provideStateUnavailableResponse(stateProviderName, contextRequestToken, false);
+        return;
+    }
+    if (stateProviderName.name != INPUT_PROPERTY_NAME) {
+        ACSDK_ERROR(LX("provideStateFailed").d("reason", "notExpectedName").sensitive("name", stateProviderName.name));
+        m_contextManager->provideStateUnavailableResponse(stateProviderName, contextRequestToken, false);
+        return;
+    }
+    if (!m_isRetrievable) {
+        ACSDK_ERROR(LX("provideStateFailed").d("reason", "provideStateOnNotRetrievableProperty"));
+        m_contextManager->provideStateUnavailableResponse(stateProviderName, contextRequestToken, false);
+        return;
+    }
+
+    Input input = m_inputController->getInput();
+    m_contextManager->provideStateResponse(stateProviderName, buildCapabilityState(input), contextRequestToken);
+}
+
+void AlexaInputControllerCapabilityAgent::sendAlexaErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+    const std::string& responseMessage) {
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        alexaErrorResponseType,
+        responseMessage);
+}
+
+void AlexaInputControllerCapabilityAgent::sendResponseEvent(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo>& info,
+    const InputControllerInterface::Response& result) {
+    switch (result.type) {
+        case InputControllerInterface::Response::Type::SUCCESS: {
+            m_responseSender->sendResponseEvent(
+                info->directive->getInstance(),
+                info->directive->getCorrelationToken(),
+                AVSMessageEndpoint(m_endpointId));
+            break;
+        }
+        case InputControllerInterface::Response::Type::FAILED_INVALID_VALUE:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INVALID_VALUE, result.errorMessage);
+            break;
+        case InputControllerInterface::Response::Type::FAILED_TOO_MANY_FAILED_ATTEMPTS:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+        case InputControllerInterface::Response::Type::FAILED_ENDPOINT_UNREACHABLE:
+            sendAlexaErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::ErrorResponseType::ENDPOINT_UNREACHABLE,
+                result.errorMessage);
+            break;
+        case InputControllerInterface::Response::Type::FAILED_INTERNAL_ERROR:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+    }
+}
+
+CapabilityState AlexaInputControllerCapabilityAgent::buildCapabilityState(Input input) {
+    return CapabilityState("\"" + alexaInputControllerInterfaces::inputToString(input) + "\"");
+}
+
+}  // namespace alexaInputController
+}  // namespace alexaClientSDK
diff --git a/capabilities/InputController/AlexaInputController/src/InputControllerFactory.cpp b/capabilities/InputController/AlexaInputController/src/InputControllerFactory.cpp
new file mode 100644
index 0000000000..6b764527b9
--- /dev/null
+++ b/capabilities/InputController/AlexaInputController/src/InputControllerFactory.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/AlexaInputController/private/InputControllerCapabilityAgent.h"
+#include "acsdk/AlexaInputController/InputControllerFactory.h"
+
+namespace alexaClientSDK {
+namespace alexaInputController {
+
+avsCommon::utils::Optional<AlexaInputControllerFactory::InputControllerCapabilityAgentData>
+AlexaInputControllerFactory::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<alexaInputControllerInterfaces::InputControllerInterface>& handler,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+    bool isProactivelyReported,
+    bool isRetrievable) {
+    auto inputControllerCA = AlexaInputControllerCapabilityAgent::create(
+        endpointId, handler, contextManager, responseSender, exceptionSender, isProactivelyReported, isRetrievable);
+    if (inputControllerCA) {
+        return avsCommon::utils::Optional<AlexaInputControllerFactory::InputControllerCapabilityAgentData>(
+            {inputControllerCA, inputControllerCA, inputControllerCA});
+    }
+    return avsCommon::utils::Optional<AlexaInputControllerFactory::InputControllerCapabilityAgentData>();
+}
+
+}  // namespace alexaInputController
+}  // namespace alexaClientSDK
diff --git a/capabilities/InputController/AlexaInputController/test/CMakeLists.txt b/capabilities/InputController/AlexaInputController/test/CMakeLists.txt
new file mode 100644
index 0000000000..818ea9e18c
--- /dev/null
+++ b/capabilities/InputController/AlexaInputController/test/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+    "${acsdkAlexaInputController_INCLUDE_DIR}"
+    "${acsdkAlexaInputController_SOURCE_DIR}/include"
+    "${acsdkAlexaInputController_SOURCE_DIR}/privateInclude"
+    "${ASDK_INCLUDE_DIRS}")
+
+set(LIBS
+    "AttachmentCommonTestLib"
+    "acsdkAlexaInputController"
+    "SDKInterfacesTests")
+
+discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
diff --git a/capabilities/InputController/AlexaInputController/test/InputControllerCapabilityAgentTest.cpp b/capabilities/InputController/AlexaInputController/test/InputControllerCapabilityAgentTest.cpp
new file mode 100644
index 0000000000..6bd6fe0c66
--- /dev/null
+++ b/capabilities/InputController/AlexaInputController/test/InputControllerCapabilityAgentTest.cpp
@@ -0,0 +1,455 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <chrono>
+#include <memory>
+#include <string>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/MockContextManager.h>
+#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/SDKInterfaces/MockAlexaInterfaceMessageSender.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/WaitEvent.h>
+
+#include "acsdk/AlexaInputController/private/InputControllerCapabilityAgent.h"
+
+namespace alexaClientSDK {
+namespace alexaInputController {
+namespace test {
+
+using namespace ::testing;
+using namespace alexaInputControllerInterfaces;
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::sdkInterfaces::test;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::memory;
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// Time of sample used for testing
+static const std::string TIME_OF_SAMPLE_TEST("2017-02-03T16:20:50.523Z");
+
+/// The test EndpointId
+static const endpoints::EndpointIdentifier TEST_ENDPOINT_ID("testEndpointId");
+
+/// The namespace for capability agent.
+static const std::string NAMESPACE{"Alexa.InputController"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"3"};
+
+/// The name for SelectInput directive
+static const std::string NAME_SETMODE{"SelectInput"};
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
+
+/// The name for modeValue property
+static const std::string INPUT_PROPERTY_NAME{"input"};
+
+/// Event key.
+static const std::string EVENT("event");
+
+/// Header key.
+static const std::string HEADER("header");
+
+/// MessageId key.
+static const std::string MESSAGE_ID("messageId");
+
+/// MessageId for testing.
+static const std::string MESSAGE_ID_TEST("MessageId_Test");
+
+/// CD Input string for testing.
+static const Input CD_INPUT_TEST = Input::CD;
+
+/// HDMI 1 Input string for testing.
+static const Input HDMI_1_INPUT_TEST = Input::HDMI_1;
+
+/// Dialog request Id key.
+static const std::string DIALOG_REQUEST_ID("dialogRequestId");
+
+/// DialogRequestId for testing.
+static const std::string DIALOG_REQUEST_ID_TEST("DialogRequestId_Test");
+
+/// Correlation token for testing.
+static const std::string CORRELATION_TOKEN_TEST("CorrelationToken_Test");
+
+/// Event correlation for testing.
+static const std::string EVENT_CORRELATION_TOKEN_TEST("EventCorrelationToken_Test");
+
+static const InputControllerInterface::SupportedInputs DEFAULT_ALLOWED_INPUT{{Input::HDMI_1, {"HDMI1"}},
+                                                                             {Input::CD, {"CD"}}};
+
+/// A simple SelectInput directive JSON string.
+static const std::string SELECT_INPUT_DIRECTIVE_JSON_STRING = R"delim(
+    {
+        "input": "HDMI 1"
+    }
+)delim";
+
+/// A simple SelectInput directive JSON string.
+static const std::string SELECT_INPUT_UNSUPPORTED_DIRECTIVE_JSON_STRING = R"delim(
+    {
+        "input": "HDMI 99"
+    }
+)delim";
+
+/// A SelectInput directive without input field
+static const std::string SELECT_INPUT_MISSING_TAG_DIRECTIVE_JSON_STRING = R"delim(
+    {
+    }
+)delim";
+
+/// A SelectInput directive with an empty input
+static const std::string SELECT_INPUT_EMPTY_INPUT_DIRECTIVE_JSON_STRING = R"delim(
+    {
+        "input": ""
+    }
+)delim";
+
+class MockHandler : public InputControllerInterface {
+public:
+    MOCK_METHOD0(getSupportedInputsMock, SupportedInputs());
+    MOCK_METHOD1(setInputMock, InputControllerInterface::Response(Input));
+    MOCK_METHOD0(getInputMock, Input());
+    MOCK_METHOD1(addObserverMock, bool(std::weak_ptr<InputControllerObserverInterface>));
+    MOCK_METHOD1(removeObserverMock, void(std::weak_ptr<InputControllerObserverInterface>));
+
+    SupportedInputs getSupportedInputs() {
+        return getSupportedInputsMock();
+    }
+
+    InputControllerInterface::Response setInput(Input input) {
+        return setInputMock(input);
+    }
+
+    Input getInput() {
+        return getInputMock();
+    }
+
+    bool addObserver(std::weak_ptr<InputControllerObserverInterface> observer) {
+        return addObserverMock(observer);
+    }
+
+    void removeObserver(std::weak_ptr<InputControllerObserverInterface> observer) {
+        removeObserverMock(observer);
+    }
+};
+
+/// Test harness for @c InputControllerCapabilityAgentTest class.
+class InputControllerCapabilityAgentTest : public Test {
+public:
+    /// Set up the test harness for running a test.
+    void SetUp() override;
+
+protected:
+    /**
+     * Function to create ModeControllerCapabilityAgent based on the reportable flags
+     * and sets required ContextManager and ModeController mocks.
+     */
+    std::shared_ptr<AlexaInputControllerCapabilityAgent> createCapabilityAgentAndSetExpects(
+        const InputControllerInterface::SupportedInputs& supportedInputsSet,
+        bool proactivelyReported,
+        bool retrievable);
+
+    /// The AlexaInputControllerCapabilityAgent instance to be tested
+    std::shared_ptr<AlexaInputControllerCapabilityAgent> m_inputControllerCA;
+
+    // a context manager
+    std::shared_ptr<StrictMock<MockContextManager>> m_mockContextManager;
+
+    /// A mock @c InputControllerObserverInterface object.
+    std::weak_ptr<InputControllerObserverInterface> m_observer;
+
+    /// A mock @c InputControllerInterface object.
+    std::shared_ptr<StrictMock<MockHandler>> m_mockInputHandler;
+
+    /// Response sender mock to track events being sent.
+    std::shared_ptr<MockAlexaInterfaceMessageSender> m_mockResponseSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<MockDirectiveHandlerResult>> m_mockDirectiveHandlerResult;
+
+    // A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    InputControllerInterface::SupportedInputs m_supportedInputs;
+};
+
+void InputControllerCapabilityAgentTest::SetUp() {
+    m_mockExceptionSender = std::make_shared<StrictMock<MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult = make_unique<StrictMock<MockDirectiveHandlerResult>>();
+    m_mockInputHandler = std::make_shared<StrictMock<MockHandler>>();
+    m_mockContextManager = std::make_shared<testing::StrictMock<MockContextManager>>();
+    m_mockResponseSender = std::make_shared<MockAlexaInterfaceMessageSender>();
+}
+
+std::shared_ptr<AlexaInputControllerCapabilityAgent> InputControllerCapabilityAgentTest::
+    createCapabilityAgentAndSetExpects(
+        const InputControllerInterface::SupportedInputs& inputSupportedSet,
+        bool proactivelyReported,
+        bool retrievable) {
+    m_supportedInputs = inputSupportedSet;
+    // ContextManager Mocks
+    if (retrievable) {
+        // Expects a non-null CA reference during create.
+        EXPECT_CALL(*m_mockContextManager, addStateProvider(_, ::testing::NotNull()));
+
+        // Expects a null when CA is shutdown.
+        EXPECT_CALL(*m_mockContextManager, removeStateProvider(_));
+    }
+
+    if (proactivelyReported) {
+        // addObserver Called during the initialization.
+        EXPECT_CALL(*m_mockInputHandler, addObserverMock(_))
+            .WillOnce(WithArg<0>(Invoke([this](std::weak_ptr<InputControllerObserverInterface> observer) {
+                m_observer = observer;
+                return true;
+            })));
+
+        // removeObserver is called during the shutdown
+        EXPECT_CALL(*m_mockInputHandler, removeObserverMock(_))
+            .WillOnce(WithArg<0>(
+                Invoke([this](std::weak_ptr<InputControllerObserverInterface> observer) { m_observer.reset(); })));
+    }
+
+    auto inputControllerCA = AlexaInputControllerCapabilityAgent::create(
+        TEST_ENDPOINT_ID,
+        m_mockInputHandler,
+        m_mockContextManager,
+        m_mockResponseSender,
+        m_mockExceptionSender,
+        proactivelyReported,
+        retrievable);
+
+    return inputControllerCA;
+}
+
+/**
+ * Utility function to build the @c AVSDirective for test.
+ *
+ * @param directiveName The name of the test directive to build.
+ * @param payload The unparsed payload of directive in JSON.
+ *
+ * @return The created AVSDirective object or @c nullptr if build failed.
+ */
+static std::shared_ptr<AVSDirective> buildAVSDirective(
+    std::string directiveName,
+    std::string payload,
+    std::string messageId = MESSAGE_ID_TEST) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<avsCommon::avs::attachment::test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(
+        NAMESPACE,
+        directiveName,
+        messageId,
+        DIALOG_REQUEST_ID_TEST,
+        CORRELATION_TOKEN_TEST,
+        EVENT_CORRELATION_TOKEN_TEST,
+        INTERFACE_VERSION,
+        TEST_ENDPOINT_ID);
+    auto avsMessageEndpoint = AVSMessageEndpoint(TEST_ENDPOINT_ID);
+
+    return AVSDirective::create("", avsMessageHeader, payload, attachmentManager, "", avsMessageEndpoint);
+}
+
+/// Test that create() returns a nullptr if called with invalid arguments.
+TEST_F(InputControllerCapabilityAgentTest, test_givenInvalidParameters_create_shouldFail) {
+    ASSERT_THAT(
+        AlexaInputControllerCapabilityAgent::create(
+            "", m_mockInputHandler, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender, true, true),
+        IsNull());
+    EXPECT_THAT(
+        AlexaInputControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, nullptr, m_mockContextManager, m_mockResponseSender, m_mockExceptionSender, true, true),
+        IsNull());
+    EXPECT_THAT(
+        AlexaInputControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockInputHandler, nullptr, m_mockResponseSender, m_mockExceptionSender, true, true),
+        IsNull());
+    EXPECT_THAT(
+        AlexaInputControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockInputHandler, m_mockContextManager, nullptr, m_mockExceptionSender, true, true),
+        IsNull());
+    EXPECT_THAT(
+        AlexaInputControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID, m_mockInputHandler, m_mockContextManager, m_mockResponseSender, nullptr, true, true),
+        IsNull());
+}
+
+/**
+ * Test successful handling of SelectInput directive.
+ */
+TEST_F(InputControllerCapabilityAgentTest, test_selectInputDirective_successCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockInputHandler, getSupportedInputsMock()).WillOnce(InvokeWithoutArgs([] {
+        return DEFAULT_ALLOWED_INPUT;
+    }));
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockInputHandler, setInputMock(HDMI_1_INPUT_TEST)).WillOnce(InvokeWithoutArgs([] {
+        return InputControllerInterface::Response();
+    }));
+
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _));
+
+    auto inputControllerCapabilityAgent = createCapabilityAgentAndSetExpects(DEFAULT_ALLOWED_INPUT, false, true);
+    ASSERT_THAT(inputControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    inputControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(NAME_SETMODE, SELECT_INPUT_DIRECTIVE_JSON_STRING), std::move(m_mockDirectiveHandlerResult));
+    inputControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    inputControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of SelectInput directive.
+ */
+TEST_F(InputControllerCapabilityAgentTest, test_selectInputDirective_errorCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockInputHandler, getSupportedInputsMock()).WillOnce(InvokeWithoutArgs([] {
+        return DEFAULT_ALLOWED_INPUT;
+    }));
+
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    EXPECT_CALL(*m_mockInputHandler, setInputMock(HDMI_1_INPUT_TEST)).WillOnce(InvokeWithoutArgs([] {
+        InputControllerInterface::Response response;
+        response.type = InputControllerInterface::Response::Type::FAILED_ENDPOINT_UNREACHABLE;
+        response.errorMessage = "TestEndpointNotReachable";
+        return response;
+    }));
+
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(
+            _, _, _, Matcher<AlexaInterfaceMessageSenderInterface::ErrorResponseType>(testing::_), _));
+
+    auto inputControllerCapabilityAgent = createCapabilityAgentAndSetExpects(DEFAULT_ALLOWED_INPUT, false, true);
+    ASSERT_THAT(inputControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    inputControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        buildAVSDirective(NAME_SETMODE, SELECT_INPUT_DIRECTIVE_JSON_STRING), std::move(m_mockDirectiveHandlerResult));
+    inputControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    inputControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test triggering of reportStateChange and subsequent call to the
+ * ContextManager to build the context.
+ */
+TEST_F(InputControllerCapabilityAgentTest, test_reportStateChange_successCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockInputHandler, getSupportedInputsMock()).WillOnce(InvokeWithoutArgs([] {
+        return DEFAULT_ALLOWED_INPUT;
+    }));
+
+    auto inputControllerCapabilityAgent = createCapabilityAgentAndSetExpects(DEFAULT_ALLOWED_INPUT, true, true);
+    ASSERT_THAT(inputControllerCapabilityAgent, NotNull());
+
+    EXPECT_CALL(*m_mockInputHandler, setInputMock(CD_INPUT_TEST)).WillOnce(InvokeWithoutArgs([this] {
+        auto m_observer_shared = m_observer.lock();
+        m_observer_shared->onInputChanged(CD_INPUT_TEST);
+        return InputControllerInterface::Response();
+    }));
+
+    EXPECT_CALL(*m_mockContextManager, reportStateChange(_, _, _))
+        .WillOnce(InvokeWithoutArgs([inputControllerCapabilityAgent] {
+            const unsigned int stateRequestToken = 1;
+            inputControllerCapabilityAgent->provideState(
+                CapabilityTag(NAMESPACE, INPUT_PROPERTY_NAME, TEST_ENDPOINT_ID), stateRequestToken);
+        }));
+
+    EXPECT_CALL(*m_mockInputHandler, getInputMock()).WillOnce(InvokeWithoutArgs([]() { return CD_INPUT_TEST; }));
+
+    EXPECT_CALL(*m_mockContextManager, provideStateResponse(_, _, _)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    m_mockInputHandler->setInputMock(CD_INPUT_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    inputControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directives.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(InputControllerCapabilityAgentTest, test_unknownInvalidDirective) {
+    static const std::vector<std::string> invalidPayloads{SELECT_INPUT_UNSUPPORTED_DIRECTIVE_JSON_STRING,
+                                                          SELECT_INPUT_MISSING_TAG_DIRECTIVE_JSON_STRING,
+                                                          SELECT_INPUT_EMPTY_INPUT_DIRECTIVE_JSON_STRING};
+
+    EXPECT_CALL(*m_mockInputHandler, getSupportedInputsMock()).WillOnce(InvokeWithoutArgs([] {
+        return DEFAULT_ALLOWED_INPUT;
+    }));
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(invalidPayloads.size());
+
+    auto inputControllerCapabilityAgent = createCapabilityAgentAndSetExpects(DEFAULT_ALLOWED_INPUT, true, true);
+    ASSERT_THAT(inputControllerCapabilityAgent, NotNull());
+
+    std::string messageId = MESSAGE_ID_TEST;
+
+    for (const auto& payload : invalidPayloads) {
+        avsCommon::utils::WaitEvent waitEvent;
+
+        messageId += "1";
+
+        auto mockDirectiveHandlerResult = make_unique<StrictMock<MockDirectiveHandlerResult>>();
+
+        EXPECT_CALL(*mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+            waitEvent.wakeUp();
+        }));
+
+        inputControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+            buildAVSDirective(NAME_SETMODE, payload, messageId), std::move(mockDirectiveHandlerResult));
+        inputControllerCapabilityAgent->CapabilityAgent::handleDirective(messageId);
+
+        EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    }
+
+    inputControllerCapabilityAgent->shutdown();
+}
+
+}  // namespace test
+}  // namespace alexaInputController
+}  // namespace alexaClientSDK
diff --git a/capabilities/InputController/AlexaInputControllerInterfaces/CMakeLists.txt b/capabilities/InputController/AlexaInputControllerInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..c61051a6b6
--- /dev/null
+++ b/capabilities/InputController/AlexaInputControllerInterfaces/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1)
+project(acsdkAlexaInputControllerInterfaces LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/capabilities/InputController/AlexaInputControllerInterfaces/include/acsdk/AlexaInputControllerInterfaces/InputControllerInterface.h b/capabilities/InputController/AlexaInputControllerInterfaces/include/acsdk/AlexaInputControllerInterfaces/InputControllerInterface.h
new file mode 100644
index 0000000000..e91d34b6bb
--- /dev/null
+++ b/capabilities/InputController/AlexaInputControllerInterfaces/include/acsdk/AlexaInputControllerInterfaces/InputControllerInterface.h
@@ -0,0 +1,139 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAINPUTCONTROLLERINTERFACES_INPUTCONTROLLERINTERFACE_H_
+#define ACSDK_ALEXAINPUTCONTROLLERINTERFACES_INPUTCONTROLLERINTERFACE_H_
+
+#include <string>
+#include <unordered_set>
+#include <vector>
+
+#include "InputControllerObserverInterface.h"
+#include "InputType.h"
+
+namespace alexaClientSDK {
+namespace alexaInputControllerInterfaces {
+
+/**
+ * An interface to handle input changes from InputController.
+ *
+ * @note Implementations of this interface must be thread-safe.
+ */
+class InputControllerInterface {
+public:
+    /**
+     * Utility object used for reporting InputController handler response.
+     */
+    struct Response {
+        /**
+         * Enum for the different response types understood by the InputController capability agent.
+         */
+        enum class Type {
+            /// InputController Request was handled successfully.
+            SUCCESS,
+            /// The directive contains a value that's not valid for the target endpoint. For example, an invalid input.
+            FAILED_INVALID_VALUE,
+            /// The number of allowed failed attempts to perform a InputController action has been exceeded.
+            FAILED_TOO_MANY_FAILED_ATTEMPTS,
+            /// Indicates the endpoint is unreachable or offline.
+            FAILED_ENDPOINT_UNREACHABLE,
+            /// Indicates that an error occurred that can't be described by one of the other error types.
+            FAILED_INTERNAL_ERROR
+        };
+
+        /**
+         * Default Constructor, set the response type to success.
+         */
+        Response() : type{Type::SUCCESS} {};
+
+        /**
+         * Constructor.
+         * @param type The response type @c Type
+         * @param errorMessage The error message if @c type is anything other than SUCCESS.
+         *
+         */
+        Response(Type type, std::string errorMessage) : type{type}, errorMessage{std::move(errorMessage)} {};
+
+        /// Response type for InputController handler responses.
+        Type type;
+
+        /// The error message for logging if the @c type is anything other than SUCCESS, for the purposes of
+        /// aiding debugging.
+        std::string errorMessage;
+    };
+
+    /**
+     * Destructor.
+     */
+    virtual ~InputControllerInterface() = default;
+
+    /**
+     * A set of pairs to specify the supported inputs of the device.
+     * The first element of a pair is the Input type, and the second element is the set of friendly names for that
+     * input.
+     * @note Each friendly name must be unique across inputs for this device
+     */
+    using SupportedInputs = std::vector<std::pair<Input, std::unordered_set<std::string>>>;
+
+    /*
+     * Return the inputs supported.
+     *
+     * @return the set of inputs the device supports.
+     */
+    virtual SupportedInputs getSupportedInputs() = 0;
+
+    /**
+     * Set the input.
+     *
+     * @param input The desired input of the endpoint, which is one of those that is available from the device.
+     * @return whether the input was successfully set, or if an error was encountered in the process. @c
+     * InputControllerInterface::Response.type should return SUCCESS if no errors were encountered. Otherwise, @c
+     * InputControllerInterface::Response.type should contain the corresponding error code along with a log message in
+     * @c InputControllerInterface::Response.errorMessage.
+     */
+    virtual Response setInput(Input input) = 0;
+
+    /**
+     * Get the current input.
+     *
+     * @return the current input
+     */
+    virtual Input getInput() = 0;
+
+    /**
+     * Adds a @c InputControllerObserverInterface observer.
+     *
+     * @note If InputController implementation has configured its instance's property as proactively reported,
+     * then it is required to notify observers of @c InputControllerObserverInterface for any change in its property
+     * state. This includes notifying the value when the device starts, if it is different from the last reported value.
+     *
+     * @param observer The pointer to the @c InputControllerObserverInterface.
+     * @return @c true if the object supports observer notification and observer was successfully added; otherwise,
+     * return @c false
+     */
+    virtual bool addObserver(std::weak_ptr<InputControllerObserverInterface> observer) = 0;
+
+    /**
+     * Removes a observer of @c InputControllerObserverInterface.
+     *
+     * @param observer The pointer to the @c InputControllerObserverInterface.
+     */
+    virtual void removeObserver(std::weak_ptr<InputControllerObserverInterface> observer) = 0;
+};
+
+}  // namespace alexaInputControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAINPUTCONTROLLERINTERFACES_INPUTCONTROLLERINTERFACE_H_
diff --git a/capabilities/InputController/AlexaInputControllerInterfaces/include/acsdk/AlexaInputControllerInterfaces/InputControllerObserverInterface.h b/capabilities/InputController/AlexaInputControllerInterfaces/include/acsdk/AlexaInputControllerInterfaces/InputControllerObserverInterface.h
new file mode 100644
index 0000000000..0f8ded5bc7
--- /dev/null
+++ b/capabilities/InputController/AlexaInputControllerInterfaces/include/acsdk/AlexaInputControllerInterfaces/InputControllerObserverInterface.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAINPUTCONTROLLERINTERFACES_INPUTCONTROLLEROBSERVERINTERFACE_H_
+#define ACSDK_ALEXAINPUTCONTROLLERINTERFACES_INPUTCONTROLLEROBSERVERINTERFACE_H_
+
+#include <string>
+
+#include "InputType.h"
+
+namespace alexaClientSDK {
+namespace alexaInputControllerInterfaces {
+
+/**
+ * This interface is used to observe changes to the Input controller property of an endpoint
+ * that are caused by the @c InputControllerInterface.
+ */
+class InputControllerObserverInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~InputControllerObserverInterface() = default;
+
+    /**
+     * Notifies the change in the input state property of the endpoint.
+     *
+     * @param input The input state specified
+     */
+    virtual void onInputChanged(Input input) = 0;
+};
+
+}  // namespace alexaInputControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAINPUTCONTROLLERINTERFACES_INPUTCONTROLLEROBSERVERINTERFACE_H_
diff --git a/capabilities/InputController/AlexaInputControllerInterfaces/include/acsdk/AlexaInputControllerInterfaces/InputType.h b/capabilities/InputController/AlexaInputControllerInterfaces/include/acsdk/AlexaInputControllerInterfaces/InputType.h
new file mode 100644
index 0000000000..05e82f281b
--- /dev/null
+++ b/capabilities/InputController/AlexaInputControllerInterfaces/include/acsdk/AlexaInputControllerInterfaces/InputType.h
@@ -0,0 +1,178 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_ALEXAINPUTCONTROLLERINTERFACES_INPUTTYPE_H_
+#define ACSDK_ALEXAINPUTCONTROLLERINTERFACES_INPUTTYPE_H_
+
+#include <string>
+
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace alexaInputControllerInterfaces {
+
+/*
+ * Enumeration definitions for all supported input values as defined at
+ * https://developer.amazon.com/en-US/docs/alexa/device-apis/alexa-inputcontroller.html#input-property
+ */
+enum class Input {
+    /// Auxiliary Input 1
+    AUX_1,
+    /// Auxiliary Input 2
+    AUX_2,
+    /// Auxiliary Input 3
+    AUX_3,
+    /// Auxiliary Input 4
+    AUX_4,
+    /// Auxiliary Input 5
+    AUX_5,
+    /// Auxiliary Input 6
+    AUX_6,
+    /// Auxiliary Input 7
+    AUX_7,
+    /// BluRay Input
+    BLURAY,
+    /// Cable Input
+    CABLE,
+    /// CD Input
+    CD,
+    /// COAX Input 1
+    COAX_1,
+    /// COAX Input 2
+    COAX_2,
+    /// Composite Input 1
+    COMPOSITE_1,
+    /// DVD Input
+    DVD,
+    /// Game Input
+    GAME,
+    /// High Definition Radio Input
+    HD_RADIO,
+    /// HDMI Input 1
+    HDMI_1,
+    /// HDMI Input 2
+    HDMI_2,
+    /// HDMI Input 3
+    HDMI_3,
+    /// HDMI Input 4
+    HDMI_4,
+    /// HDMI Input 5
+    HDMI_5,
+    /// HDMI Input 6
+    HDMI_6,
+    /// HDMI Input 7
+    HDMI_7,
+    /// HDMI Input 8
+    HDMI_8,
+    /// HDMI Input 9
+    HDMI_9,
+    /// HDMI Input 10
+    HDMI_10,
+    /// HDMI Audio Relay Channel Input
+    HDMI_ARC,
+    /// Input 1
+    INPUT_1,
+    /// Input 2
+    INPUT_2,
+    /// Input 3
+    INPUT_3,
+    /// Input 4
+    INPUT_4,
+    /// Input 5
+    INPUT_5,
+    /// Input 6
+    INPUT_6,
+    /// Input 7
+    INPUT_7,
+    /// Input 8
+    INPUT_8,
+    /// Input 9
+    INPUT_9,
+    /// Input 10
+    INPUT_10,
+    /// IPod Input
+    IPOD,
+    /// Line Input 1
+    LINE_1,
+    /// Line Input 2
+    LINE_2,
+    /// Line Input 3
+    LINE_3,
+    /// Line Input 4
+    LINE_4,
+    /// Line Input 5
+    LINE_5,
+    /// Line Input 6
+    LINE_6,
+    /// Line Input 7
+    LINE_7,
+    /// Media Player Input
+    MEDIA_PLAYER,
+    /// Optical Input 1
+    OPTICAL_1,
+    /// Optical Input 2
+    OPTICAL_2,
+    /// Phono Input
+    PHONO,
+    /// PlayStation Input
+    PLAYSTATION,
+    /// PlayStation 3 Input
+    PLAYSTATION_3,
+    /// PlayStation 4 Input
+    PLAYSTATION_4,
+    /// Satellite Input
+    SATELLITE,
+    /// SmartCast Input
+    SMARTCAST,
+    /// Tuner Input
+    TUNER,
+    /// Television Input
+    TV,
+    /// USB Digital to Analog Converter Input
+    USB_DAC,
+    /// Video Input 1
+    VIDEO_1,
+    /// Video Input 2
+    VIDEO_2,
+    /// Video Input 3
+    VIDEO_3,
+    /// XBox Input
+    XBOX
+};
+
+/**
+ * Convert an @c Input enum to its corresponding string value. Note that any @c input that does not map
+ * to @c Input enum value will return an empty string.
+ *
+ * @param input The Input value to convert.
+ * @return The corresponding string value for @c input. Returns an empty string if @c input does not map
+ * to a @c Input enum.
+ */
+std::string inputToString(Input input);
+
+/**
+ * Convert a string to a corresponding @c Input enum value. Note that any @c inputString that does not
+ * map to @c Input enum value will return an @c Optional object with no value.
+ *
+ * @param inputString The input string to convert.
+ * @return An @c Optional object, with the value as the corresponding @c Input enum value for @c inputString
+ * if there is a match. Otherwise, return an @c Optional object with no value.
+ */
+avsCommon::utils::Optional<Input> stringToInput(const std::string& inputString);
+
+}  // namespace alexaInputControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_ALEXAINPUTCONTROLLERINTERFACES_INPUTTYPE_H_
diff --git a/capabilities/InputController/AlexaInputControllerInterfaces/src/CMakeLists.txt b/capabilities/InputController/AlexaInputControllerInterfaces/src/CMakeLists.txt
new file mode 100644
index 0000000000..7b836617f2
--- /dev/null
+++ b/capabilities/InputController/AlexaInputControllerInterfaces/src/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkAlexaInputControllerInterfaces")
+
+add_library(acsdkAlexaInputControllerInterfaces
+        InputType.cpp)
+
+target_include_directories(acsdkAlexaInputControllerInterfaces PUBLIC
+        "${acsdkAlexaInputControllerInterfaces_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkAlexaInputControllerInterfaces AVSCommon Alexa)
+
+# install target
+asdk_install()
diff --git a/capabilities/InputController/AlexaInputControllerInterfaces/src/InputType.cpp b/capabilities/InputController/AlexaInputControllerInterfaces/src/InputType.cpp
new file mode 100644
index 0000000000..22b88f398e
--- /dev/null
+++ b/capabilities/InputController/AlexaInputControllerInterfaces/src/InputType.cpp
@@ -0,0 +1,278 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/AlexaInputControllerInterfaces/InputType.h>
+
+namespace alexaClientSDK {
+namespace alexaInputControllerInterfaces {
+
+std::string inputToString(Input input) {
+    switch (input) {
+        case Input::AUX_1:
+            return "AUX 1";
+        case Input::AUX_2:
+            return "AUX 2";
+        case Input::AUX_3:
+            return "AUX 3";
+        case Input::AUX_4:
+            return "AUX 4";
+        case Input::AUX_5:
+            return "AUX 5";
+        case Input::AUX_6:
+            return "AUX 6";
+        case Input::AUX_7:
+            return "AUX 7";
+        case Input::BLURAY:
+            return "BLURAY";
+        case Input::CABLE:
+            return "CABLE";
+        case Input::CD:
+            return "CD";
+        case Input::COAX_1:
+            return "COAX 1";
+        case Input::COAX_2:
+            return "COAX 2";
+        case Input::COMPOSITE_1:
+            return "COMPOSITE 1";
+        case Input::DVD:
+            return "DVD";
+        case Input::GAME:
+            return "GAME";
+        case Input::HD_RADIO:
+            return "HD RADIO";
+        case Input::HDMI_1:
+            return "HDMI 1";
+        case Input::HDMI_2:
+            return "HDMI 2";
+        case Input::HDMI_3:
+            return "HDMI 3";
+        case Input::HDMI_4:
+            return "HDMI 4";
+        case Input::HDMI_5:
+            return "HDMI 5";
+        case Input::HDMI_6:
+            return "HDMI 6";
+        case Input::HDMI_7:
+            return "HDMI 7";
+        case Input::HDMI_8:
+            return "HDMI 8";
+        case Input::HDMI_9:
+            return "HDMI 9";
+        case Input::HDMI_10:
+            return "HDMI 10";
+        case Input::HDMI_ARC:
+            return "HDMI ARC";
+        case Input::INPUT_1:
+            return "INPUT 1";
+        case Input::INPUT_2:
+            return "INPUT 2";
+        case Input::INPUT_3:
+            return "INPUT 3";
+        case Input::INPUT_4:
+            return "INPUT 4";
+        case Input::INPUT_5:
+            return "INPUT 5";
+        case Input::INPUT_6:
+            return "INPUT 6";
+        case Input::INPUT_7:
+            return "INPUT 7";
+        case Input::INPUT_8:
+            return "INPUT 8";
+        case Input::INPUT_9:
+            return "INPUT 9";
+        case Input::INPUT_10:
+            return "INPUT 10";
+        case Input::IPOD:
+            return "IPOD";
+        case Input::LINE_1:
+            return "LINE 1";
+        case Input::LINE_2:
+            return "LINE 2";
+        case Input::LINE_3:
+            return "LINE 3";
+        case Input::LINE_4:
+            return "LINE 4";
+        case Input::LINE_5:
+            return "LINE 5";
+        case Input::LINE_6:
+            return "LINE 6";
+        case Input::LINE_7:
+            return "LINE 7";
+        case Input::MEDIA_PLAYER:
+            return "MEDIA PLAYER";
+        case Input::OPTICAL_1:
+            return "OPTICAL 1";
+        case Input::OPTICAL_2:
+            return "OPTICAL 2";
+        case Input::PHONO:
+            return "PHONO";
+        case Input::PLAYSTATION:
+            return "PLAYSTATION";
+        case Input::PLAYSTATION_3:
+            return "PLAYSTATION 3";
+        case Input::PLAYSTATION_4:
+            return "PLAYSTATION 4";
+        case Input::SATELLITE:
+            return "SATELLITE";
+        case Input::SMARTCAST:
+            return "SMARTCAST";
+        case Input::TUNER:
+            return "TUNER";
+        case Input::TV:
+            return "TV";
+        case Input::USB_DAC:
+            return "USB DAC";
+        case Input::VIDEO_1:
+            return "VIDEO 1";
+        case Input::VIDEO_2:
+            return "VIDEO 2";
+        case Input::VIDEO_3:
+            return "VIDEO 3";
+        case Input::XBOX:
+            return "XBOX";
+    }
+    return "";
+}
+
+avsCommon::utils::Optional<Input> stringToInput(const std::string& inputString) {
+    avsCommon::utils::Optional<Input> input;
+    if ("AUX 1" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::AUX_1);
+    } else if ("AUX 2" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::AUX_2);
+    } else if ("AUX 3" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::AUX_3);
+    } else if ("AUX 4" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::AUX_4);
+    } else if ("AUX 5" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::AUX_5);
+    } else if ("AUX 6" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::AUX_6);
+    } else if ("AUX 7" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::AUX_7);
+    } else if ("BLURAY" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::BLURAY);
+    } else if ("CABLE" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::CABLE);
+    } else if ("CD" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::CD);
+    } else if ("COAX 1" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::COAX_1);
+    } else if ("COAX 2" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::COAX_2);
+    } else if ("COMPOSITE 1" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::COMPOSITE_1);
+    } else if ("DVD" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::DVD);
+    } else if ("GAME" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::GAME);
+    } else if ("HD RADIO" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::HD_RADIO);
+    } else if ("HDMI 1" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::HDMI_1);
+    } else if ("HDMI 2" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::HDMI_2);
+    } else if ("HDMI 3" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::HDMI_3);
+    } else if ("HDMI 4" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::HDMI_4);
+    } else if ("HDMI 5" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::HDMI_5);
+    } else if ("HDMI 6" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::HDMI_6);
+    } else if ("HDMI 7" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::HDMI_7);
+    } else if ("HDMI 8" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::HDMI_8);
+    } else if ("HDMI 9" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::HDMI_9);
+    } else if ("HDMI 10" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::HDMI_10);
+    } else if ("HDMI ARC" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::HDMI_ARC);
+    } else if ("INPUT 1" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::INPUT_1);
+    } else if ("INPUT 2" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::INPUT_2);
+    } else if ("INPUT 3" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::INPUT_3);
+    } else if ("INPUT 4" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::INPUT_4);
+    } else if ("INPUT 5" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::INPUT_5);
+    } else if ("INPUT 6" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::INPUT_6);
+    } else if ("INPUT 7" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::INPUT_7);
+    } else if ("INPUT 8" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::INPUT_8);
+    } else if ("INPUT 9" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::INPUT_9);
+    } else if ("INPUT 10" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::INPUT_10);
+    } else if ("IPOD" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::IPOD);
+    } else if ("LINE 1" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::LINE_1);
+    } else if ("LINE 2" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::LINE_2);
+    } else if ("LINE 3" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::LINE_3);
+    } else if ("LINE 4" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::LINE_4);
+    } else if ("LINE 5" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::LINE_5);
+    } else if ("LINE 6" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::LINE_6);
+    } else if ("LINE 7" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::LINE_7);
+    } else if ("MEDIA PLAYER" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::MEDIA_PLAYER);
+    } else if ("OPTICAL 1" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::OPTICAL_1);
+    } else if ("OPTICAL 2" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::OPTICAL_2);
+    } else if ("PHONO" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::PHONO);
+    } else if ("PLAYSTATION" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::PLAYSTATION);
+    } else if ("PLAYSTATION 3" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::PLAYSTATION_3);
+    } else if ("PLAYSTATION 4" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::PLAYSTATION_4);
+    } else if ("SATELLITE" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::SATELLITE);
+    } else if ("SMARTCAST" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::SMARTCAST);
+    } else if ("TUNER" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::TUNER);
+    } else if ("TV" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::TV);
+    } else if ("USB DAC" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::USB_DAC);
+    } else if ("VIDEO 1" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::VIDEO_1);
+    } else if ("VIDEO 2" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::VIDEO_2);
+    } else if ("VIDEO 3" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::VIDEO_3);
+    } else if ("XBOX" == inputString) {
+        return avsCommon::utils::Optional<Input>(Input::XBOX);
+    }
+    return input;
+}
+
+}  // namespace alexaInputControllerInterfaces
+}  // namespace alexaClientSDK
diff --git a/capabilities/InputController/CMakeLists.txt b/capabilities/InputController/CMakeLists.txt
index 0f220330bf..cdf6b5ad1f 100644
--- a/capabilities/InputController/CMakeLists.txt
+++ b/capabilities/InputController/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(AlexaInputController LANGUAGES CXX)
 
-add_subdirectory("acsdkInputController")
-add_subdirectory("acsdkInputControllerInterfaces")
+add_subdirectory("AlexaInputController")
+add_subdirectory("AlexaInputControllerInterfaces")
diff --git a/capabilities/InputController/acsdkInputController/CMakeLists.txt b/capabilities/InputController/acsdkInputController/CMakeLists.txt
deleted file mode 100644
index e2c26f87da..0000000000
--- a/capabilities/InputController/acsdkInputController/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-if(INPUT_CONTROLLER)
-    project(acsdkInputController LANGUAGES CXX)
-    include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
-    add_subdirectory("src")
-    add_subdirectory("test")
-endif()
\ No newline at end of file
diff --git a/capabilities/InputController/acsdkInputController/include/acsdkInputController/InputControllerFactory.h b/capabilities/InputController/acsdkInputController/include/acsdkInputController/InputControllerFactory.h
deleted file mode 100644
index 5fc479951d..0000000000
--- a/capabilities/InputController/acsdkInputController/include/acsdkInputController/InputControllerFactory.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKINPUTCONTROLLER_INPUTCONTROLLERFACTORY_H_
-#define ACSDKINPUTCONTROLLER_INPUTCONTROLLERFACTORY_H_
-
-#include <memory>
-
-#include <acsdkInputControllerInterfaces/InputControllerHandlerInterface.h>
-#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
-#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
-#include <AVSCommon/Utils/Optional.h>
-
-namespace alexaClientSDK {
-namespace acsdkInputController {
-
-/// This structure contains the interfaces to interact with the InputController Capability Agent.
-struct InputControllerFactoryInterfaces {
-    /// Interface for handling @c AVSDirectives.
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::DirectiveHandlerInterface> directiveHandler;
-
-    /// Interface providing CapabilitiesDelegate access to the version and configurations of the capabilities.
-    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::CapabilityConfigurationInterface>
-        capabilityConfigurationInterface;
-};
-
-/**
- * Creates a new InputController capability agent
- *
- * @param handler The handler for InputController input updates.
- * @param exceptionSender The object to use for sending AVS Exception messages.
- * @return An @c Optional @c InputControllerFactoryInterfaces object.
- */
-avsCommon::utils::Optional<InputControllerFactoryInterfaces> create(
-    const std::shared_ptr<acsdkInputControllerInterfaces::InputControllerHandlerInterface>& handler,
-    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender);
-
-}  // namespace acsdkInputController
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKINPUTCONTROLLER_INPUTCONTROLLERFACTORY_H_
diff --git a/capabilities/InputController/acsdkInputController/src/CMakeLists.txt b/capabilities/InputController/acsdkInputController/src/CMakeLists.txt
deleted file mode 100644
index bbf883def1..0000000000
--- a/capabilities/InputController/acsdkInputController/src/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-add_definitions("-DACSDK_LOG_MODULE=acsdkInputController")
-
-set(InputController_SOURCES)
-list(APPEND InputController_SOURCES
-    InputControllerCapabilityAgent.cpp
-    InputControllerFactory.cpp)
-
-add_library(acsdkInputController
-        "${InputController_SOURCES}")
-
-target_include_directories(acsdkInputController PUBLIC
-        "${acsdkInputController_SOURCE_DIR}/include")
-
-target_link_libraries(acsdkInputController
-        acsdkInputControllerInterfaces
-        AVSCommon)
-
-# install target
-asdk_install()
diff --git a/capabilities/InputController/acsdkInputController/src/InputControllerCapabilityAgent.cpp b/capabilities/InputController/acsdkInputController/src/InputControllerCapabilityAgent.cpp
deleted file mode 100644
index 0acfb4ae71..0000000000
--- a/capabilities/InputController/acsdkInputController/src/InputControllerCapabilityAgent.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-#include <unordered_map>
-
-#include "InputControllerCapabilityAgent.h"
-
-#include <AVSCommon/AVS/NamespaceAndName.h>
-#include <AVSCommon/Utils/JSON/JSONGenerator.h>
-#include <AVSCommon/Utils/JSON/JSONUtils.h>
-#include <AVSCommon/Utils/Logger/Logger.h>
-#include <AVSCommon/Utils/Optional.h>
-
-namespace alexaClientSDK {
-namespace acsdkInputController {
-
-using namespace rapidjson;
-using namespace acsdkInputControllerInterfaces;
-using namespace avsCommon::avs;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils;
-using namespace json::jsonUtils;
-
-/// String to identify log entries originating from this file.
-static const std::string TAG{"InputController"};
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param The event string for this @c LogEntry.
- */
-#define LX(event) logger::LogEntry(TAG, event)
-
-/// The namespace for this capability agent.
-static const std::string NAMESPACE = "Alexa.InputController";
-
-/// The SelectInput directive signature.
-static const NamespaceAndName SELECT_INPUT{NAMESPACE, "SelectInput"};
-
-/// InputController capability constants
-/// The AlexaInterface constant type.
-static const std::string ALEXA_INTERFACE_TYPE = "AlexaInterface";
-
-/// Interface name
-static const std::string INPUT_CONTROLLER_CAPABILITY_INTERFACE_NAME = "Alexa.InputController";
-
-/// Interface version.
-static const std::string INPUT_CONTROLLER_CAPABILITY_INTERFACE_VERSION = "3.0";
-
-/// The configuration key
-static const std::string CAPABILITY_CONFIGURATION_KEY{"configurations"};
-
-/// Payload input key
-static const std::string INPUT_CONTROLLER_INPUT_KEY = "input";
-
-/// Payload inputs key
-static const std::string INPUT_CONTROLLER_CONFIGURATION_KEY = "inputs";
-
-/// Payload name key
-static const std::string INPUT_CONTROLLER_CONFIGURATION_NAME_KEY = "name";
-
-/// Payload friendlyNames key
-static const std::string INPUT_CONTROLLER_CONFIGURATION_FRIENDLY_NAMES_KEY = "friendlyNames";
-
-/**
- * A helper function to check if the input configurations from the handler is valid.
- *
- * @param inputConfigurations The @c inputs and its friendly names.
- * @return true if valid, false otherwise.
- */
-static bool checkInputs(const InputControllerCapabilityAgent::InputFriendlyNameConfigurations& inputConfigurations) {
-    std::unordered_map<std::string, std::string> friendlyNamesCheck;
-    if (inputConfigurations.empty()) {
-        ACSDK_ERROR(LX("checkInputsFailed").d("reason", "emptyInputConfig"));
-        return false;
-    }
-    for (const auto& input : inputConfigurations) {
-        for (const auto& friendlyName : input.second) {
-            if (0 == friendlyNamesCheck.count(friendlyName)) {
-                friendlyNamesCheck[friendlyName] = input.first;
-            } else {
-                ACSDK_ERROR(LX("checkInputsFailed")
-                                .d("reason", "friendlyNameExistsInTwoInputs")
-                                .d("friendlyName", friendlyName)
-                                .d("input1", friendlyNamesCheck[friendlyName])
-                                .d("input2", input.first));
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-/**
- * A helper function to generate the @c CapabilityConfiguration based on the @c InputConfigurations.
- *
- * @param inputConfigurations The @c InputConfigurations to read from.
- * @return A @c std::shared_ptr to a @c CapabilityConfiguration.
- */
-static std::shared_ptr<CapabilityConfiguration> getInputControllerCapabilityConfiguration(
-    const InputControllerCapabilityAgent::InputFriendlyNameConfigurations& inputConfigurations) {
-    avsCommon::utils::json::JsonGenerator jsonGenerator;
-
-    jsonGenerator.startArray(INPUT_CONTROLLER_CONFIGURATION_KEY);
-    for (const auto& input : inputConfigurations) {
-        jsonGenerator.startArrayElement();
-        jsonGenerator.addMember(INPUT_CONTROLLER_CONFIGURATION_NAME_KEY, input.first);
-        jsonGenerator.addStringArray(INPUT_CONTROLLER_CONFIGURATION_FRIENDLY_NAMES_KEY, input.second);
-        jsonGenerator.finishArrayElement();
-    }
-    jsonGenerator.finishArray();
-
-    auto additionalConfigurations = CapabilityConfiguration::AdditionalConfigurations();
-    additionalConfigurations[CAPABILITY_CONFIGURATION_KEY] = jsonGenerator.toString();
-
-    auto configuration = std::make_shared<CapabilityConfiguration>(
-        ALEXA_INTERFACE_TYPE,
-        INPUT_CONTROLLER_CAPABILITY_INTERFACE_NAME,
-        INPUT_CONTROLLER_CAPABILITY_INTERFACE_VERSION,
-        avsCommon::utils::Optional<std::string>(),
-        avsCommon::utils::Optional<CapabilityConfiguration::Properties>(),
-        additionalConfigurations);
-
-    return configuration;
-}
-
-std::shared_ptr<InputControllerCapabilityAgent> InputControllerCapabilityAgent::create(
-    const std::shared_ptr<acsdkInputControllerInterfaces::InputControllerHandlerInterface>& handler,
-    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender) {
-    if (!handler) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "nullHandler"));
-        return nullptr;
-    }
-    if (!exceptionSender) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
-        return nullptr;
-    }
-    if (!checkInputs(handler->getConfiguration().inputs)) {
-        ACSDK_ERROR(LX("createFailed").d("reason", "invalidInputs"));
-        return nullptr;
-    }
-    auto inputControllerCapabilityAgent =
-        std::shared_ptr<InputControllerCapabilityAgent>(new InputControllerCapabilityAgent(handler, exceptionSender));
-    return inputControllerCapabilityAgent;
-}
-
-InputControllerCapabilityAgent::InputControllerCapabilityAgent(
-    const std::shared_ptr<acsdkInputControllerInterfaces::InputControllerHandlerInterface>& handler,
-    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender) :
-        CapabilityAgent{NAMESPACE, exceptionSender},
-        m_inputControllerHandler{handler} {
-    ACSDK_DEBUG5(LX(__func__));
-    m_inputConfigurations = handler->getConfiguration().inputs;
-    m_capabilityConfigurations.insert(getInputControllerCapabilityConfiguration(m_inputConfigurations));
-}
-
-DirectiveHandlerConfiguration InputControllerCapabilityAgent::getConfiguration() const {
-    DirectiveHandlerConfiguration configuration;
-    configuration[SELECT_INPUT] = BlockingPolicy(BlockingPolicy::MEDIUMS_NONE, false);
-    return configuration;
-}
-
-void InputControllerCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
-    ACSDK_DEBUG5(LX(__func__));
-    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
-}
-
-void InputControllerCapabilityAgent::preHandleDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
-    // No-op
-}
-
-bool InputControllerCapabilityAgent::executeHandleDirectiveHelper(
-    std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
-    std::string* errMessage,
-    ExceptionErrorType* type) {
-    ACSDK_DEBUG5(LX(__func__));
-    if (!errMessage) {
-        ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "nullErrMessage"));
-        return false;
-    }
-    if (!type) {
-        ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "nullType"));
-        return false;
-    }
-    if (!info) {
-        ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "nullInfo"));
-        return false;
-    }
-    if (!info->directive) {
-        ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "nullDirective"));
-        return false;
-    }
-
-    const std::string directiveName = info->directive->getName();
-
-    Document payload(kObjectType);
-    ParseResult result = payload.Parse(info->directive->getPayload());
-    if (!result) {
-        ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "directiveParseFailed"));
-        *errMessage = "Parse failure";
-        *type = ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED;
-        return false;
-    }
-
-    if (SELECT_INPUT.name == directiveName) {
-        rapidjson::Value::ConstMemberIterator it;
-        std::string input;
-        if (!retrieveValue(payload, INPUT_CONTROLLER_INPUT_KEY, &input)) {
-            ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "missingInputField"));
-            *errMessage = "Input field is not accessible";
-            *type = ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED;
-            return false;
-        }
-        if (input.empty()) {
-            ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "inputIsEmptyString"));
-            *errMessage = "Input is an Empty String";
-            *type = ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED;
-            return false;
-        }
-        if (0 == m_inputConfigurations.count(input)) {
-            ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "InvalidInputReceived"));
-            *errMessage = "Input is invalid";
-            *type = ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED;
-            return false;
-        }
-
-        ACSDK_INFO(LX("inputControllerNotifier").d("input", input));
-        if (!m_inputControllerHandler->onInputChange(input)) {
-            ACSDK_ERROR(LX("processDirectiveFailed").d("reason", "onInputChangeFailed"));
-            *errMessage = "Input change failed";
-            *type = ExceptionErrorType::INTERNAL_ERROR;
-            return false;
-        }
-    } else {
-        *errMessage = directiveName + " not supported";
-        *type = ExceptionErrorType::UNSUPPORTED_OPERATION;
-        return false;
-    }
-
-    return true;
-}
-
-void InputControllerCapabilityAgent::handleDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
-    ACSDK_DEBUG5(LX(__func__));
-    if (!info) {
-        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullInfo"));
-        return;
-    }
-
-    if (!info->directive) {
-        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirective"));
-        return;
-    }
-
-    m_executor.submit([this, info] {
-        std::string errMessage;
-        ExceptionErrorType errType;
-
-        if (executeHandleDirectiveHelper(info, &errMessage, &errType)) {
-            if (info->result) {
-                info->result->setCompleted();
-            }
-        } else {
-            ACSDK_ERROR(LX("processDirectiveFailed").d("reason", errMessage));
-            m_exceptionEncounteredSender->sendExceptionEncountered(
-                info->directive->getUnparsedDirective(), errType, errMessage);
-            if (info->result) {
-                info->result->setFailed(errMessage);
-            }
-        }
-        removeDirective(info->directive->getMessageId());
-    });
-}
-
-void InputControllerCapabilityAgent::cancelDirective(std::shared_ptr<CapabilityAgent::DirectiveInfo> info) {
-    // No-op
-}
-
-std::unordered_set<std::shared_ptr<CapabilityConfiguration>> InputControllerCapabilityAgent::
-    getCapabilityConfigurations() {
-    return m_capabilityConfigurations;
-}
-
-}  // namespace acsdkInputController
-}  // namespace alexaClientSDK
diff --git a/capabilities/InputController/acsdkInputController/src/InputControllerCapabilityAgent.h b/capabilities/InputController/acsdkInputController/src/InputControllerCapabilityAgent.h
deleted file mode 100644
index e33c6a31b6..0000000000
--- a/capabilities/InputController/acsdkInputController/src/InputControllerCapabilityAgent.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKINPUTCONTROLLER_SRC_INPUTCONTROLLERCAPABILITYAGENT_H_
-#define ACSDKINPUTCONTROLLER_SRC_INPUTCONTROLLERCAPABILITYAGENT_H_
-
-#include <memory>
-#include <string>
-#include <unordered_set>
-
-#include <acsdkInputControllerInterfaces/InputControllerHandlerInterface.h>
-#include <AVSCommon/AVS/CapabilityAgent.h>
-#include <AVSCommon/AVS/CapabilityConfiguration.h>
-#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
-#include <AVSCommon/Utils/Threading/Executor.h>
-
-namespace alexaClientSDK {
-namespace acsdkInputController {
-
-/**
- * The Input Controller Capability Agent provides an implementation for a client to interface with the
- * Alexa.InputController API.
- *
- * @see https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/inputcontroller.html
- *
- * AVS sends SelectInput directives to the device to switch the input.
- *
- */
-class InputControllerCapabilityAgent
-        : public avsCommon::avs::CapabilityAgent
-        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface {
-public:
-    /// Alias for brevity
-    using InputFriendlyNameConfigurations =
-        acsdkInputControllerInterfaces::InputControllerHandlerInterface::InputFriendlyNameType;
-
-    /**
-     * Destructor.
-     */
-    virtual ~InputControllerCapabilityAgent() = default;
-
-    /**
-     * Creates an instance of the @c InputControllerCapabilityAgent.
-     *
-     * @param handler The handler for InputController input updates.
-     * @param exceptionSender The object to use for sending AVS Exception messages.
-     * @return A @c std::shared_ptr to the new @c InputControllerCapabilityAgent instance, a nullptr if failed.
-     */
-    static std::shared_ptr<InputControllerCapabilityAgent> create(
-        const std::shared_ptr<acsdkInputControllerInterfaces::InputControllerHandlerInterface>& handler,
-        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender);
-
-    /// @name CapabilityAgent Functions
-    /// @{
-    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
-    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
-    void preHandleDirective(std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info) override;
-    void handleDirective(std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info) override;
-    void cancelDirective(std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info) override;
-    /// @}
-
-    /// @name CapabilityConfigurationInterface Functions
-    /// @{
-    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
-    /// @}
-
-private:
-    /**
-     * Constructor.
-     *
-     * @param handler The handler for InputController input updates.
-     * @param exceptionSender The object to use for sending AVS Exception messages.
-     */
-    InputControllerCapabilityAgent(
-        const std::shared_ptr<acsdkInputControllerInterfaces::InputControllerHandlerInterface>& handler,
-        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender);
-
-    /**
-     * Helper function to process the incoming directive
-     *
-     * @param info Directive to be processed.
-     * @param[out] errMessage Error message associated to failure to process the directive
-     * @param[out] type Error type associated to failure to process the directive
-     * @return A bool indicating the success of processing the directive
-     */
-    bool executeHandleDirectiveHelper(
-        std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info,
-        std::string* errMessage,
-        avsCommon::avs::ExceptionErrorType* type);
-
-    /// Set of capability configurations that will get published using Capabilities API
-    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> m_capabilityConfigurations;
-
-    /// The object to handle input change events.
-    const std::shared_ptr<acsdkInputControllerInterfaces::InputControllerHandlerInterface> m_inputControllerHandler;
-
-    /// The configuration of the inputs that is read from the configuration file.
-    InputFriendlyNameConfigurations m_inputConfigurations;
-
-    /**
-     * @c Executor which queues up operations from asynchronous API calls.
-     *
-     * @note This declaration needs to come *after* the Executor Thread Variables above so that the thread shuts down
-     *     before the Executor Thread Variables are destroyed.
-     */
-    avsCommon::utils::threading::Executor m_executor;
-};
-
-}  // namespace acsdkInputController
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKINPUTCONTROLLER_SRC_INPUTCONTROLLERCAPABILITYAGENT_H_
diff --git a/capabilities/InputController/acsdkInputController/src/InputControllerFactory.cpp b/capabilities/InputController/acsdkInputController/src/InputControllerFactory.cpp
deleted file mode 100644
index 5b207f9097..0000000000
--- a/capabilities/InputController/acsdkInputController/src/InputControllerFactory.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include "InputControllerCapabilityAgent.h"
-#include "acsdkInputController/InputControllerFactory.h"
-
-namespace alexaClientSDK {
-namespace acsdkInputController {
-
-using namespace avsCommon::utils;
-
-Optional<InputControllerFactoryInterfaces> create(
-    const std::shared_ptr<acsdkInputControllerInterfaces::InputControllerHandlerInterface>& handler,
-    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender) {
-    auto inputControllerCA = InputControllerCapabilityAgent::create(handler, exceptionSender);
-    if (!inputControllerCA) {
-        return Optional<InputControllerFactoryInterfaces>();
-    }
-    InputControllerFactoryInterfaces interfaces;
-    interfaces.capabilityConfigurationInterface = inputControllerCA;
-    interfaces.directiveHandler = inputControllerCA;
-    return Optional<InputControllerFactoryInterfaces>(interfaces);
-}
-
-}  // namespace acsdkInputController
-}  // namespace alexaClientSDK
diff --git a/capabilities/InputController/acsdkInputController/test/CMakeLists.txt b/capabilities/InputController/acsdkInputController/test/CMakeLists.txt
deleted file mode 100644
index a78cdae127..0000000000
--- a/capabilities/InputController/acsdkInputController/test/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
-
-set(INCLUDE_PATH
-    "${acsdkInputController_SOURCE_DIR}/include")
-
-set(LIBS
-    "acsdkInputController"
-    "SDKInterfacesTests")
-
-discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
diff --git a/capabilities/InputController/acsdkInputController/test/InputControllerCapabilityAgentTest.cpp b/capabilities/InputController/acsdkInputController/test/InputControllerCapabilityAgentTest.cpp
deleted file mode 100644
index 228ed7723b..0000000000
--- a/capabilities/InputController/acsdkInputController/test/InputControllerCapabilityAgentTest.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <condition_variable>
-#include <memory>
-#include <mutex>
-#include <string>
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include <AVSCommon/SDKInterfaces/DirectiveSequencerInterface.h>
-#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
-#include <AVSCommon/Utils/Optional.h>
-
-#include <acsdkInputController/InputControllerFactory.h>
-
-namespace alexaClientSDK {
-namespace acsdkInputController {
-namespace test {
-
-using namespace ::testing;
-using namespace acsdkInputControllerInterfaces;
-using namespace avsCommon::avs;
-using namespace avsCommon::sdkInterfaces;
-using namespace avsCommon::utils;
-using namespace avsCommon::utils::configuration;
-
-/// A simple SelectInput directive JSON string.
-static const std::string SELECT_INPUT_DIRECTIVE_JSON_STRING = R"delim(
-    {
-        "directive": {
-            "header": {
-                "namespace": "Alexa.InputController",
-                "name": "SelectInput",
-                "messageId": "12345",
-                "dialogRequestId": "2"
-            },
-            "payload": {
-                "input": "HDMI1"
-            }
-        }
-    }
-)delim";
-
-/// A SelectInput directive with invalid input (i.e. not part of the configuration as specified in @c
-/// INPUT_CONTROLLER_CONFIG_JSON)
-static const std::string SELECT_INPUT_DIRECTIVE_INVALID_INPUT_JSON_STRING = R"delim(
-    {
-        "directive": {
-            "header": {
-                "namespace": "Alexa.InputController",
-                "name": "SelectInput",
-                "messageId": "12345",
-                "dialogRequestId": "2"
-            },
-            "payload": {
-                "input": "RCA"
-            }
-        }
-    }
-)delim";
-
-/// A SelectInput directive without input field
-static const std::string SELECT_INPUT_MISSING_TAG_DIRECTIVE_JSON_STRING = R"delim(
-    {
-        "directive": {
-            "header": {
-                "namespace": "Alexa.InputController",
-                "name": "SelectInput",
-                "messageId": "12345",
-                "dialogRequestId": "2"
-            },
-            "payload": {
-            }
-        }
-    }
-)delim";
-
-/// A SelectInput directive with an empty input
-static const std::string SELECT_INPUT_EMPTY_INPUT_DIRECTIVE_JSON_STRING = R"delim(
-    {
-        "directive": {
-            "header": {
-                "namespace": "Alexa.InputController",
-                "name": "SelectInput",
-                "messageId": "12345",
-                "dialogRequestId": "2"
-            },
-            "payload": {
-                "input": ""
-            }
-        }
-    }
-)delim";
-
-/// The valid input configuration used for testing
-static const InputControllerHandlerInterface::InputFriendlyNameType INPUT_CONTROLLER_GOOD_CONFIG{
-    {"HDMI1", {"TV", "Television"}},
-    {"HDMI2", {"Game Console"}}};
-
-/// An invalid input configuration with duplicated friendly names across inputs
-static const InputControllerHandlerInterface::InputFriendlyNameType INPUT_CONTROLLER_DUPLICATE_FRIENDLY_NAMES_CONFIG{
-    {"HDMI1", {"TV", "Television"}},
-    {"HDMI2", {"TV"}}};
-
-/// An invalid input configuration with no inputs
-static const InputControllerHandlerInterface::InputFriendlyNameType INPUT_CONTROLLER_EMPTY_CONFIG{};
-
-// Timeout to wait before indicating a test failed.
-static const std::chrono::milliseconds TIMEOUT{500};
-
-/// A Mock for @c InputControllerHandlerInterface
-class MockHandler : public InputControllerHandlerInterface {
-public:
-    /// @name InputControllerHandlerInterface Functions
-    /// @{
-    InputConfigurations getConfiguration() override;
-    bool onInputChange(const std::string& input) override;
-    /// @}
-
-    /**
-     * Waits for the onInputChange() function to be called.
-     *
-     * @return An @c Optional of input.  If callback is before timeout, the Optional will be filled with input,
-     * otherwise and Empty optional if there was no callback.
-     */
-    Optional<std::string> waitOnInputChange();
-
-    /// Ctor
-    MockHandler(InputControllerHandlerInterface::InputFriendlyNameType inputConfigs) : m_inputsConfig{inputConfigs} {};
-
-protected:
-    std::mutex m_mutex;
-    std::condition_variable m_cond;
-    bool m_inputCalled = false;
-    std::string m_input;
-    InputControllerHandlerInterface::InputFriendlyNameType m_inputsConfig;
-};
-
-bool MockHandler::onInputChange(const std::string& input) {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    m_input = input;
-    m_inputCalled = true;
-    m_cond.notify_all();
-    return true;
-}
-
-InputControllerHandlerInterface::InputConfigurations MockHandler::getConfiguration() {
-    return {m_inputsConfig};
-}
-
-Optional<std::string> MockHandler::waitOnInputChange() {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    m_cond.wait_for(lock, TIMEOUT, [this] { return m_inputCalled; });
-    if (m_inputCalled) {
-        return Optional<std::string>(m_input);
-    }
-    return Optional<std::string>();
-}
-
-/// Test harness for @c InputControllerCapabilityAgentTest class.
-class InputControllerCapabilityAgentTest : public Test {
-public:
-    /// Set up the test harness for running a test.
-    void SetUp() override;
-
-protected:
-    /// The InputControllerCapabilityAgent instance to be tested
-    InputControllerFactoryInterfaces m_inputControllerCA;
-
-    /// The mock handler for testing
-    std::shared_ptr<MockHandler> m_mockHandler;
-
-    /// The mock @c ExceptionEncounteredSenderInterface.
-    std::shared_ptr<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender> m_mockExceptionEncounteredSender;
-};
-
-void InputControllerCapabilityAgentTest::SetUp() {
-    m_mockExceptionEncounteredSender =
-        std::make_shared<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>();
-
-    m_mockHandler = std::make_shared<MockHandler>(INPUT_CONTROLLER_GOOD_CONFIG);
-    auto inputControllerCA = create(m_mockHandler, m_mockExceptionEncounteredSender);
-
-    ASSERT_TRUE(inputControllerCA.hasValue());
-    m_inputControllerCA = inputControllerCA.value();
-}
-
-/**
- * Test to verify the @c InputControllerCapabilityAgent cannot be created if handler param is null.
- */
-TEST_F(InputControllerCapabilityAgentTest, test_createNoHandlerFail) {
-    auto inputControllerCA = create(nullptr, m_mockExceptionEncounteredSender);
-    ASSERT_FALSE(inputControllerCA.hasValue());
-}
-
-/**
- * Test to verify the @c InputControllerCapabilityAgent cannot be created if exceptionHandler param is null.
- */
-TEST_F(InputControllerCapabilityAgentTest, test_createNoExceptionHandlerFail) {
-    auto inputControllerCA = create(m_mockHandler, nullptr);
-    ASSERT_FALSE(inputControllerCA.hasValue());
-}
-
-/**
- * Test to verify the @c InputControllerCapabilityAgent cannot be created if config param is empty.
- */
-TEST_F(InputControllerCapabilityAgentTest, test_createEmptyConfigFail) {
-    auto mockHandler = std::make_shared<MockHandler>(INPUT_CONTROLLER_EMPTY_CONFIG);
-    auto inputControllerCA = create(mockHandler, m_mockExceptionEncounteredSender);
-    ASSERT_FALSE(inputControllerCA.hasValue());
-}
-
-/**
- * Test to verify the @c InputControllerCapabilityAgent cannot be created if the configuration is not correct.
- */
-TEST_F(InputControllerCapabilityAgentTest, test_createWithDuplicateFriendlyNamesFail) {
-    auto mockHandler = std::make_shared<MockHandler>(INPUT_CONTROLLER_DUPLICATE_FRIENDLY_NAMES_CONFIG);
-    auto inputControllerCA = create(mockHandler, m_mockExceptionEncounteredSender);
-    ASSERT_FALSE(inputControllerCA.hasValue());
-}
-
-/**
- * Test to verify if a valid SelectInput directive will set the input successfully.
- */
-TEST_F(InputControllerCapabilityAgentTest, test_selectInputDirectiveSuccess) {
-    // Create a SelectInput AVSDirective.
-    auto directivePair = AVSDirective::create(SELECT_INPUT_DIRECTIVE_JSON_STRING, nullptr, "");
-    std::shared_ptr<AVSDirective> directive = std::move(directivePair.first);
-
-    m_inputControllerCA.directiveHandler->handleDirectiveImmediately(directive);
-    auto observerReturned = m_mockHandler->waitOnInputChange();
-    EXPECT_TRUE(observerReturned.hasValue());
-    EXPECT_EQ("HDMI1", observerReturned.value());
-}
-
-/**
- * Test to verify if interface will send exceptions when the directive received is invalid
- */
-TEST_F(InputControllerCapabilityAgentTest, test_processInvalidDirectiveFail) {
-    std::shared_ptr<AVSDirective> directive1 =
-        AVSDirective::create(SELECT_INPUT_DIRECTIVE_INVALID_INPUT_JSON_STRING, nullptr, "").first;
-    std::shared_ptr<AVSDirective> directive2 =
-        AVSDirective::create(SELECT_INPUT_MISSING_TAG_DIRECTIVE_JSON_STRING, nullptr, "").first;
-    std::shared_ptr<AVSDirective> directive3 =
-        AVSDirective::create(SELECT_INPUT_EMPTY_INPUT_DIRECTIVE_JSON_STRING, nullptr, "").first;
-
-    EXPECT_CALL(*m_mockExceptionEncounteredSender, sendExceptionEncountered(_, _, _)).Times(3);
-    m_inputControllerCA.directiveHandler->handleDirectiveImmediately(directive1);
-    m_inputControllerCA.directiveHandler->handleDirectiveImmediately(directive2);
-    m_inputControllerCA.directiveHandler->handleDirectiveImmediately(directive3);
-
-    auto observerReturned = m_mockHandler->waitOnInputChange();
-    EXPECT_FALSE(observerReturned.hasValue());
-}
-
-}  // namespace test
-}  // namespace acsdkInputController
-}  // namespace alexaClientSDK
diff --git a/capabilities/InputController/acsdkInputControllerInterfaces/CMakeLists.txt b/capabilities/InputController/acsdkInputControllerInterfaces/CMakeLists.txt
deleted file mode 100644
index ce9fde3472..0000000000
--- a/capabilities/InputController/acsdkInputControllerInterfaces/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-project(acsdkInputControllerInterfaces LANGUAGES CXX)
-
-include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
-
-add_library(acsdkInputControllerInterfaces INTERFACE)
-
-target_include_directories(acsdkInputControllerInterfaces INTERFACE
-        "${acsdkInputControllerInterfaces_SOURCE_DIR}/include")
-
-# install interface
-asdk_install_interface()
\ No newline at end of file
diff --git a/capabilities/InputController/acsdkInputControllerInterfaces/include/acsdkInputControllerInterfaces/InputControllerHandlerInterface.h b/capabilities/InputController/acsdkInputControllerInterfaces/include/acsdkInputControllerInterfaces/InputControllerHandlerInterface.h
deleted file mode 100644
index ad7b7a2397..0000000000
--- a/capabilities/InputController/acsdkInputControllerInterfaces/include/acsdkInputControllerInterfaces/InputControllerHandlerInterface.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKINPUTCONTROLLERINTERFACES_INPUTCONTROLLERHANDLERINTERFACE_H_
-#define ACSDKINPUTCONTROLLERINTERFACES_INPUTCONTROLLERHANDLERINTERFACE_H_
-
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-
-namespace alexaClientSDK {
-namespace acsdkInputControllerInterfaces {
-
-/**
- * An interface to handle input changes from InputController.
- */
-class InputControllerHandlerInterface {
-public:
-    /**
-     * Destructor.
-     */
-    virtual ~InputControllerHandlerInterface() = default;
-
-    /**
-     * Alias to a type used for defining the inputs.  The key of the map is the input, and the set is the
-     * friendlyNames associated with the input.  For more information, please refer to the Alexa.InputController API.
-     *
-     * @see https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/inputcontroller.html
-     */
-    using InputFriendlyNameType = std::unordered_map<std::string, std::unordered_set<std::string>>;
-
-    /// The configuration of the inputs on the device.
-    struct InputConfigurations {
-        /// Inputs and its friendly names of the device.
-        InputFriendlyNameType inputs;
-    };
-
-    /**
-     * A function to get the input configuration of the device.
-     *
-     * @return The @c InputConfigurations of the device.
-     */
-    virtual InputConfigurations getConfiguration() = 0;
-
-    /**
-     * A callback function to request the change of the input on the device.  The @c InputController does not remember
-     * the previous input, so this callback will be called whenever AVS notifies a change in input.  Also, during
-     * initialization, the application is responsible for remembering the previous input, as the @c InputController
-     * does not notify the application of the previous input with this callback.
-     *
-     * @param input The selected input on the product.  The input is guaranteed to be one of the inputs as specified in
-     * the @c InputConfigurations from @c getConfiguration().
-     * @return A bool indicate if the change in input is successful or not.
-     *
-     */
-    virtual bool onInputChange(const std::string& input) = 0;
-};
-
-}  // namespace acsdkInputControllerInterfaces
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKINPUTCONTROLLERINTERFACES_INPUTCONTROLLERHANDLERINTERFACE_H_
diff --git a/capabilities/LiveViewController/.clang-format b/capabilities/LiveViewController/.clang-format
new file mode 100644
index 0000000000..382ffea861
--- /dev/null
+++ b/capabilities/LiveViewController/.clang-format
@@ -0,0 +1,101 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
diff --git a/capabilities/LiveViewController/AlexaLiveViewController/CMakeLists.txt b/capabilities/LiveViewController/AlexaLiveViewController/CMakeLists.txt
new file mode 100644
index 0000000000..d0d201e3d9
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewController/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaLiveViewController LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("src")
+add_subdirectory("test")
\ No newline at end of file
diff --git a/capabilities/LiveViewController/AlexaLiveViewController/include/acsdk/AlexaLiveViewController/AlexaLiveViewControllerFactory.h b/capabilities/LiveViewController/AlexaLiveViewController/include/acsdk/AlexaLiveViewController/AlexaLiveViewControllerFactory.h
new file mode 100644
index 0000000000..a0ba4b70ef
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewController/include/acsdk/AlexaLiveViewController/AlexaLiveViewControllerFactory.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLER_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLER_ALEXALIVEVIEWCONTROLLERFACTORY_H_
+#define ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLER_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLER_ALEXALIVEVIEWCONTROLLERFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerInterface.h>
+#include <acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/DirectiveHandlerInterface.h>
+#include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace alexaLiveViewController {
+
+/**
+ * This factory can be used to create a new @c AlexaLiveViewControllerFactory
+ * object which could be a parameter for capability agent construction.
+ */
+class AlexaLiveViewControllerFactory {
+private:
+    /**
+     * This object contains the interfaces to interact with the AlexaLiveViewController Capability Agent.
+     */
+    struct LiveViewControllerCapabilityAgentData {
+        /// An Interface used to receive Alexa.Camera.LiveViewController directives.
+        std::shared_ptr<avsCommon::sdkInterfaces::DirectiveHandlerInterface> directiveHandler;
+        /// An interface that provides the configurations of the capabilities being implemented by this capability
+        /// agent.
+        std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface> capabilityConfiguration;
+        /// An interface used to notify LiveViewController observers.
+        std::shared_ptr<alexaLiveViewControllerInterfaces::LiveViewControllerObserverInterface>
+            liveViewControllerObserver;
+        /// The object responsible for cleaning up this capability agent's objects during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+public:
+    /**
+     * Creates a new LiveViewController capability agent
+     *
+     * @param endpointId An endpoint to which this capability is associated.
+     * @param liveViewController An interface that this object will use to perform the live view controller operations.
+     * @param messageSender An interface used to send events to AVS.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     *
+     * @return A @c LiveViewControllerCapabilityAgentData object if successful, otherwise an @c Optional object with no
+     * value.
+     */
+    static avsCommon::utils::Optional<LiveViewControllerCapabilityAgentData> create(
+        const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+        const std::shared_ptr<alexaLiveViewControllerInterfaces::LiveViewControllerInterface>& liveViewController,
+        const std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface>& messageSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender);
+};
+
+}  // namespace alexaLiveViewController
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLER_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLER_ALEXALIVEVIEWCONTROLLERFACTORY_H_
diff --git a/capabilities/LiveViewController/AlexaLiveViewController/privateInclude/acsdk/AlexaLiveViewController/private/AlexaLiveViewControllerCapabilityAgent.h b/capabilities/LiveViewController/AlexaLiveViewController/privateInclude/acsdk/AlexaLiveViewController/private/AlexaLiveViewControllerCapabilityAgent.h
new file mode 100644
index 0000000000..f46470bf5e
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewController/privateInclude/acsdk/AlexaLiveViewController/private/AlexaLiveViewControllerCapabilityAgent.h
@@ -0,0 +1,361 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLER_PRIVATEINCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLER_PRIVATE_ALEXALIVEVIEWCONTROLLERCAPABILITYAGENT_H_
+#define ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLER_PRIVATEINCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLER_PRIVATE_ALEXALIVEVIEWCONTROLLERCAPABILITYAGENT_H_
+
+#include <memory>
+#include <string>
+#include <unordered_set>
+
+#include <rapidjson/document.h>
+
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/AVS/CapabilityState.h>
+#include <AVSCommon/SDKInterfaces/AlexaInterfaceMessageSenderInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/MessageSenderInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include <RTCSCNativeInterface/RtcscAppClientListenerInterface.h>
+#include <RTCSCNativeInterface/RtcscAppClientInterface.h>
+#include <RTCSCNativeInterface/Types/MediaConnectionState.h>
+#include <RTCSCNativeInterface/Types/MediaSide.h>
+#include <RTCSCNativeInterface/Types/MediaType.h>
+#include <RTCSCNativeInterface/Types/Optional.h>
+#include <RTCSCNativeInterface/Types/RtcscErrorCode.h>
+#include <RTCSCNativeInterface/Types/SessionState.h>
+#include <RTCSCNativeInterface/Types/VideoEffect.h>
+
+#include <acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerInterface.h>
+
+namespace alexaClientSDK {
+namespace alexaLiveViewController {
+
+/**
+ * The @c AlexaLiveViewControllerCapabilityAgent is responsible for handling Alexa.LiveViewController directives and
+ * calls the @c LiveViewControllerInterface APIs.
+ *
+ * This class implements a @c CapabilityAgent that handles the @c Alexa.LiveViewController Interface.
+ */
+class AlexaLiveViewControllerCapabilityAgent
+        : public avsCommon::avs::CapabilityAgent
+        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public alexaLiveViewControllerInterfaces::LiveViewControllerObserverInterface
+        , public rtc::native::RtcscAppClientListenerInterface
+        , public std::enable_shared_from_this<AlexaLiveViewControllerCapabilityAgent> {
+public:
+    /// Alias to improve readability.
+    using EndpointIdentifier = avsCommon::sdkInterfaces::endpoints::EndpointIdentifier;
+
+    /**
+     * Create an instance of @c AlexaLiveViewControllerCapabilityAgent.
+     *
+     * @param endpointId An endpoint to which this capability is associated.
+     * @param liveViewController An interface that this object will use to perform the live view controller operations.
+     * @param messageSender The object to use for sending events.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     * @return @c nullptr if the inputs are invalid, else a new instance of @c AlexaLiveViewControllerCapabilityAgent.
+     */
+    static std::shared_ptr<AlexaLiveViewControllerCapabilityAgent> create(
+        EndpointIdentifier endpointId,
+        std::shared_ptr<alexaLiveViewControllerInterfaces::LiveViewControllerInterface> liveViewController,
+        std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender);
+
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
+    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
+    /// @}
+
+    /// @name LiveViewControllerObserverInterface Functions
+    /// @{
+    void onMicrophoneStateChanged(alexaLiveViewControllerInterfaces::AudioState microphoneState) override;
+    void onLiveViewCleared() override;
+    /// @}
+
+    /// @name RtcscAppClientListenerInterface Functions
+    /// @{
+    void onSessionAvailable(const std::string& sessionId) override;
+    void onSessionRemoved(const std::string& sessionId) override;
+    void onError(
+        rtc::native::RtcscErrorCode errorCode,
+        const std::string& errorMessage,
+        const rtc::native::Optional<std::string>& sessionId) override;
+    void onSessionStateChanged(const std::string& sessionId, rtc::native::SessionState sessionState) override;
+    void onMediaStatusChanged(
+        const std::string& sessionId,
+        rtc::native::MediaSide mediaSide,
+        rtc::native::MediaType mediaType,
+        bool enabled) override;
+    void onVideoEffectChanged(
+        const std::string& sessionId,
+        rtc::native::VideoEffect currentVideoEffect,
+        int videoEffectDurationMs) override;
+    void onMediaConnectionStateChanged(const std::string& sessionId, rtc::native::MediaConnectionState state) override;
+    void onFirstFrameRendered(const std::string& sessionId, rtc::native::MediaSide mediaSide) override;
+    void onFirstFrameReceived(const std::string& sessionId, rtc::native::MediaType mediaType) override;
+    /// @}
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /**
+     * Set the rtcscAppClient used for communications.
+     *
+     * @param rtcscAppClient The @c RtcscAppClient to set
+     * @note This function should only be used for testing purposes. No call to any other method should
+     * be done prior to this call.
+     */
+    void setRtcscAppClient(const std::shared_ptr<rtc::native::RtcscAppClientInterface>& rtcscAppClient);
+
+private:
+    /**
+     * Constructor.
+     *
+     * @param endpointId An endpoint to which this capability is associated.
+     * @param liveViewController An interface that this object will use to perform the live view controller operations.
+     * @param messageSender The object to use for sending events.
+     * @param contextManager An interface to which this object will send property state updates.
+     * @param responseSender An interface that this object will use to send the response to AVS.
+     * @param exceptionSender An interface to report exceptions to AVS.
+     */
+    AlexaLiveViewControllerCapabilityAgent(
+        EndpointIdentifier endpointId,
+        std::shared_ptr<alexaLiveViewControllerInterfaces::LiveViewControllerInterface> liveViewController,
+        std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> messageSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> responseSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender);
+
+    /**
+     * Remove a directive from the map of message IDs to DirectiveInfo instances.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
+     */
+    void removeDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Send the handling completed notification and clean up the resources.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * This function handles a @c StartLiveView directive.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void handleStartLiveView(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * This function handles a @c StopLiveView directive.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void handleStopLiveView(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * This is a state machine function to handle the StartLiveView directive.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void executeStartLiveViewDirective(const std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * This is a state machine function to handle the StopLiveView directive.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void executeStopLiveViewDirective(const std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * This is an internal function that is called when the state machine is ready to clear live view.
+     */
+    void executeClearLiveView();
+
+    /**
+     * Handles any unknown directives received.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param type The @c ExceptionErrorType.
+     */
+    void handleUnknownDirective(std::shared_ptr<DirectiveInfo> info, avsCommon::avs::ExceptionErrorType type);
+
+    /**
+     * Call methods of @c AlexaInterfaceMessageSenderInterface based on the endpoint's response for a live view'
+     * controller method call.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param result This contains the endpoint's response for a live view controller call.
+     */
+    void executeSendResponseEvent(
+        const std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info,
+        const alexaLiveViewControllerInterfaces::LiveViewControllerInterface::Response& result);
+
+    /**
+     * Send Alexa interface error response.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     * @param alexaErrorResponseType Alexa interface error response type.
+     * @param responseMessage Alexa interface error response message.
+     */
+    void sendAlexaErrorResponse(
+        const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+        const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+        const std::string& responseMessage);
+
+    /**
+     * Builds the configuration json required for the discovery.
+     *
+     * @param configuration The live view controller configuration object containing the supported display modes,
+     * overlay types and overlay positions.
+     * @return The json string corresponding to the configuration.
+     */
+    std::string buildLiveViewControllerConfigurationJson(
+        const alexaLiveViewControllerInterfaces::Configuration& configuration);
+
+    /**
+     * Parse the payload received with Alexa.LiveViewController.StartLiveView directives.
+     *
+     * @param info The @c DirectiveInfo to read the payload string from.
+     * @return unique pointer to @c StartLiveViewRequest if the payload is parseable, else nullptr.
+     */
+    std::unique_ptr<alexaLiveViewControllerInterfaces::LiveViewControllerInterface::StartLiveViewRequest>
+    parseStartLiveViewDirectivePayload(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Parse the payload received with Alexa.LiveViewController.StopLiveView directives.
+     *
+     * @param info The @c DirectiveInfo to read the payload string from.
+     * @return true if the validation is successful, false otherwise.
+     */
+    bool validateStopLiveViewDirectivePayload(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * This function sends a live view event back to the cloud.
+     *
+     * @param eventName Name of the live view event
+     * @param payload Payload of the live view event
+     */
+    void executeSendLiveViewEvent(const std::string& eventName, const std::string& payload);
+
+    /**
+     * If m_rtcscAppClient was previously set do nothing otherwise set a new instance of it
+     */
+    void executeInstantiateRtcscAppClient();
+
+    /**
+     * This is an internal function that is called when the state machine is ready to display live view.
+     */
+    void executeRenderLiveView();
+
+    /**
+     * Internal function for disconnecting a given RTC client session.
+     *
+     * @param sessionId the id of the session to disconnect.
+     * @param disconnectCode the reason for disconnect code.
+     */
+    void executeDisconnectRtcscSession(
+        const std::string& sessionId,
+        rtc::native::RtcscAppDisconnectCode disconnectCode);
+
+    /**
+     * Internal function for determining if there is an active @c StartLiveView directive.
+     * @return true if there is an active @c StartLiveView directive.
+     */
+    bool hasActiveLiveView();
+
+    /**
+     * This function handles the notification of the render live view callbacks to all the observers. This function
+     * is intended to be used in the context of @c m_executor worker thread.
+     *
+     * @param isClearLiveView whether to clear the current displayed live view or not.
+     */
+    void executeRenderLiveViewCallbacks(bool isClearLiveView);
+
+    /**
+     * Set the microphone state
+     *
+     * @param enabled whether the microphone should be turned on or not
+     */
+    void setMicrophoneState(bool enabled);
+
+    /// Endpoint the capability agent associated to.
+    EndpointIdentifier m_endpointId;
+
+    /// Reference to @c LiveViewControllerInterface
+    std::shared_ptr<alexaLiveViewControllerInterfaces::LiveViewControllerInterface> m_liveViewController;
+
+    /// The @c MessageSender used to sent event.
+    std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface> m_messageSender;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// The @c AlexaInterfaceMessageSenderInterface used to send event messages.
+    std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface> m_responseSender;
+
+    /// RTCSC AppClient object
+    std::shared_ptr<rtc::native::RtcscAppClientInterface> m_rtcscAppClient;
+
+    /// The AppInfo object.
+    rtc::native::AppInfo m_appInfo;
+
+    /// The target endpoint ID obtained from StartLiveView directive.
+    std::string m_targetEndpointId;
+
+    /// The target type obtained from StartLiveView directive.
+    std::string m_targetType;
+
+    /// The sessionId obtained from the last StartLiveView directive.
+    std::string m_lastSessionId;
+
+    /// The sessionId obtained from the current StartLiveView directive.
+    std::string m_currentSessionId;
+
+    /// The concurrentTwoWayTalk obtained from the last StartLiveView directive.
+    alexaLiveViewControllerInterfaces::ConcurrentTwoWayTalkState m_concurrentTwoWayTalk;
+
+    /// The directive corresponding to the last StartLiveView directive.
+    std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> m_lastDisplayedDirective;
+
+    /// This is the worker thread for the @c AlexaLiveViewControllerCapabilityAgent.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> m_executor;
+};
+
+}  // namespace alexaLiveViewController
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLER_PRIVATEINCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLER_PRIVATE_ALEXALIVEVIEWCONTROLLERCAPABILITYAGENT_H_
diff --git a/capabilities/LiveViewController/AlexaLiveViewController/src/AlexaLiveViewControllerCapabilityAgent.cpp b/capabilities/LiveViewController/AlexaLiveViewController/src/AlexaLiveViewControllerCapabilityAgent.cpp
new file mode 100644
index 0000000000..6da5687e76
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewController/src/AlexaLiveViewControllerCapabilityAgent.cpp
@@ -0,0 +1,1431 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/AlexaLiveViewController/private/AlexaLiveViewControllerCapabilityAgent.h"
+
+#include <chrono>
+#include <memory>
+#include <rapidjson/error/en.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
+
+#include <AVSCommon/AVS/EventBuilder.h>
+#include <AVSCommon/Utils/JSON/JSONGenerator.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+namespace alexaClientSDK {
+namespace alexaLiveViewController {
+
+using namespace alexaClientSDK::avsCommon::avs;
+using namespace alexaClientSDK::avsCommon;
+using namespace alexaClientSDK::avsCommon::sdkInterfaces;
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::configuration;
+using namespace alexaClientSDK::avsCommon::utils::json;
+using namespace alexaLiveViewControllerInterfaces;
+
+/// String to identify log entries originating from this file.
+#define TAG "AlexaLiveViewControllerCapabilityAgent"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+/// The namespace for this capability agent.
+static const char* const NAMESPACE = "Alexa.Camera.LiveViewController";
+
+/// The supported version
+static const char* const INTERFACE_VERSION = "1.7";
+
+/// The name for StartLiveView directive
+static const char* const NAME_STARTLIVEVIEW = "StartLiveView";
+
+/// The name for StopLiveView directive
+static const char* const NAME_STOPLIVEVIEW = "StopLiveView";
+
+/// The StartLiveView directive signature.
+static const NamespaceAndName START_LIVE_VIEW{NAMESPACE, NAME_STARTLIVEVIEW};
+
+/// The StopLiveView directive signature.
+static const NamespaceAndName STOP_LIVE_VIEW{NAMESPACE, NAME_STOPLIVEVIEW};
+
+/// Supported display modes key
+static const char* const CONFIGURATION_DISPLAY_MODES_KEY = "supportedDisplayModes";
+
+/// Supported overlay types key
+static const char* const CONFIGURATION_OVERLAY_TYPES_KEY = "supportedOverlayTypes";
+
+/// Supported overlay positions key
+static const char* const CONFIGURATION_OVERLAY_POSITIONS_KEY = "supportedOverlayPositions";
+
+/// App identifier sent to RTCSessionController App Client.
+static const char* const APP_IDENTIFIER = "SmartHome-LiveView";
+
+/// The configuration key
+static const char* const CAPABILITY_CONFIGURATION_KEY = "configurations";
+
+/// LiveViewStarted event name.
+static const char* const LIVE_VIEW_STARTED_EVENT_NAME = "LiveViewStarted";
+
+/// LiveViewStopped event name.
+static const char* const LIVE_VIEW_STOPPED_EVENT_NAME = "LiveViewStopped";
+
+/// Identifier for the SessionId.
+static const char* const SESSION_ID_FIELD = "sessionId";
+
+/// Identifier for the Target.
+static const char* const TARGET_FIELD = "target";
+
+/// Identifier for a target's endpointId.
+static const char* const ENDPOINT_ID_FIELD = "endpointId";
+
+/// Identifier for a target's type.
+static const char* const TYPE_FIELD = "type";
+
+/// Identifier for the Role.
+static const char* const ROLE_FIELD = "role";
+
+/// Identifier for the participants.
+static const char* const PARTICIPANTS_FIELD = "participants";
+
+/// Identifier for the viewers in participants.
+static const char* const VIEWERS_FIELD = "viewers";
+
+/// Identifier for the name of a viewer.
+static const char* const VIEWER_NAME_FIELD = "name";
+
+/// Identifier for the hasCameraControl property of a viewer.
+static const char* const VIEWER_HAS_CAMERA_CONTROL_FIELD = "hasCameraControl";
+
+/// Identifier for the state of a viewer.
+static const char* const VIEWER_STATE_FIELD = "state";
+
+/// Identifier for the camera in participants.
+static const char* const CAMERA_FIELD = "camera";
+
+/// Identifier for the camera name in participants.
+static const char* const CAMERA_NAME_FIELD = "name";
+
+/// Identifier for the camera make in participants.
+static const char* const CAMERA_MAKE_FIELD = "make";
+
+/// Identifier for the camera model in participants.
+static const char* const CAMERA_MODEL_FIELD = "model";
+
+/// Identifier for the camera capabilities in participants.
+static const char* const CAMERA_CAPABILITIES_FIELD = "capabilities";
+
+/// Identifier for the viewerExperience.
+static const char* const VIEWER_EXPERIENCE_FIELD = "viewerExperience";
+
+/// Identifier for a viewerExperience's suggestedDisplay.
+static const char* const SUGGESTED_DISPLAY_FIELD = "suggestedDisplay";
+
+/// Identifier for a suggestedDisplay's displayMode.
+static const char* const DISPLAY_MODE_FIELD = "displayMode";
+
+/// Identifier for a suggestedDisplay's overlayType.
+static const char* const OVERLAY_TYPE_FIELD = "overlayType";
+
+/// Identifier for a suggestedDisplay's overlayPosition.
+static const char* const OVERLAY_POSITION_FIELD = "overlayPosition";
+
+/// Identifier for a viewerExperience's audioProperties.
+static const char* const AUDIO_PROPERTIES_FIELD = "audioProperties";
+
+/// Identifier for an audioProperties' talkMode.
+static const char* const TALK_MODE_FIELD = "talkMode";
+
+/// Identifier for an audioProperties' concurrentTwoWayTalk.
+static const char* const CONCURRENT_TWO_WAY_TALK_FIELD = "concurrentTwoWayTalk";
+
+/// Identifier for an audioProperties' microphoneState.
+static const char* const MICROPHONE_STATE_FIELD = "microphoneState";
+
+/// Identifier for an audioProperties' speakerState.
+static const char* const SPEAKER_STATE_FIELD = "speakerState";
+
+/// Identifier for a viewerExperience's liveViewTrigger.
+static const char* const LIVE_VIEW_TRIGGER_FIELD = "liveViewTrigger";
+
+/// Identifier for a viewerExperience's idleTimeoutInMilliseconds.
+static const char* const IDLE_TIMEOUT_FIELD = "idleTimeoutInMilliseconds";
+
+/**
+ * Converts the given string to a @c ConcurrentTwoWayTalkState.
+ *
+ * @param concurrentTwoWayTalkStateString String representing the concurrentTwoWayTalkState.
+ * @return ConcurrentTwoWayTalkState matching the given string.
+ */
+static ConcurrentTwoWayTalkState concurrentTwoWayTalkFromString(const std::string& concurrentTwoWayTalkStateString) {
+    if ("ENABLED" == concurrentTwoWayTalkStateString) {
+        return ConcurrentTwoWayTalkState::ENABLED;
+    } else if ("DISABLED" == concurrentTwoWayTalkStateString) {
+        return ConcurrentTwoWayTalkState::DISABLED;
+    } else {
+        return ConcurrentTwoWayTalkState::UNKNOWN;
+    }
+}
+
+/**
+ * Converts the given string to a @c TargetType.
+ *
+ * @param targetTypeString String representing the TargetType.
+ * @return TargetType matching the given string.
+ */
+static Target::TargetType targetTypeFromString(const std::string& targetTypeString) {
+    if ("ALEXA_ENDPOINT" == targetTypeString) {
+        return Target::TargetType::ALEXA_ENDPOINT;
+    } else {
+        return Target::TargetType::UNKNOWN;
+    }
+}
+
+/**
+ * Converts the given string to a @c Role.
+ *
+ * @param roleString String representing the Role.
+ * @return Role matching the given string.
+ */
+static Role roleFromString(const std::string& roleString) {
+    if ("CAMERA" == roleString) {
+        return Role::CAMERA;
+    } else if ("VIEWER" == roleString) {
+        return Role::VIEWER;
+    } else {
+        return Role::UNKNOWN;
+    }
+}
+
+/**
+ * Converts the given string to a @c ViewerState.
+ *
+ * @param viewerStateString String representing the ViewerState.
+ * @return ViewerState matching the given string.
+ */
+static Viewer::ViewerState viewerStateFromString(const std::string& viewerStateString) {
+    if ("CONNECTED" == viewerStateString) {
+        return Viewer::ViewerState::CONNECTED;
+    } else if ("CONNECTING" == viewerStateString) {
+        return Viewer::ViewerState::CONNECTING;
+    } else {
+        return Viewer::ViewerState::UNKNOWN;
+    }
+}
+
+/**
+ * Converts the given string to a @c DisplayMode.
+ *
+ * @param displayModeString String representing the DisplayMode.
+ * @return DisplayMode matching the given string.
+ */
+static DisplayMode displayModeFromString(const std::string& displayModeString) {
+    if ("FULL_SCREEN" == displayModeString) {
+        return DisplayMode::FULL_SCREEN;
+    } else if ("OVERLAY" == displayModeString) {
+        return DisplayMode::OVERLAY;
+    } else {
+        return DisplayMode::UNKNOWN;
+    }
+}
+
+/**
+ * Converts the given string to a @c OverlayPosition.
+ *
+ * @param overlayPositionString String representing the OverlayPosition.
+ * @return OverlayPosition matching the given string.
+ */
+static OverlayPosition overlayPositionFromString(const std::string& overlayPositionString) {
+    if ("TOP_RIGHT" == overlayPositionString) {
+        return OverlayPosition::TOP_RIGHT;
+    } else if ("TOP_LEFT" == overlayPositionString) {
+        return OverlayPosition::TOP_LEFT;
+    } else if ("BOTTOM_RIGHT" == overlayPositionString) {
+        return OverlayPosition::BOTTOM_RIGHT;
+    } else if ("BOTTOM_LEFT" == overlayPositionString) {
+        return OverlayPosition::BOTTOM_LEFT;
+    } else {
+        return OverlayPosition::UNKNOWN;
+    }
+}
+
+/**
+ * Converts the given string to a @c OverlayType.
+ *
+ * @param overlayTypeString String representing the OverlayType.
+ * @return OverlayType matching the given string.
+ */
+static OverlayType overlayTypeFromString(const std::string& overlayTypeString) {
+    if ("PICTURE_IN_PICTURE" == overlayTypeString) {
+        return OverlayType::PICTURE_IN_PICTURE;
+    } else if ("NONE" == overlayTypeString) {
+        return OverlayType::NONE;
+    } else {
+        return OverlayType::UNKNOWN;
+    }
+}
+
+/**
+ * Converts the given string to a @c TalkMode.
+ *
+ * @param talkModeString String representing the TalkMode.
+ * @return TalkMode matching the given string.
+ */
+static TalkMode talkModeFromString(const std::string& talkModeString) {
+    if ("PRESS_AND_HOLD" == talkModeString) {
+        return TalkMode::PRESS_AND_HOLD;
+    } else if ("TAP" == talkModeString) {
+        return TalkMode::TAP;
+    } else if ("NO_SUPPORT" == talkModeString) {
+        return TalkMode::NO_SUPPORT;
+    } else {
+        return TalkMode::UNKNOWN;
+    }
+}
+
+/**
+ * Converts the given string to a @c AudioState.
+ *
+ * @param audioStateString String representing the AudioState.
+ * @return AudioState matching the given string.
+ */
+static AudioState audioStateFromString(const std::string& audioStateString) {
+    if ("MUTED" == audioStateString) {
+        return AudioState::MUTED;
+    } else if ("UNMUTED" == audioStateString) {
+        return AudioState::UNMUTED;
+    } else if ("DISABLED" == audioStateString) {
+        return AudioState::DISABLED;
+    } else {
+        return AudioState::UNKNOWN;
+    }
+}
+
+/**
+ * Converts the given string to a @c LiveViewTrigger.
+ *
+ * @param liveViewTriggerString String representing the LiveViewTrigger.
+ * @return LiveViewTrigger matching the given string.
+ */
+static LiveViewTrigger liveViewTriggerFromString(const std::string& liveViewTriggerString) {
+    if ("AUTOMATED_EVENT" == liveViewTriggerString) {
+        return LiveViewTrigger::AUTOMATED_EVENT;
+    } else if ("USER_ACTION" == liveViewTriggerString) {
+        return LiveViewTrigger::USER_ACTION;
+    } else {
+        return LiveViewTrigger::UNKNOWN;
+    }
+}
+
+/**
+ * Converts the given string to a @c MotionCapability.
+ *
+ * @param motionCapabilityString String representing the MotionCapability.
+ * @return MotionCapability matching the given string.
+ */
+static MotionCapability motionCapabilityFromString(const std::string& motionCapabilityString) {
+    if ("PHYSICAL_PAN" == motionCapabilityString) {
+        return MotionCapability::PHYSICAL_PAN;
+    } else if ("PHYSICAL_TILT" == motionCapabilityString) {
+        return MotionCapability::PHYSICAL_TILT;
+    } else if ("PHYSICAL_ZOOM" == motionCapabilityString) {
+        return MotionCapability::PHYSICAL_ZOOM;
+    } else {
+        return MotionCapability::UNKNOWN;
+    }
+}
+
+/**
+ * Helper function to convert the display modes to strings and add it to the Configuration json.
+ *
+ * @param @c displayModes The set of display modes.
+ * @param @c jsonGenerator JsonGenerator object used to build the json string
+ */
+static void addDisplayModesArrayToConfiguration(
+    const std::set<DisplayMode>& displayModes,
+    avsCommon::utils::json::JsonGenerator* jsonGenerator) {
+    std::set<std::string> displayModesArray;
+    for (const auto& displayMode : displayModes) {
+        displayModesArray.insert(displayModeToString(displayMode));
+    }
+    jsonGenerator->addStringArray(CONFIGURATION_DISPLAY_MODES_KEY, displayModesArray);
+}
+
+/**
+ * Helper function to convert the overlay types to strings and add it to the Configuration json.
+ *
+ * @param @c overlayTypes The set of overlay types.
+ * @param @c jsonGenerator JsonGenerator object used to build the json string
+ */
+static void addOverlayTypesArrayToConfiguration(
+    const std::set<OverlayType>& overlayTypes,
+    avsCommon::utils::json::JsonGenerator* jsonGenerator) {
+    std::set<std::string> overlayTypesArray;
+    for (const auto& overlayType : overlayTypes) {
+        overlayTypesArray.insert(overlayTypeToString(overlayType));
+    }
+    jsonGenerator->addStringArray(CONFIGURATION_OVERLAY_TYPES_KEY, overlayTypesArray);
+}
+
+/**
+ * Helper function to convert the overlay positions to strings and add it to the Configuration json.
+ *
+ * @param @c overlayPositions The set of overlay positions.
+ * @param @c jsonGenerator JsonGenerator object used to build the json string
+ */
+static void addOverlayPositionsArrayToConfiguration(
+    const std::set<OverlayPosition>& overlayPositions,
+    avsCommon::utils::json::JsonGenerator* jsonGenerator) {
+    std::set<std::string> overlayPositionsArray;
+    for (const auto& overlayPosition : overlayPositions) {
+        overlayPositionsArray.insert(overlayPositionToString(overlayPosition));
+    }
+    jsonGenerator->addStringArray(CONFIGURATION_OVERLAY_POSITIONS_KEY, overlayPositionsArray);
+}
+
+std::shared_ptr<AlexaLiveViewControllerCapabilityAgent> AlexaLiveViewControllerCapabilityAgent::create(
+    EndpointIdentifier endpointId,
+    std::shared_ptr<LiveViewControllerInterface> liveViewController,
+    std::shared_ptr<MessageSenderInterface> messageSender,
+    std::shared_ptr<ContextManagerInterface> contextManager,
+    std::shared_ptr<AlexaInterfaceMessageSenderInterface> responseSender,
+    std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionSender) {
+    if (endpointId.empty()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "emptyEndpointId"));
+        return nullptr;
+    }
+    if (!liveViewController) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullLiveViewController"));
+        return nullptr;
+    }
+    if (!messageSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullMessageSender"));
+        return nullptr;
+    }
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManager"));
+        return nullptr;
+    }
+    if (!responseSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullResponseSender"));
+        return nullptr;
+    }
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    auto liveViewControllerCapabilityAgent =
+        std::shared_ptr<AlexaLiveViewControllerCapabilityAgent>(new AlexaLiveViewControllerCapabilityAgent(
+            endpointId,
+            std::move(liveViewController),
+            std::move(messageSender),
+            std::move(contextManager),
+            std::move(responseSender),
+            std::move(exceptionSender)));
+
+    if (!liveViewControllerCapabilityAgent) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "instantiationFailed"));
+        return nullptr;
+    }
+
+    return liveViewControllerCapabilityAgent;
+}
+
+AlexaLiveViewControllerCapabilityAgent::AlexaLiveViewControllerCapabilityAgent(
+    EndpointIdentifier endpointId,
+    std::shared_ptr<LiveViewControllerInterface> liveViewController,
+    std::shared_ptr<MessageSenderInterface> messageSender,
+    std::shared_ptr<ContextManagerInterface> contextManager,
+    std::shared_ptr<AlexaInterfaceMessageSenderInterface> responseSender,
+    std::shared_ptr<ExceptionEncounteredSenderInterface> exceptionSender) :
+        CapabilityAgent{NAMESPACE, exceptionSender},
+        RequiresShutdown{"AlexaLiveViewControllerCapabilityAgent"},
+        m_endpointId{std::move(endpointId)},
+        m_liveViewController{std::move(liveViewController)},
+        m_messageSender{std::move(messageSender)},
+        m_contextManager{std::move(contextManager)},
+        m_responseSender{std::move(responseSender)},
+        m_concurrentTwoWayTalk{ConcurrentTwoWayTalkState::DISABLED} {
+    m_executor = std::make_shared<avsCommon::utils::threading::Executor>();
+    m_appInfo = rtc::native::AppInfo{APP_IDENTIFIER};
+}
+
+void AlexaLiveViewControllerCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!directive) {
+        ACSDK_ERROR(LX("handleDirectiveImmediatelyFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+}
+
+void AlexaLiveViewControllerCapabilityAgent::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    // do nothing.
+}
+
+void AlexaLiveViewControllerCapabilityAgent::handleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("handleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+
+    ACSDK_DEBUG5(LX("handleDirective")
+                     .d("name", info->directive->getName())
+                     .d("messageId", info->directive->getMessageId())
+                     .d("correlationToken", info->directive->getCorrelationToken()));
+
+    if (info->directive->getName() == NAME_STARTLIVEVIEW) {
+        handleStartLiveView(info);
+    } else if (info->directive->getName() == NAME_STOPLIVEVIEW) {
+        handleStopLiveView(info);
+    } else {
+        handleUnknownDirective(info, ExceptionErrorType::UNSUPPORTED_OPERATION);
+    }
+}
+
+void AlexaLiveViewControllerCapabilityAgent::handleStartLiveView(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+
+    m_executor->submit([this, info]() {
+        ACSDK_DEBUG9(LX("handleStartLiveViewInExecutor").sensitive("payload", info->directive->getPayload()));
+
+        // Process the StartLiveView directive and send LiveViewStarted event
+        auto startLiveViewRequest = parseStartLiveViewDirectivePayload(info);
+        if (!startLiveViewRequest) {
+            ACSDK_ERROR(LX("handleStartLiveViewInExecutor").d("reason", "unableToParseDirectivePayload"));
+            handleUnknownDirective(info, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        // Initiate the RtcscAppClient
+        executeInstantiateRtcscAppClient();
+
+        // We only allow one active session at time with the Rtcsc Client, so disconnect the current session if active.
+        if (!m_lastSessionId.empty() && m_lastSessionId != m_currentSessionId) {
+            ACSDK_DEBUG5(LX("handleStartLiveViewInExecutor").d("interrupt session", "session id changed"));
+            executeDisconnectRtcscSession(
+                m_lastSessionId, rtc::native::RtcscAppDisconnectCode::HIGHER_PRIORITY_SESSION_INTERRUPTED);
+        }
+        m_lastSessionId = m_currentSessionId;
+
+        LiveViewControllerInterface::Response result;
+        result = m_liveViewController->start(std::move(startLiveViewRequest));
+        executeStartLiveViewDirective(info);
+        executeSetHandlingCompleted(info);
+        executeSendResponseEvent(info, result);
+    });
+}
+
+std::unique_ptr<LiveViewControllerInterface::StartLiveViewRequest> AlexaLiveViewControllerCapabilityAgent::
+    parseStartLiveViewDirectivePayload(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+
+    // Initialize the StartLiveViewRequest
+    auto startLiveViewRequest = std::unique_ptr<LiveViewControllerInterface::StartLiveViewRequest>(
+        new LiveViewControllerInterface::StartLiveViewRequest());
+
+    // Parse the StartLiveView directive
+    rapidjson::Document payload;
+    rapidjson::ParseResult parseResult = payload.Parse(info->directive->getPayload());
+    if (!parseResult) {
+        ACSDK_ERROR(LX("handleStartLiveViewInExecutor")
+                        .d("reason", rapidjson::GetParseError_En(parseResult.Code()))
+                        .d("offset", parseResult.Offset())
+                        .d("messageId", info->directive->getMessageId()));
+        sendExceptionEncounteredAndReportFailed(
+            info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+        return nullptr;
+    }
+
+    // SessionId
+    std::string sessionId;
+    if (!jsonUtils::retrieveValue(payload, SESSION_ID_FIELD, &sessionId)) {
+        ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoSessionId"));
+        sendExceptionEncounteredAndReportFailed(info, "missing sessionId");
+        return nullptr;
+    }
+    m_currentSessionId = sessionId;
+    startLiveViewRequest->sessionId = sessionId;
+
+    // Target object
+    rapidjson::Value::ConstMemberIterator target;
+    std::string targetParsedPayload;
+    if (jsonUtils::findNode(payload, TARGET_FIELD, &target) &&
+        jsonUtils::convertToValue(target->value, &targetParsedPayload)) {
+        rapidjson::Document doc;
+        doc.Parse(targetParsedPayload);
+
+        if (doc.HasMember(ENDPOINT_ID_FIELD) && doc[ENDPOINT_ID_FIELD].IsString()) {
+            m_targetEndpointId = doc[ENDPOINT_ID_FIELD].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoEndpointId"));
+            sendExceptionEncounteredAndReportFailed(info, "missing EndpointId");
+            return nullptr;
+        }
+
+        if (doc.HasMember(TYPE_FIELD) && doc[TYPE_FIELD].IsString()) {
+            m_targetType = doc[TYPE_FIELD].GetString();
+        } else {
+            ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").m("NoType"));
+            sendExceptionEncounteredAndReportFailed(info, "missing Type");
+            return nullptr;
+        }
+    } else {
+        ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoTarget"));
+        sendExceptionEncounteredAndReportFailed(info, "missing Target");
+        return nullptr;
+    }
+    Target targetObject;
+    targetObject.endpointId = m_targetEndpointId;
+    targetObject.type = targetTypeFromString(m_targetType);
+    startLiveViewRequest->target = targetObject;
+
+    // Role value
+    std::string role;
+    if (!jsonUtils::retrieveValue(payload, ROLE_FIELD, &role)) {
+        ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoRole"));
+        sendExceptionEncounteredAndReportFailed(info, "missing Role");
+        return nullptr;
+    } else if (roleFromString(role) != Role::VIEWER) {
+        ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "only supporting viewer role"));
+        sendExceptionEncounteredAndReportFailed(info, "only supporting viewer role");
+        return nullptr;
+    }
+    startLiveViewRequest->role = roleFromString(role);
+
+    // Participants object
+    rapidjson::Value::ConstMemberIterator participantsIterator;
+    std::string participantsPayload;
+    std::set<Viewer> viewers;
+    std::set<MotionCapability> motionCapabilities;
+    Camera camera;
+    Viewer viewer;
+    if (jsonUtils::findNode(payload, PARTICIPANTS_FIELD, &participantsIterator) &&
+        jsonUtils::convertToValue(participantsIterator->value, &participantsPayload)) {
+        rapidjson::Document doc;
+        doc.Parse(participantsPayload);
+
+        // Parse viewers array
+        if (doc.HasMember(VIEWERS_FIELD) && doc[VIEWERS_FIELD].IsArray()) {
+            for (auto& viewerObject : doc[VIEWERS_FIELD].GetArray()) {
+                if (!viewerObject.IsObject()) {
+                    continue;
+                }
+
+                // Parse name
+                if (viewerObject.HasMember(VIEWER_NAME_FIELD) && viewerObject[VIEWER_NAME_FIELD].IsString()) {
+                    viewer.name = viewerObject[VIEWER_NAME_FIELD].GetString();
+                } else {
+                    ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoName"));
+                    sendExceptionEncounteredAndReportFailed(info, "missing Name");
+                    return nullptr;
+                }
+
+                // Parse hasCameraControl
+                if (viewerObject.HasMember(VIEWER_HAS_CAMERA_CONTROL_FIELD) &&
+                    viewerObject[VIEWER_HAS_CAMERA_CONTROL_FIELD].IsBool()) {
+                    viewer.hasCameraControl = viewerObject[VIEWER_HAS_CAMERA_CONTROL_FIELD].GetBool();
+                } else {
+                    ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoHasCameraControl"));
+                    sendExceptionEncounteredAndReportFailed(info, "missing HasCameraControl");
+                    return nullptr;
+                }
+
+                // Parse state
+                if (viewerObject.HasMember(VIEWER_STATE_FIELD) && viewerObject[VIEWER_STATE_FIELD].IsString()) {
+                    viewer.state = viewerStateFromString(viewerObject[VIEWER_STATE_FIELD].GetString());
+                } else {
+                    ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoState"));
+                    sendExceptionEncounteredAndReportFailed(info, "missing State");
+                    return nullptr;
+                }
+
+                viewers.emplace(viewer);
+            }
+        } else {
+            ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoViewers"));
+            sendExceptionEncounteredAndReportFailed(info, "missing Viewers");
+            return nullptr;
+        }
+
+        // Parse camera object
+        if (doc.HasMember(CAMERA_FIELD) && doc[CAMERA_FIELD].IsObject()) {
+            auto cameraObject = doc[CAMERA_FIELD].GetObject();
+
+            // Parse name
+            if (cameraObject.HasMember(CAMERA_NAME_FIELD) && cameraObject[CAMERA_NAME_FIELD].IsString()) {
+                camera.name = cameraObject[CAMERA_NAME_FIELD].GetString();
+            } else {
+                ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoName"));
+                sendExceptionEncounteredAndReportFailed(info, "missing Name");
+                return nullptr;
+            }
+
+            // Parse make
+            if (cameraObject.HasMember(CAMERA_MAKE_FIELD) && cameraObject[CAMERA_MAKE_FIELD].IsString()) {
+                camera.make = cameraObject[CAMERA_MAKE_FIELD].GetString();
+            } else {
+                ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoMake"));
+                sendExceptionEncounteredAndReportFailed(info, "missing Make");
+                return nullptr;
+            }
+
+            // Parse model
+            if (cameraObject.HasMember(CAMERA_MODEL_FIELD) && cameraObject[CAMERA_MODEL_FIELD].IsString()) {
+                camera.model.set(cameraObject[CAMERA_MODEL_FIELD].GetString());
+            } else {
+                ACSDK_WARN(LX("parseStartLiveViewDirectivePayload").d("reason", "NoModel"));
+            }
+
+            // Parse capabilities
+            if (cameraObject.HasMember(CAMERA_CAPABILITIES_FIELD) &&
+                cameraObject[CAMERA_CAPABILITIES_FIELD].IsArray()) {
+                for (auto& motionCapability : cameraObject[CAMERA_CAPABILITIES_FIELD].GetArray()) {
+                    if (!motionCapability.IsString()) {
+                        continue;
+                    }
+                    motionCapabilities.emplace(motionCapabilityFromString(motionCapability.GetString()));
+                }
+                camera.capabilities = motionCapabilities;
+            } else {
+                ACSDK_WARN(LX("parseStartLiveViewDirectivePayload").d("reason", "NoCapabilities"));
+            }
+        } else {
+            ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoCamera"));
+            sendExceptionEncounteredAndReportFailed(info, "missing Camera");
+            return nullptr;
+        }
+    } else {
+        ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoParticipants"));
+        sendExceptionEncounteredAndReportFailed(info, "missing Participants");
+        return nullptr;
+    }
+    Participants participantsObject;
+    participantsObject.viewers = viewers;
+    participantsObject.camera = camera;
+    startLiveViewRequest->participants = participantsObject;
+
+    // ViewerExperience object
+    rapidjson::Value::ConstMemberIterator viewerExperienceIterator;
+    std::string viewerExperiencePayload;
+    DisplayProperties suggestedDisplay;
+    AudioProperties audioProperties;
+    LiveViewTrigger liveViewTrigger;
+    int64_t idleTimeoutInMilliseconds;
+    m_concurrentTwoWayTalk = ConcurrentTwoWayTalkState::DISABLED;
+    if (jsonUtils::findNode(payload, VIEWER_EXPERIENCE_FIELD, &viewerExperienceIterator) &&
+        jsonUtils::convertToValue(viewerExperienceIterator->value, &viewerExperiencePayload)) {
+        rapidjson::Document doc;
+        doc.Parse(viewerExperiencePayload);
+
+        // Parse suggested display
+        if (doc.HasMember(SUGGESTED_DISPLAY_FIELD) && doc[SUGGESTED_DISPLAY_FIELD].IsObject()) {
+            auto suggestedDisplayObject = doc[SUGGESTED_DISPLAY_FIELD].GetObject();
+
+            // Parse display mode
+            if (suggestedDisplayObject.HasMember(DISPLAY_MODE_FIELD) &&
+                suggestedDisplayObject[DISPLAY_MODE_FIELD].IsString()) {
+                suggestedDisplay.displayMode =
+                    displayModeFromString(suggestedDisplayObject[DISPLAY_MODE_FIELD].GetString());
+            } else {
+                ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoDisplayMode"));
+                sendExceptionEncounteredAndReportFailed(info, "missing DisplayMode");
+                return nullptr;
+            }
+            // Parse overlay type
+            if (suggestedDisplayObject.HasMember(OVERLAY_TYPE_FIELD) &&
+                suggestedDisplayObject[OVERLAY_TYPE_FIELD].IsString()) {
+                suggestedDisplay.overlayType.set(
+                    overlayTypeFromString(suggestedDisplayObject[OVERLAY_TYPE_FIELD].GetString()));
+            } else {
+                ACSDK_WARN(LX("parseStartLiveViewDirectivePayload").d("reason", "NoOverlayType"));
+            }
+            // Parse overlay position
+            if (suggestedDisplayObject.HasMember(OVERLAY_POSITION_FIELD) &&
+                suggestedDisplayObject[OVERLAY_POSITION_FIELD].IsString()) {
+                suggestedDisplay.overlayPosition.set(
+                    overlayPositionFromString(suggestedDisplayObject[OVERLAY_POSITION_FIELD].GetString()));
+            } else {
+                ACSDK_WARN(LX("parseStartLiveViewDirectivePayload").d("reason", "NoOverlayPosition"));
+            }
+        } else {
+            ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoAudioProperties"));
+            sendExceptionEncounteredAndReportFailed(info, "missing AudioProperties");
+            return nullptr;
+        }
+
+        // Parse audio properties
+        if (doc.HasMember(AUDIO_PROPERTIES_FIELD) && doc[AUDIO_PROPERTIES_FIELD].IsObject()) {
+            auto audioPropertiesObject = doc[AUDIO_PROPERTIES_FIELD].GetObject();
+
+            // Parse talk mode
+            if (audioPropertiesObject.HasMember(TALK_MODE_FIELD) && audioPropertiesObject[TALK_MODE_FIELD].IsString()) {
+                audioProperties.talkMode = talkModeFromString(audioPropertiesObject[TALK_MODE_FIELD].GetString());
+            } else {
+                ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoTalkMode"));
+                sendExceptionEncounteredAndReportFailed(info, "missing TalkMode");
+                return nullptr;
+            }
+
+            // Parse concurrent two-way talk
+            if (audioPropertiesObject.HasMember(CONCURRENT_TWO_WAY_TALK_FIELD) &&
+                audioPropertiesObject[CONCURRENT_TWO_WAY_TALK_FIELD].IsString()) {
+                m_concurrentTwoWayTalk =
+                    concurrentTwoWayTalkFromString(audioPropertiesObject[CONCURRENT_TWO_WAY_TALK_FIELD].GetString());
+                audioProperties.concurrentTwoWayTalk = m_concurrentTwoWayTalk;
+            } else {
+                ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoConcurrentTwoWayTalk"));
+                sendExceptionEncounteredAndReportFailed(info, "missing ConcurrentTwoWayTalk");
+                return nullptr;
+            }
+
+            // Parse microphone state
+            if (audioPropertiesObject.HasMember(MICROPHONE_STATE_FIELD) &&
+                audioPropertiesObject[MICROPHONE_STATE_FIELD].IsString()) {
+                audioProperties.microphoneState =
+                    audioStateFromString(audioPropertiesObject[MICROPHONE_STATE_FIELD].GetString());
+            } else {
+                ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoMicrophoneState"));
+                sendExceptionEncounteredAndReportFailed(info, "missing MicrophoneState");
+                return nullptr;
+            }
+
+            // Parse speaker state
+            if (audioPropertiesObject.HasMember(SPEAKER_STATE_FIELD) &&
+                audioPropertiesObject[SPEAKER_STATE_FIELD].IsString()) {
+                audioProperties.speakerState =
+                    audioStateFromString(audioPropertiesObject[SPEAKER_STATE_FIELD].GetString());
+            } else {
+                ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoSpeakerState"));
+                sendExceptionEncounteredAndReportFailed(info, "missing SpeakerState");
+                return nullptr;
+            }
+        } else {
+            ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoAudioProperties"));
+            sendExceptionEncounteredAndReportFailed(info, "missing AudioProperties");
+            return nullptr;
+        }
+
+        // Parse LiveViewTrigger
+        if (doc.HasMember(LIVE_VIEW_TRIGGER_FIELD) && doc[LIVE_VIEW_TRIGGER_FIELD].IsString()) {
+            liveViewTrigger = liveViewTriggerFromString(doc[LIVE_VIEW_TRIGGER_FIELD].GetString());
+        } else {
+            ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoLiveViewTrigger"));
+            sendExceptionEncounteredAndReportFailed(info, "missing LiveViewTrigger");
+            return nullptr;
+        }
+
+        // Parse IdleTimeoutInMilliseconds
+        if (!jsonUtils::retrieveValue(doc, IDLE_TIMEOUT_FIELD, &idleTimeoutInMilliseconds)) {
+            ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").m("NoIdleTimeoutInMilliseconds"));
+            sendExceptionEncounteredAndReportFailed(info, "missing IdleTimeoutInMilliseconds");
+            return nullptr;
+        }
+    } else {
+        ACSDK_ERROR(LX("parseStartLiveViewDirectivePayload").d("reason", "NoViewerExperience"));
+        sendExceptionEncounteredAndReportFailed(info, "missing ViewerExperience");
+        return nullptr;
+    }
+    ViewerExperience viewerExperienceObject;
+    viewerExperienceObject.suggestedDisplay = suggestedDisplay;
+    viewerExperienceObject.audioProperties = audioProperties;
+    viewerExperienceObject.liveViewTrigger = liveViewTrigger;
+    viewerExperienceObject.idleTimeoutInMilliseconds = std::chrono::milliseconds(idleTimeoutInMilliseconds);
+    startLiveViewRequest->viewerExperience = viewerExperienceObject;
+
+    // Set the StartLiveView request
+    return startLiveViewRequest;
+}
+
+void AlexaLiveViewControllerCapabilityAgent::executeStartLiveViewDirective(const std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    m_lastDisplayedDirective = info;
+
+    // Register with RTCSC App Client
+    if (!m_rtcscAppClient) {
+        ACSDK_ERROR(LX("executeStartLiveViewDirective").d("reason", "Null rtcscAppClient"));
+        sendExceptionEncounteredAndReportFailed(info, "Null rtcscAppClient", ExceptionErrorType::INTERNAL_ERROR);
+        m_lastDisplayedDirective.reset();
+        return;
+    }
+
+    auto errorCode = m_rtcscAppClient->registerAppClientListener(m_appInfo, this);
+    if (errorCode != rtc::native::RtcscErrorCode::SUCCESS) {
+        ACSDK_ERROR(LX(__func__).d("registerAppClientListener RtcscErrorCode", rtc::native::toString(errorCode)));
+        const std::string exceptionMessage = "registerAppClientListener results in " + rtc::native::toString(errorCode);
+        sendExceptionEncounteredAndReportFailed(info, exceptionMessage, ExceptionErrorType::INTERNAL_ERROR);
+        m_lastDisplayedDirective.reset();
+        return;
+    }
+
+    // Render live view
+    executeRenderLiveView();
+}
+
+void AlexaLiveViewControllerCapabilityAgent::executeRenderLiveView() {
+    ACSDK_DEBUG9(LX(__func__));
+
+    if (hasActiveLiveView()) {
+        executeRenderLiveViewCallbacks(false);
+    }
+}
+
+void AlexaLiveViewControllerCapabilityAgent::executeRenderLiveViewCallbacks(bool isClearLiveView) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!isClearLiveView) {
+        m_liveViewController->setCameraState(CameraState::CONNECTING);
+
+        // Send the LiveViewStartedEvent
+        rapidjson::Document targetPayload(rapidjson::kObjectType);
+        targetPayload.AddMember(
+            rapidjson::StringRef(ENDPOINT_ID_FIELD), m_targetEndpointId, targetPayload.GetAllocator());
+        targetPayload.AddMember(rapidjson::StringRef(TYPE_FIELD), m_targetType, targetPayload.GetAllocator());
+
+        rapidjson::Document liveViewStartedPayload(rapidjson::kObjectType);
+        liveViewStartedPayload.AddMember(
+            rapidjson::StringRef(SESSION_ID_FIELD), m_lastSessionId, liveViewStartedPayload.GetAllocator());
+        liveViewStartedPayload.AddMember(
+            rapidjson::StringRef(TARGET_FIELD), targetPayload, liveViewStartedPayload.GetAllocator());
+
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        if (liveViewStartedPayload.Accept(writer)) {
+            executeSendLiveViewEvent(LIVE_VIEW_STARTED_EVENT_NAME, buffer.GetString());
+        } else {
+            ACSDK_ERROR(LX(__func__).d("reason", "writerRefusedJsonObject"));
+        }
+
+    } else {
+        executeDisconnectRtcscSession(m_lastSessionId, rtc::native::RtcscAppDisconnectCode::USER_TERMINATED_SESSION);
+        m_lastDisplayedDirective = nullptr;
+
+        // Send the LiveViewStopped event
+        rapidjson::Document targetPayload(rapidjson::kObjectType);
+        targetPayload.AddMember(
+            rapidjson::StringRef(ENDPOINT_ID_FIELD), m_targetEndpointId, targetPayload.GetAllocator());
+        targetPayload.AddMember(rapidjson::StringRef(TYPE_FIELD), m_targetType, targetPayload.GetAllocator());
+
+        rapidjson::Document liveViewStoppedPayload(rapidjson::kObjectType);
+        liveViewStoppedPayload.AddMember(
+            rapidjson::StringRef(SESSION_ID_FIELD), m_lastSessionId, liveViewStoppedPayload.GetAllocator());
+        liveViewStoppedPayload.AddMember(
+            rapidjson::StringRef(TARGET_FIELD), targetPayload, liveViewStoppedPayload.GetAllocator());
+
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        if (liveViewStoppedPayload.Accept(writer)) {
+            executeSendLiveViewEvent(LIVE_VIEW_STOPPED_EVENT_NAME, buffer.GetString());
+        } else {
+            ACSDK_ERROR(LX(__func__).d("reason", "writerRefusedJsonObject"));
+        }
+        m_targetType = {};
+        m_targetEndpointId = {};
+    }
+}
+
+void AlexaLiveViewControllerCapabilityAgent::handleStopLiveView(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+
+    m_executor->submit([this, info]() {
+        ACSDK_DEBUG9(LX("handleStopLiveViewInExecutor").sensitive("payload", info->directive->getPayload()));
+        if (!validateStopLiveViewDirectivePayload(info)) {
+            ACSDK_ERROR(LX("handleStopLiveViewInExecutor").d("reason", "invalid StopLiveView directive"));
+            return;
+        }
+
+        LiveViewControllerInterface::Response result;
+        result = m_liveViewController->stop();
+        executeStopLiveViewDirective(info);
+        executeSetHandlingCompleted(info);
+        executeSendResponseEvent(info, result);
+    });
+}
+
+bool AlexaLiveViewControllerCapabilityAgent::validateStopLiveViewDirectivePayload(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    // Parse the StopLiveView directive
+    rapidjson::Document payload;
+    rapidjson::ParseResult parseResult = payload.Parse(info->directive->getPayload());
+    if (!parseResult) {
+        ACSDK_ERROR(LX("validateStopLiveViewDirectivePayload")
+                        .d("reason", rapidjson::GetParseError_En(parseResult.Code()))
+                        .d("offset", parseResult.Offset())
+                        .d("messageId", info->directive->getMessageId()));
+        sendExceptionEncounteredAndReportFailed(
+            info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+        return false;
+    }
+
+    /// Parse target object
+    rapidjson::Value::ConstMemberIterator target;
+    std::string targetParsedPayload;
+    std::string targetEndpointId;
+    std::string targetType;
+    if (jsonUtils::findNode(payload, TARGET_FIELD, &target) &&
+        jsonUtils::convertToValue(target->value, &targetParsedPayload)) {
+        rapidjson::Document doc;
+        doc.Parse(targetParsedPayload);
+
+        if (doc.HasMember(ENDPOINT_ID_FIELD) && doc[ENDPOINT_ID_FIELD].IsString()) {
+            targetEndpointId = doc[ENDPOINT_ID_FIELD].GetString();
+        } else {
+            ACSDK_WARN(LX("validateStopLiveViewDirectivePayload").d("reason", "NoTargetEndpointId"));
+        }
+
+        if (targetEndpointId != m_targetEndpointId) {
+            ACSDK_WARN(LX("validateStopLiveViewDirectivePayload")
+                           .d("reason", "mismatchedEndpointId")
+                           .d("expectedEndpointId", m_targetEndpointId)
+                           .d("receivedEndpointId", targetEndpointId));
+        }
+
+        if (doc.HasMember(TYPE_FIELD) && doc[TYPE_FIELD].IsString()) {
+            targetType = doc[TYPE_FIELD].GetString();
+        } else {
+            ACSDK_WARN(LX("validateStopLiveViewDirectivePayload").m("NoTargetType"));
+        }
+
+        if (!targetType.empty() && targetType != m_targetType) {
+            ACSDK_WARN(LX("validateStopLiveViewDirectivePayload")
+                           .d("reason", "mismatchedType")
+                           .d("expectedType", m_targetType)
+                           .d("receivedType", targetType));
+        }
+    } else {
+        ACSDK_WARN(LX("validateStopLiveViewDirectivePayload").d("reason", "NoTarget"));
+    }
+
+    return true;
+}
+
+void AlexaLiveViewControllerCapabilityAgent::executeStopLiveViewDirective(const std::shared_ptr<DirectiveInfo> info) {
+    executeClearLiveView();
+}
+
+void AlexaLiveViewControllerCapabilityAgent::executeClearLiveView() {
+    ACSDK_DEBUG9(LX(__func__));
+    if (hasActiveLiveView()) {
+        executeRenderLiveViewCallbacks(true);
+    }
+}
+
+void AlexaLiveViewControllerCapabilityAgent::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("cancelDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    removeDirective(info);
+}
+
+DirectiveHandlerConfiguration AlexaLiveViewControllerCapabilityAgent::getConfiguration() const {
+    ACSDK_DEBUG9(LX(__func__));
+    DirectiveHandlerConfiguration configuration;
+
+    configuration[START_LIVE_VIEW] = BlockingPolicy(BlockingPolicy::MEDIUM_VISUAL, true);
+    configuration[STOP_LIVE_VIEW] = BlockingPolicy(BlockingPolicy::MEDIUMS_AUDIO_AND_VISUAL, true);
+
+    return configuration;
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> AlexaLiveViewControllerCapabilityAgent::
+    getCapabilityConfigurations() {
+    auto additionalConfigurations = CapabilityConfiguration::AdditionalConfigurations();
+    auto config = m_liveViewController->getConfiguration();
+    auto configurationJson = buildLiveViewControllerConfigurationJson(config);
+    if (!configurationJson.empty()) {
+        additionalConfigurations[CAPABILITY_CONFIGURATION_KEY] = configurationJson;
+    }
+    CapabilityConfiguration configuration{CapabilityConfiguration::ALEXA_INTERFACE_TYPE,
+                                          NAMESPACE,
+                                          INTERFACE_VERSION,
+                                          Optional<std::string>(),  // instance
+                                          Optional<CapabilityConfiguration::Properties>(),
+                                          additionalConfigurations};
+    return {std::make_shared<alexaClientSDK::avsCommon::avs::CapabilityConfiguration>(configuration)};
+}
+
+void AlexaLiveViewControllerCapabilityAgent::doShutdown() {
+    ACSDK_DEBUG9(LX(__func__));
+    if (!m_executor->isShutdown()) {
+        m_executor->shutdown();
+    }
+    m_liveViewController.reset();
+    m_messageSender.reset();
+    m_contextManager.reset();
+    m_responseSender.reset();
+}
+
+void AlexaLiveViewControllerCapabilityAgent::removeDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (info->directive && info->result) {
+        CapabilityAgent::removeDirective(info->directive->getMessageId());
+    }
+}
+
+void AlexaLiveViewControllerCapabilityAgent::executeSetHandlingCompleted(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG9(LX(__func__));
+    if (info && info->result) {
+        info->result->setCompleted();
+        removeDirective(info);
+    }
+}
+
+void AlexaLiveViewControllerCapabilityAgent::handleUnknownDirective(
+    std::shared_ptr<DirectiveInfo> info,
+    avsCommon::avs::ExceptionErrorType type) {
+    ACSDK_ERROR(LX("requestedToHandleUnknownDirective")
+                    .d("reason", "unknownDirective")
+                    .d("namespace", info->directive->getNamespace())
+                    .d("name", info->directive->getName()));
+
+    m_executor->submit([this, info, type] {
+        const std::string exceptionMessage =
+            "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
+
+        sendExceptionEncounteredAndReportFailed(info, exceptionMessage, type);
+    });
+}
+
+void AlexaLiveViewControllerCapabilityAgent::executeSendResponseEvent(
+    const std::shared_ptr<avsCommon::avs::CapabilityAgent::DirectiveInfo> info,
+    const alexaLiveViewControllerInterfaces::LiveViewControllerInterface::Response& result) {
+    switch (result.type) {
+        case LiveViewControllerInterface::Response::Type::SUCCESS: {
+            m_responseSender->sendResponseEvent(
+                info->directive->getInstance(),
+                info->directive->getCorrelationToken(),
+                AVSMessageEndpoint(m_endpointId));
+            break;
+        }
+        case LiveViewControllerInterface::Response::Type::FAILED_BATTERY_TOO_LOW:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::ENDPOINT_LOW_POWER, result.errorMessage);
+            break;
+        case LiveViewControllerInterface::Response::Type::FAILED_UNAUTHORIZED:
+            sendAlexaErrorResponse(
+                info,
+                AlexaInterfaceMessageSenderInterface::ErrorResponseType::INVALID_AUTHORIZATION_CREDENTIAL,
+                result.errorMessage);
+            break;
+        case LiveViewControllerInterface::Response::Type::FAILED_MEDIA_SOURCE_NOT_FOUND:
+        case LiveViewControllerInterface::Response::Type::FAILED_MEDIA_SOURCE_ASLEEP:
+        case LiveViewControllerInterface::Response::Type::FAILED_MEDIA_SOURCE_TURNED_OFF:
+        case LiveViewControllerInterface::Response::Type::FAILED_INTERNAL_ERROR:
+            sendAlexaErrorResponse(
+                info, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, result.errorMessage);
+            break;
+    }
+}
+
+void AlexaLiveViewControllerCapabilityAgent::sendAlexaErrorResponse(
+    const std::shared_ptr<CapabilityAgent::DirectiveInfo> info,
+    const avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface::ErrorResponseType alexaErrorResponseType,
+    const std::string& responseMessage) {
+    m_responseSender->sendErrorResponseEvent(
+        info->directive->getInstance(),
+        info->directive->getCorrelationToken(),
+        AVSMessageEndpoint(m_endpointId),
+        alexaErrorResponseType,
+        responseMessage);
+}
+
+std::string AlexaLiveViewControllerCapabilityAgent::buildLiveViewControllerConfigurationJson(
+    const Configuration& configuration) {
+    avsCommon::utils::json::JsonGenerator jsonGenerator;
+
+    if (configuration.supportedDisplayModes.empty()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "EmptyDisplayModesArray"));
+        return "";
+    } else {
+        addDisplayModesArrayToConfiguration(configuration.supportedDisplayModes, &jsonGenerator);
+    }
+
+    if (configuration.supportedOverlayTypes.empty()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "EmptyOverlayTypesArray"));
+        return "";
+    } else {
+        addOverlayTypesArrayToConfiguration(configuration.supportedOverlayTypes, &jsonGenerator);
+    }
+
+    if (configuration.supportedOverlayPositions.empty()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "EmptyOverlayPositionsArray"));
+        return "";
+    } else {
+        addOverlayPositionsArrayToConfiguration(configuration.supportedOverlayPositions, &jsonGenerator);
+    }
+
+    ACSDK_DEBUG9(LX(__func__).sensitive("configuration", jsonGenerator.toString()));
+    return jsonGenerator.toString();
+}
+
+void AlexaLiveViewControllerCapabilityAgent::executeSendLiveViewEvent(
+    const std::string& eventName,
+    const std::string& payload) {
+    m_executor->submit([this, eventName, payload]() {
+        auto msgIdAndJsonEvent = avsCommon::avs::buildJsonEventString(NAMESPACE, eventName, "", payload);
+        auto userEventMessage = std::make_shared<avsCommon::avs::MessageRequest>(msgIdAndJsonEvent.second);
+        ACSDK_DEBUG9(LX("Sending event to AVS").d("namespace", NAMESPACE).d("name", eventName));
+        m_messageSender->sendMessage(userEventMessage);
+    });
+}
+
+void AlexaLiveViewControllerCapabilityAgent::setRtcscAppClient(
+    const std::shared_ptr<rtc::native::RtcscAppClientInterface>& rtcscAppClient) {
+    ACSDK_WARN(LX(__func__).d("reason", "should be called in test only"));
+    m_rtcscAppClient = rtcscAppClient;
+}
+
+void AlexaLiveViewControllerCapabilityAgent::executeInstantiateRtcscAppClient() {
+    if (!m_rtcscAppClient) {
+        m_rtcscAppClient = rtc::native::RtcscAppClientInterface::getInstance();
+    }
+}
+
+void AlexaLiveViewControllerCapabilityAgent::executeDisconnectRtcscSession(
+    const std::string& sessionId,
+    rtc::native::RtcscAppDisconnectCode disconnectCode) {
+    ACSDK_DEBUG9(LX(__func__).d("sessionId", sessionId).d("disconnectCode", rtc::native::toString(disconnectCode)));
+    if (m_rtcscAppClient) {
+        auto result = m_rtcscAppClient->disconnectSession(sessionId, disconnectCode);
+        if (result != rtc::native::RtcscErrorCode::SUCCESS) {
+            ACSDK_WARN(LX(__func__).d("reason", toString(result)));
+        }
+    }
+}
+
+bool AlexaLiveViewControllerCapabilityAgent::hasActiveLiveView() {
+    /**
+     * Checks if there is an active StartLiveView directive by comparing the namespace and name of the last displayed
+     * against Alexa.Camera.LiveViewController.StartLiveView.
+     */
+    return m_lastDisplayedDirective && m_lastDisplayedDirective->directive->getNamespace() == NAMESPACE &&
+           m_lastDisplayedDirective->directive->getName() == NAME_STARTLIVEVIEW;
+}
+
+void AlexaLiveViewControllerCapabilityAgent::setMicrophoneState(bool enabled) {
+    ACSDK_DEBUG9(LX(__func__).d("micEnabled", enabled));
+
+    m_executor->submit([this, enabled]() {
+        if (!m_rtcscAppClient) {
+            ACSDK_ERROR(LX("setMicrophoneStateFailed").d("reason", "Null rtcscAppClient"));
+            return;
+        }
+
+        auto result = m_rtcscAppClient->setLocalAudioState(m_lastSessionId, enabled);
+        if (result != rtc::native::RtcscErrorCode::SUCCESS) {
+            ACSDK_ERROR(LX("setMicrophoneStateInExecutor")
+                            .d("reason", "setLocalAudioStateFailed")
+                            .d("result", toString(result)));
+        }
+        if (m_concurrentTwoWayTalk != ConcurrentTwoWayTalkState::ENABLED) {
+            result = m_rtcscAppClient->setRemoteAudioState(m_lastSessionId, !enabled);
+            if (result != rtc::native::RtcscErrorCode::SUCCESS) {
+                ACSDK_ERROR(LX("setMicrophoneStateInExecutor")
+                                .d("reason", "setRemoteAudioState")
+                                .d("result", toString(result)));
+            }
+        }
+    });
+}
+
+void AlexaLiveViewControllerCapabilityAgent::onSessionAvailable(const std::string& sessionId) {
+    ACSDK_DEBUG9(LX(__func__).d("sessionId", sessionId));
+
+    m_executor->submit([this, sessionId]() {
+        if (!hasActiveLiveView()) {
+            ACSDK_WARN(LX(__func__).d("onSessionAvailableFailedInExecutor", "No active live view directive"));
+            return;
+        }
+        if (sessionId != m_lastSessionId) {
+            ACSDK_WARN(LX("onSessionAvailableFailedInExecutor")
+                           .d("reason", "Mismatched sessionIds from LiveViewController and RTCSessionController")
+                           .d("current SessionId", m_lastSessionId)
+                           .d("received SessionId", sessionId));
+            return;
+        }
+
+        if (!m_rtcscAppClient) {
+            ACSDK_ERROR(LX("onSessionAvailableFailedInExecutor").d("reason", "Null rtcscAppClient"));
+            return;
+        }
+
+        auto result = m_rtcscAppClient->signalReadyForSession(sessionId);
+
+        if (result != rtc::native::RtcscErrorCode::SUCCESS) {
+            ACSDK_WARN(LX("onSessionAvailableFailedInExecutor").d("reason", toString(result)));
+        }
+    });
+}
+
+void AlexaLiveViewControllerCapabilityAgent::onSessionRemoved(const std::string& sessionId) {
+    ACSDK_DEBUG9(LX(__func__).d("sessionId", sessionId));
+
+    m_executor->submit([this, sessionId]() {
+        if (!hasActiveLiveView()) {
+            // Unregister as an RTC client listener when a session has been removed, and we have no active live view
+            // directive.
+            ACSDK_DEBUG9(LX("onSessionRemovedInExecutor").d("unregistering app listener", sessionId));
+            if (m_rtcscAppClient) {
+                auto result = m_rtcscAppClient->unregisterAppClientListener(m_appInfo);
+                ACSDK_DEBUG9(LX("onSessionRemovedInExecutor").d("rtcscUnregisterCode", rtc::native::toString(result)));
+                if (result != rtc::native::RtcscErrorCode::SUCCESS) {
+                    ACSDK_WARN(LX("onSessionRemovedInExecutor").d("reason", toString(result)));
+                }
+                m_rtcscAppClient.reset();
+                rtc::native::RtcscAppClientInterface::releaseInstance();
+            }
+        }
+        if (m_lastSessionId == sessionId) {
+            ACSDK_DEBUG9(LX("onSessionRemovedInExecutor").d("reset lastSessionId", sessionId));
+            m_lastSessionId = {};
+            m_currentSessionId = {};
+        }
+    });
+}
+
+void AlexaLiveViewControllerCapabilityAgent::onError(
+    rtc::native::RtcscErrorCode errorCode,
+    const std::string& errorMessage,
+    const rtc::native::Optional<std::string>& sessionId) {
+    ACSDK_DEBUG9(LX(__func__).d("errorCode", rtc::native::toString(errorCode)).d("errorMessage", errorMessage));
+    m_executor->submit([this, sessionId] {
+        if (!hasActiveLiveView()) {
+            ACSDK_WARN(LX("onErrorInExecutor").d("reason", "No active live view directive"));
+            return;
+        }
+        if (sessionId.hasValue() && sessionId.value() != m_lastSessionId) {
+            ACSDK_WARN(LX("onErrorInExecutor")
+                           .d("reason", "Mismatched sessionIds from LiveViewController and RTCSessionController")
+                           .d("current SessionId", m_lastSessionId)
+                           .d("received SessionId", sessionId.value()));
+            return;
+        }
+        m_liveViewController->setCameraState(CameraState::ERROR);
+    });
+}
+
+void AlexaLiveViewControllerCapabilityAgent::onSessionStateChanged(
+    const std::string& sessionId,
+    rtc::native::SessionState sessionState) {
+    ACSDK_DEBUG9(LX(__func__).d("sessionState", rtc::native::toString(sessionState)).d("sessionId", sessionId));
+    // No-op
+}
+
+void AlexaLiveViewControllerCapabilityAgent::onMediaStatusChanged(
+    const std::string& sessionId,
+    rtc::native::MediaSide mediaSide,
+    rtc::native::MediaType mediaType,
+    bool enabled) {
+    ACSDK_DEBUG9(LX(__func__)
+                     .d("mediaSide", rtc::native::toString(mediaSide))
+                     .d("mediaType", rtc::native::toString(mediaType))
+                     .d("sessionId", sessionId));
+    // No-op
+}
+
+void AlexaLiveViewControllerCapabilityAgent::onVideoEffectChanged(
+    const std::string& sessionId,
+    rtc::native::VideoEffect currentVideoEffect,
+    int videoEffectDurationMs) {
+    ACSDK_DEBUG9(LX(__func__)
+                     .d("sessionId", sessionId)
+                     .d("currentVideoEffect", rtc::native::toString(currentVideoEffect))
+                     .d("videoEffectDurationMs", videoEffectDurationMs));
+    // No-op
+}
+
+void AlexaLiveViewControllerCapabilityAgent::onMediaConnectionStateChanged(
+    const std::string& sessionId,
+    rtc::native::MediaConnectionState state) {
+    m_executor->submit([this, sessionId, state] {
+        ACSDK_DEBUG9(LX("onMediaConnectionStateChangedInExecutor").d("state", rtc::native::toString(state)));
+        if (!hasActiveLiveView()) {
+            ACSDK_WARN(LX("onMediaConnectionStateChangedInExecutor").d("reason", "No active live view directive"));
+            return;
+        }
+        if (sessionId != m_lastSessionId) {
+            ACSDK_WARN(LX("onMediaConnectionStateChangedInExecutor")
+                           .d("reason", "Mismatched sessionIds from LiveViewController and RTCSessionController")
+                           .d("current SessionId", m_lastSessionId)
+                           .d("received SessionId", sessionId));
+            return;
+        }
+        switch (state) {
+            case rtc::native::MediaConnectionState::CONNECTING:
+                m_liveViewController->setCameraState(CameraState::CONNECTING);
+                break;
+            case rtc::native::MediaConnectionState::CONNECTED:
+                m_liveViewController->setCameraState(CameraState::CONNECTED);
+                // TODO: RTCSC Client to provide API for setting mic state on init.
+                // For now, always init with mic MUTED, and wait for call from LVC UI to unmute
+                setMicrophoneState(false);
+                break;
+            case rtc::native::MediaConnectionState::DISCONNECTED:
+                m_liveViewController->setCameraState(CameraState::DISCONNECTED);
+                executeClearLiveView();
+                break;
+            case rtc::native::MediaConnectionState::UNKNOWN:
+                m_liveViewController->setCameraState(CameraState::UNKNOWN);
+                break;
+        }
+    });
+}
+
+void AlexaLiveViewControllerCapabilityAgent::onFirstFrameReceived(
+    const std::string& sessionId,
+    rtc::native::MediaType mediaType) {
+    ACSDK_DEBUG9(LX(__func__).d("sessionId", sessionId).d("mediaType", rtc::native::toString(mediaType)));
+    // No-op
+}
+
+void AlexaLiveViewControllerCapabilityAgent::onFirstFrameRendered(
+    const std::string& sessionId,
+    rtc::native::MediaSide mediaSide) {
+    ACSDK_DEBUG9(LX(__func__).d("sessionId", sessionId).d("mediaSide", rtc::native::toString(mediaSide)));
+    m_executor->submit([this, sessionId] {
+        if (!hasActiveLiveView()) {
+            ACSDK_WARN(LX("onFirstFrameRenderedInExecutor").d("reason", "No active live view directive"));
+            return;
+        }
+        if (sessionId != m_lastSessionId) {
+            ACSDK_WARN(LX("onFirstFrameRenderedInExecutor")
+                           .d("reason", "Mismatched sessionIds from LiveViewController and RTCSessionController")
+                           .d("current SessionId", m_lastSessionId)
+                           .d("received SessionId", sessionId));
+            return;
+        }
+    });
+}
+
+void AlexaLiveViewControllerCapabilityAgent::onMicrophoneStateChanged(
+    alexaLiveViewControllerInterfaces::AudioState microphoneState) {
+    setMicrophoneState(audioStateToMicrophoneState(microphoneState));
+}
+
+void AlexaLiveViewControllerCapabilityAgent::onLiveViewCleared() {
+    m_executor->submit([this]() { executeClearLiveView(); });
+}
+
+}  // namespace alexaLiveViewController
+}  // namespace alexaClientSDK
diff --git a/capabilities/LiveViewController/AlexaLiveViewController/src/AlexaLiveViewControllerFactory.cpp b/capabilities/LiveViewController/AlexaLiveViewController/src/AlexaLiveViewControllerFactory.cpp
new file mode 100644
index 0000000000..d6fae1aa09
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewController/src/AlexaLiveViewControllerFactory.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/AlexaLiveViewController/AlexaLiveViewControllerFactory.h"
+#include "acsdk/AlexaLiveViewController/private/AlexaLiveViewControllerCapabilityAgent.h"
+
+namespace alexaClientSDK {
+namespace alexaLiveViewController {
+
+avsCommon::utils::Optional<AlexaLiveViewControllerFactory::LiveViewControllerCapabilityAgentData>
+AlexaLiveViewControllerFactory::create(
+    const avsCommon::sdkInterfaces::endpoints::EndpointIdentifier& endpointId,
+    const std::shared_ptr<alexaLiveViewControllerInterfaces::LiveViewControllerInterface>& liveViewController,
+    const std::shared_ptr<avsCommon::sdkInterfaces::MessageSenderInterface>& messageSender,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AlexaInterfaceMessageSenderInterface>& responseSender,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender) {
+    AlexaLiveViewControllerFactory::LiveViewControllerCapabilityAgentData liveViewControllerCapabilityAgentData;
+    auto liveViewControllerCA = alexaLiveViewController::AlexaLiveViewControllerCapabilityAgent::create(
+        endpointId, liveViewController, messageSender, contextManager, responseSender, exceptionSender);
+    if (liveViewControllerCA) {
+        liveViewControllerCapabilityAgentData.capabilityConfiguration = liveViewControllerCA;
+        liveViewControllerCapabilityAgentData.liveViewControllerObserver = liveViewControllerCA;
+        liveViewControllerCapabilityAgentData.directiveHandler = liveViewControllerCA;
+        liveViewControllerCapabilityAgentData.requiresShutdown = liveViewControllerCA;
+        return avsCommon::utils::Optional<AlexaLiveViewControllerFactory::LiveViewControllerCapabilityAgentData>(
+            liveViewControllerCapabilityAgentData);
+    }
+
+    return avsCommon::utils::Optional<AlexaLiveViewControllerFactory::LiveViewControllerCapabilityAgentData>();
+}
+
+}  // namespace alexaLiveViewController
+}  // namespace alexaClientSDK
diff --git a/capabilities/LiveViewController/AlexaLiveViewController/src/CMakeLists.txt b/capabilities/LiveViewController/AlexaLiveViewController/src/CMakeLists.txt
new file mode 100644
index 0000000000..2180a0590a
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewController/src/CMakeLists.txt
@@ -0,0 +1,21 @@
+add_definitions("-DACSDK_LOG_MODULE=acsdkLiveViewController")
+
+add_library(acsdkAlexaLiveViewController
+        "AlexaLiveViewControllerCapabilityAgent.cpp"
+        "AlexaLiveViewControllerFactory.cpp")
+
+target_include_directories(acsdkAlexaLiveViewController PRIVATE
+        "${acsdkAlexaLiveViewController_SOURCE_DIR}/privateInclude")
+
+target_include_directories(acsdkAlexaLiveViewController PUBLIC
+        "${acsdkAlexaLiveViewController_SOURCE_DIR}/include"
+        "${ASDK_INCLUDE_DIRS}"
+        ${RTCSC_INCLUDE_DIR})
+
+target_link_libraries(acsdkAlexaLiveViewController
+        acsdkAlexaLiveViewControllerInterfaces
+        AVSCommon
+        ${RTCSC_LIB_PATH})
+
+# install target
+asdk_install()
\ No newline at end of file
diff --git a/capabilities/LiveViewController/AlexaLiveViewController/test/AlexaLiveViewControllerCapabilityAgentTest.cpp b/capabilities/LiveViewController/AlexaLiveViewController/test/AlexaLiveViewControllerCapabilityAgentTest.cpp
new file mode 100644
index 0000000000..82c9739e91
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewController/test/AlexaLiveViewControllerCapabilityAgentTest.cpp
@@ -0,0 +1,595 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <acsdk/AlexaLiveViewController/private/AlexaLiveViewControllerCapabilityAgent.h>
+#include <acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerInterface.h>
+#include <acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerObserverInterface.h>
+#include <RTCSCNativeInterface/RtcscAppClientInterface.h>
+
+#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointIdentifier.h>
+#include <AVSCommon/SDKInterfaces/MockAlexaInterfaceMessageSender.h>
+#include <AVSCommon/SDKInterfaces/MockContextManager.h>
+#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/SDKInterfaces/MockMessageSender.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/WaitEvent.h>
+
+namespace alexaClientSDK {
+namespace alexaLiveViewController {
+namespace test {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::memory;
+using namespace ::testing;
+
+using namespace alexaLiveViewController;
+using namespace alexaLiveViewControllerInterfaces;
+
+/// For readability.
+using EndpointIdentifier = endpoints::EndpointIdentifier;
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// The namespace for capability agent.
+static const std::string NAMESPACE{"Alexa.Camera.LiveViewController"};
+
+/// The supported version
+static const std::string INTERFACE_VERSION{"1.7"};
+
+/// The name for StartLiveView directive
+static const std::string NAME_STARTLIVEVIEW{"StartLiveView"};
+
+/// The name for StopLiveView directive
+static const std::string NAME_STOPLIVEVIEW{"StopLiveView"};
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
+
+/// The LiveViewStarted event signature.
+static const std::string LIVE_VIEW_STARTED_EVENT{"LiveViewStarted"};
+
+/// The LiveViewStopped event signature.
+static const std::string LIVE_VIEW_STOPPED_EVENT{"LiveViewStopped"};
+
+/// The test EndpointId
+static const EndpointIdentifier TEST_ENDPOINT_ID("testEndpointId");
+
+/// MessageId key.
+static const std::string MESSAGE_ID("messageId");
+
+/// MessageId for testing.
+static const std::string MESSAGE_ID_TEST("MessageId_Test");
+
+/// Dialog request Id key.
+static const std::string DIALOG_REQUEST_ID("dialogRequestId");
+
+/// DialogRequestId for testing.
+static const std::string DIALOG_REQUEST_ID_TEST("DialogRequestId_Test");
+
+/// Correlation token key.
+static const std::string CORRELATION_TOKEN("correlationToken");
+
+/// Correlation token for testing.
+static const std::string CORRELATION_TOKEN_TEST("CorrelationToken_Test");
+
+/// Event correlation token key.
+static const std::string EVENT_CORRELATION_TOKEN("eventCorrelationToken");
+
+/// Event correlation for testing.
+static const std::string EVENT_CORRELATION_TOKEN_TEST("EventCorrelationToken_Test");
+
+/// JSON key for the event section of a message.
+static const std::string MESSAGE_EVENT_KEY = "event";
+
+/// JSON key for the header section of a message.
+static const std::string MESSAGE_HEADER_KEY = "header";
+
+/// JSON key for the payload section of an message.
+static const std::string MESSAGE_PAYLOAD_KEY = "payload";
+
+/// JSON key for the namespace field of a message header.
+static const std::string MESSAGE_NAMESPACE_KEY = "namespace";
+
+/// JSON key for the name field of a message header.
+static const std::string MESSAGE_NAME_KEY = "name";
+
+/// Sample StartLiveView payload
+static const std::string START_LIVE_VIEW_PAYLOAD = R"(
+{
+    "sessionId" : "session_id",
+    "target" : {
+        "type" : "ALEXA_ENDPOINT",
+        "endpointId" : "endpoint_id of the viewing device"
+    },
+    "role" : "VIEWER",
+    "participants" : {
+        "viewers" : [
+            {
+                "name" : "name of the viewing device",
+                "hasCameraControl" : true,
+                "state" : "CONNECTING"
+            }
+        ],
+        "camera" : {
+            "name" : "name of camera streaming the live feed",
+            "make" : "camera make name",
+            "model" : "camera model name"
+        }
+    },
+    "viewerExperience" : {
+        "suggestedDisplay" : {
+            "displayMode" : "FULL_SCREEN",
+            "overlayType" : "NONE"
+        },
+        "audioProperties" : {
+            "talkMode" : "PRESS_AND_HOLD",
+            "concurrentTwoWayTalk" : "ENABLED",
+            "microphoneState" : "MUTED",
+            "speakerState" : "UNMUTED"
+        },
+        "liveViewTrigger" : "USER_ACTION",
+        "idleTimeoutInMilliseconds" : 15000
+    }
+})";
+
+/// Sample StopLiveView payload
+static const std::string STOP_LIVE_VIEW_PAYLOAD = R"(
+{
+    "sessionId" : "session_id",
+    "target" : {
+        "type" : "ALEXA_ENDPOINT",
+        "endpointId" : "endpoint_id of the viewing device"
+    }
+})";
+
+/// Expected LiveViewStarted payload for test purposes
+static const std::string EXPECTED_LIVE_VIEW_STARTED_PAYLOAD =
+    R"({"sessionId":"session_id","target":{"endpointId":"endpoint_id of the viewing device","type":"ALEXA_ENDPOINT"}})";
+
+/// Expected LiveViewStopped payload for test purposes
+static const std::string EXPECTED_LIVE_VIEW_STOPPED_PAYLOAD =
+    R"({"sessionId":"session_id","target":{"endpointId":"endpoint_id of the viewing device","type":"ALEXA_ENDPOINT"}})";
+
+class MockAlexaLiveViewControllerInterface : public LiveViewControllerInterface {
+public:
+    MOCK_METHOD1(startMock, Response(StartLiveViewRequest*));
+    MOCK_METHOD0(stopMock, Response());
+    MOCK_METHOD1(setCameraStateMock, Response(CameraState cameraState));
+    MOCK_METHOD0(getConfigurationMock, Configuration());
+    MOCK_METHOD1(addObserver, bool(std::weak_ptr<LiveViewControllerObserverInterface> observer));
+    MOCK_METHOD1(removeObserver, void(std::weak_ptr<LiveViewControllerObserverInterface> observer));
+
+    Response start(std::unique_ptr<StartLiveViewRequest> request) {
+        return startMock(request.get());
+    }
+
+    Response stop() {
+        return stopMock();
+    }
+
+    Response setCameraState(CameraState cameraState) {
+        return setCameraStateMock(cameraState);
+    }
+
+    Configuration getConfiguration() {
+        return getConfigurationMock();
+    }
+};
+
+class MockRtcscAppClient : public rtc::native::RtcscAppClientInterface {
+public:
+    MOCK_METHOD2(
+        registerAppClientListener,
+        rtc::native::RtcscErrorCode(
+            const rtc::native::AppInfo& appInfo,
+            rtc::native::RtcscAppClientListenerInterface* appClientListener));
+    MOCK_METHOD1(unregisterAppClientListener, rtc::native::RtcscErrorCode(const rtc::native::AppInfo& appInfo));
+    MOCK_METHOD2(
+        registerMetricsPublisherListener,
+        rtc::native::RtcscErrorCode(
+            const rtc::native::AppInfo& appInfo,
+            rtc::native::RtcscMetricsPublisherListenerInterface* metricsPublisherListener));
+    MOCK_METHOD1(unregisterMetricsPublisherListener, rtc::native::RtcscErrorCode(const rtc::native::AppInfo& appInfo));
+    MOCK_METHOD2(setLocalAudioState, rtc::native::RtcscErrorCode(const std::string& sessionId, bool audioEnabled));
+    MOCK_METHOD2(setLocalVideoState, rtc::native::RtcscErrorCode(const std::string& sessionId, bool videoEnabled));
+    MOCK_METHOD2(setRemoteAudioState, rtc::native::RtcscErrorCode(const std::string& sessionId, bool audioEnabled));
+    MOCK_METHOD1(acceptSession, rtc::native::RtcscErrorCode(const std::string& sessionId));
+    MOCK_METHOD2(
+        disconnectSession,
+        rtc::native::RtcscErrorCode(
+            const std::string& sessionId,
+            rtc::native::RtcscAppDisconnectCode rtcscAppDisconnectCode));
+    MOCK_METHOD2(
+        switchCamera,
+        rtc::native::RtcscErrorCode(const std::string& sessionId, const std::string& cameraName));
+    MOCK_METHOD1(signalReadyForSession, rtc::native::RtcscErrorCode(const std::string& sessionId));
+    MOCK_METHOD3(
+        setVideoEffect,
+        rtc::native::RtcscErrorCode(
+            const std::string& sessionId,
+            const rtc::native::VideoEffect& videoEffect,
+            int videoEffectDurationMs));
+    MOCK_METHOD2(
+        registerDataChannelListener,
+        bool(const std::string& sessionId, rtc::native::RtcscDataChannelListenerInterface* dataChannelListener));
+    MOCK_METHOD1(unregisterDataChannelListener, bool(const std::string& sessionId));
+    MOCK_METHOD4(
+        sendData,
+        bool(const std::string& sessionId, const std::string& label, const std::string& data, bool binary));
+    MOCK_METHOD3(
+        registerSurfaceConsumer,
+        void(
+            const std::string& sessionId,
+            std::shared_ptr<rtc::native::RtcscSurfaceConsumerInterface> surfaceConsumer,
+            rtc::native::MediaSide side));
+    MOCK_METHOD2(unregisterSurfaceConsumer, void(const std::string& sessionId, rtc::native::MediaSide side));
+};
+
+class AlexaLiveViewControllerCapabilityAgentTest : public ::testing::Test {
+public:
+    /// SetUp before each test case.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Constructor.
+    AlexaLiveViewControllerCapabilityAgentTest() {
+    }
+
+protected:
+    /// A mock @c LiveViewControllerInterface object.
+    std::shared_ptr<StrictMock<MockAlexaLiveViewControllerInterface>> m_mockLiveViewController;
+
+    /// A context manager
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>> m_mockContextManager;
+
+    /// The mock message sender.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockMessageSender>> m_mockMessageSender;
+
+    /// The mock response sender.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>> m_mockResponseSender;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>
+        m_mockDirectiveHandlerResult;
+
+    /// The mock @c RtcscAppClientInterface.
+    std::shared_ptr<StrictMock<MockRtcscAppClient>> m_mockRtcscAppClient;
+
+    /// A pointer to an instance of the LiveViewController that will be instantiated per test.
+    std::shared_ptr<AlexaLiveViewControllerCapabilityAgent> m_liveViewControllerCapabilityAgent;
+};
+
+void AlexaLiveViewControllerCapabilityAgentTest::SetUp() {
+    m_mockExceptionSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult =
+        make_unique<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>();
+    m_mockLiveViewController = std::make_shared<StrictMock<MockAlexaLiveViewControllerInterface>>();
+    m_mockMessageSender = std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockMessageSender>>();
+    m_mockContextManager = std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockContextManager>>();
+    m_mockResponseSender =
+        std::make_shared<StrictMock<avsCommon::sdkInterfaces::test::MockAlexaInterfaceMessageSender>>();
+
+    m_liveViewControllerCapabilityAgent = AlexaLiveViewControllerCapabilityAgent::create(
+        TEST_ENDPOINT_ID,
+        m_mockLiveViewController,
+        m_mockMessageSender,
+        m_mockContextManager,
+        m_mockResponseSender,
+        m_mockExceptionSender);
+
+    m_mockRtcscAppClient = std::make_shared<StrictMock<MockRtcscAppClient>>();
+    m_liveViewControllerCapabilityAgent->setRtcscAppClient(m_mockRtcscAppClient);
+}
+
+void AlexaLiveViewControllerCapabilityAgentTest::TearDown() {
+}
+
+/**
+ * Verify the request sent to AVS is as expected.
+ *
+ * @param request Request for the event that is being sent to the cloud.
+ * @param expectedEventName Name of the event being sent.
+ * @param expectedPayload Payload of the event being sent.
+ * @param expectedNameSpace Namespace of the event being sent.
+ */
+static void verifySendMessage(
+    std::shared_ptr<avsCommon::avs::MessageRequest> request,
+    const std::string expectedEventName,
+    const std::string expectedPayload,
+    const std::string expectedNameSpace) {
+    rapidjson::Document document;
+    document.Parse(request->getJsonContent());
+    auto event = document.FindMember(MESSAGE_EVENT_KEY);
+    EXPECT_NE(event, document.MemberEnd());
+
+    auto header = event->value.FindMember(MESSAGE_HEADER_KEY);
+    EXPECT_NE(header, event->value.MemberEnd());
+    auto payload = event->value.FindMember(MESSAGE_PAYLOAD_KEY);
+    EXPECT_NE(payload, event->value.MemberEnd());
+    EXPECT_EQ(header->value.FindMember(MESSAGE_NAMESPACE_KEY)->value.GetString(), expectedNameSpace);
+    EXPECT_EQ(header->value.FindMember(MESSAGE_NAME_KEY)->value.GetString(), expectedEventName);
+    EXPECT_NE(header->value.FindMember(MESSAGE_ID)->value.GetString(), "");
+
+    std::string messagePayload;
+    avsCommon::utils::json::jsonUtils::convertToValue(payload->value, &messagePayload);
+    EXPECT_EQ(messagePayload, expectedPayload);
+    EXPECT_EQ(request->attachmentReadersCount(), 0);
+}
+
+std::shared_ptr<AVSDirective> buildAVSDirective(std::string directiveName) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<avsCommon::avs::attachment::test::MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(
+        NAMESPACE, directiveName, MESSAGE_ID_TEST, DIALOG_REQUEST_ID_TEST, CORRELATION_TOKEN_TEST, INTERFACE_VERSION);
+    auto avsMessageEndpoint = AVSMessageEndpoint(TEST_ENDPOINT_ID);
+
+    if (directiveName == NAME_STARTLIVEVIEW) {
+        return AVSDirective::create(
+            "", avsMessageHeader, START_LIVE_VIEW_PAYLOAD, attachmentManager, "", avsMessageEndpoint);
+    } else if (directiveName == NAME_STOPLIVEVIEW) {
+        return AVSDirective::create(
+            "", avsMessageHeader, STOP_LIVE_VIEW_PAYLOAD, attachmentManager, "", avsMessageEndpoint);
+    } else {
+        return AVSDirective::create("", avsMessageHeader, "", attachmentManager, "", avsMessageEndpoint);
+    }
+}
+
+/// Test that create() returns a nullptr if called with invalid arguments.
+TEST_F(AlexaLiveViewControllerCapabilityAgentTest, test_givenInvalidParameters_create_shouldFail) {
+    ASSERT_THAT(
+        AlexaLiveViewControllerCapabilityAgent::create(
+            "",
+            m_mockLiveViewController,
+            m_mockMessageSender,
+            m_mockContextManager,
+            m_mockResponseSender,
+            m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaLiveViewControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID,
+            nullptr,
+            m_mockMessageSender,
+            m_mockContextManager,
+            m_mockResponseSender,
+            m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaLiveViewControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID,
+            m_mockLiveViewController,
+            m_mockMessageSender,
+            nullptr,
+            m_mockResponseSender,
+            m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaLiveViewControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID,
+            m_mockLiveViewController,
+            m_mockMessageSender,
+            m_mockContextManager,
+            nullptr,
+            m_mockExceptionSender),
+        IsNull());
+    ASSERT_THAT(
+        AlexaLiveViewControllerCapabilityAgent::create(
+            TEST_ENDPOINT_ID,
+            m_mockLiveViewController,
+            m_mockMessageSender,
+            m_mockContextManager,
+            m_mockResponseSender,
+            nullptr),
+        IsNull());
+}
+
+/**
+ * Test successful handling of StartLiveView and StopLiveView directives.
+ */
+TEST_F(AlexaLiveViewControllerCapabilityAgentTest, test_liveViewDirectives_successCase) {
+    avsCommon::utils::WaitEvent waitEvent, waitEvent2;
+    ON_CALL(*m_mockRtcscAppClient, registerAppClientListener(_, _))
+        .WillByDefault(Return(rtc::native::RtcscErrorCode::SUCCESS));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+    EXPECT_CALL(*m_mockRtcscAppClient, registerAppClientListener(_, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockLiveViewController, setCameraStateMock(_)).WillOnce(InvokeWithoutArgs([] {
+        return LiveViewControllerInterface::Response();
+    }));
+    EXPECT_CALL(*m_mockLiveViewController, startMock(_)).WillOnce(InvokeWithoutArgs([] {
+        return LiveViewControllerInterface::Response();
+    }));
+    auto liveViewStartedVerifyEvent = [&waitEvent](std::shared_ptr<avsCommon::avs::MessageRequest> request) {
+        verifySendMessage(request, LIVE_VIEW_STARTED_EVENT, EXPECTED_LIVE_VIEW_STARTED_PAYLOAD, NAMESPACE);
+        waitEvent.wakeUp();
+    };
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).WillOnce(Invoke(liveViewStartedVerifyEvent));
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _)).Times(Exactly(1));
+
+    ASSERT_THAT(m_liveViewControllerCapabilityAgent, NotNull());
+
+    // Simulate StartLiveView directive
+    std::shared_ptr<AVSDirective> startLiveViewdirective = buildAVSDirective(NAME_STARTLIVEVIEW);
+    m_liveViewControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        startLiveViewdirective, std::move(m_mockDirectiveHandlerResult));
+    m_liveViewControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    // Re-initializing the unique pointer after the move above.
+    m_mockDirectiveHandlerResult =
+        make_unique<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>();
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+    EXPECT_CALL(*m_mockRtcscAppClient, disconnectSession(_, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockLiveViewController, stopMock()).WillOnce(InvokeWithoutArgs([] {
+        return LiveViewControllerInterface::Response();
+    }));
+    auto liveViewStoppedVerifyEvent = [&waitEvent2](std::shared_ptr<avsCommon::avs::MessageRequest> request) {
+        verifySendMessage(request, LIVE_VIEW_STOPPED_EVENT, EXPECTED_LIVE_VIEW_STOPPED_PAYLOAD, NAMESPACE);
+        waitEvent2.wakeUp();
+    };
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).WillOnce(Invoke(liveViewStoppedVerifyEvent));
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _)).Times(Exactly(1));
+
+    // Simulate StopLiveView directive
+    std::shared_ptr<AVSDirective> stopLiveViewdirective = buildAVSDirective(NAME_STOPLIVEVIEW);
+    m_liveViewControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        stopLiveViewdirective, std::move(m_mockDirectiveHandlerResult));
+    m_liveViewControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent2.wait(TIMEOUT));
+    m_liveViewControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of StartLiveView directive.
+ */
+TEST_F(AlexaLiveViewControllerCapabilityAgentTest, test_startLiveViewDirective_errorCase) {
+    avsCommon::utils::WaitEvent waitEvent;
+    ON_CALL(*m_mockRtcscAppClient, registerAppClientListener(_, _))
+        .WillByDefault(Return(rtc::native::RtcscErrorCode::SUCCESS));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+    EXPECT_CALL(*m_mockRtcscAppClient, registerAppClientListener(_, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockLiveViewController, setCameraStateMock(_)).WillOnce(InvokeWithoutArgs([] {
+        return LiveViewControllerInterface::Response(
+            LiveViewControllerInterface::Response::Type::FAILED_INTERNAL_ERROR, "InternalError");
+    }));
+    EXPECT_CALL(*m_mockLiveViewController, startMock(_)).WillOnce(InvokeWithoutArgs([] {
+        return LiveViewControllerInterface::Response(
+            LiveViewControllerInterface::Response::Type::FAILED_INTERNAL_ERROR, "InternalError");
+    }));
+    auto verifyEvent = [&waitEvent](std::shared_ptr<avsCommon::avs::MessageRequest> request) {
+        verifySendMessage(request, LIVE_VIEW_STARTED_EVENT, EXPECTED_LIVE_VIEW_STARTED_PAYLOAD, NAMESPACE);
+        waitEvent.wakeUp();
+    };
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1)).WillOnce(Invoke(verifyEvent));
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(_, _, _, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, _))
+        .Times(Exactly(1));
+
+    ASSERT_THAT(m_liveViewControllerCapabilityAgent, NotNull());
+
+    // Simulate directive
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(NAME_STARTLIVEVIEW);
+    m_liveViewControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_liveViewControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    m_liveViewControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Test error path of StopLiveView directive.
+ */
+TEST_F(AlexaLiveViewControllerCapabilityAgentTest, test_stopLiveViewDirective_errorCase) {
+    avsCommon::utils::WaitEvent waitEvent, waitEvent2;
+    ON_CALL(*m_mockRtcscAppClient, registerAppClientListener(_, _))
+        .WillByDefault(Return(rtc::native::RtcscErrorCode::SUCCESS));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+    EXPECT_CALL(*m_mockRtcscAppClient, registerAppClientListener(_, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockLiveViewController, setCameraStateMock(_)).WillOnce(InvokeWithoutArgs([] {
+        return LiveViewControllerInterface::Response();
+    }));
+    EXPECT_CALL(*m_mockLiveViewController, startMock(_)).WillOnce(InvokeWithoutArgs([] {
+        return LiveViewControllerInterface::Response();
+    }));
+    auto liveViewStartedVerifyEvent = [&waitEvent](std::shared_ptr<avsCommon::avs::MessageRequest> request) {
+        verifySendMessage(request, LIVE_VIEW_STARTED_EVENT, EXPECTED_LIVE_VIEW_STARTED_PAYLOAD, NAMESPACE);
+        waitEvent.wakeUp();
+    };
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).WillOnce(Invoke(liveViewStartedVerifyEvent));
+    EXPECT_CALL(*m_mockResponseSender, sendResponseEvent(_, _, _, _)).Times(Exactly(1));
+
+    ASSERT_THAT(m_liveViewControllerCapabilityAgent, NotNull());
+
+    // Simulate StartLiveView directive
+    std::shared_ptr<AVSDirective> startLiveViewdirective = buildAVSDirective(NAME_STARTLIVEVIEW);
+    m_liveViewControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        startLiveViewdirective, std::move(m_mockDirectiveHandlerResult));
+    m_liveViewControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+
+    // Re-initializing the unique pointer after the move above.
+    m_mockDirectiveHandlerResult =
+        make_unique<StrictMock<avsCommon::sdkInterfaces::test::MockDirectiveHandlerResult>>();
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted()).Times(Exactly(1));
+    EXPECT_CALL(*m_mockRtcscAppClient, disconnectSession(_, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockLiveViewController, stopMock()).WillOnce(InvokeWithoutArgs([] {
+        return LiveViewControllerInterface::Response(
+            LiveViewControllerInterface::Response::Type::FAILED_INTERNAL_ERROR, "InternalError");
+    }));
+
+    auto liveViewStoppedVerifyEvent = [&waitEvent2](std::shared_ptr<avsCommon::avs::MessageRequest> request) {
+        verifySendMessage(request, LIVE_VIEW_STOPPED_EVENT, EXPECTED_LIVE_VIEW_STOPPED_PAYLOAD, NAMESPACE);
+        waitEvent2.wakeUp();
+    };
+    EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).WillOnce(Invoke(liveViewStoppedVerifyEvent));
+    EXPECT_CALL(
+        *m_mockResponseSender,
+        sendErrorResponseEvent(_, _, _, AlexaInterfaceMessageSenderInterface::ErrorResponseType::INTERNAL_ERROR, _))
+        .Times(Exactly(1));
+
+    // Simulate StopLiveView directive
+    std::shared_ptr<AVSDirective> stopLiveViewdirective = buildAVSDirective(NAME_STOPLIVEVIEW);
+    m_liveViewControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        stopLiveViewdirective, std::move(m_mockDirectiveHandlerResult));
+    m_liveViewControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent2.wait(TIMEOUT));
+    m_liveViewControllerCapabilityAgent->shutdown();
+}
+
+/**
+ * Tests unknown Directive.
+ * Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(AlexaLiveViewControllerCapabilityAgentTest, test_unknownDirective) {
+    avsCommon::utils::WaitEvent waitEvent;
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_)).WillOnce(InvokeWithoutArgs([&waitEvent]() {
+        waitEvent.wakeUp();
+    }));
+
+    ASSERT_THAT(m_liveViewControllerCapabilityAgent, NotNull());
+
+    std::shared_ptr<AVSDirective> directive = buildAVSDirective(UNKNOWN_DIRECTIVE);
+    m_liveViewControllerCapabilityAgent->CapabilityAgent::preHandleDirective(
+        directive, std::move(m_mockDirectiveHandlerResult));
+    m_liveViewControllerCapabilityAgent->CapabilityAgent::handleDirective(MESSAGE_ID_TEST);
+
+    EXPECT_TRUE(waitEvent.wait(TIMEOUT));
+    m_liveViewControllerCapabilityAgent->shutdown();
+}
+
+}  // namespace test
+}  // namespace alexaLiveViewController
+}  // namespace alexaClientSDK
diff --git a/capabilities/LiveViewController/AlexaLiveViewController/test/CMakeLists.txt b/capabilities/LiveViewController/AlexaLiveViewController/test/CMakeLists.txt
new file mode 100644
index 0000000000..043d578c19
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewController/test/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+    "${acsdkAlexaLiveViewController_SOURCE_DIR}/include"
+    "${acsdkAlexaLiveViewController_SOURCE_DIR}/privateInclude"
+    "${acsdkAlexaLiveViewControllerInterfaces_SOURCE_DIR}/include"
+    "${ASDK_INCLUDE_DIRS}")
+
+set(LIBS
+        "AttachmentCommonTestLib"
+        "acsdkAlexaLiveViewController"
+        "SDKInterfacesTests")
+
+discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
diff --git a/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/CMakeLists.txt b/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..61f0ac49c8
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaLiveViewControllerInterfaces LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_library(acsdkAlexaLiveViewControllerInterfaces INTERFACE)
+
+target_include_directories(acsdkAlexaLiveViewControllerInterfaces INTERFACE
+        "${acsdkAlexaLiveViewControllerInterfaces_SOURCE_DIR}/include")
+
+# install interface
+asdk_install_interface()
\ No newline at end of file
diff --git a/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/include/acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerConfiguration.h b/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/include/acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerConfiguration.h
new file mode 100644
index 0000000000..0a93768f7f
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/include/acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerConfiguration.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLERINTERFACES_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLERINTERFACES_LIVEVIEWCONTROLLERCONFIGURATION_H_
+#define ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLERINTERFACES_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLERINTERFACES_LIVEVIEWCONTROLLERCONFIGURATION_H_
+
+#include <set>
+#include <string>
+
+#include "LiveViewControllerTypes.h"
+
+namespace alexaClientSDK {
+namespace alexaLiveViewControllerInterfaces {
+
+/**
+ * Configuration object used in the Discovery Response
+ */
+struct Configuration {
+    /// Display modes supported.
+    std::set<DisplayMode> supportedDisplayModes;
+
+    /// Overlay types supported.
+    std::set<OverlayType> supportedOverlayTypes;
+
+    /// Overlay positions supported.
+    std::set<OverlayPosition> supportedOverlayPositions;
+
+    /**
+     * Constructor.
+     *
+     * @param supportedDisplayModes The set of supported display modes.
+     * @param supportedOverlayTypes The set of supported overlay types.
+     * @param supportedOverlayPositions The set of supported overlay positions.
+     */
+    Configuration(
+        const std::set<DisplayMode>& supportedDisplayModes = {DisplayMode::FULL_SCREEN},
+        const std::set<OverlayType>& supportedOverlayTypes = {OverlayType::NONE},
+        const std::set<OverlayPosition>& supportedOverlayPositions = {OverlayPosition::TOP_RIGHT}) :
+            supportedDisplayModes{std::move(supportedDisplayModes)},
+            supportedOverlayTypes{std::move(supportedOverlayTypes)},
+            supportedOverlayPositions{std::move(supportedOverlayPositions)} {
+    }
+};
+
+}  // namespace alexaLiveViewControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLERINTERFACES_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLERINTERFACES_LIVEVIEWCONTROLLERCONFIGURATION_H_
diff --git a/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/include/acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerInterface.h b/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/include/acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerInterface.h
new file mode 100644
index 0000000000..229ece7187
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/include/acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerInterface.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLERINTERFACES_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLERINTERFACES_LIVEVIEWCONTROLLERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLERINTERFACES_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLERINTERFACES_LIVEVIEWCONTROLLERINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include "LiveViewControllerConfiguration.h"
+#include "LiveViewControllerObserverInterface.h"
+#include "LiveViewControllerTypes.h"
+
+namespace alexaClientSDK {
+namespace alexaLiveViewControllerInterfaces {
+
+/**
+ * The @c LiveViewControllerInterface carries out camera live view actions such as starting or
+ * stopping a live stream.
+ *
+ * @note Implementations of this interface must be thread-safe.
+ */
+class LiveViewControllerInterface {
+public:
+    /**
+     * A request to start camera live view stream.
+     */
+    struct StartLiveViewRequest {
+        /// Live streaming session identifier
+        std::string sessionId;
+
+        /// Identifies the viewing device.
+        Target target;
+
+        /// Specifies the role of the device for the streaming session.
+        Role role;
+
+        /// Camera source and a list of viewing devices in the requested streaming session.
+        Participants participants;
+
+        /// Defines the display and audio properties of the streaming session.
+        ViewerExperience viewerExperience;
+    };
+
+    /**
+     * Utility object used for reporting LiveViewController response event.
+     */
+    struct Response {
+        /**
+         * Enum for the different response types.
+         */
+        enum class Type {
+            /// Request has been handled successfully.
+            SUCCESS,
+            /// Battery level at the endpoint is too low.
+            FAILED_BATTERY_TOO_LOW,
+            /// The media source for the camera can't be found.
+            FAILED_MEDIA_SOURCE_NOT_FOUND,
+            /// The media source for the camera is asleep.
+            FAILED_MEDIA_SOURCE_ASLEEP,
+            /// The media source for the camera is off.
+            FAILED_MEDIA_SOURCE_TURNED_OFF,
+            /// Request is not authorized to access the live view features.
+            FAILED_UNAUTHORIZED,
+            /// Indicates that an error occurred that can't be described by one of the other error types.
+            FAILED_INTERNAL_ERROR
+        };
+
+        /// Response error type
+        Type type;
+
+        /// The error message for logging if the @c type is anything other than SUCCESS, for the purposes of aiding
+        /// debugging.
+        std::string errorMessage;
+
+        /**
+         * Default constructor, sets response type to @c SUCCESS.
+         */
+        Response() : type(Type::SUCCESS) {
+        }
+
+        /**
+         * Constructor.
+         * @param type The response type @c Type
+         * @param errorMessage The error message if @c responseType is other than SUCCESS.
+         *
+         */
+        Response(Type type, std::string errorMessage) : type{type}, errorMessage{std::move(errorMessage)} {
+        }
+    };
+
+    /**
+     * Virtual destructor to assure proper cleanup of derived types.
+     */
+    virtual ~LiveViewControllerInterface() = default;
+
+    /**
+     * Start camera live view stream based on the user request.
+     *
+     * @param request The request for the StartLiveView directive.
+     * @return whether camera live view stream has been started successfully, or if an error was encountered in the
+     * process.
+     * @c LiveViewControllerInterface::Response.type should return SUCCESS if no errors were encountered. Otherwise,
+     * @c LiveViewControllerInterface::Response.type should contain the corresponding error code along with a log
+     * message in @c LiveViewControllerInterface::Response.errorMessage.
+     */
+    virtual Response start(std::unique_ptr<StartLiveViewRequest> request) = 0;
+
+    /**
+     * Stop camera live view stream.
+     *
+     * @return whether camera live view stream has been stopped successfully, or if an error was encountered in the
+     * process.
+     * @c LiveViewControllerInterface::Response.type should return SUCCESS if no errors were encountered. Otherwise,
+     * @c LiveViewControllerInterface::Response.type should contain the corresponding error code along with a log
+     * message in @c LiveViewControllerInterface::Response.errorMessage.
+     */
+    virtual Response stop() = 0;
+
+    /**
+     * Update the camera state based on the LiveViewController interaction with other components.
+     *
+     * @param cameraState Incoming camera state.
+     * @return Whether camera state has been updated successfully, or if an error was encountered in the
+     * process.
+     * @c LiveViewControllerInterface::Response.type should return SUCCESS if no errors were encountered. Otherwise,
+     * @c LiveViewControllerInterface::Response.type should contain the corresponding error code along with a log
+     * message in @c LiveViewControllerInterface::Response.errorMessage.
+     */
+    virtual Response setCameraState(CameraState cameraState) = 0;
+
+    /**
+     * Returns the LiveViewController configuration.
+     *
+     * @return A @c Configuration object that contains the supported display modes, overlay types and overlay positions.
+     */
+    virtual Configuration getConfiguration() = 0;
+
+    /**
+     * Adds a @c LiveViewControllerObserverInterface observer.
+     *
+     * @param observer The observer which to callback.
+     * @return true if the observer was successfully added; otherwise false.
+     */
+    virtual bool addObserver(std::weak_ptr<LiveViewControllerObserverInterface> observer) = 0;
+
+    /**
+     * Removes an observer of @c LiveViewControllerObserverInterface.
+     *
+     * @param observer The observer which to callback.
+     */
+    virtual void removeObserver(std::weak_ptr<LiveViewControllerObserverInterface> observer) = 0;
+};
+
+}  // namespace alexaLiveViewControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLERINTERFACES_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLERINTERFACES_LIVEVIEWCONTROLLERINTERFACE_H_
diff --git a/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/include/acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerObserverInterface.h b/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/include/acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerObserverInterface.h
new file mode 100644
index 0000000000..d3a00db201
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/include/acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerObserverInterface.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLERINTERFACES_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLERINTERFACES_LIVEVIEWCONTROLLEROBSERVERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLERINTERFACES_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLERINTERFACES_LIVEVIEWCONTROLLEROBSERVERINTERFACE_H_
+
+#include "LiveViewControllerTypes.h"
+
+namespace alexaClientSDK {
+namespace alexaLiveViewControllerInterfaces {
+/**
+ * This interface is used to observe changes in the application related to live view camera.
+ */
+class LiveViewControllerObserverInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~LiveViewControllerObserverInterface() = default;
+
+    /**
+     * Notifies the change in the microphone state of the application.
+     *
+     * @param microphoneState Audio state of the microphone.
+     */
+    virtual void onMicrophoneStateChanged(alexaLiveViewControllerInterfaces::AudioState microphoneState) = 0;
+
+    /**
+     * Notifies that application has cleared the live view camera.
+     */
+    virtual void onLiveViewCleared() = 0;
+};
+}  // namespace alexaLiveViewControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLERINTERFACES_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLERINTERFACES_LIVEVIEWCONTROLLEROBSERVERINTERFACE_H_
diff --git a/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/include/acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerTypes.h b/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/include/acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerTypes.h
new file mode 100644
index 0000000000..977f1d804b
--- /dev/null
+++ b/capabilities/LiveViewController/AlexaLiveViewControllerInterfaces/include/acsdk/AlexaLiveViewControllerInterfaces/LiveViewControllerTypes.h
@@ -0,0 +1,575 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLERINTERFACES_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLERINTERFACES_LIVEVIEWCONTROLLERTYPES_H_
+#define ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLERINTERFACES_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLERINTERFACES_LIVEVIEWCONTROLLERTYPES_H_
+
+#include <chrono>
+#include <set>
+#include <string>
+
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/JSON/JSONGenerator.h>
+
+namespace alexaClientSDK {
+namespace alexaLiveViewControllerInterfaces {
+
+/**
+ * Enumeration of audio state properties. Defines the state of the microphone and speaker when the streaming session
+ * starts.
+ */
+enum class AudioState {
+    /**
+     * For microphone, this enables the microphone on the viewing device. For speaker, this enables audio from the
+     * camera to the viewing device.
+     */
+    UNMUTED,
+    /**
+     * For microphone, this mutes the microphone on the viewing device. For speaker, this disables audio from the camera
+     * to the viewing device.
+     */
+    MUTED,
+    /**
+     * Indicates that camera doesn't support audio communication. In this state, the viewing device doesn't display the
+     * microphone and speaker.
+     */
+    DISABLED,
+    /// Any other audio state not covered by the ones above.
+    UNKNOWN
+};
+
+/**
+ * Converts an @c AudioState value to an AVS-compliant string.
+ *
+ * @param audioState The audio state value to convert to a string.
+ * @return The @c std::string conversion of the @c AudioState value.
+ */
+inline std::string audioStateToString(AudioState audioState) {
+    switch (audioState) {
+        case AudioState::MUTED:
+            return "MUTED";
+        case AudioState::UNMUTED:
+            return "UNMUTED";
+        case AudioState::DISABLED:
+            return "DISABLED";
+        case AudioState::UNKNOWN:
+            return "";
+    }
+    return "";
+}
+
+/**
+ * Converts an @c AudioState value to a boolean representing the microphone state.
+ *
+ * @param audioState The audio state value to convert to the microphone state.
+ * @return true if @c audioState is unmuted, false otherwise.
+ * @return false
+ */
+inline bool audioStateToMicrophoneState(AudioState audioState) {
+    switch (audioState) {
+        case AudioState::UNMUTED:
+            return true;
+        case AudioState::MUTED:
+        case AudioState::DISABLED:
+        case AudioState::UNKNOWN:
+            return false;
+    }
+    return false;
+}
+
+/**
+ * Converts a microphone state in boolean (true if unmuted, false otherwise) to an @c AudioState.
+ *
+ * @param microphoneState The microphone state value to convert to the audio state.
+ * @return AudioState::UNMUTED if @c microphoneState is true, AudioState::MUTED otherwise.
+ */
+inline AudioState microphoneStateToAudioState(bool microphoneState) {
+    if (microphoneState) {
+        return AudioState::UNMUTED;
+    } else {
+        return AudioState::MUTED;
+    }
+}
+
+/**
+ * Enumeration of camera state known by the LiveViewController CA.
+ */
+enum class CameraState {
+    /// Camera is connecting currently which means RTCSC session is being initialized.
+    CONNECTING,
+    /// Camera is currently connected which means RTCSC is ready to deliver the live camera stream.
+    CONNECTED,
+    /// Camera is disconnected which means it cannot get the live camera stream anymore.
+    DISCONNECTED,
+    /// Camera has encountered an error which means it needs to reestablish the RTCSC session.
+    ERROR,
+    /// Camera is in an unknown state.
+    UNKNOWN
+};
+
+/**
+ * Enumeration of motion capability properties of a camera.
+ */
+enum class MotionCapability {
+    /// Camera supports physical panning.
+    PHYSICAL_PAN,
+    /// Camera can tilt on the vertical axis.
+    PHYSICAL_TILT,
+    /// Camera supports optical zoom.
+    PHYSICAL_ZOOM,
+    /// Motion capability unknown.
+    UNKNOWN
+};
+
+/**
+ * Converts a @c MotionCapability value to an AVS-compliant string.
+ *
+ * @param motionCapability The motion capability value to convert to a string.
+ * @return The @c std::string conversion of the @c MotionCapability value.
+ */
+inline std::string motionCapabilityToString(MotionCapability motionCapability) {
+    switch (motionCapability) {
+        case MotionCapability::PHYSICAL_PAN:
+            return "PHYSICAL_PAN";
+        case MotionCapability::PHYSICAL_TILT:
+            return "PHYSICAL_TILT";
+        case MotionCapability::PHYSICAL_ZOOM:
+            return "PHYSICAL_ZOOM";
+        case MotionCapability::UNKNOWN:
+            return "";
+    }
+    return "";
+}
+
+/**
+ * Enumeration of concurrent two way talk state properties. Indicates whether the camera supports two-way communication
+ * with the viewing device.
+ */
+enum class ConcurrentTwoWayTalkState {
+    /// Camera supports two-way audio communication with the viewing device.
+    ENABLED,
+    /// Camera doesn't support two-way audio communication with the viewing device.
+    DISABLED,
+    /// Any other concurrent two-way talk state not covered by the ones above.
+    UNKNOWN
+};
+
+/**
+ * Converts a @c ConcurrentTwoWayTalkState value to an AVS-compliant string.
+ *
+ * @param concurrentTwoWayTalkState The concurrent two-way talk state value to convert to a string.
+ * @return The @c std::string conversion of the @c ConcurrentTwoWayTalkState value.
+ */
+inline std::string concurrentTwoWayTalkStateToString(ConcurrentTwoWayTalkState concurrentTwoWayTalkState) {
+    switch (concurrentTwoWayTalkState) {
+        case ConcurrentTwoWayTalkState::ENABLED:
+            return "ENABLED";
+        case ConcurrentTwoWayTalkState::DISABLED:
+            return "DISABLED";
+        case ConcurrentTwoWayTalkState::UNKNOWN:
+            return "";
+    }
+    return "";
+}
+
+/**
+ * Enumeration of display mode properties. Defines the supported modes to render the stream.
+ */
+enum class DisplayMode {
+    /// The camera live feed stream displays on the entire screen.
+    FULL_SCREEN,
+    /// The camera live feed stream displays on top of other streams.
+    OVERLAY,
+    /// Any other display mode not covered by the ones above.
+    UNKNOWN
+};
+
+/**
+ * Converts a @c DisplayMode value to an AVS-compliant string.
+ *
+ * @param displayMode The display mode value to convert to a string.
+ * @return The @c std::string conversion of the @c DisplayMode value.
+ */
+inline std::string displayModeToString(DisplayMode displayMode) {
+    switch (displayMode) {
+        case DisplayMode::FULL_SCREEN:
+            return "FULL_SCREEN";
+        case DisplayMode::OVERLAY:
+            return "OVERLAY";
+        case DisplayMode::UNKNOWN:
+            return "";
+    }
+    return "";
+}
+
+/**
+ * Enumeration of live view trigger properties. Defines the reason that the live view session started.
+ */
+enum class LiveViewTrigger {
+    /// The user started the live view streaming session.
+    USER_ACTION,
+    /// An automated event, such as a doorbell press, triggered the streaming session.
+    AUTOMATED_EVENT,
+    /// Any other live view trigger mode not covered by the ones above.
+    UNKNOWN
+};
+
+/**
+ * Converts a @c LiveViewTrigger value to an AVS-compliant string.
+ *
+ * @param liveViewTrigger The live view trigger value to convert to a string.
+ * @return The @c std::string conversion of the @c LiveViewTrigger value.
+ */
+inline std::string liveViewTriggerToString(LiveViewTrigger liveViewTrigger) {
+    switch (liveViewTrigger) {
+        case LiveViewTrigger::AUTOMATED_EVENT:
+            return "AUTOMATED_EVENT";
+        case LiveViewTrigger::USER_ACTION:
+            return "USER_ACTION";
+        case LiveViewTrigger::UNKNOWN:
+            return "";
+    }
+    return "";
+}
+
+/**
+ * Enumeration of overlay position properties. Defines the position on the screen to display the overlay.
+ */
+enum class OverlayPosition {
+    /// Directs the viewing device to display the overlay on the top right of the screen.
+    TOP_RIGHT,
+    /// Directs the viewing device to display the overlay on the top left of the screen.
+    TOP_LEFT,
+    /// Directs the viewing device to display the overlay on the bottom right of the screen.
+    BOTTOM_RIGHT,
+    /// Directs the viewing device to display the overlay on the bottom left of the screen.
+    BOTTOM_LEFT,
+    /// Any other overlay position not covered by the ones above.
+    UNKNOWN
+};
+
+/**
+ * Converts an @c OverlayPosition value to an AVS-compliant string.
+ *
+ * @param overlayPosition The overlay position value to convert to a string.
+ * @return The @c std::string conversion of the @c OverlayPosition value.
+ */
+inline std::string overlayPositionToString(OverlayPosition overlayPosition) {
+    switch (overlayPosition) {
+        case OverlayPosition::TOP_RIGHT:
+            return "TOP_RIGHT";
+        case OverlayPosition::TOP_LEFT:
+            return "TOP_LEFT";
+        case OverlayPosition::BOTTOM_RIGHT:
+            return "BOTTOM_RIGHT";
+        case OverlayPosition::BOTTOM_LEFT:
+            return "BOTTOM_LEFT";
+        case OverlayPosition::UNKNOWN:
+            return "";
+    }
+    return "";
+}
+
+/**
+ * Enumeration of overlay type properties. Defines the type of overlay supported by the viewing device.
+ */
+enum class OverlayType {
+    /// The viewing device supports picture-in-picture display mode.
+    PICTURE_IN_PICTURE,
+    /// The viewing device doesn't support overlay mode.
+    NONE,
+    /// Any other overlay type not covered by the ones above.
+    UNKNOWN
+};
+
+/**
+ * Converts an @c OverlayType value to an AVS-compliant string.
+ *
+ * @param overlayType The overlay type value to convert to a string.
+ * @return The @c std::string conversion of the @c OverlayType value.
+ */
+inline std::string overlayTypeToString(OverlayType overlayType) {
+    switch (overlayType) {
+        case OverlayType::PICTURE_IN_PICTURE:
+            return "PICTURE_IN_PICTURE";
+        case OverlayType::NONE:
+            return "NONE";
+        case OverlayType::UNKNOWN:
+            return "";
+    }
+    return "";
+}
+
+/**
+ * Enumeration of role properties. Role property is used to specify the role of the device for the streaming session.
+ * The device can act as a security camera or a viewer of a security camera stream.
+ */
+enum class Role {
+    /// The device acts as a camera. There can be one camera per streaming session.
+    CAMERA,
+    /**
+     * The device acts as a viewer of the security camera streaming session. There can be multiple viewing devices in a
+     * streaming session.
+     */
+    VIEWER,
+    /// Any other role type not covered by the ones above.
+    UNKNOWN
+};
+
+/**
+ * Converts a @c Role value to an AVS-compliant string.
+ *
+ * @param role The role value to convert to a string.
+ * @return The @c std::string conversion of the @c Role value.
+ */
+inline std::string roleToString(Role role) {
+    switch (role) {
+        case Role::CAMERA:
+            return "CAMERA";
+        case Role::VIEWER:
+            return "VIEWER";
+        case Role::UNKNOWN:
+            return "";
+    }
+    return "";
+}
+
+/**
+ * Enumeration of status properties. Indicates the reason for the Alexa.StopLiveView directive being received or the
+ * Alexa.LiveViewStopped event being sent in their payloads.
+ */
+enum class Status {
+    /// User requested to stop the live view session
+    STOP_LIVE_VIEW_REQUESTED,
+    /// Alexa can't find the media source
+    MEDIA_SOURCE_NOT_FOUND,
+    /// Device isn't authorized to access the live view feature
+    UNAUTHORIZED,
+    /// Device battery is too low to support the live stream
+    BATTERY_LEVEL_TOO_LOW,
+    /// Media source is asleep
+    MEDIA_SOURCE_ASLEEP,
+    /// Media source is turned off
+    MEDIA_SOURCE_TURNED_OFF
+};
+
+/**
+ * Enumeration of talk mode properties. Defines the audio communication supported by the camera.
+ */
+enum class TalkMode {
+    /// Camera doesn't support audio communication
+    NO_SUPPORT,
+    /**
+     * The camera supports two-way communication in the style of a walkie-talkie. The user pushes the microphone on the
+     * viewing device to talk, and then releases to listen.
+     */
+    PRESS_AND_HOLD,
+    /**
+     * The camera supports two-way audio communication. The user taps the microphone on the viewing device to unmute and
+     * talk, and then taps to mute the microphone.
+     */
+    TAP,
+    /// Any other talk mode not covered by the ones above.
+    UNKNOWN
+};
+
+/**
+ * Converts a @c TalkMode value to an AVS-compliant string.
+ *
+ * @param talkMode The talk mode value to convert to a string.
+ * @return The @c std::string conversion of the @c TalkMode value.
+ */
+inline std::string talkModeToString(TalkMode talkMode) {
+    switch (talkMode) {
+        case TalkMode::PRESS_AND_HOLD:
+            return "PRESS_AND_HOLD";
+        case TalkMode::TAP:
+            return "TAP";
+        case TalkMode::NO_SUPPORT:
+            return "NO_SUPPORT";
+        case TalkMode::UNKNOWN:
+            return "";
+    }
+    return "";
+}
+
+/**
+ * AudioProperties object. Defines the audio details of the streaming session.
+ */
+struct AudioProperties {
+    /// Audio communication capability of the camera.
+    TalkMode talkMode;
+    /// Defines whether the camera supports concurrent two-way communication.
+    ConcurrentTwoWayTalkState concurrentTwoWayTalk;
+    /// State of the microphone at the start of the streaming session.
+    AudioState microphoneState;
+    /// State of the speaker at the start of the streaming session.
+    AudioState speakerState;
+};
+
+/**
+ * Camera object. Defines details of the camera, such as name, manufacturer, and camera capabilities.
+ */
+struct Camera {
+    /// Friendly name of the camera, such as "front door". Maximum length is 512 characters.
+    std::string name;
+    /// Name of the manufacturer of the camera. Maximum length is 512 characters.
+    std::string make;
+    /// (Optional) Model name of the camera. Maximum length is 512 characters.
+    avsCommon::utils::Optional<std::string> model;
+    /// (Optional) Motion capabilities of the camera.
+    avsCommon::utils::Optional<std::set<MotionCapability>> capabilities;
+};
+
+/**
+ * DisplayProperties object. Defines details of the requested display experience on the viewing device.
+ */
+struct DisplayProperties {
+    /// Display mode in which to render the live stream
+    DisplayMode displayMode;
+    /**
+     * (Optional) If displayMode is @c OVERLAY, the type of overlay to use to render the live stream.
+     * If set to NONE, the displayMode defaults to FULL_SCREEN.
+     */
+    avsCommon::utils::Optional<OverlayType> overlayType;
+    /// (Optional) If displayMode is @c OVERLAY, overlayPosition indicates the position on the screen to display the
+    /// overlay.
+    avsCommon::utils::Optional<OverlayPosition> overlayPosition;
+};
+
+/**
+ * Viewer object. Defines details of the Alexa device used to view the streaming session.
+ */
+struct Viewer {
+    /**
+     * Enum class for the connection state of the viewing device. In the connected state, the user can see the camera
+     * feed.
+     */
+    enum class ViewerState {
+        /// Viewing device is connected, which means the user can see the camera feed.
+        CONNECTED,
+        /// Viewing device is connecting, which means the user can not see the camera feed yet.
+        CONNECTING,
+        /// Any other state that is not covered by the viewer states above.
+        UNKNOWN
+    };
+
+    /// Friendly name of the viewing device, such as "Kitchen Echo Show." Maximum length is 512 characters.
+    std::string name;
+    /**
+     * Indicates whether the viewing device has control over the camera. In a list of viewing devices, one device can
+     * control the camera at any one time.
+     */
+    bool hasCameraControl;
+    /**
+     * Connection state of the viewing device. In the connected state, the user can see the camera feed.
+     */
+    ViewerState state;
+
+    /**
+     * Comparison with another viewer for inserting into set of viewers.
+     *
+     * @param anotherViewer Other viewer instance this viewer is compared against.
+     *
+     * @return true if this viewer should be inserted before @c anotherViewer, false otherwise.
+     */
+    bool operator<(const Viewer& anotherViewer) const {
+        return (name < anotherViewer.name);
+    }
+};
+
+/**
+ * Converts a @c ViewerState value to an AVS-compliant string.
+ *
+ * @param viewerState The viewer state value to convert to a string.
+ * @return The @c std::string conversion of the @c ViewerState value.
+ */
+inline std::string viewerStateToString(Viewer::ViewerState viewerState) {
+    switch (viewerState) {
+        case Viewer::ViewerState::CONNECTED:
+            return "CONNECTED";
+        case Viewer::ViewerState::CONNECTING:
+            return "CONNECTING";
+        case Viewer::ViewerState::UNKNOWN:
+            return "";
+    }
+    return "";
+}
+
+/**
+ * Target object. Identifies the endpoint of the viewing device.
+ */
+struct Target {
+    /// Enum class for different types of target endpoints. Currently only ALEXA_ENDPOINT is supported.
+    enum class TargetType {
+        /// Used to represent an Alexa endpoint.
+        ALEXA_ENDPOINT,
+        /// Any other endpoint that is not supported at this point.
+        UNKNOWN
+    };
+
+    /// Identifier of the device.
+    std::string endpointId;
+    /// (Optional) Type of endpoint. Valid value: ALEXA_ENDPOINT.
+    avsCommon::utils::Optional<TargetType> type;
+};
+
+/**
+ * Converts a @c TargetType value to an AVS-compliant string.
+ *
+ * @param targetType The target type value to convert to a string.
+ * @return The @c std::string conversion of the @c TargetType value.
+ */
+inline std::string targetTypeToString(Target::TargetType targetType) {
+    switch (targetType) {
+        case Target::TargetType::ALEXA_ENDPOINT:
+            return "ALEXA_ENDPOINT";
+        case Target::TargetType::UNKNOWN:
+            return "";
+    }
+    return "";
+}
+
+/**
+ * Participants object. Contains the camera source and a list of viewing devices in the current streaming session.
+ */
+struct Participants {
+    /// List of the viewing devices. At least one viewing device must be specified.
+    std::set<Viewer> viewers;
+    /// Camera source of the live feed.
+    Camera camera;
+};
+
+/**
+ * ViewerExperience object. Defines the display and audio properties of the streaming session.
+ */
+struct ViewerExperience {
+    /// Display properties of the live streaming session.
+    DisplayProperties suggestedDisplay;
+    /// Audio communication properties of the live streaming session.
+    AudioProperties audioProperties;
+    /// Reason the live view streaming session started.
+    LiveViewTrigger liveViewTrigger;
+    /**
+     * Timeout value in milliseconds. Any user interaction with the viewing device cancels the timer. For example, the
+     * user enables the microphone, performs pan, tilt, zoom gestures, or switches between full screen and
+     * picture-in-picture. A negative value or zero disables the timer. The default is 15000 milliseconds.
+     */
+    std::chrono::milliseconds idleTimeoutInMilliseconds;
+};
+
+}  // namespace alexaLiveViewControllerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_ALEXALIVEVIEWCONTROLLERINTERFACES_INCLUDE_ACSDK_ALEXALIVEVIEWCONTROLLERINTERFACES_LIVEVIEWCONTROLLERTYPES_H_
diff --git a/capabilities/LiveViewController/CMakeLists.txt b/capabilities/LiveViewController/CMakeLists.txt
new file mode 100644
index 0000000000..d618b4ed8f
--- /dev/null
+++ b/capabilities/LiveViewController/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAlexaLiveViewController LANGUAGES CXX)
+ 
+if (RTCSC)
+    add_subdirectory("AlexaLiveViewController")
+    add_subdirectory("AlexaLiveViewControllerInterfaces")
+endif()
diff --git a/capabilities/Notifications/acsdkNotifications/include/acsdkNotifications/NotificationsCapabilityAgent.h b/capabilities/Notifications/acsdkNotifications/include/acsdkNotifications/NotificationsCapabilityAgent.h
index ed94f6d744..db637094c9 100644
--- a/capabilities/Notifications/acsdkNotifications/include/acsdkNotifications/NotificationsCapabilityAgent.h
+++ b/capabilities/Notifications/acsdkNotifications/include/acsdkNotifications/NotificationsCapabilityAgent.h
@@ -93,6 +93,34 @@ class NotificationsCapabilityAgent
             avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface> endpointCapabilitiesRegistrar,
         const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder);
 
+    /**
+     * Creates a new @c NotificationsCapabilityAgent instance
+     * @note This method does not depend on manufactory.
+     *
+     * @param notificationsStorage The storage interface to the NotificationIndicator database.
+     * @param renderer The instance of the @c NotificationRendererInterface used to play assets associated with
+     * notifications.
+     * @param contextManager The AVS Context manager used to generate system context for events.
+     * @param exceptionSender The object to use for sending AVS Exception messages.
+     * @param notificationsAudioFactory The audio factory object to produce the default notification sound.
+     * @param dataManager A dataManager object that will track the CustomerDataHandler.
+     * @param metricRecorder The metric recorder.
+     * @return A @c std::shared_ptr to the new @c NotificationsCapabilityAgent instance.
+     */
+    static std::shared_ptr<NotificationsCapabilityAgent> create(
+        std::shared_ptr<acsdkNotificationsInterfaces::NotificationsStorageInterface> notificationsStorage,
+        std::shared_ptr<acsdkNotificationsInterfaces::NotificationRendererInterface> renderer,
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+        std::shared_ptr<avsCommon::sdkInterfaces::audio::NotificationsAudioFactoryInterface> notificationsAudioFactory,
+        std::shared_ptr<registrationManager::CustomerDataManagerInterface> dataManager,
+        std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface> metricRecorder = nullptr);
+
+    /**
+     * Destructor.
+     */
+    ~NotificationsCapabilityAgent() override;
+
     /**
      * Gets the @c NotificationsNotifierInterface that can relay notification changes to observers.
      *
diff --git a/capabilities/Notifications/acsdkNotifications/include/acsdkNotifications/NotificationsNotifier.h b/capabilities/Notifications/acsdkNotifications/include/acsdkNotifications/NotificationsNotifier.h
index d3e37f96b5..f3bc2b1ec6 100644
--- a/capabilities/Notifications/acsdkNotifications/include/acsdkNotifications/NotificationsNotifier.h
+++ b/capabilities/Notifications/acsdkNotifications/include/acsdkNotifications/NotificationsNotifier.h
@@ -20,7 +20,7 @@
 
 #include <acsdkNotificationsInterfaces/NotificationsNotifierInterface.h>
 #include <acsdkNotificationsInterfaces/NotificationsObserverInterface.h>
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 
 namespace alexaClientSDK {
 namespace acsdkNotifications {
@@ -28,8 +28,7 @@ namespace acsdkNotifications {
 /**
  * Relays notifications related to Notifications.
  */
-class NotificationsNotifier
-        : public acsdkNotifier::Notifier<acsdkNotificationsInterfaces::NotificationsObserverInterface> {
+class NotificationsNotifier : public notifier::Notifier<acsdkNotificationsInterfaces::NotificationsObserverInterface> {
 public:
     /**
      * Factory method.
diff --git a/capabilities/Notifications/acsdkNotifications/src/NotificationRenderer.cpp b/capabilities/Notifications/acsdkNotifications/src/NotificationRenderer.cpp
index 857fe9003e..4526d64f2a 100644
--- a/capabilities/Notifications/acsdkNotifications/src/NotificationRenderer.cpp
+++ b/capabilities/Notifications/acsdkNotifications/src/NotificationRenderer.cpp
@@ -102,7 +102,7 @@ void NotificationRenderer::onFocusChanged(FocusState newFocus, MixingBehavior be
 
     // If we reach here, we must have acquired focus (either background or
     // foreground).
-    m_executor.submit([this]() {
+    m_executor.execute([this]() {
         if (MediaPlayerInterface::ERROR == m_sourceId) {
             ACSDK_ERROR(LX("renderNotificationPreferredFailed").d("reason", "invalid sourceId"));
         } else if (m_mediaPlayer->play(m_sourceId)) {
diff --git a/capabilities/Notifications/acsdkNotifications/src/NotificationsCapabilityAgent.cpp b/capabilities/Notifications/acsdkNotifications/src/NotificationsCapabilityAgent.cpp
index dabde16f3f..1512485185 100644
--- a/capabilities/Notifications/acsdkNotifications/src/NotificationsCapabilityAgent.cpp
+++ b/capabilities/Notifications/acsdkNotifications/src/NotificationsCapabilityAgent.cpp
@@ -163,6 +163,43 @@ std::shared_ptr<NotificationsCapabilityAgent> NotificationsCapabilityAgent::crea
     return notificationsCapabilityAgent;
 }
 
+std::shared_ptr<NotificationsCapabilityAgent> NotificationsCapabilityAgent::create(
+    std::shared_ptr<acsdkNotificationsInterfaces::NotificationsStorageInterface> notificationsStorage,
+    std::shared_ptr<acsdkNotificationsInterfaces::NotificationRendererInterface> renderer,
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender,
+    std::shared_ptr<avsCommon::sdkInterfaces::audio::NotificationsAudioFactoryInterface> notificationsAudioFactory,
+    std::shared_ptr<registrationManager::CustomerDataManagerInterface> dataManager,
+    std::shared_ptr<MetricRecorderInterface> metricRecorder) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!notificationsStorage || !renderer || !contextManager || !exceptionSender || !notificationsAudioFactory ||
+        !dataManager) {
+        ACSDK_ERROR(LX("createNotificationsCapabilityAgentFailed")
+                        .d("isNotificationsStorageNull", !notificationsStorage)
+                        .d("isRendererNull", !renderer)
+                        .d("isContextManagerNull", !contextManager)
+                        .d("isExceptionManagerNull", !exceptionSender)
+                        .d("isAudioFactoryNull", !notificationsAudioFactory)
+                        .d("isDataManagerNull", !dataManager));
+        return nullptr;
+    }
+
+    auto notificationsCapabilityAgent = std::shared_ptr<NotificationsCapabilityAgent>(new NotificationsCapabilityAgent(
+        std::move(notificationsStorage),
+        std::move(renderer),
+        std::move(contextManager),
+        std::move(exceptionSender),
+        std::move(notificationsAudioFactory),
+        std::move(dataManager),
+        std::move(metricRecorder)));
+
+    if (!notificationsCapabilityAgent->init()) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "initFailed"));
+        return nullptr;
+    }
+    return notificationsCapabilityAgent;
+}
+
 NotificationsCapabilityAgent::NotificationsCapabilityAgent(
     std::shared_ptr<acsdkNotificationsInterfaces::NotificationsStorageInterface> notificationsStorage,
     std::shared_ptr<acsdkNotificationsInterfaces::NotificationRendererInterface> renderer,
@@ -186,7 +223,7 @@ NotificationsCapabilityAgent::NotificationsCapabilityAgent(
     m_notifier = std::make_shared<NotificationsNotifier>();
     m_notifier->setAddObserverFunction(
         [this](const std::shared_ptr<acsdkNotificationsInterfaces::NotificationsObserverInterface>& observer) {
-            m_executor.submit([this, observer]() {
+            m_executor.execute([this, observer]() {
                 IndicatorState currentIndicatorState = IndicatorState::OFF;
                 if (!m_notificationsStorage->getIndicatorState(&currentIndicatorState)) {
                     ACSDK_ERROR(LX("addObserverFunctionLambdaFailed")
@@ -201,6 +238,10 @@ NotificationsCapabilityAgent::NotificationsCapabilityAgent(
         });
 }
 
+NotificationsCapabilityAgent::~NotificationsCapabilityAgent() {
+    m_notifier->setAddObserverFunction(nullptr);
+}
+
 std::shared_ptr<CapabilityConfiguration> getNotificationsCapabilityConfiguration() {
     std::unordered_map<std::string, std::string> configMap;
     configMap.insert({CAPABILITY_INTERFACE_TYPE_KEY, NOTIFICATIONS_CAPABILITY_INTERFACE_TYPE});
@@ -221,7 +262,7 @@ bool NotificationsCapabilityAgent::init() {
         }
     }
 
-    m_executor.submit([this] { executeInit(); });
+    m_executor.execute([this] { executeInit(); });
 
     return true;
 }
@@ -279,7 +320,7 @@ void NotificationsCapabilityAgent::provideState(
     const NamespaceAndName& stateProviderName,
     unsigned int stateRequestToken) {
     ACSDK_DEBUG5(LX(__func__).d("stateRequestToken", stateRequestToken));
-    m_executor.submit([this, stateRequestToken] { executeProvideState(true, stateRequestToken); });
+    m_executor.execute([this, stateRequestToken] { executeProvideState(true, stateRequestToken); });
 }
 
 void NotificationsCapabilityAgent::handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) {
@@ -384,7 +425,7 @@ void NotificationsCapabilityAgent::handleSetIndicatorDirective(std::shared_ptr<D
     }
 
     const NotificationIndicator nextNotificationIndicator(persistVisualIndicator, playAudioIndicator, assetId, url);
-    m_executor.submit(
+    m_executor.execute(
         [this, nextNotificationIndicator, info] { executeSetIndicator(nextNotificationIndicator, info); });
 }
 
@@ -486,7 +527,7 @@ void NotificationsCapabilityAgent::executeSetIndicator(
 }
 
 void NotificationsCapabilityAgent::handleClearIndicatorDirective(std::shared_ptr<DirectiveInfo> info) {
-    m_executor.submit([this, info] { executeClearIndicator(info); });
+    m_executor.execute([this, info] { executeClearIndicator(info); });
 }
 
 void NotificationsCapabilityAgent::executeClearIndicator(std::shared_ptr<DirectiveInfo> info) {
@@ -602,7 +643,7 @@ void NotificationsCapabilityAgent::executeStartQueueNotEmpty() {
 
 void NotificationsCapabilityAgent::onNotificationRenderingFinished() {
     ACSDK_DEBUG5(LX(__func__).d("currentAssetId", m_currentAssetId));
-    m_executor.submit([this] { executeOnPlayFinished(); });
+    m_executor.execute([this] { executeOnPlayFinished(); });
 }
 
 void NotificationsCapabilityAgent::executeOnPlayFinished() {
@@ -767,7 +808,7 @@ void NotificationsCapabilityAgent::doShutdown() {
 
     m_notifier->setAddObserverFunction(nullptr);
 
-    m_executor.submit([this] { executeShutdown(); });
+    m_executor.execute([this] { executeShutdown(); });
 
     bool successfulShutdown = m_shutdownTrigger.wait_for(
         lock, SHUTDOWN_TIMEOUT, [this]() { return m_currentState == NotificationsCapabilityAgentState::SHUTDOWN; });
diff --git a/capabilities/Notifications/acsdkNotifications/test/NotificationsCapabilityAgentTest.cpp b/capabilities/Notifications/acsdkNotifications/test/NotificationsCapabilityAgentTest.cpp
index 7b1c6e5620..91f649e4ef 100644
--- a/capabilities/Notifications/acsdkNotifications/test/NotificationsCapabilityAgentTest.cpp
+++ b/capabilities/Notifications/acsdkNotifications/test/NotificationsCapabilityAgentTest.cpp
@@ -1141,6 +1141,18 @@ TEST_F(NotificationsCapabilityAgentTest, test_clearData) {
     ASSERT_TRUE(m_testNotificationsObserver->waitFor(IndicatorState::OFF, MY_WAIT_TIMEOUT));
 }
 
+TEST_F(NotificationsCapabilityAgentTest, test_addObserverToNotificationsAfterCapabilityAgentDestroyed) {
+    initializeCapabilityAgent();
+    auto notifier = m_notificationsCapabilityAgent->getNotificationsNotifierInterface();
+    ASSERT_TRUE(notifier);
+
+    m_renderer.reset();
+    m_notificationsCapabilityAgent->shutdown();
+    m_notificationsCapabilityAgent.reset();
+
+    notifier->addObserver(m_testNotificationsObserver);
+}
+
 }  // namespace test
 }  // namespace acsdkNotifications
 }  // namespace alexaClientSDK
diff --git a/capabilities/Notifications/acsdkNotificationsInterfaces/include/acsdkNotificationsInterfaces/NotificationsNotifierInterface.h b/capabilities/Notifications/acsdkNotificationsInterfaces/include/acsdkNotificationsInterfaces/NotificationsNotifierInterface.h
index 2d8e362f81..ae6d4e10d5 100644
--- a/capabilities/Notifications/acsdkNotificationsInterfaces/include/acsdkNotificationsInterfaces/NotificationsNotifierInterface.h
+++ b/capabilities/Notifications/acsdkNotificationsInterfaces/include/acsdkNotificationsInterfaces/NotificationsNotifierInterface.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
 
 #include "acsdkNotificationsInterfaces/NotificationsObserverInterface.h"
 
@@ -28,7 +28,7 @@ namespace acsdkNotificationsInterfaces {
 /**
  * Interface for registering to observe Bluetooth notifications.
  */
-using NotificationsNotifierInterface = acsdkNotifierInterfaces::NotifierInterface<NotificationsObserverInterface>;
+using NotificationsNotifierInterface = notifierInterfaces::NotifierInterface<NotificationsObserverInterface>;
 
 }  // namespace acsdkNotificationsInterfaces
 }  // namespace alexaClientSDK
diff --git a/capabilities/TemplateRuntime/.clang-format b/capabilities/TemplateRuntime/.clang-format
new file mode 100644
index 0000000000..db5960a4be
--- /dev/null
+++ b/capabilities/TemplateRuntime/.clang-format
@@ -0,0 +1,102 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit: 120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth: 4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes: false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
+
diff --git a/capabilities/TemplateRuntime/CMakeLists.txt b/capabilities/TemplateRuntime/CMakeLists.txt
new file mode 100644
index 0000000000..6591a099e4
--- /dev/null
+++ b/capabilities/TemplateRuntime/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+add_subdirectory("TemplateRuntimeInterfaces")
+add_subdirectory("TemplateRuntime")
diff --git a/capabilities/TemplateRuntime/TemplateRuntime/CMakeLists.txt b/capabilities/TemplateRuntime/TemplateRuntime/CMakeLists.txt
new file mode 100644
index 0000000000..d837e22dc1
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntime/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkTemplateRuntime LANGUAGES CXX)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/capabilities/TemplateRuntime/TemplateRuntime/include/acsdk/TemplateRuntime/RenderPlayerInfoCardsProviderRegistrarFactory.h b/capabilities/TemplateRuntime/TemplateRuntime/include/acsdk/TemplateRuntime/RenderPlayerInfoCardsProviderRegistrarFactory.h
new file mode 100644
index 0000000000..8e00b4fdbb
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntime/include/acsdk/TemplateRuntime/RenderPlayerInfoCardsProviderRegistrarFactory.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIME_INCLUDE_ACSDK_TEMPLATERUNTIME_RENDERPLAYERINFOCARDSPROVIDERREGISTRARFACTORY_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIME_INCLUDE_ACSDK_TEMPLATERUNTIME_RENDERPLAYERINFOCARDSPROVIDERREGISTRARFACTORY_H_
+
+#include <memory>
+
+#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderRegistrarInterface.h>
+
+namespace alexaClientSDK {
+namespace templateRuntime {
+
+/**
+ * Create a registrar for components that provides an update for renderPlayerInfo card related changes.
+ *
+ * @return A new instance of @c RenderPlayerInfoCardsProviderRegistrarInterface.
+ */
+std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface>
+createRenderPlayerInfoCardsProviderRegistrarInterface();
+
+}  // namespace templateRuntime
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIME_INCLUDE_ACSDK_TEMPLATERUNTIME_RENDERPLAYERINFOCARDSPROVIDERREGISTRARFACTORY_H_
diff --git a/capabilities/TemplateRuntime/TemplateRuntime/include/acsdk/TemplateRuntime/TemplateRuntimeFactory.h b/capabilities/TemplateRuntime/TemplateRuntime/include/acsdk/TemplateRuntime/TemplateRuntimeFactory.h
new file mode 100644
index 0000000000..914b5ef718
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntime/include/acsdk/TemplateRuntime/TemplateRuntimeFactory.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIME_INCLUDE_ACSDK_TEMPLATERUNTIME_TEMPLATERUNTIMEFACTORY_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIME_INCLUDE_ACSDK_TEMPLATERUNTIME_TEMPLATERUNTIMEFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/TemplateRuntimeInterfaces/TemplateRuntimeInterface.h>
+#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderRegistrarInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointCapabilitiesRegistrarInterface.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace templateRuntime {
+
+/**
+ * This factory can be used to create a TemplateRuntimeFactory object which could be a parameter for Capability Agent
+ * construction.
+ */
+class TemplateRuntimeFactory {
+private:
+    /**
+     * This object contains the interfaces to interact with the TemplateRuntime Capability Agent.
+     */
+    struct TemplateRuntimeAgentData {
+        /// An interface used to handle TemplateRuntime capability agent.
+        std::shared_ptr<templateRuntimeInterfaces::TemplateRuntimeInterface> templateRuntime;
+        /// Instance of @c RequiresShutdown used for cleaning up the capability agent during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+public:
+    /**
+     * @brief Creates template runtime capability agent.
+     *
+     * Method creates a component that advertises template runtime capability. The component is responsible for
+     * handling directives to render a template card and a music player.
+     *
+     * @see: https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/templateruntime.html
+     *
+     * @param renderPlayerInfoCardsProviderRegistrar The object with which to register this provider for playerInfo
+     * cards.
+     * @param endpointCapabilitiesRegistrar The @c EndpointCapabilitiesRegistrarInterface for the default endpoint.
+     * @param exceptionSender Object used to send exceptions.
+     *
+     * @return An @c Optional object containing an instance of @c TemplateRuntimeAgentData object if successful.
+     */
+    static avsCommon::utils::Optional<TemplateRuntimeAgentData> create(
+        const std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface>&
+            renderPlayerInfoCardsProviderRegistrar,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+        const std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>&
+            endpointCapabilitiesRegistrar);
+};
+}  // namespace templateRuntime
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIME_INCLUDE_ACSDK_TEMPLATERUNTIME_TEMPLATERUNTIMEFACTORY_H_
diff --git a/capabilities/TemplateRuntime/TemplateRuntime/privateInclude/acsdk/TemplateRuntime/private/RenderPlayerInfoCardsProviderRegistrar.h b/capabilities/TemplateRuntime/TemplateRuntime/privateInclude/acsdk/TemplateRuntime/private/RenderPlayerInfoCardsProviderRegistrar.h
new file mode 100644
index 0000000000..5c1a30e40b
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntime/privateInclude/acsdk/TemplateRuntime/private/RenderPlayerInfoCardsProviderRegistrar.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIME_PRIVATEINCLUDE_ACSDK_TEMPLATERUNTIME_PRIVATE_RENDERPLAYERINFOCARDSPROVIDERREGISTRAR_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIME_PRIVATEINCLUDE_ACSDK_TEMPLATERUNTIME_PRIVATE_RENDERPLAYERINFOCARDSPROVIDERREGISTRAR_H_
+
+#include <mutex>
+
+#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderInterface.h>
+#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderRegistrarInterface.h>
+
+namespace alexaClientSDK {
+namespace templateRuntime {
+
+/**
+ * Class to accumulate the set of @c RenderPlayerInfoCardsProvider instances for creating the TemplateRuntime CA.
+ */
+class RenderPlayerInfoCardsProviderRegistrar
+        : public avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface {
+public:
+    /// @name RenderPlayerInfoCardsProviderRegistrarInterface methods.
+    /// @{
+    bool registerProvider(
+        const std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>& provider) override;
+
+    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>> getProviders()
+        override;
+    /// @}
+
+private:
+    /// Serializes access to @c m_providers.
+    std::mutex m_mutex;
+
+    /// The @c RenderPlayerInfoCardsProviderInterface instances to use for the TemplateRuntime CA.
+    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>> m_providers;
+};
+
+}  // namespace templateRuntime
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIME_PRIVATEINCLUDE_ACSDK_TEMPLATERUNTIME_PRIVATE_RENDERPLAYERINFOCARDSPROVIDERREGISTRAR_H_
diff --git a/capabilities/TemplateRuntime/TemplateRuntime/privateInclude/acsdk/TemplateRuntime/private/TemplateRuntime.h b/capabilities/TemplateRuntime/TemplateRuntime/privateInclude/acsdk/TemplateRuntime/private/TemplateRuntime.h
new file mode 100644
index 0000000000..9888830d6a
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntime/privateInclude/acsdk/TemplateRuntime/private/TemplateRuntime.h
@@ -0,0 +1,281 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIME_PRIVATEINCLUDE_ACSDK_TEMPLATERUNTIME_PRIVATE_TEMPLATERUNTIME_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIME_PRIVATEINCLUDE_ACSDK_TEMPLATERUNTIME_PRIVATE_TEMPLATERUNTIME_H_
+
+#include <deque>
+#include <list>
+#include <memory>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderInterface.h>
+#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderRegistrarInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include <AVSCommon/Utils/Timing/Timer.h>
+#include <acsdk/Notifier/Notifier.h>
+
+#include <acsdk/TemplateRuntimeInterfaces/TemplateRuntimeInterface.h>
+#include <acsdk/TemplateRuntimeInterfaces/TemplateRuntimeObserverInterface.h>
+
+namespace alexaClientSDK {
+namespace templateRuntime {
+
+/**
+ * This class implements a @c CapabilityAgent that handles the AVS @c TemplateRuntime API.  The
+ * @c TemplateRuntime CA is responsible for handling the directives with the TemplateRuntime namespace.  Due
+ * to the fact that the @c RenderPlayerInfo directives are closely related to the @c AudioPlayer, the @c TemplateRuntime
+ * CA is an observer to the AudioPlayer and will be synchronizing the @c RenderPlayerInfo directives with the
+ * corresponding @c AudioItem being handled in the @c AudioPlayer.
+ *
+ * The @c TemplateRuntime CA is also an observer to the @c DialogUXState to determine the end of a interaction so
+ * that it would know when to clear a @c RenderTemplate displayCard.
+ *
+ * The clients who are interested in any TemplateRuntime directives can subscribe themselves as an observer, and the
+ * clients will be notified via the TemplateRuntimeObserverInterface.
+ */
+class TemplateRuntime
+        : public avsCommon::avs::CapabilityAgent
+        , public avsCommon::utils::RequiresShutdown
+        , public templateRuntimeInterfaces::TemplateRuntimeInterface
+        , public avsCommon::sdkInterfaces::RenderPlayerInfoCardsObserverInterface
+        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public std::enable_shared_from_this<TemplateRuntime> {
+public:
+    /**
+     * Create an instance of @c TemplateRuntime.
+     *
+     * @param renderPlayerInfoCardsInterfaces A set of objects to use for subscribing @c TemplateRuntime as an
+     * observer of changes for RenderPlayerInfoCards.
+     * @param exceptionSender The object to use for sending AVS Exception messages.
+     * @return @c nullptr if the inputs are not defined, else a new instance of @c TemplateRuntime.
+     */
+    static std::shared_ptr<TemplateRuntime> create(
+        const std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>>&
+            renderPlayerInfoCardsInterfaces,
+        const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender);
+
+    /**
+     * Destructor.
+     */
+    virtual ~TemplateRuntime() = default;
+
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override;
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override;
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override;
+    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name RenderPlayerInfoCardsObserverInterface Functions
+    /// @{
+    void onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity state, const Context& context) override;
+    /// @}
+
+    /// @name TemplateRuntimeInterface Functions
+    /// @{
+    void addObserver(std::weak_ptr<templateRuntimeInterfaces::TemplateRuntimeObserverInterface> observer) override;
+    void removeObserver(std::weak_ptr<templateRuntimeInterfaces::TemplateRuntimeObserverInterface> observer) override;
+    void addRenderPlayerInfoCardsProvider(
+        std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface> cardsProvider) override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
+    /// @}
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+private:
+    /// Alias for Notifier based on @c TemplateRuntimeObserverInterface.
+    using TemplateRuntimeNotifier = notifier::Notifier<templateRuntimeInterfaces::TemplateRuntimeObserverInterface>;
+
+    /**
+     * Constructor.
+     *
+     * @param renderPlayerInfoCardsInterfaces A set of objects to use for subscribing @c TemplateRuntime as an
+     * observer of changes for RenderPlayerInfoCards.
+     * @param exceptionSender The object to use for sending AVS Exception messages.
+     */
+    TemplateRuntime(
+        std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>>
+            renderPlayerInfoCardsInterfaces,
+        std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender);
+
+    /**
+     * Utility structure to correspond a directive with its audioItemId.
+     */
+    struct AudioItemPair {
+        /**
+         * Default Constructor.
+         */
+        AudioItemPair() = default;
+
+        /**
+         * Constructor.
+         *
+         * @param itemId The ID for the @c AudioItem.
+         * @param renderPlayerInfoDirective The @c RenderPlayerInfo directive that corresponds to the audioItemId.
+         */
+        AudioItemPair(
+            std::string itemId,
+            std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> renderPlayerInfoDirective) :
+                audioItemId{itemId},
+                directive{renderPlayerInfoDirective} {};
+
+        /// The ID of the @c AudioItem.
+        std::string audioItemId;
+
+        /// The directive corresponding to the audioItemId.
+        std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> directive;
+    };
+
+    /**
+     * Remove a directive from the map of message IDs to DirectiveInfo instances.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective whose message ID is to be removed.
+     */
+    void removeDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * Send the handling completed notification and clean up the resources.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void setHandlingCompleted(const std::shared_ptr<DirectiveInfo>& info);
+
+    /**
+     * This function handles a @c RenderTemplate directive.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void handleRenderTemplateDirective(const std::shared_ptr<DirectiveInfo>& info);
+
+    /**
+     * This function handles a @c RenderPlayerInfo directive.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void handleRenderPlayerInfoDirective(const std::shared_ptr<DirectiveInfo>& info);
+
+    /**
+     * This function handles any unknown directives received by @c TemplateRuntime CA.
+     *
+     * @param info The @c DirectiveInfo containing the @c AVSDirective and the @c DirectiveHandlerResultInterface.
+     */
+    void handleUnknownDirective(std::shared_ptr<DirectiveInfo> info);
+
+    /**
+     * This is an internal function that handles updating the @c m_audioItemInExecution when the @c AudioPlayer
+     * notifies the @c TemplateRuntime CA of any changes in the @c AudioPlayer audio state.  This function is
+     * intended to be used in the context of @c m_executor worker thread.
+     *
+     * @param state The @c PlayerActivity of the @c AudioPlayer.
+     * @param context The @c Context of the @c AudioPlayer at the time of the notification.
+     */
+    void executeAudioPlayerInfoUpdates(avsCommon::avs::PlayerActivity state, const Context& context);
+
+    /**
+     * This function handles the notification of the renderPlayerInfoCard callbacks to all the observers.  This function
+     * is intended to be used in the context of @c m_executor worker thread.
+     */
+    void executeRenderPlayerInfoCallback();
+
+    /**
+     * This function handles the notification of the renderTemplateCard callbacks to all the observers.  This function
+     * is intended to be used in the context of @c m_executor worker thread.
+     */
+    void executeRenderTemplateCallback();
+
+    /**
+     * This is an internal function that is called when the agent is ready to notify the @TemplateRuntime
+     * observers to display a card.
+     */
+    void executeDisplayCard(std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> info);
+
+    /**
+     * @name Executor Thread Variables
+     *
+     * These member variables are only accessed by functions in the @c m_executor worker thread, and do not require any
+     * synchronization.
+     */
+    /// @{
+    /// A set of observers to be notified when a @c RenderTemplate or @c RenderPlayerInfo directive is received
+    std::list<std::weak_ptr<templateRuntimeInterfaces::TemplateRuntimeObserverInterface>> m_observers;
+
+    /**
+     * This is a map that is used to store the current executing @c AudioItem based on the callbacks from the
+     * @c RenderPlayerInfoCardsProviderInterface.
+     */
+    std::unordered_map<std::shared_ptr<avsCommon::sdkInterfaces::MediaPropertiesInterface>, AudioItemPair>
+        m_audioItemsInExecution;
+
+    /// The current active RenderPlayerInfoCards provider that has the matching audioItemId.
+    std::shared_ptr<avsCommon::sdkInterfaces::MediaPropertiesInterface> m_activeRenderPlayerInfoCardsProvider;
+
+    /**
+     * This queue is for storing the @c RenderPlayerInfo directives when its audioItemId does not match the audioItemId
+     * in execution in the @c AudioPlayer.
+     */
+    std::deque<AudioItemPair> m_audioItems;
+
+    /// This map is to store the @c AudioPlayerInfo to be passed to the observers in the renderPlayerInfoCard callback.
+    std::unordered_map<
+        std::shared_ptr<avsCommon::sdkInterfaces::MediaPropertiesInterface>,
+        templateRuntimeInterfaces::TemplateRuntimeObserverInterface::AudioPlayerInfo>
+        m_audioPlayerInfo;
+
+    /// The directive corresponding to the RenderTemplate directive.
+    std::shared_ptr<alexaClientSDK::avsCommon::avs::CapabilityAgent::DirectiveInfo> m_lastDisplayedDirective;
+
+    /// A flag to check if @c RenderTemplate is the last directive received.
+    bool m_isRenderTemplateLastReceived;
+    /// @}
+
+    /**
+     * This is a set of interfaces to the @c RenderPlayerInfoCardsProviderInterface.  The @c TemplateRuntime CA
+     * used this interface to add and remove itself as an observer.
+     */
+    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>>
+        m_renderPlayerInfoCardsInterfaces;
+
+    /// Pointer to the TemplateRuntime notifier.
+    std::shared_ptr<TemplateRuntimeNotifier> m_notifier;
+
+    /// Set of capability configurations that will get published using the Capabilities API
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> m_capabilityConfigurations;
+
+    /// This is the worker thread for the @c TemplateRuntime CA.
+    avsCommon::utils::threading::Executor m_executor;
+};
+
+}  // namespace templateRuntime
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIME_PRIVATEINCLUDE_ACSDK_TEMPLATERUNTIME_PRIVATE_TEMPLATERUNTIME_H_
diff --git a/capabilities/TemplateRuntime/TemplateRuntime/src/CMakeLists.txt b/capabilities/TemplateRuntime/TemplateRuntime/src/CMakeLists.txt
new file mode 100644
index 0000000000..3049db6012
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntime/src/CMakeLists.txt
@@ -0,0 +1,18 @@
+add_definitions("-DACSDK_LOG_MODULE=templateRuntime")
+
+add_library(acsdkTemplateRuntime
+        TemplateRuntime.cpp
+        TemplateRuntimeFactory.cpp
+        RenderPlayerInfoCardsProviderRegistrar.cpp
+        RenderPlayerInfoCardsProviderRegistrarFactory.cpp)
+
+target_include_directories(acsdkTemplateRuntime PRIVATE
+        "${acsdkTemplateRuntime_SOURCE_DIR}/privateInclude")
+
+target_include_directories(acsdkTemplateRuntime PUBLIC
+        "${acsdkTemplateRuntime_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkTemplateRuntime acsdkTemplateRuntimeInterfaces AVSCommon acsdkNotifier)
+
+# install target
+asdk_install()
diff --git a/CapabilityAgents/TemplateRuntime/src/RenderPlayerInfoCardsProviderRegistrar.cpp b/capabilities/TemplateRuntime/TemplateRuntime/src/RenderPlayerInfoCardsProviderRegistrar.cpp
similarity index 75%
rename from CapabilityAgents/TemplateRuntime/src/RenderPlayerInfoCardsProviderRegistrar.cpp
rename to capabilities/TemplateRuntime/TemplateRuntime/src/RenderPlayerInfoCardsProviderRegistrar.cpp
index c18cdc1d35..2f3ddabc7e 100644
--- a/CapabilityAgents/TemplateRuntime/src/RenderPlayerInfoCardsProviderRegistrar.cpp
+++ b/capabilities/TemplateRuntime/TemplateRuntime/src/RenderPlayerInfoCardsProviderRegistrar.cpp
@@ -12,17 +12,15 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
+#include "acsdk/TemplateRuntime/private/RenderPlayerInfoCardsProviderRegistrar.h"
 
 #include <AVSCommon/Utils/Logger/Logger.h>
 
-#include "TemplateRuntime/RenderPlayerInfoCardsProviderRegistrar.h"
-
 namespace alexaClientSDK {
-namespace capabilityAgents {
 namespace templateRuntime {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("RenderPlayerInfoCardsProviderRegistrar");
+#define TAG "RenderPlayerInfoCardsProviderRegistrar"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -34,12 +32,6 @@ static const std::string TAG("RenderPlayerInfoCardsProviderRegistrar");
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::utils;
 
-std::shared_ptr<RenderPlayerInfoCardsProviderRegistrarInterface> RenderPlayerInfoCardsProviderRegistrar::
-    createRenderPlayerInfoCardsProviderRegistrarInterface() {
-    std::shared_ptr<RenderPlayerInfoCardsProviderRegistrar> registrar(new RenderPlayerInfoCardsProviderRegistrar());
-    return registrar;
-}
-
 bool RenderPlayerInfoCardsProviderRegistrar::registerProvider(
     const std::shared_ptr<RenderPlayerInfoCardsProviderInterface>& provider) {
     if (!provider) {
@@ -62,8 +54,5 @@ std::unordered_set<std::shared_ptr<RenderPlayerInfoCardsProviderInterface>> Rend
     return m_providers;
 }
 
-RenderPlayerInfoCardsProviderRegistrar::RenderPlayerInfoCardsProviderRegistrar() = default;
-
 }  // namespace templateRuntime
-}  // namespace capabilityAgents
 }  // namespace alexaClientSDK
diff --git a/capabilities/TemplateRuntime/TemplateRuntime/src/RenderPlayerInfoCardsProviderRegistrarFactory.cpp b/capabilities/TemplateRuntime/TemplateRuntime/src/RenderPlayerInfoCardsProviderRegistrarFactory.cpp
new file mode 100644
index 0000000000..9b02efea02
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntime/src/RenderPlayerInfoCardsProviderRegistrarFactory.cpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#include "acsdk/TemplateRuntime/RenderPlayerInfoCardsProviderRegistrarFactory.h"
+
+#include "acsdk/TemplateRuntime/private/RenderPlayerInfoCardsProviderRegistrar.h"
+
+namespace alexaClientSDK {
+namespace templateRuntime {
+
+using namespace avsCommon::sdkInterfaces;
+
+std::shared_ptr<RenderPlayerInfoCardsProviderRegistrarInterface>
+createRenderPlayerInfoCardsProviderRegistrarInterface() {
+    std::shared_ptr<RenderPlayerInfoCardsProviderRegistrar> registrar(new RenderPlayerInfoCardsProviderRegistrar());
+    return registrar;
+}
+
+}  // namespace templateRuntime
+}  // namespace alexaClientSDK
diff --git a/capabilities/TemplateRuntime/TemplateRuntime/src/TemplateRuntime.cpp b/capabilities/TemplateRuntime/TemplateRuntime/src/TemplateRuntime.cpp
new file mode 100644
index 0000000000..c2a1287303
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntime/src/TemplateRuntime.cpp
@@ -0,0 +1,435 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <algorithm>
+#include <utility>
+
+#include <rapidjson/error/en.h>
+
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/Utils/JSON/JSONUtils.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include "AVSCommon/Utils/Memory/Memory.h"
+
+#include "acsdk/TemplateRuntime/private/TemplateRuntime.h"
+
+namespace alexaClientSDK {
+namespace templateRuntime {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::configuration;
+using namespace avsCommon::utils::json;
+using namespace templateRuntimeInterfaces;
+
+/// TemplateRuntime capability constants
+/// TemplateRuntime interface type
+static const std::string TEMPLATERUNTIME_CAPABILITY_INTERFACE_TYPE = "AlexaInterface";
+/// TemplateRuntime interface name
+static const std::string TEMPLATERUNTIME_CAPABILITY_INTERFACE_NAME = "TemplateRuntime";
+/// TemplateRuntime interface version
+static const std::string TEMPLATERUNTIME_CAPABILITY_INTERFACE_VERSION = "1.1";
+
+/// String to identify log entries originating from this file.
+#define TAG "TemplateRuntime"
+
+/// The namespace for this capability agent.
+static const std::string NAMESPACE{"TemplateRuntime"};
+
+/// The name for RenderTemplate directive.
+static const std::string RENDER_TEMPLATE{"RenderTemplate"};
+
+/// The name for RenderPlayerInfo directive.
+static const std::string RENDER_PLAYER_INFO{"RenderPlayerInfo"};
+
+/// The RenderTemplate directive signature.
+static const NamespaceAndName TEMPLATE{NAMESPACE, RENDER_TEMPLATE};
+
+/// The RenderPlayerInfo directive signature.
+static const NamespaceAndName PLAYER_INFO{NAMESPACE, RENDER_PLAYER_INFO};
+
+/// Tag for find the AudioItemId in the payload of the RenderPlayerInfo directive
+static const std::string AUDIO_ITEM_ID_TAG{"audioItemId"};
+
+/// Maximum queue size allowed for m_audioItems.
+static const size_t MAXIMUM_QUEUE_SIZE{100};
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/**
+ * Creates the TemplateRuntime capability configuration.
+ *
+ * @return The TemplateRuntime capability configuration.
+ */
+static std::shared_ptr<avsCommon::avs::CapabilityConfiguration> getTemplateRuntimeCapabilityConfiguration();
+
+std::shared_ptr<TemplateRuntime> TemplateRuntime::create(
+    const std::unordered_set<std::shared_ptr<RenderPlayerInfoCardsProviderInterface>>& renderPlayerInfoCardInterface,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender) {
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+    std::shared_ptr<TemplateRuntime> templateRuntime(
+        new TemplateRuntime(renderPlayerInfoCardInterface, exceptionSender));
+
+    for (const auto& renderPlayerInfoCardProvider : renderPlayerInfoCardInterface) {
+        if (!renderPlayerInfoCardProvider) {
+            ACSDK_ERROR(LX("createFailed").d("reason", "nullRenderPlayerInfoCardInterface"));
+            return nullptr;
+        }
+        renderPlayerInfoCardProvider->setObserver(templateRuntime);
+    }
+
+    return templateRuntime;
+}
+
+void TemplateRuntime::handleDirectiveImmediately(std::shared_ptr<AVSDirective> directive) {
+    ACSDK_DEBUG5(LX("handleDirectiveImmediately"));
+    handleDirective(std::make_shared<DirectiveInfo>(directive, nullptr));
+}
+
+void TemplateRuntime::preHandleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX("preHandleDirective"));
+    // do nothing.
+}
+
+void TemplateRuntime::handleDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_DEBUG5(LX("handleDirective"));
+    if (!info || !info->directive) {
+        ACSDK_ERROR(LX("preHandleDirectiveFailed").d("reason", "nullDirectiveInfo"));
+        return;
+    }
+    if (info->directive->getName() == TEMPLATE.name) {
+        handleRenderTemplateDirective(info);
+    } else if (info->directive->getName() == PLAYER_INFO.name) {
+        handleRenderPlayerInfoDirective(info);
+    } else {
+        handleUnknownDirective(info);
+    }
+}
+
+void TemplateRuntime::cancelDirective(std::shared_ptr<DirectiveInfo> info) {
+    removeDirective(info);
+}
+
+DirectiveHandlerConfiguration TemplateRuntime::getConfiguration() const {
+    ACSDK_DEBUG5(LX("getConfiguration"));
+    DirectiveHandlerConfiguration configuration;
+    auto visualNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUM_VISUAL, false);
+
+    configuration[TEMPLATE] = visualNonBlockingPolicy;
+    configuration[PLAYER_INFO] = visualNonBlockingPolicy;
+    return configuration;
+}
+
+void TemplateRuntime::onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity state, const Context& context) {
+    ACSDK_DEBUG5(LX("onRenderPlayerCardsInfoChanged"));
+    m_executor.submit([this, state, context]() {
+        ACSDK_DEBUG5(LX("onPlayerActivityChangedInExecutor"));
+        executeAudioPlayerInfoUpdates(state, context);
+    });
+}
+
+void TemplateRuntime::addObserver(std::weak_ptr<TemplateRuntimeObserverInterface> observer) {
+    ACSDK_DEBUG5(LX("addObserver"));
+    m_notifier->addWeakPtrObserver(observer);
+}
+
+void TemplateRuntime::removeObserver(std::weak_ptr<TemplateRuntimeObserverInterface> observer) {
+    ACSDK_DEBUG5(LX("removeObserver"));
+    m_notifier->removeWeakPtrObserver(observer);
+}
+
+TemplateRuntime::TemplateRuntime(
+    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>>
+        renderPlayerInfoCardsInterfaces,
+    std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface> exceptionSender) :
+        CapabilityAgent{NAMESPACE, std::move(exceptionSender)},
+        RequiresShutdown{"TemplateRuntime"},
+        m_isRenderTemplateLastReceived{false},
+        m_renderPlayerInfoCardsInterfaces{std::move(renderPlayerInfoCardsInterfaces)} {
+    m_capabilityConfigurations.insert(getTemplateRuntimeCapabilityConfiguration());
+    m_notifier = std::make_shared<TemplateRuntimeNotifier>();
+}
+
+std::shared_ptr<CapabilityConfiguration> getTemplateRuntimeCapabilityConfiguration() {
+    std::unordered_map<std::string, std::string> configMap;
+    configMap.insert({CAPABILITY_INTERFACE_TYPE_KEY, TEMPLATERUNTIME_CAPABILITY_INTERFACE_TYPE});
+    configMap.insert({CAPABILITY_INTERFACE_NAME_KEY, TEMPLATERUNTIME_CAPABILITY_INTERFACE_NAME});
+    configMap.insert({CAPABILITY_INTERFACE_VERSION_KEY, TEMPLATERUNTIME_CAPABILITY_INTERFACE_VERSION});
+
+    return std::make_shared<CapabilityConfiguration>(configMap);
+}
+
+void TemplateRuntime::doShutdown() {
+    m_executor.shutdown();
+    m_observers.clear();
+    m_activeRenderPlayerInfoCardsProvider.reset();
+    m_audioItemsInExecution.clear();
+    m_audioPlayerInfo.clear();
+    for (const auto& renderPlayerInfoCardsInterface : m_renderPlayerInfoCardsInterfaces) {
+        renderPlayerInfoCardsInterface->setObserver(nullptr);
+    }
+    m_renderPlayerInfoCardsInterfaces.clear();
+}
+
+void TemplateRuntime::removeDirective(std::shared_ptr<DirectiveInfo> info) {
+    /*
+     * Check result too, to catch cases where DirectiveInfo was created locally, without a nullptr result.
+     * In those cases there is no messageId to remove because no result was expected.
+     */
+    if (info->directive && info->result) {
+        CapabilityAgent::removeDirective(info->directive->getMessageId());
+    }
+}
+
+void TemplateRuntime::setHandlingCompleted(const std::shared_ptr<DirectiveInfo>& info) {
+    if (info && info->result) {
+        info->result->setCompleted();
+    }
+    removeDirective(info);
+}
+
+void TemplateRuntime::handleRenderTemplateDirective(const std::shared_ptr<DirectiveInfo>& info) {
+    ACSDK_DEBUG5(LX("handleRenderTemplateDirective"));
+
+    m_executor.submit([this, info]() {
+        ACSDK_DEBUG5(LX("handleRenderTemplateDirectiveInExecutor"));
+        m_isRenderTemplateLastReceived = true;
+        executeDisplayCard(info);
+        setHandlingCompleted(info);
+    });
+}
+
+void TemplateRuntime::handleRenderPlayerInfoDirective(const std::shared_ptr<DirectiveInfo>& info) {
+    ACSDK_DEBUG5(LX("handleRenderPlayerInfoDirective"));
+
+    m_executor.submit([this, info]() {
+        ACSDK_DEBUG5(LX("handleRenderPlayerInfoDirectiveInExecutor"));
+        m_isRenderTemplateLastReceived = false;
+
+        rapidjson::Document payload;
+        rapidjson::ParseResult result = payload.Parse(info->directive->getPayload());
+        if (!result) {
+            ACSDK_ERROR(LX("handleRenderPlayerInfoDirectiveInExecutorParseFailed")
+                            .d("reason", rapidjson::GetParseError_En(result.Code()))
+                            .d("offset", result.Offset())
+                            .d("messageId", info->directive->getMessageId()));
+            sendExceptionEncounteredAndReportFailed(
+                info, "Unable to parse payload", ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+            return;
+        }
+
+        std::string audioItemId;
+        if (!jsonUtils::retrieveValue(payload, AUDIO_ITEM_ID_TAG, &audioItemId)) {
+            ACSDK_ERROR(LX("handleRenderPlayerInfoDirective")
+                            .d("reason", "missingAudioItemId")
+                            .d("messageId", info->directive->getMessageId()));
+            sendExceptionEncounteredAndReportFailed(info, "missing audioItemId");
+            return;
+        }
+
+        size_t found = std::string::npos;
+        for (auto& executionMap : m_audioItemsInExecution) {
+            if (!executionMap.second.audioItemId.empty()) {
+                found = audioItemId.find(executionMap.second.audioItemId);
+            }
+            if (found != std::string::npos) {
+                ACSDK_DEBUG3(LX("handleRenderPlayerInfoDirectiveInExecutor")
+                                 .d("audioItemId", audioItemId)
+                                 .m("Matching audioItemId in execution."));
+                executionMap.second.directive = info;
+                m_activeRenderPlayerInfoCardsProvider = executionMap.first;
+                m_audioPlayerInfo[m_activeRenderPlayerInfoCardsProvider].mediaProperties = executionMap.first;
+                executeDisplayCard(info);
+                // Since there'a match, we can safely empty m_audioItems.
+                m_audioItems.clear();
+                break;
+            }
+        }
+
+        if (std::string::npos == found) {
+            ACSDK_DEBUG3(LX("handleRenderPlayerInfoDirectiveInExecutor")
+                             .d("audioItemId", audioItemId)
+                             .m("Not matching audioItemId in execution."));
+
+            AudioItemPair itemPair{audioItemId, info};
+            if (m_audioItems.size() == MAXIMUM_QUEUE_SIZE) {
+                // Something is wrong, so we pop the back of the queue and log an error.
+                auto discardedAudioItem = m_audioItems.back();
+                m_audioItems.pop_back();
+                ACSDK_ERROR(LX("handleRenderPlayerInfoDirective")
+                                .d("reason", "queueIsFull")
+                                .d("discardedAudioItemId", discardedAudioItem.audioItemId));
+            }
+            m_audioItems.push_front(itemPair);
+        }
+
+        setHandlingCompleted(info);
+    });
+}
+
+void TemplateRuntime::handleUnknownDirective(std::shared_ptr<DirectiveInfo> info) {
+    ACSDK_ERROR(LX("handleDirectiveFailed")
+                    .d("reason", "unknownDirective")
+                    .d("namespace", info->directive->getNamespace())
+                    .d("name", info->directive->getName()));
+
+    m_executor.submit([this, info] {
+        const std::string exceptionMessage =
+            "unexpected directive " + info->directive->getNamespace() + ":" + info->directive->getName();
+
+        sendExceptionEncounteredAndReportFailed(
+            info, exceptionMessage, ExceptionErrorType::UNEXPECTED_INFORMATION_RECEIVED);
+    });
+}
+
+void TemplateRuntime::executeAudioPlayerInfoUpdates(avsCommon::avs::PlayerActivity state, const Context& context) {
+    ACSDK_DEBUG5(LX("executeAudioPlayerInfoUpdates")
+                     .d("audioItemId", context.audioItemId)
+                     .d("offset", context.offset.count())
+                     .d("audioPlayerState", state)
+                     .d("isRenderTemplatelastReceived", m_isRenderTemplateLastReceived));
+
+    if (avsCommon::avs::PlayerActivity::IDLE == state || avsCommon::avs::PlayerActivity::BUFFER_UNDERRUN == state) {
+        /*
+         * The TemplateRuntime Capability Agent is not interested in the IDLE nor BUFFER_UNDERRUN state, so we just
+         * ignore the callback.
+         */
+        return;
+    }
+
+    if (!context.mediaProperties) {
+        ACSDK_ERROR(LX("executeAudioPlayerInfoUpdatesFailed").d("reason", "nullRenderPlayerInfoCardsInterface"));
+        return;
+    }
+
+    const auto& currentRenderPlayerInfoCardsProvider = context.mediaProperties;
+    if (m_audioPlayerInfo[currentRenderPlayerInfoCardsProvider].audioPlayerState == state &&
+        m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].audioItemId == context.audioItemId) {
+        /*
+         * The AudioPlayer notification is chatty during audio playback as it will frequently toggle between
+         * BUFFER_UNDERRUN and PLAYER state.  So we filter out the callbacks if the notification are with the
+         * same state and audioItemId.
+         */
+        return;
+    }
+
+    m_audioPlayerInfo[currentRenderPlayerInfoCardsProvider].audioPlayerState = state;
+    m_audioPlayerInfo[currentRenderPlayerInfoCardsProvider].mediaProperties = context.mediaProperties;
+    if (m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].audioItemId != context.audioItemId) {
+        m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].audioItemId = context.audioItemId;
+        m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].directive.reset();
+        // iterate from front to back (front is most recent)
+        for (auto it = m_audioItems.begin(); it != m_audioItems.end(); ++it) {
+            auto found = it->audioItemId.find(context.audioItemId);
+            if (std::string::npos != found) {
+                ACSDK_DEBUG3(LX("executeAudioPlayerInfoUpdates")
+                                 .d("audioItemId", context.audioItemId)
+                                 .m("Found matching audioItemId in queue."));
+                m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].directive = it->directive;
+                m_activeRenderPlayerInfoCardsProvider = currentRenderPlayerInfoCardsProvider;
+                // We are erasing items older than the current found, as well as the current item.
+                m_audioItems.erase(it, m_audioItems.end());
+                break;
+            }
+        }
+    }
+    if (m_isRenderTemplateLastReceived && state != avsCommon::avs::PlayerActivity::PLAYING) {
+        /*
+         * If RenderTemplate is the last directive received and the AudioPlayer is not notifying a PLAY,
+         * we shouldn't be notifying the observer to render a PlayerInfo display card.
+         */
+        return;
+    }
+    m_isRenderTemplateLastReceived = false;
+
+    /*
+     * If the AudioPlayer notifies a PLAYING state before the RenderPlayerInfo with the corresponding
+     * audioItemId is received, this function will also be called but the m_audioItemsInExecution.directive
+     * will be set to nullptr.  So we need to do a nullptr check here to make sure there is a RenderPlayerInfo
+     * displayCard to display..
+     */
+    if (m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].directive) {
+        executeDisplayCard(m_audioItemsInExecution[currentRenderPlayerInfoCardsProvider].directive);
+    }
+}
+
+void TemplateRuntime::executeRenderPlayerInfoCallback() {
+    ACSDK_DEBUG3(LX("executeRenderPlayerInfoCallback"));
+    if (!m_activeRenderPlayerInfoCardsProvider) {
+        ACSDK_ERROR(LX("executeRenderPlayerInfoCallbackFailed").d("reason", "nullActiveRenderPlayerInfoCardsProvider"));
+        return;
+    }
+    if (!m_audioItemsInExecution[m_activeRenderPlayerInfoCardsProvider].directive) {
+        ACSDK_ERROR(LX("executeRenderPlayerInfoCallbackFailed").d("reason", "nullAudioItemInExecution"));
+        return;
+    }
+    auto payload = m_audioItemsInExecution[m_activeRenderPlayerInfoCardsProvider].directive->directive->getPayload();
+    m_notifier->notifyObservers([this, payload](const std::shared_ptr<TemplateRuntimeObserverInterface>& observer) {
+        if (observer) {
+            observer->renderPlayerInfoCard(payload, m_audioPlayerInfo[m_activeRenderPlayerInfoCardsProvider]);
+        }
+    });
+}
+
+void TemplateRuntime::executeRenderTemplateCallback() {
+    ACSDK_DEBUG3(LX("executeRenderTemplateCallback"));
+    m_notifier->notifyObservers([this](const std::shared_ptr<TemplateRuntimeObserverInterface>& observer) {
+        if (observer) {
+            observer->renderTemplateCard(m_lastDisplayedDirective->directive->getPayload());
+        }
+    });
+}
+
+void TemplateRuntime::executeDisplayCard(std::shared_ptr<DirectiveInfo> info) {
+    m_lastDisplayedDirective = std::move(info);
+
+    if (m_lastDisplayedDirective) {
+        if (m_lastDisplayedDirective->directive->getName() == RENDER_TEMPLATE) {
+            executeRenderTemplateCallback();
+        } else {
+            executeRenderPlayerInfoCallback();
+        }
+    }
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> TemplateRuntime::
+    getCapabilityConfigurations() {
+    return m_capabilityConfigurations;
+}
+
+void TemplateRuntime::addRenderPlayerInfoCardsProvider(
+    std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface> cardsProvider) {
+    ACSDK_DEBUG5(LX("addRenderPlayerInfoCardsProvider"));
+
+    if (!cardsProvider) {
+        ACSDK_ERROR(
+            LX("addRenderPlayerInfoCardsProviderFailed").d("reason", "nullRenderPlayerInfoCardsProviderInterface"));
+        return;
+    }
+    cardsProvider->setObserver(shared_from_this());
+    m_renderPlayerInfoCardsInterfaces.insert(cardsProvider);
+}
+
+}  // namespace templateRuntime
+}  // namespace alexaClientSDK
diff --git a/capabilities/TemplateRuntime/TemplateRuntime/src/TemplateRuntimeFactory.cpp b/capabilities/TemplateRuntime/TemplateRuntime/src/TemplateRuntimeFactory.cpp
new file mode 100644
index 0000000000..7fb8c6e5af
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntime/src/TemplateRuntimeFactory.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/TemplateRuntime/TemplateRuntimeFactory.h"
+
+#include "acsdk/TemplateRuntime/private/TemplateRuntime.h"
+
+namespace alexaClientSDK {
+namespace templateRuntime {
+
+using namespace avsCommon::sdkInterfaces;
+
+avsCommon::utils::Optional<TemplateRuntimeFactory::TemplateRuntimeAgentData> TemplateRuntimeFactory::create(
+    const std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderRegistrarInterface>&
+        renderPlayerInfoCardsProviderRegistrar,
+    const std::shared_ptr<avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>& exceptionSender,
+    const std::shared_ptr<avsCommon::sdkInterfaces::endpoints::EndpointCapabilitiesRegistrarInterface>&
+        endpointCapabilitiesRegistrar) {
+    auto templateRuntime =
+        TemplateRuntime::create(renderPlayerInfoCardsProviderRegistrar->getProviders(), exceptionSender);
+    endpointCapabilitiesRegistrar->withCapability(templateRuntime, templateRuntime);
+    TemplateRuntimeFactory::TemplateRuntimeAgentData templateRuntimeAgentData;
+    if (templateRuntime) {
+        templateRuntimeAgentData.templateRuntime = templateRuntime;
+        templateRuntimeAgentData.requiresShutdown = templateRuntime;
+
+        return avsCommon::utils::Optional<TemplateRuntimeFactory::TemplateRuntimeAgentData>(templateRuntimeAgentData);
+    }
+
+    return avsCommon::utils::Optional<TemplateRuntimeFactory::TemplateRuntimeAgentData>();
+}
+
+}  // namespace templateRuntime
+}  // namespace alexaClientSDK
diff --git a/capabilities/TemplateRuntime/TemplateRuntime/test/CMakeLists.txt b/capabilities/TemplateRuntime/TemplateRuntime/test/CMakeLists.txt
new file mode 100644
index 0000000000..22425758e8
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntime/test/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+    "${acsdkTemplateRuntime_SOURCE_DIR}/privateInclude"
+    "${RAPIDJSON_INCLUDE_DIR}"
+    "${AVSCommon_SOURCE_DIR}/AVS/test")
+
+set(LIBS "acsdkTemplateRuntime" "SDKInterfacesTests" "AttachmentCommonTestLib")
+
+discover_unit_tests("${INCLUDE_PATH}" "${LIBS}")
diff --git a/capabilities/TemplateRuntime/TemplateRuntime/test/RenderPlayerInfoCardsProviderRegistrarTest.cpp b/capabilities/TemplateRuntime/TemplateRuntime/test/RenderPlayerInfoCardsProviderRegistrarTest.cpp
new file mode 100644
index 0000000000..a8e71a29da
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntime/test/RenderPlayerInfoCardsProviderRegistrarTest.cpp
@@ -0,0 +1,90 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/// @file RenderPlayerInfoCardsProviderRegistrarTest.cpp
+
+#include <memory>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderInterface.h>
+
+#include <acsdk/TemplateRuntime/RenderPlayerInfoCardsProviderRegistrarFactory.h>
+
+namespace alexaClientSDK {
+namespace templateRuntime {
+namespace test {
+
+using namespace ::testing;
+using namespace avsCommon::sdkInterfaces;
+
+class MockRenderPlayerInfoCardProvider : public RenderPlayerInfoCardsProviderInterface {
+public:
+    MOCK_METHOD1(setObserver, void(std::shared_ptr<RenderPlayerInfoCardsObserverInterface>));
+};
+
+/**
+ * Verify getProviders() returns the set of registered providers.
+ */
+TEST(RenderPlayerInfoCardsProviderTest, test_getProviders) {
+    auto provider1 = std::make_shared<StrictMock<MockRenderPlayerInfoCardProvider>>();
+    auto provider2 = std::make_shared<StrictMock<MockRenderPlayerInfoCardProvider>>();
+    auto registrar = createRenderPlayerInfoCardsProviderRegistrarInterface();
+
+    ASSERT_TRUE(registrar);
+
+    ASSERT_TRUE(registrar->registerProvider(provider1));
+    ASSERT_TRUE(registrar->registerProvider(provider2));
+
+    std::unordered_set<std::shared_ptr<RenderPlayerInfoCardsProviderInterface>> providers = registrar->getProviders();
+    ASSERT_THAT(providers, Contains(provider1));
+    ASSERT_THAT(providers, Contains(provider2));
+}
+
+/**
+ * Verify registering a provider fails if it is a duplicate.
+ */
+TEST(PostConnectOperationProviderRegistrarTest, test_registerDuplicateProviderFails) {
+    auto provider1 = std::make_shared<StrictMock<MockRenderPlayerInfoCardProvider>>();
+    auto registrar = createRenderPlayerInfoCardsProviderRegistrarInterface();
+
+    ASSERT_TRUE(registrar);
+
+    ASSERT_TRUE(registrar->registerProvider(provider1));
+    ASSERT_FALSE(registrar->registerProvider(provider1));
+
+    std::unordered_set<std::shared_ptr<RenderPlayerInfoCardsProviderInterface>> providers = registrar->getProviders();
+    ASSERT_TRUE(providers.size() == 1);
+    ASSERT_THAT(providers, Contains(provider1));
+}
+
+/**
+ * Verify registering a null provider fails.
+ */
+TEST(PostConnectOperationProviderRegistrarTest, test_registerNullProviderFails) {
+    auto registrar = createRenderPlayerInfoCardsProviderRegistrarInterface();
+
+    ASSERT_TRUE(registrar);
+
+    ASSERT_FALSE(registrar->registerProvider(nullptr));
+
+    std::unordered_set<std::shared_ptr<RenderPlayerInfoCardsProviderInterface>> providers = registrar->getProviders();
+    ASSERT_TRUE(providers.size() == 0);
+}
+
+}  // namespace test
+}  // namespace templateRuntime
+}  // namespace alexaClientSDK
diff --git a/capabilities/TemplateRuntime/TemplateRuntime/test/TemplateRuntimeTest.cpp b/capabilities/TemplateRuntime/TemplateRuntime/test/TemplateRuntimeTest.cpp
new file mode 100644
index 0000000000..5dc65e52a6
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntime/test/TemplateRuntimeTest.cpp
@@ -0,0 +1,762 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/// @file TemplateRuntimeTest
+#include <future>
+#include <memory>
+#include <unordered_set>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <rapidjson/document.h>
+
+#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
+#include <AVSCommon/AVS/NamespaceAndName.h>
+#include <AVSCommon/SDKInterfaces/MediaPropertiesInterface.h>
+#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderInterface.h>
+#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderRegistrarInterface.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+
+#include <acsdk/TemplateRuntimeInterfaces/TemplateRuntimeObserverInterface.h>
+#include <acsdk/TemplateRuntime/private/TemplateRuntime.h>
+
+namespace alexaClientSDK {
+namespace templateRuntime {
+namespace test {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::avs::attachment::test;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::sdkInterfaces::test;
+using namespace avsCommon::utils::memory;
+using namespace rapidjson;
+using namespace templateRuntimeInterfaces;
+using namespace ::testing;
+
+/// Timeout when waiting for futures to be set.
+static std::chrono::milliseconds TIMEOUT(1000);
+
+/// Timeout when waiting for clearTemplateCard.
+static std::chrono::milliseconds TEMPLATE_TIMEOUT(5000);
+
+/// Timeout when waiting for clearTemplateCard not called.
+static std::chrono::milliseconds TEMPLATE_NOT_CLEAR_TIMEOUT(2500);
+
+/// The namespace for this capability agent.
+static const std::string NAMESPACE{"TemplateRuntime"};
+
+/// An unknown directive signature.
+static const std::string UNKNOWN_DIRECTIVE{"Unknown"};
+
+/// The RenderTemplate directive signature.
+static const NamespaceAndName TEMPLATE{NAMESPACE, "RenderTemplate"};
+
+/// The RenderPlayerInfo directive signature.
+static const NamespaceAndName PLAYER_INFO{NAMESPACE, "RenderPlayerInfo"};
+
+/// The @c MessageId identifer.
+static const std::string MESSAGE_ID("messageId");
+
+/// An audioItemId for the RenderPlayerInfo directive.
+static const std::string AUDIO_ITEM_ID("AudioItemId abcdefgh");
+
+/// An audioItemId without a corresponding RenderPlayerInfo directive.
+static const std::string AUDIO_ITEM_ID_1("AudioItemId 12345678");
+
+/// A RenderTemplate directive payload.
+static const std::string TEMPLATE_PAYLOAD =
+    "{"
+    "\"token\":\"TOKEN1\","
+    "\"type\":\"BodyTemplate1\","
+    "\"title\":{"
+    "\"mainTitle\":\"MAIN_TITLE\","
+    "\"subTitle\":\"SUB_TITLE\""
+    "}"
+    "}";
+
+/// A RenderPlayerInfo directive payload.
+static const std::string PLAYERINFO_PAYLOAD =
+    "{"
+    "\"audioItemId\":\"" +
+    AUDIO_ITEM_ID +
+    "\","
+    "\"content\":{"
+    "\"title\":\"TITLE\","
+    "\"header\":\"HEADER\""
+    "}"
+    "}";
+
+/// A malformed RenderPlayerInfo directive payload.
+static const std::string MALFORM_PLAYERINFO_PAYLOAD =
+    "{"
+    "\"audioItemId\"::::\"" +
+    AUDIO_ITEM_ID +
+    "\","
+    "\"content\":{{{{"
+    "\"title\":\"TITLE\","
+    "\"header\":\"HEADER\""
+    "}"
+    "}";
+
+class MockMediaPropertiesFetcher : public MediaPropertiesInterface {
+public:
+    MOCK_METHOD0(getAudioItemOffset, std::chrono::milliseconds());
+    MOCK_METHOD0(getAudioItemDuration, std::chrono::milliseconds());
+};
+
+class MockRenderInfoCardsPlayer : public RenderPlayerInfoCardsProviderInterface {
+public:
+    MOCK_METHOD1(setObserver, void(std::shared_ptr<RenderPlayerInfoCardsObserverInterface> observer));
+};
+
+class MockRenderInfoCardsPlayerRegistrar : public RenderPlayerInfoCardsProviderRegistrarInterface {
+public:
+    MOCK_METHOD1(registerProvider, bool(const std::shared_ptr<RenderPlayerInfoCardsProviderInterface>& provider));
+    MOCK_METHOD0(getProviders, std::unordered_set<std::shared_ptr<RenderPlayerInfoCardsProviderInterface>>());
+};
+
+class MockGui : public TemplateRuntimeObserverInterface {
+public:
+    MOCK_METHOD1(renderTemplateCard, void(const std::string& jsonPayload));
+    MOCK_METHOD2(
+        renderPlayerInfoCard,
+        void(const std::string& jsonPayload, TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo));
+};
+
+/// Test harness for @c TemplateRuntime class.
+class TemplateRuntimeTest : public ::testing::Test {
+public:
+    /// Set up the test harness for running a test.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Function to set the promise and wake @c m_wakeSetCompleteFuture.
+    void wakeOnSetCompleted();
+
+    /// Function to set the promise and wake @c m_wakeRenderTemplateCardFuture.
+    void wakeOnRenderTemplateCard();
+
+    /// Function to set the promise and wake @c m_wakeRenderPlayerInfoCardFuture.
+    void wakeOnRenderPlayerInfoCard();
+
+    /// Function to set the promise and wake @c m_wakeClearTemplateCardFuture.
+    void wakeOnClearTemplateCard();
+
+    /// Function to set the promise and wake @c m_wakeClearPlayerInfoCardFuture.
+    void wakeOnClearPlayerInfoCard();
+
+    /// A constructor which initializes the promises and futures needed for the test class.
+    TemplateRuntimeTest() :
+            m_wakeSetCompletedPromise{},
+            m_wakeSetCompletedFuture{m_wakeSetCompletedPromise.get_future()},
+            m_wakeRenderTemplateCardPromise{},
+            m_wakeRenderTemplateCardFuture{m_wakeRenderTemplateCardPromise.get_future()},
+            m_wakeRenderPlayerInfoCardPromise{},
+            m_wakeRenderPlayerInfoCardFuture{m_wakeRenderPlayerInfoCardPromise.get_future()},
+            m_wakeClearTemplateCardPromise{},
+            m_wakeClearTemplateCardFuture{m_wakeClearTemplateCardPromise.get_future()},
+            m_wakeClearPlayerInfoCardPromise{},
+            m_wakeClearPlayerInfoCardFuture{m_wakeClearPlayerInfoCardPromise.get_future()},
+            m_wakeReleaseChannelPromise{},
+            m_wakeReleaseChannelFuture{m_wakeReleaseChannelPromise.get_future()} {
+    }
+
+protected:
+    /// Promise to synchronize directive handling through setCompleted.
+    std::promise<void> m_wakeSetCompletedPromise;
+
+    /// Future to synchronize directive handling through setCompleted.
+    std::future<void> m_wakeSetCompletedFuture;
+
+    /// Promise to synchronize directive handling with RenderTemplateCard callback.
+    std::promise<void> m_wakeRenderTemplateCardPromise;
+
+    /// Future to synchronize directive handling with RenderTemplateCard callback.
+    std::future<void> m_wakeRenderTemplateCardFuture;
+
+    /// Promise to synchronize directive handling with RenderPlayerInfoCard callback.
+    std::promise<void> m_wakeRenderPlayerInfoCardPromise;
+
+    /// Future to synchronize directive handling with RenderPlayerInfoCard callback.
+    std::future<void> m_wakeRenderPlayerInfoCardFuture;
+
+    /// Promise to synchronize ClearTemplateCard callback.
+    std::promise<void> m_wakeClearTemplateCardPromise;
+
+    /// Future to synchronize ClearTemplateCard callback.
+    std::future<void> m_wakeClearTemplateCardFuture;
+
+    /// Promise to synchronize ClearPlayerInfoCard callback.
+    std::promise<void> m_wakeClearPlayerInfoCardPromise;
+
+    /// Future to synchronize ClearPlayerInfoCard callback.
+    std::future<void> m_wakeClearPlayerInfoCardFuture;
+
+    /// Promise to synchronize releaseChannel calls.
+    std::promise<void> m_wakeReleaseChannelPromise;
+
+    /// Future to synchronize releaseChannel calls.
+    std::future<void> m_wakeReleaseChannelFuture;
+
+    /// A nice mock for the RenderInfoCardsInterface calls.
+    std::shared_ptr<NiceMock<MockRenderInfoCardsPlayer>> m_mockRenderPlayerInfoCardsProvider;
+
+    /// A nice mock for the MediaPropertiesInterface calls.
+    std::shared_ptr<MockMediaPropertiesFetcher> m_mediaPropertiesFetcher;
+
+    /// A strict mock that allows the test to strictly monitor the exceptions being sent.
+    std::shared_ptr<StrictMock<MockExceptionEncounteredSender>> m_mockExceptionSender;
+
+    /// A strict mock that allows the test to strictly monitor the handling of directives.
+    std::unique_ptr<StrictMock<MockDirectiveHandlerResult>> m_mockDirectiveHandlerResult;
+
+    /// A strict mock to allow testing of the observer callback.
+    std::shared_ptr<StrictMock<MockGui>> m_mockGui;
+
+    /// A pointer to an instance of the TemplateRuntime that will be instantiated per test.
+    std::shared_ptr<templateRuntime::TemplateRuntime> m_templateRuntime;
+};
+
+void TemplateRuntimeTest::SetUp() {
+    m_mockExceptionSender = std::make_shared<StrictMock<MockExceptionEncounteredSender>>();
+    m_mockDirectiveHandlerResult = make_unique<StrictMock<MockDirectiveHandlerResult>>();
+    m_mediaPropertiesFetcher = std::make_shared<NiceMock<MockMediaPropertiesFetcher>>();
+    m_mockRenderPlayerInfoCardsProvider = std::make_shared<NiceMock<MockRenderInfoCardsPlayer>>();
+    m_mockGui = std::make_shared<StrictMock<MockGui>>();
+    m_templateRuntime = TemplateRuntime::create({m_mockRenderPlayerInfoCardsProvider}, m_mockExceptionSender);
+    m_templateRuntime->addObserver(m_mockGui);
+}
+
+void TemplateRuntimeTest::TearDown() {
+    if (m_templateRuntime && !m_templateRuntime->isShutdown()) {
+        m_templateRuntime->shutdown();
+    }
+
+    m_templateRuntime.reset();
+}
+
+void TemplateRuntimeTest::wakeOnSetCompleted() {
+    m_wakeSetCompletedPromise.set_value();
+}
+
+void TemplateRuntimeTest::wakeOnRenderTemplateCard() {
+    m_wakeRenderTemplateCardPromise.set_value();
+}
+
+void TemplateRuntimeTest::wakeOnRenderPlayerInfoCard() {
+    m_wakeRenderPlayerInfoCardPromise.set_value();
+}
+
+void TemplateRuntimeTest::wakeOnClearTemplateCard() {
+    m_wakeClearTemplateCardPromise.set_value();
+}
+
+void TemplateRuntimeTest::wakeOnClearPlayerInfoCard() {
+    m_wakeClearPlayerInfoCardPromise.set_value();
+}
+
+/**
+ * Tests creating the TemplateRuntime with a null audioPlayerInterface.
+ */
+TEST_F(TemplateRuntimeTest, test_nullAudioPlayerInterface) {
+    std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface>> providers = {
+        nullptr};
+    auto templateRuntime = TemplateRuntime::create(providers, m_mockExceptionSender);
+    ASSERT_EQ(templateRuntime, nullptr);
+}
+
+/**
+ * Tests creating the TemplateRuntime with a null exceptionSender.
+ */
+TEST_F(TemplateRuntimeTest, test_nullExceptionSender) {
+    auto templateRuntime = TemplateRuntime::create({m_mockRenderPlayerInfoCardsProvider}, nullptr);
+    ASSERT_EQ(templateRuntime, nullptr);
+}
+
+/**
+ * Tests that the TemplateRuntime will add itself to the providers registered with the RenderInfoCardsPlayerRegistrar at
+ * constructor time, and remove itself from them during shutdown.
+ */
+TEST_F(TemplateRuntimeTest, test_renderInfoCardsPlayersFromRegistrarAddRemoveObserver) {
+    auto mockRenderInfoCardsProvider1 = std::make_shared<NiceMock<MockRenderInfoCardsPlayer>>();
+    auto mockRenderInfoCardsProvider2 = std::make_shared<NiceMock<MockRenderInfoCardsPlayer>>();
+
+    auto mockRenderInfoCardsPlayerRegistrar = std::make_shared<StrictMock<MockRenderInfoCardsPlayerRegistrar>>();
+    EXPECT_CALL(*mockRenderInfoCardsPlayerRegistrar, getProviders())
+        .WillOnce(Invoke([mockRenderInfoCardsProvider1, mockRenderInfoCardsProvider2]() {
+            std::unordered_set<std::shared_ptr<RenderPlayerInfoCardsProviderInterface>> providers = {
+                mockRenderInfoCardsProvider1, mockRenderInfoCardsProvider2};
+            return providers;
+        }));
+
+    auto mockExceptionSender = std::make_shared<StrictMock<MockExceptionEncounteredSender>>();
+
+    Expectation setObserver1 = EXPECT_CALL(*mockRenderInfoCardsProvider1, setObserver(NotNull())).Times(Exactly(1));
+    EXPECT_CALL(*mockRenderInfoCardsProvider1, setObserver(IsNull())).Times(Exactly(1)).After(setObserver1);
+    Expectation setObserver2 = EXPECT_CALL(*mockRenderInfoCardsProvider2, setObserver(NotNull())).Times(Exactly(1));
+    EXPECT_CALL(*mockRenderInfoCardsProvider2, setObserver(IsNull())).Times(Exactly(1)).After(setObserver2);
+
+    auto templateRuntime =
+        TemplateRuntime::create(mockRenderInfoCardsPlayerRegistrar->getProviders(), mockExceptionSender);
+    templateRuntime->shutdown();
+}
+
+/**
+ * Tests that the TemplateRuntime successfully add itself with the RenderInfoCardsPlayers at constructor time, and
+ * successfully remove itself with the RenderPlayerInfoCardsPlayers during shutdown.
+ */
+TEST_F(TemplateRuntimeTest, test_renderInfoCardsPlayersAddRemoveObserver) {
+    auto mockRenderInfoCardsProvider1 = std::make_shared<NiceMock<MockRenderInfoCardsPlayer>>();
+    auto mockRenderInfoCardsProvider2 = std::make_shared<NiceMock<MockRenderInfoCardsPlayer>>();
+    auto mockExceptionSender = std::make_shared<StrictMock<MockExceptionEncounteredSender>>();
+
+    Expectation setObserver1 = EXPECT_CALL(*mockRenderInfoCardsProvider1, setObserver(NotNull())).Times(Exactly(1));
+    EXPECT_CALL(*mockRenderInfoCardsProvider1, setObserver(IsNull())).Times(Exactly(1)).After(setObserver1);
+    Expectation setObserver2 = EXPECT_CALL(*mockRenderInfoCardsProvider2, setObserver(NotNull())).Times(Exactly(1));
+    EXPECT_CALL(*mockRenderInfoCardsProvider2, setObserver(IsNull())).Times(Exactly(1)).After(setObserver2);
+
+    auto templateRuntime =
+        TemplateRuntime::create({mockRenderInfoCardsProvider1, mockRenderInfoCardsProvider2}, mockExceptionSender);
+    templateRuntime->shutdown();
+}
+
+/**
+ * Tests unknown Directive. Expect that the sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(TemplateRuntimeTest, test_unknownDirective) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(NAMESPACE, UNKNOWN_DIRECTIVE, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive = AVSDirective::create("", avsMessageHeader, "", attachmentManager, "");
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_))
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
+
+    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests RenderTemplate Directive. Expect that the renderTemplateCard callback will be called.
+ */
+TEST_F(TemplateRuntimeTest, testSlow_renderTemplateDirective) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(TEMPLATE.nameSpace, TEMPLATE.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, TEMPLATE_PAYLOAD, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockGui, renderTemplateCard(TEMPLATE_PAYLOAD))
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderTemplateCard));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
+
+    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+    m_wakeRenderTemplateCardFuture.wait_for(TIMEOUT);
+    m_wakeClearTemplateCardFuture.wait_for(TEMPLATE_TIMEOUT);
+}
+
+/**
+ * Tests RenderTemplate Directive. Expect that the renderTemplateCard callback will be called and then goes EXPECTING
+ * and SPEAKING state.
+ */
+TEST_F(
+    TemplateRuntimeTest,
+    testRenderTemplateDirectiveWillNotClearCardAfterGoingToExpectingStateAfterGoingToIDLESlowTest) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(TEMPLATE.nameSpace, TEMPLATE.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, TEMPLATE_PAYLOAD, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockGui, renderTemplateCard(TEMPLATE_PAYLOAD))
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderTemplateCard));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
+
+    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+    m_wakeRenderTemplateCardFuture.wait_for(TIMEOUT);
+
+    // first test IDLE->EXPECTING transition
+    EXPECT_EQ(m_wakeClearTemplateCardFuture.wait_for(TEMPLATE_NOT_CLEAR_TIMEOUT), std::future_status::timeout);
+
+    // now test IDLE->SPEAKING transition
+    EXPECT_EQ(m_wakeClearTemplateCardFuture.wait_for(TEMPLATE_NOT_CLEAR_TIMEOUT), std::future_status::timeout);
+}
+
+/**
+ * Tests RenderTemplate Directive using the handleDirectiveImmediately. Expect that the renderTemplateCard
+ * callback will be called.
+ */
+TEST_F(TemplateRuntimeTest, test_handleDirectiveImmediately) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(TEMPLATE.nameSpace, TEMPLATE.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, TEMPLATE_PAYLOAD, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockGui, renderTemplateCard(TEMPLATE_PAYLOAD))
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderTemplateCard));
+
+    m_templateRuntime->handleDirectiveImmediately(directive);
+    m_wakeRenderTemplateCardFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests RenderTemplate Directive received before the corresponding AudioPlayer call. Expect
+ * that the renderPlayerInfoCard callback will be called only after media starts playing.
+ */
+TEST_F(TemplateRuntimeTest, testSlow_renderPlayerInfoDirectiveBefore) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, PLAYERINFO_PAYLOAD, attachmentManager, "");
+
+    ::testing::InSequence s;
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
+    EXPECT_CALL(*m_mockGui, renderTemplateCard(_)).Times(Exactly(0));
+
+    // do not expect renderPlayerInfo card call until AudioPlayer notify with the correct audioItemId
+    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(_, _)).Times(Exactly(0));
+
+    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+
+    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _))
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderPlayerInfoCard))
+        .WillOnce(InvokeWithoutArgs([] {}));
+
+    RenderPlayerInfoCardsObserverInterface::Context context;
+    context.mediaProperties = m_mediaPropertiesFetcher;
+    context.audioItemId = AUDIO_ITEM_ID;
+    context.offset = TIMEOUT;
+    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
+
+    m_wakeRenderPlayerInfoCardFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests RenderTemplate Directive received after the corresponding AudioPlayer call. Expect
+ * that the renderTemplateCard callback will be called.
+ */
+TEST_F(TemplateRuntimeTest, test_renderPlayerInfoDirectiveAfter) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, PLAYERINFO_PAYLOAD, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _))
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderPlayerInfoCard));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
+
+    RenderPlayerInfoCardsObserverInterface::Context context;
+    context.mediaProperties = m_mediaPropertiesFetcher;
+    context.audioItemId = AUDIO_ITEM_ID;
+    context.offset = TIMEOUT;
+    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
+    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
+
+    m_wakeRenderPlayerInfoCardFuture.wait_for(TIMEOUT);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests RenderTemplate Directive received without an audioItemId. Expect that the
+ * sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(TemplateRuntimeTest, test_renderPlayerInfoDirectiveWithoutAudioItemId) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, TEMPLATE_PAYLOAD, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_))
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
+
+    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests when a malformed RenderTemplate Directive is received.  Expect that the
+ * sendExceptionEncountered and setFailed will be called.
+ */
+TEST_F(TemplateRuntimeTest, test_malformedRenderPlayerInfoDirective) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, MALFORM_PLAYERINFO_PAYLOAD, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockExceptionSender, sendExceptionEncountered(_, _, _)).Times(Exactly(1));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setFailed(_))
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
+
+    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests AudioPlayer notified the handling of AUDIO_ITEM_ID_1, and then RenderTemplate Directive with
+ * AUDIO_ITEM_ID is received.  Expect that the renderTemplateCard callback will not be called until
+ * the AudioPlayer notified the handling of AUDIO_ITEM_ID later.
+ */
+TEST_F(TemplateRuntimeTest, test_renderPlayerInfoDirectiveDifferentAudioItemId) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, PLAYERINFO_PAYLOAD, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _)).Times(Exactly(0));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
+
+    RenderPlayerInfoCardsObserverInterface::Context context;
+    context.mediaProperties = m_mediaPropertiesFetcher;
+    context.audioItemId = AUDIO_ITEM_ID_1;
+    context.offset = TIMEOUT;
+    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
+    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+
+    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _))
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderPlayerInfoCard));
+
+    context.audioItemId = AUDIO_ITEM_ID;
+    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
+
+    m_wakeRenderPlayerInfoCardFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests Provider notified the handling of AUDIO_ITEM_ID_1, and another provider notified the handling of
+ * AUDIO_ITEM_ID, and then RenderTemplate Directive with AUDIO_ITEM_ID is received.  Expect that the
+ * renderTemplateCard callback will be called and the correct getAudioItemOffset is called.
+ */
+TEST_F(TemplateRuntimeTest, test_renderPlayerInfoDirectiveWithTwoProviders) {
+    auto anotherMediaPropertiesFetcher = std::make_shared<NiceMock<MockMediaPropertiesFetcher>>();
+
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, PLAYERINFO_PAYLOAD, attachmentManager, "");
+
+    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _))
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnRenderPlayerInfoCard));
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
+
+    EXPECT_CALL(*m_mediaPropertiesFetcher, getAudioItemOffset()).Times(Exactly(0));
+
+    RenderPlayerInfoCardsObserverInterface::Context context;
+    context.mediaProperties = m_mediaPropertiesFetcher;
+    context.audioItemId = AUDIO_ITEM_ID_1;
+    context.offset = TIMEOUT;
+    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
+
+    RenderPlayerInfoCardsObserverInterface::Context context1;
+    context1.mediaProperties = anotherMediaPropertiesFetcher;
+    context1.audioItemId = AUDIO_ITEM_ID;
+    context1.offset = TIMEOUT;
+    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context1);
+
+    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
+
+    m_wakeRenderPlayerInfoCardFuture.wait_for(TIMEOUT);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Tests AudioPlayer callbacks will trigger the correct renderPlayerInfoCard callbacks. Expect
+ * the payload, audioPlayerState and offset to match to the ones passed in by the
+ * RenderPlayerInfoCardsObserverInterface.
+ */
+TEST_F(TemplateRuntimeTest, test_renderPlayerInfoDirectiveAudioStateUpdate) {
+    // Create Directive.
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, MESSAGE_ID);
+    std::shared_ptr<AVSDirective> directive =
+        AVSDirective::create("", avsMessageHeader, PLAYERINFO_PAYLOAD, attachmentManager, "");
+
+    ::testing::InSequence s;
+    // Send a directive first to TemplateRuntime
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
+    m_templateRuntime->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
+    m_templateRuntime->CapabilityAgent::handleDirective(MESSAGE_ID);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+
+    RenderPlayerInfoCardsObserverInterface::Context context;
+    context.mediaProperties = m_mediaPropertiesFetcher;
+    context.audioItemId = AUDIO_ITEM_ID;
+
+    // Test onAudioPlayed() callback with 100ms offset
+    std::promise<void> wakePlayPromise;
+    std::future<void> wakePlayFuture = wakePlayPromise.get_future();
+    context.offset = std::chrono::milliseconds(100);
+    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke(
+            [&wakePlayPromise, context](
+                const std::string& jsonPayload, TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) {
+                EXPECT_EQ(audioPlayerInfo.audioPlayerState, avsCommon::avs::PlayerActivity::PLAYING);
+                EXPECT_EQ(audioPlayerInfo.mediaProperties, context.mediaProperties);
+                wakePlayPromise.set_value();
+            }));
+    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
+    wakePlayFuture.wait_for(TIMEOUT);
+
+    // Test onAudioPaused() callback with 200ms offset
+    std::promise<void> wakePausePromise;
+    std::future<void> wakePauseFuture = wakePausePromise.get_future();
+    context.offset = std::chrono::milliseconds(200);
+    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke(
+            [&wakePausePromise, context](
+                const std::string& jsonPayload, TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) {
+                EXPECT_EQ(audioPlayerInfo.audioPlayerState, avsCommon::avs::PlayerActivity::PAUSED);
+                EXPECT_EQ(audioPlayerInfo.mediaProperties, context.mediaProperties);
+                wakePausePromise.set_value();
+            }));
+    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PAUSED, context);
+    wakePauseFuture.wait_for(TIMEOUT);
+
+    // Test onAudioStopped() callback with 300ms offset
+    std::promise<void> wakeStopPromise;
+    std::future<void> wakeStopFuture = wakeStopPromise.get_future();
+    context.offset = std::chrono::milliseconds(300);
+    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke(
+            [&wakeStopPromise, context](
+                const std::string& jsonPayload, TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) {
+                EXPECT_EQ(audioPlayerInfo.audioPlayerState, avsCommon::avs::PlayerActivity::STOPPED);
+                EXPECT_EQ(audioPlayerInfo.mediaProperties, context.mediaProperties);
+                wakeStopPromise.set_value();
+            }));
+    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::STOPPED, context);
+    wakeStopFuture.wait_for(TIMEOUT);
+
+    // Test onAudioFinished() callback with 400ms offset
+    std::promise<void> wakeFinishPromise;
+    std::future<void> wakeFinishFuture = wakeFinishPromise.get_future();
+    context.offset = std::chrono::milliseconds(400);
+    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke(
+            [&wakeFinishPromise, context](
+                const std::string& jsonPayload, TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) {
+                EXPECT_EQ(audioPlayerInfo.audioPlayerState, avsCommon::avs::PlayerActivity::FINISHED);
+                EXPECT_EQ(audioPlayerInfo.mediaProperties, context.mediaProperties);
+                wakeFinishPromise.set_value();
+            }));
+    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::FINISHED, context);
+    wakeFinishFuture.wait_for(TIMEOUT);
+}
+
+/**
+ * Test that we should skip rendering a player info card if the audio has already changed.
+ */
+TEST_F(TemplateRuntimeTest, testTimer_RenderPlayerInfoAfterPlayerActivityChanged) {
+    // Create Directive1.
+    const std::string messageId1{"messageId1"};
+    auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
+    auto avsMessageHeader1 = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, messageId1);
+    std::shared_ptr<AVSDirective> directive1 =
+        AVSDirective::create("", avsMessageHeader1, PLAYERINFO_PAYLOAD, attachmentManager, "");
+
+    RenderPlayerInfoCardsObserverInterface::Context context;
+    context.mediaProperties = m_mediaPropertiesFetcher;
+    context.audioItemId = AUDIO_ITEM_ID;
+    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
+
+    ::testing::InSequence s;
+    // Send a directive first to TemplateRuntime
+    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _)).Times(1);
+    EXPECT_CALL(*m_mockDirectiveHandlerResult, setCompleted())
+        .Times(Exactly(1))
+        .WillOnce(InvokeWithoutArgs(this, &TemplateRuntimeTest::wakeOnSetCompleted));
+    m_templateRuntime->CapabilityAgent::preHandleDirective(directive1, std::move(m_mockDirectiveHandlerResult));
+    m_templateRuntime->CapabilityAgent::handleDirective(messageId1);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+
+    // Test onAudioPlayed() callback with 100ms offset
+    std::promise<void> wakePlayPromise;
+    std::future<void> wakePlayFuture = wakePlayPromise.get_future();
+    context.offset = std::chrono::milliseconds(100);
+    EXPECT_CALL(*m_mockGui, renderPlayerInfoCard(PLAYERINFO_PAYLOAD, _)).Times(0);
+
+    // Create Directive2.
+    const std::string messageId2{"messageId2"};
+    auto avsMessageHeader2 = std::make_shared<AVSMessageHeader>(PLAYER_INFO.nameSpace, PLAYER_INFO.name, messageId2);
+    auto mockDirectiveHandlerResult1 = make_unique<StrictMock<MockDirectiveHandlerResult>>();
+    std::shared_ptr<AVSDirective> directive2 =
+        AVSDirective::create("", avsMessageHeader1, PLAYERINFO_PAYLOAD, attachmentManager, "");
+    m_templateRuntime->CapabilityAgent::preHandleDirective(directive2, std::move(m_mockDirectiveHandlerResult));
+    m_templateRuntime->CapabilityAgent::handleDirective(messageId2);
+    m_wakeSetCompletedFuture.wait_for(TIMEOUT);
+    m_wakeRenderTemplateCardFuture.wait_for(TIMEOUT);
+    m_wakeReleaseChannelFuture.wait_for(TIMEOUT);
+    context.audioItemId = AUDIO_ITEM_ID_1;
+    m_templateRuntime->onRenderPlayerCardsInfoChanged(avsCommon::avs::PlayerActivity::PLAYING, context);
+    m_wakeReleaseChannelFuture.wait_for(TIMEOUT);
+}
+
+}  // namespace test
+}  // namespace templateRuntime
+}  // namespace alexaClientSDK
diff --git a/capabilities/TemplateRuntime/TemplateRuntimeInterfaces/CMakeLists.txt b/capabilities/TemplateRuntime/TemplateRuntimeInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..540f0201c3
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntimeInterfaces/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1)
+
+project(acsdkTemplateRuntimeInterfaces LANGUAGES CXX)
+add_library(acsdkTemplateRuntimeInterfaces INTERFACE)
+target_include_directories(acsdkTemplateRuntimeInterfaces INTERFACE "${acsdkTemplateRuntimeInterfaces_SOURCE_DIR}/include")
+target_link_libraries(acsdkTemplateRuntimeInterfaces INTERFACE AVSCommon)
+
+# install interface
+asdk_install_interface()
diff --git a/capabilities/TemplateRuntime/TemplateRuntimeInterfaces/include/acsdk/TemplateRuntimeInterfaces/TemplateRuntimeInterface.h b/capabilities/TemplateRuntime/TemplateRuntimeInterfaces/include/acsdk/TemplateRuntimeInterfaces/TemplateRuntimeInterface.h
new file mode 100644
index 0000000000..e529f578c6
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntimeInterfaces/include/acsdk/TemplateRuntimeInterfaces/TemplateRuntimeInterface.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIMEINTERFACES_INCLUDE_ACSDK_TEMPLATERUNTIMEINTERFACES_TEMPLATERUNTIMEINTERFACE_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIMEINTERFACES_INCLUDE_ACSDK_TEMPLATERUNTIMEINTERFACES_TEMPLATERUNTIMEINTERFACE_H_
+
+#include <memory>
+
+#include <AVSCommon/SDKInterfaces/RenderPlayerInfoCardsProviderInterface.h>
+
+#include "TemplateRuntimeObserverInterface.h"
+
+namespace alexaClientSDK {
+namespace templateRuntimeInterfaces {
+
+/**
+ * This class defines a contract that an implementation of TemplateRuntime capability must fulfill. Application
+ * is expected to interact with TemplateRuntime by registering its observers and subscribe to GUI components that
+ * may provide user activity for playerInfo card.
+ */
+class TemplateRuntimeInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~TemplateRuntimeInterface() = default;
+
+    /**
+     * This function adds an observer to @c TemplateRuntime so that it will get notified for renderTemplateCard or
+     * renderPlayerInfoCard.
+     *
+     * @param observer The @c TemplateRuntimeObserverInterface
+     */
+    virtual void addObserver(std::weak_ptr<TemplateRuntimeObserverInterface> observer) = 0;
+
+    /**
+     * This function removes an observer from @c TemplateRuntime so that it will no longer be notified of
+     * renderTemplateCard or renderPlayerInfoCard callbacks.
+     *
+     * @param observer The @c TemplateRuntimeObserverInterface
+     */
+    virtual void removeObserver(std::weak_ptr<TemplateRuntimeObserverInterface> observer) = 0;
+
+    /**
+     * This function adds a @RenderPlayerInfoCardsProviderInterface for a client to subscribe @c TemplateRuntime as an
+     * observer of changes for RenderPlayerInfoCards.
+     *
+     * @param cardsProvider The @c RenderPlayerInfoCardsProviderInterface
+     */
+    virtual void addRenderPlayerInfoCardsProvider(
+        std::shared_ptr<avsCommon::sdkInterfaces::RenderPlayerInfoCardsProviderInterface> cardsProvider) = 0;
+};
+
+}  // namespace templateRuntimeInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIMEINTERFACES_INCLUDE_ACSDK_TEMPLATERUNTIMEINTERFACES_TEMPLATERUNTIMEINTERFACE_H_
diff --git a/capabilities/TemplateRuntime/TemplateRuntimeInterfaces/include/acsdk/TemplateRuntimeInterfaces/TemplateRuntimeObserverInterface.h b/capabilities/TemplateRuntime/TemplateRuntimeInterfaces/include/acsdk/TemplateRuntimeInterfaces/TemplateRuntimeObserverInterface.h
new file mode 100644
index 0000000000..d0d8798f60
--- /dev/null
+++ b/capabilities/TemplateRuntime/TemplateRuntimeInterfaces/include/acsdk/TemplateRuntimeInterfaces/TemplateRuntimeObserverInterface.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIMEINTERFACES_INCLUDE_ACSDK_TEMPLATERUNTIMEINTERFACES_TEMPLATERUNTIMEOBSERVERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIMEINTERFACES_INCLUDE_ACSDK_TEMPLATERUNTIMEINTERFACES_TEMPLATERUNTIMEOBSERVERINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include <AVSCommon/AVS/PlayerActivity.h>
+#include <AVSCommon/SDKInterfaces/MediaPropertiesInterface.h>
+
+namespace alexaClientSDK {
+namespace templateRuntimeInterfaces {
+
+/**
+ * This @c TemplateRuntimeObserverInterface class is used to notify observers when a @c RenderTemplate or
+ * @c RenderPlayerInfo directive is received. These two directives contains metadata for rendering display
+ * cards for devices with GUI support.
+ */
+class TemplateRuntimeObserverInterface {
+public:
+    /**
+     * The @c AudioPlayerInfo contains information that is useful for rendering a PlayerInfo display card.
+     * @c AudioPlayerInfo is passed to the observers as a parameter in the @c renderPlayerInfoCard callback.
+     */
+    struct AudioPlayerInfo {
+        /**
+         * Default constructor.
+         */
+        AudioPlayerInfo() : audioPlayerState{avsCommon::avs::PlayerActivity::IDLE} {};
+
+        /**
+         * The state of the @c AudioPlayer. This information is useful for implementing the progress bar
+         * in the display card.  It is assumed that the client is responsible for progressing the progress bar
+         * when the @c AudioPlayer is in PLAYING state.
+         */
+        avsCommon::avs::PlayerActivity audioPlayerState;
+
+        /**
+         * The properties for the media that @c AudioPlayer is handling.  This information is
+         * useful for implementation of the progress bar.
+         */
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::MediaPropertiesInterface> mediaProperties;
+    };
+
+    /**
+     * Destructor
+     */
+    virtual ~TemplateRuntimeObserverInterface() = default;
+
+    /**
+     * Used to notify the observer when a RenderTemplate directive is received. Once called, the client should
+     * render the Template display card based on the metadata provided in the payload in structured JSON format.
+     *
+     * @note The payload may contain customer sensitive information and should be used with utmost care.
+     * Failure to do so may result in exposing or mishandling of customer data.
+     *
+     * @param jsonPayload The payload of the RenderTemplate directive in structured JSON format.
+     */
+    virtual void renderTemplateCard(const std::string& jsonPayload) = 0;
+
+    /**
+     * Used to notify the observer when a RenderPlayerInfo directive is received. Once called, the client should
+     * render the PlayerInfo display card based on the metadata provided in the payload in structured JSON
+     * format.
+     *
+     * @param jsonPayload The payload of the RenderPlayerInfo directive in structured JSON format.
+     * @param audioPlayerInfo Information on the @c AudioPlayer.
+     */
+    virtual void renderPlayerInfoCard(
+        const std::string& jsonPayload,
+        TemplateRuntimeObserverInterface::AudioPlayerInfo audioPlayerInfo) = 0;
+};
+
+}  // namespace templateRuntimeInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_CAPABILITYAGENTS_TEMPLATERUNTIME_TEMPLATERUNTIMEINTERFACES_INCLUDE_ACSDK_TEMPLATERUNTIMEINTERFACES_TEMPLATERUNTIMEOBSERVERINTERFACE_H_
diff --git a/capabilities/VisualCharacteristics/.clang-format b/capabilities/VisualCharacteristics/.clang-format
new file mode 100644
index 0000000000..3d1ec24482
--- /dev/null
+++ b/capabilities/VisualCharacteristics/.clang-format
@@ -0,0 +1,102 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
+
diff --git a/capabilities/VisualCharacteristics/CMakeLists.txt b/capabilities/VisualCharacteristics/CMakeLists.txt
new file mode 100644
index 0000000000..d94198d13d
--- /dev/null
+++ b/capabilities/VisualCharacteristics/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_subdirectory("VisualCharacteristics")
+add_subdirectory("VisualCharacteristicsInterfaces")
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/CMakeLists.txt b/capabilities/VisualCharacteristics/VisualCharacteristics/CMakeLists.txt
new file mode 100644
index 0000000000..ae3bf35dde
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkVisualCharacteristics LANGUAGES CXX)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/include/acsdk/VisualCharacteristics/VisualCharacteristicsFactory.h b/capabilities/VisualCharacteristics/VisualCharacteristics/include/acsdk/VisualCharacteristics/VisualCharacteristicsFactory.h
new file mode 100644
index 0000000000..5b20fcfbc7
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/include/acsdk/VisualCharacteristics/VisualCharacteristicsFactory.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_VISUALCHARACTERISTICS_VISUALCHARACTERISTICSFACTORY_H_
+#define ACSDK_VISUALCHARACTERISTICS_VISUALCHARACTERISTICSFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateObserverInterface.h>
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h>
+
+#include <AVSCommon/SDKInterfaces/Endpoints/DefaultEndpointAnnotation.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointCapabilitiesRegistrarInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/ExceptionEncounteredSenderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace visualCharacteristics {
+
+class VisualCharacteristicsFactory {
+public:
+    /**
+     * Struct containing the interfaces exposed by the @c VisualCharacteristics component
+     */
+    struct VisualCharacteristicsExports {
+        /// The instance of @c VisualCharacteristicsInterface provided by @c VisualCharacteristics
+        std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsInterface> visualCharacteristicsInterface;
+
+        /// Instance of @c RequiresShutdown used for cleaning up during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+
+        /// Interface providing CapabilitiesDelegate access to the version and configurations of the capabilities.
+        std::shared_ptr<avsCommon::sdkInterfaces::CapabilityConfigurationInterface> capabilityConfigurationInterface;
+
+        /// Instance of @c PresentationOrchestratorStateObserverInterface used to register VisualCharacteristics as an
+        /// observer of the Presentation Orchestrator
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateObserverInterface>
+            presentationOrchestratorStateObserverInterface;
+    };
+
+    /**
+     * Creates an instance of the @c VisualCharacteristics component
+     * @param contextManager Instance of the context manager to retrieve context
+     * @param exceptionEncounteredSender Instance of the exception encountered sender
+     * @return The exports exposed by the VisualCharacteristics components
+     */
+    static avsCommon::utils::Optional<VisualCharacteristicsExports> create(
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+            exceptionEncounteredSender);
+};
+
+}  // namespace visualCharacteristics
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_VISUALCHARACTERISTICS_VISUALCHARACTERISTICSFACTORY_H_
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/include/acsdk/VisualCharacteristics/VisualCharacteristicsSerializerFactory.h b/capabilities/VisualCharacteristics/VisualCharacteristics/include/acsdk/VisualCharacteristics/VisualCharacteristicsSerializerFactory.h
new file mode 100644
index 0000000000..b99a389a85
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/include/acsdk/VisualCharacteristics/VisualCharacteristicsSerializerFactory.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_VISUALCHARACTERISTICS_VISUALCHARACTERISTICSSERIALIZERFACTORY_H_
+#define ACSDK_VISUALCHARACTERISTICS_VISUALCHARACTERISTICSSERIALIZERFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsSerializerInterface.h>
+
+namespace alexaClientSDK {
+namespace visualCharacteristics {
+
+class VisualCharacteristicsSerializerFactory {
+public:
+    /**
+     * Creates an instance of the VisualCharacteristicsSerializer
+     * @return An instance of the @c VisualCharacteristicsSerializerInterface
+     */
+    static std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsSerializerInterface> create();
+};
+
+}  // namespace visualCharacteristics
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_VISUALCHARACTERISTICS_VISUALCHARACTERISTICSSERIALIZERFACTORY_H_
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/privateInclude/acsdk/VisualCharacteristics/private/VCConfigParser.h b/capabilities/VisualCharacteristics/VisualCharacteristics/privateInclude/acsdk/VisualCharacteristics/private/VCConfigParser.h
new file mode 100644
index 0000000000..e6c8f31823
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/privateInclude/acsdk/VisualCharacteristics/private/VCConfigParser.h
@@ -0,0 +1,133 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_VISUALCHARACTERISTICS_PRIVATE_VCCONFIGPARSER_H_
+#define ACSDK_VISUALCHARACTERISTICS_PRIVATE_VCCONFIGPARSER_H_
+
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h>
+
+#include <unordered_map>
+
+namespace alexaClientSDK {
+namespace visualCharacteristics {
+class VCConfigParser {
+public:
+    /**
+     * Parse interaction modes from visual characteristics configuration.
+     * @param config  @c ConfigurationNode for InteractionMode
+     * @param interactionMode [ out ] Parsed object for @c InteractionMode.
+     *
+     * @return True if parsing successful, false otherwise.
+     */
+    static bool parseInteractionMode(
+        const avsCommon::utils::configuration::ConfigurationNode& config,
+        visualCharacteristicsInterfaces::InteractionMode& interactionMode);
+
+    /**
+     * Parse window template from visual characteristics configuration.
+     * @param config  @c ConfigurationNode for template
+     * @param windowTemplate [ out ] Parsed object for @c WindowTemplate.
+     *
+     * @return True if parsing successful, false otherwise.
+     */
+    static bool parseWindowTemplate(
+        const avsCommon::utils::configuration::ConfigurationNode& config,
+        visualCharacteristicsInterfaces::WindowTemplate& windowTemplate);
+
+    /**
+     * Parse display characteristics from visual characteristics configuration.
+     * @param config  @c ConfigurationNode for display characteristics
+     * @param display [ out ] Parsed object for @c DisplayCharacteristics.
+     *
+     * @return True if parsing successful, false otherwise.
+     */
+    static bool parseDisplayCharacteristics(
+        const avsCommon::utils::configuration::ConfigurationNode& config,
+        visualCharacteristicsInterfaces::DisplayCharacteristics& display);
+
+    /**
+     * Serialize interaction modes into reportable json format.
+     * @param interactionModes  Collection of @c InteractionMode to be serialized
+     * @param configJson [ out ] Serialized json payload
+     *
+     * @return True if serialization successful, false otherwise.
+     */
+    static bool serializeInteractionMode(
+        const std::vector<visualCharacteristicsInterfaces::InteractionMode>& interactionModes,
+        std::string& configJson);
+
+    /**
+     * Serialize window template into reportable json format.
+     * @param windowTemplates  Collection of @c WindowTemplate to be serialized
+     * @param configJson [ out ] Serialized json payload
+     *
+     * @return True if serialization successful, false otherwise.
+     */
+    static bool serializeWindowTemplate(
+        const std::vector<visualCharacteristicsInterfaces::WindowTemplate>& windowTemplates,
+        std::string& configJson);
+
+    /**
+     * Serialize display characteristics into reportable json format.
+     * @param display Instance of @c DisplayCharacteristics to be serialized
+     * @param configJson [ out ] Serialized json payload
+     *
+     * @return True if serialization successful, false otherwise.
+     */
+    static bool serializeDisplayCharacteristics(
+        const visualCharacteristicsInterfaces::DisplayCharacteristics& display,
+        std::string& configJson);
+
+private:
+    static bool stringFromConfig(
+        const avsCommon::utils::configuration::ConfigurationNode& config,
+        const std::string& configKey,
+        std::string& out);
+
+    static bool intFromConfig(
+        const avsCommon::utils::configuration::ConfigurationNode& config,
+        const std::string& configKey,
+        int& out);
+
+    static bool doubleFromConfig(
+        const avsCommon::utils::configuration::ConfigurationNode& config,
+        const std::string& configKey,
+        double& out);
+
+    static bool supportedBoolFromConfig(
+        const avsCommon::utils::configuration::ConfigurationNode& config,
+        const std::string& configKey,
+        bool& out);
+
+    template <typename T>
+    static bool enumFromConfig(
+        const avsCommon::utils::configuration::ConfigurationNode& config,
+        const std::string& configKey,
+        const std::unordered_map<std::string, T>& enumMapping,
+        T& out);
+
+    template <typename T>
+    static bool stringToEnum(const std::unordered_map<std::string, T>& mapping, const std::string& in, T& out);
+
+    static bool dimensionFromConfig(
+        const avsCommon::utils::configuration::ConfigurationNode& config,
+        const std::string& configKey,
+        visualCharacteristicsInterfaces::Dimension& out);
+};
+}  // namespace visualCharacteristics
+}  // namespace alexaClientSDK
+#endif  // ACSDK_VISUALCHARACTERISTICS_PRIVATE_VCCONFIGPARSER_H_
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/privateInclude/acsdk/VisualCharacteristics/private/VisualCharacteristics.h b/capabilities/VisualCharacteristics/VisualCharacteristics/privateInclude/acsdk/VisualCharacteristics/private/VisualCharacteristics.h
new file mode 100644
index 0000000000..a5a499d309
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/privateInclude/acsdk/VisualCharacteristics/private/VisualCharacteristics.h
@@ -0,0 +1,201 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_VISUALCHARACTERISTICS_PRIVATE_VISUALCHARACTERISTICS_H_
+#define ACSDK_VISUALCHARACTERISTICS_PRIVATE_VISUALCHARACTERISTICS_H_
+
+#include <AVSCommon/AVS/CapabilityAgent.h>
+#include <AVSCommon/SDKInterfaces/CapabilityConfigurationInterface.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/DefaultEndpointAnnotation.h>
+#include <AVSCommon/SDKInterfaces/Endpoints/EndpointCapabilitiesRegistrarInterface.h>
+#include <AVSCommon/SDKInterfaces/StateProviderInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateObserverInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h>
+
+#include <chrono>
+#include <functional>
+#include <memory>
+#include <string>
+#include <unordered_set>
+
+namespace alexaClientSDK {
+namespace visualCharacteristics {
+
+/**
+ * This class implements a @c CapabilityConfigurationInterface that publish viewport characteristic data.
+ * This set of data includes all necessary information about its windows configuration. There are three APIs:
+ * Alexa.Display: The display interface expresses explicitly the raw properties of a display.
+ * Alexa.Display.Window: An expression of windows that may be created on a display.
+ * Alexa.InteractionMode: Expression of interaction modes that the device intends to support.
+ */
+class VisualCharacteristics
+        : public avsCommon::avs::CapabilityAgent
+        , public visualCharacteristicsInterfaces::VisualCharacteristicsInterface
+        , public presentationOrchestratorInterfaces::PresentationOrchestratorStateObserverInterface
+        , public avsCommon::sdkInterfaces::CapabilityConfigurationInterface
+        , public std::enable_shared_from_this<VisualCharacteristics>
+        , public avsCommon::utils::RequiresShutdown {
+public:
+    /**
+     * Create an instance of @c VisualCharacteristics using the given configuration.
+     * @param contextManager The @c ContextManagerInterface used to generate system context for events.
+     * @param exceptionSender The @c ExceptionEncounteredSenderInterface used to report exceptions to AVS.
+     * @param configuration The @c VisualCharacteristicsConfiguration to use
+     *
+     * @return Shared pointer to the instance of @VisualCharacteristics capability agent.
+     */
+    static std::shared_ptr<VisualCharacteristics> createWithConfiguration(
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+            exceptionSender,
+        const visualCharacteristicsInterfaces::VisualCharacteristicsConfiguration& configuration);
+
+    /**
+     * Create an instance of @c VisualCharacteristics using configuration from the configuration node
+     * @param contextManager The @c ContextManagerInterface used to generate system context for events.
+     * @param exceptionSender The @c ExceptionEncounteredSenderInterface used to report exceptions to AVS.
+     *
+     * @return Shared pointer to the instance of @VisualCharacteristics capability agent.
+     */
+    static std::shared_ptr<VisualCharacteristics> create(
+        const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+            exceptionSender);
+
+    /**
+     * Destructor.
+     */
+    virtual ~VisualCharacteristics() = default;
+
+    /// @name CapabilityAgent/DirectiveHandlerInterface Functions
+    /// @{
+    void handleDirectiveImmediately(std::shared_ptr<avsCommon::avs::AVSDirective> directive) override{};
+    void preHandleDirective(std::shared_ptr<DirectiveInfo> info) override{};
+    void handleDirective(std::shared_ptr<DirectiveInfo> info) override{};
+    void cancelDirective(std::shared_ptr<DirectiveInfo> info) override{};
+    avsCommon::avs::DirectiveHandlerConfiguration getConfiguration() const override;
+    /// @}
+
+    /// @name CapabilityConfigurationInterface Functions
+    /// @{
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> getCapabilityConfigurations() override;
+    /// @}
+
+    /// @name StateProviderInterface Functions
+    /// @{
+    void provideState(const avsCommon::avs::NamespaceAndName& stateProviderName, unsigned int stateRequestToken)
+        override;
+    /// @}
+
+    /// @name VisualCharacteristicsInterface Functions
+    /// @{
+    std::vector<visualCharacteristicsInterfaces::WindowTemplate> getWindowTemplates() override;
+    std::vector<visualCharacteristicsInterfaces::InteractionMode> getInteractionModes() override;
+    visualCharacteristicsInterfaces::DisplayCharacteristics getDisplayCharacteristics() override;
+    void setWindowInstances(
+        const std::vector<visualCharacteristicsInterfaces::WindowInstance>& instances,
+        const std::string& defaultWindowInstanceId) override;
+    bool addWindowInstance(const visualCharacteristicsInterfaces::WindowInstance& instance) override;
+    bool removeWindowInstance(const std::string& windowInstanceId) override;
+    void updateWindowInstance(const visualCharacteristicsInterfaces::WindowInstance& instance) override;
+    bool setDefaultWindowInstance(const std::string& windowInstanceId) override;
+    /// @}
+
+    /// @name PresentationOrchestratorStateObserverInterface Functions
+    /// @{
+    void onStateChanged(
+        const std::string& windowId,
+        const presentationOrchestratorInterfaces::PresentationMetadata& metadata) override;
+    /// @}
+
+    /**
+     * Sets the executor for this module. Note that this method will be used only for test.
+     *
+     * @param executor Pointer to the executor instance.
+     */
+    void setExecutor(const std::shared_ptr<avsCommon::utils::threading::Executor>& executor);
+
+private:
+    /**
+     * Constructor.
+     */
+    VisualCharacteristics(
+        std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+            exceptionSender,
+        const visualCharacteristicsInterfaces::VisualCharacteristicsConfiguration& configuration);
+
+    /**
+     * Creates the VisualCharacteristics interface configuration.
+     */
+    static bool getVisualCharacteristicsCapabilityConfiguration(
+        visualCharacteristicsInterfaces::VisualCharacteristicsConfiguration& configuration);
+
+    /**
+     * Validate Visual Characteristics configuration.
+     * @param configuration Instance of @c VisualCharacteristicsConfiguration.
+     *
+     * @return True if validation is successful
+     */
+    static bool validateConfiguration(
+        const visualCharacteristicsInterfaces::VisualCharacteristicsConfiguration& configuration);
+
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /**
+     * Generate window states context json.
+     *
+     * @param stateJson [ out ] Generated payload
+     */
+    void generateWindowStateContext(std::string& stateJson);
+
+    /**
+     * Initialize instance of CapabilityConfiguration with visual characteristic configuration.
+     */
+    void initializeCapabilityConfiguration();
+
+    /// Set of capability configurations that will get published using the Capabilities API
+    std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> m_capabilityConfigurations;
+
+    /// The @c ContextManager used to generate system context for events.
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> m_contextManager;
+
+    /// This is the worker thread for the @c VisualCharacteristics CA.
+    std::shared_ptr<avsCommon::utils::threading::Executor> m_executor;
+
+    /// An immutable instance of @c VisualCharacteristicsConfiguration
+    const visualCharacteristicsInterfaces::VisualCharacteristicsConfiguration m_visualCharacteristicsConfiguration;
+
+    /// Collection of @c WindowInstance indexed by windowId
+    std::unordered_map<std::string, visualCharacteristicsInterfaces::WindowInstance> m_windowInstances;
+
+    /// Default Window ID
+    std::string m_defaultWindowId;
+
+    /// A map to store tokens served by every window. <Key: windowId, Value: Token>
+    std::unordered_map<std::string, std::string> m_tokenPerWindow;
+};
+
+}  // namespace visualCharacteristics
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_VISUALCHARACTERISTICS_PRIVATE_VISUALCHARACTERISTICS_H_
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/privateInclude/acsdk/VisualCharacteristics/private/VisualCharacteristicsSerializer.h b/capabilities/VisualCharacteristics/VisualCharacteristics/privateInclude/acsdk/VisualCharacteristics/private/VisualCharacteristicsSerializer.h
new file mode 100644
index 0000000000..88b10967c0
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/privateInclude/acsdk/VisualCharacteristics/private/VisualCharacteristicsSerializer.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_VISUALCHARACTERISTICS_PRIVATE_VISUALCHARACTERISTICSSERIALIZER_H_
+#define ACSDK_VISUALCHARACTERISTICS_PRIVATE_VISUALCHARACTERISTICSSERIALIZER_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsSerializerInterface.h>
+
+namespace alexaClientSDK {
+namespace visualCharacteristics {
+
+/**
+ * Serializer for Visual Characteristics data types
+ */
+class VisualCharacteristicsSerializer
+        : public visualCharacteristicsInterfaces::VisualCharacteristicsSerializerInterface {
+public:
+    /**
+     * Create an instance of @c VisualCharacteristicsSerializer.
+     *
+     * @return Shared pointer to the instance of @c VisualCharacteristicsSerializer
+     */
+    static std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsSerializerInterface> create();
+
+private:
+    /**
+     * Constructor.
+     */
+    VisualCharacteristicsSerializer();
+
+    /// @name VisualCharacteristicsSerializerInterface Functions
+    /// @{
+    bool serializeInteractionModes(
+        const std::vector<visualCharacteristicsInterfaces::InteractionMode>& interactionModes,
+        std::string& serializedJson) override;
+    bool serializeWindowTemplate(
+        const std::vector<visualCharacteristicsInterfaces::WindowTemplate>& windowTemplates,
+        std::string& serializedJson) override;
+    bool serializeDisplayCharacteristics(
+        const visualCharacteristicsInterfaces::DisplayCharacteristics& display,
+        std::string& serializedJson) override;
+    /// @}
+};
+
+}  // namespace visualCharacteristics
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_VISUALCHARACTERISTICS_PRIVATE_VISUALCHARACTERISTICSSERIALIZER_H_
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/src/CMakeLists.txt b/capabilities/VisualCharacteristics/VisualCharacteristics/src/CMakeLists.txt
new file mode 100644
index 0000000000..63149d38a9
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/src/CMakeLists.txt
@@ -0,0 +1,21 @@
+add_definitions("-DACSDK_LOG_MODULE=visualCharacteristics")
+
+add_library(acsdkVisualCharacteristics SHARED
+        "VCConfigParser.cpp"
+        "VisualCharacteristics.cpp"
+        "VisualCharacteristicsFactory.cpp"
+        "VisualCharacteristicsSerializer.cpp"
+        "VisualCharacteristicsSerializerFactory.cpp")
+
+target_include_directories(acsdkVisualCharacteristics PUBLIC
+        "${acsdkVisualCharacteristics_SOURCE_DIR}/include"
+        "${acsdkPresentationOrchestratorInterfaces_SOURCE_DIR}/include"
+        "${AVSCommon_INCLUDE_DIRS}")
+
+target_include_directories(acsdkVisualCharacteristics
+        PRIVATE "${acsdkVisualCharacteristics_SOURCE_DIR}/privateInclude")
+
+target_link_libraries(acsdkVisualCharacteristics AVSCommon acsdkVisualCharacteristicsInterfaces acsdkPresentationOrchestratorInterfaces)
+
+# install target
+asdk_install()
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/src/VCConfigParser.cpp b/capabilities/VisualCharacteristics/VisualCharacteristics/src/VCConfigParser.cpp
new file mode 100644
index 0000000000..ade5400cd7
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/src/VCConfigParser.cpp
@@ -0,0 +1,514 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/VisualCharacteristics/private/VCConfigParser.h"
+
+#include <unordered_map>
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
+
+namespace alexaClientSDK {
+namespace visualCharacteristics {
+using namespace visualCharacteristicsInterfaces;
+
+/// String to identify log entries originating from this file.
+static const std::string TAG{"VisualCharacteristicsConfigParser"};
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// @{
+/// String constants used for parsing visual characteristics
+static const std::string ID = "id";
+static const std::string UIMODE = "uiMode";
+static const std::string INTERACTION_DISTANCE = "interactionDistance";
+static const std::string UNIT = "unit";
+static const std::string VALUE = "value";
+static const std::string TOUCH = "touch";
+static const std::string KEYBOARD = "keyboard";
+static const std::string VIDEO = "video";
+static const std::string DIALOG = "dialog";
+static const std::string TYPE = "type";
+static const std::string CONFIGURATION = "configuration";
+static const std::string TEMPLATES = "templates";
+static const std::string MINIMUM = "minimum";
+static const std::string MAXIMUM = "maximum";
+static const std::string SUPPORTED = "SUPPORTED";
+static const std::string UNSUPPORTED = "UNSUPPORTED";
+static const std::string WIDTH = "width";
+static const std::string HEIGHT = "height";
+static const std::string SIZES = "sizes";
+static const std::string INTERACTION_MODES = "interactionModes";
+static const std::string DISPLAY = "display";
+static const std::string SHAPE = "shape";
+static const std::string DIMENSIONS = "dimensions";
+static const std::string RESOLUTION = "resolution";
+static const std::string PHYSICAL_SIZE = "physicalSize";
+static const std::string DENSITY_INDEPENDENT_RESOLUTION = "densityIndependentResolution";
+static const std::string PIXEL_DENSITY = "pixelDensity";
+/// @}
+
+/// Mappings from string values to UIMode
+static const std::unordered_map<std::string, InteractionMode::UIMode> UIMODE_MAPPING = {
+    {"AUTO", InteractionMode::UIMode::AUTO},
+    {"HUB", InteractionMode::UIMode::HUB},
+    {"TV", InteractionMode::UIMode::TV},
+    {"MOBILE", InteractionMode::UIMode::MOBILE},
+    {"PC", InteractionMode::UIMode::PC},
+    {"HEADLESS", InteractionMode::UIMode::HEADLESS}};
+
+/// Mappings from string values to InteractionMode Unit
+static const std::unordered_map<std::string, InteractionMode::Unit> INTERACTIONMODE_UNIT_MAPPING = {
+    {"CENTIMETERS", InteractionMode::Unit::CENTIMETERS},
+    {"INCHES", InteractionMode::Unit::INCHES}};
+
+/// Mappings from string values to WindowType
+static const std::unordered_map<std::string, WindowTemplate::WindowType> WINDOWTYPE_MAPPING = {
+    {"OVERLAY", WindowTemplate::WindowType::OVERLAY},
+    {"STANDARD", WindowTemplate::WindowType::STANDARD}};
+
+/// Mappings from string values to WindowSizeType
+static const std::unordered_map<std::string, WindowSize::WindowSizeType> WINDOWSIZETYPE_MAPPING = {
+    {"DISCRETE", WindowSize::WindowSizeType::DISCRETE},
+    {"CONTINUOUS", WindowSize::WindowSizeType::CONTINUOUS}};
+
+/// Mappings from string values to Dimension Unit
+static const std::unordered_map<std::string, Dimension::Unit> DIMENSION_UNIT_MAPPING = {
+    {"INCHES", Dimension::Unit::INCHES},
+    {"CENTIMETERS", Dimension::Unit::CENTIMETERS},
+    {"DP", Dimension::Unit::DP},
+    {"DPI", Dimension::Unit::DPI},
+    {"PIXEL", Dimension::Unit::PIXEL}};
+
+/// Mappings from string values to DisplayCharacteristics Type
+static const std::unordered_map<std::string, DisplayCharacteristics::Type> DISPLAY_TYPE_MAPPING = {
+    {"PIXEL", DisplayCharacteristics::Type::PIXEL}};
+
+/// Mappings from string values to DisplayCharacteristics TouchType
+static const std::unordered_map<std::string, DisplayCharacteristics::TouchType> TOUCH_MAPPING = {
+    {"SINGLE", DisplayCharacteristics::TouchType::SINGLE},
+    {"UNSUPPORTED", DisplayCharacteristics::TouchType::UNSUPPORTED},
+};
+
+/// Mappings from string values to DisplayCharacteristics Shape
+static const std::unordered_map<std::string, DisplayCharacteristics::Shape> SHAPE_MAPPING = {
+    {"RECTANGLE", DisplayCharacteristics::Shape::RECTANGLE},
+    {"ROUND", DisplayCharacteristics::Shape::ROUND},
+};
+
+/**
+ * Converts a boolean value to a SUPPORTED / UNSUPPORTED string
+ * @param value the boolean value
+ * @return the string representing the value
+ */
+constexpr static const std::string& isSupported(bool value) {
+    return value ? SUPPORTED : UNSUPPORTED;
+}
+
+bool VCConfigParser::parseInteractionMode(
+    const avsCommon::utils::configuration::ConfigurationNode& config,
+    InteractionMode& interactionMode) {
+    if (!stringFromConfig(config, ID, interactionMode.id)) return false;
+    if (!enumFromConfig(config, UIMODE, UIMODE_MAPPING, interactionMode.uiMode)) return false;
+    if (!enumFromConfig(
+            config[INTERACTION_DISTANCE], UNIT, INTERACTIONMODE_UNIT_MAPPING, interactionMode.interactionDistanceUnit))
+        return false;
+    if (!intFromConfig(config[INTERACTION_DISTANCE], VALUE, interactionMode.interactionDistanceValue)) return false;
+    if (!supportedBoolFromConfig(config, TOUCH, interactionMode.touchSupported)) return false;
+    if (!supportedBoolFromConfig(config, KEYBOARD, interactionMode.keyboardSupported)) return false;
+    if (!supportedBoolFromConfig(config, VIDEO, interactionMode.videoSupported)) return false;
+    if (!supportedBoolFromConfig(config, DIALOG, interactionMode.dialogSupported)) return false;
+
+    return true;
+}
+
+bool VCConfigParser::parseWindowTemplate(
+    const avsCommon::utils::configuration::ConfigurationNode& config,
+    WindowTemplate& windowTemplate) {
+    if (!stringFromConfig(config, ID, windowTemplate.id)) return false;
+    if (!enumFromConfig(config, TYPE, WINDOWTYPE_MAPPING, windowTemplate.type)) return false;
+
+    auto configuration = config[CONFIGURATION];
+    if (!configuration) {
+        ACSDK_ERROR(LX(__func__).d("reason", "Missing configuration"));
+        return false;
+    }
+
+    auto sizes = configuration.getArray(SIZES);
+    for (size_t i = 0; i < sizes.getArraySize(); ++i) {
+        WindowSize windowSize;
+        auto sizeConfig = sizes[i];
+        if (!enumFromConfig(sizeConfig, TYPE, WINDOWSIZETYPE_MAPPING, windowSize.type)) {
+            ACSDK_ERROR(LX(__func__).d("reason", "invalid window size type"));
+            return false;
+        }
+        if (!stringFromConfig(sizeConfig, ID, windowSize.id)) return false;
+
+        if (windowSize.type == WindowSize::WindowSizeType::DISCRETE) {
+            if (!dimensionFromConfig(sizeConfig, VALUE, windowSize.minimum)) return false;
+            windowSize.maximum = windowSize.minimum;
+        } else {
+            if (!dimensionFromConfig(sizeConfig, MINIMUM, windowSize.minimum)) return false;
+            if (!dimensionFromConfig(sizeConfig, MAXIMUM, windowSize.maximum)) return false;
+        }
+
+        if (windowSize.minimum.unit != Dimension::Unit::PIXEL) {
+            ACSDK_ERROR(LX(__func__).d("reason", "invalid unit type, only PIXEL is valid"));
+            return false;
+        }
+        windowTemplate.sizes.push_back(windowSize);
+    }
+
+    std::set<std::string> values;
+    configuration.getStringValues(INTERACTION_MODES, &values);
+    for (auto value : values) {
+        windowTemplate.interactionModes.push_back(value);
+    }
+    return true;
+}
+
+bool VCConfigParser::parseDisplayCharacteristics(
+    const avsCommon::utils::configuration::ConfigurationNode& config,
+    DisplayCharacteristics& display) {
+    auto displayConfig = config[DISPLAY];
+    if (!displayConfig) {
+        ACSDK_ERROR(LX(__func__).d("reason", "Missing display configuration item"));
+        return false;
+    }
+
+    if (!enumFromConfig(displayConfig, TYPE, DISPLAY_TYPE_MAPPING, display.type)) return false;
+    std::set<std::string> touchValues;
+    if (!displayConfig.getStringValues(TOUCH, &touchValues)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "Missing touch configuration"));
+        return false;
+    }
+
+    for (auto& value : touchValues) {
+        DisplayCharacteristics::TouchType type;
+        if (!stringToEnum(TOUCH_MAPPING, value, type)) return false;
+        display.touch.push_back(type);
+    }
+
+    if (!enumFromConfig(displayConfig, SHAPE, SHAPE_MAPPING, display.shape)) return false;
+
+    auto dimensionConfig = displayConfig[DIMENSIONS];
+    if (!dimensionFromConfig(dimensionConfig, RESOLUTION, display.resolution)) return false;
+    if (!dimensionFromConfig(dimensionConfig, PHYSICAL_SIZE, display.physicalSize)) return false;
+    if (!dimensionFromConfig(dimensionConfig, DENSITY_INDEPENDENT_RESOLUTION, display.densityIndependentResolution))
+        return false;
+    if (!intFromConfig(dimensionConfig[PIXEL_DENSITY], VALUE, display.pixelDensity)) return false;
+
+    return true;
+}
+
+bool VCConfigParser::serializeInteractionMode(
+    const std::vector<InteractionMode>& interactionModes,
+    std::string& configJson) {
+    rapidjson::Document configurationJson(rapidjson::kObjectType);
+    auto& alloc = configurationJson.GetAllocator();
+    rapidjson::Value payload(rapidjson::kObjectType);
+    rapidjson::Value interactionModesJson(rapidjson::kArrayType);
+
+    for (auto& interactionMode : interactionModes) {
+        rapidjson::Value interactionModeJson(rapidjson::kObjectType);
+
+        interactionModeJson.AddMember(rapidjson::StringRef(ID), interactionMode.id, alloc);
+        interactionModeJson.AddMember(
+            rapidjson::StringRef(UIMODE), InteractionMode::uiModeToText(interactionMode.uiMode), alloc);
+
+        rapidjson::Value interactionDistanceJson(rapidjson::kObjectType);
+        interactionDistanceJson.AddMember(
+            rapidjson::StringRef(UNIT), InteractionMode::unitToText(interactionMode.interactionDistanceUnit), alloc);
+        interactionDistanceJson.AddMember(rapidjson::StringRef(VALUE), interactionMode.interactionDistanceValue, alloc);
+        interactionModeJson.AddMember(rapidjson::StringRef(INTERACTION_DISTANCE), interactionDistanceJson, alloc);
+
+        interactionModeJson.AddMember(rapidjson::StringRef(TOUCH), isSupported(interactionMode.touchSupported), alloc);
+        interactionModeJson.AddMember(
+            rapidjson::StringRef(KEYBOARD), isSupported(interactionMode.keyboardSupported), alloc);
+        interactionModeJson.AddMember(rapidjson::StringRef(VIDEO), isSupported(interactionMode.videoSupported), alloc);
+        interactionModeJson.AddMember(
+            rapidjson::StringRef(DIALOG), isSupported(interactionMode.dialogSupported), alloc);
+
+        interactionModesJson.PushBack(interactionModeJson, alloc);
+    }
+
+    payload.AddMember(rapidjson::StringRef(INTERACTION_MODES), interactionModesJson, alloc);
+
+    rapidjson::StringBuffer sb;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(sb);
+    bool returnValue = payload.Accept(writer);
+
+    configJson = sb.GetString();
+    ACSDK_DEBUG9(LX(__func__).d("Serialized Interaction Mode", configJson));
+
+    return returnValue;
+}
+
+bool VCConfigParser::serializeWindowTemplate(
+    const std::vector<WindowTemplate>& windowTemplates,
+    std::string& configJson) {
+    rapidjson::Document configurationsJson(rapidjson::kObjectType);
+    auto& alloc = configurationsJson.GetAllocator();
+    rapidjson::Value payload(rapidjson::kObjectType);
+    rapidjson::Value windowTemplatesJson(rapidjson::kArrayType);
+
+    for (auto& windowTemplate : windowTemplates) {
+        rapidjson::Value windowTemplateJson(rapidjson::kObjectType);
+
+        windowTemplateJson.AddMember(rapidjson::StringRef(ID), windowTemplate.id, alloc);
+        windowTemplateJson.AddMember(
+            rapidjson::StringRef(TYPE), WindowTemplate::windowTypeToText(windowTemplate.type), alloc);
+
+        rapidjson::Value configurationJson(rapidjson::kObjectType);
+        rapidjson::Value sizesJson(rapidjson::kArrayType);
+        for (auto& size : windowTemplate.sizes) {
+            rapidjson::Value sizeJson(rapidjson::kObjectType);
+            sizeJson.AddMember(rapidjson::StringRef(TYPE), WindowSize::windowSizeTypeToText(size.type), alloc);
+            sizeJson.AddMember(rapidjson::StringRef(ID), size.id, alloc);
+
+            if (size.type == WindowSize::WindowSizeType::DISCRETE) {
+                rapidjson::Value valueJson(rapidjson::kObjectType);
+                valueJson.AddMember(rapidjson::StringRef(UNIT), Dimension::unitToText(size.minimum.unit), alloc);
+                rapidjson::Value unitValueJson(rapidjson::kObjectType);
+                unitValueJson.AddMember(rapidjson::StringRef(WIDTH), static_cast<int>(size.minimum.width), alloc);
+                unitValueJson.AddMember(rapidjson::StringRef(HEIGHT), static_cast<int>(size.minimum.height), alloc);
+                valueJson.AddMember(rapidjson::StringRef(VALUE), unitValueJson, alloc);
+                sizeJson.AddMember(rapidjson::StringRef(VALUE), valueJson, alloc);
+            } else if (size.type == WindowSize::WindowSizeType::CONTINUOUS) {
+                // Serialize minimum values
+                rapidjson::Value minValueJson(rapidjson::kObjectType);
+                minValueJson.AddMember(rapidjson::StringRef(UNIT), Dimension::unitToText(size.minimum.unit), alloc);
+                rapidjson::Value minUnitValueJson(rapidjson::kObjectType);
+                minUnitValueJson.AddMember(rapidjson::StringRef(WIDTH), static_cast<int>(size.minimum.width), alloc);
+                minUnitValueJson.AddMember(rapidjson::StringRef(HEIGHT), static_cast<int>(size.minimum.height), alloc);
+                minValueJson.AddMember(rapidjson::StringRef(VALUE), minUnitValueJson, alloc);
+                sizeJson.AddMember(rapidjson::StringRef(MINIMUM), minValueJson, alloc);
+                // Serialize maximum values
+                rapidjson::Value maxValueJson(rapidjson::kObjectType);
+                maxValueJson.AddMember(rapidjson::StringRef(UNIT), Dimension::unitToText(size.maximum.unit), alloc);
+                rapidjson::Value maxUnitValueJson(rapidjson::kObjectType);
+                maxUnitValueJson.AddMember(rapidjson::StringRef(WIDTH), static_cast<int>(size.maximum.width), alloc);
+                maxUnitValueJson.AddMember(rapidjson::StringRef(HEIGHT), static_cast<int>(size.maximum.height), alloc);
+                maxValueJson.AddMember(rapidjson::StringRef(VALUE), maxUnitValueJson, alloc);
+                sizeJson.AddMember(rapidjson::StringRef(MAXIMUM), maxValueJson, alloc);
+            }
+
+            sizesJson.PushBack(sizeJson, alloc);
+        }
+
+        configurationJson.AddMember(rapidjson::StringRef(SIZES), sizesJson, alloc);
+
+        rapidjson::Value interactionModesJson(rapidjson::kArrayType);
+        for (auto& mode : windowTemplate.interactionModes) {
+            rapidjson::Value value;
+            value.SetString(mode.c_str(), mode.length(), alloc);
+            interactionModesJson.PushBack(value, alloc);
+        }
+        configurationJson.AddMember(rapidjson::StringRef(INTERACTION_MODES), interactionModesJson, alloc);
+
+        windowTemplateJson.AddMember(rapidjson::StringRef(CONFIGURATION), configurationJson, alloc);
+        windowTemplatesJson.PushBack(windowTemplateJson, alloc);
+    }
+
+    payload.AddMember(rapidjson::StringRef(TEMPLATES), windowTemplatesJson, alloc);
+
+    rapidjson::StringBuffer sb;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(sb);
+    bool returnValue = payload.Accept(writer);
+
+    configJson = sb.GetString();
+    ACSDK_DEBUG9(LX(__func__).d("Serialized Window Template", configJson));
+
+    return returnValue;
+}
+
+bool VCConfigParser::serializeDisplayCharacteristics(const DisplayCharacteristics& display, std::string& configJson) {
+    rapidjson::Document configurationsJson(rapidjson::kObjectType);
+    auto& alloc = configurationsJson.GetAllocator();
+    rapidjson::Value payload(rapidjson::kObjectType);
+    rapidjson::Value displayJson(rapidjson::kObjectType);
+
+    displayJson.AddMember(rapidjson::StringRef(TYPE), DisplayCharacteristics::typeToText(display.type), alloc);
+    rapidjson::Value touchJson(rapidjson::kArrayType);
+    for (auto& touch : display.touch) {
+        rapidjson::Value value;
+        std::string touchType = DisplayCharacteristics::touchTypeToText(touch);
+        value.SetString(touchType.c_str(), touchType.length(), alloc);
+        touchJson.PushBack(value, alloc);
+    }
+    displayJson.AddMember(rapidjson::StringRef(TOUCH), touchJson, alloc);
+    displayJson.AddMember(rapidjson::StringRef(SHAPE), DisplayCharacteristics::shapeToText(display.shape), alloc);
+
+    rapidjson::Value dimensionJson(rapidjson::kObjectType);
+
+    rapidjson::Value resolutionJson(rapidjson::kObjectType);
+    resolutionJson.AddMember(rapidjson::StringRef(UNIT), Dimension::unitToText(display.resolution.unit), alloc);
+    rapidjson::Value resolutionUnitValueJson(rapidjson::kObjectType);
+    resolutionUnitValueJson.AddMember(rapidjson::StringRef(WIDTH), static_cast<int>(display.resolution.width), alloc);
+    resolutionUnitValueJson.AddMember(rapidjson::StringRef(HEIGHT), static_cast<int>(display.resolution.height), alloc);
+    resolutionJson.AddMember(rapidjson::StringRef(VALUE), resolutionUnitValueJson, alloc);
+    dimensionJson.AddMember(rapidjson::StringRef(RESOLUTION), resolutionJson, alloc);
+
+    rapidjson::Value physicalSizeJson(rapidjson::kObjectType);
+    physicalSizeJson.AddMember(rapidjson::StringRef(UNIT), Dimension::unitToText(display.physicalSize.unit), alloc);
+    rapidjson::Value physicalSizeUnitValueJson(rapidjson::kObjectType);
+    physicalSizeUnitValueJson.AddMember(rapidjson::StringRef(WIDTH), display.physicalSize.width, alloc);
+    physicalSizeUnitValueJson.AddMember(rapidjson::StringRef(HEIGHT), display.physicalSize.height, alloc);
+    physicalSizeJson.AddMember(rapidjson::StringRef(VALUE), physicalSizeUnitValueJson, alloc);
+    dimensionJson.AddMember(rapidjson::StringRef(PHYSICAL_SIZE), physicalSizeJson, alloc);
+
+    rapidjson::Value pixelDensityJson(rapidjson::kObjectType);
+    pixelDensityJson.AddMember(rapidjson::StringRef(UNIT), Dimension::unitToText(Dimension::Unit::DPI), alloc);
+    pixelDensityJson.AddMember(rapidjson::StringRef(VALUE), display.pixelDensity, alloc);
+    dimensionJson.AddMember(rapidjson::StringRef(PIXEL_DENSITY), pixelDensityJson, alloc);
+
+    rapidjson::Value densityIndependentResolutionJson(rapidjson::kObjectType);
+    densityIndependentResolutionJson.AddMember(
+        rapidjson::StringRef(UNIT), Dimension::unitToText(display.densityIndependentResolution.unit), alloc);
+    rapidjson::Value densityIndependentResolutionUnitValueJson(rapidjson::kObjectType);
+    densityIndependentResolutionUnitValueJson.AddMember(
+        rapidjson::StringRef(WIDTH), static_cast<int>(display.densityIndependentResolution.width), alloc);
+    densityIndependentResolutionUnitValueJson.AddMember(
+        rapidjson::StringRef(HEIGHT), static_cast<int>(display.densityIndependentResolution.height), alloc);
+    densityIndependentResolutionJson.AddMember(
+        rapidjson::StringRef(VALUE), densityIndependentResolutionUnitValueJson, alloc);
+    dimensionJson.AddMember(
+        rapidjson::StringRef(DENSITY_INDEPENDENT_RESOLUTION), densityIndependentResolutionJson, alloc);
+
+    displayJson.AddMember(rapidjson::StringRef(DIMENSIONS), dimensionJson, alloc);
+    payload.AddMember(rapidjson::StringRef(DISPLAY), displayJson, alloc);
+
+    rapidjson::StringBuffer sb;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(sb);
+    bool returnValue = payload.Accept(writer);
+
+    configJson = sb.GetString();
+    ACSDK_DEBUG9(LX(__func__).d("Serialized Display Characteristics", configJson));
+
+    return returnValue;
+}
+
+template <typename T>
+bool VCConfigParser::enumFromConfig(
+    const avsCommon::utils::configuration::ConfigurationNode& config,
+    const std::string& configKey,
+    const std::unordered_map<std::string, T>& enumMapping,
+    T& out) {
+    std::string value;
+    if (!config.getString(configKey, &value, "")) {
+        ACSDK_ERROR(LX(__func__).d("reason", "Missing configuration item").d("key", configKey));
+        return false;
+    }
+
+    if (!stringToEnum(enumMapping, value, out)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "Invalid value").d("key", configKey).d("value", value));
+        return false;
+    }
+
+    return true;
+}
+
+template <typename T>
+bool VCConfigParser::stringToEnum(const std::unordered_map<std::string, T>& mapping, const std::string& in, T& out) {
+    auto it = mapping.find(in);
+    if (it != mapping.end()) {
+        out = it->second;
+        return true;
+    }
+
+    return false;
+}
+
+bool VCConfigParser::supportedBoolFromConfig(
+    const avsCommon::utils::configuration::ConfigurationNode& config,
+    const std::string& configKey,
+    bool& out) {
+    std::string value;
+    if (!config.getString(configKey, &value)) {
+        ACSDK_ERROR(LX(__func__).d("reason", "Missing configuration item").d("key", configKey));
+        return false;
+    }
+    if (SUPPORTED == value) {
+        out = true;
+        return true;
+    } else if (UNSUPPORTED == value) {
+        out = false;
+        return true;
+    }
+
+    ACSDK_ERROR(LX(__func__)
+                    .d("reason", "Invalid value, expected SUPPORTED or UNSUPPORTED")
+                    .d("key", configKey)
+                    .d("value", value));
+    return false;
+}
+
+bool VCConfigParser::stringFromConfig(
+    const avsCommon::utils::configuration::ConfigurationNode& config,
+    const std::string& configKey,
+    std::string& out) {
+    if (config.getString(configKey, &out)) {
+        return true;
+    }
+
+    ACSDK_ERROR(LX(__func__).d("reason", "Missing configuration item").d("key", configKey));
+    return false;
+}
+
+bool VCConfigParser::intFromConfig(
+    const avsCommon::utils::configuration::ConfigurationNode& config,
+    const std::string& configKey,
+    int& out) {
+    if (config.getInt(configKey, &out)) {
+        return true;
+    }
+
+    ACSDK_ERROR(LX(__func__).d("reason", "Missing configuration item").d("key", configKey));
+    return false;
+}
+
+bool VCConfigParser::doubleFromConfig(
+    const avsCommon::utils::configuration::ConfigurationNode& config,
+    const std::string& configKey,
+    double& out) {
+    if (config.getValue(configKey, &out, 0.0, &rapidjson::Value::IsNumber, &rapidjson::Value::GetDouble)) {
+        return true;
+    }
+
+    ACSDK_ERROR(LX(__func__).d("reason", "Missing configuration item").d("key", configKey));
+    return false;
+}
+
+bool VCConfigParser::dimensionFromConfig(
+    const avsCommon::utils::configuration::ConfigurationNode& config,
+    const std::string& configKey,
+    Dimension& out) {
+    auto configItem = config[configKey];
+    if (!configItem) {
+        ACSDK_ERROR(LX(__func__).d("reason", "Missing configuration item").d("key", configKey));
+        return false;
+    }
+    if (!enumFromConfig(configItem, UNIT, DIMENSION_UNIT_MAPPING, out.unit)) return false;
+    if (!doubleFromConfig(configItem[VALUE], WIDTH, out.width)) return false;
+    if (!doubleFromConfig(configItem[VALUE], HEIGHT, out.height)) return false;
+    return true;
+}
+}  // namespace visualCharacteristics
+}  // namespace alexaClientSDK
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/src/VisualCharacteristics.cpp b/capabilities/VisualCharacteristics/VisualCharacteristics/src/VisualCharacteristics.cpp
new file mode 100644
index 0000000000..7a8c52aef2
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/src/VisualCharacteristics.cpp
@@ -0,0 +1,465 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/VisualCharacteristics/private/VisualCharacteristics.h"
+
+#include <algorithm>
+#include <unordered_map>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <AVSCommon/AVS/CapabilityConfiguration.h>
+#include <AVSCommon/SDKInterfaces/ContextManagerInterface.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
+
+#include "acsdk/VisualCharacteristics/private/VCConfigParser.h"
+
+namespace alexaClientSDK {
+namespace visualCharacteristics {
+
+using namespace avsCommon::avs;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::configuration;
+using namespace visualCharacteristicsInterfaces;
+
+/// String to identify log entries originating from this file.
+static const std::string TAG{"VisualCharacteristics"};
+
+/// The key in our config file to find the root of VisualCharacteristics configuration
+static const std::string VISUALCHARACTERISTICS_CONFIGURATION_ROOT_KEY = "visualCharacteristics";
+
+/// The key in our config file to find the name of configuration node
+static const std::string INTERFACE_CONFIGURATION_NAME_KEY = "interface";
+
+/// The key in our config file to find the configurations of configuration node
+static const std::string INTERFACE_CONFIGURATION_KEY = "configurations";
+
+static const std::string INTERACTION_MODES = "interactionModes";
+
+static const std::string TEMPLATES = "templates";
+
+/// The default interface name if it's not present
+static const std::string DEFAULT_INTERFACE_NAME = "";
+
+/// Capability interface type
+static const std::string CAPABILITY_INTERFACE_TYPE = "AlexaInterface";
+/// Alexa.InteractionMode interface name
+static const std::string ALEXAINTERACTIONMODE_CAPABILITY_INTERFACE_NAME = "Alexa.InteractionMode";
+/// Alexa.InteractionMode interface version
+static const std::string ALEXAINTERACTIONMODE_CAPABILITY_INTERFACE_VERSION = "1.1";
+
+/// Alexa.Display.Window interface name
+static const std::string ALEXADISPLAYWINDOW_CAPABILITY_INTERFACE_NAME = "Alexa.Display.Window";
+/// Alexa.Display.Window interface version
+static const std::string ALEXADISPLAYWINDOW_CAPABILITY_INTERFACE_VERSION = "1.0";
+
+/// Alexa.Display interface name
+static const std::string ALEXADISPLAY_CAPABILITY_INTERFACE_NAME = "Alexa.Display";
+/// Alexa.Display interface version
+static const std::string ALEXADISPLAY_CAPABILITY_INTERFACE_VERSION = "1.0";
+
+/// Namespace three supported by Alexa presentation APL capability agent.
+static const std::string ALEXA_DISPLAY_WINDOW_NAMESPACE{"Alexa.Display.Window"};
+
+/// Placeholder namespace used for exposing @c VisualCharacteristics via @c EndpointCapabilitiesBuilderInterface.
+/// Note that this namespace is not used, but is required until VisualCharacteristics becomes part of SDK Core.
+/// VisualCharacteristics is added using the ExternalCapabilityBuilderInterface prior to that time.
+static const std::string PLACEHOLDER_CAPABILITY_NAMESPACE{"VisualCharacteristics"};
+
+/// Tag for finding the device window state context information sent from the runtime as part of event context.
+static const std::string WINDOW_STATE_NAME{"WindowState"};
+
+/// Key for default window id for window state for Alexa.Display.Window.
+static const std::string DEFAULT_WINDOW_ID{"defaultWindowId"};
+
+/// Key for window id id for window state for Alexa.Display.Window.
+static const std::string ID{"id"};
+
+/// Key for template id id for window state for Alexa.Display.Window.
+static const std::string TEMPLATE_ID{"templateId"};
+
+/// Key for token id for window state for Alexa.Display.Window.
+static const std::string TOKEN{"token"};
+
+/// Key for interaction mode for window state for Alexa.Display.Window.
+static const std::string INTERACTION_MODE{"interactionMode"};
+
+/// Key for size configuration id for window state for Alexa.Display.Window.
+static const std::string SIZE_CONFIGURATION_ID{"sizeConfigurationId"};
+
+/// Key for configuration for window state for Alexa.Display.Window.
+static const std::string CONFIGURATION{"configuration"};
+
+/// Key for instance for window state for Alexa.Display.Window.
+static const std::string INSTANCES{"instances"};
+
+/// The VisualCharacteristics context state signature.
+static const avsCommon::avs::NamespaceAndName DEVICE_WINDOW_STATE{ALEXA_DISPLAY_WINDOW_NAMESPACE, WINDOW_STATE_NAME};
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+std::shared_ptr<VisualCharacteristics> VisualCharacteristics::create(
+    const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+        exceptionSender) {
+    VisualCharacteristicsConfiguration configuration;
+    if (!getVisualCharacteristicsCapabilityConfiguration(configuration)) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "Unable to retrieve capability configuration"));
+        return nullptr;
+    }
+
+    return createWithConfiguration(contextManager, exceptionSender, configuration);
+}
+
+std::shared_ptr<VisualCharacteristics> VisualCharacteristics::createWithConfiguration(
+    const std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+        exceptionSender,
+    const VisualCharacteristicsConfiguration& configuration) {
+    if (!contextManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullContextManager"));
+        return nullptr;
+    }
+
+    if (!exceptionSender) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullExceptionSender"));
+        return nullptr;
+    }
+
+    if (!validateConfiguration(configuration)) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "Invalid configuration"));
+        return nullptr;
+    }
+
+    std::shared_ptr<VisualCharacteristics> visualCharacteristics(
+        new VisualCharacteristics(contextManager, exceptionSender, configuration));
+    contextManager->setStateProvider(DEVICE_WINDOW_STATE, visualCharacteristics);
+    return visualCharacteristics;
+}
+
+void VisualCharacteristics::doShutdown() {
+    ACSDK_DEBUG3(LX(__func__));
+    m_executor->shutdown();
+    m_contextManager.reset();
+}
+
+VisualCharacteristics::VisualCharacteristics(
+    std::shared_ptr<avsCommon::sdkInterfaces::ContextManagerInterface> contextManager,
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+        exceptionSender,
+    const VisualCharacteristicsConfiguration& configuration) :
+        CapabilityAgent{PLACEHOLDER_CAPABILITY_NAMESPACE, exceptionSender},
+        RequiresShutdown{"VisualCharacteristics"},
+        m_contextManager{std::move(contextManager)},
+        m_visualCharacteristicsConfiguration(configuration) {
+    m_executor = std::make_shared<avsCommon::utils::threading::Executor>();
+    initializeCapabilityConfiguration();
+}
+
+DirectiveHandlerConfiguration VisualCharacteristics::getConfiguration() const {
+    DirectiveHandlerConfiguration configuration;
+    return configuration;
+}
+
+bool VisualCharacteristics::getVisualCharacteristicsCapabilityConfiguration(
+    VisualCharacteristicsConfiguration& configuration) {
+    ACSDK_DEBUG9(LX(__func__));
+
+    /// Get the root ConfigurationNode.
+    auto configurationRoot = ConfigurationNode::getRoot();
+
+    /// Get the ConfigurationNode contains VisualCharacteristics config array.
+    auto configurationArray = configurationRoot.getArray(VISUALCHARACTERISTICS_CONFIGURATION_ROOT_KEY);
+
+    /// Loop through the configuration node array and construct config for these APIs.
+    for (size_t i = 0; i < configurationArray.getArraySize(); i++) {
+        std::string interfaceName;
+        configurationArray[i].getString(INTERFACE_CONFIGURATION_NAME_KEY, &interfaceName, DEFAULT_INTERFACE_NAME);
+
+        if (ALEXAINTERACTIONMODE_CAPABILITY_INTERFACE_NAME == interfaceName) {
+            auto interactionModes = configurationArray[i][INTERFACE_CONFIGURATION_KEY].getArray(INTERACTION_MODES);
+            for (size_t j = 0; j < interactionModes.getArraySize(); ++j) {
+                InteractionMode interactionMode;
+                if (!VCConfigParser::parseInteractionMode(interactionModes[j], interactionMode)) {
+                    ACSDK_ERROR(LX("getVisualCharacteristicsCapabilityConfigurationFailed")
+                                    .d("reason", "Unable to retrieve interaction mode")
+                                    .d("index", j));
+                    return false;
+                }
+                configuration.interactionModes.push_back(interactionMode);
+            }
+        } else if (ALEXADISPLAYWINDOW_CAPABILITY_INTERFACE_NAME == interfaceName) {
+            auto templates = configurationArray[i][INTERFACE_CONFIGURATION_KEY].getArray(TEMPLATES);
+            for (size_t j = 0; j < templates.getArraySize(); ++j) {
+                WindowTemplate windowTemplate;
+                if (!VCConfigParser::parseWindowTemplate(templates[j], windowTemplate)) {
+                    ACSDK_ERROR(LX("getVisualCharacteristicsCapabilityConfigurationFailed")
+                                    .d("reason", "Unable to retrieve window template")
+                                    .d("index", j));
+                    return false;
+                }
+                configuration.windowTemplates.push_back(windowTemplate);
+            }
+        } else if (ALEXADISPLAY_CAPABILITY_INTERFACE_NAME == interfaceName) {
+            if (!VCConfigParser::parseDisplayCharacteristics(
+                    configurationArray[i][INTERFACE_CONFIGURATION_KEY], configuration.displayCharacteristics)) {
+                ACSDK_ERROR(LX("getVisualCharacteristicsCapabilityConfigurationFailed")
+                                .d("reason", "Unable to retrieve display characteristics"));
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+std::unordered_set<std::shared_ptr<avsCommon::avs::CapabilityConfiguration>> VisualCharacteristics::
+    getCapabilityConfigurations() {
+    return m_capabilityConfigurations;
+}
+
+void VisualCharacteristics::provideState(
+    const avsCommon::avs::NamespaceAndName& stateProviderName,
+    unsigned int stateRequestToken) {
+    m_executor->submit([this, stateRequestToken] {
+        std::string windowStateCtx;
+        generateWindowStateContext(windowStateCtx);
+        m_contextManager->setState(DEVICE_WINDOW_STATE, windowStateCtx, StateRefreshPolicy::ALWAYS, stateRequestToken);
+    });
+}
+
+std::vector<WindowTemplate> VisualCharacteristics::getWindowTemplates() {
+    return m_visualCharacteristicsConfiguration.windowTemplates;
+}
+
+std::vector<InteractionMode> VisualCharacteristics::getInteractionModes() {
+    return m_visualCharacteristicsConfiguration.interactionModes;
+}
+
+DisplayCharacteristics VisualCharacteristics::getDisplayCharacteristics() {
+    return m_visualCharacteristicsConfiguration.displayCharacteristics;
+}
+
+void VisualCharacteristics::setWindowInstances(
+    const std::vector<WindowInstance>& instances,
+    const std::string& defaultWindowInstanceId) {
+    m_executor->submit([this, instances, defaultWindowInstanceId] {
+        m_windowInstances.clear();
+        m_tokenPerWindow.clear();
+        for (const auto& instance : instances) {
+            m_windowInstances[instance.id] = instance;
+            if (instance.id == defaultWindowInstanceId) {
+                m_defaultWindowId = instance.id;
+            }
+        }
+    });
+}
+
+bool VisualCharacteristics::addWindowInstance(const WindowInstance& instance) {
+    return m_executor
+        ->submit([this, instance] {
+            bool retVal = true;
+            auto windowId = instance.id;
+            if (m_windowInstances.find(windowId) == m_windowInstances.end()) {
+                m_windowInstances[windowId] = instance;
+            } else {
+                ACSDK_ERROR(LX("addWindowInstance").d("reason", "duplicateInstance"));
+                retVal = false;
+            }
+
+            return retVal;
+        })
+        .get();
+}
+
+bool VisualCharacteristics::removeWindowInstance(const std::string& windowInstanceId) {
+    return m_executor
+        ->submit([this, windowInstanceId] {
+            bool retVal = true;
+            auto it = m_windowInstances.find(windowInstanceId);
+            if (it != m_windowInstances.end()) {
+                m_windowInstances.erase(it);
+                auto windowIdTokenIt = m_tokenPerWindow.find(windowInstanceId);
+                if (windowIdTokenIt != m_tokenPerWindow.end()) {
+                    m_tokenPerWindow.erase(windowIdTokenIt);
+                }
+            } else {
+                ACSDK_ERROR(LX("removeWindowInstance").d("reason", "windowIdNotFound"));
+                retVal = false;
+            }
+
+            return retVal;
+        })
+        .get();
+}
+
+void VisualCharacteristics::updateWindowInstance(const WindowInstance& instance) {
+    m_executor->submit([this, instance] {
+        bool retVal = true;
+        auto windowId = instance.id;
+        auto it = m_windowInstances.find(windowId);
+        if (it != m_windowInstances.end()) {
+            it->second = instance;
+        } else {
+            ACSDK_ERROR(LX("updateWindowInstance").d("reason", "windowIdNotFound"));
+            retVal = false;
+        }
+
+        return retVal;
+    });
+}
+
+bool VisualCharacteristics::setDefaultWindowInstance(const std::string& windowInstanceId) {
+    ACSDK_DEBUG0(LX(__func__).d("windowInstanceId", windowInstanceId));
+    return m_executor
+        ->submit([this, windowInstanceId] {
+            bool retVal = true;
+
+            if (m_windowInstances.find(windowInstanceId) != m_windowInstances.end()) {
+                m_defaultWindowId = windowInstanceId;
+            } else {
+                ACSDK_ERROR(LX("setDefaultWindowInstance").d("reason", "windowIdNotFound"));
+                retVal = false;
+            }
+
+            return retVal;
+        })
+        .get();
+}
+
+void VisualCharacteristics::onStateChanged(
+    const std::string& windowId,
+    const presentationOrchestratorInterfaces::PresentationMetadata& metadata) {
+    m_executor->submit([this, windowId, metadata] {
+        auto it = m_windowInstances.find(windowId);
+        if (it != m_windowInstances.end()) {
+            m_tokenPerWindow[windowId] = metadata.metadata;
+        }
+    });
+}
+
+void VisualCharacteristics::setExecutor(const std::shared_ptr<avsCommon::utils::threading::Executor>& executor) {
+    ACSDK_WARN(LX(__func__).m("should be called in test only"));
+    m_executor = executor;
+}
+
+bool VisualCharacteristics::validateConfiguration(const VisualCharacteristicsConfiguration& configuration) {
+    ACSDK_DEBUG9(LX(__func__)
+                     .d("length", configuration.interactionModes.size())
+                     .d("isEmpty", configuration.interactionModes.empty()));
+    if (configuration.interactionModes.empty()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "Missing interaction modes"));
+        return false;
+    }
+
+    if (configuration.windowTemplates.empty()) {
+        ACSDK_ERROR(LX(__func__).d("reason", "Missing window templates"));
+        return false;
+    }
+
+    // Ensure that all interaction modes in each window template match to any of the defined interaction modes
+    for (auto& windowTemplate : configuration.windowTemplates) {
+        auto present = std::all_of(
+            windowTemplate.interactionModes.begin(),
+            windowTemplate.interactionModes.end(),
+            [&](std::string const& modeName) {
+                return std::any_of(
+                    configuration.interactionModes.begin(),
+                    configuration.interactionModes.end(),
+                    [&modeName](InteractionMode const& interactionMode) { return interactionMode.id == modeName; });
+            });
+
+        if (!present) {
+            ACSDK_ERROR(LX(__func__).d("reason", "Interaction mode not found"));
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void VisualCharacteristics::generateWindowStateContext(std::string& stateJson) {
+    rapidjson::Document configurationsJson(rapidjson::kObjectType);
+    auto& alloc = configurationsJson.GetAllocator();
+    rapidjson::Value payload(rapidjson::kObjectType);
+    payload.AddMember(rapidjson::StringRef(DEFAULT_WINDOW_ID), m_defaultWindowId, alloc);
+
+    rapidjson::Value instancesJson(rapidjson::kArrayType);
+    for (auto& windowIdAndInstance : m_windowInstances) {
+        auto& windowId = windowIdAndInstance.first;
+        auto& windowInstance = windowIdAndInstance.second;
+        rapidjson::Value instanceJson(rapidjson::kObjectType);
+
+        instanceJson.AddMember(rapidjson::StringRef(ID), windowInstance.id, alloc);
+        instanceJson.AddMember(rapidjson::StringRef(TEMPLATE_ID), windowInstance.templateId, alloc);
+        instanceJson.AddMember(rapidjson::StringRef(TOKEN), m_tokenPerWindow[windowId], alloc);
+
+        rapidjson::Value configurationJson(rapidjson::kObjectType);
+        configurationJson.AddMember(rapidjson::StringRef(INTERACTION_MODE), windowInstance.interactionMode, alloc);
+        configurationJson.AddMember(
+            rapidjson::StringRef(SIZE_CONFIGURATION_ID), windowInstance.sizeConfigurationId, alloc);
+        instanceJson.AddMember(rapidjson::StringRef(CONFIGURATION), configurationJson, alloc);
+
+        instancesJson.PushBack(instanceJson, alloc);
+    }
+
+    payload.AddMember(rapidjson::StringRef(INSTANCES), instancesJson, alloc);
+
+    rapidjson::StringBuffer sb;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(sb);
+    payload.Accept(writer);
+
+    stateJson = sb.GetString();
+}
+
+void VisualCharacteristics::initializeCapabilityConfiguration() {
+    std::string interactionModeJson, displayWindowJson, displayJson;
+
+    VCConfigParser::serializeInteractionMode(
+        m_visualCharacteristicsConfiguration.interactionModes, interactionModeJson);
+    VCConfigParser::serializeWindowTemplate(m_visualCharacteristicsConfiguration.windowTemplates, displayWindowJson);
+    VCConfigParser::serializeDisplayCharacteristics(
+        m_visualCharacteristicsConfiguration.displayCharacteristics, displayJson);
+
+    std::unordered_map<std::string, std::string> configMap;
+    configMap.insert({CAPABILITY_INTERFACE_TYPE_KEY, CAPABILITY_INTERFACE_TYPE});
+    configMap.insert({CAPABILITY_INTERFACE_NAME_KEY, ALEXAINTERACTIONMODE_CAPABILITY_INTERFACE_NAME});
+    configMap.insert({CAPABILITY_INTERFACE_VERSION_KEY, ALEXAINTERACTIONMODE_CAPABILITY_INTERFACE_VERSION});
+    configMap.insert({CAPABILITY_INTERFACE_CONFIGURATIONS_KEY, interactionModeJson});
+    m_capabilityConfigurations.insert(std::make_shared<CapabilityConfiguration>(configMap));
+
+    configMap.clear();
+    configMap.insert({CAPABILITY_INTERFACE_TYPE_KEY, CAPABILITY_INTERFACE_TYPE});
+    configMap.insert({CAPABILITY_INTERFACE_NAME_KEY, ALEXADISPLAYWINDOW_CAPABILITY_INTERFACE_NAME});
+    configMap.insert({CAPABILITY_INTERFACE_VERSION_KEY, ALEXADISPLAYWINDOW_CAPABILITY_INTERFACE_VERSION});
+    configMap.insert({CAPABILITY_INTERFACE_CONFIGURATIONS_KEY, displayWindowJson});
+    m_capabilityConfigurations.insert(std::make_shared<CapabilityConfiguration>(configMap));
+
+    configMap.clear();
+    configMap.insert({CAPABILITY_INTERFACE_TYPE_KEY, CAPABILITY_INTERFACE_TYPE});
+    configMap.insert({CAPABILITY_INTERFACE_NAME_KEY, ALEXADISPLAY_CAPABILITY_INTERFACE_NAME});
+    configMap.insert({CAPABILITY_INTERFACE_VERSION_KEY, ALEXADISPLAY_CAPABILITY_INTERFACE_VERSION});
+    configMap.insert({CAPABILITY_INTERFACE_CONFIGURATIONS_KEY, displayJson});
+    m_capabilityConfigurations.insert(std::make_shared<CapabilityConfiguration>(configMap));
+}
+}  // namespace visualCharacteristics
+}  // namespace alexaClientSDK
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/src/VisualCharacteristicsFactory.cpp b/capabilities/VisualCharacteristics/VisualCharacteristics/src/VisualCharacteristicsFactory.cpp
new file mode 100644
index 0000000000..f222d96a0e
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/src/VisualCharacteristicsFactory.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/VisualCharacteristics/VisualCharacteristicsFactory.h"
+
+#include "acsdk/VisualCharacteristics/private/VisualCharacteristics.h"
+
+namespace alexaClientSDK {
+namespace visualCharacteristics {
+avsCommon::utils::Optional<VisualCharacteristicsFactory::VisualCharacteristicsExports> VisualCharacteristicsFactory::
+    create(
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ContextManagerInterface>& contextManager,
+        const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::ExceptionEncounteredSenderInterface>&
+            exceptionEncounteredSender) {
+    auto visualCharacteristics = VisualCharacteristics::create(contextManager, exceptionEncounteredSender);
+    if (!visualCharacteristics) {
+        return avsCommon::utils::Optional<VisualCharacteristicsExports>();
+    }
+
+    VisualCharacteristicsExports exports = {
+        visualCharacteristics, visualCharacteristics, visualCharacteristics, visualCharacteristics};
+    return exports;
+}
+}  // namespace visualCharacteristics
+}  // namespace alexaClientSDK
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/src/VisualCharacteristicsSerializer.cpp b/capabilities/VisualCharacteristics/VisualCharacteristics/src/VisualCharacteristicsSerializer.cpp
new file mode 100644
index 0000000000..63706ed9cd
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/src/VisualCharacteristicsSerializer.cpp
@@ -0,0 +1,69 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/VisualCharacteristics/private/VisualCharacteristicsSerializer.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "acsdk/VisualCharacteristics/private/VCConfigParser.h"
+
+namespace alexaClientSDK {
+namespace visualCharacteristics {
+
+using namespace visualCharacteristicsInterfaces;
+
+/// String to identify log entries originating from this file.
+#define TAG "VisualCharacteristicsSerializer"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+std::shared_ptr<VisualCharacteristicsSerializerInterface> VisualCharacteristicsSerializer::create() {
+    std::shared_ptr<VisualCharacteristicsSerializer> visualCharacteristicsSerializer(
+        new VisualCharacteristicsSerializer());
+
+    return visualCharacteristicsSerializer;
+}
+
+VisualCharacteristicsSerializer::VisualCharacteristicsSerializer() {
+}
+
+bool VisualCharacteristicsSerializer::serializeInteractionModes(
+    const std::vector<InteractionMode>& interactionModes,
+    std::string& serializedJson) {
+    ACSDK_DEBUG5(LX(__func__));
+    return VCConfigParser::serializeInteractionMode(interactionModes, serializedJson);
+}
+
+bool VisualCharacteristicsSerializer::serializeWindowTemplate(
+    const std::vector<WindowTemplate>& windowTemplates,
+    std::string& serializedJson) {
+    ACSDK_DEBUG5(LX(__func__));
+    return VCConfigParser::serializeWindowTemplate(windowTemplates, serializedJson);
+}
+
+bool VisualCharacteristicsSerializer::serializeDisplayCharacteristics(
+    const DisplayCharacteristics& display,
+    std::string& serializedJson) {
+    ACSDK_DEBUG5(LX(__func__));
+    return VCConfigParser::serializeDisplayCharacteristics(display, serializedJson);
+}
+
+}  // namespace visualCharacteristics
+}  // namespace alexaClientSDK
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/src/VisualCharacteristicsSerializerFactory.cpp b/capabilities/VisualCharacteristics/VisualCharacteristics/src/VisualCharacteristicsSerializerFactory.cpp
new file mode 100644
index 0000000000..e74efab6d3
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/src/VisualCharacteristicsSerializerFactory.cpp
@@ -0,0 +1,27 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/VisualCharacteristics/VisualCharacteristicsSerializerFactory.h"
+
+#include "acsdk/VisualCharacteristics/private/VisualCharacteristicsSerializer.h"
+
+namespace alexaClientSDK {
+namespace visualCharacteristics {
+std::shared_ptr<visualCharacteristicsInterfaces::VisualCharacteristicsSerializerInterface>
+VisualCharacteristicsSerializerFactory::create() {
+    return VisualCharacteristicsSerializer::create();
+}
+}  // namespace visualCharacteristics
+}  // namespace alexaClientSDK
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/test/CMakeLists.txt b/capabilities/VisualCharacteristics/VisualCharacteristics/test/CMakeLists.txt
new file mode 100644
index 0000000000..92f517f56e
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/test/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+        "${acsdkVisualCharacteristics_INCLUDE_DIR}"
+        "${acsdkVisualCharacteristics_SOURCE_DIR}/include"
+        "${acsdkVisualCharacteristics_SOURCE_DIR}/privateInclude"
+        "${ASDK_INCLUDE_DIRS}")
+
+discover_unit_tests("${INCLUDE_PATH}" "acsdkVisualCharacteristics;SDKInterfacesTests;acsdkPresentationOrchestratorInterfaces;PresentationOrchestratorTestLib")
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/test/VCConfigParserTest.cpp b/capabilities/VisualCharacteristics/VisualCharacteristics/test/VCConfigParserTest.cpp
new file mode 100644
index 0000000000..f836a1caf2
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/test/VCConfigParserTest.cpp
@@ -0,0 +1,419 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <vector>
+
+#include <gtest/gtest.h>
+
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h>
+
+#include "acsdk/VisualCharacteristics/private/VCConfigParser.h"
+
+namespace alexaClientSDK {
+namespace visualCharacteristics {
+
+using namespace ::testing;
+using namespace visualCharacteristicsInterfaces;
+using namespace avsCommon::utils::configuration;
+
+/// Alias for JSON stream type used in @c ConfigurationNode initialization
+using JSONStream = std::vector<std::shared_ptr<std::istream>>;
+
+static const std::string INTERACTION_MODES = "interactionModes";
+static const std::string TEMPLATES = "templates";
+
+static const std::string CONFIG_INTERACTIONMODE = R"({
+          "interactionModes": [
+            {
+              "id": "tv",
+              "uiMode": "TV",
+              "interactionDistance": {
+                "unit": "INCHES",
+                "value": 130
+              },
+              "touch": "UNSUPPORTED",
+              "keyboard": "SUPPORTED",
+              "video": "SUPPORTED",
+              "dialog": "SUPPORTED"
+            },
+            {
+              "id": "tv_overlay",
+              "uiMode": "TV",
+              "interactionDistance": {
+                "unit": "INCHES",
+                "value": 130
+              },
+              "touch": "UNSUPPORTED",
+              "keyboard": "SUPPORTED",
+              "video": "UNSUPPORTED",
+              "dialog": "SUPPORTED"
+            }
+          ]
+})";
+
+/**
+ * Expected objects on parsing CONFIG_INTERACTIONMODE specified above
+ */
+static const InteractionMode INTERACTION_MODE_STANDARD =
+    {InteractionMode::UIMode::TV, "tv", InteractionMode::Unit::INCHES, 130, false, true, true, true};
+static const InteractionMode INTERACTION_MODE_OVERLAY =
+    {InteractionMode::UIMode::TV, "tv_overlay", InteractionMode::Unit::INCHES, 130, false, true, false, true};
+static const std::vector<InteractionMode> EXPECTED_INTERACTION_MODES{INTERACTION_MODE_STANDARD,
+                                                                     INTERACTION_MODE_OVERLAY};
+
+static const std::string CONFIG_WINDOW = R"({
+          "templates": [
+            {
+              "id": "tvFullscreen",
+              "type": "STANDARD",
+              "configuration": {
+                "sizes": [
+                  {
+                    "type": "DISCRETE",
+                    "id": "fullscreen",
+                    "value": {
+                      "unit": "PIXEL",
+                      "value": {
+                        "width": 1920,
+                        "height": 1080
+                      }
+                    }
+                  }
+                ],
+                "interactionModes": [
+                  "tv"
+                ]
+              }
+            },
+            {
+              "id": "tvOverlayLandscape",
+              "type": "OVERLAY",
+              "configuration": {
+                "sizes": [
+                  {
+                    "type": "DISCRETE",
+                    "id": "landscapePanel",
+                    "value": {
+                      "unit": "PIXEL",
+                      "value": {
+                        "width": 1920,
+                        "height": 400
+                      }
+                    }
+                  }
+                ],
+                "interactionModes": [
+                  "tv_overlay"
+                ]
+              }
+            }
+          ]
+})";
+
+/**
+ * Expected objects on parsing CONFIG_WINDOW specified above
+ */
+static const Dimension DIMENSION_FULL_SCREEN = {Dimension::Unit::PIXEL, 1920, 1080};
+static const WindowSize SIZE_FULL_SCREEN = {"fullscreen",
+                                            WindowSize::WindowSizeType::DISCRETE,
+                                            DIMENSION_FULL_SCREEN,
+                                            DIMENSION_FULL_SCREEN};
+static const std::vector<WindowSize> SIZES_FULL_SCREEN{SIZE_FULL_SCREEN};
+static const std::vector<std::string> INTERACTION_MODES_FULL_SCREEN{"tv"};
+static const WindowTemplate TEMPLATE_FULL_SCREEN = {"tvFullscreen",
+                                                    WindowTemplate::WindowType::STANDARD,
+                                                    SIZES_FULL_SCREEN,
+                                                    INTERACTION_MODES_FULL_SCREEN};
+
+static const Dimension DIMENSION_OVERLAY = {Dimension::Unit::PIXEL, 1920, 400};
+static const WindowSize SIZE_LANDSCAPE_PANEL = {"landscapePanel",
+                                                WindowSize::WindowSizeType::DISCRETE,
+                                                DIMENSION_OVERLAY,
+                                                DIMENSION_OVERLAY};
+static const std::vector<WindowSize> SIZES_OVERLAY{SIZE_LANDSCAPE_PANEL};
+static const std::vector<std::string> INTERACTION_MODES_OVERLAY{"tv_overlay"};
+static const WindowTemplate TEMPLATE_OVERLAY = {"tvOverlayLandscape",
+                                                WindowTemplate::WindowType::OVERLAY,
+                                                SIZES_OVERLAY,
+                                                INTERACTION_MODES_OVERLAY};
+static const std::vector<WindowTemplate> EXPECTED_TEMPLATES{TEMPLATE_FULL_SCREEN, TEMPLATE_OVERLAY};
+
+static const std::string CONFIG_DISPLAY = R"({
+          "display": {
+            "type": "PIXEL",
+            "touch": [
+              "UNSUPPORTED",
+              "SINGLE"
+            ],
+            "shape": "RECTANGLE",
+            "dimensions": {
+              "resolution": {
+                "unit": "PIXEL",
+                "value": {
+                  "width": 1920,
+                  "height": 1080
+                }
+              },
+              "physicalSize": {
+                "unit": "INCHES",
+                "value": {
+                  "width": 56.7,
+                  "height": 31.9
+                }
+              },
+              "pixelDensity": {
+                "unit": "DPI",
+                "value": 320
+              },
+              "densityIndependentResolution": {
+                "unit": "DP",
+                "value": {
+                  "width": 960,
+                  "height": 540
+                }
+              }
+            }
+          }
+})";
+
+/**
+ * Expected objects on parsing CONFIG_DISPLAY specified above
+ */
+static const Dimension RESOLUTION = {Dimension::Unit::PIXEL, 1920, 1080};
+static const Dimension PHYSICAL_SIZE = {Dimension::Unit::INCHES, 56.7, 31.9};
+static const Dimension DENSITY_INDEPENDENT_RESOLUTION = {Dimension::Unit::DP, 960, 540};
+static const std::vector<DisplayCharacteristics::TouchType> TOUCH_TYPES{DisplayCharacteristics::TouchType::SINGLE,
+                                                                        DisplayCharacteristics::TouchType::UNSUPPORTED};
+static const DisplayCharacteristics EXPECTED_DISPLAY_CHARACTERISTICS = {DisplayCharacteristics::Type::PIXEL,
+                                                                        TOUCH_TYPES,
+                                                                        DisplayCharacteristics::Shape::RECTANGLE,
+                                                                        320,
+                                                                        RESOLUTION,
+                                                                        DENSITY_INDEPENDENT_RESOLUTION,
+                                                                        PHYSICAL_SIZE};
+
+/// Test harness for @c VisualCharacteristics class.
+class VCConfigParserTest : public ::testing::Test {
+public:
+    static bool areInteractionModesEqual(
+        const InteractionMode& interactionMode1,
+        const InteractionMode& interactionMode2);
+    static bool areDimensionsEqual(const Dimension& dimension1, const Dimension& dimension2);
+    static bool areWindowSizesEqual(const WindowSize& windowSize1, const WindowSize& windowSize2);
+    static bool areWindowTemplatesEqual(const WindowTemplate& windowTemplate1, const WindowTemplate& windowTemplate2);
+    static bool areDisplayCharacteristicsEqual(
+        const DisplayCharacteristics& displayCharacteristics1,
+        const DisplayCharacteristics& displayCharacteristics2);
+};
+
+bool VCConfigParserTest::areInteractionModesEqual(
+    const InteractionMode& interactionMode1,
+    const InteractionMode& interactionMode2) {
+    bool result = interactionMode1.uiMode == interactionMode2.uiMode && interactionMode1.id == interactionMode2.id &&
+                  interactionMode1.interactionDistanceUnit == interactionMode2.interactionDistanceUnit &&
+                  interactionMode1.interactionDistanceValue == interactionMode2.interactionDistanceValue &&
+                  interactionMode1.dialogSupported == interactionMode2.dialogSupported &&
+                  interactionMode1.keyboardSupported == interactionMode2.keyboardSupported &&
+                  interactionMode1.touchSupported == interactionMode2.touchSupported &&
+                  interactionMode1.videoSupported == interactionMode2.videoSupported;
+    return result;
+}
+
+bool VCConfigParserTest::areDimensionsEqual(const Dimension& dimension1, const Dimension& dimension2) {
+    bool result = dimension1.unit == dimension2.unit && dimension1.height == dimension2.height &&
+                  dimension1.width == dimension2.width;
+    return result;
+}
+
+bool VCConfigParserTest::areWindowSizesEqual(const WindowSize& windowSize1, const WindowSize& windowSize2) {
+    bool result = windowSize1.id == windowSize2.id && windowSize1.type == windowSize2.type &&
+                  areDimensionsEqual(windowSize1.maximum, windowSize2.maximum) &&
+                  areDimensionsEqual(windowSize1.minimum, windowSize2.minimum);
+    return result;
+}
+
+bool VCConfigParserTest::areWindowTemplatesEqual(
+    const WindowTemplate& windowTemplate1,
+    const WindowTemplate& windowTemplate2) {
+    bool result = windowTemplate1.id == windowTemplate2.id && windowTemplate1.type == windowTemplate2.type &&
+                  windowTemplate1.interactionModes == windowTemplate2.interactionModes;
+    if (!result) {
+        return result;
+    }
+
+    if (windowTemplate1.sizes.size() != windowTemplate2.sizes.size()) {
+        return false;
+    }
+
+    size_t numberOfWindowSizes = windowTemplate1.sizes.size();
+    for (size_t index = 0; index < numberOfWindowSizes; index++) {
+        if (!areWindowSizesEqual(windowTemplate1.sizes[index], windowTemplate2.sizes[index])) {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool VCConfigParserTest::areDisplayCharacteristicsEqual(
+    const DisplayCharacteristics& displayCharacteristics1,
+    const DisplayCharacteristics& displayCharacteristics2) {
+    bool result = displayCharacteristics1.type == displayCharacteristics2.type &&
+                  displayCharacteristics1.shape == displayCharacteristics2.shape &&
+                  displayCharacteristics1.touch == displayCharacteristics2.touch &&
+                  displayCharacteristics1.pixelDensity == displayCharacteristics2.pixelDensity &&
+                  VCConfigParserTest::areDimensionsEqual(
+                      displayCharacteristics1.resolution, displayCharacteristics2.resolution) &&
+                  VCConfigParserTest::areDimensionsEqual(
+                      displayCharacteristics1.densityIndependentResolution,
+                      displayCharacteristics2.densityIndependentResolution) &&
+                  VCConfigParserTest::areDimensionsEqual(
+                      displayCharacteristics1.physicalSize, displayCharacteristics2.physicalSize);
+    return result;
+}
+
+static ConfigurationNode getConfigurationNode(const std::string& jsonConfig) {
+    ConfigurationNode::uninitialize();
+    auto stream = std::shared_ptr<std::stringstream>(new std::stringstream(jsonConfig));
+    JSONStream jsonStream({stream});
+    ConfigurationNode::initialize(jsonStream);
+    return ConfigurationNode::getRoot();
+}
+
+/**
+ * Tests parsing logic for Interaction modes.
+ */
+TEST_F(VCConfigParserTest, testParseInteractionModes) {
+    auto cfg = getConfigurationNode(CONFIG_INTERACTIONMODE);
+    auto interactionModes = cfg.getArray(INTERACTION_MODES);
+    for (size_t j = 0; j < interactionModes.getArraySize(); ++j) {
+        InteractionMode interactionMode;
+        ASSERT_TRUE(VCConfigParser::parseInteractionMode(interactionModes[j], interactionMode));
+        ASSERT_TRUE(VCConfigParserTest::areInteractionModesEqual(EXPECTED_INTERACTION_MODES[j], interactionMode));
+    }
+}
+
+/**
+ * Tests parsing logic for Window Templates.
+ */
+TEST_F(VCConfigParserTest, testParseWindowTemplates) {
+    auto cfg = getConfigurationNode(CONFIG_WINDOW);
+    auto templates = cfg.getArray(TEMPLATES);
+    for (size_t j = 0; j < templates.getArraySize(); ++j) {
+        WindowTemplate windowTemplate;
+        ASSERT_TRUE(VCConfigParser::parseWindowTemplate(templates[j], windowTemplate));
+        ASSERT_TRUE(VCConfigParserTest::areWindowTemplatesEqual(EXPECTED_TEMPLATES[j], windowTemplate));
+    }
+}
+
+/**
+ * Tests parsing logic for display characteristics.
+ */
+TEST_F(VCConfigParserTest, testParseDisplayCharacteristics) {
+    auto cfg = getConfigurationNode(CONFIG_DISPLAY);
+    DisplayCharacteristics displayCharacteristics;
+    ASSERT_TRUE(VCConfigParser::parseDisplayCharacteristics(cfg, displayCharacteristics));
+    ASSERT_TRUE(
+        VCConfigParserTest::areDisplayCharacteristicsEqual(EXPECTED_DISPLAY_CHARACTERISTICS, displayCharacteristics));
+}
+
+/**
+ * Tests serialize logic for Interaction modes.
+ */
+TEST_F(VCConfigParserTest, testSerializeInteractionModes) {
+    std::string payloadJson;
+    InteractionMode tvInteractionMode;
+    tvInteractionMode.uiMode = InteractionMode::UIMode::TV;
+    tvInteractionMode.id = "tv";
+    tvInteractionMode.interactionDistanceUnit = InteractionMode::Unit::INCHES;
+    tvInteractionMode.interactionDistanceValue = 130;
+    tvInteractionMode.touchSupported = false;
+    tvInteractionMode.keyboardSupported = true;
+    tvInteractionMode.videoSupported = true;
+    tvInteractionMode.dialogSupported = true;
+
+    InteractionMode overlayInteractionMode;
+    overlayInteractionMode.uiMode = InteractionMode::UIMode::TV;
+    overlayInteractionMode.id = "tv_overlay";
+    overlayInteractionMode.interactionDistanceUnit = InteractionMode::Unit::INCHES;
+    overlayInteractionMode.interactionDistanceValue = 130;
+    overlayInteractionMode.touchSupported = false;
+    overlayInteractionMode.keyboardSupported = true;
+    overlayInteractionMode.videoSupported = false;
+    overlayInteractionMode.dialogSupported = true;
+
+    std::vector<InteractionMode> interactionModes{tvInteractionMode, overlayInteractionMode};
+    ASSERT_TRUE(VCConfigParser::serializeInteractionMode(interactionModes, payloadJson));
+
+    // verify that same interaction modes are recreated from the serialized json
+    auto cfg = getConfigurationNode(payloadJson);
+    auto interactionModesFromJson = cfg.getArray(INTERACTION_MODES);
+    for (size_t j = 0; j < interactionModesFromJson.getArraySize(); ++j) {
+        InteractionMode interactionModeRecreated;
+        ASSERT_TRUE(VCConfigParser::parseInteractionMode(interactionModesFromJson[j], interactionModeRecreated));
+        ASSERT_TRUE(VCConfigParserTest::areInteractionModesEqual(interactionModes[j], interactionModeRecreated));
+    }
+}
+
+/**
+ * Tests serialize logic for Window Templates.
+ */
+TEST_F(VCConfigParserTest, testSerializeWindowTemplates) {
+    std::string payloadJson;
+    Dimension fullscreenDimension{Dimension::Unit::PIXEL, 1920, 1080};
+    Dimension partialDimension{Dimension::Unit::PIXEL, 1920, 400};
+    WindowSize fullscreenSize{
+        "fullscreen", WindowSize::WindowSizeType::DISCRETE, fullscreenDimension, fullscreenDimension};
+    WindowSize partialSize{"landscapePanel", WindowSize::WindowSizeType::DISCRETE, partialDimension, partialDimension};
+    WindowTemplate templateFullscreen{"tvFullscreen", WindowTemplate::WindowType::STANDARD, {fullscreenSize}, {"tv"}};
+    WindowTemplate templatePartial{
+        "tvOverlayLandscape", WindowTemplate::WindowType::OVERLAY, {partialSize}, {"tv_overlay"}};
+
+    std::vector<WindowTemplate> windowTemplates = {templateFullscreen, templatePartial};
+    ASSERT_TRUE(VCConfigParser::serializeWindowTemplate(windowTemplates, payloadJson));
+
+    // verify that same window templates are recreated from the serialized json
+    auto cfg = getConfigurationNode(payloadJson);
+    auto templatesFromJson = cfg.getArray(TEMPLATES);
+    for (size_t j = 0; j < templatesFromJson.getArraySize(); ++j) {
+        WindowTemplate windowTemplateRecreated;
+        ASSERT_TRUE(VCConfigParser::parseWindowTemplate(templatesFromJson[j], windowTemplateRecreated));
+        ASSERT_TRUE(VCConfigParserTest::areWindowTemplatesEqual(windowTemplates[j], windowTemplateRecreated));
+    }
+}
+
+/**
+ * Tests serialize logic for display characteristics.
+ */
+TEST_F(VCConfigParserTest, testSerializeDisplayCharacteristics) {
+    std::string payloadJson;
+    DisplayCharacteristics displayCharacteristics;
+    displayCharacteristics.type = DisplayCharacteristics::Type::PIXEL;
+    displayCharacteristics.touch = {DisplayCharacteristics::TouchType::UNSUPPORTED};
+    displayCharacteristics.shape = DisplayCharacteristics::RECTANGLE;
+    displayCharacteristics.resolution = {Dimension::Unit::PIXEL, 1920, 1080};
+    displayCharacteristics.physicalSize = {Dimension::Unit::INCHES, 56.7, 31.9};
+    displayCharacteristics.pixelDensity = 320;
+    displayCharacteristics.densityIndependentResolution = {Dimension::Unit::DP, 960, 540};
+    ASSERT_TRUE(VCConfigParser::serializeDisplayCharacteristics(displayCharacteristics, payloadJson));
+
+    // verify that same display characteristics are recreated from the serialized json
+    auto cfg = getConfigurationNode(payloadJson);
+    DisplayCharacteristics displayCharacteristicsRecreated;
+    ASSERT_TRUE(VCConfigParser::parseDisplayCharacteristics(cfg, displayCharacteristicsRecreated));
+    ASSERT_TRUE(areDisplayCharacteristicsEqual(displayCharacteristics, displayCharacteristicsRecreated));
+}
+
+}  // namespace visualCharacteristics
+}  // namespace alexaClientSDK
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristics/test/VisualCharacteristicsTest.cpp b/capabilities/VisualCharacteristics/VisualCharacteristics/test/VisualCharacteristicsTest.cpp
new file mode 100644
index 0000000000..5c65677eba
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristics/test/VisualCharacteristicsTest.cpp
@@ -0,0 +1,481 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/VisualCharacteristics/private/VisualCharacteristics.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <AVSCommon/SDKInterfaces/Endpoints/MockEndpointCapabilitiesRegistrar.h>
+#include <AVSCommon/SDKInterfaces/MockContextManager.h>
+#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
+#include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
+#include <AVSCommon/Utils/Memory/Memory.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateObserverInterface.h>
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h>
+
+namespace alexaClientSDK {
+namespace visualCharacteristics {
+
+using namespace presentationOrchestratorInterfaces;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::configuration;
+using namespace avsCommon::utils::threading;
+using namespace visualCharacteristicsInterfaces;
+using namespace rapidjson;
+using namespace ::testing;
+
+using avsCommon::sdkInterfaces::endpoints::test::MockEndpointCapabilitiesRegistrar;
+using avsCommon::sdkInterfaces::test::MockContextManager;
+using avsCommon::sdkInterfaces::test::MockExceptionEncounteredSender;
+
+/// Interaction mode configuration json
+static const std::string INTERACTION_MODE_CONFIG = R"({
+   "type": "AlexaInterface",
+   "interface": "Alexa.InteractionMode",
+   "version": "1.1",
+   "configurations": {
+     "interactionModes": [
+       {
+         "id": "tv",
+         "uiMode": "TV",
+         "interactionDistance": { "unit": "INCHES", "value": 130 },
+         "touch": "UNSUPPORTED",
+         "keyboard": "SUPPORTED",
+         "video": "SUPPORTED",
+         "dialog": "SUPPORTED"
+       },
+       {
+         "id": "tv_overlay",
+         "uiMode": "TV",
+         "interactionDistance": { "unit": "INCHES", "value": 130 },
+         "touch": "UNSUPPORTED",
+         "keyboard": "SUPPORTED",
+         "video": "UNSUPPORTED",
+         "dialog": "SUPPORTED"
+       }
+     ]
+   }
+})";
+
+/// Alexa.Display.Window configuration json
+static const std::string WINDOW_CONFIG = R"({
+   "type": "AlexaInterface",
+   "interface": "Alexa.Display.Window",
+   "version": "1.0",
+   "configurations": {
+     "templates": [
+       {
+         "id": "tvFullscreen",
+         "type": "STANDARD",
+         "configuration": {
+           "sizes": [
+             {
+               "type": "DISCRETE",
+               "id": "fullscreen",
+               "value": {
+                 "unit": "PIXEL",
+                 "value": { "width": 1920, "height": 1080 }
+               }
+             }
+           ],
+           "interactionModes": ["tv"]
+         }
+       },
+       {
+         "id": "tvOverlayLandscape",
+         "type": "OVERLAY",
+         "configuration": {
+           "sizes": [
+             {
+               "type": "DISCRETE",
+               "id": "landscapePanel",
+               "value": {
+                 "unit": "PIXEL",
+                 "value": { "width": 1920, "height": 400 }
+               }
+             }
+           ],
+           "interactionModes": ["tv_overlay"]
+         }
+       }
+     ]
+   }
+})";
+
+/// Alexa.Display.Window configuration json which specifies an invalid interaction mode
+static const std::string INVALID_INTERACTION_MODE_WINDOW_CONFIG = R"({
+   "type": "AlexaInterface",
+   "interface": "Alexa.Display.Window",
+   "version": "1.0",
+   "configurations": {
+     "templates": [
+       {
+         "id": "tvFullscreen",
+         "type": "STANDARD",
+         "configuration": {
+           "sizes": [
+             {
+               "type": "DISCRETE",
+               "id": "fullscreen",
+               "value": {
+                 "unit": "PIXEL",
+                 "value": { "width": 1920, "height": 1080 }
+               }
+             }
+           ],
+           "interactionModes": ["potato", "tv"]
+         }
+       }
+     ]
+   }
+})";
+
+/// Alexa.Display configuration json
+static const std::string DISPLAY_CONFIG = R"({
+   "type": "AlexaInterface",
+   "interface": "Alexa.Display",
+   "version": "1.0",
+   "configurations": {
+     "display": {
+       "type": "PIXEL",
+       "touch": ["UNSUPPORTED"],
+       "shape": "RECTANGLE",
+       "dimensions": {
+         "resolution": {
+           "unit": "PIXEL",
+           "value": { "width": 1920, "height": 1080 }
+         },
+         "physicalSize": {
+           "unit": "INCHES",
+           "value": { "width": 56.7, "height": 31.9 }
+         },
+         "pixelDensity": { "unit": "DPI", "value": 320 },
+         "densityIndependentResolution": {
+           "unit": "DP",
+           "value": { "width": 960, "height": 540 }
+         }
+       }
+     }
+   }
+})";
+
+/// Dummy configuration for testing VC
+static const std::string SETTINGS_CONFIG = R"({
+    "visualCharacteristics": [)" + INTERACTION_MODE_CONFIG +
+                                           "," + WINDOW_CONFIG + "," + DISPLAY_CONFIG + R"(]
+})";
+
+/// Invalid interactionmode configuration for testing VC
+static const std::string INVALID_WINDOW_INTERACTIONMODE_SETTINGS_CONFIG = R"({
+    "visualCharacteristics": [)" + INTERACTION_MODE_CONFIG + "," + INVALID_INTERACTION_MODE_WINDOW_CONFIG +
+                                                                          "," + DISPLAY_CONFIG + R"(]
+})";
+
+/// Visual Context for the window states.
+static const std::string WINDOW_STATE =
+    R"({"defaultWindowId":"tvFullscreen","instances":[{"id":"tvFullscreen","templateId":"tvFullscreen","token":"token1","configuration":{"interactionMode":"tv","sizeConfigurationId":"fullscreen"}}]})";
+
+/// Visual Context for the window states without a token.
+static const std::string WINDOW_STATE_NO_TOKEN =
+    R"({"defaultWindowId":"tvFullscreen","instances":[{"id":"tvFullscreen","templateId":"tvFullscreen","token":"","configuration":{"interactionMode":"tv","sizeConfigurationId":"fullscreen"}}]})";
+
+/// Empty Visual Context for the window states.
+static const std::string EMPTY_WINDOW_STATE = R"({"defaultWindowId":"tvFullscreen","instances":[]})";
+
+/// Namespace for sending WindowState context from a device.
+static const std::string ALEXA_DISPLAY_WINDOW_NAMESPACE{"Alexa.Display.Window"};
+
+/// Tag for finding the device window state context information sent from the runtime as part of event context.
+static const std::string WINDOW_STATE_NAME{"WindowState"};
+
+/// Id of a window instance.
+static const std::string WINDOW_ID{"tvFullscreen"};
+
+/// Id of a window template used by the window instance.
+static const std::string WINDOW_TEMPLATE_ID{"tvFullscreen"};
+
+/// Id of a window template used by the window instance.
+static const std::string WINDOW_TEMPLATE_ID_OVERLAY{"tvOverlayLandscape"};
+
+/// Id of an interaction mode used by a window instance instance.
+static const std::string INTERACTION_MODE{"tv"};
+
+/// Id of a size configuration used by a window instance instance.
+static const std::string SIZE_CONFIG_ID{"fullscreen"};
+
+/// Presentation token of currently served by a presentation.
+static const std::string TOKEN{"token1"};
+
+/// Empty Presentation token.
+static const std::string EMPTY_TOKEN{""};
+
+/// Display interface holding a presentation.
+static const std::string DISPLAY_INTERFACE{"Alexa.Presentation.APL"};
+
+/// The endpoint holding this window.
+static const std::string DEFAULT_ENDPOINT{""};
+
+/// Count of the capability configuration
+static const int CAPABILITY_CFG_COUNT = 3;
+
+/// Count of the number of interaction modes
+static const int INTERACTION_MODE_CFG_COUNT = 2;
+
+/// Count of the number of window template
+static const int WINDOW_TEMPLATE_CFG_COUNT = 2;
+
+/// State request #0
+static const int STATE_REQUEST_ZERO = 0;
+
+/// State request #1
+static const int STATE_REQUEST_ONE = 1;
+
+/// State request #2
+static const int STATE_REQUEST_TWO = 2;
+
+/// The VisualCharacteristics context state signature.
+static const avsCommon::avs::NamespaceAndName DEVICE_WINDOW_STATE{ALEXA_DISPLAY_WINDOW_NAMESPACE, WINDOW_STATE_NAME};
+
+/// Mocked @c PresentationOrchestratorStateObserverInterface
+class MockPresentationOrchestratorStateObserver : public PresentationOrchestratorStateObserverInterface {
+public:
+    MOCK_METHOD2(onStateChanged, void(const std::string& windowId, const PresentationMetadata& metadata));
+};
+
+/// Test harness for @c VisualCharacteristics class.
+class VisualCharacteristicsTest : public ::testing::Test {
+public:
+    /// Set up the test harness for running a test.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Default Constructor
+    VisualCharacteristicsTest() = default;
+
+protected:
+    /// A pointer to an instance of the VisualCharacteristics that will be instantiated per test.
+    std::shared_ptr<VisualCharacteristics> m_visualCharacteristics;
+
+    /// A strict mock that allows the test to fetch context.
+    std::shared_ptr<StrictMock<MockContextManager>> m_mockContextManager;
+
+    /// A strict mock that allows reporting of exceptions during directive handling.
+    std::shared_ptr<StrictMock<MockExceptionEncounteredSender>> m_mockExceptionEncounteredSender;
+
+    /// Mock Executor.
+    std::shared_ptr<avsCommon::utils::threading::Executor> m_executor;
+
+    /// An endpoint capabilities registrar with which to register capabilities.
+    std::shared_ptr<MockEndpointCapabilitiesRegistrar> m_mockEndpointCapabilitiesRegistrar;
+};
+
+static void setConfig() {
+    ConfigurationNode::uninitialize();
+    auto stream = std::shared_ptr<std::stringstream>(new std::stringstream(SETTINGS_CONFIG));
+    std::vector<std::shared_ptr<std::istream>> jsonStream({stream});
+    ConfigurationNode::initialize(jsonStream);
+}
+
+void VisualCharacteristicsTest::SetUp() {
+    setConfig();
+
+    m_mockContextManager = std::make_shared<StrictMock<MockContextManager>>();
+    m_mockExceptionEncounteredSender = std::make_shared<StrictMock<MockExceptionEncounteredSender>>();
+    m_mockEndpointCapabilitiesRegistrar = std::make_shared<NiceMock<MockEndpointCapabilitiesRegistrar>>();
+
+    EXPECT_CALL(*m_mockContextManager, setStateProvider(_, _)).Times(Exactly(1));
+
+    m_visualCharacteristics = std::dynamic_pointer_cast<VisualCharacteristics>(
+        VisualCharacteristics::create(m_mockContextManager, m_mockExceptionEncounteredSender));
+
+    EXPECT_TRUE(m_visualCharacteristics != nullptr);
+
+    m_executor = std::make_shared<avsCommon::utils::threading::Executor>();
+
+    m_visualCharacteristics->setExecutor(m_executor);
+}
+
+void VisualCharacteristicsTest::TearDown() {
+    if (m_visualCharacteristics) {
+        m_visualCharacteristics->shutdown();
+        m_visualCharacteristics.reset();
+    }
+
+    ConfigurationNode::uninitialize();
+}
+
+/**
+ * Tests that the VisualCharacteristics capability agent can successfully publish the four APIs in the config
+ * file. Verify that other components are able to fetch the configurations.
+ */
+TEST_F(VisualCharacteristicsTest, testGetCapabilityConfigurations) {
+    auto capabilityConfigurations = m_visualCharacteristics->getCapabilityConfigurations();
+
+    EXPECT_TRUE(capabilityConfigurations.size() == CAPABILITY_CFG_COUNT);
+    for (auto& cfg : capabilityConfigurations) {
+        EXPECT_TRUE(cfg != nullptr);
+    }
+}
+
+/**
+ * Verify that other components will be able to fetch the VC configurations.
+ */
+TEST_F(VisualCharacteristicsTest, testVerifyGetConfigurations) {
+    auto capabilityConfigurations = m_visualCharacteristics->getCapabilityConfigurations();
+
+    EXPECT_TRUE(capabilityConfigurations.size() == CAPABILITY_CFG_COUNT);
+    for (auto& cfg : capabilityConfigurations) {
+        EXPECT_TRUE(cfg != nullptr);
+    }
+
+    EXPECT_TRUE(m_visualCharacteristics->getWindowTemplates().size() == WINDOW_TEMPLATE_CFG_COUNT);
+    EXPECT_TRUE(m_visualCharacteristics->getInteractionModes().size() == INTERACTION_MODE_CFG_COUNT);
+    EXPECT_TRUE(m_visualCharacteristics->getDisplayCharacteristics().type == DisplayCharacteristics::Type::PIXEL);
+}
+/**
+ * Test if the VisualCharacteristics component is able to add window instance
+ * and verify the state context.
+ */
+TEST_F(VisualCharacteristicsTest, testAddWindowInstance) {
+    std::string context;
+    EXPECT_CALL(*(m_mockContextManager.get()), setState(DEVICE_WINDOW_STATE, _, _, STATE_REQUEST_ZERO))
+        .Times(1)
+        .WillOnce(DoAll(SaveArg<1>(&context), Return(SetStateResult::SUCCESS)));
+    m_visualCharacteristics->addWindowInstance({WINDOW_ID, WINDOW_TEMPLATE_ID, INTERACTION_MODE, SIZE_CONFIG_ID});
+    m_visualCharacteristics->setDefaultWindowInstance(WINDOW_ID);
+    m_visualCharacteristics->onStateChanged(WINDOW_ID, {DEFAULT_ENDPOINT, DISPLAY_INTERFACE, TOKEN});
+    m_visualCharacteristics->provideState(DEVICE_WINDOW_STATE, STATE_REQUEST_ZERO);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(context == WINDOW_STATE);
+
+    EXPECT_CALL(*(m_mockContextManager.get()), setState(DEVICE_WINDOW_STATE, _, _, STATE_REQUEST_ONE)).Times(1);
+    m_visualCharacteristics->onStateChanged(WINDOW_ID, {DEFAULT_ENDPOINT, DISPLAY_INTERFACE, EMPTY_TOKEN});
+    m_visualCharacteristics->removeWindowInstance(WINDOW_ID);
+    m_executor->waitForSubmittedTasks();
+    m_visualCharacteristics->provideState(DEVICE_WINDOW_STATE, STATE_REQUEST_ONE);
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Test if the VisualCharacteristics component is able to update window instance
+ * and verify the state context.
+ */
+TEST_F(VisualCharacteristicsTest, testUpdateWindowInstance) {
+    std::string context;
+    EXPECT_CALL(*(m_mockContextManager.get()), setState(DEVICE_WINDOW_STATE, _, _, STATE_REQUEST_ZERO))
+        .Times(1)
+        .WillOnce(DoAll(SaveArg<1>(&context), Return(SetStateResult::SUCCESS)));
+    m_visualCharacteristics->addWindowInstance({WINDOW_ID, WINDOW_TEMPLATE_ID, INTERACTION_MODE, SIZE_CONFIG_ID});
+    m_visualCharacteristics->setDefaultWindowInstance(WINDOW_ID);
+    m_visualCharacteristics->onStateChanged(WINDOW_ID, {DEFAULT_ENDPOINT, DISPLAY_INTERFACE, TOKEN});
+    m_visualCharacteristics->provideState(DEVICE_WINDOW_STATE, STATE_REQUEST_ZERO);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(context == WINDOW_STATE);
+
+    context.clear();
+    EXPECT_CALL(*(m_mockContextManager.get()), setState(DEVICE_WINDOW_STATE, _, _, STATE_REQUEST_ONE))
+        .Times(1)
+        .WillOnce(DoAll(SaveArg<1>(&context), Return(SetStateResult::SUCCESS)));
+    m_visualCharacteristics->updateWindowInstance(
+        {WINDOW_ID, WINDOW_TEMPLATE_ID_OVERLAY, INTERACTION_MODE, SIZE_CONFIG_ID});
+
+    m_visualCharacteristics->onStateChanged(WINDOW_ID, {DEFAULT_ENDPOINT, DISPLAY_INTERFACE, TOKEN});
+    m_visualCharacteristics->provideState(DEVICE_WINDOW_STATE, STATE_REQUEST_ONE);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_FALSE(context.find(WINDOW_TEMPLATE_ID_OVERLAY) == std::string::npos);
+
+    context.clear();
+    EXPECT_CALL(*(m_mockContextManager.get()), setState(DEVICE_WINDOW_STATE, _, _, STATE_REQUEST_TWO))
+        .Times(1)
+        .WillOnce(DoAll(SaveArg<1>(&context), Return(SetStateResult::SUCCESS)));
+    m_visualCharacteristics->onStateChanged(WINDOW_ID, {DEFAULT_ENDPOINT, DISPLAY_INTERFACE, EMPTY_TOKEN});
+    m_visualCharacteristics->removeWindowInstance(WINDOW_ID);
+    m_executor->waitForSubmittedTasks();
+
+    m_visualCharacteristics->provideState(DEVICE_WINDOW_STATE, STATE_REQUEST_TWO);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(context == EMPTY_WINDOW_STATE);
+}
+
+/**
+ * Test if the VisualCharacteristics component is able to remove window instance
+ * and verify the state context.
+ */
+TEST_F(VisualCharacteristicsTest, testRemoveWindowInstance) {
+    std::string context;
+    EXPECT_CALL(*(m_mockContextManager.get()), setState(DEVICE_WINDOW_STATE, _, _, STATE_REQUEST_ZERO))
+        .WillOnce(DoAll(SaveArg<1>(&context), Return(SetStateResult::SUCCESS)));
+    m_visualCharacteristics->addWindowInstance({WINDOW_ID, WINDOW_TEMPLATE_ID, INTERACTION_MODE, SIZE_CONFIG_ID});
+    m_visualCharacteristics->setDefaultWindowInstance(WINDOW_ID);
+    m_visualCharacteristics->onStateChanged(WINDOW_ID, {DEFAULT_ENDPOINT, DISPLAY_INTERFACE, TOKEN});
+    m_visualCharacteristics->provideState(DEVICE_WINDOW_STATE, STATE_REQUEST_ZERO);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(context == WINDOW_STATE);
+
+    context.clear();
+    EXPECT_CALL(*(m_mockContextManager.get()), setState(DEVICE_WINDOW_STATE, _, _, STATE_REQUEST_ONE))
+        .Times(1)
+        .WillOnce(DoAll(SaveArg<1>(&context), Return(SetStateResult::SUCCESS)));
+    m_visualCharacteristics->onStateChanged(WINDOW_ID, {DEFAULT_ENDPOINT, DISPLAY_INTERFACE, EMPTY_TOKEN});
+    m_visualCharacteristics->removeWindowInstance(WINDOW_ID);
+    m_executor->waitForSubmittedTasks();
+
+    m_visualCharacteristics->provideState(DEVICE_WINDOW_STATE, STATE_REQUEST_ONE);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(context == EMPTY_WINDOW_STATE);
+}
+
+TEST_F(VisualCharacteristicsTest, testValidateConfigurationUnknownInteractionMode) {
+    // Reset the config with an invalid one
+    ConfigurationNode::uninitialize();
+    auto stream =
+        std::shared_ptr<std::stringstream>(new std::stringstream(INVALID_WINDOW_INTERACTIONMODE_SETTINGS_CONFIG));
+    std::vector<std::shared_ptr<std::istream>> jsonStream({stream});
+    ConfigurationNode::initialize(jsonStream);
+
+    auto visualCharacteristics = VisualCharacteristics::create(m_mockContextManager, m_mockExceptionEncounteredSender);
+
+    ASSERT_TRUE(visualCharacteristics == nullptr);
+}
+
+/**
+ * Test if the VisualCharacteristics component clears the token when an empty state is received
+ */
+TEST_F(VisualCharacteristicsTest, testClearToken) {
+    std::string context;
+    std::string context2;
+    EXPECT_CALL(*(m_mockContextManager.get()), setState(DEVICE_WINDOW_STATE, _, _, STATE_REQUEST_ZERO))
+        .WillRepeatedly(DoAll(SaveArg<1>(&context), Return(SetStateResult::SUCCESS)));
+    EXPECT_CALL(*(m_mockContextManager.get()), setState(DEVICE_WINDOW_STATE, _, _, STATE_REQUEST_ONE))
+        .WillOnce(DoAll(SaveArg<1>(&context2), Return(SetStateResult::SUCCESS)));
+    m_visualCharacteristics->addWindowInstance({WINDOW_ID, WINDOW_TEMPLATE_ID, INTERACTION_MODE, SIZE_CONFIG_ID});
+    m_visualCharacteristics->setDefaultWindowInstance(WINDOW_ID);
+    m_visualCharacteristics->onStateChanged(WINDOW_ID, {DEFAULT_ENDPOINT, DISPLAY_INTERFACE, TOKEN});
+    m_visualCharacteristics->provideState(DEVICE_WINDOW_STATE, STATE_REQUEST_ZERO);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(context == WINDOW_STATE);
+
+    m_visualCharacteristics->onStateChanged(WINDOW_ID, {});
+    m_visualCharacteristics->provideState(DEVICE_WINDOW_STATE, STATE_REQUEST_ONE);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(context2 == WINDOW_STATE_NO_TOKEN);
+}
+}  // namespace visualCharacteristics
+}  // namespace alexaClientSDK
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristicsInterfaces/CMakeLists.txt b/capabilities/VisualCharacteristics/VisualCharacteristicsInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..db1ded2dc2
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristicsInterfaces/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkVisualCharacteristicsInterfaces LANGUAGES CXX)
+
+add_library(acsdkVisualCharacteristicsInterfaces INTERFACE)
+
+target_include_directories(acsdkVisualCharacteristicsInterfaces INTERFACE "${acsdkVisualCharacteristicsInterfaces_SOURCE_DIR}/include")
+
+# install target
+asdk_install_interface()
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristicsInterfaces/include/acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h b/capabilities/VisualCharacteristics/VisualCharacteristicsInterfaces/include/acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h
new file mode 100644
index 0000000000..fb31249cea
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristicsInterfaces/include/acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h
@@ -0,0 +1,452 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_VISUALCHARACTERISTICSINTERFACES_VISUALCHARACTERISTICSINTERFACE_H_
+#define ACSDK_VISUALCHARACTERISTICSINTERFACES_VISUALCHARACTERISTICSINTERFACE_H_
+
+#include <string>
+#include <vector>
+
+namespace alexaClientSDK {
+namespace visualCharacteristicsInterfaces {
+
+/**
+ * The dimension configuration
+ */
+struct Dimension {
+    /// Enum defining the units for dimension
+    enum class Unit {
+        /// Unit in pixels.
+        PIXEL,
+
+        /// Unit in pixels.
+        DPI,
+
+        /// Unit in dp
+        DP,
+
+        /// Unit in centimeter
+        CENTIMETERS,
+
+        /// Unit in inch
+        INCHES
+    };
+
+    /// Unit for this dimension.
+    Unit unit;
+
+    /// Width in unit dimensions.
+    double width;
+
+    /// Height in unit dimensions.
+    double height;
+
+    /**
+     * Convert enum to string
+     * @param unit UNIT value
+     * @return Text defining the enum
+     */
+    static const std::string unitToText(const Unit unit) {
+        switch (unit) {
+            case Unit::PIXEL:
+                return "PIXEL";
+            case Unit::DPI:
+                return "DPI";
+            case Unit::DP:
+                return "DP";
+            case Unit::CENTIMETERS:
+                return "CENTIMETERS";
+            case Unit::INCHES:
+                return "INCHES";
+        }
+
+        return std::string();
+    }
+};
+
+/**
+ * The window size configuration
+ */
+struct WindowSize {
+    /// Enum defining the Window Size types
+    enum class WindowSizeType {
+        /// Specify DISCRETE for a window size with fixed points
+        DISCRETE,
+
+        /// Specify CONTINUOUS to allow any window size under a specified maximum width and height
+        CONTINUOUS
+    };
+
+    /// Unique identifier for the specified size configuration
+    std::string id;
+
+    /// Window size type
+    WindowSizeType type;
+
+    /// Dimension for the window
+    /// For DISCRETE window types both minimum and maximum will be identical
+    /// Unit must be PIXELS
+    Dimension minimum;
+    Dimension maximum;
+
+    static const std::string windowSizeTypeToText(const WindowSizeType windowSizeType) {
+        switch (windowSizeType) {
+            case WindowSizeType::DISCRETE:
+                return "DISCRETE";
+            case WindowSizeType::CONTINUOUS:
+                return "CONTINUOUS";
+        }
+
+        return std::string();
+    }
+};
+
+/**
+ * The window template for Alexa.Display.Window interface.
+ * https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/display-window.html
+ */
+struct WindowTemplate {
+    /// Enum defining the window types for the template
+    enum class WindowType {
+        /// Permanent, static window
+        STANDARD,
+
+        /// Temporary window that might share the screen with other experiences. Overlay windows could be transparent
+        OVERLAY
+    };
+
+    /// Window template id.
+    std::string id;
+
+    /// Type of of the window template.
+    WindowType type;
+
+    /// Sizes supported by this window template.
+    std::vector<WindowSize> sizes;
+
+    /// Interaction mode supported by this window template.
+    std::vector<std::string> interactionModes;
+
+    /**
+     * Converts enum to string
+     * @param windowType WindowType enum value
+     * @return Text defining the enum
+     */
+    static const std::string windowTypeToText(const WindowType windowType) {
+        switch (windowType) {
+            case WindowType::STANDARD:
+                return "STANDARD";
+            case WindowType::OVERLAY:
+                return "OVERLAY";
+        }
+
+        return std::string();
+    }
+};
+
+/**
+ * The interaction mode for Alexa.InteractionMode interface.
+ * https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/interaction-mode.html
+ */
+struct InteractionMode {
+    /// Enum defining the UI modes of interaction mode.
+    enum class UIMode {
+        /// Auto UI mode
+        AUTO,
+
+        /// Hub UI mode
+        HUB,
+
+        /// Tv UI mode
+        TV,
+
+        /// Mobile UI mode
+        MOBILE,
+
+        /// Pc UI mode
+        PC,
+
+        /// Headless UI mode
+        HEADLESS
+    };
+
+    /// Enum class defining the unit for the interaction mode
+    enum class Unit {
+        /// Unit is centimeters.
+        CENTIMETERS,
+
+        /// Unit is inches.
+        INCHES
+    };
+
+    /// UI mode for this interaction mode.
+    UIMode uiMode;
+
+    /// ID of this interaction mode.
+    std::string id;
+
+    /// Unit of the interaction distance for this interaction mode.
+    Unit interactionDistanceUnit;
+
+    /// Value of the interaction distance for this interaction mode.
+    int interactionDistanceValue;
+
+    /// Touch support.
+    bool touchSupported;
+
+    /// Keyboard support.
+    bool keyboardSupported;
+
+    /// Video support.
+    bool videoSupported;
+
+    /// Dialog support.
+    bool dialogSupported;
+
+    /**
+     * Converts enum to string
+     * @param uiMode UIMode enum value
+     * @return Text defining the enum
+     */
+    static const std::string uiModeToText(const UIMode uiMode) {
+        switch (uiMode) {
+            case UIMode::AUTO:
+                return "AUTO";
+            case UIMode::HUB:
+                return "HUB";
+            case UIMode::TV:
+                return "TV";
+            case UIMode::MOBILE:
+                return "MOBILE";
+            case UIMode::PC:
+                return "PC";
+            case UIMode::HEADLESS:
+                return "HEADLESS";
+        }
+
+        return std::string();
+    }
+
+    /**
+     * Converts enum to string
+     * @param unit Unit enum value
+     * @return Text defining the enum
+     */
+    static const std::string unitToText(const Unit unit) {
+        switch (unit) {
+            case Unit::CENTIMETERS:
+                return "CENTIMETERS";
+            case Unit::INCHES:
+                return "INCHES";
+        }
+
+        return std::string();
+    }
+};
+
+/**
+ * The display characteristics for Alexa.Display interface.
+ * https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/display.html
+ */
+struct DisplayCharacteristics {
+    /// Enum defining the type of the Display
+    enum Type {
+        /// Pixel display type
+        PIXEL
+    };
+
+    /// Enum defining the touch type supported by display
+    enum TouchType {
+        /// Single display type
+        SINGLE,
+
+        /// Unsupported display type
+        UNSUPPORTED
+    };
+
+    /// Enum defining the shape of the display
+    enum Shape {
+        /// Rectangle shape
+        RECTANGLE,
+
+        /// Round shape
+        ROUND
+    };
+
+    /// Type of the display.
+    Type type;
+
+    /// Touch types supported by the display.
+    std::vector<TouchType> touch;
+
+    /// Shape of the display.
+    Shape shape;
+
+    /// The pixel density, unit is DPI
+    int pixelDensity;
+
+    /// The display resolution, unit must be PIXEL
+    Dimension resolution;
+
+    /// The density independent resolution, unit must be DP
+    Dimension densityIndependentResolution;
+
+    /// The physical size of the display, unit must be CENTIMETERS or INCHES
+    Dimension physicalSize;
+
+    /**
+     * Converts enum to string
+     * @param type Display type enum value
+     * @return Text defining the enum
+     */
+    static const std::string typeToText(const Type type) {
+        switch (type) {
+            case Type::PIXEL:
+                return "PIXEL";
+        }
+
+        return std::string();
+    }
+
+    /**
+     * Converts enum to string
+     * @param touchType Display touch type enum value
+     * @return Text defining the enum
+     */
+    static const std::string touchTypeToText(const TouchType touchType) {
+        switch (touchType) {
+            case TouchType::SINGLE:
+                return "SINGLE";
+            case TouchType::UNSUPPORTED:
+                return "UNSUPPORTED";
+        }
+
+        return std::string();
+    }
+
+    /**
+     * Converts enum to string
+     * @param shape Display shape enum value
+     * @return Text defining the enum
+     */
+    static const std::string shapeToText(const Shape shape) {
+        switch (shape) {
+            case Shape::RECTANGLE:
+                return "RECTANGLE";
+            case Shape::ROUND:
+                return "ROUND";
+        }
+
+        return std::string();
+    }
+};
+
+/**
+ * Struct defining an instance of a window.
+ */
+struct WindowInstance {
+    std::string id;
+    std::string templateId;
+    std::string interactionMode;
+    std::string sizeConfigurationId;
+};
+
+/**
+ * Struct defining an instance of a window managed by orchestrator.
+ */
+struct OrchestratorWindowInstance : public WindowInstance {
+    bool includeInWindowState;
+    bool supportsBackgroundPresentations;
+    int display;
+    int zOrderIndex;
+};
+
+/**
+ * Struct defining all the visual characteristics configurations
+ */
+struct VisualCharacteristicsConfiguration {
+    std::vector<InteractionMode> interactionModes;
+    std::vector<WindowTemplate> windowTemplates;
+    DisplayCharacteristics displayCharacteristics;
+};
+
+/**
+ * Interface contract for @c VisualCharacteristics capability agent.
+ */
+class VisualCharacteristicsInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~VisualCharacteristicsInterface() = default;
+
+    /**
+     * Gets the window template configuration
+     * @return vector containing the window templates
+     */
+    virtual std::vector<WindowTemplate> getWindowTemplates() = 0;
+
+    /**
+     * Retrieve the interaction mode configuration
+     * @return vector containing the interaction modes
+     */
+    virtual std::vector<InteractionMode> getInteractionModes() = 0;
+
+    /**
+     * Get the display characteristics
+     * @return the display characteristics object
+     */
+    virtual DisplayCharacteristics getDisplayCharacteristics() = 0;
+
+    /**
+     * Sets the window instances to be reported in WindowState.
+     * Replaces any windows in the existing WindowState set.
+     * @param instances The vector of window instances to aad/report in WindowState
+     * @param defaultWindowInstanceId The default window id to report in WindowState
+     */
+    virtual void setWindowInstances(
+        const std::vector<WindowInstance>& instances,
+        const std::string& defaultWindowInstanceId) = 0;
+
+    /**
+     * Adds a window instance to be reported in WindowState
+     * @param instance The window instance to add, the templateId, interactionMode and sizeConfigurationId must match
+     * existing Ids which are reported by VisualCharacteristics, the window ID must be unique
+     * @return true if the instance was successfully added, false otherwise
+     */
+    virtual bool addWindowInstance(const WindowInstance& instance) = 0;
+
+    /**
+     * Remove an existing window instance, at least one window must exist at all times
+     * @param windowInstanceId The id of the window to remove
+     * @return true if the instance was removed, false otherwise
+     */
+    virtual bool removeWindowInstance(const std::string& windowInstanceId) = 0;
+
+    /**
+     * Updates an already existing window instance
+     * @param instace The updated window instance, the window ID must match an already existing window
+     */
+    virtual void updateWindowInstance(const WindowInstance& instance) = 0;
+
+    /**
+     * Sets the default window instance
+     * @param windowInstanceId The id of window to set as the default, this window id must already exist
+     * @return true if the default has been set, false otherwise
+     */
+    virtual bool setDefaultWindowInstance(const std::string& windowInstanceId) = 0;
+};
+}  // namespace visualCharacteristicsInterfaces
+}  // namespace alexaClientSDK
+#endif  // ACSDK_VISUALCHARACTERISTICSINTERFACES_VISUALCHARACTERISTICSINTERFACE_H_
diff --git a/capabilities/VisualCharacteristics/VisualCharacteristicsInterfaces/include/acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsSerializerInterface.h b/capabilities/VisualCharacteristics/VisualCharacteristicsInterfaces/include/acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsSerializerInterface.h
new file mode 100644
index 0000000000..4dbf9c353b
--- /dev/null
+++ b/capabilities/VisualCharacteristics/VisualCharacteristicsInterfaces/include/acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsSerializerInterface.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_VISUALCHARACTERISTICSINTERFACES_VISUALCHARACTERISTICSSERIALIZERINTERFACE_H_
+#define ACSDK_VISUALCHARACTERISTICSINTERFACES_VISUALCHARACTERISTICSSERIALIZERINTERFACE_H_
+
+#include <string>
+#include <vector>
+
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h>
+
+namespace alexaClientSDK {
+namespace visualCharacteristicsInterfaces {
+
+/**
+ * Interface contract for @c VisualCharacteristicsSerializer
+ */
+class VisualCharacteristicsSerializerInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~VisualCharacteristicsSerializerInterface() = default;
+
+    /**
+     * Serialize interaction modes into reportable json format.
+     * @param interactionModes  Collection of @c InteractionMode to be serialized
+     * @param serializedJson [ out ] Serialized json payload
+     *
+     * @return True if serialization successful, false otherwise.
+     */
+    virtual bool serializeInteractionModes(
+        const std::vector<visualCharacteristicsInterfaces::InteractionMode>& interactionModes,
+        std::string& serializedJson) = 0;
+
+    /**
+     * Serialize window template into reportable json format.
+     * @param windowTemplates  Collection of @c WindowTemplate to be serialized
+     * @param serializedJson [ out ] Serialized json payload
+     *
+     * @return True if serialization successful, false otherwise.
+     */
+    virtual bool serializeWindowTemplate(
+        const std::vector<visualCharacteristicsInterfaces::WindowTemplate>& windowTemplates,
+        std::string& serializedJson) = 0;
+
+    /**
+     * Serialize display characteristics into reportable json format.
+     * @param display Instance of @c DisplayCharacteristics to be serialized
+     * @param serializedJson [ out ] Serialized json payload
+     *
+     * @return True if serialization successful, false otherwise.
+     */
+    virtual bool serializeDisplayCharacteristics(
+        const visualCharacteristicsInterfaces::DisplayCharacteristics& display,
+        std::string& serializedJson) = 0;
+};
+}  // namespace visualCharacteristicsInterfaces
+}  // namespace alexaClientSDK
+#endif  // ACSDK_VISUALCHARACTERISTICSINTERFACES_VISUALCHARACTERISTICSSERIALIZERINTERFACE_H_
diff --git a/cmakeBuild/BuildDefaults.cmake b/cmakeBuild/BuildDefaults.cmake
index 742297e5bb..e10d92ccb7 100644
--- a/cmakeBuild/BuildDefaults.cmake
+++ b/cmakeBuild/BuildDefaults.cmake
@@ -97,8 +97,8 @@ include_once(MRM)
 # Setup A4B variables.
 include_once(A4B)
 
-# Setup speech encoder variables.
-include_once(SpeechEncoder)
+# Setup OPUS audio encoding variables.
+include_once(Opus)
 
 # Setup Metrics variables.
 include_once(Metrics)
@@ -145,11 +145,14 @@ include_once(AuthorizationManager)
 # Setup FileSystemUtils options.
 include_once(FileSystemUtils)
 
-# Setup InputController options.
-include_once(InputController)
+# Setup EndpointVideoControllers options.
+include_once(EndpointVideoControllers)
 
 # Setup LibArchive options.
 include_once(LibArchive)
 
 # Setup AssetManager options.
 include_once(AssetManager)
+
+# Setup Sample Applications
+include_once(SampleApplications)
diff --git a/cmakeBuild/cmake/CodeCoverage/postCTest.sh b/cmakeBuild/cmake/CodeCoverage/postCTest.sh
index 716fe197b7..e79ce3c39d 100644
--- a/cmakeBuild/cmake/CodeCoverage/postCTest.sh
+++ b/cmakeBuild/cmake/CodeCoverage/postCTest.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#  http://aws.amazon.com/apache2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
 if [ $# -ne 7 ]; then
     printf "USAGE:\n\
         $0 CURRENT_BINARY_DIR CURRENT_DATA_FILE CURRENT_REPORT_FOLDER TOP_BINARY_DIR TOP_DATA_FILE \
diff --git a/cmakeBuild/cmake/CodeCoverage/preCTest.sh b/cmakeBuild/cmake/CodeCoverage/preCTest.sh
index 44882ba2a0..1bcf2ef90d 100644
--- a/cmakeBuild/cmake/CodeCoverage/preCTest.sh
+++ b/cmakeBuild/cmake/CodeCoverage/preCTest.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#  http://aws.amazon.com/apache2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
 if [ $# -ne 3 ]; then
     printf "USAGE:\n\
         $0 CURRENT_BINARY_DIR TOP_BINARY_DIR TOP_DATA_FILE"
diff --git a/cmakeBuild/cmake/Comms.cmake b/cmakeBuild/cmake/Comms.cmake
index 34d11e59d5..208bd1ba13 100644
--- a/cmakeBuild/cmake/Comms.cmake
+++ b/cmakeBuild/cmake/Comms.cmake
@@ -10,6 +10,7 @@
 
 option(COMMS "Enable Alexa Comms (Calling)." OFF)
 option(COMMS_AUDIO_PROXY "Enable Alexa Comms (Calling) using audio proxy." OFF)
+option(COMMS_VISUAL_FOCUS_MANAGER "Enable Alexa Comms (Calling) using visual focus manager." OFF)
 
 if(COMMS)
     if(NOT COMMS_LIB_PATH)
@@ -25,4 +26,9 @@ if(COMMS)
         message("Creating ${PROJECT_NAME} with Alexa Comms (Calling) using audio proxy")
         add_definitions(-DENABLE_COMMS_AUDIO_PROXY)
     endif()
+
+    if(COMMS_VISUAL_FOCUS_MANAGER)
+        message("Creating ${PROJECT_NAME} with Alexa Comms (Calling) using visual focus manager")
+        add_definitions(-DENABLE_COMMS_VISUAL_FOCUS_MANAGER)
+    endif()
 endif()
diff --git a/cmakeBuild/cmake/DefaultLibNames.cmake b/cmakeBuild/cmake/DefaultLibNames.cmake
index a3d7017e3e..33393082fc 100644
--- a/cmakeBuild/cmake/DefaultLibNames.cmake
+++ b/cmakeBuild/cmake/DefaultLibNames.cmake
@@ -43,8 +43,6 @@ if (BLUETOOTH_ENABLED)
         # Log a warning for this case, but not a fatal error. Applications that use the deprecated DefaultClient::create
         # method may use their own Bluetooth implementation by passing in their implementation of BluetoothDeviceManagerInterface,
         # without specifying a custom ACSDKBLUETOOTHIMPLEMENTATIONS_LIB here.
-        #
-        # However, note that compilation for PreviewAlexaClient will fail in this case.
         message(WARNING "No default library available for ACSDKBLUETOOTHIMPLEMENTATIONS_LIB when BLUETOOTH_ENABLED=ON BLUETOOTH_BLUEZ=OFF")
     endif()
 else()
diff --git a/cmakeBuild/cmake/EndpointControllers.cmake b/cmakeBuild/cmake/EndpointControllers.cmake
index 0eef0287a3..c48db4770f 100644
--- a/cmakeBuild/cmake/EndpointControllers.cmake
+++ b/cmakeBuild/cmake/EndpointControllers.cmake
@@ -11,6 +11,7 @@
 #       -DENDPOINT_CONTROLLERS_TOGGLE_CONTROLLER=ON
 #       -DENDPOINT_CONTROLLERS_RANGE_CONTROLLER=ON
 #       -DENDPOINT_CONTROLLERS_MODE_CONTROLLER=ON
+#       -DENDPOINT_CONTROLLERS_INPUT_CONTROLLER=ON
 #
 # Also, you can specify all and opt out capabilities which are not required,
 # by specifying it as 'OFF'. For instance, you can enable all except the Toggle 
@@ -30,6 +31,7 @@ if(ENABLE_ALL_ENDPOINT_CONTROLLERS)
      cmake_dependent_option(ENDPOINT_CONTROLLERS_TOGGLE_CONTROLLER "Enable endpoint controller Toggle Controller capability" ON "ENABLE_ALL_ENDPOINT_CONTROLLERS" OFF)
      cmake_dependent_option(ENDPOINT_CONTROLLERS_RANGE_CONTROLLER "Enable endpoint controller Range Controller capability" ON "ENABLE_ALL_ENDPOINT_CONTROLLERS" OFF)
      cmake_dependent_option(ENDPOINT_CONTROLLERS_MODE_CONTROLLER "Enable endpoint controller Mode Controller capability" ON "ENABLE_ALL_ENDPOINT_CONTROLLERS" OFF)
+     cmake_dependent_option(ENDPOINT_CONTROLLERS_INPUT_CONTROLLER "Enable endpoint controller Input Controller capability" ON "ENABLE_ALL_ENDPOINT_CONTROLLERS" OFF)
 endif()
 
 if(ENDPOINT_CONTROLLERS_POWER_CONTROLLER)
@@ -52,8 +54,14 @@ if(ENDPOINT_CONTROLLERS_MODE_CONTROLLER)
      add_definitions(-DMODE_CONTROLLER)
 endif()
 
-if (ENDPOINT_CONTROLLERS_POWER_CONTROLLER OR ENDPOINT_CONTROLLERS_TOGGLE_CONTROLLER OR
-        ENDPOINT_CONTROLLERS_RANGE_CONTROLLER OR ENDPOINT_CONTROLLERS_MODE_CONTROLLER)
+if(ENDPOINT_CONTROLLERS_INPUT_CONTROLLER)
+     message("Creating ${PROJECT_NAME} with Input Controller capability")
+     add_definitions(-DINPUT_CONTROLLER)
+endif()
+
+if(ENDPOINT_CONTROLLERS_POWER_CONTROLLER OR ENDPOINT_CONTROLLERS_TOGGLE_CONTROLLER OR
+     ENDPOINT_CONTROLLERS_RANGE_CONTROLLER OR ENDPOINT_CONTROLLERS_MODE_CONTROLLER OR
+     ENDPOINT_CONTROLLERS_INPUT_CONTROLLER)
      add_definitions(-DENABLE_ENDPOINT_CONTROLLERS)
 endif()
 
diff --git a/cmakeBuild/cmake/EndpointVideoControllers.cmake b/cmakeBuild/cmake/EndpointVideoControllers.cmake
new file mode 100644
index 0000000000..827c324f48
--- /dev/null
+++ b/cmakeBuild/cmake/EndpointVideoControllers.cmake
@@ -0,0 +1,109 @@
+# Setup the video controller capabilities compiler options.
+#
+# To build with all endpoint video controller capabilities, specify:
+#   cmake <path-to-source>
+#       -DENABLE_ALL_VIDEO_CONTROLLERS=ON
+#
+# Or, you could specify each controller capabilities`
+#   cmake <path-to-source>
+#       -DVIDEO_CONTROLLERS_ALEXA_LAUNCHER=ON
+#       -DVIDEO_CONTROLLERS_ALEXA_KEYPAD_CONTROLLER=ON
+#       -DVIDEO_CONTROLLERS_ALEXA_PLAYBACK_CONTROLLER=ON
+#       -DVIDEO_CONTROLLERS_ALEXA_PLAYBACK_STATE_REPORTER=ON
+#       -DVIDEO_CONTROLLERS_ALEXA_SEEK_CONTROLLER=ON
+#       -DVIDEO_CONTROLLERS_ALEXA_VIDEO_RECORDER=ON
+#       -DVIDEO_CONTROLLERS_ALEXA_CHANNEL_CONTROLLER=ON
+#       -DVIDEO_CONTROLLERS_ALEXA_RECORD_CONTROLLER=ON
+#       -DVIDEO_CONTROLLERS_ALEXA_REMOTE_VIDEO_PLAYER=ON
+#
+# Also, you can specify all and opt out capabilities which are not required,
+# by specifying it as 'OFF'. For instance, you can enable all except the Alexa
+# Launcher capability by setting -DVIDEO_CONTROLLERS_ALEXA_LAUNCHER=OFF
+# For example:
+#   cmake <path-to-source>
+#       -DENABLE_ALL_VIDEO_CONTROLLERS=ON
+#           -DVIDEO_CONTROLLERS_ALEXA_LAUNCHER=OFF
+#           -DVIDEO_CONTROLLERS_ALEXA_KEYPAD_CONTROLLER=OFF
+#           -DVIDEO_CONTROLLERS_ALEXA_PLAYBACK_CONTROLLER=OFF
+#           -DVIDEO_CONTROLLERS_ALEXA_PLAYBACK_STATE_REPORTER=OFF
+#           -DVIDEO_CONTROLLERS_ALEXA_SEEK_CONTROLLER=OFF
+#           -DVIDEO_CONTROLLERS_ALEXA_VIDEO_RECORDER=OFF
+#           -DVIDEO_CONTROLLERS_ALEXA_CHANNEL_CONTROLLER=OFF
+#           -DVIDEO_CONTROLLERS_ALEXA_RECORD_CONTROLLER=OFF
+#           -DVIDEO_CONTROLLERS_ALEXA_REMOTE_VIDEO_PLAYER=OFF
+
+# Default is OFF
+option(ENABLE_ALL_VIDEO_CONTROLLERS "Enable all video endpoint controller capabilities" OFF)
+
+# Enable controller capabilities based on the 'ENABLE_ALL_ENDPOINT_CONTROLLERS'
+if(ENABLE_ALL_VIDEO_CONTROLLERS)
+    cmake_dependent_option(VIDEO_CONTROLLERS_ALEXA_LAUNCHER "Enable video endpoint controller Alexa Launcher capability" ON "ENABLE_ALL_VIDEO_CONTROLLERS" OFF)
+    cmake_dependent_option(VIDEO_CONTROLLERS_ALEXA_KEYPAD_CONTROLLER "Enable video endpoint controller Alexa Keypad Controller capability" ON "ENABLE_ALL_VIDEO_CONTROLLERS" OFF)
+    cmake_dependent_option(VIDEO_CONTROLLERS_ALEXA_PLAYBACK_CONTROLLER "Enable video endpoint controller Alexa Playback Controller capability" ON "ENABLE_ALL_VIDEO_CONTROLLERS" OFF)
+    cmake_dependent_option(VIDEO_CONTROLLERS_ALEXA_PLAYBACK_STATE_REPORTER "Enable video endpoint controller Alexa Playback State Reporter capability" ON "ENABLE_ALL_VIDEO_CONTROLLERS" OFF)
+    cmake_dependent_option(VIDEO_CONTROLLERS_ALEXA_SEEK_CONTROLLER "Enable video endpoint controller Alexa Seek Controller capability" ON "ENABLE_ALL_VIDEO_CONTROLLERS" OFF)
+    cmake_dependent_option(VIDEO_CONTROLLERS_ALEXA_VIDEO_RECORDER "Enable video endpoint controller Alexa Video Recorder capability" ON "ENABLE_ALL_VIDEO_CONTROLLERS" OFF)
+    cmake_dependent_option(VIDEO_CONTROLLERS_ALEXA_CHANNEL_CONTROLLER "Enable video endpoint controller Alexa Channel Controller capability" ON "ENABLE_ALL_VIDEO_CONTROLLERS" OFF)
+    cmake_dependent_option(VIDEO_CONTROLLERS_ALEXA_RECORD_CONTROLLER "Enable video endpoint controller Alexa Record Controller capability" ON "ENABLE_ALL_VIDEO_CONTROLLERS" OFF)
+    cmake_dependent_option(VIDEO_CONTROLLERS_ALEXA_REMOTE_VIDEO_PLAYER "Enable video endpoint controller Alexa Remote Video Player capability" ON "ENABLE_ALL_VIDEO_CONTROLLERS" OFF)
+endif()
+
+if(VIDEO_CONTROLLERS_ALEXA_LAUNCHER)
+    message("Creating ${PROJECT_NAME} with Alexa Launcher capability")
+    add_definitions(-DALEXA_LAUNCHER)
+endif()
+
+if(VIDEO_CONTROLLERS_ALEXA_KEYPAD_CONTROLLER)
+    message("Creating ${PROJECT_NAME} with Alexa Keypad Controller capability")
+    add_definitions(-DALEXA_KEYPAD_CONTROLLER)
+endif()
+
+if(VIDEO_CONTROLLERS_ALEXA_PLAYBACK_CONTROLLER)
+    message("Creating ${PROJECT_NAME} with Alexa Playback Controller capability")
+    add_definitions(-DALEXA_PLAYBACK_CONTROLLER)
+endif()
+
+if(VIDEO_CONTROLLERS_ALEXA_PLAYBACK_STATE_REPORTER)
+    if(NOT VIDEO_CONTROLLERS_ALEXA_PLAYBACK_CONTROLLER)
+        message(FATAL_ERROR "Must enable Alexa Playback Controller capability to enable Alexa Playback State Reporter capability")
+    endif()
+    message("Creating ${PROJECT_NAME} with Alexa Playback State Reporter capability")
+    add_definitions(-DALEXA_PLAYBACK_STATE_REPORTER)
+endif()
+
+if(VIDEO_CONTROLLERS_ALEXA_SEEK_CONTROLLER)
+    message("Creating ${PROJECT_NAME} with Alexa Seek Controller capability")
+    add_definitions(-DALEXA_SEEK_CONTROLLER)
+endif()
+
+if(VIDEO_CONTROLLERS_ALEXA_VIDEO_RECORDER)
+    message("Creating ${PROJECT_NAME} with Alexa Video Recorder capability")
+    add_definitions(-DALEXA_VIDEO_RECORDER)
+endif()
+
+if(VIDEO_CONTROLLERS_ALEXA_CHANNEL_CONTROLLER)
+    message("Creating ${PROJECT_NAME} with Alexa Channel Controller capability")
+    add_definitions(-DALEXA_CHANNEL_CONTROLLER)
+endif()
+
+if(VIDEO_CONTROLLERS_ALEXA_RECORD_CONTROLLER)
+    message("Creating ${PROJECT_NAME} with Alexa Record Controller capability")
+    add_definitions(-DALEXA_RECORD_CONTROLLER)
+endif()
+
+if(VIDEO_CONTROLLERS_ALEXA_REMOTE_VIDEO_PLAYER)
+    message("Creating ${PROJECT_NAME} with Alexa Remote Video Player capability")
+    add_definitions(-DALEXA_REMOTE_VIDEO_PLAYER)
+endif()
+
+if(VIDEO_CONTROLLERS_ALEXA_LAUNCHER
+    OR VIDEO_CONTROLLERS_ALEXA_KEYPAD_CONTROLLER
+    OR VIDEO_CONTROLLERS_ALEXA_PLAYBACK_CONTROLLER
+    OR VIDEO_CONTROLLERS_ALEXA_PLAYBACK_STATE_REPORTER
+    OR VIDEO_CONTROLLERS_ALEXA_SEEK_CONTROLLER
+    OR VIDEO_CONTROLLERS_ALEXA_VIDEO_RECORDER
+    OR VIDEO_CONTROLLERS_ALEXA_CHANNEL_CONTROLLER
+    OR VIDEO_CONTROLLERS_ALEXA_RECORD_CONTROLLER
+    OR VIDEO_CONTROLLERS_ALEXA_REMOTE_VIDEO_PLAYER)
+    add_definitions(-DENABLE_VIDEO_CONTROLLERS)
+endif()
diff --git a/cmakeBuild/cmake/InputController.cmake b/cmakeBuild/cmake/InputController.cmake
deleted file mode 100644
index f6dc915325..0000000000
--- a/cmakeBuild/cmake/InputController.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Setup the InputController compiler options.
-#
-# To build with InputController capabilities, specify:
-# cmake <path-to-source> -DINPUT_CONTROLLER=ON
-
-option(INPUT_CONTROLLER "Enable the Input Controller functionality" OFF)
-
-if(INPUT_CONTROLLER)
-    message("Enabling InputController CapabilityAgent")
-    add_definitions(-DENABLE_INPUT_CONTROLLER)
-endif()
diff --git a/cmakeBuild/cmake/KeywordDetector.cmake b/cmakeBuild/cmake/KeywordDetector.cmake
index bbb7ee540b..58cdf823fa 100644
--- a/cmakeBuild/cmake/KeywordDetector.cmake
+++ b/cmakeBuild/cmake/KeywordDetector.cmake
@@ -2,7 +2,7 @@
 # Setup the Keyword Detector type and compiler options.
 #
 # To build with a Keyword Detector, run the following command with a keyword detector type of AMAZON_KEY_WORD_DETECTOR,
-# AMAZONLITE_KEY_WORD_DETECTOR, or SENSORY_KEY_WORD_DETECTOR:
+# AMAZONLITE_KEY_WORD_DETECTOR:
 #     cmake <path-to-source>
 #       -DAMAZON_KEY_WORD_DETECTOR=ON
 #           -DAMAZON_KEY_WORD_DETECTOR_LIB_PATH=<path-to-amazon-lib>
@@ -12,9 +12,6 @@
 #           -DAMAZONLITE_KEY_WORD_DETECTOR_INCLUDE_DIR=<path-to-amazon-include-dir>
 #           -DAMAZONLITE_KEY_WORD_DETECTOR_DYNAMIC_MODEL_LOADING=<ON_OR_OFF>
 #           -DAMAZONLITE_KEY_WORD_DETECTOR_MODEL_CPP_PATH=<path-to-model-cpp-file-if-dynamic-model-loading-disabled>
-#       -DSENSORY_KEY_WORD_DETECTOR=ON
-#           -DSENSORY_KEY_WORD_DETECTOR_LIB_PATH=<path-to-sensory-lib>
-#           -DSENSORY_KEY_WORD_DETECTOR_INCLUDE_DIR=<path-to-sensory-include-dir>
 #
 
 option(AMAZON_KEY_WORD_DETECTOR "Enable Amazon keyword detector." OFF)
@@ -33,13 +30,7 @@ mark_as_dependent(AMAZONLITE_KEY_WORD_DETECTOR_MODEL_CPP_PATH AMAZONLITE_KEY_WOR
 mark_as_dependent(AMAZONLITE_KEY_WORD_DETECTOR_LIB_PATH AMAZONLITE_KEY_WORD_DETECTOR)
 mark_as_dependent(AMAZONLITE_KEY_WORD_DETECTOR_INCLUDE_DIR AMAZONLITE_KEY_WORD_DETECTOR)
 
-option(SENSORY_KEY_WORD_DETECTOR "Enable Sensory keyword detector." OFF)
-set(SENSORY_KEY_WORD_DETECTOR_LIB_PATH "" CACHE FILEPATH "Sensory keyword detector library path.")
-set(SENSORY_KEY_WORD_DETECTOR_INCLUDE_DIR "" CACHE PATH "Sensory keyword detector include dir.")
-mark_as_dependent(SENSORY_KEY_WORD_DETECTOR_LIB_PATH SENSORY_KEY_WORD_DETECTOR)
-mark_as_dependent(SENSORY_KEY_WORD_DETECTOR_INCLUDE_DIR SENSORY_KEY_WORD_DETECTOR)
-
-if(NOT AMAZON_KEY_WORD_DETECTOR AND NOT AMAZONLITE_KEY_WORD_DETECTOR AND NOT SENSORY_KEY_WORD_DETECTOR)
+if(NOT AMAZON_KEY_WORD_DETECTOR AND NOT AMAZONLITE_KEY_WORD_DETECTOR)
     message("No keyword detector type specified, skipping build of keyword detector.")
     return()
 endif()
@@ -69,20 +60,3 @@ if(AMAZONLITE_KEY_WORD_DETECTOR)
     add_definitions(-DKWD_AMAZONLITE)
     set(KWD ON)
 endif()
-
-if(SENSORY_KEY_WORD_DETECTOR)
-    message("Creating ${PROJECT_NAME} with keyword detector type: Sensory")
-    if(NOT SENSORY_KEY_WORD_DETECTOR_LIB_PATH)
-        message(FATAL_ERROR "Must pass library path of Sensory KeywordDetector!")
-    endif()
-    if(NOT SENSORY_KEY_WORD_DETECTOR_INCLUDE_DIR)
-        message(FATAL_ERROR "Must pass include dir path of Sensory KeywordDetector!")
-    endif()
-    add_definitions(-DKWD)
-    add_definitions(-DKWD_SENSORY)
-    set(KWD ON)
-
-    # If Sensory KWD Enabled Add SensoryAdapter to extension paths to include with project.
-    set(EXTENSION_PATHS "${PROJECT_SOURCE_DIR}/applications/acsdkSensoryAdapter;${EXTENSION_PATHS}" CACHE STRING
-        "Adding SensoryAdapter to the ExtensionPaths" FORCE)
-endif()
diff --git a/cmakeBuild/cmake/Logger.cmake b/cmakeBuild/cmake/Logger.cmake
index a41ce98e2b..086482b525 100644
--- a/cmakeBuild/cmake/Logger.cmake
+++ b/cmakeBuild/cmake/Logger.cmake
@@ -13,10 +13,16 @@
 #     -DACSDK_EMIT_SENSITIVE_LOGS=ON
 # Note that this option is only honored in DEBUG builds.
 #
+# Older Android releases redefine __func__ as __PRETTY_FUNCTION__, which produces unnecessarily large output logs.
+# Logger.h now undefines this macro unless ACSDK_LOGS_KEEP_FUNC_MACRO is set to OFF. To keep the macro definition
+# intact, include the following option on the cmake command line:
+#     -DACSDK_LOGS_KEEP_FUNC_MACRO=ON
+#
 
 option(ACSDK_LOG "Enabled logging within the SDK" OFF)
 option(ACSDK_DEBUG_LOG "Enables logging of DEBUG level logs" OFF)
 option(ACSDK_EMIT_SENSITIVE_LOGS "Enable Logging of sensitive information." OFF)
+option(ACSDK_LOGS_KEEP_FUNC_MACRO "Keep __func__ macro if defined." OFF)
 
 if (ACSDK_EMIT_SENSITIVE_LOGS)
     string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE_UPPER)
@@ -48,3 +54,7 @@ if (ACSDK_DEBUG_LOG)
         message("WARNING: Logging of debug logging enabled")
     endif()
 endif()
+
+if (ACSDK_LOGS_KEEP_FUNC_MACRO)
+    add_definitions(-DACSDK_LOGS_KEEP_FUNC_MACRO)
+endif()
diff --git a/cmakeBuild/cmake/Opus.cmake b/cmakeBuild/cmake/Opus.cmake
new file mode 100644
index 0000000000..cd27d5f5ff
--- /dev/null
+++ b/cmakeBuild/cmake/Opus.cmake
@@ -0,0 +1,28 @@
+#
+# Setup the OPUS compiler options.
+#
+# To build with OPUS support, include the following option on the cmake command line.
+#     cmake <path-to-source>
+#       -DOPUS=ON
+#
+
+option(OPUS "Enable OPUS encoding." OFF)
+
+if (OPUS)
+    find_path(OPUS_INCLUDE_DIR opus)
+    find_library(OPUS_LIBRARY opus)
+    if(NOT OPUS_LIBRARY)
+        message(FATAL_ERROR "Cannot find libopus")
+    endif()
+    if (NOT EXISTS "${OPUS_INCLUDE_DIR}/opus/opus.h")
+        message(FATAL_ERROR "Cannot find opus.h")
+    endif()
+    set(OPUS_INCLUDE_DIR ${OPUS_INCLUDE_DIR}/opus)
+
+    message(STATUS "OPUS audio encoder is enabled")
+
+    message(STATUS "\tLibrary Path: ${OPUS_LIBRARY}")
+    message(STATUS "\tInclude Path: ${OPUS_INCLUDE_DIR}/")
+else()
+    message(STATUS "OPUS audio encoder is disabled")
+endif()
diff --git a/cmakeBuild/cmake/PKCS11.cmake b/cmakeBuild/cmake/PKCS11.cmake
index dafe20d241..d71057bae7 100644
--- a/cmakeBuild/cmake/PKCS11.cmake
+++ b/cmakeBuild/cmake/PKCS11.cmake
@@ -20,7 +20,7 @@ endif()
 
 # acsdkPkcs11 requires an absolute path to PKCS11 library. We use stubs in unit tests by default, and the default
 # library location corresponds to project directory, but the location can be overridden.
-set(PKCS11_TEST_LIBRARY_DIR "${PROJECT_BINARY_DIR}/core/Crypto/acsdkPkcs11/testStubs/")
+set(PKCS11_TEST_LIBRARY_DIR "${PROJECT_BINARY_DIR}/core/Crypto/Pkcs11/testStubs/")
 if (WIN32 AND NOT "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" STREQUAL "")
     set(PKCS11_TEST_LIBRARY_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 elseif(NOT WIN32 AND NOT "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" STREQUAL "")
diff --git a/cmakeBuild/cmake/Platforms.cmake b/cmakeBuild/cmake/Platforms.cmake
index df379c20fc..a621c69e53 100644
--- a/cmakeBuild/cmake/Platforms.cmake
+++ b/cmakeBuild/cmake/Platforms.cmake
@@ -19,3 +19,8 @@ if (WIN32)
     # in the same directory or add them to the path variable.
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 endif()
+
+# Some Linux distributions don't automatically link libatomic
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    link_libraries(atomic)
+endif()
diff --git a/cmakeBuild/cmake/PrepareInstall.cmake b/cmakeBuild/cmake/PrepareInstall.cmake
index bd829fd21f..e54202a6ff 100644
--- a/cmakeBuild/cmake/PrepareInstall.cmake
+++ b/cmakeBuild/cmake/PrepareInstall.cmake
@@ -18,6 +18,13 @@ function(asdk_install)
     install(DIRECTORY "${PROJECT_SOURCE_DIR}/include" DESTINATION "${ASDK_INCLUDE_INSTALL_DIR}")
 endfunction()
 
+# Function to install the sample target
+function(asdk_sample_install)
+    if (INSTALL_COMMON_SAMPLE_LIBS)
+        asdk_install()
+    endif()
+endfunction()
+
 # Function to install an interface library
 function(asdk_install_interface)
     install(DIRECTORY include DESTINATION "${ASDK_INCLUDE_INSTALL_DIR}")
diff --git a/cmakeBuild/cmake/SampleApplications.cmake b/cmakeBuild/cmake/SampleApplications.cmake
new file mode 100644
index 0000000000..7d17a08948
--- /dev/null
+++ b/cmakeBuild/cmake/SampleApplications.cmake
@@ -0,0 +1,9 @@
+#
+# Configure sample applications and libraries.
+#
+# By default, common libraries for sample applications are not installed. To enable installation of common libraries,
+# add INSTALL_COMMON_SAMPLE_LIBS to cmake:
+#     cmake <path-to-source> -DINSTALL_COMMON_SAMPLE_LIBS=ON
+#
+
+option(INSTALL_COMMON_SAMPLE_LIBS "Install common libraries for sample applications" OFF)
diff --git a/cmakeBuild/cmake/SpeechEncoder.cmake b/cmakeBuild/cmake/SpeechEncoder.cmake
deleted file mode 100644
index 6ba81899d3..0000000000
--- a/cmakeBuild/cmake/SpeechEncoder.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Setup the OPUS compiler options.
-#
-# To build with OPUS support, include the following option on the cmake command line.
-#     cmake <path-to-source>
-#       -OPUS=ON
-#
-
-option(OPUS "Enable OPUS encoding." OFF)
-
-if(OPUS)
-    message("Creating ${PROJECT_NAME} with OPUS encoding")
-    add_definitions(-DENABLE_OPUS)
-endif()
diff --git a/core/AudioEncoder/AudioEncoder/CMakeLists.txt b/core/AudioEncoder/AudioEncoder/CMakeLists.txt
new file mode 100644
index 0000000000..7847c90121
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoder/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAudioEncoder LANGUAGES CXX)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/core/AudioEncoder/AudioEncoder/include/acsdk/AudioEncoder/AudioEncoderFactory.h b/core/AudioEncoder/AudioEncoder/include/acsdk/AudioEncoder/AudioEncoderFactory.h
new file mode 100644
index 0000000000..a5df789ad8
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoder/include/acsdk/AudioEncoder/AudioEncoderFactory.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_AUDIOENCODER_AUDIOENCODERFACTORY_H_
+#define ACSDK_AUDIOENCODER_AUDIOENCODERFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/AudioEncoderInterfaces/AudioEncoderInterface.h>
+#include <acsdk/AudioEncoderInterfaces/BlockAudioEncoderInterface.h>
+#include <acsdk/AudioEncoder/AudioEncoderParams.h>
+
+namespace alexaClientSDK {
+namespace audioEncoder {
+
+/**
+ * @brief Create audio encoder with default parameters.
+ *
+ * Method creates a new instance of audio encoder with default parameters.
+ *
+ * By default, audio encoder uses 10 milliseconds for read timeout, 100 milliseconds for write timeout, and 1000
+ * milliseconds for stop timeout. The output stream will buffer up to 20 packets in the output stream and will allow
+ * up to 10 readers.
+ *
+ * @param[in] blockAudioEncoder   The backend encoder implementation. This parameter must not be nullptr.
+ *
+ * @return New instance of audio encoder or nullptr on error.
+ *
+ * @see createAudioEncoderWithParams()
+ * @see AudioEncoderParams
+ */
+std::unique_ptr<audioEncoderInterfaces::AudioEncoderInterface> createAudioEncoder(
+    const std::shared_ptr<audioEncoderInterfaces::BlockAudioEncoderInterface>& blockAudioEncoder);
+
+/**
+ * @brief Create audio encoder with given parameters.
+ *
+ * @param[in] blockAudioEncoder   The backend encoder implementation. This parameter must not be nullptr.
+ * @param[in] params              Encoder parameters.
+ *
+ * @return New instance of audio encoder or nullptr on error.
+ *
+ * @see createAudioEncoder()
+ */
+std::unique_ptr<audioEncoderInterfaces::AudioEncoderInterface> createAudioEncoderWithParams(
+    const std::shared_ptr<audioEncoderInterfaces::BlockAudioEncoderInterface>& blockAudioEncoder,
+    const AudioEncoderParams& params);
+
+}  // namespace audioEncoder
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_AUDIOENCODER_AUDIOENCODERFACTORY_H_
diff --git a/core/AudioEncoder/AudioEncoder/include/acsdk/AudioEncoder/AudioEncoderParams.h b/core/AudioEncoder/AudioEncoder/include/acsdk/AudioEncoder/AudioEncoderParams.h
new file mode 100644
index 0000000000..0d039aff54
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoder/include/acsdk/AudioEncoder/AudioEncoderParams.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_AUDIOENCODER_AUDIOENCODERPARAMS_H_
+#define ACSDK_AUDIOENCODER_AUDIOENCODERPARAMS_H_
+
+#include <chrono>
+#include <cstddef>
+
+namespace alexaClientSDK {
+namespace audioEncoder {
+
+/**
+ * @brief Audio encoder parameters.
+ *
+ * These parameters affect performance and memory consumption by audio encoder.
+ *
+ * @see #createAudioEncoder()
+ */
+struct AudioEncoderParams {
+    /**
+     * @brief Reading timeout from input audio stream.
+     *
+     * Read timeout control how frequently audio encoder checks for stop signal while reading frame.
+     */
+    std::chrono::milliseconds readTimeoutMs;
+
+    /**
+     * @brief Timeout between write retrying.
+     *
+     * Write timeout control how frequently audio encoder checks for stop signal while writing encoded frame.
+     */
+    std::chrono::milliseconds writeTimeoutMs;
+
+    /**
+     * @brief Timeout for graceful stop operation.
+     *
+     * This timeout controls for how long the audio encoder tries to stop operation gracefully. Audio encoder will
+     * abort operation after timeout elapses.
+     */
+    std::chrono::milliseconds stopTimeoutMs;
+
+    /**
+     * @brief The maximum number of readers of the output stream.
+     *
+     * Audio encoder constructs the output stream and it needs to know how many readers will consume the data.
+     */
+    std::size_t maxOutputStreamReaders;
+
+    /**
+     * @brief The maximum number of packets to be buffered to the output stream.
+     *
+     * Audio encoder constructs the output stream and it needs to know how much data to buffer.
+     */
+    std::size_t maxOutputStreamBufferedPackets;
+
+// GCC 4.x and 5.x reached end of support before some of c++11 amendments were made. In particular, these compilers
+// do not have default constructors for list initialization from aggregates. This issue has been addressed in GCC 6.x.
+// http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 6)
+    /**
+     * Copy constructor.
+     *
+     * This constructor is required only for GCC before version 6.x.
+     *
+     * @param[in] params Source parameters.
+     *
+     * @see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+     */
+    AudioEncoderParams(const AudioEncoderParams& params);
+
+    /**
+     * Explicit constructor with parameters.
+     *
+     * This constructor is required only for GCC before version 6.x.
+     *
+     * @param[in] readTimeoutMs                  Reading timeout from input audio stream.
+     * @param[in] writeTimeoutMs                 Timeout between write retrying.
+     * @param[in] stopTimeoutMs                  Timeout for graceful stop operation.
+     * @param[in] maxOutputStreamReaders         The maximum number of readers of the output stream.
+     * @param[in] maxOutputStreamBufferedPackets The maximum number of packets to be buffered to the output stream.
+     *
+     * @see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+     */
+    AudioEncoderParams(
+        std::chrono::milliseconds readTimeoutMs,
+        std::chrono::milliseconds writeTimeoutMs,
+        std::chrono::milliseconds stopTimeoutMs,
+        std::size_t maxOutputStreamReaders,
+        std::size_t maxOutputStreamBufferedPackets);
+#endif
+};
+
+}  // namespace audioEncoder
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_AUDIOENCODER_AUDIOENCODERPARAMS_H_
diff --git a/core/AudioEncoder/AudioEncoder/privateInclude/acsdk/AudioEncoder/private/AudioEncoder.h b/core/AudioEncoder/AudioEncoder/privateInclude/acsdk/AudioEncoder/private/AudioEncoder.h
new file mode 100644
index 0000000000..5cce49086e
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoder/privateInclude/acsdk/AudioEncoder/private/AudioEncoder.h
@@ -0,0 +1,265 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_AUDIOENCODER_PRIVATE_AUDIOENCODER_H_
+#define ACSDK_AUDIOENCODER_PRIVATE_AUDIOENCODER_H_
+
+#include <atomic>
+#include <memory>
+#include <thread>
+
+#include <AVSCommon/AVS/AudioInputStream.h>
+#include <AVSCommon/Utils/AudioFormat.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+#include <acsdk/AudioEncoderInterfaces/AudioEncoderInterface.h>
+#include <acsdk/AudioEncoderInterfaces/BlockAudioEncoderInterface.h>
+#include <acsdk/AudioEncoder/AudioEncoderParams.h>
+#include <acsdk/AudioEncoder/private/AudioEncoderState.h>
+
+namespace alexaClientSDK {
+namespace audioEncoder {
+
+/**
+ * @brief Audio encoder for @c AudioInputStream.
+ *
+ * This class provides generic interface between backend encoder implementation and the application who wants to encode
+ * audio stream within @c AudioInputStream.
+ */
+class AudioEncoder : public audioEncoderInterfaces::AudioEncoderInterface {
+public:
+    /**
+     * Constructor.
+     *
+     * @param[in] blockAudioEncoder The backend encoder implementation.
+     * @param[in] params            Encoder parameters.
+     */
+    AudioEncoder(
+        const std::shared_ptr<audioEncoderInterfaces::BlockAudioEncoderInterface>& blockAudioEncoder,
+        const AudioEncoderParams& params);
+
+    /**
+     * Destructor.
+     */
+    ~AudioEncoder();
+
+    /// @name Methods from @c AudioEncoderInterface.
+    /// @{
+    std::shared_ptr<avsCommon::avs::AudioInputStream> startEncoding(
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& inputStream,
+        avsCommon::utils::AudioFormat inputFormat,
+        avsCommon::avs::AudioInputStream::Index begin,
+        avsCommon::avs::AudioInputStream::Reader::Reference reference) override;
+    void stopEncoding(bool stopImmediately = false) override;
+    avsCommon::utils::AudioFormat::Encoding getEncoding() override;
+    std::string getAVSFormatName() override;
+    /// @}
+
+private:
+    /**
+     * @brief Clock to use.
+     *
+     * The implementation uses monotonic clock to detect stop timeouts.
+     */
+    using Clock = std::chrono::steady_clock;
+
+    /**
+     * @brief Byte buffer data type.
+     */
+    using Bytes = audioEncoderInterfaces::BlockAudioEncoderInterface::Bytes;
+
+    /**
+     * Thread loop
+     */
+    void encodeLoop(
+        avsCommon::avs::AudioInputStream::Index begin,
+        avsCommon::avs::AudioInputStream::Reader::Reference reference);
+
+    /**
+     * @brief Check if encoding is permitted to start next frame processing.
+     *
+     * Encoder is allowed to continue if #stopEncoding() has not been called.
+     *
+     * @return True if encoder can continue processing, or false if it must stop.
+     *
+     * @see #mayContinueEncoding()
+     */
+    bool mayProcessNextFrame();
+
+    /**
+     * @brief Check if encoding is permitted to continue.
+     *
+     * Encoder is allowed to continue if #stopEncoding() has not been called, or #stopEncoding() has been called with
+     * @a stopImmediately flag set to false and stop timeout has not yet elapsed.
+     *
+     * @return True if encoder can continue processing, or false if it must stop.
+     *
+     * @see #mayProcessNextFrame()
+     * @see #mayFinishEncoding()
+     */
+    bool mayContinueEncoding();
+
+    /**
+     * @brief Check if encoding is permitted to finish.
+     *
+     * Encoder is allowed to finish (flush the data) if #stopEncoding() has not been called, or #stopEncoding() has been
+     * called with @a stopImmediately flag set to false and stop timeout has not yet elapsed, and if there has been no
+     * error.
+     *
+     * @return True if encoder can finish processing, or false if it must stop.
+     */
+    bool mayFinishEncoding();
+
+    /**
+     * @brief Check if encoder needs to read more data from input stream.
+     *
+     * If @a m_encoder requires full frame for processing, this method checks if the amount of data accumulated in
+     * @a m_inputBuffer equal to frame size. If @a m_encoder doesn't require full frame, this method checks if @a
+     * m_inputBuffer has at least one word.
+     *
+     * @return True if there is not enough data to invoke audio encoder. False if there is enough data for audio
+     *         encoding.
+     */
+    bool needReadMoreWordsFromInput();
+
+    /**
+     * @brief Read audio data from input stream.
+     *
+     * This method reads audio data from input stream until there is enough data for audio encoding, or until there is
+     * no more data, or an error occurred.
+     *
+     * @return True if there is enough data for audio encoding, False if end of stream has been reached, or error
+     *         occurred.
+     *
+     * @see #encodeWordsIntoOutput()
+     */
+    bool readWordsFromInput();
+
+    /**
+     * @brief Encode buffered data.
+     *
+     * This method encodes data from @a m_inputBuffer into @a m_outputBuffer. The method appends encoded data into
+     * m_outputBuffer, as it may have incomplete word left from a previous write operation.
+     *
+     * @return True if data has been encoded, false if operation has been terminated or there is an error.
+     *
+     * @see #readWordsFromInput()
+     * @see #writeEncodedWordsFromOutput()
+     */
+    bool encodeWordsIntoOutput();
+
+    /**
+     * @brief Write encoded data into output stream.
+     *
+     * This method writes encoded data from @a m_outputBuffer into @a m_outputStream. Because output buffer may contain
+     * incomplete words, it is possible that some bytes are left in output buffer after write succeeds. These bytes are
+     * moved into output buffer's heads.
+     *
+     * Because output stream may not be able to accept all data at once, this method repeats writes until all complete
+     * words are written, or encoding operation has been terminated, or there is an error.
+     *
+     * @return True if operation succeeds, False if operation fails or has been terminated.
+     */
+    bool writeEncodedWordsFromOutput();
+
+    /**
+     * @brief Complete encoding operation.
+     *
+     * This method updates object state and notifies any blocked threads that encoding was completed or stopped.
+     *
+     * This method doesn't reset @a m_outputStream, as it must be accessible after the encoding operation completion.
+     */
+    void completeEncodingAndNotifyWaiters();
+
+    /**
+     * @brief Change the encoder state to error.
+     *
+     * The method updates the encoder state to indicate the error has encountered and the encoding shall stop.
+     */
+    void setErrorState();
+
+    /// Backend implementation
+    const std::shared_ptr<audioEncoderInterfaces::BlockAudioEncoderInterface> m_encoder;
+
+    /// Encoder parameters.
+    const AudioEncoderParams m_params;
+
+    /// Mutex to control object state
+    std::mutex m_mutex;
+
+    /// Internal Executor for managing encoding thread
+    avsCommon::utils::threading::Executor m_executor;
+
+    /// Flag if @a m_encoder requires full frame for encoding.
+    bool m_requireFullFrameSize;
+
+    /// Maximum single encoded frame size (words) initialized from EncoderContext
+    size_t m_maxInputFrameSizeWords;
+
+    /// Maximum output frame size (bytes) initialized from EncoderContext
+    size_t m_maxOutputFrameSizeBytes;
+
+    /// Encoder word size in bytes initialized from EncoderContext
+    std::size_t m_outputWordSizeBytes;
+
+    /// Output stream buffer size in bytes
+    std::size_t m_outputBufferSizeBytes;
+
+    /// Condition variable for notifications to blocked threads
+    std::condition_variable m_cond;
+
+    /// Current encoder state. Access to this variable must be synchronized
+    std::atomic<AudioEncoderState> m_state;
+
+    /// Data input stream. Access to this variable must be synchronized
+    /// Audio input stream (PCM frames).
+    std::shared_ptr<avsCommon::avs::AudioInputStream> m_inputStream;
+
+    /// Reader for @a #m_inputStream.
+    std::unique_ptr<avsCommon::avs::AudioInputStream::Reader> m_inputStreamReader;
+
+    /// Data output stream. Access to this variable must be synchronized
+    std::shared_ptr<avsCommon::avs::AudioInputStream> m_outputStream;
+
+    /// Writer for @a #m_outputStream.
+    std::unique_ptr<avsCommon::avs::AudioInputStream::Writer> m_outputStreamWriter;
+
+    /// Input word size in bytes initialized from input stream.
+    std::size_t m_inputWordSizeBytes;
+
+    /// @brief Buffer for reading data from input stream.
+    ///
+    /// This buffer must be sufficient to hold
+    Bytes m_inputBuffer;
+
+    /// @brief Number of words in @a m_inputBuffer.
+    std::size_t m_wordsInInputBuffer;
+
+    /// @brief Buffer for holding encoded data before writing it to output stream.
+    ///
+    /// This buffer TBD
+    // we need to allocate extra space for output buffer, because encoder produces result in bytes, not words, while
+    // writer writes results in words. this may lead to situation when there are few bytes left in buffer, and the
+    // buffer still has to store full encoding result.
+    Bytes m_outputBuffer;
+
+    /// @brief Timeout time point when executing graceful stop.
+    Clock::time_point m_timeoutTimePoint;
+};
+
+}  // namespace audioEncoder
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_AUDIOENCODER_PRIVATE_AUDIOENCODER_H_
diff --git a/core/AudioEncoder/AudioEncoder/privateInclude/acsdk/AudioEncoder/private/AudioEncoderState.h b/core/AudioEncoder/AudioEncoder/privateInclude/acsdk/AudioEncoder/private/AudioEncoderState.h
new file mode 100644
index 0000000000..46873047d7
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoder/privateInclude/acsdk/AudioEncoder/private/AudioEncoderState.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_AUDIOENCODER_PRIVATE_AUDIOENCODERSTATE_H_
+#define ACSDK_AUDIOENCODER_PRIVATE_AUDIOENCODERSTATE_H_
+
+#include <ostream>
+
+namespace alexaClientSDK {
+namespace audioEncoder {
+
+/**
+ * @brief Encoder states.
+ */
+enum class AudioEncoderState {
+    /// Encoder is idle and can start encoding.
+    IDLE,
+    /// Encoder is encoding and can be stopped.
+    ENCODING,
+    /// Encoder has encountered an error.
+    ENCODING_ERROR,
+    /// Encoder is encoding and stop is requested.
+    /// Encoder should finish current frame processing within the configured timeout.
+    STOPPING,
+    /// Encoder is encoding and immediate stop is requested.
+    ABORTING
+};
+
+std::ostream& operator<<(std::ostream& out, AudioEncoderState state);
+
+}  // namespace audioEncoder
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_AUDIOENCODER_PRIVATE_AUDIOENCODERSTATE_H_
diff --git a/core/AudioEncoder/AudioEncoder/src/AudioEncoder.cpp b/core/AudioEncoder/AudioEncoder/src/AudioEncoder.cpp
new file mode 100644
index 0000000000..8d20c04eb1
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoder/src/AudioEncoder.cpp
@@ -0,0 +1,416 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <iostream>
+#include <climits>
+#include <fstream>
+
+#include <acsdk/AudioEncoder/private/AudioEncoder.h>
+#include <AVSCommon/Utils/Error/FinallyGuard.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace audioEncoder {
+
+using namespace avsCommon;
+using namespace avsCommon::avs;
+using namespace avsCommon::utils;
+using namespace avsCommon::utils::error;
+using namespace audioEncoderInterfaces;
+
+/// String to identify log entries originating from this file.
+#define TAG "AudioEncoder"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+AudioEncoder::AudioEncoder(
+    const std::shared_ptr<BlockAudioEncoderInterface>& encoder,
+    const AudioEncoderParams& params) :
+        m_encoder{encoder},
+        m_params{params},
+        m_executor{},
+        m_state{AudioEncoderState::IDLE},
+        m_wordsInInputBuffer{0} {
+    m_timeoutTimePoint = Clock::time_point();
+}
+
+AudioEncoder::~AudioEncoder() {
+    stopEncoding(true);
+    m_executor.waitForSubmittedTasks();
+    m_executor.shutdown();
+}
+
+std::shared_ptr<AudioInputStream> AudioEncoder::startEncoding(
+    const std::shared_ptr<AudioInputStream>& inputStream,
+    AudioFormat inputFormat,
+    AudioInputStream::Index begin,
+    AudioInputStream::Reader::Reference reference) {
+    if (!inputStream) {
+        ACSDK_ERROR(LX("startEncodingFailed").d("reason", "inputStreamNull"));
+        return nullptr;
+    }
+
+    std::lock_guard<std::mutex> lock(m_mutex);
+
+    if (AudioEncoderState::IDLE != m_state) {
+        ACSDK_ERROR(LX("startEncodingFailed").d("state", m_state));
+        return nullptr;
+    }
+
+    if (!m_encoder->init(inputFormat)) {
+        ACSDK_ERROR(LX("startEncodingFailed").d("reason", "Encoder init failed"));
+        return nullptr;
+    }
+
+    bool success = false;
+    FinallyGuard errorCleanup{[&] {
+        // cppcheck-suppress knownConditionTrueFalse
+        if (!success) {
+            m_inputStream.reset();
+            m_outputStream.reset();
+            m_state = AudioEncoderState::IDLE;
+        }
+    }};
+
+    m_requireFullFrameSize = m_encoder->requiresFullyRead();
+    m_maxInputFrameSizeWords = m_encoder->getInputFrameSize();
+    m_maxOutputFrameSizeBytes = m_encoder->getOutputFrameSize();
+    m_outputWordSizeBytes = m_encoder->getAudioFormat().sampleSizeInBits / CHAR_BIT;
+    m_outputBufferSizeBytes = AudioInputStream::calculateBufferSize(
+        m_maxOutputFrameSizeBytes * m_params.maxOutputStreamBufferedPackets,
+        m_outputWordSizeBytes,
+        m_params.maxOutputStreamReaders);
+
+    m_state = AudioEncoderState::ENCODING;
+    m_inputStream = inputStream;
+    m_inputWordSizeBytes = inputStream->getWordSize();
+    m_wordsInInputBuffer = 0;
+    m_inputBuffer.resize(m_maxInputFrameSizeWords * m_inputWordSizeBytes);
+    m_outputBuffer.clear();
+    m_outputBuffer.reserve(m_maxOutputFrameSizeBytes + m_outputWordSizeBytes);
+
+    auto buffer = std::make_shared<AudioInputStream::Buffer>(m_outputBufferSizeBytes);
+    m_outputStream = AudioInputStream::create(buffer, m_outputWordSizeBytes, m_params.maxOutputStreamReaders);
+    if (!m_outputStream) {
+        ACSDK_ERROR(LX("startEncodingFailed").d("reason", "AudioInputStream creation failed"));
+        return nullptr;
+    }
+
+    auto result = m_outputStream;
+
+    ACSDK_DEBUG0(LX("startEncoding").d("begin", begin));
+    m_executor.execute([this, begin, reference]() { encodeLoop(begin, reference); });
+
+    success = true;
+    return result;
+}
+
+void AudioEncoder::stopEncoding(bool stopImmediately) {
+    ACSDK_DEBUG0(LX("stopEncoding").d("stopImmediately", stopImmediately));
+#ifdef ACSDK_DEBUG_LOG_ENABLED
+    const auto start = Clock::now();
+#else
+    // This variable is not used when debug logging is disabled, but we need it for logging macro evaluation.
+    Clock::time_point start;
+#endif
+    std::unique_lock<std::mutex> lock(m_mutex);
+
+    ACSDK_DEBUG7(LX("stopEncoding").d("state", m_state));
+
+    if (AudioEncoderState::ENCODING == m_state || AudioEncoderState::STOPPING == m_state) {
+        if (stopImmediately) {
+            m_state = AudioEncoderState::ABORTING;
+        } else {
+            m_state = AudioEncoderState::STOPPING;
+            m_timeoutTimePoint = Clock::now() + m_params.stopTimeoutMs;
+        }
+        m_cond.wait(lock, [this] { return AudioEncoderState::IDLE == m_state; });
+    }
+
+    ACSDK_DEBUG7(LX("stopEncodingSuccess")
+                     .d("time", std::chrono::duration_cast<std::chrono::milliseconds>(Clock::now() - start).count()));
+}
+
+AudioFormat::Encoding AudioEncoder::getEncoding() {
+    return m_encoder->getAudioFormat().encoding;
+}
+
+std::string AudioEncoder::getAVSFormatName() {
+    return m_encoder->getAVSFormatName();
+}
+
+void AudioEncoder::encodeLoop(AudioInputStream::Index begin, AudioInputStream::Reader::Reference reference) {
+    ACSDK_DEBUG5(LX("encodeLoopStarted"));
+
+    // When we return, the state is IDLE
+    FinallyGuard markCompleted{[this] { completeEncodingAndNotifyWaiters(); }};
+
+    // Prepare reader
+    m_inputStreamReader = m_inputStream->createReader(AudioInputStream::Reader::Policy::BLOCKING);
+    if (!m_inputStreamReader) {
+        ACSDK_ERROR(LX("encodeLoopError").d("reason", "createReaderFailed"));
+        return;
+    }
+    // Close and release reader on return
+    FinallyGuard readerClose{[this] { m_inputStreamReader->close(); }};
+    if (!m_inputStreamReader->seek(begin, reference)) {
+        ACSDK_ERROR(LX("encodeLoopError").d("reason", "readerSeekFailed"));
+        return;
+    }
+
+    // Prepare writer
+    m_outputStreamWriter = m_outputStream->createWriter(AudioInputStream::Writer::Policy::BLOCKING);
+    if (!m_outputStreamWriter) {
+        ACSDK_ERROR(LX("encodeLoopError").d("reason", "createWriterFailed"));
+        return;
+    }
+    // Close writer and release on return
+    FinallyGuard writerClose{[this]() { m_outputStreamWriter->close(); }};
+
+    // Prepare encoder
+    if (!m_encoder->start(m_outputBuffer)) {
+        ACSDK_ERROR(LX("encodeLoopError").d("reason", "encoderStartFailed"));
+        return;
+    }
+    // Stop encoder on return
+    FinallyGuard encoderClose{[this] { m_encoder->close(); }};
+
+    if (!writeEncodedWordsFromOutput()) {
+        ACSDK_DEBUG0(LX("encodeLoopError").d("reason", "failedToWritePrologue"));
+        return;
+    }
+
+    while (readWordsFromInput() && encodeWordsIntoOutput() && writeEncodedWordsFromOutput())
+        ;
+
+    if (mayFinishEncoding()) {
+        if (m_encoder->flush(m_outputBuffer)) {
+            writeEncodedWordsFromOutput();
+        }
+    }
+}
+
+void AudioEncoder::completeEncodingAndNotifyWaiters() {
+    {
+        std::unique_lock<std::mutex> lock{m_mutex};
+        m_state = AudioEncoderState::IDLE;
+        m_inputStream.reset();
+        m_inputStreamReader.reset();
+        m_outputStreamWriter.reset();
+        m_timeoutTimePoint = Clock::time_point{};
+        m_wordsInInputBuffer = 0;
+        m_inputBuffer.clear();
+        m_outputBuffer.clear();
+        m_cond.notify_all();
+    }
+
+    ACSDK_DEBUG5(LX("encodeLoopFinished"));
+}
+
+void AudioEncoder::setErrorState() {
+    std::unique_lock<std::mutex> lock{m_mutex};
+    m_state = AudioEncoderState::ENCODING_ERROR;
+}
+
+bool AudioEncoder::needReadMoreWordsFromInput() {
+    if (m_requireFullFrameSize) {
+        return m_wordsInInputBuffer < m_maxInputFrameSizeWords;
+    } else {
+        return !m_wordsInInputBuffer;
+    }
+}
+
+bool AudioEncoder::mayProcessNextFrame() {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    switch (m_state.load()) {
+        case AudioEncoderState::ENCODING:
+            return true;
+        case AudioEncoderState::STOPPING:
+        case AudioEncoderState::ABORTING:
+            ACSDK_DEBUG7(LX("mayProcessNextFrame").m("stopOrAbort"));
+            return false;
+        case AudioEncoderState::ENCODING_ERROR:
+            return false;
+        default:
+            ACSDK_ERROR(LX("mayProcessNextFrameError").d("unexpectedState", m_state));
+            return false;
+    }
+}
+
+bool AudioEncoder::mayContinueEncoding() {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    switch (m_state.load()) {
+        case AudioEncoderState::ENCODING:
+            return true;
+        case AudioEncoderState::STOPPING:
+            if (Clock::now() < m_timeoutTimePoint) {
+                return true;
+            } else {
+                ACSDK_DEBUG7(LX("mayContinueEncoding").m("stopTimeoutExpired"));
+                return false;
+            }
+        case AudioEncoderState::ABORTING:
+            ACSDK_DEBUG7(LX("mayContinueEncoding").m("aborting"));
+            return false;
+        case AudioEncoderState::ENCODING_ERROR:
+            return false;
+        default:
+            ACSDK_ERROR(LX("mayContinueEncodingError").d("unexpectedState", m_state));
+            return false;
+    }
+}
+
+bool AudioEncoder::mayFinishEncoding() {
+    std::lock_guard<std::mutex> lock{m_mutex};
+    switch (m_state.load()) {
+        case AudioEncoderState::ENCODING:
+            return true;
+        case AudioEncoderState::STOPPING:
+            return Clock::now() < m_timeoutTimePoint;
+        case AudioEncoderState::ENCODING_ERROR:
+        case AudioEncoderState::ABORTING:
+        default:
+            return false;
+    }
+}
+
+bool AudioEncoder::readWordsFromInput() {
+    while (needReadMoreWordsFromInput()) {
+        bool mayContinue;
+        if (m_wordsInInputBuffer) {
+            mayContinue = mayContinueEncoding();
+        } else {
+            mayContinue = mayProcessNextFrame();
+        }
+        if (!mayContinue) {
+            return false;
+        }
+
+        auto readResult = m_inputStreamReader->read(
+            m_inputBuffer.data() + m_wordsInInputBuffer * m_inputWordSizeBytes,
+            m_maxInputFrameSizeWords - m_wordsInInputBuffer,
+            m_params.readTimeoutMs);
+        if (readResult <= 0) {
+            switch (readResult) {
+                case AudioInputStream::Reader::Error::WOULDBLOCK:
+                case AudioInputStream::Reader::Error::TIMEDOUT:
+                    // Ignore and retry
+                    continue;
+                case AudioInputStream::Reader::Error::CLOSED:
+                    // End of input stream
+                    ACSDK_DEBUG7(LX("readWordsFromInput").m("endOfStream"));
+                    return false;
+                case AudioInputStream::Reader::Error::OVERRUN:
+                case AudioInputStream::Reader::Error::INVALID:
+                default:
+                    ACSDK_ERROR(LX("encodeLoopFailed").d("error", readResult));
+                    return false;
+            }
+        } else {
+            m_wordsInInputBuffer += readResult;
+        }
+    }
+
+    return true;
+}
+
+bool AudioEncoder::encodeWordsIntoOutput() {
+    if (!mayContinueEncoding()) {
+        return false;
+    }
+
+    if (!m_wordsInInputBuffer) {
+        return true;
+    }
+
+    auto offset = m_wordsInInputBuffer * m_inputWordSizeBytes;
+    if (!m_encoder->processSamples(m_inputBuffer.begin(), m_inputBuffer.begin() + offset, m_outputBuffer)) {
+        ACSDK_ERROR(LX("encodeLoopFailed").d("reason", "processSamplesFailed"));
+        setErrorState();
+        return false;
+    } else {
+        m_wordsInInputBuffer = 0;
+        return true;
+    }
+}
+
+bool AudioEncoder::writeEncodedWordsFromOutput() {
+    std::size_t totalWordsToSend = m_outputBuffer.size() / m_outputWordSizeBytes;
+    std::size_t wordsSent = 0;
+    std::size_t writeBufIndex = 0;
+
+    // This loop will push the encoded samples to the output stream.
+    while (wordsSent < totalWordsToSend) {
+        if (!mayContinueEncoding()) {
+            return false;
+        }
+
+        auto writeResult = m_outputStreamWriter->write(
+            m_outputBuffer.data() + writeBufIndex, totalWordsToSend - wordsSent, m_params.writeTimeoutMs);
+        if (writeResult > 0) {
+            // Some words were sent, update the counters.
+            wordsSent += writeResult;
+            writeBufIndex += writeResult * m_outputWordSizeBytes;
+            continue;
+        }
+
+        switch (writeResult) {
+            case AudioInputStream::Writer::Error::TIMEDOUT:
+                ACSDK_DEBUG9(LX("Timeout occurred while writing to stream"));
+                continue;
+            case AudioInputStream::Writer::Error::WOULDBLOCK:
+                // Should never happen.
+                ACSDK_ERROR(LX("encodeLoopFailed").d("reason", "WOULDBLOCK error while writing to stream"));
+                break;
+            case AudioInputStream::Writer::Error::INVALID:
+                ACSDK_ERROR(LX("encodeLoopFailed").d("reason", "INVALID error while writing to stream"));
+                setErrorState();
+                break;
+            case AudioInputStream::Writer::Error::CLOSED:
+                ACSDK_DEBUG7(LX("streamClosed"));
+                setErrorState();
+                break;
+            default:
+                ACSDK_ERROR(LX("unknownError").d("unknownError", writeResult));
+                setErrorState();
+                break;
+        }
+
+        return false;
+    }
+
+    if (wordsSent == totalWordsToSend) {
+        if (wordsSent) {
+            // We are done sending everything we could.
+            // If there are some bytes left in the buffer, move them to the beginning
+            std::size_t leftoverBytes = m_outputBuffer.size() % m_outputWordSizeBytes;
+            std::memmove(
+                m_outputBuffer.data(), m_outputBuffer.data() + m_outputBuffer.size() - leftoverBytes, leftoverBytes);
+            m_outputBuffer.resize(leftoverBytes);
+        }
+        return true;
+    } else {
+        ACSDK_ERROR(LX("encodeLoopFailed").d("reason", "bufferOverRun"));
+        return false;
+    }
+}
+
+}  // namespace audioEncoder
+}  // namespace alexaClientSDK
diff --git a/core/AudioEncoder/AudioEncoder/src/AudioEncoderFactory.cpp b/core/AudioEncoder/AudioEncoder/src/AudioEncoderFactory.cpp
new file mode 100644
index 0000000000..419d4eae6d
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoder/src/AudioEncoderFactory.cpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <chrono>
+#include <cstddef>
+
+#include <acsdk/AudioEncoder/AudioEncoderFactory.h>
+#include <acsdk/AudioEncoder/private/AudioEncoder.h>
+
+namespace alexaClientSDK {
+namespace audioEncoder {
+
+using audioEncoderInterfaces::AudioEncoderInterface;
+
+/// Default value for @ref AudioEncoderParams#readTimeoutMs.
+static constexpr std::chrono::milliseconds DEFAULT_READ_TIMEOUT_MS{10};
+/// Default value for @ref AudioEncoderParams#writeTimeoutMs.
+static constexpr std::chrono::milliseconds DEFAULT_WRITE_TIMEOUT_MS{100};
+/// Default value for @ref AudioEncoderParams#stopTimeoutMs.
+static constexpr std::chrono::milliseconds DEFAULT_STOP_TIMEOUT_MS{1000};
+/// Default value for @ref AudioEncoderParams#maxOutputStreamReaders.
+static constexpr std::size_t DEFAULT_MAX_OUTPUT_STREAM_READERS = 10;
+/// Default value for @ref AudioEncoderParams#maxOutputStreamBufferedPackets.
+static constexpr std::size_t DEFAULT_MAX_OUTPUT_STREAM_BUFFERED_PACKETS = 20;
+
+std::unique_ptr<AudioEncoderInterface> createAudioEncoder(
+    const std::shared_ptr<audioEncoderInterfaces::BlockAudioEncoderInterface>& encoder) {
+    return createAudioEncoderWithParams(
+        encoder,
+        AudioEncoderParams{DEFAULT_READ_TIMEOUT_MS,
+                           DEFAULT_WRITE_TIMEOUT_MS,
+                           DEFAULT_STOP_TIMEOUT_MS,
+                           DEFAULT_MAX_OUTPUT_STREAM_READERS,
+                           DEFAULT_MAX_OUTPUT_STREAM_BUFFERED_PACKETS});
+}
+
+std::unique_ptr<AudioEncoderInterface> createAudioEncoderWithParams(
+    const std::shared_ptr<audioEncoderInterfaces::BlockAudioEncoderInterface>& encoder,
+    const AudioEncoderParams& params) {
+    return std::unique_ptr<AudioEncoder>(new AudioEncoder(encoder, params));
+}
+
+}  // namespace audioEncoder
+}  // namespace alexaClientSDK
diff --git a/core/AudioEncoder/AudioEncoder/src/AudioEncoderParams.cpp b/core/AudioEncoder/AudioEncoder/src/AudioEncoderParams.cpp
new file mode 100644
index 0000000000..5c28a4accd
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoder/src/AudioEncoderParams.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/AudioEncoder/AudioEncoderParams.h>
+
+namespace alexaClientSDK {
+namespace audioEncoder {
+
+// GCC 4.x and 5.x reached end of support before some of c++11 amendments were made. In particular, these compilers
+// do not have default constructors for list initialization from aggregates. This issue has been addressed in GCC 6.x.
+// http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1467
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 6)
+
+AudioEncoderParams::AudioEncoderParams(
+    std::chrono::milliseconds readTimeoutMs,
+    std::chrono::milliseconds writeTimeoutMs,
+    std::chrono::milliseconds stopTimeoutMs,
+    std::size_t maxOutputStreamReaders,
+    std::size_t maxOutputStreamBufferedPackets) :
+        readTimeoutMs{readTimeoutMs},
+        writeTimeoutMs{writeTimeoutMs},
+        stopTimeoutMs{stopTimeoutMs},
+        maxOutputStreamReaders{maxOutputStreamReaders},
+        maxOutputStreamBufferedPackets{maxOutputStreamBufferedPackets} {
+}
+
+AudioEncoderParams::AudioEncoderParams(const AudioEncoderParams& params) :
+        readTimeoutMs{params.readTimeoutMs},
+        writeTimeoutMs{params.writeTimeoutMs},
+        stopTimeoutMs{params.stopTimeoutMs},
+        maxOutputStreamReaders{params.maxOutputStreamReaders},
+        maxOutputStreamBufferedPackets{params.maxOutputStreamBufferedPackets} {
+}
+
+#endif
+
+}  // namespace audioEncoder
+}  // namespace alexaClientSDK
diff --git a/core/AudioEncoder/AudioEncoder/src/AudioEncoderState.cpp b/core/AudioEncoder/AudioEncoder/src/AudioEncoderState.cpp
new file mode 100644
index 0000000000..14d40bd207
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoder/src/AudioEncoderState.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/AudioEncoder/private/AudioEncoderState.h>
+
+namespace alexaClientSDK {
+namespace audioEncoder {
+
+std::ostream& operator<<(std::ostream& out, AudioEncoderState state) {
+    const char* stateStr;
+    switch (state) {
+        case AudioEncoderState::IDLE:
+            stateStr = "IDLE";
+            break;
+        case AudioEncoderState::ENCODING:
+            stateStr = "ENCODING";
+            break;
+        case AudioEncoderState::ENCODING_ERROR:
+            stateStr = "ENCODING_ERROR";
+            break;
+        case AudioEncoderState::STOPPING:
+            stateStr = "STOPPING";
+            break;
+        case AudioEncoderState::ABORTING:
+            stateStr = "ABORTING";
+            break;
+        default:
+            return out << "Unknown(" << static_cast<int>(state) << ")";
+    }
+    return out << stateStr;
+}
+
+}  // namespace audioEncoder
+}  // namespace alexaClientSDK
diff --git a/core/AudioEncoder/AudioEncoder/src/CMakeLists.txt b/core/AudioEncoder/AudioEncoder/src/CMakeLists.txt
new file mode 100644
index 0000000000..9688a955c9
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoder/src/CMakeLists.txt
@@ -0,0 +1,11 @@
+add_definitions("-DACSDK_LOG_MODULE=audioEncoder")
+
+add_library(acsdkAudioEncoder AudioEncoder.cpp AudioEncoderFactory.cpp AudioEncoderParams.cpp AudioEncoderState.cpp)
+
+target_include_directories(acsdkAudioEncoder PUBLIC "${acsdkAudioEncoder_SOURCE_DIR}/include")
+target_include_directories(acsdkAudioEncoder PRIVATE "${acsdkAudioEncoder_SOURCE_DIR}/privateInclude")
+
+target_link_libraries(acsdkAudioEncoder PUBLIC AVSCommon acsdkAudioEncoderInterfaces)
+
+# install target
+asdk_install()
diff --git a/core/AudioEncoder/AudioEncoder/test/AudioEncoderTest.cpp b/core/AudioEncoder/AudioEncoder/test/AudioEncoderTest.cpp
new file mode 100644
index 0000000000..bebe142c56
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoder/test/AudioEncoderTest.cpp
@@ -0,0 +1,324 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <chrono>
+#include <thread>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <acsdk/AudioEncoder/AudioEncoderFactory.h>
+#include <AVSCommon/AVS/AudioInputStream.h>
+#include <AVSCommon/Utils/AudioFormat.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry("AudioEncoderTest", event)
+
+namespace alexaClientSDK {
+namespace audioEncoder {
+namespace test {
+
+using namespace avsCommon;
+using namespace avsCommon::avs;
+using namespace avsCommon::utils;
+
+/// Word size per PCM frame = 2byte (16bit)
+static constexpr size_t FRAME_WORDSIZE = 2;
+
+/// Number of dummy frames that will be sent to encoder.
+static constexpr size_t NUM_AUDIO_WRITE = 100;
+
+/// Input frame size for mock encoder. Will accept 2 frames. (2 * 2byte = 4)
+static constexpr size_t MOCK_ENCODER_INPUT_FRAME_SIZE_WORDS = 2;
+
+/// Output frame size for mock encoder. Will output 2 frames per encode. (2 * 2byte = 4)
+static constexpr size_t MOCK_ENCODER_OUTPUT_FRAME_SIZE_BYTES = 4;
+
+/// Number of words in input stream SDS buffer (must be large enough to fill encoder's output stream)
+static constexpr size_t INPUT_WORD_COUNT = 4096;
+
+/// Short timeout (needs to be greater than @c SpeechEncoder's BLOCKING writer timeout).
+static auto PROCESSING_TIMEOUT = std::chrono::milliseconds(200);
+
+/// The maximum factor of compression we expect to encounter.
+static constexpr unsigned int MAX_COMPRESSION_FACTOR = 10;
+
+/// Output format for mock encoder.
+static const AudioFormat MOCK_ENCODER_FORMAT = {
+    AudioFormat::Encoding::LPCM,
+    AudioFormat::Endianness::LITTLE,
+    16000,
+    FRAME_WORDSIZE* CHAR_BIT,
+    1,
+    false,
+    AudioFormat::Layout::INTERLEAVED,
+};
+
+using ::testing::Return;
+using namespace ::testing;
+using namespace audioEncoderInterfaces;
+using namespace audioEncoder;
+using Bytes = BlockAudioEncoderInterface::Bytes;
+
+/**
+ * A mock encoder backend implementation that inherits from @c EncoderContext.
+ */
+class MockEncoderContext : public BlockAudioEncoderInterface {
+public:
+    MOCK_METHOD1(init, bool(alexaClientSDK::avsCommon::utils::AudioFormat inputFormat));
+    MOCK_METHOD0(getInputFrameSize, size_t());
+    MOCK_METHOD0(getOutputFrameSize, size_t());
+    MOCK_METHOD0(requiresFullyRead, bool());
+    MOCK_METHOD0(getAudioFormat, AudioFormat());
+    MOCK_METHOD0(getAVSFormatName, std::string());
+
+    MOCK_METHOD1(start, bool(Bytes&));
+    MOCK_METHOD3(processSamples, bool(Bytes::const_iterator, Bytes::const_iterator, Bytes&));
+    MOCK_METHOD1(flush, bool(Bytes&));
+    MOCK_METHOD0(close, void());
+};
+
+class AudioEncoderTest : public ::testing::Test {
+protected:
+    /// The AudioEncoder to test.
+    std::shared_ptr<AudioEncoderInterface> m_encoder;
+
+    /// The mock @c EncoderContext.
+    std::shared_ptr<MockEncoderContext> m_encoderCtx;
+
+    /**
+     * Set up the test harness for running a test.
+     */
+    virtual void SetUp() {
+        m_encoderCtx = std::make_shared<MockEncoderContext>();
+        m_encoder = createAudioEncoder(m_encoderCtx);
+
+        EXPECT_CALL(*m_encoderCtx, getInputFrameSize()).WillRepeatedly(Return(MOCK_ENCODER_INPUT_FRAME_SIZE_WORDS));
+        EXPECT_CALL(*m_encoderCtx, getAudioFormat()).WillRepeatedly(Return(MOCK_ENCODER_FORMAT));
+        EXPECT_CALL(*m_encoderCtx, getOutputFrameSize()).WillRepeatedly(Return(MOCK_ENCODER_OUTPUT_FRAME_SIZE_BYTES));
+    }
+};
+
+/*
+ * Test to verify if SpeechEncoder::startEncoding properly call backend implementation.
+ * This test will feed a dummy PCM stream into SpeechEncoder, then test the behavior with
+ * the mock @c EncoderContext.
+ */
+TEST_F(AudioEncoderTest, testTimer_startEncoding) {
+    AudioFormat audioFormat = {AudioFormat::Encoding::LPCM,
+                               AudioFormat::Endianness::LITTLE,
+                               16000,
+                               FRAME_WORDSIZE * CHAR_BIT,
+                               1,
+                               false,
+                               AudioFormat::Layout::INTERLEAVED};
+    auto buffer = std::make_shared<AudioInputStream::Buffer>(4000);
+    std::shared_ptr<AudioInputStream> inputStream = AudioInputStream::create(buffer, FRAME_WORDSIZE, 1);
+    ASSERT_TRUE(inputStream);
+
+    // EncoderContext::init should be called once.
+    EXPECT_CALL(*m_encoderCtx, init(_)).Times(1).WillOnce(Return(true));
+
+    // Mock encoder requires fully read.
+    EXPECT_CALL(*m_encoderCtx, requiresFullyRead()).WillRepeatedly(Return(true));
+
+    // EncoderContext::start should be called once.
+    EXPECT_CALL(*m_encoderCtx, start(_)).Times(1).WillOnce(Return(true));
+
+    // EncoderContext::flush should be called once.
+    EXPECT_CALL(*m_encoderCtx, flush(_)).Times(1).WillOnce(Return(true));
+
+    // EncoderContext::close should be called once.
+    EXPECT_CALL(*m_encoderCtx, close()).Times(1);
+
+    // Start the encoder.
+    auto encodedStream =
+        m_encoder->startEncoding(inputStream, audioFormat, 0, AudioInputStream::Reader::Reference::ABSOLUTE);
+    ASSERT_TRUE(encodedStream);
+
+    // EncoderContext::processSamples should be called with MOCK_ENCODER_INPUT_FRAME_SIZE size.
+    EXPECT_CALL(*m_encoderCtx, processSamples(_, _, _))
+        .Times(NUM_AUDIO_WRITE / MOCK_ENCODER_INPUT_FRAME_SIZE_WORDS)
+        .WillRepeatedly(Invoke(
+            [](Bytes::const_iterator begin, Bytes::const_iterator end, BlockAudioEncoderInterface::Bytes& output) {
+                if (MOCK_ENCODER_INPUT_FRAME_SIZE_WORDS * FRAME_WORDSIZE != end - begin) {
+                    ACSDK_ERROR(LX("testTimer_startEncoding").d("BadInputSize", end - begin));
+                    return false;
+                }
+                output.resize(output.size() + MOCK_ENCODER_OUTPUT_FRAME_SIZE_BYTES);
+                return true;
+            }));
+
+    // Begin feeding dummy(empty) PCM frames into SDS.
+    std::shared_ptr<AudioInputStream::Writer> writer =
+        inputStream->createWriter(AudioInputStream::Writer::Policy::BLOCKING);
+    BlockAudioEncoderInterface::Byte dummy[FRAME_WORDSIZE] = {0, 0};
+    for (size_t i = 0; i < NUM_AUDIO_WRITE; i++) {
+        writer->write(&dummy, 1);
+    }
+    writer->close();
+
+    ASSERT_EQ(FRAME_WORDSIZE, encodedStream->getWordSize());
+    auto reader = encodedStream->createReader(AudioInputStream::Reader::Policy::BLOCKING);
+    ASSERT_TRUE(reader);
+    BlockAudioEncoderInterface::Bytes result;
+    result.resize(FRAME_WORDSIZE * NUM_AUDIO_WRITE * 2);
+    size_t wordsRead = 0;
+    bool open = true;
+    while (open) {
+        auto readResult = reader->read(
+            result.data() + wordsRead * reader->getWordSize(),
+            result.size() / FRAME_WORDSIZE - wordsRead,
+            std::chrono::milliseconds(100));
+        if (readResult > 0) {
+            wordsRead += static_cast<size_t>(readResult);
+        } else {
+            switch (readResult) {
+                case AudioInputStream::Reader::Error::TIMEDOUT:
+                    continue;
+                case AudioInputStream::Reader::Error::CLOSED:
+                    open = false;
+                    continue;
+                default:
+                    ASSERT_TRUE(false);
+            }
+        }
+    }
+    ASSERT_EQ(NUM_AUDIO_WRITE, wordsRead);
+}
+
+/**
+ * Test if encoding thread will exit if encoder output is not being consumed on exit.
+ */
+TEST_F(AudioEncoderTest, test_shutdownOnBlockingWrite) {
+    AudioFormat audioFormat = {
+        AudioFormat::Encoding::LPCM,
+        AudioFormat::Endianness::LITTLE,
+        16000,
+        FRAME_WORDSIZE * CHAR_BIT,
+        1,
+        false,
+        AudioFormat::Layout::INTERLEAVED,
+    };
+
+    auto inputBufferSize = AudioInputStream::calculateBufferSize(INPUT_WORD_COUNT, FRAME_WORDSIZE, 1);
+    auto buffer = std::make_shared<AudioInputStream::Buffer>(inputBufferSize);
+    std::shared_ptr<AudioInputStream> inputStream = AudioInputStream::create(buffer, FRAME_WORDSIZE, 1);
+    ASSERT_TRUE(inputStream);
+
+    // EncoderContext::init should be called once.
+    EXPECT_CALL(*m_encoderCtx, init(_)).Times(1).WillOnce(Return(true));
+
+    // Mock encoder requires fully read.
+    EXPECT_CALL(*m_encoderCtx, requiresFullyRead()).WillRepeatedly(Return(true));
+
+    // EncoderContext::start should be called once.
+    EXPECT_CALL(*m_encoderCtx, start(_)).Times(1).WillOnce(Return(true));
+
+    // EncoderContext::flush should never be called.
+    EXPECT_CALL(*m_encoderCtx, flush(_)).Times(0);
+
+    // EncoderContext::close should be called once.
+    EXPECT_CALL(*m_encoderCtx, close()).Times(1);
+
+    // EncoderContext::processSamples should be called with MOCK_ENCODER_INPUT_FRAME_SIZE size.
+    EXPECT_CALL(*m_encoderCtx, processSamples(_, _, _)).WillRepeatedly(Return(MOCK_ENCODER_OUTPUT_FRAME_SIZE_BYTES));
+
+    // Start the encoder.
+    auto encodedStream =
+        m_encoder->startEncoding(inputStream, audioFormat, 0, AudioInputStream::Reader::Reference::ABSOLUTE);
+    ASSERT_TRUE(encodedStream);
+    // If this test fails, INPUT_WORD_COUNT should be increased.
+    ASSERT_GE(INPUT_WORD_COUNT, encodedStream->getDataSize() * MAX_COMPRESSION_FACTOR);
+
+    // Fill input buffer with dummy PCM data
+    std::shared_ptr<AudioInputStream::Writer> writer =
+        inputStream->createWriter(AudioInputStream::Writer::Policy::BLOCKING);
+    BlockAudioEncoderInterface::Byte dummy[FRAME_WORDSIZE];
+    std::memset(dummy, 0, sizeof(dummy));
+
+    for (size_t wordsWritten = 0; wordsWritten < INPUT_WORD_COUNT; wordsWritten++) {
+        writer->write(dummy, 1);
+    }
+
+    // Let encoder thread process as much input data as it can.
+    std::this_thread::sleep_for(PROCESSING_TIMEOUT);
+
+    // At this point, speech encoder loop should be experiencing timeout and will keep on retrying.
+
+    // Simulate a shutdown.
+    m_encoder.reset();
+}
+
+/**
+ * Test if encoding thread will exit and create again when stopEncoding() and startEncoding() is called in quick
+ * succession.
+ */
+TEST_F(AudioEncoderTest, test_stopAndStartEncoder) {
+    const AudioFormat audioFormat = {
+        AudioFormat::Encoding::LPCM,
+        AudioFormat::Endianness::LITTLE,
+        16000,
+        FRAME_WORDSIZE * CHAR_BIT,
+        1,
+        false,
+        AudioFormat::Layout::INTERLEAVED,
+    };
+
+    // number of start and stop encoding to run
+    const int numRunOfTest = 10;
+
+    auto inputBufferSize = AudioInputStream::calculateBufferSize(INPUT_WORD_COUNT, FRAME_WORDSIZE, 1);
+    auto buffer = std::make_shared<AudioInputStream::Buffer>(inputBufferSize);
+    std::shared_ptr<AudioInputStream> inputStream = AudioInputStream::create(buffer, FRAME_WORDSIZE, 1);
+    ASSERT_TRUE(inputStream);
+
+    // EncoderContext::init should be called numRunOfTest times
+    EXPECT_CALL(*m_encoderCtx, init(_)).Times(numRunOfTest).WillRepeatedly(Return(true));
+
+    // Mock encoder requires fully read.
+    EXPECT_CALL(*m_encoderCtx, requiresFullyRead()).WillRepeatedly(Return(true));
+
+    // EncoderContext::start should be called numRunOfTest times.
+    EXPECT_CALL(*m_encoderCtx, start(_)).Times(numRunOfTest).WillRepeatedly(Return(true));
+
+    // EncoderContext::flush should never be called.
+    EXPECT_CALL(*m_encoderCtx, flush(_)).Times(0);
+
+    // EncoderContext::close should be called numRunOfTest times.
+    EXPECT_CALL(*m_encoderCtx, close()).Times(numRunOfTest);
+
+    // EncoderContext::processSamples should be called with MOCK_ENCODER_INPUT_FRAME_SIZE size.
+    EXPECT_CALL(*m_encoderCtx, processSamples(_, _, _)).WillRepeatedly(Return(MOCK_ENCODER_OUTPUT_FRAME_SIZE_BYTES));
+
+    for (auto i = 0; i < numRunOfTest; ++i) {
+        // Start the encoder.
+        auto encodedStream =
+            m_encoder->startEncoding(inputStream, audioFormat, 0, AudioInputStream::Reader::Reference::ABSOLUTE);
+        ASSERT_TRUE(encodedStream);
+
+        // Stop the encoder
+        m_encoder->stopEncoding(true);
+    }
+}
+
+}  // namespace test
+}  // namespace audioEncoder
+}  // namespace alexaClientSDK
diff --git a/core/AudioEncoder/AudioEncoder/test/CMakeLists.txt b/core/AudioEncoder/AudioEncoder/test/CMakeLists.txt
new file mode 100644
index 0000000000..c7c5812d7f
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoder/test/CMakeLists.txt
@@ -0,0 +1 @@
+discover_unit_tests("" acsdkAudioEncoder)
diff --git a/core/AudioEncoder/AudioEncoderComponent/CMakeLists.txt b/core/AudioEncoder/AudioEncoderComponent/CMakeLists.txt
new file mode 100644
index 0000000000..36fa02de25
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoderComponent/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkAudioEncoderComponent LANGUAGES CXX)
+
+add_library(acsdkAudioEncoderComponent INTERFACE)
+target_include_directories(acsdkAudioEncoderComponent INTERFACE ${acsdkAudioEncoderComponent_SOURCE_DIR}/include)
+target_link_libraries(acsdkAudioEncoderComponent INTERFACE acsdkManufactory acsdkAudioEncoderInterfaces)
+
+# install target
+asdk_install_interface()
diff --git a/core/AudioEncoder/AudioEncoderComponent/include/acsdk/AudioEncoderComponent/ComponentFactory.h b/core/AudioEncoder/AudioEncoderComponent/include/acsdk/AudioEncoderComponent/ComponentFactory.h
new file mode 100644
index 0000000000..f0ebdda459
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoderComponent/include/acsdk/AudioEncoderComponent/ComponentFactory.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_AUDIOENCODERCOMPONENT_COMPONENTFACTORY_H_
+#define ACSDK_AUDIOENCODERCOMPONENT_COMPONENTFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/AudioEncoderInterfaces/AudioEncoderInterface.h>
+#include <acsdkManufactory/Component.h>
+
+namespace alexaClientSDK {
+namespace audioEncoderComponent {
+
+/**
+ * Manufactory Component definition for an Opus @c AudioEncoderInterface.
+ */
+using AudioEncoderComponent =
+    acsdkManufactory::Component<std::shared_ptr<audioEncoderInterfaces::AudioEncoderInterface>>;
+
+/**
+ * Get the Manufactory component for creating an Opus @c AudioEncoderInterface.
+ *
+ * @return The default @c Manufactory component for creating an Opus @c AudioEncoderInterface.
+ */
+AudioEncoderComponent getComponent();
+
+}  // namespace audioEncoderComponent
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_AUDIOENCODERCOMPONENT_COMPONENTFACTORY_H_
diff --git a/core/AudioEncoder/AudioEncoderInterfaces/CMakeLists.txt b/core/AudioEncoder/AudioEncoderInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..aec69c6cd2
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoderInterfaces/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1)
+
+project(acsdkAudioEncoderInterfaces LANGUAGES CXX)
+add_library(acsdkAudioEncoderInterfaces INTERFACE)
+target_include_directories(acsdkAudioEncoderInterfaces INTERFACE "${acsdkAudioEncoderInterfaces_SOURCE_DIR}/include")
+target_link_libraries(acsdkAudioEncoderInterfaces INTERFACE AVSCommon)
+
+# install interface
+asdk_install_interface()
diff --git a/core/AudioEncoder/AudioEncoderInterfaces/include/acsdk/AudioEncoderInterfaces/AudioEncoderInterface.h b/core/AudioEncoder/AudioEncoderInterfaces/include/acsdk/AudioEncoderInterfaces/AudioEncoderInterface.h
new file mode 100644
index 0000000000..4be8a45002
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoderInterfaces/include/acsdk/AudioEncoderInterfaces/AudioEncoderInterface.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_AUDIOENCODERINTERFACES_AUDIOENCODERINTERFACE_H_
+#define ACSDK_AUDIOENCODERINTERFACES_AUDIOENCODERINTERFACE_H_
+
+#include <memory>
+
+#include <AVSCommon/AVS/AudioInputStream.h>
+#include <AVSCommon/Utils/AudioFormat.h>
+
+#include <acsdk/AudioEncoderInterfaces/BlockAudioEncoderInterface.h>
+
+namespace alexaClientSDK {
+namespace audioEncoderInterfaces {
+
+/**
+ * @brief Interface for encoding audio stream.
+ *
+ * This class provides generic interface between audio stream encoder implementation and the application who wants to
+ * encode audio stream.
+ *
+ * Encoder converts input audio stream into encoded format. Each encoder implementation is expected to support one
+ * output format which doesn't change over time.
+ *
+ * Encoding operation starts with #startEncoding() call and finished in one of the following cases:
+ * - Encoder reaches end of input stream
+ * - Encoder encounters an error
+ * - Encoding operation is stopped using #stopEncoding() operation
+ *
+ * Encoder supports a single encoding session, but there can be more than one encoder in the system.
+ *
+ * @see AudioEncoderInterface::AudioStream
+ * @see AudioEncoderInterface::AudioFormat
+ */
+class AudioEncoderInterface {
+public:
+    /**
+     * @brief Virtual destructor.
+     */
+    virtual ~AudioEncoderInterface() = default;
+
+    /**
+     * @brief Start the new encoding session.
+     *
+     * Method starts the new encoding session. Object can manage only single session at the same time, thus this call
+     * will fail if ongoing encoding session exists.
+     *
+     * If the method succeeds, client may request to stop encoding with #stopEncoding() call. The encoding session will
+     * continue until stopped, end of @a inputStream is reached, or encoder encounters an error.
+     *
+     * When this method is called, encoder may change the format returned with #getAVSFormatName() method based on
+     * input format.
+     *
+     * @param[in]   inputStream     The @c AudioStream to stream audio from. (i.e.input stream that has raw PCM frames.)
+     * @param[in]   inputFormat     The @c AudioFormat to describe the audio format of the input stream.
+     * @param[in]   begin           The index where encoding should begin.
+     * @param[in]   reference       The reference for the index.
+     *
+     * @return Stream for encoding output. Encoder creates a new stream for storing the encoding results. On error the
+     *         result is nullptr.
+     */
+    virtual std::shared_ptr<avsCommon::avs::AudioInputStream> startEncoding(
+        const std::shared_ptr<avsCommon::avs::AudioInputStream>& inputStream,
+        avsCommon::utils::AudioFormat inputFormat,
+        avsCommon::avs::AudioInputStream::Index begin,
+        avsCommon::avs::AudioInputStream::Reader::Reference reference) = 0;
+
+    /**
+     * @brief Stop current encoding session.
+     *
+     * Method stops current encoding session if it exists. If there is an ongoing encoding session, the method returns
+     * after the session is terminated.
+     *
+     * This method has an execution timeout, and even if @a stopImmediately is false, encoding will be aborted if it
+     * cannot be stopped gracefully.
+     *
+     * @param[in] stopImmediately Flag indicating that encoding should stop immediately. If this flag is set to @c false
+     *                            (the default), encoding will continue until any existing data in the buffer has been
+     *                            encoded. If this flag is set to @c true, existing data in the buffer which has not
+     *                            already been encoded will be discarded, and encoding will stop immediately.
+     */
+    virtual void stopEncoding(bool stopImmediately = false) = 0;
+
+    /**
+     * @brief Get output encoding type.
+     *
+     * Method returns output encoding type.
+     *
+     * @return Output encoding supported by this encoder.
+     */
+    virtual avsCommon::utils::AudioFormat::Encoding getEncoding() = 0;
+
+    /**
+     * @brief Get output format name for AVS service.
+     *
+     * This method returns output format name for AVS service. The encoder may change the format depending on
+     * configuration when encoding starts with #startEncoding() call, and the clients should use this method after it.
+     * The AVS format name doesn't change until the next call to #startEncoding().
+     *
+     * @return The string interpretation of the output format, that AVS cloud service can recognize.
+     *
+     * @see https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/speechrecognizer.html#recognize
+     */
+    virtual std::string getAVSFormatName() = 0;
+};
+
+}  // namespace audioEncoderInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_AUDIOENCODERINTERFACES_AUDIOENCODERINTERFACE_H_
diff --git a/core/AudioEncoder/AudioEncoderInterfaces/include/acsdk/AudioEncoderInterfaces/BlockAudioEncoderInterface.h b/core/AudioEncoder/AudioEncoderInterfaces/include/acsdk/AudioEncoderInterfaces/BlockAudioEncoderInterface.h
new file mode 100644
index 0000000000..57f3f4fdd3
--- /dev/null
+++ b/core/AudioEncoder/AudioEncoderInterfaces/include/acsdk/AudioEncoderInterfaces/BlockAudioEncoderInterface.h
@@ -0,0 +1,202 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_AUDIOENCODERINTERFACES_BLOCKAUDIOENCODERINTERFACE_H_
+#define ACSDK_AUDIOENCODERINTERFACES_BLOCKAUDIOENCODERINTERFACE_H_
+
+#include <memory>
+#include <vector>
+
+#include <AVSCommon/Utils/AudioFormat.h>
+
+namespace alexaClientSDK {
+namespace audioEncoderInterfaces {
+
+/**
+ * @brief Block audio encoder interface.
+ *
+ * Block audio encoder provides a generic interface for converting audio stream data. The encoding is performed within
+ * a session that is started with #init() call and ends with #close().
+ *
+ * After initialization block audio encoding has the following stages:
+ * - start operation to generate encoded data prologue.
+ * - sequential encoding operations to encode input and generated encoded output.
+ * - flush operation to generate encoded data epilogue.
+ *
+ * @code{.cpp}
+ * auto encoder = ...
+ * encoder->init(inputAudioFormat);
+ * ...
+ * encoder->start(outputBuffer);
+ * writeOutputData(outputBuffer);
+ * while (hasMoreData()) {
+ *   encoder->processSamples(inputData, inputDataSize, outputBuffer);
+ *   writeOutputData(outputBuffer);
+ * }
+ * encoder->flush(outputBuffer);
+ * writeOutputData(outputBuffer);
+ * encoder->close();
+ * @endcode
+ *
+ * After call to #close() the encoder instance can be reused for another encoding operation.
+ *
+ * @see AudioEncoderInterface
+ */
+class BlockAudioEncoderInterface {
+public:
+    /**
+     * @brief Byte data type.
+     */
+    using Byte = unsigned char;
+
+    /**
+     * @brief Byte array data type for encoding output.
+     */
+    using Bytes = std::vector<Byte>;
+
+    /**
+     * @brief Pre-initialize the encoder.
+     *
+     * Pre-initialization before actual encoding session has began. Note that this function will be called everytime
+     * before new encoding session is starting.
+     *
+     * @note Encoder may change some output parameters after this call, and consumers should check #getAVSFormatName()
+     *       after calling this method.
+     *
+     * @param[in] inputFormat The @c AudioFormat describes the audio format of the future incoming PCM frames.
+     *
+     * @return true when initialization success.
+     */
+    virtual bool init(avsCommon::utils::AudioFormat inputFormat) = 0;
+
+    /**
+     * The maximum number of sample can be processed at the same time. In other words, this will limit input stream
+     * buffering. Thus number of samples of #processSamples() call will never exceeds this limit.
+     *
+     * @return The number of sample (in words).
+     */
+    virtual size_t getInputFrameSize() = 0;
+
+    /**
+     * @brief Provide maximum output frame size.
+     *
+     * The method provides an estimate for an output frame size in bytes. This value is used to allocate necessary
+     * buffer space in output audio stream.
+     *
+     * @return The maximum output length (in bytes).
+     */
+    virtual size_t getOutputFrameSize() = 0;
+
+    /**
+     * @brief Return if input must contain full frame.
+     *
+     * Determine whether input stream should be fully buffered with the maximum number of samples provided at
+     * #getInputFrameSize() function. This value will change the behavior of how processSamples is called during the
+     * encoding session. This is useful when backend encoder requires fixed length of input samples.
+     *
+     * In case the encoding session has been shutdown before the buffer is filled fully, this will cause any partial
+     * data to be discarded (e.g. AudioEncoderInterface#stopEncoding() has been called, or reaches the end of the
+     * data stream).
+     *
+     * @return true if processSamples should be called with fixed length of
+     * input samples during the session.
+     */
+    virtual bool requiresFullyRead() = 0;
+
+    /**
+     * @brief Return output audio format.
+     *
+     * Method returns @c AudioFormat that describes encoded output.
+     *
+     * @note The number of channels in the resulting format is known only after encoding operation has started.
+     *
+     * @return The @c AudioFormat describes the encoded audio stream.
+     */
+    virtual avsCommon::utils::AudioFormat getAudioFormat() = 0;
+
+    /**
+     * @brief AVS format name for encoded audio.
+     *
+     * Method returns string interpretation of the output format, that AVS cloud service can recognize.
+     *
+     * @return Output format string.
+     * @see https://developer.amazon.com/en-US/docs/alexa/alexa-voice-service/speechrecognizer.html#recognize
+     */
+    virtual std::string getAVSFormatName() = 0;
+
+    /**
+     * @brief Start the encoding session.
+     *
+     * This function starts a new encoding session after a call to #init(). If block audio encoder produces some data,
+     * it can be returned through @a preamble buffer.
+     *
+     * After the session is started, user can call #processSamples() until session is closed with #close() call.
+     *
+     * @param[out] preamble Destination buffer for encoding preamble output. The method will append preamble bytes to
+     *                      @a preamble if needed. On error @a preamble is not modified.
+     *
+     * @return true when success.
+     */
+    virtual bool start(Bytes& preamble) = 0;
+
+    /**
+     * @brief Encode a block of audio.
+     *
+     * This method encodes a block of input audio samples. The samples are provided in a form of byte array restricted
+     * by @a begin and @a end iterator arguments. The input bytes must represent complete samples, and each sample size
+     * is be known via @c AudioFormat used with #init() call. If #requiresFullyRead() returns true, the number of
+     * samples must be equal to #getInputFrameSize(). If #requiresFullyRead() returns false, the number of samples must
+     * be greater then zero and not more than #getInputFrameSize().
+     *
+     * This method can be called any number of times after #start() has been called.
+     *
+     * @param[in]   begin           Bytes iterator for the first byte of samples. This parameter must be less then
+     *                              @a end, or the method will fail with an error.
+     * @param[in]   end             Bytes iterator for the end of sample array. This parameter must be greater then
+     *                              @a begin, or the method will fail with an error.
+     * @param[out]  buffer          Output buffer for encoded data.
+     *
+     * @return true when success.
+     */
+    virtual bool processSamples(Bytes::const_iterator begin, Bytes::const_iterator end, Bytes& buffer) = 0;
+
+    /**
+     * @brief Flush buffered data if any.
+     *
+     * This method appends any encoded data to @a buffer.
+     *
+     * @param[out] buffer Buffer for appending data. The buffer contents is not modified on error.
+     *
+     * @return true when success.
+     */
+    virtual bool flush(Bytes& buffer) = 0;
+
+    /**
+     * @brief Close encoding session.
+     *
+     * Notify end of the session. Any backend library then may be deinitialized so it cleans memory and threads.
+     */
+    virtual void close() = 0;
+
+    /**
+     * Destructor.
+     */
+    virtual ~BlockAudioEncoderInterface() = default;
+};
+
+}  // namespace audioEncoderInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_AUDIOENCODERINTERFACES_BLOCKAUDIOENCODERINTERFACE_H_
diff --git a/core/AudioEncoder/CMakeLists.txt b/core/AudioEncoder/CMakeLists.txt
new file mode 100644
index 0000000000..8a9b06afe0
--- /dev/null
+++ b/core/AudioEncoder/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+add_subdirectory("AudioEncoder")
+add_subdirectory("AudioEncoderComponent")
+add_subdirectory("AudioEncoderInterfaces")
+if(OPUS)
+    add_subdirectory("OpusAudioEncoder")
+endif()
diff --git a/core/AudioEncoder/OpusAudioEncoder/CMakeLists.txt b/core/AudioEncoder/OpusAudioEncoder/CMakeLists.txt
new file mode 100644
index 0000000000..7d5d71f24b
--- /dev/null
+++ b/core/AudioEncoder/OpusAudioEncoder/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkOpusAudioEncoder LANGUAGES CXX)
+
+add_subdirectory("src")
diff --git a/core/AudioEncoder/OpusAudioEncoder/include/acsdk/OpusAudioEncoder/AudioEncoderFactory.h b/core/AudioEncoder/OpusAudioEncoder/include/acsdk/OpusAudioEncoder/AudioEncoderFactory.h
new file mode 100644
index 0000000000..12dea467f2
--- /dev/null
+++ b/core/AudioEncoder/OpusAudioEncoder/include/acsdk/OpusAudioEncoder/AudioEncoderFactory.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_OPUSAUDIOENCODER_AUDIOENCODERFACTORY_H_
+#define ACSDK_OPUSAUDIOENCODER_AUDIOENCODERFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/AudioEncoderInterfaces/BlockAudioEncoderInterface.h>
+
+namespace alexaClientSDK {
+namespace opusAudioEncoder {
+
+/**
+ * @brief Creates block audio encoder.
+ *
+ * Method creates block audio encoder that uses OPUS library as a backend. This encoder supports only 16KHz single
+ * channel or interleaved dual channel LPCM input, and produces OPUS encoded output.
+ *
+ * @return New encoder reference or nullptr on error.
+ */
+std::unique_ptr<audioEncoderInterfaces::BlockAudioEncoderInterface> createOpusAudioEncoder();
+
+}  // namespace opusAudioEncoder
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_OPUSAUDIOENCODER_AUDIOENCODERFACTORY_H_
\ No newline at end of file
diff --git a/core/AudioEncoder/OpusAudioEncoder/privateInclude/acsdk/OpusAudioEncoder/private/OpusAudioEncoder.h b/core/AudioEncoder/OpusAudioEncoder/privateInclude/acsdk/OpusAudioEncoder/private/OpusAudioEncoder.h
new file mode 100644
index 0000000000..a80b7f753f
--- /dev/null
+++ b/core/AudioEncoder/OpusAudioEncoder/privateInclude/acsdk/OpusAudioEncoder/private/OpusAudioEncoder.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_OPUSAUDIOENCODER_PRIVATE_OPUSAUDIOENCODER_H_
+#define ACSDK_OPUSAUDIOENCODER_PRIVATE_OPUSAUDIOENCODER_H_
+
+#include <memory>
+#include <opus.h>
+
+#include <acsdk/AudioEncoderInterfaces/BlockAudioEncoderInterface.h>
+#include <AVSCommon/Utils/AudioFormat.h>
+
+namespace alexaClientSDK {
+namespace opusAudioEncoder {
+
+/**
+ * @brief Block audio encoder implementation using libopus as a backend library.
+ */
+class OpusAudioEncoder : public audioEncoderInterfaces::BlockAudioEncoderInterface {
+public:
+    /**
+     * Factory method.
+     *
+     * @return A @c std::unique_ptr to a new @c OpusAudioEncoder.
+     */
+    static std::unique_ptr<BlockAudioEncoderInterface> createEncoder();
+
+    /**
+     * Constructor.
+     */
+    OpusAudioEncoder();
+
+    /**
+     * Destructor.
+     */
+    ~OpusAudioEncoder();
+
+    /// @name Methods from @c BlockAudioEncoderInterface
+    /// @{
+    bool init(alexaClientSDK::avsCommon::utils::AudioFormat inputFormat) override;
+    size_t getInputFrameSize() override;
+    size_t getOutputFrameSize() override;
+    bool requiresFullyRead() override;
+    alexaClientSDK::avsCommon::utils::AudioFormat getAudioFormat() override;
+    std::string getAVSFormatName() override;
+    bool start(Bytes& preamble) override;
+    bool processSamples(Bytes::const_iterator begin, Bytes::const_iterator end, Bytes& buffer) override;
+    bool flush(Bytes& buffer) override;
+    void close() override;
+    /// @}
+
+private:
+    /**
+     * @brief Helper to configure OPUS handle.
+     *
+     * This methods prepares @a m_encoder for encoding operation.
+     *
+     * @return true when success.
+     */
+    bool configureEncoder();
+
+    /// OPUS encoder handle
+    OpusEncoder* m_encoder;
+
+    /// @c AudioFormat to describe output format
+    alexaClientSDK::avsCommon::utils::AudioFormat m_outputFormat;
+
+    /// @c AudioFormat to describe input format
+    alexaClientSDK::avsCommon::utils::AudioFormat m_inputFormat;
+};
+
+}  // namespace opusAudioEncoder
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_OPUSAUDIOENCODER_PRIVATE_OPUSAUDIOENCODER_H_
diff --git a/core/AudioEncoder/OpusAudioEncoder/src/AudioEncoderFactory.cpp b/core/AudioEncoder/OpusAudioEncoder/src/AudioEncoderFactory.cpp
new file mode 100644
index 0000000000..fc8bee6513
--- /dev/null
+++ b/core/AudioEncoder/OpusAudioEncoder/src/AudioEncoderFactory.cpp
@@ -0,0 +1,29 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/OpusAudioEncoder/AudioEncoderFactory.h>
+#include <acsdk/OpusAudioEncoder/private/OpusAudioEncoder.h>
+
+namespace alexaClientSDK {
+namespace opusAudioEncoder {
+
+using alexaClientSDK::audioEncoderInterfaces::BlockAudioEncoderInterface;
+
+std::unique_ptr<BlockAudioEncoderInterface> createOpusAudioEncoder() {
+    return OpusAudioEncoder::createEncoder();
+}
+
+}  // namespace opusAudioEncoder
+}  // namespace alexaClientSDK
diff --git a/core/AudioEncoder/OpusAudioEncoder/src/CMakeLists.txt b/core/AudioEncoder/OpusAudioEncoder/src/CMakeLists.txt
new file mode 100644
index 0000000000..ed69d5bf08
--- /dev/null
+++ b/core/AudioEncoder/OpusAudioEncoder/src/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_definitions("-DACSDK_LOG_MODULE=opusAudioEncoder")
+
+add_library(acsdkOpusAudioEncoder AudioEncoderFactory.cpp OpusAudioEncoder.cpp)
+
+target_include_directories(acsdkOpusAudioEncoder
+    PUBLIC "${acsdkOpusAudioEncoder_SOURCE_DIR}/include"
+    PRIVATE ${OPUS_INCLUDE_DIR} "${acsdkOpusAudioEncoder_SOURCE_DIR}/privateInclude"
+)
+
+target_link_libraries(acsdkOpusAudioEncoder
+    PUBLIC
+        acsdkAudioEncoderInterfaces
+        AVSCommon
+    PRIVATE
+        ${OPUS_LIBRARY}
+)
+
+# install target
+asdk_install()
diff --git a/core/AudioEncoder/OpusAudioEncoder/src/OpusAudioEncoder.cpp b/core/AudioEncoder/OpusAudioEncoder/src/OpusAudioEncoder.cpp
new file mode 100644
index 0000000000..69dba9f871
--- /dev/null
+++ b/core/AudioEncoder/OpusAudioEncoder/src/OpusAudioEncoder.cpp
@@ -0,0 +1,247 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <iostream>
+#include <climits>
+#include <cstring>
+
+#include <acsdk/OpusAudioEncoder/private/OpusAudioEncoder.h>
+#include <AVSCommon/Utils/Endian.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace opusAudioEncoder {
+
+using namespace avsCommon;
+using namespace avsCommon::utils;
+using namespace audioEncoderInterfaces;
+
+/// String to identify log entries originating from this file.
+#define TAG "OpusEncoderContext"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/// AVS OPUS format name
+static constexpr char AVS_FORMAT[] = "OPUS";
+
+/// Audio sample rate: 16kHz
+static constexpr unsigned int SAMPLE_RATE = 16000;
+
+/// OPUS bitrate: 32kbps CBR
+static constexpr unsigned int BIT_RATE = 32000;
+
+/// OPUS frame length: 20ms
+static constexpr unsigned int FRAME_LENGTH = 20;
+
+/// PCM frame size
+static constexpr unsigned int FRAME_SIZE = (SAMPLE_RATE / 1000) * FRAME_LENGTH;
+
+/// OPUS packet size (CBR)
+static constexpr unsigned int PACKET_SIZE = ((BIT_RATE / CHAR_BIT) / 1000) * FRAME_LENGTH;
+
+/// Maximum packet size
+static constexpr unsigned int MAX_PACKET_SIZE = PACKET_SIZE * 2;
+
+inline uint16_t Reverse16(uint16_t value) {
+    return (((value & 0x00FF) << 8) | ((value & 0xFF00) >> 8));
+}
+
+std::unique_ptr<BlockAudioEncoderInterface> OpusAudioEncoder::createEncoder() {
+    return std::unique_ptr<OpusAudioEncoder>(new OpusAudioEncoder);
+}
+
+OpusAudioEncoder::~OpusAudioEncoder() {
+    close();
+}
+
+bool OpusAudioEncoder::init(AudioFormat inputFormat) {
+    m_inputFormat = inputFormat;
+
+    if (inputFormat.sampleRateHz != SAMPLE_RATE) {
+        ACSDK_ERROR(LX("initFailed").d("reason", "Input sampling rate is invalid"));
+        return false;
+    }
+    if (inputFormat.encoding != AudioFormat::Encoding::LPCM) {
+        ACSDK_ERROR(LX("initFailed").d("reason", "Input audio format must be LPCM"));
+        return false;
+    }
+    if (inputFormat.numChannels == 2 && inputFormat.layout != AudioFormat::Layout::INTERLEAVED) {
+        // Error, only interleaved frames are supported for 2 channel
+        ACSDK_ERROR(LX("initFailed").d("reason", "Input audio format must be interleaved"));
+        return false;
+    }
+
+    m_outputFormat.numChannels = inputFormat.numChannels;
+    return true;
+}
+
+size_t OpusAudioEncoder::getInputFrameSize() {
+    return FRAME_SIZE;
+}
+
+size_t OpusAudioEncoder::getOutputFrameSize() {
+    return PACKET_SIZE;
+}
+
+bool OpusAudioEncoder::requiresFullyRead() {
+    return true;
+}
+
+AudioFormat OpusAudioEncoder::getAudioFormat() {
+    return m_outputFormat;
+}
+
+std::string OpusAudioEncoder::getAVSFormatName() {
+    return AVS_FORMAT;
+}
+
+bool OpusAudioEncoder::configureEncoder() {
+    int err;
+
+    // Use 32k bit rate
+    err = opus_encoder_ctl(m_encoder, OPUS_SET_BITRATE(BIT_RATE));
+    if (err != OPUS_OK) {
+        ACSDK_ERROR(LX("startFailed").d("reason", "Failed to set bitrate to 32kbps").d("err", err));
+        return false;
+    }
+
+    // CBR Only
+    err = opus_encoder_ctl(m_encoder, OPUS_SET_VBR(0));
+    if (err != OPUS_OK) {
+        ACSDK_ERROR(LX("startFailed").d("reason", "Failed to set hard-CBR").d("err", err));
+        return false;
+    }
+
+    // 20ms framesize
+    err = opus_encoder_ctl(m_encoder, OPUS_SET_EXPERT_FRAME_DURATION(OPUS_FRAMESIZE_20_MS));
+    if (err != OPUS_OK) {
+        ACSDK_ERROR(LX("startFailed").d("reason", "Failed to set frame size to 20ms").d("err", err));
+        return false;
+    }
+
+    return true;
+}
+
+bool OpusAudioEncoder::start(Bytes&) {
+    int err;
+
+    if (m_encoder) {
+        ACSDK_ERROR(LX("startFailed").d("reason", "OpusEncoder is not null"));
+        return false;
+    }
+
+    m_encoder = opus_encoder_create(m_inputFormat.sampleRateHz, m_inputFormat.numChannels, OPUS_APPLICATION_VOIP, &err);
+
+    if (err != OPUS_OK) {
+        ACSDK_ERROR(LX("startFailed").d("reason", "Failed to create OpusEncoder").d("err", err));
+        return false;
+    }
+
+    if (!m_encoder) {
+        ACSDK_ERROR(LX("startFailed").d("reason", "OpusEncoder is null"));
+        return false;
+    }
+
+    if (!configureEncoder()) {
+        // Destroy previously created encoder
+        opus_encoder_destroy(m_encoder);
+        return false;
+    }
+
+    return true;
+}
+
+bool OpusAudioEncoder::processSamples(Bytes::const_iterator begin, Bytes::const_iterator end, Bytes& buffer) {
+    opus_int16 pcm[FRAME_SIZE];
+
+    if (end <= begin) {
+        ACSDK_ERROR(LX("processSamplesError").d("reason", "InputRangeNegative"));
+        return false;
+    }
+    const auto byteCount = static_cast<std::size_t>(std::distance(begin, end));
+    if (byteCount > sizeof(pcm)) {
+        ACSDK_ERROR(LX("processSamplesError").d("reason", "InputTooLarge"));
+        return false;
+    }
+    if (byteCount % sizeof(opus_int16)) {
+        ACSDK_ERROR(LX("processSamplesError").d("reason", "InputHasIncompleteSample"));
+        return false;
+    }
+
+    std::memcpy(pcm, &*begin, byteCount);
+    const bool littleEndianInput = m_inputFormat.endianness == AudioFormat::Endianness::LITTLE;
+    const size_t numberOfWords = byteCount / sizeof(opus_int16);
+
+    if (littleEndianInput != littleEndianMachine()) {
+        for (size_t i = 0; i < numberOfWords; i++) {
+            pcm[i] = Reverse16(pcm[i]);
+        }
+    }
+
+    const auto bufferOffset = buffer.size();
+#if __cpp_exceptions || defined(__EXCEPTIONS)
+    try {
+#endif
+        buffer.resize(bufferOffset + MAX_PACKET_SIZE);
+#if __cpp_exceptions || defined(__EXCEPTIONS)
+    } catch (const std::bad_alloc& e) {
+        ACSDK_ERROR(LX("processSamplesError").d("bufferResizeFailed", e.what()));
+        return false;
+    }
+#endif
+
+    opus_int32 res =
+        opus_encode(m_encoder, pcm, static_cast<int>(numberOfWords), buffer.data() + bufferOffset, MAX_PACKET_SIZE);
+    if (res >= 0) {
+        buffer.resize(bufferOffset + static_cast<size_t>(res));
+        return true;
+    } else {
+        ACSDK_ERROR(LX("processSamplesError").d("code", res));
+        buffer.resize(bufferOffset);
+        return false;
+    }
+}
+
+bool OpusAudioEncoder::flush(Bytes&) {
+    return true;
+}
+
+void OpusAudioEncoder::close() {
+    if (m_encoder) {
+        opus_encoder_destroy(m_encoder);
+        m_encoder = nullptr;
+    }
+}
+
+OpusAudioEncoder::OpusAudioEncoder() :
+        m_encoder{nullptr},
+        m_outputFormat{
+            AudioFormat::Encoding::OPUS,
+            AudioFormat::Endianness::LITTLE,
+            SAMPLE_RATE,
+            16,
+            0,
+            false,
+            AudioFormat::Layout::INTERLEAVED,
+        } {
+}
+
+}  // namespace opusAudioEncoder
+}  // namespace alexaClientSDK
diff --git a/core/Authorization/acsdkAuthorization/include/acsdkAuthorization/LWA/LWAAuthorizationAdapter.h b/core/Authorization/acsdkAuthorization/include/acsdkAuthorization/LWA/LWAAuthorizationAdapter.h
index 39687ed780..a06979398c 100644
--- a/core/Authorization/acsdkAuthorization/include/acsdkAuthorization/LWA/LWAAuthorizationAdapter.h
+++ b/core/Authorization/acsdkAuthorization/include/acsdkAuthorization/LWA/LWAAuthorizationAdapter.h
@@ -351,6 +351,12 @@ class LWAAuthorizationAdapter
      */
     void stop();
 
+    /**
+     * Stop the current auth attempt by resetting m_authMethod. This will force LWAAuthorizationAdapter to wait for a
+     * new Auth operation. The mutex should be locked before calling this method.
+     */
+    void resetAuthMethodLocked();
+
     /**
      * A wrapper function that acquires the mutex and then calls @c setRefreshTokenResponseLocked().
      *
diff --git a/core/Authorization/acsdkAuthorization/include/acsdkAuthorization/LWA/LWAAuthorizationStorage.h b/core/Authorization/acsdkAuthorization/include/acsdkAuthorization/LWA/LWAAuthorizationStorage.h
index 4ae48fe52d..9c12de795f 100644
--- a/core/Authorization/acsdkAuthorization/include/acsdkAuthorization/LWA/LWAAuthorizationStorage.h
+++ b/core/Authorization/acsdkAuthorization/include/acsdkAuthorization/LWA/LWAAuthorizationStorage.h
@@ -20,9 +20,9 @@
 #include <string>
 
 #include <acsdkAuthorizationInterfaces/LWA/LWAAuthorizationStorageInterface.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
-#include <acsdkPropertiesInterfaces/PropertiesFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/PropertiesInterfaces/PropertiesFactoryInterface.h>
 #include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
 #include <SQLiteStorage/SQLiteMiscStorage.h>
@@ -39,7 +39,7 @@ namespace lwa {
  * This implementation class adapts properties interface to domain-specific authorization storage interface. Depending
  * on
  *
- * @sa PropertiesAPI
+ * @sa Lib_acsdkPropertiesInterfaces
  */
 class LWAAuthorizationStorage : public acsdkAuthorizationInterfaces::lwa::LWAAuthorizationStorageInterface {
 public:
@@ -54,7 +54,7 @@ class LWAAuthorizationStorage : public acsdkAuthorizationInterfaces::lwa::LWAAut
      * @return Pointer to the LWAAuthorizationStorage object, nullptr if there's an error creating it.
      */
     static std::shared_ptr<LWAAuthorizationStorageInterface> createStorage(
-        const std::shared_ptr<acsdkPropertiesInterfaces::PropertiesFactoryInterface>& propertiesFactory);
+        const std::shared_ptr<propertiesInterfaces::PropertiesFactoryInterface>& propertiesFactory);
 
     /**
      * @brief Create storage interface backed by SQLite.
@@ -78,8 +78,8 @@ class LWAAuthorizationStorage : public acsdkAuthorizationInterfaces::lwa::LWAAut
     createLWAAuthorizationStorageInterface(
         const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationRoot,
         const std::string& storageRootKey,
-        const std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
-        const std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>& keyStore);
+        const std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+        const std::shared_ptr<cryptoInterfaces::KeyStoreInterface>& keyStore);
 
     /**
      * Destructor.
@@ -133,14 +133,13 @@ class LWAAuthorizationStorage : public acsdkAuthorizationInterfaces::lwa::LWAAut
      * Constructor.
      */
     LWAAuthorizationStorage(
-        const std::shared_ptr<alexaClientSDK::acsdkPropertiesInterfaces::PropertiesFactoryInterface>&
-            propertiesFactory);
+        const std::shared_ptr<alexaClientSDK::propertiesInterfaces::PropertiesFactoryInterface>& propertiesFactory);
 
     /// The underlying properties factory class;
-    std::shared_ptr<alexaClientSDK::acsdkPropertiesInterfaces::PropertiesFactoryInterface> m_propertiesFactory;
+    std::shared_ptr<alexaClientSDK::propertiesInterfaces::PropertiesFactoryInterface> m_propertiesFactory;
 
     /// The underlying properties class;
-    std::shared_ptr<alexaClientSDK::acsdkPropertiesInterfaces::PropertiesInterface> m_properties;
+    std::shared_ptr<alexaClientSDK::propertiesInterfaces::PropertiesInterface> m_properties;
 
     /// Friend class for member access.
     friend class LWAAuthorizationStorageTestHelper;
diff --git a/core/Authorization/acsdkAuthorization/privateInclude/acsdkAuthorization/private/LWA/LWAStorageConstants.h b/core/Authorization/acsdkAuthorization/privateInclude/acsdkAuthorization/private/LWA/LWAStorageConstants.h
index 296c163f74..97fe35b2ae 100644
--- a/core/Authorization/acsdkAuthorization/privateInclude/acsdkAuthorization/private/LWA/LWAStorageConstants.h
+++ b/core/Authorization/acsdkAuthorization/privateInclude/acsdkAuthorization/private/LWA/LWAStorageConstants.h
@@ -19,7 +19,7 @@
 #include <memory>
 #include <string>
 
-#include <acsdkPropertiesInterfaces/PropertiesFactoryInterface.h>
+#include <acsdk/PropertiesInterfaces/PropertiesFactoryInterface.h>
 #include <SQLiteStorage/SQLiteMiscStorage.h>
 
 namespace alexaClientSDK {
diff --git a/core/Authorization/acsdkAuthorization/privateInclude/acsdkAuthorization/private/LWA/LWAStorageDataMigration.h b/core/Authorization/acsdkAuthorization/privateInclude/acsdkAuthorization/private/LWA/LWAStorageDataMigration.h
index 957d97d5e8..d716ee2c6e 100644
--- a/core/Authorization/acsdkAuthorization/privateInclude/acsdkAuthorization/private/LWA/LWAStorageDataMigration.h
+++ b/core/Authorization/acsdkAuthorization/privateInclude/acsdkAuthorization/private/LWA/LWAStorageDataMigration.h
@@ -19,7 +19,7 @@
 #include <memory>
 #include <string>
 
-#include <acsdkPropertiesInterfaces/PropertiesFactoryInterface.h>
+#include <acsdk/PropertiesInterfaces/PropertiesFactoryInterface.h>
 #include <SQLiteStorage/SQLiteMiscStorage.h>
 
 namespace alexaClientSDK {
@@ -38,7 +38,7 @@ class LWAStorageDataMigration {
 public:
     LWAStorageDataMigration(
         const std::shared_ptr<storage::sqliteStorage::SQLiteMiscStorage>& storage,
-        const std::shared_ptr<acsdkPropertiesInterfaces::PropertiesFactoryInterface>& propertiesFactory) noexcept;
+        const std::shared_ptr<propertiesInterfaces::PropertiesFactoryInterface>& propertiesFactory) noexcept;
 
     /**
      * @brief Upgrades storage structure if required.
@@ -68,12 +68,12 @@ class LWAStorageDataMigration {
     bool migrateSinglePropertyTable(
         const std::string& tableName,
         const std::string& columnName,
-        const std::shared_ptr<alexaClientSDK::acsdkPropertiesInterfaces::PropertiesInterface>& properties,
+        const std::shared_ptr<alexaClientSDK::propertiesInterfaces::PropertiesInterface>& properties,
         const std::string& propertyName) noexcept;
 
 private:
     const std::shared_ptr<storage::sqliteStorage::SQLiteMiscStorage> m_storage;
-    const std::shared_ptr<acsdkPropertiesInterfaces::PropertiesFactoryInterface> m_propertiesFactory;
+    const std::shared_ptr<propertiesInterfaces::PropertiesFactoryInterface> m_propertiesFactory;
 };
 
 }  // namespace lwa
diff --git a/core/Authorization/acsdkAuthorization/src/AuthorizationManager.cpp b/core/Authorization/acsdkAuthorization/src/AuthorizationManager.cpp
index 12deeb4139..328226214f 100644
--- a/core/Authorization/acsdkAuthorization/src/AuthorizationManager.cpp
+++ b/core/Authorization/acsdkAuthorization/src/AuthorizationManager.cpp
@@ -17,7 +17,7 @@
 #include <acsdkAuthorization/private/Logging.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"AuthorizationManager"};
+#define TAG "AuthorizationManager"
 
 namespace alexaClientSDK {
 namespace acsdkAuthorization {
@@ -115,7 +115,7 @@ void AuthorizationManager::reportStateChange(
         return;
     }
 
-    m_executor.submit([this, state, authId, userId] { handleTransition(state, authId, userId); });
+    m_executor.execute([this, state, authId, userId] { handleTransition(state, authId, userId); });
 }
 
 void AuthorizationManager::setStateLocked(const avsCommon::sdkInterfaces::AuthObserverInterface::FullState& state) {
@@ -258,7 +258,6 @@ void AuthorizationManager::handleTransition(
             break;
         case AuthObserverInterface::State::UNRECOVERABLE_ERROR:
             setStateLocked(newState);
-            logoutHelper(lock);
             return;
     };
 
diff --git a/core/Authorization/acsdkAuthorization/src/AuthorizationManagerStorage.cpp b/core/Authorization/acsdkAuthorization/src/AuthorizationManagerStorage.cpp
index edf9705073..8311588769 100644
--- a/core/Authorization/acsdkAuthorization/src/AuthorizationManagerStorage.cpp
+++ b/core/Authorization/acsdkAuthorization/src/AuthorizationManagerStorage.cpp
@@ -17,7 +17,7 @@
 #include <acsdkAuthorization/private/Logging.h>
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"AuthorizationManagerStorage"};
+#define TAG "AuthorizationManagerStorage"
 
 namespace alexaClientSDK {
 namespace acsdkAuthorization {
diff --git a/core/Authorization/acsdkAuthorization/src/LWA/LWAAuthorizationAdapter.cpp b/core/Authorization/acsdkAuthorization/src/LWA/LWAAuthorizationAdapter.cpp
index 2a3fe9bf3f..d46bc4f848 100644
--- a/core/Authorization/acsdkAuthorization/src/LWA/LWAAuthorizationAdapter.cpp
+++ b/core/Authorization/acsdkAuthorization/src/LWA/LWAAuthorizationAdapter.cpp
@@ -44,7 +44,7 @@ using namespace avsCommon::utils::libcurlUtils;
 using namespace rapidjson;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("LWAAuthorizationAdapter");
+#define TAG "LWAAuthorizationAdapter"
 
 /// Key for user_code values in JSON returned by @c LWA
 static const char JSON_KEY_USER_CODE[] = "user_code";
@@ -738,6 +738,11 @@ LWAAuthorizationAdapter::FlowState LWAAuthorizationAdapter::handleRequestingToke
                 updateStateAndNotifyManager(
                     AuthObserverInterface::State::UNINITIALIZED, AuthObserverInterface::Error::SUCCESS);
             } else {
+                {
+                    std::lock_guard<std::mutex> lock(m_mutex);
+                    resetAuthMethodLocked();
+                }
+
                 updateStateAndNotifyManager(AuthObserverInterface::State::UNRECOVERABLE_ERROR, result.value());
             }
 
@@ -752,6 +757,11 @@ LWAAuthorizationAdapter::FlowState LWAAuthorizationAdapter::handleRequestingToke
     return FlowState::IDLE;
 }
 
+void LWAAuthorizationAdapter::resetAuthMethodLocked() {
+    ACSDK_DEBUG5(LX("resetAuthMethodLocked"));
+    m_authMethod = TokenExchangeMethod::NONE;
+}
+
 bool LWAAuthorizationAdapter::getCustomerProfile(const std::string& accessToken) {
     ACSDK_DEBUG5(LX("getCustomerProfile"));
     std::string url = m_configuration->getCustomerProfileUrl() + "?access_token=" + accessToken;
@@ -913,6 +923,7 @@ LWAAuthorizationAdapter::FlowState LWAAuthorizationAdapter::handleRefreshingToke
                 case AuthObserverInterface::Error::INVALID_CODE_PAIR:
                 case AuthObserverInterface::Error::INTERNAL_ERROR:
                 case AuthObserverInterface::Error::INVALID_CBL_CLIENT_ID: {
+                    resetAuthMethodLocked();
                     updateStateAndNotifyManager(AuthObserverInterface::State::UNRECOVERABLE_ERROR, error);
                     return FlowState::IDLE;
                 }
@@ -1137,7 +1148,7 @@ void LWAAuthorizationAdapter::reset() {
     m_userCode.clear();
     m_tokenRequestInterval = std::chrono::seconds::zero();
     m_authFailureReported = false;
-    m_authMethod = TokenExchangeMethod::NONE;
+    resetAuthMethodLocked();
     m_isClearingData = true;
     m_wake.notify_one();
 }
diff --git a/core/Authorization/acsdkAuthorization/src/LWA/LWAAuthorizationConfiguration.cpp b/core/Authorization/acsdkAuthorization/src/LWA/LWAAuthorizationConfiguration.cpp
index f3a9cdbad9..3cd443e0a9 100644
--- a/core/Authorization/acsdkAuthorization/src/LWA/LWAAuthorizationConfiguration.cpp
+++ b/core/Authorization/acsdkAuthorization/src/LWA/LWAAuthorizationConfiguration.cpp
@@ -33,7 +33,7 @@ using namespace avsCommon::utils::json::jsonUtils;
 using namespace rapidjson;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("LWAAuthorizationConfiguration");
+#define TAG "LWAAuthorizationConfiguration"
 
 /// Name of @c ConfigurationNode for LWAAuthorization
 static const std::string CONFIG_KEY_LWA_AUTHORIZATION = "lwaAuthorization";
diff --git a/core/Authorization/acsdkAuthorization/src/LWA/LWAAuthorizationStorage.cpp b/core/Authorization/acsdkAuthorization/src/LWA/LWAAuthorizationStorage.cpp
index 28b9648f5f..b633222b6b 100644
--- a/core/Authorization/acsdkAuthorization/src/LWA/LWAAuthorizationStorage.cpp
+++ b/core/Authorization/acsdkAuthorization/src/LWA/LWAAuthorizationStorage.cpp
@@ -19,8 +19,8 @@
 #include <acsdkAuthorization/private/Logging.h>
 #include <acsdkAuthorization/private/LWA/LWAStorageConstants.h>
 #include <acsdkAuthorization/private/LWA/LWAStorageDataMigration.h>
-#include <acsdkProperties/EncryptedPropertiesFactories.h>
-#include <acsdkProperties/MiscStorageAdapter.h>
+#include <acsdk/Properties/EncryptedPropertiesFactories.h>
+#include <acsdk/Properties/MiscStorageAdapter.h>
 #include <AVSCommon/Utils/FileSystem/FileSystemUtils.h>
 #include <SQLiteStorage/SQLiteMiscStorage.h>
 
@@ -30,14 +30,14 @@ namespace lwa {
 
 using namespace ::alexaClientSDK::acsdkAuthorizationInterfaces;
 using namespace ::alexaClientSDK::acsdkAuthorizationInterfaces::lwa;
-using namespace ::alexaClientSDK::acsdkProperties;
-using namespace ::alexaClientSDK::acsdkPropertiesInterfaces;
+using namespace ::alexaClientSDK::properties;
+using namespace ::alexaClientSDK::propertiesInterfaces;
 using namespace ::alexaClientSDK::avsCommon::utils::configuration;
 using namespace ::alexaClientSDK::avsCommon::utils::logger;
 using namespace ::alexaClientSDK::storage;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("LWAAuthorizationStorage");
+#define TAG "LWAAuthorizationStorage"
 
 /// Name of default @c ConfigurationNode for LWA
 static const std::string CONFIG_KEY_LWA_AUTHORIZATION = "lwaAuthorization";
@@ -46,7 +46,7 @@ static const std::string CONFIG_KEY_LWA_AUTHORIZATION = "lwaAuthorization";
 static const std::string CONFIG_KEY_DB_FILE_PATH_KEY = "databaseFilePath";
 
 std::shared_ptr<LWAAuthorizationStorageInterface> LWAAuthorizationStorage::createStorage(
-    const std::shared_ptr<acsdkPropertiesInterfaces::PropertiesFactoryInterface>& propertiesFactory) {
+    const std::shared_ptr<propertiesInterfaces::PropertiesFactoryInterface>& propertiesFactory) {
     if (!propertiesFactory) {
         ACSDK_ERROR(LX("createStorageFailed").d("reason", "propertiesFactoryNull"));
         return nullptr;
@@ -126,8 +126,8 @@ std::shared_ptr<storage::sqliteStorage::SQLiteMiscStorage> LWAAuthorizationStora
 std::shared_ptr<LWAAuthorizationStorageInterface> LWAAuthorizationStorage::createLWAAuthorizationStorageInterface(
     const std::shared_ptr<avsCommon::utils::configuration::ConfigurationNode>& configurationRoot,
     const std::string& storageRootKey,
-    const std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
-    const std::shared_ptr<acsdkCryptoInterfaces::KeyStoreInterface>& keyStore) {
+    const std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+    const std::shared_ptr<cryptoInterfaces::KeyStoreInterface>& keyStore) {
     ACSDK_DEBUG0(LX("createLWAAuthorizationStorageInterface"));
 
     bool useEncryptionAtRest = true;
diff --git a/core/Authorization/acsdkAuthorization/src/LWA/LWAStorageDataMigration.cpp b/core/Authorization/acsdkAuthorization/src/LWA/LWAStorageDataMigration.cpp
index bd6fb31c02..d58b48c412 100644
--- a/core/Authorization/acsdkAuthorization/src/LWA/LWAStorageDataMigration.cpp
+++ b/core/Authorization/acsdkAuthorization/src/LWA/LWAStorageDataMigration.cpp
@@ -22,17 +22,17 @@ namespace alexaClientSDK {
 namespace acsdkAuthorization {
 namespace lwa {
 
-using namespace ::alexaClientSDK::acsdkPropertiesInterfaces;
+using namespace ::alexaClientSDK::propertiesInterfaces;
 using namespace ::alexaClientSDK::storage;
 using namespace ::alexaClientSDK::avsCommon::utils::logger;
 using namespace ::alexaClientSDK::avsCommon::utils::error;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("LWAStorageDataMigration");
+#define TAG "LWAStorageDataMigration"
 
 LWAStorageDataMigration::LWAStorageDataMigration(
     const std::shared_ptr<storage::sqliteStorage::SQLiteMiscStorage>& storage,
-    const std::shared_ptr<acsdkPropertiesInterfaces::PropertiesFactoryInterface>& propertiesFactory) noexcept :
+    const std::shared_ptr<propertiesInterfaces::PropertiesFactoryInterface>& propertiesFactory) noexcept :
         m_storage{storage},
         m_propertiesFactory{propertiesFactory} {
 }
@@ -69,7 +69,7 @@ void LWAStorageDataMigration::upgradeStorage() noexcept {
 bool LWAStorageDataMigration::migrateSinglePropertyTable(
     const std::string& tableName,
     const std::string& columnName,
-    const std::shared_ptr<alexaClientSDK::acsdkPropertiesInterfaces::PropertiesInterface>& properties,
+    const std::shared_ptr<alexaClientSDK::propertiesInterfaces::PropertiesInterface>& properties,
     const std::string& propertyName) noexcept {
     if (!m_storage) {
         ACSDK_ERROR(LX("migrateSinglePropertyTableFailed").d("reason", "storageNull"));
diff --git a/core/Authorization/acsdkAuthorization/test/AuthorizationManagerTest.cpp b/core/Authorization/acsdkAuthorization/test/AuthorizationManagerTest.cpp
index 3a6ad64ba1..5bdc688f43 100644
--- a/core/Authorization/acsdkAuthorization/test/AuthorizationManagerTest.cpp
+++ b/core/Authorization/acsdkAuthorization/test/AuthorizationManagerTest.cpp
@@ -258,8 +258,8 @@ TEST_F(AuthorizationManagerTest, test_refreshedState_Persisted) {
     EXPECT_TRUE(storageHasKeyValue(MISC_TABLE_USER_ID_KEY, USER_ID));
 }
 
-/// Check logout behavior if AuthorizationManager is in the UNRECOVERABLE_ERROR state.
-TEST_F(AuthorizationManagerTest, test_unrecoverableError_Logout) {
+/// Check the behavior if AuthorizationManager is in the UNRECOVERABLE_ERROR state.
+TEST_F(AuthorizationManagerTest, test_unrecoverableError_Success) {
     {
         InSequence s;
 
@@ -270,17 +270,10 @@ TEST_F(AuthorizationManagerTest, test_unrecoverableError_Logout) {
         EXPECT_CALL(
             *m_mockAuthObsv,
             onAuthStateChange(
-                AuthObserverInterface::State::UNRECOVERABLE_ERROR, AuthObserverInterface::Error::UNKNOWN_ERROR));
-
-        EXPECT_CALL(
-            *m_mockAuthObsv,
-            onAuthStateChange(AuthObserverInterface::State::UNINITIALIZED, AuthObserverInterface::Error::SUCCESS))
+                AuthObserverInterface::State::UNRECOVERABLE_ERROR, AuthObserverInterface::Error::UNKNOWN_ERROR))
             .WillOnce(InvokeWithoutArgs([this]() { m_wait.wakeUp(); }));
     }
 
-    EXPECT_CALL(*m_mockRegMgr, logout());
-    EXPECT_CALL(*m_mockAdapter, reset());
-
     m_authMgr->reportStateChange(
         {AuthObserverInterface::State::AUTHORIZING, AuthObserverInterface::Error::SUCCESS}, ADAPTER_ID, USER_ID);
 
@@ -290,9 +283,6 @@ TEST_F(AuthorizationManagerTest, test_unrecoverableError_Logout) {
         USER_ID);
 
     EXPECT_TRUE(m_wait.wait(TIMEOUT));
-
-    EXPECT_FALSE(storageHasKey(MISC_TABLE_ADAPTER_ID_KEY));
-    EXPECT_FALSE(storageHasKey(MISC_TABLE_USER_ID_KEY));
 }
 
 /// Check invalid transitions.
diff --git a/core/Authorization/acsdkAuthorization/test/LWAAuthStorageMigrationTest.cpp b/core/Authorization/acsdkAuthorization/test/LWAAuthStorageMigrationTest.cpp
index f4126df22d..03d18b9445 100644
--- a/core/Authorization/acsdkAuthorization/test/LWAAuthStorageMigrationTest.cpp
+++ b/core/Authorization/acsdkAuthorization/test/LWAAuthStorageMigrationTest.cpp
@@ -16,8 +16,8 @@
 
 #include <gtest/gtest.h>
 
-#include <acsdkPropertiesInterfaces/test/StubPropertiesFactory.h>
-#include <acsdkProperties/MiscStorageAdapter.h>
+#include <acsdk/PropertiesInterfaces/test/StubPropertiesFactory.h>
+#include <acsdk/Properties/MiscStorageAdapter.h>
 #include <acsdkAuthorization/private/LWA/LWAStorageDataMigration.h>
 #include <acsdkAuthorization/private/LWA/LWAStorageConstants.h>
 #include <acsdkAuthorization/private/Logging.h>
@@ -29,8 +29,8 @@ namespace acsdkAuthorization {
 namespace lwa {
 namespace test {
 
-using namespace ::alexaClientSDK::acsdkProperties;
-using namespace ::alexaClientSDK::acsdkPropertiesInterfaces::test;
+using namespace ::alexaClientSDK::properties;
+using namespace ::alexaClientSDK::propertiesInterfaces::test;
 using namespace ::alexaClientSDK::avsCommon::sdkInterfaces::storage;
 using namespace ::alexaClientSDK::avsCommon::utils::configuration;
 using namespace ::alexaClientSDK::storage::sqliteStorage;
diff --git a/core/Authorization/acsdkAuthorization/test/LWAAuthorizationStorageTest.cpp b/core/Authorization/acsdkAuthorization/test/LWAAuthorizationStorageTest.cpp
index e0b6856163..2f64889687 100644
--- a/core/Authorization/acsdkAuthorization/test/LWAAuthorizationStorageTest.cpp
+++ b/core/Authorization/acsdkAuthorization/test/LWAAuthorizationStorageTest.cpp
@@ -17,7 +17,7 @@
 #include <thread>
 #include <gtest/gtest.h>
 
-#include <acsdkPropertiesInterfaces/test/StubPropertiesFactory.h>
+#include <acsdk/PropertiesInterfaces/test/StubPropertiesFactory.h>
 #include <acsdkAuthorization/LWA/LWAAuthorizationStorage.h>
 #include <acsdkAuthorization/private/LWA/LWAStorageConstants.h>
 #include <AVSCommon/AVS/Initialization/AlexaClientSDKInit.h>
@@ -29,7 +29,7 @@ namespace acsdkAuthorization {
 namespace lwa {
 namespace test {
 
-using namespace ::alexaClientSDK::acsdkPropertiesInterfaces::test;
+using namespace ::alexaClientSDK::propertiesInterfaces::test;
 using namespace ::alexaClientSDK::avsCommon::avs::initialization;
 using namespace ::alexaClientSDK::avsCommon::sdkInterfaces::storage;
 using namespace ::alexaClientSDK::avsCommon::utils::configuration;
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 20fed9cfd2..253d9739fa 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 add_subdirectory("acsdkAlexaEventProcessedNotifierInterfaces")
-add_subdirectory("acsdkCodecUtils")
 add_subdirectory("acsdkCore")
 add_subdirectory("acsdkPostConnectOperationProviderRegistrar")
 add_subdirectory("acsdkPostConnectOperationProviderRegistrarInterfaces")
@@ -9,6 +8,8 @@ add_subdirectory("acsdkRegistrationManager")
 add_subdirectory("acsdkRegistrationManagerInterfaces")
 add_subdirectory("acsdkSystemClockMonitor")
 add_subdirectory("acsdkSystemClockMonitorInterfaces")
+add_subdirectory("AudioEncoder")
 add_subdirectory("Authorization")
+add_subdirectory("CodecUtils")
 add_subdirectory("Crypto")
 add_subdirectory("Properties")
diff --git a/core/acsdkCodecUtils/CMakeLists.txt b/core/CodecUtils/CMakeLists.txt
similarity index 100%
rename from core/acsdkCodecUtils/CMakeLists.txt
rename to core/CodecUtils/CMakeLists.txt
diff --git a/core/acsdkCodecUtils/doc/CodecUtils.dox b/core/CodecUtils/doc/CodecUtils.dox
similarity index 78%
rename from core/acsdkCodecUtils/doc/CodecUtils.dox
rename to core/CodecUtils/doc/CodecUtils.dox
index d10fc6781c..a514925b39 100644
--- a/core/acsdkCodecUtils/doc/CodecUtils.dox
+++ b/core/CodecUtils/doc/CodecUtils.dox
@@ -14,20 +14,20 @@
  */
 
 /**
- * \defgroup CodecUtils Binary Codec Utilities
+ * \defgroup acsdkCodecUtils Binary Codec Utilities
  * @brief Non-cryptographic binary encoders and decoders
  *
  * This module includes functions for non-cryptographic binary encoders and decoders.
  *
- * \sa \ref acsdkCodecUtils Namespace
- * \sa \ref acsdkCodecUtils::test Namespace
+ * \sa \ref alexaClientSDK::codecUtils Namespace
+ * \sa \ref alexaClientSDK::codecUtils::test Namespace
  *
- * \namespace ::alexaClientSDK::acsdkCodecUtils
+ * \namespace ::alexaClientSDK::codecUtils
  * \brief Binary codec utilities.
  * \ingroup CodecUtils
  * \sa CodecUtils
  *
- * \namespace ::alexaClientSDK::acsdkCodecUtils::test
+ * \namespace ::alexaClientSDK::codecUtils::test
  * \brief Test cases for \ref CodecUtils
  * \ingroup CodecUtils
  * \sa CodecUtils
diff --git a/core/acsdkCodecUtils/include/acsdkCodecUtils/Base64.h b/core/CodecUtils/include/acsdk/CodecUtils/Base64.h
similarity index 91%
rename from core/acsdkCodecUtils/include/acsdkCodecUtils/Base64.h
rename to core/CodecUtils/include/acsdk/CodecUtils/Base64.h
index 15ce2ee347..dce66ecc9c 100644
--- a/core/acsdkCodecUtils/include/acsdkCodecUtils/Base64.h
+++ b/core/CodecUtils/include/acsdk/CodecUtils/Base64.h
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCODECUTILS_BASE64_H_
-#define ACSDKCODECUTILS_BASE64_H_
+#ifndef ACSDK_CODECUTILS_BASE64_H_
+#define ACSDK_CODECUTILS_BASE64_H_
 
 #include <string>
-#include <acsdkCodecUtils/Types.h>
+#include <acsdk/CodecUtils/Types.h>
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 
 /**
  * @brief Encodes binary data into string using Base64.
@@ -58,7 +58,7 @@ bool encodeBase64(const Bytes& binary, std::string& base64String) noexcept;
  */
 bool decodeBase64(const std::string& base64String, Bytes& binary) noexcept;
 
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCODECUTILS_BASE64_H_
+#endif  // ACSDK_CODECUTILS_BASE64_H_
diff --git a/core/acsdkCodecUtils/include/acsdkCodecUtils/Hex.h b/core/CodecUtils/include/acsdk/CodecUtils/Hex.h
similarity index 91%
rename from core/acsdkCodecUtils/include/acsdkCodecUtils/Hex.h
rename to core/CodecUtils/include/acsdk/CodecUtils/Hex.h
index ba6d8943e8..a40821d808 100644
--- a/core/acsdkCodecUtils/include/acsdkCodecUtils/Hex.h
+++ b/core/CodecUtils/include/acsdk/CodecUtils/Hex.h
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCODECUTILS_HEX_H_
-#define ACSDKCODECUTILS_HEX_H_
+#ifndef ACSDK_CODECUTILS_HEX_H_
+#define ACSDK_CODECUTILS_HEX_H_
 
 #include <string>
-#include <acsdkCodecUtils/Types.h>
+#include <acsdk/CodecUtils/Types.h>
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 
 /**
  * Encode binary data into string using hex encoding.
@@ -58,7 +58,7 @@ bool encodeHex(const Bytes& binary, std::string& hexString) noexcept;
  */
 bool decodeHex(const std::string& hexString, Bytes& binary) noexcept;
 
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCODECUTILS_HEX_H_
+#endif  // ACSDK_CODECUTILS_HEX_H_
diff --git a/core/acsdkCodecUtils/include/acsdkCodecUtils/Types.h b/core/CodecUtils/include/acsdk/CodecUtils/Types.h
similarity index 83%
rename from core/acsdkCodecUtils/include/acsdkCodecUtils/Types.h
rename to core/CodecUtils/include/acsdk/CodecUtils/Types.h
index 585975ea4c..66a8237fff 100644
--- a/core/acsdkCodecUtils/include/acsdkCodecUtils/Types.h
+++ b/core/CodecUtils/include/acsdk/CodecUtils/Types.h
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCODECUTILS_TYPES_H_
-#define ACSDKCODECUTILS_TYPES_H_
+#ifndef ACSDK_CODECUTILS_TYPES_H_
+#define ACSDK_CODECUTILS_TYPES_H_
 
 #include <vector>
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 
 /// @brief Byte data type.
 /// @ingroup CodecUtils
@@ -29,7 +29,7 @@ typedef unsigned char Byte;
 /// @ingroup CodecUtils
 typedef std::vector<Byte> Bytes;
 
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCODECUTILS_TYPES_H_
+#endif  // ACSDK_CODECUTILS_TYPES_H_
diff --git a/core/acsdkCodecUtils/privateInclude/acsdkCodecUtils/private/Base64Common.h b/core/CodecUtils/privateInclude/acsdk/CodecUtils/private/Base64Common.h
similarity index 83%
rename from core/acsdkCodecUtils/privateInclude/acsdkCodecUtils/private/Base64Common.h
rename to core/CodecUtils/privateInclude/acsdk/CodecUtils/private/Base64Common.h
index d9a52c54fb..312c4953aa 100644
--- a/core/acsdkCodecUtils/privateInclude/acsdkCodecUtils/private/Base64Common.h
+++ b/core/CodecUtils/privateInclude/acsdk/CodecUtils/private/Base64Common.h
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCODECUTILS_PRIVATE_BASE64COMMON_H_
-#define ACSDKCODECUTILS_PRIVATE_BASE64COMMON_H_
+#ifndef ACSDK_CODECUTILS_PRIVATE_BASE64COMMON_H_
+#define ACSDK_CODECUTILS_PRIVATE_BASE64COMMON_H_
 
 #include <string>
 
-#include <acsdkCodecUtils/Types.h>
+#include <acsdk/CodecUtils/Types.h>
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 
 /// @brief Number of bytes in Base64 encoded block.
 /// @private
@@ -44,7 +44,7 @@ static constexpr unsigned B64BIN_BLOCK = 3;
  */
 bool preprocessBase64(const std::string& base64String, Bytes& output) noexcept;
 
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCODECUTILS_PRIVATE_BASE64COMMON_H_
+#endif  // ACSDK_CODECUTILS_PRIVATE_BASE64COMMON_H_
diff --git a/core/acsdkCodecUtils/privateInclude/acsdkCodecUtils/private/CodecsCommon.h b/core/CodecUtils/privateInclude/acsdk/CodecUtils/private/CodecsCommon.h
similarity index 83%
rename from core/acsdkCodecUtils/privateInclude/acsdkCodecUtils/private/CodecsCommon.h
rename to core/CodecUtils/privateInclude/acsdk/CodecUtils/private/CodecsCommon.h
index ffc153d2b3..311dc8e251 100644
--- a/core/acsdkCodecUtils/privateInclude/acsdkCodecUtils/private/CodecsCommon.h
+++ b/core/CodecUtils/privateInclude/acsdk/CodecUtils/private/CodecsCommon.h
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCODECUTILS_PRIVATE_CODECSCOMMON_H_
-#define ACSDKCODECUTILS_PRIVATE_CODECSCOMMON_H_
+#ifndef ACSDK_CODECUTILS_PRIVATE_CODECSCOMMON_H_
+#define ACSDK_CODECUTILS_PRIVATE_CODECSCOMMON_H_
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 
 /**
  * @brief Method to determine is character is ignorable when decoding data.
@@ -32,7 +32,7 @@ namespace acsdkCodecUtils {
  */
 bool isIgnorableWhitespace(char ch);
 
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCODECUTILS_PRIVATE_CODECSCOMMON_H_
+#endif  // ACSDK_CODECUTILS_PRIVATE_CODECSCOMMON_H_
diff --git a/core/acsdkCodecUtils/src/Base64Common.cpp b/core/CodecUtils/src/Base64Common.cpp
similarity index 93%
rename from core/acsdkCodecUtils/src/Base64Common.cpp
rename to core/CodecUtils/src/Base64Common.cpp
index dc6d8531ed..0a102c6f09 100644
--- a/core/acsdkCodecUtils/src/Base64Common.cpp
+++ b/core/CodecUtils/src/Base64Common.cpp
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkCodecUtils/private/Base64Common.h>
-#include <acsdkCodecUtils/private/CodecsCommon.h>
+#include <acsdk/CodecUtils/private/Base64Common.h>
+#include <acsdk/CodecUtils/private/CodecsCommon.h>
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 
 /**
  * @brief Checks if the character is valid.
@@ -71,5 +71,5 @@ bool preprocessBase64(const std::string& base64String, Bytes& output) noexcept {
     return true;
 }
 
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
diff --git a/core/acsdkCodecUtils/src/Base64Internal.cpp b/core/CodecUtils/src/Base64Internal.cpp
similarity index 97%
rename from core/acsdkCodecUtils/src/Base64Internal.cpp
rename to core/CodecUtils/src/Base64Internal.cpp
index 5254800e7f..e7b4b296f9 100644
--- a/core/acsdkCodecUtils/src/Base64Internal.cpp
+++ b/core/CodecUtils/src/Base64Internal.cpp
@@ -15,10 +15,10 @@
 
 #include <climits>
 
-#include <acsdkCodecUtils/private/Base64Common.h>
+#include <acsdk/CodecUtils/private/Base64Common.h>
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 
 /// @brief Number of bits in Base64 byte.
 /// @private
@@ -154,5 +154,5 @@ bool decodeBase64(const std::string& base64String, Bytes& binary) noexcept {
     return len <= expectedLen;
 }
 
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
diff --git a/core/acsdkCodecUtils/src/Base64OpenSsl.cpp b/core/CodecUtils/src/Base64OpenSsl.cpp
similarity index 89%
rename from core/acsdkCodecUtils/src/Base64OpenSsl.cpp
rename to core/CodecUtils/src/Base64OpenSsl.cpp
index 93c8a1996b..ac4134e041 100644
--- a/core/acsdkCodecUtils/src/Base64OpenSsl.cpp
+++ b/core/CodecUtils/src/Base64OpenSsl.cpp
@@ -15,10 +15,10 @@
 
 #include <openssl/evp.h>
 
-#include <acsdkCodecUtils/private/Base64Common.h>
+#include <acsdk/CodecUtils/private/Base64Common.h>
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 
 bool encodeBase64(const Bytes& binary, std::string& base64String) noexcept {
     if (binary.empty()) {
@@ -37,7 +37,7 @@ bool encodeBase64(const Bytes& binary, std::string& base64String) noexcept {
     int len = EVP_EncodeBlock(
         reinterpret_cast<unsigned char*>(&tmp[0]),
         reinterpret_cast<const unsigned char*>(binary.data()),
-        binary.size());
+        static_cast<int>(binary.size()));
     if (len >= 0 && static_cast<size_t>(len) == expectedLen) {
         base64String.append(tmp.data());
         return true;
@@ -58,10 +58,10 @@ bool decodeBase64(const std::string& base64String, Bytes& binary) noexcept {
     size_t expectedLen = tmp.size() / B64CHAR_BLOCK * B64BIN_BLOCK;
     size_t index = binary.size();
     binary.resize(index + expectedLen);
-    int len = EVP_DecodeBlock(&binary[index], &tmp[0], tmp.size());
+    int len = EVP_DecodeBlock(&binary[index], &tmp[0], static_cast<int>(tmp.size()));
 
     return len >= 0 && static_cast<size_t>(len) <= expectedLen;
 }
 
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
diff --git a/core/acsdkCodecUtils/src/CMakeLists.txt b/core/CodecUtils/src/CMakeLists.txt
similarity index 100%
rename from core/acsdkCodecUtils/src/CMakeLists.txt
rename to core/CodecUtils/src/CMakeLists.txt
diff --git a/core/acsdkCodecUtils/src/CodecsCommon.cpp b/core/CodecUtils/src/CodecsCommon.cpp
similarity index 89%
rename from core/acsdkCodecUtils/src/CodecsCommon.cpp
rename to core/CodecUtils/src/CodecsCommon.cpp
index 62adc4d505..7eb72e1632 100644
--- a/core/acsdkCodecUtils/src/CodecsCommon.cpp
+++ b/core/CodecUtils/src/CodecsCommon.cpp
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkCodecUtils/private/CodecsCommon.h>
+#include <acsdk/CodecUtils/private/CodecsCommon.h>
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 
 bool isIgnorableWhitespace(char ch) {
     switch (ch) {
@@ -33,5 +33,5 @@ bool isIgnorableWhitespace(char ch) {
     }
 }
 
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
diff --git a/core/acsdkCodecUtils/src/Hex.cpp b/core/CodecUtils/src/Hex.cpp
similarity index 93%
rename from core/acsdkCodecUtils/src/Hex.cpp
rename to core/CodecUtils/src/Hex.cpp
index 7a60aac410..df3b1a4c8b 100644
--- a/core/acsdkCodecUtils/src/Hex.cpp
+++ b/core/CodecUtils/src/Hex.cpp
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkCodecUtils/Hex.h>
-#include <acsdkCodecUtils/private/CodecsCommon.h>
+#include <acsdk/CodecUtils/Hex.h>
+#include <acsdk/CodecUtils/private/CodecsCommon.h>
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 
 /**
  * @brief Static table to convert binary code into ASCII character.
@@ -100,7 +100,7 @@ bool decodeHex(const std::string& hexString, Bytes& binary) noexcept {
 
         if (accumulator) {
             accumulator = false;
-            binary.push_back((b0 << 4) | b1);
+            binary.push_back(static_cast<Byte>((b0 << 4) | b1));
         } else {
             accumulator = true;
             b0 = b1;
@@ -110,5 +110,5 @@ bool decodeHex(const std::string& hexString, Bytes& binary) noexcept {
     return true;
 }
 
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
diff --git a/core/acsdkCodecUtils/test/Base64CodecTest.cpp b/core/CodecUtils/test/Base64CodecTest.cpp
similarity index 97%
rename from core/acsdkCodecUtils/test/Base64CodecTest.cpp
rename to core/CodecUtils/test/Base64CodecTest.cpp
index 02d36841e6..6b6cbdb5df 100644
--- a/core/acsdkCodecUtils/test/Base64CodecTest.cpp
+++ b/core/CodecUtils/test/Base64CodecTest.cpp
@@ -17,10 +17,10 @@
 
 #include <gtest/gtest.h>
 
-#include <acsdkCodecUtils/Base64.h>
+#include <acsdk/CodecUtils/Base64.h>
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 namespace test {
 
 using namespace ::testing;
@@ -107,7 +107,7 @@ TEST(Base64CodecTest, test_base64DecodeErrorEarlyEnd) {
 }
 
 }  // namespace test
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
 
 #endif  // ifdef CRYPTO_FOUND
diff --git a/core/acsdkCodecUtils/test/Base64InternalCodecTest.cpp b/core/CodecUtils/test/Base64InternalCodecTest.cpp
similarity index 98%
rename from core/acsdkCodecUtils/test/Base64InternalCodecTest.cpp
rename to core/CodecUtils/test/Base64InternalCodecTest.cpp
index a494bca1ed..5676705a98 100644
--- a/core/acsdkCodecUtils/test/Base64InternalCodecTest.cpp
+++ b/core/CodecUtils/test/Base64InternalCodecTest.cpp
@@ -18,7 +18,7 @@
 #include <Base64Internal.cpp>
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 namespace test {
 
 using namespace ::testing;
@@ -105,5 +105,5 @@ TEST(Base64InternalCodecTest, test_base64DecodeErrorEarlyEnd) {
 }
 
 }  // namespace test
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
diff --git a/core/acsdkCodecUtils/test/CMakeLists.txt b/core/CodecUtils/test/CMakeLists.txt
similarity index 100%
rename from core/acsdkCodecUtils/test/CMakeLists.txt
rename to core/CodecUtils/test/CMakeLists.txt
diff --git a/core/acsdkCodecUtils/test/HexCodecTest.cpp b/core/CodecUtils/test/HexCodecTest.cpp
similarity index 98%
rename from core/acsdkCodecUtils/test/HexCodecTest.cpp
rename to core/CodecUtils/test/HexCodecTest.cpp
index f70d3ac217..aa1905f371 100644
--- a/core/acsdkCodecUtils/test/HexCodecTest.cpp
+++ b/core/CodecUtils/test/HexCodecTest.cpp
@@ -15,10 +15,10 @@
 
 #include <gtest/gtest.h>
 
-#include <acsdkCodecUtils/Hex.h>
+#include <acsdk/CodecUtils/Hex.h>
 
 namespace alexaClientSDK {
-namespace acsdkCodecUtils {
+namespace codecUtils {
 namespace test {
 
 using namespace ::testing;
@@ -147,5 +147,5 @@ TEST(HexCodecTest, test_hexDecodeWithWhitespace) {
 }
 
 }  // namespace test
-}  // namespace acsdkCodecUtils
+}  // namespace codecUtils
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/CMakeLists.txt b/core/Crypto/CMakeLists.txt
index 7c16f1fa0c..dee5728864 100644
--- a/core/Crypto/CMakeLists.txt
+++ b/core/Crypto/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
-add_subdirectory("acsdkCryptoInterfaces")
-add_subdirectory("acsdkCrypto")
-add_subdirectory("acsdkPkcs11")
+add_subdirectory("CryptoInterfaces")
+add_subdirectory("Crypto")
+if(PKCS11)
+  add_subdirectory("Pkcs11")
+endif()
diff --git a/core/Crypto/acsdkCrypto/CMakeLists.txt b/core/Crypto/Crypto/CMakeLists.txt
similarity index 100%
rename from core/Crypto/acsdkCrypto/CMakeLists.txt
rename to core/Crypto/Crypto/CMakeLists.txt
diff --git a/core/Crypto/Crypto/doc/Crypto.dox b/core/Crypto/Crypto/doc/Crypto.dox
new file mode 100644
index 0000000000..99216a57a6
--- /dev/null
+++ b/core/Crypto/Crypto/doc/Crypto.dox
@@ -0,0 +1,39 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * \defgroup Lib_acsdkCrypto Cryptographic Functions Implementation
+ * @brief Implementations for \ref Lib_acsdkCryptoInterfaces
+ *
+ * Lib_acsdkCrypto provides implementation of cryptographic functions to encrypt and decrypt data, to generate keys and
+ * initialization vectors, and to compute digests.
+ *
+ * The reference implementation uses OpenSSL library, but can be extended to use platform-specific APIs.
+ *
+ * \sa Lib_acsdkCryptoInterfaces
+ *
+ * \sa alexaClientSDK::crypto
+ * \sa alexaClientSDK::crypto::test
+ *
+ * \namespace alexaClientSDK::crypto
+ * \brief OpenSSL-based implementation.
+ * \ingroup Lib_acsdkCrypto
+ * \sa Lib_acsdkCrypto
+ *
+ * \namespace alexaClientSDK::crypto::test
+ * \brief Test cases for \ref Lib_acsdkCrypto
+ * \ingroup Lib_acsdkCrypto
+ * \sa Lib_acsdkCrypto
+ */
diff --git a/core/Crypto/Crypto/include/acsdk/Crypto/CryptoFactory.h b/core/Crypto/Crypto/include/acsdk/Crypto/CryptoFactory.h
new file mode 100644
index 0000000000..d551e1f874
--- /dev/null
+++ b/core/Crypto/Crypto/include/acsdk/Crypto/CryptoFactory.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_CRYPTO_CRYPTOFACTORY_H_
+#define ACSDK_CRYPTO_CRYPTOFACTORY_H_
+
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+
+namespace alexaClientSDK {
+namespace crypto {
+
+/**
+ * @brief Factory method for @c CryptoFactoryInterface.
+ * Provides crypto functions interface if available.
+ *
+ * @return Factory reference or nullptr on error.
+ * @see cryptoInterfaces::CryptoFactoryInterface
+ */
+std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface> createCryptoFactory() noexcept;
+
+}  // namespace crypto
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_CRYPTO_CRYPTOFACTORY_H_
diff --git a/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/Logging.h b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/Logging.h
new file mode 100644
index 0000000000..ce7fd6644c
--- /dev/null
+++ b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/Logging.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_CRYPTO_PRIVATE_LOGGING_H_
+#define ACSDK_CRYPTO_PRIVATE_LOGGING_H_
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ * @private
+ * @ingroup Lib_acsdkCrypto
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#endif  // ACSDK_CRYPTO_PRIVATE_LOGGING_H_
diff --git a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslCryptoCodec.h b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslCryptoCodec.h
similarity index 87%
rename from core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslCryptoCodec.h
rename to core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslCryptoCodec.h
index 17e6c76fa9..b226df9da2 100644
--- a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslCryptoCodec.h
+++ b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslCryptoCodec.h
@@ -13,29 +13,29 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCRYPTO_PRIVATE_OPENSSLCRYPTOCODEC_H_
-#define ACSDKCRYPTO_PRIVATE_OPENSSLCRYPTOCODEC_H_
+#ifndef ACSDK_CRYPTO_PRIVATE_OPENSSLCRYPTOCODEC_H_
+#define ACSDK_CRYPTO_PRIVATE_OPENSSLCRYPTOCODEC_H_
 
 #include <memory>
 
 #include <openssl/evp.h>
 
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
-#include <acsdkCryptoInterfaces/CryptoCodecInterface.h>
-#include <acsdkCrypto/private/OpenSslTypes.h>
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
+#include <acsdk/CryptoInterfaces/CryptoCodecInterface.h>
+#include <acsdk/Crypto/private/OpenSslTypes.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 
-using alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType;
-using alexaClientSDK::acsdkCryptoInterfaces::CryptoCodecInterface;
+using alexaClientSDK::cryptoInterfaces::AlgorithmType;
+using alexaClientSDK::cryptoInterfaces::CryptoCodecInterface;
 
 /**
  * @brief Binary codec implementation.
  *
  * This class uses EVP API from OpenSSL library. We can add new algorithms as needed.
  *
- * @ingroup CryptoIMPL
+ * @ingroup Lib_acsdkCrypto
  */
 class OpenSslCryptoCodec : public CryptoCodecInterface {
 public:
@@ -120,7 +120,7 @@ class OpenSslCryptoCodec : public CryptoCodecInterface {
     const EVP_CIPHER* m_cipher;
 };
 
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCRYPTO_PRIVATE_OPENSSLCRYPTOCODEC_H_
+#endif  // ACSDK_CRYPTO_PRIVATE_OPENSSLCRYPTOCODEC_H_
diff --git a/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslCryptoFactory.h b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslCryptoFactory.h
new file mode 100644
index 0000000000..7a89e9ced0
--- /dev/null
+++ b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslCryptoFactory.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_CRYPTO_PRIVATE_OPENSSLCRYPTOFACTORY_H_
+#define ACSDK_CRYPTO_PRIVATE_OPENSSLCRYPTOFACTORY_H_
+
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+
+namespace alexaClientSDK {
+namespace crypto {
+
+/**
+ * @brief Cryptography factory implementation based on OpenSSL.
+ *
+ * @ingroup Lib_acsdkCrypto
+ */
+class OpenSslCryptoFactory : public alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface {
+public:
+    /**
+     * @brief Initializes OpenSSL library and returns factory interface.
+     *
+     * @return Factory reference or nullptr on error.
+     */
+    static std::shared_ptr<CryptoFactoryInterface> create() noexcept;
+
+    /// @name CryptoCodecInterface methods.
+    ///@{
+    std::unique_ptr<alexaClientSDK::cryptoInterfaces::CryptoCodecInterface> createEncoder(
+        alexaClientSDK::cryptoInterfaces::AlgorithmType type) noexcept override;
+    std::unique_ptr<alexaClientSDK::cryptoInterfaces::CryptoCodecInterface> createDecoder(
+        alexaClientSDK::cryptoInterfaces::AlgorithmType type) noexcept override;
+    std::unique_ptr<alexaClientSDK::cryptoInterfaces::DigestInterface> createDigest(
+        alexaClientSDK::cryptoInterfaces::DigestType type) noexcept override;
+    std::shared_ptr<alexaClientSDK::cryptoInterfaces::KeyFactoryInterface> getKeyFactory() noexcept override;
+    ///@}
+private:
+    /// Private object constructor.
+    OpenSslCryptoFactory() noexcept;
+
+    /**
+     * @brief Initializes crypto library.
+     *
+     * @return Boolean indicating operation success.
+     */
+    bool init() noexcept;
+
+    /// Singleton instance of key factory.
+    std::shared_ptr<alexaClientSDK::cryptoInterfaces::KeyFactoryInterface> m_keyFactory;
+};
+
+}  // namespace crypto
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_CRYPTO_PRIVATE_OPENSSLCRYPTOFACTORY_H_
diff --git a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslDigest.h b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslDigest.h
similarity index 83%
rename from core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslDigest.h
rename to core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslDigest.h
index 8e6ef2e04f..490e3e368b 100644
--- a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslDigest.h
+++ b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslDigest.h
@@ -13,26 +13,26 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCRYPTO_PRIVATE_OPENSSLDIGEST_H_
-#define ACSDKCRYPTO_PRIVATE_OPENSSLDIGEST_H_
+#ifndef ACSDK_CRYPTO_PRIVATE_OPENSSLDIGEST_H_
+#define ACSDK_CRYPTO_PRIVATE_OPENSSLDIGEST_H_
 
 #include <memory>
 
 #include <openssl/evp.h>
 
-#include <acsdkCryptoInterfaces/DigestInterface.h>
-#include <acsdkCryptoInterfaces/DigestType.h>
+#include <acsdk/CryptoInterfaces/DigestInterface.h>
+#include <acsdk/CryptoInterfaces/DigestType.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 
-using alexaClientSDK::acsdkCryptoInterfaces::DigestInterface;
-using alexaClientSDK::acsdkCryptoInterfaces::DigestType;
+using alexaClientSDK::cryptoInterfaces::DigestInterface;
+using alexaClientSDK::cryptoInterfaces::DigestType;
 
 /**
  * @brief Digest implementation based on OpenSSL.
  *
- * @ingroup CryptoIMPL
+ * @ingroup Lib_acsdkCrypto
  */
 class OpenSslDigest : public DigestInterface {
 public:
@@ -79,7 +79,7 @@ class OpenSslDigest : public DigestInterface {
     EVP_MD_CTX* m_ctx;
 };
 
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCRYPTO_PRIVATE_OPENSSLDIGEST_H_
+#endif  // ACSDK_CRYPTO_PRIVATE_OPENSSLDIGEST_H_
diff --git a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslErrorCleanup.h b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslErrorCleanup.h
similarity index 88%
rename from core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslErrorCleanup.h
rename to core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslErrorCleanup.h
index 4ee36ed50f..59ccc3746f 100644
--- a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslErrorCleanup.h
+++ b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslErrorCleanup.h
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCRYPTO_PRIVATE_OPENSSLERRORCLEANUP_H_
-#define ACSDKCRYPTO_PRIVATE_OPENSSLERRORCLEANUP_H_
+#ifndef ACSDK_CRYPTO_PRIVATE_OPENSSLERRORCLEANUP_H_
+#define ACSDK_CRYPTO_PRIVATE_OPENSSLERRORCLEANUP_H_
 
 #include <string>
 
 #include <AVSCommon/Utils/Error/FinallyGuard.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 
 /**
  * @brief Helper class for handling OpenSSL errors.
@@ -29,7 +29,7 @@ namespace acsdkCrypto {
  * This class automatically clears OpenSSL error queue and logs errors to log on destruction. This helps with
  * troubleshooting OpenSSL errors.
  *
- * @ingroup CryptoIMPL
+ * @ingroup Lib_acsdkCrypto
  */
 class OpenSslErrorCleanup : public avsCommon::utils::error::FinallyGuard {
 public:
@@ -53,7 +53,7 @@ class OpenSslErrorCleanup : public avsCommon::utils::error::FinallyGuard {
     static void clearAndLogOpenSslErrors(const std::string& logTag) noexcept;
 };
 
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCRYPTO_PRIVATE_OPENSSLERRORCLEANUP_H_
+#endif  // ACSDK_CRYPTO_PRIVATE_OPENSSLERRORCLEANUP_H_
diff --git a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslKeyFactory.h b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslKeyFactory.h
similarity index 79%
rename from core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslKeyFactory.h
rename to core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslKeyFactory.h
index 7e462b30fa..015d02ffb5 100644
--- a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslKeyFactory.h
+++ b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslKeyFactory.h
@@ -13,23 +13,23 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCRYPTO_PRIVATE_OPENSSLKEYFACTORY_H_
-#define ACSDKCRYPTO_PRIVATE_OPENSSLKEYFACTORY_H_
+#ifndef ACSDK_CRYPTO_PRIVATE_OPENSSLKEYFACTORY_H_
+#define ACSDK_CRYPTO_PRIVATE_OPENSSLKEYFACTORY_H_
 
 #include <memory>
 
-#include <acsdkCryptoInterfaces/KeyFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyFactoryInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 
-using alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType;
-using alexaClientSDK::acsdkCryptoInterfaces::KeyFactoryInterface;
+using alexaClientSDK::cryptoInterfaces::AlgorithmType;
+using alexaClientSDK::cryptoInterfaces::KeyFactoryInterface;
 
 /**
  * @brief Key factory implementation based on OpenSSL.
  *
- * @ingroup CryptoIMPL
+ * @ingroup Lib_acsdkCrypto
  */
 class OpenSslKeyFactory : public KeyFactoryInterface {
 public:
@@ -60,7 +60,7 @@ class OpenSslKeyFactory : public KeyFactoryInterface {
     bool generateRandom(std::vector<unsigned char>& data, int size) noexcept;
 };
 
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCRYPTO_PRIVATE_OPENSSLKEYFACTORY_H_
+#endif  // ACSDK_CRYPTO_PRIVATE_OPENSSLKEYFACTORY_H_
diff --git a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslTypeMapper.h b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslTypeMapper.h
similarity index 82%
rename from core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslTypeMapper.h
rename to core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslTypeMapper.h
index 06537ba047..facc2b884d 100644
--- a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslTypeMapper.h
+++ b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslTypeMapper.h
@@ -13,25 +13,25 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCRYPTO_PRIVATE_OPENSSLTYPEMAPPER_H_
-#define ACSDKCRYPTO_PRIVATE_OPENSSLTYPEMAPPER_H_
+#ifndef ACSDK_CRYPTO_PRIVATE_OPENSSLTYPEMAPPER_H_
+#define ACSDK_CRYPTO_PRIVATE_OPENSSLTYPEMAPPER_H_
 
 #include <openssl/evp.h>
 
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
-#include <acsdkCryptoInterfaces/DigestType.h>
-#include <acsdkCrypto/private/OpenSslTypes.h>
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
+#include <acsdk/CryptoInterfaces/DigestType.h>
+#include <acsdk/Crypto/private/OpenSslTypes.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 
-using alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType;
-using alexaClientSDK::acsdkCryptoInterfaces::DigestType;
+using alexaClientSDK::cryptoInterfaces::AlgorithmType;
+using alexaClientSDK::cryptoInterfaces::DigestType;
 
 /**
  * @brief Helper class to map SDK types into types from OpenSSL EVP API.
  *
- * @ingroup CryptoIMPL
+ * @ingroup Lib_acsdkCrypto
  */
 class OpenSslTypeMapper {
 public:
@@ -80,7 +80,7 @@ class OpenSslTypeMapper {
     static const EVP_MD* mapDigestToEvpMd(DigestType type) noexcept;
 };
 
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCRYPTO_PRIVATE_OPENSSLTYPEMAPPER_H_
+#endif  // ACSDK_CRYPTO_PRIVATE_OPENSSLTYPEMAPPER_H_
diff --git a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslTypes.h b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslTypes.h
similarity index 79%
rename from core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslTypes.h
rename to core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslTypes.h
index aaa9886eb8..82a295a761 100644
--- a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslTypes.h
+++ b/core/Crypto/Crypto/privateInclude/acsdk/Crypto/private/OpenSslTypes.h
@@ -13,27 +13,27 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCRYPTO_PRIVATE_OPENSSLTYPES_H_
-#define ACSDKCRYPTO_PRIVATE_OPENSSLTYPES_H_
+#ifndef ACSDK_CRYPTO_PRIVATE_OPENSSLTYPES_H_
+#define ACSDK_CRYPTO_PRIVATE_OPENSSLTYPES_H_
 
 /**
  * @brief Macro for cutting off OpenSSL features introduced before 1.1.0 release.
  * @private
- * @ingroup CryptoIMPL
+ * @ingroup Lib_acsdkCrypto
  */
 #define OPENSSL_VERSION_NUMBER_1_1_0 0x10100000L
 
 #include <ostream>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 
 /**
  * @brief Typed enumeration for codec types to use with EVP API.
  *
  * This enumeration defines values for use with EVP_CipherInit_ex method.
  *
- * @ingroup CryptoIMPL
+ * @ingroup Lib_acsdkCrypto
  */
 enum class CodecType : int {
     Decoder = 0,  ///< Decoder.
@@ -45,7 +45,7 @@ enum class CodecType : int {
  *
  * This enumeration defines values for use with EVP_CIPHER_CTX_set_padding method.
  *
- * @ingroup CryptoIMPL
+ * @ingroup Lib_acsdkCrypto
  */
 enum class PaddingMode : int {
     NoPadding = 0,  ///< No padding.
@@ -54,19 +54,19 @@ enum class PaddingMode : int {
 
 /// Success code for some OpenSSL functions.
 /// @private
-/// @ingroup CryptoIMPL
+/// @ingroup Lib_acsdkCrypto
 static constexpr int OPENSSL_OK = 1;
 
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
 
 namespace std {
 
 /// @brief Pretty-print function for padding mode values.
 /// @private
-/// @ingroup CryptoIMPL
-std::ostream& operator<<(std::ostream& o, alexaClientSDK::acsdkCrypto::PaddingMode mode);
+/// @ingroup Lib_acsdkCrypto
+std::ostream& operator<<(std::ostream& o, alexaClientSDK::crypto::PaddingMode mode);
 
 }  // namespace std
 
-#endif  // ACSDKCRYPTO_PRIVATE_OPENSSLTYPES_H_
+#endif  // ACSDK_CRYPTO_PRIVATE_OPENSSLTYPES_H_
diff --git a/core/Crypto/acsdkCrypto/src/CMakeLists.txt b/core/Crypto/Crypto/src/CMakeLists.txt
similarity index 100%
rename from core/Crypto/acsdkCrypto/src/CMakeLists.txt
rename to core/Crypto/Crypto/src/CMakeLists.txt
diff --git a/core/Crypto/Crypto/src/CryptoFactory.cpp b/core/Crypto/Crypto/src/CryptoFactory.cpp
new file mode 100644
index 0000000000..aa25fa593e
--- /dev/null
+++ b/core/Crypto/Crypto/src/CryptoFactory.cpp
@@ -0,0 +1,29 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/Crypto/CryptoFactory.h>
+#include <acsdk/Crypto/private/OpenSslCryptoFactory.h>
+
+namespace alexaClientSDK {
+namespace crypto {
+
+using namespace alexaClientSDK::cryptoInterfaces;
+
+std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface> createCryptoFactory() noexcept {
+    return OpenSslCryptoFactory::create();
+}
+
+}  // namespace crypto
+}  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCrypto/src/OpenSslCryptoCodec.cpp b/core/Crypto/Crypto/src/OpenSslCryptoCodec.cpp
similarity index 89%
rename from core/Crypto/acsdkCrypto/src/OpenSslCryptoCodec.cpp
rename to core/Crypto/Crypto/src/OpenSslCryptoCodec.cpp
index 2699bafab5..741f470adf 100644
--- a/core/Crypto/acsdkCrypto/src/OpenSslCryptoCodec.cpp
+++ b/core/Crypto/Crypto/src/OpenSslCryptoCodec.cpp
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkCrypto/private/Logging.h>
-#include <acsdkCrypto/private/OpenSslCryptoCodec.h>
-#include <acsdkCrypto/private/OpenSslErrorCleanup.h>
-#include <acsdkCrypto/private/OpenSslTypeMapper.h>
+#include <acsdk/Crypto/private/Logging.h>
+#include <acsdk/Crypto/private/OpenSslCryptoCodec.h>
+#include <acsdk/Crypto/private/OpenSslErrorCleanup.h>
+#include <acsdk/Crypto/private/OpenSslTypeMapper.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"OpenSSL::CryptoCodec"};
+#define TAG "OpenSSL::CryptoCodec"
 
 std::unique_ptr<OpenSslCryptoCodec> OpenSslCryptoCodec::createDecoder(AlgorithmType type) noexcept {
     ACSDK_DEBUG9(LX("createDecoder").d("algorithmType", type));
@@ -139,9 +139,10 @@ bool OpenSslCryptoCodec::processAAD(
     OpenSslErrorCleanup errorCleanup{TAG};
 
     int cipherBlockSize = EVP_CIPHER_block_size(m_cipher);
-    int outLen = (dataInEnd - dataInBegin) + cipherBlockSize;
+    int outLen = static_cast<int>((dataInEnd - dataInBegin) + cipherBlockSize);
 
-    if (OPENSSL_OK == EVP_CipherUpdate(m_cipherCtx, nullptr, &outLen, &*dataInBegin, dataInEnd - dataInBegin)) {
+    if (OPENSSL_OK ==
+        EVP_CipherUpdate(m_cipherCtx, nullptr, &outLen, &*dataInBegin, static_cast<int>(dataInEnd - dataInBegin))) {
         return true;
     } else {
         ACSDK_ERROR(LX("processAADFailed").d("reason", "cipherUpdateFailed"));
@@ -175,11 +176,13 @@ bool OpenSslCryptoCodec::process(
 
     int cipherBlockSize = EVP_CIPHER_block_size(m_cipher);
 
-    int outLen = (dataInEnd - dataInBegin) + cipherBlockSize;
+    int outLen = static_cast<int>((dataInEnd - dataInBegin) + cipherBlockSize);
     size_t index = dataOut.size();
     dataOut.resize(index + outLen);
 
-    if (OPENSSL_OK == EVP_CipherUpdate(m_cipherCtx, &dataOut[index], &outLen, &*dataInBegin, dataInEnd - dataInBegin)) {
+    if (OPENSSL_OK ==
+        EVP_CipherUpdate(
+            m_cipherCtx, &dataOut[index], &outLen, &*dataInBegin, static_cast<int>(dataInEnd - dataInBegin))) {
         dataOut.resize(index + outLen);
 
         return true;
@@ -244,7 +247,8 @@ bool OpenSslCryptoCodec::getTag(Tag& tag) noexcept {
     tag.resize(tagOffset + tagSize);
     OpenSslErrorCleanup errorCleanup{TAG};
 
-    if (OPENSSL_OK != EVP_CIPHER_CTX_ctrl(m_cipherCtx, EVP_CTRL_GCM_GET_TAG, tag.size(), tag.data() + tagOffset)) {
+    if (OPENSSL_OK !=
+        EVP_CIPHER_CTX_ctrl(m_cipherCtx, EVP_CTRL_GCM_GET_TAG, static_cast<int>(tag.size()), tag.data() + tagOffset)) {
         ACSDK_ERROR(LX("getTagFailed").d("reason", "sslError"));
         return false;
     }
@@ -273,7 +277,7 @@ bool OpenSslCryptoCodec::setTag(const Tag& tag) noexcept {
 
     unsigned char* const tagData = const_cast<unsigned char*>(tag.data());
 
-    if (OPENSSL_OK != EVP_CIPHER_CTX_ctrl(m_cipherCtx, EVP_CTRL_GCM_SET_TAG, tag.size(), tagData)) {
+    if (OPENSSL_OK != EVP_CIPHER_CTX_ctrl(m_cipherCtx, EVP_CTRL_GCM_SET_TAG, static_cast<int>(tag.size()), tagData)) {
         ACSDK_ERROR(LX("setTagFailed").d("reason", "opensslError"));
         return false;
     }
@@ -291,5 +295,5 @@ bool OpenSslCryptoCodec::isAEADCipher() noexcept {
     }
 }
 
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCrypto/src/OpenSslCryptoFactory.cpp b/core/Crypto/Crypto/src/OpenSslCryptoFactory.cpp
similarity index 81%
rename from core/Crypto/acsdkCrypto/src/OpenSslCryptoFactory.cpp
rename to core/Crypto/Crypto/src/OpenSslCryptoFactory.cpp
index 972bb4e546..b14e3e193c 100644
--- a/core/Crypto/acsdkCrypto/src/OpenSslCryptoFactory.cpp
+++ b/core/Crypto/Crypto/src/OpenSslCryptoFactory.cpp
@@ -13,20 +13,20 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkCrypto/private/Logging.h>
-#include <acsdkCrypto/private/OpenSslCryptoCodec.h>
-#include <acsdkCrypto/private/OpenSslCryptoFactory.h>
-#include <acsdkCrypto/private/OpenSslDigest.h>
-#include <acsdkCrypto/private/OpenSslKeyFactory.h>
+#include <acsdk/Crypto/private/Logging.h>
+#include <acsdk/Crypto/private/OpenSslCryptoCodec.h>
+#include <acsdk/Crypto/private/OpenSslCryptoFactory.h>
+#include <acsdk/Crypto/private/OpenSslDigest.h>
+#include <acsdk/Crypto/private/OpenSslKeyFactory.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"OpenSSL::CryptoFactory"};
+#define TAG "OpenSSL::CryptoFactory"
 
 std::shared_ptr<CryptoFactoryInterface> OpenSslCryptoFactory::create() noexcept {
     auto res = std::shared_ptr<OpenSslCryptoFactory>(new OpenSslCryptoFactory);
@@ -67,5 +67,5 @@ std::shared_ptr<KeyFactoryInterface> OpenSslCryptoFactory::getKeyFactory() noexc
     return m_keyFactory;
 }
 
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCrypto/src/OpenSslDigest.cpp b/core/Crypto/Crypto/src/OpenSslDigest.cpp
similarity index 92%
rename from core/Crypto/acsdkCrypto/src/OpenSslDigest.cpp
rename to core/Crypto/Crypto/src/OpenSslDigest.cpp
index 2202861c93..41d4ce0669 100644
--- a/core/Crypto/acsdkCrypto/src/OpenSslDigest.cpp
+++ b/core/Crypto/Crypto/src/OpenSslDigest.cpp
@@ -15,20 +15,20 @@
 
 #include <climits>
 
-#include <acsdkCrypto/private/Logging.h>
-#include <acsdkCrypto/private/OpenSslDigest.h>
-#include <acsdkCrypto/private/OpenSslErrorCleanup.h>
-#include <acsdkCrypto/private/OpenSslTypeMapper.h>
-#include <acsdkCrypto/private/OpenSslTypes.h>
+#include <acsdk/Crypto/private/Logging.h>
+#include <acsdk/Crypto/private/OpenSslDigest.h>
+#include <acsdk/Crypto/private/OpenSslErrorCleanup.h>
+#include <acsdk/Crypto/private/OpenSslTypeMapper.h>
+#include <acsdk/Crypto/private/OpenSslTypes.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 
-using namespace alexaClientSDK::acsdkCryptoInterfaces;
+using namespace alexaClientSDK::cryptoInterfaces;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"OpenSSL::Digest"};
+#define TAG "OpenSSL::Digest"
 
 #if CHAR_BIT != 8
 #error This source file must be modified to support 7-bit characters
@@ -136,5 +136,5 @@ bool OpenSslDigest::reset() noexcept {
 #endif
 }
 
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCrypto/src/OpenSslErrorCleanup.cpp b/core/Crypto/Crypto/src/OpenSslErrorCleanup.cpp
similarity index 92%
rename from core/Crypto/acsdkCrypto/src/OpenSslErrorCleanup.cpp
rename to core/Crypto/Crypto/src/OpenSslErrorCleanup.cpp
index 4afd2636e0..0ce0c469f6 100644
--- a/core/Crypto/acsdkCrypto/src/OpenSslErrorCleanup.cpp
+++ b/core/Crypto/Crypto/src/OpenSslErrorCleanup.cpp
@@ -15,11 +15,11 @@
 
 #include <openssl/err.h>
 
-#include <acsdkCrypto/private/OpenSslErrorCleanup.h>
+#include <acsdk/Crypto/private/OpenSslErrorCleanup.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 
 using ::alexaClientSDK::avsCommon::utils::logger::LogEntry;
 
@@ -36,5 +36,5 @@ void OpenSslErrorCleanup::clearAndLogOpenSslErrors(const std::string& logTag) no
     }
 }
 
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCrypto/src/OpenSslKeyFactory.cpp b/core/Crypto/Crypto/src/OpenSslKeyFactory.cpp
similarity index 85%
rename from core/Crypto/acsdkCrypto/src/OpenSslKeyFactory.cpp
rename to core/Crypto/Crypto/src/OpenSslKeyFactory.cpp
index 8bed39851a..13bae44a40 100644
--- a/core/Crypto/acsdkCrypto/src/OpenSslKeyFactory.cpp
+++ b/core/Crypto/Crypto/src/OpenSslKeyFactory.cpp
@@ -16,19 +16,19 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 
-#include <acsdkCrypto/private/Logging.h>
-#include <acsdkCrypto/private/OpenSslErrorCleanup.h>
-#include <acsdkCrypto/private/OpenSslKeyFactory.h>
-#include <acsdkCrypto/private/OpenSslTypeMapper.h>
+#include <acsdk/Crypto/private/Logging.h>
+#include <acsdk/Crypto/private/OpenSslErrorCleanup.h>
+#include <acsdk/Crypto/private/OpenSslKeyFactory.h>
+#include <acsdk/Crypto/private/OpenSslTypeMapper.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 
-using namespace alexaClientSDK::acsdkCryptoInterfaces;
+using namespace alexaClientSDK::cryptoInterfaces;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"OpenSSL::KeyFactory"};
+#define TAG "OpenSSL::KeyFactory"
 
 std::shared_ptr<KeyFactoryInterface> OpenSslKeyFactory::create() noexcept {
     return std::shared_ptr<OpenSslKeyFactory>(new OpenSslKeyFactory);
@@ -71,5 +71,5 @@ bool OpenSslKeyFactory::generateRandom(std::vector<unsigned char>& data, int siz
     return true;
 }
 
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCrypto/src/OpenSslTypeMapper.cpp b/core/Crypto/Crypto/src/OpenSslTypeMapper.cpp
similarity index 91%
rename from core/Crypto/acsdkCrypto/src/OpenSslTypeMapper.cpp
rename to core/Crypto/Crypto/src/OpenSslTypeMapper.cpp
index 185ca465b7..19aa27cbc9 100644
--- a/core/Crypto/acsdkCrypto/src/OpenSslTypeMapper.cpp
+++ b/core/Crypto/Crypto/src/OpenSslTypeMapper.cpp
@@ -16,17 +16,17 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 
-#include <acsdkCrypto/private/Logging.h>
-#include <acsdkCrypto/private/OpenSslTypeMapper.h>
+#include <acsdk/Crypto/private/Logging.h>
+#include <acsdk/Crypto/private/OpenSslTypeMapper.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 
-using namespace alexaClientSDK::acsdkCryptoInterfaces;
+using namespace alexaClientSDK::cryptoInterfaces;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"OpenSSL::TypeMapper"};
+#define TAG "OpenSSL::TypeMapper"
 
 const EVP_CIPHER* OpenSslTypeMapper::mapAlgorithmToEvpCipher(AlgorithmType type) noexcept {
     const EVP_CIPHER* evpCipher = nullptr;
@@ -101,6 +101,9 @@ const EVP_MD* OpenSslTypeMapper::mapDigestToEvpMd(DigestType type) noexcept {
         case DigestType::SHA_256:
             evpMd = EVP_sha256();
             break;
+        case DigestType::MD5:
+            evpMd = EVP_md5();
+            break;
         default:
             ACSDK_ERROR(LX("unknownAlgorithmType").d("type", type));
             break;
@@ -109,5 +112,5 @@ const EVP_MD* OpenSslTypeMapper::mapDigestToEvpMd(DigestType type) noexcept {
     return evpMd;
 }
 
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCrypto/src/OpenSslTypes.cpp b/core/Crypto/Crypto/src/OpenSslTypes.cpp
similarity index 76%
rename from core/Crypto/acsdkCrypto/src/OpenSslTypes.cpp
rename to core/Crypto/Crypto/src/OpenSslTypes.cpp
index 0a0632b0ea..ee003ea62a 100644
--- a/core/Crypto/acsdkCrypto/src/OpenSslTypes.cpp
+++ b/core/Crypto/Crypto/src/OpenSslTypes.cpp
@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkCrypto/private/OpenSslTypes.h>
+#include <acsdk/Crypto/private/OpenSslTypes.h>
 
 namespace std {
 
-std::ostream& operator<<(std::ostream& o, alexaClientSDK::acsdkCrypto::PaddingMode mode) {
+std::ostream& operator<<(std::ostream& o, alexaClientSDK::crypto::PaddingMode mode) {
     const char* type;
     switch (mode) {
-        case alexaClientSDK::acsdkCrypto::PaddingMode::NoPadding:
+        case alexaClientSDK::crypto::PaddingMode::NoPadding:
             type = "NoPadding";
             break;
-        case alexaClientSDK::acsdkCrypto::PaddingMode::Padding:
+        case alexaClientSDK::crypto::PaddingMode::Padding:
             type = "Padding";
             break;
         default:
diff --git a/core/Crypto/acsdkCrypto/test/CMakeLists.txt b/core/Crypto/Crypto/test/CMakeLists.txt
similarity index 100%
rename from core/Crypto/acsdkCrypto/test/CMakeLists.txt
rename to core/Crypto/Crypto/test/CMakeLists.txt
diff --git a/core/Crypto/acsdkCrypto/test/OpenSslCryptoCodecAEADTest.cpp b/core/Crypto/Crypto/test/OpenSslCryptoCodecAEADTest.cpp
similarity index 97%
rename from core/Crypto/acsdkCrypto/test/OpenSslCryptoCodecAEADTest.cpp
rename to core/Crypto/Crypto/test/OpenSslCryptoCodecAEADTest.cpp
index 73091a163b..601077c8eb 100644
--- a/core/Crypto/acsdkCrypto/test/OpenSslCryptoCodecAEADTest.cpp
+++ b/core/Crypto/Crypto/test/OpenSslCryptoCodecAEADTest.cpp
@@ -17,18 +17,18 @@
 #include <memory>
 #include <tuple>
 
-#include <acsdkCodecUtils/Hex.h>
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
-#include <acsdkCrypto/private/OpenSslCryptoCodec.h>
-#include <acsdkCrypto/private/OpenSslKeyFactory.h>
+#include <acsdk/CodecUtils/Hex.h>
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
+#include <acsdk/Crypto/private/OpenSslCryptoCodec.h>
+#include <acsdk/Crypto/private/OpenSslKeyFactory.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 namespace test {
 
 using namespace ::testing;
-using namespace alexaClientSDK::acsdkCryptoInterfaces;
-using namespace alexaClientSDK::acsdkCodecUtils;
+using namespace alexaClientSDK::cryptoInterfaces;
+using namespace alexaClientSDK::codecUtils;
 
 static std::vector<unsigned char> hexStringToBytes(const std::string& hex);
 
@@ -325,5 +325,5 @@ INSTANTIATE_TEST_CASE_P(
         TestParams{AlgorithmType::AES_128_GCM, TEST_KEY128, TEST_TAG128, TEST_CIPHERTEXT128}));
 
 }  // namespace test
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCrypto/test/OpenSslCryptoCodecTest.cpp b/core/Crypto/Crypto/test/OpenSslCryptoCodecTest.cpp
similarity index 97%
rename from core/Crypto/acsdkCrypto/test/OpenSslCryptoCodecTest.cpp
rename to core/Crypto/Crypto/test/OpenSslCryptoCodecTest.cpp
index 4e433dbea0..6e08146d28 100644
--- a/core/Crypto/acsdkCrypto/test/OpenSslCryptoCodecTest.cpp
+++ b/core/Crypto/Crypto/test/OpenSslCryptoCodecTest.cpp
@@ -16,18 +16,18 @@
 #include <gtest/gtest.h>
 #include <memory>
 
-#include <acsdkCodecUtils/Hex.h>
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
-#include <acsdkCrypto/private/OpenSslCryptoCodec.h>
-#include <acsdkCrypto/private/OpenSslKeyFactory.h>
+#include <acsdk/CodecUtils/Hex.h>
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
+#include <acsdk/Crypto/private/OpenSslCryptoCodec.h>
+#include <acsdk/Crypto/private/OpenSslKeyFactory.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 namespace test {
 
 using namespace ::testing;
-using namespace alexaClientSDK::acsdkCryptoInterfaces;
-using namespace alexaClientSDK::acsdkCodecUtils;
+using namespace alexaClientSDK::cryptoInterfaces;
+using namespace alexaClientSDK::codecUtils;
 
 const std::string TEST_STR = "The quick brown fox jumps over the lazy dog";        // 43 characters
 const std::string TEST_STR2 = "The quick brown fox jumps over the lazy dog.....";  // 48 characters
@@ -347,5 +347,5 @@ TEST(OpenSslCryptoCodecTest, test_aes256CbcDecodeString) {
 }
 
 }  // namespace test
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCrypto/test/OpenSslCryptoFactoryTest.cpp b/core/Crypto/Crypto/test/OpenSslCryptoFactoryTest.cpp
similarity index 93%
rename from core/Crypto/acsdkCrypto/test/OpenSslCryptoFactoryTest.cpp
rename to core/Crypto/Crypto/test/OpenSslCryptoFactoryTest.cpp
index b6d6aee26d..aee90552d4 100644
--- a/core/Crypto/acsdkCrypto/test/OpenSslCryptoFactoryTest.cpp
+++ b/core/Crypto/Crypto/test/OpenSslCryptoFactoryTest.cpp
@@ -15,17 +15,17 @@
 
 #include <gtest/gtest.h>
 
-#include <acsdkCodecUtils/Hex.h>
-#include <acsdkCrypto/CryptoFactory.h>
-#include <acsdkCrypto/private/OpenSslCryptoFactory.h>
+#include <acsdk/CodecUtils/Hex.h>
+#include <acsdk/Crypto/CryptoFactory.h>
+#include <acsdk/Crypto/private/OpenSslCryptoFactory.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 namespace test {
 
 using namespace ::testing;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
-using namespace ::alexaClientSDK::acsdkCodecUtils;
+using namespace ::alexaClientSDK::cryptoInterfaces;
+using namespace ::alexaClientSDK::codecUtils;
 
 /// Test IV for AES.
 /// @private
@@ -117,5 +117,5 @@ TEST(OpenSslCryptoFactoryTest, test_encryptDecrypt) {
 }
 
 }  // namespace test
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/Crypto/test/OpenSslDigestTest.cpp b/core/Crypto/Crypto/test/OpenSslDigestTest.cpp
new file mode 100644
index 0000000000..2e363cf890
--- /dev/null
+++ b/core/Crypto/Crypto/test/OpenSslDigestTest.cpp
@@ -0,0 +1,250 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+
+#include <acsdk/CodecUtils/Hex.h>
+#include <acsdk/Crypto/private/OpenSslDigest.h>
+
+namespace alexaClientSDK {
+namespace crypto {
+namespace test {
+
+using namespace ::testing;
+using namespace ::alexaClientSDK::cryptoInterfaces;
+using namespace ::alexaClientSDK::codecUtils;
+
+static const char TEST_STR[] = "The quick brown fox jumps over the lazy dog";
+static const std::vector<unsigned char> TEST_DATA{TEST_STR, TEST_STR + sizeof(TEST_STR) - 1};
+static const uint8_t TEST_UINT8 = 1;
+static const uint16_t TEST_UINT16 = 1;
+static const uint32_t TEST_UINT32 = 1;
+static const uint64_t TEST_UINT64 = 1;
+static const std::string SHA256_EMPTY_HEX{"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"};
+static const std::string SHA256_TEST_DATA_HEX{"d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592"};
+// To verify: echo 01 | xxd -r -p | openssl dgst -sha256
+static const std::string SHA256_UINT8_HEX{"4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a"};
+// To verify: echo 0001 | xxd -r -p | openssl dgst -sha256
+static const std::string SHA256_UNT16_HEX{"b413f47d13ee2fe6c845b2ee141af81de858df4ec549a58b7970bb96645bc8d2"};
+// To verify: echo 00000001 | xxd -r -p | openssl dgst -sha256
+static const std::string SHA256_UINT32_HEX{"b40711a88c7039756fb8a73827eabe2c0fe5a0346ca7e0a104adc0fc764f528d"};
+// To verify: echo 0000000000000001 | xxd -r -p | openssl dgst -sha256
+static const std::string SHA256_UINT64_HEX{"cd2662154e6d76b2b2b92e70c0cac3ccf534f9b74eb5b89819ec509083d00a50"};
+
+static const std::string MD5_EMPTY_HEX{"d41d8cd98f00b204e9800998ecf8427e"};
+static const std::string MD5_TEST_DATA_HEX{"9e107d9d372bb6826bd81d3542a419d6"};
+// To verify: echo 01 | xxd -r -p | openssl dgst -md5
+static const std::string MD5_UINT8_HEX{"55a54008ad1ba589aa210d2629c1df41"};
+// To verify: echo 0001 | xxd -r -p | openssl dgst -md5
+static const std::string MD5_UNT16_HEX{"441077cc9e57554dd476bdfb8b8b8102"};
+// To verify: echo 00000001 | xxd -r -p | openssl dgst -md5
+static const std::string MD5_UINT32_HEX{"f1450306517624a57eafbbf8ed995985"};
+// To verify: echo 0000000000000001 | xxd -r -p | openssl dgst -md5
+static const std::string MD5_UINT64_HEX{"fa5ad9a8557e5a84cf23e52d3d3adf77"};
+
+static constexpr DigestType BAD_DIGEST_TYPE = static_cast<DigestType>(0);
+
+/**
+ * A test struct to encapsulate  @c DigestType and @c hexString value.
+ *
+ * @private
+ */
+struct OpenSslDigestTestData {
+    OpenSslDigestTestData(DigestType digestType, const std::string& hexString) :
+            m_digestType(digestType),
+            m_hexString(hexString) {
+    }
+
+    DigestType m_digestType;
+    std::string m_hexString;
+};
+
+/**
+ * Test fixture for create digest tests.
+ *
+ * @private
+ */
+
+class OpenSslDigestCreateFixture : public testing::TestWithParam<OpenSslDigestTestData> {};
+
+TEST_P(OpenSslDigestCreateFixture, test_create) {
+    OpenSslDigestTestData openSslDigestTestData = GetParam();
+    auto digest = OpenSslDigest::create(openSslDigestTestData.m_digestType);
+    ASSERT_NE(nullptr, digest);
+}
+
+INSTANTIATE_TEST_CASE_P(
+    Parameterized,
+    OpenSslDigestCreateFixture,
+    ::testing::Values(OpenSslDigestTestData(DigestType::SHA_256, ""), OpenSslDigestTestData(DigestType::MD5, "")));
+
+TEST(OpenSslDigestTest, test_createInvalid) {
+    auto digest = OpenSslDigest::create(BAD_DIGEST_TYPE);
+    ASSERT_EQ(nullptr, digest);
+}
+
+/**
+ * Test fixture for empty digest tests.
+ *
+ * @private
+ */
+class OpenSslDigestEmptyFixture : public testing::TestWithParam<OpenSslDigestTestData> {};
+
+TEST_P(OpenSslDigestEmptyFixture, test_emptyDigest) {
+    OpenSslDigestTestData openSslDigestTestData = GetParam();
+    auto digest = OpenSslDigest::create(openSslDigestTestData.m_digestType);
+    digest->process({});
+    OpenSslDigest::DataBlock res;
+    ASSERT_TRUE(digest->finalize(res));
+    std::string hex;
+    ASSERT_TRUE(encodeHex(res, hex));
+    ASSERT_EQ(openSslDigestTestData.m_hexString, hex);
+}
+
+INSTANTIATE_TEST_CASE_P(
+    Parameterized,
+    OpenSslDigestEmptyFixture,
+    ::testing::Values(
+        OpenSslDigestTestData(DigestType::SHA_256, SHA256_EMPTY_HEX),
+        OpenSslDigestTestData(DigestType::MD5, MD5_EMPTY_HEX)));
+
+/**
+ * Test fixture for testdata digest tests.
+ *
+ * @private
+ */
+class OpenSslDigestTestDataFixture : public testing::TestWithParam<OpenSslDigestTestData> {};
+
+TEST_P(OpenSslDigestTestDataFixture, test_digest) {
+    OpenSslDigestTestData openSslDigestTestData = GetParam();
+    auto digest = OpenSslDigest::create(openSslDigestTestData.m_digestType);
+    digest->process(TEST_DATA);
+    OpenSslDigest::DataBlock res;
+    ASSERT_TRUE(digest->finalize(res));
+    std::string hex;
+    ASSERT_TRUE(encodeHex(res, hex));
+    ASSERT_EQ(openSslDigestTestData.m_hexString, hex);
+}
+
+INSTANTIATE_TEST_CASE_P(
+    Parameterized,
+    OpenSslDigestTestDataFixture,
+    ::testing::Values(
+        OpenSslDigestTestData(DigestType::SHA_256, SHA256_TEST_DATA_HEX),
+        OpenSslDigestTestData(DigestType::MD5, MD5_TEST_DATA_HEX)));
+
+/**
+ * Test fixture for UInt8 digest tests.
+ *
+ * @private
+ */
+class OpenSslDigestUInt8Fixture : public testing::TestWithParam<OpenSslDigestTestData> {};
+
+TEST_P(OpenSslDigestUInt8Fixture, test_digestUInt8) {
+    OpenSslDigestTestData openSslDigestTestData = GetParam();
+    auto digest = OpenSslDigest::create(openSslDigestTestData.m_digestType);
+    ASSERT_TRUE(digest->processUInt8(TEST_UINT8));
+    OpenSslDigest::DataBlock res;
+    ASSERT_TRUE(digest->finalize(res));
+    std::string hex;
+    ASSERT_TRUE(encodeHex(res, hex));
+    ASSERT_EQ(openSslDigestTestData.m_hexString, hex);
+}
+
+INSTANTIATE_TEST_CASE_P(
+    Parameterized,
+    OpenSslDigestUInt8Fixture,
+    ::testing::Values(
+        OpenSslDigestTestData(DigestType::SHA_256, SHA256_UINT8_HEX),
+        OpenSslDigestTestData(DigestType::MD5, MD5_UINT8_HEX)));
+
+/**
+ * Test fixture for UInt16 digest tests.
+ *
+ * @private
+ */
+class OpenSslDigestUInt16Fixture : public testing::TestWithParam<OpenSslDigestTestData> {};
+
+TEST_P(OpenSslDigestUInt16Fixture, test_digestUInt16) {
+    OpenSslDigestTestData openSslDigestTestData = GetParam();
+    auto digest = OpenSslDigest::create(openSslDigestTestData.m_digestType);
+    ASSERT_TRUE(digest->processUInt16(TEST_UINT16));
+    OpenSslDigest::DataBlock res;
+    ASSERT_TRUE(digest->finalize(res));
+    std::string hex;
+    ASSERT_TRUE(encodeHex(res, hex));
+    ASSERT_EQ(openSslDigestTestData.m_hexString, hex);
+}
+
+INSTANTIATE_TEST_CASE_P(
+    Parameterized,
+    OpenSslDigestUInt16Fixture,
+    ::testing::Values(
+        OpenSslDigestTestData(DigestType::SHA_256, SHA256_UNT16_HEX),
+        OpenSslDigestTestData(DigestType::MD5, MD5_UNT16_HEX)));
+
+/**
+ * Test fixture for UInt32 digest tests.
+ *
+ * @private
+ */
+class OpenSslDigestUInt32Fixture : public testing::TestWithParam<OpenSslDigestTestData> {};
+
+TEST_P(OpenSslDigestUInt32Fixture, test_digestUInt32) {
+    OpenSslDigestTestData openSslDigestTestData = GetParam();
+    auto digest = OpenSslDigest::create(openSslDigestTestData.m_digestType);
+    ASSERT_TRUE(digest->processUInt32(TEST_UINT32));
+    OpenSslDigest::DataBlock res;
+    ASSERT_TRUE(digest->finalize(res));
+    std::string hex;
+    ASSERT_TRUE(encodeHex(res, hex));
+    ASSERT_EQ(openSslDigestTestData.m_hexString, hex);
+}
+
+INSTANTIATE_TEST_CASE_P(
+    Parameterized,
+    OpenSslDigestUInt32Fixture,
+    ::testing::Values(
+        OpenSslDigestTestData(DigestType::SHA_256, SHA256_UINT32_HEX),
+        OpenSslDigestTestData(DigestType::MD5, MD5_UINT32_HEX)));
+
+/**
+ * Test fixture for UInt64 digest tests.
+ *
+ * @private
+ */
+class OpenSslDigestUInt64Fixture : public testing::TestWithParam<OpenSslDigestTestData> {};
+
+TEST_P(OpenSslDigestUInt64Fixture, test_digestUInt64) {
+    OpenSslDigestTestData openSslDigestTestData = GetParam();
+    auto digest = OpenSslDigest::create(openSslDigestTestData.m_digestType);
+    ASSERT_TRUE(digest->processUInt64(TEST_UINT64));
+    OpenSslDigest::DataBlock res;
+    ASSERT_TRUE(digest->finalize(res));
+    std::string hex;
+    ASSERT_TRUE(encodeHex(res, hex));
+    ASSERT_EQ(openSslDigestTestData.m_hexString, hex);
+}
+
+INSTANTIATE_TEST_CASE_P(
+    Parameterized,
+    OpenSslDigestUInt64Fixture,
+    ::testing::Values(
+        OpenSslDigestTestData(DigestType::SHA_256, SHA256_UINT64_HEX),
+        OpenSslDigestTestData(DigestType::MD5, MD5_UINT64_HEX)));
+
+}  // namespace test
+}  // namespace crypto
+}  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCrypto/test/OpenSslKeyFactoryTest.cpp b/core/Crypto/Crypto/test/OpenSslKeyFactoryTest.cpp
similarity index 95%
rename from core/Crypto/acsdkCrypto/test/OpenSslKeyFactoryTest.cpp
rename to core/Crypto/Crypto/test/OpenSslKeyFactoryTest.cpp
index 7293528462..987eb0c85d 100644
--- a/core/Crypto/acsdkCrypto/test/OpenSslKeyFactoryTest.cpp
+++ b/core/Crypto/Crypto/test/OpenSslKeyFactoryTest.cpp
@@ -15,14 +15,14 @@
 
 #include <gtest/gtest.h>
 
-#include <acsdkCrypto/private/OpenSslKeyFactory.h>
+#include <acsdk/Crypto/private/OpenSslKeyFactory.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 namespace test {
 
 using namespace ::testing;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 static constexpr size_t AES_256_KEY_SIZE = 32u;  // 256 bits
 static constexpr size_t AES_128_KEY_SIZE = 16u;  // 128 bits
@@ -120,5 +120,5 @@ INSTANTIATE_TEST_CASE_P(
         AlgorithmType::AES_256_GCM));
 
 }  // namespace test
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCrypto/test/OpenSslTypeMapperTest.cpp b/core/Crypto/Crypto/test/OpenSslTypeMapperTest.cpp
similarity index 93%
rename from core/Crypto/acsdkCrypto/test/OpenSslTypeMapperTest.cpp
rename to core/Crypto/Crypto/test/OpenSslTypeMapperTest.cpp
index f86a16e4fb..eca7eafe49 100644
--- a/core/Crypto/acsdkCrypto/test/OpenSslTypeMapperTest.cpp
+++ b/core/Crypto/Crypto/test/OpenSslTypeMapperTest.cpp
@@ -15,14 +15,14 @@
 
 #include <gtest/gtest.h>
 
-#include <acsdkCrypto/private/OpenSslTypeMapper.h>
+#include <acsdk/Crypto/private/OpenSslTypeMapper.h>
 
 namespace alexaClientSDK {
-namespace acsdkCrypto {
+namespace crypto {
 namespace test {
 
 using namespace ::testing;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 class MapDigest : public TestWithParam<std::pair<DigestType, const EVP_MD*>> {};
 
@@ -65,5 +65,5 @@ TEST(OpenSslTypeMapperTest, test_unknownAlgorithm) {
 }
 
 }  // namespace test
-}  // namespace acsdkCrypto
+}  // namespace crypto
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCryptoInterfaces/CMakeLists.txt b/core/Crypto/CryptoInterfaces/CMakeLists.txt
similarity index 100%
rename from core/Crypto/acsdkCryptoInterfaces/CMakeLists.txt
rename to core/Crypto/CryptoInterfaces/CMakeLists.txt
diff --git a/core/Crypto/CryptoInterfaces/doc/CryptoInterfaces.dox b/core/Crypto/CryptoInterfaces/doc/CryptoInterfaces.dox
new file mode 100644
index 0000000000..357b6b7880
--- /dev/null
+++ b/core/Crypto/CryptoInterfaces/doc/CryptoInterfaces.dox
@@ -0,0 +1,36 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * \defgroup Lib_acsdkCryptoInterfaces Cryptography API
+ * @brief Cryptographic Functions for ACSDK
+ *
+ * This module provides APIs for encrypting and decrypting data, and for computing secure digests.
+ *
+ * There are two ways for data encryption and decryption: through user-space cryptographic functions, accessible through
+ * \ref alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface and through hardware security module (HSM)
+ * accessible through \ref alexaClientSDK::cryptoInterfaces::KeyStoreInterface.
+ *
+ * When using \ref alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface user can generate keys and
+ * initialization vectors through \ref alexaClientSDK::cryptoInterfaces::KeyFactoryInterface to use with
+ * cryptographic functions. When working with \ref alexaClientSDK::cryptoInterfaces::KeyStoreInterface, keys must
+ * be pre-provisioned by device manufacturer and those keys can be used through references (aliases).
+ *
+ * \sa Lib_acsdkCrypto
+ * \sa Lib_acsdkPkcs11
+ *
+ * \sa alexaClientSDK::cryptoInterfaces
+ * \sa alexaClientSDK::cryptoInterfaces::test
+ */
diff --git a/core/Crypto/CryptoInterfaces/doc/Namespaces.dox b/core/Crypto/CryptoInterfaces/doc/Namespaces.dox
new file mode 100644
index 0000000000..dd6213df7f
--- /dev/null
+++ b/core/Crypto/CryptoInterfaces/doc/Namespaces.dox
@@ -0,0 +1,20 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * \namespace ::alexaClientSDK::cryptoInterfaces
+ * \brief Cryptographic Types and Interfaces.
+ * \ingroup Lib_acsdkCryptoInterfaces
+ */
diff --git a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/AlgorithmType.h b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/AlgorithmType.h
similarity index 88%
rename from core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/AlgorithmType.h
rename to core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/AlgorithmType.h
index 22f74711fb..a5275f739c 100644
--- a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/AlgorithmType.h
+++ b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/AlgorithmType.h
@@ -13,20 +13,20 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCRYPTOINTERFACES_ALGORITHMTYPE_H_
-#define ACSDKCRYPTOINTERFACES_ALGORITHMTYPE_H_
+#ifndef ACSDK_CRYPTOINTERFACES_ALGORITHMTYPE_H_
+#define ACSDK_CRYPTOINTERFACES_ALGORITHMTYPE_H_
 
 #include <ostream>
 
 namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
+namespace cryptoInterfaces {
 
 /**
  * @brief Enumeration of all supported encryption protocols.
  *
  * This enumeration defines cipher type, key size, mode of operation, and padding.
  *
- * @ingroup CryptoAPI
+ * @ingroup Lib_acsdkCryptoInterfaces
  */
 enum class AlgorithmType {
     /// @brief AES 256 CBC.
@@ -71,11 +71,11 @@ enum class AlgorithmType {
  * @param[in] value Value to write.
  *
  * @return Output stream.
- * @ingroup CryptoAPI
+ * @ingroup Lib_acsdkCryptoInterfaces
  */
 std::ostream& operator<<(std::ostream& out, AlgorithmType value);
 
-}  // namespace acsdkCryptoInterfaces
+}  // namespace cryptoInterfaces
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCRYPTOINTERFACES_ALGORITHMTYPE_H_
+#endif  // ACSDK_CRYPTOINTERFACES_ALGORITHMTYPE_H_
diff --git a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/CryptoCodecInterface.h b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/CryptoCodecInterface.h
similarity index 98%
rename from core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/CryptoCodecInterface.h
rename to core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/CryptoCodecInterface.h
index c0e169f4b7..c5ef3d4bce 100644
--- a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/CryptoCodecInterface.h
+++ b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/CryptoCodecInterface.h
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCRYPTOINTERFACES_CRYPTOCODECINTERFACE_H_
-#define ACSDKCRYPTOINTERFACES_CRYPTOCODECINTERFACE_H_
+#ifndef ACSDK_CRYPTOINTERFACES_CRYPTOCODECINTERFACE_H_
+#define ACSDK_CRYPTOINTERFACES_CRYPTOCODECINTERFACE_H_
 
 #include <vector>
 
 namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
+namespace cryptoInterfaces {
 
 /**
  * @brief Crypto codec (cipher) interface.
@@ -151,7 +151,7 @@ namespace acsdkCryptoInterfaces {
  *
  * This interface is not thread safe and caller must ensure only one thread can make calls at any time.
  *
- * @ingroup CryptoAPI
+ * @ingroup Lib_acsdkCryptoInterfaces
  */
 class CryptoCodecInterface {
 public:
@@ -362,7 +362,7 @@ class CryptoCodecInterface {
     virtual bool setTag(const Tag& tag) noexcept = 0;
 };
 
-}  // namespace acsdkCryptoInterfaces
+}  // namespace cryptoInterfaces
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCRYPTOINTERFACES_CRYPTOCODECINTERFACE_H_
+#endif  // ACSDK_CRYPTOINTERFACES_CRYPTOCODECINTERFACE_H_
diff --git a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/CryptoFactoryInterface.h b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/CryptoFactoryInterface.h
similarity index 89%
rename from core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/CryptoFactoryInterface.h
rename to core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/CryptoFactoryInterface.h
index 8fcf3e24af..5ac32bf440 100644
--- a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/CryptoFactoryInterface.h
+++ b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/CryptoFactoryInterface.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCRYPTOINTERFACES_CRYPTOFACTORYINTERFACE_H_
-#define ACSDKCRYPTOINTERFACES_CRYPTOFACTORYINTERFACE_H_
+#ifndef ACSDK_CRYPTOINTERFACES_CRYPTOFACTORYINTERFACE_H_
+#define ACSDK_CRYPTOINTERFACES_CRYPTOFACTORYINTERFACE_H_
 
 #include <memory>
 
@@ -25,7 +25,7 @@
 #include "DigestType.h"
 
 namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
+namespace cryptoInterfaces {
 
 /**
  * @brief Crypto API factory interface.
@@ -36,8 +36,8 @@ namespace acsdkCryptoInterfaces {
  *
  * This interface is thread safe and can be used concurrently by different threads.
  *
- * @ingroup CryptoAPI
- * @sa CryptoIMPL
+ * @ingroup Lib_acsdkCryptoInterfaces
+ * @sa Lib_acsdkCrypto
  */
 class CryptoFactoryInterface {
 public:
@@ -87,7 +87,7 @@ class CryptoFactoryInterface {
     virtual std::shared_ptr<KeyFactoryInterface> getKeyFactory() noexcept = 0;
 };
 
-}  // namespace acsdkCryptoInterfaces
+}  // namespace cryptoInterfaces
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCRYPTOINTERFACES_CRYPTOFACTORYINTERFACE_H_
+#endif  // ACSDK_CRYPTOINTERFACES_CRYPTOFACTORYINTERFACE_H_
diff --git a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/DigestInterface.h b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/DigestInterface.h
similarity index 96%
rename from core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/DigestInterface.h
rename to core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/DigestInterface.h
index e6bdb5ce71..f8fb2f386a 100644
--- a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/DigestInterface.h
+++ b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/DigestInterface.h
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCRYPTOINTERFACES_DIGESTINTERFACE_H_
-#define ACSDKCRYPTOINTERFACES_DIGESTINTERFACE_H_
+#ifndef ACSDK_CRYPTOINTERFACES_DIGESTINTERFACE_H_
+#define ACSDK_CRYPTOINTERFACES_DIGESTINTERFACE_H_
 
 #include <string>
 #include <vector>
 
 namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
+namespace cryptoInterfaces {
 
 /**
  * @brief Digest computation interface.
@@ -47,7 +47,7 @@ namespace acsdkCryptoInterfaces {
  *
  * This interface is not thread safe and caller must ensure only one thread can make calls at any time.
  *
- * @ingroup CryptoAPI
+ * @ingroup Lib_acsdkCryptoInterfaces
  */
 class DigestInterface {
 public:
@@ -217,7 +217,7 @@ class DigestInterface {
     virtual bool reset() noexcept = 0;
 };
 
-}  // namespace acsdkCryptoInterfaces
+}  // namespace cryptoInterfaces
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCRYPTOINTERFACES_DIGESTINTERFACE_H_
+#endif  // ACSDK_CRYPTOINTERFACES_DIGESTINTERFACE_H_
diff --git a/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/DigestType.h b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/DigestType.h
new file mode 100644
index 0000000000..44f903d721
--- /dev/null
+++ b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/DigestType.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_CRYPTOINTERFACES_DIGESTTYPE_H_
+#define ACSDK_CRYPTOINTERFACES_DIGESTTYPE_H_
+
+#include <ostream>
+
+namespace alexaClientSDK {
+namespace cryptoInterfaces {
+
+/**
+ * @brief Enumeration of all supported digest algorithms.
+ *
+ * This enumeration provides list of supported digest algorithms.
+ *
+ * @ingroup Lib_acsdkCryptoInterfaces
+ */
+enum class DigestType {
+    /// @brief SHA-256 digest algorithm.
+    ///
+    /// Secure Hash Algorithm 2 with 256 bit digest.
+    ///
+    /// @see https://en.wikipedia.org/wiki/SHA-2
+    SHA_256 = 1,
+
+    /// @brief MD5 digest algorithm.
+    ///
+    /// Message Digest algorithm 5 with 128 bit digest.
+    ///
+    /// @see https://en.wikipedia.org/wiki/MD5
+    MD5 = 2,
+};
+
+/**
+ * @brief Helper method to write digest type as a literal constant.
+ *
+ * This method enables logging functions to accept digest type as a value.
+ *
+ * @param[in] out   Output stream.
+ * @param[in] value Value to write.
+ *
+ * @return Output stream.
+ * @ingroup Lib_acsdkCryptoInterfaces
+ */
+std::ostream& operator<<(std::ostream& out, DigestType value);
+
+}  // namespace cryptoInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_CRYPTOINTERFACES_DIGESTTYPE_H_
diff --git a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/KeyFactoryInterface.h b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/KeyFactoryInterface.h
similarity index 89%
rename from core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/KeyFactoryInterface.h
rename to core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/KeyFactoryInterface.h
index c30e54a49a..1628c02c23 100644
--- a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/KeyFactoryInterface.h
+++ b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/KeyFactoryInterface.h
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCRYPTOINTERFACES_KEYFACTORYINTERFACE_H_
-#define ACSDKCRYPTOINTERFACES_KEYFACTORYINTERFACE_H_
+#ifndef ACSDK_CRYPTOINTERFACES_KEYFACTORYINTERFACE_H_
+#define ACSDK_CRYPTOINTERFACES_KEYFACTORYINTERFACE_H_
 
 #include <vector>
 
 #include "AlgorithmType.h"
 
 namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
+namespace cryptoInterfaces {
 
 /**
  * @brief Key factory interface.
@@ -32,7 +32,7 @@ namespace acsdkCryptoInterfaces {
  *
  * This interface is thread safe and can be used concurrently by different threads.
  *
- * @ingroup CryptoAPI
+ * @ingroup Lib_acsdkCryptoInterfaces
  */
 class KeyFactoryInterface {
 public:
@@ -74,7 +74,7 @@ class KeyFactoryInterface {
     virtual bool generateIV(AlgorithmType type, IV& iv) noexcept = 0;
 };
 
-}  // namespace acsdkCryptoInterfaces
+}  // namespace cryptoInterfaces
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCRYPTOINTERFACES_KEYFACTORYINTERFACE_H_
+#endif  // ACSDK_CRYPTOINTERFACES_KEYFACTORYINTERFACE_H_
diff --git a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/KeyStoreInterface.h b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/KeyStoreInterface.h
similarity index 97%
rename from core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/KeyStoreInterface.h
rename to core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/KeyStoreInterface.h
index a9f3358382..202e528bd6 100644
--- a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/KeyStoreInterface.h
+++ b/core/Crypto/CryptoInterfaces/include/acsdk/CryptoInterfaces/KeyStoreInterface.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKCRYPTOINTERFACES_KEYSTOREINTERFACE_H_
-#define ACSDKCRYPTOINTERFACES_KEYSTOREINTERFACE_H_
+#ifndef ACSDK_CRYPTOINTERFACES_KEYSTOREINTERFACE_H_
+#define ACSDK_CRYPTOINTERFACES_KEYSTOREINTERFACE_H_
 
 #include <memory>
 #include <string>
@@ -23,7 +23,7 @@
 #include "AlgorithmType.h"
 
 namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
+namespace cryptoInterfaces {
 
 /**
  * @brief Key Store Interface.
@@ -41,8 +41,8 @@ namespace acsdkCryptoInterfaces {
  *
  * This interface is thread safe and can be used concurrently by different threads.
  *
- * @sa CryptoPKCS11
- * @ingroup CryptoAPI
+ * @sa Lib_acsdkPkcs11
+ * @ingroup Lib_acsdkCryptoInterfaces
  */
 class KeyStoreInterface {
 public:
@@ -205,7 +205,7 @@ class KeyStoreInterface {
     virtual bool getDefaultKeyAlias(std::string& keyAlias) noexcept = 0;
 };
 
-}  // namespace acsdkCryptoInterfaces
+}  // namespace cryptoInterfaces
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKCRYPTOINTERFACES_KEYSTOREINTERFACE_H_
+#endif  // ACSDK_CRYPTOINTERFACES_KEYSTOREINTERFACE_H_
diff --git a/core/Crypto/acsdkCryptoInterfaces/src/AlgorithmType.cpp b/core/Crypto/CryptoInterfaces/src/AlgorithmType.cpp
similarity index 92%
rename from core/Crypto/acsdkCryptoInterfaces/src/AlgorithmType.cpp
rename to core/Crypto/CryptoInterfaces/src/AlgorithmType.cpp
index 35142682fb..208ef31b52 100644
--- a/core/Crypto/acsdkCryptoInterfaces/src/AlgorithmType.cpp
+++ b/core/Crypto/CryptoInterfaces/src/AlgorithmType.cpp
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
 
 namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
+namespace cryptoInterfaces {
 
 std::ostream& operator<<(std::ostream& out, AlgorithmType value) {
     const char* type;
@@ -45,5 +45,5 @@ std::ostream& operator<<(std::ostream& out, AlgorithmType value) {
     return out << type;
 }
 
-}  // namespace acsdkCryptoInterfaces
+}  // namespace cryptoInterfaces
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCryptoInterfaces/src/CMakeLists.txt b/core/Crypto/CryptoInterfaces/src/CMakeLists.txt
similarity index 100%
rename from core/Crypto/acsdkCryptoInterfaces/src/CMakeLists.txt
rename to core/Crypto/CryptoInterfaces/src/CMakeLists.txt
diff --git a/core/Crypto/acsdkCryptoInterfaces/src/DigestType.cpp b/core/Crypto/CryptoInterfaces/src/DigestType.cpp
similarity index 83%
rename from core/Crypto/acsdkCryptoInterfaces/src/DigestType.cpp
rename to core/Crypto/CryptoInterfaces/src/DigestType.cpp
index 3fc2a2d102..a6b565eb3b 100644
--- a/core/Crypto/acsdkCryptoInterfaces/src/DigestType.cpp
+++ b/core/Crypto/CryptoInterfaces/src/DigestType.cpp
@@ -13,19 +13,21 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkCryptoInterfaces/DigestType.h>
+#include <acsdk/CryptoInterfaces/DigestType.h>
 
 namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
+namespace cryptoInterfaces {
 
 std::ostream& operator<<(std::ostream& out, DigestType value) {
     switch (value) {
         case DigestType::SHA_256:
             return out << "SHA-256";
+        case DigestType::MD5:
+            return out << "MD5";
         default:
             return out << static_cast<int>(value);
     }
 }
 
-}  // namespace acsdkCryptoInterfaces
+}  // namespace cryptoInterfaces
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCryptoInterfaces/test/CMakeLists.txt b/core/Crypto/CryptoInterfaces/test/CMakeLists.txt
similarity index 100%
rename from core/Crypto/acsdkCryptoInterfaces/test/CMakeLists.txt
rename to core/Crypto/CryptoInterfaces/test/CMakeLists.txt
diff --git a/core/Crypto/CryptoInterfaces/test/doc/Namespaces.dox b/core/Crypto/CryptoInterfaces/test/doc/Namespaces.dox
new file mode 100644
index 0000000000..7e7238831a
--- /dev/null
+++ b/core/Crypto/CryptoInterfaces/test/doc/Namespaces.dox
@@ -0,0 +1,20 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * \namespace ::alexaClientSDK::cryptoInterfaces::test
+ * \brief Test stubs and mocks for \ref Lib_acsdkCryptoInterfaces
+ * \ingroup Lib_acsdkCryptoInterfaces
+ */
diff --git a/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockCryptoCodec.h b/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockCryptoCodec.h
new file mode 100644
index 0000000000..50c2e17b91
--- /dev/null
+++ b/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockCryptoCodec.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_CRYPTOINTERFACES_TEST_MOCKCRYPTOCODEC_H_
+#define ACSDK_CRYPTOINTERFACES_TEST_MOCKCRYPTOCODEC_H_
+
+#include <acsdk/CryptoInterfaces/CryptoCodecInterface.h>
+#include <acsdk/Test/GmockExtensions.h>
+
+namespace alexaClientSDK {
+namespace cryptoInterfaces {
+namespace test {
+
+/**
+ * Mock class for @c CryptoCodecInterface.
+ */
+class MockCryptoCodec : public CryptoCodecInterface {
+public:
+    MOCK_NOEXCEPT_METHOD2(_init, bool(const Key&, const IV&));
+    MOCK_NOEXCEPT_METHOD1(_processAAD, bool(const DataBlock&));
+    MOCK_NOEXCEPT_METHOD2(_processAAD, bool(const DataBlock::const_iterator&, const DataBlock::const_iterator&));
+    MOCK_NOEXCEPT_METHOD2(_process, bool(const DataBlock&, DataBlock&));
+    MOCK_NOEXCEPT_METHOD3(
+        _process,
+        bool(const DataBlock::const_iterator&, const DataBlock::const_iterator&, DataBlock&));
+    MOCK_NOEXCEPT_METHOD1(_finalize, bool(DataBlock&));
+    MOCK_NOEXCEPT_METHOD1(_getTag, bool(Tag&));
+    MOCK_NOEXCEPT_METHOD1(_setTag, bool(const Tag&));
+};
+
+}  // namespace test
+}  // namespace cryptoInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_CRYPTOINTERFACES_TEST_MOCKCRYPTOCODEC_H_
diff --git a/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockCryptoFactory.h b/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockCryptoFactory.h
new file mode 100644
index 0000000000..de84a87b85
--- /dev/null
+++ b/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockCryptoFactory.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_CRYPTOINTERFACES_TEST_MOCKCRYPTOFACTORY_H_
+#define ACSDK_CRYPTOINTERFACES_TEST_MOCKCRYPTOFACTORY_H_
+
+#include <unordered_map>
+#include <string>
+#include <memory>
+
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
+#include <acsdk/CryptoInterfaces/DigestType.h>
+#include <acsdk/CryptoInterfaces/DigestInterface.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/CryptoCodecInterface.h>
+#include <acsdk/CryptoInterfaces/KeyFactoryInterface.h>
+#include <acsdk/Test/GmockExtensions.h>
+
+namespace alexaClientSDK {
+namespace cryptoInterfaces {
+namespace test {
+
+/**
+ * Mock class for @c CryptoFactoryInterface.
+ */
+class MockCryptoFactory : public CryptoFactoryInterface {
+public:
+    MOCK_NOEXCEPT_METHOD1(createEncoder, std::unique_ptr<CryptoCodecInterface>(AlgorithmType));
+    MOCK_NOEXCEPT_METHOD1(createDecoder, std::unique_ptr<CryptoCodecInterface>(AlgorithmType));
+    MOCK_NOEXCEPT_METHOD1(createDigest, std::unique_ptr<DigestInterface>(DigestType));
+    MOCK_NOEXCEPT_METHOD0(getKeyFactory, std::shared_ptr<KeyFactoryInterface>());
+};
+
+}  // namespace test
+}  // namespace cryptoInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_CRYPTOINTERFACES_TEST_MOCKCRYPTOFACTORY_H_
diff --git a/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockDigest.h b/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockDigest.h
new file mode 100644
index 0000000000..7ef756fa9c
--- /dev/null
+++ b/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockDigest.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_CRYPTOINTERFACES_TEST_MOCKDIGEST_H_
+#define ACSDK_CRYPTOINTERFACES_TEST_MOCKDIGEST_H_
+
+#include <acsdk/CryptoInterfaces/DigestInterface.h>
+#include <acsdk/Test/GmockExtensions.h>
+
+namespace alexaClientSDK {
+namespace cryptoInterfaces {
+namespace test {
+
+/**
+ * Mock class for @c DigestInterface.
+ */
+class MockDigest : public DigestInterface {
+public:
+    MOCK_NOEXCEPT_METHOD1(process, bool(const DataBlock&));
+    MOCK_NOEXCEPT_METHOD2(process, bool(const DataBlock::const_iterator, const DataBlock::const_iterator));
+    MOCK_NOEXCEPT_METHOD1(processByte, bool(unsigned char));
+    MOCK_NOEXCEPT_METHOD1(processUInt8, bool(uint8_t));
+    MOCK_NOEXCEPT_METHOD1(processUInt16, bool(uint16_t));
+    MOCK_NOEXCEPT_METHOD1(processUInt32, bool(uint32_t));
+    MOCK_NOEXCEPT_METHOD1(processUInt64, bool(uint64_t));
+    MOCK_NOEXCEPT_METHOD1(processString, bool(const std::string&));
+    MOCK_NOEXCEPT_METHOD1(finalize, bool(DataBlock&));
+    MOCK_NOEXCEPT_METHOD0(reset, bool());
+};
+
+}  // namespace test
+}  // namespace cryptoInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_CRYPTOINTERFACES_TEST_MOCKDIGEST_H_
diff --git a/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockKeyFactory.h b/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockKeyFactory.h
new file mode 100644
index 0000000000..96606c101c
--- /dev/null
+++ b/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockKeyFactory.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_CRYPTOINTERFACES_TEST_MOCKKEYFACTORY_H_
+#define ACSDK_CRYPTOINTERFACES_TEST_MOCKKEYFACTORY_H_
+
+#include <acsdk/CryptoInterfaces/KeyFactoryInterface.h>
+#include <acsdk/Test/GmockExtensions.h>
+
+namespace alexaClientSDK {
+namespace cryptoInterfaces {
+namespace test {
+
+/**
+ * Mock class for @c KeyFactoryInterface.
+ */
+class MockKeyFactory : public KeyFactoryInterface {
+public:
+    MOCK_NOEXCEPT_METHOD2(generateKey, bool(AlgorithmType type, Key& key));
+    MOCK_NOEXCEPT_METHOD2(generateIV, bool(AlgorithmType type, IV& iv));
+};
+
+}  // namespace test
+}  // namespace cryptoInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_CRYPTOINTERFACES_TEST_MOCKKEYFACTORY_H_
diff --git a/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockKeyStore.h b/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockKeyStore.h
new file mode 100644
index 0000000000..d56f80df8f
--- /dev/null
+++ b/core/Crypto/CryptoInterfaces/test/include/acsdk/CryptoInterfaces/test/MockKeyStore.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_CRYPTOINTERFACES_TEST_MOCKKEYSTORE_H_
+#define ACSDK_CRYPTOINTERFACES_TEST_MOCKKEYSTORE_H_
+
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/Test/GmockExtensions.h>
+
+namespace alexaClientSDK {
+namespace cryptoInterfaces {
+namespace test {
+
+/**
+ * Mock class for @c KeyStoreInterface.
+ */
+class MockKeyStore : public KeyStoreInterface {
+public:
+    MOCK_NOEXCEPT_METHOD6(
+        encrypt,
+        bool(
+            const std::string& keyAlias,
+            AlgorithmType type,
+            const IV& iv,
+            const DataBlock& plaintext,
+            KeyChecksum& checksum,
+            DataBlock& ciphertext));
+    MOCK_NOEXCEPT_METHOD8(
+        encryptAE,
+        bool(
+            const std::string& keyAlias,
+            AlgorithmType type,
+            const IV& iv,
+            const DataBlock& aad,
+            const DataBlock& plaintext,
+            KeyChecksum& checksum,
+            DataBlock& ciphertext,
+            DataBlock& tag));
+    MOCK_NOEXCEPT_METHOD6(
+        decrypt,
+        bool(
+            const std::string& keyAlias,
+            AlgorithmType type,
+            const KeyChecksum& checksum,
+            const IV& iv,
+            const DataBlock& ciphertext,
+            DataBlock& plaintext));
+    MOCK_NOEXCEPT_METHOD8(
+        decryptAD,
+        bool(
+            const std::string& keyAlias,
+            AlgorithmType type,
+            const KeyChecksum& checksum,
+            const IV& iv,
+            const DataBlock& aad,
+            const DataBlock& ciphertext,
+            const Tag& tag,
+            DataBlock& plaintext));
+    MOCK_NOEXCEPT_METHOD1(getDefaultKeyAlias, bool(std::string&));
+};
+
+}  // namespace test
+}  // namespace cryptoInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_CRYPTOINTERFACES_TEST_MOCKKEYSTORE_H_
diff --git a/core/Crypto/acsdkPkcs11/CMakeLists.txt b/core/Crypto/Pkcs11/CMakeLists.txt
similarity index 100%
rename from core/Crypto/acsdkPkcs11/CMakeLists.txt
rename to core/Crypto/Pkcs11/CMakeLists.txt
diff --git a/core/Crypto/acsdkPkcs11/doc/CryptoPKCS11.dox b/core/Crypto/Pkcs11/doc/CryptoPKCS11.dox
similarity index 81%
rename from core/Crypto/acsdkPkcs11/doc/CryptoPKCS11.dox
rename to core/Crypto/Pkcs11/doc/CryptoPKCS11.dox
index a519f1097a..d6f49ae309 100644
--- a/core/Crypto/acsdkPkcs11/doc/CryptoPKCS11.dox
+++ b/core/Crypto/Pkcs11/doc/CryptoPKCS11.dox
@@ -14,10 +14,10 @@
  */
 
 /**
- * \defgroup CryptoPKCS11 Hardware Security Module Functions
- * @brief HSM functions for \ref CryptoAPI.
+ * \defgroup Lib_acsdkPkcs11 Hardware Security Module Functions
+ * @brief HSM functions for \ref Lib_acsdkCryptoInterfaces.
  *
- * \ref CryptoPKCS11 implements a subset of \ref CryptoAPI for hardware security module operations. Module provides
+ * \ref Lib_acsdkPkcs11 implements a subset of \ref Lib_acsdkCryptoInterfaces for hardware security module operations. Module provides
  * access to data encryption and decryption functions using HSM-managed secrets.
  *
  * This module requires platform configuration that provides the following information:
@@ -35,7 +35,7 @@
  *
  * The library provides a single method:
  * \code{.cpp}
- * #include <acsdkPkcs11/KeyStoreFactory.h>
+ * #include <acsdk/Pkcs11/KeyStoreFactory.h>
  *
  * auto metricRecorder = ...;
  * auto factory = createKeyStoreFactory(metricRecorder);
@@ -58,17 +58,17 @@
  * "GET_CHECKSUM_ERROR" | Checksum check error. This error indicates the checksum is not available.
  * "EXTRACTABLE_KEY"    | This counters indicate the key may have been compromized.
  *
- * \sa CryptoAPI
- * \sa alexaClientSDK::acsdkPkcs11
- * \sa alexaClientSDK::acsdkPkcs11::test
+ * \sa Lib_acsdkCryptoInterfaces
+ * \sa alexaClientSDK::pkcs11
+ * \sa alexaClientSDK::pkcs11::test
  *
- * \namespace alexaClientSDK::acsdkPkcs11
+ * \namespace alexaClientSDK::pkcs11
  * \brief HSM interface implementation.
- * \ingroup CryptoPKCS11
- * \sa CryptoPKCS11
+ * \ingroup Lib_acsdkPkcs11
+ * \sa Lib_acsdkPkcs11
  *
- * \namespace alexaClientSDK::acsdkPkcs11::test
- * \brief Test cases for \ref CryptoPKCS11
- * \ingroup CryptoPKCS11
- * \sa CryptoPKCS11
+ * \namespace alexaClientSDK::pkcs11::test
+ * \brief Test cases for \ref Lib_acsdkPkcs11
+ * \ingroup Lib_acsdkPkcs11
+ * \sa Lib_acsdkPkcs11
  */
diff --git a/core/Crypto/acsdkPkcs11/include/acsdkPkcs11/KeyStoreFactory.h b/core/Crypto/Pkcs11/include/acsdk/Pkcs11/KeyStoreFactory.h
similarity index 76%
rename from core/Crypto/acsdkPkcs11/include/acsdkPkcs11/KeyStoreFactory.h
rename to core/Crypto/Pkcs11/include/acsdk/Pkcs11/KeyStoreFactory.h
index 811b0aefc6..5ff581dab4 100644
--- a/core/Crypto/acsdkPkcs11/include/acsdkPkcs11/KeyStoreFactory.h
+++ b/core/Crypto/Pkcs11/include/acsdk/Pkcs11/KeyStoreFactory.h
@@ -13,16 +13,16 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPKCS11_KEYSTOREFACTORY_H_
-#define ACSDKPKCS11_KEYSTOREFACTORY_H_
+#ifndef ACSDK_PKCS11_KEYSTOREFACTORY_H_
+#define ACSDK_PKCS11_KEYSTOREFACTORY_H_
 
 #include <memory>
 
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
 #include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 using alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface;
 
@@ -36,14 +36,14 @@ using alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface;
  *
  * @return Key store reference or nullptr on error.
  *
- * @see alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface
+ * @see alexaClientSDK::cryptoInterfaces::KeyStoreInterface
  * @see alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface
- * @ingroup CryptoPKCS11
+ * @ingroup Lib_acsdkPkcs11
  */
-std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface> createKeyStore(
+std::shared_ptr<alexaClientSDK::cryptoInterfaces::KeyStoreInterface> createKeyStore(
     const std::shared_ptr<MetricRecorderInterface>& metricRecorder = nullptr) noexcept;
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPKCS11_KEYSTOREFACTORY_H_
+#endif  // ACSDK_PKCS11_KEYSTOREFACTORY_H_
diff --git a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/ErrorCleanupGuard.h b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/ErrorCleanupGuard.h
similarity index 91%
rename from core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/ErrorCleanupGuard.h
rename to core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/ErrorCleanupGuard.h
index f5ca097b3b..6535ebd947 100644
--- a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/ErrorCleanupGuard.h
+++ b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/ErrorCleanupGuard.h
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPKCS11_PRIVATE_ERRORCLEANUPGUARD_H_
-#define ACSDKPKCS11_PRIVATE_ERRORCLEANUPGUARD_H_
+#ifndef ACSDK_PKCS11_PRIVATE_ERRORCLEANUPGUARD_H_
+#define ACSDK_PKCS11_PRIVATE_ERRORCLEANUPGUARD_H_
 
 #include <AVSCommon/Utils/Error/FinallyGuard.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 /**
  * @brief Error cleanup function on error.
@@ -57,7 +57,7 @@ class ErrorCleanupGuard : public alexaClientSDK::avsCommon::utils::error::Finall
     }
 };
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPKCS11_PRIVATE_ERRORCLEANUPGUARD_H_
+#endif  // ACSDK_PKCS11_PRIVATE_ERRORCLEANUPGUARD_H_
diff --git a/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/Logging.h b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/Logging.h
new file mode 100644
index 0000000000..5d691b8553
--- /dev/null
+++ b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/Logging.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_PKCS11_PRIVATE_LOGGING_H_
+#define ACSDK_PKCS11_PRIVATE_LOGGING_H_
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ * @ingroup Lib_acsdkPkcs11
+ * @private
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+#endif  // ACSDK_PKCS11_PRIVATE_LOGGING_H_
diff --git a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11API.h b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11API.h
similarity index 88%
rename from core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11API.h
rename to core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11API.h
index 55040e306b..2612383360 100644
--- a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11API.h
+++ b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11API.h
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPKCS11_PRIVATE_PKCS11API_H_
-#define ACSDKPKCS11_PRIVATE_PKCS11API_H_
+#ifndef ACSDK_PKCS11_PRIVATE_PKCS11API_H_
+#define ACSDK_PKCS11_PRIVATE_PKCS11API_H_
 
-/// @addtogroup CryptoPKCS11
+/// @addtogroup Lib_acsdkPkcs11
 /// @{
 
 // Define platform-specific macros for PKCS#11 API (UNIX)
@@ -44,4 +44,4 @@ static constexpr CK_OBJECT_CLASS UNDEFINED_OBJECT_CLASS = static_cast<CK_OBJECT_
 /// @brief Constant for key type initialization.
 static constexpr CK_KEY_TYPE UNDEFINED_KEY_TYPE = static_cast<CK_KEY_TYPE>(-1);
 
-#endif  // ACSDKPKCS11_PRIVATE_PKCS11API_H_
+#endif  // ACSDK_PKCS11_PRIVATE_PKCS11API_H_
diff --git a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Config.h b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Config.h
similarity index 92%
rename from core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Config.h
rename to core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Config.h
index cf678f90f6..5533329886 100644
--- a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Config.h
+++ b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Config.h
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPKCS11_PRIVATE_PKCS11CONFIG_H_
-#define ACSDKPKCS11_PRIVATE_PKCS11CONFIG_H_
+#ifndef ACSDK_PKCS11_PRIVATE_PKCS11CONFIG_H_
+#define ACSDK_PKCS11_PRIVATE_PKCS11CONFIG_H_
 
 #include <memory>
 #include <string>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 class PKCS11Key;
 class PKCS11Slot;
@@ -34,7 +34,7 @@ class PKCS11Session;
  *
  * The configuration file shall have restricted access to service account, that executes application.
  *
- * @sa CryptoPKCS11
+ * @sa Lib_acsdkPkcs11
  */
 class PKCS11Config {
 public:
@@ -94,7 +94,7 @@ class PKCS11Config {
     std::string m_defaultKeyName;
 };
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPKCS11_PRIVATE_PKCS11CONFIG_H_
+#endif  // ACSDK_PKCS11_PRIVATE_PKCS11CONFIG_H_
diff --git a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Functions.h b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Functions.h
similarity index 92%
rename from core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Functions.h
rename to core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Functions.h
index 537dd3a460..5e51ca0d81 100644
--- a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Functions.h
+++ b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Functions.h
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPKCS11_PRIVATE_PKCS11FUNCTIONS_H_
-#define ACSDKPKCS11_PRIVATE_PKCS11FUNCTIONS_H_
+#ifndef ACSDK_PKCS11_PRIVATE_PKCS11FUNCTIONS_H_
+#define ACSDK_PKCS11_PRIVATE_PKCS11FUNCTIONS_H_
 
 #include <memory>
 #include <string>
@@ -27,10 +27,10 @@
 #include <windows.h>
 #endif
 
-#include <acsdkPkcs11/private/PKCS11API.h>
+#include <acsdk/Pkcs11/private/PKCS11API.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 class PKCS11Key;
 class PKCS11Slot;
@@ -42,7 +42,7 @@ class PKCS11Token;
  *
  * This class manages library load, initialization, and slot operations.
  *
- * @ingroup CryptoPKCS11
+ * @ingroup Lib_acsdkPkcs11
  */
 class PKCS11Functions : public std::enable_shared_from_this<PKCS11Functions> {
 public:
@@ -123,7 +123,7 @@ class PKCS11Functions : public std::enable_shared_from_this<PKCS11Functions> {
     CK_FUNCTION_LIST* m_pkcs11Functions;
 };
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPKCS11_PRIVATE_PKCS11FUNCTIONS_H_
+#endif  // ACSDK_PKCS11_PRIVATE_PKCS11FUNCTIONS_H_
diff --git a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Key.h b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Key.h
similarity index 92%
rename from core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Key.h
rename to core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Key.h
index 44c5af76a6..6495c600a1 100644
--- a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Key.h
+++ b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Key.h
@@ -13,27 +13,27 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPKCS11_PRIVATE_PKCS11KEY_H_
-#define ACSDKPKCS11_PRIVATE_PKCS11KEY_H_
+#ifndef ACSDK_PKCS11_PRIVATE_PKCS11KEY_H_
+#define ACSDK_PKCS11_PRIVATE_PKCS11KEY_H_
 
 #include <memory>
 #include <string>
 
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
-#include <acsdkPkcs11/private/PKCS11API.h>
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
+#include <acsdk/Pkcs11/private/PKCS11API.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 class PKCS11Session;
 
-using alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType;
+using alexaClientSDK::cryptoInterfaces::AlgorithmType;
 
 /**
  * @brief PKCS11 key object wrapper.
  *
  * This class wraps PKCS#11 key handle and related operations.
- * @ingroup CryptoPKCS11
+ * @ingroup Lib_acsdkPkcs11
  */
 class PKCS11Key {
 public:
@@ -133,7 +133,7 @@ class PKCS11Key {
     CK_OBJECT_HANDLE m_keyHandle;
 };
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPKCS11_PRIVATE_PKCS11KEY_H_
+#endif  // ACSDK_PKCS11_PRIVATE_PKCS11KEY_H_
diff --git a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11KeyDescriptor.h b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11KeyDescriptor.h
similarity index 77%
rename from core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11KeyDescriptor.h
rename to core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11KeyDescriptor.h
index ce9dff0116..a7cfc9979f 100644
--- a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11KeyDescriptor.h
+++ b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11KeyDescriptor.h
@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPKCS11_PRIVATE_PKCS11KEYDESCRIPTOR_H_
-#define ACSDKPKCS11_PRIVATE_PKCS11KEYDESCRIPTOR_H_
+#ifndef ACSDK_PKCS11_PRIVATE_PKCS11KEYDESCRIPTOR_H_
+#define ACSDK_PKCS11_PRIVATE_PKCS11KEYDESCRIPTOR_H_
 
 #include <functional>
 #include <string>
 
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
-#include <acsdkPkcs11/private/PKCS11API.h>
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
+#include <acsdk/Pkcs11/private/PKCS11API.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 /**
  * @brief Class to identify key object in HSM.
@@ -64,7 +64,7 @@ struct PKCS11KeyDescriptor {
      * @param[in] objectLabel Object label.
      * @param[in] algorithmType Algorithm type.
      */
-    PKCS11KeyDescriptor(const std::string& objectLabel, acsdkCryptoInterfaces::AlgorithmType algorithmType) noexcept;
+    PKCS11KeyDescriptor(const std::string& objectLabel, cryptoInterfaces::AlgorithmType algorithmType) noexcept;
 
     /**
      * @brief Create object with given parameters.
@@ -85,12 +85,12 @@ struct PKCS11KeyDescriptor {
      * @return Returns true on success.
      */
     static bool mapAlgorithmToKeyParams(
-        acsdkCryptoInterfaces::AlgorithmType algorithmType,
+        cryptoInterfaces::AlgorithmType algorithmType,
         CK_KEY_TYPE& keyType,
         CK_ULONG& keyLen);
 };
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
 
 namespace std {
@@ -99,7 +99,7 @@ namespace std {
  * @brief Hash support for PKCS11KeyDescriptor.
  */
 template <>
-struct hash<alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor> {
+struct hash<alexaClientSDK::pkcs11::PKCS11KeyDescriptor> {
     /**
      * @brief Compute hash code.
      *
@@ -107,14 +107,14 @@ struct hash<alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor> {
      *
      * @return Computed hash code.
      */
-    std::size_t operator()(const alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor& arg) const noexcept;
+    std::size_t operator()(const alexaClientSDK::pkcs11::PKCS11KeyDescriptor& arg) const noexcept;
 };
 
 /**
  * @brief Comparison support PKCS11KeyDescriptor.
  */
 template <>
-struct equal_to<alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor> {
+struct equal_to<alexaClientSDK::pkcs11::PKCS11KeyDescriptor> {
     /**
      * @brief Compares two PKCS11KeyDescriptor instances.
      *
@@ -124,13 +124,13 @@ struct equal_to<alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor> {
      * @return True if instances are equal.
      */
     bool operator()(
-        const alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor& arg1,
-        const alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor& arg2) const noexcept;
+        const alexaClientSDK::pkcs11::PKCS11KeyDescriptor& arg1,
+        const alexaClientSDK::pkcs11::PKCS11KeyDescriptor& arg2) const noexcept;
 };
 
 // Dumps PKCS11KeyDescriptor data into stream (for logging).
-std::ostream& operator<<(std::ostream& out, const alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor& arg) noexcept;
+std::ostream& operator<<(std::ostream& out, const alexaClientSDK::pkcs11::PKCS11KeyDescriptor& arg) noexcept;
 
 }  // namespace std
 
-#endif  // ACSDKPKCS11_PRIVATE_PKCS11KEYDESCRIPTOR_H_
+#endif  // ACSDK_PKCS11_PRIVATE_PKCS11KEYDESCRIPTOR_H_
diff --git a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11KeyStore.h b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11KeyStore.h
similarity index 86%
rename from core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11KeyStore.h
rename to core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11KeyStore.h
index 8acbc17b4a..416c4d8206 100644
--- a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11KeyStore.h
+++ b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11KeyStore.h
@@ -13,34 +13,34 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPKCS11_PRIVATE_PKCS11KEYSTORE_H_
-#define ACSDKPKCS11_PRIVATE_PKCS11KEYSTORE_H_
+#ifndef ACSDK_PKCS11_PRIVATE_PKCS11KEYSTORE_H_
+#define ACSDK_PKCS11_PRIVATE_PKCS11KEYSTORE_H_
 
 #include <memory>
 #include <unordered_map>
 
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
-#include <acsdkPkcs11/private/PKCS11Functions.h>
-#include <acsdkPkcs11/private/PKCS11Key.h>
-#include <acsdkPkcs11/private/PKCS11KeyDescriptor.h>
-#include <acsdkPkcs11/private/PKCS11Session.h>
-#include <acsdkPkcs11/private/PKCS11Slot.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/Pkcs11/private/PKCS11Functions.h>
+#include <acsdk/Pkcs11/private/PKCS11Key.h>
+#include <acsdk/Pkcs11/private/PKCS11KeyDescriptor.h>
+#include <acsdk/Pkcs11/private/PKCS11Session.h>
+#include <acsdk/Pkcs11/private/PKCS11Slot.h>
 #include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
-using alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType;
-using alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface;
 using alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface;
+using alexaClientSDK::cryptoInterfaces::AlgorithmType;
+using alexaClientSDK::cryptoInterfaces::KeyStoreInterface;
 
 /**
  * @brief Key store implementation for PKCS11.
  *
- * This class implements features of @ref alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface using PKCS#11
+ * This class implements features of @ref alexaClientSDK::cryptoInterfaces::KeyStoreInterface using PKCS#11
  * interface functions.
  *
- * @ingroup CryptoPKCS11
+ * @ingroup Lib_acsdkPkcs11
  */
 class PKCS11KeyStore : public KeyStoreInterface {
 public:
@@ -154,7 +154,7 @@ class PKCS11KeyStore : public KeyStoreInterface {
     std::string m_defaultKeyAlias;
 };
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPKCS11_PRIVATE_PKCS11KEYSTORE_H_
+#endif  // ACSDK_PKCS11_PRIVATE_PKCS11KEYSTORE_H_
diff --git a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Session.h b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Session.h
similarity index 87%
rename from core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Session.h
rename to core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Session.h
index 99e403c7f0..570497668a 100644
--- a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Session.h
+++ b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Session.h
@@ -13,27 +13,27 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPKCS11_PRIVATE_PKCS11SESSION_H_
-#define ACSDKPKCS11_PRIVATE_PKCS11SESSION_H_
+#ifndef ACSDK_PKCS11_PRIVATE_PKCS11SESSION_H_
+#define ACSDK_PKCS11_PRIVATE_PKCS11SESSION_H_
 
 #include <memory>
 #include <mutex>
 #include <string>
 
-#include <acsdkPkcs11/private/PKCS11KeyDescriptor.h>
+#include <acsdk/Pkcs11/private/PKCS11KeyDescriptor.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 class PKCS11Functions;
 class PKCS11Key;
-using alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType;
+using alexaClientSDK::cryptoInterfaces::AlgorithmType;
 
 /**
  * @brief PKCS11 session wrapper.
  *
  * This class wraps PKCS#11 API session handle and related operations.
- * @ingroup CryptoPKCS11
+ * @ingroup Lib_acsdkPkcs11
  */
 class PKCS11Session : public std::enable_shared_from_this<PKCS11Session> {
 public:
@@ -94,7 +94,7 @@ class PKCS11Session : public std::enable_shared_from_this<PKCS11Session> {
     CK_SESSION_HANDLE m_sessionHandle;
 };
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPKCS11_PRIVATE_PKCS11SESSION_H_
+#endif  // ACSDK_PKCS11_PRIVATE_PKCS11SESSION_H_
diff --git a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Slot.h b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Slot.h
similarity index 86%
rename from core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Slot.h
rename to core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Slot.h
index 5ee29523ed..6e94542698 100644
--- a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/PKCS11Slot.h
+++ b/core/Crypto/Pkcs11/privateInclude/acsdk/Pkcs11/private/PKCS11Slot.h
@@ -13,16 +13,16 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPKCS11_PRIVATE_PKCS11SLOT_H_
-#define ACSDKPKCS11_PRIVATE_PKCS11SLOT_H_
+#ifndef ACSDK_PKCS11_PRIVATE_PKCS11SLOT_H_
+#define ACSDK_PKCS11_PRIVATE_PKCS11SLOT_H_
 
 #include <memory>
 #include <string>
 
-#include <acsdkPkcs11/private/PKCS11API.h>
+#include <acsdk/Pkcs11/private/PKCS11API.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 class PKCS11Functions;
 class PKCS11Session;
@@ -31,7 +31,7 @@ class PKCS11Session;
  * @brief PKCS11 slot wrapper.
  *
  * This class wraps PKCS#11 slot handle and related operations.
- * @ingroup CryptoPKCS11
+ * @ingroup Lib_acsdkPkcs11
  */
 class PKCS11Slot {
 public:
@@ -67,7 +67,7 @@ class PKCS11Slot {
     CK_SLOT_ID m_slotID;
 };
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPKCS11_PRIVATE_PKCS11SLOT_H_
+#endif  // ACSDK_PKCS11_PRIVATE_PKCS11SLOT_H_
diff --git a/core/Crypto/acsdkPkcs11/src/CMakeLists.txt b/core/Crypto/Pkcs11/src/CMakeLists.txt
similarity index 100%
rename from core/Crypto/acsdkPkcs11/src/CMakeLists.txt
rename to core/Crypto/Pkcs11/src/CMakeLists.txt
diff --git a/core/Crypto/acsdkPkcs11/src/KeyStoreFactory.cpp b/core/Crypto/Pkcs11/src/KeyStoreFactory.cpp
similarity index 78%
rename from core/Crypto/acsdkPkcs11/src/KeyStoreFactory.cpp
rename to core/Crypto/Pkcs11/src/KeyStoreFactory.cpp
index 34725178ca..dcc20f6490 100644
--- a/core/Crypto/acsdkPkcs11/src/KeyStoreFactory.cpp
+++ b/core/Crypto/Pkcs11/src/KeyStoreFactory.cpp
@@ -13,18 +13,18 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkPkcs11/KeyStoreFactory.h>
-#include <acsdkPkcs11/private/PKCS11KeyStore.h>
+#include <acsdk/Pkcs11/KeyStoreFactory.h>
+#include <acsdk/Pkcs11/private/PKCS11KeyStore.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 using alexaClientSDK::avsCommon::utils::metrics::MetricRecorderInterface;
 
-std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface> createKeyStore(
+std::shared_ptr<alexaClientSDK::cryptoInterfaces::KeyStoreInterface> createKeyStore(
     const std::shared_ptr<MetricRecorderInterface>& metricRecorder) noexcept {
     return PKCS11KeyStore::create(metricRecorder);
 }
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/src/PKCS11Config.cpp b/core/Crypto/Pkcs11/src/PKCS11Config.cpp
similarity index 92%
rename from core/Crypto/acsdkPkcs11/src/PKCS11Config.cpp
rename to core/Crypto/Pkcs11/src/PKCS11Config.cpp
index b2f5e2bc6d..04f23a10c7 100644
--- a/core/Crypto/acsdkPkcs11/src/PKCS11Config.cpp
+++ b/core/Crypto/Pkcs11/src/PKCS11Config.cpp
@@ -13,18 +13,18 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkPkcs11/private/Logging.h>
-#include <acsdkPkcs11/private/PKCS11Config.h>
+#include <acsdk/Pkcs11/private/Logging.h>
+#include <acsdk/Pkcs11/private/PKCS11Config.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 using namespace alexaClientSDK::avsCommon::utils::configuration;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"pkcs11::Config"};
+#define TAG "pkcs11::Config"
 
 /// @private
 static const std::string PKCS11_MODULE_CONFIG_KEY{"pkcs11Module"};
@@ -85,5 +85,5 @@ bool PKCS11Config::loadFromSettings() noexcept {
     return true;
 }
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/src/PKCS11Functions.cpp b/core/Crypto/Pkcs11/src/PKCS11Functions.cpp
similarity index 94%
rename from core/Crypto/acsdkPkcs11/src/PKCS11Functions.cpp
rename to core/Crypto/Pkcs11/src/PKCS11Functions.cpp
index 5f0a0e2836..d30901c03b 100644
--- a/core/Crypto/acsdkPkcs11/src/PKCS11Functions.cpp
+++ b/core/Crypto/Pkcs11/src/PKCS11Functions.cpp
@@ -13,16 +13,16 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkPkcs11/private/Logging.h>
-#include <acsdkPkcs11/private/PKCS11Functions.h>
-#include <acsdkPkcs11/private/PKCS11Slot.h>
+#include <acsdk/Pkcs11/private/Logging.h>
+#include <acsdk/Pkcs11/private/PKCS11Functions.h>
+#include <acsdk/Pkcs11/private/PKCS11Slot.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"pkcs11::Functions"};
+#define TAG "pkcs11::Functions"
 
 std::shared_ptr<PKCS11Functions> PKCS11Functions::create(const std::string& libpath) noexcept {
     auto res = std::shared_ptr<PKCS11Functions>(new PKCS11Functions);
@@ -131,5 +131,5 @@ bool PKCS11Functions::findSlotByTokenName(const std::string& tokenName, std::sha
     return true;
 }
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/src/PKCS11FunctionsPosix.cpp b/core/Crypto/Pkcs11/src/PKCS11FunctionsPosix.cpp
similarity index 90%
rename from core/Crypto/acsdkPkcs11/src/PKCS11FunctionsPosix.cpp
rename to core/Crypto/Pkcs11/src/PKCS11FunctionsPosix.cpp
index 3d55b98256..8b2b17803e 100644
--- a/core/Crypto/acsdkPkcs11/src/PKCS11FunctionsPosix.cpp
+++ b/core/Crypto/Pkcs11/src/PKCS11FunctionsPosix.cpp
@@ -15,16 +15,16 @@
 
 #include <dlfcn.h>
 
-#include <acsdkPkcs11/private/ErrorCleanupGuard.h>
-#include <acsdkPkcs11/private/Logging.h>
-#include <acsdkPkcs11/private/PKCS11Functions.h>
+#include <acsdk/Pkcs11/private/ErrorCleanupGuard.h>
+#include <acsdk/Pkcs11/private/Logging.h>
+#include <acsdk/Pkcs11/private/PKCS11Functions.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"pkcs11::Functions"};
+#define TAG "pkcs11::Functions"
 
 /**
  * @brief Check if the path is absolute.
@@ -82,5 +82,5 @@ void PKCS11Functions::unloadLibrary() noexcept {
     }
 }
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/src/PKCS11FunctionsUwp.cpp b/core/Crypto/Pkcs11/src/PKCS11FunctionsUwp.cpp
similarity index 92%
rename from core/Crypto/acsdkPkcs11/src/PKCS11FunctionsUwp.cpp
rename to core/Crypto/Pkcs11/src/PKCS11FunctionsUwp.cpp
index 7c910a35aa..2f6063d0dc 100644
--- a/core/Crypto/acsdkPkcs11/src/PKCS11FunctionsUwp.cpp
+++ b/core/Crypto/Pkcs11/src/PKCS11FunctionsUwp.cpp
@@ -15,16 +15,16 @@
 
 #include <stdlib.h>
 
-#include <acsdkPkcs11/private/ErrorCleanupGuard.h>
-#include <acsdkPkcs11/private/Logging.h>
-#include <acsdkPkcs11/private/PKCS11Functions.h>
+#include <acsdk/Pkcs11/private/ErrorCleanupGuard.h>
+#include <acsdk/Pkcs11/private/Logging.h>
+#include <acsdk/Pkcs11/private/PKCS11Functions.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"pkcs11::Functions"};
+#define TAG "pkcs11::Functions"
 
 /**
  * @brief Check if the path is absolute.
@@ -96,5 +96,5 @@ void PKCS11Functions::unloadLibrary() noexcept {
     }
 }
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/src/PKCS11Key.cpp b/core/Crypto/Pkcs11/src/PKCS11Key.cpp
similarity index 97%
rename from core/Crypto/acsdkPkcs11/src/PKCS11Key.cpp
rename to core/Crypto/Pkcs11/src/PKCS11Key.cpp
index 4e13d67d7a..f729924469 100644
--- a/core/Crypto/acsdkPkcs11/src/PKCS11Key.cpp
+++ b/core/Crypto/Pkcs11/src/PKCS11Key.cpp
@@ -15,20 +15,20 @@
 
 #include <climits>
 
-#include <acsdkPkcs11/private/Logging.h>
-#include <acsdkPkcs11/private/PKCS11Key.h>
-#include <acsdkPkcs11/private/PKCS11Session.h>
-#include <acsdkPkcs11/private/PKCS11Slot.h>
-#include <acsdkPkcs11/private/PKCS11Functions.h>
+#include <acsdk/Pkcs11/private/Logging.h>
+#include <acsdk/Pkcs11/private/PKCS11Key.h>
+#include <acsdk/Pkcs11/private/PKCS11Session.h>
+#include <acsdk/Pkcs11/private/PKCS11Slot.h>
+#include <acsdk/Pkcs11/private/PKCS11Functions.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"pkcs11::Key"};
+#define TAG "pkcs11::Key"
 
-using namespace alexaClientSDK::acsdkCryptoInterfaces;
+using namespace alexaClientSDK::cryptoInterfaces;
 
 /// @private
 static constexpr size_t AES_CBC_IV_SIZE = 16;
@@ -364,5 +364,5 @@ bool PKCS11Key::configureMechanism(
     return true;
 }
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/src/PKCS11KeyDescriptor.cpp b/core/Crypto/Pkcs11/src/PKCS11KeyDescriptor.cpp
similarity index 79%
rename from core/Crypto/acsdkPkcs11/src/PKCS11KeyDescriptor.cpp
rename to core/Crypto/Pkcs11/src/PKCS11KeyDescriptor.cpp
index 8a6490889a..704c4ba9d1 100644
--- a/core/Crypto/acsdkPkcs11/src/PKCS11KeyDescriptor.cpp
+++ b/core/Crypto/Pkcs11/src/PKCS11KeyDescriptor.cpp
@@ -13,16 +13,16 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkPkcs11/private/PKCS11KeyDescriptor.h>
+#include <acsdk/Pkcs11/private/PKCS11KeyDescriptor.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"pkcs11::KeyDescriptor"};
+#define TAG "pkcs11::KeyDescriptor"
 
-using namespace alexaClientSDK::acsdkCryptoInterfaces;
+using namespace alexaClientSDK::cryptoInterfaces;
 
 /// @private
 static constexpr CK_ULONG AES_256_KEY_SIZE = 32;
@@ -64,24 +64,24 @@ PKCS11KeyDescriptor::PKCS11KeyDescriptor(
         keyLen{keyLen} {
 }
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
 
 namespace std {
 
-bool equal_to<alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor>::operator()(
-    const alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor& arg1,
-    const alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor& arg2) const noexcept {
+bool equal_to<alexaClientSDK::pkcs11::PKCS11KeyDescriptor>::operator()(
+    const alexaClientSDK::pkcs11::PKCS11KeyDescriptor& arg1,
+    const alexaClientSDK::pkcs11::PKCS11KeyDescriptor& arg2) const noexcept {
     return &arg1 == &arg2 ||
            (arg1.keyType == arg2.keyType && arg1.keyLen == arg2.keyLen && arg1.objectLabel == arg2.objectLabel);
 }
 
-std::size_t hash<alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor>::operator()(
-    const alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor& arg) const noexcept {
+std::size_t hash<alexaClientSDK::pkcs11::PKCS11KeyDescriptor>::operator()(
+    const alexaClientSDK::pkcs11::PKCS11KeyDescriptor& arg) const noexcept {
     return hash<std::string>()(arg.objectLabel) ^ hash<CK_ULONG>()(arg.keyType) ^ hash<CK_ULONG>()(arg.keyLen);
 }
 
-std::ostream& operator<<(std::ostream& out, const alexaClientSDK::acsdkPkcs11::PKCS11KeyDescriptor& arg) noexcept {
+std::ostream& operator<<(std::ostream& out, const alexaClientSDK::pkcs11::PKCS11KeyDescriptor& arg) noexcept {
     out << arg.objectLabel << "/";
     switch (arg.keyType) {
         case CKK_AES:
diff --git a/core/Crypto/acsdkPkcs11/src/PKCS11KeyStore.cpp b/core/Crypto/Pkcs11/src/PKCS11KeyStore.cpp
similarity index 96%
rename from core/Crypto/acsdkPkcs11/src/PKCS11KeyStore.cpp
rename to core/Crypto/Pkcs11/src/PKCS11KeyStore.cpp
index 02be425ff4..215eced857 100644
--- a/core/Crypto/acsdkPkcs11/src/PKCS11KeyStore.cpp
+++ b/core/Crypto/Pkcs11/src/PKCS11KeyStore.cpp
@@ -13,22 +13,22 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkPkcs11/private/Logging.h>
-#include <acsdkPkcs11/private/ErrorCleanupGuard.h>
-#include <acsdkPkcs11/private/PKCS11KeyStore.h>
-#include <acsdkPkcs11/private/PKCS11Config.h>
+#include <acsdk/Pkcs11/private/Logging.h>
+#include <acsdk/Pkcs11/private/ErrorCleanupGuard.h>
+#include <acsdk/Pkcs11/private/PKCS11KeyStore.h>
+#include <acsdk/Pkcs11/private/PKCS11Config.h>
 #include <AVSCommon/Utils/Metrics/MetricEventBuilder.h>
 #include <AVSCommon/Utils/Metrics/DataPointCounterBuilder.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
-using namespace alexaClientSDK::acsdkCryptoInterfaces;
+using namespace alexaClientSDK::cryptoInterfaces;
 using namespace alexaClientSDK::avsCommon::utils::metrics;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"pkcs11::KeyStore"};
+#define TAG "pkcs11::KeyStore"
 
 /// The activity name for encryption.
 /// @private
@@ -279,5 +279,5 @@ bool PKCS11KeyStore::getDefaultKeyAlias(std::string& keyAlias) noexcept {
     return true;
 }
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/src/PKCS11Session.cpp b/core/Crypto/Pkcs11/src/PKCS11Session.cpp
similarity index 92%
rename from core/Crypto/acsdkPkcs11/src/PKCS11Session.cpp
rename to core/Crypto/Pkcs11/src/PKCS11Session.cpp
index aa69312e01..c7a6a2337d 100644
--- a/core/Crypto/acsdkPkcs11/src/PKCS11Session.cpp
+++ b/core/Crypto/Pkcs11/src/PKCS11Session.cpp
@@ -15,19 +15,19 @@
 
 #include <climits>
 
-#include <acsdkPkcs11/private/Logging.h>
-#include <acsdkPkcs11/private/PKCS11Functions.h>
-#include <acsdkPkcs11/private/PKCS11Session.h>
-#include <acsdkPkcs11/private/PKCS11Key.h>
+#include <acsdk/Pkcs11/private/Logging.h>
+#include <acsdk/Pkcs11/private/PKCS11Functions.h>
+#include <acsdk/Pkcs11/private/PKCS11Session.h>
+#include <acsdk/Pkcs11/private/PKCS11Key.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
-using namespace alexaClientSDK::acsdkCryptoInterfaces;
+using namespace alexaClientSDK::cryptoInterfaces;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"pkcs11::Session"};
+#define TAG "pkcs11::Session"
 
 PKCS11Session::PKCS11Session(
     const std::shared_ptr<PKCS11Functions>& functions,
@@ -139,5 +139,5 @@ std::unique_ptr<PKCS11Key> PKCS11Session::findKey(const PKCS11KeyDescriptor& des
     return std::unique_ptr<PKCS11Key>(new PKCS11Key(shared_from_this(), keyHandle));
 }
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/src/PKCS11Slot.cpp b/core/Crypto/Pkcs11/src/PKCS11Slot.cpp
similarity index 88%
rename from core/Crypto/acsdkPkcs11/src/PKCS11Slot.cpp
rename to core/Crypto/Pkcs11/src/PKCS11Slot.cpp
index 32ee588eb6..53045488f1 100644
--- a/core/Crypto/acsdkPkcs11/src/PKCS11Slot.cpp
+++ b/core/Crypto/Pkcs11/src/PKCS11Slot.cpp
@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkPkcs11/private/Logging.h>
-#include <acsdkPkcs11/private/PKCS11Slot.h>
-#include <acsdkPkcs11/private/PKCS11Session.h>
-#include <acsdkPkcs11/private/PKCS11Functions.h>
+#include <acsdk/Pkcs11/private/Logging.h>
+#include <acsdk/Pkcs11/private/PKCS11Slot.h>
+#include <acsdk/Pkcs11/private/PKCS11Session.h>
+#include <acsdk/Pkcs11/private/PKCS11Functions.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"pkcs11::Slot"};
+#define TAG "pkcs11::Slot"
 
 PKCS11Slot::PKCS11Slot(std::shared_ptr<PKCS11Functions>&& functions, CK_SLOT_ID slotId) noexcept :
         m_functions(functions),
@@ -74,5 +74,5 @@ std::shared_ptr<PKCS11Session> PKCS11Slot::openSession() noexcept {
     return session;
 }
 
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/test/CMakeLists.txt b/core/Crypto/Pkcs11/test/CMakeLists.txt
similarity index 100%
rename from core/Crypto/acsdkPkcs11/test/CMakeLists.txt
rename to core/Crypto/Pkcs11/test/CMakeLists.txt
diff --git a/core/Crypto/acsdkPkcs11/test/ErrorCleanupGuardTest.cpp b/core/Crypto/Pkcs11/test/ErrorCleanupGuardTest.cpp
similarity index 92%
rename from core/Crypto/acsdkPkcs11/test/ErrorCleanupGuardTest.cpp
rename to core/Crypto/Pkcs11/test/ErrorCleanupGuardTest.cpp
index 98cc1b064b..58c70d07dd 100644
--- a/core/Crypto/acsdkPkcs11/test/ErrorCleanupGuardTest.cpp
+++ b/core/Crypto/Pkcs11/test/ErrorCleanupGuardTest.cpp
@@ -15,10 +15,10 @@
 
 #include <gtest/gtest.h>
 
-#include <acsdkPkcs11/private/ErrorCleanupGuard.h>
+#include <acsdk/Pkcs11/private/ErrorCleanupGuard.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 namespace test {
 
 using namespace ::testing;
@@ -45,5 +45,5 @@ TEST(ErrorCleanupGuardTest, test_executeOnSuccess) {
 }
 
 }  // namespace test
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/test/PKCS11ConfigTest.cpp b/core/Crypto/Pkcs11/test/PKCS11ConfigTest.cpp
similarity index 94%
rename from core/Crypto/acsdkPkcs11/test/PKCS11ConfigTest.cpp
rename to core/Crypto/Pkcs11/test/PKCS11ConfigTest.cpp
index 4bede69470..d37b065157 100644
--- a/core/Crypto/acsdkPkcs11/test/PKCS11ConfigTest.cpp
+++ b/core/Crypto/Pkcs11/test/PKCS11ConfigTest.cpp
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkPkcs11/private/PKCS11Config.h>
+#include <acsdk/Pkcs11/private/PKCS11Config.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
 
 #include <gtest/gtest.h>
 #include <sstream>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 namespace test {
 
 using namespace ::testing;
@@ -53,5 +53,5 @@ TEST(PKCS11ConfigTest, test_defaultConfig) {
 }
 
 }  // namespace test
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/test/PKCS11FunctionsTest.cpp b/core/Crypto/Pkcs11/test/PKCS11FunctionsTest.cpp
similarity index 92%
rename from core/Crypto/acsdkPkcs11/test/PKCS11FunctionsTest.cpp
rename to core/Crypto/Pkcs11/test/PKCS11FunctionsTest.cpp
index 792a4cced2..726e2d0e81 100644
--- a/core/Crypto/acsdkPkcs11/test/PKCS11FunctionsTest.cpp
+++ b/core/Crypto/Pkcs11/test/PKCS11FunctionsTest.cpp
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkPkcs11/private/PKCS11Functions.h>
-#include <acsdkPkcs11/private/PKCS11Slot.h>
-#include <acsdkPkcs11/private/PKCS11Config.h>
+#include <acsdk/Pkcs11/private/PKCS11Functions.h>
+#include <acsdk/Pkcs11/private/PKCS11Slot.h>
+#include <acsdk/Pkcs11/private/PKCS11Config.h>
 
 #include <gtest/gtest.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 namespace test {
 
 using namespace ::testing;
@@ -68,5 +68,5 @@ TEST(PKCS11FunctionsTest, test_findOtherSlot) {
 }
 
 }  // namespace test
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/test/PKCS11KeyStoreTest.cpp b/core/Crypto/Pkcs11/test/PKCS11KeyStoreTest.cpp
similarity index 94%
rename from core/Crypto/acsdkPkcs11/test/PKCS11KeyStoreTest.cpp
rename to core/Crypto/Pkcs11/test/PKCS11KeyStoreTest.cpp
index 7289234d89..46e2551ac6 100644
--- a/core/Crypto/acsdkPkcs11/test/PKCS11KeyStoreTest.cpp
+++ b/core/Crypto/Pkcs11/test/PKCS11KeyStoreTest.cpp
@@ -17,19 +17,19 @@
 
 #include <gtest/gtest.h>
 
-#include <acsdkPkcs11/private/PKCS11Functions.h>
-#include <acsdkPkcs11/private/PKCS11Slot.h>
-#include <acsdkPkcs11/private/PKCS11KeyStore.h>
+#include <acsdk/Pkcs11/private/PKCS11Functions.h>
+#include <acsdk/Pkcs11/private/PKCS11Slot.h>
+#include <acsdk/Pkcs11/private/PKCS11KeyStore.h>
 
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 namespace test {
 
 using namespace ::testing;
 using namespace ::alexaClientSDK::avsCommon::utils::configuration;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 /// @private
 static const KeyStoreInterface::IV
@@ -120,5 +120,5 @@ TEST(PKCS11KeyStoreTest, test_createOrLoadKeyTwiceUsesTheSameKey) {
 }
 
 }  // namespace test
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/test/PKCS11KeyTest.cpp b/core/Crypto/Pkcs11/test/PKCS11KeyTest.cpp
similarity index 94%
rename from core/Crypto/acsdkPkcs11/test/PKCS11KeyTest.cpp
rename to core/Crypto/Pkcs11/test/PKCS11KeyTest.cpp
index 5abf524387..cdc4c4dd62 100644
--- a/core/Crypto/acsdkPkcs11/test/PKCS11KeyTest.cpp
+++ b/core/Crypto/Pkcs11/test/PKCS11KeyTest.cpp
@@ -18,18 +18,18 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <acsdkPkcs11/private/PKCS11Functions.h>
-#include <acsdkPkcs11/private/PKCS11Slot.h>
-#include <acsdkPkcs11/private/PKCS11Session.h>
-#include <acsdkPkcs11/private/PKCS11Key.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/Pkcs11/private/PKCS11Functions.h>
+#include <acsdk/Pkcs11/private/PKCS11Slot.h>
+#include <acsdk/Pkcs11/private/PKCS11Session.h>
+#include <acsdk/Pkcs11/private/PKCS11Key.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 namespace test {
 
 using namespace ::testing;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 /// @private
 static const KeyStoreInterface::IV
@@ -173,5 +173,5 @@ TEST(PKCS11KeyTest, test_getKeyAttributes) {
 }
 
 }  // namespace test
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/test/PKCS11SessionTest.cpp b/core/Crypto/Pkcs11/test/PKCS11SessionTest.cpp
similarity index 86%
rename from core/Crypto/acsdkPkcs11/test/PKCS11SessionTest.cpp
rename to core/Crypto/Pkcs11/test/PKCS11SessionTest.cpp
index acbc0c7d36..718e67a71a 100644
--- a/core/Crypto/acsdkPkcs11/test/PKCS11SessionTest.cpp
+++ b/core/Crypto/Pkcs11/test/PKCS11SessionTest.cpp
@@ -17,17 +17,17 @@
 
 #include <gtest/gtest.h>
 
-#include <acsdkPkcs11/private/PKCS11Functions.h>
-#include <acsdkPkcs11/private/PKCS11Slot.h>
-#include <acsdkPkcs11/private/PKCS11Session.h>
-#include <acsdkPkcs11/private/PKCS11Key.h>
+#include <acsdk/Pkcs11/private/PKCS11Functions.h>
+#include <acsdk/Pkcs11/private/PKCS11Slot.h>
+#include <acsdk/Pkcs11/private/PKCS11Session.h>
+#include <acsdk/Pkcs11/private/PKCS11Key.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 namespace test {
 
 using namespace ::testing;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 /// Test that the constructor with a nullptr doesn't segfault.
 TEST(PKCS11SessionTest, test_loginLogout) {
@@ -61,5 +61,5 @@ TEST(PKCS11SessionTest, test_keySessionOps) {
 }
 
 }  // namespace test
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/test/PKCS11SlotTest.cpp b/core/Crypto/Pkcs11/test/PKCS11SlotTest.cpp
similarity index 89%
rename from core/Crypto/acsdkPkcs11/test/PKCS11SlotTest.cpp
rename to core/Crypto/Pkcs11/test/PKCS11SlotTest.cpp
index cfb59a13cc..f291620186 100644
--- a/core/Crypto/acsdkPkcs11/test/PKCS11SlotTest.cpp
+++ b/core/Crypto/Pkcs11/test/PKCS11SlotTest.cpp
@@ -17,12 +17,12 @@
 
 #include <gtest/gtest.h>
 
-#include <acsdkPkcs11/private/PKCS11Functions.h>
-#include <acsdkPkcs11/private/PKCS11Slot.h>
-#include <acsdkPkcs11/private/PKCS11Session.h>
+#include <acsdk/Pkcs11/private/PKCS11Functions.h>
+#include <acsdk/Pkcs11/private/PKCS11Slot.h>
+#include <acsdk/Pkcs11/private/PKCS11Session.h>
 
 namespace alexaClientSDK {
-namespace acsdkPkcs11 {
+namespace pkcs11 {
 namespace test {
 
 using namespace ::testing;
@@ -50,5 +50,5 @@ TEST(PKCS11SlotTest, test_openSession) {
 }
 
 }  // namespace test
-}  // namespace acsdkPkcs11
+}  // namespace pkcs11
 }  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkPkcs11/testStubs/CMakeLists.txt b/core/Crypto/Pkcs11/testStubs/CMakeLists.txt
similarity index 100%
rename from core/Crypto/acsdkPkcs11/testStubs/CMakeLists.txt
rename to core/Crypto/Pkcs11/testStubs/CMakeLists.txt
diff --git a/core/Crypto/acsdkPkcs11/testStubs/doc/CryptoPKCS11Stubs.dox b/core/Crypto/Pkcs11/testStubs/doc/CryptoPKCS11Stubs.dox
similarity index 82%
rename from core/Crypto/acsdkPkcs11/testStubs/doc/CryptoPKCS11Stubs.dox
rename to core/Crypto/Pkcs11/testStubs/doc/CryptoPKCS11Stubs.dox
index b92c366ec5..d25d317758 100644
--- a/core/Crypto/acsdkPkcs11/testStubs/doc/CryptoPKCS11Stubs.dox
+++ b/core/Crypto/Pkcs11/testStubs/doc/CryptoPKCS11Stubs.dox
@@ -14,19 +14,19 @@
  */
 
 /**
- * @defgroup CryptoPKCS11Stubs Test Stubs for PKCS#11 Library
- * @brief HSM function stubs for @a CryptoAPI.
+ * @defgroup Lib_acsdkPkcs11Stubs Test Stubs for PKCS#11 Library
+ * @brief HSM function stubs for @a Lib_acsdkCryptoInterfaces.
  *
  * This module provide bare-bone stub functionality subset from PKCS#11 specification. Only few functions are
  * implemented, and code can expect the following:
  * - There is only one hardcoded slot with ACSDK token name.
  * - User PIN is hardcoded to 1234 value.
  * - There are two object that corresponds to AES-256 and AES-128 keys with TEST_KEY name.
- * - Code supports AES encryption and decryption operations using @ref CryptoIMPL.
+ * - Code supports AES encryption and decryption operations using @ref Lib_acsdkCrypto.
  *
  * This is a test support module, and must not be used either for integration tests or in production.
  *
- * @sa CryptoAPI
- * @sa CryptoPKCS11
- * @sa CryptoIMPL
+ * @sa Lib_acsdkCryptoInterfaces
+ * @sa Lib_acsdkPkcs11
+ * @sa Lib_acsdkCrypto
  */
diff --git a/core/Crypto/acsdkPkcs11/testStubs/src/Pkcs11Stubs.cpp b/core/Crypto/Pkcs11/testStubs/src/Pkcs11Stubs.cpp
similarity index 98%
rename from core/Crypto/acsdkPkcs11/testStubs/src/Pkcs11Stubs.cpp
rename to core/Crypto/Pkcs11/testStubs/src/Pkcs11Stubs.cpp
index 880e7ae33c..10d132e053 100644
--- a/core/Crypto/acsdkPkcs11/testStubs/src/Pkcs11Stubs.cpp
+++ b/core/Crypto/Pkcs11/testStubs/src/Pkcs11Stubs.cpp
@@ -25,11 +25,11 @@
  *
  * @param event The event string for this @c LogEntry.
  * @private
- * @ingroup CryptoPKCS11Stubs
+ * @ingroup Lib_acsdkPkcs11Stubs
  */
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
-/// @addtogroup CryptoPKCS11Stubs
+/// @addtogroup Lib_acsdkPkcs11Stubs
 /// @{
 // Define platform-specific macros for PKCS#11 API (UNIX)
 #define CK_PTR *
@@ -47,16 +47,16 @@
 #pragma pack(pop, cryptoki)
 #endif
 
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCrypto/CryptoFactory.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/Crypto/CryptoFactory.h>
 
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
-/// @addtogroup CryptoPKCS11Stubs
+/// @addtogroup Lib_acsdkPkcs11Stubs
 /// @{
 
 /// @private
-static const std::string TAG{"pkcs11:HSMStub"};
+#define TAG "pkcs11:HSMStub"
 
 /**
  * @brief PKCS11 function list table.
@@ -258,7 +258,7 @@ CK_RV C_Initialize(CK_VOID_PTR reserved) {
     ACSDK_DEBUG0(LX("C_Initialize"));
 
     std::unique_lock<std::mutex> sessionLock(c_sessionsMutex);
-    c_cryptoFactory = alexaClientSDK::acsdkCrypto::createCryptoFactory();
+    c_cryptoFactory = alexaClientSDK::crypto::createCryptoFactory();
     initializeKey(AlgorithmType::AES_256_CBC, c_aes256Key, c_aes256Checksum);
     initializeKey(AlgorithmType::AES_128_CBC, c_aes128Key, c_aes128Checksum);
     return CKR_OK;
@@ -872,7 +872,7 @@ CK_RV C_Encrypt(
             res.reserve(res.size() + tag.size());
             res.insert(res.end(), tag.cbegin(), tag.cend());
         }
-        *ciphertextLen = res.size();
+        *ciphertextLen = static_cast<CK_ULONG>(res.size());
         ::memcpy(ciphertext, res.data(), res.size());
 
         session->m_cryptoCodec.reset();
@@ -1056,7 +1056,7 @@ CK_RV C_Decrypt(
         }
         session->m_cryptoCodec.reset();
         std::memcpy(plaintext, res.data(), res.size());
-        *plaintextLen = res.size();
+        *plaintextLen = static_cast<CK_ULONG>(res.size());
     } else {
         *plaintextLen = estSize;
     }
diff --git a/core/Crypto/acsdkCrypto/doc/CryptoIMPL.dox b/core/Crypto/acsdkCrypto/doc/CryptoIMPL.dox
deleted file mode 100644
index 79f43e28ab..0000000000
--- a/core/Crypto/acsdkCrypto/doc/CryptoIMPL.dox
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/**
- * \defgroup CryptoIMPL Cryptographic Functions Implementation
- * @brief Implementations for \ref CryptoAPI
- *
- * CryptoIMPL provides implementation of cryptographic functions to encrypt and decrypt data, to generate keys and
- * initialization vectors, and to compute digests.
- *
- * The reference implementation uses OpenSSL library, but can be extended to use platform-specific APIs.
- *
- * \sa CryptoAPI
- *
- * \sa alexaClientSDK::acsdkCrypto
- * \sa alexaClientSDK::acsdkCrypto::test
- *
- * \namespace alexaClientSDK::acsdkCrypto
- * \brief OpenSSL-based implementation.
- * \ingroup CryptoIMPL
- * \sa CryptoIMPL
- *
- * \namespace alexaClientSDK::acsdkCrypto::test
- * \brief Test cases for \ref CryptoIMPL
- * \ingroup CryptoIMPL
- * \sa CryptoIMPL
- */
diff --git a/core/Crypto/acsdkCrypto/include/acsdkCrypto/CryptoFactory.h b/core/Crypto/acsdkCrypto/include/acsdkCrypto/CryptoFactory.h
deleted file mode 100644
index a7a84cf395..0000000000
--- a/core/Crypto/acsdkCrypto/include/acsdkCrypto/CryptoFactory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKCRYPTO_CRYPTOFACTORY_H_
-#define ACSDKCRYPTO_CRYPTOFACTORY_H_
-
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-
-namespace alexaClientSDK {
-namespace acsdkCrypto {
-
-/**
- * @brief Factory method for @c CryptoFactoryInterface.
- * Provides crypto functions interface if available.
- *
- * @return Factory reference or nullptr on error.
- * @see acsdkCryptoInterfaces::CryptoFactoryInterface
- */
-std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface> createCryptoFactory() noexcept;
-
-}  // namespace acsdkCrypto
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKCRYPTO_CRYPTOFACTORY_H_
diff --git a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/Logging.h b/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/Logging.h
deleted file mode 100644
index fecf44465f..0000000000
--- a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/Logging.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKCRYPTO_PRIVATE_LOGGING_H_
-#define ACSDKCRYPTO_PRIVATE_LOGGING_H_
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param event The event string for this @c LogEntry.
- * @private
- * @ingroup CryptoIMPL
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-#include <AVSCommon/Utils/Logger/Logger.h>
-
-#endif  // ACSDKCRYPTO_PRIVATE_LOGGING_H_
diff --git a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslCryptoFactory.h b/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslCryptoFactory.h
deleted file mode 100644
index 7554bef359..0000000000
--- a/core/Crypto/acsdkCrypto/privateInclude/acsdkCrypto/private/OpenSslCryptoFactory.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKCRYPTO_PRIVATE_OPENSSLCRYPTOFACTORY_H_
-#define ACSDKCRYPTO_PRIVATE_OPENSSLCRYPTOFACTORY_H_
-
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-
-namespace alexaClientSDK {
-namespace acsdkCrypto {
-
-/**
- * @brief Cryptography factory implementation based on OpenSSL.
- *
- * @ingroup CryptoIMPL
- */
-class OpenSslCryptoFactory : public alexaClientSDK::acsdkCryptoInterfaces::CryptoFactoryInterface {
-public:
-    /**
-     * @brief Initializes OpenSSL library and returns factory interface.
-     *
-     * @return Factory reference or nullptr on error.
-     */
-    static std::shared_ptr<CryptoFactoryInterface> create() noexcept;
-
-    /// @name CryptoCodecInterface methods.
-    ///@{
-    std::unique_ptr<alexaClientSDK::acsdkCryptoInterfaces::CryptoCodecInterface> createEncoder(
-        alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType type) noexcept override;
-    std::unique_ptr<alexaClientSDK::acsdkCryptoInterfaces::CryptoCodecInterface> createDecoder(
-        alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType type) noexcept override;
-    std::unique_ptr<alexaClientSDK::acsdkCryptoInterfaces::DigestInterface> createDigest(
-        alexaClientSDK::acsdkCryptoInterfaces::DigestType type) noexcept override;
-    std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::KeyFactoryInterface> getKeyFactory() noexcept override;
-    ///@}
-private:
-    /// Private object constructor.
-    OpenSslCryptoFactory() noexcept;
-
-    /**
-     * @brief Initializes crypto library.
-     *
-     * @return Boolean indicating operation success.
-     */
-    bool init() noexcept;
-
-    /// Singleton instance of key factory.
-    std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::KeyFactoryInterface> m_keyFactory;
-};
-
-}  // namespace acsdkCrypto
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKCRYPTO_PRIVATE_OPENSSLCRYPTOFACTORY_H_
diff --git a/core/Crypto/acsdkCrypto/src/CryptoFactory.cpp b/core/Crypto/acsdkCrypto/src/CryptoFactory.cpp
deleted file mode 100644
index 23b9256e3d..0000000000
--- a/core/Crypto/acsdkCrypto/src/CryptoFactory.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <acsdkCrypto/CryptoFactory.h>
-#include <acsdkCrypto/private/OpenSslCryptoFactory.h>
-
-namespace alexaClientSDK {
-namespace acsdkCrypto {
-
-using namespace alexaClientSDK::acsdkCryptoInterfaces;
-
-std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface> createCryptoFactory() noexcept {
-    return OpenSslCryptoFactory::create();
-}
-
-}  // namespace acsdkCrypto
-}  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCrypto/test/OpenSslDigestTest.cpp b/core/Crypto/acsdkCrypto/test/OpenSslDigestTest.cpp
deleted file mode 100644
index 440430f9f9..0000000000
--- a/core/Crypto/acsdkCrypto/test/OpenSslDigestTest.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include <acsdkCodecUtils/Hex.h>
-#include <acsdkCrypto/private/OpenSslDigest.h>
-
-namespace alexaClientSDK {
-namespace acsdkCrypto {
-namespace test {
-
-using namespace ::testing;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
-using namespace ::alexaClientSDK::acsdkCodecUtils;
-
-static const char TEST_STR[] = "The quick brown fox jumps over the lazy dog";
-static const std::vector<unsigned char> TEST_DATA{TEST_STR, TEST_STR + sizeof(TEST_STR) - 1};
-static const uint8_t TEST_UINT8 = 1;
-static const uint16_t TEST_UINT16 = 1;
-static const uint32_t TEST_UINT32 = 1;
-static const uint64_t TEST_UINT64 = 1;
-static const std::string SHA256_EMPTY_HEX{"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"};
-static const std::string SHA256_TEST_DATA_HEX{"d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592"};
-// To verify: echo 01 | xxd -r -p | openssl dgst -sha256
-static const std::string SHA256_UINT8_HEX{"4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a"};
-// To verify: echo 0001 | xxd -r -p | openssl dgst -sha256
-static const std::string SHA256_UNT16_HEX{"b413f47d13ee2fe6c845b2ee141af81de858df4ec549a58b7970bb96645bc8d2"};
-// To verify: echo 00000001 | xxd -r -p | openssl dgst -sha256
-static const std::string SHA256_UINT32_HEX{"b40711a88c7039756fb8a73827eabe2c0fe5a0346ca7e0a104adc0fc764f528d"};
-// To verify: echo 0000000000000001 | xxd -r -p | openssl dgst -sha256
-static const std::string SHA256_UINT64_HEX{"cd2662154e6d76b2b2b92e70c0cac3ccf534f9b74eb5b89819ec509083d00a50"};
-static constexpr DigestType BAD_DIGEST_TYPE = static_cast<DigestType>(0);
-
-TEST(OpenSslDigestTest, test_createSHA256) {
-    auto digest = OpenSslDigest::create(DigestType::SHA_256);
-    ASSERT_NE(nullptr, digest);
-}
-
-TEST(OpenSslDigestTest, test_createInvalid) {
-    auto digest = OpenSslDigest::create(BAD_DIGEST_TYPE);
-    ASSERT_EQ(nullptr, digest);
-}
-
-TEST(OpenSslDigestTest, test_emptySha256Digest) {
-    auto digest = OpenSslDigest::create(DigestType::SHA_256);
-    digest->process({});
-    OpenSslDigest::DataBlock res;
-    ASSERT_TRUE(digest->finalize(res));
-    std::string hex;
-    ASSERT_TRUE(encodeHex(res, hex));
-    ASSERT_EQ(SHA256_EMPTY_HEX, hex);
-}
-
-TEST(OpenSslDigestTest, test_digest) {
-    auto digest = OpenSslDigest::create(DigestType::SHA_256);
-    digest->process(TEST_DATA);
-    OpenSslDigest::DataBlock res;
-    ASSERT_TRUE(digest->finalize(res));
-    std::string hex;
-    ASSERT_TRUE(encodeHex(res, hex));
-    ASSERT_EQ(SHA256_TEST_DATA_HEX, hex);
-}
-
-TEST(OpenSslDigestTest, test_digestUInt8) {
-    auto digest = OpenSslDigest::create(DigestType::SHA_256);
-    ASSERT_TRUE(digest->processUInt8(TEST_UINT8));
-    OpenSslDigest::DataBlock res;
-    ASSERT_TRUE(digest->finalize(res));
-    std::string hex;
-    ASSERT_TRUE(encodeHex(res, hex));
-    ASSERT_EQ(SHA256_UINT8_HEX, hex);
-}
-
-TEST(OpenSslDigestTest, test_digestUInt16) {
-    auto digest = OpenSslDigest::create(DigestType::SHA_256);
-    ASSERT_TRUE(digest->processUInt16(TEST_UINT16));
-    OpenSslDigest::DataBlock res;
-    ASSERT_TRUE(digest->finalize(res));
-    std::string hex;
-    ASSERT_TRUE(encodeHex(res, hex));
-    ASSERT_EQ(SHA256_UNT16_HEX, hex);
-}
-
-TEST(OpenSslDigestTest, test_digestUInt32) {
-    auto digest = OpenSslDigest::create(DigestType::SHA_256);
-    ASSERT_TRUE(digest->processUInt32(TEST_UINT32));
-    OpenSslDigest::DataBlock res;
-    ASSERT_TRUE(digest->finalize(res));
-    std::string hex;
-    ASSERT_TRUE(encodeHex(res, hex));
-    ASSERT_EQ(SHA256_UINT32_HEX, hex);
-}
-
-TEST(OpenSslDigestTest, test_digestUInt64) {
-    auto digest = OpenSslDigest::create(DigestType::SHA_256);
-    ASSERT_TRUE(digest->processUInt64(TEST_UINT64));
-    OpenSslDigest::DataBlock res;
-    ASSERT_TRUE(digest->finalize(res));
-    std::string hex;
-    ASSERT_TRUE(encodeHex(res, hex));
-    ASSERT_EQ(SHA256_UINT64_HEX, hex);
-}
-
-}  // namespace test
-}  // namespace acsdkCrypto
-}  // namespace alexaClientSDK
diff --git a/core/Crypto/acsdkCryptoInterfaces/doc/CryptoAPI.dox b/core/Crypto/acsdkCryptoInterfaces/doc/CryptoAPI.dox
deleted file mode 100644
index 069c700fb6..0000000000
--- a/core/Crypto/acsdkCryptoInterfaces/doc/CryptoAPI.dox
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/**
- * \defgroup CryptoAPI Cryptography API
- * @brief Cryptographic Functions for ACSDK
- *
- * This module provides APIs for encrypting and decrypting data, and for computing secure digests.
- *
- * There are two ways for data encryption and decryption: through user-space cryptographic functions, accessible through
- * \ref alexaClientSDK::acsdkCryptoInterfaces::CryptoFactoryInterface and through hardware security module (HSM)
- * accessible through \ref alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface.
- *
- * When using \ref alexaClientSDK::acsdkCryptoInterfaces::CryptoFactoryInterface user can generate keys and
- * initialization vectors through \ref alexaClientSDK::acsdkCryptoInterfaces::KeyFactoryInterface to use with
- * cryptographic functions. When working with \ref alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface, keys must
- * be pre-provisioned by device manufacturer and those keys can be used through references (aliases).
- *
- * \sa CryptoIMPL
- * \sa CryptoPKCS11
- *
- * \sa alexaClientSDK::acsdkCryptoInterfaces
- * \sa alexaClientSDK::acsdkCryptoInterfaces::test
- */
diff --git a/core/Crypto/acsdkCryptoInterfaces/doc/Namespaces.dox b/core/Crypto/acsdkCryptoInterfaces/doc/Namespaces.dox
deleted file mode 100644
index a4c16db169..0000000000
--- a/core/Crypto/acsdkCryptoInterfaces/doc/Namespaces.dox
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/**
- * \namespace ::alexaClientSDK::acsdkCryptoInterfaces
- * \brief Cryptographic Types and Interfaces.
- * \ingroup CryptoAPI
- */
diff --git a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/DigestType.h b/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/DigestType.h
deleted file mode 100644
index 68b4379ce0..0000000000
--- a/core/Crypto/acsdkCryptoInterfaces/include/acsdkCryptoInterfaces/DigestType.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKCRYPTOINTERFACES_DIGESTTYPE_H_
-#define ACSDKCRYPTOINTERFACES_DIGESTTYPE_H_
-
-#include <ostream>
-
-namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
-
-/**
- * @brief Enumeration of all supported digest algorithms.
- *
- * This enumeration provides list of supported digest algorithms.
- *
- * @ingroup CryptoAPI
- */
-enum class DigestType {
-    /// @brief SHA-256 digest algorithm.
-    ///
-    /// Secure Hash Algorithm 2 with 256 bit digest.
-    ///
-    /// @see https://en.wikipedia.org/wiki/SHA-2
-    SHA_256 = 1,
-};
-
-/**
- * @brief Helper method to write digest type as a literal constant.
- *
- * This method enables logging functions to accept digest type as a value.
- *
- * @param[in] out   Output stream.
- * @param[in] value Value to write.
- *
- * @return Output stream.
- * @ingroup CryptoAPI
- */
-std::ostream& operator<<(std::ostream& out, DigestType value);
-
-}  // namespace acsdkCryptoInterfaces
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKCRYPTOINTERFACES_DIGESTTYPE_H_
diff --git a/core/Crypto/acsdkCryptoInterfaces/test/doc/Namespaces.dox b/core/Crypto/acsdkCryptoInterfaces/test/doc/Namespaces.dox
deleted file mode 100644
index b882661d35..0000000000
--- a/core/Crypto/acsdkCryptoInterfaces/test/doc/Namespaces.dox
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/**
- * \namespace ::alexaClientSDK::acsdkCryptoInterfaces::test
- * \brief Test stubs and mocks for \ref CryptoAPI
- * \ingroup CryptoAPI
- */
diff --git a/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockCryptoCodec.h b/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockCryptoCodec.h
deleted file mode 100644
index eb079bd6ae..0000000000
--- a/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockCryptoCodec.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKCRYPTOINTERFACES_TEST_MOCKCRYPTOCODEC_H_
-#define ACSDKCRYPTOINTERFACES_TEST_MOCKCRYPTOCODEC_H_
-
-#include <acsdkCryptoInterfaces/CryptoCodecInterface.h>
-#include <gmock/gmock.h>
-
-namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
-namespace test {
-
-/**
- * Mock class for @c CryptoCodecInterface.
- */
-class MockCryptoCodec : public CryptoCodecInterface {
-public:
-    MOCK_METHOD2(_init, bool(const Key&, const IV&));
-    MOCK_METHOD1(_processAAD, bool(const DataBlock&));
-    MOCK_METHOD2(_processAAD, bool(const DataBlock::const_iterator&, const DataBlock::const_iterator&));
-    MOCK_METHOD2(_process, bool(const DataBlock&, DataBlock&));
-    MOCK_METHOD3(_process, bool(const DataBlock::const_iterator&, const DataBlock::const_iterator&, DataBlock&));
-    MOCK_METHOD1(_finalize, bool(DataBlock&));
-    MOCK_METHOD1(_getTag, bool(Tag&));
-    MOCK_METHOD1(_setTag, bool(const Tag&));
-
-    bool init(const Key& key, const IV& iv) noexcept override;
-    bool processAAD(const DataBlock& dataIn) noexcept override;
-    bool processAAD(DataBlock::const_iterator dataInBegin, DataBlock::const_iterator dataInEnd) noexcept override;
-    bool process(const DataBlock& dataIn, DataBlock& dataOut) noexcept override;
-    bool process(
-        DataBlock::const_iterator dataInBegin,
-        DataBlock::const_iterator dataInEnd,
-        DataBlock& dataOut) noexcept override;
-    bool finalize(DataBlock& dataOut) noexcept override;
-    bool getTag(DataBlock& tag) noexcept override;
-    bool setTag(const DataBlock& tag) noexcept override;
-};
-
-inline bool MockCryptoCodec::init(const Key& key, const IV& iv) noexcept {
-    return _init(key, iv);
-}
-
-inline bool MockCryptoCodec::process(const DataBlock& dataIn, DataBlock& dataOut) noexcept {
-    return _process(dataIn, dataOut, append);
-}
-
-inline bool MockCryptoCodec::process(
-    DataBlock::const_iterator dataInBegin,
-    DataBlock::const_iterator dataInEnd,
-    DataBlock& dataOut) noexcept {
-    return _process(dataInBegin, dataInEnd, dataOut);
-}
-
-inline bool MockCryptoCodec::finalize(DataBlock& dataOut) noexcept {
-    return _finalize(dataOut);
-}
-
-inline bool MockCryptoCodec::getTag(Tag& tag) noexcept {
-    return _getTag(tag);
-}
-
-inline bool MockCryptoCodec::setTag(const Tag& tag) noexcept {
-    return _setTag(tag);
-}
-
-}  // namespace test
-}  // namespace acsdkCryptoInterfaces
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKCRYPTOINTERFACES_TEST_MOCKCRYPTOCODEC_H_
diff --git a/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockCryptoFactory.h b/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockCryptoFactory.h
deleted file mode 100644
index efa54cef75..0000000000
--- a/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockCryptoFactory.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKCRYPTOINTERFACES_TEST_MOCKCRYPTOFACTORY_H_
-#define ACSDKCRYPTOINTERFACES_TEST_MOCKCRYPTOFACTORY_H_
-
-#include <unordered_map>
-#include <string>
-#include <memory>
-#include <gmock/gmock.h>
-
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
-#include <acsdkCryptoInterfaces/DigestType.h>
-#include <acsdkCryptoInterfaces/DigestInterface.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCryptoInterfaces/CryptoCodecInterface.h>
-#include <acsdkCryptoInterfaces/KeyFactoryInterface.h>
-
-namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
-namespace test {
-
-/**
- * Mock class for @c CryptoFactoryInterface.
- */
-class MockCryptoFactory : public CryptoFactoryInterface {
-public:
-    MOCK_METHOD1(_createEncoder, std::unique_ptr<CryptoCodecInterface>(AlgorithmType));
-    MOCK_METHOD1(_createDecoder, std::unique_ptr<CryptoCodecInterface>(AlgorithmType));
-    MOCK_METHOD1(_createDigest, std::unique_ptr<DigestInterface>(DigestType));
-    MOCK_METHOD0(_getKeyFactory, std::shared_ptr<KeyFactoryInterface>());
-
-    std::unique_ptr<CryptoCodecInterface> createEncoder(AlgorithmType type) noexcept override;
-    std::unique_ptr<CryptoCodecInterface> createDecoder(AlgorithmType type) noexcept override;
-    std::unique_ptr<DigestInterface> createDigest(DigestType type) noexcept override;
-    std::shared_ptr<KeyFactoryInterface> getKeyFactory() noexcept override;
-};
-
-inline std::unique_ptr<CryptoCodecInterface> MockCryptoFactory::createEncoder(AlgorithmType type) noexcept {
-    return _createEncoder(type);
-}
-
-inline std::unique_ptr<CryptoCodecInterface> MockCryptoFactory::createDecoder(AlgorithmType type) noexcept {
-    return _createDecoder(type);
-}
-
-inline std::unique_ptr<DigestInterface> MockCryptoFactory::createDigest(DigestType type) noexcept {
-    return _createDigest(type);
-}
-
-inline std::shared_ptr<KeyFactoryInterface> MockCryptoFactory::getKeyFactory() noexcept {
-    return _getKeyFactory();
-}
-
-}  // namespace test
-}  // namespace acsdkCryptoInterfaces
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKCRYPTOINTERFACES_TEST_MOCKCRYPTOFACTORY_H_
diff --git a/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockDigest.h b/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockDigest.h
deleted file mode 100644
index f8a3f7cca6..0000000000
--- a/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockDigest.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKCRYPTOINTERFACES_TEST_MOCKDIGEST_H_
-#define ACSDKCRYPTOINTERFACES_TEST_MOCKDIGEST_H_
-
-#include <acsdkCryptoInterfaces/DigestInterface.h>
-#include <gmock/gmock.h>
-
-namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
-namespace test {
-
-/**
- * Mock class for @c DigestInterface.
- */
-class MockDigest : public DigestInterface {
-public:
-    MOCK_METHOD1(_process, bool(const DataBlock&));
-    MOCK_METHOD2(_process, bool(const DataBlock::const_iterator, const DataBlock::const_iterator));
-    MOCK_METHOD1(_processByte, bool(unsigned char));
-    MOCK_METHOD1(_processUInt8, bool(uint8_t));
-    MOCK_METHOD1(_processUInt16, bool(uint16_t));
-    MOCK_METHOD1(_processUInt32, bool(uint32_t));
-    MOCK_METHOD1(_processUInt64, bool(uint64_t));
-    MOCK_METHOD1(_processString, bool(const std::string&));
-    MOCK_METHOD1(_finalize, bool(DataBlock&));
-    MOCK_METHOD0(_reset, bool());
-
-    bool process(const DataBlock& dataIn) noexcept override;
-    bool process(DataBlock::const_iterator begin, DataBlock::const_iterator end) noexcept override;
-    bool processByte(unsigned char value) noexcept override;
-    bool processUInt8(uint8_t value) noexcept override;
-    bool processUInt16(uint16_t value) noexcept override;
-    bool processUInt32(uint32_t value) noexcept override;
-    bool processUInt64(uint64_t value) noexcept override;
-    bool processString(const std::string& value) noexcept override;
-    bool finalize(DataBlock& dataOut) noexcept override;
-    bool reset() noexcept override;
-};
-
-bool MockDigest::process(const DataBlock& dataIn) noexcept {
-    return _process(dataIn);
-}
-
-bool MockDigest::process(DataBlock::const_iterator begin, DataBlock::const_iterator end) noexcept {
-    return _process(begin, end);
-}
-
-inline bool MockDigest::processByte(unsigned char value) noexcept {
-    return _processByte(value);
-}
-
-inline bool MockDigest::processUInt8(uint8_t value) noexcept {
-    return _processUInt8(value);
-}
-
-inline bool MockDigest::processUInt16(uint16_t value) noexcept {
-    return _processUInt16(value);
-}
-
-inline bool MockDigest::processUInt32(uint32_t value) noexcept {
-    return _processUInt32(value);
-}
-
-inline bool MockDigest::processUInt64(uint64_t value) noexcept {
-    return _processUInt64(value);
-}
-
-inline bool MockDigest::processString(const std::string& value) noexcept {
-    return _processString(value);
-}
-
-inline bool MockDigest::finalize(DataBlock& dataOut) noexcept {
-    return _finalize(dataOut);
-}
-
-inline bool MockDigest::reset() noexcept {
-    return _reset();
-}
-
-}  // namespace test
-}  // namespace acsdkCryptoInterfaces
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKCRYPTOINTERFACES_TEST_MOCKDIGEST_H_
diff --git a/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockKeyFactory.h b/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockKeyFactory.h
deleted file mode 100644
index fe8d05b3dc..0000000000
--- a/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockKeyFactory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKCRYPTOINTERFACES_TEST_MOCKKEYFACTORY_H_
-#define ACSDKCRYPTOINTERFACES_TEST_MOCKKEYFACTORY_H_
-
-#include <acsdkCryptoInterfaces/KeyFactoryInterface.h>
-#include <gmock/gmock.h>
-
-namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
-namespace test {
-
-/**
- * Mock class for @c KeyFactoryInterface.
- */
-class MockKeyFactory : public KeyFactoryInterface {
-public:
-    MOCK_METHOD2(_generateKey, bool(AlgorithmType type, Key& key));
-    MOCK_METHOD2(_generateIV, bool(AlgorithmType type, IV& iv));
-
-    bool generateIV(AlgorithmType type, IV& iv) noexcept override;
-    bool generateKey(AlgorithmType type, Key& key) noexcept override;
-};
-
-inline bool MockKeyFactory::generateKey(AlgorithmType type, Key& key) noexcept {
-    return _generateKey(type, key);
-}
-
-inline bool MockKeyFactory::generateIV(AlgorithmType type, IV& iv) noexcept {
-    return _generateIV(type, iv);
-}
-
-}  // namespace test
-}  // namespace acsdkCryptoInterfaces
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKCRYPTOINTERFACES_TEST_MOCKKEYFACTORY_H_
diff --git a/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockKeyStore.h b/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockKeyStore.h
deleted file mode 100644
index d926118513..0000000000
--- a/core/Crypto/acsdkCryptoInterfaces/test/include/acsdkCryptoInterfaces/test/MockKeyStore.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKCRYPTOINTERFACES_TEST_MOCKKEYSTORE_H_
-#define ACSDKCRYPTOINTERFACES_TEST_MOCKKEYSTORE_H_
-
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
-#include <gmock/gmock.h>
-
-namespace alexaClientSDK {
-namespace acsdkCryptoInterfaces {
-namespace test {
-
-/**
- * Mock class for @c KeyStoreInterface.
- */
-class MockKeyStore : public KeyStoreInterface {
-public:
-    MOCK_METHOD6(
-        _encrypt,
-        bool(
-            const std::string& keyAlias,
-            AlgorithmType type,
-            const IV& iv,
-            const DataBlock& plaintext,
-            KeyChecksum& checksum,
-            DataBlock& ciphertext));
-    MOCK_METHOD8(
-        _encryptAE,
-        bool(
-            const std::string& keyAlias,
-            AlgorithmType type,
-            const IV& iv,
-            const DataBlock& aad,
-            const DataBlock& plaintext,
-            KeyChecksum& checksum,
-            DataBlock& ciphertext,
-            DataBlock& tag));
-    MOCK_METHOD6(
-        _decrypt,
-        bool(
-            const std::string& keyAlias,
-            AlgorithmType type,
-            const KeyChecksum& checksum,
-            const IV& iv,
-            const DataBlock& ciphertext,
-            DataBlock& plaintext));
-    MOCK_METHOD8(
-        _decryptAD,
-        bool(
-            const std::string& keyAlias,
-            AlgorithmType type,
-            const KeyChecksum& checksum,
-            const IV& iv,
-            const DataBlock& aad,
-            const DataBlock& ciphertext,
-            const Tag& tag,
-            DataBlock& plaintext));
-    MOCK_METHOD1(_getDefaultKeyAlias, bool(std::string&));
-
-    bool encrypt(
-        const std::string& keyAlias,
-        AlgorithmType type,
-        const IV& iv,
-        const KeyChecksum& plaintext,
-        DataBlock& checksum,
-        DataBlock& ciphertext) noexcept override;
-    bool encryptAE(
-        const std::string& keyAlias,
-        AlgorithmType type,
-        const IV& iv,
-        const DataBlock& aad,
-        const DataBlock& plaintext,
-        KeyChecksum& checksum,
-        DataBlock& ciphertext,
-        Tag& tag) noexcept override;
-    bool decrypt(
-        const std::string& keyAlias,
-        AlgorithmType type,
-        const KeyChecksum& checksum,
-        const IV& iv,
-        const DataBlock& ciphertext,
-        DataBlock& plaintext) noexcept override;
-    bool decryptAD(
-        const std::string& keyAlias,
-        AlgorithmType type,
-        const KeyChecksum& checksum,
-        const IV& iv,
-        const DataBlock& aad,
-        const DataBlock& ciphertext,
-        const Tag& tag,
-        DataBlock& plaintext) noexcept override;
-    bool getDefaultKeyAlias(std::string& keyAlias) noexcept override;
-};
-
-inline bool MockKeyStore::encrypt(
-    const std::string& keyAlias,
-    AlgorithmType type,
-    const IV& iv,
-    const DataBlock& plaintext,
-    KeyChecksum& checksum,
-    DataBlock& ciphertext) noexcept {
-    return _encrypt(keyAlias, type, iv, plaintext, checksum, ciphertext);
-}
-
-inline bool MockKeyStore::encryptAE(
-    const std::string& keyAlias,
-    AlgorithmType type,
-    const IV& iv,
-    const DataBlock& aad,
-    const DataBlock& plaintext,
-    KeyChecksum& checksum,
-    DataBlock& ciphertext,
-    Tag& tag) noexcept {
-    return _encryptAE(keyAlias, type, iv, aad, plaintext, checksum, ciphertext, tag);
-}
-
-inline bool MockKeyStore::decrypt(
-    const std::string& keyAlias,
-    AlgorithmType type,
-    const KeyChecksum& checksum,
-    const IV& iv,
-    const DataBlock& ciphertext,
-    DataBlock& plaintext) noexcept {
-    return _decrypt(keyAlias, type, checksum, iv, ciphertext, plaintext);
-}
-
-inline bool MockKeyStore::decryptAD(
-    const std::string& keyAlias,
-    AlgorithmType type,
-    const KeyChecksum& checksum,
-    const IV& iv,
-    const DataBlock& aad,
-    const DataBlock& ciphertext,
-    const Tag& tag,
-    DataBlock& plaintext) noexcept {
-    return _decryptAD(keyAlias, type, checksum, iv, aad, ciphertext, tag, plaintext);
-}
-
-inline bool MockKeyStore::getDefaultKeyAlias(std::string& keyAlias) noexcept {
-    return _getDefaultKeyAlias(keyAlias);
-}
-
-}  // namespace test
-}  // namespace acsdkCryptoInterfaces
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKCRYPTOINTERFACES_TEST_MOCKKEYSTORE_H_
diff --git a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/Logging.h b/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/Logging.h
deleted file mode 100644
index 6ff0f0f75f..0000000000
--- a/core/Crypto/acsdkPkcs11/privateInclude/acsdkPkcs11/private/Logging.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKPKCS11_PRIVATE_LOGGING_H_
-#define ACSDKPKCS11_PRIVATE_LOGGING_H_
-
-#include <AVSCommon/Utils/Logger/Logger.h>
-
-/**
- * Create a LogEntry using this file's TAG and the specified event string.
- *
- * @param event The event string for this @c LogEntry.
- * @ingroup CryptoPKCS11
- * @private
- */
-#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-#endif  // ACSDKPKCS11_PRIVATE_LOGGING_H_
diff --git a/core/Properties/CMakeLists.txt b/core/Properties/CMakeLists.txt
index 116c89bade..5c1fdb6f3f 100644
--- a/core/Properties/CMakeLists.txt
+++ b/core/Properties/CMakeLists.txt
@@ -1,4 +1,4 @@
 cmake_minimum_required(VERSION 3.1)
 
-add_subdirectory("acsdkPropertiesInterfaces")
-add_subdirectory("acsdkProperties")
+add_subdirectory("PropertiesInterfaces")
+add_subdirectory("Properties")
diff --git a/core/Properties/acsdkProperties/CMakeLists.txt b/core/Properties/Properties/CMakeLists.txt
similarity index 100%
rename from core/Properties/acsdkProperties/CMakeLists.txt
rename to core/Properties/Properties/CMakeLists.txt
diff --git a/core/Properties/Properties/doc/Namespaces.dox b/core/Properties/Properties/doc/Namespaces.dox
new file mode 100644
index 0000000000..aa3eb64135
--- /dev/null
+++ b/core/Properties/Properties/doc/Namespaces.dox
@@ -0,0 +1,23 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * \namespace ::alexaClientSDK::properties
+ * \brief Properties Implementation.
+ * \ingroup Lib_acsdkProperties
+ *
+ * \namespace ::alexaClientSDK::properties::test
+ * \brief Test cases for \ref Lib_acsdkProperties
+ */
diff --git a/core/Properties/Properties/doc/acsdkProperties.dox b/core/Properties/Properties/doc/acsdkProperties.dox
new file mode 100644
index 0000000000..3a9b9fbbc0
--- /dev/null
+++ b/core/Properties/Properties/doc/acsdkProperties.dox
@@ -0,0 +1,54 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * \defgroup Lib_acsdkProperties Properties Implementation
+ * @brief Implementations for \ref Lib_acsdkPropertiesInterfaces
+ *
+ * Lib_acsdkProperties enables users to use Lib_acsdkPropertiesInterfaces instead of lower level MiscStorageInterface and SQLiteDatabase. In
+ * addition, this module offers data at rest protection using hardware security module.
+ *
+ * To use unencrypted adapter for \ref alexaClientSDK::properties::MiscStorageInterface:
+ * \code{.cpp}
+ * #include <acsdk/Properties/PropertiesFactories.h>
+ *
+ * std::shared_ptr<MiscStorageInterface> miscStorage = ...;
+ * auto factory = createPropertiesFactory(miscStorage);
+ * auto properties = propertiesFactory->getProperties("componentName", "configNamespace");
+ * properties->putString("propertyName", "stringValue");
+ * \endcode
+ *
+ * The following example demonstrates how to use encrypted properties:
+ * \code{.cpp}
+ * #include <acsdk/Properties/EncryptedPropertiesFactories.h>
+ *
+ * std::shared_ptr<MiscStorageInterface> miscStorage = ...;
+ * std::shared_ptr<CryptoFactoryInterface> cryptoFactory = ...;
+ * std::shared_ptr<KeyStoreInterface> keyStore = ...;
+ *
+ * auto factory = createEncryptedPropertiesFactory(cryptoFactory, keyStore, miscStorage);
+ * auto properties = propertiesFactory->getProperties("componentName", "configNamespace");
+ * properties->putString("propertyName", "stringValue");
+ * \endcode
+ *
+ * Encryption at rest requires that CryptoAPI support is available and the platform has correctly configured
+ * hardware security module.
+ *
+ * \sa CryptoIMPL how to obtain \ref alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface.
+ * \sa PKCS11IMPL how to obtain \ref alexaClientSDK::cryptoInterfaces::KeyStoreInterface and configure HSM.
+ *
+ * \sa alexaClientSDK::properties
+ * \sa alexaClientSDK::properties::test
+ */
diff --git a/core/Properties/acsdkProperties/include/acsdkProperties/EncryptedPropertiesFactories.h b/core/Properties/Properties/include/acsdk/Properties/EncryptedPropertiesFactories.h
similarity index 82%
rename from core/Properties/acsdkProperties/include/acsdkProperties/EncryptedPropertiesFactories.h
rename to core/Properties/Properties/include/acsdk/Properties/EncryptedPropertiesFactories.h
index 636abb8b52..3f258ebbe8 100644
--- a/core/Properties/acsdkProperties/include/acsdkProperties/EncryptedPropertiesFactories.h
+++ b/core/Properties/Properties/include/acsdk/Properties/EncryptedPropertiesFactories.h
@@ -13,25 +13,25 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIES_ENCRYPTEDPROPERTIESFACTORIES_H_
-#define ACSDKPROPERTIES_ENCRYPTEDPROPERTIESFACTORIES_H_
+#ifndef ACSDK_PROPERTIES_ENCRYPTEDPROPERTIESFACTORIES_H_
+#define ACSDK_PROPERTIES_ENCRYPTEDPROPERTIESFACTORIES_H_
 
 #include <memory>
 
-#include <acsdkPropertiesInterfaces/PropertiesFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkProperties/MiscStorageAdapter.h>
+#include <acsdk/PropertiesInterfaces/PropertiesFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/Properties/MiscStorageAdapter.h>
 #include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-using alexaClientSDK::acsdkCryptoInterfaces::CryptoFactoryInterface;
-using alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface;
-using alexaClientSDK::acsdkPropertiesInterfaces::PropertiesFactoryInterface;
 using alexaClientSDK::avsCommon::sdkInterfaces::storage::MiscStorageInterface;
+using alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface;
+using alexaClientSDK::cryptoInterfaces::KeyStoreInterface;
+using alexaClientSDK::propertiesInterfaces::PropertiesFactoryInterface;
 
 /**
  * @brief Creates properties factory with encryption support by wrapping a factory without encryption support.
@@ -76,7 +76,7 @@ std::shared_ptr<PropertiesFactoryInterface> createEncryptedPropertiesFactory(
  *
  * @return Properties factory reference or nullptr on error.
  *
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 std::shared_ptr<PropertiesFactoryInterface> createEncryptedPropertiesFactory(
     const std::shared_ptr<MiscStorageInterface>& innerStorage,
@@ -84,7 +84,7 @@ std::shared_ptr<PropertiesFactoryInterface> createEncryptedPropertiesFactory(
     const std::shared_ptr<CryptoFactoryInterface>& cryptoFactory,
     const std::shared_ptr<KeyStoreInterface>& keyStore) noexcept;
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIES_ENCRYPTEDPROPERTIESFACTORIES_H_
+#endif  // ACSDK_PROPERTIES_ENCRYPTEDPROPERTIESFACTORIES_H_
diff --git a/core/Properties/acsdkProperties/include/acsdkProperties/ErrorCallbackInterface.h b/core/Properties/Properties/include/acsdk/Properties/ErrorCallbackInterface.h
similarity index 94%
rename from core/Properties/acsdkProperties/include/acsdkProperties/ErrorCallbackInterface.h
rename to core/Properties/Properties/include/acsdk/Properties/ErrorCallbackInterface.h
index ae95467934..ac964e4284 100644
--- a/core/Properties/acsdkProperties/include/acsdkProperties/ErrorCallbackInterface.h
+++ b/core/Properties/Properties/include/acsdk/Properties/ErrorCallbackInterface.h
@@ -13,14 +13,14 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIES_ERRORCALLBACKINTERFACE_H_
-#define ACSDKPROPERTIES_ERRORCALLBACKINTERFACE_H_
+#ifndef ACSDK_PROPERTIES_ERRORCALLBACKINTERFACE_H_
+#define ACSDK_PROPERTIES_ERRORCALLBACKINTERFACE_H_
 
 #include <memory>
 #include <string>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 /**
  * @brief Possible error causes.
@@ -28,7 +28,7 @@ namespace acsdkProperties {
  * This enumeration defines supported error reasons for properties open operation.
  *
  * @sa ErrorCallbackInterface
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 enum class StatusCode {
     SUCCESS = 1,                 ///< Status code indicating no error. For internal use only.
@@ -45,7 +45,7 @@ enum class StatusCode {
  * This enumeration defines possible actions when properties framework encounters an error.
  *
  * @sa ErrorCallbackInterface
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 enum class Action {
     CONTINUE = 1,    ///< Continue with default behaviour.
@@ -61,7 +61,7 @@ enum class Action {
  * situations.
  *
  * @sa setErrorCallback()
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 class ErrorCallbackInterface {
 public:
@@ -122,7 +122,7 @@ class ErrorCallbackInterface {
     virtual Action onPutPropertyError(StatusCode status, const std::string& configUri) noexcept = 0;
 };
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIES_ERRORCALLBACKINTERFACE_H_
+#endif  // ACSDK_PROPERTIES_ERRORCALLBACKINTERFACE_H_
diff --git a/core/Properties/acsdkProperties/include/acsdkProperties/ErrorCallbackSetter.h b/core/Properties/Properties/include/acsdk/Properties/ErrorCallbackSetter.h
similarity index 90%
rename from core/Properties/acsdkProperties/include/acsdkProperties/ErrorCallbackSetter.h
rename to core/Properties/Properties/include/acsdk/Properties/ErrorCallbackSetter.h
index fc52f62949..4772ec6e12 100644
--- a/core/Properties/acsdkProperties/include/acsdkProperties/ErrorCallbackSetter.h
+++ b/core/Properties/Properties/include/acsdk/Properties/ErrorCallbackSetter.h
@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIES_ERRORCALLBACKSETTER_H_
-#define ACSDKPROPERTIES_ERRORCALLBACKSETTER_H_
+#ifndef ACSDK_PROPERTIES_ERRORCALLBACKSETTER_H_
+#define ACSDK_PROPERTIES_ERRORCALLBACKSETTER_H_
 
 #include <cstdint>
 #include <memory>
 #include <string>
 
-#include <acsdkProperties/ErrorCallbackInterface.h>
+#include <acsdk/Properties/ErrorCallbackInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 /**
  * @brief Default number of retries when using error callback interface.
@@ -60,14 +60,14 @@ static constexpr uint32_t UNLIMITED_RETRIES = UINT32_MAX;
  *
  * @return Boolean indicating operation success. On failure, contents of *previous is undefined and false is returned.
  *
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 bool setErrorCallback(
     const std::weak_ptr<ErrorCallbackInterface>& callback,
     uint32_t maxRetries = DEFAULT_MAX_RETRIES,
     std::weak_ptr<ErrorCallbackInterface>* previous = nullptr) noexcept;
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIES_ERRORCALLBACKSETTER_H_
+#endif  // ACSDK_PROPERTIES_ERRORCALLBACKSETTER_H_
diff --git a/core/Properties/acsdkProperties/include/acsdkProperties/MiscStorageAdapter.h b/core/Properties/Properties/include/acsdk/Properties/MiscStorageAdapter.h
similarity index 87%
rename from core/Properties/acsdkProperties/include/acsdkProperties/MiscStorageAdapter.h
rename to core/Properties/Properties/include/acsdk/Properties/MiscStorageAdapter.h
index 537e98368e..876b4f50b5 100644
--- a/core/Properties/acsdkProperties/include/acsdkProperties/MiscStorageAdapter.h
+++ b/core/Properties/Properties/include/acsdk/Properties/MiscStorageAdapter.h
@@ -13,33 +13,33 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIES_MISCSTORAGEADAPTER_H_
-#define ACSDKPROPERTIES_MISCSTORAGEADAPTER_H_
+#ifndef ACSDK_PROPERTIES_MISCSTORAGEADAPTER_H_
+#define ACSDK_PROPERTIES_MISCSTORAGEADAPTER_H_
 
 #include <memory>
 #include <string>
 
-#include <acsdkPropertiesInterfaces/PropertiesFactoryInterface.h>
+#include <acsdk/PropertiesInterfaces/PropertiesFactoryInterface.h>
 #include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-using alexaClientSDK::acsdkPropertiesInterfaces::PropertiesFactoryInterface;
 using alexaClientSDK::avsCommon::sdkInterfaces::storage::MiscStorageInterface;
+using alexaClientSDK::propertiesInterfaces::PropertiesFactoryInterface;
 
 /**
  * @brief Interface to map properties config URI into component name and table name.
  *
- * This interface connects \ref PropertiesAPI and @c MiscStorageInterface.
+ * This interface connects \ref Lib_acsdkPropertiesInterfaces and @c MiscStorageInterface.
  *
  * @c PropertiesFactoryInterface uses configuration URI to open properties container. When working with @c
  * MiscStorageInterface this URI must be mapped into @a componentName and @a tableName parameters.
  *
- * @sa PropertiesAPI
- * @sa alexaClientSDK::acsdkPropertiesInterfaces::PropertiesFactoryInterface
+ * @sa Lib_acsdkPropertiesInterfaces
+ * @sa alexaClientSDK::propertiesInterfaces::PropertiesFactoryInterface
  * @sa alexaClientSDK::avsCommon::sdkInterfaces::storage::MiscStorageInterface
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 class MiscStorageUriMapperInterface {
 public:
@@ -76,7 +76,7 @@ class MiscStorageUriMapperInterface {
  * name.
  *
  * @sa createPropertiesFactory()
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 class SimpleMiscStorageUriMapper : public MiscStorageUriMapperInterface {
 public:
@@ -117,13 +117,13 @@ class SimpleMiscStorageUriMapper : public MiscStorageUriMapperInterface {
  *                          and component name values when accessing \ref MiscStorageInterface API.
  *
  * @return Factory reference or nullptr on error.
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 std::shared_ptr<PropertiesFactoryInterface> createPropertiesFactory(
     const std::shared_ptr<MiscStorageInterface>& innerStorage,
     const std::shared_ptr<MiscStorageUriMapperInterface>& nameMapper = SimpleMiscStorageUriMapper::create()) noexcept;
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIES_MISCSTORAGEADAPTER_H_
+#endif  // ACSDK_PROPERTIES_MISCSTORAGEADAPTER_H_
diff --git a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/Asn1Helper.h b/core/Properties/Properties/privateInclude/acsdk/Properties/private/Asn1Helper.h
similarity index 93%
rename from core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/Asn1Helper.h
rename to core/Properties/Properties/privateInclude/acsdk/Properties/private/Asn1Helper.h
index 4e53bdd315..ec45ee02e6 100644
--- a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/Asn1Helper.h
+++ b/core/Properties/Properties/privateInclude/acsdk/Properties/private/Asn1Helper.h
@@ -13,26 +13,26 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIES_PRIVATE_ASN1HELPER_H_
-#define ACSDKPROPERTIES_PRIVATE_ASN1HELPER_H_
+#ifndef ACSDK_PROPERTIES_PRIVATE_ASN1HELPER_H_
+#define ACSDK_PROPERTIES_PRIVATE_ASN1HELPER_H_
 
 #include <vector>
 #include <openssl/asn1t.h>
 #include <string>
 
-#include <acsdkCryptoInterfaces/DigestType.h>
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
+#include <acsdk/CryptoInterfaces/DigestType.h>
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-using acsdkCryptoInterfaces::AlgorithmType;
-using acsdkCryptoInterfaces::DigestType;
+using cryptoInterfaces::AlgorithmType;
+using cryptoInterfaces::DigestType;
 
 /**
  * @brief Helper for ASN.1 operations.
  *
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 struct Asn1Helper {
     /// @brief Byte vector type.
@@ -163,7 +163,7 @@ struct Asn1Helper {
     static bool convertDigTypeFromAsn1(int64_t asn1Type, DigestType& type) noexcept;
 };
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIES_PRIVATE_ASN1HELPER_H_
+#endif  // ACSDK_PROPERTIES_PRIVATE_ASN1HELPER_H_
diff --git a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/Asn1Types.h b/core/Properties/Properties/privateInclude/acsdk/Properties/private/Asn1Types.h
similarity index 94%
rename from core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/Asn1Types.h
rename to core/Properties/Properties/privateInclude/acsdk/Properties/private/Asn1Types.h
index d370a6ca0a..22e6c52cb2 100644
--- a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/Asn1Types.h
+++ b/core/Properties/Properties/privateInclude/acsdk/Properties/private/Asn1Types.h
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIES_PRIVATE_ASN1TYPES_H_
-#define ACSDKPROPERTIES_PRIVATE_ASN1TYPES_H_
+#ifndef ACSDK_PROPERTIES_PRIVATE_ASN1TYPES_H_
+#define ACSDK_PROPERTIES_PRIVATE_ASN1TYPES_H_
 
 #include <openssl/asn1t.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-/// @addtogroup PropertiesIMPL
+/// @addtogroup Lib_acsdkProperties
 /// @{
 
 /*-
@@ -130,7 +130,7 @@ DECLARE_ASN1_FUNCTIONS(ACSDK_DATA_PROP);
 
 /// @}
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIES_PRIVATE_ASN1TYPES_H_
+#endif  // ACSDK_PROPERTIES_PRIVATE_ASN1TYPES_H_
diff --git a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/DataPropertyCodec.h b/core/Properties/Properties/privateInclude/acsdk/Properties/private/DataPropertyCodec.h
similarity index 77%
rename from core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/DataPropertyCodec.h
rename to core/Properties/Properties/privateInclude/acsdk/Properties/private/DataPropertyCodec.h
index ba37a974eb..7844ffc35b 100644
--- a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/DataPropertyCodec.h
+++ b/core/Properties/Properties/privateInclude/acsdk/Properties/private/DataPropertyCodec.h
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIES_PRIVATE_DATAPROPERTYCODEC_H_
-#define ACSDKPROPERTIES_PRIVATE_DATAPROPERTYCODEC_H_
+#ifndef ACSDK_PROPERTIES_PRIVATE_DATAPROPERTYCODEC_H_
+#define ACSDK_PROPERTIES_PRIVATE_DATAPROPERTYCODEC_H_
 
 #include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 /**
  * @brief ASN.1 Encoder/Decoder for encrypted property value.
@@ -34,15 +34,15 @@ namespace acsdkProperties {
  * format.
  *
  * @sa DataPropertyCodecState
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 struct DataPropertyCodec {
     /// Initialization vector data type.
-    typedef acsdkCryptoInterfaces::CryptoCodecInterface::IV IV;
+    typedef cryptoInterfaces::CryptoCodecInterface::IV IV;
     /// Byte vector data type.
-    typedef acsdkCryptoInterfaces::CryptoCodecInterface::DataBlock DataBlock;
+    typedef cryptoInterfaces::CryptoCodecInterface::DataBlock DataBlock;
     /// Tag data type.
-    typedef acsdkCryptoInterfaces::CryptoCodecInterface::Tag Tag;
+    typedef cryptoInterfaces::CryptoCodecInterface::Tag Tag;
 
     /**
      * @brief Encodes encrypted property value into DER form.
@@ -56,7 +56,7 @@ struct DataPropertyCodec {
      * @return True if operation is successful.
      */
     static bool encode(
-        const std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+        const std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
         const IV& dataIV,
         const DataBlock& dataCiphertext,
         const Tag& dataTag,
@@ -76,7 +76,7 @@ struct DataPropertyCodec {
      * @return True if operation is successful.
      */
     static bool decode(
-        const std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+        const std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
         const std::vector<uint8_t>& derEncoded,
         IV& dataIV,
         DataBlock& dataCiphertext,
@@ -85,7 +85,7 @@ struct DataPropertyCodec {
         DataBlock& digestActual) noexcept;
 };
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIES_PRIVATE_DATAPROPERTYCODEC_H_
+#endif  // ACSDK_PROPERTIES_PRIVATE_DATAPROPERTYCODEC_H_
diff --git a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/DataPropertyCodecState.h b/core/Properties/Properties/privateInclude/acsdk/Properties/private/DataPropertyCodecState.h
similarity index 89%
rename from core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/DataPropertyCodecState.h
rename to core/Properties/Properties/privateInclude/acsdk/Properties/private/DataPropertyCodecState.h
index ff189d9f39..c6c9b8eeeb 100644
--- a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/DataPropertyCodecState.h
+++ b/core/Properties/Properties/privateInclude/acsdk/Properties/private/DataPropertyCodecState.h
@@ -13,39 +13,39 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIES_PRIVATE_DATAPROPERTYCODECSTATE_H_
-#define ACSDKPROPERTIES_PRIVATE_DATAPROPERTYCODECSTATE_H_
+#ifndef ACSDK_PROPERTIES_PRIVATE_DATAPROPERTYCODECSTATE_H_
+#define ACSDK_PROPERTIES_PRIVATE_DATAPROPERTYCODECSTATE_H_
 
 #include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <acsdkProperties/private/Asn1Types.h>
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/Properties/private/Asn1Types.h>
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-using acsdkCryptoInterfaces::DigestType;
+using cryptoInterfaces::DigestType;
 
 /**
  * @brief Helper state for holding ASN.1 structures of DER codec for encrypted property value.
  *
  * @sa DataPropertyCodec
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 class DataPropertyCodecState {
 public:
     /// @brief Initialization vector data type.
-    typedef acsdkCryptoInterfaces::CryptoCodecInterface::IV IV;
+    typedef cryptoInterfaces::CryptoCodecInterface::IV IV;
 
     /// @brief Byte vector data type.
-    typedef acsdkCryptoInterfaces::CryptoCodecInterface::DataBlock DataBlock;
+    typedef cryptoInterfaces::CryptoCodecInterface::DataBlock DataBlock;
 
     /// @brief Data tag type.
-    typedef acsdkCryptoInterfaces::CryptoCodecInterface::Tag Tag;
+    typedef cryptoInterfaces::CryptoCodecInterface::Tag Tag;
 
     /// @brief Object constructor
     DataPropertyCodecState() noexcept;
@@ -213,7 +213,7 @@ class DataPropertyCodecState {
     DataProperty* m_asn1Data;
 };
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIES_PRIVATE_DATAPROPERTYCODECSTATE_H_
+#endif  // ACSDK_PROPERTIES_PRIVATE_DATAPROPERTYCODECSTATE_H_
diff --git a/core/Properties/Properties/privateInclude/acsdk/Properties/private/EncryptedProperties.h b/core/Properties/Properties/privateInclude/acsdk/Properties/private/EncryptedProperties.h
new file mode 100644
index 0000000000..de94b4682b
--- /dev/null
+++ b/core/Properties/Properties/privateInclude/acsdk/Properties/private/EncryptedProperties.h
@@ -0,0 +1,163 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_PROPERTIES_PRIVATE_ENCRYPTEDPROPERTIES_H_
+#define ACSDK_PROPERTIES_PRIVATE_ENCRYPTEDPROPERTIES_H_
+
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/PropertiesInterfaces/PropertiesInterface.h>
+#include <acsdk/Properties/ErrorCallbackInterface.h>
+#include <acsdk/Properties/private/RetryExecutor.h>
+
+namespace alexaClientSDK {
+namespace properties {
+
+/**
+ * @brief Properties adapter with field encryption.
+ *
+ * This class wraps underlying PropertiesInterface with encryption support. All property values are encrypted on save
+ * and decrypted on load. When this adapter initializes for the first time, it automatically encrypts all fields. To
+ * manage encryption key, additional data is stored with '$acsdkEncryption$' property name. This property contains
+ * algorithms to use and encrypted data key. The data key itself is encrypted using HSM key store.
+ *
+ * This class is thread safe and can be shared between multiple consumers.
+ *
+ * @ingroup Lib_acsdkProperties
+ */
+class EncryptedProperties : public alexaClientSDK::propertiesInterfaces::PropertiesInterface {
+public:
+    static std::shared_ptr<PropertiesInterface> create(
+        const std::string& configUri,
+        const std::shared_ptr<PropertiesInterface>& innerProperties,
+        const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+        const std::shared_ptr<alexaClientSDK::cryptoInterfaces::KeyStoreInterface>& keyStore) noexcept;
+
+    /// @name PropertiesInterface methods.
+    /// @{
+    bool getString(const std::string& key, std::string& value) noexcept override;
+    bool putString(const std::string& key, const std::string& value) noexcept override;
+    bool getBytes(const std::string& key, Bytes& value) noexcept override;
+    bool putBytes(const std::string& key, const Bytes& value) noexcept override;
+    bool remove(const std::string& key) noexcept override;
+    bool getKeys(std::unordered_set<std::string>& valueContainer) noexcept override;
+    bool clear() noexcept override;
+    /// @}
+
+protected:
+    typedef cryptoInterfaces::KeyStoreInterface::IV IV;
+    typedef cryptoInterfaces::KeyStoreInterface::DataBlock DataBlock;
+    typedef cryptoInterfaces::KeyStoreInterface::KeyChecksum KeyChecksum;
+    typedef cryptoInterfaces::CryptoCodecInterface::Key Key;
+    typedef cryptoInterfaces::CryptoCodecInterface::Tag Tag;
+
+    // Constructor.
+    EncryptedProperties(
+        const std::string& configUri,
+        const std::shared_ptr<PropertiesInterface>& innerProperties,
+        const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+        const std::shared_ptr<alexaClientSDK::cryptoInterfaces::KeyStoreInterface>& keyStore) noexcept;
+
+    // Container initialization.
+    bool init() noexcept;
+    // Encryption upgrade.
+    StatusCode upgradeEncryption(RetryExecutor& executor, const std::unordered_set<std::string>& keys) noexcept;
+    // Prepare data key
+    StatusCode loadAndDecryptDataKey(RetryExecutor& executor) noexcept;
+
+    // Data property operations.
+    bool encryptAndEncodePropertyValue(
+        const std::string& key,
+        const Bytes& plaintext,
+        Bytes& encodedCiphertext) noexcept;
+    bool decodeAndDecryptPropertyValue(
+        const std::string& key,
+        const Bytes& encodedCiphertext,
+        Bytes& plaintext) noexcept;
+    bool encryptAndPutInternal(const std::string& key, const Bytes& plaintext) noexcept;
+    bool getAndDecryptInternal(const std::string& key, Bytes& plaintext) noexcept;
+
+    // Encryption property operations.
+    StatusCode generateAndStoreDataKeyWithRetries(RetryExecutor& executor) noexcept;
+
+    // Inner properties operations
+    bool loadKeysWithRetries(RetryExecutor& executor, std::unordered_set<std::string>& keys) noexcept;
+    bool storeValueWithRetries(
+        RetryExecutor& executor,
+        const std::string& key,
+        const Bytes& data,
+        bool canDrop) noexcept;
+    bool loadValueWithRetries(RetryExecutor& executor, const std::string& key, Bytes& data) noexcept;
+    bool deleteValueWithRetries(RetryExecutor& executor, const std::string& key) noexcept;
+    bool clearAllValuesWithRetries(RetryExecutor& executor) noexcept;
+    bool executeKeyOperationWithRetries(
+        RetryExecutor& executor,
+        const std::string& operationName,
+        const std::string& key,
+        const std::function<bool()>& operation) noexcept;
+
+    /**
+     * @brief Generate new data key.
+     *
+     * Method generates new data key and stores it in this instance. If there is an error, the method attempts to
+     * do retries.
+     *
+     * @param[in] helper Executor for perform operation with retries.
+     * @return True if operation succeeds, false otherwise.
+     */
+    bool generateDataKeyWithRetries(RetryExecutor& executor) noexcept;
+    bool encryptAndEncodeDataKeyWithRetries(RetryExecutor& executor, Bytes& encoded) noexcept;
+    StatusCode decodeAndDecryptDataKey(const Bytes& encoded) noexcept;
+    bool encryptDataKey(
+        std::string& mainKeyAlias,
+        alexaClientSDK::cryptoInterfaces::AlgorithmType& algorithmType,
+        KeyChecksum& mainKeyChecksum,
+        IV& dataKeyIV,
+        DataBlock& dataKeyCiphertext,
+        Tag& dataKeyTag) noexcept;
+    bool decryptDataKey(
+        const std::string& mainKeyAlias,
+        alexaClientSDK::cryptoInterfaces::AlgorithmType dataKeyAlgorithm,
+        const KeyChecksum& mainKeyChecksum,
+        const IV& dataKeyIV,
+        const DataBlock& keyCiphertext,
+        const Tag& dataKeyTag) noexcept;
+
+    bool doClear(RetryExecutor& helper) noexcept;
+
+    /// Configuration namespace (for error callbacks).
+    const std::string m_configUri;
+
+    /// Underlying storage interface.
+    const std::shared_ptr<PropertiesInterface> m_innerProperties;
+
+    /// Cryptography service factory.
+    const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface> m_cryptoFactory;
+
+    /// HSM keystore interface.
+    const std::shared_ptr<alexaClientSDK::cryptoInterfaces::KeyStoreInterface> m_keyStore;
+
+    /// Actual algorithm type in use.
+    alexaClientSDK::cryptoInterfaces::AlgorithmType m_dataAlgorithmType;
+
+    /// Data key in use
+    Key m_dataKey;
+};
+
+}  // namespace properties
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_PROPERTIES_PRIVATE_ENCRYPTEDPROPERTIES_H_
diff --git a/core/Properties/Properties/privateInclude/acsdk/Properties/private/EncryptedPropertiesFactory.h b/core/Properties/Properties/privateInclude/acsdk/Properties/private/EncryptedPropertiesFactory.h
new file mode 100644
index 0000000000..a247bdf5d0
--- /dev/null
+++ b/core/Properties/Properties/privateInclude/acsdk/Properties/private/EncryptedPropertiesFactory.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_PROPERTIES_PRIVATE_ENCRYPTEDPROPERTIESFACTORY_H_
+#define ACSDK_PROPERTIES_PRIVATE_ENCRYPTEDPROPERTIESFACTORY_H_
+
+#include <acsdk/PropertiesInterfaces/PropertiesFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/Properties/MiscStorageAdapter.h>
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
+
+namespace alexaClientSDK {
+namespace properties {
+
+/**
+ * @brief Properties factory wrapper to encrypt all properties.
+ *
+ * This factory works with @name EncryptedProperties class to ensure all property values are stored in encrypted form
+ * in the underlying storage.
+ *
+ * @ingroup Lib_acsdkProperties
+ */
+class EncryptedPropertiesFactory : public alexaClientSDK::propertiesInterfaces::PropertiesFactoryInterface {
+public:
+    /**
+     * @brief Creates properties factory using given dependencies.
+     *
+     * @param[in] innerFactory Internal factory for accessing properties in plain text manner.
+     * @param[in] cryptoFactory Encryption facilities factory.
+     * @param[in] keyStore HSM key store.
+     *
+     * @return Reference to factory or nullptr on error.
+     */
+    static std::shared_ptr<PropertiesFactoryInterface> create(
+        const std::shared_ptr<alexaClientSDK::propertiesInterfaces::PropertiesFactoryInterface>& innerFactory,
+        const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+        const std::shared_ptr<alexaClientSDK::cryptoInterfaces::KeyStoreInterface>& keyStore) noexcept;
+
+    /// @name PropertiesFactoryInterface methods
+    ///@{
+    std::shared_ptr<alexaClientSDK::propertiesInterfaces::PropertiesInterface> getProperties(
+        const std::string& configUri) noexcept override;
+    ///@}
+
+private:
+    /**
+     * @brief Constructs factory.
+     *
+     * @param[in] innerFactory Internal factory for accessing properties in plain text manner.
+     * @param[in] cryptoFactory Encryption facilities factory.
+     * @param[in] keyStore HSM key store.
+     */
+    EncryptedPropertiesFactory(
+        const std::shared_ptr<PropertiesFactoryInterface>& innerFactory,
+        const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+        const std::shared_ptr<alexaClientSDK::cryptoInterfaces::KeyStoreInterface>& keyStore) noexcept;
+
+    bool init() noexcept;
+
+    /// Nested unencrypted properties factory.
+    const std::shared_ptr<alexaClientSDK::propertiesInterfaces::PropertiesFactoryInterface> m_storage;
+    /// Cryptography service factory.
+    const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface> m_cryptoFactory;
+    /// HSM keystore interface.
+    const std::shared_ptr<alexaClientSDK::cryptoInterfaces::KeyStoreInterface> m_keyStore;
+};
+
+}  // namespace properties
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_PROPERTIES_PRIVATE_ENCRYPTEDPROPERTIESFACTORY_H_
diff --git a/core/Properties/Properties/privateInclude/acsdk/Properties/private/EncryptionKeyPropertyCodec.h b/core/Properties/Properties/privateInclude/acsdk/Properties/private/EncryptionKeyPropertyCodec.h
new file mode 100644
index 0000000000..5b578f31a2
--- /dev/null
+++ b/core/Properties/Properties/privateInclude/acsdk/Properties/private/EncryptionKeyPropertyCodec.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_PROPERTIES_PRIVATE_ENCRYPTIONKEYPROPERTYCODEC_H_
+#define ACSDK_PROPERTIES_PRIVATE_ENCRYPTIONKEYPROPERTYCODEC_H_
+
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/CryptoInterfaces/KeyStoreInterface.h>
+#include <acsdk/PropertiesInterfaces/PropertiesInterface.h>
+#include <acsdk/Properties/private/Asn1Types.h>
+
+namespace alexaClientSDK {
+namespace properties {
+
+/**
+ * @brief ASN.1 Codec API for Encryption Key Property Encoding.
+ *
+ * This class provides top-level functions to encode encryption key property into DER format or decode it from DER
+ * format.
+ *
+ * @sa EncryptionKeyPropertyCodecState
+ * @ingroup Lib_acsdkProperties
+ */
+struct EncryptionKeyPropertyCodec {
+    typedef cryptoInterfaces::KeyStoreInterface::KeyChecksum KeyChecksum;
+    typedef cryptoInterfaces::KeyStoreInterface::DataBlock DataBlock;
+    typedef cryptoInterfaces::KeyStoreInterface::IV IV;
+    typedef cryptoInterfaces::CryptoCodecInterface::Tag Tag;
+    typedef propertiesInterfaces::PropertiesInterface::Bytes Bytes;
+
+    /**
+     * @brief Produces encryption key property in DER form.
+     *
+     * @param[in] cryptoFactory Crypto API factory.
+     * @param[in] mainKeyAlias Main key alias.
+     * @param[in] mainKeyChecksum Main key checksum.
+     * @param[in] dataKeyAlgorithm Algorithm used to wrap data key.
+     * @param[in] dataKeyIV Initialization vector used to wrap data key.
+     * @param[in] dataKeyCiphertext Wrapped data key.
+     * @param[in] dataKeyTag Data key tag.
+     * @param[in] dataAlgorithm Algorithm for data encryption.
+     *
+     * @param[out] derEncoded Encoded properties in DER format.
+     *
+     * @return True on success.
+     */
+    static bool encode(
+        const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+        const std::string& mainKeyAlias,
+        const KeyChecksum& mainKeyChecksum,
+        alexaClientSDK::cryptoInterfaces::AlgorithmType dataKeyAlgorithm,
+        const IV& dataKeyIV,
+        const DataBlock& dataKeyCiphertext,
+        const Tag& dataKeyTag,
+        alexaClientSDK::cryptoInterfaces::AlgorithmType dataAlgorithm,
+        Bytes& derEncoded) noexcept;
+
+    /**
+     * @brief Decode encryption key property.
+     *
+     * This method parses DER input and extracts encoding fields. Method also computes actual digest for digest
+     * verification.
+     *
+     * @param[in] cryptoFactory Crypto API factory.
+     * @param[in] derEncoded DER-encoded properties.
+     * @param[out] mainKeyAlias Parsed main key alias.
+     * @param[out] mainKeyChecksum Parsed main key checksum.
+     * @param[out] dataKeyAlgorithm Parsed algorithm for data key unwrapping.
+     * @param[out] dataKeyIV Parsed initialization vector for data key unwrapping.
+     * @param[out] dataKeyCiphertext Parsed wrapped data key.
+     * @param[out] dataKeyTag Parsed data key tag.
+     * @param[out] dataAlgorithm Parsed algorithm to encrypt/decrypt data.
+     * @param[out] digestDecoded Parsed digest.
+     * @param[out] digestActual Actual (recomputed) digest.
+     *
+     * @return True on success.
+     */
+    static bool decode(
+        const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+        const Bytes& derEncoded,
+        std::string& mainKeyAlias,
+        KeyChecksum& mainKeyChecksum,
+        alexaClientSDK::cryptoInterfaces::AlgorithmType& dataKeyAlgorithm,
+        IV& dataKeyIV,
+        DataBlock& dataKeyCiphertext,
+        Tag& dataKeyTag,
+        alexaClientSDK::cryptoInterfaces::AlgorithmType& dataAlgorithm,
+        DataBlock& digestDecoded,
+        DataBlock& digestActual) noexcept;
+};
+
+}  // namespace properties
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_PROPERTIES_PRIVATE_ENCRYPTIONKEYPROPERTYCODEC_H_
diff --git a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/EncryptionKeyPropertyCodecState.h b/core/Properties/Properties/privateInclude/acsdk/Properties/private/EncryptionKeyPropertyCodecState.h
similarity index 89%
rename from core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/EncryptionKeyPropertyCodecState.h
rename to core/Properties/Properties/privateInclude/acsdk/Properties/private/EncryptionKeyPropertyCodecState.h
index 93d5cfa3cd..790b453e5e 100644
--- a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/EncryptionKeyPropertyCodecState.h
+++ b/core/Properties/Properties/privateInclude/acsdk/Properties/private/EncryptionKeyPropertyCodecState.h
@@ -13,23 +13,23 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIES_PRIVATE_ENCRYPTIONKEYPROPERTYCODECSTATE_H_
-#define ACSDKPROPERTIES_PRIVATE_ENCRYPTIONKEYPROPERTYCODECSTATE_H_
+#ifndef ACSDK_PROPERTIES_PRIVATE_ENCRYPTIONKEYPROPERTYCODECSTATE_H_
+#define ACSDK_PROPERTIES_PRIVATE_ENCRYPTIONKEYPROPERTYCODECSTATE_H_
 
 #include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <acsdkProperties/private/Asn1Types.h>
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
+#include <acsdk/Properties/private/Asn1Types.h>
+#include <acsdk/CryptoInterfaces/AlgorithmType.h>
+#include <acsdk/CryptoInterfaces/CryptoFactoryInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-using acsdkCryptoInterfaces::AlgorithmType;
-using acsdkCryptoInterfaces::DigestType;
+using cryptoInterfaces::AlgorithmType;
+using cryptoInterfaces::DigestType;
 
 /**
  * @brief ASN.1 Codec state for encryption key property.
@@ -37,18 +37,18 @@ using acsdkCryptoInterfaces::DigestType;
  * This class contains data for DER encoding and decoding of encryption key property.
  *
  * @sa EncryptionKeyPropertyCodec
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 class EncryptionKeyPropertyCodecState {
 public:
     /// Initialization vector data type.
-    typedef acsdkCryptoInterfaces::KeyStoreInterface::IV IV;
+    typedef cryptoInterfaces::KeyStoreInterface::IV IV;
     /// Key checksum data type.
-    typedef acsdkCryptoInterfaces::KeyStoreInterface::KeyChecksum KeyChecksum;
+    typedef cryptoInterfaces::KeyStoreInterface::KeyChecksum KeyChecksum;
     /// Byte vector data type.
-    typedef acsdkCryptoInterfaces::KeyStoreInterface::DataBlock DataBlock;
+    typedef cryptoInterfaces::KeyStoreInterface::DataBlock DataBlock;
     /// Data tag type.
-    typedef acsdkCryptoInterfaces::CryptoCodecInterface::Tag Tag;
+    typedef cryptoInterfaces::CryptoCodecInterface::Tag Tag;
 
     EncryptionKeyPropertyCodecState() noexcept;
     ~EncryptionKeyPropertyCodecState() noexcept;
@@ -275,7 +275,7 @@ class EncryptionKeyPropertyCodecState {
     EncryptionProperty* m_asn1Data;
 };
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIES_PRIVATE_ENCRYPTIONKEYPROPERTYCODECSTATE_H_
+#endif  // ACSDK_PROPERTIES_PRIVATE_ENCRYPTIONKEYPROPERTYCODECSTATE_H_
diff --git a/core/Properties/Properties/privateInclude/acsdk/Properties/private/Logging.h b/core/Properties/Properties/privateInclude/acsdk/Properties/private/Logging.h
new file mode 100644
index 0000000000..10f5a49d75
--- /dev/null
+++ b/core/Properties/Properties/privateInclude/acsdk/Properties/private/Logging.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_PROPERTIES_PRIVATE_LOGGING_H_
+#define ACSDK_PROPERTIES_PRIVATE_LOGGING_H_
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/**
+ * @brief Create a LogEntry.
+ *
+ * Create a LogEntry using TAG constant and the specified event string.
+ *
+ * @param[in] event The event string for this @c LogEntry.
+ * @private
+ * @ingroup properties
+ */
+#define LX(event) ::alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+/**
+ * @brief Create a LogEntry for configuration event.
+ *
+ * @param[in] event The event string for this @c LogEntry.
+ * @param[in] configUri Configuration URI.
+ * @private
+ * @ingroup properties
+ */
+#define LX_CFG(event, configUri) LX(event).d(::alexaClientSDK::properties::CONFIG_URI, configUri)
+
+/**
+ * @brief Create a LogEntry for configuration event.
+ *
+ * @param[in] event The event string for this @c LogEntry.
+ * @param[in] configUri Configuration URI.
+ * @param[in] key Key name.
+ * @private
+ * @ingroup properties
+ */
+#define LX_CFG_KEY(event, configUri, key) LX_CFG(event, configUri).d(::alexaClientSDK::properties::KEY, key)
+
+/**
+ * @brief Macro to help compiler happy when variable is unused.
+ *
+ * When variables are passed for logging events, compiler complains when logging is disabled (as variables become
+ * unused. This macro marks variable as used to suppress build errors.
+ *
+ * @param[in] var Variable name.
+ *
+ * @private
+ * @ingroup properties
+ */
+#define ACSDK_UNUSED_VARIABLE(var) (void)var
+
+namespace alexaClientSDK {
+namespace avsCommon {
+namespace utils {
+namespace logger {
+
+template <>
+LogEntry& LogEntry::d(const char* key, const std::vector<unsigned char>& value);
+
+}  // namespace logger
+}  // namespace utils
+}  // namespace avsCommon
+}  // namespace alexaClientSDK
+
+namespace alexaClientSDK {
+namespace properties {
+
+/// String to identify config URI.
+/// @private
+extern const std::string CONFIG_URI;
+
+/// String to identify key.
+/// @private
+extern const std::string KEY;
+
+}  // namespace properties
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_PROPERTIES_PRIVATE_LOGGING_H_
diff --git a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/MiscStorageProperties.h b/core/Properties/Properties/privateInclude/acsdk/Properties/private/MiscStorageProperties.h
similarity index 87%
rename from core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/MiscStorageProperties.h
rename to core/Properties/Properties/privateInclude/acsdk/Properties/private/MiscStorageProperties.h
index 69bbb77f62..3dc439978a 100644
--- a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/MiscStorageProperties.h
+++ b/core/Properties/Properties/privateInclude/acsdk/Properties/private/MiscStorageProperties.h
@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIES_PRIVATE_MISCSTORAGEPROPERTIES_H_
-#define ACSDKPROPERTIES_PRIVATE_MISCSTORAGEPROPERTIES_H_
+#ifndef ACSDK_PROPERTIES_PRIVATE_MISCSTORAGEPROPERTIES_H_
+#define ACSDK_PROPERTIES_PRIVATE_MISCSTORAGEPROPERTIES_H_
 
 #include <memory>
 
-#include <acsdkPropertiesInterfaces/PropertiesInterface.h>
-#include <acsdkProperties/private/RetryExecutor.h>
+#include <acsdk/PropertiesInterfaces/PropertiesInterface.h>
+#include <acsdk/Properties/private/RetryExecutor.h>
 #include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 /**
  * @brief Properties for MiscStorageInterface.
@@ -32,12 +32,12 @@ namespace acsdkProperties {
  *
  * This class is thread safe and can be shared between multiple consumers.
  *
- * @see alexaClientSDK::acsdkPropertiesInterfaces::PropertiesInterface
+ * @see alexaClientSDK::propertiesInterfaces::PropertiesInterface
  * @see alexaClientSDK::avsCommon::sdkInterfaces::storage::MiscStorageInterface
  *
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
-class MiscStorageProperties : public alexaClientSDK::acsdkPropertiesInterfaces::PropertiesInterface {
+class MiscStorageProperties : public alexaClientSDK::propertiesInterfaces::PropertiesInterface {
 public:
     /**
      * @brief Factory method.
@@ -110,7 +110,7 @@ class MiscStorageProperties : public alexaClientSDK::acsdkPropertiesInterfaces::
     const std::string m_tableName;
 };
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIES_PRIVATE_MISCSTORAGEPROPERTIES_H_
+#endif  // ACSDK_PROPERTIES_PRIVATE_MISCSTORAGEPROPERTIES_H_
diff --git a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/MiscStoragePropertiesFactory.h b/core/Properties/Properties/privateInclude/acsdk/Properties/private/MiscStoragePropertiesFactory.h
similarity index 80%
rename from core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/MiscStoragePropertiesFactory.h
rename to core/Properties/Properties/privateInclude/acsdk/Properties/private/MiscStoragePropertiesFactory.h
index fb9fd8af22..2eb0cf45a3 100644
--- a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/MiscStoragePropertiesFactory.h
+++ b/core/Properties/Properties/privateInclude/acsdk/Properties/private/MiscStoragePropertiesFactory.h
@@ -13,28 +13,28 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIES_PRIVATE_MISCSTORAGEPROPERTIESFACTORY_H_
-#define ACSDKPROPERTIES_PRIVATE_MISCSTORAGEPROPERTIESFACTORY_H_
+#ifndef ACSDK_PROPERTIES_PRIVATE_MISCSTORAGEPROPERTIESFACTORY_H_
+#define ACSDK_PROPERTIES_PRIVATE_MISCSTORAGEPROPERTIESFACTORY_H_
 
 #include <mutex>
 
-#include <acsdkPropertiesInterfaces/PropertiesFactoryInterface.h>
-#include <acsdkProperties/MiscStorageAdapter.h>
+#include <acsdk/PropertiesInterfaces/PropertiesFactoryInterface.h>
+#include <acsdk/Properties/MiscStorageAdapter.h>
 #include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-using alexaClientSDK::acsdkPropertiesInterfaces::PropertiesFactoryInterface;
-using alexaClientSDK::acsdkPropertiesInterfaces::PropertiesInterface;
 using alexaClientSDK::avsCommon::sdkInterfaces::storage::MiscStorageInterface;
+using alexaClientSDK::propertiesInterfaces::PropertiesFactoryInterface;
+using alexaClientSDK::propertiesInterfaces::PropertiesInterface;
 
 /**
  * @brief Properties factory for MiscStorageInterface.
  *
  * This class adapts \ref MiscStorageInterface into \ref PropertiesFactoryInterface.
  *
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 class MiscStoragePropertiesFactory : public PropertiesFactoryInterface {
 public:
@@ -71,7 +71,7 @@ class MiscStoragePropertiesFactory : public PropertiesFactoryInterface {
     std::unordered_map<std::string, std::weak_ptr<PropertiesInterface>> m_openProperties;
 };
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIES_PRIVATE_MISCSTORAGEPROPERTIESFACTORY_H_
+#endif  // ACSDK_PROPERTIES_PRIVATE_MISCSTORAGEPROPERTIESFACTORY_H_
diff --git a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/RetryExecutor.h b/core/Properties/Properties/privateInclude/acsdk/Properties/private/RetryExecutor.h
similarity index 96%
rename from core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/RetryExecutor.h
rename to core/Properties/Properties/privateInclude/acsdk/Properties/private/RetryExecutor.h
index f02b89921e..5084a0298e 100644
--- a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/RetryExecutor.h
+++ b/core/Properties/Properties/privateInclude/acsdk/Properties/private/RetryExecutor.h
@@ -13,17 +13,17 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIES_PRIVATE_RETRYEXECUTOR_H_
-#define ACSDKPROPERTIES_PRIVATE_RETRYEXECUTOR_H_
+#ifndef ACSDK_PROPERTIES_PRIVATE_RETRYEXECUTOR_H_
+#define ACSDK_PROPERTIES_PRIVATE_RETRYEXECUTOR_H_
 
 #include <functional>
 #include <mutex>
 #include <thread>
 
-#include <acsdkProperties/ErrorCallbackInterface.h>
+#include <acsdk/Properties/ErrorCallbackInterface.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 /**
  * @brief Tracked operation types for error callbacks.
@@ -109,7 +109,7 @@ typedef std::pair<StatusCode, bool> StatusCodeWithRetry;
  * @sa ErrorCallbackInterface
  * @sa setErrorCallback()
  *
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 class RetryExecutor {
 public:
@@ -152,7 +152,7 @@ class RetryExecutor {
      * @return Boolean indicating operation success. On failure, contents of *previous is undefined and false is
      * returned.
      *
-     * @ingroup PropertiesIMPL
+     * @ingroup Lib_acsdkProperties
      */
     static bool setErrorCallback(
         const std::weak_ptr<ErrorCallbackInterface>& callback,
@@ -245,7 +245,7 @@ class RetryExecutor {
     std::shared_ptr<ErrorCallbackInterface> m_callback;
 };
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIES_PRIVATE_RETRYEXECUTOR_H_
+#endif  // ACSDK_PROPERTIES_PRIVATE_RETRYEXECUTOR_H_
diff --git a/core/Properties/acsdkProperties/src/Asn1Helper.cpp b/core/Properties/Properties/src/Asn1Helper.cpp
similarity index 94%
rename from core/Properties/acsdkProperties/src/Asn1Helper.cpp
rename to core/Properties/Properties/src/Asn1Helper.cpp
index 324e25adb2..e14dee2ea0 100644
--- a/core/Properties/acsdkProperties/src/Asn1Helper.cpp
+++ b/core/Properties/Properties/src/Asn1Helper.cpp
@@ -15,23 +15,23 @@
 
 #include <string.h>
 
-#include <acsdkProperties/private/Asn1Helper.h>
-#include <acsdkProperties/private/Asn1Types.h>
-#include <acsdkProperties/private/Logging.h>
+#include <acsdk/Properties/private/Asn1Helper.h>
+#include <acsdk/Properties/private/Asn1Types.h>
+#include <acsdk/Properties/private/Logging.h>
 
 /**
  * @brief Macro for cutting off OpenSSL features introduced before 1.1.0 release.
  * @private
- * @ingroup PropertiesIMPL
+ * @ingroup Lib_acsdkProperties
  */
 #define OPENSSL_VERSION_NUMBER_1_1_0 0x10100000L
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"Asn1Helper"};
+#define TAG "Asn1Helper"
 
 /// OK status code for some OpenSSL operations.
 /// @private
@@ -94,7 +94,7 @@ bool Asn1Helper::setStr(ASN1_UTF8STRING*& asn1String, const std::string& value)
         ACSDK_ERROR(LX("setStrFailed").m("newStringFailed"));
         return false;
     } else {
-        return OPENSSL_OK == ASN1_STRING_set(asn1String, value.c_str(), value.size());
+        return OPENSSL_OK == ASN1_STRING_set(asn1String, value.c_str(), static_cast<int>(value.size()));
     }
 }
 
@@ -118,7 +118,7 @@ bool Asn1Helper::setData(ASN1_OCTET_STRING*& asn1String, const Bytes& value) noe
         ACSDK_ERROR(LX("setDataFailed").m("newOctetStringFailed"));
         return false;
     } else {
-        return OPENSSL_OK == ASN1_OCTET_STRING_set(asn1String, value.data(), value.size());
+        return OPENSSL_OK == ASN1_OCTET_STRING_set(asn1String, value.data(), static_cast<int>(value.size()));
     }
 }
 
@@ -186,5 +186,5 @@ bool Asn1Helper::convertDigTypeFromAsn1(int64_t asn1Type, DigestType& type) noex
     return true;
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/Asn1Types.cpp b/core/Properties/Properties/src/Asn1Types.cpp
similarity index 95%
rename from core/Properties/acsdkProperties/src/Asn1Types.cpp
rename to core/Properties/Properties/src/Asn1Types.cpp
index 0765a0bcb8..b001ae210f 100644
--- a/core/Properties/acsdkProperties/src/Asn1Types.cpp
+++ b/core/Properties/Properties/src/Asn1Types.cpp
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkProperties/private/Asn1Types.h>
+#include <acsdk/Properties/private/Asn1Types.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 ASN1_SEQUENCE(ACSDK_ENC_INFO) = {
     ASN1_EXP_OPT(ACSDK_ENC_INFO, version, ASN1_INTEGER, 0),
@@ -52,5 +52,5 @@ ASN1_SEQUENCE(ACSDK_DATA_PROP) = {
 } ASN1_SEQUENCE_END(ACSDK_DATA_PROP);
 IMPLEMENT_ASN1_FUNCTIONS(ACSDK_DATA_PROP);
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/CMakeLists.txt b/core/Properties/Properties/src/CMakeLists.txt
similarity index 100%
rename from core/Properties/acsdkProperties/src/CMakeLists.txt
rename to core/Properties/Properties/src/CMakeLists.txt
diff --git a/core/Properties/acsdkProperties/src/DataPropertyCodec.cpp b/core/Properties/Properties/src/DataPropertyCodec.cpp
similarity index 94%
rename from core/Properties/acsdkProperties/src/DataPropertyCodec.cpp
rename to core/Properties/Properties/src/DataPropertyCodec.cpp
index 27d69f4fcb..5101976b6a 100644
--- a/core/Properties/acsdkProperties/src/DataPropertyCodec.cpp
+++ b/core/Properties/Properties/src/DataPropertyCodec.cpp
@@ -15,18 +15,18 @@
 
 #include <stdlib.h>
 
-#include <acsdkProperties/private/DataPropertyCodec.h>
-#include <acsdkProperties/private/DataPropertyCodecState.h>
-#include <acsdkProperties/private/Logging.h>
+#include <acsdk/Properties/private/DataPropertyCodec.h>
+#include <acsdk/Properties/private/DataPropertyCodecState.h>
+#include <acsdk/Properties/private/Logging.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"DataPropertyCodec"};
+#define TAG "DataPropertyCodec"
 
 /// @private
 static constexpr DigestType DEFAULT_DIGEST_TYPE = DigestType::SHA_256;
@@ -195,5 +195,5 @@ bool DataPropertyCodec::decode(
     return true;
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/DataPropertyCodecState.cpp b/core/Properties/Properties/src/DataPropertyCodecState.cpp
similarity index 92%
rename from core/Properties/acsdkProperties/src/DataPropertyCodecState.cpp
rename to core/Properties/Properties/src/DataPropertyCodecState.cpp
index 8224def5c6..a49caf7974 100644
--- a/core/Properties/acsdkProperties/src/DataPropertyCodecState.cpp
+++ b/core/Properties/Properties/src/DataPropertyCodecState.cpp
@@ -15,18 +15,18 @@
 
 #include <stdlib.h>
 
-#include <acsdkProperties/private/Asn1Helper.h>
-#include <acsdkProperties/private/DataPropertyCodecState.h>
-#include <acsdkProperties/private/Logging.h>
+#include <acsdk/Properties/private/Asn1Helper.h>
+#include <acsdk/Properties/private/DataPropertyCodecState.h>
+#include <acsdk/Properties/private/Logging.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"DataPropertyCodecState"};
+#define TAG "DataPropertyCodecState"
 
 DataPropertyCodecState::DataPropertyCodecState() noexcept {
     m_asn1Data = nullptr;
@@ -148,7 +148,7 @@ bool DataPropertyCodecState::decode(const DataBlock& der) noexcept {
         m_asn1Data = nullptr;
     }
     const unsigned char* data = der.data();
-    m_asn1Data = d2i_ACSDK_DATA_PROP(nullptr, &data, der.size());
+    m_asn1Data = d2i_ACSDK_DATA_PROP(nullptr, &data, static_cast<long>(der.size()));
     if (!m_asn1Data || !m_asn1Data->dataInfo) {
         ACSDK_ERROR(LX("decodeFailed").m("derDecodeFailed"));
         return false;
@@ -157,5 +157,5 @@ bool DataPropertyCodecState::decode(const DataBlock& der) noexcept {
     return true;
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/EncryptedProperties.cpp b/core/Properties/Properties/src/EncryptedProperties.cpp
similarity index 98%
rename from core/Properties/acsdkProperties/src/EncryptedProperties.cpp
rename to core/Properties/Properties/src/EncryptedProperties.cpp
index f410d3a92e..d42914ba07 100644
--- a/core/Properties/acsdkProperties/src/EncryptedProperties.cpp
+++ b/core/Properties/Properties/src/EncryptedProperties.cpp
@@ -15,22 +15,22 @@
 
 #include <unordered_map>
 
-#include <acsdkProperties/private/DataPropertyCodec.h>
-#include <acsdkProperties/private/EncryptedProperties.h>
-#include <acsdkProperties/private/EncryptionKeyPropertyCodec.h>
-#include <acsdkProperties/private/RetryExecutor.h>
-#include <acsdkProperties/private/Logging.h>
-#include <acsdkCodecUtils/Hex.h>
+#include <acsdk/Properties/private/DataPropertyCodec.h>
+#include <acsdk/Properties/private/EncryptedProperties.h>
+#include <acsdk/Properties/private/EncryptionKeyPropertyCodec.h>
+#include <acsdk/Properties/private/RetryExecutor.h>
+#include <acsdk/Properties/private/Logging.h>
+#include <acsdk/CodecUtils/Hex.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-using namespace ::alexaClientSDK::acsdkPropertiesInterfaces;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::propertiesInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"EncryptedProperties"};
+#define TAG "EncryptedProperties"
 /// @private
 static const std::string KEY_PROPERTY_NAME = "$acsdkEncryption$";
 /// @private
@@ -817,5 +817,5 @@ bool EncryptedProperties::decodeAndDecryptPropertyValue(
     return true;
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/Properties/src/EncryptedPropertiesFactories.cpp b/core/Properties/Properties/src/EncryptedPropertiesFactories.cpp
new file mode 100644
index 0000000000..4200ff0690
--- /dev/null
+++ b/core/Properties/Properties/src/EncryptedPropertiesFactories.cpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdk/Properties/MiscStorageAdapter.h>
+#include <acsdk/Properties/private/EncryptedPropertiesFactory.h>
+#include <acsdk/Properties/private/Logging.h>
+
+namespace alexaClientSDK {
+namespace properties {
+
+using namespace ::alexaClientSDK::avsCommon::sdkInterfaces::storage;
+using namespace ::alexaClientSDK::cryptoInterfaces;
+
+/// String to identify log entries originating from this file.
+/// @private
+#define TAG "EncryptedPropertiesFactoryApi"
+
+std::shared_ptr<PropertiesFactoryInterface> createEncryptedPropertiesFactory(
+    const std::shared_ptr<PropertiesFactoryInterface>& innerPropertiesFactory,
+    const std::shared_ptr<CryptoFactoryInterface>& cryptoFactory,
+    const std::shared_ptr<KeyStoreInterface>& keyStore) noexcept {
+    auto res = EncryptedPropertiesFactory::create(innerPropertiesFactory, cryptoFactory, keyStore);
+    if (!res) {
+        ACSDK_ERROR(LX("createEncryptedPropertiesFactoryFailed"));
+    }
+    return res;
+}
+
+std::shared_ptr<alexaClientSDK::propertiesInterfaces::PropertiesFactoryInterface> createEncryptedPropertiesFactory(
+    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::storage::MiscStorageInterface>& innerStorage,
+    const std::shared_ptr<MiscStorageUriMapperInterface>& uriMapper,
+    const std::shared_ptr<alexaClientSDK::cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+    const std::shared_ptr<alexaClientSDK::cryptoInterfaces::KeyStoreInterface>& keyStore) noexcept {
+    auto adapter = createPropertiesFactory(innerStorage, uriMapper);
+    if (!adapter) {
+        ACSDK_ERROR(LX("createEncryptedPropertiesFactoryFailed").d("reason", "miscStorageAdapterCreateFailed"));
+        return nullptr;
+    }
+    return createEncryptedPropertiesFactory(adapter, cryptoFactory, keyStore);
+}
+
+}  // namespace properties
+}  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/EncryptedPropertiesFactory.cpp b/core/Properties/Properties/src/EncryptedPropertiesFactory.cpp
similarity index 84%
rename from core/Properties/acsdkProperties/src/EncryptedPropertiesFactory.cpp
rename to core/Properties/Properties/src/EncryptedPropertiesFactory.cpp
index 9889ad806a..99836a3930 100644
--- a/core/Properties/acsdkProperties/src/EncryptedPropertiesFactory.cpp
+++ b/core/Properties/Properties/src/EncryptedPropertiesFactory.cpp
@@ -13,20 +13,20 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkProperties/private/EncryptedPropertiesFactory.h>
-#include <acsdkProperties/private/EncryptedProperties.h>
-#include <acsdkProperties/private/Logging.h>
+#include <acsdk/Properties/private/EncryptedPropertiesFactory.h>
+#include <acsdk/Properties/private/EncryptedProperties.h>
+#include <acsdk/Properties/private/Logging.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 using namespace ::alexaClientSDK::avsCommon::sdkInterfaces::storage;
-using namespace ::alexaClientSDK::acsdkPropertiesInterfaces;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::propertiesInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"EncryptedPropertiesFactory"};
+#define TAG "EncryptedPropertiesFactory"
 
 std::shared_ptr<PropertiesFactoryInterface> EncryptedPropertiesFactory::create(
     const std::shared_ptr<PropertiesFactoryInterface>& innerFactory,
@@ -68,5 +68,5 @@ std::shared_ptr<PropertiesInterface> EncryptedPropertiesFactory::getProperties(c
     return EncryptedProperties::create(configUri, m_storage->getProperties(configUri), m_cryptoFactory, m_keyStore);
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/EncryptionKeyPropertyCodec.cpp b/core/Properties/Properties/src/EncryptionKeyPropertyCodec.cpp
similarity index 89%
rename from core/Properties/acsdkProperties/src/EncryptionKeyPropertyCodec.cpp
rename to core/Properties/Properties/src/EncryptionKeyPropertyCodec.cpp
index dde01a4043..1ccfd2ee29 100644
--- a/core/Properties/acsdkProperties/src/EncryptionKeyPropertyCodec.cpp
+++ b/core/Properties/Properties/src/EncryptionKeyPropertyCodec.cpp
@@ -15,33 +15,33 @@
 
 #include <stdlib.h>
 
-#include <acsdkProperties/private/Asn1Helper.h>
-#include <acsdkProperties/private/EncryptionKeyPropertyCodec.h>
-#include <acsdkProperties/private/EncryptionKeyPropertyCodecState.h>
-#include <acsdkProperties/private/Logging.h>
+#include <acsdk/Properties/private/Asn1Helper.h>
+#include <acsdk/Properties/private/EncryptionKeyPropertyCodec.h>
+#include <acsdk/Properties/private/EncryptionKeyPropertyCodecState.h>
+#include <acsdk/Properties/private/Logging.h>
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"EncryptionKeyPropertyCodec"};
+#define TAG "EncryptionKeyPropertyCodec"
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 /// Default digest type used when creating new digests.
 /// @private
 static constexpr DigestType DEFAULT_DIGEST_TYPE = DigestType::SHA_256;
 
 bool EncryptionKeyPropertyCodec::encode(
-    const std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+    const std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
     const std::string& mainKeyAlias,
     const KeyChecksum& mainKeyChecksum,
-    alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType dataKeyAlgorithm,
+    alexaClientSDK::cryptoInterfaces::AlgorithmType dataKeyAlgorithm,
     const IV& dataKeyIV,
     const DataBlock& dataKeyCiphertext,
     const Tag& dataKeyTag,
-    alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType dataAlgorithm,
+    alexaClientSDK::cryptoInterfaces::AlgorithmType dataAlgorithm,
     Bytes& derEncoded) noexcept {
     DigestType digestType = DEFAULT_DIGEST_TYPE;
 
@@ -139,15 +139,15 @@ bool EncryptionKeyPropertyCodec::encode(
 }
 
 bool EncryptionKeyPropertyCodec::decode(
-    const std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
+    const std::shared_ptr<cryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
     const Bytes& derEncoded,
     std::string& mainKeyAlias,
     KeyChecksum& mainKeyChecksum,
-    alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType& dataKeyAlgorithm,
+    alexaClientSDK::cryptoInterfaces::AlgorithmType& dataKeyAlgorithm,
     IV& dataKeyIV,
     DataBlock& dataKeyCiphertext,
     Tag& dataKeyTag,
-    alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType& dataAlgorithm,
+    alexaClientSDK::cryptoInterfaces::AlgorithmType& dataAlgorithm,
     DataBlock& digestDecoded,
     DataBlock& digestActual) noexcept {
     if (!cryptoFactory) {
@@ -244,5 +244,5 @@ bool EncryptionKeyPropertyCodec::decode(
     return true;
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/EncryptionKeyPropertyCodecState.cpp b/core/Properties/Properties/src/EncryptionKeyPropertyCodecState.cpp
similarity index 94%
rename from core/Properties/acsdkProperties/src/EncryptionKeyPropertyCodecState.cpp
rename to core/Properties/Properties/src/EncryptionKeyPropertyCodecState.cpp
index c2731cb928..abd48a816f 100644
--- a/core/Properties/acsdkProperties/src/EncryptionKeyPropertyCodecState.cpp
+++ b/core/Properties/Properties/src/EncryptionKeyPropertyCodecState.cpp
@@ -15,14 +15,14 @@
 
 #include <stdlib.h>
 
-#include <acsdkProperties/private/EncryptionKeyPropertyCodec.h>
-#include <acsdkProperties/private/EncryptionKeyPropertyCodecState.h>
-#include <acsdkProperties/private/Asn1Helper.h>
+#include <acsdk/Properties/private/EncryptionKeyPropertyCodec.h>
+#include <acsdk/Properties/private/EncryptionKeyPropertyCodecState.h>
+#include <acsdk/Properties/private/Asn1Helper.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
 
 EncryptionKeyPropertyCodecState::EncryptionKeyPropertyCodecState() noexcept {
     m_asn1Data = nullptr;
@@ -180,7 +180,7 @@ bool EncryptionKeyPropertyCodecState::decode(const std::vector<uint8_t>& der) no
         m_asn1Data = nullptr;
     }
     const unsigned char* data = der.data();
-    m_asn1Data = d2i_ACSDK_ENC_PROP(nullptr, &data, der.size());
+    m_asn1Data = d2i_ACSDK_ENC_PROP(nullptr, &data, static_cast<long>(der.size()));
     if (!m_asn1Data) {
         return false;
     }
@@ -188,5 +188,5 @@ bool EncryptionKeyPropertyCodecState::decode(const std::vector<uint8_t>& der) no
     return true;
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/ErrorCallbackSetter.cpp b/core/Properties/Properties/src/ErrorCallbackSetter.cpp
similarity index 84%
rename from core/Properties/acsdkProperties/src/ErrorCallbackSetter.cpp
rename to core/Properties/Properties/src/ErrorCallbackSetter.cpp
index ec716f7ec5..d4721ecf77 100644
--- a/core/Properties/acsdkProperties/src/ErrorCallbackSetter.cpp
+++ b/core/Properties/Properties/src/ErrorCallbackSetter.cpp
@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkProperties/ErrorCallbackSetter.h>
-#include <acsdkProperties/private/RetryExecutor.h>
+#include <acsdk/Properties/ErrorCallbackSetter.h>
+#include <acsdk/Properties/private/RetryExecutor.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 bool setErrorCallback(
     const std::weak_ptr<ErrorCallbackInterface>& callback,
@@ -26,5 +26,5 @@ bool setErrorCallback(
     return RetryExecutor::setErrorCallback(callback, maxRetries, previous);
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/Logging.cpp b/core/Properties/Properties/src/Logging.cpp
similarity index 85%
rename from core/Properties/acsdkProperties/src/Logging.cpp
rename to core/Properties/Properties/src/Logging.cpp
index 5b5d1dfc89..aceacca4d3 100644
--- a/core/Properties/acsdkProperties/src/Logging.cpp
+++ b/core/Properties/Properties/src/Logging.cpp
@@ -15,8 +15,8 @@
 
 #include <unordered_map>
 
-#include <acsdkProperties/private/Logging.h>
-#include <acsdkCodecUtils/Hex.h>
+#include <acsdk/Properties/private/Logging.h>
+#include <acsdk/CodecUtils/Hex.h>
 
 namespace alexaClientSDK {
 namespace avsCommon {
@@ -27,7 +27,7 @@ template <>
 LogEntry& LogEntry::d(const char* key, const std::vector<unsigned char>& value) {
     prefixKeyValuePair();
     std::string hexValue;
-    alexaClientSDK::acsdkCodecUtils::encodeHex(value, hexValue);
+    alexaClientSDK::codecUtils::encodeHex(value, hexValue);
     m_stream << key << KEY_VALUE_SEPARATOR << hexValue;
     return *this;
 }
@@ -38,10 +38,10 @@ LogEntry& LogEntry::d(const char* key, const std::vector<unsigned char>& value)
 }  // namespace alexaClientSDK
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 const std::string CONFIG_URI{"configUri"};
 const std::string KEY{"key"};
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/MiscStorageAdapter.cpp b/core/Properties/Properties/src/MiscStorageAdapter.cpp
similarity index 81%
rename from core/Properties/acsdkProperties/src/MiscStorageAdapter.cpp
rename to core/Properties/Properties/src/MiscStorageAdapter.cpp
index 0fe8f5d783..656ebd017b 100644
--- a/core/Properties/acsdkProperties/src/MiscStorageAdapter.cpp
+++ b/core/Properties/Properties/src/MiscStorageAdapter.cpp
@@ -13,18 +13,18 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkProperties/MiscStorageAdapter.h>
-#include <acsdkProperties/private/MiscStoragePropertiesFactory.h>
-#include <acsdkProperties/private/Logging.h>
+#include <acsdk/Properties/MiscStorageAdapter.h>
+#include <acsdk/Properties/private/MiscStoragePropertiesFactory.h>
+#include <acsdk/Properties/private/Logging.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 using namespace alexaClientSDK::avsCommon::sdkInterfaces::storage;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"MiscStorageAdapter"};
+#define TAG "MiscStorageAdapter"
 
 std::shared_ptr<PropertiesFactoryInterface> createPropertiesFactory(
     const std::shared_ptr<MiscStorageInterface>& innerStorage,
@@ -36,5 +36,5 @@ std::shared_ptr<PropertiesFactoryInterface> createPropertiesFactory(
     return res;
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/MiscStorageProperties.cpp b/core/Properties/Properties/src/MiscStorageProperties.cpp
similarity index 97%
rename from core/Properties/acsdkProperties/src/MiscStorageProperties.cpp
rename to core/Properties/Properties/src/MiscStorageProperties.cpp
index 256aa33078..e065d983a8 100644
--- a/core/Properties/acsdkProperties/src/MiscStorageProperties.cpp
+++ b/core/Properties/Properties/src/MiscStorageProperties.cpp
@@ -14,20 +14,20 @@
  */
 #include <algorithm>
 
-#include <acsdkCodecUtils/Base64.h>
-#include <acsdkProperties/private/RetryExecutor.h>
-#include <acsdkProperties/private/MiscStorageProperties.h>
-#include <acsdkProperties/private/Logging.h>
+#include <acsdk/CodecUtils/Base64.h>
+#include <acsdk/Properties/private/RetryExecutor.h>
+#include <acsdk/Properties/private/MiscStorageProperties.h>
+#include <acsdk/Properties/private/Logging.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 using namespace ::alexaClientSDK::avsCommon::sdkInterfaces::storage;
-using namespace ::alexaClientSDK::acsdkCodecUtils;
+using namespace ::alexaClientSDK::codecUtils;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"MiscStorageProperties"};
+#define TAG "MiscStorageProperties"
 
 std::shared_ptr<MiscStorageProperties> MiscStorageProperties::create(
     const std::shared_ptr<MiscStorageInterface>& storage,
@@ -373,5 +373,5 @@ bool MiscStorageProperties::clearAllValuesWithRetries(RetryExecutor& executor) n
     return true;
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/MiscStoragePropertiesFactory.cpp b/core/Properties/Properties/src/MiscStoragePropertiesFactory.cpp
similarity index 90%
rename from core/Properties/acsdkProperties/src/MiscStoragePropertiesFactory.cpp
rename to core/Properties/Properties/src/MiscStoragePropertiesFactory.cpp
index fabdffcb29..a39c19de32 100644
--- a/core/Properties/acsdkProperties/src/MiscStoragePropertiesFactory.cpp
+++ b/core/Properties/Properties/src/MiscStoragePropertiesFactory.cpp
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkProperties/private/MiscStorageProperties.h>
-#include <acsdkProperties/private/MiscStoragePropertiesFactory.h>
-#include <acsdkProperties/private/Logging.h>
+#include <acsdk/Properties/private/MiscStorageProperties.h>
+#include <acsdk/Properties/private/MiscStoragePropertiesFactory.h>
+#include <acsdk/Properties/private/Logging.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-using namespace alexaClientSDK::acsdkPropertiesInterfaces;
+using namespace alexaClientSDK::propertiesInterfaces;
 using namespace alexaClientSDK::avsCommon::sdkInterfaces::storage;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"MiscStoragePropertiesFactory"};
+#define TAG "MiscStoragePropertiesFactory"
 
 std::shared_ptr<PropertiesFactoryInterface> MiscStoragePropertiesFactory::create(
     const std::shared_ptr<MiscStorageInterface>& storage,
@@ -104,5 +104,5 @@ std::shared_ptr<PropertiesInterface> MiscStoragePropertiesFactory::getProperties
     return result;
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/RetryExecutor.cpp b/core/Properties/Properties/src/RetryExecutor.cpp
similarity index 96%
rename from core/Properties/acsdkProperties/src/RetryExecutor.cpp
rename to core/Properties/Properties/src/RetryExecutor.cpp
index 248fe500f1..aa15b2fe61 100644
--- a/core/Properties/acsdkProperties/src/RetryExecutor.cpp
+++ b/core/Properties/Properties/src/RetryExecutor.cpp
@@ -13,16 +13,16 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkProperties/ErrorCallbackSetter.h>
-#include <acsdkProperties/private/RetryExecutor.h>
-#include <acsdkProperties/private/Logging.h>
+#include <acsdk/Properties/ErrorCallbackSetter.h>
+#include <acsdk/Properties/private/RetryExecutor.h>
+#include <acsdk/Properties/private/Logging.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"RetryExecutor"};
+#define TAG "RetryExecutor"
 
 const StatusCodeWithRetry RetryExecutor::SUCCESS{StatusCode::SUCCESS, false};
 const StatusCodeWithRetry RetryExecutor::RETRYABLE_CRYPTO_ERROR{StatusCode::CRYPTO_ERROR, true};
@@ -156,5 +156,5 @@ bool RetryExecutor::isValidContinueAction(Action continueAction) noexcept {
     }
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/src/SimpleMiscStorageUriMapper.cpp b/core/Properties/Properties/src/SimpleMiscStorageUriMapper.cpp
similarity index 88%
rename from core/Properties/acsdkProperties/src/SimpleMiscStorageUriMapper.cpp
rename to core/Properties/Properties/src/SimpleMiscStorageUriMapper.cpp
index 3dd8373869..3033e5c2e3 100644
--- a/core/Properties/acsdkProperties/src/SimpleMiscStorageUriMapper.cpp
+++ b/core/Properties/Properties/src/SimpleMiscStorageUriMapper.cpp
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkProperties/MiscStorageAdapter.h>
-#include <acsdkProperties/private/Logging.h>
+#include <acsdk/Properties/MiscStorageAdapter.h>
+#include <acsdk/Properties/private/Logging.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 
-static const std::string TAG{"SimpleMiscStorageUriMapper"};
+#define TAG "SimpleMiscStorageUriMapper"
 
 std::shared_ptr<SimpleMiscStorageUriMapper> SimpleMiscStorageUriMapper::create(char sep) noexcept {
     return std::shared_ptr<SimpleMiscStorageUriMapper>(new SimpleMiscStorageUriMapper(sep));
@@ -47,5 +47,5 @@ bool SimpleMiscStorageUriMapper::extractComponentAndTableName(
     }
 }
 
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/test/CMakeLists.txt b/core/Properties/Properties/test/CMakeLists.txt
similarity index 100%
rename from core/Properties/acsdkProperties/test/CMakeLists.txt
rename to core/Properties/Properties/test/CMakeLists.txt
diff --git a/core/Properties/acsdkProperties/test/MiscStoragePropertiesFactoryTest.cpp b/core/Properties/Properties/test/MiscStoragePropertiesFactoryTest.cpp
similarity index 97%
rename from core/Properties/acsdkProperties/test/MiscStoragePropertiesFactoryTest.cpp
rename to core/Properties/Properties/test/MiscStoragePropertiesFactoryTest.cpp
index 04d76e6f56..ecb433aeb7 100644
--- a/core/Properties/acsdkProperties/test/MiscStoragePropertiesFactoryTest.cpp
+++ b/core/Properties/Properties/test/MiscStoragePropertiesFactoryTest.cpp
@@ -18,11 +18,11 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <acsdkProperties/private/MiscStoragePropertiesFactory.h>
+#include <acsdk/Properties/private/MiscStoragePropertiesFactory.h>
 #include <AVSCommon/SDKInterfaces/Storage/MockMiscStorage.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 namespace test {
 
 using namespace ::testing;
@@ -138,5 +138,5 @@ TEST(MiscStoragePropertiesFactoryTest, test_createPropertiesFailsToCreateTable)
 }
 
 }  // namespace test
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/test/MiscStoragePropertiesTest.cpp b/core/Properties/Properties/test/MiscStoragePropertiesTest.cpp
similarity index 98%
rename from core/Properties/acsdkProperties/test/MiscStoragePropertiesTest.cpp
rename to core/Properties/Properties/test/MiscStoragePropertiesTest.cpp
index f540c3a20a..b8e4d16b9b 100644
--- a/core/Properties/acsdkProperties/test/MiscStoragePropertiesTest.cpp
+++ b/core/Properties/Properties/test/MiscStoragePropertiesTest.cpp
@@ -18,7 +18,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <acsdkProperties/private/MiscStorageProperties.h>
+#include <acsdk/Properties/private/MiscStorageProperties.h>
 #include <AVSCommon/SDKInterfaces/Storage/MockMiscStorage.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 
@@ -31,7 +31,7 @@
 #define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 namespace test {
 
 using namespace ::testing;
@@ -40,7 +40,7 @@ using namespace ::alexaClientSDK::avsCommon::sdkInterfaces::storage::test;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"MiscStoragePropertiesTest"};
+#define TAG "MiscStoragePropertiesTest"
 
 /// Test that the constructor.
 TEST(MiscStoragePropertiesTest, testCreatePropertiesTableExists) {
@@ -277,5 +277,5 @@ TEST(MiscStoragePropertiesTest, testClearFailedClearTable) {
 }
 
 }  // namespace test
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/testCrypto/CMakeLists.txt b/core/Properties/Properties/testCrypto/CMakeLists.txt
similarity index 100%
rename from core/Properties/acsdkProperties/testCrypto/CMakeLists.txt
rename to core/Properties/Properties/testCrypto/CMakeLists.txt
diff --git a/core/Properties/acsdkProperties/testCrypto/DataPropertyCodecTest.cpp b/core/Properties/Properties/testCrypto/DataPropertyCodecTest.cpp
similarity index 78%
rename from core/Properties/acsdkProperties/testCrypto/DataPropertyCodecTest.cpp
rename to core/Properties/Properties/testCrypto/DataPropertyCodecTest.cpp
index aac6bcd451..daa35c6031 100644
--- a/core/Properties/acsdkProperties/testCrypto/DataPropertyCodecTest.cpp
+++ b/core/Properties/Properties/testCrypto/DataPropertyCodecTest.cpp
@@ -17,10 +17,10 @@
 #include <gtest/gtest.h>
 #include <string>
 
-#include <acsdkCodecUtils/Hex.h>
-#include <acsdkCryptoInterfaces/test/MockCryptoFactory.h>
-#include <acsdkCryptoInterfaces/test/MockDigest.h>
-#include <acsdkProperties/private/DataPropertyCodec.h>
+#include <acsdk/CodecUtils/Hex.h>
+#include <acsdk/CryptoInterfaces/test/MockCryptoFactory.h>
+#include <acsdk/CryptoInterfaces/test/MockDigest.h>
+#include <acsdk/Properties/private/DataPropertyCodec.h>
 
 // Workaround for GCC < 5.x
 #if (defined(__GNUC__) && (__GNUC___ < 5))
@@ -30,14 +30,14 @@
 #endif
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 namespace test {
 
 using namespace ::testing;
 
-using namespace ::alexaClientSDK::acsdkCodecUtils;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces::test;
+using namespace ::alexaClientSDK::codecUtils;
+using namespace ::alexaClientSDK::cryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces::test;
 
 /// @private
 static const DataPropertyCodec::IV TEST_IV{0x10, 0x10, 0x10, 0x10};
@@ -57,11 +57,11 @@ static const std::string TEST_DER_DIGEST2_HEX{"301630100404101010100404aaaaaaaa0
 TEST(DataPropertyCodecTest, test_encodeDer) {
     auto mockCryptoFactory = std::make_shared<MockCryptoFactory>();
 
-    EXPECT_CALL(*mockCryptoFactory, _createDigest(DigestType::SHA_256))
+    EXPECT_CALL(*mockCryptoFactory, createDigest(DigestType::SHA_256))
         .WillOnce(Invoke([](DigestType type) -> std::unique_ptr<DigestInterface> {
             auto mockDigest = std::unique_ptr<MockDigest>(new MockDigest);
-            EXPECT_CALL(*mockDigest, _process(_)).WillRepeatedly(Return(true));
-            EXPECT_CALL(*mockDigest, _finalize(_)).WillOnce(Invoke([](DigestInterface::DataBlock& res) -> bool {
+            EXPECT_CALL(*mockDigest, process(_)).WillRepeatedly(Return(true));
+            EXPECT_CALL(*mockDigest, finalize(_)).WillOnce(Invoke([](DigestInterface::DataBlock& res) -> bool {
                 res.insert(res.end(), TEST_DIGEST.begin(), TEST_DIGEST.end());
                 return true;
             }));
@@ -79,11 +79,11 @@ TEST(DataPropertyCodecTest, test_encodeDer) {
 TEST(DataPropertyCodecTest, test_decodeDer) {
     auto mockCryptoFactory = std::make_shared<MockCryptoFactory>();
 
-    EXPECT_CALL(*mockCryptoFactory, _createDigest(DigestType::SHA_256))
+    EXPECT_CALL(*mockCryptoFactory, createDigest(DigestType::SHA_256))
         .WillRepeatedly(Invoke([](DigestType type) -> std::unique_ptr<DigestInterface> {
             auto mockDigest = std::unique_ptr<MockDigest>(new MockDigest);
-            EXPECT_CALL(*mockDigest, _process(_)).WillRepeatedly(Return(true));
-            EXPECT_CALL(*mockDigest, _finalize(_)).WillOnce(Invoke([](DigestInterface::DataBlock& res) -> bool {
+            EXPECT_CALL(*mockDigest, process(_)).WillRepeatedly(Return(true));
+            EXPECT_CALL(*mockDigest, finalize(_)).WillOnce(Invoke([](DigestInterface::DataBlock& res) -> bool {
                 res.insert(res.end(), TEST_DIGEST2.begin(), TEST_DIGEST2.end());
                 return true;
             }));
@@ -112,5 +112,5 @@ TEST(DataPropertyCodecTest, test_decodeDer) {
 }
 
 }  // namespace test
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/testCrypto/EncryptedPropertiesFactoryTest.cpp b/core/Properties/Properties/testCrypto/EncryptedPropertiesFactoryTest.cpp
similarity index 82%
rename from core/Properties/acsdkProperties/testCrypto/EncryptedPropertiesFactoryTest.cpp
rename to core/Properties/Properties/testCrypto/EncryptedPropertiesFactoryTest.cpp
index bac6c6420b..78adb61fe3 100644
--- a/core/Properties/acsdkProperties/testCrypto/EncryptedPropertiesFactoryTest.cpp
+++ b/core/Properties/Properties/testCrypto/EncryptedPropertiesFactoryTest.cpp
@@ -16,27 +16,27 @@
 #include <gtest/gtest.h>
 #include <string>
 
-#include <acsdkCryptoInterfaces/test/MockCryptoFactory.h>
-#include <acsdkCryptoInterfaces/test/MockKeyStore.h>
-#include <acsdkCrypto/CryptoFactory.h>
-#include <acsdkPkcs11/KeyStoreFactory.h>
+#include <acsdk/CryptoInterfaces/test/MockCryptoFactory.h>
+#include <acsdk/CryptoInterfaces/test/MockKeyStore.h>
+#include <acsdk/Crypto/CryptoFactory.h>
+#include <acsdk/Pkcs11/KeyStoreFactory.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
-#include <acsdkPropertiesInterfaces/test/MockPropertiesFactory.h>
-#include <acsdkPropertiesInterfaces/test/StubPropertiesFactory.h>
-#include <acsdkProperties/private/EncryptedPropertiesFactory.h>
+#include <acsdk/PropertiesInterfaces/test/MockPropertiesFactory.h>
+#include <acsdk/PropertiesInterfaces/test/StubPropertiesFactory.h>
+#include <acsdk/Properties/private/EncryptedPropertiesFactory.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 namespace test {
 
 using namespace ::testing;
-using namespace ::alexaClientSDK::acsdkPropertiesInterfaces::test;
+using namespace ::alexaClientSDK::propertiesInterfaces::test;
 
-using namespace ::alexaClientSDK::acsdkPropertiesInterfaces;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
-using namespace ::alexaClientSDK::acsdkCrypto;
-using namespace ::alexaClientSDK::acsdkPkcs11;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces::test;
+using namespace ::alexaClientSDK::propertiesInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
+using namespace ::alexaClientSDK::crypto;
+using namespace ::alexaClientSDK::pkcs11;
+using namespace ::alexaClientSDK::cryptoInterfaces::test;
 using namespace ::alexaClientSDK::avsCommon::utils::configuration;
 
 /// @private
@@ -118,5 +118,5 @@ TEST(EncryptedPropertiesFactoryTest, test_createNullKeyStore) {
 }
 
 }  // namespace test
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/testCrypto/EncryptedPropertiesTest.cpp b/core/Properties/Properties/testCrypto/EncryptedPropertiesTest.cpp
similarity index 88%
rename from core/Properties/acsdkProperties/testCrypto/EncryptedPropertiesTest.cpp
rename to core/Properties/Properties/testCrypto/EncryptedPropertiesTest.cpp
index b1741167f7..003bdbcfd0 100644
--- a/core/Properties/acsdkProperties/testCrypto/EncryptedPropertiesTest.cpp
+++ b/core/Properties/Properties/testCrypto/EncryptedPropertiesTest.cpp
@@ -16,37 +16,37 @@
 #include <gtest/gtest.h>
 #include <string>
 
-#include <acsdkCodecUtils/Hex.h>
-#include <acsdkCrypto/CryptoFactory.h>
-#include <acsdkCryptoInterfaces/test/MockCryptoFactory.h>
-#include <acsdkCryptoInterfaces/test/MockKeyStore.h>
-#include <acsdkPkcs11/KeyStoreFactory.h>
-#include <acsdkPropertiesInterfaces/test/MockProperties.h>
-#include <acsdkPropertiesInterfaces/test/StubPropertiesFactory.h>
-#include <acsdkProperties/private/EncryptedProperties.h>
-#include <acsdkProperties/private/MiscStorageProperties.h>
-#include <acsdkProperties/private/Logging.h>
+#include <acsdk/CodecUtils/Hex.h>
+#include <acsdk/Crypto/CryptoFactory.h>
+#include <acsdk/CryptoInterfaces/test/MockCryptoFactory.h>
+#include <acsdk/CryptoInterfaces/test/MockKeyStore.h>
+#include <acsdk/Pkcs11/KeyStoreFactory.h>
+#include <acsdk/PropertiesInterfaces/test/MockProperties.h>
+#include <acsdk/PropertiesInterfaces/test/StubPropertiesFactory.h>
+#include <acsdk/Properties/private/EncryptedProperties.h>
+#include <acsdk/Properties/private/MiscStorageProperties.h>
+#include <acsdk/Properties/private/Logging.h>
 #include <AVSCommon/SDKInterfaces/Storage/StubMiscStorage.h>
 #include <AVSCommon/Utils/Configuration/ConfigurationNode.h>
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 namespace test {
 
 using namespace ::testing;
-using namespace ::alexaClientSDK::acsdkCodecUtils;
-using namespace ::alexaClientSDK::acsdkCrypto;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces::test;
-using namespace ::alexaClientSDK::acsdkPkcs11;
-using namespace ::alexaClientSDK::acsdkPropertiesInterfaces;
-using namespace ::alexaClientSDK::acsdkPropertiesInterfaces::test;
+using namespace ::alexaClientSDK::codecUtils;
+using namespace ::alexaClientSDK::crypto;
+using namespace ::alexaClientSDK::cryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces::test;
+using namespace ::alexaClientSDK::pkcs11;
+using namespace ::alexaClientSDK::propertiesInterfaces;
+using namespace ::alexaClientSDK::propertiesInterfaces::test;
 using namespace ::alexaClientSDK::avsCommon::utils::configuration;
 using namespace ::alexaClientSDK::avsCommon::sdkInterfaces::storage::test;
 
 /// String to identify log entries originating from this file.
 /// @private
-static const std::string TAG{"EncryptedPropertiesTest"};
+#define TAG "EncryptedPropertiesTest"
 
 /// @private
 static const std::string JSON_TEST_CONFIG = R"(
@@ -234,5 +234,5 @@ TEST(EncryptedPropertiesTest, test_reopenEncryptedProperties) {
 }
 
 }  // namespace test
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/testCrypto/EncryptionKeyPropertyCodecTest.cpp b/core/Properties/Properties/testCrypto/EncryptionKeyPropertyCodecTest.cpp
similarity index 81%
rename from core/Properties/acsdkProperties/testCrypto/EncryptionKeyPropertyCodecTest.cpp
rename to core/Properties/Properties/testCrypto/EncryptionKeyPropertyCodecTest.cpp
index a890e4cb95..63693df4bb 100644
--- a/core/Properties/acsdkProperties/testCrypto/EncryptionKeyPropertyCodecTest.cpp
+++ b/core/Properties/Properties/testCrypto/EncryptionKeyPropertyCodecTest.cpp
@@ -17,10 +17,10 @@
 #include <gtest/gtest.h>
 #include <string>
 
-#include <acsdkCodecUtils/Hex.h>
-#include <acsdkCryptoInterfaces/test/MockCryptoFactory.h>
-#include <acsdkCryptoInterfaces/test/MockDigest.h>
-#include <acsdkProperties/private/EncryptionKeyPropertyCodec.h>
+#include <acsdk/CodecUtils/Hex.h>
+#include <acsdk/CryptoInterfaces/test/MockCryptoFactory.h>
+#include <acsdk/CryptoInterfaces/test/MockDigest.h>
+#include <acsdk/Properties/private/EncryptionKeyPropertyCodec.h>
 
 // Workaround for GCC < 5.x
 #if (defined(__GNUC__) && (__GNUC___ < 5))
@@ -30,15 +30,15 @@
 #endif
 
 namespace alexaClientSDK {
-namespace acsdkProperties {
+namespace properties {
 namespace test {
 
 using namespace ::testing;
 
-using namespace ::alexaClientSDK::acsdkPropertiesInterfaces;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces::test;
-using namespace ::alexaClientSDK::acsdkCodecUtils;
+using namespace ::alexaClientSDK::propertiesInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces;
+using namespace ::alexaClientSDK::cryptoInterfaces::test;
+using namespace ::alexaClientSDK::codecUtils;
 
 // Test content for decoding.
 static const std::string DER_ENCODED_HEX =
@@ -47,11 +47,11 @@ static const std::string DER_ENCODED_HEX =
 TEST(EncryptionKeyPropertyTest, test_encodeDer) {
     auto mockCryptoFactory = std::make_shared<MockCryptoFactory>();
 
-    EXPECT_CALL(*mockCryptoFactory, _createDigest(DigestType::SHA_256))
+    EXPECT_CALL(*mockCryptoFactory, createDigest(DigestType::SHA_256))
         .WillOnce(Invoke([](DigestType type) -> std::unique_ptr<DigestInterface> {
             auto mockDigest = std::unique_ptr<MockDigest>(new MockDigest);
-            EXPECT_CALL(*mockDigest, _process(_)).WillRepeatedly(Return(true));
-            EXPECT_CALL(*mockDigest, _finalize(_)).WillOnce(Invoke([](DigestInterface::DataBlock& res) -> bool {
+            EXPECT_CALL(*mockDigest, process(_)).WillRepeatedly(Return(true));
+            EXPECT_CALL(*mockDigest, finalize(_)).WillOnce(Invoke([](DigestInterface::DataBlock& res) -> bool {
                 DigestInterface::DataBlock digest{0xDD, 0xDD};
                 res.insert(res.end(), digest.begin(), digest.end());
                 return true;
@@ -91,11 +91,11 @@ TEST(EncryptionKeyPropertyTest, test_encodeDer) {
 TEST(EncryptionKeyPropertyTest, test_decodeDer) {
     auto mockCryptoFactory = std::make_shared<MockCryptoFactory>();
 
-    EXPECT_CALL(*mockCryptoFactory, _createDigest(DigestType::SHA_256))
+    EXPECT_CALL(*mockCryptoFactory, createDigest(DigestType::SHA_256))
         .WillRepeatedly(Invoke([](DigestType type) -> std::unique_ptr<DigestInterface> {
             auto mockDigest = std::unique_ptr<MockDigest>(new MockDigest);
-            EXPECT_CALL(*mockDigest, _process(_)).WillRepeatedly(Return(true));
-            EXPECT_CALL(*mockDigest, _finalize(_)).WillOnce(Invoke([](std::vector<uint8_t>& res) -> bool {
+            EXPECT_CALL(*mockDigest, process(_)).WillRepeatedly(Return(true));
+            EXPECT_CALL(*mockDigest, finalize(_)).WillOnce(Invoke([](std::vector<uint8_t>& res) -> bool {
                 DigestInterface::DataBlock digest{0xEE, 0xEE};
                 res.insert(res.end(), digest.begin(), digest.end());
                 return true;
@@ -156,5 +156,5 @@ TEST(EncryptionKeyPropertyTest, test_decodeDer) {
 }
 
 }  // namespace test
-}  // namespace acsdkProperties
+}  // namespace properties
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkPropertiesInterfaces/CMakeLists.txt b/core/Properties/PropertiesInterfaces/CMakeLists.txt
similarity index 100%
rename from core/Properties/acsdkPropertiesInterfaces/CMakeLists.txt
rename to core/Properties/PropertiesInterfaces/CMakeLists.txt
diff --git a/core/Properties/PropertiesInterfaces/doc/Namespaces.dox b/core/Properties/PropertiesInterfaces/doc/Namespaces.dox
new file mode 100644
index 0000000000..b00b2949c2
--- /dev/null
+++ b/core/Properties/PropertiesInterfaces/doc/Namespaces.dox
@@ -0,0 +1,20 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * \namespace ::alexaClientSDK::propertiesInterfaces
+ * \brief Properties API Interfaces and Data Types.
+ * \ingroup Lib_acsdkPropertiesInterfaces
+ */
diff --git a/core/Properties/PropertiesInterfaces/doc/acsdkPropertiesInterfaces.dox b/core/Properties/PropertiesInterfaces/doc/acsdkPropertiesInterfaces.dox
new file mode 100644
index 0000000000..8f9db960f3
--- /dev/null
+++ b/core/Properties/PropertiesInterfaces/doc/acsdkPropertiesInterfaces.dox
@@ -0,0 +1,37 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * \defgroup Lib_acsdkPropertiesInterfaces
+ * \defgroup Lib_acsdkPropertiesInterfaces Properties API
+ * @brief Interfaces for accessing persistent configuration.
+ *
+ * Properties API provides interfaces for accessing persistent configuration. The API doesn't mandate how the
+ * configuration is stored, but assumes that it can be accessed as a group of containers. A single container can be
+ * identified by configuration URI (Uniform ResourceLocator).
+ *
+ * Usage Example:
+ * \code{.cpp}
+ * auto properties = propertiesFactory->getProperties("componentName/tableName");
+ * properties->putString("propertyName", "stringValue");
+ * \endcode
+ *
+ * ACSDK provides reference implementation of \ref Lib_acsdkPropertiesInterfaces to use with \ref MiscStorageInterface and to store
+ * properties values in encrypted form. See \ref Lib_acsdkProperties for documentation on reference implementation.
+ *
+ * \sa Lib_acsdkProperties
+ * \sa \ref propertiesInterfaces Namespace
+ * \sa \ref propertiesInterfaces::test Namespace
+ */
diff --git a/core/Properties/acsdkPropertiesInterfaces/include/acsdkPropertiesInterfaces/PropertiesFactoryInterface.h b/core/Properties/PropertiesInterfaces/include/acsdk/PropertiesInterfaces/PropertiesFactoryInterface.h
similarity index 83%
rename from core/Properties/acsdkPropertiesInterfaces/include/acsdkPropertiesInterfaces/PropertiesFactoryInterface.h
rename to core/Properties/PropertiesInterfaces/include/acsdk/PropertiesInterfaces/PropertiesFactoryInterface.h
index 531e03fc3e..08bfe5cf89 100644
--- a/core/Properties/acsdkPropertiesInterfaces/include/acsdkPropertiesInterfaces/PropertiesFactoryInterface.h
+++ b/core/Properties/PropertiesInterfaces/include/acsdk/PropertiesInterfaces/PropertiesFactoryInterface.h
@@ -13,18 +13,18 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIESINTERFACES_PROPERTIESFACTORYINTERFACE_H_
-#define ACSDKPROPERTIESINTERFACES_PROPERTIESFACTORYINTERFACE_H_
+#ifndef ACSDK_PROPERTIESINTERFACES_PROPERTIESFACTORYINTERFACE_H_
+#define ACSDK_PROPERTIESINTERFACES_PROPERTIESFACTORYINTERFACE_H_
 
 #include <memory>
 #include <string>
 
-#include <acsdkPropertiesInterfaces/PropertiesInterface.h>
+#include <acsdk/PropertiesInterfaces/PropertiesInterface.h>
 
 namespace alexaClientSDK {
-//! \addtogroup PropertiesAPI
+//! \addtogroup Lib_acsdkPropertiesInterfaces
 //! @{
-namespace acsdkPropertiesInterfaces {
+namespace propertiesInterfaces {
 
 //! Factory interface to component properties.
 /**
@@ -35,8 +35,8 @@ namespace acsdkPropertiesInterfaces {
  * Application may operate with a single or multiple instances of this interface, that use different implementation, or
  * provide access to different physical resources for access control.
  *
- * \ingroup PropertiesAPI
- * \sa PropertiesIMPL
+ * \ingroup Lib_acsdkPropertiesInterfaces
+ * \sa Lib_acsdkProperties
  */
 class PropertiesFactoryInterface {
 public:
@@ -61,8 +61,8 @@ class PropertiesFactoryInterface {
     virtual std::shared_ptr<PropertiesInterface> getProperties(const std::string& uri) noexcept = 0;
 };
 
-}  // namespace acsdkPropertiesInterfaces
+}  // namespace propertiesInterfaces
 //! @}
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIESINTERFACES_PROPERTIESFACTORYINTERFACE_H_
+#endif  // ACSDK_PROPERTIESINTERFACES_PROPERTIESFACTORYINTERFACE_H_
diff --git a/core/Properties/acsdkPropertiesInterfaces/include/acsdkPropertiesInterfaces/PropertiesInterface.h b/core/Properties/PropertiesInterfaces/include/acsdk/PropertiesInterfaces/PropertiesInterface.h
similarity index 95%
rename from core/Properties/acsdkPropertiesInterfaces/include/acsdkPropertiesInterfaces/PropertiesInterface.h
rename to core/Properties/PropertiesInterfaces/include/acsdk/PropertiesInterfaces/PropertiesInterface.h
index 75028aa670..94a7ba307c 100644
--- a/core/Properties/acsdkPropertiesInterfaces/include/acsdkPropertiesInterfaces/PropertiesInterface.h
+++ b/core/Properties/PropertiesInterfaces/include/acsdk/PropertiesInterfaces/PropertiesInterface.h
@@ -13,15 +13,15 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIESINTERFACES_PROPERTIESINTERFACE_H_
-#define ACSDKPROPERTIESINTERFACES_PROPERTIESINTERFACE_H_
+#ifndef ACSDK_PROPERTIESINTERFACES_PROPERTIESINTERFACE_H_
+#define ACSDK_PROPERTIESINTERFACES_PROPERTIESINTERFACE_H_
 
 #include <string>
 #include <unordered_set>
 #include <vector>
 
 namespace alexaClientSDK {
-namespace acsdkPropertiesInterfaces {
+namespace propertiesInterfaces {
 
 //! This class provides an interface to a simple key/value container.
 /**
@@ -31,7 +31,7 @@ namespace acsdkPropertiesInterfaces {
  * The implementation must do best effort for data consistency when handling data update errors for each property. If
  * it is possible, the value of property shall be either left intact, or deleted if the data corruption is unavoidable.
  *
- * \ingroup PropertiesAPI
+ * \ingroup Lib_acsdkPropertiesInterfaces
  * @sa PropertiesFactoryInterface
  */
 class PropertiesInterface {
@@ -136,7 +136,7 @@ class PropertiesInterface {
     virtual bool clear() noexcept = 0;
 };
 
-}  // namespace acsdkPropertiesInterfaces
+}  // namespace propertiesInterfaces
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIESINTERFACES_PROPERTIESINTERFACE_H_
+#endif  // ACSDK_PROPERTIESINTERFACES_PROPERTIESINTERFACE_H_
diff --git a/core/Properties/acsdkPropertiesInterfaces/test/CMakeLists.txt b/core/Properties/PropertiesInterfaces/test/CMakeLists.txt
similarity index 100%
rename from core/Properties/acsdkPropertiesInterfaces/test/CMakeLists.txt
rename to core/Properties/PropertiesInterfaces/test/CMakeLists.txt
diff --git a/core/Properties/PropertiesInterfaces/test/doc/Namespaces.dox b/core/Properties/PropertiesInterfaces/test/doc/Namespaces.dox
new file mode 100644
index 0000000000..fb9d8aea67
--- /dev/null
+++ b/core/Properties/PropertiesInterfaces/test/doc/Namespaces.dox
@@ -0,0 +1,20 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * \namespace ::alexaClientSDK::propertiesInterfaces::test
+ * \brief Test utilities for \ref Lib_acsdkPropertiesInterfaces
+ * \sa Lib_acsdkPropertiesInterfaces.
+ */
diff --git a/core/Properties/PropertiesInterfaces/test/include/acsdk/PropertiesInterfaces/test/MockProperties.h b/core/Properties/PropertiesInterfaces/test/include/acsdk/PropertiesInterfaces/test/MockProperties.h
new file mode 100644
index 0000000000..d44427c4fd
--- /dev/null
+++ b/core/Properties/PropertiesInterfaces/test/include/acsdk/PropertiesInterfaces/test/MockProperties.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_PROPERTIESINTERFACES_TEST_MOCKPROPERTIES_H_
+#define ACSDK_PROPERTIESINTERFACES_TEST_MOCKPROPERTIES_H_
+
+#include <acsdk/PropertiesInterfaces/PropertiesInterface.h>
+#include <acsdk/Test/GmockExtensions.h>
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
+
+namespace alexaClientSDK {
+namespace propertiesInterfaces {
+namespace test {
+
+//! Mock class for @c PropertiesInterface.
+/**
+ * \ingroup Lib_acsdkPropertiesInterfaces
+ */
+class MockProperties : public PropertiesInterface {
+public:
+    /// @name PropertiesInterface stub methods
+    ///@{
+    MOCK_NOEXCEPT_METHOD2(getString, bool(const std::string&, std::string&));
+    MOCK_NOEXCEPT_METHOD2(putString, bool(const std::string&, const std::string&));
+    MOCK_NOEXCEPT_METHOD2(getBytes, bool(const std::string&, Bytes&));
+    MOCK_NOEXCEPT_METHOD2(putBytes, bool(const std::string&, const Bytes&));
+    MOCK_NOEXCEPT_METHOD1(getKeys, bool(std::unordered_set<std::string>&));
+    MOCK_NOEXCEPT_METHOD1(remove, bool(const std::string&));
+    MOCK_NOEXCEPT_METHOD0(clear, bool());
+    ///@}
+};
+
+}  // namespace test
+}  // namespace propertiesInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_PROPERTIESINTERFACES_TEST_MOCKPROPERTIES_H_
diff --git a/core/Properties/PropertiesInterfaces/test/include/acsdk/PropertiesInterfaces/test/MockPropertiesFactory.h b/core/Properties/PropertiesInterfaces/test/include/acsdk/PropertiesInterfaces/test/MockPropertiesFactory.h
new file mode 100644
index 0000000000..4898c769b6
--- /dev/null
+++ b/core/Properties/PropertiesInterfaces/test/include/acsdk/PropertiesInterfaces/test/MockPropertiesFactory.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_PROPERTIESINTERFACES_TEST_MOCKPROPERTIESFACTORY_H_
+#define ACSDK_PROPERTIESINTERFACES_TEST_MOCKPROPERTIESFACTORY_H_
+
+#include <acsdk/PropertiesInterfaces/PropertiesFactoryInterface.h>
+#include <acsdk/PropertiesInterfaces/PropertiesInterface.h>
+#include <acsdk/Test/GmockExtensions.h>
+#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
+
+namespace alexaClientSDK {
+namespace propertiesInterfaces {
+namespace test {
+
+//! Mock class for @c PropertiesFactoryInterface.
+/**
+ * \ingroup Lib_acsdkPropertiesInterfaces
+ */
+class MockPropertiesFactory : public PropertiesFactoryInterface {
+public:
+    /// @name PropertiesFactoryInterface stub methods.
+    ///@{
+    MOCK_NOEXCEPT_METHOD1(getProperties, std::shared_ptr<PropertiesInterface>(const std::string&));
+    ///@}
+};
+
+}  // namespace test
+}  // namespace propertiesInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_PROPERTIESINTERFACES_TEST_MOCKPROPERTIESFACTORY_H_
diff --git a/core/Properties/acsdkPropertiesInterfaces/test/include/acsdkPropertiesInterfaces/test/StubProperties.h b/core/Properties/PropertiesInterfaces/test/include/acsdk/PropertiesInterfaces/test/StubProperties.h
similarity index 82%
rename from core/Properties/acsdkPropertiesInterfaces/test/include/acsdkPropertiesInterfaces/test/StubProperties.h
rename to core/Properties/PropertiesInterfaces/test/include/acsdk/PropertiesInterfaces/test/StubProperties.h
index 3a99f3e487..f8121b01b3 100644
--- a/core/Properties/acsdkPropertiesInterfaces/test/include/acsdkPropertiesInterfaces/test/StubProperties.h
+++ b/core/Properties/PropertiesInterfaces/test/include/acsdk/PropertiesInterfaces/test/StubProperties.h
@@ -13,19 +13,19 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIESINTERFACES_TEST_STUBPROPERTIES_H_
-#define ACSDKPROPERTIESINTERFACES_TEST_STUBPROPERTIES_H_
+#ifndef ACSDK_PROPERTIESINTERFACES_TEST_STUBPROPERTIES_H_
+#define ACSDK_PROPERTIESINTERFACES_TEST_STUBPROPERTIES_H_
 
-#include <gmock/gmock.h>
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
 
-#include <acsdkPropertiesInterfaces/PropertiesInterface.h>
-#include <acsdkPropertiesInterfaces/test/StubPropertiesFactory.h>
+#include <acsdk/PropertiesInterfaces/PropertiesInterface.h>
+#include <acsdk/PropertiesInterfaces/test/StubPropertiesFactory.h>
+#include <acsdk/Test/GmockExtensions.h>
 
 namespace alexaClientSDK {
-namespace acsdkPropertiesInterfaces {
+namespace propertiesInterfaces {
 namespace test {
 
 //! In-memory stub implementation of @c PropertiesInterface.
@@ -34,7 +34,7 @@ namespace test {
  * by using \ref StubPropertiesFactory.
  *
  * \sa StubPropertiesFactory.
- * \ingroup PropertiesAPI
+ * \ingroup Lib_acsdkPropertiesInterfaces
  */
 class StubProperties : public PropertiesInterface {
 public:
@@ -67,7 +67,7 @@ class StubProperties : public PropertiesInterface {
 };
 
 }  // namespace test
-}  // namespace acsdkPropertiesInterfaces
+}  // namespace propertiesInterfaces
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIESINTERFACES_TEST_STUBPROPERTIES_H_
+#endif  // ACSDK_PROPERTIESINTERFACES_TEST_STUBPROPERTIES_H_
diff --git a/core/Properties/acsdkPropertiesInterfaces/test/include/acsdkPropertiesInterfaces/test/StubPropertiesFactory.h b/core/Properties/PropertiesInterfaces/test/include/acsdk/PropertiesInterfaces/test/StubPropertiesFactory.h
similarity index 81%
rename from core/Properties/acsdkPropertiesInterfaces/test/include/acsdkPropertiesInterfaces/test/StubPropertiesFactory.h
rename to core/Properties/PropertiesInterfaces/test/include/acsdk/PropertiesInterfaces/test/StubPropertiesFactory.h
index e3edbf4d64..18b93d9b33 100644
--- a/core/Properties/acsdkPropertiesInterfaces/test/include/acsdkPropertiesInterfaces/test/StubPropertiesFactory.h
+++ b/core/Properties/PropertiesInterfaces/test/include/acsdk/PropertiesInterfaces/test/StubPropertiesFactory.h
@@ -13,25 +13,25 @@
  * permissions and limitations under the License.
  */
 
-#ifndef ACSDKPROPERTIESINTERFACES_TEST_STUBPROPERTIESFACTORY_H_
-#define ACSDKPROPERTIESINTERFACES_TEST_STUBPROPERTIESFACTORY_H_
+#ifndef ACSDK_PROPERTIESINTERFACES_TEST_STUBPROPERTIESFACTORY_H_
+#define ACSDK_PROPERTIESINTERFACES_TEST_STUBPROPERTIESFACTORY_H_
 
-#include <gmock/gmock.h>
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
 
-#include <acsdkPropertiesInterfaces/PropertiesFactoryInterface.h>
+#include <acsdk/PropertiesInterfaces/PropertiesFactoryInterface.h>
+#include <acsdk/Test/GmockExtensions.h>
 
 namespace alexaClientSDK {
-namespace acsdkPropertiesInterfaces {
+namespace propertiesInterfaces {
 namespace test {
 
 //! In-memory stub implementation of @c PropertiesFactoryInterface.
 /**
  * In memory implementation for @c PropertiesFactoryInterface. This class is not thread safe.
  *
- * \ingroup PropertiesAPI
+ * \ingroup Lib_acsdkPropertiesInterfaces
  */
 class StubPropertiesFactory
         : public PropertiesFactoryInterface
@@ -62,7 +62,7 @@ class StubPropertiesFactory
 };
 
 }  // namespace test
-}  // namespace acsdkPropertiesInterfaces
+}  // namespace propertiesInterfaces
 }  // namespace alexaClientSDK
 
-#endif  // ACSDKPROPERTIESINTERFACES_TEST_STUBPROPERTIESFACTORY_H_
+#endif  // ACSDK_PROPERTIESINTERFACES_TEST_STUBPROPERTIESFACTORY_H_
diff --git a/core/Properties/PropertiesInterfaces/test/src/CMakeLists.txt b/core/Properties/PropertiesInterfaces/test/src/CMakeLists.txt
new file mode 100644
index 0000000000..c44c008052
--- /dev/null
+++ b/core/Properties/PropertiesInterfaces/test/src/CMakeLists.txt
@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+if (BUILD_TESTING)
+    add_library(acsdkPropertiesInterfacesTestLib STATIC
+            StubProperties.cpp
+            StubPropertiesFactory.cpp)
+    target_compile_definitions(acsdkPropertiesInterfacesTestLib PRIVATE ACSDK_LOG_MODULE=acsdkPropertiesInterfacesTest)
+    target_include_directories(acsdkPropertiesInterfacesTestLib PUBLIC "../include")
+    target_link_libraries(acsdkPropertiesInterfacesTestLib
+            PUBLIC AVSCommonTestLib UtilsCommonTestLib
+            PRIVATE acsdkPropertiesInterfaces acsdkCodecUtils)
+endif()
diff --git a/core/Properties/acsdkPropertiesInterfaces/test/src/StubProperties.cpp b/core/Properties/PropertiesInterfaces/test/src/StubProperties.cpp
similarity index 96%
rename from core/Properties/acsdkPropertiesInterfaces/test/src/StubProperties.cpp
rename to core/Properties/PropertiesInterfaces/test/src/StubProperties.cpp
index e9910ea573..496eb2080d 100644
--- a/core/Properties/acsdkPropertiesInterfaces/test/src/StubProperties.cpp
+++ b/core/Properties/PropertiesInterfaces/test/src/StubProperties.cpp
@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-#include <acsdkPropertiesInterfaces/test/StubProperties.h>
+#include <acsdk/PropertiesInterfaces/test/StubProperties.h>
 
 namespace alexaClientSDK {
-namespace acsdkPropertiesInterfaces {
+namespace propertiesInterfaces {
 namespace test {
 
 /// @private
@@ -114,5 +114,5 @@ bool StubProperties::clear() noexcept {
 }
 
 }  // namespace test
-}  // namespace acsdkPropertiesInterfaces
+}  // namespace propertiesInterfaces
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkPropertiesInterfaces/test/src/StubPropertiesFactory.cpp b/core/Properties/PropertiesInterfaces/test/src/StubPropertiesFactory.cpp
similarity index 84%
rename from core/Properties/acsdkPropertiesInterfaces/test/src/StubPropertiesFactory.cpp
rename to core/Properties/PropertiesInterfaces/test/src/StubPropertiesFactory.cpp
index 2ff8146aba..82a2cf5b73 100644
--- a/core/Properties/acsdkPropertiesInterfaces/test/src/StubPropertiesFactory.cpp
+++ b/core/Properties/PropertiesInterfaces/test/src/StubPropertiesFactory.cpp
@@ -15,11 +15,11 @@
 
 #include <gtest/gtest.h>
 
-#include <acsdkPropertiesInterfaces/test/StubPropertiesFactory.h>
-#include <acsdkPropertiesInterfaces/test/StubProperties.h>
+#include <acsdk/PropertiesInterfaces/test/StubPropertiesFactory.h>
+#include <acsdk/PropertiesInterfaces/test/StubProperties.h>
 
 namespace alexaClientSDK {
-namespace acsdkPropertiesInterfaces {
+namespace propertiesInterfaces {
 namespace test {
 
 std::shared_ptr<StubPropertiesFactory> StubPropertiesFactory::create() noexcept {
@@ -34,5 +34,5 @@ std::shared_ptr<PropertiesInterface> StubPropertiesFactory::getProperties(const
 }
 
 }  // namespace test
-}  // namespace acsdkPropertiesInterfaces
+}  // namespace propertiesInterfaces
 }  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkProperties/doc/Namespaces.dox b/core/Properties/acsdkProperties/doc/Namespaces.dox
deleted file mode 100644
index f80d89ecc2..0000000000
--- a/core/Properties/acsdkProperties/doc/Namespaces.dox
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/**
- * \namespace ::alexaClientSDK::acsdkProperties
- * \brief Properties Implementation.
- * \ingroup PropertiesIMPL
- *
- * \namespace ::alexaClientSDK::acsdkProperties::test
- * \brief Test cases for \ref PropertiesIMPL
- * \ingroup PropertiesIMPL
- */
diff --git a/core/Properties/acsdkProperties/doc/PropertiesIMPL.dox b/core/Properties/acsdkProperties/doc/PropertiesIMPL.dox
deleted file mode 100644
index 76255a54d2..0000000000
--- a/core/Properties/acsdkProperties/doc/PropertiesIMPL.dox
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/**
- * \defgroup PropertiesIMPL Properties Implementation
- * @brief Implementations for \ref PropertiesAPI
- *
- * PropertiesIMPL enables users to use PropertiesAPI instead of lower level MiscStorageInterface and SQLiteDatabase. In
- * addition, this module offers data at rest protection using hardware security module.
- *
- * To use unencrypted adapter for \ref alexaClientSDK::acsdkProperties::MiscStorageInterface:
- * \code{.cpp}
- * #include <acsdkProperties/PropertiesFactories.h>
- *
- * std::shared_ptr<MiscStorageInterface> miscStorage = ...;
- * auto factory = createPropertiesFactory(miscStorage);
- * auto properties = propertiesFactory->getProperties("componentName", "configNamespace");
- * properties->putString("propertyName", "stringValue");
- * \endcode
- *
- * The following example demonstrates how to use encrypted properties:
- * \code{.cpp}
- * #include <acsdkProperties/EncryptedPropertiesFactories.h>
- *
- * std::shared_ptr<MiscStorageInterface> miscStorage = ...;
- * std::shared_ptr<CryptoFactoryInterface> cryptoFactory = ...;
- * std::shared_ptr<KeyStoreInterface> keyStore = ...;
- *
- * auto factory = createEncryptedPropertiesFactory(cryptoFactory, keyStore, miscStorage);
- * auto properties = propertiesFactory->getProperties("componentName", "configNamespace");
- * properties->putString("propertyName", "stringValue");
- * \endcode
- *
- * Encryption at rest requires that CryptoAPI support is available and the platform has correctly configured
- * hardware security module.
- *
- * \sa CryptoIMPL how to obtain \ref alexaClientSDK::acsdkCryptoInterfaces::CryptoFactoryInterface.
- * \sa PKCS11IMPL how to obtain \ref alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface and configure HSM.
- *
- * \sa alexaClientSDK::acsdkProperties
- * \sa alexaClientSDK::acsdkProperties::test
- */
diff --git a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/EncryptedProperties.h b/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/EncryptedProperties.h
deleted file mode 100644
index af48871859..0000000000
--- a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/EncryptedProperties.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKPROPERTIES_PRIVATE_ENCRYPTEDPROPERTIES_H_
-#define ACSDKPROPERTIES_PRIVATE_ENCRYPTEDPROPERTIES_H_
-
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
-#include <acsdkPropertiesInterfaces/PropertiesInterface.h>
-#include <acsdkProperties/ErrorCallbackInterface.h>
-#include <acsdkProperties/private/RetryExecutor.h>
-
-namespace alexaClientSDK {
-namespace acsdkProperties {
-
-/**
- * @brief Properties adapter with field encryption.
- *
- * This class wraps underlying PropertiesInterface with encryption support. All property values are encrypted on save
- * and decrypted on load. When this adapter initializes for the first time, it automatically encrypts all fields. To
- * manage encryption key, additional data is stored with '$acsdkEncryption$' property name. This property contains
- * algorithms to use and encrypted data key. The data key itself is encrypted using HSM key store.
- *
- * This class is thread safe and can be shared between multiple consumers.
- *
- * @ingroup PropertiesIMPL
- */
-class EncryptedProperties : public alexaClientSDK::acsdkPropertiesInterfaces::PropertiesInterface {
-public:
-    static std::shared_ptr<PropertiesInterface> create(
-        const std::string& configUri,
-        const std::shared_ptr<PropertiesInterface>& innerProperties,
-        const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
-        const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface>& keyStore) noexcept;
-
-    /// @name PropertiesInterface methods.
-    /// @{
-    bool getString(const std::string& key, std::string& value) noexcept override;
-    bool putString(const std::string& key, const std::string& value) noexcept override;
-    bool getBytes(const std::string& key, Bytes& value) noexcept override;
-    bool putBytes(const std::string& key, const Bytes& value) noexcept override;
-    bool remove(const std::string& key) noexcept override;
-    bool getKeys(std::unordered_set<std::string>& valueContainer) noexcept override;
-    bool clear() noexcept override;
-    /// @}
-
-protected:
-    typedef acsdkCryptoInterfaces::KeyStoreInterface::IV IV;
-    typedef acsdkCryptoInterfaces::KeyStoreInterface::DataBlock DataBlock;
-    typedef acsdkCryptoInterfaces::KeyStoreInterface::KeyChecksum KeyChecksum;
-    typedef acsdkCryptoInterfaces::CryptoCodecInterface::Key Key;
-    typedef acsdkCryptoInterfaces::CryptoCodecInterface::Tag Tag;
-
-    // Constructor.
-    EncryptedProperties(
-        const std::string& configUri,
-        const std::shared_ptr<PropertiesInterface>& innerProperties,
-        const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
-        const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface>& keyStore) noexcept;
-
-    // Container initialization.
-    bool init() noexcept;
-    // Encryption upgrade.
-    StatusCode upgradeEncryption(RetryExecutor& executor, const std::unordered_set<std::string>& keys) noexcept;
-    // Prepare data key
-    StatusCode loadAndDecryptDataKey(RetryExecutor& executor) noexcept;
-
-    // Data property operations.
-    bool encryptAndEncodePropertyValue(
-        const std::string& key,
-        const Bytes& plaintext,
-        Bytes& encodedCiphertext) noexcept;
-    bool decodeAndDecryptPropertyValue(
-        const std::string& key,
-        const Bytes& encodedCiphertext,
-        Bytes& plaintext) noexcept;
-    bool encryptAndPutInternal(const std::string& key, const Bytes& plaintext) noexcept;
-    bool getAndDecryptInternal(const std::string& key, Bytes& plaintext) noexcept;
-
-    // Encryption property operations.
-    StatusCode generateAndStoreDataKeyWithRetries(RetryExecutor& executor) noexcept;
-
-    // Inner properties operations
-    bool loadKeysWithRetries(RetryExecutor& executor, std::unordered_set<std::string>& keys) noexcept;
-    bool storeValueWithRetries(
-        RetryExecutor& executor,
-        const std::string& key,
-        const Bytes& data,
-        bool canDrop) noexcept;
-    bool loadValueWithRetries(RetryExecutor& executor, const std::string& key, Bytes& data) noexcept;
-    bool deleteValueWithRetries(RetryExecutor& executor, const std::string& key) noexcept;
-    bool clearAllValuesWithRetries(RetryExecutor& executor) noexcept;
-    bool executeKeyOperationWithRetries(
-        RetryExecutor& executor,
-        const std::string& operationName,
-        const std::string& key,
-        const std::function<bool()>& operation) noexcept;
-
-    /**
-     * @brief Generate new data key.
-     *
-     * Method generates new data key and stores it in this instance. If there is an error, the method attempts to
-     * do retries.
-     *
-     * @param[in] helper Executor for perform operation with retries.
-     * @return True if operation succeeds, false otherwise.
-     */
-    bool generateDataKeyWithRetries(RetryExecutor& executor) noexcept;
-    bool encryptAndEncodeDataKeyWithRetries(RetryExecutor& executor, Bytes& encoded) noexcept;
-    StatusCode decodeAndDecryptDataKey(const Bytes& encoded) noexcept;
-    bool encryptDataKey(
-        std::string& mainKeyAlias,
-        alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType& algorithmType,
-        KeyChecksum& mainKeyChecksum,
-        IV& dataKeyIV,
-        DataBlock& dataKeyCiphertext,
-        Tag& dataKeyTag) noexcept;
-    bool decryptDataKey(
-        const std::string& mainKeyAlias,
-        alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType dataKeyAlgorithm,
-        const KeyChecksum& mainKeyChecksum,
-        const IV& dataKeyIV,
-        const DataBlock& keyCiphertext,
-        const Tag& dataKeyTag) noexcept;
-
-    bool doClear(RetryExecutor& helper) noexcept;
-
-    /// Configuration namespace (for error callbacks).
-    const std::string m_configUri;
-
-    /// Underlying storage interface.
-    const std::shared_ptr<PropertiesInterface> m_innerProperties;
-
-    /// Cryptography service factory.
-    const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::CryptoFactoryInterface> m_cryptoFactory;
-
-    /// HSM keystore interface.
-    const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface> m_keyStore;
-
-    /// Actual algorithm type in use.
-    alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType m_dataAlgorithmType;
-
-    /// Data key in use
-    Key m_dataKey;
-};
-
-}  // namespace acsdkProperties
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKPROPERTIES_PRIVATE_ENCRYPTEDPROPERTIES_H_
diff --git a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/EncryptedPropertiesFactory.h b/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/EncryptedPropertiesFactory.h
deleted file mode 100644
index aad999455c..0000000000
--- a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/EncryptedPropertiesFactory.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKPROPERTIES_PRIVATE_ENCRYPTEDPROPERTIESFACTORY_H_
-#define ACSDKPROPERTIES_PRIVATE_ENCRYPTEDPROPERTIESFACTORY_H_
-
-#include <acsdkPropertiesInterfaces/PropertiesFactoryInterface.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
-#include <acsdkProperties/MiscStorageAdapter.h>
-#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
-
-namespace alexaClientSDK {
-namespace acsdkProperties {
-
-/**
- * @brief Properties factory wrapper to encrypt all properties.
- *
- * This factory works with @name EncryptedProperties class to ensure all property values are stored in encrypted form
- * in the underlying storage.
- *
- * @ingroup PropertiesIMPL
- */
-class EncryptedPropertiesFactory : public alexaClientSDK::acsdkPropertiesInterfaces::PropertiesFactoryInterface {
-public:
-    /**
-     * @brief Creates properties factory using given dependencies.
-     *
-     * @param[in] innerFactory Internal factory for accessing properties in plain text manner.
-     * @param[in] cryptoFactory Encryption facilities factory.
-     * @param[in] keyStore HSM key store.
-     *
-     * @return Reference to factory or nullptr on error.
-     */
-    static std::shared_ptr<PropertiesFactoryInterface> create(
-        const std::shared_ptr<alexaClientSDK::acsdkPropertiesInterfaces::PropertiesFactoryInterface>& innerFactory,
-        const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
-        const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface>& keyStore) noexcept;
-
-    /// @name PropertiesFactoryInterface methods
-    ///@{
-    std::shared_ptr<alexaClientSDK::acsdkPropertiesInterfaces::PropertiesInterface> getProperties(
-        const std::string& configUri) noexcept override;
-    ///@}
-
-private:
-    /**
-     * @brief Constructs factory.
-     *
-     * @param[in] innerFactory Internal factory for accessing properties in plain text manner.
-     * @param[in] cryptoFactory Encryption facilities factory.
-     * @param[in] keyStore HSM key store.
-     */
-    EncryptedPropertiesFactory(
-        const std::shared_ptr<PropertiesFactoryInterface>& innerFactory,
-        const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
-        const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface>& keyStore) noexcept;
-
-    bool init() noexcept;
-
-    /// Nested unencrypted properties factory.
-    const std::shared_ptr<alexaClientSDK::acsdkPropertiesInterfaces::PropertiesFactoryInterface> m_storage;
-    /// Cryptography service factory.
-    const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::CryptoFactoryInterface> m_cryptoFactory;
-    /// HSM keystore interface.
-    const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface> m_keyStore;
-};
-
-}  // namespace acsdkProperties
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKPROPERTIES_PRIVATE_ENCRYPTEDPROPERTIESFACTORY_H_
diff --git a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/EncryptionKeyPropertyCodec.h b/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/EncryptionKeyPropertyCodec.h
deleted file mode 100644
index a7afc61f65..0000000000
--- a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/EncryptionKeyPropertyCodec.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKPROPERTIES_PRIVATE_ENCRYPTIONKEYPROPERTYCODEC_H_
-#define ACSDKPROPERTIES_PRIVATE_ENCRYPTIONKEYPROPERTYCODEC_H_
-
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <acsdkCryptoInterfaces/AlgorithmType.h>
-#include <acsdkCryptoInterfaces/CryptoFactoryInterface.h>
-#include <acsdkCryptoInterfaces/KeyStoreInterface.h>
-#include <acsdkPropertiesInterfaces/PropertiesInterface.h>
-#include <acsdkProperties/private/Asn1Types.h>
-
-namespace alexaClientSDK {
-namespace acsdkProperties {
-
-/**
- * @brief ASN.1 Codec API for Encryption Key Property Encoding.
- *
- * This class provides top-level functions to encode encryption key property into DER format or decode it from DER
- * format.
- *
- * @sa EncryptionKeyPropertyCodecState
- * @ingroup PropertiesIMPL
- */
-struct EncryptionKeyPropertyCodec {
-    typedef acsdkCryptoInterfaces::KeyStoreInterface::KeyChecksum KeyChecksum;
-    typedef acsdkCryptoInterfaces::KeyStoreInterface::DataBlock DataBlock;
-    typedef acsdkCryptoInterfaces::KeyStoreInterface::IV IV;
-    typedef acsdkCryptoInterfaces::CryptoCodecInterface::Tag Tag;
-    typedef acsdkPropertiesInterfaces::PropertiesInterface::Bytes Bytes;
-
-    /**
-     * @brief Produces encryption key property in DER form.
-     *
-     * @param[in] cryptoFactory Crypto API factory.
-     * @param[in] mainKeyAlias Main key alias.
-     * @param[in] mainKeyChecksum Main key checksum.
-     * @param[in] dataKeyAlgorithm Algorithm used to wrap data key.
-     * @param[in] dataKeyIV Initialization vector used to wrap data key.
-     * @param[in] dataKeyCiphertext Wrapped data key.
-     * @param[in] dataKeyTag Data key tag.
-     * @param[in] dataAlgorithm Algorithm for data encryption.
-     *
-     * @param[out] derEncoded Encoded properties in DER format.
-     *
-     * @return True on success.
-     */
-    static bool encode(
-        const std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
-        const std::string& mainKeyAlias,
-        const KeyChecksum& mainKeyChecksum,
-        alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType dataKeyAlgorithm,
-        const IV& dataKeyIV,
-        const DataBlock& dataKeyCiphertext,
-        const Tag& dataKeyTag,
-        alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType dataAlgorithm,
-        Bytes& derEncoded) noexcept;
-
-    /**
-     * @brief Decode encryption key property.
-     *
-     * This method parses DER input and extracts encoding fields. Method also computes actual digest for digest
-     * verification.
-     *
-     * @param[in] cryptoFactory Crypto API factory.
-     * @param[in] derEncoded DER-encoded properties.
-     * @param[out] mainKeyAlias Parsed main key alias.
-     * @param[out] mainKeyChecksum Parsed main key checksum.
-     * @param[out] dataKeyAlgorithm Parsed algorithm for data key unwrapping.
-     * @param[out] dataKeyIV Parsed initialization vector for data key unwrapping.
-     * @param[out] dataKeyCiphertext Parsed wrapped data key.
-     * @param[out] dataKeyTag Parsed data key tag.
-     * @param[out] dataAlgorithm Parsed algorithm to encrypt/decrypt data.
-     * @param[out] digestDecoded Parsed digest.
-     * @param[out] digestActual Actual (recomputed) digest.
-     *
-     * @return True on success.
-     */
-    static bool decode(
-        const std::shared_ptr<acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
-        const Bytes& derEncoded,
-        std::string& mainKeyAlias,
-        KeyChecksum& mainKeyChecksum,
-        alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType& dataKeyAlgorithm,
-        IV& dataKeyIV,
-        DataBlock& dataKeyCiphertext,
-        Tag& dataKeyTag,
-        alexaClientSDK::acsdkCryptoInterfaces::AlgorithmType& dataAlgorithm,
-        DataBlock& digestDecoded,
-        DataBlock& digestActual) noexcept;
-};
-
-}  // namespace acsdkProperties
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKPROPERTIES_PRIVATE_ENCRYPTIONKEYPROPERTYCODEC_H_
diff --git a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/Logging.h b/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/Logging.h
deleted file mode 100644
index 2e62f520a3..0000000000
--- a/core/Properties/acsdkProperties/privateInclude/acsdkProperties/private/Logging.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKPROPERTIES_PRIVATE_LOGGING_H_
-#define ACSDKPROPERTIES_PRIVATE_LOGGING_H_
-
-#include <AVSCommon/Utils/Logger/Logger.h>
-
-/**
- * @brief Create a LogEntry.
- *
- * Create a LogEntry using TAG constant and the specified event string.
- *
- * @param[in] event The event string for this @c LogEntry.
- * @private
- * @ingroup acsdkProperties
- */
-#define LX(event) ::alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
-
-/**
- * @brief Create a LogEntry for configuration event.
- *
- * @param[in] event The event string for this @c LogEntry.
- * @param[in] configUri Configuration URI.
- * @private
- * @ingroup acsdkProperties
- */
-#define LX_CFG(event, configUri) LX(event).d(::alexaClientSDK::acsdkProperties::CONFIG_URI, configUri)
-
-/**
- * @brief Create a LogEntry for configuration event.
- *
- * @param[in] event The event string for this @c LogEntry.
- * @param[in] configUri Configuration URI.
- * @param[in] key Key name.
- * @private
- * @ingroup acsdkProperties
- */
-#define LX_CFG_KEY(event, configUri, key) LX_CFG(event, configUri).d(::alexaClientSDK::acsdkProperties::KEY, key)
-
-/**
- * @brief Macro to help compiler happy when variable is unused.
- *
- * When variables are passed for logging events, compiler complains when logging is disabled (as variables become
- * unused. This macro marks variable as used to suppress build errors.
- *
- * @param[in] var Variable name.
- *
- * @private
- * @ingroup acsdkProperties
- */
-#define ACSDK_UNUSED_VARIABLE(var) (void)var
-
-namespace alexaClientSDK {
-namespace avsCommon {
-namespace utils {
-namespace logger {
-
-template <>
-LogEntry& LogEntry::d(const char* key, const std::vector<unsigned char>& value);
-
-}  // namespace logger
-}  // namespace utils
-}  // namespace avsCommon
-}  // namespace alexaClientSDK
-
-namespace alexaClientSDK {
-namespace acsdkProperties {
-
-/// String to identify config URI.
-/// @private
-extern const std::string CONFIG_URI;
-
-/// String to identify key.
-/// @private
-extern const std::string KEY;
-
-}  // namespace acsdkProperties
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKPROPERTIES_PRIVATE_LOGGING_H_
diff --git a/core/Properties/acsdkProperties/src/EncryptedPropertiesFactories.cpp b/core/Properties/acsdkProperties/src/EncryptedPropertiesFactories.cpp
deleted file mode 100644
index c38b76371d..0000000000
--- a/core/Properties/acsdkProperties/src/EncryptedPropertiesFactories.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#include <acsdkProperties/MiscStorageAdapter.h>
-#include <acsdkProperties/private/EncryptedPropertiesFactory.h>
-#include <acsdkProperties/private/Logging.h>
-
-namespace alexaClientSDK {
-namespace acsdkProperties {
-
-using namespace ::alexaClientSDK::avsCommon::sdkInterfaces::storage;
-using namespace ::alexaClientSDK::acsdkCryptoInterfaces;
-
-/// String to identify log entries originating from this file.
-/// @private
-static const std::string TAG{"EncryptedPropertiesFactoryApi"};
-
-std::shared_ptr<PropertiesFactoryInterface> createEncryptedPropertiesFactory(
-    const std::shared_ptr<PropertiesFactoryInterface>& innerPropertiesFactory,
-    const std::shared_ptr<CryptoFactoryInterface>& cryptoFactory,
-    const std::shared_ptr<KeyStoreInterface>& keyStore) noexcept {
-    auto res = EncryptedPropertiesFactory::create(innerPropertiesFactory, cryptoFactory, keyStore);
-    if (!res) {
-        ACSDK_ERROR(LX("createEncryptedPropertiesFactoryFailed"));
-    }
-    return res;
-}
-
-std::shared_ptr<alexaClientSDK::acsdkPropertiesInterfaces::PropertiesFactoryInterface> createEncryptedPropertiesFactory(
-    const std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::storage::MiscStorageInterface>& innerStorage,
-    const std::shared_ptr<MiscStorageUriMapperInterface>& uriMapper,
-    const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::CryptoFactoryInterface>& cryptoFactory,
-    const std::shared_ptr<alexaClientSDK::acsdkCryptoInterfaces::KeyStoreInterface>& keyStore) noexcept {
-    auto adapter = createPropertiesFactory(innerStorage, uriMapper);
-    if (!adapter) {
-        ACSDK_ERROR(LX("createEncryptedPropertiesFactoryFailed").d("reason", "miscStorageAdapterCreateFailed"));
-        return nullptr;
-    }
-    return createEncryptedPropertiesFactory(adapter, cryptoFactory, keyStore);
-}
-
-}  // namespace acsdkProperties
-}  // namespace alexaClientSDK
diff --git a/core/Properties/acsdkPropertiesInterfaces/doc/Namespaces.dox b/core/Properties/acsdkPropertiesInterfaces/doc/Namespaces.dox
deleted file mode 100644
index 60a7d09a24..0000000000
--- a/core/Properties/acsdkPropertiesInterfaces/doc/Namespaces.dox
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/**
- * \namespace ::alexaClientSDK::acsdkPropertiesInterfaces
- * \brief Properties API Interfaces and Data Types.
- * \ingroup PropertiesAPI
- */
diff --git a/core/Properties/acsdkPropertiesInterfaces/doc/PropertiesAPI.dox b/core/Properties/acsdkPropertiesInterfaces/doc/PropertiesAPI.dox
deleted file mode 100644
index 47098f32aa..0000000000
--- a/core/Properties/acsdkPropertiesInterfaces/doc/PropertiesAPI.dox
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/**
- * \defgroup PropertiesAPI
- * \defgroup PropertiesAPI Properties API
- * @brief Interfaces for accessing persistent configuration.
- *
- * Properties API provides interfaces for accessing persistent configuration. The API doesn't mandate how the
- * configuration is stored, but assumes that it can be accessed as a group of containers. A single container can be
- * identified by configuration URI (Uniform ResourceLocator).
- *
- * Usage Example:
- * \code{.cpp}
- * auto properties = propertiesFactory->getProperties("componentName/tableName");
- * properties->putString("propertyName", "stringValue");
- * \endcode
- *
- * ACSDK provides reference implementation of \ref PropertiesAPI to use with \ref MiscStorageInterface and to store
- * properties values in encrypted form. See \ref PropertiesIMPL for documentation on reference implementation.
- *
- * \sa PropertiesIMPL
- * \sa \ref acsdkPropertiesInterfaces Namespace
- * \sa \ref acsdkPropertiesInterfaces::test Namespace
- */
diff --git a/core/Properties/acsdkPropertiesInterfaces/test/doc/Namespaces.dox b/core/Properties/acsdkPropertiesInterfaces/test/doc/Namespaces.dox
deleted file mode 100644
index c5e35754b6..0000000000
--- a/core/Properties/acsdkPropertiesInterfaces/test/doc/Namespaces.dox
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-/**
- * \namespace ::alexaClientSDK::acsdkPropertiesInterfaces::test
- * \brief Test utilities for \ref PropertiesAPI
- * \ingroup PropertiesAPI
- * \sa PropertiesAPI.
- */
diff --git a/core/Properties/acsdkPropertiesInterfaces/test/include/acsdkPropertiesInterfaces/test/MockProperties.h b/core/Properties/acsdkPropertiesInterfaces/test/include/acsdkPropertiesInterfaces/test/MockProperties.h
deleted file mode 100644
index 71b8d8cecd..0000000000
--- a/core/Properties/acsdkPropertiesInterfaces/test/include/acsdkPropertiesInterfaces/test/MockProperties.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKPROPERTIESINTERFACES_TEST_MOCKPROPERTIES_H_
-#define ACSDKPROPERTIESINTERFACES_TEST_MOCKPROPERTIES_H_
-
-#include <gmock/gmock.h>
-
-#include <acsdkPropertiesInterfaces/PropertiesInterface.h>
-#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
-
-namespace alexaClientSDK {
-namespace acsdkPropertiesInterfaces {
-namespace test {
-
-//! Mock class for @c PropertiesInterface.
-/**
- * \ingroup PropertiesAPI
- */
-class MockProperties : public PropertiesInterface {
-public:
-    /// @name PropertiesInterface methods
-    ///@{
-    bool getString(const std::string& key, std::string& value) noexcept override;
-    bool putString(const std::string& key, const std::string& value) noexcept override;
-    bool getBytes(const std::string& key, Bytes& value) noexcept override;
-    bool putBytes(const std::string& key, const Bytes& value) noexcept override;
-    bool getKeys(std::unordered_set<std::string>& keys) noexcept override;
-    bool remove(const std::string& key) noexcept override;
-    bool clear() noexcept override;
-    ///@}
-    /// @name PropertiesInterface stub methods for 1.8.x gmock
-    ///@{
-    MOCK_METHOD2(_getString, bool(const std::string&, std::string&));
-    MOCK_METHOD2(_putString, bool(const std::string&, const std::string&));
-    MOCK_METHOD2(_getBytes, bool(const std::string&, Bytes&));
-    MOCK_METHOD2(_putBytes, bool(const std::string&, const Bytes&));
-    MOCK_METHOD1(_getKeys, bool(std::unordered_set<std::string>&));
-    MOCK_METHOD1(_remove, bool(const std::string&));
-    MOCK_METHOD0(_clear, bool());
-    ///@}
-};
-
-inline bool MockProperties::getString(const std::string& key, std::string& value) noexcept {
-    return _getString(key, value);
-}
-
-inline bool MockProperties::putString(const std::string& key, const std::string& value) noexcept {
-    return _putString(key, value);
-}
-
-inline bool MockProperties::getBytes(const std::string& key, Bytes& value) noexcept {
-    return _getBytes(key, value);
-}
-
-inline bool MockProperties::putBytes(const std::string& key, const Bytes& value) noexcept {
-    return _putBytes(key, value);
-}
-
-inline bool MockProperties::getKeys(std::unordered_set<std::string>& keys) noexcept {
-    return _getKeys(keys);
-}
-
-inline bool MockProperties::remove(const std::string& key) noexcept {
-    return _remove(key);
-}
-
-inline bool MockProperties::clear() noexcept {
-    return _clear();
-}
-
-}  // namespace test
-}  // namespace acsdkPropertiesInterfaces
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKPROPERTIESINTERFACES_TEST_MOCKPROPERTIES_H_
diff --git a/core/Properties/acsdkPropertiesInterfaces/test/include/acsdkPropertiesInterfaces/test/MockPropertiesFactory.h b/core/Properties/acsdkPropertiesInterfaces/test/include/acsdkPropertiesInterfaces/test/MockPropertiesFactory.h
deleted file mode 100644
index a9fe371096..0000000000
--- a/core/Properties/acsdkPropertiesInterfaces/test/include/acsdkPropertiesInterfaces/test/MockPropertiesFactory.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKPROPERTIESINTERFACES_TEST_MOCKPROPERTIESFACTORY_H_
-#define ACSDKPROPERTIESINTERFACES_TEST_MOCKPROPERTIESFACTORY_H_
-
-#include <gmock/gmock.h>
-
-#include <acsdkPropertiesInterfaces/PropertiesFactoryInterface.h>
-#include <acsdkPropertiesInterfaces/PropertiesInterface.h>
-#include <AVSCommon/SDKInterfaces/Storage/MiscStorageInterface.h>
-
-namespace alexaClientSDK {
-namespace acsdkPropertiesInterfaces {
-namespace test {
-
-//! Mock class for @c PropertiesFactoryInterface.
-/**
- * \ingroup PropertiesAPI
- */
-class MockPropertiesFactory : public PropertiesFactoryInterface {
-public:
-    /// @name PropertiesFactoryInterface methods
-    ///@{
-    std::shared_ptr<PropertiesInterface> getProperties(const std::string& configUri) noexcept override;
-    ///@}
-    /// @name PropertiesFactoryInterface stub methods for 1.8.x gmock
-    ///@{
-    MOCK_METHOD1(_getProperties, std::shared_ptr<PropertiesInterface>(const std::string&));
-    ///@}
-};
-
-inline std::shared_ptr<PropertiesInterface> MockPropertiesFactory::getProperties(
-    const std::string& configUri) noexcept {
-    return _getProperties(configUri);
-}
-
-}  // namespace test
-}  // namespace acsdkPropertiesInterfaces
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKPROPERTIESINTERFACES_TEST_MOCKPROPERTIESFACTORY_H_
diff --git a/core/Properties/acsdkPropertiesInterfaces/test/src/CMakeLists.txt b/core/Properties/acsdkPropertiesInterfaces/test/src/CMakeLists.txt
deleted file mode 100644
index 2865f89306..0000000000
--- a/core/Properties/acsdkPropertiesInterfaces/test/src/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-
-if (BUILD_TESTING)
-    add_library(acsdkPropertiesInterfacesTestLib STATIC
-            StubProperties.cpp
-            StubPropertiesFactory.cpp)
-    target_compile_definitions(acsdkPropertiesInterfacesTestLib PRIVATE ACSDK_LOG_MODULE=acsdkPropertiesInterfacesTest)
-    target_include_directories(acsdkPropertiesInterfacesTestLib PUBLIC "../include")
-    target_link_libraries(acsdkPropertiesInterfacesTestLib PRIVATE acsdkPropertiesInterfaces acsdkCodecUtils)
-endif()
diff --git a/core/acsdkAlexaEventProcessedNotifierInterfaces/include/acsdkAlexaEventProcessedNotifierInterfaces/AlexaEventProcessedNotifierInterface.h b/core/acsdkAlexaEventProcessedNotifierInterfaces/include/acsdkAlexaEventProcessedNotifierInterfaces/AlexaEventProcessedNotifierInterface.h
index 939c116ad8..b7fe9c269f 100644
--- a/core/acsdkAlexaEventProcessedNotifierInterfaces/include/acsdkAlexaEventProcessedNotifierInterfaces/AlexaEventProcessedNotifierInterface.h
+++ b/core/acsdkAlexaEventProcessedNotifierInterfaces/include/acsdkAlexaEventProcessedNotifierInterfaces/AlexaEventProcessedNotifierInterface.h
@@ -16,7 +16,7 @@
 #ifndef ACSDKALEXAEVENTPROCESSEDNOTIFIERINTERFACES_ALEXAEVENTPROCESSEDNOTIFIERINTERFACE_H_
 #define ACSDKALEXAEVENTPROCESSEDNOTIFIERINTERFACES_ALEXAEVENTPROCESSEDNOTIFIERINTERFACE_H_
 
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
 #include <AVSCommon/SDKInterfaces/AlexaEventProcessedObserverInterface.h>
 
 namespace alexaClientSDK {
@@ -26,7 +26,7 @@ namespace acsdkAlexaEventProcessedNotifierInterfaces {
  * Interface for registering to observe AlexaEventProcessed notifications.
  */
 using AlexaEventProcessedNotifierInterface =
-    acsdkNotifierInterfaces::NotifierInterface<avsCommon::sdkInterfaces::AlexaEventProcessedObserverInterface>;
+    notifierInterfaces::NotifierInterface<avsCommon::sdkInterfaces::AlexaEventProcessedObserverInterface>;
 
 }  // namespace acsdkAlexaEventProcessedNotifierInterfaces
 }  // namespace alexaClientSDK
diff --git a/core/acsdkCore/include/acsdkCore/CoreComponent.h b/core/acsdkCore/include/acsdkCore/CoreComponent.h
index 63bd23f3d9..dbc9bb23ec 100644
--- a/core/acsdkCore/include/acsdkCore/CoreComponent.h
+++ b/core/acsdkCore/include/acsdkCore/CoreComponent.h
@@ -43,7 +43,6 @@
 #include <AVSCommon/SDKInterfaces/Endpoints/EndpointBuilderInterface.h>
 #include <AVSCommon/SDKInterfaces/Endpoints/EndpointCapabilitiesRegistrarInterface.h>
 #include <AVSCommon/SDKInterfaces/Endpoints/DefaultEndpointAnnotation.h>
-#include <AVSCommon/SDKInterfaces/VisualFocusAnnotation.h>
 #include <Alexa/AlexaInterfaceMessageSender.h>
 #include <InterruptModel/InterruptModel.h>
 #include <RegistrationManager/CustomerDataManagerInterface.h>
@@ -80,8 +79,6 @@ using CoreComponent = acsdkManufactory::Component<
     std::shared_ptr<afml::interruptModel::InterruptModel>,
     acsdkManufactory::
         Annotated<avsCommon::sdkInterfaces::AudioFocusAnnotation, avsCommon::sdkInterfaces::FocusManagerInterface>,
-    acsdkManufactory::
-        Annotated<avsCommon::sdkInterfaces::VisualFocusAnnotation, avsCommon::sdkInterfaces::FocusManagerInterface>,
     std::shared_ptr<registrationManager::CustomerDataManagerInterface>,
     std::shared_ptr<registrationManager::RegistrationManagerInterface>,
     std::shared_ptr<registrationManager::RegistrationNotifierInterface>,
diff --git a/core/acsdkCore/src/CoreComponent.cpp b/core/acsdkCore/src/CoreComponent.cpp
index 53d912ac43..1f162a24e8 100644
--- a/core/acsdkCore/src/CoreComponent.cpp
+++ b/core/acsdkCore/src/CoreComponent.cpp
@@ -68,7 +68,7 @@ using namespace registrationManager;
 using namespace synchronizeStateSender;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CoreComponent");
+#define TAG "CoreComponent"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/core/acsdkPostConnectOperationProviderRegistrar/src/PostConnectOperationProviderRegistrar.cpp b/core/acsdkPostConnectOperationProviderRegistrar/src/PostConnectOperationProviderRegistrar.cpp
index b51b9ad8a6..6a988f2976 100644
--- a/core/acsdkPostConnectOperationProviderRegistrar/src/PostConnectOperationProviderRegistrar.cpp
+++ b/core/acsdkPostConnectOperationProviderRegistrar/src/PostConnectOperationProviderRegistrar.cpp
@@ -21,7 +21,7 @@ namespace alexaClientSDK {
 namespace acsdkPostConnectOperationProviderRegistrar {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("PostConnectOperationProviderRegistrar");
+#define TAG "PostConnectOperationProviderRegistrar"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/core/acsdkRegistrationManager/include/RegistrationManager/RegistrationManagerFactory.h b/core/acsdkRegistrationManager/include/RegistrationManager/RegistrationManagerFactory.h
new file mode 100644
index 0000000000..025449cc72
--- /dev/null
+++ b/core/acsdkRegistrationManager/include/RegistrationManager/RegistrationManagerFactory.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef REGISTRATIONMANAGER_REGISTRATIONMANAGERFACTORY_H_
+#define REGISTRATIONMANAGER_REGISTRATIONMANAGERFACTORY_H_
+
+#include <memory>
+
+#include <AVSCommon/SDKInterfaces/AVSConnectionManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/DirectiveSequencerInterface.h>
+#include <AVSCommon/Utils/Metrics/MetricRecorderInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <RegistrationManager/CustomerDataManagerInterface.h>
+#include <RegistrationManager/RegistrationManagerInterface.h>
+#include <RegistrationManager/RegistrationNotifierInterface.h>
+
+namespace alexaClientSDK {
+namespace registrationManager {
+
+/**
+ * Creates a new instance of @c RegistrationManagerInterface.
+ *
+ * @param customerDataManager The @c CustomerDataManagerInterface to handle customer data handlers.
+ * @param connectionManager The @c AVSConnectionManagerInterface to handle connection with AVS.
+ * @param directiveSequencer The @c DirectiveSequencerInterface to handle @c AVSDirective instances.
+ * @param metricRecorder The @c MetricRecorderInterface to record metrics to send to sinks.
+ * @param notifier The @c RegistrationNotifierInterface to observe changes to the RegistrationManager.
+ * @return A pointer to the @c RegistrationManagerInterface.
+ */
+std::shared_ptr<registrationManager::RegistrationManagerInterface> createRegistrationManager(
+    const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AVSConnectionManagerInterface>& connectionManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::DirectiveSequencerInterface>& directiveSequencer,
+    const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder,
+    const std::shared_ptr<registrationManager::RegistrationNotifierInterface>& notifier);
+
+/**
+ * Creates a new instance of @c RegistrationNotifierInterface.
+ *
+ * @return A pointer to the @c RegistrationNotifierInterface.
+ */
+std::shared_ptr<registrationManager::RegistrationNotifierInterface> createRegistrationNotifier();
+
+}  // namespace registrationManager
+}  // namespace alexaClientSDK
+
+#endif  // REGISTRATIONMANAGER_REGISTRATIONMANAGERFACTORY_H_
diff --git a/core/acsdkRegistrationManager/privateInclude/RegistrationManager/RegistrationNotifier.h b/core/acsdkRegistrationManager/privateInclude/RegistrationManager/RegistrationNotifier.h
index 19c1640920..625190cf8c 100644
--- a/core/acsdkRegistrationManager/privateInclude/RegistrationManager/RegistrationNotifier.h
+++ b/core/acsdkRegistrationManager/privateInclude/RegistrationManager/RegistrationNotifier.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 #include <RegistrationManager/RegistrationNotifierInterface.h>
 #include <RegistrationManager/RegistrationObserverInterface.h>
 
@@ -28,7 +28,7 @@ namespace registrationManager {
 /**
  * Implementation of the @c RegistrationNotifier.
  */
-class RegistrationNotifier : public acsdkNotifier::Notifier<registrationManager::RegistrationObserverInterface> {
+class RegistrationNotifier : public notifier::Notifier<registrationManager::RegistrationObserverInterface> {
 public:
     /**
      * Factory method to create a @c RegistrationNotifier.
diff --git a/core/acsdkRegistrationManager/src/CMakeLists.txt b/core/acsdkRegistrationManager/src/CMakeLists.txt
index 2c6ecc3c87..19f6742d69 100644
--- a/core/acsdkRegistrationManager/src/CMakeLists.txt
+++ b/core/acsdkRegistrationManager/src/CMakeLists.txt
@@ -4,6 +4,7 @@ add_library(RegistrationManager
         CustomerDataHandler.cpp
         CustomerDataManager.cpp
         CustomerDataManagerFactory.cpp
+        RegistrationManagerFactory.cpp
         RegistrationManager.cpp
         RegistrationManagerComponent.cpp
         RegistrationNotifier.cpp)
diff --git a/core/acsdkRegistrationManager/src/CustomerDataHandler.cpp b/core/acsdkRegistrationManager/src/CustomerDataHandler.cpp
index d0335d0274..718086b550 100644
--- a/core/acsdkRegistrationManager/src/CustomerDataHandler.cpp
+++ b/core/acsdkRegistrationManager/src/CustomerDataHandler.cpp
@@ -20,7 +20,7 @@
 #include "RegistrationManager/CustomerDataHandler.h"
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CustomerDataHandler");
+#define TAG "CustomerDataHandler"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/core/acsdkRegistrationManager/src/CustomerDataManager.cpp b/core/acsdkRegistrationManager/src/CustomerDataManager.cpp
index 3e103dd1d9..40d6558d72 100644
--- a/core/acsdkRegistrationManager/src/CustomerDataManager.cpp
+++ b/core/acsdkRegistrationManager/src/CustomerDataManager.cpp
@@ -22,7 +22,7 @@ namespace alexaClientSDK {
 namespace registrationManager {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("CustomerDataManager");
+#define TAG "CustomerDataManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/core/acsdkRegistrationManager/src/RegistrationManager.cpp b/core/acsdkRegistrationManager/src/RegistrationManager.cpp
index 5a75a2b758..eb3a19a156 100644
--- a/core/acsdkRegistrationManager/src/RegistrationManager.cpp
+++ b/core/acsdkRegistrationManager/src/RegistrationManager.cpp
@@ -34,7 +34,7 @@ static const std::string METRIC_SOURCE_PREFIX = "REGISTRATION_MANAGER-";
 static const std::string LOGOUT_OCCURRED = "LOGOUT_OCCURRED";
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("RegistrationManager");
+#define TAG "RegistrationManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/core/acsdkRegistrationManager/src/RegistrationManagerFactory.cpp b/core/acsdkRegistrationManager/src/RegistrationManagerFactory.cpp
new file mode 100644
index 0000000000..484bc0d53a
--- /dev/null
+++ b/core/acsdkRegistrationManager/src/RegistrationManagerFactory.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <RegistrationManager/CustomerDataManager.h>
+#include <RegistrationManager/RegistrationManager.h>
+#include <RegistrationManager/RegistrationNotifier.h>
+
+#include "RegistrationManager/RegistrationManagerFactory.h"
+
+namespace alexaClientSDK {
+namespace registrationManager {
+
+std::shared_ptr<registrationManager::RegistrationManagerInterface> createRegistrationManager(
+    const std::shared_ptr<registrationManager::CustomerDataManagerInterface>& customerDataManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::AVSConnectionManagerInterface>& connectionManager,
+    const std::shared_ptr<avsCommon::sdkInterfaces::DirectiveSequencerInterface>& directiveSequencer,
+    const std::shared_ptr<avsCommon::utils::metrics::MetricRecorderInterface>& metricRecorder,
+    const std::shared_ptr<registrationManager::RegistrationNotifierInterface>& notifier) {
+    auto registrationManager = RegistrationManager::createRegistrationManagerInterface(
+        customerDataManager, notifier, connectionManager, directiveSequencer, metricRecorder);
+    return registrationManager;
+}
+
+std::shared_ptr<registrationManager::RegistrationNotifierInterface> createRegistrationNotifier() {
+    return RegistrationNotifier::createRegistrationNotifierInterface();
+}
+
+}  // namespace registrationManager
+}  // namespace alexaClientSDK
diff --git a/core/acsdkRegistrationManagerInterfaces/include/RegistrationManager/RegistrationNotifierInterface.h b/core/acsdkRegistrationManagerInterfaces/include/RegistrationManager/RegistrationNotifierInterface.h
index c5a33530a4..b0db935e4d 100644
--- a/core/acsdkRegistrationManagerInterfaces/include/RegistrationManager/RegistrationNotifierInterface.h
+++ b/core/acsdkRegistrationManagerInterfaces/include/RegistrationManager/RegistrationNotifierInterface.h
@@ -15,7 +15,7 @@
 #ifndef REGISTRATIONMANAGER_REGISTRATIONNOTIFIERINTERFACE_H_
 #define REGISTRATIONMANAGER_REGISTRATIONNOTIFIERINTERFACE_H_
 
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
 
 #include "RegistrationManager/RegistrationObserverInterface.h"
 
@@ -25,7 +25,7 @@ namespace registrationManager {
 /**
  * Interface for registering to observe changes to RegistrationManager.
  */
-using RegistrationNotifierInterface = acsdkNotifierInterfaces::NotifierInterface<RegistrationObserverInterface>;
+using RegistrationNotifierInterface = notifierInterfaces::NotifierInterface<RegistrationObserverInterface>;
 
 }  // namespace registrationManager
 }  // namespace alexaClientSDK
diff --git a/core/acsdkSystemClockMonitor/include/acsdkSystemClockMonitor/SystemClockNotifier.h b/core/acsdkSystemClockMonitor/include/acsdkSystemClockMonitor/SystemClockNotifier.h
index 890dd11cf4..d327f98be2 100644
--- a/core/acsdkSystemClockMonitor/include/acsdkSystemClockMonitor/SystemClockNotifier.h
+++ b/core/acsdkSystemClockMonitor/include/acsdkSystemClockMonitor/SystemClockNotifier.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 #include <acsdkSystemClockMonitorInterfaces/SystemClockNotifierInterface.h>
 #include <acsdkSystemClockMonitorInterfaces/SystemClockMonitorObserverInterface.h>
 
@@ -29,7 +29,7 @@ namespace acsdkSystemClockMonitor {
  * Implementation of StartupNotifierInterface.
  */
 class SystemClockNotifier
-        : public acsdkNotifier::Notifier<acsdkSystemClockMonitorInterfaces::SystemClockMonitorObserverInterface> {
+        : public notifier::Notifier<acsdkSystemClockMonitorInterfaces::SystemClockMonitorObserverInterface> {
 public:
     /**
      * Factory method.
diff --git a/core/acsdkSystemClockMonitor/src/SystemClockMonitor.cpp b/core/acsdkSystemClockMonitor/src/SystemClockMonitor.cpp
index 0349488587..834dd951fd 100644
--- a/core/acsdkSystemClockMonitor/src/SystemClockMonitor.cpp
+++ b/core/acsdkSystemClockMonitor/src/SystemClockMonitor.cpp
@@ -24,7 +24,7 @@ using namespace acsdkSystemClockMonitorInterfaces;
 using namespace avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("SystemClockMonitor");
+#define TAG "SystemClockMonitor"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/core/acsdkSystemClockMonitorInterfaces/include/acsdkSystemClockMonitorInterfaces/SystemClockNotifierInterface.h b/core/acsdkSystemClockMonitorInterfaces/include/acsdkSystemClockMonitorInterfaces/SystemClockNotifierInterface.h
index 71be9ba3f8..e0abfb58c9 100644
--- a/core/acsdkSystemClockMonitorInterfaces/include/acsdkSystemClockMonitorInterfaces/SystemClockNotifierInterface.h
+++ b/core/acsdkSystemClockMonitorInterfaces/include/acsdkSystemClockMonitorInterfaces/SystemClockNotifierInterface.h
@@ -16,7 +16,7 @@
 #ifndef ACSDKSYSTEMCLOCKMONITORINTERFACES_SYSTEMCLOCKNOTIFIERINTERFACE_H_
 #define ACSDKSYSTEMCLOCKMONITORINTERFACES_SYSTEMCLOCKNOTIFIERINTERFACE_H_
 
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
 
 #include "acsdkSystemClockMonitorInterfaces/SystemClockMonitorObserverInterface.h"
 
@@ -26,7 +26,7 @@ namespace acsdkSystemClockMonitorInterfaces {
 /**
  * Interface for registering to observe when the system clock is synchronized.
  */
-using SystemClockNotifierInterface = acsdkNotifierInterfaces::NotifierInterface<SystemClockMonitorObserverInterface>;
+using SystemClockNotifierInterface = notifierInterfaces::NotifierInterface<SystemClockMonitorObserverInterface>;
 
 }  // namespace acsdkSystemClockMonitorInterfaces
 }  // namespace alexaClientSDK
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index f3d2e3f04b..43b6064ccd 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,14 +1,35 @@
 find_package(Doxygen ${DOXYGEN_PACKAGE_CONFIG})
 
 if(NOT DOXYGEN_FOUND)
-    message(FATAL "Doxygen is required to generate documentation.")
+    message(WARNING "Doxygen is required to generate documentation.")
 else()
     set(DOXYGEN_CFG_IN doxygen.cfg.in)
+
     set(DOXYGEN_CFG ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg)
+    set(CMAKE_EXTRACT_PRIVATE "NO")
+    set(CMAKE_EXCLUDE_PATTERNS "*/privateInclude/* */src/* */test/*" "*/internal/*")
     configure_file(${DOXYGEN_CFG_IN} ${DOXYGEN_CFG} @ONLY)
     add_custom_target(
         doc COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_CFG}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         COMMENT "Generating API documentation with Doxygen"
         VERBATIM)
+
+    set(DOXYGEN_CFG_ALL ${CMAKE_CURRENT_BINARY_DIR}/doxygen_all.cfg)
+    set(CMAKE_EXCLUDE_PATTERNS "")
+    configure_file(${DOXYGEN_CFG_IN} ${DOXYGEN_CFG_ALL} @ONLY)
+    add_custom_target(
+        doc-all COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_CFG_ALL}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        COMMENT "Generating API documentation with Doxygen including private headers content"
+        VERBATIM)
+
+    set(DOXYGEN_CFG_ALL_PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/doxygen_all_private.cfg)
+    set(CMAKE_EXTRACT_PRIVATE "YES")
+    configure_file(${DOXYGEN_CFG_IN} ${DOXYGEN_CFG_ALL_PRIVATE} @ONLY)
+    add_custom_target(
+        doc-all-private COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_CFG_ALL_PRIVATE}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        COMMENT "Generating API documentation with Doxygen including private headers content and private elements"
+        VERBATIM)
 endif()
diff --git a/doc/doxygen.cfg.in b/doc/doxygen.cfg.in
index 848cd8237f..8c36e2633c 100644
--- a/doc/doxygen.cfg.in
+++ b/doc/doxygen.cfg.in
@@ -360,14 +360,14 @@ IDL_PROPERTY_SUPPORT   = YES
 # all members of a group must be documented explicitly.
 # The default value is: NO.
 
-DISTRIBUTE_GROUP_DOC   = NO
+DISTRIBUTE_GROUP_DOC   = YES
 
 # If one adds a struct or class to a group and this option is enabled, then also
 # any nested class or struct is added to the same group. By default this option
 # is disabled and one has to add nested compounds explicitly via \ingroup.
 # The default value is: NO.
 
-GROUP_NESTED_COMPOUNDS = NO
+GROUP_NESTED_COMPOUNDS = YES
 
 # Set the SUBGROUPING tag to YES to allow class member groups of the same type
 # (for instance a group of public functions) to be put as a subgroup of that
@@ -441,7 +441,7 @@ EXTRACT_ALL            = YES
 # be included in the documentation.
 # The default value is: NO.
 
-EXTRACT_PRIVATE        = NO
+EXTRACT_PRIVATE        = @CMAKE_EXTRACT_PRIVATE@
 
 # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
@@ -890,7 +890,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = @CMAKE_EXCLUDE_PATTERNS@
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
diff --git a/shared/CMakeLists.txt b/shared/CMakeLists.txt
index 64ba8a82da..6c54b6f539 100644
--- a/shared/CMakeLists.txt
+++ b/shared/CMakeLists.txt
@@ -1,14 +1,13 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
-add_subdirectory("acsdkCommunication")
-add_subdirectory("acsdkCommunicationInterfaces")
-add_subdirectory("acsdkManufactory")
-add_subdirectory("acsdkNotifier")
-add_subdirectory("acsdkNotifierInterfaces")
-add_subdirectory("acsdkShared")
-add_subdirectory("acsdkShutdownManager")
-add_subdirectory("acsdkShutdownManagerInterfaces")
-add_subdirectory("acsdkStartupManager")
-add_subdirectory("acsdkStartupManagerInterfaces")
-add_subdirectory("KWD")
-
+# Add all subdirectories within the current path
+file(GLOB DIRECTORY_ENTRIES "${CMAKE_CURRENT_LIST_DIR}/*/")
+foreach(DIRECTORY IN LISTS DIRECTORY_ENTRIES)
+    if(IS_DIRECTORY "${DIRECTORY}")
+        if(EXISTS "${DIRECTORY}/CMakeLists.txt")
+            add_subdirectory("${DIRECTORY}")
+        else()
+            message(WARNING "Could not find CMakeLists.txt within ${DIRECTORY}")
+        endif()
+    endif()
+endforeach()
\ No newline at end of file
diff --git a/shared/KWD/acsdkKWDImplementations/include/acsdkKWDImplementations/AbstractKeywordDetector.h b/shared/KWD/acsdkKWDImplementations/include/acsdkKWDImplementations/AbstractKeywordDetector.h
index 7e8231a3d8..6f5a6fcf9d 100644
--- a/shared/KWD/acsdkKWDImplementations/include/acsdkKWDImplementations/AbstractKeywordDetector.h
+++ b/shared/KWD/acsdkKWDImplementations/include/acsdkKWDImplementations/AbstractKeywordDetector.h
@@ -73,23 +73,27 @@ class AbstractKeywordDetector {
      *
      * @param keyWordObservers The observers to notify of keyword detections.
      * @param keyWordDetectorStateObservers The observers to notify of state changes in the engine.
+     * @param supportsDavs Boolean to indicate whether keyword detector supports Davs or not.
      */
     AbstractKeywordDetector(
         std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::KeyWordObserverInterface>> keyWordObservers =
             std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::KeyWordObserverInterface>>(),
         std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::KeyWordDetectorStateObserverInterface>>
             keyWordDetectorStateObservers =
-                std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::KeyWordDetectorStateObserverInterface>>());
+                std::unordered_set<std::shared_ptr<avsCommon::sdkInterfaces::KeyWordDetectorStateObserverInterface>>(),
+        bool supportsDavs = false);
 
     /**
      * Constructor.
      *
      * @param keyWordNotifier The object with which to notifiy observers of keyword detections.
      * @param KeyWordDetectorStateNotifier The object with which to notify observers of state changes in the engine.
+     * @param supportsDavs Boolean to indicate whether keyword detector supports Davs or not.
      */
     AbstractKeywordDetector(
         std::shared_ptr<acsdkKWDInterfaces::KeywordNotifierInterface> keywordNotifier,
-        std::shared_ptr<acsdkKWDInterfaces::KeywordDetectorStateNotifierInterface> keyWordDetectorStateNotifier);
+        std::shared_ptr<acsdkKWDInterfaces::KeywordDetectorStateNotifierInterface> keyWordDetectorStateNotifier,
+        bool supportsDavs = false);
 
     /**
      * Notifies all keyword observers of the keyword detection.
@@ -142,6 +146,13 @@ class AbstractKeywordDetector {
      */
     static bool isByteswappingRequired(avsCommon::utils::AudioFormat audioFormat);
 
+    /**
+     * Checks to see whether keyword detector is compatible with DAVS.
+     *
+     * @return @c true if Davs is supported @c false otherwise.
+     */
+    bool isDavsSupported();
+
 private:
     /**
      * The notifier to notify observers of key word detections.
@@ -162,6 +173,9 @@ class AbstractKeywordDetector {
 
     /// Lock to protect m_detectorState.
     mutable std::mutex m_detectorStateMutex;
+
+    /// Boolean to indicate whether the keyword detector is compatible with DAVS.
+    bool m_supportsDavs;
 };
 
 }  // namespace acsdkKWDImplementations
diff --git a/shared/KWD/acsdkKWDImplementations/privateInclude/acsdkKWDImplementations/KeywordDetectorStateNotifier.h b/shared/KWD/acsdkKWDImplementations/privateInclude/acsdkKWDImplementations/KeywordDetectorStateNotifier.h
index ef5bd2ee81..33af58700b 100644
--- a/shared/KWD/acsdkKWDImplementations/privateInclude/acsdkKWDImplementations/KeywordDetectorStateNotifier.h
+++ b/shared/KWD/acsdkKWDImplementations/privateInclude/acsdkKWDImplementations/KeywordDetectorStateNotifier.h
@@ -19,7 +19,7 @@
 #include <memory>
 
 #include <acsdkKWDInterfaces/KeywordDetectorStateNotifierInterface.h>
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 #include <AVSCommon/SDKInterfaces/KeyWordDetectorStateObserverInterface.h>
 
 namespace alexaClientSDK {
@@ -29,7 +29,7 @@ namespace acsdkKWDImplementations {
  * Relays notifications related to KeywordDetectorState.
  */
 class KeywordDetectorStateNotifier
-        : public acsdkNotifier::Notifier<avsCommon::sdkInterfaces::KeyWordDetectorStateObserverInterface> {
+        : public notifier::Notifier<avsCommon::sdkInterfaces::KeyWordDetectorStateObserverInterface> {
 public:
     /**
      * Factory method.
diff --git a/shared/KWD/acsdkKWDImplementations/privateInclude/acsdkKWDImplementations/KeywordNotifier.h b/shared/KWD/acsdkKWDImplementations/privateInclude/acsdkKWDImplementations/KeywordNotifier.h
index ff3788485b..3ce5f73bd4 100644
--- a/shared/KWD/acsdkKWDImplementations/privateInclude/acsdkKWDImplementations/KeywordNotifier.h
+++ b/shared/KWD/acsdkKWDImplementations/privateInclude/acsdkKWDImplementations/KeywordNotifier.h
@@ -19,7 +19,7 @@
 #include <memory>
 
 #include <acsdkKWDInterfaces/KeywordNotifierInterface.h>
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 #include <AVSCommon/SDKInterfaces/KeyWordObserverInterface.h>
 
 namespace alexaClientSDK {
@@ -28,7 +28,7 @@ namespace acsdkKWDImplementations {
 /**
  * Relays notifications related to keyword.
  */
-class KeywordNotifier : public acsdkNotifier::Notifier<avsCommon::sdkInterfaces::KeyWordObserverInterface> {
+class KeywordNotifier : public notifier::Notifier<avsCommon::sdkInterfaces::KeyWordObserverInterface> {
 public:
     /**
      * Factory method.
diff --git a/shared/KWD/acsdkKWDImplementations/src/AbstractKeywordDetector.cpp b/shared/KWD/acsdkKWDImplementations/src/AbstractKeywordDetector.cpp
index 5bcc6aa423..c5a4439e0d 100644
--- a/shared/KWD/acsdkKWDImplementations/src/AbstractKeywordDetector.cpp
+++ b/shared/KWD/acsdkKWDImplementations/src/AbstractKeywordDetector.cpp
@@ -27,7 +27,7 @@ using namespace avsCommon::avs;
 using namespace avsCommon::sdkInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("AbstractKeywordDetector");
+#define TAG "AbstractKeywordDetector"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -56,8 +56,10 @@ void AbstractKeywordDetector::removeKeyWordDetectorStateObserver(
 
 AbstractKeywordDetector::AbstractKeywordDetector(
     std::unordered_set<std::shared_ptr<KeyWordObserverInterface>> keyWordObservers,
-    std::unordered_set<std::shared_ptr<KeyWordDetectorStateObserverInterface>> keyWordDetectorStateObservers) :
-        m_detectorState{KeyWordDetectorStateObserverInterface::KeyWordDetectorState::STREAM_CLOSED} {
+    std::unordered_set<std::shared_ptr<KeyWordDetectorStateObserverInterface>> keyWordDetectorStateObservers,
+    bool supportsDavs) :
+        m_detectorState{KeyWordDetectorStateObserverInterface::KeyWordDetectorState::STREAM_CLOSED},
+        m_supportsDavs(supportsDavs) {
     m_keywordNotifier = KeywordNotifier::createKeywordNotifierInterface();
     for (auto kwObserver : keyWordObservers) {
         m_keywordNotifier->addObserver(kwObserver);
@@ -76,10 +78,12 @@ AbstractKeywordDetector::AbstractKeywordDetector(
 
 AbstractKeywordDetector::AbstractKeywordDetector(
     std::shared_ptr<acsdkKWDInterfaces::KeywordNotifierInterface> keywordNotifier,
-    std::shared_ptr<acsdkKWDInterfaces::KeywordDetectorStateNotifierInterface> keyWordDetectorStateNotifier) :
+    std::shared_ptr<acsdkKWDInterfaces::KeywordDetectorStateNotifierInterface> keyWordDetectorStateNotifier,
+    bool supportsDavs) :
         m_keywordNotifier{keywordNotifier},
         m_keywordDetectorStateNotifier{keyWordDetectorStateNotifier},
-        m_detectorState{KeyWordDetectorStateObserverInterface::KeyWordDetectorState::STREAM_CLOSED} {
+        m_detectorState{KeyWordDetectorStateObserverInterface::KeyWordDetectorState::STREAM_CLOSED},
+        m_supportsDavs(supportsDavs) {
     m_keywordDetectorStateNotifier->setAddObserverFunction(
         [this](std::shared_ptr<KeyWordDetectorStateObserverInterface> stateObserver) {
             std::lock_guard<std::mutex> lock(m_detectorStateMutex);
@@ -162,6 +166,10 @@ ssize_t AbstractKeywordDetector::readFromStream(
     return wordsRead;
 }
 
+bool AbstractKeywordDetector::isDavsSupported() {
+    return m_supportsDavs;
+}
+
 bool AbstractKeywordDetector::isByteswappingRequired(avsCommon::utils::AudioFormat audioFormat) {
     bool isPlatformLittleEndian = false;
     int num = 1;
diff --git a/shared/KWD/acsdkKWDImplementations/test/AbstractKeywordDetectorTest.cpp b/shared/KWD/acsdkKWDImplementations/test/AbstractKeywordDetectorTest.cpp
index 649c7a6ae6..333f94f8fe 100644
--- a/shared/KWD/acsdkKWDImplementations/test/AbstractKeywordDetectorTest.cpp
+++ b/shared/KWD/acsdkKWDImplementations/test/AbstractKeywordDetectorTest.cpp
@@ -20,7 +20,7 @@
 
 #include <acsdkKWDInterfaces/KeywordDetectorStateNotifierInterface.h>
 #include <acsdkKWDInterfaces/KeywordNotifierInterface.h>
-#include <acsdkNotifierInterfaces/internal/MockNotifier.h>
+#include <acsdk/NotifierInterfaces/test/MockNotifier.h>
 #include <AVSCommon/AVS/AudioInputStream.h>
 #include <AVSCommon/SDKInterfaces/KeyWordDetectorStateObserverInterface.h>
 #include <AVSCommon/SDKInterfaces/KeyWordObserverInterface.h>
@@ -70,11 +70,11 @@ class MockStateObserver : public avsCommon::sdkInterfaces::KeyWordDetectorStateO
 
 /// A test KeywordNotifier.
 class MockKeywordNotifier
-        : public acsdkNotifierInterfaces::test::MockNotifier<avsCommon::sdkInterfaces::KeyWordObserverInterface> {};
+        : public notifierInterfaces::test::MockNotifier<avsCommon::sdkInterfaces::KeyWordObserverInterface> {};
 
 /// A test KeywordDetectorStateNotifier.
 class MockKeywordDetectorStateNotifier
-        : public acsdkNotifierInterfaces::test::MockNotifier<
+        : public notifierInterfaces::test::MockNotifier<
               avsCommon::sdkInterfaces::KeyWordDetectorStateObserverInterface> {};
 
 /**
diff --git a/shared/KWD/acsdkKWDImplementations/test/CMakeLists.txt b/shared/KWD/acsdkKWDImplementations/test/CMakeLists.txt
index 524bbc0679..09d505bd63 100644
--- a/shared/KWD/acsdkKWDImplementations/test/CMakeLists.txt
+++ b/shared/KWD/acsdkKWDImplementations/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
-set(LIBS acsdkKWDImplementations NotifierTestLib)
+set(LIBS acsdkKWDImplementations acsdkNotifierTestLib)
 
 discover_unit_tests("${acsdkKWDImplementations_SOURCE_DIR}/include" "${LIBS}")
diff --git a/shared/KWD/acsdkKWDInterfaces/include/acsdkKWDInterfaces/KeywordDetectorStateNotifierInterface.h b/shared/KWD/acsdkKWDInterfaces/include/acsdkKWDInterfaces/KeywordDetectorStateNotifierInterface.h
index 40693250f2..b565bfad69 100644
--- a/shared/KWD/acsdkKWDInterfaces/include/acsdkKWDInterfaces/KeywordDetectorStateNotifierInterface.h
+++ b/shared/KWD/acsdkKWDInterfaces/include/acsdkKWDInterfaces/KeywordDetectorStateNotifierInterface.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
 #include <AVSCommon/SDKInterfaces/KeyWordDetectorStateObserverInterface.h>
 
 namespace alexaClientSDK {
@@ -28,7 +28,7 @@ namespace acsdkKWDInterfaces {
  * Interface for registering to observe Bluetooth notifications.
  */
 using KeywordDetectorStateNotifierInterface =
-    acsdkNotifierInterfaces::NotifierInterface<avsCommon::sdkInterfaces::KeyWordDetectorStateObserverInterface>;
+    notifierInterfaces::NotifierInterface<avsCommon::sdkInterfaces::KeyWordDetectorStateObserverInterface>;
 
 }  // namespace acsdkKWDInterfaces
 }  // namespace alexaClientSDK
diff --git a/shared/KWD/acsdkKWDInterfaces/include/acsdkKWDInterfaces/KeywordNotifierInterface.h b/shared/KWD/acsdkKWDInterfaces/include/acsdkKWDInterfaces/KeywordNotifierInterface.h
index 2e13d7a358..f86246b95b 100644
--- a/shared/KWD/acsdkKWDInterfaces/include/acsdkKWDInterfaces/KeywordNotifierInterface.h
+++ b/shared/KWD/acsdkKWDInterfaces/include/acsdkKWDInterfaces/KeywordNotifierInterface.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
 #include <AVSCommon/SDKInterfaces/KeyWordObserverInterface.h>
 
 namespace alexaClientSDK {
@@ -28,7 +28,7 @@ namespace acsdkKWDInterfaces {
  * Interface for registering to observe Bluetooth notifications.
  */
 using KeywordNotifierInterface =
-    acsdkNotifierInterfaces::NotifierInterface<avsCommon::sdkInterfaces::KeyWordObserverInterface>;
+    notifierInterfaces::NotifierInterface<avsCommon::sdkInterfaces::KeyWordObserverInterface>;
 
 }  // namespace acsdkKWDInterfaces
 }  // namespace alexaClientSDK
diff --git a/shared/KWD/acsdkKWDProvider/src/KeywordDetectorProvider.cpp b/shared/KWD/acsdkKWDProvider/src/KeywordDetectorProvider.cpp
index 3bdbc1c448..3d96d474e2 100644
--- a/shared/KWD/acsdkKWDProvider/src/KeywordDetectorProvider.cpp
+++ b/shared/KWD/acsdkKWDProvider/src/KeywordDetectorProvider.cpp
@@ -21,7 +21,7 @@ using namespace alexaClientSDK;
 using namespace alexaClientSDK::kwd;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG{"KeywordDetectorProvider"};
+#define TAG "KeywordDetectorProvider"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/shared/Notifier/CMakeLists.txt b/shared/Notifier/CMakeLists.txt
new file mode 100644
index 0000000000..d0bef70f30
--- /dev/null
+++ b/shared/Notifier/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.1)
+
+project(acsdkNotifier LANGUAGES CXX)
+file(GLOB_RECURSE acsdkNotifier_SOURCES "src/*.cpp")
+add_library(acsdkNotifier ${acsdkNotifier_SOURCES})
+target_include_directories(acsdkNotifier
+        PUBLIC "${acsdkNotifier_SOURCE_DIR}/include"
+        PRIVATE "${acsdkNotifier_SOURCE_DIR}/privateInclude")
+target_compile_definitions(acsdkNotifier PRIVATE ACSDK_LOG_MODULE=acsdkNotifier)
+target_link_libraries(acsdkNotifier PUBLIC acsdkNotifierInterfaces)
+target_link_libraries(acsdkNotifier PRIVATE AVSCommon)
+
+# install library
+asdk_install()
+
+add_subdirectory("test")
diff --git a/shared/Notifier/doc/Namespaces.dox b/shared/Notifier/doc/Namespaces.dox
new file mode 100644
index 0000000000..0105e35680
--- /dev/null
+++ b/shared/Notifier/doc/Namespaces.dox
@@ -0,0 +1,31 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @namespace ::alexaClientSDK::notifier
+ * @brief Event notifier implementations.
+ *
+ * @see Lib_acsdkNotifier
+ * @ingroup Lib_acsdkNotifier
+ *
+ * @namespace ::alexaClientSDK::notifier::internal
+ * @brief Event notifier internal implementation types.
+ *
+ * Classes in this namespace are not part of the public API.
+ *
+ * @see Lib_acsdkNotifier
+ * @private
+ * @ingroup Lib_acsdkNotifier
+ */
diff --git a/shared/Notifier/doc/Notifier.dox b/shared/Notifier/doc/Notifier.dox
new file mode 100644
index 0000000000..e82d79429c
--- /dev/null
+++ b/shared/Notifier/doc/Notifier.dox
@@ -0,0 +1,22 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @defgroup Lib_acsdkNotifier Event Broadcasting Implementation
+ * @brief Collection of classes for event broadcasting.
+ *
+ * @see alexaClientSDK::notifier Namespace
+ * @see Lib_acsdkNotifierInterfaces
+ */
diff --git a/shared/Notifier/include/acsdk/Notifier/Notifier.h b/shared/Notifier/include/acsdk/Notifier/Notifier.h
new file mode 100644
index 0000000000..6d92280dec
--- /dev/null
+++ b/shared/Notifier/include/acsdk/Notifier/Notifier.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_NOTIFIER_NOTIFIER_H_
+#define ACSDK_NOTIFIER_NOTIFIER_H_
+
+#include <memory>
+
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
+#include <acsdk/Notifier/internal/DataInterface.h>
+#include <acsdk/Notifier/internal/NotifierTraits.h>
+
+namespace alexaClientSDK {
+namespace notifier {
+
+/**
+ * @brief Generic implementation of @c NotifierInterface.
+ *
+ * Notifier maintains a set of observers that are notified with a caller defined function.
+ *
+ * @tparam ObserverType The type of observer notified by the template instantiation.
+ *
+ * @ingroup Lib_acsdkNotifier
+ */
+template <typename ObserverType>
+class Notifier : public notifierInterfaces::NotifierInterface<ObserverType> {
+public:
+    Notifier();
+
+    /// @name NotifierInterface methods
+    /// @{
+    void addObserver(const std::shared_ptr<ObserverType>& observer) override;
+    void removeObserver(const std::shared_ptr<ObserverType>& observer) override;
+    void addWeakPtrObserver(const std::weak_ptr<ObserverType>& observer) override;
+    void removeWeakPtrObserver(const std::weak_ptr<ObserverType>& observer) override;
+    void notifyObservers(std::function<void(const std::shared_ptr<ObserverType>&)> notify) override;
+    bool notifyObserversInReverse(std::function<void(const std::shared_ptr<ObserverType>&)> notify) override;
+    void setAddObserverFunction(std::function<void(const std::shared_ptr<ObserverType>&)> addObserverFunc) override;
+    /// @}
+private:
+    /// @brief internal::NotifierTraits specialization for type @a ObserverType.
+    using Traits = NotifierTraits<ObserverType>;
+
+    /// @brief Actual container for managing observer references.
+    std::unique_ptr<DataInterface> m_data;
+};
+
+template <typename ObserverType>
+inline Notifier<ObserverType>::Notifier() : m_data(createDataInterface()) {
+}
+
+template <typename ObserverType>
+inline void Notifier<ObserverType>::addObserver(const std::shared_ptr<ObserverType>& observer) {
+    m_data->doAddStrongRefObserver(Traits::toVoidPtr(observer));
+}
+
+template <typename ObserverType>
+inline void Notifier<ObserverType>::removeObserver(const std::shared_ptr<ObserverType>& observer) {
+    m_data->doRemoveObserver(Traits::toVoidPtr(observer));
+}
+
+template <typename ObserverType>
+inline void Notifier<ObserverType>::addWeakPtrObserver(const std::weak_ptr<ObserverType>& observer) {
+    m_data->doAddWeakRefObserver(Traits::toVoidPtr(observer.lock()));
+}
+
+template <typename ObserverType>
+inline void Notifier<ObserverType>::removeWeakPtrObserver(const std::weak_ptr<ObserverType>& observer) {
+    m_data->doRemoveObserver(Traits::toVoidPtr(observer.lock()));
+}
+
+template <typename ObserverType>
+inline void Notifier<ObserverType>::notifyObservers(std::function<void(const std::shared_ptr<ObserverType>&)> notify) {
+    m_data->doNotifyObservers(Traits::adaptFunction(std::move(notify)));
+}
+
+template <typename ObserverType>
+inline bool Notifier<ObserverType>::notifyObserversInReverse(
+    std::function<void(const std::shared_ptr<ObserverType>&)> notify) {
+    return m_data->doNotifyObserversInReverse(Traits::adaptFunction(std::move(notify)));
+}
+
+template <typename ObserverType>
+inline void Notifier<ObserverType>::setAddObserverFunction(
+    std::function<void(const std::shared_ptr<ObserverType>&)> addObserverFunc) {
+    m_data->doSetAddObserverFunction(Traits::adaptFunction(std::move(addObserverFunc)));
+}
+
+}  // namespace notifier
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_NOTIFIER_NOTIFIER_H_
diff --git a/shared/Notifier/include/acsdk/Notifier/internal/DataInterface.h b/shared/Notifier/include/acsdk/Notifier/internal/DataInterface.h
new file mode 100644
index 0000000000..02c7fa0098
--- /dev/null
+++ b/shared/Notifier/include/acsdk/Notifier/internal/DataInterface.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_NOTIFIER_INTERNAL_DATAINTERFACE_H_
+#define ACSDK_NOTIFIER_INTERNAL_DATAINTERFACE_H_
+
+#include <functional>
+#include <memory>
+
+#include <acsdk/Notifier/internal/NotifierTraits.h>
+
+namespace alexaClientSDK {
+namespace notifier {
+
+/**
+ * @brief Interface for notifier operations.
+ *
+ * @ingroup Lib_acsdkNotifier
+ * @private
+ */
+class DataInterface {
+public:
+    /**
+     * Constructor.
+     */
+    virtual ~DataInterface() noexcept = default;
+
+    /**
+     * @{
+     * @brief Add an observer.
+     *
+     * Method adds @a observer to observer list unless @a observer is nullptr or already present in the list.
+     *
+     * @param[in] observer Observer as shared pointer to void.
+     */
+    virtual void doAddStrongRefObserver(std::shared_ptr<void> observer) noexcept = 0;
+    virtual void doAddWeakRefObserver(std::shared_ptr<void> observer) noexcept = 0;
+    /// @}
+
+    /**
+     * @brief Remove an observer.
+     *
+     * Method removes an observer from observer list if it is present there.
+     *
+     * @param[in] observer Observer as shared pointer to void.
+     */
+    virtual void doRemoveObserver(std::shared_ptr<void> observer) noexcept = 0;
+
+    /**
+     * @brief Notify observers in forward order.
+     *
+     * Method invokes @a notify function for all observers in their addition order.
+     *
+     * @param[in] notify Function to handle notification.
+     */
+    virtual void doNotifyObservers(std::function<void(const std::shared_ptr<void>&)> notify) noexcept = 0;
+
+    /**
+     * @brief Notify observers in reverse order.
+     *
+     * Method invokes @a notify function for all observers in order inverse to addition.
+     *
+     * @param[in] notify Function to handle notification.
+     *
+     * @return True if the size of collection hasn't changed, false otherwise.
+     */
+    virtual bool doNotifyObserversInReverse(std::function<void(const std::shared_ptr<void>&)> notify) noexcept = 0;
+
+    /**
+     * @brief Install or remove function to handle observer additions.
+     *
+     * @param[in] addObserverFunc Function to call when a new observer is added. If function is empty, previously
+     *                            installed function is reset.
+     */
+    virtual void doSetAddObserverFunction(
+        std::function<void(const std::shared_ptr<void>&)> addObserverFunc) noexcept = 0;
+};
+
+/**
+ * @brief Constructs a new instance of @c DataInterface.
+ *
+ * @return Reference to @c DataInterface instance.
+ */
+std::unique_ptr<DataInterface> createDataInterface();
+
+}  // namespace notifier
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_NOTIFIER_INTERNAL_DATAINTERFACE_H_
diff --git a/shared/Notifier/include/acsdk/Notifier/internal/NotifierTraits.h b/shared/Notifier/include/acsdk/Notifier/internal/NotifierTraits.h
new file mode 100644
index 0000000000..12980b72d1
--- /dev/null
+++ b/shared/Notifier/include/acsdk/Notifier/internal/NotifierTraits.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_NOTIFIER_INTERNAL_NOTIFIERTRAITS_H_
+#define ACSDK_NOTIFIER_INTERNAL_NOTIFIERTRAITS_H_
+
+#include <functional>
+#include <memory>
+
+namespace alexaClientSDK {
+namespace notifier {
+
+/**
+ * @brief Type helper for Notifier template class.
+ *
+ * This helper provides common functions for a particular type @a T.
+ *
+ * @tparam T Observer type.
+ * @ingroup Lib_acsdkNotifier
+ * @private
+ */
+template <class T>
+class NotifierTraits {
+public:
+    // This type is not constructable.
+    NotifierTraits() noexcept = delete;
+    ~NotifierTraits() noexcept = delete;
+    void operator=(const NotifierTraits<T>&) noexcept = delete;
+
+    /**
+     * @{
+     * @brief Convert typed pointer into void pointer.
+     *
+     * Method converts pointer of type @a T into void pointer through static cast.
+     *
+     * @param[in] src Pointer to convert.
+     * @return New pointer of type void.
+     *
+     * @see #fromVoidPtr()
+     */
+    static std::shared_ptr<void> toVoidPtr(const std::shared_ptr<T>& src) noexcept;
+    /// @}
+
+    /**
+     * @brief Convert pointer to void to typed pointer.
+     *
+     * Method converts pointer to void into pointer of type @a T.
+     *
+     * @param[in] src Pointer to void.
+     *
+     * @return Pointer to type @a T.
+     *
+     * @see #toVoidPtr()
+     */
+    static std::shared_ptr<T> fromVoidPtr(const std::shared_ptr<void>& src) noexcept;
+
+    /**
+     * @brief Create consumer function that handles pointer conversion.
+     *
+     * Method creates a wrapper function around @a notify to convert void pointers into pointers of type @a T and invoke
+     * @a notify.
+     *
+     * @param[in] notify Void function that consumes pointer of type @a T.
+     * @return Function that consumes pointer to void, converts it into type @a T, and invokes @a notify with conversion
+     *         result. If @a notify is empty, the method returns an empty function.
+     *
+     * @see #fromVoidPtr()
+     */
+    static std::function<void(const std::shared_ptr<void>&)> adaptFunction(
+        std::function<void(const std::shared_ptr<T>&)>&& notify) noexcept;
+
+private:
+    /**
+     * @brief Invoke callback after pointer type conversion.
+     *
+     * Method converts pointer to void into pointer to type @a T and invokes @a notify with the conversion result.
+     *
+     * @note The returned function is valid until reference to @a notify is valid.
+     *
+     * @param[in] notify Function to invoke.
+     * @param[in] data   Pointer to void to convert and use as a @a notify argument.
+     */
+    static void invokeNotify(
+        const std::function<void(const std::shared_ptr<T>&)>& notify,
+        const std::shared_ptr<void>& data) noexcept;
+};
+
+template <class T>
+std::shared_ptr<void> NotifierTraits<T>::toVoidPtr(const std::shared_ptr<T>& src) noexcept {
+    return std::static_pointer_cast<void>(src);
+}
+
+template <class T>
+std::shared_ptr<T> NotifierTraits<T>::fromVoidPtr(const std::shared_ptr<void>& src) noexcept {
+    return std::static_pointer_cast<T>(src);
+}
+
+template <class T>
+std::function<void(const std::shared_ptr<void>&)> NotifierTraits<T>::adaptFunction(
+    std::function<void(const std::shared_ptr<T>&)>&& notify) noexcept {
+    if (notify) {
+        return std::bind(&NotifierTraits<T>::invokeNotify, std::move(notify), std::placeholders::_1);
+    } else {
+        return nullptr;
+    }
+}
+
+template <class T>
+void NotifierTraits<T>::invokeNotify(
+    const std::function<void(const std::shared_ptr<T>&)>& notify,
+    const std::shared_ptr<void>& data) noexcept {
+    notify(fromVoidPtr(data));
+}
+
+}  // namespace notifier
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_NOTIFIER_INTERNAL_NOTIFIERTRAITS_H_
diff --git a/shared/Notifier/privateInclude/acsdk/Notifier/private/NotifierData.h b/shared/Notifier/privateInclude/acsdk/Notifier/private/NotifierData.h
new file mode 100644
index 0000000000..ada84aeaa4
--- /dev/null
+++ b/shared/Notifier/privateInclude/acsdk/Notifier/private/NotifierData.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_NOTIFIER_PRIVATE_NOTIFIERDATA_H_
+#define ACSDK_NOTIFIER_PRIVATE_NOTIFIERDATA_H_
+
+#include <cstdint>
+#include <memory>
+#include <mutex>
+#include <vector>
+
+#include <acsdk/Notifier/internal/DataInterface.h>
+#include <acsdk/Notifier/private/ObserverWrapper.h>
+
+namespace alexaClientSDK {
+namespace notifier {
+
+/**
+ * @brief Container for abstract observer operations.
+ *
+ * This class implements container operations for Notifier type.
+ *
+ * @ingroup Lib_acsdkNotifier
+ * @private
+ */
+class NotifierData : public virtual DataInterface {
+public:
+    /**
+     * Constructor.
+     */
+    NotifierData() noexcept;
+
+    /// @name Methods from @c DataInterface
+    /// @{
+    void doAddStrongRefObserver(std::shared_ptr<void> observer) noexcept override;
+    void doAddWeakRefObserver(std::shared_ptr<void> observer) noexcept override;
+    void doRemoveObserver(std::shared_ptr<void> observer) noexcept override;
+    void doNotifyObservers(std::function<void(const std::shared_ptr<void>&)> notify) noexcept override;
+    bool doNotifyObserversInReverse(std::function<void(const std::shared_ptr<void>&)> notify) noexcept override;
+    void doSetAddObserverFunction(std::function<void(const std::shared_ptr<void>&)> addObserverFunc) noexcept override;
+    /// @}
+
+private:
+    /**
+     * @brief Adds an observer reference.
+     *
+     * This method implements functionality for DataInterface::doAddStrongRefObserver() and
+     * DataInterface::doAddWeakRefObserver() methods.
+     *
+     * @param[in] observer Observer.
+     * @param[in] type     Reference type.
+     */
+    void doAddObserver(std::shared_ptr<void> observer, ReferenceType type) noexcept;
+
+    /**
+     * @brief Remove reference and clean up observers array.
+     *
+     * Eliminate the @a unwanted observer value from @c m_observers.  This will also cleanup any @c weak_ptr observer
+     * that has expired.
+     *
+     * @param[in] unwanted The unwanted observer value.
+     */
+    void cleanupLocked(const std::shared_ptr<void>& unwanted) noexcept;
+
+    /**
+     * @brief Check if observer already registered.
+     *
+     * Method checks if observer already exists in  @c m_observers.
+     *
+     * @param[in] observer The observer value.
+     * @return true if observer already exists, false otherwise.
+     */
+    bool isAlreadyExistLocked(const std::shared_ptr<void>& observer) noexcept;
+
+    /// Mutex to serialize access to m_depth and m_observers.  Note that a recursive mutex is used
+    /// here to avoid undefined behavior if notifying an observer callback in to this @c Notifier.
+    std::recursive_mutex m_mutex;
+
+    /// Depth of calls to @c notifyObservers() and notifyObserversInReverse().
+    std::size_t m_depth;
+
+    /// The set of observers.  Note that a vector is used here to allow for the addition
+    /// or removal of observers while calls to notifyObservers() are in progress.
+    std::vector<ObserverWrapper> m_observers;
+
+    /// If set, this function will be called after an observer is added.
+    std::function<void(const std::shared_ptr<void>&)> m_addObserverFunc;
+};
+
+}  // namespace notifier
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_NOTIFIER_PRIVATE_NOTIFIERDATA_H_
diff --git a/shared/Notifier/privateInclude/acsdk/Notifier/private/ObserverWrapper.h b/shared/Notifier/privateInclude/acsdk/Notifier/private/ObserverWrapper.h
new file mode 100644
index 0000000000..16a68e3581
--- /dev/null
+++ b/shared/Notifier/privateInclude/acsdk/Notifier/private/ObserverWrapper.h
@@ -0,0 +1,115 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_NOTIFIER_PRIVATE_OBSERVERWRAPPER_H_
+#define ACSDK_NOTIFIER_PRIVATE_OBSERVERWRAPPER_H_
+
+#include <memory>
+
+#include <acsdk/Notifier/private/ReferenceType.h>
+
+namespace alexaClientSDK {
+namespace notifier {
+
+/**
+ * @brief Container class for holding shared or weak reference.
+ *
+ * This class holds either shared or weak reference. The reference may be nullptr.
+ *
+ * @ingroup Lib_acsdkNotifier
+ * @private
+ */
+class ObserverWrapper {
+public:
+    /**
+     * @brief Constructor for a reference with a given type.
+     *
+     * @param[in] observer The @c std::shared_ptr observer.
+     */
+    explicit ObserverWrapper(ReferenceType type, const std::shared_ptr<void>& observer) noexcept;
+
+    /**
+     * @brief Move constructor.
+     *
+     * @param[in] src Source Observer object.
+     */
+    ObserverWrapper(ObserverWrapper&& src) noexcept;
+
+    /**
+     * @brief Copy constructor.
+     *
+     * @param[in] src Source Observer object.
+     */
+    ObserverWrapper(const ObserverWrapper& src) noexcept;
+
+    /**
+     * @brief Destructor.
+     */
+    ~ObserverWrapper() noexcept;
+
+    /**
+     * Gets the observer.
+     *
+     * @return The observer as a @c std::shared_ptr.
+     */
+    std::shared_ptr<void> get() const;
+
+    /**
+     * @brief Drop managed reference.
+     *
+     * Method releases strong or weak reference if any. This may lead to release of managed instance and recursive
+     * calls.
+     */
+    void reset() noexcept;
+
+    /**
+     * Checks if the notifier observer matches the observer that is passed in, or if the notifier observer (if it's
+     * a weak_ptr observer) has expired.
+     *
+     * @param observer The observer to check against if it's equal.
+     * @return true if observer is equal to notifier observer or if notifier observer has expired, false otherwise.
+     */
+    bool isEqualOrExpired(void* observer) const noexcept;
+
+    /**
+     * @brief Move assignment operator.
+     *
+     * @param[in] src Source object.
+     * @return Reference to @a *this.
+     */
+    ObserverWrapper& operator=(ObserverWrapper&& src) noexcept;
+
+    /**
+     * @brief Returns type.
+     *
+     * @return Type of managed reference.
+     */
+    ReferenceType getReferenceType() const noexcept;
+
+private:
+    /// Type of managed reference.
+    ReferenceType m_type;
+    union {
+        /// shared_ptr of observer, if @a m_type is Type::StrongRef.
+        std::shared_ptr<void> m_sharedPtrObserver;
+        /// weak_ptr of observer, if @a m_type is Type::WeakRef.
+        std::weak_ptr<void> m_weakPtrObserver;
+    };
+};
+
+}  // namespace notifier
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_NOTIFIER_PRIVATE_OBSERVERWRAPPER_H_
diff --git a/shared/Notifier/privateInclude/acsdk/Notifier/private/ReferenceType.h b/shared/Notifier/privateInclude/acsdk/Notifier/private/ReferenceType.h
new file mode 100644
index 0000000000..654b240c0a
--- /dev/null
+++ b/shared/Notifier/privateInclude/acsdk/Notifier/private/ReferenceType.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_NOTIFIER_PRIVATE_REFERENCETYPE_H_
+#define ACSDK_NOTIFIER_PRIVATE_REFERENCETYPE_H_
+
+namespace alexaClientSDK {
+namespace notifier {
+
+/**
+ * @brief Type of managed reference.
+ *
+ * @ingroup Lib_acsdkNotifier
+ * @private
+ */
+enum class ReferenceType {
+    /// Wrapper is empty.
+    None = 1,
+    /// Wrapper is using std::shared_ptr
+    StrongRef,
+    /// Wrapper is using std::weak_ptr
+    WeakRef,
+};
+
+}  // namespace notifier
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_NOTIFIER_PRIVATE_REFERENCETYPE_H_
diff --git a/shared/Notifier/src/NotifierData.cpp b/shared/Notifier/src/NotifierData.cpp
new file mode 100644
index 0000000000..1a02330e9e
--- /dev/null
+++ b/shared/Notifier/src/NotifierData.cpp
@@ -0,0 +1,178 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <algorithm>
+
+#include <acsdk/Notifier/private/NotifierData.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/// String to identify log entries originating from this file.
+/// @ingroup Lib_acsdkNotifier
+/// @private
+#define TAG "NotifierData"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ * @ingroup Lib_acsdkNotifier
+ * @private
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace notifier {
+
+/**
+ * @brief Helper to invoke function and catch exceptions.
+ *
+ * Method invokes function @a fn with argument @a ptr if @a fn is not empty, and @a ptr is not nullptr. If exception
+ * is thrown during callback, it is logged.
+ *
+ * @param[in] fn   Function to invoke.
+ * @param[in] ptr  Argument to use for function invocation.
+ *
+ * @ingroup Lib_acsdkNotifier
+ * @private
+ */
+static void safeInvoke(std::function<void(const std::shared_ptr<void>&)>& fn, const std::shared_ptr<void>& ptr) {
+    if (!ptr || !fn) {
+        return;
+    }
+
+#if __cpp_exceptions || defined(__EXCEPTIONS)
+    try {
+#endif
+        fn(ptr);
+#if __cpp_exceptions || defined(__EXCEPTIONS)
+    } catch (const std::exception& ex) {
+        ACSDK_ERROR(LX(__func__).d("taskException", ex.what()));
+    } catch (...) {
+        ACSDK_ERROR(LX(__func__).d("taskException", "other"));
+    }
+#endif
+}
+
+std::unique_ptr<DataInterface> createDataInterface() {
+    return std::unique_ptr<DataInterface>(new NotifierData);
+}
+
+NotifierData::NotifierData() noexcept : m_depth{0} {
+}
+
+void NotifierData::doAddStrongRefObserver(std::shared_ptr<void> observer) noexcept {
+    doAddObserver(std::move(observer), ReferenceType::StrongRef);
+}
+
+void NotifierData::doAddWeakRefObserver(std::shared_ptr<void> observer) noexcept {
+    doAddObserver(std::move(observer), ReferenceType::WeakRef);
+}
+
+void NotifierData::doAddObserver(std::shared_ptr<void> observer, ReferenceType type) noexcept {
+    if (!observer) {
+        ACSDK_ERROR(LX(__func__).d("reason", "nullObserver"));
+        return;
+    }
+
+    std::lock_guard<std::recursive_mutex> guard(m_mutex);
+    if (isAlreadyExistLocked(observer)) {
+        return;
+    }
+    m_observers.emplace_back(type, observer);
+
+    if (m_addObserverFunc) {
+        m_addObserverFunc(observer);
+    }
+}
+
+void NotifierData::doRemoveObserver(std::shared_ptr<void> observer) noexcept {
+    if (!observer) {
+        ACSDK_WARN(LX(__func__).d("reason", "nullObserver"));
+        return;
+    }
+    std::lock_guard<std::recursive_mutex> guard(m_mutex);
+    if (m_depth > 0) {
+        for (std::size_t ix = 0; ix < m_observers.size(); ix++) {
+            auto& notifierObserver = m_observers[ix];
+            if (notifierObserver.get() == observer) {
+                notifierObserver.reset();
+                break;
+            }
+        }
+    } else {
+        cleanupLocked(observer);
+    }
+}
+
+void NotifierData::doNotifyObservers(std::function<void(const std::shared_ptr<void>&)> notify) noexcept {
+    if (!notify) {
+        ACSDK_ERROR(LX(__func__).d("reason", "nullNotify"));
+        return;
+    }
+    std::lock_guard<std::recursive_mutex> guard(m_mutex);
+    m_depth++;
+    for (std::size_t ix = 0; ix < m_observers.size(); ix++) {
+        const auto& notifierObserver = m_observers[ix];
+        auto observer = notifierObserver.get();
+        safeInvoke(notify, observer);
+    }
+    if (0 == --m_depth) {
+        cleanupLocked(nullptr);
+    }
+}
+
+bool NotifierData::doNotifyObserversInReverse(std::function<void(const std::shared_ptr<void>&)> notify) noexcept {
+    if (!notify) {
+        ACSDK_ERROR(LX(__func__).d("reason", "nullNotify"));
+        return true;
+    }
+    std::lock_guard<std::recursive_mutex> guard(m_mutex);
+    m_depth++;
+    auto initialSize = m_observers.size();
+    for (auto ix = initialSize; ix-- > 0;) {
+        const auto& notifierObserver = m_observers[ix];
+        auto observer = notifierObserver.get();
+        safeInvoke(notify, observer);
+    }
+    auto result = m_observers.size() == initialSize;
+    if (0 == --m_depth) {
+        cleanupLocked(nullptr);
+    }
+    return result;
+}
+
+void NotifierData::doSetAddObserverFunction(
+    std::function<void(const std::shared_ptr<void>&)> addObserverFunc) noexcept {
+    std::lock_guard<std::recursive_mutex> guard(m_mutex);
+    const auto notifyAddedObservers = !m_addObserverFunc && addObserverFunc;
+    m_addObserverFunc = std::move(addObserverFunc);
+    if (notifyAddedObservers) {
+        doNotifyObservers(m_addObserverFunc);
+    }
+}
+
+void NotifierData::cleanupLocked(const std::shared_ptr<void>& unwanted) noexcept {
+    auto ptr = unwanted.get();
+    auto matcher = [ptr](const ObserverWrapper& notifierObserver) { return notifierObserver.isEqualOrExpired(ptr); };
+    m_observers.erase(std::remove_if(m_observers.begin(), m_observers.end(), std::move(matcher)), m_observers.end());
+}
+
+bool NotifierData::isAlreadyExistLocked(const std::shared_ptr<void>& observer) noexcept {
+    auto matcher = [&observer](const ObserverWrapper& arg) { return arg.get() == observer; };
+    return std::find_if(m_observers.begin(), m_observers.end(), std::move(matcher)) != m_observers.end();
+}
+
+}  // namespace notifier
+}  // namespace alexaClientSDK
diff --git a/shared/Notifier/src/ObserverWrapper.cpp b/shared/Notifier/src/ObserverWrapper.cpp
new file mode 100644
index 0000000000..42778cbc2b
--- /dev/null
+++ b/shared/Notifier/src/ObserverWrapper.cpp
@@ -0,0 +1,189 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <algorithm>
+
+#include <acsdk/Notifier/private/ObserverWrapper.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+/// String to identify log entries originating from this file.
+/// @ingroup Lib_acsdkNotifier
+/// @private
+#define TAG "ObserverWrapper"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ * @ingroup Lib_acsdkNotifier
+ * @private
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+namespace alexaClientSDK {
+namespace notifier {
+
+ObserverWrapper::ObserverWrapper(ReferenceType type, const std::shared_ptr<void>& observer) noexcept : m_type{type} {
+    switch (m_type) {
+        case ReferenceType::None:
+            break;
+        case ReferenceType::StrongRef:
+            new (&m_sharedPtrObserver) std::shared_ptr<void>{observer};
+            break;
+        case ReferenceType::WeakRef:
+            new (&m_weakPtrObserver) std::weak_ptr<void>{observer};
+            break;
+        default:
+            ACSDK_ERROR(LX(__func__).d("reason", "unexpectedState"));
+            break;
+    }
+}
+
+ObserverWrapper::ObserverWrapper(ObserverWrapper&& src) noexcept : m_type{src.m_type} {
+    switch (m_type) {
+        case ReferenceType::None:
+            break;
+        case ReferenceType::StrongRef:
+            new (&m_sharedPtrObserver) std::shared_ptr<void>{std::move(src.m_sharedPtrObserver)};
+            break;
+        case ReferenceType::WeakRef:
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 6)
+            // Move constructor doesn't work for std::weak_ptr in GCC 4.8
+            new (&m_weakPtrObserver) std::weak_ptr<void>{src.m_weakPtrObserver};
+            src.m_weakPtrObserver.reset();
+#else
+            new (&m_weakPtrObserver) std::weak_ptr<void>{std::move(src.m_weakPtrObserver)};
+#endif
+            break;
+        default:
+            ACSDK_ERROR(LX(__func__).d("reason", "unexpectedState"));
+            break;
+    }
+}
+
+ObserverWrapper::ObserverWrapper(const ObserverWrapper& src) noexcept : m_type{src.m_type} {
+    switch (m_type) {
+        case ReferenceType::None:
+            break;
+        case ReferenceType::StrongRef:
+            new (&m_sharedPtrObserver) std::shared_ptr<void>{src.m_sharedPtrObserver};
+            break;
+        case ReferenceType::WeakRef:
+            new (&m_weakPtrObserver) std::weak_ptr<void>{src.m_weakPtrObserver};
+            break;
+        default:
+            ACSDK_ERROR(LX(__func__).d("reason", "unexpectedState"));
+            break;
+    }
+}
+
+ObserverWrapper& ObserverWrapper::operator=(ObserverWrapper&& src) noexcept {
+    if (m_type != src.m_type) {
+        reset();
+        m_type = src.m_type;
+        switch (m_type) {
+            case ReferenceType::StrongRef:
+                new (&m_sharedPtrObserver) std::shared_ptr<void>{std::move(src.m_sharedPtrObserver)};
+                break;
+            case ReferenceType::WeakRef:
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 6)
+                // Move constructor doesn't work for std::weak_ptr in GCC 4.8
+                new (&m_weakPtrObserver) std::weak_ptr<void>{src.m_weakPtrObserver};
+                src.m_weakPtrObserver.reset();
+#else
+                new (&m_weakPtrObserver) std::weak_ptr<void>{std::move(src.m_weakPtrObserver)};
+#endif
+                break;
+            default:
+                ACSDK_ERROR(LX(__func__).d("reason", "unexpectedState"));
+                break;
+        }
+    } else {
+        switch (m_type) {
+            case ReferenceType::None:
+                break;
+            case ReferenceType::StrongRef:
+                m_sharedPtrObserver = std::move(src.m_sharedPtrObserver);
+                break;
+            case ReferenceType::WeakRef:
+                m_weakPtrObserver = std::move(src.m_weakPtrObserver);
+                break;
+            default:
+                ACSDK_ERROR(LX(__func__).d("reason", "unexpectedState"));
+                break;
+        }
+    }
+
+    return *this;
+}
+
+ObserverWrapper::~ObserverWrapper() noexcept {
+    reset();
+}
+
+std::shared_ptr<void> ObserverWrapper::get() const {
+    switch (m_type) {
+        case ReferenceType::None:
+            return nullptr;
+        case ReferenceType::StrongRef:
+            return m_sharedPtrObserver;
+        case ReferenceType::WeakRef:
+            return m_weakPtrObserver.lock();
+        default:
+            ACSDK_ERROR(LX(__func__).d("reason", "unexpectedState"));
+            return nullptr;
+    }
+}
+
+void ObserverWrapper::reset() noexcept {
+    switch (m_type) {
+        case ReferenceType::None:
+            break;
+        case ReferenceType::StrongRef:
+            m_sharedPtrObserver.~shared_ptr<void>();
+            m_type = ReferenceType::None;
+            break;
+        case ReferenceType::WeakRef:
+            m_weakPtrObserver.~weak_ptr<void>();
+            m_type = ReferenceType::None;
+            break;
+        default:
+            ACSDK_ERROR(LX(__func__).d("reason", "unexpectedState"));
+            break;
+    }
+}
+
+bool ObserverWrapper::isEqualOrExpired(void* observer) const noexcept {
+    switch (m_type) {
+        case ReferenceType::None:
+            return true;
+        case ReferenceType::StrongRef:
+            return m_sharedPtrObserver.get() == observer;
+        case ReferenceType::WeakRef: {
+            auto shared = m_weakPtrObserver.lock();
+            return !shared || shared.get() == observer;
+        }
+        default:
+            ACSDK_ERROR(LX(__func__).d("reason", "unexpectedState"));
+            return true;
+    }
+}
+
+ReferenceType ObserverWrapper::getReferenceType() const noexcept {
+    return m_type;
+}
+
+}  // namespace notifier
+}  // namespace alexaClientSDK
diff --git a/shared/Notifier/test/CMakeLists.txt b/shared/Notifier/test/CMakeLists.txt
new file mode 100644
index 0000000000..e33e23b24a
--- /dev/null
+++ b/shared/Notifier/test/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+discover_unit_tests("${acsdkNotifier_SOURCE_DIR}/privateInclude" "acsdkNotifier;AVSCommon")
diff --git a/shared/Notifier/test/Namespaces.dox b/shared/Notifier/test/Namespaces.dox
new file mode 100644
index 0000000000..2759cd4274
--- /dev/null
+++ b/shared/Notifier/test/Namespaces.dox
@@ -0,0 +1,20 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @namespace ::alexaClientSDK::notifier::test
+ * @brief Test cases for @ref Lib_acsdkNotifier
+ * @ingroup Lib_acsdkNotifierTests
+ */
diff --git a/shared/Notifier/test/NotifierDataTest.cpp b/shared/Notifier/test/NotifierDataTest.cpp
new file mode 100644
index 0000000000..9508963584
--- /dev/null
+++ b/shared/Notifier/test/NotifierDataTest.cpp
@@ -0,0 +1,247 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <memory>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <acsdk/Notifier/private/NotifierData.h>
+
+namespace alexaClientSDK {
+namespace notifier {
+namespace test {
+
+using namespace ::testing;
+
+/**
+ * @brief Test fixture for @c NotifierData.
+ * @ingroup Lib_acsdkNotifierTests
+ */
+class NotifierDataTest : public ::testing::Test {};
+
+/**
+ * @brief Test interface.
+ * @ingroup Lib_acsdkNotifierTests
+ * @private
+ */
+class TestObserverInterface {
+public:
+    virtual ~TestObserverInterface() = default;
+    virtual void onSomething() = 0;
+};
+
+/**
+ *
+ * @ingroup Lib_acsdkNotifierTests
+ * @private
+ */
+class MockTestObserver : public TestObserverInterface {
+public:
+    MOCK_METHOD0(onSomething, void());
+};
+
+/// Alias for traits helper.
+/// @ingroup Lib_acsdkNotifierTests
+/// @private
+using Traits = NotifierTraits<TestObserverInterface>;
+
+/**
+ * @brief Lambda to invoke observer method.
+ * @ingroup Lib_acsdkNotifierTests
+ * @private
+ */
+static auto invokeOnSomething = [](const std::shared_ptr<TestObserverInterface>& observer) { observer->onSomething(); };
+
+/**
+ * Verify factory returns valid pointer.
+ */
+TEST_F(NotifierDataTest, test_factory) {
+    auto data = createDataInterface();
+    ASSERT_TRUE(data);
+}
+
+TEST_F(NotifierDataTest, test_addStrongReferenceAndRemove) {
+    auto data = createDataInterface();
+    auto observer = std::make_shared<MockTestObserver>();
+    data->doAddStrongRefObserver(Traits::toVoidPtr(observer));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer, onSomething()).Times(1);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+    data->doRemoveObserver(Traits::toVoidPtr(observer));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer, onSomething()).Times(0);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+}
+
+TEST_F(NotifierDataTest, test_addStrongReferenceTwiceAndRemove) {
+    auto data = createDataInterface();
+    auto observer = std::make_shared<MockTestObserver>();
+    data->doAddStrongRefObserver(Traits::toVoidPtr(observer));
+    data->doAddStrongRefObserver(Traits::toVoidPtr(observer));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer, onSomething()).Times(1);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+    data->doRemoveObserver(Traits::toVoidPtr(observer));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer, onSomething()).Times(0);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+}
+
+TEST_F(NotifierDataTest, test_addWeakReferenceAndRemove) {
+    auto data = createDataInterface();
+    auto observer = std::make_shared<MockTestObserver>();
+    data->doAddWeakRefObserver(Traits::toVoidPtr(observer));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer, onSomething()).Times(1);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+    data->doRemoveObserver(Traits::toVoidPtr(observer));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer, onSomething()).Times(0);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+}
+
+TEST_F(NotifierDataTest, test_addWeakReferenceTwiceAndRemove) {
+    auto data = createDataInterface();
+    auto observer = std::make_shared<MockTestObserver>();
+    data->doAddWeakRefObserver(Traits::toVoidPtr(observer));
+    data->doAddWeakRefObserver(Traits::toVoidPtr(observer));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer, onSomething()).Times(1);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+    data->doRemoveObserver(Traits::toVoidPtr(observer));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer, onSomething()).Times(0);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+}
+
+TEST_F(NotifierDataTest, test_addStrongAndWeakReferenceAndRemove) {
+    auto data = createDataInterface();
+    auto observer = std::make_shared<MockTestObserver>();
+    data->doAddStrongRefObserver(Traits::toVoidPtr(observer));
+    data->doAddWeakRefObserver(Traits::toVoidPtr(observer));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer, onSomething()).Times(1);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+    data->doRemoveObserver(Traits::toVoidPtr(observer));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer, onSomething()).Times(0);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+}
+
+TEST_F(NotifierDataTest, test_addWeakReferenceAndExpire) {
+    auto data = createDataInterface();
+    auto observer = std::make_shared<MockTestObserver>();
+    data->doAddWeakRefObserver(Traits::toVoidPtr(observer));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer, onSomething()).Times(1);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+    std::weak_ptr<TestObserverInterface> weakRef = observer;
+    EXPECT_FALSE(weakRef.expired());
+    observer.reset();
+    ASSERT_TRUE(weakRef.expired());
+}
+
+TEST_F(NotifierDataTest, test_addWeakAndStrongReferenceAndExpire) {
+    auto data = createDataInterface();
+    auto observer = std::make_shared<MockTestObserver>();
+    data->doAddWeakRefObserver(Traits::toVoidPtr(observer));
+    data->doAddStrongRefObserver(Traits::toVoidPtr(observer));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer, onSomething()).Times(1);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+    std::weak_ptr<TestObserverInterface> weakRef = observer;
+    EXPECT_FALSE(weakRef.expired());
+    observer.reset();
+    ASSERT_TRUE(weakRef.expired());
+}
+
+TEST_F(NotifierDataTest, test_notifyInFifoOrderWithRemoval) {
+    auto data = createDataInterface();
+    auto observer1 = std::make_shared<MockTestObserver>();
+    auto observer2 = std::make_shared<MockTestObserver>();
+    auto observer3 = std::make_shared<MockTestObserver>();
+    data->doAddStrongRefObserver(Traits::toVoidPtr(observer1));
+    data->doAddWeakRefObserver(Traits::toVoidPtr(observer2));
+    data->doAddStrongRefObserver(Traits::toVoidPtr(observer3));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer1, onSomething()).Times(1);
+        EXPECT_CALL(*observer2, onSomething()).Times(1);
+        EXPECT_CALL(*observer3, onSomething()).Times(1);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+    data->doRemoveObserver(Traits::toVoidPtr(observer2));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer1, onSomething()).Times(1);
+        EXPECT_CALL(*observer2, onSomething()).Times(0);
+        EXPECT_CALL(*observer3, onSomething()).Times(1);
+        data->doNotifyObservers(Traits::adaptFunction(invokeOnSomething));
+    }
+}
+
+TEST_F(NotifierDataTest, test_notifyInLifoOrderWithRemoval) {
+    auto data = createDataInterface();
+    auto observer1 = std::make_shared<MockTestObserver>();
+    auto observer2 = std::make_shared<MockTestObserver>();
+    auto observer3 = std::make_shared<MockTestObserver>();
+    data->doAddStrongRefObserver(Traits::toVoidPtr(observer1));
+    data->doAddWeakRefObserver(Traits::toVoidPtr(observer2));
+    data->doAddStrongRefObserver(Traits::toVoidPtr(observer3));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer3, onSomething()).Times(1);
+        EXPECT_CALL(*observer2, onSomething()).Times(1);
+        EXPECT_CALL(*observer1, onSomething()).Times(1);
+        data->doNotifyObserversInReverse(Traits::adaptFunction(invokeOnSomething));
+    }
+    data->doRemoveObserver(Traits::toVoidPtr(observer2));
+    {
+        InSequence inSequence;
+        EXPECT_CALL(*observer3, onSomething()).Times(1);
+        EXPECT_CALL(*observer2, onSomething()).Times(0);
+        EXPECT_CALL(*observer1, onSomething()).Times(1);
+        data->doNotifyObserversInReverse(Traits::adaptFunction(invokeOnSomething));
+    }
+}
+
+}  // namespace test
+}  // namespace notifier
+}  // namespace alexaClientSDK
diff --git a/shared/acsdkNotifier/test/NotifierTest.cpp b/shared/Notifier/test/NotifierTest.cpp
similarity index 82%
rename from shared/acsdkNotifier/test/NotifierTest.cpp
rename to shared/Notifier/test/NotifierTest.cpp
index 1d85433055..08a42d12ac 100644
--- a/shared/acsdkNotifier/test/NotifierTest.cpp
+++ b/shared/Notifier/test/NotifierTest.cpp
@@ -20,17 +20,26 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "acsdkNotifier/internal/Notifier.h"
+#include "acsdk/Notifier/Notifier.h"
 
 namespace alexaClientSDK {
-namespace acsdkNotifier {
+namespace notifier {
 namespace test {
 
 using namespace ::testing;
-using namespace acsdkNotifier;
+using namespace notifier;
 
+/**
+ * @brief Test fixture for @c Notifier.
+ * @ingroup Lib_acsdkNotifierTests
+ */
 class NotifierTest : public ::testing::Test {};
 
+/**
+ * @brief Test interface.
+ * @ingroup Lib_acsdkNotifierTests
+ * @private
+ */
 class TestObserverInterface {
 public:
     virtual ~TestObserverInterface() = default;
@@ -38,6 +47,11 @@ class TestObserverInterface {
     virtual void onSomething() = 0;
 };
 
+/**
+ * @brief Mock for @c TestObserverInterface.
+ * @ingroup Lib_acsdkNotifierTests
+ * @private
+ */
 class MockTestObserver : public TestObserverInterface {
 public:
     MOCK_METHOD0(onSomething, void());
@@ -45,7 +59,14 @@ class MockTestObserver : public TestObserverInterface {
 
 using TestNotifier = Notifier<TestObserverInterface>;
 
-static auto invokeOnSomething = [](const std::shared_ptr<TestObserverInterface>& observer) { observer->onSomething(); };
+/**
+ * @brief Helper lambda to invoke TestObserverInterface::onSomething() method.
+ * @ingroup Lib_acsdkNotifierTests
+ * @private
+ */
+static const auto invokeOnSomething = [](const std::shared_ptr<TestObserverInterface>& observer) {
+    observer->onSomething();
+};
 
 /**
  * Verify the simplest case of notifying an observer.
@@ -157,6 +178,7 @@ TEST_F(NotifierTest, test_removingObservers) {
     auto observer3 = std::make_shared<MockTestObserver>();
     std::weak_ptr<MockTestObserver> weakObserver1 = observer1;
     std::weak_ptr<MockTestObserver> weakObserver3 = observer3;
+
     InSequence sequence;
     EXPECT_CALL(*observer2, onSomething());
     notifier.addObserver(observer0);
@@ -169,6 +191,70 @@ TEST_F(NotifierTest, test_removingObservers) {
     notifier.notifyObservers(invokeOnSomething);
 }
 
+/**
+ * Verify removal of observers.
+ */
+TEST_F(NotifierTest, test_removingObserversWithNotificationInFifoMode) {
+    TestNotifier notifier;
+    auto observer0 = std::make_shared<MockTestObserver>();
+    auto observer1 = std::make_shared<MockTestObserver>();
+    auto observer2 = std::make_shared<MockTestObserver>();
+
+    notifier.addObserver(observer0);
+    notifier.addObserver(observer1);
+    notifier.addObserver(observer2);
+
+    {
+        InSequence sequence;
+        EXPECT_CALL(*observer0, onSomething());
+        EXPECT_CALL(*observer1, onSomething());
+        EXPECT_CALL(*observer2, onSomething());
+
+        notifier.notifyObservers(invokeOnSomething);
+    }
+    notifier.removeObserver(observer1);
+    {
+        InSequence sequence;
+        EXPECT_CALL(*observer0, onSomething());
+        EXPECT_CALL(*observer1, onSomething()).Times(0);
+        EXPECT_CALL(*observer2, onSomething());
+
+        notifier.notifyObservers(invokeOnSomething);
+    }
+}
+
+/**
+ * Verify removal of observers.
+ */
+TEST_F(NotifierTest, test_removingObserversWithNotificationInLifoMode) {
+    TestNotifier notifier;
+    auto observer0 = std::make_shared<MockTestObserver>();
+    auto observer1 = std::make_shared<MockTestObserver>();
+    auto observer2 = std::make_shared<MockTestObserver>();
+
+    notifier.addObserver(observer0);
+    notifier.addObserver(observer1);
+    notifier.addObserver(observer2);
+
+    {
+        InSequence sequence;
+        EXPECT_CALL(*observer2, onSomething());
+        EXPECT_CALL(*observer1, onSomething());
+        EXPECT_CALL(*observer0, onSomething());
+
+        notifier.notifyObserversInReverse(invokeOnSomething);
+    }
+    notifier.removeObserver(observer1);
+    {
+        InSequence sequence;
+        EXPECT_CALL(*observer2, onSomething());
+        EXPECT_CALL(*observer1, onSomething()).Times(0);
+        EXPECT_CALL(*observer0, onSomething());
+
+        notifier.notifyObserversInReverse(invokeOnSomething);
+    }
+}
+
 /**
  * Verify notification of observers in the reverse order.
  */
@@ -302,5 +388,5 @@ TEST_F(NotifierTest, test_resetSharedPtrWeakPtrCallbackShallNotBeCalled) {
 }
 
 }  // namespace test
-}  // namespace acsdkNotifier
+}  // namespace notifier
 }  // namespace alexaClientSDK
diff --git a/shared/Notifier/test/NotifierTests.dox b/shared/Notifier/test/NotifierTests.dox
new file mode 100644
index 0000000000..8e0e7537e7
--- /dev/null
+++ b/shared/Notifier/test/NotifierTests.dox
@@ -0,0 +1,22 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @defgroup Lib_acsdkNotifierTests Unit Tests for Event Broadcasting
+ * @brief Collection of test cases for event broadcasting.
+ *
+ * @see alexaClientSDK::notifier::test Namespace
+ * @see Lib_acsdkNotifier
+ */
diff --git a/shared/Notifier/test/NotifierTraitsTest.cpp b/shared/Notifier/test/NotifierTraitsTest.cpp
new file mode 100644
index 0000000000..4e6888d557
--- /dev/null
+++ b/shared/Notifier/test/NotifierTraitsTest.cpp
@@ -0,0 +1,69 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <memory>
+
+#include <gtest/gtest.h>
+
+#include <acsdk/Notifier/internal/NotifierTraits.h>
+
+namespace alexaClientSDK {
+namespace notifier {
+namespace test {
+
+using namespace ::testing;
+
+/**
+ * @brief Test fixture for @c NotifierTraits.
+ * @ingroup Lib_acsdkNotifierTests
+ */
+class NotifierTraitsTest : public ::testing::Test {};
+
+/**
+ * Verify conversion to void works.
+ */
+TEST_F(NotifierTraitsTest, test_toVoidConversion) {
+    auto reference = std::make_shared<std::string>("test");
+    auto voidReference = NotifierTraits<std::string>::toVoidPtr(reference);
+    ASSERT_EQ(reference.get(), voidReference.get());
+}
+
+/**
+ * Verify conversion from void works.
+ */
+TEST_F(NotifierTraitsTest, test_fromVoidConversion) {
+    auto reference = std::make_shared<std::string>("test");
+    auto voidReference = NotifierTraits<std::string>::toVoidPtr(reference);
+    auto reference2 = NotifierTraits<std::string>::fromVoidPtr(voidReference);
+    ASSERT_EQ(reference.get(), reference2.get());
+}
+
+/**
+ * Verify function adapter works.
+ */
+TEST_F(NotifierTraitsTest, test_adaptFunction) {
+    std::shared_ptr<std::string> calledValue;
+    std::function<void(const std::shared_ptr<std::string>& value)> fn =
+        [&calledValue](const std::shared_ptr<std::string>& value) { calledValue = value; };
+    auto adaptedFn = NotifierTraits<std::string>::adaptFunction(std::move(fn));
+    auto reference = std::make_shared<std::string>("test");
+    adaptedFn(NotifierTraits<std::string>::toVoidPtr(reference));
+    ASSERT_TRUE(calledValue);
+    ASSERT_EQ(calledValue, reference);
+}
+
+}  // namespace test
+}  // namespace notifier
+}  // namespace alexaClientSDK
diff --git a/shared/Notifier/test/ObserverWrapperTest.cpp b/shared/Notifier/test/ObserverWrapperTest.cpp
new file mode 100644
index 0000000000..8264607a12
--- /dev/null
+++ b/shared/Notifier/test/ObserverWrapperTest.cpp
@@ -0,0 +1,112 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+
+#include <acsdk/Notifier/private/ObserverWrapper.h>
+
+namespace alexaClientSDK {
+namespace notifier {
+namespace test {
+
+/**
+ * @brief Test fixture for @a ObserverWrapper unit tests.
+ * @ingroup Lib_acsdkNotifierTests
+ */
+class ObserverWrapperTest : public ::testing::Test {};
+
+/**
+ * @brief Test class for unit tests.
+ * @ingroup Lib_acsdkNotifierTests
+ * @private
+ */
+class TestObserver {};
+
+TEST_F(ObserverWrapperTest, test_strongRefState) {
+    auto strongRef = std::make_shared<TestObserver>();
+    ObserverWrapper wrapper(ReferenceType::StrongRef, strongRef);
+    ASSERT_EQ(ReferenceType::StrongRef, wrapper.getReferenceType());
+    ASSERT_EQ(strongRef, wrapper.get());
+    ASSERT_TRUE(wrapper.isEqualOrExpired(strongRef.get()));
+    ASSERT_FALSE(wrapper.isEqualOrExpired(std::make_shared<TestObserver>().get()));
+}
+
+TEST_F(ObserverWrapperTest, test_strongReferenceDoesNotExpire) {
+    auto strongRef = std::make_shared<TestObserver>();
+    ObserverWrapper wrapper(ReferenceType::StrongRef, strongRef);
+    std::weak_ptr<TestObserver> weakPtr = strongRef;
+    strongRef.reset();
+    ASSERT_FALSE(weakPtr.expired());
+    ASSERT_FALSE(wrapper.isEqualOrExpired(nullptr));
+}
+
+TEST_F(ObserverWrapperTest, test_weakReferenceExpires) {
+    auto testObserver = std::make_shared<TestObserver>();
+    ObserverWrapper wrapper(ReferenceType::WeakRef, testObserver);
+    std::weak_ptr<TestObserver> weakRef = testObserver;
+    ASSERT_FALSE(weakRef.expired());
+    testObserver.reset();
+    ASSERT_TRUE(weakRef.expired());
+    ASSERT_TRUE(wrapper.isEqualOrExpired(std::make_shared<TestObserver>().get()));
+    ASSERT_TRUE(wrapper.isEqualOrExpired(nullptr));
+}
+
+TEST_F(ObserverWrapperTest, test_copyConstructStrongRef) {
+    auto strongRef = std::make_shared<TestObserver>();
+    ObserverWrapper wrapper1(ReferenceType::StrongRef, strongRef);
+    ObserverWrapper wrapper2(wrapper1);
+
+    ASSERT_EQ(ReferenceType::StrongRef, wrapper1.getReferenceType());
+    ASSERT_EQ(ReferenceType::StrongRef, wrapper2.getReferenceType());
+    ASSERT_EQ(strongRef, wrapper1.get());
+    ASSERT_EQ(strongRef, wrapper2.get());
+}
+
+TEST_F(ObserverWrapperTest, test_moveConstructStrongRef) {
+    auto strongRef = std::make_shared<TestObserver>();
+    ObserverWrapper wrapper1(ReferenceType::StrongRef, strongRef);
+    ObserverWrapper wrapper2(std::move(wrapper1));
+
+    ASSERT_EQ(ReferenceType::StrongRef, wrapper1.getReferenceType());
+    ASSERT_EQ(ReferenceType::StrongRef, wrapper2.getReferenceType());
+    ASSERT_EQ(nullptr, wrapper1.get());
+    ASSERT_EQ(strongRef, wrapper2.get());
+}
+
+TEST_F(ObserverWrapperTest, test_copyConstructWeakRef) {
+    auto strongRef = std::make_shared<TestObserver>();
+    ObserverWrapper wrapper1(ReferenceType::WeakRef, strongRef);
+    ObserverWrapper wrapper2(wrapper1);
+
+    ASSERT_EQ(ReferenceType::WeakRef, wrapper1.getReferenceType());
+    ASSERT_EQ(ReferenceType::WeakRef, wrapper2.getReferenceType());
+    ASSERT_EQ(strongRef, wrapper1.get());
+    ASSERT_EQ(strongRef, wrapper2.get());
+}
+
+TEST_F(ObserverWrapperTest, test_moveConstructWeakRef) {
+    auto strongRef = std::make_shared<TestObserver>();
+    ObserverWrapper wrapper1(ReferenceType::WeakRef, strongRef);
+    ObserverWrapper wrapper2(std::move(wrapper1));
+
+    ASSERT_EQ(ReferenceType::WeakRef, wrapper1.getReferenceType());
+    ASSERT_EQ(ReferenceType::WeakRef, wrapper2.getReferenceType());
+    ASSERT_EQ(nullptr, wrapper1.get().get());
+    ASSERT_EQ(strongRef, wrapper2.get());
+}
+
+}  // namespace test
+}  // namespace notifier
+}  // namespace alexaClientSDK
diff --git a/shared/acsdkNotifierInterfaces/CMakeLists.txt b/shared/NotifierInterfaces/CMakeLists.txt
similarity index 100%
rename from shared/acsdkNotifierInterfaces/CMakeLists.txt
rename to shared/NotifierInterfaces/CMakeLists.txt
diff --git a/shared/NotifierInterfaces/doc/Namespaces.dox b/shared/NotifierInterfaces/doc/Namespaces.dox
new file mode 100644
index 0000000000..25e3d6bd6c
--- /dev/null
+++ b/shared/NotifierInterfaces/doc/Namespaces.dox
@@ -0,0 +1,23 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @namespace ::alexaClientSDK::notifierInterfaces
+ * @brief Event notifier interfaces.
+ *
+ * @see Lib_acsdkNotifierInterfaces
+ * @see Lib_acsdkNotifier
+ * @ingroup Lib_acsdkNotifierInterfaces
+ */
diff --git a/shared/NotifierInterfaces/doc/NotifierInterfaces.dox b/shared/NotifierInterfaces/doc/NotifierInterfaces.dox
new file mode 100644
index 0000000000..dfa80aafe8
--- /dev/null
+++ b/shared/NotifierInterfaces/doc/NotifierInterfaces.dox
@@ -0,0 +1,23 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @defgroup Lib_acsdkNotifierInterfaces Event Broadcasting Interfaces
+ * @brief Collection of interfaces for event broadcasting.
+ *
+ * @see alexaClientSDK::notifierInterfaces Namespace
+ * @see Lib_acsdkNotifierInterfaces
+ * @see Lib_acsdkNotifier
+ */
diff --git a/shared/NotifierInterfaces/include/acsdk/NotifierInterfaces/NotifierInterface.h b/shared/NotifierInterfaces/include/acsdk/NotifierInterfaces/NotifierInterface.h
new file mode 100644
index 0000000000..8bcf4551cb
--- /dev/null
+++ b/shared/NotifierInterfaces/include/acsdk/NotifierInterfaces/NotifierInterface.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_NOTIFIERINTERFACES_NOTIFIERINTERFACE_H_
+#define ACSDK_NOTIFIERINTERFACES_NOTIFIERINTERFACE_H_
+
+#include <functional>
+#include <memory>
+
+namespace alexaClientSDK {
+namespace notifierInterfaces {
+
+/**
+ * @brief Generic observer operations interface.
+ *
+ * Interface for maintaining a set of observers that are notified with a caller defined function.
+ *
+ * @tparam ObserverType The type of observer notified by the template instantiation.
+ */
+template <typename ObserverType>
+class NotifierInterface {
+public:
+    /**
+     * Destructor.
+     */
+    virtual ~NotifierInterface() = default;
+
+    /**
+     * @brief Add an observer.
+     *
+     * Method adds a strong reference to observer. If the same observer has already been added as a strong or weak
+     * reference, the method does nothing.
+     *
+     * If the observer function has been installed prior to this call, it will be invoked with the newly added observer.
+     *
+     * @param[in] observer The observer to add. If @a observer is nullptr, the method does nothing.
+     *
+     * @deprecated In the future, @c Notifier will no longer maintain the life cycle of its @c observers.  Please start
+     * using the new @c addWeakPtrObserver() API instead.
+     */
+    virtual void addObserver(const std::shared_ptr<ObserverType>& observer) = 0;
+
+    /**
+     * @brief Remove an observer.
+     *
+     * Method removes a strong or weak reference to @a observer. If the class doesn't have a strong or weak reference
+     * to @a observer, the method does nothing.
+     *
+     * @param[in] observer The observer to remove. If @a observer is nullptr, the method does nothing.
+     *
+     * @deprecated In the future, @c Notifier will no longer maintain the life cycle of its @c observers.  Please start
+     * using the new @c removeWeakPtrObserver() API instead.
+     */
+    virtual void removeObserver(const std::shared_ptr<ObserverType>& observer) = 0;
+
+    /**
+     * @brief Add a weak reference to an observer.
+     *
+     * Method adds a weak reference to observer. If the same observer has already been added as a strong or weak
+     * reference, the method does nothing.
+     *
+     * If the observer function has been installed prior to this call, it will be invoked with the newly added observer.
+     *
+     * @param[in] observer The observer to add. If @a observer is nullptr, the method does nothing.
+     *
+     * @note Lifecycle of @a observer will not be managed by the Notifier.  If @a observer object is expired, then
+     *       no callback will be called to that object.
+     */
+    virtual void addWeakPtrObserver(const std::weak_ptr<ObserverType>& observer) = 0;
+
+    /**
+     * @brief Remove an observer.
+     *
+     * Method removes a strong or weak reference to @a observer. If the class doesn't have a strong or weak reference
+     * to @a observer, the method does nothing.
+     *
+     * @param[in] observer The observer to remove. If @a observer is nullptr, the method does nothing.
+     */
+    virtual void removeWeakPtrObserver(const std::weak_ptr<ObserverType>& observer) = 0;
+
+    /**
+     * @brief Notify the observers in the order that they were added.
+     *
+     * @param[in] notify The function to invoke to notify an observer.
+     */
+    virtual void notifyObservers(std::function<void(const std::shared_ptr<ObserverType>&)> notify) = 0;
+
+    /**
+     * @brief Notify the observers in the reverse order that they were added.
+     *
+     * @param notify The function to invoke to notify an observer.
+     * @return true if (and only if) all observers were notified (observers added during calls to this method
+     * will miss out).
+     */
+    virtual bool notifyObserversInReverse(std::function<void(const std::shared_ptr<ObserverType>&)> notify) = 0;
+
+    /**
+     * @brief Set a function for notifications on an observer additions.
+     *
+     * Set the function to be called after an observer is added (for example, to notify the newly-added observer
+     * of the current state).
+     *
+     * If there's any observers that were added before @c setAddObserverFunction is called, those added observers will
+     * be notified as well.
+     *
+     * @warn Use caution when setting this function. The function MUST be reentrant, or else you run the risk
+     * of deadlock. When an observer adds itself to a @c NotifierInterface, this function will be called in the
+     * same context.
+     *
+     * @param[in] postAddFunc The function to call after an observer is added.
+     */
+    virtual void setAddObserverFunction(std::function<void(const std::shared_ptr<ObserverType>&)> postAddFunc) = 0;
+};
+
+}  // namespace notifierInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_NOTIFIERINTERFACES_NOTIFIERINTERFACE_H_
diff --git a/shared/NotifierInterfaces/test/CMakeLists.txt b/shared/NotifierInterfaces/test/CMakeLists.txt
new file mode 100644
index 0000000000..1537b9fcdb
--- /dev/null
+++ b/shared/NotifierInterfaces/test/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+if (BUILD_TESTING)
+    add_library(acsdkNotifierTestLib INTERFACE)
+
+    target_include_directories(acsdkNotifierTestLib INTERFACE "${acsdkNotifierInterfaces_SOURCE_DIR}/test/include")
+
+    target_link_libraries(acsdkNotifierTestLib INTERFACE acsdkNotifierInterfaces gmock_main)
+
+    discover_unit_tests("" acsdkNotifierTestLib)
+endif()
diff --git a/shared/NotifierInterfaces/test/MockNotifierTest.cpp b/shared/NotifierInterfaces/test/MockNotifierTest.cpp
new file mode 100644
index 0000000000..3d89b29b91
--- /dev/null
+++ b/shared/NotifierInterfaces/test/MockNotifierTest.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/// @file NotifierTest.cpp
+
+#include <memory>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <acsdk/NotifierInterfaces/test/MockNotifier.h>
+
+namespace alexaClientSDK {
+namespace notifierInterfaces {
+namespace test {
+
+/**
+ * @brief Test fixture for MockNotifier tests.
+ *
+ * @ingroup lib_acsdkNotifierTestLib
+ */
+class MockNotifierTest : public ::testing::Test {};
+
+/**
+ * Verify that mock is correct.
+ */
+TEST_F(MockNotifierTest, test_construction) {
+    auto mock = std::make_shared<MockNotifier<void>>();
+    ASSERT_TRUE(mock);
+}
+
+}  // namespace test
+}  // namespace notifierInterfaces
+}  // namespace alexaClientSDK
diff --git a/shared/NotifierInterfaces/test/Namespaces.dox b/shared/NotifierInterfaces/test/Namespaces.dox
new file mode 100644
index 0000000000..2759cd4274
--- /dev/null
+++ b/shared/NotifierInterfaces/test/Namespaces.dox
@@ -0,0 +1,20 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @namespace ::alexaClientSDK::notifier::test
+ * @brief Test cases for @ref Lib_acsdkNotifier
+ * @ingroup Lib_acsdkNotifierTests
+ */
diff --git a/shared/NotifierInterfaces/test/NotifierInterfacesTests.dox b/shared/NotifierInterfaces/test/NotifierInterfacesTests.dox
new file mode 100644
index 0000000000..98eaa6c884
--- /dev/null
+++ b/shared/NotifierInterfaces/test/NotifierInterfacesTests.dox
@@ -0,0 +1,22 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @defgroup Lib_acsdkNotifierInterfacesTestLib Mocks for event broadcasting interfaces
+ * @brief Mocks for event broadcasting interfaces.
+ *
+ * @see alexaClientSDK::notifierInterfaces::test Namespace
+ * @see Lib_acsdkNotifier
+ */
diff --git a/shared/NotifierInterfaces/test/include/acsdk/NotifierInterfaces/test/MockNotifier.h b/shared/NotifierInterfaces/test/include/acsdk/NotifierInterfaces/test/MockNotifier.h
new file mode 100644
index 0000000000..6b5894b2da
--- /dev/null
+++ b/shared/NotifierInterfaces/test/include/acsdk/NotifierInterfaces/test/MockNotifier.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#ifndef ACSDK_NOTIFIERINTERFACES_TEST_MOCKNOTIFIER_H_
+#define ACSDK_NOTIFIERINTERFACES_TEST_MOCKNOTIFIER_H_
+
+#include <gmock/gmock.h>
+
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
+
+namespace alexaClientSDK {
+namespace notifierInterfaces {
+namespace test {
+
+/**
+ * @brief Mock class that implements NotifierInterface.
+ *
+ * To make Expect calls against the observer you will need to set a ON_CALL WillByDefault assertion that will pass the
+ * args to the observer.
+ *
+ * @code
+ * ON_CALL(MockNotifier, notifyObservers(_))
+ *          .WillByDefault(Invoke(
+ *              [this](std::function<void(
+ *                         const std::shared_ptr<ObserverType>&)>
+ *                         notifyFn) { notifyFn(observer); }));
+ * @endcode
+ *
+ * @ingroup Lib_acsdkNotifierTestLib
+ */
+template <typename ObserverType>
+class MockNotifier : public notifierInterfaces::NotifierInterface<ObserverType> {
+public:
+    MOCK_METHOD1_T(addObserver, void(const std::shared_ptr<ObserverType>& observer));
+    MOCK_METHOD1_T(removeObserver, void(const std::shared_ptr<ObserverType>& observer));
+    MOCK_METHOD1_T(addWeakPtrObserver, void(const std::weak_ptr<ObserverType>& observer));
+    MOCK_METHOD1_T(removeWeakPtrObserver, void(const std::weak_ptr<ObserverType>& observer));
+    MOCK_METHOD1_T(notifyObservers, void(std::function<void(const std::shared_ptr<ObserverType>&)>));
+    MOCK_METHOD1_T(notifyObserversInReverse, bool(std::function<void(const std::shared_ptr<ObserverType>&)>));
+    MOCK_METHOD1_T(setAddObserverFunction, void(std::function<void(const std::shared_ptr<ObserverType>&)>));
+};
+
+}  // namespace test
+}  // namespace notifierInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_NOTIFIERINTERFACES_TEST_MOCKNOTIFIER_H_
diff --git a/shared/PresentationOrchestrator/.clang-format b/shared/PresentationOrchestrator/.clang-format
new file mode 100644
index 0000000000..3d1ec24482
--- /dev/null
+++ b/shared/PresentationOrchestrator/.clang-format
@@ -0,0 +1,102 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+#AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+#AlignEscapedNewlines: Left
+#AlignOperands:   true
+#AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+#AllowShortBlocksOnASingleLine: false
+#AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+#AllowShortIfStatementsOnASingleLine: true
+#AllowShortLoopsOnASingleLine: true
+#AlwaysBreakAfterDefinitionReturnType: None
+#AlwaysBreakAfterReturnType: None
+#AlwaysBreakBeforeMultilineStrings: true
+#AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+#BraceWrapping:   None
+#  AfterClass:      false
+#  AfterControlStatement: false
+#  AfterEnum:       false
+#  AfterFunction:   false
+#  AfterNamespace:  false
+#  AfterObjCDeclaration: false
+#  AfterStruct:     false
+#  AfterUnion:      false
+#  BeforeCatch:     false
+#  BeforeElse:      false
+#  IndentBraces:    false
+#  SplitEmptyFunctionBody: true
+#BreakBeforeBinaryOperators: None
+#BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: true
+#BreakBeforeTernaryOperators: true
+#BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: AfterColon
+#BreakAfterJavaFieldAnnotations: false
+#BreakStringLiterals: true
+ColumnLimit:     120
+#CommentPragmas:  '^ IWYU pragma:'
+#CompactNamespaces: false
+#ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+#ContinuationIndentWidth: 4
+#Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+#DisableFormat:   false
+#ExperimentalAutoDetectBinPacking: false
+#FixNamespaceComments: true
+#ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+#IncludeCategories:
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#  - Regex:           '^<.*'
+#    Priority:        2
+#  - Regex:           '.*'
+#    Priority:        3
+#IncludeIsMainRegex: '([-_](test|unittest))?$'
+#IndentCaseLabels: true
+IndentWidth:     4
+#IndentWrappedFunctionNames: false
+#JavaScriptQuotes: Leave
+#JavaScriptWrapImports: true
+#KeepEmptyLinesAtTheStartOfBlocks: false
+#MacroBlockBegin: ''
+#MacroBlockEnd:   ''
+#MaxEmptyLinesToKeep: 1
+#NamespaceIndentation: None
+#ObjCBlockIndentWidth: 2
+#ObjCSpaceAfterProperty: false
+#ObjCSpaceBeforeProtocolList: false
+#PenaltyBreakAssignment: 2
+#PenaltyBreakBeforeFirstCallParameter: 1
+#PenaltyBreakComment: 300
+#PenaltyBreakFirstLessLess: 120
+#PenaltyBreakString: 1000
+#PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 20000
+#PointerAlignment: Left
+#ReflowComments:  true
+SortIncludes:    false
+#SpaceAfterCStyleCast: false
+#SpaceAfterTemplateKeyword: true
+#SpaceBeforeAssignmentOperators: true
+#SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+#SpacesBeforeTrailingComments: 2
+#SpacesInAngles:  false
+#SpacesInContainerLiterals: true
+#SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+#Standard:        Auto
+#TabWidth:        8
+#UseTab:          Never
+...
+
diff --git a/shared/PresentationOrchestrator/CMakeLists.txt b/shared/PresentationOrchestrator/CMakeLists.txt
new file mode 100644
index 0000000000..4ae176f8e1
--- /dev/null
+++ b/shared/PresentationOrchestrator/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+add_subdirectory("PresentationOrchestratorClient" "POClient")
+add_subdirectory("PresentationOrchestratorInterfaces" "POInterfaces")
+add_subdirectory("PresentationOrchestratorStateTracker" "POStateTracker")
+add_subdirectory("VisualTimeoutManager")
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/CMakeLists.txt b/shared/PresentationOrchestrator/PresentationOrchestratorClient/CMakeLists.txt
new file mode 100644
index 0000000000..de3ffa6595
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkPresentationOrchestratorClient LANGUAGES CXX)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/include/acsdk/PresentationOrchestratorClient/PresentationOrchestratorClientFactory.h b/shared/PresentationOrchestrator/PresentationOrchestratorClient/include/acsdk/PresentationOrchestratorClient/PresentationOrchestratorClientFactory.h
new file mode 100644
index 0000000000..ffca37087a
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/include/acsdk/PresentationOrchestratorClient/PresentationOrchestratorClientFactory.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRESENTATIONORCHESTRATORCLIENTFACTORY_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRESENTATIONORCHESTRATORCLIENTFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorClientInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/VisualTimeoutManagerInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+class PresentationOrchestratorClientFactory {
+public:
+    /// Struct returned by the create method which contains instances of the interfaces exposed by the
+    /// @c PresentationOrchestratorClient
+    struct PresentationOrchestratorClientExports {
+        /// The instance of @c PresentationOrchestratorClientInterface provided by the @c PresentationOrchestratorClient
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface>
+            presentationOrchestratorClientInterface;
+        /// The instance of @c PresentationOrchestratorInterface provided by the @c PresentationOrchestratorClient
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorInterface>
+            presentationOrchestratorInterface;
+        /// Instance of @c RequiresShutdown used for cleaning up during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+    /**
+     * Creates an instance of the PresentationOrchestratorClient
+     * @param stateTracker Instance of the @c PresentationOrchestratorStateTrackerInterface to use for state reporting
+     * @param visualTimeoutManager Instance of the @c VisualTimeoutManagerInterface for managing timeouts
+     * @return Optional containing the interfaces exported by the PresentationOrchestratorClient, or empty if creation
+     * failed
+     */
+    static avsCommon::utils::Optional<PresentationOrchestratorClientExports> create(
+        const std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>&
+            stateTracker,
+        const std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface>& visualTimeoutManager,
+        const std::string& clientId = "default");
+};
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRESENTATIONORCHESTRATORCLIENTFACTORY_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/MultiWindowManagerInterface.h b/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/MultiWindowManagerInterface.h
new file mode 100644
index 0000000000..c4119841e8
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/MultiWindowManagerInterface.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_MULTIWINDOWMANAGERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_MULTIWINDOWMANAGERINTERFACE_H_
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorTypes.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+
+/**
+ * Interface used by @c WindowManager to invoke operations on windows other than its internally managed window
+ */
+class MultiWindowManagerInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~MultiWindowManagerInterface() = default;
+
+    /// Callback definition for readability
+    using ForegroundWindowCallback = std::function<void()>;
+
+    /**
+     * Invoke operations on windows other than the specified window instance being foregrounded.
+     * These may include unfocusing a window or clearing presentations from windows with higher zOrderIndex.
+     * Ensure that this call does not lead to a deadlock between the @c WindowManager and implementation of @c
+     * MultiWindowManagerInterface
+     * @param windowInstanceToForeground The window instance to be foregrounded
+     * @param foregroundWindowCallback The callback to be invoked once the specified window instance can be foregrounded
+     */
+    virtual void prepareToForegroundWindow(
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& windowInstanceToForeground,
+        ForegroundWindowCallback foregroundWindowCallback) = 0;
+
+    /**
+     * Called when a state change has occurred to a previously foregrounded Window which may affect the state of other
+     * windows.
+     * Will result in the next window which should have foreground focus (if any) being updated to the foreground state.
+     */
+    virtual void updateForegroundWindow() = 0;
+};
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_MULTIWINDOWMANAGERINTERFACE_H_
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/Presentation.h b/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/Presentation.h
new file mode 100644
index 0000000000..dfcd520da7
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/Presentation.h
@@ -0,0 +1,177 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_PRESENTATION_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_PRESENTATION_H_
+
+#include <atomic>
+#include <chrono>
+#include <memory>
+#include <mutex>
+#include <string>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationObserverInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationTypes.h>
+#include <acsdk/PresentationOrchestratorInterfaces/VisualTimeoutManagerInterface.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+
+/// Forward declaration for @c WindowManager class
+class WindowManager;
+
+/**
+ * Class which represents an instance of a PresentationInterface returned by the Presentation Orchestrator
+ */
+class Presentation
+        : public presentationOrchestratorInterfaces::PresentationInterface
+        , public std::enable_shared_from_this<Presentation> {
+public:
+    /**
+     * Create an instance of @c Presentation
+     * @param observer Observer to notify of presentation availability and state changes
+     * @param options presentation options
+     * @param requestToken the unique identifier included when @c PresentationObserverInterface functions are called
+     * @param state presentation state
+     * @param visualTimeoutManager Pointer to @c VisualTimeoutManagerInterface
+     * @param windowManager Pointer to @c WindowManager
+     * @param lifespanToTimeoutMapper Pointer to @c PresentationLifespanToTimeoutMapper
+     * @return @c Presentation instance
+     */
+    static std::shared_ptr<Presentation> create(
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationObserverInterface> observer,
+        presentationOrchestratorInterfaces::PresentationOptions options,
+        presentationOrchestratorInterfaces::PresentationRequestToken requestToken,
+        presentationOrchestratorInterfaces::PresentationState state,
+        std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> visualTimeoutManager,
+        std::shared_ptr<WindowManager> windowManager);
+
+    /// @c PresentationInterface functions
+    /// @{
+    void dismiss() override;
+    void foreground() override;
+    void setMetadata(const std::string& metadata) override;
+    void setLifespan(const presentationOrchestratorInterfaces::PresentationLifespan& lifespan) override;
+    void startTimeout() override;
+    void stopTimeout() override;
+    void setTimeout(const std::chrono::milliseconds& timeout) override;
+    presentationOrchestratorInterfaces::PresentationState getState() override;
+    /// @}
+
+    /**
+     * Getter for metadata
+     * @return metadata for the presentation
+     */
+    std::string getMetadata() const;
+
+    /**
+     * Getter for interface
+     * @return interface associated with the presentation
+     */
+    std::string getInterface() const;
+
+    /**
+     * Getter for request token
+     * @return token specified when presentation was requested
+     */
+    presentationOrchestratorInterfaces::PresentationRequestToken getRequestToken() const;
+
+    /**
+     * Getter for presentation lifespan
+     * @return presentation lifespan
+     */
+    presentationOrchestratorInterfaces::PresentationLifespan getLifespan() const;
+
+    /**
+     * Method to update the presentation state
+     * @param newState Presentation state
+     */
+    void setState(presentationOrchestratorInterfaces::PresentationState newState);
+
+    /**
+     * Method to perform custom back navigation on the presentation if supported
+     * @return true if custom back navigation on presentation was handled, false otherwise
+     */
+    bool navigateBack();
+
+private:
+    /**
+     * Constructor
+     * @param observer Observer to notify of presentation availability and state changes
+     * @param options presentation options
+     * @param requestToken the unique identifier included when @c PresentationObserverInterface functions are called
+     * @param state presentation state
+     * @param visualTimeoutManager Pointer to @c VisualTimeoutManagerInterface
+     * @param windowManager Pointer to @c WindowManager
+     * @param customTimeout A custom timeout value specified in initial options post validation, -1 to use default
+     */
+    Presentation(
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationObserverInterface> observer,
+        presentationOrchestratorInterfaces::PresentationOptions options,
+        presentationOrchestratorInterfaces::PresentationRequestToken requestToken,
+        presentationOrchestratorInterfaces::PresentationState state,
+        std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> visualTimeoutManager,
+        std::shared_ptr<WindowManager> windowManager,
+        std::chrono::milliseconds customTimeout);
+
+    /**
+     * Internal method to start the timeout assuming that the lock for m_options has already been acquired
+     */
+    void startTimeoutLocked();
+
+    /**
+     * Internal method to set the timeout assuming that the lock for m_options has already been acquired
+     * @param timeout timeout value to be set
+     */
+    void setTimeoutLocked(const std::chrono::milliseconds& timeout);
+
+    /**
+     * Internal method to validate timeout value
+     * @param timeout timeout value
+     * @return true if timeout value is valid, false otherwise
+     */
+    static bool validateTimeout(const std::chrono::milliseconds& timeout);
+
+    /// Pointer to @c PresentationObserverInterface for notifying presentation state change
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationObserverInterface> m_observer;
+
+    /// Tracks current @c PresentationOptions associated with presentation
+    presentationOrchestratorInterfaces::PresentationOptions m_options;
+
+    /// Mutex to serialize access to m_options
+    mutable std::mutex m_optionsMutex;
+
+    /// Tracks current state of presentation
+    std::atomic<presentationOrchestratorInterfaces::PresentationState> m_state;
+
+    /// Token specified when presentation became available
+    const presentationOrchestratorInterfaces::PresentationRequestToken m_requestToken;
+
+    /// Tracks timeoutId from latest request made to @c VisualTimeoutManagerInterface
+    std::atomic<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface::VisualTimeoutId> m_lastTimeoutId;
+
+    /// Pointer to @c VisualTimeoutManagerInterface for requesting/stopping timeout
+    std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> m_visualTimeoutManager;
+
+    /// Pointer to @c WindowManager for invoking operations on it's worker thread and presentation stack
+    std::shared_ptr<WindowManager> m_windowManager;
+
+    /// Custom timeout post validation specified in initial options. Not expected to change once initialized
+    const std::chrono::milliseconds m_customTimeout;
+};
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_PRESENTATION_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/PresentationLifespanToTimeoutMapper.h b/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/PresentationLifespanToTimeoutMapper.h
new file mode 100644
index 0000000000..f0b22df7d9
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/PresentationLifespanToTimeoutMapper.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_PRESENTATIONLIFESPANTOTIMEOUTMAPPER_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_PRESENTATIONLIFESPANTOTIMEOUTMAPPER_H_
+
+#include <chrono>
+#include <memory>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationTypes.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+
+/**
+ * Class which handles mappings from @c PresentationLifespan to durations
+ */
+class PresentationLifespanToTimeoutMapper {
+public:
+    /**
+     * Create an instance of @c PresentationLifespanToTimeoutMapper
+     * @return Pointer to @c PresentationLifespanToTimeoutMapper instance
+     */
+    static std::shared_ptr<PresentationLifespanToTimeoutMapper> create();
+
+    /**
+     * Return the timeout duration corresponding to a presentation lifespan
+     * @param lifespan presentation lifespan
+     * @return timeout duration
+     */
+    std::chrono::milliseconds getTimeoutDuration(
+        const presentationOrchestratorInterfaces::PresentationLifespan& lifespan);
+
+private:
+    /**
+     * Constructor
+     */
+    PresentationLifespanToTimeoutMapper();
+
+    /**
+     * Initializes the object by reading the values from configuration.
+     */
+    void initialize();
+
+    /// The timeout value in ms for SHORT presentations
+    std::chrono::milliseconds m_shortPresentationTimeout;
+
+    /// The timeout value in ms for TRANSIENT presentations
+    std::chrono::milliseconds m_transientPresentationTimeout;
+
+    /// The timeout value in ms for LONG presentations
+    std::chrono::milliseconds m_longPresentationTimeout;
+};
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_PRESENTATIONLIFESPANTOTIMEOUTMAPPER_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/PresentationOrchestratorClient.h b/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/PresentationOrchestratorClient.h
new file mode 100644
index 0000000000..c04ea70eaa
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/PresentationOrchestratorClient.h
@@ -0,0 +1,193 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_PRESENTATIONORCHESTRATORCLIENT_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_PRESENTATIONORCHESTRATORCLIENT_H_
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorClientInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/VisualTimeoutManagerInterface.h>
+
+#include "acsdk/PresentationOrchestratorClient/private/MultiWindowManagerInterface.h"
+#include "acsdk/PresentationOrchestratorClient/private/PresentationLifespanToTimeoutMapper.h"
+#include "acsdk/PresentationOrchestratorClient/private/WindowManager.h"
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+
+/**
+ * The PresentationOrchestratorClient class.
+ * Takes window requests from clients and manages the lifespan and status of presentations across windows.
+ * Notifies the PresentationOrchestratorStateTracker when state changes occur to ensure state is reported accurately.
+ */
+class PresentationOrchestratorClient
+        : public presentationOrchestratorInterfaces::PresentationOrchestratorClientInterface
+        , public presentationOrchestratorInterfaces::PresentationOrchestratorInterface
+        , public presentationOrchestratorInterfaces::PresentationOrchestratorWindowObserverInterface
+        , public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public MultiWindowManagerInterface
+        , public std::enable_shared_from_this<PresentationOrchestratorClient> {
+public:
+    /**
+     * Create an instance of @c PresentationOrchestratorClient
+     * @param clientId Id for PO Client
+     * @param stateTracker Pointer to @c PresentationOrchestratorStateTrackerInterface
+     * @param visualTimeoutManager Pointer to @c VisualTimeoutManagerInterface
+     * @return @c PresentationOrchestratorClient instance
+     */
+    static std::shared_ptr<PresentationOrchestratorClient> create(
+        const std::string& clientId,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface> stateTracker,
+        std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> visualTimeoutManager);
+
+    /// @c PresentationOrchestratorClientInterface functions
+    /// @{
+    presentationOrchestratorInterfaces::PresentationRequestToken requestWindow(
+        const std::string& windowId,
+        presentationOrchestratorInterfaces::PresentationOptions options,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationObserverInterface> observer) override;
+    /// @}
+
+    /// @c PresentationOrchestratorInterface functions
+    /// @{
+    void clearPresentations() override;
+    bool navigateBack() override;
+    /// @}
+
+    /// @c PresentationOrchestratorWindowObserverInterface functions
+    void onWindowAdded(
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& windowInstance) override;
+    void onWindowModified(
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& windowInstance) override;
+    void onWindowRemoved(const std::string& windowId) override;
+    /// @}
+
+    /// @c MultiWindowManagerInterface functions
+    /// @{
+    void prepareToForegroundWindow(
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& windowInstanceToForeground,
+        ForegroundWindowCallback foregroundWindowCallback) override;
+
+    void updateForegroundWindow() override;
+    /// @}
+
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /**
+     * Set the executor used as the worker thread
+     * @param executor The @c Executor to set
+     * @note This function should only be used for testing purposes. No call to any other method should
+     * be done prior to this call.
+     */
+    void setExecutor(const std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor>& executor);
+
+private:
+    /**
+     * Constructor
+     * @param clientId Id for PO Client
+     * @param stateTracker Pointer to @c PresentationOrchestratorStateTrackerInterface
+     * @param visualTimeoutManager Pointer to @c VisualTimeoutManagerInterface
+     */
+    PresentationOrchestratorClient(
+        const std::string& clientId,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface> stateTracker,
+        std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> visualTimeoutManager);
+
+    /**
+     * Internal method to process request of window and presentation
+     * @param requestToken the unique identifier for this request, this will be included when observer functions are
+     * called. onPresentationAvailable will be called on the observer interface once the presentation is available for
+     * use.
+     * @param windowId The window ID being requested
+     * @param options The presentation options for this request
+     * @param observer The observer for this window - all state changes for this presentation will be reported to this
+     */
+    void executeRequestWindow(
+        const presentationOrchestratorInterfaces::PresentationRequestToken& requestToken,
+        const std::string& windowId,
+        presentationOrchestratorInterfaces::PresentationOptions options,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationObserverInterface> observer);
+
+    /**
+     * Handle any prerequisite tasks for windows other than the specified window instance, before its foregrounded.
+     * These may include unfocusing a window or clearing presentations from windows with higher zOrderIndex
+     * @param windowInstanceToForeground The window instance to be foregrounded
+     * @param foregroundWindowCallback The callback to be invoked once the specified window instance can be foregrounded
+     */
+    void executePrepareToForegroundWindow(
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& windowInstanceToForeground,
+        ForegroundWindowCallback foregroundWindowCallback);
+
+    /**
+     * Internal method to process modifications in specified window instance
+     * @param windowInstance The updated window instance
+     */
+    void executeOnWindowModified(
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& windowInstance);
+
+    /**
+     * Internal method to process removal of a specified window
+     * @param windowId ID of window being removed
+     */
+    void executeOnWindowRemoved(const std::string& windowId);
+
+    /**
+     * Internal method to retrieve the @c WindowManager which owns the foreground focused presentation
+     * @return shared_ptr to foreground @c WindowManager, or nullptr if no @c WindowManager has foreground focus
+     */
+    std::shared_ptr<WindowManager> executeGetFocusedWindowManager();
+
+    /**
+     * A counter used to increment the token when a new window is requested.
+     * Incrementing should be atomic operation and variable must be used only in worker thread.
+     */
+    std::atomic<presentationOrchestratorInterfaces::PresentationRequestToken> m_requestTokenCounter;
+
+    /// Map of windowId to Window manager instances
+    std::unordered_map<std::string, std::shared_ptr<WindowManager>> m_windowIdToManager;
+
+    /// Pointer to @c PresentationOrchestratorStateTrackerInterface
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface> m_stateTracker;
+
+    /// Pointer to @c VisualTimeoutManagerInterface
+    std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> m_visualTimeoutManager;
+
+    /// Pointer to @c PresentationLifespanToTimeoutMapper
+    std::shared_ptr<PresentationLifespanToTimeoutMapper> m_lifespanToTimeoutMapper;
+
+    /// Id for PO Client
+    std::string m_clientId;
+
+    /**
+     * Worker thread for the @c PresentationOrchestratorClient
+     * @note This declaration needs to come *after* the Executor Thread Variables above so that the thread shuts down
+     *     before the Executor Thread Variables are destroyed.
+     */
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> m_executor;
+};
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_PRESENTATIONORCHESTRATORCLIENT_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/ReorderableUniqueStack.h b/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/ReorderableUniqueStack.h
new file mode 100644
index 0000000000..b26ed27f48
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/ReorderableUniqueStack.h
@@ -0,0 +1,214 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_REORDERABLEUNIQUESTACK_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_REORDERABLEUNIQUESTACK_H_
+
+#include <list>
+#include <unordered_map>
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+#include <AVSCommon/Utils/Optional.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+
+/// String to identify log entries originating from this file.
+#define REORDERABLE_UNIQUE_STACK_TAG "ReorderableUniqueStack"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(REORDERABLE_UNIQUE_STACK_TAG, event)
+
+/**
+ * Implementation of a stack which contains distinct elements and allows elements to be erased from any position
+ * within the stack.
+ * User of this stack implementation should ensure thread-safety
+ * @tparam T The type of object managed by this stack
+ */
+template <class T>
+class ReorderableUniqueStack {
+public:
+    /**
+     * Default Constructor
+     */
+    ReorderableUniqueStack() = default;
+
+    /**
+     * Pushes an element on to the top of the stack
+     * @param element The element to push
+     */
+    void push(const T& element);
+
+    /**
+     * Retrieve the element at the top of the stack
+     * @return element at the top of the stack
+     */
+    alexaClientSDK::avsCommon::utils::Optional<T> top();
+
+    /**
+     * Pop the element at the top of the stack
+     */
+    void pop();
+
+    /**
+     * Check if the stack contains any elements
+     * @return true if the stack contains no elements
+     */
+    bool empty();
+
+    /**
+     * Erases the given element from the stack
+     * @param element The element to erase
+     */
+    void erase(const T& element);
+
+    /**
+     * Clears the entire stack
+     */
+    void clear();
+
+    /**
+     * Moves a given entry to the top of the stack
+     */
+    void moveToTop(const T& element);
+
+    /**
+     * Returns the number of elements in the stack
+     * @return size of stack
+     */
+    size_t size();
+
+    /**
+     * Returns whether the element is present in the stack
+     * @return boolean for presence of element
+     */
+    bool contains(const T& element);
+
+    /**
+     * Returns element above specified element in stack
+     * @return element above
+     */
+    alexaClientSDK::avsCommon::utils::Optional<T> above(const T& element);
+
+private:
+    using StackType = std::list<T>;
+    StackType m_stack;
+    std::unordered_map<T, typename StackType::iterator> m_entries;
+};
+
+template <class T>
+void ReorderableUniqueStack<T>::push(const T& element) {
+    if (m_entries.count(element)) {
+        // Element already exists, push it to the top
+        moveToTop(element);
+        return;
+    }
+    m_stack.push_back(element);
+    m_entries[element] = std::prev(m_stack.end());
+}
+
+template <class T>
+alexaClientSDK::avsCommon::utils::Optional<T> ReorderableUniqueStack<T>::top() {
+    if (m_stack.empty()) {
+        ACSDK_DEBUG9(LX("topFailed").d("reason", "Attempt to access empty stack"));
+        return alexaClientSDK::avsCommon::utils::Optional<T>();
+    }
+    return m_stack.back();
+}
+
+template <class T>
+void ReorderableUniqueStack<T>::pop() {
+    if (m_stack.empty()) {
+        ACSDK_ERROR(LX("popFailed").d("reason", "Attempt to access empty stack"));
+        return;
+    }
+    m_entries.erase(m_stack.back());
+    m_stack.pop_back();
+}
+
+template <class T>
+bool ReorderableUniqueStack<T>::empty() {
+    return m_stack.empty();
+}
+
+template <class T>
+void ReorderableUniqueStack<T>::erase(const T& element) {
+    auto findIt = m_entries.find(element);
+    if (findIt == m_entries.end()) {
+        ACSDK_WARN(LX("eraseFailed").d("reason", "Element does not exist in stack"));
+        return;
+    }
+    m_stack.erase(findIt->second);
+    m_entries.erase(findIt);
+}
+
+template <class T>
+void ReorderableUniqueStack<T>::clear() {
+    m_entries.clear();
+    m_stack.clear();
+}
+
+template <class T>
+void ReorderableUniqueStack<T>::moveToTop(const T& element) {
+    auto findIt = m_entries.find(element);
+    if (findIt == m_entries.end()) {
+        ACSDK_WARN(LX("moveToTopFailed").d("reason", "Element does not exist in stack"));
+        return;
+    }
+
+    // Remove this element from its current position and place it on top of the stack (iterators remain valid)
+    m_stack.splice(m_stack.end(), m_stack, findIt->second);
+}
+
+template <class T>
+size_t ReorderableUniqueStack<T>::size() {
+    return m_stack.size();
+};
+
+template <class T>
+bool ReorderableUniqueStack<T>::contains(const T& element) {
+    auto findIt = m_entries.find(element);
+    return findIt != m_entries.end();
+};
+
+template <class T>
+alexaClientSDK::avsCommon::utils::Optional<T> ReorderableUniqueStack<T>::above(const T& element) {
+    auto findIt = m_entries.find(element);
+    if (m_stack.empty()) {
+        ACSDK_WARN(LX("aboveFailed").d("reason", "Attempt to access empty stack"));
+        return alexaClientSDK::avsCommon::utils::Optional<T>();
+    }
+
+    if (element == m_stack.back()) {
+        ACSDK_WARN(LX("aboveFailed").d("reason", "Specified element is top of stack"));
+        return alexaClientSDK::avsCommon::utils::Optional<T>();
+    }
+
+    if (findIt == m_entries.end()) {
+        ACSDK_WARN(LX("aboveFailed").d("reason", "Element does not exist in stack"));
+        return alexaClientSDK::avsCommon::utils::Optional<T>();
+    }
+
+    return *std::next(findIt->second);
+};
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_REORDERABLEUNIQUESTACK_H_
+
+#undef LX
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/WindowManager.h b/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/WindowManager.h
new file mode 100644
index 0000000000..101d5cc02b
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/privateInclude/acsdk/PresentationOrchestratorClient/private/WindowManager.h
@@ -0,0 +1,279 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_WINDOWMANAGER_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_WINDOWMANAGER_H_
+
+#include <memory>
+#include <string>
+
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationObserverInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorTypes.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationTypes.h>
+#include <acsdk/PresentationOrchestratorInterfaces/VisualTimeoutManagerInterface.h>
+
+#include "acsdk/PresentationOrchestratorClient/private/MultiWindowManagerInterface.h"
+#include "acsdk/PresentationOrchestratorClient/private/Presentation.h"
+#include "acsdk/PresentationOrchestratorClient/private/PresentationLifespanToTimeoutMapper.h"
+#include "acsdk/PresentationOrchestratorClient/private/ReorderableUniqueStack.h"
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+
+/**
+ * The @c WindowManager is responsible for managing a single window instance and all associated presentations
+ */
+class WindowManager
+        : public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public std::enable_shared_from_this<WindowManager> {
+public:
+    /**
+     * Create an instance of @c WindowManager
+     * @param clientId PO client ID responsible for the window manager
+     * @param windowInstance Window instance information managed by window manager
+     * @param stateTracker Pointer to @c PresentationOrchestratorStateTrackerInterface
+     * @param visualTimeoutManager Pointer to @c VisualTimeoutManagerInterface
+     * @param multiWindowManager Pointer to @c MultiWindowManagerInterface
+     * @param lifespanToTimeoutMapper Pointer to @c PresentationLifespanToTimeoutMapper
+     * @return @c WindowManager instance
+     */
+    static std::shared_ptr<WindowManager> create(
+        const std::string& clientId,
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& windowInstance,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface> stateTracker,
+        std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> visualTimeoutManager,
+        std::shared_ptr<MultiWindowManagerInterface> multiWindowManager,
+        std::shared_ptr<PresentationLifespanToTimeoutMapper> lifespanToTimeoutMapper);
+
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /**
+     * Acquire foreground state for presentation in this window
+     * @param requestToken token associated with the window request
+     * @param options presentation options
+     * @param observer @c PresentationObserverInterface pointer for notifying of presentation availability
+     */
+    void acquire(
+        const presentationOrchestratorInterfaces::PresentationRequestToken& requestToken,
+        presentationOrchestratorInterfaces::PresentationOptions options,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationObserverInterface> observer);
+
+    /**
+     * Clear/dismiss all presentations tracked by the window manager, ignoring visual focus behavior
+     */
+    void clearPresentations();
+
+    /**
+     * Method to navigate back in the presentation stack being managed for this window
+     * @return true if the window manager handled back navigation, false otherwise
+     */
+    bool navigateBack();
+
+    /**
+     * Foreground specified presentation from the stack.
+     * The presentation should already be present in the stack to be foregrounded.
+     * @param presentation presentation to be foregrounded
+     */
+    void foregroundPresentation(std::shared_ptr<Presentation> presentation);
+
+    /**
+     * Set a window and its presentation to foreground focused.
+     * PO State Tracker should already be tracking the window as focused before this method is called.
+     */
+    void foregroundWindow();
+
+    /**
+     * Check if a window and its presentation is in foreground and focused
+     * @return boolean indicating if window is foreground focused
+     */
+    bool isForegroundFocused();
+
+    /**
+     *  Unfocus a window and its presentation while retaining in foreground
+     */
+    void unfocus();
+
+    /**
+     * Dismiss specified presentation from the stack
+     * @param presentation presentation to be dismissed
+     * @param isSelfDismiss true if presentation dismiss method was called, false for timeout and back navigation
+     */
+    void dismissPresentation(std::shared_ptr<Presentation> presentation, bool isSelfDismiss = false);
+
+    /**
+     * Method to handle update in presentation metadata
+     * @param presentation presentation whose metadata was updated
+     */
+    void onPresentationMetadataUpdate(std::shared_ptr<Presentation> presentation);
+
+    /**
+     * Method to handle update in presentation lifespan
+     * @param presentation presentation whose lifespan was updated
+     */
+    void onPresentationLifespanUpdate(std::shared_ptr<Presentation> presentation);
+
+    /**
+     * Method to handle update in window instance configuration
+     * @param windowInstance updated window instance
+     */
+    void setWindowInstance(
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& windowInstance);
+
+    /**
+     * Getter for associated window instance
+     * @return the window instance information
+     */
+    presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance getWindowInstance();
+
+    /**
+     * Return the timeout duration corresponding to a presentation lifespan
+     * @param lifespan presentation lifespan
+     * @return timeout duration
+     */
+    std::chrono::milliseconds getTimeoutDuration(
+        const presentationOrchestratorInterfaces::PresentationLifespan& lifespan);
+
+private:
+    /**
+     * Constructor
+     * @param clientId PO client ID responsible for the window manager
+     * @param windowInstance Window instance information managed by window manager
+     * @param stateTracker Pointer to @c PresentationOrchestratorStateTrackerInterface
+     * @param visualTimeoutManager Pointer to @c VisualTimeoutManagerInterface
+     * @param multiWindowManager Pointer to @c MultiWindowManagerInterface
+     * @param lifespanToTimeoutMapper Pointer to @c PresentationLifespanToTimeoutMapper
+     */
+    WindowManager(
+        const std::string& clientId,
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& windowInstance,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface> stateTracker,
+        std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> visualTimeoutManager,
+        std::shared_ptr<MultiWindowManagerInterface> multiWindowManager,
+        std::shared_ptr<PresentationLifespanToTimeoutMapper> lifespanToTimeoutMapper);
+
+    /**
+     * Internal method to process request for window and presentation foreground state
+     * @param requestToken token associated with the window request
+     * @param options presentation options
+     * @param observer @c PresentationObserverInterface pointer for notifying of presentation availability
+     */
+    void executeAcquire(
+        const presentationOrchestratorInterfaces::PresentationRequestToken& requestToken,
+        presentationOrchestratorInterfaces::PresentationOptions options,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationObserverInterface> observer);
+
+    /**
+     * Internal method to dismiss specified presentation
+     * @param presentation presentation to be dismissed
+     * @param isSelfDismiss true if presentation dismiss method was called, false for timeout and back navigation
+     */
+    void executeDismissPresentation(std::shared_ptr<Presentation> presentation, bool isSelfDismiss);
+
+    /**
+     * Internal method to handle back navigations
+     * @return true if the window manager handled back navigation, false otherwise
+     */
+    bool executeNavigateBack();
+
+    /**
+     * Internal method to foreground presentation
+     * @param presentation presentation to be foregrounded
+     */
+    void executeForegroundPresentation(std::shared_ptr<Presentation> presentation);
+
+    /**
+     * Internal method to process update in lifespan of a presentation tracked for associated window
+     * @param presentation presentation whose lifespan was updated
+     */
+    void executeOnPresentationLifespanUpdate(std::shared_ptr<Presentation> presentation);
+
+    /**
+     * Internal method to process update in metadata of a presentation tracked for associated window
+     * @param presentation presentation whose metadata was updated
+     */
+    void executeOnPresentationMetadataUpdate(std::shared_ptr<Presentation> presentation);
+
+    /**
+     * Internal method to set the window and its presentation to foreground focused state.
+     * PO State Tracker should already be tracking the window as focused before this method is called.
+     */
+    void executeForegroundWindow();
+
+    /**
+     * Internal method to determine whether the window and its presentation is in foreground and focused
+     * @return boolean indicating if window is foreground focused
+     */
+    bool executeIsForegroundFocused();
+
+    /**
+     * Internal method to clear all presentations tracked by associated window
+     */
+    void executeClearPresentations();
+
+    /**
+     * Internal method to unfocus the window while retaining it in foreground
+     */
+    void executeUnfocus();
+
+    /**
+     * Internal method to handle state change for presentation on top of stack.
+     * Called in executor before foregrounding a new presentation.
+     * @param nextPresentationLifespan lifespan of next presentation to be moved to top of stack
+     */
+    void executeTopPresentationStateChange(
+        const presentationOrchestratorInterfaces::PresentationLifespan& nextPresentationLifespan);
+
+    /// Presentation stack
+    ReorderableUniqueStack<std::shared_ptr<Presentation>> m_presentationStack;
+
+    /// Pointer to @c PresentationOrchestratorStateTrackerInterface
+    std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface> m_stateTracker;
+
+    /// PO client ID responsible for the window manager
+    std::string m_clientId;
+
+    /// Window instance for the manager
+    presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance m_windowInstance;
+
+    /// Pointer to @c VisualTimeoutManagerInterface
+    std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface> m_visualTimeoutManager;
+
+    /// Pointer to @c MultiWindowManagerInterface
+    std::shared_ptr<MultiWindowManagerInterface> m_multiWindowManager;
+
+    /**
+     * Pointer to @c PresentationLifespanToTimeoutMapper
+     * @note This is not expected to undergo thread unsafe operations and hence used directly in main class thread
+     */
+    std::shared_ptr<PresentationLifespanToTimeoutMapper> m_lifespanToTimeoutMapper;
+
+    /**
+     * Worker thread for the @c WindowManager
+     * @note This declaration needs to come *after* the Executor Thread Variables above so that the thread shuts down
+     *     before the Executor Thread Variables are destroyed.
+     */
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> m_executor;
+};
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORCLIENT_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORCLIENT_PRIVATE_WINDOWMANAGER_H_
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/CMakeLists.txt b/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/CMakeLists.txt
new file mode 100644
index 0000000000..2a51e480e9
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_definitions("-DACSDK_LOG_MODULE=presentationOrchestratorClient")
+
+add_library(acsdkPresentationOrchestratorClient SHARED
+        "Presentation.cpp"
+        "PresentationLifespanToTimeoutMapper.cpp"
+        "PresentationOrchestratorClient.cpp"
+        "PresentationOrchestratorClientFactory.cpp"
+        "WindowManager.cpp")
+
+target_include_directories(acsdkPresentationOrchestratorClient
+        PUBLIC "${acsdkPresentationOrchestratorClient_SOURCE_DIR}/include"
+        "${ASDK_INCLUDE_DIRS}")
+
+target_include_directories(acsdkPresentationOrchestratorClient
+        PRIVATE "${acsdkPresentationOrchestratorClient_SOURCE_DIR}/privateInclude")
+
+target_link_libraries(acsdkPresentationOrchestratorClient "${ASDK_LDFLAGS}" AVSCommon acsdkPresentationOrchestratorInterfaces acsdkVisualCharacteristicsInterfaces)
+
+# install target
+asdk_install()
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/Presentation.cpp b/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/Presentation.cpp
new file mode 100644
index 0000000000..e9a99f9836
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/Presentation.cpp
@@ -0,0 +1,274 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/PresentationOrchestratorClient/private/Presentation.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+#include "acsdk/PresentationOrchestratorClient/private/WindowManager.h"
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+
+using namespace presentationOrchestratorInterfaces;
+using namespace alexaClientSDK::avsCommon::utils;
+
+/// String to identify log entries originating from this file.
+#define TAG "Presentation"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+std::shared_ptr<Presentation> Presentation::create(
+    std::shared_ptr<PresentationObserverInterface> observer,
+    PresentationOptions options,
+    PresentationRequestToken requestToken,
+    PresentationState state,
+    std::shared_ptr<VisualTimeoutManagerInterface> visualTimeoutManager,
+    std::shared_ptr<WindowManager> windowManager) {
+    if (!observer) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullPresentationObserver"));
+        return nullptr;
+    }
+
+    if (!visualTimeoutManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullVisualTimeoutManager"));
+        return nullptr;
+    }
+
+    if (!windowManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullWindowManager"));
+        return nullptr;
+    }
+
+    auto customTimeout = options.timeout;
+    if (!validateTimeout(options.timeout) || options.timeout == PresentationInterface::getTimeoutDefault()) {
+        ACSDK_DEBUG5(LX(__func__)
+                         .d("reason", "Defaulting to timeout associated with lifespan")
+                         .d("presentationRequestToken", requestToken)
+                         .d("timeout", options.timeout.count()));
+        options.timeout = windowManager->getTimeoutDuration(options.presentationLifespan);
+        customTimeout = PresentationInterface::getTimeoutDefault();
+    } else if (options.presentationLifespan == PresentationLifespan::PERMANENT) {
+        auto defaultTimeout = windowManager->getTimeoutDuration(PresentationLifespan::PERMANENT);
+        if (defaultTimeout != options.timeout) {
+            ACSDK_WARN(
+                LX(__func__)
+                    .d("reason", "Presentations with PERMANENT lifespan cannot have custom timeout. Defaulting timeout")
+                    .d("presentationRequestToken", requestToken));
+            options.timeout = defaultTimeout;
+        }
+    }
+
+    return std::shared_ptr<Presentation>(new Presentation(
+        std::move(observer),
+        std::move(options),
+        std::move(requestToken),
+        std::move(state),
+        std::move(visualTimeoutManager),
+        std::move(windowManager),
+        std::move(customTimeout)));
+}
+
+Presentation::Presentation(
+    std::shared_ptr<PresentationObserverInterface> observer,
+    PresentationOptions options,
+    PresentationRequestToken requestToken,
+    PresentationState state,
+    std::shared_ptr<VisualTimeoutManagerInterface> visualTimeoutManager,
+    std::shared_ptr<WindowManager> windowManager,
+    std::chrono::milliseconds customTimeout) :
+        m_observer(std::move(observer)),
+        m_options(std::move(options)),
+        m_state(std::move(state)),
+        m_requestToken(std::move(requestToken)),
+        m_visualTimeoutManager(std::move(visualTimeoutManager)),
+        m_windowManager(std::move(windowManager)),
+        m_customTimeout(customTimeout) {
+}
+
+void Presentation::dismiss() {
+    ACSDK_DEBUG5(LX(__func__));
+    m_windowManager->dismissPresentation(shared_from_this(), true);
+}
+
+void Presentation::foreground() {
+    ACSDK_DEBUG5(LX(__func__));
+    m_windowManager->foregroundPresentation(shared_from_this());
+}
+
+void Presentation::setMetadata(const std::string& metadata) {
+    ACSDK_DEBUG5(LX(__func__));
+    const std::lock_guard<std::mutex> lock(m_optionsMutex);
+    m_options.metadata = metadata;
+    m_windowManager->onPresentationMetadataUpdate(shared_from_this());
+}
+
+void Presentation::setLifespan(const presentationOrchestratorInterfaces::PresentationLifespan& newLifespan) {
+    ACSDK_DEBUG5(LX(__func__));
+    const std::lock_guard<std::mutex> lock(m_optionsMutex);
+    m_options.presentationLifespan = newLifespan;
+
+    setTimeoutLocked(m_customTimeout);
+
+    m_windowManager->onPresentationLifespanUpdate(shared_from_this());
+}
+
+void Presentation::startTimeout() {
+    ACSDK_DEBUG5(LX(__func__));
+    const std::lock_guard<std::mutex> lock(m_optionsMutex);
+    startTimeoutLocked();
+}
+
+void Presentation::startTimeoutLocked() {
+    ACSDK_DEBUG5(LX(__func__));
+    if (m_options.timeout == PresentationInterface::getTimeoutDisabled()) {
+        ACSDK_DEBUG3(LX("startTimeoutLockedFailed")
+                         .d("reason", "Timeout is disabled")
+                         .d("presentationRequestToken", m_requestToken));
+        return;
+    }
+
+    if (m_state != PresentationState::FOREGROUND) {
+        ACSDK_DEBUG3(LX("startTimeoutLockedFailed")
+                         .d("reason", "Presentation not in FOREGROUND state")
+                         .d("presentationRequestToken", m_requestToken)
+                         .d("presentationState", m_state));
+        return;
+    }
+
+    m_lastTimeoutId = m_visualTimeoutManager->requestTimeout(
+        m_options.timeout, [this]() { m_windowManager->dismissPresentation(shared_from_this()); });
+}
+
+void Presentation::stopTimeout() {
+    ACSDK_DEBUG5(LX(__func__));
+
+    m_visualTimeoutManager->stopTimeout(m_lastTimeoutId);
+}
+
+void Presentation::setTimeout(const std::chrono::milliseconds& timeout) {
+    ACSDK_DEBUG5(LX(__func__));
+    const std::lock_guard<std::mutex> lock(m_optionsMutex);
+    setTimeoutLocked(timeout);
+}
+
+void Presentation::setTimeoutLocked(const std::chrono::milliseconds& timeout) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (!validateTimeout(timeout)) {
+        return;
+    }
+
+    if (timeout == PresentationInterface::getTimeoutDefault()) {
+        ACSDK_DEBUG5(LX(__func__)
+                         .d("reason", "Defaulting to timeout associated with lifespan")
+                         .d("presentationRequestToken", m_requestToken));
+        m_options.timeout = m_windowManager->getTimeoutDuration(m_options.presentationLifespan);
+        if (m_options.timeout == PresentationInterface::getTimeoutDisabled()) {
+            ACSDK_DEBUG5(LX(__func__).d("reason", "Timeout disabled").d("presentationRequestToken", m_requestToken));
+            stopTimeout();
+        }
+        return;
+    }
+
+    if (m_options.presentationLifespan == PresentationLifespan::PERMANENT) {
+        ACSDK_WARN(LX(__func__)
+                       .d("reason", "Presentations with PERMANENT lifespan cannot have custom timeout")
+                       .d("presentationRequestToken", m_requestToken));
+        return;
+    }
+
+    m_options.timeout = timeout;
+    if (timeout == PresentationInterface::getTimeoutDisabled()) {
+        ACSDK_DEBUG5(LX(__func__).d("reason", "Timeout disabled").d("presentationRequestToken", m_requestToken));
+        stopTimeout();
+    }
+}
+
+bool Presentation::validateTimeout(const std::chrono::milliseconds& timeout) {
+    if (timeout.count() <= 0 && timeout != PresentationInterface::getTimeoutDisabled() &&
+        timeout != PresentationInterface::getTimeoutDefault()) {
+        ACSDK_WARN(LX(__func__).d("reason", "Invalid timeout value").d("timeout", timeout.count()));
+        return false;
+    }
+
+    return true;
+}
+
+PresentationState Presentation::getState() {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_state;
+}
+
+PresentationRequestToken Presentation::getRequestToken() const {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_requestToken;
+}
+
+PresentationLifespan Presentation::getLifespan() const {
+    ACSDK_DEBUG5(LX(__func__));
+    const std::lock_guard<std::mutex> lock(m_optionsMutex);
+
+    return m_options.presentationLifespan;
+}
+
+std::string Presentation::getMetadata() const {
+    ACSDK_DEBUG5(LX(__func__));
+    const std::lock_guard<std::mutex> lock(m_optionsMutex);
+
+    return m_options.metadata;
+}
+
+std::string Presentation::getInterface() const {
+    ACSDK_DEBUG5(LX(__func__));
+    const std::lock_guard<std::mutex> lock(m_optionsMutex);
+
+    return m_options.interfaceName;
+}
+
+void Presentation::setState(PresentationState newState) {
+    ACSDK_DEBUG5(LX(__func__).d("requestToken", m_requestToken).d("currentState", m_state).d("newState", newState));
+    const std::lock_guard<std::mutex> lock(m_optionsMutex);
+
+    if (newState != m_state) {
+        PresentationState oldState = m_state;
+        m_state = newState;
+
+        // restart timeout if presentation state changes to foreground
+        if (newState == PresentationState::FOREGROUND &&
+            m_options.timeout != PresentationInterface::getTimeoutDisabled()) {
+            startTimeoutLocked();
+        }
+
+        // stop timeout if presentation state changes to any state other than FOREGROUND
+        // only a foregrounded presentation should have an active timeout
+        if (oldState == PresentationState::FOREGROUND) {
+            stopTimeout();
+        }
+        m_observer->onPresentationStateChanged(m_requestToken, m_state);
+    }
+}
+
+bool Presentation::navigateBack() {
+    ACSDK_DEBUG5(LX(__func__).d("requestToken", m_requestToken));
+    return m_observer->onNavigateBack(m_requestToken);
+}
+
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/PresentationLifespanToTimeoutMapper.cpp b/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/PresentationLifespanToTimeoutMapper.cpp
new file mode 100644
index 0000000000..4983d0d84d
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/PresentationLifespanToTimeoutMapper.cpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/PresentationOrchestratorClient/private/PresentationLifespanToTimeoutMapper.h"
+
+#include <string>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationInterface.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+
+using namespace presentationOrchestratorInterfaces;
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace alexaClientSDK::avsCommon::utils::configuration;
+
+/// String to identify log entries originating from this file.
+#define TAG "PresentationLifespanToTimeoutMapper"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+/// The key in config file to find the root of presentation options.
+static const std::string PRESENTATION_OPTIONS_ROOT_KEY = "presentationOptions";
+
+/// The key in config file to find the timeout for SHORT presentations.
+static const char SHORT_PRESENTATION_TIMEOUT_KEY[] = "shortPresentationTimeoutMs";
+
+/// The key in config file to find the timeout for TRANSIENT presentations.
+static const char TRANSIENT_PRESENTATION_TIMEOUT_KEY[] = "transientPresentationTimeoutMs";
+
+/// The key in config file to find the timeout for LONG presentations.
+static const char LONG_PRESENTATION_TIMEOUT_KEY[] = "longPresentationTimeoutMs";
+
+/// Default timeout for SHORT presentations.
+static const std::chrono::milliseconds DEFAULT_TIMEOUT_SHORT_PRESENTATION_MS{30000};
+
+/// Default timeout for TRANSIENT presentations.
+static const std::chrono::milliseconds DEFAULT_TIMEOUT_TRANSIENT_PRESENTATION_MS{10000};
+
+/// Default timeout for LONG presentations.
+static const std::chrono::milliseconds DEFAULT_TIMEOUT_LONG_PRESENTATION_MS{
+    PresentationInterface::getTimeoutDisabled()};
+
+/// Default timeout for PERMANENT presentations.
+static const std::chrono::milliseconds DEFAULT_TIMEOUT_PERMANENT_PRESENTATION_MS{
+    PresentationInterface::getTimeoutDisabled()};
+
+std::shared_ptr<PresentationLifespanToTimeoutMapper> PresentationLifespanToTimeoutMapper::create() {
+    auto mapper = std::shared_ptr<PresentationLifespanToTimeoutMapper>(new PresentationLifespanToTimeoutMapper());
+    mapper->initialize();
+
+    return mapper;
+}
+
+void PresentationLifespanToTimeoutMapper::initialize() {
+    auto configurationRoot = ConfigurationNode::getRoot()[PRESENTATION_OPTIONS_ROOT_KEY];
+
+    configurationRoot.getDuration<std::chrono::milliseconds>(
+        SHORT_PRESENTATION_TIMEOUT_KEY, &m_shortPresentationTimeout, DEFAULT_TIMEOUT_SHORT_PRESENTATION_MS);
+
+    configurationRoot.getDuration<std::chrono::milliseconds>(
+        TRANSIENT_PRESENTATION_TIMEOUT_KEY, &m_transientPresentationTimeout, DEFAULT_TIMEOUT_TRANSIENT_PRESENTATION_MS);
+
+    configurationRoot.getDuration<std::chrono::milliseconds>(
+        LONG_PRESENTATION_TIMEOUT_KEY, &m_longPresentationTimeout, DEFAULT_TIMEOUT_LONG_PRESENTATION_MS);
+}
+
+PresentationLifespanToTimeoutMapper::PresentationLifespanToTimeoutMapper() = default;
+
+static bool isTimeoutDisabled(std::chrono::milliseconds timeoutVal) {
+    return timeoutVal.count() == -1;
+}
+
+std::chrono::milliseconds PresentationLifespanToTimeoutMapper::getTimeoutDuration(
+    const PresentationLifespan& lifespan) {
+    ACSDK_DEBUG5(LX(__func__).d("lifespan", lifespan));
+
+    std::chrono::milliseconds configurableTimeout;
+
+    switch (lifespan) {
+        case PresentationLifespan::SHORT:
+            configurableTimeout = m_shortPresentationTimeout;
+            break;
+        case PresentationLifespan::TRANSIENT:
+            configurableTimeout = m_transientPresentationTimeout;
+            break;
+        case PresentationLifespan::LONG:
+            configurableTimeout = m_longPresentationTimeout;
+            break;
+        case PresentationLifespan::PERMANENT:
+            return DEFAULT_TIMEOUT_PERMANENT_PRESENTATION_MS;
+    }
+
+    // Configurable Timeout value of -1 equals disabled
+    if (isTimeoutDisabled(configurableTimeout)) {
+        configurableTimeout = PresentationInterface::getTimeoutDisabled();
+    }
+
+    return configurableTimeout;
+}
+
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/PresentationOrchestratorClient.cpp b/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/PresentationOrchestratorClient.cpp
new file mode 100644
index 0000000000..1aabfae3d5
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/PresentationOrchestratorClient.cpp
@@ -0,0 +1,286 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/PresentationOrchestratorClient/private/PresentationOrchestratorClient.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+
+using namespace presentationOrchestratorInterfaces;
+using namespace alexaClientSDK::avsCommon::utils;
+
+/// String to identify log entries originating from this file.
+#define TAG "PresentationOrchestratorClient"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+std::shared_ptr<PresentationOrchestratorClient> PresentationOrchestratorClient::create(
+    const std::string& clientId,
+    std::shared_ptr<PresentationOrchestratorStateTrackerInterface> stateTracker,
+    std::shared_ptr<VisualTimeoutManagerInterface> visualTimeoutManager) {
+    if (!stateTracker) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullStateTracker"));
+        return nullptr;
+    }
+
+    if (!visualTimeoutManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullVisualTimeoutManager"));
+        return nullptr;
+    }
+
+    auto client = std::shared_ptr<PresentationOrchestratorClient>(
+        new PresentationOrchestratorClient(clientId, stateTracker, visualTimeoutManager));
+
+    stateTracker->addWindowObserver(client);
+
+    return client;
+}
+
+PresentationOrchestratorClient::PresentationOrchestratorClient(
+    const std::string& clientId,
+    std::shared_ptr<PresentationOrchestratorStateTrackerInterface> stateTracker,
+    std::shared_ptr<VisualTimeoutManagerInterface> visualTimeoutManager) :
+        RequiresShutdown{TAG},
+        m_requestTokenCounter{0},
+        m_stateTracker{std::move(stateTracker)},
+        m_visualTimeoutManager{std::move(visualTimeoutManager)},
+        m_lifespanToTimeoutMapper{PresentationLifespanToTimeoutMapper::create()},
+        m_clientId{clientId} {
+    m_executor = std::make_shared<threading::Executor>();
+}
+
+PresentationRequestToken PresentationOrchestratorClient::requestWindow(
+    const std::string& windowId,
+    PresentationOptions options,
+    std::shared_ptr<PresentationObserverInterface> observer) {
+    ACSDK_DEBUG5(LX(__func__));
+
+    const PresentationRequestToken requestToken = m_requestTokenCounter++;
+
+    m_executor->submit([this, requestToken, windowId, options, observer]() {
+        executeRequestWindow(requestToken, windowId, options, observer);
+    });
+
+    return requestToken;
+}
+
+void PresentationOrchestratorClient::clearPresentations() {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this]() {
+        ACSDK_DEBUG5(LX("executeClearPresentations"));
+        for (auto const& windowManagerIt : m_windowIdToManager) {
+            windowManagerIt.second->clearPresentations();
+        }
+    });
+}
+
+bool PresentationOrchestratorClient::navigateBack() {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_executor
+        ->submit([this]() {
+            ACSDK_DEBUG5(LX("executeNavigateBack"));
+            if (auto windowManager = executeGetFocusedWindowManager()) {
+                return windowManager->navigateBack();
+            }
+
+            return false;
+        })
+        .get();
+}
+
+void PresentationOrchestratorClient::onWindowAdded(const PresentationOrchestratorWindowInstance& windowInstance) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, windowInstance]() {
+        ACSDK_DEBUG5(LX("executeOnWindowAdded").d("windowId", windowInstance.id));
+        auto windowManager = WindowManager::create(
+            m_clientId,
+            windowInstance,
+            m_stateTracker,
+            m_visualTimeoutManager,
+            shared_from_this(),
+            m_lifespanToTimeoutMapper);
+        m_windowIdToManager.insert({windowInstance.id, windowManager});
+    });
+}
+
+void PresentationOrchestratorClient::onWindowModified(const PresentationOrchestratorWindowInstance& windowInstance) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, windowInstance]() { executeOnWindowModified(windowInstance); });
+}
+
+void PresentationOrchestratorClient::onWindowRemoved(const std::string& windowId) {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", windowId));
+
+    m_executor->submit([this, windowId]() { executeOnWindowRemoved(windowId); });
+}
+
+void PresentationOrchestratorClient::prepareToForegroundWindow(
+    const PresentationOrchestratorWindowInstance& windowInstance,
+    ForegroundWindowCallback foregroundWindowCallback) {
+    m_executor->submit([this, windowInstance, foregroundWindowCallback]() {
+        executePrepareToForegroundWindow(windowInstance, foregroundWindowCallback);
+    });
+}
+
+void PresentationOrchestratorClient::doShutdown() {
+    m_executor->shutdown();
+    auto windowManagerIt = m_windowIdToManager.begin();
+    while (windowManagerIt != m_windowIdToManager.end()) {
+        windowManagerIt->second->shutdown();
+        windowManagerIt++;
+    }
+    m_windowIdToManager.clear();
+}
+
+void PresentationOrchestratorClient::setExecutor(const std::shared_ptr<threading::Executor>& executor) {
+    ACSDK_WARN(LX(__func__).d("reason", "should only be called in tests"));
+    m_executor = executor;
+}
+
+void PresentationOrchestratorClient::executeRequestWindow(
+    const PresentationRequestToken& requestToken,
+    const std::string& windowId,
+    PresentationOptions options,
+    std::shared_ptr<PresentationObserverInterface> observer) {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", windowId));
+
+    auto windowManagerIt = m_windowIdToManager.find(windowId);
+    if (windowManagerIt == m_windowIdToManager.end()) {
+        ACSDK_ERROR(LX("executeRequestWindowFailed")
+                        .d("reason", "Window Manager does not exist for specified window Id")
+                        .d("windowId", windowId));
+        return;
+    }
+
+    auto windowInstance = windowManagerIt->second->getWindowInstance();
+    auto supportedInterfaces = windowInstance.supportedInterfaces;
+    auto findIt = std::find(supportedInterfaces.begin(), supportedInterfaces.end(), options.interfaceName);
+    if (findIt == supportedInterfaces.end()) {
+        ACSDK_ERROR(LX("executeRequestWindowFailed")
+                        .d("reason", "Interface not supported in specified window")
+                        .d("windowId", windowId)
+                        .d("interface", options.interfaceName));
+        return;
+    }
+
+    windowManagerIt->second->acquire(requestToken, options, observer);
+}
+
+void PresentationOrchestratorClient::executePrepareToForegroundWindow(
+    const PresentationOrchestratorWindowInstance& windowInstanceToForeground,
+    ForegroundWindowCallback foregroundWindowCallback) {
+    ACSDK_DEBUG5(LX(__func__));
+
+    for (auto windowManagerIt = m_windowIdToManager.begin(); windowManagerIt != m_windowIdToManager.end();
+         windowManagerIt++) {
+        if (windowManagerIt->first == windowInstanceToForeground.id) {
+            // ensure that no blocking calls are made on the window being foregrounded leading to a cycle
+            continue;
+        }
+
+        auto windowManager = windowManagerIt->second;
+        auto windowInstance = windowManager->getWindowInstance();
+        // presentations in windows with higher zOrderIndex must be cleared before foregrounding a window
+        if (windowInstance.zOrderIndex > windowInstanceToForeground.zOrderIndex) {
+            windowManager->clearPresentations();
+            continue;
+        }
+
+        // unfocus any previously foreground focused window
+        if (windowManager->isForegroundFocused()) {
+            windowManager->unfocus();
+            continue;
+        }
+    }
+
+    foregroundWindowCallback();
+}
+
+void PresentationOrchestratorClient::executeOnWindowModified(
+    const PresentationOrchestratorWindowInstance& windowInstance) {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", windowInstance.id));
+
+    auto windowManagerIt = m_windowIdToManager.find(windowInstance.id);
+    if (windowManagerIt == m_windowIdToManager.end()) {
+        ACSDK_ERROR(LX("executeOnWindowModifiedFailed")
+                        .d("reason", "Window Manager does not exist")
+                        .d("windowId", windowInstance.id));
+        return;
+    }
+
+    windowManagerIt->second->setWindowInstance(windowInstance);
+
+    if (auto windowManager = executeGetFocusedWindowManager()) {
+        if (windowManager->isForegroundFocused()) {
+            ACSDK_DEBUG7(LX("executeOnWindowModified").d("reason", "Window already in foreground"));
+            return;
+        }
+
+        windowManager->foregroundWindow();
+    }
+}
+
+void PresentationOrchestratorClient::executeOnWindowRemoved(const std::string& windowId) {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", windowId));
+
+    auto windowManagerIt = m_windowIdToManager.find(windowId);
+    if (windowManagerIt == m_windowIdToManager.end()) {
+        ACSDK_ERROR(
+            LX("executeOnWindowRemovedFailed").d("reason", "Window Manager does not exist").d("windowId", windowId));
+        return;
+    }
+
+    windowManagerIt->second->shutdown();
+    m_windowIdToManager.erase(windowId);
+
+    if (auto windowManager = executeGetFocusedWindowManager()) {
+        windowManager->foregroundWindow();
+    }
+}
+
+void PresentationOrchestratorClient::updateForegroundWindow() {
+    m_executor->submit([this]() {
+        ACSDK_DEBUG5(LX("updateForegroundWindow"));
+        if (auto windowManager = executeGetFocusedWindowManager()) {
+            windowManager->foregroundWindow();
+        }
+    });
+}
+
+std::shared_ptr<WindowManager> PresentationOrchestratorClient::executeGetFocusedWindowManager() {
+    auto focusedWindowId = m_stateTracker->getFocusedWindowId();
+    if (focusedWindowId.empty()) {
+        ACSDK_DEBUG5(LX(__func__).m("No window in focus"));
+        return nullptr;
+    }
+
+    auto focusedWindowManagerIt = m_windowIdToManager.find(focusedWindowId);
+    if (focusedWindowManagerIt == m_windowIdToManager.end()) {
+        ACSDK_DEBUG5(LX(__func__).d("reason", "Window Manager does not exist").d("windowId", focusedWindowId));
+        return nullptr;
+    }
+
+    return focusedWindowManagerIt->second;
+}
+
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/PresentationOrchestratorClientFactory.cpp b/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/PresentationOrchestratorClientFactory.cpp
new file mode 100644
index 0000000000..271f066810
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/PresentationOrchestratorClientFactory.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/PresentationOrchestratorClient/PresentationOrchestratorClientFactory.h"
+
+#include "acsdk/PresentationOrchestratorClient/private/PresentationOrchestratorClient.h"
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+avsCommon::utils::Optional<PresentationOrchestratorClientFactory::PresentationOrchestratorClientExports>
+PresentationOrchestratorClientFactory::create(
+    const std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>&
+        stateTracker,
+    const std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface>& visualTimeoutManager,
+    const std::string& clientId) {
+    auto poClient = PresentationOrchestratorClient::create(clientId, stateTracker, visualTimeoutManager);
+    if (!poClient) {
+        return avsCommon::utils::Optional<
+            PresentationOrchestratorClientFactory::PresentationOrchestratorClientExports>();
+    }
+
+    PresentationOrchestratorClientFactory::PresentationOrchestratorClientExports exports = {
+        poClient, poClient, poClient};
+
+    return exports;
+}
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/WindowManager.cpp b/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/WindowManager.cpp
new file mode 100644
index 0000000000..d1631e1a92
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/src/WindowManager.cpp
@@ -0,0 +1,494 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/PresentationOrchestratorClient/private/WindowManager.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+
+using namespace presentationOrchestratorInterfaces;
+using namespace alexaClientSDK::avsCommon::utils;
+
+/// String to identify log entries originating from this file.
+#define TAG "WindowManager"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+std::shared_ptr<WindowManager> WindowManager::create(
+    const std::string& clientId,
+    const PresentationOrchestratorWindowInstance& windowInstance,
+    std::shared_ptr<PresentationOrchestratorStateTrackerInterface> stateTracker,
+    std::shared_ptr<VisualTimeoutManagerInterface> visualTimeoutManager,
+    std::shared_ptr<MultiWindowManagerInterface> multiWindowManager,
+    std::shared_ptr<PresentationLifespanToTimeoutMapper> lifespanToTimeoutMapper) {
+    if (!stateTracker) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullStateTracker"));
+        return nullptr;
+    }
+
+    if (!visualTimeoutManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullVisualTimeoutManager"));
+        return nullptr;
+    }
+
+    if (!multiWindowManager) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullMultiWindowManager"));
+        return nullptr;
+    }
+
+    if (!lifespanToTimeoutMapper) {
+        ACSDK_ERROR(LX("createFailed").d("reason", "nullLifespanToTimeoutMapper"));
+        return nullptr;
+    }
+
+    return std::shared_ptr<WindowManager>(new WindowManager(
+        clientId, windowInstance, stateTracker, visualTimeoutManager, multiWindowManager, lifespanToTimeoutMapper));
+}
+
+WindowManager::WindowManager(
+    const std::string& clientId,
+    const PresentationOrchestratorWindowInstance& windowInstance,
+    std::shared_ptr<PresentationOrchestratorStateTrackerInterface> stateTracker,
+    std::shared_ptr<VisualTimeoutManagerInterface> visualTimeoutManager,
+    std::shared_ptr<MultiWindowManagerInterface> multiWindowManager,
+    std::shared_ptr<PresentationLifespanToTimeoutMapper> lifespanToTimeoutMapper) :
+        RequiresShutdown{TAG},
+        m_stateTracker{std::move(stateTracker)},
+        m_clientId{clientId},
+        m_windowInstance{windowInstance},
+        m_visualTimeoutManager{std::move(visualTimeoutManager)},
+        m_multiWindowManager{std::move(multiWindowManager)},
+        m_lifespanToTimeoutMapper{std::move(lifespanToTimeoutMapper)} {
+    m_executor = std::make_shared<threading::Executor>();
+}
+
+PresentationMetadata getPresentationMetadata(const std::string& interfaceName, const std::string& metadata) {
+    PresentationMetadata presentationMetadata;
+    presentationMetadata.interfaceName = interfaceName;
+    presentationMetadata.metadata = metadata;
+    return presentationMetadata;
+}
+
+void WindowManager::acquire(
+    const PresentationRequestToken& requestToken,
+    PresentationOptions options,
+    std::shared_ptr<PresentationObserverInterface> observer) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, requestToken, options, observer]() {
+        if (executeIsForegroundFocused()) {
+            executeAcquire(requestToken, options, observer);
+            return;
+        }
+
+        m_multiWindowManager->prepareToForegroundWindow(m_windowInstance, [this, requestToken, options, observer]() {
+            executeAcquire(requestToken, options, observer);
+        });
+    });
+}
+
+void WindowManager::dismissPresentation(std::shared_ptr<Presentation> presentation, bool isSelfDismiss) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit(
+        [this, presentation, isSelfDismiss]() { executeDismissPresentation(presentation, isSelfDismiss); });
+}
+
+void WindowManager::foregroundPresentation(std::shared_ptr<Presentation> presentation) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, presentation]() {
+        if (executeIsForegroundFocused()) {
+            executeForegroundPresentation(presentation);
+            return;
+        }
+
+        m_multiWindowManager->prepareToForegroundWindow(m_windowInstance, [this, presentation]() {
+            m_executor->submit([this, presentation]() { executeForegroundPresentation(presentation); });
+        });
+    });
+}
+
+void WindowManager::foregroundWindow() {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this]() { executeForegroundWindow(); });
+}
+
+bool WindowManager::navigateBack() {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_executor->submit([this]() { return executeNavigateBack(); }).get();
+}
+
+void WindowManager::onPresentationMetadataUpdate(std::shared_ptr<Presentation> presentation) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, presentation]() { executeOnPresentationMetadataUpdate(presentation); });
+}
+
+void WindowManager::onPresentationLifespanUpdate(std::shared_ptr<Presentation> presentation) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, presentation]() { executeOnPresentationLifespanUpdate(presentation); });
+}
+
+void WindowManager::setWindowInstance(const PresentationOrchestratorWindowInstance& windowInstance) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, windowInstance]() { m_windowInstance = windowInstance; });
+}
+
+PresentationOrchestratorWindowInstance WindowManager::getWindowInstance() {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_executor->submit([this]() { return m_windowInstance; }).get();
+}
+
+std::chrono::milliseconds WindowManager::getTimeoutDuration(const PresentationLifespan& lifespan) {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_lifespanToTimeoutMapper->getTimeoutDuration(lifespan);
+}
+
+void WindowManager::clearPresentations() {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this]() { executeClearPresentations(); }).get();
+}
+
+bool WindowManager::isForegroundFocused() {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_executor->submit([this]() { return executeIsForegroundFocused(); }).get();
+}
+
+void WindowManager::unfocus() {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this]() { executeUnfocus(); }).get();
+}
+
+void WindowManager::doShutdown() {
+    clearPresentations();
+    m_executor->shutdown();
+}
+
+void WindowManager::executeTopPresentationStateChange(const PresentationLifespan& nextPresentationLifespan) {
+    ACSDK_DEBUG5(LX(__func__));
+
+    if (!m_presentationStack.top().hasValue()) {
+        ACSDK_ERROR(LX("executeTopPresentationStateChangeFailed").d("reason", "Presentation stack is empty"));
+        return;
+    }
+
+    auto topPresentation = m_presentationStack.top().value();
+    auto topPresentationLifespan = topPresentation->getLifespan();
+
+    switch (topPresentationLifespan) {
+        case PresentationLifespan::TRANSIENT:
+            m_presentationStack.pop();
+            topPresentation->setState(PresentationState::NONE);
+            break;
+        case PresentationLifespan::SHORT:
+            if (nextPresentationLifespan == PresentationLifespan::TRANSIENT) {
+                // A short lived presentation can be backgrounded if a transient presentation is displayed
+                topPresentation->setState(PresentationState::BACKGROUND);
+            } else {
+                m_presentationStack.pop();
+                topPresentation->setState(PresentationState::NONE);
+            }
+            break;
+        case PresentationLifespan::LONG:
+        case PresentationLifespan::PERMANENT:
+            topPresentation->setState(PresentationState::BACKGROUND);
+            break;
+    }
+}
+
+void WindowManager::executeAcquire(
+    const PresentationRequestToken& requestToken,
+    PresentationOptions options,
+    std::shared_ptr<PresentationObserverInterface> observer) {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", m_windowInstance.id).d("presentationRequestToken", requestToken));
+
+    PresentationMetadata presentationMetadata = getPresentationMetadata(options.interfaceName, options.metadata);
+    if (!executeIsForegroundFocused()) {
+        m_stateTracker->acquireWindow(m_clientId, m_windowInstance.id, presentationMetadata);
+    } else {
+        m_stateTracker->updatePresentationMetadata(m_clientId, m_windowInstance.id, presentationMetadata);
+        executeTopPresentationStateChange(options.presentationLifespan);
+    }
+
+    auto nextPresentation = Presentation::create(
+        observer, options, requestToken, PresentationState::FOREGROUND, m_visualTimeoutManager, shared_from_this());
+    m_presentationStack.push(nextPresentation);
+    nextPresentation->startTimeout();
+    observer->onPresentationAvailable(requestToken, nextPresentation);
+}
+
+void WindowManager::executeDismissPresentation(std::shared_ptr<Presentation> presentation, bool isSelfDismiss) {
+    ACSDK_DEBUG5(
+        LX(__func__).d("windowId", m_windowInstance.id).d("presentationRequestToken", presentation->getRequestToken()));
+
+    if (presentation->getState() == PresentationState::NONE) {
+        ACSDK_WARN(LX("executeDismissPresentationFailed")
+                       .d("reason", "Presentation has already been dismissed")
+                       .d("presentationRequestToken", presentation->getRequestToken())
+                       .d("windowId", m_windowInstance.id));
+        return;
+    }
+
+    if (!m_presentationStack.contains(presentation)) {
+        ACSDK_ERROR(LX("executeDismissPresentationFailed")
+                        .d("reason", "Presentation absent from the stack")
+                        .d("windowId", m_windowInstance.id)
+                        .d("presentationRequestToken", presentation->getRequestToken()));
+        return;
+    }
+
+    if (presentation->getLifespan() == PresentationLifespan::PERMANENT && !isSelfDismiss) {
+        ACSDK_ERROR(LX("executeDismissPresentationFailed")
+                        .d("reason", "Presentation with lifespan PERMANENT cannot be dismissed")
+                        .d("presentationRequestToken", presentation->getRequestToken())
+                        .d("windowId", m_windowInstance.id));
+        return;
+    }
+
+    PresentationState prevState = presentation->getState();
+    // remove presentation from the stack, not necessarily the top
+    m_presentationStack.erase(presentation);
+
+    if (!m_presentationStack.top().hasValue()) {
+        presentation->setState(PresentationState::NONE);
+        // window must release focus if all presentations in stack are dismissed
+        m_stateTracker->releaseWindow(m_clientId, m_windowInstance.id);
+        m_multiWindowManager->updateForegroundWindow();
+        return;
+    }
+
+    presentation->setState(PresentationState::NONE);
+    if (prevState == PresentationState::FOREGROUND || prevState == PresentationState::FOREGROUND_UNFOCUSED) {
+        // top must be foregrounded if the dismissed presentation was in foreground
+        m_presentationStack.top().value()->setState(prevState);
+    }
+}
+
+void WindowManager::executeForegroundPresentation(std::shared_ptr<Presentation> presentation) {
+    ACSDK_DEBUG5(
+        LX(__func__).d("windowId", m_windowInstance.id).d("presentationRequestToken", presentation->getRequestToken()));
+
+    if (presentation->getState() == PresentationState::FOREGROUND) {
+        ACSDK_WARN(LX("executeForegroundPresentationFailed")
+                       .d("reason", "Presentation already in foreground")
+                       .d("windowId", m_windowInstance.id)
+                       .d("presentationRequestToken", presentation->getRequestToken()));
+        return;
+    }
+
+    if (!m_presentationStack.top().hasValue()) {
+        ACSDK_ERROR(LX("executeForegroundPresentationFailed")
+                        .d("reason", "Presentation stack is empty")
+                        .d("windowId", m_windowInstance.id));
+        return;
+    }
+
+    if (!m_presentationStack.contains(presentation)) {
+        ACSDK_ERROR(LX("executeForegroundPresentationFailed")
+                        .d("reason", "Presentation absent from the stack")
+                        .d("windowId", m_windowInstance.id)
+                        .d("presentationRequestToken", presentation->getRequestToken()));
+        return;
+    }
+
+    auto topPresentation = m_presentationStack.top().value();
+    auto topPresentationLifespan = presentation->getLifespan();
+
+    executeTopPresentationStateChange(topPresentationLifespan);
+    // move presentation to be foregrounded on top of stack
+    m_presentationStack.moveToTop(presentation);
+
+    auto interfaceName = presentation->getInterface();
+    auto metadata = presentation->getMetadata();
+    auto presentationMetadata = getPresentationMetadata(interfaceName, metadata);
+    if (executeIsForegroundFocused()) {
+        m_stateTracker->updatePresentationMetadata(m_clientId, m_windowInstance.id, presentationMetadata);
+    } else {
+        m_stateTracker->acquireWindow(m_clientId, m_windowInstance.id, presentationMetadata);
+    }
+    presentation->setState(PresentationState::FOREGROUND);
+}
+
+void WindowManager::executeForegroundWindow() {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", m_windowInstance.id));
+
+    if (!m_presentationStack.top().hasValue()) {
+        ACSDK_WARN(LX("executeForegroundWindowFailed").d("reason", "Window in FOREGROUND without any presentation"));
+        return;
+    }
+
+    auto topPresentation = m_presentationStack.top().value();
+    topPresentation->setState(PresentationState::FOREGROUND);
+}
+
+bool WindowManager::executeNavigateBack() {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", m_windowInstance.id));
+
+    if (!m_presentationStack.top().hasValue()) {
+        ACSDK_ERROR(LX("executeNavigateBackFailed").d("reason", "Presentation stack is empty"));
+        return false;
+    }
+
+    auto topPresentation = m_presentationStack.top().value();
+    auto topPresentationState = topPresentation->getState();
+    auto topPresentationLifespan = topPresentation->getLifespan();
+
+    // check that the top presentation is in the foreground
+    if (topPresentationState != PresentationState::FOREGROUND) {
+        ACSDK_ERROR(LX("executeNavigateBackFailed")
+                        .d("reason", "Presentation on top of stack is not in the Foreground")
+                        .d("presentationRequestToken", topPresentation->getRequestToken())
+                        .d("presentationLifespan", topPresentationLifespan));
+        return false;
+    }
+
+    if (topPresentation->navigateBack()) {
+        // skip the default navigation behavior
+        return false;
+    }
+
+    if (topPresentationLifespan == PresentationLifespan::PERMANENT) {
+        ACSDK_DEBUG3(LX("executeNavigateBackFailed")
+                         .d("reason", "Presentation on top of stack cannot be dismissed")
+                         .d("presentationRequestToken", topPresentation->getRequestToken())
+                         .d("presentationLifespan", topPresentationLifespan));
+        return false;
+    }
+
+    // remove top presentation
+    m_presentationStack.pop();
+    topPresentation->setState(PresentationState::NONE);
+
+    if (!m_presentationStack.top().hasValue()) {
+        // window must release focus if all presentations in stack are dismissed
+        m_stateTracker->releaseWindow(m_clientId, m_windowInstance.id);
+        m_multiWindowManager->updateForegroundWindow();
+    } else {
+        m_presentationStack.top().value()->setState(topPresentationState);
+    }
+    return true;
+}
+
+void WindowManager::executeOnPresentationLifespanUpdate(std::shared_ptr<Presentation> presentation) {
+    ACSDK_DEBUG5(
+        LX(__func__).d("windowId", m_windowInstance.id).d("presentationRequestToken", presentation->getRequestToken()));
+
+    auto presentationState = presentation->getState();
+    auto presentationLifespan = presentation->getLifespan();
+
+    if (presentationState == PresentationState::FOREGROUND ||
+        presentationState == PresentationState::FOREGROUND_UNFOCUSED) {
+        // nothing to do if the presentation is in foreground
+        return;
+    }
+
+    if (presentationState == PresentationState::NONE) {
+        ACSDK_WARN(LX("executeOnPresentationLifespanUpdateFailed")
+                       .d("reason", "A dismissed presentation present in stack")
+                       .d("presentationRequestToken", presentation->getRequestToken()));
+        return;
+    }
+
+    if (presentationLifespan == PresentationLifespan::TRANSIENT) {
+        // A transient presentation cannot be backgrounded
+        presentation->setState(PresentationState::NONE);
+        m_presentationStack.erase(presentation);
+        return;
+    }
+
+    if (presentationLifespan == PresentationLifespan::SHORT) {
+        if (!m_presentationStack.above(presentation).hasValue()) {
+            ACSDK_WARN(LX("executeOnPresentationLifespanUpdateFailed")
+                           .d("reason", "Backgrounded presentation must have a presentation above it in stack")
+                           .d("presentationRequestToken", presentation->getRequestToken()));
+            return;
+        }
+
+        auto presentationAbove = m_presentationStack.above(presentation).value();
+        auto presentationAboveLifespan = presentationAbove->getLifespan();
+
+        // short presentation should only be in background if transient presentation is on top
+        if (presentationAboveLifespan != PresentationLifespan::TRANSIENT) {
+            presentation->setState(PresentationState::NONE);
+            m_presentationStack.erase(presentation);
+            return;
+        }
+    }
+}
+
+void WindowManager::executeOnPresentationMetadataUpdate(std::shared_ptr<Presentation> presentation) {
+    ACSDK_DEBUG5(LX(__func__).d("presentationRequestToken", presentation->getRequestToken()));
+    auto presentationState = presentation->getState();
+    if (presentationState == PresentationState::FOREGROUND ||
+        presentationState == PresentationState::FOREGROUND_UNFOCUSED) {
+        auto interfaceName = presentation->getInterface();
+        auto metadata = presentation->getMetadata();
+        auto presentationMetadata = getPresentationMetadata(interfaceName, metadata);
+        m_stateTracker->updatePresentationMetadata(m_clientId, m_windowInstance.id, presentationMetadata);
+    }
+}
+
+bool WindowManager::executeIsForegroundFocused() {
+    ACSDK_DEBUG5(LX(__func__));
+
+    if (!m_presentationStack.top().hasValue()) {
+        ACSDK_DEBUG5(LX("executeIsForegroundFocusedFailed").d("reason", "Presentation stack is empty"));
+        return false;
+    }
+
+    auto topPresentation = m_presentationStack.top().value();
+    auto topPresentationState = topPresentation->getState();
+    return topPresentationState == PresentationState::FOREGROUND;
+}
+
+void WindowManager::executeClearPresentations() {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", m_windowInstance.id));
+
+    if (!m_presentationStack.top().hasValue()) {
+        ACSDK_DEBUG9(LX("executeClearPresentations")
+                         .d("reason", "Presentation stack is empty")
+                         .d("windowId", m_windowInstance.id));
+        return;
+    }
+
+    // Dismiss all presentations without checking for visual focus behavior
+    while (m_presentationStack.top().hasValue()) {
+        m_presentationStack.top().value()->setState(PresentationState::NONE);
+        m_presentationStack.pop();
+    }
+
+    // Always release the window when clearing presentations
+    m_stateTracker->releaseWindow(m_clientId, m_windowInstance.id);
+}
+
+void WindowManager::executeUnfocus() {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", m_windowInstance.id));
+
+    if (!executeIsForegroundFocused()) {
+        ACSDK_ERROR(
+            LX("executeUnfocusFailed").d("reason", "Window not foreground focused").d("windowId", m_windowInstance.id));
+        return;
+    }
+
+    auto topPresentation = m_presentationStack.top().value();
+    topPresentation->setState(PresentationState::FOREGROUND_UNFOCUSED);
+}
+
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/test/CMakeLists.txt b/shared/PresentationOrchestrator/PresentationOrchestratorClient/test/CMakeLists.txt
new file mode 100644
index 0000000000..34e5a1dec8
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/test/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+        "${acsdkPresentationOrchestratorClient_INCLUDE_DIR}"
+        "${acsdkPresentationOrchestratorClient_SOURCE_DIR}/include"
+        "${acsdkPresentationOrchestratorClient_SOURCE_DIR}/privateInclude"
+        "${ASDK_INCLUDE_DIRS}")
+
+discover_unit_tests("${INCLUDE_PATH}" "acsdkPresentationOrchestratorClient;PresentationOrchestratorTestLib")
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorClient/test/PresentationOrchestratorClientTest.cpp b/shared/PresentationOrchestrator/PresentationOrchestratorClient/test/PresentationOrchestratorClientTest.cpp
new file mode 100644
index 0000000000..789b9b8ccf
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorClient/test/PresentationOrchestratorClientTest.cpp
@@ -0,0 +1,1657 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/PresentationOrchestratorClient/private/PresentationOrchestratorClient.h"
+
+#include <chrono>
+#include <vector>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <acsdk/PresentationOrchestratorInterfaces/MockPresentationObserver.h>
+#include <acsdk/PresentationOrchestratorInterfaces/MockPresentationOrchestratorStateTracker.h>
+#include <acsdk/PresentationOrchestratorInterfaces/MockVisualTimeoutManager.h>
+#include <AVSCommon/Utils/PromiseFuturePair.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorClient {
+namespace test {
+
+using namespace ::testing;
+using namespace avsCommon;
+using namespace sdkInterfaces;
+using namespace presentationOrchestratorInterfaces;
+using namespace presentationOrchestratorInterfaces::test;
+
+static const auto SHORT_DELAY = std::chrono::milliseconds(500);
+static const char CLIENT_ID[] = "clientId";
+static const char WINDOW_ID_1[] = "windowId1";
+static const char WINDOW_ID_2[] = "windowId2";
+static const char INTERFACE_1[] = "interface1";
+static const char INTERFACE_2[] = "interface2";
+static const char METADATA_1[] = "metadata1";
+static const char METADATA_2[] = "metadata2";
+static const auto TIMEOUT = std::chrono::milliseconds(500);
+
+/// Default timeout for SHORT presentations.
+static const std::chrono::milliseconds DEFAULT_TIMEOUT_SHORT_PRESENTATION_MS{30000};
+
+/// Test harness for @c PresentationOrchestratorClient class.
+class PresentationOrchestratorClientTest : public ::testing::Test {
+public:
+    PresentationOrchestratorClientTest() = default;
+
+    /// Set up the test harness for running a test.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+protected:
+    /// Mock of @c PresentationOrchestratorStateTracker.
+    std::shared_ptr<MockPresentationOrchestratorStateTracker> m_stateTracker;
+
+    /// Mock of @c PresentationObserver.
+    std::shared_ptr<MockPresentationObserver> m_presentationObserver;
+
+    /// Mock of @c VisualTimeoutManager.
+    std::shared_ptr<MockVisualTimeoutManager> m_visualTimeoutManager;
+
+    /// An instance of the @c PresentationOrchestratorClient per test.
+    std::shared_ptr<PresentationOrchestratorClient> m_presentationOrchestratorClient;
+
+    /// An instance of @c Executor used by PO Client.
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> m_executor;
+};
+
+void PresentationOrchestratorClientTest::SetUp() {
+    m_presentationObserver = std::make_shared<NiceMock<MockPresentationObserver>>();
+    m_stateTracker = std::make_shared<NiceMock<MockPresentationOrchestratorStateTracker>>();
+    m_visualTimeoutManager = std::make_shared<NiceMock<MockVisualTimeoutManager>>();
+    m_executor = std::make_shared<alexaClientSDK::avsCommon::utils::threading::Executor>();
+
+    m_presentationOrchestratorClient =
+        PresentationOrchestratorClient::create(CLIENT_ID, m_stateTracker, m_visualTimeoutManager);
+    m_presentationOrchestratorClient->setExecutor(m_executor);
+}
+
+void PresentationOrchestratorClientTest::TearDown() {
+    m_presentationOrchestratorClient->shutdown();
+    m_presentationOrchestratorClient.reset();
+    m_presentationObserver.reset();
+    m_stateTracker.reset();
+    m_visualTimeoutManager.reset();
+}
+
+PresentationOptions generatePresentationOptions(
+    const std::chrono::milliseconds& timeout,
+    const PresentationLifespan& lifespan,
+    const std::string& interfaceName,
+    const std::string& metadata) {
+    PresentationOptions options;
+    options.timeout = std::chrono::milliseconds(timeout);
+    options.presentationLifespan = lifespan;
+    options.interfaceName = interfaceName;
+    options.metadata = metadata;
+    return options;
+}
+
+PresentationOrchestratorWindowInstance generateWindowInstance(
+    const std::string& windowId,
+    const int& zOrder,
+    const std::vector<std::string>& supportedInterfaces) {
+    PresentationOrchestratorWindowInstance window;
+    window.id = windowId;
+    window.zOrderIndex = zOrder;
+    window.supportedInterfaces = supportedInterfaces;
+    return window;
+}
+
+/**
+ * Tests requestWindow for a windowId not recognized by PO Client
+ */
+TEST_F(PresentationOrchestratorClientTest, testRequestWindowInvalidWindowId) {
+    auto presentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+
+    // promise value won't be set as acquire window isn't supposed to be called
+    avsCommon::utils::PromiseFuturePair<void> onAcquireWindowCalled;
+    EXPECT_CALL(*m_stateTracker, acquireWindow(_, _, _)).Times(Exactly(0));
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _)).Times(Exactly(0));
+    EXPECT_CALL(*m_visualTimeoutManager, requestTimeout(_, _)).Times(Exactly(0));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+
+    ASSERT_FALSE(onAcquireWindowCalled.waitFor(SHORT_DELAY));
+}
+
+/**
+ * Tests requestWindow for a presentation with an interface not supported by requested window
+ */
+TEST_F(PresentationOrchestratorClientTest, testRequestWindowUnsupportedInterface) {
+    auto presentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+    std::vector<std::string> supportedInterfaces = {INTERFACE_2};
+    auto windowInstance = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance);
+
+    // promise value won't be set as acquire window isn't supposed to be called
+    avsCommon::utils::PromiseFuturePair<void> onAcquireWindowCalled;
+    EXPECT_CALL(*m_stateTracker, acquireWindow(_, _, _)).Times(Exactly(0));
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _)).Times(Exactly(0));
+    EXPECT_CALL(*m_visualTimeoutManager, requestTimeout(_, _)).Times(Exactly(0));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+
+    ASSERT_FALSE(onAcquireWindowCalled.waitFor(SHORT_DELAY));
+}
+
+/**
+ * Tests whether acquireWindow of state tracker is called with the correct params post requestWindow
+ */
+TEST_F(PresentationOrchestratorClientTest, testAddAndRequestWindow) {
+    std::vector<std::string> supportedInterfaces = {INTERFACE_1};
+    auto windowInstance = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance);
+
+    auto expectedOptions = generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<void> onAcquireWindowCalled;
+    EXPECT_CALL(*m_stateTracker, acquireWindow(_, _, _))
+        .Times(Exactly(1))
+        .WillOnce(
+            Invoke([&expectedOptions, &onAcquireWindowCalled](
+                       const std::string& clientId, const std::string& windowId, const PresentationMetadata& metadata) {
+                ASSERT_EQ(CLIENT_ID, clientId);
+                ASSERT_EQ(WINDOW_ID_1, windowId);
+                ASSERT_EQ(expectedOptions.metadata, metadata.metadata);
+                ASSERT_EQ(expectedOptions.interfaceName, metadata.interfaceName);
+                onAcquireWindowCalled.setValue();
+            }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, expectedOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+
+    ASSERT_TRUE(onAcquireWindowCalled.waitFor(SHORT_DELAY));
+}
+
+/**
+ * Tests whether timeout is requested on requestedWindow and stopped on window removal
+ */
+TEST_F(PresentationOrchestratorClientTest, testAddRequestAndRemoveWindowWithTimeouts) {
+    std::vector<std::string> supportedInterfaces = {INTERFACE_1};
+    auto windowInstance = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance);
+
+    auto expectedOptions = generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<void> onAcquireWindowCalled;
+    EXPECT_CALL(*m_stateTracker, acquireWindow(_, _, _))
+        .Times(Exactly(1))
+        .WillOnce(
+            Invoke([&onAcquireWindowCalled](
+                       const std::string& clientId, const std::string& windowId, const PresentationMetadata& metadata) {
+                onAcquireWindowCalled.setValue();
+            }));
+
+    VisualTimeoutManagerInterface::VisualTimeoutId expectedTimeoutId = 3;
+    EXPECT_CALL(*m_visualTimeoutManager, requestTimeout(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([&expectedTimeoutId, &expectedOptions](
+                             const std::chrono::milliseconds& delay,
+                             const VisualTimeoutManagerInterface::VisualTimeoutCallback& timeoutCallback) {
+            EXPECT_EQ(expectedOptions.timeout, delay);
+            return expectedTimeoutId;
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, expectedOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onAcquireWindowCalled.waitFor(SHORT_DELAY));
+
+    EXPECT_CALL(*m_visualTimeoutManager, stopTimeout(_))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([&expectedTimeoutId](const VisualTimeoutManagerInterface::VisualTimeoutId& timeoutId) {
+            EXPECT_TRUE(expectedTimeoutId == timeoutId);
+            return true;
+        }));
+    EXPECT_CALL(*m_stateTracker, getFocusedWindowId()).Times(1).WillOnce(Invoke([]() { return ""; }));
+
+    m_presentationOrchestratorClient->onWindowRemoved(WINDOW_ID_1);
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Tests whether presentation request tokens are returned without awaiting for executor tasks to be completed
+ */
+TEST_F(PresentationOrchestratorClientTest, testRequestTokens) {
+    std::vector<std::string> supportedInterfaces = {INTERFACE_1};
+    auto windowInstance = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance);
+
+    auto expectedOptions = generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+
+    auto requestToken1 =
+        m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, expectedOptions, m_presentationObserver);
+    auto requestToken2 =
+        m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, expectedOptions, m_presentationObserver);
+    auto requestToken3 =
+        m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, expectedOptions, m_presentationObserver);
+
+    ASSERT_EQ(requestToken1, PresentationRequestToken(0));
+    ASSERT_EQ(requestToken2, PresentationRequestToken(1));
+    ASSERT_EQ(requestToken3, PresentationRequestToken(2));
+}
+
+/**
+ * Tests presentation observer is notified of availability post requestWindow
+ */
+TEST_F(PresentationOrchestratorClientTest, testOnPresentationAvailable) {
+    std::vector<std::string> supportedInterfaces = {INTERFACE_1};
+    auto windowInstance = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance);
+
+    auto expectedOptions = generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<PresentationRequestToken> onPresentationAvailableCalled;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([&onPresentationAvailableCalled](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+            onPresentationAvailableCalled.setValue(requestToken);
+        }));
+
+    auto requestToken =
+        m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, expectedOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+
+    ASSERT_TRUE(onPresentationAvailableCalled.waitFor(SHORT_DELAY));
+    ASSERT_EQ(onPresentationAvailableCalled.getValue(), requestToken);
+}
+
+/**
+ * Tests updatePresentationMetadata of state tracker is invoked with correct params
+ * Window was requested previously and should be in foreground focused state before another requestWindow call
+ */
+TEST_F(PresentationOrchestratorClientTest, testMetadataUpdate) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    PresentationOrchestratorWindowInstance windowInstance1 =
+        generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+
+    auto presentationOptions1 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<void> onAcquireWindowCalled;
+    EXPECT_CALL(*m_stateTracker, acquireWindow(_, _, _))
+        .Times(Exactly(1))
+        .WillOnce(
+            Invoke([&presentationOptions1, &onAcquireWindowCalled](
+                       const std::string& clientId, const std::string& windowId, const PresentationMetadata& metadata) {
+                ASSERT_EQ(CLIENT_ID, clientId);
+                ASSERT_EQ(WINDOW_ID_1, windowId);
+                ASSERT_EQ(presentationOptions1.metadata, metadata.metadata);
+                ASSERT_EQ(presentationOptions1.interfaceName, metadata.interfaceName);
+                onAcquireWindowCalled.setValue();
+            }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions1, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onAcquireWindowCalled.waitFor(SHORT_DELAY));
+
+    auto presentationOptions2 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::TRANSIENT, INTERFACE_1, METADATA_1);
+    avsCommon::utils::PromiseFuturePair<void> onUpdatePresentationMetadataCalled;
+    EXPECT_CALL(*m_stateTracker, updatePresentationMetadata(_, _, _))
+        .Times(Exactly(1))
+        .WillOnce(
+            Invoke([&presentationOptions2, &onUpdatePresentationMetadataCalled](
+                       const std::string& clientId, const std::string& windowId, const PresentationMetadata& metadata) {
+                ASSERT_EQ(CLIENT_ID, clientId);
+                ASSERT_EQ(WINDOW_ID_1, windowId);
+                ASSERT_EQ(presentationOptions2.metadata, metadata.metadata);
+                ASSERT_EQ(presentationOptions2.interfaceName, metadata.interfaceName);
+                onUpdatePresentationMetadataCalled.setValue();
+            }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions2, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onUpdatePresentationMetadataCalled.waitFor(SHORT_DELAY));
+}
+
+/**
+ * Tests state of presentations from two windows having same zOrderIndex on requestWindow and clearPresentations
+ */
+TEST_F(PresentationOrchestratorClientTest, testRequestAndClearMultipleWindowsWithSameZOrderIndex) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    std::vector<std::string> supportedInterfaces2 = {INTERFACE_2};
+    auto windowInstance2 = generateWindowInstance(WINDOW_ID_2, 2, supportedInterfaces2);
+
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance2);
+
+    auto presentationOptions1 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+    auto presentationOptions2 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::SHORT, INTERFACE_2, METADATA_2);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPresentationAvailable1;
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPresentationAvailable2;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onPresentationAvailable1](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPresentationAvailable1.setValue(presentation);
+        }))
+        .WillOnce(Invoke([&onPresentationAvailable2](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPresentationAvailable2.setValue(presentation);
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions1, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailable1.waitFor(SHORT_DELAY));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_2, presentationOptions2, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailable2.waitFor(SHORT_DELAY));
+
+    // foregrounded presentation from other window must be unfocused
+    auto presentation1 = onPresentationAvailable1.getValue();
+    ASSERT_EQ(presentation1->getState(), PresentationState::FOREGROUND_UNFOCUSED);
+
+    auto presentation2 = onPresentationAvailable2.getValue();
+    ASSERT_EQ(presentation2->getState(), PresentationState::FOREGROUND);
+
+    // Expect both windows to be released
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_2, windowId);
+        }))
+        .WillOnce(Invoke([](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_1, windowId);
+        }));
+
+    m_presentationOrchestratorClient->clearPresentations();
+    m_executor->waitForSubmittedTasks();
+
+    ASSERT_EQ(presentation1->getState(), PresentationState::NONE);
+    ASSERT_EQ(presentation2->getState(), PresentationState::NONE);
+}
+
+/**
+ * Tests state of presentations from two windows having different zOrderIndex on requestWindow and clearPresentations
+ * The second requested window has a lower zOrderIndex than the first window in this case
+ */
+TEST_F(PresentationOrchestratorClientTest, testRequestAndClearMultipleWindowsWithDifferentZOrderIndex) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 3, supportedInterfaces1);
+    std::vector<std::string> supportedInterfaces2 = {INTERFACE_2};
+    auto windowInstance2 = generateWindowInstance(WINDOW_ID_2, 2, supportedInterfaces2);
+
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance2);
+
+    auto presentationOptions1 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+    auto presentationOptions2 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::SHORT, INTERFACE_2, METADATA_2);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPresentationAvailable1;
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPresentationAvailable2;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onPresentationAvailable1](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPresentationAvailable1.setValue(presentation);
+        }))
+        .WillOnce(Invoke([&onPresentationAvailable2](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPresentationAvailable2.setValue(presentation);
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions1, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailable1.waitFor(SHORT_DELAY));
+
+    // Expect WINDOW_ID_1 to be released when WINDOW_ID_2 is foregrounded
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_1, windowId);
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_2, presentationOptions2, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailable2.waitFor(SHORT_DELAY));
+
+    // presentations from windows with higher zOrderIndex must be cleared
+    auto presentation1 = onPresentationAvailable1.getValue();
+    ASSERT_EQ(presentation1->getState(), PresentationState::NONE);
+
+    auto presentation2 = onPresentationAvailable2.getValue();
+    ASSERT_EQ(presentation2->getState(), PresentationState::FOREGROUND);
+
+    // Expect WINDOW_ID_2 to be released
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_2, windowId);
+        }));
+
+    m_presentationOrchestratorClient->clearPresentations();
+    m_executor->waitForSubmittedTasks();
+
+    ASSERT_EQ(presentation1->getState(), PresentationState::NONE);
+    ASSERT_EQ(presentation2->getState(), PresentationState::NONE);
+}
+
+/**
+ * Tests back navigation on a window with two presentations
+ * When both presentations are dismissed, releaseWindow of state tracker should be invoked
+ */
+TEST_F(PresentationOrchestratorClientTest, testNavigateBack) {
+    std::vector<std::string> supportedInterfaces = {INTERFACE_1};
+    auto windowInstance = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance);
+
+    auto presentationOptions1 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+    auto presentationOptions2 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::TRANSIENT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<void> onPresentationAvailableCalled1;
+    avsCommon::utils::PromiseFuturePair<void> onPresentationAvailableCalled2;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onPresentationAvailableCalled1](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+            onPresentationAvailableCalled1.setValue();
+        }))
+        .WillOnce(Invoke([&onPresentationAvailableCalled2](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+            onPresentationAvailableCalled2.setValue();
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions1, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailableCalled1.waitFor(SHORT_DELAY));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions2, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailableCalled2.waitFor(SHORT_DELAY));
+
+    EXPECT_CALL(*m_stateTracker, getFocusedWindowId()).WillRepeatedly(Invoke([]() { return WINDOW_ID_1; }));
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _)).Times(0);
+    EXPECT_CALL(*m_presentationObserver, onNavigateBack(_))
+        .Times(Exactly(2))
+        .WillRepeatedly(
+            Invoke([](const presentationOrchestratorInterfaces::PresentationRequestToken id) { return false; }));
+
+    // should not invoke releaseWindow of state tracker
+    m_presentationOrchestratorClient->navigateBack();
+    m_executor->waitForSubmittedTasks();
+
+    avsCommon::utils::PromiseFuturePair<void> releaseWindowCalled;
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _))
+        .Times(1)
+        .WillOnce(Invoke([&releaseWindowCalled](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_1, windowId);
+            releaseWindowCalled.setValue();
+        }));
+
+    // should invoke releaseWindow of state tracker
+    m_presentationOrchestratorClient->navigateBack();
+    m_executor->waitForSubmittedTasks();
+
+    ASSERT_TRUE(releaseWindowCalled.waitFor(SHORT_DELAY));
+}
+
+/**
+ * Tests back navigation with two windows, each with one presentation (with LONG lifespans).
+ * When the topmost presentation is dismissed, the window should be released and the topmost presentation of the
+ * next window (if one exists) should then be foregrounded.
+ */
+TEST_F(PresentationOrchestratorClientTest, testNavigateBackMultipleWindowsSingleLongPresentationEach) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    std::vector<std::string> supportedInterfaces2 = {INTERFACE_2};
+    auto windowInstance2 = generateWindowInstance(WINDOW_ID_2, 2, supportedInterfaces2);
+
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance2);
+
+    auto presentationOptions1 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+    auto presentationOptions2 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_2, METADATA_2);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPresentationAvailable1;
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPresentationAvailable2;
+
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onPresentationAvailable1](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPresentationAvailable1.setValue(presentation);
+        }))
+        .WillOnce(Invoke([&onPresentationAvailable2](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPresentationAvailable2.setValue(presentation);
+        }));
+
+    auto presentation1RequestToken =
+        m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions1, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailable1.waitFor(SHORT_DELAY));
+
+    auto presentation2RequestToken =
+        m_presentationOrchestratorClient->requestWindow(WINDOW_ID_2, presentationOptions2, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailable2.waitFor(SHORT_DELAY));
+
+    auto presentation1 = onPresentationAvailable1.getValue();
+    ASSERT_EQ(presentation1->getState(), PresentationState::FOREGROUND_UNFOCUSED);
+
+    auto presentation2 = onPresentationAvailable2.getValue();
+    ASSERT_EQ(presentation2->getState(), PresentationState::FOREGROUND);
+
+    EXPECT_CALL(*m_stateTracker, getFocusedWindowId())
+        .WillOnce(Invoke([]() { return WINDOW_ID_2; }))
+        .WillRepeatedly(Invoke([]() { return WINDOW_ID_1; }));
+
+    EXPECT_CALL(*m_presentationObserver, onNavigateBack(_))
+        .Times(Exactly(2))
+        .WillRepeatedly(
+            Invoke([](const presentationOrchestratorInterfaces::PresentationRequestToken id) { return false; }));
+
+    avsCommon::utils::PromiseFuturePair<void> onPresentation1StateChangedForeground;
+    avsCommon::utils::PromiseFuturePair<void> onPresentation2StateChangedNone;
+
+    // There should be 2 state changes on the first navigateBack():
+    // 1. presentation2 state should go from FOREGROUND to NONE, and,
+    // 2. presentation1 state should go from FOREGROUND_UNFOCUSED to FOREGROUND
+    EXPECT_CALL(*m_presentationObserver, onPresentationStateChanged(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([presentation2RequestToken, &onPresentation2StateChangedNone](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, presentation2RequestToken);
+            ASSERT_EQ(newState, PresentationState::NONE);
+            onPresentation2StateChangedNone.setValue();
+        }))
+        .WillOnce(Invoke([presentation1RequestToken, &onPresentation1StateChangedForeground](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, presentation1RequestToken);
+            ASSERT_EQ(newState, PresentationState::FOREGROUND);
+            onPresentation1StateChangedForeground.setValue();
+        }));
+
+    // WINDOW_ID_2 should be released when navigateBack() is called on presentation2
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_2, windowId);
+        }));
+
+    // navigateBack() on presentation2
+    m_presentationOrchestratorClient->navigateBack();
+    m_executor->waitForSubmittedTasks();
+
+    onPresentation2StateChangedNone.waitFor(TIMEOUT);
+    // Confirm that presentation2 has been dismissed
+    ASSERT_EQ(presentation2->getState(), PresentationState::NONE);
+
+    onPresentation1StateChangedForeground.waitFor(TIMEOUT);
+    // Confirm that presentation1 is in the foreground
+    ASSERT_EQ(presentation1->getState(), PresentationState::FOREGROUND);
+
+    avsCommon::utils::PromiseFuturePair<void> onPresentation1StateChangedNone;
+    // On the next navigateBack(), one state change should occur:
+    // presentation1 state should go from FOREGROUND to NONE
+    EXPECT_CALL(*m_presentationObserver, onPresentationStateChanged(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([presentation1RequestToken, &onPresentation1StateChangedNone](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, presentation1RequestToken);
+            ASSERT_EQ(newState, PresentationState::NONE);
+            onPresentation1StateChangedNone.setValue();
+        }));
+
+    // WINDOW_ID_1 should be released when navigateBack() is called on presentation1
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_1, windowId);
+        }));
+
+    // navigateBack() on presentation1
+    m_presentationOrchestratorClient->navigateBack();
+    m_executor->waitForSubmittedTasks();
+
+    onPresentation1StateChangedNone.waitFor(TIMEOUT);
+    // Confirm that presentation1 has been dismissed
+    ASSERT_EQ(presentation1->getState(), PresentationState::NONE);
+}
+
+/**
+ * Tests back navigation with two windows each having a presentation with a different lifespan.
+ * When the topmost presentation (with LONG lifespan) is dismissed, the window should be released and the PERMANENT
+ * presentation of the next window should then be foregrounded. navigateBack() on the PERMANENT presentation should not
+ * release the window or cause a state change.
+ */
+TEST_F(PresentationOrchestratorClientTest, testNavigateBackMultipleWindowsLongOnPermanent) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    std::vector<std::string> supportedInterfaces2 = {INTERFACE_2};
+    auto windowInstance2 = generateWindowInstance(WINDOW_ID_2, 2, supportedInterfaces2);
+
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance2);
+
+    auto presentationOptions1 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::PERMANENT, INTERFACE_1, METADATA_1);
+    auto presentationOptions2 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_2, METADATA_2);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPresentationAvailable1;
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPresentationAvailable2;
+
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onPresentationAvailable1](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPresentationAvailable1.setValue(presentation);
+        }))
+        .WillOnce(Invoke([&onPresentationAvailable2](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPresentationAvailable2.setValue(presentation);
+        }));
+
+    auto presentation1RequestToken =
+        m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions1, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailable1.waitFor(SHORT_DELAY));
+
+    auto presentation2RequestToken =
+        m_presentationOrchestratorClient->requestWindow(WINDOW_ID_2, presentationOptions2, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailable2.waitFor(SHORT_DELAY));
+
+    auto presentation1 = onPresentationAvailable1.getValue();
+    ASSERT_EQ(presentation1->getState(), PresentationState::FOREGROUND_UNFOCUSED);
+
+    auto presentation2 = onPresentationAvailable2.getValue();
+    ASSERT_EQ(presentation2->getState(), PresentationState::FOREGROUND);
+
+    EXPECT_CALL(*m_stateTracker, getFocusedWindowId())
+        .WillOnce(Invoke([]() { return WINDOW_ID_2; }))
+        .WillRepeatedly(Invoke([]() { return WINDOW_ID_1; }));
+    EXPECT_CALL(*m_presentationObserver, onNavigateBack(_))
+        .Times(Exactly(2))
+        .WillRepeatedly(
+            Invoke([](const presentationOrchestratorInterfaces::PresentationRequestToken id) { return false; }));
+
+    avsCommon::utils::PromiseFuturePair<void> onPresentation1StateChangedForeground;
+    avsCommon::utils::PromiseFuturePair<void> onPresentation2StateChangedNone;
+
+    // There should be 2 state changes on the first navigateBack():
+    // 1. presentation2 state should go from FOREGROUND to NONE, and,
+    // 2. presentation1 state should go from FOREGROUND_UNFOCUSED to FOREGROUND
+    EXPECT_CALL(*m_presentationObserver, onPresentationStateChanged(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([presentation2RequestToken, &onPresentation2StateChangedNone](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, presentation2RequestToken);
+            ASSERT_EQ(newState, PresentationState::NONE);
+            onPresentation2StateChangedNone.setValue();
+        }))
+        .WillOnce(Invoke([presentation1RequestToken, &onPresentation1StateChangedForeground](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, presentation1RequestToken);
+            ASSERT_EQ(newState, PresentationState::FOREGROUND);
+            onPresentation1StateChangedForeground.setValue();
+        }));
+
+    // WINDOW_ID_2 should be released when navigateBack() is called on presentation2
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_2, windowId);
+        }));
+
+    // navigateBack() on presentation2
+    m_presentationOrchestratorClient->navigateBack();
+    m_executor->waitForSubmittedTasks();
+
+    onPresentation2StateChangedNone.waitFor(TIMEOUT);
+    // Confirm that presentation2 has been dismissed
+    ASSERT_EQ(presentation2->getState(), PresentationState::NONE);
+
+    onPresentation1StateChangedForeground.waitFor(TIMEOUT);
+    // Confirm that presentation1 is in the foreground
+    ASSERT_EQ(presentation1->getState(), PresentationState::FOREGROUND);
+
+    // No state changes are expected when navigateBack() is called on presentation1
+    EXPECT_CALL(*m_presentationObserver, onPresentationStateChanged(_, _)).Times(Exactly(0));
+
+    // WINDOW_ID_1 should not be released when navigateBack() is called on presentation1
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _)).Times(Exactly(0));
+
+    // navigateBack() on presentation1
+    m_presentationOrchestratorClient->navigateBack();
+    m_executor->waitForSubmittedTasks();
+    // Confirm that presentation1 is still in the foreground
+    ASSERT_EQ(presentation1->getState(), PresentationState::FOREGROUND);
+
+    // WINDOW_ID_1 should be released during tear down
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_1, windowId);
+        }));
+
+    // presentation1 state should go from FOREGROUND to NONE
+    EXPECT_CALL(*m_presentationObserver, onPresentationStateChanged(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([presentation1RequestToken](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, presentation1RequestToken);
+            ASSERT_EQ(newState, PresentationState::NONE);
+        }));
+}
+
+/**
+ * Tests back navigation with two windows each having a presentation with a different lifespan.
+ * When navigateBack() on the topmost presentation (with PERMANENT lifespan) is invoked, there should be no state
+ * change.
+ */
+TEST_F(PresentationOrchestratorClientTest, testNavigateBackMultipleWindowsPermanentOnLong) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    std::vector<std::string> supportedInterfaces2 = {INTERFACE_2};
+    auto windowInstance2 = generateWindowInstance(WINDOW_ID_2, 2, supportedInterfaces2);
+
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance2);
+
+    auto presentationOptions1 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+    auto presentationOptions2 =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::PERMANENT, INTERFACE_2, METADATA_2);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPresentationAvailable1;
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPresentationAvailable2;
+
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onPresentationAvailable1](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPresentationAvailable1.setValue(presentation);
+        }))
+        .WillOnce(Invoke([&onPresentationAvailable2](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPresentationAvailable2.setValue(presentation);
+        }));
+
+    auto presentation1RequestToken =
+        m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions1, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailable1.waitFor(SHORT_DELAY));
+
+    auto presentation2RequestToken =
+        m_presentationOrchestratorClient->requestWindow(WINDOW_ID_2, presentationOptions2, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailable2.waitFor(SHORT_DELAY));
+
+    auto presentation1 = onPresentationAvailable1.getValue();
+    ASSERT_EQ(presentation1->getState(), PresentationState::FOREGROUND_UNFOCUSED);
+
+    auto presentation2 = onPresentationAvailable2.getValue();
+    ASSERT_EQ(presentation2->getState(), PresentationState::FOREGROUND);
+
+    EXPECT_CALL(*m_stateTracker, getFocusedWindowId()).WillOnce(Invoke([]() { return WINDOW_ID_2; }));
+    EXPECT_CALL(*m_presentationObserver, onNavigateBack(_))
+        .Times(Exactly(1))
+        .WillRepeatedly(
+            Invoke([](const presentationOrchestratorInterfaces::PresentationRequestToken id) { return false; }));
+
+    // No state changes are expected when navigateBack() is called on on presentation2
+    EXPECT_CALL(*m_presentationObserver, onPresentationStateChanged(_, _)).Times(Exactly(0));
+
+    // WINDOW_ID_2 should not be released when navigateBack() is called on presentation2
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _)).Times(Exactly(0));
+
+    // navigateBack() on presentation2
+    m_presentationOrchestratorClient->navigateBack();
+    m_executor->waitForSubmittedTasks();
+    // presentation2 should still be in the FOREGROUND
+    ASSERT_EQ(presentation2->getState(), PresentationState::FOREGROUND);
+
+    // Both windows are released during teardown
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_2, windowId);
+        }))
+        .WillOnce(Invoke([](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_1, windowId);
+        }));
+
+    // Only state changes that occur should be that both presentations are moved to NONE state during teardown
+    EXPECT_CALL(*m_presentationObserver, onPresentationStateChanged(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([presentation2RequestToken](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, presentation2RequestToken);
+            ASSERT_EQ(newState, PresentationState::NONE);
+        }))
+        .WillOnce(Invoke([presentation1RequestToken](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, presentation1RequestToken);
+            ASSERT_EQ(newState, PresentationState::NONE);
+        }));
+}
+
+/**
+ * Tests back navigation on a single window having a presentation with PERMANENT lifespan
+ * Window shouldn't be released in this case
+ */
+TEST_F(PresentationOrchestratorClientTest, testNavigateBackPermanent) {
+    std::vector<std::string> supportedInterfaces = {INTERFACE_1};
+    auto windowInstance = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance);
+
+    auto expectedOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::PERMANENT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<void> onPresentationAvailableCalled;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([&onPresentationAvailableCalled](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+            onPresentationAvailableCalled.setValue();
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, expectedOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailableCalled.waitFor(SHORT_DELAY));
+
+    EXPECT_CALL(*m_stateTracker, getFocusedWindowId()).WillRepeatedly(Invoke([]() { return WINDOW_ID_1; }));
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _)).Times(0);
+    EXPECT_CALL(*m_presentationObserver, onNavigateBack(_))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const presentationOrchestratorInterfaces::PresentationRequestToken id) { return false; }));
+
+    m_presentationOrchestratorClient->navigateBack();
+    m_executor->waitForSubmittedTasks();
+
+    // release window should be invoked in tearDown
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_1, windowId);
+        }));
+}
+
+/**
+ * Tests back navigation on a window with two presentations
+ * Top PERMANENT presentation should not be dismissed on navigate back
+ */
+TEST_F(PresentationOrchestratorClientTest, testNavigateBackPermanentOnLong) {
+    std::vector<std::string> supportedInterfaces = {INTERFACE_1};
+    auto windowInstance = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance);
+
+    auto longPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+    auto permanentPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::PERMANENT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<void> onLongPresentationAvailableCalled;
+    avsCommon::utils::PromiseFuturePair<void> onPermanentPresentationAvailableCalled;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onLongPresentationAvailableCalled](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+            onLongPresentationAvailableCalled.setValue();
+        }))
+        .WillOnce(Invoke([&onPermanentPresentationAvailableCalled](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+            onPermanentPresentationAvailableCalled.setValue();
+        }));
+
+    auto longPresentationRequestToken =
+        m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, longPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onLongPresentationAvailableCalled.waitFor(SHORT_DELAY));
+
+    auto permanentPresentationRequestToken = m_presentationOrchestratorClient->requestWindow(
+        WINDOW_ID_1, permanentPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPermanentPresentationAvailableCalled.waitFor(SHORT_DELAY));
+
+    EXPECT_CALL(*m_stateTracker, getFocusedWindowId()).WillRepeatedly(Invoke([]() { return WINDOW_ID_1; }));
+    EXPECT_CALL(*m_presentationObserver, onPresentationStateChanged(_, _)).Times(0);
+    EXPECT_CALL(*m_presentationObserver, onNavigateBack(_))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const presentationOrchestratorInterfaces::PresentationRequestToken id) { return false; }));
+
+    // should not invoke onPresentationStateChanged of presentation observer
+    m_presentationOrchestratorClient->navigateBack();
+    m_executor->waitForSubmittedTasks();
+
+    // onPresentationStateChanged should be invoked in tearDown
+    EXPECT_CALL(*m_presentationObserver, onPresentationStateChanged(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([permanentPresentationRequestToken](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, permanentPresentationRequestToken);
+            ASSERT_EQ(newState, PresentationState::NONE);
+        }))
+        .WillOnce(Invoke([longPresentationRequestToken](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, longPresentationRequestToken);
+            ASSERT_EQ(newState, PresentationState::NONE);
+        }));
+}
+
+/**
+ * Tests back navigation on a single window having a presentation with SHORT lifespan that handles back navigation
+ * Window shouldn't be released in this case
+ */
+TEST_F(PresentationOrchestratorClientTest, testNavigateBackShortHandlesBack) {
+    std::vector<std::string> supportedInterfaces = {INTERFACE_1};
+    auto windowInstance = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance);
+
+    auto expectedOptions = generatePresentationOptions(TIMEOUT, PresentationLifespan::SHORT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<void> onPresentationAvailableCalled;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([&onPresentationAvailableCalled](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+            onPresentationAvailableCalled.setValue();
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, expectedOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailableCalled.waitFor(SHORT_DELAY));
+
+    EXPECT_CALL(*m_stateTracker, getFocusedWindowId()).WillRepeatedly(Invoke([]() { return WINDOW_ID_1; }));
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _)).Times(0);
+    EXPECT_CALL(*m_presentationObserver, onNavigateBack(_))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const presentationOrchestratorInterfaces::PresentationRequestToken id) { return true; }));
+
+    m_presentationOrchestratorClient->navigateBack();
+    m_executor->waitForSubmittedTasks();
+
+    // release window should be invoked in tearDown
+    EXPECT_CALL(*m_stateTracker, releaseWindow(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const std::string& clientId, const std::string& windowId) {
+            ASSERT_EQ(CLIENT_ID, clientId);
+            ASSERT_EQ(WINDOW_ID_1, windowId);
+        }));
+}
+
+/**
+ * Test LONG presentation being foregrounded after TRANSIENT presentation in same window
+ */
+TEST_F(PresentationOrchestratorClientTest, testRequestWindowTransientFollowedByLongPresentation) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+
+    auto transientPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::TRANSIENT, INTERFACE_1, METADATA_1);
+    auto longPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onTransientPresentationAvailable;
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onLongPresentationAvailable;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onTransientPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onTransientPresentationAvailable.setValue(presentation);
+        }))
+        .WillOnce(Invoke([&onLongPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onLongPresentationAvailable.setValue(presentation);
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, transientPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onTransientPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto transientPresentation = onTransientPresentationAvailable.getValue();
+    ASSERT_EQ(transientPresentation->getState(), PresentationState::FOREGROUND);
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, longPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onLongPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto longPresentation = onLongPresentationAvailable.getValue();
+    ASSERT_EQ(transientPresentation->getState(), PresentationState::NONE);
+    ASSERT_EQ(longPresentation->getState(), PresentationState::FOREGROUND);
+}
+
+/**
+ * Test LONG presentation being foregrounded after SHORT presentation in same window
+ */
+TEST_F(PresentationOrchestratorClientTest, testRequestWindowShortFollowedByLongPresentation) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+
+    auto shortPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::TRANSIENT, INTERFACE_1, METADATA_1);
+    auto longPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onShortPresentationAvailable;
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onLongPresentationAvailable;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onShortPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onShortPresentationAvailable.setValue(presentation);
+        }))
+        .WillOnce(Invoke([&onLongPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onLongPresentationAvailable.setValue(presentation);
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, shortPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onShortPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto shortPresentation = onShortPresentationAvailable.getValue();
+    ASSERT_EQ(shortPresentation->getState(), PresentationState::FOREGROUND);
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, longPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onLongPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto longPresentation = onLongPresentationAvailable.getValue();
+    ASSERT_EQ(shortPresentation->getState(), PresentationState::NONE);
+    ASSERT_EQ(longPresentation->getState(), PresentationState::FOREGROUND);
+}
+
+/**
+ * Test TRANSIENT presentation being foregrounded after SHORT presentation in same window
+ */
+TEST_F(PresentationOrchestratorClientTest, testRequestWindowShortFollowedByTransientPresentation) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+
+    auto shortPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::SHORT, INTERFACE_1, METADATA_1);
+    auto transientPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::TRANSIENT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onShortPresentationAvailable;
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onTransientPresentationAvailable;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onShortPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onShortPresentationAvailable.setValue(presentation);
+        }))
+        .WillOnce(Invoke([&onTransientPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onTransientPresentationAvailable.setValue(presentation);
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, shortPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onShortPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto shortPresentation = onShortPresentationAvailable.getValue();
+    ASSERT_EQ(shortPresentation->getState(), PresentationState::FOREGROUND);
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, transientPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onTransientPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto transientPresentation = onTransientPresentationAvailable.getValue();
+    ASSERT_EQ(shortPresentation->getState(), PresentationState::BACKGROUND);
+    ASSERT_EQ(transientPresentation->getState(), PresentationState::FOREGROUND);
+}
+
+/**
+ * Test TRANSIENT presentation being foregrounded after LONG presentation in same window
+ */
+TEST_F(PresentationOrchestratorClientTest, testRequestWindowLongFollowedByTransientPresentation) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+
+    auto longPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+    auto transientPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::TRANSIENT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onLongPresentationAvailable;
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onTransientPresentationAvailable;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onLongPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onLongPresentationAvailable.setValue(presentation);
+        }))
+        .WillOnce(Invoke([&onTransientPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onTransientPresentationAvailable.setValue(presentation);
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, longPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onLongPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto longPresentation = onLongPresentationAvailable.getValue();
+    ASSERT_EQ(longPresentation->getState(), PresentationState::FOREGROUND);
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, transientPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onTransientPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto transientPresentation = onTransientPresentationAvailable.getValue();
+    ASSERT_EQ(longPresentation->getState(), PresentationState::BACKGROUND);
+    ASSERT_EQ(transientPresentation->getState(), PresentationState::FOREGROUND);
+}
+
+/**
+ * Test PERMANENT presentation should be foregrounded after SHORT presentation is dismissed
+ */
+TEST_F(PresentationOrchestratorClientTest, testDismissShortOnPermanent) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+
+    auto permanentPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::PERMANENT, INTERFACE_1, METADATA_1);
+    auto shortPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::SHORT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPermanentPresentationAvailable;
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onShortPresentationAvailable;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onPermanentPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+            onPermanentPresentationAvailable.setValue(presentation);
+        }))
+        .WillOnce(Invoke([&onShortPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+            onShortPresentationAvailable.setValue(presentation);
+        }));
+
+    auto permanentPresentationRequestToken = m_presentationOrchestratorClient->requestWindow(
+        WINDOW_ID_1, permanentPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPermanentPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto permanentPresentation = onPermanentPresentationAvailable.getValue();
+    ASSERT_EQ(permanentPresentation->getState(), PresentationState::FOREGROUND);
+
+    auto shortPresentationRequestToken =
+        m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, shortPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onShortPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto shortPresentation = onShortPresentationAvailable.getValue();
+    ASSERT_EQ(permanentPresentation->getState(), PresentationState::BACKGROUND);
+    ASSERT_EQ(shortPresentation->getState(), PresentationState::FOREGROUND);
+
+    EXPECT_CALL(*m_presentationObserver, onPresentationStateChanged(_, _))
+        .Times(Exactly(3))
+        .WillOnce(Invoke([shortPresentationRequestToken](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, shortPresentationRequestToken);
+            ASSERT_EQ(newState, PresentationState::NONE);
+        }))
+        .WillOnce(Invoke([permanentPresentationRequestToken](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, permanentPresentationRequestToken);
+            ASSERT_EQ(newState, PresentationState::FOREGROUND);
+        }))
+        .WillOnce(Invoke([permanentPresentationRequestToken](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            // onPresentationStateChanged for permanent presentation should be invoked in tearDown
+            ASSERT_EQ(id, permanentPresentationRequestToken);
+            ASSERT_EQ(newState, PresentationState::NONE);
+        }));
+
+    // Dismiss SHORT presentation should foreground PERMANENT presentation
+    shortPresentation->dismiss();
+}
+
+/**
+ * Test PERMANENT presentation should be foregrounded after TRANSIENT presentation is dismissed
+ */
+TEST_F(PresentationOrchestratorClientTest, testDismissTransientOnPermanent) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+
+    auto permanentPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::PERMANENT, INTERFACE_1, METADATA_1);
+    auto transientPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::TRANSIENT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPermanentPresentationAvailable;
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onTransientPresentationAvailable;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onPermanentPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+            onPermanentPresentationAvailable.setValue(presentation);
+        }))
+        .WillOnce(Invoke([&onTransientPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+            onTransientPresentationAvailable.setValue(presentation);
+        }));
+
+    auto permanentPresentationRequestToken = m_presentationOrchestratorClient->requestWindow(
+        WINDOW_ID_1, permanentPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPermanentPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto permanentPresentation = onPermanentPresentationAvailable.getValue();
+    ASSERT_EQ(permanentPresentation->getState(), PresentationState::FOREGROUND);
+
+    auto transientPresentationRequestToken = m_presentationOrchestratorClient->requestWindow(
+        WINDOW_ID_1, transientPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onTransientPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto transientPresentation = onTransientPresentationAvailable.getValue();
+    ASSERT_EQ(permanentPresentation->getState(), PresentationState::BACKGROUND);
+    ASSERT_EQ(transientPresentation->getState(), PresentationState::FOREGROUND);
+
+    EXPECT_CALL(*m_presentationObserver, onPresentationStateChanged(_, _))
+        .Times(Exactly(3))
+        .WillOnce(Invoke([transientPresentationRequestToken](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, transientPresentationRequestToken);
+            ASSERT_EQ(newState, PresentationState::NONE);
+        }))
+        .WillOnce(Invoke([permanentPresentationRequestToken](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            ASSERT_EQ(id, permanentPresentationRequestToken);
+            ASSERT_EQ(newState, PresentationState::FOREGROUND);
+        }))
+        .WillOnce(Invoke([permanentPresentationRequestToken](
+                             const presentationOrchestratorInterfaces::PresentationRequestToken id,
+                             const presentationOrchestratorInterfaces::PresentationState newState) {
+            // onPresentationStateChanged for permanent presentation should be invoked in tearDown
+            ASSERT_EQ(id, permanentPresentationRequestToken);
+            ASSERT_EQ(newState, PresentationState::NONE);
+        }));
+
+    // Dismiss TRANSIENT presentation should foreground PERMANENT presentation
+    transientPresentation->dismiss();
+}
+
+/**
+ * Test defaulting presentation timeouts in single window
+ */
+TEST_F(PresentationOrchestratorClientTest, testDefaultingTimeout) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+
+    auto longPresentationOptions = generatePresentationOptions(
+        PresentationInterface::getTimeoutDefault(), PresentationLifespan::LONG, INTERFACE_1, METADATA_1);
+    auto shortPresentationOptions = generatePresentationOptions(
+        PresentationInterface::getTimeoutDefault(), PresentationLifespan::SHORT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onLongPresentationAvailable;
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onShortPresentationAvailable;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(2))
+        .WillOnce(Invoke([&onLongPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onLongPresentationAvailable.setValue(presentation);
+        }))
+        .WillOnce(Invoke([&onShortPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onShortPresentationAvailable.setValue(presentation);
+        }));
+
+    // Timeout should be disabled on LONG presentation by default
+    EXPECT_CALL(*m_visualTimeoutManager, requestTimeout(_, _)).Times(Exactly(0));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, longPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onLongPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto longPresentation = onLongPresentationAvailable.getValue();
+    ASSERT_EQ(longPresentation->getState(), PresentationState::FOREGROUND);
+
+    EXPECT_CALL(*m_visualTimeoutManager, requestTimeout(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const std::chrono::milliseconds& delay,
+                            const VisualTimeoutManagerInterface::VisualTimeoutCallback& timeoutCallback) {
+            EXPECT_EQ(DEFAULT_TIMEOUT_SHORT_PRESENTATION_MS, delay);
+            // random timeout id; not validated
+            return 1;
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, shortPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onShortPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto shortPresentation = onShortPresentationAvailable.getValue();
+    ASSERT_EQ(longPresentation->getState(), PresentationState::BACKGROUND);
+    ASSERT_EQ(shortPresentation->getState(), PresentationState::FOREGROUND);
+}
+
+/**
+ * Test presentation initialization with timeout disabled
+ */
+TEST_F(PresentationOrchestratorClientTest, testPresentationDisabledTimeout) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+
+    auto shortPresentationOptions = generatePresentationOptions(
+        PresentationInterface::getTimeoutDisabled(), PresentationLifespan::TRANSIENT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onShortPresentationAvailable;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([&onShortPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onShortPresentationAvailable.setValue(presentation);
+        }));
+
+    EXPECT_CALL(*m_visualTimeoutManager, requestTimeout(_, _)).Times(Exactly(0));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, shortPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onShortPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto shortPresentation = onShortPresentationAvailable.getValue();
+    ASSERT_EQ(shortPresentation->getState(), PresentationState::FOREGROUND);
+}
+
+/**
+ * Test disabling timeout using Presentation::setTimeout
+ */
+TEST_F(PresentationOrchestratorClientTest, testDisablingTimeoutUsingSetTimeout) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+
+    auto shortPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::SHORT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onShortPresentationAvailable;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([&onShortPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onShortPresentationAvailable.setValue(presentation);
+        }));
+
+    // random timeout id
+    VisualTimeoutManagerInterface::VisualTimeoutId expectedTimeoutId = 1;
+    EXPECT_CALL(*m_visualTimeoutManager, requestTimeout(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([&expectedTimeoutId](
+                             const std::chrono::milliseconds& delay,
+                             const VisualTimeoutManagerInterface::VisualTimeoutCallback& timeoutCallback) {
+            EXPECT_EQ(TIMEOUT, delay);
+            return expectedTimeoutId;
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, shortPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onShortPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto shortPresentation = onShortPresentationAvailable.getValue();
+    ASSERT_EQ(shortPresentation->getState(), PresentationState::FOREGROUND);
+
+    EXPECT_CALL(*m_visualTimeoutManager, stopTimeout(_))
+        .Times(AtLeast(1))
+        .WillOnce(Invoke([&expectedTimeoutId](const VisualTimeoutManagerInterface::VisualTimeoutId& timeoutId) {
+            EXPECT_TRUE(expectedTimeoutId == timeoutId);
+            return true;
+        }));
+
+    shortPresentation->setTimeout(PresentationInterface::getTimeoutDisabled());
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Test that custom timeout is not used for presentation with lifespan PERMANENT.
+ * VisualTimeoutManager requestTimeout should not be called.
+ */
+TEST_F(PresentationOrchestratorClientTest, testPermanentPresentationCustomTimeout) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+
+    // provide a custom timeout during initialization
+    auto permanentPresentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::PERMANENT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPermanentPresentationAvailable;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([&onPermanentPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPermanentPresentationAvailable.setValue(presentation);
+        }));
+
+    EXPECT_CALL(*m_visualTimeoutManager, requestTimeout(_, _)).Times(Exactly(0));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, permanentPresentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPermanentPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto permanentPresentation = onPermanentPresentationAvailable.getValue();
+    ASSERT_EQ(permanentPresentation->getState(), PresentationState::FOREGROUND);
+
+    // try setting a custom timeout again
+    permanentPresentation->setTimeout(TIMEOUT);
+    permanentPresentation->startTimeout();
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Test that custom timeout is not used for presentation with lifespan PERMANENT.
+ * However, once the lifespan is changed to SHORT, it uses the custom timeout instead of default.
+ */
+TEST_F(PresentationOrchestratorClientTest, testPermanentPresentationUpdateToShortCustomTimeout) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance1 = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance1);
+
+    // provide a custom timeout during initialization
+    auto presentationOptions =
+        generatePresentationOptions(TIMEOUT, PresentationLifespan::PERMANENT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPresentationAvailable;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([&onPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPresentationAvailable.setValue(presentation);
+        }));
+
+    EXPECT_CALL(*m_visualTimeoutManager, requestTimeout(_, _)).Times(Exactly(0));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto presentation = onPresentationAvailable.getValue();
+    ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+
+    EXPECT_CALL(*m_visualTimeoutManager, requestTimeout(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([](const std::chrono::milliseconds& delay,
+                            const VisualTimeoutManagerInterface::VisualTimeoutCallback& timeoutCallback) {
+            EXPECT_EQ(TIMEOUT, delay);
+            // random timeout id; not validated
+            return 1;
+        }));
+
+    // change the lifespan so custom timeout is used when timeout is restarted
+    presentation->setLifespan(PresentationLifespan::SHORT);
+    presentation->startTimeout();
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Test timeout is stopped if the updated lifespan has a timeout disabled by default.
+ * Presentations with lifespan LONG have timeout disabled by default. This test changes lifespan from SHORT to LONG.
+ */
+TEST_F(PresentationOrchestratorClientTest, testShortLifespanToLongLifespanChangeDisablesTimeout) {
+    std::vector<std::string> supportedInterfaces1 = {INTERFACE_1};
+    auto windowInstance = generateWindowInstance(WINDOW_ID_1, 1, supportedInterfaces1);
+    m_presentationOrchestratorClient->onWindowAdded(windowInstance);
+
+    // use default timeout for presentation
+    auto presentationOptions = generatePresentationOptions(
+        PresentationInterface::getTimeoutDefault(), PresentationLifespan::SHORT, INTERFACE_1, METADATA_1);
+
+    avsCommon::utils::PromiseFuturePair<std::shared_ptr<PresentationInterface>> onPresentationAvailable;
+    EXPECT_CALL(*m_presentationObserver, onPresentationAvailable(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([&onPresentationAvailable](
+                             const PresentationRequestToken& requestToken,
+                             const std::shared_ptr<PresentationInterface>& presentation) {
+            onPresentationAvailable.setValue(presentation);
+        }));
+
+    // random timeout id
+    VisualTimeoutManagerInterface::VisualTimeoutId expectedTimeoutId = 3;
+    // timeout should be requested for presentation with lifespan SHORT
+    EXPECT_CALL(*m_visualTimeoutManager, requestTimeout(_, _))
+        .Times(Exactly(1))
+        .WillOnce(Invoke([expectedTimeoutId](
+                             const std::chrono::milliseconds& delay,
+                             const VisualTimeoutManagerInterface::VisualTimeoutCallback& timeoutCallback) {
+            return expectedTimeoutId;
+        }));
+
+    m_presentationOrchestratorClient->requestWindow(WINDOW_ID_1, presentationOptions, m_presentationObserver);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(onPresentationAvailable.waitFor(SHORT_DELAY));
+
+    auto presentation = onPresentationAvailable.getValue();
+    ASSERT_EQ(presentation->getState(), PresentationState::FOREGROUND);
+
+    // active timeout should be stopped once lifespan changes to LONG
+    EXPECT_CALL(*m_visualTimeoutManager, stopTimeout(_))
+        // first call on lifespan change; second call during teardown
+        .Times(Exactly(2))
+        .WillRepeatedly(Invoke([expectedTimeoutId](const VisualTimeoutManagerInterface::VisualTimeoutId& timeoutId) {
+            EXPECT_TRUE(expectedTimeoutId == timeoutId);
+            return true;
+        }));
+
+    // change presentation lifespan to LONG
+    presentation->setLifespan(PresentationLifespan::LONG);
+    m_executor->waitForSubmittedTasks();
+}
+
+}  // namespace test
+}  // namespace presentationOrchestratorClient
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/CMakeLists.txt b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/CMakeLists.txt
new file mode 100644
index 0000000000..eb9678bce9
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.1)
+project(acsdkPresentationOrchestratorInterfaces LANGUAGES CXX)
+
+include(${AVS_CMAKE_BUILD}/BuildDefaults.cmake)
+
+add_library(acsdkPresentationOrchestratorInterfaces INTERFACE)
+
+target_include_directories(acsdkPresentationOrchestratorInterfaces INTERFACE
+        "${acsdkPresentationOrchestratorInterfaces_SOURCE_DIR}/include")
+
+add_subdirectory("test")
+
+asdk_install_interface()
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationInterface.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationInterface.h
new file mode 100644
index 0000000000..8914be6949
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationInterface.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONINTERFACE_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONINTERFACE_H_
+
+#include <chrono>
+#include <string>
+
+#include "PresentationTypes.h"
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+/**
+ * Interface which represents a Presentation object, provides methods to manage the lifecycle of a presentation
+ */
+class PresentationInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~PresentationInterface() = default;
+
+    /**
+     * Gets a value which can be used in @c setTimeout that indicates the timeout should be disabled.
+     *
+     * @return Value indicating timeout is disabled
+     */
+    static const std::chrono::milliseconds getTimeoutDisabled() {
+        static const std::chrono::milliseconds TIMEOUT_DISABLED = std::chrono::milliseconds::max();
+        return TIMEOUT_DISABLED;
+    }
+
+    /**
+     * Gets a value which can be used in @c setTimeout that indicates the timeout should be set to the default value
+     * associated with the @c PresentationLifespan for the presentation.
+     *
+     * @return Value indicating default timeout should be used
+     */
+    static const std::chrono::milliseconds getTimeoutDefault() {
+        static const std::chrono::milliseconds TIMEOUT_DEFAULT{-1};
+        return TIMEOUT_DEFAULT;
+    }
+
+    /**
+     * Dismiss the current presentation
+     */
+    virtual void dismiss() = 0;
+
+    /**
+     * Request foregrounding of the current presentation
+     */
+    virtual void foreground() = 0;
+
+    /**
+     * Sets the metadata associated with this presentation
+     * @param token The new metadata
+     */
+    virtual void setMetadata(const std::string& metadata) = 0;
+
+    /**
+     * Sets the lifespan of the presentation
+     * @param lifespan new lifespan value
+     */
+    virtual void setLifespan(const PresentationLifespan& lifespan) = 0;
+
+    /**
+     * Starts or Restarts the timeout for this presentation.
+     * @note the timer will only be started if the presentation currently is focused, i.e. is in the FOREGROUND state
+     */
+    virtual void startTimeout() = 0;
+
+    /**
+     * Stops the timeout for this presentation
+     * @note the timer may be resumed as a result of other user actions, or presentation state change events.
+     */
+    virtual void stopTimeout() = 0;
+
+    /**
+     * Sets the timeout for this presentation - the new value will take effect the next time the timeout is restarted
+     * @param timeout The new timeout value, use @c PresentationInterface::getTimeoutDisabled() to disable the timeout
+     * use @c PresentationInterface::getTimeoutDefault() to default timeout based on the presentation lifespan
+     */
+    virtual void setTimeout(const std::chrono::milliseconds& timeout) = 0;
+
+    /**
+     * Gets the current state for this presentation
+     * @return The current presentation state
+     */
+    virtual PresentationState getState() = 0;
+};
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONINTERFACE_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationObserverInterface.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationObserverInterface.h
new file mode 100644
index 0000000000..b1a20f35c3
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationObserverInterface.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONOBSERVERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONOBSERVERINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include "PresentationInterface.h"
+#include "PresentationTypes.h"
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+/**
+ * Interface to be implemented by observers interested in state changes to a @c PresentationInterface
+ */
+class PresentationObserverInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~PresentationObserverInterface() = default;
+
+    /**
+     * Called when the presentation is available for use
+     * @param id The identifier for this presentation, as provided when the window was initially requested
+     * @param presentation The pointer used for presentation control
+     */
+    virtual void onPresentationAvailable(
+        PresentationRequestToken id,
+        std::shared_ptr<PresentationInterface> presentation) = 0;
+
+    /**
+     * Called when the presentation state has changed
+     * @param id The identifier for this presentation, as provided when the window was initially requested
+     * @param newState The new presentation state
+     */
+    virtual void onPresentationStateChanged(PresentationRequestToken id, PresentationState newState) = 0;
+
+    /**
+     * Called by the presentation orchestrator to perform custom back navigation on a presentation if supported
+     * @param id The identifier for the presentation, as provided when the window was initially requested
+     * @return true if the observer handled back navigation, false if the presentation orchestrator should handle back
+     */
+    virtual bool onNavigateBack(PresentationRequestToken id) = 0;
+};
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONOBSERVERINTERFACE_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorClientInterface.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorClientInterface.h
new file mode 100644
index 0000000000..73fcc7a437
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorClientInterface.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORCLIENTINTERFACE_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORCLIENTINTERFACE_H_
+
+#include <memory>
+#include <string>
+
+#include "PresentationObserverInterface.h"
+#include "PresentationTypes.h"
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+
+class PresentationOrchestratorClientInterface {
+public:
+    virtual ~PresentationOrchestratorClientInterface() = default;
+
+    /**
+     * Request a GUI window for the given presentation
+     * @param windowId The window ID being requested
+     * @param options The options for this window request
+     * @param observer The observer for this window - all state changes for this presentation will be reported to this
+     * observer
+     * @return the unique identifier for this request, this will be included when observer functions are called.
+     * presentationAvailable will be called on the observer interface once the presentation is available for use.
+     */
+    virtual PresentationRequestToken requestWindow(
+        const std::string& windowId,
+        PresentationOptions options,
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationObserverInterface> observer) = 0;
+};
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORCLIENTINTERFACE_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorInterface.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorInterface.h
new file mode 100644
index 0000000000..48adf7f9d9
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorInterface.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORINTERFACE_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORINTERFACE_H_
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+
+class PresentationOrchestratorInterface {
+public:
+    virtual ~PresentationOrchestratorInterface() = default;
+
+    /**
+     * Clears all presentations across all windows, ignoring visual focus behavior
+     */
+    virtual void clearPresentations() = 0;
+
+    /**
+     * Navigates backwards, the next selected presentation will be determined based on the @c PresentationLifespan of
+     * the active presentation
+     * @return true if presentation orchestrator handled back navigation, false otherwise
+     */
+    virtual bool navigateBack() = 0;
+};
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORINTERFACE_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateObserverInterface.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateObserverInterface.h
new file mode 100644
index 0000000000..8ca6faf281
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateObserverInterface.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORSTATEOBSERVERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORSTATEOBSERVERINTERFACE_H_
+
+#include <string>
+
+#include "PresentationOrchestratorTypes.h"
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+/**
+ * Interface to be implemented by observers interested in changes to the active presentation in a window
+ */
+class PresentationOrchestratorStateObserverInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~PresentationOrchestratorStateObserverInterface() = default;
+
+    /**
+     * Called when the active presentation in a window has changed
+     * @param windowId The window ID which was updated
+     * @param metadata The new focus metadata
+     */
+    virtual void onStateChanged(const std::string& windowId, const PresentationMetadata& metadata) = 0;
+};
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORSTATEOBSERVERINTERFACE_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h
new file mode 100644
index 0000000000..87d1e308f4
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h
@@ -0,0 +1,151 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORSTATETRACKERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORSTATETRACKERINTERFACE_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "PresentationOrchestratorStateObserverInterface.h"
+#include "PresentationOrchestratorWindowObserverInterface.h"
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+
+/**
+ * The PresentationOrchestratorStateTrackerInterface tracks windows and presentations, the active presentation state
+ * will be reported to the VisualActivityTracker in addition to any registered observers.
+ */
+class PresentationOrchestratorStateTrackerInterface {
+public:
+    virtual ~PresentationOrchestratorStateTrackerInterface() = default;
+
+    /**
+     * Acquires, or reacquires the given window ID
+     * To ensure accurate state reporting it is recommended this function is called whenever a window is foregrounded
+     * @param clientId The identifier for the client making this request
+     * @param windowId The window ID which is being acquired
+     * @param metadata The metadata for this request
+     */
+    virtual void acquireWindow(
+        const std::string& clientId,
+        const std::string& windowId,
+        PresentationMetadata metadata) = 0;
+
+    /**
+     * Updates the presentation metadata, a previous acquireWindow call should already have been made
+     * This function does not move this client to the front of the window stack
+     * @param clientId The identifier for the client making this request
+     * @param windowId The window ID to update
+     * @param metadata The new metadata
+     */
+    virtual void updatePresentationMetadata(
+        const std::string& clientId,
+        const std::string& windowId,
+        PresentationMetadata metadata) = 0;
+
+    /**
+     * Releases a previously acquired window
+     * @param clientId The identifier for the client making this request
+     * @param windowId The window ID which is being released
+     */
+    virtual void releaseWindow(const std::string& clientId, const std::string& windowId) = 0;
+
+    /**
+     * Retrieve the interface for the current focused presentation
+     * @return The interface, or an empty string if nothing is active
+     */
+    virtual std::string getFocusedInterface() = 0;
+
+    /**
+     * Retrieve the current focused windowId
+     * @return The window ID, or an empty string if nothing is active
+     */
+    virtual std::string getFocusedWindowId() = 0;
+
+    /**
+     * Sets the window instances that the orchestrator should track.
+     * Will remove/update any existing orchestrator windows that are not in the set or have changed.
+     * Will add any window instances in the set that are not currently handled by orchestrator.
+     *
+     * @param windows Array of window instances
+     */
+    virtual void setWindows(const std::vector<PresentationOrchestratorWindowInstance>& windows) = 0;
+
+    /**
+     * Adds a window instance to the orchestrator
+     * @param window The window instance information
+     * @return true if the window was added, false if the addition failed
+     */
+    virtual bool addWindow(const PresentationOrchestratorWindowInstance& window) = 0;
+
+    /**
+     * Removes a window instance from this orchestrator
+     * @param windowId The id of the window to remove
+     */
+    virtual void removeWindow(const std::string& windowId) = 0;
+
+    /**
+     * Updates an existing window instance
+     * @param window The window instance information, the window id must already exist
+     */
+    virtual void updateWindow(const PresentationOrchestratorWindowInstance& window) = 0;
+
+    /**
+     * Retrieves information for all window instances tracked by orchestrator
+     * @return vector of window information
+     */
+    virtual std::vector<PresentationOrchestratorWindowInfo> getWindowInformation() = 0;
+
+    /**
+     * Adds an observer to be notified of window changes
+     * @param observer The observer to add
+     */
+    virtual void addWindowObserver(std::weak_ptr<PresentationOrchestratorWindowObserverInterface> observer) = 0;
+
+    /**
+     * Removes a window observer that was previously added
+     * @param observer The observer to remove
+     */
+    virtual void removeWindowObserver(std::weak_ptr<PresentationOrchestratorWindowObserverInterface> observer) = 0;
+
+    /**
+     * Adds an observer to be notified of state changes
+     * @param observer The observer to add
+     */
+    virtual void addStateObserver(std::weak_ptr<PresentationOrchestratorStateObserverInterface> observer) = 0;
+
+    /**
+     * Removes an observer that was previously added
+     * @param observer The observer to remove
+     */
+    virtual void removeStateObserver(std::weak_ptr<PresentationOrchestratorStateObserverInterface> observer) = 0;
+
+    /**
+     * Sets the interface which will be reported if no other clients have acquired a window
+     * @param interfaceName The interface to report in VisualActivityTracker
+     */
+    virtual void setDeviceInterface(std::string interfaceName) = 0;
+
+    /**
+     * Releases the device interface which was previously set with setDeviceInterface
+     */
+    virtual void releaseDeviceInterface() = 0;
+};
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORSTATETRACKERINTERFACE_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorTypes.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorTypes.h
new file mode 100644
index 0000000000..f514240107
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorTypes.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORTYPES_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORTYPES_H_
+
+#include <string>
+#include <vector>
+
+#include <acsdk/VisualCharacteristicsInterfaces/VisualCharacteristicsInterface.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+/**
+ * Struct holding the metadata for a presentation
+ */
+struct PresentationMetadata {
+    /// The endpoint holding this window, the default endpoint will be assumed if empty
+    std::string endpoint;
+
+    /// The AVS interface holding this window
+    std::string interfaceName;
+
+    /// Metadata associated with the interface
+    /// For example, for the Alexa.Presentation.APL interface this should contain the presentation token
+    std::string metadata;
+};
+
+/**
+ * Specialization of a VC Window Instance, contains additional information for a window which is required by the
+ * Presentation Orchestrator
+ */
+struct PresentationOrchestratorWindowInstance : public visualCharacteristicsInterfaces::WindowInstance {
+    /// The set of interfaces supported by this window
+    std::vector<std::string> supportedInterfaces;
+
+    /// Where in the zOrder this window instance exists
+    /// @note Windows with larger values appears above windows with smaller values
+    int zOrderIndex;
+};
+
+/**
+ * Contains information on the current window configuration and state
+ */
+struct PresentationOrchestratorWindowInfo {
+    /// The window instance configuration
+    PresentationOrchestratorWindowInstance configuration;
+
+    /// The window instance state
+    PresentationMetadata state;
+};
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORTYPES_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorWindowObserverInterface.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorWindowObserverInterface.h
new file mode 100644
index 0000000000..af69db9d2a
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorWindowObserverInterface.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORWINDOWOBSERVERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORWINDOWOBSERVERINTERFACE_H_
+
+#include <string>
+
+#include "PresentationOrchestratorTypes.h"
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+/**
+ * Interface to be implemented by observers interested in changes to window configuration
+ */
+class PresentationOrchestratorWindowObserverInterface {
+public:
+    /**
+     * Destructor
+     */
+    virtual ~PresentationOrchestratorWindowObserverInterface() = default;
+
+    /**
+     * A window was added to the window configuration
+     * @param instance The window instance which was added
+     */
+    virtual void onWindowAdded(const PresentationOrchestratorWindowInstance& instance) = 0;
+
+    /**
+     * Called when a window instance has been modified
+     * @param instance The modified window instance
+     * @note the Window ID will never be changed
+     */
+    virtual void onWindowModified(const PresentationOrchestratorWindowInstance& instance) = 0;
+
+    /**
+     * Called when a window instance has been removed
+     * @param windowId The window ID which has been removed
+     */
+    virtual void onWindowRemoved(const std::string& windowId) = 0;
+};
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONORCHESTRATORWINDOWOBSERVERINTERFACE_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationTypes.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationTypes.h
new file mode 100644
index 0000000000..5780a71bff
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/PresentationTypes.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONTYPES_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONTYPES_H_
+
+#include <chrono>
+#include <ostream>
+#include <string>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+using PresentationRequestToken = uint64_t;
+
+enum class PresentationLifespan {
+    /// A short lived presentation which cannot be backgrounded, upon timeout will be dismissed and the next SHORT,
+    /// LONG or PERMANENT presentation will be resumed
+    TRANSIENT,
+
+    /// A short lived presentation, not generally backgrounded but can be if a transient presentation is displayed.
+    /// Upon timeout the next LONG or PERMANENT presentation will be resumed
+    SHORT,
+
+    /// A long lived presentation, may not have a timeout attached to it - will be backgrounded if another presentation
+    /// is displayed
+    LONG,
+
+    /// Special use case for applications that are always running and are not expected to terminate, for example home
+    /// screens. Permanent presentations can be backgrounded but cannot be dismissed as a result of back navigation.
+    PERMANENT
+};
+
+/**
+ * enumeration of all PresentationStates
+ */
+enum class PresentationState {
+    /**
+     * Presentation is in the foreground of its window and has focus (it is the primary target of user interaction)
+     */
+    FOREGROUND,
+
+    /**
+     * Presentation is in the foreground of the window, but is not the focused application
+     */
+    FOREGROUND_UNFOCUSED,
+
+    /**
+     * Presentation is no longer in the foreground and does not have focus
+     */
+    BACKGROUND,
+
+    /**
+     * Presentation has been dismissed
+     */
+    NONE,
+};
+
+/**
+ * This function converts the provided @c PresentationState to a string.
+ *
+ * @param state The @c PresentationState to convert to a string.
+ * @return The string conversion of @c state.
+ */
+inline std::string presentationStateToString(PresentationState state) {
+    switch (state) {
+        case PresentationState::FOREGROUND:
+            return "FOREGROUND";
+        case PresentationState::FOREGROUND_UNFOCUSED:
+            return "FOREGROUND_UNFOCUSED";
+        case PresentationState::BACKGROUND:
+            return "BACKGROUND";
+        case PresentationState::NONE:
+            return "NONE";
+    }
+    return "Unknown State";
+}
+
+/**
+ * Write a @c PresentationState value to an @c ostream as a string.
+ *
+ * @param stream The stream to write the value to.
+ * @param state The @c PresentationState value to write to the @c ostream as a string.
+ * @return The @c ostream that was passed in and written to.
+ */
+inline std::ostream& operator<<(std::ostream& stream, const PresentationState& state) {
+    return stream << presentationStateToString(state);
+}
+
+/**
+ * This function converts the provided @c PresentationLifespan to a string.
+ *
+ * @param state The @c PresentationLifespan to convert to a string.
+ * @return The string conversion of @c lifespan.
+ */
+inline std::string presentationLifespanToString(PresentationLifespan lifespan) {
+    switch (lifespan) {
+        case PresentationLifespan::TRANSIENT:
+            return "TRANSIENT";
+        case PresentationLifespan::SHORT:
+            return "SHORT";
+        case PresentationLifespan::LONG:
+            return "LONG";
+        case PresentationLifespan::PERMANENT:
+            return "PERMANENT";
+    }
+    return "Unknown Lifespan";
+}
+
+/**
+ * Write a @c PresentationLifespan value to an @c ostream as a string.
+ *
+ * @param stream The stream to write the value to.
+ * @param lifespan The @c PresentationLifespan value to write to the @c ostream as a string.
+ * @return The @c ostream that was passed in and written to.
+ */
+inline std::ostream& operator<<(std::ostream& stream, const PresentationLifespan& lifespan) {
+    return stream << presentationLifespanToString(lifespan);
+}
+
+struct PresentationOptions {
+    /// The timeout for the document, use @c PresentationInterface::getTimeoutDisabled() to disable the timeout
+    /// use @c PresentationInterface::getTimeoutDefault() to default timeout based on the presentation lifespan
+    std::chrono::milliseconds timeout;
+
+    /// Specifies the lifespan type for this presentation
+    PresentationLifespan presentationLifespan;
+
+    /// The AVS namespace associated with this presentation
+    std::string interfaceName;
+
+    /// Metadata associated with the interface
+    /// For example, for the Alexa.Presentation.APL interface this should contain the presentation token
+    std::string metadata;
+};
+
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_PRESENTATIONTYPES_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/VisualTimeoutManagerInterface.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/VisualTimeoutManagerInterface.h
new file mode 100644
index 0000000000..95c52609d2
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/include/acsdk/PresentationOrchestratorInterfaces/VisualTimeoutManagerInterface.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_VISUALTIMEOUTMANAGERINTERFACE_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_VISUALTIMEOUTMANAGERINTERFACE_H_
+
+#include <chrono>
+#include <functional>
+
+#include <AVSCommon/SDKInterfaces/DialogUXStateObserverInterface.h>
+#include <AVSCommon/SDKInterfaces/GUIActivityEventObserverInterface.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+
+class VisualTimeoutManagerInterface
+        : public avsCommon::sdkInterfaces::DialogUXStateObserverInterface
+        , public avsCommon::sdkInterfaces::GUIActivityEventObserverInterface {
+public:
+    virtual ~VisualTimeoutManagerInterface() = default;
+
+    using VisualTimeoutCallback = std::function<void()>;
+    using VisualTimeoutId = unsigned int;
+
+    /**
+     * Creates a timeout, replaces any existing timeout which was registered
+     * @param delay The time which must elapse before the timeout is fired
+     * @param timeoutCallback The callback which will be fired upon the timeout expiring
+     * @return An identifier uniquely identifying this timeout
+     */
+    virtual VisualTimeoutId requestTimeout(std::chrono::milliseconds delay, VisualTimeoutCallback timeoutCallback) = 0;
+
+    /**
+     * Stops a running timeout
+     * @param timeoutId The identifier returned in the call to requestTimeout
+     * @return true if the timeout was stopped, false if this timeoutId does not match the id generated by the last call
+     * to requestTimeout
+     */
+    virtual bool stopTimeout(VisualTimeoutId timeoutId) = 0;
+};
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_VISUALTIMEOUTMANAGERINTERFACE_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/test/CMakeLists.txt b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/test/CMakeLists.txt
new file mode 100644
index 0000000000..9320e8f831
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/test/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1)
+
+if (BUILD_TESTING)
+    add_library(PresentationOrchestratorTestLib INTERFACE)
+
+    target_include_directories(PresentationOrchestratorTestLib INTERFACE "${acsdkPresentationOrchestratorInterfaces_SOURCE_DIR}/test")
+
+    target_link_libraries(PresentationOrchestratorTestLib INTERFACE acsdkPresentationOrchestratorInterfaces gmock_main)
+endif ()
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/test/acsdk/PresentationOrchestratorInterfaces/MockPresentationObserver.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/test/acsdk/PresentationOrchestratorInterfaces/MockPresentationObserver.h
new file mode 100644
index 0000000000..4958b08517
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/test/acsdk/PresentationOrchestratorInterfaces/MockPresentationObserver.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_TEST_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_MOCKPRESENTATIONOBSERVER_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_TEST_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_MOCKPRESENTATIONOBSERVER_H_
+
+#include <gmock/gmock.h>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationObserverInterface.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+namespace test {
+
+/**
+ * Mock class that implements @c PresentationObserverInterface
+ */
+class MockPresentationObserver : public presentationOrchestratorInterfaces::PresentationObserverInterface {
+public:
+    MOCK_METHOD2(
+        onPresentationAvailable,
+        void(
+            presentationOrchestratorInterfaces::PresentationRequestToken id,
+            std::shared_ptr<presentationOrchestratorInterfaces::PresentationInterface> presentation));
+
+    MOCK_METHOD2(
+        onPresentationStateChanged,
+        void(
+            presentationOrchestratorInterfaces::PresentationRequestToken id,
+            presentationOrchestratorInterfaces::PresentationState newState));
+
+    MOCK_METHOD1(onNavigateBack, bool(presentationOrchestratorInterfaces::PresentationRequestToken id));
+};
+
+}  // namespace test
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_TEST_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_MOCKPRESENTATIONOBSERVER_H_
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/test/acsdk/PresentationOrchestratorInterfaces/MockPresentationOrchestratorStateTracker.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/test/acsdk/PresentationOrchestratorInterfaces/MockPresentationOrchestratorStateTracker.h
new file mode 100644
index 0000000000..044688a930
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/test/acsdk/PresentationOrchestratorInterfaces/MockPresentationOrchestratorStateTracker.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_TEST_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_MOCKPRESENTATIONORCHESTRATORSTATETRACKER_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_TEST_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_MOCKPRESENTATIONORCHESTRATORSTATETRACKER_H_
+
+#include <gmock/gmock.h>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorWindowObserverInterface.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+namespace test {
+
+/**
+ * Mock class that implements @c PresentationOrchestratorStateTrackerInterface
+ */
+class MockPresentationOrchestratorStateTracker
+        : public presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface {
+public:
+    MOCK_METHOD3(
+        acquireWindow,
+        void(
+            const std::string& clientId,
+            const std::string& windowId,
+            presentationOrchestratorInterfaces::PresentationMetadata metadata));
+
+    MOCK_METHOD3(
+        updatePresentationMetadata,
+        void(
+            const std::string& clientId,
+            const std::string& windowId,
+            presentationOrchestratorInterfaces::PresentationMetadata metadata));
+
+    MOCK_METHOD2(releaseWindow, void(const std::string& clientId, const std::string& windowId));
+
+    MOCK_METHOD1(setDeviceInterface, void(std::string interface));
+
+    MOCK_METHOD0(releaseDeviceInterface, void());
+
+    MOCK_METHOD0(getFocusedInterface, std::string());
+
+    MOCK_METHOD0(getFocusedWindowId, std::string());
+
+    MOCK_METHOD1(
+        setWindows,
+        void(const std::vector<presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance>& windows));
+
+    MOCK_METHOD1(
+        addWindow,
+        bool(const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& window));
+
+    MOCK_METHOD1(removeWindow, void(const std::string& windowId));
+
+    MOCK_METHOD1(
+        updateWindow,
+        void(const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& window));
+
+    MOCK_METHOD0(
+        getWindowInformation,
+        std::vector<presentationOrchestratorInterfaces::PresentationOrchestratorWindowInfo>());
+
+    MOCK_METHOD1(
+        addWindowObserver,
+        void(std::weak_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorWindowObserverInterface>
+                 observer));
+
+    MOCK_METHOD1(
+        removeWindowObserver,
+        void(std::weak_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorWindowObserverInterface>
+                 observer));
+
+    MOCK_METHOD1(
+        addStateObserver,
+        void(std::weak_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateObserverInterface>
+                 observer));
+
+    MOCK_METHOD1(
+        removeStateObserver,
+        void(std::weak_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateObserverInterface>
+                 obserevr));
+};
+
+}  // namespace test
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_TEST_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_MOCKPRESENTATIONORCHESTRATORSTATETRACKER_H_
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/test/acsdk/PresentationOrchestratorInterfaces/MockVisualTimeoutManager.h b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/test/acsdk/PresentationOrchestratorInterfaces/MockVisualTimeoutManager.h
new file mode 100644
index 0000000000..611da65991
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorInterfaces/test/acsdk/PresentationOrchestratorInterfaces/MockVisualTimeoutManager.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_TEST_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_MOCKVISUALTIMEOUTMANAGER_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_TEST_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_MOCKVISUALTIMEOUTMANAGER_H_
+
+#include <gmock/gmock.h>
+
+#include <acsdk/PresentationOrchestratorInterfaces/VisualTimeoutManagerInterface.h>
+#include <AVSCommon/SDKInterfaces/GUIActivityEvent.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorInterfaces {
+namespace test {
+
+/**
+ * Mock class that implements @c VisualTimeoutManagerInterface
+ */
+class MockVisualTimeoutManager : public presentationOrchestratorInterfaces::VisualTimeoutManagerInterface {
+public:
+    MOCK_METHOD2(
+        requestTimeout,
+        VisualTimeoutId(std::chrono::milliseconds delay, VisualTimeoutCallback timeoutCallback));
+
+    MOCK_METHOD1(stopTimeout, bool(VisualTimeoutId timeoutId));
+
+    MOCK_METHOD1(onDialogUXStateChanged, void(DialogUXStateObserverInterface::DialogUXState newState));
+
+    MOCK_METHOD2(
+        onGUIActivityEventReceived,
+        void(const std::string& source, const avsCommon::sdkInterfaces::GUIActivityEvent& activityEvent));
+};
+
+}  // namespace test
+}  // namespace presentationOrchestratorInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORINTERFACES_TEST_ACSDK_PRESENTATIONORCHESTRATORINTERFACES_MOCKVISUALTIMEOUTMANAGER_H_
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/CMakeLists.txt b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/CMakeLists.txt
new file mode 100644
index 0000000000..5209ea8eb5
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkPresentationOrchestratorStateTracker LANGUAGES CXX)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/include/acsdk/PresentationOrchestratorStateTracker/PresentationOrchestratorStateTrackerFactory.h b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/include/acsdk/PresentationOrchestratorStateTracker/PresentationOrchestratorStateTrackerFactory.h
new file mode 100644
index 0000000000..5d35beb622
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/include/acsdk/PresentationOrchestratorStateTracker/PresentationOrchestratorStateTrackerFactory.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORSTATETRACKER_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORSTATETRACKER_PRESENTATIONORCHESTRATORSTATETRACKERFACTORY_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORSTATETRACKER_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORSTATETRACKER_PRESENTATIONORCHESTRATORSTATETRACKERFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <AFML/ActivityTrackerInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorStateTracker {
+
+/**
+ * Class which creates an instance of the @c PresentationOrchestratorStateTracker
+ */
+class PresentationOrchestratorStateTrackerFactory {
+public:
+    /// Struct returned by the create method which contains instances of the interfaces exposed by the
+    /// @c PresentationOrchestratorStateTracker
+    struct PresentationOrchestratorStateTrackerExports {
+        /// The instance of @c PresentationOrchestratorStateTrackerInterface provided by the @c
+        /// PresentationOrchestratorStateTracker
+        std::shared_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface>
+            presentationOrchestratorStateTrackerInterface;
+        /// Instance of @c RequiresShutdown used for cleaning up during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+    /**
+     * Create an instance of the @c PresentationOrchestratorStateTracker
+     * @param activityTrackerInterface The @c ActivityTrackerInterface to publish state changes to
+     * @return The interfaces exposed by the @c PresentationOrchestratorStateTracker, or empty if creation failed
+     */
+    static avsCommon::utils::Optional<PresentationOrchestratorStateTrackerExports> create(
+        const std::shared_ptr<afml::ActivityTrackerInterface>& activityTrackerInterface);
+};
+
+}  // namespace presentationOrchestratorStateTracker
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORSTATETRACKER_INCLUDE_ACSDK_PRESENTATIONORCHESTRATORSTATETRACKER_PRESENTATIONORCHESTRATORSTATETRACKERFACTORY_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/privateInclude/acsdk/PresentationOrchestratorStateTracker/private/PresentationOrchestratorStateTracker.h b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/privateInclude/acsdk/PresentationOrchestratorStateTracker/private/PresentationOrchestratorStateTracker.h
new file mode 100644
index 0000000000..1eadb1932a
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/privateInclude/acsdk/PresentationOrchestratorStateTracker/private/PresentationOrchestratorStateTracker.h
@@ -0,0 +1,223 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORSTATETRACKER_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORSTATETRACKER_PRIVATE_PRESENTATIONORCHESTRATORSTATETRACKER_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORSTATETRACKER_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORSTATETRACKER_PRIVATE_PRESENTATIONORCHESTRATORSTATETRACKER_H_
+
+#include <chrono>
+#include <list>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include <acsdk/PresentationOrchestratorInterfaces/PresentationOrchestratorStateTrackerInterface.h>
+#include <acsdk/Notifier/Notifier.h>
+#include <AFML/ActivityTrackerInterface.h>
+#include <AVSCommon/SDKInterfaces/VisualFocusAnnotation.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorStateTracker {
+class PresentationOrchestratorStateTracker
+        : public presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface
+        , public avsCommon::utils::RequiresShutdown
+        , public notifier::Notifier<presentationOrchestratorInterfaces::PresentationOrchestratorWindowObserverInterface>
+        , public notifier::Notifier<
+              presentationOrchestratorInterfaces::PresentationOrchestratorStateObserverInterface> {
+public:
+    /**
+     * Creates an instance of the PresentationOrchestratorStateTracker
+     * @param visualActivityTracker Instance of the VisualActivityTrackerInterface to update with state updates
+     * @return Instance of the PresentationOrchestratorStateTracker if creation was successfull, nullptr otherwise
+     */
+    static std::shared_ptr<PresentationOrchestratorStateTracker> create(
+        const std::shared_ptr<afml::ActivityTrackerInterface>& visualActivityTracker);
+
+    /// @c PresentationOrchestratorStateTrackerInterface functions
+    /// @{
+    void acquireWindow(
+        const std::string& clientId,
+        const std::string& windowId,
+        presentationOrchestratorInterfaces::PresentationMetadata metadata) override;
+    void updatePresentationMetadata(
+        const std::string& clientId,
+        const std::string& windowId,
+        presentationOrchestratorInterfaces::PresentationMetadata metadata) override;
+    void releaseWindow(const std::string& clientId, const std::string& windowId) override;
+    std::string getFocusedInterface() override;
+    std::string getFocusedWindowId() override;
+    void setWindows(const std::vector<presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance>&
+                        windows) override;
+    bool addWindow(const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& window) override;
+    void removeWindow(const std::string& windowId) override;
+    void updateWindow(
+        const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& window) override;
+    std::vector<presentationOrchestratorInterfaces::PresentationOrchestratorWindowInfo> getWindowInformation() override;
+    void addWindowObserver(
+        std::weak_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorWindowObserverInterface> observer)
+        override;
+    void removeWindowObserver(
+        std::weak_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorWindowObserverInterface> observer)
+        override;
+    void addStateObserver(
+        std::weak_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateObserverInterface> observer)
+        override;
+    void removeStateObserver(
+        std::weak_ptr<presentationOrchestratorInterfaces::PresentationOrchestratorStateObserverInterface> observer)
+        override;
+    void setDeviceInterface(std::string interfaceName) override;
+    void releaseDeviceInterface() override;
+    /// @}
+
+    /// @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /**
+     * Set the executor used as the worker thread
+     * @param executor The @c Executor to set
+     * @note This function should only be used for testing purposes. No call to any other method should
+     * be done prior to this call.
+     */
+    void setExecutor(const std::shared_ptr<avsCommon::utils::threading::Executor>& executor);
+
+private:
+    /// Constructor
+    explicit PresentationOrchestratorStateTracker(
+        std::shared_ptr<afml::ActivityTrackerInterface> visualActivityTracker);
+
+    /// Internal struct holding presentation metadata
+    struct PresentationMetadata {
+        /// The client ID
+        std::string clientId;
+
+        /// The presentation metadata
+        presentationOrchestratorInterfaces::PresentationMetadata metadata;
+
+        /// The last time at which this presentation was acquired
+        std::chrono::time_point<std::chrono::steady_clock> acquiredTime;
+
+        /// Default constructor
+        PresentationMetadata() = default;
+
+        /// Constructor
+        PresentationMetadata(
+            std::string clientId,
+            presentationOrchestratorInterfaces::PresentationMetadata metadata,
+            std::chrono::time_point<std::chrono::steady_clock> acquiredTime = std::chrono::steady_clock::now()) :
+                clientId(std::move(clientId)),
+                metadata(std::move(metadata)),
+                acquiredTime(std::move(acquiredTime)) {
+        }
+    };
+
+    /// Internal struct defining a window and its state
+    struct Window {
+        /// The window configuration
+        presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance configuration;
+
+        /// The Mapping from client ID to the presentations iterator inside the presentationStack
+        std::unordered_map<std::string, std::list<PresentationMetadata>::iterator> clientIdToPresentation;
+
+        /// The stack of presentations
+        std::list<PresentationMetadata> presentationStack;
+
+        /// Constructor
+        explicit Window(presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance config) :
+                configuration(std::move(config)) {
+        }
+    };
+
+    /**
+     * Notify all the state observers when a window change has occurred
+     * @param windowId The window ID which was updated
+     * @param metadata The new metadata
+     */
+    void executeNotifyStateObservers(
+        const std::string& windowId,
+        const presentationOrchestratorInterfaces::PresentationMetadata& metadata);
+
+    /**
+     * Updates the focused presentation, if necessary
+     * @param changedWindow The window ID which triggered the change
+     */
+    void executeUpdateFocusedPresentation(const Window& changedWindow);
+
+    /**
+     * Updates the visual activity tracker
+     */
+    void executeUpdateVisualActivityTracker();
+
+    /**
+     * Executor - Sets the window instances that the orchestrator should track.
+     * Will remove/update any existing orchestrator windows that are not in the set or have changed.
+     * Will add any window instances in the set that are not currently handled by orchestrator.
+     *
+     * @param windows Array of window instances
+     */
+    void executeSetWindows(
+        const std::vector<presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance>& windows);
+
+    /**
+     * Executor - Adds a window instance to the orchestrator
+     * @param window The window instance information
+     */
+    bool executeAddWindow(const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& window);
+
+    /**
+     * Executor - Removes a window instance from this orchestrator
+     * @param windowId The id of the window to remove
+     */
+    void executeRemoveWindow(const std::string& windowId);
+
+    /**
+     * Executor - Updates an existing window instance
+     * @param window The window instance information, the window id must already exist
+     */
+    void executeUpdateWindow(const presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance& window);
+
+    /**
+     * Gets the interface of the currently focused presentation
+     * @return The interface name
+     */
+    std::string executeGetFocusedInterface();
+
+    /**
+     * Gets the currently focused windowId
+     * @return The window id
+     */
+    std::string executeGetFocusedWindowId();
+
+    /// The visual activity tracker
+    std::shared_ptr<afml::ActivityTrackerInterface> m_visualActivityTracker;
+
+    /// Map from window ID to window
+    std::unordered_map<std::string, Window> m_windows;
+
+    /// The currently focused window ID and presentation
+    std::pair<std::string, PresentationMetadata> m_focusedWindowAndPresentation;
+
+    /// The device interface as set by setDeviceInterface
+    std::string m_deviceInterface;
+
+    /// The worker thread for the @c PresentationOrchestratorStateTracker.
+    std::shared_ptr<avsCommon::utils::threading::Executor> m_executor;
+};
+}  // namespace presentationOrchestratorStateTracker
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_PRESENTATIONORCHESTRATORSTATETRACKER_PRIVATEINCLUDE_ACSDK_PRESENTATIONORCHESTRATORSTATETRACKER_PRIVATE_PRESENTATIONORCHESTRATORSTATETRACKER_H_
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/src/CMakeLists.txt b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/src/CMakeLists.txt
new file mode 100644
index 0000000000..ef9f156f40
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/src/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_definitions("-DACSDK_LOG_MODULE=presentationOrchestratorStateTracker")
+
+add_library(acsdkPresentationOrchestratorStateTracker SHARED
+        "PresentationOrchestratorStateTrackerFactory.cpp"
+        "PresentationOrchestratorStateTracker.cpp")
+
+target_include_directories(acsdkPresentationOrchestratorStateTracker
+        PUBLIC "${acsdkPresentationOrchestratorStateTracker_SOURCE_DIR}/include"
+        "${ASDK_INCLUDE_DIRS}")
+
+target_include_directories(acsdkPresentationOrchestratorStateTracker
+        PRIVATE "${acsdkPresentationOrchestratorStateTracker_SOURCE_DIR}/privateInclude")
+
+target_link_libraries(acsdkPresentationOrchestratorStateTracker "${ASDK_LDFLAGS}" AFML AVSCommon acsdkNotifier acsdkPresentationOrchestratorInterfaces acsdkVisualCharacteristicsInterfaces)
+
+# install target
+asdk_install()
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/src/PresentationOrchestratorStateTracker.cpp b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/src/PresentationOrchestratorStateTracker.cpp
new file mode 100644
index 0000000000..625346e32b
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/src/PresentationOrchestratorStateTracker.cpp
@@ -0,0 +1,439 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+#include "acsdk/PresentationOrchestratorStateTracker/private/PresentationOrchestratorStateTracker.h"
+
+#include <AVSCommon/SDKInterfaces/FocusManagerInterface.h>
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorStateTracker {
+
+static const std::string TAG{"PresentationOrchestratorStateTracker"};
+#define LX(event) avsCommon::utils::logger::LogEntry(TAG, event)
+
+using presentationOrchestratorInterfaces::PresentationOrchestratorStateObserverInterface;
+using presentationOrchestratorInterfaces::PresentationOrchestratorStateTrackerInterface;
+using presentationOrchestratorInterfaces::PresentationOrchestratorWindowInfo;
+using presentationOrchestratorInterfaces::PresentationOrchestratorWindowInstance;
+using presentationOrchestratorInterfaces::PresentationOrchestratorWindowObserverInterface;
+
+std::shared_ptr<PresentationOrchestratorStateTracker> PresentationOrchestratorStateTracker::create(
+    const std::shared_ptr<alexaClientSDK::afml::ActivityTrackerInterface>& visualActivityTracker) {
+    if (!visualActivityTracker) {
+        ACSDK_ERROR(LX("createFailed").m("Null VisualActivityTracker"));
+        return nullptr;
+    }
+
+    return std::shared_ptr<PresentationOrchestratorStateTracker>(
+        new PresentationOrchestratorStateTracker(visualActivityTracker));
+}
+
+PresentationOrchestratorStateTracker::PresentationOrchestratorStateTracker(
+    std::shared_ptr<afml::ActivityTrackerInterface> visualActivityTracker) :
+        RequiresShutdown{TAG},
+        m_visualActivityTracker{std::move(visualActivityTracker)} {
+    m_executor = std::make_shared<avsCommon::utils::threading::Executor>();
+}
+
+void PresentationOrchestratorStateTracker::acquireWindow(
+    const std::string& clientId,
+    const std::string& windowId,
+    presentationOrchestratorInterfaces::PresentationMetadata metadata) {
+    ACSDK_DEBUG5(LX(__func__).d("clientId", clientId).d("windowId", windowId));
+    m_executor->submit([this, clientId, windowId, metadata]() {
+        auto windowIt = m_windows.find(windowId);
+        if (windowIt == m_windows.end()) {
+            ACSDK_ERROR(LX("acquireWindowFailed").d("reason", "Unknown windowId").d("windowId", windowId));
+            return;
+        }
+
+        auto& window = windowIt->second;
+
+        auto clientIt = window.clientIdToPresentation.find(clientId);
+        if (clientIt == window.clientIdToPresentation.end()) {
+            window.presentationStack.emplace_front(clientId, metadata);
+            window.clientIdToPresentation[clientId] = window.presentationStack.begin();
+        } else {
+            // Move the element to the front of the stack without invalidating iterators
+            window.presentationStack.splice(
+                window.presentationStack.begin(), window.presentationStack, clientIt->second);
+            clientIt->second->acquiredTime = std::chrono::steady_clock::now();
+        }
+
+        executeNotifyStateObservers(windowId, metadata);
+        executeUpdateFocusedPresentation(window);
+    });
+}
+
+void PresentationOrchestratorStateTracker::updatePresentationMetadata(
+    const std::string& clientId,
+    const std::string& windowId,
+    presentationOrchestratorInterfaces::PresentationMetadata metadata) {
+    m_executor->submit([this, clientId, windowId, metadata] {
+        auto windowIt = m_windows.find(windowId);
+        if (windowIt == m_windows.end()) {
+            ACSDK_ERROR(LX("updatePresentationMetadataFailed").d("reason", "Unknown windowId").d("windowId", windowId));
+            return;
+        }
+
+        auto& window = windowIt->second;
+
+        auto clientIt = window.clientIdToPresentation.find(clientId);
+        if (clientIt == window.clientIdToPresentation.end()) {
+            ACSDK_ERROR(LX("updatePresentationMetadataFailed").d("reason", "Unknown client").d("clientId", clientId));
+            return;
+        }
+
+        clientIt->second->metadata = metadata;
+
+        if (clientIt->second == window.presentationStack.begin()) {
+            executeNotifyStateObservers(windowId, metadata);
+        }
+    });
+}
+
+void PresentationOrchestratorStateTracker::releaseWindow(const std::string& clientId, const std::string& windowId) {
+    ACSDK_DEBUG5(LX(__func__).d("clientId", clientId).d("windowId", windowId));
+    m_executor->submit([this, clientId, windowId]() {
+        auto windowIt = m_windows.find(windowId);
+        if (windowIt == m_windows.end()) {
+            ACSDK_WARN(LX("releaseWindowFailed").d("reason", "Unknown windowId").d("windowId", windowId));
+            return;
+        }
+
+        auto& window = windowIt->second;
+
+        auto clientIt = window.clientIdToPresentation.find(clientId);
+        if (clientIt == window.clientIdToPresentation.end()) {
+            ACSDK_WARN(LX("releaseWindowFailed").d("reason", "Unknown client").d("clientId", clientId));
+            return;
+        }
+
+        bool wasForeground = window.presentationStack.begin() == clientIt->second;
+
+        window.presentationStack.erase(clientIt->second);
+        window.clientIdToPresentation.erase(clientIt);
+
+        if (wasForeground) {
+            if (window.presentationStack.empty()) {
+                executeNotifyStateObservers(windowId, {});
+            } else {
+                executeNotifyStateObservers(windowId, window.presentationStack.front().metadata);
+            }
+            executeUpdateFocusedPresentation(window);
+        }
+    });
+}
+
+void PresentationOrchestratorStateTracker::setDeviceInterface(std::string interfaceName) {
+    m_executor->submit([this, interfaceName]() {
+        if (m_deviceInterface == interfaceName) {
+            return;
+        }
+
+        m_deviceInterface = interfaceName;
+        if (m_focusedWindowAndPresentation.first.empty()) {
+            executeUpdateVisualActivityTracker();
+        }
+    });
+}
+
+void PresentationOrchestratorStateTracker::releaseDeviceInterface() {
+    m_executor->submit([this]() {
+        if (m_deviceInterface.empty()) {
+            return;
+        }
+
+        m_deviceInterface.clear();
+        if (m_focusedWindowAndPresentation.first.empty()) {
+            executeUpdateVisualActivityTracker();
+        }
+    });
+}
+
+std::string PresentationOrchestratorStateTracker::getFocusedInterface() {
+    return m_executor->submit([this]() { return executeGetFocusedInterface(); }).get();
+}
+
+std::string PresentationOrchestratorStateTracker::getFocusedWindowId() {
+    return m_executor->submit([this]() { return executeGetFocusedWindowId(); }).get();
+}
+
+void PresentationOrchestratorStateTracker::setWindows(
+    const std::vector<PresentationOrchestratorWindowInstance>& windows) {
+    ACSDK_DEBUG5(LX(__func__).d("windowCount", windows.size()));
+    m_executor->submit([this, windows] { executeSetWindows(windows); });
+}
+
+void PresentationOrchestratorStateTracker::executeSetWindows(
+    const std::vector<PresentationOrchestratorWindowInstance>& windows) {
+    if (m_windows.empty()) {
+        for (const auto& window : windows) {
+            executeAddWindow(window);
+        }
+    } else {
+        std::vector<PresentationOrchestratorWindowInstance> windowsToAdd;
+        std::vector<std::string> windowsIdsToRemove;
+        std::vector<std::string> newWindowIds;
+
+        // Identify windows to add or update
+        for (const auto& window : windows) {
+            newWindowIds.push_back(window.id);
+            if (!m_windows.count(window.id)) {
+                windowsToAdd.push_back(window);
+            } else {
+                // Update any existing window
+                executeUpdateWindow(window);
+            }
+        }
+
+        // Identify windows to remove
+        for (const auto& existingWindow : m_windows) {
+            if (!std::count(newWindowIds.begin(), newWindowIds.end(), existingWindow.first)) {
+                windowsIdsToRemove.push_back(existingWindow.first);
+            }
+        }
+
+        // Remove windows
+        for (const auto& windowIdToRemove : windowsIdsToRemove) {
+            executeRemoveWindow(windowIdToRemove);
+        }
+
+        // Add new windows
+        for (const auto& windowToAdd : windowsToAdd) {
+            executeAddWindow(windowToAdd);
+        }
+    }
+}
+
+bool PresentationOrchestratorStateTracker::addWindow(const PresentationOrchestratorWindowInstance& window) {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", window.id));
+    return m_executor->submit([this, window]() { return executeAddWindow(window); }).get();
+}
+
+bool PresentationOrchestratorStateTracker::executeAddWindow(const PresentationOrchestratorWindowInstance& window) {
+    if (window.id.empty()) {
+        ACSDK_ERROR(LX("addWindowFailed").d("reason", "Empty window Id"));
+        return false;
+    }
+    if (m_windows.count(window.id)) {
+        ACSDK_ERROR(LX("addWindowFailed").d("reason", "Window Id already exists").d("windowId", window.id));
+        return false;
+    }
+
+    m_windows.insert({window.id, Window(window)});
+
+    notifier::Notifier<PresentationOrchestratorWindowObserverInterface>::notifyObservers(
+        [window](const std::shared_ptr<PresentationOrchestratorWindowObserverInterface>& observer) {
+            observer->onWindowAdded(window);
+        });
+
+    return true;
+}
+
+void PresentationOrchestratorStateTracker::removeWindow(const std::string& windowId) {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", windowId));
+    m_executor->submit([this, windowId]() { executeRemoveWindow(windowId); });
+}
+
+void PresentationOrchestratorStateTracker::executeRemoveWindow(const std::string& windowId) {
+    auto windowIt = m_windows.find(windowId);
+    if (windowIt == m_windows.end()) {
+        ACSDK_ERROR(LX("removeWindowFailed").d("reason", "Window Id does not exist").d("windowId", windowId));
+        return;
+    }
+
+    m_windows.erase(windowIt);
+
+    // handle the case if window being removed is focused
+    if (windowId == m_focusedWindowAndPresentation.first) {
+        executeUpdateFocusedPresentation(windowIt->second);
+    }
+
+    notifier::Notifier<PresentationOrchestratorWindowObserverInterface>::notifyObservers(
+        [windowId](const std::shared_ptr<PresentationOrchestratorWindowObserverInterface>& observer) {
+            observer->onWindowRemoved(windowId);
+        });
+}
+
+void PresentationOrchestratorStateTracker::updateWindow(const PresentationOrchestratorWindowInstance& window) {
+    ACSDK_DEBUG5(LX(__func__).d("windowId", window.id));
+    m_executor->submit([this, window]() { executeUpdateWindow(window); });
+}
+
+void PresentationOrchestratorStateTracker::executeUpdateWindow(const PresentationOrchestratorWindowInstance& window) {
+    auto windowIt = m_windows.find(window.id);
+    if (windowIt == m_windows.end()) {
+        ACSDK_ERROR(LX("updateWindowFailed").d("reason", "Window Id does not exist").d("windowId", window.id));
+        return;
+    }
+
+    windowIt->second.configuration = window;
+
+    // update focused presentation based on modified window configuration
+    // zOrderIndex update, for example, may change focused window
+    executeUpdateFocusedPresentation(windowIt->second);
+
+    notifier::Notifier<PresentationOrchestratorWindowObserverInterface>::notifyObservers(
+        [window](const std::shared_ptr<PresentationOrchestratorWindowObserverInterface>& observer) {
+            observer->onWindowModified(window);
+        });
+}
+
+void PresentationOrchestratorStateTracker::addWindowObserver(
+    std::weak_ptr<PresentationOrchestratorWindowObserverInterface> observer) {
+    notifier::Notifier<PresentationOrchestratorWindowObserverInterface>::addWeakPtrObserver(observer);
+}
+
+void PresentationOrchestratorStateTracker::removeWindowObserver(
+    std::weak_ptr<PresentationOrchestratorWindowObserverInterface> observer) {
+    notifier::Notifier<PresentationOrchestratorWindowObserverInterface>::removeWeakPtrObserver(observer);
+}
+
+void PresentationOrchestratorStateTracker::addStateObserver(
+    std::weak_ptr<PresentationOrchestratorStateObserverInterface> observer) {
+    notifier::Notifier<PresentationOrchestratorStateObserverInterface>::addWeakPtrObserver(observer);
+}
+
+void PresentationOrchestratorStateTracker::removeStateObserver(
+    std::weak_ptr<PresentationOrchestratorStateObserverInterface> observer) {
+    notifier::Notifier<PresentationOrchestratorStateObserverInterface>::removeWeakPtrObserver(observer);
+}
+
+void PresentationOrchestratorStateTracker::executeNotifyStateObservers(
+    const std::string& windowId,
+    const presentationOrchestratorInterfaces::PresentationMetadata& metadata) {
+    notifier::Notifier<PresentationOrchestratorStateObserverInterface>::notifyObservers(
+        [windowId, metadata](const std::shared_ptr<PresentationOrchestratorStateObserverInterface>& observer) {
+            observer->onStateChanged(windowId, metadata);
+        });
+}
+
+void PresentationOrchestratorStateTracker::executeUpdateFocusedPresentation(const Window& changedWindow) {
+    ACSDK_DEBUG5(LX(__func__).d("changedWindowId", changedWindow.configuration.id));
+    bool shouldUpdateVisualActivityTracker = false;
+    if (m_focusedWindowAndPresentation.first.empty()) {
+        if (changedWindow.presentationStack.empty()) {
+            ACSDK_WARN(LX("updateFocusedPresentationFailed")
+                           .d("reason", "Unexpected state change, expected active presentation"));
+            return;
+        }
+
+        m_focusedWindowAndPresentation.first = changedWindow.configuration.id;
+        m_focusedWindowAndPresentation.second = changedWindow.presentationStack.front();
+        shouldUpdateVisualActivityTracker = true;
+    } else {
+        int focusedZOrder = -1;
+        std::string focusedWindowId;
+        const PresentationMetadata* focusedPresentation = nullptr;
+
+        for (const auto& window : m_windows) {
+            const int candidateZOrder = window.second.configuration.zOrderIndex;
+            if (candidateZOrder >= focusedZOrder && !window.second.presentationStack.empty()) {
+                // In the case where two zOrders are the same the latest request wins
+                const PresentationMetadata* const candidate = &window.second.presentationStack.front();
+                if (!focusedPresentation || candidate->acquiredTime > focusedPresentation->acquiredTime) {
+                    focusedZOrder = candidateZOrder;
+                    focusedWindowId = window.first;
+                    focusedPresentation = candidate;
+                }
+            }
+        }
+
+        if (!focusedPresentation) {
+            if (!m_focusedWindowAndPresentation.first.empty()) {
+                shouldUpdateVisualActivityTracker = true;
+            }
+        } else if (
+            m_focusedWindowAndPresentation.first.empty() ||
+            m_focusedWindowAndPresentation.second.metadata.interfaceName !=
+                focusedPresentation->metadata.interfaceName) {
+            shouldUpdateVisualActivityTracker = true;
+        }
+
+        m_focusedWindowAndPresentation.first = focusedWindowId;
+        if (focusedPresentation) {
+            m_focusedWindowAndPresentation.second = *focusedPresentation;
+        }
+    }
+
+    if (shouldUpdateVisualActivityTracker) {
+        executeUpdateVisualActivityTracker();
+    }
+}
+
+void PresentationOrchestratorStateTracker::executeUpdateVisualActivityTracker() {
+    if (!m_visualActivityTracker) return;
+
+    afml::Channel::State stateUpdate(avsCommon::sdkInterfaces::FocusManagerInterface::VISUAL_CHANNEL_NAME);
+
+    stateUpdate.interfaceName = executeGetFocusedInterface();
+    if (stateUpdate.interfaceName.empty()) {
+        stateUpdate.focusState = avsCommon::avs::FocusState::NONE;
+    } else {
+        stateUpdate.focusState = avsCommon::avs::FocusState::FOREGROUND;
+    }
+
+    m_visualActivityTracker->notifyOfActivityUpdates({stateUpdate});
+}
+
+std::vector<PresentationOrchestratorWindowInfo> PresentationOrchestratorStateTracker::getWindowInformation() {
+    return m_executor
+        ->submit([this]() {
+            std::vector<PresentationOrchestratorWindowInfo> instances;
+
+            for (const auto& window : m_windows) {
+                PresentationOrchestratorWindowInfo info;
+                info.configuration = window.second.configuration;
+                if (!window.second.presentationStack.empty()) {
+                    info.state = window.second.presentationStack.front().metadata;
+                }
+                instances.push_back(info);
+            }
+
+            return instances;
+        })
+        .get();
+}
+
+void PresentationOrchestratorStateTracker::setExecutor(
+    const std::shared_ptr<avsCommon::utils::threading::Executor>& executor) {
+    ACSDK_WARN(LX(__func__).d("reason", "should be called in test only"));
+    m_executor = executor;
+}
+
+void PresentationOrchestratorStateTracker::doShutdown() {
+    m_executor->shutdown();
+}
+
+std::string PresentationOrchestratorStateTracker::executeGetFocusedInterface() {
+    std::string interfaceName;
+    if (!m_focusedWindowAndPresentation.first.empty()) {
+        interfaceName = m_focusedWindowAndPresentation.second.metadata.interfaceName;
+    } else if (!m_deviceInterface.empty()) {
+        interfaceName = m_deviceInterface;
+    }
+    return interfaceName;
+}
+
+std::string PresentationOrchestratorStateTracker::executeGetFocusedWindowId() {
+    std::string windowId;
+    if (!m_focusedWindowAndPresentation.first.empty()) {
+        windowId = m_focusedWindowAndPresentation.first;
+    }
+    return windowId;
+}
+}  // namespace presentationOrchestratorStateTracker
+}  // namespace alexaClientSDK
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/src/PresentationOrchestratorStateTrackerFactory.cpp b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/src/PresentationOrchestratorStateTrackerFactory.cpp
new file mode 100644
index 0000000000..7a46570c56
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/src/PresentationOrchestratorStateTrackerFactory.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/PresentationOrchestratorStateTracker/PresentationOrchestratorStateTrackerFactory.h"
+
+#include "acsdk/PresentationOrchestratorStateTracker/private/PresentationOrchestratorStateTracker.h"
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorStateTracker {
+avsCommon::utils::Optional<PresentationOrchestratorStateTrackerFactory::PresentationOrchestratorStateTrackerExports>
+PresentationOrchestratorStateTrackerFactory::create(
+    const std::shared_ptr<afml::ActivityTrackerInterface>& activityTrackerInterface) {
+    auto poStateTracker = PresentationOrchestratorStateTracker::create(activityTrackerInterface);
+    if (!poStateTracker) {
+        return avsCommon::utils::Optional<PresentationOrchestratorStateTrackerExports>();
+    }
+
+    PresentationOrchestratorStateTrackerExports exports = {poStateTracker, poStateTracker};
+    return exports;
+}
+}  // namespace presentationOrchestratorStateTracker
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/test/CMakeLists.txt b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/test/CMakeLists.txt
new file mode 100644
index 0000000000..c898ff6e56
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/test/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+        "${acsdkPresentationOrchestratorStateTracker_INCLUDE_DIR}"
+        "${acsdkPresentationOrchestratorStateTracker_SOURCE_DIR}/include"
+        "${acsdkPresentationOrchestratorStateTracker_SOURCE_DIR}/privateInclude"
+        "${ASDK_INCLUDE_DIRS}")
+
+discover_unit_tests("${INCLUDE_PATH}" "acsdkPresentationOrchestratorStateTracker")
diff --git a/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/test/PresentationOrchestratorStateTrackerTest.cpp b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/test/PresentationOrchestratorStateTrackerTest.cpp
new file mode 100644
index 0000000000..b9a5fdcf45
--- /dev/null
+++ b/shared/PresentationOrchestrator/PresentationOrchestratorStateTracker/test/PresentationOrchestratorStateTrackerTest.cpp
@@ -0,0 +1,411 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/PresentationOrchestratorStateTracker/private/PresentationOrchestratorStateTracker.h"
+
+#include <functional>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace alexaClientSDK {
+namespace presentationOrchestratorStateTracker {
+
+using namespace ::testing;
+using namespace avsCommon;
+using namespace avs;
+using namespace visualCharacteristicsInterfaces;
+using namespace presentationOrchestratorInterfaces;
+
+static const std::string CLIENT_ID = "clientId";
+static const std::string CLIENT_ID_2 = "clientId2";
+static const std::string WINDOW_ID = "windowId";
+static const std::string WINDOW_ID_2 = "windowId2";
+static const PresentationMetadata EMPTY_METADATA = {"", "", ""};
+static const PresentationMetadata METADATA = {"endpoint", "interface", "metadata"};
+static const PresentationMetadata METADATA_2 = {"endpoint2", "interface2", "metadata2"};
+
+class MockVisualCharacteristics : public VisualCharacteristicsInterface {
+public:
+    MOCK_METHOD0(getVisualCharacteristicsCapabilityConfiguration, void());
+};
+
+class MockVisualActivityTracker : public alexaClientSDK::afml::ActivityTrackerInterface {
+public:
+    MOCK_METHOD1(notifyOfActivityUpdates, void(const std::vector<alexaClientSDK::afml::Channel::State>& channelStates));
+};
+
+class MockStateObserver : public PresentationOrchestratorStateObserverInterface {
+public:
+    MOCK_METHOD2(onStateChanged, void(const std::string& windowId, const PresentationMetadata& metadata));
+};
+
+class MockWindowObserver : public PresentationOrchestratorWindowObserverInterface {
+public:
+    MOCK_METHOD1(onWindowAdded, void(const PresentationOrchestratorWindowInstance& instance));
+    MOCK_METHOD1(onWindowModified, void(const PresentationOrchestratorWindowInstance& instance));
+    MOCK_METHOD1(onWindowRemoved, void(const std::string& windowId));
+};
+
+MATCHER_P(PresentationMetadataEqual, other, "Compares if PresentationMetadata is equal") {
+    return arg.endpoint == other.endpoint && arg.interfaceName == other.interfaceName && arg.metadata == other.metadata;
+}
+
+MATCHER_P2(ActivityUpdateEqual, focusState, interfaceName, "Compares if Activity Update is Equal") {
+    return arg.size() == 1 && arg[0].focusState == focusState && arg[0].interfaceName == interfaceName &&
+           arg[0].name == avsCommon::sdkInterfaces::FocusManagerInterface::VISUAL_CHANNEL_NAME;
+}
+
+/// Test harness for @c PresentationOrchestratorStateTracker class.
+class PresentationOrchestratorStateTrackerTest : public ::testing::Test {
+protected:
+    /// Set up the test harness for running a test.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    static PresentationOrchestratorWindowInstance generateWindow(const std::string& windowId, int zOrder);
+
+    std::shared_ptr<MockVisualActivityTracker> m_visualActivityTracker;
+
+    std::shared_ptr<MockStateObserver> m_stateObserver;
+
+    std::shared_ptr<MockWindowObserver> m_windowObserver;
+
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> m_executor;
+
+    std::shared_ptr<PresentationOrchestratorStateTracker> m_presentationOrchestrator;
+};
+
+void PresentationOrchestratorStateTrackerTest::SetUp() {
+    m_visualActivityTracker = std::make_shared<NiceMock<MockVisualActivityTracker>>();
+    m_stateObserver = std::make_shared<NiceMock<MockStateObserver>>();
+    m_windowObserver = std::make_shared<NiceMock<MockWindowObserver>>();
+    m_executor = std::make_shared<alexaClientSDK::avsCommon::utils::threading::Executor>();
+
+    m_presentationOrchestrator = PresentationOrchestratorStateTracker::create(m_visualActivityTracker);
+
+    m_presentationOrchestrator->setExecutor(m_executor);
+
+    m_presentationOrchestrator->addStateObserver(m_stateObserver);
+    m_presentationOrchestrator->addWindowObserver(m_windowObserver);
+
+    m_executor->waitForSubmittedTasks();
+}
+
+void PresentationOrchestratorStateTrackerTest::TearDown() {
+    m_presentationOrchestrator->shutdown();
+}
+
+PresentationOrchestratorWindowInstance PresentationOrchestratorStateTrackerTest::generateWindow(
+    const std::string& windowId,
+    int zOrder) {
+    PresentationOrchestratorWindowInstance window;
+    window.id = windowId;
+    window.zOrderIndex = zOrder;
+    return window;
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testCreate) {
+    EXPECT_TRUE(PresentationOrchestratorStateTracker::create(m_visualActivityTracker) != nullptr);
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testAddRemoveStateObserver) {
+    auto stateObserver = std::make_shared<NiceMock<MockStateObserver>>();
+    m_presentationOrchestrator->addStateObserver(stateObserver);
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    EXPECT_CALL(*m_stateObserver, onStateChanged(_, _)).Times(2);
+    EXPECT_CALL(*stateObserver, onStateChanged(_, _)).Times(1);
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID, {});
+    m_executor->waitForSubmittedTasks();
+    m_presentationOrchestrator->removeStateObserver(stateObserver);
+    m_presentationOrchestrator->releaseWindow(CLIENT_ID, WINDOW_ID);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testAddRemoveWindowObserver) {
+    auto windowObserver = std::make_shared<NiceMock<MockWindowObserver>>();
+    EXPECT_CALL(*m_windowObserver, onWindowAdded(_)).Times(2);
+    EXPECT_CALL(*windowObserver, onWindowAdded(_)).Times(1);
+    m_presentationOrchestrator->addWindowObserver(windowObserver);
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    m_executor->waitForSubmittedTasks();
+    m_presentationOrchestrator->removeWindowObserver(windowObserver);
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID_2, 0));
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testAddWindow) {
+    EXPECT_CALL(*m_windowObserver, onWindowAdded(_))
+        .Times(1)
+        .WillOnce(Invoke([](PresentationOrchestratorWindowInstance instance) {
+            EXPECT_TRUE(instance.id == WINDOW_ID);
+            EXPECT_TRUE(instance.zOrderIndex == 0);
+        }));
+    EXPECT_TRUE(m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0)));
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testAddDuplicateWindow) {
+    EXPECT_CALL(*m_windowObserver, onWindowAdded(_))
+        .Times(1)
+        .WillOnce(Invoke([](PresentationOrchestratorWindowInstance instance) {
+            EXPECT_TRUE(instance.id == WINDOW_ID);
+            EXPECT_TRUE(instance.zOrderIndex == 0);
+        }));
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    EXPECT_FALSE(m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 1)));
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testRemoveWindow) {
+    EXPECT_CALL(*m_windowObserver, onWindowRemoved(WINDOW_ID)).Times(1);
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    m_presentationOrchestrator->removeWindow(WINDOW_ID);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testUpdateWindow) {
+    auto modifiedWindow = generateWindow(WINDOW_ID, 1);
+    EXPECT_CALL(*m_windowObserver, onWindowModified(_))
+        .Times(1)
+        .WillOnce(Invoke([](PresentationOrchestratorWindowInstance instance) {
+            EXPECT_TRUE(instance.id == WINDOW_ID);
+            EXPECT_TRUE(instance.zOrderIndex == 1);
+        }));
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    m_presentationOrchestrator->updateWindow(modifiedWindow);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testAcquireSingleWindow) {
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(METADATA))).Times(1);
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID, METADATA);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testReleaseSingleWindow) {
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(METADATA))).Times(1);
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID, METADATA);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(EMPTY_METADATA))).Times(1);
+    m_presentationOrchestrator->releaseWindow(CLIENT_ID, WINDOW_ID);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testReleaseWindowTwice) {
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(METADATA))).Times(1);
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID, METADATA);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(EMPTY_METADATA))).Times(1);
+    m_presentationOrchestrator->releaseWindow(CLIENT_ID, WINDOW_ID);
+    m_presentationOrchestrator->releaseWindow(CLIENT_ID, WINDOW_ID);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testAcquireMultiWindow) {
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID_2, 1));
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(METADATA))).Times(1);
+    EXPECT_CALL(
+        *m_visualActivityTracker,
+        notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, METADATA.interfaceName)))
+        .Times(1);
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID, METADATA);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID_2, PresentationMetadataEqual(METADATA_2))).Times(1);
+    EXPECT_CALL(
+        *m_visualActivityTracker,
+        notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, METADATA_2.interfaceName)))
+        .Times(1);
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID_2, METADATA_2);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testAcquireReverseZorderMultiWindow) {
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID_2, 1));
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID_2, PresentationMetadataEqual(METADATA_2))).Times(1);
+    EXPECT_CALL(
+        *m_visualActivityTracker,
+        notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, METADATA_2.interfaceName)))
+        .Times(1);
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID_2, METADATA_2);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(METADATA))).Times(1);
+    // Not expecting the second visual activity tracker update as window 2 is above window 1
+    EXPECT_CALL(*m_visualActivityTracker, notifyOfActivityUpdates(_)).Times(0);
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID, METADATA);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testReleaseMultiWindow) {
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID_2, 1));
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID, METADATA);
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID_2, METADATA_2);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID_2, PresentationMetadataEqual(EMPTY_METADATA))).Times(1);
+    EXPECT_CALL(
+        *m_visualActivityTracker,
+        notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, METADATA.interfaceName)))
+        .Times(1);
+    m_presentationOrchestrator->releaseWindow(CLIENT_ID, WINDOW_ID_2);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(EMPTY_METADATA))).Times(1);
+    EXPECT_CALL(*m_visualActivityTracker, notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::NONE, ""))).Times(1);
+    m_presentationOrchestrator->releaseWindow(CLIENT_ID, WINDOW_ID);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testMultiWindowSameZorder) {
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID_2, 0));
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(METADATA))).Times(1);
+    EXPECT_CALL(
+        *m_visualActivityTracker,
+        notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, METADATA.interfaceName)))
+        .Times(1);
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID, METADATA);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID_2, PresentationMetadataEqual(METADATA_2))).Times(1);
+    EXPECT_CALL(
+        *m_visualActivityTracker,
+        notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, METADATA_2.interfaceName)))
+        .Times(1);
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID_2, METADATA_2);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(EMPTY_METADATA))).Times(1);
+    EXPECT_CALL(*m_visualActivityTracker, notifyOfActivityUpdates(_)).Times(0);
+    m_presentationOrchestrator->releaseWindow(CLIENT_ID, WINDOW_ID);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID_2, PresentationMetadataEqual(EMPTY_METADATA))).Times(1);
+    EXPECT_CALL(*m_visualActivityTracker, notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::NONE, ""))).Times(1);
+    m_presentationOrchestrator->releaseWindow(CLIENT_ID, WINDOW_ID_2);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testReacquireWindow) {
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(METADATA))).Times(1);
+    EXPECT_CALL(
+        *m_visualActivityTracker,
+        notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, METADATA.interfaceName)))
+        .Times(1);
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID, METADATA);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(METADATA_2))).Times(1);
+    EXPECT_CALL(
+        *m_visualActivityTracker,
+        notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, METADATA_2.interfaceName)))
+        .Times(1);
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID_2, WINDOW_ID, METADATA_2);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(METADATA))).Times(1);
+    EXPECT_CALL(
+        *m_visualActivityTracker,
+        notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, METADATA.interfaceName)))
+        .Times(1);
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID, METADATA);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_stateObserver, onStateChanged(WINDOW_ID, PresentationMetadataEqual(METADATA_2))).Times(1);
+    EXPECT_CALL(
+        *m_visualActivityTracker,
+        notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, METADATA_2.interfaceName)))
+        .Times(1);
+    m_presentationOrchestrator->releaseWindow(CLIENT_ID, WINDOW_ID);
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testSetReleaseDeviceInterface) {
+    EXPECT_CALL(
+        *m_visualActivityTracker, notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, "DEVICE")))
+        .Times(1);
+    m_presentationOrchestrator->setDeviceInterface("DEVICE");
+    EXPECT_CALL(*m_visualActivityTracker, notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::NONE, ""))).Times(1);
+    m_presentationOrchestrator->releaseDeviceInterface();
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testDeviceInterfaceWithWindows) {
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+
+    EXPECT_CALL(
+        *m_visualActivityTracker,
+        notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, METADATA.interfaceName)))
+        .Times(1);
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID, METADATA);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_visualActivityTracker, notifyOfActivityUpdates(_)).Times(0);
+    m_presentationOrchestrator->setDeviceInterface("DEVICE");
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(
+        *m_visualActivityTracker, notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::FOREGROUND, "DEVICE")))
+        .Times(1);
+    m_presentationOrchestrator->releaseWindow(CLIENT_ID, WINDOW_ID);
+    m_executor->waitForSubmittedTasks();
+
+    EXPECT_CALL(*m_visualActivityTracker, notifyOfActivityUpdates(ActivityUpdateEqual(FocusState::NONE, "")));
+    m_presentationOrchestrator->releaseDeviceInterface();
+    m_executor->waitForSubmittedTasks();
+}
+
+TEST_F(PresentationOrchestratorStateTrackerTest, testGetWindowInfo) {
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID, 0));
+    m_presentationOrchestrator->addWindow(generateWindow(WINDOW_ID_2, 1));
+    m_presentationOrchestrator->acquireWindow(CLIENT_ID, WINDOW_ID, METADATA);
+    auto info = m_presentationOrchestrator->getWindowInformation();
+    EXPECT_TRUE(info.size() == 2);
+    if (info[0].configuration.id == WINDOW_ID) {
+        EXPECT_TRUE(info[0].configuration.zOrderIndex == 0);
+        EXPECT_TRUE(info[0].state.interfaceName == METADATA.interfaceName);
+        EXPECT_TRUE(info[0].state.metadata == METADATA.metadata);
+        EXPECT_TRUE(info[1].configuration.id == WINDOW_ID_2);
+        EXPECT_TRUE(info[1].configuration.zOrderIndex == 1);
+        EXPECT_TRUE(info[1].state.interfaceName.empty());
+        EXPECT_TRUE(info[1].state.metadata.empty());
+    } else {
+        EXPECT_TRUE(info[1].configuration.id == WINDOW_ID);
+        EXPECT_TRUE(info[1].configuration.zOrderIndex == 0);
+        EXPECT_TRUE(info[1].state.interfaceName == METADATA.interfaceName);
+        EXPECT_TRUE(info[1].state.metadata == METADATA.metadata);
+        EXPECT_TRUE(info[0].configuration.id == WINDOW_ID_2);
+        EXPECT_TRUE(info[0].configuration.zOrderIndex == 1);
+        EXPECT_TRUE(info[0].state.interfaceName.empty());
+        EXPECT_TRUE(info[0].state.metadata.empty());
+    }
+}
+
+}  // namespace presentationOrchestratorStateTracker
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/VisualTimeoutManager/CMakeLists.txt b/shared/PresentationOrchestrator/VisualTimeoutManager/CMakeLists.txt
new file mode 100644
index 0000000000..57ac323284
--- /dev/null
+++ b/shared/PresentationOrchestrator/VisualTimeoutManager/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkVisualTimeoutManager LANGUAGES CXX)
+
+add_subdirectory("src")
+add_subdirectory("test")
diff --git a/shared/PresentationOrchestrator/VisualTimeoutManager/include/acsdk/VisualTimeoutManager/VisualTimeoutManagerFactory.h b/shared/PresentationOrchestrator/VisualTimeoutManager/include/acsdk/VisualTimeoutManager/VisualTimeoutManagerFactory.h
new file mode 100644
index 0000000000..4e493af70c
--- /dev/null
+++ b/shared/PresentationOrchestrator/VisualTimeoutManager/include/acsdk/VisualTimeoutManager/VisualTimeoutManagerFactory.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_VISUALTIMEOUTMANAGER_INCLUDE_ACSDK_VISUALTIMEOUTMANAGER_VISUALTIMEOUTMANAGERFACTORY_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_VISUALTIMEOUTMANAGER_INCLUDE_ACSDK_VISUALTIMEOUTMANAGER_VISUALTIMEOUTMANAGERFACTORY_H_
+
+#include <memory>
+
+#include <acsdk/PresentationOrchestratorInterfaces/VisualTimeoutManagerInterface.h>
+#include <AVSCommon/Utils/Optional.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+namespace alexaClientSDK {
+namespace visualTimeoutManager {
+
+/**
+ * Class which creates instances of the @c VisualTimeoutManager
+ */
+class VisualTimeoutManagerFactory {
+public:
+    /**
+     * Struct containing interfaces exposed by the @c VisualTimeoutManager
+     */
+    struct VisualTimeoutManagerExports {
+        /// Instance of the @c VisualTimeoutManagerInterface exposed by the VisualTimeoutManager
+        std::shared_ptr<presentationOrchestratorInterfaces::VisualTimeoutManagerInterface>
+            visualTimeoutManagerInterface;
+
+        /// Instance of @c RequiresShutdown used for cleaning up during shutdown.
+        std::shared_ptr<avsCommon::utils::RequiresShutdown> requiresShutdown;
+    };
+
+    /**
+     * Creates an instance of the VisualTimeoutManager
+     * @return Optional containing the interfaces exported by the VisualTimeoutManager, or empty if creation
+     * failed
+     */
+    static avsCommon::utils::Optional<VisualTimeoutManagerExports> create();
+};
+
+}  // namespace visualTimeoutManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_VISUALTIMEOUTMANAGER_INCLUDE_ACSDK_VISUALTIMEOUTMANAGER_VISUALTIMEOUTMANAGERFACTORY_H_
diff --git a/shared/PresentationOrchestrator/VisualTimeoutManager/privateInclude/acsdk/VisualTimeoutManager/private/VisualTimeoutManager.h b/shared/PresentationOrchestrator/VisualTimeoutManager/privateInclude/acsdk/VisualTimeoutManager/private/VisualTimeoutManager.h
new file mode 100644
index 0000000000..f40691fb17
--- /dev/null
+++ b/shared/PresentationOrchestrator/VisualTimeoutManager/privateInclude/acsdk/VisualTimeoutManager/private/VisualTimeoutManager.h
@@ -0,0 +1,242 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_VISUALTIMEOUTMANAGER_PRIVATEINCLUDE_ACSDK_VISUALTIMEOUTMANAGER_PRIVATE_VISUALTIMEOUTMANAGER_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_VISUALTIMEOUTMANAGER_PRIVATEINCLUDE_ACSDK_VISUALTIMEOUTMANAGER_PRIVATE_VISUALTIMEOUTMANAGER_H_
+
+#include <chrono>
+#include <memory>
+#include <string>
+#include <ostream>
+#include <unordered_set>
+
+#include <acsdk/PresentationOrchestratorInterfaces/VisualTimeoutManagerInterface.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/Threading/Executor.h>
+#include <AVSCommon/Utils/Timing/Timer.h>
+
+namespace alexaClientSDK {
+namespace visualTimeoutManager {
+
+/**
+ * Class which manages timeouts for visual experiences, tracks dialog and GUI events to reset timeout appropriately
+ */
+class VisualTimeoutManager
+        : public alexaClientSDK::avsCommon::utils::RequiresShutdown
+        , public presentationOrchestratorInterfaces::VisualTimeoutManagerInterface {
+public:
+    /**
+     * Creates an instance of @c VisualTimeoutManager.
+     *
+     * @param timerDelegateFactory The optional TimerDelegateFactoryInterface object used to initialize timer for
+     * testing.
+     */
+    static std::shared_ptr<VisualTimeoutManager> create(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::timing::TimerDelegateFactoryInterface>
+            timerDelegateFactory = nullptr);
+
+    /// @c VisualTimeoutManagerInterface functions
+    /// @{
+    VisualTimeoutId requestTimeout(std::chrono::milliseconds delay, VisualTimeoutCallback timeoutCallback) override;
+    bool stopTimeout(VisualTimeoutId timeoutId) override;
+    /// @}
+
+    /// @name DialogUXStateObserverInterface Functions
+    /// @{
+    void onDialogUXStateChanged(
+        alexaClientSDK::avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState newState) override;
+    /// @}
+
+    /// @name ActivityEventObserverInterface Functions
+    /// @{
+    void onGUIActivityEventReceived(
+        const std::string& source,
+        const avsCommon::sdkInterfaces::GUIActivityEvent& activityEvent) override;
+    /// @}
+
+    // @name RequiresShutdown Functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+    /**
+     * Set the executor used as the worker thread
+     * @param executor The @c Executor to set
+     * @note This function should only be used for testing purposes. No call to any other method should
+     * be done prior to this call.
+     */
+    void setExecutor(const std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor>& executor);
+
+private:
+    /**
+     * Enum to track the (internal) state of the VisualTimeout
+     */
+    enum class VisualTimeoutState {
+        /**
+         * Represents internal timer has started and timeout is active.
+         */
+        ACTIVE,
+
+        /**
+         * Timeout finished executing the callback.
+         */
+        FINISHED,
+
+        /**
+         * Initial state before a timeout is set to active.
+         */
+        INIT,
+
+        /**
+         * Timeout is stopped via call to StopTimeout API.
+         * Timeout cannot be activated again from this state.
+         * A new request is expected to replace the timeout.
+         */
+        STOPPED,
+
+        /**
+         * Timeout suspended due to change in device state.
+         * Same timeout can be activated again from this state.
+         */
+        SUSPENDED
+    };
+
+    /**
+     * Converts @c VisualTimeoutState to string
+     * @param @c VisualTimeoutState value
+     * @return string representation
+     */
+    static const std::string visualTimeoutStateToString(const VisualTimeoutState& state) {
+        switch (state) {
+            case VisualTimeoutState::ACTIVE:
+                return "ACTIVE";
+            case VisualTimeoutState::FINISHED:
+                return "FINISHED";
+            case VisualTimeoutState::INIT:
+                return "INIT";
+            case VisualTimeoutState::STOPPED:
+                return "STOPPED";
+            case VisualTimeoutState::SUSPENDED:
+                return "SUSPENDED";
+        }
+
+        return std::string();
+    }
+
+    /**
+     * Write a @c VisualTimeoutState value to an @c ostream as a string.     *
+     * @param An ostream to send the @c VisualTimeoutState as a string.
+     * @param The @c VisualTimeoutState to convert.
+     * @return The stream.
+     */
+    friend std::ostream& operator<<(std::ostream& stream, const VisualTimeoutState& state);
+
+    /**
+     * Struct to group attributes for VisualTimeout
+     */
+    struct VisualTimeoutAttributes {
+        std::chrono::milliseconds delay;
+        VisualTimeoutCallback timeoutCallback;
+        VisualTimeoutId timeoutId;
+        VisualTimeoutState state;
+
+        VisualTimeoutAttributes() :
+                timeoutId{std::numeric_limits<VisualTimeoutId>::max()},
+                state(VisualTimeoutState::INIT) {
+        }
+
+        VisualTimeoutAttributes(
+            std::chrono::milliseconds delay,
+            VisualTimeoutCallback timeoutCallback,
+            VisualTimeoutId timeoutId) :
+                delay{std::move(delay)},
+                timeoutCallback{std::move(timeoutCallback)},
+                timeoutId{timeoutId},
+                state{VisualTimeoutState::INIT} {};
+    };
+
+    /**
+     * Constructor.
+     *
+     * @param timerDelegateFactory The optional TimerDelegateFactoryInterface object used to initialize timer for
+     * testing.
+     */
+    VisualTimeoutManager(
+        std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::timing::TimerDelegateFactoryInterface>
+            timerDelegateFactory = nullptr);
+
+    /**
+     * Internal function for starting the timer
+     */
+    void executeStartTimer();
+
+    /**
+     * Internal function to stop the timer
+     * @param timeoutId Id corresponding to the timeout, returned by requestTimeout
+     * @return true if the timer was stopped, false if this timer was not active
+     */
+    bool executeStopTimer(VisualTimeoutId timeoutId);
+
+    /**
+     * Internal function to handle the change in DialogUXState
+     * @param newState new @c DialogUXState
+     */
+    void executeOnDialogUXStateChanged(
+        alexaClientSDK::avsCommon::sdkInterfaces::DialogUXStateObserverInterface::DialogUXState newState);
+
+    /**
+     * Internal function to act on @c ActivityEvent
+     * @param source The source of the activity event.
+     * @param activityEvent The activity event.
+     */
+    void executeOnGUIActivityEventReceived(
+        const std::string& source,
+        const avsCommon::sdkInterfaces::GUIActivityEvent& activityEvent);
+
+    /**
+     * Internal function to set the state in current timeout attributes
+     * @param newState @c VisualTimeoutState to be set
+     */
+    void executeSetState(const VisualTimeoutState& newState);
+
+    /**
+     * Internal function to execute the callback associated with current timeout
+     */
+    void executeCallback();
+
+    /// Timeout attributes specified in current request
+    VisualTimeoutAttributes m_currentTimeoutAttributes;
+
+    /// Internal timer responsible for submitting callbacks to the worker thread
+    alexaClientSDK::avsCommon::utils::timing::Timer m_timer;
+
+    /// Worker thread for the @c VisualTimeoutManager
+    std::shared_ptr<alexaClientSDK::avsCommon::utils::threading::Executor> m_executor;
+
+    /// The current state of DialogUX. Should only be used in worker thread
+    DialogUXState m_dialogUxState;
+
+    /// Set of sources which are currently reporting activity. Should only be used in worker thread
+    std::unordered_set<std::string> m_activeSources;
+
+    /**
+     * A counter used to increment the timeout id when a new timeout is requested.
+     * Incrementing should be atomic operation and variable must be used only in worker thread.
+     */
+    VisualTimeoutId m_timeoutIdCounter;
+};
+}  // namespace visualTimeoutManager
+}  // namespace alexaClientSDK
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_VISUALTIMEOUTMANAGER_PRIVATEINCLUDE_ACSDK_VISUALTIMEOUTMANAGER_PRIVATE_VISUALTIMEOUTMANAGER_H_
diff --git a/shared/PresentationOrchestrator/VisualTimeoutManager/src/CMakeLists.txt b/shared/PresentationOrchestrator/VisualTimeoutManager/src/CMakeLists.txt
new file mode 100644
index 0000000000..1407f8f968
--- /dev/null
+++ b/shared/PresentationOrchestrator/VisualTimeoutManager/src/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_definitions("-DACSDK_LOG_MODULE=visualTimeoutManager")
+
+add_library(acsdkVisualTimeoutManager SHARED
+        "${CMAKE_CURRENT_LIST_DIR}/VisualTimeoutManagerFactory.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/VisualTimeoutManager.cpp")
+
+target_include_directories(acsdkVisualTimeoutManager
+        PUBLIC "${acsdkVisualTimeoutManager_SOURCE_DIR}/include"
+        "${ASDK_INCLUDE_DIRS}")
+
+target_include_directories(acsdkVisualTimeoutManager
+        PRIVATE "${acsdkVisualTimeoutManager_SOURCE_DIR}/privateInclude")
+
+target_link_libraries(acsdkVisualTimeoutManager "${ASDK_LDFLAGS}" AVSCommon acsdkPresentationOrchestratorInterfaces)
+
+# install target
+asdk_install()
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/VisualTimeoutManager/src/VisualTimeoutManager.cpp b/shared/PresentationOrchestrator/VisualTimeoutManager/src/VisualTimeoutManager.cpp
new file mode 100644
index 0000000000..0a071bf29f
--- /dev/null
+++ b/shared/PresentationOrchestrator/VisualTimeoutManager/src/VisualTimeoutManager.cpp
@@ -0,0 +1,218 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/VisualTimeoutManager/private/VisualTimeoutManager.h"
+
+#include <AVSCommon/Utils/Logger/Logger.h>
+
+namespace alexaClientSDK {
+namespace visualTimeoutManager {
+
+using namespace alexaClientSDK::avsCommon::sdkInterfaces;
+using namespace alexaClientSDK::avsCommon::utils;
+using namespace presentationOrchestratorInterfaces;
+using namespace std::chrono;
+
+/// String to identify log entries originating from this file.
+#define TAG "VisualTimeoutManager"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param The event string for this @c LogEntry.
+ */
+#define LX(event) logger::LogEntry(TAG, event)
+
+std::shared_ptr<VisualTimeoutManager> VisualTimeoutManager::create(
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::timing::TimerDelegateFactoryInterface>
+        timerDelegateFactory) {
+    auto visualTimeoutManager = std::shared_ptr<VisualTimeoutManager>(new VisualTimeoutManager(timerDelegateFactory));
+
+    return visualTimeoutManager;
+}
+
+VisualTimeoutManager::VisualTimeoutManager(
+    std::shared_ptr<alexaClientSDK::avsCommon::sdkInterfaces::timing::TimerDelegateFactoryInterface>
+        timerDelegateFactory) :
+        RequiresShutdown{TAG},
+        m_timer{timerDelegateFactory},
+        m_dialogUxState{DialogUXState::IDLE},
+        m_timeoutIdCounter{0} {
+    m_executor = std::make_shared<threading::Executor>();
+}
+
+VisualTimeoutManagerInterface::VisualTimeoutId VisualTimeoutManager::requestTimeout(
+    milliseconds delay,
+    VisualTimeoutManagerInterface::VisualTimeoutCallback timeoutCallback) {
+    ACSDK_DEBUG5(LX(__func__).d("timeoutMs", delay.count()));
+    return m_executor
+        ->submit([this, delay, timeoutCallback] {
+            // stop previous active timer
+            if (m_timer.isActive()) {
+                ACSDK_DEBUG9(LX("requestTimeout").d("reason", "stopping previous timer"));
+                m_timer.stop();
+            }
+            // reset any sources tracking activity
+            m_activeSources.clear();
+
+            m_currentTimeoutAttributes = VisualTimeoutAttributes(delay, timeoutCallback, m_timeoutIdCounter++);
+
+            executeStartTimer();
+            return m_currentTimeoutAttributes.timeoutId;
+        })
+        .get();
+}
+
+bool VisualTimeoutManager::stopTimeout(VisualTimeoutManagerInterface::VisualTimeoutId timeoutId) {
+    ACSDK_DEBUG5(LX(__func__));
+    return m_executor->submit([this, timeoutId]() { return executeStopTimer(timeoutId); }).get();
+}
+
+void VisualTimeoutManager::onDialogUXStateChanged(DialogUXStateObserverInterface::DialogUXState newState) {
+    ACSDK_DEBUG5(LX(__func__));
+    m_executor->submit([this, newState]() { executeOnDialogUXStateChanged(newState); });
+}
+
+void VisualTimeoutManager::onGUIActivityEventReceived(
+    const std::string& source,
+    const GUIActivityEvent& activityEvent) {
+    ACSDK_DEBUG5(LX(__func__));
+    if (source.empty()) {
+        ACSDK_ERROR(LX("onActivityEventReceivedFailed").d("reason", "event source is empty"));
+        return;
+    }
+
+    m_executor->submit([this, source, activityEvent]() { executeOnGUIActivityEventReceived(source, activityEvent); });
+}
+
+void VisualTimeoutManager::doShutdown() {
+    m_timer.stop();
+    m_executor->shutdown();
+}
+
+void VisualTimeoutManager::setExecutor(const std::shared_ptr<threading::Executor>& executor) {
+    ACSDK_WARN(LX(__func__).d("reason", "should only be called in tests"));
+    m_executor = executor;
+}
+
+void VisualTimeoutManager::executeStartTimer() {
+    ACSDK_DEBUG5(LX("executeStartTimer").d("timeoutMs", m_currentTimeoutAttributes.delay.count()));
+
+    if (DialogUXStateObserverInterface::DialogUXState::IDLE == m_dialogUxState && m_activeSources.empty()) {
+        m_timer.start(m_currentTimeoutAttributes.delay, [this] { m_executor->submit([this] { executeCallback(); }); });
+        executeSetState(VisualTimeoutState::ACTIVE);
+    } else {
+        executeSetState(VisualTimeoutState::SUSPENDED);
+    }
+}
+
+bool VisualTimeoutManager::executeStopTimer(VisualTimeoutManagerInterface::VisualTimeoutId timeoutId) {
+    ACSDK_DEBUG5(LX("executeStopTimer"));
+    if (timeoutId != m_currentTimeoutAttributes.timeoutId) {
+        ACSDK_DEBUG9(
+            LX("executeStopTimer").d("timeoutId", timeoutId).d("reason", "timeout Id does not match active timer"));
+        return false;
+    }
+
+    if (m_timer.isActive()) {
+        m_timer.stop();
+    }
+
+    executeSetState(VisualTimeoutState::STOPPED);
+    return true;
+}
+
+void VisualTimeoutManager::executeOnDialogUXStateChanged(DialogUXStateObserverInterface::DialogUXState newState) {
+    ACSDK_DEBUG5(LX("executeOnDialogUXStateChanged"));
+    m_dialogUxState = newState;
+
+    if (DialogUXStateObserverInterface::DialogUXState::IDLE == newState && m_activeSources.empty()) {
+        if (m_currentTimeoutAttributes.state == VisualTimeoutState::SUSPENDED) {
+            ACSDK_DEBUG9(
+                LX(__func__).d("timeoutId", m_currentTimeoutAttributes.timeoutId).d("reason", "restarting timer"));
+            executeStartTimer();
+        }
+        return;
+    }
+
+    if (m_timer.isActive()) {
+        ACSDK_DEBUG9(LX(__func__).d("timeoutId", m_currentTimeoutAttributes.timeoutId).d("reason", "suspending timer"));
+        m_timer.stop();
+        executeSetState(VisualTimeoutState::SUSPENDED);
+    }
+}
+
+void VisualTimeoutManager::executeCallback() {
+    ACSDK_DEBUG5(LX("executeCallback"));
+
+    // ensure that the timeout is still active
+    if (m_currentTimeoutAttributes.state != VisualTimeoutState::ACTIVE) {
+        ACSDK_DEBUG9(LX("executeCallback")
+                         .d("currentState", m_currentTimeoutAttributes.state)
+                         .d("reason", "callback not executed as timeout is no longer active"));
+        return;
+    }
+
+    m_currentTimeoutAttributes.timeoutCallback();
+    executeSetState(VisualTimeoutState::FINISHED);
+}
+
+void VisualTimeoutManager::executeOnGUIActivityEventReceived(
+    const std::string& source,
+    const GUIActivityEvent& activityEvent) {
+    ACSDK_DEBUG5(LX(__func__).d("source", source).d("event", activityEvent));
+
+    switch (activityEvent) {
+        case GUIActivityEvent::ACTIVATED:
+            if (m_timer.isActive()) {
+                ACSDK_DEBUG9(
+                    LX(__func__).d("timeoutId", m_currentTimeoutAttributes.timeoutId).d("reason", "suspending timer"));
+                m_timer.stop();
+                executeSetState(VisualTimeoutState::SUSPENDED);
+            }
+            m_activeSources.insert(source);
+            break;
+
+        case GUIActivityEvent::DEACTIVATED:
+            m_activeSources.erase(source);
+            // fall through; no break
+        case GUIActivityEvent::INTERRUPT:
+            if (DialogUXState::IDLE == m_dialogUxState && m_activeSources.empty()) {
+                if (m_currentTimeoutAttributes.state == VisualTimeoutState::SUSPENDED) {
+                    ACSDK_DEBUG9(LX(__func__)
+                                     .d("timeoutId", m_currentTimeoutAttributes.timeoutId)
+                                     .d("reason", "restarting timer"));
+                    executeStartTimer();
+                }
+            }
+            break;
+
+        case GUIActivityEvent::UNKNOWN:
+            ACSDK_WARN(LX(__func__).d("event", activityEvent));
+            break;
+    }
+}
+
+void VisualTimeoutManager::executeSetState(const VisualTimeoutState& newState) {
+    ACSDK_DEBUG9(LX("executeSetState").d("newState", newState));
+    m_currentTimeoutAttributes.state = newState;
+}
+
+std::ostream& operator<<(std::ostream& stream, const VisualTimeoutManager::VisualTimeoutState& state) {
+    return stream << VisualTimeoutManager::visualTimeoutStateToString(state);
+}
+
+}  // namespace visualTimeoutManager
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/VisualTimeoutManager/src/VisualTimeoutManagerFactory.cpp b/shared/PresentationOrchestrator/VisualTimeoutManager/src/VisualTimeoutManagerFactory.cpp
new file mode 100644
index 0000000000..261a0b6037
--- /dev/null
+++ b/shared/PresentationOrchestrator/VisualTimeoutManager/src/VisualTimeoutManagerFactory.cpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/VisualTimeoutManager/VisualTimeoutManagerFactory.h"
+
+#include "acsdk/VisualTimeoutManager/private/VisualTimeoutManager.h"
+
+namespace alexaClientSDK {
+namespace visualTimeoutManager {
+avsCommon::utils::Optional<VisualTimeoutManagerFactory::VisualTimeoutManagerExports> VisualTimeoutManagerFactory::
+    create() {
+    auto visualTimeoutManager = VisualTimeoutManager::create();
+    if (!visualTimeoutManager) {
+        return avsCommon::utils::Optional<VisualTimeoutManagerExports>();
+    }
+
+    VisualTimeoutManagerExports exports = {visualTimeoutManager, visualTimeoutManager};
+    return exports;
+}
+}  // namespace visualTimeoutManager
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/VisualTimeoutManager/test/CMakeLists.txt b/shared/PresentationOrchestrator/VisualTimeoutManager/test/CMakeLists.txt
new file mode 100644
index 0000000000..798b022047
--- /dev/null
+++ b/shared/PresentationOrchestrator/VisualTimeoutManager/test/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(INCLUDE_PATH
+        "${acsdkVisualTimeoutManager_INCLUDE_DIR}"
+        "${acsdkVisualTimeoutManager_SOURCE_DIR}/include"
+        "${acsdkVisualTimeoutManager_SOURCE_DIR}/privateInclude"
+        "${ASDK_INCLUDE_DIRS}")
+
+discover_unit_tests("${INCLUDE_PATH}" "acsdkVisualTimeoutManager")
diff --git a/shared/PresentationOrchestrator/VisualTimeoutManager/test/MockTimerFactory.h b/shared/PresentationOrchestrator/VisualTimeoutManager/test/MockTimerFactory.h
new file mode 100644
index 0000000000..f4073f8ab0
--- /dev/null
+++ b/shared/PresentationOrchestrator/VisualTimeoutManager/test/MockTimerFactory.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_VISUALTIMEOUTMANAGER_TEST_MOCKTIMERFACTORY_H_
+#define ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_VISUALTIMEOUTMANAGER_TEST_MOCKTIMERFACTORY_H_
+
+#include <chrono>
+#include <functional>
+
+#include <AVSCommon/SDKInterfaces/Timing/TimerDelegateFactoryInterface.h>
+#include <AVSCommon/SDKInterfaces/Timing/TimerDelegateInterface.h>
+
+namespace alexaClientSDK {
+namespace visualTimeoutManager {
+namespace test {
+
+/**
+ * A basic timer that enables jumping forward to prevent real-time waiting
+ * This timer does not support periodic delays
+ */
+class WarpTimer : public alexaClientSDK::avsCommon::sdkInterfaces::timing::TimerDelegateInterface {
+public:
+    /// @name TimerDelegateInterface Functions
+    /// @{
+    void start(
+        std::chrono::nanoseconds delay,
+        std::chrono::nanoseconds period,
+        PeriodType periodType,
+        size_t maxCount,
+        std::function<void()> task) override {
+        m_task = task;
+        m_delay = delay;
+    }
+    void stop() override {
+        m_active = false;
+    }
+    bool activate() override {
+        assert(!m_active);
+        m_active = true;
+        return m_active;
+    }
+    bool isActive() const override {
+        return m_active;
+    }
+    /// @}
+
+    /**
+     * Simulate time moving forward by the given period, if step is greater than the configured delay the timer will be
+     * fired. Step time is absolute, time is not added to any previous calls to this function.
+     * @param step Time period to step forward.
+     * @return True if task was dispatched
+     */
+    bool warpForward(std::chrono::nanoseconds step) {
+        bool dispatched = (step >= m_delay);
+        if (dispatched) {
+            m_task();
+        }
+
+        return dispatched;
+    }
+
+    /**
+     * Get the delay which has been configured for this timer.
+     *
+     * @return The delay period
+     */
+    std::chrono::nanoseconds getDelay() {
+        return m_delay;
+    }
+
+protected:
+    std::function<void()> m_task;
+    std::chrono::nanoseconds m_delay;
+    bool m_active{false};
+};
+
+/**
+ * MockTimerFactory to return a single instance of WarpTimer
+ */
+class MockTimerFactory : public alexaClientSDK::avsCommon::sdkInterfaces::timing::TimerDelegateFactoryInterface {
+public:
+    /// @name TimerDelegateFactoryInterface Functions
+    /// @{
+    bool supportsLowPowerMode() override {
+        return true;
+    }
+    std::unique_ptr<alexaClientSDK::avsCommon::sdkInterfaces::timing::TimerDelegateInterface> getTimerDelegate()
+        override {
+        if (m_timer) {
+            assert(false);  // does not support multiple instances
+        }
+        m_timer = new WarpTimer();
+        std::unique_ptr<alexaClientSDK::avsCommon::sdkInterfaces::timing::TimerDelegateInterface> ptr{m_timer};
+
+        return ptr;
+    }
+    /// @}
+
+    /**
+     * Gets the timer which was created by the last call to @c getTimerDelegate()
+     * @note This function must be used with great care, the lifetime of the timer is controlled by the unique_ptr
+     * which was returned by @c getTimerDelegate()
+     *
+     * @returns pointer to the timer instance
+     */
+    WarpTimer* getTimer() {
+        return m_timer;
+    }
+
+protected:
+    WarpTimer* m_timer{nullptr};
+};
+
+}  // namespace test
+}  // namespace visualTimeoutManager
+}  // namespace alexaClientSDK
+
+#endif  // ALEXA_CLIENT_SDK_AVS_SHARED_PRESENTATIONORCHESTRATOR_VISUALTIMEOUTMANAGER_TEST_MOCKTIMERFACTORY_H_
\ No newline at end of file
diff --git a/shared/PresentationOrchestrator/VisualTimeoutManager/test/VisualTimeoutManagerTest.cpp b/shared/PresentationOrchestrator/VisualTimeoutManager/test/VisualTimeoutManagerTest.cpp
new file mode 100644
index 0000000000..7c29125d12
--- /dev/null
+++ b/shared/PresentationOrchestrator/VisualTimeoutManager/test/VisualTimeoutManagerTest.cpp
@@ -0,0 +1,246 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/VisualTimeoutManager/private/VisualTimeoutManager.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include "MockTimerFactory.h"
+
+namespace alexaClientSDK {
+namespace visualTimeoutManager {
+namespace test {
+
+using namespace ::testing;
+using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils;
+using namespace presentationOrchestratorInterfaces;
+using namespace std::chrono;
+
+static const milliseconds DELAY_1_MS = milliseconds(1);
+static const milliseconds DELAY_2_MS = milliseconds(2);
+static const milliseconds DELAY_5_MS = milliseconds(5);
+
+class VisualTimeoutManagerTest : public ::testing::Test {
+public:
+    using MockTimeoutCallback = testing::MockFunction<void()>;
+
+    /// Set up the test harness for running a test.
+    void SetUp() override;
+
+    /// Clean up the test harness after running a test.
+    void TearDown() override;
+
+    /// Constructor
+    VisualTimeoutManagerTest() {
+    }
+
+protected:
+    /// A pointer to an instance of the @c VisualTimeoutManager that will be instantiated per test.
+    std::shared_ptr<VisualTimeoutManager> m_visualTimeoutManager;
+
+    /// A pointer to @c MockTimerFactory used by the test object.
+    std::shared_ptr<MockTimerFactory> m_timerFactory;
+
+    /// A pointer to @c Executor used by the tested object.
+    std::shared_ptr<threading::Executor> m_executor;
+};
+
+void VisualTimeoutManagerTest::SetUp() {
+    m_timerFactory = std::make_shared<MockTimerFactory>();
+
+    m_visualTimeoutManager = VisualTimeoutManager::create(m_timerFactory);
+
+    m_executor = std::make_shared<threading::Executor>();
+    m_visualTimeoutManager->setExecutor(m_executor);
+}
+
+void VisualTimeoutManagerTest::TearDown() {
+    m_timerFactory->getTimer()->stop();
+    m_visualTimeoutManager->shutdown();
+}
+
+/**
+ * Tests invocation of callback on RequestTimeout
+ */
+TEST_F(VisualTimeoutManagerTest, testRequestTimeout) {
+    MockTimeoutCallback mockCallback;
+    auto requestDelay = DELAY_1_MS;
+
+    EXPECT_CALL(mockCallback, Call()).Times(Exactly(1));
+
+    m_visualTimeoutManager->requestTimeout(requestDelay, mockCallback.AsStdFunction());
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(m_timerFactory->getTimer()->isActive());
+    ASSERT_EQ(m_timerFactory->getTimer()->getDelay(), requestDelay);
+
+    // Invoke callback via timer
+    m_timerFactory->getTimer()->warpForward(requestDelay);
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Tests StopTimeout call without RequestTimeout
+ */
+TEST_F(VisualTimeoutManagerTest, testStopTimeoutWithoutRequest) {
+    VisualTimeoutManagerInterface::VisualTimeoutId timeoutId = 0;
+    ASSERT_FALSE(m_visualTimeoutManager->stopTimeout(timeoutId));
+}
+
+/**
+ * Tests behavior on RequestTimeout followed by StopTimeout.
+ * Callback specified in request should not be invoked once StopTimeout is called.
+ */
+TEST_F(VisualTimeoutManagerTest, testRequestTimeoutFollowedByStopTimeout) {
+    MockTimeoutCallback mockCallback;
+    auto requestDelay = DELAY_2_MS;
+
+    // Timeout callback shouldn't be invoked once stopTimeout is called
+    EXPECT_CALL(mockCallback, Call()).Times(Exactly(0));
+
+    auto timeoutId = m_visualTimeoutManager->requestTimeout(requestDelay, mockCallback.AsStdFunction());
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(m_timerFactory->getTimer()->isActive());
+    ASSERT_EQ(m_timerFactory->getTimer()->getDelay(), requestDelay);
+    ASSERT_TRUE(m_visualTimeoutManager->stopTimeout(timeoutId));
+
+    m_executor->waitForSubmittedTasks();
+    ASSERT_FALSE(m_timerFactory->getTimer()->isActive());
+}
+
+/**
+ * Tests callback doesn't execute if timeout state changed to non-ACTIVE.
+ * The timer in this case submits a task to execute callback to the executor.
+ * A queued task in executor however changes the state and timeout is no longer active.
+ */
+TEST_F(VisualTimeoutManagerTest, testCallbackNotExecutedIfTimeoutNotActive) {
+    MockTimeoutCallback mockCallback;
+    auto requestDelay = DELAY_2_MS;
+
+    EXPECT_CALL(mockCallback, Call()).Times(Exactly(0));
+
+    m_visualTimeoutManager->requestTimeout(requestDelay, mockCallback.AsStdFunction());
+    m_executor->waitForSubmittedTasks();
+    ASSERT_EQ(m_timerFactory->getTimer()->getDelay(), requestDelay);
+    ASSERT_TRUE(m_timerFactory->getTimer()->isActive());
+
+    // submits task to executor to suspend timeout
+    m_visualTimeoutManager->onDialogUXStateChanged(DialogUXStateObserverInterface::DialogUXState::SPEAKING);
+    // submits task to executor to execute callback
+    m_timerFactory->getTimer()->warpForward(requestDelay);
+
+    m_executor->waitForSubmittedTasks();
+    ASSERT_FALSE(m_timerFactory->getTimer()->isActive());
+}
+
+/**
+ * Tests behavior on RequestTimeout followed by another RequestTimeout call.
+ * Only the latest timeout request should be processed while replacing any previous requests.
+ */
+TEST_F(VisualTimeoutManagerTest, testRequestTimeoutFollowedByAnotherRequest) {
+    MockTimeoutCallback mockCallback1;
+    MockTimeoutCallback mockCallback2;
+    auto requestDelay1 = DELAY_2_MS;
+    auto requestDelay2 = DELAY_1_MS;
+
+    EXPECT_CALL(mockCallback1, Call()).Times(Exactly(0));
+    // Timeout callback specified by the latest request alone should be called
+    EXPECT_CALL(mockCallback2, Call()).Times(Exactly(1));
+
+    // Invoke two timeout requests
+    m_visualTimeoutManager->requestTimeout(requestDelay1, mockCallback1.AsStdFunction());
+    m_visualTimeoutManager->requestTimeout(requestDelay2, mockCallback2.AsStdFunction());
+    m_executor->waitForSubmittedTasks();
+    ASSERT_EQ(m_timerFactory->getTimer()->getDelay(), requestDelay2);
+    ASSERT_TRUE(m_timerFactory->getTimer()->isActive());
+
+    // Invoke callback via timer
+    m_timerFactory->getTimer()->warpForward(requestDelay2);
+    m_executor->waitForSubmittedTasks();
+}
+
+/**
+ * Tests multiple timeout requests followed by stop timeouts.
+ * StopTimeout with timeoutId of latest request should return true.
+ * StopTimeout with timeoutId of requests other than latest should return false.
+ * Only the latest timeout is considered active.
+ */
+TEST_F(VisualTimeoutManagerTest, testMultipleRequestTimeoutsFollowedByStopTimeouts) {
+    MockTimeoutCallback mockCallback1;
+    MockTimeoutCallback mockCallback2;
+    auto requestDelay1 = DELAY_2_MS;
+    auto requestDelay2 = DELAY_5_MS;
+
+    EXPECT_CALL(mockCallback1, Call()).Times(Exactly(0));
+    EXPECT_CALL(mockCallback2, Call()).Times(Exactly(0));
+
+    auto timeoutId1 = m_visualTimeoutManager->requestTimeout(requestDelay1, mockCallback1.AsStdFunction());
+    auto timeoutId2 = m_visualTimeoutManager->requestTimeout(requestDelay2, mockCallback2.AsStdFunction());
+    m_executor->waitForSubmittedTasks();
+    ASSERT_EQ(m_timerFactory->getTimer()->getDelay(), requestDelay2);
+    ASSERT_TRUE(m_timerFactory->getTimer()->isActive());
+
+    ASSERT_FALSE(m_visualTimeoutManager->stopTimeout(timeoutId1));
+    ASSERT_TRUE(m_visualTimeoutManager->stopTimeout(timeoutId2));
+
+    m_executor->waitForSubmittedTasks();
+    ASSERT_FALSE(m_timerFactory->getTimer()->isActive());
+}
+
+/**
+ * Tests suspending timeout on DialogUXState change to non-IDLE state.
+ */
+TEST_F(VisualTimeoutManagerTest, testTimeoutSuspendedByDialogUXState) {
+    MockTimeoutCallback mockCallback;
+    auto requestDelay = DELAY_2_MS;
+
+    EXPECT_CALL(mockCallback, Call()).Times(Exactly(0));
+
+    m_visualTimeoutManager->requestTimeout(requestDelay, mockCallback.AsStdFunction());
+    ASSERT_TRUE(m_timerFactory->getTimer()->isActive());
+
+    m_visualTimeoutManager->onDialogUXStateChanged(DialogUXStateObserverInterface::DialogUXState::SPEAKING);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_FALSE(m_timerFactory->getTimer()->isActive());
+}
+
+/**
+ * Tests whether timeout is restarted on DialogUXState change to IDLE state.
+ */
+TEST_F(VisualTimeoutManagerTest, testTimeoutSuspendedAndRestartedByDialogUXState) {
+    MockTimeoutCallback mockCallback;
+    auto requestDelay = DELAY_2_MS;
+
+    EXPECT_CALL(mockCallback, Call()).Times(Exactly(0));
+    m_visualTimeoutManager->requestTimeout(requestDelay, mockCallback.AsStdFunction());
+    m_visualTimeoutManager->onDialogUXStateChanged(DialogUXStateObserverInterface::DialogUXState::SPEAKING);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_FALSE(m_timerFactory->getTimer()->isActive());
+
+    m_visualTimeoutManager->onDialogUXStateChanged(DialogUXStateObserverInterface::DialogUXState::IDLE);
+    m_executor->waitForSubmittedTasks();
+    ASSERT_TRUE(m_timerFactory->getTimer()->isActive());
+
+    // Timeout callback should be invoked once timer is restarted
+    EXPECT_CALL(mockCallback, Call()).Times(Exactly(1));
+    // Invoke callback via timer
+    m_timerFactory->getTimer()->warpForward(requestDelay);
+    m_executor->waitForSubmittedTasks();
+}
+
+}  // namespace test
+}  // namespace visualTimeoutManager
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/shared/SDKClient/CMakeLists.txt b/shared/SDKClient/CMakeLists.txt
new file mode 100644
index 0000000000..287635bb81
--- /dev/null
+++ b/shared/SDKClient/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+project(acsdkSDKClient LANGUAGES CXX)
+
+add_subdirectory("src")
+add_subdirectory("test")
\ No newline at end of file
diff --git a/shared/SDKClient/include/acsdk/SDKClient/Annotated.h b/shared/SDKClient/include/acsdk/SDKClient/Annotated.h
new file mode 100644
index 0000000000..6527a046e5
--- /dev/null
+++ b/shared/SDKClient/include/acsdk/SDKClient/Annotated.h
@@ -0,0 +1,188 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_ANNOTATED_H_
+#define ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_ANNOTATED_H_
+
+#include <memory>
+
+#include <AVSCommon/Utils/PlatformDefinitions.h>
+
+namespace alexaClientSDK {
+namespace sdkClient {
+
+/**
+ * Annotated is a @c shared_ptr wrapper used to define a shared_ptr to a @c Type where the
+ * type of the wrapper is distinguished by an @c Annotation type. You can use this when you
+ * have multiple instances of the same interface but want to identify or distinguish them by
+ * type rather than the underlying pointer value.
+ *
+ * @tparam Annotation A type used to flavor the template instantiation.  This is typically an
+ * empty @c struct definition, where just the name of the @c struct is used to distinguish types.
+ * @tparam Type The underlying type that the Annotated @c shared_ptr refers to.
+ */
+template <typename Annotation, typename Type>
+struct Annotated {
+public:
+    /// The underlying type that is being annotated.
+    using element_type = Type;
+
+    /**
+     * Constructor.
+     */
+    Annotated() = default;
+
+    /**
+     * Create an @c Annotated<> instance from a pointer to the underlying @c Type.  The resulting instance of
+     * @c Annotated takes ownership of the pointer.
+     *
+     * @param value A pointer to an instance of the underlying @c Type.
+     */
+    ACSDK_INLINE_VISIBILITY Annotated(Type* value);
+
+    /**
+     * Create from a shared_ptr to an instance underlying @c Type.
+     *
+     * @param value A shared_ptr to an instance underlying @c Type.
+     */
+    ACSDK_INLINE_VISIBILITY Annotated(const std::shared_ptr<Type>& value);
+
+    /**
+     * Create from a shared_ptr to an instance underlying @c Type.
+     *
+     * @param value A shared_ptr to an instance underlying @c Type.
+     */
+    ACSDK_INLINE_VISIBILITY Annotated(std::shared_ptr<Type>&& value);
+
+    /**
+     * Release this reference to the underlying instance.
+     */
+    ACSDK_INLINE_VISIBILITY void reset();
+
+    /**
+     * Get a naked pointer to the underlying instance.
+     *
+     * @return A naked pointer to the underlying instance.
+     */
+    ACSDK_INLINE_VISIBILITY Type* get() const;
+
+    /**
+     * Get a reference to the underlying instance.
+     *
+     * @return A reference to the underlying instance.
+     */
+    ACSDK_INLINE_VISIBILITY Type& operator*() const;
+
+    /**
+     * Get a naked pointer to the underlying instance.
+     *
+     * @return A naked pointer to the underlying instance.
+     */
+    ACSDK_INLINE_VISIBILITY Type* operator->() const;
+
+    /**
+     * Convert to a shared_ptr to the underlying instance.
+     *
+     * @return A shared_ptr to the underlying instance.
+     */
+    ACSDK_INLINE_VISIBILITY operator std::shared_ptr<Type>() const;
+
+    /**
+     * Return true if the pointer is non-null.
+     *
+     * @return True if the pointer is non-null.
+     */
+    ACSDK_INLINE_VISIBILITY explicit operator bool() const;
+
+private:
+    /// shared_ptr to the underlying instance.
+    std::shared_ptr<Type> m_value;
+};
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline Annotated<Annotation, Type>::Annotated(Type* value) : m_value{value} {
+}
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline Annotated<Annotation, Type>::Annotated(const std::shared_ptr<Type>& value) :
+        m_value{value} {
+}
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline Annotated<Annotation, Type>::Annotated(std::shared_ptr<Type>&& value) : m_value{value} {
+}
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline void Annotated<Annotation, Type>::reset() {
+    m_value.reset();
+}
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline Type* Annotated<Annotation, Type>::get() const {
+    return m_value.get();
+}
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline Type& Annotated<Annotation, Type>::operator*() const {
+    return *m_value;
+}
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline Type* Annotated<Annotation, Type>::operator->() const {
+    return m_value.get();
+}
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline Annotated<Annotation, Type>::operator std::shared_ptr<Type>() const {
+    return m_value;
+}
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline Annotated<Annotation, Type>::operator bool() const {
+    return !!m_value;
+}
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline bool operator==(
+    const Annotated<Annotation, Type>& lhs,
+    const Annotated<Annotation, Type>& rhs) {
+    return lhs.get() == rhs.get();
+};
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline bool operator!=(
+    const Annotated<Annotation, Type>& lhs,
+    const Annotated<Annotation, Type>& rhs) {
+    return !(lhs == rhs);
+};
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline bool operator==(
+    const Annotated<Annotation, Type>& lhs,
+    const std::shared_ptr<Type>& rhs) {
+    return lhs.get() == rhs.get();
+};
+
+template <typename Annotation, typename Type>
+ACSDK_INLINE_VISIBILITY inline bool operator!=(
+    const Annotated<Annotation, Type>& lhs,
+    const std::shared_ptr<Type>& rhs) {
+    return !(lhs == rhs);
+};
+
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
+
+#endif  // ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_ANNOTATED_H_
diff --git a/shared/SDKClient/include/acsdk/SDKClient/FeatureClientBuilderInterface.h b/shared/SDKClient/include/acsdk/SDKClient/FeatureClientBuilderInterface.h
new file mode 100644
index 0000000000..c933cd2b25
--- /dev/null
+++ b/shared/SDKClient/include/acsdk/SDKClient/FeatureClientBuilderInterface.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_FEATURECLIENTBUILDERINTERFACE_H_
+#define ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_FEATURECLIENTBUILDERINTERFACE_H_
+
+#include <AVSCommon/Utils/PlatformDefinitions.h>
+
+#include "FeatureClientInterface.h"
+
+namespace alexaClientSDK {
+namespace sdkClient {
+/**
+ * Interface to be implemented by Feature Client Builders
+ *
+ * @note During construction of the feature client builder any required types must be requested by calling
+ * the @c addRequiredType<T> function exposed by the @c FeatureClientBuilderInterface.
+ * @code
+ *  MyFeature::MyFeature() {
+ *      addRequiredType<RequiredType1>();
+ *      addRequiredType<RequiredType2>();
+ *  }
+ * @endcode
+ */
+class FeatureClientBuilderInterface {
+public:
+    /**
+     * Virtual destructor
+     */
+    virtual ~FeatureClientBuilderInterface() = default;
+
+    /**
+     * Retrieve the name of the client, used to get friendly names in case of errors
+     * @return string containing the friendly name of the client
+     */
+    virtual std::string name() = 0;
+
+protected:
+    /**
+     * Adds a type which is required for the construction of the client.
+     * Types added in this way are guaranteed to be available when @c construct is called.
+     * All required types should be registered in the constructor of the feature client.
+     * @tparam ComponentType The type which is required
+     */
+    template <typename ComponentType>
+    ACSDK_INLINE_VISIBILITY inline void addRequiredType();
+
+private:
+    /**
+     * Returns the types required by this FeatureClientInterface - used by the @c SDKClientBuilder
+     * @return TypeRegistry containing the required types
+     */
+    const internal::TypeRegistry& getRequiredTypes() {
+        return m_requiredTypes;
+    }
+
+    /// TypeRegistry containing the types required by this FeatureClientInterface
+    internal::TypeRegistry m_requiredTypes;
+
+    /// SDKClientBuilder and SDKClientRegistry are friends to allow them to retrieve types
+    friend class SDKClientBuilder;
+    friend class SDKClientRegistry;
+};
+
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
+
+#include "internal/FeatureClientBuilderInterface_impl.h"
+#endif  // ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_FEATURECLIENTBUILDERINTERFACE_H_
diff --git a/shared/SDKClient/include/acsdk/SDKClient/FeatureClientInterface.h b/shared/SDKClient/include/acsdk/SDKClient/FeatureClientInterface.h
new file mode 100644
index 0000000000..bc86a34258
--- /dev/null
+++ b/shared/SDKClient/include/acsdk/SDKClient/FeatureClientInterface.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_FEATURECLIENTINTERFACE_H_
+#define ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_FEATURECLIENTINTERFACE_H_
+#include <memory>
+#include <string>
+
+#include <AVSCommon/Utils/RequiresShutdown.h>
+
+#include "acsdk/SDKClient/internal/TypeRegistry.h"
+
+namespace alexaClientSDK {
+namespace sdkClient {
+
+// Forward declaration
+class SDKClientRegistry;
+
+/**
+ * The FeatureClientInterface must be implemented by feature clients which expose additional capabilities to
+ * applications utilizing the AVS SDK. To allow feature clients to be added to the @c SDKClientRegistry (directly or
+ * through the @c SDKClientBuilder) a matching feature client builder which implements the
+ * @c FeatureClientBuilderInterface and which constructs the feature client should be implemented.
+ */
+class FeatureClientInterface : public avsCommon::utils::RequiresShutdown {
+public:
+    /**
+     * Constructor
+     * @param name The name of the class
+     */
+    FeatureClientInterface(const std::string& name);
+
+    /**
+     * Perform any addition configuration on the client, called after all clients have been built successfully.
+     * @param sdkClientRegistry Reference to the SDKClientRegistry
+     * @return true if successful
+     */
+    virtual bool configure(const std::shared_ptr<SDKClientRegistry>& sdkClientRegistry) = 0;
+
+    /// Destructor
+    virtual ~FeatureClientInterface() = default;
+};
+
+inline FeatureClientInterface::FeatureClientInterface(const std::string& name) :
+        avsCommon::utils::RequiresShutdown(name) {
+}
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
+#endif  // ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_FEATURECLIENTINTERFACE_H_
diff --git a/shared/SDKClient/include/acsdk/SDKClient/SDKClientBuilder.h b/shared/SDKClient/include/acsdk/SDKClient/SDKClientBuilder.h
new file mode 100644
index 0000000000..e7178332ae
--- /dev/null
+++ b/shared/SDKClient/include/acsdk/SDKClient/SDKClientBuilder.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_SDKCLIENTBUILDER_H_
+#define ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_SDKCLIENTBUILDER_H_
+
+#include <list>
+#include <memory>
+
+#include <AVSCommon/Utils/PlatformDefinitions.h>
+#include <AVSCommon/Utils/TypeIndex.h>
+
+#include "FeatureClientBuilderInterface.h"
+#include "FeatureClientInterface.h"
+#include "SDKClientRegistry.h"
+
+namespace alexaClientSDK {
+namespace sdkClient {
+/**
+ * Class which takes a number of feature client builders and builds them to form a single SDKClientRegistry
+ *
+ * This class can be used as follows:
+ * @code
+ * auto clientBuilder1 = FeatureClientBuilder1::create(...);
+ * auto clientBuilder2 = FeatureClientBuilder2::create(...);
+ *
+ * SDKClientBuilder builder;
+ * auto sdkClient = builder.withFeature(client1).withFeature(client2).build();
+ * auto client1 = sdkClient.get<FeatureClient1>();
+ * auto client2 = sdkClient.get<FeatureClient2>();
+ */
+class SDKClientBuilder {
+public:
+    /**
+     * Add the feature to this @c SDKClientBuilder
+     * @param feature The pointer to the @c FeatureClientBuilderInterface to be added
+     * @tparam FeatureClientBuilderType The type of the feature to add
+     * @return The @c SDKClientBuilder object
+     */
+    template <typename FeatureClientBuilderType>
+    ACSDK_INLINE_VISIBILITY inline SDKClientBuilder& withFeature(std::unique_ptr<FeatureClientBuilderType> feature);
+
+    /**
+     * Construct the SDKClientRegistry
+     * After calling build() the @c SDKClientBuilder object should not be used
+     * @return shared_ptr to the @c SDKClientRegistry, or nullptr if the build failed
+     */
+    std::shared_ptr<SDKClientRegistry> build();
+
+private:
+    /// Helper struct to store type and pointer to client
+    struct Client {
+        /// The type of the feature client created by the builder (not the type of the builder)
+        avsCommon::utils::TypeIndex typeId;
+
+        /// Pointer to the client builder object
+        std::unique_ptr<FeatureClientBuilderInterface> client;
+
+        /// Pointer to the construct function
+        std::function<std::shared_ptr<FeatureClientInterface>(const std::shared_ptr<SDKClientRegistry>&)> constructorFn;
+    };
+
+    /**
+     * Internal function to add a feature client to the SDKClientBuilder
+     * @param client Pointer to the client object
+     */
+    void withFeature(std::shared_ptr<Client> client);
+
+    /// The list of clients which have been added to this builder
+    std::list<std::shared_ptr<Client>> m_clients;
+};
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
+
+#include "acsdk/SDKClient/internal/SDKClientBuilder_impl.h"
+#endif  // ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_SDKCLIENTBUILDER_H_
diff --git a/shared/SDKClient/include/acsdk/SDKClient/SDKClientRegistry.h b/shared/SDKClient/include/acsdk/SDKClient/SDKClientRegistry.h
new file mode 100644
index 0000000000..a993131348
--- /dev/null
+++ b/shared/SDKClient/include/acsdk/SDKClient/SDKClientRegistry.h
@@ -0,0 +1,161 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_SDKCLIENTREGISTRY_H_
+#define ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_SDKCLIENTREGISTRY_H_
+
+#include <memory>
+#include <unordered_map>
+
+#include <acsdkShutdownManagerInterfaces/ShutdownManagerInterface.h>
+#include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
+#include <AVSCommon/Utils/PlatformDefinitions.h>
+#include <AVSCommon/Utils/RequiresShutdown.h>
+#include <AVSCommon/Utils/TypeIndex.h>
+
+#include "Annotated.h"
+#include "FeatureClientInterface.h"
+#include "internal/Utils.h"
+
+namespace alexaClientSDK {
+namespace sdkClient {
+
+/**
+ * The SDKClientRegistry combines a number of feature clients and provides a registry of components and clients.
+ * Once built by the @c SDKClientBuilder, the SDKClientRegistry provides methods to allow the application to access
+ * components or clients.
+ *
+ * Once built, the SDKClientRegistry can be used as follows:
+ * @code
+ * std::shared_ptr<SDKClientRegistry> sdkClientRegistry = ... // From SDKClientBuilder
+ * auto client1 = sdkClientRegistry->get<FeatureClient1>() // Retrieve FeatureClient1 client
+ * auto component1 = sdkClientRegistry->getComponent<Component1>() // Retrieve component exposed by a FeatureClient
+ */
+class SDKClientRegistry
+        : public std::enable_shared_from_this<SDKClientRegistry>
+        , public avsCommon::utils::RequiresShutdown {
+public:
+    /**
+     * Retrieve a feature client from this SDKClientRegistry
+     * @tparam ClientType The type of the client to retrieve
+     * @return shared_ptr to the client, or nullptr if no such feature client exists
+     */
+    template <
+        typename ClientType,
+        typename std::enable_if<std::is_base_of<FeatureClientInterface, ClientType>::value>::type* = nullptr>
+    ACSDK_INLINE_VISIBILITY inline std::shared_ptr<ClientType> get();
+
+    /**
+     * Retrieve a component provided by a feature client from this SDKClientRegistry
+     * @tparam ComponentType The type of the component to retrieve, may also be an annotated type
+     * @return shared_ptr to the component of type ComponentType (or the underlying type if an annotated type is used)
+     * or nullptr if no such component exists
+     */
+    template <typename ComponentType>
+    ACSDK_INLINE_VISIBILITY inline std::shared_ptr<typename internal::UnderlyingComponentType<ComponentType>::type>
+    getComponent();
+
+    /**
+     * Register a component with this SDKClientRegistry
+     * @tparam ComponentType The components type, or annotated type
+     * @param component Shared pointer to the component which is being registered with this SDKClientRegistry
+     * @return true if the client was registered successfully, false if the component could not be registered
+     */
+    template <typename ComponentType>
+    ACSDK_INLINE_VISIBILITY inline bool registerComponent(std::shared_ptr<ComponentType> component);
+
+    /**
+     * Register an annotated component with this SDKClientRegistry
+     * @tparam AnnotatedName The name of this component
+     * @tparam ComponentType The components type
+     * @param component Shared pointer to the component which is being registered with this SDKClientRegistry
+     * @return true if the client was registered successfully, false if the component could not be registered
+     */
+    template <typename AnnotatedName, typename ComponentType>
+    ACSDK_INLINE_VISIBILITY inline bool registerComponent(Annotated<AnnotatedName, ComponentType> component);
+
+    /**
+     * Adds a feature client to an existing SDK Client
+     * @tparam ClientBuilderType The type of the feature client builder
+     * @param feature The feature client to add, all dependencies which are requested by this feature client must
+     * already be registered by existing feature clients
+     * @return true if the feature was added successfully, false if a failure occurred.
+     */
+    template <typename FeatureClientBuilderType>
+    ACSDK_INLINE_VISIBILITY inline bool addFeature(std::unique_ptr<FeatureClientBuilderType> featureBuilder);
+
+    /// @c RequiresShutdown functions
+    /// @{
+    void doShutdown() override;
+    /// @}
+
+private:
+    /// Private Constructor
+    SDKClientRegistry();
+
+    /// Initializes the SDKClientRegistry following construction, expected to be called by SDKClientBuilder
+    bool initialize();
+
+    /**
+     * Registers a new client with the @c SDKClientRegistry
+     * @param clientTypeId The TypeIndex for the client
+     * @param client The feature client object
+     * @return true if successful
+     */
+    bool registerClient(
+        const avsCommon::utils::TypeIndex& clientTypeId,
+        std::shared_ptr<FeatureClientInterface> client);
+
+    /**
+     * Registers a component with the @c SDKClientRegistry
+     * @param clientTypeId The TypeIndex for the client
+     * @param component The component to register
+     * @return true if successful
+     */
+    bool registerComponent(const avsCommon::utils::TypeIndex& clientTypeId, std::shared_ptr<void> component);
+
+    /**
+     * Adds a feature to the @c SDKClientRegistry
+     * @param clientTypeId The TypeIndex for the client
+     * @param featureBuilder The feature client builder object
+     * @param constructorFn The construct function for this builder
+     * @return true if successful
+     */
+    bool addFeature(
+        const avsCommon::utils::TypeIndex& clientTypeId,
+        std::unique_ptr<FeatureClientBuilderInterface> featureBuilder,
+        std::function<std::shared_ptr<FeatureClientInterface>(const std::shared_ptr<SDKClientRegistry>&)>
+            constructorFn);
+
+    /// Contains the type to client interface mapping
+    std::unordered_map<avsCommon::utils::TypeIndex, std::shared_ptr<FeatureClientInterface>> m_clientMapping;
+
+    /// Contains the type to component mapping
+    std::unordered_map<avsCommon::utils::TypeIndex, std::shared_ptr<void>> m_componentMapping;
+
+    /// The shutdown manager
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownManagerInterface> m_shutdownManager;
+
+    /// The shutdown notifier
+    std::shared_ptr<acsdkShutdownManagerInterfaces::ShutdownNotifierInterface> m_shutdownNotifier;
+
+    /// SDKClientBuilder is a friend to allow it to construct the SDKClientRegistry
+    friend class SDKClientBuilder;
+};
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
+
+#include "acsdk/SDKClient/internal/SDKClientRegistry_impl.h"
+#endif  // ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_SDKCLIENTREGISTRY_H_
diff --git a/shared/SDKClient/include/acsdk/SDKClient/internal/FeatureClientBuilderInterface_impl.h b/shared/SDKClient/include/acsdk/SDKClient/internal/FeatureClientBuilderInterface_impl.h
new file mode 100644
index 0000000000..2e7798b629
--- /dev/null
+++ b/shared/SDKClient/include/acsdk/SDKClient/internal/FeatureClientBuilderInterface_impl.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_FEATURECLIENTBUILDERINTERFACE_IMPL_H_
+#define ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_FEATURECLIENTBUILDERINTERFACE_IMPL_H_
+
+namespace alexaClientSDK {
+namespace sdkClient {
+
+template <typename ComponentType>
+ACSDK_INLINE_VISIBILITY inline void FeatureClientBuilderInterface::addRequiredType() {
+    m_requiredTypes.addType<ComponentType>();
+}
+
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
+#endif  // ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_FEATURECLIENTBUILDERINTERFACE_IMPL_H_
diff --git a/shared/SDKClient/include/acsdk/SDKClient/internal/SDKClientBuilder_impl.h b/shared/SDKClient/include/acsdk/SDKClient/internal/SDKClientBuilder_impl.h
new file mode 100644
index 0000000000..636420832f
--- /dev/null
+++ b/shared/SDKClient/include/acsdk/SDKClient/internal/SDKClientBuilder_impl.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_SDKCLIENTBUILDER_IMPL_H_
+#define ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_SDKCLIENTBUILDER_IMPL_H_
+#include <AVSCommon/Utils/TypeIndex.h>
+
+#include "Utils.h"
+
+namespace alexaClientSDK {
+namespace sdkClient {
+
+template <typename FeatureClientBuilderType>
+ACSDK_INLINE_VISIBILITY inline SDKClientBuilder& SDKClientBuilder::withFeature(
+    std::unique_ptr<FeatureClientBuilderType> feature) {
+    internal::AssertFeatureClientBuilderTypeIsValid<FeatureClientBuilderType>();
+
+    auto featureTypeId =
+        avsCommon::utils::getTypeIndex<typename std::result_of<decltype (&FeatureClientBuilderType::construct)(
+            FeatureClientBuilderType, const std::shared_ptr<SDKClientRegistry>&)>::type::element_type>();
+    auto constructFn = std::bind(&FeatureClientBuilderType::construct, feature.get(), std::placeholders::_1);
+    auto client = std::shared_ptr<Client>(new Client{featureTypeId, std::move(feature), std::move(constructFn)});
+
+    withFeature(std::move(client));
+
+    return *this;
+}
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
+#endif  // ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_SDKCLIENTBUILDER_IMPL_H_
diff --git a/shared/SDKClient/include/acsdk/SDKClient/internal/SDKClientRegistry_impl.h b/shared/SDKClient/include/acsdk/SDKClient/internal/SDKClientRegistry_impl.h
new file mode 100644
index 0000000000..5b60b37eba
--- /dev/null
+++ b/shared/SDKClient/include/acsdk/SDKClient/internal/SDKClientRegistry_impl.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_SDKCLIENTREGISTRY_IMPL_H_
+#define ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_SDKCLIENTREGISTRY_IMPL_H_
+#include <AVSCommon/Utils/TypeIndex.h>
+
+#include "Utils.h"
+
+namespace alexaClientSDK {
+namespace sdkClient {
+
+template <
+    typename ClientType,
+    typename std::enable_if<std::is_base_of<FeatureClientInterface, ClientType>::value>::type*>
+ACSDK_INLINE_VISIBILITY inline std::shared_ptr<ClientType> SDKClientRegistry::get() {
+    auto clientTypeId = avsCommon::utils::getTypeIndex<ClientType>();
+    auto it = m_clientMapping.find(clientTypeId);
+    if (it == m_clientMapping.end()) {
+        return nullptr;
+    }
+    return std::static_pointer_cast<ClientType>(it->second);
+}
+
+template <typename ComponentType>
+ACSDK_INLINE_VISIBILITY inline std::shared_ptr<typename internal::UnderlyingComponentType<ComponentType>::type>
+SDKClientRegistry::getComponent() {
+    auto clientTypeId = avsCommon::utils::getTypeIndex<ComponentType>();
+    auto it = m_componentMapping.find(clientTypeId);
+    if (it == m_componentMapping.end()) {
+        return nullptr;
+    }
+    return std::static_pointer_cast<typename internal::UnderlyingComponentType<ComponentType>::type>(it->second);
+}
+
+template <typename ComponentType>
+ACSDK_INLINE_VISIBILITY inline bool SDKClientRegistry::registerComponent(std::shared_ptr<ComponentType> component) {
+    auto clientTypeId = avsCommon::utils::getTypeIndex<ComponentType>();
+    return registerComponent(clientTypeId, std::move(component));
+}
+
+template <typename AnnotatedName, typename ComponentType>
+ACSDK_INLINE_VISIBILITY inline bool SDKClientRegistry::registerComponent(
+    Annotated<AnnotatedName, ComponentType> component) {
+    auto clientTypeId = avsCommon::utils::getTypeIndex<Annotated<AnnotatedName, ComponentType>>();
+    std::shared_ptr<ComponentType> spComponent = std::move(component);
+    return registerComponent(clientTypeId, std::move(spComponent));
+}
+
+template <typename FeatureClientBuilderType>
+ACSDK_INLINE_VISIBILITY inline bool SDKClientRegistry::addFeature(
+    std::unique_ptr<FeatureClientBuilderType> featureBuilder) {
+    internal::AssertFeatureClientBuilderTypeIsValid<FeatureClientBuilderType>();
+
+    const auto typeIndex =
+        avsCommon::utils::getTypeIndex<typename std::result_of<decltype (&FeatureClientBuilderType::construct)(
+            FeatureClientBuilderType, const std::shared_ptr<SDKClientRegistry>&)>::type::element_type>();
+    auto constructFn = std::bind(&FeatureClientBuilderType::construct, featureBuilder.get(), std::placeholders::_1);
+    return addFeature(typeIndex, std::move(featureBuilder), std::move(constructFn));
+}
+
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
+#endif  // ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_SDKCLIENTREGISTRY_IMPL_H_
diff --git a/shared/SDKClient/include/acsdk/SDKClient/internal/TypeRegistry.h b/shared/SDKClient/include/acsdk/SDKClient/internal/TypeRegistry.h
new file mode 100644
index 0000000000..11fbcf437b
--- /dev/null
+++ b/shared/SDKClient/include/acsdk/SDKClient/internal/TypeRegistry.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_TYPEREGISTRY_H_
+#define ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_TYPEREGISTRY_H_
+
+#include <unordered_set>
+
+#include <AVSCommon/Utils/PlatformDefinitions.h>
+#include <AVSCommon/Utils/TypeIndex.h>
+
+namespace alexaClientSDK {
+namespace sdkClient {
+namespace internal {
+/**
+ * Internal class which keeps track of a set of types
+ */
+class TypeRegistry {
+public:
+    /**
+     * Adds the given type, provided as a template to the registry
+     * @tparam ComponentType The type to add
+     */
+    template <typename ComponentType>
+    ACSDK_INLINE_VISIBILITY inline void addType() {
+        m_types.insert(avsCommon::utils::getTypeIndex<ComponentType>());
+    }
+
+    /**
+     * Adds the given type, provided as a parameter to the registry
+     * @param typeIndex The type to add
+     */
+    void addTypeIndex(const avsCommon::utils::TypeIndex& typeIndex);
+
+    /**
+     * Removes the given type from the registry
+     * @tparam ComponentType The type to remove
+     */
+    template <typename ComponentType>
+    ACSDK_INLINE_VISIBILITY inline void removeType() {
+        m_types.erase(avsCommon::utils::getTypeIndex<ComponentType>());
+    }
+
+    /**
+     * Check if this registry contains no items
+     * @return true if the registry is empty
+     */
+    bool empty() const;
+
+    /**
+     * Returns a type registry containing the types present in this TypeRegistry, but not the other
+     * @param other The other TypeRegistry
+     * @return A TypeRegistry containing the types present in this but not other
+     */
+    TypeRegistry typeDifference(const TypeRegistry& other) const;
+
+    /**
+     * Returns whether all types present in this registry are present in the other
+     * @param other The other TypeRegistry
+     * @return true if all types present in this are also in other
+     */
+    bool typeDifferenceIsEmpty(const TypeRegistry& other) const;
+
+    /**
+     * Uses the given stream to output a list of types contained within this registry, note that the readability of the
+     * string depends to a large extent on whether the SDK has been built with RTTI support.
+     * @param stream The output stream
+     */
+    void outputToStream(std::ostream& stream) const;
+
+    /**
+     * Creates a string containing the list of types contained within this registry, note that the readability of the
+     * string depends to a large extent on whether the SDK has been built with RTTI support.
+     * @return A string of the format "[type1, type2, type3, ...]"
+     */
+    std::string toString() const;
+
+    /// type alias for const_iterator, no order is guaranteed
+    using const_iterator = std::unordered_set<avsCommon::utils::TypeIndex>::const_iterator;
+
+    /**
+     * Get the const_iterator referencing the first of the types in this TypeRegistry
+     * @return const_iterator to the first item
+     */
+    const_iterator cbegin() const;
+
+    /**
+     * Get the const_iterator referencing one past the end of the types in this TypeRegistry
+     * @return const_iterator to the first item
+     */
+    const_iterator cend() const;
+
+private:
+    /// The set of types registered to this TypeRegistry
+    std::unordered_set<avsCommon::utils::TypeIndex> m_types;
+};
+
+/**
+ * Write a @c TypeRegistry to an @c ostream.
+ *
+ * @param stream The stream to write the value to.
+ * @param typeRegistry The @c TypeRegistry to write to the @c ostream as a string.
+ * @return The @c ostream that was passed in and written to.
+ */
+inline std::ostream& operator<<(std::ostream& stream, const TypeRegistry& typeRegistry) {
+    typeRegistry.outputToStream(stream);
+    return stream;
+}
+}  // namespace internal
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
+#endif  // ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_TYPEREGISTRY_H_
diff --git a/shared/SDKClient/include/acsdk/SDKClient/internal/Utils.h b/shared/SDKClient/include/acsdk/SDKClient/internal/Utils.h
new file mode 100644
index 0000000000..934abd52a0
--- /dev/null
+++ b/shared/SDKClient/include/acsdk/SDKClient/internal/Utils.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_UTILS_H_
+#define ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_UTILS_H_
+
+#include "acsdk/SDKClient/FeatureClientBuilderInterface.h"
+
+namespace alexaClientSDK {
+namespace sdkClient {
+namespace internal {
+/// Helper struct to get type of non-annotated types
+/// @tparam T The type of the component
+template <typename T>
+struct UnderlyingComponentType {
+    typedef T type;
+};
+
+/// Specialization of component_type to identify underlying type of annotated types
+/// @tparam Annotation The annotated name for the component
+/// @tparam ComponentType The type of the underlying component
+template <typename Annotation, typename ComponentType>
+struct UnderlyingComponentType<Annotated<Annotation, ComponentType>> {
+    typedef ComponentType type;
+};
+
+/**
+ * Helper to determine if a type is a shared_ptr
+ * @tparam T type to check
+ */
+template <typename T>
+struct IsSharedPtr : std::false_type {};
+
+/**
+ * Specialization to determine if a type is a shared_ptr
+ * @tparam T type to check
+ */
+template <typename T>
+struct IsSharedPtr<std::shared_ptr<T>> : std::true_type {};
+
+/**
+ * Function to assert if the given FeatureClientBuilderType is valid for use in feature construction
+ * @tparam FeatureClientBuilderType The type to validate
+ */
+template <typename FeatureClientBuilderType>
+ACSDK_INLINE_VISIBILITY inline void AssertFeatureClientBuilderTypeIsValid() {
+    static_assert(
+        std::is_base_of<FeatureClientBuilderInterface, FeatureClientBuilderType>::value,
+        "FeatureClientBuilderInterface must implement FeatureClientBuilderInterface");
+
+    static_assert(
+        internal::IsSharedPtr<typename std::result_of<decltype (&FeatureClientBuilderType::construct)(
+            FeatureClientBuilderType, const std::shared_ptr<SDKClientRegistry>&)>::type>::value,
+        "FeatureClientBuilder must define a construct(const std::shared_ptr<SDKClientRegistry>&) method which returns "
+        "a shared_ptr");
+
+    static_assert(
+        std::is_base_of<
+            FeatureClientInterface,
+            typename std::result_of<decltype (&FeatureClientBuilderType::construct)(
+                FeatureClientBuilderType, const std::shared_ptr<SDKClientRegistry>&)>::type::element_type>::value,
+        "FeatureClientBuilder construct method must return a shared_ptr to a FeatureClientInterface implementation");
+}
+
+}  // namespace internal
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
+#endif  // ACSDK_SDKCLIENT_INCLUDE_ACSDK_SDKCLIENT_INTERNAL_UTILS_H_
\ No newline at end of file
diff --git a/shared/SDKClient/src/CMakeLists.txt b/shared/SDKClient/src/CMakeLists.txt
new file mode 100644
index 0000000000..9a30c2b6c0
--- /dev/null
+++ b/shared/SDKClient/src/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+add_library(acsdkSDKClient
+        SDKClientBuilder.cpp
+        SDKClientRegistry.cpp
+        TypeRegistry.cpp
+        )
+
+target_compile_definitions(acsdkSDKClient PRIVATE ACSDK_LOG_MODULE=sdkClient)
+target_include_directories(acsdkSDKClient PUBLIC
+        "${acsdkSDKClient_SOURCE_DIR}/include")
+
+target_link_libraries(acsdkSDKClient AVSCommon acsdkShutdownManager)
+
+# install target
+asdk_install()
diff --git a/shared/SDKClient/src/SDKClientBuilder.cpp b/shared/SDKClient/src/SDKClientBuilder.cpp
new file mode 100644
index 0000000000..11fe0cd9f6
--- /dev/null
+++ b/shared/SDKClient/src/SDKClientBuilder.cpp
@@ -0,0 +1,113 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/SDKClient/SDKClientBuilder.h"
+
+namespace alexaClientSDK {
+namespace sdkClient {
+
+/// String to identify log entries originating from this file.
+#define TAG "SDKClientBuilder"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+std::shared_ptr<SDKClientRegistry> SDKClientBuilder::build() {
+    if (m_clients.empty()) {
+        ACSDK_ERROR(LX("buildFailed").d("reason", "No feature clients to build"));
+        return nullptr;
+    }
+
+    // Resolve dependencies and calculate build order
+    // One core feature should have zero dependencies, identify it first
+    internal::TypeRegistry providedTypes;
+
+    auto sdkClientRegistry = std::shared_ptr<SDKClientRegistry>(new SDKClientRegistry());
+
+    auto modified = true;
+    while (modified && !m_clients.empty()) {
+        modified = false;
+        for (auto it = m_clients.begin(); it != m_clients.end();) {
+            const auto& client = *it;
+            if (client->client->getRequiredTypes().typeDifferenceIsEmpty(providedTypes)) {
+                ACSDK_DEBUG0(LX(__func__).d("constructing", client->client->name()));
+                auto newClient = client->constructorFn(sdkClientRegistry);
+                if (!newClient) {
+                    ACSDK_CRITICAL(LX("buildFailed")
+                                       .d("reason", "Failed to instantiate client")
+                                       .d("client", client->client->name()));
+                    return nullptr;
+                }
+
+                sdkClientRegistry->registerClient(client->typeId, std::move(newClient));
+
+                it = m_clients.erase(it);
+                modified = true;
+            } else {
+                ++it;
+            }
+        }
+
+        // Update the list of provided types
+        for (auto& componentPair : sdkClientRegistry->m_componentMapping) {
+            providedTypes.addTypeIndex(componentPair.first);
+        }
+    }
+
+    if (!m_clients.empty()) {
+        for (const auto& client : m_clients) {
+            const auto missingDeps = client->client->getRequiredTypes().typeDifference(providedTypes);
+
+            ACSDK_ERROR(LX("buildFailed")
+                            .d("reason", "Unsatisfied dependency building client")
+                            .d("client", client->client->name())
+                            .d("missing dependencies", missingDeps));
+        }
+        return nullptr;
+    }
+
+    // Cleanup, unique_ptrs are no longer valid
+    m_clients.clear();
+
+    // Finalize initialization of the combined client
+    if (!sdkClientRegistry->initialize()) {
+        ACSDK_ERROR(LX("buildFailed").d("reason", "configuration failed"));
+        return nullptr;
+    }
+
+    return sdkClientRegistry;
+}
+
+void SDKClientBuilder::withFeature(std::shared_ptr<Client> client) {
+    if (!client || !client->client) {
+        ACSDK_ERROR(LX("withFeatureFailed").d("reason", "Null client"));
+        return;
+    }
+
+    if (std::find_if(m_clients.begin(), m_clients.end(), [client](const std::shared_ptr<Client>& other) {
+            return client->typeId == other->typeId;
+        }) != m_clients.end()) {
+        ACSDK_WARN(LX("withFeatureFailed").d("reason", "Client already exists").d("type", client->client->name()));
+    } else {
+        m_clients.push_back(std::move(client));
+    }
+}
+
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/shared/SDKClient/src/SDKClientRegistry.cpp b/shared/SDKClient/src/SDKClientRegistry.cpp
new file mode 100644
index 0000000000..19c06bcd5d
--- /dev/null
+++ b/shared/SDKClient/src/SDKClientRegistry.cpp
@@ -0,0 +1,129 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <acsdkShutdownManager/ShutdownNotifier.h>
+#include <acsdkShutdownManager/ShutdownManager.h>
+
+#include "acsdk/SDKClient/SDKClientRegistry.h"
+
+namespace alexaClientSDK {
+namespace sdkClient {
+/// String to identify log entries originating from this file.
+#define TAG "SDKClientRegistry"
+
+/**
+ * Create a LogEntry using this file's TAG and the specified event string.
+ *
+ * @param event The event string for this @c LogEntry.
+ */
+#define LX(event) alexaClientSDK::avsCommon::utils::logger::LogEntry(TAG, event)
+
+SDKClientRegistry::SDKClientRegistry() : avsCommon::utils::RequiresShutdown(TAG) {
+    m_shutdownNotifier = acsdkShutdownManager::ShutdownNotifier::createShutdownNotifierInterface();
+    m_shutdownManager = acsdkShutdownManager::ShutdownManager::createShutdownManagerInterface(m_shutdownNotifier);
+    if (!m_shutdownNotifier || !m_shutdownManager) {
+        ACSDK_ERROR(LX("constructorFailed").d("reason", "null shutdownManager"));
+    }
+}
+
+bool SDKClientRegistry::initialize() {
+    for (const auto& client : m_clientMapping) {
+        if (!client.second->configure(shared_from_this())) {
+            ACSDK_ERROR(
+                LX("initializeFailed").d("reason", "Client configuration failed").d("client", client.first.getName()));
+            return false;
+        }
+    }
+    return true;
+}
+
+bool SDKClientRegistry::registerClient(
+    const avsCommon::utils::TypeIndex& clientTypeId,
+    std::shared_ptr<FeatureClientInterface> client) {
+    if (!client) {
+        ACSDK_ERROR(LX("registerClientFailed").d("reason", "null client"));
+        return false;
+    }
+    if (m_clientMapping.count(clientTypeId)) {
+        ACSDK_ERROR(LX("registerClientFailed").d("reason", "Client already registered"));
+        return false;
+    }
+    if (m_shutdownNotifier) {
+        m_shutdownNotifier->addObserver(client);
+    }
+    m_clientMapping[clientTypeId] = std::move(client);
+    return true;
+}
+
+bool SDKClientRegistry::registerComponent(
+    const avsCommon::utils::TypeIndex& clientTypeId,
+    std::shared_ptr<void> component) {
+    if (!component) {
+        ACSDK_WARN(LX("registerComponentFailed").d("reason", "Attempt to register null pointer"));
+        return false;
+    }
+
+    if (m_componentMapping.count(clientTypeId)) {
+        // Duplicate component
+        ACSDK_WARN(
+            LX("registerComponentFailed").d("reason", "Component already exists").d("type", clientTypeId.getName()));
+        return false;
+    }
+    m_componentMapping[clientTypeId] = std::move(component);
+    return true;
+}
+
+void SDKClientRegistry::doShutdown() {
+    if (m_shutdownManager) {
+        m_shutdownManager->shutdown();
+    }
+}
+
+bool SDKClientRegistry::addFeature(
+    const avsCommon::utils::TypeIndex& clientTypeId,
+    std::unique_ptr<FeatureClientBuilderInterface> featureBuilder,
+    std::function<std::shared_ptr<FeatureClientInterface>(const std::shared_ptr<SDKClientRegistry>&)> constructorFn) {
+    if (!featureBuilder) {
+        ACSDK_ERROR(LX("addFeatureFailed").d("reason", "null featureBuilder"));
+        return false;
+    }
+    if (!constructorFn) {
+        ACSDK_ERROR(LX("addFeatureFailed").d("reason", "empty constructor function"));
+        return false;
+    }
+    // Verify that each required type is already available
+    const auto& requiredTypes = featureBuilder->getRequiredTypes();
+    for (auto it = requiredTypes.cbegin(); it != requiredTypes.cend(); ++it) {
+        auto componentIt = m_componentMapping.find(*it);
+        if (componentIt == m_componentMapping.end()) {
+            ACSDK_ERROR(LX("addFeatureFailed").d("reason", "Missing required dependency").d("type", it->getName()));
+            return false;
+        }
+    }
+    auto client = constructorFn(shared_from_this());
+    if (!client) {
+        ACSDK_ERROR(LX("addFeatureFailed").d("reason", "Feature construction failed"));
+        return false;
+    }
+
+    if (!client->configure(shared_from_this())) {
+        ACSDK_ERROR(LX("addFeatureFailed").d("reason", "Feature configuration failed"));
+        return false;
+    }
+
+    return registerClient(clientTypeId, std::move(client));
+}
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
diff --git a/shared/SDKClient/src/TypeRegistry.cpp b/shared/SDKClient/src/TypeRegistry.cpp
new file mode 100644
index 0000000000..690a5e39ae
--- /dev/null
+++ b/shared/SDKClient/src/TypeRegistry.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include "acsdk/SDKClient/internal/TypeRegistry.h"
+
+namespace alexaClientSDK {
+namespace sdkClient {
+namespace internal {
+void TypeRegistry::addTypeIndex(const avsCommon::utils::TypeIndex& typeIndex) {
+    m_types.insert(typeIndex);
+}
+
+bool TypeRegistry::empty() const {
+    return m_types.empty();
+}
+
+TypeRegistry TypeRegistry::typeDifference(const TypeRegistry& other) const {
+    TypeRegistry result;
+    for (const auto& type : m_types) {
+        if (!other.m_types.count(type)) {
+            result.m_types.insert(type);
+        }
+    }
+    return result;
+}
+
+bool TypeRegistry::typeDifferenceIsEmpty(const TypeRegistry& other) const {
+    for (const auto& type : m_types) {
+        if (!other.m_types.count(type)) {
+            return false;
+        }
+    }
+    return true;
+}
+
+void TypeRegistry::outputToStream(std::ostream& stream) const {
+    stream << "[";
+    for (auto it = m_types.begin(); it != m_types.end(); ++it) {
+        if (it != m_types.begin()) {
+            stream << ", ";
+        }
+        stream << it->getName();
+    }
+    stream << "]";
+}
+
+std::string TypeRegistry::toString() const {
+    std::stringstream ss;
+    outputToStream(ss);
+    return ss.str();
+}
+
+TypeRegistry::const_iterator TypeRegistry::cbegin() const {
+    return m_types.cbegin();
+}
+
+TypeRegistry::const_iterator TypeRegistry::cend() const {
+    return m_types.cend();
+}
+}  // namespace internal
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
\ No newline at end of file
diff --git a/shared/SDKClient/test/CMakeLists.txt b/shared/SDKClient/test/CMakeLists.txt
new file mode 100644
index 0000000000..7e6e76808a
--- /dev/null
+++ b/shared/SDKClient/test/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+set(LIBRARIES acsdkSDKClient SDKInterfacesTests)
+
+discover_unit_tests("" "${LIBRARIES}")
diff --git a/shared/SDKClient/test/SDKClientRegistryTest.cpp b/shared/SDKClient/test/SDKClientRegistryTest.cpp
new file mode 100644
index 0000000000..523909be01
--- /dev/null
+++ b/shared/SDKClient/test/SDKClientRegistryTest.cpp
@@ -0,0 +1,381 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <memory>
+
+#include "acsdk/SDKClient/SDKClientBuilder.h"
+#include "acsdk/SDKClient/SDKClientRegistry.h"
+
+namespace alexaClientSDK {
+namespace sdkClient {
+namespace test {
+
+using namespace ::testing;
+
+struct MockComponent {};
+struct MockComponent2 {};
+struct Annotation1 {};
+struct Annotation2 {};
+
+/// Mock feature
+class MockFeatureNoReqs : public FeatureClientInterface {
+public:
+    MockFeatureNoReqs() : FeatureClientInterface("MockFeatureNoReqs") {
+    }
+    MOCK_METHOD1(configure, bool(const std::shared_ptr<sdkClient::SDKClientRegistry>&));
+    MOCK_METHOD0(doShutdown, void());
+};
+
+class MockFeatureBuilderNoReqs : public FeatureClientBuilderInterface {
+public:
+    MockFeatureBuilderNoReqs() {
+    }
+    MOCK_METHOD1(construct, std::shared_ptr<MockFeatureNoReqs>(const std::shared_ptr<SDKClientRegistry>& client));
+    MOCK_METHOD0(name, std::string());
+};
+
+// Mock feature with two required types
+class MockFeatureTwoReqs : public FeatureClientInterface {
+public:
+    MockFeatureTwoReqs() : FeatureClientInterface("MockFeatureTwoReqs") {
+    }
+    MOCK_METHOD1(configure, bool(const std::shared_ptr<sdkClient::SDKClientRegistry>&));
+    MOCK_METHOD0(doShutdown, void());
+};
+
+class MockFeatureBuilderTwoReqs : public FeatureClientBuilderInterface {
+public:
+    MockFeatureBuilderTwoReqs() {
+        addRequiredType<MockComponent>();
+        addRequiredType<MockComponent2>();
+    }
+    MOCK_METHOD1(construct, std::shared_ptr<MockFeatureTwoReqs>(const std::shared_ptr<SDKClientRegistry>& client));
+    MOCK_METHOD0(name, std::string());
+};
+
+/// Test harness for @c TemplateRuntime class.
+class SDKClientRegistryTest : public ::testing::Test {
+public:
+    template <typename T, typename Y>
+    std::unique_ptr<T> generateFeatureBuilder(std::shared_ptr<Y> constructedClient) {
+        auto underlyingBuilder = new T();
+        EXPECT_CALL(*underlyingBuilder, construct(_)).Times(1).WillOnce(Return(constructedClient));
+        ON_CALL(*underlyingBuilder, name()).WillByDefault(Return("BuilderName"));
+        return std::unique_ptr<T>(underlyingBuilder);
+    }
+
+    template <typename T>
+    std::unique_ptr<T> generateFeatureClientWithExpectations(bool configureSuccess) {
+        auto underlyingFeature = new T();
+
+        EXPECT_CALL(*underlyingFeature, configure(_)).Times(1).WillOnce(Return(configureSuccess));
+
+        return std::unique_ptr<T>(underlyingFeature);
+    }
+};
+
+/**
+ * Tests that an SDKClientRegistry can be constructed using the SDKClientBuilder
+ */
+TEST_F(SDKClientRegistryTest, test_buildSimpleClient) {
+    SDKClientBuilder builder;
+    builder.withFeature(generateFeatureBuilder<MockFeatureBuilderNoReqs, MockFeatureNoReqs>(
+        generateFeatureClientWithExpectations<MockFeatureNoReqs>(true)));
+    auto client = builder.build();
+    EXPECT_NE(client, nullptr);
+}
+
+/**
+ * Tests the SDKClientBuilder does not add a null feature
+ */
+TEST_F(SDKClientRegistryTest, test_addNullFeature) {
+    SDKClientBuilder builder;
+    std::unique_ptr<MockFeatureBuilderNoReqs> nullFeature;
+    builder.withFeature(std::move(nullFeature));
+    auto client = builder.build();
+    EXPECT_EQ(client, nullptr);
+}
+
+/**
+ * Tests that the builder fails if construction of a dependency fails
+ */
+TEST_F(SDKClientRegistryTest, test_buildSimpleClientConstructionFailure) {
+    SDKClientBuilder builder;
+    builder.withFeature(generateFeatureBuilder<MockFeatureBuilderNoReqs, MockFeatureNoReqs>(nullptr));
+    auto client = builder.build();
+    EXPECT_EQ(client, nullptr);
+}
+
+/**
+ * Tests that the builder fails if configuration of a dependency fails
+ */
+TEST_F(SDKClientRegistryTest, test_buildSimpleClientConfigurationFailure) {
+    SDKClientBuilder builder;
+    builder.withFeature(generateFeatureBuilder<MockFeatureBuilderNoReqs, MockFeatureNoReqs>(
+        generateFeatureClientWithExpectations<MockFeatureNoReqs>(false)));
+    auto client = builder.build();
+    EXPECT_EQ(client, nullptr);
+}
+
+/**
+ * Tests that an SDKClientRegistry successfully resolves dependencies
+ */
+TEST_F(SDKClientRegistryTest, test_buildDependentClient) {
+    SDKClientBuilder builder;
+    auto component1 = std::make_shared<MockComponent>();
+    auto component2 = std::make_shared<MockComponent2>();
+    auto feature1 = std::make_shared<MockFeatureNoReqs>();
+    auto feature1Builder = new MockFeatureBuilderNoReqs();
+    EXPECT_CALL(*feature1Builder, construct(_))
+        .Times(1)
+        .WillOnce(Invoke([component1, component2, feature1](const std::shared_ptr<SDKClientRegistry>& client) {
+            client->registerComponent(component1);
+            client->registerComponent(component2);
+            return feature1;
+        }));
+    EXPECT_CALL(*feature1, configure(_)).Times(1).WillOnce(Return(true));
+    builder.withFeature(std::unique_ptr<MockFeatureBuilderNoReqs>(feature1Builder));
+    builder.withFeature(generateFeatureBuilder<MockFeatureBuilderTwoReqs, MockFeatureTwoReqs>(
+        generateFeatureClientWithExpectations<MockFeatureTwoReqs>(true)));
+    auto client = builder.build();
+    EXPECT_NE(client, nullptr);
+}
+
+/**
+ * Tests that an SDKClientRegistry successfully resolves dependencies when they are added in a different order
+ */
+TEST_F(SDKClientRegistryTest, test_buildDependentClientReversedOrder) {
+    SDKClientBuilder builder;
+    auto component1 = std::make_shared<MockComponent>();
+    auto component2 = std::make_shared<MockComponent2>();
+    auto feature1 = std::make_shared<MockFeatureNoReqs>();
+    auto feature1Builder = new MockFeatureBuilderNoReqs();
+    EXPECT_CALL(*feature1Builder, construct(_))
+        .Times(1)
+        .WillOnce(Invoke([component1, component2, feature1](const std::shared_ptr<SDKClientRegistry>& client) {
+            client->registerComponent(component1);
+            client->registerComponent(component2);
+            return feature1;
+        }));
+    EXPECT_CALL(*feature1, configure(_)).Times(1).WillOnce(Return(true));
+    builder.withFeature(generateFeatureBuilder<MockFeatureBuilderTwoReqs, MockFeatureTwoReqs>(
+        generateFeatureClientWithExpectations<MockFeatureTwoReqs>(true)));
+    builder.withFeature(std::unique_ptr<MockFeatureBuilderNoReqs>(feature1Builder));
+    auto client = builder.build();
+    EXPECT_NE(client, nullptr);
+}
+
+/**
+ * Tests that an SDKClientRegistry is not returned if a dependency is unsatisfied
+ */
+TEST_F(SDKClientRegistryTest, test_buildDependentClientUnsatisfied) {
+    SDKClientBuilder builder;
+    auto noReqFeatureBuilder =
+        generateFeatureBuilder<MockFeatureBuilderNoReqs, MockFeatureNoReqs>(std::make_shared<MockFeatureNoReqs>());
+    auto twoReqFeatureBuilder = new MockFeatureBuilderTwoReqs();
+    EXPECT_CALL(*twoReqFeatureBuilder, construct(_)).Times(0);
+    ON_CALL(*twoReqFeatureBuilder, name()).WillByDefault(Return("MockFeatureBuilderTwoReqs"));
+    builder.withFeature(std::unique_ptr<MockFeatureBuilderNoReqs>(std::move(noReqFeatureBuilder)));
+    builder.withFeature(std::unique_ptr<MockFeatureBuilderTwoReqs>(twoReqFeatureBuilder));
+    auto client = builder.build();
+    EXPECT_EQ(client, nullptr);
+}
+
+/**
+ * Test that a component can be retrieved
+ */
+TEST_F(SDKClientRegistryTest, test_getComponent) {
+    SDKClientBuilder builder;
+    auto component1 = std::make_shared<MockComponent>();
+    auto feature1 = std::make_shared<MockFeatureNoReqs>();
+    auto feature1Builder = new MockFeatureBuilderNoReqs();
+    EXPECT_CALL(*feature1Builder, construct(_))
+        .Times(1)
+        .WillOnce(Invoke([component1, feature1](const std::shared_ptr<SDKClientRegistry>& client) {
+            client->registerComponent(component1);
+            return feature1;
+        }));
+    EXPECT_CALL(*feature1, configure(_)).Times(1).WillOnce(Return(true));
+    builder.withFeature(std::unique_ptr<MockFeatureBuilderNoReqs>(std::move(feature1Builder)));
+    auto client = builder.build();
+    EXPECT_NE(client, nullptr);
+    EXPECT_EQ(client->getComponent<MockComponent>(), component1);
+    EXPECT_EQ(client->getComponent<MockComponent2>(), nullptr);
+}
+
+/**
+ * Test that a client can be retrieved
+ */
+TEST_F(SDKClientRegistryTest, test_getClient) {
+    SDKClientBuilder builder;
+    builder.withFeature(generateFeatureBuilder<MockFeatureBuilderNoReqs, MockFeatureNoReqs>(
+        generateFeatureClientWithExpectations<MockFeatureNoReqs>(true)));
+    auto client = builder.build();
+    EXPECT_NE(client, nullptr);
+    EXPECT_NE(client->get<MockFeatureNoReqs>(), nullptr);
+}
+
+/**
+ * Test that annotated components function correctly
+ */
+TEST_F(SDKClientRegistryTest, test_annotatedComponent) {
+    SDKClientBuilder builder;
+    auto component1 = std::make_shared<MockComponent>();
+    auto component2 = std::make_shared<MockComponent>();
+    auto component3 = std::make_shared<MockComponent>();
+    auto feature1 = new MockFeatureNoReqs();
+    auto feature1Builder = new MockFeatureBuilderNoReqs();
+    EXPECT_CALL(*feature1Builder, construct(_))
+        .Times(1)
+        .WillOnce(
+            Invoke([component1, component2, component3, feature1](const std::shared_ptr<SDKClientRegistry>& client) {
+                client->registerComponent(Annotated<Annotation1, MockComponent>(component1));
+                client->registerComponent(Annotated<Annotation2, MockComponent>(component2));
+                client->registerComponent(component3);
+                return std::shared_ptr<MockFeatureNoReqs>(feature1);
+            }));
+    EXPECT_CALL(*feature1, configure(_)).Times(1).WillOnce(Return(true));
+    builder.withFeature(std::unique_ptr<MockFeatureBuilderNoReqs>(std::move(feature1Builder)));
+    auto client = builder.build();
+    EXPECT_NE(client, nullptr);
+
+    auto retrievedComponent1 = client->getComponent<Annotated<Annotation1, MockComponent>>();
+    auto retrievedComponent2 = client->getComponent<Annotated<Annotation2, MockComponent>>();
+    EXPECT_EQ(retrievedComponent1, component1);
+    EXPECT_EQ(retrievedComponent2, component2);
+    EXPECT_EQ(client->getComponent<MockComponent>(), component3);
+}
+
+/**
+ * Test that duplicate clients are not registered
+ */
+TEST_F(SDKClientRegistryTest, test_duplicateClient) {
+    SDKClientBuilder builder;
+    auto duplicateFeatureBuilder = new MockFeatureBuilderNoReqs();
+    EXPECT_CALL(*duplicateFeatureBuilder, construct(_)).Times(0);
+    builder.withFeature(generateFeatureBuilder<MockFeatureBuilderNoReqs, MockFeatureNoReqs>(
+        generateFeatureClientWithExpectations<MockFeatureNoReqs>(true)));
+    builder.withFeature(std::unique_ptr<MockFeatureBuilderNoReqs>(std::move(duplicateFeatureBuilder)));
+    auto client = builder.build();
+}
+
+/**
+ * Test that duplicate components are not registered
+ */
+TEST_F(SDKClientRegistryTest, test_duplicateComponent) {
+    SDKClientBuilder builder;
+    auto component1 = std::make_shared<MockComponent>();
+    auto feature1 = new MockFeatureNoReqs();
+    auto feature1Builder = new MockFeatureBuilderNoReqs();
+    EXPECT_CALL(*feature1Builder, construct(_))
+        .Times(1)
+        .WillOnce(Invoke([component1, feature1](const std::shared_ptr<SDKClientRegistry>& client) {
+            EXPECT_TRUE(client->registerComponent(component1));
+            EXPECT_FALSE(client->registerComponent(component1));
+            return std::shared_ptr<MockFeatureNoReqs>(feature1);
+        }));
+    EXPECT_CALL(*feature1, configure(_)).Times(1).WillOnce(Return(true));
+    builder.withFeature(std::unique_ptr<MockFeatureBuilderNoReqs>(std::move(feature1Builder)));
+    auto client = builder.build();
+    EXPECT_NE(client, nullptr);
+}
+
+/**
+ * Test that a client can be registered post build
+ */
+TEST_F(SDKClientRegistryTest, test_addFeature) {
+    SDKClientBuilder builder;
+    auto feature1 = new MockFeatureNoReqs();
+    auto feature1Builder = new MockFeatureBuilderNoReqs();
+    EXPECT_CALL(*feature1Builder, construct(_))
+        .Times(1)
+        .WillOnce(Invoke([feature1](const std::shared_ptr<SDKClientRegistry>& client) {
+            client->registerComponent(std::make_shared<MockComponent>());
+            client->registerComponent(std::make_shared<MockComponent2>());
+            return std::shared_ptr<MockFeatureNoReqs>(feature1);
+        }));
+    EXPECT_CALL(*feature1, configure(_)).Times(1).WillOnce(Return(true));
+    builder.withFeature(std::unique_ptr<MockFeatureBuilderNoReqs>(std::move(feature1Builder)));
+    auto client = builder.build();
+    EXPECT_NE(client, nullptr);
+
+    EXPECT_TRUE(client->addFeature(generateFeatureBuilder<MockFeatureBuilderTwoReqs, MockFeatureTwoReqs>(
+        generateFeatureClientWithExpectations<MockFeatureTwoReqs>(true))));
+    EXPECT_NE(client->get<MockFeatureTwoReqs>(), nullptr);
+}
+
+/**
+ * Test that attempting to add a feature post build fails if the requirements are unsatisfied
+ */
+TEST_F(SDKClientRegistryTest, test_addFeaturesRequirementsUnsatisfied) {
+    SDKClientBuilder builder;
+    auto feature1 = new MockFeatureNoReqs();
+    auto feature1Builder = new MockFeatureBuilderNoReqs();
+    EXPECT_CALL(*feature1Builder, construct(_))
+        .Times(1)
+        .WillOnce(Invoke([feature1](const std::shared_ptr<SDKClientRegistry>& client) {
+            client->registerComponent(std::make_shared<MockComponent>());
+            return std::shared_ptr<MockFeatureNoReqs>(feature1);
+        }));
+    EXPECT_CALL(*feature1, configure(_)).Times(1).WillOnce(Return(true));
+    builder.withFeature(std::unique_ptr<MockFeatureBuilderNoReqs>(std::move(feature1Builder)));
+    auto client = builder.build();
+    EXPECT_NE(client, nullptr);
+
+    auto feature2Builder = new MockFeatureBuilderTwoReqs();
+    EXPECT_CALL(*feature2Builder, construct(_)).Times(0);
+    EXPECT_FALSE(client->addFeature(std::unique_ptr<MockFeatureBuilderTwoReqs>(std::move(feature2Builder))));
+    EXPECT_EQ(client->get<MockFeatureTwoReqs>(), nullptr);
+}
+
+/**
+ * Tests that clients are shutdown in reverse order of construction
+ */
+TEST_F(SDKClientRegistryTest, test_shutdown) {
+    SDKClientBuilder builder;
+    auto component1 = std::make_shared<MockComponent>();
+    auto component2 = std::make_shared<MockComponent2>();
+    auto feature1 = std::make_shared<MockFeatureNoReqs>();
+    auto feature1Builder = new MockFeatureBuilderNoReqs();
+    EXPECT_CALL(*feature1Builder, construct(_))
+        .Times(1)
+        .WillOnce(Invoke([component1, component2, feature1](const std::shared_ptr<SDKClientRegistry>& client) {
+            client->registerComponent(component1);
+            client->registerComponent(component2);
+            return feature1;
+        }));
+    EXPECT_CALL(*feature1, configure(_)).WillOnce(Return(true));
+    builder.withFeature(std::unique_ptr<MockFeatureBuilderNoReqs>(feature1Builder));
+
+    auto feature2 = std::make_shared<MockFeatureTwoReqs>();
+    auto feature2Builder = new MockFeatureBuilderTwoReqs();
+    EXPECT_CALL(*feature2Builder, construct(_))
+        .Times(1)
+        .WillOnce(Invoke([feature2](const std::shared_ptr<SDKClientRegistry>& client) { return feature2; }));
+    EXPECT_CALL(*feature2, configure(_)).WillOnce(Return(true));
+    builder.withFeature(std::unique_ptr<MockFeatureBuilderTwoReqs>(feature2Builder));
+    auto client = builder.build();
+    EXPECT_NE(client, nullptr);
+    Sequence seq;
+    EXPECT_CALL(*feature2, doShutdown()).InSequence(seq);
+    EXPECT_CALL(*feature1, doShutdown()).InSequence(seq);
+    client->shutdown();
+}
+
+}  // namespace test
+}  // namespace sdkClient
+}  // namespace alexaClientSDK
diff --git a/shared/acsdkCommunication/include/acsdkCommunication/InMemoryCommunicationPropertiesHandler.h b/shared/acsdkCommunication/include/acsdkCommunication/InMemoryCommunicationPropertiesHandler.h
index fc8b1022f9..f674727de2 100644
--- a/shared/acsdkCommunication/include/acsdkCommunication/InMemoryCommunicationPropertiesHandler.h
+++ b/shared/acsdkCommunication/include/acsdkCommunication/InMemoryCommunicationPropertiesHandler.h
@@ -26,7 +26,7 @@
 #include <acsdkCommunicationInterfaces/CommunicationPropertyChangeSubscriber.h>
 #include <acsdkCommunicationInterfaces/CommunicationPropertyValidatorInterface.h>
 #include <acsdkCommunicationInterfaces/CommunicationPropertiesHandlerInterface.h>
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 
 namespace alexaClientSDK {
 namespace acsdkCommunication {
@@ -57,7 +57,7 @@ class InMemoryCommunicationPropertiesHandler
      */
     class WeakSubscriptionProxy
             : public acsdkCommunicationInterfaces::CommunicationPropertyChangeSubscriber<T>
-            , public acsdkNotifier::Notifier<acsdkCommunicationInterfaces::CommunicationPropertyChangeSubscriber<T>> {
+            , public notifier::Notifier<acsdkCommunicationInterfaces::CommunicationPropertyChangeSubscriber<T>> {
     public:
         /// @name CommunictionPropertyChangeSubscriber methods
         /// @{
diff --git a/shared/acsdkCommunicationInterfaces/include/acsdkCommunicationInterfaces/CommunicationProperty.h b/shared/acsdkCommunicationInterfaces/include/acsdkCommunicationInterfaces/CommunicationProperty.h
index 9505bf67d7..60e693cccc 100644
--- a/shared/acsdkCommunicationInterfaces/include/acsdkCommunicationInterfaces/CommunicationProperty.h
+++ b/shared/acsdkCommunicationInterfaces/include/acsdkCommunicationInterfaces/CommunicationProperty.h
@@ -20,7 +20,7 @@
 #include <AVSCommon/Utils/Logger/Logger.h>
 #include <AVSCommon/Utils/Threading/Executor.h>
 #include <acsdkCommunicationInterfaces/CommunicationPropertyChangeSubscriber.h>
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 
 namespace alexaClientSDK {
 namespace acsdkCommunicationInterfaces {
@@ -33,10 +33,6 @@ namespace acsdkCommunicationInterfaces {
 template <typename T>
 class CommunicationProperty {
 public:
-    ~CommunicationProperty() {
-        m_executor.waitForSubmittedTasks();
-        m_executor.shutdown();
-    }
     /**
      * setValue allows setting of the value without going through the CommunicationPropertiesHandlerInterface
      * @param newValue The newValue which we are setting the value to.
@@ -45,7 +41,16 @@ class CommunicationProperty {
     bool setValue(T newValue) {
         std::unique_lock<std::mutex> lock(m_propertyMutex);
         m_value = newValue;
-        m_executor.submit([this, newValue]() { notifyOnCommunicationPropertyChange(m_name, newValue); });
+        auto weakSubscriptionProxy = m_weakSubscriptionProxy;
+        auto propertyName = m_name;
+        /// Capturing a snapshot of this communication property and notifying the subscribers by submitting this
+        /// to the executor.
+        m_staticExecutor.execute([weakSubscriptionProxy, newValue, propertyName]() {
+            weakSubscriptionProxy->notifyObservers(
+                [=](const std::shared_ptr<CommunicationPropertyChangeSubscriber<T>>& obs) {
+                    obs->onCommunicationPropertyChange(propertyName, newValue);
+                });
+        });
         return true;
     }
 
@@ -84,7 +89,7 @@ class CommunicationProperty {
      * @return true if subscriber is valid and was added, false otherwise.
      */
     bool addSubscriber(const std::weak_ptr<CommunicationPropertyChangeSubscriber<T>>& subscriber) {
-        m_weakSubscriptionProxy.addWeakPtrObserver(subscriber);
+        m_weakSubscriptionProxy->addWeakPtrObserver(subscriber);
         return !subscriber.expired();
     }
 
@@ -93,7 +98,7 @@ class CommunicationProperty {
      * @param subscriber The subscriber that doesn't want to listen to property change events.
      */
     void removeSubscriber(const std::shared_ptr<CommunicationPropertyChangeSubscriber<T>>& subscriber) {
-        m_weakSubscriptionProxy.removeWeakPtrObserver(subscriber);
+        m_weakSubscriptionProxy->removeWeakPtrObserver(subscriber);
     }
 
 private:
@@ -101,7 +106,7 @@ class CommunicationProperty {
      * Notify subscribers of a change to a the property value. This is called from an executor.
      */
     bool notifyOnCommunicationPropertyChange(const std::string& propertyName, T newValue) {
-        m_weakSubscriptionProxy.notifyObservers(
+        m_weakSubscriptionProxy->notifyObservers(
             [=](const std::shared_ptr<CommunicationPropertyChangeSubscriber<T>>& obs) {
                 obs->onCommunicationPropertyChange(propertyName, newValue);
             });
@@ -115,6 +120,7 @@ class CommunicationProperty {
      * @param writeable If the property is writeable or not.
      */
     CommunicationProperty<T>(std::string name, T initValue, bool writeable) :
+            m_weakSubscriptionProxy{std::make_shared<notifier::Notifier<CommunicationPropertyChangeSubscriber<T>>>()},
             m_name{std::move(name)},
             m_value{std::move(initValue)},
             m_writeable{writeable} {
@@ -122,7 +128,7 @@ class CommunicationProperty {
 
 private:
     /// The communication Property to notify on setValue events.
-    acsdkNotifier::Notifier<CommunicationPropertyChangeSubscriber<T>> m_weakSubscriptionProxy;
+    const std::shared_ptr<notifier::Notifier<CommunicationPropertyChangeSubscriber<T>>> m_weakSubscriptionProxy;
 
     /// The name of property
     const std::string m_name;
@@ -133,12 +139,16 @@ class CommunicationProperty {
     /// Is the property writeable
     const bool m_writeable;
 
-    /// Mutex to protect the poperty value
+    /// Mutex to protect the property value
     std::mutex m_propertyMutex;
 
-    avsCommon::utils::threading::Executor m_executor;
+    /// Static executor for all Communication Properties.
+    static avsCommon::utils::threading::Executor m_staticExecutor;
 };
 
+template <typename T>
+avsCommon::utils::threading::Executor CommunicationProperty<T>::m_staticExecutor;
+
 }  // namespace acsdkCommunicationInterfaces
 }  // namespace alexaClientSDK
 
diff --git a/shared/acsdkManufactory/include/acsdkManufactory/internal/AbstractRecipe.h b/shared/acsdkManufactory/include/acsdkManufactory/internal/AbstractRecipe.h
index ff52ee48d6..9eb8481ea2 100644
--- a/shared/acsdkManufactory/include/acsdkManufactory/internal/AbstractRecipe.h
+++ b/shared/acsdkManufactory/include/acsdkManufactory/internal/AbstractRecipe.h
@@ -16,7 +16,7 @@
 #ifndef ACSDKMANUFACTORY_INTERNAL_ABSTRACTRECIPE_H_
 #define ACSDKMANUFACTORY_INTERNAL_ABSTRACTRECIPE_H_
 
-#include "acsdkManufactory/internal/TypeIndex.h"
+#include <AVSCommon/Utils/TypeIndex.h>
 
 namespace alexaClientSDK {
 namespace acsdkManufactory {
@@ -129,18 +129,18 @@ class AbstractRecipe {
      *
      * @return The start of a vector enumerating the dependencies of the interface this Recipe creates.
      */
-    std::vector<TypeIndex>::const_iterator begin() const;
+    std::vector<avsCommon::utils::TypeIndex>::const_iterator begin() const;
 
     /**
      * Get the end of a vector enumerating the dependencies of the interface this Recipe creates.
      *
      * @return The end of a vector enumerating the dependencies of the interface this Recipe creates.
      */
-    std::vector<TypeIndex>::const_iterator end() const;
+    std::vector<avsCommon::utils::TypeIndex>::const_iterator end() const;
 
 protected:
     /// Vector enumerating the dependencies of the interface this @c AbstractRecipe creates.
-    std::vector<TypeIndex> m_dependencies;
+    std::vector<avsCommon::utils::TypeIndex> m_dependencies;
 
     /// Function pointer that can produce an instance of this type.
     ProduceInstanceFunction m_produceFunction;
@@ -171,11 +171,11 @@ inline AbstractRecipe::DeleteInstanceFunction AbstractRecipe::getDeleteInstanceF
     return m_deleteFunction;
 }
 
-inline std::vector<TypeIndex>::const_iterator AbstractRecipe::begin() const {
+inline std::vector<avsCommon::utils::TypeIndex>::const_iterator AbstractRecipe::begin() const {
     return m_dependencies.begin();
 }
 
-inline std::vector<TypeIndex>::const_iterator AbstractRecipe::end() const {
+inline std::vector<avsCommon::utils::TypeIndex>::const_iterator AbstractRecipe::end() const {
     return m_dependencies.end();
 }
 
diff --git a/shared/acsdkManufactory/include/acsdkManufactory/internal/CookBook.h b/shared/acsdkManufactory/include/acsdkManufactory/internal/CookBook.h
index 52d0059e63..b47a46f169 100644
--- a/shared/acsdkManufactory/include/acsdkManufactory/internal/CookBook.h
+++ b/shared/acsdkManufactory/include/acsdkManufactory/internal/CookBook.h
@@ -23,10 +23,11 @@
 #include <unordered_set>
 #include <vector>
 
+#include <AVSCommon/Utils/TypeIndex.h>
+
 #include "acsdkManufactory/Annotated.h"
 #include "acsdkManufactory/internal/AbstractPointerCache.h"
 #include "acsdkManufactory/internal/AbstractRecipe.h"
-#include "acsdkManufactory/internal/TypeIndex.h"
 
 namespace alexaClientSDK {
 namespace acsdkManufactory {
@@ -353,7 +354,7 @@ class CookBook {
         FactoryRecipe(
             Factory factory,
             CachedInstanceLifecycle lifecycle,
-            std::vector<TypeIndex> dependencies,
+            std::vector<avsCommon::utils::TypeIndex> dependencies,
             ProduceInstanceFunction produceFunction,
             DeleteInstanceFunction deleteFunction);
 
@@ -403,7 +404,7 @@ class CookBook {
         FunctionRecipe(
             Function function,
             CachedInstanceLifecycle lifecycle,
-            std::vector<TypeIndex> dependencies,
+            std::vector<avsCommon::utils::TypeIndex> dependencies,
             ProduceInstanceFunction produceFunction,
             DeleteInstanceFunction deleteFunction,
             DeleteRecipeFunction deleteRecipeFunction);
@@ -783,7 +784,7 @@ class CookBook {
 
     private:
         /// Map of TypeIndex to the index of the GetWrapper in m_orderedGetWrappers.
-        std::unordered_map<TypeIndex, std::size_t> m_types;
+        std::unordered_map<avsCommon::utils::TypeIndex, std::size_t> m_types;
 
         /// Vector of GetWrappers.
         std::vector<GetWrapper> m_orderedGetWrappers;
@@ -802,7 +803,7 @@ class CookBook {
      * @param newRecipe The new instance recipe to add.
      * @return Whether adding the instance was successful.
      */
-    bool addInstance(TypeIndex type, const std::shared_ptr<AbstractRecipe>& newInstanceRecipe);
+    bool addInstance(avsCommon::utils::TypeIndex type, const std::shared_ptr<AbstractRecipe>& newInstanceRecipe);
 
     /**
      * Add a recipe to the CookBook.
@@ -811,7 +812,7 @@ class CookBook {
      * @param newRecipe The new recipe to add.
      * @return Whether adding the recipe was successful.
      */
-    bool addRecipe(TypeIndex type, const std::shared_ptr<AbstractRecipe>& newRecipe);
+    bool addRecipe(avsCommon::utils::TypeIndex type, const std::shared_ptr<AbstractRecipe>& newRecipe);
 
     /**
      * Check this cookbook for cyclic dependency relationships.
@@ -878,7 +879,7 @@ class CookBook {
     bool m_isValid;
 
     /// Map from interface types to the recipe for getting an instance of that type.
-    std::unordered_map<TypeIndex, std::shared_ptr<AbstractRecipe>> m_recipes;
+    std::unordered_map<avsCommon::utils::TypeIndex, std::shared_ptr<AbstractRecipe>> m_recipes;
 
     /// The collection of functions that need to be called to trigger @c get<Type>() calls for all primary types in this
     /// @c CookBook.
diff --git a/shared/acsdkManufactory/include/acsdkManufactory/internal/CookBook_imp.h b/shared/acsdkManufactory/include/acsdkManufactory/internal/CookBook_imp.h
index fff6159953..07f0899dc8 100644
--- a/shared/acsdkManufactory/include/acsdkManufactory/internal/CookBook_imp.h
+++ b/shared/acsdkManufactory/include/acsdkManufactory/internal/CookBook_imp.h
@@ -45,7 +45,7 @@ inline CookBook& CookBook::addUniqueFactory(std::function<std::unique_ptr<Type>(
 
     using ResultType = std::unique_ptr<Type>;
     auto funcPtr = new std::function<ResultType(Dependencies...)>(function);
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FunctionRecipe>(
         reinterpret_cast<void*>(funcPtr),
@@ -56,7 +56,7 @@ inline CookBook& CookBook::addUniqueFactory(std::function<std::unique_ptr<Type>(
         static_cast<void (*)(void*)>(deleteFunctionForUniqueRecipe),
         static_cast<void (*)(void*)>(deleteFunctionForFunctionRecipeFunction<ResultType, Dependencies...>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addUniqueFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -71,7 +71,7 @@ inline CookBook& CookBook::addUniqueFactory(std::unique_ptr<Type> (*factory)(Dep
     }
 
     using ResultType = std::unique_ptr<Type>;
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FactoryRecipe>(
         reinterpret_cast<void* (*)()>(factory),
@@ -81,7 +81,7 @@ inline CookBook& CookBook::addUniqueFactory(std::unique_ptr<Type> (*factory)(Dep
             produceFromUniqueFactoryRecipe<Type, Dependencies...>),
         static_cast<void (*)(void*)>(deleteFunctionForUniqueRecipe));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addUniqueFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -97,7 +97,7 @@ inline CookBook& CookBook::addPrimaryFactory(std::function<std::shared_ptr<Type>
 
     using ResultType = std::shared_ptr<Type>;
     auto funcPtr = new std::function<ResultType(Dependencies...)>(function);
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FunctionRecipe>(
         reinterpret_cast<void*>(funcPtr),
@@ -108,7 +108,7 @@ inline CookBook& CookBook::addPrimaryFactory(std::function<std::shared_ptr<Type>
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>),
         static_cast<void (*)(void*)>(deleteFunctionForFunctionRecipeFunction<ResultType, Dependencies...>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addPrimaryFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -127,7 +127,7 @@ inline CookBook& CookBook::addPrimaryFactory(std::function<Annotated<Annotation,
 
     using ResultType = Annotated<Annotation, Type>;
     auto funcPtr = new std::function<ResultType(Dependencies...)>(function);
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FunctionRecipe>(
         reinterpret_cast<void*>(funcPtr),
@@ -138,7 +138,7 @@ inline CookBook& CookBook::addPrimaryFactory(std::function<Annotated<Annotation,
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>),
         static_cast<void (*)(void*)>(deleteFunctionForFunctionRecipeFunction<ResultType, Dependencies...>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addPrimaryFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -156,7 +156,7 @@ inline CookBook& CookBook::addPrimaryFactory(std::shared_ptr<Type> (*factory)(De
     }
 
     using ResultType = std::shared_ptr<Type>;
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FactoryRecipe>(
         reinterpret_cast<void* (*)()>(factory),
@@ -166,7 +166,7 @@ inline CookBook& CookBook::addPrimaryFactory(std::shared_ptr<Type> (*factory)(De
             produceFromSharedFactoryRecipe<Type, Dependencies...>),
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addPrimaryFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -184,7 +184,7 @@ inline CookBook& CookBook::addPrimaryFactory(Annotated<Annotation, Type> (*facto
     }
 
     using ResultType = Annotated<Annotation, Type>;
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FactoryRecipe>(
         reinterpret_cast<void* (*)()>(factory),
@@ -194,7 +194,7 @@ inline CookBook& CookBook::addPrimaryFactory(Annotated<Annotation, Type> (*facto
             produceFromAnnotatedSharedFactoryRecipe<Type, Annotation, Dependencies...>),
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addPrimaryFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -213,7 +213,7 @@ inline CookBook& CookBook::addRequiredFactory(std::function<std::shared_ptr<Type
 
     using ResultType = std::shared_ptr<Type>;
     auto funcPtr = new std::function<ResultType(Dependencies...)>(function);
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FunctionRecipe>(
         reinterpret_cast<void*>(funcPtr),
@@ -224,7 +224,7 @@ inline CookBook& CookBook::addRequiredFactory(std::function<std::shared_ptr<Type
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>),
         static_cast<void (*)(void*)>(deleteFunctionForFunctionRecipeFunction<ResultType, Dependencies...>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addRequiredFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -243,7 +243,7 @@ inline CookBook& CookBook::addRequiredFactory(std::function<Annotated<Annotation
 
     using ResultType = Annotated<Annotation, Type>;
     auto funcPtr = new std::function<ResultType(Dependencies...)>(function);
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FunctionRecipe>(
         reinterpret_cast<void*>(funcPtr),
@@ -254,7 +254,7 @@ inline CookBook& CookBook::addRequiredFactory(std::function<Annotated<Annotation
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>),
         static_cast<void (*)(void*)>(deleteFunctionForFunctionRecipeFunction<ResultType, Dependencies...>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addRequiredFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -272,7 +272,7 @@ inline CookBook& CookBook::addRequiredFactory(std::shared_ptr<Type> (*factory)(D
     }
 
     using ResultType = std::shared_ptr<Type>;
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FactoryRecipe>(
         reinterpret_cast<void* (*)()>(factory),
@@ -282,7 +282,7 @@ inline CookBook& CookBook::addRequiredFactory(std::shared_ptr<Type> (*factory)(D
             produceFromSharedFactoryRecipe<Type, Dependencies...>),
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addRequiredFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -300,7 +300,7 @@ inline CookBook& CookBook::addRequiredFactory(Annotated<Annotation, Type> (*fact
     }
 
     using ResultType = Annotated<Annotation, Type>;
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FactoryRecipe>(
         reinterpret_cast<void* (*)()>(factory),
@@ -310,7 +310,7 @@ inline CookBook& CookBook::addRequiredFactory(Annotated<Annotation, Type> (*fact
             produceFromAnnotatedSharedFactoryRecipe<Type, Annotation, Dependencies...>),
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addRequiredFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -329,7 +329,7 @@ inline CookBook& CookBook::addRetainedFactory(std::function<std::shared_ptr<Type
 
     using ResultType = std::shared_ptr<Type>;
     auto funcPtr = new std::function<ResultType(Dependencies...)>(function);
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FunctionRecipe>(
         reinterpret_cast<void*>(funcPtr),
@@ -340,7 +340,7 @@ inline CookBook& CookBook::addRetainedFactory(std::function<std::shared_ptr<Type
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>),
         static_cast<void (*)(void*)>(deleteFunctionForFunctionRecipeFunction<ResultType, Dependencies...>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addRetainedFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -356,7 +356,7 @@ inline CookBook& CookBook::addRetainedFactory(std::function<Annotated<Annotation
 
     using ResultType = Annotated<Annotation, Type>;
     auto funcPtr = new std::function<ResultType(Dependencies...)>(function);
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FunctionRecipe>(
         reinterpret_cast<void*>(funcPtr),
@@ -367,7 +367,7 @@ inline CookBook& CookBook::addRetainedFactory(std::function<Annotated<Annotation
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>),
         static_cast<void (*)(void*)>(deleteFunctionForFunctionRecipeFunction<ResultType, Dependencies...>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addRetainedFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -382,7 +382,7 @@ inline CookBook& CookBook::addRetainedFactory(std::shared_ptr<Type> (*factory)(D
     }
 
     using ResultType = std::shared_ptr<Type>;
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FactoryRecipe>(
         reinterpret_cast<void* (*)()>(factory),
@@ -392,7 +392,7 @@ inline CookBook& CookBook::addRetainedFactory(std::shared_ptr<Type> (*factory)(D
             produceFromSharedFactoryRecipe<Type, Dependencies...>),
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addRetainedFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -407,7 +407,7 @@ inline CookBook& CookBook::addRetainedFactory(Annotated<Annotation, Type> (*fact
     }
 
     using ResultType = Annotated<Annotation, Type>;
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FactoryRecipe>(
         reinterpret_cast<void* (*)()>(factory),
@@ -417,7 +417,7 @@ inline CookBook& CookBook::addRetainedFactory(Annotated<Annotation, Type> (*fact
             produceFromAnnotatedSharedFactoryRecipe<Type, Annotation, Dependencies...>),
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addRetainedFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -433,7 +433,7 @@ inline CookBook& CookBook::addUnloadableFactory(std::function<std::shared_ptr<Ty
 
     using ResultType = std::shared_ptr<Type>;
     auto funcPtr = new std::function<ResultType(Dependencies...)>(function);
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FunctionRecipe>(
         reinterpret_cast<void*>(funcPtr),
@@ -444,7 +444,7 @@ inline CookBook& CookBook::addUnloadableFactory(std::function<std::shared_ptr<Ty
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>),
         static_cast<void (*)(void*)>(deleteFunctionForFunctionRecipeFunction<ResultType, Dependencies...>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addUnloadableFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -460,7 +460,7 @@ inline CookBook& CookBook::addUnloadableFactory(std::function<Annotated<Annotati
 
     using ResultType = Annotated<Annotation, Type>;
     auto funcPtr = new std::function<ResultType(Dependencies...)>(function);
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FunctionRecipe>(
         reinterpret_cast<void*>(funcPtr),
@@ -471,7 +471,7 @@ inline CookBook& CookBook::addUnloadableFactory(std::function<Annotated<Annotati
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>),
         static_cast<void (*)(void*)>(deleteFunctionForFunctionRecipeFunction<ResultType, Dependencies...>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addUnloadableFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -486,7 +486,7 @@ inline CookBook& CookBook::addUnloadableFactory(std::shared_ptr<Type> (*factory)
     }
 
     using ResultType = std::shared_ptr<Type>;
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FactoryRecipe>(
         reinterpret_cast<void* (*)()>(factory),
@@ -496,7 +496,7 @@ inline CookBook& CookBook::addUnloadableFactory(std::shared_ptr<Type> (*factory)
             produceFromSharedFactoryRecipe<Type, Dependencies...>),
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addUnloadableFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -511,7 +511,7 @@ inline CookBook& CookBook::addUnloadableFactory(Annotated<Annotation, Type> (*fa
     }
 
     using ResultType = Annotated<Annotation, Type>;
-    std::vector<TypeIndex> dependencies = {getTypeIndex<Dependencies>()...};
+    std::vector<avsCommon::utils::TypeIndex> dependencies = {avsCommon::utils::getTypeIndex<Dependencies>()...};
 
     auto newRecipe = std::make_shared<FactoryRecipe>(
         reinterpret_cast<void* (*)()>(factory),
@@ -521,7 +521,7 @@ inline CookBook& CookBook::addUnloadableFactory(Annotated<Annotation, Type> (*fa
             produceFromAnnotatedSharedFactoryRecipe<Type, Annotation, Dependencies...>),
         static_cast<void (*)(void*)>(deleteFunctionForSharedRecipe<Type>));
 
-    TypeIndex type = getTypeIndex<ResultType>();
+    auto type = avsCommon::utils::getTypeIndex<ResultType>();
     if (!addRecipe(type, newRecipe)) {
         markInvalid("addUnloadableFactoryFailed", "non-isEquivalent recipe ", type.getName());
     }
@@ -540,7 +540,7 @@ inline CookBook& CookBook::addInstance(const Type& instance) {
         static_cast<void* (*)(std::shared_ptr<AbstractRecipe>, RuntimeManufactory&, void*)>(produceFromInstanceRecipe),
         static_cast<void (*)(void*)>(deleteFunctionForInstanceRecipe));
 
-    TypeIndex type = getTypeIndex<Type>();
+    auto type = avsCommon::utils::getTypeIndex<Type>();
     if (!addInstance(type, newRecipe)) {
         markInvalid("addInstanceFailed", "non-isEquivalent instance ", type.getName());
     }
@@ -548,7 +548,9 @@ inline CookBook& CookBook::addInstance(const Type& instance) {
     return *this;
 }
 
-inline bool CookBook::addInstance(TypeIndex type, const std::shared_ptr<AbstractRecipe>& newInstanceRecipe) {
+inline bool CookBook::addInstance(
+    avsCommon::utils::TypeIndex type,
+    const std::shared_ptr<AbstractRecipe>& newInstanceRecipe) {
     auto& RecipePtr = m_recipes[type];
     if (RecipePtr) {
         if (!RecipePtr->isEquivalent(newInstanceRecipe)) {
@@ -561,7 +563,7 @@ inline bool CookBook::addInstance(TypeIndex type, const std::shared_ptr<Abstract
     return true;
 }
 
-inline bool CookBook::addRecipe(TypeIndex type, const std::shared_ptr<AbstractRecipe>& newRecipe) {
+inline bool CookBook::addRecipe(avsCommon::utils::TypeIndex type, const std::shared_ptr<AbstractRecipe>& newRecipe) {
     auto& RecipePtr = m_recipes[type];
     if (RecipePtr) {
 /// Remove this check for Windows only.
@@ -630,7 +632,7 @@ inline std::unique_ptr<Type> CookBook::createUniquePointer(RuntimeManufactory& r
         return std::unique_ptr<Type>();
     }
 
-    auto type = getTypeIndex<std::unique_ptr<Type>>();
+    auto type = avsCommon::utils::getTypeIndex<std::unique_ptr<Type>>();
     auto it = m_recipes.find(type);
     if (it != m_recipes.end()) {
         if (it->second) {
@@ -670,7 +672,7 @@ inline std::unique_ptr<AbstractPointerCache> CookBook::createPointerCache() {
         return std::unique_ptr<SharedPointerCache>();
     }
 
-    auto type = getTypeIndex<Type>();
+    auto type = avsCommon::utils::getTypeIndex<Type>();
     auto it = m_recipes.find(type);
     if (it != m_recipes.end()) {
         if (it->second) {
@@ -908,7 +910,7 @@ inline void* CookBook::produceFromUniqueFunctionRecipe(
 
 template <typename Type>
 inline bool CookBook::GetWrapperCollection::append(GetWrapper getWrapper) {
-    auto typeIndex = getTypeIndex<Type>();
+    auto typeIndex = avsCommon::utils::getTypeIndex<Type>();
 
     if (m_types.end() == m_types.find(typeIndex)) {
         m_orderedGetWrappers.push_back(getWrapper);
diff --git a/shared/acsdkManufactory/include/acsdkManufactory/internal/RuntimeManufactory.h b/shared/acsdkManufactory/include/acsdkManufactory/internal/RuntimeManufactory.h
index c1e8253fda..29d4db28c0 100644
--- a/shared/acsdkManufactory/include/acsdkManufactory/internal/RuntimeManufactory.h
+++ b/shared/acsdkManufactory/include/acsdkManufactory/internal/RuntimeManufactory.h
@@ -21,9 +21,10 @@
 #include <unordered_map>
 #include <vector>
 
+#include <AVSCommon/Utils/TypeIndex.h>
+
 #include "acsdkManufactory/Annotated.h"
 #include "acsdkManufactory/internal/AbstractPointerCache.h"
-#include "acsdkManufactory/internal/TypeIndex.h"
 
 namespace alexaClientSDK {
 namespace acsdkManufactory {
@@ -86,7 +87,7 @@ class RuntimeManufactory {
     std::unique_ptr<CookBook> m_cookBook;
 
     /// Map from interface types to cached values.
-    std::unordered_map<TypeIndex, std::shared_ptr<AbstractPointerCache>> m_values;
+    std::unordered_map<avsCommon::utils::TypeIndex, std::shared_ptr<AbstractPointerCache>> m_values;
 };
 
 }  // namespace internal
diff --git a/shared/acsdkManufactory/include/acsdkManufactory/internal/RuntimeManufactory_imp.h b/shared/acsdkManufactory/include/acsdkManufactory/internal/RuntimeManufactory_imp.h
index 228bf69f4f..50608b7907 100644
--- a/shared/acsdkManufactory/include/acsdkManufactory/internal/RuntimeManufactory_imp.h
+++ b/shared/acsdkManufactory/include/acsdkManufactory/internal/RuntimeManufactory_imp.h
@@ -16,10 +16,11 @@
 #ifndef ACSDKMANUFACTORY_INTERNAL_RUNTIMEMANUFACTORY_IMP_H_
 #define ACSDKMANUFACTORY_INTERNAL_RUNTIMEMANUFACTORY_IMP_H_
 
+#include <AVSCommon/Utils/TypeIndex.h>
+
 #include "acsdkManufactory/internal/CookBook.h"
 #include "acsdkManufactory/internal/SharedPointerCache.h"
 #include "acsdkManufactory/internal/RuntimeManufactory.h"
-#include "acsdkManufactory/internal/TypeIndex.h"
 
 namespace alexaClientSDK {
 namespace acsdkManufactory {
@@ -45,7 +46,7 @@ inline std::shared_ptr<Type> RuntimeManufactory::innerGet(std::shared_ptr<Type>*
     using ResultType = std::shared_ptr<Type>;
     ResultType ret;
 
-    auto resultTypeIndex = getTypeIndex<ResultType>();
+    auto resultTypeIndex = avsCommon::utils::getTypeIndex<ResultType>();
 
     auto it = m_values.find(resultTypeIndex);
     if (m_values.end() == it || !it->second) {
@@ -67,7 +68,7 @@ inline Annotated<Annotation, Type> RuntimeManufactory::innerGet(Annotated<Annota
     using ResultType = Annotated<Annotation, Type>;
     ResultType ret;
 
-    auto resultTypeIndex = getTypeIndex<ResultType>();
+    auto resultTypeIndex = avsCommon::utils::getTypeIndex<ResultType>();
 
     auto it = m_values.find(resultTypeIndex);
     if (m_values.end() == it || !it->second) {
diff --git a/shared/acsdkManufactory/src/CookBook.cpp b/shared/acsdkManufactory/src/CookBook.cpp
index 37409cd62a..5fce08f9f3 100644
--- a/shared/acsdkManufactory/src/CookBook.cpp
+++ b/shared/acsdkManufactory/src/CookBook.cpp
@@ -22,7 +22,7 @@ namespace acsdkManufactory {
 namespace internal {
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("Cookbook");
+#define TAG "Cookbook"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
@@ -39,21 +39,21 @@ bool CookBook::checkForCyclicDependencies() {
     // 'in progress' that indicates a circular dependency.
 
     // Note, std::map<> used here for stability of iterators.
-    using TypeToCompletedMap = std::map<TypeIndex, bool>;
+    using TypeToCompletedMap = std::map<avsCommon::utils::TypeIndex, bool>;
 
     // Position at one level in DFS traversal.
     struct Position {
         TypeToCompletedMap::iterator typeToCompletedIt;
-        std::vector<TypeIndex>::const_iterator nextDependency;
-        std::vector<TypeIndex>::const_iterator endOfDependencies;
+        std::vector<avsCommon::utils::TypeIndex>::const_iterator nextDependency;
+        std::vector<avsCommon::utils::TypeIndex>::const_iterator endOfDependencies;
     };
 
     // Regularize the depth first search to include all types in the CookBook by creating a dummy 'root'
     // type that includes all types as dependencies.
 
     TypeToCompletedMap typeToCompletedMap;
-    auto terminalCompletedIt = typeToCompletedMap.insert({getTypeIndex<CookBook>(), false}).first;
-    std::vector<TypeIndex> allTypes;
+    auto terminalCompletedIt = typeToCompletedMap.insert({avsCommon::utils::getTypeIndex<CookBook>(), false}).first;
+    std::vector<avsCommon::utils::TypeIndex> allTypes;
     for (auto item : m_recipes) {
         allTypes.push_back(item.first);
     }
@@ -142,7 +142,7 @@ void CookBook::deleteFunctionForInstanceRecipe(void* cachedValue) {
 CookBook::FactoryRecipe::FactoryRecipe(
     Factory factory,
     CachedInstanceLifecycle lifecycle,
-    std::vector<TypeIndex> dependencies,
+    std::vector<avsCommon::utils::TypeIndex> dependencies,
     ProduceInstanceFunction produceFunction,
     DeleteInstanceFunction deleteFunction) {
     this->m_objectLifecycle = lifecycle;
@@ -171,7 +171,7 @@ CookBook::FactoryRecipe::Factory CookBook::FactoryRecipe::getFactory() const {
 CookBook::FunctionRecipe::FunctionRecipe(
     Function function,
     CachedInstanceLifecycle lifecycle,
-    std::vector<TypeIndex> dependencies,
+    std::vector<avsCommon::utils::TypeIndex> dependencies,
     ProduceInstanceFunction produceFunction,
     DeleteInstanceFunction deleteFunction,
     DeleteRecipeFunction deleteRecipeFunction) {
diff --git a/shared/acsdkNotifier/CMakeLists.txt b/shared/acsdkNotifier/CMakeLists.txt
deleted file mode 100644
index b89bc0373c..0000000000
--- a/shared/acsdkNotifier/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-cmake_minimum_required(VERSION 3.1)
-
-project(acsdkNotifier LANGUAGES CXX)
-
-add_library(acsdkNotifier INTERFACE)
-
-target_include_directories(acsdkNotifier INTERFACE
-    "${acsdkNotifier_SOURCE_DIR}/include"
-)
-
-target_link_libraries(acsdkNotifier INTERFACE acsdkNotifierInterfaces)
-
-# install interface
-asdk_install_interface()
-
-add_subdirectory("test")
\ No newline at end of file
diff --git a/shared/acsdkNotifier/include/acsdkNotifier/internal/Notifier.h b/shared/acsdkNotifier/include/acsdkNotifier/internal/Notifier.h
deleted file mode 100644
index 116ec15a37..0000000000
--- a/shared/acsdkNotifier/include/acsdkNotifier/internal/Notifier.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKNOTIFIER_INTERNAL_NOTIFIER_H_
-#define ACSDKNOTIFIER_INTERNAL_NOTIFIER_H_
-
-#include <algorithm>
-#include <memory>
-#include <mutex>
-#include <vector>
-
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
-
-namespace alexaClientSDK {
-namespace acsdkNotifier {
-
-/**
- * Notifier maintains a set of observers that are notified with a caller defined function.
- *
- * @tparam ObserverType The type of observer notified by the template instantiation.
- */
-template <typename ObserverType>
-class Notifier : public acsdkNotifierInterfaces::NotifierInterface<ObserverType> {
-public:
-    /**
-     * Constructor.
-     */
-    Notifier();
-
-    /// @name NotifierInterface methods
-    /// @{
-    void addObserver(const std::shared_ptr<ObserverType>& observer) override;
-    void removeObserver(const std::shared_ptr<ObserverType>& observer) override;
-    void addWeakPtrObserver(const std::weak_ptr<ObserverType>& observer) override;
-    void removeWeakPtrObserver(const std::weak_ptr<ObserverType>& observer) override;
-    void notifyObservers(std::function<void(const std::shared_ptr<ObserverType>&)> notify) override;
-    bool notifyObserversInReverse(std::function<void(const std::shared_ptr<ObserverType>&)> notify) override;
-    void setAddObserverFunction(std::function<void(const std::shared_ptr<ObserverType>&)> addObserverFunc) override;
-    /// @}
-
-private:
-    /**
-     * Eliminate the unwanted observer value from @c m_observers.  This will also cleanup any @c weak_ptr observer that
-     * has been expired.
-     *
-     * @param unwanted The unwanted observer value.
-     */
-    void cleanupLocked(const std::shared_ptr<ObserverType>& unwanted);
-
-    /**
-     * Checks if observer already exists in  @c m_observers.
-     *
-     * @param unwanted The observer value.
-     * @return true if observer already exists, false otherwise.
-     */
-    bool isAlreadyExistLocked(const std::shared_ptr<ObserverType>& observer);
-
-    /// A class for a Notifier observer
-    class NotifierObserver {
-    public:
-        /**
-         * Constructor.
-         *
-         * @param observer The @c std::shared_ptr observer.
-         */
-        explicit NotifierObserver(const std::shared_ptr<ObserverType>& observer);
-
-        /**
-         * Constructor.
-         *
-         * @param observer The @c std::weak_ptr observer.
-         */
-        explicit NotifierObserver(const std::weak_ptr<ObserverType>& observer);
-
-        /**
-         * Gets the observer.
-         *
-         * @return The observer as a @c std::shared_ptr.
-         */
-        std::shared_ptr<ObserverType> get() const;
-
-        /**
-         * Clears the observer.
-         */
-        void clear();
-
-        /**
-         * Checks if the notifier observer matches the observer that is passed in, or if the notifier observer (if it's
-         * a weak_ptr observer) has expired.
-         *
-         * @param The observer to check against if it's equal.
-         * @return true if observer is equal to notifier observer or if notifier observer has expired, false otherwise.
-         */
-        bool isEqualOrExpired(const std::shared_ptr<ObserverType>& observer) const;
-
-    private:
-        /// A enum type to specify the observer pointer type
-        enum class ObserverPointerType {
-            /// Observer is SHARED_PTR
-            SHARED_PTR,
-            /// Observer is WEAK_PTR
-            WEAK_PTR
-        };
-
-        /// Type of observer
-        ObserverPointerType m_type;
-        /// shared_ptr of observer, if its type is SHARED_PTR
-        std::shared_ptr<ObserverType> m_sharedPtrObserver;
-        /// weak_ptr of observer, if its type is WEAK_PTR
-        std::weak_ptr<ObserverType> m_weakPtrObserver;
-    };
-
-    /// Mutex to serialize access to m_depth and m_observers.  Note that a recursive mutex is used
-    /// here to avoid undefined behavior if notifying an observer callback in to this @c Notifier.
-    std::recursive_mutex m_mutex;
-
-    /// Depth of calls to @c notifyObservers() and notifyObserversInReverse().
-    int m_depth;
-
-    /// The set of observers.  Note that a vector is used here to allow for the addition
-    /// or removal of observers while calls to notifyObservers() are in progress.
-    std::vector<NotifierObserver> m_observers;
-
-    /// If set, this function will be called after an observer is added.
-    std::function<void(const std::shared_ptr<ObserverType>&)> m_addObserverFunc;
-};
-
-template <typename ObserverType>
-inline Notifier<ObserverType>::NotifierObserver::NotifierObserver(const std::shared_ptr<ObserverType>& observer) :
-        m_type{ObserverPointerType::SHARED_PTR},
-        m_sharedPtrObserver{observer} {
-}
-
-template <typename ObserverType>
-inline Notifier<ObserverType>::NotifierObserver::NotifierObserver(const std::weak_ptr<ObserverType>& observer) :
-        m_type{ObserverPointerType::WEAK_PTR},
-        m_weakPtrObserver{observer} {
-}
-
-template <typename ObserverType>
-inline std::shared_ptr<ObserverType> Notifier<ObserverType>::NotifierObserver::get() const {
-    if (ObserverPointerType::SHARED_PTR == m_type) {
-        return m_sharedPtrObserver;
-    } else {
-        return m_weakPtrObserver.lock();
-    }
-}
-
-template <typename ObserverType>
-inline void Notifier<ObserverType>::NotifierObserver::clear() {
-    if (ObserverPointerType::SHARED_PTR == m_type) {
-        m_sharedPtrObserver.reset();
-    } else {
-        m_weakPtrObserver.reset();
-    }
-}
-
-template <typename ObserverType>
-inline bool Notifier<ObserverType>::NotifierObserver::isEqualOrExpired(
-    const std::shared_ptr<ObserverType>& observer) const {
-    if (m_type == ObserverPointerType::SHARED_PTR) {
-        return m_sharedPtrObserver == observer;
-    } else {
-        return m_weakPtrObserver.expired() || m_weakPtrObserver.lock() == observer;
-    }
-}
-
-template <typename ObserverType>
-inline Notifier<ObserverType>::Notifier() : m_depth{0} {
-}
-
-template <typename ObserverType>
-inline void Notifier<ObserverType>::addObserver(const std::shared_ptr<ObserverType>& observer) {
-    if (!observer) {
-        return;
-    }
-
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    if (isAlreadyExistLocked(observer)) {
-        return;
-    }
-    m_observers.push_back(NotifierObserver{observer});
-
-    if (m_addObserverFunc) {
-        m_addObserverFunc(observer);
-    }
-}
-
-template <typename ObserverType>
-inline void Notifier<ObserverType>::removeObserver(const std::shared_ptr<ObserverType>& observer) {
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    if (m_depth > 0) {
-        for (size_t ix = 0; ix < m_observers.size(); ix++) {
-            auto& notifierObserver = m_observers[ix];
-            if (notifierObserver.get() == observer) {
-                notifierObserver.clear();
-            }
-        }
-    } else {
-        cleanupLocked(observer);
-    }
-}
-
-template <typename ObserverType>
-inline void Notifier<ObserverType>::addWeakPtrObserver(const std::weak_ptr<ObserverType>& observer) {
-    auto observerSharedPtr = observer.lock();
-    if (!observerSharedPtr) {
-        return;
-    }
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    if (isAlreadyExistLocked(observerSharedPtr)) {
-        return;
-    }
-    m_observers.push_back(NotifierObserver{observer});
-
-    if (m_addObserverFunc) {
-        m_addObserverFunc(observerSharedPtr);
-    }
-}
-
-template <typename ObserverType>
-inline void Notifier<ObserverType>::removeWeakPtrObserver(const std::weak_ptr<ObserverType>& observer) {
-    auto observerSharedPtr = observer.lock();
-    if (!observerSharedPtr) {
-        return;
-    }
-    removeObserver(observerSharedPtr);
-}
-
-template <typename ObserverType>
-inline void Notifier<ObserverType>::notifyObservers(std::function<void(const std::shared_ptr<ObserverType>&)> notify) {
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    m_depth++;
-    for (size_t ix = 0; ix < m_observers.size(); ix++) {
-        const auto& notifierObserver = m_observers[ix];
-        auto observer = notifierObserver.get();
-        if (observer) {
-            notify(observer);
-        }
-    }
-    if (0 == --m_depth) {
-        cleanupLocked(nullptr);
-    }
-}
-
-template <typename ObserverType>
-inline bool Notifier<ObserverType>::notifyObserversInReverse(
-    std::function<void(const std::shared_ptr<ObserverType>&)> notify) {
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    m_depth++;
-    auto initialSize = m_observers.size();
-    for (auto ix = initialSize; ix-- > 0;) {
-        const auto& notifierObserver = m_observers[ix];
-        auto observer = notifierObserver.get();
-        if (observer) {
-            notify(observer);
-        }
-    }
-    bool result = m_observers.size() == initialSize;
-    if (0 == --m_depth) {
-        cleanupLocked(nullptr);
-    }
-    return result;
-}
-
-template <typename ObserverType>
-inline void Notifier<ObserverType>::setAddObserverFunction(
-    std::function<void(const std::shared_ptr<ObserverType>&)> addObserverFunc) {
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    bool notifyAddedObservers = false;
-    if (!m_addObserverFunc && addObserverFunc) {
-        notifyAddedObservers = true;
-    }
-    m_addObserverFunc = addObserverFunc;
-    if (notifyAddedObservers) {
-        notifyObservers(m_addObserverFunc);
-    }
-}
-
-template <typename ObserverType>
-inline void Notifier<ObserverType>::cleanupLocked(const std::shared_ptr<ObserverType>& unwanted) {
-    auto matches = [unwanted](NotifierObserver notifierObserver) {
-        return notifierObserver.isEqualOrExpired(unwanted);
-    };
-
-    m_observers.erase(std::remove_if(m_observers.begin(), m_observers.end(), matches), m_observers.end());
-}
-
-template <typename ObserverType>
-inline bool Notifier<ObserverType>::isAlreadyExistLocked(const std::shared_ptr<ObserverType>& observer) {
-    for (const auto& existing : m_observers) {
-        if (existing.get() == observer) {
-            return true;
-        }
-    }
-    return false;
-}
-
-}  // namespace acsdkNotifier
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKNOTIFIER_INTERNAL_NOTIFIER_H_
diff --git a/shared/acsdkNotifier/test/CMakeLists.txt b/shared/acsdkNotifier/test/CMakeLists.txt
deleted file mode 100644
index d1231d3aff..0000000000
--- a/shared/acsdkNotifier/test/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-
-discover_unit_tests("${acsdkNotifier_INCLUDE_DIRS}" acsdkNotifier AVSCommon)
diff --git a/shared/acsdkNotifierInterfaces/include/acsdkNotifierInterfaces/internal/NotifierInterface.h b/shared/acsdkNotifierInterfaces/include/acsdkNotifierInterfaces/internal/NotifierInterface.h
deleted file mode 100644
index b079ab4edf..0000000000
--- a/shared/acsdkNotifierInterfaces/include/acsdkNotifierInterfaces/internal/NotifierInterface.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-#ifndef ACSDKNOTIFIERINTERFACES_INTERNAL_NOTIFIERINTERFACE_H_
-#define ACSDKNOTIFIERINTERFACES_INTERNAL_NOTIFIERINTERFACE_H_
-
-#include <functional>
-#include <memory>
-
-namespace alexaClientSDK {
-namespace acsdkNotifierInterfaces {
-
-/**
- * Interface for maintains a set of observers that are notified with a caller defined function.
- *
- * @tparam ObserverType The type of observer notified by the template instantiation.
- */
-template <typename ObserverType>
-class NotifierInterface {
-public:
-    /**
-     * Destructor.
-     */
-    virtual ~NotifierInterface() = default;
-
-    /**
-     * Add an observer.  Duplicate additions are ignored.
-     *
-     * @param observer The observer to add.
-     *
-     * @deprecated In the future, @c Notifier will no longer maintain the life cycle of its @c observers.  Please start
-     * using the new @c addWeakPtrObserver() API instead.
-     */
-    virtual void addObserver(const std::shared_ptr<ObserverType>& observer) = 0;
-
-    /**
-     * Remove an observer.  Invalid requests (nullptr or non member observers) are ignored.
-     *
-     * @param observer The observer to remove.
-     *
-     * @deprecated In the future, @c Notifier will no longer maintain the life cycle of its @c observers.  Please start
-     * using the new @c removeWeakPtrObserver() API instead.
-     */
-    virtual void removeObserver(const std::shared_ptr<ObserverType>& observer) = 0;
-
-    /**
-     * Add an observer with weak_ptr.  Duplicate additions are ignored.
-     *
-     * @param observer The observer to add.
-     *
-     * @note Lifecycle of the observer will not be managed by the Notifier.  If the observer object is expired, then
-     * no callback will be called to that object.
-     */
-    virtual void addWeakPtrObserver(const std::weak_ptr<ObserverType>& observer) = 0;
-
-    /**
-     * Remove an observer with weak_ptr.  Invalid requests (nullptr or non member observers) are ignored.
-     *
-     * @param observer The observer to remove.
-     */
-    virtual void removeWeakPtrObserver(const std::weak_ptr<ObserverType>& observer) = 0;
-
-    /**
-     * Notify the observers in the order that they were added.
-     *
-     * @param notify The function to invoke to notify an observer.
-     */
-    virtual void notifyObservers(std::function<void(const std::shared_ptr<ObserverType>&)> notify) = 0;
-
-    /**
-     * Notify the observers in the reverse order that they were added.
-     *
-     * @param notify The function to invoke to notify an observer.
-     * @return true if (and only if) all observers were notified (observers added during calls to this method
-     * will miss out).
-     */
-    virtual bool notifyObserversInReverse(std::function<void(const std::shared_ptr<ObserverType>&)> notify) = 0;
-
-    /**
-     * Set the function to be called after an observer is added (for example, to notify the newly-added observer
-     * of the current state).
-     *
-     * If there's any observers that were added before @c setAddObserverFunction is called, those added observers will
-     * be notified as well.
-     *
-     * @warn Use caution when setting this function. The function MUST be reentrant, or else you run the risk
-     * of deadlock. When an observer adds itself to a @c NotifierInterface, this function will be called in the
-     * same context.
-     *
-     * @param postAddFunc The function to call after an observer is added.
-     */
-    virtual void setAddObserverFunction(std::function<void(const std::shared_ptr<ObserverType>&)> postAddFunc) = 0;
-};
-
-}  // namespace acsdkNotifierInterfaces
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKNOTIFIERINTERFACES_INTERNAL_NOTIFIERINTERFACE_H_
diff --git a/shared/acsdkNotifierInterfaces/test/CMakeLists.txt b/shared/acsdkNotifierInterfaces/test/CMakeLists.txt
deleted file mode 100644
index a64ee4d7cb..0000000000
--- a/shared/acsdkNotifierInterfaces/test/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-
-if (BUILD_TESTING)
-    add_library(NotifierTestLib INTERFACE)
-
-    target_include_directories(NotifierTestLib INTERFACE "${acsdkNotifierInterfaces_SOURCE_DIR}/test/include")
-
-    target_link_libraries(NotifierTestLib INTERFACE acsdkNotifierInterfaces gmock_main)
-endif()
diff --git a/shared/acsdkNotifierInterfaces/test/include/acsdkNotifierInterfaces/internal/MockNotifier.h b/shared/acsdkNotifierInterfaces/test/include/acsdkNotifierInterfaces/internal/MockNotifier.h
deleted file mode 100644
index f56ebd778d..0000000000
--- a/shared/acsdkNotifierInterfaces/test/include/acsdkNotifierInterfaces/internal/MockNotifier.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-#ifndef ACSDKNOTIFIERINTERFACES_INTERNAL_MOCKNOTIFIER_H_
-#define ACSDKNOTIFIERINTERFACES_INTERNAL_MOCKNOTIFIER_H_
-
-#include <gmock/gmock.h>
-
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
-
-namespace alexaClientSDK {
-namespace acsdkNotifierInterfaces {
-namespace test {
-
-/**
- * Mock class that implements NotifierInterface.
- *
- * To make Expect calls against the observer you will need to set a ON_CALL WillByDefault assertion that will pass the
- * args to the observer.
- *
- * ON_CALL(MockNotifier, notifyObservers(_))
-            .WillByDefault(Invoke(
-                [this](std::function<void(
-                           const std::shared_ptr<ObserverType>&)>
-                           notifyFn) { notifyFn(observer); }));
- */
-template <typename ObserverType>
-class MockNotifier : public acsdkNotifierInterfaces::NotifierInterface<ObserverType> {
-public:
-    MOCK_METHOD1_T(addObserver, void(const std::shared_ptr<ObserverType>& observer));
-
-    MOCK_METHOD1_T(removeObserver, void(const std::shared_ptr<ObserverType>& observer));
-
-    MOCK_METHOD1_T(addWeakPtrObserver, void(const std::weak_ptr<ObserverType>& observer));
-
-    MOCK_METHOD1_T(removeWeakPtrObserver, void(const std::weak_ptr<ObserverType>& observer));
-
-    MOCK_METHOD1_T(notifyObservers, void(std::function<void(const std::shared_ptr<ObserverType>&)>));
-
-    MOCK_METHOD1_T(notifyObserversInReverse, bool(std::function<void(const std::shared_ptr<ObserverType>&)>));
-
-    MOCK_METHOD1_T(setAddObserverFunction, void(std::function<void(const std::shared_ptr<ObserverType>&)>));
-};
-
-}  // namespace test
-}  // namespace acsdkNotifierInterfaces
-}  // namespace alexaClientSDK
-
-#endif  // ACSDKNOTIFIERINTERFACES_INTERNAL_MOCKNOTIFIER_H_
diff --git a/shared/acsdkShutdownManager/include/acsdkShutdownManager/ShutdownNotifier.h b/shared/acsdkShutdownManager/include/acsdkShutdownManager/ShutdownNotifier.h
index bbcd228e83..949e621513 100644
--- a/shared/acsdkShutdownManager/include/acsdkShutdownManager/ShutdownNotifier.h
+++ b/shared/acsdkShutdownManager/include/acsdkShutdownManager/ShutdownNotifier.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 #include <acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h>
 #include <AVSCommon/Utils/RequiresShutdown.h>
 
@@ -28,7 +28,7 @@ namespace acsdkShutdownManager {
 /**
  * Relays notification when it's time to shut down.
  */
-class ShutdownNotifier : public acsdkNotifier::Notifier<avsCommon::utils::RequiresShutdown> {
+class ShutdownNotifier : public notifier::Notifier<avsCommon::utils::RequiresShutdown> {
 public:
     /**
      * Factory method.
diff --git a/shared/acsdkShutdownManager/src/ShutdownManager.cpp b/shared/acsdkShutdownManager/src/ShutdownManager.cpp
index bc6c42516a..4e800908a8 100644
--- a/shared/acsdkShutdownManager/src/ShutdownManager.cpp
+++ b/shared/acsdkShutdownManager/src/ShutdownManager.cpp
@@ -24,7 +24,7 @@ using namespace acsdkShutdownManagerInterfaces;
 using namespace avsCommon::utils;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("ShutdownManager");
+#define TAG "ShutdownManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/shared/acsdkShutdownManagerInterfaces/include/acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h b/shared/acsdkShutdownManagerInterfaces/include/acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h
index a3d92a52f8..148f6f3a15 100644
--- a/shared/acsdkShutdownManagerInterfaces/include/acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h
+++ b/shared/acsdkShutdownManagerInterfaces/include/acsdkShutdownManagerInterfaces/ShutdownNotifierInterface.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
 #include <AVSCommon/Utils/RequiresShutdown.h>
 
 namespace alexaClientSDK {
@@ -27,7 +27,7 @@ namespace acsdkShutdownManagerInterfaces {
 /**
  * Interface for registering to observe shutdown notifications.
  */
-using ShutdownNotifierInterface = acsdkNotifierInterfaces::NotifierInterface<avsCommon::utils::RequiresShutdown>;
+using ShutdownNotifierInterface = notifierInterfaces::NotifierInterface<avsCommon::utils::RequiresShutdown>;
 
 }  // namespace acsdkShutdownManagerInterfaces
 }  // namespace alexaClientSDK
diff --git a/shared/acsdkStartupManager/include/acsdkStartupManager/StartupNotifier.h b/shared/acsdkStartupManager/include/acsdkStartupManager/StartupNotifier.h
index c2c398e6ac..58204cb94e 100644
--- a/shared/acsdkStartupManager/include/acsdkStartupManager/StartupNotifier.h
+++ b/shared/acsdkStartupManager/include/acsdkStartupManager/StartupNotifier.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <acsdkNotifier/internal/Notifier.h>
+#include <acsdk/Notifier/Notifier.h>
 
 #include "acsdkStartupManagerInterfaces/RequiresStartupInterface.h"
 #include "acsdkStartupManagerInterfaces/StartupNotifierInterface.h"
@@ -29,7 +29,7 @@ namespace acsdkStartupManager {
 /**
  * Relays the notification when it's time to start up.
  */
-class StartupNotifier : public acsdkNotifier::Notifier<acsdkStartupManagerInterfaces::RequiresStartupInterface> {
+class StartupNotifier : public notifier::Notifier<acsdkStartupManagerInterfaces::RequiresStartupInterface> {
 public:
     /**
      * Factory method.
diff --git a/shared/acsdkStartupManager/src/StartupManager.cpp b/shared/acsdkStartupManager/src/StartupManager.cpp
index ab6403fb3d..94d696d6bc 100644
--- a/shared/acsdkStartupManager/src/StartupManager.cpp
+++ b/shared/acsdkStartupManager/src/StartupManager.cpp
@@ -23,7 +23,7 @@ namespace acsdkStartupManager {
 using namespace acsdkStartupManagerInterfaces;
 
 /// String to identify log entries originating from this file.
-static const std::string TAG("StartupManager");
+#define TAG "StartupManager"
 
 /**
  * Create a LogEntry using this file's TAG and the specified event string.
diff --git a/shared/acsdkStartupManagerInterfaces/CMakeLists.txt b/shared/acsdkStartupManagerInterfaces/CMakeLists.txt
index 4bbeef350b..be423d987a 100644
--- a/shared/acsdkStartupManagerInterfaces/CMakeLists.txt
+++ b/shared/acsdkStartupManagerInterfaces/CMakeLists.txt
@@ -14,3 +14,5 @@ target_link_libraries(acsdkStartupManagerInterfaces INTERFACE
 
 # install interface
 asdk_install_interface()
+
+add_subdirectory("test")
diff --git a/shared/acsdkStartupManagerInterfaces/include/acsdkStartupManagerInterfaces/StartupNotifierInterface.h b/shared/acsdkStartupManagerInterfaces/include/acsdkStartupManagerInterfaces/StartupNotifierInterface.h
index 41522029f7..02051f2317 100644
--- a/shared/acsdkStartupManagerInterfaces/include/acsdkStartupManagerInterfaces/StartupNotifierInterface.h
+++ b/shared/acsdkStartupManagerInterfaces/include/acsdkStartupManagerInterfaces/StartupNotifierInterface.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <acsdkNotifierInterfaces/internal/NotifierInterface.h>
+#include <acsdk/NotifierInterfaces/NotifierInterface.h>
 
 #include "acsdkStartupManagerInterfaces/RequiresStartupInterface.h"
 
@@ -28,7 +28,7 @@ namespace acsdkStartupManagerInterfaces {
 /**
  * Interface for registering to observe startup notifications.
  */
-using StartupNotifierInterface = acsdkNotifierInterfaces::NotifierInterface<RequiresStartupInterface>;
+using StartupNotifierInterface = notifierInterfaces::NotifierInterface<RequiresStartupInterface>;
 
 }  // namespace acsdkStartupManagerInterfaces
 }  // namespace alexaClientSDK
diff --git a/shared/acsdkStartupManagerInterfaces/test/CMakeLists.txt b/shared/acsdkStartupManagerInterfaces/test/CMakeLists.txt
new file mode 100644
index 0000000000..01e0c4d8c4
--- /dev/null
+++ b/shared/acsdkStartupManagerInterfaces/test/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+if (BUILD_TESTING)
+  add_library(StartupNotifierTestLib INTERFACE)
+
+  target_include_directories(StartupNotifierTestLib INTERFACE "${acsdkStartupManagerInterfaces_SOURCE_DIR}/test")
+
+  target_link_libraries(StartupNotifierTestLib INTERFACE acsdkStartupManagerInterfaces gmock_main)
+endif()
+
diff --git a/shared/acsdkStartupManagerInterfaces/test/acsdkStartupManagerInterfaces/MockStartupNotifier.h b/shared/acsdkStartupManagerInterfaces/test/acsdkStartupManagerInterfaces/MockStartupNotifier.h
new file mode 100644
index 0000000000..78c92f8867
--- /dev/null
+++ b/shared/acsdkStartupManagerInterfaces/test/acsdkStartupManagerInterfaces/MockStartupNotifier.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef SHARED_ACSDKSTARTUPMANAGERINTERFACES_TEST_ACSDKSTARTUPMANAGERINTERFACES_MOCKSTARTUPNOTIFIER_H_
+#define SHARED_ACSDKSTARTUPMANAGERINTERFACES_TEST_ACSDKSTARTUPMANAGERINTERFACES_MOCKSTARTUPNOTIFIER_H_
+
+#include <acsdkStartupManagerInterfaces/StartupNotifierInterface.h>
+
+#include <gtest/gtest.h>
+
+namespace alexaClientSDK {
+namespace acsdkStartupManagerInterfaces {
+namespace test {
+
+/// Mock class for StartupNotifierInterface
+class MockStartupNotifier : public StartupNotifierInterface {
+public:
+    MOCK_METHOD1(
+        addObserver,
+        void(const std::shared_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>& observer));
+    MOCK_METHOD1(
+        removeObserver,
+        void(const std::shared_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>& observer));
+    MOCK_METHOD1(
+        addWeakPtrObserver,
+        void(const std::weak_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>& observer));
+    MOCK_METHOD1(
+        removeWeakPtrObserver,
+        void(const std::weak_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>& observer));
+    MOCK_METHOD1(
+        notifyObservers,
+        void(std::function<void(const std::shared_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>&)>));
+    MOCK_METHOD1(
+        notifyObserversInReverse,
+        bool(std::function<void(const std::shared_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>&)>));
+    MOCK_METHOD1(
+        setAddObserverFunction,
+        void(std::function<void(const std::shared_ptr<acsdkStartupManagerInterfaces::RequiresStartupInterface>&)>));
+};
+
+}  // namespace test
+}  // namespace acsdkStartupManagerInterfaces
+}  // namespace alexaClientSDK
+
+#endif  // SHARED_ACSDKSTARTUPMANAGERINTERFACES_TEST_ACSDKSTARTUPMANAGERINTERFACES_MOCKSTARTUPNOTIFIER_H_
diff --git a/tools/Install/android.sh b/tools/Install/android.sh
index 3710f97986..b6d11d5c1e 100644
--- a/tools/Install/android.sh
+++ b/tools/Install/android.sh
@@ -1,5 +1,4 @@
-#
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License").
 # You may not use this file except in compliance with the License.
@@ -11,7 +10,6 @@
 # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
-#
 
 if [ -z "$PLATFORM" ]; then
 	echo "You should run the main script."
@@ -47,9 +45,6 @@ CURL_CA_BUNDLE=${CURL_CA_BUNDLE:-"${DEVICE_INSTALL_PATH}/cacert.pem"}
 # Path to the start script that may be used to start the sample app.
 START_SCRIPT="${INSTALL_BASE}/startsample.sh"
 
-# Path to the start script that may be used to start the preview app.
-START_PREVIEW_SCRIPT="${INSTALL_BASE}/startpreview.sh"
-
 # Path to the sdk sqllite databases.
 CONFIG_DB_PATH="${DEVICE_INSTALL_PATH}/databases"
 
@@ -102,8 +97,10 @@ set_cmake_var() {
         -DFFMPEG_LIB_PATH=${INSTALL_TARGET_LIB} \
         -DFFMPEG_INCLUDE_DIR=${INSTALL_TARGET}/include \
         -DTARGET_RPATH=${INSTALL_TARGET_LIB} \
+        -DASSET_MANAGER=ON \
         -DLibArchive_LIBRARIES="${INSTALL_TARGET_LIB}/libarchive.so" \
         -DLibArchive_INCLUDE_DIRS="${INSTALL_TARGET_INCLUDE}" \
+        -DINSTALL_COMMON_SAMPLE_LIBS=ON \
         -DCMAKE_CXX_FLAGS="-I${LIBARCHIVE_LIBRARY_SOURCE}/contrib/android/include")
         #-DBUILD_SHARED_LIBS="ON" \
 }
@@ -134,14 +131,6 @@ generate_start_script() {
       ${DEVICE_BIN_PATH}/SampleApp \
       ${DEVICE_INSTALL_PATH}/${CONFIG_BASENAME} DEBUG9
 EOF
-
-  # Script for starting the Preview App.
-  cat << EOF > "${START_PREVIEW_SCRIPT}"
-
-  ${ADB} shell LD_LIBRARY_PATH=${DEVICE_INSTALL_PATH}/lib \
-      ${DEVICE_BIN_PATH}/PreviewAlexaClient \
-      ${DEVICE_INSTALL_PATH}/${CONFIG_BASENAME} DEBUG9
-EOF
 }
 
 generate_test_script() {
@@ -624,6 +613,7 @@ install_dependencies() {
           --host="${TOOLCHAIN_HOST}" \
           --build="${TOOLCHAIN_BUILD}" \
           --prefix="${INSTALL_TARGET}" \
+          --without-xml2 \
           CPPFLAGS="-I${LIBARCHIVE_LIBRARY_SOURCE}/contrib/android/include"
           popd
       fi
@@ -776,8 +766,7 @@ adb_push() {
   configure_target
 
   ${ADB} push ${INSTALL_TARGET_LIB} ${DEVICE_INSTALL_PATH}
-  ${ADB} push ${BUILD_PATH}/SampleApp/src/SampleApp ${DEVICE_BIN_PATH}
-  ${ADB} push ${BUILD_PATH}/applications/acsdkPreviewAlexaClient/src/PreviewAlexaClient ${DEVICE_BIN_PATH}
+  ${ADB} push ${BUILD_PATH}/SampleApplications/ConsoleSampleApplication/src/SampleApp ${DEVICE_BIN_PATH}
   ${ADB} push ${OUTPUT_CONFIG_FILE} ${DEVICE_INSTALL_PATH}
 }
 
diff --git a/tools/Install/genConfig.sh b/tools/Install/genConfig.sh
index f1ec8d16c7..56d4f1930d 100755
--- a/tools/Install/genConfig.sh
+++ b/tools/Install/genConfig.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-#
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License").
@@ -13,7 +12,6 @@
 # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
-#
 
 set -o errexit  # Exit the script if any statement fails.
 set -o nounset  # Exit the script if any uninitialized variable is used.
@@ -25,8 +23,6 @@ LOCALE=${LOCALE:-'en-US'}
 INDEX_MANUFACTURER_NAME=0
 # The device description.
 INDEX_DEVICE_DESCRIPTION=1
-# The path to sensory model file.
-INDEX_SENSORY_MODEL_FILE_PATH=2
 
 # Defaults for PKCS11
 PKCS11_MODULE_PATH="__undefined__"
@@ -34,6 +30,11 @@ PKCS11_TOKEN_NAME="__undefined__"
 PKCS11_USER_PIN="__undefined__"
 PKCS11_KEY_NAME="__undefined__"
 
+# DAVS root directory path
+DAVS_ARTIFACT_ROOT_DIR="__undefined__"
+# DAVS segment id
+DAVS_SEGMENT_ID="__undefined__"
+
 function printUsageAndExit() {
     echo  'Usage: genConfig.sh <config.json file> <device_serial_number> <db path> <SDK Source Directory>'
     echo  '<output AlexaClientSDKConfig.json file> [-D<variable>=<value>]+'
@@ -48,12 +49,12 @@ function printUsageAndExit() {
     'Avaiable variables are:'
     echo  '   "SDK_CONFIG_MANUFACTURER_NAME": The name of the device manufacturer. This variable is required.'
     echo  '   "SDK_CONFIG_DEVICE_DESCRIPTION": The description of the device. This variable is required.'
-    echo  '   "SDK_SENSORY_MODEL_FILE_PATH": The path to the sensory KWD model. This variable is optional for Sensory KWD.\n' \
-    '   Please see https://github.com/Sensory/alexa-rpi#model-selection for more information.'
     echo  '   "PKCS11_MODULE_PATH": PKCS11 Module Path. This variable is required if PKCS11 is enabled.'
     echo  '   "PKCS11_TOKEN_NAME": PKCS11 Token Name. This variable is required if PKCS11 is enabled.'
     echo  '   "PKCS11_USER_PIN": PKCS11 User PIN. This variable is required if PKCS11 is enabled.'
     echo  '   "PKCS11_KEY_NAME": PKCS11 Key Object Name. This variable is required if PKCS11 is enabled.'
+    echo  '   "DAVS_ARTIFACT_ROOT_DIR": Specifies device artifact vending service (DAVS) root directory. This variable is required if ASSET_MANAGER is enabled.'
+    echo  '   "DAVS_SEGMENT_ID": Specifies device artifact vending service (DAVS) segment id. This variable is required if ASSET_MANAGER is enabled.'
     exit 1
 }
 
@@ -110,9 +111,6 @@ for variable in "$@"; do
     SDK_CONFIG_MANUFACTURER_NAME )
       extra_variables[${INDEX_MANUFACTURER_NAME}]=${variable_value}
       ;;
-    SDK_SENSORY_MODEL_FILE_PATH )
-      extra_variables[${INDEX_SENSORY_MODEL_FILE_PATH}]=${variable_value}
-      ;;
     PKCS11_MODULE_PATH )
       PKCS11_MODULE_PATH="${variable_value}"
       ;;
@@ -125,6 +123,12 @@ for variable in "$@"; do
     PKCS11_KEY_NAME )
       PKCS11_KEY_NAME="${variable_value}"
       ;;
+    DAVS_ARTIFACT_ROOT_DIR )
+      DAVS_ARTIFACT_ROOT_DIR="${variable_value}"
+      ;;
+    DAVS_SEGMENT_ID )
+      DAVS_SEGMENT_ID="${variable_value}"
+      ;;
     * )
       echo "[ERROR] Unknown configuration variable ${variable_name}"
       printUsageAndExit
@@ -178,8 +182,6 @@ fi
 set -a
 
 # Set variables for configuration file
-# Variables for cblAuthDelegate
-SDK_CBL_AUTH_DELEGATE_DATABASE_FILE_PATH=$CONFIG_DB_PATH/cblAuthDelegate.db
 
 # Variables for deviceInfo
 SDK_CONFIG_DEVICE_SERIAL_NUMBER=$DEVICE_SERIAL_NUMBER
@@ -214,18 +216,15 @@ SDK_LWA_AUTHORIZATION_ADAPTER_DATABASE_FILE_PATH=$CONFIG_DB_PATH/lwaAuthorizatio
 SDK_CONFIG_MANUFACTURER_NAME=${extra_variables[${INDEX_MANUFACTURER_NAME}]}
 SDK_CONFIG_DEVICE_DESCRIPTION=${extra_variables[${INDEX_DEVICE_DESCRIPTION}]}
 
-# Variable for Sensory Keyword Detection
-if [[ ${extra_variables[${INDEX_SENSORY_MODEL_FILE_PATH}]+foobar} ]]
-then
-  SDK_SENSORY_MODEL_FILE_PATH=${extra_variables[${INDEX_SENSORY_MODEL_FILE_PATH}]}
-fi
-
 # Variables for HSM
 SDK_PKCS11_MODULE_PATH="$PKCS11_MODULE_PATH"
 SDK_PKCS11_TOKEN_NAME="$PKCS11_TOKEN_NAME"
 SDK_PKCS11_KEY_NAME="$PKCS11_KEY_NAME"
 SDK_PKCS11_USER_PIN="$PKCS11_USER_PIN"
 
+SDK_DAVS_ARTIFACT_DIR="$DAVS_ARTIFACT_ROOT_DIR"
+SDK_DAVS_SEGMENT_ID="$DAVS_SEGMENT_ID"
+
 ########################################################################################################################
 # End of setting variables for generating $OUTPUT_CONFIG_FILE
 # All variables that needs to be substituted must be defined above "set +a" line!
diff --git a/tools/Install/mingw.sh b/tools/Install/mingw.sh
index 62fb44b922..aee4c03cbe 100644
--- a/tools/Install/mingw.sh
+++ b/tools/Install/mingw.sh
@@ -1,5 +1,4 @@
-#
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License").
 # You may not use this file except in compliance with the License.
@@ -11,7 +10,6 @@
 # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
-#
 
 if [ -z "$PLATFORM" ]; then
 	echo "You should run the main script."
@@ -20,7 +18,6 @@ fi
 
 LIB_SUFFIX="dll.a"
 START_SCRIPT="$INSTALL_BASE/startsample.bat"
-START_PREVIEW_SCRIPT="$INSTALL_BASE/startpreview.bat"
 CMAKE_PLATFORM_SPECIFIC=(-G 'MSYS Makefiles' -Dgtest_disable_pthreads=ON \
     -DGSTREAMER_MEDIA_PLAYER=ON -DPORTAUDIO=ON \
     -DPORTAUDIO_LIB_PATH="$THIRD_PARTY_PATH/portaudio/lib/.libs/libportaudio.$LIB_SUFFIX" \
@@ -68,13 +65,6 @@ generate_start_script() {
   SampleApp.exe `cygpath.exe -m $OUTPUT_CONFIG_FILE` DEBUG9
   pause
 EOF
-
-  cat << EOF > "$START_PREVIEW_SCRIPT"
-  set path=`cygpath.exe -m $MSYSTEM_PREFIX/bin`;%path%;
-  cd `cygpath.exe -m $BUILD_PATH/bin`
-  PreviewAlexaClient.exe `cygpath.exe -m $OUTPUT_CONFIG_FILE` DEBUG9
-  pause
-EOF
 }
 
 generate_test_script() {
diff --git a/tools/Install/pi.sh b/tools/Install/pi.sh
index d68ea09c2e..d7db5b00cb 100644
--- a/tools/Install/pi.sh
+++ b/tools/Install/pi.sh
@@ -1,4 +1,3 @@
-#
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License").
@@ -11,7 +10,6 @@
 # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
-#
 
 if [ -z "$PLATFORM" ]; then
 	echo "You should run the setup.sh script."
@@ -20,7 +18,6 @@ fi
 
 SOUND_CONFIG="$HOME/.asoundrc"
 START_SCRIPT="$INSTALL_BASE/startsample.sh"
-START_PREVIEW_SCRIPT="$INSTALL_BASE/startpreview.sh"
 CMAKE_PLATFORM_SPECIFIC=(-DGSTREAMER_MEDIA_PLAYER=ON \
     -DPORTAUDIO=ON \
     -DPORTAUDIO_LIB_PATH="$THIRD_PARTY_PATH/portaudio/lib/.libs/libportaudio.$LIB_SUFFIX" \
@@ -80,16 +77,10 @@ build_curl() {
 
 generate_start_script() {
   cat << EOF > "$START_SCRIPT"
-  cd "$BUILD_PATH/SampleApp/src"
+  cd "$BUILD_PATH/SampleApplications/ConsoleSampleApplication/src"
 
   PA_ALSA_PLUGHW=1 ./SampleApp "$OUTPUT_CONFIG_FILE" DEBUG9
 EOF
-
-  cat << EOF > "$START_PREVIEW_SCRIPT"
-  cd "$BUILD_PATH/applications/acsdkPreviewAlexaClient/src"
-
-  PA_ALSA_PLUGHW=1 ./PreviewAlexaClient "$OUTPUT_CONFIG_FILE" DEBUG9
-EOF
 }
 
 generate_test_script() {
diff --git a/tools/Install/setup.sh b/tools/Install/setup.sh
index 5ae9a0d2d1..887d3a2709 100755
--- a/tools/Install/setup.sh
+++ b/tools/Install/setup.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-#
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License").
@@ -13,12 +12,11 @@
 # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
-#
 
 set -o errexit  # Exit the script if any statement fails.
 set -o nounset  # Exit the script if any uninitialized variable is used.
 
-CLONE_URL=${CLONE_URL:- 'git://github.com/alexa/avs-device-sdk.git'}
+CLONE_URL=${CLONE_URL:-'https://github.com/alexa/avs-device-sdk.git'}
 
 PORT_AUDIO_FILE="pa_stable_v190600_20161030.tgz"
 PORT_AUDIO_DOWNLOAD_URL="http://www.portaudio.com/archives/$PORT_AUDIO_FILE"
@@ -320,17 +318,16 @@ then
   cmake "$SOURCE_PATH/avs-device-sdk" \
       -DCMAKE_BUILD_TYPE=DEBUG \
       -DPKCS11=$ACSDK_PKCS11 \
+      -DINSTALL_COMMON_SAMPLE_LIBS=ON \
       "${CMAKE_PLATFORM_SPECIFIC[@]}"
 
   cd $BUILD_PATH
   make SampleApp -j2
-  make PreviewAlexaClient -j2
   make all -j2
 
 else
   cd $BUILD_PATH
   make SampleApp -j2
-  make PreviewAlexaClient -j2
   make all -j2
 fi
 
@@ -362,4 +359,3 @@ generate_start_script
 generate_test_script
 
 echo " **** Completed Configuration/Build ***"
-
diff --git a/tools/Testing.cmake b/tools/Testing.cmake
index 95540396e1..547e55f9bd 100644
--- a/tools/Testing.cmake
+++ b/tools/Testing.cmake
@@ -31,13 +31,14 @@ macro(discover_unit_tests includes libraries)
             if (HAS_NO_DEPRECATED_DECLARATIONS)
                 target_compile_options(${testname} PRIVATE -Wno-deprecated-declarations)
             endif()
+            CHECK_CXX_COMPILER_FLAG("-Winfinite-recursion" HAS_INFINITE_RECURSION)
+            if (HAS_INFINITE_RECURSION)
+                target_compile_options(${testname} PRIVATE -Wno-error=infinite-recursion)
+            endif()
             target_include_directories(${testname} PRIVATE ${includes})
             # Do not include gtest_main due to double free issue
             # - https://github.com/google/googletest/issues/930
             target_link_libraries(${testname} ${libraries} gmock_main)
-            if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-                target_link_libraries(${testname} atomic)
-            endif()
             add_rpath_to_target("${testname}")
             configure_test_command(${testname} "${inputs}" ${testsourcefile})
         endforeach()
diff --git a/tools/Testing/android_test.py b/tools/Testing/android_test.py
index 7ef73ee49b..2fe3aa7325 100644
--- a/tools/Testing/android_test.py
+++ b/tools/Testing/android_test.py
@@ -1,10 +1,10 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License").
 # You may not use this file except in compliance with the License.
 # A copy of the License is located at
 #
-#     http://aws.amazon.com/apache2.0/
+#  http://aws.amazon.com/apache2.0
 #
 # or in the "license" file accompanying this file. This file is distributed
 # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either